From 4a20082c0d540defc1e090b1776f106db0d3430a Mon Sep 17 00:00:00 2001 From: Daniel Paul Carbone Date: Sat, 16 Nov 2019 22:48:17 -0600 Subject: [PATCH] latest updates from generator, including fhir_comments handling and better value container serialization --- .../DSTU1/FHIRAddressUseList.php | 3 +- .../DSTU1/FHIRAggregationModeList.php | 3 +- .../DSTU1/FHIRAlertStatusList.php | 3 +- .../DSTU1/FHIRBase64BinaryPrimitive.php | 3 +- .../PHPFHIRGenerated/DSTU1/FHIRBinary.php | 22 +- .../DSTU1/FHIRBindingConformanceList.php | 3 +- .../DSTU1/FHIRBooleanPrimitive.php | 3 +- .../FHIRCarePlanActivityCategoryList.php | 3 +- .../DSTU1/FHIRCarePlanActivityStatusList.php | 3 +- .../DSTU1/FHIRCarePlanGoalStatusList.php | 3 +- .../DSTU1/FHIRCarePlanStatusList.php | 3 +- .../DSTU1/FHIRCausalityExpectationList.php | 3 +- .../DSTU1/FHIRCodePrimitive.php | 3 +- .../FHIRCompositionAttestationModeList.php | 3 +- .../DSTU1/FHIRCompositionStatusList.php | 3 +- .../DSTU1/FHIRConceptMapEquivalenceList.php | 3 +- .../FHIRConditionRelationshipTypeList.php | 3 +- .../DSTU1/FHIRConditionStatusList.php | 3 +- .../DSTU1/FHIRConformanceEventModeList.php | 3 +- .../FHIRConformanceStatementStatusList.php | 3 +- .../DSTU1/FHIRConstraintSeverityList.php | 3 +- .../DSTU1/FHIRContactSystemList.php | 3 +- .../DSTU1/FHIRContactUseList.php | 3 +- .../DSTU1/FHIRCriticalityList.php | 3 +- .../DSTU1/FHIRDatePrimitive.php | 3 +- .../DSTU1/FHIRDateTimePrimitive.php | 3 +- .../DSTU1/FHIRDecimalPrimitive.php | 3 +- .../DSTU1/FHIRDiagnosticOrderPriorityList.php | 3 +- .../DSTU1/FHIRDiagnosticOrderStatusList.php | 3 +- .../DSTU1/FHIRDiagnosticReportStatusList.php | 3 +- .../DSTU1/FHIRDocumentModeList.php | 3 +- .../DSTU1/FHIRDocumentReferenceStatusList.php | 3 +- .../FHIRDocumentRelationshipTypeList.php | 3 +- .../PHPFHIRGenerated/DSTU1/FHIRElement.php | 22 +- .../DSTU1/FHIRElement/FHIRAddress.php | 149 +- .../DSTU1/FHIRElement/FHIRAddressUse.php | 12 +- .../DSTU1/FHIRElement/FHIRAggregationMode.php | 12 +- .../DSTU1/FHIRElement/FHIRAlertStatus.php | 12 +- .../DSTU1/FHIRElement/FHIRAttachment.php | 142 +- .../DSTU1/FHIRElement/FHIRBackboneElement.php | 14 +- .../FHIRAdverseReactionExposure.php | 67 +- .../FHIRAdverseReactionSymptom.php | 29 +- .../FHIRCarePlan/FHIRCarePlanActivity.php | 76 +- .../FHIRCarePlan/FHIRCarePlanGoal.php | 71 +- .../FHIRCarePlan/FHIRCarePlanParticipant.php | 11 +- .../FHIRCarePlan/FHIRCarePlanSimple.php | 112 +- .../FHIRCompositionAttester.php | 60 +- .../FHIRComposition/FHIRCompositionEvent.php | 16 +- .../FHIRCompositionSection.php | 34 +- .../FHIRConceptMap/FHIRConceptMapConcept.php | 55 +- .../FHIRConceptMapDependsOn.php | 66 +- .../FHIRConceptMap/FHIRConceptMapMap.php | 90 +- .../FHIRCondition/FHIRConditionEvidence.php | 15 +- .../FHIRCondition/FHIRConditionLocation.php | 29 +- .../FHIRConditionRelatedItem.php | 30 +- .../FHIRCondition/FHIRConditionStage.php | 13 +- .../FHIRConformanceCertificate.php | 47 +- .../FHIRConformanceDocument.php | 48 +- .../FHIRConformance/FHIRConformanceEvent.php | 91 +- .../FHIRConformanceImplementation.php | 47 +- .../FHIRConformanceMessaging.php | 71 +- .../FHIRConformanceOperation.php | 47 +- .../FHIRConformanceOperation1.php | 47 +- .../FHIRConformance/FHIRConformanceQuery.php | 71 +- .../FHIRConformanceResource.php | 100 +- .../FHIRConformance/FHIRConformanceRest.php | 84 +- .../FHIRConformanceSearchParam.php | 137 +- .../FHIRConformanceSecurity.php | 57 +- .../FHIRConformanceSoftware.php | 66 +- .../FHIRDeviceObservationReportChannel.php | 15 +- .../FHIRDeviceObservationReportMetric.php | 10 +- ...IRDeviceObservationReportVirtualDevice.php | 13 +- .../FHIRDiagnosticOrderEvent.php | 49 +- .../FHIRDiagnosticOrderItem.php | 36 +- .../FHIRDiagnosticReportImage.php | 29 +- .../FHIRDocumentReferenceContext.php | 14 +- .../FHIRDocumentReferenceParameter.php | 48 +- .../FHIRDocumentReferenceRelatesTo.php | 29 +- .../FHIRDocumentReferenceService.php | 60 +- .../FHIREncounterAccomodation.php | 11 +- .../FHIREncounterHospitalization.php | 65 +- .../FHIREncounter/FHIREncounterLocation.php | 11 +- .../FHIREncounterParticipant.php | 15 +- .../FHIRFamilyHistoryCondition.php | 71 +- .../FHIRFamilyHistoryRelation.php | 169 +- .../FHIRGroup/FHIRGroupCharacteristic.php | 69 +- .../FHIRImagingStudyInstance.php | 124 +- .../FHIRImagingStudySeries.php | 165 +- .../FHIRImmunizationExplanation.php | 17 +- .../FHIRImmunizationReaction.php | 48 +- .../FHIRImmunizationVaccinationProtocol.php | 89 +- ...mmunizationRecommendationDateCriterion.php | 30 +- ...FHIRImmunizationRecommendationProtocol.php | 67 +- ...munizationRecommendationRecommendation.php | 89 +- .../FHIRList/FHIRListEntry.php | 51 +- .../FHIRLocation/FHIRLocationPosition.php | 66 +- .../FHIRMedication/FHIRMedicationContent.php | 29 +- .../FHIRMedicationIngredient.php | 11 +- .../FHIRMedication/FHIRMedicationPackage.php | 15 +- .../FHIRMedication/FHIRMedicationProduct.php | 15 +- .../FHIRMedicationAdministrationDosage.php | 73 +- .../FHIRMedicationDispenseDispense.php | 113 +- .../FHIRMedicationDispenseDosage.php | 75 +- .../FHIRMedicationDispenseSubstitution.php | 16 +- .../FHIRMedicationPrescriptionDispense.php | 70 +- ...edicationPrescriptionDosageInstruction.php | 94 +- ...FHIRMedicationPrescriptionSubstitution.php | 11 +- .../FHIRMedicationStatementDosage.php | 54 +- .../FHIRMessageHeaderDestination.php | 48 +- .../FHIRMessageHeaderResponse.php | 48 +- .../FHIRMessageHeaderSource.php | 104 +- .../FHIRObservationReferenceRange.php | 49 +- .../FHIRObservationRelated.php | 29 +- .../FHIROperationOutcomeIssue.php | 73 +- .../FHIROrder/FHIROrderWhen.php | 11 +- .../FHIROrganizationContact.php | 46 +- .../FHIRPatient/FHIRPatientAnimal.php | 12 +- .../FHIRPatient/FHIRPatientContact.php | 49 +- .../FHIRPatient/FHIRPatientLink.php | 29 +- .../FHIRPractitionerQualification.php | 12 +- .../FHIRProcedure/FHIRProcedurePerformer.php | 11 +- .../FHIRProcedureRelatedItem.php | 29 +- .../FHIRProfile/FHIRProfileBinding.php | 105 +- .../FHIRProfile/FHIRProfileConstraint.php | 104 +- .../FHIRProfile/FHIRProfileDefinition.php | 891 ++++-- .../FHIRProfile/FHIRProfileElement.php | 80 +- .../FHIRProfile/FHIRProfileExtensionDefn.php | 92 +- .../FHIRProfile/FHIRProfileMapping.php | 85 +- .../FHIRProfile/FHIRProfileMapping1.php | 47 +- .../FHIRProfile/FHIRProfileQuery.php | 52 +- .../FHIRProfile/FHIRProfileSearchParam.php | 110 +- .../FHIRProfile/FHIRProfileSlicing.php | 66 +- .../FHIRProfile/FHIRProfileStructure.php | 95 +- .../FHIRProfile/FHIRProfileType.php | 80 +- .../FHIRProvenance/FHIRProvenanceAgent.php | 49 +- .../FHIRProvenance/FHIRProvenanceEntity.php | 68 +- .../FHIRQuery/FHIRQueryResponse.php | 88 +- .../FHIRQuestionnaireGroup.php | 57 +- .../FHIRQuestionnaireQuestion.php | 503 ++- .../FHIRBackboneElement/FHIRResource.php | 31 +- .../FHIRResource/FHIRAdverseReaction.php | 88 +- .../FHIRResource/FHIRAlert.php | 83 +- .../FHIRResource/FHIRAllergyIntolerance.php | 127 +- .../FHIRResource/FHIRCarePlan.php | 113 +- .../FHIRResource/FHIRComposition.php | 101 +- .../FHIRResource/FHIRConceptMap.php | 220 +- .../FHIRResource/FHIRCondition.php | 215 +- .../FHIRResource/FHIRConformance.php | 279 +- .../FHIRResource/FHIRDevice.php | 210 +- .../FHIRDeviceObservationReport.php | 54 +- .../FHIRResource/FHIRDiagnosticOrder.php | 109 +- .../FHIRResource/FHIRDiagnosticReport.php | 134 +- .../FHIRResource/FHIRDocumentManifest.php | 154 +- .../FHIRResource/FHIRDocumentReference.php | 295 +- .../FHIRResource/FHIREncounter.php | 118 +- .../FHIRResource/FHIRFamilyHistory.php | 65 +- .../FHIRResource/FHIRGroup.php | 113 +- .../FHIRResource/FHIRImagingStudy.php | 256 +- .../FHIRResource/FHIRImmunization.php | 171 +- .../FHIRImmunizationRecommendation.php | 44 +- .../FHIRResource/FHIRList.php | 104 +- .../FHIRResource/FHIRLocation.php | 141 +- .../FHIRResource/FHIRMedia.php | 180 +- .../FHIRResource/FHIRMedication.php | 70 +- .../FHIRMedicationAdministration.php | 93 +- .../FHIRResource/FHIRMedicationDispense.php | 56 +- .../FHIRMedicationPrescription.php | 89 +- .../FHIRResource/FHIRMedicationStatement.php | 73 +- .../FHIRResource/FHIRMessageHeader.php | 61 +- .../FHIRResource/FHIRObservation.php | 182 +- .../FHIRResource/FHIROperationOutcome.php | 14 +- .../FHIRResource/FHIROrder.php | 69 +- .../FHIRResource/FHIROrderResponse.php | 104 +- .../FHIRResource/FHIROrganization.php | 122 +- .../FHIRResource/FHIROther.php | 62 +- .../FHIRResource/FHIRPatient.php | 214 +- .../FHIRResource/FHIRPractitioner.php | 115 +- .../FHIRResource/FHIRProcedure.php | 121 +- .../FHIRResource/FHIRProfile.php | 255 +- .../FHIRResource/FHIRProvenance.php | 88 +- .../FHIRResource/FHIRQuery.php | 32 +- .../FHIRResource/FHIRQuestionnaire.php | 84 +- .../FHIRResource/FHIRRelatedPerson.php | 81 +- .../FHIRResource/FHIRSecurityEvent.php | 17 +- .../FHIRResource/FHIRSpecimen.php | 92 +- .../FHIRResource/FHIRSubstance.php | 33 +- .../FHIRResource/FHIRSupply.php | 53 +- .../FHIRResource/FHIRValueSet.php | 235 +- .../FHIRSecurityEventDetail.php | 48 +- .../FHIRSecurityEventEvent.php | 89 +- .../FHIRSecurityEventNetwork.php | 47 +- .../FHIRSecurityEventObject.php | 175 +- .../FHIRSecurityEventParticipant.php | 93 +- .../FHIRSecurityEventSource.php | 52 +- .../FHIRSpecimen/FHIRSpecimenCollection.php | 76 +- .../FHIRSpecimen/FHIRSpecimenContainer.php | 99 +- .../FHIRSpecimen/FHIRSpecimenSource.php | 33 +- .../FHIRSpecimen/FHIRSpecimenTreatment.php | 34 +- .../FHIRSubstance/FHIRSubstanceIngredient.php | 11 +- .../FHIRSubstance/FHIRSubstanceInstance.php | 66 +- .../FHIRSupply/FHIRSupplyDispense.php | 75 +- .../FHIRValueSet/FHIRValueSetCompose.php | 44 +- .../FHIRValueSet/FHIRValueSetConcept.php | 90 +- .../FHIRValueSet/FHIRValueSetContains.php | 71 +- .../FHIRValueSet/FHIRValueSetDefine.php | 71 +- .../FHIRValueSet/FHIRValueSetExpansion.php | 50 +- .../FHIRValueSet/FHIRValueSetFilter.php | 67 +- .../FHIRValueSet/FHIRValueSetInclude.php | 105 +- .../DSTU1/FHIRElement/FHIRBase64Binary.php | 11 +- .../FHIRElement/FHIRBindingConformance.php | 12 +- .../DSTU1/FHIRElement/FHIRBoolean.php | 11 +- .../FHIRCarePlanActivityCategory.php | 12 +- .../FHIRCarePlanActivityStatus.php | 12 +- .../FHIRElement/FHIRCarePlanGoalStatus.php | 12 +- .../DSTU1/FHIRElement/FHIRCarePlanStatus.php | 12 +- .../FHIRElement/FHIRCausalityExpectation.php | 12 +- .../DSTU1/FHIRElement/FHIRCode.php | 11 +- .../DSTU1/FHIRElement/FHIRCodeableConcept.php | 33 +- .../DSTU1/FHIRElement/FHIRCoding.php | 105 +- .../FHIRCompositionAttestationMode.php | 12 +- .../FHIRElement/FHIRCompositionStatus.php | 12 +- .../FHIRElement/FHIRConceptMapEquivalence.php | 12 +- .../FHIRConditionRelationshipType.php | 12 +- .../DSTU1/FHIRElement/FHIRConditionStatus.php | 12 +- .../FHIRElement/FHIRConformanceEventMode.php | 12 +- .../FHIRConformanceStatementStatus.php | 12 +- .../FHIRElement/FHIRConstraintSeverity.php | 12 +- .../DSTU1/FHIRElement/FHIRContact.php | 68 +- .../DSTU1/FHIRElement/FHIRContactSystem.php | 12 +- .../DSTU1/FHIRElement/FHIRContactUse.php | 12 +- .../DSTU1/FHIRElement/FHIRCriticality.php | 12 +- .../DSTU1/FHIRElement/FHIRDate.php | 11 +- .../DSTU1/FHIRElement/FHIRDateTime.php | 11 +- .../DSTU1/FHIRElement/FHIRDecimal.php | 11 +- .../FHIRElement/FHIRDecimal/FHIRScore.php | 3 +- .../FHIRDiagnosticOrderPriority.php | 12 +- .../FHIRElement/FHIRDiagnosticOrderStatus.php | 12 +- .../FHIRDiagnosticReportStatus.php | 12 +- .../DSTU1/FHIRElement/FHIRDocumentMode.php | 12 +- .../FHIRDocumentReferenceStatus.php | 12 +- .../FHIRDocumentRelationshipType.php | 12 +- .../DSTU1/FHIRElement/FHIREncounterClass.php | 12 +- .../DSTU1/FHIRElement/FHIREncounterState.php | 12 +- .../DSTU1/FHIRElement/FHIREventTiming.php | 12 +- .../DSTU1/FHIRElement/FHIRExposureType.php | 12 +- .../DSTU1/FHIRElement/FHIRExtension.php | 270 +- .../FHIRElement/FHIRExtensionContext.php | 12 +- .../DSTU1/FHIRElement/FHIRFilterOperator.php | 12 +- .../DSTU1/FHIRElement/FHIRGroupType.php | 12 +- .../FHIRHierarchicalRelationshipType.php | 12 +- .../DSTU1/FHIRElement/FHIRHumanName.php | 154 +- .../DSTU1/FHIRElement/FHIRId.php | 11 +- .../DSTU1/FHIRElement/FHIRIdentifier.php | 88 +- .../DSTU1/FHIRElement/FHIRIdentifierUse.php | 12 +- .../DSTU1/FHIRElement/FHIRImagingModality.php | 12 +- .../FHIRElement/FHIRInstanceAvailability.php | 12 +- .../DSTU1/FHIRElement/FHIRInstant.php | 11 +- .../DSTU1/FHIRElement/FHIRInteger.php | 11 +- .../FHIRInteger/FHIRTotalResults.php | 3 +- .../DSTU1/FHIRElement/FHIRIssueSeverity.php | 12 +- .../DSTU1/FHIRElement/FHIRLinkType.php | 12 +- .../DSTU1/FHIRElement/FHIRListMode.php | 12 +- .../DSTU1/FHIRElement/FHIRLocationMode.php | 12 +- .../DSTU1/FHIRElement/FHIRLocationStatus.php | 12 +- .../DSTU1/FHIRElement/FHIRMediaType.php | 12 +- .../FHIRMedicationAdministrationStatus.php | 12 +- .../FHIRMedicationDispenseStatus.php | 12 +- .../DSTU1/FHIRElement/FHIRMedicationKind.php | 12 +- .../FHIRMedicationPrescriptionStatus.php | 12 +- .../FHIRMessageSignificanceCategory.php | 12 +- .../DSTU1/FHIRElement/FHIRModality.php | 12 +- .../DSTU1/FHIRElement/FHIRNameUse.php | 12 +- .../DSTU1/FHIRElement/FHIRNarrative.php | 31 +- .../DSTU1/FHIRElement/FHIRNarrativeStatus.php | 12 +- .../FHIRObservationRelationshipType.php | 12 +- .../FHIRObservationReliability.php | 12 +- .../FHIRElement/FHIRObservationStatus.php | 12 +- .../DSTU1/FHIRElement/FHIROid.php | 11 +- .../FHIRElement/FHIROrderOutcomeStatus.php | 12 +- .../DSTU1/FHIRElement/FHIRPeriod.php | 47 +- .../FHIRProcedureRelationshipType.php | 12 +- .../FHIRPropertyRepresentation.php | 12 +- .../FHIRElement/FHIRProvenanceEntityRole.php | 12 +- .../DSTU1/FHIRElement/FHIRQuantity.php | 105 +- .../FHIRElement/FHIRQuantity/FHIRAge.php | 3 +- .../FHIRElement/FHIRQuantity/FHIRCount.php | 3 +- .../FHIRElement/FHIRQuantity/FHIRDistance.php | 3 +- .../FHIRElement/FHIRQuantity/FHIRDuration.php | 3 +- .../FHIRElement/FHIRQuantity/FHIRMoney.php | 3 +- .../FHIRElement/FHIRQuantityCompararator.php | 12 +- .../DSTU1/FHIRElement/FHIRQueryOutcome.php | 12 +- .../FHIRElement/FHIRQuestionnaireStatus.php | 12 +- .../DSTU1/FHIRElement/FHIRRange.php | 47 +- .../DSTU1/FHIRElement/FHIRRatio.php | 47 +- .../FHIRElement/FHIRReactionSeverity.php | 12 +- .../FHIRElement/FHIRResourceProfileStatus.php | 12 +- .../FHIRElement/FHIRResourceReference.php | 47 +- .../DSTU1/FHIRElement/FHIRResponseType.php | 12 +- .../FHIRRestfulConformanceMode.php | 12 +- .../FHIRRestfulOperationSystem.php | 12 +- .../FHIRElement/FHIRRestfulOperationType.php | 12 +- .../DSTU1/FHIRElement/FHIRSampledData.php | 142 +- .../FHIRElement/FHIRSampledDataDataType.php | 11 +- .../DSTU1/FHIRElement/FHIRSchedule.php | 13 +- .../FHIRSchedule/FHIRScheduleRepeat.php | 123 +- .../DSTU1/FHIRElement/FHIRSearchParamType.php | 12 +- .../FHIRElement/FHIRSecurityEventAction.php | 12 +- .../FHIRSecurityEventObjectLifecycle.php | 12 +- .../FHIRSecurityEventObjectRole.php | 12 +- .../FHIRSecurityEventObjectType.php | 12 +- .../FHIRElement/FHIRSecurityEventOutcome.php | 12 +- ...HIRSecurityEventParticipantNetworkType.php | 12 +- .../FHIRElement/FHIRSensitivityStatus.php | 12 +- .../DSTU1/FHIRElement/FHIRSensitivityType.php | 12 +- .../DSTU1/FHIRElement/FHIRSlicingRules.php | 12 +- .../DSTU1/FHIRElement/FHIRString.php | 11 +- .../FHIRElement/FHIRSupplyDispenseStatus.php | 12 +- .../DSTU1/FHIRElement/FHIRSupplyStatus.php | 12 +- .../DSTU1/FHIRElement/FHIRUnitsOfTime.php | 12 +- .../DSTU1/FHIRElement/FHIRUri.php | 11 +- .../DSTU1/FHIRElement/FHIRUuid.php | 11 +- .../DSTU1/FHIRElement/FHIRValueSetStatus.php | 12 +- .../DSTU1/FHIREncounterClassList.php | 3 +- .../DSTU1/FHIREncounterStateList.php | 3 +- .../DSTU1/FHIREventTimingList.php | 3 +- .../DSTU1/FHIRExposureTypeList.php | 3 +- .../DSTU1/FHIRExtensionContextList.php | 3 +- .../DSTU1/FHIRFilterOperatorList.php | 3 +- .../DSTU1/FHIRGroupTypeList.php | 3 +- .../FHIRHierarchicalRelationshipTypeList.php | 3 +- .../DSTU1/FHIRIdPrimitive.php | 3 +- .../DSTU1/FHIRIdPrimitive/FHIRXmlIdRef.php | 13 +- .../DSTU1/FHIRIdentifierUseList.php | 3 +- .../DSTU1/FHIRImagingModalityList.php | 3 +- .../DSTU1/FHIRInstanceAvailabilityList.php | 3 +- .../DSTU1/FHIRInstantPrimitive.php | 3 +- .../DSTU1/FHIRIntegerPrimitive.php | 3 +- .../DSTU1/FHIRIssueSeverityList.php | 3 +- .../DSTU1/FHIRLinkTypeList.php | 3 +- .../DSTU1/FHIRListModeList.php | 3 +- .../DSTU1/FHIRLocationModeList.php | 3 +- .../DSTU1/FHIRLocationStatusList.php | 3 +- .../DSTU1/FHIRMediaTypeList.php | 3 +- ...FHIRMedicationAdministrationStatusList.php | 3 +- .../FHIRMedicationDispenseStatusList.php | 3 +- .../DSTU1/FHIRMedicationKindList.php | 3 +- .../FHIRMedicationPrescriptionStatusList.php | 3 +- .../FHIRMessageSignificanceCategoryList.php | 3 +- .../DSTU1/FHIRModalityList.php | 3 +- .../DSTU1/FHIRNameUseList.php | 3 +- .../DSTU1/FHIRNarrativeStatusList.php | 3 +- .../FHIRObservationRelationshipTypeList.php | 3 +- .../DSTU1/FHIRObservationReliabilityList.php | 3 +- .../DSTU1/FHIRObservationStatusList.php | 3 +- .../DSTU1/FHIROidPrimitive.php | 3 +- .../DSTU1/FHIROrderOutcomeStatusList.php | 3 +- .../FHIRProcedureRelationshipTypeList.php | 3 +- .../DSTU1/FHIRPropertyRepresentationList.php | 3 +- .../DSTU1/FHIRProvenanceEntityRoleList.php | 3 +- .../DSTU1/FHIRQuantityCompararatorList.php | 3 +- .../DSTU1/FHIRQueryOutcomeList.php | 3 +- .../DSTU1/FHIRQuestionnaireStatusList.php | 3 +- .../DSTU1/FHIRReactionSeverityList.php | 3 +- .../DSTU1/FHIRResourceInline.php | 17 +- .../DSTU1/FHIRResourceProfileStatusList.php | 3 +- .../DSTU1/FHIRResourceType.php | 3 +- .../FHIRResourceNamesPlusBinary.php | 13 +- .../DSTU1/FHIRResponseTypeList.php | 3 +- .../DSTU1/FHIRRestfulConformanceModeList.php | 3 +- .../DSTU1/FHIRRestfulOperationSystemList.php | 3 +- .../DSTU1/FHIRRestfulOperationTypeList.php | 3 +- .../FHIRSampledDataDataTypePrimitive.php | 3 +- .../DSTU1/FHIRSearchParamTypeList.php | 3 +- .../DSTU1/FHIRSecurityEventActionList.php | 3 +- .../FHIRSecurityEventObjectLifecycleList.php | 3 +- .../DSTU1/FHIRSecurityEventObjectRoleList.php | 3 +- .../DSTU1/FHIRSecurityEventObjectTypeList.php | 3 +- .../DSTU1/FHIRSecurityEventOutcomeList.php | 3 +- ...ecurityEventParticipantNetworkTypeList.php | 3 +- .../DSTU1/FHIRSensitivityStatusList.php | 3 +- .../DSTU1/FHIRSensitivityTypeList.php | 3 +- .../DSTU1/FHIRSlicingRulesList.php | 3 +- .../DSTU1/FHIRStringPrimitive.php | 3 +- .../DSTU1/FHIRSupplyDispenseStatusList.php | 3 +- .../DSTU1/FHIRSupplyStatusList.php | 3 +- .../DSTU1/FHIRUnitsOfTimeList.php | 3 +- .../DSTU1/FHIRUriPrimitive.php | 3 +- .../DSTU1/FHIRUuidPrimitive.php | 3 +- .../DSTU1/FHIRValueSetStatusList.php | 3 +- .../DSTU1/PHPFHIRAutoloader.php | 2 +- .../PHPFHIRCommentContainerInterface.php | 2 +- .../DSTU1/PHPFHIRCommentContainerTrait.php | 4 +- .../DSTU1/PHPFHIRConstants.php | 4 +- .../DSTU1/PHPFHIRContainedTypeInterface.php | 2 +- .../DSTU1/PHPFHIRResponseParser.php | 2 +- .../DSTU1/PHPFHIRResponseParserConfig.php | 2 +- .../PHPFHIRTests/FHIRAddressUseListTest.php | 2 +- .../FHIRAggregationModeListTest.php | 2 +- .../PHPFHIRTests/FHIRAlertStatusListTest.php | 2 +- .../FHIRBase64BinaryPrimitiveTest.php | 2 +- .../DSTU1/PHPFHIRTests/FHIRBinaryTest.php | 2 +- .../FHIRBindingConformanceListTest.php | 2 +- .../PHPFHIRTests/FHIRBooleanPrimitiveTest.php | 2 +- .../FHIRCarePlanActivityCategoryListTest.php | 2 +- .../FHIRCarePlanActivityStatusListTest.php | 2 +- .../FHIRCarePlanGoalStatusListTest.php | 2 +- .../FHIRCarePlanStatusListTest.php | 2 +- .../FHIRCausalityExpectationListTest.php | 2 +- .../PHPFHIRTests/FHIRCodePrimitiveTest.php | 2 +- ...FHIRCompositionAttestationModeListTest.php | 2 +- .../FHIRCompositionStatusListTest.php | 2 +- .../FHIRConceptMapEquivalenceListTest.php | 2 +- .../FHIRConditionRelationshipTypeListTest.php | 2 +- .../FHIRConditionStatusListTest.php | 2 +- .../FHIRConformanceEventModeListTest.php | 2 +- ...FHIRConformanceStatementStatusListTest.php | 2 +- .../FHIRConstraintSeverityListTest.php | 2 +- .../FHIRContactSystemListTest.php | 2 +- .../PHPFHIRTests/FHIRContactUseListTest.php | 2 +- .../PHPFHIRTests/FHIRCriticalityListTest.php | 2 +- .../PHPFHIRTests/FHIRDatePrimitiveTest.php | 2 +- .../FHIRDateTimePrimitiveTest.php | 2 +- .../PHPFHIRTests/FHIRDecimalPrimitiveTest.php | 2 +- .../FHIRDiagnosticOrderPriorityListTest.php | 2 +- .../FHIRDiagnosticOrderStatusListTest.php | 2 +- .../FHIRDiagnosticReportStatusListTest.php | 2 +- .../PHPFHIRTests/FHIRDocumentModeListTest.php | 2 +- .../FHIRDocumentReferenceStatusListTest.php | 2 +- .../FHIRDocumentRelationshipTypeListTest.php | 2 +- .../FHIRElement/FHIRAddressTest.php | 2 +- .../FHIRElement/FHIRAddressUseTest.php | 2 +- .../FHIRElement/FHIRAggregationModeTest.php | 2 +- .../FHIRElement/FHIRAlertStatusTest.php | 2 +- .../FHIRElement/FHIRAttachmentTest.php | 2 +- .../FHIRAdverseReactionExposureTest.php | 2 +- .../FHIRAdverseReactionSymptomTest.php | 2 +- .../FHIRCarePlan/FHIRCarePlanActivityTest.php | 2 +- .../FHIRCarePlan/FHIRCarePlanGoalTest.php | 2 +- .../FHIRCarePlanParticipantTest.php | 2 +- .../FHIRCarePlan/FHIRCarePlanSimpleTest.php | 2 +- .../FHIRCompositionAttesterTest.php | 2 +- .../FHIRCompositionEventTest.php | 2 +- .../FHIRCompositionSectionTest.php | 2 +- .../FHIRConceptMapConceptTest.php | 2 +- .../FHIRConceptMapDependsOnTest.php | 2 +- .../FHIRConceptMap/FHIRConceptMapMapTest.php | 2 +- .../FHIRConditionEvidenceTest.php | 2 +- .../FHIRConditionLocationTest.php | 2 +- .../FHIRConditionRelatedItemTest.php | 2 +- .../FHIRCondition/FHIRConditionStageTest.php | 2 +- .../FHIRConformanceCertificateTest.php | 2 +- .../FHIRConformanceDocumentTest.php | 2 +- .../FHIRConformanceEventTest.php | 2 +- .../FHIRConformanceImplementationTest.php | 2 +- .../FHIRConformanceMessagingTest.php | 2 +- .../FHIRConformanceOperation1Test.php | 2 +- .../FHIRConformanceOperationTest.php | 2 +- .../FHIRConformanceQueryTest.php | 2 +- .../FHIRConformanceResourceTest.php | 2 +- .../FHIRConformanceRestTest.php | 2 +- .../FHIRConformanceSearchParamTest.php | 2 +- .../FHIRConformanceSecurityTest.php | 2 +- .../FHIRConformanceSoftwareTest.php | 2 +- ...FHIRDeviceObservationReportChannelTest.php | 2 +- .../FHIRDeviceObservationReportMetricTest.php | 2 +- ...viceObservationReportVirtualDeviceTest.php | 2 +- .../FHIRDiagnosticOrderEventTest.php | 2 +- .../FHIRDiagnosticOrderItemTest.php | 2 +- .../FHIRDiagnosticReportImageTest.php | 2 +- .../FHIRDocumentReferenceContextTest.php | 2 +- .../FHIRDocumentReferenceParameterTest.php | 2 +- .../FHIRDocumentReferenceRelatesToTest.php | 2 +- .../FHIRDocumentReferenceServiceTest.php | 2 +- .../FHIREncounterAccomodationTest.php | 2 +- .../FHIREncounterHospitalizationTest.php | 2 +- .../FHIREncounterLocationTest.php | 2 +- .../FHIREncounterParticipantTest.php | 2 +- .../FHIRFamilyHistoryConditionTest.php | 2 +- .../FHIRFamilyHistoryRelationTest.php | 2 +- .../FHIRGroup/FHIRGroupCharacteristicTest.php | 2 +- .../FHIRImagingStudyInstanceTest.php | 2 +- .../FHIRImagingStudySeriesTest.php | 2 +- .../FHIRImmunizationExplanationTest.php | 2 +- .../FHIRImmunizationReactionTest.php | 2 +- ...HIRImmunizationVaccinationProtocolTest.php | 2 +- ...izationRecommendationDateCriterionTest.php | 2 +- ...ImmunizationRecommendationProtocolTest.php | 2 +- ...zationRecommendationRecommendationTest.php | 2 +- .../FHIRList/FHIRListEntryTest.php | 2 +- .../FHIRLocation/FHIRLocationPositionTest.php | 2 +- .../FHIRMedicationContentTest.php | 2 +- .../FHIRMedicationIngredientTest.php | 2 +- .../FHIRMedicationPackageTest.php | 2 +- .../FHIRMedicationProductTest.php | 2 +- ...FHIRMedicationAdministrationDosageTest.php | 2 +- .../FHIRMedicationDispenseDispenseTest.php | 2 +- .../FHIRMedicationDispenseDosageTest.php | 2 +- ...FHIRMedicationDispenseSubstitutionTest.php | 2 +- ...FHIRMedicationPrescriptionDispenseTest.php | 2 +- ...ationPrescriptionDosageInstructionTest.php | 2 +- ...MedicationPrescriptionSubstitutionTest.php | 2 +- .../FHIRMedicationStatementDosageTest.php | 2 +- .../FHIRMessageHeaderDestinationTest.php | 2 +- .../FHIRMessageHeaderResponseTest.php | 2 +- .../FHIRMessageHeaderSourceTest.php | 2 +- .../FHIRObservationReferenceRangeTest.php | 2 +- .../FHIRObservationRelatedTest.php | 2 +- .../FHIROperationOutcomeIssueTest.php | 2 +- .../FHIROrder/FHIROrderWhenTest.php | 2 +- .../FHIROrganizationContactTest.php | 2 +- .../FHIRPatient/FHIRPatientAnimalTest.php | 2 +- .../FHIRPatient/FHIRPatientContactTest.php | 2 +- .../FHIRPatient/FHIRPatientLinkTest.php | 2 +- .../FHIRPractitionerQualificationTest.php | 2 +- .../FHIRProcedurePerformerTest.php | 2 +- .../FHIRProcedureRelatedItemTest.php | 2 +- .../FHIRProfile/FHIRProfileBindingTest.php | 2 +- .../FHIRProfile/FHIRProfileConstraintTest.php | 2 +- .../FHIRProfile/FHIRProfileDefinitionTest.php | 2 +- .../FHIRProfile/FHIRProfileElementTest.php | 2 +- .../FHIRProfileExtensionDefnTest.php | 2 +- .../FHIRProfile/FHIRProfileMapping1Test.php | 2 +- .../FHIRProfile/FHIRProfileMappingTest.php | 2 +- .../FHIRProfile/FHIRProfileQueryTest.php | 2 +- .../FHIRProfileSearchParamTest.php | 2 +- .../FHIRProfile/FHIRProfileSlicingTest.php | 2 +- .../FHIRProfile/FHIRProfileStructureTest.php | 2 +- .../FHIRProfile/FHIRProfileTypeTest.php | 2 +- .../FHIRProvenanceAgentTest.php | 2 +- .../FHIRProvenanceEntityTest.php | 2 +- .../FHIRQuery/FHIRQueryResponseTest.php | 2 +- .../FHIRQuestionnaireGroupTest.php | 2 +- .../FHIRQuestionnaireQuestionTest.php | 2 +- .../FHIRResource/FHIRAdverseReactionTest.php | 2 +- .../FHIRResource/FHIRAlertTest.php | 2 +- .../FHIRAllergyIntoleranceTest.php | 2 +- .../FHIRResource/FHIRCarePlanTest.php | 2 +- .../FHIRResource/FHIRCompositionTest.php | 2 +- .../FHIRResource/FHIRConceptMapTest.php | 2 +- .../FHIRResource/FHIRConditionTest.php | 2 +- .../FHIRResource/FHIRConformanceTest.php | 2 +- .../FHIRDeviceObservationReportTest.php | 2 +- .../FHIRResource/FHIRDeviceTest.php | 2 +- .../FHIRResource/FHIRDiagnosticOrderTest.php | 2 +- .../FHIRResource/FHIRDiagnosticReportTest.php | 2 +- .../FHIRResource/FHIRDocumentManifestTest.php | 2 +- .../FHIRDocumentReferenceTest.php | 2 +- .../FHIRResource/FHIREncounterTest.php | 2 +- .../FHIRResource/FHIRFamilyHistoryTest.php | 2 +- .../FHIRResource/FHIRGroupTest.php | 2 +- .../FHIRResource/FHIRImagingStudyTest.php | 2 +- .../FHIRImmunizationRecommendationTest.php | 2 +- .../FHIRResource/FHIRImmunizationTest.php | 2 +- .../FHIRResource/FHIRListTest.php | 2 +- .../FHIRResource/FHIRLocationTest.php | 2 +- .../FHIRResource/FHIRMediaTest.php | 2 +- .../FHIRMedicationAdministrationTest.php | 2 +- .../FHIRMedicationDispenseTest.php | 2 +- .../FHIRMedicationPrescriptionTest.php | 2 +- .../FHIRMedicationStatementTest.php | 2 +- .../FHIRResource/FHIRMedicationTest.php | 2 +- .../FHIRResource/FHIRMessageHeaderTest.php | 2 +- .../FHIRResource/FHIRObservationTest.php | 2 +- .../FHIRResource/FHIROperationOutcomeTest.php | 2 +- .../FHIRResource/FHIROrderResponseTest.php | 2 +- .../FHIRResource/FHIROrderTest.php | 2 +- .../FHIRResource/FHIROrganizationTest.php | 2 +- .../FHIRResource/FHIROtherTest.php | 2 +- .../FHIRResource/FHIRPatientTest.php | 2 +- .../FHIRResource/FHIRPractitionerTest.php | 2 +- .../FHIRResource/FHIRProcedureTest.php | 2 +- .../FHIRResource/FHIRProfileTest.php | 2 +- .../FHIRResource/FHIRProvenanceTest.php | 2 +- .../FHIRResource/FHIRQueryTest.php | 2 +- .../FHIRResource/FHIRQuestionnaireTest.php | 2 +- .../FHIRResource/FHIRRelatedPersonTest.php | 2 +- .../FHIRResource/FHIRSecurityEventTest.php | 2 +- .../FHIRResource/FHIRSpecimenTest.php | 2 +- .../FHIRResource/FHIRSubstanceTest.php | 2 +- .../FHIRResource/FHIRSupplyTest.php | 2 +- .../FHIRResource/FHIRValueSetTest.php | 2 +- .../FHIRBackboneElement/FHIRResourceTest.php | 2 +- .../FHIRSecurityEventDetailTest.php | 2 +- .../FHIRSecurityEventEventTest.php | 2 +- .../FHIRSecurityEventNetworkTest.php | 2 +- .../FHIRSecurityEventObjectTest.php | 2 +- .../FHIRSecurityEventParticipantTest.php | 2 +- .../FHIRSecurityEventSourceTest.php | 2 +- .../FHIRSpecimenCollectionTest.php | 2 +- .../FHIRSpecimenContainerTest.php | 2 +- .../FHIRSpecimen/FHIRSpecimenSourceTest.php | 2 +- .../FHIRSpecimenTreatmentTest.php | 2 +- .../FHIRSubstanceIngredientTest.php | 2 +- .../FHIRSubstanceInstanceTest.php | 2 +- .../FHIRSupply/FHIRSupplyDispenseTest.php | 2 +- .../FHIRValueSet/FHIRValueSetComposeTest.php | 2 +- .../FHIRValueSet/FHIRValueSetConceptTest.php | 2 +- .../FHIRValueSet/FHIRValueSetContainsTest.php | 2 +- .../FHIRValueSet/FHIRValueSetDefineTest.php | 2 +- .../FHIRValueSetExpansionTest.php | 2 +- .../FHIRValueSet/FHIRValueSetFilterTest.php | 2 +- .../FHIRValueSet/FHIRValueSetIncludeTest.php | 2 +- .../FHIRElement/FHIRBackboneElementTest.php | 2 +- .../FHIRElement/FHIRBase64BinaryTest.php | 2 +- .../FHIRBindingConformanceTest.php | 2 +- .../FHIRElement/FHIRBooleanTest.php | 2 +- .../FHIRCarePlanActivityCategoryTest.php | 2 +- .../FHIRCarePlanActivityStatusTest.php | 2 +- .../FHIRCarePlanGoalStatusTest.php | 2 +- .../FHIRElement/FHIRCarePlanStatusTest.php | 2 +- .../FHIRCausalityExpectationTest.php | 2 +- .../PHPFHIRTests/FHIRElement/FHIRCodeTest.php | 2 +- .../FHIRElement/FHIRCodeableConceptTest.php | 2 +- .../FHIRElement/FHIRCodingTest.php | 2 +- .../FHIRCompositionAttestationModeTest.php | 2 +- .../FHIRElement/FHIRCompositionStatusTest.php | 2 +- .../FHIRConceptMapEquivalenceTest.php | 2 +- .../FHIRConditionRelationshipTypeTest.php | 2 +- .../FHIRElement/FHIRConditionStatusTest.php | 2 +- .../FHIRConformanceEventModeTest.php | 2 +- .../FHIRConformanceStatementStatusTest.php | 2 +- .../FHIRConstraintSeverityTest.php | 2 +- .../FHIRElement/FHIRContactSystemTest.php | 2 +- .../FHIRElement/FHIRContactTest.php | 2 +- .../FHIRElement/FHIRContactUseTest.php | 2 +- .../FHIRElement/FHIRCriticalityTest.php | 2 +- .../PHPFHIRTests/FHIRElement/FHIRDateTest.php | 2 +- .../FHIRElement/FHIRDateTimeTest.php | 2 +- .../FHIRElement/FHIRDecimal/FHIRScoreTest.php | 2 +- .../FHIRElement/FHIRDecimalTest.php | 2 +- .../FHIRDiagnosticOrderPriorityTest.php | 2 +- .../FHIRDiagnosticOrderStatusTest.php | 2 +- .../FHIRDiagnosticReportStatusTest.php | 2 +- .../FHIRElement/FHIRDocumentModeTest.php | 2 +- .../FHIRDocumentReferenceStatusTest.php | 2 +- .../FHIRDocumentRelationshipTypeTest.php | 2 +- .../FHIRElement/FHIREncounterClassTest.php | 2 +- .../FHIRElement/FHIREncounterStateTest.php | 2 +- .../FHIRElement/FHIREventTimingTest.php | 2 +- .../FHIRElement/FHIRExposureTypeTest.php | 2 +- .../FHIRElement/FHIRExtensionContextTest.php | 2 +- .../FHIRElement/FHIRExtensionTest.php | 2 +- .../FHIRElement/FHIRFilterOperatorTest.php | 2 +- .../FHIRElement/FHIRGroupTypeTest.php | 2 +- .../FHIRHierarchicalRelationshipTypeTest.php | 2 +- .../FHIRElement/FHIRHumanNameTest.php | 2 +- .../PHPFHIRTests/FHIRElement/FHIRIdTest.php | 2 +- .../FHIRElement/FHIRIdentifierTest.php | 2 +- .../FHIRElement/FHIRIdentifierUseTest.php | 2 +- .../FHIRElement/FHIRImagingModalityTest.php | 2 +- .../FHIRInstanceAvailabilityTest.php | 2 +- .../FHIRElement/FHIRInstantTest.php | 2 +- .../FHIRInteger/FHIRTotalResultsTest.php | 2 +- .../FHIRElement/FHIRIntegerTest.php | 2 +- .../FHIRElement/FHIRIssueSeverityTest.php | 2 +- .../FHIRElement/FHIRLinkTypeTest.php | 2 +- .../FHIRElement/FHIRListModeTest.php | 2 +- .../FHIRElement/FHIRLocationModeTest.php | 2 +- .../FHIRElement/FHIRLocationStatusTest.php | 2 +- .../FHIRElement/FHIRMediaTypeTest.php | 2 +- ...FHIRMedicationAdministrationStatusTest.php | 2 +- .../FHIRMedicationDispenseStatusTest.php | 2 +- .../FHIRElement/FHIRMedicationKindTest.php | 2 +- .../FHIRMedicationPrescriptionStatusTest.php | 2 +- .../FHIRMessageSignificanceCategoryTest.php | 2 +- .../FHIRElement/FHIRModalityTest.php | 2 +- .../FHIRElement/FHIRNameUseTest.php | 2 +- .../FHIRElement/FHIRNarrativeStatusTest.php | 2 +- .../FHIRElement/FHIRNarrativeTest.php | 2 +- .../FHIRObservationRelationshipTypeTest.php | 2 +- .../FHIRObservationReliabilityTest.php | 2 +- .../FHIRElement/FHIRObservationStatusTest.php | 2 +- .../PHPFHIRTests/FHIRElement/FHIROidTest.php | 2 +- .../FHIROrderOutcomeStatusTest.php | 2 +- .../FHIRElement/FHIRPeriodTest.php | 2 +- .../FHIRProcedureRelationshipTypeTest.php | 2 +- .../FHIRPropertyRepresentationTest.php | 2 +- .../FHIRProvenanceEntityRoleTest.php | 2 +- .../FHIRElement/FHIRQuantity/FHIRAgeTest.php | 2 +- .../FHIRQuantity/FHIRCountTest.php | 2 +- .../FHIRQuantity/FHIRDistanceTest.php | 2 +- .../FHIRQuantity/FHIRDurationTest.php | 2 +- .../FHIRQuantity/FHIRMoneyTest.php | 2 +- .../FHIRQuantityCompararatorTest.php | 2 +- .../FHIRElement/FHIRQuantityTest.php | 2 +- .../FHIRElement/FHIRQueryOutcomeTest.php | 2 +- .../FHIRQuestionnaireStatusTest.php | 2 +- .../FHIRElement/FHIRRangeTest.php | 2 +- .../FHIRElement/FHIRRatioTest.php | 2 +- .../FHIRElement/FHIRReactionSeverityTest.php | 2 +- .../FHIRResourceProfileStatusTest.php | 2 +- .../FHIRElement/FHIRResourceReferenceTest.php | 2 +- .../FHIRElement/FHIRResponseTypeTest.php | 2 +- .../FHIRRestfulConformanceModeTest.php | 2 +- .../FHIRRestfulOperationSystemTest.php | 2 +- .../FHIRRestfulOperationTypeTest.php | 2 +- .../FHIRSampledDataDataTypeTest.php | 2 +- .../FHIRElement/FHIRSampledDataTest.php | 2 +- .../FHIRSchedule/FHIRScheduleRepeatTest.php | 2 +- .../FHIRElement/FHIRScheduleTest.php | 2 +- .../FHIRElement/FHIRSearchParamTypeTest.php | 2 +- .../FHIRSecurityEventActionTest.php | 2 +- .../FHIRSecurityEventObjectLifecycleTest.php | 2 +- .../FHIRSecurityEventObjectRoleTest.php | 2 +- .../FHIRSecurityEventObjectTypeTest.php | 2 +- .../FHIRSecurityEventOutcomeTest.php | 2 +- ...ecurityEventParticipantNetworkTypeTest.php | 2 +- .../FHIRElement/FHIRSensitivityStatusTest.php | 2 +- .../FHIRElement/FHIRSensitivityTypeTest.php | 2 +- .../FHIRElement/FHIRSlicingRulesTest.php | 2 +- .../FHIRElement/FHIRStringTest.php | 2 +- .../FHIRSupplyDispenseStatusTest.php | 2 +- .../FHIRElement/FHIRSupplyStatusTest.php | 2 +- .../FHIRElement/FHIRUnitsOfTimeTest.php | 2 +- .../PHPFHIRTests/FHIRElement/FHIRUriTest.php | 2 +- .../PHPFHIRTests/FHIRElement/FHIRUuidTest.php | 2 +- .../FHIRElement/FHIRValueSetStatusTest.php | 2 +- .../DSTU1/PHPFHIRTests/FHIRElementTest.php | 2 +- .../FHIREncounterClassListTest.php | 2 +- .../FHIREncounterStateListTest.php | 2 +- .../PHPFHIRTests/FHIREventTimingListTest.php | 2 +- .../PHPFHIRTests/FHIRExposureTypeListTest.php | 2 +- .../FHIRExtensionContextListTest.php | 2 +- .../FHIRFilterOperatorListTest.php | 2 +- .../PHPFHIRTests/FHIRGroupTypeListTest.php | 2 +- ...IRHierarchicalRelationshipTypeListTest.php | 2 +- .../FHIRIdPrimitive/FHIRXmlIdRefTest.php | 2 +- .../PHPFHIRTests/FHIRIdPrimitiveTest.php | 2 +- .../FHIRIdentifierUseListTest.php | 2 +- .../FHIRImagingModalityListTest.php | 2 +- .../FHIRInstanceAvailabilityListTest.php | 2 +- .../PHPFHIRTests/FHIRInstantPrimitiveTest.php | 2 +- .../PHPFHIRTests/FHIRIntegerPrimitiveTest.php | 2 +- .../FHIRIssueSeverityListTest.php | 2 +- .../PHPFHIRTests/FHIRLinkTypeListTest.php | 2 +- .../PHPFHIRTests/FHIRListModeListTest.php | 2 +- .../PHPFHIRTests/FHIRLocationModeListTest.php | 2 +- .../FHIRLocationStatusListTest.php | 2 +- .../PHPFHIRTests/FHIRMediaTypeListTest.php | 2 +- ...MedicationAdministrationStatusListTest.php | 2 +- .../FHIRMedicationDispenseStatusListTest.php | 2 +- .../FHIRMedicationKindListTest.php | 2 +- ...IRMedicationPrescriptionStatusListTest.php | 2 +- ...HIRMessageSignificanceCategoryListTest.php | 2 +- .../PHPFHIRTests/FHIRModalityListTest.php | 2 +- .../PHPFHIRTests/FHIRNameUseListTest.php | 2 +- .../FHIRNarrativeStatusListTest.php | 2 +- ...HIRObservationRelationshipTypeListTest.php | 2 +- .../FHIRObservationReliabilityListTest.php | 2 +- .../FHIRObservationStatusListTest.php | 2 +- .../PHPFHIRTests/FHIROidPrimitiveTest.php | 2 +- .../FHIROrderOutcomeStatusListTest.php | 2 +- .../FHIRProcedureRelationshipTypeListTest.php | 2 +- .../FHIRPropertyRepresentationListTest.php | 2 +- .../FHIRProvenanceEntityRoleListTest.php | 2 +- .../FHIRQuantityCompararatorListTest.php | 2 +- .../PHPFHIRTests/FHIRQueryOutcomeListTest.php | 2 +- .../FHIRQuestionnaireStatusListTest.php | 2 +- .../FHIRReactionSeverityListTest.php | 2 +- .../PHPFHIRTests/FHIRResourceInlineTest.php | 2 +- .../FHIRResourceProfileStatusListTest.php | 2 +- .../FHIRResourceNamesPlusBinaryTest.php | 2 +- .../PHPFHIRTests/FHIRResourceTypeTest.php | 2 +- .../PHPFHIRTests/FHIRResponseTypeListTest.php | 2 +- .../FHIRRestfulConformanceModeListTest.php | 2 +- .../FHIRRestfulOperationSystemListTest.php | 2 +- .../FHIRRestfulOperationTypeListTest.php | 2 +- .../FHIRSampledDataDataTypePrimitiveTest.php | 2 +- .../FHIRSearchParamTypeListTest.php | 2 +- .../FHIRSecurityEventActionListTest.php | 2 +- ...IRSecurityEventObjectLifecycleListTest.php | 2 +- .../FHIRSecurityEventObjectRoleListTest.php | 2 +- .../FHIRSecurityEventObjectTypeListTest.php | 2 +- .../FHIRSecurityEventOutcomeListTest.php | 2 +- ...ityEventParticipantNetworkTypeListTest.php | 2 +- .../FHIRSensitivityStatusListTest.php | 2 +- .../FHIRSensitivityTypeListTest.php | 2 +- .../PHPFHIRTests/FHIRSlicingRulesListTest.php | 2 +- .../PHPFHIRTests/FHIRStringPrimitiveTest.php | 2 +- .../FHIRSupplyDispenseStatusListTest.php | 2 +- .../PHPFHIRTests/FHIRSupplyStatusListTest.php | 2 +- .../PHPFHIRTests/FHIRUnitsOfTimeListTest.php | 2 +- .../PHPFHIRTests/FHIRUriPrimitiveTest.php | 2 +- .../PHPFHIRTests/FHIRUuidPrimitiveTest.php | 2 +- .../FHIRValueSetStatusListTest.php | 2 +- .../PHPFHIRTests/PHPFHIRConstantsTest.php | 2 +- .../DSTU1/PHPFHIRTests/PHPFHIRTypeMapTest.php | 2 +- .../DSTU1/PHPFHIRTypeInterface.php | 2 +- .../PHPFHIRGenerated/DSTU1/PHPFHIRTypeMap.php | 2 +- .../DSTU2/FHIRAccountStatusList.php | 3 +- .../DSTU2/FHIRActionListList.php | 3 +- .../DSTU2/FHIRAddressTypeList.php | 3 +- .../DSTU2/FHIRAddressUseList.php | 3 +- .../DSTU2/FHIRAdministrativeGenderList.php | 3 +- .../DSTU2/FHIRAggregationModeList.php | 3 +- .../FHIRAllergyIntoleranceCategoryList.php | 3 +- .../FHIRAllergyIntoleranceCertaintyList.php | 3 +- .../FHIRAllergyIntoleranceCriticalityList.php | 3 +- .../FHIRAllergyIntoleranceSeverityList.php | 3 +- .../FHIRAllergyIntoleranceStatusList.php | 3 +- .../DSTU2/FHIRAllergyIntoleranceTypeList.php | 3 +- .../DSTU2/FHIRAnswerFormatList.php | 3 +- .../DSTU2/FHIRAppointmentStatusList.php | 3 +- .../DSTU2/FHIRAssertionDirectionTypeList.php | 3 +- .../DSTU2/FHIRAssertionOperatorTypeList.php | 3 +- .../DSTU2/FHIRAssertionResponseTypesList.php | 3 +- .../DSTU2/FHIRAuditEventActionList.php | 3 +- .../DSTU2/FHIRAuditEventOutcomeList.php | 3 +- ...IRAuditEventParticipantNetworkTypeList.php | 3 +- .../DSTU2/FHIRBase64BinaryPrimitive.php | 3 +- .../DSTU2/FHIRBindingStrengthList.php | 3 +- .../DSTU2/FHIRBooleanPrimitive.php | 3 +- .../DSTU2/FHIRBundleTypeList.php | 3 +- .../DSTU2/FHIRCarePlanActivityStatusList.php | 3 +- .../DSTU2/FHIRCarePlanRelationshipList.php | 3 +- .../DSTU2/FHIRCarePlanStatusList.php | 3 +- .../DSTU2/FHIRClaimTypeList.php | 3 +- .../FHIRClinicalImpressionStatusList.php | 3 +- .../DSTU2/FHIRCodePrimitive.php | 3 +- .../FHIRCommunicationRequestStatusList.php | 3 +- .../DSTU2/FHIRCommunicationStatusList.php | 3 +- .../FHIRCompositionAttestationModeList.php | 3 +- .../DSTU2/FHIRCompositionStatusList.php | 3 +- .../DSTU2/FHIRConceptMapEquivalenceList.php | 3 +- .../FHIRConditionVerificationStatusList.php | 3 +- .../DSTU2/FHIRConditionalDeleteStatusList.php | 3 +- .../DSTU2/FHIRConformanceEventModeList.php | 3 +- .../FHIRConformanceResourceStatusList.php | 3 +- .../FHIRConformanceStatementKindList.php | 3 +- .../DSTU2/FHIRConstraintSeverityList.php | 3 +- .../DSTU2/FHIRContactPointSystemList.php | 3 +- .../DSTU2/FHIRContactPointUseList.php | 3 +- .../DSTU2/FHIRContentTypeList.php | 3 +- .../DSTU2/FHIRDataElementStringencyList.php | 3 +- .../DSTU2/FHIRDatePrimitive.php | 3 +- .../DSTU2/FHIRDateTimePrimitive.php | 3 +- .../DSTU2/FHIRDaysOfWeekList.php | 3 +- .../DSTU2/FHIRDecimalPrimitive.php | 3 +- .../DSTU2/FHIRDetectedIssueSeverityList.php | 3 +- .../FHIRDeviceMetricCalibrationStateList.php | 3 +- .../FHIRDeviceMetricCalibrationTypeList.php | 3 +- .../DSTU2/FHIRDeviceMetricCategoryList.php | 3 +- .../DSTU2/FHIRDeviceMetricColorList.php | 3 +- .../FHIRDeviceMetricOperationalStatusList.php | 3 +- .../DSTU2/FHIRDeviceStatusList.php | 3 +- .../FHIRDeviceUseRequestPriorityList.php | 3 +- .../DSTU2/FHIRDeviceUseRequestStatusList.php | 3 +- .../DSTU2/FHIRDiagnosticOrderPriorityList.php | 3 +- .../DSTU2/FHIRDiagnosticOrderStatusList.php | 3 +- .../DSTU2/FHIRDiagnosticReportStatusList.php | 3 +- .../DSTU2/FHIRDigitalMediaTypeList.php | 3 +- .../DSTU2/FHIRDocumentModeList.php | 3 +- .../DSTU2/FHIRDocumentReferenceStatusList.php | 3 +- .../FHIRDocumentRelationshipTypeList.php | 3 +- .../PHPFHIRGenerated/DSTU2/FHIRElement.php | 22 +- .../DSTU2/FHIRElement/FHIRAccountStatus.php | 12 +- .../DSTU2/FHIRElement/FHIRActionList.php | 12 +- .../DSTU2/FHIRElement/FHIRAddress.php | 187 +- .../DSTU2/FHIRElement/FHIRAddressType.php | 12 +- .../DSTU2/FHIRElement/FHIRAddressUse.php | 12 +- .../FHIRElement/FHIRAdministrativeGender.php | 12 +- .../DSTU2/FHIRElement/FHIRAggregationMode.php | 12 +- .../FHIRAllergyIntoleranceCategory.php | 12 +- .../FHIRAllergyIntoleranceCertainty.php | 12 +- .../FHIRAllergyIntoleranceCriticality.php | 12 +- .../FHIRAllergyIntoleranceSeverity.php | 12 +- .../FHIRAllergyIntoleranceStatus.php | 12 +- .../FHIRAllergyIntoleranceType.php | 12 +- .../DSTU2/FHIRElement/FHIRAnnotation.php | 67 +- .../DSTU2/FHIRElement/FHIRAnswerFormat.php | 12 +- .../FHIRElement/FHIRAppointmentStatus.php | 12 +- .../FHIRAssertionDirectionType.php | 12 +- .../FHIRElement/FHIRAssertionOperatorType.php | 12 +- .../FHIRAssertionResponseTypes.php | 12 +- .../DSTU2/FHIRElement/FHIRAttachment.php | 161 +- .../FHIRElement/FHIRAuditEventAction.php | 12 +- .../FHIRElement/FHIRAuditEventOutcome.php | 12 +- .../FHIRAuditEventParticipantNetworkType.php | 12 +- .../DSTU2/FHIRElement/FHIRBackboneElement.php | 14 +- .../FHIRAllergyIntoleranceReaction.php | 91 +- .../FHIRAppointmentParticipant.php | 53 +- .../FHIRAuditEvent/FHIRAuditEventDetail.php | 48 +- .../FHIRAuditEvent/FHIRAuditEventEvent.php | 92 +- .../FHIRAuditEvent/FHIRAuditEventNetwork.php | 47 +- .../FHIRAuditEvent/FHIRAuditEventObject.php | 123 +- .../FHIRAuditEventParticipant.php | 120 +- .../FHIRAuditEvent/FHIRAuditEventSource.php | 52 +- .../FHIRBundle/FHIRBundleEntry.php | 35 +- .../FHIRBundle/FHIRBundleLink.php | 47 +- .../FHIRBundle/FHIRBundleRequest.php | 123 +- .../FHIRBundle/FHIRBundleResponse.php | 85 +- .../FHIRBundle/FHIRBundleSearch.php | 47 +- .../FHIRCarePlan/FHIRCarePlanActivity.php | 17 +- .../FHIRCarePlan/FHIRCarePlanDetail.php | 147 +- .../FHIRCarePlan/FHIRCarePlanParticipant.php | 11 +- .../FHIRCarePlan/FHIRCarePlanRelatedPlan.php | 29 +- .../FHIRClaim/FHIRClaimCoverage.php | 95 +- .../FHIRClaim/FHIRClaimDetail.php | 135 +- .../FHIRClaim/FHIRClaimDiagnosis.php | 29 +- .../FHIRClaim/FHIRClaimItem.php | 192 +- .../FHIRClaim/FHIRClaimMissingTeeth.php | 30 +- .../FHIRClaim/FHIRClaimPayee.php | 13 +- .../FHIRClaim/FHIRClaimProsthesis.php | 48 +- .../FHIRClaim/FHIRClaimSubDetail.php | 132 +- .../FHIRClaimResponseAddItem.php | 117 +- .../FHIRClaimResponseAdjudication.php | 51 +- .../FHIRClaimResponseAdjudication1.php | 51 +- .../FHIRClaimResponseAdjudication2.php | 51 +- .../FHIRClaimResponseAdjudication3.php | 51 +- .../FHIRClaimResponseAdjudication4.php | 51 +- .../FHIRClaimResponseCoverage.php | 95 +- .../FHIRClaimResponseDetail.php | 66 +- .../FHIRClaimResponseDetail1.php | 62 +- .../FHIRClaimResponseError.php | 67 +- .../FHIRClaimResponseItem.php | 91 +- .../FHIRClaimResponseNote.php | 48 +- .../FHIRClaimResponseSubDetail.php | 61 +- .../FHIRClinicalImpressionFinding.php | 29 +- .../FHIRClinicalImpressionInvestigations.php | 15 +- .../FHIRClinicalImpressionRuledOut.php | 29 +- .../FHIRCommunicationPayload.php | 30 +- .../FHIRCommunicationRequestPayload.php | 30 +- .../FHIRCompositionAttester.php | 60 +- .../FHIRComposition/FHIRCompositionEvent.php | 16 +- .../FHIRCompositionSection.php | 59 +- .../FHIRConceptMap/FHIRConceptMapContact.php | 61 +- .../FHIRConceptMapDependsOn.php | 66 +- .../FHIRConceptMap/FHIRConceptMapElement.php | 52 +- .../FHIRConceptMap/FHIRConceptMapTarget.php | 95 +- .../FHIRCondition/FHIRConditionEvidence.php | 15 +- .../FHIRCondition/FHIRConditionStage.php | 13 +- .../FHIRConformanceCertificate.php | 47 +- .../FHIRConformanceContact.php | 61 +- .../FHIRConformanceDocument.php | 48 +- .../FHIRConformanceEndpoint.php | 29 +- .../FHIRConformance/FHIRConformanceEvent.php | 88 +- .../FHIRConformanceImplementation.php | 47 +- .../FHIRConformanceInteraction.php | 47 +- .../FHIRConformanceInteraction1.php | 47 +- .../FHIRConformanceMessaging.php | 55 +- .../FHIRConformanceOperation.php | 29 +- .../FHIRConformanceResource.php | 203 +- .../FHIRConformance/FHIRConformanceRest.php | 106 +- .../FHIRConformanceSearchParam.php | 172 +- .../FHIRConformanceSecurity.php | 57 +- .../FHIRConformanceSoftware.php | 66 +- .../FHIRContract/FHIRContractActor.php | 15 +- .../FHIRContract/FHIRContractActor1.php | 15 +- .../FHIRContract/FHIRContractFriendly.php | 11 +- .../FHIRContract/FHIRContractLegal.php | 11 +- .../FHIRContract/FHIRContractRule.php | 11 +- .../FHIRContract/FHIRContractSigner.php | 30 +- .../FHIRContract/FHIRContractTerm.php | 87 +- .../FHIRContract/FHIRContractValuedItem.php | 150 +- .../FHIRContract/FHIRContractValuedItem1.php | 150 +- .../FHIRDataElementContact.php | 61 +- .../FHIRDataElementMapping.php | 85 +- .../FHIRDetectedIssueMitigation.php | 30 +- ...DeviceComponentProductionSpecification.php | 48 +- .../FHIRDeviceMetricCalibration.php | 66 +- .../FHIRDiagnosticOrderEvent.php | 49 +- .../FHIRDiagnosticOrderItem.php | 36 +- .../FHIRDiagnosticReportImage.php | 29 +- .../FHIRDocumentManifestContent.php | 11 +- .../FHIRDocumentManifestRelated.php | 29 +- .../FHIRDocumentReferenceContent.php | 15 +- .../FHIRDocumentReferenceContext.php | 20 +- .../FHIRDocumentReferenceRelated.php | 29 +- .../FHIRDocumentReferenceRelatesTo.php | 29 +- .../FHIREncounterHospitalization.php | 50 +- .../FHIREncounter/FHIREncounterLocation.php | 30 +- .../FHIREncounterParticipant.php | 16 +- .../FHIREncounterStatusHistory.php | 29 +- .../FHIREpisodeOfCareCareTeam.php | 16 +- .../FHIREpisodeOfCareStatusHistory.php | 29 +- .../FHIRFamilyMemberHistoryCondition.php | 54 +- .../FHIRGoal/FHIRGoalOutcome.php | 11 +- .../FHIRGroup/FHIRGroupCharacteristic.php | 70 +- .../FHIRGroup/FHIRGroupMember.php | 30 +- .../FHIRHealthcareServiceAvailableTime.php | 99 +- .../FHIRHealthcareServiceNotAvailable.php | 29 +- .../FHIRHealthcareServiceServiceType.php | 13 +- .../FHIRImagingObjectSelectionFrames.php | 55 +- .../FHIRImagingObjectSelectionInstance.php | 71 +- .../FHIRImagingObjectSelectionSeries.php | 52 +- .../FHIRImagingObjectSelectionStudy.php | 53 +- .../FHIRImagingStudyInstance.php | 109 +- .../FHIRImagingStudySeries.php | 148 +- .../FHIRImmunizationExplanation.php | 17 +- .../FHIRImmunizationReaction.php | 48 +- .../FHIRImmunizationVaccinationProtocol.php | 93 +- ...mmunizationRecommendationDateCriterion.php | 30 +- ...FHIRImmunizationRecommendationProtocol.php | 67 +- ...munizationRecommendationRecommendation.php | 89 +- .../FHIRImplementationGuideContact.php | 61 +- .../FHIRImplementationGuideDependency.php | 47 +- .../FHIRImplementationGuideGlobal.php | 29 +- .../FHIRImplementationGuidePackage.php | 52 +- .../FHIRImplementationGuidePage.php | 142 +- .../FHIRImplementationGuideResource.php | 106 +- .../FHIRList/FHIRListEntry.php | 49 +- .../FHIRLocation/FHIRLocationPosition.php | 66 +- .../FHIRMedication/FHIRMedicationBatch.php | 47 +- .../FHIRMedication/FHIRMedicationContent.php | 31 +- .../FHIRMedicationIngredient.php | 11 +- .../FHIRMedication/FHIRMedicationPackage.php | 15 +- .../FHIRMedication/FHIRMedicationProduct.php | 18 +- .../FHIRMedicationAdministrationDosage.php | 55 +- ...HIRMedicationDispenseDosageInstruction.php | 79 +- .../FHIRMedicationDispenseSubstitution.php | 16 +- .../FHIRMedicationOrderDispenseRequest.php | 73 +- .../FHIRMedicationOrderDosageInstruction.php | 79 +- .../FHIRMedicationOrderSubstitution.php | 11 +- .../FHIRMedicationStatementDosage.php | 78 +- .../FHIRMessageHeaderDestination.php | 48 +- .../FHIRMessageHeaderResponse.php | 48 +- .../FHIRMessageHeaderSource.php | 104 +- .../FHIRNamingSystemContact.php | 61 +- .../FHIRNamingSystemUniqueId.php | 68 +- .../FHIRNutritionOrderAdministration.php | 53 +- .../FHIRNutritionOrderEnteralFormula.php | 116 +- .../FHIRNutritionOrderNutrient.php | 31 +- .../FHIRNutritionOrderOralDiet.php | 47 +- .../FHIRNutritionOrderSupplement.php | 72 +- .../FHIRNutritionOrderTexture.php | 11 +- .../FHIRObservationComponent.php | 96 +- .../FHIRObservationReferenceRange.php | 72 +- .../FHIRObservationRelated.php | 29 +- .../FHIROperationDefinitionBinding.php | 48 +- .../FHIROperationDefinitionContact.php | 61 +- .../FHIROperationDefinitionParameter.php | 128 +- .../FHIROperationOutcomeIssue.php | 92 +- .../FHIROrder/FHIROrderWhen.php | 11 +- .../FHIROrganizationContact.php | 45 +- .../FHIRParametersParameter.php | 427 ++- .../FHIRPatient/FHIRPatientAnimal.php | 12 +- .../FHIRPatient/FHIRPatientCommunication.php | 29 +- .../FHIRPatient/FHIRPatientContact.php | 68 +- .../FHIRPatient/FHIRPatientLink.php | 29 +- .../FHIRPaymentReconciliationDetail.php | 54 +- .../FHIRPaymentReconciliationNote.php | 29 +- .../FHIRPerson/FHIRPersonLink.php | 29 +- .../FHIRPractitionerPractitionerRole.php | 23 +- .../FHIRPractitionerQualification.php | 43 +- .../FHIRProcedureFocalDevice.php | 11 +- .../FHIRProcedure/FHIRProcedurePerformer.php | 11 +- .../FHIRProcessRequestItem.php | 28 +- .../FHIRProcessResponseNotes.php | 29 +- .../FHIRProvenance/FHIRProvenanceAgent.php | 33 +- .../FHIRProvenance/FHIRProvenanceEntity.php | 68 +- .../FHIRProvenanceRelatedAgent.php | 29 +- .../FHIRQuestionnaireGroup.php | 117 +- .../FHIRQuestionnaireQuestion.php | 116 +- .../FHIRQuestionnaireResponseAnswer.php | 205 +- .../FHIRQuestionnaireResponseGroup.php | 75 +- .../FHIRQuestionnaireResponseQuestion.php | 52 +- .../FHIRRiskAssessmentPrediction.php | 71 +- .../FHIRSearchParameterContact.php | 61 +- .../FHIRSpecimen/FHIRSpecimenCollection.php | 78 +- .../FHIRSpecimen/FHIRSpecimenContainer.php | 104 +- .../FHIRSpecimen/FHIRSpecimenTreatment.php | 34 +- .../FHIRStructureDefinitionContact.php | 61 +- .../FHIRStructureDefinitionDifferential.php | 14 +- .../FHIRStructureDefinitionMapping.php | 85 +- .../FHIRStructureDefinitionSnapshot.php | 14 +- .../FHIRSubscriptionChannel.php | 85 +- .../FHIRSubstance/FHIRSubstanceIngredient.php | 11 +- .../FHIRSubstance/FHIRSubstanceInstance.php | 68 +- .../FHIRSupplyRequestWhen.php | 11 +- .../FHIRTestScript/FHIRTestScriptAction.php | 29 +- .../FHIRTestScript/FHIRTestScriptAction1.php | 29 +- .../FHIRTestScript/FHIRTestScriptAction2.php | 10 +- .../FHIRTestScript/FHIRTestScriptAssert.php | 352 ++- .../FHIRTestScriptCapability.php | 113 +- .../FHIRTestScript/FHIRTestScriptContact.php | 61 +- .../FHIRTestScript/FHIRTestScriptFixture.php | 48 +- .../FHIRTestScript/FHIRTestScriptLink.php | 47 +- .../FHIRTestScript/FHIRTestScriptMetadata.php | 17 +- .../FHIRTestScriptOperation.php | 271 +- .../FHIRTestScriptRequestHeader.php | 48 +- .../FHIRTestScript/FHIRTestScriptSetup.php | 13 +- .../FHIRTestScript/FHIRTestScriptTeardown.php | 14 +- .../FHIRTestScript/FHIRTestScriptTest.php | 53 +- .../FHIRTestScript/FHIRTestScriptVariable.php | 85 +- .../FHIRValueSet/FHIRValueSetCodeSystem.php | 71 +- .../FHIRValueSet/FHIRValueSetCompose.php | 44 +- .../FHIRValueSet/FHIRValueSetConcept.php | 123 +- .../FHIRValueSet/FHIRValueSetConcept1.php | 80 +- .../FHIRValueSet/FHIRValueSetContact.php | 61 +- .../FHIRValueSet/FHIRValueSetContains.php | 109 +- .../FHIRValueSet/FHIRValueSetDesignation.php | 49 +- .../FHIRValueSet/FHIRValueSetExpansion.php | 95 +- .../FHIRValueSet/FHIRValueSetFilter.php | 67 +- .../FHIRValueSet/FHIRValueSetInclude.php | 83 +- .../FHIRValueSet/FHIRValueSetParameter.php | 142 +- .../FHIRVisionPrescriptionDispense.php | 278 +- .../DSTU2/FHIRElement/FHIRBase64Binary.php | 11 +- .../DSTU2/FHIRElement/FHIRBindingStrength.php | 12 +- .../DSTU2/FHIRElement/FHIRBoolean.php | 11 +- .../DSTU2/FHIRElement/FHIRBundleType.php | 12 +- .../FHIRCarePlanActivityStatus.php | 12 +- .../FHIRElement/FHIRCarePlanRelationship.php | 12 +- .../DSTU2/FHIRElement/FHIRCarePlanStatus.php | 12 +- .../DSTU2/FHIRElement/FHIRClaimType.php | 12 +- .../FHIRClinicalImpressionStatus.php | 12 +- .../DSTU2/FHIRElement/FHIRCode.php | 11 +- .../DSTU2/FHIRElement/FHIRCodeableConcept.php | 33 +- .../DSTU2/FHIRElement/FHIRCoding.php | 104 +- .../FHIRCommunicationRequestStatus.php | 12 +- .../FHIRElement/FHIRCommunicationStatus.php | 12 +- .../FHIRCompositionAttestationMode.php | 12 +- .../FHIRElement/FHIRCompositionStatus.php | 12 +- .../FHIRElement/FHIRConceptMapEquivalence.php | 12 +- .../FHIRConditionVerificationStatus.php | 12 +- .../FHIRConditionalDeleteStatus.php | 12 +- .../FHIRElement/FHIRConformanceEventMode.php | 12 +- .../FHIRConformanceResourceStatus.php | 12 +- .../FHIRConformanceStatementKind.php | 12 +- .../FHIRElement/FHIRConstraintSeverity.php | 12 +- .../DSTU2/FHIRElement/FHIRContactPoint.php | 87 +- .../FHIRElement/FHIRContactPointSystem.php | 12 +- .../DSTU2/FHIRElement/FHIRContactPointUse.php | 12 +- .../DSTU2/FHIRElement/FHIRContentType.php | 12 +- .../FHIRElement/FHIRDataElementStringency.php | 12 +- .../DSTU2/FHIRElement/FHIRDate.php | 11 +- .../DSTU2/FHIRElement/FHIRDateTime.php | 11 +- .../DSTU2/FHIRElement/FHIRDaysOfWeek.php | 12 +- .../DSTU2/FHIRElement/FHIRDecimal.php | 11 +- .../FHIRElement/FHIRDetectedIssueSeverity.php | 12 +- .../FHIRDeviceMetricCalibrationState.php | 12 +- .../FHIRDeviceMetricCalibrationType.php | 12 +- .../FHIRElement/FHIRDeviceMetricCategory.php | 12 +- .../FHIRElement/FHIRDeviceMetricColor.php | 12 +- .../FHIRDeviceMetricOperationalStatus.php | 12 +- .../DSTU2/FHIRElement/FHIRDeviceStatus.php | 12 +- .../FHIRDeviceUseRequestPriority.php | 12 +- .../FHIRDeviceUseRequestStatus.php | 12 +- .../FHIRDiagnosticOrderPriority.php | 12 +- .../FHIRElement/FHIRDiagnosticOrderStatus.php | 12 +- .../FHIRDiagnosticReportStatus.php | 12 +- .../FHIRElement/FHIRDigitalMediaType.php | 12 +- .../DSTU2/FHIRElement/FHIRDocumentMode.php | 12 +- .../FHIRDocumentReferenceStatus.php | 12 +- .../FHIRDocumentRelationshipType.php | 12 +- .../FHIRElement/FHIRElementDefinition.php | 2762 +++++++++++++---- .../FHIRElementDefinitionBase.php | 66 +- .../FHIRElementDefinitionBinding.php | 67 +- .../FHIRElementDefinitionConstraint.php | 104 +- .../FHIRElementDefinitionMapping.php | 66 +- .../FHIRElementDefinitionSlicing.php | 93 +- .../FHIRElementDefinitionType.php | 88 +- .../DSTU2/FHIRElement/FHIREncounterClass.php | 12 +- .../FHIREncounterLocationStatus.php | 12 +- .../DSTU2/FHIRElement/FHIREncounterState.php | 12 +- .../FHIRElement/FHIREpisodeOfCareStatus.php | 12 +- .../DSTU2/FHIRElement/FHIREventTiming.php | 12 +- .../DSTU2/FHIRElement/FHIRExtension.php | 406 ++- .../FHIRElement/FHIRExtensionContext.php | 12 +- .../FHIRElement/FHIRFamilyHistoryStatus.php | 12 +- .../DSTU2/FHIRElement/FHIRFilterOperator.php | 12 +- .../DSTU2/FHIRElement/FHIRFlagStatus.php | 12 +- .../DSTU2/FHIRElement/FHIRGoalStatus.php | 12 +- .../DSTU2/FHIRElement/FHIRGroupType.php | 12 +- .../FHIRElement/FHIRGuideDependencyType.php | 12 +- .../DSTU2/FHIRElement/FHIRGuidePageKind.php | 12 +- .../FHIRElement/FHIRGuideResourcePurpose.php | 12 +- .../DSTU2/FHIRElement/FHIRHTTPVerb.php | 12 +- .../DSTU2/FHIRElement/FHIRHumanName.php | 154 +- .../DSTU2/FHIRElement/FHIRId.php | 11 +- .../DSTU2/FHIRElement/FHIRIdentifier.php | 70 +- .../DSTU2/FHIRElement/FHIRIdentifierUse.php | 12 +- .../FHIRIdentityAssuranceLevel.php | 12 +- .../FHIRElement/FHIRInstanceAvailability.php | 12 +- .../DSTU2/FHIRElement/FHIRInstant.php | 11 +- .../DSTU2/FHIRElement/FHIRInteger.php | 11 +- .../DSTU2/FHIRElement/FHIRIssueSeverity.php | 12 +- .../DSTU2/FHIRElement/FHIRIssueType.php | 12 +- .../DSTU2/FHIRElement/FHIRLinkType.php | 12 +- .../DSTU2/FHIRElement/FHIRListMode.php | 12 +- .../DSTU2/FHIRElement/FHIRListStatus.php | 12 +- .../DSTU2/FHIRElement/FHIRLocationMode.php | 12 +- .../DSTU2/FHIRElement/FHIRLocationStatus.php | 12 +- .../DSTU2/FHIRElement/FHIRMarkdown.php | 11 +- .../FHIRElement/FHIRMeasmnt_Principle.php | 12 +- .../FHIRMedicationAdministrationStatus.php | 12 +- .../FHIRMedicationDispenseStatus.php | 12 +- .../FHIRElement/FHIRMedicationOrderStatus.php | 12 +- .../FHIRMedicationStatementStatus.php | 12 +- .../FHIRMessageSignificanceCategory.php | 12 +- .../DSTU2/FHIRElement/FHIRMeta.php | 80 +- .../DSTU2/FHIRElement/FHIRNameUse.php | 12 +- .../FHIRNamingSystemIdentifierType.php | 12 +- .../FHIRElement/FHIRNamingSystemType.php | 12 +- .../DSTU2/FHIRElement/FHIRNarrative.php | 31 +- .../DSTU2/FHIRElement/FHIRNarrativeStatus.php | 12 +- .../DSTU2/FHIRElement/FHIRNoteType.php | 12 +- .../FHIRElement/FHIRNutritionOrderStatus.php | 12 +- .../FHIRObservationRelationshipType.php | 12 +- .../FHIRElement/FHIRObservationStatus.php | 12 +- .../DSTU2/FHIRElement/FHIROid.php | 11 +- .../DSTU2/FHIRElement/FHIROperationKind.php | 12 +- .../FHIRElement/FHIROperationParameterUse.php | 12 +- .../DSTU2/FHIRElement/FHIROrderStatus.php | 12 +- .../FHIRElement/FHIRParticipantRequired.php | 12 +- .../FHIRElement/FHIRParticipantStatus.php | 12 +- .../FHIRElement/FHIRParticipationStatus.php | 12 +- .../DSTU2/FHIRElement/FHIRPeriod.php | 47 +- .../DSTU2/FHIRElement/FHIRPositiveInt.php | 11 +- .../FHIRProcedureRequestPriority.php | 12 +- .../FHIRProcedureRequestStatus.php | 12 +- .../DSTU2/FHIRElement/FHIRProcedureStatus.php | 12 +- .../FHIRPropertyRepresentation.php | 12 +- .../FHIRElement/FHIRProvenanceEntityRole.php | 12 +- .../DSTU2/FHIRElement/FHIRQuantity.php | 105 +- .../FHIRElement/FHIRQuantity/FHIRAge.php | 3 +- .../FHIRElement/FHIRQuantity/FHIRCount.php | 3 +- .../FHIRElement/FHIRQuantity/FHIRDistance.php | 3 +- .../FHIRElement/FHIRQuantity/FHIRDuration.php | 3 +- .../FHIRElement/FHIRQuantity/FHIRMoney.php | 3 +- .../FHIRQuantity/FHIRSimpleQuantity.php | 3 +- .../FHIRElement/FHIRQuantityComparator.php | 12 +- .../FHIRQuestionnaireResponseStatus.php | 12 +- .../FHIRElement/FHIRQuestionnaireStatus.php | 12 +- .../DSTU2/FHIRElement/FHIRRange.php | 51 +- .../DSTU2/FHIRElement/FHIRRatio.php | 47 +- .../DSTU2/FHIRElement/FHIRReference.php | 47 +- .../DSTU2/FHIRElement/FHIRReferralStatus.php | 12 +- .../FHIRElement/FHIRRemittanceOutcome.php | 12 +- .../FHIRElement/FHIRResourceVersionPolicy.php | 12 +- .../DSTU2/FHIRElement/FHIRResponseType.php | 12 +- .../FHIRRestfulConformanceMode.php | 12 +- .../DSTU2/FHIRElement/FHIRSampledData.php | 144 +- .../FHIRElement/FHIRSampledDataDataType.php | 11 +- .../DSTU2/FHIRElement/FHIRSearchEntryMode.php | 12 +- .../FHIRElement/FHIRSearchModifierCode.php | 12 +- .../DSTU2/FHIRElement/FHIRSearchParamType.php | 12 +- .../DSTU2/FHIRElement/FHIRSignature.php | 91 +- .../DSTU2/FHIRElement/FHIRSlicingRules.php | 12 +- .../DSTU2/FHIRElement/FHIRSlotStatus.php | 12 +- .../DSTU2/FHIRElement/FHIRSpecimenStatus.php | 12 +- .../DSTU2/FHIRElement/FHIRString.php | 11 +- .../FHIRStructureDefinitionKind.php | 12 +- .../FHIRSubscriptionChannelType.php | 12 +- .../FHIRElement/FHIRSubscriptionStatus.php | 12 +- .../FHIRElement/FHIRSupplyDeliveryStatus.php | 12 +- .../FHIRElement/FHIRSupplyRequestStatus.php | 12 +- .../FHIRSystemRestfulInteraction.php | 12 +- .../DSTU2/FHIRElement/FHIRTime.php | 11 +- .../DSTU2/FHIRElement/FHIRTiming.php | 36 +- .../FHIRTiming/FHIRTimingRepeat.php | 222 +- .../DSTU2/FHIRElement/FHIRTransactionMode.php | 12 +- .../FHIRTypeRestfulInteraction.php | 12 +- .../DSTU2/FHIRElement/FHIRUnitsOfTime.php | 12 +- .../FHIRElement/FHIRUnknownContentCode.php | 12 +- .../DSTU2/FHIRElement/FHIRUnsignedInt.php | 11 +- .../DSTU2/FHIRElement/FHIRUri.php | 11 +- .../DSTU2/FHIRElement/FHIRUse.php | 12 +- .../DSTU2/FHIRElement/FHIRUuid.php | 11 +- .../DSTU2/FHIRElement/FHIRVisionBase.php | 12 +- .../DSTU2/FHIRElement/FHIRVisionEyes.php | 12 +- .../DSTU2/FHIRElement/FHIRXPathUsageType.php | 12 +- .../DSTU2/FHIREncounterClassList.php | 3 +- .../DSTU2/FHIREncounterLocationStatusList.php | 3 +- .../DSTU2/FHIREncounterStateList.php | 3 +- .../DSTU2/FHIREpisodeOfCareStatusList.php | 3 +- .../DSTU2/FHIREventTimingList.php | 3 +- .../DSTU2/FHIRExtensionContextList.php | 3 +- .../DSTU2/FHIRFamilyHistoryStatusList.php | 3 +- .../DSTU2/FHIRFilterOperatorList.php | 3 +- .../DSTU2/FHIRFlagStatusList.php | 3 +- .../DSTU2/FHIRGoalStatusList.php | 3 +- .../DSTU2/FHIRGroupTypeList.php | 3 +- .../DSTU2/FHIRGuideDependencyTypeList.php | 3 +- .../DSTU2/FHIRGuidePageKindList.php | 3 +- .../DSTU2/FHIRGuideResourcePurposeList.php | 3 +- .../DSTU2/FHIRHTTPVerbList.php | 3 +- .../DSTU2/FHIRIdPrimitive.php | 3 +- .../DSTU2/FHIRIdentifierUseList.php | 3 +- .../DSTU2/FHIRIdentityAssuranceLevelList.php | 3 +- .../DSTU2/FHIRInstanceAvailabilityList.php | 3 +- .../DSTU2/FHIRInstantPrimitive.php | 3 +- .../DSTU2/FHIRIntegerPrimitive.php | 3 +- .../DSTU2/FHIRIssueSeverityList.php | 3 +- .../DSTU2/FHIRIssueTypeList.php | 3 +- .../DSTU2/FHIRLinkTypeList.php | 3 +- .../DSTU2/FHIRListModeList.php | 3 +- .../DSTU2/FHIRListStatusList.php | 3 +- .../DSTU2/FHIRLocationModeList.php | 3 +- .../DSTU2/FHIRLocationStatusList.php | 3 +- .../DSTU2/FHIRMarkdownPrimitive.php | 3 +- .../DSTU2/FHIRMeasmnt_PrincipleList.php | 3 +- ...FHIRMedicationAdministrationStatusList.php | 3 +- .../FHIRMedicationDispenseStatusList.php | 3 +- .../DSTU2/FHIRMedicationOrderStatusList.php | 3 +- .../FHIRMedicationStatementStatusList.php | 3 +- .../FHIRMessageSignificanceCategoryList.php | 3 +- .../DSTU2/FHIRNameUseList.php | 3 +- .../FHIRNamingSystemIdentifierTypeList.php | 3 +- .../DSTU2/FHIRNamingSystemTypeList.php | 3 +- .../DSTU2/FHIRNarrativeStatusList.php | 3 +- .../DSTU2/FHIRNoteTypeList.php | 3 +- .../DSTU2/FHIRNutritionOrderStatusList.php | 3 +- .../FHIRObservationRelationshipTypeList.php | 3 +- .../DSTU2/FHIRObservationStatusList.php | 3 +- .../DSTU2/FHIROidPrimitive.php | 3 +- .../DSTU2/FHIROperationKindList.php | 3 +- .../DSTU2/FHIROperationParameterUseList.php | 3 +- .../DSTU2/FHIROrderStatusList.php | 3 +- .../DSTU2/FHIRParticipantRequiredList.php | 3 +- .../DSTU2/FHIRParticipantStatusList.php | 3 +- .../DSTU2/FHIRParticipationStatusList.php | 3 +- .../DSTU2/FHIRPositiveIntPrimitive.php | 3 +- .../FHIRProcedureRequestPriorityList.php | 3 +- .../DSTU2/FHIRProcedureRequestStatusList.php | 3 +- .../DSTU2/FHIRProcedureStatusList.php | 3 +- .../DSTU2/FHIRPropertyRepresentationList.php | 3 +- .../DSTU2/FHIRProvenanceEntityRoleList.php | 3 +- .../DSTU2/FHIRQuantityComparatorList.php | 3 +- .../FHIRQuestionnaireResponseStatusList.php | 3 +- .../DSTU2/FHIRQuestionnaireStatusList.php | 3 +- .../DSTU2/FHIRReferralStatusList.php | 3 +- .../DSTU2/FHIRRemittanceOutcomeList.php | 3 +- .../PHPFHIRGenerated/DSTU2/FHIRResource.php | 78 +- .../DSTU2/FHIRResource/FHIRBinary.php | 47 +- .../DSTU2/FHIRResource/FHIRBundle.php | 54 +- .../DSTU2/FHIRResource/FHIRDomainResource.php | 16 +- .../FHIRDomainResource/FHIRAccount.php | 126 +- .../FHIRAllergyIntolerance.php | 185 +- .../FHIRDomainResource/FHIRAppointment.php | 187 +- .../FHIRAppointmentResponse.php | 123 +- .../FHIRDomainResource/FHIRAuditEvent.php | 17 +- .../FHIRDomainResource/FHIRBasic.php | 62 +- .../FHIRDomainResource/FHIRBodySite.php | 67 +- .../FHIRDomainResource/FHIRCarePlan.php | 129 +- .../FHIRDomainResource/FHIRClaim.php | 176 +- .../FHIRDomainResource/FHIRClaimResponse.php | 267 +- .../FHIRClinicalImpression.php | 151 +- .../FHIRDomainResource/FHIRCommunication.php | 116 +- .../FHIRCommunicationRequest.php | 118 +- .../FHIRDomainResource/FHIRComposition.php | 121 +- .../FHIRDomainResource/FHIRConceptMap.php | 273 +- .../FHIRDomainResource/FHIRCondition.php | 272 +- .../FHIRDomainResource/FHIRConformance.php | 306 +- .../FHIRDomainResource/FHIRContract.php | 92 +- .../FHIRDomainResource/FHIRCoverage.php | 201 +- .../FHIRDomainResource/FHIRDataElement.php | 231 +- .../FHIRDomainResource/FHIRDetectedIssue.php | 113 +- .../FHIRDomainResource/FHIRDevice.php | 251 +- .../FHIRDeviceComponent.php | 77 +- .../FHIRDomainResource/FHIRDeviceMetric.php | 93 +- .../FHIRDeviceUseRequest.php | 179 +- .../FHIRDeviceUseStatement.php | 117 +- .../FHIRDiagnosticOrder.php | 101 +- .../FHIRDiagnosticReport.php | 147 +- .../FHIRDocumentManifest.php | 153 +- .../FHIRDocumentReference.php | 158 +- .../FHIREligibilityRequest.php | 64 +- .../FHIREligibilityResponse.php | 103 +- .../FHIRDomainResource/FHIREncounter.php | 132 +- .../FHIREnrollmentRequest.php | 67 +- .../FHIREnrollmentResponse.php | 103 +- .../FHIRDomainResource/FHIREpisodeOfCare.php | 80 +- .../FHIRExplanationOfBenefit.php | 103 +- .../FHIRFamilyMemberHistory.php | 285 +- .../FHIRDomainResource/FHIRFlag.php | 65 +- .../FHIRDomainResource/FHIRGoal.php | 175 +- .../FHIRDomainResource/FHIRGroup.php | 125 +- .../FHIRHealthcareService.php | 259 +- .../FHIRImagingObjectSelection.php | 72 +- .../FHIRDomainResource/FHIRImagingStudy.php | 211 +- .../FHIRDomainResource/FHIRImmunization.php | 196 +- .../FHIRImmunizationRecommendation.php | 46 +- .../FHIRImplementationGuide.php | 248 +- .../FHIRDomainResource/FHIRList.php | 144 +- .../FHIRDomainResource/FHIRLocation.php | 153 +- .../FHIRDomainResource/FHIRMedia.php | 159 +- .../FHIRDomainResource/FHIRMedication.php | 32 +- .../FHIRMedicationAdministration.php | 133 +- .../FHIRMedicationDispense.php | 162 +- .../FHIRMedicationOrder.php | 130 +- .../FHIRMedicationStatement.php | 155 +- .../FHIRDomainResource/FHIRMessageHeader.php | 42 +- .../FHIRDomainResource/FHIRNamingSystem.php | 206 +- .../FHIRDomainResource/FHIRNutritionOrder.php | 99 +- .../FHIRDomainResource/FHIRObservation.php | 221 +- .../FHIROperationDefinition.php | 332 +- .../FHIROperationOutcome.php | 14 +- .../FHIRDomainResource/FHIROrder.php | 68 +- .../FHIRDomainResource/FHIROrderResponse.php | 102 +- .../FHIRDomainResource/FHIROrganization.php | 119 +- .../FHIRDomainResource/FHIRPatient.php | 232 +- .../FHIRDomainResource/FHIRPaymentNotice.php | 67 +- .../FHIRPaymentReconciliation.php | 134 +- .../FHIRDomainResource/FHIRPerson.php | 143 +- .../FHIRDomainResource/FHIRPractitioner.php | 150 +- .../FHIRDomainResource/FHIRProcedure.php | 136 +- .../FHIRProcedureRequest.php | 153 +- .../FHIRDomainResource/FHIRProcessRequest.php | 181 +- .../FHIRProcessResponse.php | 92 +- .../FHIRDomainResource/FHIRProvenance.php | 75 +- .../FHIRDomainResource/FHIRQuestionnaire.php | 177 +- .../FHIRQuestionnaireResponse.php | 72 +- .../FHIRReferralRequest.php | 133 +- .../FHIRDomainResource/FHIRRelatedPerson.php | 123 +- .../FHIRDomainResource/FHIRRiskAssessment.php | 77 +- .../FHIRDomainResource/FHIRSchedule.php | 66 +- .../FHIRSearchParameter.php | 288 +- .../FHIRDomainResource/FHIRSlot.php | 139 +- .../FHIRDomainResource/FHIRSpecimen.php | 111 +- .../FHIRStructureDefinition.php | 410 ++- .../FHIRDomainResource/FHIRSubscription.php | 143 +- .../FHIRDomainResource/FHIRSubstance.php | 71 +- .../FHIRDomainResource/FHIRSupplyDelivery.php | 96 +- .../FHIRDomainResource/FHIRSupplyRequest.php | 76 +- .../FHIRDomainResource/FHIRTestScript.php | 266 +- .../FHIRDomainResource/FHIRValueSet.php | 288 +- .../FHIRVisionPrescription.php | 67 +- .../DSTU2/FHIRResource/FHIRParameters.php | 14 +- .../DSTU2/FHIRResourceContainer.php | 17 +- .../DSTU2/FHIRResourceVersionPolicyList.php | 3 +- .../DSTU2/FHIRResponseTypeList.php | 3 +- .../DSTU2/FHIRRestfulConformanceModeList.php | 3 +- .../FHIRSampledDataDataTypePrimitive.php | 3 +- .../DSTU2/FHIRSearchEntryModeList.php | 3 +- .../DSTU2/FHIRSearchModifierCodeList.php | 3 +- .../DSTU2/FHIRSearchParamTypeList.php | 3 +- .../DSTU2/FHIRSlicingRulesList.php | 3 +- .../DSTU2/FHIRSlotStatusList.php | 3 +- .../DSTU2/FHIRSpecimenStatusList.php | 3 +- .../DSTU2/FHIRStringPrimitive.php | 3 +- .../DSTU2/FHIRStructureDefinitionKindList.php | 3 +- .../DSTU2/FHIRSubscriptionChannelTypeList.php | 3 +- .../DSTU2/FHIRSubscriptionStatusList.php | 3 +- .../DSTU2/FHIRSupplyDeliveryStatusList.php | 3 +- .../DSTU2/FHIRSupplyRequestStatusList.php | 3 +- .../FHIRSystemRestfulInteractionList.php | 3 +- .../DSTU2/FHIRTimePrimitive.php | 3 +- .../DSTU2/FHIRTransactionModeList.php | 3 +- .../DSTU2/FHIRTypeRestfulInteractionList.php | 3 +- .../DSTU2/FHIRUnitsOfTimeList.php | 3 +- .../DSTU2/FHIRUnknownContentCodeList.php | 3 +- .../DSTU2/FHIRUnsignedIntPrimitive.php | 3 +- .../DSTU2/FHIRUriPrimitive.php | 3 +- .../PHPFHIRGenerated/DSTU2/FHIRUseList.php | 3 +- .../DSTU2/FHIRUuidPrimitive.php | 3 +- .../DSTU2/FHIRVisionBaseList.php | 3 +- .../DSTU2/FHIRVisionEyesList.php | 3 +- .../DSTU2/FHIRXPathUsageTypeList.php | 3 +- .../DSTU2/PHPFHIRAutoloader.php | 2 +- .../PHPFHIRCommentContainerInterface.php | 2 +- .../DSTU2/PHPFHIRCommentContainerTrait.php | 4 +- .../DSTU2/PHPFHIRConstants.php | 4 +- .../DSTU2/PHPFHIRContainedTypeInterface.php | 2 +- .../DSTU2/PHPFHIRResponseParser.php | 2 +- .../DSTU2/PHPFHIRResponseParserConfig.php | 2 +- .../FHIRAccountStatusListTest.php | 2 +- .../PHPFHIRTests/FHIRActionListListTest.php | 2 +- .../PHPFHIRTests/FHIRAddressTypeListTest.php | 2 +- .../PHPFHIRTests/FHIRAddressUseListTest.php | 2 +- .../FHIRAdministrativeGenderListTest.php | 2 +- .../FHIRAggregationModeListTest.php | 2 +- ...FHIRAllergyIntoleranceCategoryListTest.php | 2 +- ...HIRAllergyIntoleranceCertaintyListTest.php | 2 +- ...RAllergyIntoleranceCriticalityListTest.php | 2 +- ...FHIRAllergyIntoleranceSeverityListTest.php | 2 +- .../FHIRAllergyIntoleranceStatusListTest.php | 2 +- .../FHIRAllergyIntoleranceTypeListTest.php | 2 +- .../PHPFHIRTests/FHIRAnswerFormatListTest.php | 2 +- .../FHIRAppointmentStatusListTest.php | 2 +- .../FHIRAssertionDirectionTypeListTest.php | 2 +- .../FHIRAssertionOperatorTypeListTest.php | 2 +- .../FHIRAssertionResponseTypesListTest.php | 2 +- .../FHIRAuditEventActionListTest.php | 2 +- .../FHIRAuditEventOutcomeListTest.php | 2 +- ...ditEventParticipantNetworkTypeListTest.php | 2 +- .../FHIRBase64BinaryPrimitiveTest.php | 2 +- .../FHIRBindingStrengthListTest.php | 2 +- .../PHPFHIRTests/FHIRBooleanPrimitiveTest.php | 2 +- .../PHPFHIRTests/FHIRBundleTypeListTest.php | 2 +- .../FHIRCarePlanActivityStatusListTest.php | 2 +- .../FHIRCarePlanRelationshipListTest.php | 2 +- .../FHIRCarePlanStatusListTest.php | 2 +- .../PHPFHIRTests/FHIRClaimTypeListTest.php | 2 +- .../FHIRClinicalImpressionStatusListTest.php | 2 +- .../PHPFHIRTests/FHIRCodePrimitiveTest.php | 2 +- ...FHIRCommunicationRequestStatusListTest.php | 2 +- .../FHIRCommunicationStatusListTest.php | 2 +- ...FHIRCompositionAttestationModeListTest.php | 2 +- .../FHIRCompositionStatusListTest.php | 2 +- .../FHIRConceptMapEquivalenceListTest.php | 2 +- ...HIRConditionVerificationStatusListTest.php | 2 +- .../FHIRConditionalDeleteStatusListTest.php | 2 +- .../FHIRConformanceEventModeListTest.php | 2 +- .../FHIRConformanceResourceStatusListTest.php | 2 +- .../FHIRConformanceStatementKindListTest.php | 2 +- .../FHIRConstraintSeverityListTest.php | 2 +- .../FHIRContactPointSystemListTest.php | 2 +- .../FHIRContactPointUseListTest.php | 2 +- .../PHPFHIRTests/FHIRContentTypeListTest.php | 2 +- .../FHIRDataElementStringencyListTest.php | 2 +- .../PHPFHIRTests/FHIRDatePrimitiveTest.php | 2 +- .../FHIRDateTimePrimitiveTest.php | 2 +- .../PHPFHIRTests/FHIRDaysOfWeekListTest.php | 2 +- .../PHPFHIRTests/FHIRDecimalPrimitiveTest.php | 2 +- .../FHIRDetectedIssueSeverityListTest.php | 2 +- ...IRDeviceMetricCalibrationStateListTest.php | 2 +- ...HIRDeviceMetricCalibrationTypeListTest.php | 2 +- .../FHIRDeviceMetricCategoryListTest.php | 2 +- .../FHIRDeviceMetricColorListTest.php | 2 +- ...RDeviceMetricOperationalStatusListTest.php | 2 +- .../PHPFHIRTests/FHIRDeviceStatusListTest.php | 2 +- .../FHIRDeviceUseRequestPriorityListTest.php | 2 +- .../FHIRDeviceUseRequestStatusListTest.php | 2 +- .../FHIRDiagnosticOrderPriorityListTest.php | 2 +- .../FHIRDiagnosticOrderStatusListTest.php | 2 +- .../FHIRDiagnosticReportStatusListTest.php | 2 +- .../FHIRDigitalMediaTypeListTest.php | 2 +- .../PHPFHIRTests/FHIRDocumentModeListTest.php | 2 +- .../FHIRDocumentReferenceStatusListTest.php | 2 +- .../FHIRDocumentRelationshipTypeListTest.php | 2 +- .../FHIRElement/FHIRAccountStatusTest.php | 2 +- .../FHIRElement/FHIRActionListTest.php | 2 +- .../FHIRElement/FHIRAddressTest.php | 2 +- .../FHIRElement/FHIRAddressTypeTest.php | 2 +- .../FHIRElement/FHIRAddressUseTest.php | 2 +- .../FHIRAdministrativeGenderTest.php | 2 +- .../FHIRElement/FHIRAggregationModeTest.php | 2 +- .../FHIRAllergyIntoleranceCategoryTest.php | 2 +- .../FHIRAllergyIntoleranceCertaintyTest.php | 2 +- .../FHIRAllergyIntoleranceCriticalityTest.php | 2 +- .../FHIRAllergyIntoleranceSeverityTest.php | 2 +- .../FHIRAllergyIntoleranceStatusTest.php | 2 +- .../FHIRAllergyIntoleranceTypeTest.php | 2 +- .../FHIRElement/FHIRAnnotationTest.php | 2 +- .../FHIRElement/FHIRAnswerFormatTest.php | 2 +- .../FHIRElement/FHIRAppointmentStatusTest.php | 2 +- .../FHIRAssertionDirectionTypeTest.php | 2 +- .../FHIRAssertionOperatorTypeTest.php | 2 +- .../FHIRAssertionResponseTypesTest.php | 2 +- .../FHIRElement/FHIRAttachmentTest.php | 2 +- .../FHIRElement/FHIRAuditEventActionTest.php | 2 +- .../FHIRElement/FHIRAuditEventOutcomeTest.php | 2 +- ...IRAuditEventParticipantNetworkTypeTest.php | 2 +- .../FHIRAllergyIntoleranceReactionTest.php | 2 +- .../FHIRAppointmentParticipantTest.php | 2 +- .../FHIRAuditEventDetailTest.php | 2 +- .../FHIRAuditEventEventTest.php | 2 +- .../FHIRAuditEventNetworkTest.php | 2 +- .../FHIRAuditEventObjectTest.php | 2 +- .../FHIRAuditEventParticipantTest.php | 2 +- .../FHIRAuditEventSourceTest.php | 2 +- .../FHIRBundle/FHIRBundleEntryTest.php | 2 +- .../FHIRBundle/FHIRBundleLinkTest.php | 2 +- .../FHIRBundle/FHIRBundleRequestTest.php | 2 +- .../FHIRBundle/FHIRBundleResponseTest.php | 2 +- .../FHIRBundle/FHIRBundleSearchTest.php | 2 +- .../FHIRCarePlan/FHIRCarePlanActivityTest.php | 2 +- .../FHIRCarePlan/FHIRCarePlanDetailTest.php | 2 +- .../FHIRCarePlanParticipantTest.php | 2 +- .../FHIRCarePlanRelatedPlanTest.php | 2 +- .../FHIRClaim/FHIRClaimCoverageTest.php | 2 +- .../FHIRClaim/FHIRClaimDetailTest.php | 2 +- .../FHIRClaim/FHIRClaimDiagnosisTest.php | 2 +- .../FHIRClaim/FHIRClaimItemTest.php | 2 +- .../FHIRClaim/FHIRClaimMissingTeethTest.php | 2 +- .../FHIRClaim/FHIRClaimPayeeTest.php | 2 +- .../FHIRClaim/FHIRClaimProsthesisTest.php | 2 +- .../FHIRClaim/FHIRClaimSubDetailTest.php | 2 +- .../FHIRClaimResponseAddItemTest.php | 2 +- .../FHIRClaimResponseAdjudication1Test.php | 2 +- .../FHIRClaimResponseAdjudication2Test.php | 2 +- .../FHIRClaimResponseAdjudication3Test.php | 2 +- .../FHIRClaimResponseAdjudication4Test.php | 2 +- .../FHIRClaimResponseAdjudicationTest.php | 2 +- .../FHIRClaimResponseCoverageTest.php | 2 +- .../FHIRClaimResponseDetail1Test.php | 2 +- .../FHIRClaimResponseDetailTest.php | 2 +- .../FHIRClaimResponseErrorTest.php | 2 +- .../FHIRClaimResponseItemTest.php | 2 +- .../FHIRClaimResponseNoteTest.php | 2 +- .../FHIRClaimResponseSubDetailTest.php | 2 +- .../FHIRClinicalImpressionFindingTest.php | 2 +- ...IRClinicalImpressionInvestigationsTest.php | 2 +- .../FHIRClinicalImpressionRuledOutTest.php | 2 +- .../FHIRCommunicationPayloadTest.php | 2 +- .../FHIRCommunicationRequestPayloadTest.php | 2 +- .../FHIRCompositionAttesterTest.php | 2 +- .../FHIRCompositionEventTest.php | 2 +- .../FHIRCompositionSectionTest.php | 2 +- .../FHIRConceptMapContactTest.php | 2 +- .../FHIRConceptMapDependsOnTest.php | 2 +- .../FHIRConceptMapElementTest.php | 2 +- .../FHIRConceptMapTargetTest.php | 2 +- .../FHIRConditionEvidenceTest.php | 2 +- .../FHIRCondition/FHIRConditionStageTest.php | 2 +- .../FHIRConformanceCertificateTest.php | 2 +- .../FHIRConformanceContactTest.php | 2 +- .../FHIRConformanceDocumentTest.php | 2 +- .../FHIRConformanceEndpointTest.php | 2 +- .../FHIRConformanceEventTest.php | 2 +- .../FHIRConformanceImplementationTest.php | 2 +- .../FHIRConformanceInteraction1Test.php | 2 +- .../FHIRConformanceInteractionTest.php | 2 +- .../FHIRConformanceMessagingTest.php | 2 +- .../FHIRConformanceOperationTest.php | 2 +- .../FHIRConformanceResourceTest.php | 2 +- .../FHIRConformanceRestTest.php | 2 +- .../FHIRConformanceSearchParamTest.php | 2 +- .../FHIRConformanceSecurityTest.php | 2 +- .../FHIRConformanceSoftwareTest.php | 2 +- .../FHIRContract/FHIRContractActor1Test.php | 2 +- .../FHIRContract/FHIRContractActorTest.php | 2 +- .../FHIRContract/FHIRContractFriendlyTest.php | 2 +- .../FHIRContract/FHIRContractLegalTest.php | 2 +- .../FHIRContract/FHIRContractRuleTest.php | 2 +- .../FHIRContract/FHIRContractSignerTest.php | 2 +- .../FHIRContract/FHIRContractTermTest.php | 2 +- .../FHIRContractValuedItem1Test.php | 2 +- .../FHIRContractValuedItemTest.php | 2 +- .../FHIRDataElementContactTest.php | 2 +- .../FHIRDataElementMappingTest.php | 2 +- .../FHIRDetectedIssueMitigationTest.php | 2 +- ...ceComponentProductionSpecificationTest.php | 2 +- .../FHIRDeviceMetricCalibrationTest.php | 2 +- .../FHIRDiagnosticOrderEventTest.php | 2 +- .../FHIRDiagnosticOrderItemTest.php | 2 +- .../FHIRDiagnosticReportImageTest.php | 2 +- .../FHIRDocumentManifestContentTest.php | 2 +- .../FHIRDocumentManifestRelatedTest.php | 2 +- .../FHIRDocumentReferenceContentTest.php | 2 +- .../FHIRDocumentReferenceContextTest.php | 2 +- .../FHIRDocumentReferenceRelatedTest.php | 2 +- .../FHIRDocumentReferenceRelatesToTest.php | 2 +- .../FHIREncounterHospitalizationTest.php | 2 +- .../FHIREncounterLocationTest.php | 2 +- .../FHIREncounterParticipantTest.php | 2 +- .../FHIREncounterStatusHistoryTest.php | 2 +- .../FHIREpisodeOfCareCareTeamTest.php | 2 +- .../FHIREpisodeOfCareStatusHistoryTest.php | 2 +- .../FHIRFamilyMemberHistoryConditionTest.php | 2 +- .../FHIRGoal/FHIRGoalOutcomeTest.php | 2 +- .../FHIRGroup/FHIRGroupCharacteristicTest.php | 2 +- .../FHIRGroup/FHIRGroupMemberTest.php | 2 +- ...FHIRHealthcareServiceAvailableTimeTest.php | 2 +- .../FHIRHealthcareServiceNotAvailableTest.php | 2 +- .../FHIRHealthcareServiceServiceTypeTest.php | 2 +- .../FHIRImagingObjectSelectionFramesTest.php | 2 +- ...FHIRImagingObjectSelectionInstanceTest.php | 2 +- .../FHIRImagingObjectSelectionSeriesTest.php | 2 +- .../FHIRImagingObjectSelectionStudyTest.php | 2 +- .../FHIRImagingStudyInstanceTest.php | 2 +- .../FHIRImagingStudySeriesTest.php | 2 +- .../FHIRImmunizationExplanationTest.php | 2 +- .../FHIRImmunizationReactionTest.php | 2 +- ...HIRImmunizationVaccinationProtocolTest.php | 2 +- ...izationRecommendationDateCriterionTest.php | 2 +- ...ImmunizationRecommendationProtocolTest.php | 2 +- ...zationRecommendationRecommendationTest.php | 2 +- .../FHIRImplementationGuideContactTest.php | 2 +- .../FHIRImplementationGuideDependencyTest.php | 2 +- .../FHIRImplementationGuideGlobalTest.php | 2 +- .../FHIRImplementationGuidePackageTest.php | 2 +- .../FHIRImplementationGuidePageTest.php | 2 +- .../FHIRImplementationGuideResourceTest.php | 2 +- .../FHIRList/FHIRListEntryTest.php | 2 +- .../FHIRLocation/FHIRLocationPositionTest.php | 2 +- .../FHIRMedicationBatchTest.php | 2 +- .../FHIRMedicationContentTest.php | 2 +- .../FHIRMedicationIngredientTest.php | 2 +- .../FHIRMedicationPackageTest.php | 2 +- .../FHIRMedicationProductTest.php | 2 +- ...FHIRMedicationAdministrationDosageTest.php | 2 +- ...edicationDispenseDosageInstructionTest.php | 2 +- ...FHIRMedicationDispenseSubstitutionTest.php | 2 +- ...FHIRMedicationOrderDispenseRequestTest.php | 2 +- ...IRMedicationOrderDosageInstructionTest.php | 2 +- .../FHIRMedicationOrderSubstitutionTest.php | 2 +- .../FHIRMedicationStatementDosageTest.php | 2 +- .../FHIRMessageHeaderDestinationTest.php | 2 +- .../FHIRMessageHeaderResponseTest.php | 2 +- .../FHIRMessageHeaderSourceTest.php | 2 +- .../FHIRNamingSystemContactTest.php | 2 +- .../FHIRNamingSystemUniqueIdTest.php | 2 +- .../FHIRNutritionOrderAdministrationTest.php | 2 +- .../FHIRNutritionOrderEnteralFormulaTest.php | 2 +- .../FHIRNutritionOrderNutrientTest.php | 2 +- .../FHIRNutritionOrderOralDietTest.php | 2 +- .../FHIRNutritionOrderSupplementTest.php | 2 +- .../FHIRNutritionOrderTextureTest.php | 2 +- .../FHIRObservationComponentTest.php | 2 +- .../FHIRObservationReferenceRangeTest.php | 2 +- .../FHIRObservationRelatedTest.php | 2 +- .../FHIROperationDefinitionBindingTest.php | 2 +- .../FHIROperationDefinitionContactTest.php | 2 +- .../FHIROperationDefinitionParameterTest.php | 2 +- .../FHIROperationOutcomeIssueTest.php | 2 +- .../FHIROrder/FHIROrderWhenTest.php | 2 +- .../FHIROrganizationContactTest.php | 2 +- .../FHIRParametersParameterTest.php | 2 +- .../FHIRPatient/FHIRPatientAnimalTest.php | 2 +- .../FHIRPatientCommunicationTest.php | 2 +- .../FHIRPatient/FHIRPatientContactTest.php | 2 +- .../FHIRPatient/FHIRPatientLinkTest.php | 2 +- .../FHIRPaymentReconciliationDetailTest.php | 2 +- .../FHIRPaymentReconciliationNoteTest.php | 2 +- .../FHIRPerson/FHIRPersonLinkTest.php | 2 +- .../FHIRPractitionerPractitionerRoleTest.php | 2 +- .../FHIRPractitionerQualificationTest.php | 2 +- .../FHIRProcedureFocalDeviceTest.php | 2 +- .../FHIRProcedurePerformerTest.php | 2 +- .../FHIRProcessRequestItemTest.php | 2 +- .../FHIRProcessResponseNotesTest.php | 2 +- .../FHIRProvenanceAgentTest.php | 2 +- .../FHIRProvenanceEntityTest.php | 2 +- .../FHIRProvenanceRelatedAgentTest.php | 2 +- .../FHIRQuestionnaireGroupTest.php | 2 +- .../FHIRQuestionnaireQuestionTest.php | 2 +- .../FHIRQuestionnaireResponseAnswerTest.php | 2 +- .../FHIRQuestionnaireResponseGroupTest.php | 2 +- .../FHIRQuestionnaireResponseQuestionTest.php | 2 +- .../FHIRRiskAssessmentPredictionTest.php | 2 +- .../FHIRSearchParameterContactTest.php | 2 +- .../FHIRSpecimenCollectionTest.php | 2 +- .../FHIRSpecimenContainerTest.php | 2 +- .../FHIRSpecimenTreatmentTest.php | 2 +- .../FHIRStructureDefinitionContactTest.php | 2 +- ...HIRStructureDefinitionDifferentialTest.php | 2 +- .../FHIRStructureDefinitionMappingTest.php | 2 +- .../FHIRStructureDefinitionSnapshotTest.php | 2 +- .../FHIRSubscriptionChannelTest.php | 2 +- .../FHIRSubstanceIngredientTest.php | 2 +- .../FHIRSubstanceInstanceTest.php | 2 +- .../FHIRSupplyRequestWhenTest.php | 2 +- .../FHIRTestScriptAction1Test.php | 2 +- .../FHIRTestScriptAction2Test.php | 2 +- .../FHIRTestScriptActionTest.php | 2 +- .../FHIRTestScriptAssertTest.php | 2 +- .../FHIRTestScriptCapabilityTest.php | 2 +- .../FHIRTestScriptContactTest.php | 2 +- .../FHIRTestScriptFixtureTest.php | 2 +- .../FHIRTestScript/FHIRTestScriptLinkTest.php | 2 +- .../FHIRTestScriptMetadataTest.php | 2 +- .../FHIRTestScriptOperationTest.php | 2 +- .../FHIRTestScriptRequestHeaderTest.php | 2 +- .../FHIRTestScriptSetupTest.php | 2 +- .../FHIRTestScriptTeardownTest.php | 2 +- .../FHIRTestScript/FHIRTestScriptTestTest.php | 2 +- .../FHIRTestScriptVariableTest.php | 2 +- .../FHIRValueSetCodeSystemTest.php | 2 +- .../FHIRValueSet/FHIRValueSetComposeTest.php | 2 +- .../FHIRValueSet/FHIRValueSetConcept1Test.php | 2 +- .../FHIRValueSet/FHIRValueSetConceptTest.php | 2 +- .../FHIRValueSet/FHIRValueSetContactTest.php | 2 +- .../FHIRValueSet/FHIRValueSetContainsTest.php | 2 +- .../FHIRValueSetDesignationTest.php | 2 +- .../FHIRValueSetExpansionTest.php | 2 +- .../FHIRValueSet/FHIRValueSetFilterTest.php | 2 +- .../FHIRValueSet/FHIRValueSetIncludeTest.php | 2 +- .../FHIRValueSetParameterTest.php | 2 +- .../FHIRVisionPrescriptionDispenseTest.php | 2 +- .../FHIRElement/FHIRBackboneElementTest.php | 2 +- .../FHIRElement/FHIRBase64BinaryTest.php | 2 +- .../FHIRElement/FHIRBindingStrengthTest.php | 2 +- .../FHIRElement/FHIRBooleanTest.php | 2 +- .../FHIRElement/FHIRBundleTypeTest.php | 2 +- .../FHIRCarePlanActivityStatusTest.php | 2 +- .../FHIRCarePlanRelationshipTest.php | 2 +- .../FHIRElement/FHIRCarePlanStatusTest.php | 2 +- .../FHIRElement/FHIRClaimTypeTest.php | 2 +- .../FHIRClinicalImpressionStatusTest.php | 2 +- .../PHPFHIRTests/FHIRElement/FHIRCodeTest.php | 2 +- .../FHIRElement/FHIRCodeableConceptTest.php | 2 +- .../FHIRElement/FHIRCodingTest.php | 2 +- .../FHIRCommunicationRequestStatusTest.php | 2 +- .../FHIRCommunicationStatusTest.php | 2 +- .../FHIRCompositionAttestationModeTest.php | 2 +- .../FHIRElement/FHIRCompositionStatusTest.php | 2 +- .../FHIRConceptMapEquivalenceTest.php | 2 +- .../FHIRConditionVerificationStatusTest.php | 2 +- .../FHIRConditionalDeleteStatusTest.php | 2 +- .../FHIRConformanceEventModeTest.php | 2 +- .../FHIRConformanceResourceStatusTest.php | 2 +- .../FHIRConformanceStatementKindTest.php | 2 +- .../FHIRConstraintSeverityTest.php | 2 +- .../FHIRContactPointSystemTest.php | 2 +- .../FHIRElement/FHIRContactPointTest.php | 2 +- .../FHIRElement/FHIRContactPointUseTest.php | 2 +- .../FHIRElement/FHIRContentTypeTest.php | 2 +- .../FHIRDataElementStringencyTest.php | 2 +- .../PHPFHIRTests/FHIRElement/FHIRDateTest.php | 2 +- .../FHIRElement/FHIRDateTimeTest.php | 2 +- .../FHIRElement/FHIRDaysOfWeekTest.php | 2 +- .../FHIRElement/FHIRDecimalTest.php | 2 +- .../FHIRDetectedIssueSeverityTest.php | 2 +- .../FHIRDeviceMetricCalibrationStateTest.php | 2 +- .../FHIRDeviceMetricCalibrationTypeTest.php | 2 +- .../FHIRDeviceMetricCategoryTest.php | 2 +- .../FHIRElement/FHIRDeviceMetricColorTest.php | 2 +- .../FHIRDeviceMetricOperationalStatusTest.php | 2 +- .../FHIRElement/FHIRDeviceStatusTest.php | 2 +- .../FHIRDeviceUseRequestPriorityTest.php | 2 +- .../FHIRDeviceUseRequestStatusTest.php | 2 +- .../FHIRDiagnosticOrderPriorityTest.php | 2 +- .../FHIRDiagnosticOrderStatusTest.php | 2 +- .../FHIRDiagnosticReportStatusTest.php | 2 +- .../FHIRElement/FHIRDigitalMediaTypeTest.php | 2 +- .../FHIRElement/FHIRDocumentModeTest.php | 2 +- .../FHIRDocumentReferenceStatusTest.php | 2 +- .../FHIRDocumentRelationshipTypeTest.php | 2 +- .../FHIRElementDefinitionBaseTest.php | 2 +- .../FHIRElementDefinitionBindingTest.php | 2 +- .../FHIRElementDefinitionConstraintTest.php | 2 +- .../FHIRElementDefinitionMappingTest.php | 2 +- .../FHIRElementDefinitionSlicingTest.php | 2 +- .../FHIRElementDefinitionTypeTest.php | 2 +- .../FHIRElement/FHIRElementDefinitionTest.php | 2 +- .../FHIRElement/FHIREncounterClassTest.php | 2 +- .../FHIREncounterLocationStatusTest.php | 2 +- .../FHIRElement/FHIREncounterStateTest.php | 2 +- .../FHIREpisodeOfCareStatusTest.php | 2 +- .../FHIRElement/FHIREventTimingTest.php | 2 +- .../FHIRElement/FHIRExtensionContextTest.php | 2 +- .../FHIRElement/FHIRExtensionTest.php | 2 +- .../FHIRFamilyHistoryStatusTest.php | 2 +- .../FHIRElement/FHIRFilterOperatorTest.php | 2 +- .../FHIRElement/FHIRFlagStatusTest.php | 2 +- .../FHIRElement/FHIRGoalStatusTest.php | 2 +- .../FHIRElement/FHIRGroupTypeTest.php | 2 +- .../FHIRGuideDependencyTypeTest.php | 2 +- .../FHIRElement/FHIRGuidePageKindTest.php | 2 +- .../FHIRGuideResourcePurposeTest.php | 2 +- .../FHIRElement/FHIRHTTPVerbTest.php | 2 +- .../FHIRElement/FHIRHumanNameTest.php | 2 +- .../PHPFHIRTests/FHIRElement/FHIRIdTest.php | 2 +- .../FHIRElement/FHIRIdentifierTest.php | 2 +- .../FHIRElement/FHIRIdentifierUseTest.php | 2 +- .../FHIRIdentityAssuranceLevelTest.php | 2 +- .../FHIRInstanceAvailabilityTest.php | 2 +- .../FHIRElement/FHIRInstantTest.php | 2 +- .../FHIRElement/FHIRIntegerTest.php | 2 +- .../FHIRElement/FHIRIssueSeverityTest.php | 2 +- .../FHIRElement/FHIRIssueTypeTest.php | 2 +- .../FHIRElement/FHIRLinkTypeTest.php | 2 +- .../FHIRElement/FHIRListModeTest.php | 2 +- .../FHIRElement/FHIRListStatusTest.php | 2 +- .../FHIRElement/FHIRLocationModeTest.php | 2 +- .../FHIRElement/FHIRLocationStatusTest.php | 2 +- .../FHIRElement/FHIRMarkdownTest.php | 2 +- .../FHIRElement/FHIRMeasmnt_PrincipleTest.php | 2 +- ...FHIRMedicationAdministrationStatusTest.php | 2 +- .../FHIRMedicationDispenseStatusTest.php | 2 +- .../FHIRMedicationOrderStatusTest.php | 2 +- .../FHIRMedicationStatementStatusTest.php | 2 +- .../FHIRMessageSignificanceCategoryTest.php | 2 +- .../PHPFHIRTests/FHIRElement/FHIRMetaTest.php | 2 +- .../FHIRElement/FHIRNameUseTest.php | 2 +- .../FHIRNamingSystemIdentifierTypeTest.php | 2 +- .../FHIRElement/FHIRNamingSystemTypeTest.php | 2 +- .../FHIRElement/FHIRNarrativeStatusTest.php | 2 +- .../FHIRElement/FHIRNarrativeTest.php | 2 +- .../FHIRElement/FHIRNoteTypeTest.php | 2 +- .../FHIRNutritionOrderStatusTest.php | 2 +- .../FHIRObservationRelationshipTypeTest.php | 2 +- .../FHIRElement/FHIRObservationStatusTest.php | 2 +- .../PHPFHIRTests/FHIRElement/FHIROidTest.php | 2 +- .../FHIRElement/FHIROperationKindTest.php | 2 +- .../FHIROperationParameterUseTest.php | 2 +- .../FHIRElement/FHIROrderStatusTest.php | 2 +- .../FHIRParticipantRequiredTest.php | 2 +- .../FHIRElement/FHIRParticipantStatusTest.php | 2 +- .../FHIRParticipationStatusTest.php | 2 +- .../FHIRElement/FHIRPeriodTest.php | 2 +- .../FHIRElement/FHIRPositiveIntTest.php | 2 +- .../FHIRProcedureRequestPriorityTest.php | 2 +- .../FHIRProcedureRequestStatusTest.php | 2 +- .../FHIRElement/FHIRProcedureStatusTest.php | 2 +- .../FHIRPropertyRepresentationTest.php | 2 +- .../FHIRProvenanceEntityRoleTest.php | 2 +- .../FHIRElement/FHIRQuantity/FHIRAgeTest.php | 2 +- .../FHIRQuantity/FHIRCountTest.php | 2 +- .../FHIRQuantity/FHIRDistanceTest.php | 2 +- .../FHIRQuantity/FHIRDurationTest.php | 2 +- .../FHIRQuantity/FHIRMoneyTest.php | 2 +- .../FHIRQuantity/FHIRSimpleQuantityTest.php | 2 +- .../FHIRQuantityComparatorTest.php | 2 +- .../FHIRElement/FHIRQuantityTest.php | 2 +- .../FHIRQuestionnaireResponseStatusTest.php | 2 +- .../FHIRQuestionnaireStatusTest.php | 2 +- .../FHIRElement/FHIRRangeTest.php | 2 +- .../FHIRElement/FHIRRatioTest.php | 2 +- .../FHIRElement/FHIRReferenceTest.php | 2 +- .../FHIRElement/FHIRReferralStatusTest.php | 2 +- .../FHIRElement/FHIRRemittanceOutcomeTest.php | 2 +- .../FHIRResourceVersionPolicyTest.php | 2 +- .../FHIRElement/FHIRResponseTypeTest.php | 2 +- .../FHIRRestfulConformanceModeTest.php | 2 +- .../FHIRSampledDataDataTypeTest.php | 2 +- .../FHIRElement/FHIRSampledDataTest.php | 2 +- .../FHIRElement/FHIRSearchEntryModeTest.php | 2 +- .../FHIRSearchModifierCodeTest.php | 2 +- .../FHIRElement/FHIRSearchParamTypeTest.php | 2 +- .../FHIRElement/FHIRSignatureTest.php | 2 +- .../FHIRElement/FHIRSlicingRulesTest.php | 2 +- .../FHIRElement/FHIRSlotStatusTest.php | 2 +- .../FHIRElement/FHIRSpecimenStatusTest.php | 2 +- .../FHIRElement/FHIRStringTest.php | 2 +- .../FHIRStructureDefinitionKindTest.php | 2 +- .../FHIRSubscriptionChannelTypeTest.php | 2 +- .../FHIRSubscriptionStatusTest.php | 2 +- .../FHIRSupplyDeliveryStatusTest.php | 2 +- .../FHIRSupplyRequestStatusTest.php | 2 +- .../FHIRSystemRestfulInteractionTest.php | 2 +- .../PHPFHIRTests/FHIRElement/FHIRTimeTest.php | 2 +- .../FHIRTiming/FHIRTimingRepeatTest.php | 2 +- .../FHIRElement/FHIRTimingTest.php | 2 +- .../FHIRElement/FHIRTransactionModeTest.php | 2 +- .../FHIRTypeRestfulInteractionTest.php | 2 +- .../FHIRElement/FHIRUnitsOfTimeTest.php | 2 +- .../FHIRUnknownContentCodeTest.php | 2 +- .../FHIRElement/FHIRUnsignedIntTest.php | 2 +- .../PHPFHIRTests/FHIRElement/FHIRUriTest.php | 2 +- .../PHPFHIRTests/FHIRElement/FHIRUseTest.php | 2 +- .../PHPFHIRTests/FHIRElement/FHIRUuidTest.php | 2 +- .../FHIRElement/FHIRVisionBaseTest.php | 2 +- .../FHIRElement/FHIRVisionEyesTest.php | 2 +- .../FHIRElement/FHIRXPathUsageTypeTest.php | 2 +- .../DSTU2/PHPFHIRTests/FHIRElementTest.php | 2 +- .../FHIREncounterClassListTest.php | 2 +- .../FHIREncounterLocationStatusListTest.php | 2 +- .../FHIREncounterStateListTest.php | 2 +- .../FHIREpisodeOfCareStatusListTest.php | 2 +- .../PHPFHIRTests/FHIREventTimingListTest.php | 2 +- .../FHIRExtensionContextListTest.php | 2 +- .../FHIRFamilyHistoryStatusListTest.php | 2 +- .../FHIRFilterOperatorListTest.php | 2 +- .../PHPFHIRTests/FHIRFlagStatusListTest.php | 2 +- .../PHPFHIRTests/FHIRGoalStatusListTest.php | 2 +- .../PHPFHIRTests/FHIRGroupTypeListTest.php | 2 +- .../FHIRGuideDependencyTypeListTest.php | 2 +- .../FHIRGuidePageKindListTest.php | 2 +- .../FHIRGuideResourcePurposeListTest.php | 2 +- .../PHPFHIRTests/FHIRHTTPVerbListTest.php | 2 +- .../PHPFHIRTests/FHIRIdPrimitiveTest.php | 2 +- .../FHIRIdentifierUseListTest.php | 2 +- .../FHIRIdentityAssuranceLevelListTest.php | 2 +- .../FHIRInstanceAvailabilityListTest.php | 2 +- .../PHPFHIRTests/FHIRInstantPrimitiveTest.php | 2 +- .../PHPFHIRTests/FHIRIntegerPrimitiveTest.php | 2 +- .../FHIRIssueSeverityListTest.php | 2 +- .../PHPFHIRTests/FHIRIssueTypeListTest.php | 2 +- .../PHPFHIRTests/FHIRLinkTypeListTest.php | 2 +- .../PHPFHIRTests/FHIRListModeListTest.php | 2 +- .../PHPFHIRTests/FHIRListStatusListTest.php | 2 +- .../PHPFHIRTests/FHIRLocationModeListTest.php | 2 +- .../FHIRLocationStatusListTest.php | 2 +- .../FHIRMarkdownPrimitiveTest.php | 2 +- .../FHIRMeasmnt_PrincipleListTest.php | 2 +- ...MedicationAdministrationStatusListTest.php | 2 +- .../FHIRMedicationDispenseStatusListTest.php | 2 +- .../FHIRMedicationOrderStatusListTest.php | 2 +- .../FHIRMedicationStatementStatusListTest.php | 2 +- ...HIRMessageSignificanceCategoryListTest.php | 2 +- .../PHPFHIRTests/FHIRNameUseListTest.php | 2 +- ...FHIRNamingSystemIdentifierTypeListTest.php | 2 +- .../FHIRNamingSystemTypeListTest.php | 2 +- .../FHIRNarrativeStatusListTest.php | 2 +- .../PHPFHIRTests/FHIRNoteTypeListTest.php | 2 +- .../FHIRNutritionOrderStatusListTest.php | 2 +- ...HIRObservationRelationshipTypeListTest.php | 2 +- .../FHIRObservationStatusListTest.php | 2 +- .../PHPFHIRTests/FHIROidPrimitiveTest.php | 2 +- .../FHIROperationKindListTest.php | 2 +- .../FHIROperationParameterUseListTest.php | 2 +- .../PHPFHIRTests/FHIROrderStatusListTest.php | 2 +- .../FHIRParticipantRequiredListTest.php | 2 +- .../FHIRParticipantStatusListTest.php | 2 +- .../FHIRParticipationStatusListTest.php | 2 +- .../FHIRPositiveIntPrimitiveTest.php | 2 +- .../FHIRProcedureRequestPriorityListTest.php | 2 +- .../FHIRProcedureRequestStatusListTest.php | 2 +- .../FHIRProcedureStatusListTest.php | 2 +- .../FHIRPropertyRepresentationListTest.php | 2 +- .../FHIRProvenanceEntityRoleListTest.php | 2 +- .../FHIRQuantityComparatorListTest.php | 2 +- ...HIRQuestionnaireResponseStatusListTest.php | 2 +- .../FHIRQuestionnaireStatusListTest.php | 2 +- .../FHIRReferralStatusListTest.php | 2 +- .../FHIRRemittanceOutcomeListTest.php | 2 +- .../FHIRResource/FHIRBinaryTest.php | 2 +- .../FHIRResource/FHIRBundleTest.php | 2 +- .../FHIRDomainResource/FHIRAccountTest.php | 2 +- .../FHIRAllergyIntoleranceTest.php | 2 +- .../FHIRAppointmentResponseTest.php | 2 +- .../FHIRAppointmentTest.php | 2 +- .../FHIRDomainResource/FHIRAuditEventTest.php | 2 +- .../FHIRDomainResource/FHIRBasicTest.php | 2 +- .../FHIRDomainResource/FHIRBodySiteTest.php | 2 +- .../FHIRDomainResource/FHIRCarePlanTest.php | 2 +- .../FHIRClaimResponseTest.php | 2 +- .../FHIRDomainResource/FHIRClaimTest.php | 2 +- .../FHIRClinicalImpressionTest.php | 2 +- .../FHIRCommunicationRequestTest.php | 2 +- .../FHIRCommunicationTest.php | 2 +- .../FHIRCompositionTest.php | 2 +- .../FHIRDomainResource/FHIRConceptMapTest.php | 2 +- .../FHIRDomainResource/FHIRConditionTest.php | 2 +- .../FHIRConformanceTest.php | 2 +- .../FHIRDomainResource/FHIRContractTest.php | 2 +- .../FHIRDomainResource/FHIRCoverageTest.php | 2 +- .../FHIRDataElementTest.php | 2 +- .../FHIRDetectedIssueTest.php | 2 +- .../FHIRDeviceComponentTest.php | 2 +- .../FHIRDeviceMetricTest.php | 2 +- .../FHIRDomainResource/FHIRDeviceTest.php | 2 +- .../FHIRDeviceUseRequestTest.php | 2 +- .../FHIRDeviceUseStatementTest.php | 2 +- .../FHIRDiagnosticOrderTest.php | 2 +- .../FHIRDiagnosticReportTest.php | 2 +- .../FHIRDocumentManifestTest.php | 2 +- .../FHIRDocumentReferenceTest.php | 2 +- .../FHIREligibilityRequestTest.php | 2 +- .../FHIREligibilityResponseTest.php | 2 +- .../FHIRDomainResource/FHIREncounterTest.php | 2 +- .../FHIREnrollmentRequestTest.php | 2 +- .../FHIREnrollmentResponseTest.php | 2 +- .../FHIREpisodeOfCareTest.php | 2 +- .../FHIRExplanationOfBenefitTest.php | 2 +- .../FHIRFamilyMemberHistoryTest.php | 2 +- .../FHIRDomainResource/FHIRFlagTest.php | 2 +- .../FHIRDomainResource/FHIRGoalTest.php | 2 +- .../FHIRDomainResource/FHIRGroupTest.php | 2 +- .../FHIRHealthcareServiceTest.php | 2 +- .../FHIRImagingObjectSelectionTest.php | 2 +- .../FHIRImagingStudyTest.php | 2 +- .../FHIRImmunizationRecommendationTest.php | 2 +- .../FHIRImmunizationTest.php | 2 +- .../FHIRImplementationGuideTest.php | 2 +- .../FHIRDomainResource/FHIRListTest.php | 2 +- .../FHIRDomainResource/FHIRLocationTest.php | 2 +- .../FHIRDomainResource/FHIRMediaTest.php | 2 +- .../FHIRMedicationAdministrationTest.php | 2 +- .../FHIRMedicationDispenseTest.php | 2 +- .../FHIRMedicationOrderTest.php | 2 +- .../FHIRMedicationStatementTest.php | 2 +- .../FHIRDomainResource/FHIRMedicationTest.php | 2 +- .../FHIRMessageHeaderTest.php | 2 +- .../FHIRNamingSystemTest.php | 2 +- .../FHIRNutritionOrderTest.php | 2 +- .../FHIRObservationTest.php | 2 +- .../FHIROperationDefinitionTest.php | 2 +- .../FHIROperationOutcomeTest.php | 2 +- .../FHIROrderResponseTest.php | 2 +- .../FHIRDomainResource/FHIROrderTest.php | 2 +- .../FHIROrganizationTest.php | 2 +- .../FHIRDomainResource/FHIRPatientTest.php | 2 +- .../FHIRPaymentNoticeTest.php | 2 +- .../FHIRPaymentReconciliationTest.php | 2 +- .../FHIRDomainResource/FHIRPersonTest.php | 2 +- .../FHIRPractitionerTest.php | 2 +- .../FHIRProcedureRequestTest.php | 2 +- .../FHIRDomainResource/FHIRProcedureTest.php | 2 +- .../FHIRProcessRequestTest.php | 2 +- .../FHIRProcessResponseTest.php | 2 +- .../FHIRDomainResource/FHIRProvenanceTest.php | 2 +- .../FHIRQuestionnaireResponseTest.php | 2 +- .../FHIRQuestionnaireTest.php | 2 +- .../FHIRReferralRequestTest.php | 2 +- .../FHIRRelatedPersonTest.php | 2 +- .../FHIRRiskAssessmentTest.php | 2 +- .../FHIRDomainResource/FHIRScheduleTest.php | 2 +- .../FHIRSearchParameterTest.php | 2 +- .../FHIRDomainResource/FHIRSlotTest.php | 2 +- .../FHIRDomainResource/FHIRSpecimenTest.php | 2 +- .../FHIRStructureDefinitionTest.php | 2 +- .../FHIRSubscriptionTest.php | 2 +- .../FHIRDomainResource/FHIRSubstanceTest.php | 2 +- .../FHIRSupplyDeliveryTest.php | 2 +- .../FHIRSupplyRequestTest.php | 2 +- .../FHIRDomainResource/FHIRTestScriptTest.php | 2 +- .../FHIRDomainResource/FHIRValueSetTest.php | 2 +- .../FHIRVisionPrescriptionTest.php | 2 +- .../FHIRResource/FHIRDomainResourceTest.php | 2 +- .../FHIRResource/FHIRParametersTest.php | 2 +- .../FHIRResourceContainerTest.php | 2 +- .../DSTU2/PHPFHIRTests/FHIRResourceTest.php | 2 +- .../FHIRResourceVersionPolicyListTest.php | 2 +- .../PHPFHIRTests/FHIRResponseTypeListTest.php | 2 +- .../FHIRRestfulConformanceModeListTest.php | 2 +- .../FHIRSampledDataDataTypePrimitiveTest.php | 2 +- .../FHIRSearchEntryModeListTest.php | 2 +- .../FHIRSearchModifierCodeListTest.php | 2 +- .../FHIRSearchParamTypeListTest.php | 2 +- .../PHPFHIRTests/FHIRSlicingRulesListTest.php | 2 +- .../PHPFHIRTests/FHIRSlotStatusListTest.php | 2 +- .../FHIRSpecimenStatusListTest.php | 2 +- .../PHPFHIRTests/FHIRStringPrimitiveTest.php | 2 +- .../FHIRStructureDefinitionKindListTest.php | 2 +- .../FHIRSubscriptionChannelTypeListTest.php | 2 +- .../FHIRSubscriptionStatusListTest.php | 2 +- .../FHIRSupplyDeliveryStatusListTest.php | 2 +- .../FHIRSupplyRequestStatusListTest.php | 2 +- .../FHIRSystemRestfulInteractionListTest.php | 2 +- .../PHPFHIRTests/FHIRTimePrimitiveTest.php | 2 +- .../FHIRTransactionModeListTest.php | 2 +- .../FHIRTypeRestfulInteractionListTest.php | 2 +- .../PHPFHIRTests/FHIRUnitsOfTimeListTest.php | 2 +- .../FHIRUnknownContentCodeListTest.php | 2 +- .../FHIRUnsignedIntPrimitiveTest.php | 2 +- .../PHPFHIRTests/FHIRUriPrimitiveTest.php | 2 +- .../DSTU2/PHPFHIRTests/FHIRUseListTest.php | 2 +- .../PHPFHIRTests/FHIRUuidPrimitiveTest.php | 2 +- .../PHPFHIRTests/FHIRVisionBaseListTest.php | 2 +- .../PHPFHIRTests/FHIRVisionEyesListTest.php | 2 +- .../FHIRXPathUsageTypeListTest.php | 2 +- .../PHPFHIRTests/PHPFHIRConstantsTest.php | 2 +- .../DSTU2/PHPFHIRTests/PHPFHIRTypeMapTest.php | 2 +- .../DSTU2/PHPFHIRTypeInterface.php | 2 +- .../PHPFHIRGenerated/DSTU2/PHPFHIRTypeMap.php | 2 +- .../R4/FHIRAccountStatusList.php | 3 +- .../R4/FHIRActionCardinalityBehaviorList.php | 3 +- .../R4/FHIRActionConditionKindList.php | 3 +- .../R4/FHIRActionGroupingBehaviorList.php | 3 +- .../R4/FHIRActionParticipantTypeList.php | 3 +- .../R4/FHIRActionPrecheckBehaviorList.php | 3 +- .../R4/FHIRActionRelationshipTypeList.php | 3 +- .../R4/FHIRActionRequiredBehaviorList.php | 3 +- .../R4/FHIRActionSelectionBehaviorList.php | 3 +- .../R4/FHIRAddressTypeList.php | 3 +- .../R4/FHIRAddressUseList.php | 3 +- .../R4/FHIRAdministrativeGenderList.php | 3 +- .../R4/FHIRAdverseEventActualityList.php | 3 +- .../R4/FHIRAggregationModeList.php | 3 +- .../R4/FHIRAllergyIntoleranceCategoryList.php | 3 +- .../FHIRAllergyIntoleranceCriticalityList.php | 3 +- .../R4/FHIRAllergyIntoleranceSeverityList.php | 3 +- .../R4/FHIRAllergyIntoleranceTypeList.php | 3 +- .../R4/FHIRAppointmentStatusList.php | 3 +- .../R4/FHIRAssertionDirectionTypeList.php | 3 +- .../R4/FHIRAssertionOperatorTypeList.php | 3 +- .../R4/FHIRAssertionResponseTypesList.php | 3 +- .../R4/FHIRAuditEventActionList.php | 3 +- .../R4/FHIRAuditEventAgentNetworkTypeList.php | 3 +- .../R4/FHIRAuditEventOutcomeList.php | 3 +- .../R4/FHIRBase64BinaryPrimitive.php | 3 +- .../R4/FHIRBindingStrengthList.php | 3 +- ...BiologicallyDerivedProductCategoryList.php | 3 +- ...IRBiologicallyDerivedProductStatusList.php | 3 +- ...ogicallyDerivedProductStorageScaleList.php | 3 +- .../R4/FHIRBooleanPrimitive.php | 3 +- .../R4/FHIRBundleTypeList.php | 3 +- .../R4/FHIRCanonicalPrimitive.php | 3 +- .../R4/FHIRCapabilityStatementKindList.php | 3 +- .../R4/FHIRCarePlanActivityKindList.php | 3 +- .../R4/FHIRCarePlanActivityStatusList.php | 3 +- .../R4/FHIRCarePlanIntentList.php | 3 +- .../R4/FHIRCareTeamStatusList.php | 3 +- .../R4/FHIRCatalogEntryRelationTypeList.php | 3 +- .../R4/FHIRChargeItemStatusList.php | 3 +- .../R4/FHIRClaimProcessingCodesList.php | 3 +- .../R4/FHIRClinicalImpressionStatusList.php | 3 +- .../PHPFHIRGenerated/R4/FHIRCodePrimitive.php | 3 +- .../R4/FHIRCodeSearchSupportList.php | 3 +- .../R4/FHIRCodeSystemContentModeList.php | 3 +- .../R4/FHIRCodeSystemHierarchyMeaningList.php | 3 +- .../R4/FHIRCompartmentTypeList.php | 3 +- .../R4/FHIRCompositionAttestationModeList.php | 3 +- .../R4/FHIRCompositionStatusList.php | 3 +- .../R4/FHIRConceptMapEquivalenceList.php | 3 +- .../FHIRConceptMapGroupUnmappedModeList.php | 3 +- .../R4/FHIRConditionalDeleteStatusList.php | 3 +- .../R4/FHIRConditionalReadStatusList.php | 3 +- .../R4/FHIRConsentDataMeaningList.php | 3 +- .../R4/FHIRConsentProvisionTypeList.php | 3 +- .../R4/FHIRConsentStateList.php | 3 +- .../R4/FHIRConstraintSeverityList.php | 3 +- .../R4/FHIRContactPointSystemList.php | 3 +- .../R4/FHIRContactPointUseList.php | 3 +- ...ractResourcePublicationStatusCodesList.php | 3 +- .../FHIRContractResourceStatusCodesList.php | 3 +- .../R4/FHIRContributorTypeList.php | 3 +- .../PHPFHIRGenerated/R4/FHIRDatePrimitive.php | 3 +- .../R4/FHIRDateTimePrimitive.php | 3 +- .../R4/FHIRDaysOfWeekList.php | 3 +- .../R4/FHIRDecimalPrimitive.php | 3 +- .../R4/FHIRDetectedIssueSeverityList.php | 3 +- .../FHIRDeviceMetricCalibrationStateList.php | 3 +- .../FHIRDeviceMetricCalibrationTypeList.php | 3 +- .../R4/FHIRDeviceMetricCategoryList.php | 3 +- .../R4/FHIRDeviceMetricColorList.php | 3 +- .../FHIRDeviceMetricOperationalStatusList.php | 3 +- .../R4/FHIRDeviceNameTypeList.php | 3 +- .../R4/FHIRDeviceUseStatementStatusList.php | 3 +- .../R4/FHIRDiagnosticReportStatusList.php | 3 +- .../R4/FHIRDiscriminatorTypeList.php | 3 +- .../R4/FHIRDocumentModeList.php | 3 +- .../R4/FHIRDocumentReferenceStatusList.php | 3 +- .../R4/FHIRDocumentRelationshipTypeList.php | 3 +- .../PHPFHIRGenerated/R4/FHIRElement.php | 22 +- .../R4/FHIRElement/FHIRAccountStatus.php | 12 +- .../FHIRActionCardinalityBehavior.php | 12 +- .../FHIRElement/FHIRActionConditionKind.php | 12 +- .../FHIRActionGroupingBehavior.php | 12 +- .../FHIRElement/FHIRActionParticipantType.php | 12 +- .../FHIRActionPrecheckBehavior.php | 12 +- .../FHIRActionRelationshipType.php | 12 +- .../FHIRActionRequiredBehavior.php | 12 +- .../FHIRActionSelectionBehavior.php | 12 +- .../R4/FHIRElement/FHIRAddress.php | 187 +- .../R4/FHIRElement/FHIRAddressType.php | 12 +- .../R4/FHIRElement/FHIRAddressUse.php | 12 +- .../FHIRElement/FHIRAdministrativeGender.php | 12 +- .../FHIRElement/FHIRAdverseEventActuality.php | 12 +- .../R4/FHIRElement/FHIRAggregationMode.php | 12 +- .../FHIRAllergyIntoleranceCategory.php | 12 +- .../FHIRAllergyIntoleranceCriticality.php | 12 +- .../FHIRAllergyIntoleranceSeverity.php | 12 +- .../FHIRAllergyIntoleranceType.php | 12 +- .../R4/FHIRElement/FHIRAnnotation.php | 67 +- .../R4/FHIRElement/FHIRAppointmentStatus.php | 12 +- .../FHIRAssertionDirectionType.php | 12 +- .../FHIRElement/FHIRAssertionOperatorType.php | 12 +- .../FHIRAssertionResponseTypes.php | 12 +- .../R4/FHIRElement/FHIRAttachment.php | 161 +- .../R4/FHIRElement/FHIRAuditEventAction.php | 12 +- .../FHIRAuditEventAgentNetworkType.php | 12 +- .../R4/FHIRElement/FHIRAuditEventOutcome.php | 12 +- .../R4/FHIRElement/FHIRBackboneElement.php | 14 +- .../FHIRAccount/FHIRAccountCoverage.php | 29 +- .../FHIRAccount/FHIRAccountGuarantor.php | 30 +- .../FHIRActivityDefinitionDynamicValue.php | 29 +- .../FHIRActivityDefinitionParticipant.php | 29 +- .../FHIRAdverseEventCausality.php | 31 +- .../FHIRAdverseEventSuspectEntity.php | 13 +- .../FHIRAllergyIntoleranceReaction.php | 76 +- .../FHIRAppointmentParticipant.php | 54 +- .../FHIRAuditEvent/FHIRAuditEventAgent.php | 104 +- .../FHIRAuditEvent/FHIRAuditEventDetail.php | 66 +- .../FHIRAuditEvent/FHIRAuditEventEntity.php | 76 +- .../FHIRAuditEvent/FHIRAuditEventNetwork.php | 47 +- .../FHIRAuditEvent/FHIRAuditEventSource.php | 34 +- ...IRBiologicallyDerivedProductCollection.php | 31 +- ...BiologicallyDerivedProductManipulation.php | 48 +- ...IRBiologicallyDerivedProductProcessing.php | 50 +- .../FHIRBiologicallyDerivedProductStorage.php | 67 +- .../FHIRBundle/FHIRBundleEntry.php | 35 +- .../FHIRBundle/FHIRBundleLink.php | 47 +- .../FHIRBundle/FHIRBundleRequest.php | 123 +- .../FHIRBundle/FHIRBundleResponse.php | 86 +- .../FHIRBundle/FHIRBundleSearch.php | 47 +- .../FHIRCapabilityStatementDocument.php | 66 +- .../FHIRCapabilityStatementEndpoint.php | 29 +- .../FHIRCapabilityStatementImplementation.php | 48 +- .../FHIRCapabilityStatementInteraction.php | 47 +- .../FHIRCapabilityStatementInteraction1.php | 47 +- .../FHIRCapabilityStatementMessaging.php | 57 +- .../FHIRCapabilityStatementOperation.php | 66 +- .../FHIRCapabilityStatementResource.php | 324 +- .../FHIRCapabilityStatementRest.php | 87 +- .../FHIRCapabilityStatementSearchParam.php | 85 +- .../FHIRCapabilityStatementSecurity.php | 52 +- .../FHIRCapabilityStatementSoftware.php | 66 +- ...HIRCapabilityStatementSupportedMessage.php | 47 +- .../FHIRCarePlan/FHIRCarePlanActivity.php | 20 +- .../FHIRCarePlan/FHIRCarePlanDetail.php | 215 +- .../FHIRCareTeam/FHIRCareTeamParticipant.php | 17 +- .../FHIRCatalogEntryRelatedEntry.php | 29 +- .../FHIRChargeItemPerformer.php | 11 +- .../FHIRChargeItemDefinitionApplicability.php | 66 +- ...FHIRChargeItemDefinitionPriceComponent.php | 67 +- .../FHIRChargeItemDefinitionPropertyGroup.php | 17 +- .../FHIRClaim/FHIRClaimAccident.php | 31 +- .../FHIRClaim/FHIRClaimCareTeam.php | 50 +- .../FHIRClaim/FHIRClaimDetail.php | 119 +- .../FHIRClaim/FHIRClaimDiagnosis.php | 37 +- .../FHIRClaim/FHIRClaimInsurance.php | 114 +- .../FHIRClaim/FHIRClaimItem.php | 253 +- .../FHIRClaim/FHIRClaimPayee.php | 11 +- .../FHIRClaim/FHIRClaimProcedure.php | 57 +- .../FHIRClaim/FHIRClaimRelated.php | 30 +- .../FHIRClaim/FHIRClaimSubDetail.php | 116 +- .../FHIRClaim/FHIRClaimSupportingInfo.php | 110 +- .../FHIRClaimResponseAddItem.php | 262 +- .../FHIRClaimResponseAdjudication.php | 50 +- .../FHIRClaimResponseDetail.php | 91 +- .../FHIRClaimResponseDetail1.php | 150 +- .../FHIRClaimResponseError.php | 67 +- .../FHIRClaimResponseInsurance.php | 68 +- .../FHIRClaimResponseItem.php | 91 +- .../FHIRClaimResponsePayment.php | 87 +- .../FHIRClaimResponseProcessNote.php | 67 +- .../FHIRClaimResponseSubDetail.php | 88 +- .../FHIRClaimResponseSubDetail1.php | 147 +- .../FHIRClaimResponseTotal.php | 29 +- .../FHIRClinicalImpressionFinding.php | 30 +- .../FHIRClinicalImpressionInvestigation.php | 15 +- .../FHIRCodeSystem/FHIRCodeSystemConcept.php | 109 +- .../FHIRCodeSystemDesignation.php | 49 +- .../FHIRCodeSystem/FHIRCodeSystemFilter.php | 100 +- .../FHIRCodeSystem/FHIRCodeSystemProperty.php | 85 +- .../FHIRCodeSystemProperty1.php | 143 +- .../FHIRCommunicationPayload.php | 30 +- .../FHIRCommunicationRequestPayload.php | 30 +- .../FHIRCompartmentDefinitionResource.php | 74 +- .../FHIRCompositionAttester.php | 48 +- .../FHIRComposition/FHIRCompositionEvent.php | 16 +- .../FHIRCompositionRelatesTo.php | 48 +- .../FHIRCompositionSection.php | 61 +- .../FHIRConceptMapDependsOn.php | 86 +- .../FHIRConceptMap/FHIRConceptMapElement.php | 52 +- .../FHIRConceptMap/FHIRConceptMapGroup.php | 91 +- .../FHIRConceptMap/FHIRConceptMapTarget.php | 151 +- .../FHIRConceptMap/FHIRConceptMapUnmapped.php | 85 +- .../FHIRCondition/FHIRConditionEvidence.php | 17 +- .../FHIRCondition/FHIRConditionStage.php | 14 +- .../FHIRConsent/FHIRConsentActor.php | 11 +- .../FHIRConsent/FHIRConsentData.php | 29 +- .../FHIRConsent/FHIRConsentPolicy.php | 47 +- .../FHIRConsent/FHIRConsentProvision.php | 54 +- .../FHIRConsent/FHIRConsentVerification.php | 48 +- .../FHIRContract/FHIRContractAction.php | 260 +- .../FHIRContract/FHIRContractAnswer.php | 183 +- .../FHIRContract/FHIRContractAsset.php | 134 +- .../FHIRContractContentDefinition.php | 69 +- .../FHIRContract/FHIRContractContext.php | 32 +- .../FHIRContract/FHIRContractFriendly.php | 11 +- .../FHIRContract/FHIRContractLegal.php | 11 +- .../FHIRContract/FHIRContractOffer.php | 127 +- .../FHIRContract/FHIRContractParty.php | 13 +- .../FHIRContract/FHIRContractRule.php | 11 +- .../FHIRContractSecurityLabel.php | 45 +- .../FHIRContract/FHIRContractSigner.php | 14 +- .../FHIRContract/FHIRContractSubject.php | 13 +- .../FHIRContract/FHIRContractTerm.php | 84 +- .../FHIRContract/FHIRContractValuedItem.php | 234 +- .../FHIRCoverage/FHIRCoverageClass.php | 49 +- .../FHIRCoverageCostToBeneficiary.php | 51 +- .../FHIRCoverage/FHIRCoverageException.php | 11 +- ...HIRCoverageEligibilityRequestDiagnosis.php | 11 +- ...HIRCoverageEligibilityRequestInsurance.php | 48 +- .../FHIRCoverageEligibilityRequestItem.php | 85 +- ...verageEligibilityRequestSupportingInfo.php | 48 +- ...FHIRCoverageEligibilityResponseBenefit.php | 124 +- .../FHIRCoverageEligibilityResponseError.php | 10 +- ...IRCoverageEligibilityResponseInsurance.php | 35 +- .../FHIRCoverageEligibilityResponseItem.php | 123 +- .../FHIRDetectedIssueEvidence.php | 17 +- .../FHIRDetectedIssueMitigation.php | 30 +- .../FHIRDevice/FHIRDeviceDeviceName.php | 47 +- .../FHIRDevice/FHIRDeviceProperty.php | 46 +- .../FHIRDevice/FHIRDeviceSpecialization.php | 29 +- .../FHIRDevice/FHIRDeviceUdiCarrier.php | 123 +- .../FHIRDevice/FHIRDeviceVersion.php | 49 +- .../FHIRDeviceDefinitionCapability.php | 13 +- .../FHIRDeviceDefinitionDeviceName.php | 47 +- .../FHIRDeviceDefinitionMaterial.php | 48 +- .../FHIRDeviceDefinitionProperty.php | 46 +- .../FHIRDeviceDefinitionSpecialization.php | 47 +- ...HIRDeviceDefinitionUdiDeviceIdentifier.php | 66 +- .../FHIRDeviceMetricCalibration.php | 66 +- .../FHIRDeviceRequestParameter.php | 50 +- .../FHIRDiagnosticReportMedia.php | 29 +- .../FHIRDocumentManifestRelated.php | 29 +- .../FHIRDocumentReferenceContent.php | 11 +- .../FHIRDocumentReferenceContext.php | 22 +- .../FHIRDocumentReferenceRelatesTo.php | 29 +- .../FHIRBackboneElement/FHIRDosage.php | 137 +- .../FHIRDosage/FHIRDosageDoseAndRate.php | 51 +- .../FHIREffectEvidenceSynthesisCertainty.php | 20 +- ...EvidenceSynthesisCertaintySubcomponent.php | 16 +- ...REffectEvidenceSynthesisEffectEstimate.php | 54 +- ...fectEvidenceSynthesisPrecisionEstimate.php | 67 +- ...fectEvidenceSynthesisResultsByExposure.php | 49 +- .../FHIREffectEvidenceSynthesisSampleSize.php | 66 +- .../FHIRElementDefinition.php | 2434 +++++++++++---- .../FHIRElementDefinitionBase.php | 66 +- .../FHIRElementDefinitionBinding.php | 66 +- .../FHIRElementDefinitionConstraint.php | 142 +- .../FHIRElementDefinitionDiscriminator.php | 47 +- .../FHIRElementDefinitionExample.php | 572 +++- .../FHIRElementDefinitionMapping.php | 85 +- .../FHIRElementDefinitionSlicing.php | 71 +- .../FHIRElementDefinitionType.php | 132 +- .../FHIREncounterClassHistory.php | 11 +- .../FHIREncounter/FHIREncounterDiagnosis.php | 30 +- .../FHIREncounterHospitalization.php | 44 +- .../FHIREncounter/FHIREncounterLocation.php | 31 +- .../FHIREncounterParticipant.php | 16 +- .../FHIREncounterStatusHistory.php | 29 +- .../FHIREpisodeOfCareDiagnosis.php | 30 +- .../FHIREpisodeOfCareStatusHistory.php | 29 +- .../FHIREvidenceVariableCharacteristic.php | 158 +- .../FHIRExampleScenarioActor.php | 85 +- .../FHIRExampleScenarioAlternative.php | 52 +- .../FHIRExampleScenarioContainedInstance.php | 47 +- .../FHIRExampleScenarioInstance.php | 79 +- .../FHIRExampleScenarioOperation.php | 163 +- .../FHIRExampleScenarioProcess.php | 90 +- .../FHIRExampleScenarioStep.php | 37 +- .../FHIRExampleScenarioVersion.php | 47 +- .../FHIRExplanationOfBenefitAccident.php | 31 +- .../FHIRExplanationOfBenefitAddItem.php | 260 +- .../FHIRExplanationOfBenefitAdjudication.php | 50 +- ...FHIRExplanationOfBenefitBenefitBalance.php | 75 +- .../FHIRExplanationOfBenefitCareTeam.php | 50 +- .../FHIRExplanationOfBenefitDetail.php | 175 +- .../FHIRExplanationOfBenefitDetail1.php | 150 +- .../FHIRExplanationOfBenefitDiagnosis.php | 37 +- .../FHIRExplanationOfBenefitFinancial.php | 105 +- .../FHIRExplanationOfBenefitInsurance.php | 56 +- .../FHIRExplanationOfBenefitItem.php | 311 +- .../FHIRExplanationOfBenefitPayee.php | 11 +- .../FHIRExplanationOfBenefitPayment.php | 87 +- .../FHIRExplanationOfBenefitProcedure.php | 57 +- .../FHIRExplanationOfBenefitProcessNote.php | 67 +- .../FHIRExplanationOfBenefitRelated.php | 30 +- .../FHIRExplanationOfBenefitSubDetail.php | 172 +- .../FHIRExplanationOfBenefitSubDetail1.php | 147 +- ...FHIRExplanationOfBenefitSupportingInfo.php | 110 +- .../FHIRExplanationOfBenefitTotal.php | 29 +- .../FHIRFamilyMemberHistoryCondition.php | 75 +- .../FHIRGoal/FHIRGoalTarget.php | 129 +- .../FHIRGraphDefinitionCompartment.php | 104 +- .../FHIRGraphDefinitionLink.php | 109 +- .../FHIRGraphDefinitionTarget.php | 74 +- .../FHIRGroup/FHIRGroupCharacteristic.php | 71 +- .../FHIRGroup/FHIRGroupMember.php | 30 +- .../FHIRHealthcareServiceAvailableTime.php | 99 +- .../FHIRHealthcareServiceEligibility.php | 29 +- .../FHIRHealthcareServiceNotAvailable.php | 29 +- .../FHIRImagingStudyInstance.php | 67 +- .../FHIRImagingStudyPerformer.php | 11 +- .../FHIRImagingStudySeries.php | 121 +- .../FHIRImmunizationEducation.php | 85 +- .../FHIRImmunizationPerformer.php | 11 +- .../FHIRImmunizationProtocolApplied.php | 110 +- .../FHIRImmunizationReaction.php | 48 +- ...mmunizationRecommendationDateCriterion.php | 30 +- ...munizationRecommendationRecommendation.php | 175 +- .../FHIRImplementationGuideDefinition.php | 52 +- .../FHIRImplementationGuideDependsOn.php | 66 +- .../FHIRImplementationGuideGlobal.php | 47 +- .../FHIRImplementationGuideGrouping.php | 47 +- .../FHIRImplementationGuideManifest.php | 90 +- .../FHIRImplementationGuidePage.php | 72 +- .../FHIRImplementationGuidePage1.php | 74 +- .../FHIRImplementationGuideParameter.php | 48 +- .../FHIRImplementationGuideResource.php | 138 +- .../FHIRImplementationGuideResource1.php | 67 +- .../FHIRImplementationGuideTemplate.php | 66 +- .../FHIRInsurancePlanBenefit.php | 62 +- .../FHIRInsurancePlanBenefit1.php | 41 +- .../FHIRInsurancePlanContact.php | 45 +- .../FHIRInsurancePlanCost.php | 34 +- .../FHIRInsurancePlanCoverage.php | 16 +- .../FHIRInsurancePlanGeneralCost.php | 67 +- .../FHIRInsurancePlanLimit.php | 30 +- .../FHIRInsurancePlanPlan.php | 53 +- .../FHIRInsurancePlanSpecificCost.php | 13 +- .../FHIRInvoice/FHIRInvoiceLineItem.php | 35 +- .../FHIRInvoice/FHIRInvoiceParticipant.php | 11 +- .../FHIRInvoice/FHIRInvoicePriceComponent.php | 67 +- .../FHIRLinkage/FHIRLinkageItem.php | 29 +- .../FHIRList/FHIRListEntry.php | 49 +- .../FHIRLocationHoursOfOperation.php | 99 +- .../FHIRLocation/FHIRLocationPosition.php | 66 +- .../FHIRMarketingStatus.php | 32 +- .../FHIRMeasure/FHIRMeasureComponent.php | 30 +- .../FHIRMeasure/FHIRMeasureGroup.php | 37 +- .../FHIRMeasure/FHIRMeasurePopulation.php | 30 +- .../FHIRMeasure/FHIRMeasureStratifier.php | 33 +- .../FHIRMeasureSupplementalData.php | 35 +- .../FHIRMeasureReportComponent.php | 17 +- .../FHIRMeasureReportGroup.php | 37 +- .../FHIRMeasureReportPopulation.php | 30 +- .../FHIRMeasureReportPopulation1.php | 30 +- .../FHIRMeasureReportStratifier.php | 45 +- .../FHIRMeasureReportStratum.php | 69 +- .../FHIRMedication/FHIRMedicationBatch.php | 47 +- .../FHIRMedicationIngredient.php | 31 +- .../FHIRMedicationAdministrationDosage.php | 70 +- .../FHIRMedicationAdministrationPerformer.php | 11 +- .../FHIRMedicationDispensePerformer.php | 11 +- .../FHIRMedicationDispenseSubstitution.php | 35 +- ...ationKnowledgeAdministrationGuidelines.php | 47 +- .../FHIRMedicationKnowledgeCost.php | 48 +- .../FHIRMedicationKnowledgeDosage.php | 13 +- ...RMedicationKnowledgeDrugCharacteristic.php | 68 +- .../FHIRMedicationKnowledgeIngredient.php | 31 +- .../FHIRMedicationKnowledgeKinetics.php | 94 +- .../FHIRMedicationKnowledgeMaxDispense.php | 49 +- ...icationKnowledgeMedicineClassification.php | 13 +- ...IRMedicationKnowledgeMonitoringProgram.php | 29 +- .../FHIRMedicationKnowledgeMonograph.php | 11 +- .../FHIRMedicationKnowledgePackaging.php | 29 +- ...icationKnowledgePatientCharacteristics.php | 56 +- .../FHIRMedicationKnowledgeRegulatory.php | 19 +- ...ionKnowledgeRelatedMedicationKnowledge.php | 13 +- .../FHIRMedicationKnowledgeSchedule.php | 10 +- .../FHIRMedicationKnowledgeSubstitution.php | 29 +- .../FHIRMedicationRequestDispenseRequest.php | 92 +- .../FHIRMedicationRequestInitialFill.php | 49 +- .../FHIRMedicationRequestSubstitution.php | 30 +- .../FHIRMedicinalProductCountryLanguage.php | 12 +- ...lProductManufacturingBusinessOperation.php | 53 +- .../FHIRMedicinalProductName.php | 36 +- .../FHIRMedicinalProductNamePart.php | 29 +- ...FHIRMedicinalProductSpecialDesignation.php | 65 +- ...thorizationJurisdictionalAuthorization.php | 46 +- ...MedicinalProductAuthorizationProcedure.php | 54 +- ...nalProductContraindicationOtherTherapy.php | 12 +- ...MedicinalProductIndicationOtherTherapy.php | 12 +- ...inalProductIngredientReferenceStrength.php | 36 +- ...nalProductIngredientSpecifiedSubstance.php | 17 +- ...FHIRMedicinalProductIngredientStrength.php | 42 +- ...HIRMedicinalProductIngredientSubstance.php | 15 +- ...MedicinalProductInteractionInteractant.php | 11 +- ...edicinalProductPackagedBatchIdentifier.php | 47 +- ...HIRMedicinalProductPackagedPackageItem.php | 85 +- ...alProductPharmaceuticalCharacteristics.php | 11 +- ...uctPharmaceuticalRouteOfAdministration.php | 94 +- ...inalProductPharmaceuticalTargetSpecies.php | 43 +- ...lProductPharmaceuticalWithdrawalPeriod.php | 49 +- .../FHIRMessageDefinitionAllowedResponse.php | 47 +- .../FHIRMessageDefinitionFocus.php | 85 +- .../FHIRMessageHeaderDestination.php | 49 +- .../FHIRMessageHeaderResponse.php | 48 +- .../FHIRMessageHeaderSource.php | 104 +- .../FHIRMolecularSequenceInner.php | 47 +- .../FHIRMolecularSequenceOuter.php | 47 +- .../FHIRMolecularSequenceQuality.php | 240 +- .../FHIRMolecularSequenceReferenceSeq.php | 126 +- .../FHIRMolecularSequenceRepository.php | 123 +- .../FHIRMolecularSequenceRoc.php | 198 +- .../FHIRMolecularSequenceStructureVariant.php | 50 +- .../FHIRMolecularSequenceVariant.php | 105 +- .../FHIRNamingSystemUniqueId.php | 87 +- .../FHIRNutritionOrderAdministration.php | 49 +- .../FHIRNutritionOrderEnteralFormula.php | 112 +- .../FHIRNutritionOrderNutrient.php | 29 +- .../FHIRNutritionOrderOralDiet.php | 47 +- .../FHIRNutritionOrderSupplement.php | 70 +- .../FHIRNutritionOrderTexture.php | 11 +- .../FHIRObservationComponent.php | 138 +- .../FHIRObservationReferenceRange.php | 71 +- ...ObservationDefinitionQualifiedInterval.php | 73 +- ...servationDefinitionQuantitativeDetails.php | 49 +- .../FHIROperationDefinitionBinding.php | 47 +- .../FHIROperationDefinitionOverload.php | 55 +- .../FHIROperationDefinitionParameter.php | 176 +- .../FHIROperationDefinitionReferencedFrom.php | 47 +- .../FHIROperationOutcomeIssue.php | 119 +- .../FHIROrganizationContact.php | 45 +- .../FHIRParametersParameter.php | 576 +++- .../FHIRPatient/FHIRPatientCommunication.php | 29 +- .../FHIRPatient/FHIRPatientContact.php | 68 +- .../FHIRPatient/FHIRPatientLink.php | 29 +- .../FHIRPaymentReconciliationDetail.php | 91 +- .../FHIRPaymentReconciliationProcessNote.php | 47 +- .../FHIRPerson/FHIRPersonLink.php | 29 +- .../FHIRPlanDefinitionAction.php | 385 ++- .../FHIRPlanDefinitionCondition.php | 29 +- .../FHIRPlanDefinitionDynamicValue.php | 29 +- .../FHIRPlanDefinitionGoal.php | 24 +- .../FHIRPlanDefinitionParticipant.php | 29 +- .../FHIRPlanDefinitionRelatedAction.php | 69 +- .../FHIRPlanDefinitionTarget.php | 52 +- .../FHIRBackboneElement/FHIRPopulation.php | 14 +- .../FHIRPractitionerQualification.php | 43 +- .../FHIRPractitionerRoleAvailableTime.php | 99 +- .../FHIRPractitionerRoleNotAvailable.php | 29 +- .../FHIRProcedureFocalDevice.php | 11 +- .../FHIRProcedure/FHIRProcedurePerformer.php | 12 +- .../FHIRProdCharacteristic.php | 198 +- .../FHIRProductShelfLife.php | 51 +- .../FHIRProvenance/FHIRProvenanceAgent.php | 15 +- .../FHIRProvenance/FHIRProvenanceEntity.php | 32 +- .../FHIRQuestionnaireAnswerOption.php | 106 +- .../FHIRQuestionnaireEnableWhen.php | 201 +- .../FHIRQuestionnaireInitial.php | 183 +- .../FHIRQuestionnaireItem.php | 239 +- .../FHIRQuestionnaireResponseAnswer.php | 186 +- .../FHIRQuestionnaireResponseItem.php | 76 +- .../FHIRRelatedPersonCommunication.php | 29 +- .../FHIRRequestGroupAction.php | 285 +- .../FHIRRequestGroupCondition.php | 29 +- .../FHIRRequestGroupRelatedAction.php | 69 +- ...esearchElementDefinitionCharacteristic.php | 258 +- .../FHIRResearchStudyArm.php | 48 +- .../FHIRResearchStudyObjective.php | 29 +- .../FHIRRiskAssessmentPrediction.php | 71 +- .../FHIRRiskEvidenceSynthesisCertainty.php | 20 +- ...EvidenceSynthesisCertaintySubcomponent.php | 16 +- ...RiskEvidenceSynthesisPrecisionEstimate.php | 67 +- .../FHIRRiskEvidenceSynthesisRiskEstimate.php | 91 +- .../FHIRRiskEvidenceSynthesisSampleSize.php | 66 +- .../FHIRSearchParameterComponent.php | 47 +- .../FHIRSpecimen/FHIRSpecimenCollection.php | 94 +- .../FHIRSpecimen/FHIRSpecimenContainer.php | 100 +- .../FHIRSpecimen/FHIRSpecimenProcessing.php | 54 +- .../FHIRSpecimenDefinitionAdditive.php | 11 +- .../FHIRSpecimenDefinitionContainer.php | 110 +- .../FHIRSpecimenDefinitionHandling.php | 51 +- .../FHIRSpecimenDefinitionTypeTested.php | 99 +- .../FHIRStructureDefinitionContext.php | 47 +- .../FHIRStructureDefinitionDifferential.php | 14 +- .../FHIRStructureDefinitionMapping.php | 85 +- .../FHIRStructureDefinitionSnapshot.php | 14 +- .../FHIRStructureMapDependent.php | 55 +- .../FHIRStructureMapGroup.php | 93 +- .../FHIRStructureMapInput.php | 85 +- .../FHIRStructureMapParameter.php | 104 +- .../FHIRStructureMap/FHIRStructureMapRule.php | 63 +- .../FHIRStructureMapSource.php | 743 ++++- .../FHIRStructureMapStructure.php | 85 +- .../FHIRStructureMapTarget.php | 159 +- .../FHIRSubscriptionChannel.php | 93 +- .../FHIRSubstance/FHIRSubstanceIngredient.php | 12 +- .../FHIRSubstance/FHIRSubstanceInstance.php | 66 +- .../FHIRSubstanceAmount.php | 69 +- .../FHIRSubstanceAmountReferenceRange.php | 47 +- .../FHIRSubstanceNucleicAcidLinkage.php | 85 +- .../FHIRSubstanceNucleicAcidSubunit.php | 77 +- .../FHIRSubstanceNucleicAcidSugar.php | 66 +- ...SubstancePolymerDegreeOfPolymerisation.php | 11 +- .../FHIRSubstancePolymerMonomerSet.php | 15 +- .../FHIRSubstancePolymerRepeat.php | 51 +- .../FHIRSubstancePolymerRepeatUnit.php | 38 +- .../FHIRSubstancePolymerStartingMaterial.php | 31 +- ...bstancePolymerStructuralRepresentation.php | 30 +- .../FHIRSubstanceProteinSubunit.php | 143 +- ...anceReferenceInformationClassification.php | 19 +- .../FHIRSubstanceReferenceInformationGene.php | 16 +- ...bstanceReferenceInformationGeneElement.php | 32 +- ...HIRSubstanceReferenceInformationTarget.php | 75 +- .../FHIRSubstanceSourceMaterialAuthor.php | 29 +- ...tanceSourceMaterialFractionDescription.php | 29 +- .../FHIRSubstanceSourceMaterialHybrid.php | 86 +- .../FHIRSubstanceSourceMaterialOrganism.php | 37 +- ...SubstanceSourceMaterialOrganismGeneral.php | 13 +- ...SubstanceSourceMaterialPartDescription.php | 11 +- .../FHIRSubstanceSpecificationCode.php | 52 +- .../FHIRSubstanceSpecificationIsotope.php | 50 +- .../FHIRSubstanceSpecificationMoiety.php | 107 +- ...RSubstanceSpecificationMolecularWeight.php | 30 +- .../FHIRSubstanceSpecificationName.php | 74 +- .../FHIRSubstanceSpecificationOfficial.php | 30 +- .../FHIRSubstanceSpecificationProperty.php | 70 +- ...FHIRSubstanceSpecificationRelationship.php | 76 +- ...IRSubstanceSpecificationRepresentation.php | 30 +- .../FHIRSubstanceSpecificationStructure.php | 61 +- .../FHIRSupplyDeliverySuppliedItem.php | 30 +- .../FHIRSupplyRequestParameter.php | 50 +- .../FHIRTask/FHIRTaskInput.php | 554 +++- .../FHIRTask/FHIRTaskOutput.php | 554 +++- .../FHIRTask/FHIRTaskRestriction.php | 34 +- .../FHIRTerminologyCapabilitiesClosure.php | 28 +- .../FHIRTerminologyCapabilitiesCodeSystem.php | 52 +- .../FHIRTerminologyCapabilitiesExpansion.php | 90 +- .../FHIRTerminologyCapabilitiesFilter.php | 55 +- ...RTerminologyCapabilitiesImplementation.php | 47 +- .../FHIRTerminologyCapabilitiesParameter.php | 47 +- .../FHIRTerminologyCapabilitiesSoftware.php | 47 +- ...FHIRTerminologyCapabilitiesTranslation.php | 28 +- ...HIRTerminologyCapabilitiesValidateCode.php | 28 +- .../FHIRTerminologyCapabilitiesVersion.php | 125 +- .../FHIRTestReport/FHIRTestReportAction.php | 11 +- .../FHIRTestReport/FHIRTestReportAction1.php | 11 +- .../FHIRTestReport/FHIRTestReportAction2.php | 10 +- .../FHIRTestReport/FHIRTestReportAssert.php | 66 +- .../FHIRTestReportOperation.php | 66 +- .../FHIRTestReportParticipant.php | 66 +- .../FHIRTestReport/FHIRTestReportSetup.php | 14 +- .../FHIRTestReport/FHIRTestReportTeardown.php | 14 +- .../FHIRTestReport/FHIRTestReportTest.php | 52 +- .../FHIRTestScript/FHIRTestScriptAction.php | 29 +- .../FHIRTestScript/FHIRTestScriptAction1.php | 29 +- .../FHIRTestScript/FHIRTestScriptAction2.php | 10 +- .../FHIRTestScript/FHIRTestScriptAssert.php | 428 ++- .../FHIRTestScriptCapability.php | 158 +- .../FHIRTestScriptDestination.php | 29 +- .../FHIRTestScript/FHIRTestScriptFixture.php | 48 +- .../FHIRTestScript/FHIRTestScriptLink.php | 47 +- .../FHIRTestScript/FHIRTestScriptMetadata.php | 17 +- .../FHIRTestScriptOperation.php | 328 +- .../FHIRTestScript/FHIRTestScriptOrigin.php | 29 +- .../FHIRTestScriptRequestHeader.php | 48 +- .../FHIRTestScript/FHIRTestScriptSetup.php | 14 +- .../FHIRTestScript/FHIRTestScriptTeardown.php | 14 +- .../FHIRTestScript/FHIRTestScriptTest.php | 52 +- .../FHIRTestScript/FHIRTestScriptVariable.php | 161 +- .../FHIRBackboneElement/FHIRTiming.php | 36 +- .../FHIRTiming/FHIRTimingRepeat.php | 326 +- .../FHIRValueSet/FHIRValueSetCompose.php | 57 +- .../FHIRValueSet/FHIRValueSetConcept.php | 80 +- .../FHIRValueSet/FHIRValueSetContains.php | 159 +- .../FHIRValueSet/FHIRValueSetDesignation.php | 49 +- .../FHIRValueSet/FHIRValueSetExpansion.php | 95 +- .../FHIRValueSet/FHIRValueSetFilter.php | 67 +- .../FHIRValueSet/FHIRValueSetInclude.php | 110 +- .../FHIRValueSet/FHIRValueSetParameter.php | 161 +- .../FHIRVerificationResultAttestation.php | 71 +- .../FHIRVerificationResultPrimarySource.php | 42 +- .../FHIRVerificationResultValidator.php | 30 +- ...HIRVisionPrescriptionLensSpecification.php | 227 +- .../FHIRVisionPrescriptionPrism.php | 47 +- .../R4/FHIRElement/FHIRBase64Binary.php | 11 +- .../R4/FHIRElement/FHIRBindingStrength.php | 12 +- ...FHIRBiologicallyDerivedProductCategory.php | 12 +- .../FHIRBiologicallyDerivedProductStatus.php | 12 +- ...BiologicallyDerivedProductStorageScale.php | 12 +- .../R4/FHIRElement/FHIRBoolean.php | 11 +- .../R4/FHIRElement/FHIRBundleType.php | 12 +- .../R4/FHIRElement/FHIRCanonical.php | 11 +- .../FHIRCapabilityStatementKind.php | 12 +- .../FHIRElement/FHIRCarePlanActivityKind.php | 12 +- .../FHIRCarePlanActivityStatus.php | 12 +- .../R4/FHIRElement/FHIRCarePlanIntent.php | 12 +- .../R4/FHIRElement/FHIRCareTeamStatus.php | 12 +- .../FHIRCatalogEntryRelationType.php | 12 +- .../R4/FHIRElement/FHIRChargeItemStatus.php | 12 +- .../FHIRElement/FHIRClaimProcessingCodes.php | 12 +- .../FHIRClinicalImpressionStatus.php | 12 +- .../R4/FHIRElement/FHIRCode.php | 11 +- .../R4/FHIRElement/FHIRCodeSearchSupport.php | 12 +- .../FHIRElement/FHIRCodeSystemContentMode.php | 12 +- .../FHIRCodeSystemHierarchyMeaning.php | 12 +- .../R4/FHIRElement/FHIRCodeableConcept.php | 33 +- .../R4/FHIRElement/FHIRCoding.php | 104 +- .../R4/FHIRElement/FHIRCompartmentType.php | 12 +- .../FHIRCompositionAttestationMode.php | 12 +- .../R4/FHIRElement/FHIRCompositionStatus.php | 12 +- .../FHIRElement/FHIRConceptMapEquivalence.php | 12 +- .../FHIRConceptMapGroupUnmappedMode.php | 12 +- .../FHIRConditionalDeleteStatus.php | 12 +- .../FHIRElement/FHIRConditionalReadStatus.php | 12 +- .../R4/FHIRElement/FHIRConsentDataMeaning.php | 12 +- .../FHIRElement/FHIRConsentProvisionType.php | 12 +- .../R4/FHIRElement/FHIRConsentState.php | 12 +- .../R4/FHIRElement/FHIRConstraintSeverity.php | 12 +- .../R4/FHIRElement/FHIRContactDetail.php | 61 +- .../R4/FHIRElement/FHIRContactPoint.php | 87 +- .../R4/FHIRElement/FHIRContactPointSystem.php | 12 +- .../R4/FHIRElement/FHIRContactPointUse.php | 12 +- ...ContractResourcePublicationStatusCodes.php | 12 +- .../FHIRContractResourceStatusCodes.php | 12 +- .../R4/FHIRElement/FHIRContributor.php | 52 +- .../R4/FHIRElement/FHIRContributorType.php | 12 +- .../R4/FHIRElement/FHIRDataRequirement.php | 112 +- .../FHIRDataRequirementCodeFilter.php | 71 +- .../FHIRDataRequirementDateFilter.php | 88 +- .../FHIRDataRequirementSort.php | 47 +- .../R4/FHIRElement/FHIRDate.php | 11 +- .../R4/FHIRElement/FHIRDateTime.php | 11 +- .../R4/FHIRElement/FHIRDaysOfWeek.php | 12 +- .../R4/FHIRElement/FHIRDecimal.php | 11 +- .../FHIRElement/FHIRDetectedIssueSeverity.php | 12 +- .../FHIRDeviceMetricCalibrationState.php | 12 +- .../FHIRDeviceMetricCalibrationType.php | 12 +- .../FHIRElement/FHIRDeviceMetricCategory.php | 12 +- .../R4/FHIRElement/FHIRDeviceMetricColor.php | 12 +- .../FHIRDeviceMetricOperationalStatus.php | 12 +- .../R4/FHIRElement/FHIRDeviceNameType.php | 12 +- .../FHIRDeviceUseStatementStatus.php | 12 +- .../FHIRDiagnosticReportStatus.php | 12 +- .../R4/FHIRElement/FHIRDiscriminatorType.php | 12 +- .../R4/FHIRElement/FHIRDocumentMode.php | 12 +- .../FHIRDocumentReferenceStatus.php | 12 +- .../FHIRDocumentRelationshipType.php | 12 +- .../FHIREligibilityRequestPurpose.php | 12 +- .../FHIREligibilityResponsePurpose.php | 12 +- .../R4/FHIRElement/FHIREnableWhenBehavior.php | 12 +- .../FHIREncounterLocationStatus.php | 12 +- .../R4/FHIRElement/FHIREncounterStatus.php | 12 +- .../R4/FHIRElement/FHIREndpointStatus.php | 12 +- .../FHIRElement/FHIREpisodeOfCareStatus.php | 12 +- .../FHIRElement/FHIREventCapabilityMode.php | 12 +- .../R4/FHIRElement/FHIREventStatus.php | 12 +- .../R4/FHIRElement/FHIREventTiming.php | 12 +- .../FHIRElement/FHIREvidenceVariableType.php | 12 +- .../FHIRExampleScenarioActorType.php | 12 +- .../FHIRExplanationOfBenefitStatus.php | 12 +- .../R4/FHIRElement/FHIRExposureState.php | 12 +- .../R4/FHIRElement/FHIRExpression.php | 104 +- .../R4/FHIRElement/FHIRExpressionLanguage.php | 12 +- .../R4/FHIRElement/FHIRExtension.php | 556 +++- .../FHIRElement/FHIRExtensionContextType.php | 12 +- .../R4/FHIRElement/FHIRFHIRDeviceStatus.php | 12 +- .../FHIRElement/FHIRFHIRSubstanceStatus.php | 12 +- .../R4/FHIRElement/FHIRFHIRVersion.php | 12 +- .../FHIRElement/FHIRFamilyHistoryStatus.php | 12 +- .../R4/FHIRElement/FHIRFilterOperator.php | 12 +- .../FHIRFinancialResourceStatusCodes.php | 12 +- .../R4/FHIRElement/FHIRFlagStatus.php | 12 +- .../FHIRElement/FHIRGoalLifecycleStatus.php | 12 +- .../FHIRElement/FHIRGraphCompartmentRule.php | 12 +- .../FHIRElement/FHIRGraphCompartmentUse.php | 12 +- .../R4/FHIRElement/FHIRGroupMeasure.php | 12 +- .../R4/FHIRElement/FHIRGroupType.php | 12 +- .../FHIRGuidanceResponseStatus.php | 12 +- .../FHIRElement/FHIRGuidePageGeneration.php | 12 +- .../R4/FHIRElement/FHIRGuideParameterCode.php | 12 +- .../R4/FHIRElement/FHIRHTTPVerb.php | 12 +- .../R4/FHIRElement/FHIRHumanName.php | 146 +- .../R4/FHIRElement/FHIRId.php | 11 +- .../R4/FHIRElement/FHIRIdentifier.php | 70 +- .../R4/FHIRElement/FHIRIdentifierUse.php | 12 +- .../FHIRIdentityAssuranceLevel.php | 12 +- .../R4/FHIRElement/FHIRImagingStudyStatus.php | 12 +- .../FHIRImmunizationEvaluationStatusCodes.php | 12 +- .../FHIRImmunizationStatusCodes.php | 12 +- .../R4/FHIRElement/FHIRInstant.php | 11 +- .../R4/FHIRElement/FHIRInteger.php | 11 +- .../FHIRInvoicePriceComponentType.php | 12 +- .../R4/FHIRElement/FHIRInvoiceStatus.php | 12 +- .../R4/FHIRElement/FHIRIssueSeverity.php | 12 +- .../R4/FHIRElement/FHIRIssueType.php | 12 +- .../R4/FHIRElement/FHIRLinkType.php | 12 +- .../R4/FHIRElement/FHIRLinkageType.php | 12 +- .../R4/FHIRElement/FHIRListMode.php | 12 +- .../R4/FHIRElement/FHIRListStatus.php | 12 +- .../R4/FHIRElement/FHIRLocationMode.php | 12 +- .../R4/FHIRElement/FHIRLocationStatus.php | 12 +- .../R4/FHIRElement/FHIRMarkdown.php | 11 +- .../FHIRElement/FHIRMeasureReportStatus.php | 12 +- .../R4/FHIRElement/FHIRMeasureReportType.php | 12 +- .../FHIRMedicationRequestIntent.php | 12 +- .../FHIRElement/FHIRMedicationStatusCodes.php | 12 +- .../FHIRMedicationrequestStatus.php | 12 +- .../FHIRMessageSignificanceCategory.php | 12 +- .../FHIRMessageheaderResponseRequest.php | 12 +- .../R4/FHIRElement/FHIRMeta.php | 101 +- .../R4/FHIRElement/FHIRMoney.php | 48 +- .../R4/FHIRElement/FHIRNameUse.php | 12 +- .../FHIRNamingSystemIdentifierType.php | 12 +- .../R4/FHIRElement/FHIRNamingSystemType.php | 12 +- .../R4/FHIRElement/FHIRNarrative.php | 31 +- .../R4/FHIRElement/FHIRNarrativeStatus.php | 12 +- .../R4/FHIRElement/FHIRNoteType.php | 12 +- .../FHIRElement/FHIRObservationDataType.php | 12 +- .../FHIRObservationRangeCategory.php | 12 +- .../R4/FHIRElement/FHIRObservationStatus.php | 12 +- .../R4/FHIRElement/FHIROid.php | 11 +- .../R4/FHIRElement/FHIROperationKind.php | 12 +- .../FHIRElement/FHIROperationParameterUse.php | 12 +- .../R4/FHIRElement/FHIROrientationType.php | 12 +- .../FHIRElement/FHIRParameterDefinition.php | 142 +- .../FHIRElement/FHIRParticipantRequired.php | 12 +- .../FHIRElement/FHIRParticipationStatus.php | 12 +- .../R4/FHIRElement/FHIRPeriod.php | 47 +- .../R4/FHIRElement/FHIRPositiveInt.php | 11 +- .../FHIRPropertyRepresentation.php | 12 +- .../R4/FHIRElement/FHIRPropertyType.php | 12 +- .../FHIRElement/FHIRProvenanceEntityRole.php | 12 +- .../R4/FHIRElement/FHIRPublicationStatus.php | 12 +- .../R4/FHIRElement/FHIRQualityType.php | 12 +- .../R4/FHIRElement/FHIRQuantity.php | 105 +- .../R4/FHIRElement/FHIRQuantity/FHIRAge.php | 3 +- .../R4/FHIRElement/FHIRQuantity/FHIRCount.php | 3 +- .../FHIRElement/FHIRQuantity/FHIRDistance.php | 3 +- .../FHIRElement/FHIRQuantity/FHIRDuration.php | 3 +- .../R4/FHIRElement/FHIRQuantityComparator.php | 12 +- .../FHIRQuestionnaireItemOperator.php | 12 +- .../FHIRElement/FHIRQuestionnaireItemType.php | 12 +- .../FHIRQuestionnaireResponseStatus.php | 12 +- .../R4/FHIRElement/FHIRRange.php | 47 +- .../R4/FHIRElement/FHIRRatio.php | 47 +- .../R4/FHIRElement/FHIRReference.php | 85 +- .../FHIRReferenceHandlingPolicy.php | 12 +- .../FHIRElement/FHIRReferenceVersionRules.php | 12 +- .../R4/FHIRElement/FHIRRelatedArtifact.php | 124 +- .../FHIRElement/FHIRRelatedArtifactType.php | 12 +- .../R4/FHIRElement/FHIRRemittanceOutcome.php | 12 +- .../R4/FHIRElement/FHIRRepositoryType.php | 12 +- .../R4/FHIRElement/FHIRRequestIntent.php | 12 +- .../R4/FHIRElement/FHIRRequestPriority.php | 12 +- .../FHIRElement/FHIRRequestResourceType.php | 12 +- .../R4/FHIRElement/FHIRRequestStatus.php | 12 +- .../FHIRElement/FHIRResearchElementType.php | 12 +- .../FHIRElement/FHIRResearchStudyStatus.php | 12 +- .../FHIRElement/FHIRResearchSubjectStatus.php | 12 +- .../FHIRElement/FHIRResourceVersionPolicy.php | 12 +- .../R4/FHIRElement/FHIRResponseType.php | 12 +- .../FHIRElement/FHIRRestfulCapabilityMode.php | 12 +- .../R4/FHIRElement/FHIRSPDXLicense.php | 12 +- .../R4/FHIRElement/FHIRSampledData.php | 142 +- .../FHIRElement/FHIRSampledDataDataType.php | 11 +- .../R4/FHIRElement/FHIRSearchComparator.php | 12 +- .../R4/FHIRElement/FHIRSearchEntryMode.php | 12 +- .../R4/FHIRElement/FHIRSearchModifierCode.php | 12 +- .../R4/FHIRElement/FHIRSearchParamType.php | 12 +- .../R4/FHIRElement/FHIRSequenceType.php | 12 +- .../R4/FHIRElement/FHIRSignature.php | 92 +- .../R4/FHIRElement/FHIRSlicingRules.php | 12 +- .../R4/FHIRElement/FHIRSlotStatus.php | 12 +- .../R4/FHIRElement/FHIRSortDirection.php | 12 +- .../FHIRSpecimenContainedPreference.php | 12 +- .../R4/FHIRElement/FHIRSpecimenStatus.php | 12 +- .../R4/FHIRElement/FHIRStatus.php | 12 +- .../R4/FHIRElement/FHIRStrandType.php | 12 +- .../R4/FHIRElement/FHIRString.php | 11 +- .../FHIRStructureDefinitionKind.php | 12 +- .../FHIRStructureMapContextType.php | 12 +- .../FHIRStructureMapGroupTypeMode.php | 12 +- .../FHIRElement/FHIRStructureMapInputMode.php | 12 +- .../FHIRElement/FHIRStructureMapModelMode.php | 12 +- .../FHIRStructureMapSourceListMode.php | 12 +- .../FHIRStructureMapTargetListMode.php | 12 +- .../FHIRElement/FHIRStructureMapTransform.php | 12 +- .../FHIRSubscriptionChannelType.php | 12 +- .../R4/FHIRElement/FHIRSubscriptionStatus.php | 12 +- .../FHIRElement/FHIRSupplyDeliveryStatus.php | 12 +- .../FHIRElement/FHIRSupplyRequestStatus.php | 12 +- .../FHIRSystemRestfulInteraction.php | 12 +- .../R4/FHIRElement/FHIRTaskIntent.php | 12 +- .../R4/FHIRElement/FHIRTaskStatus.php | 12 +- .../FHIRTestReportActionResult.php | 12 +- .../FHIRTestReportParticipantType.php | 12 +- .../R4/FHIRElement/FHIRTestReportResult.php | 12 +- .../R4/FHIRElement/FHIRTestReportStatus.php | 12 +- .../FHIRTestScriptRequestMethodCode.php | 12 +- .../R4/FHIRElement/FHIRTime.php | 11 +- .../R4/FHIRElement/FHIRTriggerDefinition.php | 93 +- .../R4/FHIRElement/FHIRTriggerType.php | 12 +- .../R4/FHIRElement/FHIRTypeDerivationRule.php | 12 +- .../FHIRTypeRestfulInteraction.php | 12 +- .../R4/FHIRElement/FHIRUDIEntryType.php | 12 +- .../R4/FHIRElement/FHIRUnitsOfTime.php | 12 +- .../R4/FHIRElement/FHIRUnsignedInt.php | 11 +- .../R4/FHIRElement/FHIRUri.php | 11 +- .../R4/FHIRElement/FHIRUrl.php | 11 +- .../R4/FHIRElement/FHIRUsageContext.php | 32 +- .../R4/FHIRElement/FHIRUse.php | 12 +- .../R4/FHIRElement/FHIRUuid.php | 11 +- .../FHIRVConfidentialityClassification.php | 12 +- .../R4/FHIRElement/FHIRVariableType.php | 12 +- .../R4/FHIRElement/FHIRVisionBase.php | 12 +- .../R4/FHIRElement/FHIRVisionEyes.php | 12 +- .../R4/FHIRElement/FHIRXPathUsageType.php | 12 +- .../R4/FHIREligibilityRequestPurposeList.php | 3 +- .../R4/FHIREligibilityResponsePurposeList.php | 3 +- .../R4/FHIREnableWhenBehaviorList.php | 3 +- .../R4/FHIREncounterLocationStatusList.php | 3 +- .../R4/FHIREncounterStatusList.php | 3 +- .../R4/FHIREndpointStatusList.php | 3 +- .../R4/FHIREpisodeOfCareStatusList.php | 3 +- .../R4/FHIREventCapabilityModeList.php | 3 +- .../R4/FHIREventStatusList.php | 3 +- .../R4/FHIREventTimingList.php | 3 +- .../R4/FHIREvidenceVariableTypeList.php | 3 +- .../R4/FHIRExampleScenarioActorTypeList.php | 3 +- .../R4/FHIRExplanationOfBenefitStatusList.php | 3 +- .../R4/FHIRExposureStateList.php | 3 +- .../R4/FHIRExpressionLanguageList.php | 3 +- .../R4/FHIRExtensionContextTypeList.php | 3 +- .../R4/FHIRFHIRDeviceStatusList.php | 3 +- .../R4/FHIRFHIRSubstanceStatusList.php | 3 +- .../R4/FHIRFHIRVersionList.php | 3 +- .../R4/FHIRFamilyHistoryStatusList.php | 3 +- .../R4/FHIRFilterOperatorList.php | 3 +- .../FHIRFinancialResourceStatusCodesList.php | 3 +- .../R4/FHIRFlagStatusList.php | 3 +- .../R4/FHIRGoalLifecycleStatusList.php | 3 +- .../R4/FHIRGraphCompartmentRuleList.php | 3 +- .../R4/FHIRGraphCompartmentUseList.php | 3 +- .../R4/FHIRGroupMeasureList.php | 3 +- .../PHPFHIRGenerated/R4/FHIRGroupTypeList.php | 3 +- .../R4/FHIRGuidanceResponseStatusList.php | 3 +- .../R4/FHIRGuidePageGenerationList.php | 3 +- .../R4/FHIRGuideParameterCodeList.php | 3 +- .../PHPFHIRGenerated/R4/FHIRHTTPVerbList.php | 3 +- .../PHPFHIRGenerated/R4/FHIRIdPrimitive.php | 3 +- .../R4/FHIRIdentifierUseList.php | 3 +- .../R4/FHIRIdentityAssuranceLevelList.php | 3 +- .../R4/FHIRImagingStudyStatusList.php | 3 +- ...RImmunizationEvaluationStatusCodesList.php | 3 +- .../R4/FHIRImmunizationStatusCodesList.php | 3 +- .../R4/FHIRInstantPrimitive.php | 3 +- .../R4/FHIRIntegerPrimitive.php | 3 +- .../R4/FHIRInvoicePriceComponentTypeList.php | 3 +- .../R4/FHIRInvoiceStatusList.php | 3 +- .../R4/FHIRIssueSeverityList.php | 3 +- .../PHPFHIRGenerated/R4/FHIRIssueTypeList.php | 3 +- .../PHPFHIRGenerated/R4/FHIRLinkTypeList.php | 3 +- .../R4/FHIRLinkageTypeList.php | 3 +- .../PHPFHIRGenerated/R4/FHIRListModeList.php | 3 +- .../R4/FHIRListStatusList.php | 3 +- .../R4/FHIRLocationModeList.php | 3 +- .../R4/FHIRLocationStatusList.php | 3 +- .../R4/FHIRMarkdownPrimitive.php | 3 +- .../R4/FHIRMeasureReportStatusList.php | 3 +- .../R4/FHIRMeasureReportTypeList.php | 3 +- .../R4/FHIRMedicationRequestIntentList.php | 3 +- .../R4/FHIRMedicationStatusCodesList.php | 3 +- .../R4/FHIRMedicationrequestStatusList.php | 3 +- .../FHIRMessageSignificanceCategoryList.php | 3 +- .../FHIRMessageheaderResponseRequestList.php | 3 +- .../PHPFHIRGenerated/R4/FHIRNameUseList.php | 3 +- .../R4/FHIRNamingSystemIdentifierTypeList.php | 3 +- .../R4/FHIRNamingSystemTypeList.php | 3 +- .../R4/FHIRNarrativeStatusList.php | 3 +- .../PHPFHIRGenerated/R4/FHIRNoteTypeList.php | 3 +- .../R4/FHIRObservationDataTypeList.php | 3 +- .../R4/FHIRObservationRangeCategoryList.php | 3 +- .../R4/FHIRObservationStatusList.php | 3 +- .../PHPFHIRGenerated/R4/FHIROidPrimitive.php | 3 +- .../R4/FHIROperationKindList.php | 3 +- .../R4/FHIROperationParameterUseList.php | 3 +- .../R4/FHIROrientationTypeList.php | 3 +- .../R4/FHIRParticipantRequiredList.php | 3 +- .../R4/FHIRParticipationStatusList.php | 3 +- .../R4/FHIRPositiveIntPrimitive.php | 3 +- .../R4/FHIRPropertyRepresentationList.php | 3 +- .../R4/FHIRPropertyTypeList.php | 3 +- .../R4/FHIRProvenanceEntityRoleList.php | 3 +- .../R4/FHIRPublicationStatusList.php | 3 +- .../R4/FHIRQualityTypeList.php | 3 +- .../R4/FHIRQuantityComparatorList.php | 3 +- .../R4/FHIRQuestionnaireItemOperatorList.php | 3 +- .../R4/FHIRQuestionnaireItemTypeList.php | 3 +- .../FHIRQuestionnaireResponseStatusList.php | 3 +- .../R4/FHIRReferenceHandlingPolicyList.php | 3 +- .../R4/FHIRReferenceVersionRulesList.php | 3 +- .../R4/FHIRRelatedArtifactTypeList.php | 3 +- .../R4/FHIRRemittanceOutcomeList.php | 3 +- .../R4/FHIRRepositoryTypeList.php | 3 +- .../R4/FHIRRequestIntentList.php | 3 +- .../R4/FHIRRequestPriorityList.php | 3 +- .../R4/FHIRRequestResourceTypeList.php | 3 +- .../R4/FHIRRequestStatusList.php | 3 +- .../R4/FHIRResearchElementTypeList.php | 3 +- .../R4/FHIRResearchStudyStatusList.php | 3 +- .../R4/FHIRResearchSubjectStatusList.php | 3 +- .../PHPFHIRGenerated/R4/FHIRResource.php | 78 +- .../R4/FHIRResource/FHIRBinary.php | 48 +- .../R4/FHIRResource/FHIRBundle.php | 92 +- .../R4/FHIRResource/FHIRDomainResource.php | 16 +- .../FHIRDomainResource/FHIRAccount.php | 114 +- .../FHIRActivityDefinition.php | 610 +++- .../FHIRDomainResource/FHIRAdverseEvent.php | 137 +- .../FHIRAllergyIntolerance.php | 225 +- .../FHIRDomainResource/FHIRAppointment.php | 251 +- .../FHIRAppointmentResponse.php | 123 +- .../FHIRDomainResource/FHIRAuditEvent.php | 102 +- .../FHIRDomainResource/FHIRBasic.php | 62 +- .../FHIRBiologicallyDerivedProduct.php | 114 +- .../FHIRDomainResource/FHIRBodyStructure.php | 87 +- .../FHIRCapabilityStatement.php | 415 ++- .../FHIRDomainResource/FHIRCarePlan.php | 230 +- .../FHIRDomainResource/FHIRCareTeam.php | 134 +- .../FHIRDomainResource/FHIRCatalogEntry.php | 164 +- .../FHIRDomainResource/FHIRChargeItem.php | 266 +- .../FHIRChargeItemDefinition.php | 356 ++- .../FHIRDomainResource/FHIRClaim.php | 154 +- .../FHIRDomainResource/FHIRClaimResponse.php | 220 +- .../FHIRClinicalImpression.php | 192 +- .../FHIRDomainResource/FHIRCodeSystem.php | 453 ++- .../FHIRDomainResource/FHIRCommunication.php | 210 +- .../FHIRCommunicationRequest.php | 196 +- .../FHIRCompartmentDefinition.php | 233 +- .../FHIRDomainResource/FHIRComposition.php | 126 +- .../FHIRDomainResource/FHIRConceptMap.php | 331 +- .../FHIRDomainResource/FHIRCondition.php | 204 +- .../FHIRDomainResource/FHIRConsent.php | 103 +- .../FHIRDomainResource/FHIRContract.php | 270 +- .../FHIRDomainResource/FHIRCoverage.php | 204 +- .../FHIRCoverageEligibilityRequest.php | 148 +- .../FHIRCoverageEligibilityResponse.php | 197 +- .../FHIRDomainResource/FHIRDetectedIssue.php | 150 +- .../FHIRDomainResource/FHIRDevice.php | 327 +- .../FHIRDeviceDefinition.php | 234 +- .../FHIRDomainResource/FHIRDeviceMetric.php | 105 +- .../FHIRDomainResource/FHIRDeviceRequest.php | 248 +- .../FHIRDeviceUseStatement.php | 120 +- .../FHIRDiagnosticReport.php | 154 +- .../FHIRDocumentManifest.php | 153 +- .../FHIRDocumentReference.php | 155 +- .../FHIREffectEvidenceSynthesis.php | 332 +- .../FHIRDomainResource/FHIREncounter.php | 126 +- .../FHIRDomainResource/FHIREndpoint.php | 186 +- .../FHIREnrollmentRequest.php | 82 +- .../FHIREnrollmentResponse.php | 119 +- .../FHIRDomainResource/FHIREpisodeOfCare.php | 83 +- .../FHIREventDefinition.php | 368 ++- .../FHIRDomainResource/FHIREvidence.php | 337 +- .../FHIREvidenceVariable.php | 350 ++- .../FHIRExampleScenario.php | 264 +- .../FHIRExplanationOfBenefit.php | 272 +- .../FHIRFamilyMemberHistory.php | 347 ++- .../FHIRDomainResource/FHIRFlag.php | 67 +- .../FHIRDomainResource/FHIRGoal.php | 142 +- .../FHIRGraphDefinition.php | 236 +- .../FHIRDomainResource/FHIRGroup.php | 145 +- .../FHIRGuidanceResponse.php | 160 +- .../FHIRHealthcareService.php | 237 +- .../FHIRDomainResource/FHIRImagingStudy.php | 173 +- .../FHIRDomainResource/FHIRImmunization.php | 256 +- .../FHIRImmunizationEvaluation.php | 200 +- .../FHIRImmunizationRecommendation.php | 66 +- .../FHIRImplementationGuide.php | 291 +- .../FHIRDomainResource/FHIRInsurancePlan.php | 131 +- .../FHIRDomainResource/FHIRInvoice.php | 173 +- .../FHIRDomainResource/FHIRLibrary.php | 377 ++- .../FHIRDomainResource/FHIRLinkage.php | 34 +- .../FHIRDomainResource/FHIRList.php | 128 +- .../FHIRDomainResource/FHIRLocation.php | 210 +- .../FHIRDomainResource/FHIRMeasure.php | 553 +++- .../FHIRDomainResource/FHIRMeasureReport.php | 126 +- .../FHIRDomainResource/FHIRMedia.php | 216 +- .../FHIRDomainResource/FHIRMedication.php | 67 +- .../FHIRMedicationAdministration.php | 142 +- .../FHIRMedicationDispense.php | 175 +- .../FHIRMedicationKnowledge.php | 141 +- .../FHIRMedicationRequest.php | 273 +- .../FHIRMedicationStatement.php | 130 +- .../FHIRMedicinalProduct.php | 137 +- .../FHIRMedicinalProductAuthorization.php | 135 +- .../FHIRMedicinalProductContraindication.php | 28 +- .../FHIRMedicinalProductIndication.php | 48 +- .../FHIRMedicinalProductIngredient.php | 55 +- .../FHIRMedicinalProductInteraction.php | 38 +- .../FHIRMedicinalProductManufactured.php | 40 +- .../FHIRMedicinalProductPackaged.php | 80 +- .../FHIRMedicinalProductPharmaceutical.php | 54 +- .../FHIRMedicinalProductUndesirableEffect.php | 18 +- .../FHIRMessageDefinition.php | 428 ++- .../FHIRDomainResource/FHIRMessageHeader.php | 61 +- .../FHIRMolecularSequence.php | 159 +- .../FHIRDomainResource/FHIRNamingSystem.php | 208 +- .../FHIRDomainResource/FHIRNutritionOrder.php | 202 +- .../FHIRDomainResource/FHIRObservation.php | 280 +- .../FHIRObservationDefinition.php | 124 +- .../FHIROperationDefinition.php | 435 ++- .../FHIROperationOutcome.php | 14 +- .../FHIRDomainResource/FHIROrganization.php | 153 +- .../FHIROrganizationAffiliation.php | 113 +- .../FHIRDomainResource/FHIRPatient.php | 233 +- .../FHIRDomainResource/FHIRPaymentNotice.php | 123 +- .../FHIRPaymentReconciliation.php | 186 +- .../FHIRDomainResource/FHIRPerson.php | 143 +- .../FHIRDomainResource/FHIRPlanDefinition.php | 399 ++- .../FHIRDomainResource/FHIRPractitioner.php | 147 +- .../FHIRPractitionerRole.php | 135 +- .../FHIRDomainResource/FHIRProcedure.php | 227 +- .../FHIRDomainResource/FHIRProvenance.php | 94 +- .../FHIRDomainResource/FHIRQuestionnaire.php | 363 ++- .../FHIRQuestionnaireResponse.php | 100 +- .../FHIRDomainResource/FHIRRelatedPerson.php | 149 +- .../FHIRDomainResource/FHIRRequestGroup.php | 211 +- .../FHIRResearchDefinition.php | 444 ++- .../FHIRResearchElementDefinition.php | 477 ++- .../FHIRDomainResource/FHIRResearchStudy.php | 147 +- .../FHIRResearchSubject.php | 101 +- .../FHIRDomainResource/FHIRRiskAssessment.php | 123 +- .../FHIRRiskEvidenceSynthesis.php | 316 +- .../FHIRDomainResource/FHIRSchedule.php | 95 +- .../FHIRSearchParameter.php | 491 ++- .../FHIRDomainResource/FHIRServiceRequest.php | 345 +- .../FHIRDomainResource/FHIRSlot.php | 150 +- .../FHIRDomainResource/FHIRSpecimen.php | 120 +- .../FHIRSpecimenDefinition.php | 61 +- .../FHIRStructureDefinition.php | 416 ++- .../FHIRDomainResource/FHIRStructureMap.php | 299 +- .../FHIRDomainResource/FHIRSubscription.php | 138 +- .../FHIRDomainResource/FHIRSubstance.php | 88 +- .../FHIRSubstanceNucleicAcid.php | 54 +- .../FHIRSubstancePolymer.php | 47 +- .../FHIRSubstanceProtein.php | 61 +- .../FHIRSubstanceReferenceInformation.php | 44 +- .../FHIRSubstanceSourceMaterial.php | 146 +- .../FHIRSubstanceSpecification.php | 98 +- .../FHIRDomainResource/FHIRSupplyDelivery.php | 96 +- .../FHIRDomainResource/FHIRSupplyRequest.php | 157 +- .../FHIRDomainResource/FHIRTask.php | 250 +- .../FHIRTerminologyCapabilities.php | 295 +- .../FHIRDomainResource/FHIRTestReport.php | 151 +- .../FHIRDomainResource/FHIRTestScript.php | 277 +- .../FHIRDomainResource/FHIRValueSet.php | 287 +- .../FHIRVerificationResult.php | 131 +- .../FHIRVisionPrescription.php | 103 +- .../R4/FHIRResource/FHIRParameters.php | 14 +- .../R4/FHIRResourceContainer.php | 17 +- .../PHPFHIRGenerated/R4/FHIRResourceType.php | 3 +- .../R4/FHIRResourceTypeList.php | 3 +- .../R4/FHIRResourceVersionPolicyList.php | 3 +- .../R4/FHIRResponseTypeList.php | 3 +- .../R4/FHIRRestfulCapabilityModeList.php | 3 +- .../R4/FHIRSPDXLicenseList.php | 3 +- .../R4/FHIRSampledDataDataTypePrimitive.php | 3 +- .../R4/FHIRSearchComparatorList.php | 3 +- .../R4/FHIRSearchEntryModeList.php | 3 +- .../R4/FHIRSearchModifierCodeList.php | 3 +- .../R4/FHIRSearchParamTypeList.php | 3 +- .../R4/FHIRSequenceTypeList.php | 3 +- .../R4/FHIRSlicingRulesList.php | 3 +- .../R4/FHIRSlotStatusList.php | 3 +- .../R4/FHIRSortDirectionList.php | 3 +- .../FHIRSpecimenContainedPreferenceList.php | 3 +- .../R4/FHIRSpecimenStatusList.php | 3 +- .../PHPFHIRGenerated/R4/FHIRStatusList.php | 3 +- .../R4/FHIRStrandTypeList.php | 3 +- .../R4/FHIRStringPrimitive.php | 3 +- .../R4/FHIRStructureDefinitionKindList.php | 3 +- .../R4/FHIRStructureMapContextTypeList.php | 3 +- .../R4/FHIRStructureMapGroupTypeModeList.php | 3 +- .../R4/FHIRStructureMapInputModeList.php | 3 +- .../R4/FHIRStructureMapModelModeList.php | 3 +- .../R4/FHIRStructureMapSourceListModeList.php | 3 +- .../R4/FHIRStructureMapTargetListModeList.php | 3 +- .../R4/FHIRStructureMapTransformList.php | 3 +- .../R4/FHIRSubscriptionChannelTypeList.php | 3 +- .../R4/FHIRSubscriptionStatusList.php | 3 +- .../R4/FHIRSupplyDeliveryStatusList.php | 3 +- .../R4/FHIRSupplyRequestStatusList.php | 3 +- .../R4/FHIRSystemRestfulInteractionList.php | 3 +- .../R4/FHIRTaskIntentList.php | 3 +- .../R4/FHIRTaskStatusList.php | 3 +- .../R4/FHIRTestReportActionResultList.php | 3 +- .../R4/FHIRTestReportParticipantTypeList.php | 3 +- .../R4/FHIRTestReportResultList.php | 3 +- .../R4/FHIRTestReportStatusList.php | 3 +- .../FHIRTestScriptRequestMethodCodeList.php | 3 +- .../PHPFHIRGenerated/R4/FHIRTimePrimitive.php | 3 +- .../R4/FHIRTriggerTypeList.php | 3 +- .../R4/FHIRTypeDerivationRuleList.php | 3 +- .../R4/FHIRTypeRestfulInteractionList.php | 3 +- .../R4/FHIRUDIEntryTypeList.php | 3 +- .../R4/FHIRUnitsOfTimeList.php | 3 +- .../R4/FHIRUnsignedIntPrimitive.php | 3 +- .../PHPFHIRGenerated/R4/FHIRUriPrimitive.php | 3 +- .../PHPFHIRGenerated/R4/FHIRUrlPrimitive.php | 3 +- .../PHPFHIRGenerated/R4/FHIRUseList.php | 3 +- .../PHPFHIRGenerated/R4/FHIRUuidPrimitive.php | 3 +- ...FHIRVConfidentialityClassificationList.php | 3 +- .../R4/FHIRVariableTypeList.php | 3 +- .../R4/FHIRVisionBaseList.php | 3 +- .../R4/FHIRVisionEyesList.php | 3 +- .../R4/FHIRXPathUsageTypeList.php | 3 +- .../PHPFHIRGenerated/R4/PHPFHIRAutoloader.php | 2 +- .../R4/PHPFHIRCommentContainerInterface.php | 2 +- .../R4/PHPFHIRCommentContainerTrait.php | 4 +- .../PHPFHIRGenerated/R4/PHPFHIRConstants.php | 4 +- .../R4/PHPFHIRContainedTypeInterface.php | 2 +- .../R4/PHPFHIRResponseParser.php | 2 +- .../R4/PHPFHIRResponseParserConfig.php | 2 +- .../FHIRAccountStatusListTest.php | 2 +- .../FHIRActionCardinalityBehaviorListTest.php | 2 +- .../FHIRActionConditionKindListTest.php | 2 +- .../FHIRActionGroupingBehaviorListTest.php | 2 +- .../FHIRActionParticipantTypeListTest.php | 2 +- .../FHIRActionPrecheckBehaviorListTest.php | 2 +- .../FHIRActionRelationshipTypeListTest.php | 2 +- .../FHIRActionRequiredBehaviorListTest.php | 2 +- .../FHIRActionSelectionBehaviorListTest.php | 2 +- .../PHPFHIRTests/FHIRAddressTypeListTest.php | 2 +- .../PHPFHIRTests/FHIRAddressUseListTest.php | 2 +- .../FHIRAdministrativeGenderListTest.php | 2 +- .../FHIRAdverseEventActualityListTest.php | 2 +- .../FHIRAggregationModeListTest.php | 2 +- ...FHIRAllergyIntoleranceCategoryListTest.php | 2 +- ...RAllergyIntoleranceCriticalityListTest.php | 2 +- ...FHIRAllergyIntoleranceSeverityListTest.php | 2 +- .../FHIRAllergyIntoleranceTypeListTest.php | 2 +- .../FHIRAppointmentStatusListTest.php | 2 +- .../FHIRAssertionDirectionTypeListTest.php | 2 +- .../FHIRAssertionOperatorTypeListTest.php | 2 +- .../FHIRAssertionResponseTypesListTest.php | 2 +- .../FHIRAuditEventActionListTest.php | 2 +- ...FHIRAuditEventAgentNetworkTypeListTest.php | 2 +- .../FHIRAuditEventOutcomeListTest.php | 2 +- .../FHIRBase64BinaryPrimitiveTest.php | 2 +- .../FHIRBindingStrengthListTest.php | 2 +- ...ogicallyDerivedProductCategoryListTest.php | 2 +- ...ologicallyDerivedProductStatusListTest.php | 2 +- ...allyDerivedProductStorageScaleListTest.php | 2 +- .../PHPFHIRTests/FHIRBooleanPrimitiveTest.php | 2 +- .../PHPFHIRTests/FHIRBundleTypeListTest.php | 2 +- .../FHIRCanonicalPrimitiveTest.php | 2 +- .../FHIRCapabilityStatementKindListTest.php | 2 +- .../FHIRCarePlanActivityKindListTest.php | 2 +- .../FHIRCarePlanActivityStatusListTest.php | 2 +- .../FHIRCarePlanIntentListTest.php | 2 +- .../FHIRCareTeamStatusListTest.php | 2 +- .../FHIRCatalogEntryRelationTypeListTest.php | 2 +- .../FHIRChargeItemStatusListTest.php | 2 +- .../FHIRClaimProcessingCodesListTest.php | 2 +- .../FHIRClinicalImpressionStatusListTest.php | 2 +- .../R4/PHPFHIRTests/FHIRCodePrimitiveTest.php | 2 +- .../FHIRCodeSearchSupportListTest.php | 2 +- .../FHIRCodeSystemContentModeListTest.php | 2 +- ...FHIRCodeSystemHierarchyMeaningListTest.php | 2 +- .../FHIRCompartmentTypeListTest.php | 2 +- ...FHIRCompositionAttestationModeListTest.php | 2 +- .../FHIRCompositionStatusListTest.php | 2 +- .../FHIRConceptMapEquivalenceListTest.php | 2 +- ...HIRConceptMapGroupUnmappedModeListTest.php | 2 +- .../FHIRConditionalDeleteStatusListTest.php | 2 +- .../FHIRConditionalReadStatusListTest.php | 2 +- .../FHIRConsentDataMeaningListTest.php | 2 +- .../FHIRConsentProvisionTypeListTest.php | 2 +- .../PHPFHIRTests/FHIRConsentStateListTest.php | 2 +- .../FHIRConstraintSeverityListTest.php | 2 +- .../FHIRContactPointSystemListTest.php | 2 +- .../FHIRContactPointUseListTest.php | 2 +- ...ResourcePublicationStatusCodesListTest.php | 2 +- ...HIRContractResourceStatusCodesListTest.php | 2 +- .../FHIRContributorTypeListTest.php | 2 +- .../R4/PHPFHIRTests/FHIRDatePrimitiveTest.php | 2 +- .../FHIRDateTimePrimitiveTest.php | 2 +- .../PHPFHIRTests/FHIRDaysOfWeekListTest.php | 2 +- .../PHPFHIRTests/FHIRDecimalPrimitiveTest.php | 2 +- .../FHIRDetectedIssueSeverityListTest.php | 2 +- ...IRDeviceMetricCalibrationStateListTest.php | 2 +- ...HIRDeviceMetricCalibrationTypeListTest.php | 2 +- .../FHIRDeviceMetricCategoryListTest.php | 2 +- .../FHIRDeviceMetricColorListTest.php | 2 +- ...RDeviceMetricOperationalStatusListTest.php | 2 +- .../FHIRDeviceNameTypeListTest.php | 2 +- .../FHIRDeviceUseStatementStatusListTest.php | 2 +- .../FHIRDiagnosticReportStatusListTest.php | 2 +- .../FHIRDiscriminatorTypeListTest.php | 2 +- .../PHPFHIRTests/FHIRDocumentModeListTest.php | 2 +- .../FHIRDocumentReferenceStatusListTest.php | 2 +- .../FHIRDocumentRelationshipTypeListTest.php | 2 +- .../FHIRElement/FHIRAccountStatusTest.php | 2 +- .../FHIRActionCardinalityBehaviorTest.php | 2 +- .../FHIRActionConditionKindTest.php | 2 +- .../FHIRActionGroupingBehaviorTest.php | 2 +- .../FHIRActionParticipantTypeTest.php | 2 +- .../FHIRActionPrecheckBehaviorTest.php | 2 +- .../FHIRActionRelationshipTypeTest.php | 2 +- .../FHIRActionRequiredBehaviorTest.php | 2 +- .../FHIRActionSelectionBehaviorTest.php | 2 +- .../FHIRElement/FHIRAddressTest.php | 2 +- .../FHIRElement/FHIRAddressTypeTest.php | 2 +- .../FHIRElement/FHIRAddressUseTest.php | 2 +- .../FHIRAdministrativeGenderTest.php | 2 +- .../FHIRAdverseEventActualityTest.php | 2 +- .../FHIRElement/FHIRAggregationModeTest.php | 2 +- .../FHIRAllergyIntoleranceCategoryTest.php | 2 +- .../FHIRAllergyIntoleranceCriticalityTest.php | 2 +- .../FHIRAllergyIntoleranceSeverityTest.php | 2 +- .../FHIRAllergyIntoleranceTypeTest.php | 2 +- .../FHIRElement/FHIRAnnotationTest.php | 2 +- .../FHIRElement/FHIRAppointmentStatusTest.php | 2 +- .../FHIRAssertionDirectionTypeTest.php | 2 +- .../FHIRAssertionOperatorTypeTest.php | 2 +- .../FHIRAssertionResponseTypesTest.php | 2 +- .../FHIRElement/FHIRAttachmentTest.php | 2 +- .../FHIRElement/FHIRAuditEventActionTest.php | 2 +- .../FHIRAuditEventAgentNetworkTypeTest.php | 2 +- .../FHIRElement/FHIRAuditEventOutcomeTest.php | 2 +- .../FHIRAccount/FHIRAccountCoverageTest.php | 2 +- .../FHIRAccount/FHIRAccountGuarantorTest.php | 2 +- ...FHIRActivityDefinitionDynamicValueTest.php | 2 +- .../FHIRActivityDefinitionParticipantTest.php | 2 +- .../FHIRAdverseEventCausalityTest.php | 2 +- .../FHIRAdverseEventSuspectEntityTest.php | 2 +- .../FHIRAllergyIntoleranceReactionTest.php | 2 +- .../FHIRAppointmentParticipantTest.php | 2 +- .../FHIRAuditEventAgentTest.php | 2 +- .../FHIRAuditEventDetailTest.php | 2 +- .../FHIRAuditEventEntityTest.php | 2 +- .../FHIRAuditEventNetworkTest.php | 2 +- .../FHIRAuditEventSourceTest.php | 2 +- ...ologicallyDerivedProductCollectionTest.php | 2 +- ...ogicallyDerivedProductManipulationTest.php | 2 +- ...ologicallyDerivedProductProcessingTest.php | 2 +- ...RBiologicallyDerivedProductStorageTest.php | 2 +- .../FHIRBundle/FHIRBundleEntryTest.php | 2 +- .../FHIRBundle/FHIRBundleLinkTest.php | 2 +- .../FHIRBundle/FHIRBundleRequestTest.php | 2 +- .../FHIRBundle/FHIRBundleResponseTest.php | 2 +- .../FHIRBundle/FHIRBundleSearchTest.php | 2 +- .../FHIRCapabilityStatementDocumentTest.php | 2 +- .../FHIRCapabilityStatementEndpointTest.php | 2 +- ...RCapabilityStatementImplementationTest.php | 2 +- ...HIRCapabilityStatementInteraction1Test.php | 2 +- ...FHIRCapabilityStatementInteractionTest.php | 2 +- .../FHIRCapabilityStatementMessagingTest.php | 2 +- .../FHIRCapabilityStatementOperationTest.php | 2 +- .../FHIRCapabilityStatementResourceTest.php | 2 +- .../FHIRCapabilityStatementRestTest.php | 2 +- ...FHIRCapabilityStatementSearchParamTest.php | 2 +- .../FHIRCapabilityStatementSecurityTest.php | 2 +- .../FHIRCapabilityStatementSoftwareTest.php | 2 +- ...apabilityStatementSupportedMessageTest.php | 2 +- .../FHIRCarePlan/FHIRCarePlanActivityTest.php | 2 +- .../FHIRCarePlan/FHIRCarePlanDetailTest.php | 2 +- .../FHIRCareTeamParticipantTest.php | 2 +- .../FHIRCatalogEntryRelatedEntryTest.php | 2 +- .../FHIRChargeItemPerformerTest.php | 2 +- ...RChargeItemDefinitionApplicabilityTest.php | 2 +- ...ChargeItemDefinitionPriceComponentTest.php | 2 +- ...RChargeItemDefinitionPropertyGroupTest.php | 2 +- .../FHIRClaim/FHIRClaimAccidentTest.php | 2 +- .../FHIRClaim/FHIRClaimCareTeamTest.php | 2 +- .../FHIRClaim/FHIRClaimDetailTest.php | 2 +- .../FHIRClaim/FHIRClaimDiagnosisTest.php | 2 +- .../FHIRClaim/FHIRClaimInsuranceTest.php | 2 +- .../FHIRClaim/FHIRClaimItemTest.php | 2 +- .../FHIRClaim/FHIRClaimPayeeTest.php | 2 +- .../FHIRClaim/FHIRClaimProcedureTest.php | 2 +- .../FHIRClaim/FHIRClaimRelatedTest.php | 2 +- .../FHIRClaim/FHIRClaimSubDetailTest.php | 2 +- .../FHIRClaim/FHIRClaimSupportingInfoTest.php | 2 +- .../FHIRClaimResponseAddItemTest.php | 2 +- .../FHIRClaimResponseAdjudicationTest.php | 2 +- .../FHIRClaimResponseDetail1Test.php | 2 +- .../FHIRClaimResponseDetailTest.php | 2 +- .../FHIRClaimResponseErrorTest.php | 2 +- .../FHIRClaimResponseInsuranceTest.php | 2 +- .../FHIRClaimResponseItemTest.php | 2 +- .../FHIRClaimResponsePaymentTest.php | 2 +- .../FHIRClaimResponseProcessNoteTest.php | 2 +- .../FHIRClaimResponseSubDetail1Test.php | 2 +- .../FHIRClaimResponseSubDetailTest.php | 2 +- .../FHIRClaimResponseTotalTest.php | 2 +- .../FHIRClinicalImpressionFindingTest.php | 2 +- ...HIRClinicalImpressionInvestigationTest.php | 2 +- .../FHIRCodeSystemConceptTest.php | 2 +- .../FHIRCodeSystemDesignationTest.php | 2 +- .../FHIRCodeSystemFilterTest.php | 2 +- .../FHIRCodeSystemProperty1Test.php | 2 +- .../FHIRCodeSystemPropertyTest.php | 2 +- .../FHIRCommunicationPayloadTest.php | 2 +- .../FHIRCommunicationRequestPayloadTest.php | 2 +- .../FHIRCompartmentDefinitionResourceTest.php | 2 +- .../FHIRCompositionAttesterTest.php | 2 +- .../FHIRCompositionEventTest.php | 2 +- .../FHIRCompositionRelatesToTest.php | 2 +- .../FHIRCompositionSectionTest.php | 2 +- .../FHIRConceptMapDependsOnTest.php | 2 +- .../FHIRConceptMapElementTest.php | 2 +- .../FHIRConceptMapGroupTest.php | 2 +- .../FHIRConceptMapTargetTest.php | 2 +- .../FHIRConceptMapUnmappedTest.php | 2 +- .../FHIRConditionEvidenceTest.php | 2 +- .../FHIRCondition/FHIRConditionStageTest.php | 2 +- .../FHIRConsent/FHIRConsentActorTest.php | 2 +- .../FHIRConsent/FHIRConsentDataTest.php | 2 +- .../FHIRConsent/FHIRConsentPolicyTest.php | 2 +- .../FHIRConsent/FHIRConsentProvisionTest.php | 2 +- .../FHIRConsentVerificationTest.php | 2 +- .../FHIRContract/FHIRContractActionTest.php | 2 +- .../FHIRContract/FHIRContractAnswerTest.php | 2 +- .../FHIRContract/FHIRContractAssetTest.php | 2 +- .../FHIRContractContentDefinitionTest.php | 2 +- .../FHIRContract/FHIRContractContextTest.php | 2 +- .../FHIRContract/FHIRContractFriendlyTest.php | 2 +- .../FHIRContract/FHIRContractLegalTest.php | 2 +- .../FHIRContract/FHIRContractOfferTest.php | 2 +- .../FHIRContract/FHIRContractPartyTest.php | 2 +- .../FHIRContract/FHIRContractRuleTest.php | 2 +- .../FHIRContractSecurityLabelTest.php | 2 +- .../FHIRContract/FHIRContractSignerTest.php | 2 +- .../FHIRContract/FHIRContractSubjectTest.php | 2 +- .../FHIRContract/FHIRContractTermTest.php | 2 +- .../FHIRContractValuedItemTest.php | 2 +- .../FHIRCoverage/FHIRCoverageClassTest.php | 2 +- .../FHIRCoverageCostToBeneficiaryTest.php | 2 +- .../FHIRCoverageExceptionTest.php | 2 +- ...overageEligibilityRequestDiagnosisTest.php | 2 +- ...overageEligibilityRequestInsuranceTest.php | 2 +- ...FHIRCoverageEligibilityRequestItemTest.php | 2 +- ...geEligibilityRequestSupportingInfoTest.php | 2 +- ...CoverageEligibilityResponseBenefitTest.php | 2 +- ...IRCoverageEligibilityResponseErrorTest.php | 2 +- ...verageEligibilityResponseInsuranceTest.php | 2 +- ...HIRCoverageEligibilityResponseItemTest.php | 2 +- .../FHIRDetectedIssueEvidenceTest.php | 2 +- .../FHIRDetectedIssueMitigationTest.php | 2 +- .../FHIRDevice/FHIRDeviceDeviceNameTest.php | 2 +- .../FHIRDevice/FHIRDevicePropertyTest.php | 2 +- .../FHIRDeviceSpecializationTest.php | 2 +- .../FHIRDevice/FHIRDeviceUdiCarrierTest.php | 2 +- .../FHIRDevice/FHIRDeviceVersionTest.php | 2 +- .../FHIRDeviceDefinitionCapabilityTest.php | 2 +- .../FHIRDeviceDefinitionDeviceNameTest.php | 2 +- .../FHIRDeviceDefinitionMaterialTest.php | 2 +- .../FHIRDeviceDefinitionPropertyTest.php | 2 +- ...FHIRDeviceDefinitionSpecializationTest.php | 2 +- ...eviceDefinitionUdiDeviceIdentifierTest.php | 2 +- .../FHIRDeviceMetricCalibrationTest.php | 2 +- .../FHIRDeviceRequestParameterTest.php | 2 +- .../FHIRDiagnosticReportMediaTest.php | 2 +- .../FHIRDocumentManifestRelatedTest.php | 2 +- .../FHIRDocumentReferenceContentTest.php | 2 +- .../FHIRDocumentReferenceContextTest.php | 2 +- .../FHIRDocumentReferenceRelatesToTest.php | 2 +- .../FHIRDosage/FHIRDosageDoseAndRateTest.php | 2 +- .../FHIRBackboneElement/FHIRDosageTest.php | 2 +- ...enceSynthesisCertaintySubcomponentTest.php | 2 +- ...IREffectEvidenceSynthesisCertaintyTest.php | 2 +- ...ectEvidenceSynthesisEffectEstimateTest.php | 2 +- ...EvidenceSynthesisPrecisionEstimateTest.php | 2 +- ...EvidenceSynthesisResultsByExposureTest.php | 2 +- ...REffectEvidenceSynthesisSampleSizeTest.php | 2 +- .../FHIRElementDefinitionBaseTest.php | 2 +- .../FHIRElementDefinitionBindingTest.php | 2 +- .../FHIRElementDefinitionConstraintTest.php | 2 +- ...FHIRElementDefinitionDiscriminatorTest.php | 2 +- .../FHIRElementDefinitionExampleTest.php | 2 +- .../FHIRElementDefinitionMappingTest.php | 2 +- .../FHIRElementDefinitionSlicingTest.php | 2 +- .../FHIRElementDefinitionTypeTest.php | 2 +- .../FHIRElementDefinitionTest.php | 2 +- .../FHIREncounterClassHistoryTest.php | 2 +- .../FHIREncounterDiagnosisTest.php | 2 +- .../FHIREncounterHospitalizationTest.php | 2 +- .../FHIREncounterLocationTest.php | 2 +- .../FHIREncounterParticipantTest.php | 2 +- .../FHIREncounterStatusHistoryTest.php | 2 +- .../FHIREpisodeOfCareDiagnosisTest.php | 2 +- .../FHIREpisodeOfCareStatusHistoryTest.php | 2 +- ...FHIREvidenceVariableCharacteristicTest.php | 2 +- .../FHIRExampleScenarioActorTest.php | 2 +- .../FHIRExampleScenarioAlternativeTest.php | 2 +- ...IRExampleScenarioContainedInstanceTest.php | 2 +- .../FHIRExampleScenarioInstanceTest.php | 2 +- .../FHIRExampleScenarioOperationTest.php | 2 +- .../FHIRExampleScenarioProcessTest.php | 2 +- .../FHIRExampleScenarioStepTest.php | 2 +- .../FHIRExampleScenarioVersionTest.php | 2 +- .../FHIRExplanationOfBenefitAccidentTest.php | 2 +- .../FHIRExplanationOfBenefitAddItemTest.php | 2 +- ...IRExplanationOfBenefitAdjudicationTest.php | 2 +- ...ExplanationOfBenefitBenefitBalanceTest.php | 2 +- .../FHIRExplanationOfBenefitCareTeamTest.php | 2 +- .../FHIRExplanationOfBenefitDetail1Test.php | 2 +- .../FHIRExplanationOfBenefitDetailTest.php | 2 +- .../FHIRExplanationOfBenefitDiagnosisTest.php | 2 +- .../FHIRExplanationOfBenefitFinancialTest.php | 2 +- .../FHIRExplanationOfBenefitInsuranceTest.php | 2 +- .../FHIRExplanationOfBenefitItemTest.php | 2 +- .../FHIRExplanationOfBenefitPayeeTest.php | 2 +- .../FHIRExplanationOfBenefitPaymentTest.php | 2 +- .../FHIRExplanationOfBenefitProcedureTest.php | 2 +- ...HIRExplanationOfBenefitProcessNoteTest.php | 2 +- .../FHIRExplanationOfBenefitRelatedTest.php | 2 +- ...FHIRExplanationOfBenefitSubDetail1Test.php | 2 +- .../FHIRExplanationOfBenefitSubDetailTest.php | 2 +- ...ExplanationOfBenefitSupportingInfoTest.php | 2 +- .../FHIRExplanationOfBenefitTotalTest.php | 2 +- .../FHIRFamilyMemberHistoryConditionTest.php | 2 +- .../FHIRGoal/FHIRGoalTargetTest.php | 2 +- .../FHIRGraphDefinitionCompartmentTest.php | 2 +- .../FHIRGraphDefinitionLinkTest.php | 2 +- .../FHIRGraphDefinitionTargetTest.php | 2 +- .../FHIRGroup/FHIRGroupCharacteristicTest.php | 2 +- .../FHIRGroup/FHIRGroupMemberTest.php | 2 +- ...FHIRHealthcareServiceAvailableTimeTest.php | 2 +- .../FHIRHealthcareServiceEligibilityTest.php | 2 +- .../FHIRHealthcareServiceNotAvailableTest.php | 2 +- .../FHIRImagingStudyInstanceTest.php | 2 +- .../FHIRImagingStudyPerformerTest.php | 2 +- .../FHIRImagingStudySeriesTest.php | 2 +- .../FHIRImmunizationEducationTest.php | 2 +- .../FHIRImmunizationPerformerTest.php | 2 +- .../FHIRImmunizationProtocolAppliedTest.php | 2 +- .../FHIRImmunizationReactionTest.php | 2 +- ...izationRecommendationDateCriterionTest.php | 2 +- ...zationRecommendationRecommendationTest.php | 2 +- .../FHIRImplementationGuideDefinitionTest.php | 2 +- .../FHIRImplementationGuideDependsOnTest.php | 2 +- .../FHIRImplementationGuideGlobalTest.php | 2 +- .../FHIRImplementationGuideGroupingTest.php | 2 +- .../FHIRImplementationGuideManifestTest.php | 2 +- .../FHIRImplementationGuidePage1Test.php | 2 +- .../FHIRImplementationGuidePageTest.php | 2 +- .../FHIRImplementationGuideParameterTest.php | 2 +- .../FHIRImplementationGuideResource1Test.php | 2 +- .../FHIRImplementationGuideResourceTest.php | 2 +- .../FHIRImplementationGuideTemplateTest.php | 2 +- .../FHIRInsurancePlanBenefit1Test.php | 2 +- .../FHIRInsurancePlanBenefitTest.php | 2 +- .../FHIRInsurancePlanContactTest.php | 2 +- .../FHIRInsurancePlanCostTest.php | 2 +- .../FHIRInsurancePlanCoverageTest.php | 2 +- .../FHIRInsurancePlanGeneralCostTest.php | 2 +- .../FHIRInsurancePlanLimitTest.php | 2 +- .../FHIRInsurancePlanPlanTest.php | 2 +- .../FHIRInsurancePlanSpecificCostTest.php | 2 +- .../FHIRInvoice/FHIRInvoiceLineItemTest.php | 2 +- .../FHIRInvoiceParticipantTest.php | 2 +- .../FHIRInvoicePriceComponentTest.php | 2 +- .../FHIRLinkage/FHIRLinkageItemTest.php | 2 +- .../FHIRList/FHIRListEntryTest.php | 2 +- .../FHIRLocationHoursOfOperationTest.php | 2 +- .../FHIRLocation/FHIRLocationPositionTest.php | 2 +- .../FHIRMarketingStatusTest.php | 2 +- .../FHIRMeasure/FHIRMeasureComponentTest.php | 2 +- .../FHIRMeasure/FHIRMeasureGroupTest.php | 2 +- .../FHIRMeasure/FHIRMeasurePopulationTest.php | 2 +- .../FHIRMeasure/FHIRMeasureStratifierTest.php | 2 +- .../FHIRMeasureSupplementalDataTest.php | 2 +- .../FHIRMeasureReportComponentTest.php | 2 +- .../FHIRMeasureReportGroupTest.php | 2 +- .../FHIRMeasureReportPopulation1Test.php | 2 +- .../FHIRMeasureReportPopulationTest.php | 2 +- .../FHIRMeasureReportStratifierTest.php | 2 +- .../FHIRMeasureReportStratumTest.php | 2 +- .../FHIRMedicationBatchTest.php | 2 +- .../FHIRMedicationIngredientTest.php | 2 +- ...FHIRMedicationAdministrationDosageTest.php | 2 +- ...RMedicationAdministrationPerformerTest.php | 2 +- .../FHIRMedicationDispensePerformerTest.php | 2 +- ...FHIRMedicationDispenseSubstitutionTest.php | 2 +- ...nKnowledgeAdministrationGuidelinesTest.php | 2 +- .../FHIRMedicationKnowledgeCostTest.php | 2 +- .../FHIRMedicationKnowledgeDosageTest.php | 2 +- ...icationKnowledgeDrugCharacteristicTest.php | 2 +- .../FHIRMedicationKnowledgeIngredientTest.php | 2 +- .../FHIRMedicationKnowledgeKineticsTest.php | 2 +- ...FHIRMedicationKnowledgeMaxDispenseTest.php | 2 +- ...ionKnowledgeMedicineClassificationTest.php | 2 +- ...dicationKnowledgeMonitoringProgramTest.php | 2 +- .../FHIRMedicationKnowledgeMonographTest.php | 2 +- .../FHIRMedicationKnowledgePackagingTest.php | 2 +- ...ionKnowledgePatientCharacteristicsTest.php | 2 +- .../FHIRMedicationKnowledgeRegulatoryTest.php | 2 +- ...nowledgeRelatedMedicationKnowledgeTest.php | 2 +- .../FHIRMedicationKnowledgeScheduleTest.php | 2 +- ...HIRMedicationKnowledgeSubstitutionTest.php | 2 +- ...IRMedicationRequestDispenseRequestTest.php | 2 +- .../FHIRMedicationRequestInitialFillTest.php | 2 +- .../FHIRMedicationRequestSubstitutionTest.php | 2 +- ...HIRMedicinalProductCountryLanguageTest.php | 2 +- ...ductManufacturingBusinessOperationTest.php | 2 +- .../FHIRMedicinalProductNamePartTest.php | 2 +- .../FHIRMedicinalProductNameTest.php | 2 +- ...MedicinalProductSpecialDesignationTest.php | 2 +- ...izationJurisdictionalAuthorizationTest.php | 2 +- ...cinalProductAuthorizationProcedureTest.php | 2 +- ...roductContraindicationOtherTherapyTest.php | 2 +- ...cinalProductIndicationOtherTherapyTest.php | 2 +- ...ProductIngredientReferenceStrengthTest.php | 2 +- ...roductIngredientSpecifiedSubstanceTest.php | 2 +- ...MedicinalProductIngredientStrengthTest.php | 2 +- ...edicinalProductIngredientSubstanceTest.php | 2 +- ...cinalProductInteractionInteractantTest.php | 2 +- ...inalProductPackagedBatchIdentifierTest.php | 2 +- ...edicinalProductPackagedPackageItemTest.php | 2 +- ...oductPharmaceuticalCharacteristicsTest.php | 2 +- ...harmaceuticalRouteOfAdministrationTest.php | 2 +- ...ProductPharmaceuticalTargetSpeciesTest.php | 2 +- ...ductPharmaceuticalWithdrawalPeriodTest.php | 2 +- ...IRMessageDefinitionAllowedResponseTest.php | 2 +- .../FHIRMessageDefinitionFocusTest.php | 2 +- .../FHIRMessageHeaderDestinationTest.php | 2 +- .../FHIRMessageHeaderResponseTest.php | 2 +- .../FHIRMessageHeaderSourceTest.php | 2 +- .../FHIRMolecularSequenceInnerTest.php | 2 +- .../FHIRMolecularSequenceOuterTest.php | 2 +- .../FHIRMolecularSequenceQualityTest.php | 2 +- .../FHIRMolecularSequenceReferenceSeqTest.php | 2 +- .../FHIRMolecularSequenceRepositoryTest.php | 2 +- .../FHIRMolecularSequenceRocTest.php | 2 +- ...RMolecularSequenceStructureVariantTest.php | 2 +- .../FHIRMolecularSequenceVariantTest.php | 2 +- .../FHIRNamingSystemUniqueIdTest.php | 2 +- .../FHIRNutritionOrderAdministrationTest.php | 2 +- .../FHIRNutritionOrderEnteralFormulaTest.php | 2 +- .../FHIRNutritionOrderNutrientTest.php | 2 +- .../FHIRNutritionOrderOralDietTest.php | 2 +- .../FHIRNutritionOrderSupplementTest.php | 2 +- .../FHIRNutritionOrderTextureTest.php | 2 +- .../FHIRObservationComponentTest.php | 2 +- .../FHIRObservationReferenceRangeTest.php | 2 +- ...rvationDefinitionQualifiedIntervalTest.php | 2 +- ...ationDefinitionQuantitativeDetailsTest.php | 2 +- .../FHIROperationDefinitionBindingTest.php | 2 +- .../FHIROperationDefinitionOverloadTest.php | 2 +- .../FHIROperationDefinitionParameterTest.php | 2 +- ...ROperationDefinitionReferencedFromTest.php | 2 +- .../FHIROperationOutcomeIssueTest.php | 2 +- .../FHIROrganizationContactTest.php | 2 +- .../FHIRParametersParameterTest.php | 2 +- .../FHIRPatientCommunicationTest.php | 2 +- .../FHIRPatient/FHIRPatientContactTest.php | 2 +- .../FHIRPatient/FHIRPatientLinkTest.php | 2 +- .../FHIRPaymentReconciliationDetailTest.php | 2 +- ...IRPaymentReconciliationProcessNoteTest.php | 2 +- .../FHIRPerson/FHIRPersonLinkTest.php | 2 +- .../FHIRPlanDefinitionActionTest.php | 2 +- .../FHIRPlanDefinitionConditionTest.php | 2 +- .../FHIRPlanDefinitionDynamicValueTest.php | 2 +- .../FHIRPlanDefinitionGoalTest.php | 2 +- .../FHIRPlanDefinitionParticipantTest.php | 2 +- .../FHIRPlanDefinitionRelatedActionTest.php | 2 +- .../FHIRPlanDefinitionTargetTest.php | 2 +- .../FHIRPopulationTest.php | 2 +- .../FHIRPractitionerQualificationTest.php | 2 +- .../FHIRPractitionerRoleAvailableTimeTest.php | 2 +- .../FHIRPractitionerRoleNotAvailableTest.php | 2 +- .../FHIRProcedureFocalDeviceTest.php | 2 +- .../FHIRProcedurePerformerTest.php | 2 +- .../FHIRProdCharacteristicTest.php | 2 +- .../FHIRProductShelfLifeTest.php | 2 +- .../FHIRProvenanceAgentTest.php | 2 +- .../FHIRProvenanceEntityTest.php | 2 +- .../FHIRQuestionnaireAnswerOptionTest.php | 2 +- .../FHIRQuestionnaireEnableWhenTest.php | 2 +- .../FHIRQuestionnaireInitialTest.php | 2 +- .../FHIRQuestionnaireItemTest.php | 2 +- .../FHIRQuestionnaireResponseAnswerTest.php | 2 +- .../FHIRQuestionnaireResponseItemTest.php | 2 +- .../FHIRRelatedPersonCommunicationTest.php | 2 +- .../FHIRRequestGroupActionTest.php | 2 +- .../FHIRRequestGroupConditionTest.php | 2 +- .../FHIRRequestGroupRelatedActionTest.php | 2 +- ...rchElementDefinitionCharacteristicTest.php | 2 +- .../FHIRResearchStudyArmTest.php | 2 +- .../FHIRResearchStudyObjectiveTest.php | 2 +- .../FHIRRiskAssessmentPredictionTest.php | 2 +- ...enceSynthesisCertaintySubcomponentTest.php | 2 +- ...FHIRRiskEvidenceSynthesisCertaintyTest.php | 2 +- ...EvidenceSynthesisPrecisionEstimateTest.php | 2 +- ...RRiskEvidenceSynthesisRiskEstimateTest.php | 2 +- ...HIRRiskEvidenceSynthesisSampleSizeTest.php | 2 +- .../FHIRSearchParameterComponentTest.php | 2 +- .../FHIRSpecimenCollectionTest.php | 2 +- .../FHIRSpecimenContainerTest.php | 2 +- .../FHIRSpecimenProcessingTest.php | 2 +- .../FHIRSpecimenDefinitionAdditiveTest.php | 2 +- .../FHIRSpecimenDefinitionContainerTest.php | 2 +- .../FHIRSpecimenDefinitionHandlingTest.php | 2 +- .../FHIRSpecimenDefinitionTypeTestedTest.php | 2 +- .../FHIRStructureDefinitionContextTest.php | 2 +- ...HIRStructureDefinitionDifferentialTest.php | 2 +- .../FHIRStructureDefinitionMappingTest.php | 2 +- .../FHIRStructureDefinitionSnapshotTest.php | 2 +- .../FHIRStructureMapDependentTest.php | 2 +- .../FHIRStructureMapGroupTest.php | 2 +- .../FHIRStructureMapInputTest.php | 2 +- .../FHIRStructureMapParameterTest.php | 2 +- .../FHIRStructureMapRuleTest.php | 2 +- .../FHIRStructureMapSourceTest.php | 2 +- .../FHIRStructureMapStructureTest.php | 2 +- .../FHIRStructureMapTargetTest.php | 2 +- .../FHIRSubscriptionChannelTest.php | 2 +- .../FHIRSubstanceIngredientTest.php | 2 +- .../FHIRSubstanceInstanceTest.php | 2 +- .../FHIRSubstanceAmountReferenceRangeTest.php | 2 +- .../FHIRSubstanceAmountTest.php | 2 +- .../FHIRSubstanceNucleicAcidLinkageTest.php | 2 +- .../FHIRSubstanceNucleicAcidSubunitTest.php | 2 +- .../FHIRSubstanceNucleicAcidSugarTest.php | 2 +- ...tancePolymerDegreeOfPolymerisationTest.php | 2 +- .../FHIRSubstancePolymerMonomerSetTest.php | 2 +- .../FHIRSubstancePolymerRepeatTest.php | 2 +- .../FHIRSubstancePolymerRepeatUnitTest.php | 2 +- ...IRSubstancePolymerStartingMaterialTest.php | 2 +- ...ncePolymerStructuralRepresentationTest.php | 2 +- .../FHIRSubstanceProteinSubunitTest.php | 2 +- ...ReferenceInformationClassificationTest.php | 2 +- ...nceReferenceInformationGeneElementTest.php | 2 +- ...RSubstanceReferenceInformationGeneTest.php | 2 +- ...ubstanceReferenceInformationTargetTest.php | 2 +- .../FHIRSubstanceSourceMaterialAuthorTest.php | 2 +- ...eSourceMaterialFractionDescriptionTest.php | 2 +- .../FHIRSubstanceSourceMaterialHybridTest.php | 2 +- ...tanceSourceMaterialOrganismGeneralTest.php | 2 +- ...HIRSubstanceSourceMaterialOrganismTest.php | 2 +- ...tanceSourceMaterialPartDescriptionTest.php | 2 +- .../FHIRSubstanceSpecificationCodeTest.php | 2 +- .../FHIRSubstanceSpecificationIsotopeTest.php | 2 +- .../FHIRSubstanceSpecificationMoietyTest.php | 2 +- ...stanceSpecificationMolecularWeightTest.php | 2 +- .../FHIRSubstanceSpecificationNameTest.php | 2 +- ...FHIRSubstanceSpecificationOfficialTest.php | 2 +- ...FHIRSubstanceSpecificationPropertyTest.php | 2 +- ...SubstanceSpecificationRelationshipTest.php | 2 +- ...bstanceSpecificationRepresentationTest.php | 2 +- ...HIRSubstanceSpecificationStructureTest.php | 2 +- .../FHIRSupplyDeliverySuppliedItemTest.php | 2 +- .../FHIRSupplyRequestParameterTest.php | 2 +- .../FHIRTask/FHIRTaskInputTest.php | 2 +- .../FHIRTask/FHIRTaskOutputTest.php | 2 +- .../FHIRTask/FHIRTaskRestrictionTest.php | 2 +- ...FHIRTerminologyCapabilitiesClosureTest.php | 2 +- ...RTerminologyCapabilitiesCodeSystemTest.php | 2 +- ...IRTerminologyCapabilitiesExpansionTest.php | 2 +- .../FHIRTerminologyCapabilitiesFilterTest.php | 2 +- ...minologyCapabilitiesImplementationTest.php | 2 +- ...IRTerminologyCapabilitiesParameterTest.php | 2 +- ...HIRTerminologyCapabilitiesSoftwareTest.php | 2 +- ...TerminologyCapabilitiesTranslationTest.php | 2 +- ...erminologyCapabilitiesValidateCodeTest.php | 2 +- ...FHIRTerminologyCapabilitiesVersionTest.php | 2 +- .../FHIRTestReportAction1Test.php | 2 +- .../FHIRTestReportAction2Test.php | 2 +- .../FHIRTestReportActionTest.php | 2 +- .../FHIRTestReportAssertTest.php | 2 +- .../FHIRTestReportOperationTest.php | 2 +- .../FHIRTestReportParticipantTest.php | 2 +- .../FHIRTestReportSetupTest.php | 2 +- .../FHIRTestReportTeardownTest.php | 2 +- .../FHIRTestReport/FHIRTestReportTestTest.php | 2 +- .../FHIRTestScriptAction1Test.php | 2 +- .../FHIRTestScriptAction2Test.php | 2 +- .../FHIRTestScriptActionTest.php | 2 +- .../FHIRTestScriptAssertTest.php | 2 +- .../FHIRTestScriptCapabilityTest.php | 2 +- .../FHIRTestScriptDestinationTest.php | 2 +- .../FHIRTestScriptFixtureTest.php | 2 +- .../FHIRTestScript/FHIRTestScriptLinkTest.php | 2 +- .../FHIRTestScriptMetadataTest.php | 2 +- .../FHIRTestScriptOperationTest.php | 2 +- .../FHIRTestScriptOriginTest.php | 2 +- .../FHIRTestScriptRequestHeaderTest.php | 2 +- .../FHIRTestScriptSetupTest.php | 2 +- .../FHIRTestScriptTeardownTest.php | 2 +- .../FHIRTestScript/FHIRTestScriptTestTest.php | 2 +- .../FHIRTestScriptVariableTest.php | 2 +- .../FHIRTiming/FHIRTimingRepeatTest.php | 2 +- .../FHIRBackboneElement/FHIRTimingTest.php | 2 +- .../FHIRValueSet/FHIRValueSetComposeTest.php | 2 +- .../FHIRValueSet/FHIRValueSetConceptTest.php | 2 +- .../FHIRValueSet/FHIRValueSetContainsTest.php | 2 +- .../FHIRValueSetDesignationTest.php | 2 +- .../FHIRValueSetExpansionTest.php | 2 +- .../FHIRValueSet/FHIRValueSetFilterTest.php | 2 +- .../FHIRValueSet/FHIRValueSetIncludeTest.php | 2 +- .../FHIRValueSetParameterTest.php | 2 +- .../FHIRVerificationResultAttestationTest.php | 2 +- ...HIRVerificationResultPrimarySourceTest.php | 2 +- .../FHIRVerificationResultValidatorTest.php | 2 +- ...isionPrescriptionLensSpecificationTest.php | 2 +- .../FHIRVisionPrescriptionPrismTest.php | 2 +- .../FHIRElement/FHIRBackboneElementTest.php | 2 +- .../FHIRElement/FHIRBase64BinaryTest.php | 2 +- .../FHIRElement/FHIRBindingStrengthTest.php | 2 +- ...BiologicallyDerivedProductCategoryTest.php | 2 +- ...IRBiologicallyDerivedProductStatusTest.php | 2 +- ...ogicallyDerivedProductStorageScaleTest.php | 2 +- .../FHIRElement/FHIRBooleanTest.php | 2 +- .../FHIRElement/FHIRBundleTypeTest.php | 2 +- .../FHIRElement/FHIRCanonicalTest.php | 2 +- .../FHIRCapabilityStatementKindTest.php | 2 +- .../FHIRCarePlanActivityKindTest.php | 2 +- .../FHIRCarePlanActivityStatusTest.php | 2 +- .../FHIRElement/FHIRCarePlanIntentTest.php | 2 +- .../FHIRElement/FHIRCareTeamStatusTest.php | 2 +- .../FHIRCatalogEntryRelationTypeTest.php | 2 +- .../FHIRElement/FHIRChargeItemStatusTest.php | 2 +- .../FHIRClaimProcessingCodesTest.php | 2 +- .../FHIRClinicalImpressionStatusTest.php | 2 +- .../FHIRElement/FHIRCodeSearchSupportTest.php | 2 +- .../FHIRCodeSystemContentModeTest.php | 2 +- .../FHIRCodeSystemHierarchyMeaningTest.php | 2 +- .../PHPFHIRTests/FHIRElement/FHIRCodeTest.php | 2 +- .../FHIRElement/FHIRCodeableConceptTest.php | 2 +- .../FHIRElement/FHIRCodingTest.php | 2 +- .../FHIRElement/FHIRCompartmentTypeTest.php | 2 +- .../FHIRCompositionAttestationModeTest.php | 2 +- .../FHIRElement/FHIRCompositionStatusTest.php | 2 +- .../FHIRConceptMapEquivalenceTest.php | 2 +- .../FHIRConceptMapGroupUnmappedModeTest.php | 2 +- .../FHIRConditionalDeleteStatusTest.php | 2 +- .../FHIRConditionalReadStatusTest.php | 2 +- .../FHIRConsentDataMeaningTest.php | 2 +- .../FHIRConsentProvisionTypeTest.php | 2 +- .../FHIRElement/FHIRConsentStateTest.php | 2 +- .../FHIRConstraintSeverityTest.php | 2 +- .../FHIRElement/FHIRContactDetailTest.php | 2 +- .../FHIRContactPointSystemTest.php | 2 +- .../FHIRElement/FHIRContactPointTest.php | 2 +- .../FHIRElement/FHIRContactPointUseTest.php | 2 +- ...ractResourcePublicationStatusCodesTest.php | 2 +- .../FHIRContractResourceStatusCodesTest.php | 2 +- .../FHIRElement/FHIRContributorTest.php | 2 +- .../FHIRElement/FHIRContributorTypeTest.php | 2 +- .../FHIRDataRequirementCodeFilterTest.php | 2 +- .../FHIRDataRequirementDateFilterTest.php | 2 +- .../FHIRDataRequirementSortTest.php | 2 +- .../FHIRElement/FHIRDataRequirementTest.php | 2 +- .../PHPFHIRTests/FHIRElement/FHIRDateTest.php | 2 +- .../FHIRElement/FHIRDateTimeTest.php | 2 +- .../FHIRElement/FHIRDaysOfWeekTest.php | 2 +- .../FHIRElement/FHIRDecimalTest.php | 2 +- .../FHIRDetectedIssueSeverityTest.php | 2 +- .../FHIRDeviceMetricCalibrationStateTest.php | 2 +- .../FHIRDeviceMetricCalibrationTypeTest.php | 2 +- .../FHIRDeviceMetricCategoryTest.php | 2 +- .../FHIRElement/FHIRDeviceMetricColorTest.php | 2 +- .../FHIRDeviceMetricOperationalStatusTest.php | 2 +- .../FHIRElement/FHIRDeviceNameTypeTest.php | 2 +- .../FHIRDeviceUseStatementStatusTest.php | 2 +- .../FHIRDiagnosticReportStatusTest.php | 2 +- .../FHIRElement/FHIRDiscriminatorTypeTest.php | 2 +- .../FHIRElement/FHIRDocumentModeTest.php | 2 +- .../FHIRDocumentReferenceStatusTest.php | 2 +- .../FHIRDocumentRelationshipTypeTest.php | 2 +- .../FHIREligibilityRequestPurposeTest.php | 2 +- .../FHIREligibilityResponsePurposeTest.php | 2 +- .../FHIREnableWhenBehaviorTest.php | 2 +- .../FHIREncounterLocationStatusTest.php | 2 +- .../FHIRElement/FHIREncounterStatusTest.php | 2 +- .../FHIRElement/FHIREndpointStatusTest.php | 2 +- .../FHIREpisodeOfCareStatusTest.php | 2 +- .../FHIREventCapabilityModeTest.php | 2 +- .../FHIRElement/FHIREventStatusTest.php | 2 +- .../FHIRElement/FHIREventTimingTest.php | 2 +- .../FHIREvidenceVariableTypeTest.php | 2 +- .../FHIRExampleScenarioActorTypeTest.php | 2 +- .../FHIRExplanationOfBenefitStatusTest.php | 2 +- .../FHIRElement/FHIRExposureStateTest.php | 2 +- .../FHIRExpressionLanguageTest.php | 2 +- .../FHIRElement/FHIRExpressionTest.php | 2 +- .../FHIRExtensionContextTypeTest.php | 2 +- .../FHIRElement/FHIRExtensionTest.php | 2 +- .../FHIRElement/FHIRFHIRDeviceStatusTest.php | 2 +- .../FHIRFHIRSubstanceStatusTest.php | 2 +- .../FHIRElement/FHIRFHIRVersionTest.php | 2 +- .../FHIRFamilyHistoryStatusTest.php | 2 +- .../FHIRElement/FHIRFilterOperatorTest.php | 2 +- .../FHIRFinancialResourceStatusCodesTest.php | 2 +- .../FHIRElement/FHIRFlagStatusTest.php | 2 +- .../FHIRGoalLifecycleStatusTest.php | 2 +- .../FHIRGraphCompartmentRuleTest.php | 2 +- .../FHIRGraphCompartmentUseTest.php | 2 +- .../FHIRElement/FHIRGroupMeasureTest.php | 2 +- .../FHIRElement/FHIRGroupTypeTest.php | 2 +- .../FHIRGuidanceResponseStatusTest.php | 2 +- .../FHIRGuidePageGenerationTest.php | 2 +- .../FHIRGuideParameterCodeTest.php | 2 +- .../FHIRElement/FHIRHTTPVerbTest.php | 2 +- .../FHIRElement/FHIRHumanNameTest.php | 2 +- .../PHPFHIRTests/FHIRElement/FHIRIdTest.php | 2 +- .../FHIRElement/FHIRIdentifierTest.php | 2 +- .../FHIRElement/FHIRIdentifierUseTest.php | 2 +- .../FHIRIdentityAssuranceLevelTest.php | 2 +- .../FHIRImagingStudyStatusTest.php | 2 +- ...RImmunizationEvaluationStatusCodesTest.php | 2 +- .../FHIRImmunizationStatusCodesTest.php | 2 +- .../FHIRElement/FHIRInstantTest.php | 2 +- .../FHIRElement/FHIRIntegerTest.php | 2 +- .../FHIRInvoicePriceComponentTypeTest.php | 2 +- .../FHIRElement/FHIRInvoiceStatusTest.php | 2 +- .../FHIRElement/FHIRIssueSeverityTest.php | 2 +- .../FHIRElement/FHIRIssueTypeTest.php | 2 +- .../FHIRElement/FHIRLinkTypeTest.php | 2 +- .../FHIRElement/FHIRLinkageTypeTest.php | 2 +- .../FHIRElement/FHIRListModeTest.php | 2 +- .../FHIRElement/FHIRListStatusTest.php | 2 +- .../FHIRElement/FHIRLocationModeTest.php | 2 +- .../FHIRElement/FHIRLocationStatusTest.php | 2 +- .../FHIRElement/FHIRMarkdownTest.php | 2 +- .../FHIRMeasureReportStatusTest.php | 2 +- .../FHIRElement/FHIRMeasureReportTypeTest.php | 2 +- .../FHIRMedicationRequestIntentTest.php | 2 +- .../FHIRMedicationStatusCodesTest.php | 2 +- .../FHIRMedicationrequestStatusTest.php | 2 +- .../FHIRMessageSignificanceCategoryTest.php | 2 +- .../FHIRMessageheaderResponseRequestTest.php | 2 +- .../PHPFHIRTests/FHIRElement/FHIRMetaTest.php | 2 +- .../FHIRElement/FHIRMoneyTest.php | 2 +- .../FHIRElement/FHIRNameUseTest.php | 2 +- .../FHIRNamingSystemIdentifierTypeTest.php | 2 +- .../FHIRElement/FHIRNamingSystemTypeTest.php | 2 +- .../FHIRElement/FHIRNarrativeStatusTest.php | 2 +- .../FHIRElement/FHIRNarrativeTest.php | 2 +- .../FHIRElement/FHIRNoteTypeTest.php | 2 +- .../FHIRObservationDataTypeTest.php | 2 +- .../FHIRObservationRangeCategoryTest.php | 2 +- .../FHIRElement/FHIRObservationStatusTest.php | 2 +- .../PHPFHIRTests/FHIRElement/FHIROidTest.php | 2 +- .../FHIRElement/FHIROperationKindTest.php | 2 +- .../FHIROperationParameterUseTest.php | 2 +- .../FHIRElement/FHIROrientationTypeTest.php | 2 +- .../FHIRParameterDefinitionTest.php | 2 +- .../FHIRParticipantRequiredTest.php | 2 +- .../FHIRParticipationStatusTest.php | 2 +- .../FHIRElement/FHIRPeriodTest.php | 2 +- .../FHIRElement/FHIRPositiveIntTest.php | 2 +- .../FHIRPropertyRepresentationTest.php | 2 +- .../FHIRElement/FHIRPropertyTypeTest.php | 2 +- .../FHIRProvenanceEntityRoleTest.php | 2 +- .../FHIRElement/FHIRPublicationStatusTest.php | 2 +- .../FHIRElement/FHIRQualityTypeTest.php | 2 +- .../FHIRElement/FHIRQuantity/FHIRAgeTest.php | 2 +- .../FHIRQuantity/FHIRCountTest.php | 2 +- .../FHIRQuantity/FHIRDistanceTest.php | 2 +- .../FHIRQuantity/FHIRDurationTest.php | 2 +- .../FHIRQuantityComparatorTest.php | 2 +- .../FHIRElement/FHIRQuantityTest.php | 2 +- .../FHIRQuestionnaireItemOperatorTest.php | 2 +- .../FHIRQuestionnaireItemTypeTest.php | 2 +- .../FHIRQuestionnaireResponseStatusTest.php | 2 +- .../FHIRElement/FHIRRangeTest.php | 2 +- .../FHIRElement/FHIRRatioTest.php | 2 +- .../FHIRReferenceHandlingPolicyTest.php | 2 +- .../FHIRElement/FHIRReferenceTest.php | 2 +- .../FHIRReferenceVersionRulesTest.php | 2 +- .../FHIRElement/FHIRRelatedArtifactTest.php | 2 +- .../FHIRRelatedArtifactTypeTest.php | 2 +- .../FHIRElement/FHIRRemittanceOutcomeTest.php | 2 +- .../FHIRElement/FHIRRepositoryTypeTest.php | 2 +- .../FHIRElement/FHIRRequestIntentTest.php | 2 +- .../FHIRElement/FHIRRequestPriorityTest.php | 2 +- .../FHIRRequestResourceTypeTest.php | 2 +- .../FHIRElement/FHIRRequestStatusTest.php | 2 +- .../FHIRResearchElementTypeTest.php | 2 +- .../FHIRResearchStudyStatusTest.php | 2 +- .../FHIRResearchSubjectStatusTest.php | 2 +- .../FHIRResourceVersionPolicyTest.php | 2 +- .../FHIRElement/FHIRResponseTypeTest.php | 2 +- .../FHIRRestfulCapabilityModeTest.php | 2 +- .../FHIRElement/FHIRSPDXLicenseTest.php | 2 +- .../FHIRSampledDataDataTypeTest.php | 2 +- .../FHIRElement/FHIRSampledDataTest.php | 2 +- .../FHIRElement/FHIRSearchComparatorTest.php | 2 +- .../FHIRElement/FHIRSearchEntryModeTest.php | 2 +- .../FHIRSearchModifierCodeTest.php | 2 +- .../FHIRElement/FHIRSearchParamTypeTest.php | 2 +- .../FHIRElement/FHIRSequenceTypeTest.php | 2 +- .../FHIRElement/FHIRSignatureTest.php | 2 +- .../FHIRElement/FHIRSlicingRulesTest.php | 2 +- .../FHIRElement/FHIRSlotStatusTest.php | 2 +- .../FHIRElement/FHIRSortDirectionTest.php | 2 +- .../FHIRSpecimenContainedPreferenceTest.php | 2 +- .../FHIRElement/FHIRSpecimenStatusTest.php | 2 +- .../FHIRElement/FHIRStatusTest.php | 2 +- .../FHIRElement/FHIRStrandTypeTest.php | 2 +- .../FHIRElement/FHIRStringTest.php | 2 +- .../FHIRStructureDefinitionKindTest.php | 2 +- .../FHIRStructureMapContextTypeTest.php | 2 +- .../FHIRStructureMapGroupTypeModeTest.php | 2 +- .../FHIRStructureMapInputModeTest.php | 2 +- .../FHIRStructureMapModelModeTest.php | 2 +- .../FHIRStructureMapSourceListModeTest.php | 2 +- .../FHIRStructureMapTargetListModeTest.php | 2 +- .../FHIRStructureMapTransformTest.php | 2 +- .../FHIRSubscriptionChannelTypeTest.php | 2 +- .../FHIRSubscriptionStatusTest.php | 2 +- .../FHIRSupplyDeliveryStatusTest.php | 2 +- .../FHIRSupplyRequestStatusTest.php | 2 +- .../FHIRSystemRestfulInteractionTest.php | 2 +- .../FHIRElement/FHIRTaskIntentTest.php | 2 +- .../FHIRElement/FHIRTaskStatusTest.php | 2 +- .../FHIRTestReportActionResultTest.php | 2 +- .../FHIRTestReportParticipantTypeTest.php | 2 +- .../FHIRElement/FHIRTestReportResultTest.php | 2 +- .../FHIRElement/FHIRTestReportStatusTest.php | 2 +- .../FHIRTestScriptRequestMethodCodeTest.php | 2 +- .../PHPFHIRTests/FHIRElement/FHIRTimeTest.php | 2 +- .../FHIRElement/FHIRTriggerDefinitionTest.php | 2 +- .../FHIRElement/FHIRTriggerTypeTest.php | 2 +- .../FHIRTypeDerivationRuleTest.php | 2 +- .../FHIRTypeRestfulInteractionTest.php | 2 +- .../FHIRElement/FHIRUDIEntryTypeTest.php | 2 +- .../FHIRElement/FHIRUnitsOfTimeTest.php | 2 +- .../FHIRElement/FHIRUnsignedIntTest.php | 2 +- .../PHPFHIRTests/FHIRElement/FHIRUriTest.php | 2 +- .../PHPFHIRTests/FHIRElement/FHIRUrlTest.php | 2 +- .../FHIRElement/FHIRUsageContextTest.php | 2 +- .../PHPFHIRTests/FHIRElement/FHIRUseTest.php | 2 +- .../PHPFHIRTests/FHIRElement/FHIRUuidTest.php | 2 +- ...FHIRVConfidentialityClassificationTest.php | 2 +- .../FHIRElement/FHIRVariableTypeTest.php | 2 +- .../FHIRElement/FHIRVisionBaseTest.php | 2 +- .../FHIRElement/FHIRVisionEyesTest.php | 2 +- .../FHIRElement/FHIRXPathUsageTypeTest.php | 2 +- .../R4/PHPFHIRTests/FHIRElementTest.php | 2 +- .../FHIREligibilityRequestPurposeListTest.php | 2 +- ...FHIREligibilityResponsePurposeListTest.php | 2 +- .../FHIREnableWhenBehaviorListTest.php | 2 +- .../FHIREncounterLocationStatusListTest.php | 2 +- .../FHIREncounterStatusListTest.php | 2 +- .../FHIREndpointStatusListTest.php | 2 +- .../FHIREpisodeOfCareStatusListTest.php | 2 +- .../FHIREventCapabilityModeListTest.php | 2 +- .../PHPFHIRTests/FHIREventStatusListTest.php | 2 +- .../PHPFHIRTests/FHIREventTimingListTest.php | 2 +- .../FHIREvidenceVariableTypeListTest.php | 2 +- .../FHIRExampleScenarioActorTypeListTest.php | 2 +- ...FHIRExplanationOfBenefitStatusListTest.php | 2 +- .../FHIRExposureStateListTest.php | 2 +- .../FHIRExpressionLanguageListTest.php | 2 +- .../FHIRExtensionContextTypeListTest.php | 2 +- .../FHIRFHIRDeviceStatusListTest.php | 2 +- .../FHIRFHIRSubstanceStatusListTest.php | 2 +- .../PHPFHIRTests/FHIRFHIRVersionListTest.php | 2 +- .../FHIRFamilyHistoryStatusListTest.php | 2 +- .../FHIRFilterOperatorListTest.php | 2 +- ...IRFinancialResourceStatusCodesListTest.php | 2 +- .../PHPFHIRTests/FHIRFlagStatusListTest.php | 2 +- .../FHIRGoalLifecycleStatusListTest.php | 2 +- .../FHIRGraphCompartmentRuleListTest.php | 2 +- .../FHIRGraphCompartmentUseListTest.php | 2 +- .../PHPFHIRTests/FHIRGroupMeasureListTest.php | 2 +- .../R4/PHPFHIRTests/FHIRGroupTypeListTest.php | 2 +- .../FHIRGuidanceResponseStatusListTest.php | 2 +- .../FHIRGuidePageGenerationListTest.php | 2 +- .../FHIRGuideParameterCodeListTest.php | 2 +- .../R4/PHPFHIRTests/FHIRHTTPVerbListTest.php | 2 +- .../R4/PHPFHIRTests/FHIRIdPrimitiveTest.php | 2 +- .../FHIRIdentifierUseListTest.php | 2 +- .../FHIRIdentityAssuranceLevelListTest.php | 2 +- .../FHIRImagingStudyStatusListTest.php | 2 +- ...unizationEvaluationStatusCodesListTest.php | 2 +- .../FHIRImmunizationStatusCodesListTest.php | 2 +- .../PHPFHIRTests/FHIRInstantPrimitiveTest.php | 2 +- .../PHPFHIRTests/FHIRIntegerPrimitiveTest.php | 2 +- .../FHIRInvoicePriceComponentTypeListTest.php | 2 +- .../FHIRInvoiceStatusListTest.php | 2 +- .../FHIRIssueSeverityListTest.php | 2 +- .../R4/PHPFHIRTests/FHIRIssueTypeListTest.php | 2 +- .../R4/PHPFHIRTests/FHIRLinkTypeListTest.php | 2 +- .../PHPFHIRTests/FHIRLinkageTypeListTest.php | 2 +- .../R4/PHPFHIRTests/FHIRListModeListTest.php | 2 +- .../PHPFHIRTests/FHIRListStatusListTest.php | 2 +- .../PHPFHIRTests/FHIRLocationModeListTest.php | 2 +- .../FHIRLocationStatusListTest.php | 2 +- .../FHIRMarkdownPrimitiveTest.php | 2 +- .../FHIRMeasureReportStatusListTest.php | 2 +- .../FHIRMeasureReportTypeListTest.php | 2 +- .../FHIRMedicationRequestIntentListTest.php | 2 +- .../FHIRMedicationStatusCodesListTest.php | 2 +- .../FHIRMedicationrequestStatusListTest.php | 2 +- ...HIRMessageSignificanceCategoryListTest.php | 2 +- ...IRMessageheaderResponseRequestListTest.php | 2 +- .../R4/PHPFHIRTests/FHIRNameUseListTest.php | 2 +- ...FHIRNamingSystemIdentifierTypeListTest.php | 2 +- .../FHIRNamingSystemTypeListTest.php | 2 +- .../FHIRNarrativeStatusListTest.php | 2 +- .../R4/PHPFHIRTests/FHIRNoteTypeListTest.php | 2 +- .../FHIRObservationDataTypeListTest.php | 2 +- .../FHIRObservationRangeCategoryListTest.php | 2 +- .../FHIRObservationStatusListTest.php | 2 +- .../R4/PHPFHIRTests/FHIROidPrimitiveTest.php | 2 +- .../FHIROperationKindListTest.php | 2 +- .../FHIROperationParameterUseListTest.php | 2 +- .../FHIROrientationTypeListTest.php | 2 +- .../FHIRParticipantRequiredListTest.php | 2 +- .../FHIRParticipationStatusListTest.php | 2 +- .../FHIRPositiveIntPrimitiveTest.php | 2 +- .../FHIRPropertyRepresentationListTest.php | 2 +- .../PHPFHIRTests/FHIRPropertyTypeListTest.php | 2 +- .../FHIRProvenanceEntityRoleListTest.php | 2 +- .../FHIRPublicationStatusListTest.php | 2 +- .../PHPFHIRTests/FHIRQualityTypeListTest.php | 2 +- .../FHIRQuantityComparatorListTest.php | 2 +- .../FHIRQuestionnaireItemOperatorListTest.php | 2 +- .../FHIRQuestionnaireItemTypeListTest.php | 2 +- ...HIRQuestionnaireResponseStatusListTest.php | 2 +- .../FHIRReferenceHandlingPolicyListTest.php | 2 +- .../FHIRReferenceVersionRulesListTest.php | 2 +- .../FHIRRelatedArtifactTypeListTest.php | 2 +- .../FHIRRemittanceOutcomeListTest.php | 2 +- .../FHIRRepositoryTypeListTest.php | 2 +- .../FHIRRequestIntentListTest.php | 2 +- .../FHIRRequestPriorityListTest.php | 2 +- .../FHIRRequestResourceTypeListTest.php | 2 +- .../FHIRRequestStatusListTest.php | 2 +- .../FHIRResearchElementTypeListTest.php | 2 +- .../FHIRResearchStudyStatusListTest.php | 2 +- .../FHIRResearchSubjectStatusListTest.php | 2 +- .../FHIRResource/FHIRBinaryTest.php | 2 +- .../FHIRResource/FHIRBundleTest.php | 2 +- .../FHIRDomainResource/FHIRAccountTest.php | 2 +- .../FHIRActivityDefinitionTest.php | 2 +- .../FHIRAdverseEventTest.php | 2 +- .../FHIRAllergyIntoleranceTest.php | 2 +- .../FHIRAppointmentResponseTest.php | 2 +- .../FHIRAppointmentTest.php | 2 +- .../FHIRDomainResource/FHIRAuditEventTest.php | 2 +- .../FHIRDomainResource/FHIRBasicTest.php | 2 +- .../FHIRBiologicallyDerivedProductTest.php | 2 +- .../FHIRBodyStructureTest.php | 2 +- .../FHIRCapabilityStatementTest.php | 2 +- .../FHIRDomainResource/FHIRCarePlanTest.php | 2 +- .../FHIRDomainResource/FHIRCareTeamTest.php | 2 +- .../FHIRCatalogEntryTest.php | 2 +- .../FHIRChargeItemDefinitionTest.php | 2 +- .../FHIRDomainResource/FHIRChargeItemTest.php | 2 +- .../FHIRClaimResponseTest.php | 2 +- .../FHIRDomainResource/FHIRClaimTest.php | 2 +- .../FHIRClinicalImpressionTest.php | 2 +- .../FHIRDomainResource/FHIRCodeSystemTest.php | 2 +- .../FHIRCommunicationRequestTest.php | 2 +- .../FHIRCommunicationTest.php | 2 +- .../FHIRCompartmentDefinitionTest.php | 2 +- .../FHIRCompositionTest.php | 2 +- .../FHIRDomainResource/FHIRConceptMapTest.php | 2 +- .../FHIRDomainResource/FHIRConditionTest.php | 2 +- .../FHIRDomainResource/FHIRConsentTest.php | 2 +- .../FHIRDomainResource/FHIRContractTest.php | 2 +- .../FHIRCoverageEligibilityRequestTest.php | 2 +- .../FHIRCoverageEligibilityResponseTest.php | 2 +- .../FHIRDomainResource/FHIRCoverageTest.php | 2 +- .../FHIRDetectedIssueTest.php | 2 +- .../FHIRDeviceDefinitionTest.php | 2 +- .../FHIRDeviceMetricTest.php | 2 +- .../FHIRDeviceRequestTest.php | 2 +- .../FHIRDomainResource/FHIRDeviceTest.php | 2 +- .../FHIRDeviceUseStatementTest.php | 2 +- .../FHIRDiagnosticReportTest.php | 2 +- .../FHIRDocumentManifestTest.php | 2 +- .../FHIRDocumentReferenceTest.php | 2 +- .../FHIREffectEvidenceSynthesisTest.php | 2 +- .../FHIRDomainResource/FHIREncounterTest.php | 2 +- .../FHIRDomainResource/FHIREndpointTest.php | 2 +- .../FHIREnrollmentRequestTest.php | 2 +- .../FHIREnrollmentResponseTest.php | 2 +- .../FHIREpisodeOfCareTest.php | 2 +- .../FHIREventDefinitionTest.php | 2 +- .../FHIRDomainResource/FHIREvidenceTest.php | 2 +- .../FHIREvidenceVariableTest.php | 2 +- .../FHIRExampleScenarioTest.php | 2 +- .../FHIRExplanationOfBenefitTest.php | 2 +- .../FHIRFamilyMemberHistoryTest.php | 2 +- .../FHIRDomainResource/FHIRFlagTest.php | 2 +- .../FHIRDomainResource/FHIRGoalTest.php | 2 +- .../FHIRGraphDefinitionTest.php | 2 +- .../FHIRDomainResource/FHIRGroupTest.php | 2 +- .../FHIRGuidanceResponseTest.php | 2 +- .../FHIRHealthcareServiceTest.php | 2 +- .../FHIRImagingStudyTest.php | 2 +- .../FHIRImmunizationEvaluationTest.php | 2 +- .../FHIRImmunizationRecommendationTest.php | 2 +- .../FHIRImmunizationTest.php | 2 +- .../FHIRImplementationGuideTest.php | 2 +- .../FHIRInsurancePlanTest.php | 2 +- .../FHIRDomainResource/FHIRInvoiceTest.php | 2 +- .../FHIRDomainResource/FHIRLibraryTest.php | 2 +- .../FHIRDomainResource/FHIRLinkageTest.php | 2 +- .../FHIRDomainResource/FHIRListTest.php | 2 +- .../FHIRDomainResource/FHIRLocationTest.php | 2 +- .../FHIRMeasureReportTest.php | 2 +- .../FHIRDomainResource/FHIRMeasureTest.php | 2 +- .../FHIRDomainResource/FHIRMediaTest.php | 2 +- .../FHIRMedicationAdministrationTest.php | 2 +- .../FHIRMedicationDispenseTest.php | 2 +- .../FHIRMedicationKnowledgeTest.php | 2 +- .../FHIRMedicationRequestTest.php | 2 +- .../FHIRMedicationStatementTest.php | 2 +- .../FHIRDomainResource/FHIRMedicationTest.php | 2 +- .../FHIRMedicinalProductAuthorizationTest.php | 2 +- ...IRMedicinalProductContraindicationTest.php | 2 +- .../FHIRMedicinalProductIndicationTest.php | 2 +- .../FHIRMedicinalProductIngredientTest.php | 2 +- .../FHIRMedicinalProductInteractionTest.php | 2 +- .../FHIRMedicinalProductManufacturedTest.php | 2 +- .../FHIRMedicinalProductPackagedTest.php | 2 +- ...FHIRMedicinalProductPharmaceuticalTest.php | 2 +- .../FHIRMedicinalProductTest.php | 2 +- ...RMedicinalProductUndesirableEffectTest.php | 2 +- .../FHIRMessageDefinitionTest.php | 2 +- .../FHIRMessageHeaderTest.php | 2 +- .../FHIRMolecularSequenceTest.php | 2 +- .../FHIRNamingSystemTest.php | 2 +- .../FHIRNutritionOrderTest.php | 2 +- .../FHIRObservationDefinitionTest.php | 2 +- .../FHIRObservationTest.php | 2 +- .../FHIROperationDefinitionTest.php | 2 +- .../FHIROperationOutcomeTest.php | 2 +- .../FHIROrganizationAffiliationTest.php | 2 +- .../FHIROrganizationTest.php | 2 +- .../FHIRDomainResource/FHIRPatientTest.php | 2 +- .../FHIRPaymentNoticeTest.php | 2 +- .../FHIRPaymentReconciliationTest.php | 2 +- .../FHIRDomainResource/FHIRPersonTest.php | 2 +- .../FHIRPlanDefinitionTest.php | 2 +- .../FHIRPractitionerRoleTest.php | 2 +- .../FHIRPractitionerTest.php | 2 +- .../FHIRDomainResource/FHIRProcedureTest.php | 2 +- .../FHIRDomainResource/FHIRProvenanceTest.php | 2 +- .../FHIRQuestionnaireResponseTest.php | 2 +- .../FHIRQuestionnaireTest.php | 2 +- .../FHIRRelatedPersonTest.php | 2 +- .../FHIRRequestGroupTest.php | 2 +- .../FHIRResearchDefinitionTest.php | 2 +- .../FHIRResearchElementDefinitionTest.php | 2 +- .../FHIRResearchStudyTest.php | 2 +- .../FHIRResearchSubjectTest.php | 2 +- .../FHIRRiskAssessmentTest.php | 2 +- .../FHIRRiskEvidenceSynthesisTest.php | 2 +- .../FHIRDomainResource/FHIRScheduleTest.php | 2 +- .../FHIRSearchParameterTest.php | 2 +- .../FHIRServiceRequestTest.php | 2 +- .../FHIRDomainResource/FHIRSlotTest.php | 2 +- .../FHIRSpecimenDefinitionTest.php | 2 +- .../FHIRDomainResource/FHIRSpecimenTest.php | 2 +- .../FHIRStructureDefinitionTest.php | 2 +- .../FHIRStructureMapTest.php | 2 +- .../FHIRSubscriptionTest.php | 2 +- .../FHIRSubstanceNucleicAcidTest.php | 2 +- .../FHIRSubstancePolymerTest.php | 2 +- .../FHIRSubstanceProteinTest.php | 2 +- .../FHIRSubstanceReferenceInformationTest.php | 2 +- .../FHIRSubstanceSourceMaterialTest.php | 2 +- .../FHIRSubstanceSpecificationTest.php | 2 +- .../FHIRDomainResource/FHIRSubstanceTest.php | 2 +- .../FHIRSupplyDeliveryTest.php | 2 +- .../FHIRSupplyRequestTest.php | 2 +- .../FHIRDomainResource/FHIRTaskTest.php | 2 +- .../FHIRTerminologyCapabilitiesTest.php | 2 +- .../FHIRDomainResource/FHIRTestReportTest.php | 2 +- .../FHIRDomainResource/FHIRTestScriptTest.php | 2 +- .../FHIRDomainResource/FHIRValueSetTest.php | 2 +- .../FHIRVerificationResultTest.php | 2 +- .../FHIRVisionPrescriptionTest.php | 2 +- .../FHIRResource/FHIRDomainResourceTest.php | 2 +- .../FHIRResource/FHIRParametersTest.php | 2 +- .../FHIRResourceContainerTest.php | 2 +- .../R4/PHPFHIRTests/FHIRResourceTest.php | 2 +- .../PHPFHIRTests/FHIRResourceTypeListTest.php | 2 +- .../R4/PHPFHIRTests/FHIRResourceTypeTest.php | 2 +- .../FHIRResourceVersionPolicyListTest.php | 2 +- .../PHPFHIRTests/FHIRResponseTypeListTest.php | 2 +- .../FHIRRestfulCapabilityModeListTest.php | 2 +- .../PHPFHIRTests/FHIRSPDXLicenseListTest.php | 2 +- .../FHIRSampledDataDataTypePrimitiveTest.php | 2 +- .../FHIRSearchComparatorListTest.php | 2 +- .../FHIRSearchEntryModeListTest.php | 2 +- .../FHIRSearchModifierCodeListTest.php | 2 +- .../FHIRSearchParamTypeListTest.php | 2 +- .../PHPFHIRTests/FHIRSequenceTypeListTest.php | 2 +- .../PHPFHIRTests/FHIRSlicingRulesListTest.php | 2 +- .../PHPFHIRTests/FHIRSlotStatusListTest.php | 2 +- .../FHIRSortDirectionListTest.php | 2 +- ...HIRSpecimenContainedPreferenceListTest.php | 2 +- .../FHIRSpecimenStatusListTest.php | 2 +- .../R4/PHPFHIRTests/FHIRStatusListTest.php | 2 +- .../PHPFHIRTests/FHIRStrandTypeListTest.php | 2 +- .../PHPFHIRTests/FHIRStringPrimitiveTest.php | 2 +- .../FHIRStructureDefinitionKindListTest.php | 2 +- .../FHIRStructureMapContextTypeListTest.php | 2 +- .../FHIRStructureMapGroupTypeModeListTest.php | 2 +- .../FHIRStructureMapInputModeListTest.php | 2 +- .../FHIRStructureMapModelModeListTest.php | 2 +- ...FHIRStructureMapSourceListModeListTest.php | 2 +- ...FHIRStructureMapTargetListModeListTest.php | 2 +- .../FHIRStructureMapTransformListTest.php | 2 +- .../FHIRSubscriptionChannelTypeListTest.php | 2 +- .../FHIRSubscriptionStatusListTest.php | 2 +- .../FHIRSupplyDeliveryStatusListTest.php | 2 +- .../FHIRSupplyRequestStatusListTest.php | 2 +- .../FHIRSystemRestfulInteractionListTest.php | 2 +- .../PHPFHIRTests/FHIRTaskIntentListTest.php | 2 +- .../PHPFHIRTests/FHIRTaskStatusListTest.php | 2 +- .../FHIRTestReportActionResultListTest.php | 2 +- .../FHIRTestReportParticipantTypeListTest.php | 2 +- .../FHIRTestReportResultListTest.php | 2 +- .../FHIRTestReportStatusListTest.php | 2 +- ...HIRTestScriptRequestMethodCodeListTest.php | 2 +- .../R4/PHPFHIRTests/FHIRTimePrimitiveTest.php | 2 +- .../PHPFHIRTests/FHIRTriggerTypeListTest.php | 2 +- .../FHIRTypeDerivationRuleListTest.php | 2 +- .../FHIRTypeRestfulInteractionListTest.php | 2 +- .../PHPFHIRTests/FHIRUDIEntryTypeListTest.php | 2 +- .../PHPFHIRTests/FHIRUnitsOfTimeListTest.php | 2 +- .../FHIRUnsignedIntPrimitiveTest.php | 2 +- .../R4/PHPFHIRTests/FHIRUriPrimitiveTest.php | 2 +- .../R4/PHPFHIRTests/FHIRUrlPrimitiveTest.php | 2 +- .../R4/PHPFHIRTests/FHIRUseListTest.php | 2 +- .../R4/PHPFHIRTests/FHIRUuidPrimitiveTest.php | 2 +- ...VConfidentialityClassificationListTest.php | 2 +- .../PHPFHIRTests/FHIRVariableTypeListTest.php | 2 +- .../PHPFHIRTests/FHIRVisionBaseListTest.php | 2 +- .../PHPFHIRTests/FHIRVisionEyesListTest.php | 2 +- .../FHIRXPathUsageTypeListTest.php | 2 +- .../R4/PHPFHIRTests/PHPFHIRConstantsTest.php | 2 +- .../R4/PHPFHIRTests/PHPFHIRTypeMapTest.php | 2 +- .../R4/PHPFHIRTypeInterface.php | 2 +- .../PHPFHIRGenerated/R4/PHPFHIRTypeMap.php | 2 +- .../STU3/FHIRAccountStatusList.php | 2 +- .../FHIRActionCardinalityBehaviorList.php | 2 +- .../STU3/FHIRActionConditionKindList.php | 2 +- .../STU3/FHIRActionGroupingBehaviorList.php | 2 +- .../STU3/FHIRActionListList.php | 2 +- .../STU3/FHIRActionParticipantTypeList.php | 2 +- .../STU3/FHIRActionPrecheckBehaviorList.php | 2 +- .../STU3/FHIRActionRelationshipTypeList.php | 2 +- .../STU3/FHIRActionRequiredBehaviorList.php | 2 +- .../STU3/FHIRActionSelectionBehaviorList.php | 2 +- .../STU3/FHIRAddressTypeList.php | 2 +- .../STU3/FHIRAddressUseList.php | 2 +- .../STU3/FHIRAdministrativeGenderList.php | 2 +- .../STU3/FHIRAdverseEventCategoryList.php | 2 +- .../STU3/FHIRAdverseEventCausalityList.php | 2 +- .../STU3/FHIRAggregationModeList.php | 2 +- .../FHIRAllergyIntoleranceCategoryList.php | 2 +- ...IRAllergyIntoleranceClinicalStatusList.php | 2 +- .../FHIRAllergyIntoleranceCriticalityList.php | 2 +- .../FHIRAllergyIntoleranceSeverityList.php | 2 +- .../STU3/FHIRAllergyIntoleranceTypeList.php | 2 +- ...lergyIntoleranceVerificationStatusList.php | 2 +- .../STU3/FHIRAppointmentStatusList.php | 2 +- .../STU3/FHIRAssertionDirectionTypeList.php | 2 +- .../STU3/FHIRAssertionOperatorTypeList.php | 2 +- .../STU3/FHIRAssertionResponseTypesList.php | 2 +- .../STU3/FHIRAuditEventActionList.php | 2 +- .../FHIRAuditEventAgentNetworkTypeList.php | 2 +- .../STU3/FHIRAuditEventOutcomeList.php | 2 +- .../STU3/FHIRBase64BinaryPrimitive.php | 2 +- .../STU3/FHIRBindingStrengthList.php | 2 +- .../STU3/FHIRBooleanPrimitive.php | 2 +- .../STU3/FHIRBundleTypeList.php | 2 +- .../STU3/FHIRCapabilityStatementKindList.php | 2 +- .../STU3/FHIRCarePlanActivityStatusList.php | 2 +- .../STU3/FHIRCarePlanIntentList.php | 2 +- .../STU3/FHIRCarePlanStatusList.php | 2 +- .../STU3/FHIRCareTeamStatusList.php | 2 +- .../STU3/FHIRChargeItemStatusList.php | 2 +- .../STU3/FHIRClinicalImpressionStatusList.php | 2 +- .../STU3/FHIRCodePrimitive.php | 2 +- .../STU3/FHIRCodeSystemContentModeList.php | 2 +- .../FHIRCodeSystemHierarchyMeaningList.php | 2 +- .../STU3/FHIRCompartmentTypeList.php | 2 +- .../FHIRCompositionAttestationModeList.php | 2 +- .../STU3/FHIRCompositionStatusList.php | 2 +- .../STU3/FHIRConceptMapEquivalenceList.php | 2 +- .../FHIRConceptMapGroupUnmappedModeList.php | 2 +- .../FHIRConditionClinicalStatusCodesList.php | 2 +- .../FHIRConditionVerificationStatusList.php | 2 +- .../STU3/FHIRConditionalDeleteStatusList.php | 2 +- .../STU3/FHIRConditionalReadStatusList.php | 2 +- .../FHIRConfidentialityClassificationList.php | 2 +- .../STU3/FHIRConsentDataMeaningList.php | 2 +- .../STU3/FHIRConsentExceptTypeList.php | 2 +- .../STU3/FHIRConsentStateList.php | 2 +- .../STU3/FHIRConstraintSeverityList.php | 2 +- .../STU3/FHIRContactPointSystemList.php | 2 +- .../STU3/FHIRContactPointUseList.php | 2 +- .../STU3/FHIRContentTypeList.php | 2 +- .../FHIRContractResourceStatusCodesList.php | 2 +- .../STU3/FHIRContributorTypeList.php | 2 +- .../STU3/FHIRDataElementStringencyList.php | 2 +- .../STU3/FHIRDatePrimitive.php | 2 +- .../STU3/FHIRDateTimePrimitive.php | 2 +- .../STU3/FHIRDaysOfWeekList.php | 2 +- .../STU3/FHIRDecimalPrimitive.php | 2 +- .../STU3/FHIRDetectedIssueSeverityList.php | 2 +- .../FHIRDeviceMetricCalibrationStateList.php | 2 +- .../FHIRDeviceMetricCalibrationTypeList.php | 2 +- .../STU3/FHIRDeviceMetricCategoryList.php | 2 +- .../STU3/FHIRDeviceMetricColorList.php | 2 +- .../FHIRDeviceMetricOperationalStatusList.php | 2 +- .../STU3/FHIRDeviceUseStatementStatusList.php | 2 +- .../STU3/FHIRDiagnosticReportStatusList.php | 2 +- .../STU3/FHIRDigitalMediaTypeList.php | 2 +- .../STU3/FHIRDiscriminatorTypeList.php | 2 +- .../STU3/FHIRDocumentModeList.php | 2 +- .../STU3/FHIRDocumentReferenceStatusList.php | 2 +- .../STU3/FHIRDocumentRelationshipTypeList.php | 2 +- .../PHPFHIRGenerated/STU3/FHIRElement.php | 25 +- .../STU3/FHIRElement/FHIRAccountStatus.php | 9 +- .../FHIRActionCardinalityBehavior.php | 9 +- .../FHIRElement/FHIRActionConditionKind.php | 9 +- .../FHIRActionGroupingBehavior.php | 9 +- .../STU3/FHIRElement/FHIRActionList.php | 9 +- .../FHIRElement/FHIRActionParticipantType.php | 9 +- .../FHIRActionPrecheckBehavior.php | 9 +- .../FHIRActionRelationshipType.php | 9 +- .../FHIRActionRequiredBehavior.php | 9 +- .../FHIRActionSelectionBehavior.php | 9 +- .../STU3/FHIRElement/FHIRAddress.php | 189 +- .../STU3/FHIRElement/FHIRAddressType.php | 9 +- .../STU3/FHIRElement/FHIRAddressUse.php | 9 +- .../FHIRElement/FHIRAdministrativeGender.php | 9 +- .../FHIRElement/FHIRAdverseEventCategory.php | 9 +- .../FHIRElement/FHIRAdverseEventCausality.php | 9 +- .../STU3/FHIRElement/FHIRAggregationMode.php | 9 +- .../FHIRAllergyIntoleranceCategory.php | 9 +- .../FHIRAllergyIntoleranceClinicalStatus.php | 9 +- .../FHIRAllergyIntoleranceCriticality.php | 9 +- .../FHIRAllergyIntoleranceSeverity.php | 9 +- .../FHIRAllergyIntoleranceType.php | 9 +- ...IRAllergyIntoleranceVerificationStatus.php | 9 +- .../STU3/FHIRElement/FHIRAnnotation.php | 66 +- .../FHIRElement/FHIRAppointmentStatus.php | 9 +- .../FHIRAssertionDirectionType.php | 9 +- .../FHIRElement/FHIRAssertionOperatorType.php | 9 +- .../FHIRAssertionResponseTypes.php | 9 +- .../STU3/FHIRElement/FHIRAttachment.php | 162 +- .../STU3/FHIRElement/FHIRAuditEventAction.php | 9 +- .../FHIRAuditEventAgentNetworkType.php | 9 +- .../FHIRElement/FHIRAuditEventOutcome.php | 9 +- .../STU3/FHIRElement/FHIRBackboneElement.php | 12 +- .../FHIRAccount/FHIRAccountCoverage.php | 28 +- .../FHIRAccount/FHIRAccountGuarantor.php | 31 +- .../FHIRActivityDefinitionDynamicValue.php | 86 +- .../FHIRActivityDefinitionParticipant.php | 28 +- .../FHIRAdverseEventSuspectEntity.php | 51 +- .../FHIRAllergyIntoleranceReaction.php | 77 +- .../FHIRAppointmentParticipant.php | 51 +- .../FHIRAuditEvent/FHIRAuditEventAgent.php | 124 +- .../FHIRAuditEvent/FHIRAuditEventDetail.php | 49 +- .../FHIRAuditEvent/FHIRAuditEventEntity.php | 126 +- .../FHIRAuditEvent/FHIRAuditEventNetwork.php | 48 +- .../FHIRAuditEvent/FHIRAuditEventSource.php | 50 +- .../FHIRBundle/FHIRBundleEntry.php | 37 +- .../FHIRBundle/FHIRBundleLink.php | 48 +- .../FHIRBundle/FHIRBundleRequest.php | 124 +- .../FHIRBundle/FHIRBundleResponse.php | 87 +- .../FHIRBundle/FHIRBundleSearch.php | 46 +- .../FHIRCapabilityStatementCertificate.php | 48 +- .../FHIRCapabilityStatementDocument.php | 49 +- .../FHIRCapabilityStatementEndpoint.php | 30 +- .../FHIRCapabilityStatementEvent.php | 71 +- .../FHIRCapabilityStatementImplementation.php | 48 +- .../FHIRCapabilityStatementInteraction.php | 46 +- .../FHIRCapabilityStatementInteraction1.php | 46 +- .../FHIRCapabilityStatementMessaging.php | 60 +- .../FHIRCapabilityStatementOperation.php | 28 +- .../FHIRCapabilityStatementResource.php | 258 +- .../FHIRCapabilityStatementRest.php | 91 +- .../FHIRCapabilityStatementSearchParam.php | 86 +- .../FHIRCapabilityStatementSecurity.php | 54 +- .../FHIRCapabilityStatementSoftware.php | 67 +- ...HIRCapabilityStatementSupportedMessage.php | 28 +- .../FHIRCarePlan/FHIRCarePlanActivity.php | 22 +- .../FHIRCarePlan/FHIRCarePlanDetail.php | 165 +- .../FHIRCareTeam/FHIRCareTeamParticipant.php | 12 +- .../FHIRChargeItemParticipant.php | 10 +- .../FHIRClaim/FHIRClaimAccident.php | 32 +- .../FHIRClaim/FHIRClaimCareTeam.php | 49 +- .../FHIRClaim/FHIRClaimDetail.php | 126 +- .../FHIRClaim/FHIRClaimDiagnosis.php | 34 +- .../FHIRClaim/FHIRClaimInformation.php | 90 +- .../FHIRClaim/FHIRClaimInsurance.php | 95 +- .../FHIRClaim/FHIRClaimItem.php | 262 +- .../FHIRClaim/FHIRClaimPayee.php | 11 +- .../FHIRClaim/FHIRClaimProcedure.php | 50 +- .../FHIRClaim/FHIRClaimRelated.php | 29 +- .../FHIRClaim/FHIRClaimSubDetail.php | 122 +- .../FHIRClaimResponseAddItem.php | 124 +- .../FHIRClaimResponseAdjudication.php | 51 +- .../FHIRClaimResponseDetail.php | 89 +- .../FHIRClaimResponseDetail1.php | 94 +- .../FHIRClaimResponseError.php | 66 +- .../FHIRClaimResponseInsurance.php | 95 +- .../FHIRClaimResponseItem.php | 89 +- .../FHIRClaimResponsePayment.php | 90 +- .../FHIRClaimResponseProcessNote.php | 48 +- .../FHIRClaimResponseSubDetail.php | 85 +- .../FHIRClinicalImpressionFinding.php | 31 +- .../FHIRClinicalImpressionInvestigation.php | 13 +- .../FHIRCodeSystem/FHIRCodeSystemConcept.php | 107 +- .../FHIRCodeSystemDesignation.php | 50 +- .../FHIRCodeSystem/FHIRCodeSystemFilter.php | 100 +- .../FHIRCodeSystem/FHIRCodeSystemProperty.php | 86 +- .../FHIRCodeSystemProperty1.php | 125 +- .../FHIRCommunicationPayload.php | 29 +- .../FHIRCommunicationRequestPayload.php | 29 +- .../FHIRCommunicationRequestRequester.php | 10 +- .../FHIRCompartmentDefinitionResource.php | 54 +- .../FHIRCompositionAttester.php | 60 +- .../FHIRComposition/FHIRCompositionEvent.php | 17 +- .../FHIRCompositionRelatesTo.php | 47 +- .../FHIRCompositionSection.php | 58 +- .../FHIRConceptMapDependsOn.php | 86 +- .../FHIRConceptMap/FHIRConceptMapElement.php | 52 +- .../FHIRConceptMap/FHIRConceptMapGroup.php | 89 +- .../FHIRConceptMap/FHIRConceptMapTarget.php | 94 +- .../FHIRConceptMap/FHIRConceptMapUnmapped.php | 86 +- .../FHIRCondition/FHIRConditionEvidence.php | 16 +- .../FHIRCondition/FHIRConditionStage.php | 13 +- .../FHIRConsent/FHIRConsentActor.php | 10 +- .../FHIRConsent/FHIRConsentActor1.php | 10 +- .../FHIRConsent/FHIRConsentData.php | 28 +- .../FHIRConsent/FHIRConsentData1.php | 28 +- .../FHIRConsent/FHIRConsentExcept.php | 57 +- .../FHIRConsent/FHIRConsentPolicy.php | 48 +- .../FHIRContract/FHIRContractAgent.php | 13 +- .../FHIRContract/FHIRContractAgent1.php | 13 +- .../FHIRContract/FHIRContractFriendly.php | 10 +- .../FHIRContract/FHIRContractLegal.php | 10 +- .../FHIRContract/FHIRContractRule.php | 10 +- .../FHIRContract/FHIRContractSigner.php | 14 +- .../FHIRContract/FHIRContractTerm.php | 96 +- .../FHIRContract/FHIRContractValuedItem.php | 149 +- .../FHIRContract/FHIRContractValuedItem1.php | 149 +- .../FHIRCoverage/FHIRCoverageGrouping.php | 238 +- .../FHIRDataElementMapping.php | 86 +- .../FHIRDetectedIssueMitigation.php | 29 +- .../FHIRDevice/FHIRDeviceUdi.php | 143 +- ...DeviceComponentProductionSpecification.php | 47 +- .../FHIRDeviceMetricCalibration.php | 65 +- .../FHIRDeviceRequestRequester.php | 10 +- .../FHIRDiagnosticReportImage.php | 30 +- .../FHIRDiagnosticReportPerformer.php | 10 +- .../FHIRDocumentManifestContent.php | 10 +- .../FHIRDocumentManifestRelated.php | 28 +- .../FHIRDocumentReferenceContent.php | 10 +- .../FHIRDocumentReferenceContext.php | 21 +- .../FHIRDocumentReferenceRelated.php | 28 +- .../FHIRDocumentReferenceRelatesTo.php | 28 +- .../FHIREligibilityResponseBenefitBalance.php | 74 +- .../FHIREligibilityResponseError.php | 9 +- .../FHIREligibilityResponseFinancial.php | 108 +- .../FHIREligibilityResponseInsurance.php | 14 +- .../FHIREncounterClassHistory.php | 10 +- .../FHIREncounter/FHIREncounterDiagnosis.php | 29 +- .../FHIREncounterHospitalization.php | 44 +- .../FHIREncounter/FHIREncounterLocation.php | 29 +- .../FHIREncounterParticipant.php | 14 +- .../FHIREncounterStatusHistory.php | 28 +- .../FHIREpisodeOfCareDiagnosis.php | 29 +- .../FHIREpisodeOfCareStatusHistory.php | 28 +- .../FHIRExpansionProfileDesignation.php | 10 +- .../FHIRExpansionProfileDesignation1.php | 30 +- .../FHIRExpansionProfileDesignation2.php | 30 +- .../FHIRExpansionProfileExclude.php | 12 +- .../FHIRExpansionProfileExcludedSystem.php | 48 +- .../FHIRExpansionProfileFixedVersion.php | 65 +- .../FHIRExpansionProfileInclude.php | 12 +- .../FHIRExplanationOfBenefitAccident.php | 32 +- .../FHIRExplanationOfBenefitAddItem.php | 124 +- .../FHIRExplanationOfBenefitAdjudication.php | 51 +- ...FHIRExplanationOfBenefitBenefitBalance.php | 74 +- .../FHIRExplanationOfBenefitCareTeam.php | 49 +- .../FHIRExplanationOfBenefitDetail.php | 185 +- .../FHIRExplanationOfBenefitDetail1.php | 94 +- .../FHIRExplanationOfBenefitDiagnosis.php | 34 +- .../FHIRExplanationOfBenefitFinancial.php | 108 +- .../FHIRExplanationOfBenefitInformation.php | 90 +- .../FHIRExplanationOfBenefitInsurance.php | 35 +- .../FHIRExplanationOfBenefitItem.php | 320 +- .../FHIRExplanationOfBenefitPayee.php | 11 +- .../FHIRExplanationOfBenefitPayment.php | 90 +- .../FHIRExplanationOfBenefitProcedure.php | 50 +- .../FHIRExplanationOfBenefitProcessNote.php | 48 +- .../FHIRExplanationOfBenefitRelated.php | 29 +- .../FHIRExplanationOfBenefitSubDetail.php | 181 +- .../FHIRFamilyMemberHistoryCondition.php | 56 +- .../FHIRGoal/FHIRGoalTarget.php | 70 +- .../FHIRGraphDefinitionCompartment.php | 84 +- .../FHIRGraphDefinitionLink.php | 109 +- .../FHIRGraphDefinitionTarget.php | 38 +- .../FHIRGroup/FHIRGroupCharacteristic.php | 69 +- .../FHIRGroup/FHIRGroupMember.php | 29 +- .../FHIRHealthcareServiceAvailableTime.php | 99 +- .../FHIRHealthcareServiceNotAvailable.php | 30 +- .../FHIRImagingManifestInstance.php | 48 +- .../FHIRImagingManifestSeries.php | 35 +- .../FHIRImagingManifestStudy.php | 36 +- .../FHIRImagingStudyInstance.php | 86 +- .../FHIRImagingStudySeries.php | 137 +- .../FHIRImmunizationExplanation.php | 16 +- .../FHIRImmunizationPractitioner.php | 10 +- .../FHIRImmunizationReaction.php | 49 +- .../FHIRImmunizationVaccinationProtocol.php | 91 +- ...mmunizationRecommendationDateCriterion.php | 29 +- ...FHIRImmunizationRecommendationProtocol.php | 66 +- ...munizationRecommendationRecommendation.php | 92 +- .../FHIRImplementationGuideDependency.php | 46 +- .../FHIRImplementationGuideGlobal.php | 12 +- .../FHIRImplementationGuidePackage.php | 52 +- .../FHIRImplementationGuidePage.php | 122 +- .../FHIRImplementationGuideResource.php | 107 +- .../FHIRLinkage/FHIRLinkageItem.php | 28 +- .../FHIRList/FHIRListEntry.php | 50 +- .../FHIRLocation/FHIRLocationPosition.php | 67 +- .../FHIRMeasure/FHIRMeasureGroup.php | 75 +- .../FHIRMeasure/FHIRMeasurePopulation.php | 85 +- .../FHIRMeasure/FHIRMeasureStratifier.php | 67 +- .../FHIRMeasureSupplementalData.php | 71 +- .../FHIRMeasureReportGroup.php | 54 +- .../FHIRMeasureReportPopulation.php | 48 +- .../FHIRMeasureReportPopulation1.php | 48 +- .../FHIRMeasureReportStratifier.php | 59 +- .../FHIRMeasureReportStratum.php | 53 +- .../FHIRMedication/FHIRMedicationBatch.php | 48 +- .../FHIRMedication/FHIRMedicationContent.php | 29 +- .../FHIRMedicationIngredient.php | 30 +- .../FHIRMedication/FHIRMedicationPackage.php | 17 +- .../FHIRMedicationAdministrationDosage.php | 69 +- .../FHIRMedicationAdministrationPerformer.php | 10 +- .../FHIRMedicationDispensePerformer.php | 10 +- .../FHIRMedicationDispenseSubstitution.php | 36 +- .../FHIRMedicationRequestDispenseRequest.php | 69 +- .../FHIRMedicationRequestRequester.php | 10 +- .../FHIRMedicationRequestSubstitution.php | 30 +- .../FHIRMessageDefinitionAllowedResponse.php | 28 +- .../FHIRMessageDefinitionFocus.php | 48 +- .../FHIRMessageHeaderDestination.php | 49 +- .../FHIRMessageHeaderResponse.php | 47 +- .../FHIRMessageHeaderSource.php | 103 +- .../FHIRNamingSystemUniqueId.php | 88 +- .../FHIRNutritionOrderAdministration.php | 48 +- .../FHIRNutritionOrderEnteralFormula.php | 112 +- .../FHIRNutritionOrderNutrient.php | 28 +- .../FHIRNutritionOrderOralDiet.php | 47 +- .../FHIRNutritionOrderSupplement.php | 72 +- .../FHIRNutritionOrderTexture.php | 10 +- .../FHIRObservationComponent.php | 97 +- .../FHIRObservationReferenceRange.php | 71 +- .../FHIRObservationRelated.php | 28 +- .../FHIROperationDefinitionBinding.php | 47 +- .../FHIROperationDefinitionOverload.php | 55 +- .../FHIROperationDefinitionParameter.php | 147 +- .../FHIROperationOutcomeIssue.php | 118 +- .../FHIROrganizationContact.php | 43 +- .../FHIRParametersParameter.php | 514 ++- .../FHIRPatient/FHIRPatientAnimal.php | 11 +- .../FHIRPatient/FHIRPatientCommunication.php | 28 +- .../FHIRPatient/FHIRPatientContact.php | 67 +- .../FHIRPatient/FHIRPatientLink.php | 28 +- .../FHIRPaymentReconciliationDetail.php | 53 +- .../FHIRPaymentReconciliationProcessNote.php | 30 +- .../FHIRPerson/FHIRPersonLink.php | 28 +- .../FHIRPlanDefinitionAction.php | 295 +- .../FHIRPlanDefinitionCondition.php | 86 +- .../FHIRPlanDefinitionDynamicValue.php | 86 +- .../FHIRPlanDefinitionGoal.php | 24 +- .../FHIRPlanDefinitionParticipant.php | 28 +- .../FHIRPlanDefinitionRelatedAction.php | 70 +- .../FHIRPlanDefinitionTarget.php | 51 +- .../FHIRPractitionerQualification.php | 43 +- .../FHIRPractitionerRoleAvailableTime.php | 99 +- .../FHIRPractitionerRoleNotAvailable.php | 30 +- .../FHIRProcedureFocalDevice.php | 10 +- .../FHIRProcedure/FHIRProcedurePerformer.php | 11 +- .../FHIRProcedureRequestRequester.php | 10 +- .../FHIRProcessRequestItem.php | 29 +- .../FHIRProcessResponseProcessNote.php | 30 +- .../FHIRProvenance/FHIRProvenanceAgent.php | 53 +- .../FHIRProvenance/FHIRProvenanceEntity.php | 70 +- .../FHIRQuestionnaireEnableWhen.php | 220 +- .../FHIRQuestionnaireItem.php | 370 ++- .../FHIRQuestionnaireOption.php | 85 +- .../FHIRQuestionnaireResponseAnswer.php | 186 +- .../FHIRQuestionnaireResponseItem.php | 74 +- .../FHIRReferralRequestRequester.php | 10 +- .../FHIRRequestGroupAction.php | 248 +- .../FHIRRequestGroupCondition.php | 86 +- .../FHIRRequestGroupRelatedAction.php | 70 +- .../FHIRResearchStudyArm.php | 47 +- .../FHIRRiskAssessmentPrediction.php | 70 +- .../FHIRSearchParameterComponent.php | 28 +- .../FHIRSequence/FHIRSequenceQuality.php | 240 +- .../FHIRSequence/FHIRSequenceReferenceSeq.php | 106 +- .../FHIRSequence/FHIRSequenceRepository.php | 124 +- .../FHIRSequence/FHIRSequenceVariant.php | 106 +- .../FHIRSpecimen/FHIRSpecimenCollection.php | 50 +- .../FHIRSpecimen/FHIRSpecimenContainer.php | 100 +- .../FHIRSpecimen/FHIRSpecimenProcessing.php | 52 +- .../FHIRStructureDefinitionDifferential.php | 12 +- .../FHIRStructureDefinitionMapping.php | 86 +- .../FHIRStructureDefinitionSnapshot.php | 12 +- .../FHIRStructureMapDependent.php | 55 +- .../FHIRStructureMapGroup.php | 94 +- .../FHIRStructureMapInput.php | 86 +- .../FHIRStructureMapParameter.php | 105 +- .../FHIRStructureMap/FHIRStructureMapRule.php | 62 +- .../FHIRStructureMapSource.php | 661 +++- .../FHIRStructureMapStructure.php | 86 +- .../FHIRStructureMapTarget.php | 160 +- .../FHIRSubscriptionChannel.php | 93 +- .../FHIRSubstance/FHIRSubstanceIngredient.php | 11 +- .../FHIRSubstance/FHIRSubstanceInstance.php | 67 +- .../FHIRSupplyDeliverySuppliedItem.php | 29 +- .../FHIRSupplyRequestOrderedItem.php | 29 +- .../FHIRSupplyRequestRequester.php | 10 +- .../FHIRTask/FHIRTaskInput.php | 489 ++- .../FHIRTask/FHIRTaskOutput.php | 489 ++- .../FHIRTask/FHIRTaskRequester.php | 10 +- .../FHIRTask/FHIRTaskRestriction.php | 32 +- .../FHIRTestReport/FHIRTestReportAction.php | 10 +- .../FHIRTestReport/FHIRTestReportAction1.php | 10 +- .../FHIRTestReport/FHIRTestReportAction2.php | 9 +- .../FHIRTestReport/FHIRTestReportAssert.php | 67 +- .../FHIRTestReportOperation.php | 67 +- .../FHIRTestReportParticipant.php | 67 +- .../FHIRTestReport/FHIRTestReportSetup.php | 12 +- .../FHIRTestReport/FHIRTestReportTeardown.php | 12 +- .../FHIRTestReport/FHIRTestReportTest.php | 50 +- .../FHIRTestScript/FHIRTestScriptAction.php | 28 +- .../FHIRTestScript/FHIRTestScriptAction1.php | 28 +- .../FHIRTestScript/FHIRTestScriptAction2.php | 9 +- .../FHIRTestScript/FHIRTestScriptAssert.php | 431 ++- .../FHIRTestScriptCapability.php | 137 +- .../FHIRTestScriptDestination.php | 30 +- .../FHIRTestScript/FHIRTestScriptFixture.php | 49 +- .../FHIRTestScript/FHIRTestScriptLink.php | 48 +- .../FHIRTestScript/FHIRTestScriptMetadata.php | 16 +- .../FHIRTestScriptOperation.php | 307 +- .../FHIRTestScript/FHIRTestScriptOrigin.php | 30 +- .../FHIRTestScript/FHIRTestScriptParam.php | 49 +- .../FHIRTestScript/FHIRTestScriptParam1.php | 49 +- .../FHIRTestScript/FHIRTestScriptParam2.php | 49 +- .../FHIRTestScript/FHIRTestScriptParam3.php | 49 +- .../FHIRTestScriptRequestHeader.php | 49 +- .../FHIRTestScript/FHIRTestScriptRule.php | 41 +- .../FHIRTestScript/FHIRTestScriptRule1.php | 59 +- .../FHIRTestScript/FHIRTestScriptRule2.php | 59 +- .../FHIRTestScript/FHIRTestScriptRule3.php | 59 +- .../FHIRTestScript/FHIRTestScriptRuleset.php | 13 +- .../FHIRTestScript/FHIRTestScriptRuleset1.php | 31 +- .../FHIRTestScript/FHIRTestScriptSetup.php | 12 +- .../FHIRTestScript/FHIRTestScriptTeardown.php | 12 +- .../FHIRTestScript/FHIRTestScriptTest.php | 50 +- .../FHIRTestScript/FHIRTestScriptVariable.php | 162 +- .../FHIRValueSet/FHIRValueSetCompose.php | 54 +- .../FHIRValueSet/FHIRValueSetConcept.php | 80 +- .../FHIRValueSet/FHIRValueSetContains.php | 160 +- .../FHIRValueSet/FHIRValueSetDesignation.php | 50 +- .../FHIRValueSet/FHIRValueSetExpansion.php | 92 +- .../FHIRValueSet/FHIRValueSetFilter.php | 66 +- .../FHIRValueSet/FHIRValueSetInclude.php | 108 +- .../FHIRValueSet/FHIRValueSetParameter.php | 143 +- .../FHIRVisionPrescriptionDispense.php | 262 +- .../STU3/FHIRElement/FHIRBase64Binary.php | 8 +- .../STU3/FHIRElement/FHIRBindingStrength.php | 9 +- .../STU3/FHIRElement/FHIRBoolean.php | 8 +- .../STU3/FHIRElement/FHIRBundleType.php | 9 +- .../FHIRCapabilityStatementKind.php | 9 +- .../FHIRCarePlanActivityStatus.php | 9 +- .../STU3/FHIRElement/FHIRCarePlanIntent.php | 9 +- .../STU3/FHIRElement/FHIRCarePlanStatus.php | 9 +- .../STU3/FHIRElement/FHIRCareTeamStatus.php | 9 +- .../STU3/FHIRElement/FHIRChargeItemStatus.php | 9 +- .../FHIRClinicalImpressionStatus.php | 9 +- .../STU3/FHIRElement/FHIRCode.php | 8 +- .../FHIRElement/FHIRCodeSystemContentMode.php | 9 +- .../FHIRCodeSystemHierarchyMeaning.php | 9 +- .../STU3/FHIRElement/FHIRCodeableConcept.php | 31 +- .../STU3/FHIRElement/FHIRCoding.php | 105 +- .../STU3/FHIRElement/FHIRCompartmentType.php | 9 +- .../FHIRCompositionAttestationMode.php | 9 +- .../FHIRElement/FHIRCompositionStatus.php | 9 +- .../FHIRElement/FHIRConceptMapEquivalence.php | 9 +- .../FHIRConceptMapGroupUnmappedMode.php | 9 +- .../FHIRConditionClinicalStatusCodes.php | 9 +- .../FHIRConditionVerificationStatus.php | 9 +- .../FHIRConditionalDeleteStatus.php | 9 +- .../FHIRElement/FHIRConditionalReadStatus.php | 9 +- .../FHIRConfidentialityClassification.php | 9 +- .../FHIRElement/FHIRConsentDataMeaning.php | 9 +- .../FHIRElement/FHIRConsentExceptType.php | 9 +- .../STU3/FHIRElement/FHIRConsentState.php | 9 +- .../FHIRElement/FHIRConstraintSeverity.php | 9 +- .../STU3/FHIRElement/FHIRContactDetail.php | 61 +- .../STU3/FHIRElement/FHIRContactPoint.php | 86 +- .../FHIRElement/FHIRContactPointSystem.php | 9 +- .../STU3/FHIRElement/FHIRContactPointUse.php | 9 +- .../STU3/FHIRElement/FHIRContentType.php | 9 +- .../FHIRContractResourceStatusCodes.php | 9 +- .../STU3/FHIRElement/FHIRContributor.php | 50 +- .../STU3/FHIRElement/FHIRContributorType.php | 9 +- .../FHIRElement/FHIRDataElementStringency.php | 9 +- .../STU3/FHIRElement/FHIRDataRequirement.php | 87 +- .../FHIRDataRequirementCodeFilter.php | 83 +- .../FHIRDataRequirementDateFilter.php | 70 +- .../STU3/FHIRElement/FHIRDate.php | 8 +- .../STU3/FHIRElement/FHIRDateTime.php | 8 +- .../STU3/FHIRElement/FHIRDaysOfWeek.php | 9 +- .../STU3/FHIRElement/FHIRDecimal.php | 8 +- .../FHIRElement/FHIRDetectedIssueSeverity.php | 9 +- .../FHIRDeviceMetricCalibrationState.php | 9 +- .../FHIRDeviceMetricCalibrationType.php | 9 +- .../FHIRElement/FHIRDeviceMetricCategory.php | 9 +- .../FHIRElement/FHIRDeviceMetricColor.php | 9 +- .../FHIRDeviceMetricOperationalStatus.php | 9 +- .../FHIRDeviceUseStatementStatus.php | 9 +- .../FHIRDiagnosticReportStatus.php | 9 +- .../STU3/FHIRElement/FHIRDigitalMediaType.php | 9 +- .../FHIRElement/FHIRDiscriminatorType.php | 9 +- .../STU3/FHIRElement/FHIRDocumentMode.php | 9 +- .../FHIRDocumentReferenceStatus.php | 9 +- .../FHIRDocumentRelationshipType.php | 9 +- .../STU3/FHIRElement/FHIRDosage.php | 173 +- .../FHIRElement/FHIRElementDefinition.php | 2203 ++++++++++--- .../FHIRElementDefinitionBase.php | 67 +- .../FHIRElementDefinitionBinding.php | 68 +- .../FHIRElementDefinitionConstraint.php | 143 +- .../FHIRElementDefinitionDiscriminator.php | 48 +- .../FHIRElementDefinitionExample.php | 509 ++- .../FHIRElementDefinitionMapping.php | 86 +- .../FHIRElementDefinitionSlicing.php | 71 +- .../FHIRElementDefinitionType.php | 116 +- .../FHIREncounterLocationStatus.php | 9 +- .../STU3/FHIRElement/FHIREncounterStatus.php | 9 +- .../STU3/FHIRElement/FHIREndpointStatus.php | 9 +- .../FHIRElement/FHIREpisodeOfCareStatus.php | 9 +- .../FHIRElement/FHIREventCapabilityMode.php | 9 +- .../STU3/FHIRElement/FHIREventStatus.php | 9 +- .../STU3/FHIRElement/FHIREventTiming.php | 9 +- .../FHIRExplanationOfBenefitStatus.php | 9 +- .../STU3/FHIRElement/FHIRExtension.php | 489 ++- .../STU3/FHIRElement/FHIRExtensionContext.php | 9 +- .../STU3/FHIRElement/FHIRFHIRAllTypes.php | 9 +- .../STU3/FHIRElement/FHIRFHIRDefinedType.php | 9 +- .../STU3/FHIRElement/FHIRFHIRDeviceStatus.php | 9 +- .../FHIRElement/FHIRFHIRSubstanceStatus.php | 9 +- .../FHIRElement/FHIRFamilyHistoryStatus.php | 9 +- .../STU3/FHIRElement/FHIRFilterOperator.php | 9 +- .../FHIRFinancialResourceStatusCodes.php | 9 +- .../STU3/FHIRElement/FHIRFlagStatus.php | 9 +- .../STU3/FHIRElement/FHIRGoalStatus.php | 9 +- .../FHIRElement/FHIRGraphCompartmentRule.php | 9 +- .../STU3/FHIRElement/FHIRGroupType.php | 9 +- .../FHIRGuidanceResponseStatus.php | 9 +- .../FHIRElement/FHIRGuideDependencyType.php | 9 +- .../STU3/FHIRElement/FHIRGuidePageKind.php | 9 +- .../STU3/FHIRElement/FHIRHTTPVerb.php | 9 +- .../STU3/FHIRElement/FHIRHumanName.php | 146 +- .../STU3/FHIRElement/FHIRId.php | 8 +- .../STU3/FHIRElement/FHIRIdentifier.php | 69 +- .../STU3/FHIRElement/FHIRIdentifierUse.php | 9 +- .../FHIRIdentityAssuranceLevel.php | 9 +- .../FHIRImmunizationStatusCodes.php | 9 +- .../FHIRElement/FHIRInstanceAvailability.php | 9 +- .../STU3/FHIRElement/FHIRInstant.php | 8 +- .../STU3/FHIRElement/FHIRInteger.php | 8 +- .../STU3/FHIRElement/FHIRIssueSeverity.php | 9 +- .../STU3/FHIRElement/FHIRIssueType.php | 9 +- .../STU3/FHIRElement/FHIRLinkType.php | 9 +- .../STU3/FHIRElement/FHIRLinkageType.php | 9 +- .../STU3/FHIRElement/FHIRListMode.php | 9 +- .../STU3/FHIRElement/FHIRListStatus.php | 9 +- .../STU3/FHIRElement/FHIRLocationMode.php | 9 +- .../STU3/FHIRElement/FHIRLocationStatus.php | 9 +- .../STU3/FHIRElement/FHIRMarkdown.php | 8 +- .../STU3/FHIRElement/FHIRMeasmntPrinciple.php | 9 +- .../FHIRElement/FHIRMeasureReportStatus.php | 9 +- .../FHIRElement/FHIRMeasureReportType.php | 9 +- .../FHIRMedicationAdministrationStatus.php | 9 +- .../FHIRMedicationDispenseStatus.php | 9 +- .../FHIRMedicationRequestIntent.php | 9 +- .../FHIRMedicationRequestPriority.php | 9 +- .../FHIRMedicationRequestStatus.php | 9 +- .../FHIRMedicationStatementStatus.php | 9 +- .../FHIRMedicationStatementTaken.php | 9 +- .../STU3/FHIRElement/FHIRMedicationStatus.php | 9 +- .../FHIRMessageSignificanceCategory.php | 9 +- .../STU3/FHIRElement/FHIRMeta.php | 82 +- .../STU3/FHIRElement/FHIRNameUse.php | 9 +- .../FHIRNamingSystemIdentifierType.php | 9 +- .../STU3/FHIRElement/FHIRNamingSystemType.php | 9 +- .../STU3/FHIRElement/FHIRNarrative.php | 28 +- .../STU3/FHIRElement/FHIRNarrativeStatus.php | 9 +- .../STU3/FHIRElement/FHIRNoteType.php | 9 +- .../FHIRElement/FHIRNutritionOrderStatus.php | 9 +- .../FHIRObservationRelationshipType.php | 9 +- .../FHIRElement/FHIRObservationStatus.php | 9 +- .../STU3/FHIRElement/FHIROid.php | 8 +- .../STU3/FHIRElement/FHIROperationKind.php | 9 +- .../FHIRElement/FHIROperationParameterUse.php | 9 +- .../FHIRElement/FHIRParameterDefinition.php | 125 +- .../FHIRElement/FHIRParticipantRequired.php | 9 +- .../FHIRElement/FHIRParticipationStatus.php | 9 +- .../STU3/FHIRElement/FHIRPeriod.php | 48 +- .../STU3/FHIRElement/FHIRPositiveInt.php | 8 +- .../FHIRPropertyRepresentation.php | 9 +- .../STU3/FHIRElement/FHIRPropertyType.php | 9 +- .../FHIRElement/FHIRProvenanceEntityRole.php | 9 +- .../FHIRElement/FHIRPublicationStatus.php | 9 +- .../STU3/FHIRElement/FHIRQualityType.php | 9 +- .../STU3/FHIRElement/FHIRQuantity.php | 106 +- .../STU3/FHIRElement/FHIRQuantity/FHIRAge.php | 4 +- .../FHIRElement/FHIRQuantity/FHIRCount.php | 4 +- .../FHIRElement/FHIRQuantity/FHIRDistance.php | 4 +- .../FHIRElement/FHIRQuantity/FHIRDuration.php | 4 +- .../FHIRElement/FHIRQuantity/FHIRMoney.php | 4 +- .../FHIRElement/FHIRQuantityComparator.php | 9 +- .../FHIRElement/FHIRQuestionnaireItemType.php | 9 +- .../FHIRQuestionnaireResponseStatus.php | 9 +- .../STU3/FHIRElement/FHIRRange.php | 46 +- .../STU3/FHIRElement/FHIRRatio.php | 46 +- .../STU3/FHIRElement/FHIRReference.php | 67 +- .../FHIRReferenceHandlingPolicy.php | 9 +- .../FHIRElement/FHIRReferenceVersionRules.php | 9 +- .../STU3/FHIRElement/FHIRRelatedArtifact.php | 88 +- .../FHIRElement/FHIRRelatedArtifactType.php | 9 +- .../FHIRElement/FHIRRemittanceOutcome.php | 9 +- .../STU3/FHIRElement/FHIRRepositoryType.php | 9 +- .../STU3/FHIRElement/FHIRRequestIntent.php | 9 +- .../STU3/FHIRElement/FHIRRequestPriority.php | 9 +- .../STU3/FHIRElement/FHIRRequestStatus.php | 9 +- .../FHIRElement/FHIRResearchStudyStatus.php | 9 +- .../FHIRElement/FHIRResearchSubjectStatus.php | 9 +- .../FHIRElement/FHIRResourceVersionPolicy.php | 9 +- .../STU3/FHIRElement/FHIRResponseType.php | 9 +- .../FHIRElement/FHIRRestfulCapabilityMode.php | 9 +- .../STU3/FHIRElement/FHIRSampledData.php | 143 +- .../FHIRElement/FHIRSampledDataDataType.php | 8 +- .../STU3/FHIRElement/FHIRSearchComparator.php | 9 +- .../STU3/FHIRElement/FHIRSearchEntryMode.php | 9 +- .../FHIRElement/FHIRSearchModifierCode.php | 9 +- .../STU3/FHIRElement/FHIRSearchParamType.php | 9 +- .../STU3/FHIRElement/FHIRSignature.php | 111 +- .../STU3/FHIRElement/FHIRSlicingRules.php | 9 +- .../STU3/FHIRElement/FHIRSlotStatus.php | 9 +- .../STU3/FHIRElement/FHIRSpecimenStatus.php | 9 +- .../STU3/FHIRElement/FHIRString.php | 8 +- .../FHIRStructureDefinitionKind.php | 9 +- .../FHIRStructureMapContextType.php | 9 +- .../FHIRStructureMapGroupTypeMode.php | 9 +- .../FHIRElement/FHIRStructureMapInputMode.php | 9 +- .../FHIRElement/FHIRStructureMapModelMode.php | 9 +- .../FHIRStructureMapSourceListMode.php | 9 +- .../FHIRStructureMapTargetListMode.php | 9 +- .../FHIRElement/FHIRStructureMapTransform.php | 9 +- .../FHIRSubscriptionChannelType.php | 9 +- .../FHIRElement/FHIRSubscriptionStatus.php | 9 +- .../FHIRElement/FHIRSupplyDeliveryStatus.php | 9 +- .../FHIRElement/FHIRSupplyRequestStatus.php | 9 +- .../FHIRSystemRestfulInteraction.php | 9 +- .../FHIRSystemVersionProcessingMode.php | 9 +- .../STU3/FHIRElement/FHIRTaskStatus.php | 9 +- .../FHIRTestReportActionResult.php | 9 +- .../FHIRTestReportParticipantType.php | 9 +- .../STU3/FHIRElement/FHIRTestReportResult.php | 9 +- .../STU3/FHIRElement/FHIRTestReportStatus.php | 9 +- .../FHIRTestScriptRequestMethodCode.php | 9 +- .../STU3/FHIRElement/FHIRTime.php | 8 +- .../STU3/FHIRElement/FHIRTiming.php | 36 +- .../FHIRTiming/FHIRTimingRepeat.php | 324 +- .../FHIRElement/FHIRTriggerDefinition.php | 87 +- .../STU3/FHIRElement/FHIRTriggerType.php | 9 +- .../FHIRElement/FHIRTypeDerivationRule.php | 9 +- .../FHIRTypeRestfulInteraction.php | 9 +- .../STU3/FHIRElement/FHIRUDIEntryType.php | 9 +- .../STU3/FHIRElement/FHIRUnitsOfTime.php | 9 +- .../FHIRElement/FHIRUnknownContentCode.php | 9 +- .../STU3/FHIRElement/FHIRUnsignedInt.php | 8 +- .../STU3/FHIRElement/FHIRUri.php | 8 +- .../STU3/FHIRElement/FHIRUsageContext.php | 30 +- .../STU3/FHIRElement/FHIRUse.php | 9 +- .../STU3/FHIRElement/FHIRUuid.php | 8 +- .../STU3/FHIRElement/FHIRVisionBase.php | 9 +- .../STU3/FHIRElement/FHIRVisionEyes.php | 9 +- .../STU3/FHIRElement/FHIRXPathUsageType.php | 9 +- .../STU3/FHIREncounterLocationStatusList.php | 2 +- .../STU3/FHIREncounterStatusList.php | 2 +- .../STU3/FHIREndpointStatusList.php | 2 +- .../STU3/FHIREpisodeOfCareStatusList.php | 2 +- .../STU3/FHIREventCapabilityModeList.php | 2 +- .../STU3/FHIREventStatusList.php | 2 +- .../STU3/FHIREventTimingList.php | 2 +- .../FHIRExplanationOfBenefitStatusList.php | 2 +- .../STU3/FHIRExtensionContextList.php | 2 +- .../STU3/FHIRFHIRAllTypesList.php | 2 +- .../STU3/FHIRFHIRDefinedTypeList.php | 2 +- .../STU3/FHIRFHIRDeviceStatusList.php | 2 +- .../STU3/FHIRFHIRSubstanceStatusList.php | 2 +- .../STU3/FHIRFamilyHistoryStatusList.php | 2 +- .../STU3/FHIRFilterOperatorList.php | 2 +- .../FHIRFinancialResourceStatusCodesList.php | 2 +- .../STU3/FHIRFlagStatusList.php | 2 +- .../STU3/FHIRGoalStatusList.php | 2 +- .../STU3/FHIRGraphCompartmentRuleList.php | 2 +- .../STU3/FHIRGroupTypeList.php | 2 +- .../STU3/FHIRGuidanceResponseStatusList.php | 2 +- .../STU3/FHIRGuideDependencyTypeList.php | 2 +- .../STU3/FHIRGuidePageKindList.php | 2 +- .../STU3/FHIRHTTPVerbList.php | 2 +- .../PHPFHIRGenerated/STU3/FHIRIdPrimitive.php | 2 +- .../STU3/FHIRIdentifierUseList.php | 2 +- .../STU3/FHIRIdentityAssuranceLevelList.php | 2 +- .../STU3/FHIRImmunizationStatusCodesList.php | 2 +- .../STU3/FHIRInstanceAvailabilityList.php | 2 +- .../STU3/FHIRInstantPrimitive.php | 2 +- .../STU3/FHIRIntegerPrimitive.php | 2 +- .../STU3/FHIRIssueSeverityList.php | 2 +- .../STU3/FHIRIssueTypeList.php | 2 +- .../STU3/FHIRLinkTypeList.php | 2 +- .../STU3/FHIRLinkageTypeList.php | 2 +- .../STU3/FHIRListModeList.php | 2 +- .../STU3/FHIRListStatusList.php | 2 +- .../STU3/FHIRLocationModeList.php | 2 +- .../STU3/FHIRLocationStatusList.php | 2 +- .../STU3/FHIRMarkdownPrimitive.php | 2 +- .../STU3/FHIRMeasmntPrincipleList.php | 2 +- .../STU3/FHIRMeasureReportStatusList.php | 2 +- .../STU3/FHIRMeasureReportTypeList.php | 2 +- ...FHIRMedicationAdministrationStatusList.php | 2 +- .../STU3/FHIRMedicationDispenseStatusList.php | 2 +- .../STU3/FHIRMedicationRequestIntentList.php | 2 +- .../FHIRMedicationRequestPriorityList.php | 2 +- .../STU3/FHIRMedicationRequestStatusList.php | 2 +- .../FHIRMedicationStatementStatusList.php | 2 +- .../STU3/FHIRMedicationStatementTakenList.php | 2 +- .../STU3/FHIRMedicationStatusList.php | 2 +- .../FHIRMessageSignificanceCategoryList.php | 2 +- .../PHPFHIRGenerated/STU3/FHIRNameUseList.php | 2 +- .../FHIRNamingSystemIdentifierTypeList.php | 2 +- .../STU3/FHIRNamingSystemTypeList.php | 2 +- .../STU3/FHIRNarrativeStatusList.php | 2 +- .../STU3/FHIRNoteTypeList.php | 2 +- .../STU3/FHIRNutritionOrderStatusList.php | 2 +- .../FHIRObservationRelationshipTypeList.php | 2 +- .../STU3/FHIRObservationStatusList.php | 2 +- .../STU3/FHIROidPrimitive.php | 2 +- .../STU3/FHIROperationKindList.php | 2 +- .../STU3/FHIROperationParameterUseList.php | 2 +- .../STU3/FHIRParticipantRequiredList.php | 2 +- .../STU3/FHIRParticipationStatusList.php | 2 +- .../STU3/FHIRPositiveIntPrimitive.php | 2 +- .../STU3/FHIRPropertyRepresentationList.php | 2 +- .../STU3/FHIRPropertyTypeList.php | 2 +- .../STU3/FHIRProvenanceEntityRoleList.php | 2 +- .../STU3/FHIRPublicationStatusList.php | 2 +- .../STU3/FHIRQualityTypeList.php | 2 +- .../STU3/FHIRQuantityComparatorList.php | 2 +- .../STU3/FHIRQuestionnaireItemTypeList.php | 2 +- .../FHIRQuestionnaireResponseStatusList.php | 2 +- .../STU3/FHIRReferenceHandlingPolicyList.php | 2 +- .../STU3/FHIRReferenceVersionRulesList.php | 2 +- .../STU3/FHIRRelatedArtifactTypeList.php | 2 +- .../STU3/FHIRRemittanceOutcomeList.php | 2 +- .../STU3/FHIRRepositoryTypeList.php | 2 +- .../STU3/FHIRRequestIntentList.php | 2 +- .../STU3/FHIRRequestPriorityList.php | 2 +- .../STU3/FHIRRequestStatusList.php | 2 +- .../STU3/FHIRResearchStudyStatusList.php | 2 +- .../STU3/FHIRResearchSubjectStatusList.php | 2 +- .../PHPFHIRGenerated/STU3/FHIRResource.php | 78 +- .../STU3/FHIRResource/FHIRBinary.php | 49 +- .../STU3/FHIRResource/FHIRBundle.php | 74 +- .../STU3/FHIRResource/FHIRDomainResource.php | 18 +- .../FHIRDomainResource/FHIRAccount.php | 131 +- .../FHIRActivityDefinition.php | 402 ++- .../FHIRDomainResource/FHIRAdverseEvent.php | 111 +- .../FHIRAllergyIntolerance.php | 261 +- .../FHIRDomainResource/FHIRAppointment.php | 230 +- .../FHIRAppointmentResponse.php | 122 +- .../FHIRDomainResource/FHIRAuditEvent.php | 102 +- .../FHIRDomainResource/FHIRBasic.php | 62 +- .../FHIRDomainResource/FHIRBodySite.php | 90 +- .../FHIRCapabilityStatement.php | 408 ++- .../FHIRDomainResource/FHIRCarePlan.php | 167 +- .../FHIRDomainResource/FHIRCareTeam.php | 105 +- .../FHIRDomainResource/FHIRChargeItem.php | 228 +- .../FHIRDomainResource/FHIRClaim.php | 167 +- .../FHIRDomainResource/FHIRClaimResponse.php | 194 +- .../FHIRClinicalImpression.php | 195 +- .../FHIRDomainResource/FHIRCodeSystem.php | 423 ++- .../FHIRDomainResource/FHIRCommunication.php | 164 +- .../FHIRCommunicationRequest.php | 182 +- .../FHIRCompartmentDefinition.php | 233 +- .../FHIRDomainResource/FHIRComposition.php | 128 +- .../FHIRDomainResource/FHIRConceptMap.php | 292 +- .../FHIRDomainResource/FHIRCondition.php | 260 +- .../FHIRDomainResource/FHIRConsent.php | 148 +- .../FHIRDomainResource/FHIRContract.php | 131 +- .../FHIRDomainResource/FHIRCoverage.php | 169 +- .../FHIRDomainResource/FHIRDataElement.php | 250 +- .../FHIRDomainResource/FHIRDetectedIssue.php | 133 +- .../FHIRDomainResource/FHIRDevice.php | 237 +- .../FHIRDeviceComponent.php | 78 +- .../FHIRDomainResource/FHIRDeviceMetric.php | 93 +- .../FHIRDomainResource/FHIRDeviceRequest.php | 179 +- .../FHIRDeviceUseStatement.php | 112 +- .../FHIRDiagnosticReport.php | 153 +- .../FHIRDocumentManifest.php | 153 +- .../FHIRDocumentReference.php | 176 +- .../FHIREligibilityRequest.php | 127 +- .../FHIREligibilityResponse.php | 132 +- .../FHIRDomainResource/FHIREncounter.php | 128 +- .../FHIRDomainResource/FHIREndpoint.php | 190 +- .../FHIREnrollmentRequest.php | 83 +- .../FHIREnrollmentResponse.php | 104 +- .../FHIRDomainResource/FHIREpisodeOfCare.php | 87 +- .../FHIRExpansionProfile.php | 351 ++- .../FHIRExplanationOfBenefit.php | 240 +- .../FHIRFamilyMemberHistory.php | 336 +- .../FHIRDomainResource/FHIRFlag.php | 65 +- .../FHIRDomainResource/FHIRGoal.php | 142 +- .../FHIRGraphDefinition.php | 217 +- .../FHIRDomainResource/FHIRGroup.php | 146 +- .../FHIRGuidanceResponse.php | 104 +- .../FHIRHealthcareService.php | 277 +- .../FHIRImagingManifest.php | 71 +- .../FHIRDomainResource/FHIRImagingStudy.php | 205 +- .../FHIRDomainResource/FHIRImmunization.php | 200 +- .../FHIRImmunizationRecommendation.php | 45 +- .../FHIRImplementationGuide.php | 251 +- .../FHIRDomainResource/FHIRLibrary.php | 346 ++- .../FHIRDomainResource/FHIRLinkage.php | 34 +- .../FHIRDomainResource/FHIRList.php | 130 +- .../FHIRDomainResource/FHIRLocation.php | 185 +- .../FHIRDomainResource/FHIRMeasure.php | 529 +++- .../FHIRDomainResource/FHIRMeasureReport.php | 95 +- .../FHIRDomainResource/FHIRMedia.php | 175 +- .../FHIRDomainResource/FHIRMedication.php | 77 +- .../FHIRMedicationAdministration.php | 145 +- .../FHIRMedicationDispense.php | 200 +- .../FHIRMedicationRequest.php | 183 +- .../FHIRMedicationStatement.php | 155 +- .../FHIRMessageDefinition.php | 304 +- .../FHIRDomainResource/FHIRMessageHeader.php | 44 +- .../FHIRDomainResource/FHIRNamingSystem.php | 206 +- .../FHIRDomainResource/FHIRNutritionOrder.php | 99 +- .../FHIRDomainResource/FHIRObservation.php | 251 +- .../FHIROperationDefinition.php | 339 +- .../FHIROperationOutcome.php | 12 +- .../FHIRDomainResource/FHIROrganization.php | 155 +- .../FHIRDomainResource/FHIRPatient.php | 238 +- .../FHIRDomainResource/FHIRPaymentNotice.php | 105 +- .../FHIRPaymentReconciliation.php | 135 +- .../FHIRDomainResource/FHIRPerson.php | 145 +- .../FHIRDomainResource/FHIRPlanDefinition.php | 344 +- .../FHIRDomainResource/FHIRPractitioner.php | 151 +- .../FHIRPractitionerRole.php | 143 +- .../FHIRDomainResource/FHIRProcedure.php | 165 +- .../FHIRProcedureRequest.php | 247 +- .../FHIRDomainResource/FHIRProcessRequest.php | 197 +- .../FHIRProcessResponse.php | 115 +- .../FHIRDomainResource/FHIRProvenance.php | 76 +- .../FHIRDomainResource/FHIRQuestionnaire.php | 316 +- .../FHIRQuestionnaireResponse.php | 82 +- .../FHIRReferralRequest.php | 221 +- .../FHIRDomainResource/FHIRRelatedPerson.php | 146 +- .../FHIRDomainResource/FHIRRequestGroup.php | 160 +- .../FHIRDomainResource/FHIRResearchStudy.php | 149 +- .../FHIRResearchSubject.php | 90 +- .../FHIRDomainResource/FHIRRiskAssessment.php | 122 +- .../FHIRDomainResource/FHIRSchedule.php | 94 +- .../FHIRSearchParameter.php | 409 ++- .../FHIRDomainResource/FHIRSequence.php | 158 +- .../FHIRServiceDefinition.php | 342 +- .../FHIRDomainResource/FHIRSlot.php | 146 +- .../FHIRDomainResource/FHIRSpecimen.php | 120 +- .../FHIRStructureDefinition.php | 458 ++- .../FHIRDomainResource/FHIRStructureMap.php | 295 +- .../FHIRDomainResource/FHIRSubscription.php | 140 +- .../FHIRDomainResource/FHIRSubstance.php | 91 +- .../FHIRDomainResource/FHIRSupplyDelivery.php | 84 +- .../FHIRDomainResource/FHIRSupplyRequest.php | 118 +- .../FHIRDomainResource/FHIRTask.php | 234 +- .../FHIRDomainResource/FHIRTestReport.php | 152 +- .../FHIRDomainResource/FHIRTestScript.php | 283 +- .../FHIRDomainResource/FHIRValueSet.php | 301 +- .../FHIRVisionPrescription.php | 89 +- .../STU3/FHIRResource/FHIRParameters.php | 12 +- .../STU3/FHIRResourceContainer.php | 17 +- .../STU3/FHIRResourceType.php | 2 +- .../STU3/FHIRResourceTypeList.php | 2 +- .../STU3/FHIRResourceVersionPolicyList.php | 2 +- .../STU3/FHIRResponseTypeList.php | 2 +- .../STU3/FHIRRestfulCapabilityModeList.php | 2 +- .../STU3/FHIRSampledDataDataTypePrimitive.php | 2 +- .../STU3/FHIRSearchComparatorList.php | 2 +- .../STU3/FHIRSearchEntryModeList.php | 2 +- .../STU3/FHIRSearchModifierCodeList.php | 2 +- .../STU3/FHIRSearchParamTypeList.php | 2 +- .../STU3/FHIRSlicingRulesList.php | 2 +- .../STU3/FHIRSlotStatusList.php | 2 +- .../STU3/FHIRSpecimenStatusList.php | 2 +- .../STU3/FHIRStringPrimitive.php | 2 +- .../STU3/FHIRStructureDefinitionKindList.php | 2 +- .../STU3/FHIRStructureMapContextTypeList.php | 2 +- .../FHIRStructureMapGroupTypeModeList.php | 2 +- .../STU3/FHIRStructureMapInputModeList.php | 2 +- .../STU3/FHIRStructureMapModelModeList.php | 2 +- .../FHIRStructureMapSourceListModeList.php | 2 +- .../FHIRStructureMapTargetListModeList.php | 2 +- .../STU3/FHIRStructureMapTransformList.php | 2 +- .../STU3/FHIRSubscriptionChannelTypeList.php | 2 +- .../STU3/FHIRSubscriptionStatusList.php | 2 +- .../STU3/FHIRSupplyDeliveryStatusList.php | 2 +- .../STU3/FHIRSupplyRequestStatusList.php | 2 +- .../STU3/FHIRSystemRestfulInteractionList.php | 2 +- .../FHIRSystemVersionProcessingModeList.php | 2 +- .../STU3/FHIRTaskStatusList.php | 2 +- .../STU3/FHIRTestReportActionResultList.php | 2 +- .../FHIRTestReportParticipantTypeList.php | 2 +- .../STU3/FHIRTestReportResultList.php | 2 +- .../STU3/FHIRTestReportStatusList.php | 2 +- .../FHIRTestScriptRequestMethodCodeList.php | 2 +- .../STU3/FHIRTimePrimitive.php | 2 +- .../STU3/FHIRTriggerTypeList.php | 2 +- .../STU3/FHIRTypeDerivationRuleList.php | 2 +- .../STU3/FHIRTypeRestfulInteractionList.php | 2 +- .../STU3/FHIRUDIEntryTypeList.php | 2 +- .../STU3/FHIRUnitsOfTimeList.php | 2 +- .../STU3/FHIRUnknownContentCodeList.php | 2 +- .../STU3/FHIRUnsignedIntPrimitive.php | 2 +- .../STU3/FHIRUriPrimitive.php | 2 +- .../PHPFHIRGenerated/STU3/FHIRUseList.php | 2 +- .../STU3/FHIRUuidPrimitive.php | 2 +- .../STU3/FHIRVisionBaseList.php | 2 +- .../STU3/FHIRVisionEyesList.php | 2 +- .../STU3/FHIRXPathUsageTypeList.php | 2 +- .../STU3/PHPFHIRAutoloader.php | 2 +- .../STU3/PHPFHIRCommentContainerInterface.php | 2 +- .../STU3/PHPFHIRCommentContainerTrait.php | 4 +- .../STU3/PHPFHIRConstants.php | 4 +- .../STU3/PHPFHIRContainedTypeInterface.php | 2 +- .../STU3/PHPFHIRResponseParser.php | 2 +- .../STU3/PHPFHIRResponseParserConfig.php | 2 +- .../FHIRAccountStatusListTest.php | 2 +- .../FHIRActionCardinalityBehaviorListTest.php | 2 +- .../FHIRActionConditionKindListTest.php | 2 +- .../FHIRActionGroupingBehaviorListTest.php | 2 +- .../PHPFHIRTests/FHIRActionListListTest.php | 2 +- .../FHIRActionParticipantTypeListTest.php | 2 +- .../FHIRActionPrecheckBehaviorListTest.php | 2 +- .../FHIRActionRelationshipTypeListTest.php | 2 +- .../FHIRActionRequiredBehaviorListTest.php | 2 +- .../FHIRActionSelectionBehaviorListTest.php | 2 +- .../PHPFHIRTests/FHIRAddressTypeListTest.php | 2 +- .../PHPFHIRTests/FHIRAddressUseListTest.php | 2 +- .../FHIRAdministrativeGenderListTest.php | 2 +- .../FHIRAdverseEventCategoryListTest.php | 2 +- .../FHIRAdverseEventCausalityListTest.php | 2 +- .../FHIRAggregationModeListTest.php | 2 +- ...FHIRAllergyIntoleranceCategoryListTest.php | 2 +- ...lergyIntoleranceClinicalStatusListTest.php | 2 +- ...RAllergyIntoleranceCriticalityListTest.php | 2 +- ...FHIRAllergyIntoleranceSeverityListTest.php | 2 +- .../FHIRAllergyIntoleranceTypeListTest.php | 2 +- ...yIntoleranceVerificationStatusListTest.php | 2 +- .../FHIRAppointmentStatusListTest.php | 2 +- .../FHIRAssertionDirectionTypeListTest.php | 2 +- .../FHIRAssertionOperatorTypeListTest.php | 2 +- .../FHIRAssertionResponseTypesListTest.php | 2 +- .../FHIRAuditEventActionListTest.php | 2 +- ...FHIRAuditEventAgentNetworkTypeListTest.php | 2 +- .../FHIRAuditEventOutcomeListTest.php | 2 +- .../FHIRBase64BinaryPrimitiveTest.php | 2 +- .../FHIRBindingStrengthListTest.php | 2 +- .../PHPFHIRTests/FHIRBooleanPrimitiveTest.php | 2 +- .../PHPFHIRTests/FHIRBundleTypeListTest.php | 2 +- .../FHIRCapabilityStatementKindListTest.php | 2 +- .../FHIRCarePlanActivityStatusListTest.php | 2 +- .../FHIRCarePlanIntentListTest.php | 2 +- .../FHIRCarePlanStatusListTest.php | 2 +- .../FHIRCareTeamStatusListTest.php | 2 +- .../FHIRChargeItemStatusListTest.php | 2 +- .../FHIRClinicalImpressionStatusListTest.php | 2 +- .../PHPFHIRTests/FHIRCodePrimitiveTest.php | 2 +- .../FHIRCodeSystemContentModeListTest.php | 2 +- ...FHIRCodeSystemHierarchyMeaningListTest.php | 2 +- .../FHIRCompartmentTypeListTest.php | 2 +- ...FHIRCompositionAttestationModeListTest.php | 2 +- .../FHIRCompositionStatusListTest.php | 2 +- .../FHIRConceptMapEquivalenceListTest.php | 2 +- ...HIRConceptMapGroupUnmappedModeListTest.php | 2 +- ...IRConditionClinicalStatusCodesListTest.php | 2 +- ...HIRConditionVerificationStatusListTest.php | 2 +- .../FHIRConditionalDeleteStatusListTest.php | 2 +- .../FHIRConditionalReadStatusListTest.php | 2 +- ...RConfidentialityClassificationListTest.php | 2 +- .../FHIRConsentDataMeaningListTest.php | 2 +- .../FHIRConsentExceptTypeListTest.php | 2 +- .../PHPFHIRTests/FHIRConsentStateListTest.php | 2 +- .../FHIRConstraintSeverityListTest.php | 2 +- .../FHIRContactPointSystemListTest.php | 2 +- .../FHIRContactPointUseListTest.php | 2 +- .../PHPFHIRTests/FHIRContentTypeListTest.php | 2 +- ...HIRContractResourceStatusCodesListTest.php | 2 +- .../FHIRContributorTypeListTest.php | 2 +- .../FHIRDataElementStringencyListTest.php | 2 +- .../PHPFHIRTests/FHIRDatePrimitiveTest.php | 2 +- .../FHIRDateTimePrimitiveTest.php | 2 +- .../PHPFHIRTests/FHIRDaysOfWeekListTest.php | 2 +- .../PHPFHIRTests/FHIRDecimalPrimitiveTest.php | 2 +- .../FHIRDetectedIssueSeverityListTest.php | 2 +- ...IRDeviceMetricCalibrationStateListTest.php | 2 +- ...HIRDeviceMetricCalibrationTypeListTest.php | 2 +- .../FHIRDeviceMetricCategoryListTest.php | 2 +- .../FHIRDeviceMetricColorListTest.php | 2 +- ...RDeviceMetricOperationalStatusListTest.php | 2 +- .../FHIRDeviceUseStatementStatusListTest.php | 2 +- .../FHIRDiagnosticReportStatusListTest.php | 2 +- .../FHIRDigitalMediaTypeListTest.php | 2 +- .../FHIRDiscriminatorTypeListTest.php | 2 +- .../PHPFHIRTests/FHIRDocumentModeListTest.php | 2 +- .../FHIRDocumentReferenceStatusListTest.php | 2 +- .../FHIRDocumentRelationshipTypeListTest.php | 2 +- .../FHIRElement/FHIRAccountStatusTest.php | 2 +- .../FHIRActionCardinalityBehaviorTest.php | 2 +- .../FHIRActionConditionKindTest.php | 2 +- .../FHIRActionGroupingBehaviorTest.php | 2 +- .../FHIRElement/FHIRActionListTest.php | 2 +- .../FHIRActionParticipantTypeTest.php | 2 +- .../FHIRActionPrecheckBehaviorTest.php | 2 +- .../FHIRActionRelationshipTypeTest.php | 2 +- .../FHIRActionRequiredBehaviorTest.php | 2 +- .../FHIRActionSelectionBehaviorTest.php | 2 +- .../FHIRElement/FHIRAddressTest.php | 2 +- .../FHIRElement/FHIRAddressTypeTest.php | 2 +- .../FHIRElement/FHIRAddressUseTest.php | 2 +- .../FHIRAdministrativeGenderTest.php | 2 +- .../FHIRAdverseEventCategoryTest.php | 2 +- .../FHIRAdverseEventCausalityTest.php | 2 +- .../FHIRElement/FHIRAggregationModeTest.php | 2 +- .../FHIRAllergyIntoleranceCategoryTest.php | 2 +- ...IRAllergyIntoleranceClinicalStatusTest.php | 2 +- .../FHIRAllergyIntoleranceCriticalityTest.php | 2 +- .../FHIRAllergyIntoleranceSeverityTest.php | 2 +- .../FHIRAllergyIntoleranceTypeTest.php | 2 +- ...lergyIntoleranceVerificationStatusTest.php | 2 +- .../FHIRElement/FHIRAnnotationTest.php | 2 +- .../FHIRElement/FHIRAppointmentStatusTest.php | 2 +- .../FHIRAssertionDirectionTypeTest.php | 2 +- .../FHIRAssertionOperatorTypeTest.php | 2 +- .../FHIRAssertionResponseTypesTest.php | 2 +- .../FHIRElement/FHIRAttachmentTest.php | 2 +- .../FHIRElement/FHIRAuditEventActionTest.php | 2 +- .../FHIRAuditEventAgentNetworkTypeTest.php | 2 +- .../FHIRElement/FHIRAuditEventOutcomeTest.php | 2 +- .../FHIRAccount/FHIRAccountCoverageTest.php | 2 +- .../FHIRAccount/FHIRAccountGuarantorTest.php | 2 +- ...FHIRActivityDefinitionDynamicValueTest.php | 2 +- .../FHIRActivityDefinitionParticipantTest.php | 2 +- .../FHIRAdverseEventSuspectEntityTest.php | 2 +- .../FHIRAllergyIntoleranceReactionTest.php | 2 +- .../FHIRAppointmentParticipantTest.php | 2 +- .../FHIRAuditEventAgentTest.php | 2 +- .../FHIRAuditEventDetailTest.php | 2 +- .../FHIRAuditEventEntityTest.php | 2 +- .../FHIRAuditEventNetworkTest.php | 2 +- .../FHIRAuditEventSourceTest.php | 2 +- .../FHIRBundle/FHIRBundleEntryTest.php | 2 +- .../FHIRBundle/FHIRBundleLinkTest.php | 2 +- .../FHIRBundle/FHIRBundleRequestTest.php | 2 +- .../FHIRBundle/FHIRBundleResponseTest.php | 2 +- .../FHIRBundle/FHIRBundleSearchTest.php | 2 +- ...FHIRCapabilityStatementCertificateTest.php | 2 +- .../FHIRCapabilityStatementDocumentTest.php | 2 +- .../FHIRCapabilityStatementEndpointTest.php | 2 +- .../FHIRCapabilityStatementEventTest.php | 2 +- ...RCapabilityStatementImplementationTest.php | 2 +- ...HIRCapabilityStatementInteraction1Test.php | 2 +- ...FHIRCapabilityStatementInteractionTest.php | 2 +- .../FHIRCapabilityStatementMessagingTest.php | 2 +- .../FHIRCapabilityStatementOperationTest.php | 2 +- .../FHIRCapabilityStatementResourceTest.php | 2 +- .../FHIRCapabilityStatementRestTest.php | 2 +- ...FHIRCapabilityStatementSearchParamTest.php | 2 +- .../FHIRCapabilityStatementSecurityTest.php | 2 +- .../FHIRCapabilityStatementSoftwareTest.php | 2 +- ...apabilityStatementSupportedMessageTest.php | 2 +- .../FHIRCarePlan/FHIRCarePlanActivityTest.php | 2 +- .../FHIRCarePlan/FHIRCarePlanDetailTest.php | 2 +- .../FHIRCareTeamParticipantTest.php | 2 +- .../FHIRChargeItemParticipantTest.php | 2 +- .../FHIRClaim/FHIRClaimAccidentTest.php | 2 +- .../FHIRClaim/FHIRClaimCareTeamTest.php | 2 +- .../FHIRClaim/FHIRClaimDetailTest.php | 2 +- .../FHIRClaim/FHIRClaimDiagnosisTest.php | 2 +- .../FHIRClaim/FHIRClaimInformationTest.php | 2 +- .../FHIRClaim/FHIRClaimInsuranceTest.php | 2 +- .../FHIRClaim/FHIRClaimItemTest.php | 2 +- .../FHIRClaim/FHIRClaimPayeeTest.php | 2 +- .../FHIRClaim/FHIRClaimProcedureTest.php | 2 +- .../FHIRClaim/FHIRClaimRelatedTest.php | 2 +- .../FHIRClaim/FHIRClaimSubDetailTest.php | 2 +- .../FHIRClaimResponseAddItemTest.php | 2 +- .../FHIRClaimResponseAdjudicationTest.php | 2 +- .../FHIRClaimResponseDetail1Test.php | 2 +- .../FHIRClaimResponseDetailTest.php | 2 +- .../FHIRClaimResponseErrorTest.php | 2 +- .../FHIRClaimResponseInsuranceTest.php | 2 +- .../FHIRClaimResponseItemTest.php | 2 +- .../FHIRClaimResponsePaymentTest.php | 2 +- .../FHIRClaimResponseProcessNoteTest.php | 2 +- .../FHIRClaimResponseSubDetailTest.php | 2 +- .../FHIRClinicalImpressionFindingTest.php | 2 +- ...HIRClinicalImpressionInvestigationTest.php | 2 +- .../FHIRCodeSystemConceptTest.php | 2 +- .../FHIRCodeSystemDesignationTest.php | 2 +- .../FHIRCodeSystemFilterTest.php | 2 +- .../FHIRCodeSystemProperty1Test.php | 2 +- .../FHIRCodeSystemPropertyTest.php | 2 +- .../FHIRCommunicationPayloadTest.php | 2 +- .../FHIRCommunicationRequestPayloadTest.php | 2 +- .../FHIRCommunicationRequestRequesterTest.php | 2 +- .../FHIRCompartmentDefinitionResourceTest.php | 2 +- .../FHIRCompositionAttesterTest.php | 2 +- .../FHIRCompositionEventTest.php | 2 +- .../FHIRCompositionRelatesToTest.php | 2 +- .../FHIRCompositionSectionTest.php | 2 +- .../FHIRConceptMapDependsOnTest.php | 2 +- .../FHIRConceptMapElementTest.php | 2 +- .../FHIRConceptMapGroupTest.php | 2 +- .../FHIRConceptMapTargetTest.php | 2 +- .../FHIRConceptMapUnmappedTest.php | 2 +- .../FHIRConditionEvidenceTest.php | 2 +- .../FHIRCondition/FHIRConditionStageTest.php | 2 +- .../FHIRConsent/FHIRConsentActor1Test.php | 2 +- .../FHIRConsent/FHIRConsentActorTest.php | 2 +- .../FHIRConsent/FHIRConsentData1Test.php | 2 +- .../FHIRConsent/FHIRConsentDataTest.php | 2 +- .../FHIRConsent/FHIRConsentExceptTest.php | 2 +- .../FHIRConsent/FHIRConsentPolicyTest.php | 2 +- .../FHIRContract/FHIRContractAgent1Test.php | 2 +- .../FHIRContract/FHIRContractAgentTest.php | 2 +- .../FHIRContract/FHIRContractFriendlyTest.php | 2 +- .../FHIRContract/FHIRContractLegalTest.php | 2 +- .../FHIRContract/FHIRContractRuleTest.php | 2 +- .../FHIRContract/FHIRContractSignerTest.php | 2 +- .../FHIRContract/FHIRContractTermTest.php | 2 +- .../FHIRContractValuedItem1Test.php | 2 +- .../FHIRContractValuedItemTest.php | 2 +- .../FHIRCoverage/FHIRCoverageGroupingTest.php | 2 +- .../FHIRDataElementMappingTest.php | 2 +- .../FHIRDetectedIssueMitigationTest.php | 2 +- .../FHIRDevice/FHIRDeviceUdiTest.php | 2 +- ...ceComponentProductionSpecificationTest.php | 2 +- .../FHIRDeviceMetricCalibrationTest.php | 2 +- .../FHIRDeviceRequestRequesterTest.php | 2 +- .../FHIRDiagnosticReportImageTest.php | 2 +- .../FHIRDiagnosticReportPerformerTest.php | 2 +- .../FHIRDocumentManifestContentTest.php | 2 +- .../FHIRDocumentManifestRelatedTest.php | 2 +- .../FHIRDocumentReferenceContentTest.php | 2 +- .../FHIRDocumentReferenceContextTest.php | 2 +- .../FHIRDocumentReferenceRelatedTest.php | 2 +- .../FHIRDocumentReferenceRelatesToTest.php | 2 +- ...REligibilityResponseBenefitBalanceTest.php | 2 +- .../FHIREligibilityResponseErrorTest.php | 2 +- .../FHIREligibilityResponseFinancialTest.php | 2 +- .../FHIREligibilityResponseInsuranceTest.php | 2 +- .../FHIREncounterClassHistoryTest.php | 2 +- .../FHIREncounterDiagnosisTest.php | 2 +- .../FHIREncounterHospitalizationTest.php | 2 +- .../FHIREncounterLocationTest.php | 2 +- .../FHIREncounterParticipantTest.php | 2 +- .../FHIREncounterStatusHistoryTest.php | 2 +- .../FHIREpisodeOfCareDiagnosisTest.php | 2 +- .../FHIREpisodeOfCareStatusHistoryTest.php | 2 +- .../FHIRExpansionProfileDesignation1Test.php | 2 +- .../FHIRExpansionProfileDesignation2Test.php | 2 +- .../FHIRExpansionProfileDesignationTest.php | 2 +- .../FHIRExpansionProfileExcludeTest.php | 2 +- ...FHIRExpansionProfileExcludedSystemTest.php | 2 +- .../FHIRExpansionProfileFixedVersionTest.php | 2 +- .../FHIRExpansionProfileIncludeTest.php | 2 +- .../FHIRExplanationOfBenefitAccidentTest.php | 2 +- .../FHIRExplanationOfBenefitAddItemTest.php | 2 +- ...IRExplanationOfBenefitAdjudicationTest.php | 2 +- ...ExplanationOfBenefitBenefitBalanceTest.php | 2 +- .../FHIRExplanationOfBenefitCareTeamTest.php | 2 +- .../FHIRExplanationOfBenefitDetail1Test.php | 2 +- .../FHIRExplanationOfBenefitDetailTest.php | 2 +- .../FHIRExplanationOfBenefitDiagnosisTest.php | 2 +- .../FHIRExplanationOfBenefitFinancialTest.php | 2 +- ...HIRExplanationOfBenefitInformationTest.php | 2 +- .../FHIRExplanationOfBenefitInsuranceTest.php | 2 +- .../FHIRExplanationOfBenefitItemTest.php | 2 +- .../FHIRExplanationOfBenefitPayeeTest.php | 2 +- .../FHIRExplanationOfBenefitPaymentTest.php | 2 +- .../FHIRExplanationOfBenefitProcedureTest.php | 2 +- ...HIRExplanationOfBenefitProcessNoteTest.php | 2 +- .../FHIRExplanationOfBenefitRelatedTest.php | 2 +- .../FHIRExplanationOfBenefitSubDetailTest.php | 2 +- .../FHIRFamilyMemberHistoryConditionTest.php | 2 +- .../FHIRGoal/FHIRGoalTargetTest.php | 2 +- .../FHIRGraphDefinitionCompartmentTest.php | 2 +- .../FHIRGraphDefinitionLinkTest.php | 2 +- .../FHIRGraphDefinitionTargetTest.php | 2 +- .../FHIRGroup/FHIRGroupCharacteristicTest.php | 2 +- .../FHIRGroup/FHIRGroupMemberTest.php | 2 +- ...FHIRHealthcareServiceAvailableTimeTest.php | 2 +- .../FHIRHealthcareServiceNotAvailableTest.php | 2 +- .../FHIRImagingManifestInstanceTest.php | 2 +- .../FHIRImagingManifestSeriesTest.php | 2 +- .../FHIRImagingManifestStudyTest.php | 2 +- .../FHIRImagingStudyInstanceTest.php | 2 +- .../FHIRImagingStudySeriesTest.php | 2 +- .../FHIRImmunizationExplanationTest.php | 2 +- .../FHIRImmunizationPractitionerTest.php | 2 +- .../FHIRImmunizationReactionTest.php | 2 +- ...HIRImmunizationVaccinationProtocolTest.php | 2 +- ...izationRecommendationDateCriterionTest.php | 2 +- ...ImmunizationRecommendationProtocolTest.php | 2 +- ...zationRecommendationRecommendationTest.php | 2 +- .../FHIRImplementationGuideDependencyTest.php | 2 +- .../FHIRImplementationGuideGlobalTest.php | 2 +- .../FHIRImplementationGuidePackageTest.php | 2 +- .../FHIRImplementationGuidePageTest.php | 2 +- .../FHIRImplementationGuideResourceTest.php | 2 +- .../FHIRLinkage/FHIRLinkageItemTest.php | 2 +- .../FHIRList/FHIRListEntryTest.php | 2 +- .../FHIRLocation/FHIRLocationPositionTest.php | 2 +- .../FHIRMeasure/FHIRMeasureGroupTest.php | 2 +- .../FHIRMeasure/FHIRMeasurePopulationTest.php | 2 +- .../FHIRMeasure/FHIRMeasureStratifierTest.php | 2 +- .../FHIRMeasureSupplementalDataTest.php | 2 +- .../FHIRMeasureReportGroupTest.php | 2 +- .../FHIRMeasureReportPopulation1Test.php | 2 +- .../FHIRMeasureReportPopulationTest.php | 2 +- .../FHIRMeasureReportStratifierTest.php | 2 +- .../FHIRMeasureReportStratumTest.php | 2 +- .../FHIRMedicationBatchTest.php | 2 +- .../FHIRMedicationContentTest.php | 2 +- .../FHIRMedicationIngredientTest.php | 2 +- .../FHIRMedicationPackageTest.php | 2 +- ...FHIRMedicationAdministrationDosageTest.php | 2 +- ...RMedicationAdministrationPerformerTest.php | 2 +- .../FHIRMedicationDispensePerformerTest.php | 2 +- ...FHIRMedicationDispenseSubstitutionTest.php | 2 +- ...IRMedicationRequestDispenseRequestTest.php | 2 +- .../FHIRMedicationRequestRequesterTest.php | 2 +- .../FHIRMedicationRequestSubstitutionTest.php | 2 +- ...IRMessageDefinitionAllowedResponseTest.php | 2 +- .../FHIRMessageDefinitionFocusTest.php | 2 +- .../FHIRMessageHeaderDestinationTest.php | 2 +- .../FHIRMessageHeaderResponseTest.php | 2 +- .../FHIRMessageHeaderSourceTest.php | 2 +- .../FHIRNamingSystemUniqueIdTest.php | 2 +- .../FHIRNutritionOrderAdministrationTest.php | 2 +- .../FHIRNutritionOrderEnteralFormulaTest.php | 2 +- .../FHIRNutritionOrderNutrientTest.php | 2 +- .../FHIRNutritionOrderOralDietTest.php | 2 +- .../FHIRNutritionOrderSupplementTest.php | 2 +- .../FHIRNutritionOrderTextureTest.php | 2 +- .../FHIRObservationComponentTest.php | 2 +- .../FHIRObservationReferenceRangeTest.php | 2 +- .../FHIRObservationRelatedTest.php | 2 +- .../FHIROperationDefinitionBindingTest.php | 2 +- .../FHIROperationDefinitionOverloadTest.php | 2 +- .../FHIROperationDefinitionParameterTest.php | 2 +- .../FHIROperationOutcomeIssueTest.php | 2 +- .../FHIROrganizationContactTest.php | 2 +- .../FHIRParametersParameterTest.php | 2 +- .../FHIRPatient/FHIRPatientAnimalTest.php | 2 +- .../FHIRPatientCommunicationTest.php | 2 +- .../FHIRPatient/FHIRPatientContactTest.php | 2 +- .../FHIRPatient/FHIRPatientLinkTest.php | 2 +- .../FHIRPaymentReconciliationDetailTest.php | 2 +- ...IRPaymentReconciliationProcessNoteTest.php | 2 +- .../FHIRPerson/FHIRPersonLinkTest.php | 2 +- .../FHIRPlanDefinitionActionTest.php | 2 +- .../FHIRPlanDefinitionConditionTest.php | 2 +- .../FHIRPlanDefinitionDynamicValueTest.php | 2 +- .../FHIRPlanDefinitionGoalTest.php | 2 +- .../FHIRPlanDefinitionParticipantTest.php | 2 +- .../FHIRPlanDefinitionRelatedActionTest.php | 2 +- .../FHIRPlanDefinitionTargetTest.php | 2 +- .../FHIRPractitionerQualificationTest.php | 2 +- .../FHIRPractitionerRoleAvailableTimeTest.php | 2 +- .../FHIRPractitionerRoleNotAvailableTest.php | 2 +- .../FHIRProcedureFocalDeviceTest.php | 2 +- .../FHIRProcedurePerformerTest.php | 2 +- .../FHIRProcedureRequestRequesterTest.php | 2 +- .../FHIRProcessRequestItemTest.php | 2 +- .../FHIRProcessResponseProcessNoteTest.php | 2 +- .../FHIRProvenanceAgentTest.php | 2 +- .../FHIRProvenanceEntityTest.php | 2 +- .../FHIRQuestionnaireEnableWhenTest.php | 2 +- .../FHIRQuestionnaireItemTest.php | 2 +- .../FHIRQuestionnaireOptionTest.php | 2 +- .../FHIRQuestionnaireResponseAnswerTest.php | 2 +- .../FHIRQuestionnaireResponseItemTest.php | 2 +- .../FHIRReferralRequestRequesterTest.php | 2 +- .../FHIRRequestGroupActionTest.php | 2 +- .../FHIRRequestGroupConditionTest.php | 2 +- .../FHIRRequestGroupRelatedActionTest.php | 2 +- .../FHIRResearchStudyArmTest.php | 2 +- .../FHIRRiskAssessmentPredictionTest.php | 2 +- .../FHIRSearchParameterComponentTest.php | 2 +- .../FHIRSequence/FHIRSequenceQualityTest.php | 2 +- .../FHIRSequenceReferenceSeqTest.php | 2 +- .../FHIRSequenceRepositoryTest.php | 2 +- .../FHIRSequence/FHIRSequenceVariantTest.php | 2 +- .../FHIRSpecimenCollectionTest.php | 2 +- .../FHIRSpecimenContainerTest.php | 2 +- .../FHIRSpecimenProcessingTest.php | 2 +- ...HIRStructureDefinitionDifferentialTest.php | 2 +- .../FHIRStructureDefinitionMappingTest.php | 2 +- .../FHIRStructureDefinitionSnapshotTest.php | 2 +- .../FHIRStructureMapDependentTest.php | 2 +- .../FHIRStructureMapGroupTest.php | 2 +- .../FHIRStructureMapInputTest.php | 2 +- .../FHIRStructureMapParameterTest.php | 2 +- .../FHIRStructureMapRuleTest.php | 2 +- .../FHIRStructureMapSourceTest.php | 2 +- .../FHIRStructureMapStructureTest.php | 2 +- .../FHIRStructureMapTargetTest.php | 2 +- .../FHIRSubscriptionChannelTest.php | 2 +- .../FHIRSubstanceIngredientTest.php | 2 +- .../FHIRSubstanceInstanceTest.php | 2 +- .../FHIRSupplyDeliverySuppliedItemTest.php | 2 +- .../FHIRSupplyRequestOrderedItemTest.php | 2 +- .../FHIRSupplyRequestRequesterTest.php | 2 +- .../FHIRTask/FHIRTaskInputTest.php | 2 +- .../FHIRTask/FHIRTaskOutputTest.php | 2 +- .../FHIRTask/FHIRTaskRequesterTest.php | 2 +- .../FHIRTask/FHIRTaskRestrictionTest.php | 2 +- .../FHIRTestReportAction1Test.php | 2 +- .../FHIRTestReportAction2Test.php | 2 +- .../FHIRTestReportActionTest.php | 2 +- .../FHIRTestReportAssertTest.php | 2 +- .../FHIRTestReportOperationTest.php | 2 +- .../FHIRTestReportParticipantTest.php | 2 +- .../FHIRTestReportSetupTest.php | 2 +- .../FHIRTestReportTeardownTest.php | 2 +- .../FHIRTestReport/FHIRTestReportTestTest.php | 2 +- .../FHIRTestScriptAction1Test.php | 2 +- .../FHIRTestScriptAction2Test.php | 2 +- .../FHIRTestScriptActionTest.php | 2 +- .../FHIRTestScriptAssertTest.php | 2 +- .../FHIRTestScriptCapabilityTest.php | 2 +- .../FHIRTestScriptDestinationTest.php | 2 +- .../FHIRTestScriptFixtureTest.php | 2 +- .../FHIRTestScript/FHIRTestScriptLinkTest.php | 2 +- .../FHIRTestScriptMetadataTest.php | 2 +- .../FHIRTestScriptOperationTest.php | 2 +- .../FHIRTestScriptOriginTest.php | 2 +- .../FHIRTestScriptParam1Test.php | 2 +- .../FHIRTestScriptParam2Test.php | 2 +- .../FHIRTestScriptParam3Test.php | 2 +- .../FHIRTestScriptParamTest.php | 2 +- .../FHIRTestScriptRequestHeaderTest.php | 2 +- .../FHIRTestScriptRule1Test.php | 2 +- .../FHIRTestScriptRule2Test.php | 2 +- .../FHIRTestScriptRule3Test.php | 2 +- .../FHIRTestScript/FHIRTestScriptRuleTest.php | 2 +- .../FHIRTestScriptRuleset1Test.php | 2 +- .../FHIRTestScriptRulesetTest.php | 2 +- .../FHIRTestScriptSetupTest.php | 2 +- .../FHIRTestScriptTeardownTest.php | 2 +- .../FHIRTestScript/FHIRTestScriptTestTest.php | 2 +- .../FHIRTestScriptVariableTest.php | 2 +- .../FHIRValueSet/FHIRValueSetComposeTest.php | 2 +- .../FHIRValueSet/FHIRValueSetConceptTest.php | 2 +- .../FHIRValueSet/FHIRValueSetContainsTest.php | 2 +- .../FHIRValueSetDesignationTest.php | 2 +- .../FHIRValueSetExpansionTest.php | 2 +- .../FHIRValueSet/FHIRValueSetFilterTest.php | 2 +- .../FHIRValueSet/FHIRValueSetIncludeTest.php | 2 +- .../FHIRValueSetParameterTest.php | 2 +- .../FHIRVisionPrescriptionDispenseTest.php | 2 +- .../FHIRElement/FHIRBackboneElementTest.php | 2 +- .../FHIRElement/FHIRBase64BinaryTest.php | 2 +- .../FHIRElement/FHIRBindingStrengthTest.php | 2 +- .../FHIRElement/FHIRBooleanTest.php | 2 +- .../FHIRElement/FHIRBundleTypeTest.php | 2 +- .../FHIRCapabilityStatementKindTest.php | 2 +- .../FHIRCarePlanActivityStatusTest.php | 2 +- .../FHIRElement/FHIRCarePlanIntentTest.php | 2 +- .../FHIRElement/FHIRCarePlanStatusTest.php | 2 +- .../FHIRElement/FHIRCareTeamStatusTest.php | 2 +- .../FHIRElement/FHIRChargeItemStatusTest.php | 2 +- .../FHIRClinicalImpressionStatusTest.php | 2 +- .../FHIRCodeSystemContentModeTest.php | 2 +- .../FHIRCodeSystemHierarchyMeaningTest.php | 2 +- .../PHPFHIRTests/FHIRElement/FHIRCodeTest.php | 2 +- .../FHIRElement/FHIRCodeableConceptTest.php | 2 +- .../FHIRElement/FHIRCodingTest.php | 2 +- .../FHIRElement/FHIRCompartmentTypeTest.php | 2 +- .../FHIRCompositionAttestationModeTest.php | 2 +- .../FHIRElement/FHIRCompositionStatusTest.php | 2 +- .../FHIRConceptMapEquivalenceTest.php | 2 +- .../FHIRConceptMapGroupUnmappedModeTest.php | 2 +- .../FHIRConditionClinicalStatusCodesTest.php | 2 +- .../FHIRConditionVerificationStatusTest.php | 2 +- .../FHIRConditionalDeleteStatusTest.php | 2 +- .../FHIRConditionalReadStatusTest.php | 2 +- .../FHIRConfidentialityClassificationTest.php | 2 +- .../FHIRConsentDataMeaningTest.php | 2 +- .../FHIRElement/FHIRConsentExceptTypeTest.php | 2 +- .../FHIRElement/FHIRConsentStateTest.php | 2 +- .../FHIRConstraintSeverityTest.php | 2 +- .../FHIRElement/FHIRContactDetailTest.php | 2 +- .../FHIRContactPointSystemTest.php | 2 +- .../FHIRElement/FHIRContactPointTest.php | 2 +- .../FHIRElement/FHIRContactPointUseTest.php | 2 +- .../FHIRElement/FHIRContentTypeTest.php | 2 +- .../FHIRContractResourceStatusCodesTest.php | 2 +- .../FHIRElement/FHIRContributorTest.php | 2 +- .../FHIRElement/FHIRContributorTypeTest.php | 2 +- .../FHIRDataElementStringencyTest.php | 2 +- .../FHIRDataRequirementCodeFilterTest.php | 2 +- .../FHIRDataRequirementDateFilterTest.php | 2 +- .../FHIRElement/FHIRDataRequirementTest.php | 2 +- .../PHPFHIRTests/FHIRElement/FHIRDateTest.php | 2 +- .../FHIRElement/FHIRDateTimeTest.php | 2 +- .../FHIRElement/FHIRDaysOfWeekTest.php | 2 +- .../FHIRElement/FHIRDecimalTest.php | 2 +- .../FHIRDetectedIssueSeverityTest.php | 2 +- .../FHIRDeviceMetricCalibrationStateTest.php | 2 +- .../FHIRDeviceMetricCalibrationTypeTest.php | 2 +- .../FHIRDeviceMetricCategoryTest.php | 2 +- .../FHIRElement/FHIRDeviceMetricColorTest.php | 2 +- .../FHIRDeviceMetricOperationalStatusTest.php | 2 +- .../FHIRDeviceUseStatementStatusTest.php | 2 +- .../FHIRDiagnosticReportStatusTest.php | 2 +- .../FHIRElement/FHIRDigitalMediaTypeTest.php | 2 +- .../FHIRElement/FHIRDiscriminatorTypeTest.php | 2 +- .../FHIRElement/FHIRDocumentModeTest.php | 2 +- .../FHIRDocumentReferenceStatusTest.php | 2 +- .../FHIRDocumentRelationshipTypeTest.php | 2 +- .../FHIRElement/FHIRDosageTest.php | 2 +- .../FHIRElementDefinitionBaseTest.php | 2 +- .../FHIRElementDefinitionBindingTest.php | 2 +- .../FHIRElementDefinitionConstraintTest.php | 2 +- ...FHIRElementDefinitionDiscriminatorTest.php | 2 +- .../FHIRElementDefinitionExampleTest.php | 2 +- .../FHIRElementDefinitionMappingTest.php | 2 +- .../FHIRElementDefinitionSlicingTest.php | 2 +- .../FHIRElementDefinitionTypeTest.php | 2 +- .../FHIRElement/FHIRElementDefinitionTest.php | 2 +- .../FHIREncounterLocationStatusTest.php | 2 +- .../FHIRElement/FHIREncounterStatusTest.php | 2 +- .../FHIRElement/FHIREndpointStatusTest.php | 2 +- .../FHIREpisodeOfCareStatusTest.php | 2 +- .../FHIREventCapabilityModeTest.php | 2 +- .../FHIRElement/FHIREventStatusTest.php | 2 +- .../FHIRElement/FHIREventTimingTest.php | 2 +- .../FHIRExplanationOfBenefitStatusTest.php | 2 +- .../FHIRElement/FHIRExtensionContextTest.php | 2 +- .../FHIRElement/FHIRExtensionTest.php | 2 +- .../FHIRElement/FHIRFHIRAllTypesTest.php | 2 +- .../FHIRElement/FHIRFHIRDefinedTypeTest.php | 2 +- .../FHIRElement/FHIRFHIRDeviceStatusTest.php | 2 +- .../FHIRFHIRSubstanceStatusTest.php | 2 +- .../FHIRFamilyHistoryStatusTest.php | 2 +- .../FHIRElement/FHIRFilterOperatorTest.php | 2 +- .../FHIRFinancialResourceStatusCodesTest.php | 2 +- .../FHIRElement/FHIRFlagStatusTest.php | 2 +- .../FHIRElement/FHIRGoalStatusTest.php | 2 +- .../FHIRGraphCompartmentRuleTest.php | 2 +- .../FHIRElement/FHIRGroupTypeTest.php | 2 +- .../FHIRGuidanceResponseStatusTest.php | 2 +- .../FHIRGuideDependencyTypeTest.php | 2 +- .../FHIRElement/FHIRGuidePageKindTest.php | 2 +- .../FHIRElement/FHIRHTTPVerbTest.php | 2 +- .../FHIRElement/FHIRHumanNameTest.php | 2 +- .../PHPFHIRTests/FHIRElement/FHIRIdTest.php | 2 +- .../FHIRElement/FHIRIdentifierTest.php | 2 +- .../FHIRElement/FHIRIdentifierUseTest.php | 2 +- .../FHIRIdentityAssuranceLevelTest.php | 2 +- .../FHIRImmunizationStatusCodesTest.php | 2 +- .../FHIRInstanceAvailabilityTest.php | 2 +- .../FHIRElement/FHIRInstantTest.php | 2 +- .../FHIRElement/FHIRIntegerTest.php | 2 +- .../FHIRElement/FHIRIssueSeverityTest.php | 2 +- .../FHIRElement/FHIRIssueTypeTest.php | 2 +- .../FHIRElement/FHIRLinkTypeTest.php | 2 +- .../FHIRElement/FHIRLinkageTypeTest.php | 2 +- .../FHIRElement/FHIRListModeTest.php | 2 +- .../FHIRElement/FHIRListStatusTest.php | 2 +- .../FHIRElement/FHIRLocationModeTest.php | 2 +- .../FHIRElement/FHIRLocationStatusTest.php | 2 +- .../FHIRElement/FHIRMarkdownTest.php | 2 +- .../FHIRElement/FHIRMeasmntPrincipleTest.php | 2 +- .../FHIRMeasureReportStatusTest.php | 2 +- .../FHIRElement/FHIRMeasureReportTypeTest.php | 2 +- ...FHIRMedicationAdministrationStatusTest.php | 2 +- .../FHIRMedicationDispenseStatusTest.php | 2 +- .../FHIRMedicationRequestIntentTest.php | 2 +- .../FHIRMedicationRequestPriorityTest.php | 2 +- .../FHIRMedicationRequestStatusTest.php | 2 +- .../FHIRMedicationStatementStatusTest.php | 2 +- .../FHIRMedicationStatementTakenTest.php | 2 +- .../FHIRElement/FHIRMedicationStatusTest.php | 2 +- .../FHIRMessageSignificanceCategoryTest.php | 2 +- .../PHPFHIRTests/FHIRElement/FHIRMetaTest.php | 2 +- .../FHIRElement/FHIRNameUseTest.php | 2 +- .../FHIRNamingSystemIdentifierTypeTest.php | 2 +- .../FHIRElement/FHIRNamingSystemTypeTest.php | 2 +- .../FHIRElement/FHIRNarrativeStatusTest.php | 2 +- .../FHIRElement/FHIRNarrativeTest.php | 2 +- .../FHIRElement/FHIRNoteTypeTest.php | 2 +- .../FHIRNutritionOrderStatusTest.php | 2 +- .../FHIRObservationRelationshipTypeTest.php | 2 +- .../FHIRElement/FHIRObservationStatusTest.php | 2 +- .../PHPFHIRTests/FHIRElement/FHIROidTest.php | 2 +- .../FHIRElement/FHIROperationKindTest.php | 2 +- .../FHIROperationParameterUseTest.php | 2 +- .../FHIRParameterDefinitionTest.php | 2 +- .../FHIRParticipantRequiredTest.php | 2 +- .../FHIRParticipationStatusTest.php | 2 +- .../FHIRElement/FHIRPeriodTest.php | 2 +- .../FHIRElement/FHIRPositiveIntTest.php | 2 +- .../FHIRPropertyRepresentationTest.php | 2 +- .../FHIRElement/FHIRPropertyTypeTest.php | 2 +- .../FHIRProvenanceEntityRoleTest.php | 2 +- .../FHIRElement/FHIRPublicationStatusTest.php | 2 +- .../FHIRElement/FHIRQualityTypeTest.php | 2 +- .../FHIRElement/FHIRQuantity/FHIRAgeTest.php | 2 +- .../FHIRQuantity/FHIRCountTest.php | 2 +- .../FHIRQuantity/FHIRDistanceTest.php | 2 +- .../FHIRQuantity/FHIRDurationTest.php | 2 +- .../FHIRQuantity/FHIRMoneyTest.php | 2 +- .../FHIRQuantityComparatorTest.php | 2 +- .../FHIRElement/FHIRQuantityTest.php | 2 +- .../FHIRQuestionnaireItemTypeTest.php | 2 +- .../FHIRQuestionnaireResponseStatusTest.php | 2 +- .../FHIRElement/FHIRRangeTest.php | 2 +- .../FHIRElement/FHIRRatioTest.php | 2 +- .../FHIRReferenceHandlingPolicyTest.php | 2 +- .../FHIRElement/FHIRReferenceTest.php | 2 +- .../FHIRReferenceVersionRulesTest.php | 2 +- .../FHIRElement/FHIRRelatedArtifactTest.php | 2 +- .../FHIRRelatedArtifactTypeTest.php | 2 +- .../FHIRElement/FHIRRemittanceOutcomeTest.php | 2 +- .../FHIRElement/FHIRRepositoryTypeTest.php | 2 +- .../FHIRElement/FHIRRequestIntentTest.php | 2 +- .../FHIRElement/FHIRRequestPriorityTest.php | 2 +- .../FHIRElement/FHIRRequestStatusTest.php | 2 +- .../FHIRResearchStudyStatusTest.php | 2 +- .../FHIRResearchSubjectStatusTest.php | 2 +- .../FHIRResourceVersionPolicyTest.php | 2 +- .../FHIRElement/FHIRResponseTypeTest.php | 2 +- .../FHIRRestfulCapabilityModeTest.php | 2 +- .../FHIRSampledDataDataTypeTest.php | 2 +- .../FHIRElement/FHIRSampledDataTest.php | 2 +- .../FHIRElement/FHIRSearchComparatorTest.php | 2 +- .../FHIRElement/FHIRSearchEntryModeTest.php | 2 +- .../FHIRSearchModifierCodeTest.php | 2 +- .../FHIRElement/FHIRSearchParamTypeTest.php | 2 +- .../FHIRElement/FHIRSignatureTest.php | 2 +- .../FHIRElement/FHIRSlicingRulesTest.php | 2 +- .../FHIRElement/FHIRSlotStatusTest.php | 2 +- .../FHIRElement/FHIRSpecimenStatusTest.php | 2 +- .../FHIRElement/FHIRStringTest.php | 2 +- .../FHIRStructureDefinitionKindTest.php | 2 +- .../FHIRStructureMapContextTypeTest.php | 2 +- .../FHIRStructureMapGroupTypeModeTest.php | 2 +- .../FHIRStructureMapInputModeTest.php | 2 +- .../FHIRStructureMapModelModeTest.php | 2 +- .../FHIRStructureMapSourceListModeTest.php | 2 +- .../FHIRStructureMapTargetListModeTest.php | 2 +- .../FHIRStructureMapTransformTest.php | 2 +- .../FHIRSubscriptionChannelTypeTest.php | 2 +- .../FHIRSubscriptionStatusTest.php | 2 +- .../FHIRSupplyDeliveryStatusTest.php | 2 +- .../FHIRSupplyRequestStatusTest.php | 2 +- .../FHIRSystemRestfulInteractionTest.php | 2 +- .../FHIRSystemVersionProcessingModeTest.php | 2 +- .../FHIRElement/FHIRTaskStatusTest.php | 2 +- .../FHIRTestReportActionResultTest.php | 2 +- .../FHIRTestReportParticipantTypeTest.php | 2 +- .../FHIRElement/FHIRTestReportResultTest.php | 2 +- .../FHIRElement/FHIRTestReportStatusTest.php | 2 +- .../FHIRTestScriptRequestMethodCodeTest.php | 2 +- .../PHPFHIRTests/FHIRElement/FHIRTimeTest.php | 2 +- .../FHIRTiming/FHIRTimingRepeatTest.php | 2 +- .../FHIRElement/FHIRTimingTest.php | 2 +- .../FHIRElement/FHIRTriggerDefinitionTest.php | 2 +- .../FHIRElement/FHIRTriggerTypeTest.php | 2 +- .../FHIRTypeDerivationRuleTest.php | 2 +- .../FHIRTypeRestfulInteractionTest.php | 2 +- .../FHIRElement/FHIRUDIEntryTypeTest.php | 2 +- .../FHIRElement/FHIRUnitsOfTimeTest.php | 2 +- .../FHIRUnknownContentCodeTest.php | 2 +- .../FHIRElement/FHIRUnsignedIntTest.php | 2 +- .../PHPFHIRTests/FHIRElement/FHIRUriTest.php | 2 +- .../FHIRElement/FHIRUsageContextTest.php | 2 +- .../PHPFHIRTests/FHIRElement/FHIRUseTest.php | 2 +- .../PHPFHIRTests/FHIRElement/FHIRUuidTest.php | 2 +- .../FHIRElement/FHIRVisionBaseTest.php | 2 +- .../FHIRElement/FHIRVisionEyesTest.php | 2 +- .../FHIRElement/FHIRXPathUsageTypeTest.php | 2 +- .../STU3/PHPFHIRTests/FHIRElementTest.php | 2 +- .../FHIREncounterLocationStatusListTest.php | 2 +- .../FHIREncounterStatusListTest.php | 2 +- .../FHIREndpointStatusListTest.php | 2 +- .../FHIREpisodeOfCareStatusListTest.php | 2 +- .../FHIREventCapabilityModeListTest.php | 2 +- .../PHPFHIRTests/FHIREventStatusListTest.php | 2 +- .../PHPFHIRTests/FHIREventTimingListTest.php | 2 +- ...FHIRExplanationOfBenefitStatusListTest.php | 2 +- .../FHIRExtensionContextListTest.php | 2 +- .../PHPFHIRTests/FHIRFHIRAllTypesListTest.php | 2 +- .../FHIRFHIRDefinedTypeListTest.php | 2 +- .../FHIRFHIRDeviceStatusListTest.php | 2 +- .../FHIRFHIRSubstanceStatusListTest.php | 2 +- .../FHIRFamilyHistoryStatusListTest.php | 2 +- .../FHIRFilterOperatorListTest.php | 2 +- ...IRFinancialResourceStatusCodesListTest.php | 2 +- .../PHPFHIRTests/FHIRFlagStatusListTest.php | 2 +- .../PHPFHIRTests/FHIRGoalStatusListTest.php | 2 +- .../FHIRGraphCompartmentRuleListTest.php | 2 +- .../PHPFHIRTests/FHIRGroupTypeListTest.php | 2 +- .../FHIRGuidanceResponseStatusListTest.php | 2 +- .../FHIRGuideDependencyTypeListTest.php | 2 +- .../FHIRGuidePageKindListTest.php | 2 +- .../PHPFHIRTests/FHIRHTTPVerbListTest.php | 2 +- .../STU3/PHPFHIRTests/FHIRIdPrimitiveTest.php | 2 +- .../FHIRIdentifierUseListTest.php | 2 +- .../FHIRIdentityAssuranceLevelListTest.php | 2 +- .../FHIRImmunizationStatusCodesListTest.php | 2 +- .../FHIRInstanceAvailabilityListTest.php | 2 +- .../PHPFHIRTests/FHIRInstantPrimitiveTest.php | 2 +- .../PHPFHIRTests/FHIRIntegerPrimitiveTest.php | 2 +- .../FHIRIssueSeverityListTest.php | 2 +- .../PHPFHIRTests/FHIRIssueTypeListTest.php | 2 +- .../PHPFHIRTests/FHIRLinkTypeListTest.php | 2 +- .../PHPFHIRTests/FHIRLinkageTypeListTest.php | 2 +- .../PHPFHIRTests/FHIRListModeListTest.php | 2 +- .../PHPFHIRTests/FHIRListStatusListTest.php | 2 +- .../PHPFHIRTests/FHIRLocationModeListTest.php | 2 +- .../FHIRLocationStatusListTest.php | 2 +- .../FHIRMarkdownPrimitiveTest.php | 2 +- .../FHIRMeasmntPrincipleListTest.php | 2 +- .../FHIRMeasureReportStatusListTest.php | 2 +- .../FHIRMeasureReportTypeListTest.php | 2 +- ...MedicationAdministrationStatusListTest.php | 2 +- .../FHIRMedicationDispenseStatusListTest.php | 2 +- .../FHIRMedicationRequestIntentListTest.php | 2 +- .../FHIRMedicationRequestPriorityListTest.php | 2 +- .../FHIRMedicationRequestStatusListTest.php | 2 +- .../FHIRMedicationStatementStatusListTest.php | 2 +- .../FHIRMedicationStatementTakenListTest.php | 2 +- .../FHIRMedicationStatusListTest.php | 2 +- ...HIRMessageSignificanceCategoryListTest.php | 2 +- .../STU3/PHPFHIRTests/FHIRNameUseListTest.php | 2 +- ...FHIRNamingSystemIdentifierTypeListTest.php | 2 +- .../FHIRNamingSystemTypeListTest.php | 2 +- .../FHIRNarrativeStatusListTest.php | 2 +- .../PHPFHIRTests/FHIRNoteTypeListTest.php | 2 +- .../FHIRNutritionOrderStatusListTest.php | 2 +- ...HIRObservationRelationshipTypeListTest.php | 2 +- .../FHIRObservationStatusListTest.php | 2 +- .../PHPFHIRTests/FHIROidPrimitiveTest.php | 2 +- .../FHIROperationKindListTest.php | 2 +- .../FHIROperationParameterUseListTest.php | 2 +- .../FHIRParticipantRequiredListTest.php | 2 +- .../FHIRParticipationStatusListTest.php | 2 +- .../FHIRPositiveIntPrimitiveTest.php | 2 +- .../FHIRPropertyRepresentationListTest.php | 2 +- .../PHPFHIRTests/FHIRPropertyTypeListTest.php | 2 +- .../FHIRProvenanceEntityRoleListTest.php | 2 +- .../FHIRPublicationStatusListTest.php | 2 +- .../PHPFHIRTests/FHIRQualityTypeListTest.php | 2 +- .../FHIRQuantityComparatorListTest.php | 2 +- .../FHIRQuestionnaireItemTypeListTest.php | 2 +- ...HIRQuestionnaireResponseStatusListTest.php | 2 +- .../FHIRReferenceHandlingPolicyListTest.php | 2 +- .../FHIRReferenceVersionRulesListTest.php | 2 +- .../FHIRRelatedArtifactTypeListTest.php | 2 +- .../FHIRRemittanceOutcomeListTest.php | 2 +- .../FHIRRepositoryTypeListTest.php | 2 +- .../FHIRRequestIntentListTest.php | 2 +- .../FHIRRequestPriorityListTest.php | 2 +- .../FHIRRequestStatusListTest.php | 2 +- .../FHIRResearchStudyStatusListTest.php | 2 +- .../FHIRResearchSubjectStatusListTest.php | 2 +- .../FHIRResource/FHIRBinaryTest.php | 2 +- .../FHIRResource/FHIRBundleTest.php | 2 +- .../FHIRDomainResource/FHIRAccountTest.php | 2 +- .../FHIRActivityDefinitionTest.php | 2 +- .../FHIRAdverseEventTest.php | 2 +- .../FHIRAllergyIntoleranceTest.php | 2 +- .../FHIRAppointmentResponseTest.php | 2 +- .../FHIRAppointmentTest.php | 2 +- .../FHIRDomainResource/FHIRAuditEventTest.php | 2 +- .../FHIRDomainResource/FHIRBasicTest.php | 2 +- .../FHIRDomainResource/FHIRBodySiteTest.php | 2 +- .../FHIRCapabilityStatementTest.php | 2 +- .../FHIRDomainResource/FHIRCarePlanTest.php | 2 +- .../FHIRDomainResource/FHIRCareTeamTest.php | 2 +- .../FHIRDomainResource/FHIRChargeItemTest.php | 2 +- .../FHIRClaimResponseTest.php | 2 +- .../FHIRDomainResource/FHIRClaimTest.php | 2 +- .../FHIRClinicalImpressionTest.php | 2 +- .../FHIRDomainResource/FHIRCodeSystemTest.php | 2 +- .../FHIRCommunicationRequestTest.php | 2 +- .../FHIRCommunicationTest.php | 2 +- .../FHIRCompartmentDefinitionTest.php | 2 +- .../FHIRCompositionTest.php | 2 +- .../FHIRDomainResource/FHIRConceptMapTest.php | 2 +- .../FHIRDomainResource/FHIRConditionTest.php | 2 +- .../FHIRDomainResource/FHIRConsentTest.php | 2 +- .../FHIRDomainResource/FHIRContractTest.php | 2 +- .../FHIRDomainResource/FHIRCoverageTest.php | 2 +- .../FHIRDataElementTest.php | 2 +- .../FHIRDetectedIssueTest.php | 2 +- .../FHIRDeviceComponentTest.php | 2 +- .../FHIRDeviceMetricTest.php | 2 +- .../FHIRDeviceRequestTest.php | 2 +- .../FHIRDomainResource/FHIRDeviceTest.php | 2 +- .../FHIRDeviceUseStatementTest.php | 2 +- .../FHIRDiagnosticReportTest.php | 2 +- .../FHIRDocumentManifestTest.php | 2 +- .../FHIRDocumentReferenceTest.php | 2 +- .../FHIREligibilityRequestTest.php | 2 +- .../FHIREligibilityResponseTest.php | 2 +- .../FHIRDomainResource/FHIREncounterTest.php | 2 +- .../FHIRDomainResource/FHIREndpointTest.php | 2 +- .../FHIREnrollmentRequestTest.php | 2 +- .../FHIREnrollmentResponseTest.php | 2 +- .../FHIREpisodeOfCareTest.php | 2 +- .../FHIRExpansionProfileTest.php | 2 +- .../FHIRExplanationOfBenefitTest.php | 2 +- .../FHIRFamilyMemberHistoryTest.php | 2 +- .../FHIRDomainResource/FHIRFlagTest.php | 2 +- .../FHIRDomainResource/FHIRGoalTest.php | 2 +- .../FHIRGraphDefinitionTest.php | 2 +- .../FHIRDomainResource/FHIRGroupTest.php | 2 +- .../FHIRGuidanceResponseTest.php | 2 +- .../FHIRHealthcareServiceTest.php | 2 +- .../FHIRImagingManifestTest.php | 2 +- .../FHIRImagingStudyTest.php | 2 +- .../FHIRImmunizationRecommendationTest.php | 2 +- .../FHIRImmunizationTest.php | 2 +- .../FHIRImplementationGuideTest.php | 2 +- .../FHIRDomainResource/FHIRLibraryTest.php | 2 +- .../FHIRDomainResource/FHIRLinkageTest.php | 2 +- .../FHIRDomainResource/FHIRListTest.php | 2 +- .../FHIRDomainResource/FHIRLocationTest.php | 2 +- .../FHIRMeasureReportTest.php | 2 +- .../FHIRDomainResource/FHIRMeasureTest.php | 2 +- .../FHIRDomainResource/FHIRMediaTest.php | 2 +- .../FHIRMedicationAdministrationTest.php | 2 +- .../FHIRMedicationDispenseTest.php | 2 +- .../FHIRMedicationRequestTest.php | 2 +- .../FHIRMedicationStatementTest.php | 2 +- .../FHIRDomainResource/FHIRMedicationTest.php | 2 +- .../FHIRMessageDefinitionTest.php | 2 +- .../FHIRMessageHeaderTest.php | 2 +- .../FHIRNamingSystemTest.php | 2 +- .../FHIRNutritionOrderTest.php | 2 +- .../FHIRObservationTest.php | 2 +- .../FHIROperationDefinitionTest.php | 2 +- .../FHIROperationOutcomeTest.php | 2 +- .../FHIROrganizationTest.php | 2 +- .../FHIRDomainResource/FHIRPatientTest.php | 2 +- .../FHIRPaymentNoticeTest.php | 2 +- .../FHIRPaymentReconciliationTest.php | 2 +- .../FHIRDomainResource/FHIRPersonTest.php | 2 +- .../FHIRPlanDefinitionTest.php | 2 +- .../FHIRPractitionerRoleTest.php | 2 +- .../FHIRPractitionerTest.php | 2 +- .../FHIRProcedureRequestTest.php | 2 +- .../FHIRDomainResource/FHIRProcedureTest.php | 2 +- .../FHIRProcessRequestTest.php | 2 +- .../FHIRProcessResponseTest.php | 2 +- .../FHIRDomainResource/FHIRProvenanceTest.php | 2 +- .../FHIRQuestionnaireResponseTest.php | 2 +- .../FHIRQuestionnaireTest.php | 2 +- .../FHIRReferralRequestTest.php | 2 +- .../FHIRRelatedPersonTest.php | 2 +- .../FHIRRequestGroupTest.php | 2 +- .../FHIRResearchStudyTest.php | 2 +- .../FHIRResearchSubjectTest.php | 2 +- .../FHIRRiskAssessmentTest.php | 2 +- .../FHIRDomainResource/FHIRScheduleTest.php | 2 +- .../FHIRSearchParameterTest.php | 2 +- .../FHIRDomainResource/FHIRSequenceTest.php | 2 +- .../FHIRServiceDefinitionTest.php | 2 +- .../FHIRDomainResource/FHIRSlotTest.php | 2 +- .../FHIRDomainResource/FHIRSpecimenTest.php | 2 +- .../FHIRStructureDefinitionTest.php | 2 +- .../FHIRStructureMapTest.php | 2 +- .../FHIRSubscriptionTest.php | 2 +- .../FHIRDomainResource/FHIRSubstanceTest.php | 2 +- .../FHIRSupplyDeliveryTest.php | 2 +- .../FHIRSupplyRequestTest.php | 2 +- .../FHIRDomainResource/FHIRTaskTest.php | 2 +- .../FHIRDomainResource/FHIRTestReportTest.php | 2 +- .../FHIRDomainResource/FHIRTestScriptTest.php | 2 +- .../FHIRDomainResource/FHIRValueSetTest.php | 2 +- .../FHIRVisionPrescriptionTest.php | 2 +- .../FHIRResource/FHIRDomainResourceTest.php | 2 +- .../FHIRResource/FHIRParametersTest.php | 2 +- .../FHIRResourceContainerTest.php | 2 +- .../STU3/PHPFHIRTests/FHIRResourceTest.php | 2 +- .../PHPFHIRTests/FHIRResourceTypeListTest.php | 2 +- .../PHPFHIRTests/FHIRResourceTypeTest.php | 2 +- .../FHIRResourceVersionPolicyListTest.php | 2 +- .../PHPFHIRTests/FHIRResponseTypeListTest.php | 2 +- .../FHIRRestfulCapabilityModeListTest.php | 2 +- .../FHIRSampledDataDataTypePrimitiveTest.php | 2 +- .../FHIRSearchComparatorListTest.php | 2 +- .../FHIRSearchEntryModeListTest.php | 2 +- .../FHIRSearchModifierCodeListTest.php | 2 +- .../FHIRSearchParamTypeListTest.php | 2 +- .../PHPFHIRTests/FHIRSlicingRulesListTest.php | 2 +- .../PHPFHIRTests/FHIRSlotStatusListTest.php | 2 +- .../FHIRSpecimenStatusListTest.php | 2 +- .../PHPFHIRTests/FHIRStringPrimitiveTest.php | 2 +- .../FHIRStructureDefinitionKindListTest.php | 2 +- .../FHIRStructureMapContextTypeListTest.php | 2 +- .../FHIRStructureMapGroupTypeModeListTest.php | 2 +- .../FHIRStructureMapInputModeListTest.php | 2 +- .../FHIRStructureMapModelModeListTest.php | 2 +- ...FHIRStructureMapSourceListModeListTest.php | 2 +- ...FHIRStructureMapTargetListModeListTest.php | 2 +- .../FHIRStructureMapTransformListTest.php | 2 +- .../FHIRSubscriptionChannelTypeListTest.php | 2 +- .../FHIRSubscriptionStatusListTest.php | 2 +- .../FHIRSupplyDeliveryStatusListTest.php | 2 +- .../FHIRSupplyRequestStatusListTest.php | 2 +- .../FHIRSystemRestfulInteractionListTest.php | 2 +- ...HIRSystemVersionProcessingModeListTest.php | 2 +- .../PHPFHIRTests/FHIRTaskStatusListTest.php | 2 +- .../FHIRTestReportActionResultListTest.php | 2 +- .../FHIRTestReportParticipantTypeListTest.php | 2 +- .../FHIRTestReportResultListTest.php | 2 +- .../FHIRTestReportStatusListTest.php | 2 +- ...HIRTestScriptRequestMethodCodeListTest.php | 2 +- .../PHPFHIRTests/FHIRTimePrimitiveTest.php | 2 +- .../PHPFHIRTests/FHIRTriggerTypeListTest.php | 2 +- .../FHIRTypeDerivationRuleListTest.php | 2 +- .../FHIRTypeRestfulInteractionListTest.php | 2 +- .../PHPFHIRTests/FHIRUDIEntryTypeListTest.php | 2 +- .../PHPFHIRTests/FHIRUnitsOfTimeListTest.php | 2 +- .../FHIRUnknownContentCodeListTest.php | 2 +- .../FHIRUnsignedIntPrimitiveTest.php | 2 +- .../PHPFHIRTests/FHIRUriPrimitiveTest.php | 2 +- .../STU3/PHPFHIRTests/FHIRUseListTest.php | 2 +- .../PHPFHIRTests/FHIRUuidPrimitiveTest.php | 2 +- .../PHPFHIRTests/FHIRVisionBaseListTest.php | 2 +- .../PHPFHIRTests/FHIRVisionEyesListTest.php | 2 +- .../FHIRXPathUsageTypeListTest.php | 2 +- .../PHPFHIRTests/PHPFHIRConstantsTest.php | 2 +- .../STU3/PHPFHIRTests/PHPFHIRTypeMapTest.php | 2 +- .../STU3/PHPFHIRTypeInterface.php | 2 +- .../PHPFHIRGenerated/STU3/PHPFHIRTypeMap.php | 2 +- 6202 files changed, 132719 insertions(+), 48848 deletions(-) diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRAddressUseList.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRAddressUseList.php index a5fa65c804..858cfc8ddd 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRAddressUseList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRAddressUseList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -242,6 +242,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRAggregationModeList.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRAggregationModeList.php index c6ade0c26b..99933bef7e 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRAggregationModeList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRAggregationModeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -241,6 +241,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRAlertStatusList.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRAlertStatusList.php index 099dee1f39..6c455d09f1 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRAlertStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRAlertStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -241,6 +241,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRBase64BinaryPrimitive.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRBase64BinaryPrimitive.php index 1e1c2aff23..3ac2532cea 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRBase64BinaryPrimitive.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRBase64BinaryPrimitive.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -224,6 +224,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRBinary.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRBinary.php index 7b2ad9e2e6..469b995f9b 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRBinary.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRBinary.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -67,9 +67,7 @@ class FHIRBinary implements PHPFHIRCommentContainerInterface, PHPFHIRContainedTy // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_BINARY; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; + const FIELD_FHIR_COMMENTS = 'fhir_comments'; const FIELD_CONTENT_TYPE = 'contentType'; const FIELD_ID = 'id'; @@ -84,6 +82,9 @@ class FHIRBinary implements PHPFHIRCommentContainerInterface, PHPFHIRContainedTy */ protected $id = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRBinary Constructor * @param null|array $data @@ -99,6 +100,13 @@ public function __construct($data = null) gettype($data) )); } + if (isset($data[self::FIELD_FHIR_COMMENTS])) { + if (is_array($data[self::FIELD_FHIR_COMMENTS])) { + $this->_setFHIRComments($data[self::FIELD_FHIR_COMMENTS]); + } else if (is_string($data[self::FIELD_FHIR_COMMENTS])) { + $this->_addFHIRComment($data[self::FIELD_FHIR_COMMENTS]); + } + } if (isset($data[self::FIELD_CONTENT_TYPE])) { $this->setContentType($data[self::FIELD_CONTENT_TYPE]); } @@ -278,8 +286,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 } if (null !== ($v = $this->getContentType())) { $sxe->addAttribute(self::FIELD_CONTENT_TYPE, (string)$v); - } - if (null !== ($v = $this->getId())) { + } if (null !== ($v = $this->getId())) { $sxe->addAttribute(self::FIELD_ID, (string)$v); } return $sxe; @@ -291,6 +298,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 public function jsonSerialize() { $a = []; + if ([] !== ($vs = $this->_getFHIRComments())) { + $a[self::FIELD_FHIR_COMMENTS] = $vs; + } if (null !== ($v = $this->getContentType())) { $a[self::FIELD_CONTENT_TYPE] = $v; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRBindingConformanceList.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRBindingConformanceList.php index da8f1668ac..dea238d178 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRBindingConformanceList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRBindingConformanceList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -241,6 +241,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRBooleanPrimitive.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRBooleanPrimitive.php index 17cfef7bdd..ebca883254 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRBooleanPrimitive.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRBooleanPrimitive.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -220,6 +220,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRCarePlanActivityCategoryList.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRCarePlanActivityCategoryList.php index de1a2b2590..e21f39a633 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRCarePlanActivityCategoryList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRCarePlanActivityCategoryList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -245,6 +245,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRCarePlanActivityStatusList.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRCarePlanActivityStatusList.php index d00d09df05..1c033f9641 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRCarePlanActivityStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRCarePlanActivityStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -244,6 +244,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRCarePlanGoalStatusList.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRCarePlanGoalStatusList.php index 01761de77d..c203372043 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRCarePlanGoalStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRCarePlanGoalStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -242,6 +242,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRCarePlanStatusList.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRCarePlanStatusList.php index f75959b574..0156eada31 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRCarePlanStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRCarePlanStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -241,6 +241,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRCausalityExpectationList.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRCausalityExpectationList.php index 4f4d721d52..42a63985bb 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRCausalityExpectationList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRCausalityExpectationList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -242,6 +242,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRCodePrimitive.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRCodePrimitive.php index f9771a56f9..9b3655f78a 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRCodePrimitive.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRCodePrimitive.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -224,6 +224,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRCompositionAttestationModeList.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRCompositionAttestationModeList.php index f97f37f228..492fa5f01b 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRCompositionAttestationModeList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRCompositionAttestationModeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -242,6 +242,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRCompositionStatusList.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRCompositionStatusList.php index 4e475617d8..a041ec4fbd 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRCompositionStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRCompositionStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -243,6 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRConceptMapEquivalenceList.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRConceptMapEquivalenceList.php index f304edd94f..69b12e06eb 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRConceptMapEquivalenceList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRConceptMapEquivalenceList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -247,6 +247,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRConditionRelationshipTypeList.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRConditionRelationshipTypeList.php index 6abfe28a44..089db1655a 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRConditionRelationshipTypeList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRConditionRelationshipTypeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -240,6 +240,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRConditionStatusList.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRConditionStatusList.php index 9e9ffb7579..29511fac7b 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRConditionStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRConditionStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -242,6 +242,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRConformanceEventModeList.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRConformanceEventModeList.php index 4c653607ef..ce4c7292f3 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRConformanceEventModeList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRConformanceEventModeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -240,6 +240,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRConformanceStatementStatusList.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRConformanceStatementStatusList.php index 0183a31f2b..ee03838e50 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRConformanceStatementStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRConformanceStatementStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -241,6 +241,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRConstraintSeverityList.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRConstraintSeverityList.php index 9cdf4074cb..78589562f7 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRConstraintSeverityList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRConstraintSeverityList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -240,6 +240,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRContactSystemList.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRContactSystemList.php index cdcf502d70..adb639d5fd 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRContactSystemList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRContactSystemList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -242,6 +242,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRContactUseList.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRContactUseList.php index 41e61d9234..83f126301b 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRContactUseList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRContactUseList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -243,6 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRCriticalityList.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRCriticalityList.php index c366988054..60695e366e 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRCriticalityList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRCriticalityList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -242,6 +242,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRDatePrimitive.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRDatePrimitive.php index 38521fd116..23db7c2d4f 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRDatePrimitive.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRDatePrimitive.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -266,6 +266,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRDateTimePrimitive.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRDateTimePrimitive.php index 5189f29a53..ac3756c392 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRDateTimePrimitive.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRDateTimePrimitive.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -268,6 +268,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRDecimalPrimitive.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRDecimalPrimitive.php index 3b0967e2b6..a924444455 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRDecimalPrimitive.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRDecimalPrimitive.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -219,6 +219,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRDiagnosticOrderPriorityList.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRDiagnosticOrderPriorityList.php index d884e09da1..689e9c0d40 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRDiagnosticOrderPriorityList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRDiagnosticOrderPriorityList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -242,6 +242,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRDiagnosticOrderStatusList.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRDiagnosticOrderStatusList.php index 6bbdca1b54..f59b0b4685 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRDiagnosticOrderStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRDiagnosticOrderStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -247,6 +247,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRDiagnosticReportStatusList.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRDiagnosticReportStatusList.php index c7e07510dc..b035680cf4 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRDiagnosticReportStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRDiagnosticReportStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -246,6 +246,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRDocumentModeList.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRDocumentModeList.php index 08e1a54d59..8be71b6128 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRDocumentModeList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRDocumentModeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -240,6 +240,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRDocumentReferenceStatusList.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRDocumentReferenceStatusList.php index 470fc2253f..522082f65a 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRDocumentReferenceStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRDocumentReferenceStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -241,6 +241,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRDocumentRelationshipTypeList.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRDocumentRelationshipTypeList.php index 4134f4aa1b..b1959d6c6e 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRDocumentRelationshipTypeList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRDocumentRelationshipTypeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -242,6 +242,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement.php index d7967b5da0..b767c5dcc0 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -72,9 +72,7 @@ class FHIRElement implements PHPFHIRCommentContainerInterface, PHPFHIRTypeInterf // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ELEMENT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; + const FIELD_FHIR_COMMENTS = 'fhir_comments'; const FIELD_EXTENSION = 'extension'; const FIELD_ID = 'id'; @@ -95,6 +93,9 @@ class FHIRElement implements PHPFHIRCommentContainerInterface, PHPFHIRTypeInterf */ protected $id = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRElement Constructor * @param null|array $data @@ -110,9 +111,19 @@ public function __construct($data = null) gettype($data) )); } + if (isset($data[self::FIELD_FHIR_COMMENTS])) { + if (is_array($data[self::FIELD_FHIR_COMMENTS])) { + $this->_setFHIRComments($data[self::FIELD_FHIR_COMMENTS]); + } else if (is_string($data[self::FIELD_FHIR_COMMENTS])) { + $this->_addFHIRComment($data[self::FIELD_FHIR_COMMENTS]); + } + } if (isset($data[self::FIELD_EXTENSION])) { if (is_array($data[self::FIELD_EXTENSION])) { foreach($data[self::FIELD_EXTENSION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRExtension) { $this->addExtension($v); } else { @@ -341,6 +352,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 public function jsonSerialize() { $a = []; + if ([] !== ($vs = $this->_getFHIRComments())) { + $a[self::FIELD_FHIR_COMMENTS] = $vs; + } if ([] !== ($vs = $this->getExtension())) { $a[self::FIELD_EXTENSION] = $vs; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRAddress.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRAddress.php index 8640ee27c6..3fd8c1a6fb 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRAddress.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRAddress.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -74,10 +74,6 @@ class FHIRAddress extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ADDRESS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CITY = 'city'; const FIELD_CITY_EXT = '_city'; const FIELD_COUNTRY = 'country'; @@ -177,6 +173,9 @@ class FHIRAddress extends FHIRElement */ protected $zip = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRAddress Constructor * @param null|array $data @@ -199,8 +198,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CITY] instanceof FHIRString) { $this->setCity($data[self::FIELD_CITY]); - } elseif ($ext && is_scalar($data[self::FIELD_CITY])) { - $this->setCity(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_CITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CITY])) { + $this->setCity(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_CITY]] + $ext)); + } else if (is_array($data[self::FIELD_CITY])) { + $this->setCity(new FHIRString(array_merge($ext, $data[self::FIELD_CITY]))); + } } else { $this->setCity(new FHIRString($data[self::FIELD_CITY])); } @@ -211,8 +214,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_COUNTRY] instanceof FHIRString) { $this->setCountry($data[self::FIELD_COUNTRY]); - } elseif ($ext && is_scalar($data[self::FIELD_COUNTRY])) { - $this->setCountry(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_COUNTRY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_COUNTRY])) { + $this->setCountry(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_COUNTRY]] + $ext)); + } else if (is_array($data[self::FIELD_COUNTRY])) { + $this->setCountry(new FHIRString(array_merge($ext, $data[self::FIELD_COUNTRY]))); + } } else { $this->setCountry(new FHIRString($data[self::FIELD_COUNTRY])); } @@ -223,17 +230,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_LINE])) { foreach($data[self::FIELD_LINE] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRString) { $this->addLine($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addLine(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addLine(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addLine(new FHIRString(array_merge($v, $ext[$i]))); + } } else { $this->addLine(new FHIRString($v)); } } } elseif ($data[self::FIELD_LINE] instanceof FHIRString) { $this->addLine($data[self::FIELD_LINE]); - } elseif ($ext && is_scalar($data[self::FIELD_LINE])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_LINE])) { $this->addLine(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_LINE]] + $ext)); } else { $this->addLine(new FHIRString($data[self::FIELD_LINE])); @@ -252,8 +266,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATE] instanceof FHIRString) { $this->setState($data[self::FIELD_STATE]); - } elseif ($ext && is_scalar($data[self::FIELD_STATE])) { - $this->setState(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_STATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATE])) { + $this->setState(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_STATE]] + $ext)); + } else if (is_array($data[self::FIELD_STATE])) { + $this->setState(new FHIRString(array_merge($ext, $data[self::FIELD_STATE]))); + } } else { $this->setState(new FHIRString($data[self::FIELD_STATE])); } @@ -264,8 +282,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TEXT] instanceof FHIRString) { $this->setText($data[self::FIELD_TEXT]); - } elseif ($ext && is_scalar($data[self::FIELD_TEXT])) { - $this->setText(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TEXT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TEXT])) { + $this->setText(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TEXT]] + $ext)); + } else if (is_array($data[self::FIELD_TEXT])) { + $this->setText(new FHIRString(array_merge($ext, $data[self::FIELD_TEXT]))); + } } else { $this->setText(new FHIRString($data[self::FIELD_TEXT])); } @@ -276,8 +298,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_USE] instanceof FHIRAddressUse) { $this->setUse($data[self::FIELD_USE]); - } elseif ($ext && is_scalar($data[self::FIELD_USE])) { - $this->setUse(new FHIRAddressUse([FHIRAddressUse::FIELD_VALUE => $data[self::FIELD_USE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_USE])) { + $this->setUse(new FHIRAddressUse([FHIRAddressUse::FIELD_VALUE => $data[self::FIELD_USE]] + $ext)); + } else if (is_array($data[self::FIELD_USE])) { + $this->setUse(new FHIRAddressUse(array_merge($ext, $data[self::FIELD_USE]))); + } } else { $this->setUse(new FHIRAddressUse($data[self::FIELD_USE])); } @@ -288,8 +314,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ZIP] instanceof FHIRString) { $this->setZip($data[self::FIELD_ZIP]); - } elseif ($ext && is_scalar($data[self::FIELD_ZIP])) { - $this->setZip(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_ZIP]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ZIP])) { + $this->setZip(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_ZIP]] + $ext)); + } else if (is_array($data[self::FIELD_ZIP])) { + $this->setZip(new FHIRString(array_merge($ext, $data[self::FIELD_ZIP]))); + } } else { $this->setZip(new FHIRString($data[self::FIELD_ZIP])); } @@ -767,7 +797,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getText())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TEXT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getUse())) { $v->xmlSerialize($sxe->addChild(self::FIELD_USE, null, $v->_getFHIRXMLNamespace())); } @@ -784,12 +813,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getCity())) { - $a[self::FIELD_CITY] = $v->getValue(); - $a[self::FIELD_CITY_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CITY_EXT] = $enc; + } + } else { + $a[self::FIELD_CITY] = $v; + } } if (null !== ($v = $this->getCountry())) { - $a[self::FIELD_COUNTRY] = $v->getValue(); - $a[self::FIELD_COUNTRY_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_COUNTRY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_COUNTRY_EXT] = $enc; + } + } else { + $a[self::FIELD_COUNTRY] = $v; + } } if ([] !== ($vs = $this->getLine())) { $a[self::FIELD_LINE] = []; @@ -797,27 +840,65 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_LINE][] = $v->getValue(); - $a[self::FIELD_LINE_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_LINE][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_LINE_EXT][] = $enc; + } else { + $a[self::FIELD_LINE_EXT][] = null; + } + } else { + $a[self::FIELD_LINE][] = $v; + } } } if (null !== ($v = $this->getPeriod())) { $a[self::FIELD_PERIOD] = $v; } if (null !== ($v = $this->getState())) { - $a[self::FIELD_STATE] = $v->getValue(); - $a[self::FIELD_STATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATE_EXT] = $enc; + } + } else { + $a[self::FIELD_STATE] = $v; + } } if (null !== ($v = $this->getText())) { - $a[self::FIELD_TEXT] = $v->getValue(); - $a[self::FIELD_TEXT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TEXT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TEXT_EXT] = $enc; + } + } else { + $a[self::FIELD_TEXT] = $v; + } } if (null !== ($v = $this->getUse())) { - $a[self::FIELD_USE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_USE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_USE_EXT] = $enc; + } + } else { + $a[self::FIELD_USE] = $v; + } } if (null !== ($v = $this->getZip())) { - $a[self::FIELD_ZIP] = $v->getValue(); - $a[self::FIELD_ZIP_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ZIP] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ZIP_EXT] = $enc; + } + } else { + $a[self::FIELD_ZIP] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRAddressUse.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRAddressUse.php index 16477fac53..6ab3244719 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRAddressUse.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRAddressUse.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -73,10 +73,6 @@ class FHIRAddressUse extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ADDRESS_USE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -84,6 +80,9 @@ class FHIRAddressUse extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRAddressUse Constructor * @param null|array $data @@ -239,8 +238,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRAggregationMode.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRAggregationMode.php index f4b204be1e..129ecb462d 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRAggregationMode.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRAggregationMode.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -73,10 +73,6 @@ class FHIRAggregationMode extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_AGGREGATION_MODE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -84,6 +80,9 @@ class FHIRAggregationMode extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRAggregationMode Constructor * @param null|array $data @@ -239,8 +238,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRAlertStatus.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRAlertStatus.php index 2f9ddabe20..4388b9d507 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRAlertStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRAlertStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -74,10 +74,6 @@ class FHIRAlertStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ALERT_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -85,6 +81,9 @@ class FHIRAlertStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRAlertStatus Constructor * @param null|array $data @@ -240,8 +239,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRAttachment.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRAttachment.php index a0fa4c99a6..7889c68d94 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRAttachment.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRAttachment.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -73,10 +73,6 @@ class FHIRAttachment extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ATTACHMENT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CONTENT_TYPE = 'contentType'; const FIELD_CONTENT_TYPE_EXT = '_contentType'; const FIELD_DATA = 'data'; @@ -170,6 +166,9 @@ class FHIRAttachment extends FHIRElement */ protected $url = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRAttachment Constructor * @param null|array $data @@ -192,8 +191,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CONTENT_TYPE] instanceof FHIRCode) { $this->setContentType($data[self::FIELD_CONTENT_TYPE]); - } elseif ($ext && is_scalar($data[self::FIELD_CONTENT_TYPE])) { - $this->setContentType(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_CONTENT_TYPE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CONTENT_TYPE])) { + $this->setContentType(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_CONTENT_TYPE]] + $ext)); + } else if (is_array($data[self::FIELD_CONTENT_TYPE])) { + $this->setContentType(new FHIRCode(array_merge($ext, $data[self::FIELD_CONTENT_TYPE]))); + } } else { $this->setContentType(new FHIRCode($data[self::FIELD_CONTENT_TYPE])); } @@ -204,8 +207,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATA] instanceof FHIRBase64Binary) { $this->setData($data[self::FIELD_DATA]); - } elseif ($ext && is_scalar($data[self::FIELD_DATA])) { - $this->setData(new FHIRBase64Binary([FHIRBase64Binary::FIELD_VALUE => $data[self::FIELD_DATA]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATA])) { + $this->setData(new FHIRBase64Binary([FHIRBase64Binary::FIELD_VALUE => $data[self::FIELD_DATA]] + $ext)); + } else if (is_array($data[self::FIELD_DATA])) { + $this->setData(new FHIRBase64Binary(array_merge($ext, $data[self::FIELD_DATA]))); + } } else { $this->setData(new FHIRBase64Binary($data[self::FIELD_DATA])); } @@ -216,8 +223,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_HASH] instanceof FHIRBase64Binary) { $this->setHash($data[self::FIELD_HASH]); - } elseif ($ext && is_scalar($data[self::FIELD_HASH])) { - $this->setHash(new FHIRBase64Binary([FHIRBase64Binary::FIELD_VALUE => $data[self::FIELD_HASH]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_HASH])) { + $this->setHash(new FHIRBase64Binary([FHIRBase64Binary::FIELD_VALUE => $data[self::FIELD_HASH]] + $ext)); + } else if (is_array($data[self::FIELD_HASH])) { + $this->setHash(new FHIRBase64Binary(array_merge($ext, $data[self::FIELD_HASH]))); + } } else { $this->setHash(new FHIRBase64Binary($data[self::FIELD_HASH])); } @@ -228,8 +239,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_LANGUAGE] instanceof FHIRCode) { $this->setLanguage($data[self::FIELD_LANGUAGE]); - } elseif ($ext && is_scalar($data[self::FIELD_LANGUAGE])) { - $this->setLanguage(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_LANGUAGE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_LANGUAGE])) { + $this->setLanguage(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_LANGUAGE]] + $ext)); + } else if (is_array($data[self::FIELD_LANGUAGE])) { + $this->setLanguage(new FHIRCode(array_merge($ext, $data[self::FIELD_LANGUAGE]))); + } } else { $this->setLanguage(new FHIRCode($data[self::FIELD_LANGUAGE])); } @@ -240,8 +255,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SIZE] instanceof FHIRInteger) { $this->setSize($data[self::FIELD_SIZE]); - } elseif ($ext && is_scalar($data[self::FIELD_SIZE])) { - $this->setSize(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_SIZE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SIZE])) { + $this->setSize(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_SIZE]] + $ext)); + } else if (is_array($data[self::FIELD_SIZE])) { + $this->setSize(new FHIRInteger(array_merge($ext, $data[self::FIELD_SIZE]))); + } } else { $this->setSize(new FHIRInteger($data[self::FIELD_SIZE])); } @@ -252,8 +271,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TITLE] instanceof FHIRString) { $this->setTitle($data[self::FIELD_TITLE]); - } elseif ($ext && is_scalar($data[self::FIELD_TITLE])) { - $this->setTitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TITLE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TITLE])) { + $this->setTitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TITLE]] + $ext)); + } else if (is_array($data[self::FIELD_TITLE])) { + $this->setTitle(new FHIRString(array_merge($ext, $data[self::FIELD_TITLE]))); + } } else { $this->setTitle(new FHIRString($data[self::FIELD_TITLE])); } @@ -264,8 +287,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_URL] instanceof FHIRUri) { $this->setUrl($data[self::FIELD_URL]); - } elseif ($ext && is_scalar($data[self::FIELD_URL])) { - $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } else if (is_array($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri(array_merge($ext, $data[self::FIELD_URL]))); + } } else { $this->setUrl(new FHIRUri($data[self::FIELD_URL])); } @@ -712,32 +739,81 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getContentType())) { - $a[self::FIELD_CONTENT_TYPE] = $v->getValue(); - $a[self::FIELD_CONTENT_TYPE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CONTENT_TYPE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CONTENT_TYPE_EXT] = $enc; + } + } else { + $a[self::FIELD_CONTENT_TYPE] = $v; + } } if (null !== ($v = $this->getData())) { - $a[self::FIELD_DATA] = $v->getValue(); - $a[self::FIELD_DATA_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATA] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATA_EXT] = $enc; + } + } else { + $a[self::FIELD_DATA] = $v; + } } if (null !== ($v = $this->getHash())) { - $a[self::FIELD_HASH] = $v->getValue(); - $a[self::FIELD_HASH_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_HASH] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_HASH_EXT] = $enc; + } + } else { + $a[self::FIELD_HASH] = $v; + } } if (null !== ($v = $this->getLanguage())) { - $a[self::FIELD_LANGUAGE] = $v->getValue(); - $a[self::FIELD_LANGUAGE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_LANGUAGE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_LANGUAGE_EXT] = $enc; + } + } else { + $a[self::FIELD_LANGUAGE] = $v; + } } if (null !== ($v = $this->getSize())) { - $a[self::FIELD_SIZE] = $v->getValue(); - $a[self::FIELD_SIZE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SIZE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SIZE_EXT] = $enc; + } + } else { + $a[self::FIELD_SIZE] = $v; + } } if (null !== ($v = $this->getTitle())) { - $a[self::FIELD_TITLE] = $v->getValue(); - $a[self::FIELD_TITLE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TITLE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TITLE_EXT] = $enc; + } + } else { + $a[self::FIELD_TITLE] = $v; + } } if (null !== ($v = $this->getUrl())) { - $a[self::FIELD_URL] = $v->getValue(); - $a[self::FIELD_URL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_URL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_URL_EXT] = $enc; + } + } else { + $a[self::FIELD_URL] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement.php index ffb7bdbf84..acf7dba6bd 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -71,10 +71,6 @@ class FHIRBackboneElement extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_BACKBONE_ELEMENT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_MODIFIER_EXTENSION = 'modifierExtension'; /** @@ -89,6 +85,9 @@ class FHIRBackboneElement extends FHIRElement */ protected $modifierExtension = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRBackboneElement Constructor * @param null|array $data @@ -108,6 +107,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_MODIFIER_EXTENSION])) { if (is_array($data[self::FIELD_MODIFIER_EXTENSION])) { foreach($data[self::FIELD_MODIFIER_EXTENSION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRExtension) { $this->addModifierExtension($v); } else { @@ -285,7 +287,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getModifierExtension())) { foreach($vs as $v) { if (null === $v) { @@ -294,6 +295,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_MODIFIER_EXTENSION, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRAdverseReaction/FHIRAdverseReactionExposure.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRAdverseReaction/FHIRAdverseReactionExposure.php index 1c32213426..94e9a9ee6d 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRAdverseReaction/FHIRAdverseReactionExposure.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRAdverseReaction/FHIRAdverseReactionExposure.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -76,10 +76,6 @@ class FHIRAdverseReactionExposure extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ADVERSE_REACTION_DOT_EXPOSURE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CAUSALITY_EXPECTATION = 'causalityExpectation'; const FIELD_CAUSALITY_EXPECTATION_EXT = '_causalityExpectation'; const FIELD_DATE = 'date'; @@ -134,6 +130,9 @@ class FHIRAdverseReactionExposure extends FHIRBackboneElement */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRAdverseReactionExposure Constructor * @param null|array $data @@ -156,8 +155,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CAUSALITY_EXPECTATION] instanceof FHIRCausalityExpectation) { $this->setCausalityExpectation($data[self::FIELD_CAUSALITY_EXPECTATION]); - } elseif ($ext && is_scalar($data[self::FIELD_CAUSALITY_EXPECTATION])) { - $this->setCausalityExpectation(new FHIRCausalityExpectation([FHIRCausalityExpectation::FIELD_VALUE => $data[self::FIELD_CAUSALITY_EXPECTATION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CAUSALITY_EXPECTATION])) { + $this->setCausalityExpectation(new FHIRCausalityExpectation([FHIRCausalityExpectation::FIELD_VALUE => $data[self::FIELD_CAUSALITY_EXPECTATION]] + $ext)); + } else if (is_array($data[self::FIELD_CAUSALITY_EXPECTATION])) { + $this->setCausalityExpectation(new FHIRCausalityExpectation(array_merge($ext, $data[self::FIELD_CAUSALITY_EXPECTATION]))); + } } else { $this->setCausalityExpectation(new FHIRCausalityExpectation($data[self::FIELD_CAUSALITY_EXPECTATION])); } @@ -168,8 +171,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATE] instanceof FHIRDateTime) { $this->setDate($data[self::FIELD_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_DATE])) { - $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime(array_merge($ext, $data[self::FIELD_DATE]))); + } } else { $this->setDate(new FHIRDateTime($data[self::FIELD_DATE])); } @@ -187,8 +194,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TYPE] instanceof FHIRExposureType) { $this->setType($data[self::FIELD_TYPE]); - } elseif ($ext && is_scalar($data[self::FIELD_TYPE])) { - $this->setType(new FHIRExposureType([FHIRExposureType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TYPE])) { + $this->setType(new FHIRExposureType([FHIRExposureType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } else if (is_array($data[self::FIELD_TYPE])) { + $this->setType(new FHIRExposureType(array_merge($ext, $data[self::FIELD_TYPE]))); + } } else { $this->setType(new FHIRExposureType($data[self::FIELD_TYPE])); } @@ -441,18 +452,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getCausalityExpectation())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CAUSALITY_EXPECTATION, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DATE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSubstance())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBSTANCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -466,17 +474,40 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getCausalityExpectation())) { - $a[self::FIELD_CAUSALITY_EXPECTATION] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CAUSALITY_EXPECTATION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CAUSALITY_EXPECTATION_EXT] = $enc; + } + } else { + $a[self::FIELD_CAUSALITY_EXPECTATION] = $v; + } } if (null !== ($v = $this->getDate())) { - $a[self::FIELD_DATE] = $v->getValue(); - $a[self::FIELD_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_DATE] = $v; + } } if (null !== ($v = $this->getSubstance())) { $a[self::FIELD_SUBSTANCE] = $v; } if (null !== ($v = $this->getType())) { - $a[self::FIELD_TYPE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TYPE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TYPE_EXT] = $enc; + } + } else { + $a[self::FIELD_TYPE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRAdverseReaction/FHIRAdverseReactionSymptom.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRAdverseReaction/FHIRAdverseReactionSymptom.php index 97401d6286..00778dbbcb 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRAdverseReaction/FHIRAdverseReactionSymptom.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRAdverseReaction/FHIRAdverseReactionSymptom.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -74,10 +74,6 @@ class FHIRAdverseReactionSymptom extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ADVERSE_REACTION_DOT_SYMPTOM; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CODE = 'code'; const FIELD_SEVERITY = 'severity'; const FIELD_SEVERITY_EXT = '_severity'; @@ -104,6 +100,9 @@ class FHIRAdverseReactionSymptom extends FHIRBackboneElement */ protected $severity = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRAdverseReactionSymptom Constructor * @param null|array $data @@ -133,8 +132,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SEVERITY] instanceof FHIRReactionSeverity) { $this->setSeverity($data[self::FIELD_SEVERITY]); - } elseif ($ext && is_scalar($data[self::FIELD_SEVERITY])) { - $this->setSeverity(new FHIRReactionSeverity([FHIRReactionSeverity::FIELD_VALUE => $data[self::FIELD_SEVERITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SEVERITY])) { + $this->setSeverity(new FHIRReactionSeverity([FHIRReactionSeverity::FIELD_VALUE => $data[self::FIELD_SEVERITY]] + $ext)); + } else if (is_array($data[self::FIELD_SEVERITY])) { + $this->setSeverity(new FHIRReactionSeverity(array_merge($ext, $data[self::FIELD_SEVERITY]))); + } } else { $this->setSeverity(new FHIRReactionSeverity($data[self::FIELD_SEVERITY])); } @@ -306,11 +309,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSeverity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SEVERITY, null, $v->_getFHIRXMLNamespace())); } @@ -327,7 +328,15 @@ public function jsonSerialize() $a[self::FIELD_CODE] = $v; } if (null !== ($v = $this->getSeverity())) { - $a[self::FIELD_SEVERITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SEVERITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SEVERITY_EXT] = $enc; + } + } else { + $a[self::FIELD_SEVERITY] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRCarePlan/FHIRCarePlanActivity.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRCarePlan/FHIRCarePlanActivity.php index 6a4e911bbc..4ca6ca8df2 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRCarePlan/FHIRCarePlanActivity.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRCarePlan/FHIRCarePlanActivity.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRCarePlanActivity extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CARE_PLAN_DOT_ACTIVITY; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ACTION_RESULTING = 'actionResulting'; const FIELD_DETAIL = 'detail'; const FIELD_GOAL = 'goal'; @@ -167,6 +163,9 @@ class FHIRCarePlanActivity extends FHIRBackboneElement */ protected $status = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRCarePlanActivity Constructor * @param null|array $data @@ -186,6 +185,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ACTION_RESULTING])) { if (is_array($data[self::FIELD_ACTION_RESULTING])) { foreach($data[self::FIELD_ACTION_RESULTING] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRResourceReference) { $this->addActionResulting($v); } else { @@ -208,6 +210,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_GOAL])) { if (is_array($data[self::FIELD_GOAL])) { foreach($data[self::FIELD_GOAL] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRXmlIdRef) { $this->addGoal($v); } else { @@ -226,8 +231,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NOTES] instanceof FHIRString) { $this->setNotes($data[self::FIELD_NOTES]); - } elseif ($ext && is_scalar($data[self::FIELD_NOTES])) { - $this->setNotes(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NOTES]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NOTES])) { + $this->setNotes(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NOTES]] + $ext)); + } else if (is_array($data[self::FIELD_NOTES])) { + $this->setNotes(new FHIRString(array_merge($ext, $data[self::FIELD_NOTES]))); + } } else { $this->setNotes(new FHIRString($data[self::FIELD_NOTES])); } @@ -238,8 +247,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PROHIBITED] instanceof FHIRBoolean) { $this->setProhibited($data[self::FIELD_PROHIBITED]); - } elseif ($ext && is_scalar($data[self::FIELD_PROHIBITED])) { - $this->setProhibited(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_PROHIBITED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PROHIBITED])) { + $this->setProhibited(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_PROHIBITED]] + $ext)); + } else if (is_array($data[self::FIELD_PROHIBITED])) { + $this->setProhibited(new FHIRBoolean(array_merge($ext, $data[self::FIELD_PROHIBITED]))); + } } else { $this->setProhibited(new FHIRBoolean($data[self::FIELD_PROHIBITED])); } @@ -257,8 +270,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRCarePlanActivityStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRCarePlanActivityStatus([FHIRCarePlanActivityStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRCarePlanActivityStatus([FHIRCarePlanActivityStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRCarePlanActivityStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRCarePlanActivityStatus($data[self::FIELD_STATUS])); } @@ -665,7 +682,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getActionResulting())) { foreach($vs as $v) { if (null === $v) { @@ -678,7 +694,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDetail())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DETAIL, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getGoal())) { foreach($vs as $v) { if (null === $v) { @@ -687,17 +702,16 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_GOAL, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getNotes())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NOTES, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getProhibited())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PROHIBITED, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSimple())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SIMPLE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } @@ -720,18 +734,40 @@ public function jsonSerialize() $a[self::FIELD_GOAL] = $vs; } if (null !== ($v = $this->getNotes())) { - $a[self::FIELD_NOTES] = $v->getValue(); - $a[self::FIELD_NOTES_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NOTES] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NOTES_EXT] = $enc; + } + } else { + $a[self::FIELD_NOTES] = $v; + } } if (null !== ($v = $this->getProhibited())) { - $a[self::FIELD_PROHIBITED] = $v->getValue(); - $a[self::FIELD_PROHIBITED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PROHIBITED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PROHIBITED_EXT] = $enc; + } + } else { + $a[self::FIELD_PROHIBITED] = $v; + } } if (null !== ($v = $this->getSimple())) { $a[self::FIELD_SIMPLE] = $v; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRCarePlan/FHIRCarePlanGoal.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRCarePlan/FHIRCarePlanGoal.php index fa33f6e339..e454dca308 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRCarePlan/FHIRCarePlanGoal.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRCarePlan/FHIRCarePlanGoal.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -76,10 +76,6 @@ class FHIRCarePlanGoal extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CARE_PLAN_DOT_GOAL; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CONCERN = 'concern'; const FIELD_DESCRIPTION = 'description'; const FIELD_DESCRIPTION_EXT = '_description'; @@ -130,6 +126,9 @@ class FHIRCarePlanGoal extends FHIRBackboneElement */ protected $status = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRCarePlanGoal Constructor * @param null|array $data @@ -149,6 +148,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CONCERN])) { if (is_array($data[self::FIELD_CONCERN])) { foreach($data[self::FIELD_CONCERN] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRResourceReference) { $this->addConcern($v); } else { @@ -167,8 +169,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -179,8 +185,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NOTES] instanceof FHIRString) { $this->setNotes($data[self::FIELD_NOTES]); - } elseif ($ext && is_scalar($data[self::FIELD_NOTES])) { - $this->setNotes(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NOTES]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NOTES])) { + $this->setNotes(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NOTES]] + $ext)); + } else if (is_array($data[self::FIELD_NOTES])) { + $this->setNotes(new FHIRString(array_merge($ext, $data[self::FIELD_NOTES]))); + } } else { $this->setNotes(new FHIRString($data[self::FIELD_NOTES])); } @@ -191,8 +201,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRCarePlanGoalStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRCarePlanGoalStatus([FHIRCarePlanGoalStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRCarePlanGoalStatus([FHIRCarePlanGoalStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRCarePlanGoalStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRCarePlanGoalStatus($data[self::FIELD_STATUS])); } @@ -477,7 +491,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getConcern())) { foreach($vs as $v) { if (null === $v) { @@ -486,13 +499,13 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_CONCERN, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getDescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESCRIPTION, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getNotes())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NOTES, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } @@ -509,15 +522,37 @@ public function jsonSerialize() $a[self::FIELD_CONCERN] = $vs; } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if (null !== ($v = $this->getNotes())) { - $a[self::FIELD_NOTES] = $v->getValue(); - $a[self::FIELD_NOTES_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NOTES] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NOTES_EXT] = $enc; + } + } else { + $a[self::FIELD_NOTES] = $v; + } } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRCarePlan/FHIRCarePlanParticipant.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRCarePlan/FHIRCarePlanParticipant.php index a5257a141e..f5bcbb3765 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRCarePlan/FHIRCarePlanParticipant.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRCarePlan/FHIRCarePlanParticipant.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -75,10 +75,6 @@ class FHIRCarePlanParticipant extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CARE_PLAN_DOT_PARTICIPANT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_MEMBER = 'member'; const FIELD_ROLE = 'role'; @@ -107,6 +103,9 @@ class FHIRCarePlanParticipant extends FHIRBackboneElement */ protected $role = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRCarePlanParticipant Constructor * @param null|array $data @@ -310,11 +309,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getMember())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MEMBER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRole())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ROLE, null, $v->_getFHIRXMLNamespace())); } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRCarePlan/FHIRCarePlanSimple.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRCarePlan/FHIRCarePlanSimple.php index 4258f694cd..cee378a8ee 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRCarePlan/FHIRCarePlanSimple.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRCarePlan/FHIRCarePlanSimple.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRCarePlanSimple extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CARE_PLAN_DOT_SIMPLE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CATEGORY = 'category'; const FIELD_CATEGORY_EXT = '_category'; const FIELD_CODE = 'code'; @@ -231,6 +227,9 @@ class FHIRCarePlanSimple extends FHIRBackboneElement */ protected $timingString = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRCarePlanSimple Constructor * @param null|array $data @@ -253,8 +252,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CATEGORY] instanceof FHIRCarePlanActivityCategory) { $this->setCategory($data[self::FIELD_CATEGORY]); - } elseif ($ext && is_scalar($data[self::FIELD_CATEGORY])) { - $this->setCategory(new FHIRCarePlanActivityCategory([FHIRCarePlanActivityCategory::FIELD_VALUE => $data[self::FIELD_CATEGORY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CATEGORY])) { + $this->setCategory(new FHIRCarePlanActivityCategory([FHIRCarePlanActivityCategory::FIELD_VALUE => $data[self::FIELD_CATEGORY]] + $ext)); + } else if (is_array($data[self::FIELD_CATEGORY])) { + $this->setCategory(new FHIRCarePlanActivityCategory(array_merge($ext, $data[self::FIELD_CATEGORY]))); + } } else { $this->setCategory(new FHIRCarePlanActivityCategory($data[self::FIELD_CATEGORY])); } @@ -272,8 +275,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DAILY_AMOUNT] instanceof FHIRQuantity) { $this->setDailyAmount($data[self::FIELD_DAILY_AMOUNT]); - } elseif ($ext && is_scalar($data[self::FIELD_DAILY_AMOUNT])) { - $this->setDailyAmount(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_DAILY_AMOUNT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DAILY_AMOUNT])) { + $this->setDailyAmount(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_DAILY_AMOUNT]] + $ext)); + } else if (is_array($data[self::FIELD_DAILY_AMOUNT])) { + $this->setDailyAmount(new FHIRQuantity(array_merge($ext, $data[self::FIELD_DAILY_AMOUNT]))); + } } else { $this->setDailyAmount(new FHIRQuantity($data[self::FIELD_DAILY_AMOUNT])); } @@ -284,8 +291,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DETAILS] instanceof FHIRString) { $this->setDetails($data[self::FIELD_DETAILS]); - } elseif ($ext && is_scalar($data[self::FIELD_DETAILS])) { - $this->setDetails(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DETAILS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DETAILS])) { + $this->setDetails(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DETAILS]] + $ext)); + } else if (is_array($data[self::FIELD_DETAILS])) { + $this->setDetails(new FHIRString(array_merge($ext, $data[self::FIELD_DETAILS]))); + } } else { $this->setDetails(new FHIRString($data[self::FIELD_DETAILS])); } @@ -300,6 +311,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PERFORMER])) { if (is_array($data[self::FIELD_PERFORMER])) { foreach($data[self::FIELD_PERFORMER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRResourceReference) { $this->addPerformer($v); } else { @@ -325,8 +339,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_QUANTITY] instanceof FHIRQuantity) { $this->setQuantity($data[self::FIELD_QUANTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_QUANTITY])) { - $this->setQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_QUANTITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_QUANTITY])) { + $this->setQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_QUANTITY])) { + $this->setQuantity(new FHIRQuantity(array_merge($ext, $data[self::FIELD_QUANTITY]))); + } } else { $this->setQuantity(new FHIRQuantity($data[self::FIELD_QUANTITY])); } @@ -351,8 +369,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TIMING_STRING] instanceof FHIRString) { $this->setTimingString($data[self::FIELD_TIMING_STRING]); - } elseif ($ext && is_scalar($data[self::FIELD_TIMING_STRING])) { - $this->setTimingString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TIMING_STRING]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TIMING_STRING])) { + $this->setTimingString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TIMING_STRING]] + $ext)); + } else if (is_array($data[self::FIELD_TIMING_STRING])) { + $this->setTimingString(new FHIRString(array_merge($ext, $data[self::FIELD_TIMING_STRING]))); + } } else { $this->setTimingString(new FHIRString($data[self::FIELD_TIMING_STRING])); } @@ -889,26 +911,21 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getCategory())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CATEGORY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDailyAmount())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DAILY_AMOUNT, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getDetails())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DETAILS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getLocation())) { $v->xmlSerialize($sxe->addChild(self::FIELD_LOCATION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getPerformer())) { foreach($vs as $v) { if (null === $v) { @@ -921,15 +938,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getProduct())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PRODUCT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_QUANTITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getTimingPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TIMING_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getTimingSchedule())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TIMING_SCHEDULE, null, $v->_getFHIRXMLNamespace())); } @@ -946,17 +960,40 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getCategory())) { - $a[self::FIELD_CATEGORY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CATEGORY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CATEGORY_EXT] = $enc; + } + } else { + $a[self::FIELD_CATEGORY] = $v; + } } if (null !== ($v = $this->getCode())) { $a[self::FIELD_CODE] = $v; } if (null !== ($v = $this->getDailyAmount())) { - $a[self::FIELD_DAILY_AMOUNT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DAILY_AMOUNT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DAILY_AMOUNT_EXT] = $enc; + } + } else { + $a[self::FIELD_DAILY_AMOUNT] = $v; + } } if (null !== ($v = $this->getDetails())) { - $a[self::FIELD_DETAILS] = $v->getValue(); - $a[self::FIELD_DETAILS_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DETAILS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DETAILS_EXT] = $enc; + } + } else { + $a[self::FIELD_DETAILS] = $v; + } } if (null !== ($v = $this->getLocation())) { $a[self::FIELD_LOCATION] = $v; @@ -968,7 +1005,15 @@ public function jsonSerialize() $a[self::FIELD_PRODUCT] = $v; } if (null !== ($v = $this->getQuantity())) { - $a[self::FIELD_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_QUANTITY] = $v; + } } if (null !== ($v = $this->getTimingPeriod())) { $a[self::FIELD_TIMING_PERIOD] = $v; @@ -977,8 +1022,15 @@ public function jsonSerialize() $a[self::FIELD_TIMING_SCHEDULE] = $v; } if (null !== ($v = $this->getTimingString())) { - $a[self::FIELD_TIMING_STRING] = $v->getValue(); - $a[self::FIELD_TIMING_STRING_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TIMING_STRING] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TIMING_STRING_EXT] = $enc; + } + } else { + $a[self::FIELD_TIMING_STRING] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRComposition/FHIRCompositionAttester.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRComposition/FHIRCompositionAttester.php index 27e7f95e52..b27e99196d 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRComposition/FHIRCompositionAttester.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRComposition/FHIRCompositionAttester.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -77,10 +77,6 @@ class FHIRCompositionAttester extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_COMPOSITION_DOT_ATTESTER; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_MODE = 'mode'; const FIELD_MODE_EXT = '_mode'; const FIELD_PARTY = 'party'; @@ -121,6 +117,9 @@ class FHIRCompositionAttester extends FHIRBackboneElement */ protected $time = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRCompositionAttester Constructor * @param null|array $data @@ -143,17 +142,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_MODE])) { foreach($data[self::FIELD_MODE] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCompositionAttestationMode) { $this->addMode($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addMode(new FHIRCompositionAttestationMode([FHIRCompositionAttestationMode::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addMode(new FHIRCompositionAttestationMode([FHIRCompositionAttestationMode::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addMode(new FHIRCompositionAttestationMode(array_merge($v, $ext[$i]))); + } } else { $this->addMode(new FHIRCompositionAttestationMode($v)); } } } elseif ($data[self::FIELD_MODE] instanceof FHIRCompositionAttestationMode) { $this->addMode($data[self::FIELD_MODE]); - } elseif ($ext && is_scalar($data[self::FIELD_MODE])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_MODE])) { $this->addMode(new FHIRCompositionAttestationMode([FHIRCompositionAttestationMode::FIELD_VALUE => $data[self::FIELD_MODE]] + $ext)); } else { $this->addMode(new FHIRCompositionAttestationMode($data[self::FIELD_MODE])); @@ -172,8 +178,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TIME] instanceof FHIRDateTime) { $this->setTime($data[self::FIELD_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_TIME])) { - $this->setTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TIME])) { + $this->setTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_TIME])) { + $this->setTime(new FHIRDateTime(array_merge($ext, $data[self::FIELD_TIME]))); + } } else { $this->setTime(new FHIRDateTime($data[self::FIELD_TIME])); } @@ -418,7 +428,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getMode())) { foreach($vs as $v) { if (null === $v) { @@ -444,14 +453,37 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if ([] !== ($vs = $this->getMode())) { - $a[self::FIELD_MODE] = $vs; + $a[self::FIELD_MODE] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MODE][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MODE_EXT][] = $enc; + } else { + $a[self::FIELD_MODE_EXT][] = null; + } + } else { + $a[self::FIELD_MODE][] = $v; + } + } } if (null !== ($v = $this->getParty())) { $a[self::FIELD_PARTY] = $v; } if (null !== ($v = $this->getTime())) { - $a[self::FIELD_TIME] = $v->getValue(); - $a[self::FIELD_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_TIME] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRComposition/FHIRCompositionEvent.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRComposition/FHIRCompositionEvent.php index 5480f03f8a..58bab9b559 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRComposition/FHIRCompositionEvent.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRComposition/FHIRCompositionEvent.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -77,10 +77,6 @@ class FHIRCompositionEvent extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_COMPOSITION_DOT_EVENT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CODE = 'code'; const FIELD_DETAIL = 'detail'; const FIELD_PERIOD = 'period'; @@ -124,6 +120,9 @@ class FHIRCompositionEvent extends FHIRBackboneElement */ protected $period = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRCompositionEvent Constructor * @param null|array $data @@ -143,6 +142,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CODE])) { if (is_array($data[self::FIELD_CODE])) { foreach($data[self::FIELD_CODE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addCode($v); } else { @@ -158,6 +160,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_DETAIL])) { if (is_array($data[self::FIELD_DETAIL])) { foreach($data[self::FIELD_DETAIL] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRResourceReference) { $this->addDetail($v); } else { @@ -449,7 +454,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getCode())) { foreach($vs as $v) { if (null === $v) { diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRComposition/FHIRCompositionSection.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRComposition/FHIRCompositionSection.php index bedbca3c6b..f7fd66e152 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRComposition/FHIRCompositionSection.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRComposition/FHIRCompositionSection.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -77,10 +77,6 @@ class FHIRCompositionSection extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_COMPOSITION_DOT_SECTION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CODE = 'code'; const FIELD_CONTENT = 'content'; const FIELD_SECTION = 'section'; @@ -145,6 +141,9 @@ class FHIRCompositionSection extends FHIRBackboneElement */ protected $title = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRCompositionSection Constructor * @param null|array $data @@ -178,6 +177,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SECTION])) { if (is_array($data[self::FIELD_SECTION])) { foreach($data[self::FIELD_SECTION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCompositionSection) { $this->addSection($v); } else { @@ -203,8 +205,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TITLE] instanceof FHIRString) { $this->setTitle($data[self::FIELD_TITLE]); - } elseif ($ext && is_scalar($data[self::FIELD_TITLE])) { - $this->setTitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TITLE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TITLE])) { + $this->setTitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TITLE]] + $ext)); + } else if (is_array($data[self::FIELD_TITLE])) { + $this->setTitle(new FHIRString(array_merge($ext, $data[self::FIELD_TITLE]))); + } } else { $this->setTitle(new FHIRString($data[self::FIELD_TITLE])); } @@ -519,15 +525,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getContent())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CONTENT, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getSection())) { foreach($vs as $v) { if (null === $v) { @@ -565,8 +568,15 @@ public function jsonSerialize() $a[self::FIELD_SUBJECT] = $v; } if (null !== ($v = $this->getTitle())) { - $a[self::FIELD_TITLE] = $v->getValue(); - $a[self::FIELD_TITLE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TITLE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TITLE_EXT] = $enc; + } + } else { + $a[self::FIELD_TITLE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRConceptMap/FHIRConceptMapConcept.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRConceptMap/FHIRConceptMapConcept.php index a6c3018d8b..64d4e359e7 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRConceptMap/FHIRConceptMapConcept.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRConceptMap/FHIRConceptMapConcept.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -74,10 +74,6 @@ class FHIRConceptMapConcept extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONCEPT_MAP_DOT_CONCEPT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CODE = 'code'; const FIELD_CODE_EXT = '_code'; const FIELD_DEPENDS_ON = 'dependsOn'; @@ -129,6 +125,9 @@ class FHIRConceptMapConcept extends FHIRBackboneElement */ protected $system = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRConceptMapConcept Constructor * @param null|array $data @@ -151,8 +150,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CODE] instanceof FHIRCode) { $this->setCode($data[self::FIELD_CODE]); - } elseif ($ext && is_scalar($data[self::FIELD_CODE])) { - $this->setCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_CODE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CODE])) { + $this->setCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_CODE]] + $ext)); + } else if (is_array($data[self::FIELD_CODE])) { + $this->setCode(new FHIRCode(array_merge($ext, $data[self::FIELD_CODE]))); + } } else { $this->setCode(new FHIRCode($data[self::FIELD_CODE])); } @@ -160,6 +163,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_DEPENDS_ON])) { if (is_array($data[self::FIELD_DEPENDS_ON])) { foreach($data[self::FIELD_DEPENDS_ON] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRConceptMapDependsOn) { $this->addDependsOn($v); } else { @@ -175,6 +181,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_MAP])) { if (is_array($data[self::FIELD_MAP])) { foreach($data[self::FIELD_MAP] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRConceptMapMap) { $this->addMap($v); } else { @@ -193,8 +202,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SYSTEM] instanceof FHIRUri) { $this->setSystem($data[self::FIELD_SYSTEM]); - } elseif ($ext && is_scalar($data[self::FIELD_SYSTEM])) { - $this->setSystem(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_SYSTEM]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SYSTEM])) { + $this->setSystem(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_SYSTEM]] + $ext)); + } else if (is_array($data[self::FIELD_SYSTEM])) { + $this->setSystem(new FHIRUri(array_merge($ext, $data[self::FIELD_SYSTEM]))); + } } else { $this->setSystem(new FHIRUri($data[self::FIELD_SYSTEM])); } @@ -513,7 +526,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getDependsOn())) { foreach($vs as $v) { if (null === $v) { @@ -531,6 +543,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_MAP, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getSystem())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SYSTEM, null, $v->_getFHIRXMLNamespace())); } @@ -544,8 +557,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getCode())) { - $a[self::FIELD_CODE] = $v->getValue(); - $a[self::FIELD_CODE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CODE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CODE_EXT] = $enc; + } + } else { + $a[self::FIELD_CODE] = $v; + } } if ([] !== ($vs = $this->getDependsOn())) { $a[self::FIELD_DEPENDS_ON] = $vs; @@ -554,8 +574,15 @@ public function jsonSerialize() $a[self::FIELD_MAP] = $vs; } if (null !== ($v = $this->getSystem())) { - $a[self::FIELD_SYSTEM] = $v->getValue(); - $a[self::FIELD_SYSTEM_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SYSTEM] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SYSTEM_EXT] = $enc; + } + } else { + $a[self::FIELD_SYSTEM] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRConceptMap/FHIRConceptMapDependsOn.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRConceptMap/FHIRConceptMapDependsOn.php index 65df0fc002..76276f8362 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRConceptMap/FHIRConceptMapDependsOn.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRConceptMap/FHIRConceptMapDependsOn.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -74,10 +74,6 @@ class FHIRConceptMapDependsOn extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONCEPT_MAP_DOT_DEPENDS_ON; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CODE = 'code'; const FIELD_CODE_EXT = '_code'; const FIELD_CONCEPT = 'concept'; @@ -120,6 +116,9 @@ class FHIRConceptMapDependsOn extends FHIRBackboneElement */ protected $system = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRConceptMapDependsOn Constructor * @param null|array $data @@ -142,8 +141,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CODE] instanceof FHIRCode) { $this->setCode($data[self::FIELD_CODE]); - } elseif ($ext && is_scalar($data[self::FIELD_CODE])) { - $this->setCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_CODE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CODE])) { + $this->setCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_CODE]] + $ext)); + } else if (is_array($data[self::FIELD_CODE])) { + $this->setCode(new FHIRCode(array_merge($ext, $data[self::FIELD_CODE]))); + } } else { $this->setCode(new FHIRCode($data[self::FIELD_CODE])); } @@ -154,8 +157,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CONCEPT] instanceof FHIRUri) { $this->setConcept($data[self::FIELD_CONCEPT]); - } elseif ($ext && is_scalar($data[self::FIELD_CONCEPT])) { - $this->setConcept(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_CONCEPT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CONCEPT])) { + $this->setConcept(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_CONCEPT]] + $ext)); + } else if (is_array($data[self::FIELD_CONCEPT])) { + $this->setConcept(new FHIRUri(array_merge($ext, $data[self::FIELD_CONCEPT]))); + } } else { $this->setConcept(new FHIRUri($data[self::FIELD_CONCEPT])); } @@ -166,8 +173,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SYSTEM] instanceof FHIRUri) { $this->setSystem($data[self::FIELD_SYSTEM]); - } elseif ($ext && is_scalar($data[self::FIELD_SYSTEM])) { - $this->setSystem(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_SYSTEM]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SYSTEM])) { + $this->setSystem(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_SYSTEM]] + $ext)); + } else if (is_array($data[self::FIELD_SYSTEM])) { + $this->setSystem(new FHIRUri(array_merge($ext, $data[self::FIELD_SYSTEM]))); + } } else { $this->setSystem(new FHIRUri($data[self::FIELD_SYSTEM])); } @@ -428,16 +439,37 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getCode())) { - $a[self::FIELD_CODE] = $v->getValue(); - $a[self::FIELD_CODE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CODE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CODE_EXT] = $enc; + } + } else { + $a[self::FIELD_CODE] = $v; + } } if (null !== ($v = $this->getConcept())) { - $a[self::FIELD_CONCEPT] = $v->getValue(); - $a[self::FIELD_CONCEPT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CONCEPT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CONCEPT_EXT] = $enc; + } + } else { + $a[self::FIELD_CONCEPT] = $v; + } } if (null !== ($v = $this->getSystem())) { - $a[self::FIELD_SYSTEM] = $v->getValue(); - $a[self::FIELD_SYSTEM_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SYSTEM] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SYSTEM_EXT] = $enc; + } + } else { + $a[self::FIELD_SYSTEM] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRConceptMap/FHIRConceptMapMap.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRConceptMap/FHIRConceptMapMap.php index b5097f2b1b..ff13318000 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRConceptMap/FHIRConceptMapMap.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRConceptMap/FHIRConceptMapMap.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -76,10 +76,6 @@ class FHIRConceptMapMap extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONCEPT_MAP_DOT_MAP; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CODE = 'code'; const FIELD_CODE_EXT = '_code'; const FIELD_COMMENTS = 'comments'; @@ -146,6 +142,9 @@ class FHIRConceptMapMap extends FHIRBackboneElement */ protected $system = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRConceptMapMap Constructor * @param null|array $data @@ -168,8 +167,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CODE] instanceof FHIRCode) { $this->setCode($data[self::FIELD_CODE]); - } elseif ($ext && is_scalar($data[self::FIELD_CODE])) { - $this->setCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_CODE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CODE])) { + $this->setCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_CODE]] + $ext)); + } else if (is_array($data[self::FIELD_CODE])) { + $this->setCode(new FHIRCode(array_merge($ext, $data[self::FIELD_CODE]))); + } } else { $this->setCode(new FHIRCode($data[self::FIELD_CODE])); } @@ -180,8 +183,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_COMMENTS] instanceof FHIRString) { $this->setComments($data[self::FIELD_COMMENTS]); - } elseif ($ext && is_scalar($data[self::FIELD_COMMENTS])) { - $this->setComments(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_COMMENTS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_COMMENTS])) { + $this->setComments(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_COMMENTS]] + $ext)); + } else if (is_array($data[self::FIELD_COMMENTS])) { + $this->setComments(new FHIRString(array_merge($ext, $data[self::FIELD_COMMENTS]))); + } } else { $this->setComments(new FHIRString($data[self::FIELD_COMMENTS])); } @@ -192,8 +199,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EQUIVALENCE] instanceof FHIRConceptMapEquivalence) { $this->setEquivalence($data[self::FIELD_EQUIVALENCE]); - } elseif ($ext && is_scalar($data[self::FIELD_EQUIVALENCE])) { - $this->setEquivalence(new FHIRConceptMapEquivalence([FHIRConceptMapEquivalence::FIELD_VALUE => $data[self::FIELD_EQUIVALENCE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EQUIVALENCE])) { + $this->setEquivalence(new FHIRConceptMapEquivalence([FHIRConceptMapEquivalence::FIELD_VALUE => $data[self::FIELD_EQUIVALENCE]] + $ext)); + } else if (is_array($data[self::FIELD_EQUIVALENCE])) { + $this->setEquivalence(new FHIRConceptMapEquivalence(array_merge($ext, $data[self::FIELD_EQUIVALENCE]))); + } } else { $this->setEquivalence(new FHIRConceptMapEquivalence($data[self::FIELD_EQUIVALENCE])); } @@ -201,6 +212,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PRODUCT])) { if (is_array($data[self::FIELD_PRODUCT])) { foreach($data[self::FIELD_PRODUCT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRConceptMapDependsOn) { $this->addProduct($v); } else { @@ -219,8 +233,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SYSTEM] instanceof FHIRUri) { $this->setSystem($data[self::FIELD_SYSTEM]); - } elseif ($ext && is_scalar($data[self::FIELD_SYSTEM])) { - $this->setSystem(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_SYSTEM]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SYSTEM])) { + $this->setSystem(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_SYSTEM]] + $ext)); + } else if (is_array($data[self::FIELD_SYSTEM])) { + $this->setSystem(new FHIRUri(array_merge($ext, $data[self::FIELD_SYSTEM]))); + } } else { $this->setSystem(new FHIRUri($data[self::FIELD_SYSTEM])); } @@ -562,11 +580,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getComments())) { $v->xmlSerialize($sxe->addChild(self::FIELD_COMMENTS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getEquivalence())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EQUIVALENCE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getProduct())) { foreach($vs as $v) { if (null === $v) { @@ -575,6 +591,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_PRODUCT, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getSystem())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SYSTEM, null, $v->_getFHIRXMLNamespace())); } @@ -588,22 +605,51 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getCode())) { - $a[self::FIELD_CODE] = $v->getValue(); - $a[self::FIELD_CODE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CODE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CODE_EXT] = $enc; + } + } else { + $a[self::FIELD_CODE] = $v; + } } if (null !== ($v = $this->getComments())) { - $a[self::FIELD_COMMENTS] = $v->getValue(); - $a[self::FIELD_COMMENTS_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_COMMENTS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_COMMENTS_EXT] = $enc; + } + } else { + $a[self::FIELD_COMMENTS] = $v; + } } if (null !== ($v = $this->getEquivalence())) { - $a[self::FIELD_EQUIVALENCE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EQUIVALENCE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EQUIVALENCE_EXT] = $enc; + } + } else { + $a[self::FIELD_EQUIVALENCE] = $v; + } } if ([] !== ($vs = $this->getProduct())) { $a[self::FIELD_PRODUCT] = $vs; } if (null !== ($v = $this->getSystem())) { - $a[self::FIELD_SYSTEM] = $v->getValue(); - $a[self::FIELD_SYSTEM_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SYSTEM] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SYSTEM_EXT] = $enc; + } + } else { + $a[self::FIELD_SYSTEM] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRCondition/FHIRConditionEvidence.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRCondition/FHIRConditionEvidence.php index 27b7dc67ca..60aad7c6c7 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRCondition/FHIRConditionEvidence.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRCondition/FHIRConditionEvidence.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -76,10 +76,6 @@ class FHIRConditionEvidence extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONDITION_DOT_EVIDENCE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CODE = 'code'; const FIELD_DETAIL = 'detail'; @@ -106,6 +102,9 @@ class FHIRConditionEvidence extends FHIRBackboneElement */ protected $detail = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRConditionEvidence Constructor * @param null|array $data @@ -132,6 +131,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_DETAIL])) { if (is_array($data[self::FIELD_DETAIL])) { foreach($data[self::FIELD_DETAIL] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRResourceReference) { $this->addDetail($v); } else { @@ -341,11 +343,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getDetail())) { foreach($vs as $v) { if (null === $v) { @@ -354,6 +354,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_DETAIL, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRCondition/FHIRConditionLocation.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRCondition/FHIRConditionLocation.php index f0d2ec69aa..cb917008c2 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRCondition/FHIRConditionLocation.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRCondition/FHIRConditionLocation.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -76,10 +76,6 @@ class FHIRConditionLocation extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONDITION_DOT_LOCATION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CODE = 'code'; const FIELD_DETAIL = 'detail'; const FIELD_DETAIL_EXT = '_detail'; @@ -106,6 +102,9 @@ class FHIRConditionLocation extends FHIRBackboneElement */ protected $detail = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRConditionLocation Constructor * @param null|array $data @@ -135,8 +134,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DETAIL] instanceof FHIRString) { $this->setDetail($data[self::FIELD_DETAIL]); - } elseif ($ext && is_scalar($data[self::FIELD_DETAIL])) { - $this->setDetail(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DETAIL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DETAIL])) { + $this->setDetail(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DETAIL]] + $ext)); + } else if (is_array($data[self::FIELD_DETAIL])) { + $this->setDetail(new FHIRString(array_merge($ext, $data[self::FIELD_DETAIL]))); + } } else { $this->setDetail(new FHIRString($data[self::FIELD_DETAIL])); } @@ -319,7 +322,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } @@ -339,8 +341,15 @@ public function jsonSerialize() $a[self::FIELD_CODE] = $v; } if (null !== ($v = $this->getDetail())) { - $a[self::FIELD_DETAIL] = $v->getValue(); - $a[self::FIELD_DETAIL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DETAIL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DETAIL_EXT] = $enc; + } + } else { + $a[self::FIELD_DETAIL] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRCondition/FHIRConditionRelatedItem.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRCondition/FHIRConditionRelatedItem.php index 38e9a5c46d..f2c22b04cd 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRCondition/FHIRConditionRelatedItem.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRCondition/FHIRConditionRelatedItem.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -77,10 +77,6 @@ class FHIRConditionRelatedItem extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONDITION_DOT_RELATED_ITEM; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CODE = 'code'; const FIELD_TARGET = 'target'; const FIELD_TYPE = 'type'; @@ -120,6 +116,9 @@ class FHIRConditionRelatedItem extends FHIRBackboneElement */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRConditionRelatedItem Constructor * @param null|array $data @@ -156,8 +155,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TYPE] instanceof FHIRConditionRelationshipType) { $this->setType($data[self::FIELD_TYPE]); - } elseif ($ext && is_scalar($data[self::FIELD_TYPE])) { - $this->setType(new FHIRConditionRelationshipType([FHIRConditionRelationshipType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TYPE])) { + $this->setType(new FHIRConditionRelationshipType([FHIRConditionRelationshipType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } else if (is_array($data[self::FIELD_TYPE])) { + $this->setType(new FHIRConditionRelationshipType(array_merge($ext, $data[self::FIELD_TYPE]))); + } } else { $this->setType(new FHIRConditionRelationshipType($data[self::FIELD_TYPE])); } @@ -364,15 +367,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getTarget())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TARGET, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -392,7 +392,15 @@ public function jsonSerialize() $a[self::FIELD_TARGET] = $v; } if (null !== ($v = $this->getType())) { - $a[self::FIELD_TYPE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TYPE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TYPE_EXT] = $enc; + } + } else { + $a[self::FIELD_TYPE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRCondition/FHIRConditionStage.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRCondition/FHIRConditionStage.php index 5ea3a71ad1..22679f0c58 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRCondition/FHIRConditionStage.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRCondition/FHIRConditionStage.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -76,10 +76,6 @@ class FHIRConditionStage extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONDITION_DOT_STAGE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ASSESSMENT = 'assessment'; const FIELD_SUMMARY = 'summary'; @@ -108,6 +104,9 @@ class FHIRConditionStage extends FHIRBackboneElement */ protected $summary = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRConditionStage Constructor * @param null|array $data @@ -127,6 +126,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ASSESSMENT])) { if (is_array($data[self::FIELD_ASSESSMENT])) { foreach($data[self::FIELD_ASSESSMENT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRResourceReference) { $this->addAssessment($v); } else { @@ -348,7 +350,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getAssessment())) { foreach($vs as $v) { if (null === $v) { diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceCertificate.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceCertificate.php index feff5f8156..20f2bfb909 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceCertificate.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceCertificate.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -75,10 +75,6 @@ class FHIRConformanceCertificate extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONFORMANCE_DOT_CERTIFICATE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_BLOB = 'blob'; const FIELD_BLOB_EXT = '_blob'; const FIELD_TYPE = 'type'; @@ -106,6 +102,9 @@ class FHIRConformanceCertificate extends FHIRBackboneElement */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRConformanceCertificate Constructor * @param null|array $data @@ -128,8 +127,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_BLOB] instanceof FHIRBase64Binary) { $this->setBlob($data[self::FIELD_BLOB]); - } elseif ($ext && is_scalar($data[self::FIELD_BLOB])) { - $this->setBlob(new FHIRBase64Binary([FHIRBase64Binary::FIELD_VALUE => $data[self::FIELD_BLOB]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_BLOB])) { + $this->setBlob(new FHIRBase64Binary([FHIRBase64Binary::FIELD_VALUE => $data[self::FIELD_BLOB]] + $ext)); + } else if (is_array($data[self::FIELD_BLOB])) { + $this->setBlob(new FHIRBase64Binary(array_merge($ext, $data[self::FIELD_BLOB]))); + } } else { $this->setBlob(new FHIRBase64Binary($data[self::FIELD_BLOB])); } @@ -140,8 +143,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TYPE] instanceof FHIRCode) { $this->setType($data[self::FIELD_TYPE]); - } elseif ($ext && is_scalar($data[self::FIELD_TYPE])) { - $this->setType(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TYPE])) { + $this->setType(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } else if (is_array($data[self::FIELD_TYPE])) { + $this->setType(new FHIRCode(array_merge($ext, $data[self::FIELD_TYPE]))); + } } else { $this->setType(new FHIRCode($data[self::FIELD_TYPE])); } @@ -351,12 +358,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getBlob())) { - $a[self::FIELD_BLOB] = $v->getValue(); - $a[self::FIELD_BLOB_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_BLOB] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_BLOB_EXT] = $enc; + } + } else { + $a[self::FIELD_BLOB] = $v; + } } if (null !== ($v = $this->getType())) { - $a[self::FIELD_TYPE] = $v->getValue(); - $a[self::FIELD_TYPE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TYPE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TYPE_EXT] = $enc; + } + } else { + $a[self::FIELD_TYPE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceDocument.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceDocument.php index 0a828db965..34a032c168 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceDocument.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceDocument.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -76,10 +76,6 @@ class FHIRConformanceDocument extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONFORMANCE_DOT_DOCUMENT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DOCUMENTATION = 'documentation'; const FIELD_DOCUMENTATION_EXT = '_documentation'; const FIELD_MODE = 'mode'; @@ -119,6 +115,9 @@ class FHIRConformanceDocument extends FHIRBackboneElement */ protected $profile = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRConformanceDocument Constructor * @param null|array $data @@ -141,8 +140,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DOCUMENTATION] instanceof FHIRString) { $this->setDocumentation($data[self::FIELD_DOCUMENTATION]); - } elseif ($ext && is_scalar($data[self::FIELD_DOCUMENTATION])) { - $this->setDocumentation(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DOCUMENTATION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DOCUMENTATION])) { + $this->setDocumentation(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DOCUMENTATION]] + $ext)); + } else if (is_array($data[self::FIELD_DOCUMENTATION])) { + $this->setDocumentation(new FHIRString(array_merge($ext, $data[self::FIELD_DOCUMENTATION]))); + } } else { $this->setDocumentation(new FHIRString($data[self::FIELD_DOCUMENTATION])); } @@ -153,8 +156,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MODE] instanceof FHIRDocumentMode) { $this->setMode($data[self::FIELD_MODE]); - } elseif ($ext && is_scalar($data[self::FIELD_MODE])) { - $this->setMode(new FHIRDocumentMode([FHIRDocumentMode::FIELD_VALUE => $data[self::FIELD_MODE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MODE])) { + $this->setMode(new FHIRDocumentMode([FHIRDocumentMode::FIELD_VALUE => $data[self::FIELD_MODE]] + $ext)); + } else if (is_array($data[self::FIELD_MODE])) { + $this->setMode(new FHIRDocumentMode(array_merge($ext, $data[self::FIELD_MODE]))); + } } else { $this->setMode(new FHIRDocumentMode($data[self::FIELD_MODE])); } @@ -380,11 +387,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDocumentation())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DOCUMENTATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getMode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MODE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getProfile())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PROFILE, null, $v->_getFHIRXMLNamespace())); } @@ -398,11 +403,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getDocumentation())) { - $a[self::FIELD_DOCUMENTATION] = $v->getValue(); - $a[self::FIELD_DOCUMENTATION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DOCUMENTATION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DOCUMENTATION_EXT] = $enc; + } + } else { + $a[self::FIELD_DOCUMENTATION] = $v; + } } if (null !== ($v = $this->getMode())) { - $a[self::FIELD_MODE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MODE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MODE_EXT] = $enc; + } + } else { + $a[self::FIELD_MODE] = $v; + } } if (null !== ($v = $this->getProfile())) { $a[self::FIELD_PROFILE] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceEvent.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceEvent.php index 1323b7e33f..cbf5112e54 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceEvent.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceEvent.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRConformanceEvent extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONFORMANCE_DOT_EVENT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CATEGORY = 'category'; const FIELD_CATEGORY_EXT = '_category'; const FIELD_CODE = 'code'; @@ -185,6 +181,9 @@ class FHIRConformanceEvent extends FHIRBackboneElement */ protected $response = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRConformanceEvent Constructor * @param null|array $data @@ -207,8 +206,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CATEGORY] instanceof FHIRMessageSignificanceCategory) { $this->setCategory($data[self::FIELD_CATEGORY]); - } elseif ($ext && is_scalar($data[self::FIELD_CATEGORY])) { - $this->setCategory(new FHIRMessageSignificanceCategory([FHIRMessageSignificanceCategory::FIELD_VALUE => $data[self::FIELD_CATEGORY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CATEGORY])) { + $this->setCategory(new FHIRMessageSignificanceCategory([FHIRMessageSignificanceCategory::FIELD_VALUE => $data[self::FIELD_CATEGORY]] + $ext)); + } else if (is_array($data[self::FIELD_CATEGORY])) { + $this->setCategory(new FHIRMessageSignificanceCategory(array_merge($ext, $data[self::FIELD_CATEGORY]))); + } } else { $this->setCategory(new FHIRMessageSignificanceCategory($data[self::FIELD_CATEGORY])); } @@ -226,8 +229,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DOCUMENTATION] instanceof FHIRString) { $this->setDocumentation($data[self::FIELD_DOCUMENTATION]); - } elseif ($ext && is_scalar($data[self::FIELD_DOCUMENTATION])) { - $this->setDocumentation(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DOCUMENTATION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DOCUMENTATION])) { + $this->setDocumentation(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DOCUMENTATION]] + $ext)); + } else if (is_array($data[self::FIELD_DOCUMENTATION])) { + $this->setDocumentation(new FHIRString(array_merge($ext, $data[self::FIELD_DOCUMENTATION]))); + } } else { $this->setDocumentation(new FHIRString($data[self::FIELD_DOCUMENTATION])); } @@ -238,8 +245,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_FOCUS] instanceof FHIRCode) { $this->setFocus($data[self::FIELD_FOCUS]); - } elseif ($ext && is_scalar($data[self::FIELD_FOCUS])) { - $this->setFocus(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_FOCUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_FOCUS])) { + $this->setFocus(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_FOCUS]] + $ext)); + } else if (is_array($data[self::FIELD_FOCUS])) { + $this->setFocus(new FHIRCode(array_merge($ext, $data[self::FIELD_FOCUS]))); + } } else { $this->setFocus(new FHIRCode($data[self::FIELD_FOCUS])); } @@ -250,8 +261,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MODE] instanceof FHIRConformanceEventMode) { $this->setMode($data[self::FIELD_MODE]); - } elseif ($ext && is_scalar($data[self::FIELD_MODE])) { - $this->setMode(new FHIRConformanceEventMode([FHIRConformanceEventMode::FIELD_VALUE => $data[self::FIELD_MODE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MODE])) { + $this->setMode(new FHIRConformanceEventMode([FHIRConformanceEventMode::FIELD_VALUE => $data[self::FIELD_MODE]] + $ext)); + } else if (is_array($data[self::FIELD_MODE])) { + $this->setMode(new FHIRConformanceEventMode(array_merge($ext, $data[self::FIELD_MODE]))); + } } else { $this->setMode(new FHIRConformanceEventMode($data[self::FIELD_MODE])); } @@ -259,6 +274,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PROTOCOL])) { if (is_array($data[self::FIELD_PROTOCOL])) { foreach($data[self::FIELD_PROTOCOL] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCoding) { $this->addProtocol($v); } else { @@ -703,11 +721,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getCategory())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CATEGORY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } @@ -717,11 +733,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getFocus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FOCUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getMode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MODE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getProtocol())) { foreach($vs as $v) { if (null === $v) { @@ -734,7 +748,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getRequest())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REQUEST, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getResponse())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RESPONSE, null, $v->_getFHIRXMLNamespace())); } @@ -748,21 +761,51 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getCategory())) { - $a[self::FIELD_CATEGORY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CATEGORY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CATEGORY_EXT] = $enc; + } + } else { + $a[self::FIELD_CATEGORY] = $v; + } } if (null !== ($v = $this->getCode())) { $a[self::FIELD_CODE] = $v; } if (null !== ($v = $this->getDocumentation())) { - $a[self::FIELD_DOCUMENTATION] = $v->getValue(); - $a[self::FIELD_DOCUMENTATION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DOCUMENTATION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DOCUMENTATION_EXT] = $enc; + } + } else { + $a[self::FIELD_DOCUMENTATION] = $v; + } } if (null !== ($v = $this->getFocus())) { - $a[self::FIELD_FOCUS] = $v->getValue(); - $a[self::FIELD_FOCUS_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FOCUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FOCUS_EXT] = $enc; + } + } else { + $a[self::FIELD_FOCUS] = $v; + } } if (null !== ($v = $this->getMode())) { - $a[self::FIELD_MODE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MODE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MODE_EXT] = $enc; + } + } else { + $a[self::FIELD_MODE] = $v; + } } if ([] !== ($vs = $this->getProtocol())) { $a[self::FIELD_PROTOCOL] = $vs; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceImplementation.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceImplementation.php index 6e2032a5db..4e94aa4745 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceImplementation.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceImplementation.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -75,10 +75,6 @@ class FHIRConformanceImplementation extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONFORMANCE_DOT_IMPLEMENTATION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DESCRIPTION = 'description'; const FIELD_DESCRIPTION_EXT = '_description'; const FIELD_URL = 'url'; @@ -106,6 +102,9 @@ class FHIRConformanceImplementation extends FHIRBackboneElement */ protected $url = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRConformanceImplementation Constructor * @param null|array $data @@ -128,8 +127,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -140,8 +143,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_URL] instanceof FHIRUri) { $this->setUrl($data[self::FIELD_URL]); - } elseif ($ext && is_scalar($data[self::FIELD_URL])) { - $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } else if (is_array($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri(array_merge($ext, $data[self::FIELD_URL]))); + } } else { $this->setUrl(new FHIRUri($data[self::FIELD_URL])); } @@ -351,12 +358,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if (null !== ($v = $this->getUrl())) { - $a[self::FIELD_URL] = $v->getValue(); - $a[self::FIELD_URL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_URL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_URL_EXT] = $enc; + } + } else { + $a[self::FIELD_URL] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceMessaging.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceMessaging.php index 460501b441..4b70a560f3 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceMessaging.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceMessaging.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -76,10 +76,6 @@ class FHIRConformanceMessaging extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONFORMANCE_DOT_MESSAGING; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DOCUMENTATION = 'documentation'; const FIELD_DOCUMENTATION_EXT = '_documentation'; const FIELD_ENDPOINT = 'endpoint'; @@ -132,6 +128,9 @@ class FHIRConformanceMessaging extends FHIRBackboneElement */ protected $reliableCache = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRConformanceMessaging Constructor * @param null|array $data @@ -154,8 +153,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DOCUMENTATION] instanceof FHIRString) { $this->setDocumentation($data[self::FIELD_DOCUMENTATION]); - } elseif ($ext && is_scalar($data[self::FIELD_DOCUMENTATION])) { - $this->setDocumentation(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DOCUMENTATION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DOCUMENTATION])) { + $this->setDocumentation(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DOCUMENTATION]] + $ext)); + } else if (is_array($data[self::FIELD_DOCUMENTATION])) { + $this->setDocumentation(new FHIRString(array_merge($ext, $data[self::FIELD_DOCUMENTATION]))); + } } else { $this->setDocumentation(new FHIRString($data[self::FIELD_DOCUMENTATION])); } @@ -166,8 +169,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ENDPOINT] instanceof FHIRUri) { $this->setEndpoint($data[self::FIELD_ENDPOINT]); - } elseif ($ext && is_scalar($data[self::FIELD_ENDPOINT])) { - $this->setEndpoint(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_ENDPOINT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ENDPOINT])) { + $this->setEndpoint(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_ENDPOINT]] + $ext)); + } else if (is_array($data[self::FIELD_ENDPOINT])) { + $this->setEndpoint(new FHIRUri(array_merge($ext, $data[self::FIELD_ENDPOINT]))); + } } else { $this->setEndpoint(new FHIRUri($data[self::FIELD_ENDPOINT])); } @@ -175,6 +182,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_EVENT])) { if (is_array($data[self::FIELD_EVENT])) { foreach($data[self::FIELD_EVENT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRConformanceEvent) { $this->addEvent($v); } else { @@ -193,8 +203,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_RELIABLE_CACHE] instanceof FHIRInteger) { $this->setReliableCache($data[self::FIELD_RELIABLE_CACHE]); - } elseif ($ext && is_scalar($data[self::FIELD_RELIABLE_CACHE])) { - $this->setReliableCache(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_RELIABLE_CACHE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_RELIABLE_CACHE])) { + $this->setReliableCache(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_RELIABLE_CACHE]] + $ext)); + } else if (is_array($data[self::FIELD_RELIABLE_CACHE])) { + $this->setReliableCache(new FHIRInteger(array_merge($ext, $data[self::FIELD_RELIABLE_CACHE]))); + } } else { $this->setReliableCache(new FHIRInteger($data[self::FIELD_RELIABLE_CACHE])); } @@ -499,7 +513,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getEndpoint())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ENDPOINT, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getEvent())) { foreach($vs as $v) { if (null === $v) { @@ -508,6 +521,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_EVENT, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getReliableCache())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RELIABLE_CACHE, null, $v->_getFHIRXMLNamespace())); } @@ -521,19 +535,40 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getDocumentation())) { - $a[self::FIELD_DOCUMENTATION] = $v->getValue(); - $a[self::FIELD_DOCUMENTATION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DOCUMENTATION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DOCUMENTATION_EXT] = $enc; + } + } else { + $a[self::FIELD_DOCUMENTATION] = $v; + } } if (null !== ($v = $this->getEndpoint())) { - $a[self::FIELD_ENDPOINT] = $v->getValue(); - $a[self::FIELD_ENDPOINT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ENDPOINT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ENDPOINT_EXT] = $enc; + } + } else { + $a[self::FIELD_ENDPOINT] = $v; + } } if ([] !== ($vs = $this->getEvent())) { $a[self::FIELD_EVENT] = $vs; } if (null !== ($v = $this->getReliableCache())) { - $a[self::FIELD_RELIABLE_CACHE] = $v->getValue(); - $a[self::FIELD_RELIABLE_CACHE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_RELIABLE_CACHE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_RELIABLE_CACHE_EXT] = $enc; + } + } else { + $a[self::FIELD_RELIABLE_CACHE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceOperation.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceOperation.php index 6174399925..18040f1492 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceOperation.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceOperation.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -75,10 +75,6 @@ class FHIRConformanceOperation extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONFORMANCE_DOT_OPERATION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CODE = 'code'; const FIELD_CODE_EXT = '_code'; const FIELD_DOCUMENTATION = 'documentation'; @@ -106,6 +102,9 @@ class FHIRConformanceOperation extends FHIRBackboneElement */ protected $documentation = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRConformanceOperation Constructor * @param null|array $data @@ -128,8 +127,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CODE] instanceof FHIRRestfulOperationType) { $this->setCode($data[self::FIELD_CODE]); - } elseif ($ext && is_scalar($data[self::FIELD_CODE])) { - $this->setCode(new FHIRRestfulOperationType([FHIRRestfulOperationType::FIELD_VALUE => $data[self::FIELD_CODE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CODE])) { + $this->setCode(new FHIRRestfulOperationType([FHIRRestfulOperationType::FIELD_VALUE => $data[self::FIELD_CODE]] + $ext)); + } else if (is_array($data[self::FIELD_CODE])) { + $this->setCode(new FHIRRestfulOperationType(array_merge($ext, $data[self::FIELD_CODE]))); + } } else { $this->setCode(new FHIRRestfulOperationType($data[self::FIELD_CODE])); } @@ -140,8 +143,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DOCUMENTATION] instanceof FHIRString) { $this->setDocumentation($data[self::FIELD_DOCUMENTATION]); - } elseif ($ext && is_scalar($data[self::FIELD_DOCUMENTATION])) { - $this->setDocumentation(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DOCUMENTATION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DOCUMENTATION])) { + $this->setDocumentation(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DOCUMENTATION]] + $ext)); + } else if (is_array($data[self::FIELD_DOCUMENTATION])) { + $this->setDocumentation(new FHIRString(array_merge($ext, $data[self::FIELD_DOCUMENTATION]))); + } } else { $this->setDocumentation(new FHIRString($data[self::FIELD_DOCUMENTATION])); } @@ -324,7 +331,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } @@ -341,11 +347,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getCode())) { - $a[self::FIELD_CODE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CODE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CODE_EXT] = $enc; + } + } else { + $a[self::FIELD_CODE] = $v; + } } if (null !== ($v = $this->getDocumentation())) { - $a[self::FIELD_DOCUMENTATION] = $v->getValue(); - $a[self::FIELD_DOCUMENTATION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DOCUMENTATION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DOCUMENTATION_EXT] = $enc; + } + } else { + $a[self::FIELD_DOCUMENTATION] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceOperation1.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceOperation1.php index ae3ee5baaf..c29404e429 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceOperation1.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceOperation1.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -75,10 +75,6 @@ class FHIRConformanceOperation1 extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONFORMANCE_DOT_OPERATION_1; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CODE = 'code'; const FIELD_CODE_EXT = '_code'; const FIELD_DOCUMENTATION = 'documentation'; @@ -106,6 +102,9 @@ class FHIRConformanceOperation1 extends FHIRBackboneElement */ protected $documentation = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRConformanceOperation1 Constructor * @param null|array $data @@ -128,8 +127,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CODE] instanceof FHIRRestfulOperationSystem) { $this->setCode($data[self::FIELD_CODE]); - } elseif ($ext && is_scalar($data[self::FIELD_CODE])) { - $this->setCode(new FHIRRestfulOperationSystem([FHIRRestfulOperationSystem::FIELD_VALUE => $data[self::FIELD_CODE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CODE])) { + $this->setCode(new FHIRRestfulOperationSystem([FHIRRestfulOperationSystem::FIELD_VALUE => $data[self::FIELD_CODE]] + $ext)); + } else if (is_array($data[self::FIELD_CODE])) { + $this->setCode(new FHIRRestfulOperationSystem(array_merge($ext, $data[self::FIELD_CODE]))); + } } else { $this->setCode(new FHIRRestfulOperationSystem($data[self::FIELD_CODE])); } @@ -140,8 +143,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DOCUMENTATION] instanceof FHIRString) { $this->setDocumentation($data[self::FIELD_DOCUMENTATION]); - } elseif ($ext && is_scalar($data[self::FIELD_DOCUMENTATION])) { - $this->setDocumentation(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DOCUMENTATION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DOCUMENTATION])) { + $this->setDocumentation(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DOCUMENTATION]] + $ext)); + } else if (is_array($data[self::FIELD_DOCUMENTATION])) { + $this->setDocumentation(new FHIRString(array_merge($ext, $data[self::FIELD_DOCUMENTATION]))); + } } else { $this->setDocumentation(new FHIRString($data[self::FIELD_DOCUMENTATION])); } @@ -324,7 +331,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } @@ -341,11 +347,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getCode())) { - $a[self::FIELD_CODE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CODE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CODE_EXT] = $enc; + } + } else { + $a[self::FIELD_CODE] = $v; + } } if (null !== ($v = $this->getDocumentation())) { - $a[self::FIELD_DOCUMENTATION] = $v->getValue(); - $a[self::FIELD_DOCUMENTATION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DOCUMENTATION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DOCUMENTATION_EXT] = $enc; + } + } else { + $a[self::FIELD_DOCUMENTATION] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceQuery.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceQuery.php index 7153a224fd..ba5d91f6d3 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceQuery.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceQuery.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -75,10 +75,6 @@ class FHIRConformanceQuery extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONFORMANCE_DOT_QUERY; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DEFINITION = 'definition'; const FIELD_DEFINITION_EXT = '_definition'; const FIELD_DOCUMENTATION = 'documentation'; @@ -130,6 +126,9 @@ class FHIRConformanceQuery extends FHIRBackboneElement */ protected $parameter = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRConformanceQuery Constructor * @param null|array $data @@ -152,8 +151,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DEFINITION] instanceof FHIRUri) { $this->setDefinition($data[self::FIELD_DEFINITION]); - } elseif ($ext && is_scalar($data[self::FIELD_DEFINITION])) { - $this->setDefinition(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_DEFINITION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DEFINITION])) { + $this->setDefinition(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_DEFINITION]] + $ext)); + } else if (is_array($data[self::FIELD_DEFINITION])) { + $this->setDefinition(new FHIRUri(array_merge($ext, $data[self::FIELD_DEFINITION]))); + } } else { $this->setDefinition(new FHIRUri($data[self::FIELD_DEFINITION])); } @@ -164,8 +167,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DOCUMENTATION] instanceof FHIRString) { $this->setDocumentation($data[self::FIELD_DOCUMENTATION]); - } elseif ($ext && is_scalar($data[self::FIELD_DOCUMENTATION])) { - $this->setDocumentation(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DOCUMENTATION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DOCUMENTATION])) { + $this->setDocumentation(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DOCUMENTATION]] + $ext)); + } else if (is_array($data[self::FIELD_DOCUMENTATION])) { + $this->setDocumentation(new FHIRString(array_merge($ext, $data[self::FIELD_DOCUMENTATION]))); + } } else { $this->setDocumentation(new FHIRString($data[self::FIELD_DOCUMENTATION])); } @@ -176,8 +183,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -185,6 +196,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PARAMETER])) { if (is_array($data[self::FIELD_PARAMETER])) { foreach($data[self::FIELD_PARAMETER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRConformanceSearchParam) { $this->addParameter($v); } else { @@ -498,7 +512,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NAME, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getParameter())) { foreach($vs as $v) { if (null === $v) { @@ -507,6 +520,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_PARAMETER, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } @@ -517,16 +531,37 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getDefinition())) { - $a[self::FIELD_DEFINITION] = $v->getValue(); - $a[self::FIELD_DEFINITION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DEFINITION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DEFINITION_EXT] = $enc; + } + } else { + $a[self::FIELD_DEFINITION] = $v; + } } if (null !== ($v = $this->getDocumentation())) { - $a[self::FIELD_DOCUMENTATION] = $v->getValue(); - $a[self::FIELD_DOCUMENTATION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DOCUMENTATION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DOCUMENTATION_EXT] = $enc; + } + } else { + $a[self::FIELD_DOCUMENTATION] = $v; + } } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if ([] !== ($vs = $this->getParameter())) { $a[self::FIELD_PARAMETER] = $vs; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceResource.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceResource.php index 5d5f18a026..7206120514 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceResource.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceResource.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -77,10 +77,6 @@ class FHIRConformanceResource extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONFORMANCE_DOT_RESOURCE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_OPERATION = 'operation'; const FIELD_PROFILE = 'profile'; const FIELD_READ_HISTORY = 'readHistory'; @@ -174,6 +170,9 @@ class FHIRConformanceResource extends FHIRBackboneElement */ protected $updateCreate = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRConformanceResource Constructor * @param null|array $data @@ -193,6 +192,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_OPERATION])) { if (is_array($data[self::FIELD_OPERATION])) { foreach($data[self::FIELD_OPERATION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRConformanceOperation) { $this->addOperation($v); } else { @@ -218,8 +220,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_READ_HISTORY] instanceof FHIRBoolean) { $this->setReadHistory($data[self::FIELD_READ_HISTORY]); - } elseif ($ext && is_scalar($data[self::FIELD_READ_HISTORY])) { - $this->setReadHistory(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_READ_HISTORY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_READ_HISTORY])) { + $this->setReadHistory(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_READ_HISTORY]] + $ext)); + } else if (is_array($data[self::FIELD_READ_HISTORY])) { + $this->setReadHistory(new FHIRBoolean(array_merge($ext, $data[self::FIELD_READ_HISTORY]))); + } } else { $this->setReadHistory(new FHIRBoolean($data[self::FIELD_READ_HISTORY])); } @@ -230,17 +236,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_SEARCH_INCLUDE])) { foreach($data[self::FIELD_SEARCH_INCLUDE] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRString) { $this->addSearchInclude($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addSearchInclude(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addSearchInclude(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addSearchInclude(new FHIRString(array_merge($v, $ext[$i]))); + } } else { $this->addSearchInclude(new FHIRString($v)); } } } elseif ($data[self::FIELD_SEARCH_INCLUDE] instanceof FHIRString) { $this->addSearchInclude($data[self::FIELD_SEARCH_INCLUDE]); - } elseif ($ext && is_scalar($data[self::FIELD_SEARCH_INCLUDE])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_SEARCH_INCLUDE])) { $this->addSearchInclude(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SEARCH_INCLUDE]] + $ext)); } else { $this->addSearchInclude(new FHIRString($data[self::FIELD_SEARCH_INCLUDE])); @@ -249,6 +262,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SEARCH_PARAM])) { if (is_array($data[self::FIELD_SEARCH_PARAM])) { foreach($data[self::FIELD_SEARCH_PARAM] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRConformanceSearchParam) { $this->addSearchParam($v); } else { @@ -267,8 +283,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TYPE] instanceof FHIRCode) { $this->setType($data[self::FIELD_TYPE]); - } elseif ($ext && is_scalar($data[self::FIELD_TYPE])) { - $this->setType(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TYPE])) { + $this->setType(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } else if (is_array($data[self::FIELD_TYPE])) { + $this->setType(new FHIRCode(array_merge($ext, $data[self::FIELD_TYPE]))); + } } else { $this->setType(new FHIRCode($data[self::FIELD_TYPE])); } @@ -279,8 +299,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_UPDATE_CREATE] instanceof FHIRBoolean) { $this->setUpdateCreate($data[self::FIELD_UPDATE_CREATE]); - } elseif ($ext && is_scalar($data[self::FIELD_UPDATE_CREATE])) { - $this->setUpdateCreate(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_UPDATE_CREATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_UPDATE_CREATE])) { + $this->setUpdateCreate(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_UPDATE_CREATE]] + $ext)); + } else if (is_array($data[self::FIELD_UPDATE_CREATE])) { + $this->setUpdateCreate(new FHIRBoolean(array_merge($ext, $data[self::FIELD_UPDATE_CREATE]))); + } } else { $this->setUpdateCreate(new FHIRBoolean($data[self::FIELD_UPDATE_CREATE])); } @@ -752,7 +776,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getOperation())) { foreach($vs as $v) { if (null === $v) { @@ -785,6 +808,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_SEARCH_PARAM, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -807,8 +831,15 @@ public function jsonSerialize() $a[self::FIELD_PROFILE] = $v; } if (null !== ($v = $this->getReadHistory())) { - $a[self::FIELD_READ_HISTORY] = $v->getValue(); - $a[self::FIELD_READ_HISTORY_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_READ_HISTORY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_READ_HISTORY_EXT] = $enc; + } + } else { + $a[self::FIELD_READ_HISTORY] = $v; + } } if ([] !== ($vs = $this->getSearchInclude())) { $a[self::FIELD_SEARCH_INCLUDE] = []; @@ -816,20 +847,43 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_SEARCH_INCLUDE][] = $v->getValue(); - $a[self::FIELD_SEARCH_INCLUDE_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SEARCH_INCLUDE][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SEARCH_INCLUDE_EXT][] = $enc; + } else { + $a[self::FIELD_SEARCH_INCLUDE_EXT][] = null; + } + } else { + $a[self::FIELD_SEARCH_INCLUDE][] = $v; + } } } if ([] !== ($vs = $this->getSearchParam())) { $a[self::FIELD_SEARCH_PARAM] = $vs; } if (null !== ($v = $this->getType())) { - $a[self::FIELD_TYPE] = $v->getValue(); - $a[self::FIELD_TYPE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TYPE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TYPE_EXT] = $enc; + } + } else { + $a[self::FIELD_TYPE] = $v; + } } if (null !== ($v = $this->getUpdateCreate())) { - $a[self::FIELD_UPDATE_CREATE] = $v->getValue(); - $a[self::FIELD_UPDATE_CREATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_UPDATE_CREATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_UPDATE_CREATE_EXT] = $enc; + } + } else { + $a[self::FIELD_UPDATE_CREATE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceRest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceRest.php index 57fc162ae2..d973f16581 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceRest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceRest.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -76,10 +76,6 @@ class FHIRConformanceRest extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONFORMANCE_DOT_REST; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DOCUMENT_MAILBOX = 'documentMailbox'; const FIELD_DOCUMENT_MAILBOX_EXT = '_documentMailbox'; const FIELD_DOCUMENTATION = 'documentation'; @@ -172,6 +168,9 @@ class FHIRConformanceRest extends FHIRBackboneElement */ protected $security = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRConformanceRest Constructor * @param null|array $data @@ -194,17 +193,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_DOCUMENT_MAILBOX])) { foreach($data[self::FIELD_DOCUMENT_MAILBOX] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRUri) { $this->addDocumentMailbox($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addDocumentMailbox(new FHIRUri([FHIRUri::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addDocumentMailbox(new FHIRUri([FHIRUri::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addDocumentMailbox(new FHIRUri(array_merge($v, $ext[$i]))); + } } else { $this->addDocumentMailbox(new FHIRUri($v)); } } } elseif ($data[self::FIELD_DOCUMENT_MAILBOX] instanceof FHIRUri) { $this->addDocumentMailbox($data[self::FIELD_DOCUMENT_MAILBOX]); - } elseif ($ext && is_scalar($data[self::FIELD_DOCUMENT_MAILBOX])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_DOCUMENT_MAILBOX])) { $this->addDocumentMailbox(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_DOCUMENT_MAILBOX]] + $ext)); } else { $this->addDocumentMailbox(new FHIRUri($data[self::FIELD_DOCUMENT_MAILBOX])); @@ -216,8 +222,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DOCUMENTATION] instanceof FHIRString) { $this->setDocumentation($data[self::FIELD_DOCUMENTATION]); - } elseif ($ext && is_scalar($data[self::FIELD_DOCUMENTATION])) { - $this->setDocumentation(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DOCUMENTATION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DOCUMENTATION])) { + $this->setDocumentation(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DOCUMENTATION]] + $ext)); + } else if (is_array($data[self::FIELD_DOCUMENTATION])) { + $this->setDocumentation(new FHIRString(array_merge($ext, $data[self::FIELD_DOCUMENTATION]))); + } } else { $this->setDocumentation(new FHIRString($data[self::FIELD_DOCUMENTATION])); } @@ -228,8 +238,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MODE] instanceof FHIRRestfulConformanceMode) { $this->setMode($data[self::FIELD_MODE]); - } elseif ($ext && is_scalar($data[self::FIELD_MODE])) { - $this->setMode(new FHIRRestfulConformanceMode([FHIRRestfulConformanceMode::FIELD_VALUE => $data[self::FIELD_MODE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MODE])) { + $this->setMode(new FHIRRestfulConformanceMode([FHIRRestfulConformanceMode::FIELD_VALUE => $data[self::FIELD_MODE]] + $ext)); + } else if (is_array($data[self::FIELD_MODE])) { + $this->setMode(new FHIRRestfulConformanceMode(array_merge($ext, $data[self::FIELD_MODE]))); + } } else { $this->setMode(new FHIRRestfulConformanceMode($data[self::FIELD_MODE])); } @@ -237,6 +251,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_OPERATION])) { if (is_array($data[self::FIELD_OPERATION])) { foreach($data[self::FIELD_OPERATION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRConformanceOperation1) { $this->addOperation($v); } else { @@ -252,6 +269,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_QUERY])) { if (is_array($data[self::FIELD_QUERY])) { foreach($data[self::FIELD_QUERY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRConformanceQuery) { $this->addQuery($v); } else { @@ -267,6 +287,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_RESOURCE])) { if (is_array($data[self::FIELD_RESOURCE])) { foreach($data[self::FIELD_RESOURCE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRConformanceResource) { $this->addResource($v); } else { @@ -772,14 +795,13 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_DOCUMENT_MAILBOX, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getDocumentation())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DOCUMENTATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getMode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MODE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getOperation())) { foreach($vs as $v) { if (null === $v) { @@ -825,16 +847,40 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_DOCUMENT_MAILBOX][] = $v->getValue(); - $a[self::FIELD_DOCUMENT_MAILBOX_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DOCUMENT_MAILBOX][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DOCUMENT_MAILBOX_EXT][] = $enc; + } else { + $a[self::FIELD_DOCUMENT_MAILBOX_EXT][] = null; + } + } else { + $a[self::FIELD_DOCUMENT_MAILBOX][] = $v; + } } } if (null !== ($v = $this->getDocumentation())) { - $a[self::FIELD_DOCUMENTATION] = $v->getValue(); - $a[self::FIELD_DOCUMENTATION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DOCUMENTATION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DOCUMENTATION_EXT] = $enc; + } + } else { + $a[self::FIELD_DOCUMENTATION] = $v; + } } if (null !== ($v = $this->getMode())) { - $a[self::FIELD_MODE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MODE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MODE_EXT] = $enc; + } + } else { + $a[self::FIELD_MODE] = $v; + } } if ([] !== ($vs = $this->getOperation())) { $a[self::FIELD_OPERATION] = $vs; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceSearchParam.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceSearchParam.php index 29a96ac88d..cedf98e982 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceSearchParam.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceSearchParam.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -77,10 +77,6 @@ class FHIRConformanceSearchParam extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONFORMANCE_DOT_SEARCH_PARAM; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CHAIN = 'chain'; const FIELD_CHAIN_EXT = '_chain'; const FIELD_DEFINITION = 'definition'; @@ -158,6 +154,9 @@ class FHIRConformanceSearchParam extends FHIRBackboneElement */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRConformanceSearchParam Constructor * @param null|array $data @@ -180,17 +179,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_CHAIN])) { foreach($data[self::FIELD_CHAIN] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRString) { $this->addChain($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addChain(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addChain(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addChain(new FHIRString(array_merge($v, $ext[$i]))); + } } else { $this->addChain(new FHIRString($v)); } } } elseif ($data[self::FIELD_CHAIN] instanceof FHIRString) { $this->addChain($data[self::FIELD_CHAIN]); - } elseif ($ext && is_scalar($data[self::FIELD_CHAIN])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_CHAIN])) { $this->addChain(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_CHAIN]] + $ext)); } else { $this->addChain(new FHIRString($data[self::FIELD_CHAIN])); @@ -202,8 +208,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DEFINITION] instanceof FHIRUri) { $this->setDefinition($data[self::FIELD_DEFINITION]); - } elseif ($ext && is_scalar($data[self::FIELD_DEFINITION])) { - $this->setDefinition(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_DEFINITION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DEFINITION])) { + $this->setDefinition(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_DEFINITION]] + $ext)); + } else if (is_array($data[self::FIELD_DEFINITION])) { + $this->setDefinition(new FHIRUri(array_merge($ext, $data[self::FIELD_DEFINITION]))); + } } else { $this->setDefinition(new FHIRUri($data[self::FIELD_DEFINITION])); } @@ -214,8 +224,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DOCUMENTATION] instanceof FHIRString) { $this->setDocumentation($data[self::FIELD_DOCUMENTATION]); - } elseif ($ext && is_scalar($data[self::FIELD_DOCUMENTATION])) { - $this->setDocumentation(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DOCUMENTATION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DOCUMENTATION])) { + $this->setDocumentation(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DOCUMENTATION]] + $ext)); + } else if (is_array($data[self::FIELD_DOCUMENTATION])) { + $this->setDocumentation(new FHIRString(array_merge($ext, $data[self::FIELD_DOCUMENTATION]))); + } } else { $this->setDocumentation(new FHIRString($data[self::FIELD_DOCUMENTATION])); } @@ -226,8 +240,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -238,17 +256,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_TARGET])) { foreach($data[self::FIELD_TARGET] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCode) { $this->addTarget($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addTarget(new FHIRCode([FHIRCode::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addTarget(new FHIRCode([FHIRCode::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addTarget(new FHIRCode(array_merge($v, $ext[$i]))); + } } else { $this->addTarget(new FHIRCode($v)); } } } elseif ($data[self::FIELD_TARGET] instanceof FHIRCode) { $this->addTarget($data[self::FIELD_TARGET]); - } elseif ($ext && is_scalar($data[self::FIELD_TARGET])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_TARGET])) { $this->addTarget(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_TARGET]] + $ext)); } else { $this->addTarget(new FHIRCode($data[self::FIELD_TARGET])); @@ -260,8 +285,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TYPE] instanceof FHIRSearchParamType) { $this->setType($data[self::FIELD_TYPE]); - } elseif ($ext && is_scalar($data[self::FIELD_TYPE])) { - $this->setType(new FHIRSearchParamType([FHIRSearchParamType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TYPE])) { + $this->setType(new FHIRSearchParamType([FHIRSearchParamType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } else if (is_array($data[self::FIELD_TYPE])) { + $this->setType(new FHIRSearchParamType(array_merge($ext, $data[self::FIELD_TYPE]))); + } } else { $this->setType(new FHIRSearchParamType($data[self::FIELD_TYPE])); } @@ -680,6 +709,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_CHAIN, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getDefinition())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFINITION, null, $v->_getFHIRXMLNamespace())); } @@ -716,21 +746,51 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_CHAIN][] = $v->getValue(); - $a[self::FIELD_CHAIN_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CHAIN][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CHAIN_EXT][] = $enc; + } else { + $a[self::FIELD_CHAIN_EXT][] = null; + } + } else { + $a[self::FIELD_CHAIN][] = $v; + } } } if (null !== ($v = $this->getDefinition())) { - $a[self::FIELD_DEFINITION] = $v->getValue(); - $a[self::FIELD_DEFINITION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DEFINITION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DEFINITION_EXT] = $enc; + } + } else { + $a[self::FIELD_DEFINITION] = $v; + } } if (null !== ($v = $this->getDocumentation())) { - $a[self::FIELD_DOCUMENTATION] = $v->getValue(); - $a[self::FIELD_DOCUMENTATION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DOCUMENTATION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DOCUMENTATION_EXT] = $enc; + } + } else { + $a[self::FIELD_DOCUMENTATION] = $v; + } } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if ([] !== ($vs = $this->getTarget())) { $a[self::FIELD_TARGET] = []; @@ -738,12 +798,29 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_TARGET][] = $v->getValue(); - $a[self::FIELD_TARGET_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TARGET][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TARGET_EXT][] = $enc; + } else { + $a[self::FIELD_TARGET_EXT][] = null; + } + } else { + $a[self::FIELD_TARGET][] = $v; + } } } if (null !== ($v = $this->getType())) { - $a[self::FIELD_TYPE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TYPE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TYPE_EXT] = $enc; + } + } else { + $a[self::FIELD_TYPE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceSecurity.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceSecurity.php index 186075e99a..e5f1907ee5 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceSecurity.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceSecurity.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -76,10 +76,6 @@ class FHIRConformanceSecurity extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONFORMANCE_DOT_SECURITY; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CERTIFICATE = 'certificate'; const FIELD_CORS = 'cors'; const FIELD_CORS_EXT = '_cors'; @@ -131,6 +127,9 @@ class FHIRConformanceSecurity extends FHIRBackboneElement */ protected $service = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRConformanceSecurity Constructor * @param null|array $data @@ -150,6 +149,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CERTIFICATE])) { if (is_array($data[self::FIELD_CERTIFICATE])) { foreach($data[self::FIELD_CERTIFICATE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRConformanceCertificate) { $this->addCertificate($v); } else { @@ -168,8 +170,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CORS] instanceof FHIRBoolean) { $this->setCors($data[self::FIELD_CORS]); - } elseif ($ext && is_scalar($data[self::FIELD_CORS])) { - $this->setCors(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_CORS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CORS])) { + $this->setCors(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_CORS]] + $ext)); + } else if (is_array($data[self::FIELD_CORS])) { + $this->setCors(new FHIRBoolean(array_merge($ext, $data[self::FIELD_CORS]))); + } } else { $this->setCors(new FHIRBoolean($data[self::FIELD_CORS])); } @@ -180,8 +186,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -189,6 +199,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SERVICE])) { if (is_array($data[self::FIELD_SERVICE])) { foreach($data[self::FIELD_SERVICE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addService($v); } else { @@ -513,7 +526,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getCertificate())) { foreach($vs as $v) { if (null === $v) { @@ -522,13 +534,13 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_CERTIFICATE, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getCors())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CORS, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getDescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESCRIPTION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getService())) { foreach($vs as $v) { if (null === $v) { @@ -537,6 +549,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_SERVICE, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } @@ -550,12 +563,26 @@ public function jsonSerialize() $a[self::FIELD_CERTIFICATE] = $vs; } if (null !== ($v = $this->getCors())) { - $a[self::FIELD_CORS] = $v->getValue(); - $a[self::FIELD_CORS_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CORS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CORS_EXT] = $enc; + } + } else { + $a[self::FIELD_CORS] = $v; + } } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if ([] !== ($vs = $this->getService())) { $a[self::FIELD_SERVICE] = $vs; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceSoftware.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceSoftware.php index ca4a46cb14..f8673a1289 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceSoftware.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceSoftware.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -75,10 +75,6 @@ class FHIRConformanceSoftware extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONFORMANCE_DOT_SOFTWARE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_NAME = 'name'; const FIELD_NAME_EXT = '_name'; const FIELD_RELEASE_DATE = 'releaseDate'; @@ -119,6 +115,9 @@ class FHIRConformanceSoftware extends FHIRBackboneElement */ protected $version = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRConformanceSoftware Constructor * @param null|array $data @@ -141,8 +140,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -153,8 +156,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_RELEASE_DATE] instanceof FHIRDateTime) { $this->setReleaseDate($data[self::FIELD_RELEASE_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_RELEASE_DATE])) { - $this->setReleaseDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_RELEASE_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_RELEASE_DATE])) { + $this->setReleaseDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_RELEASE_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_RELEASE_DATE])) { + $this->setReleaseDate(new FHIRDateTime(array_merge($ext, $data[self::FIELD_RELEASE_DATE]))); + } } else { $this->setReleaseDate(new FHIRDateTime($data[self::FIELD_RELEASE_DATE])); } @@ -165,8 +172,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VERSION] instanceof FHIRString) { $this->setVersion($data[self::FIELD_VERSION]); - } elseif ($ext && is_scalar($data[self::FIELD_VERSION])) { - $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } else if (is_array($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString(array_merge($ext, $data[self::FIELD_VERSION]))); + } } else { $this->setVersion(new FHIRString($data[self::FIELD_VERSION])); } @@ -423,16 +434,37 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if (null !== ($v = $this->getReleaseDate())) { - $a[self::FIELD_RELEASE_DATE] = $v->getValue(); - $a[self::FIELD_RELEASE_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_RELEASE_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_RELEASE_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_RELEASE_DATE] = $v; + } } if (null !== ($v = $this->getVersion())) { - $a[self::FIELD_VERSION] = $v->getValue(); - $a[self::FIELD_VERSION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VERSION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VERSION_EXT] = $enc; + } + } else { + $a[self::FIELD_VERSION] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRDeviceObservationReport/FHIRDeviceObservationReportChannel.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRDeviceObservationReport/FHIRDeviceObservationReportChannel.php index 40472dd116..942ab55d89 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRDeviceObservationReport/FHIRDeviceObservationReportChannel.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRDeviceObservationReport/FHIRDeviceObservationReportChannel.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -72,10 +72,6 @@ class FHIRDeviceObservationReportChannel extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DEVICE_OBSERVATION_REPORT_DOT_CHANNEL; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CODE = 'code'; const FIELD_METRIC = 'metric'; @@ -100,6 +96,9 @@ class FHIRDeviceObservationReportChannel extends FHIRBackboneElement */ protected $metric = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRDeviceObservationReportChannel Constructor * @param null|array $data @@ -126,6 +125,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_METRIC])) { if (is_array($data[self::FIELD_METRIC])) { foreach($data[self::FIELD_METRIC] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRDeviceObservationReportMetric) { $this->addMetric($v); } else { @@ -329,11 +331,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getMetric())) { foreach($vs as $v) { if (null === $v) { @@ -342,6 +342,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_METRIC, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRDeviceObservationReport/FHIRDeviceObservationReportMetric.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRDeviceObservationReport/FHIRDeviceObservationReportMetric.php index 5dae70bfa2..83c7b0dd89 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRDeviceObservationReport/FHIRDeviceObservationReportMetric.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRDeviceObservationReport/FHIRDeviceObservationReportMetric.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -72,10 +72,6 @@ class FHIRDeviceObservationReportMetric extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DEVICE_OBSERVATION_REPORT_DOT_METRIC; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_OBSERVATION = 'observation'; /** @@ -89,6 +85,9 @@ class FHIRDeviceObservationReportMetric extends FHIRBackboneElement */ protected $observation = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRDeviceObservationReportMetric Constructor * @param null|array $data @@ -246,7 +245,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getObservation())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OBSERVATION, null, $v->_getFHIRXMLNamespace())); } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRDeviceObservationReport/FHIRDeviceObservationReportVirtualDevice.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRDeviceObservationReport/FHIRDeviceObservationReportVirtualDevice.php index 206f3a1968..039ae19cc7 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRDeviceObservationReport/FHIRDeviceObservationReportVirtualDevice.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRDeviceObservationReport/FHIRDeviceObservationReportVirtualDevice.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -72,10 +72,6 @@ class FHIRDeviceObservationReportVirtualDevice extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DEVICE_OBSERVATION_REPORT_DOT_VIRTUAL_DEVICE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CHANNEL = 'channel'; const FIELD_CODE = 'code'; @@ -100,6 +96,9 @@ class FHIRDeviceObservationReportVirtualDevice extends FHIRBackboneElement */ protected $code = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRDeviceObservationReportVirtualDevice Constructor * @param null|array $data @@ -119,6 +118,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CHANNEL])) { if (is_array($data[self::FIELD_CHANNEL])) { foreach($data[self::FIELD_CHANNEL] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRDeviceObservationReportChannel) { $this->addChannel($v); } else { @@ -329,7 +331,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getChannel())) { foreach($vs as $v) { if (null === $v) { diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRDiagnosticOrder/FHIRDiagnosticOrderEvent.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRDiagnosticOrder/FHIRDiagnosticOrderEvent.php index 7ef602d563..c5fbae2509 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRDiagnosticOrder/FHIRDiagnosticOrderEvent.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRDiagnosticOrder/FHIRDiagnosticOrderEvent.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -75,10 +75,6 @@ class FHIRDiagnosticOrderEvent extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DIAGNOSTIC_ORDER_DOT_EVENT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ACTOR = 'actor'; const FIELD_DATE_TIME = 'dateTime'; const FIELD_DATE_TIME_EXT = '_dateTime'; @@ -133,6 +129,9 @@ class FHIRDiagnosticOrderEvent extends FHIRBackboneElement */ protected $status = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRDiagnosticOrderEvent Constructor * @param null|array $data @@ -162,8 +161,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATE_TIME] instanceof FHIRDateTime) { $this->setDateTime($data[self::FIELD_DATE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_DATE_TIME])) { - $this->setDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATE_TIME])) { + $this->setDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_DATE_TIME])) { + $this->setDateTime(new FHIRDateTime(array_merge($ext, $data[self::FIELD_DATE_TIME]))); + } } else { $this->setDateTime(new FHIRDateTime($data[self::FIELD_DATE_TIME])); } @@ -181,8 +184,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRDiagnosticOrderStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRDiagnosticOrderStatus([FHIRDiagnosticOrderStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRDiagnosticOrderStatus([FHIRDiagnosticOrderStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRDiagnosticOrderStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRDiagnosticOrderStatus($data[self::FIELD_STATUS])); } @@ -437,18 +444,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getActor())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ACTOR, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getDateTime())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DATE_TIME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESCRIPTION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } @@ -465,14 +469,29 @@ public function jsonSerialize() $a[self::FIELD_ACTOR] = $v; } if (null !== ($v = $this->getDateTime())) { - $a[self::FIELD_DATE_TIME] = $v->getValue(); - $a[self::FIELD_DATE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_DATE_TIME] = $v; + } } if (null !== ($v = $this->getDescription())) { $a[self::FIELD_DESCRIPTION] = $v; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRDiagnosticOrder/FHIRDiagnosticOrderItem.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRDiagnosticOrder/FHIRDiagnosticOrderItem.php index e6a118f527..891bececcd 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRDiagnosticOrder/FHIRDiagnosticOrderItem.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRDiagnosticOrder/FHIRDiagnosticOrderItem.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -74,10 +74,6 @@ class FHIRDiagnosticOrderItem extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DIAGNOSTIC_ORDER_DOT_ITEM; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_BODY_SITE = 'bodySite'; const FIELD_CODE = 'code'; const FIELD_EVENT = 'event'; @@ -141,6 +137,9 @@ class FHIRDiagnosticOrderItem extends FHIRBackboneElement */ protected $status = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRDiagnosticOrderItem Constructor * @param null|array $data @@ -174,6 +173,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_EVENT])) { if (is_array($data[self::FIELD_EVENT])) { foreach($data[self::FIELD_EVENT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRDiagnosticOrderEvent) { $this->addEvent($v); } else { @@ -189,6 +191,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SPECIMEN])) { if (is_array($data[self::FIELD_SPECIMEN])) { foreach($data[self::FIELD_SPECIMEN] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRResourceReference) { $this->addSpecimen($v); } else { @@ -207,8 +212,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRDiagnosticOrderStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRDiagnosticOrderStatus([FHIRDiagnosticOrderStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRDiagnosticOrderStatus([FHIRDiagnosticOrderStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRDiagnosticOrderStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRDiagnosticOrderStatus($data[self::FIELD_STATUS])); } @@ -536,15 +545,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getBodySite())) { $v->xmlSerialize($sxe->addChild(self::FIELD_BODY_SITE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getEvent())) { foreach($vs as $v) { if (null === $v) { @@ -588,7 +594,15 @@ public function jsonSerialize() $a[self::FIELD_SPECIMEN] = $vs; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRDiagnosticReport/FHIRDiagnosticReportImage.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRDiagnosticReport/FHIRDiagnosticReportImage.php index 4dcaeb09af..1c8d4e8633 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRDiagnosticReport/FHIRDiagnosticReportImage.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRDiagnosticReport/FHIRDiagnosticReportImage.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -77,10 +77,6 @@ class FHIRDiagnosticReportImage extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DIAGNOSTIC_REPORT_DOT_IMAGE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_COMMENT = 'comment'; const FIELD_COMMENT_EXT = '_comment'; const FIELD_LINK = 'link'; @@ -108,6 +104,9 @@ class FHIRDiagnosticReportImage extends FHIRBackboneElement */ protected $link = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRDiagnosticReportImage Constructor * @param null|array $data @@ -130,8 +129,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_COMMENT] instanceof FHIRString) { $this->setComment($data[self::FIELD_COMMENT]); - } elseif ($ext && is_scalar($data[self::FIELD_COMMENT])) { - $this->setComment(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_COMMENT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_COMMENT])) { + $this->setComment(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_COMMENT]] + $ext)); + } else if (is_array($data[self::FIELD_COMMENT])) { + $this->setComment(new FHIRString(array_merge($ext, $data[self::FIELD_COMMENT]))); + } } else { $this->setComment(new FHIRString($data[self::FIELD_COMMENT])); } @@ -326,7 +329,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getComment())) { $v->xmlSerialize($sxe->addChild(self::FIELD_COMMENT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getLink())) { $v->xmlSerialize($sxe->addChild(self::FIELD_LINK, null, $v->_getFHIRXMLNamespace())); } @@ -340,8 +342,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getComment())) { - $a[self::FIELD_COMMENT] = $v->getValue(); - $a[self::FIELD_COMMENT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_COMMENT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_COMMENT_EXT] = $enc; + } + } else { + $a[self::FIELD_COMMENT] = $v; + } } if (null !== ($v = $this->getLink())) { $a[self::FIELD_LINK] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRDocumentReference/FHIRDocumentReferenceContext.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRDocumentReference/FHIRDocumentReferenceContext.php index 31507df391..757ae23575 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRDocumentReference/FHIRDocumentReferenceContext.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRDocumentReference/FHIRDocumentReferenceContext.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -73,10 +73,6 @@ class FHIRDocumentReferenceContext extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DOCUMENT_REFERENCE_DOT_CONTEXT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_EVENT = 'event'; const FIELD_FACILITY_TYPE = 'facilityType'; const FIELD_PERIOD = 'period'; @@ -120,6 +116,9 @@ class FHIRDocumentReferenceContext extends FHIRBackboneElement */ protected $period = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRDocumentReferenceContext Constructor * @param null|array $data @@ -139,6 +138,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_EVENT])) { if (is_array($data[self::FIELD_EVENT])) { foreach($data[self::FIELD_EVENT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addEvent($v); } else { @@ -409,7 +411,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getEvent())) { foreach($vs as $v) { if (null === $v) { @@ -422,7 +423,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getFacilityType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FACILITY_TYPE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PERIOD, null, $v->_getFHIRXMLNamespace())); } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRDocumentReference/FHIRDocumentReferenceParameter.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRDocumentReference/FHIRDocumentReferenceParameter.php index 14e8d46672..74a5e37928 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRDocumentReference/FHIRDocumentReferenceParameter.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRDocumentReference/FHIRDocumentReferenceParameter.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -72,10 +72,6 @@ class FHIRDocumentReferenceParameter extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DOCUMENT_REFERENCE_DOT_PARAMETER; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_NAME = 'name'; const FIELD_NAME_EXT = '_name'; const FIELD_VALUE = 'value'; @@ -101,6 +97,9 @@ class FHIRDocumentReferenceParameter extends FHIRBackboneElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRDocumentReferenceParameter Constructor * @param null|array $data @@ -127,8 +126,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -139,8 +142,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE] instanceof FHIRString) { $this->setValue($data[self::FIELD_VALUE]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE])) { - $this->setValue(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VALUE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE])) { + $this->setValue(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VALUE]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE])) { + $this->setValue(new FHIRString(array_merge($ext, $data[self::FIELD_VALUE]))); + } } else { $this->setValue(new FHIRString($data[self::FIELD_VALUE])); } @@ -334,6 +341,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_NAME, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getValue())) { + $sxe->addAttribute(self::FIELD_VALUE, (string)$v); $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE, null, $v->_getFHIRXMLNamespace())); } return $sxe; @@ -346,12 +354,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if (null !== ($v = $this->getValue())) { - $a[self::FIELD_VALUE] = $v->getValue(); - $a[self::FIELD_VALUE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRDocumentReference/FHIRDocumentReferenceRelatesTo.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRDocumentReference/FHIRDocumentReferenceRelatesTo.php index 46c6a75819..41ed82481e 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRDocumentReference/FHIRDocumentReferenceRelatesTo.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRDocumentReference/FHIRDocumentReferenceRelatesTo.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -73,10 +73,6 @@ class FHIRDocumentReferenceRelatesTo extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DOCUMENT_REFERENCE_DOT_RELATES_TO; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CODE = 'code'; const FIELD_CODE_EXT = '_code'; const FIELD_TARGET = 'target'; @@ -102,6 +98,9 @@ class FHIRDocumentReferenceRelatesTo extends FHIRBackboneElement */ protected $target = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRDocumentReferenceRelatesTo Constructor * @param null|array $data @@ -124,8 +123,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CODE] instanceof FHIRDocumentRelationshipType) { $this->setCode($data[self::FIELD_CODE]); - } elseif ($ext && is_scalar($data[self::FIELD_CODE])) { - $this->setCode(new FHIRDocumentRelationshipType([FHIRDocumentRelationshipType::FIELD_VALUE => $data[self::FIELD_CODE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CODE])) { + $this->setCode(new FHIRDocumentRelationshipType([FHIRDocumentRelationshipType::FIELD_VALUE => $data[self::FIELD_CODE]] + $ext)); + } else if (is_array($data[self::FIELD_CODE])) { + $this->setCode(new FHIRDocumentRelationshipType(array_merge($ext, $data[self::FIELD_CODE]))); + } } else { $this->setCode(new FHIRDocumentRelationshipType($data[self::FIELD_CODE])); } @@ -302,11 +305,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getTarget())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TARGET, null, $v->_getFHIRXMLNamespace())); } @@ -320,7 +321,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getCode())) { - $a[self::FIELD_CODE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CODE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CODE_EXT] = $enc; + } + } else { + $a[self::FIELD_CODE] = $v; + } } if (null !== ($v = $this->getTarget())) { $a[self::FIELD_TARGET] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRDocumentReference/FHIRDocumentReferenceService.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRDocumentReference/FHIRDocumentReferenceService.php index c24705caa4..84ca68e939 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRDocumentReference/FHIRDocumentReferenceService.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRDocumentReference/FHIRDocumentReferenceService.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -73,10 +73,6 @@ class FHIRDocumentReferenceService extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DOCUMENT_REFERENCE_DOT_SERVICE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ADDRESS = 'address'; const FIELD_ADDRESS_EXT = '_address'; const FIELD_PARAMETER = 'parameter'; @@ -114,6 +110,9 @@ class FHIRDocumentReferenceService extends FHIRBackboneElement */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRDocumentReferenceService Constructor * @param null|array $data @@ -136,8 +135,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ADDRESS] instanceof FHIRString) { $this->setAddress($data[self::FIELD_ADDRESS]); - } elseif ($ext && is_scalar($data[self::FIELD_ADDRESS])) { - $this->setAddress(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_ADDRESS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ADDRESS])) { + $this->setAddress(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_ADDRESS]] + $ext)); + } else if (is_array($data[self::FIELD_ADDRESS])) { + $this->setAddress(new FHIRString(array_merge($ext, $data[self::FIELD_ADDRESS]))); + } } else { $this->setAddress(new FHIRString($data[self::FIELD_ADDRESS])); } @@ -148,17 +151,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_PARAMETER])) { foreach($data[self::FIELD_PARAMETER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRDocumentReferenceParameter) { $this->addParameter($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addParameter(new FHIRDocumentReferenceParameter([FHIRDocumentReferenceParameter::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addParameter(new FHIRDocumentReferenceParameter([FHIRDocumentReferenceParameter::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addParameter(new FHIRDocumentReferenceParameter(array_merge($v, $ext[$i]))); + } } else { $this->addParameter(new FHIRDocumentReferenceParameter($v)); } } } elseif ($data[self::FIELD_PARAMETER] instanceof FHIRDocumentReferenceParameter) { $this->addParameter($data[self::FIELD_PARAMETER]); - } elseif ($ext && is_scalar($data[self::FIELD_PARAMETER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_PARAMETER])) { $this->addParameter(new FHIRDocumentReferenceParameter([FHIRDocumentReferenceParameter::FIELD_VALUE => $data[self::FIELD_PARAMETER]] + $ext)); } else { $this->addParameter(new FHIRDocumentReferenceParameter($data[self::FIELD_PARAMETER])); @@ -407,7 +417,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getAddress())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ADDRESS, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getParameter())) { foreach($vs as $v) { if (null === $v) { @@ -430,11 +439,34 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getAddress())) { - $a[self::FIELD_ADDRESS] = $v->getValue(); - $a[self::FIELD_ADDRESS_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ADDRESS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ADDRESS_EXT] = $enc; + } + } else { + $a[self::FIELD_ADDRESS] = $v; + } } if ([] !== ($vs = $this->getParameter())) { - $a[self::FIELD_PARAMETER] = $vs; + $a[self::FIELD_PARAMETER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PARAMETER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PARAMETER_EXT][] = $enc; + } else { + $a[self::FIELD_PARAMETER_EXT][] = null; + } + } else { + $a[self::FIELD_PARAMETER][] = $v; + } + } } if (null !== ($v = $this->getType())) { $a[self::FIELD_TYPE] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIREncounter/FHIREncounterAccomodation.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIREncounter/FHIREncounterAccomodation.php index 1194eb34b4..ed7b8157a5 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIREncounter/FHIREncounterAccomodation.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIREncounter/FHIREncounterAccomodation.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -74,10 +74,6 @@ class FHIREncounterAccomodation extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ENCOUNTER_DOT_ACCOMODATION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_BED = 'bed'; const FIELD_PERIOD = 'period'; @@ -103,6 +99,9 @@ class FHIREncounterAccomodation extends FHIRBackboneElement */ protected $period = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIREncounterAccomodation Constructor * @param null|array $data @@ -300,11 +299,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getBed())) { $v->xmlSerialize($sxe->addChild(self::FIELD_BED, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PERIOD, null, $v->_getFHIRXMLNamespace())); } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIREncounter/FHIREncounterHospitalization.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIREncounter/FHIREncounterHospitalization.php index b46603439c..bb58f7efa0 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIREncounter/FHIREncounterHospitalization.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIREncounter/FHIREncounterHospitalization.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -77,10 +77,6 @@ class FHIREncounterHospitalization extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ENCOUNTER_DOT_HOSPITALIZATION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ACCOMODATION = 'accomodation'; const FIELD_ADMIT_SOURCE = 'admitSource'; const FIELD_DESTINATION = 'destination'; @@ -232,6 +228,9 @@ class FHIREncounterHospitalization extends FHIRBackboneElement */ protected $specialCourtesy = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIREncounterHospitalization Constructor * @param null|array $data @@ -251,6 +250,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ACCOMODATION])) { if (is_array($data[self::FIELD_ACCOMODATION])) { foreach($data[self::FIELD_ACCOMODATION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIREncounterAccomodation) { $this->addAccomodation($v); } else { @@ -318,8 +320,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PRE_ADMISSION_IDENTIFIER] instanceof FHIRIdentifier) { $this->setPreAdmissionIdentifier($data[self::FIELD_PRE_ADMISSION_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_PRE_ADMISSION_IDENTIFIER])) { - $this->setPreAdmissionIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_PRE_ADMISSION_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PRE_ADMISSION_IDENTIFIER])) { + $this->setPreAdmissionIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_PRE_ADMISSION_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_PRE_ADMISSION_IDENTIFIER])) { + $this->setPreAdmissionIdentifier(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_PRE_ADMISSION_IDENTIFIER]))); + } } else { $this->setPreAdmissionIdentifier(new FHIRIdentifier($data[self::FIELD_PRE_ADMISSION_IDENTIFIER])); } @@ -330,8 +336,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_RE_ADMISSION] instanceof FHIRBoolean) { $this->setReAdmission($data[self::FIELD_RE_ADMISSION]); - } elseif ($ext && is_scalar($data[self::FIELD_RE_ADMISSION])) { - $this->setReAdmission(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_RE_ADMISSION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_RE_ADMISSION])) { + $this->setReAdmission(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_RE_ADMISSION]] + $ext)); + } else if (is_array($data[self::FIELD_RE_ADMISSION])) { + $this->setReAdmission(new FHIRBoolean(array_merge($ext, $data[self::FIELD_RE_ADMISSION]))); + } } else { $this->setReAdmission(new FHIRBoolean($data[self::FIELD_RE_ADMISSION])); } @@ -339,6 +349,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SPECIAL_ARRANGEMENT])) { if (is_array($data[self::FIELD_SPECIAL_ARRANGEMENT])) { foreach($data[self::FIELD_SPECIAL_ARRANGEMENT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addSpecialArrangement($v); } else { @@ -354,6 +367,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SPECIAL_COURTESY])) { if (is_array($data[self::FIELD_SPECIAL_COURTESY])) { foreach($data[self::FIELD_SPECIAL_COURTESY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addSpecialCourtesy($v); } else { @@ -967,7 +983,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getAccomodation())) { foreach($vs as $v) { if (null === $v) { @@ -980,38 +995,30 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getAdmitSource())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ADMIT_SOURCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDestination())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESTINATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDiet())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DIET, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDischargeDiagnosis())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DISCHARGE_DIAGNOSIS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDischargeDisposition())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DISCHARGE_DISPOSITION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOrigin())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ORIGIN, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPreAdmissionIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PRE_ADMISSION_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getReAdmission())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RE_ADMISSION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getSpecialArrangement())) { foreach($vs as $v) { if (null === $v) { @@ -1029,6 +1036,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_SPECIAL_COURTESY, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } @@ -1063,11 +1071,26 @@ public function jsonSerialize() $a[self::FIELD_PERIOD] = $v; } if (null !== ($v = $this->getPreAdmissionIdentifier())) { - $a[self::FIELD_PRE_ADMISSION_IDENTIFIER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PRE_ADMISSION_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PRE_ADMISSION_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_PRE_ADMISSION_IDENTIFIER] = $v; + } } if (null !== ($v = $this->getReAdmission())) { - $a[self::FIELD_RE_ADMISSION] = $v->getValue(); - $a[self::FIELD_RE_ADMISSION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_RE_ADMISSION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_RE_ADMISSION_EXT] = $enc; + } + } else { + $a[self::FIELD_RE_ADMISSION] = $v; + } } if ([] !== ($vs = $this->getSpecialArrangement())) { $a[self::FIELD_SPECIAL_ARRANGEMENT] = $vs; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIREncounter/FHIREncounterLocation.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIREncounter/FHIREncounterLocation.php index b1732dc401..507d16239b 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIREncounter/FHIREncounterLocation.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIREncounter/FHIREncounterLocation.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -74,10 +74,6 @@ class FHIREncounterLocation extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ENCOUNTER_DOT_LOCATION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_LOCATION = 'location'; const FIELD_PERIOD = 'period'; @@ -103,6 +99,9 @@ class FHIREncounterLocation extends FHIRBackboneElement */ protected $period = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIREncounterLocation Constructor * @param null|array $data @@ -300,11 +299,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getLocation())) { $v->xmlSerialize($sxe->addChild(self::FIELD_LOCATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PERIOD, null, $v->_getFHIRXMLNamespace())); } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIREncounter/FHIREncounterParticipant.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIREncounter/FHIREncounterParticipant.php index 8aeba6ab82..188dd0baa1 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIREncounter/FHIREncounterParticipant.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIREncounter/FHIREncounterParticipant.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -74,10 +74,6 @@ class FHIREncounterParticipant extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ENCOUNTER_DOT_PARTICIPANT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_INDIVIDUAL = 'individual'; const FIELD_TYPE = 'type'; @@ -104,6 +100,9 @@ class FHIREncounterParticipant extends FHIRBackboneElement */ protected $type = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIREncounterParticipant Constructor * @param null|array $data @@ -130,6 +129,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_TYPE])) { if (is_array($data[self::FIELD_TYPE])) { foreach($data[self::FIELD_TYPE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addType($v); } else { @@ -340,11 +342,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getIndividual())) { $v->xmlSerialize($sxe->addChild(self::FIELD_INDIVIDUAL, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getType())) { foreach($vs as $v) { if (null === $v) { @@ -353,6 +353,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRFamilyHistory/FHIRFamilyHistoryCondition.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRFamilyHistory/FHIRFamilyHistoryCondition.php index 2cdd7a4f0a..3803636382 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRFamilyHistory/FHIRFamilyHistoryCondition.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRFamilyHistory/FHIRFamilyHistoryCondition.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -76,13 +76,10 @@ class FHIRFamilyHistoryCondition extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_FAMILY_HISTORY_DOT_CONDITION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_NOTE = 'note'; const FIELD_NOTE_EXT = '_note'; const FIELD_ONSET_AGE = 'onsetAge'; + const FIELD_ONSET_AGE_EXT = '_onsetAge'; const FIELD_ONSET_RANGE = 'onsetRange'; const FIELD_ONSET_STRING = 'onsetString'; const FIELD_ONSET_STRING_EXT = '_onsetString'; @@ -160,6 +157,9 @@ class FHIRFamilyHistoryCondition extends FHIRBackboneElement */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRFamilyHistoryCondition Constructor * @param null|array $data @@ -182,15 +182,28 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NOTE] instanceof FHIRString) { $this->setNote($data[self::FIELD_NOTE]); - } elseif ($ext && is_scalar($data[self::FIELD_NOTE])) { - $this->setNote(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NOTE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NOTE])) { + $this->setNote(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NOTE]] + $ext)); + } else if (is_array($data[self::FIELD_NOTE])) { + $this->setNote(new FHIRString(array_merge($ext, $data[self::FIELD_NOTE]))); + } } else { $this->setNote(new FHIRString($data[self::FIELD_NOTE])); } } if (isset($data[self::FIELD_ONSET_AGE])) { + $ext = (isset($data[self::FIELD_ONSET_AGE_EXT]) && is_array($data[self::FIELD_ONSET_AGE_EXT])) + ? $data[self::FIELD_ONSET_AGE_EXT] + : null; if ($data[self::FIELD_ONSET_AGE] instanceof FHIRAge) { $this->setOnsetAge($data[self::FIELD_ONSET_AGE]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ONSET_AGE])) { + $this->setOnsetAge(new FHIRAge([FHIRAge::FIELD_VALUE => $data[self::FIELD_ONSET_AGE]] + $ext)); + } else if (is_array($data[self::FIELD_ONSET_AGE])) { + $this->setOnsetAge(new FHIRAge(array_merge($ext, $data[self::FIELD_ONSET_AGE]))); + } } else { $this->setOnsetAge(new FHIRAge($data[self::FIELD_ONSET_AGE])); } @@ -208,8 +221,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ONSET_STRING] instanceof FHIRString) { $this->setOnsetString($data[self::FIELD_ONSET_STRING]); - } elseif ($ext && is_scalar($data[self::FIELD_ONSET_STRING])) { - $this->setOnsetString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_ONSET_STRING]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ONSET_STRING])) { + $this->setOnsetString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_ONSET_STRING]] + $ext)); + } else if (is_array($data[self::FIELD_ONSET_STRING])) { + $this->setOnsetString(new FHIRString(array_merge($ext, $data[self::FIELD_ONSET_STRING]))); + } } else { $this->setOnsetString(new FHIRString($data[self::FIELD_ONSET_STRING])); } @@ -562,22 +579,18 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getNote())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NOTE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOnsetAge())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ONSET_AGE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOnsetRange())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ONSET_RANGE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getOnsetString())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ONSET_STRING, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOutcome())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OUTCOME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -591,18 +604,40 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getNote())) { - $a[self::FIELD_NOTE] = $v->getValue(); - $a[self::FIELD_NOTE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NOTE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NOTE_EXT] = $enc; + } + } else { + $a[self::FIELD_NOTE] = $v; + } } if (null !== ($v = $this->getOnsetAge())) { - $a[self::FIELD_ONSET_AGE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ONSET_AGE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ONSET_AGE_EXT] = $enc; + } + } else { + $a[self::FIELD_ONSET_AGE] = $v; + } } if (null !== ($v = $this->getOnsetRange())) { $a[self::FIELD_ONSET_RANGE] = $v; } if (null !== ($v = $this->getOnsetString())) { - $a[self::FIELD_ONSET_STRING] = $v->getValue(); - $a[self::FIELD_ONSET_STRING_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ONSET_STRING] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ONSET_STRING_EXT] = $enc; + } + } else { + $a[self::FIELD_ONSET_STRING] = $v; + } } if (null !== ($v = $this->getOutcome())) { $a[self::FIELD_OUTCOME] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRFamilyHistory/FHIRFamilyHistoryRelation.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRFamilyHistory/FHIRFamilyHistoryRelation.php index 15ce56df9e..0602e92ef0 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRFamilyHistory/FHIRFamilyHistoryRelation.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRFamilyHistory/FHIRFamilyHistoryRelation.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRFamilyHistoryRelation extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_FAMILY_HISTORY_DOT_RELATION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_BORN_DATE = 'bornDate'; const FIELD_BORN_DATE_EXT = '_bornDate'; const FIELD_BORN_PERIOD = 'bornPeriod'; @@ -90,6 +86,7 @@ class FHIRFamilyHistoryRelation extends FHIRBackboneElement const FIELD_BORN_STRING_EXT = '_bornString'; const FIELD_CONDITION = 'condition'; const FIELD_DECEASED_AGE = 'deceasedAge'; + const FIELD_DECEASED_AGE_EXT = '_deceasedAge'; const FIELD_DECEASED_BOOLEAN = 'deceasedBoolean'; const FIELD_DECEASED_BOOLEAN_EXT = '_deceasedBoolean'; const FIELD_DECEASED_DATE = 'deceasedDate'; @@ -255,6 +252,9 @@ class FHIRFamilyHistoryRelation extends FHIRBackboneElement */ protected $relationship = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRFamilyHistoryRelation Constructor * @param null|array $data @@ -277,8 +277,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_BORN_DATE] instanceof FHIRDate) { $this->setBornDate($data[self::FIELD_BORN_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_BORN_DATE])) { - $this->setBornDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_BORN_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_BORN_DATE])) { + $this->setBornDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_BORN_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_BORN_DATE])) { + $this->setBornDate(new FHIRDate(array_merge($ext, $data[self::FIELD_BORN_DATE]))); + } } else { $this->setBornDate(new FHIRDate($data[self::FIELD_BORN_DATE])); } @@ -296,8 +300,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_BORN_STRING] instanceof FHIRString) { $this->setBornString($data[self::FIELD_BORN_STRING]); - } elseif ($ext && is_scalar($data[self::FIELD_BORN_STRING])) { - $this->setBornString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_BORN_STRING]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_BORN_STRING])) { + $this->setBornString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_BORN_STRING]] + $ext)); + } else if (is_array($data[self::FIELD_BORN_STRING])) { + $this->setBornString(new FHIRString(array_merge($ext, $data[self::FIELD_BORN_STRING]))); + } } else { $this->setBornString(new FHIRString($data[self::FIELD_BORN_STRING])); } @@ -305,6 +313,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CONDITION])) { if (is_array($data[self::FIELD_CONDITION])) { foreach($data[self::FIELD_CONDITION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRFamilyHistoryCondition) { $this->addCondition($v); } else { @@ -318,8 +329,17 @@ public function __construct($data = null) } } if (isset($data[self::FIELD_DECEASED_AGE])) { + $ext = (isset($data[self::FIELD_DECEASED_AGE_EXT]) && is_array($data[self::FIELD_DECEASED_AGE_EXT])) + ? $data[self::FIELD_DECEASED_AGE_EXT] + : null; if ($data[self::FIELD_DECEASED_AGE] instanceof FHIRAge) { $this->setDeceasedAge($data[self::FIELD_DECEASED_AGE]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DECEASED_AGE])) { + $this->setDeceasedAge(new FHIRAge([FHIRAge::FIELD_VALUE => $data[self::FIELD_DECEASED_AGE]] + $ext)); + } else if (is_array($data[self::FIELD_DECEASED_AGE])) { + $this->setDeceasedAge(new FHIRAge(array_merge($ext, $data[self::FIELD_DECEASED_AGE]))); + } } else { $this->setDeceasedAge(new FHIRAge($data[self::FIELD_DECEASED_AGE])); } @@ -330,8 +350,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DECEASED_BOOLEAN] instanceof FHIRBoolean) { $this->setDeceasedBoolean($data[self::FIELD_DECEASED_BOOLEAN]); - } elseif ($ext && is_scalar($data[self::FIELD_DECEASED_BOOLEAN])) { - $this->setDeceasedBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_DECEASED_BOOLEAN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DECEASED_BOOLEAN])) { + $this->setDeceasedBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_DECEASED_BOOLEAN]] + $ext)); + } else if (is_array($data[self::FIELD_DECEASED_BOOLEAN])) { + $this->setDeceasedBoolean(new FHIRBoolean(array_merge($ext, $data[self::FIELD_DECEASED_BOOLEAN]))); + } } else { $this->setDeceasedBoolean(new FHIRBoolean($data[self::FIELD_DECEASED_BOOLEAN])); } @@ -342,8 +366,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DECEASED_DATE] instanceof FHIRDate) { $this->setDeceasedDate($data[self::FIELD_DECEASED_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_DECEASED_DATE])) { - $this->setDeceasedDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_DECEASED_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DECEASED_DATE])) { + $this->setDeceasedDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_DECEASED_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_DECEASED_DATE])) { + $this->setDeceasedDate(new FHIRDate(array_merge($ext, $data[self::FIELD_DECEASED_DATE]))); + } } else { $this->setDeceasedDate(new FHIRDate($data[self::FIELD_DECEASED_DATE])); } @@ -361,8 +389,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DECEASED_STRING] instanceof FHIRString) { $this->setDeceasedString($data[self::FIELD_DECEASED_STRING]); - } elseif ($ext && is_scalar($data[self::FIELD_DECEASED_STRING])) { - $this->setDeceasedString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DECEASED_STRING]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DECEASED_STRING])) { + $this->setDeceasedString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DECEASED_STRING]] + $ext)); + } else if (is_array($data[self::FIELD_DECEASED_STRING])) { + $this->setDeceasedString(new FHIRString(array_merge($ext, $data[self::FIELD_DECEASED_STRING]))); + } } else { $this->setDeceasedString(new FHIRString($data[self::FIELD_DECEASED_STRING])); } @@ -373,8 +405,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -385,8 +421,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NOTE] instanceof FHIRString) { $this->setNote($data[self::FIELD_NOTE]); - } elseif ($ext && is_scalar($data[self::FIELD_NOTE])) { - $this->setNote(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NOTE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NOTE])) { + $this->setNote(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NOTE]] + $ext)); + } else if (is_array($data[self::FIELD_NOTE])) { + $this->setNote(new FHIRString(array_merge($ext, $data[self::FIELD_NOTE]))); + } } else { $this->setNote(new FHIRString($data[self::FIELD_NOTE])); } @@ -1045,14 +1085,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getBornDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_BORN_DATE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getBornPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_BORN_PERIOD, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getBornString())) { $v->xmlSerialize($sxe->addChild(self::FIELD_BORN_STRING, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getCondition())) { foreach($vs as $v) { if (null === $v) { @@ -1071,7 +1109,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDeceasedDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DECEASED_DATE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDeceasedRange())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DECEASED_RANGE, null, $v->_getFHIRXMLNamespace())); } @@ -1084,7 +1121,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getNote())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NOTE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRelationship())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RELATIONSHIP, null, $v->_getFHIRXMLNamespace())); } @@ -1098,44 +1134,101 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getBornDate())) { - $a[self::FIELD_BORN_DATE] = $v->getValue(); - $a[self::FIELD_BORN_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_BORN_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_BORN_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_BORN_DATE] = $v; + } } if (null !== ($v = $this->getBornPeriod())) { $a[self::FIELD_BORN_PERIOD] = $v; } if (null !== ($v = $this->getBornString())) { - $a[self::FIELD_BORN_STRING] = $v->getValue(); - $a[self::FIELD_BORN_STRING_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_BORN_STRING] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_BORN_STRING_EXT] = $enc; + } + } else { + $a[self::FIELD_BORN_STRING] = $v; + } } if ([] !== ($vs = $this->getCondition())) { $a[self::FIELD_CONDITION] = $vs; } if (null !== ($v = $this->getDeceasedAge())) { - $a[self::FIELD_DECEASED_AGE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DECEASED_AGE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DECEASED_AGE_EXT] = $enc; + } + } else { + $a[self::FIELD_DECEASED_AGE] = $v; + } } if (null !== ($v = $this->getDeceasedBoolean())) { - $a[self::FIELD_DECEASED_BOOLEAN] = $v->getValue(); - $a[self::FIELD_DECEASED_BOOLEAN_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DECEASED_BOOLEAN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DECEASED_BOOLEAN_EXT] = $enc; + } + } else { + $a[self::FIELD_DECEASED_BOOLEAN] = $v; + } } if (null !== ($v = $this->getDeceasedDate())) { - $a[self::FIELD_DECEASED_DATE] = $v->getValue(); - $a[self::FIELD_DECEASED_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DECEASED_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DECEASED_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_DECEASED_DATE] = $v; + } } if (null !== ($v = $this->getDeceasedRange())) { $a[self::FIELD_DECEASED_RANGE] = $v; } if (null !== ($v = $this->getDeceasedString())) { - $a[self::FIELD_DECEASED_STRING] = $v->getValue(); - $a[self::FIELD_DECEASED_STRING_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DECEASED_STRING] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DECEASED_STRING_EXT] = $enc; + } + } else { + $a[self::FIELD_DECEASED_STRING] = $v; + } } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if (null !== ($v = $this->getNote())) { - $a[self::FIELD_NOTE] = $v->getValue(); - $a[self::FIELD_NOTE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NOTE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NOTE_EXT] = $enc; + } + } else { + $a[self::FIELD_NOTE] = $v; + } } if (null !== ($v = $this->getRelationship())) { $a[self::FIELD_RELATIONSHIP] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRGroup/FHIRGroupCharacteristic.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRGroup/FHIRGroupCharacteristic.php index 63cae573e0..7a83e8c075 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRGroup/FHIRGroupCharacteristic.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRGroup/FHIRGroupCharacteristic.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -77,10 +77,6 @@ class FHIRGroupCharacteristic extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_GROUP_DOT_CHARACTERISTIC; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CODE = 'code'; const FIELD_EXCLUDE = 'exclude'; const FIELD_EXCLUDE_EXT = '_exclude'; @@ -164,6 +160,9 @@ class FHIRGroupCharacteristic extends FHIRBackboneElement */ protected $valueRange = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRGroupCharacteristic Constructor * @param null|array $data @@ -193,8 +192,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EXCLUDE] instanceof FHIRBoolean) { $this->setExclude($data[self::FIELD_EXCLUDE]); - } elseif ($ext && is_scalar($data[self::FIELD_EXCLUDE])) { - $this->setExclude(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_EXCLUDE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EXCLUDE])) { + $this->setExclude(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_EXCLUDE]] + $ext)); + } else if (is_array($data[self::FIELD_EXCLUDE])) { + $this->setExclude(new FHIRBoolean(array_merge($ext, $data[self::FIELD_EXCLUDE]))); + } } else { $this->setExclude(new FHIRBoolean($data[self::FIELD_EXCLUDE])); } @@ -205,8 +208,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_BOOLEAN] instanceof FHIRBoolean) { $this->setValueBoolean($data[self::FIELD_VALUE_BOOLEAN]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_BOOLEAN])) { - $this->setValueBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_VALUE_BOOLEAN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_BOOLEAN])) { + $this->setValueBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_VALUE_BOOLEAN]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_BOOLEAN])) { + $this->setValueBoolean(new FHIRBoolean(array_merge($ext, $data[self::FIELD_VALUE_BOOLEAN]))); + } } else { $this->setValueBoolean(new FHIRBoolean($data[self::FIELD_VALUE_BOOLEAN])); } @@ -224,8 +231,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_QUANTITY] instanceof FHIRQuantity) { $this->setValueQuantity($data[self::FIELD_VALUE_QUANTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_QUANTITY])) { - $this->setValueQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_VALUE_QUANTITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_QUANTITY])) { + $this->setValueQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_VALUE_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_QUANTITY])) { + $this->setValueQuantity(new FHIRQuantity(array_merge($ext, $data[self::FIELD_VALUE_QUANTITY]))); + } } else { $this->setValueQuantity(new FHIRQuantity($data[self::FIELD_VALUE_QUANTITY])); } @@ -572,7 +583,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } @@ -582,15 +592,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getValueBoolean())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_BOOLEAN, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_QUANTITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueRange())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_RANGE, null, $v->_getFHIRXMLNamespace())); } @@ -607,18 +614,40 @@ public function jsonSerialize() $a[self::FIELD_CODE] = $v; } if (null !== ($v = $this->getExclude())) { - $a[self::FIELD_EXCLUDE] = $v->getValue(); - $a[self::FIELD_EXCLUDE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EXCLUDE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EXCLUDE_EXT] = $enc; + } + } else { + $a[self::FIELD_EXCLUDE] = $v; + } } if (null !== ($v = $this->getValueBoolean())) { - $a[self::FIELD_VALUE_BOOLEAN] = $v->getValue(); - $a[self::FIELD_VALUE_BOOLEAN_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_BOOLEAN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_BOOLEAN_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_BOOLEAN] = $v; + } } if (null !== ($v = $this->getValueCodeableConcept())) { $a[self::FIELD_VALUE_CODEABLE_CONCEPT] = $v; } if (null !== ($v = $this->getValueQuantity())) { - $a[self::FIELD_VALUE_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_QUANTITY] = $v; + } } if (null !== ($v = $this->getValueRange())) { $a[self::FIELD_VALUE_RANGE] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRImagingStudy/FHIRImagingStudyInstance.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRImagingStudy/FHIRImagingStudyInstance.php index ea348d89ec..60c002d65c 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRImagingStudy/FHIRImagingStudyInstance.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRImagingStudy/FHIRImagingStudyInstance.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRImagingStudyInstance extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_IMAGING_STUDY_DOT_INSTANCE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ATTACHMENT = 'attachment'; const FIELD_NUMBER = 'number'; const FIELD_NUMBER_EXT = '_number'; @@ -169,6 +165,9 @@ class FHIRImagingStudyInstance extends FHIRBackboneElement */ protected $url = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRImagingStudyInstance Constructor * @param null|array $data @@ -198,8 +197,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NUMBER] instanceof FHIRInteger) { $this->setNumber($data[self::FIELD_NUMBER]); - } elseif ($ext && is_scalar($data[self::FIELD_NUMBER])) { - $this->setNumber(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_NUMBER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NUMBER])) { + $this->setNumber(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_NUMBER]] + $ext)); + } else if (is_array($data[self::FIELD_NUMBER])) { + $this->setNumber(new FHIRInteger(array_merge($ext, $data[self::FIELD_NUMBER]))); + } } else { $this->setNumber(new FHIRInteger($data[self::FIELD_NUMBER])); } @@ -210,8 +213,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SOPCLASS] instanceof FHIROid) { $this->setSopclass($data[self::FIELD_SOPCLASS]); - } elseif ($ext && is_scalar($data[self::FIELD_SOPCLASS])) { - $this->setSopclass(new FHIROid([FHIROid::FIELD_VALUE => $data[self::FIELD_SOPCLASS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SOPCLASS])) { + $this->setSopclass(new FHIROid([FHIROid::FIELD_VALUE => $data[self::FIELD_SOPCLASS]] + $ext)); + } else if (is_array($data[self::FIELD_SOPCLASS])) { + $this->setSopclass(new FHIROid(array_merge($ext, $data[self::FIELD_SOPCLASS]))); + } } else { $this->setSopclass(new FHIROid($data[self::FIELD_SOPCLASS])); } @@ -222,8 +229,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TITLE] instanceof FHIRString) { $this->setTitle($data[self::FIELD_TITLE]); - } elseif ($ext && is_scalar($data[self::FIELD_TITLE])) { - $this->setTitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TITLE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TITLE])) { + $this->setTitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TITLE]] + $ext)); + } else if (is_array($data[self::FIELD_TITLE])) { + $this->setTitle(new FHIRString(array_merge($ext, $data[self::FIELD_TITLE]))); + } } else { $this->setTitle(new FHIRString($data[self::FIELD_TITLE])); } @@ -234,8 +245,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TYPE] instanceof FHIRString) { $this->setType($data[self::FIELD_TYPE]); - } elseif ($ext && is_scalar($data[self::FIELD_TYPE])) { - $this->setType(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TYPE])) { + $this->setType(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } else if (is_array($data[self::FIELD_TYPE])) { + $this->setType(new FHIRString(array_merge($ext, $data[self::FIELD_TYPE]))); + } } else { $this->setType(new FHIRString($data[self::FIELD_TYPE])); } @@ -246,8 +261,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_UID] instanceof FHIROid) { $this->setUid($data[self::FIELD_UID]); - } elseif ($ext && is_scalar($data[self::FIELD_UID])) { - $this->setUid(new FHIROid([FHIROid::FIELD_VALUE => $data[self::FIELD_UID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_UID])) { + $this->setUid(new FHIROid([FHIROid::FIELD_VALUE => $data[self::FIELD_UID]] + $ext)); + } else if (is_array($data[self::FIELD_UID])) { + $this->setUid(new FHIROid(array_merge($ext, $data[self::FIELD_UID]))); + } } else { $this->setUid(new FHIROid($data[self::FIELD_UID])); } @@ -258,8 +277,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_URL] instanceof FHIRUri) { $this->setUrl($data[self::FIELD_URL]); - } elseif ($ext && is_scalar($data[self::FIELD_URL])) { - $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } else if (is_array($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri(array_merge($ext, $data[self::FIELD_URL]))); + } } else { $this->setUrl(new FHIRUri($data[self::FIELD_URL])); } @@ -654,7 +677,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getAttachment())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ATTACHMENT, null, $v->_getFHIRXMLNamespace())); } @@ -689,28 +711,70 @@ public function jsonSerialize() $a[self::FIELD_ATTACHMENT] = $v; } if (null !== ($v = $this->getNumber())) { - $a[self::FIELD_NUMBER] = $v->getValue(); - $a[self::FIELD_NUMBER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NUMBER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NUMBER_EXT] = $enc; + } + } else { + $a[self::FIELD_NUMBER] = $v; + } } if (null !== ($v = $this->getSopclass())) { - $a[self::FIELD_SOPCLASS] = $v->getValue(); - $a[self::FIELD_SOPCLASS_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SOPCLASS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SOPCLASS_EXT] = $enc; + } + } else { + $a[self::FIELD_SOPCLASS] = $v; + } } if (null !== ($v = $this->getTitle())) { - $a[self::FIELD_TITLE] = $v->getValue(); - $a[self::FIELD_TITLE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TITLE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TITLE_EXT] = $enc; + } + } else { + $a[self::FIELD_TITLE] = $v; + } } if (null !== ($v = $this->getType())) { - $a[self::FIELD_TYPE] = $v->getValue(); - $a[self::FIELD_TYPE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TYPE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TYPE_EXT] = $enc; + } + } else { + $a[self::FIELD_TYPE] = $v; + } } if (null !== ($v = $this->getUid())) { - $a[self::FIELD_UID] = $v->getValue(); - $a[self::FIELD_UID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_UID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_UID_EXT] = $enc; + } + } else { + $a[self::FIELD_UID] = $v; + } } if (null !== ($v = $this->getUrl())) { - $a[self::FIELD_URL] = $v->getValue(); - $a[self::FIELD_URL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_URL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_URL_EXT] = $enc; + } + } else { + $a[self::FIELD_URL] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRImagingStudy/FHIRImagingStudySeries.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRImagingStudy/FHIRImagingStudySeries.php index 177088ff61..11f1c93553 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRImagingStudy/FHIRImagingStudySeries.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRImagingStudy/FHIRImagingStudySeries.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -81,10 +81,6 @@ class FHIRImagingStudySeries extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_IMAGING_STUDY_DOT_SERIES; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_AVAILABILITY = 'availability'; const FIELD_AVAILABILITY_EXT = '_availability'; const FIELD_BODY_SITE = 'bodySite'; @@ -211,6 +207,9 @@ class FHIRImagingStudySeries extends FHIRBackboneElement */ protected $url = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRImagingStudySeries Constructor * @param null|array $data @@ -233,8 +232,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_AVAILABILITY] instanceof FHIRInstanceAvailability) { $this->setAvailability($data[self::FIELD_AVAILABILITY]); - } elseif ($ext && is_scalar($data[self::FIELD_AVAILABILITY])) { - $this->setAvailability(new FHIRInstanceAvailability([FHIRInstanceAvailability::FIELD_VALUE => $data[self::FIELD_AVAILABILITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_AVAILABILITY])) { + $this->setAvailability(new FHIRInstanceAvailability([FHIRInstanceAvailability::FIELD_VALUE => $data[self::FIELD_AVAILABILITY]] + $ext)); + } else if (is_array($data[self::FIELD_AVAILABILITY])) { + $this->setAvailability(new FHIRInstanceAvailability(array_merge($ext, $data[self::FIELD_AVAILABILITY]))); + } } else { $this->setAvailability(new FHIRInstanceAvailability($data[self::FIELD_AVAILABILITY])); } @@ -252,8 +255,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATE_TIME] instanceof FHIRDateTime) { $this->setDateTime($data[self::FIELD_DATE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_DATE_TIME])) { - $this->setDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATE_TIME])) { + $this->setDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_DATE_TIME])) { + $this->setDateTime(new FHIRDateTime(array_merge($ext, $data[self::FIELD_DATE_TIME]))); + } } else { $this->setDateTime(new FHIRDateTime($data[self::FIELD_DATE_TIME])); } @@ -264,8 +271,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -273,6 +284,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_INSTANCE])) { if (is_array($data[self::FIELD_INSTANCE])) { foreach($data[self::FIELD_INSTANCE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRImagingStudyInstance) { $this->addInstance($v); } else { @@ -291,8 +305,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MODALITY] instanceof FHIRModality) { $this->setModality($data[self::FIELD_MODALITY]); - } elseif ($ext && is_scalar($data[self::FIELD_MODALITY])) { - $this->setModality(new FHIRModality([FHIRModality::FIELD_VALUE => $data[self::FIELD_MODALITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MODALITY])) { + $this->setModality(new FHIRModality([FHIRModality::FIELD_VALUE => $data[self::FIELD_MODALITY]] + $ext)); + } else if (is_array($data[self::FIELD_MODALITY])) { + $this->setModality(new FHIRModality(array_merge($ext, $data[self::FIELD_MODALITY]))); + } } else { $this->setModality(new FHIRModality($data[self::FIELD_MODALITY])); } @@ -303,8 +321,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NUMBER] instanceof FHIRInteger) { $this->setNumber($data[self::FIELD_NUMBER]); - } elseif ($ext && is_scalar($data[self::FIELD_NUMBER])) { - $this->setNumber(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_NUMBER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NUMBER])) { + $this->setNumber(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_NUMBER]] + $ext)); + } else if (is_array($data[self::FIELD_NUMBER])) { + $this->setNumber(new FHIRInteger(array_merge($ext, $data[self::FIELD_NUMBER]))); + } } else { $this->setNumber(new FHIRInteger($data[self::FIELD_NUMBER])); } @@ -315,8 +337,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NUMBER_OF_INSTANCES] instanceof FHIRInteger) { $this->setNumberOfInstances($data[self::FIELD_NUMBER_OF_INSTANCES]); - } elseif ($ext && is_scalar($data[self::FIELD_NUMBER_OF_INSTANCES])) { - $this->setNumberOfInstances(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_NUMBER_OF_INSTANCES]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NUMBER_OF_INSTANCES])) { + $this->setNumberOfInstances(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_NUMBER_OF_INSTANCES]] + $ext)); + } else if (is_array($data[self::FIELD_NUMBER_OF_INSTANCES])) { + $this->setNumberOfInstances(new FHIRInteger(array_merge($ext, $data[self::FIELD_NUMBER_OF_INSTANCES]))); + } } else { $this->setNumberOfInstances(new FHIRInteger($data[self::FIELD_NUMBER_OF_INSTANCES])); } @@ -327,8 +353,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_UID] instanceof FHIROid) { $this->setUid($data[self::FIELD_UID]); - } elseif ($ext && is_scalar($data[self::FIELD_UID])) { - $this->setUid(new FHIROid([FHIROid::FIELD_VALUE => $data[self::FIELD_UID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_UID])) { + $this->setUid(new FHIROid([FHIROid::FIELD_VALUE => $data[self::FIELD_UID]] + $ext)); + } else if (is_array($data[self::FIELD_UID])) { + $this->setUid(new FHIROid(array_merge($ext, $data[self::FIELD_UID]))); + } } else { $this->setUid(new FHIROid($data[self::FIELD_UID])); } @@ -339,8 +369,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_URL] instanceof FHIRUri) { $this->setUrl($data[self::FIELD_URL]); - } elseif ($ext && is_scalar($data[self::FIELD_URL])) { - $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } else if (is_array($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri(array_merge($ext, $data[self::FIELD_URL]))); + } } else { $this->setUrl(new FHIRUri($data[self::FIELD_URL])); } @@ -864,11 +898,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getAvailability())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AVAILABILITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getBodySite())) { $v->xmlSerialize($sxe->addChild(self::FIELD_BODY_SITE, null, $v->_getFHIRXMLNamespace())); } @@ -878,7 +910,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESCRIPTION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getInstance())) { foreach($vs as $v) { if (null === $v) { @@ -913,40 +944,98 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getAvailability())) { - $a[self::FIELD_AVAILABILITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_AVAILABILITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_AVAILABILITY_EXT] = $enc; + } + } else { + $a[self::FIELD_AVAILABILITY] = $v; + } } if (null !== ($v = $this->getBodySite())) { $a[self::FIELD_BODY_SITE] = $v; } if (null !== ($v = $this->getDateTime())) { - $a[self::FIELD_DATE_TIME] = $v->getValue(); - $a[self::FIELD_DATE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_DATE_TIME] = $v; + } } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if ([] !== ($vs = $this->getInstance())) { $a[self::FIELD_INSTANCE] = $vs; } if (null !== ($v = $this->getModality())) { - $a[self::FIELD_MODALITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MODALITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MODALITY_EXT] = $enc; + } + } else { + $a[self::FIELD_MODALITY] = $v; + } } if (null !== ($v = $this->getNumber())) { - $a[self::FIELD_NUMBER] = $v->getValue(); - $a[self::FIELD_NUMBER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NUMBER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NUMBER_EXT] = $enc; + } + } else { + $a[self::FIELD_NUMBER] = $v; + } } if (null !== ($v = $this->getNumberOfInstances())) { - $a[self::FIELD_NUMBER_OF_INSTANCES] = $v->getValue(); - $a[self::FIELD_NUMBER_OF_INSTANCES_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NUMBER_OF_INSTANCES] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NUMBER_OF_INSTANCES_EXT] = $enc; + } + } else { + $a[self::FIELD_NUMBER_OF_INSTANCES] = $v; + } } if (null !== ($v = $this->getUid())) { - $a[self::FIELD_UID] = $v->getValue(); - $a[self::FIELD_UID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_UID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_UID_EXT] = $enc; + } + } else { + $a[self::FIELD_UID] = $v; + } } if (null !== ($v = $this->getUrl())) { - $a[self::FIELD_URL] = $v->getValue(); - $a[self::FIELD_URL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_URL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_URL_EXT] = $enc; + } + } else { + $a[self::FIELD_URL] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRImmunization/FHIRImmunizationExplanation.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRImmunization/FHIRImmunizationExplanation.php index eac38b5cc0..a15f98d966 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRImmunization/FHIRImmunizationExplanation.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRImmunization/FHIRImmunizationExplanation.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -72,10 +72,6 @@ class FHIRImmunizationExplanation extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_IMMUNIZATION_DOT_EXPLANATION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_REASON = 'reason'; const FIELD_REFUSAL_REASON = 'refusalReason'; @@ -103,6 +99,9 @@ class FHIRImmunizationExplanation extends FHIRBackboneElement */ protected $refusalReason = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRImmunizationExplanation Constructor * @param null|array $data @@ -122,6 +121,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REASON])) { if (is_array($data[self::FIELD_REASON])) { foreach($data[self::FIELD_REASON] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addReason($v); } else { @@ -137,6 +139,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REFUSAL_REASON])) { if (is_array($data[self::FIELD_REFUSAL_REASON])) { foreach($data[self::FIELD_REFUSAL_REASON] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addRefusalReason($v); } else { @@ -378,7 +383,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getReason())) { foreach($vs as $v) { if (null === $v) { @@ -396,6 +400,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_REFUSAL_REASON, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRImmunization/FHIRImmunizationReaction.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRImmunization/FHIRImmunizationReaction.php index 7c1424475a..0a0b4fe6c7 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRImmunization/FHIRImmunizationReaction.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRImmunization/FHIRImmunizationReaction.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -74,10 +74,6 @@ class FHIRImmunizationReaction extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_IMMUNIZATION_DOT_REACTION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DATE = 'date'; const FIELD_DATE_EXT = '_date'; const FIELD_DETAIL = 'detail'; @@ -118,6 +114,9 @@ class FHIRImmunizationReaction extends FHIRBackboneElement */ protected $reported = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRImmunizationReaction Constructor * @param null|array $data @@ -140,8 +139,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATE] instanceof FHIRDateTime) { $this->setDate($data[self::FIELD_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_DATE])) { - $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime(array_merge($ext, $data[self::FIELD_DATE]))); + } } else { $this->setDate(new FHIRDateTime($data[self::FIELD_DATE])); } @@ -159,8 +162,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_REPORTED] instanceof FHIRBoolean) { $this->setReported($data[self::FIELD_REPORTED]); - } elseif ($ext && is_scalar($data[self::FIELD_REPORTED])) { - $this->setReported(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_REPORTED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_REPORTED])) { + $this->setReported(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_REPORTED]] + $ext)); + } else if (is_array($data[self::FIELD_REPORTED])) { + $this->setReported(new FHIRBoolean(array_merge($ext, $data[self::FIELD_REPORTED]))); + } } else { $this->setReported(new FHIRBoolean($data[self::FIELD_REPORTED])); } @@ -392,7 +399,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DATE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDetail())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DETAIL, null, $v->_getFHIRXMLNamespace())); } @@ -409,15 +415,29 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getDate())) { - $a[self::FIELD_DATE] = $v->getValue(); - $a[self::FIELD_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_DATE] = $v; + } } if (null !== ($v = $this->getDetail())) { $a[self::FIELD_DETAIL] = $v; } if (null !== ($v = $this->getReported())) { - $a[self::FIELD_REPORTED] = $v->getValue(); - $a[self::FIELD_REPORTED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_REPORTED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_REPORTED_EXT] = $enc; + } + } else { + $a[self::FIELD_REPORTED] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRImmunization/FHIRImmunizationVaccinationProtocol.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRImmunization/FHIRImmunizationVaccinationProtocol.php index a7ba6399e3..29bdf57036 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRImmunization/FHIRImmunizationVaccinationProtocol.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRImmunization/FHIRImmunizationVaccinationProtocol.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -75,10 +75,6 @@ class FHIRImmunizationVaccinationProtocol extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_IMMUNIZATION_DOT_VACCINATION_PROTOCOL; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_AUTHORITY = 'authority'; const FIELD_DESCRIPTION = 'description'; const FIELD_DESCRIPTION_EXT = '_description'; @@ -182,6 +178,9 @@ class FHIRImmunizationVaccinationProtocol extends FHIRBackboneElement */ protected $seriesDoses = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRImmunizationVaccinationProtocol Constructor * @param null|array $data @@ -211,8 +210,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -223,8 +226,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DOSE_SEQUENCE] instanceof FHIRInteger) { $this->setDoseSequence($data[self::FIELD_DOSE_SEQUENCE]); - } elseif ($ext && is_scalar($data[self::FIELD_DOSE_SEQUENCE])) { - $this->setDoseSequence(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_DOSE_SEQUENCE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DOSE_SEQUENCE])) { + $this->setDoseSequence(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_DOSE_SEQUENCE]] + $ext)); + } else if (is_array($data[self::FIELD_DOSE_SEQUENCE])) { + $this->setDoseSequence(new FHIRInteger(array_merge($ext, $data[self::FIELD_DOSE_SEQUENCE]))); + } } else { $this->setDoseSequence(new FHIRInteger($data[self::FIELD_DOSE_SEQUENCE])); } @@ -256,8 +263,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SERIES] instanceof FHIRString) { $this->setSeries($data[self::FIELD_SERIES]); - } elseif ($ext && is_scalar($data[self::FIELD_SERIES])) { - $this->setSeries(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SERIES]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SERIES])) { + $this->setSeries(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SERIES]] + $ext)); + } else if (is_array($data[self::FIELD_SERIES])) { + $this->setSeries(new FHIRString(array_merge($ext, $data[self::FIELD_SERIES]))); + } } else { $this->setSeries(new FHIRString($data[self::FIELD_SERIES])); } @@ -268,8 +279,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SERIES_DOSES] instanceof FHIRInteger) { $this->setSeriesDoses($data[self::FIELD_SERIES_DOSES]); - } elseif ($ext && is_scalar($data[self::FIELD_SERIES_DOSES])) { - $this->setSeriesDoses(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_SERIES_DOSES]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SERIES_DOSES])) { + $this->setSeriesDoses(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_SERIES_DOSES]] + $ext)); + } else if (is_array($data[self::FIELD_SERIES_DOSES])) { + $this->setSeriesDoses(new FHIRInteger(array_merge($ext, $data[self::FIELD_SERIES_DOSES]))); + } } else { $this->setSeriesDoses(new FHIRInteger($data[self::FIELD_SERIES_DOSES])); } @@ -687,7 +702,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getAuthority())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AUTHORITY, null, $v->_getFHIRXMLNamespace())); } @@ -697,15 +711,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDoseSequence())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DOSE_SEQUENCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDoseStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DOSE_STATUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDoseStatusReason())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DOSE_STATUS_REASON, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDoseTarget())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DOSE_TARGET, null, $v->_getFHIRXMLNamespace())); } @@ -728,12 +739,26 @@ public function jsonSerialize() $a[self::FIELD_AUTHORITY] = $v; } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if (null !== ($v = $this->getDoseSequence())) { - $a[self::FIELD_DOSE_SEQUENCE] = $v->getValue(); - $a[self::FIELD_DOSE_SEQUENCE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DOSE_SEQUENCE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DOSE_SEQUENCE_EXT] = $enc; + } + } else { + $a[self::FIELD_DOSE_SEQUENCE] = $v; + } } if (null !== ($v = $this->getDoseStatus())) { $a[self::FIELD_DOSE_STATUS] = $v; @@ -745,12 +770,26 @@ public function jsonSerialize() $a[self::FIELD_DOSE_TARGET] = $v; } if (null !== ($v = $this->getSeries())) { - $a[self::FIELD_SERIES] = $v->getValue(); - $a[self::FIELD_SERIES_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SERIES] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SERIES_EXT] = $enc; + } + } else { + $a[self::FIELD_SERIES] = $v; + } } if (null !== ($v = $this->getSeriesDoses())) { - $a[self::FIELD_SERIES_DOSES] = $v->getValue(); - $a[self::FIELD_SERIES_DOSES_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SERIES_DOSES] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SERIES_DOSES_EXT] = $enc; + } + } else { + $a[self::FIELD_SERIES_DOSES] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRImmunizationRecommendation/FHIRImmunizationRecommendationDateCriterion.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRImmunizationRecommendation/FHIRImmunizationRecommendationDateCriterion.php index 366dc3e7e6..764c028059 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRImmunizationRecommendation/FHIRImmunizationRecommendationDateCriterion.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRImmunizationRecommendation/FHIRImmunizationRecommendationDateCriterion.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -74,10 +74,6 @@ class FHIRImmunizationRecommendationDateCriterion extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_IMMUNIZATION_RECOMMENDATION_DOT_DATE_CRITERION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CODE = 'code'; const FIELD_VALUE = 'value'; const FIELD_VALUE_EXT = '_value'; @@ -108,6 +104,9 @@ class FHIRImmunizationRecommendationDateCriterion extends FHIRBackboneElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRImmunizationRecommendationDateCriterion Constructor * @param null|array $data @@ -141,8 +140,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE] instanceof FHIRDateTime) { $this->setValue($data[self::FIELD_VALUE]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE])) { - $this->setValue(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_VALUE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE])) { + $this->setValue(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_VALUE]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE])) { + $this->setValue(new FHIRDateTime(array_merge($ext, $data[self::FIELD_VALUE]))); + } } else { $this->setValue(new FHIRDateTime($data[self::FIELD_VALUE])); } @@ -333,11 +336,11 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getValue())) { + $sxe->addAttribute(self::FIELD_VALUE, (string)$v); $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE, null, $v->_getFHIRXMLNamespace())); } return $sxe; @@ -353,8 +356,15 @@ public function jsonSerialize() $a[self::FIELD_CODE] = $v; } if (null !== ($v = $this->getValue())) { - $a[self::FIELD_VALUE] = $v->getValue(); - $a[self::FIELD_VALUE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRImmunizationRecommendation/FHIRImmunizationRecommendationProtocol.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRImmunizationRecommendation/FHIRImmunizationRecommendationProtocol.php index 0b6dce22d2..fb5113179f 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRImmunizationRecommendation/FHIRImmunizationRecommendationProtocol.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRImmunizationRecommendation/FHIRImmunizationRecommendationProtocol.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -75,10 +75,6 @@ class FHIRImmunizationRecommendationProtocol extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_IMMUNIZATION_RECOMMENDATION_DOT_PROTOCOL; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_AUTHORITY = 'authority'; const FIELD_DESCRIPTION = 'description'; const FIELD_DESCRIPTION_EXT = '_description'; @@ -131,6 +127,9 @@ class FHIRImmunizationRecommendationProtocol extends FHIRBackboneElement */ protected $series = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRImmunizationRecommendationProtocol Constructor * @param null|array $data @@ -160,8 +159,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -172,8 +175,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DOSE_SEQUENCE] instanceof FHIRInteger) { $this->setDoseSequence($data[self::FIELD_DOSE_SEQUENCE]); - } elseif ($ext && is_scalar($data[self::FIELD_DOSE_SEQUENCE])) { - $this->setDoseSequence(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_DOSE_SEQUENCE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DOSE_SEQUENCE])) { + $this->setDoseSequence(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_DOSE_SEQUENCE]] + $ext)); + } else if (is_array($data[self::FIELD_DOSE_SEQUENCE])) { + $this->setDoseSequence(new FHIRInteger(array_merge($ext, $data[self::FIELD_DOSE_SEQUENCE]))); + } } else { $this->setDoseSequence(new FHIRInteger($data[self::FIELD_DOSE_SEQUENCE])); } @@ -184,8 +191,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SERIES] instanceof FHIRString) { $this->setSeries($data[self::FIELD_SERIES]); - } elseif ($ext && is_scalar($data[self::FIELD_SERIES])) { - $this->setSeries(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SERIES]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SERIES])) { + $this->setSeries(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SERIES]] + $ext)); + } else if (is_array($data[self::FIELD_SERIES])) { + $this->setSeries(new FHIRString(array_merge($ext, $data[self::FIELD_SERIES]))); + } } else { $this->setSeries(new FHIRString($data[self::FIELD_SERIES])); } @@ -456,7 +467,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getAuthority())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AUTHORITY, null, $v->_getFHIRXMLNamespace())); } @@ -482,16 +492,37 @@ public function jsonSerialize() $a[self::FIELD_AUTHORITY] = $v; } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if (null !== ($v = $this->getDoseSequence())) { - $a[self::FIELD_DOSE_SEQUENCE] = $v->getValue(); - $a[self::FIELD_DOSE_SEQUENCE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DOSE_SEQUENCE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DOSE_SEQUENCE_EXT] = $enc; + } + } else { + $a[self::FIELD_DOSE_SEQUENCE] = $v; + } } if (null !== ($v = $this->getSeries())) { - $a[self::FIELD_SERIES] = $v->getValue(); - $a[self::FIELD_SERIES_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SERIES] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SERIES_EXT] = $enc; + } + } else { + $a[self::FIELD_SERIES] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRImmunizationRecommendation/FHIRImmunizationRecommendationRecommendation.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRImmunizationRecommendation/FHIRImmunizationRecommendationRecommendation.php index e0f81aa8f9..476c046778 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRImmunizationRecommendation/FHIRImmunizationRecommendationRecommendation.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRImmunizationRecommendation/FHIRImmunizationRecommendationRecommendation.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -76,10 +76,6 @@ class FHIRImmunizationRecommendationRecommendation extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_IMMUNIZATION_RECOMMENDATION_DOT_RECOMMENDATION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DATE = 'date'; const FIELD_DATE_EXT = '_date'; const FIELD_DATE_CRITERION = 'dateCriterion'; @@ -185,6 +181,9 @@ class FHIRImmunizationRecommendationRecommendation extends FHIRBackboneElement */ protected $vaccineType = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRImmunizationRecommendationRecommendation Constructor * @param null|array $data @@ -207,8 +206,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATE] instanceof FHIRDateTime) { $this->setDate($data[self::FIELD_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_DATE])) { - $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime(array_merge($ext, $data[self::FIELD_DATE]))); + } } else { $this->setDate(new FHIRDateTime($data[self::FIELD_DATE])); } @@ -219,17 +222,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_DATE_CRITERION])) { foreach($data[self::FIELD_DATE_CRITERION] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRImmunizationRecommendationDateCriterion) { $this->addDateCriterion($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addDateCriterion(new FHIRImmunizationRecommendationDateCriterion([FHIRImmunizationRecommendationDateCriterion::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addDateCriterion(new FHIRImmunizationRecommendationDateCriterion([FHIRImmunizationRecommendationDateCriterion::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addDateCriterion(new FHIRImmunizationRecommendationDateCriterion(array_merge($v, $ext[$i]))); + } } else { $this->addDateCriterion(new FHIRImmunizationRecommendationDateCriterion($v)); } } } elseif ($data[self::FIELD_DATE_CRITERION] instanceof FHIRImmunizationRecommendationDateCriterion) { $this->addDateCriterion($data[self::FIELD_DATE_CRITERION]); - } elseif ($ext && is_scalar($data[self::FIELD_DATE_CRITERION])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_DATE_CRITERION])) { $this->addDateCriterion(new FHIRImmunizationRecommendationDateCriterion([FHIRImmunizationRecommendationDateCriterion::FIELD_VALUE => $data[self::FIELD_DATE_CRITERION]] + $ext)); } else { $this->addDateCriterion(new FHIRImmunizationRecommendationDateCriterion($data[self::FIELD_DATE_CRITERION])); @@ -241,8 +251,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DOSE_NUMBER] instanceof FHIRInteger) { $this->setDoseNumber($data[self::FIELD_DOSE_NUMBER]); - } elseif ($ext && is_scalar($data[self::FIELD_DOSE_NUMBER])) { - $this->setDoseNumber(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_DOSE_NUMBER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DOSE_NUMBER])) { + $this->setDoseNumber(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_DOSE_NUMBER]] + $ext)); + } else if (is_array($data[self::FIELD_DOSE_NUMBER])) { + $this->setDoseNumber(new FHIRInteger(array_merge($ext, $data[self::FIELD_DOSE_NUMBER]))); + } } else { $this->setDoseNumber(new FHIRInteger($data[self::FIELD_DOSE_NUMBER])); } @@ -264,6 +278,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SUPPORTING_IMMUNIZATION])) { if (is_array($data[self::FIELD_SUPPORTING_IMMUNIZATION])) { foreach($data[self::FIELD_SUPPORTING_IMMUNIZATION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRResourceReference) { $this->addSupportingImmunization($v); } else { @@ -279,6 +296,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SUPPORTING_PATIENT_INFORMATION])) { if (is_array($data[self::FIELD_SUPPORTING_PATIENT_INFORMATION])) { foreach($data[self::FIELD_SUPPORTING_PATIENT_INFORMATION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRResourceReference) { $this->addSupportingPatientInformation($v); } else { @@ -783,7 +803,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DATE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getDateCriterion())) { foreach($vs as $v) { if (null === $v) { @@ -792,18 +811,16 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_DATE_CRITERION, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getDoseNumber())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DOSE_NUMBER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getForecastStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FORECAST_STATUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getProtocol())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PROTOCOL, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getSupportingImmunization())) { foreach($vs as $v) { if (null === $v) { @@ -835,15 +852,45 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getDate())) { - $a[self::FIELD_DATE] = $v->getValue(); - $a[self::FIELD_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_DATE] = $v; + } } if ([] !== ($vs = $this->getDateCriterion())) { - $a[self::FIELD_DATE_CRITERION] = $vs; + $a[self::FIELD_DATE_CRITERION] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATE_CRITERION][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATE_CRITERION_EXT][] = $enc; + } else { + $a[self::FIELD_DATE_CRITERION_EXT][] = null; + } + } else { + $a[self::FIELD_DATE_CRITERION][] = $v; + } + } } if (null !== ($v = $this->getDoseNumber())) { - $a[self::FIELD_DOSE_NUMBER] = $v->getValue(); - $a[self::FIELD_DOSE_NUMBER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DOSE_NUMBER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DOSE_NUMBER_EXT] = $enc; + } + } else { + $a[self::FIELD_DOSE_NUMBER] = $v; + } } if (null !== ($v = $this->getForecastStatus())) { $a[self::FIELD_FORECAST_STATUS] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRList/FHIRListEntry.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRList/FHIRListEntry.php index 84fdf054d6..56461277c3 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRList/FHIRListEntry.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRList/FHIRListEntry.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -75,10 +75,6 @@ class FHIRListEntry extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_LIST_DOT_ENTRY; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DATE = 'date'; const FIELD_DATE_EXT = '_date'; const FIELD_DELETED = 'deleted'; @@ -133,6 +129,9 @@ class FHIRListEntry extends FHIRBackboneElement */ protected $item = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRListEntry Constructor * @param null|array $data @@ -155,8 +154,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATE] instanceof FHIRDateTime) { $this->setDate($data[self::FIELD_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_DATE])) { - $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime(array_merge($ext, $data[self::FIELD_DATE]))); + } } else { $this->setDate(new FHIRDateTime($data[self::FIELD_DATE])); } @@ -167,8 +170,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DELETED] instanceof FHIRBoolean) { $this->setDeleted($data[self::FIELD_DELETED]); - } elseif ($ext && is_scalar($data[self::FIELD_DELETED])) { - $this->setDeleted(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_DELETED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DELETED])) { + $this->setDeleted(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_DELETED]] + $ext)); + } else if (is_array($data[self::FIELD_DELETED])) { + $this->setDeleted(new FHIRBoolean(array_merge($ext, $data[self::FIELD_DELETED]))); + } } else { $this->setDeleted(new FHIRBoolean($data[self::FIELD_DELETED])); } @@ -176,6 +183,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_FLAG])) { if (is_array($data[self::FIELD_FLAG])) { foreach($data[self::FIELD_FLAG] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addFlag($v); } else { @@ -492,7 +502,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDeleted())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DELETED, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getFlag())) { foreach($vs as $v) { if (null === $v) { @@ -515,12 +524,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getDate())) { - $a[self::FIELD_DATE] = $v->getValue(); - $a[self::FIELD_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_DATE] = $v; + } } if (null !== ($v = $this->getDeleted())) { - $a[self::FIELD_DELETED] = $v->getValue(); - $a[self::FIELD_DELETED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DELETED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DELETED_EXT] = $enc; + } + } else { + $a[self::FIELD_DELETED] = $v; + } } if ([] !== ($vs = $this->getFlag())) { $a[self::FIELD_FLAG] = $vs; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRLocation/FHIRLocationPosition.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRLocation/FHIRLocationPosition.php index 5c501b954f..1cdcc6625b 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRLocation/FHIRLocationPosition.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRLocation/FHIRLocationPosition.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -74,10 +74,6 @@ class FHIRLocationPosition extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_LOCATION_DOT_POSITION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ALTITUDE = 'altitude'; const FIELD_ALTITUDE_EXT = '_altitude'; const FIELD_LATITUDE = 'latitude'; @@ -118,6 +114,9 @@ class FHIRLocationPosition extends FHIRBackboneElement */ protected $longitude = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRLocationPosition Constructor * @param null|array $data @@ -140,8 +139,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ALTITUDE] instanceof FHIRDecimal) { $this->setAltitude($data[self::FIELD_ALTITUDE]); - } elseif ($ext && is_scalar($data[self::FIELD_ALTITUDE])) { - $this->setAltitude(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_ALTITUDE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ALTITUDE])) { + $this->setAltitude(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_ALTITUDE]] + $ext)); + } else if (is_array($data[self::FIELD_ALTITUDE])) { + $this->setAltitude(new FHIRDecimal(array_merge($ext, $data[self::FIELD_ALTITUDE]))); + } } else { $this->setAltitude(new FHIRDecimal($data[self::FIELD_ALTITUDE])); } @@ -152,8 +155,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_LATITUDE] instanceof FHIRDecimal) { $this->setLatitude($data[self::FIELD_LATITUDE]); - } elseif ($ext && is_scalar($data[self::FIELD_LATITUDE])) { - $this->setLatitude(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_LATITUDE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_LATITUDE])) { + $this->setLatitude(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_LATITUDE]] + $ext)); + } else if (is_array($data[self::FIELD_LATITUDE])) { + $this->setLatitude(new FHIRDecimal(array_merge($ext, $data[self::FIELD_LATITUDE]))); + } } else { $this->setLatitude(new FHIRDecimal($data[self::FIELD_LATITUDE])); } @@ -164,8 +171,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_LONGITUDE] instanceof FHIRDecimal) { $this->setLongitude($data[self::FIELD_LONGITUDE]); - } elseif ($ext && is_scalar($data[self::FIELD_LONGITUDE])) { - $this->setLongitude(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_LONGITUDE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_LONGITUDE])) { + $this->setLongitude(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_LONGITUDE]] + $ext)); + } else if (is_array($data[self::FIELD_LONGITUDE])) { + $this->setLongitude(new FHIRDecimal(array_merge($ext, $data[self::FIELD_LONGITUDE]))); + } } else { $this->setLongitude(new FHIRDecimal($data[self::FIELD_LONGITUDE])); } @@ -422,16 +433,37 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getAltitude())) { - $a[self::FIELD_ALTITUDE] = $v->getValue(); - $a[self::FIELD_ALTITUDE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ALTITUDE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ALTITUDE_EXT] = $enc; + } + } else { + $a[self::FIELD_ALTITUDE] = $v; + } } if (null !== ($v = $this->getLatitude())) { - $a[self::FIELD_LATITUDE] = $v->getValue(); - $a[self::FIELD_LATITUDE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_LATITUDE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_LATITUDE_EXT] = $enc; + } + } else { + $a[self::FIELD_LATITUDE] = $v; + } } if (null !== ($v = $this->getLongitude())) { - $a[self::FIELD_LONGITUDE] = $v->getValue(); - $a[self::FIELD_LONGITUDE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_LONGITUDE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_LONGITUDE_EXT] = $enc; + } + } else { + $a[self::FIELD_LONGITUDE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRMedication/FHIRMedicationContent.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRMedication/FHIRMedicationContent.php index 980d419adf..53b2934b8d 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRMedication/FHIRMedicationContent.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRMedication/FHIRMedicationContent.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -74,10 +74,6 @@ class FHIRMedicationContent extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MEDICATION_DOT_CONTENT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_AMOUNT = 'amount'; const FIELD_AMOUNT_EXT = '_amount'; const FIELD_ITEM = 'item'; @@ -106,6 +102,9 @@ class FHIRMedicationContent extends FHIRBackboneElement */ protected $item = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMedicationContent Constructor * @param null|array $data @@ -128,8 +127,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_AMOUNT] instanceof FHIRQuantity) { $this->setAmount($data[self::FIELD_AMOUNT]); - } elseif ($ext && is_scalar($data[self::FIELD_AMOUNT])) { - $this->setAmount(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_AMOUNT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_AMOUNT])) { + $this->setAmount(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_AMOUNT]] + $ext)); + } else if (is_array($data[self::FIELD_AMOUNT])) { + $this->setAmount(new FHIRQuantity(array_merge($ext, $data[self::FIELD_AMOUNT]))); + } } else { $this->setAmount(new FHIRQuantity($data[self::FIELD_AMOUNT])); } @@ -312,11 +315,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getAmount())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AMOUNT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getItem())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ITEM, null, $v->_getFHIRXMLNamespace())); } @@ -330,7 +331,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getAmount())) { - $a[self::FIELD_AMOUNT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_AMOUNT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_AMOUNT_EXT] = $enc; + } + } else { + $a[self::FIELD_AMOUNT] = $v; + } } if (null !== ($v = $this->getItem())) { $a[self::FIELD_ITEM] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRMedication/FHIRMedicationIngredient.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRMedication/FHIRMedicationIngredient.php index 707b6bbaf0..0729534344 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRMedication/FHIRMedicationIngredient.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRMedication/FHIRMedicationIngredient.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -74,10 +74,6 @@ class FHIRMedicationIngredient extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MEDICATION_DOT_INGREDIENT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_AMOUNT = 'amount'; const FIELD_ITEM = 'item'; @@ -106,6 +102,9 @@ class FHIRMedicationIngredient extends FHIRBackboneElement */ protected $item = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMedicationIngredient Constructor * @param null|array $data @@ -309,11 +308,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getAmount())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AMOUNT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getItem())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ITEM, null, $v->_getFHIRXMLNamespace())); } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRMedication/FHIRMedicationPackage.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRMedication/FHIRMedicationPackage.php index b33527ea39..c6c41385a1 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRMedication/FHIRMedicationPackage.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRMedication/FHIRMedicationPackage.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -73,10 +73,6 @@ class FHIRMedicationPackage extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MEDICATION_DOT_PACKAGE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CONTAINER = 'container'; const FIELD_CONTENT = 'content'; @@ -102,6 +98,9 @@ class FHIRMedicationPackage extends FHIRBackboneElement */ protected $content = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMedicationPackage Constructor * @param null|array $data @@ -128,6 +127,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CONTENT])) { if (is_array($data[self::FIELD_CONTENT])) { foreach($data[self::FIELD_CONTENT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRMedicationContent) { $this->addContent($v); } else { @@ -334,11 +336,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getContainer())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CONTAINER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getContent())) { foreach($vs as $v) { if (null === $v) { @@ -347,6 +347,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_CONTENT, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRMedication/FHIRMedicationProduct.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRMedication/FHIRMedicationProduct.php index b6e529f9ec..17a1855d75 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRMedication/FHIRMedicationProduct.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRMedication/FHIRMedicationProduct.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -73,10 +73,6 @@ class FHIRMedicationProduct extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MEDICATION_DOT_PRODUCT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_FORM = 'form'; const FIELD_INGREDIENT = 'ingredient'; @@ -102,6 +98,9 @@ class FHIRMedicationProduct extends FHIRBackboneElement */ protected $ingredient = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMedicationProduct Constructor * @param null|array $data @@ -128,6 +127,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_INGREDIENT])) { if (is_array($data[self::FIELD_INGREDIENT])) { foreach($data[self::FIELD_INGREDIENT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRMedicationIngredient) { $this->addIngredient($v); } else { @@ -334,11 +336,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getForm())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FORM, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIngredient())) { foreach($vs as $v) { if (null === $v) { @@ -347,6 +347,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_INGREDIENT, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRMedicationAdministration/FHIRMedicationAdministrationDosage.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRMedicationAdministration/FHIRMedicationAdministrationDosage.php index 6133a9f8e3..a97cfede39 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRMedicationAdministration/FHIRMedicationAdministrationDosage.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRMedicationAdministration/FHIRMedicationAdministrationDosage.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRMedicationAdministrationDosage extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MEDICATION_ADMINISTRATION_DOT_DOSAGE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_AS_NEEDED_BOOLEAN = 'asNeededBoolean'; const FIELD_AS_NEEDED_BOOLEAN_EXT = '_asNeededBoolean'; const FIELD_AS_NEEDED_CODEABLE_CONCEPT = 'asNeededCodeableConcept'; @@ -238,6 +234,9 @@ class FHIRMedicationAdministrationDosage extends FHIRBackboneElement */ protected $timingPeriod = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMedicationAdministrationDosage Constructor * @param null|array $data @@ -260,8 +259,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_AS_NEEDED_BOOLEAN] instanceof FHIRBoolean) { $this->setAsNeededBoolean($data[self::FIELD_AS_NEEDED_BOOLEAN]); - } elseif ($ext && is_scalar($data[self::FIELD_AS_NEEDED_BOOLEAN])) { - $this->setAsNeededBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_AS_NEEDED_BOOLEAN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_AS_NEEDED_BOOLEAN])) { + $this->setAsNeededBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_AS_NEEDED_BOOLEAN]] + $ext)); + } else if (is_array($data[self::FIELD_AS_NEEDED_BOOLEAN])) { + $this->setAsNeededBoolean(new FHIRBoolean(array_merge($ext, $data[self::FIELD_AS_NEEDED_BOOLEAN]))); + } } else { $this->setAsNeededBoolean(new FHIRBoolean($data[self::FIELD_AS_NEEDED_BOOLEAN])); } @@ -293,8 +296,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_QUANTITY] instanceof FHIRQuantity) { $this->setQuantity($data[self::FIELD_QUANTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_QUANTITY])) { - $this->setQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_QUANTITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_QUANTITY])) { + $this->setQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_QUANTITY])) { + $this->setQuantity(new FHIRQuantity(array_merge($ext, $data[self::FIELD_QUANTITY]))); + } } else { $this->setQuantity(new FHIRQuantity($data[self::FIELD_QUANTITY])); } @@ -326,8 +333,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TIMING_DATE_TIME] instanceof FHIRDateTime) { $this->setTimingDateTime($data[self::FIELD_TIMING_DATE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_TIMING_DATE_TIME])) { - $this->setTimingDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_TIMING_DATE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TIMING_DATE_TIME])) { + $this->setTimingDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_TIMING_DATE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_TIMING_DATE_TIME])) { + $this->setTimingDateTime(new FHIRDateTime(array_merge($ext, $data[self::FIELD_TIMING_DATE_TIME]))); + } } else { $this->setTimingDateTime(new FHIRDateTime($data[self::FIELD_TIMING_DATE_TIME])); } @@ -855,38 +866,30 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getAsNeededBoolean())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AS_NEEDED_BOOLEAN, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getAsNeededCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AS_NEEDED_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getMaxDosePerPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MAX_DOSE_PER_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getMethod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_METHOD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_QUANTITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RATE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRoute())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ROUTE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSite())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SITE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getTimingDateTime())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TIMING_DATE_TIME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getTimingPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TIMING_PERIOD, null, $v->_getFHIRXMLNamespace())); } @@ -900,8 +903,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getAsNeededBoolean())) { - $a[self::FIELD_AS_NEEDED_BOOLEAN] = $v->getValue(); - $a[self::FIELD_AS_NEEDED_BOOLEAN_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_AS_NEEDED_BOOLEAN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_AS_NEEDED_BOOLEAN_EXT] = $enc; + } + } else { + $a[self::FIELD_AS_NEEDED_BOOLEAN] = $v; + } } if (null !== ($v = $this->getAsNeededCodeableConcept())) { $a[self::FIELD_AS_NEEDED_CODEABLE_CONCEPT] = $v; @@ -913,7 +923,15 @@ public function jsonSerialize() $a[self::FIELD_METHOD] = $v; } if (null !== ($v = $this->getQuantity())) { - $a[self::FIELD_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_QUANTITY] = $v; + } } if (null !== ($v = $this->getRate())) { $a[self::FIELD_RATE] = $v; @@ -925,8 +943,15 @@ public function jsonSerialize() $a[self::FIELD_SITE] = $v; } if (null !== ($v = $this->getTimingDateTime())) { - $a[self::FIELD_TIMING_DATE_TIME] = $v->getValue(); - $a[self::FIELD_TIMING_DATE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TIMING_DATE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TIMING_DATE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_TIMING_DATE_TIME] = $v; + } } if (null !== ($v = $this->getTimingPeriod())) { $a[self::FIELD_TIMING_PERIOD] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRMedicationDispense/FHIRMedicationDispenseDispense.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRMedicationDispense/FHIRMedicationDispenseDispense.php index fea351cdab..b16668b438 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRMedicationDispense/FHIRMedicationDispenseDispense.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRMedicationDispense/FHIRMedicationDispenseDispense.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRMedicationDispenseDispense extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MEDICATION_DISPENSE_DOT_DISPENSE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DESTINATION = 'destination'; const FIELD_DOSAGE = 'dosage'; const FIELD_IDENTIFIER = 'identifier'; @@ -221,6 +217,9 @@ class FHIRMedicationDispenseDispense extends FHIRBackboneElement */ protected $whenPrepared = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMedicationDispenseDispense Constructor * @param null|array $data @@ -247,6 +246,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_DOSAGE])) { if (is_array($data[self::FIELD_DOSAGE])) { foreach($data[self::FIELD_DOSAGE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRMedicationDispenseDosage) { $this->addDosage($v); } else { @@ -265,8 +267,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->setIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { - $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_IDENTIFIER]))); + } } else { $this->setIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); } @@ -284,8 +290,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_QUANTITY] instanceof FHIRQuantity) { $this->setQuantity($data[self::FIELD_QUANTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_QUANTITY])) { - $this->setQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_QUANTITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_QUANTITY])) { + $this->setQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_QUANTITY])) { + $this->setQuantity(new FHIRQuantity(array_merge($ext, $data[self::FIELD_QUANTITY]))); + } } else { $this->setQuantity(new FHIRQuantity($data[self::FIELD_QUANTITY])); } @@ -293,6 +303,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_RECEIVER])) { if (is_array($data[self::FIELD_RECEIVER])) { foreach($data[self::FIELD_RECEIVER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRResourceReference) { $this->addReceiver($v); } else { @@ -311,8 +324,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRMedicationDispenseStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRMedicationDispenseStatus([FHIRMedicationDispenseStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRMedicationDispenseStatus([FHIRMedicationDispenseStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRMedicationDispenseStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRMedicationDispenseStatus($data[self::FIELD_STATUS])); } @@ -330,8 +347,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_WHEN_HANDED_OVER] instanceof FHIRDateTime) { $this->setWhenHandedOver($data[self::FIELD_WHEN_HANDED_OVER]); - } elseif ($ext && is_scalar($data[self::FIELD_WHEN_HANDED_OVER])) { - $this->setWhenHandedOver(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_WHEN_HANDED_OVER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_WHEN_HANDED_OVER])) { + $this->setWhenHandedOver(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_WHEN_HANDED_OVER]] + $ext)); + } else if (is_array($data[self::FIELD_WHEN_HANDED_OVER])) { + $this->setWhenHandedOver(new FHIRDateTime(array_merge($ext, $data[self::FIELD_WHEN_HANDED_OVER]))); + } } else { $this->setWhenHandedOver(new FHIRDateTime($data[self::FIELD_WHEN_HANDED_OVER])); } @@ -342,8 +363,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_WHEN_PREPARED] instanceof FHIRDateTime) { $this->setWhenPrepared($data[self::FIELD_WHEN_PREPARED]); - } elseif ($ext && is_scalar($data[self::FIELD_WHEN_PREPARED])) { - $this->setWhenPrepared(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_WHEN_PREPARED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_WHEN_PREPARED])) { + $this->setWhenPrepared(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_WHEN_PREPARED]] + $ext)); + } else if (is_array($data[self::FIELD_WHEN_PREPARED])) { + $this->setWhenPrepared(new FHIRDateTime(array_merge($ext, $data[self::FIELD_WHEN_PREPARED]))); + } } else { $this->setWhenPrepared(new FHIRDateTime($data[self::FIELD_WHEN_PREPARED])); } @@ -884,11 +909,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getDestination())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESTINATION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getDosage())) { foreach($vs as $v) { if (null === $v) { @@ -901,15 +924,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getMedication())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MEDICATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_QUANTITY, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getReceiver())) { foreach($vs as $v) { if (null === $v) { @@ -922,7 +942,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -948,30 +967,68 @@ public function jsonSerialize() $a[self::FIELD_DOSAGE] = $vs; } if (null !== ($v = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_IDENTIFIER] = $v; + } } if (null !== ($v = $this->getMedication())) { $a[self::FIELD_MEDICATION] = $v; } if (null !== ($v = $this->getQuantity())) { - $a[self::FIELD_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_QUANTITY] = $v; + } } if ([] !== ($vs = $this->getReceiver())) { $a[self::FIELD_RECEIVER] = $vs; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getType())) { $a[self::FIELD_TYPE] = $v; } if (null !== ($v = $this->getWhenHandedOver())) { - $a[self::FIELD_WHEN_HANDED_OVER] = $v->getValue(); - $a[self::FIELD_WHEN_HANDED_OVER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_WHEN_HANDED_OVER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_WHEN_HANDED_OVER_EXT] = $enc; + } + } else { + $a[self::FIELD_WHEN_HANDED_OVER] = $v; + } } if (null !== ($v = $this->getWhenPrepared())) { - $a[self::FIELD_WHEN_PREPARED] = $v->getValue(); - $a[self::FIELD_WHEN_PREPARED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_WHEN_PREPARED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_WHEN_PREPARED_EXT] = $enc; + } + } else { + $a[self::FIELD_WHEN_PREPARED] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRMedicationDispense/FHIRMedicationDispenseDosage.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRMedicationDispense/FHIRMedicationDispenseDosage.php index f489e757c9..e8dbab1080 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRMedicationDispense/FHIRMedicationDispenseDosage.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRMedicationDispense/FHIRMedicationDispenseDosage.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRMedicationDispenseDosage extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MEDICATION_DISPENSE_DOT_DOSAGE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ADDITIONAL_INSTRUCTIONS = 'additionalInstructions'; const FIELD_AS_NEEDED_BOOLEAN = 'asNeededBoolean'; const FIELD_AS_NEEDED_BOOLEAN_EXT = '_asNeededBoolean'; @@ -265,6 +261,9 @@ class FHIRMedicationDispenseDosage extends FHIRBackboneElement */ protected $timingSchedule = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMedicationDispenseDosage Constructor * @param null|array $data @@ -294,8 +293,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_AS_NEEDED_BOOLEAN] instanceof FHIRBoolean) { $this->setAsNeededBoolean($data[self::FIELD_AS_NEEDED_BOOLEAN]); - } elseif ($ext && is_scalar($data[self::FIELD_AS_NEEDED_BOOLEAN])) { - $this->setAsNeededBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_AS_NEEDED_BOOLEAN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_AS_NEEDED_BOOLEAN])) { + $this->setAsNeededBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_AS_NEEDED_BOOLEAN]] + $ext)); + } else if (is_array($data[self::FIELD_AS_NEEDED_BOOLEAN])) { + $this->setAsNeededBoolean(new FHIRBoolean(array_merge($ext, $data[self::FIELD_AS_NEEDED_BOOLEAN]))); + } } else { $this->setAsNeededBoolean(new FHIRBoolean($data[self::FIELD_AS_NEEDED_BOOLEAN])); } @@ -327,8 +330,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_QUANTITY] instanceof FHIRQuantity) { $this->setQuantity($data[self::FIELD_QUANTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_QUANTITY])) { - $this->setQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_QUANTITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_QUANTITY])) { + $this->setQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_QUANTITY])) { + $this->setQuantity(new FHIRQuantity(array_merge($ext, $data[self::FIELD_QUANTITY]))); + } } else { $this->setQuantity(new FHIRQuantity($data[self::FIELD_QUANTITY])); } @@ -360,8 +367,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TIMING_DATE_TIME] instanceof FHIRDateTime) { $this->setTimingDateTime($data[self::FIELD_TIMING_DATE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_TIMING_DATE_TIME])) { - $this->setTimingDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_TIMING_DATE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TIMING_DATE_TIME])) { + $this->setTimingDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_TIMING_DATE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_TIMING_DATE_TIME])) { + $this->setTimingDateTime(new FHIRDateTime(array_merge($ext, $data[self::FIELD_TIMING_DATE_TIME]))); + } } else { $this->setTimingDateTime(new FHIRDateTime($data[self::FIELD_TIMING_DATE_TIME])); } @@ -967,49 +978,39 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getAdditionalInstructions())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ADDITIONAL_INSTRUCTIONS, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getAsNeededBoolean())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AS_NEEDED_BOOLEAN, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getAsNeededCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AS_NEEDED_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getMaxDosePerPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MAX_DOSE_PER_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getMethod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_METHOD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_QUANTITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RATE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRoute())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ROUTE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSite())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SITE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getTimingDateTime())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TIMING_DATE_TIME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getTimingPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TIMING_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getTimingSchedule())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TIMING_SCHEDULE, null, $v->_getFHIRXMLNamespace())); } @@ -1026,8 +1027,15 @@ public function jsonSerialize() $a[self::FIELD_ADDITIONAL_INSTRUCTIONS] = $v; } if (null !== ($v = $this->getAsNeededBoolean())) { - $a[self::FIELD_AS_NEEDED_BOOLEAN] = $v->getValue(); - $a[self::FIELD_AS_NEEDED_BOOLEAN_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_AS_NEEDED_BOOLEAN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_AS_NEEDED_BOOLEAN_EXT] = $enc; + } + } else { + $a[self::FIELD_AS_NEEDED_BOOLEAN] = $v; + } } if (null !== ($v = $this->getAsNeededCodeableConcept())) { $a[self::FIELD_AS_NEEDED_CODEABLE_CONCEPT] = $v; @@ -1039,7 +1047,15 @@ public function jsonSerialize() $a[self::FIELD_METHOD] = $v; } if (null !== ($v = $this->getQuantity())) { - $a[self::FIELD_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_QUANTITY] = $v; + } } if (null !== ($v = $this->getRate())) { $a[self::FIELD_RATE] = $v; @@ -1051,8 +1067,15 @@ public function jsonSerialize() $a[self::FIELD_SITE] = $v; } if (null !== ($v = $this->getTimingDateTime())) { - $a[self::FIELD_TIMING_DATE_TIME] = $v->getValue(); - $a[self::FIELD_TIMING_DATE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TIMING_DATE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TIMING_DATE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_TIMING_DATE_TIME] = $v; + } } if (null !== ($v = $this->getTimingPeriod())) { $a[self::FIELD_TIMING_PERIOD] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRMedicationDispense/FHIRMedicationDispenseSubstitution.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRMedicationDispense/FHIRMedicationDispenseSubstitution.php index 3d6c86cf3d..2be37b85d3 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRMedicationDispense/FHIRMedicationDispenseSubstitution.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRMedicationDispense/FHIRMedicationDispenseSubstitution.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -74,10 +74,6 @@ class FHIRMedicationDispenseSubstitution extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MEDICATION_DISPENSE_DOT_SUBSTITUTION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_REASON = 'reason'; const FIELD_RESPONSIBLE_PARTY = 'responsibleParty'; const FIELD_TYPE = 'type'; @@ -119,6 +115,9 @@ class FHIRMedicationDispenseSubstitution extends FHIRBackboneElement */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMedicationDispenseSubstitution Constructor * @param null|array $data @@ -138,6 +137,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REASON])) { if (is_array($data[self::FIELD_REASON])) { foreach($data[self::FIELD_REASON] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addReason($v); } else { @@ -153,6 +155,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_RESPONSIBLE_PARTY])) { if (is_array($data[self::FIELD_RESPONSIBLE_PARTY])) { foreach($data[self::FIELD_RESPONSIBLE_PARTY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRResourceReference) { $this->addResponsibleParty($v); } else { @@ -438,7 +443,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getReason())) { foreach($vs as $v) { if (null === $v) { diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRMedicationPrescription/FHIRMedicationPrescriptionDispense.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRMedicationPrescription/FHIRMedicationPrescriptionDispense.php index c007480105..699349a028 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRMedicationPrescription/FHIRMedicationPrescriptionDispense.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRMedicationPrescription/FHIRMedicationPrescriptionDispense.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -77,11 +77,8 @@ class FHIRMedicationPrescriptionDispense extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MEDICATION_PRESCRIPTION_DOT_DISPENSE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_EXPECTED_SUPPLY_DURATION = 'expectedSupplyDuration'; + const FIELD_EXPECTED_SUPPLY_DURATION_EXT = '_expectedSupplyDuration'; const FIELD_MEDICATION = 'medication'; const FIELD_NUMBER_OF_REPEATS_ALLOWED = 'numberOfRepeatsAllowed'; const FIELD_NUMBER_OF_REPEATS_ALLOWED_EXT = '_numberOfRepeatsAllowed'; @@ -161,6 +158,9 @@ class FHIRMedicationPrescriptionDispense extends FHIRBackboneElement */ protected $validityPeriod = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMedicationPrescriptionDispense Constructor * @param null|array $data @@ -178,8 +178,17 @@ public function __construct($data = null) } parent::__construct($data); if (isset($data[self::FIELD_EXPECTED_SUPPLY_DURATION])) { + $ext = (isset($data[self::FIELD_EXPECTED_SUPPLY_DURATION_EXT]) && is_array($data[self::FIELD_EXPECTED_SUPPLY_DURATION_EXT])) + ? $data[self::FIELD_EXPECTED_SUPPLY_DURATION_EXT] + : null; if ($data[self::FIELD_EXPECTED_SUPPLY_DURATION] instanceof FHIRDuration) { $this->setExpectedSupplyDuration($data[self::FIELD_EXPECTED_SUPPLY_DURATION]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EXPECTED_SUPPLY_DURATION])) { + $this->setExpectedSupplyDuration(new FHIRDuration([FHIRDuration::FIELD_VALUE => $data[self::FIELD_EXPECTED_SUPPLY_DURATION]] + $ext)); + } else if (is_array($data[self::FIELD_EXPECTED_SUPPLY_DURATION])) { + $this->setExpectedSupplyDuration(new FHIRDuration(array_merge($ext, $data[self::FIELD_EXPECTED_SUPPLY_DURATION]))); + } } else { $this->setExpectedSupplyDuration(new FHIRDuration($data[self::FIELD_EXPECTED_SUPPLY_DURATION])); } @@ -197,8 +206,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NUMBER_OF_REPEATS_ALLOWED] instanceof FHIRInteger) { $this->setNumberOfRepeatsAllowed($data[self::FIELD_NUMBER_OF_REPEATS_ALLOWED]); - } elseif ($ext && is_scalar($data[self::FIELD_NUMBER_OF_REPEATS_ALLOWED])) { - $this->setNumberOfRepeatsAllowed(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_NUMBER_OF_REPEATS_ALLOWED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NUMBER_OF_REPEATS_ALLOWED])) { + $this->setNumberOfRepeatsAllowed(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_NUMBER_OF_REPEATS_ALLOWED]] + $ext)); + } else if (is_array($data[self::FIELD_NUMBER_OF_REPEATS_ALLOWED])) { + $this->setNumberOfRepeatsAllowed(new FHIRInteger(array_merge($ext, $data[self::FIELD_NUMBER_OF_REPEATS_ALLOWED]))); + } } else { $this->setNumberOfRepeatsAllowed(new FHIRInteger($data[self::FIELD_NUMBER_OF_REPEATS_ALLOWED])); } @@ -209,8 +222,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_QUANTITY] instanceof FHIRQuantity) { $this->setQuantity($data[self::FIELD_QUANTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_QUANTITY])) { - $this->setQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_QUANTITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_QUANTITY])) { + $this->setQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_QUANTITY])) { + $this->setQuantity(new FHIRQuantity(array_merge($ext, $data[self::FIELD_QUANTITY]))); + } } else { $this->setQuantity(new FHIRQuantity($data[self::FIELD_QUANTITY])); } @@ -533,22 +550,18 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getExpectedSupplyDuration())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EXPECTED_SUPPLY_DURATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getMedication())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MEDICATION, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getNumberOfRepeatsAllowed())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NUMBER_OF_REPEATS_ALLOWED, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_QUANTITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValidityPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALIDITY_PERIOD, null, $v->_getFHIRXMLNamespace())); } @@ -562,17 +575,40 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getExpectedSupplyDuration())) { - $a[self::FIELD_EXPECTED_SUPPLY_DURATION] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EXPECTED_SUPPLY_DURATION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EXPECTED_SUPPLY_DURATION_EXT] = $enc; + } + } else { + $a[self::FIELD_EXPECTED_SUPPLY_DURATION] = $v; + } } if (null !== ($v = $this->getMedication())) { $a[self::FIELD_MEDICATION] = $v; } if (null !== ($v = $this->getNumberOfRepeatsAllowed())) { - $a[self::FIELD_NUMBER_OF_REPEATS_ALLOWED] = $v->getValue(); - $a[self::FIELD_NUMBER_OF_REPEATS_ALLOWED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NUMBER_OF_REPEATS_ALLOWED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NUMBER_OF_REPEATS_ALLOWED_EXT] = $enc; + } + } else { + $a[self::FIELD_NUMBER_OF_REPEATS_ALLOWED] = $v; + } } if (null !== ($v = $this->getQuantity())) { - $a[self::FIELD_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_QUANTITY] = $v; + } } if (null !== ($v = $this->getValidityPeriod())) { $a[self::FIELD_VALIDITY_PERIOD] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRMedicationPrescription/FHIRMedicationPrescriptionDosageInstruction.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRMedicationPrescription/FHIRMedicationPrescriptionDosageInstruction.php index 82ae207114..8dfa5ac342 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRMedicationPrescription/FHIRMedicationPrescriptionDosageInstruction.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRMedicationPrescription/FHIRMedicationPrescriptionDosageInstruction.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRMedicationPrescriptionDosageInstruction extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MEDICATION_PRESCRIPTION_DOT_DOSAGE_INSTRUCTION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ADDITIONAL_INSTRUCTIONS = 'additionalInstructions'; const FIELD_AS_NEEDED_BOOLEAN = 'asNeededBoolean'; const FIELD_AS_NEEDED_BOOLEAN_EXT = '_asNeededBoolean'; @@ -279,6 +275,9 @@ class FHIRMedicationPrescriptionDosageInstruction extends FHIRBackboneElement */ protected $timingSchedule = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMedicationPrescriptionDosageInstruction Constructor * @param null|array $data @@ -308,8 +307,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_AS_NEEDED_BOOLEAN] instanceof FHIRBoolean) { $this->setAsNeededBoolean($data[self::FIELD_AS_NEEDED_BOOLEAN]); - } elseif ($ext && is_scalar($data[self::FIELD_AS_NEEDED_BOOLEAN])) { - $this->setAsNeededBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_AS_NEEDED_BOOLEAN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_AS_NEEDED_BOOLEAN])) { + $this->setAsNeededBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_AS_NEEDED_BOOLEAN]] + $ext)); + } else if (is_array($data[self::FIELD_AS_NEEDED_BOOLEAN])) { + $this->setAsNeededBoolean(new FHIRBoolean(array_merge($ext, $data[self::FIELD_AS_NEEDED_BOOLEAN]))); + } } else { $this->setAsNeededBoolean(new FHIRBoolean($data[self::FIELD_AS_NEEDED_BOOLEAN])); } @@ -327,8 +330,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DOSE_QUANTITY] instanceof FHIRQuantity) { $this->setDoseQuantity($data[self::FIELD_DOSE_QUANTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_DOSE_QUANTITY])) { - $this->setDoseQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_DOSE_QUANTITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DOSE_QUANTITY])) { + $this->setDoseQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_DOSE_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_DOSE_QUANTITY])) { + $this->setDoseQuantity(new FHIRQuantity(array_merge($ext, $data[self::FIELD_DOSE_QUANTITY]))); + } } else { $this->setDoseQuantity(new FHIRQuantity($data[self::FIELD_DOSE_QUANTITY])); } @@ -374,8 +381,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TEXT] instanceof FHIRString) { $this->setText($data[self::FIELD_TEXT]); - } elseif ($ext && is_scalar($data[self::FIELD_TEXT])) { - $this->setText(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TEXT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TEXT])) { + $this->setText(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TEXT]] + $ext)); + } else if (is_array($data[self::FIELD_TEXT])) { + $this->setText(new FHIRString(array_merge($ext, $data[self::FIELD_TEXT]))); + } } else { $this->setText(new FHIRString($data[self::FIELD_TEXT])); } @@ -386,8 +397,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TIMING_DATE_TIME] instanceof FHIRDateTime) { $this->setTimingDateTime($data[self::FIELD_TIMING_DATE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_TIMING_DATE_TIME])) { - $this->setTimingDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_TIMING_DATE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TIMING_DATE_TIME])) { + $this->setTimingDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_TIMING_DATE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_TIMING_DATE_TIME])) { + $this->setTimingDateTime(new FHIRDateTime(array_merge($ext, $data[self::FIELD_TIMING_DATE_TIME]))); + } } else { $this->setTimingDateTime(new FHIRDateTime($data[self::FIELD_TIMING_DATE_TIME])); } @@ -1037,38 +1052,30 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getAdditionalInstructions())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ADDITIONAL_INSTRUCTIONS, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getAsNeededBoolean())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AS_NEEDED_BOOLEAN, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getAsNeededCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AS_NEEDED_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDoseQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DOSE_QUANTITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getMaxDosePerPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MAX_DOSE_PER_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getMethod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_METHOD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RATE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRoute())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ROUTE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSite())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SITE, null, $v->_getFHIRXMLNamespace())); } @@ -1078,11 +1085,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getTimingDateTime())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TIMING_DATE_TIME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getTimingPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TIMING_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getTimingSchedule())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TIMING_SCHEDULE, null, $v->_getFHIRXMLNamespace())); } @@ -1099,14 +1104,29 @@ public function jsonSerialize() $a[self::FIELD_ADDITIONAL_INSTRUCTIONS] = $v; } if (null !== ($v = $this->getAsNeededBoolean())) { - $a[self::FIELD_AS_NEEDED_BOOLEAN] = $v->getValue(); - $a[self::FIELD_AS_NEEDED_BOOLEAN_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_AS_NEEDED_BOOLEAN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_AS_NEEDED_BOOLEAN_EXT] = $enc; + } + } else { + $a[self::FIELD_AS_NEEDED_BOOLEAN] = $v; + } } if (null !== ($v = $this->getAsNeededCodeableConcept())) { $a[self::FIELD_AS_NEEDED_CODEABLE_CONCEPT] = $v; } if (null !== ($v = $this->getDoseQuantity())) { - $a[self::FIELD_DOSE_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DOSE_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DOSE_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_DOSE_QUANTITY] = $v; + } } if (null !== ($v = $this->getMaxDosePerPeriod())) { $a[self::FIELD_MAX_DOSE_PER_PERIOD] = $v; @@ -1124,12 +1144,26 @@ public function jsonSerialize() $a[self::FIELD_SITE] = $v; } if (null !== ($v = $this->getText())) { - $a[self::FIELD_TEXT] = $v->getValue(); - $a[self::FIELD_TEXT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TEXT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TEXT_EXT] = $enc; + } + } else { + $a[self::FIELD_TEXT] = $v; + } } if (null !== ($v = $this->getTimingDateTime())) { - $a[self::FIELD_TIMING_DATE_TIME] = $v->getValue(); - $a[self::FIELD_TIMING_DATE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TIMING_DATE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TIMING_DATE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_TIMING_DATE_TIME] = $v; + } } if (null !== ($v = $this->getTimingPeriod())) { $a[self::FIELD_TIMING_PERIOD] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRMedicationPrescription/FHIRMedicationPrescriptionSubstitution.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRMedicationPrescription/FHIRMedicationPrescriptionSubstitution.php index 2d3461f0b3..485f7ca502 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRMedicationPrescription/FHIRMedicationPrescriptionSubstitution.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRMedicationPrescription/FHIRMedicationPrescriptionSubstitution.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -73,10 +73,6 @@ class FHIRMedicationPrescriptionSubstitution extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MEDICATION_PRESCRIPTION_DOT_SUBSTITUTION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_REASON = 'reason'; const FIELD_TYPE = 'type'; @@ -106,6 +102,9 @@ class FHIRMedicationPrescriptionSubstitution extends FHIRBackboneElement */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMedicationPrescriptionSubstitution Constructor * @param null|array $data @@ -311,11 +310,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getReason())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REASON, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRMedicationStatement/FHIRMedicationStatementDosage.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRMedicationStatement/FHIRMedicationStatementDosage.php index 3f0504b0e4..6ab49d56dd 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRMedicationStatement/FHIRMedicationStatementDosage.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRMedicationStatement/FHIRMedicationStatementDosage.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRMedicationStatementDosage extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MEDICATION_STATEMENT_DOT_DOSAGE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_AS_NEEDED_BOOLEAN = 'asNeededBoolean'; const FIELD_AS_NEEDED_BOOLEAN_EXT = '_asNeededBoolean'; const FIELD_AS_NEEDED_CODEABLE_CONCEPT = 'asNeededCodeableConcept'; @@ -217,6 +213,9 @@ class FHIRMedicationStatementDosage extends FHIRBackboneElement */ protected $timing = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMedicationStatementDosage Constructor * @param null|array $data @@ -239,8 +238,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_AS_NEEDED_BOOLEAN] instanceof FHIRBoolean) { $this->setAsNeededBoolean($data[self::FIELD_AS_NEEDED_BOOLEAN]); - } elseif ($ext && is_scalar($data[self::FIELD_AS_NEEDED_BOOLEAN])) { - $this->setAsNeededBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_AS_NEEDED_BOOLEAN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_AS_NEEDED_BOOLEAN])) { + $this->setAsNeededBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_AS_NEEDED_BOOLEAN]] + $ext)); + } else if (is_array($data[self::FIELD_AS_NEEDED_BOOLEAN])) { + $this->setAsNeededBoolean(new FHIRBoolean(array_merge($ext, $data[self::FIELD_AS_NEEDED_BOOLEAN]))); + } } else { $this->setAsNeededBoolean(new FHIRBoolean($data[self::FIELD_AS_NEEDED_BOOLEAN])); } @@ -272,8 +275,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_QUANTITY] instanceof FHIRQuantity) { $this->setQuantity($data[self::FIELD_QUANTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_QUANTITY])) { - $this->setQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_QUANTITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_QUANTITY])) { + $this->setQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_QUANTITY])) { + $this->setQuantity(new FHIRQuantity(array_merge($ext, $data[self::FIELD_QUANTITY]))); + } } else { $this->setQuantity(new FHIRQuantity($data[self::FIELD_QUANTITY])); } @@ -766,35 +773,27 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getAsNeededBoolean())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AS_NEEDED_BOOLEAN, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getAsNeededCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AS_NEEDED_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getMaxDosePerPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MAX_DOSE_PER_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getMethod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_METHOD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_QUANTITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RATE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRoute())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ROUTE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSite())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SITE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getTiming())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TIMING, null, $v->_getFHIRXMLNamespace())); } @@ -808,8 +807,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getAsNeededBoolean())) { - $a[self::FIELD_AS_NEEDED_BOOLEAN] = $v->getValue(); - $a[self::FIELD_AS_NEEDED_BOOLEAN_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_AS_NEEDED_BOOLEAN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_AS_NEEDED_BOOLEAN_EXT] = $enc; + } + } else { + $a[self::FIELD_AS_NEEDED_BOOLEAN] = $v; + } } if (null !== ($v = $this->getAsNeededCodeableConcept())) { $a[self::FIELD_AS_NEEDED_CODEABLE_CONCEPT] = $v; @@ -821,7 +827,15 @@ public function jsonSerialize() $a[self::FIELD_METHOD] = $v; } if (null !== ($v = $this->getQuantity())) { - $a[self::FIELD_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_QUANTITY] = $v; + } } if (null !== ($v = $this->getRate())) { $a[self::FIELD_RATE] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRMessageHeader/FHIRMessageHeaderDestination.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRMessageHeader/FHIRMessageHeaderDestination.php index 478a10817d..5b590ceb02 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRMessageHeader/FHIRMessageHeaderDestination.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRMessageHeader/FHIRMessageHeaderDestination.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -77,10 +77,6 @@ class FHIRMessageHeaderDestination extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MESSAGE_HEADER_DOT_DESTINATION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ENDPOINT = 'endpoint'; const FIELD_ENDPOINT_EXT = '_endpoint'; const FIELD_NAME = 'name'; @@ -119,6 +115,9 @@ class FHIRMessageHeaderDestination extends FHIRBackboneElement */ protected $target = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMessageHeaderDestination Constructor * @param null|array $data @@ -141,8 +140,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ENDPOINT] instanceof FHIRUri) { $this->setEndpoint($data[self::FIELD_ENDPOINT]); - } elseif ($ext && is_scalar($data[self::FIELD_ENDPOINT])) { - $this->setEndpoint(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_ENDPOINT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ENDPOINT])) { + $this->setEndpoint(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_ENDPOINT]] + $ext)); + } else if (is_array($data[self::FIELD_ENDPOINT])) { + $this->setEndpoint(new FHIRUri(array_merge($ext, $data[self::FIELD_ENDPOINT]))); + } } else { $this->setEndpoint(new FHIRUri($data[self::FIELD_ENDPOINT])); } @@ -153,8 +156,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -392,7 +399,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NAME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getTarget())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TARGET, null, $v->_getFHIRXMLNamespace())); } @@ -406,12 +412,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getEndpoint())) { - $a[self::FIELD_ENDPOINT] = $v->getValue(); - $a[self::FIELD_ENDPOINT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ENDPOINT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ENDPOINT_EXT] = $enc; + } + } else { + $a[self::FIELD_ENDPOINT] = $v; + } } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if (null !== ($v = $this->getTarget())) { $a[self::FIELD_TARGET] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRMessageHeader/FHIRMessageHeaderResponse.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRMessageHeader/FHIRMessageHeaderResponse.php index f90708b0ae..dce49fed7a 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRMessageHeader/FHIRMessageHeaderResponse.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRMessageHeader/FHIRMessageHeaderResponse.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -77,10 +77,6 @@ class FHIRMessageHeaderResponse extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MESSAGE_HEADER_DOT_RESPONSE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CODE = 'code'; const FIELD_CODE_EXT = '_code'; const FIELD_DETAILS = 'details'; @@ -122,6 +118,9 @@ class FHIRMessageHeaderResponse extends FHIRBackboneElement */ protected $identifier = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMessageHeaderResponse Constructor * @param null|array $data @@ -144,8 +143,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CODE] instanceof FHIRResponseType) { $this->setCode($data[self::FIELD_CODE]); - } elseif ($ext && is_scalar($data[self::FIELD_CODE])) { - $this->setCode(new FHIRResponseType([FHIRResponseType::FIELD_VALUE => $data[self::FIELD_CODE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CODE])) { + $this->setCode(new FHIRResponseType([FHIRResponseType::FIELD_VALUE => $data[self::FIELD_CODE]] + $ext)); + } else if (is_array($data[self::FIELD_CODE])) { + $this->setCode(new FHIRResponseType(array_merge($ext, $data[self::FIELD_CODE]))); + } } else { $this->setCode(new FHIRResponseType($data[self::FIELD_CODE])); } @@ -163,8 +166,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IDENTIFIER] instanceof FHIRId) { $this->setIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { - $this->setIdentifier(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRId(array_merge($ext, $data[self::FIELD_IDENTIFIER]))); + } } else { $this->setIdentifier(new FHIRId($data[self::FIELD_IDENTIFIER])); } @@ -384,11 +391,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDetails())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DETAILS, null, $v->_getFHIRXMLNamespace())); } @@ -405,14 +410,29 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getCode())) { - $a[self::FIELD_CODE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CODE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CODE_EXT] = $enc; + } + } else { + $a[self::FIELD_CODE] = $v; + } } if (null !== ($v = $this->getDetails())) { $a[self::FIELD_DETAILS] = $v; } if (null !== ($v = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $v->getValue(); - $a[self::FIELD_IDENTIFIER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_IDENTIFIER] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRMessageHeader/FHIRMessageHeaderSource.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRMessageHeader/FHIRMessageHeaderSource.php index 89bf7d0f5a..1f5bb8408a 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRMessageHeader/FHIRMessageHeaderSource.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRMessageHeader/FHIRMessageHeaderSource.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -77,10 +77,6 @@ class FHIRMessageHeaderSource extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MESSAGE_HEADER_DOT_SOURCE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CONTACT = 'contact'; const FIELD_CONTACT_EXT = '_contact'; const FIELD_ENDPOINT = 'endpoint'; @@ -146,6 +142,9 @@ class FHIRMessageHeaderSource extends FHIRBackboneElement */ protected $version = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMessageHeaderSource Constructor * @param null|array $data @@ -168,8 +167,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CONTACT] instanceof FHIRContact) { $this->setContact($data[self::FIELD_CONTACT]); - } elseif ($ext && is_scalar($data[self::FIELD_CONTACT])) { - $this->setContact(new FHIRContact([FHIRContact::FIELD_VALUE => $data[self::FIELD_CONTACT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CONTACT])) { + $this->setContact(new FHIRContact([FHIRContact::FIELD_VALUE => $data[self::FIELD_CONTACT]] + $ext)); + } else if (is_array($data[self::FIELD_CONTACT])) { + $this->setContact(new FHIRContact(array_merge($ext, $data[self::FIELD_CONTACT]))); + } } else { $this->setContact(new FHIRContact($data[self::FIELD_CONTACT])); } @@ -180,8 +183,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ENDPOINT] instanceof FHIRUri) { $this->setEndpoint($data[self::FIELD_ENDPOINT]); - } elseif ($ext && is_scalar($data[self::FIELD_ENDPOINT])) { - $this->setEndpoint(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_ENDPOINT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ENDPOINT])) { + $this->setEndpoint(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_ENDPOINT]] + $ext)); + } else if (is_array($data[self::FIELD_ENDPOINT])) { + $this->setEndpoint(new FHIRUri(array_merge($ext, $data[self::FIELD_ENDPOINT]))); + } } else { $this->setEndpoint(new FHIRUri($data[self::FIELD_ENDPOINT])); } @@ -192,8 +199,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -204,8 +215,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SOFTWARE] instanceof FHIRString) { $this->setSoftware($data[self::FIELD_SOFTWARE]); - } elseif ($ext && is_scalar($data[self::FIELD_SOFTWARE])) { - $this->setSoftware(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SOFTWARE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SOFTWARE])) { + $this->setSoftware(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SOFTWARE]] + $ext)); + } else if (is_array($data[self::FIELD_SOFTWARE])) { + $this->setSoftware(new FHIRString(array_merge($ext, $data[self::FIELD_SOFTWARE]))); + } } else { $this->setSoftware(new FHIRString($data[self::FIELD_SOFTWARE])); } @@ -216,8 +231,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VERSION] instanceof FHIRString) { $this->setVersion($data[self::FIELD_VERSION]); - } elseif ($ext && is_scalar($data[self::FIELD_VERSION])) { - $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } else if (is_array($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString(array_merge($ext, $data[self::FIELD_VERSION]))); + } } else { $this->setVersion(new FHIRString($data[self::FIELD_VERSION])); } @@ -530,7 +549,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getContact())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CONTACT, null, $v->_getFHIRXMLNamespace())); } @@ -556,23 +574,59 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getContact())) { - $a[self::FIELD_CONTACT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CONTACT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CONTACT_EXT] = $enc; + } + } else { + $a[self::FIELD_CONTACT] = $v; + } } if (null !== ($v = $this->getEndpoint())) { - $a[self::FIELD_ENDPOINT] = $v->getValue(); - $a[self::FIELD_ENDPOINT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ENDPOINT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ENDPOINT_EXT] = $enc; + } + } else { + $a[self::FIELD_ENDPOINT] = $v; + } } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if (null !== ($v = $this->getSoftware())) { - $a[self::FIELD_SOFTWARE] = $v->getValue(); - $a[self::FIELD_SOFTWARE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SOFTWARE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SOFTWARE_EXT] = $enc; + } + } else { + $a[self::FIELD_SOFTWARE] = $v; + } } if (null !== ($v = $this->getVersion())) { - $a[self::FIELD_VERSION] = $v->getValue(); - $a[self::FIELD_VERSION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VERSION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VERSION_EXT] = $enc; + } + } else { + $a[self::FIELD_VERSION] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRObservation/FHIRObservationReferenceRange.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRObservation/FHIRObservationReferenceRange.php index 3a14b3b188..ef716ef102 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRObservation/FHIRObservationReferenceRange.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRObservation/FHIRObservationReferenceRange.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -75,10 +75,6 @@ class FHIRObservationReferenceRange extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_OBSERVATION_DOT_REFERENCE_RANGE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_AGE = 'age'; const FIELD_HIGH = 'high'; const FIELD_HIGH_EXT = '_high'; @@ -138,6 +134,9 @@ class FHIRObservationReferenceRange extends FHIRBackboneElement */ protected $meaning = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRObservationReferenceRange Constructor * @param null|array $data @@ -167,8 +166,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_HIGH] instanceof FHIRQuantity) { $this->setHigh($data[self::FIELD_HIGH]); - } elseif ($ext && is_scalar($data[self::FIELD_HIGH])) { - $this->setHigh(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_HIGH]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_HIGH])) { + $this->setHigh(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_HIGH]] + $ext)); + } else if (is_array($data[self::FIELD_HIGH])) { + $this->setHigh(new FHIRQuantity(array_merge($ext, $data[self::FIELD_HIGH]))); + } } else { $this->setHigh(new FHIRQuantity($data[self::FIELD_HIGH])); } @@ -179,8 +182,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_LOW] instanceof FHIRQuantity) { $this->setLow($data[self::FIELD_LOW]); - } elseif ($ext && is_scalar($data[self::FIELD_LOW])) { - $this->setLow(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_LOW]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_LOW])) { + $this->setLow(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_LOW]] + $ext)); + } else if (is_array($data[self::FIELD_LOW])) { + $this->setLow(new FHIRQuantity(array_merge($ext, $data[self::FIELD_LOW]))); + } } else { $this->setLow(new FHIRQuantity($data[self::FIELD_LOW])); } @@ -441,19 +448,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getAge())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AGE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getHigh())) { $v->xmlSerialize($sxe->addChild(self::FIELD_HIGH, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getLow())) { $v->xmlSerialize($sxe->addChild(self::FIELD_LOW, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getMeaning())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MEANING, null, $v->_getFHIRXMLNamespace())); } @@ -470,10 +473,26 @@ public function jsonSerialize() $a[self::FIELD_AGE] = $v; } if (null !== ($v = $this->getHigh())) { - $a[self::FIELD_HIGH] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_HIGH] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_HIGH_EXT] = $enc; + } + } else { + $a[self::FIELD_HIGH] = $v; + } } if (null !== ($v = $this->getLow())) { - $a[self::FIELD_LOW] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_LOW] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_LOW_EXT] = $enc; + } + } else { + $a[self::FIELD_LOW] = $v; + } } if (null !== ($v = $this->getMeaning())) { $a[self::FIELD_MEANING] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRObservation/FHIRObservationRelated.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRObservation/FHIRObservationRelated.php index 2ed3aa99dd..06d63bcdc9 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRObservation/FHIRObservationRelated.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRObservation/FHIRObservationRelated.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -74,10 +74,6 @@ class FHIRObservationRelated extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_OBSERVATION_DOT_RELATED; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_TARGET = 'target'; const FIELD_TYPE = 'type'; const FIELD_TYPE_EXT = '_type'; @@ -104,6 +100,9 @@ class FHIRObservationRelated extends FHIRBackboneElement */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRObservationRelated Constructor * @param null|array $data @@ -133,8 +132,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TYPE] instanceof FHIRObservationRelationshipType) { $this->setType($data[self::FIELD_TYPE]); - } elseif ($ext && is_scalar($data[self::FIELD_TYPE])) { - $this->setType(new FHIRObservationRelationshipType([FHIRObservationRelationshipType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TYPE])) { + $this->setType(new FHIRObservationRelationshipType([FHIRObservationRelationshipType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } else if (is_array($data[self::FIELD_TYPE])) { + $this->setType(new FHIRObservationRelationshipType(array_merge($ext, $data[self::FIELD_TYPE]))); + } } else { $this->setType(new FHIRObservationRelationshipType($data[self::FIELD_TYPE])); } @@ -306,11 +309,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getTarget())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TARGET, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -327,7 +328,15 @@ public function jsonSerialize() $a[self::FIELD_TARGET] = $v; } if (null !== ($v = $this->getType())) { - $a[self::FIELD_TYPE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TYPE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TYPE_EXT] = $enc; + } + } else { + $a[self::FIELD_TYPE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIROperationOutcome/FHIROperationOutcomeIssue.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIROperationOutcome/FHIROperationOutcomeIssue.php index 5c9a8a67db..43cc52c6fe 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIROperationOutcome/FHIROperationOutcomeIssue.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIROperationOutcome/FHIROperationOutcomeIssue.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -75,10 +75,6 @@ class FHIROperationOutcomeIssue extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_OPERATION_OUTCOME_DOT_ISSUE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DETAILS = 'details'; const FIELD_DETAILS_EXT = '_details'; const FIELD_LOCATION = 'location'; @@ -130,6 +126,9 @@ class FHIROperationOutcomeIssue extends FHIRBackboneElement */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIROperationOutcomeIssue Constructor * @param null|array $data @@ -152,8 +151,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DETAILS] instanceof FHIRString) { $this->setDetails($data[self::FIELD_DETAILS]); - } elseif ($ext && is_scalar($data[self::FIELD_DETAILS])) { - $this->setDetails(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DETAILS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DETAILS])) { + $this->setDetails(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DETAILS]] + $ext)); + } else if (is_array($data[self::FIELD_DETAILS])) { + $this->setDetails(new FHIRString(array_merge($ext, $data[self::FIELD_DETAILS]))); + } } else { $this->setDetails(new FHIRString($data[self::FIELD_DETAILS])); } @@ -164,17 +167,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_LOCATION])) { foreach($data[self::FIELD_LOCATION] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRString) { $this->addLocation($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addLocation(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addLocation(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addLocation(new FHIRString(array_merge($v, $ext[$i]))); + } } else { $this->addLocation(new FHIRString($v)); } } } elseif ($data[self::FIELD_LOCATION] instanceof FHIRString) { $this->addLocation($data[self::FIELD_LOCATION]); - } elseif ($ext && is_scalar($data[self::FIELD_LOCATION])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_LOCATION])) { $this->addLocation(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_LOCATION]] + $ext)); } else { $this->addLocation(new FHIRString($data[self::FIELD_LOCATION])); @@ -186,8 +196,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SEVERITY] instanceof FHIRIssueSeverity) { $this->setSeverity($data[self::FIELD_SEVERITY]); - } elseif ($ext && is_scalar($data[self::FIELD_SEVERITY])) { - $this->setSeverity(new FHIRIssueSeverity([FHIRIssueSeverity::FIELD_VALUE => $data[self::FIELD_SEVERITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SEVERITY])) { + $this->setSeverity(new FHIRIssueSeverity([FHIRIssueSeverity::FIELD_VALUE => $data[self::FIELD_SEVERITY]] + $ext)); + } else if (is_array($data[self::FIELD_SEVERITY])) { + $this->setSeverity(new FHIRIssueSeverity(array_merge($ext, $data[self::FIELD_SEVERITY]))); + } } else { $this->setSeverity(new FHIRIssueSeverity($data[self::FIELD_SEVERITY])); } @@ -496,7 +510,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getSeverity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SEVERITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -510,8 +523,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getDetails())) { - $a[self::FIELD_DETAILS] = $v->getValue(); - $a[self::FIELD_DETAILS_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DETAILS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DETAILS_EXT] = $enc; + } + } else { + $a[self::FIELD_DETAILS] = $v; + } } if ([] !== ($vs = $this->getLocation())) { $a[self::FIELD_LOCATION] = []; @@ -519,12 +539,29 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_LOCATION][] = $v->getValue(); - $a[self::FIELD_LOCATION_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_LOCATION][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_LOCATION_EXT][] = $enc; + } else { + $a[self::FIELD_LOCATION_EXT][] = null; + } + } else { + $a[self::FIELD_LOCATION][] = $v; + } } } if (null !== ($v = $this->getSeverity())) { - $a[self::FIELD_SEVERITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SEVERITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SEVERITY_EXT] = $enc; + } + } else { + $a[self::FIELD_SEVERITY] = $v; + } } if (null !== ($v = $this->getType())) { $a[self::FIELD_TYPE] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIROrder/FHIROrderWhen.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIROrder/FHIROrderWhen.php index 725597ec12..047769e9fe 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIROrder/FHIROrderWhen.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIROrder/FHIROrderWhen.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -73,10 +73,6 @@ class FHIROrderWhen extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ORDER_DOT_WHEN; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CODE = 'code'; const FIELD_SCHEDULE = 'schedule'; @@ -105,6 +101,9 @@ class FHIROrderWhen extends FHIRBackboneElement */ protected $schedule = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIROrderWhen Constructor * @param null|array $data @@ -308,11 +307,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSchedule())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SCHEDULE, null, $v->_getFHIRXMLNamespace())); } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIROrganization/FHIROrganizationContact.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIROrganization/FHIROrganizationContact.php index e5aba7332e..e192125db7 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIROrganization/FHIROrganizationContact.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIROrganization/FHIROrganizationContact.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIROrganizationContact extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ORGANIZATION_DOT_CONTACT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ADDRESS = 'address'; const FIELD_GENDER = 'gender'; const FIELD_NAME = 'name'; @@ -150,6 +146,9 @@ class FHIROrganizationContact extends FHIRBackboneElement */ protected $telecom = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIROrganizationContact Constructor * @param null|array $data @@ -200,17 +199,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_TELECOM])) { foreach($data[self::FIELD_TELECOM] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContact) { $this->addTelecom($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addTelecom(new FHIRContact([FHIRContact::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addTelecom(new FHIRContact([FHIRContact::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addTelecom(new FHIRContact(array_merge($v, $ext[$i]))); + } } else { $this->addTelecom(new FHIRContact($v)); } } } elseif ($data[self::FIELD_TELECOM] instanceof FHIRContact) { $this->addTelecom($data[self::FIELD_TELECOM]); - } elseif ($ext && is_scalar($data[self::FIELD_TELECOM])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_TELECOM])) { $this->addTelecom(new FHIRContact([FHIRContact::FIELD_VALUE => $data[self::FIELD_TELECOM]] + $ext)); } else { $this->addTelecom(new FHIRContact($data[self::FIELD_TELECOM])); @@ -524,23 +530,18 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getAddress())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ADDRESS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getGender())) { $v->xmlSerialize($sxe->addChild(self::FIELD_GENDER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NAME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPurpose())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PURPOSE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getTelecom())) { foreach($vs as $v) { if (null === $v) { @@ -549,6 +550,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_TELECOM, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } @@ -571,7 +573,23 @@ public function jsonSerialize() $a[self::FIELD_PURPOSE] = $v; } if ([] !== ($vs = $this->getTelecom())) { - $a[self::FIELD_TELECOM] = $vs; + $a[self::FIELD_TELECOM] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TELECOM][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TELECOM_EXT][] = $enc; + } else { + $a[self::FIELD_TELECOM_EXT][] = null; + } + } else { + $a[self::FIELD_TELECOM][] = $v; + } + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRPatient/FHIRPatientAnimal.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRPatient/FHIRPatientAnimal.php index 599cb2ef74..66cfe51d26 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRPatient/FHIRPatientAnimal.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRPatient/FHIRPatientAnimal.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -73,10 +73,6 @@ class FHIRPatientAnimal extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_PATIENT_DOT_ANIMAL; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_BREED = 'breed'; const FIELD_GENDER_STATUS = 'genderStatus'; const FIELD_SPECIES = 'species'; @@ -117,6 +113,9 @@ class FHIRPatientAnimal extends FHIRBackboneElement */ protected $species = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRPatientAnimal Constructor * @param null|array $data @@ -360,15 +359,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getBreed())) { $v->xmlSerialize($sxe->addChild(self::FIELD_BREED, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getGenderStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_GENDER_STATUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSpecies())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SPECIES, null, $v->_getFHIRXMLNamespace())); } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRPatient/FHIRPatientContact.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRPatient/FHIRPatientContact.php index 02691f06c1..7ef2579d7b 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRPatient/FHIRPatientContact.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRPatient/FHIRPatientContact.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -77,10 +77,6 @@ class FHIRPatientContact extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_PATIENT_DOT_CONTACT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ADDRESS = 'address'; const FIELD_GENDER = 'gender'; const FIELD_NAME = 'name'; @@ -161,6 +157,9 @@ class FHIRPatientContact extends FHIRBackboneElement */ protected $telecom = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRPatientContact Constructor * @param null|array $data @@ -208,6 +207,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_RELATIONSHIP])) { if (is_array($data[self::FIELD_RELATIONSHIP])) { foreach($data[self::FIELD_RELATIONSHIP] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addRelationship($v); } else { @@ -226,17 +228,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_TELECOM])) { foreach($data[self::FIELD_TELECOM] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContact) { $this->addTelecom($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addTelecom(new FHIRContact([FHIRContact::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addTelecom(new FHIRContact([FHIRContact::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addTelecom(new FHIRContact(array_merge($v, $ext[$i]))); + } } else { $this->addTelecom(new FHIRContact($v)); } } } elseif ($data[self::FIELD_TELECOM] instanceof FHIRContact) { $this->addTelecom($data[self::FIELD_TELECOM]); - } elseif ($ext && is_scalar($data[self::FIELD_TELECOM])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_TELECOM])) { $this->addTelecom(new FHIRContact([FHIRContact::FIELD_VALUE => $data[self::FIELD_TELECOM]] + $ext)); } else { $this->addTelecom(new FHIRContact($data[self::FIELD_TELECOM])); @@ -611,23 +620,18 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getAddress())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ADDRESS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getGender())) { $v->xmlSerialize($sxe->addChild(self::FIELD_GENDER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NAME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOrganization())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ORGANIZATION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getRelationship())) { foreach($vs as $v) { if (null === $v) { @@ -645,6 +649,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_TELECOM, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } @@ -670,7 +675,23 @@ public function jsonSerialize() $a[self::FIELD_RELATIONSHIP] = $vs; } if ([] !== ($vs = $this->getTelecom())) { - $a[self::FIELD_TELECOM] = $vs; + $a[self::FIELD_TELECOM] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TELECOM][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TELECOM_EXT][] = $enc; + } else { + $a[self::FIELD_TELECOM_EXT][] = null; + } + } else { + $a[self::FIELD_TELECOM][] = $v; + } + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRPatient/FHIRPatientLink.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRPatient/FHIRPatientLink.php index b1934df443..e62fc04c93 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRPatient/FHIRPatientLink.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRPatient/FHIRPatientLink.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -74,10 +74,6 @@ class FHIRPatientLink extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_PATIENT_DOT_LINK; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_OTHER = 'other'; const FIELD_TYPE = 'type'; const FIELD_TYPE_EXT = '_type'; @@ -103,6 +99,9 @@ class FHIRPatientLink extends FHIRBackboneElement */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRPatientLink Constructor * @param null|array $data @@ -132,8 +131,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TYPE] instanceof FHIRLinkType) { $this->setType($data[self::FIELD_TYPE]); - } elseif ($ext && is_scalar($data[self::FIELD_TYPE])) { - $this->setType(new FHIRLinkType([FHIRLinkType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TYPE])) { + $this->setType(new FHIRLinkType([FHIRLinkType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } else if (is_array($data[self::FIELD_TYPE])) { + $this->setType(new FHIRLinkType(array_merge($ext, $data[self::FIELD_TYPE]))); + } } else { $this->setType(new FHIRLinkType($data[self::FIELD_TYPE])); } @@ -303,11 +306,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getOther())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OTHER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -324,7 +325,15 @@ public function jsonSerialize() $a[self::FIELD_OTHER] = $v; } if (null !== ($v = $this->getType())) { - $a[self::FIELD_TYPE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TYPE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TYPE_EXT] = $enc; + } + } else { + $a[self::FIELD_TYPE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRPractitioner/FHIRPractitionerQualification.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRPractitioner/FHIRPractitionerQualification.php index be8add3e05..ccea3f80d0 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRPractitioner/FHIRPractitionerQualification.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRPractitioner/FHIRPractitionerQualification.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -75,10 +75,6 @@ class FHIRPractitionerQualification extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_PRACTITIONER_DOT_QUALIFICATION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CODE = 'code'; const FIELD_ISSUER = 'issuer'; const FIELD_PERIOD = 'period'; @@ -117,6 +113,9 @@ class FHIRPractitionerQualification extends FHIRBackboneElement */ protected $period = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRPractitionerQualification Constructor * @param null|array $data @@ -356,15 +355,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getIssuer())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ISSUER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PERIOD, null, $v->_getFHIRXMLNamespace())); } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRProcedure/FHIRProcedurePerformer.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRProcedure/FHIRProcedurePerformer.php index 3fd819434c..498c4aaaaa 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRProcedure/FHIRProcedurePerformer.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRProcedure/FHIRProcedurePerformer.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -74,10 +74,6 @@ class FHIRProcedurePerformer extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_PROCEDURE_DOT_PERFORMER; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_PERSON = 'person'; const FIELD_ROLE = 'role'; @@ -104,6 +100,9 @@ class FHIRProcedurePerformer extends FHIRBackboneElement */ protected $role = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRProcedurePerformer Constructor * @param null|array $data @@ -303,11 +302,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getPerson())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PERSON, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRole())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ROLE, null, $v->_getFHIRXMLNamespace())); } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRProcedure/FHIRProcedureRelatedItem.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRProcedure/FHIRProcedureRelatedItem.php index c16805be3a..9cb638616e 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRProcedure/FHIRProcedureRelatedItem.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRProcedure/FHIRProcedureRelatedItem.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -74,10 +74,6 @@ class FHIRProcedureRelatedItem extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_PROCEDURE_DOT_RELATED_ITEM; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_TARGET = 'target'; const FIELD_TYPE = 'type'; const FIELD_TYPE_EXT = '_type'; @@ -103,6 +99,9 @@ class FHIRProcedureRelatedItem extends FHIRBackboneElement */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRProcedureRelatedItem Constructor * @param null|array $data @@ -132,8 +131,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TYPE] instanceof FHIRProcedureRelationshipType) { $this->setType($data[self::FIELD_TYPE]); - } elseif ($ext && is_scalar($data[self::FIELD_TYPE])) { - $this->setType(new FHIRProcedureRelationshipType([FHIRProcedureRelationshipType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TYPE])) { + $this->setType(new FHIRProcedureRelationshipType([FHIRProcedureRelationshipType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } else if (is_array($data[self::FIELD_TYPE])) { + $this->setType(new FHIRProcedureRelationshipType(array_merge($ext, $data[self::FIELD_TYPE]))); + } } else { $this->setType(new FHIRProcedureRelationshipType($data[self::FIELD_TYPE])); } @@ -303,11 +306,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getTarget())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TARGET, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -324,7 +325,15 @@ public function jsonSerialize() $a[self::FIELD_TARGET] = $v; } if (null !== ($v = $this->getType())) { - $a[self::FIELD_TYPE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TYPE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TYPE_EXT] = $enc; + } + } else { + $a[self::FIELD_TYPE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRProfile/FHIRProfileBinding.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRProfile/FHIRProfileBinding.php index d6803803b2..8962851285 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRProfile/FHIRProfileBinding.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRProfile/FHIRProfileBinding.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRProfileBinding extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_PROFILE_DOT_BINDING; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CONFORMANCE = 'conformance'; const FIELD_CONFORMANCE_EXT = '_conformance'; const FIELD_DESCRIPTION = 'description'; @@ -161,6 +157,9 @@ class FHIRProfileBinding extends FHIRBackboneElement */ protected $referenceUri = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRProfileBinding Constructor * @param null|array $data @@ -183,8 +182,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CONFORMANCE] instanceof FHIRBindingConformance) { $this->setConformance($data[self::FIELD_CONFORMANCE]); - } elseif ($ext && is_scalar($data[self::FIELD_CONFORMANCE])) { - $this->setConformance(new FHIRBindingConformance([FHIRBindingConformance::FIELD_VALUE => $data[self::FIELD_CONFORMANCE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CONFORMANCE])) { + $this->setConformance(new FHIRBindingConformance([FHIRBindingConformance::FIELD_VALUE => $data[self::FIELD_CONFORMANCE]] + $ext)); + } else if (is_array($data[self::FIELD_CONFORMANCE])) { + $this->setConformance(new FHIRBindingConformance(array_merge($ext, $data[self::FIELD_CONFORMANCE]))); + } } else { $this->setConformance(new FHIRBindingConformance($data[self::FIELD_CONFORMANCE])); } @@ -195,8 +198,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -207,8 +214,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IS_EXTENSIBLE] instanceof FHIRBoolean) { $this->setIsExtensible($data[self::FIELD_IS_EXTENSIBLE]); - } elseif ($ext && is_scalar($data[self::FIELD_IS_EXTENSIBLE])) { - $this->setIsExtensible(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_IS_EXTENSIBLE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IS_EXTENSIBLE])) { + $this->setIsExtensible(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_IS_EXTENSIBLE]] + $ext)); + } else if (is_array($data[self::FIELD_IS_EXTENSIBLE])) { + $this->setIsExtensible(new FHIRBoolean(array_merge($ext, $data[self::FIELD_IS_EXTENSIBLE]))); + } } else { $this->setIsExtensible(new FHIRBoolean($data[self::FIELD_IS_EXTENSIBLE])); } @@ -219,8 +230,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -238,8 +253,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_REFERENCE_URI] instanceof FHIRUri) { $this->setReferenceUri($data[self::FIELD_REFERENCE_URI]); - } elseif ($ext && is_scalar($data[self::FIELD_REFERENCE_URI])) { - $this->setReferenceUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_REFERENCE_URI]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_REFERENCE_URI])) { + $this->setReferenceUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_REFERENCE_URI]] + $ext)); + } else if (is_array($data[self::FIELD_REFERENCE_URI])) { + $this->setReferenceUri(new FHIRUri(array_merge($ext, $data[self::FIELD_REFERENCE_URI]))); + } } else { $this->setReferenceUri(new FHIRUri($data[self::FIELD_REFERENCE_URI])); } @@ -589,7 +608,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getConformance())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CONFORMANCE, null, $v->_getFHIRXMLNamespace())); } @@ -602,7 +620,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NAME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getReferenceResource())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REFERENCE_RESOURCE, null, $v->_getFHIRXMLNamespace())); } @@ -619,26 +636,62 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getConformance())) { - $a[self::FIELD_CONFORMANCE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CONFORMANCE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CONFORMANCE_EXT] = $enc; + } + } else { + $a[self::FIELD_CONFORMANCE] = $v; + } } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if (null !== ($v = $this->getIsExtensible())) { - $a[self::FIELD_IS_EXTENSIBLE] = $v->getValue(); - $a[self::FIELD_IS_EXTENSIBLE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IS_EXTENSIBLE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IS_EXTENSIBLE_EXT] = $enc; + } + } else { + $a[self::FIELD_IS_EXTENSIBLE] = $v; + } } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if (null !== ($v = $this->getReferenceResource())) { $a[self::FIELD_REFERENCE_RESOURCE] = $v; } if (null !== ($v = $this->getReferenceUri())) { - $a[self::FIELD_REFERENCE_URI] = $v->getValue(); - $a[self::FIELD_REFERENCE_URI_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_REFERENCE_URI] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_REFERENCE_URI_EXT] = $enc; + } + } else { + $a[self::FIELD_REFERENCE_URI] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRProfile/FHIRProfileConstraint.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRProfile/FHIRProfileConstraint.php index aef327fbcf..d02b380c40 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRProfile/FHIRProfileConstraint.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRProfile/FHIRProfileConstraint.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -76,10 +76,6 @@ class FHIRProfileConstraint extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_PROFILE_DOT_CONSTRAINT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_HUMAN = 'human'; const FIELD_HUMAN_EXT = '_human'; const FIELD_KEY = 'key'; @@ -149,6 +145,9 @@ class FHIRProfileConstraint extends FHIRBackboneElement */ protected $xpath = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRProfileConstraint Constructor * @param null|array $data @@ -171,8 +170,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_HUMAN] instanceof FHIRString) { $this->setHuman($data[self::FIELD_HUMAN]); - } elseif ($ext && is_scalar($data[self::FIELD_HUMAN])) { - $this->setHuman(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_HUMAN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_HUMAN])) { + $this->setHuman(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_HUMAN]] + $ext)); + } else if (is_array($data[self::FIELD_HUMAN])) { + $this->setHuman(new FHIRString(array_merge($ext, $data[self::FIELD_HUMAN]))); + } } else { $this->setHuman(new FHIRString($data[self::FIELD_HUMAN])); } @@ -183,8 +186,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_KEY] instanceof FHIRId) { $this->setKey($data[self::FIELD_KEY]); - } elseif ($ext && is_scalar($data[self::FIELD_KEY])) { - $this->setKey(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_KEY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_KEY])) { + $this->setKey(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_KEY]] + $ext)); + } else if (is_array($data[self::FIELD_KEY])) { + $this->setKey(new FHIRId(array_merge($ext, $data[self::FIELD_KEY]))); + } } else { $this->setKey(new FHIRId($data[self::FIELD_KEY])); } @@ -195,8 +202,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -207,8 +218,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SEVERITY] instanceof FHIRConstraintSeverity) { $this->setSeverity($data[self::FIELD_SEVERITY]); - } elseif ($ext && is_scalar($data[self::FIELD_SEVERITY])) { - $this->setSeverity(new FHIRConstraintSeverity([FHIRConstraintSeverity::FIELD_VALUE => $data[self::FIELD_SEVERITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SEVERITY])) { + $this->setSeverity(new FHIRConstraintSeverity([FHIRConstraintSeverity::FIELD_VALUE => $data[self::FIELD_SEVERITY]] + $ext)); + } else if (is_array($data[self::FIELD_SEVERITY])) { + $this->setSeverity(new FHIRConstraintSeverity(array_merge($ext, $data[self::FIELD_SEVERITY]))); + } } else { $this->setSeverity(new FHIRConstraintSeverity($data[self::FIELD_SEVERITY])); } @@ -219,8 +234,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_XPATH] instanceof FHIRString) { $this->setXpath($data[self::FIELD_XPATH]); - } elseif ($ext && is_scalar($data[self::FIELD_XPATH])) { - $this->setXpath(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_XPATH]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_XPATH])) { + $this->setXpath(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_XPATH]] + $ext)); + } else if (is_array($data[self::FIELD_XPATH])) { + $this->setXpath(new FHIRString(array_merge($ext, $data[self::FIELD_XPATH]))); + } } else { $this->setXpath(new FHIRString($data[self::FIELD_XPATH])); } @@ -550,7 +569,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NAME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSeverity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SEVERITY, null, $v->_getFHIRXMLNamespace())); } @@ -567,23 +585,59 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getHuman())) { - $a[self::FIELD_HUMAN] = $v->getValue(); - $a[self::FIELD_HUMAN_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_HUMAN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_HUMAN_EXT] = $enc; + } + } else { + $a[self::FIELD_HUMAN] = $v; + } } if (null !== ($v = $this->getKey())) { - $a[self::FIELD_KEY] = $v->getValue(); - $a[self::FIELD_KEY_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_KEY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_KEY_EXT] = $enc; + } + } else { + $a[self::FIELD_KEY] = $v; + } } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if (null !== ($v = $this->getSeverity())) { - $a[self::FIELD_SEVERITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SEVERITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SEVERITY_EXT] = $enc; + } + } else { + $a[self::FIELD_SEVERITY] = $v; + } } if (null !== ($v = $this->getXpath())) { - $a[self::FIELD_XPATH] = $v->getValue(); - $a[self::FIELD_XPATH_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_XPATH] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_XPATH_EXT] = $enc; + } + } else { + $a[self::FIELD_XPATH] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRProfile/FHIRProfileDefinition.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRProfile/FHIRProfileDefinition.php index ff91996360..d16c5fb9f5 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRProfile/FHIRProfileDefinition.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRProfile/FHIRProfileDefinition.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -100,10 +100,6 @@ class FHIRProfileDefinition extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_PROFILE_DOT_DEFINITION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_BINDING = 'binding'; const FIELD_COMMENTS = 'comments'; const FIELD_COMMENTS_EXT = '_comments'; @@ -1010,6 +1006,9 @@ class FHIRProfileDefinition extends FHIRBackboneElement */ protected $valueUuid = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRProfileDefinition Constructor * @param null|array $data @@ -1039,8 +1038,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_COMMENTS] instanceof FHIRString) { $this->setComments($data[self::FIELD_COMMENTS]); - } elseif ($ext && is_scalar($data[self::FIELD_COMMENTS])) { - $this->setComments(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_COMMENTS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_COMMENTS])) { + $this->setComments(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_COMMENTS]] + $ext)); + } else if (is_array($data[self::FIELD_COMMENTS])) { + $this->setComments(new FHIRString(array_merge($ext, $data[self::FIELD_COMMENTS]))); + } } else { $this->setComments(new FHIRString($data[self::FIELD_COMMENTS])); } @@ -1051,17 +1054,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_CONDITION])) { foreach($data[self::FIELD_CONDITION] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRId) { $this->addCondition($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addCondition(new FHIRId([FHIRId::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addCondition(new FHIRId([FHIRId::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addCondition(new FHIRId(array_merge($v, $ext[$i]))); + } } else { $this->addCondition(new FHIRId($v)); } } } elseif ($data[self::FIELD_CONDITION] instanceof FHIRId) { $this->addCondition($data[self::FIELD_CONDITION]); - } elseif ($ext && is_scalar($data[self::FIELD_CONDITION])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_CONDITION])) { $this->addCondition(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_CONDITION]] + $ext)); } else { $this->addCondition(new FHIRId($data[self::FIELD_CONDITION])); @@ -1070,6 +1080,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CONSTRAINT])) { if (is_array($data[self::FIELD_CONSTRAINT])) { foreach($data[self::FIELD_CONSTRAINT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRProfileConstraint) { $this->addConstraint($v); } else { @@ -1102,8 +1115,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EXAMPLE_BASE_64BINARY] instanceof FHIRBase64Binary) { $this->setExampleBase64Binary($data[self::FIELD_EXAMPLE_BASE_64BINARY]); - } elseif ($ext && is_scalar($data[self::FIELD_EXAMPLE_BASE_64BINARY])) { - $this->setExampleBase64Binary(new FHIRBase64Binary([FHIRBase64Binary::FIELD_VALUE => $data[self::FIELD_EXAMPLE_BASE_64BINARY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EXAMPLE_BASE_64BINARY])) { + $this->setExampleBase64Binary(new FHIRBase64Binary([FHIRBase64Binary::FIELD_VALUE => $data[self::FIELD_EXAMPLE_BASE_64BINARY]] + $ext)); + } else if (is_array($data[self::FIELD_EXAMPLE_BASE_64BINARY])) { + $this->setExampleBase64Binary(new FHIRBase64Binary(array_merge($ext, $data[self::FIELD_EXAMPLE_BASE_64BINARY]))); + } } else { $this->setExampleBase64Binary(new FHIRBase64Binary($data[self::FIELD_EXAMPLE_BASE_64BINARY])); } @@ -1114,8 +1131,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EXAMPLE_BOOLEAN] instanceof FHIRBoolean) { $this->setExampleBoolean($data[self::FIELD_EXAMPLE_BOOLEAN]); - } elseif ($ext && is_scalar($data[self::FIELD_EXAMPLE_BOOLEAN])) { - $this->setExampleBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_EXAMPLE_BOOLEAN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EXAMPLE_BOOLEAN])) { + $this->setExampleBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_EXAMPLE_BOOLEAN]] + $ext)); + } else if (is_array($data[self::FIELD_EXAMPLE_BOOLEAN])) { + $this->setExampleBoolean(new FHIRBoolean(array_merge($ext, $data[self::FIELD_EXAMPLE_BOOLEAN]))); + } } else { $this->setExampleBoolean(new FHIRBoolean($data[self::FIELD_EXAMPLE_BOOLEAN])); } @@ -1126,8 +1147,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EXAMPLE_CODE] instanceof FHIRCode) { $this->setExampleCode($data[self::FIELD_EXAMPLE_CODE]); - } elseif ($ext && is_scalar($data[self::FIELD_EXAMPLE_CODE])) { - $this->setExampleCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_EXAMPLE_CODE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EXAMPLE_CODE])) { + $this->setExampleCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_EXAMPLE_CODE]] + $ext)); + } else if (is_array($data[self::FIELD_EXAMPLE_CODE])) { + $this->setExampleCode(new FHIRCode(array_merge($ext, $data[self::FIELD_EXAMPLE_CODE]))); + } } else { $this->setExampleCode(new FHIRCode($data[self::FIELD_EXAMPLE_CODE])); } @@ -1152,8 +1177,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EXAMPLE_CONTACT] instanceof FHIRContact) { $this->setExampleContact($data[self::FIELD_EXAMPLE_CONTACT]); - } elseif ($ext && is_scalar($data[self::FIELD_EXAMPLE_CONTACT])) { - $this->setExampleContact(new FHIRContact([FHIRContact::FIELD_VALUE => $data[self::FIELD_EXAMPLE_CONTACT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EXAMPLE_CONTACT])) { + $this->setExampleContact(new FHIRContact([FHIRContact::FIELD_VALUE => $data[self::FIELD_EXAMPLE_CONTACT]] + $ext)); + } else if (is_array($data[self::FIELD_EXAMPLE_CONTACT])) { + $this->setExampleContact(new FHIRContact(array_merge($ext, $data[self::FIELD_EXAMPLE_CONTACT]))); + } } else { $this->setExampleContact(new FHIRContact($data[self::FIELD_EXAMPLE_CONTACT])); } @@ -1164,8 +1193,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EXAMPLE_DATE] instanceof FHIRDate) { $this->setExampleDate($data[self::FIELD_EXAMPLE_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_EXAMPLE_DATE])) { - $this->setExampleDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_EXAMPLE_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EXAMPLE_DATE])) { + $this->setExampleDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_EXAMPLE_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_EXAMPLE_DATE])) { + $this->setExampleDate(new FHIRDate(array_merge($ext, $data[self::FIELD_EXAMPLE_DATE]))); + } } else { $this->setExampleDate(new FHIRDate($data[self::FIELD_EXAMPLE_DATE])); } @@ -1176,8 +1209,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EXAMPLE_DATE_TIME] instanceof FHIRDateTime) { $this->setExampleDateTime($data[self::FIELD_EXAMPLE_DATE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_EXAMPLE_DATE_TIME])) { - $this->setExampleDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_EXAMPLE_DATE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EXAMPLE_DATE_TIME])) { + $this->setExampleDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_EXAMPLE_DATE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_EXAMPLE_DATE_TIME])) { + $this->setExampleDateTime(new FHIRDateTime(array_merge($ext, $data[self::FIELD_EXAMPLE_DATE_TIME]))); + } } else { $this->setExampleDateTime(new FHIRDateTime($data[self::FIELD_EXAMPLE_DATE_TIME])); } @@ -1188,8 +1225,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EXAMPLE_DECIMAL] instanceof FHIRDecimal) { $this->setExampleDecimal($data[self::FIELD_EXAMPLE_DECIMAL]); - } elseif ($ext && is_scalar($data[self::FIELD_EXAMPLE_DECIMAL])) { - $this->setExampleDecimal(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_EXAMPLE_DECIMAL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EXAMPLE_DECIMAL])) { + $this->setExampleDecimal(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_EXAMPLE_DECIMAL]] + $ext)); + } else if (is_array($data[self::FIELD_EXAMPLE_DECIMAL])) { + $this->setExampleDecimal(new FHIRDecimal(array_merge($ext, $data[self::FIELD_EXAMPLE_DECIMAL]))); + } } else { $this->setExampleDecimal(new FHIRDecimal($data[self::FIELD_EXAMPLE_DECIMAL])); } @@ -1207,8 +1248,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EXAMPLE_ID] instanceof FHIRId) { $this->setExampleId($data[self::FIELD_EXAMPLE_ID]); - } elseif ($ext && is_scalar($data[self::FIELD_EXAMPLE_ID])) { - $this->setExampleId(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_EXAMPLE_ID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EXAMPLE_ID])) { + $this->setExampleId(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_EXAMPLE_ID]] + $ext)); + } else if (is_array($data[self::FIELD_EXAMPLE_ID])) { + $this->setExampleId(new FHIRId(array_merge($ext, $data[self::FIELD_EXAMPLE_ID]))); + } } else { $this->setExampleId(new FHIRId($data[self::FIELD_EXAMPLE_ID])); } @@ -1219,8 +1264,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EXAMPLE_IDENTIFIER] instanceof FHIRIdentifier) { $this->setExampleIdentifier($data[self::FIELD_EXAMPLE_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_EXAMPLE_IDENTIFIER])) { - $this->setExampleIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_EXAMPLE_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EXAMPLE_IDENTIFIER])) { + $this->setExampleIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_EXAMPLE_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_EXAMPLE_IDENTIFIER])) { + $this->setExampleIdentifier(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_EXAMPLE_IDENTIFIER]))); + } } else { $this->setExampleIdentifier(new FHIRIdentifier($data[self::FIELD_EXAMPLE_IDENTIFIER])); } @@ -1231,8 +1280,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EXAMPLE_INSTANT] instanceof FHIRInstant) { $this->setExampleInstant($data[self::FIELD_EXAMPLE_INSTANT]); - } elseif ($ext && is_scalar($data[self::FIELD_EXAMPLE_INSTANT])) { - $this->setExampleInstant(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_EXAMPLE_INSTANT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EXAMPLE_INSTANT])) { + $this->setExampleInstant(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_EXAMPLE_INSTANT]] + $ext)); + } else if (is_array($data[self::FIELD_EXAMPLE_INSTANT])) { + $this->setExampleInstant(new FHIRInstant(array_merge($ext, $data[self::FIELD_EXAMPLE_INSTANT]))); + } } else { $this->setExampleInstant(new FHIRInstant($data[self::FIELD_EXAMPLE_INSTANT])); } @@ -1243,8 +1296,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EXAMPLE_INTEGER] instanceof FHIRInteger) { $this->setExampleInteger($data[self::FIELD_EXAMPLE_INTEGER]); - } elseif ($ext && is_scalar($data[self::FIELD_EXAMPLE_INTEGER])) { - $this->setExampleInteger(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_EXAMPLE_INTEGER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EXAMPLE_INTEGER])) { + $this->setExampleInteger(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_EXAMPLE_INTEGER]] + $ext)); + } else if (is_array($data[self::FIELD_EXAMPLE_INTEGER])) { + $this->setExampleInteger(new FHIRInteger(array_merge($ext, $data[self::FIELD_EXAMPLE_INTEGER]))); + } } else { $this->setExampleInteger(new FHIRInteger($data[self::FIELD_EXAMPLE_INTEGER])); } @@ -1255,8 +1312,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EXAMPLE_OID] instanceof FHIROid) { $this->setExampleOid($data[self::FIELD_EXAMPLE_OID]); - } elseif ($ext && is_scalar($data[self::FIELD_EXAMPLE_OID])) { - $this->setExampleOid(new FHIROid([FHIROid::FIELD_VALUE => $data[self::FIELD_EXAMPLE_OID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EXAMPLE_OID])) { + $this->setExampleOid(new FHIROid([FHIROid::FIELD_VALUE => $data[self::FIELD_EXAMPLE_OID]] + $ext)); + } else if (is_array($data[self::FIELD_EXAMPLE_OID])) { + $this->setExampleOid(new FHIROid(array_merge($ext, $data[self::FIELD_EXAMPLE_OID]))); + } } else { $this->setExampleOid(new FHIROid($data[self::FIELD_EXAMPLE_OID])); } @@ -1274,8 +1335,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EXAMPLE_QUANTITY] instanceof FHIRQuantity) { $this->setExampleQuantity($data[self::FIELD_EXAMPLE_QUANTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_EXAMPLE_QUANTITY])) { - $this->setExampleQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_EXAMPLE_QUANTITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EXAMPLE_QUANTITY])) { + $this->setExampleQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_EXAMPLE_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_EXAMPLE_QUANTITY])) { + $this->setExampleQuantity(new FHIRQuantity(array_merge($ext, $data[self::FIELD_EXAMPLE_QUANTITY]))); + } } else { $this->setExampleQuantity(new FHIRQuantity($data[self::FIELD_EXAMPLE_QUANTITY])); } @@ -1321,8 +1386,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EXAMPLE_STRING] instanceof FHIRString) { $this->setExampleString($data[self::FIELD_EXAMPLE_STRING]); - } elseif ($ext && is_scalar($data[self::FIELD_EXAMPLE_STRING])) { - $this->setExampleString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_EXAMPLE_STRING]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EXAMPLE_STRING])) { + $this->setExampleString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_EXAMPLE_STRING]] + $ext)); + } else if (is_array($data[self::FIELD_EXAMPLE_STRING])) { + $this->setExampleString(new FHIRString(array_merge($ext, $data[self::FIELD_EXAMPLE_STRING]))); + } } else { $this->setExampleString(new FHIRString($data[self::FIELD_EXAMPLE_STRING])); } @@ -1333,8 +1402,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EXAMPLE_URI] instanceof FHIRUri) { $this->setExampleUri($data[self::FIELD_EXAMPLE_URI]); - } elseif ($ext && is_scalar($data[self::FIELD_EXAMPLE_URI])) { - $this->setExampleUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_EXAMPLE_URI]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EXAMPLE_URI])) { + $this->setExampleUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_EXAMPLE_URI]] + $ext)); + } else if (is_array($data[self::FIELD_EXAMPLE_URI])) { + $this->setExampleUri(new FHIRUri(array_merge($ext, $data[self::FIELD_EXAMPLE_URI]))); + } } else { $this->setExampleUri(new FHIRUri($data[self::FIELD_EXAMPLE_URI])); } @@ -1345,8 +1418,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EXAMPLE_UUID] instanceof FHIRUuid) { $this->setExampleUuid($data[self::FIELD_EXAMPLE_UUID]); - } elseif ($ext && is_scalar($data[self::FIELD_EXAMPLE_UUID])) { - $this->setExampleUuid(new FHIRUuid([FHIRUuid::FIELD_VALUE => $data[self::FIELD_EXAMPLE_UUID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EXAMPLE_UUID])) { + $this->setExampleUuid(new FHIRUuid([FHIRUuid::FIELD_VALUE => $data[self::FIELD_EXAMPLE_UUID]] + $ext)); + } else if (is_array($data[self::FIELD_EXAMPLE_UUID])) { + $this->setExampleUuid(new FHIRUuid(array_merge($ext, $data[self::FIELD_EXAMPLE_UUID]))); + } } else { $this->setExampleUuid(new FHIRUuid($data[self::FIELD_EXAMPLE_UUID])); } @@ -1357,8 +1434,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_FORMAL] instanceof FHIRString) { $this->setFormal($data[self::FIELD_FORMAL]); - } elseif ($ext && is_scalar($data[self::FIELD_FORMAL])) { - $this->setFormal(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_FORMAL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_FORMAL])) { + $this->setFormal(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_FORMAL]] + $ext)); + } else if (is_array($data[self::FIELD_FORMAL])) { + $this->setFormal(new FHIRString(array_merge($ext, $data[self::FIELD_FORMAL]))); + } } else { $this->setFormal(new FHIRString($data[self::FIELD_FORMAL])); } @@ -1369,8 +1450,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IS_MODIFIER] instanceof FHIRBoolean) { $this->setIsModifier($data[self::FIELD_IS_MODIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IS_MODIFIER])) { - $this->setIsModifier(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_IS_MODIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IS_MODIFIER])) { + $this->setIsModifier(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_IS_MODIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_IS_MODIFIER])) { + $this->setIsModifier(new FHIRBoolean(array_merge($ext, $data[self::FIELD_IS_MODIFIER]))); + } } else { $this->setIsModifier(new FHIRBoolean($data[self::FIELD_IS_MODIFIER])); } @@ -1378,6 +1463,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_MAPPING])) { if (is_array($data[self::FIELD_MAPPING])) { foreach($data[self::FIELD_MAPPING] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRProfileMapping1) { $this->addMapping($v); } else { @@ -1396,8 +1484,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MAX] instanceof FHIRString) { $this->setMax($data[self::FIELD_MAX]); - } elseif ($ext && is_scalar($data[self::FIELD_MAX])) { - $this->setMax(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_MAX]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MAX])) { + $this->setMax(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_MAX]] + $ext)); + } else if (is_array($data[self::FIELD_MAX])) { + $this->setMax(new FHIRString(array_merge($ext, $data[self::FIELD_MAX]))); + } } else { $this->setMax(new FHIRString($data[self::FIELD_MAX])); } @@ -1408,8 +1500,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MAX_LENGTH] instanceof FHIRInteger) { $this->setMaxLength($data[self::FIELD_MAX_LENGTH]); - } elseif ($ext && is_scalar($data[self::FIELD_MAX_LENGTH])) { - $this->setMaxLength(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_MAX_LENGTH]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MAX_LENGTH])) { + $this->setMaxLength(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_MAX_LENGTH]] + $ext)); + } else if (is_array($data[self::FIELD_MAX_LENGTH])) { + $this->setMaxLength(new FHIRInteger(array_merge($ext, $data[self::FIELD_MAX_LENGTH]))); + } } else { $this->setMaxLength(new FHIRInteger($data[self::FIELD_MAX_LENGTH])); } @@ -1420,8 +1516,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MIN] instanceof FHIRInteger) { $this->setMin($data[self::FIELD_MIN]); - } elseif ($ext && is_scalar($data[self::FIELD_MIN])) { - $this->setMin(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_MIN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MIN])) { + $this->setMin(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_MIN]] + $ext)); + } else if (is_array($data[self::FIELD_MIN])) { + $this->setMin(new FHIRInteger(array_merge($ext, $data[self::FIELD_MIN]))); + } } else { $this->setMin(new FHIRInteger($data[self::FIELD_MIN])); } @@ -1432,8 +1532,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MUST_SUPPORT] instanceof FHIRBoolean) { $this->setMustSupport($data[self::FIELD_MUST_SUPPORT]); - } elseif ($ext && is_scalar($data[self::FIELD_MUST_SUPPORT])) { - $this->setMustSupport(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_MUST_SUPPORT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MUST_SUPPORT])) { + $this->setMustSupport(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_MUST_SUPPORT]] + $ext)); + } else if (is_array($data[self::FIELD_MUST_SUPPORT])) { + $this->setMustSupport(new FHIRBoolean(array_merge($ext, $data[self::FIELD_MUST_SUPPORT]))); + } } else { $this->setMustSupport(new FHIRBoolean($data[self::FIELD_MUST_SUPPORT])); } @@ -1444,8 +1548,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME_REFERENCE] instanceof FHIRString) { $this->setNameReference($data[self::FIELD_NAME_REFERENCE]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME_REFERENCE])) { - $this->setNameReference(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME_REFERENCE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME_REFERENCE])) { + $this->setNameReference(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME_REFERENCE]] + $ext)); + } else if (is_array($data[self::FIELD_NAME_REFERENCE])) { + $this->setNameReference(new FHIRString(array_merge($ext, $data[self::FIELD_NAME_REFERENCE]))); + } } else { $this->setNameReference(new FHIRString($data[self::FIELD_NAME_REFERENCE])); } @@ -1456,8 +1564,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_REQUIREMENTS] instanceof FHIRString) { $this->setRequirements($data[self::FIELD_REQUIREMENTS]); - } elseif ($ext && is_scalar($data[self::FIELD_REQUIREMENTS])) { - $this->setRequirements(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_REQUIREMENTS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_REQUIREMENTS])) { + $this->setRequirements(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_REQUIREMENTS]] + $ext)); + } else if (is_array($data[self::FIELD_REQUIREMENTS])) { + $this->setRequirements(new FHIRString(array_merge($ext, $data[self::FIELD_REQUIREMENTS]))); + } } else { $this->setRequirements(new FHIRString($data[self::FIELD_REQUIREMENTS])); } @@ -1468,8 +1580,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SHORT] instanceof FHIRString) { $this->setShort($data[self::FIELD_SHORT]); - } elseif ($ext && is_scalar($data[self::FIELD_SHORT])) { - $this->setShort(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SHORT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SHORT])) { + $this->setShort(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SHORT]] + $ext)); + } else if (is_array($data[self::FIELD_SHORT])) { + $this->setShort(new FHIRString(array_merge($ext, $data[self::FIELD_SHORT]))); + } } else { $this->setShort(new FHIRString($data[self::FIELD_SHORT])); } @@ -1480,17 +1596,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_SYNONYM])) { foreach($data[self::FIELD_SYNONYM] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRString) { $this->addSynonym($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addSynonym(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addSynonym(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addSynonym(new FHIRString(array_merge($v, $ext[$i]))); + } } else { $this->addSynonym(new FHIRString($v)); } } } elseif ($data[self::FIELD_SYNONYM] instanceof FHIRString) { $this->addSynonym($data[self::FIELD_SYNONYM]); - } elseif ($ext && is_scalar($data[self::FIELD_SYNONYM])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_SYNONYM])) { $this->addSynonym(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SYNONYM]] + $ext)); } else { $this->addSynonym(new FHIRString($data[self::FIELD_SYNONYM])); @@ -1499,6 +1622,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_TYPE])) { if (is_array($data[self::FIELD_TYPE])) { foreach($data[self::FIELD_TYPE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRProfileType) { $this->addType($v); } else { @@ -1531,8 +1657,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_BASE_64BINARY] instanceof FHIRBase64Binary) { $this->setValueBase64Binary($data[self::FIELD_VALUE_BASE_64BINARY]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_BASE_64BINARY])) { - $this->setValueBase64Binary(new FHIRBase64Binary([FHIRBase64Binary::FIELD_VALUE => $data[self::FIELD_VALUE_BASE_64BINARY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_BASE_64BINARY])) { + $this->setValueBase64Binary(new FHIRBase64Binary([FHIRBase64Binary::FIELD_VALUE => $data[self::FIELD_VALUE_BASE_64BINARY]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_BASE_64BINARY])) { + $this->setValueBase64Binary(new FHIRBase64Binary(array_merge($ext, $data[self::FIELD_VALUE_BASE_64BINARY]))); + } } else { $this->setValueBase64Binary(new FHIRBase64Binary($data[self::FIELD_VALUE_BASE_64BINARY])); } @@ -1543,8 +1673,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_BOOLEAN] instanceof FHIRBoolean) { $this->setValueBoolean($data[self::FIELD_VALUE_BOOLEAN]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_BOOLEAN])) { - $this->setValueBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_VALUE_BOOLEAN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_BOOLEAN])) { + $this->setValueBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_VALUE_BOOLEAN]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_BOOLEAN])) { + $this->setValueBoolean(new FHIRBoolean(array_merge($ext, $data[self::FIELD_VALUE_BOOLEAN]))); + } } else { $this->setValueBoolean(new FHIRBoolean($data[self::FIELD_VALUE_BOOLEAN])); } @@ -1555,8 +1689,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_CODE] instanceof FHIRCode) { $this->setValueCode($data[self::FIELD_VALUE_CODE]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_CODE])) { - $this->setValueCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_VALUE_CODE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_CODE])) { + $this->setValueCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_VALUE_CODE]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_CODE])) { + $this->setValueCode(new FHIRCode(array_merge($ext, $data[self::FIELD_VALUE_CODE]))); + } } else { $this->setValueCode(new FHIRCode($data[self::FIELD_VALUE_CODE])); } @@ -1581,8 +1719,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_CONTACT] instanceof FHIRContact) { $this->setValueContact($data[self::FIELD_VALUE_CONTACT]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_CONTACT])) { - $this->setValueContact(new FHIRContact([FHIRContact::FIELD_VALUE => $data[self::FIELD_VALUE_CONTACT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_CONTACT])) { + $this->setValueContact(new FHIRContact([FHIRContact::FIELD_VALUE => $data[self::FIELD_VALUE_CONTACT]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_CONTACT])) { + $this->setValueContact(new FHIRContact(array_merge($ext, $data[self::FIELD_VALUE_CONTACT]))); + } } else { $this->setValueContact(new FHIRContact($data[self::FIELD_VALUE_CONTACT])); } @@ -1593,8 +1735,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_DATE] instanceof FHIRDate) { $this->setValueDate($data[self::FIELD_VALUE_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_DATE])) { - $this->setValueDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_VALUE_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_DATE])) { + $this->setValueDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_VALUE_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_DATE])) { + $this->setValueDate(new FHIRDate(array_merge($ext, $data[self::FIELD_VALUE_DATE]))); + } } else { $this->setValueDate(new FHIRDate($data[self::FIELD_VALUE_DATE])); } @@ -1605,8 +1751,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_DATE_TIME] instanceof FHIRDateTime) { $this->setValueDateTime($data[self::FIELD_VALUE_DATE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_DATE_TIME])) { - $this->setValueDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_VALUE_DATE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_DATE_TIME])) { + $this->setValueDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_VALUE_DATE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_DATE_TIME])) { + $this->setValueDateTime(new FHIRDateTime(array_merge($ext, $data[self::FIELD_VALUE_DATE_TIME]))); + } } else { $this->setValueDateTime(new FHIRDateTime($data[self::FIELD_VALUE_DATE_TIME])); } @@ -1617,8 +1767,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_DECIMAL] instanceof FHIRDecimal) { $this->setValueDecimal($data[self::FIELD_VALUE_DECIMAL]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_DECIMAL])) { - $this->setValueDecimal(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_VALUE_DECIMAL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_DECIMAL])) { + $this->setValueDecimal(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_VALUE_DECIMAL]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_DECIMAL])) { + $this->setValueDecimal(new FHIRDecimal(array_merge($ext, $data[self::FIELD_VALUE_DECIMAL]))); + } } else { $this->setValueDecimal(new FHIRDecimal($data[self::FIELD_VALUE_DECIMAL])); } @@ -1636,8 +1790,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_ID] instanceof FHIRId) { $this->setValueId($data[self::FIELD_VALUE_ID]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_ID])) { - $this->setValueId(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_VALUE_ID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_ID])) { + $this->setValueId(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_VALUE_ID]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_ID])) { + $this->setValueId(new FHIRId(array_merge($ext, $data[self::FIELD_VALUE_ID]))); + } } else { $this->setValueId(new FHIRId($data[self::FIELD_VALUE_ID])); } @@ -1648,8 +1806,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_IDENTIFIER] instanceof FHIRIdentifier) { $this->setValueIdentifier($data[self::FIELD_VALUE_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_IDENTIFIER])) { - $this->setValueIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_VALUE_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_IDENTIFIER])) { + $this->setValueIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_VALUE_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_IDENTIFIER])) { + $this->setValueIdentifier(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_VALUE_IDENTIFIER]))); + } } else { $this->setValueIdentifier(new FHIRIdentifier($data[self::FIELD_VALUE_IDENTIFIER])); } @@ -1660,8 +1822,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_INSTANT] instanceof FHIRInstant) { $this->setValueInstant($data[self::FIELD_VALUE_INSTANT]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_INSTANT])) { - $this->setValueInstant(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_VALUE_INSTANT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_INSTANT])) { + $this->setValueInstant(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_VALUE_INSTANT]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_INSTANT])) { + $this->setValueInstant(new FHIRInstant(array_merge($ext, $data[self::FIELD_VALUE_INSTANT]))); + } } else { $this->setValueInstant(new FHIRInstant($data[self::FIELD_VALUE_INSTANT])); } @@ -1672,8 +1838,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_INTEGER] instanceof FHIRInteger) { $this->setValueInteger($data[self::FIELD_VALUE_INTEGER]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_INTEGER])) { - $this->setValueInteger(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_VALUE_INTEGER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_INTEGER])) { + $this->setValueInteger(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_VALUE_INTEGER]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_INTEGER])) { + $this->setValueInteger(new FHIRInteger(array_merge($ext, $data[self::FIELD_VALUE_INTEGER]))); + } } else { $this->setValueInteger(new FHIRInteger($data[self::FIELD_VALUE_INTEGER])); } @@ -1684,8 +1854,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_OID] instanceof FHIROid) { $this->setValueOid($data[self::FIELD_VALUE_OID]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_OID])) { - $this->setValueOid(new FHIROid([FHIROid::FIELD_VALUE => $data[self::FIELD_VALUE_OID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_OID])) { + $this->setValueOid(new FHIROid([FHIROid::FIELD_VALUE => $data[self::FIELD_VALUE_OID]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_OID])) { + $this->setValueOid(new FHIROid(array_merge($ext, $data[self::FIELD_VALUE_OID]))); + } } else { $this->setValueOid(new FHIROid($data[self::FIELD_VALUE_OID])); } @@ -1703,8 +1877,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_QUANTITY] instanceof FHIRQuantity) { $this->setValueQuantity($data[self::FIELD_VALUE_QUANTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_QUANTITY])) { - $this->setValueQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_VALUE_QUANTITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_QUANTITY])) { + $this->setValueQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_VALUE_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_QUANTITY])) { + $this->setValueQuantity(new FHIRQuantity(array_merge($ext, $data[self::FIELD_VALUE_QUANTITY]))); + } } else { $this->setValueQuantity(new FHIRQuantity($data[self::FIELD_VALUE_QUANTITY])); } @@ -1750,8 +1928,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_STRING] instanceof FHIRString) { $this->setValueString($data[self::FIELD_VALUE_STRING]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_STRING])) { - $this->setValueString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VALUE_STRING]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_STRING])) { + $this->setValueString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VALUE_STRING]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_STRING])) { + $this->setValueString(new FHIRString(array_merge($ext, $data[self::FIELD_VALUE_STRING]))); + } } else { $this->setValueString(new FHIRString($data[self::FIELD_VALUE_STRING])); } @@ -1762,8 +1944,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_URI] instanceof FHIRUri) { $this->setValueUri($data[self::FIELD_VALUE_URI]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_URI])) { - $this->setValueUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_VALUE_URI]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_URI])) { + $this->setValueUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_VALUE_URI]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_URI])) { + $this->setValueUri(new FHIRUri(array_merge($ext, $data[self::FIELD_VALUE_URI]))); + } } else { $this->setValueUri(new FHIRUri($data[self::FIELD_VALUE_URI])); } @@ -1774,8 +1960,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_UUID] instanceof FHIRUuid) { $this->setValueUuid($data[self::FIELD_VALUE_UUID]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_UUID])) { - $this->setValueUuid(new FHIRUuid([FHIRUuid::FIELD_VALUE => $data[self::FIELD_VALUE_UUID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_UUID])) { + $this->setValueUuid(new FHIRUuid([FHIRUuid::FIELD_VALUE => $data[self::FIELD_VALUE_UUID]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_UUID])) { + $this->setValueUuid(new FHIRUuid(array_merge($ext, $data[self::FIELD_VALUE_UUID]))); + } } else { $this->setValueUuid(new FHIRUuid($data[self::FIELD_VALUE_UUID])); } @@ -4795,7 +4985,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getBinding())) { $v->xmlSerialize($sxe->addChild(self::FIELD_BINDING, null, $v->_getFHIRXMLNamespace())); } @@ -4823,7 +5012,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getExampleAddress())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EXAMPLE_ADDRESS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getExampleAttachment())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EXAMPLE_ATTACHMENT, null, $v->_getFHIRXMLNamespace())); } @@ -4836,15 +5024,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getExampleCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EXAMPLE_CODE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getExampleCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EXAMPLE_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getExampleCoding())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EXAMPLE_CODING, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getExampleContact())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EXAMPLE_CONTACT, null, $v->_getFHIRXMLNamespace())); } @@ -4857,14 +5042,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getExampleDecimal())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EXAMPLE_DECIMAL, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getExampleHumanName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EXAMPLE_HUMAN_NAME, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getExampleId())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EXAMPLE_ID, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getExampleIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EXAMPLE_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } @@ -4877,31 +5060,24 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getExampleOid())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EXAMPLE_OID, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getExamplePeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EXAMPLE_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getExampleQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EXAMPLE_QUANTITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getExampleRange())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EXAMPLE_RANGE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getExampleRatio())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EXAMPLE_RATIO, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getExampleResource())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EXAMPLE_RESOURCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getExampleSampledData())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EXAMPLE_SAMPLED_DATA, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getExampleSchedule())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EXAMPLE_SCHEDULE, null, $v->_getFHIRXMLNamespace())); } @@ -4920,7 +5096,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getIsModifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_IS_MODIFIER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getMapping())) { foreach($vs as $v) { if (null === $v) { @@ -4929,6 +5104,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_MAPPING, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getMax())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MAX, null, $v->_getFHIRXMLNamespace())); } @@ -4971,7 +5147,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getValueAddress())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_ADDRESS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueAttachment())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_ATTACHMENT, null, $v->_getFHIRXMLNamespace())); } @@ -4984,15 +5159,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getValueCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_CODE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueCoding())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_CODING, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueContact())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_CONTACT, null, $v->_getFHIRXMLNamespace())); } @@ -5005,14 +5177,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getValueDecimal())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_DECIMAL, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueHumanName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_HUMAN_NAME, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getValueId())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_ID, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } @@ -5025,31 +5195,24 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getValueOid())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_OID, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValuePeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_QUANTITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueRange())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_RANGE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueRatio())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_RATIO, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueResource())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_RESOURCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueSampledData())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_SAMPLED_DATA, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueSchedule())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_SCHEDULE, null, $v->_getFHIRXMLNamespace())); } @@ -5075,8 +5238,15 @@ public function jsonSerialize() $a[self::FIELD_BINDING] = $v; } if (null !== ($v = $this->getComments())) { - $a[self::FIELD_COMMENTS] = $v->getValue(); - $a[self::FIELD_COMMENTS_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_COMMENTS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_COMMENTS_EXT] = $enc; + } + } else { + $a[self::FIELD_COMMENTS] = $v; + } } if ([] !== ($vs = $this->getCondition())) { $a[self::FIELD_CONDITION] = []; @@ -5084,8 +5254,17 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_CONDITION][] = $v->getValue(); - $a[self::FIELD_CONDITION_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CONDITION][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CONDITION_EXT][] = $enc; + } else { + $a[self::FIELD_CONDITION_EXT][] = null; + } + } else { + $a[self::FIELD_CONDITION][] = $v; + } } } if ([] !== ($vs = $this->getConstraint())) { @@ -5098,16 +5277,37 @@ public function jsonSerialize() $a[self::FIELD_EXAMPLE_ATTACHMENT] = $v; } if (null !== ($v = $this->getExampleBase64Binary())) { - $a[self::FIELD_EXAMPLE_BASE_64BINARY] = $v->getValue(); - $a[self::FIELD_EXAMPLE_BASE_64BINARY_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EXAMPLE_BASE_64BINARY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EXAMPLE_BASE_64BINARY_EXT] = $enc; + } + } else { + $a[self::FIELD_EXAMPLE_BASE_64BINARY] = $v; + } } if (null !== ($v = $this->getExampleBoolean())) { - $a[self::FIELD_EXAMPLE_BOOLEAN] = $v->getValue(); - $a[self::FIELD_EXAMPLE_BOOLEAN_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EXAMPLE_BOOLEAN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EXAMPLE_BOOLEAN_EXT] = $enc; + } + } else { + $a[self::FIELD_EXAMPLE_BOOLEAN] = $v; + } } if (null !== ($v = $this->getExampleCode())) { - $a[self::FIELD_EXAMPLE_CODE] = $v->getValue(); - $a[self::FIELD_EXAMPLE_CODE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EXAMPLE_CODE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EXAMPLE_CODE_EXT] = $enc; + } + } else { + $a[self::FIELD_EXAMPLE_CODE] = $v; + } } if (null !== ($v = $this->getExampleCodeableConcept())) { $a[self::FIELD_EXAMPLE_CODEABLE_CONCEPT] = $v; @@ -5116,47 +5316,120 @@ public function jsonSerialize() $a[self::FIELD_EXAMPLE_CODING] = $v; } if (null !== ($v = $this->getExampleContact())) { - $a[self::FIELD_EXAMPLE_CONTACT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EXAMPLE_CONTACT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EXAMPLE_CONTACT_EXT] = $enc; + } + } else { + $a[self::FIELD_EXAMPLE_CONTACT] = $v; + } } if (null !== ($v = $this->getExampleDate())) { - $a[self::FIELD_EXAMPLE_DATE] = $v->getValue(); - $a[self::FIELD_EXAMPLE_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EXAMPLE_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EXAMPLE_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_EXAMPLE_DATE] = $v; + } } if (null !== ($v = $this->getExampleDateTime())) { - $a[self::FIELD_EXAMPLE_DATE_TIME] = $v->getValue(); - $a[self::FIELD_EXAMPLE_DATE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EXAMPLE_DATE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EXAMPLE_DATE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_EXAMPLE_DATE_TIME] = $v; + } } if (null !== ($v = $this->getExampleDecimal())) { - $a[self::FIELD_EXAMPLE_DECIMAL] = $v->getValue(); - $a[self::FIELD_EXAMPLE_DECIMAL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EXAMPLE_DECIMAL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EXAMPLE_DECIMAL_EXT] = $enc; + } + } else { + $a[self::FIELD_EXAMPLE_DECIMAL] = $v; + } } if (null !== ($v = $this->getExampleHumanName())) { $a[self::FIELD_EXAMPLE_HUMAN_NAME] = $v; } if (null !== ($v = $this->getExampleId())) { - $a[self::FIELD_EXAMPLE_ID] = $v->getValue(); - $a[self::FIELD_EXAMPLE_ID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EXAMPLE_ID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EXAMPLE_ID_EXT] = $enc; + } + } else { + $a[self::FIELD_EXAMPLE_ID] = $v; + } } if (null !== ($v = $this->getExampleIdentifier())) { - $a[self::FIELD_EXAMPLE_IDENTIFIER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EXAMPLE_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EXAMPLE_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_EXAMPLE_IDENTIFIER] = $v; + } } if (null !== ($v = $this->getExampleInstant())) { - $a[self::FIELD_EXAMPLE_INSTANT] = $v->getValue(); - $a[self::FIELD_EXAMPLE_INSTANT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EXAMPLE_INSTANT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EXAMPLE_INSTANT_EXT] = $enc; + } + } else { + $a[self::FIELD_EXAMPLE_INSTANT] = $v; + } } if (null !== ($v = $this->getExampleInteger())) { - $a[self::FIELD_EXAMPLE_INTEGER] = $v->getValue(); - $a[self::FIELD_EXAMPLE_INTEGER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EXAMPLE_INTEGER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EXAMPLE_INTEGER_EXT] = $enc; + } + } else { + $a[self::FIELD_EXAMPLE_INTEGER] = $v; + } } if (null !== ($v = $this->getExampleOid())) { - $a[self::FIELD_EXAMPLE_OID] = $v->getValue(); - $a[self::FIELD_EXAMPLE_OID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EXAMPLE_OID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EXAMPLE_OID_EXT] = $enc; + } + } else { + $a[self::FIELD_EXAMPLE_OID] = $v; + } } if (null !== ($v = $this->getExamplePeriod())) { $a[self::FIELD_EXAMPLE_PERIOD] = $v; } if (null !== ($v = $this->getExampleQuantity())) { - $a[self::FIELD_EXAMPLE_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EXAMPLE_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EXAMPLE_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_EXAMPLE_QUANTITY] = $v; + } } if (null !== ($v = $this->getExampleRange())) { $a[self::FIELD_EXAMPLE_RANGE] = $v; @@ -5174,55 +5447,139 @@ public function jsonSerialize() $a[self::FIELD_EXAMPLE_SCHEDULE] = $v; } if (null !== ($v = $this->getExampleString())) { - $a[self::FIELD_EXAMPLE_STRING] = $v->getValue(); - $a[self::FIELD_EXAMPLE_STRING_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EXAMPLE_STRING] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EXAMPLE_STRING_EXT] = $enc; + } + } else { + $a[self::FIELD_EXAMPLE_STRING] = $v; + } } if (null !== ($v = $this->getExampleUri())) { - $a[self::FIELD_EXAMPLE_URI] = $v->getValue(); - $a[self::FIELD_EXAMPLE_URI_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EXAMPLE_URI] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EXAMPLE_URI_EXT] = $enc; + } + } else { + $a[self::FIELD_EXAMPLE_URI] = $v; + } } if (null !== ($v = $this->getExampleUuid())) { - $a[self::FIELD_EXAMPLE_UUID] = $v->getValue(); - $a[self::FIELD_EXAMPLE_UUID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EXAMPLE_UUID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EXAMPLE_UUID_EXT] = $enc; + } + } else { + $a[self::FIELD_EXAMPLE_UUID] = $v; + } } if (null !== ($v = $this->getFormal())) { - $a[self::FIELD_FORMAL] = $v->getValue(); - $a[self::FIELD_FORMAL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FORMAL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FORMAL_EXT] = $enc; + } + } else { + $a[self::FIELD_FORMAL] = $v; + } } if (null !== ($v = $this->getIsModifier())) { - $a[self::FIELD_IS_MODIFIER] = $v->getValue(); - $a[self::FIELD_IS_MODIFIER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IS_MODIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IS_MODIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_IS_MODIFIER] = $v; + } } if ([] !== ($vs = $this->getMapping())) { $a[self::FIELD_MAPPING] = $vs; } if (null !== ($v = $this->getMax())) { - $a[self::FIELD_MAX] = $v->getValue(); - $a[self::FIELD_MAX_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MAX] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MAX_EXT] = $enc; + } + } else { + $a[self::FIELD_MAX] = $v; + } } if (null !== ($v = $this->getMaxLength())) { - $a[self::FIELD_MAX_LENGTH] = $v->getValue(); - $a[self::FIELD_MAX_LENGTH_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MAX_LENGTH] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MAX_LENGTH_EXT] = $enc; + } + } else { + $a[self::FIELD_MAX_LENGTH] = $v; + } } if (null !== ($v = $this->getMin())) { - $a[self::FIELD_MIN] = $v->getValue(); - $a[self::FIELD_MIN_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MIN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MIN_EXT] = $enc; + } + } else { + $a[self::FIELD_MIN] = $v; + } } if (null !== ($v = $this->getMustSupport())) { - $a[self::FIELD_MUST_SUPPORT] = $v->getValue(); - $a[self::FIELD_MUST_SUPPORT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MUST_SUPPORT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MUST_SUPPORT_EXT] = $enc; + } + } else { + $a[self::FIELD_MUST_SUPPORT] = $v; + } } if (null !== ($v = $this->getNameReference())) { - $a[self::FIELD_NAME_REFERENCE] = $v->getValue(); - $a[self::FIELD_NAME_REFERENCE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME_REFERENCE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_REFERENCE_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME_REFERENCE] = $v; + } } if (null !== ($v = $this->getRequirements())) { - $a[self::FIELD_REQUIREMENTS] = $v->getValue(); - $a[self::FIELD_REQUIREMENTS_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_REQUIREMENTS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_REQUIREMENTS_EXT] = $enc; + } + } else { + $a[self::FIELD_REQUIREMENTS] = $v; + } } if (null !== ($v = $this->getShort())) { - $a[self::FIELD_SHORT] = $v->getValue(); - $a[self::FIELD_SHORT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SHORT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SHORT_EXT] = $enc; + } + } else { + $a[self::FIELD_SHORT] = $v; + } } if ([] !== ($vs = $this->getSynonym())) { $a[self::FIELD_SYNONYM] = []; @@ -5230,8 +5587,17 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_SYNONYM][] = $v->getValue(); - $a[self::FIELD_SYNONYM_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SYNONYM][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SYNONYM_EXT][] = $enc; + } else { + $a[self::FIELD_SYNONYM_EXT][] = null; + } + } else { + $a[self::FIELD_SYNONYM][] = $v; + } } } if ([] !== ($vs = $this->getType())) { @@ -5244,16 +5610,37 @@ public function jsonSerialize() $a[self::FIELD_VALUE_ATTACHMENT] = $v; } if (null !== ($v = $this->getValueBase64Binary())) { - $a[self::FIELD_VALUE_BASE_64BINARY] = $v->getValue(); - $a[self::FIELD_VALUE_BASE_64BINARY_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_BASE_64BINARY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_BASE_64BINARY_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_BASE_64BINARY] = $v; + } } if (null !== ($v = $this->getValueBoolean())) { - $a[self::FIELD_VALUE_BOOLEAN] = $v->getValue(); - $a[self::FIELD_VALUE_BOOLEAN_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_BOOLEAN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_BOOLEAN_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_BOOLEAN] = $v; + } } if (null !== ($v = $this->getValueCode())) { - $a[self::FIELD_VALUE_CODE] = $v->getValue(); - $a[self::FIELD_VALUE_CODE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_CODE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_CODE_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_CODE] = $v; + } } if (null !== ($v = $this->getValueCodeableConcept())) { $a[self::FIELD_VALUE_CODEABLE_CONCEPT] = $v; @@ -5262,47 +5649,120 @@ public function jsonSerialize() $a[self::FIELD_VALUE_CODING] = $v; } if (null !== ($v = $this->getValueContact())) { - $a[self::FIELD_VALUE_CONTACT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_CONTACT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_CONTACT_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_CONTACT] = $v; + } } if (null !== ($v = $this->getValueDate())) { - $a[self::FIELD_VALUE_DATE] = $v->getValue(); - $a[self::FIELD_VALUE_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_DATE] = $v; + } } if (null !== ($v = $this->getValueDateTime())) { - $a[self::FIELD_VALUE_DATE_TIME] = $v->getValue(); - $a[self::FIELD_VALUE_DATE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_DATE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_DATE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_DATE_TIME] = $v; + } } if (null !== ($v = $this->getValueDecimal())) { - $a[self::FIELD_VALUE_DECIMAL] = $v->getValue(); - $a[self::FIELD_VALUE_DECIMAL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_DECIMAL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_DECIMAL_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_DECIMAL] = $v; + } } if (null !== ($v = $this->getValueHumanName())) { $a[self::FIELD_VALUE_HUMAN_NAME] = $v; } if (null !== ($v = $this->getValueId())) { - $a[self::FIELD_VALUE_ID] = $v->getValue(); - $a[self::FIELD_VALUE_ID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_ID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_ID_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_ID] = $v; + } } if (null !== ($v = $this->getValueIdentifier())) { - $a[self::FIELD_VALUE_IDENTIFIER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_IDENTIFIER] = $v; + } } if (null !== ($v = $this->getValueInstant())) { - $a[self::FIELD_VALUE_INSTANT] = $v->getValue(); - $a[self::FIELD_VALUE_INSTANT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_INSTANT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_INSTANT_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_INSTANT] = $v; + } } if (null !== ($v = $this->getValueInteger())) { - $a[self::FIELD_VALUE_INTEGER] = $v->getValue(); - $a[self::FIELD_VALUE_INTEGER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_INTEGER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_INTEGER_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_INTEGER] = $v; + } } if (null !== ($v = $this->getValueOid())) { - $a[self::FIELD_VALUE_OID] = $v->getValue(); - $a[self::FIELD_VALUE_OID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_OID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_OID_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_OID] = $v; + } } if (null !== ($v = $this->getValuePeriod())) { $a[self::FIELD_VALUE_PERIOD] = $v; } if (null !== ($v = $this->getValueQuantity())) { - $a[self::FIELD_VALUE_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_QUANTITY] = $v; + } } if (null !== ($v = $this->getValueRange())) { $a[self::FIELD_VALUE_RANGE] = $v; @@ -5320,16 +5780,37 @@ public function jsonSerialize() $a[self::FIELD_VALUE_SCHEDULE] = $v; } if (null !== ($v = $this->getValueString())) { - $a[self::FIELD_VALUE_STRING] = $v->getValue(); - $a[self::FIELD_VALUE_STRING_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_STRING] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_STRING_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_STRING] = $v; + } } if (null !== ($v = $this->getValueUri())) { - $a[self::FIELD_VALUE_URI] = $v->getValue(); - $a[self::FIELD_VALUE_URI_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_URI] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_URI_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_URI] = $v; + } } if (null !== ($v = $this->getValueUuid())) { - $a[self::FIELD_VALUE_UUID] = $v->getValue(); - $a[self::FIELD_VALUE_UUID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_UUID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_UUID_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_UUID] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRProfile/FHIRProfileElement.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRProfile/FHIRProfileElement.php index 08ce595bfa..fded671e2c 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRProfile/FHIRProfileElement.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRProfile/FHIRProfileElement.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -75,10 +75,6 @@ class FHIRProfileElement extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_PROFILE_DOT_ELEMENT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DEFINITION = 'definition'; const FIELD_NAME = 'name'; const FIELD_NAME_EXT = '_name'; @@ -150,6 +146,9 @@ class FHIRProfileElement extends FHIRBackboneElement */ protected $slicing = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRProfileElement Constructor * @param null|array $data @@ -179,8 +178,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -191,8 +194,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PATH] instanceof FHIRString) { $this->setPath($data[self::FIELD_PATH]); - } elseif ($ext && is_scalar($data[self::FIELD_PATH])) { - $this->setPath(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PATH]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PATH])) { + $this->setPath(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PATH]] + $ext)); + } else if (is_array($data[self::FIELD_PATH])) { + $this->setPath(new FHIRString(array_merge($ext, $data[self::FIELD_PATH]))); + } } else { $this->setPath(new FHIRString($data[self::FIELD_PATH])); } @@ -203,17 +210,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_REPRESENTATION])) { foreach($data[self::FIELD_REPRESENTATION] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRPropertyRepresentation) { $this->addRepresentation($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addRepresentation(new FHIRPropertyRepresentation([FHIRPropertyRepresentation::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addRepresentation(new FHIRPropertyRepresentation([FHIRPropertyRepresentation::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addRepresentation(new FHIRPropertyRepresentation(array_merge($v, $ext[$i]))); + } } else { $this->addRepresentation(new FHIRPropertyRepresentation($v)); } } } elseif ($data[self::FIELD_REPRESENTATION] instanceof FHIRPropertyRepresentation) { $this->addRepresentation($data[self::FIELD_REPRESENTATION]); - } elseif ($ext && is_scalar($data[self::FIELD_REPRESENTATION])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_REPRESENTATION])) { $this->addRepresentation(new FHIRPropertyRepresentation([FHIRPropertyRepresentation::FIELD_VALUE => $data[self::FIELD_REPRESENTATION]] + $ext)); } else { $this->addRepresentation(new FHIRPropertyRepresentation($data[self::FIELD_REPRESENTATION])); @@ -556,7 +570,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getDefinition())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFINITION, null, $v->_getFHIRXMLNamespace())); } @@ -566,7 +579,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getPath())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATH, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getRepresentation())) { foreach($vs as $v) { if (null === $v) { @@ -592,15 +604,45 @@ public function jsonSerialize() $a[self::FIELD_DEFINITION] = $v; } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if (null !== ($v = $this->getPath())) { - $a[self::FIELD_PATH] = $v->getValue(); - $a[self::FIELD_PATH_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PATH] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PATH_EXT] = $enc; + } + } else { + $a[self::FIELD_PATH] = $v; + } } if ([] !== ($vs = $this->getRepresentation())) { - $a[self::FIELD_REPRESENTATION] = $vs; + $a[self::FIELD_REPRESENTATION] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_REPRESENTATION][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_REPRESENTATION_EXT][] = $enc; + } else { + $a[self::FIELD_REPRESENTATION_EXT][] = null; + } + } else { + $a[self::FIELD_REPRESENTATION][] = $v; + } + } } if (null !== ($v = $this->getSlicing())) { $a[self::FIELD_SLICING] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRProfile/FHIRProfileExtensionDefn.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRProfile/FHIRProfileExtensionDefn.php index 1eab8e805e..74d323703f 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRProfile/FHIRProfileExtensionDefn.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRProfile/FHIRProfileExtensionDefn.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -76,10 +76,6 @@ class FHIRProfileExtensionDefn extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_PROFILE_DOT_EXTENSION_DEFN; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CODE = 'code'; const FIELD_CODE_EXT = '_code'; const FIELD_CONTEXT = 'context'; @@ -145,6 +141,9 @@ class FHIRProfileExtensionDefn extends FHIRBackboneElement */ protected $display = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRProfileExtensionDefn Constructor * @param null|array $data @@ -167,8 +166,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CODE] instanceof FHIRCode) { $this->setCode($data[self::FIELD_CODE]); - } elseif ($ext && is_scalar($data[self::FIELD_CODE])) { - $this->setCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_CODE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CODE])) { + $this->setCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_CODE]] + $ext)); + } else if (is_array($data[self::FIELD_CODE])) { + $this->setCode(new FHIRCode(array_merge($ext, $data[self::FIELD_CODE]))); + } } else { $this->setCode(new FHIRCode($data[self::FIELD_CODE])); } @@ -179,17 +182,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_CONTEXT])) { foreach($data[self::FIELD_CONTEXT] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRString) { $this->addContext($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addContext(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addContext(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addContext(new FHIRString(array_merge($v, $ext[$i]))); + } } else { $this->addContext(new FHIRString($v)); } } } elseif ($data[self::FIELD_CONTEXT] instanceof FHIRString) { $this->addContext($data[self::FIELD_CONTEXT]); - } elseif ($ext && is_scalar($data[self::FIELD_CONTEXT])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_CONTEXT])) { $this->addContext(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_CONTEXT]] + $ext)); } else { $this->addContext(new FHIRString($data[self::FIELD_CONTEXT])); @@ -201,8 +211,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CONTEXT_TYPE] instanceof FHIRExtensionContext) { $this->setContextType($data[self::FIELD_CONTEXT_TYPE]); - } elseif ($ext && is_scalar($data[self::FIELD_CONTEXT_TYPE])) { - $this->setContextType(new FHIRExtensionContext([FHIRExtensionContext::FIELD_VALUE => $data[self::FIELD_CONTEXT_TYPE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CONTEXT_TYPE])) { + $this->setContextType(new FHIRExtensionContext([FHIRExtensionContext::FIELD_VALUE => $data[self::FIELD_CONTEXT_TYPE]] + $ext)); + } else if (is_array($data[self::FIELD_CONTEXT_TYPE])) { + $this->setContextType(new FHIRExtensionContext(array_merge($ext, $data[self::FIELD_CONTEXT_TYPE]))); + } } else { $this->setContextType(new FHIRExtensionContext($data[self::FIELD_CONTEXT_TYPE])); } @@ -220,8 +234,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DISPLAY] instanceof FHIRString) { $this->setDisplay($data[self::FIELD_DISPLAY]); - } elseif ($ext && is_scalar($data[self::FIELD_DISPLAY])) { - $this->setDisplay(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DISPLAY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DISPLAY])) { + $this->setDisplay(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DISPLAY]] + $ext)); + } else if (is_array($data[self::FIELD_DISPLAY])) { + $this->setDisplay(new FHIRString(array_merge($ext, $data[self::FIELD_DISPLAY]))); + } } else { $this->setDisplay(new FHIRString($data[self::FIELD_DISPLAY])); } @@ -568,7 +586,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getContextType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CONTEXT_TYPE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDefinition())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFINITION, null, $v->_getFHIRXMLNamespace())); } @@ -585,8 +602,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getCode())) { - $a[self::FIELD_CODE] = $v->getValue(); - $a[self::FIELD_CODE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CODE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CODE_EXT] = $enc; + } + } else { + $a[self::FIELD_CODE] = $v; + } } if ([] !== ($vs = $this->getContext())) { $a[self::FIELD_CONTEXT] = []; @@ -594,19 +618,43 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_CONTEXT][] = $v->getValue(); - $a[self::FIELD_CONTEXT_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CONTEXT][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CONTEXT_EXT][] = $enc; + } else { + $a[self::FIELD_CONTEXT_EXT][] = null; + } + } else { + $a[self::FIELD_CONTEXT][] = $v; + } } } if (null !== ($v = $this->getContextType())) { - $a[self::FIELD_CONTEXT_TYPE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CONTEXT_TYPE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CONTEXT_TYPE_EXT] = $enc; + } + } else { + $a[self::FIELD_CONTEXT_TYPE] = $v; + } } if (null !== ($v = $this->getDefinition())) { $a[self::FIELD_DEFINITION] = $v; } if (null !== ($v = $this->getDisplay())) { - $a[self::FIELD_DISPLAY] = $v->getValue(); - $a[self::FIELD_DISPLAY_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DISPLAY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DISPLAY_EXT] = $enc; + } + } else { + $a[self::FIELD_DISPLAY] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRProfile/FHIRProfileMapping.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRProfile/FHIRProfileMapping.php index a0b4732598..39d5030bdf 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRProfile/FHIRProfileMapping.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRProfile/FHIRProfileMapping.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -76,10 +76,6 @@ class FHIRProfileMapping extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_PROFILE_DOT_MAPPING; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_COMMENTS = 'comments'; const FIELD_COMMENTS_EXT = '_comments'; const FIELD_IDENTITY = 'identity'; @@ -134,6 +130,9 @@ class FHIRProfileMapping extends FHIRBackboneElement */ protected $uri = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRProfileMapping Constructor * @param null|array $data @@ -156,8 +155,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_COMMENTS] instanceof FHIRString) { $this->setComments($data[self::FIELD_COMMENTS]); - } elseif ($ext && is_scalar($data[self::FIELD_COMMENTS])) { - $this->setComments(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_COMMENTS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_COMMENTS])) { + $this->setComments(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_COMMENTS]] + $ext)); + } else if (is_array($data[self::FIELD_COMMENTS])) { + $this->setComments(new FHIRString(array_merge($ext, $data[self::FIELD_COMMENTS]))); + } } else { $this->setComments(new FHIRString($data[self::FIELD_COMMENTS])); } @@ -168,8 +171,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IDENTITY] instanceof FHIRId) { $this->setIdentity($data[self::FIELD_IDENTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTITY])) { - $this->setIdentity(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_IDENTITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IDENTITY])) { + $this->setIdentity(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_IDENTITY]] + $ext)); + } else if (is_array($data[self::FIELD_IDENTITY])) { + $this->setIdentity(new FHIRId(array_merge($ext, $data[self::FIELD_IDENTITY]))); + } } else { $this->setIdentity(new FHIRId($data[self::FIELD_IDENTITY])); } @@ -180,8 +187,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -192,8 +203,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_URI] instanceof FHIRUri) { $this->setUri($data[self::FIELD_URI]); - } elseif ($ext && is_scalar($data[self::FIELD_URI])) { - $this->setUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URI]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_URI])) { + $this->setUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URI]] + $ext)); + } else if (is_array($data[self::FIELD_URI])) { + $this->setUri(new FHIRUri(array_merge($ext, $data[self::FIELD_URI]))); + } } else { $this->setUri(new FHIRUri($data[self::FIELD_URI])); } @@ -499,20 +514,48 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getComments())) { - $a[self::FIELD_COMMENTS] = $v->getValue(); - $a[self::FIELD_COMMENTS_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_COMMENTS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_COMMENTS_EXT] = $enc; + } + } else { + $a[self::FIELD_COMMENTS] = $v; + } } if (null !== ($v = $this->getIdentity())) { - $a[self::FIELD_IDENTITY] = $v->getValue(); - $a[self::FIELD_IDENTITY_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_IDENTITY] = $v; + } } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if (null !== ($v = $this->getUri())) { - $a[self::FIELD_URI] = $v->getValue(); - $a[self::FIELD_URI_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_URI] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_URI_EXT] = $enc; + } + } else { + $a[self::FIELD_URI] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRProfile/FHIRProfileMapping1.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRProfile/FHIRProfileMapping1.php index 6e4e671884..b97918c32d 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRProfile/FHIRProfileMapping1.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRProfile/FHIRProfileMapping1.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -75,10 +75,6 @@ class FHIRProfileMapping1 extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_PROFILE_DOT_MAPPING_1; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_IDENTITY = 'identity'; const FIELD_IDENTITY_EXT = '_identity'; const FIELD_MAP = 'map'; @@ -107,6 +103,9 @@ class FHIRProfileMapping1 extends FHIRBackboneElement */ protected $map = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRProfileMapping1 Constructor * @param null|array $data @@ -129,8 +128,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IDENTITY] instanceof FHIRId) { $this->setIdentity($data[self::FIELD_IDENTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTITY])) { - $this->setIdentity(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_IDENTITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IDENTITY])) { + $this->setIdentity(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_IDENTITY]] + $ext)); + } else if (is_array($data[self::FIELD_IDENTITY])) { + $this->setIdentity(new FHIRId(array_merge($ext, $data[self::FIELD_IDENTITY]))); + } } else { $this->setIdentity(new FHIRId($data[self::FIELD_IDENTITY])); } @@ -141,8 +144,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MAP] instanceof FHIRString) { $this->setMap($data[self::FIELD_MAP]); - } elseif ($ext && is_scalar($data[self::FIELD_MAP])) { - $this->setMap(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_MAP]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MAP])) { + $this->setMap(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_MAP]] + $ext)); + } else if (is_array($data[self::FIELD_MAP])) { + $this->setMap(new FHIRString(array_merge($ext, $data[self::FIELD_MAP]))); + } } else { $this->setMap(new FHIRString($data[self::FIELD_MAP])); } @@ -354,12 +361,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getIdentity())) { - $a[self::FIELD_IDENTITY] = $v->getValue(); - $a[self::FIELD_IDENTITY_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_IDENTITY] = $v; + } } if (null !== ($v = $this->getMap())) { - $a[self::FIELD_MAP] = $v->getValue(); - $a[self::FIELD_MAP_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MAP] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MAP_EXT] = $enc; + } + } else { + $a[self::FIELD_MAP] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRProfile/FHIRProfileQuery.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRProfile/FHIRProfileQuery.php index fdf53b872c..3eeae11b80 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRProfile/FHIRProfileQuery.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRProfile/FHIRProfileQuery.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -74,10 +74,6 @@ class FHIRProfileQuery extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_PROFILE_DOT_QUERY; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DOCUMENTATION = 'documentation'; const FIELD_DOCUMENTATION_EXT = '_documentation'; const FIELD_NAME = 'name'; @@ -119,6 +115,9 @@ class FHIRProfileQuery extends FHIRBackboneElement */ protected $parameter = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRProfileQuery Constructor * @param null|array $data @@ -141,8 +140,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DOCUMENTATION] instanceof FHIRString) { $this->setDocumentation($data[self::FIELD_DOCUMENTATION]); - } elseif ($ext && is_scalar($data[self::FIELD_DOCUMENTATION])) { - $this->setDocumentation(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DOCUMENTATION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DOCUMENTATION])) { + $this->setDocumentation(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DOCUMENTATION]] + $ext)); + } else if (is_array($data[self::FIELD_DOCUMENTATION])) { + $this->setDocumentation(new FHIRString(array_merge($ext, $data[self::FIELD_DOCUMENTATION]))); + } } else { $this->setDocumentation(new FHIRString($data[self::FIELD_DOCUMENTATION])); } @@ -153,8 +156,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -162,6 +169,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PARAMETER])) { if (is_array($data[self::FIELD_PARAMETER])) { foreach($data[self::FIELD_PARAMETER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRProfileSearchParam) { $this->addParameter($v); } else { @@ -434,7 +444,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NAME, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getParameter())) { foreach($vs as $v) { if (null === $v) { @@ -443,6 +452,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_PARAMETER, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } @@ -453,12 +463,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getDocumentation())) { - $a[self::FIELD_DOCUMENTATION] = $v->getValue(); - $a[self::FIELD_DOCUMENTATION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DOCUMENTATION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DOCUMENTATION_EXT] = $enc; + } + } else { + $a[self::FIELD_DOCUMENTATION] = $v; + } } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if ([] !== ($vs = $this->getParameter())) { $a[self::FIELD_PARAMETER] = $vs; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRProfile/FHIRProfileSearchParam.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRProfile/FHIRProfileSearchParam.php index 82e420fcc6..8ff23918f2 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRProfile/FHIRProfileSearchParam.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRProfile/FHIRProfileSearchParam.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -76,10 +76,6 @@ class FHIRProfileSearchParam extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_PROFILE_DOT_SEARCH_PARAM; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DOCUMENTATION = 'documentation'; const FIELD_DOCUMENTATION_EXT = '_documentation'; const FIELD_NAME = 'name'; @@ -145,6 +141,9 @@ class FHIRProfileSearchParam extends FHIRBackboneElement */ protected $xpath = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRProfileSearchParam Constructor * @param null|array $data @@ -167,8 +166,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DOCUMENTATION] instanceof FHIRString) { $this->setDocumentation($data[self::FIELD_DOCUMENTATION]); - } elseif ($ext && is_scalar($data[self::FIELD_DOCUMENTATION])) { - $this->setDocumentation(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DOCUMENTATION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DOCUMENTATION])) { + $this->setDocumentation(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DOCUMENTATION]] + $ext)); + } else if (is_array($data[self::FIELD_DOCUMENTATION])) { + $this->setDocumentation(new FHIRString(array_merge($ext, $data[self::FIELD_DOCUMENTATION]))); + } } else { $this->setDocumentation(new FHIRString($data[self::FIELD_DOCUMENTATION])); } @@ -179,8 +182,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -191,17 +198,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_TARGET])) { foreach($data[self::FIELD_TARGET] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCode) { $this->addTarget($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addTarget(new FHIRCode([FHIRCode::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addTarget(new FHIRCode([FHIRCode::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addTarget(new FHIRCode(array_merge($v, $ext[$i]))); + } } else { $this->addTarget(new FHIRCode($v)); } } } elseif ($data[self::FIELD_TARGET] instanceof FHIRCode) { $this->addTarget($data[self::FIELD_TARGET]); - } elseif ($ext && is_scalar($data[self::FIELD_TARGET])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_TARGET])) { $this->addTarget(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_TARGET]] + $ext)); } else { $this->addTarget(new FHIRCode($data[self::FIELD_TARGET])); @@ -213,8 +227,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TYPE] instanceof FHIRSearchParamType) { $this->setType($data[self::FIELD_TYPE]); - } elseif ($ext && is_scalar($data[self::FIELD_TYPE])) { - $this->setType(new FHIRSearchParamType([FHIRSearchParamType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TYPE])) { + $this->setType(new FHIRSearchParamType([FHIRSearchParamType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } else if (is_array($data[self::FIELD_TYPE])) { + $this->setType(new FHIRSearchParamType(array_merge($ext, $data[self::FIELD_TYPE]))); + } } else { $this->setType(new FHIRSearchParamType($data[self::FIELD_TYPE])); } @@ -225,8 +243,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_XPATH] instanceof FHIRString) { $this->setXpath($data[self::FIELD_XPATH]); - } elseif ($ext && is_scalar($data[self::FIELD_XPATH])) { - $this->setXpath(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_XPATH]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_XPATH])) { + $this->setXpath(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_XPATH]] + $ext)); + } else if (is_array($data[self::FIELD_XPATH])) { + $this->setXpath(new FHIRString(array_merge($ext, $data[self::FIELD_XPATH]))); + } } else { $this->setXpath(new FHIRString($data[self::FIELD_XPATH])); } @@ -599,12 +621,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getDocumentation())) { - $a[self::FIELD_DOCUMENTATION] = $v->getValue(); - $a[self::FIELD_DOCUMENTATION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DOCUMENTATION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DOCUMENTATION_EXT] = $enc; + } + } else { + $a[self::FIELD_DOCUMENTATION] = $v; + } } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if ([] !== ($vs = $this->getTarget())) { $a[self::FIELD_TARGET] = []; @@ -612,16 +648,40 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_TARGET][] = $v->getValue(); - $a[self::FIELD_TARGET_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TARGET][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TARGET_EXT][] = $enc; + } else { + $a[self::FIELD_TARGET_EXT][] = null; + } + } else { + $a[self::FIELD_TARGET][] = $v; + } } } if (null !== ($v = $this->getType())) { - $a[self::FIELD_TYPE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TYPE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TYPE_EXT] = $enc; + } + } else { + $a[self::FIELD_TYPE] = $v; + } } if (null !== ($v = $this->getXpath())) { - $a[self::FIELD_XPATH] = $v->getValue(); - $a[self::FIELD_XPATH_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_XPATH] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_XPATH_EXT] = $enc; + } + } else { + $a[self::FIELD_XPATH] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRProfile/FHIRProfileSlicing.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRProfile/FHIRProfileSlicing.php index caeb7285ce..b2d4b1e5be 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRProfile/FHIRProfileSlicing.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRProfile/FHIRProfileSlicing.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -76,10 +76,6 @@ class FHIRProfileSlicing extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_PROFILE_DOT_SLICING; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DISCRIMINATOR = 'discriminator'; const FIELD_DISCRIMINATOR_EXT = '_discriminator'; const FIELD_ORDERED = 'ordered'; @@ -125,6 +121,9 @@ class FHIRProfileSlicing extends FHIRBackboneElement */ protected $rules = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRProfileSlicing Constructor * @param null|array $data @@ -147,8 +146,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DISCRIMINATOR] instanceof FHIRId) { $this->setDiscriminator($data[self::FIELD_DISCRIMINATOR]); - } elseif ($ext && is_scalar($data[self::FIELD_DISCRIMINATOR])) { - $this->setDiscriminator(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_DISCRIMINATOR]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DISCRIMINATOR])) { + $this->setDiscriminator(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_DISCRIMINATOR]] + $ext)); + } else if (is_array($data[self::FIELD_DISCRIMINATOR])) { + $this->setDiscriminator(new FHIRId(array_merge($ext, $data[self::FIELD_DISCRIMINATOR]))); + } } else { $this->setDiscriminator(new FHIRId($data[self::FIELD_DISCRIMINATOR])); } @@ -159,8 +162,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ORDERED] instanceof FHIRBoolean) { $this->setOrdered($data[self::FIELD_ORDERED]); - } elseif ($ext && is_scalar($data[self::FIELD_ORDERED])) { - $this->setOrdered(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_ORDERED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ORDERED])) { + $this->setOrdered(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_ORDERED]] + $ext)); + } else if (is_array($data[self::FIELD_ORDERED])) { + $this->setOrdered(new FHIRBoolean(array_merge($ext, $data[self::FIELD_ORDERED]))); + } } else { $this->setOrdered(new FHIRBoolean($data[self::FIELD_ORDERED])); } @@ -171,8 +178,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_RULES] instanceof FHIRSlicingRules) { $this->setRules($data[self::FIELD_RULES]); - } elseif ($ext && is_scalar($data[self::FIELD_RULES])) { - $this->setRules(new FHIRSlicingRules([FHIRSlicingRules::FIELD_VALUE => $data[self::FIELD_RULES]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_RULES])) { + $this->setRules(new FHIRSlicingRules([FHIRSlicingRules::FIELD_VALUE => $data[self::FIELD_RULES]] + $ext)); + } else if (is_array($data[self::FIELD_RULES])) { + $this->setRules(new FHIRSlicingRules(array_merge($ext, $data[self::FIELD_RULES]))); + } } else { $this->setRules(new FHIRSlicingRules($data[self::FIELD_RULES])); } @@ -415,7 +426,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getOrdered())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ORDERED, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRules())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RULES, null, $v->_getFHIRXMLNamespace())); } @@ -429,15 +439,37 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getDiscriminator())) { - $a[self::FIELD_DISCRIMINATOR] = $v->getValue(); - $a[self::FIELD_DISCRIMINATOR_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DISCRIMINATOR] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DISCRIMINATOR_EXT] = $enc; + } + } else { + $a[self::FIELD_DISCRIMINATOR] = $v; + } } if (null !== ($v = $this->getOrdered())) { - $a[self::FIELD_ORDERED] = $v->getValue(); - $a[self::FIELD_ORDERED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ORDERED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ORDERED_EXT] = $enc; + } + } else { + $a[self::FIELD_ORDERED] = $v; + } } if (null !== ($v = $this->getRules())) { - $a[self::FIELD_RULES] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_RULES] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_RULES_EXT] = $enc; + } + } else { + $a[self::FIELD_RULES] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRProfile/FHIRProfileStructure.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRProfile/FHIRProfileStructure.php index 359126c969..4f1cbf0510 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRProfile/FHIRProfileStructure.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRProfile/FHIRProfileStructure.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -76,10 +76,6 @@ class FHIRProfileStructure extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_PROFILE_DOT_STRUCTURE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ELEMENT = 'element'; const FIELD_NAME = 'name'; const FIELD_NAME_EXT = '_name'; @@ -158,6 +154,9 @@ class FHIRProfileStructure extends FHIRBackboneElement */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRProfileStructure Constructor * @param null|array $data @@ -177,6 +176,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ELEMENT])) { if (is_array($data[self::FIELD_ELEMENT])) { foreach($data[self::FIELD_ELEMENT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRProfileElement) { $this->addElement($v); } else { @@ -195,8 +197,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -207,8 +213,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PUBLISH] instanceof FHIRBoolean) { $this->setPublish($data[self::FIELD_PUBLISH]); - } elseif ($ext && is_scalar($data[self::FIELD_PUBLISH])) { - $this->setPublish(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_PUBLISH]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PUBLISH])) { + $this->setPublish(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_PUBLISH]] + $ext)); + } else if (is_array($data[self::FIELD_PUBLISH])) { + $this->setPublish(new FHIRBoolean(array_merge($ext, $data[self::FIELD_PUBLISH]))); + } } else { $this->setPublish(new FHIRBoolean($data[self::FIELD_PUBLISH])); } @@ -219,8 +229,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PURPOSE] instanceof FHIRString) { $this->setPurpose($data[self::FIELD_PURPOSE]); - } elseif ($ext && is_scalar($data[self::FIELD_PURPOSE])) { - $this->setPurpose(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PURPOSE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PURPOSE])) { + $this->setPurpose(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PURPOSE]] + $ext)); + } else if (is_array($data[self::FIELD_PURPOSE])) { + $this->setPurpose(new FHIRString(array_merge($ext, $data[self::FIELD_PURPOSE]))); + } } else { $this->setPurpose(new FHIRString($data[self::FIELD_PURPOSE])); } @@ -228,6 +242,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SEARCH_PARAM])) { if (is_array($data[self::FIELD_SEARCH_PARAM])) { foreach($data[self::FIELD_SEARCH_PARAM] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRProfileSearchParam) { $this->addSearchParam($v); } else { @@ -246,8 +263,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TYPE] instanceof FHIRCode) { $this->setType($data[self::FIELD_TYPE]); - } elseif ($ext && is_scalar($data[self::FIELD_TYPE])) { - $this->setType(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TYPE])) { + $this->setType(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } else if (is_array($data[self::FIELD_TYPE])) { + $this->setType(new FHIRCode(array_merge($ext, $data[self::FIELD_TYPE]))); + } } else { $this->setType(new FHIRCode($data[self::FIELD_TYPE])); } @@ -653,7 +674,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getElement())) { foreach($vs as $v) { if (null === $v) { @@ -662,6 +682,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_ELEMENT, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NAME, null, $v->_getFHIRXMLNamespace())); } @@ -671,7 +692,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getPurpose())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PURPOSE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getSearchParam())) { foreach($vs as $v) { if (null === $v) { @@ -680,6 +700,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_SEARCH_PARAM, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -696,23 +717,51 @@ public function jsonSerialize() $a[self::FIELD_ELEMENT] = $vs; } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if (null !== ($v = $this->getPublish())) { - $a[self::FIELD_PUBLISH] = $v->getValue(); - $a[self::FIELD_PUBLISH_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PUBLISH] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PUBLISH_EXT] = $enc; + } + } else { + $a[self::FIELD_PUBLISH] = $v; + } } if (null !== ($v = $this->getPurpose())) { - $a[self::FIELD_PURPOSE] = $v->getValue(); - $a[self::FIELD_PURPOSE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PURPOSE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PURPOSE_EXT] = $enc; + } + } else { + $a[self::FIELD_PURPOSE] = $v; + } } if ([] !== ($vs = $this->getSearchParam())) { $a[self::FIELD_SEARCH_PARAM] = $vs; } if (null !== ($v = $this->getType())) { - $a[self::FIELD_TYPE] = $v->getValue(); - $a[self::FIELD_TYPE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TYPE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TYPE_EXT] = $enc; + } + } else { + $a[self::FIELD_TYPE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRProfile/FHIRProfileType.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRProfile/FHIRProfileType.php index 83c4eae7b3..bda8f0af50 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRProfile/FHIRProfileType.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRProfile/FHIRProfileType.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -76,10 +76,6 @@ class FHIRProfileType extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_PROFILE_DOT_TYPE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_AGGREGATION = 'aggregation'; const FIELD_AGGREGATION_EXT = '_aggregation'; const FIELD_CODE = 'code'; @@ -123,6 +119,9 @@ class FHIRProfileType extends FHIRBackboneElement */ protected $profile = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRProfileType Constructor * @param null|array $data @@ -145,17 +144,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_AGGREGATION])) { foreach($data[self::FIELD_AGGREGATION] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRAggregationMode) { $this->addAggregation($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addAggregation(new FHIRAggregationMode([FHIRAggregationMode::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addAggregation(new FHIRAggregationMode([FHIRAggregationMode::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addAggregation(new FHIRAggregationMode(array_merge($v, $ext[$i]))); + } } else { $this->addAggregation(new FHIRAggregationMode($v)); } } } elseif ($data[self::FIELD_AGGREGATION] instanceof FHIRAggregationMode) { $this->addAggregation($data[self::FIELD_AGGREGATION]); - } elseif ($ext && is_scalar($data[self::FIELD_AGGREGATION])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_AGGREGATION])) { $this->addAggregation(new FHIRAggregationMode([FHIRAggregationMode::FIELD_VALUE => $data[self::FIELD_AGGREGATION]] + $ext)); } else { $this->addAggregation(new FHIRAggregationMode($data[self::FIELD_AGGREGATION])); @@ -167,8 +173,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CODE] instanceof FHIRCode) { $this->setCode($data[self::FIELD_CODE]); - } elseif ($ext && is_scalar($data[self::FIELD_CODE])) { - $this->setCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_CODE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CODE])) { + $this->setCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_CODE]] + $ext)); + } else if (is_array($data[self::FIELD_CODE])) { + $this->setCode(new FHIRCode(array_merge($ext, $data[self::FIELD_CODE]))); + } } else { $this->setCode(new FHIRCode($data[self::FIELD_CODE])); } @@ -179,8 +189,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PROFILE] instanceof FHIRUri) { $this->setProfile($data[self::FIELD_PROFILE]); - } elseif ($ext && is_scalar($data[self::FIELD_PROFILE])) { - $this->setProfile(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_PROFILE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PROFILE])) { + $this->setProfile(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_PROFILE]] + $ext)); + } else if (is_array($data[self::FIELD_PROFILE])) { + $this->setProfile(new FHIRUri(array_merge($ext, $data[self::FIELD_PROFILE]))); + } } else { $this->setProfile(new FHIRUri($data[self::FIELD_PROFILE])); } @@ -442,7 +456,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getAggregation())) { foreach($vs as $v) { if (null === $v) { @@ -451,6 +464,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_AGGREGATION, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } @@ -467,15 +481,45 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if ([] !== ($vs = $this->getAggregation())) { - $a[self::FIELD_AGGREGATION] = $vs; + $a[self::FIELD_AGGREGATION] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_AGGREGATION][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_AGGREGATION_EXT][] = $enc; + } else { + $a[self::FIELD_AGGREGATION_EXT][] = null; + } + } else { + $a[self::FIELD_AGGREGATION][] = $v; + } + } } if (null !== ($v = $this->getCode())) { - $a[self::FIELD_CODE] = $v->getValue(); - $a[self::FIELD_CODE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CODE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CODE_EXT] = $enc; + } + } else { + $a[self::FIELD_CODE] = $v; + } } if (null !== ($v = $this->getProfile())) { - $a[self::FIELD_PROFILE] = $v->getValue(); - $a[self::FIELD_PROFILE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PROFILE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PROFILE_EXT] = $enc; + } + } else { + $a[self::FIELD_PROFILE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRProvenance/FHIRProvenanceAgent.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRProvenance/FHIRProvenanceAgent.php index b40a0ad309..bade9d426f 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRProvenance/FHIRProvenanceAgent.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRProvenance/FHIRProvenanceAgent.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRProvenanceAgent extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_PROVENANCE_DOT_AGENT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DISPLAY = 'display'; const FIELD_DISPLAY_EXT = '_display'; const FIELD_REFERENCE = 'reference'; @@ -132,6 +128,9 @@ class FHIRProvenanceAgent extends FHIRBackboneElement */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRProvenanceAgent Constructor * @param null|array $data @@ -154,8 +153,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DISPLAY] instanceof FHIRString) { $this->setDisplay($data[self::FIELD_DISPLAY]); - } elseif ($ext && is_scalar($data[self::FIELD_DISPLAY])) { - $this->setDisplay(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DISPLAY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DISPLAY])) { + $this->setDisplay(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DISPLAY]] + $ext)); + } else if (is_array($data[self::FIELD_DISPLAY])) { + $this->setDisplay(new FHIRString(array_merge($ext, $data[self::FIELD_DISPLAY]))); + } } else { $this->setDisplay(new FHIRString($data[self::FIELD_DISPLAY])); } @@ -166,8 +169,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_REFERENCE] instanceof FHIRUri) { $this->setReference($data[self::FIELD_REFERENCE]); - } elseif ($ext && is_scalar($data[self::FIELD_REFERENCE])) { - $this->setReference(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_REFERENCE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_REFERENCE])) { + $this->setReference(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_REFERENCE]] + $ext)); + } else if (is_array($data[self::FIELD_REFERENCE])) { + $this->setReference(new FHIRUri(array_merge($ext, $data[self::FIELD_REFERENCE]))); + } } else { $this->setReference(new FHIRUri($data[self::FIELD_REFERENCE])); } @@ -445,11 +452,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REFERENCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRole())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ROLE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -463,12 +468,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getDisplay())) { - $a[self::FIELD_DISPLAY] = $v->getValue(); - $a[self::FIELD_DISPLAY_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DISPLAY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DISPLAY_EXT] = $enc; + } + } else { + $a[self::FIELD_DISPLAY] = $v; + } } if (null !== ($v = $this->getReference())) { - $a[self::FIELD_REFERENCE] = $v->getValue(); - $a[self::FIELD_REFERENCE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_REFERENCE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_REFERENCE_EXT] = $enc; + } + } else { + $a[self::FIELD_REFERENCE] = $v; + } } if (null !== ($v = $this->getRole())) { $a[self::FIELD_ROLE] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRProvenance/FHIRProvenanceEntity.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRProvenance/FHIRProvenanceEntity.php index b3482bb6a8..23f6ae1708 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRProvenance/FHIRProvenanceEntity.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRProvenance/FHIRProvenanceEntity.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRProvenanceEntity extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_PROVENANCE_DOT_ENTITY; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_AGENT = 'agent'; const FIELD_DISPLAY = 'display'; const FIELD_DISPLAY_EXT = '_display'; @@ -151,6 +147,9 @@ class FHIRProvenanceEntity extends FHIRBackboneElement */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRProvenanceEntity Constructor * @param null|array $data @@ -180,8 +179,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DISPLAY] instanceof FHIRString) { $this->setDisplay($data[self::FIELD_DISPLAY]); - } elseif ($ext && is_scalar($data[self::FIELD_DISPLAY])) { - $this->setDisplay(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DISPLAY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DISPLAY])) { + $this->setDisplay(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DISPLAY]] + $ext)); + } else if (is_array($data[self::FIELD_DISPLAY])) { + $this->setDisplay(new FHIRString(array_merge($ext, $data[self::FIELD_DISPLAY]))); + } } else { $this->setDisplay(new FHIRString($data[self::FIELD_DISPLAY])); } @@ -192,8 +195,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_REFERENCE] instanceof FHIRUri) { $this->setReference($data[self::FIELD_REFERENCE]); - } elseif ($ext && is_scalar($data[self::FIELD_REFERENCE])) { - $this->setReference(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_REFERENCE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_REFERENCE])) { + $this->setReference(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_REFERENCE]] + $ext)); + } else if (is_array($data[self::FIELD_REFERENCE])) { + $this->setReference(new FHIRUri(array_merge($ext, $data[self::FIELD_REFERENCE]))); + } } else { $this->setReference(new FHIRUri($data[self::FIELD_REFERENCE])); } @@ -204,8 +211,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ROLE] instanceof FHIRProvenanceEntityRole) { $this->setRole($data[self::FIELD_ROLE]); - } elseif ($ext && is_scalar($data[self::FIELD_ROLE])) { - $this->setRole(new FHIRProvenanceEntityRole([FHIRProvenanceEntityRole::FIELD_VALUE => $data[self::FIELD_ROLE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ROLE])) { + $this->setRole(new FHIRProvenanceEntityRole([FHIRProvenanceEntityRole::FIELD_VALUE => $data[self::FIELD_ROLE]] + $ext)); + } else if (is_array($data[self::FIELD_ROLE])) { + $this->setRole(new FHIRProvenanceEntityRole(array_merge($ext, $data[self::FIELD_ROLE]))); + } } else { $this->setRole(new FHIRProvenanceEntityRole($data[self::FIELD_ROLE])); } @@ -513,7 +524,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getAgent())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AGENT, null, $v->_getFHIRXMLNamespace())); } @@ -523,11 +533,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REFERENCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRole())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ROLE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -544,15 +552,37 @@ public function jsonSerialize() $a[self::FIELD_AGENT] = $v; } if (null !== ($v = $this->getDisplay())) { - $a[self::FIELD_DISPLAY] = $v->getValue(); - $a[self::FIELD_DISPLAY_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DISPLAY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DISPLAY_EXT] = $enc; + } + } else { + $a[self::FIELD_DISPLAY] = $v; + } } if (null !== ($v = $this->getReference())) { - $a[self::FIELD_REFERENCE] = $v->getValue(); - $a[self::FIELD_REFERENCE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_REFERENCE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_REFERENCE_EXT] = $enc; + } + } else { + $a[self::FIELD_REFERENCE] = $v; + } } if (null !== ($v = $this->getRole())) { - $a[self::FIELD_ROLE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ROLE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ROLE_EXT] = $enc; + } + } else { + $a[self::FIELD_ROLE] = $v; + } } if (null !== ($v = $this->getType())) { $a[self::FIELD_TYPE] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRQuery/FHIRQueryResponse.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRQuery/FHIRQueryResponse.php index e81869c187..b997edcd2a 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRQuery/FHIRQueryResponse.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRQuery/FHIRQueryResponse.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -76,10 +76,6 @@ class FHIRQueryResponse extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_QUERY_DOT_RESPONSE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_FIRST = 'first'; const FIELD_IDENTIFIER = 'identifier'; const FIELD_IDENTIFIER_EXT = '_identifier'; @@ -189,6 +185,9 @@ class FHIRQueryResponse extends FHIRBackboneElement */ protected $total = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRQueryResponse Constructor * @param null|array $data @@ -208,6 +207,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_FIRST])) { if (is_array($data[self::FIELD_FIRST])) { foreach($data[self::FIELD_FIRST] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRExtension) { $this->addFirst($v); } else { @@ -226,8 +228,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IDENTIFIER] instanceof FHIRUri) { $this->setIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { - $this->setIdentifier(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRUri(array_merge($ext, $data[self::FIELD_IDENTIFIER]))); + } } else { $this->setIdentifier(new FHIRUri($data[self::FIELD_IDENTIFIER])); } @@ -235,6 +241,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_LAST])) { if (is_array($data[self::FIELD_LAST])) { foreach($data[self::FIELD_LAST] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRExtension) { $this->addLast($v); } else { @@ -250,6 +259,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_NEXT])) { if (is_array($data[self::FIELD_NEXT])) { foreach($data[self::FIELD_NEXT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRExtension) { $this->addNext($v); } else { @@ -268,8 +280,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_OUTCOME] instanceof FHIRQueryOutcome) { $this->setOutcome($data[self::FIELD_OUTCOME]); - } elseif ($ext && is_scalar($data[self::FIELD_OUTCOME])) { - $this->setOutcome(new FHIRQueryOutcome([FHIRQueryOutcome::FIELD_VALUE => $data[self::FIELD_OUTCOME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_OUTCOME])) { + $this->setOutcome(new FHIRQueryOutcome([FHIRQueryOutcome::FIELD_VALUE => $data[self::FIELD_OUTCOME]] + $ext)); + } else if (is_array($data[self::FIELD_OUTCOME])) { + $this->setOutcome(new FHIRQueryOutcome(array_merge($ext, $data[self::FIELD_OUTCOME]))); + } } else { $this->setOutcome(new FHIRQueryOutcome($data[self::FIELD_OUTCOME])); } @@ -277,6 +293,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PARAMETER])) { if (is_array($data[self::FIELD_PARAMETER])) { foreach($data[self::FIELD_PARAMETER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRExtension) { $this->addParameter($v); } else { @@ -292,6 +311,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PREVIOUS])) { if (is_array($data[self::FIELD_PREVIOUS])) { foreach($data[self::FIELD_PREVIOUS] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRExtension) { $this->addPrevious($v); } else { @@ -307,6 +329,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REFERENCE])) { if (is_array($data[self::FIELD_REFERENCE])) { foreach($data[self::FIELD_REFERENCE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRResourceReference) { $this->addReference($v); } else { @@ -325,8 +350,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TOTAL] instanceof FHIRInteger) { $this->setTotal($data[self::FIELD_TOTAL]); - } elseif ($ext && is_scalar($data[self::FIELD_TOTAL])) { - $this->setTotal(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_TOTAL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TOTAL])) { + $this->setTotal(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_TOTAL]] + $ext)); + } else if (is_array($data[self::FIELD_TOTAL])) { + $this->setTotal(new FHIRInteger(array_merge($ext, $data[self::FIELD_TOTAL]))); + } } else { $this->setTotal(new FHIRInteger($data[self::FIELD_TOTAL])); } @@ -913,7 +942,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getFirst())) { foreach($vs as $v) { if (null === $v) { @@ -922,10 +950,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_FIRST, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getLast())) { foreach($vs as $v) { if (null === $v) { @@ -947,7 +975,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getOutcome())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OUTCOME, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getParameter())) { foreach($vs as $v) { if (null === $v) { @@ -974,6 +1001,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_REFERENCE, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getTotal())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TOTAL, null, $v->_getFHIRXMLNamespace())); } @@ -990,8 +1018,15 @@ public function jsonSerialize() $a[self::FIELD_FIRST] = $vs; } if (null !== ($v = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $v->getValue(); - $a[self::FIELD_IDENTIFIER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_IDENTIFIER] = $v; + } } if ([] !== ($vs = $this->getLast())) { $a[self::FIELD_LAST] = $vs; @@ -1000,7 +1035,15 @@ public function jsonSerialize() $a[self::FIELD_NEXT] = $vs; } if (null !== ($v = $this->getOutcome())) { - $a[self::FIELD_OUTCOME] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_OUTCOME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_OUTCOME_EXT] = $enc; + } + } else { + $a[self::FIELD_OUTCOME] = $v; + } } if ([] !== ($vs = $this->getParameter())) { $a[self::FIELD_PARAMETER] = $vs; @@ -1012,8 +1055,15 @@ public function jsonSerialize() $a[self::FIELD_REFERENCE] = $vs; } if (null !== ($v = $this->getTotal())) { - $a[self::FIELD_TOTAL] = $v->getValue(); - $a[self::FIELD_TOTAL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TOTAL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TOTAL_EXT] = $enc; + } + } else { + $a[self::FIELD_TOTAL] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRQuestionnaire/FHIRQuestionnaireGroup.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRQuestionnaire/FHIRQuestionnaireGroup.php index 8b8e4e47df..8ae85de84c 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRQuestionnaire/FHIRQuestionnaireGroup.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRQuestionnaire/FHIRQuestionnaireGroup.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -77,10 +77,6 @@ class FHIRQuestionnaireGroup extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_QUESTIONNAIRE_DOT_GROUP; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_GROUP = 'group'; const FIELD_HEADER = 'header'; const FIELD_HEADER_EXT = '_header'; @@ -161,6 +157,9 @@ class FHIRQuestionnaireGroup extends FHIRBackboneElement */ protected $text = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRQuestionnaireGroup Constructor * @param null|array $data @@ -180,6 +179,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_GROUP])) { if (is_array($data[self::FIELD_GROUP])) { foreach($data[self::FIELD_GROUP] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRQuestionnaireGroup) { $this->addGroup($v); } else { @@ -198,8 +200,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_HEADER] instanceof FHIRString) { $this->setHeader($data[self::FIELD_HEADER]); - } elseif ($ext && is_scalar($data[self::FIELD_HEADER])) { - $this->setHeader(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_HEADER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_HEADER])) { + $this->setHeader(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_HEADER]] + $ext)); + } else if (is_array($data[self::FIELD_HEADER])) { + $this->setHeader(new FHIRString(array_merge($ext, $data[self::FIELD_HEADER]))); + } } else { $this->setHeader(new FHIRString($data[self::FIELD_HEADER])); } @@ -214,6 +220,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_QUESTION])) { if (is_array($data[self::FIELD_QUESTION])) { foreach($data[self::FIELD_QUESTION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRQuestionnaireQuestion) { $this->addQuestion($v); } else { @@ -239,8 +248,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TEXT] instanceof FHIRString) { $this->setText($data[self::FIELD_TEXT]); - } elseif ($ext && is_scalar($data[self::FIELD_TEXT])) { - $this->setText(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TEXT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TEXT])) { + $this->setText(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TEXT]] + $ext)); + } else if (is_array($data[self::FIELD_TEXT])) { + $this->setText(new FHIRString(array_merge($ext, $data[self::FIELD_TEXT]))); + } } else { $this->setText(new FHIRString($data[self::FIELD_TEXT])); } @@ -636,7 +649,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getGroup())) { foreach($vs as $v) { if (null === $v) { @@ -645,14 +657,13 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_GROUP, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getHeader())) { $v->xmlSerialize($sxe->addChild(self::FIELD_HEADER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NAME, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getQuestion())) { foreach($vs as $v) { if (null === $v) { @@ -681,8 +692,15 @@ public function jsonSerialize() $a[self::FIELD_GROUP] = $vs; } if (null !== ($v = $this->getHeader())) { - $a[self::FIELD_HEADER] = $v->getValue(); - $a[self::FIELD_HEADER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_HEADER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_HEADER_EXT] = $enc; + } + } else { + $a[self::FIELD_HEADER] = $v; + } } if (null !== ($v = $this->getName())) { $a[self::FIELD_NAME] = $v; @@ -694,8 +712,15 @@ public function jsonSerialize() $a[self::FIELD_SUBJECT] = $v; } if (null !== ($v = $this->getText())) { - $a[self::FIELD_TEXT] = $v->getValue(); - $a[self::FIELD_TEXT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TEXT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TEXT_EXT] = $enc; + } + } else { + $a[self::FIELD_TEXT] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRQuestionnaire/FHIRQuestionnaireQuestion.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRQuestionnaire/FHIRQuestionnaireQuestion.php index f911207e2c..9d256c30a3 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRQuestionnaire/FHIRQuestionnaireQuestion.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRQuestionnaire/FHIRQuestionnaireQuestion.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -101,10 +101,6 @@ class FHIRQuestionnaireQuestion extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_QUESTIONNAIRE_DOT_QUESTION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ANSWER_BOOLEAN = 'answerBoolean'; const FIELD_ANSWER_BOOLEAN_EXT = '_answerBoolean'; const FIELD_ANSWER_DATE = 'answerDate'; @@ -620,6 +616,9 @@ class FHIRQuestionnaireQuestion extends FHIRBackboneElement */ protected $text = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRQuestionnaireQuestion Constructor * @param null|array $data @@ -642,8 +641,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ANSWER_BOOLEAN] instanceof FHIRBoolean) { $this->setAnswerBoolean($data[self::FIELD_ANSWER_BOOLEAN]); - } elseif ($ext && is_scalar($data[self::FIELD_ANSWER_BOOLEAN])) { - $this->setAnswerBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_ANSWER_BOOLEAN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ANSWER_BOOLEAN])) { + $this->setAnswerBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_ANSWER_BOOLEAN]] + $ext)); + } else if (is_array($data[self::FIELD_ANSWER_BOOLEAN])) { + $this->setAnswerBoolean(new FHIRBoolean(array_merge($ext, $data[self::FIELD_ANSWER_BOOLEAN]))); + } } else { $this->setAnswerBoolean(new FHIRBoolean($data[self::FIELD_ANSWER_BOOLEAN])); } @@ -654,8 +657,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ANSWER_DATE] instanceof FHIRDate) { $this->setAnswerDate($data[self::FIELD_ANSWER_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_ANSWER_DATE])) { - $this->setAnswerDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_ANSWER_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ANSWER_DATE])) { + $this->setAnswerDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_ANSWER_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_ANSWER_DATE])) { + $this->setAnswerDate(new FHIRDate(array_merge($ext, $data[self::FIELD_ANSWER_DATE]))); + } } else { $this->setAnswerDate(new FHIRDate($data[self::FIELD_ANSWER_DATE])); } @@ -666,8 +673,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ANSWER_DATE_TIME] instanceof FHIRDateTime) { $this->setAnswerDateTime($data[self::FIELD_ANSWER_DATE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_ANSWER_DATE_TIME])) { - $this->setAnswerDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_ANSWER_DATE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ANSWER_DATE_TIME])) { + $this->setAnswerDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_ANSWER_DATE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_ANSWER_DATE_TIME])) { + $this->setAnswerDateTime(new FHIRDateTime(array_merge($ext, $data[self::FIELD_ANSWER_DATE_TIME]))); + } } else { $this->setAnswerDateTime(new FHIRDateTime($data[self::FIELD_ANSWER_DATE_TIME])); } @@ -678,8 +689,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ANSWER_DECIMAL] instanceof FHIRDecimal) { $this->setAnswerDecimal($data[self::FIELD_ANSWER_DECIMAL]); - } elseif ($ext && is_scalar($data[self::FIELD_ANSWER_DECIMAL])) { - $this->setAnswerDecimal(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_ANSWER_DECIMAL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ANSWER_DECIMAL])) { + $this->setAnswerDecimal(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_ANSWER_DECIMAL]] + $ext)); + } else if (is_array($data[self::FIELD_ANSWER_DECIMAL])) { + $this->setAnswerDecimal(new FHIRDecimal(array_merge($ext, $data[self::FIELD_ANSWER_DECIMAL]))); + } } else { $this->setAnswerDecimal(new FHIRDecimal($data[self::FIELD_ANSWER_DECIMAL])); } @@ -690,8 +705,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ANSWER_INSTANT] instanceof FHIRInstant) { $this->setAnswerInstant($data[self::FIELD_ANSWER_INSTANT]); - } elseif ($ext && is_scalar($data[self::FIELD_ANSWER_INSTANT])) { - $this->setAnswerInstant(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_ANSWER_INSTANT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ANSWER_INSTANT])) { + $this->setAnswerInstant(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_ANSWER_INSTANT]] + $ext)); + } else if (is_array($data[self::FIELD_ANSWER_INSTANT])) { + $this->setAnswerInstant(new FHIRInstant(array_merge($ext, $data[self::FIELD_ANSWER_INSTANT]))); + } } else { $this->setAnswerInstant(new FHIRInstant($data[self::FIELD_ANSWER_INSTANT])); } @@ -702,8 +721,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ANSWER_INTEGER] instanceof FHIRInteger) { $this->setAnswerInteger($data[self::FIELD_ANSWER_INTEGER]); - } elseif ($ext && is_scalar($data[self::FIELD_ANSWER_INTEGER])) { - $this->setAnswerInteger(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_ANSWER_INTEGER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ANSWER_INTEGER])) { + $this->setAnswerInteger(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_ANSWER_INTEGER]] + $ext)); + } else if (is_array($data[self::FIELD_ANSWER_INTEGER])) { + $this->setAnswerInteger(new FHIRInteger(array_merge($ext, $data[self::FIELD_ANSWER_INTEGER]))); + } } else { $this->setAnswerInteger(new FHIRInteger($data[self::FIELD_ANSWER_INTEGER])); } @@ -714,8 +737,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ANSWER_STRING] instanceof FHIRString) { $this->setAnswerString($data[self::FIELD_ANSWER_STRING]); - } elseif ($ext && is_scalar($data[self::FIELD_ANSWER_STRING])) { - $this->setAnswerString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_ANSWER_STRING]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ANSWER_STRING])) { + $this->setAnswerString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_ANSWER_STRING]] + $ext)); + } else if (is_array($data[self::FIELD_ANSWER_STRING])) { + $this->setAnswerString(new FHIRString(array_merge($ext, $data[self::FIELD_ANSWER_STRING]))); + } } else { $this->setAnswerString(new FHIRString($data[self::FIELD_ANSWER_STRING])); } @@ -723,6 +750,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CHOICE])) { if (is_array($data[self::FIELD_CHOICE])) { foreach($data[self::FIELD_CHOICE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCoding) { $this->addChoice($v); } else { @@ -755,8 +785,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATA_BASE_64BINARY] instanceof FHIRBase64Binary) { $this->setDataBase64Binary($data[self::FIELD_DATA_BASE_64BINARY]); - } elseif ($ext && is_scalar($data[self::FIELD_DATA_BASE_64BINARY])) { - $this->setDataBase64Binary(new FHIRBase64Binary([FHIRBase64Binary::FIELD_VALUE => $data[self::FIELD_DATA_BASE_64BINARY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATA_BASE_64BINARY])) { + $this->setDataBase64Binary(new FHIRBase64Binary([FHIRBase64Binary::FIELD_VALUE => $data[self::FIELD_DATA_BASE_64BINARY]] + $ext)); + } else if (is_array($data[self::FIELD_DATA_BASE_64BINARY])) { + $this->setDataBase64Binary(new FHIRBase64Binary(array_merge($ext, $data[self::FIELD_DATA_BASE_64BINARY]))); + } } else { $this->setDataBase64Binary(new FHIRBase64Binary($data[self::FIELD_DATA_BASE_64BINARY])); } @@ -767,8 +801,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATA_BOOLEAN] instanceof FHIRBoolean) { $this->setDataBoolean($data[self::FIELD_DATA_BOOLEAN]); - } elseif ($ext && is_scalar($data[self::FIELD_DATA_BOOLEAN])) { - $this->setDataBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_DATA_BOOLEAN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATA_BOOLEAN])) { + $this->setDataBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_DATA_BOOLEAN]] + $ext)); + } else if (is_array($data[self::FIELD_DATA_BOOLEAN])) { + $this->setDataBoolean(new FHIRBoolean(array_merge($ext, $data[self::FIELD_DATA_BOOLEAN]))); + } } else { $this->setDataBoolean(new FHIRBoolean($data[self::FIELD_DATA_BOOLEAN])); } @@ -779,8 +817,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATA_CODE] instanceof FHIRCode) { $this->setDataCode($data[self::FIELD_DATA_CODE]); - } elseif ($ext && is_scalar($data[self::FIELD_DATA_CODE])) { - $this->setDataCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_DATA_CODE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATA_CODE])) { + $this->setDataCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_DATA_CODE]] + $ext)); + } else if (is_array($data[self::FIELD_DATA_CODE])) { + $this->setDataCode(new FHIRCode(array_merge($ext, $data[self::FIELD_DATA_CODE]))); + } } else { $this->setDataCode(new FHIRCode($data[self::FIELD_DATA_CODE])); } @@ -805,8 +847,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATA_CONTACT] instanceof FHIRContact) { $this->setDataContact($data[self::FIELD_DATA_CONTACT]); - } elseif ($ext && is_scalar($data[self::FIELD_DATA_CONTACT])) { - $this->setDataContact(new FHIRContact([FHIRContact::FIELD_VALUE => $data[self::FIELD_DATA_CONTACT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATA_CONTACT])) { + $this->setDataContact(new FHIRContact([FHIRContact::FIELD_VALUE => $data[self::FIELD_DATA_CONTACT]] + $ext)); + } else if (is_array($data[self::FIELD_DATA_CONTACT])) { + $this->setDataContact(new FHIRContact(array_merge($ext, $data[self::FIELD_DATA_CONTACT]))); + } } else { $this->setDataContact(new FHIRContact($data[self::FIELD_DATA_CONTACT])); } @@ -817,8 +863,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATA_DATE] instanceof FHIRDate) { $this->setDataDate($data[self::FIELD_DATA_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_DATA_DATE])) { - $this->setDataDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_DATA_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATA_DATE])) { + $this->setDataDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_DATA_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_DATA_DATE])) { + $this->setDataDate(new FHIRDate(array_merge($ext, $data[self::FIELD_DATA_DATE]))); + } } else { $this->setDataDate(new FHIRDate($data[self::FIELD_DATA_DATE])); } @@ -829,8 +879,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATA_DATE_TIME] instanceof FHIRDateTime) { $this->setDataDateTime($data[self::FIELD_DATA_DATE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_DATA_DATE_TIME])) { - $this->setDataDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATA_DATE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATA_DATE_TIME])) { + $this->setDataDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATA_DATE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_DATA_DATE_TIME])) { + $this->setDataDateTime(new FHIRDateTime(array_merge($ext, $data[self::FIELD_DATA_DATE_TIME]))); + } } else { $this->setDataDateTime(new FHIRDateTime($data[self::FIELD_DATA_DATE_TIME])); } @@ -841,8 +895,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATA_DECIMAL] instanceof FHIRDecimal) { $this->setDataDecimal($data[self::FIELD_DATA_DECIMAL]); - } elseif ($ext && is_scalar($data[self::FIELD_DATA_DECIMAL])) { - $this->setDataDecimal(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_DATA_DECIMAL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATA_DECIMAL])) { + $this->setDataDecimal(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_DATA_DECIMAL]] + $ext)); + } else if (is_array($data[self::FIELD_DATA_DECIMAL])) { + $this->setDataDecimal(new FHIRDecimal(array_merge($ext, $data[self::FIELD_DATA_DECIMAL]))); + } } else { $this->setDataDecimal(new FHIRDecimal($data[self::FIELD_DATA_DECIMAL])); } @@ -860,8 +918,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATA_ID] instanceof FHIRId) { $this->setDataId($data[self::FIELD_DATA_ID]); - } elseif ($ext && is_scalar($data[self::FIELD_DATA_ID])) { - $this->setDataId(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_DATA_ID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATA_ID])) { + $this->setDataId(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_DATA_ID]] + $ext)); + } else if (is_array($data[self::FIELD_DATA_ID])) { + $this->setDataId(new FHIRId(array_merge($ext, $data[self::FIELD_DATA_ID]))); + } } else { $this->setDataId(new FHIRId($data[self::FIELD_DATA_ID])); } @@ -872,8 +934,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATA_IDENTIFIER] instanceof FHIRIdentifier) { $this->setDataIdentifier($data[self::FIELD_DATA_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_DATA_IDENTIFIER])) { - $this->setDataIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_DATA_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATA_IDENTIFIER])) { + $this->setDataIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_DATA_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_DATA_IDENTIFIER])) { + $this->setDataIdentifier(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_DATA_IDENTIFIER]))); + } } else { $this->setDataIdentifier(new FHIRIdentifier($data[self::FIELD_DATA_IDENTIFIER])); } @@ -884,8 +950,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATA_INSTANT] instanceof FHIRInstant) { $this->setDataInstant($data[self::FIELD_DATA_INSTANT]); - } elseif ($ext && is_scalar($data[self::FIELD_DATA_INSTANT])) { - $this->setDataInstant(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_DATA_INSTANT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATA_INSTANT])) { + $this->setDataInstant(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_DATA_INSTANT]] + $ext)); + } else if (is_array($data[self::FIELD_DATA_INSTANT])) { + $this->setDataInstant(new FHIRInstant(array_merge($ext, $data[self::FIELD_DATA_INSTANT]))); + } } else { $this->setDataInstant(new FHIRInstant($data[self::FIELD_DATA_INSTANT])); } @@ -896,8 +966,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATA_INTEGER] instanceof FHIRInteger) { $this->setDataInteger($data[self::FIELD_DATA_INTEGER]); - } elseif ($ext && is_scalar($data[self::FIELD_DATA_INTEGER])) { - $this->setDataInteger(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_DATA_INTEGER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATA_INTEGER])) { + $this->setDataInteger(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_DATA_INTEGER]] + $ext)); + } else if (is_array($data[self::FIELD_DATA_INTEGER])) { + $this->setDataInteger(new FHIRInteger(array_merge($ext, $data[self::FIELD_DATA_INTEGER]))); + } } else { $this->setDataInteger(new FHIRInteger($data[self::FIELD_DATA_INTEGER])); } @@ -908,8 +982,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATA_OID] instanceof FHIROid) { $this->setDataOid($data[self::FIELD_DATA_OID]); - } elseif ($ext && is_scalar($data[self::FIELD_DATA_OID])) { - $this->setDataOid(new FHIROid([FHIROid::FIELD_VALUE => $data[self::FIELD_DATA_OID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATA_OID])) { + $this->setDataOid(new FHIROid([FHIROid::FIELD_VALUE => $data[self::FIELD_DATA_OID]] + $ext)); + } else if (is_array($data[self::FIELD_DATA_OID])) { + $this->setDataOid(new FHIROid(array_merge($ext, $data[self::FIELD_DATA_OID]))); + } } else { $this->setDataOid(new FHIROid($data[self::FIELD_DATA_OID])); } @@ -927,8 +1005,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATA_QUANTITY] instanceof FHIRQuantity) { $this->setDataQuantity($data[self::FIELD_DATA_QUANTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_DATA_QUANTITY])) { - $this->setDataQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_DATA_QUANTITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATA_QUANTITY])) { + $this->setDataQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_DATA_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_DATA_QUANTITY])) { + $this->setDataQuantity(new FHIRQuantity(array_merge($ext, $data[self::FIELD_DATA_QUANTITY]))); + } } else { $this->setDataQuantity(new FHIRQuantity($data[self::FIELD_DATA_QUANTITY])); } @@ -974,8 +1056,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATA_STRING] instanceof FHIRString) { $this->setDataString($data[self::FIELD_DATA_STRING]); - } elseif ($ext && is_scalar($data[self::FIELD_DATA_STRING])) { - $this->setDataString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DATA_STRING]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATA_STRING])) { + $this->setDataString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DATA_STRING]] + $ext)); + } else if (is_array($data[self::FIELD_DATA_STRING])) { + $this->setDataString(new FHIRString(array_merge($ext, $data[self::FIELD_DATA_STRING]))); + } } else { $this->setDataString(new FHIRString($data[self::FIELD_DATA_STRING])); } @@ -986,8 +1072,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATA_URI] instanceof FHIRUri) { $this->setDataUri($data[self::FIELD_DATA_URI]); - } elseif ($ext && is_scalar($data[self::FIELD_DATA_URI])) { - $this->setDataUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_DATA_URI]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATA_URI])) { + $this->setDataUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_DATA_URI]] + $ext)); + } else if (is_array($data[self::FIELD_DATA_URI])) { + $this->setDataUri(new FHIRUri(array_merge($ext, $data[self::FIELD_DATA_URI]))); + } } else { $this->setDataUri(new FHIRUri($data[self::FIELD_DATA_URI])); } @@ -998,8 +1088,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATA_UUID] instanceof FHIRUuid) { $this->setDataUuid($data[self::FIELD_DATA_UUID]); - } elseif ($ext && is_scalar($data[self::FIELD_DATA_UUID])) { - $this->setDataUuid(new FHIRUuid([FHIRUuid::FIELD_VALUE => $data[self::FIELD_DATA_UUID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATA_UUID])) { + $this->setDataUuid(new FHIRUuid([FHIRUuid::FIELD_VALUE => $data[self::FIELD_DATA_UUID]] + $ext)); + } else if (is_array($data[self::FIELD_DATA_UUID])) { + $this->setDataUuid(new FHIRUuid(array_merge($ext, $data[self::FIELD_DATA_UUID]))); + } } else { $this->setDataUuid(new FHIRUuid($data[self::FIELD_DATA_UUID])); } @@ -1007,6 +1101,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_GROUP])) { if (is_array($data[self::FIELD_GROUP])) { foreach($data[self::FIELD_GROUP] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRQuestionnaireGroup) { $this->addGroup($v); } else { @@ -1039,8 +1136,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_REMARKS] instanceof FHIRString) { $this->setRemarks($data[self::FIELD_REMARKS]); - } elseif ($ext && is_scalar($data[self::FIELD_REMARKS])) { - $this->setRemarks(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_REMARKS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_REMARKS])) { + $this->setRemarks(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_REMARKS]] + $ext)); + } else if (is_array($data[self::FIELD_REMARKS])) { + $this->setRemarks(new FHIRString(array_merge($ext, $data[self::FIELD_REMARKS]))); + } } else { $this->setRemarks(new FHIRString($data[self::FIELD_REMARKS])); } @@ -1051,8 +1152,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TEXT] instanceof FHIRString) { $this->setText($data[self::FIELD_TEXT]); - } elseif ($ext && is_scalar($data[self::FIELD_TEXT])) { - $this->setText(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TEXT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TEXT])) { + $this->setText(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TEXT]] + $ext)); + } else if (is_array($data[self::FIELD_TEXT])) { + $this->setText(new FHIRString(array_merge($ext, $data[self::FIELD_TEXT]))); + } } else { $this->setText(new FHIRString($data[self::FIELD_TEXT])); } @@ -2817,7 +2922,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getAnswerString())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ANSWER_STRING, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getChoice())) { foreach($vs as $v) { if (null === $v) { @@ -2830,7 +2934,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDataAddress())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DATA_ADDRESS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDataAttachment())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DATA_ATTACHMENT, null, $v->_getFHIRXMLNamespace())); } @@ -2843,15 +2946,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDataCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DATA_CODE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDataCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DATA_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDataCoding())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DATA_CODING, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDataContact())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DATA_CONTACT, null, $v->_getFHIRXMLNamespace())); } @@ -2864,14 +2964,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDataDecimal())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DATA_DECIMAL, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDataHumanName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DATA_HUMAN_NAME, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getDataId())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DATA_ID, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDataIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DATA_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } @@ -2884,31 +2982,24 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDataOid())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DATA_OID, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDataPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DATA_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDataQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DATA_QUANTITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDataRange())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DATA_RANGE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDataRatio())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DATA_RATIO, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDataResource())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DATA_RESOURCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDataSampledData())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DATA_SAMPLED_DATA, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDataSchedule())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DATA_SCHEDULE, null, $v->_getFHIRXMLNamespace())); } @@ -2921,7 +3012,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDataUuid())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DATA_UUID, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getGroup())) { foreach($vs as $v) { if (null === $v) { @@ -2934,7 +3024,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NAME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOptions())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OPTIONS, null, $v->_getFHIRXMLNamespace())); } @@ -2954,32 +3043,81 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getAnswerBoolean())) { - $a[self::FIELD_ANSWER_BOOLEAN] = $v->getValue(); - $a[self::FIELD_ANSWER_BOOLEAN_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ANSWER_BOOLEAN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ANSWER_BOOLEAN_EXT] = $enc; + } + } else { + $a[self::FIELD_ANSWER_BOOLEAN] = $v; + } } if (null !== ($v = $this->getAnswerDate())) { - $a[self::FIELD_ANSWER_DATE] = $v->getValue(); - $a[self::FIELD_ANSWER_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ANSWER_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ANSWER_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_ANSWER_DATE] = $v; + } } if (null !== ($v = $this->getAnswerDateTime())) { - $a[self::FIELD_ANSWER_DATE_TIME] = $v->getValue(); - $a[self::FIELD_ANSWER_DATE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ANSWER_DATE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ANSWER_DATE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_ANSWER_DATE_TIME] = $v; + } } if (null !== ($v = $this->getAnswerDecimal())) { - $a[self::FIELD_ANSWER_DECIMAL] = $v->getValue(); - $a[self::FIELD_ANSWER_DECIMAL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ANSWER_DECIMAL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ANSWER_DECIMAL_EXT] = $enc; + } + } else { + $a[self::FIELD_ANSWER_DECIMAL] = $v; + } } if (null !== ($v = $this->getAnswerInstant())) { - $a[self::FIELD_ANSWER_INSTANT] = $v->getValue(); - $a[self::FIELD_ANSWER_INSTANT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ANSWER_INSTANT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ANSWER_INSTANT_EXT] = $enc; + } + } else { + $a[self::FIELD_ANSWER_INSTANT] = $v; + } } if (null !== ($v = $this->getAnswerInteger())) { - $a[self::FIELD_ANSWER_INTEGER] = $v->getValue(); - $a[self::FIELD_ANSWER_INTEGER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ANSWER_INTEGER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ANSWER_INTEGER_EXT] = $enc; + } + } else { + $a[self::FIELD_ANSWER_INTEGER] = $v; + } } if (null !== ($v = $this->getAnswerString())) { - $a[self::FIELD_ANSWER_STRING] = $v->getValue(); - $a[self::FIELD_ANSWER_STRING_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ANSWER_STRING] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ANSWER_STRING_EXT] = $enc; + } + } else { + $a[self::FIELD_ANSWER_STRING] = $v; + } } if ([] !== ($vs = $this->getChoice())) { $a[self::FIELD_CHOICE] = $vs; @@ -2991,16 +3129,37 @@ public function jsonSerialize() $a[self::FIELD_DATA_ATTACHMENT] = $v; } if (null !== ($v = $this->getDataBase64Binary())) { - $a[self::FIELD_DATA_BASE_64BINARY] = $v->getValue(); - $a[self::FIELD_DATA_BASE_64BINARY_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATA_BASE_64BINARY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATA_BASE_64BINARY_EXT] = $enc; + } + } else { + $a[self::FIELD_DATA_BASE_64BINARY] = $v; + } } if (null !== ($v = $this->getDataBoolean())) { - $a[self::FIELD_DATA_BOOLEAN] = $v->getValue(); - $a[self::FIELD_DATA_BOOLEAN_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATA_BOOLEAN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATA_BOOLEAN_EXT] = $enc; + } + } else { + $a[self::FIELD_DATA_BOOLEAN] = $v; + } } if (null !== ($v = $this->getDataCode())) { - $a[self::FIELD_DATA_CODE] = $v->getValue(); - $a[self::FIELD_DATA_CODE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATA_CODE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATA_CODE_EXT] = $enc; + } + } else { + $a[self::FIELD_DATA_CODE] = $v; + } } if (null !== ($v = $this->getDataCodeableConcept())) { $a[self::FIELD_DATA_CODEABLE_CONCEPT] = $v; @@ -3009,47 +3168,120 @@ public function jsonSerialize() $a[self::FIELD_DATA_CODING] = $v; } if (null !== ($v = $this->getDataContact())) { - $a[self::FIELD_DATA_CONTACT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATA_CONTACT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATA_CONTACT_EXT] = $enc; + } + } else { + $a[self::FIELD_DATA_CONTACT] = $v; + } } if (null !== ($v = $this->getDataDate())) { - $a[self::FIELD_DATA_DATE] = $v->getValue(); - $a[self::FIELD_DATA_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATA_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATA_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_DATA_DATE] = $v; + } } if (null !== ($v = $this->getDataDateTime())) { - $a[self::FIELD_DATA_DATE_TIME] = $v->getValue(); - $a[self::FIELD_DATA_DATE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATA_DATE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATA_DATE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_DATA_DATE_TIME] = $v; + } } if (null !== ($v = $this->getDataDecimal())) { - $a[self::FIELD_DATA_DECIMAL] = $v->getValue(); - $a[self::FIELD_DATA_DECIMAL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATA_DECIMAL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATA_DECIMAL_EXT] = $enc; + } + } else { + $a[self::FIELD_DATA_DECIMAL] = $v; + } } if (null !== ($v = $this->getDataHumanName())) { $a[self::FIELD_DATA_HUMAN_NAME] = $v; } if (null !== ($v = $this->getDataId())) { - $a[self::FIELD_DATA_ID] = $v->getValue(); - $a[self::FIELD_DATA_ID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATA_ID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATA_ID_EXT] = $enc; + } + } else { + $a[self::FIELD_DATA_ID] = $v; + } } if (null !== ($v = $this->getDataIdentifier())) { - $a[self::FIELD_DATA_IDENTIFIER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATA_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATA_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_DATA_IDENTIFIER] = $v; + } } if (null !== ($v = $this->getDataInstant())) { - $a[self::FIELD_DATA_INSTANT] = $v->getValue(); - $a[self::FIELD_DATA_INSTANT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATA_INSTANT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATA_INSTANT_EXT] = $enc; + } + } else { + $a[self::FIELD_DATA_INSTANT] = $v; + } } if (null !== ($v = $this->getDataInteger())) { - $a[self::FIELD_DATA_INTEGER] = $v->getValue(); - $a[self::FIELD_DATA_INTEGER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATA_INTEGER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATA_INTEGER_EXT] = $enc; + } + } else { + $a[self::FIELD_DATA_INTEGER] = $v; + } } if (null !== ($v = $this->getDataOid())) { - $a[self::FIELD_DATA_OID] = $v->getValue(); - $a[self::FIELD_DATA_OID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATA_OID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATA_OID_EXT] = $enc; + } + } else { + $a[self::FIELD_DATA_OID] = $v; + } } if (null !== ($v = $this->getDataPeriod())) { $a[self::FIELD_DATA_PERIOD] = $v; } if (null !== ($v = $this->getDataQuantity())) { - $a[self::FIELD_DATA_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATA_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATA_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_DATA_QUANTITY] = $v; + } } if (null !== ($v = $this->getDataRange())) { $a[self::FIELD_DATA_RANGE] = $v; @@ -3067,16 +3299,37 @@ public function jsonSerialize() $a[self::FIELD_DATA_SCHEDULE] = $v; } if (null !== ($v = $this->getDataString())) { - $a[self::FIELD_DATA_STRING] = $v->getValue(); - $a[self::FIELD_DATA_STRING_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATA_STRING] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATA_STRING_EXT] = $enc; + } + } else { + $a[self::FIELD_DATA_STRING] = $v; + } } if (null !== ($v = $this->getDataUri())) { - $a[self::FIELD_DATA_URI] = $v->getValue(); - $a[self::FIELD_DATA_URI_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATA_URI] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATA_URI_EXT] = $enc; + } + } else { + $a[self::FIELD_DATA_URI] = $v; + } } if (null !== ($v = $this->getDataUuid())) { - $a[self::FIELD_DATA_UUID] = $v->getValue(); - $a[self::FIELD_DATA_UUID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATA_UUID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATA_UUID_EXT] = $enc; + } + } else { + $a[self::FIELD_DATA_UUID] = $v; + } } if ([] !== ($vs = $this->getGroup())) { $a[self::FIELD_GROUP] = $vs; @@ -3088,12 +3341,26 @@ public function jsonSerialize() $a[self::FIELD_OPTIONS] = $v; } if (null !== ($v = $this->getRemarks())) { - $a[self::FIELD_REMARKS] = $v->getValue(); - $a[self::FIELD_REMARKS_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_REMARKS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_REMARKS_EXT] = $enc; + } + } else { + $a[self::FIELD_REMARKS] = $v; + } } if (null !== ($v = $this->getText())) { - $a[self::FIELD_TEXT] = $v->getValue(); - $a[self::FIELD_TEXT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TEXT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TEXT_EXT] = $enc; + } + } else { + $a[self::FIELD_TEXT] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource.php index 40d66efdaa..71227e2a55 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -76,10 +76,6 @@ class FHIRResource extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_RESOURCE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CONTAINED = 'contained'; const FIELD_LANGUAGE = 'language'; const FIELD_LANGUAGE_EXT = '_language'; @@ -118,6 +114,9 @@ class FHIRResource extends FHIRBackboneElement */ protected $text = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRResource Constructor * @param null|array $data @@ -158,8 +157,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_LANGUAGE] instanceof FHIRCode) { $this->setLanguage($data[self::FIELD_LANGUAGE]); - } elseif ($ext && is_scalar($data[self::FIELD_LANGUAGE])) { - $this->setLanguage(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_LANGUAGE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_LANGUAGE])) { + $this->setLanguage(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_LANGUAGE]] + $ext)); + } else if (is_array($data[self::FIELD_LANGUAGE])) { + $this->setLanguage(new FHIRCode(array_merge($ext, $data[self::FIELD_LANGUAGE]))); + } } else { $this->setLanguage(new FHIRCode($data[self::FIELD_LANGUAGE])); } @@ -433,7 +436,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getContained())) { foreach($vs as $v) { if (null === $v) { @@ -442,10 +444,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_CONTAINED, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getLanguage())) { $v->xmlSerialize($sxe->addChild(self::FIELD_LANGUAGE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getText())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TEXT, null, $v->_getFHIRXMLNamespace())); } @@ -462,8 +464,15 @@ public function jsonSerialize() $a[self::FIELD_CONTAINED] = $vs; } if (null !== ($v = $this->getLanguage())) { - $a[self::FIELD_LANGUAGE] = $v->getValue(); - $a[self::FIELD_LANGUAGE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_LANGUAGE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_LANGUAGE_EXT] = $enc; + } + } else { + $a[self::FIELD_LANGUAGE] = $v; + } } if (null !== ($v = $this->getText())) { $a[self::FIELD_TEXT] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRAdverseReaction.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRAdverseReaction.php index 64cff8207c..b2c6f86720 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRAdverseReaction.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRAdverseReaction.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRAdverseReaction extends FHIRResource implements PHPFHIRContainedTypeIn { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ADVERSE_REACTION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DATE = 'date'; const FIELD_DATE_EXT = '_date'; const FIELD_DID_NOT_OCCUR_FLAG = 'didNotOccurFlag'; @@ -175,6 +171,9 @@ class FHIRAdverseReaction extends FHIRResource implements PHPFHIRContainedTypeIn */ protected $symptom = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRAdverseReaction Constructor * @param null|array $data @@ -197,8 +196,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATE] instanceof FHIRDateTime) { $this->setDate($data[self::FIELD_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_DATE])) { - $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime(array_merge($ext, $data[self::FIELD_DATE]))); + } } else { $this->setDate(new FHIRDateTime($data[self::FIELD_DATE])); } @@ -209,8 +212,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DID_NOT_OCCUR_FLAG] instanceof FHIRBoolean) { $this->setDidNotOccurFlag($data[self::FIELD_DID_NOT_OCCUR_FLAG]); - } elseif ($ext && is_scalar($data[self::FIELD_DID_NOT_OCCUR_FLAG])) { - $this->setDidNotOccurFlag(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_DID_NOT_OCCUR_FLAG]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DID_NOT_OCCUR_FLAG])) { + $this->setDidNotOccurFlag(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_DID_NOT_OCCUR_FLAG]] + $ext)); + } else if (is_array($data[self::FIELD_DID_NOT_OCCUR_FLAG])) { + $this->setDidNotOccurFlag(new FHIRBoolean(array_merge($ext, $data[self::FIELD_DID_NOT_OCCUR_FLAG]))); + } } else { $this->setDidNotOccurFlag(new FHIRBoolean($data[self::FIELD_DID_NOT_OCCUR_FLAG])); } @@ -218,6 +225,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_EXPOSURE])) { if (is_array($data[self::FIELD_EXPOSURE])) { foreach($data[self::FIELD_EXPOSURE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRAdverseReactionExposure) { $this->addExposure($v); } else { @@ -236,17 +246,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -269,6 +286,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SYMPTOM])) { if (is_array($data[self::FIELD_SYMPTOM])) { foreach($data[self::FIELD_SYMPTOM] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRAdverseReactionSymptom) { $this->addSymptom($v); } else { @@ -740,7 +760,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDidNotOccurFlag())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DID_NOT_OCCUR_FLAG, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getExposure())) { foreach($vs as $v) { if (null === $v) { @@ -762,11 +781,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getRecorder())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RECORDER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSubject())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBJECT, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getSymptom())) { foreach($vs as $v) { if (null === $v) { @@ -775,6 +792,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_SYMPTOM, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } @@ -785,18 +803,48 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getDate())) { - $a[self::FIELD_DATE] = $v->getValue(); - $a[self::FIELD_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_DATE] = $v; + } } if (null !== ($v = $this->getDidNotOccurFlag())) { - $a[self::FIELD_DID_NOT_OCCUR_FLAG] = $v->getValue(); - $a[self::FIELD_DID_NOT_OCCUR_FLAG_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DID_NOT_OCCUR_FLAG] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DID_NOT_OCCUR_FLAG_EXT] = $enc; + } + } else { + $a[self::FIELD_DID_NOT_OCCUR_FLAG] = $v; + } } if ([] !== ($vs = $this->getExposure())) { $a[self::FIELD_EXPOSURE] = $vs; } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if (null !== ($v = $this->getRecorder())) { $a[self::FIELD_RECORDER] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRAlert.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRAlert.php index 90f323e5c5..7e73b240f4 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRAlert.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRAlert.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRAlert extends FHIRResource implements PHPFHIRContainedTypeInterface { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ALERT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_AUTHOR = 'author'; const FIELD_CATEGORY = 'category'; const FIELD_IDENTIFIER = 'identifier'; @@ -160,6 +156,9 @@ class FHIRAlert extends FHIRResource implements PHPFHIRContainedTypeInterface */ protected $subject = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRAlert Constructor * @param null|array $data @@ -196,17 +195,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -218,8 +224,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NOTE] instanceof FHIRString) { $this->setNote($data[self::FIELD_NOTE]); - } elseif ($ext && is_scalar($data[self::FIELD_NOTE])) { - $this->setNote(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NOTE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NOTE])) { + $this->setNote(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NOTE]] + $ext)); + } else if (is_array($data[self::FIELD_NOTE])) { + $this->setNote(new FHIRString(array_merge($ext, $data[self::FIELD_NOTE]))); + } } else { $this->setNote(new FHIRString($data[self::FIELD_NOTE])); } @@ -230,8 +240,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRAlertStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRAlertStatus([FHIRAlertStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRAlertStatus([FHIRAlertStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRAlertStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRAlertStatus($data[self::FIELD_STATUS])); } @@ -594,15 +608,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getAuthor())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AUTHOR, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getCategory())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CATEGORY, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -611,14 +622,13 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getNote())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NOTE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSubject())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBJECT, null, $v->_getFHIRXMLNamespace())); } @@ -638,14 +648,45 @@ public function jsonSerialize() $a[self::FIELD_CATEGORY] = $v; } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if (null !== ($v = $this->getNote())) { - $a[self::FIELD_NOTE] = $v->getValue(); - $a[self::FIELD_NOTE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NOTE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NOTE_EXT] = $enc; + } + } else { + $a[self::FIELD_NOTE] = $v; + } } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getSubject())) { $a[self::FIELD_SUBJECT] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRAllergyIntolerance.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRAllergyIntolerance.php index d986d06060..67a3cfe9a7 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRAllergyIntolerance.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRAllergyIntolerance.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRAllergyIntolerance extends FHIRResource implements PHPFHIRContainedTyp { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ALLERGY_INTOLERANCE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CRITICALITY = 'criticality'; const FIELD_CRITICALITY_EXT = '_criticality'; const FIELD_IDENTIFIER = 'identifier'; @@ -212,6 +208,9 @@ class FHIRAllergyIntolerance extends FHIRResource implements PHPFHIRContainedTyp */ protected $substance = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRAllergyIntolerance Constructor * @param null|array $data @@ -234,8 +233,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CRITICALITY] instanceof FHIRCriticality) { $this->setCriticality($data[self::FIELD_CRITICALITY]); - } elseif ($ext && is_scalar($data[self::FIELD_CRITICALITY])) { - $this->setCriticality(new FHIRCriticality([FHIRCriticality::FIELD_VALUE => $data[self::FIELD_CRITICALITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CRITICALITY])) { + $this->setCriticality(new FHIRCriticality([FHIRCriticality::FIELD_VALUE => $data[self::FIELD_CRITICALITY]] + $ext)); + } else if (is_array($data[self::FIELD_CRITICALITY])) { + $this->setCriticality(new FHIRCriticality(array_merge($ext, $data[self::FIELD_CRITICALITY]))); + } } else { $this->setCriticality(new FHIRCriticality($data[self::FIELD_CRITICALITY])); } @@ -246,17 +249,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -265,6 +275,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REACTION])) { if (is_array($data[self::FIELD_REACTION])) { foreach($data[self::FIELD_REACTION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRResourceReference) { $this->addReaction($v); } else { @@ -283,8 +296,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_RECORDED_DATE] instanceof FHIRDateTime) { $this->setRecordedDate($data[self::FIELD_RECORDED_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_RECORDED_DATE])) { - $this->setRecordedDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_RECORDED_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_RECORDED_DATE])) { + $this->setRecordedDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_RECORDED_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_RECORDED_DATE])) { + $this->setRecordedDate(new FHIRDateTime(array_merge($ext, $data[self::FIELD_RECORDED_DATE]))); + } } else { $this->setRecordedDate(new FHIRDateTime($data[self::FIELD_RECORDED_DATE])); } @@ -299,6 +316,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SENSITIVITY_TEST])) { if (is_array($data[self::FIELD_SENSITIVITY_TEST])) { foreach($data[self::FIELD_SENSITIVITY_TEST] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRResourceReference) { $this->addSensitivityTest($v); } else { @@ -317,8 +337,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SENSITIVITY_TYPE] instanceof FHIRSensitivityType) { $this->setSensitivityType($data[self::FIELD_SENSITIVITY_TYPE]); - } elseif ($ext && is_scalar($data[self::FIELD_SENSITIVITY_TYPE])) { - $this->setSensitivityType(new FHIRSensitivityType([FHIRSensitivityType::FIELD_VALUE => $data[self::FIELD_SENSITIVITY_TYPE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SENSITIVITY_TYPE])) { + $this->setSensitivityType(new FHIRSensitivityType([FHIRSensitivityType::FIELD_VALUE => $data[self::FIELD_SENSITIVITY_TYPE]] + $ext)); + } else if (is_array($data[self::FIELD_SENSITIVITY_TYPE])) { + $this->setSensitivityType(new FHIRSensitivityType(array_merge($ext, $data[self::FIELD_SENSITIVITY_TYPE]))); + } } else { $this->setSensitivityType(new FHIRSensitivityType($data[self::FIELD_SENSITIVITY_TYPE])); } @@ -329,8 +353,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRSensitivityStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRSensitivityStatus([FHIRSensitivityStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRSensitivityStatus([FHIRSensitivityStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRSensitivityStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRSensitivityStatus($data[self::FIELD_STATUS])); } @@ -890,11 +918,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getCriticality())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CRITICALITY, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -912,14 +938,13 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_REACTION, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getRecordedDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RECORDED_DATE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRecorder())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RECORDER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getSensitivityTest())) { foreach($vs as $v) { if (null === $v) { @@ -932,15 +957,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getSensitivityType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SENSITIVITY_TYPE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSubject())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBJECT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSubstance())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBSTANCE, null, $v->_getFHIRXMLNamespace())); } @@ -954,17 +976,48 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getCriticality())) { - $a[self::FIELD_CRITICALITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CRITICALITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CRITICALITY_EXT] = $enc; + } + } else { + $a[self::FIELD_CRITICALITY] = $v; + } } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if ([] !== ($vs = $this->getReaction())) { $a[self::FIELD_REACTION] = $vs; } if (null !== ($v = $this->getRecordedDate())) { - $a[self::FIELD_RECORDED_DATE] = $v->getValue(); - $a[self::FIELD_RECORDED_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_RECORDED_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_RECORDED_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_RECORDED_DATE] = $v; + } } if (null !== ($v = $this->getRecorder())) { $a[self::FIELD_RECORDER] = $v; @@ -973,10 +1026,26 @@ public function jsonSerialize() $a[self::FIELD_SENSITIVITY_TEST] = $vs; } if (null !== ($v = $this->getSensitivityType())) { - $a[self::FIELD_SENSITIVITY_TYPE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SENSITIVITY_TYPE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SENSITIVITY_TYPE_EXT] = $enc; + } + } else { + $a[self::FIELD_SENSITIVITY_TYPE] = $v; + } } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getSubject())) { $a[self::FIELD_SUBJECT] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRCarePlan.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRCarePlan.php index 373f58e3b2..6d6698676f 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRCarePlan.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRCarePlan.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -84,10 +84,6 @@ class FHIRCarePlan extends FHIRResource implements PHPFHIRContainedTypeInterface { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CARE_PLAN; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ACTIVITY = 'activity'; const FIELD_CONCERN = 'concern'; const FIELD_GOAL = 'goal'; @@ -221,6 +217,9 @@ class FHIRCarePlan extends FHIRResource implements PHPFHIRContainedTypeInterface */ protected $status = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRCarePlan Constructor * @param null|array $data @@ -240,6 +239,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ACTIVITY])) { if (is_array($data[self::FIELD_ACTIVITY])) { foreach($data[self::FIELD_ACTIVITY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCarePlanActivity) { $this->addActivity($v); } else { @@ -255,6 +257,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CONCERN])) { if (is_array($data[self::FIELD_CONCERN])) { foreach($data[self::FIELD_CONCERN] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRResourceReference) { $this->addConcern($v); } else { @@ -270,6 +275,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_GOAL])) { if (is_array($data[self::FIELD_GOAL])) { foreach($data[self::FIELD_GOAL] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCarePlanGoal) { $this->addGoal($v); } else { @@ -288,17 +296,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -310,8 +325,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MODIFIED] instanceof FHIRDateTime) { $this->setModified($data[self::FIELD_MODIFIED]); - } elseif ($ext && is_scalar($data[self::FIELD_MODIFIED])) { - $this->setModified(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_MODIFIED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MODIFIED])) { + $this->setModified(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_MODIFIED]] + $ext)); + } else if (is_array($data[self::FIELD_MODIFIED])) { + $this->setModified(new FHIRDateTime(array_merge($ext, $data[self::FIELD_MODIFIED]))); + } } else { $this->setModified(new FHIRDateTime($data[self::FIELD_MODIFIED])); } @@ -322,8 +341,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NOTES] instanceof FHIRString) { $this->setNotes($data[self::FIELD_NOTES]); - } elseif ($ext && is_scalar($data[self::FIELD_NOTES])) { - $this->setNotes(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NOTES]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NOTES])) { + $this->setNotes(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NOTES]] + $ext)); + } else if (is_array($data[self::FIELD_NOTES])) { + $this->setNotes(new FHIRString(array_merge($ext, $data[self::FIELD_NOTES]))); + } } else { $this->setNotes(new FHIRString($data[self::FIELD_NOTES])); } @@ -331,6 +354,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PARTICIPANT])) { if (is_array($data[self::FIELD_PARTICIPANT])) { foreach($data[self::FIELD_PARTICIPANT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCarePlanParticipant) { $this->addParticipant($v); } else { @@ -363,8 +389,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRCarePlanStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRCarePlanStatus([FHIRCarePlanStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRCarePlanStatus([FHIRCarePlanStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRCarePlanStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRCarePlanStatus($data[self::FIELD_STATUS])); } @@ -992,7 +1022,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getActivity())) { foreach($vs as $v) { if (null === $v) { @@ -1028,13 +1057,13 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getModified())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MODIFIED, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getNotes())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NOTES, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getParticipant())) { foreach($vs as $v) { if (null === $v) { @@ -1047,11 +1076,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getPatient())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATIENT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } @@ -1074,15 +1101,45 @@ public function jsonSerialize() $a[self::FIELD_GOAL] = $vs; } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if (null !== ($v = $this->getModified())) { - $a[self::FIELD_MODIFIED] = $v->getValue(); - $a[self::FIELD_MODIFIED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MODIFIED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MODIFIED_EXT] = $enc; + } + } else { + $a[self::FIELD_MODIFIED] = $v; + } } if (null !== ($v = $this->getNotes())) { - $a[self::FIELD_NOTES] = $v->getValue(); - $a[self::FIELD_NOTES_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NOTES] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NOTES_EXT] = $enc; + } + } else { + $a[self::FIELD_NOTES] = $v; + } } if ([] !== ($vs = $this->getParticipant())) { $a[self::FIELD_PARTICIPANT] = $vs; @@ -1094,7 +1151,15 @@ public function jsonSerialize() $a[self::FIELD_PERIOD] = $v; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRComposition.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRComposition.php index ea812dad71..17425e326f 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRComposition.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRComposition.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -86,10 +86,6 @@ class FHIRComposition extends FHIRResource implements PHPFHIRContainedTypeInterf { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_COMPOSITION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ATTESTER = 'attester'; const FIELD_AUTHOR = 'author'; const FIELD_CLASS = 'class'; @@ -281,6 +277,9 @@ class FHIRComposition extends FHIRResource implements PHPFHIRContainedTypeInterf */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRComposition Constructor * @param null|array $data @@ -300,6 +299,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ATTESTER])) { if (is_array($data[self::FIELD_ATTESTER])) { foreach($data[self::FIELD_ATTESTER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCompositionAttester) { $this->addAttester($v); } else { @@ -315,6 +317,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_AUTHOR])) { if (is_array($data[self::FIELD_AUTHOR])) { foreach($data[self::FIELD_AUTHOR] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRResourceReference) { $this->addAuthor($v); } else { @@ -354,8 +359,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATE] instanceof FHIRDateTime) { $this->setDate($data[self::FIELD_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_DATE])) { - $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime(array_merge($ext, $data[self::FIELD_DATE]))); + } } else { $this->setDate(new FHIRDateTime($data[self::FIELD_DATE])); } @@ -380,8 +389,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->setIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { - $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_IDENTIFIER]))); + } } else { $this->setIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); } @@ -389,6 +402,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SECTION])) { if (is_array($data[self::FIELD_SECTION])) { foreach($data[self::FIELD_SECTION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCompositionSection) { $this->addSection($v); } else { @@ -407,8 +423,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRCompositionStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRCompositionStatus([FHIRCompositionStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRCompositionStatus([FHIRCompositionStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRCompositionStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRCompositionStatus($data[self::FIELD_STATUS])); } @@ -426,8 +446,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TITLE] instanceof FHIRString) { $this->setTitle($data[self::FIELD_TITLE]); - } elseif ($ext && is_scalar($data[self::FIELD_TITLE])) { - $this->setTitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TITLE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TITLE])) { + $this->setTitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TITLE]] + $ext)); + } else if (is_array($data[self::FIELD_TITLE])) { + $this->setTitle(new FHIRString(array_merge($ext, $data[self::FIELD_TITLE]))); + } } else { $this->setTitle(new FHIRString($data[self::FIELD_TITLE])); } @@ -1155,7 +1179,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getAttester())) { foreach($vs as $v) { if (null === $v) { @@ -1177,30 +1200,24 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getClass())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CLASS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getConfidentiality())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CONFIDENTIALITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getCustodian())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CUSTODIAN, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DATE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getEncounter())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ENCOUNTER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getEvent())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EVENT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getSection())) { foreach($vs as $v) { if (null === $v) { @@ -1213,14 +1230,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSubject())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBJECT, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getTitle())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TITLE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -1249,8 +1264,15 @@ public function jsonSerialize() $a[self::FIELD_CUSTODIAN] = $v; } if (null !== ($v = $this->getDate())) { - $a[self::FIELD_DATE] = $v->getValue(); - $a[self::FIELD_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_DATE] = $v; + } } if (null !== ($v = $this->getEncounter())) { $a[self::FIELD_ENCOUNTER] = $v; @@ -1259,20 +1281,43 @@ public function jsonSerialize() $a[self::FIELD_EVENT] = $v; } if (null !== ($v = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_IDENTIFIER] = $v; + } } if ([] !== ($vs = $this->getSection())) { $a[self::FIELD_SECTION] = $vs; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getSubject())) { $a[self::FIELD_SUBJECT] = $v; } if (null !== ($v = $this->getTitle())) { - $a[self::FIELD_TITLE] = $v->getValue(); - $a[self::FIELD_TITLE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TITLE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TITLE_EXT] = $enc; + } + } else { + $a[self::FIELD_TITLE] = $v; + } } if (null !== ($v = $this->getType())) { $a[self::FIELD_TYPE] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRConceptMap.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRConceptMap.php index 3ce366d8ab..f4aabb562a 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRConceptMap.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRConceptMap.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -81,10 +81,6 @@ class FHIRConceptMap extends FHIRResource implements PHPFHIRContainedTypeInterfa { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONCEPT_MAP; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CONCEPT = 'concept'; const FIELD_COPYRIGHT = 'copyright'; const FIELD_COPYRIGHT_EXT = '_copyright'; @@ -256,6 +252,9 @@ class FHIRConceptMap extends FHIRResource implements PHPFHIRContainedTypeInterfa */ protected $version = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRConceptMap Constructor * @param null|array $data @@ -275,6 +274,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CONCEPT])) { if (is_array($data[self::FIELD_CONCEPT])) { foreach($data[self::FIELD_CONCEPT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRConceptMapConcept) { $this->addConcept($v); } else { @@ -293,8 +295,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_COPYRIGHT] instanceof FHIRString) { $this->setCopyright($data[self::FIELD_COPYRIGHT]); - } elseif ($ext && is_scalar($data[self::FIELD_COPYRIGHT])) { - $this->setCopyright(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_COPYRIGHT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_COPYRIGHT])) { + $this->setCopyright(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_COPYRIGHT]] + $ext)); + } else if (is_array($data[self::FIELD_COPYRIGHT])) { + $this->setCopyright(new FHIRString(array_merge($ext, $data[self::FIELD_COPYRIGHT]))); + } } else { $this->setCopyright(new FHIRString($data[self::FIELD_COPYRIGHT])); } @@ -305,8 +311,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATE] instanceof FHIRDateTime) { $this->setDate($data[self::FIELD_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_DATE])) { - $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime(array_merge($ext, $data[self::FIELD_DATE]))); + } } else { $this->setDate(new FHIRDateTime($data[self::FIELD_DATE])); } @@ -317,8 +327,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -329,8 +343,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EXPERIMENTAL] instanceof FHIRBoolean) { $this->setExperimental($data[self::FIELD_EXPERIMENTAL]); - } elseif ($ext && is_scalar($data[self::FIELD_EXPERIMENTAL])) { - $this->setExperimental(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_EXPERIMENTAL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EXPERIMENTAL])) { + $this->setExperimental(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_EXPERIMENTAL]] + $ext)); + } else if (is_array($data[self::FIELD_EXPERIMENTAL])) { + $this->setExperimental(new FHIRBoolean(array_merge($ext, $data[self::FIELD_EXPERIMENTAL]))); + } } else { $this->setExperimental(new FHIRBoolean($data[self::FIELD_EXPERIMENTAL])); } @@ -341,8 +359,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IDENTIFIER] instanceof FHIRString) { $this->setIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { - $this->setIdentifier(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRString(array_merge($ext, $data[self::FIELD_IDENTIFIER]))); + } } else { $this->setIdentifier(new FHIRString($data[self::FIELD_IDENTIFIER])); } @@ -353,8 +375,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -365,8 +391,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PUBLISHER] instanceof FHIRString) { $this->setPublisher($data[self::FIELD_PUBLISHER]); - } elseif ($ext && is_scalar($data[self::FIELD_PUBLISHER])) { - $this->setPublisher(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PUBLISHER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PUBLISHER])) { + $this->setPublisher(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PUBLISHER]] + $ext)); + } else if (is_array($data[self::FIELD_PUBLISHER])) { + $this->setPublisher(new FHIRString(array_merge($ext, $data[self::FIELD_PUBLISHER]))); + } } else { $this->setPublisher(new FHIRString($data[self::FIELD_PUBLISHER])); } @@ -384,8 +414,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRValueSetStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRValueSetStatus([FHIRValueSetStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRValueSetStatus([FHIRValueSetStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRValueSetStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRValueSetStatus($data[self::FIELD_STATUS])); } @@ -403,17 +437,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_TELECOM])) { foreach($data[self::FIELD_TELECOM] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContact) { $this->addTelecom($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addTelecom(new FHIRContact([FHIRContact::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addTelecom(new FHIRContact([FHIRContact::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addTelecom(new FHIRContact(array_merge($v, $ext[$i]))); + } } else { $this->addTelecom(new FHIRContact($v)); } } } elseif ($data[self::FIELD_TELECOM] instanceof FHIRContact) { $this->addTelecom($data[self::FIELD_TELECOM]); - } elseif ($ext && is_scalar($data[self::FIELD_TELECOM])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_TELECOM])) { $this->addTelecom(new FHIRContact([FHIRContact::FIELD_VALUE => $data[self::FIELD_TELECOM]] + $ext)); } else { $this->addTelecom(new FHIRContact($data[self::FIELD_TELECOM])); @@ -425,8 +466,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VERSION] instanceof FHIRString) { $this->setVersion($data[self::FIELD_VERSION]); - } elseif ($ext && is_scalar($data[self::FIELD_VERSION])) { - $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } else if (is_array($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString(array_merge($ext, $data[self::FIELD_VERSION]))); + } } else { $this->setVersion(new FHIRString($data[self::FIELD_VERSION])); } @@ -1122,7 +1167,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getConcept())) { foreach($vs as $v) { if (null === $v) { @@ -1131,6 +1175,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_CONCEPT, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getCopyright())) { $v->xmlSerialize($sxe->addChild(self::FIELD_COPYRIGHT, null, $v->_getFHIRXMLNamespace())); } @@ -1152,19 +1197,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getPublisher())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PUBLISHER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSource())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SOURCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getTarget())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TARGET, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getTelecom())) { foreach($vs as $v) { if (null === $v) { @@ -1173,6 +1214,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_TELECOM, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getVersion())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VERSION, null, $v->_getFHIRXMLNamespace())); } @@ -1189,48 +1231,128 @@ public function jsonSerialize() $a[self::FIELD_CONCEPT] = $vs; } if (null !== ($v = $this->getCopyright())) { - $a[self::FIELD_COPYRIGHT] = $v->getValue(); - $a[self::FIELD_COPYRIGHT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_COPYRIGHT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_COPYRIGHT_EXT] = $enc; + } + } else { + $a[self::FIELD_COPYRIGHT] = $v; + } } if (null !== ($v = $this->getDate())) { - $a[self::FIELD_DATE] = $v->getValue(); - $a[self::FIELD_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_DATE] = $v; + } } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if (null !== ($v = $this->getExperimental())) { - $a[self::FIELD_EXPERIMENTAL] = $v->getValue(); - $a[self::FIELD_EXPERIMENTAL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EXPERIMENTAL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EXPERIMENTAL_EXT] = $enc; + } + } else { + $a[self::FIELD_EXPERIMENTAL] = $v; + } } if (null !== ($v = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $v->getValue(); - $a[self::FIELD_IDENTIFIER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_IDENTIFIER] = $v; + } } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if (null !== ($v = $this->getPublisher())) { - $a[self::FIELD_PUBLISHER] = $v->getValue(); - $a[self::FIELD_PUBLISHER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PUBLISHER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PUBLISHER_EXT] = $enc; + } + } else { + $a[self::FIELD_PUBLISHER] = $v; + } } if (null !== ($v = $this->getSource())) { $a[self::FIELD_SOURCE] = $v; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getTarget())) { $a[self::FIELD_TARGET] = $v; } if ([] !== ($vs = $this->getTelecom())) { - $a[self::FIELD_TELECOM] = $vs; + $a[self::FIELD_TELECOM] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TELECOM][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TELECOM_EXT][] = $enc; + } else { + $a[self::FIELD_TELECOM_EXT][] = null; + } + } else { + $a[self::FIELD_TELECOM][] = $v; + } + } } if (null !== ($v = $this->getVersion())) { - $a[self::FIELD_VERSION] = $v->getValue(); - $a[self::FIELD_VERSION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VERSION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VERSION_EXT] = $enc; + } + } else { + $a[self::FIELD_VERSION] = $v; + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRCondition.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRCondition.php index 26f43727da..98d9252393 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRCondition.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRCondition.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -88,11 +88,8 @@ class FHIRCondition extends FHIRResource implements PHPFHIRContainedTypeInterfac { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONDITION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ABATEMENT_AGE = 'abatementAge'; + const FIELD_ABATEMENT_AGE_EXT = '_abatementAge'; const FIELD_ABATEMENT_BOOLEAN = 'abatementBoolean'; const FIELD_ABATEMENT_BOOLEAN_EXT = '_abatementBoolean'; const FIELD_ABATEMENT_DATE = 'abatementDate'; @@ -111,6 +108,7 @@ class FHIRCondition extends FHIRResource implements PHPFHIRContainedTypeInterfac const FIELD_NOTES = 'notes'; const FIELD_NOTES_EXT = '_notes'; const FIELD_ONSET_AGE = 'onsetAge'; + const FIELD_ONSET_AGE_EXT = '_onsetAge'; const FIELD_ONSET_DATE = 'onsetDate'; const FIELD_ONSET_DATE_EXT = '_onsetDate'; const FIELD_RELATED_ITEM = 'relatedItem'; @@ -360,6 +358,9 @@ class FHIRCondition extends FHIRResource implements PHPFHIRContainedTypeInterfac */ protected $subject = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRCondition Constructor * @param null|array $data @@ -377,8 +378,17 @@ public function __construct($data = null) } parent::__construct($data); if (isset($data[self::FIELD_ABATEMENT_AGE])) { + $ext = (isset($data[self::FIELD_ABATEMENT_AGE_EXT]) && is_array($data[self::FIELD_ABATEMENT_AGE_EXT])) + ? $data[self::FIELD_ABATEMENT_AGE_EXT] + : null; if ($data[self::FIELD_ABATEMENT_AGE] instanceof FHIRAge) { $this->setAbatementAge($data[self::FIELD_ABATEMENT_AGE]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ABATEMENT_AGE])) { + $this->setAbatementAge(new FHIRAge([FHIRAge::FIELD_VALUE => $data[self::FIELD_ABATEMENT_AGE]] + $ext)); + } else if (is_array($data[self::FIELD_ABATEMENT_AGE])) { + $this->setAbatementAge(new FHIRAge(array_merge($ext, $data[self::FIELD_ABATEMENT_AGE]))); + } } else { $this->setAbatementAge(new FHIRAge($data[self::FIELD_ABATEMENT_AGE])); } @@ -389,8 +399,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ABATEMENT_BOOLEAN] instanceof FHIRBoolean) { $this->setAbatementBoolean($data[self::FIELD_ABATEMENT_BOOLEAN]); - } elseif ($ext && is_scalar($data[self::FIELD_ABATEMENT_BOOLEAN])) { - $this->setAbatementBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_ABATEMENT_BOOLEAN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ABATEMENT_BOOLEAN])) { + $this->setAbatementBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_ABATEMENT_BOOLEAN]] + $ext)); + } else if (is_array($data[self::FIELD_ABATEMENT_BOOLEAN])) { + $this->setAbatementBoolean(new FHIRBoolean(array_merge($ext, $data[self::FIELD_ABATEMENT_BOOLEAN]))); + } } else { $this->setAbatementBoolean(new FHIRBoolean($data[self::FIELD_ABATEMENT_BOOLEAN])); } @@ -401,8 +415,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ABATEMENT_DATE] instanceof FHIRDate) { $this->setAbatementDate($data[self::FIELD_ABATEMENT_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_ABATEMENT_DATE])) { - $this->setAbatementDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_ABATEMENT_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ABATEMENT_DATE])) { + $this->setAbatementDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_ABATEMENT_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_ABATEMENT_DATE])) { + $this->setAbatementDate(new FHIRDate(array_merge($ext, $data[self::FIELD_ABATEMENT_DATE]))); + } } else { $this->setAbatementDate(new FHIRDate($data[self::FIELD_ABATEMENT_DATE])); } @@ -441,8 +459,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATE_ASSERTED] instanceof FHIRDate) { $this->setDateAsserted($data[self::FIELD_DATE_ASSERTED]); - } elseif ($ext && is_scalar($data[self::FIELD_DATE_ASSERTED])) { - $this->setDateAsserted(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_DATE_ASSERTED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATE_ASSERTED])) { + $this->setDateAsserted(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_DATE_ASSERTED]] + $ext)); + } else if (is_array($data[self::FIELD_DATE_ASSERTED])) { + $this->setDateAsserted(new FHIRDate(array_merge($ext, $data[self::FIELD_DATE_ASSERTED]))); + } } else { $this->setDateAsserted(new FHIRDate($data[self::FIELD_DATE_ASSERTED])); } @@ -457,6 +479,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_EVIDENCE])) { if (is_array($data[self::FIELD_EVIDENCE])) { foreach($data[self::FIELD_EVIDENCE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRConditionEvidence) { $this->addEvidence($v); } else { @@ -475,17 +500,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -494,6 +526,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_LOCATION])) { if (is_array($data[self::FIELD_LOCATION])) { foreach($data[self::FIELD_LOCATION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRConditionLocation) { $this->addLocation($v); } else { @@ -512,15 +547,28 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NOTES] instanceof FHIRString) { $this->setNotes($data[self::FIELD_NOTES]); - } elseif ($ext && is_scalar($data[self::FIELD_NOTES])) { - $this->setNotes(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NOTES]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NOTES])) { + $this->setNotes(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NOTES]] + $ext)); + } else if (is_array($data[self::FIELD_NOTES])) { + $this->setNotes(new FHIRString(array_merge($ext, $data[self::FIELD_NOTES]))); + } } else { $this->setNotes(new FHIRString($data[self::FIELD_NOTES])); } } if (isset($data[self::FIELD_ONSET_AGE])) { + $ext = (isset($data[self::FIELD_ONSET_AGE_EXT]) && is_array($data[self::FIELD_ONSET_AGE_EXT])) + ? $data[self::FIELD_ONSET_AGE_EXT] + : null; if ($data[self::FIELD_ONSET_AGE] instanceof FHIRAge) { $this->setOnsetAge($data[self::FIELD_ONSET_AGE]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ONSET_AGE])) { + $this->setOnsetAge(new FHIRAge([FHIRAge::FIELD_VALUE => $data[self::FIELD_ONSET_AGE]] + $ext)); + } else if (is_array($data[self::FIELD_ONSET_AGE])) { + $this->setOnsetAge(new FHIRAge(array_merge($ext, $data[self::FIELD_ONSET_AGE]))); + } } else { $this->setOnsetAge(new FHIRAge($data[self::FIELD_ONSET_AGE])); } @@ -531,8 +579,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ONSET_DATE] instanceof FHIRDate) { $this->setOnsetDate($data[self::FIELD_ONSET_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_ONSET_DATE])) { - $this->setOnsetDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_ONSET_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ONSET_DATE])) { + $this->setOnsetDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_ONSET_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_ONSET_DATE])) { + $this->setOnsetDate(new FHIRDate(array_merge($ext, $data[self::FIELD_ONSET_DATE]))); + } } else { $this->setOnsetDate(new FHIRDate($data[self::FIELD_ONSET_DATE])); } @@ -540,6 +592,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_RELATED_ITEM])) { if (is_array($data[self::FIELD_RELATED_ITEM])) { foreach($data[self::FIELD_RELATED_ITEM] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRConditionRelatedItem) { $this->addRelatedItem($v); } else { @@ -572,8 +627,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRConditionStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRConditionStatus([FHIRConditionStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRConditionStatus([FHIRConditionStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRConditionStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRConditionStatus($data[self::FIELD_STATUS])); } @@ -1570,7 +1629,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getAbatementAge())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ABATEMENT_AGE, null, $v->_getFHIRXMLNamespace())); } @@ -1580,30 +1638,24 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getAbatementDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ABATEMENT_DATE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getAsserter())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ASSERTER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getCategory())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CATEGORY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getCertainty())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CERTAINTY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getDateAsserted())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DATE_ASSERTED, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getEncounter())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ENCOUNTER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getEvidence())) { foreach($vs as $v) { if (null === $v) { @@ -1630,17 +1682,16 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_LOCATION, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getNotes())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NOTES, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOnsetAge())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ONSET_AGE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getOnsetDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ONSET_DATE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getRelatedItem())) { foreach($vs as $v) { if (null === $v) { @@ -1653,15 +1704,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getSeverity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SEVERITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStage())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STAGE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSubject())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBJECT, null, $v->_getFHIRXMLNamespace())); } @@ -1675,15 +1723,37 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getAbatementAge())) { - $a[self::FIELD_ABATEMENT_AGE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ABATEMENT_AGE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ABATEMENT_AGE_EXT] = $enc; + } + } else { + $a[self::FIELD_ABATEMENT_AGE] = $v; + } } if (null !== ($v = $this->getAbatementBoolean())) { - $a[self::FIELD_ABATEMENT_BOOLEAN] = $v->getValue(); - $a[self::FIELD_ABATEMENT_BOOLEAN_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ABATEMENT_BOOLEAN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ABATEMENT_BOOLEAN_EXT] = $enc; + } + } else { + $a[self::FIELD_ABATEMENT_BOOLEAN] = $v; + } } if (null !== ($v = $this->getAbatementDate())) { - $a[self::FIELD_ABATEMENT_DATE] = $v->getValue(); - $a[self::FIELD_ABATEMENT_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ABATEMENT_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ABATEMENT_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_ABATEMENT_DATE] = $v; + } } if (null !== ($v = $this->getAsserter())) { $a[self::FIELD_ASSERTER] = $v; @@ -1698,8 +1768,15 @@ public function jsonSerialize() $a[self::FIELD_CODE] = $v; } if (null !== ($v = $this->getDateAsserted())) { - $a[self::FIELD_DATE_ASSERTED] = $v->getValue(); - $a[self::FIELD_DATE_ASSERTED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATE_ASSERTED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATE_ASSERTED_EXT] = $enc; + } + } else { + $a[self::FIELD_DATE_ASSERTED] = $v; + } } if (null !== ($v = $this->getEncounter())) { $a[self::FIELD_ENCOUNTER] = $v; @@ -1708,21 +1785,59 @@ public function jsonSerialize() $a[self::FIELD_EVIDENCE] = $vs; } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if ([] !== ($vs = $this->getLocation())) { $a[self::FIELD_LOCATION] = $vs; } if (null !== ($v = $this->getNotes())) { - $a[self::FIELD_NOTES] = $v->getValue(); - $a[self::FIELD_NOTES_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NOTES] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NOTES_EXT] = $enc; + } + } else { + $a[self::FIELD_NOTES] = $v; + } } if (null !== ($v = $this->getOnsetAge())) { - $a[self::FIELD_ONSET_AGE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ONSET_AGE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ONSET_AGE_EXT] = $enc; + } + } else { + $a[self::FIELD_ONSET_AGE] = $v; + } } if (null !== ($v = $this->getOnsetDate())) { - $a[self::FIELD_ONSET_DATE] = $v->getValue(); - $a[self::FIELD_ONSET_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ONSET_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ONSET_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_ONSET_DATE] = $v; + } } if ([] !== ($vs = $this->getRelatedItem())) { $a[self::FIELD_RELATED_ITEM] = $vs; @@ -1734,7 +1849,15 @@ public function jsonSerialize() $a[self::FIELD_STAGE] = $v; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getSubject())) { $a[self::FIELD_SUBJECT] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRConformance.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRConformance.php index 4b0b255b47..b3d19d5880 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRConformance.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRConformance.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -88,10 +88,6 @@ class FHIRConformance extends FHIRResource implements PHPFHIRContainedTypeInterf { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONFORMANCE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ACCEPT_UNKNOWN = 'acceptUnknown'; const FIELD_ACCEPT_UNKNOWN_EXT = '_acceptUnknown'; const FIELD_DATE = 'date'; @@ -340,6 +336,9 @@ class FHIRConformance extends FHIRResource implements PHPFHIRContainedTypeInterf */ protected $version = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRConformance Constructor * @param null|array $data @@ -362,8 +361,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ACCEPT_UNKNOWN] instanceof FHIRBoolean) { $this->setAcceptUnknown($data[self::FIELD_ACCEPT_UNKNOWN]); - } elseif ($ext && is_scalar($data[self::FIELD_ACCEPT_UNKNOWN])) { - $this->setAcceptUnknown(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_ACCEPT_UNKNOWN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ACCEPT_UNKNOWN])) { + $this->setAcceptUnknown(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_ACCEPT_UNKNOWN]] + $ext)); + } else if (is_array($data[self::FIELD_ACCEPT_UNKNOWN])) { + $this->setAcceptUnknown(new FHIRBoolean(array_merge($ext, $data[self::FIELD_ACCEPT_UNKNOWN]))); + } } else { $this->setAcceptUnknown(new FHIRBoolean($data[self::FIELD_ACCEPT_UNKNOWN])); } @@ -374,8 +377,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATE] instanceof FHIRDateTime) { $this->setDate($data[self::FIELD_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_DATE])) { - $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime(array_merge($ext, $data[self::FIELD_DATE]))); + } } else { $this->setDate(new FHIRDateTime($data[self::FIELD_DATE])); } @@ -386,8 +393,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -395,6 +406,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_DOCUMENT])) { if (is_array($data[self::FIELD_DOCUMENT])) { foreach($data[self::FIELD_DOCUMENT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRConformanceDocument) { $this->addDocument($v); } else { @@ -413,8 +427,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EXPERIMENTAL] instanceof FHIRBoolean) { $this->setExperimental($data[self::FIELD_EXPERIMENTAL]); - } elseif ($ext && is_scalar($data[self::FIELD_EXPERIMENTAL])) { - $this->setExperimental(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_EXPERIMENTAL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EXPERIMENTAL])) { + $this->setExperimental(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_EXPERIMENTAL]] + $ext)); + } else if (is_array($data[self::FIELD_EXPERIMENTAL])) { + $this->setExperimental(new FHIRBoolean(array_merge($ext, $data[self::FIELD_EXPERIMENTAL]))); + } } else { $this->setExperimental(new FHIRBoolean($data[self::FIELD_EXPERIMENTAL])); } @@ -425,8 +443,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_FHIR_VERSION] instanceof FHIRId) { $this->setFhirVersion($data[self::FIELD_FHIR_VERSION]); - } elseif ($ext && is_scalar($data[self::FIELD_FHIR_VERSION])) { - $this->setFhirVersion(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_FHIR_VERSION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_FHIR_VERSION])) { + $this->setFhirVersion(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_FHIR_VERSION]] + $ext)); + } else if (is_array($data[self::FIELD_FHIR_VERSION])) { + $this->setFhirVersion(new FHIRId(array_merge($ext, $data[self::FIELD_FHIR_VERSION]))); + } } else { $this->setFhirVersion(new FHIRId($data[self::FIELD_FHIR_VERSION])); } @@ -437,17 +459,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_FORMAT])) { foreach($data[self::FIELD_FORMAT] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCode) { $this->addFormat($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addFormat(new FHIRCode([FHIRCode::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addFormat(new FHIRCode([FHIRCode::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addFormat(new FHIRCode(array_merge($v, $ext[$i]))); + } } else { $this->addFormat(new FHIRCode($v)); } } } elseif ($data[self::FIELD_FORMAT] instanceof FHIRCode) { $this->addFormat($data[self::FIELD_FORMAT]); - } elseif ($ext && is_scalar($data[self::FIELD_FORMAT])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_FORMAT])) { $this->addFormat(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_FORMAT]] + $ext)); } else { $this->addFormat(new FHIRCode($data[self::FIELD_FORMAT])); @@ -459,8 +488,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IDENTIFIER] instanceof FHIRString) { $this->setIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { - $this->setIdentifier(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRString(array_merge($ext, $data[self::FIELD_IDENTIFIER]))); + } } else { $this->setIdentifier(new FHIRString($data[self::FIELD_IDENTIFIER])); } @@ -475,6 +508,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_MESSAGING])) { if (is_array($data[self::FIELD_MESSAGING])) { foreach($data[self::FIELD_MESSAGING] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRConformanceMessaging) { $this->addMessaging($v); } else { @@ -493,8 +529,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -502,6 +542,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PROFILE])) { if (is_array($data[self::FIELD_PROFILE])) { foreach($data[self::FIELD_PROFILE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRResourceReference) { $this->addProfile($v); } else { @@ -520,8 +563,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PUBLISHER] instanceof FHIRString) { $this->setPublisher($data[self::FIELD_PUBLISHER]); - } elseif ($ext && is_scalar($data[self::FIELD_PUBLISHER])) { - $this->setPublisher(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PUBLISHER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PUBLISHER])) { + $this->setPublisher(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PUBLISHER]] + $ext)); + } else if (is_array($data[self::FIELD_PUBLISHER])) { + $this->setPublisher(new FHIRString(array_merge($ext, $data[self::FIELD_PUBLISHER]))); + } } else { $this->setPublisher(new FHIRString($data[self::FIELD_PUBLISHER])); } @@ -529,6 +576,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REST])) { if (is_array($data[self::FIELD_REST])) { foreach($data[self::FIELD_REST] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRConformanceRest) { $this->addRest($v); } else { @@ -554,8 +604,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRConformanceStatementStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRConformanceStatementStatus([FHIRConformanceStatementStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRConformanceStatementStatus([FHIRConformanceStatementStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRConformanceStatementStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRConformanceStatementStatus($data[self::FIELD_STATUS])); } @@ -566,17 +620,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_TELECOM])) { foreach($data[self::FIELD_TELECOM] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContact) { $this->addTelecom($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addTelecom(new FHIRContact([FHIRContact::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addTelecom(new FHIRContact([FHIRContact::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addTelecom(new FHIRContact(array_merge($v, $ext[$i]))); + } } else { $this->addTelecom(new FHIRContact($v)); } } } elseif ($data[self::FIELD_TELECOM] instanceof FHIRContact) { $this->addTelecom($data[self::FIELD_TELECOM]); - } elseif ($ext && is_scalar($data[self::FIELD_TELECOM])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_TELECOM])) { $this->addTelecom(new FHIRContact([FHIRContact::FIELD_VALUE => $data[self::FIELD_TELECOM]] + $ext)); } else { $this->addTelecom(new FHIRContact($data[self::FIELD_TELECOM])); @@ -588,8 +649,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VERSION] instanceof FHIRString) { $this->setVersion($data[self::FIELD_VERSION]); - } elseif ($ext && is_scalar($data[self::FIELD_VERSION])) { - $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } else if (is_array($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString(array_merge($ext, $data[self::FIELD_VERSION]))); + } } else { $this->setVersion(new FHIRString($data[self::FIELD_VERSION])); } @@ -1629,7 +1694,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESCRIPTION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getDocument())) { foreach($vs as $v) { if (null === $v) { @@ -1638,6 +1702,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_DOCUMENT, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getExperimental())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EXPERIMENTAL, null, $v->_getFHIRXMLNamespace())); } @@ -1652,14 +1717,13 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_FORMAT, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getImplementation())) { $v->xmlSerialize($sxe->addChild(self::FIELD_IMPLEMENTATION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getMessaging())) { foreach($vs as $v) { if (null === $v) { @@ -1668,10 +1732,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_MESSAGING, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NAME, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getProfile())) { foreach($vs as $v) { if (null === $v) { @@ -1680,10 +1744,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_PROFILE, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getPublisher())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PUBLISHER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getRest())) { foreach($vs as $v) { if (null === $v) { @@ -1696,11 +1760,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getSoftware())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SOFTWARE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getTelecom())) { foreach($vs as $v) { if (null === $v) { @@ -1709,6 +1771,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_TELECOM, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getVersion())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VERSION, null, $v->_getFHIRXMLNamespace())); } @@ -1722,27 +1785,62 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getAcceptUnknown())) { - $a[self::FIELD_ACCEPT_UNKNOWN] = $v->getValue(); - $a[self::FIELD_ACCEPT_UNKNOWN_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ACCEPT_UNKNOWN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ACCEPT_UNKNOWN_EXT] = $enc; + } + } else { + $a[self::FIELD_ACCEPT_UNKNOWN] = $v; + } } if (null !== ($v = $this->getDate())) { - $a[self::FIELD_DATE] = $v->getValue(); - $a[self::FIELD_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_DATE] = $v; + } } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if ([] !== ($vs = $this->getDocument())) { $a[self::FIELD_DOCUMENT] = $vs; } if (null !== ($v = $this->getExperimental())) { - $a[self::FIELD_EXPERIMENTAL] = $v->getValue(); - $a[self::FIELD_EXPERIMENTAL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EXPERIMENTAL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EXPERIMENTAL_EXT] = $enc; + } + } else { + $a[self::FIELD_EXPERIMENTAL] = $v; + } } if (null !== ($v = $this->getFhirVersion())) { - $a[self::FIELD_FHIR_VERSION] = $v->getValue(); - $a[self::FIELD_FHIR_VERSION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FHIR_VERSION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FHIR_VERSION_EXT] = $enc; + } + } else { + $a[self::FIELD_FHIR_VERSION] = $v; + } } if ([] !== ($vs = $this->getFormat())) { $a[self::FIELD_FORMAT] = []; @@ -1750,13 +1848,29 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_FORMAT][] = $v->getValue(); - $a[self::FIELD_FORMAT_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FORMAT][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FORMAT_EXT][] = $enc; + } else { + $a[self::FIELD_FORMAT_EXT][] = null; + } + } else { + $a[self::FIELD_FORMAT][] = $v; + } } } if (null !== ($v = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $v->getValue(); - $a[self::FIELD_IDENTIFIER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_IDENTIFIER] = $v; + } } if (null !== ($v = $this->getImplementation())) { $a[self::FIELD_IMPLEMENTATION] = $v; @@ -1765,15 +1879,29 @@ public function jsonSerialize() $a[self::FIELD_MESSAGING] = $vs; } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if ([] !== ($vs = $this->getProfile())) { $a[self::FIELD_PROFILE] = $vs; } if (null !== ($v = $this->getPublisher())) { - $a[self::FIELD_PUBLISHER] = $v->getValue(); - $a[self::FIELD_PUBLISHER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PUBLISHER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PUBLISHER_EXT] = $enc; + } + } else { + $a[self::FIELD_PUBLISHER] = $v; + } } if ([] !== ($vs = $this->getRest())) { $a[self::FIELD_REST] = $vs; @@ -1782,14 +1910,45 @@ public function jsonSerialize() $a[self::FIELD_SOFTWARE] = $v; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if ([] !== ($vs = $this->getTelecom())) { - $a[self::FIELD_TELECOM] = $vs; + $a[self::FIELD_TELECOM] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TELECOM][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TELECOM_EXT][] = $enc; + } else { + $a[self::FIELD_TELECOM_EXT][] = null; + } + } else { + $a[self::FIELD_TELECOM][] = $v; + } + } } if (null !== ($v = $this->getVersion())) { - $a[self::FIELD_VERSION] = $v->getValue(); - $a[self::FIELD_VERSION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VERSION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VERSION_EXT] = $enc; + } + } else { + $a[self::FIELD_VERSION] = $v; + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRDevice.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRDevice.php index c2c7da14d6..97fa13f3f8 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRDevice.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRDevice.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -85,10 +85,6 @@ class FHIRDevice extends FHIRResource implements PHPFHIRContainedTypeInterface { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DEVICE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CONTACT = 'contact'; const FIELD_CONTACT_EXT = '_contact'; const FIELD_EXPIRY = 'expiry'; @@ -263,6 +259,9 @@ class FHIRDevice extends FHIRResource implements PHPFHIRContainedTypeInterface */ protected $version = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRDevice Constructor * @param null|array $data @@ -285,17 +284,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_CONTACT])) { foreach($data[self::FIELD_CONTACT] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContact) { $this->addContact($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addContact(new FHIRContact([FHIRContact::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addContact(new FHIRContact([FHIRContact::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addContact(new FHIRContact(array_merge($v, $ext[$i]))); + } } else { $this->addContact(new FHIRContact($v)); } } } elseif ($data[self::FIELD_CONTACT] instanceof FHIRContact) { $this->addContact($data[self::FIELD_CONTACT]); - } elseif ($ext && is_scalar($data[self::FIELD_CONTACT])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_CONTACT])) { $this->addContact(new FHIRContact([FHIRContact::FIELD_VALUE => $data[self::FIELD_CONTACT]] + $ext)); } else { $this->addContact(new FHIRContact($data[self::FIELD_CONTACT])); @@ -307,8 +313,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EXPIRY] instanceof FHIRDate) { $this->setExpiry($data[self::FIELD_EXPIRY]); - } elseif ($ext && is_scalar($data[self::FIELD_EXPIRY])) { - $this->setExpiry(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_EXPIRY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EXPIRY])) { + $this->setExpiry(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_EXPIRY]] + $ext)); + } else if (is_array($data[self::FIELD_EXPIRY])) { + $this->setExpiry(new FHIRDate(array_merge($ext, $data[self::FIELD_EXPIRY]))); + } } else { $this->setExpiry(new FHIRDate($data[self::FIELD_EXPIRY])); } @@ -319,17 +329,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -348,8 +365,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_LOT_NUMBER] instanceof FHIRString) { $this->setLotNumber($data[self::FIELD_LOT_NUMBER]); - } elseif ($ext && is_scalar($data[self::FIELD_LOT_NUMBER])) { - $this->setLotNumber(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_LOT_NUMBER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_LOT_NUMBER])) { + $this->setLotNumber(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_LOT_NUMBER]] + $ext)); + } else if (is_array($data[self::FIELD_LOT_NUMBER])) { + $this->setLotNumber(new FHIRString(array_merge($ext, $data[self::FIELD_LOT_NUMBER]))); + } } else { $this->setLotNumber(new FHIRString($data[self::FIELD_LOT_NUMBER])); } @@ -360,8 +381,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MANUFACTURER] instanceof FHIRString) { $this->setManufacturer($data[self::FIELD_MANUFACTURER]); - } elseif ($ext && is_scalar($data[self::FIELD_MANUFACTURER])) { - $this->setManufacturer(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_MANUFACTURER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MANUFACTURER])) { + $this->setManufacturer(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_MANUFACTURER]] + $ext)); + } else if (is_array($data[self::FIELD_MANUFACTURER])) { + $this->setManufacturer(new FHIRString(array_merge($ext, $data[self::FIELD_MANUFACTURER]))); + } } else { $this->setManufacturer(new FHIRString($data[self::FIELD_MANUFACTURER])); } @@ -372,8 +397,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MODEL] instanceof FHIRString) { $this->setModel($data[self::FIELD_MODEL]); - } elseif ($ext && is_scalar($data[self::FIELD_MODEL])) { - $this->setModel(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_MODEL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MODEL])) { + $this->setModel(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_MODEL]] + $ext)); + } else if (is_array($data[self::FIELD_MODEL])) { + $this->setModel(new FHIRString(array_merge($ext, $data[self::FIELD_MODEL]))); + } } else { $this->setModel(new FHIRString($data[self::FIELD_MODEL])); } @@ -405,8 +434,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_UDI] instanceof FHIRString) { $this->setUdi($data[self::FIELD_UDI]); - } elseif ($ext && is_scalar($data[self::FIELD_UDI])) { - $this->setUdi(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_UDI]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_UDI])) { + $this->setUdi(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_UDI]] + $ext)); + } else if (is_array($data[self::FIELD_UDI])) { + $this->setUdi(new FHIRString(array_merge($ext, $data[self::FIELD_UDI]))); + } } else { $this->setUdi(new FHIRString($data[self::FIELD_UDI])); } @@ -417,8 +450,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_URL] instanceof FHIRUri) { $this->setUrl($data[self::FIELD_URL]); - } elseif ($ext && is_scalar($data[self::FIELD_URL])) { - $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } else if (is_array($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri(array_merge($ext, $data[self::FIELD_URL]))); + } } else { $this->setUrl(new FHIRUri($data[self::FIELD_URL])); } @@ -429,8 +466,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VERSION] instanceof FHIRString) { $this->setVersion($data[self::FIELD_VERSION]); - } elseif ($ext && is_scalar($data[self::FIELD_VERSION])) { - $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } else if (is_array($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString(array_merge($ext, $data[self::FIELD_VERSION]))); + } } else { $this->setVersion(new FHIRString($data[self::FIELD_VERSION])); } @@ -1127,7 +1168,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getContact())) { foreach($vs as $v) { if (null === $v) { @@ -1136,10 +1176,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_CONTACT, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getExpiry())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EXPIRY, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -1161,15 +1201,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getModel())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MODEL, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOwner())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OWNER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPatient())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATIENT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -1192,29 +1229,89 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if ([] !== ($vs = $this->getContact())) { - $a[self::FIELD_CONTACT] = $vs; + $a[self::FIELD_CONTACT] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CONTACT][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CONTACT_EXT][] = $enc; + } else { + $a[self::FIELD_CONTACT_EXT][] = null; + } + } else { + $a[self::FIELD_CONTACT][] = $v; + } + } } if (null !== ($v = $this->getExpiry())) { - $a[self::FIELD_EXPIRY] = $v->getValue(); - $a[self::FIELD_EXPIRY_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EXPIRY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EXPIRY_EXT] = $enc; + } + } else { + $a[self::FIELD_EXPIRY] = $v; + } } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if (null !== ($v = $this->getLocation())) { $a[self::FIELD_LOCATION] = $v; } if (null !== ($v = $this->getLotNumber())) { - $a[self::FIELD_LOT_NUMBER] = $v->getValue(); - $a[self::FIELD_LOT_NUMBER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_LOT_NUMBER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_LOT_NUMBER_EXT] = $enc; + } + } else { + $a[self::FIELD_LOT_NUMBER] = $v; + } } if (null !== ($v = $this->getManufacturer())) { - $a[self::FIELD_MANUFACTURER] = $v->getValue(); - $a[self::FIELD_MANUFACTURER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MANUFACTURER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MANUFACTURER_EXT] = $enc; + } + } else { + $a[self::FIELD_MANUFACTURER] = $v; + } } if (null !== ($v = $this->getModel())) { - $a[self::FIELD_MODEL] = $v->getValue(); - $a[self::FIELD_MODEL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MODEL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MODEL_EXT] = $enc; + } + } else { + $a[self::FIELD_MODEL] = $v; + } } if (null !== ($v = $this->getOwner())) { $a[self::FIELD_OWNER] = $v; @@ -1226,16 +1323,37 @@ public function jsonSerialize() $a[self::FIELD_TYPE] = $v; } if (null !== ($v = $this->getUdi())) { - $a[self::FIELD_UDI] = $v->getValue(); - $a[self::FIELD_UDI_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_UDI] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_UDI_EXT] = $enc; + } + } else { + $a[self::FIELD_UDI] = $v; + } } if (null !== ($v = $this->getUrl())) { - $a[self::FIELD_URL] = $v->getValue(); - $a[self::FIELD_URL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_URL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_URL_EXT] = $enc; + } + } else { + $a[self::FIELD_URL] = $v; + } } if (null !== ($v = $this->getVersion())) { - $a[self::FIELD_VERSION] = $v->getValue(); - $a[self::FIELD_VERSION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VERSION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VERSION_EXT] = $enc; + } + } else { + $a[self::FIELD_VERSION] = $v; + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRDeviceObservationReport.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRDeviceObservationReport.php index 7e30cd397b..f0f69bd0a8 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRDeviceObservationReport.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRDeviceObservationReport.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -77,10 +77,6 @@ class FHIRDeviceObservationReport extends FHIRResource implements PHPFHIRContain { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DEVICE_OBSERVATION_REPORT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_IDENTIFIER = 'identifier'; const FIELD_IDENTIFIER_EXT = '_identifier'; const FIELD_INSTANT = 'instant'; @@ -142,6 +138,9 @@ class FHIRDeviceObservationReport extends FHIRResource implements PHPFHIRContain */ protected $virtualDevice = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRDeviceObservationReport Constructor * @param null|array $data @@ -164,8 +163,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->setIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { - $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_IDENTIFIER]))); + } } else { $this->setIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); } @@ -176,8 +179,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_INSTANT] instanceof FHIRInstant) { $this->setInstant($data[self::FIELD_INSTANT]); - } elseif ($ext && is_scalar($data[self::FIELD_INSTANT])) { - $this->setInstant(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_INSTANT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_INSTANT])) { + $this->setInstant(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_INSTANT]] + $ext)); + } else if (is_array($data[self::FIELD_INSTANT])) { + $this->setInstant(new FHIRInstant(array_merge($ext, $data[self::FIELD_INSTANT]))); + } } else { $this->setInstant(new FHIRInstant($data[self::FIELD_INSTANT])); } @@ -199,6 +206,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_VIRTUAL_DEVICE])) { if (is_array($data[self::FIELD_VIRTUAL_DEVICE])) { foreach($data[self::FIELD_VIRTUAL_DEVICE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRDeviceObservationReportVirtualDevice) { $this->addVirtualDevice($v); } else { @@ -518,22 +528,18 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getInstant())) { $v->xmlSerialize($sxe->addChild(self::FIELD_INSTANT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSource())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SOURCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSubject())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBJECT, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getVirtualDevice())) { foreach($vs as $v) { if (null === $v) { @@ -542,6 +548,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_VIRTUAL_DEVICE, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } @@ -552,11 +559,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_IDENTIFIER] = $v; + } } if (null !== ($v = $this->getInstant())) { - $a[self::FIELD_INSTANT] = $v->getValue(); - $a[self::FIELD_INSTANT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_INSTANT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_INSTANT_EXT] = $enc; + } + } else { + $a[self::FIELD_INSTANT] = $v; + } } if (null !== ($v = $this->getSource())) { $a[self::FIELD_SOURCE] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRDiagnosticOrder.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRDiagnosticOrder.php index d16dedc5ef..f0e93f45a6 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRDiagnosticOrder.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRDiagnosticOrder.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRDiagnosticOrder extends FHIRResource implements PHPFHIRContainedTypeIn { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DIAGNOSTIC_ORDER; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CLINICAL_NOTES = 'clinicalNotes'; const FIELD_CLINICAL_NOTES_EXT = '_clinicalNotes'; const FIELD_ENCOUNTER = 'encounter'; @@ -211,6 +207,9 @@ class FHIRDiagnosticOrder extends FHIRResource implements PHPFHIRContainedTypeIn */ protected $subject = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRDiagnosticOrder Constructor * @param null|array $data @@ -233,8 +232,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CLINICAL_NOTES] instanceof FHIRString) { $this->setClinicalNotes($data[self::FIELD_CLINICAL_NOTES]); - } elseif ($ext && is_scalar($data[self::FIELD_CLINICAL_NOTES])) { - $this->setClinicalNotes(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_CLINICAL_NOTES]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CLINICAL_NOTES])) { + $this->setClinicalNotes(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_CLINICAL_NOTES]] + $ext)); + } else if (is_array($data[self::FIELD_CLINICAL_NOTES])) { + $this->setClinicalNotes(new FHIRString(array_merge($ext, $data[self::FIELD_CLINICAL_NOTES]))); + } } else { $this->setClinicalNotes(new FHIRString($data[self::FIELD_CLINICAL_NOTES])); } @@ -249,6 +252,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_EVENT])) { if (is_array($data[self::FIELD_EVENT])) { foreach($data[self::FIELD_EVENT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRDiagnosticOrderEvent) { $this->addEvent($v); } else { @@ -267,17 +273,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -286,6 +299,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ITEM])) { if (is_array($data[self::FIELD_ITEM])) { foreach($data[self::FIELD_ITEM] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRDiagnosticOrderItem) { $this->addItem($v); } else { @@ -311,8 +327,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PRIORITY] instanceof FHIRDiagnosticOrderPriority) { $this->setPriority($data[self::FIELD_PRIORITY]); - } elseif ($ext && is_scalar($data[self::FIELD_PRIORITY])) { - $this->setPriority(new FHIRDiagnosticOrderPriority([FHIRDiagnosticOrderPriority::FIELD_VALUE => $data[self::FIELD_PRIORITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PRIORITY])) { + $this->setPriority(new FHIRDiagnosticOrderPriority([FHIRDiagnosticOrderPriority::FIELD_VALUE => $data[self::FIELD_PRIORITY]] + $ext)); + } else if (is_array($data[self::FIELD_PRIORITY])) { + $this->setPriority(new FHIRDiagnosticOrderPriority(array_merge($ext, $data[self::FIELD_PRIORITY]))); + } } else { $this->setPriority(new FHIRDiagnosticOrderPriority($data[self::FIELD_PRIORITY])); } @@ -320,6 +340,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SPECIMEN])) { if (is_array($data[self::FIELD_SPECIMEN])) { foreach($data[self::FIELD_SPECIMEN] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRResourceReference) { $this->addSpecimen($v); } else { @@ -338,8 +361,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRDiagnosticOrderStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRDiagnosticOrderStatus([FHIRDiagnosticOrderStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRDiagnosticOrderStatus([FHIRDiagnosticOrderStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRDiagnosticOrderStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRDiagnosticOrderStatus($data[self::FIELD_STATUS])); } @@ -920,11 +947,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getClinicalNotes())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CLINICAL_NOTES, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getEncounter())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ENCOUNTER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getEvent())) { foreach($vs as $v) { if (null === $v) { @@ -955,11 +980,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getOrderer())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ORDERER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPriority())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PRIORITY, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getSpecimen())) { foreach($vs as $v) { if (null === $v) { @@ -972,7 +995,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSubject())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBJECT, null, $v->_getFHIRXMLNamespace())); } @@ -986,8 +1008,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getClinicalNotes())) { - $a[self::FIELD_CLINICAL_NOTES] = $v->getValue(); - $a[self::FIELD_CLINICAL_NOTES_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CLINICAL_NOTES] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CLINICAL_NOTES_EXT] = $enc; + } + } else { + $a[self::FIELD_CLINICAL_NOTES] = $v; + } } if (null !== ($v = $this->getEncounter())) { $a[self::FIELD_ENCOUNTER] = $v; @@ -996,7 +1025,23 @@ public function jsonSerialize() $a[self::FIELD_EVENT] = $vs; } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if ([] !== ($vs = $this->getItem())) { $a[self::FIELD_ITEM] = $vs; @@ -1005,13 +1050,29 @@ public function jsonSerialize() $a[self::FIELD_ORDERER] = $v; } if (null !== ($v = $this->getPriority())) { - $a[self::FIELD_PRIORITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PRIORITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PRIORITY_EXT] = $enc; + } + } else { + $a[self::FIELD_PRIORITY] = $v; + } } if ([] !== ($vs = $this->getSpecimen())) { $a[self::FIELD_SPECIMEN] = $vs; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getSubject())) { $a[self::FIELD_SUBJECT] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRDiagnosticReport.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRDiagnosticReport.php index c4645983df..4a2eafd83e 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRDiagnosticReport.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRDiagnosticReport.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -86,10 +86,6 @@ class FHIRDiagnosticReport extends FHIRResource implements PHPFHIRContainedTypeI { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DIAGNOSTIC_REPORT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CODED_DIAGNOSIS = 'codedDiagnosis'; const FIELD_CONCLUSION = 'conclusion'; const FIELD_CONCLUSION_EXT = '_conclusion'; @@ -325,6 +321,9 @@ class FHIRDiagnosticReport extends FHIRResource implements PHPFHIRContainedTypeI */ protected $subject = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRDiagnosticReport Constructor * @param null|array $data @@ -344,6 +343,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CODED_DIAGNOSIS])) { if (is_array($data[self::FIELD_CODED_DIAGNOSIS])) { foreach($data[self::FIELD_CODED_DIAGNOSIS] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addCodedDiagnosis($v); } else { @@ -362,8 +364,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CONCLUSION] instanceof FHIRString) { $this->setConclusion($data[self::FIELD_CONCLUSION]); - } elseif ($ext && is_scalar($data[self::FIELD_CONCLUSION])) { - $this->setConclusion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_CONCLUSION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CONCLUSION])) { + $this->setConclusion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_CONCLUSION]] + $ext)); + } else if (is_array($data[self::FIELD_CONCLUSION])) { + $this->setConclusion(new FHIRString(array_merge($ext, $data[self::FIELD_CONCLUSION]))); + } } else { $this->setConclusion(new FHIRString($data[self::FIELD_CONCLUSION])); } @@ -374,8 +380,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DIAGNOSTIC_DATE_TIME] instanceof FHIRDateTime) { $this->setDiagnosticDateTime($data[self::FIELD_DIAGNOSTIC_DATE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_DIAGNOSTIC_DATE_TIME])) { - $this->setDiagnosticDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DIAGNOSTIC_DATE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DIAGNOSTIC_DATE_TIME])) { + $this->setDiagnosticDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DIAGNOSTIC_DATE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_DIAGNOSTIC_DATE_TIME])) { + $this->setDiagnosticDateTime(new FHIRDateTime(array_merge($ext, $data[self::FIELD_DIAGNOSTIC_DATE_TIME]))); + } } else { $this->setDiagnosticDateTime(new FHIRDateTime($data[self::FIELD_DIAGNOSTIC_DATE_TIME])); } @@ -393,8 +403,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->setIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { - $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_IDENTIFIER]))); + } } else { $this->setIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); } @@ -402,6 +416,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_IMAGE])) { if (is_array($data[self::FIELD_IMAGE])) { foreach($data[self::FIELD_IMAGE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRDiagnosticReportImage) { $this->addImage($v); } else { @@ -417,6 +434,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_IMAGING_STUDY])) { if (is_array($data[self::FIELD_IMAGING_STUDY])) { foreach($data[self::FIELD_IMAGING_STUDY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRResourceReference) { $this->addImagingStudy($v); } else { @@ -435,8 +455,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ISSUED] instanceof FHIRDateTime) { $this->setIssued($data[self::FIELD_ISSUED]); - } elseif ($ext && is_scalar($data[self::FIELD_ISSUED])) { - $this->setIssued(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_ISSUED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ISSUED])) { + $this->setIssued(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_ISSUED]] + $ext)); + } else if (is_array($data[self::FIELD_ISSUED])) { + $this->setIssued(new FHIRDateTime(array_merge($ext, $data[self::FIELD_ISSUED]))); + } } else { $this->setIssued(new FHIRDateTime($data[self::FIELD_ISSUED])); } @@ -458,6 +482,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PRESENTED_FORM])) { if (is_array($data[self::FIELD_PRESENTED_FORM])) { foreach($data[self::FIELD_PRESENTED_FORM] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRAttachment) { $this->addPresentedForm($v); } else { @@ -473,6 +500,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REQUEST_DETAIL])) { if (is_array($data[self::FIELD_REQUEST_DETAIL])) { foreach($data[self::FIELD_REQUEST_DETAIL] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRResourceReference) { $this->addRequestDetail($v); } else { @@ -488,6 +518,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_RESULT])) { if (is_array($data[self::FIELD_RESULT])) { foreach($data[self::FIELD_RESULT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRResourceReference) { $this->addResult($v); } else { @@ -510,6 +543,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SPECIMEN])) { if (is_array($data[self::FIELD_SPECIMEN])) { foreach($data[self::FIELD_SPECIMEN] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRResourceReference) { $this->addSpecimen($v); } else { @@ -528,8 +564,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRDiagnosticReportStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRDiagnosticReportStatus([FHIRDiagnosticReportStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRDiagnosticReportStatus([FHIRDiagnosticReportStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRDiagnosticReportStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRDiagnosticReportStatus($data[self::FIELD_STATUS])); } @@ -1501,7 +1541,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getCodedDiagnosis())) { foreach($vs as $v) { if (null === $v) { @@ -1510,21 +1549,19 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_CODED_DIAGNOSIS, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getConclusion())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CONCLUSION, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getDiagnosticDateTime())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DIAGNOSTIC_DATE_TIME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDiagnosticPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DIAGNOSTIC_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getImage())) { foreach($vs as $v) { if (null === $v) { @@ -1542,18 +1579,16 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_IMAGING_STUDY, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getIssued())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ISSUED, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NAME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPerformer())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PERFORMER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getPresentedForm())) { foreach($vs as $v) { if (null === $v) { @@ -1584,7 +1619,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getServiceCategory())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SERVICE_CATEGORY, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getSpecimen())) { foreach($vs as $v) { if (null === $v) { @@ -1597,7 +1631,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSubject())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBJECT, null, $v->_getFHIRXMLNamespace())); } @@ -1614,18 +1647,40 @@ public function jsonSerialize() $a[self::FIELD_CODED_DIAGNOSIS] = $vs; } if (null !== ($v = $this->getConclusion())) { - $a[self::FIELD_CONCLUSION] = $v->getValue(); - $a[self::FIELD_CONCLUSION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CONCLUSION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CONCLUSION_EXT] = $enc; + } + } else { + $a[self::FIELD_CONCLUSION] = $v; + } } if (null !== ($v = $this->getDiagnosticDateTime())) { - $a[self::FIELD_DIAGNOSTIC_DATE_TIME] = $v->getValue(); - $a[self::FIELD_DIAGNOSTIC_DATE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DIAGNOSTIC_DATE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DIAGNOSTIC_DATE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_DIAGNOSTIC_DATE_TIME] = $v; + } } if (null !== ($v = $this->getDiagnosticPeriod())) { $a[self::FIELD_DIAGNOSTIC_PERIOD] = $v; } if (null !== ($v = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_IDENTIFIER] = $v; + } } if ([] !== ($vs = $this->getImage())) { $a[self::FIELD_IMAGE] = $vs; @@ -1634,8 +1689,15 @@ public function jsonSerialize() $a[self::FIELD_IMAGING_STUDY] = $vs; } if (null !== ($v = $this->getIssued())) { - $a[self::FIELD_ISSUED] = $v->getValue(); - $a[self::FIELD_ISSUED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ISSUED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ISSUED_EXT] = $enc; + } + } else { + $a[self::FIELD_ISSUED] = $v; + } } if (null !== ($v = $this->getName())) { $a[self::FIELD_NAME] = $v; @@ -1659,7 +1721,15 @@ public function jsonSerialize() $a[self::FIELD_SPECIMEN] = $vs; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getSubject())) { $a[self::FIELD_SUBJECT] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRDocumentManifest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRDocumentManifest.php index 22ccff097c..c97b9c5ec9 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRDocumentManifest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRDocumentManifest.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRDocumentManifest extends FHIRResource implements PHPFHIRContainedTypeI { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DOCUMENT_MANIFEST; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_AUTHOR = 'author'; const FIELD_CONFIDENTIALITY = 'confidentiality'; const FIELD_CONTENT = 'content'; @@ -263,6 +259,9 @@ class FHIRDocumentManifest extends FHIRResource implements PHPFHIRContainedTypeI */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRDocumentManifest Constructor * @param null|array $data @@ -282,6 +281,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_AUTHOR])) { if (is_array($data[self::FIELD_AUTHOR])) { foreach($data[self::FIELD_AUTHOR] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRResourceReference) { $this->addAuthor($v); } else { @@ -304,6 +306,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CONTENT])) { if (is_array($data[self::FIELD_CONTENT])) { foreach($data[self::FIELD_CONTENT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRResourceReference) { $this->addContent($v); } else { @@ -322,8 +327,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CREATED] instanceof FHIRDateTime) { $this->setCreated($data[self::FIELD_CREATED]); - } elseif ($ext && is_scalar($data[self::FIELD_CREATED])) { - $this->setCreated(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_CREATED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CREATED])) { + $this->setCreated(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_CREATED]] + $ext)); + } else if (is_array($data[self::FIELD_CREATED])) { + $this->setCreated(new FHIRDateTime(array_merge($ext, $data[self::FIELD_CREATED]))); + } } else { $this->setCreated(new FHIRDateTime($data[self::FIELD_CREATED])); } @@ -334,8 +343,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -346,17 +359,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -368,8 +388,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MASTER_IDENTIFIER] instanceof FHIRIdentifier) { $this->setMasterIdentifier($data[self::FIELD_MASTER_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_MASTER_IDENTIFIER])) { - $this->setMasterIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_MASTER_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MASTER_IDENTIFIER])) { + $this->setMasterIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_MASTER_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_MASTER_IDENTIFIER])) { + $this->setMasterIdentifier(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_MASTER_IDENTIFIER]))); + } } else { $this->setMasterIdentifier(new FHIRIdentifier($data[self::FIELD_MASTER_IDENTIFIER])); } @@ -377,6 +401,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_RECIPIENT])) { if (is_array($data[self::FIELD_RECIPIENT])) { foreach($data[self::FIELD_RECIPIENT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRResourceReference) { $this->addRecipient($v); } else { @@ -395,8 +422,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SOURCE] instanceof FHIRUri) { $this->setSource($data[self::FIELD_SOURCE]); - } elseif ($ext && is_scalar($data[self::FIELD_SOURCE])) { - $this->setSource(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_SOURCE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SOURCE])) { + $this->setSource(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_SOURCE]] + $ext)); + } else if (is_array($data[self::FIELD_SOURCE])) { + $this->setSource(new FHIRUri(array_merge($ext, $data[self::FIELD_SOURCE]))); + } } else { $this->setSource(new FHIRUri($data[self::FIELD_SOURCE])); } @@ -407,8 +438,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRDocumentReferenceStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRDocumentReferenceStatus([FHIRDocumentReferenceStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRDocumentReferenceStatus([FHIRDocumentReferenceStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRDocumentReferenceStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRDocumentReferenceStatus($data[self::FIELD_STATUS])); } @@ -416,6 +451,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SUBJECT])) { if (is_array($data[self::FIELD_SUBJECT])) { foreach($data[self::FIELD_SUBJECT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRResourceReference) { $this->addSubject($v); } else { @@ -1193,7 +1231,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getAuthor())) { foreach($vs as $v) { if (null === $v) { @@ -1206,7 +1243,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getConfidentiality())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CONFIDENTIALITY, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getContent())) { foreach($vs as $v) { if (null === $v) { @@ -1215,13 +1251,13 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_CONTENT, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getCreated())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CREATED, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getDescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESCRIPTION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -1234,7 +1270,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getMasterIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MASTER_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getRecipient())) { foreach($vs as $v) { if (null === $v) { @@ -1243,14 +1278,13 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_RECIPIENT, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getSource())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SOURCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getSubject())) { foreach($vs as $v) { if (null === $v) { @@ -1263,7 +1297,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getSupercedes())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUPERCEDES, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -1286,28 +1319,81 @@ public function jsonSerialize() $a[self::FIELD_CONTENT] = $vs; } if (null !== ($v = $this->getCreated())) { - $a[self::FIELD_CREATED] = $v->getValue(); - $a[self::FIELD_CREATED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CREATED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CREATED_EXT] = $enc; + } + } else { + $a[self::FIELD_CREATED] = $v; + } } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if (null !== ($v = $this->getMasterIdentifier())) { - $a[self::FIELD_MASTER_IDENTIFIER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MASTER_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MASTER_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_MASTER_IDENTIFIER] = $v; + } } if ([] !== ($vs = $this->getRecipient())) { $a[self::FIELD_RECIPIENT] = $vs; } if (null !== ($v = $this->getSource())) { - $a[self::FIELD_SOURCE] = $v->getValue(); - $a[self::FIELD_SOURCE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SOURCE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SOURCE_EXT] = $enc; + } + } else { + $a[self::FIELD_SOURCE] = $v; + } } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if ([] !== ($vs = $this->getSubject())) { $a[self::FIELD_SUBJECT] = $vs; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRDocumentReference.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRDocumentReference.php index fc5f55ca4e..a5dd7cb2a3 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRDocumentReference.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRDocumentReference.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -86,10 +86,6 @@ class FHIRDocumentReference extends FHIRResource implements PHPFHIRContainedType { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DOCUMENT_REFERENCE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_AUTHENTICATOR = 'authenticator'; const FIELD_AUTHOR = 'author'; const FIELD_CLASS = 'class'; @@ -398,6 +394,9 @@ class FHIRDocumentReference extends FHIRResource implements PHPFHIRContainedType */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRDocumentReference Constructor * @param null|array $data @@ -424,6 +423,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_AUTHOR])) { if (is_array($data[self::FIELD_AUTHOR])) { foreach($data[self::FIELD_AUTHOR] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRResourceReference) { $this->addAuthor($v); } else { @@ -446,6 +448,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CONFIDENTIALITY])) { if (is_array($data[self::FIELD_CONFIDENTIALITY])) { foreach($data[self::FIELD_CONFIDENTIALITY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addConfidentiality($v); } else { @@ -471,8 +476,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CREATED] instanceof FHIRDateTime) { $this->setCreated($data[self::FIELD_CREATED]); - } elseif ($ext && is_scalar($data[self::FIELD_CREATED])) { - $this->setCreated(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_CREATED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CREATED])) { + $this->setCreated(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_CREATED]] + $ext)); + } else if (is_array($data[self::FIELD_CREATED])) { + $this->setCreated(new FHIRDateTime(array_merge($ext, $data[self::FIELD_CREATED]))); + } } else { $this->setCreated(new FHIRDateTime($data[self::FIELD_CREATED])); } @@ -490,8 +499,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -509,17 +522,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_FORMAT])) { foreach($data[self::FIELD_FORMAT] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRUri) { $this->addFormat($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addFormat(new FHIRUri([FHIRUri::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addFormat(new FHIRUri([FHIRUri::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addFormat(new FHIRUri(array_merge($v, $ext[$i]))); + } } else { $this->addFormat(new FHIRUri($v)); } } } elseif ($data[self::FIELD_FORMAT] instanceof FHIRUri) { $this->addFormat($data[self::FIELD_FORMAT]); - } elseif ($ext && is_scalar($data[self::FIELD_FORMAT])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_FORMAT])) { $this->addFormat(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_FORMAT]] + $ext)); } else { $this->addFormat(new FHIRUri($data[self::FIELD_FORMAT])); @@ -531,8 +551,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_HASH] instanceof FHIRString) { $this->setHash($data[self::FIELD_HASH]); - } elseif ($ext && is_scalar($data[self::FIELD_HASH])) { - $this->setHash(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_HASH]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_HASH])) { + $this->setHash(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_HASH]] + $ext)); + } else if (is_array($data[self::FIELD_HASH])) { + $this->setHash(new FHIRString(array_merge($ext, $data[self::FIELD_HASH]))); + } } else { $this->setHash(new FHIRString($data[self::FIELD_HASH])); } @@ -543,17 +567,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -565,8 +596,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_INDEXED] instanceof FHIRInstant) { $this->setIndexed($data[self::FIELD_INDEXED]); - } elseif ($ext && is_scalar($data[self::FIELD_INDEXED])) { - $this->setIndexed(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_INDEXED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_INDEXED])) { + $this->setIndexed(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_INDEXED]] + $ext)); + } else if (is_array($data[self::FIELD_INDEXED])) { + $this->setIndexed(new FHIRInstant(array_merge($ext, $data[self::FIELD_INDEXED]))); + } } else { $this->setIndexed(new FHIRInstant($data[self::FIELD_INDEXED])); } @@ -577,8 +612,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_LOCATION] instanceof FHIRUri) { $this->setLocation($data[self::FIELD_LOCATION]); - } elseif ($ext && is_scalar($data[self::FIELD_LOCATION])) { - $this->setLocation(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_LOCATION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_LOCATION])) { + $this->setLocation(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_LOCATION]] + $ext)); + } else if (is_array($data[self::FIELD_LOCATION])) { + $this->setLocation(new FHIRUri(array_merge($ext, $data[self::FIELD_LOCATION]))); + } } else { $this->setLocation(new FHIRUri($data[self::FIELD_LOCATION])); } @@ -589,8 +628,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MASTER_IDENTIFIER] instanceof FHIRIdentifier) { $this->setMasterIdentifier($data[self::FIELD_MASTER_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_MASTER_IDENTIFIER])) { - $this->setMasterIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_MASTER_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MASTER_IDENTIFIER])) { + $this->setMasterIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_MASTER_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_MASTER_IDENTIFIER])) { + $this->setMasterIdentifier(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_MASTER_IDENTIFIER]))); + } } else { $this->setMasterIdentifier(new FHIRIdentifier($data[self::FIELD_MASTER_IDENTIFIER])); } @@ -601,8 +644,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MIME_TYPE] instanceof FHIRCode) { $this->setMimeType($data[self::FIELD_MIME_TYPE]); - } elseif ($ext && is_scalar($data[self::FIELD_MIME_TYPE])) { - $this->setMimeType(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_MIME_TYPE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MIME_TYPE])) { + $this->setMimeType(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_MIME_TYPE]] + $ext)); + } else if (is_array($data[self::FIELD_MIME_TYPE])) { + $this->setMimeType(new FHIRCode(array_merge($ext, $data[self::FIELD_MIME_TYPE]))); + } } else { $this->setMimeType(new FHIRCode($data[self::FIELD_MIME_TYPE])); } @@ -613,8 +660,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_POLICY_MANAGER] instanceof FHIRUri) { $this->setPolicyManager($data[self::FIELD_POLICY_MANAGER]); - } elseif ($ext && is_scalar($data[self::FIELD_POLICY_MANAGER])) { - $this->setPolicyManager(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_POLICY_MANAGER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_POLICY_MANAGER])) { + $this->setPolicyManager(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_POLICY_MANAGER]] + $ext)); + } else if (is_array($data[self::FIELD_POLICY_MANAGER])) { + $this->setPolicyManager(new FHIRUri(array_merge($ext, $data[self::FIELD_POLICY_MANAGER]))); + } } else { $this->setPolicyManager(new FHIRUri($data[self::FIELD_POLICY_MANAGER])); } @@ -625,8 +676,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PRIMARY_LANGUAGE] instanceof FHIRCode) { $this->setPrimaryLanguage($data[self::FIELD_PRIMARY_LANGUAGE]); - } elseif ($ext && is_scalar($data[self::FIELD_PRIMARY_LANGUAGE])) { - $this->setPrimaryLanguage(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_PRIMARY_LANGUAGE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PRIMARY_LANGUAGE])) { + $this->setPrimaryLanguage(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_PRIMARY_LANGUAGE]] + $ext)); + } else if (is_array($data[self::FIELD_PRIMARY_LANGUAGE])) { + $this->setPrimaryLanguage(new FHIRCode(array_merge($ext, $data[self::FIELD_PRIMARY_LANGUAGE]))); + } } else { $this->setPrimaryLanguage(new FHIRCode($data[self::FIELD_PRIMARY_LANGUAGE])); } @@ -634,6 +689,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_RELATES_TO])) { if (is_array($data[self::FIELD_RELATES_TO])) { foreach($data[self::FIELD_RELATES_TO] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRDocumentReferenceRelatesTo) { $this->addRelatesTo($v); } else { @@ -659,8 +717,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SIZE] instanceof FHIRInteger) { $this->setSize($data[self::FIELD_SIZE]); - } elseif ($ext && is_scalar($data[self::FIELD_SIZE])) { - $this->setSize(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_SIZE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SIZE])) { + $this->setSize(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_SIZE]] + $ext)); + } else if (is_array($data[self::FIELD_SIZE])) { + $this->setSize(new FHIRInteger(array_merge($ext, $data[self::FIELD_SIZE]))); + } } else { $this->setSize(new FHIRInteger($data[self::FIELD_SIZE])); } @@ -671,8 +733,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRDocumentReferenceStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRDocumentReferenceStatus([FHIRDocumentReferenceStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRDocumentReferenceStatus([FHIRDocumentReferenceStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRDocumentReferenceStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRDocumentReferenceStatus($data[self::FIELD_STATUS])); } @@ -1855,11 +1921,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getAuthenticator())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AUTHENTICATOR, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getAuthor())) { foreach($vs as $v) { if (null === $v) { @@ -1872,7 +1936,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getClass())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CLASS, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getConfidentiality())) { foreach($vs as $v) { if (null === $v) { @@ -1888,14 +1951,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getCreated())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CREATED, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getCustodian())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CUSTODIAN, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getDescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESCRIPTION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDocStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DOC_STATUS, null, $v->_getFHIRXMLNamespace())); } @@ -1907,10 +1968,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_FORMAT, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getHash())) { $v->xmlSerialize($sxe->addChild(self::FIELD_HASH, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -1919,13 +1980,13 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getIndexed())) { $v->xmlSerialize($sxe->addChild(self::FIELD_INDEXED, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getLocation())) { $v->xmlSerialize($sxe->addChild(self::FIELD_LOCATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getMasterIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MASTER_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } @@ -1938,7 +1999,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getPrimaryLanguage())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PRIMARY_LANGUAGE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getRelatesTo())) { foreach($vs as $v) { if (null === $v) { @@ -1954,15 +2014,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getSize())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SIZE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSubject())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBJECT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -1991,15 +2048,29 @@ public function jsonSerialize() $a[self::FIELD_CONTEXT] = $v; } if (null !== ($v = $this->getCreated())) { - $a[self::FIELD_CREATED] = $v->getValue(); - $a[self::FIELD_CREATED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CREATED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CREATED_EXT] = $enc; + } + } else { + $a[self::FIELD_CREATED] = $v; + } } if (null !== ($v = $this->getCustodian())) { $a[self::FIELD_CUSTODIAN] = $v; } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if (null !== ($v = $this->getDocStatus())) { $a[self::FIELD_DOC_STATUS] = $v; @@ -2010,39 +2081,114 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_FORMAT][] = $v->getValue(); - $a[self::FIELD_FORMAT_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FORMAT][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FORMAT_EXT][] = $enc; + } else { + $a[self::FIELD_FORMAT_EXT][] = null; + } + } else { + $a[self::FIELD_FORMAT][] = $v; + } } } if (null !== ($v = $this->getHash())) { - $a[self::FIELD_HASH] = $v->getValue(); - $a[self::FIELD_HASH_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_HASH] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_HASH_EXT] = $enc; + } + } else { + $a[self::FIELD_HASH] = $v; + } } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if (null !== ($v = $this->getIndexed())) { - $a[self::FIELD_INDEXED] = $v->getValue(); - $a[self::FIELD_INDEXED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_INDEXED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_INDEXED_EXT] = $enc; + } + } else { + $a[self::FIELD_INDEXED] = $v; + } } if (null !== ($v = $this->getLocation())) { - $a[self::FIELD_LOCATION] = $v->getValue(); - $a[self::FIELD_LOCATION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_LOCATION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_LOCATION_EXT] = $enc; + } + } else { + $a[self::FIELD_LOCATION] = $v; + } } if (null !== ($v = $this->getMasterIdentifier())) { - $a[self::FIELD_MASTER_IDENTIFIER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MASTER_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MASTER_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_MASTER_IDENTIFIER] = $v; + } } if (null !== ($v = $this->getMimeType())) { - $a[self::FIELD_MIME_TYPE] = $v->getValue(); - $a[self::FIELD_MIME_TYPE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MIME_TYPE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MIME_TYPE_EXT] = $enc; + } + } else { + $a[self::FIELD_MIME_TYPE] = $v; + } } if (null !== ($v = $this->getPolicyManager())) { - $a[self::FIELD_POLICY_MANAGER] = $v->getValue(); - $a[self::FIELD_POLICY_MANAGER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_POLICY_MANAGER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_POLICY_MANAGER_EXT] = $enc; + } + } else { + $a[self::FIELD_POLICY_MANAGER] = $v; + } } if (null !== ($v = $this->getPrimaryLanguage())) { - $a[self::FIELD_PRIMARY_LANGUAGE] = $v->getValue(); - $a[self::FIELD_PRIMARY_LANGUAGE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PRIMARY_LANGUAGE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PRIMARY_LANGUAGE_EXT] = $enc; + } + } else { + $a[self::FIELD_PRIMARY_LANGUAGE] = $v; + } } if ([] !== ($vs = $this->getRelatesTo())) { $a[self::FIELD_RELATES_TO] = $vs; @@ -2051,11 +2197,26 @@ public function jsonSerialize() $a[self::FIELD_SERVICE] = $v; } if (null !== ($v = $this->getSize())) { - $a[self::FIELD_SIZE] = $v->getValue(); - $a[self::FIELD_SIZE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SIZE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SIZE_EXT] = $enc; + } + } else { + $a[self::FIELD_SIZE] = $v; + } } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getSubject())) { $a[self::FIELD_SUBJECT] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIREncounter.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIREncounter.php index 059145f5cd..28a3bfb71c 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIREncounter.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIREncounter.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -84,10 +84,6 @@ class FHIREncounter extends FHIRResource implements PHPFHIRContainedTypeInterfac { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ENCOUNTER; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CLASS = 'class'; const FIELD_CLASS_EXT = '_class'; const FIELD_HOSPITALIZATION = 'hospitalization'; @@ -95,6 +91,7 @@ class FHIREncounter extends FHIRResource implements PHPFHIRContainedTypeInterfac const FIELD_IDENTIFIER_EXT = '_identifier'; const FIELD_INDICATION = 'indication'; const FIELD_LENGTH = 'length'; + const FIELD_LENGTH_EXT = '_length'; const FIELD_LOCATION = 'location'; const FIELD_PART_OF = 'partOf'; const FIELD_PARTICIPANT = 'participant'; @@ -271,6 +268,9 @@ class FHIREncounter extends FHIRResource implements PHPFHIRContainedTypeInterfac */ protected $type = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIREncounter Constructor * @param null|array $data @@ -293,8 +293,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CLASS] instanceof FHIREncounterClass) { $this->setClass($data[self::FIELD_CLASS]); - } elseif ($ext && is_scalar($data[self::FIELD_CLASS])) { - $this->setClass(new FHIREncounterClass([FHIREncounterClass::FIELD_VALUE => $data[self::FIELD_CLASS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CLASS])) { + $this->setClass(new FHIREncounterClass([FHIREncounterClass::FIELD_VALUE => $data[self::FIELD_CLASS]] + $ext)); + } else if (is_array($data[self::FIELD_CLASS])) { + $this->setClass(new FHIREncounterClass(array_merge($ext, $data[self::FIELD_CLASS]))); + } } else { $this->setClass(new FHIREncounterClass($data[self::FIELD_CLASS])); } @@ -312,17 +316,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -336,8 +347,17 @@ public function __construct($data = null) } } if (isset($data[self::FIELD_LENGTH])) { + $ext = (isset($data[self::FIELD_LENGTH_EXT]) && is_array($data[self::FIELD_LENGTH_EXT])) + ? $data[self::FIELD_LENGTH_EXT] + : null; if ($data[self::FIELD_LENGTH] instanceof FHIRDuration) { $this->setLength($data[self::FIELD_LENGTH]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_LENGTH])) { + $this->setLength(new FHIRDuration([FHIRDuration::FIELD_VALUE => $data[self::FIELD_LENGTH]] + $ext)); + } else if (is_array($data[self::FIELD_LENGTH])) { + $this->setLength(new FHIRDuration(array_merge($ext, $data[self::FIELD_LENGTH]))); + } } else { $this->setLength(new FHIRDuration($data[self::FIELD_LENGTH])); } @@ -345,6 +365,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_LOCATION])) { if (is_array($data[self::FIELD_LOCATION])) { foreach($data[self::FIELD_LOCATION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIREncounterLocation) { $this->addLocation($v); } else { @@ -367,6 +390,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PARTICIPANT])) { if (is_array($data[self::FIELD_PARTICIPANT])) { foreach($data[self::FIELD_PARTICIPANT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIREncounterParticipant) { $this->addParticipant($v); } else { @@ -413,8 +439,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIREncounterState) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIREncounterState([FHIREncounterState::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIREncounterState([FHIREncounterState::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIREncounterState(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIREncounterState($data[self::FIELD_STATUS])); } @@ -429,6 +459,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_TYPE])) { if (is_array($data[self::FIELD_TYPE])) { foreach($data[self::FIELD_TYPE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addType($v); } else { @@ -1155,15 +1188,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getClass())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CLASS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getHospitalization())) { $v->xmlSerialize($sxe->addChild(self::FIELD_HOSPITALIZATION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -1176,11 +1206,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getIndication())) { $v->xmlSerialize($sxe->addChild(self::FIELD_INDICATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getLength())) { $v->xmlSerialize($sxe->addChild(self::FIELD_LENGTH, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getLocation())) { foreach($vs as $v) { if (null === $v) { @@ -1193,7 +1221,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getPartOf())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PART_OF, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getParticipant())) { foreach($vs as $v) { if (null === $v) { @@ -1206,27 +1233,21 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPriority())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PRIORITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getReason())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REASON, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getServiceProvider())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SERVICE_PROVIDER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSubject())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBJECT, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getType())) { foreach($vs as $v) { if (null === $v) { @@ -1235,6 +1256,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } @@ -1245,19 +1267,51 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getClass())) { - $a[self::FIELD_CLASS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CLASS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CLASS_EXT] = $enc; + } + } else { + $a[self::FIELD_CLASS] = $v; + } } if (null !== ($v = $this->getHospitalization())) { $a[self::FIELD_HOSPITALIZATION] = $v; } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if (null !== ($v = $this->getIndication())) { $a[self::FIELD_INDICATION] = $v; } if (null !== ($v = $this->getLength())) { - $a[self::FIELD_LENGTH] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_LENGTH] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_LENGTH_EXT] = $enc; + } + } else { + $a[self::FIELD_LENGTH] = $v; + } } if ([] !== ($vs = $this->getLocation())) { $a[self::FIELD_LOCATION] = $vs; @@ -1281,7 +1335,15 @@ public function jsonSerialize() $a[self::FIELD_SERVICE_PROVIDER] = $v; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getSubject())) { $a[self::FIELD_SUBJECT] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRFamilyHistory.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRFamilyHistory.php index 2a86018d0e..6e07420638 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRFamilyHistory.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRFamilyHistory.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRFamilyHistory extends FHIRResource implements PHPFHIRContainedTypeInte { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_FAMILY_HISTORY; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_IDENTIFIER = 'identifier'; const FIELD_IDENTIFIER_EXT = '_identifier'; const FIELD_NOTE = 'note'; @@ -135,6 +131,9 @@ class FHIRFamilyHistory extends FHIRResource implements PHPFHIRContainedTypeInte */ protected $subject = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRFamilyHistory Constructor * @param null|array $data @@ -157,17 +156,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -179,8 +185,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NOTE] instanceof FHIRString) { $this->setNote($data[self::FIELD_NOTE]); - } elseif ($ext && is_scalar($data[self::FIELD_NOTE])) { - $this->setNote(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NOTE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NOTE])) { + $this->setNote(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NOTE]] + $ext)); + } else if (is_array($data[self::FIELD_NOTE])) { + $this->setNote(new FHIRString(array_merge($ext, $data[self::FIELD_NOTE]))); + } } else { $this->setNote(new FHIRString($data[self::FIELD_NOTE])); } @@ -188,6 +198,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_RELATION])) { if (is_array($data[self::FIELD_RELATION])) { foreach($data[self::FIELD_RELATION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRFamilyHistoryRelation) { $this->addRelation($v); } else { @@ -522,7 +535,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -531,10 +543,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getNote())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NOTE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getRelation())) { foreach($vs as $v) { if (null === $v) { @@ -557,11 +569,34 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if (null !== ($v = $this->getNote())) { - $a[self::FIELD_NOTE] = $v->getValue(); - $a[self::FIELD_NOTE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NOTE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NOTE_EXT] = $enc; + } + } else { + $a[self::FIELD_NOTE] = $v; + } } if ([] !== ($vs = $this->getRelation())) { $a[self::FIELD_RELATION] = $vs; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRGroup.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRGroup.php index d657984cff..0880863bd8 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRGroup.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRGroup.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -83,10 +83,6 @@ class FHIRGroup extends FHIRResource implements PHPFHIRContainedTypeInterface { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_GROUP; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ACTUAL = 'actual'; const FIELD_ACTUAL_EXT = '_actual'; const FIELD_CHARACTERISTIC = 'characteristic'; @@ -188,6 +184,9 @@ class FHIRGroup extends FHIRResource implements PHPFHIRContainedTypeInterface */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRGroup Constructor * @param null|array $data @@ -210,8 +209,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ACTUAL] instanceof FHIRBoolean) { $this->setActual($data[self::FIELD_ACTUAL]); - } elseif ($ext && is_scalar($data[self::FIELD_ACTUAL])) { - $this->setActual(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_ACTUAL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ACTUAL])) { + $this->setActual(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_ACTUAL]] + $ext)); + } else if (is_array($data[self::FIELD_ACTUAL])) { + $this->setActual(new FHIRBoolean(array_merge($ext, $data[self::FIELD_ACTUAL]))); + } } else { $this->setActual(new FHIRBoolean($data[self::FIELD_ACTUAL])); } @@ -219,6 +222,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CHARACTERISTIC])) { if (is_array($data[self::FIELD_CHARACTERISTIC])) { foreach($data[self::FIELD_CHARACTERISTIC] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRGroupCharacteristic) { $this->addCharacteristic($v); } else { @@ -244,8 +250,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->setIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { - $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_IDENTIFIER]))); + } } else { $this->setIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); } @@ -253,6 +263,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_MEMBER])) { if (is_array($data[self::FIELD_MEMBER])) { foreach($data[self::FIELD_MEMBER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRResourceReference) { $this->addMember($v); } else { @@ -271,8 +284,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -283,8 +300,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_QUANTITY] instanceof FHIRInteger) { $this->setQuantity($data[self::FIELD_QUANTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_QUANTITY])) { - $this->setQuantity(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_QUANTITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_QUANTITY])) { + $this->setQuantity(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_QUANTITY])) { + $this->setQuantity(new FHIRInteger(array_merge($ext, $data[self::FIELD_QUANTITY]))); + } } else { $this->setQuantity(new FHIRInteger($data[self::FIELD_QUANTITY])); } @@ -295,8 +316,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TYPE] instanceof FHIRGroupType) { $this->setType($data[self::FIELD_TYPE]); - } elseif ($ext && is_scalar($data[self::FIELD_TYPE])) { - $this->setType(new FHIRGroupType([FHIRGroupType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TYPE])) { + $this->setType(new FHIRGroupType([FHIRGroupType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } else if (is_array($data[self::FIELD_TYPE])) { + $this->setType(new FHIRGroupType(array_merge($ext, $data[self::FIELD_TYPE]))); + } } else { $this->setType(new FHIRGroupType($data[self::FIELD_TYPE])); } @@ -764,7 +789,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getActual())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ACTUAL, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getCharacteristic())) { foreach($vs as $v) { if (null === $v) { @@ -777,11 +801,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getMember())) { foreach($vs as $v) { if (null === $v) { @@ -790,13 +812,13 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_MEMBER, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NAME, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_QUANTITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -810,8 +832,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getActual())) { - $a[self::FIELD_ACTUAL] = $v->getValue(); - $a[self::FIELD_ACTUAL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ACTUAL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ACTUAL_EXT] = $enc; + } + } else { + $a[self::FIELD_ACTUAL] = $v; + } } if ([] !== ($vs = $this->getCharacteristic())) { $a[self::FIELD_CHARACTERISTIC] = $vs; @@ -820,21 +849,51 @@ public function jsonSerialize() $a[self::FIELD_CODE] = $v; } if (null !== ($v = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_IDENTIFIER] = $v; + } } if ([] !== ($vs = $this->getMember())) { $a[self::FIELD_MEMBER] = $vs; } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if (null !== ($v = $this->getQuantity())) { - $a[self::FIELD_QUANTITY] = $v->getValue(); - $a[self::FIELD_QUANTITY_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_QUANTITY] = $v; + } } if (null !== ($v = $this->getType())) { - $a[self::FIELD_TYPE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TYPE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TYPE_EXT] = $enc; + } + } else { + $a[self::FIELD_TYPE] = $v; + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRImagingStudy.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRImagingStudy.php index cf4e8ff54a..790a62639c 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRImagingStudy.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRImagingStudy.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -86,10 +86,6 @@ class FHIRImagingStudy extends FHIRResource implements PHPFHIRContainedTypeInter { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_IMAGING_STUDY; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ACCESSION_NO = 'accessionNo'; const FIELD_ACCESSION_NO_EXT = '_accessionNo'; const FIELD_AVAILABILITY = 'availability'; @@ -305,6 +301,9 @@ class FHIRImagingStudy extends FHIRResource implements PHPFHIRContainedTypeInter */ protected $url = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRImagingStudy Constructor * @param null|array $data @@ -327,8 +326,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ACCESSION_NO] instanceof FHIRIdentifier) { $this->setAccessionNo($data[self::FIELD_ACCESSION_NO]); - } elseif ($ext && is_scalar($data[self::FIELD_ACCESSION_NO])) { - $this->setAccessionNo(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_ACCESSION_NO]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ACCESSION_NO])) { + $this->setAccessionNo(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_ACCESSION_NO]] + $ext)); + } else if (is_array($data[self::FIELD_ACCESSION_NO])) { + $this->setAccessionNo(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_ACCESSION_NO]))); + } } else { $this->setAccessionNo(new FHIRIdentifier($data[self::FIELD_ACCESSION_NO])); } @@ -339,8 +342,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_AVAILABILITY] instanceof FHIRInstanceAvailability) { $this->setAvailability($data[self::FIELD_AVAILABILITY]); - } elseif ($ext && is_scalar($data[self::FIELD_AVAILABILITY])) { - $this->setAvailability(new FHIRInstanceAvailability([FHIRInstanceAvailability::FIELD_VALUE => $data[self::FIELD_AVAILABILITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_AVAILABILITY])) { + $this->setAvailability(new FHIRInstanceAvailability([FHIRInstanceAvailability::FIELD_VALUE => $data[self::FIELD_AVAILABILITY]] + $ext)); + } else if (is_array($data[self::FIELD_AVAILABILITY])) { + $this->setAvailability(new FHIRInstanceAvailability(array_merge($ext, $data[self::FIELD_AVAILABILITY]))); + } } else { $this->setAvailability(new FHIRInstanceAvailability($data[self::FIELD_AVAILABILITY])); } @@ -351,8 +358,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CLINICAL_INFORMATION] instanceof FHIRString) { $this->setClinicalInformation($data[self::FIELD_CLINICAL_INFORMATION]); - } elseif ($ext && is_scalar($data[self::FIELD_CLINICAL_INFORMATION])) { - $this->setClinicalInformation(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_CLINICAL_INFORMATION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CLINICAL_INFORMATION])) { + $this->setClinicalInformation(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_CLINICAL_INFORMATION]] + $ext)); + } else if (is_array($data[self::FIELD_CLINICAL_INFORMATION])) { + $this->setClinicalInformation(new FHIRString(array_merge($ext, $data[self::FIELD_CLINICAL_INFORMATION]))); + } } else { $this->setClinicalInformation(new FHIRString($data[self::FIELD_CLINICAL_INFORMATION])); } @@ -363,8 +374,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATE_TIME] instanceof FHIRDateTime) { $this->setDateTime($data[self::FIELD_DATE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_DATE_TIME])) { - $this->setDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATE_TIME])) { + $this->setDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_DATE_TIME])) { + $this->setDateTime(new FHIRDateTime(array_merge($ext, $data[self::FIELD_DATE_TIME]))); + } } else { $this->setDateTime(new FHIRDateTime($data[self::FIELD_DATE_TIME])); } @@ -375,8 +390,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -387,17 +406,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -416,17 +442,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_MODALITY])) { foreach($data[self::FIELD_MODALITY] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRImagingModality) { $this->addModality($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addModality(new FHIRImagingModality([FHIRImagingModality::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addModality(new FHIRImagingModality([FHIRImagingModality::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addModality(new FHIRImagingModality(array_merge($v, $ext[$i]))); + } } else { $this->addModality(new FHIRImagingModality($v)); } } } elseif ($data[self::FIELD_MODALITY] instanceof FHIRImagingModality) { $this->addModality($data[self::FIELD_MODALITY]); - } elseif ($ext && is_scalar($data[self::FIELD_MODALITY])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_MODALITY])) { $this->addModality(new FHIRImagingModality([FHIRImagingModality::FIELD_VALUE => $data[self::FIELD_MODALITY]] + $ext)); } else { $this->addModality(new FHIRImagingModality($data[self::FIELD_MODALITY])); @@ -438,8 +471,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NUMBER_OF_INSTANCES] instanceof FHIRInteger) { $this->setNumberOfInstances($data[self::FIELD_NUMBER_OF_INSTANCES]); - } elseif ($ext && is_scalar($data[self::FIELD_NUMBER_OF_INSTANCES])) { - $this->setNumberOfInstances(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_NUMBER_OF_INSTANCES]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NUMBER_OF_INSTANCES])) { + $this->setNumberOfInstances(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_NUMBER_OF_INSTANCES]] + $ext)); + } else if (is_array($data[self::FIELD_NUMBER_OF_INSTANCES])) { + $this->setNumberOfInstances(new FHIRInteger(array_merge($ext, $data[self::FIELD_NUMBER_OF_INSTANCES]))); + } } else { $this->setNumberOfInstances(new FHIRInteger($data[self::FIELD_NUMBER_OF_INSTANCES])); } @@ -450,8 +487,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NUMBER_OF_SERIES] instanceof FHIRInteger) { $this->setNumberOfSeries($data[self::FIELD_NUMBER_OF_SERIES]); - } elseif ($ext && is_scalar($data[self::FIELD_NUMBER_OF_SERIES])) { - $this->setNumberOfSeries(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_NUMBER_OF_SERIES]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NUMBER_OF_SERIES])) { + $this->setNumberOfSeries(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_NUMBER_OF_SERIES]] + $ext)); + } else if (is_array($data[self::FIELD_NUMBER_OF_SERIES])) { + $this->setNumberOfSeries(new FHIRInteger(array_merge($ext, $data[self::FIELD_NUMBER_OF_SERIES]))); + } } else { $this->setNumberOfSeries(new FHIRInteger($data[self::FIELD_NUMBER_OF_SERIES])); } @@ -459,6 +500,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ORDER])) { if (is_array($data[self::FIELD_ORDER])) { foreach($data[self::FIELD_ORDER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRResourceReference) { $this->addOrder($v); } else { @@ -474,6 +518,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PROCEDURE])) { if (is_array($data[self::FIELD_PROCEDURE])) { foreach($data[self::FIELD_PROCEDURE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCoding) { $this->addProcedure($v); } else { @@ -496,6 +543,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SERIES])) { if (is_array($data[self::FIELD_SERIES])) { foreach($data[self::FIELD_SERIES] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRImagingStudySeries) { $this->addSeries($v); } else { @@ -521,8 +571,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_UID] instanceof FHIROid) { $this->setUid($data[self::FIELD_UID]); - } elseif ($ext && is_scalar($data[self::FIELD_UID])) { - $this->setUid(new FHIROid([FHIROid::FIELD_VALUE => $data[self::FIELD_UID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_UID])) { + $this->setUid(new FHIROid([FHIROid::FIELD_VALUE => $data[self::FIELD_UID]] + $ext)); + } else if (is_array($data[self::FIELD_UID])) { + $this->setUid(new FHIROid(array_merge($ext, $data[self::FIELD_UID]))); + } } else { $this->setUid(new FHIROid($data[self::FIELD_UID])); } @@ -533,8 +587,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_URL] instanceof FHIRUri) { $this->setUrl($data[self::FIELD_URL]); - } elseif ($ext && is_scalar($data[self::FIELD_URL])) { - $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } else if (is_array($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri(array_merge($ext, $data[self::FIELD_URL]))); + } } else { $this->setUrl(new FHIRUri($data[self::FIELD_URL])); } @@ -1426,11 +1484,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getAccessionNo())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ACCESSION_NO, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getAvailability())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AVAILABILITY, null, $v->_getFHIRXMLNamespace())); } @@ -1443,7 +1499,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESCRIPTION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -1456,7 +1511,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getInterpreter())) { $v->xmlSerialize($sxe->addChild(self::FIELD_INTERPRETER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getModality())) { foreach($vs as $v) { if (null === $v) { @@ -1465,13 +1519,13 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_MODALITY, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getNumberOfInstances())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NUMBER_OF_INSTANCES, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getNumberOfSeries())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NUMBER_OF_SERIES, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getOrder())) { foreach($vs as $v) { if (null === $v) { @@ -1493,7 +1547,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getReferrer())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REFERRER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getSeries())) { foreach($vs as $v) { if (null === $v) { @@ -1522,39 +1575,122 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getAccessionNo())) { - $a[self::FIELD_ACCESSION_NO] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ACCESSION_NO] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ACCESSION_NO_EXT] = $enc; + } + } else { + $a[self::FIELD_ACCESSION_NO] = $v; + } } if (null !== ($v = $this->getAvailability())) { - $a[self::FIELD_AVAILABILITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_AVAILABILITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_AVAILABILITY_EXT] = $enc; + } + } else { + $a[self::FIELD_AVAILABILITY] = $v; + } } if (null !== ($v = $this->getClinicalInformation())) { - $a[self::FIELD_CLINICAL_INFORMATION] = $v->getValue(); - $a[self::FIELD_CLINICAL_INFORMATION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CLINICAL_INFORMATION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CLINICAL_INFORMATION_EXT] = $enc; + } + } else { + $a[self::FIELD_CLINICAL_INFORMATION] = $v; + } } if (null !== ($v = $this->getDateTime())) { - $a[self::FIELD_DATE_TIME] = $v->getValue(); - $a[self::FIELD_DATE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_DATE_TIME] = $v; + } } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if (null !== ($v = $this->getInterpreter())) { $a[self::FIELD_INTERPRETER] = $v; } if ([] !== ($vs = $this->getModality())) { - $a[self::FIELD_MODALITY] = $vs; + $a[self::FIELD_MODALITY] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MODALITY][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MODALITY_EXT][] = $enc; + } else { + $a[self::FIELD_MODALITY_EXT][] = null; + } + } else { + $a[self::FIELD_MODALITY][] = $v; + } + } } if (null !== ($v = $this->getNumberOfInstances())) { - $a[self::FIELD_NUMBER_OF_INSTANCES] = $v->getValue(); - $a[self::FIELD_NUMBER_OF_INSTANCES_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NUMBER_OF_INSTANCES] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NUMBER_OF_INSTANCES_EXT] = $enc; + } + } else { + $a[self::FIELD_NUMBER_OF_INSTANCES] = $v; + } } if (null !== ($v = $this->getNumberOfSeries())) { - $a[self::FIELD_NUMBER_OF_SERIES] = $v->getValue(); - $a[self::FIELD_NUMBER_OF_SERIES_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NUMBER_OF_SERIES] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NUMBER_OF_SERIES_EXT] = $enc; + } + } else { + $a[self::FIELD_NUMBER_OF_SERIES] = $v; + } } if ([] !== ($vs = $this->getOrder())) { $a[self::FIELD_ORDER] = $vs; @@ -1572,12 +1708,26 @@ public function jsonSerialize() $a[self::FIELD_SUBJECT] = $v; } if (null !== ($v = $this->getUid())) { - $a[self::FIELD_UID] = $v->getValue(); - $a[self::FIELD_UID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_UID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_UID_EXT] = $enc; + } + } else { + $a[self::FIELD_UID] = $v; + } } if (null !== ($v = $this->getUrl())) { - $a[self::FIELD_URL] = $v->getValue(); - $a[self::FIELD_URL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_URL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_URL_EXT] = $enc; + } + } else { + $a[self::FIELD_URL] = $v; + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRImmunization.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRImmunization.php index aa4efa9d58..4a0d197846 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRImmunization.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRImmunization.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -84,10 +84,6 @@ class FHIRImmunization extends FHIRResource implements PHPFHIRContainedTypeInter { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_IMMUNIZATION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DATE = 'date'; const FIELD_DATE_EXT = '_date'; const FIELD_DOSE_QUANTITY = 'doseQuantity'; @@ -313,6 +309,9 @@ class FHIRImmunization extends FHIRResource implements PHPFHIRContainedTypeInter */ protected $vaccineType = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRImmunization Constructor * @param null|array $data @@ -335,8 +334,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATE] instanceof FHIRDateTime) { $this->setDate($data[self::FIELD_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_DATE])) { - $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime(array_merge($ext, $data[self::FIELD_DATE]))); + } } else { $this->setDate(new FHIRDateTime($data[self::FIELD_DATE])); } @@ -347,8 +350,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DOSE_QUANTITY] instanceof FHIRQuantity) { $this->setDoseQuantity($data[self::FIELD_DOSE_QUANTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_DOSE_QUANTITY])) { - $this->setDoseQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_DOSE_QUANTITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DOSE_QUANTITY])) { + $this->setDoseQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_DOSE_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_DOSE_QUANTITY])) { + $this->setDoseQuantity(new FHIRQuantity(array_merge($ext, $data[self::FIELD_DOSE_QUANTITY]))); + } } else { $this->setDoseQuantity(new FHIRQuantity($data[self::FIELD_DOSE_QUANTITY])); } @@ -359,8 +366,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EXPIRATION_DATE] instanceof FHIRDate) { $this->setExpirationDate($data[self::FIELD_EXPIRATION_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_EXPIRATION_DATE])) { - $this->setExpirationDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_EXPIRATION_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EXPIRATION_DATE])) { + $this->setExpirationDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_EXPIRATION_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_EXPIRATION_DATE])) { + $this->setExpirationDate(new FHIRDate(array_merge($ext, $data[self::FIELD_EXPIRATION_DATE]))); + } } else { $this->setExpirationDate(new FHIRDate($data[self::FIELD_EXPIRATION_DATE])); } @@ -378,17 +389,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -407,8 +425,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_LOT_NUMBER] instanceof FHIRString) { $this->setLotNumber($data[self::FIELD_LOT_NUMBER]); - } elseif ($ext && is_scalar($data[self::FIELD_LOT_NUMBER])) { - $this->setLotNumber(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_LOT_NUMBER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_LOT_NUMBER])) { + $this->setLotNumber(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_LOT_NUMBER]] + $ext)); + } else if (is_array($data[self::FIELD_LOT_NUMBER])) { + $this->setLotNumber(new FHIRString(array_merge($ext, $data[self::FIELD_LOT_NUMBER]))); + } } else { $this->setLotNumber(new FHIRString($data[self::FIELD_LOT_NUMBER])); } @@ -430,6 +452,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REACTION])) { if (is_array($data[self::FIELD_REACTION])) { foreach($data[self::FIELD_REACTION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRImmunizationReaction) { $this->addReaction($v); } else { @@ -448,8 +473,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_REFUSED_INDICATOR] instanceof FHIRBoolean) { $this->setRefusedIndicator($data[self::FIELD_REFUSED_INDICATOR]); - } elseif ($ext && is_scalar($data[self::FIELD_REFUSED_INDICATOR])) { - $this->setRefusedIndicator(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_REFUSED_INDICATOR]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_REFUSED_INDICATOR])) { + $this->setRefusedIndicator(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_REFUSED_INDICATOR]] + $ext)); + } else if (is_array($data[self::FIELD_REFUSED_INDICATOR])) { + $this->setRefusedIndicator(new FHIRBoolean(array_merge($ext, $data[self::FIELD_REFUSED_INDICATOR]))); + } } else { $this->setRefusedIndicator(new FHIRBoolean($data[self::FIELD_REFUSED_INDICATOR])); } @@ -460,8 +489,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_REPORTED] instanceof FHIRBoolean) { $this->setReported($data[self::FIELD_REPORTED]); - } elseif ($ext && is_scalar($data[self::FIELD_REPORTED])) { - $this->setReported(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_REPORTED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_REPORTED])) { + $this->setReported(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_REPORTED]] + $ext)); + } else if (is_array($data[self::FIELD_REPORTED])) { + $this->setReported(new FHIRBoolean(array_merge($ext, $data[self::FIELD_REPORTED]))); + } } else { $this->setReported(new FHIRBoolean($data[self::FIELD_REPORTED])); } @@ -497,6 +530,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_VACCINATION_PROTOCOL])) { if (is_array($data[self::FIELD_VACCINATION_PROTOCOL])) { foreach($data[self::FIELD_VACCINATION_PROTOCOL] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRImmunizationVaccinationProtocol) { $this->addVaccinationProtocol($v); } else { @@ -1361,18 +1397,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DATE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDoseQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DOSE_QUANTITY, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getExpirationDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EXPIRATION_DATE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getExplanation())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EXPLANATION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -1388,15 +1421,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getLotNumber())) { $v->xmlSerialize($sxe->addChild(self::FIELD_LOT_NUMBER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getManufacturer())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MANUFACTURER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPerformer())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PERFORMER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getReaction())) { foreach($vs as $v) { if (null === $v) { @@ -1405,29 +1435,25 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_REACTION, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getRefusedIndicator())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REFUSED_INDICATOR, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getReported())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REPORTED, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRequester())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REQUESTER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRoute())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ROUTE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSite())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SITE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSubject())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBJECT, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getVaccinationProtocol())) { foreach($vs as $v) { if (null === $v) { @@ -1450,28 +1476,73 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getDate())) { - $a[self::FIELD_DATE] = $v->getValue(); - $a[self::FIELD_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_DATE] = $v; + } } if (null !== ($v = $this->getDoseQuantity())) { - $a[self::FIELD_DOSE_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DOSE_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DOSE_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_DOSE_QUANTITY] = $v; + } } if (null !== ($v = $this->getExpirationDate())) { - $a[self::FIELD_EXPIRATION_DATE] = $v->getValue(); - $a[self::FIELD_EXPIRATION_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EXPIRATION_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EXPIRATION_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_EXPIRATION_DATE] = $v; + } } if (null !== ($v = $this->getExplanation())) { $a[self::FIELD_EXPLANATION] = $v; } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if (null !== ($v = $this->getLocation())) { $a[self::FIELD_LOCATION] = $v; } if (null !== ($v = $this->getLotNumber())) { - $a[self::FIELD_LOT_NUMBER] = $v->getValue(); - $a[self::FIELD_LOT_NUMBER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_LOT_NUMBER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_LOT_NUMBER_EXT] = $enc; + } + } else { + $a[self::FIELD_LOT_NUMBER] = $v; + } } if (null !== ($v = $this->getManufacturer())) { $a[self::FIELD_MANUFACTURER] = $v; @@ -1483,12 +1554,26 @@ public function jsonSerialize() $a[self::FIELD_REACTION] = $vs; } if (null !== ($v = $this->getRefusedIndicator())) { - $a[self::FIELD_REFUSED_INDICATOR] = $v->getValue(); - $a[self::FIELD_REFUSED_INDICATOR_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_REFUSED_INDICATOR] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_REFUSED_INDICATOR_EXT] = $enc; + } + } else { + $a[self::FIELD_REFUSED_INDICATOR] = $v; + } } if (null !== ($v = $this->getReported())) { - $a[self::FIELD_REPORTED] = $v->getValue(); - $a[self::FIELD_REPORTED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_REPORTED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_REPORTED_EXT] = $enc; + } + } else { + $a[self::FIELD_REPORTED] = $v; + } } if (null !== ($v = $this->getRequester())) { $a[self::FIELD_REQUESTER] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRImmunizationRecommendation.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRImmunizationRecommendation.php index 7e602fa789..d2c98c6474 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRImmunizationRecommendation.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRImmunizationRecommendation.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -77,10 +77,6 @@ class FHIRImmunizationRecommendation extends FHIRResource implements PHPFHIRCont { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_IMMUNIZATION_RECOMMENDATION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_IDENTIFIER = 'identifier'; const FIELD_IDENTIFIER_EXT = '_identifier'; const FIELD_RECOMMENDATION = 'recommendation'; @@ -118,6 +114,9 @@ class FHIRImmunizationRecommendation extends FHIRResource implements PHPFHIRCont */ protected $subject = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRImmunizationRecommendation Constructor * @param null|array $data @@ -140,17 +139,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -159,6 +165,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_RECOMMENDATION])) { if (is_array($data[self::FIELD_RECOMMENDATION])) { foreach($data[self::FIELD_RECOMMENDATION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRImmunizationRecommendationRecommendation) { $this->addRecommendation($v); } else { @@ -439,7 +448,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -471,7 +479,23 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if ([] !== ($vs = $this->getRecommendation())) { $a[self::FIELD_RECOMMENDATION] = $vs; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRList.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRList.php index a6133dfecd..88fc4225e0 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRList extends FHIRResource implements PHPFHIRContainedTypeInterface { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_LIST; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CODE = 'code'; const FIELD_DATE = 'date'; const FIELD_DATE_EXT = '_date'; @@ -202,6 +198,9 @@ class FHIRList extends FHIRResource implements PHPFHIRContainedTypeInterface */ protected $subject = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRList Constructor * @param null|array $data @@ -231,8 +230,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATE] instanceof FHIRDateTime) { $this->setDate($data[self::FIELD_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_DATE])) { - $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime(array_merge($ext, $data[self::FIELD_DATE]))); + } } else { $this->setDate(new FHIRDateTime($data[self::FIELD_DATE])); } @@ -247,6 +250,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ENTRY])) { if (is_array($data[self::FIELD_ENTRY])) { foreach($data[self::FIELD_ENTRY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRListEntry) { $this->addEntry($v); } else { @@ -265,17 +271,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -287,8 +300,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MODE] instanceof FHIRListMode) { $this->setMode($data[self::FIELD_MODE]); - } elseif ($ext && is_scalar($data[self::FIELD_MODE])) { - $this->setMode(new FHIRListMode([FHIRListMode::FIELD_VALUE => $data[self::FIELD_MODE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MODE])) { + $this->setMode(new FHIRListMode([FHIRListMode::FIELD_VALUE => $data[self::FIELD_MODE]] + $ext)); + } else if (is_array($data[self::FIELD_MODE])) { + $this->setMode(new FHIRListMode(array_merge($ext, $data[self::FIELD_MODE]))); + } } else { $this->setMode(new FHIRListMode($data[self::FIELD_MODE])); } @@ -299,8 +316,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ORDERED] instanceof FHIRBoolean) { $this->setOrdered($data[self::FIELD_ORDERED]); - } elseif ($ext && is_scalar($data[self::FIELD_ORDERED])) { - $this->setOrdered(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_ORDERED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ORDERED])) { + $this->setOrdered(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_ORDERED]] + $ext)); + } else if (is_array($data[self::FIELD_ORDERED])) { + $this->setOrdered(new FHIRBoolean(array_merge($ext, $data[self::FIELD_ORDERED]))); + } } else { $this->setOrdered(new FHIRBoolean($data[self::FIELD_ORDERED])); } @@ -812,18 +833,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DATE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getEmptyReason())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EMPTY_REASON, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getEntry())) { foreach($vs as $v) { if (null === $v) { @@ -848,11 +866,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getOrdered())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ORDERED, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSource())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SOURCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSubject())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBJECT, null, $v->_getFHIRXMLNamespace())); } @@ -869,8 +885,15 @@ public function jsonSerialize() $a[self::FIELD_CODE] = $v; } if (null !== ($v = $this->getDate())) { - $a[self::FIELD_DATE] = $v->getValue(); - $a[self::FIELD_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_DATE] = $v; + } } if (null !== ($v = $this->getEmptyReason())) { $a[self::FIELD_EMPTY_REASON] = $v; @@ -879,14 +902,45 @@ public function jsonSerialize() $a[self::FIELD_ENTRY] = $vs; } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if (null !== ($v = $this->getMode())) { - $a[self::FIELD_MODE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MODE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MODE_EXT] = $enc; + } + } else { + $a[self::FIELD_MODE] = $v; + } } if (null !== ($v = $this->getOrdered())) { - $a[self::FIELD_ORDERED] = $v->getValue(); - $a[self::FIELD_ORDERED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ORDERED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ORDERED_EXT] = $enc; + } + } else { + $a[self::FIELD_ORDERED] = $v; + } } if (null !== ($v = $this->getSource())) { $a[self::FIELD_SOURCE] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRLocation.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRLocation.php index f9093addf0..fe6d66be9b 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRLocation.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRLocation.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -84,10 +84,6 @@ class FHIRLocation extends FHIRResource implements PHPFHIRContainedTypeInterface { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_LOCATION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ADDRESS = 'address'; const FIELD_DESCRIPTION = 'description'; const FIELD_DESCRIPTION_EXT = '_description'; @@ -245,6 +241,9 @@ class FHIRLocation extends FHIRResource implements PHPFHIRContainedTypeInterface */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRLocation Constructor * @param null|array $data @@ -274,8 +273,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -286,8 +289,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->setIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { - $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_IDENTIFIER]))); + } } else { $this->setIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); } @@ -305,8 +312,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MODE] instanceof FHIRLocationMode) { $this->setMode($data[self::FIELD_MODE]); - } elseif ($ext && is_scalar($data[self::FIELD_MODE])) { - $this->setMode(new FHIRLocationMode([FHIRLocationMode::FIELD_VALUE => $data[self::FIELD_MODE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MODE])) { + $this->setMode(new FHIRLocationMode([FHIRLocationMode::FIELD_VALUE => $data[self::FIELD_MODE]] + $ext)); + } else if (is_array($data[self::FIELD_MODE])) { + $this->setMode(new FHIRLocationMode(array_merge($ext, $data[self::FIELD_MODE]))); + } } else { $this->setMode(new FHIRLocationMode($data[self::FIELD_MODE])); } @@ -317,8 +328,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -350,8 +365,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRLocationStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRLocationStatus([FHIRLocationStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRLocationStatus([FHIRLocationStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRLocationStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRLocationStatus($data[self::FIELD_STATUS])); } @@ -362,17 +381,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_TELECOM])) { foreach($data[self::FIELD_TELECOM] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContact) { $this->addTelecom($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addTelecom(new FHIRContact([FHIRContact::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addTelecom(new FHIRContact([FHIRContact::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addTelecom(new FHIRContact(array_merge($v, $ext[$i]))); + } } else { $this->addTelecom(new FHIRContact($v)); } } } elseif ($data[self::FIELD_TELECOM] instanceof FHIRContact) { $this->addTelecom($data[self::FIELD_TELECOM]); - } elseif ($ext && is_scalar($data[self::FIELD_TELECOM])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_TELECOM])) { $this->addTelecom(new FHIRContact([FHIRContact::FIELD_VALUE => $data[self::FIELD_TELECOM]] + $ext)); } else { $this->addTelecom(new FHIRContact($data[self::FIELD_TELECOM])); @@ -955,45 +981,36 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getAddress())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ADDRESS, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getDescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESCRIPTION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getManagingOrganization())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MANAGING_ORGANIZATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getMode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MODE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NAME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPartOf())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PART_OF, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPhysicalType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PHYSICAL_TYPE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPosition())) { $v->xmlSerialize($sxe->addChild(self::FIELD_POSITION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getTelecom())) { foreach($vs as $v) { if (null === $v) { @@ -1019,21 +1036,51 @@ public function jsonSerialize() $a[self::FIELD_ADDRESS] = $v; } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if (null !== ($v = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_IDENTIFIER] = $v; + } } if (null !== ($v = $this->getManagingOrganization())) { $a[self::FIELD_MANAGING_ORGANIZATION] = $v; } if (null !== ($v = $this->getMode())) { - $a[self::FIELD_MODE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MODE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MODE_EXT] = $enc; + } + } else { + $a[self::FIELD_MODE] = $v; + } } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if (null !== ($v = $this->getPartOf())) { $a[self::FIELD_PART_OF] = $v; @@ -1045,10 +1092,34 @@ public function jsonSerialize() $a[self::FIELD_POSITION] = $v; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if ([] !== ($vs = $this->getTelecom())) { - $a[self::FIELD_TELECOM] = $vs; + $a[self::FIELD_TELECOM] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TELECOM][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TELECOM_EXT][] = $enc; + } else { + $a[self::FIELD_TELECOM_EXT][] = null; + } + } else { + $a[self::FIELD_TELECOM][] = $v; + } + } } if (null !== ($v = $this->getType())) { $a[self::FIELD_TYPE] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRMedia.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRMedia.php index cb03ceddc2..8c5a7aed3a 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRMedia.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRMedia.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -82,10 +82,6 @@ class FHIRMedia extends FHIRResource implements PHPFHIRContainedTypeInterface { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MEDIA; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CONTENT = 'content'; const FIELD_DATE_TIME = 'dateTime'; const FIELD_DATE_TIME_EXT = '_dateTime'; @@ -261,6 +257,9 @@ class FHIRMedia extends FHIRResource implements PHPFHIRContainedTypeInterface */ protected $width = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMedia Constructor * @param null|array $data @@ -290,8 +289,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATE_TIME] instanceof FHIRDateTime) { $this->setDateTime($data[self::FIELD_DATE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_DATE_TIME])) { - $this->setDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATE_TIME])) { + $this->setDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_DATE_TIME])) { + $this->setDateTime(new FHIRDateTime(array_merge($ext, $data[self::FIELD_DATE_TIME]))); + } } else { $this->setDateTime(new FHIRDateTime($data[self::FIELD_DATE_TIME])); } @@ -302,8 +305,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DEVICE_NAME] instanceof FHIRString) { $this->setDeviceName($data[self::FIELD_DEVICE_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_DEVICE_NAME])) { - $this->setDeviceName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DEVICE_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DEVICE_NAME])) { + $this->setDeviceName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DEVICE_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_DEVICE_NAME])) { + $this->setDeviceName(new FHIRString(array_merge($ext, $data[self::FIELD_DEVICE_NAME]))); + } } else { $this->setDeviceName(new FHIRString($data[self::FIELD_DEVICE_NAME])); } @@ -314,8 +321,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_FRAMES] instanceof FHIRInteger) { $this->setFrames($data[self::FIELD_FRAMES]); - } elseif ($ext && is_scalar($data[self::FIELD_FRAMES])) { - $this->setFrames(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_FRAMES]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_FRAMES])) { + $this->setFrames(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_FRAMES]] + $ext)); + } else if (is_array($data[self::FIELD_FRAMES])) { + $this->setFrames(new FHIRInteger(array_merge($ext, $data[self::FIELD_FRAMES]))); + } } else { $this->setFrames(new FHIRInteger($data[self::FIELD_FRAMES])); } @@ -326,8 +337,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_HEIGHT] instanceof FHIRInteger) { $this->setHeight($data[self::FIELD_HEIGHT]); - } elseif ($ext && is_scalar($data[self::FIELD_HEIGHT])) { - $this->setHeight(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_HEIGHT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_HEIGHT])) { + $this->setHeight(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_HEIGHT]] + $ext)); + } else if (is_array($data[self::FIELD_HEIGHT])) { + $this->setHeight(new FHIRInteger(array_merge($ext, $data[self::FIELD_HEIGHT]))); + } } else { $this->setHeight(new FHIRInteger($data[self::FIELD_HEIGHT])); } @@ -338,17 +353,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -360,8 +382,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_LENGTH] instanceof FHIRInteger) { $this->setLength($data[self::FIELD_LENGTH]); - } elseif ($ext && is_scalar($data[self::FIELD_LENGTH])) { - $this->setLength(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_LENGTH]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_LENGTH])) { + $this->setLength(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_LENGTH]] + $ext)); + } else if (is_array($data[self::FIELD_LENGTH])) { + $this->setLength(new FHIRInteger(array_merge($ext, $data[self::FIELD_LENGTH]))); + } } else { $this->setLength(new FHIRInteger($data[self::FIELD_LENGTH])); } @@ -393,8 +419,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TYPE] instanceof FHIRMediaType) { $this->setType($data[self::FIELD_TYPE]); - } elseif ($ext && is_scalar($data[self::FIELD_TYPE])) { - $this->setType(new FHIRMediaType([FHIRMediaType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TYPE])) { + $this->setType(new FHIRMediaType([FHIRMediaType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } else if (is_array($data[self::FIELD_TYPE])) { + $this->setType(new FHIRMediaType(array_merge($ext, $data[self::FIELD_TYPE]))); + } } else { $this->setType(new FHIRMediaType($data[self::FIELD_TYPE])); } @@ -412,8 +442,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_WIDTH] instanceof FHIRInteger) { $this->setWidth($data[self::FIELD_WIDTH]); - } elseif ($ext && is_scalar($data[self::FIELD_WIDTH])) { - $this->setWidth(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_WIDTH]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_WIDTH])) { + $this->setWidth(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_WIDTH]] + $ext)); + } else if (is_array($data[self::FIELD_WIDTH])) { + $this->setWidth(new FHIRInteger(array_merge($ext, $data[self::FIELD_WIDTH]))); + } } else { $this->setWidth(new FHIRInteger($data[self::FIELD_WIDTH])); } @@ -1072,7 +1106,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getContent())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CONTENT, null, $v->_getFHIRXMLNamespace())); } @@ -1088,7 +1121,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getHeight())) { $v->xmlSerialize($sxe->addChild(self::FIELD_HEIGHT, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -1097,26 +1129,22 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getLength())) { $v->xmlSerialize($sxe->addChild(self::FIELD_LENGTH, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOperator())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OPERATOR, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSubject())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBJECT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSubtype())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBTYPE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getView())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VIEW, null, $v->_getFHIRXMLNamespace())); } @@ -1136,27 +1164,78 @@ public function jsonSerialize() $a[self::FIELD_CONTENT] = $v; } if (null !== ($v = $this->getDateTime())) { - $a[self::FIELD_DATE_TIME] = $v->getValue(); - $a[self::FIELD_DATE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_DATE_TIME] = $v; + } } if (null !== ($v = $this->getDeviceName())) { - $a[self::FIELD_DEVICE_NAME] = $v->getValue(); - $a[self::FIELD_DEVICE_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DEVICE_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DEVICE_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_DEVICE_NAME] = $v; + } } if (null !== ($v = $this->getFrames())) { - $a[self::FIELD_FRAMES] = $v->getValue(); - $a[self::FIELD_FRAMES_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FRAMES] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FRAMES_EXT] = $enc; + } + } else { + $a[self::FIELD_FRAMES] = $v; + } } if (null !== ($v = $this->getHeight())) { - $a[self::FIELD_HEIGHT] = $v->getValue(); - $a[self::FIELD_HEIGHT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_HEIGHT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_HEIGHT_EXT] = $enc; + } + } else { + $a[self::FIELD_HEIGHT] = $v; + } } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if (null !== ($v = $this->getLength())) { - $a[self::FIELD_LENGTH] = $v->getValue(); - $a[self::FIELD_LENGTH_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_LENGTH] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_LENGTH_EXT] = $enc; + } + } else { + $a[self::FIELD_LENGTH] = $v; + } } if (null !== ($v = $this->getOperator())) { $a[self::FIELD_OPERATOR] = $v; @@ -1168,14 +1247,29 @@ public function jsonSerialize() $a[self::FIELD_SUBTYPE] = $v; } if (null !== ($v = $this->getType())) { - $a[self::FIELD_TYPE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TYPE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TYPE_EXT] = $enc; + } + } else { + $a[self::FIELD_TYPE] = $v; + } } if (null !== ($v = $this->getView())) { $a[self::FIELD_VIEW] = $v; } if (null !== ($v = $this->getWidth())) { - $a[self::FIELD_WIDTH] = $v->getValue(); - $a[self::FIELD_WIDTH_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_WIDTH] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_WIDTH_EXT] = $enc; + } + } else { + $a[self::FIELD_WIDTH] = $v; + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRMedication.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRMedication.php index 0c1968d2a7..d7cdf6307c 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRMedication.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRMedication.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -81,10 +81,6 @@ class FHIRMedication extends FHIRResource implements PHPFHIRContainedTypeInterfa { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MEDICATION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CODE = 'code'; const FIELD_IS_BRAND = 'isBrand'; const FIELD_IS_BRAND_EXT = '_isBrand'; @@ -176,6 +172,9 @@ class FHIRMedication extends FHIRResource implements PHPFHIRContainedTypeInterfa */ protected $product = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMedication Constructor * @param null|array $data @@ -205,8 +204,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IS_BRAND] instanceof FHIRBoolean) { $this->setIsBrand($data[self::FIELD_IS_BRAND]); - } elseif ($ext && is_scalar($data[self::FIELD_IS_BRAND])) { - $this->setIsBrand(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_IS_BRAND]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IS_BRAND])) { + $this->setIsBrand(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_IS_BRAND]] + $ext)); + } else if (is_array($data[self::FIELD_IS_BRAND])) { + $this->setIsBrand(new FHIRBoolean(array_merge($ext, $data[self::FIELD_IS_BRAND]))); + } } else { $this->setIsBrand(new FHIRBoolean($data[self::FIELD_IS_BRAND])); } @@ -217,8 +220,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_KIND] instanceof FHIRMedicationKind) { $this->setKind($data[self::FIELD_KIND]); - } elseif ($ext && is_scalar($data[self::FIELD_KIND])) { - $this->setKind(new FHIRMedicationKind([FHIRMedicationKind::FIELD_VALUE => $data[self::FIELD_KIND]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_KIND])) { + $this->setKind(new FHIRMedicationKind([FHIRMedicationKind::FIELD_VALUE => $data[self::FIELD_KIND]] + $ext)); + } else if (is_array($data[self::FIELD_KIND])) { + $this->setKind(new FHIRMedicationKind(array_merge($ext, $data[self::FIELD_KIND]))); + } } else { $this->setKind(new FHIRMedicationKind($data[self::FIELD_KIND])); } @@ -236,8 +243,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -624,29 +635,24 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getIsBrand())) { $v->xmlSerialize($sxe->addChild(self::FIELD_IS_BRAND, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getKind())) { $v->xmlSerialize($sxe->addChild(self::FIELD_KIND, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getManufacturer())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MANUFACTURER, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NAME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPackage())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PACKAGE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getProduct())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PRODUCT, null, $v->_getFHIRXMLNamespace())); } @@ -663,18 +669,40 @@ public function jsonSerialize() $a[self::FIELD_CODE] = $v; } if (null !== ($v = $this->getIsBrand())) { - $a[self::FIELD_IS_BRAND] = $v->getValue(); - $a[self::FIELD_IS_BRAND_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IS_BRAND] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IS_BRAND_EXT] = $enc; + } + } else { + $a[self::FIELD_IS_BRAND] = $v; + } } if (null !== ($v = $this->getKind())) { - $a[self::FIELD_KIND] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_KIND] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_KIND_EXT] = $enc; + } + } else { + $a[self::FIELD_KIND] = $v; + } } if (null !== ($v = $this->getManufacturer())) { $a[self::FIELD_MANUFACTURER] = $v; } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if (null !== ($v = $this->getPackage())) { $a[self::FIELD_PACKAGE] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRMedicationAdministration.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRMedicationAdministration.php index 0a769214cb..b1a5de7968 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRMedicationAdministration.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRMedicationAdministration.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -83,10 +83,6 @@ class FHIRMedicationAdministration extends FHIRResource implements PHPFHIRContai { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MEDICATION_ADMINISTRATION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DEVICE = 'device'; const FIELD_DOSAGE = 'dosage'; const FIELD_ENCOUNTER = 'encounter'; @@ -251,6 +247,9 @@ class FHIRMedicationAdministration extends FHIRResource implements PHPFHIRContai */ protected $whenGiven = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMedicationAdministration Constructor * @param null|array $data @@ -270,6 +269,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_DEVICE])) { if (is_array($data[self::FIELD_DEVICE])) { foreach($data[self::FIELD_DEVICE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRResourceReference) { $this->addDevice($v); } else { @@ -285,6 +287,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_DOSAGE])) { if (is_array($data[self::FIELD_DOSAGE])) { foreach($data[self::FIELD_DOSAGE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRMedicationAdministrationDosage) { $this->addDosage($v); } else { @@ -310,17 +315,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -357,6 +369,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REASON_NOT_GIVEN])) { if (is_array($data[self::FIELD_REASON_NOT_GIVEN])) { foreach($data[self::FIELD_REASON_NOT_GIVEN] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addReasonNotGiven($v); } else { @@ -375,8 +390,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRMedicationAdministrationStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRMedicationAdministrationStatus([FHIRMedicationAdministrationStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRMedicationAdministrationStatus([FHIRMedicationAdministrationStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRMedicationAdministrationStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRMedicationAdministrationStatus($data[self::FIELD_STATUS])); } @@ -387,8 +406,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_WAS_NOT_GIVEN] instanceof FHIRBoolean) { $this->setWasNotGiven($data[self::FIELD_WAS_NOT_GIVEN]); - } elseif ($ext && is_scalar($data[self::FIELD_WAS_NOT_GIVEN])) { - $this->setWasNotGiven(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_WAS_NOT_GIVEN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_WAS_NOT_GIVEN])) { + $this->setWasNotGiven(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_WAS_NOT_GIVEN]] + $ext)); + } else if (is_array($data[self::FIELD_WAS_NOT_GIVEN])) { + $this->setWasNotGiven(new FHIRBoolean(array_merge($ext, $data[self::FIELD_WAS_NOT_GIVEN]))); + } } else { $this->setWasNotGiven(new FHIRBoolean($data[self::FIELD_WAS_NOT_GIVEN])); } @@ -1069,7 +1092,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getDevice())) { foreach($vs as $v) { if (null === $v) { @@ -1091,7 +1113,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getEncounter())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ENCOUNTER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -1104,19 +1125,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getMedication())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MEDICATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPatient())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATIENT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPractitioner())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PRACTITIONER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPrescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PRESCRIPTION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getReasonNotGiven())) { foreach($vs as $v) { if (null === $v) { @@ -1132,7 +1149,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getWasNotGiven())) { $v->xmlSerialize($sxe->addChild(self::FIELD_WAS_NOT_GIVEN, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getWhenGiven())) { $v->xmlSerialize($sxe->addChild(self::FIELD_WHEN_GIVEN, null, $v->_getFHIRXMLNamespace())); } @@ -1155,7 +1171,23 @@ public function jsonSerialize() $a[self::FIELD_ENCOUNTER] = $v; } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if (null !== ($v = $this->getMedication())) { $a[self::FIELD_MEDICATION] = $v; @@ -1173,11 +1205,26 @@ public function jsonSerialize() $a[self::FIELD_REASON_NOT_GIVEN] = $vs; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getWasNotGiven())) { - $a[self::FIELD_WAS_NOT_GIVEN] = $v->getValue(); - $a[self::FIELD_WAS_NOT_GIVEN_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_WAS_NOT_GIVEN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_WAS_NOT_GIVEN_EXT] = $enc; + } + } else { + $a[self::FIELD_WAS_NOT_GIVEN] = $v; + } } if (null !== ($v = $this->getWhenGiven())) { $a[self::FIELD_WHEN_GIVEN] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRMedicationDispense.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRMedicationDispense.php index 30db79e2e1..12f4188bc2 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRMedicationDispense.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRMedicationDispense.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRMedicationDispense extends FHIRResource implements PHPFHIRContainedTyp { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MEDICATION_DISPENSE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_AUTHORIZING_PRESCRIPTION = 'authorizingPrescription'; const FIELD_DISPENSE = 'dispense'; const FIELD_DISPENSER = 'dispenser'; @@ -173,6 +169,9 @@ class FHIRMedicationDispense extends FHIRResource implements PHPFHIRContainedTyp */ protected $substitution = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMedicationDispense Constructor * @param null|array $data @@ -192,6 +191,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_AUTHORIZING_PRESCRIPTION])) { if (is_array($data[self::FIELD_AUTHORIZING_PRESCRIPTION])) { foreach($data[self::FIELD_AUTHORIZING_PRESCRIPTION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRResourceReference) { $this->addAuthorizingPrescription($v); } else { @@ -207,6 +209,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_DISPENSE])) { if (is_array($data[self::FIELD_DISPENSE])) { foreach($data[self::FIELD_DISPENSE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRMedicationDispenseDispense) { $this->addDispense($v); } else { @@ -232,8 +237,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->setIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { - $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_IDENTIFIER]))); + } } else { $this->setIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); } @@ -251,8 +260,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRMedicationDispenseStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRMedicationDispenseStatus([FHIRMedicationDispenseStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRMedicationDispenseStatus([FHIRMedicationDispenseStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRMedicationDispenseStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRMedicationDispenseStatus($data[self::FIELD_STATUS])); } @@ -666,7 +679,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getAuthorizingPrescription())) { foreach($vs as $v) { if (null === $v) { @@ -688,19 +700,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDispenser())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DISPENSER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPatient())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATIENT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSubstitution())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBSTITUTION, null, $v->_getFHIRXMLNamespace())); } @@ -723,13 +731,29 @@ public function jsonSerialize() $a[self::FIELD_DISPENSER] = $v; } if (null !== ($v = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_IDENTIFIER] = $v; + } } if (null !== ($v = $this->getPatient())) { $a[self::FIELD_PATIENT] = $v; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getSubstitution())) { $a[self::FIELD_SUBSTITUTION] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRMedicationPrescription.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRMedicationPrescription.php index afbb3995b3..6c0d1f7250 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRMedicationPrescription.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRMedicationPrescription.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -82,10 +82,6 @@ class FHIRMedicationPrescription extends FHIRResource implements PHPFHIRContaine { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MEDICATION_PRESCRIPTION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DATE_WRITTEN = 'dateWritten'; const FIELD_DATE_WRITTEN_EXT = '_dateWritten'; const FIELD_DISPENSE = 'dispense'; @@ -246,6 +242,9 @@ class FHIRMedicationPrescription extends FHIRResource implements PHPFHIRContaine */ protected $substitution = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMedicationPrescription Constructor * @param null|array $data @@ -268,8 +267,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATE_WRITTEN] instanceof FHIRDateTime) { $this->setDateWritten($data[self::FIELD_DATE_WRITTEN]); - } elseif ($ext && is_scalar($data[self::FIELD_DATE_WRITTEN])) { - $this->setDateWritten(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE_WRITTEN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATE_WRITTEN])) { + $this->setDateWritten(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE_WRITTEN]] + $ext)); + } else if (is_array($data[self::FIELD_DATE_WRITTEN])) { + $this->setDateWritten(new FHIRDateTime(array_merge($ext, $data[self::FIELD_DATE_WRITTEN]))); + } } else { $this->setDateWritten(new FHIRDateTime($data[self::FIELD_DATE_WRITTEN])); } @@ -284,6 +287,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_DOSAGE_INSTRUCTION])) { if (is_array($data[self::FIELD_DOSAGE_INSTRUCTION])) { foreach($data[self::FIELD_DOSAGE_INSTRUCTION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRMedicationPrescriptionDosageInstruction) { $this->addDosageInstruction($v); } else { @@ -309,17 +315,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -366,8 +379,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRMedicationPrescriptionStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRMedicationPrescriptionStatus([FHIRMedicationPrescriptionStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRMedicationPrescriptionStatus([FHIRMedicationPrescriptionStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRMedicationPrescriptionStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRMedicationPrescriptionStatus($data[self::FIELD_STATUS])); } @@ -981,11 +998,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDateWritten())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DATE_WRITTEN, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDispense())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DISPENSE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getDosageInstruction())) { foreach($vs as $v) { if (null === $v) { @@ -998,7 +1013,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getEncounter())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ENCOUNTER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -1011,27 +1025,21 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getMedication())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MEDICATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPatient())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATIENT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPrescriber())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PRESCRIBER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getReasonCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REASON_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getReasonResource())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REASON_RESOURCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSubstitution())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBSTITUTION, null, $v->_getFHIRXMLNamespace())); } @@ -1045,8 +1053,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getDateWritten())) { - $a[self::FIELD_DATE_WRITTEN] = $v->getValue(); - $a[self::FIELD_DATE_WRITTEN_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATE_WRITTEN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATE_WRITTEN_EXT] = $enc; + } + } else { + $a[self::FIELD_DATE_WRITTEN] = $v; + } } if (null !== ($v = $this->getDispense())) { $a[self::FIELD_DISPENSE] = $v; @@ -1058,7 +1073,23 @@ public function jsonSerialize() $a[self::FIELD_ENCOUNTER] = $v; } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if (null !== ($v = $this->getMedication())) { $a[self::FIELD_MEDICATION] = $v; @@ -1076,7 +1107,15 @@ public function jsonSerialize() $a[self::FIELD_REASON_RESOURCE] = $v; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getSubstitution())) { $a[self::FIELD_SUBSTITUTION] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRMedicationStatement.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRMedicationStatement.php index 3ec3fbe0ff..cf28b0d283 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRMedicationStatement.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRMedicationStatement.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -81,10 +81,6 @@ class FHIRMedicationStatement extends FHIRResource implements PHPFHIRContainedTy { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MEDICATION_STATEMENT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DEVICE = 'device'; const FIELD_DOSAGE = 'dosage'; const FIELD_IDENTIFIER = 'identifier'; @@ -194,6 +190,9 @@ class FHIRMedicationStatement extends FHIRResource implements PHPFHIRContainedTy */ protected $whenGiven = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMedicationStatement Constructor * @param null|array $data @@ -213,6 +212,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_DEVICE])) { if (is_array($data[self::FIELD_DEVICE])) { foreach($data[self::FIELD_DEVICE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRResourceReference) { $this->addDevice($v); } else { @@ -228,6 +230,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_DOSAGE])) { if (is_array($data[self::FIELD_DOSAGE])) { foreach($data[self::FIELD_DOSAGE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRMedicationStatementDosage) { $this->addDosage($v); } else { @@ -246,17 +251,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -279,6 +291,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REASON_NOT_GIVEN])) { if (is_array($data[self::FIELD_REASON_NOT_GIVEN])) { foreach($data[self::FIELD_REASON_NOT_GIVEN] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addReasonNotGiven($v); } else { @@ -297,8 +312,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_WAS_NOT_GIVEN] instanceof FHIRBoolean) { $this->setWasNotGiven($data[self::FIELD_WAS_NOT_GIVEN]); - } elseif ($ext && is_scalar($data[self::FIELD_WAS_NOT_GIVEN])) { - $this->setWasNotGiven(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_WAS_NOT_GIVEN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_WAS_NOT_GIVEN])) { + $this->setWasNotGiven(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_WAS_NOT_GIVEN]] + $ext)); + } else if (is_array($data[self::FIELD_WAS_NOT_GIVEN])) { + $this->setWasNotGiven(new FHIRBoolean(array_merge($ext, $data[self::FIELD_WAS_NOT_GIVEN]))); + } } else { $this->setWasNotGiven(new FHIRBoolean($data[self::FIELD_WAS_NOT_GIVEN])); } @@ -834,7 +853,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getDevice())) { foreach($vs as $v) { if (null === $v) { @@ -865,11 +883,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getMedication())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MEDICATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPatient())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATIENT, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getReasonNotGiven())) { foreach($vs as $v) { if (null === $v) { @@ -878,10 +894,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_REASON_NOT_GIVEN, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getWasNotGiven())) { $v->xmlSerialize($sxe->addChild(self::FIELD_WAS_NOT_GIVEN, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getWhenGiven())) { $v->xmlSerialize($sxe->addChild(self::FIELD_WHEN_GIVEN, null, $v->_getFHIRXMLNamespace())); } @@ -901,7 +917,23 @@ public function jsonSerialize() $a[self::FIELD_DOSAGE] = $vs; } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if (null !== ($v = $this->getMedication())) { $a[self::FIELD_MEDICATION] = $v; @@ -913,8 +945,15 @@ public function jsonSerialize() $a[self::FIELD_REASON_NOT_GIVEN] = $vs; } if (null !== ($v = $this->getWasNotGiven())) { - $a[self::FIELD_WAS_NOT_GIVEN] = $v->getValue(); - $a[self::FIELD_WAS_NOT_GIVEN_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_WAS_NOT_GIVEN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_WAS_NOT_GIVEN_EXT] = $enc; + } + } else { + $a[self::FIELD_WAS_NOT_GIVEN] = $v; + } } if (null !== ($v = $this->getWhenGiven())) { $a[self::FIELD_WHEN_GIVEN] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRMessageHeader.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRMessageHeader.php index e10957209f..cb308b74ca 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRMessageHeader.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRMessageHeader.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -84,10 +84,6 @@ class FHIRMessageHeader extends FHIRResource implements PHPFHIRContainedTypeInte { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MESSAGE_HEADER; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_AUTHOR = 'author'; const FIELD_DATA = 'data'; const FIELD_DESTINATION = 'destination'; @@ -252,6 +248,9 @@ class FHIRMessageHeader extends FHIRResource implements PHPFHIRContainedTypeInte */ protected $timestamp = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMessageHeader Constructor * @param null|array $data @@ -278,6 +277,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_DATA])) { if (is_array($data[self::FIELD_DATA])) { foreach($data[self::FIELD_DATA] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRResourceReference) { $this->addData($v); } else { @@ -293,6 +295,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_DESTINATION])) { if (is_array($data[self::FIELD_DESTINATION])) { foreach($data[self::FIELD_DESTINATION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRMessageHeaderDestination) { $this->addDestination($v); } else { @@ -325,8 +330,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IDENTIFIER] instanceof FHIRId) { $this->setIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { - $this->setIdentifier(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRId(array_merge($ext, $data[self::FIELD_IDENTIFIER]))); + } } else { $this->setIdentifier(new FHIRId($data[self::FIELD_IDENTIFIER])); } @@ -372,8 +381,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TIMESTAMP] instanceof FHIRInstant) { $this->setTimestamp($data[self::FIELD_TIMESTAMP]); - } elseif ($ext && is_scalar($data[self::FIELD_TIMESTAMP])) { - $this->setTimestamp(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_TIMESTAMP]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TIMESTAMP])) { + $this->setTimestamp(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_TIMESTAMP]] + $ext)); + } else if (is_array($data[self::FIELD_TIMESTAMP])) { + $this->setTimestamp(new FHIRInstant(array_merge($ext, $data[self::FIELD_TIMESTAMP]))); + } } else { $this->setTimestamp(new FHIRInstant($data[self::FIELD_TIMESTAMP])); } @@ -997,11 +1010,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getAuthor())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AUTHOR, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getData())) { foreach($vs as $v) { if (null === $v) { @@ -1023,30 +1034,24 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getEnterer())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ENTERER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getEvent())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EVENT, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getReason())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REASON, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getReceiver())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RECEIVER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getResponse())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RESPONSE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getResponsible())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RESPONSIBLE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSource())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SOURCE, null, $v->_getFHIRXMLNamespace())); } @@ -1078,8 +1083,15 @@ public function jsonSerialize() $a[self::FIELD_EVENT] = $v; } if (null !== ($v = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $v->getValue(); - $a[self::FIELD_IDENTIFIER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_IDENTIFIER] = $v; + } } if (null !== ($v = $this->getReason())) { $a[self::FIELD_REASON] = $v; @@ -1097,8 +1109,15 @@ public function jsonSerialize() $a[self::FIELD_SOURCE] = $v; } if (null !== ($v = $this->getTimestamp())) { - $a[self::FIELD_TIMESTAMP] = $v->getValue(); - $a[self::FIELD_TIMESTAMP_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TIMESTAMP] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TIMESTAMP_EXT] = $enc; + } + } else { + $a[self::FIELD_TIMESTAMP] = $v; + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRObservation.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRObservation.php index c1018f4c69..fc6b6d4109 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRObservation.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRObservation.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -89,10 +89,6 @@ class FHIRObservation extends FHIRResource implements PHPFHIRContainedTypeInterf { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_OBSERVATION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_APPLIES_DATE_TIME = 'appliesDateTime'; const FIELD_APPLIES_DATE_TIME_EXT = '_appliesDateTime'; const FIELD_APPLIES_PERIOD = 'appliesPeriod'; @@ -403,6 +399,9 @@ class FHIRObservation extends FHIRResource implements PHPFHIRContainedTypeInterf */ protected $valueString = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRObservation Constructor * @param null|array $data @@ -425,8 +424,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_APPLIES_DATE_TIME] instanceof FHIRDateTime) { $this->setAppliesDateTime($data[self::FIELD_APPLIES_DATE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_APPLIES_DATE_TIME])) { - $this->setAppliesDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_APPLIES_DATE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_APPLIES_DATE_TIME])) { + $this->setAppliesDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_APPLIES_DATE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_APPLIES_DATE_TIME])) { + $this->setAppliesDateTime(new FHIRDateTime(array_merge($ext, $data[self::FIELD_APPLIES_DATE_TIME]))); + } } else { $this->setAppliesDateTime(new FHIRDateTime($data[self::FIELD_APPLIES_DATE_TIME])); } @@ -451,8 +454,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_COMMENTS] instanceof FHIRString) { $this->setComments($data[self::FIELD_COMMENTS]); - } elseif ($ext && is_scalar($data[self::FIELD_COMMENTS])) { - $this->setComments(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_COMMENTS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_COMMENTS])) { + $this->setComments(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_COMMENTS]] + $ext)); + } else if (is_array($data[self::FIELD_COMMENTS])) { + $this->setComments(new FHIRString(array_merge($ext, $data[self::FIELD_COMMENTS]))); + } } else { $this->setComments(new FHIRString($data[self::FIELD_COMMENTS])); } @@ -463,8 +470,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->setIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { - $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_IDENTIFIER]))); + } } else { $this->setIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); } @@ -482,8 +493,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ISSUED] instanceof FHIRInstant) { $this->setIssued($data[self::FIELD_ISSUED]); - } elseif ($ext && is_scalar($data[self::FIELD_ISSUED])) { - $this->setIssued(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_ISSUED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ISSUED])) { + $this->setIssued(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_ISSUED]] + $ext)); + } else if (is_array($data[self::FIELD_ISSUED])) { + $this->setIssued(new FHIRInstant(array_merge($ext, $data[self::FIELD_ISSUED]))); + } } else { $this->setIssued(new FHIRInstant($data[self::FIELD_ISSUED])); } @@ -505,6 +520,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PERFORMER])) { if (is_array($data[self::FIELD_PERFORMER])) { foreach($data[self::FIELD_PERFORMER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRResourceReference) { $this->addPerformer($v); } else { @@ -520,6 +538,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REFERENCE_RANGE])) { if (is_array($data[self::FIELD_REFERENCE_RANGE])) { foreach($data[self::FIELD_REFERENCE_RANGE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRObservationReferenceRange) { $this->addReferenceRange($v); } else { @@ -535,6 +556,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_RELATED])) { if (is_array($data[self::FIELD_RELATED])) { foreach($data[self::FIELD_RELATED] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRObservationRelated) { $this->addRelated($v); } else { @@ -553,8 +577,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_RELIABILITY] instanceof FHIRObservationReliability) { $this->setReliability($data[self::FIELD_RELIABILITY]); - } elseif ($ext && is_scalar($data[self::FIELD_RELIABILITY])) { - $this->setReliability(new FHIRObservationReliability([FHIRObservationReliability::FIELD_VALUE => $data[self::FIELD_RELIABILITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_RELIABILITY])) { + $this->setReliability(new FHIRObservationReliability([FHIRObservationReliability::FIELD_VALUE => $data[self::FIELD_RELIABILITY]] + $ext)); + } else if (is_array($data[self::FIELD_RELIABILITY])) { + $this->setReliability(new FHIRObservationReliability(array_merge($ext, $data[self::FIELD_RELIABILITY]))); + } } else { $this->setReliability(new FHIRObservationReliability($data[self::FIELD_RELIABILITY])); } @@ -572,8 +600,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRObservationStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRObservationStatus([FHIRObservationStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRObservationStatus([FHIRObservationStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRObservationStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRObservationStatus($data[self::FIELD_STATUS])); } @@ -612,8 +644,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_QUANTITY] instanceof FHIRQuantity) { $this->setValueQuantity($data[self::FIELD_VALUE_QUANTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_QUANTITY])) { - $this->setValueQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_VALUE_QUANTITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_QUANTITY])) { + $this->setValueQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_VALUE_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_QUANTITY])) { + $this->setValueQuantity(new FHIRQuantity(array_merge($ext, $data[self::FIELD_VALUE_QUANTITY]))); + } } else { $this->setValueQuantity(new FHIRQuantity($data[self::FIELD_VALUE_QUANTITY])); } @@ -638,8 +674,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_STRING] instanceof FHIRString) { $this->setValueString($data[self::FIELD_VALUE_STRING]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_STRING])) { - $this->setValueString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VALUE_STRING]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_STRING])) { + $this->setValueString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VALUE_STRING]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_STRING])) { + $this->setValueString(new FHIRString(array_merge($ext, $data[self::FIELD_VALUE_STRING]))); + } } else { $this->setValueString(new FHIRString($data[self::FIELD_VALUE_STRING])); } @@ -1693,37 +1733,30 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getAppliesDateTime())) { $v->xmlSerialize($sxe->addChild(self::FIELD_APPLIES_DATE_TIME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getAppliesPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_APPLIES_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getBodySite())) { $v->xmlSerialize($sxe->addChild(self::FIELD_BODY_SITE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getComments())) { $v->xmlSerialize($sxe->addChild(self::FIELD_COMMENTS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getInterpretation())) { $v->xmlSerialize($sxe->addChild(self::FIELD_INTERPRETATION, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getIssued())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ISSUED, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getMethod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_METHOD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NAME, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getPerformer())) { foreach($vs as $v) { if (null === $v) { @@ -1754,39 +1787,30 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getReliability())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RELIABILITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSpecimen())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SPECIMEN, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSubject())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBJECT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueAttachment())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_ATTACHMENT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValuePeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_QUANTITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueRatio())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_RATIO, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueSampledData())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_SAMPLED_DATA, null, $v->_getFHIRXMLNamespace())); } @@ -1803,8 +1827,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getAppliesDateTime())) { - $a[self::FIELD_APPLIES_DATE_TIME] = $v->getValue(); - $a[self::FIELD_APPLIES_DATE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_APPLIES_DATE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_APPLIES_DATE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_APPLIES_DATE_TIME] = $v; + } } if (null !== ($v = $this->getAppliesPeriod())) { $a[self::FIELD_APPLIES_PERIOD] = $v; @@ -1813,18 +1844,40 @@ public function jsonSerialize() $a[self::FIELD_BODY_SITE] = $v; } if (null !== ($v = $this->getComments())) { - $a[self::FIELD_COMMENTS] = $v->getValue(); - $a[self::FIELD_COMMENTS_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_COMMENTS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_COMMENTS_EXT] = $enc; + } + } else { + $a[self::FIELD_COMMENTS] = $v; + } } if (null !== ($v = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_IDENTIFIER] = $v; + } } if (null !== ($v = $this->getInterpretation())) { $a[self::FIELD_INTERPRETATION] = $v; } if (null !== ($v = $this->getIssued())) { - $a[self::FIELD_ISSUED] = $v->getValue(); - $a[self::FIELD_ISSUED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ISSUED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ISSUED_EXT] = $enc; + } + } else { + $a[self::FIELD_ISSUED] = $v; + } } if (null !== ($v = $this->getMethod())) { $a[self::FIELD_METHOD] = $v; @@ -1842,13 +1895,29 @@ public function jsonSerialize() $a[self::FIELD_RELATED] = $vs; } if (null !== ($v = $this->getReliability())) { - $a[self::FIELD_RELIABILITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_RELIABILITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_RELIABILITY_EXT] = $enc; + } + } else { + $a[self::FIELD_RELIABILITY] = $v; + } } if (null !== ($v = $this->getSpecimen())) { $a[self::FIELD_SPECIMEN] = $v; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getSubject())) { $a[self::FIELD_SUBJECT] = $v; @@ -1863,7 +1932,15 @@ public function jsonSerialize() $a[self::FIELD_VALUE_PERIOD] = $v; } if (null !== ($v = $this->getValueQuantity())) { - $a[self::FIELD_VALUE_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_QUANTITY] = $v; + } } if (null !== ($v = $this->getValueRatio())) { $a[self::FIELD_VALUE_RATIO] = $v; @@ -1872,8 +1949,15 @@ public function jsonSerialize() $a[self::FIELD_VALUE_SAMPLED_DATA] = $v; } if (null !== ($v = $this->getValueString())) { - $a[self::FIELD_VALUE_STRING] = $v->getValue(); - $a[self::FIELD_VALUE_STRING_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_STRING] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_STRING_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_STRING] = $v; + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIROperationOutcome.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIROperationOutcome.php index 5ad8e14a52..107892c5ef 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIROperationOutcome.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIROperationOutcome.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -75,10 +75,6 @@ class FHIROperationOutcome extends FHIRResource implements PHPFHIRContainedTypeI { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_OPERATION_OUTCOME; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ISSUE = 'issue'; /** @@ -91,6 +87,9 @@ class FHIROperationOutcome extends FHIRResource implements PHPFHIRContainedTypeI */ protected $issue = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIROperationOutcome Constructor * @param null|array $data @@ -110,6 +109,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ISSUE])) { if (is_array($data[self::FIELD_ISSUE])) { foreach($data[self::FIELD_ISSUE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIROperationOutcomeIssue) { $this->addIssue($v); } else { @@ -289,7 +291,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getIssue())) { foreach($vs as $v) { if (null === $v) { @@ -298,6 +299,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_ISSUE, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIROrder.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIROrder.php index ea1be6e0aa..6890e51752 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIROrder.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIROrder.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIROrder extends FHIRResource implements PHPFHIRContainedTypeInterface { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ORDER; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_AUTHORITY = 'authority'; const FIELD_DATE = 'date'; const FIELD_DATE_EXT = '_date'; @@ -206,6 +202,9 @@ class FHIROrder extends FHIRResource implements PHPFHIRContainedTypeInterface */ protected $when = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIROrder Constructor * @param null|array $data @@ -235,8 +234,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATE] instanceof FHIRDateTime) { $this->setDate($data[self::FIELD_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_DATE])) { - $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime(array_merge($ext, $data[self::FIELD_DATE]))); + } } else { $this->setDate(new FHIRDateTime($data[self::FIELD_DATE])); } @@ -244,6 +247,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_DETAIL])) { if (is_array($data[self::FIELD_DETAIL])) { foreach($data[self::FIELD_DETAIL] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRResourceReference) { $this->addDetail($v); } else { @@ -262,17 +268,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -828,14 +841,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getAuthority())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AUTHORITY, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DATE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getDetail())) { foreach($vs as $v) { if (null === $v) { @@ -857,23 +868,18 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getReasonCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REASON_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getReasonResource())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REASON_RESOURCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSource())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SOURCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSubject())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBJECT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getTarget())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TARGET, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getWhen())) { $v->xmlSerialize($sxe->addChild(self::FIELD_WHEN, null, $v->_getFHIRXMLNamespace())); } @@ -890,14 +896,37 @@ public function jsonSerialize() $a[self::FIELD_AUTHORITY] = $v; } if (null !== ($v = $this->getDate())) { - $a[self::FIELD_DATE] = $v->getValue(); - $a[self::FIELD_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_DATE] = $v; + } } if ([] !== ($vs = $this->getDetail())) { $a[self::FIELD_DETAIL] = $vs; } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if (null !== ($v = $this->getReasonCodeableConcept())) { $a[self::FIELD_REASON_CODEABLE_CONCEPT] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIROrderResponse.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIROrderResponse.php index 63e8a6707a..87532646d2 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIROrderResponse.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIROrderResponse.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIROrderResponse extends FHIRResource implements PHPFHIRContainedTypeInte { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ORDER_RESPONSE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_AUTHORITY_CODEABLE_CONCEPT = 'authorityCodeableConcept'; const FIELD_AUTHORITY_RESOURCE = 'authorityResource'; const FIELD_CODE = 'code'; @@ -204,6 +200,9 @@ class FHIROrderResponse extends FHIRResource implements PHPFHIRContainedTypeInte */ protected $who = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIROrderResponse Constructor * @param null|array $data @@ -240,8 +239,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CODE] instanceof FHIROrderOutcomeStatus) { $this->setCode($data[self::FIELD_CODE]); - } elseif ($ext && is_scalar($data[self::FIELD_CODE])) { - $this->setCode(new FHIROrderOutcomeStatus([FHIROrderOutcomeStatus::FIELD_VALUE => $data[self::FIELD_CODE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CODE])) { + $this->setCode(new FHIROrderOutcomeStatus([FHIROrderOutcomeStatus::FIELD_VALUE => $data[self::FIELD_CODE]] + $ext)); + } else if (is_array($data[self::FIELD_CODE])) { + $this->setCode(new FHIROrderOutcomeStatus(array_merge($ext, $data[self::FIELD_CODE]))); + } } else { $this->setCode(new FHIROrderOutcomeStatus($data[self::FIELD_CODE])); } @@ -252,8 +255,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATE] instanceof FHIRDateTime) { $this->setDate($data[self::FIELD_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_DATE])) { - $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime(array_merge($ext, $data[self::FIELD_DATE]))); + } } else { $this->setDate(new FHIRDateTime($data[self::FIELD_DATE])); } @@ -264,8 +271,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -273,6 +284,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_FULFILLMENT])) { if (is_array($data[self::FIELD_FULFILLMENT])) { foreach($data[self::FIELD_FULFILLMENT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRResourceReference) { $this->addFulfillment($v); } else { @@ -291,17 +305,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -825,15 +846,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getAuthorityCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AUTHORITY_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getAuthorityResource())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AUTHORITY_RESOURCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } @@ -843,7 +861,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESCRIPTION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getFulfillment())) { foreach($vs as $v) { if (null === $v) { @@ -865,7 +882,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getRequest())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REQUEST, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getWho())) { $v->xmlSerialize($sxe->addChild(self::FIELD_WHO, null, $v->_getFHIRXMLNamespace())); } @@ -885,21 +901,59 @@ public function jsonSerialize() $a[self::FIELD_AUTHORITY_RESOURCE] = $v; } if (null !== ($v = $this->getCode())) { - $a[self::FIELD_CODE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CODE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CODE_EXT] = $enc; + } + } else { + $a[self::FIELD_CODE] = $v; + } } if (null !== ($v = $this->getDate())) { - $a[self::FIELD_DATE] = $v->getValue(); - $a[self::FIELD_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_DATE] = $v; + } } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if ([] !== ($vs = $this->getFulfillment())) { $a[self::FIELD_FULFILLMENT] = $vs; } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if (null !== ($v = $this->getRequest())) { $a[self::FIELD_REQUEST] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIROrganization.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIROrganization.php index ca0ce2fe02..2539b8b693 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIROrganization.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIROrganization.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -84,10 +84,6 @@ class FHIROrganization extends FHIRResource implements PHPFHIRContainedTypeInter { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ORGANIZATION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ACTIVE = 'active'; const FIELD_ACTIVE_EXT = '_active'; const FIELD_ADDRESS = 'address'; @@ -204,6 +200,9 @@ class FHIROrganization extends FHIRResource implements PHPFHIRContainedTypeInter */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIROrganization Constructor * @param null|array $data @@ -226,8 +225,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ACTIVE] instanceof FHIRBoolean) { $this->setActive($data[self::FIELD_ACTIVE]); - } elseif ($ext && is_scalar($data[self::FIELD_ACTIVE])) { - $this->setActive(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_ACTIVE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ACTIVE])) { + $this->setActive(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_ACTIVE]] + $ext)); + } else if (is_array($data[self::FIELD_ACTIVE])) { + $this->setActive(new FHIRBoolean(array_merge($ext, $data[self::FIELD_ACTIVE]))); + } } else { $this->setActive(new FHIRBoolean($data[self::FIELD_ACTIVE])); } @@ -235,6 +238,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ADDRESS])) { if (is_array($data[self::FIELD_ADDRESS])) { foreach($data[self::FIELD_ADDRESS] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRAddress) { $this->addAddress($v); } else { @@ -250,6 +256,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CONTACT])) { if (is_array($data[self::FIELD_CONTACT])) { foreach($data[self::FIELD_CONTACT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIROrganizationContact) { $this->addContact($v); } else { @@ -268,17 +277,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -287,6 +303,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_LOCATION])) { if (is_array($data[self::FIELD_LOCATION])) { foreach($data[self::FIELD_LOCATION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRResourceReference) { $this->addLocation($v); } else { @@ -305,8 +324,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -324,17 +347,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_TELECOM])) { foreach($data[self::FIELD_TELECOM] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContact) { $this->addTelecom($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addTelecom(new FHIRContact([FHIRContact::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addTelecom(new FHIRContact([FHIRContact::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addTelecom(new FHIRContact(array_merge($v, $ext[$i]))); + } } else { $this->addTelecom(new FHIRContact($v)); } } } elseif ($data[self::FIELD_TELECOM] instanceof FHIRContact) { $this->addTelecom($data[self::FIELD_TELECOM]); - } elseif ($ext && is_scalar($data[self::FIELD_TELECOM])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_TELECOM])) { $this->addTelecom(new FHIRContact([FHIRContact::FIELD_VALUE => $data[self::FIELD_TELECOM]] + $ext)); } else { $this->addTelecom(new FHIRContact($data[self::FIELD_TELECOM])); @@ -928,7 +958,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getActive())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ACTIVE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getAddress())) { foreach($vs as $v) { if (null === $v) { @@ -964,14 +993,13 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_LOCATION, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NAME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPartOf())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PART_OF, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getTelecom())) { foreach($vs as $v) { if (null === $v) { @@ -994,8 +1022,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getActive())) { - $a[self::FIELD_ACTIVE] = $v->getValue(); - $a[self::FIELD_ACTIVE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ACTIVE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ACTIVE_EXT] = $enc; + } + } else { + $a[self::FIELD_ACTIVE] = $v; + } } if ([] !== ($vs = $this->getAddress())) { $a[self::FIELD_ADDRESS] = $vs; @@ -1004,20 +1039,59 @@ public function jsonSerialize() $a[self::FIELD_CONTACT] = $vs; } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if ([] !== ($vs = $this->getLocation())) { $a[self::FIELD_LOCATION] = $vs; } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if (null !== ($v = $this->getPartOf())) { $a[self::FIELD_PART_OF] = $v; } if ([] !== ($vs = $this->getTelecom())) { - $a[self::FIELD_TELECOM] = $vs; + $a[self::FIELD_TELECOM] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TELECOM][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TELECOM_EXT][] = $enc; + } else { + $a[self::FIELD_TELECOM_EXT][] = null; + } + } else { + $a[self::FIELD_TELECOM][] = $v; + } + } } if (null !== ($v = $this->getType())) { $a[self::FIELD_TYPE] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIROther.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIROther.php index 5b9db1e1aa..7e98bc5acf 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIROther.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIROther.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIROther extends FHIRResource implements PHPFHIRContainedTypeInterface { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_OTHER; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_AUTHOR = 'author'; const FIELD_CODE = 'code'; const FIELD_CREATED = 'created'; @@ -150,6 +146,9 @@ class FHIROther extends FHIRResource implements PHPFHIRContainedTypeInterface */ protected $subject = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIROther Constructor * @param null|array $data @@ -186,8 +185,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CREATED] instanceof FHIRDate) { $this->setCreated($data[self::FIELD_CREATED]); - } elseif ($ext && is_scalar($data[self::FIELD_CREATED])) { - $this->setCreated(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_CREATED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CREATED])) { + $this->setCreated(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_CREATED]] + $ext)); + } else if (is_array($data[self::FIELD_CREATED])) { + $this->setCreated(new FHIRDate(array_merge($ext, $data[self::FIELD_CREATED]))); + } } else { $this->setCreated(new FHIRDate($data[self::FIELD_CREATED])); } @@ -198,17 +201,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -545,18 +555,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getAuthor())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AUTHOR, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getCreated())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CREATED, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -585,11 +592,34 @@ public function jsonSerialize() $a[self::FIELD_CODE] = $v; } if (null !== ($v = $this->getCreated())) { - $a[self::FIELD_CREATED] = $v->getValue(); - $a[self::FIELD_CREATED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CREATED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CREATED_EXT] = $enc; + } + } else { + $a[self::FIELD_CREATED] = $v; + } } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if (null !== ($v = $this->getSubject())) { $a[self::FIELD_SUBJECT] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRPatient.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRPatient.php index 7a91c2045f..a7fb91f672 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRPatient.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRPatient.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -87,10 +87,6 @@ class FHIRPatient extends FHIRResource implements PHPFHIRContainedTypeInterface { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_PATIENT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ACTIVE = 'active'; const FIELD_ACTIVE_EXT = '_active'; const FIELD_ADDRESS = 'address'; @@ -335,6 +331,9 @@ class FHIRPatient extends FHIRResource implements PHPFHIRContainedTypeInterface */ protected $telecom = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRPatient Constructor * @param null|array $data @@ -357,8 +356,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ACTIVE] instanceof FHIRBoolean) { $this->setActive($data[self::FIELD_ACTIVE]); - } elseif ($ext && is_scalar($data[self::FIELD_ACTIVE])) { - $this->setActive(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_ACTIVE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ACTIVE])) { + $this->setActive(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_ACTIVE]] + $ext)); + } else if (is_array($data[self::FIELD_ACTIVE])) { + $this->setActive(new FHIRBoolean(array_merge($ext, $data[self::FIELD_ACTIVE]))); + } } else { $this->setActive(new FHIRBoolean($data[self::FIELD_ACTIVE])); } @@ -366,6 +369,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ADDRESS])) { if (is_array($data[self::FIELD_ADDRESS])) { foreach($data[self::FIELD_ADDRESS] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRAddress) { $this->addAddress($v); } else { @@ -391,8 +397,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_BIRTH_DATE] instanceof FHIRDateTime) { $this->setBirthDate($data[self::FIELD_BIRTH_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_BIRTH_DATE])) { - $this->setBirthDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_BIRTH_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_BIRTH_DATE])) { + $this->setBirthDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_BIRTH_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_BIRTH_DATE])) { + $this->setBirthDate(new FHIRDateTime(array_merge($ext, $data[self::FIELD_BIRTH_DATE]))); + } } else { $this->setBirthDate(new FHIRDateTime($data[self::FIELD_BIRTH_DATE])); } @@ -400,6 +410,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CARE_PROVIDER])) { if (is_array($data[self::FIELD_CARE_PROVIDER])) { foreach($data[self::FIELD_CARE_PROVIDER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRResourceReference) { $this->addCareProvider($v); } else { @@ -415,6 +428,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_COMMUNICATION])) { if (is_array($data[self::FIELD_COMMUNICATION])) { foreach($data[self::FIELD_COMMUNICATION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addCommunication($v); } else { @@ -430,6 +446,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CONTACT])) { if (is_array($data[self::FIELD_CONTACT])) { foreach($data[self::FIELD_CONTACT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRPatientContact) { $this->addContact($v); } else { @@ -448,8 +467,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DECEASED_BOOLEAN] instanceof FHIRBoolean) { $this->setDeceasedBoolean($data[self::FIELD_DECEASED_BOOLEAN]); - } elseif ($ext && is_scalar($data[self::FIELD_DECEASED_BOOLEAN])) { - $this->setDeceasedBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_DECEASED_BOOLEAN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DECEASED_BOOLEAN])) { + $this->setDeceasedBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_DECEASED_BOOLEAN]] + $ext)); + } else if (is_array($data[self::FIELD_DECEASED_BOOLEAN])) { + $this->setDeceasedBoolean(new FHIRBoolean(array_merge($ext, $data[self::FIELD_DECEASED_BOOLEAN]))); + } } else { $this->setDeceasedBoolean(new FHIRBoolean($data[self::FIELD_DECEASED_BOOLEAN])); } @@ -460,8 +483,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DECEASED_DATE_TIME] instanceof FHIRDateTime) { $this->setDeceasedDateTime($data[self::FIELD_DECEASED_DATE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_DECEASED_DATE_TIME])) { - $this->setDeceasedDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DECEASED_DATE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DECEASED_DATE_TIME])) { + $this->setDeceasedDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DECEASED_DATE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_DECEASED_DATE_TIME])) { + $this->setDeceasedDateTime(new FHIRDateTime(array_merge($ext, $data[self::FIELD_DECEASED_DATE_TIME]))); + } } else { $this->setDeceasedDateTime(new FHIRDateTime($data[self::FIELD_DECEASED_DATE_TIME])); } @@ -479,17 +506,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -498,6 +532,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_LINK])) { if (is_array($data[self::FIELD_LINK])) { foreach($data[self::FIELD_LINK] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRPatientLink) { $this->addLink($v); } else { @@ -530,8 +567,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MULTIPLE_BIRTH_BOOLEAN] instanceof FHIRBoolean) { $this->setMultipleBirthBoolean($data[self::FIELD_MULTIPLE_BIRTH_BOOLEAN]); - } elseif ($ext && is_scalar($data[self::FIELD_MULTIPLE_BIRTH_BOOLEAN])) { - $this->setMultipleBirthBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_MULTIPLE_BIRTH_BOOLEAN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MULTIPLE_BIRTH_BOOLEAN])) { + $this->setMultipleBirthBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_MULTIPLE_BIRTH_BOOLEAN]] + $ext)); + } else if (is_array($data[self::FIELD_MULTIPLE_BIRTH_BOOLEAN])) { + $this->setMultipleBirthBoolean(new FHIRBoolean(array_merge($ext, $data[self::FIELD_MULTIPLE_BIRTH_BOOLEAN]))); + } } else { $this->setMultipleBirthBoolean(new FHIRBoolean($data[self::FIELD_MULTIPLE_BIRTH_BOOLEAN])); } @@ -542,8 +583,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MULTIPLE_BIRTH_INTEGER] instanceof FHIRInteger) { $this->setMultipleBirthInteger($data[self::FIELD_MULTIPLE_BIRTH_INTEGER]); - } elseif ($ext && is_scalar($data[self::FIELD_MULTIPLE_BIRTH_INTEGER])) { - $this->setMultipleBirthInteger(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_MULTIPLE_BIRTH_INTEGER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MULTIPLE_BIRTH_INTEGER])) { + $this->setMultipleBirthInteger(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_MULTIPLE_BIRTH_INTEGER]] + $ext)); + } else if (is_array($data[self::FIELD_MULTIPLE_BIRTH_INTEGER])) { + $this->setMultipleBirthInteger(new FHIRInteger(array_merge($ext, $data[self::FIELD_MULTIPLE_BIRTH_INTEGER]))); + } } else { $this->setMultipleBirthInteger(new FHIRInteger($data[self::FIELD_MULTIPLE_BIRTH_INTEGER])); } @@ -551,6 +596,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_NAME])) { if (is_array($data[self::FIELD_NAME])) { foreach($data[self::FIELD_NAME] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRHumanName) { $this->addName($v); } else { @@ -566,6 +614,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PHOTO])) { if (is_array($data[self::FIELD_PHOTO])) { foreach($data[self::FIELD_PHOTO] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRAttachment) { $this->addPhoto($v); } else { @@ -584,17 +635,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_TELECOM])) { foreach($data[self::FIELD_TELECOM] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContact) { $this->addTelecom($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addTelecom(new FHIRContact([FHIRContact::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addTelecom(new FHIRContact([FHIRContact::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addTelecom(new FHIRContact(array_merge($v, $ext[$i]))); + } } else { $this->addTelecom(new FHIRContact($v)); } } } elseif ($data[self::FIELD_TELECOM] instanceof FHIRContact) { $this->addTelecom($data[self::FIELD_TELECOM]); - } elseif ($ext && is_scalar($data[self::FIELD_TELECOM])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_TELECOM])) { $this->addTelecom(new FHIRContact([FHIRContact::FIELD_VALUE => $data[self::FIELD_TELECOM]] + $ext)); } else { $this->addTelecom(new FHIRContact($data[self::FIELD_TELECOM])); @@ -1674,7 +1732,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getActive())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ACTIVE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getAddress())) { foreach($vs as $v) { if (null === $v) { @@ -1690,7 +1747,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getBirthDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_BIRTH_DATE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getCareProvider())) { foreach($vs as $v) { if (null === $v) { @@ -1717,17 +1773,16 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_CONTACT, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getDeceasedBoolean())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DECEASED_BOOLEAN, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getDeceasedDateTime())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DECEASED_DATE_TIME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getGender())) { $v->xmlSerialize($sxe->addChild(self::FIELD_GENDER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -1749,7 +1804,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getManagingOrganization())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MANAGING_ORGANIZATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getMaritalStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MARITAL_STATUS, null, $v->_getFHIRXMLNamespace())); } @@ -1759,7 +1813,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getMultipleBirthInteger())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MULTIPLE_BIRTH_INTEGER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getName())) { foreach($vs as $v) { if (null === $v) { @@ -1786,6 +1839,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_TELECOM, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } @@ -1796,8 +1850,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getActive())) { - $a[self::FIELD_ACTIVE] = $v->getValue(); - $a[self::FIELD_ACTIVE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ACTIVE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ACTIVE_EXT] = $enc; + } + } else { + $a[self::FIELD_ACTIVE] = $v; + } } if ([] !== ($vs = $this->getAddress())) { $a[self::FIELD_ADDRESS] = $vs; @@ -1806,8 +1867,15 @@ public function jsonSerialize() $a[self::FIELD_ANIMAL] = $v; } if (null !== ($v = $this->getBirthDate())) { - $a[self::FIELD_BIRTH_DATE] = $v->getValue(); - $a[self::FIELD_BIRTH_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_BIRTH_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_BIRTH_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_BIRTH_DATE] = $v; + } } if ([] !== ($vs = $this->getCareProvider())) { $a[self::FIELD_CARE_PROVIDER] = $vs; @@ -1819,18 +1887,48 @@ public function jsonSerialize() $a[self::FIELD_CONTACT] = $vs; } if (null !== ($v = $this->getDeceasedBoolean())) { - $a[self::FIELD_DECEASED_BOOLEAN] = $v->getValue(); - $a[self::FIELD_DECEASED_BOOLEAN_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DECEASED_BOOLEAN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DECEASED_BOOLEAN_EXT] = $enc; + } + } else { + $a[self::FIELD_DECEASED_BOOLEAN] = $v; + } } if (null !== ($v = $this->getDeceasedDateTime())) { - $a[self::FIELD_DECEASED_DATE_TIME] = $v->getValue(); - $a[self::FIELD_DECEASED_DATE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DECEASED_DATE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DECEASED_DATE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_DECEASED_DATE_TIME] = $v; + } } if (null !== ($v = $this->getGender())) { $a[self::FIELD_GENDER] = $v; } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if ([] !== ($vs = $this->getLink())) { $a[self::FIELD_LINK] = $vs; @@ -1842,12 +1940,26 @@ public function jsonSerialize() $a[self::FIELD_MARITAL_STATUS] = $v; } if (null !== ($v = $this->getMultipleBirthBoolean())) { - $a[self::FIELD_MULTIPLE_BIRTH_BOOLEAN] = $v->getValue(); - $a[self::FIELD_MULTIPLE_BIRTH_BOOLEAN_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MULTIPLE_BIRTH_BOOLEAN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MULTIPLE_BIRTH_BOOLEAN_EXT] = $enc; + } + } else { + $a[self::FIELD_MULTIPLE_BIRTH_BOOLEAN] = $v; + } } if (null !== ($v = $this->getMultipleBirthInteger())) { - $a[self::FIELD_MULTIPLE_BIRTH_INTEGER] = $v->getValue(); - $a[self::FIELD_MULTIPLE_BIRTH_INTEGER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MULTIPLE_BIRTH_INTEGER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MULTIPLE_BIRTH_INTEGER_EXT] = $enc; + } + } else { + $a[self::FIELD_MULTIPLE_BIRTH_INTEGER] = $v; + } } if ([] !== ($vs = $this->getName())) { $a[self::FIELD_NAME] = $vs; @@ -1856,7 +1968,23 @@ public function jsonSerialize() $a[self::FIELD_PHOTO] = $vs; } if ([] !== ($vs = $this->getTelecom())) { - $a[self::FIELD_TELECOM] = $vs; + $a[self::FIELD_TELECOM] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TELECOM][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TELECOM_EXT][] = $enc; + } else { + $a[self::FIELD_TELECOM_EXT][] = null; + } + } else { + $a[self::FIELD_TELECOM][] = $v; + } + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRPractitioner.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRPractitioner.php index 2f85787ae4..b4244782e2 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRPractitioner.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRPractitioner.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -84,10 +84,6 @@ class FHIRPractitioner extends FHIRResource implements PHPFHIRContainedTypeInter { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_PRACTITIONER; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ADDRESS = 'address'; const FIELD_BIRTH_DATE = 'birthDate'; const FIELD_BIRTH_DATE_EXT = '_birthDate'; @@ -271,6 +267,9 @@ class FHIRPractitioner extends FHIRResource implements PHPFHIRContainedTypeInter */ protected $telecom = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRPractitioner Constructor * @param null|array $data @@ -300,8 +299,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_BIRTH_DATE] instanceof FHIRDateTime) { $this->setBirthDate($data[self::FIELD_BIRTH_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_BIRTH_DATE])) { - $this->setBirthDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_BIRTH_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_BIRTH_DATE])) { + $this->setBirthDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_BIRTH_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_BIRTH_DATE])) { + $this->setBirthDate(new FHIRDateTime(array_merge($ext, $data[self::FIELD_BIRTH_DATE]))); + } } else { $this->setBirthDate(new FHIRDateTime($data[self::FIELD_BIRTH_DATE])); } @@ -309,6 +312,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_COMMUNICATION])) { if (is_array($data[self::FIELD_COMMUNICATION])) { foreach($data[self::FIELD_COMMUNICATION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addCommunication($v); } else { @@ -334,17 +340,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -353,6 +366,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_LOCATION])) { if (is_array($data[self::FIELD_LOCATION])) { foreach($data[self::FIELD_LOCATION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRResourceReference) { $this->addLocation($v); } else { @@ -389,6 +405,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PHOTO])) { if (is_array($data[self::FIELD_PHOTO])) { foreach($data[self::FIELD_PHOTO] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRAttachment) { $this->addPhoto($v); } else { @@ -404,6 +423,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_QUALIFICATION])) { if (is_array($data[self::FIELD_QUALIFICATION])) { foreach($data[self::FIELD_QUALIFICATION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRPractitionerQualification) { $this->addQualification($v); } else { @@ -419,6 +441,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ROLE])) { if (is_array($data[self::FIELD_ROLE])) { foreach($data[self::FIELD_ROLE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addRole($v); } else { @@ -434,6 +459,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SPECIALTY])) { if (is_array($data[self::FIELD_SPECIALTY])) { foreach($data[self::FIELD_SPECIALTY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addSpecialty($v); } else { @@ -452,17 +480,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_TELECOM])) { foreach($data[self::FIELD_TELECOM] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContact) { $this->addTelecom($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addTelecom(new FHIRContact([FHIRContact::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addTelecom(new FHIRContact([FHIRContact::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addTelecom(new FHIRContact(array_merge($v, $ext[$i]))); + } } else { $this->addTelecom(new FHIRContact($v)); } } } elseif ($data[self::FIELD_TELECOM] instanceof FHIRContact) { $this->addTelecom($data[self::FIELD_TELECOM]); - } elseif ($ext && is_scalar($data[self::FIELD_TELECOM])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_TELECOM])) { $this->addTelecom(new FHIRContact([FHIRContact::FIELD_VALUE => $data[self::FIELD_TELECOM]] + $ext)); } else { $this->addTelecom(new FHIRContact($data[self::FIELD_TELECOM])); @@ -1300,14 +1335,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getAddress())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ADDRESS, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getBirthDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_BIRTH_DATE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getCommunication())) { foreach($vs as $v) { if (null === $v) { @@ -1320,7 +1353,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getGender())) { $v->xmlSerialize($sxe->addChild(self::FIELD_GENDER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -1342,15 +1374,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NAME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOrganization())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ORGANIZATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getPhoto())) { foreach($vs as $v) { if (null === $v) { @@ -1395,6 +1424,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_TELECOM, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } @@ -1408,8 +1438,15 @@ public function jsonSerialize() $a[self::FIELD_ADDRESS] = $v; } if (null !== ($v = $this->getBirthDate())) { - $a[self::FIELD_BIRTH_DATE] = $v->getValue(); - $a[self::FIELD_BIRTH_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_BIRTH_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_BIRTH_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_BIRTH_DATE] = $v; + } } if ([] !== ($vs = $this->getCommunication())) { $a[self::FIELD_COMMUNICATION] = $vs; @@ -1418,7 +1455,23 @@ public function jsonSerialize() $a[self::FIELD_GENDER] = $v; } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if ([] !== ($vs = $this->getLocation())) { $a[self::FIELD_LOCATION] = $vs; @@ -1445,7 +1498,23 @@ public function jsonSerialize() $a[self::FIELD_SPECIALTY] = $vs; } if ([] !== ($vs = $this->getTelecom())) { - $a[self::FIELD_TELECOM] = $vs; + $a[self::FIELD_TELECOM] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TELECOM][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TELECOM_EXT][] = $enc; + } else { + $a[self::FIELD_TELECOM_EXT][] = null; + } + } else { + $a[self::FIELD_TELECOM][] = $v; + } + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRProcedure.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRProcedure.php index 02c01e4b05..4f2e5390f2 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRProcedure.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRProcedure.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -81,10 +81,6 @@ class FHIRProcedure extends FHIRResource implements PHPFHIRContainedTypeInterfac { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_PROCEDURE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_BODY_SITE = 'bodySite'; const FIELD_COMPLICATION = 'complication'; const FIELD_DATE = 'date'; @@ -273,6 +269,9 @@ class FHIRProcedure extends FHIRResource implements PHPFHIRContainedTypeInterfac */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRProcedure Constructor * @param null|array $data @@ -292,6 +291,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_BODY_SITE])) { if (is_array($data[self::FIELD_BODY_SITE])) { foreach($data[self::FIELD_BODY_SITE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addBodySite($v); } else { @@ -307,6 +309,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_COMPLICATION])) { if (is_array($data[self::FIELD_COMPLICATION])) { foreach($data[self::FIELD_COMPLICATION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addComplication($v); } else { @@ -339,8 +344,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_FOLLOW_UP] instanceof FHIRString) { $this->setFollowUp($data[self::FIELD_FOLLOW_UP]); - } elseif ($ext && is_scalar($data[self::FIELD_FOLLOW_UP])) { - $this->setFollowUp(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_FOLLOW_UP]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_FOLLOW_UP])) { + $this->setFollowUp(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_FOLLOW_UP]] + $ext)); + } else if (is_array($data[self::FIELD_FOLLOW_UP])) { + $this->setFollowUp(new FHIRString(array_merge($ext, $data[self::FIELD_FOLLOW_UP]))); + } } else { $this->setFollowUp(new FHIRString($data[self::FIELD_FOLLOW_UP])); } @@ -351,17 +360,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -370,6 +386,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_INDICATION])) { if (is_array($data[self::FIELD_INDICATION])) { foreach($data[self::FIELD_INDICATION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addIndication($v); } else { @@ -388,8 +407,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NOTES] instanceof FHIRString) { $this->setNotes($data[self::FIELD_NOTES]); - } elseif ($ext && is_scalar($data[self::FIELD_NOTES])) { - $this->setNotes(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NOTES]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NOTES])) { + $this->setNotes(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NOTES]] + $ext)); + } else if (is_array($data[self::FIELD_NOTES])) { + $this->setNotes(new FHIRString(array_merge($ext, $data[self::FIELD_NOTES]))); + } } else { $this->setNotes(new FHIRString($data[self::FIELD_NOTES])); } @@ -400,8 +423,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_OUTCOME] instanceof FHIRString) { $this->setOutcome($data[self::FIELD_OUTCOME]); - } elseif ($ext && is_scalar($data[self::FIELD_OUTCOME])) { - $this->setOutcome(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_OUTCOME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_OUTCOME])) { + $this->setOutcome(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_OUTCOME]] + $ext)); + } else if (is_array($data[self::FIELD_OUTCOME])) { + $this->setOutcome(new FHIRString(array_merge($ext, $data[self::FIELD_OUTCOME]))); + } } else { $this->setOutcome(new FHIRString($data[self::FIELD_OUTCOME])); } @@ -409,6 +436,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PERFORMER])) { if (is_array($data[self::FIELD_PERFORMER])) { foreach($data[self::FIELD_PERFORMER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRProcedurePerformer) { $this->addPerformer($v); } else { @@ -424,6 +454,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_RELATED_ITEM])) { if (is_array($data[self::FIELD_RELATED_ITEM])) { foreach($data[self::FIELD_RELATED_ITEM] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRProcedureRelatedItem) { $this->addRelatedItem($v); } else { @@ -439,6 +472,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REPORT])) { if (is_array($data[self::FIELD_REPORT])) { foreach($data[self::FIELD_REPORT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRResourceReference) { $this->addReport($v); } else { @@ -1306,7 +1342,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getBodySite())) { foreach($vs as $v) { if (null === $v) { @@ -1328,14 +1363,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DATE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getEncounter())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ENCOUNTER, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getFollowUp())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FOLLOW_UP, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -1353,13 +1386,13 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_INDICATION, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getNotes())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NOTES, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getOutcome())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OUTCOME, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getPerformer())) { foreach($vs as $v) { if (null === $v) { @@ -1390,7 +1423,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getSubject())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBJECT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -1416,22 +1448,59 @@ public function jsonSerialize() $a[self::FIELD_ENCOUNTER] = $v; } if (null !== ($v = $this->getFollowUp())) { - $a[self::FIELD_FOLLOW_UP] = $v->getValue(); - $a[self::FIELD_FOLLOW_UP_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FOLLOW_UP] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FOLLOW_UP_EXT] = $enc; + } + } else { + $a[self::FIELD_FOLLOW_UP] = $v; + } } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if ([] !== ($vs = $this->getIndication())) { $a[self::FIELD_INDICATION] = $vs; } if (null !== ($v = $this->getNotes())) { - $a[self::FIELD_NOTES] = $v->getValue(); - $a[self::FIELD_NOTES_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NOTES] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NOTES_EXT] = $enc; + } + } else { + $a[self::FIELD_NOTES] = $v; + } } if (null !== ($v = $this->getOutcome())) { - $a[self::FIELD_OUTCOME] = $v->getValue(); - $a[self::FIELD_OUTCOME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_OUTCOME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_OUTCOME_EXT] = $enc; + } + } else { + $a[self::FIELD_OUTCOME] = $v; + } } if ([] !== ($vs = $this->getPerformer())) { $a[self::FIELD_PERFORMER] = $vs; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRProfile.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRProfile.php index 15dacc5446..3af3c19dbc 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRProfile.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRProfile.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -86,10 +86,6 @@ class FHIRProfile extends FHIRResource implements PHPFHIRContainedTypeInterface { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_PROFILE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CODE = 'code'; const FIELD_DATE = 'date'; const FIELD_DATE_EXT = '_date'; @@ -301,6 +297,9 @@ class FHIRProfile extends FHIRResource implements PHPFHIRContainedTypeInterface */ protected $version = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRProfile Constructor * @param null|array $data @@ -320,6 +319,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CODE])) { if (is_array($data[self::FIELD_CODE])) { foreach($data[self::FIELD_CODE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCoding) { $this->addCode($v); } else { @@ -338,8 +340,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATE] instanceof FHIRDateTime) { $this->setDate($data[self::FIELD_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_DATE])) { - $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime(array_merge($ext, $data[self::FIELD_DATE]))); + } } else { $this->setDate(new FHIRDateTime($data[self::FIELD_DATE])); } @@ -350,8 +356,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -362,8 +372,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EXPERIMENTAL] instanceof FHIRBoolean) { $this->setExperimental($data[self::FIELD_EXPERIMENTAL]); - } elseif ($ext && is_scalar($data[self::FIELD_EXPERIMENTAL])) { - $this->setExperimental(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_EXPERIMENTAL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EXPERIMENTAL])) { + $this->setExperimental(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_EXPERIMENTAL]] + $ext)); + } else if (is_array($data[self::FIELD_EXPERIMENTAL])) { + $this->setExperimental(new FHIRBoolean(array_merge($ext, $data[self::FIELD_EXPERIMENTAL]))); + } } else { $this->setExperimental(new FHIRBoolean($data[self::FIELD_EXPERIMENTAL])); } @@ -371,6 +385,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_EXTENSION_DEFN])) { if (is_array($data[self::FIELD_EXTENSION_DEFN])) { foreach($data[self::FIELD_EXTENSION_DEFN] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRProfileExtensionDefn) { $this->addExtensionDefn($v); } else { @@ -389,8 +406,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_FHIR_VERSION] instanceof FHIRId) { $this->setFhirVersion($data[self::FIELD_FHIR_VERSION]); - } elseif ($ext && is_scalar($data[self::FIELD_FHIR_VERSION])) { - $this->setFhirVersion(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_FHIR_VERSION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_FHIR_VERSION])) { + $this->setFhirVersion(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_FHIR_VERSION]] + $ext)); + } else if (is_array($data[self::FIELD_FHIR_VERSION])) { + $this->setFhirVersion(new FHIRId(array_merge($ext, $data[self::FIELD_FHIR_VERSION]))); + } } else { $this->setFhirVersion(new FHIRId($data[self::FIELD_FHIR_VERSION])); } @@ -401,8 +422,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IDENTIFIER] instanceof FHIRString) { $this->setIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { - $this->setIdentifier(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRString(array_merge($ext, $data[self::FIELD_IDENTIFIER]))); + } } else { $this->setIdentifier(new FHIRString($data[self::FIELD_IDENTIFIER])); } @@ -410,6 +435,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_MAPPING])) { if (is_array($data[self::FIELD_MAPPING])) { foreach($data[self::FIELD_MAPPING] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRProfileMapping) { $this->addMapping($v); } else { @@ -428,8 +456,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -440,8 +472,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PUBLISHER] instanceof FHIRString) { $this->setPublisher($data[self::FIELD_PUBLISHER]); - } elseif ($ext && is_scalar($data[self::FIELD_PUBLISHER])) { - $this->setPublisher(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PUBLISHER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PUBLISHER])) { + $this->setPublisher(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PUBLISHER]] + $ext)); + } else if (is_array($data[self::FIELD_PUBLISHER])) { + $this->setPublisher(new FHIRString(array_merge($ext, $data[self::FIELD_PUBLISHER]))); + } } else { $this->setPublisher(new FHIRString($data[self::FIELD_PUBLISHER])); } @@ -449,6 +485,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_QUERY])) { if (is_array($data[self::FIELD_QUERY])) { foreach($data[self::FIELD_QUERY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRProfileQuery) { $this->addQuery($v); } else { @@ -467,8 +506,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_REQUIREMENTS] instanceof FHIRString) { $this->setRequirements($data[self::FIELD_REQUIREMENTS]); - } elseif ($ext && is_scalar($data[self::FIELD_REQUIREMENTS])) { - $this->setRequirements(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_REQUIREMENTS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_REQUIREMENTS])) { + $this->setRequirements(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_REQUIREMENTS]] + $ext)); + } else if (is_array($data[self::FIELD_REQUIREMENTS])) { + $this->setRequirements(new FHIRString(array_merge($ext, $data[self::FIELD_REQUIREMENTS]))); + } } else { $this->setRequirements(new FHIRString($data[self::FIELD_REQUIREMENTS])); } @@ -479,8 +522,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRResourceProfileStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRResourceProfileStatus([FHIRResourceProfileStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRResourceProfileStatus([FHIRResourceProfileStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRResourceProfileStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRResourceProfileStatus($data[self::FIELD_STATUS])); } @@ -488,6 +535,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_STRUCTURE])) { if (is_array($data[self::FIELD_STRUCTURE])) { foreach($data[self::FIELD_STRUCTURE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRProfileStructure) { $this->addStructure($v); } else { @@ -506,17 +556,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_TELECOM])) { foreach($data[self::FIELD_TELECOM] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContact) { $this->addTelecom($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addTelecom(new FHIRContact([FHIRContact::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addTelecom(new FHIRContact([FHIRContact::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addTelecom(new FHIRContact(array_merge($v, $ext[$i]))); + } } else { $this->addTelecom(new FHIRContact($v)); } } } elseif ($data[self::FIELD_TELECOM] instanceof FHIRContact) { $this->addTelecom($data[self::FIELD_TELECOM]); - } elseif ($ext && is_scalar($data[self::FIELD_TELECOM])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_TELECOM])) { $this->addTelecom(new FHIRContact([FHIRContact::FIELD_VALUE => $data[self::FIELD_TELECOM]] + $ext)); } else { $this->addTelecom(new FHIRContact($data[self::FIELD_TELECOM])); @@ -528,8 +585,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VERSION] instanceof FHIRString) { $this->setVersion($data[self::FIELD_VERSION]); - } elseif ($ext && is_scalar($data[self::FIELD_VERSION])) { - $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } else if (is_array($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString(array_merge($ext, $data[self::FIELD_VERSION]))); + } } else { $this->setVersion(new FHIRString($data[self::FIELD_VERSION])); } @@ -1455,7 +1516,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getCode())) { foreach($vs as $v) { if (null === $v) { @@ -1464,6 +1524,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DATE, null, $v->_getFHIRXMLNamespace())); } @@ -1473,7 +1534,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getExperimental())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EXPERIMENTAL, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getExtensionDefn())) { foreach($vs as $v) { if (null === $v) { @@ -1482,13 +1542,13 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_EXTENSION_DEFN, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getFhirVersion())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FHIR_VERSION, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getMapping())) { foreach($vs as $v) { if (null === $v) { @@ -1497,13 +1557,13 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_MAPPING, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NAME, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getPublisher())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PUBLISHER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getQuery())) { foreach($vs as $v) { if (null === $v) { @@ -1512,14 +1572,13 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_QUERY, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getRequirements())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REQUIREMENTS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getStructure())) { foreach($vs as $v) { if (null === $v) { @@ -1537,6 +1596,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_TELECOM, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getVersion())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VERSION, null, $v->_getFHIRXMLNamespace())); } @@ -1553,58 +1613,145 @@ public function jsonSerialize() $a[self::FIELD_CODE] = $vs; } if (null !== ($v = $this->getDate())) { - $a[self::FIELD_DATE] = $v->getValue(); - $a[self::FIELD_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_DATE] = $v; + } } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if (null !== ($v = $this->getExperimental())) { - $a[self::FIELD_EXPERIMENTAL] = $v->getValue(); - $a[self::FIELD_EXPERIMENTAL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EXPERIMENTAL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EXPERIMENTAL_EXT] = $enc; + } + } else { + $a[self::FIELD_EXPERIMENTAL] = $v; + } } if ([] !== ($vs = $this->getExtensionDefn())) { $a[self::FIELD_EXTENSION_DEFN] = $vs; } if (null !== ($v = $this->getFhirVersion())) { - $a[self::FIELD_FHIR_VERSION] = $v->getValue(); - $a[self::FIELD_FHIR_VERSION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FHIR_VERSION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FHIR_VERSION_EXT] = $enc; + } + } else { + $a[self::FIELD_FHIR_VERSION] = $v; + } } if (null !== ($v = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $v->getValue(); - $a[self::FIELD_IDENTIFIER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_IDENTIFIER] = $v; + } } if ([] !== ($vs = $this->getMapping())) { $a[self::FIELD_MAPPING] = $vs; } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if (null !== ($v = $this->getPublisher())) { - $a[self::FIELD_PUBLISHER] = $v->getValue(); - $a[self::FIELD_PUBLISHER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PUBLISHER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PUBLISHER_EXT] = $enc; + } + } else { + $a[self::FIELD_PUBLISHER] = $v; + } } if ([] !== ($vs = $this->getQuery())) { $a[self::FIELD_QUERY] = $vs; } if (null !== ($v = $this->getRequirements())) { - $a[self::FIELD_REQUIREMENTS] = $v->getValue(); - $a[self::FIELD_REQUIREMENTS_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_REQUIREMENTS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_REQUIREMENTS_EXT] = $enc; + } + } else { + $a[self::FIELD_REQUIREMENTS] = $v; + } } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if ([] !== ($vs = $this->getStructure())) { $a[self::FIELD_STRUCTURE] = $vs; } if ([] !== ($vs = $this->getTelecom())) { - $a[self::FIELD_TELECOM] = $vs; + $a[self::FIELD_TELECOM] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TELECOM][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TELECOM_EXT][] = $enc; + } else { + $a[self::FIELD_TELECOM_EXT][] = null; + } + } else { + $a[self::FIELD_TELECOM][] = $v; + } + } } if (null !== ($v = $this->getVersion())) { - $a[self::FIELD_VERSION] = $v->getValue(); - $a[self::FIELD_VERSION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VERSION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VERSION_EXT] = $enc; + } + } else { + $a[self::FIELD_VERSION] = $v; + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRProvenance.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRProvenance.php index 23e58ac7c4..fd617abdd7 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRProvenance.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRProvenance.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -85,10 +85,6 @@ class FHIRProvenance extends FHIRResource implements PHPFHIRContainedTypeInterfa { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_PROVENANCE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_AGENT = 'agent'; const FIELD_ENTITY = 'entity'; const FIELD_INTEGRITY_SIGNATURE = 'integritySignature'; @@ -214,6 +210,9 @@ class FHIRProvenance extends FHIRResource implements PHPFHIRContainedTypeInterfa */ protected $target = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRProvenance Constructor * @param null|array $data @@ -233,6 +232,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_AGENT])) { if (is_array($data[self::FIELD_AGENT])) { foreach($data[self::FIELD_AGENT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRProvenanceAgent) { $this->addAgent($v); } else { @@ -248,6 +250,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ENTITY])) { if (is_array($data[self::FIELD_ENTITY])) { foreach($data[self::FIELD_ENTITY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRProvenanceEntity) { $this->addEntity($v); } else { @@ -266,8 +271,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_INTEGRITY_SIGNATURE] instanceof FHIRString) { $this->setIntegritySignature($data[self::FIELD_INTEGRITY_SIGNATURE]); - } elseif ($ext && is_scalar($data[self::FIELD_INTEGRITY_SIGNATURE])) { - $this->setIntegritySignature(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_INTEGRITY_SIGNATURE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_INTEGRITY_SIGNATURE])) { + $this->setIntegritySignature(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_INTEGRITY_SIGNATURE]] + $ext)); + } else if (is_array($data[self::FIELD_INTEGRITY_SIGNATURE])) { + $this->setIntegritySignature(new FHIRString(array_merge($ext, $data[self::FIELD_INTEGRITY_SIGNATURE]))); + } } else { $this->setIntegritySignature(new FHIRString($data[self::FIELD_INTEGRITY_SIGNATURE])); } @@ -292,17 +301,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_POLICY])) { foreach($data[self::FIELD_POLICY] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRUri) { $this->addPolicy($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addPolicy(new FHIRUri([FHIRUri::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addPolicy(new FHIRUri([FHIRUri::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addPolicy(new FHIRUri(array_merge($v, $ext[$i]))); + } } else { $this->addPolicy(new FHIRUri($v)); } } } elseif ($data[self::FIELD_POLICY] instanceof FHIRUri) { $this->addPolicy($data[self::FIELD_POLICY]); - } elseif ($ext && is_scalar($data[self::FIELD_POLICY])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_POLICY])) { $this->addPolicy(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_POLICY]] + $ext)); } else { $this->addPolicy(new FHIRUri($data[self::FIELD_POLICY])); @@ -321,8 +337,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_RECORDED] instanceof FHIRInstant) { $this->setRecorded($data[self::FIELD_RECORDED]); - } elseif ($ext && is_scalar($data[self::FIELD_RECORDED])) { - $this->setRecorded(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_RECORDED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_RECORDED])) { + $this->setRecorded(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_RECORDED]] + $ext)); + } else if (is_array($data[self::FIELD_RECORDED])) { + $this->setRecorded(new FHIRInstant(array_merge($ext, $data[self::FIELD_RECORDED]))); + } } else { $this->setRecorded(new FHIRInstant($data[self::FIELD_RECORDED])); } @@ -330,6 +350,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_TARGET])) { if (is_array($data[self::FIELD_TARGET])) { foreach($data[self::FIELD_TARGET] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRResourceReference) { $this->addTarget($v); } else { @@ -929,7 +952,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getAgent())) { foreach($vs as $v) { if (null === $v) { @@ -947,14 +969,13 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_ENTITY, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getIntegritySignature())) { $v->xmlSerialize($sxe->addChild(self::FIELD_INTEGRITY_SIGNATURE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getLocation())) { $v->xmlSerialize($sxe->addChild(self::FIELD_LOCATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PERIOD, null, $v->_getFHIRXMLNamespace())); } @@ -973,7 +994,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getRecorded())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RECORDED, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getTarget())) { foreach($vs as $v) { if (null === $v) { @@ -982,6 +1002,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_TARGET, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } @@ -998,8 +1019,15 @@ public function jsonSerialize() $a[self::FIELD_ENTITY] = $vs; } if (null !== ($v = $this->getIntegritySignature())) { - $a[self::FIELD_INTEGRITY_SIGNATURE] = $v->getValue(); - $a[self::FIELD_INTEGRITY_SIGNATURE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_INTEGRITY_SIGNATURE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_INTEGRITY_SIGNATURE_EXT] = $enc; + } + } else { + $a[self::FIELD_INTEGRITY_SIGNATURE] = $v; + } } if (null !== ($v = $this->getLocation())) { $a[self::FIELD_LOCATION] = $v; @@ -1013,16 +1041,32 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_POLICY][] = $v->getValue(); - $a[self::FIELD_POLICY_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_POLICY][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_POLICY_EXT][] = $enc; + } else { + $a[self::FIELD_POLICY_EXT][] = null; + } + } else { + $a[self::FIELD_POLICY][] = $v; + } } } if (null !== ($v = $this->getReason())) { $a[self::FIELD_REASON] = $v; } if (null !== ($v = $this->getRecorded())) { - $a[self::FIELD_RECORDED] = $v->getValue(); - $a[self::FIELD_RECORDED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_RECORDED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_RECORDED_EXT] = $enc; + } + } else { + $a[self::FIELD_RECORDED] = $v; + } } if ([] !== ($vs = $this->getTarget())) { $a[self::FIELD_TARGET] = $vs; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRQuery.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRQuery.php index 56b6178280..ad0b8af4ae 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRQuery.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRQuery.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -76,10 +76,6 @@ class FHIRQuery extends FHIRResource implements PHPFHIRContainedTypeInterface { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_QUERY; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_IDENTIFIER = 'identifier'; const FIELD_IDENTIFIER_EXT = '_identifier'; const FIELD_PARAMETER = 'parameter'; @@ -115,6 +111,9 @@ class FHIRQuery extends FHIRResource implements PHPFHIRContainedTypeInterface */ protected $response = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRQuery Constructor * @param null|array $data @@ -137,8 +136,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IDENTIFIER] instanceof FHIRUri) { $this->setIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { - $this->setIdentifier(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRUri(array_merge($ext, $data[self::FIELD_IDENTIFIER]))); + } } else { $this->setIdentifier(new FHIRUri($data[self::FIELD_IDENTIFIER])); } @@ -146,6 +149,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PARAMETER])) { if (is_array($data[self::FIELD_PARAMETER])) { foreach($data[self::FIELD_PARAMETER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRExtension) { $this->addParameter($v); } else { @@ -409,7 +415,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getParameter())) { foreach($vs as $v) { if (null === $v) { @@ -432,8 +437,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $v->getValue(); - $a[self::FIELD_IDENTIFIER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_IDENTIFIER] = $v; + } } if ([] !== ($vs = $this->getParameter())) { $a[self::FIELD_PARAMETER] = $vs; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRQuestionnaire.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRQuestionnaire.php index 0ec59d36e1..7b02c15980 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRQuestionnaire.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRQuestionnaire.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -82,10 +82,6 @@ class FHIRQuestionnaire extends FHIRResource implements PHPFHIRContainedTypeInte { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_QUESTIONNAIRE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_AUTHOR = 'author'; const FIELD_AUTHORED = 'authored'; const FIELD_AUTHORED_EXT = '_authored'; @@ -211,6 +207,9 @@ class FHIRQuestionnaire extends FHIRResource implements PHPFHIRContainedTypeInte */ protected $subject = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRQuestionnaire Constructor * @param null|array $data @@ -240,8 +239,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_AUTHORED] instanceof FHIRDateTime) { $this->setAuthored($data[self::FIELD_AUTHORED]); - } elseif ($ext && is_scalar($data[self::FIELD_AUTHORED])) { - $this->setAuthored(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_AUTHORED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_AUTHORED])) { + $this->setAuthored(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_AUTHORED]] + $ext)); + } else if (is_array($data[self::FIELD_AUTHORED])) { + $this->setAuthored(new FHIRDateTime(array_merge($ext, $data[self::FIELD_AUTHORED]))); + } } else { $this->setAuthored(new FHIRDateTime($data[self::FIELD_AUTHORED])); } @@ -266,17 +269,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -302,8 +312,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRQuestionnaireStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRQuestionnaireStatus([FHIRQuestionnaireStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRQuestionnaireStatus([FHIRQuestionnaireStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRQuestionnaireStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRQuestionnaireStatus($data[self::FIELD_STATUS])); } @@ -789,22 +803,18 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getAuthor())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AUTHOR, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getAuthored())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AUTHORED, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getEncounter())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ENCOUNTER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getGroup())) { $v->xmlSerialize($sxe->addChild(self::FIELD_GROUP, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -817,15 +827,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NAME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSource())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SOURCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSubject())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBJECT, null, $v->_getFHIRXMLNamespace())); } @@ -842,8 +849,15 @@ public function jsonSerialize() $a[self::FIELD_AUTHOR] = $v; } if (null !== ($v = $this->getAuthored())) { - $a[self::FIELD_AUTHORED] = $v->getValue(); - $a[self::FIELD_AUTHORED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_AUTHORED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_AUTHORED_EXT] = $enc; + } + } else { + $a[self::FIELD_AUTHORED] = $v; + } } if (null !== ($v = $this->getEncounter())) { $a[self::FIELD_ENCOUNTER] = $v; @@ -852,7 +866,23 @@ public function jsonSerialize() $a[self::FIELD_GROUP] = $v; } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if (null !== ($v = $this->getName())) { $a[self::FIELD_NAME] = $v; @@ -861,7 +891,15 @@ public function jsonSerialize() $a[self::FIELD_SOURCE] = $v; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getSubject())) { $a[self::FIELD_SUBJECT] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRRelatedPerson.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRRelatedPerson.php index bec6042809..337d0f7ef7 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRRelatedPerson.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRRelatedPerson.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -82,10 +82,6 @@ class FHIRRelatedPerson extends FHIRResource implements PHPFHIRContainedTypeInte { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_RELATED_PERSON; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ADDRESS = 'address'; const FIELD_GENDER = 'gender'; const FIELD_IDENTIFIER = 'identifier'; @@ -190,6 +186,9 @@ class FHIRRelatedPerson extends FHIRResource implements PHPFHIRContainedTypeInte */ protected $telecom = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRRelatedPerson Constructor * @param null|array $data @@ -226,17 +225,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -259,6 +265,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PHOTO])) { if (is_array($data[self::FIELD_PHOTO])) { foreach($data[self::FIELD_PHOTO] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRAttachment) { $this->addPhoto($v); } else { @@ -284,17 +293,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_TELECOM])) { foreach($data[self::FIELD_TELECOM] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContact) { $this->addTelecom($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addTelecom(new FHIRContact([FHIRContact::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addTelecom(new FHIRContact([FHIRContact::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addTelecom(new FHIRContact(array_merge($v, $ext[$i]))); + } } else { $this->addTelecom(new FHIRContact($v)); } } } elseif ($data[self::FIELD_TELECOM] instanceof FHIRContact) { $this->addTelecom($data[self::FIELD_TELECOM]); - } elseif ($ext && is_scalar($data[self::FIELD_TELECOM])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_TELECOM])) { $this->addTelecom(new FHIRContact([FHIRContact::FIELD_VALUE => $data[self::FIELD_TELECOM]] + $ext)); } else { $this->addTelecom(new FHIRContact($data[self::FIELD_TELECOM])); @@ -768,15 +784,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getAddress())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ADDRESS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getGender())) { $v->xmlSerialize($sxe->addChild(self::FIELD_GENDER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -789,11 +802,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NAME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPatient())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATIENT, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getPhoto())) { foreach($vs as $v) { if (null === $v) { @@ -806,7 +817,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getRelationship())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RELATIONSHIP, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getTelecom())) { foreach($vs as $v) { if (null === $v) { @@ -815,6 +825,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_TELECOM, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } @@ -831,7 +842,23 @@ public function jsonSerialize() $a[self::FIELD_GENDER] = $v; } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if (null !== ($v = $this->getName())) { $a[self::FIELD_NAME] = $v; @@ -846,7 +873,23 @@ public function jsonSerialize() $a[self::FIELD_RELATIONSHIP] = $v; } if ([] !== ($vs = $this->getTelecom())) { - $a[self::FIELD_TELECOM] = $vs; + $a[self::FIELD_TELECOM] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TELECOM][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TELECOM_EXT][] = $enc; + } else { + $a[self::FIELD_TELECOM_EXT][] = null; + } + } else { + $a[self::FIELD_TELECOM][] = $v; + } + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRSecurityEvent.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRSecurityEvent.php index 1e74deb048..55fc7d1bf5 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRSecurityEvent.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRSecurityEvent.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRSecurityEvent extends FHIRResource implements PHPFHIRContainedTypeInte { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SECURITY_EVENT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_EVENT = 'event'; const FIELD_OBJECT = 'object'; const FIELD_PARTICIPANT = 'participant'; @@ -132,6 +128,9 @@ class FHIRSecurityEvent extends FHIRResource implements PHPFHIRContainedTypeInte */ protected $source = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSecurityEvent Constructor * @param null|array $data @@ -158,6 +157,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_OBJECT])) { if (is_array($data[self::FIELD_OBJECT])) { foreach($data[self::FIELD_OBJECT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRSecurityEventObject) { $this->addObject($v); } else { @@ -173,6 +175,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PARTICIPANT])) { if (is_array($data[self::FIELD_PARTICIPANT])) { foreach($data[self::FIELD_PARTICIPANT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRSecurityEventParticipant) { $this->addParticipant($v); } else { @@ -489,11 +494,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getEvent())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EVENT, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getObject())) { foreach($vs as $v) { if (null === $v) { diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRSpecimen.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRSpecimen.php index e7a8e66a9f..549dbd9425 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRSpecimen.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRSpecimen.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -81,10 +81,6 @@ class FHIRSpecimen extends FHIRResource implements PHPFHIRContainedTypeInterface { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SPECIMEN; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ACCESSION_IDENTIFIER = 'accessionIdentifier'; const FIELD_ACCESSION_IDENTIFIER_EXT = '_accessionIdentifier'; const FIELD_COLLECTION = 'collection'; @@ -196,6 +192,9 @@ class FHIRSpecimen extends FHIRResource implements PHPFHIRContainedTypeInterface */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSpecimen Constructor * @param null|array $data @@ -218,8 +217,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ACCESSION_IDENTIFIER] instanceof FHIRIdentifier) { $this->setAccessionIdentifier($data[self::FIELD_ACCESSION_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_ACCESSION_IDENTIFIER])) { - $this->setAccessionIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_ACCESSION_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ACCESSION_IDENTIFIER])) { + $this->setAccessionIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_ACCESSION_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_ACCESSION_IDENTIFIER])) { + $this->setAccessionIdentifier(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_ACCESSION_IDENTIFIER]))); + } } else { $this->setAccessionIdentifier(new FHIRIdentifier($data[self::FIELD_ACCESSION_IDENTIFIER])); } @@ -234,6 +237,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CONTAINER])) { if (is_array($data[self::FIELD_CONTAINER])) { foreach($data[self::FIELD_CONTAINER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRSpecimenContainer) { $this->addContainer($v); } else { @@ -252,17 +258,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -274,8 +287,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_RECEIVED_TIME] instanceof FHIRDateTime) { $this->setReceivedTime($data[self::FIELD_RECEIVED_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_RECEIVED_TIME])) { - $this->setReceivedTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_RECEIVED_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_RECEIVED_TIME])) { + $this->setReceivedTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_RECEIVED_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_RECEIVED_TIME])) { + $this->setReceivedTime(new FHIRDateTime(array_merge($ext, $data[self::FIELD_RECEIVED_TIME]))); + } } else { $this->setReceivedTime(new FHIRDateTime($data[self::FIELD_RECEIVED_TIME])); } @@ -283,6 +300,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SOURCE])) { if (is_array($data[self::FIELD_SOURCE])) { foreach($data[self::FIELD_SOURCE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRSpecimenSource) { $this->addSource($v); } else { @@ -305,6 +325,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_TREATMENT])) { if (is_array($data[self::FIELD_TREATMENT])) { foreach($data[self::FIELD_TREATMENT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRSpecimenTreatment) { $this->addTreatment($v); } else { @@ -846,15 +869,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getAccessionIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ACCESSION_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getCollection())) { $v->xmlSerialize($sxe->addChild(self::FIELD_COLLECTION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getContainer())) { foreach($vs as $v) { if (null === $v) { @@ -872,10 +892,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getReceivedTime())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RECEIVED_TIME, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getSource())) { foreach($vs as $v) { if (null === $v) { @@ -888,7 +908,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getSubject())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBJECT, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getTreatment())) { foreach($vs as $v) { if (null === $v) { @@ -911,7 +930,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getAccessionIdentifier())) { - $a[self::FIELD_ACCESSION_IDENTIFIER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ACCESSION_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ACCESSION_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_ACCESSION_IDENTIFIER] = $v; + } } if (null !== ($v = $this->getCollection())) { $a[self::FIELD_COLLECTION] = $v; @@ -920,11 +947,34 @@ public function jsonSerialize() $a[self::FIELD_CONTAINER] = $vs; } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if (null !== ($v = $this->getReceivedTime())) { - $a[self::FIELD_RECEIVED_TIME] = $v->getValue(); - $a[self::FIELD_RECEIVED_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_RECEIVED_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_RECEIVED_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_RECEIVED_TIME] = $v; + } } if ([] !== ($vs = $this->getSource())) { $a[self::FIELD_SOURCE] = $vs; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRSubstance.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRSubstance.php index 5f0fa2564c..468dc6f999 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRSubstance.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRSubstance.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -77,10 +77,6 @@ class FHIRSubstance extends FHIRResource implements PHPFHIRContainedTypeInterfac { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SUBSTANCE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DESCRIPTION = 'description'; const FIELD_DESCRIPTION_EXT = '_description'; const FIELD_INGREDIENT = 'ingredient'; @@ -129,6 +125,9 @@ class FHIRSubstance extends FHIRResource implements PHPFHIRContainedTypeInterfac */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSubstance Constructor * @param null|array $data @@ -151,8 +150,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -160,6 +163,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_INGREDIENT])) { if (is_array($data[self::FIELD_INGREDIENT])) { foreach($data[self::FIELD_INGREDIENT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRSubstanceIngredient) { $this->addIngredient($v); } else { @@ -463,7 +469,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESCRIPTION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIngredient())) { foreach($vs as $v) { if (null === $v) { @@ -476,7 +481,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getInstance())) { $v->xmlSerialize($sxe->addChild(self::FIELD_INSTANCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -490,8 +494,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if ([] !== ($vs = $this->getIngredient())) { $a[self::FIELD_INGREDIENT] = $vs; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRSupply.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRSupply.php index 7d9b7bf589..6080771d18 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRSupply.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRSupply.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRSupply extends FHIRResource implements PHPFHIRContainedTypeInterface { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SUPPLY; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DISPENSE = 'dispense'; const FIELD_IDENTIFIER = 'identifier'; const FIELD_IDENTIFIER_EXT = '_identifier'; @@ -157,6 +153,9 @@ class FHIRSupply extends FHIRResource implements PHPFHIRContainedTypeInterface */ protected $status = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSupply Constructor * @param null|array $data @@ -176,6 +175,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_DISPENSE])) { if (is_array($data[self::FIELD_DISPENSE])) { foreach($data[self::FIELD_DISPENSE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRSupplyDispense) { $this->addDispense($v); } else { @@ -194,8 +196,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->setIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { - $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_IDENTIFIER]))); + } } else { $this->setIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); } @@ -227,8 +233,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRSupplyStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRSupplyStatus([FHIRSupplyStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRSupplyStatus([FHIRSupplyStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRSupplyStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRSupplyStatus($data[self::FIELD_STATUS])); } @@ -567,7 +577,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getDispense())) { foreach($vs as $v) { if (null === $v) { @@ -580,19 +589,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getKind())) { $v->xmlSerialize($sxe->addChild(self::FIELD_KIND, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOrderedItem())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ORDERED_ITEM, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPatient())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATIENT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } @@ -609,7 +614,15 @@ public function jsonSerialize() $a[self::FIELD_DISPENSE] = $vs; } if (null !== ($v = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_IDENTIFIER] = $v; + } } if (null !== ($v = $this->getKind())) { $a[self::FIELD_KIND] = $v; @@ -621,7 +634,15 @@ public function jsonSerialize() $a[self::FIELD_PATIENT] = $v; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRValueSet.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRValueSet.php index 3d7d38174c..b3c8a751da 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRValueSet.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRValueSet.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -81,10 +81,6 @@ class FHIRValueSet extends FHIRResource implements PHPFHIRContainedTypeInterface { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_VALUE_SET; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_COMPOSE = 'compose'; const FIELD_COPYRIGHT = 'copyright'; const FIELD_COPYRIGHT_EXT = '_copyright'; @@ -261,6 +257,9 @@ class FHIRValueSet extends FHIRResource implements PHPFHIRContainedTypeInterface */ protected $version = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRValueSet Constructor * @param null|array $data @@ -290,8 +289,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_COPYRIGHT] instanceof FHIRString) { $this->setCopyright($data[self::FIELD_COPYRIGHT]); - } elseif ($ext && is_scalar($data[self::FIELD_COPYRIGHT])) { - $this->setCopyright(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_COPYRIGHT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_COPYRIGHT])) { + $this->setCopyright(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_COPYRIGHT]] + $ext)); + } else if (is_array($data[self::FIELD_COPYRIGHT])) { + $this->setCopyright(new FHIRString(array_merge($ext, $data[self::FIELD_COPYRIGHT]))); + } } else { $this->setCopyright(new FHIRString($data[self::FIELD_COPYRIGHT])); } @@ -302,8 +305,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATE] instanceof FHIRDateTime) { $this->setDate($data[self::FIELD_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_DATE])) { - $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime(array_merge($ext, $data[self::FIELD_DATE]))); + } } else { $this->setDate(new FHIRDateTime($data[self::FIELD_DATE])); } @@ -321,8 +328,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -340,8 +351,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EXPERIMENTAL] instanceof FHIRBoolean) { $this->setExperimental($data[self::FIELD_EXPERIMENTAL]); - } elseif ($ext && is_scalar($data[self::FIELD_EXPERIMENTAL])) { - $this->setExperimental(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_EXPERIMENTAL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EXPERIMENTAL])) { + $this->setExperimental(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_EXPERIMENTAL]] + $ext)); + } else if (is_array($data[self::FIELD_EXPERIMENTAL])) { + $this->setExperimental(new FHIRBoolean(array_merge($ext, $data[self::FIELD_EXPERIMENTAL]))); + } } else { $this->setExperimental(new FHIRBoolean($data[self::FIELD_EXPERIMENTAL])); } @@ -352,8 +367,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EXTENSIBLE] instanceof FHIRBoolean) { $this->setExtensible($data[self::FIELD_EXTENSIBLE]); - } elseif ($ext && is_scalar($data[self::FIELD_EXTENSIBLE])) { - $this->setExtensible(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_EXTENSIBLE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EXTENSIBLE])) { + $this->setExtensible(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_EXTENSIBLE]] + $ext)); + } else if (is_array($data[self::FIELD_EXTENSIBLE])) { + $this->setExtensible(new FHIRBoolean(array_merge($ext, $data[self::FIELD_EXTENSIBLE]))); + } } else { $this->setExtensible(new FHIRBoolean($data[self::FIELD_EXTENSIBLE])); } @@ -364,8 +383,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IDENTIFIER] instanceof FHIRString) { $this->setIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { - $this->setIdentifier(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRString(array_merge($ext, $data[self::FIELD_IDENTIFIER]))); + } } else { $this->setIdentifier(new FHIRString($data[self::FIELD_IDENTIFIER])); } @@ -376,8 +399,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -388,8 +415,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PUBLISHER] instanceof FHIRString) { $this->setPublisher($data[self::FIELD_PUBLISHER]); - } elseif ($ext && is_scalar($data[self::FIELD_PUBLISHER])) { - $this->setPublisher(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PUBLISHER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PUBLISHER])) { + $this->setPublisher(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PUBLISHER]] + $ext)); + } else if (is_array($data[self::FIELD_PUBLISHER])) { + $this->setPublisher(new FHIRString(array_merge($ext, $data[self::FIELD_PUBLISHER]))); + } } else { $this->setPublisher(new FHIRString($data[self::FIELD_PUBLISHER])); } @@ -400,8 +431,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRValueSetStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRValueSetStatus([FHIRValueSetStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRValueSetStatus([FHIRValueSetStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRValueSetStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRValueSetStatus($data[self::FIELD_STATUS])); } @@ -412,17 +447,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_TELECOM])) { foreach($data[self::FIELD_TELECOM] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContact) { $this->addTelecom($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addTelecom(new FHIRContact([FHIRContact::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addTelecom(new FHIRContact([FHIRContact::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addTelecom(new FHIRContact(array_merge($v, $ext[$i]))); + } } else { $this->addTelecom(new FHIRContact($v)); } } } elseif ($data[self::FIELD_TELECOM] instanceof FHIRContact) { $this->addTelecom($data[self::FIELD_TELECOM]); - } elseif ($ext && is_scalar($data[self::FIELD_TELECOM])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_TELECOM])) { $this->addTelecom(new FHIRContact([FHIRContact::FIELD_VALUE => $data[self::FIELD_TELECOM]] + $ext)); } else { $this->addTelecom(new FHIRContact($data[self::FIELD_TELECOM])); @@ -434,8 +476,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VERSION] instanceof FHIRString) { $this->setVersion($data[self::FIELD_VERSION]); - } elseif ($ext && is_scalar($data[self::FIELD_VERSION])) { - $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } else if (is_array($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString(array_merge($ext, $data[self::FIELD_VERSION]))); + } } else { $this->setVersion(new FHIRString($data[self::FIELD_VERSION])); } @@ -1132,7 +1178,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getCompose())) { $v->xmlSerialize($sxe->addChild(self::FIELD_COMPOSE, null, $v->_getFHIRXMLNamespace())); } @@ -1142,14 +1187,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DATE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDefine())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFINE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getDescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESCRIPTION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getExpansion())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EXPANSION, null, $v->_getFHIRXMLNamespace())); } @@ -1168,11 +1211,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getPublisher())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PUBLISHER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getTelecom())) { foreach($vs as $v) { if (null === $v) { @@ -1181,6 +1222,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_TELECOM, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getVersion())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VERSION, null, $v->_getFHIRXMLNamespace())); } @@ -1197,52 +1239,139 @@ public function jsonSerialize() $a[self::FIELD_COMPOSE] = $v; } if (null !== ($v = $this->getCopyright())) { - $a[self::FIELD_COPYRIGHT] = $v->getValue(); - $a[self::FIELD_COPYRIGHT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_COPYRIGHT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_COPYRIGHT_EXT] = $enc; + } + } else { + $a[self::FIELD_COPYRIGHT] = $v; + } } if (null !== ($v = $this->getDate())) { - $a[self::FIELD_DATE] = $v->getValue(); - $a[self::FIELD_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_DATE] = $v; + } } if (null !== ($v = $this->getDefine())) { $a[self::FIELD_DEFINE] = $v; } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if (null !== ($v = $this->getExpansion())) { $a[self::FIELD_EXPANSION] = $v; } if (null !== ($v = $this->getExperimental())) { - $a[self::FIELD_EXPERIMENTAL] = $v->getValue(); - $a[self::FIELD_EXPERIMENTAL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EXPERIMENTAL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EXPERIMENTAL_EXT] = $enc; + } + } else { + $a[self::FIELD_EXPERIMENTAL] = $v; + } } if (null !== ($v = $this->getExtensible())) { - $a[self::FIELD_EXTENSIBLE] = $v->getValue(); - $a[self::FIELD_EXTENSIBLE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EXTENSIBLE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EXTENSIBLE_EXT] = $enc; + } + } else { + $a[self::FIELD_EXTENSIBLE] = $v; + } } if (null !== ($v = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $v->getValue(); - $a[self::FIELD_IDENTIFIER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_IDENTIFIER] = $v; + } } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if (null !== ($v = $this->getPublisher())) { - $a[self::FIELD_PUBLISHER] = $v->getValue(); - $a[self::FIELD_PUBLISHER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PUBLISHER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PUBLISHER_EXT] = $enc; + } + } else { + $a[self::FIELD_PUBLISHER] = $v; + } } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if ([] !== ($vs = $this->getTelecom())) { - $a[self::FIELD_TELECOM] = $vs; + $a[self::FIELD_TELECOM] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TELECOM][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TELECOM_EXT][] = $enc; + } else { + $a[self::FIELD_TELECOM_EXT][] = null; + } + } else { + $a[self::FIELD_TELECOM][] = $v; + } + } } if (null !== ($v = $this->getVersion())) { - $a[self::FIELD_VERSION] = $v->getValue(); - $a[self::FIELD_VERSION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VERSION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VERSION_EXT] = $enc; + } + } else { + $a[self::FIELD_VERSION] = $v; + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRSecurityEvent/FHIRSecurityEventDetail.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRSecurityEvent/FHIRSecurityEventDetail.php index b9e5d5d694..86dfcf6ca7 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRSecurityEvent/FHIRSecurityEventDetail.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRSecurityEvent/FHIRSecurityEventDetail.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -75,10 +75,6 @@ class FHIRSecurityEventDetail extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SECURITY_EVENT_DOT_DETAIL; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_TYPE = 'type'; const FIELD_TYPE_EXT = '_type'; const FIELD_VALUE = 'value'; @@ -104,6 +100,9 @@ class FHIRSecurityEventDetail extends FHIRBackboneElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSecurityEventDetail Constructor * @param null|array $data @@ -130,8 +129,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TYPE] instanceof FHIRString) { $this->setType($data[self::FIELD_TYPE]); - } elseif ($ext && is_scalar($data[self::FIELD_TYPE])) { - $this->setType(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TYPE])) { + $this->setType(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } else if (is_array($data[self::FIELD_TYPE])) { + $this->setType(new FHIRString(array_merge($ext, $data[self::FIELD_TYPE]))); + } } else { $this->setType(new FHIRString($data[self::FIELD_TYPE])); } @@ -142,8 +145,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE] instanceof FHIRBase64Binary) { $this->setValue($data[self::FIELD_VALUE]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE])) { - $this->setValue(new FHIRBase64Binary([FHIRBase64Binary::FIELD_VALUE => $data[self::FIELD_VALUE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE])) { + $this->setValue(new FHIRBase64Binary([FHIRBase64Binary::FIELD_VALUE => $data[self::FIELD_VALUE]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE])) { + $this->setValue(new FHIRBase64Binary(array_merge($ext, $data[self::FIELD_VALUE]))); + } } else { $this->setValue(new FHIRBase64Binary($data[self::FIELD_VALUE])); } @@ -337,6 +344,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getValue())) { + $sxe->addAttribute(self::FIELD_VALUE, (string)$v); $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE, null, $v->_getFHIRXMLNamespace())); } return $sxe; @@ -349,12 +357,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getType())) { - $a[self::FIELD_TYPE] = $v->getValue(); - $a[self::FIELD_TYPE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TYPE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TYPE_EXT] = $enc; + } + } else { + $a[self::FIELD_TYPE] = $v; + } } if (null !== ($v = $this->getValue())) { - $a[self::FIELD_VALUE] = $v->getValue(); - $a[self::FIELD_VALUE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRSecurityEvent/FHIRSecurityEventEvent.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRSecurityEvent/FHIRSecurityEventEvent.php index a651ea52f0..f19189c403 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRSecurityEvent/FHIRSecurityEventEvent.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRSecurityEvent/FHIRSecurityEventEvent.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRSecurityEventEvent extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SECURITY_EVENT_DOT_EVENT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ACTION = 'action'; const FIELD_ACTION_EXT = '_action'; const FIELD_DATE_TIME = 'dateTime'; @@ -159,6 +155,9 @@ class FHIRSecurityEventEvent extends FHIRBackboneElement */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSecurityEventEvent Constructor * @param null|array $data @@ -181,8 +180,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ACTION] instanceof FHIRSecurityEventAction) { $this->setAction($data[self::FIELD_ACTION]); - } elseif ($ext && is_scalar($data[self::FIELD_ACTION])) { - $this->setAction(new FHIRSecurityEventAction([FHIRSecurityEventAction::FIELD_VALUE => $data[self::FIELD_ACTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ACTION])) { + $this->setAction(new FHIRSecurityEventAction([FHIRSecurityEventAction::FIELD_VALUE => $data[self::FIELD_ACTION]] + $ext)); + } else if (is_array($data[self::FIELD_ACTION])) { + $this->setAction(new FHIRSecurityEventAction(array_merge($ext, $data[self::FIELD_ACTION]))); + } } else { $this->setAction(new FHIRSecurityEventAction($data[self::FIELD_ACTION])); } @@ -193,8 +196,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATE_TIME] instanceof FHIRInstant) { $this->setDateTime($data[self::FIELD_DATE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_DATE_TIME])) { - $this->setDateTime(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_DATE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATE_TIME])) { + $this->setDateTime(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_DATE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_DATE_TIME])) { + $this->setDateTime(new FHIRInstant(array_merge($ext, $data[self::FIELD_DATE_TIME]))); + } } else { $this->setDateTime(new FHIRInstant($data[self::FIELD_DATE_TIME])); } @@ -205,8 +212,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_OUTCOME] instanceof FHIRSecurityEventOutcome) { $this->setOutcome($data[self::FIELD_OUTCOME]); - } elseif ($ext && is_scalar($data[self::FIELD_OUTCOME])) { - $this->setOutcome(new FHIRSecurityEventOutcome([FHIRSecurityEventOutcome::FIELD_VALUE => $data[self::FIELD_OUTCOME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_OUTCOME])) { + $this->setOutcome(new FHIRSecurityEventOutcome([FHIRSecurityEventOutcome::FIELD_VALUE => $data[self::FIELD_OUTCOME]] + $ext)); + } else if (is_array($data[self::FIELD_OUTCOME])) { + $this->setOutcome(new FHIRSecurityEventOutcome(array_merge($ext, $data[self::FIELD_OUTCOME]))); + } } else { $this->setOutcome(new FHIRSecurityEventOutcome($data[self::FIELD_OUTCOME])); } @@ -217,8 +228,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_OUTCOME_DESC] instanceof FHIRString) { $this->setOutcomeDesc($data[self::FIELD_OUTCOME_DESC]); - } elseif ($ext && is_scalar($data[self::FIELD_OUTCOME_DESC])) { - $this->setOutcomeDesc(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_OUTCOME_DESC]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_OUTCOME_DESC])) { + $this->setOutcomeDesc(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_OUTCOME_DESC]] + $ext)); + } else if (is_array($data[self::FIELD_OUTCOME_DESC])) { + $this->setOutcomeDesc(new FHIRString(array_merge($ext, $data[self::FIELD_OUTCOME_DESC]))); + } } else { $this->setOutcomeDesc(new FHIRString($data[self::FIELD_OUTCOME_DESC])); } @@ -226,6 +241,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SUBTYPE])) { if (is_array($data[self::FIELD_SUBTYPE])) { foreach($data[self::FIELD_SUBTYPE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addSubtype($v); } else { @@ -595,21 +613,18 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getAction())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ACTION, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getDateTime())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DATE_TIME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOutcome())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OUTCOME, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getOutcomeDesc())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OUTCOME_DESC, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getSubtype())) { foreach($vs as $v) { if (null === $v) { @@ -632,18 +647,48 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getAction())) { - $a[self::FIELD_ACTION] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ACTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ACTION_EXT] = $enc; + } + } else { + $a[self::FIELD_ACTION] = $v; + } } if (null !== ($v = $this->getDateTime())) { - $a[self::FIELD_DATE_TIME] = $v->getValue(); - $a[self::FIELD_DATE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_DATE_TIME] = $v; + } } if (null !== ($v = $this->getOutcome())) { - $a[self::FIELD_OUTCOME] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_OUTCOME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_OUTCOME_EXT] = $enc; + } + } else { + $a[self::FIELD_OUTCOME] = $v; + } } if (null !== ($v = $this->getOutcomeDesc())) { - $a[self::FIELD_OUTCOME_DESC] = $v->getValue(); - $a[self::FIELD_OUTCOME_DESC_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_OUTCOME_DESC] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_OUTCOME_DESC_EXT] = $enc; + } + } else { + $a[self::FIELD_OUTCOME_DESC] = $v; + } } if ([] !== ($vs = $this->getSubtype())) { $a[self::FIELD_SUBTYPE] = $vs; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRSecurityEvent/FHIRSecurityEventNetwork.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRSecurityEvent/FHIRSecurityEventNetwork.php index cde0530703..1b8029b311 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRSecurityEvent/FHIRSecurityEventNetwork.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRSecurityEvent/FHIRSecurityEventNetwork.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -75,10 +75,6 @@ class FHIRSecurityEventNetwork extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SECURITY_EVENT_DOT_NETWORK; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_IDENTIFIER = 'identifier'; const FIELD_IDENTIFIER_EXT = '_identifier'; const FIELD_TYPE = 'type'; @@ -106,6 +102,9 @@ class FHIRSecurityEventNetwork extends FHIRBackboneElement */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSecurityEventNetwork Constructor * @param null|array $data @@ -128,8 +127,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IDENTIFIER] instanceof FHIRString) { $this->setIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { - $this->setIdentifier(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRString(array_merge($ext, $data[self::FIELD_IDENTIFIER]))); + } } else { $this->setIdentifier(new FHIRString($data[self::FIELD_IDENTIFIER])); } @@ -140,8 +143,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TYPE] instanceof FHIRSecurityEventParticipantNetworkType) { $this->setType($data[self::FIELD_TYPE]); - } elseif ($ext && is_scalar($data[self::FIELD_TYPE])) { - $this->setType(new FHIRSecurityEventParticipantNetworkType([FHIRSecurityEventParticipantNetworkType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TYPE])) { + $this->setType(new FHIRSecurityEventParticipantNetworkType([FHIRSecurityEventParticipantNetworkType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } else if (is_array($data[self::FIELD_TYPE])) { + $this->setType(new FHIRSecurityEventParticipantNetworkType(array_merge($ext, $data[self::FIELD_TYPE]))); + } } else { $this->setType(new FHIRSecurityEventParticipantNetworkType($data[self::FIELD_TYPE])); } @@ -327,7 +334,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -341,11 +347,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $v->getValue(); - $a[self::FIELD_IDENTIFIER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_IDENTIFIER] = $v; + } } if (null !== ($v = $this->getType())) { - $a[self::FIELD_TYPE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TYPE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TYPE_EXT] = $enc; + } + } else { + $a[self::FIELD_TYPE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRSecurityEvent/FHIRSecurityEventObject.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRSecurityEvent/FHIRSecurityEventObject.php index 27430f6367..859d577bd9 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRSecurityEvent/FHIRSecurityEventObject.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRSecurityEvent/FHIRSecurityEventObject.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -81,10 +81,6 @@ class FHIRSecurityEventObject extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SECURITY_EVENT_DOT_OBJECT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DESCRIPTION = 'description'; const FIELD_DESCRIPTION_EXT = '_description'; const FIELD_DETAIL = 'detail'; @@ -215,6 +211,9 @@ class FHIRSecurityEventObject extends FHIRBackboneElement */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSecurityEventObject Constructor * @param null|array $data @@ -237,8 +236,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -249,17 +252,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_DETAIL])) { foreach($data[self::FIELD_DETAIL] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRSecurityEventDetail) { $this->addDetail($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addDetail(new FHIRSecurityEventDetail([FHIRSecurityEventDetail::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addDetail(new FHIRSecurityEventDetail([FHIRSecurityEventDetail::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addDetail(new FHIRSecurityEventDetail(array_merge($v, $ext[$i]))); + } } else { $this->addDetail(new FHIRSecurityEventDetail($v)); } } } elseif ($data[self::FIELD_DETAIL] instanceof FHIRSecurityEventDetail) { $this->addDetail($data[self::FIELD_DETAIL]); - } elseif ($ext && is_scalar($data[self::FIELD_DETAIL])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_DETAIL])) { $this->addDetail(new FHIRSecurityEventDetail([FHIRSecurityEventDetail::FIELD_VALUE => $data[self::FIELD_DETAIL]] + $ext)); } else { $this->addDetail(new FHIRSecurityEventDetail($data[self::FIELD_DETAIL])); @@ -271,8 +281,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->setIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { - $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_IDENTIFIER]))); + } } else { $this->setIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); } @@ -283,8 +297,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_LIFECYCLE] instanceof FHIRSecurityEventObjectLifecycle) { $this->setLifecycle($data[self::FIELD_LIFECYCLE]); - } elseif ($ext && is_scalar($data[self::FIELD_LIFECYCLE])) { - $this->setLifecycle(new FHIRSecurityEventObjectLifecycle([FHIRSecurityEventObjectLifecycle::FIELD_VALUE => $data[self::FIELD_LIFECYCLE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_LIFECYCLE])) { + $this->setLifecycle(new FHIRSecurityEventObjectLifecycle([FHIRSecurityEventObjectLifecycle::FIELD_VALUE => $data[self::FIELD_LIFECYCLE]] + $ext)); + } else if (is_array($data[self::FIELD_LIFECYCLE])) { + $this->setLifecycle(new FHIRSecurityEventObjectLifecycle(array_merge($ext, $data[self::FIELD_LIFECYCLE]))); + } } else { $this->setLifecycle(new FHIRSecurityEventObjectLifecycle($data[self::FIELD_LIFECYCLE])); } @@ -295,8 +313,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -307,8 +329,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_QUERY] instanceof FHIRBase64Binary) { $this->setQuery($data[self::FIELD_QUERY]); - } elseif ($ext && is_scalar($data[self::FIELD_QUERY])) { - $this->setQuery(new FHIRBase64Binary([FHIRBase64Binary::FIELD_VALUE => $data[self::FIELD_QUERY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_QUERY])) { + $this->setQuery(new FHIRBase64Binary([FHIRBase64Binary::FIELD_VALUE => $data[self::FIELD_QUERY]] + $ext)); + } else if (is_array($data[self::FIELD_QUERY])) { + $this->setQuery(new FHIRBase64Binary(array_merge($ext, $data[self::FIELD_QUERY]))); + } } else { $this->setQuery(new FHIRBase64Binary($data[self::FIELD_QUERY])); } @@ -326,8 +352,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ROLE] instanceof FHIRSecurityEventObjectRole) { $this->setRole($data[self::FIELD_ROLE]); - } elseif ($ext && is_scalar($data[self::FIELD_ROLE])) { - $this->setRole(new FHIRSecurityEventObjectRole([FHIRSecurityEventObjectRole::FIELD_VALUE => $data[self::FIELD_ROLE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ROLE])) { + $this->setRole(new FHIRSecurityEventObjectRole([FHIRSecurityEventObjectRole::FIELD_VALUE => $data[self::FIELD_ROLE]] + $ext)); + } else if (is_array($data[self::FIELD_ROLE])) { + $this->setRole(new FHIRSecurityEventObjectRole(array_merge($ext, $data[self::FIELD_ROLE]))); + } } else { $this->setRole(new FHIRSecurityEventObjectRole($data[self::FIELD_ROLE])); } @@ -345,8 +375,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TYPE] instanceof FHIRSecurityEventObjectType) { $this->setType($data[self::FIELD_TYPE]); - } elseif ($ext && is_scalar($data[self::FIELD_TYPE])) { - $this->setType(new FHIRSecurityEventObjectType([FHIRSecurityEventObjectType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TYPE])) { + $this->setType(new FHIRSecurityEventObjectType([FHIRSecurityEventObjectType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } else if (is_array($data[self::FIELD_TYPE])) { + $this->setType(new FHIRSecurityEventObjectType(array_merge($ext, $data[self::FIELD_TYPE]))); + } } else { $this->setType(new FHIRSecurityEventObjectType($data[self::FIELD_TYPE])); } @@ -848,7 +882,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESCRIPTION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getDetail())) { foreach($vs as $v) { if (null === $v) { @@ -861,7 +894,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getLifecycle())) { $v->xmlSerialize($sxe->addChild(self::FIELD_LIFECYCLE, null, $v->_getFHIRXMLNamespace())); } @@ -871,19 +903,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getQuery())) { $v->xmlSerialize($sxe->addChild(self::FIELD_QUERY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REFERENCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRole())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ROLE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSensitivity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SENSITIVITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -897,37 +925,106 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if ([] !== ($vs = $this->getDetail())) { - $a[self::FIELD_DETAIL] = $vs; + $a[self::FIELD_DETAIL] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DETAIL][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DETAIL_EXT][] = $enc; + } else { + $a[self::FIELD_DETAIL_EXT][] = null; + } + } else { + $a[self::FIELD_DETAIL][] = $v; + } + } } if (null !== ($v = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_IDENTIFIER] = $v; + } } if (null !== ($v = $this->getLifecycle())) { - $a[self::FIELD_LIFECYCLE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_LIFECYCLE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_LIFECYCLE_EXT] = $enc; + } + } else { + $a[self::FIELD_LIFECYCLE] = $v; + } } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if (null !== ($v = $this->getQuery())) { - $a[self::FIELD_QUERY] = $v->getValue(); - $a[self::FIELD_QUERY_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_QUERY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_QUERY_EXT] = $enc; + } + } else { + $a[self::FIELD_QUERY] = $v; + } } if (null !== ($v = $this->getReference())) { $a[self::FIELD_REFERENCE] = $v; } if (null !== ($v = $this->getRole())) { - $a[self::FIELD_ROLE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ROLE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ROLE_EXT] = $enc; + } + } else { + $a[self::FIELD_ROLE] = $v; + } } if (null !== ($v = $this->getSensitivity())) { $a[self::FIELD_SENSITIVITY] = $v; } if (null !== ($v = $this->getType())) { - $a[self::FIELD_TYPE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TYPE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TYPE_EXT] = $enc; + } + } else { + $a[self::FIELD_TYPE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRSecurityEvent/FHIRSecurityEventParticipant.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRSecurityEvent/FHIRSecurityEventParticipant.php index 35bfdca62b..e5e5df5f9d 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRSecurityEvent/FHIRSecurityEventParticipant.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRSecurityEvent/FHIRSecurityEventParticipant.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRSecurityEventParticipant extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SECURITY_EVENT_DOT_PARTICIPANT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ALT_ID = 'altId'; const FIELD_ALT_ID_EXT = '_altId'; const FIELD_MEDIA = 'media'; @@ -187,6 +183,9 @@ class FHIRSecurityEventParticipant extends FHIRBackboneElement */ protected $userId = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSecurityEventParticipant Constructor * @param null|array $data @@ -209,8 +208,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ALT_ID] instanceof FHIRString) { $this->setAltId($data[self::FIELD_ALT_ID]); - } elseif ($ext && is_scalar($data[self::FIELD_ALT_ID])) { - $this->setAltId(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_ALT_ID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ALT_ID])) { + $this->setAltId(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_ALT_ID]] + $ext)); + } else if (is_array($data[self::FIELD_ALT_ID])) { + $this->setAltId(new FHIRString(array_merge($ext, $data[self::FIELD_ALT_ID]))); + } } else { $this->setAltId(new FHIRString($data[self::FIELD_ALT_ID])); } @@ -228,8 +231,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -254,8 +261,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_REQUESTOR] instanceof FHIRBoolean) { $this->setRequestor($data[self::FIELD_REQUESTOR]); - } elseif ($ext && is_scalar($data[self::FIELD_REQUESTOR])) { - $this->setRequestor(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_REQUESTOR]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_REQUESTOR])) { + $this->setRequestor(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_REQUESTOR]] + $ext)); + } else if (is_array($data[self::FIELD_REQUESTOR])) { + $this->setRequestor(new FHIRBoolean(array_merge($ext, $data[self::FIELD_REQUESTOR]))); + } } else { $this->setRequestor(new FHIRBoolean($data[self::FIELD_REQUESTOR])); } @@ -263,6 +274,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ROLE])) { if (is_array($data[self::FIELD_ROLE])) { foreach($data[self::FIELD_ROLE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addRole($v); } else { @@ -281,8 +295,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_USER_ID] instanceof FHIRString) { $this->setUserId($data[self::FIELD_USER_ID]); - } elseif ($ext && is_scalar($data[self::FIELD_USER_ID])) { - $this->setUserId(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_USER_ID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_USER_ID])) { + $this->setUserId(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_USER_ID]] + $ext)); + } else if (is_array($data[self::FIELD_USER_ID])) { + $this->setUserId(new FHIRString(array_merge($ext, $data[self::FIELD_USER_ID]))); + } } else { $this->setUserId(new FHIRString($data[self::FIELD_USER_ID])); } @@ -738,25 +756,21 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getAltId())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ALT_ID, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getMedia())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MEDIA, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NAME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getNetwork())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NETWORK, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REFERENCE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getRequestor())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REQUESTOR, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getRole())) { foreach($vs as $v) { if (null === $v) { @@ -765,6 +779,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_ROLE, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getUserId())) { $v->xmlSerialize($sxe->addChild(self::FIELD_USER_ID, null, $v->_getFHIRXMLNamespace())); } @@ -778,15 +793,29 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getAltId())) { - $a[self::FIELD_ALT_ID] = $v->getValue(); - $a[self::FIELD_ALT_ID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ALT_ID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ALT_ID_EXT] = $enc; + } + } else { + $a[self::FIELD_ALT_ID] = $v; + } } if (null !== ($v = $this->getMedia())) { $a[self::FIELD_MEDIA] = $v; } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if (null !== ($v = $this->getNetwork())) { $a[self::FIELD_NETWORK] = $v; @@ -795,15 +824,29 @@ public function jsonSerialize() $a[self::FIELD_REFERENCE] = $v; } if (null !== ($v = $this->getRequestor())) { - $a[self::FIELD_REQUESTOR] = $v->getValue(); - $a[self::FIELD_REQUESTOR_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_REQUESTOR] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_REQUESTOR_EXT] = $enc; + } + } else { + $a[self::FIELD_REQUESTOR] = $v; + } } if ([] !== ($vs = $this->getRole())) { $a[self::FIELD_ROLE] = $vs; } if (null !== ($v = $this->getUserId())) { - $a[self::FIELD_USER_ID] = $v->getValue(); - $a[self::FIELD_USER_ID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_USER_ID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_USER_ID_EXT] = $enc; + } + } else { + $a[self::FIELD_USER_ID] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRSecurityEvent/FHIRSecurityEventSource.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRSecurityEvent/FHIRSecurityEventSource.php index e176713e6e..9d69dc661f 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRSecurityEvent/FHIRSecurityEventSource.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRSecurityEvent/FHIRSecurityEventSource.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -75,10 +75,6 @@ class FHIRSecurityEventSource extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SECURITY_EVENT_DOT_SOURCE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_IDENTIFIER = 'identifier'; const FIELD_IDENTIFIER_EXT = '_identifier'; const FIELD_SITE = 'site'; @@ -116,6 +112,9 @@ class FHIRSecurityEventSource extends FHIRBackboneElement */ protected $type = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSecurityEventSource Constructor * @param null|array $data @@ -138,8 +137,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IDENTIFIER] instanceof FHIRString) { $this->setIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { - $this->setIdentifier(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRString(array_merge($ext, $data[self::FIELD_IDENTIFIER]))); + } } else { $this->setIdentifier(new FHIRString($data[self::FIELD_IDENTIFIER])); } @@ -150,8 +153,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SITE] instanceof FHIRString) { $this->setSite($data[self::FIELD_SITE]); - } elseif ($ext && is_scalar($data[self::FIELD_SITE])) { - $this->setSite(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SITE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SITE])) { + $this->setSite(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SITE]] + $ext)); + } else if (is_array($data[self::FIELD_SITE])) { + $this->setSite(new FHIRString(array_merge($ext, $data[self::FIELD_SITE]))); + } } else { $this->setSite(new FHIRString($data[self::FIELD_SITE])); } @@ -159,6 +166,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_TYPE])) { if (is_array($data[self::FIELD_TYPE])) { foreach($data[self::FIELD_TYPE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCoding) { $this->addType($v); } else { @@ -423,7 +433,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getSite())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SITE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getType())) { foreach($vs as $v) { if (null === $v) { @@ -432,6 +441,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } @@ -442,12 +452,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $v->getValue(); - $a[self::FIELD_IDENTIFIER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_IDENTIFIER] = $v; + } } if (null !== ($v = $this->getSite())) { - $a[self::FIELD_SITE] = $v->getValue(); - $a[self::FIELD_SITE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SITE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SITE_EXT] = $enc; + } + } else { + $a[self::FIELD_SITE] = $v; + } } if ([] !== ($vs = $this->getType())) { $a[self::FIELD_TYPE] = $vs; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRSpecimen/FHIRSpecimenCollection.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRSpecimen/FHIRSpecimenCollection.php index e8b212d5a5..78bed8e181 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRSpecimen/FHIRSpecimenCollection.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRSpecimen/FHIRSpecimenCollection.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -77,10 +77,6 @@ class FHIRSpecimenCollection extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SPECIMEN_DOT_COLLECTION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_COLLECTED_DATE_TIME = 'collectedDateTime'; const FIELD_COLLECTED_DATE_TIME_EXT = '_collectedDateTime'; const FIELD_COLLECTED_PERIOD = 'collectedPeriod'; @@ -179,6 +175,9 @@ class FHIRSpecimenCollection extends FHIRBackboneElement */ protected $sourceSite = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSpecimenCollection Constructor * @param null|array $data @@ -201,8 +200,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_COLLECTED_DATE_TIME] instanceof FHIRDateTime) { $this->setCollectedDateTime($data[self::FIELD_COLLECTED_DATE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_COLLECTED_DATE_TIME])) { - $this->setCollectedDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_COLLECTED_DATE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_COLLECTED_DATE_TIME])) { + $this->setCollectedDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_COLLECTED_DATE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_COLLECTED_DATE_TIME])) { + $this->setCollectedDateTime(new FHIRDateTime(array_merge($ext, $data[self::FIELD_COLLECTED_DATE_TIME]))); + } } else { $this->setCollectedDateTime(new FHIRDateTime($data[self::FIELD_COLLECTED_DATE_TIME])); } @@ -227,17 +230,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_COMMENT])) { foreach($data[self::FIELD_COMMENT] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRString) { $this->addComment($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addComment(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addComment(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addComment(new FHIRString(array_merge($v, $ext[$i]))); + } } else { $this->addComment(new FHIRString($v)); } } } elseif ($data[self::FIELD_COMMENT] instanceof FHIRString) { $this->addComment($data[self::FIELD_COMMENT]); - } elseif ($ext && is_scalar($data[self::FIELD_COMMENT])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_COMMENT])) { $this->addComment(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_COMMENT]] + $ext)); } else { $this->addComment(new FHIRString($data[self::FIELD_COMMENT])); @@ -256,8 +266,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_QUANTITY] instanceof FHIRQuantity) { $this->setQuantity($data[self::FIELD_QUANTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_QUANTITY])) { - $this->setQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_QUANTITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_QUANTITY])) { + $this->setQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_QUANTITY])) { + $this->setQuantity(new FHIRQuantity(array_merge($ext, $data[self::FIELD_QUANTITY]))); + } } else { $this->setQuantity(new FHIRQuantity($data[self::FIELD_QUANTITY])); } @@ -674,11 +688,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getCollectedDateTime())) { $v->xmlSerialize($sxe->addChild(self::FIELD_COLLECTED_DATE_TIME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getCollectedPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_COLLECTED_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getCollector())) { $v->xmlSerialize($sxe->addChild(self::FIELD_COLLECTOR, null, $v->_getFHIRXMLNamespace())); } @@ -694,11 +706,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getMethod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_METHOD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_QUANTITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSourceSite())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SOURCE_SITE, null, $v->_getFHIRXMLNamespace())); } @@ -712,8 +722,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getCollectedDateTime())) { - $a[self::FIELD_COLLECTED_DATE_TIME] = $v->getValue(); - $a[self::FIELD_COLLECTED_DATE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_COLLECTED_DATE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_COLLECTED_DATE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_COLLECTED_DATE_TIME] = $v; + } } if (null !== ($v = $this->getCollectedPeriod())) { $a[self::FIELD_COLLECTED_PERIOD] = $v; @@ -727,15 +744,32 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_COMMENT][] = $v->getValue(); - $a[self::FIELD_COMMENT_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_COMMENT][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_COMMENT_EXT][] = $enc; + } else { + $a[self::FIELD_COMMENT_EXT][] = null; + } + } else { + $a[self::FIELD_COMMENT][] = $v; + } } } if (null !== ($v = $this->getMethod())) { $a[self::FIELD_METHOD] = $v; } if (null !== ($v = $this->getQuantity())) { - $a[self::FIELD_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_QUANTITY] = $v; + } } if (null !== ($v = $this->getSourceSite())) { $a[self::FIELD_SOURCE_SITE] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRSpecimen/FHIRSpecimenContainer.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRSpecimen/FHIRSpecimenContainer.php index 4b9482648d..0e586ac2e8 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRSpecimen/FHIRSpecimenContainer.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRSpecimen/FHIRSpecimenContainer.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -76,10 +76,6 @@ class FHIRSpecimenContainer extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SPECIMEN_DOT_CONTAINER; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ADDITIVE = 'additive'; const FIELD_CAPACITY = 'capacity'; const FIELD_CAPACITY_EXT = '_capacity'; @@ -164,6 +160,9 @@ class FHIRSpecimenContainer extends FHIRBackboneElement */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSpecimenContainer Constructor * @param null|array $data @@ -193,8 +192,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CAPACITY] instanceof FHIRQuantity) { $this->setCapacity($data[self::FIELD_CAPACITY]); - } elseif ($ext && is_scalar($data[self::FIELD_CAPACITY])) { - $this->setCapacity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_CAPACITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CAPACITY])) { + $this->setCapacity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_CAPACITY]] + $ext)); + } else if (is_array($data[self::FIELD_CAPACITY])) { + $this->setCapacity(new FHIRQuantity(array_merge($ext, $data[self::FIELD_CAPACITY]))); + } } else { $this->setCapacity(new FHIRQuantity($data[self::FIELD_CAPACITY])); } @@ -205,8 +208,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -217,17 +224,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -239,8 +253,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SPECIMEN_QUANTITY] instanceof FHIRQuantity) { $this->setSpecimenQuantity($data[self::FIELD_SPECIMEN_QUANTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_SPECIMEN_QUANTITY])) { - $this->setSpecimenQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_SPECIMEN_QUANTITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SPECIMEN_QUANTITY])) { + $this->setSpecimenQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_SPECIMEN_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_SPECIMEN_QUANTITY])) { + $this->setSpecimenQuantity(new FHIRQuantity(array_merge($ext, $data[self::FIELD_SPECIMEN_QUANTITY]))); + } } else { $this->setSpecimenQuantity(new FHIRQuantity($data[self::FIELD_SPECIMEN_QUANTITY])); } @@ -606,18 +624,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getAdditive())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ADDITIVE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getCapacity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CAPACITY, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getDescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESCRIPTION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -630,7 +645,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getSpecimenQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SPECIMEN_QUANTITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -647,17 +661,56 @@ public function jsonSerialize() $a[self::FIELD_ADDITIVE] = $v; } if (null !== ($v = $this->getCapacity())) { - $a[self::FIELD_CAPACITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CAPACITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CAPACITY_EXT] = $enc; + } + } else { + $a[self::FIELD_CAPACITY] = $v; + } } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if (null !== ($v = $this->getSpecimenQuantity())) { - $a[self::FIELD_SPECIMEN_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SPECIMEN_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SPECIMEN_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_SPECIMEN_QUANTITY] = $v; + } } if (null !== ($v = $this->getType())) { $a[self::FIELD_TYPE] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRSpecimen/FHIRSpecimenSource.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRSpecimen/FHIRSpecimenSource.php index f2b7db3f1a..9834f75d09 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRSpecimen/FHIRSpecimenSource.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRSpecimen/FHIRSpecimenSource.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -73,10 +73,6 @@ class FHIRSpecimenSource extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SPECIMEN_DOT_SOURCE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_RELATIONSHIP = 'relationship'; const FIELD_RELATIONSHIP_EXT = '_relationship'; const FIELD_TARGET = 'target'; @@ -102,6 +98,9 @@ class FHIRSpecimenSource extends FHIRBackboneElement */ protected $target = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSpecimenSource Constructor * @param null|array $data @@ -124,8 +123,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_RELATIONSHIP] instanceof FHIRHierarchicalRelationshipType) { $this->setRelationship($data[self::FIELD_RELATIONSHIP]); - } elseif ($ext && is_scalar($data[self::FIELD_RELATIONSHIP])) { - $this->setRelationship(new FHIRHierarchicalRelationshipType([FHIRHierarchicalRelationshipType::FIELD_VALUE => $data[self::FIELD_RELATIONSHIP]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_RELATIONSHIP])) { + $this->setRelationship(new FHIRHierarchicalRelationshipType([FHIRHierarchicalRelationshipType::FIELD_VALUE => $data[self::FIELD_RELATIONSHIP]] + $ext)); + } else if (is_array($data[self::FIELD_RELATIONSHIP])) { + $this->setRelationship(new FHIRHierarchicalRelationshipType(array_merge($ext, $data[self::FIELD_RELATIONSHIP]))); + } } else { $this->setRelationship(new FHIRHierarchicalRelationshipType($data[self::FIELD_RELATIONSHIP])); } @@ -133,6 +136,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_TARGET])) { if (is_array($data[self::FIELD_TARGET])) { foreach($data[self::FIELD_TARGET] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRResourceReference) { $this->addTarget($v); } else { @@ -338,11 +344,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getRelationship())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RELATIONSHIP, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getTarget())) { foreach($vs as $v) { if (null === $v) { @@ -351,6 +355,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_TARGET, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } @@ -361,7 +366,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getRelationship())) { - $a[self::FIELD_RELATIONSHIP] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_RELATIONSHIP] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_RELATIONSHIP_EXT] = $enc; + } + } else { + $a[self::FIELD_RELATIONSHIP] = $v; + } } if ([] !== ($vs = $this->getTarget())) { $a[self::FIELD_TARGET] = $vs; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRSpecimen/FHIRSpecimenTreatment.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRSpecimen/FHIRSpecimenTreatment.php index 8f312236a8..b23e991c25 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRSpecimen/FHIRSpecimenTreatment.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRSpecimen/FHIRSpecimenTreatment.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -74,10 +74,6 @@ class FHIRSpecimenTreatment extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SPECIMEN_DOT_TREATMENT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ADDITIVE = 'additive'; const FIELD_DESCRIPTION = 'description'; const FIELD_DESCRIPTION_EXT = '_description'; @@ -116,6 +112,9 @@ class FHIRSpecimenTreatment extends FHIRBackboneElement */ protected $procedure = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSpecimenTreatment Constructor * @param null|array $data @@ -135,6 +134,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ADDITIVE])) { if (is_array($data[self::FIELD_ADDITIVE])) { foreach($data[self::FIELD_ADDITIVE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRResourceReference) { $this->addAdditive($v); } else { @@ -153,8 +155,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -405,7 +411,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getAdditive())) { foreach($vs as $v) { if (null === $v) { @@ -414,10 +419,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_ADDITIVE, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getDescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESCRIPTION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getProcedure())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PROCEDURE, null, $v->_getFHIRXMLNamespace())); } @@ -434,8 +439,15 @@ public function jsonSerialize() $a[self::FIELD_ADDITIVE] = $vs; } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if (null !== ($v = $this->getProcedure())) { $a[self::FIELD_PROCEDURE] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRSubstance/FHIRSubstanceIngredient.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRSubstance/FHIRSubstanceIngredient.php index b7d44abd45..f2cb39daa4 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRSubstance/FHIRSubstanceIngredient.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRSubstance/FHIRSubstanceIngredient.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -73,10 +73,6 @@ class FHIRSubstanceIngredient extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SUBSTANCE_DOT_INGREDIENT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_QUANTITY = 'quantity'; const FIELD_SUBSTANCE = 'substance'; @@ -103,6 +99,9 @@ class FHIRSubstanceIngredient extends FHIRBackboneElement */ protected $substance = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSubstanceIngredient Constructor * @param null|array $data @@ -302,11 +301,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_QUANTITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSubstance())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBSTANCE, null, $v->_getFHIRXMLNamespace())); } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRSubstance/FHIRSubstanceInstance.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRSubstance/FHIRSubstanceInstance.php index 4f696cfe8c..970bfbabb6 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRSubstance/FHIRSubstanceInstance.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRSubstance/FHIRSubstanceInstance.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -74,10 +74,6 @@ class FHIRSubstanceInstance extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SUBSTANCE_DOT_INSTANCE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_EXPIRY = 'expiry'; const FIELD_EXPIRY_EXT = '_expiry'; const FIELD_IDENTIFIER = 'identifier'; @@ -124,6 +120,9 @@ class FHIRSubstanceInstance extends FHIRBackboneElement */ protected $quantity = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSubstanceInstance Constructor * @param null|array $data @@ -146,8 +145,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EXPIRY] instanceof FHIRDateTime) { $this->setExpiry($data[self::FIELD_EXPIRY]); - } elseif ($ext && is_scalar($data[self::FIELD_EXPIRY])) { - $this->setExpiry(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_EXPIRY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EXPIRY])) { + $this->setExpiry(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_EXPIRY]] + $ext)); + } else if (is_array($data[self::FIELD_EXPIRY])) { + $this->setExpiry(new FHIRDateTime(array_merge($ext, $data[self::FIELD_EXPIRY]))); + } } else { $this->setExpiry(new FHIRDateTime($data[self::FIELD_EXPIRY])); } @@ -158,8 +161,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->setIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { - $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_IDENTIFIER]))); + } } else { $this->setIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); } @@ -170,8 +177,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_QUANTITY] instanceof FHIRQuantity) { $this->setQuantity($data[self::FIELD_QUANTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_QUANTITY])) { - $this->setQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_QUANTITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_QUANTITY])) { + $this->setQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_QUANTITY])) { + $this->setQuantity(new FHIRQuantity(array_merge($ext, $data[self::FIELD_QUANTITY]))); + } } else { $this->setQuantity(new FHIRQuantity($data[self::FIELD_QUANTITY])); } @@ -402,11 +413,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getExpiry())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EXPIRY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_QUANTITY, null, $v->_getFHIRXMLNamespace())); } @@ -420,14 +429,37 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getExpiry())) { - $a[self::FIELD_EXPIRY] = $v->getValue(); - $a[self::FIELD_EXPIRY_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EXPIRY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EXPIRY_EXT] = $enc; + } + } else { + $a[self::FIELD_EXPIRY] = $v; + } } if (null !== ($v = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_IDENTIFIER] = $v; + } } if (null !== ($v = $this->getQuantity())) { - $a[self::FIELD_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_QUANTITY] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRSupply/FHIRSupplyDispense.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRSupply/FHIRSupplyDispense.php index 6621e47943..a418c3e880 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRSupply/FHIRSupplyDispense.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRSupply/FHIRSupplyDispense.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -77,10 +77,6 @@ class FHIRSupplyDispense extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SUPPLY_DOT_DISPENSE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DESTINATION = 'destination'; const FIELD_IDENTIFIER = 'identifier'; const FIELD_IDENTIFIER_EXT = '_identifier'; @@ -212,6 +208,9 @@ class FHIRSupplyDispense extends FHIRBackboneElement */ protected $whenPrepared = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSupplyDispense Constructor * @param null|array $data @@ -241,8 +240,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->setIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { - $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_IDENTIFIER]))); + } } else { $this->setIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); } @@ -253,8 +256,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_QUANTITY] instanceof FHIRQuantity) { $this->setQuantity($data[self::FIELD_QUANTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_QUANTITY])) { - $this->setQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_QUANTITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_QUANTITY])) { + $this->setQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_QUANTITY])) { + $this->setQuantity(new FHIRQuantity(array_merge($ext, $data[self::FIELD_QUANTITY]))); + } } else { $this->setQuantity(new FHIRQuantity($data[self::FIELD_QUANTITY])); } @@ -262,6 +269,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_RECEIVER])) { if (is_array($data[self::FIELD_RECEIVER])) { foreach($data[self::FIELD_RECEIVER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRResourceReference) { $this->addReceiver($v); } else { @@ -280,8 +290,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRSupplyDispenseStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRSupplyDispenseStatus([FHIRSupplyDispenseStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRSupplyDispenseStatus([FHIRSupplyDispenseStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRSupplyDispenseStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRSupplyDispenseStatus($data[self::FIELD_STATUS])); } @@ -794,19 +808,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getDestination())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESTINATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_QUANTITY, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getReceiver())) { foreach($vs as $v) { if (null === $v) { @@ -819,23 +829,18 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSuppliedItem())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUPPLIED_ITEM, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSupplier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUPPLIER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getWhenHandedOver())) { $v->xmlSerialize($sxe->addChild(self::FIELD_WHEN_HANDED_OVER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getWhenPrepared())) { $v->xmlSerialize($sxe->addChild(self::FIELD_WHEN_PREPARED, null, $v->_getFHIRXMLNamespace())); } @@ -852,16 +857,40 @@ public function jsonSerialize() $a[self::FIELD_DESTINATION] = $v; } if (null !== ($v = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_IDENTIFIER] = $v; + } } if (null !== ($v = $this->getQuantity())) { - $a[self::FIELD_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_QUANTITY] = $v; + } } if ([] !== ($vs = $this->getReceiver())) { $a[self::FIELD_RECEIVER] = $vs; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getSuppliedItem())) { $a[self::FIELD_SUPPLIED_ITEM] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetCompose.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetCompose.php index 86cd87cbad..8ff0476296 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetCompose.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetCompose.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -72,10 +72,6 @@ class FHIRValueSetCompose extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_VALUE_SET_DOT_COMPOSE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_EXCLUDE = 'exclude'; const FIELD_IMPORT = 'import'; const FIELD_IMPORT_EXT = '_import'; @@ -110,6 +106,9 @@ class FHIRValueSetCompose extends FHIRBackboneElement */ protected $include = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRValueSetCompose Constructor * @param null|array $data @@ -129,6 +128,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_EXCLUDE])) { if (is_array($data[self::FIELD_EXCLUDE])) { foreach($data[self::FIELD_EXCLUDE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRValueSetInclude) { $this->addExclude($v); } else { @@ -147,17 +149,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IMPORT])) { foreach($data[self::FIELD_IMPORT] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRUri) { $this->addImport($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addImport(new FHIRUri([FHIRUri::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addImport(new FHIRUri([FHIRUri::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addImport(new FHIRUri(array_merge($v, $ext[$i]))); + } } else { $this->addImport(new FHIRUri($v)); } } } elseif ($data[self::FIELD_IMPORT] instanceof FHIRUri) { $this->addImport($data[self::FIELD_IMPORT]); - } elseif ($ext && is_scalar($data[self::FIELD_IMPORT])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IMPORT])) { $this->addImport(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_IMPORT]] + $ext)); } else { $this->addImport(new FHIRUri($data[self::FIELD_IMPORT])); @@ -166,6 +175,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_INCLUDE])) { if (is_array($data[self::FIELD_INCLUDE])) { foreach($data[self::FIELD_INCLUDE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRValueSetInclude) { $this->addInclude($v); } else { @@ -461,7 +473,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getExclude())) { foreach($vs as $v) { if (null === $v) { @@ -470,6 +481,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_EXCLUDE, null, $v->_getFHIRXMLNamespace())); } } + if ([] !== ($vs = $this->getImport())) { foreach($vs as $v) { if (null === $v) { @@ -487,6 +499,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_INCLUDE, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } @@ -505,8 +518,17 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_IMPORT][] = $v->getValue(); - $a[self::FIELD_IMPORT_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IMPORT][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IMPORT_EXT][] = $enc; + } else { + $a[self::FIELD_IMPORT_EXT][] = null; + } + } else { + $a[self::FIELD_IMPORT][] = $v; + } } } if ([] !== ($vs = $this->getInclude())) { diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetConcept.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetConcept.php index 2284b920a6..a3c4b8d64d 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetConcept.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetConcept.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -74,10 +74,6 @@ class FHIRValueSetConcept extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_VALUE_SET_DOT_CONCEPT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ABSTRACT = 'abstract'; const FIELD_ABSTRACT_EXT = '_abstract'; const FIELD_CODE = 'code'; @@ -142,6 +138,9 @@ class FHIRValueSetConcept extends FHIRBackboneElement */ protected $display = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRValueSetConcept Constructor * @param null|array $data @@ -164,8 +163,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ABSTRACT] instanceof FHIRBoolean) { $this->setAbstract($data[self::FIELD_ABSTRACT]); - } elseif ($ext && is_scalar($data[self::FIELD_ABSTRACT])) { - $this->setAbstract(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_ABSTRACT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ABSTRACT])) { + $this->setAbstract(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_ABSTRACT]] + $ext)); + } else if (is_array($data[self::FIELD_ABSTRACT])) { + $this->setAbstract(new FHIRBoolean(array_merge($ext, $data[self::FIELD_ABSTRACT]))); + } } else { $this->setAbstract(new FHIRBoolean($data[self::FIELD_ABSTRACT])); } @@ -176,8 +179,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CODE] instanceof FHIRCode) { $this->setCode($data[self::FIELD_CODE]); - } elseif ($ext && is_scalar($data[self::FIELD_CODE])) { - $this->setCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_CODE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CODE])) { + $this->setCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_CODE]] + $ext)); + } else if (is_array($data[self::FIELD_CODE])) { + $this->setCode(new FHIRCode(array_merge($ext, $data[self::FIELD_CODE]))); + } } else { $this->setCode(new FHIRCode($data[self::FIELD_CODE])); } @@ -185,6 +192,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CONCEPT])) { if (is_array($data[self::FIELD_CONCEPT])) { foreach($data[self::FIELD_CONCEPT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRValueSetConcept) { $this->addConcept($v); } else { @@ -203,8 +213,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DEFINITION] instanceof FHIRString) { $this->setDefinition($data[self::FIELD_DEFINITION]); - } elseif ($ext && is_scalar($data[self::FIELD_DEFINITION])) { - $this->setDefinition(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DEFINITION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DEFINITION])) { + $this->setDefinition(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DEFINITION]] + $ext)); + } else if (is_array($data[self::FIELD_DEFINITION])) { + $this->setDefinition(new FHIRString(array_merge($ext, $data[self::FIELD_DEFINITION]))); + } } else { $this->setDefinition(new FHIRString($data[self::FIELD_DEFINITION])); } @@ -215,8 +229,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DISPLAY] instanceof FHIRString) { $this->setDisplay($data[self::FIELD_DISPLAY]); - } elseif ($ext && is_scalar($data[self::FIELD_DISPLAY])) { - $this->setDisplay(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DISPLAY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DISPLAY])) { + $this->setDisplay(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DISPLAY]] + $ext)); + } else if (is_array($data[self::FIELD_DISPLAY])) { + $this->setDisplay(new FHIRString(array_merge($ext, $data[self::FIELD_DISPLAY]))); + } } else { $this->setDisplay(new FHIRString($data[self::FIELD_DISPLAY])); } @@ -561,7 +579,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getConcept())) { foreach($vs as $v) { if (null === $v) { @@ -570,6 +587,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_CONCEPT, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getDefinition())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFINITION, null, $v->_getFHIRXMLNamespace())); } @@ -586,23 +604,51 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getAbstract())) { - $a[self::FIELD_ABSTRACT] = $v->getValue(); - $a[self::FIELD_ABSTRACT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ABSTRACT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ABSTRACT_EXT] = $enc; + } + } else { + $a[self::FIELD_ABSTRACT] = $v; + } } if (null !== ($v = $this->getCode())) { - $a[self::FIELD_CODE] = $v->getValue(); - $a[self::FIELD_CODE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CODE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CODE_EXT] = $enc; + } + } else { + $a[self::FIELD_CODE] = $v; + } } if ([] !== ($vs = $this->getConcept())) { $a[self::FIELD_CONCEPT] = $vs; } if (null !== ($v = $this->getDefinition())) { - $a[self::FIELD_DEFINITION] = $v->getValue(); - $a[self::FIELD_DEFINITION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DEFINITION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DEFINITION_EXT] = $enc; + } + } else { + $a[self::FIELD_DEFINITION] = $v; + } } if (null !== ($v = $this->getDisplay())) { - $a[self::FIELD_DISPLAY] = $v->getValue(); - $a[self::FIELD_DISPLAY_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DISPLAY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DISPLAY_EXT] = $enc; + } + } else { + $a[self::FIELD_DISPLAY] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetContains.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetContains.php index 7a24aef644..26f4fae4b8 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetContains.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetContains.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -74,10 +74,6 @@ class FHIRValueSetContains extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_VALUE_SET_DOT_CONTAINS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CODE = 'code'; const FIELD_CODE_EXT = '_code'; const FIELD_CONTAINS = 'contains'; @@ -127,6 +123,9 @@ class FHIRValueSetContains extends FHIRBackboneElement */ protected $system = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRValueSetContains Constructor * @param null|array $data @@ -149,8 +148,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CODE] instanceof FHIRCode) { $this->setCode($data[self::FIELD_CODE]); - } elseif ($ext && is_scalar($data[self::FIELD_CODE])) { - $this->setCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_CODE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CODE])) { + $this->setCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_CODE]] + $ext)); + } else if (is_array($data[self::FIELD_CODE])) { + $this->setCode(new FHIRCode(array_merge($ext, $data[self::FIELD_CODE]))); + } } else { $this->setCode(new FHIRCode($data[self::FIELD_CODE])); } @@ -158,6 +161,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CONTAINS])) { if (is_array($data[self::FIELD_CONTAINS])) { foreach($data[self::FIELD_CONTAINS] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRValueSetContains) { $this->addContains($v); } else { @@ -176,8 +182,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DISPLAY] instanceof FHIRString) { $this->setDisplay($data[self::FIELD_DISPLAY]); - } elseif ($ext && is_scalar($data[self::FIELD_DISPLAY])) { - $this->setDisplay(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DISPLAY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DISPLAY])) { + $this->setDisplay(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DISPLAY]] + $ext)); + } else if (is_array($data[self::FIELD_DISPLAY])) { + $this->setDisplay(new FHIRString(array_merge($ext, $data[self::FIELD_DISPLAY]))); + } } else { $this->setDisplay(new FHIRString($data[self::FIELD_DISPLAY])); } @@ -188,8 +198,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SYSTEM] instanceof FHIRUri) { $this->setSystem($data[self::FIELD_SYSTEM]); - } elseif ($ext && is_scalar($data[self::FIELD_SYSTEM])) { - $this->setSystem(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_SYSTEM]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SYSTEM])) { + $this->setSystem(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_SYSTEM]] + $ext)); + } else if (is_array($data[self::FIELD_SYSTEM])) { + $this->setSystem(new FHIRUri(array_merge($ext, $data[self::FIELD_SYSTEM]))); + } } else { $this->setSystem(new FHIRUri($data[self::FIELD_SYSTEM])); } @@ -483,7 +497,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getContains())) { foreach($vs as $v) { if (null === $v) { @@ -492,6 +505,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_CONTAINS, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getDisplay())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DISPLAY, null, $v->_getFHIRXMLNamespace())); } @@ -508,19 +522,40 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getCode())) { - $a[self::FIELD_CODE] = $v->getValue(); - $a[self::FIELD_CODE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CODE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CODE_EXT] = $enc; + } + } else { + $a[self::FIELD_CODE] = $v; + } } if ([] !== ($vs = $this->getContains())) { $a[self::FIELD_CONTAINS] = $vs; } if (null !== ($v = $this->getDisplay())) { - $a[self::FIELD_DISPLAY] = $v->getValue(); - $a[self::FIELD_DISPLAY_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DISPLAY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DISPLAY_EXT] = $enc; + } + } else { + $a[self::FIELD_DISPLAY] = $v; + } } if (null !== ($v = $this->getSystem())) { - $a[self::FIELD_SYSTEM] = $v->getValue(); - $a[self::FIELD_SYSTEM_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SYSTEM] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SYSTEM_EXT] = $enc; + } + } else { + $a[self::FIELD_SYSTEM] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetDefine.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetDefine.php index 299979d995..a8fd5bfbd5 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetDefine.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetDefine.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -74,10 +74,6 @@ class FHIRValueSetDefine extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_VALUE_SET_DOT_DEFINE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CASE_SENSITIVE = 'caseSensitive'; const FIELD_CASE_SENSITIVE_EXT = '_caseSensitive'; const FIELD_CONCEPT = 'concept'; @@ -130,6 +126,9 @@ class FHIRValueSetDefine extends FHIRBackboneElement */ protected $version = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRValueSetDefine Constructor * @param null|array $data @@ -152,8 +151,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CASE_SENSITIVE] instanceof FHIRBoolean) { $this->setCaseSensitive($data[self::FIELD_CASE_SENSITIVE]); - } elseif ($ext && is_scalar($data[self::FIELD_CASE_SENSITIVE])) { - $this->setCaseSensitive(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_CASE_SENSITIVE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CASE_SENSITIVE])) { + $this->setCaseSensitive(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_CASE_SENSITIVE]] + $ext)); + } else if (is_array($data[self::FIELD_CASE_SENSITIVE])) { + $this->setCaseSensitive(new FHIRBoolean(array_merge($ext, $data[self::FIELD_CASE_SENSITIVE]))); + } } else { $this->setCaseSensitive(new FHIRBoolean($data[self::FIELD_CASE_SENSITIVE])); } @@ -161,6 +164,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CONCEPT])) { if (is_array($data[self::FIELD_CONCEPT])) { foreach($data[self::FIELD_CONCEPT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRValueSetConcept) { $this->addConcept($v); } else { @@ -179,8 +185,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SYSTEM] instanceof FHIRUri) { $this->setSystem($data[self::FIELD_SYSTEM]); - } elseif ($ext && is_scalar($data[self::FIELD_SYSTEM])) { - $this->setSystem(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_SYSTEM]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SYSTEM])) { + $this->setSystem(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_SYSTEM]] + $ext)); + } else if (is_array($data[self::FIELD_SYSTEM])) { + $this->setSystem(new FHIRUri(array_merge($ext, $data[self::FIELD_SYSTEM]))); + } } else { $this->setSystem(new FHIRUri($data[self::FIELD_SYSTEM])); } @@ -191,8 +201,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VERSION] instanceof FHIRString) { $this->setVersion($data[self::FIELD_VERSION]); - } elseif ($ext && is_scalar($data[self::FIELD_VERSION])) { - $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } else if (is_array($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString(array_merge($ext, $data[self::FIELD_VERSION]))); + } } else { $this->setVersion(new FHIRString($data[self::FIELD_VERSION])); } @@ -492,7 +506,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getCaseSensitive())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CASE_SENSITIVE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getConcept())) { foreach($vs as $v) { if (null === $v) { @@ -501,6 +514,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_CONCEPT, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getSystem())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SYSTEM, null, $v->_getFHIRXMLNamespace())); } @@ -517,19 +531,40 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getCaseSensitive())) { - $a[self::FIELD_CASE_SENSITIVE] = $v->getValue(); - $a[self::FIELD_CASE_SENSITIVE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CASE_SENSITIVE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CASE_SENSITIVE_EXT] = $enc; + } + } else { + $a[self::FIELD_CASE_SENSITIVE] = $v; + } } if ([] !== ($vs = $this->getConcept())) { $a[self::FIELD_CONCEPT] = $vs; } if (null !== ($v = $this->getSystem())) { - $a[self::FIELD_SYSTEM] = $v->getValue(); - $a[self::FIELD_SYSTEM_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SYSTEM] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SYSTEM_EXT] = $enc; + } + } else { + $a[self::FIELD_SYSTEM] = $v; + } } if (null !== ($v = $this->getVersion())) { - $a[self::FIELD_VERSION] = $v->getValue(); - $a[self::FIELD_VERSION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VERSION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VERSION_EXT] = $enc; + } + } else { + $a[self::FIELD_VERSION] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetExpansion.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetExpansion.php index 183921e53e..081cc94da0 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetExpansion.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetExpansion.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -73,10 +73,6 @@ class FHIRValueSetExpansion extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_VALUE_SET_DOT_EXPANSION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CONTAINS = 'contains'; const FIELD_IDENTIFIER = 'identifier'; const FIELD_IDENTIFIER_EXT = '_identifier'; @@ -115,6 +111,9 @@ class FHIRValueSetExpansion extends FHIRBackboneElement */ protected $timestamp = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRValueSetExpansion Constructor * @param null|array $data @@ -134,6 +133,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CONTAINS])) { if (is_array($data[self::FIELD_CONTAINS])) { foreach($data[self::FIELD_CONTAINS] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRValueSetContains) { $this->addContains($v); } else { @@ -152,8 +154,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->setIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { - $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_IDENTIFIER]))); + } } else { $this->setIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); } @@ -164,8 +170,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TIMESTAMP] instanceof FHIRInstant) { $this->setTimestamp($data[self::FIELD_TIMESTAMP]); - } elseif ($ext && is_scalar($data[self::FIELD_TIMESTAMP])) { - $this->setTimestamp(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_TIMESTAMP]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TIMESTAMP])) { + $this->setTimestamp(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_TIMESTAMP]] + $ext)); + } else if (is_array($data[self::FIELD_TIMESTAMP])) { + $this->setTimestamp(new FHIRInstant(array_merge($ext, $data[self::FIELD_TIMESTAMP]))); + } } else { $this->setTimestamp(new FHIRInstant($data[self::FIELD_TIMESTAMP])); } @@ -405,7 +415,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getContains())) { foreach($vs as $v) { if (null === $v) { @@ -434,11 +443,26 @@ public function jsonSerialize() $a[self::FIELD_CONTAINS] = $vs; } if (null !== ($v = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_IDENTIFIER] = $v; + } } if (null !== ($v = $this->getTimestamp())) { - $a[self::FIELD_TIMESTAMP] = $v->getValue(); - $a[self::FIELD_TIMESTAMP_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TIMESTAMP] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TIMESTAMP_EXT] = $enc; + } + } else { + $a[self::FIELD_TIMESTAMP] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetFilter.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetFilter.php index 983b3a6295..a8aff9c538 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetFilter.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetFilter.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -73,10 +73,6 @@ class FHIRValueSetFilter extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_VALUE_SET_DOT_FILTER; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_OP = 'op'; const FIELD_OP_EXT = '_op'; const FIELD_PROPERTY = 'property'; @@ -119,6 +115,9 @@ class FHIRValueSetFilter extends FHIRBackboneElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRValueSetFilter Constructor * @param null|array $data @@ -145,8 +144,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_OP] instanceof FHIRFilterOperator) { $this->setOp($data[self::FIELD_OP]); - } elseif ($ext && is_scalar($data[self::FIELD_OP])) { - $this->setOp(new FHIRFilterOperator([FHIRFilterOperator::FIELD_VALUE => $data[self::FIELD_OP]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_OP])) { + $this->setOp(new FHIRFilterOperator([FHIRFilterOperator::FIELD_VALUE => $data[self::FIELD_OP]] + $ext)); + } else if (is_array($data[self::FIELD_OP])) { + $this->setOp(new FHIRFilterOperator(array_merge($ext, $data[self::FIELD_OP]))); + } } else { $this->setOp(new FHIRFilterOperator($data[self::FIELD_OP])); } @@ -157,8 +160,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PROPERTY] instanceof FHIRCode) { $this->setProperty($data[self::FIELD_PROPERTY]); - } elseif ($ext && is_scalar($data[self::FIELD_PROPERTY])) { - $this->setProperty(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_PROPERTY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PROPERTY])) { + $this->setProperty(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_PROPERTY]] + $ext)); + } else if (is_array($data[self::FIELD_PROPERTY])) { + $this->setProperty(new FHIRCode(array_merge($ext, $data[self::FIELD_PROPERTY]))); + } } else { $this->setProperty(new FHIRCode($data[self::FIELD_PROPERTY])); } @@ -169,8 +176,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE] instanceof FHIRCode) { $this->setValue($data[self::FIELD_VALUE]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE])) { - $this->setValue(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_VALUE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE])) { + $this->setValue(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_VALUE]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE])) { + $this->setValue(new FHIRCode(array_merge($ext, $data[self::FIELD_VALUE]))); + } } else { $this->setValue(new FHIRCode($data[self::FIELD_VALUE])); } @@ -401,7 +412,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getOp())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OP, null, $v->_getFHIRXMLNamespace())); } @@ -409,6 +419,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_PROPERTY, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getValue())) { + $sxe->addAttribute(self::FIELD_VALUE, (string)$v); $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE, null, $v->_getFHIRXMLNamespace())); } return $sxe; @@ -421,15 +432,37 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getOp())) { - $a[self::FIELD_OP] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_OP] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_OP_EXT] = $enc; + } + } else { + $a[self::FIELD_OP] = $v; + } } if (null !== ($v = $this->getProperty())) { - $a[self::FIELD_PROPERTY] = $v->getValue(); - $a[self::FIELD_PROPERTY_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PROPERTY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PROPERTY_EXT] = $enc; + } + } else { + $a[self::FIELD_PROPERTY] = $v; + } } if (null !== ($v = $this->getValue())) { - $a[self::FIELD_VALUE] = $v->getValue(); - $a[self::FIELD_VALUE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetInclude.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetInclude.php index fe6e8090ea..7198844f64 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetInclude.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetInclude.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -74,10 +74,6 @@ class FHIRValueSetInclude extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_VALUE_SET_DOT_INCLUDE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CODE = 'code'; const FIELD_CODE_EXT = '_code'; const FIELD_FILTER = 'filter'; @@ -131,6 +127,9 @@ class FHIRValueSetInclude extends FHIRBackboneElement */ protected $version = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRValueSetInclude Constructor * @param null|array $data @@ -153,17 +152,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_CODE])) { foreach($data[self::FIELD_CODE] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCode) { $this->addCode($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addCode(new FHIRCode([FHIRCode::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addCode(new FHIRCode([FHIRCode::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addCode(new FHIRCode(array_merge($v, $ext[$i]))); + } } else { $this->addCode(new FHIRCode($v)); } } } elseif ($data[self::FIELD_CODE] instanceof FHIRCode) { $this->addCode($data[self::FIELD_CODE]); - } elseif ($ext && is_scalar($data[self::FIELD_CODE])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_CODE])) { $this->addCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_CODE]] + $ext)); } else { $this->addCode(new FHIRCode($data[self::FIELD_CODE])); @@ -175,17 +181,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_FILTER])) { foreach($data[self::FIELD_FILTER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRValueSetFilter) { $this->addFilter($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addFilter(new FHIRValueSetFilter([FHIRValueSetFilter::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addFilter(new FHIRValueSetFilter([FHIRValueSetFilter::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addFilter(new FHIRValueSetFilter(array_merge($v, $ext[$i]))); + } } else { $this->addFilter(new FHIRValueSetFilter($v)); } } } elseif ($data[self::FIELD_FILTER] instanceof FHIRValueSetFilter) { $this->addFilter($data[self::FIELD_FILTER]); - } elseif ($ext && is_scalar($data[self::FIELD_FILTER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_FILTER])) { $this->addFilter(new FHIRValueSetFilter([FHIRValueSetFilter::FIELD_VALUE => $data[self::FIELD_FILTER]] + $ext)); } else { $this->addFilter(new FHIRValueSetFilter($data[self::FIELD_FILTER])); @@ -197,8 +210,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SYSTEM] instanceof FHIRUri) { $this->setSystem($data[self::FIELD_SYSTEM]); - } elseif ($ext && is_scalar($data[self::FIELD_SYSTEM])) { - $this->setSystem(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_SYSTEM]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SYSTEM])) { + $this->setSystem(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_SYSTEM]] + $ext)); + } else if (is_array($data[self::FIELD_SYSTEM])) { + $this->setSystem(new FHIRUri(array_merge($ext, $data[self::FIELD_SYSTEM]))); + } } else { $this->setSystem(new FHIRUri($data[self::FIELD_SYSTEM])); } @@ -209,8 +226,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VERSION] instanceof FHIRString) { $this->setVersion($data[self::FIELD_VERSION]); - } elseif ($ext && is_scalar($data[self::FIELD_VERSION])) { - $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } else if (is_array($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString(array_merge($ext, $data[self::FIELD_VERSION]))); + } } else { $this->setVersion(new FHIRString($data[self::FIELD_VERSION])); } @@ -556,6 +577,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_FILTER, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getSystem())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SYSTEM, null, $v->_getFHIRXMLNamespace())); } @@ -577,20 +599,59 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_CODE][] = $v->getValue(); - $a[self::FIELD_CODE_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CODE][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CODE_EXT][] = $enc; + } else { + $a[self::FIELD_CODE_EXT][] = null; + } + } else { + $a[self::FIELD_CODE][] = $v; + } } } if ([] !== ($vs = $this->getFilter())) { - $a[self::FIELD_FILTER] = $vs; + $a[self::FIELD_FILTER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FILTER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FILTER_EXT][] = $enc; + } else { + $a[self::FIELD_FILTER_EXT][] = null; + } + } else { + $a[self::FIELD_FILTER][] = $v; + } + } } if (null !== ($v = $this->getSystem())) { - $a[self::FIELD_SYSTEM] = $v->getValue(); - $a[self::FIELD_SYSTEM_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SYSTEM] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SYSTEM_EXT] = $enc; + } + } else { + $a[self::FIELD_SYSTEM] = $v; + } } if (null !== ($v = $this->getVersion())) { - $a[self::FIELD_VERSION] = $v->getValue(); - $a[self::FIELD_VERSION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VERSION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VERSION_EXT] = $enc; + } + } else { + $a[self::FIELD_VERSION] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBase64Binary.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBase64Binary.php index 5f14d40aad..b4fbd09dd3 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBase64Binary.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBase64Binary.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -73,10 +73,6 @@ class FHIRBase64Binary extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_BASE_64BINARY; - - /** @var string */ - protected $_xmlns = ''; - const FIELD_VALUE = 'value'; /** @@ -84,6 +80,8 @@ class FHIRBase64Binary extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; /** * FHIRBase64Binary Constructor @@ -241,8 +239,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBindingConformance.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBindingConformance.php index 3c1e91caa1..9da85f67e5 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBindingConformance.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBindingConformance.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -73,10 +73,6 @@ class FHIRBindingConformance extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_BINDING_CONFORMANCE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -84,6 +80,9 @@ class FHIRBindingConformance extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRBindingConformance Constructor * @param null|array $data @@ -239,8 +238,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBoolean.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBoolean.php index a1ee2b59b7..f20bc2e2b0 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBoolean.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRBoolean.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -73,10 +73,6 @@ class FHIRBoolean extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_BOOLEAN; - - /** @var string */ - protected $_xmlns = ''; - const FIELD_VALUE = 'value'; /** @@ -84,6 +80,8 @@ class FHIRBoolean extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; /** * FHIRBoolean Constructor @@ -241,8 +239,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRCarePlanActivityCategory.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRCarePlanActivityCategory.php index 2072e119b6..91b66788d4 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRCarePlanActivityCategory.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRCarePlanActivityCategory.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -73,10 +73,6 @@ class FHIRCarePlanActivityCategory extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CARE_PLAN_ACTIVITY_CATEGORY; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -84,6 +80,9 @@ class FHIRCarePlanActivityCategory extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRCarePlanActivityCategory Constructor * @param null|array $data @@ -239,8 +238,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRCarePlanActivityStatus.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRCarePlanActivityStatus.php index 311f7f3732..3663ca8653 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRCarePlanActivityStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRCarePlanActivityStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -73,10 +73,6 @@ class FHIRCarePlanActivityStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CARE_PLAN_ACTIVITY_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -84,6 +80,9 @@ class FHIRCarePlanActivityStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRCarePlanActivityStatus Constructor * @param null|array $data @@ -239,8 +238,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRCarePlanGoalStatus.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRCarePlanGoalStatus.php index 69be2d7dbc..a12da87ae5 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRCarePlanGoalStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRCarePlanGoalStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -73,10 +73,6 @@ class FHIRCarePlanGoalStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CARE_PLAN_GOAL_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -84,6 +80,9 @@ class FHIRCarePlanGoalStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRCarePlanGoalStatus Constructor * @param null|array $data @@ -239,8 +238,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRCarePlanStatus.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRCarePlanStatus.php index d2d51e1ca2..17f9f2d855 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRCarePlanStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRCarePlanStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -74,10 +74,6 @@ class FHIRCarePlanStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CARE_PLAN_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -85,6 +81,9 @@ class FHIRCarePlanStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRCarePlanStatus Constructor * @param null|array $data @@ -240,8 +239,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRCausalityExpectation.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRCausalityExpectation.php index 2ecf6c7ea1..5bf81e6780 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRCausalityExpectation.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRCausalityExpectation.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -73,10 +73,6 @@ class FHIRCausalityExpectation extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CAUSALITY_EXPECTATION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -84,6 +80,9 @@ class FHIRCausalityExpectation extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRCausalityExpectation Constructor * @param null|array $data @@ -239,8 +238,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRCode.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRCode.php index fc0dd8635f..e97d0eaf48 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRCode.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRCode.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -75,10 +75,6 @@ class FHIRCode extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CODE; - - /** @var string */ - protected $_xmlns = ''; - const FIELD_VALUE = 'value'; /** @@ -86,6 +82,8 @@ class FHIRCode extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; /** * FHIRCode Constructor @@ -243,8 +241,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRCodeableConcept.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRCodeableConcept.php index acad0ec40c..248e3d3817 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRCodeableConcept.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRCodeableConcept.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -74,10 +74,6 @@ class FHIRCodeableConcept extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CODEABLE_CONCEPT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CODING = 'coding'; const FIELD_TEXT = 'text'; const FIELD_TEXT_EXT = '_text'; @@ -105,6 +101,9 @@ class FHIRCodeableConcept extends FHIRElement */ protected $text = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRCodeableConcept Constructor * @param null|array $data @@ -124,6 +123,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CODING])) { if (is_array($data[self::FIELD_CODING])) { foreach($data[self::FIELD_CODING] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCoding) { $this->addCoding($v); } else { @@ -142,8 +144,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TEXT] instanceof FHIRString) { $this->setText($data[self::FIELD_TEXT]); - } elseif ($ext && is_scalar($data[self::FIELD_TEXT])) { - $this->setText(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TEXT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TEXT])) { + $this->setText(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TEXT]] + $ext)); + } else if (is_array($data[self::FIELD_TEXT])) { + $this->setText(new FHIRString(array_merge($ext, $data[self::FIELD_TEXT]))); + } } else { $this->setText(new FHIRString($data[self::FIELD_TEXT])); } @@ -356,7 +362,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getCoding())) { foreach($vs as $v) { if (null === $v) { @@ -365,6 +370,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_CODING, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getText())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TEXT, null, $v->_getFHIRXMLNamespace())); } @@ -381,8 +387,15 @@ public function jsonSerialize() $a[self::FIELD_CODING] = $vs; } if (null !== ($v = $this->getText())) { - $a[self::FIELD_TEXT] = $v->getValue(); - $a[self::FIELD_TEXT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TEXT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TEXT_EXT] = $enc; + } + } else { + $a[self::FIELD_TEXT] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRCoding.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRCoding.php index a6a37e1cc2..2ae57133cc 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRCoding.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRCoding.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -73,10 +73,6 @@ class FHIRCoding extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CODING; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CODE = 'code'; const FIELD_CODE_EXT = '_code'; const FIELD_DISPLAY = 'display'; @@ -160,6 +156,9 @@ class FHIRCoding extends FHIRElement */ protected $version = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRCoding Constructor * @param null|array $data @@ -182,8 +181,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CODE] instanceof FHIRCode) { $this->setCode($data[self::FIELD_CODE]); - } elseif ($ext && is_scalar($data[self::FIELD_CODE])) { - $this->setCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_CODE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CODE])) { + $this->setCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_CODE]] + $ext)); + } else if (is_array($data[self::FIELD_CODE])) { + $this->setCode(new FHIRCode(array_merge($ext, $data[self::FIELD_CODE]))); + } } else { $this->setCode(new FHIRCode($data[self::FIELD_CODE])); } @@ -194,8 +197,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DISPLAY] instanceof FHIRString) { $this->setDisplay($data[self::FIELD_DISPLAY]); - } elseif ($ext && is_scalar($data[self::FIELD_DISPLAY])) { - $this->setDisplay(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DISPLAY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DISPLAY])) { + $this->setDisplay(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DISPLAY]] + $ext)); + } else if (is_array($data[self::FIELD_DISPLAY])) { + $this->setDisplay(new FHIRString(array_merge($ext, $data[self::FIELD_DISPLAY]))); + } } else { $this->setDisplay(new FHIRString($data[self::FIELD_DISPLAY])); } @@ -206,8 +213,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PRIMARY] instanceof FHIRBoolean) { $this->setPrimary($data[self::FIELD_PRIMARY]); - } elseif ($ext && is_scalar($data[self::FIELD_PRIMARY])) { - $this->setPrimary(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_PRIMARY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PRIMARY])) { + $this->setPrimary(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_PRIMARY]] + $ext)); + } else if (is_array($data[self::FIELD_PRIMARY])) { + $this->setPrimary(new FHIRBoolean(array_merge($ext, $data[self::FIELD_PRIMARY]))); + } } else { $this->setPrimary(new FHIRBoolean($data[self::FIELD_PRIMARY])); } @@ -218,8 +229,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SYSTEM] instanceof FHIRUri) { $this->setSystem($data[self::FIELD_SYSTEM]); - } elseif ($ext && is_scalar($data[self::FIELD_SYSTEM])) { - $this->setSystem(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_SYSTEM]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SYSTEM])) { + $this->setSystem(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_SYSTEM]] + $ext)); + } else if (is_array($data[self::FIELD_SYSTEM])) { + $this->setSystem(new FHIRUri(array_merge($ext, $data[self::FIELD_SYSTEM]))); + } } else { $this->setSystem(new FHIRUri($data[self::FIELD_SYSTEM])); } @@ -237,8 +252,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VERSION] instanceof FHIRString) { $this->setVersion($data[self::FIELD_VERSION]); - } elseif ($ext && is_scalar($data[self::FIELD_VERSION])) { - $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } else if (is_array($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString(array_merge($ext, $data[self::FIELD_VERSION]))); + } } else { $this->setVersion(new FHIRString($data[self::FIELD_VERSION])); } @@ -619,7 +638,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getSystem())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SYSTEM, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueSet())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_SET, null, $v->_getFHIRXMLNamespace())); } @@ -636,27 +654,62 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getCode())) { - $a[self::FIELD_CODE] = $v->getValue(); - $a[self::FIELD_CODE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CODE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CODE_EXT] = $enc; + } + } else { + $a[self::FIELD_CODE] = $v; + } } if (null !== ($v = $this->getDisplay())) { - $a[self::FIELD_DISPLAY] = $v->getValue(); - $a[self::FIELD_DISPLAY_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DISPLAY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DISPLAY_EXT] = $enc; + } + } else { + $a[self::FIELD_DISPLAY] = $v; + } } if (null !== ($v = $this->getPrimary())) { - $a[self::FIELD_PRIMARY] = $v->getValue(); - $a[self::FIELD_PRIMARY_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PRIMARY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PRIMARY_EXT] = $enc; + } + } else { + $a[self::FIELD_PRIMARY] = $v; + } } if (null !== ($v = $this->getSystem())) { - $a[self::FIELD_SYSTEM] = $v->getValue(); - $a[self::FIELD_SYSTEM_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SYSTEM] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SYSTEM_EXT] = $enc; + } + } else { + $a[self::FIELD_SYSTEM] = $v; + } } if (null !== ($v = $this->getValueSet())) { $a[self::FIELD_VALUE_SET] = $v; } if (null !== ($v = $this->getVersion())) { - $a[self::FIELD_VERSION] = $v->getValue(); - $a[self::FIELD_VERSION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VERSION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VERSION_EXT] = $enc; + } + } else { + $a[self::FIELD_VERSION] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRCompositionAttestationMode.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRCompositionAttestationMode.php index 7fbe7a9cc2..1cc331010a 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRCompositionAttestationMode.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRCompositionAttestationMode.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -73,10 +73,6 @@ class FHIRCompositionAttestationMode extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_COMPOSITION_ATTESTATION_MODE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -84,6 +80,9 @@ class FHIRCompositionAttestationMode extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRCompositionAttestationMode Constructor * @param null|array $data @@ -239,8 +238,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRCompositionStatus.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRCompositionStatus.php index 8b91ab1311..7f447fdbbd 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRCompositionStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRCompositionStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -73,10 +73,6 @@ class FHIRCompositionStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_COMPOSITION_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -84,6 +80,9 @@ class FHIRCompositionStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRCompositionStatus Constructor * @param null|array $data @@ -239,8 +238,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRConceptMapEquivalence.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRConceptMapEquivalence.php index 2cc365dcfd..dbfd76e70d 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRConceptMapEquivalence.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRConceptMapEquivalence.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -73,10 +73,6 @@ class FHIRConceptMapEquivalence extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONCEPT_MAP_EQUIVALENCE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -84,6 +80,9 @@ class FHIRConceptMapEquivalence extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRConceptMapEquivalence Constructor * @param null|array $data @@ -239,8 +238,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRConditionRelationshipType.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRConditionRelationshipType.php index 82fe996fe3..7e2b2acfbc 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRConditionRelationshipType.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRConditionRelationshipType.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -73,10 +73,6 @@ class FHIRConditionRelationshipType extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONDITION_RELATIONSHIP_TYPE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -84,6 +80,9 @@ class FHIRConditionRelationshipType extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRConditionRelationshipType Constructor * @param null|array $data @@ -239,8 +238,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRConditionStatus.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRConditionStatus.php index 85067f75c9..7c791f9ac1 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRConditionStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRConditionStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -73,10 +73,6 @@ class FHIRConditionStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONDITION_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -84,6 +80,9 @@ class FHIRConditionStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRConditionStatus Constructor * @param null|array $data @@ -239,8 +238,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRConformanceEventMode.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRConformanceEventMode.php index f92803e84e..029b666cfd 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRConformanceEventMode.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRConformanceEventMode.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -73,10 +73,6 @@ class FHIRConformanceEventMode extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONFORMANCE_EVENT_MODE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -84,6 +80,9 @@ class FHIRConformanceEventMode extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRConformanceEventMode Constructor * @param null|array $data @@ -239,8 +238,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRConformanceStatementStatus.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRConformanceStatementStatus.php index b38f47ab7e..3c4df13764 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRConformanceStatementStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRConformanceStatementStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -73,10 +73,6 @@ class FHIRConformanceStatementStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONFORMANCE_STATEMENT_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -84,6 +80,9 @@ class FHIRConformanceStatementStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRConformanceStatementStatus Constructor * @param null|array $data @@ -239,8 +238,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRConstraintSeverity.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRConstraintSeverity.php index 7019016c46..b558eb3b1f 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRConstraintSeverity.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRConstraintSeverity.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -73,10 +73,6 @@ class FHIRConstraintSeverity extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONSTRAINT_SEVERITY; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -84,6 +80,9 @@ class FHIRConstraintSeverity extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRConstraintSeverity Constructor * @param null|array $data @@ -239,8 +238,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRContact.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRContact.php index 1d13f72ccd..2ec2129520 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRContact.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRContact.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -74,10 +74,6 @@ class FHIRContact extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONTACT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_PERIOD = 'period'; const FIELD_SYSTEM = 'system'; const FIELD_SYSTEM_EXT = '_system'; @@ -129,6 +125,9 @@ class FHIRContact extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRContact Constructor * @param null|array $data @@ -162,8 +161,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SYSTEM] instanceof FHIRContactSystem) { $this->setSystem($data[self::FIELD_SYSTEM]); - } elseif ($ext && is_scalar($data[self::FIELD_SYSTEM])) { - $this->setSystem(new FHIRContactSystem([FHIRContactSystem::FIELD_VALUE => $data[self::FIELD_SYSTEM]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SYSTEM])) { + $this->setSystem(new FHIRContactSystem([FHIRContactSystem::FIELD_VALUE => $data[self::FIELD_SYSTEM]] + $ext)); + } else if (is_array($data[self::FIELD_SYSTEM])) { + $this->setSystem(new FHIRContactSystem(array_merge($ext, $data[self::FIELD_SYSTEM]))); + } } else { $this->setSystem(new FHIRContactSystem($data[self::FIELD_SYSTEM])); } @@ -174,8 +177,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_USE] instanceof FHIRContactUse) { $this->setUse($data[self::FIELD_USE]); - } elseif ($ext && is_scalar($data[self::FIELD_USE])) { - $this->setUse(new FHIRContactUse([FHIRContactUse::FIELD_VALUE => $data[self::FIELD_USE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_USE])) { + $this->setUse(new FHIRContactUse([FHIRContactUse::FIELD_VALUE => $data[self::FIELD_USE]] + $ext)); + } else if (is_array($data[self::FIELD_USE])) { + $this->setUse(new FHIRContactUse(array_merge($ext, $data[self::FIELD_USE]))); + } } else { $this->setUse(new FHIRContactUse($data[self::FIELD_USE])); } @@ -186,8 +193,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE] instanceof FHIRString) { $this->setValue($data[self::FIELD_VALUE]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE])) { - $this->setValue(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VALUE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE])) { + $this->setValue(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VALUE]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE])) { + $this->setValue(new FHIRString(array_merge($ext, $data[self::FIELD_VALUE]))); + } } else { $this->setValue(new FHIRString($data[self::FIELD_VALUE])); } @@ -434,19 +445,17 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSystem())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SYSTEM, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getUse())) { $v->xmlSerialize($sxe->addChild(self::FIELD_USE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getValue())) { + $sxe->addAttribute(self::FIELD_VALUE, (string)$v); $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE, null, $v->_getFHIRXMLNamespace())); } return $sxe; @@ -462,14 +471,37 @@ public function jsonSerialize() $a[self::FIELD_PERIOD] = $v; } if (null !== ($v = $this->getSystem())) { - $a[self::FIELD_SYSTEM] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SYSTEM] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SYSTEM_EXT] = $enc; + } + } else { + $a[self::FIELD_SYSTEM] = $v; + } } if (null !== ($v = $this->getUse())) { - $a[self::FIELD_USE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_USE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_USE_EXT] = $enc; + } + } else { + $a[self::FIELD_USE] = $v; + } } if (null !== ($v = $this->getValue())) { - $a[self::FIELD_VALUE] = $v->getValue(); - $a[self::FIELD_VALUE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRContactSystem.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRContactSystem.php index 146552d5ba..7a87364105 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRContactSystem.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRContactSystem.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -73,10 +73,6 @@ class FHIRContactSystem extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONTACT_SYSTEM; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -84,6 +80,9 @@ class FHIRContactSystem extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRContactSystem Constructor * @param null|array $data @@ -239,8 +238,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRContactUse.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRContactUse.php index fc5407ad97..7fd60a008c 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRContactUse.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRContactUse.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -73,10 +73,6 @@ class FHIRContactUse extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONTACT_USE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -84,6 +80,9 @@ class FHIRContactUse extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRContactUse Constructor * @param null|array $data @@ -239,8 +238,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRCriticality.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRCriticality.php index a06bf9ab8b..d5a5f739ec 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRCriticality.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRCriticality.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -73,10 +73,6 @@ class FHIRCriticality extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CRITICALITY; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -84,6 +80,9 @@ class FHIRCriticality extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRCriticality Constructor * @param null|array $data @@ -239,8 +238,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRDate.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRDate.php index 7b9c1c444f..5a57175c0c 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRDate.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRDate.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -75,10 +75,6 @@ class FHIRDate extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DATE; - - /** @var string */ - protected $_xmlns = ''; - const FIELD_VALUE = 'value'; /** @@ -86,6 +82,8 @@ class FHIRDate extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; /** * FHIRDate Constructor @@ -243,8 +241,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRDateTime.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRDateTime.php index eed36ea21b..ea7705684f 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRDateTime.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRDateTime.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -76,10 +76,6 @@ class FHIRDateTime extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DATE_TIME; - - /** @var string */ - protected $_xmlns = ''; - const FIELD_VALUE = 'value'; /** @@ -87,6 +83,8 @@ class FHIRDateTime extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; /** * FHIRDateTime Constructor @@ -244,8 +242,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRDecimal.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRDecimal.php index eed9358335..8997dc996e 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRDecimal.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRDecimal.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -73,10 +73,6 @@ class FHIRDecimal extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DECIMAL; - - /** @var string */ - protected $_xmlns = ''; - const FIELD_VALUE = 'value'; /** @@ -84,6 +80,8 @@ class FHIRDecimal extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; /** * FHIRDecimal Constructor @@ -241,8 +239,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRDecimal/FHIRScore.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRDecimal/FHIRScore.php index c19031957d..f31f529feb 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRDecimal/FHIRScore.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRDecimal/FHIRScore.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,7 +78,6 @@ class FHIRScore extends FHIRDecimal { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SCORE; - /** @var string */ protected $_xmlns = 'http://hl7.org/fhir'; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRDiagnosticOrderPriority.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRDiagnosticOrderPriority.php index 35615ca052..6ce17111f2 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRDiagnosticOrderPriority.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRDiagnosticOrderPriority.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -73,10 +73,6 @@ class FHIRDiagnosticOrderPriority extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DIAGNOSTIC_ORDER_PRIORITY; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -84,6 +80,9 @@ class FHIRDiagnosticOrderPriority extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRDiagnosticOrderPriority Constructor * @param null|array $data @@ -239,8 +238,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRDiagnosticOrderStatus.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRDiagnosticOrderStatus.php index 4714764cb9..9c15c81b0f 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRDiagnosticOrderStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRDiagnosticOrderStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -73,10 +73,6 @@ class FHIRDiagnosticOrderStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DIAGNOSTIC_ORDER_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -84,6 +80,9 @@ class FHIRDiagnosticOrderStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRDiagnosticOrderStatus Constructor * @param null|array $data @@ -239,8 +238,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRDiagnosticReportStatus.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRDiagnosticReportStatus.php index 3f0ffa8045..1095e83744 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRDiagnosticReportStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRDiagnosticReportStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -73,10 +73,6 @@ class FHIRDiagnosticReportStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DIAGNOSTIC_REPORT_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -84,6 +80,9 @@ class FHIRDiagnosticReportStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRDiagnosticReportStatus Constructor * @param null|array $data @@ -239,8 +238,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRDocumentMode.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRDocumentMode.php index fc7017dab0..e85e507ee3 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRDocumentMode.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRDocumentMode.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -73,10 +73,6 @@ class FHIRDocumentMode extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DOCUMENT_MODE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -84,6 +80,9 @@ class FHIRDocumentMode extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRDocumentMode Constructor * @param null|array $data @@ -239,8 +238,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRDocumentReferenceStatus.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRDocumentReferenceStatus.php index 8c06ebc496..0dab949a04 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRDocumentReferenceStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRDocumentReferenceStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -72,10 +72,6 @@ class FHIRDocumentReferenceStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DOCUMENT_REFERENCE_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -83,6 +79,9 @@ class FHIRDocumentReferenceStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRDocumentReferenceStatus Constructor * @param null|array $data @@ -238,8 +237,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRDocumentRelationshipType.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRDocumentRelationshipType.php index 7f07e3cb5f..71043e89ed 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRDocumentRelationshipType.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRDocumentRelationshipType.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -73,10 +73,6 @@ class FHIRDocumentRelationshipType extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DOCUMENT_RELATIONSHIP_TYPE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -84,6 +80,9 @@ class FHIRDocumentRelationshipType extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRDocumentRelationshipType Constructor * @param null|array $data @@ -239,8 +238,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIREncounterClass.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIREncounterClass.php index 70f1cdcac6..49d1269da4 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIREncounterClass.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIREncounterClass.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -73,10 +73,6 @@ class FHIREncounterClass extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ENCOUNTER_CLASS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -84,6 +80,9 @@ class FHIREncounterClass extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIREncounterClass Constructor * @param null|array $data @@ -239,8 +238,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIREncounterState.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIREncounterState.php index 64b24150f1..6bf8194b4d 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIREncounterState.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIREncounterState.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -73,10 +73,6 @@ class FHIREncounterState extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ENCOUNTER_STATE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -84,6 +80,9 @@ class FHIREncounterState extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIREncounterState Constructor * @param null|array $data @@ -239,8 +238,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIREventTiming.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIREventTiming.php index 2e02c8bbfd..849e23c6ea 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIREventTiming.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIREventTiming.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -73,10 +73,6 @@ class FHIREventTiming extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_EVENT_TIMING; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -84,6 +80,9 @@ class FHIREventTiming extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIREventTiming Constructor * @param null|array $data @@ -239,8 +238,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRExposureType.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRExposureType.php index fd5413d00e..bf21b2d371 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRExposureType.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRExposureType.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -73,10 +73,6 @@ class FHIRExposureType extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_EXPOSURE_TYPE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -84,6 +80,9 @@ class FHIRExposureType extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRExposureType Constructor * @param null|array $data @@ -239,8 +238,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRExtension.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRExtension.php index ba07c8b008..20ac52568c 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRExtension.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRExtension.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -74,10 +74,6 @@ class FHIRExtension extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_EXTENSION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_URL = 'url'; const FIELD_VALUE_ADDRESS = 'valueAddress'; const FIELD_VALUE_ATTACHMENT = 'valueAttachment'; @@ -415,6 +411,9 @@ class FHIRExtension extends FHIRElement */ protected $valueUri = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRExtension Constructor * @param null|array $data @@ -454,8 +453,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_BASE_64BINARY] instanceof FHIRBase64Binary) { $this->setValueBase64Binary($data[self::FIELD_VALUE_BASE_64BINARY]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_BASE_64BINARY])) { - $this->setValueBase64Binary(new FHIRBase64Binary([FHIRBase64Binary::FIELD_VALUE => $data[self::FIELD_VALUE_BASE_64BINARY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_BASE_64BINARY])) { + $this->setValueBase64Binary(new FHIRBase64Binary([FHIRBase64Binary::FIELD_VALUE => $data[self::FIELD_VALUE_BASE_64BINARY]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_BASE_64BINARY])) { + $this->setValueBase64Binary(new FHIRBase64Binary(array_merge($ext, $data[self::FIELD_VALUE_BASE_64BINARY]))); + } } else { $this->setValueBase64Binary(new FHIRBase64Binary($data[self::FIELD_VALUE_BASE_64BINARY])); } @@ -466,8 +469,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_BOOLEAN] instanceof FHIRBoolean) { $this->setValueBoolean($data[self::FIELD_VALUE_BOOLEAN]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_BOOLEAN])) { - $this->setValueBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_VALUE_BOOLEAN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_BOOLEAN])) { + $this->setValueBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_VALUE_BOOLEAN]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_BOOLEAN])) { + $this->setValueBoolean(new FHIRBoolean(array_merge($ext, $data[self::FIELD_VALUE_BOOLEAN]))); + } } else { $this->setValueBoolean(new FHIRBoolean($data[self::FIELD_VALUE_BOOLEAN])); } @@ -478,8 +485,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_CODE] instanceof FHIRCode) { $this->setValueCode($data[self::FIELD_VALUE_CODE]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_CODE])) { - $this->setValueCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_VALUE_CODE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_CODE])) { + $this->setValueCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_VALUE_CODE]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_CODE])) { + $this->setValueCode(new FHIRCode(array_merge($ext, $data[self::FIELD_VALUE_CODE]))); + } } else { $this->setValueCode(new FHIRCode($data[self::FIELD_VALUE_CODE])); } @@ -504,8 +515,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_CONTACT] instanceof FHIRContact) { $this->setValueContact($data[self::FIELD_VALUE_CONTACT]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_CONTACT])) { - $this->setValueContact(new FHIRContact([FHIRContact::FIELD_VALUE => $data[self::FIELD_VALUE_CONTACT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_CONTACT])) { + $this->setValueContact(new FHIRContact([FHIRContact::FIELD_VALUE => $data[self::FIELD_VALUE_CONTACT]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_CONTACT])) { + $this->setValueContact(new FHIRContact(array_merge($ext, $data[self::FIELD_VALUE_CONTACT]))); + } } else { $this->setValueContact(new FHIRContact($data[self::FIELD_VALUE_CONTACT])); } @@ -516,8 +531,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_DATE] instanceof FHIRDate) { $this->setValueDate($data[self::FIELD_VALUE_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_DATE])) { - $this->setValueDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_VALUE_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_DATE])) { + $this->setValueDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_VALUE_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_DATE])) { + $this->setValueDate(new FHIRDate(array_merge($ext, $data[self::FIELD_VALUE_DATE]))); + } } else { $this->setValueDate(new FHIRDate($data[self::FIELD_VALUE_DATE])); } @@ -528,8 +547,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_DATE_TIME] instanceof FHIRDateTime) { $this->setValueDateTime($data[self::FIELD_VALUE_DATE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_DATE_TIME])) { - $this->setValueDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_VALUE_DATE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_DATE_TIME])) { + $this->setValueDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_VALUE_DATE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_DATE_TIME])) { + $this->setValueDateTime(new FHIRDateTime(array_merge($ext, $data[self::FIELD_VALUE_DATE_TIME]))); + } } else { $this->setValueDateTime(new FHIRDateTime($data[self::FIELD_VALUE_DATE_TIME])); } @@ -540,8 +563,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_DECIMAL] instanceof FHIRDecimal) { $this->setValueDecimal($data[self::FIELD_VALUE_DECIMAL]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_DECIMAL])) { - $this->setValueDecimal(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_VALUE_DECIMAL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_DECIMAL])) { + $this->setValueDecimal(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_VALUE_DECIMAL]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_DECIMAL])) { + $this->setValueDecimal(new FHIRDecimal(array_merge($ext, $data[self::FIELD_VALUE_DECIMAL]))); + } } else { $this->setValueDecimal(new FHIRDecimal($data[self::FIELD_VALUE_DECIMAL])); } @@ -559,8 +586,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_IDENTIFIER] instanceof FHIRIdentifier) { $this->setValueIdentifier($data[self::FIELD_VALUE_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_IDENTIFIER])) { - $this->setValueIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_VALUE_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_IDENTIFIER])) { + $this->setValueIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_VALUE_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_IDENTIFIER])) { + $this->setValueIdentifier(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_VALUE_IDENTIFIER]))); + } } else { $this->setValueIdentifier(new FHIRIdentifier($data[self::FIELD_VALUE_IDENTIFIER])); } @@ -571,8 +602,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_INSTANT] instanceof FHIRInstant) { $this->setValueInstant($data[self::FIELD_VALUE_INSTANT]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_INSTANT])) { - $this->setValueInstant(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_VALUE_INSTANT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_INSTANT])) { + $this->setValueInstant(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_VALUE_INSTANT]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_INSTANT])) { + $this->setValueInstant(new FHIRInstant(array_merge($ext, $data[self::FIELD_VALUE_INSTANT]))); + } } else { $this->setValueInstant(new FHIRInstant($data[self::FIELD_VALUE_INSTANT])); } @@ -583,8 +618,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_INTEGER] instanceof FHIRInteger) { $this->setValueInteger($data[self::FIELD_VALUE_INTEGER]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_INTEGER])) { - $this->setValueInteger(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_VALUE_INTEGER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_INTEGER])) { + $this->setValueInteger(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_VALUE_INTEGER]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_INTEGER])) { + $this->setValueInteger(new FHIRInteger(array_merge($ext, $data[self::FIELD_VALUE_INTEGER]))); + } } else { $this->setValueInteger(new FHIRInteger($data[self::FIELD_VALUE_INTEGER])); } @@ -602,8 +641,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_QUANTITY] instanceof FHIRQuantity) { $this->setValueQuantity($data[self::FIELD_VALUE_QUANTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_QUANTITY])) { - $this->setValueQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_VALUE_QUANTITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_QUANTITY])) { + $this->setValueQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_VALUE_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_QUANTITY])) { + $this->setValueQuantity(new FHIRQuantity(array_merge($ext, $data[self::FIELD_VALUE_QUANTITY]))); + } } else { $this->setValueQuantity(new FHIRQuantity($data[self::FIELD_VALUE_QUANTITY])); } @@ -649,8 +692,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_STRING] instanceof FHIRString) { $this->setValueString($data[self::FIELD_VALUE_STRING]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_STRING])) { - $this->setValueString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VALUE_STRING]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_STRING])) { + $this->setValueString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VALUE_STRING]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_STRING])) { + $this->setValueString(new FHIRString(array_merge($ext, $data[self::FIELD_VALUE_STRING]))); + } } else { $this->setValueString(new FHIRString($data[self::FIELD_VALUE_STRING])); } @@ -661,8 +708,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_URI] instanceof FHIRUri) { $this->setValueUri($data[self::FIELD_VALUE_URI]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_URI])) { - $this->setValueUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_VALUE_URI]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_URI])) { + $this->setValueUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_VALUE_URI]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_URI])) { + $this->setValueUri(new FHIRUri(array_merge($ext, $data[self::FIELD_VALUE_URI]))); + } } else { $this->setValueUri(new FHIRUri($data[self::FIELD_VALUE_URI])); } @@ -1759,15 +1810,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getUrl())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getUrl())) { $sxe->addAttribute(self::FIELD_URL, (string)$v); } - if (null !== ($v = $this->getValueAddress())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_ADDRESS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueAttachment())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_ATTACHMENT, null, $v->_getFHIRXMLNamespace())); } @@ -1780,15 +1828,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getValueCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_CODE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueCoding())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_CODING, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueContact())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_CONTACT, null, $v->_getFHIRXMLNamespace())); } @@ -1801,11 +1846,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getValueDecimal())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_DECIMAL, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueHumanName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_HUMAN_NAME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } @@ -1815,31 +1858,24 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getValueInteger())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_INTEGER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValuePeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_QUANTITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueRange())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_RANGE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueRatio())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_RATIO, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueResource())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_RESOURCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueSampledData())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_SAMPLED_DATA, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueSchedule())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_SCHEDULE, null, $v->_getFHIRXMLNamespace())); } @@ -1868,16 +1904,37 @@ public function jsonSerialize() $a[self::FIELD_VALUE_ATTACHMENT] = $v; } if (null !== ($v = $this->getValueBase64Binary())) { - $a[self::FIELD_VALUE_BASE_64BINARY] = $v->getValue(); - $a[self::FIELD_VALUE_BASE_64BINARY_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_BASE_64BINARY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_BASE_64BINARY_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_BASE_64BINARY] = $v; + } } if (null !== ($v = $this->getValueBoolean())) { - $a[self::FIELD_VALUE_BOOLEAN] = $v->getValue(); - $a[self::FIELD_VALUE_BOOLEAN_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_BOOLEAN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_BOOLEAN_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_BOOLEAN] = $v; + } } if (null !== ($v = $this->getValueCode())) { - $a[self::FIELD_VALUE_CODE] = $v->getValue(); - $a[self::FIELD_VALUE_CODE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_CODE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_CODE_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_CODE] = $v; + } } if (null !== ($v = $this->getValueCodeableConcept())) { $a[self::FIELD_VALUE_CODEABLE_CONCEPT] = $v; @@ -1886,39 +1943,98 @@ public function jsonSerialize() $a[self::FIELD_VALUE_CODING] = $v; } if (null !== ($v = $this->getValueContact())) { - $a[self::FIELD_VALUE_CONTACT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_CONTACT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_CONTACT_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_CONTACT] = $v; + } } if (null !== ($v = $this->getValueDate())) { - $a[self::FIELD_VALUE_DATE] = $v->getValue(); - $a[self::FIELD_VALUE_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_DATE] = $v; + } } if (null !== ($v = $this->getValueDateTime())) { - $a[self::FIELD_VALUE_DATE_TIME] = $v->getValue(); - $a[self::FIELD_VALUE_DATE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_DATE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_DATE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_DATE_TIME] = $v; + } } if (null !== ($v = $this->getValueDecimal())) { - $a[self::FIELD_VALUE_DECIMAL] = $v->getValue(); - $a[self::FIELD_VALUE_DECIMAL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_DECIMAL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_DECIMAL_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_DECIMAL] = $v; + } } if (null !== ($v = $this->getValueHumanName())) { $a[self::FIELD_VALUE_HUMAN_NAME] = $v; } if (null !== ($v = $this->getValueIdentifier())) { - $a[self::FIELD_VALUE_IDENTIFIER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_IDENTIFIER] = $v; + } } if (null !== ($v = $this->getValueInstant())) { - $a[self::FIELD_VALUE_INSTANT] = $v->getValue(); - $a[self::FIELD_VALUE_INSTANT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_INSTANT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_INSTANT_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_INSTANT] = $v; + } } if (null !== ($v = $this->getValueInteger())) { - $a[self::FIELD_VALUE_INTEGER] = $v->getValue(); - $a[self::FIELD_VALUE_INTEGER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_INTEGER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_INTEGER_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_INTEGER] = $v; + } } if (null !== ($v = $this->getValuePeriod())) { $a[self::FIELD_VALUE_PERIOD] = $v; } if (null !== ($v = $this->getValueQuantity())) { - $a[self::FIELD_VALUE_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_QUANTITY] = $v; + } } if (null !== ($v = $this->getValueRange())) { $a[self::FIELD_VALUE_RANGE] = $v; @@ -1936,12 +2052,26 @@ public function jsonSerialize() $a[self::FIELD_VALUE_SCHEDULE] = $v; } if (null !== ($v = $this->getValueString())) { - $a[self::FIELD_VALUE_STRING] = $v->getValue(); - $a[self::FIELD_VALUE_STRING_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_STRING] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_STRING_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_STRING] = $v; + } } if (null !== ($v = $this->getValueUri())) { - $a[self::FIELD_VALUE_URI] = $v->getValue(); - $a[self::FIELD_VALUE_URI_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_URI] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_URI_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_URI] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRExtensionContext.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRExtensionContext.php index bdb9c8024c..1722085161 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRExtensionContext.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRExtensionContext.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -73,10 +73,6 @@ class FHIRExtensionContext extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_EXTENSION_CONTEXT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -84,6 +80,9 @@ class FHIRExtensionContext extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRExtensionContext Constructor * @param null|array $data @@ -239,8 +238,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRFilterOperator.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRFilterOperator.php index 25bde148e0..5a258af951 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRFilterOperator.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRFilterOperator.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -73,10 +73,6 @@ class FHIRFilterOperator extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_FILTER_OPERATOR; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -84,6 +80,9 @@ class FHIRFilterOperator extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRFilterOperator Constructor * @param null|array $data @@ -239,8 +238,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRGroupType.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRGroupType.php index 78d7e6f773..9618d26332 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRGroupType.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRGroupType.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -73,10 +73,6 @@ class FHIRGroupType extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_GROUP_TYPE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -84,6 +80,9 @@ class FHIRGroupType extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRGroupType Constructor * @param null|array $data @@ -239,8 +238,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRHierarchicalRelationshipType.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRHierarchicalRelationshipType.php index d12069fd62..09b4eb19e8 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRHierarchicalRelationshipType.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRHierarchicalRelationshipType.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -73,10 +73,6 @@ class FHIRHierarchicalRelationshipType extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_HIERARCHICAL_RELATIONSHIP_TYPE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -84,6 +80,9 @@ class FHIRHierarchicalRelationshipType extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRHierarchicalRelationshipType Constructor * @param null|array $data @@ -239,8 +238,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRHumanName.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRHumanName.php index 5ed52ed07f..ecda4a077c 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRHumanName.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRHumanName.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -73,10 +73,6 @@ class FHIRHumanName extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_HUMAN_NAME; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_FAMILY = 'family'; const FIELD_FAMILY_EXT = '_family'; const FIELD_GIVEN = 'given'; @@ -165,6 +161,9 @@ class FHIRHumanName extends FHIRElement */ protected $use = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRHumanName Constructor * @param null|array $data @@ -187,17 +186,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_FAMILY])) { foreach($data[self::FIELD_FAMILY] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRString) { $this->addFamily($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addFamily(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addFamily(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addFamily(new FHIRString(array_merge($v, $ext[$i]))); + } } else { $this->addFamily(new FHIRString($v)); } } } elseif ($data[self::FIELD_FAMILY] instanceof FHIRString) { $this->addFamily($data[self::FIELD_FAMILY]); - } elseif ($ext && is_scalar($data[self::FIELD_FAMILY])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_FAMILY])) { $this->addFamily(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_FAMILY]] + $ext)); } else { $this->addFamily(new FHIRString($data[self::FIELD_FAMILY])); @@ -209,17 +215,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_GIVEN])) { foreach($data[self::FIELD_GIVEN] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRString) { $this->addGiven($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addGiven(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addGiven(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addGiven(new FHIRString(array_merge($v, $ext[$i]))); + } } else { $this->addGiven(new FHIRString($v)); } } } elseif ($data[self::FIELD_GIVEN] instanceof FHIRString) { $this->addGiven($data[self::FIELD_GIVEN]); - } elseif ($ext && is_scalar($data[self::FIELD_GIVEN])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_GIVEN])) { $this->addGiven(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_GIVEN]] + $ext)); } else { $this->addGiven(new FHIRString($data[self::FIELD_GIVEN])); @@ -238,17 +251,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_PREFIX])) { foreach($data[self::FIELD_PREFIX] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRString) { $this->addPrefix($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addPrefix(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addPrefix(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addPrefix(new FHIRString(array_merge($v, $ext[$i]))); + } } else { $this->addPrefix(new FHIRString($v)); } } } elseif ($data[self::FIELD_PREFIX] instanceof FHIRString) { $this->addPrefix($data[self::FIELD_PREFIX]); - } elseif ($ext && is_scalar($data[self::FIELD_PREFIX])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_PREFIX])) { $this->addPrefix(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PREFIX]] + $ext)); } else { $this->addPrefix(new FHIRString($data[self::FIELD_PREFIX])); @@ -260,17 +280,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_SUFFIX])) { foreach($data[self::FIELD_SUFFIX] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRString) { $this->addSuffix($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addSuffix(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addSuffix(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addSuffix(new FHIRString(array_merge($v, $ext[$i]))); + } } else { $this->addSuffix(new FHIRString($v)); } } } elseif ($data[self::FIELD_SUFFIX] instanceof FHIRString) { $this->addSuffix($data[self::FIELD_SUFFIX]); - } elseif ($ext && is_scalar($data[self::FIELD_SUFFIX])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_SUFFIX])) { $this->addSuffix(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SUFFIX]] + $ext)); } else { $this->addSuffix(new FHIRString($data[self::FIELD_SUFFIX])); @@ -282,8 +309,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TEXT] instanceof FHIRString) { $this->setText($data[self::FIELD_TEXT]); - } elseif ($ext && is_scalar($data[self::FIELD_TEXT])) { - $this->setText(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TEXT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TEXT])) { + $this->setText(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TEXT]] + $ext)); + } else if (is_array($data[self::FIELD_TEXT])) { + $this->setText(new FHIRString(array_merge($ext, $data[self::FIELD_TEXT]))); + } } else { $this->setText(new FHIRString($data[self::FIELD_TEXT])); } @@ -294,8 +325,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_USE] instanceof FHIRNameUse) { $this->setUse($data[self::FIELD_USE]); - } elseif ($ext && is_scalar($data[self::FIELD_USE])) { - $this->setUse(new FHIRNameUse([FHIRNameUse::FIELD_VALUE => $data[self::FIELD_USE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_USE])) { + $this->setUse(new FHIRNameUse([FHIRNameUse::FIELD_VALUE => $data[self::FIELD_USE]] + $ext)); + } else if (is_array($data[self::FIELD_USE])) { + $this->setUse(new FHIRNameUse(array_merge($ext, $data[self::FIELD_USE]))); + } } else { $this->setUse(new FHIRNameUse($data[self::FIELD_USE])); } @@ -800,6 +835,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_FAMILY, null, $v->_getFHIRXMLNamespace())); } } + if ([] !== ($vs = $this->getGiven())) { foreach($vs as $v) { if (null === $v) { @@ -820,6 +856,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_PREFIX, null, $v->_getFHIRXMLNamespace())); } } + if ([] !== ($vs = $this->getSuffix())) { foreach($vs as $v) { if (null === $v) { @@ -828,10 +865,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_SUFFIX, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getText())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TEXT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getUse())) { $v->xmlSerialize($sxe->addChild(self::FIELD_USE, null, $v->_getFHIRXMLNamespace())); } @@ -850,8 +887,17 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_FAMILY][] = $v->getValue(); - $a[self::FIELD_FAMILY_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FAMILY][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FAMILY_EXT][] = $enc; + } else { + $a[self::FIELD_FAMILY_EXT][] = null; + } + } else { + $a[self::FIELD_FAMILY][] = $v; + } } } if ([] !== ($vs = $this->getGiven())) { @@ -860,8 +906,17 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_GIVEN][] = $v->getValue(); - $a[self::FIELD_GIVEN_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_GIVEN][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_GIVEN_EXT][] = $enc; + } else { + $a[self::FIELD_GIVEN_EXT][] = null; + } + } else { + $a[self::FIELD_GIVEN][] = $v; + } } } if (null !== ($v = $this->getPeriod())) { @@ -873,8 +928,17 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_PREFIX][] = $v->getValue(); - $a[self::FIELD_PREFIX_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PREFIX][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PREFIX_EXT][] = $enc; + } else { + $a[self::FIELD_PREFIX_EXT][] = null; + } + } else { + $a[self::FIELD_PREFIX][] = $v; + } } } if ([] !== ($vs = $this->getSuffix())) { @@ -883,16 +947,40 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_SUFFIX][] = $v->getValue(); - $a[self::FIELD_SUFFIX_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SUFFIX][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SUFFIX_EXT][] = $enc; + } else { + $a[self::FIELD_SUFFIX_EXT][] = null; + } + } else { + $a[self::FIELD_SUFFIX][] = $v; + } } } if (null !== ($v = $this->getText())) { - $a[self::FIELD_TEXT] = $v->getValue(); - $a[self::FIELD_TEXT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TEXT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TEXT_EXT] = $enc; + } + } else { + $a[self::FIELD_TEXT] = $v; + } } if (null !== ($v = $this->getUse())) { - $a[self::FIELD_USE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_USE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_USE_EXT] = $enc; + } + } else { + $a[self::FIELD_USE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRId.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRId.php index 0b3412729e..4875d4cfa1 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRId.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRId.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -76,10 +76,6 @@ class FHIRId extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ID; - - /** @var string */ - protected $_xmlns = ''; - const FIELD_VALUE = 'value'; /** @@ -87,6 +83,8 @@ class FHIRId extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; /** * FHIRId Constructor @@ -244,8 +242,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRIdentifier.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRIdentifier.php index be1f9d2757..be556350af 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRIdentifier.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRIdentifier.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -73,10 +73,6 @@ class FHIRIdentifier extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_IDENTIFIER; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ASSIGNER = 'assigner'; const FIELD_LABEL = 'label'; const FIELD_LABEL_EXT = '_label'; @@ -152,6 +148,9 @@ class FHIRIdentifier extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRIdentifier Constructor * @param null|array $data @@ -185,8 +184,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_LABEL] instanceof FHIRString) { $this->setLabel($data[self::FIELD_LABEL]); - } elseif ($ext && is_scalar($data[self::FIELD_LABEL])) { - $this->setLabel(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_LABEL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_LABEL])) { + $this->setLabel(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_LABEL]] + $ext)); + } else if (is_array($data[self::FIELD_LABEL])) { + $this->setLabel(new FHIRString(array_merge($ext, $data[self::FIELD_LABEL]))); + } } else { $this->setLabel(new FHIRString($data[self::FIELD_LABEL])); } @@ -204,8 +207,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SYSTEM] instanceof FHIRUri) { $this->setSystem($data[self::FIELD_SYSTEM]); - } elseif ($ext && is_scalar($data[self::FIELD_SYSTEM])) { - $this->setSystem(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_SYSTEM]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SYSTEM])) { + $this->setSystem(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_SYSTEM]] + $ext)); + } else if (is_array($data[self::FIELD_SYSTEM])) { + $this->setSystem(new FHIRUri(array_merge($ext, $data[self::FIELD_SYSTEM]))); + } } else { $this->setSystem(new FHIRUri($data[self::FIELD_SYSTEM])); } @@ -216,8 +223,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_USE] instanceof FHIRIdentifierUse) { $this->setUse($data[self::FIELD_USE]); - } elseif ($ext && is_scalar($data[self::FIELD_USE])) { - $this->setUse(new FHIRIdentifierUse([FHIRIdentifierUse::FIELD_VALUE => $data[self::FIELD_USE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_USE])) { + $this->setUse(new FHIRIdentifierUse([FHIRIdentifierUse::FIELD_VALUE => $data[self::FIELD_USE]] + $ext)); + } else if (is_array($data[self::FIELD_USE])) { + $this->setUse(new FHIRIdentifierUse(array_merge($ext, $data[self::FIELD_USE]))); + } } else { $this->setUse(new FHIRIdentifierUse($data[self::FIELD_USE])); } @@ -228,8 +239,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE] instanceof FHIRString) { $this->setValue($data[self::FIELD_VALUE]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE])) { - $this->setValue(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VALUE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE])) { + $this->setValue(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VALUE]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE])) { + $this->setValue(new FHIRString(array_merge($ext, $data[self::FIELD_VALUE]))); + } } else { $this->setValue(new FHIRString($data[self::FIELD_VALUE])); } @@ -562,25 +577,23 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getAssigner())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ASSIGNER, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getLabel())) { $v->xmlSerialize($sxe->addChild(self::FIELD_LABEL, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PERIOD, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getSystem())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SYSTEM, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getUse())) { $v->xmlSerialize($sxe->addChild(self::FIELD_USE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getValue())) { + $sxe->addAttribute(self::FIELD_VALUE, (string)$v); $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE, null, $v->_getFHIRXMLNamespace())); } return $sxe; @@ -596,22 +609,51 @@ public function jsonSerialize() $a[self::FIELD_ASSIGNER] = $v; } if (null !== ($v = $this->getLabel())) { - $a[self::FIELD_LABEL] = $v->getValue(); - $a[self::FIELD_LABEL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_LABEL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_LABEL_EXT] = $enc; + } + } else { + $a[self::FIELD_LABEL] = $v; + } } if (null !== ($v = $this->getPeriod())) { $a[self::FIELD_PERIOD] = $v; } if (null !== ($v = $this->getSystem())) { - $a[self::FIELD_SYSTEM] = $v->getValue(); - $a[self::FIELD_SYSTEM_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SYSTEM] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SYSTEM_EXT] = $enc; + } + } else { + $a[self::FIELD_SYSTEM] = $v; + } } if (null !== ($v = $this->getUse())) { - $a[self::FIELD_USE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_USE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_USE_EXT] = $enc; + } + } else { + $a[self::FIELD_USE] = $v; + } } if (null !== ($v = $this->getValue())) { - $a[self::FIELD_VALUE] = $v->getValue(); - $a[self::FIELD_VALUE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRIdentifierUse.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRIdentifierUse.php index cbab901f27..d06281eaec 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRIdentifierUse.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRIdentifierUse.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -73,10 +73,6 @@ class FHIRIdentifierUse extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_IDENTIFIER_USE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -84,6 +80,9 @@ class FHIRIdentifierUse extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRIdentifierUse Constructor * @param null|array $data @@ -239,8 +238,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRImagingModality.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRImagingModality.php index d8ea616725..68d7ce5d2b 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRImagingModality.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRImagingModality.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -73,10 +73,6 @@ class FHIRImagingModality extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_IMAGING_MODALITY; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -84,6 +80,9 @@ class FHIRImagingModality extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRImagingModality Constructor * @param null|array $data @@ -239,8 +238,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRInstanceAvailability.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRInstanceAvailability.php index e67e173596..31648b6dfd 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRInstanceAvailability.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRInstanceAvailability.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -73,10 +73,6 @@ class FHIRInstanceAvailability extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_INSTANCE_AVAILABILITY; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -84,6 +80,9 @@ class FHIRInstanceAvailability extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRInstanceAvailability Constructor * @param null|array $data @@ -239,8 +238,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRInstant.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRInstant.php index 6aa378072e..222ea7e4ff 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRInstant.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRInstant.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -73,10 +73,6 @@ class FHIRInstant extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_INSTANT; - - /** @var string */ - protected $_xmlns = ''; - const FIELD_VALUE = 'value'; /** @@ -84,6 +80,8 @@ class FHIRInstant extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; /** * FHIRInstant Constructor @@ -241,8 +239,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRInteger.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRInteger.php index 89a6f536c6..1b6149dc51 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRInteger.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRInteger.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -73,10 +73,6 @@ class FHIRInteger extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_INTEGER; - - /** @var string */ - protected $_xmlns = ''; - const FIELD_VALUE = 'value'; /** @@ -84,6 +80,8 @@ class FHIRInteger extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; /** * FHIRInteger Constructor @@ -241,8 +239,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRInteger/FHIRTotalResults.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRInteger/FHIRTotalResults.php index ee18d1eb3d..571953c8ea 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRInteger/FHIRTotalResults.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRInteger/FHIRTotalResults.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -72,7 +72,6 @@ class FHIRTotalResults extends FHIRInteger { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_TOTAL_RESULTS; - /** @var string */ protected $_xmlns = 'http://hl7.org/fhir'; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRIssueSeverity.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRIssueSeverity.php index 610715648c..785c60c06f 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRIssueSeverity.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRIssueSeverity.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -73,10 +73,6 @@ class FHIRIssueSeverity extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ISSUE_SEVERITY; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -84,6 +80,9 @@ class FHIRIssueSeverity extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRIssueSeverity Constructor * @param null|array $data @@ -239,8 +238,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRLinkType.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRLinkType.php index 635f393678..93d07263f0 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRLinkType.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRLinkType.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -73,10 +73,6 @@ class FHIRLinkType extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_LINK_TYPE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -84,6 +80,9 @@ class FHIRLinkType extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRLinkType Constructor * @param null|array $data @@ -239,8 +238,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRListMode.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRListMode.php index 532223a3e5..75afff24ee 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRListMode.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRListMode.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -73,10 +73,6 @@ class FHIRListMode extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_LIST_MODE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -84,6 +80,9 @@ class FHIRListMode extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRListMode Constructor * @param null|array $data @@ -239,8 +238,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRLocationMode.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRLocationMode.php index 0a91c58731..35c5899e83 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRLocationMode.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRLocationMode.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -74,10 +74,6 @@ class FHIRLocationMode extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_LOCATION_MODE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -85,6 +81,9 @@ class FHIRLocationMode extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRLocationMode Constructor * @param null|array $data @@ -240,8 +239,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRLocationStatus.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRLocationStatus.php index 28e11a0378..97511cf887 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRLocationStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRLocationStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -73,10 +73,6 @@ class FHIRLocationStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_LOCATION_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -84,6 +80,9 @@ class FHIRLocationStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRLocationStatus Constructor * @param null|array $data @@ -239,8 +238,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRMediaType.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRMediaType.php index 0f781f73ea..69f6fcbca7 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRMediaType.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRMediaType.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -73,10 +73,6 @@ class FHIRMediaType extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MEDIA_TYPE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -84,6 +80,9 @@ class FHIRMediaType extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMediaType Constructor * @param null|array $data @@ -239,8 +238,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRMedicationAdministrationStatus.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRMedicationAdministrationStatus.php index 3e96cbf2ad..15c738ab9d 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRMedicationAdministrationStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRMedicationAdministrationStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -73,10 +73,6 @@ class FHIRMedicationAdministrationStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MEDICATION_ADMINISTRATION_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -84,6 +80,9 @@ class FHIRMedicationAdministrationStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMedicationAdministrationStatus Constructor * @param null|array $data @@ -239,8 +238,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRMedicationDispenseStatus.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRMedicationDispenseStatus.php index bb095646d6..c38600c863 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRMedicationDispenseStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRMedicationDispenseStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -73,10 +73,6 @@ class FHIRMedicationDispenseStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MEDICATION_DISPENSE_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -84,6 +80,9 @@ class FHIRMedicationDispenseStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMedicationDispenseStatus Constructor * @param null|array $data @@ -239,8 +238,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRMedicationKind.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRMedicationKind.php index 1089e5c8ab..0178dae8d6 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRMedicationKind.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRMedicationKind.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -73,10 +73,6 @@ class FHIRMedicationKind extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MEDICATION_KIND; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -84,6 +80,9 @@ class FHIRMedicationKind extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMedicationKind Constructor * @param null|array $data @@ -239,8 +238,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRMedicationPrescriptionStatus.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRMedicationPrescriptionStatus.php index 48de3ae0a5..fc20c186f6 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRMedicationPrescriptionStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRMedicationPrescriptionStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -74,10 +74,6 @@ class FHIRMedicationPrescriptionStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MEDICATION_PRESCRIPTION_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -85,6 +81,9 @@ class FHIRMedicationPrescriptionStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMedicationPrescriptionStatus Constructor * @param null|array $data @@ -240,8 +239,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRMessageSignificanceCategory.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRMessageSignificanceCategory.php index 2f451f37c4..f8dc99fd37 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRMessageSignificanceCategory.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRMessageSignificanceCategory.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -73,10 +73,6 @@ class FHIRMessageSignificanceCategory extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MESSAGE_SIGNIFICANCE_CATEGORY; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -84,6 +80,9 @@ class FHIRMessageSignificanceCategory extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMessageSignificanceCategory Constructor * @param null|array $data @@ -239,8 +238,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRModality.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRModality.php index 8b56280bb5..1869567cb1 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRModality.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRModality.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -73,10 +73,6 @@ class FHIRModality extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MODALITY; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -84,6 +80,9 @@ class FHIRModality extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRModality Constructor * @param null|array $data @@ -239,8 +238,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRNameUse.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRNameUse.php index 2ea3833ec9..7666820921 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRNameUse.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRNameUse.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -73,10 +73,6 @@ class FHIRNameUse extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_NAME_USE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -84,6 +80,9 @@ class FHIRNameUse extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRNameUse Constructor * @param null|array $data @@ -239,8 +238,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRNarrative.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRNarrative.php index 76753151e9..88c344ac2d 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRNarrative.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRNarrative.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -74,10 +74,6 @@ class FHIRNarrative extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_NARRATIVE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DIV = 'div'; const FIELD_STATUS = 'status'; const FIELD_STATUS_EXT = '_status'; @@ -101,6 +97,9 @@ class FHIRNarrative extends FHIRElement */ protected $status = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRNarrative Constructor * @param null|array $data @@ -126,8 +125,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRNarrativeStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRNarrativeStatus([FHIRNarrativeStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRNarrativeStatus([FHIRNarrativeStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRNarrativeStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRNarrativeStatus($data[self::FIELD_STATUS])); } @@ -303,11 +306,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getDiv())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getDiv())) { $sxe->addAttribute(self::FIELD_DIV, (string)$v); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } @@ -324,7 +325,15 @@ public function jsonSerialize() $a[self::FIELD_DIV] = $v; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRNarrativeStatus.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRNarrativeStatus.php index 45f9ebad2e..809be362cb 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRNarrativeStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRNarrativeStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -73,10 +73,6 @@ class FHIRNarrativeStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_NARRATIVE_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -84,6 +80,9 @@ class FHIRNarrativeStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRNarrativeStatus Constructor * @param null|array $data @@ -239,8 +238,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRObservationRelationshipType.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRObservationRelationshipType.php index 7b073c3dec..402cf17b88 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRObservationRelationshipType.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRObservationRelationshipType.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -73,10 +73,6 @@ class FHIRObservationRelationshipType extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_OBSERVATION_RELATIONSHIP_TYPE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -84,6 +80,9 @@ class FHIRObservationRelationshipType extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRObservationRelationshipType Constructor * @param null|array $data @@ -239,8 +238,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRObservationReliability.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRObservationReliability.php index c29eb8c809..d18aed8c92 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRObservationReliability.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRObservationReliability.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -74,10 +74,6 @@ class FHIRObservationReliability extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_OBSERVATION_RELIABILITY; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -85,6 +81,9 @@ class FHIRObservationReliability extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRObservationReliability Constructor * @param null|array $data @@ -240,8 +239,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRObservationStatus.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRObservationStatus.php index 489db32915..d54c28a985 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRObservationStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRObservationStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -73,10 +73,6 @@ class FHIRObservationStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_OBSERVATION_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -84,6 +80,9 @@ class FHIRObservationStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRObservationStatus Constructor * @param null|array $data @@ -239,8 +238,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIROid.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIROid.php index 79f39b66e3..27eb3f1ca7 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIROid.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIROid.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -74,10 +74,6 @@ class FHIROid extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_OID; - - /** @var string */ - protected $_xmlns = ''; - const FIELD_VALUE = 'value'; /** @@ -85,6 +81,8 @@ class FHIROid extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; /** * FHIROid Constructor @@ -242,8 +240,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIROrderOutcomeStatus.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIROrderOutcomeStatus.php index ffeb655095..2830afd652 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIROrderOutcomeStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIROrderOutcomeStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -73,10 +73,6 @@ class FHIROrderOutcomeStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ORDER_OUTCOME_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -84,6 +80,9 @@ class FHIROrderOutcomeStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIROrderOutcomeStatus Constructor * @param null|array $data @@ -239,8 +238,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRPeriod.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRPeriod.php index 4054b6bf75..12a894c504 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRPeriod.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRPeriod.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -73,10 +73,6 @@ class FHIRPeriod extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_PERIOD; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_END = 'end'; const FIELD_END_EXT = '_end'; const FIELD_START = 'start'; @@ -109,6 +105,9 @@ class FHIRPeriod extends FHIRElement */ protected $start = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRPeriod Constructor * @param null|array $data @@ -131,8 +130,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_END] instanceof FHIRDateTime) { $this->setEnd($data[self::FIELD_END]); - } elseif ($ext && is_scalar($data[self::FIELD_END])) { - $this->setEnd(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_END]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_END])) { + $this->setEnd(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_END]] + $ext)); + } else if (is_array($data[self::FIELD_END])) { + $this->setEnd(new FHIRDateTime(array_merge($ext, $data[self::FIELD_END]))); + } } else { $this->setEnd(new FHIRDateTime($data[self::FIELD_END])); } @@ -143,8 +146,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_START] instanceof FHIRDateTime) { $this->setStart($data[self::FIELD_START]); - } elseif ($ext && is_scalar($data[self::FIELD_START])) { - $this->setStart(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_START]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_START])) { + $this->setStart(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_START]] + $ext)); + } else if (is_array($data[self::FIELD_START])) { + $this->setStart(new FHIRDateTime(array_merge($ext, $data[self::FIELD_START]))); + } } else { $this->setStart(new FHIRDateTime($data[self::FIELD_START])); } @@ -364,12 +371,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getEnd())) { - $a[self::FIELD_END] = $v->getValue(); - $a[self::FIELD_END_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_END] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_END_EXT] = $enc; + } + } else { + $a[self::FIELD_END] = $v; + } } if (null !== ($v = $this->getStart())) { - $a[self::FIELD_START] = $v->getValue(); - $a[self::FIELD_START_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_START] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_START_EXT] = $enc; + } + } else { + $a[self::FIELD_START] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRProcedureRelationshipType.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRProcedureRelationshipType.php index ebdd11a6df..6e03bfcd1a 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRProcedureRelationshipType.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRProcedureRelationshipType.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -73,10 +73,6 @@ class FHIRProcedureRelationshipType extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_PROCEDURE_RELATIONSHIP_TYPE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -84,6 +80,9 @@ class FHIRProcedureRelationshipType extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRProcedureRelationshipType Constructor * @param null|array $data @@ -239,8 +238,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRPropertyRepresentation.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRPropertyRepresentation.php index de17d8686b..5fccec2490 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRPropertyRepresentation.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRPropertyRepresentation.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -73,10 +73,6 @@ class FHIRPropertyRepresentation extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_PROPERTY_REPRESENTATION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -84,6 +80,9 @@ class FHIRPropertyRepresentation extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRPropertyRepresentation Constructor * @param null|array $data @@ -239,8 +238,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRProvenanceEntityRole.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRProvenanceEntityRole.php index 2fff45a5d1..b04d254959 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRProvenanceEntityRole.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRProvenanceEntityRole.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -73,10 +73,6 @@ class FHIRProvenanceEntityRole extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_PROVENANCE_ENTITY_ROLE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -84,6 +80,9 @@ class FHIRProvenanceEntityRole extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRProvenanceEntityRole Constructor * @param null|array $data @@ -239,8 +238,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRQuantity.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRQuantity.php index f7a0e4a2ef..69595c971c 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRQuantity.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRQuantity.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -75,10 +75,6 @@ class FHIRQuantity extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_QUANTITY; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CODE = 'code'; const FIELD_CODE_EXT = '_code'; const FIELD_COMPARATOR = 'comparator'; @@ -145,6 +141,9 @@ class FHIRQuantity extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRQuantity Constructor * @param null|array $data @@ -171,8 +170,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CODE] instanceof FHIRCode) { $this->setCode($data[self::FIELD_CODE]); - } elseif ($ext && is_scalar($data[self::FIELD_CODE])) { - $this->setCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_CODE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CODE])) { + $this->setCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_CODE]] + $ext)); + } else if (is_array($data[self::FIELD_CODE])) { + $this->setCode(new FHIRCode(array_merge($ext, $data[self::FIELD_CODE]))); + } } else { $this->setCode(new FHIRCode($data[self::FIELD_CODE])); } @@ -183,8 +186,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_COMPARATOR] instanceof FHIRQuantityCompararator) { $this->setComparator($data[self::FIELD_COMPARATOR]); - } elseif ($ext && is_scalar($data[self::FIELD_COMPARATOR])) { - $this->setComparator(new FHIRQuantityCompararator([FHIRQuantityCompararator::FIELD_VALUE => $data[self::FIELD_COMPARATOR]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_COMPARATOR])) { + $this->setComparator(new FHIRQuantityCompararator([FHIRQuantityCompararator::FIELD_VALUE => $data[self::FIELD_COMPARATOR]] + $ext)); + } else if (is_array($data[self::FIELD_COMPARATOR])) { + $this->setComparator(new FHIRQuantityCompararator(array_merge($ext, $data[self::FIELD_COMPARATOR]))); + } } else { $this->setComparator(new FHIRQuantityCompararator($data[self::FIELD_COMPARATOR])); } @@ -195,8 +202,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SYSTEM] instanceof FHIRUri) { $this->setSystem($data[self::FIELD_SYSTEM]); - } elseif ($ext && is_scalar($data[self::FIELD_SYSTEM])) { - $this->setSystem(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_SYSTEM]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SYSTEM])) { + $this->setSystem(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_SYSTEM]] + $ext)); + } else if (is_array($data[self::FIELD_SYSTEM])) { + $this->setSystem(new FHIRUri(array_merge($ext, $data[self::FIELD_SYSTEM]))); + } } else { $this->setSystem(new FHIRUri($data[self::FIELD_SYSTEM])); } @@ -207,8 +218,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_UNITS] instanceof FHIRString) { $this->setUnits($data[self::FIELD_UNITS]); - } elseif ($ext && is_scalar($data[self::FIELD_UNITS])) { - $this->setUnits(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_UNITS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_UNITS])) { + $this->setUnits(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_UNITS]] + $ext)); + } else if (is_array($data[self::FIELD_UNITS])) { + $this->setUnits(new FHIRString(array_merge($ext, $data[self::FIELD_UNITS]))); + } } else { $this->setUnits(new FHIRString($data[self::FIELD_UNITS])); } @@ -219,8 +234,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE] instanceof FHIRDecimal) { $this->setValue($data[self::FIELD_VALUE]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE])) { - $this->setValue(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_VALUE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE])) { + $this->setValue(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_VALUE]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE])) { + $this->setValue(new FHIRDecimal(array_merge($ext, $data[self::FIELD_VALUE]))); + } } else { $this->setValue(new FHIRDecimal($data[self::FIELD_VALUE])); } @@ -538,7 +557,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getComparator())) { $v->xmlSerialize($sxe->addChild(self::FIELD_COMPARATOR, null, $v->_getFHIRXMLNamespace())); } @@ -549,6 +567,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_UNITS, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getValue())) { + $sxe->addAttribute(self::FIELD_VALUE, (string)$v); $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE, null, $v->_getFHIRXMLNamespace())); } return $sxe; @@ -561,23 +580,59 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getCode())) { - $a[self::FIELD_CODE] = $v->getValue(); - $a[self::FIELD_CODE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CODE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CODE_EXT] = $enc; + } + } else { + $a[self::FIELD_CODE] = $v; + } } if (null !== ($v = $this->getComparator())) { - $a[self::FIELD_COMPARATOR] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_COMPARATOR] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_COMPARATOR_EXT] = $enc; + } + } else { + $a[self::FIELD_COMPARATOR] = $v; + } } if (null !== ($v = $this->getSystem())) { - $a[self::FIELD_SYSTEM] = $v->getValue(); - $a[self::FIELD_SYSTEM_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SYSTEM] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SYSTEM_EXT] = $enc; + } + } else { + $a[self::FIELD_SYSTEM] = $v; + } } if (null !== ($v = $this->getUnits())) { - $a[self::FIELD_UNITS] = $v->getValue(); - $a[self::FIELD_UNITS_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_UNITS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_UNITS_EXT] = $enc; + } + } else { + $a[self::FIELD_UNITS] = $v; + } } if (null !== ($v = $this->getValue())) { - $a[self::FIELD_VALUE] = $v->getValue(); - $a[self::FIELD_VALUE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRQuantity/FHIRAge.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRQuantity/FHIRAge.php index 74cb59c110..ba461a0c7b 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRQuantity/FHIRAge.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRQuantity/FHIRAge.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -69,7 +69,6 @@ class FHIRAge extends FHIRQuantity { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_AGE; - /** @var string */ protected $_xmlns = 'http://hl7.org/fhir'; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRQuantity/FHIRCount.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRQuantity/FHIRCount.php index c7c7f394e7..50c08dff90 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRQuantity/FHIRCount.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRQuantity/FHIRCount.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -69,7 +69,6 @@ class FHIRCount extends FHIRQuantity { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_COUNT; - /** @var string */ protected $_xmlns = 'http://hl7.org/fhir'; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRQuantity/FHIRDistance.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRQuantity/FHIRDistance.php index 12f5fec5ce..59b3fcc548 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRQuantity/FHIRDistance.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRQuantity/FHIRDistance.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -69,7 +69,6 @@ class FHIRDistance extends FHIRQuantity { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DISTANCE; - /** @var string */ protected $_xmlns = 'http://hl7.org/fhir'; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRQuantity/FHIRDuration.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRQuantity/FHIRDuration.php index c622d227f3..7f63961c41 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRQuantity/FHIRDuration.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRQuantity/FHIRDuration.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -69,7 +69,6 @@ class FHIRDuration extends FHIRQuantity { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DURATION; - /** @var string */ protected $_xmlns = 'http://hl7.org/fhir'; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRQuantity/FHIRMoney.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRQuantity/FHIRMoney.php index a967a3862f..ed3da59013 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRQuantity/FHIRMoney.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRQuantity/FHIRMoney.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -69,7 +69,6 @@ class FHIRMoney extends FHIRQuantity { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MONEY; - /** @var string */ protected $_xmlns = 'http://hl7.org/fhir'; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRQuantityCompararator.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRQuantityCompararator.php index cb7fd27192..c8b3df6904 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRQuantityCompararator.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRQuantityCompararator.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -73,10 +73,6 @@ class FHIRQuantityCompararator extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_QUANTITY_COMPARARATOR; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -84,6 +80,9 @@ class FHIRQuantityCompararator extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRQuantityCompararator Constructor * @param null|array $data @@ -239,8 +238,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRQueryOutcome.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRQueryOutcome.php index b25875be7d..f2b9cc7577 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRQueryOutcome.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRQueryOutcome.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -73,10 +73,6 @@ class FHIRQueryOutcome extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_QUERY_OUTCOME; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -84,6 +80,9 @@ class FHIRQueryOutcome extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRQueryOutcome Constructor * @param null|array $data @@ -239,8 +238,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRQuestionnaireStatus.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRQuestionnaireStatus.php index d0e5150079..67a33da3da 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRQuestionnaireStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRQuestionnaireStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -73,10 +73,6 @@ class FHIRQuestionnaireStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_QUESTIONNAIRE_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -84,6 +80,9 @@ class FHIRQuestionnaireStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRQuestionnaireStatus Constructor * @param null|array $data @@ -239,8 +238,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRRange.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRRange.php index eff56cf45f..98ea27b5fb 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRRange.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRRange.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -73,10 +73,6 @@ class FHIRRange extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_RANGE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_HIGH = 'high'; const FIELD_HIGH_EXT = '_high'; const FIELD_LOW = 'low'; @@ -108,6 +104,9 @@ class FHIRRange extends FHIRElement */ protected $low = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRRange Constructor * @param null|array $data @@ -130,8 +129,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_HIGH] instanceof FHIRQuantity) { $this->setHigh($data[self::FIELD_HIGH]); - } elseif ($ext && is_scalar($data[self::FIELD_HIGH])) { - $this->setHigh(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_HIGH]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_HIGH])) { + $this->setHigh(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_HIGH]] + $ext)); + } else if (is_array($data[self::FIELD_HIGH])) { + $this->setHigh(new FHIRQuantity(array_merge($ext, $data[self::FIELD_HIGH]))); + } } else { $this->setHigh(new FHIRQuantity($data[self::FIELD_HIGH])); } @@ -142,8 +145,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_LOW] instanceof FHIRQuantity) { $this->setLow($data[self::FIELD_LOW]); - } elseif ($ext && is_scalar($data[self::FIELD_LOW])) { - $this->setLow(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_LOW]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_LOW])) { + $this->setLow(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_LOW]] + $ext)); + } else if (is_array($data[self::FIELD_LOW])) { + $this->setLow(new FHIRQuantity(array_merge($ext, $data[self::FIELD_LOW]))); + } } else { $this->setLow(new FHIRQuantity($data[self::FIELD_LOW])); } @@ -323,11 +330,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getHigh())) { $v->xmlSerialize($sxe->addChild(self::FIELD_HIGH, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getLow())) { $v->xmlSerialize($sxe->addChild(self::FIELD_LOW, null, $v->_getFHIRXMLNamespace())); } @@ -341,10 +346,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getHigh())) { - $a[self::FIELD_HIGH] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_HIGH] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_HIGH_EXT] = $enc; + } + } else { + $a[self::FIELD_HIGH] = $v; + } } if (null !== ($v = $this->getLow())) { - $a[self::FIELD_LOW] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_LOW] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_LOW_EXT] = $enc; + } + } else { + $a[self::FIELD_LOW] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRRatio.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRRatio.php index 7d561153e4..495d723890 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRRatio.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRRatio.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -74,10 +74,6 @@ class FHIRRatio extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_RATIO; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DENOMINATOR = 'denominator'; const FIELD_DENOMINATOR_EXT = '_denominator'; const FIELD_NUMERATOR = 'numerator'; @@ -109,6 +105,9 @@ class FHIRRatio extends FHIRElement */ protected $numerator = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRRatio Constructor * @param null|array $data @@ -131,8 +130,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DENOMINATOR] instanceof FHIRQuantity) { $this->setDenominator($data[self::FIELD_DENOMINATOR]); - } elseif ($ext && is_scalar($data[self::FIELD_DENOMINATOR])) { - $this->setDenominator(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_DENOMINATOR]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DENOMINATOR])) { + $this->setDenominator(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_DENOMINATOR]] + $ext)); + } else if (is_array($data[self::FIELD_DENOMINATOR])) { + $this->setDenominator(new FHIRQuantity(array_merge($ext, $data[self::FIELD_DENOMINATOR]))); + } } else { $this->setDenominator(new FHIRQuantity($data[self::FIELD_DENOMINATOR])); } @@ -143,8 +146,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NUMERATOR] instanceof FHIRQuantity) { $this->setNumerator($data[self::FIELD_NUMERATOR]); - } elseif ($ext && is_scalar($data[self::FIELD_NUMERATOR])) { - $this->setNumerator(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_NUMERATOR]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NUMERATOR])) { + $this->setNumerator(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_NUMERATOR]] + $ext)); + } else if (is_array($data[self::FIELD_NUMERATOR])) { + $this->setNumerator(new FHIRQuantity(array_merge($ext, $data[self::FIELD_NUMERATOR]))); + } } else { $this->setNumerator(new FHIRQuantity($data[self::FIELD_NUMERATOR])); } @@ -324,11 +331,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getDenominator())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DENOMINATOR, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getNumerator())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NUMERATOR, null, $v->_getFHIRXMLNamespace())); } @@ -342,10 +347,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getDenominator())) { - $a[self::FIELD_DENOMINATOR] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DENOMINATOR] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DENOMINATOR_EXT] = $enc; + } + } else { + $a[self::FIELD_DENOMINATOR] = $v; + } } if (null !== ($v = $this->getNumerator())) { - $a[self::FIELD_NUMERATOR] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NUMERATOR] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NUMERATOR_EXT] = $enc; + } + } else { + $a[self::FIELD_NUMERATOR] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRReactionSeverity.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRReactionSeverity.php index 13a02fae4e..5ed3865a15 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRReactionSeverity.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRReactionSeverity.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -73,10 +73,6 @@ class FHIRReactionSeverity extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_REACTION_SEVERITY; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -84,6 +80,9 @@ class FHIRReactionSeverity extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRReactionSeverity Constructor * @param null|array $data @@ -239,8 +238,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRResourceProfileStatus.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRResourceProfileStatus.php index b87ee690ce..ef6d131f62 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRResourceProfileStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRResourceProfileStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -73,10 +73,6 @@ class FHIRResourceProfileStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_RESOURCE_PROFILE_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -84,6 +80,9 @@ class FHIRResourceProfileStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRResourceProfileStatus Constructor * @param null|array $data @@ -239,8 +238,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRResourceReference.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRResourceReference.php index 8370ac2e51..7fa61cbdbf 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRResourceReference.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRResourceReference.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -73,10 +73,6 @@ class FHIRResourceReference extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_RESOURCE_REFERENCE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DISPLAY = 'display'; const FIELD_DISPLAY_EXT = '_display'; const FIELD_REFERENCE = 'reference'; @@ -108,6 +104,9 @@ class FHIRResourceReference extends FHIRElement */ protected $reference = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRResourceReference Constructor * @param null|array $data @@ -130,8 +129,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DISPLAY] instanceof FHIRString) { $this->setDisplay($data[self::FIELD_DISPLAY]); - } elseif ($ext && is_scalar($data[self::FIELD_DISPLAY])) { - $this->setDisplay(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DISPLAY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DISPLAY])) { + $this->setDisplay(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DISPLAY]] + $ext)); + } else if (is_array($data[self::FIELD_DISPLAY])) { + $this->setDisplay(new FHIRString(array_merge($ext, $data[self::FIELD_DISPLAY]))); + } } else { $this->setDisplay(new FHIRString($data[self::FIELD_DISPLAY])); } @@ -142,8 +145,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_REFERENCE] instanceof FHIRString) { $this->setReference($data[self::FIELD_REFERENCE]); - } elseif ($ext && is_scalar($data[self::FIELD_REFERENCE])) { - $this->setReference(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_REFERENCE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_REFERENCE])) { + $this->setReference(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_REFERENCE]] + $ext)); + } else if (is_array($data[self::FIELD_REFERENCE])) { + $this->setReference(new FHIRString(array_merge($ext, $data[self::FIELD_REFERENCE]))); + } } else { $this->setReference(new FHIRString($data[self::FIELD_REFERENCE])); } @@ -361,12 +368,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getDisplay())) { - $a[self::FIELD_DISPLAY] = $v->getValue(); - $a[self::FIELD_DISPLAY_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DISPLAY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DISPLAY_EXT] = $enc; + } + } else { + $a[self::FIELD_DISPLAY] = $v; + } } if (null !== ($v = $this->getReference())) { - $a[self::FIELD_REFERENCE] = $v->getValue(); - $a[self::FIELD_REFERENCE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_REFERENCE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_REFERENCE_EXT] = $enc; + } + } else { + $a[self::FIELD_REFERENCE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRResponseType.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRResponseType.php index 39eed699e3..280a28b56a 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRResponseType.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRResponseType.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -73,10 +73,6 @@ class FHIRResponseType extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_RESPONSE_TYPE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -84,6 +80,9 @@ class FHIRResponseType extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRResponseType Constructor * @param null|array $data @@ -239,8 +238,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRRestfulConformanceMode.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRRestfulConformanceMode.php index f0ff11811b..2e1437c666 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRRestfulConformanceMode.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRRestfulConformanceMode.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -73,10 +73,6 @@ class FHIRRestfulConformanceMode extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_RESTFUL_CONFORMANCE_MODE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -84,6 +80,9 @@ class FHIRRestfulConformanceMode extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRRestfulConformanceMode Constructor * @param null|array $data @@ -239,8 +238,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRRestfulOperationSystem.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRRestfulOperationSystem.php index 2de8849853..23aeac4da1 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRRestfulOperationSystem.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRRestfulOperationSystem.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -73,10 +73,6 @@ class FHIRRestfulOperationSystem extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_RESTFUL_OPERATION_SYSTEM; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -84,6 +80,9 @@ class FHIRRestfulOperationSystem extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRRestfulOperationSystem Constructor * @param null|array $data @@ -239,8 +238,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRRestfulOperationType.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRRestfulOperationType.php index 629e7e58bf..1d075976fa 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRRestfulOperationType.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRRestfulOperationType.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -73,10 +73,6 @@ class FHIRRestfulOperationType extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_RESTFUL_OPERATION_TYPE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -84,6 +80,9 @@ class FHIRRestfulOperationType extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRRestfulOperationType Constructor * @param null|array $data @@ -239,8 +238,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRSampledData.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRSampledData.php index dad74c406c..1375892f2b 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRSampledData.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRSampledData.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -74,10 +74,6 @@ class FHIRSampledData extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SAMPLED_DATA; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DATA = 'data'; const FIELD_DATA_EXT = '_data'; const FIELD_DIMENSIONS = 'dimensions'; @@ -171,6 +167,9 @@ class FHIRSampledData extends FHIRElement */ protected $upperLimit = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSampledData Constructor * @param null|array $data @@ -193,8 +192,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATA] instanceof FHIRSampledDataDataType) { $this->setData($data[self::FIELD_DATA]); - } elseif ($ext && is_scalar($data[self::FIELD_DATA])) { - $this->setData(new FHIRSampledDataDataType([FHIRSampledDataDataType::FIELD_VALUE => $data[self::FIELD_DATA]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATA])) { + $this->setData(new FHIRSampledDataDataType([FHIRSampledDataDataType::FIELD_VALUE => $data[self::FIELD_DATA]] + $ext)); + } else if (is_array($data[self::FIELD_DATA])) { + $this->setData(new FHIRSampledDataDataType(array_merge($ext, $data[self::FIELD_DATA]))); + } } else { $this->setData(new FHIRSampledDataDataType($data[self::FIELD_DATA])); } @@ -205,8 +208,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DIMENSIONS] instanceof FHIRInteger) { $this->setDimensions($data[self::FIELD_DIMENSIONS]); - } elseif ($ext && is_scalar($data[self::FIELD_DIMENSIONS])) { - $this->setDimensions(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_DIMENSIONS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DIMENSIONS])) { + $this->setDimensions(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_DIMENSIONS]] + $ext)); + } else if (is_array($data[self::FIELD_DIMENSIONS])) { + $this->setDimensions(new FHIRInteger(array_merge($ext, $data[self::FIELD_DIMENSIONS]))); + } } else { $this->setDimensions(new FHIRInteger($data[self::FIELD_DIMENSIONS])); } @@ -217,8 +224,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_FACTOR] instanceof FHIRDecimal) { $this->setFactor($data[self::FIELD_FACTOR]); - } elseif ($ext && is_scalar($data[self::FIELD_FACTOR])) { - $this->setFactor(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_FACTOR]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_FACTOR])) { + $this->setFactor(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_FACTOR]] + $ext)); + } else if (is_array($data[self::FIELD_FACTOR])) { + $this->setFactor(new FHIRDecimal(array_merge($ext, $data[self::FIELD_FACTOR]))); + } } else { $this->setFactor(new FHIRDecimal($data[self::FIELD_FACTOR])); } @@ -229,8 +240,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_LOWER_LIMIT] instanceof FHIRDecimal) { $this->setLowerLimit($data[self::FIELD_LOWER_LIMIT]); - } elseif ($ext && is_scalar($data[self::FIELD_LOWER_LIMIT])) { - $this->setLowerLimit(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_LOWER_LIMIT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_LOWER_LIMIT])) { + $this->setLowerLimit(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_LOWER_LIMIT]] + $ext)); + } else if (is_array($data[self::FIELD_LOWER_LIMIT])) { + $this->setLowerLimit(new FHIRDecimal(array_merge($ext, $data[self::FIELD_LOWER_LIMIT]))); + } } else { $this->setLowerLimit(new FHIRDecimal($data[self::FIELD_LOWER_LIMIT])); } @@ -241,8 +256,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ORIGIN] instanceof FHIRQuantity) { $this->setOrigin($data[self::FIELD_ORIGIN]); - } elseif ($ext && is_scalar($data[self::FIELD_ORIGIN])) { - $this->setOrigin(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_ORIGIN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ORIGIN])) { + $this->setOrigin(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_ORIGIN]] + $ext)); + } else if (is_array($data[self::FIELD_ORIGIN])) { + $this->setOrigin(new FHIRQuantity(array_merge($ext, $data[self::FIELD_ORIGIN]))); + } } else { $this->setOrigin(new FHIRQuantity($data[self::FIELD_ORIGIN])); } @@ -253,8 +272,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PERIOD] instanceof FHIRDecimal) { $this->setPeriod($data[self::FIELD_PERIOD]); - } elseif ($ext && is_scalar($data[self::FIELD_PERIOD])) { - $this->setPeriod(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_PERIOD]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PERIOD])) { + $this->setPeriod(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_PERIOD]] + $ext)); + } else if (is_array($data[self::FIELD_PERIOD])) { + $this->setPeriod(new FHIRDecimal(array_merge($ext, $data[self::FIELD_PERIOD]))); + } } else { $this->setPeriod(new FHIRDecimal($data[self::FIELD_PERIOD])); } @@ -265,8 +288,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_UPPER_LIMIT] instanceof FHIRDecimal) { $this->setUpperLimit($data[self::FIELD_UPPER_LIMIT]); - } elseif ($ext && is_scalar($data[self::FIELD_UPPER_LIMIT])) { - $this->setUpperLimit(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_UPPER_LIMIT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_UPPER_LIMIT])) { + $this->setUpperLimit(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_UPPER_LIMIT]] + $ext)); + } else if (is_array($data[self::FIELD_UPPER_LIMIT])) { + $this->setUpperLimit(new FHIRDecimal(array_merge($ext, $data[self::FIELD_UPPER_LIMIT]))); + } } else { $this->setUpperLimit(new FHIRDecimal($data[self::FIELD_UPPER_LIMIT])); } @@ -683,7 +710,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getLowerLimit())) { $v->xmlSerialize($sxe->addChild(self::FIELD_LOWER_LIMIT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOrigin())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ORIGIN, null, $v->_getFHIRXMLNamespace())); } @@ -703,31 +729,81 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getData())) { - $a[self::FIELD_DATA] = $v->getValue(); - $a[self::FIELD_DATA_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATA] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATA_EXT] = $enc; + } + } else { + $a[self::FIELD_DATA] = $v; + } } if (null !== ($v = $this->getDimensions())) { - $a[self::FIELD_DIMENSIONS] = $v->getValue(); - $a[self::FIELD_DIMENSIONS_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DIMENSIONS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DIMENSIONS_EXT] = $enc; + } + } else { + $a[self::FIELD_DIMENSIONS] = $v; + } } if (null !== ($v = $this->getFactor())) { - $a[self::FIELD_FACTOR] = $v->getValue(); - $a[self::FIELD_FACTOR_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FACTOR] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FACTOR_EXT] = $enc; + } + } else { + $a[self::FIELD_FACTOR] = $v; + } } if (null !== ($v = $this->getLowerLimit())) { - $a[self::FIELD_LOWER_LIMIT] = $v->getValue(); - $a[self::FIELD_LOWER_LIMIT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_LOWER_LIMIT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_LOWER_LIMIT_EXT] = $enc; + } + } else { + $a[self::FIELD_LOWER_LIMIT] = $v; + } } if (null !== ($v = $this->getOrigin())) { - $a[self::FIELD_ORIGIN] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ORIGIN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ORIGIN_EXT] = $enc; + } + } else { + $a[self::FIELD_ORIGIN] = $v; + } } if (null !== ($v = $this->getPeriod())) { - $a[self::FIELD_PERIOD] = $v->getValue(); - $a[self::FIELD_PERIOD_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PERIOD] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PERIOD_EXT] = $enc; + } + } else { + $a[self::FIELD_PERIOD] = $v; + } } if (null !== ($v = $this->getUpperLimit())) { - $a[self::FIELD_UPPER_LIMIT] = $v->getValue(); - $a[self::FIELD_UPPER_LIMIT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_UPPER_LIMIT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_UPPER_LIMIT_EXT] = $enc; + } + } else { + $a[self::FIELD_UPPER_LIMIT] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRSampledDataDataType.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRSampledDataDataType.php index d97838165f..2e289f9356 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRSampledDataDataType.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRSampledDataDataType.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -70,10 +70,6 @@ class FHIRSampledDataDataType extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SAMPLED_DATA_DATA_TYPE; - - /** @var string */ - protected $_xmlns = ''; - const FIELD_VALUE = 'value'; /** @@ -81,6 +77,8 @@ class FHIRSampledDataDataType extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; /** * FHIRSampledDataDataType Constructor @@ -238,8 +236,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRSchedule.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRSchedule.php index 16df07c18d..2b84ba70cb 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRSchedule.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRSchedule.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -75,10 +75,6 @@ class FHIRSchedule extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SCHEDULE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_EVENT = 'event'; const FIELD_REPEAT = 'repeat'; @@ -105,6 +101,9 @@ class FHIRSchedule extends FHIRElement */ protected $repeat = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSchedule Constructor * @param null|array $data @@ -124,6 +123,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_EVENT])) { if (is_array($data[self::FIELD_EVENT])) { foreach($data[self::FIELD_EVENT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRPeriod) { $this->addEvent($v); } else { @@ -340,7 +342,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getEvent())) { foreach($vs as $v) { if (null === $v) { diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRSchedule/FHIRScheduleRepeat.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRSchedule/FHIRScheduleRepeat.php index 672fe47f2e..c461c3ebc1 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRSchedule/FHIRScheduleRepeat.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRSchedule/FHIRScheduleRepeat.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRScheduleRepeat extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SCHEDULE_DOT_REPEAT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_COUNT = 'count'; const FIELD_COUNT_EXT = '_count'; const FIELD_DURATION = 'duration'; @@ -159,6 +155,9 @@ class FHIRScheduleRepeat extends FHIRElement */ protected $when = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRScheduleRepeat Constructor * @param null|array $data @@ -181,8 +180,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_COUNT] instanceof FHIRInteger) { $this->setCount($data[self::FIELD_COUNT]); - } elseif ($ext && is_scalar($data[self::FIELD_COUNT])) { - $this->setCount(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_COUNT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_COUNT])) { + $this->setCount(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_COUNT]] + $ext)); + } else if (is_array($data[self::FIELD_COUNT])) { + $this->setCount(new FHIRInteger(array_merge($ext, $data[self::FIELD_COUNT]))); + } } else { $this->setCount(new FHIRInteger($data[self::FIELD_COUNT])); } @@ -193,8 +196,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DURATION] instanceof FHIRDecimal) { $this->setDuration($data[self::FIELD_DURATION]); - } elseif ($ext && is_scalar($data[self::FIELD_DURATION])) { - $this->setDuration(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_DURATION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DURATION])) { + $this->setDuration(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_DURATION]] + $ext)); + } else if (is_array($data[self::FIELD_DURATION])) { + $this->setDuration(new FHIRDecimal(array_merge($ext, $data[self::FIELD_DURATION]))); + } } else { $this->setDuration(new FHIRDecimal($data[self::FIELD_DURATION])); } @@ -205,8 +212,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_END] instanceof FHIRDateTime) { $this->setEnd($data[self::FIELD_END]); - } elseif ($ext && is_scalar($data[self::FIELD_END])) { - $this->setEnd(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_END]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_END])) { + $this->setEnd(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_END]] + $ext)); + } else if (is_array($data[self::FIELD_END])) { + $this->setEnd(new FHIRDateTime(array_merge($ext, $data[self::FIELD_END]))); + } } else { $this->setEnd(new FHIRDateTime($data[self::FIELD_END])); } @@ -217,8 +228,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_FREQUENCY] instanceof FHIRInteger) { $this->setFrequency($data[self::FIELD_FREQUENCY]); - } elseif ($ext && is_scalar($data[self::FIELD_FREQUENCY])) { - $this->setFrequency(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_FREQUENCY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_FREQUENCY])) { + $this->setFrequency(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_FREQUENCY]] + $ext)); + } else if (is_array($data[self::FIELD_FREQUENCY])) { + $this->setFrequency(new FHIRInteger(array_merge($ext, $data[self::FIELD_FREQUENCY]))); + } } else { $this->setFrequency(new FHIRInteger($data[self::FIELD_FREQUENCY])); } @@ -229,8 +244,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_UNITS] instanceof FHIRUnitsOfTime) { $this->setUnits($data[self::FIELD_UNITS]); - } elseif ($ext && is_scalar($data[self::FIELD_UNITS])) { - $this->setUnits(new FHIRUnitsOfTime([FHIRUnitsOfTime::FIELD_VALUE => $data[self::FIELD_UNITS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_UNITS])) { + $this->setUnits(new FHIRUnitsOfTime([FHIRUnitsOfTime::FIELD_VALUE => $data[self::FIELD_UNITS]] + $ext)); + } else if (is_array($data[self::FIELD_UNITS])) { + $this->setUnits(new FHIRUnitsOfTime(array_merge($ext, $data[self::FIELD_UNITS]))); + } } else { $this->setUnits(new FHIRUnitsOfTime($data[self::FIELD_UNITS])); } @@ -241,8 +260,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_WHEN] instanceof FHIREventTiming) { $this->setWhen($data[self::FIELD_WHEN]); - } elseif ($ext && is_scalar($data[self::FIELD_WHEN])) { - $this->setWhen(new FHIREventTiming([FHIREventTiming::FIELD_VALUE => $data[self::FIELD_WHEN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_WHEN])) { + $this->setWhen(new FHIREventTiming([FHIREventTiming::FIELD_VALUE => $data[self::FIELD_WHEN]] + $ext)); + } else if (is_array($data[self::FIELD_WHEN])) { + $this->setWhen(new FHIREventTiming(array_merge($ext, $data[self::FIELD_WHEN]))); + } } else { $this->setWhen(new FHIREventTiming($data[self::FIELD_WHEN])); } @@ -596,11 +619,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getFrequency())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FREQUENCY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getUnits())) { $v->xmlSerialize($sxe->addChild(self::FIELD_UNITS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getWhen())) { $v->xmlSerialize($sxe->addChild(self::FIELD_WHEN, null, $v->_getFHIRXMLNamespace())); } @@ -614,26 +635,70 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getCount())) { - $a[self::FIELD_COUNT] = $v->getValue(); - $a[self::FIELD_COUNT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_COUNT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_COUNT_EXT] = $enc; + } + } else { + $a[self::FIELD_COUNT] = $v; + } } if (null !== ($v = $this->getDuration())) { - $a[self::FIELD_DURATION] = $v->getValue(); - $a[self::FIELD_DURATION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DURATION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DURATION_EXT] = $enc; + } + } else { + $a[self::FIELD_DURATION] = $v; + } } if (null !== ($v = $this->getEnd())) { - $a[self::FIELD_END] = $v->getValue(); - $a[self::FIELD_END_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_END] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_END_EXT] = $enc; + } + } else { + $a[self::FIELD_END] = $v; + } } if (null !== ($v = $this->getFrequency())) { - $a[self::FIELD_FREQUENCY] = $v->getValue(); - $a[self::FIELD_FREQUENCY_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FREQUENCY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FREQUENCY_EXT] = $enc; + } + } else { + $a[self::FIELD_FREQUENCY] = $v; + } } if (null !== ($v = $this->getUnits())) { - $a[self::FIELD_UNITS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_UNITS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_UNITS_EXT] = $enc; + } + } else { + $a[self::FIELD_UNITS] = $v; + } } if (null !== ($v = $this->getWhen())) { - $a[self::FIELD_WHEN] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_WHEN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_WHEN_EXT] = $enc; + } + } else { + $a[self::FIELD_WHEN] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRSearchParamType.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRSearchParamType.php index ed73d51598..c101a08398 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRSearchParamType.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRSearchParamType.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -72,10 +72,6 @@ class FHIRSearchParamType extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SEARCH_PARAM_TYPE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -83,6 +79,9 @@ class FHIRSearchParamType extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSearchParamType Constructor * @param null|array $data @@ -238,8 +237,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRSecurityEventAction.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRSecurityEventAction.php index 1b209042e6..7d75e427ef 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRSecurityEventAction.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRSecurityEventAction.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -74,10 +74,6 @@ class FHIRSecurityEventAction extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SECURITY_EVENT_ACTION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -85,6 +81,9 @@ class FHIRSecurityEventAction extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSecurityEventAction Constructor * @param null|array $data @@ -240,8 +239,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRSecurityEventObjectLifecycle.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRSecurityEventObjectLifecycle.php index 417004b8af..33794751d9 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRSecurityEventObjectLifecycle.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRSecurityEventObjectLifecycle.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -73,10 +73,6 @@ class FHIRSecurityEventObjectLifecycle extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SECURITY_EVENT_OBJECT_LIFECYCLE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -84,6 +80,9 @@ class FHIRSecurityEventObjectLifecycle extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSecurityEventObjectLifecycle Constructor * @param null|array $data @@ -239,8 +238,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRSecurityEventObjectRole.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRSecurityEventObjectRole.php index 75912c467d..cfde36e405 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRSecurityEventObjectRole.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRSecurityEventObjectRole.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -74,10 +74,6 @@ class FHIRSecurityEventObjectRole extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SECURITY_EVENT_OBJECT_ROLE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -85,6 +81,9 @@ class FHIRSecurityEventObjectRole extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSecurityEventObjectRole Constructor * @param null|array $data @@ -240,8 +239,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRSecurityEventObjectType.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRSecurityEventObjectType.php index 2aa3f595eb..74e09b0bf5 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRSecurityEventObjectType.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRSecurityEventObjectType.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -73,10 +73,6 @@ class FHIRSecurityEventObjectType extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SECURITY_EVENT_OBJECT_TYPE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -84,6 +80,9 @@ class FHIRSecurityEventObjectType extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSecurityEventObjectType Constructor * @param null|array $data @@ -239,8 +238,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRSecurityEventOutcome.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRSecurityEventOutcome.php index d7df5bc881..a7670c07cf 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRSecurityEventOutcome.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRSecurityEventOutcome.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -73,10 +73,6 @@ class FHIRSecurityEventOutcome extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SECURITY_EVENT_OUTCOME; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -84,6 +80,9 @@ class FHIRSecurityEventOutcome extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSecurityEventOutcome Constructor * @param null|array $data @@ -239,8 +238,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRSecurityEventParticipantNetworkType.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRSecurityEventParticipantNetworkType.php index bdcc126619..b864892e8a 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRSecurityEventParticipantNetworkType.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRSecurityEventParticipantNetworkType.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -73,10 +73,6 @@ class FHIRSecurityEventParticipantNetworkType extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SECURITY_EVENT_PARTICIPANT_NETWORK_TYPE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -84,6 +80,9 @@ class FHIRSecurityEventParticipantNetworkType extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSecurityEventParticipantNetworkType Constructor * @param null|array $data @@ -239,8 +238,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRSensitivityStatus.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRSensitivityStatus.php index 1fa380a2e6..ac9060d32a 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRSensitivityStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRSensitivityStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -73,10 +73,6 @@ class FHIRSensitivityStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SENSITIVITY_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -84,6 +80,9 @@ class FHIRSensitivityStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSensitivityStatus Constructor * @param null|array $data @@ -239,8 +238,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRSensitivityType.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRSensitivityType.php index 8e42195d89..07295ccb7d 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRSensitivityType.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRSensitivityType.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -73,10 +73,6 @@ class FHIRSensitivityType extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SENSITIVITY_TYPE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -84,6 +80,9 @@ class FHIRSensitivityType extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSensitivityType Constructor * @param null|array $data @@ -239,8 +238,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRSlicingRules.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRSlicingRules.php index 305847fdf5..075419e067 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRSlicingRules.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRSlicingRules.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -73,10 +73,6 @@ class FHIRSlicingRules extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SLICING_RULES; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -84,6 +80,9 @@ class FHIRSlicingRules extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSlicingRules Constructor * @param null|array $data @@ -239,8 +238,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRString.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRString.php index fc9ba68ca0..58c9a9069e 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRString.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRString.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -73,10 +73,6 @@ class FHIRString extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_STRING; - - /** @var string */ - protected $_xmlns = ''; - const FIELD_VALUE = 'value'; /** @@ -84,6 +80,8 @@ class FHIRString extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; /** * FHIRString Constructor @@ -241,8 +239,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRSupplyDispenseStatus.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRSupplyDispenseStatus.php index 333ea1ed8b..1b232d1aec 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRSupplyDispenseStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRSupplyDispenseStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -73,10 +73,6 @@ class FHIRSupplyDispenseStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SUPPLY_DISPENSE_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -84,6 +80,9 @@ class FHIRSupplyDispenseStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSupplyDispenseStatus Constructor * @param null|array $data @@ -239,8 +238,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRSupplyStatus.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRSupplyStatus.php index 0816407bf6..cd0229dcb8 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRSupplyStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRSupplyStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -73,10 +73,6 @@ class FHIRSupplyStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SUPPLY_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -84,6 +80,9 @@ class FHIRSupplyStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSupplyStatus Constructor * @param null|array $data @@ -239,8 +238,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRUnitsOfTime.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRUnitsOfTime.php index 6fbcb456f5..05fcdf672b 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRUnitsOfTime.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRUnitsOfTime.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -73,10 +73,6 @@ class FHIRUnitsOfTime extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_UNITS_OF_TIME; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -84,6 +80,9 @@ class FHIRUnitsOfTime extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRUnitsOfTime Constructor * @param null|array $data @@ -239,8 +238,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRUri.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRUri.php index 15a04e8788..20eed2630d 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRUri.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRUri.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -73,10 +73,6 @@ class FHIRUri extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_URI; - - /** @var string */ - protected $_xmlns = ''; - const FIELD_VALUE = 'value'; /** @@ -84,6 +80,8 @@ class FHIRUri extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; /** * FHIRUri Constructor @@ -241,8 +239,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRUuid.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRUuid.php index d35f54c1e8..993d71ac86 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRUuid.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRUuid.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -74,10 +74,6 @@ class FHIRUuid extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_UUID; - - /** @var string */ - protected $_xmlns = ''; - const FIELD_VALUE = 'value'; /** @@ -85,6 +81,8 @@ class FHIRUuid extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; /** * FHIRUuid Constructor @@ -242,8 +240,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRValueSetStatus.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRValueSetStatus.php index 2e1a694289..3ac1006093 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRValueSetStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRElement/FHIRValueSetStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -72,10 +72,6 @@ class FHIRValueSetStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_VALUE_SET_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -83,6 +79,9 @@ class FHIRValueSetStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRValueSetStatus Constructor * @param null|array $data @@ -238,8 +237,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIREncounterClassList.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIREncounterClassList.php index adc7ce56f7..bbfb229d5e 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIREncounterClassList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIREncounterClassList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -246,6 +246,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIREncounterStateList.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIREncounterStateList.php index 3f2091d65c..e963e41233 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIREncounterStateList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIREncounterStateList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -243,6 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIREventTimingList.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIREventTimingList.php index 1cc543a4c2..dcf36d8cf2 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIREventTimingList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIREventTimingList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -248,6 +248,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRExposureTypeList.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRExposureTypeList.php index 0aae97368f..3714aff2cf 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRExposureTypeList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRExposureTypeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -241,6 +241,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRExtensionContextList.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRExtensionContextList.php index abd1cdf783..8119ef291c 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRExtensionContextList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRExtensionContextList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -242,6 +242,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRFilterOperatorList.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRFilterOperatorList.php index 7c9c316913..1d648e3780 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRFilterOperatorList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRFilterOperatorList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -244,6 +244,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRGroupTypeList.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRGroupTypeList.php index 2b0574c299..5accf6a728 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRGroupTypeList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRGroupTypeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -244,6 +244,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRHierarchicalRelationshipTypeList.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRHierarchicalRelationshipTypeList.php index ef27eac3a0..2182e4e82f 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRHierarchicalRelationshipTypeList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRHierarchicalRelationshipTypeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -240,6 +240,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRIdPrimitive.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRIdPrimitive.php index 9842003e85..dee3fd854a 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRIdPrimitive.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRIdPrimitive.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -224,6 +224,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRIdPrimitive/FHIRXmlIdRef.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRIdPrimitive/FHIRXmlIdRef.php index 286debbc99..869e684d2f 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRIdPrimitive/FHIRXmlIdRef.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRIdPrimitive/FHIRXmlIdRef.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -69,6 +69,7 @@ class FHIRXmlIdRef extends FHIRIdPrimitive { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_XML_ID_REF; + const FIELD_FHIR_COMMENTS = 'fhir_comments'; /** @var string */ protected $_xmlns = 'http://hl7.org/fhir'; @@ -89,6 +90,13 @@ public function __construct($data = null) )); } parent::__construct($data); + if (isset($data[self::FIELD_FHIR_COMMENTS])) { + if (is_array($data[self::FIELD_FHIR_COMMENTS])) { + $this->_setFHIRComments($data[self::FIELD_FHIR_COMMENTS]); + } else if (is_string($data[self::FIELD_FHIR_COMMENTS])) { + $this->_addFHIRComment($data[self::FIELD_FHIR_COMMENTS]); + } + } } /** @@ -197,6 +205,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 public function jsonSerialize() { $a = parent::jsonSerialize(); + if ([] !== ($vs = $this->_getFHIRComments())) { + $a[self::FIELD_FHIR_COMMENTS] = $vs; + } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRIdentifierUseList.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRIdentifierUseList.php index 97f129f6b3..0a1edec957 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRIdentifierUseList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRIdentifierUseList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -242,6 +242,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRImagingModalityList.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRImagingModalityList.php index 4781dfacd7..479f75d37e 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRImagingModalityList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRImagingModalityList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -274,6 +274,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRInstanceAvailabilityList.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRInstanceAvailabilityList.php index 7093ee90ed..6ef078a0f6 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRInstanceAvailabilityList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRInstanceAvailabilityList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -242,6 +242,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRInstantPrimitive.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRInstantPrimitive.php index 24bbc1e7f0..3a82e365c4 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRInstantPrimitive.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRInstantPrimitive.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -251,6 +251,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRIntegerPrimitive.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRIntegerPrimitive.php index cbd14b8d25..eb104004f0 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRIntegerPrimitive.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRIntegerPrimitive.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -239,6 +239,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRIssueSeverityList.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRIssueSeverityList.php index 2edaf1919c..892409cd33 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRIssueSeverityList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRIssueSeverityList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -242,6 +242,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRLinkTypeList.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRLinkTypeList.php index 64fe552eee..a2f631c596 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRLinkTypeList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRLinkTypeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -241,6 +241,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRListModeList.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRListModeList.php index 596f256aa7..7e7a46313f 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRListModeList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRListModeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -241,6 +241,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRLocationModeList.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRLocationModeList.php index 4e43797033..e40b922177 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRLocationModeList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRLocationModeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -240,6 +240,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRLocationStatusList.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRLocationStatusList.php index 2db4c3fe0a..623f8cf3fe 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRLocationStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRLocationStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -241,6 +241,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRMediaTypeList.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRMediaTypeList.php index 088b8c2114..d14ee92e8c 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRMediaTypeList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRMediaTypeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -241,6 +241,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRMedicationAdministrationStatusList.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRMedicationAdministrationStatusList.php index 3f57ff9cec..fc219fd260 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRMedicationAdministrationStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRMedicationAdministrationStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -243,6 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRMedicationDispenseStatusList.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRMedicationDispenseStatusList.php index 85483ae054..f2d228d1bf 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRMedicationDispenseStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRMedicationDispenseStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -243,6 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRMedicationKindList.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRMedicationKindList.php index da11e52507..fa8a2090dd 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRMedicationKindList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRMedicationKindList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -240,6 +240,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRMedicationPrescriptionStatusList.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRMedicationPrescriptionStatusList.php index 0141e3bc1e..2422e5930b 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRMedicationPrescriptionStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRMedicationPrescriptionStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -244,6 +244,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRMessageSignificanceCategoryList.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRMessageSignificanceCategoryList.php index 38f829964e..8346f9ce4a 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRMessageSignificanceCategoryList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRMessageSignificanceCategoryList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -241,6 +241,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRModalityList.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRModalityList.php index f87aae07dc..77190ee9a8 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRModalityList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRModalityList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -291,6 +291,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRNameUseList.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRNameUseList.php index a45e835193..2a57e1e5bf 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRNameUseList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRNameUseList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -245,6 +245,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRNarrativeStatusList.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRNarrativeStatusList.php index a962aa5d90..db6ef5ba47 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRNarrativeStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRNarrativeStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -242,6 +242,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRObservationRelationshipTypeList.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRObservationRelationshipTypeList.php index f308e89e49..82dd5bc0c6 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRObservationRelationshipTypeList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRObservationRelationshipTypeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -245,6 +245,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRObservationReliabilityList.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRObservationReliabilityList.php index 77cd1fbf9a..0e96c44763 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRObservationReliabilityList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRObservationReliabilityList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -245,6 +245,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRObservationStatusList.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRObservationStatusList.php index da16928021..e6a76b4f6f 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRObservationStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRObservationStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -244,6 +244,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIROidPrimitive.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIROidPrimitive.php index 47e9b6b0dc..04cfe7e67b 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIROidPrimitive.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIROidPrimitive.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -224,6 +224,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIROrderOutcomeStatusList.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIROrderOutcomeStatusList.php index aa83524816..29da5fd083 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIROrderOutcomeStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIROrderOutcomeStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -247,6 +247,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRProcedureRelationshipTypeList.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRProcedureRelationshipTypeList.php index 7cf3e96d00..8535cb98ff 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRProcedureRelationshipTypeList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRProcedureRelationshipTypeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -240,6 +240,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRPropertyRepresentationList.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRPropertyRepresentationList.php index a05b62a5f0..099a50da1e 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRPropertyRepresentationList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRPropertyRepresentationList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -239,6 +239,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRProvenanceEntityRoleList.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRProvenanceEntityRoleList.php index 4be8228594..5beb776896 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRProvenanceEntityRoleList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRProvenanceEntityRoleList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -242,6 +242,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRQuantityCompararatorList.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRQuantityCompararatorList.php index fa7e60b9db..e22a53b30b 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRQuantityCompararatorList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRQuantityCompararatorList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -242,6 +242,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRQueryOutcomeList.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRQueryOutcomeList.php index 778cf356ca..f922c5afa2 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRQueryOutcomeList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRQueryOutcomeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -242,6 +242,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRQuestionnaireStatusList.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRQuestionnaireStatusList.php index 49bd9e584b..fca562bdd0 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRQuestionnaireStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRQuestionnaireStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -244,6 +244,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRReactionSeverityList.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRReactionSeverityList.php index 2bb578e656..19358a2285 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRReactionSeverityList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRReactionSeverityList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -242,6 +242,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRResourceInline.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRResourceInline.php index b571173dac..d18c105900 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRResourceInline.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRResourceInline.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -116,9 +116,7 @@ class FHIRResourceInline implements PHPFHIRCommentContainerInterface, PHPFHIRTyp // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_RESOURCE_DOT_INLINE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; + const FIELD_FHIR_COMMENTS = 'fhir_comments'; const FIELD_ADVERSE_REACTION = 'AdverseReaction'; const FIELD_ALERT = 'Alert'; @@ -624,6 +622,9 @@ class FHIRResourceInline implements PHPFHIRCommentContainerInterface, PHPFHIRTyp */ protected $ValueSet = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRResourceInline Constructor * @param null|array $data @@ -639,6 +640,13 @@ public function __construct($data = null) gettype($data) )); } + if (isset($data[self::FIELD_FHIR_COMMENTS])) { + if (is_array($data[self::FIELD_FHIR_COMMENTS])) { + $this->_setFHIRComments($data[self::FIELD_FHIR_COMMENTS]); + } else if (is_string($data[self::FIELD_FHIR_COMMENTS])) { + $this->_addFHIRComment($data[self::FIELD_FHIR_COMMENTS]); + } + } if (isset($data[self::FIELD_ADVERSE_REACTION])) { if ($data[self::FIELD_ADVERSE_REACTION] instanceof FHIRAdverseReaction) { $this->setAdverseReaction($data[self::FIELD_ADVERSE_REACTION]); @@ -2724,6 +2732,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRResourceProfileStatusList.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRResourceProfileStatusList.php index 3330c2cecb..df5e77ee23 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRResourceProfileStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRResourceProfileStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -241,6 +241,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRResourceType.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRResourceType.php index 4146164254..63f84f5b67 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRResourceType.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRResourceType.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -286,6 +286,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRResourceType/FHIRResourceNamesPlusBinary.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRResourceType/FHIRResourceNamesPlusBinary.php index 555fcbb7a1..dc275e9ff3 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRResourceType/FHIRResourceNamesPlusBinary.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRResourceType/FHIRResourceNamesPlusBinary.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -69,6 +69,7 @@ class FHIRResourceNamesPlusBinary extends FHIRResourceType { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_RESOURCE_NAMES_PLUS_BINARY; + const FIELD_FHIR_COMMENTS = 'fhir_comments'; /** @var string */ protected $_xmlns = 'http://hl7.org/fhir'; @@ -89,6 +90,13 @@ public function __construct($data = null) )); } parent::__construct($data); + if (isset($data[self::FIELD_FHIR_COMMENTS])) { + if (is_array($data[self::FIELD_FHIR_COMMENTS])) { + $this->_setFHIRComments($data[self::FIELD_FHIR_COMMENTS]); + } else if (is_string($data[self::FIELD_FHIR_COMMENTS])) { + $this->_addFHIRComment($data[self::FIELD_FHIR_COMMENTS]); + } + } } /** @@ -197,6 +205,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 public function jsonSerialize() { $a = parent::jsonSerialize(); + if ([] !== ($vs = $this->_getFHIRComments())) { + $a[self::FIELD_FHIR_COMMENTS] = $vs; + } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRResponseTypeList.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRResponseTypeList.php index 2332fc9d13..48e9c9adf1 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRResponseTypeList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRResponseTypeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -241,6 +241,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRRestfulConformanceModeList.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRRestfulConformanceModeList.php index e643048aaa..11efbeed03 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRRestfulConformanceModeList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRRestfulConformanceModeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -240,6 +240,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRRestfulOperationSystemList.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRRestfulOperationSystemList.php index 9189542fcb..175c3d2cf7 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRRestfulOperationSystemList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRRestfulOperationSystemList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -241,6 +241,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRRestfulOperationTypeList.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRRestfulOperationTypeList.php index 01d73f0741..5b8e76c0e8 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRRestfulOperationTypeList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRRestfulOperationTypeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -247,6 +247,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRSampledDataDataTypePrimitive.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRSampledDataDataTypePrimitive.php index 98d0090d1f..191afdc517 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRSampledDataDataTypePrimitive.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRSampledDataDataTypePrimitive.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -224,6 +224,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRSearchParamTypeList.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRSearchParamTypeList.php index ff2857bd96..c6b05bbf15 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRSearchParamTypeList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRSearchParamTypeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -245,6 +245,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRSecurityEventActionList.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRSecurityEventActionList.php index e2e754c2c1..ba436ddc43 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRSecurityEventActionList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRSecurityEventActionList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -243,6 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRSecurityEventObjectLifecycleList.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRSecurityEventObjectLifecycleList.php index 19983233e0..1d05becb57 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRSecurityEventObjectLifecycleList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRSecurityEventObjectLifecycleList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -253,6 +253,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRSecurityEventObjectRoleList.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRSecurityEventObjectRoleList.php index 624262cd5d..a75256841b 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRSecurityEventObjectRoleList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRSecurityEventObjectRoleList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -262,6 +262,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRSecurityEventObjectTypeList.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRSecurityEventObjectTypeList.php index 40f9b138c4..48f436bdf1 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRSecurityEventObjectTypeList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRSecurityEventObjectTypeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -242,6 +242,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRSecurityEventOutcomeList.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRSecurityEventOutcomeList.php index ace87f992c..44d5d5601c 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRSecurityEventOutcomeList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRSecurityEventOutcomeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -242,6 +242,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRSecurityEventParticipantNetworkTypeList.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRSecurityEventParticipantNetworkTypeList.php index 4ebf4908e0..6691b4b2e4 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRSecurityEventParticipantNetworkTypeList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRSecurityEventParticipantNetworkTypeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -243,6 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRSensitivityStatusList.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRSensitivityStatusList.php index 4f2389bab8..aa91a53227 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRSensitivityStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRSensitivityStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -242,6 +242,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRSensitivityTypeList.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRSensitivityTypeList.php index 1f8e354d7b..ece1171f89 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRSensitivityTypeList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRSensitivityTypeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -241,6 +241,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRSlicingRulesList.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRSlicingRulesList.php index 65e63bbdb4..21627609ac 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRSlicingRulesList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRSlicingRulesList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -241,6 +241,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRStringPrimitive.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRStringPrimitive.php index bcd9bd52b8..278022385d 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRStringPrimitive.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRStringPrimitive.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -224,6 +224,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRSupplyDispenseStatusList.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRSupplyDispenseStatusList.php index be508e4cdd..ffb1af05ab 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRSupplyDispenseStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRSupplyDispenseStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -241,6 +241,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRSupplyStatusList.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRSupplyStatusList.php index 2055354a25..ac916a3d61 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRSupplyStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRSupplyStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -243,6 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRUnitsOfTimeList.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRUnitsOfTimeList.php index 5acfece8b0..cb6b01514c 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRUnitsOfTimeList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRUnitsOfTimeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -245,6 +245,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRUriPrimitive.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRUriPrimitive.php index 55dd9a339e..763054a415 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRUriPrimitive.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRUriPrimitive.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -224,6 +224,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRUuidPrimitive.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRUuidPrimitive.php index 256713255a..4378853c7f 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRUuidPrimitive.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRUuidPrimitive.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -224,6 +224,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRValueSetStatusList.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRValueSetStatusList.php index 24dcc54911..58a279f2bd 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRValueSetStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/FHIRValueSetStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -241,6 +241,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRAutoloader.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRAutoloader.php index d71372059e..7f41f7777e 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRAutoloader.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRAutoloader.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRCommentContainerInterface.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRCommentContainerInterface.php index 17ad38b4c1..42bd0f8da4 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRCommentContainerInterface.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRCommentContainerInterface.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRCommentContainerTrait.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRCommentContainerTrait.php index 1923ebbcd8..6816632334 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRCommentContainerTrait.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRCommentContainerTrait.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -64,7 +64,7 @@ trait PHPFHIRCommentContainerTrait { /** @var array */ - private $_fhirComments = []; + protected $_fhirComments = []; /** * Arbitrary comments of a hopefully useful nature diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRConstants.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRConstants.php index 7bc91bc411..857105059a 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRConstants.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRConstants.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -68,7 +68,7 @@ abstract class PHPFHIRConstants const SOURCE_GENERATION_DATE = 'Tue, Sep 30, 2014 18:08+1000'; // PHPFHIR - const CODE_GENERATION_DATE = 'November 10th, 2019 18:12+0000'; + const CODE_GENERATION_DATE = 'November 17th, 2019 04:21+0000'; // Common const JSON_FIELD_RESOURCE_TYPE = 'resourceType'; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRContainedTypeInterface.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRContainedTypeInterface.php index afa8e9ef5a..79d474a3be 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRContainedTypeInterface.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRContainedTypeInterface.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRResponseParser.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRResponseParser.php index 29c5b6d656..882c35bf03 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRResponseParser.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRResponseParser.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRResponseParserConfig.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRResponseParserConfig.php index 05e0f0931b..908411f53e 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRResponseParserConfig.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRResponseParserConfig.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRAddressUseListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRAddressUseListTest.php index 22c6b5680f..5f296bf287 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRAddressUseListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRAddressUseListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRAggregationModeListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRAggregationModeListTest.php index 812329c62b..17286584ba 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRAggregationModeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRAggregationModeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRAlertStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRAlertStatusListTest.php index 27460fcab7..49489aba18 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRAlertStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRAlertStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRBase64BinaryPrimitiveTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRBase64BinaryPrimitiveTest.php index b443970125..e968a2578e 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRBase64BinaryPrimitiveTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRBase64BinaryPrimitiveTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRBinaryTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRBinaryTest.php index 711c687c93..8df27e7857 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRBinaryTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRBinaryTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRBindingConformanceListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRBindingConformanceListTest.php index 9c119d3d98..90f8bd4d79 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRBindingConformanceListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRBindingConformanceListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRBooleanPrimitiveTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRBooleanPrimitiveTest.php index e46bf21427..bced2e580d 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRBooleanPrimitiveTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRBooleanPrimitiveTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRCarePlanActivityCategoryListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRCarePlanActivityCategoryListTest.php index 91a353f8eb..66090f4485 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRCarePlanActivityCategoryListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRCarePlanActivityCategoryListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRCarePlanActivityStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRCarePlanActivityStatusListTest.php index 964c74b135..9eed4bc1d0 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRCarePlanActivityStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRCarePlanActivityStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRCarePlanGoalStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRCarePlanGoalStatusListTest.php index 46d09f3a9d..e8f5c24b8a 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRCarePlanGoalStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRCarePlanGoalStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRCarePlanStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRCarePlanStatusListTest.php index 2714ce3b4b..5cec02e684 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRCarePlanStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRCarePlanStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRCausalityExpectationListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRCausalityExpectationListTest.php index af3065ac89..317eb2f4e4 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRCausalityExpectationListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRCausalityExpectationListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRCodePrimitiveTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRCodePrimitiveTest.php index 464331cb3e..293ff5fd46 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRCodePrimitiveTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRCodePrimitiveTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRCompositionAttestationModeListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRCompositionAttestationModeListTest.php index 6025a0cb26..4cbeb15a16 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRCompositionAttestationModeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRCompositionAttestationModeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRCompositionStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRCompositionStatusListTest.php index 59be591d44..55f861600f 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRCompositionStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRCompositionStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRConceptMapEquivalenceListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRConceptMapEquivalenceListTest.php index d427ea50d6..3f2c75c03d 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRConceptMapEquivalenceListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRConceptMapEquivalenceListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRConditionRelationshipTypeListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRConditionRelationshipTypeListTest.php index e566468ecc..5e2bfc4423 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRConditionRelationshipTypeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRConditionRelationshipTypeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRConditionStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRConditionStatusListTest.php index d430896ff7..4401e38eec 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRConditionStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRConditionStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRConformanceEventModeListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRConformanceEventModeListTest.php index 2cf82ea605..1a5473b3ba 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRConformanceEventModeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRConformanceEventModeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRConformanceStatementStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRConformanceStatementStatusListTest.php index 26bd450cf0..3b13f3a1b8 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRConformanceStatementStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRConformanceStatementStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRConstraintSeverityListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRConstraintSeverityListTest.php index c8482df210..30f2b1a96b 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRConstraintSeverityListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRConstraintSeverityListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRContactSystemListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRContactSystemListTest.php index d86129fdd1..45355a6aaf 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRContactSystemListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRContactSystemListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRContactUseListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRContactUseListTest.php index 80e641439b..4f88b2c7a0 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRContactUseListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRContactUseListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRCriticalityListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRCriticalityListTest.php index f7284fa8ac..cc79e46c8d 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRCriticalityListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRCriticalityListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRDatePrimitiveTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRDatePrimitiveTest.php index de17b889b6..6cb6a19eea 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRDatePrimitiveTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRDatePrimitiveTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRDateTimePrimitiveTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRDateTimePrimitiveTest.php index 0b73e76db2..07bcde01ba 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRDateTimePrimitiveTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRDateTimePrimitiveTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRDecimalPrimitiveTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRDecimalPrimitiveTest.php index f0d2448462..86509a7e8f 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRDecimalPrimitiveTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRDecimalPrimitiveTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRDiagnosticOrderPriorityListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRDiagnosticOrderPriorityListTest.php index d29933ba0f..3c540a95af 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRDiagnosticOrderPriorityListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRDiagnosticOrderPriorityListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRDiagnosticOrderStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRDiagnosticOrderStatusListTest.php index b8d423f40c..6511027ef9 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRDiagnosticOrderStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRDiagnosticOrderStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRDiagnosticReportStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRDiagnosticReportStatusListTest.php index af541954e2..74a5eec154 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRDiagnosticReportStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRDiagnosticReportStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRDocumentModeListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRDocumentModeListTest.php index 5b68819d65..87157065d2 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRDocumentModeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRDocumentModeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRDocumentReferenceStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRDocumentReferenceStatusListTest.php index 0aa3ee6e07..7d7563c8d3 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRDocumentReferenceStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRDocumentReferenceStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRDocumentRelationshipTypeListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRDocumentRelationshipTypeListTest.php index ebb3b63c22..67578cfccd 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRDocumentRelationshipTypeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRDocumentRelationshipTypeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRAddressTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRAddressTest.php index ecea05297b..ef089db96b 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRAddressTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRAddressTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRAddressUseTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRAddressUseTest.php index 4f8a98eef7..8895812414 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRAddressUseTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRAddressUseTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRAggregationModeTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRAggregationModeTest.php index 8ce990a00d..0bb5d55496 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRAggregationModeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRAggregationModeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRAlertStatusTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRAlertStatusTest.php index 55fd828aa0..13f9657a6b 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRAlertStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRAlertStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRAttachmentTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRAttachmentTest.php index ca14a73d35..27ad868692 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRAttachmentTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRAttachmentTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRAdverseReaction/FHIRAdverseReactionExposureTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRAdverseReaction/FHIRAdverseReactionExposureTest.php index 8b87759d32..f8342cc40c 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRAdverseReaction/FHIRAdverseReactionExposureTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRAdverseReaction/FHIRAdverseReactionExposureTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRAdverseReaction/FHIRAdverseReactionSymptomTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRAdverseReaction/FHIRAdverseReactionSymptomTest.php index db6f224e34..b2ab37e382 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRAdverseReaction/FHIRAdverseReactionSymptomTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRAdverseReaction/FHIRAdverseReactionSymptomTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCarePlan/FHIRCarePlanActivityTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCarePlan/FHIRCarePlanActivityTest.php index e6cac477d2..b455a20aa6 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCarePlan/FHIRCarePlanActivityTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCarePlan/FHIRCarePlanActivityTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCarePlan/FHIRCarePlanGoalTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCarePlan/FHIRCarePlanGoalTest.php index b0f19003af..4b2960eca7 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCarePlan/FHIRCarePlanGoalTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCarePlan/FHIRCarePlanGoalTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCarePlan/FHIRCarePlanParticipantTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCarePlan/FHIRCarePlanParticipantTest.php index a1a7b70d50..f03d46a50e 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCarePlan/FHIRCarePlanParticipantTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCarePlan/FHIRCarePlanParticipantTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCarePlan/FHIRCarePlanSimpleTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCarePlan/FHIRCarePlanSimpleTest.php index 886f482653..4ce89b15e7 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCarePlan/FHIRCarePlanSimpleTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCarePlan/FHIRCarePlanSimpleTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRComposition/FHIRCompositionAttesterTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRComposition/FHIRCompositionAttesterTest.php index 3e096d4bb1..73b17502b8 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRComposition/FHIRCompositionAttesterTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRComposition/FHIRCompositionAttesterTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRComposition/FHIRCompositionEventTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRComposition/FHIRCompositionEventTest.php index de0bcb087c..f4b0b720ae 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRComposition/FHIRCompositionEventTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRComposition/FHIRCompositionEventTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRComposition/FHIRCompositionSectionTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRComposition/FHIRCompositionSectionTest.php index ac70f210c9..61ee13f2b1 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRComposition/FHIRCompositionSectionTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRComposition/FHIRCompositionSectionTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConceptMap/FHIRConceptMapConceptTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConceptMap/FHIRConceptMapConceptTest.php index cd78c262b5..7d416b6813 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConceptMap/FHIRConceptMapConceptTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConceptMap/FHIRConceptMapConceptTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConceptMap/FHIRConceptMapDependsOnTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConceptMap/FHIRConceptMapDependsOnTest.php index 4bdebe96fd..9104dad3ad 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConceptMap/FHIRConceptMapDependsOnTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConceptMap/FHIRConceptMapDependsOnTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConceptMap/FHIRConceptMapMapTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConceptMap/FHIRConceptMapMapTest.php index 31b4e97702..97194d58ea 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConceptMap/FHIRConceptMapMapTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConceptMap/FHIRConceptMapMapTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCondition/FHIRConditionEvidenceTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCondition/FHIRConditionEvidenceTest.php index d6bea0fbf4..692d3b0c7d 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCondition/FHIRConditionEvidenceTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCondition/FHIRConditionEvidenceTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCondition/FHIRConditionLocationTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCondition/FHIRConditionLocationTest.php index 53122d34bc..e3467ddf0f 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCondition/FHIRConditionLocationTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCondition/FHIRConditionLocationTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCondition/FHIRConditionRelatedItemTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCondition/FHIRConditionRelatedItemTest.php index 8cc188f996..90e5059bb1 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCondition/FHIRConditionRelatedItemTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCondition/FHIRConditionRelatedItemTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCondition/FHIRConditionStageTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCondition/FHIRConditionStageTest.php index 9a183cea12..f3123f1181 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCondition/FHIRConditionStageTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCondition/FHIRConditionStageTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceCertificateTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceCertificateTest.php index a4a172c8bc..a4b660e596 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceCertificateTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceCertificateTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceDocumentTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceDocumentTest.php index 23284aeec1..6e74e1182f 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceDocumentTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceDocumentTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceEventTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceEventTest.php index 508936a3af..c5291c8185 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceEventTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceEventTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceImplementationTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceImplementationTest.php index 3d1e80790f..6f55b57645 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceImplementationTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceImplementationTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceMessagingTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceMessagingTest.php index 80caea7686..157eca9d50 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceMessagingTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceMessagingTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceOperation1Test.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceOperation1Test.php index 628fe64d5c..b17c93d768 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceOperation1Test.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceOperation1Test.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceOperationTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceOperationTest.php index d69bb2b123..b666e3c1eb 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceOperationTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceOperationTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceQueryTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceQueryTest.php index 73d7fec824..534752c875 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceQueryTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceQueryTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceResourceTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceResourceTest.php index 0ffa41f1b4..d70c867254 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceResourceTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceResourceTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceRestTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceRestTest.php index b227c42541..a7015a472f 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceRestTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceRestTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceSearchParamTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceSearchParamTest.php index f09b66e4d3..4f032bc5c4 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceSearchParamTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceSearchParamTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceSecurityTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceSecurityTest.php index df541f1f1c..3b33e1a473 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceSecurityTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceSecurityTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceSoftwareTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceSoftwareTest.php index 51adf15d39..ce8f2dba8a 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceSoftwareTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceSoftwareTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDeviceObservationReport/FHIRDeviceObservationReportChannelTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDeviceObservationReport/FHIRDeviceObservationReportChannelTest.php index 56dd62eb9a..f7db4ca6ac 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDeviceObservationReport/FHIRDeviceObservationReportChannelTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDeviceObservationReport/FHIRDeviceObservationReportChannelTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDeviceObservationReport/FHIRDeviceObservationReportMetricTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDeviceObservationReport/FHIRDeviceObservationReportMetricTest.php index 5c7f3aa15b..1fbfd8e0ad 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDeviceObservationReport/FHIRDeviceObservationReportMetricTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDeviceObservationReport/FHIRDeviceObservationReportMetricTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDeviceObservationReport/FHIRDeviceObservationReportVirtualDeviceTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDeviceObservationReport/FHIRDeviceObservationReportVirtualDeviceTest.php index c3bef3e60d..85cad55cac 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDeviceObservationReport/FHIRDeviceObservationReportVirtualDeviceTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDeviceObservationReport/FHIRDeviceObservationReportVirtualDeviceTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDiagnosticOrder/FHIRDiagnosticOrderEventTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDiagnosticOrder/FHIRDiagnosticOrderEventTest.php index f6671fe448..f2a9edd87d 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDiagnosticOrder/FHIRDiagnosticOrderEventTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDiagnosticOrder/FHIRDiagnosticOrderEventTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDiagnosticOrder/FHIRDiagnosticOrderItemTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDiagnosticOrder/FHIRDiagnosticOrderItemTest.php index d04402b5db..57687a57e0 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDiagnosticOrder/FHIRDiagnosticOrderItemTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDiagnosticOrder/FHIRDiagnosticOrderItemTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDiagnosticReport/FHIRDiagnosticReportImageTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDiagnosticReport/FHIRDiagnosticReportImageTest.php index 1258782836..10af750d18 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDiagnosticReport/FHIRDiagnosticReportImageTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDiagnosticReport/FHIRDiagnosticReportImageTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDocumentReference/FHIRDocumentReferenceContextTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDocumentReference/FHIRDocumentReferenceContextTest.php index 17cb6168aa..af21363363 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDocumentReference/FHIRDocumentReferenceContextTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDocumentReference/FHIRDocumentReferenceContextTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDocumentReference/FHIRDocumentReferenceParameterTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDocumentReference/FHIRDocumentReferenceParameterTest.php index 7293bb846a..b4c19690e8 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDocumentReference/FHIRDocumentReferenceParameterTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDocumentReference/FHIRDocumentReferenceParameterTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDocumentReference/FHIRDocumentReferenceRelatesToTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDocumentReference/FHIRDocumentReferenceRelatesToTest.php index 593c3fa0a3..5612f42394 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDocumentReference/FHIRDocumentReferenceRelatesToTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDocumentReference/FHIRDocumentReferenceRelatesToTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDocumentReference/FHIRDocumentReferenceServiceTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDocumentReference/FHIRDocumentReferenceServiceTest.php index 4b4260ceac..877bc98749 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDocumentReference/FHIRDocumentReferenceServiceTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDocumentReference/FHIRDocumentReferenceServiceTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIREncounter/FHIREncounterAccomodationTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIREncounter/FHIREncounterAccomodationTest.php index 7445e48913..040d95910c 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIREncounter/FHIREncounterAccomodationTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIREncounter/FHIREncounterAccomodationTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIREncounter/FHIREncounterHospitalizationTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIREncounter/FHIREncounterHospitalizationTest.php index 83ae7ccd0b..bc33d2ef65 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIREncounter/FHIREncounterHospitalizationTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIREncounter/FHIREncounterHospitalizationTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIREncounter/FHIREncounterLocationTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIREncounter/FHIREncounterLocationTest.php index e42e72dc15..c7eede58cb 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIREncounter/FHIREncounterLocationTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIREncounter/FHIREncounterLocationTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIREncounter/FHIREncounterParticipantTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIREncounter/FHIREncounterParticipantTest.php index 75b2e2e91c..80ab589ed6 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIREncounter/FHIREncounterParticipantTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIREncounter/FHIREncounterParticipantTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRFamilyHistory/FHIRFamilyHistoryConditionTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRFamilyHistory/FHIRFamilyHistoryConditionTest.php index 28519bb1fd..751a3f2e2c 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRFamilyHistory/FHIRFamilyHistoryConditionTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRFamilyHistory/FHIRFamilyHistoryConditionTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRFamilyHistory/FHIRFamilyHistoryRelationTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRFamilyHistory/FHIRFamilyHistoryRelationTest.php index b6351d11cc..f8ac8857b2 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRFamilyHistory/FHIRFamilyHistoryRelationTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRFamilyHistory/FHIRFamilyHistoryRelationTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRGroup/FHIRGroupCharacteristicTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRGroup/FHIRGroupCharacteristicTest.php index bcfc82ba79..bc4ee871e7 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRGroup/FHIRGroupCharacteristicTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRGroup/FHIRGroupCharacteristicTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImagingStudy/FHIRImagingStudyInstanceTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImagingStudy/FHIRImagingStudyInstanceTest.php index 947d02f8ec..1b5604af60 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImagingStudy/FHIRImagingStudyInstanceTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImagingStudy/FHIRImagingStudyInstanceTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImagingStudy/FHIRImagingStudySeriesTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImagingStudy/FHIRImagingStudySeriesTest.php index 4bd13a4887..fa956364ae 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImagingStudy/FHIRImagingStudySeriesTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImagingStudy/FHIRImagingStudySeriesTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImmunization/FHIRImmunizationExplanationTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImmunization/FHIRImmunizationExplanationTest.php index 2c8d61874d..cb1501ecd8 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImmunization/FHIRImmunizationExplanationTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImmunization/FHIRImmunizationExplanationTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImmunization/FHIRImmunizationReactionTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImmunization/FHIRImmunizationReactionTest.php index 940382a603..729de89be1 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImmunization/FHIRImmunizationReactionTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImmunization/FHIRImmunizationReactionTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImmunization/FHIRImmunizationVaccinationProtocolTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImmunization/FHIRImmunizationVaccinationProtocolTest.php index cecbd0c91d..16c1c3d58b 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImmunization/FHIRImmunizationVaccinationProtocolTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImmunization/FHIRImmunizationVaccinationProtocolTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImmunizationRecommendation/FHIRImmunizationRecommendationDateCriterionTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImmunizationRecommendation/FHIRImmunizationRecommendationDateCriterionTest.php index d0f52e6e0f..8c32ee179b 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImmunizationRecommendation/FHIRImmunizationRecommendationDateCriterionTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImmunizationRecommendation/FHIRImmunizationRecommendationDateCriterionTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImmunizationRecommendation/FHIRImmunizationRecommendationProtocolTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImmunizationRecommendation/FHIRImmunizationRecommendationProtocolTest.php index 45f0ffbea1..ccf6a97cd0 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImmunizationRecommendation/FHIRImmunizationRecommendationProtocolTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImmunizationRecommendation/FHIRImmunizationRecommendationProtocolTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImmunizationRecommendation/FHIRImmunizationRecommendationRecommendationTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImmunizationRecommendation/FHIRImmunizationRecommendationRecommendationTest.php index 2d48547038..276b50954d 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImmunizationRecommendation/FHIRImmunizationRecommendationRecommendationTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImmunizationRecommendation/FHIRImmunizationRecommendationRecommendationTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRList/FHIRListEntryTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRList/FHIRListEntryTest.php index e2ee5b476b..23a660fd91 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRList/FHIRListEntryTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRList/FHIRListEntryTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRLocation/FHIRLocationPositionTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRLocation/FHIRLocationPositionTest.php index 3637969f84..ccb4c6a437 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRLocation/FHIRLocationPositionTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRLocation/FHIRLocationPositionTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedication/FHIRMedicationContentTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedication/FHIRMedicationContentTest.php index eb3851b633..2b936fda28 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedication/FHIRMedicationContentTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedication/FHIRMedicationContentTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedication/FHIRMedicationIngredientTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedication/FHIRMedicationIngredientTest.php index 9d1212205c..87a0e4e4b5 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedication/FHIRMedicationIngredientTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedication/FHIRMedicationIngredientTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedication/FHIRMedicationPackageTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedication/FHIRMedicationPackageTest.php index 76aab52f93..0a2e25b1d0 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedication/FHIRMedicationPackageTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedication/FHIRMedicationPackageTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedication/FHIRMedicationProductTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedication/FHIRMedicationProductTest.php index 7eb9298c0f..cc5869a861 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedication/FHIRMedicationProductTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedication/FHIRMedicationProductTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationAdministration/FHIRMedicationAdministrationDosageTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationAdministration/FHIRMedicationAdministrationDosageTest.php index 6ea24dc606..c3dd05ce96 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationAdministration/FHIRMedicationAdministrationDosageTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationAdministration/FHIRMedicationAdministrationDosageTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationDispense/FHIRMedicationDispenseDispenseTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationDispense/FHIRMedicationDispenseDispenseTest.php index ac5b1b204b..ef6e0529e5 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationDispense/FHIRMedicationDispenseDispenseTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationDispense/FHIRMedicationDispenseDispenseTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationDispense/FHIRMedicationDispenseDosageTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationDispense/FHIRMedicationDispenseDosageTest.php index 92c7a58604..3b4a92662d 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationDispense/FHIRMedicationDispenseDosageTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationDispense/FHIRMedicationDispenseDosageTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationDispense/FHIRMedicationDispenseSubstitutionTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationDispense/FHIRMedicationDispenseSubstitutionTest.php index 35dbc43b50..26fc48c420 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationDispense/FHIRMedicationDispenseSubstitutionTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationDispense/FHIRMedicationDispenseSubstitutionTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationPrescription/FHIRMedicationPrescriptionDispenseTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationPrescription/FHIRMedicationPrescriptionDispenseTest.php index 218482b369..cd093d05e9 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationPrescription/FHIRMedicationPrescriptionDispenseTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationPrescription/FHIRMedicationPrescriptionDispenseTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationPrescription/FHIRMedicationPrescriptionDosageInstructionTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationPrescription/FHIRMedicationPrescriptionDosageInstructionTest.php index ea4d5fc024..7980c23f17 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationPrescription/FHIRMedicationPrescriptionDosageInstructionTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationPrescription/FHIRMedicationPrescriptionDosageInstructionTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationPrescription/FHIRMedicationPrescriptionSubstitutionTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationPrescription/FHIRMedicationPrescriptionSubstitutionTest.php index 41fcfe5605..2883dbf239 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationPrescription/FHIRMedicationPrescriptionSubstitutionTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationPrescription/FHIRMedicationPrescriptionSubstitutionTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationStatement/FHIRMedicationStatementDosageTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationStatement/FHIRMedicationStatementDosageTest.php index 2ad2599030..43a3a105c5 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationStatement/FHIRMedicationStatementDosageTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationStatement/FHIRMedicationStatementDosageTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMessageHeader/FHIRMessageHeaderDestinationTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMessageHeader/FHIRMessageHeaderDestinationTest.php index 85fb93015f..be6bfda82f 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMessageHeader/FHIRMessageHeaderDestinationTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMessageHeader/FHIRMessageHeaderDestinationTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMessageHeader/FHIRMessageHeaderResponseTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMessageHeader/FHIRMessageHeaderResponseTest.php index a36f25d12b..56ebbe0a8a 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMessageHeader/FHIRMessageHeaderResponseTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMessageHeader/FHIRMessageHeaderResponseTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMessageHeader/FHIRMessageHeaderSourceTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMessageHeader/FHIRMessageHeaderSourceTest.php index 88239bf20b..5363b345c7 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMessageHeader/FHIRMessageHeaderSourceTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMessageHeader/FHIRMessageHeaderSourceTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRObservation/FHIRObservationReferenceRangeTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRObservation/FHIRObservationReferenceRangeTest.php index 63da8896fe..cec6c7245b 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRObservation/FHIRObservationReferenceRangeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRObservation/FHIRObservationReferenceRangeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRObservation/FHIRObservationRelatedTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRObservation/FHIRObservationRelatedTest.php index 6151db4d8b..3a867eccbf 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRObservation/FHIRObservationRelatedTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRObservation/FHIRObservationRelatedTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIROperationOutcome/FHIROperationOutcomeIssueTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIROperationOutcome/FHIROperationOutcomeIssueTest.php index ee58cca6c7..97ff9b1a23 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIROperationOutcome/FHIROperationOutcomeIssueTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIROperationOutcome/FHIROperationOutcomeIssueTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIROrder/FHIROrderWhenTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIROrder/FHIROrderWhenTest.php index 3eb042bbf9..37aa34c5e2 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIROrder/FHIROrderWhenTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIROrder/FHIROrderWhenTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIROrganization/FHIROrganizationContactTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIROrganization/FHIROrganizationContactTest.php index 24b0c7332b..61c611c093 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIROrganization/FHIROrganizationContactTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIROrganization/FHIROrganizationContactTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPatient/FHIRPatientAnimalTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPatient/FHIRPatientAnimalTest.php index 3eefeea354..dfa15e252e 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPatient/FHIRPatientAnimalTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPatient/FHIRPatientAnimalTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPatient/FHIRPatientContactTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPatient/FHIRPatientContactTest.php index 5f78706d71..a7f46cc5c8 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPatient/FHIRPatientContactTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPatient/FHIRPatientContactTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPatient/FHIRPatientLinkTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPatient/FHIRPatientLinkTest.php index 3ac5c0d669..1409e2b032 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPatient/FHIRPatientLinkTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPatient/FHIRPatientLinkTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPractitioner/FHIRPractitionerQualificationTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPractitioner/FHIRPractitionerQualificationTest.php index 507c9e2533..3a5dcb5edd 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPractitioner/FHIRPractitionerQualificationTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPractitioner/FHIRPractitionerQualificationTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRProcedure/FHIRProcedurePerformerTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRProcedure/FHIRProcedurePerformerTest.php index 7d47df829f..ff3ebf0eef 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRProcedure/FHIRProcedurePerformerTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRProcedure/FHIRProcedurePerformerTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRProcedure/FHIRProcedureRelatedItemTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRProcedure/FHIRProcedureRelatedItemTest.php index 3d845cbc7b..719195600e 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRProcedure/FHIRProcedureRelatedItemTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRProcedure/FHIRProcedureRelatedItemTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRProfile/FHIRProfileBindingTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRProfile/FHIRProfileBindingTest.php index 1f9aa57580..483e7ac074 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRProfile/FHIRProfileBindingTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRProfile/FHIRProfileBindingTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRProfile/FHIRProfileConstraintTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRProfile/FHIRProfileConstraintTest.php index c7afaa422c..b163f386a4 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRProfile/FHIRProfileConstraintTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRProfile/FHIRProfileConstraintTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRProfile/FHIRProfileDefinitionTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRProfile/FHIRProfileDefinitionTest.php index 110c1a4795..1f07a173c5 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRProfile/FHIRProfileDefinitionTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRProfile/FHIRProfileDefinitionTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRProfile/FHIRProfileElementTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRProfile/FHIRProfileElementTest.php index 33515f911b..e397655687 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRProfile/FHIRProfileElementTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRProfile/FHIRProfileElementTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRProfile/FHIRProfileExtensionDefnTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRProfile/FHIRProfileExtensionDefnTest.php index 749e2ac4fb..812034bddb 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRProfile/FHIRProfileExtensionDefnTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRProfile/FHIRProfileExtensionDefnTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRProfile/FHIRProfileMapping1Test.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRProfile/FHIRProfileMapping1Test.php index 06744b7c0f..3a7dc32656 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRProfile/FHIRProfileMapping1Test.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRProfile/FHIRProfileMapping1Test.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRProfile/FHIRProfileMappingTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRProfile/FHIRProfileMappingTest.php index 269e36d67d..37da221728 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRProfile/FHIRProfileMappingTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRProfile/FHIRProfileMappingTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRProfile/FHIRProfileQueryTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRProfile/FHIRProfileQueryTest.php index 48b6a951f2..2b7dd623a0 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRProfile/FHIRProfileQueryTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRProfile/FHIRProfileQueryTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRProfile/FHIRProfileSearchParamTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRProfile/FHIRProfileSearchParamTest.php index 298510282c..77fbc5fd6f 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRProfile/FHIRProfileSearchParamTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRProfile/FHIRProfileSearchParamTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRProfile/FHIRProfileSlicingTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRProfile/FHIRProfileSlicingTest.php index 03bcb165f7..3cadfaed91 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRProfile/FHIRProfileSlicingTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRProfile/FHIRProfileSlicingTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRProfile/FHIRProfileStructureTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRProfile/FHIRProfileStructureTest.php index 3474635f56..15470956de 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRProfile/FHIRProfileStructureTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRProfile/FHIRProfileStructureTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRProfile/FHIRProfileTypeTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRProfile/FHIRProfileTypeTest.php index 07f9714933..4dfafd5260 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRProfile/FHIRProfileTypeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRProfile/FHIRProfileTypeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRProvenance/FHIRProvenanceAgentTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRProvenance/FHIRProvenanceAgentTest.php index 456fdad1c3..7d72f56b46 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRProvenance/FHIRProvenanceAgentTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRProvenance/FHIRProvenanceAgentTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRProvenance/FHIRProvenanceEntityTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRProvenance/FHIRProvenanceEntityTest.php index 948a203bbe..0708248c53 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRProvenance/FHIRProvenanceEntityTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRProvenance/FHIRProvenanceEntityTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRQuery/FHIRQueryResponseTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRQuery/FHIRQueryResponseTest.php index 9b60b58216..167bd448ce 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRQuery/FHIRQueryResponseTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRQuery/FHIRQueryResponseTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRQuestionnaire/FHIRQuestionnaireGroupTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRQuestionnaire/FHIRQuestionnaireGroupTest.php index ff7d0ace08..8c388b2a81 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRQuestionnaire/FHIRQuestionnaireGroupTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRQuestionnaire/FHIRQuestionnaireGroupTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRQuestionnaire/FHIRQuestionnaireQuestionTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRQuestionnaire/FHIRQuestionnaireQuestionTest.php index ddbb51a5e1..6dea576912 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRQuestionnaire/FHIRQuestionnaireQuestionTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRQuestionnaire/FHIRQuestionnaireQuestionTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRAdverseReactionTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRAdverseReactionTest.php index 1d41ac8ae5..ce3547d2b6 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRAdverseReactionTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRAdverseReactionTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRAlertTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRAlertTest.php index d4e31f6395..9198de4235 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRAlertTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRAlertTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRAllergyIntoleranceTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRAllergyIntoleranceTest.php index 879375b9aa..c3e0f7a8ff 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRAllergyIntoleranceTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRAllergyIntoleranceTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRCarePlanTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRCarePlanTest.php index 7a4df0311e..151e643ea8 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRCarePlanTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRCarePlanTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRCompositionTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRCompositionTest.php index 773f29e208..85ad54611b 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRCompositionTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRCompositionTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRConceptMapTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRConceptMapTest.php index 04abae599a..752567bb2d 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRConceptMapTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRConceptMapTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRConditionTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRConditionTest.php index 9dfb935dcd..1521a00b63 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRConditionTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRConditionTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRConformanceTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRConformanceTest.php index c1bfa3fce2..bfa6599887 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRConformanceTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRConformanceTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRDeviceObservationReportTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRDeviceObservationReportTest.php index 8302fe9973..291cfc4307 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRDeviceObservationReportTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRDeviceObservationReportTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRDeviceTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRDeviceTest.php index 8d99803a25..67b01e0ab8 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRDeviceTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRDeviceTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRDiagnosticOrderTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRDiagnosticOrderTest.php index 88031b389e..be1833f815 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRDiagnosticOrderTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRDiagnosticOrderTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRDiagnosticReportTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRDiagnosticReportTest.php index 8b2f5b96ea..dc83b99d51 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRDiagnosticReportTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRDiagnosticReportTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRDocumentManifestTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRDocumentManifestTest.php index c4acb4dc4f..7c03282358 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRDocumentManifestTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRDocumentManifestTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRDocumentReferenceTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRDocumentReferenceTest.php index f1720a2832..6eab10ef91 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRDocumentReferenceTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRDocumentReferenceTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIREncounterTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIREncounterTest.php index caf36f4cd9..55ec139ba6 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIREncounterTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIREncounterTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRFamilyHistoryTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRFamilyHistoryTest.php index 1e2b8581ba..82bc604f88 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRFamilyHistoryTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRFamilyHistoryTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRGroupTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRGroupTest.php index 8adb78fbbc..5cd2f9d1e4 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRGroupTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRGroupTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRImagingStudyTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRImagingStudyTest.php index bc1f937e54..d523d6770a 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRImagingStudyTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRImagingStudyTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRImmunizationRecommendationTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRImmunizationRecommendationTest.php index abc9a8c9ba..8c51b6f386 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRImmunizationRecommendationTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRImmunizationRecommendationTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRImmunizationTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRImmunizationTest.php index b0bef09606..ae6d313f74 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRImmunizationTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRImmunizationTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRListTest.php index d07c226eea..9a2b81209e 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRLocationTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRLocationTest.php index bcfd84499d..36e2097e51 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRLocationTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRLocationTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRMediaTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRMediaTest.php index cbe3384e27..209d86456d 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRMediaTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRMediaTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRMedicationAdministrationTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRMedicationAdministrationTest.php index ab10cc4fa2..f0b02b66dd 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRMedicationAdministrationTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRMedicationAdministrationTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRMedicationDispenseTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRMedicationDispenseTest.php index 72e67250a9..ceff7e3cd7 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRMedicationDispenseTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRMedicationDispenseTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRMedicationPrescriptionTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRMedicationPrescriptionTest.php index bada5b45d1..69f5247d8b 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRMedicationPrescriptionTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRMedicationPrescriptionTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRMedicationStatementTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRMedicationStatementTest.php index d30ecde6f6..5045e61880 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRMedicationStatementTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRMedicationStatementTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRMedicationTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRMedicationTest.php index 91337b0d9f..eee193e8c8 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRMedicationTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRMedicationTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRMessageHeaderTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRMessageHeaderTest.php index 0812ddbd76..a9f025fda6 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRMessageHeaderTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRMessageHeaderTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRObservationTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRObservationTest.php index 4f1f936dd3..fbec7ffb8b 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRObservationTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRObservationTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIROperationOutcomeTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIROperationOutcomeTest.php index 988f13eeb2..37516c4d3f 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIROperationOutcomeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIROperationOutcomeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIROrderResponseTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIROrderResponseTest.php index 90f7799c7e..238db38686 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIROrderResponseTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIROrderResponseTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIROrderTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIROrderTest.php index c02d46a1b6..36412f2ed3 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIROrderTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIROrderTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIROrganizationTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIROrganizationTest.php index b9ab72dcc6..12ef54f622 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIROrganizationTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIROrganizationTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIROtherTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIROtherTest.php index 72e2fe4932..33a65d01b9 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIROtherTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIROtherTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRPatientTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRPatientTest.php index 824b79f350..67be26495e 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRPatientTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRPatientTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRPractitionerTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRPractitionerTest.php index c1d97623ea..75b92eaf51 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRPractitionerTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRPractitionerTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRProcedureTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRProcedureTest.php index ff30b627b2..a648b418a6 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRProcedureTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRProcedureTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRProfileTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRProfileTest.php index 519bd61ce9..7a88afe8ba 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRProfileTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRProfileTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRProvenanceTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRProvenanceTest.php index 70eb767638..6b4e8dfcc8 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRProvenanceTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRProvenanceTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRQueryTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRQueryTest.php index 6629c07579..d9248a164a 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRQueryTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRQueryTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRQuestionnaireTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRQuestionnaireTest.php index 13dcab0346..f51e7c03aa 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRQuestionnaireTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRQuestionnaireTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRRelatedPersonTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRRelatedPersonTest.php index 0ac043ce48..40e2cf46ef 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRRelatedPersonTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRRelatedPersonTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRSecurityEventTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRSecurityEventTest.php index 145495d1be..20a8a09367 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRSecurityEventTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRSecurityEventTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRSpecimenTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRSpecimenTest.php index a612d53ed3..56e570e4e4 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRSpecimenTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRSpecimenTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRSubstanceTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRSubstanceTest.php index 0c910a4bbe..2023a175a4 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRSubstanceTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRSubstanceTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRSupplyTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRSupplyTest.php index e6a1d151a6..9828b25960 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRSupplyTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRSupplyTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRValueSetTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRValueSetTest.php index 0e9a119a1f..8b182cef92 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRValueSetTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResource/FHIRValueSetTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResourceTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResourceTest.php index 229454e090..63cbd41a77 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResourceTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResourceTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSecurityEvent/FHIRSecurityEventDetailTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSecurityEvent/FHIRSecurityEventDetailTest.php index 70e7673cf1..abd34dc6b3 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSecurityEvent/FHIRSecurityEventDetailTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSecurityEvent/FHIRSecurityEventDetailTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSecurityEvent/FHIRSecurityEventEventTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSecurityEvent/FHIRSecurityEventEventTest.php index f21bd8a08a..4b9302837f 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSecurityEvent/FHIRSecurityEventEventTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSecurityEvent/FHIRSecurityEventEventTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSecurityEvent/FHIRSecurityEventNetworkTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSecurityEvent/FHIRSecurityEventNetworkTest.php index f7ba4c0297..9bc1a783ad 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSecurityEvent/FHIRSecurityEventNetworkTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSecurityEvent/FHIRSecurityEventNetworkTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSecurityEvent/FHIRSecurityEventObjectTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSecurityEvent/FHIRSecurityEventObjectTest.php index 1b16aee55b..ae7bf9d8da 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSecurityEvent/FHIRSecurityEventObjectTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSecurityEvent/FHIRSecurityEventObjectTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSecurityEvent/FHIRSecurityEventParticipantTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSecurityEvent/FHIRSecurityEventParticipantTest.php index 9e788f79c5..798b12b9d7 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSecurityEvent/FHIRSecurityEventParticipantTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSecurityEvent/FHIRSecurityEventParticipantTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSecurityEvent/FHIRSecurityEventSourceTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSecurityEvent/FHIRSecurityEventSourceTest.php index e69d01231b..963648151b 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSecurityEvent/FHIRSecurityEventSourceTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSecurityEvent/FHIRSecurityEventSourceTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSpecimen/FHIRSpecimenCollectionTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSpecimen/FHIRSpecimenCollectionTest.php index e318322991..856315833e 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSpecimen/FHIRSpecimenCollectionTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSpecimen/FHIRSpecimenCollectionTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSpecimen/FHIRSpecimenContainerTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSpecimen/FHIRSpecimenContainerTest.php index 66468c4744..2f4cdaefc7 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSpecimen/FHIRSpecimenContainerTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSpecimen/FHIRSpecimenContainerTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSpecimen/FHIRSpecimenSourceTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSpecimen/FHIRSpecimenSourceTest.php index 1def2789e3..6422a3c4ee 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSpecimen/FHIRSpecimenSourceTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSpecimen/FHIRSpecimenSourceTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSpecimen/FHIRSpecimenTreatmentTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSpecimen/FHIRSpecimenTreatmentTest.php index b5f8aede61..8d91ad58bb 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSpecimen/FHIRSpecimenTreatmentTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSpecimen/FHIRSpecimenTreatmentTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubstance/FHIRSubstanceIngredientTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubstance/FHIRSubstanceIngredientTest.php index 9fc6b04ec4..510cc5bf98 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubstance/FHIRSubstanceIngredientTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubstance/FHIRSubstanceIngredientTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubstance/FHIRSubstanceInstanceTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubstance/FHIRSubstanceInstanceTest.php index 6ae03bc98e..4db0e2ef0e 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubstance/FHIRSubstanceInstanceTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubstance/FHIRSubstanceInstanceTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSupply/FHIRSupplyDispenseTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSupply/FHIRSupplyDispenseTest.php index 1cc60b0df5..f854a973c3 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSupply/FHIRSupplyDispenseTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSupply/FHIRSupplyDispenseTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetComposeTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetComposeTest.php index bdda42f574..8f91441cec 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetComposeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetComposeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetConceptTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetConceptTest.php index 6986b6437f..a1201e74af 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetConceptTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetConceptTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetContainsTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetContainsTest.php index c1aa5c7fa4..eacedb9f36 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetContainsTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetContainsTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetDefineTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetDefineTest.php index 9d7451d607..bad8749612 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetDefineTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetDefineTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetExpansionTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetExpansionTest.php index e0636fe81e..ef3ceb11c5 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetExpansionTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetExpansionTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetFilterTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetFilterTest.php index a4b62588ee..3198028c33 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetFilterTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetFilterTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetIncludeTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetIncludeTest.php index 9e378779d2..13a3603570 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetIncludeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetIncludeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElementTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElementTest.php index 1b57fd9933..1df127ba22 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElementTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBackboneElementTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBase64BinaryTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBase64BinaryTest.php index efe1f05912..fabd29a17f 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBase64BinaryTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBase64BinaryTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBindingConformanceTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBindingConformanceTest.php index 1d6a59b65f..e02d48dbc1 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBindingConformanceTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBindingConformanceTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBooleanTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBooleanTest.php index 99279bc365..c573301c2d 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBooleanTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRBooleanTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRCarePlanActivityCategoryTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRCarePlanActivityCategoryTest.php index 36ca703c1d..41d9c614ba 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRCarePlanActivityCategoryTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRCarePlanActivityCategoryTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRCarePlanActivityStatusTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRCarePlanActivityStatusTest.php index 122ebea3b4..7a706a1144 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRCarePlanActivityStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRCarePlanActivityStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRCarePlanGoalStatusTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRCarePlanGoalStatusTest.php index 22a666a9bb..35565f4935 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRCarePlanGoalStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRCarePlanGoalStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRCarePlanStatusTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRCarePlanStatusTest.php index 7ff9820db6..e5f9483324 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRCarePlanStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRCarePlanStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRCausalityExpectationTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRCausalityExpectationTest.php index 1bbea8b3ea..021b81bffd 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRCausalityExpectationTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRCausalityExpectationTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRCodeTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRCodeTest.php index 86a80c9844..d27cb5dea5 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRCodeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRCodeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRCodeableConceptTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRCodeableConceptTest.php index eab1a7ff38..a7418947ba 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRCodeableConceptTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRCodeableConceptTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRCodingTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRCodingTest.php index 9581fa9253..d8c42cad36 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRCodingTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRCodingTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRCompositionAttestationModeTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRCompositionAttestationModeTest.php index ce0f5cbeb1..7d36f5b696 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRCompositionAttestationModeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRCompositionAttestationModeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRCompositionStatusTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRCompositionStatusTest.php index 2cb216cb7c..c0f3edc552 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRCompositionStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRCompositionStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRConceptMapEquivalenceTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRConceptMapEquivalenceTest.php index e063240220..0739ebee01 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRConceptMapEquivalenceTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRConceptMapEquivalenceTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRConditionRelationshipTypeTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRConditionRelationshipTypeTest.php index b397ff3a4e..fa94c9d501 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRConditionRelationshipTypeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRConditionRelationshipTypeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRConditionStatusTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRConditionStatusTest.php index c7e7f573f9..c2ec46e9f8 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRConditionStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRConditionStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRConformanceEventModeTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRConformanceEventModeTest.php index 5c5a2f9318..f8dd0c96ae 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRConformanceEventModeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRConformanceEventModeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRConformanceStatementStatusTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRConformanceStatementStatusTest.php index bf210a526c..c7e2c768db 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRConformanceStatementStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRConformanceStatementStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRConstraintSeverityTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRConstraintSeverityTest.php index e3e8398361..a144b8231c 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRConstraintSeverityTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRConstraintSeverityTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRContactSystemTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRContactSystemTest.php index 69280e3392..352c42ab3c 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRContactSystemTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRContactSystemTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRContactTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRContactTest.php index 8a455485e7..8f02060059 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRContactTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRContactTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRContactUseTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRContactUseTest.php index 2b0d5d5275..2f1a438e13 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRContactUseTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRContactUseTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRCriticalityTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRCriticalityTest.php index 467ccb7858..aec445001c 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRCriticalityTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRCriticalityTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRDateTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRDateTest.php index ab29a0cb9a..95c3af0925 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRDateTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRDateTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRDateTimeTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRDateTimeTest.php index 5e0ccf1dd0..23da49d6f7 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRDateTimeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRDateTimeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRDecimal/FHIRScoreTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRDecimal/FHIRScoreTest.php index 8dead4d55b..eaff2ed499 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRDecimal/FHIRScoreTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRDecimal/FHIRScoreTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRDecimalTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRDecimalTest.php index ed50aaf8c2..c05b4fbe8f 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRDecimalTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRDecimalTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRDiagnosticOrderPriorityTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRDiagnosticOrderPriorityTest.php index 8b1b77c995..d3ee441fdf 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRDiagnosticOrderPriorityTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRDiagnosticOrderPriorityTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRDiagnosticOrderStatusTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRDiagnosticOrderStatusTest.php index b503597d12..19ff79affb 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRDiagnosticOrderStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRDiagnosticOrderStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRDiagnosticReportStatusTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRDiagnosticReportStatusTest.php index b074a3a50f..62ac0a6a3e 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRDiagnosticReportStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRDiagnosticReportStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRDocumentModeTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRDocumentModeTest.php index 6e6d3c02a4..685cef7f75 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRDocumentModeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRDocumentModeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRDocumentReferenceStatusTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRDocumentReferenceStatusTest.php index fa77a0767e..52d2533544 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRDocumentReferenceStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRDocumentReferenceStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRDocumentRelationshipTypeTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRDocumentRelationshipTypeTest.php index 3075b10979..c5ce8e5380 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRDocumentRelationshipTypeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRDocumentRelationshipTypeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIREncounterClassTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIREncounterClassTest.php index b7c00f369f..ed30a3e763 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIREncounterClassTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIREncounterClassTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIREncounterStateTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIREncounterStateTest.php index b70368cd15..4673957828 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIREncounterStateTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIREncounterStateTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIREventTimingTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIREventTimingTest.php index 57faae5c15..9db4d9ec69 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIREventTimingTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIREventTimingTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRExposureTypeTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRExposureTypeTest.php index 0e51b52a04..ab16aadb43 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRExposureTypeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRExposureTypeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRExtensionContextTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRExtensionContextTest.php index 6da327c6c9..3faa74f7d4 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRExtensionContextTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRExtensionContextTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRExtensionTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRExtensionTest.php index ca8ea7b78d..c42421259d 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRExtensionTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRExtensionTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRFilterOperatorTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRFilterOperatorTest.php index f0c3fc91b6..aee65d8dc9 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRFilterOperatorTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRFilterOperatorTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRGroupTypeTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRGroupTypeTest.php index 4a5b3dc7b0..8d7af94d0a 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRGroupTypeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRGroupTypeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRHierarchicalRelationshipTypeTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRHierarchicalRelationshipTypeTest.php index 62dc8ee367..4f34dc4522 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRHierarchicalRelationshipTypeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRHierarchicalRelationshipTypeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRHumanNameTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRHumanNameTest.php index 118ec9844f..55fa9fd6b2 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRHumanNameTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRHumanNameTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRIdTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRIdTest.php index a98505dc7a..ab91cc46c9 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRIdTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRIdTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRIdentifierTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRIdentifierTest.php index 28cdf41429..3f19fd8cd5 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRIdentifierTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRIdentifierTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRIdentifierUseTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRIdentifierUseTest.php index 9120d95035..15bfaaf662 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRIdentifierUseTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRIdentifierUseTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRImagingModalityTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRImagingModalityTest.php index 9b7d9da86a..4690b98964 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRImagingModalityTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRImagingModalityTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRInstanceAvailabilityTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRInstanceAvailabilityTest.php index adbdb6040d..b4c4402514 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRInstanceAvailabilityTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRInstanceAvailabilityTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRInstantTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRInstantTest.php index 75a99ef770..f8ca77de7f 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRInstantTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRInstantTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRInteger/FHIRTotalResultsTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRInteger/FHIRTotalResultsTest.php index 79d12b5280..604213ce7f 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRInteger/FHIRTotalResultsTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRInteger/FHIRTotalResultsTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRIntegerTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRIntegerTest.php index c71f11a754..9a1cb00577 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRIntegerTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRIntegerTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRIssueSeverityTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRIssueSeverityTest.php index b14a13111f..fe68464195 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRIssueSeverityTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRIssueSeverityTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRLinkTypeTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRLinkTypeTest.php index b9bd6f8c3d..a44440e2c1 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRLinkTypeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRLinkTypeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRListModeTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRListModeTest.php index 6d3d287771..d1540a4e9c 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRListModeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRListModeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRLocationModeTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRLocationModeTest.php index 66429afbb6..4f4a5522b4 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRLocationModeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRLocationModeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRLocationStatusTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRLocationStatusTest.php index 18341b4729..c9eff59f25 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRLocationStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRLocationStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRMediaTypeTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRMediaTypeTest.php index ce76525614..4e51b8e51a 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRMediaTypeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRMediaTypeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRMedicationAdministrationStatusTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRMedicationAdministrationStatusTest.php index 95008b3576..8287398a24 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRMedicationAdministrationStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRMedicationAdministrationStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRMedicationDispenseStatusTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRMedicationDispenseStatusTest.php index 46a045a51b..10d5744414 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRMedicationDispenseStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRMedicationDispenseStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRMedicationKindTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRMedicationKindTest.php index 98d505565a..8ce2487a46 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRMedicationKindTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRMedicationKindTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRMedicationPrescriptionStatusTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRMedicationPrescriptionStatusTest.php index 74edccc6b9..2344616c25 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRMedicationPrescriptionStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRMedicationPrescriptionStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRMessageSignificanceCategoryTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRMessageSignificanceCategoryTest.php index 9d218aee88..0a599b8f9a 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRMessageSignificanceCategoryTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRMessageSignificanceCategoryTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRModalityTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRModalityTest.php index b30ae7f7eb..1e8fda481d 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRModalityTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRModalityTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRNameUseTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRNameUseTest.php index 716f6922a4..6e6cbbcc36 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRNameUseTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRNameUseTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRNarrativeStatusTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRNarrativeStatusTest.php index 6e8571d6c2..499c17e39a 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRNarrativeStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRNarrativeStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRNarrativeTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRNarrativeTest.php index 766576cd3e..b5dff7702f 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRNarrativeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRNarrativeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRObservationRelationshipTypeTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRObservationRelationshipTypeTest.php index 0706458ad7..8486d053bb 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRObservationRelationshipTypeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRObservationRelationshipTypeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRObservationReliabilityTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRObservationReliabilityTest.php index fdbb9df815..10ba5971c3 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRObservationReliabilityTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRObservationReliabilityTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRObservationStatusTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRObservationStatusTest.php index 2833ef1dac..e1202e0e98 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRObservationStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRObservationStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIROidTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIROidTest.php index aaa48958ec..d9502b69ea 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIROidTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIROidTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIROrderOutcomeStatusTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIROrderOutcomeStatusTest.php index e2d3d5e472..25d1f135eb 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIROrderOutcomeStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIROrderOutcomeStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRPeriodTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRPeriodTest.php index 079fccf926..4263138637 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRPeriodTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRPeriodTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRProcedureRelationshipTypeTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRProcedureRelationshipTypeTest.php index 48836a97e9..9d99763088 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRProcedureRelationshipTypeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRProcedureRelationshipTypeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRPropertyRepresentationTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRPropertyRepresentationTest.php index b385e6923b..80a7a9db22 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRPropertyRepresentationTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRPropertyRepresentationTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRProvenanceEntityRoleTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRProvenanceEntityRoleTest.php index a9a9ac50d5..51c3cdeb2f 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRProvenanceEntityRoleTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRProvenanceEntityRoleTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRQuantity/FHIRAgeTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRQuantity/FHIRAgeTest.php index 19281d23ae..45ad74e4ce 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRQuantity/FHIRAgeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRQuantity/FHIRAgeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRQuantity/FHIRCountTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRQuantity/FHIRCountTest.php index ea8f0cb845..c45e5ce799 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRQuantity/FHIRCountTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRQuantity/FHIRCountTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRQuantity/FHIRDistanceTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRQuantity/FHIRDistanceTest.php index 5f672a8eda..d372897527 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRQuantity/FHIRDistanceTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRQuantity/FHIRDistanceTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRQuantity/FHIRDurationTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRQuantity/FHIRDurationTest.php index 106cf5792c..2d2660b005 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRQuantity/FHIRDurationTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRQuantity/FHIRDurationTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRQuantity/FHIRMoneyTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRQuantity/FHIRMoneyTest.php index 1ab6a298d0..6b0e466f8b 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRQuantity/FHIRMoneyTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRQuantity/FHIRMoneyTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRQuantityCompararatorTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRQuantityCompararatorTest.php index 3e315f5d1a..848b0c017d 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRQuantityCompararatorTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRQuantityCompararatorTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRQuantityTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRQuantityTest.php index bfc8bb164e..190cbf062d 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRQuantityTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRQuantityTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRQueryOutcomeTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRQueryOutcomeTest.php index 8ff06f6bf3..d90652baf7 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRQueryOutcomeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRQueryOutcomeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRQuestionnaireStatusTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRQuestionnaireStatusTest.php index c27a5d0bac..868ec2cc26 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRQuestionnaireStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRQuestionnaireStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRRangeTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRRangeTest.php index 7941ecb457..789723cdbf 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRRangeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRRangeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRRatioTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRRatioTest.php index fa616c0111..76e01302c9 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRRatioTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRRatioTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRReactionSeverityTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRReactionSeverityTest.php index 19ef628b21..bde0b837e2 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRReactionSeverityTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRReactionSeverityTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRResourceProfileStatusTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRResourceProfileStatusTest.php index 05788cde42..7f2194a285 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRResourceProfileStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRResourceProfileStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRResourceReferenceTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRResourceReferenceTest.php index e3f29bcafe..69ed2e1221 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRResourceReferenceTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRResourceReferenceTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRResponseTypeTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRResponseTypeTest.php index 0db1b7e68f..0e6d0a5c3a 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRResponseTypeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRResponseTypeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRRestfulConformanceModeTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRRestfulConformanceModeTest.php index 163dd37bd8..92211fca2d 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRRestfulConformanceModeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRRestfulConformanceModeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRRestfulOperationSystemTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRRestfulOperationSystemTest.php index 8af032edf5..c31c901c39 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRRestfulOperationSystemTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRRestfulOperationSystemTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRRestfulOperationTypeTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRRestfulOperationTypeTest.php index cf564cc6ae..50d9c3cc1d 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRRestfulOperationTypeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRRestfulOperationTypeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRSampledDataDataTypeTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRSampledDataDataTypeTest.php index 40268881c7..3d083878d5 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRSampledDataDataTypeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRSampledDataDataTypeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRSampledDataTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRSampledDataTest.php index e6480f3e79..f7d31e8985 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRSampledDataTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRSampledDataTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRSchedule/FHIRScheduleRepeatTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRSchedule/FHIRScheduleRepeatTest.php index af6c5b9f9b..b570874930 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRSchedule/FHIRScheduleRepeatTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRSchedule/FHIRScheduleRepeatTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRScheduleTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRScheduleTest.php index a67684e6a7..756f0d21f8 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRScheduleTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRScheduleTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRSearchParamTypeTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRSearchParamTypeTest.php index c4acaa3262..99fd99fc29 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRSearchParamTypeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRSearchParamTypeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRSecurityEventActionTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRSecurityEventActionTest.php index 292c39f2f4..f075bbd17c 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRSecurityEventActionTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRSecurityEventActionTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRSecurityEventObjectLifecycleTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRSecurityEventObjectLifecycleTest.php index bf2cd949e2..f42b2559d6 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRSecurityEventObjectLifecycleTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRSecurityEventObjectLifecycleTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRSecurityEventObjectRoleTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRSecurityEventObjectRoleTest.php index ddbc997795..3a83e3cf34 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRSecurityEventObjectRoleTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRSecurityEventObjectRoleTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRSecurityEventObjectTypeTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRSecurityEventObjectTypeTest.php index 2dd2fbbe66..8367ac510d 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRSecurityEventObjectTypeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRSecurityEventObjectTypeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRSecurityEventOutcomeTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRSecurityEventOutcomeTest.php index 02fb6e124f..70086c8699 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRSecurityEventOutcomeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRSecurityEventOutcomeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRSecurityEventParticipantNetworkTypeTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRSecurityEventParticipantNetworkTypeTest.php index 44fb26049a..074fbd30bf 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRSecurityEventParticipantNetworkTypeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRSecurityEventParticipantNetworkTypeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRSensitivityStatusTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRSensitivityStatusTest.php index f4cf3cae63..08c8a58983 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRSensitivityStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRSensitivityStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRSensitivityTypeTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRSensitivityTypeTest.php index d7448f2c9f..11c5175b71 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRSensitivityTypeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRSensitivityTypeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRSlicingRulesTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRSlicingRulesTest.php index eaf783631d..2cc3934a79 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRSlicingRulesTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRSlicingRulesTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRStringTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRStringTest.php index 4a9c528396..430c9bd1f9 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRStringTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRStringTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRSupplyDispenseStatusTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRSupplyDispenseStatusTest.php index 3e5dccaea2..e30936c5c4 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRSupplyDispenseStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRSupplyDispenseStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRSupplyStatusTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRSupplyStatusTest.php index 36da56ea77..fc051ff7d0 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRSupplyStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRSupplyStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRUnitsOfTimeTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRUnitsOfTimeTest.php index 219e0f4a48..d1b9c91da4 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRUnitsOfTimeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRUnitsOfTimeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRUriTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRUriTest.php index 96c182527e..69e4e98ebb 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRUriTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRUriTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRUuidTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRUuidTest.php index dbacfe549f..174c27ec6e 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRUuidTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRUuidTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRValueSetStatusTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRValueSetStatusTest.php index 5942a0c30b..90f1c31600 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRValueSetStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElement/FHIRValueSetStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElementTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElementTest.php index 43f737d5c9..371cd22527 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElementTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRElementTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIREncounterClassListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIREncounterClassListTest.php index e545a82e0f..53246e6e8a 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIREncounterClassListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIREncounterClassListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIREncounterStateListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIREncounterStateListTest.php index 1050528000..4bbd811c52 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIREncounterStateListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIREncounterStateListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIREventTimingListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIREventTimingListTest.php index 853a0b439a..d93550ac09 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIREventTimingListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIREventTimingListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRExposureTypeListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRExposureTypeListTest.php index ee575b1cd6..528e8f66f2 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRExposureTypeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRExposureTypeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRExtensionContextListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRExtensionContextListTest.php index 230840b2d8..7cb3456f02 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRExtensionContextListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRExtensionContextListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRFilterOperatorListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRFilterOperatorListTest.php index 32f0e488fc..e5d4a44b4d 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRFilterOperatorListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRFilterOperatorListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRGroupTypeListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRGroupTypeListTest.php index 69f4524305..a20f74157c 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRGroupTypeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRGroupTypeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRHierarchicalRelationshipTypeListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRHierarchicalRelationshipTypeListTest.php index 7b5fdeac99..dd30233348 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRHierarchicalRelationshipTypeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRHierarchicalRelationshipTypeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRIdPrimitive/FHIRXmlIdRefTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRIdPrimitive/FHIRXmlIdRefTest.php index d0eb2e80e8..2295425bc6 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRIdPrimitive/FHIRXmlIdRefTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRIdPrimitive/FHIRXmlIdRefTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRIdPrimitiveTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRIdPrimitiveTest.php index dd013b9875..c2f8d2b55c 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRIdPrimitiveTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRIdPrimitiveTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRIdentifierUseListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRIdentifierUseListTest.php index c7a664f9fc..e4b94e041e 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRIdentifierUseListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRIdentifierUseListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRImagingModalityListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRImagingModalityListTest.php index 38866f327e..33cc120343 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRImagingModalityListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRImagingModalityListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRInstanceAvailabilityListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRInstanceAvailabilityListTest.php index 7a62e790e3..f56d2895d5 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRInstanceAvailabilityListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRInstanceAvailabilityListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRInstantPrimitiveTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRInstantPrimitiveTest.php index f8434879dc..ae8009089b 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRInstantPrimitiveTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRInstantPrimitiveTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRIntegerPrimitiveTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRIntegerPrimitiveTest.php index 6225c24f2f..88dfd5cbb8 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRIntegerPrimitiveTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRIntegerPrimitiveTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRIssueSeverityListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRIssueSeverityListTest.php index c32e0bc548..3aa1e7cd9c 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRIssueSeverityListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRIssueSeverityListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRLinkTypeListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRLinkTypeListTest.php index 3f0912ce07..54a2ae3183 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRLinkTypeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRLinkTypeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRListModeListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRListModeListTest.php index d3ef5dc59f..d5c6105669 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRListModeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRListModeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRLocationModeListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRLocationModeListTest.php index 64acc3ea57..e505ea5b46 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRLocationModeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRLocationModeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRLocationStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRLocationStatusListTest.php index 54de3bf2fd..9e1a6f234f 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRLocationStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRLocationStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRMediaTypeListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRMediaTypeListTest.php index d4b98e3cfa..4b9a30f5cb 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRMediaTypeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRMediaTypeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRMedicationAdministrationStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRMedicationAdministrationStatusListTest.php index 0c52290956..02606a11c5 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRMedicationAdministrationStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRMedicationAdministrationStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRMedicationDispenseStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRMedicationDispenseStatusListTest.php index d9d83f26fa..0d40262918 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRMedicationDispenseStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRMedicationDispenseStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRMedicationKindListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRMedicationKindListTest.php index f649b6c94c..9b5da91af0 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRMedicationKindListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRMedicationKindListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRMedicationPrescriptionStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRMedicationPrescriptionStatusListTest.php index a7316b2a44..6380f2a569 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRMedicationPrescriptionStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRMedicationPrescriptionStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRMessageSignificanceCategoryListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRMessageSignificanceCategoryListTest.php index d5b41dfc02..8db4945299 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRMessageSignificanceCategoryListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRMessageSignificanceCategoryListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRModalityListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRModalityListTest.php index 3addf64e63..226e1968c8 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRModalityListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRModalityListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRNameUseListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRNameUseListTest.php index fdb17906a2..44f08f2325 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRNameUseListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRNameUseListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRNarrativeStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRNarrativeStatusListTest.php index 2145cc8c09..f9fa8f5a02 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRNarrativeStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRNarrativeStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRObservationRelationshipTypeListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRObservationRelationshipTypeListTest.php index 606fea559a..40faccb44c 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRObservationRelationshipTypeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRObservationRelationshipTypeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRObservationReliabilityListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRObservationReliabilityListTest.php index 946c8b626e..0307e522d1 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRObservationReliabilityListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRObservationReliabilityListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRObservationStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRObservationStatusListTest.php index dd757a46ff..4f89b547b9 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRObservationStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRObservationStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIROidPrimitiveTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIROidPrimitiveTest.php index 136cfdb1a3..a67df540c8 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIROidPrimitiveTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIROidPrimitiveTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIROrderOutcomeStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIROrderOutcomeStatusListTest.php index 5166e6d596..ac6dc2ed5a 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIROrderOutcomeStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIROrderOutcomeStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRProcedureRelationshipTypeListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRProcedureRelationshipTypeListTest.php index a31a20d996..d32c0d2a6e 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRProcedureRelationshipTypeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRProcedureRelationshipTypeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRPropertyRepresentationListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRPropertyRepresentationListTest.php index 28dc87e255..877da85ee5 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRPropertyRepresentationListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRPropertyRepresentationListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRProvenanceEntityRoleListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRProvenanceEntityRoleListTest.php index b8dfd52a60..2b83de3540 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRProvenanceEntityRoleListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRProvenanceEntityRoleListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRQuantityCompararatorListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRQuantityCompararatorListTest.php index 8661b3b588..9c76c2ab76 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRQuantityCompararatorListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRQuantityCompararatorListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRQueryOutcomeListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRQueryOutcomeListTest.php index d3147a3210..5009b3bd7a 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRQueryOutcomeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRQueryOutcomeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRQuestionnaireStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRQuestionnaireStatusListTest.php index 1ca5f7d4d1..97a6873f79 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRQuestionnaireStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRQuestionnaireStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRReactionSeverityListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRReactionSeverityListTest.php index 0da1c639bf..f6ced39e90 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRReactionSeverityListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRReactionSeverityListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRResourceInlineTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRResourceInlineTest.php index a6228bb2e4..38937d959b 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRResourceInlineTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRResourceInlineTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRResourceProfileStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRResourceProfileStatusListTest.php index 242cb57637..f3821a4999 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRResourceProfileStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRResourceProfileStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRResourceType/FHIRResourceNamesPlusBinaryTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRResourceType/FHIRResourceNamesPlusBinaryTest.php index 7b9398291b..51daa45fc9 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRResourceType/FHIRResourceNamesPlusBinaryTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRResourceType/FHIRResourceNamesPlusBinaryTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRResourceTypeTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRResourceTypeTest.php index 41985248b0..00e2d337a8 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRResourceTypeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRResourceTypeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRResponseTypeListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRResponseTypeListTest.php index 7690f54dec..a9be49219f 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRResponseTypeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRResponseTypeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRRestfulConformanceModeListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRRestfulConformanceModeListTest.php index 797dc525d5..1300f16d9d 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRRestfulConformanceModeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRRestfulConformanceModeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRRestfulOperationSystemListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRRestfulOperationSystemListTest.php index 8b8bcf7580..e7d2207e5a 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRRestfulOperationSystemListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRRestfulOperationSystemListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRRestfulOperationTypeListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRRestfulOperationTypeListTest.php index db52f06bae..6766c185cc 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRRestfulOperationTypeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRRestfulOperationTypeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRSampledDataDataTypePrimitiveTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRSampledDataDataTypePrimitiveTest.php index 8f797b461b..a39f558149 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRSampledDataDataTypePrimitiveTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRSampledDataDataTypePrimitiveTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRSearchParamTypeListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRSearchParamTypeListTest.php index 3e806d033b..611711bb0e 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRSearchParamTypeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRSearchParamTypeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRSecurityEventActionListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRSecurityEventActionListTest.php index edf6f624ea..907b84cda4 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRSecurityEventActionListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRSecurityEventActionListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRSecurityEventObjectLifecycleListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRSecurityEventObjectLifecycleListTest.php index aad0d49373..ab010f30b6 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRSecurityEventObjectLifecycleListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRSecurityEventObjectLifecycleListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRSecurityEventObjectRoleListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRSecurityEventObjectRoleListTest.php index e687dbabc7..4e2e4a2d83 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRSecurityEventObjectRoleListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRSecurityEventObjectRoleListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRSecurityEventObjectTypeListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRSecurityEventObjectTypeListTest.php index 8fca7cfb7c..7aa3b22120 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRSecurityEventObjectTypeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRSecurityEventObjectTypeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRSecurityEventOutcomeListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRSecurityEventOutcomeListTest.php index f3fe2ebb4d..d8a5361e70 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRSecurityEventOutcomeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRSecurityEventOutcomeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRSecurityEventParticipantNetworkTypeListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRSecurityEventParticipantNetworkTypeListTest.php index 5ecfdcab56..b95b4a9087 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRSecurityEventParticipantNetworkTypeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRSecurityEventParticipantNetworkTypeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRSensitivityStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRSensitivityStatusListTest.php index 821dce4e6c..8df65f5382 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRSensitivityStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRSensitivityStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRSensitivityTypeListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRSensitivityTypeListTest.php index dc33eacd28..78f7257e6c 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRSensitivityTypeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRSensitivityTypeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRSlicingRulesListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRSlicingRulesListTest.php index 97ee435627..f310ae4c90 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRSlicingRulesListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRSlicingRulesListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRStringPrimitiveTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRStringPrimitiveTest.php index 36801172f7..46e1a3ffac 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRStringPrimitiveTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRStringPrimitiveTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRSupplyDispenseStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRSupplyDispenseStatusListTest.php index a55dc94c20..86bb3ef8e0 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRSupplyDispenseStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRSupplyDispenseStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRSupplyStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRSupplyStatusListTest.php index 7b57aef5fe..3f59f9b05b 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRSupplyStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRSupplyStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRUnitsOfTimeListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRUnitsOfTimeListTest.php index 713c56b4f7..ac33d6734f 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRUnitsOfTimeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRUnitsOfTimeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRUriPrimitiveTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRUriPrimitiveTest.php index c6f4fc695b..09b8d5ac63 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRUriPrimitiveTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRUriPrimitiveTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRUuidPrimitiveTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRUuidPrimitiveTest.php index cdcf959c34..fde1fc06be 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRUuidPrimitiveTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRUuidPrimitiveTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRValueSetStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRValueSetStatusListTest.php index c782f07f17..e1450f031d 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRValueSetStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/FHIRValueSetStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/PHPFHIRConstantsTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/PHPFHIRConstantsTest.php index 91028c31da..10134874ff 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/PHPFHIRConstantsTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/PHPFHIRConstantsTest.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/PHPFHIRTypeMapTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/PHPFHIRTypeMapTest.php index 0365dc7c33..5dd0adfd30 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/PHPFHIRTypeMapTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTests/PHPFHIRTypeMapTest.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTypeInterface.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTypeInterface.php index f320e4150d..9c36b69094 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTypeInterface.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTypeInterface.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTypeMap.php b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTypeMap.php index 5e769b0d55..d3f7949b1e 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTypeMap.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU1/PHPFHIRTypeMap.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRAccountStatusList.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRAccountStatusList.php index 986c23bf05..28e9813696 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRAccountStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRAccountStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -245,6 +245,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRActionListList.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRActionListList.php index 508fe27092..1bd3136c60 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRActionListList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRActionListList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -247,6 +247,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRAddressTypeList.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRAddressTypeList.php index f352df2903..f6522821e0 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRAddressTypeList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRAddressTypeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -246,6 +246,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRAddressUseList.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRAddressUseList.php index 6c8970a2ec..8d1eaf13d7 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRAddressUseList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRAddressUseList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -247,6 +247,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRAdministrativeGenderList.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRAdministrativeGenderList.php index 7e42b89bde..5aeabed106 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRAdministrativeGenderList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRAdministrativeGenderList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -247,6 +247,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRAggregationModeList.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRAggregationModeList.php index e51a1dcd88..f96339f041 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRAggregationModeList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRAggregationModeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -246,6 +246,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRAllergyIntoleranceCategoryList.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRAllergyIntoleranceCategoryList.php index ce5919a279..8e847f175f 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRAllergyIntoleranceCategoryList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRAllergyIntoleranceCategoryList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -247,6 +247,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRAllergyIntoleranceCertaintyList.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRAllergyIntoleranceCertaintyList.php index 69035774ab..5c5d0679ea 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRAllergyIntoleranceCertaintyList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRAllergyIntoleranceCertaintyList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -246,6 +246,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRAllergyIntoleranceCriticalityList.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRAllergyIntoleranceCriticalityList.php index 2f49a2affd..ee4240631a 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRAllergyIntoleranceCriticalityList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRAllergyIntoleranceCriticalityList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -246,6 +246,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRAllergyIntoleranceSeverityList.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRAllergyIntoleranceSeverityList.php index 332bdf3c14..8d5f101add 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRAllergyIntoleranceSeverityList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRAllergyIntoleranceSeverityList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -246,6 +246,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRAllergyIntoleranceStatusList.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRAllergyIntoleranceStatusList.php index 826d61c6fa..182baf3089 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRAllergyIntoleranceStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRAllergyIntoleranceStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -250,6 +250,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRAllergyIntoleranceTypeList.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRAllergyIntoleranceTypeList.php index 4327750aaf..abf1e15544 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRAllergyIntoleranceTypeList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRAllergyIntoleranceTypeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -245,6 +245,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRAnswerFormatList.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRAnswerFormatList.php index 56bd8e99a1..7febbc9494 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRAnswerFormatList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRAnswerFormatList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -258,6 +258,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRAppointmentStatusList.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRAppointmentStatusList.php index 0aa700459a..db538ed14f 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRAppointmentStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRAppointmentStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -250,6 +250,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRAssertionDirectionTypeList.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRAssertionDirectionTypeList.php index 6084fc3ea4..c7d08b0eec 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRAssertionDirectionTypeList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRAssertionDirectionTypeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -245,6 +245,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRAssertionOperatorTypeList.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRAssertionOperatorTypeList.php index 00bcef6978..61c9e87085 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRAssertionOperatorTypeList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRAssertionOperatorTypeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -253,6 +253,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRAssertionResponseTypesList.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRAssertionResponseTypesList.php index f575a70838..a0928ab918 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRAssertionResponseTypesList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRAssertionResponseTypesList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -255,6 +255,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRAuditEventActionList.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRAuditEventActionList.php index e6fc5b761a..931c6cf753 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRAuditEventActionList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRAuditEventActionList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -248,6 +248,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRAuditEventOutcomeList.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRAuditEventOutcomeList.php index 2c3806bb51..17e3362905 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRAuditEventOutcomeList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRAuditEventOutcomeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -247,6 +247,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRAuditEventParticipantNetworkTypeList.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRAuditEventParticipantNetworkTypeList.php index 7482d65236..48e00ce110 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRAuditEventParticipantNetworkTypeList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRAuditEventParticipantNetworkTypeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -248,6 +248,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRBase64BinaryPrimitive.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRBase64BinaryPrimitive.php index 7752a704be..9da4e90608 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRBase64BinaryPrimitive.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRBase64BinaryPrimitive.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -229,6 +229,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRBindingStrengthList.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRBindingStrengthList.php index 0e001d0ebb..59d13ae096 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRBindingStrengthList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRBindingStrengthList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -247,6 +247,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRBooleanPrimitive.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRBooleanPrimitive.php index 354ed1ff76..2e27bca236 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRBooleanPrimitive.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRBooleanPrimitive.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -225,6 +225,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRBundleTypeList.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRBundleTypeList.php index a94c1d9937..140deea998 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRBundleTypeList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRBundleTypeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -252,6 +252,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRCarePlanActivityStatusList.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRCarePlanActivityStatusList.php index e1a57877d1..b3caf102c5 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRCarePlanActivityStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRCarePlanActivityStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -249,6 +249,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRCarePlanRelationshipList.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRCarePlanRelationshipList.php index bc194df58b..70802ee11e 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRCarePlanRelationshipList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRCarePlanRelationshipList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -246,6 +246,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRCarePlanStatusList.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRCarePlanStatusList.php index 32bc68c025..c1c06921bc 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRCarePlanStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRCarePlanStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -248,6 +248,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRClaimTypeList.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRClaimTypeList.php index 5c06fd897c..e8fedb46d3 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRClaimTypeList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRClaimTypeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -248,6 +248,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRClinicalImpressionStatusList.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRClinicalImpressionStatusList.php index 0a971da9c4..048084b44b 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRClinicalImpressionStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRClinicalImpressionStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -246,6 +246,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRCodePrimitive.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRCodePrimitive.php index 0f1a5b9ec2..34a2dd2a11 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRCodePrimitive.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRCodePrimitive.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -229,6 +229,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRCommunicationRequestStatusList.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRCommunicationRequestStatusList.php index 08109ac2b1..1029120eb1 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRCommunicationRequestStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRCommunicationRequestStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -253,6 +253,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRCommunicationStatusList.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRCommunicationStatusList.php index da62dbcb3a..20b973d455 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRCommunicationStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRCommunicationStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -248,6 +248,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRCompositionAttestationModeList.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRCompositionAttestationModeList.php index b07f339341..7e44df7106 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRCompositionAttestationModeList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRCompositionAttestationModeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -247,6 +247,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRCompositionStatusList.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRCompositionStatusList.php index 496a763c68..302dce3055 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRCompositionStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRCompositionStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -247,6 +247,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRConceptMapEquivalenceList.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRConceptMapEquivalenceList.php index 818365195b..6daf81deb2 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRConceptMapEquivalenceList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRConceptMapEquivalenceList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -252,6 +252,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRConditionVerificationStatusList.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRConditionVerificationStatusList.php index 4e968a5d22..e6af4ea3b1 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRConditionVerificationStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRConditionVerificationStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -249,6 +249,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRConditionalDeleteStatusList.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRConditionalDeleteStatusList.php index 04c1670d2d..f752fa22ea 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRConditionalDeleteStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRConditionalDeleteStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -246,6 +246,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRConformanceEventModeList.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRConformanceEventModeList.php index 9c555d1859..fc1ca26397 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRConformanceEventModeList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRConformanceEventModeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -245,6 +245,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRConformanceResourceStatusList.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRConformanceResourceStatusList.php index 12a34e47c0..a8fc97d7d1 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRConformanceResourceStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRConformanceResourceStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -246,6 +246,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRConformanceStatementKindList.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRConformanceStatementKindList.php index 8c167597ee..9fe8e01cf2 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRConformanceStatementKindList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRConformanceStatementKindList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -246,6 +246,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRConstraintSeverityList.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRConstraintSeverityList.php index 6ab3d444d4..4b89d1040d 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRConstraintSeverityList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRConstraintSeverityList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -245,6 +245,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRContactPointSystemList.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRContactPointSystemList.php index cff6283705..c170b08b13 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRContactPointSystemList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRContactPointSystemList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -248,6 +248,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRContactPointUseList.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRContactPointUseList.php index 24193b49e7..80dde5a188 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRContactPointUseList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRContactPointUseList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -248,6 +248,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRContentTypeList.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRContentTypeList.php index db8cffb97a..356ffa26c5 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRContentTypeList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRContentTypeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -245,6 +245,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRDataElementStringencyList.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRDataElementStringencyList.php index 1518449bf6..ca7db8f62f 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRDataElementStringencyList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRDataElementStringencyList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -249,6 +249,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRDatePrimitive.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRDatePrimitive.php index a1a954134c..2c4fd808ad 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRDatePrimitive.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRDatePrimitive.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -271,6 +271,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRDateTimePrimitive.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRDateTimePrimitive.php index 57f0939653..bf61be6148 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRDateTimePrimitive.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRDateTimePrimitive.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -273,6 +273,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRDaysOfWeekList.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRDaysOfWeekList.php index 53500ffbbd..54aef6b1d9 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRDaysOfWeekList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRDaysOfWeekList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -250,6 +250,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRDecimalPrimitive.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRDecimalPrimitive.php index 538cd37fd2..d22ddf0593 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRDecimalPrimitive.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRDecimalPrimitive.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -224,6 +224,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRDetectedIssueSeverityList.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRDetectedIssueSeverityList.php index 118307366a..6a23f750c6 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRDetectedIssueSeverityList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRDetectedIssueSeverityList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -246,6 +246,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRDeviceMetricCalibrationStateList.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRDeviceMetricCalibrationStateList.php index d7d0cb774d..da92ad4bc1 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRDeviceMetricCalibrationStateList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRDeviceMetricCalibrationStateList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -247,6 +247,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRDeviceMetricCalibrationTypeList.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRDeviceMetricCalibrationTypeList.php index 746315bf62..b23a41278d 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRDeviceMetricCalibrationTypeList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRDeviceMetricCalibrationTypeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -247,6 +247,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRDeviceMetricCategoryList.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRDeviceMetricCategoryList.php index 6584d541df..8d6785e1ee 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRDeviceMetricCategoryList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRDeviceMetricCategoryList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -247,6 +247,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRDeviceMetricColorList.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRDeviceMetricColorList.php index 59a9917201..d575c2c9c9 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRDeviceMetricColorList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRDeviceMetricColorList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -251,6 +251,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRDeviceMetricOperationalStatusList.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRDeviceMetricOperationalStatusList.php index 046d6f6f5d..c49f3e3635 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRDeviceMetricOperationalStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRDeviceMetricOperationalStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -246,6 +246,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRDeviceStatusList.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRDeviceStatusList.php index 7060a1f7b4..f4744cd6e9 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRDeviceStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRDeviceStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -246,6 +246,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRDeviceUseRequestPriorityList.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRDeviceUseRequestPriorityList.php index 928c1f927d..72392c24aa 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRDeviceUseRequestPriorityList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRDeviceUseRequestPriorityList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -247,6 +247,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRDeviceUseRequestStatusList.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRDeviceUseRequestStatusList.php index 28e14645bc..2cb104ae82 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRDeviceUseRequestStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRDeviceUseRequestStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -253,6 +253,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRDiagnosticOrderPriorityList.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRDiagnosticOrderPriorityList.php index f7b8d71fc9..b5ba89f3a2 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRDiagnosticOrderPriorityList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRDiagnosticOrderPriorityList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -247,6 +247,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRDiagnosticOrderStatusList.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRDiagnosticOrderStatusList.php index ee9c2ac391..0ada1c5fd8 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRDiagnosticOrderStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRDiagnosticOrderStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -256,6 +256,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRDiagnosticReportStatusList.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRDiagnosticReportStatusList.php index 8dada01dd6..9369ab0874 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRDiagnosticReportStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRDiagnosticReportStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -250,6 +250,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRDigitalMediaTypeList.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRDigitalMediaTypeList.php index 0f73548670..60525b97bf 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRDigitalMediaTypeList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRDigitalMediaTypeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -246,6 +246,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRDocumentModeList.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRDocumentModeList.php index bde64d4554..cec92c29bd 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRDocumentModeList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRDocumentModeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -245,6 +245,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRDocumentReferenceStatusList.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRDocumentReferenceStatusList.php index 66e589888d..4d455813ad 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRDocumentReferenceStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRDocumentReferenceStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -246,6 +246,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRDocumentRelationshipTypeList.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRDocumentRelationshipTypeList.php index cb548b5635..f594a2dfd4 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRDocumentRelationshipTypeList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRDocumentRelationshipTypeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -247,6 +247,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement.php index f9b25e90e8..5526f574d0 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,9 +78,7 @@ class FHIRElement implements PHPFHIRCommentContainerInterface, PHPFHIRTypeInterf // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ELEMENT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; + const FIELD_FHIR_COMMENTS = 'fhir_comments'; const FIELD_EXTENSION = 'extension'; const FIELD_ID = 'id'; @@ -106,6 +104,9 @@ class FHIRElement implements PHPFHIRCommentContainerInterface, PHPFHIRTypeInterf */ protected $id = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRElement Constructor * @param null|array $data @@ -121,9 +122,19 @@ public function __construct($data = null) gettype($data) )); } + if (isset($data[self::FIELD_FHIR_COMMENTS])) { + if (is_array($data[self::FIELD_FHIR_COMMENTS])) { + $this->_setFHIRComments($data[self::FIELD_FHIR_COMMENTS]); + } else if (is_string($data[self::FIELD_FHIR_COMMENTS])) { + $this->_addFHIRComment($data[self::FIELD_FHIR_COMMENTS]); + } + } if (isset($data[self::FIELD_EXTENSION])) { if (is_array($data[self::FIELD_EXTENSION])) { foreach($data[self::FIELD_EXTENSION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRExtension) { $this->addExtension($v); } else { @@ -367,6 +378,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 public function jsonSerialize() { $a = []; + if ([] !== ($vs = $this->_getFHIRComments())) { + $a[self::FIELD_FHIR_COMMENTS] = $vs; + } if ([] !== ($vs = $this->getExtension())) { $a[self::FIELD_EXTENSION] = $vs; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRAccountStatus.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRAccountStatus.php index c0abb1d6b4..7e1c775c28 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRAccountStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRAccountStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRAccountStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ACCOUNT_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRAccountStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRAccountStatus Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRActionList.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRActionList.php index cc3cd4f077..88d002152d 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRActionList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRActionList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRActionList extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ACTION_LIST; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRActionList extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRActionList Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRAddress.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRAddress.php index fc08892ceb..98059c3315 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRAddress.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRAddress.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRAddress extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ADDRESS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CITY = 'city'; const FIELD_CITY_EXT = '_city'; const FIELD_COUNTRY = 'country'; @@ -214,6 +210,9 @@ class FHIRAddress extends FHIRElement */ protected $use = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRAddress Constructor * @param null|array $data @@ -236,8 +235,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CITY] instanceof FHIRString) { $this->setCity($data[self::FIELD_CITY]); - } elseif ($ext && is_scalar($data[self::FIELD_CITY])) { - $this->setCity(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_CITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CITY])) { + $this->setCity(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_CITY]] + $ext)); + } else if (is_array($data[self::FIELD_CITY])) { + $this->setCity(new FHIRString(array_merge($ext, $data[self::FIELD_CITY]))); + } } else { $this->setCity(new FHIRString($data[self::FIELD_CITY])); } @@ -248,8 +251,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_COUNTRY] instanceof FHIRString) { $this->setCountry($data[self::FIELD_COUNTRY]); - } elseif ($ext && is_scalar($data[self::FIELD_COUNTRY])) { - $this->setCountry(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_COUNTRY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_COUNTRY])) { + $this->setCountry(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_COUNTRY]] + $ext)); + } else if (is_array($data[self::FIELD_COUNTRY])) { + $this->setCountry(new FHIRString(array_merge($ext, $data[self::FIELD_COUNTRY]))); + } } else { $this->setCountry(new FHIRString($data[self::FIELD_COUNTRY])); } @@ -260,8 +267,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DISTRICT] instanceof FHIRString) { $this->setDistrict($data[self::FIELD_DISTRICT]); - } elseif ($ext && is_scalar($data[self::FIELD_DISTRICT])) { - $this->setDistrict(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DISTRICT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DISTRICT])) { + $this->setDistrict(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DISTRICT]] + $ext)); + } else if (is_array($data[self::FIELD_DISTRICT])) { + $this->setDistrict(new FHIRString(array_merge($ext, $data[self::FIELD_DISTRICT]))); + } } else { $this->setDistrict(new FHIRString($data[self::FIELD_DISTRICT])); } @@ -272,17 +283,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_LINE])) { foreach($data[self::FIELD_LINE] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRString) { $this->addLine($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addLine(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addLine(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addLine(new FHIRString(array_merge($v, $ext[$i]))); + } } else { $this->addLine(new FHIRString($v)); } } } elseif ($data[self::FIELD_LINE] instanceof FHIRString) { $this->addLine($data[self::FIELD_LINE]); - } elseif ($ext && is_scalar($data[self::FIELD_LINE])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_LINE])) { $this->addLine(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_LINE]] + $ext)); } else { $this->addLine(new FHIRString($data[self::FIELD_LINE])); @@ -301,8 +319,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_POSTAL_CODE] instanceof FHIRString) { $this->setPostalCode($data[self::FIELD_POSTAL_CODE]); - } elseif ($ext && is_scalar($data[self::FIELD_POSTAL_CODE])) { - $this->setPostalCode(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_POSTAL_CODE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_POSTAL_CODE])) { + $this->setPostalCode(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_POSTAL_CODE]] + $ext)); + } else if (is_array($data[self::FIELD_POSTAL_CODE])) { + $this->setPostalCode(new FHIRString(array_merge($ext, $data[self::FIELD_POSTAL_CODE]))); + } } else { $this->setPostalCode(new FHIRString($data[self::FIELD_POSTAL_CODE])); } @@ -313,8 +335,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATE] instanceof FHIRString) { $this->setState($data[self::FIELD_STATE]); - } elseif ($ext && is_scalar($data[self::FIELD_STATE])) { - $this->setState(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_STATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATE])) { + $this->setState(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_STATE]] + $ext)); + } else if (is_array($data[self::FIELD_STATE])) { + $this->setState(new FHIRString(array_merge($ext, $data[self::FIELD_STATE]))); + } } else { $this->setState(new FHIRString($data[self::FIELD_STATE])); } @@ -325,8 +351,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TEXT] instanceof FHIRString) { $this->setText($data[self::FIELD_TEXT]); - } elseif ($ext && is_scalar($data[self::FIELD_TEXT])) { - $this->setText(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TEXT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TEXT])) { + $this->setText(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TEXT]] + $ext)); + } else if (is_array($data[self::FIELD_TEXT])) { + $this->setText(new FHIRString(array_merge($ext, $data[self::FIELD_TEXT]))); + } } else { $this->setText(new FHIRString($data[self::FIELD_TEXT])); } @@ -337,8 +367,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TYPE] instanceof FHIRAddressType) { $this->setType($data[self::FIELD_TYPE]); - } elseif ($ext && is_scalar($data[self::FIELD_TYPE])) { - $this->setType(new FHIRAddressType([FHIRAddressType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TYPE])) { + $this->setType(new FHIRAddressType([FHIRAddressType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } else if (is_array($data[self::FIELD_TYPE])) { + $this->setType(new FHIRAddressType(array_merge($ext, $data[self::FIELD_TYPE]))); + } } else { $this->setType(new FHIRAddressType($data[self::FIELD_TYPE])); } @@ -349,8 +383,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_USE] instanceof FHIRAddressUse) { $this->setUse($data[self::FIELD_USE]); - } elseif ($ext && is_scalar($data[self::FIELD_USE])) { - $this->setUse(new FHIRAddressUse([FHIRAddressUse::FIELD_VALUE => $data[self::FIELD_USE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_USE])) { + $this->setUse(new FHIRAddressUse([FHIRAddressUse::FIELD_VALUE => $data[self::FIELD_USE]] + $ext)); + } else if (is_array($data[self::FIELD_USE])) { + $this->setUse(new FHIRAddressUse(array_merge($ext, $data[self::FIELD_USE]))); + } } else { $this->setUse(new FHIRAddressUse($data[self::FIELD_USE])); } @@ -924,11 +962,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getText())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TEXT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getUse())) { $v->xmlSerialize($sxe->addChild(self::FIELD_USE, null, $v->_getFHIRXMLNamespace())); } @@ -942,16 +978,37 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getCity())) { - $a[self::FIELD_CITY] = $v->getValue(); - $a[self::FIELD_CITY_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CITY_EXT] = $enc; + } + } else { + $a[self::FIELD_CITY] = $v; + } } if (null !== ($v = $this->getCountry())) { - $a[self::FIELD_COUNTRY] = $v->getValue(); - $a[self::FIELD_COUNTRY_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_COUNTRY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_COUNTRY_EXT] = $enc; + } + } else { + $a[self::FIELD_COUNTRY] = $v; + } } if (null !== ($v = $this->getDistrict())) { - $a[self::FIELD_DISTRICT] = $v->getValue(); - $a[self::FIELD_DISTRICT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DISTRICT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DISTRICT_EXT] = $enc; + } + } else { + $a[self::FIELD_DISTRICT] = $v; + } } if ([] !== ($vs = $this->getLine())) { $a[self::FIELD_LINE] = []; @@ -959,30 +1016,76 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_LINE][] = $v->getValue(); - $a[self::FIELD_LINE_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_LINE][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_LINE_EXT][] = $enc; + } else { + $a[self::FIELD_LINE_EXT][] = null; + } + } else { + $a[self::FIELD_LINE][] = $v; + } } } if (null !== ($v = $this->getPeriod())) { $a[self::FIELD_PERIOD] = $v; } if (null !== ($v = $this->getPostalCode())) { - $a[self::FIELD_POSTAL_CODE] = $v->getValue(); - $a[self::FIELD_POSTAL_CODE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_POSTAL_CODE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_POSTAL_CODE_EXT] = $enc; + } + } else { + $a[self::FIELD_POSTAL_CODE] = $v; + } } if (null !== ($v = $this->getState())) { - $a[self::FIELD_STATE] = $v->getValue(); - $a[self::FIELD_STATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATE_EXT] = $enc; + } + } else { + $a[self::FIELD_STATE] = $v; + } } if (null !== ($v = $this->getText())) { - $a[self::FIELD_TEXT] = $v->getValue(); - $a[self::FIELD_TEXT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TEXT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TEXT_EXT] = $enc; + } + } else { + $a[self::FIELD_TEXT] = $v; + } } if (null !== ($v = $this->getType())) { - $a[self::FIELD_TYPE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TYPE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TYPE_EXT] = $enc; + } + } else { + $a[self::FIELD_TYPE] = $v; + } } if (null !== ($v = $this->getUse())) { - $a[self::FIELD_USE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_USE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_USE_EXT] = $enc; + } + } else { + $a[self::FIELD_USE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRAddressType.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRAddressType.php index 6767f6e0c9..c6a4cb2f4b 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRAddressType.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRAddressType.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRAddressType extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ADDRESS_TYPE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRAddressType extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRAddressType Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRAddressUse.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRAddressUse.php index 5ed7c4b38d..57ebf32054 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRAddressUse.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRAddressUse.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRAddressUse extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ADDRESS_USE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRAddressUse extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRAddressUse Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRAdministrativeGender.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRAdministrativeGender.php index 056a286cbc..378956ce9b 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRAdministrativeGender.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRAdministrativeGender.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -77,10 +77,6 @@ class FHIRAdministrativeGender extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ADMINISTRATIVE_GENDER; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -88,6 +84,9 @@ class FHIRAdministrativeGender extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRAdministrativeGender Constructor * @param null|array $data @@ -243,8 +242,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRAggregationMode.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRAggregationMode.php index 2e061fb731..cb58cf268e 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRAggregationMode.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRAggregationMode.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRAggregationMode extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_AGGREGATION_MODE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRAggregationMode extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRAggregationMode Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRAllergyIntoleranceCategory.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRAllergyIntoleranceCategory.php index 423f5d08fb..9190e0ae94 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRAllergyIntoleranceCategory.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRAllergyIntoleranceCategory.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRAllergyIntoleranceCategory extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ALLERGY_INTOLERANCE_CATEGORY; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRAllergyIntoleranceCategory extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRAllergyIntoleranceCategory Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRAllergyIntoleranceCertainty.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRAllergyIntoleranceCertainty.php index 322388ec3a..d49f40fb05 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRAllergyIntoleranceCertainty.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRAllergyIntoleranceCertainty.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRAllergyIntoleranceCertainty extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ALLERGY_INTOLERANCE_CERTAINTY; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -90,6 +86,9 @@ class FHIRAllergyIntoleranceCertainty extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRAllergyIntoleranceCertainty Constructor * @param null|array $data @@ -245,8 +244,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRAllergyIntoleranceCriticality.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRAllergyIntoleranceCriticality.php index f1a81b96bb..33a4cb9cd2 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRAllergyIntoleranceCriticality.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRAllergyIntoleranceCriticality.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRAllergyIntoleranceCriticality extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ALLERGY_INTOLERANCE_CRITICALITY; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -90,6 +86,9 @@ class FHIRAllergyIntoleranceCriticality extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRAllergyIntoleranceCriticality Constructor * @param null|array $data @@ -245,8 +244,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRAllergyIntoleranceSeverity.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRAllergyIntoleranceSeverity.php index f97f853a46..af8ba1ea74 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRAllergyIntoleranceSeverity.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRAllergyIntoleranceSeverity.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRAllergyIntoleranceSeverity extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ALLERGY_INTOLERANCE_SEVERITY; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -90,6 +86,9 @@ class FHIRAllergyIntoleranceSeverity extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRAllergyIntoleranceSeverity Constructor * @param null|array $data @@ -245,8 +244,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRAllergyIntoleranceStatus.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRAllergyIntoleranceStatus.php index c406deca87..f467a71e7d 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRAllergyIntoleranceStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRAllergyIntoleranceStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRAllergyIntoleranceStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ALLERGY_INTOLERANCE_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -90,6 +86,9 @@ class FHIRAllergyIntoleranceStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRAllergyIntoleranceStatus Constructor * @param null|array $data @@ -245,8 +244,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRAllergyIntoleranceType.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRAllergyIntoleranceType.php index 728f9f6fd7..483b3a9d03 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRAllergyIntoleranceType.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRAllergyIntoleranceType.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRAllergyIntoleranceType extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ALLERGY_INTOLERANCE_TYPE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRAllergyIntoleranceType extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRAllergyIntoleranceType Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRAnnotation.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRAnnotation.php index b58f673163..f55e908ef6 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRAnnotation.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRAnnotation.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRAnnotation extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ANNOTATION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_AUTHOR_REFERENCE = 'authorReference'; const FIELD_AUTHOR_STRING = 'authorString'; const FIELD_AUTHOR_STRING_EXT = '_authorString'; @@ -138,6 +134,9 @@ class FHIRAnnotation extends FHIRElement */ protected $time = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRAnnotation Constructor * @param null|array $data @@ -167,8 +166,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_AUTHOR_STRING] instanceof FHIRString) { $this->setAuthorString($data[self::FIELD_AUTHOR_STRING]); - } elseif ($ext && is_scalar($data[self::FIELD_AUTHOR_STRING])) { - $this->setAuthorString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_AUTHOR_STRING]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_AUTHOR_STRING])) { + $this->setAuthorString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_AUTHOR_STRING]] + $ext)); + } else if (is_array($data[self::FIELD_AUTHOR_STRING])) { + $this->setAuthorString(new FHIRString(array_merge($ext, $data[self::FIELD_AUTHOR_STRING]))); + } } else { $this->setAuthorString(new FHIRString($data[self::FIELD_AUTHOR_STRING])); } @@ -179,8 +182,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TEXT] instanceof FHIRString) { $this->setText($data[self::FIELD_TEXT]); - } elseif ($ext && is_scalar($data[self::FIELD_TEXT])) { - $this->setText(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TEXT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TEXT])) { + $this->setText(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TEXT]] + $ext)); + } else if (is_array($data[self::FIELD_TEXT])) { + $this->setText(new FHIRString(array_merge($ext, $data[self::FIELD_TEXT]))); + } } else { $this->setText(new FHIRString($data[self::FIELD_TEXT])); } @@ -191,8 +198,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TIME] instanceof FHIRDateTime) { $this->setTime($data[self::FIELD_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_TIME])) { - $this->setTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TIME])) { + $this->setTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_TIME])) { + $this->setTime(new FHIRDateTime(array_merge($ext, $data[self::FIELD_TIME]))); + } } else { $this->setTime(new FHIRDateTime($data[self::FIELD_TIME])); } @@ -469,7 +480,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getAuthorReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AUTHOR_REFERENCE, null, $v->_getFHIRXMLNamespace())); } @@ -495,16 +505,37 @@ public function jsonSerialize() $a[self::FIELD_AUTHOR_REFERENCE] = $v; } if (null !== ($v = $this->getAuthorString())) { - $a[self::FIELD_AUTHOR_STRING] = $v->getValue(); - $a[self::FIELD_AUTHOR_STRING_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_AUTHOR_STRING] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_AUTHOR_STRING_EXT] = $enc; + } + } else { + $a[self::FIELD_AUTHOR_STRING] = $v; + } } if (null !== ($v = $this->getText())) { - $a[self::FIELD_TEXT] = $v->getValue(); - $a[self::FIELD_TEXT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TEXT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TEXT_EXT] = $enc; + } + } else { + $a[self::FIELD_TEXT] = $v; + } } if (null !== ($v = $this->getTime())) { - $a[self::FIELD_TIME] = $v->getValue(); - $a[self::FIELD_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_TIME] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRAnswerFormat.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRAnswerFormat.php index da4a45dfa5..a0c018a179 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRAnswerFormat.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRAnswerFormat.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRAnswerFormat extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ANSWER_FORMAT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRAnswerFormat extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRAnswerFormat Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRAppointmentStatus.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRAppointmentStatus.php index f649d7b506..e146581564 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRAppointmentStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRAppointmentStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRAppointmentStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_APPOINTMENT_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRAppointmentStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRAppointmentStatus Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRAssertionDirectionType.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRAssertionDirectionType.php index 2661fa21ea..ed0f351da3 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRAssertionDirectionType.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRAssertionDirectionType.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRAssertionDirectionType extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ASSERTION_DIRECTION_TYPE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRAssertionDirectionType extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRAssertionDirectionType Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRAssertionOperatorType.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRAssertionOperatorType.php index a2cb3cd766..6556b79280 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRAssertionOperatorType.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRAssertionOperatorType.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRAssertionOperatorType extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ASSERTION_OPERATOR_TYPE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRAssertionOperatorType extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRAssertionOperatorType Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRAssertionResponseTypes.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRAssertionResponseTypes.php index abf681ab48..ed97e99b34 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRAssertionResponseTypes.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRAssertionResponseTypes.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRAssertionResponseTypes extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ASSERTION_RESPONSE_TYPES; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRAssertionResponseTypes extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRAssertionResponseTypes Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRAttachment.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRAttachment.php index 1edfbec0ac..dc3b226fc2 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRAttachment.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRAttachment.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRAttachment extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ATTACHMENT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CONTENT_TYPE = 'contentType'; const FIELD_CONTENT_TYPE_EXT = '_contentType'; const FIELD_CREATION = 'creation'; @@ -196,6 +192,9 @@ class FHIRAttachment extends FHIRElement */ protected $url = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRAttachment Constructor * @param null|array $data @@ -218,8 +217,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CONTENT_TYPE] instanceof FHIRCode) { $this->setContentType($data[self::FIELD_CONTENT_TYPE]); - } elseif ($ext && is_scalar($data[self::FIELD_CONTENT_TYPE])) { - $this->setContentType(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_CONTENT_TYPE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CONTENT_TYPE])) { + $this->setContentType(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_CONTENT_TYPE]] + $ext)); + } else if (is_array($data[self::FIELD_CONTENT_TYPE])) { + $this->setContentType(new FHIRCode(array_merge($ext, $data[self::FIELD_CONTENT_TYPE]))); + } } else { $this->setContentType(new FHIRCode($data[self::FIELD_CONTENT_TYPE])); } @@ -230,8 +233,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CREATION] instanceof FHIRDateTime) { $this->setCreation($data[self::FIELD_CREATION]); - } elseif ($ext && is_scalar($data[self::FIELD_CREATION])) { - $this->setCreation(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_CREATION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CREATION])) { + $this->setCreation(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_CREATION]] + $ext)); + } else if (is_array($data[self::FIELD_CREATION])) { + $this->setCreation(new FHIRDateTime(array_merge($ext, $data[self::FIELD_CREATION]))); + } } else { $this->setCreation(new FHIRDateTime($data[self::FIELD_CREATION])); } @@ -242,8 +249,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATA] instanceof FHIRBase64Binary) { $this->setData($data[self::FIELD_DATA]); - } elseif ($ext && is_scalar($data[self::FIELD_DATA])) { - $this->setData(new FHIRBase64Binary([FHIRBase64Binary::FIELD_VALUE => $data[self::FIELD_DATA]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATA])) { + $this->setData(new FHIRBase64Binary([FHIRBase64Binary::FIELD_VALUE => $data[self::FIELD_DATA]] + $ext)); + } else if (is_array($data[self::FIELD_DATA])) { + $this->setData(new FHIRBase64Binary(array_merge($ext, $data[self::FIELD_DATA]))); + } } else { $this->setData(new FHIRBase64Binary($data[self::FIELD_DATA])); } @@ -254,8 +265,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_HASH] instanceof FHIRBase64Binary) { $this->setHash($data[self::FIELD_HASH]); - } elseif ($ext && is_scalar($data[self::FIELD_HASH])) { - $this->setHash(new FHIRBase64Binary([FHIRBase64Binary::FIELD_VALUE => $data[self::FIELD_HASH]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_HASH])) { + $this->setHash(new FHIRBase64Binary([FHIRBase64Binary::FIELD_VALUE => $data[self::FIELD_HASH]] + $ext)); + } else if (is_array($data[self::FIELD_HASH])) { + $this->setHash(new FHIRBase64Binary(array_merge($ext, $data[self::FIELD_HASH]))); + } } else { $this->setHash(new FHIRBase64Binary($data[self::FIELD_HASH])); } @@ -266,8 +281,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_LANGUAGE] instanceof FHIRCode) { $this->setLanguage($data[self::FIELD_LANGUAGE]); - } elseif ($ext && is_scalar($data[self::FIELD_LANGUAGE])) { - $this->setLanguage(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_LANGUAGE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_LANGUAGE])) { + $this->setLanguage(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_LANGUAGE]] + $ext)); + } else if (is_array($data[self::FIELD_LANGUAGE])) { + $this->setLanguage(new FHIRCode(array_merge($ext, $data[self::FIELD_LANGUAGE]))); + } } else { $this->setLanguage(new FHIRCode($data[self::FIELD_LANGUAGE])); } @@ -278,8 +297,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SIZE] instanceof FHIRUnsignedInt) { $this->setSize($data[self::FIELD_SIZE]); - } elseif ($ext && is_scalar($data[self::FIELD_SIZE])) { - $this->setSize(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_SIZE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SIZE])) { + $this->setSize(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_SIZE]] + $ext)); + } else if (is_array($data[self::FIELD_SIZE])) { + $this->setSize(new FHIRUnsignedInt(array_merge($ext, $data[self::FIELD_SIZE]))); + } } else { $this->setSize(new FHIRUnsignedInt($data[self::FIELD_SIZE])); } @@ -290,8 +313,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TITLE] instanceof FHIRString) { $this->setTitle($data[self::FIELD_TITLE]); - } elseif ($ext && is_scalar($data[self::FIELD_TITLE])) { - $this->setTitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TITLE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TITLE])) { + $this->setTitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TITLE]] + $ext)); + } else if (is_array($data[self::FIELD_TITLE])) { + $this->setTitle(new FHIRString(array_merge($ext, $data[self::FIELD_TITLE]))); + } } else { $this->setTitle(new FHIRString($data[self::FIELD_TITLE])); } @@ -302,8 +329,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_URL] instanceof FHIRUri) { $this->setUrl($data[self::FIELD_URL]); - } elseif ($ext && is_scalar($data[self::FIELD_URL])) { - $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } else if (is_array($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri(array_merge($ext, $data[self::FIELD_URL]))); + } } else { $this->setUrl(new FHIRUri($data[self::FIELD_URL])); } @@ -813,36 +844,92 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getContentType())) { - $a[self::FIELD_CONTENT_TYPE] = $v->getValue(); - $a[self::FIELD_CONTENT_TYPE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CONTENT_TYPE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CONTENT_TYPE_EXT] = $enc; + } + } else { + $a[self::FIELD_CONTENT_TYPE] = $v; + } } if (null !== ($v = $this->getCreation())) { - $a[self::FIELD_CREATION] = $v->getValue(); - $a[self::FIELD_CREATION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CREATION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CREATION_EXT] = $enc; + } + } else { + $a[self::FIELD_CREATION] = $v; + } } if (null !== ($v = $this->getData())) { - $a[self::FIELD_DATA] = $v->getValue(); - $a[self::FIELD_DATA_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATA] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATA_EXT] = $enc; + } + } else { + $a[self::FIELD_DATA] = $v; + } } if (null !== ($v = $this->getHash())) { - $a[self::FIELD_HASH] = $v->getValue(); - $a[self::FIELD_HASH_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_HASH] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_HASH_EXT] = $enc; + } + } else { + $a[self::FIELD_HASH] = $v; + } } if (null !== ($v = $this->getLanguage())) { - $a[self::FIELD_LANGUAGE] = $v->getValue(); - $a[self::FIELD_LANGUAGE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_LANGUAGE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_LANGUAGE_EXT] = $enc; + } + } else { + $a[self::FIELD_LANGUAGE] = $v; + } } if (null !== ($v = $this->getSize())) { - $a[self::FIELD_SIZE] = $v->getValue(); - $a[self::FIELD_SIZE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SIZE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SIZE_EXT] = $enc; + } + } else { + $a[self::FIELD_SIZE] = $v; + } } if (null !== ($v = $this->getTitle())) { - $a[self::FIELD_TITLE] = $v->getValue(); - $a[self::FIELD_TITLE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TITLE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TITLE_EXT] = $enc; + } + } else { + $a[self::FIELD_TITLE] = $v; + } } if (null !== ($v = $this->getUrl())) { - $a[self::FIELD_URL] = $v->getValue(); - $a[self::FIELD_URL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_URL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_URL_EXT] = $enc; + } + } else { + $a[self::FIELD_URL] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRAuditEventAction.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRAuditEventAction.php index 47c3ca7cb7..428787b640 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRAuditEventAction.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRAuditEventAction.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRAuditEventAction extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_AUDIT_EVENT_ACTION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -90,6 +86,9 @@ class FHIRAuditEventAction extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRAuditEventAction Constructor * @param null|array $data @@ -245,8 +244,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRAuditEventOutcome.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRAuditEventOutcome.php index 09087a22a7..5b69ed2bec 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRAuditEventOutcome.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRAuditEventOutcome.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRAuditEventOutcome extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_AUDIT_EVENT_OUTCOME; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRAuditEventOutcome extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRAuditEventOutcome Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRAuditEventParticipantNetworkType.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRAuditEventParticipantNetworkType.php index cdf3287bd3..1af50cdf36 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRAuditEventParticipantNetworkType.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRAuditEventParticipantNetworkType.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRAuditEventParticipantNetworkType extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_AUDIT_EVENT_PARTICIPANT_NETWORK_TYPE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRAuditEventParticipantNetworkType extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRAuditEventParticipantNetworkType Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement.php index 61ebe18912..0da3ffb8b9 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRBackboneElement extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_BACKBONE_ELEMENT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_MODIFIER_EXTENSION = 'modifierExtension'; /** @@ -103,6 +99,9 @@ class FHIRBackboneElement extends FHIRElement */ protected $modifierExtension = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRBackboneElement Constructor * @param null|array $data @@ -122,6 +121,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_MODIFIER_EXTENSION])) { if (is_array($data[self::FIELD_MODIFIER_EXTENSION])) { foreach($data[self::FIELD_MODIFIER_EXTENSION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRExtension) { $this->addModifierExtension($v); } else { @@ -317,7 +319,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getModifierExtension())) { foreach($vs as $v) { if (null === $v) { @@ -326,6 +327,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_MODIFIER_EXTENSION, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRAllergyIntolerance/FHIRAllergyIntoleranceReaction.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRAllergyIntolerance/FHIRAllergyIntoleranceReaction.php index 6efb9eff8f..d189801a52 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRAllergyIntolerance/FHIRAllergyIntoleranceReaction.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRAllergyIntolerance/FHIRAllergyIntoleranceReaction.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -83,10 +83,6 @@ class FHIRAllergyIntoleranceReaction extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ALLERGY_INTOLERANCE_DOT_REACTION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CERTAINTY = 'certainty'; const FIELD_CERTAINTY_EXT = '_certainty'; const FIELD_DESCRIPTION = 'description'; @@ -205,6 +201,9 @@ class FHIRAllergyIntoleranceReaction extends FHIRBackboneElement */ protected $substance = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRAllergyIntoleranceReaction Constructor * @param null|array $data @@ -227,8 +226,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CERTAINTY] instanceof FHIRAllergyIntoleranceCertainty) { $this->setCertainty($data[self::FIELD_CERTAINTY]); - } elseif ($ext && is_scalar($data[self::FIELD_CERTAINTY])) { - $this->setCertainty(new FHIRAllergyIntoleranceCertainty([FHIRAllergyIntoleranceCertainty::FIELD_VALUE => $data[self::FIELD_CERTAINTY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CERTAINTY])) { + $this->setCertainty(new FHIRAllergyIntoleranceCertainty([FHIRAllergyIntoleranceCertainty::FIELD_VALUE => $data[self::FIELD_CERTAINTY]] + $ext)); + } else if (is_array($data[self::FIELD_CERTAINTY])) { + $this->setCertainty(new FHIRAllergyIntoleranceCertainty(array_merge($ext, $data[self::FIELD_CERTAINTY]))); + } } else { $this->setCertainty(new FHIRAllergyIntoleranceCertainty($data[self::FIELD_CERTAINTY])); } @@ -239,8 +242,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -255,6 +262,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_MANIFESTATION])) { if (is_array($data[self::FIELD_MANIFESTATION])) { foreach($data[self::FIELD_MANIFESTATION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addManifestation($v); } else { @@ -280,8 +290,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ONSET] instanceof FHIRDateTime) { $this->setOnset($data[self::FIELD_ONSET]); - } elseif ($ext && is_scalar($data[self::FIELD_ONSET])) { - $this->setOnset(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_ONSET]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ONSET])) { + $this->setOnset(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_ONSET]] + $ext)); + } else if (is_array($data[self::FIELD_ONSET])) { + $this->setOnset(new FHIRDateTime(array_merge($ext, $data[self::FIELD_ONSET]))); + } } else { $this->setOnset(new FHIRDateTime($data[self::FIELD_ONSET])); } @@ -292,8 +306,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SEVERITY] instanceof FHIRAllergyIntoleranceSeverity) { $this->setSeverity($data[self::FIELD_SEVERITY]); - } elseif ($ext && is_scalar($data[self::FIELD_SEVERITY])) { - $this->setSeverity(new FHIRAllergyIntoleranceSeverity([FHIRAllergyIntoleranceSeverity::FIELD_VALUE => $data[self::FIELD_SEVERITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SEVERITY])) { + $this->setSeverity(new FHIRAllergyIntoleranceSeverity([FHIRAllergyIntoleranceSeverity::FIELD_VALUE => $data[self::FIELD_SEVERITY]] + $ext)); + } else if (is_array($data[self::FIELD_SEVERITY])) { + $this->setSeverity(new FHIRAllergyIntoleranceSeverity(array_merge($ext, $data[self::FIELD_SEVERITY]))); + } } else { $this->setSeverity(new FHIRAllergyIntoleranceSeverity($data[self::FIELD_SEVERITY])); } @@ -756,18 +774,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getCertainty())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CERTAINTY, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getDescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESCRIPTION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getExposureRoute())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EXPOSURE_ROUTE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getManifestation())) { foreach($vs as $v) { if (null === $v) { @@ -783,11 +798,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getOnset())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ONSET, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSeverity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SEVERITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSubstance())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBSTANCE, null, $v->_getFHIRXMLNamespace())); } @@ -801,11 +814,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getCertainty())) { - $a[self::FIELD_CERTAINTY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CERTAINTY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CERTAINTY_EXT] = $enc; + } + } else { + $a[self::FIELD_CERTAINTY] = $v; + } } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if (null !== ($v = $this->getExposureRoute())) { $a[self::FIELD_EXPOSURE_ROUTE] = $v; @@ -817,11 +845,26 @@ public function jsonSerialize() $a[self::FIELD_NOTE] = $v; } if (null !== ($v = $this->getOnset())) { - $a[self::FIELD_ONSET] = $v->getValue(); - $a[self::FIELD_ONSET_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ONSET] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ONSET_EXT] = $enc; + } + } else { + $a[self::FIELD_ONSET] = $v; + } } if (null !== ($v = $this->getSeverity())) { - $a[self::FIELD_SEVERITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SEVERITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SEVERITY_EXT] = $enc; + } + } else { + $a[self::FIELD_SEVERITY] = $v; + } } if (null !== ($v = $this->getSubstance())) { $a[self::FIELD_SUBSTANCE] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRAppointment/FHIRAppointmentParticipant.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRAppointment/FHIRAppointmentParticipant.php index cb48060187..47018ac312 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRAppointment/FHIRAppointmentParticipant.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRAppointment/FHIRAppointmentParticipant.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -82,10 +82,6 @@ class FHIRAppointmentParticipant extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_APPOINTMENT_DOT_PARTICIPANT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ACTOR = 'actor'; const FIELD_REQUIRED = 'required'; const FIELD_REQUIRED_EXT = '_required'; @@ -139,6 +135,9 @@ class FHIRAppointmentParticipant extends FHIRBackboneElement */ protected $type = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRAppointmentParticipant Constructor * @param null|array $data @@ -168,8 +167,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_REQUIRED] instanceof FHIRParticipantRequired) { $this->setRequired($data[self::FIELD_REQUIRED]); - } elseif ($ext && is_scalar($data[self::FIELD_REQUIRED])) { - $this->setRequired(new FHIRParticipantRequired([FHIRParticipantRequired::FIELD_VALUE => $data[self::FIELD_REQUIRED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_REQUIRED])) { + $this->setRequired(new FHIRParticipantRequired([FHIRParticipantRequired::FIELD_VALUE => $data[self::FIELD_REQUIRED]] + $ext)); + } else if (is_array($data[self::FIELD_REQUIRED])) { + $this->setRequired(new FHIRParticipantRequired(array_merge($ext, $data[self::FIELD_REQUIRED]))); + } } else { $this->setRequired(new FHIRParticipantRequired($data[self::FIELD_REQUIRED])); } @@ -180,8 +183,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRParticipationStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRParticipationStatus([FHIRParticipationStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRParticipationStatus([FHIRParticipationStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRParticipationStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRParticipationStatus($data[self::FIELD_STATUS])); } @@ -189,6 +196,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_TYPE])) { if (is_array($data[self::FIELD_TYPE])) { foreach($data[self::FIELD_TYPE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addType($v); } else { @@ -467,19 +477,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getActor())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ACTOR, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRequired())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REQUIRED, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getType())) { foreach($vs as $v) { if (null === $v) { @@ -488,6 +494,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } @@ -501,10 +508,26 @@ public function jsonSerialize() $a[self::FIELD_ACTOR] = $v; } if (null !== ($v = $this->getRequired())) { - $a[self::FIELD_REQUIRED] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_REQUIRED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_REQUIRED_EXT] = $enc; + } + } else { + $a[self::FIELD_REQUIRED] = $v; + } } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if ([] !== ($vs = $this->getType())) { $a[self::FIELD_TYPE] = $vs; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRAuditEvent/FHIRAuditEventDetail.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRAuditEvent/FHIRAuditEventDetail.php index fea6949360..58a2c313d0 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRAuditEvent/FHIRAuditEventDetail.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRAuditEvent/FHIRAuditEventDetail.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRAuditEventDetail extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_AUDIT_EVENT_DOT_DETAIL; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_TYPE = 'type'; const FIELD_TYPE_EXT = '_type'; const FIELD_VALUE = 'value'; @@ -111,6 +107,9 @@ class FHIRAuditEventDetail extends FHIRBackboneElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRAuditEventDetail Constructor * @param null|array $data @@ -137,8 +136,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TYPE] instanceof FHIRString) { $this->setType($data[self::FIELD_TYPE]); - } elseif ($ext && is_scalar($data[self::FIELD_TYPE])) { - $this->setType(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TYPE])) { + $this->setType(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } else if (is_array($data[self::FIELD_TYPE])) { + $this->setType(new FHIRString(array_merge($ext, $data[self::FIELD_TYPE]))); + } } else { $this->setType(new FHIRString($data[self::FIELD_TYPE])); } @@ -149,8 +152,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE] instanceof FHIRBase64Binary) { $this->setValue($data[self::FIELD_VALUE]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE])) { - $this->setValue(new FHIRBase64Binary([FHIRBase64Binary::FIELD_VALUE => $data[self::FIELD_VALUE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE])) { + $this->setValue(new FHIRBase64Binary([FHIRBase64Binary::FIELD_VALUE => $data[self::FIELD_VALUE]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE])) { + $this->setValue(new FHIRBase64Binary(array_merge($ext, $data[self::FIELD_VALUE]))); + } } else { $this->setValue(new FHIRBase64Binary($data[self::FIELD_VALUE])); } @@ -348,6 +355,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getValue())) { + $sxe->addAttribute(self::FIELD_VALUE, (string)$v); $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE, null, $v->_getFHIRXMLNamespace())); } return $sxe; @@ -360,12 +368,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getType())) { - $a[self::FIELD_TYPE] = $v->getValue(); - $a[self::FIELD_TYPE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TYPE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TYPE_EXT] = $enc; + } + } else { + $a[self::FIELD_TYPE] = $v; + } } if (null !== ($v = $this->getValue())) { - $a[self::FIELD_VALUE] = $v->getValue(); - $a[self::FIELD_VALUE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRAuditEvent/FHIRAuditEventEvent.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRAuditEvent/FHIRAuditEventEvent.php index 437ffe8d10..66a803433b 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRAuditEvent/FHIRAuditEventEvent.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRAuditEvent/FHIRAuditEventEvent.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -83,10 +83,6 @@ class FHIRAuditEventEvent extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_AUDIT_EVENT_DOT_EVENT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ACTION = 'action'; const FIELD_ACTION_EXT = '_action'; const FIELD_DATE_TIME = 'dateTime'; @@ -180,6 +176,9 @@ class FHIRAuditEventEvent extends FHIRBackboneElement */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRAuditEventEvent Constructor * @param null|array $data @@ -202,8 +201,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ACTION] instanceof FHIRAuditEventAction) { $this->setAction($data[self::FIELD_ACTION]); - } elseif ($ext && is_scalar($data[self::FIELD_ACTION])) { - $this->setAction(new FHIRAuditEventAction([FHIRAuditEventAction::FIELD_VALUE => $data[self::FIELD_ACTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ACTION])) { + $this->setAction(new FHIRAuditEventAction([FHIRAuditEventAction::FIELD_VALUE => $data[self::FIELD_ACTION]] + $ext)); + } else if (is_array($data[self::FIELD_ACTION])) { + $this->setAction(new FHIRAuditEventAction(array_merge($ext, $data[self::FIELD_ACTION]))); + } } else { $this->setAction(new FHIRAuditEventAction($data[self::FIELD_ACTION])); } @@ -214,8 +217,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATE_TIME] instanceof FHIRInstant) { $this->setDateTime($data[self::FIELD_DATE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_DATE_TIME])) { - $this->setDateTime(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_DATE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATE_TIME])) { + $this->setDateTime(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_DATE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_DATE_TIME])) { + $this->setDateTime(new FHIRInstant(array_merge($ext, $data[self::FIELD_DATE_TIME]))); + } } else { $this->setDateTime(new FHIRInstant($data[self::FIELD_DATE_TIME])); } @@ -226,8 +233,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_OUTCOME] instanceof FHIRAuditEventOutcome) { $this->setOutcome($data[self::FIELD_OUTCOME]); - } elseif ($ext && is_scalar($data[self::FIELD_OUTCOME])) { - $this->setOutcome(new FHIRAuditEventOutcome([FHIRAuditEventOutcome::FIELD_VALUE => $data[self::FIELD_OUTCOME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_OUTCOME])) { + $this->setOutcome(new FHIRAuditEventOutcome([FHIRAuditEventOutcome::FIELD_VALUE => $data[self::FIELD_OUTCOME]] + $ext)); + } else if (is_array($data[self::FIELD_OUTCOME])) { + $this->setOutcome(new FHIRAuditEventOutcome(array_merge($ext, $data[self::FIELD_OUTCOME]))); + } } else { $this->setOutcome(new FHIRAuditEventOutcome($data[self::FIELD_OUTCOME])); } @@ -238,8 +249,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_OUTCOME_DESC] instanceof FHIRString) { $this->setOutcomeDesc($data[self::FIELD_OUTCOME_DESC]); - } elseif ($ext && is_scalar($data[self::FIELD_OUTCOME_DESC])) { - $this->setOutcomeDesc(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_OUTCOME_DESC]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_OUTCOME_DESC])) { + $this->setOutcomeDesc(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_OUTCOME_DESC]] + $ext)); + } else if (is_array($data[self::FIELD_OUTCOME_DESC])) { + $this->setOutcomeDesc(new FHIRString(array_merge($ext, $data[self::FIELD_OUTCOME_DESC]))); + } } else { $this->setOutcomeDesc(new FHIRString($data[self::FIELD_OUTCOME_DESC])); } @@ -247,6 +262,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PURPOSE_OF_EVENT])) { if (is_array($data[self::FIELD_PURPOSE_OF_EVENT])) { foreach($data[self::FIELD_PURPOSE_OF_EVENT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCoding) { $this->addPurposeOfEvent($v); } else { @@ -262,6 +280,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SUBTYPE])) { if (is_array($data[self::FIELD_SUBTYPE])) { foreach($data[self::FIELD_SUBTYPE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCoding) { $this->addSubtype($v); } else { @@ -699,21 +720,18 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getAction())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ACTION, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getDateTime())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DATE_TIME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOutcome())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OUTCOME, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getOutcomeDesc())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OUTCOME_DESC, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getPurposeOfEvent())) { foreach($vs as $v) { if (null === $v) { @@ -745,18 +763,48 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getAction())) { - $a[self::FIELD_ACTION] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ACTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ACTION_EXT] = $enc; + } + } else { + $a[self::FIELD_ACTION] = $v; + } } if (null !== ($v = $this->getDateTime())) { - $a[self::FIELD_DATE_TIME] = $v->getValue(); - $a[self::FIELD_DATE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_DATE_TIME] = $v; + } } if (null !== ($v = $this->getOutcome())) { - $a[self::FIELD_OUTCOME] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_OUTCOME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_OUTCOME_EXT] = $enc; + } + } else { + $a[self::FIELD_OUTCOME] = $v; + } } if (null !== ($v = $this->getOutcomeDesc())) { - $a[self::FIELD_OUTCOME_DESC] = $v->getValue(); - $a[self::FIELD_OUTCOME_DESC_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_OUTCOME_DESC] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_OUTCOME_DESC_EXT] = $enc; + } + } else { + $a[self::FIELD_OUTCOME_DESC] = $v; + } } if ([] !== ($vs = $this->getPurposeOfEvent())) { $a[self::FIELD_PURPOSE_OF_EVENT] = $vs; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRAuditEvent/FHIRAuditEventNetwork.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRAuditEvent/FHIRAuditEventNetwork.php index 01f937aaf2..ed25196d65 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRAuditEvent/FHIRAuditEventNetwork.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRAuditEvent/FHIRAuditEventNetwork.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRAuditEventNetwork extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_AUDIT_EVENT_DOT_NETWORK; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ADDRESS = 'address'; const FIELD_ADDRESS_EXT = '_address'; const FIELD_TYPE = 'type'; @@ -112,6 +108,9 @@ class FHIRAuditEventNetwork extends FHIRBackboneElement */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRAuditEventNetwork Constructor * @param null|array $data @@ -134,8 +133,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ADDRESS] instanceof FHIRString) { $this->setAddress($data[self::FIELD_ADDRESS]); - } elseif ($ext && is_scalar($data[self::FIELD_ADDRESS])) { - $this->setAddress(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_ADDRESS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ADDRESS])) { + $this->setAddress(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_ADDRESS]] + $ext)); + } else if (is_array($data[self::FIELD_ADDRESS])) { + $this->setAddress(new FHIRString(array_merge($ext, $data[self::FIELD_ADDRESS]))); + } } else { $this->setAddress(new FHIRString($data[self::FIELD_ADDRESS])); } @@ -146,8 +149,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TYPE] instanceof FHIRAuditEventParticipantNetworkType) { $this->setType($data[self::FIELD_TYPE]); - } elseif ($ext && is_scalar($data[self::FIELD_TYPE])) { - $this->setType(new FHIRAuditEventParticipantNetworkType([FHIRAuditEventParticipantNetworkType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TYPE])) { + $this->setType(new FHIRAuditEventParticipantNetworkType([FHIRAuditEventParticipantNetworkType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } else if (is_array($data[self::FIELD_TYPE])) { + $this->setType(new FHIRAuditEventParticipantNetworkType(array_merge($ext, $data[self::FIELD_TYPE]))); + } } else { $this->setType(new FHIRAuditEventParticipantNetworkType($data[self::FIELD_TYPE])); } @@ -335,7 +342,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getAddress())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ADDRESS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -349,11 +355,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getAddress())) { - $a[self::FIELD_ADDRESS] = $v->getValue(); - $a[self::FIELD_ADDRESS_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ADDRESS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ADDRESS_EXT] = $enc; + } + } else { + $a[self::FIELD_ADDRESS] = $v; + } } if (null !== ($v = $this->getType())) { - $a[self::FIELD_TYPE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TYPE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TYPE_EXT] = $enc; + } + } else { + $a[self::FIELD_TYPE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRAuditEvent/FHIRAuditEventObject.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRAuditEvent/FHIRAuditEventObject.php index fa95e1fb43..8be7224e51 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRAuditEvent/FHIRAuditEventObject.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRAuditEvent/FHIRAuditEventObject.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -83,10 +83,6 @@ class FHIRAuditEventObject extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_AUDIT_EVENT_DOT_OBJECT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DESCRIPTION = 'description'; const FIELD_DESCRIPTION_EXT = '_description'; const FIELD_DETAIL = 'detail'; @@ -217,6 +213,9 @@ class FHIRAuditEventObject extends FHIRBackboneElement */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRAuditEventObject Constructor * @param null|array $data @@ -239,8 +238,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -251,17 +254,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_DETAIL])) { foreach($data[self::FIELD_DETAIL] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRAuditEventDetail) { $this->addDetail($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addDetail(new FHIRAuditEventDetail([FHIRAuditEventDetail::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addDetail(new FHIRAuditEventDetail([FHIRAuditEventDetail::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addDetail(new FHIRAuditEventDetail(array_merge($v, $ext[$i]))); + } } else { $this->addDetail(new FHIRAuditEventDetail($v)); } } } elseif ($data[self::FIELD_DETAIL] instanceof FHIRAuditEventDetail) { $this->addDetail($data[self::FIELD_DETAIL]); - } elseif ($ext && is_scalar($data[self::FIELD_DETAIL])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_DETAIL])) { $this->addDetail(new FHIRAuditEventDetail([FHIRAuditEventDetail::FIELD_VALUE => $data[self::FIELD_DETAIL]] + $ext)); } else { $this->addDetail(new FHIRAuditEventDetail($data[self::FIELD_DETAIL])); @@ -273,8 +283,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->setIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { - $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_IDENTIFIER]))); + } } else { $this->setIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); } @@ -292,8 +306,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -304,8 +322,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_QUERY] instanceof FHIRBase64Binary) { $this->setQuery($data[self::FIELD_QUERY]); - } elseif ($ext && is_scalar($data[self::FIELD_QUERY])) { - $this->setQuery(new FHIRBase64Binary([FHIRBase64Binary::FIELD_VALUE => $data[self::FIELD_QUERY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_QUERY])) { + $this->setQuery(new FHIRBase64Binary([FHIRBase64Binary::FIELD_VALUE => $data[self::FIELD_QUERY]] + $ext)); + } else if (is_array($data[self::FIELD_QUERY])) { + $this->setQuery(new FHIRBase64Binary(array_merge($ext, $data[self::FIELD_QUERY]))); + } } else { $this->setQuery(new FHIRBase64Binary($data[self::FIELD_QUERY])); } @@ -327,6 +349,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SECURITY_LABEL])) { if (is_array($data[self::FIELD_SECURITY_LABEL])) { foreach($data[self::FIELD_SECURITY_LABEL] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCoding) { $this->addSecurityLabel($v); } else { @@ -877,7 +902,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESCRIPTION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getDetail())) { foreach($vs as $v) { if (null === $v) { @@ -890,7 +914,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getLifecycle())) { $v->xmlSerialize($sxe->addChild(self::FIELD_LIFECYCLE, null, $v->_getFHIRXMLNamespace())); } @@ -900,15 +923,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getQuery())) { $v->xmlSerialize($sxe->addChild(self::FIELD_QUERY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REFERENCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRole())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ROLE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getSecurityLabel())) { foreach($vs as $v) { if (null === $v) { @@ -931,25 +951,70 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if ([] !== ($vs = $this->getDetail())) { - $a[self::FIELD_DETAIL] = $vs; + $a[self::FIELD_DETAIL] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DETAIL][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DETAIL_EXT][] = $enc; + } else { + $a[self::FIELD_DETAIL_EXT][] = null; + } + } else { + $a[self::FIELD_DETAIL][] = $v; + } + } } if (null !== ($v = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_IDENTIFIER] = $v; + } } if (null !== ($v = $this->getLifecycle())) { $a[self::FIELD_LIFECYCLE] = $v; } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if (null !== ($v = $this->getQuery())) { - $a[self::FIELD_QUERY] = $v->getValue(); - $a[self::FIELD_QUERY_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_QUERY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_QUERY_EXT] = $enc; + } + } else { + $a[self::FIELD_QUERY] = $v; + } } if (null !== ($v = $this->getReference())) { $a[self::FIELD_REFERENCE] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRAuditEvent/FHIRAuditEventParticipant.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRAuditEvent/FHIRAuditEventParticipant.php index 4d06b0219b..7bd0c37e1e 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRAuditEvent/FHIRAuditEventParticipant.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRAuditEvent/FHIRAuditEventParticipant.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -85,10 +85,6 @@ class FHIRAuditEventParticipant extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_AUDIT_EVENT_DOT_PARTICIPANT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ALT_ID = 'altId'; const FIELD_ALT_ID_EXT = '_altId'; const FIELD_LOCATION = 'location'; @@ -237,6 +233,9 @@ class FHIRAuditEventParticipant extends FHIRBackboneElement */ protected $userId = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRAuditEventParticipant Constructor * @param null|array $data @@ -259,8 +258,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ALT_ID] instanceof FHIRString) { $this->setAltId($data[self::FIELD_ALT_ID]); - } elseif ($ext && is_scalar($data[self::FIELD_ALT_ID])) { - $this->setAltId(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_ALT_ID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ALT_ID])) { + $this->setAltId(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_ALT_ID]] + $ext)); + } else if (is_array($data[self::FIELD_ALT_ID])) { + $this->setAltId(new FHIRString(array_merge($ext, $data[self::FIELD_ALT_ID]))); + } } else { $this->setAltId(new FHIRString($data[self::FIELD_ALT_ID])); } @@ -285,8 +288,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -304,17 +311,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_POLICY])) { foreach($data[self::FIELD_POLICY] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRUri) { $this->addPolicy($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addPolicy(new FHIRUri([FHIRUri::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addPolicy(new FHIRUri([FHIRUri::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addPolicy(new FHIRUri(array_merge($v, $ext[$i]))); + } } else { $this->addPolicy(new FHIRUri($v)); } } } elseif ($data[self::FIELD_POLICY] instanceof FHIRUri) { $this->addPolicy($data[self::FIELD_POLICY]); - } elseif ($ext && is_scalar($data[self::FIELD_POLICY])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_POLICY])) { $this->addPolicy(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_POLICY]] + $ext)); } else { $this->addPolicy(new FHIRUri($data[self::FIELD_POLICY])); @@ -323,6 +337,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PURPOSE_OF_USE])) { if (is_array($data[self::FIELD_PURPOSE_OF_USE])) { foreach($data[self::FIELD_PURPOSE_OF_USE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCoding) { $this->addPurposeOfUse($v); } else { @@ -348,8 +365,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_REQUESTOR] instanceof FHIRBoolean) { $this->setRequestor($data[self::FIELD_REQUESTOR]); - } elseif ($ext && is_scalar($data[self::FIELD_REQUESTOR])) { - $this->setRequestor(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_REQUESTOR]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_REQUESTOR])) { + $this->setRequestor(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_REQUESTOR]] + $ext)); + } else if (is_array($data[self::FIELD_REQUESTOR])) { + $this->setRequestor(new FHIRBoolean(array_merge($ext, $data[self::FIELD_REQUESTOR]))); + } } else { $this->setRequestor(new FHIRBoolean($data[self::FIELD_REQUESTOR])); } @@ -357,6 +378,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ROLE])) { if (is_array($data[self::FIELD_ROLE])) { foreach($data[self::FIELD_ROLE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addRole($v); } else { @@ -375,8 +399,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_USER_ID] instanceof FHIRIdentifier) { $this->setUserId($data[self::FIELD_USER_ID]); - } elseif ($ext && is_scalar($data[self::FIELD_USER_ID])) { - $this->setUserId(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_USER_ID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_USER_ID])) { + $this->setUserId(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_USER_ID]] + $ext)); + } else if (is_array($data[self::FIELD_USER_ID])) { + $this->setUserId(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_USER_ID]))); + } } else { $this->setUserId(new FHIRIdentifier($data[self::FIELD_USER_ID])); } @@ -1002,18 +1030,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getAltId())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ALT_ID, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getLocation())) { $v->xmlSerialize($sxe->addChild(self::FIELD_LOCATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getMedia())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MEDIA, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NAME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getNetwork())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NETWORK, null, $v->_getFHIRXMLNamespace())); } @@ -1041,7 +1066,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getRequestor())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REQUESTOR, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getRole())) { foreach($vs as $v) { if (null === $v) { @@ -1064,8 +1088,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getAltId())) { - $a[self::FIELD_ALT_ID] = $v->getValue(); - $a[self::FIELD_ALT_ID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ALT_ID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ALT_ID_EXT] = $enc; + } + } else { + $a[self::FIELD_ALT_ID] = $v; + } } if (null !== ($v = $this->getLocation())) { $a[self::FIELD_LOCATION] = $v; @@ -1074,8 +1105,15 @@ public function jsonSerialize() $a[self::FIELD_MEDIA] = $v; } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if (null !== ($v = $this->getNetwork())) { $a[self::FIELD_NETWORK] = $v; @@ -1086,8 +1124,17 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_POLICY][] = $v->getValue(); - $a[self::FIELD_POLICY_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_POLICY][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_POLICY_EXT][] = $enc; + } else { + $a[self::FIELD_POLICY_EXT][] = null; + } + } else { + $a[self::FIELD_POLICY][] = $v; + } } } if ([] !== ($vs = $this->getPurposeOfUse())) { @@ -1097,14 +1144,29 @@ public function jsonSerialize() $a[self::FIELD_REFERENCE] = $v; } if (null !== ($v = $this->getRequestor())) { - $a[self::FIELD_REQUESTOR] = $v->getValue(); - $a[self::FIELD_REQUESTOR_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_REQUESTOR] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_REQUESTOR_EXT] = $enc; + } + } else { + $a[self::FIELD_REQUESTOR] = $v; + } } if ([] !== ($vs = $this->getRole())) { $a[self::FIELD_ROLE] = $vs; } if (null !== ($v = $this->getUserId())) { - $a[self::FIELD_USER_ID] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_USER_ID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_USER_ID_EXT] = $enc; + } + } else { + $a[self::FIELD_USER_ID] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRAuditEvent/FHIRAuditEventSource.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRAuditEvent/FHIRAuditEventSource.php index f6b9cb745e..77d8ea0988 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRAuditEvent/FHIRAuditEventSource.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRAuditEvent/FHIRAuditEventSource.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -81,10 +81,6 @@ class FHIRAuditEventSource extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_AUDIT_EVENT_DOT_SOURCE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_IDENTIFIER = 'identifier'; const FIELD_IDENTIFIER_EXT = '_identifier'; const FIELD_SITE = 'site'; @@ -125,6 +121,9 @@ class FHIRAuditEventSource extends FHIRBackboneElement */ protected $type = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRAuditEventSource Constructor * @param null|array $data @@ -147,8 +146,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->setIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { - $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_IDENTIFIER]))); + } } else { $this->setIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); } @@ -159,8 +162,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SITE] instanceof FHIRString) { $this->setSite($data[self::FIELD_SITE]); - } elseif ($ext && is_scalar($data[self::FIELD_SITE])) { - $this->setSite(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SITE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SITE])) { + $this->setSite(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SITE]] + $ext)); + } else if (is_array($data[self::FIELD_SITE])) { + $this->setSite(new FHIRString(array_merge($ext, $data[self::FIELD_SITE]))); + } } else { $this->setSite(new FHIRString($data[self::FIELD_SITE])); } @@ -168,6 +175,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_TYPE])) { if (is_array($data[self::FIELD_TYPE])) { foreach($data[self::FIELD_TYPE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCoding) { $this->addType($v); } else { @@ -421,14 +431,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getSite())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SITE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getType())) { foreach($vs as $v) { if (null === $v) { @@ -437,6 +445,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } @@ -447,11 +456,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_IDENTIFIER] = $v; + } } if (null !== ($v = $this->getSite())) { - $a[self::FIELD_SITE] = $v->getValue(); - $a[self::FIELD_SITE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SITE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SITE_EXT] = $enc; + } + } else { + $a[self::FIELD_SITE] = $v; + } } if ([] !== ($vs = $this->getType())) { $a[self::FIELD_TYPE] = $vs; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRBundle/FHIRBundleEntry.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRBundle/FHIRBundleEntry.php index 2163772e94..557d287e30 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRBundle/FHIRBundleEntry.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRBundle/FHIRBundleEntry.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRBundleEntry extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_BUNDLE_DOT_ENTRY; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_FULL_URL = 'fullUrl'; const FIELD_FULL_URL_EXT = '_fullUrl'; const FIELD_LINK = 'link'; @@ -149,6 +145,9 @@ class FHIRBundleEntry extends FHIRBackboneElement */ protected $search = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRBundleEntry Constructor * @param null|array $data @@ -171,8 +170,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_FULL_URL] instanceof FHIRUri) { $this->setFullUrl($data[self::FIELD_FULL_URL]); - } elseif ($ext && is_scalar($data[self::FIELD_FULL_URL])) { - $this->setFullUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_FULL_URL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_FULL_URL])) { + $this->setFullUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_FULL_URL]] + $ext)); + } else if (is_array($data[self::FIELD_FULL_URL])) { + $this->setFullUrl(new FHIRUri(array_merge($ext, $data[self::FIELD_FULL_URL]))); + } } else { $this->setFullUrl(new FHIRUri($data[self::FIELD_FULL_URL])); } @@ -180,6 +183,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_LINK])) { if (is_array($data[self::FIELD_LINK])) { foreach($data[self::FIELD_LINK] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRBundleLink) { $this->addLink($v); } else { @@ -567,7 +573,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getFullUrl())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FULL_URL, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getLink())) { foreach($vs as $v) { if (null === $v) { @@ -580,16 +585,13 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getRequest())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REQUEST, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getResource())) { $tsxe = $sxe->addChild(self::FIELD_RESOURCE); $v->xmlSerialize($tsxe->addChild($v->_getFHIRTypeName(), null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getResponse())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RESPONSE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSearch())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SEARCH, null, $v->_getFHIRXMLNamespace())); } @@ -603,8 +605,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getFullUrl())) { - $a[self::FIELD_FULL_URL] = $v->getValue(); - $a[self::FIELD_FULL_URL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FULL_URL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FULL_URL_EXT] = $enc; + } + } else { + $a[self::FIELD_FULL_URL] = $v; + } } if ([] !== ($vs = $this->getLink())) { $a[self::FIELD_LINK] = $vs; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRBundle/FHIRBundleLink.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRBundle/FHIRBundleLink.php index b24eea74cf..310c2c734d 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRBundle/FHIRBundleLink.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRBundle/FHIRBundleLink.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRBundleLink extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_BUNDLE_DOT_LINK; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_RELATION = 'relation'; const FIELD_RELATION_EXT = '_relation'; const FIELD_URL = 'url'; @@ -110,6 +106,9 @@ class FHIRBundleLink extends FHIRBackboneElement */ protected $url = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRBundleLink Constructor * @param null|array $data @@ -132,8 +131,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_RELATION] instanceof FHIRString) { $this->setRelation($data[self::FIELD_RELATION]); - } elseif ($ext && is_scalar($data[self::FIELD_RELATION])) { - $this->setRelation(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_RELATION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_RELATION])) { + $this->setRelation(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_RELATION]] + $ext)); + } else if (is_array($data[self::FIELD_RELATION])) { + $this->setRelation(new FHIRString(array_merge($ext, $data[self::FIELD_RELATION]))); + } } else { $this->setRelation(new FHIRString($data[self::FIELD_RELATION])); } @@ -144,8 +147,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_URL] instanceof FHIRUri) { $this->setUrl($data[self::FIELD_URL]); - } elseif ($ext && is_scalar($data[self::FIELD_URL])) { - $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } else if (is_array($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri(array_merge($ext, $data[self::FIELD_URL]))); + } } else { $this->setUrl(new FHIRUri($data[self::FIELD_URL])); } @@ -357,12 +364,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getRelation())) { - $a[self::FIELD_RELATION] = $v->getValue(); - $a[self::FIELD_RELATION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_RELATION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_RELATION_EXT] = $enc; + } + } else { + $a[self::FIELD_RELATION] = $v; + } } if (null !== ($v = $this->getUrl())) { - $a[self::FIELD_URL] = $v->getValue(); - $a[self::FIELD_URL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_URL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_URL_EXT] = $enc; + } + } else { + $a[self::FIELD_URL] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRBundle/FHIRBundleRequest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRBundle/FHIRBundleRequest.php index 198dc024d0..ec1c61dc23 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRBundle/FHIRBundleRequest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRBundle/FHIRBundleRequest.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRBundleRequest extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_BUNDLE_DOT_REQUEST; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_IF_MATCH = 'ifMatch'; const FIELD_IF_MATCH_EXT = '_ifMatch'; const FIELD_IF_MODIFIED_SINCE = 'ifModifiedSince'; @@ -172,6 +168,9 @@ class FHIRBundleRequest extends FHIRBackboneElement */ protected $url = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRBundleRequest Constructor * @param null|array $data @@ -194,8 +193,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IF_MATCH] instanceof FHIRString) { $this->setIfMatch($data[self::FIELD_IF_MATCH]); - } elseif ($ext && is_scalar($data[self::FIELD_IF_MATCH])) { - $this->setIfMatch(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_IF_MATCH]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IF_MATCH])) { + $this->setIfMatch(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_IF_MATCH]] + $ext)); + } else if (is_array($data[self::FIELD_IF_MATCH])) { + $this->setIfMatch(new FHIRString(array_merge($ext, $data[self::FIELD_IF_MATCH]))); + } } else { $this->setIfMatch(new FHIRString($data[self::FIELD_IF_MATCH])); } @@ -206,8 +209,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IF_MODIFIED_SINCE] instanceof FHIRInstant) { $this->setIfModifiedSince($data[self::FIELD_IF_MODIFIED_SINCE]); - } elseif ($ext && is_scalar($data[self::FIELD_IF_MODIFIED_SINCE])) { - $this->setIfModifiedSince(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_IF_MODIFIED_SINCE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IF_MODIFIED_SINCE])) { + $this->setIfModifiedSince(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_IF_MODIFIED_SINCE]] + $ext)); + } else if (is_array($data[self::FIELD_IF_MODIFIED_SINCE])) { + $this->setIfModifiedSince(new FHIRInstant(array_merge($ext, $data[self::FIELD_IF_MODIFIED_SINCE]))); + } } else { $this->setIfModifiedSince(new FHIRInstant($data[self::FIELD_IF_MODIFIED_SINCE])); } @@ -218,8 +225,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IF_NONE_EXIST] instanceof FHIRString) { $this->setIfNoneExist($data[self::FIELD_IF_NONE_EXIST]); - } elseif ($ext && is_scalar($data[self::FIELD_IF_NONE_EXIST])) { - $this->setIfNoneExist(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_IF_NONE_EXIST]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IF_NONE_EXIST])) { + $this->setIfNoneExist(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_IF_NONE_EXIST]] + $ext)); + } else if (is_array($data[self::FIELD_IF_NONE_EXIST])) { + $this->setIfNoneExist(new FHIRString(array_merge($ext, $data[self::FIELD_IF_NONE_EXIST]))); + } } else { $this->setIfNoneExist(new FHIRString($data[self::FIELD_IF_NONE_EXIST])); } @@ -230,8 +241,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IF_NONE_MATCH] instanceof FHIRString) { $this->setIfNoneMatch($data[self::FIELD_IF_NONE_MATCH]); - } elseif ($ext && is_scalar($data[self::FIELD_IF_NONE_MATCH])) { - $this->setIfNoneMatch(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_IF_NONE_MATCH]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IF_NONE_MATCH])) { + $this->setIfNoneMatch(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_IF_NONE_MATCH]] + $ext)); + } else if (is_array($data[self::FIELD_IF_NONE_MATCH])) { + $this->setIfNoneMatch(new FHIRString(array_merge($ext, $data[self::FIELD_IF_NONE_MATCH]))); + } } else { $this->setIfNoneMatch(new FHIRString($data[self::FIELD_IF_NONE_MATCH])); } @@ -242,8 +257,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_METHOD] instanceof FHIRHTTPVerb) { $this->setMethod($data[self::FIELD_METHOD]); - } elseif ($ext && is_scalar($data[self::FIELD_METHOD])) { - $this->setMethod(new FHIRHTTPVerb([FHIRHTTPVerb::FIELD_VALUE => $data[self::FIELD_METHOD]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_METHOD])) { + $this->setMethod(new FHIRHTTPVerb([FHIRHTTPVerb::FIELD_VALUE => $data[self::FIELD_METHOD]] + $ext)); + } else if (is_array($data[self::FIELD_METHOD])) { + $this->setMethod(new FHIRHTTPVerb(array_merge($ext, $data[self::FIELD_METHOD]))); + } } else { $this->setMethod(new FHIRHTTPVerb($data[self::FIELD_METHOD])); } @@ -254,8 +273,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_URL] instanceof FHIRUri) { $this->setUrl($data[self::FIELD_URL]); - } elseif ($ext && is_scalar($data[self::FIELD_URL])) { - $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } else if (is_array($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri(array_merge($ext, $data[self::FIELD_URL]))); + } } else { $this->setUrl(new FHIRUri($data[self::FIELD_URL])); } @@ -644,7 +667,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getIfNoneMatch())) { $v->xmlSerialize($sxe->addChild(self::FIELD_IF_NONE_MATCH, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getMethod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_METHOD, null, $v->_getFHIRXMLNamespace())); } @@ -661,27 +683,70 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getIfMatch())) { - $a[self::FIELD_IF_MATCH] = $v->getValue(); - $a[self::FIELD_IF_MATCH_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IF_MATCH] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IF_MATCH_EXT] = $enc; + } + } else { + $a[self::FIELD_IF_MATCH] = $v; + } } if (null !== ($v = $this->getIfModifiedSince())) { - $a[self::FIELD_IF_MODIFIED_SINCE] = $v->getValue(); - $a[self::FIELD_IF_MODIFIED_SINCE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IF_MODIFIED_SINCE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IF_MODIFIED_SINCE_EXT] = $enc; + } + } else { + $a[self::FIELD_IF_MODIFIED_SINCE] = $v; + } } if (null !== ($v = $this->getIfNoneExist())) { - $a[self::FIELD_IF_NONE_EXIST] = $v->getValue(); - $a[self::FIELD_IF_NONE_EXIST_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IF_NONE_EXIST] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IF_NONE_EXIST_EXT] = $enc; + } + } else { + $a[self::FIELD_IF_NONE_EXIST] = $v; + } } if (null !== ($v = $this->getIfNoneMatch())) { - $a[self::FIELD_IF_NONE_MATCH] = $v->getValue(); - $a[self::FIELD_IF_NONE_MATCH_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IF_NONE_MATCH] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IF_NONE_MATCH_EXT] = $enc; + } + } else { + $a[self::FIELD_IF_NONE_MATCH] = $v; + } } if (null !== ($v = $this->getMethod())) { - $a[self::FIELD_METHOD] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_METHOD] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_METHOD_EXT] = $enc; + } + } else { + $a[self::FIELD_METHOD] = $v; + } } if (null !== ($v = $this->getUrl())) { - $a[self::FIELD_URL] = $v->getValue(); - $a[self::FIELD_URL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_URL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_URL_EXT] = $enc; + } + } else { + $a[self::FIELD_URL] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRBundle/FHIRBundleResponse.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRBundle/FHIRBundleResponse.php index ba64ab9134..9c47a6cdb1 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRBundle/FHIRBundleResponse.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRBundle/FHIRBundleResponse.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRBundleResponse extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_BUNDLE_DOT_RESPONSE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ETAG = 'etag'; const FIELD_ETAG_EXT = '_etag'; const FIELD_LAST_MODIFIED = 'lastModified'; @@ -139,6 +135,9 @@ class FHIRBundleResponse extends FHIRBackboneElement */ protected $status = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRBundleResponse Constructor * @param null|array $data @@ -161,8 +160,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ETAG] instanceof FHIRString) { $this->setEtag($data[self::FIELD_ETAG]); - } elseif ($ext && is_scalar($data[self::FIELD_ETAG])) { - $this->setEtag(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_ETAG]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ETAG])) { + $this->setEtag(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_ETAG]] + $ext)); + } else if (is_array($data[self::FIELD_ETAG])) { + $this->setEtag(new FHIRString(array_merge($ext, $data[self::FIELD_ETAG]))); + } } else { $this->setEtag(new FHIRString($data[self::FIELD_ETAG])); } @@ -173,8 +176,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_LAST_MODIFIED] instanceof FHIRInstant) { $this->setLastModified($data[self::FIELD_LAST_MODIFIED]); - } elseif ($ext && is_scalar($data[self::FIELD_LAST_MODIFIED])) { - $this->setLastModified(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_LAST_MODIFIED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_LAST_MODIFIED])) { + $this->setLastModified(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_LAST_MODIFIED]] + $ext)); + } else if (is_array($data[self::FIELD_LAST_MODIFIED])) { + $this->setLastModified(new FHIRInstant(array_merge($ext, $data[self::FIELD_LAST_MODIFIED]))); + } } else { $this->setLastModified(new FHIRInstant($data[self::FIELD_LAST_MODIFIED])); } @@ -185,8 +192,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_LOCATION] instanceof FHIRUri) { $this->setLocation($data[self::FIELD_LOCATION]); - } elseif ($ext && is_scalar($data[self::FIELD_LOCATION])) { - $this->setLocation(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_LOCATION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_LOCATION])) { + $this->setLocation(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_LOCATION]] + $ext)); + } else if (is_array($data[self::FIELD_LOCATION])) { + $this->setLocation(new FHIRUri(array_merge($ext, $data[self::FIELD_LOCATION]))); + } } else { $this->setLocation(new FHIRUri($data[self::FIELD_LOCATION])); } @@ -197,8 +208,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRString) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRString(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRString($data[self::FIELD_STATUS])); } @@ -508,20 +523,48 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getEtag())) { - $a[self::FIELD_ETAG] = $v->getValue(); - $a[self::FIELD_ETAG_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ETAG] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ETAG_EXT] = $enc; + } + } else { + $a[self::FIELD_ETAG] = $v; + } } if (null !== ($v = $this->getLastModified())) { - $a[self::FIELD_LAST_MODIFIED] = $v->getValue(); - $a[self::FIELD_LAST_MODIFIED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_LAST_MODIFIED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_LAST_MODIFIED_EXT] = $enc; + } + } else { + $a[self::FIELD_LAST_MODIFIED] = $v; + } } if (null !== ($v = $this->getLocation())) { - $a[self::FIELD_LOCATION] = $v->getValue(); - $a[self::FIELD_LOCATION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_LOCATION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_LOCATION_EXT] = $enc; + } + } else { + $a[self::FIELD_LOCATION] = $v; + } } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v->getValue(); - $a[self::FIELD_STATUS_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRBundle/FHIRBundleSearch.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRBundle/FHIRBundleSearch.php index 54525ceabf..7681f4e022 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRBundle/FHIRBundleSearch.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRBundle/FHIRBundleSearch.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRBundleSearch extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_BUNDLE_DOT_SEARCH; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_MODE = 'mode'; const FIELD_MODE_EXT = '_mode'; const FIELD_SCORE = 'score'; @@ -111,6 +107,9 @@ class FHIRBundleSearch extends FHIRBackboneElement */ protected $score = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRBundleSearch Constructor * @param null|array $data @@ -133,8 +132,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MODE] instanceof FHIRSearchEntryMode) { $this->setMode($data[self::FIELD_MODE]); - } elseif ($ext && is_scalar($data[self::FIELD_MODE])) { - $this->setMode(new FHIRSearchEntryMode([FHIRSearchEntryMode::FIELD_VALUE => $data[self::FIELD_MODE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MODE])) { + $this->setMode(new FHIRSearchEntryMode([FHIRSearchEntryMode::FIELD_VALUE => $data[self::FIELD_MODE]] + $ext)); + } else if (is_array($data[self::FIELD_MODE])) { + $this->setMode(new FHIRSearchEntryMode(array_merge($ext, $data[self::FIELD_MODE]))); + } } else { $this->setMode(new FHIRSearchEntryMode($data[self::FIELD_MODE])); } @@ -145,8 +148,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SCORE] instanceof FHIRDecimal) { $this->setScore($data[self::FIELD_SCORE]); - } elseif ($ext && is_scalar($data[self::FIELD_SCORE])) { - $this->setScore(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_SCORE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SCORE])) { + $this->setScore(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_SCORE]] + $ext)); + } else if (is_array($data[self::FIELD_SCORE])) { + $this->setScore(new FHIRDecimal(array_merge($ext, $data[self::FIELD_SCORE]))); + } } else { $this->setScore(new FHIRDecimal($data[self::FIELD_SCORE])); } @@ -333,7 +340,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getMode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MODE, null, $v->_getFHIRXMLNamespace())); } @@ -350,11 +356,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getMode())) { - $a[self::FIELD_MODE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MODE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MODE_EXT] = $enc; + } + } else { + $a[self::FIELD_MODE] = $v; + } } if (null !== ($v = $this->getScore())) { - $a[self::FIELD_SCORE] = $v->getValue(); - $a[self::FIELD_SCORE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SCORE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SCORE_EXT] = $enc; + } + } else { + $a[self::FIELD_SCORE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRCarePlan/FHIRCarePlanActivity.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRCarePlan/FHIRCarePlanActivity.php index 15a977dbfd..5351aa57db 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRCarePlan/FHIRCarePlanActivity.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRCarePlan/FHIRCarePlanActivity.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRCarePlanActivity extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CARE_PLAN_DOT_ACTIVITY; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ACTION_RESULTING = 'actionResulting'; const FIELD_DETAIL = 'detail'; const FIELD_PROGRESS = 'progress'; @@ -137,6 +133,9 @@ class FHIRCarePlanActivity extends FHIRBackboneElement */ protected $reference = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRCarePlanActivity Constructor * @param null|array $data @@ -156,6 +155,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ACTION_RESULTING])) { if (is_array($data[self::FIELD_ACTION_RESULTING])) { foreach($data[self::FIELD_ACTION_RESULTING] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addActionResulting($v); } else { @@ -178,6 +180,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PROGRESS])) { if (is_array($data[self::FIELD_PROGRESS])) { foreach($data[self::FIELD_PROGRESS] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRAnnotation) { $this->addProgress($v); } else { @@ -496,7 +501,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getActionResulting())) { foreach($vs as $v) { if (null === $v) { @@ -509,7 +513,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDetail())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DETAIL, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getProgress())) { foreach($vs as $v) { if (null === $v) { diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRCarePlan/FHIRCarePlanDetail.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRCarePlan/FHIRCarePlanDetail.php index 93d978d6fe..c2721bbbaf 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRCarePlan/FHIRCarePlanDetail.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRCarePlan/FHIRCarePlanDetail.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -86,13 +86,10 @@ class FHIRCarePlanDetail extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CARE_PLAN_DOT_DETAIL; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CATEGORY = 'category'; const FIELD_CODE = 'code'; const FIELD_DAILY_AMOUNT = 'dailyAmount'; + const FIELD_DAILY_AMOUNT_EXT = '_dailyAmount'; const FIELD_DESCRIPTION = 'description'; const FIELD_DESCRIPTION_EXT = '_description'; const FIELD_GOAL = 'goal'; @@ -103,6 +100,7 @@ class FHIRCarePlanDetail extends FHIRBackboneElement const FIELD_PROHIBITED = 'prohibited'; const FIELD_PROHIBITED_EXT = '_prohibited'; const FIELD_QUANTITY = 'quantity'; + const FIELD_QUANTITY_EXT = '_quantity'; const FIELD_REASON_CODE = 'reasonCode'; const FIELD_REASON_REFERENCE = 'reasonReference'; const FIELD_SCHEDULED_PERIOD = 'scheduledPeriod'; @@ -322,6 +320,9 @@ class FHIRCarePlanDetail extends FHIRBackboneElement */ protected $statusReason = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRCarePlanDetail Constructor * @param null|array $data @@ -353,8 +354,17 @@ public function __construct($data = null) } } if (isset($data[self::FIELD_DAILY_AMOUNT])) { + $ext = (isset($data[self::FIELD_DAILY_AMOUNT_EXT]) && is_array($data[self::FIELD_DAILY_AMOUNT_EXT])) + ? $data[self::FIELD_DAILY_AMOUNT_EXT] + : null; if ($data[self::FIELD_DAILY_AMOUNT] instanceof FHIRSimpleQuantity) { $this->setDailyAmount($data[self::FIELD_DAILY_AMOUNT]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DAILY_AMOUNT])) { + $this->setDailyAmount(new FHIRSimpleQuantity([FHIRSimpleQuantity::FIELD_VALUE => $data[self::FIELD_DAILY_AMOUNT]] + $ext)); + } else if (is_array($data[self::FIELD_DAILY_AMOUNT])) { + $this->setDailyAmount(new FHIRSimpleQuantity(array_merge($ext, $data[self::FIELD_DAILY_AMOUNT]))); + } } else { $this->setDailyAmount(new FHIRSimpleQuantity($data[self::FIELD_DAILY_AMOUNT])); } @@ -365,8 +375,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -374,6 +388,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_GOAL])) { if (is_array($data[self::FIELD_GOAL])) { foreach($data[self::FIELD_GOAL] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addGoal($v); } else { @@ -396,6 +413,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PERFORMER])) { if (is_array($data[self::FIELD_PERFORMER])) { foreach($data[self::FIELD_PERFORMER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addPerformer($v); } else { @@ -428,15 +448,28 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PROHIBITED] instanceof FHIRBoolean) { $this->setProhibited($data[self::FIELD_PROHIBITED]); - } elseif ($ext && is_scalar($data[self::FIELD_PROHIBITED])) { - $this->setProhibited(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_PROHIBITED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PROHIBITED])) { + $this->setProhibited(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_PROHIBITED]] + $ext)); + } else if (is_array($data[self::FIELD_PROHIBITED])) { + $this->setProhibited(new FHIRBoolean(array_merge($ext, $data[self::FIELD_PROHIBITED]))); + } } else { $this->setProhibited(new FHIRBoolean($data[self::FIELD_PROHIBITED])); } } if (isset($data[self::FIELD_QUANTITY])) { + $ext = (isset($data[self::FIELD_QUANTITY_EXT]) && is_array($data[self::FIELD_QUANTITY_EXT])) + ? $data[self::FIELD_QUANTITY_EXT] + : null; if ($data[self::FIELD_QUANTITY] instanceof FHIRSimpleQuantity) { $this->setQuantity($data[self::FIELD_QUANTITY]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_QUANTITY])) { + $this->setQuantity(new FHIRSimpleQuantity([FHIRSimpleQuantity::FIELD_VALUE => $data[self::FIELD_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_QUANTITY])) { + $this->setQuantity(new FHIRSimpleQuantity(array_merge($ext, $data[self::FIELD_QUANTITY]))); + } } else { $this->setQuantity(new FHIRSimpleQuantity($data[self::FIELD_QUANTITY])); } @@ -444,6 +477,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REASON_CODE])) { if (is_array($data[self::FIELD_REASON_CODE])) { foreach($data[self::FIELD_REASON_CODE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addReasonCode($v); } else { @@ -459,6 +495,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REASON_REFERENCE])) { if (is_array($data[self::FIELD_REASON_REFERENCE])) { foreach($data[self::FIELD_REASON_REFERENCE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addReasonReference($v); } else { @@ -484,8 +523,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SCHEDULED_STRING] instanceof FHIRString) { $this->setScheduledString($data[self::FIELD_SCHEDULED_STRING]); - } elseif ($ext && is_scalar($data[self::FIELD_SCHEDULED_STRING])) { - $this->setScheduledString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SCHEDULED_STRING]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SCHEDULED_STRING])) { + $this->setScheduledString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SCHEDULED_STRING]] + $ext)); + } else if (is_array($data[self::FIELD_SCHEDULED_STRING])) { + $this->setScheduledString(new FHIRString(array_merge($ext, $data[self::FIELD_SCHEDULED_STRING]))); + } } else { $this->setScheduledString(new FHIRString($data[self::FIELD_SCHEDULED_STRING])); } @@ -503,8 +546,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRCarePlanActivityStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRCarePlanActivityStatus([FHIRCarePlanActivityStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRCarePlanActivityStatus([FHIRCarePlanActivityStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRCarePlanActivityStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRCarePlanActivityStatus($data[self::FIELD_STATUS])); } @@ -1382,22 +1429,18 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getCategory())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CATEGORY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDailyAmount())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DAILY_AMOUNT, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getDescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESCRIPTION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getGoal())) { foreach($vs as $v) { if (null === $v) { @@ -1410,7 +1453,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getLocation())) { $v->xmlSerialize($sxe->addChild(self::FIELD_LOCATION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getPerformer())) { foreach($vs as $v) { if (null === $v) { @@ -1423,18 +1465,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getProductCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PRODUCT_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getProductReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PRODUCT_REFERENCE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getProhibited())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PROHIBITED, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_QUANTITY, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getReasonCode())) { foreach($vs as $v) { if (null === $v) { @@ -1459,15 +1498,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getScheduledString())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SCHEDULED_STRING, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getScheduledTiming())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SCHEDULED_TIMING, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatusReason())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS_REASON, null, $v->_getFHIRXMLNamespace())); } @@ -1487,11 +1523,26 @@ public function jsonSerialize() $a[self::FIELD_CODE] = $v; } if (null !== ($v = $this->getDailyAmount())) { - $a[self::FIELD_DAILY_AMOUNT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DAILY_AMOUNT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DAILY_AMOUNT_EXT] = $enc; + } + } else { + $a[self::FIELD_DAILY_AMOUNT] = $v; + } } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if ([] !== ($vs = $this->getGoal())) { $a[self::FIELD_GOAL] = $vs; @@ -1509,11 +1560,26 @@ public function jsonSerialize() $a[self::FIELD_PRODUCT_REFERENCE] = $v; } if (null !== ($v = $this->getProhibited())) { - $a[self::FIELD_PROHIBITED] = $v->getValue(); - $a[self::FIELD_PROHIBITED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PROHIBITED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PROHIBITED_EXT] = $enc; + } + } else { + $a[self::FIELD_PROHIBITED] = $v; + } } if (null !== ($v = $this->getQuantity())) { - $a[self::FIELD_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_QUANTITY] = $v; + } } if ([] !== ($vs = $this->getReasonCode())) { $a[self::FIELD_REASON_CODE] = $vs; @@ -1525,14 +1591,29 @@ public function jsonSerialize() $a[self::FIELD_SCHEDULED_PERIOD] = $v; } if (null !== ($v = $this->getScheduledString())) { - $a[self::FIELD_SCHEDULED_STRING] = $v->getValue(); - $a[self::FIELD_SCHEDULED_STRING_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SCHEDULED_STRING] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SCHEDULED_STRING_EXT] = $enc; + } + } else { + $a[self::FIELD_SCHEDULED_STRING] = $v; + } } if (null !== ($v = $this->getScheduledTiming())) { $a[self::FIELD_SCHEDULED_TIMING] = $v; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getStatusReason())) { $a[self::FIELD_STATUS_REASON] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRCarePlan/FHIRCarePlanParticipant.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRCarePlan/FHIRCarePlanParticipant.php index 7d62a456fd..ebc040227f 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRCarePlan/FHIRCarePlanParticipant.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRCarePlan/FHIRCarePlanParticipant.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRCarePlanParticipant extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CARE_PLAN_DOT_PARTICIPANT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_MEMBER = 'member'; const FIELD_ROLE = 'role'; @@ -112,6 +108,9 @@ class FHIRCarePlanParticipant extends FHIRBackboneElement */ protected $role = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRCarePlanParticipant Constructor * @param null|array $data @@ -315,11 +314,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getMember())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MEMBER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRole())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ROLE, null, $v->_getFHIRXMLNamespace())); } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRCarePlan/FHIRCarePlanRelatedPlan.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRCarePlan/FHIRCarePlanRelatedPlan.php index 714017687e..c680076d86 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRCarePlan/FHIRCarePlanRelatedPlan.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRCarePlan/FHIRCarePlanRelatedPlan.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRCarePlanRelatedPlan extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CARE_PLAN_DOT_RELATED_PLAN; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CODE = 'code'; const FIELD_CODE_EXT = '_code'; const FIELD_PLAN = 'plan'; @@ -109,6 +105,9 @@ class FHIRCarePlanRelatedPlan extends FHIRBackboneElement */ protected $plan = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRCarePlanRelatedPlan Constructor * @param null|array $data @@ -131,8 +130,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CODE] instanceof FHIRCarePlanRelationship) { $this->setCode($data[self::FIELD_CODE]); - } elseif ($ext && is_scalar($data[self::FIELD_CODE])) { - $this->setCode(new FHIRCarePlanRelationship([FHIRCarePlanRelationship::FIELD_VALUE => $data[self::FIELD_CODE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CODE])) { + $this->setCode(new FHIRCarePlanRelationship([FHIRCarePlanRelationship::FIELD_VALUE => $data[self::FIELD_CODE]] + $ext)); + } else if (is_array($data[self::FIELD_CODE])) { + $this->setCode(new FHIRCarePlanRelationship(array_merge($ext, $data[self::FIELD_CODE]))); + } } else { $this->setCode(new FHIRCarePlanRelationship($data[self::FIELD_CODE])); } @@ -309,11 +312,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPlan())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PLAN, null, $v->_getFHIRXMLNamespace())); } @@ -327,7 +328,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getCode())) { - $a[self::FIELD_CODE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CODE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CODE_EXT] = $enc; + } + } else { + $a[self::FIELD_CODE] = $v; + } } if (null !== ($v = $this->getPlan())) { $a[self::FIELD_PLAN] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimCoverage.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimCoverage.php index b399964458..22f16ed522 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimCoverage.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimCoverage.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -82,10 +82,6 @@ class FHIRClaimCoverage extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CLAIM_DOT_COVERAGE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_BUSINESS_ARRANGEMENT = 'businessArrangement'; const FIELD_BUSINESS_ARRANGEMENT_EXT = '_businessArrangement'; const FIELD_CLAIM_RESPONSE = 'claimResponse'; @@ -189,6 +185,9 @@ class FHIRClaimCoverage extends FHIRBackboneElement */ protected $sequence = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRClaimCoverage Constructor * @param null|array $data @@ -211,8 +210,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_BUSINESS_ARRANGEMENT] instanceof FHIRString) { $this->setBusinessArrangement($data[self::FIELD_BUSINESS_ARRANGEMENT]); - } elseif ($ext && is_scalar($data[self::FIELD_BUSINESS_ARRANGEMENT])) { - $this->setBusinessArrangement(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_BUSINESS_ARRANGEMENT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_BUSINESS_ARRANGEMENT])) { + $this->setBusinessArrangement(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_BUSINESS_ARRANGEMENT]] + $ext)); + } else if (is_array($data[self::FIELD_BUSINESS_ARRANGEMENT])) { + $this->setBusinessArrangement(new FHIRString(array_merge($ext, $data[self::FIELD_BUSINESS_ARRANGEMENT]))); + } } else { $this->setBusinessArrangement(new FHIRString($data[self::FIELD_BUSINESS_ARRANGEMENT])); } @@ -237,8 +240,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_FOCAL] instanceof FHIRBoolean) { $this->setFocal($data[self::FIELD_FOCAL]); - } elseif ($ext && is_scalar($data[self::FIELD_FOCAL])) { - $this->setFocal(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_FOCAL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_FOCAL])) { + $this->setFocal(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_FOCAL]] + $ext)); + } else if (is_array($data[self::FIELD_FOCAL])) { + $this->setFocal(new FHIRBoolean(array_merge($ext, $data[self::FIELD_FOCAL]))); + } } else { $this->setFocal(new FHIRBoolean($data[self::FIELD_FOCAL])); } @@ -256,17 +263,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_PRE_AUTH_REF])) { foreach($data[self::FIELD_PRE_AUTH_REF] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRString) { $this->addPreAuthRef($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addPreAuthRef(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addPreAuthRef(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addPreAuthRef(new FHIRString(array_merge($v, $ext[$i]))); + } } else { $this->addPreAuthRef(new FHIRString($v)); } } } elseif ($data[self::FIELD_PRE_AUTH_REF] instanceof FHIRString) { $this->addPreAuthRef($data[self::FIELD_PRE_AUTH_REF]); - } elseif ($ext && is_scalar($data[self::FIELD_PRE_AUTH_REF])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_PRE_AUTH_REF])) { $this->addPreAuthRef(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PRE_AUTH_REF]] + $ext)); } else { $this->addPreAuthRef(new FHIRString($data[self::FIELD_PRE_AUTH_REF])); @@ -285,8 +299,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SEQUENCE] instanceof FHIRPositiveInt) { $this->setSequence($data[self::FIELD_SEQUENCE]); - } elseif ($ext && is_scalar($data[self::FIELD_SEQUENCE])) { - $this->setSequence(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_SEQUENCE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SEQUENCE])) { + $this->setSequence(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_SEQUENCE]] + $ext)); + } else if (is_array($data[self::FIELD_SEQUENCE])) { + $this->setSequence(new FHIRPositiveInt(array_merge($ext, $data[self::FIELD_SEQUENCE]))); + } } else { $this->setSequence(new FHIRPositiveInt($data[self::FIELD_SEQUENCE])); } @@ -735,18 +753,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getBusinessArrangement())) { $v->xmlSerialize($sxe->addChild(self::FIELD_BUSINESS_ARRANGEMENT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getClaimResponse())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CLAIM_RESPONSE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getCoverage())) { $v->xmlSerialize($sxe->addChild(self::FIELD_COVERAGE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getFocal())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FOCAL, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOriginalRuleset())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ORIGINAL_RULESET, null, $v->_getFHIRXMLNamespace())); } @@ -775,8 +790,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getBusinessArrangement())) { - $a[self::FIELD_BUSINESS_ARRANGEMENT] = $v->getValue(); - $a[self::FIELD_BUSINESS_ARRANGEMENT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_BUSINESS_ARRANGEMENT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_BUSINESS_ARRANGEMENT_EXT] = $enc; + } + } else { + $a[self::FIELD_BUSINESS_ARRANGEMENT] = $v; + } } if (null !== ($v = $this->getClaimResponse())) { $a[self::FIELD_CLAIM_RESPONSE] = $v; @@ -785,8 +807,15 @@ public function jsonSerialize() $a[self::FIELD_COVERAGE] = $v; } if (null !== ($v = $this->getFocal())) { - $a[self::FIELD_FOCAL] = $v->getValue(); - $a[self::FIELD_FOCAL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FOCAL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FOCAL_EXT] = $enc; + } + } else { + $a[self::FIELD_FOCAL] = $v; + } } if (null !== ($v = $this->getOriginalRuleset())) { $a[self::FIELD_ORIGINAL_RULESET] = $v; @@ -797,16 +826,32 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_PRE_AUTH_REF][] = $v->getValue(); - $a[self::FIELD_PRE_AUTH_REF_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PRE_AUTH_REF][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PRE_AUTH_REF_EXT][] = $enc; + } else { + $a[self::FIELD_PRE_AUTH_REF_EXT][] = null; + } + } else { + $a[self::FIELD_PRE_AUTH_REF][] = $v; + } } } if (null !== ($v = $this->getRelationship())) { $a[self::FIELD_RELATIONSHIP] = $v; } if (null !== ($v = $this->getSequence())) { - $a[self::FIELD_SEQUENCE] = $v->getValue(); - $a[self::FIELD_SEQUENCE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SEQUENCE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SEQUENCE_EXT] = $enc; + } + } else { + $a[self::FIELD_SEQUENCE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimDetail.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimDetail.php index bda7143b71..2abc7adb1e 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimDetail.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimDetail.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -82,16 +82,14 @@ class FHIRClaimDetail extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CLAIM_DOT_DETAIL; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_FACTOR = 'factor'; const FIELD_FACTOR_EXT = '_factor'; const FIELD_NET = 'net'; + const FIELD_NET_EXT = '_net'; const FIELD_POINTS = 'points'; const FIELD_POINTS_EXT = '_points'; const FIELD_QUANTITY = 'quantity'; + const FIELD_QUANTITY_EXT = '_quantity'; const FIELD_SEQUENCE = 'sequence'; const FIELD_SEQUENCE_EXT = '_sequence'; const FIELD_SERVICE = 'service'; @@ -99,6 +97,7 @@ class FHIRClaimDetail extends FHIRBackboneElement const FIELD_TYPE = 'type'; const FIELD_UDI = 'udi'; const FIELD_UNIT_PRICE = 'unitPrice'; + const FIELD_UNIT_PRICE_EXT = '_unitPrice'; /** * A rational number with implicit precision @@ -209,6 +208,9 @@ class FHIRClaimDetail extends FHIRBackboneElement */ protected $unitPrice = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRClaimDetail Constructor * @param null|array $data @@ -231,15 +233,28 @@ public function __construct($data = null) : null; if ($data[self::FIELD_FACTOR] instanceof FHIRDecimal) { $this->setFactor($data[self::FIELD_FACTOR]); - } elseif ($ext && is_scalar($data[self::FIELD_FACTOR])) { - $this->setFactor(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_FACTOR]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_FACTOR])) { + $this->setFactor(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_FACTOR]] + $ext)); + } else if (is_array($data[self::FIELD_FACTOR])) { + $this->setFactor(new FHIRDecimal(array_merge($ext, $data[self::FIELD_FACTOR]))); + } } else { $this->setFactor(new FHIRDecimal($data[self::FIELD_FACTOR])); } } if (isset($data[self::FIELD_NET])) { + $ext = (isset($data[self::FIELD_NET_EXT]) && is_array($data[self::FIELD_NET_EXT])) + ? $data[self::FIELD_NET_EXT] + : null; if ($data[self::FIELD_NET] instanceof FHIRMoney) { $this->setNet($data[self::FIELD_NET]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NET])) { + $this->setNet(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_NET]] + $ext)); + } else if (is_array($data[self::FIELD_NET])) { + $this->setNet(new FHIRMoney(array_merge($ext, $data[self::FIELD_NET]))); + } } else { $this->setNet(new FHIRMoney($data[self::FIELD_NET])); } @@ -250,15 +265,28 @@ public function __construct($data = null) : null; if ($data[self::FIELD_POINTS] instanceof FHIRDecimal) { $this->setPoints($data[self::FIELD_POINTS]); - } elseif ($ext && is_scalar($data[self::FIELD_POINTS])) { - $this->setPoints(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_POINTS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_POINTS])) { + $this->setPoints(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_POINTS]] + $ext)); + } else if (is_array($data[self::FIELD_POINTS])) { + $this->setPoints(new FHIRDecimal(array_merge($ext, $data[self::FIELD_POINTS]))); + } } else { $this->setPoints(new FHIRDecimal($data[self::FIELD_POINTS])); } } if (isset($data[self::FIELD_QUANTITY])) { + $ext = (isset($data[self::FIELD_QUANTITY_EXT]) && is_array($data[self::FIELD_QUANTITY_EXT])) + ? $data[self::FIELD_QUANTITY_EXT] + : null; if ($data[self::FIELD_QUANTITY] instanceof FHIRSimpleQuantity) { $this->setQuantity($data[self::FIELD_QUANTITY]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_QUANTITY])) { + $this->setQuantity(new FHIRSimpleQuantity([FHIRSimpleQuantity::FIELD_VALUE => $data[self::FIELD_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_QUANTITY])) { + $this->setQuantity(new FHIRSimpleQuantity(array_merge($ext, $data[self::FIELD_QUANTITY]))); + } } else { $this->setQuantity(new FHIRSimpleQuantity($data[self::FIELD_QUANTITY])); } @@ -269,8 +297,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SEQUENCE] instanceof FHIRPositiveInt) { $this->setSequence($data[self::FIELD_SEQUENCE]); - } elseif ($ext && is_scalar($data[self::FIELD_SEQUENCE])) { - $this->setSequence(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_SEQUENCE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SEQUENCE])) { + $this->setSequence(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_SEQUENCE]] + $ext)); + } else if (is_array($data[self::FIELD_SEQUENCE])) { + $this->setSequence(new FHIRPositiveInt(array_merge($ext, $data[self::FIELD_SEQUENCE]))); + } } else { $this->setSequence(new FHIRPositiveInt($data[self::FIELD_SEQUENCE])); } @@ -285,6 +317,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SUB_DETAIL])) { if (is_array($data[self::FIELD_SUB_DETAIL])) { foreach($data[self::FIELD_SUB_DETAIL] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRClaimSubDetail) { $this->addSubDetail($v); } else { @@ -312,8 +347,17 @@ public function __construct($data = null) } } if (isset($data[self::FIELD_UNIT_PRICE])) { + $ext = (isset($data[self::FIELD_UNIT_PRICE_EXT]) && is_array($data[self::FIELD_UNIT_PRICE_EXT])) + ? $data[self::FIELD_UNIT_PRICE_EXT] + : null; if ($data[self::FIELD_UNIT_PRICE] instanceof FHIRMoney) { $this->setUnitPrice($data[self::FIELD_UNIT_PRICE]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_UNIT_PRICE])) { + $this->setUnitPrice(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_UNIT_PRICE]] + $ext)); + } else if (is_array($data[self::FIELD_UNIT_PRICE])) { + $this->setUnitPrice(new FHIRMoney(array_merge($ext, $data[self::FIELD_UNIT_PRICE]))); + } } else { $this->setUnitPrice(new FHIRMoney($data[self::FIELD_UNIT_PRICE])); } @@ -810,25 +854,21 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getFactor())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FACTOR, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getNet())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NET, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getPoints())) { $v->xmlSerialize($sxe->addChild(self::FIELD_POINTS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_QUANTITY, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getSequence())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SEQUENCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getService())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SERVICE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getSubDetail())) { foreach($vs as $v) { if (null === $v) { @@ -841,11 +881,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getUdi())) { $v->xmlSerialize($sxe->addChild(self::FIELD_UDI, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getUnitPrice())) { $v->xmlSerialize($sxe->addChild(self::FIELD_UNIT_PRICE, null, $v->_getFHIRXMLNamespace())); } @@ -859,22 +897,59 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getFactor())) { - $a[self::FIELD_FACTOR] = $v->getValue(); - $a[self::FIELD_FACTOR_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FACTOR] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FACTOR_EXT] = $enc; + } + } else { + $a[self::FIELD_FACTOR] = $v; + } } if (null !== ($v = $this->getNet())) { - $a[self::FIELD_NET] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NET] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NET_EXT] = $enc; + } + } else { + $a[self::FIELD_NET] = $v; + } } if (null !== ($v = $this->getPoints())) { - $a[self::FIELD_POINTS] = $v->getValue(); - $a[self::FIELD_POINTS_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_POINTS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_POINTS_EXT] = $enc; + } + } else { + $a[self::FIELD_POINTS] = $v; + } } if (null !== ($v = $this->getQuantity())) { - $a[self::FIELD_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_QUANTITY] = $v; + } } if (null !== ($v = $this->getSequence())) { - $a[self::FIELD_SEQUENCE] = $v->getValue(); - $a[self::FIELD_SEQUENCE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SEQUENCE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SEQUENCE_EXT] = $enc; + } + } else { + $a[self::FIELD_SEQUENCE] = $v; + } } if (null !== ($v = $this->getService())) { $a[self::FIELD_SERVICE] = $v; @@ -889,7 +964,15 @@ public function jsonSerialize() $a[self::FIELD_UDI] = $v; } if (null !== ($v = $this->getUnitPrice())) { - $a[self::FIELD_UNIT_PRICE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_UNIT_PRICE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_UNIT_PRICE_EXT] = $enc; + } + } else { + $a[self::FIELD_UNIT_PRICE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimDiagnosis.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimDiagnosis.php index 5c3bdc1524..0c8b528d58 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimDiagnosis.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimDiagnosis.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRClaimDiagnosis extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CLAIM_DOT_DIAGNOSIS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DIAGNOSIS = 'diagnosis'; const FIELD_SEQUENCE = 'sequence'; const FIELD_SEQUENCE_EXT = '_sequence'; @@ -109,6 +105,9 @@ class FHIRClaimDiagnosis extends FHIRBackboneElement */ protected $sequence = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRClaimDiagnosis Constructor * @param null|array $data @@ -138,8 +137,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SEQUENCE] instanceof FHIRPositiveInt) { $this->setSequence($data[self::FIELD_SEQUENCE]); - } elseif ($ext && is_scalar($data[self::FIELD_SEQUENCE])) { - $this->setSequence(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_SEQUENCE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SEQUENCE])) { + $this->setSequence(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_SEQUENCE]] + $ext)); + } else if (is_array($data[self::FIELD_SEQUENCE])) { + $this->setSequence(new FHIRPositiveInt(array_merge($ext, $data[self::FIELD_SEQUENCE]))); + } } else { $this->setSequence(new FHIRPositiveInt($data[self::FIELD_SEQUENCE])); } @@ -322,7 +325,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getDiagnosis())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DIAGNOSIS, null, $v->_getFHIRXMLNamespace())); } @@ -342,8 +344,15 @@ public function jsonSerialize() $a[self::FIELD_DIAGNOSIS] = $v; } if (null !== ($v = $this->getSequence())) { - $a[self::FIELD_SEQUENCE] = $v->getValue(); - $a[self::FIELD_SEQUENCE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SEQUENCE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SEQUENCE_EXT] = $enc; + } + } else { + $a[self::FIELD_SEQUENCE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimItem.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimItem.php index e22bbf2897..91455bfb40 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimItem.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimItem.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -84,10 +84,6 @@ class FHIRClaimItem extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CLAIM_DOT_ITEM; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_BODY_SITE = 'bodySite'; const FIELD_DETAIL = 'detail'; const FIELD_DIAGNOSIS_LINK_ID = 'diagnosisLinkId'; @@ -96,11 +92,13 @@ class FHIRClaimItem extends FHIRBackboneElement const FIELD_FACTOR_EXT = '_factor'; const FIELD_MODIFIER = 'modifier'; const FIELD_NET = 'net'; + const FIELD_NET_EXT = '_net'; const FIELD_POINTS = 'points'; const FIELD_POINTS_EXT = '_points'; const FIELD_PROSTHESIS = 'prosthesis'; const FIELD_PROVIDER = 'provider'; const FIELD_QUANTITY = 'quantity'; + const FIELD_QUANTITY_EXT = '_quantity'; const FIELD_SEQUENCE = 'sequence'; const FIELD_SEQUENCE_EXT = '_sequence'; const FIELD_SERVICE = 'service'; @@ -110,6 +108,7 @@ class FHIRClaimItem extends FHIRBackboneElement const FIELD_TYPE = 'type'; const FIELD_UDI = 'udi'; const FIELD_UNIT_PRICE = 'unitPrice'; + const FIELD_UNIT_PRICE_EXT = '_unitPrice'; /** * A reference to a code defined by a terminology system. @@ -298,6 +297,9 @@ class FHIRClaimItem extends FHIRBackboneElement */ protected $unitPrice = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRClaimItem Constructor * @param null|array $data @@ -324,6 +326,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_DETAIL])) { if (is_array($data[self::FIELD_DETAIL])) { foreach($data[self::FIELD_DETAIL] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRClaimDetail) { $this->addDetail($v); } else { @@ -342,17 +347,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_DIAGNOSIS_LINK_ID])) { foreach($data[self::FIELD_DIAGNOSIS_LINK_ID] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRPositiveInt) { $this->addDiagnosisLinkId($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addDiagnosisLinkId(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addDiagnosisLinkId(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addDiagnosisLinkId(new FHIRPositiveInt(array_merge($v, $ext[$i]))); + } } else { $this->addDiagnosisLinkId(new FHIRPositiveInt($v)); } } } elseif ($data[self::FIELD_DIAGNOSIS_LINK_ID] instanceof FHIRPositiveInt) { $this->addDiagnosisLinkId($data[self::FIELD_DIAGNOSIS_LINK_ID]); - } elseif ($ext && is_scalar($data[self::FIELD_DIAGNOSIS_LINK_ID])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_DIAGNOSIS_LINK_ID])) { $this->addDiagnosisLinkId(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_DIAGNOSIS_LINK_ID]] + $ext)); } else { $this->addDiagnosisLinkId(new FHIRPositiveInt($data[self::FIELD_DIAGNOSIS_LINK_ID])); @@ -364,8 +376,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_FACTOR] instanceof FHIRDecimal) { $this->setFactor($data[self::FIELD_FACTOR]); - } elseif ($ext && is_scalar($data[self::FIELD_FACTOR])) { - $this->setFactor(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_FACTOR]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_FACTOR])) { + $this->setFactor(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_FACTOR]] + $ext)); + } else if (is_array($data[self::FIELD_FACTOR])) { + $this->setFactor(new FHIRDecimal(array_merge($ext, $data[self::FIELD_FACTOR]))); + } } else { $this->setFactor(new FHIRDecimal($data[self::FIELD_FACTOR])); } @@ -373,6 +389,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_MODIFIER])) { if (is_array($data[self::FIELD_MODIFIER])) { foreach($data[self::FIELD_MODIFIER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCoding) { $this->addModifier($v); } else { @@ -386,8 +405,17 @@ public function __construct($data = null) } } if (isset($data[self::FIELD_NET])) { + $ext = (isset($data[self::FIELD_NET_EXT]) && is_array($data[self::FIELD_NET_EXT])) + ? $data[self::FIELD_NET_EXT] + : null; if ($data[self::FIELD_NET] instanceof FHIRMoney) { $this->setNet($data[self::FIELD_NET]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NET])) { + $this->setNet(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_NET]] + $ext)); + } else if (is_array($data[self::FIELD_NET])) { + $this->setNet(new FHIRMoney(array_merge($ext, $data[self::FIELD_NET]))); + } } else { $this->setNet(new FHIRMoney($data[self::FIELD_NET])); } @@ -398,8 +426,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_POINTS] instanceof FHIRDecimal) { $this->setPoints($data[self::FIELD_POINTS]); - } elseif ($ext && is_scalar($data[self::FIELD_POINTS])) { - $this->setPoints(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_POINTS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_POINTS])) { + $this->setPoints(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_POINTS]] + $ext)); + } else if (is_array($data[self::FIELD_POINTS])) { + $this->setPoints(new FHIRDecimal(array_merge($ext, $data[self::FIELD_POINTS]))); + } } else { $this->setPoints(new FHIRDecimal($data[self::FIELD_POINTS])); } @@ -419,8 +451,17 @@ public function __construct($data = null) } } if (isset($data[self::FIELD_QUANTITY])) { + $ext = (isset($data[self::FIELD_QUANTITY_EXT]) && is_array($data[self::FIELD_QUANTITY_EXT])) + ? $data[self::FIELD_QUANTITY_EXT] + : null; if ($data[self::FIELD_QUANTITY] instanceof FHIRSimpleQuantity) { $this->setQuantity($data[self::FIELD_QUANTITY]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_QUANTITY])) { + $this->setQuantity(new FHIRSimpleQuantity([FHIRSimpleQuantity::FIELD_VALUE => $data[self::FIELD_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_QUANTITY])) { + $this->setQuantity(new FHIRSimpleQuantity(array_merge($ext, $data[self::FIELD_QUANTITY]))); + } } else { $this->setQuantity(new FHIRSimpleQuantity($data[self::FIELD_QUANTITY])); } @@ -431,8 +472,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SEQUENCE] instanceof FHIRPositiveInt) { $this->setSequence($data[self::FIELD_SEQUENCE]); - } elseif ($ext && is_scalar($data[self::FIELD_SEQUENCE])) { - $this->setSequence(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_SEQUENCE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SEQUENCE])) { + $this->setSequence(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_SEQUENCE]] + $ext)); + } else if (is_array($data[self::FIELD_SEQUENCE])) { + $this->setSequence(new FHIRPositiveInt(array_merge($ext, $data[self::FIELD_SEQUENCE]))); + } } else { $this->setSequence(new FHIRPositiveInt($data[self::FIELD_SEQUENCE])); } @@ -450,8 +495,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SERVICE_DATE] instanceof FHIRDate) { $this->setServiceDate($data[self::FIELD_SERVICE_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_SERVICE_DATE])) { - $this->setServiceDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_SERVICE_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SERVICE_DATE])) { + $this->setServiceDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_SERVICE_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_SERVICE_DATE])) { + $this->setServiceDate(new FHIRDate(array_merge($ext, $data[self::FIELD_SERVICE_DATE]))); + } } else { $this->setServiceDate(new FHIRDate($data[self::FIELD_SERVICE_DATE])); } @@ -459,6 +508,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SUB_SITE])) { if (is_array($data[self::FIELD_SUB_SITE])) { foreach($data[self::FIELD_SUB_SITE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCoding) { $this->addSubSite($v); } else { @@ -486,8 +538,17 @@ public function __construct($data = null) } } if (isset($data[self::FIELD_UNIT_PRICE])) { + $ext = (isset($data[self::FIELD_UNIT_PRICE_EXT]) && is_array($data[self::FIELD_UNIT_PRICE_EXT])) + ? $data[self::FIELD_UNIT_PRICE_EXT] + : null; if ($data[self::FIELD_UNIT_PRICE] instanceof FHIRMoney) { $this->setUnitPrice($data[self::FIELD_UNIT_PRICE]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_UNIT_PRICE])) { + $this->setUnitPrice(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_UNIT_PRICE]] + $ext)); + } else if (is_array($data[self::FIELD_UNIT_PRICE])) { + $this->setUnitPrice(new FHIRMoney(array_merge($ext, $data[self::FIELD_UNIT_PRICE]))); + } } else { $this->setUnitPrice(new FHIRMoney($data[self::FIELD_UNIT_PRICE])); } @@ -1321,11 +1382,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getBodySite())) { $v->xmlSerialize($sxe->addChild(self::FIELD_BODY_SITE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getDetail())) { foreach($vs as $v) { if (null === $v) { @@ -1334,6 +1393,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_DETAIL, null, $v->_getFHIRXMLNamespace())); } } + if ([] !== ($vs = $this->getDiagnosisLinkId())) { foreach($vs as $v) { if (null === $v) { @@ -1342,10 +1402,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_DIAGNOSIS_LINK_ID, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getFactor())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FACTOR, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getModifier())) { foreach($vs as $v) { if (null === $v) { @@ -1361,29 +1421,24 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getPoints())) { $v->xmlSerialize($sxe->addChild(self::FIELD_POINTS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getProsthesis())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PROSTHESIS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getProvider())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PROVIDER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_QUANTITY, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getSequence())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SEQUENCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getService())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SERVICE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getServiceDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SERVICE_DATE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getSubSite())) { foreach($vs as $v) { if (null === $v) { @@ -1396,11 +1451,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getUdi())) { $v->xmlSerialize($sxe->addChild(self::FIELD_UDI, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getUnitPrice())) { $v->xmlSerialize($sxe->addChild(self::FIELD_UNIT_PRICE, null, $v->_getFHIRXMLNamespace())); } @@ -1425,23 +1478,54 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_DIAGNOSIS_LINK_ID][] = $v->getValue(); - $a[self::FIELD_DIAGNOSIS_LINK_ID_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DIAGNOSIS_LINK_ID][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DIAGNOSIS_LINK_ID_EXT][] = $enc; + } else { + $a[self::FIELD_DIAGNOSIS_LINK_ID_EXT][] = null; + } + } else { + $a[self::FIELD_DIAGNOSIS_LINK_ID][] = $v; + } } } if (null !== ($v = $this->getFactor())) { - $a[self::FIELD_FACTOR] = $v->getValue(); - $a[self::FIELD_FACTOR_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FACTOR] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FACTOR_EXT] = $enc; + } + } else { + $a[self::FIELD_FACTOR] = $v; + } } if ([] !== ($vs = $this->getModifier())) { $a[self::FIELD_MODIFIER] = $vs; } if (null !== ($v = $this->getNet())) { - $a[self::FIELD_NET] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NET] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NET_EXT] = $enc; + } + } else { + $a[self::FIELD_NET] = $v; + } } if (null !== ($v = $this->getPoints())) { - $a[self::FIELD_POINTS] = $v->getValue(); - $a[self::FIELD_POINTS_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_POINTS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_POINTS_EXT] = $enc; + } + } else { + $a[self::FIELD_POINTS] = $v; + } } if (null !== ($v = $this->getProsthesis())) { $a[self::FIELD_PROSTHESIS] = $v; @@ -1450,18 +1534,40 @@ public function jsonSerialize() $a[self::FIELD_PROVIDER] = $v; } if (null !== ($v = $this->getQuantity())) { - $a[self::FIELD_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_QUANTITY] = $v; + } } if (null !== ($v = $this->getSequence())) { - $a[self::FIELD_SEQUENCE] = $v->getValue(); - $a[self::FIELD_SEQUENCE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SEQUENCE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SEQUENCE_EXT] = $enc; + } + } else { + $a[self::FIELD_SEQUENCE] = $v; + } } if (null !== ($v = $this->getService())) { $a[self::FIELD_SERVICE] = $v; } if (null !== ($v = $this->getServiceDate())) { - $a[self::FIELD_SERVICE_DATE] = $v->getValue(); - $a[self::FIELD_SERVICE_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SERVICE_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SERVICE_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_SERVICE_DATE] = $v; + } } if ([] !== ($vs = $this->getSubSite())) { $a[self::FIELD_SUB_SITE] = $vs; @@ -1473,7 +1579,15 @@ public function jsonSerialize() $a[self::FIELD_UDI] = $v; } if (null !== ($v = $this->getUnitPrice())) { - $a[self::FIELD_UNIT_PRICE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_UNIT_PRICE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_UNIT_PRICE_EXT] = $enc; + } + } else { + $a[self::FIELD_UNIT_PRICE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimMissingTeeth.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimMissingTeeth.php index ed05637497..4b85325ebd 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimMissingTeeth.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimMissingTeeth.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRClaimMissingTeeth extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CLAIM_DOT_MISSING_TEETH; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_EXTRACTION_DATE = 'extractionDate'; const FIELD_EXTRACTION_DATE_EXT = '_extractionDate'; const FIELD_REASON = 'reason'; @@ -123,6 +119,9 @@ class FHIRClaimMissingTeeth extends FHIRBackboneElement */ protected $tooth = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRClaimMissingTeeth Constructor * @param null|array $data @@ -145,8 +144,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EXTRACTION_DATE] instanceof FHIRDate) { $this->setExtractionDate($data[self::FIELD_EXTRACTION_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_EXTRACTION_DATE])) { - $this->setExtractionDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_EXTRACTION_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EXTRACTION_DATE])) { + $this->setExtractionDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_EXTRACTION_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_EXTRACTION_DATE])) { + $this->setExtractionDate(new FHIRDate(array_merge($ext, $data[self::FIELD_EXTRACTION_DATE]))); + } } else { $this->setExtractionDate(new FHIRDate($data[self::FIELD_EXTRACTION_DATE])); } @@ -383,11 +386,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getExtractionDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EXTRACTION_DATE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getReason())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REASON, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getTooth())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TOOTH, null, $v->_getFHIRXMLNamespace())); } @@ -401,8 +402,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getExtractionDate())) { - $a[self::FIELD_EXTRACTION_DATE] = $v->getValue(); - $a[self::FIELD_EXTRACTION_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EXTRACTION_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EXTRACTION_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_EXTRACTION_DATE] = $v; + } } if (null !== ($v = $this->getReason())) { $a[self::FIELD_REASON] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimPayee.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimPayee.php index ec7e0ebaf8..6ccafdc299 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimPayee.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimPayee.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRClaimPayee extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CLAIM_DOT_PAYEE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ORGANIZATION = 'organization'; const FIELD_PERSON = 'person'; const FIELD_PROVIDER = 'provider'; @@ -135,6 +131,9 @@ class FHIRClaimPayee extends FHIRBackboneElement */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRClaimPayee Constructor * @param null|array $data @@ -418,19 +417,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getOrganization())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ORGANIZATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPerson())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PERSON, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getProvider())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PROVIDER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimProsthesis.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimProsthesis.php index 899d9de3ab..0a804fcc14 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimProsthesis.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimProsthesis.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRClaimProsthesis extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CLAIM_DOT_PROSTHESIS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_INITIAL = 'initial'; const FIELD_INITIAL_EXT = '_initial'; const FIELD_PRIOR_DATE = 'priorDate'; @@ -123,6 +119,9 @@ class FHIRClaimProsthesis extends FHIRBackboneElement */ protected $priorMaterial = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRClaimProsthesis Constructor * @param null|array $data @@ -145,8 +144,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_INITIAL] instanceof FHIRBoolean) { $this->setInitial($data[self::FIELD_INITIAL]); - } elseif ($ext && is_scalar($data[self::FIELD_INITIAL])) { - $this->setInitial(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_INITIAL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_INITIAL])) { + $this->setInitial(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_INITIAL]] + $ext)); + } else if (is_array($data[self::FIELD_INITIAL])) { + $this->setInitial(new FHIRBoolean(array_merge($ext, $data[self::FIELD_INITIAL]))); + } } else { $this->setInitial(new FHIRBoolean($data[self::FIELD_INITIAL])); } @@ -157,8 +160,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PRIOR_DATE] instanceof FHIRDate) { $this->setPriorDate($data[self::FIELD_PRIOR_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_PRIOR_DATE])) { - $this->setPriorDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_PRIOR_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PRIOR_DATE])) { + $this->setPriorDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_PRIOR_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_PRIOR_DATE])) { + $this->setPriorDate(new FHIRDate(array_merge($ext, $data[self::FIELD_PRIOR_DATE]))); + } } else { $this->setPriorDate(new FHIRDate($data[self::FIELD_PRIOR_DATE])); } @@ -398,7 +405,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getPriorDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PRIOR_DATE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPriorMaterial())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PRIOR_MATERIAL, null, $v->_getFHIRXMLNamespace())); } @@ -412,12 +418,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getInitial())) { - $a[self::FIELD_INITIAL] = $v->getValue(); - $a[self::FIELD_INITIAL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_INITIAL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_INITIAL_EXT] = $enc; + } + } else { + $a[self::FIELD_INITIAL] = $v; + } } if (null !== ($v = $this->getPriorDate())) { - $a[self::FIELD_PRIOR_DATE] = $v->getValue(); - $a[self::FIELD_PRIOR_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PRIOR_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PRIOR_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_PRIOR_DATE] = $v; + } } if (null !== ($v = $this->getPriorMaterial())) { $a[self::FIELD_PRIOR_MATERIAL] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimSubDetail.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimSubDetail.php index 668abe9227..1b495b68f8 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimSubDetail.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimSubDetail.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -82,22 +82,21 @@ class FHIRClaimSubDetail extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CLAIM_DOT_SUB_DETAIL; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_FACTOR = 'factor'; const FIELD_FACTOR_EXT = '_factor'; const FIELD_NET = 'net'; + const FIELD_NET_EXT = '_net'; const FIELD_POINTS = 'points'; const FIELD_POINTS_EXT = '_points'; const FIELD_QUANTITY = 'quantity'; + const FIELD_QUANTITY_EXT = '_quantity'; const FIELD_SEQUENCE = 'sequence'; const FIELD_SEQUENCE_EXT = '_sequence'; const FIELD_SERVICE = 'service'; const FIELD_TYPE = 'type'; const FIELD_UDI = 'udi'; const FIELD_UNIT_PRICE = 'unitPrice'; + const FIELD_UNIT_PRICE_EXT = '_unitPrice'; /** * A rational number with implicit precision @@ -196,6 +195,9 @@ class FHIRClaimSubDetail extends FHIRBackboneElement */ protected $unitPrice = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRClaimSubDetail Constructor * @param null|array $data @@ -218,15 +220,28 @@ public function __construct($data = null) : null; if ($data[self::FIELD_FACTOR] instanceof FHIRDecimal) { $this->setFactor($data[self::FIELD_FACTOR]); - } elseif ($ext && is_scalar($data[self::FIELD_FACTOR])) { - $this->setFactor(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_FACTOR]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_FACTOR])) { + $this->setFactor(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_FACTOR]] + $ext)); + } else if (is_array($data[self::FIELD_FACTOR])) { + $this->setFactor(new FHIRDecimal(array_merge($ext, $data[self::FIELD_FACTOR]))); + } } else { $this->setFactor(new FHIRDecimal($data[self::FIELD_FACTOR])); } } if (isset($data[self::FIELD_NET])) { + $ext = (isset($data[self::FIELD_NET_EXT]) && is_array($data[self::FIELD_NET_EXT])) + ? $data[self::FIELD_NET_EXT] + : null; if ($data[self::FIELD_NET] instanceof FHIRMoney) { $this->setNet($data[self::FIELD_NET]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NET])) { + $this->setNet(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_NET]] + $ext)); + } else if (is_array($data[self::FIELD_NET])) { + $this->setNet(new FHIRMoney(array_merge($ext, $data[self::FIELD_NET]))); + } } else { $this->setNet(new FHIRMoney($data[self::FIELD_NET])); } @@ -237,15 +252,28 @@ public function __construct($data = null) : null; if ($data[self::FIELD_POINTS] instanceof FHIRDecimal) { $this->setPoints($data[self::FIELD_POINTS]); - } elseif ($ext && is_scalar($data[self::FIELD_POINTS])) { - $this->setPoints(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_POINTS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_POINTS])) { + $this->setPoints(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_POINTS]] + $ext)); + } else if (is_array($data[self::FIELD_POINTS])) { + $this->setPoints(new FHIRDecimal(array_merge($ext, $data[self::FIELD_POINTS]))); + } } else { $this->setPoints(new FHIRDecimal($data[self::FIELD_POINTS])); } } if (isset($data[self::FIELD_QUANTITY])) { + $ext = (isset($data[self::FIELD_QUANTITY_EXT]) && is_array($data[self::FIELD_QUANTITY_EXT])) + ? $data[self::FIELD_QUANTITY_EXT] + : null; if ($data[self::FIELD_QUANTITY] instanceof FHIRSimpleQuantity) { $this->setQuantity($data[self::FIELD_QUANTITY]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_QUANTITY])) { + $this->setQuantity(new FHIRSimpleQuantity([FHIRSimpleQuantity::FIELD_VALUE => $data[self::FIELD_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_QUANTITY])) { + $this->setQuantity(new FHIRSimpleQuantity(array_merge($ext, $data[self::FIELD_QUANTITY]))); + } } else { $this->setQuantity(new FHIRSimpleQuantity($data[self::FIELD_QUANTITY])); } @@ -256,8 +284,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SEQUENCE] instanceof FHIRPositiveInt) { $this->setSequence($data[self::FIELD_SEQUENCE]); - } elseif ($ext && is_scalar($data[self::FIELD_SEQUENCE])) { - $this->setSequence(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_SEQUENCE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SEQUENCE])) { + $this->setSequence(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_SEQUENCE]] + $ext)); + } else if (is_array($data[self::FIELD_SEQUENCE])) { + $this->setSequence(new FHIRPositiveInt(array_merge($ext, $data[self::FIELD_SEQUENCE]))); + } } else { $this->setSequence(new FHIRPositiveInt($data[self::FIELD_SEQUENCE])); } @@ -284,8 +316,17 @@ public function __construct($data = null) } } if (isset($data[self::FIELD_UNIT_PRICE])) { + $ext = (isset($data[self::FIELD_UNIT_PRICE_EXT]) && is_array($data[self::FIELD_UNIT_PRICE_EXT])) + ? $data[self::FIELD_UNIT_PRICE_EXT] + : null; if ($data[self::FIELD_UNIT_PRICE] instanceof FHIRMoney) { $this->setUnitPrice($data[self::FIELD_UNIT_PRICE]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_UNIT_PRICE])) { + $this->setUnitPrice(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_UNIT_PRICE]] + $ext)); + } else if (is_array($data[self::FIELD_UNIT_PRICE])) { + $this->setUnitPrice(new FHIRMoney(array_merge($ext, $data[self::FIELD_UNIT_PRICE]))); + } } else { $this->setUnitPrice(new FHIRMoney($data[self::FIELD_UNIT_PRICE])); } @@ -720,33 +761,27 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getFactor())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FACTOR, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getNet())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NET, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getPoints())) { $v->xmlSerialize($sxe->addChild(self::FIELD_POINTS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_QUANTITY, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getSequence())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SEQUENCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getService())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SERVICE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getUdi())) { $v->xmlSerialize($sxe->addChild(self::FIELD_UDI, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getUnitPrice())) { $v->xmlSerialize($sxe->addChild(self::FIELD_UNIT_PRICE, null, $v->_getFHIRXMLNamespace())); } @@ -760,22 +795,59 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getFactor())) { - $a[self::FIELD_FACTOR] = $v->getValue(); - $a[self::FIELD_FACTOR_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FACTOR] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FACTOR_EXT] = $enc; + } + } else { + $a[self::FIELD_FACTOR] = $v; + } } if (null !== ($v = $this->getNet())) { - $a[self::FIELD_NET] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NET] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NET_EXT] = $enc; + } + } else { + $a[self::FIELD_NET] = $v; + } } if (null !== ($v = $this->getPoints())) { - $a[self::FIELD_POINTS] = $v->getValue(); - $a[self::FIELD_POINTS_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_POINTS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_POINTS_EXT] = $enc; + } + } else { + $a[self::FIELD_POINTS] = $v; + } } if (null !== ($v = $this->getQuantity())) { - $a[self::FIELD_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_QUANTITY] = $v; + } } if (null !== ($v = $this->getSequence())) { - $a[self::FIELD_SEQUENCE] = $v->getValue(); - $a[self::FIELD_SEQUENCE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SEQUENCE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SEQUENCE_EXT] = $enc; + } + } else { + $a[self::FIELD_SEQUENCE] = $v; + } } if (null !== ($v = $this->getService())) { $a[self::FIELD_SERVICE] = $v; @@ -787,7 +859,15 @@ public function jsonSerialize() $a[self::FIELD_UDI] = $v; } if (null !== ($v = $this->getUnitPrice())) { - $a[self::FIELD_UNIT_PRICE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_UNIT_PRICE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_UNIT_PRICE_EXT] = $enc; + } + } else { + $a[self::FIELD_UNIT_PRICE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseAddItem.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseAddItem.php index 6a4261e5ee..dc7e37bcd6 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseAddItem.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseAddItem.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -80,14 +80,11 @@ class FHIRClaimResponseAddItem extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CLAIM_RESPONSE_DOT_ADD_ITEM; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ADJUDICATION = 'adjudication'; const FIELD_ADJUDICATION_EXT = '_adjudication'; const FIELD_DETAIL = 'detail'; const FIELD_FEE = 'fee'; + const FIELD_FEE_EXT = '_fee'; const FIELD_NOTE_NUMBER_LINK_ID = 'noteNumberLinkId'; const FIELD_NOTE_NUMBER_LINK_ID_EXT = '_noteNumberLinkId'; const FIELD_SEQUENCE_LINK_ID = 'sequenceLinkId'; @@ -154,6 +151,9 @@ class FHIRClaimResponseAddItem extends FHIRBackboneElement */ protected $service = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRClaimResponseAddItem Constructor * @param null|array $data @@ -176,17 +176,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_ADJUDICATION])) { foreach($data[self::FIELD_ADJUDICATION] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRClaimResponseAdjudication3) { $this->addAdjudication($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addAdjudication(new FHIRClaimResponseAdjudication3([FHIRClaimResponseAdjudication3::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addAdjudication(new FHIRClaimResponseAdjudication3([FHIRClaimResponseAdjudication3::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addAdjudication(new FHIRClaimResponseAdjudication3(array_merge($v, $ext[$i]))); + } } else { $this->addAdjudication(new FHIRClaimResponseAdjudication3($v)); } } } elseif ($data[self::FIELD_ADJUDICATION] instanceof FHIRClaimResponseAdjudication3) { $this->addAdjudication($data[self::FIELD_ADJUDICATION]); - } elseif ($ext && is_scalar($data[self::FIELD_ADJUDICATION])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_ADJUDICATION])) { $this->addAdjudication(new FHIRClaimResponseAdjudication3([FHIRClaimResponseAdjudication3::FIELD_VALUE => $data[self::FIELD_ADJUDICATION]] + $ext)); } else { $this->addAdjudication(new FHIRClaimResponseAdjudication3($data[self::FIELD_ADJUDICATION])); @@ -195,6 +202,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_DETAIL])) { if (is_array($data[self::FIELD_DETAIL])) { foreach($data[self::FIELD_DETAIL] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRClaimResponseDetail1) { $this->addDetail($v); } else { @@ -208,8 +218,17 @@ public function __construct($data = null) } } if (isset($data[self::FIELD_FEE])) { + $ext = (isset($data[self::FIELD_FEE_EXT]) && is_array($data[self::FIELD_FEE_EXT])) + ? $data[self::FIELD_FEE_EXT] + : null; if ($data[self::FIELD_FEE] instanceof FHIRMoney) { $this->setFee($data[self::FIELD_FEE]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_FEE])) { + $this->setFee(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_FEE]] + $ext)); + } else if (is_array($data[self::FIELD_FEE])) { + $this->setFee(new FHIRMoney(array_merge($ext, $data[self::FIELD_FEE]))); + } } else { $this->setFee(new FHIRMoney($data[self::FIELD_FEE])); } @@ -220,17 +239,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_NOTE_NUMBER_LINK_ID])) { foreach($data[self::FIELD_NOTE_NUMBER_LINK_ID] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRPositiveInt) { $this->addNoteNumberLinkId($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addNoteNumberLinkId(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addNoteNumberLinkId(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addNoteNumberLinkId(new FHIRPositiveInt(array_merge($v, $ext[$i]))); + } } else { $this->addNoteNumberLinkId(new FHIRPositiveInt($v)); } } } elseif ($data[self::FIELD_NOTE_NUMBER_LINK_ID] instanceof FHIRPositiveInt) { $this->addNoteNumberLinkId($data[self::FIELD_NOTE_NUMBER_LINK_ID]); - } elseif ($ext && is_scalar($data[self::FIELD_NOTE_NUMBER_LINK_ID])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_NOTE_NUMBER_LINK_ID])) { $this->addNoteNumberLinkId(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_NOTE_NUMBER_LINK_ID]] + $ext)); } else { $this->addNoteNumberLinkId(new FHIRPositiveInt($data[self::FIELD_NOTE_NUMBER_LINK_ID])); @@ -242,17 +268,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_SEQUENCE_LINK_ID])) { foreach($data[self::FIELD_SEQUENCE_LINK_ID] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRPositiveInt) { $this->addSequenceLinkId($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addSequenceLinkId(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addSequenceLinkId(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addSequenceLinkId(new FHIRPositiveInt(array_merge($v, $ext[$i]))); + } } else { $this->addSequenceLinkId(new FHIRPositiveInt($v)); } } } elseif ($data[self::FIELD_SEQUENCE_LINK_ID] instanceof FHIRPositiveInt) { $this->addSequenceLinkId($data[self::FIELD_SEQUENCE_LINK_ID]); - } elseif ($ext && is_scalar($data[self::FIELD_SEQUENCE_LINK_ID])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_SEQUENCE_LINK_ID])) { $this->addSequenceLinkId(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_SEQUENCE_LINK_ID]] + $ext)); } else { $this->addSequenceLinkId(new FHIRPositiveInt($data[self::FIELD_SEQUENCE_LINK_ID])); @@ -684,7 +717,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getAdjudication())) { foreach($vs as $v) { if (null === $v) { @@ -714,6 +746,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_NOTE_NUMBER_LINK_ID, null, $v->_getFHIRXMLNamespace())); } } + if ([] !== ($vs = $this->getSequenceLinkId())) { foreach($vs as $v) { if (null === $v) { @@ -736,13 +769,37 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if ([] !== ($vs = $this->getAdjudication())) { - $a[self::FIELD_ADJUDICATION] = $vs; + $a[self::FIELD_ADJUDICATION] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ADJUDICATION][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ADJUDICATION_EXT][] = $enc; + } else { + $a[self::FIELD_ADJUDICATION_EXT][] = null; + } + } else { + $a[self::FIELD_ADJUDICATION][] = $v; + } + } } if ([] !== ($vs = $this->getDetail())) { $a[self::FIELD_DETAIL] = $vs; } if (null !== ($v = $this->getFee())) { - $a[self::FIELD_FEE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FEE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FEE_EXT] = $enc; + } + } else { + $a[self::FIELD_FEE] = $v; + } } if ([] !== ($vs = $this->getNoteNumberLinkId())) { $a[self::FIELD_NOTE_NUMBER_LINK_ID] = []; @@ -750,8 +807,17 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_NOTE_NUMBER_LINK_ID][] = $v->getValue(); - $a[self::FIELD_NOTE_NUMBER_LINK_ID_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NOTE_NUMBER_LINK_ID][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NOTE_NUMBER_LINK_ID_EXT][] = $enc; + } else { + $a[self::FIELD_NOTE_NUMBER_LINK_ID_EXT][] = null; + } + } else { + $a[self::FIELD_NOTE_NUMBER_LINK_ID][] = $v; + } } } if ([] !== ($vs = $this->getSequenceLinkId())) { @@ -760,8 +826,17 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_SEQUENCE_LINK_ID][] = $v->getValue(); - $a[self::FIELD_SEQUENCE_LINK_ID_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SEQUENCE_LINK_ID][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SEQUENCE_LINK_ID_EXT][] = $enc; + } else { + $a[self::FIELD_SEQUENCE_LINK_ID_EXT][] = null; + } + } else { + $a[self::FIELD_SEQUENCE_LINK_ID][] = $v; + } } } if (null !== ($v = $this->getService())) { diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseAdjudication.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseAdjudication.php index 9bcc963241..dfe86e7e5b 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseAdjudication.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseAdjudication.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -80,11 +80,8 @@ class FHIRClaimResponseAdjudication extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CLAIM_RESPONSE_DOT_ADJUDICATION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_AMOUNT = 'amount'; + const FIELD_AMOUNT_EXT = '_amount'; const FIELD_CODE = 'code'; const FIELD_VALUE = 'value'; const FIELD_VALUE_EXT = '_value'; @@ -120,6 +117,9 @@ class FHIRClaimResponseAdjudication extends FHIRBackboneElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRClaimResponseAdjudication Constructor * @param null|array $data @@ -141,8 +141,17 @@ public function __construct($data = null) } parent::__construct($data); if (isset($data[self::FIELD_AMOUNT])) { + $ext = (isset($data[self::FIELD_AMOUNT_EXT]) && is_array($data[self::FIELD_AMOUNT_EXT])) + ? $data[self::FIELD_AMOUNT_EXT] + : null; if ($data[self::FIELD_AMOUNT] instanceof FHIRMoney) { $this->setAmount($data[self::FIELD_AMOUNT]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_AMOUNT])) { + $this->setAmount(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_AMOUNT]] + $ext)); + } else if (is_array($data[self::FIELD_AMOUNT])) { + $this->setAmount(new FHIRMoney(array_merge($ext, $data[self::FIELD_AMOUNT]))); + } } else { $this->setAmount(new FHIRMoney($data[self::FIELD_AMOUNT])); } @@ -160,8 +169,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE] instanceof FHIRDecimal) { $this->setValue($data[self::FIELD_VALUE]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE])) { - $this->setValue(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_VALUE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE])) { + $this->setValue(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_VALUE]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE])) { + $this->setValue(new FHIRDecimal(array_merge($ext, $data[self::FIELD_VALUE]))); + } } else { $this->setValue(new FHIRDecimal($data[self::FIELD_VALUE])); } @@ -373,15 +386,14 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getAmount())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AMOUNT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getValue())) { + $sxe->addAttribute(self::FIELD_VALUE, (string)$v); $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE, null, $v->_getFHIRXMLNamespace())); } return $sxe; @@ -394,14 +406,29 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getAmount())) { - $a[self::FIELD_AMOUNT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_AMOUNT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_AMOUNT_EXT] = $enc; + } + } else { + $a[self::FIELD_AMOUNT] = $v; + } } if (null !== ($v = $this->getCode())) { $a[self::FIELD_CODE] = $v; } if (null !== ($v = $this->getValue())) { - $a[self::FIELD_VALUE] = $v->getValue(); - $a[self::FIELD_VALUE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseAdjudication1.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseAdjudication1.php index c4f4844806..2d0ff60302 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseAdjudication1.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseAdjudication1.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -80,11 +80,8 @@ class FHIRClaimResponseAdjudication1 extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CLAIM_RESPONSE_DOT_ADJUDICATION_1; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_AMOUNT = 'amount'; + const FIELD_AMOUNT_EXT = '_amount'; const FIELD_CODE = 'code'; const FIELD_VALUE = 'value'; const FIELD_VALUE_EXT = '_value'; @@ -120,6 +117,9 @@ class FHIRClaimResponseAdjudication1 extends FHIRBackboneElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRClaimResponseAdjudication1 Constructor * @param null|array $data @@ -141,8 +141,17 @@ public function __construct($data = null) } parent::__construct($data); if (isset($data[self::FIELD_AMOUNT])) { + $ext = (isset($data[self::FIELD_AMOUNT_EXT]) && is_array($data[self::FIELD_AMOUNT_EXT])) + ? $data[self::FIELD_AMOUNT_EXT] + : null; if ($data[self::FIELD_AMOUNT] instanceof FHIRMoney) { $this->setAmount($data[self::FIELD_AMOUNT]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_AMOUNT])) { + $this->setAmount(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_AMOUNT]] + $ext)); + } else if (is_array($data[self::FIELD_AMOUNT])) { + $this->setAmount(new FHIRMoney(array_merge($ext, $data[self::FIELD_AMOUNT]))); + } } else { $this->setAmount(new FHIRMoney($data[self::FIELD_AMOUNT])); } @@ -160,8 +169,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE] instanceof FHIRDecimal) { $this->setValue($data[self::FIELD_VALUE]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE])) { - $this->setValue(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_VALUE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE])) { + $this->setValue(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_VALUE]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE])) { + $this->setValue(new FHIRDecimal(array_merge($ext, $data[self::FIELD_VALUE]))); + } } else { $this->setValue(new FHIRDecimal($data[self::FIELD_VALUE])); } @@ -373,15 +386,14 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getAmount())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AMOUNT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getValue())) { + $sxe->addAttribute(self::FIELD_VALUE, (string)$v); $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE, null, $v->_getFHIRXMLNamespace())); } return $sxe; @@ -394,14 +406,29 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getAmount())) { - $a[self::FIELD_AMOUNT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_AMOUNT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_AMOUNT_EXT] = $enc; + } + } else { + $a[self::FIELD_AMOUNT] = $v; + } } if (null !== ($v = $this->getCode())) { $a[self::FIELD_CODE] = $v; } if (null !== ($v = $this->getValue())) { - $a[self::FIELD_VALUE] = $v->getValue(); - $a[self::FIELD_VALUE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseAdjudication2.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseAdjudication2.php index b13cfce9f9..4c492526e1 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseAdjudication2.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseAdjudication2.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -80,11 +80,8 @@ class FHIRClaimResponseAdjudication2 extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CLAIM_RESPONSE_DOT_ADJUDICATION_2; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_AMOUNT = 'amount'; + const FIELD_AMOUNT_EXT = '_amount'; const FIELD_CODE = 'code'; const FIELD_VALUE = 'value'; const FIELD_VALUE_EXT = '_value'; @@ -120,6 +117,9 @@ class FHIRClaimResponseAdjudication2 extends FHIRBackboneElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRClaimResponseAdjudication2 Constructor * @param null|array $data @@ -141,8 +141,17 @@ public function __construct($data = null) } parent::__construct($data); if (isset($data[self::FIELD_AMOUNT])) { + $ext = (isset($data[self::FIELD_AMOUNT_EXT]) && is_array($data[self::FIELD_AMOUNT_EXT])) + ? $data[self::FIELD_AMOUNT_EXT] + : null; if ($data[self::FIELD_AMOUNT] instanceof FHIRMoney) { $this->setAmount($data[self::FIELD_AMOUNT]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_AMOUNT])) { + $this->setAmount(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_AMOUNT]] + $ext)); + } else if (is_array($data[self::FIELD_AMOUNT])) { + $this->setAmount(new FHIRMoney(array_merge($ext, $data[self::FIELD_AMOUNT]))); + } } else { $this->setAmount(new FHIRMoney($data[self::FIELD_AMOUNT])); } @@ -160,8 +169,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE] instanceof FHIRDecimal) { $this->setValue($data[self::FIELD_VALUE]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE])) { - $this->setValue(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_VALUE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE])) { + $this->setValue(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_VALUE]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE])) { + $this->setValue(new FHIRDecimal(array_merge($ext, $data[self::FIELD_VALUE]))); + } } else { $this->setValue(new FHIRDecimal($data[self::FIELD_VALUE])); } @@ -373,15 +386,14 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getAmount())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AMOUNT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getValue())) { + $sxe->addAttribute(self::FIELD_VALUE, (string)$v); $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE, null, $v->_getFHIRXMLNamespace())); } return $sxe; @@ -394,14 +406,29 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getAmount())) { - $a[self::FIELD_AMOUNT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_AMOUNT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_AMOUNT_EXT] = $enc; + } + } else { + $a[self::FIELD_AMOUNT] = $v; + } } if (null !== ($v = $this->getCode())) { $a[self::FIELD_CODE] = $v; } if (null !== ($v = $this->getValue())) { - $a[self::FIELD_VALUE] = $v->getValue(); - $a[self::FIELD_VALUE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseAdjudication3.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseAdjudication3.php index 8d28d80002..ae0855749f 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseAdjudication3.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseAdjudication3.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -80,11 +80,8 @@ class FHIRClaimResponseAdjudication3 extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CLAIM_RESPONSE_DOT_ADJUDICATION_3; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_AMOUNT = 'amount'; + const FIELD_AMOUNT_EXT = '_amount'; const FIELD_CODE = 'code'; const FIELD_VALUE = 'value'; const FIELD_VALUE_EXT = '_value'; @@ -120,6 +117,9 @@ class FHIRClaimResponseAdjudication3 extends FHIRBackboneElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRClaimResponseAdjudication3 Constructor * @param null|array $data @@ -141,8 +141,17 @@ public function __construct($data = null) } parent::__construct($data); if (isset($data[self::FIELD_AMOUNT])) { + $ext = (isset($data[self::FIELD_AMOUNT_EXT]) && is_array($data[self::FIELD_AMOUNT_EXT])) + ? $data[self::FIELD_AMOUNT_EXT] + : null; if ($data[self::FIELD_AMOUNT] instanceof FHIRMoney) { $this->setAmount($data[self::FIELD_AMOUNT]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_AMOUNT])) { + $this->setAmount(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_AMOUNT]] + $ext)); + } else if (is_array($data[self::FIELD_AMOUNT])) { + $this->setAmount(new FHIRMoney(array_merge($ext, $data[self::FIELD_AMOUNT]))); + } } else { $this->setAmount(new FHIRMoney($data[self::FIELD_AMOUNT])); } @@ -160,8 +169,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE] instanceof FHIRDecimal) { $this->setValue($data[self::FIELD_VALUE]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE])) { - $this->setValue(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_VALUE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE])) { + $this->setValue(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_VALUE]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE])) { + $this->setValue(new FHIRDecimal(array_merge($ext, $data[self::FIELD_VALUE]))); + } } else { $this->setValue(new FHIRDecimal($data[self::FIELD_VALUE])); } @@ -373,15 +386,14 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getAmount())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AMOUNT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getValue())) { + $sxe->addAttribute(self::FIELD_VALUE, (string)$v); $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE, null, $v->_getFHIRXMLNamespace())); } return $sxe; @@ -394,14 +406,29 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getAmount())) { - $a[self::FIELD_AMOUNT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_AMOUNT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_AMOUNT_EXT] = $enc; + } + } else { + $a[self::FIELD_AMOUNT] = $v; + } } if (null !== ($v = $this->getCode())) { $a[self::FIELD_CODE] = $v; } if (null !== ($v = $this->getValue())) { - $a[self::FIELD_VALUE] = $v->getValue(); - $a[self::FIELD_VALUE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseAdjudication4.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseAdjudication4.php index 3535d64f9f..bc1f76af71 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseAdjudication4.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseAdjudication4.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -80,11 +80,8 @@ class FHIRClaimResponseAdjudication4 extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CLAIM_RESPONSE_DOT_ADJUDICATION_4; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_AMOUNT = 'amount'; + const FIELD_AMOUNT_EXT = '_amount'; const FIELD_CODE = 'code'; const FIELD_VALUE = 'value'; const FIELD_VALUE_EXT = '_value'; @@ -120,6 +117,9 @@ class FHIRClaimResponseAdjudication4 extends FHIRBackboneElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRClaimResponseAdjudication4 Constructor * @param null|array $data @@ -141,8 +141,17 @@ public function __construct($data = null) } parent::__construct($data); if (isset($data[self::FIELD_AMOUNT])) { + $ext = (isset($data[self::FIELD_AMOUNT_EXT]) && is_array($data[self::FIELD_AMOUNT_EXT])) + ? $data[self::FIELD_AMOUNT_EXT] + : null; if ($data[self::FIELD_AMOUNT] instanceof FHIRMoney) { $this->setAmount($data[self::FIELD_AMOUNT]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_AMOUNT])) { + $this->setAmount(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_AMOUNT]] + $ext)); + } else if (is_array($data[self::FIELD_AMOUNT])) { + $this->setAmount(new FHIRMoney(array_merge($ext, $data[self::FIELD_AMOUNT]))); + } } else { $this->setAmount(new FHIRMoney($data[self::FIELD_AMOUNT])); } @@ -160,8 +169,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE] instanceof FHIRDecimal) { $this->setValue($data[self::FIELD_VALUE]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE])) { - $this->setValue(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_VALUE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE])) { + $this->setValue(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_VALUE]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE])) { + $this->setValue(new FHIRDecimal(array_merge($ext, $data[self::FIELD_VALUE]))); + } } else { $this->setValue(new FHIRDecimal($data[self::FIELD_VALUE])); } @@ -373,15 +386,14 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getAmount())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AMOUNT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getValue())) { + $sxe->addAttribute(self::FIELD_VALUE, (string)$v); $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE, null, $v->_getFHIRXMLNamespace())); } return $sxe; @@ -394,14 +406,29 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getAmount())) { - $a[self::FIELD_AMOUNT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_AMOUNT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_AMOUNT_EXT] = $enc; + } + } else { + $a[self::FIELD_AMOUNT] = $v; + } } if (null !== ($v = $this->getCode())) { $a[self::FIELD_CODE] = $v; } if (null !== ($v = $this->getValue())) { - $a[self::FIELD_VALUE] = $v->getValue(); - $a[self::FIELD_VALUE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseCoverage.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseCoverage.php index 5bd3432ecc..ec0359ad7e 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseCoverage.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseCoverage.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -82,10 +82,6 @@ class FHIRClaimResponseCoverage extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CLAIM_RESPONSE_DOT_COVERAGE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_BUSINESS_ARRANGEMENT = 'businessArrangement'; const FIELD_BUSINESS_ARRANGEMENT_EXT = '_businessArrangement'; const FIELD_CLAIM_RESPONSE = 'claimResponse'; @@ -189,6 +185,9 @@ class FHIRClaimResponseCoverage extends FHIRBackboneElement */ protected $sequence = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRClaimResponseCoverage Constructor * @param null|array $data @@ -211,8 +210,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_BUSINESS_ARRANGEMENT] instanceof FHIRString) { $this->setBusinessArrangement($data[self::FIELD_BUSINESS_ARRANGEMENT]); - } elseif ($ext && is_scalar($data[self::FIELD_BUSINESS_ARRANGEMENT])) { - $this->setBusinessArrangement(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_BUSINESS_ARRANGEMENT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_BUSINESS_ARRANGEMENT])) { + $this->setBusinessArrangement(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_BUSINESS_ARRANGEMENT]] + $ext)); + } else if (is_array($data[self::FIELD_BUSINESS_ARRANGEMENT])) { + $this->setBusinessArrangement(new FHIRString(array_merge($ext, $data[self::FIELD_BUSINESS_ARRANGEMENT]))); + } } else { $this->setBusinessArrangement(new FHIRString($data[self::FIELD_BUSINESS_ARRANGEMENT])); } @@ -237,8 +240,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_FOCAL] instanceof FHIRBoolean) { $this->setFocal($data[self::FIELD_FOCAL]); - } elseif ($ext && is_scalar($data[self::FIELD_FOCAL])) { - $this->setFocal(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_FOCAL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_FOCAL])) { + $this->setFocal(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_FOCAL]] + $ext)); + } else if (is_array($data[self::FIELD_FOCAL])) { + $this->setFocal(new FHIRBoolean(array_merge($ext, $data[self::FIELD_FOCAL]))); + } } else { $this->setFocal(new FHIRBoolean($data[self::FIELD_FOCAL])); } @@ -256,17 +263,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_PRE_AUTH_REF])) { foreach($data[self::FIELD_PRE_AUTH_REF] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRString) { $this->addPreAuthRef($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addPreAuthRef(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addPreAuthRef(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addPreAuthRef(new FHIRString(array_merge($v, $ext[$i]))); + } } else { $this->addPreAuthRef(new FHIRString($v)); } } } elseif ($data[self::FIELD_PRE_AUTH_REF] instanceof FHIRString) { $this->addPreAuthRef($data[self::FIELD_PRE_AUTH_REF]); - } elseif ($ext && is_scalar($data[self::FIELD_PRE_AUTH_REF])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_PRE_AUTH_REF])) { $this->addPreAuthRef(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PRE_AUTH_REF]] + $ext)); } else { $this->addPreAuthRef(new FHIRString($data[self::FIELD_PRE_AUTH_REF])); @@ -285,8 +299,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SEQUENCE] instanceof FHIRPositiveInt) { $this->setSequence($data[self::FIELD_SEQUENCE]); - } elseif ($ext && is_scalar($data[self::FIELD_SEQUENCE])) { - $this->setSequence(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_SEQUENCE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SEQUENCE])) { + $this->setSequence(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_SEQUENCE]] + $ext)); + } else if (is_array($data[self::FIELD_SEQUENCE])) { + $this->setSequence(new FHIRPositiveInt(array_merge($ext, $data[self::FIELD_SEQUENCE]))); + } } else { $this->setSequence(new FHIRPositiveInt($data[self::FIELD_SEQUENCE])); } @@ -735,18 +753,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getBusinessArrangement())) { $v->xmlSerialize($sxe->addChild(self::FIELD_BUSINESS_ARRANGEMENT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getClaimResponse())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CLAIM_RESPONSE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getCoverage())) { $v->xmlSerialize($sxe->addChild(self::FIELD_COVERAGE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getFocal())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FOCAL, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOriginalRuleset())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ORIGINAL_RULESET, null, $v->_getFHIRXMLNamespace())); } @@ -775,8 +790,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getBusinessArrangement())) { - $a[self::FIELD_BUSINESS_ARRANGEMENT] = $v->getValue(); - $a[self::FIELD_BUSINESS_ARRANGEMENT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_BUSINESS_ARRANGEMENT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_BUSINESS_ARRANGEMENT_EXT] = $enc; + } + } else { + $a[self::FIELD_BUSINESS_ARRANGEMENT] = $v; + } } if (null !== ($v = $this->getClaimResponse())) { $a[self::FIELD_CLAIM_RESPONSE] = $v; @@ -785,8 +807,15 @@ public function jsonSerialize() $a[self::FIELD_COVERAGE] = $v; } if (null !== ($v = $this->getFocal())) { - $a[self::FIELD_FOCAL] = $v->getValue(); - $a[self::FIELD_FOCAL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FOCAL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FOCAL_EXT] = $enc; + } + } else { + $a[self::FIELD_FOCAL] = $v; + } } if (null !== ($v = $this->getOriginalRuleset())) { $a[self::FIELD_ORIGINAL_RULESET] = $v; @@ -797,16 +826,32 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_PRE_AUTH_REF][] = $v->getValue(); - $a[self::FIELD_PRE_AUTH_REF_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PRE_AUTH_REF][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PRE_AUTH_REF_EXT][] = $enc; + } else { + $a[self::FIELD_PRE_AUTH_REF_EXT][] = null; + } + } else { + $a[self::FIELD_PRE_AUTH_REF][] = $v; + } } } if (null !== ($v = $this->getRelationship())) { $a[self::FIELD_RELATIONSHIP] = $v; } if (null !== ($v = $this->getSequence())) { - $a[self::FIELD_SEQUENCE] = $v->getValue(); - $a[self::FIELD_SEQUENCE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SEQUENCE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SEQUENCE_EXT] = $enc; + } + } else { + $a[self::FIELD_SEQUENCE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseDetail.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseDetail.php index b163e47dc7..c4c7a67eb8 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseDetail.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseDetail.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRClaimResponseDetail extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CLAIM_RESPONSE_DOT_DETAIL; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ADJUDICATION = 'adjudication'; const FIELD_ADJUDICATION_EXT = '_adjudication'; const FIELD_SEQUENCE_LINK_ID = 'sequenceLinkId'; @@ -119,6 +115,9 @@ class FHIRClaimResponseDetail extends FHIRBackboneElement */ protected $subDetail = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRClaimResponseDetail Constructor * @param null|array $data @@ -141,17 +140,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_ADJUDICATION])) { foreach($data[self::FIELD_ADJUDICATION] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRClaimResponseAdjudication1) { $this->addAdjudication($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addAdjudication(new FHIRClaimResponseAdjudication1([FHIRClaimResponseAdjudication1::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addAdjudication(new FHIRClaimResponseAdjudication1([FHIRClaimResponseAdjudication1::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addAdjudication(new FHIRClaimResponseAdjudication1(array_merge($v, $ext[$i]))); + } } else { $this->addAdjudication(new FHIRClaimResponseAdjudication1($v)); } } } elseif ($data[self::FIELD_ADJUDICATION] instanceof FHIRClaimResponseAdjudication1) { $this->addAdjudication($data[self::FIELD_ADJUDICATION]); - } elseif ($ext && is_scalar($data[self::FIELD_ADJUDICATION])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_ADJUDICATION])) { $this->addAdjudication(new FHIRClaimResponseAdjudication1([FHIRClaimResponseAdjudication1::FIELD_VALUE => $data[self::FIELD_ADJUDICATION]] + $ext)); } else { $this->addAdjudication(new FHIRClaimResponseAdjudication1($data[self::FIELD_ADJUDICATION])); @@ -163,8 +169,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SEQUENCE_LINK_ID] instanceof FHIRPositiveInt) { $this->setSequenceLinkId($data[self::FIELD_SEQUENCE_LINK_ID]); - } elseif ($ext && is_scalar($data[self::FIELD_SEQUENCE_LINK_ID])) { - $this->setSequenceLinkId(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_SEQUENCE_LINK_ID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SEQUENCE_LINK_ID])) { + $this->setSequenceLinkId(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_SEQUENCE_LINK_ID]] + $ext)); + } else if (is_array($data[self::FIELD_SEQUENCE_LINK_ID])) { + $this->setSequenceLinkId(new FHIRPositiveInt(array_merge($ext, $data[self::FIELD_SEQUENCE_LINK_ID]))); + } } else { $this->setSequenceLinkId(new FHIRPositiveInt($data[self::FIELD_SEQUENCE_LINK_ID])); } @@ -172,6 +182,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SUB_DETAIL])) { if (is_array($data[self::FIELD_SUB_DETAIL])) { foreach($data[self::FIELD_SUB_DETAIL] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRClaimResponseSubDetail) { $this->addSubDetail($v); } else { @@ -445,7 +458,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getAdjudication())) { foreach($vs as $v) { if (null === $v) { @@ -454,10 +466,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_ADJUDICATION, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getSequenceLinkId())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SEQUENCE_LINK_ID, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getSubDetail())) { foreach($vs as $v) { if (null === $v) { @@ -466,6 +478,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_SUB_DETAIL, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } @@ -476,11 +489,34 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if ([] !== ($vs = $this->getAdjudication())) { - $a[self::FIELD_ADJUDICATION] = $vs; + $a[self::FIELD_ADJUDICATION] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ADJUDICATION][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ADJUDICATION_EXT][] = $enc; + } else { + $a[self::FIELD_ADJUDICATION_EXT][] = null; + } + } else { + $a[self::FIELD_ADJUDICATION][] = $v; + } + } } if (null !== ($v = $this->getSequenceLinkId())) { - $a[self::FIELD_SEQUENCE_LINK_ID] = $v->getValue(); - $a[self::FIELD_SEQUENCE_LINK_ID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SEQUENCE_LINK_ID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SEQUENCE_LINK_ID_EXT] = $enc; + } + } else { + $a[self::FIELD_SEQUENCE_LINK_ID] = $v; + } } if ([] !== ($vs = $this->getSubDetail())) { $a[self::FIELD_SUB_DETAIL] = $vs; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseDetail1.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseDetail1.php index 1a280f895b..bb7d2df00c 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseDetail1.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseDetail1.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,13 +79,10 @@ class FHIRClaimResponseDetail1 extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CLAIM_RESPONSE_DOT_DETAIL_1; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ADJUDICATION = 'adjudication'; const FIELD_ADJUDICATION_EXT = '_adjudication'; const FIELD_FEE = 'fee'; + const FIELD_FEE_EXT = '_fee'; const FIELD_SERVICE = 'service'; /** @@ -116,6 +113,9 @@ class FHIRClaimResponseDetail1 extends FHIRBackboneElement */ protected $service = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRClaimResponseDetail1 Constructor * @param null|array $data @@ -138,25 +138,41 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_ADJUDICATION])) { foreach($data[self::FIELD_ADJUDICATION] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRClaimResponseAdjudication4) { $this->addAdjudication($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addAdjudication(new FHIRClaimResponseAdjudication4([FHIRClaimResponseAdjudication4::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addAdjudication(new FHIRClaimResponseAdjudication4([FHIRClaimResponseAdjudication4::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addAdjudication(new FHIRClaimResponseAdjudication4(array_merge($v, $ext[$i]))); + } } else { $this->addAdjudication(new FHIRClaimResponseAdjudication4($v)); } } } elseif ($data[self::FIELD_ADJUDICATION] instanceof FHIRClaimResponseAdjudication4) { $this->addAdjudication($data[self::FIELD_ADJUDICATION]); - } elseif ($ext && is_scalar($data[self::FIELD_ADJUDICATION])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_ADJUDICATION])) { $this->addAdjudication(new FHIRClaimResponseAdjudication4([FHIRClaimResponseAdjudication4::FIELD_VALUE => $data[self::FIELD_ADJUDICATION]] + $ext)); } else { $this->addAdjudication(new FHIRClaimResponseAdjudication4($data[self::FIELD_ADJUDICATION])); } } if (isset($data[self::FIELD_FEE])) { + $ext = (isset($data[self::FIELD_FEE_EXT]) && is_array($data[self::FIELD_FEE_EXT])) + ? $data[self::FIELD_FEE_EXT] + : null; if ($data[self::FIELD_FEE] instanceof FHIRMoney) { $this->setFee($data[self::FIELD_FEE]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_FEE])) { + $this->setFee(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_FEE]] + $ext)); + } else if (is_array($data[self::FIELD_FEE])) { + $this->setFee(new FHIRMoney(array_merge($ext, $data[self::FIELD_FEE]))); + } } else { $this->setFee(new FHIRMoney($data[self::FIELD_FEE])); } @@ -385,7 +401,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getAdjudication())) { foreach($vs as $v) { if (null === $v) { @@ -398,7 +413,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getFee())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FEE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getService())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SERVICE, null, $v->_getFHIRXMLNamespace())); } @@ -412,10 +426,34 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if ([] !== ($vs = $this->getAdjudication())) { - $a[self::FIELD_ADJUDICATION] = $vs; + $a[self::FIELD_ADJUDICATION] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ADJUDICATION][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ADJUDICATION_EXT][] = $enc; + } else { + $a[self::FIELD_ADJUDICATION_EXT][] = null; + } + } else { + $a[self::FIELD_ADJUDICATION][] = $v; + } + } } if (null !== ($v = $this->getFee())) { - $a[self::FIELD_FEE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FEE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FEE_EXT] = $enc; + } + } else { + $a[self::FIELD_FEE] = $v; + } } if (null !== ($v = $this->getService())) { $a[self::FIELD_SERVICE] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseError.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseError.php index 7424665398..648ad3ce4b 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseError.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseError.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRClaimResponseError extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CLAIM_RESPONSE_DOT_ERROR; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CODE = 'code'; const FIELD_DETAIL_SEQUENCE_LINK_ID = 'detailSequenceLinkId'; const FIELD_DETAIL_SEQUENCE_LINK_ID_EXT = '_detailSequenceLinkId'; @@ -141,6 +137,9 @@ class FHIRClaimResponseError extends FHIRBackboneElement */ protected $subdetailSequenceLinkId = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRClaimResponseError Constructor * @param null|array $data @@ -170,8 +169,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DETAIL_SEQUENCE_LINK_ID] instanceof FHIRPositiveInt) { $this->setDetailSequenceLinkId($data[self::FIELD_DETAIL_SEQUENCE_LINK_ID]); - } elseif ($ext && is_scalar($data[self::FIELD_DETAIL_SEQUENCE_LINK_ID])) { - $this->setDetailSequenceLinkId(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_DETAIL_SEQUENCE_LINK_ID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DETAIL_SEQUENCE_LINK_ID])) { + $this->setDetailSequenceLinkId(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_DETAIL_SEQUENCE_LINK_ID]] + $ext)); + } else if (is_array($data[self::FIELD_DETAIL_SEQUENCE_LINK_ID])) { + $this->setDetailSequenceLinkId(new FHIRPositiveInt(array_merge($ext, $data[self::FIELD_DETAIL_SEQUENCE_LINK_ID]))); + } } else { $this->setDetailSequenceLinkId(new FHIRPositiveInt($data[self::FIELD_DETAIL_SEQUENCE_LINK_ID])); } @@ -182,8 +185,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SEQUENCE_LINK_ID] instanceof FHIRPositiveInt) { $this->setSequenceLinkId($data[self::FIELD_SEQUENCE_LINK_ID]); - } elseif ($ext && is_scalar($data[self::FIELD_SEQUENCE_LINK_ID])) { - $this->setSequenceLinkId(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_SEQUENCE_LINK_ID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SEQUENCE_LINK_ID])) { + $this->setSequenceLinkId(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_SEQUENCE_LINK_ID]] + $ext)); + } else if (is_array($data[self::FIELD_SEQUENCE_LINK_ID])) { + $this->setSequenceLinkId(new FHIRPositiveInt(array_merge($ext, $data[self::FIELD_SEQUENCE_LINK_ID]))); + } } else { $this->setSequenceLinkId(new FHIRPositiveInt($data[self::FIELD_SEQUENCE_LINK_ID])); } @@ -194,8 +201,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SUBDETAIL_SEQUENCE_LINK_ID] instanceof FHIRPositiveInt) { $this->setSubdetailSequenceLinkId($data[self::FIELD_SUBDETAIL_SEQUENCE_LINK_ID]); - } elseif ($ext && is_scalar($data[self::FIELD_SUBDETAIL_SEQUENCE_LINK_ID])) { - $this->setSubdetailSequenceLinkId(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_SUBDETAIL_SEQUENCE_LINK_ID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SUBDETAIL_SEQUENCE_LINK_ID])) { + $this->setSubdetailSequenceLinkId(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_SUBDETAIL_SEQUENCE_LINK_ID]] + $ext)); + } else if (is_array($data[self::FIELD_SUBDETAIL_SEQUENCE_LINK_ID])) { + $this->setSubdetailSequenceLinkId(new FHIRPositiveInt(array_merge($ext, $data[self::FIELD_SUBDETAIL_SEQUENCE_LINK_ID]))); + } } else { $this->setSubdetailSequenceLinkId(new FHIRPositiveInt($data[self::FIELD_SUBDETAIL_SEQUENCE_LINK_ID])); } @@ -478,7 +489,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } @@ -504,16 +514,37 @@ public function jsonSerialize() $a[self::FIELD_CODE] = $v; } if (null !== ($v = $this->getDetailSequenceLinkId())) { - $a[self::FIELD_DETAIL_SEQUENCE_LINK_ID] = $v->getValue(); - $a[self::FIELD_DETAIL_SEQUENCE_LINK_ID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DETAIL_SEQUENCE_LINK_ID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DETAIL_SEQUENCE_LINK_ID_EXT] = $enc; + } + } else { + $a[self::FIELD_DETAIL_SEQUENCE_LINK_ID] = $v; + } } if (null !== ($v = $this->getSequenceLinkId())) { - $a[self::FIELD_SEQUENCE_LINK_ID] = $v->getValue(); - $a[self::FIELD_SEQUENCE_LINK_ID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SEQUENCE_LINK_ID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SEQUENCE_LINK_ID_EXT] = $enc; + } + } else { + $a[self::FIELD_SEQUENCE_LINK_ID] = $v; + } } if (null !== ($v = $this->getSubdetailSequenceLinkId())) { - $a[self::FIELD_SUBDETAIL_SEQUENCE_LINK_ID] = $v->getValue(); - $a[self::FIELD_SUBDETAIL_SEQUENCE_LINK_ID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SUBDETAIL_SEQUENCE_LINK_ID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SUBDETAIL_SEQUENCE_LINK_ID_EXT] = $enc; + } + } else { + $a[self::FIELD_SUBDETAIL_SEQUENCE_LINK_ID] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseItem.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseItem.php index e9e916a847..766fffc516 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseItem.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseItem.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRClaimResponseItem extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CLAIM_RESPONSE_DOT_ITEM; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ADJUDICATION = 'adjudication'; const FIELD_ADJUDICATION_EXT = '_adjudication'; const FIELD_DETAIL = 'detail'; @@ -132,6 +128,9 @@ class FHIRClaimResponseItem extends FHIRBackboneElement */ protected $sequenceLinkId = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRClaimResponseItem Constructor * @param null|array $data @@ -154,17 +153,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_ADJUDICATION])) { foreach($data[self::FIELD_ADJUDICATION] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRClaimResponseAdjudication) { $this->addAdjudication($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addAdjudication(new FHIRClaimResponseAdjudication([FHIRClaimResponseAdjudication::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addAdjudication(new FHIRClaimResponseAdjudication([FHIRClaimResponseAdjudication::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addAdjudication(new FHIRClaimResponseAdjudication(array_merge($v, $ext[$i]))); + } } else { $this->addAdjudication(new FHIRClaimResponseAdjudication($v)); } } } elseif ($data[self::FIELD_ADJUDICATION] instanceof FHIRClaimResponseAdjudication) { $this->addAdjudication($data[self::FIELD_ADJUDICATION]); - } elseif ($ext && is_scalar($data[self::FIELD_ADJUDICATION])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_ADJUDICATION])) { $this->addAdjudication(new FHIRClaimResponseAdjudication([FHIRClaimResponseAdjudication::FIELD_VALUE => $data[self::FIELD_ADJUDICATION]] + $ext)); } else { $this->addAdjudication(new FHIRClaimResponseAdjudication($data[self::FIELD_ADJUDICATION])); @@ -173,6 +179,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_DETAIL])) { if (is_array($data[self::FIELD_DETAIL])) { foreach($data[self::FIELD_DETAIL] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRClaimResponseDetail) { $this->addDetail($v); } else { @@ -191,17 +200,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_NOTE_NUMBER])) { foreach($data[self::FIELD_NOTE_NUMBER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRPositiveInt) { $this->addNoteNumber($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addNoteNumber(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addNoteNumber(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addNoteNumber(new FHIRPositiveInt(array_merge($v, $ext[$i]))); + } } else { $this->addNoteNumber(new FHIRPositiveInt($v)); } } } elseif ($data[self::FIELD_NOTE_NUMBER] instanceof FHIRPositiveInt) { $this->addNoteNumber($data[self::FIELD_NOTE_NUMBER]); - } elseif ($ext && is_scalar($data[self::FIELD_NOTE_NUMBER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_NOTE_NUMBER])) { $this->addNoteNumber(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_NOTE_NUMBER]] + $ext)); } else { $this->addNoteNumber(new FHIRPositiveInt($data[self::FIELD_NOTE_NUMBER])); @@ -213,8 +229,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SEQUENCE_LINK_ID] instanceof FHIRPositiveInt) { $this->setSequenceLinkId($data[self::FIELD_SEQUENCE_LINK_ID]); - } elseif ($ext && is_scalar($data[self::FIELD_SEQUENCE_LINK_ID])) { - $this->setSequenceLinkId(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_SEQUENCE_LINK_ID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SEQUENCE_LINK_ID])) { + $this->setSequenceLinkId(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_SEQUENCE_LINK_ID]] + $ext)); + } else if (is_array($data[self::FIELD_SEQUENCE_LINK_ID])) { + $this->setSequenceLinkId(new FHIRPositiveInt(array_merge($ext, $data[self::FIELD_SEQUENCE_LINK_ID]))); + } } else { $this->setSequenceLinkId(new FHIRPositiveInt($data[self::FIELD_SEQUENCE_LINK_ID])); } @@ -552,7 +572,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getAdjudication())) { foreach($vs as $v) { if (null === $v) { @@ -570,6 +589,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_DETAIL, null, $v->_getFHIRXMLNamespace())); } } + if ([] !== ($vs = $this->getNoteNumber())) { foreach($vs as $v) { if (null === $v) { @@ -578,6 +598,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_NOTE_NUMBER, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getSequenceLinkId())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SEQUENCE_LINK_ID, null, $v->_getFHIRXMLNamespace())); } @@ -591,7 +612,23 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if ([] !== ($vs = $this->getAdjudication())) { - $a[self::FIELD_ADJUDICATION] = $vs; + $a[self::FIELD_ADJUDICATION] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ADJUDICATION][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ADJUDICATION_EXT][] = $enc; + } else { + $a[self::FIELD_ADJUDICATION_EXT][] = null; + } + } else { + $a[self::FIELD_ADJUDICATION][] = $v; + } + } } if ([] !== ($vs = $this->getDetail())) { $a[self::FIELD_DETAIL] = $vs; @@ -602,13 +639,29 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_NOTE_NUMBER][] = $v->getValue(); - $a[self::FIELD_NOTE_NUMBER_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NOTE_NUMBER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NOTE_NUMBER_EXT][] = $enc; + } else { + $a[self::FIELD_NOTE_NUMBER_EXT][] = null; + } + } else { + $a[self::FIELD_NOTE_NUMBER][] = $v; + } } } if (null !== ($v = $this->getSequenceLinkId())) { - $a[self::FIELD_SEQUENCE_LINK_ID] = $v->getValue(); - $a[self::FIELD_SEQUENCE_LINK_ID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SEQUENCE_LINK_ID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SEQUENCE_LINK_ID_EXT] = $enc; + } + } else { + $a[self::FIELD_SEQUENCE_LINK_ID] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseNote.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseNote.php index 7efd96720d..913df51af6 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseNote.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseNote.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRClaimResponseNote extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CLAIM_RESPONSE_DOT_NOTE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_NUMBER = 'number'; const FIELD_NUMBER_EXT = '_number'; const FIELD_TEXT = 'text'; @@ -124,6 +120,9 @@ class FHIRClaimResponseNote extends FHIRBackboneElement */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRClaimResponseNote Constructor * @param null|array $data @@ -146,8 +145,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NUMBER] instanceof FHIRPositiveInt) { $this->setNumber($data[self::FIELD_NUMBER]); - } elseif ($ext && is_scalar($data[self::FIELD_NUMBER])) { - $this->setNumber(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_NUMBER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NUMBER])) { + $this->setNumber(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_NUMBER]] + $ext)); + } else if (is_array($data[self::FIELD_NUMBER])) { + $this->setNumber(new FHIRPositiveInt(array_merge($ext, $data[self::FIELD_NUMBER]))); + } } else { $this->setNumber(new FHIRPositiveInt($data[self::FIELD_NUMBER])); } @@ -158,8 +161,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TEXT] instanceof FHIRString) { $this->setText($data[self::FIELD_TEXT]); - } elseif ($ext && is_scalar($data[self::FIELD_TEXT])) { - $this->setText(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TEXT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TEXT])) { + $this->setText(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TEXT]] + $ext)); + } else if (is_array($data[self::FIELD_TEXT])) { + $this->setText(new FHIRString(array_merge($ext, $data[self::FIELD_TEXT]))); + } } else { $this->setText(new FHIRString($data[self::FIELD_TEXT])); } @@ -401,7 +408,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getText())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TEXT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -415,12 +421,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getNumber())) { - $a[self::FIELD_NUMBER] = $v->getValue(); - $a[self::FIELD_NUMBER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NUMBER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NUMBER_EXT] = $enc; + } + } else { + $a[self::FIELD_NUMBER] = $v; + } } if (null !== ($v = $this->getText())) { - $a[self::FIELD_TEXT] = $v->getValue(); - $a[self::FIELD_TEXT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TEXT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TEXT_EXT] = $enc; + } + } else { + $a[self::FIELD_TEXT] = $v; + } } if (null !== ($v = $this->getType())) { $a[self::FIELD_TYPE] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseSubDetail.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseSubDetail.php index bb25b33256..e2631b1318 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseSubDetail.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseSubDetail.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRClaimResponseSubDetail extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CLAIM_RESPONSE_DOT_SUB_DETAIL; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ADJUDICATION = 'adjudication'; const FIELD_ADJUDICATION_EXT = '_adjudication'; const FIELD_SEQUENCE_LINK_ID = 'sequenceLinkId'; @@ -108,6 +104,9 @@ class FHIRClaimResponseSubDetail extends FHIRBackboneElement */ protected $sequenceLinkId = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRClaimResponseSubDetail Constructor * @param null|array $data @@ -130,17 +129,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_ADJUDICATION])) { foreach($data[self::FIELD_ADJUDICATION] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRClaimResponseAdjudication2) { $this->addAdjudication($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addAdjudication(new FHIRClaimResponseAdjudication2([FHIRClaimResponseAdjudication2::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addAdjudication(new FHIRClaimResponseAdjudication2([FHIRClaimResponseAdjudication2::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addAdjudication(new FHIRClaimResponseAdjudication2(array_merge($v, $ext[$i]))); + } } else { $this->addAdjudication(new FHIRClaimResponseAdjudication2($v)); } } } elseif ($data[self::FIELD_ADJUDICATION] instanceof FHIRClaimResponseAdjudication2) { $this->addAdjudication($data[self::FIELD_ADJUDICATION]); - } elseif ($ext && is_scalar($data[self::FIELD_ADJUDICATION])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_ADJUDICATION])) { $this->addAdjudication(new FHIRClaimResponseAdjudication2([FHIRClaimResponseAdjudication2::FIELD_VALUE => $data[self::FIELD_ADJUDICATION]] + $ext)); } else { $this->addAdjudication(new FHIRClaimResponseAdjudication2($data[self::FIELD_ADJUDICATION])); @@ -152,8 +158,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SEQUENCE_LINK_ID] instanceof FHIRPositiveInt) { $this->setSequenceLinkId($data[self::FIELD_SEQUENCE_LINK_ID]); - } elseif ($ext && is_scalar($data[self::FIELD_SEQUENCE_LINK_ID])) { - $this->setSequenceLinkId(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_SEQUENCE_LINK_ID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SEQUENCE_LINK_ID])) { + $this->setSequenceLinkId(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_SEQUENCE_LINK_ID]] + $ext)); + } else if (is_array($data[self::FIELD_SEQUENCE_LINK_ID])) { + $this->setSequenceLinkId(new FHIRPositiveInt(array_merge($ext, $data[self::FIELD_SEQUENCE_LINK_ID]))); + } } else { $this->setSequenceLinkId(new FHIRPositiveInt($data[self::FIELD_SEQUENCE_LINK_ID])); } @@ -361,7 +371,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getAdjudication())) { foreach($vs as $v) { if (null === $v) { @@ -370,6 +379,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_ADJUDICATION, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getSequenceLinkId())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SEQUENCE_LINK_ID, null, $v->_getFHIRXMLNamespace())); } @@ -383,11 +393,34 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if ([] !== ($vs = $this->getAdjudication())) { - $a[self::FIELD_ADJUDICATION] = $vs; + $a[self::FIELD_ADJUDICATION] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ADJUDICATION][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ADJUDICATION_EXT][] = $enc; + } else { + $a[self::FIELD_ADJUDICATION_EXT][] = null; + } + } else { + $a[self::FIELD_ADJUDICATION][] = $v; + } + } } if (null !== ($v = $this->getSequenceLinkId())) { - $a[self::FIELD_SEQUENCE_LINK_ID] = $v->getValue(); - $a[self::FIELD_SEQUENCE_LINK_ID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SEQUENCE_LINK_ID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SEQUENCE_LINK_ID_EXT] = $enc; + } + } else { + $a[self::FIELD_SEQUENCE_LINK_ID] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRClinicalImpression/FHIRClinicalImpressionFinding.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRClinicalImpression/FHIRClinicalImpressionFinding.php index 39c6a6188e..6496a78ccb 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRClinicalImpression/FHIRClinicalImpressionFinding.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRClinicalImpression/FHIRClinicalImpressionFinding.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -84,10 +84,6 @@ class FHIRClinicalImpressionFinding extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CLINICAL_IMPRESSION_DOT_FINDING; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CAUSE = 'cause'; const FIELD_CAUSE_EXT = '_cause'; const FIELD_ITEM = 'item'; @@ -115,6 +111,9 @@ class FHIRClinicalImpressionFinding extends FHIRBackboneElement */ protected $item = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRClinicalImpressionFinding Constructor * @param null|array $data @@ -137,8 +136,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CAUSE] instanceof FHIRString) { $this->setCause($data[self::FIELD_CAUSE]); - } elseif ($ext && is_scalar($data[self::FIELD_CAUSE])) { - $this->setCause(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_CAUSE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CAUSE])) { + $this->setCause(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_CAUSE]] + $ext)); + } else if (is_array($data[self::FIELD_CAUSE])) { + $this->setCause(new FHIRString(array_merge($ext, $data[self::FIELD_CAUSE]))); + } } else { $this->setCause(new FHIRString($data[self::FIELD_CAUSE])); } @@ -333,7 +336,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getCause())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CAUSE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getItem())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ITEM, null, $v->_getFHIRXMLNamespace())); } @@ -347,8 +349,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getCause())) { - $a[self::FIELD_CAUSE] = $v->getValue(); - $a[self::FIELD_CAUSE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CAUSE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CAUSE_EXT] = $enc; + } + } else { + $a[self::FIELD_CAUSE] = $v; + } } if (null !== ($v = $this->getItem())) { $a[self::FIELD_ITEM] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRClinicalImpression/FHIRClinicalImpressionInvestigations.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRClinicalImpression/FHIRClinicalImpressionInvestigations.php index be0499804d..46758d9c55 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRClinicalImpression/FHIRClinicalImpressionInvestigations.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRClinicalImpression/FHIRClinicalImpressionInvestigations.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -84,10 +84,6 @@ class FHIRClinicalImpressionInvestigations extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CLINICAL_IMPRESSION_DOT_INVESTIGATIONS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CODE = 'code'; const FIELD_ITEM = 'item'; @@ -117,6 +113,9 @@ class FHIRClinicalImpressionInvestigations extends FHIRBackboneElement */ protected $item = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRClinicalImpressionInvestigations Constructor * @param null|array $data @@ -143,6 +142,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ITEM])) { if (is_array($data[self::FIELD_ITEM])) { foreach($data[self::FIELD_ITEM] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addItem($v); } else { @@ -358,11 +360,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getItem())) { foreach($vs as $v) { if (null === $v) { @@ -371,6 +371,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_ITEM, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRClinicalImpression/FHIRClinicalImpressionRuledOut.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRClinicalImpression/FHIRClinicalImpressionRuledOut.php index bf1573fcba..df2ff0ac82 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRClinicalImpression/FHIRClinicalImpressionRuledOut.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRClinicalImpression/FHIRClinicalImpressionRuledOut.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -84,10 +84,6 @@ class FHIRClinicalImpressionRuledOut extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CLINICAL_IMPRESSION_DOT_RULED_OUT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ITEM = 'item'; const FIELD_REASON = 'reason'; const FIELD_REASON_EXT = '_reason'; @@ -115,6 +111,9 @@ class FHIRClinicalImpressionRuledOut extends FHIRBackboneElement */ protected $reason = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRClinicalImpressionRuledOut Constructor * @param null|array $data @@ -144,8 +143,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_REASON] instanceof FHIRString) { $this->setReason($data[self::FIELD_REASON]); - } elseif ($ext && is_scalar($data[self::FIELD_REASON])) { - $this->setReason(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_REASON]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_REASON])) { + $this->setReason(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_REASON]] + $ext)); + } else if (is_array($data[self::FIELD_REASON])) { + $this->setReason(new FHIRString(array_merge($ext, $data[self::FIELD_REASON]))); + } } else { $this->setReason(new FHIRString($data[self::FIELD_REASON])); } @@ -330,7 +333,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getItem())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ITEM, null, $v->_getFHIRXMLNamespace())); } @@ -350,8 +352,15 @@ public function jsonSerialize() $a[self::FIELD_ITEM] = $v; } if (null !== ($v = $this->getReason())) { - $a[self::FIELD_REASON] = $v->getValue(); - $a[self::FIELD_REASON_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_REASON] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_REASON_EXT] = $enc; + } + } else { + $a[self::FIELD_REASON] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRCommunication/FHIRCommunicationPayload.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRCommunication/FHIRCommunicationPayload.php index d8c6470b49..4a7515bda7 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRCommunication/FHIRCommunicationPayload.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRCommunication/FHIRCommunicationPayload.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -81,10 +81,6 @@ class FHIRCommunicationPayload extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_COMMUNICATION_DOT_PAYLOAD; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CONTENT_ATTACHMENT = 'contentAttachment'; const FIELD_CONTENT_REFERENCE = 'contentReference'; const FIELD_CONTENT_STRING = 'contentString'; @@ -126,6 +122,9 @@ class FHIRCommunicationPayload extends FHIRBackboneElement */ protected $contentString = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRCommunicationPayload Constructor * @param null|array $data @@ -162,8 +161,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CONTENT_STRING] instanceof FHIRString) { $this->setContentString($data[self::FIELD_CONTENT_STRING]); - } elseif ($ext && is_scalar($data[self::FIELD_CONTENT_STRING])) { - $this->setContentString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_CONTENT_STRING]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CONTENT_STRING])) { + $this->setContentString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_CONTENT_STRING]] + $ext)); + } else if (is_array($data[self::FIELD_CONTENT_STRING])) { + $this->setContentString(new FHIRString(array_merge($ext, $data[self::FIELD_CONTENT_STRING]))); + } } else { $this->setContentString(new FHIRString($data[self::FIELD_CONTENT_STRING])); } @@ -385,11 +388,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getContentAttachment())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CONTENT_ATTACHMENT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getContentReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CONTENT_REFERENCE, null, $v->_getFHIRXMLNamespace())); } @@ -412,8 +413,15 @@ public function jsonSerialize() $a[self::FIELD_CONTENT_REFERENCE] = $v; } if (null !== ($v = $this->getContentString())) { - $a[self::FIELD_CONTENT_STRING] = $v->getValue(); - $a[self::FIELD_CONTENT_STRING_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CONTENT_STRING] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CONTENT_STRING_EXT] = $enc; + } + } else { + $a[self::FIELD_CONTENT_STRING] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRCommunicationRequest/FHIRCommunicationRequestPayload.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRCommunicationRequest/FHIRCommunicationRequestPayload.php index 50a0dea515..bc7b623c9a 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRCommunicationRequest/FHIRCommunicationRequestPayload.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRCommunicationRequest/FHIRCommunicationRequestPayload.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -81,10 +81,6 @@ class FHIRCommunicationRequestPayload extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_COMMUNICATION_REQUEST_DOT_PAYLOAD; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CONTENT_ATTACHMENT = 'contentAttachment'; const FIELD_CONTENT_REFERENCE = 'contentReference'; const FIELD_CONTENT_STRING = 'contentString'; @@ -126,6 +122,9 @@ class FHIRCommunicationRequestPayload extends FHIRBackboneElement */ protected $contentString = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRCommunicationRequestPayload Constructor * @param null|array $data @@ -162,8 +161,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CONTENT_STRING] instanceof FHIRString) { $this->setContentString($data[self::FIELD_CONTENT_STRING]); - } elseif ($ext && is_scalar($data[self::FIELD_CONTENT_STRING])) { - $this->setContentString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_CONTENT_STRING]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CONTENT_STRING])) { + $this->setContentString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_CONTENT_STRING]] + $ext)); + } else if (is_array($data[self::FIELD_CONTENT_STRING])) { + $this->setContentString(new FHIRString(array_merge($ext, $data[self::FIELD_CONTENT_STRING]))); + } } else { $this->setContentString(new FHIRString($data[self::FIELD_CONTENT_STRING])); } @@ -385,11 +388,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getContentAttachment())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CONTENT_ATTACHMENT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getContentReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CONTENT_REFERENCE, null, $v->_getFHIRXMLNamespace())); } @@ -412,8 +413,15 @@ public function jsonSerialize() $a[self::FIELD_CONTENT_REFERENCE] = $v; } if (null !== ($v = $this->getContentString())) { - $a[self::FIELD_CONTENT_STRING] = $v->getValue(); - $a[self::FIELD_CONTENT_STRING_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CONTENT_STRING] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CONTENT_STRING_EXT] = $enc; + } + } else { + $a[self::FIELD_CONTENT_STRING] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRComposition/FHIRCompositionAttester.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRComposition/FHIRCompositionAttester.php index 889823638c..d76dc7c448 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRComposition/FHIRCompositionAttester.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRComposition/FHIRCompositionAttester.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -84,10 +84,6 @@ class FHIRCompositionAttester extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_COMPOSITION_DOT_ATTESTER; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_MODE = 'mode'; const FIELD_MODE_EXT = '_mode'; const FIELD_PARTY = 'party'; @@ -129,6 +125,9 @@ class FHIRCompositionAttester extends FHIRBackboneElement */ protected $time = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRCompositionAttester Constructor * @param null|array $data @@ -151,17 +150,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_MODE])) { foreach($data[self::FIELD_MODE] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCompositionAttestationMode) { $this->addMode($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addMode(new FHIRCompositionAttestationMode([FHIRCompositionAttestationMode::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addMode(new FHIRCompositionAttestationMode([FHIRCompositionAttestationMode::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addMode(new FHIRCompositionAttestationMode(array_merge($v, $ext[$i]))); + } } else { $this->addMode(new FHIRCompositionAttestationMode($v)); } } } elseif ($data[self::FIELD_MODE] instanceof FHIRCompositionAttestationMode) { $this->addMode($data[self::FIELD_MODE]); - } elseif ($ext && is_scalar($data[self::FIELD_MODE])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_MODE])) { $this->addMode(new FHIRCompositionAttestationMode([FHIRCompositionAttestationMode::FIELD_VALUE => $data[self::FIELD_MODE]] + $ext)); } else { $this->addMode(new FHIRCompositionAttestationMode($data[self::FIELD_MODE])); @@ -180,8 +186,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TIME] instanceof FHIRDateTime) { $this->setTime($data[self::FIELD_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_TIME])) { - $this->setTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TIME])) { + $this->setTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_TIME])) { + $this->setTime(new FHIRDateTime(array_merge($ext, $data[self::FIELD_TIME]))); + } } else { $this->setTime(new FHIRDateTime($data[self::FIELD_TIME])); } @@ -428,7 +438,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getMode())) { foreach($vs as $v) { if (null === $v) { @@ -454,14 +463,37 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if ([] !== ($vs = $this->getMode())) { - $a[self::FIELD_MODE] = $vs; + $a[self::FIELD_MODE] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MODE][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MODE_EXT][] = $enc; + } else { + $a[self::FIELD_MODE_EXT][] = null; + } + } else { + $a[self::FIELD_MODE][] = $v; + } + } } if (null !== ($v = $this->getParty())) { $a[self::FIELD_PARTY] = $v; } if (null !== ($v = $this->getTime())) { - $a[self::FIELD_TIME] = $v->getValue(); - $a[self::FIELD_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_TIME] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRComposition/FHIRCompositionEvent.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRComposition/FHIRCompositionEvent.php index d3b41f092e..847ea44d2c 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRComposition/FHIRCompositionEvent.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRComposition/FHIRCompositionEvent.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -84,10 +84,6 @@ class FHIRCompositionEvent extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_COMPOSITION_DOT_EVENT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CODE = 'code'; const FIELD_DETAIL = 'detail'; const FIELD_PERIOD = 'period'; @@ -132,6 +128,9 @@ class FHIRCompositionEvent extends FHIRBackboneElement */ protected $period = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRCompositionEvent Constructor * @param null|array $data @@ -151,6 +150,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CODE])) { if (is_array($data[self::FIELD_CODE])) { foreach($data[self::FIELD_CODE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addCode($v); } else { @@ -166,6 +168,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_DETAIL])) { if (is_array($data[self::FIELD_DETAIL])) { foreach($data[self::FIELD_DETAIL] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addDetail($v); } else { @@ -460,7 +465,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getCode())) { foreach($vs as $v) { if (null === $v) { diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRComposition/FHIRCompositionSection.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRComposition/FHIRCompositionSection.php index c7c72b447f..4019ef7236 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRComposition/FHIRCompositionSection.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRComposition/FHIRCompositionSection.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -86,10 +86,6 @@ class FHIRCompositionSection extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_COMPOSITION_DOT_SECTION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CODE = 'code'; const FIELD_EMPTY_REASON = 'emptyReason'; const FIELD_ENTRY = 'entry'; @@ -206,6 +202,9 @@ class FHIRCompositionSection extends FHIRBackboneElement */ protected $title = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRCompositionSection Constructor * @param null|array $data @@ -239,6 +238,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ENTRY])) { if (is_array($data[self::FIELD_ENTRY])) { foreach($data[self::FIELD_ENTRY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addEntry($v); } else { @@ -257,8 +259,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MODE] instanceof FHIRCode) { $this->setMode($data[self::FIELD_MODE]); - } elseif ($ext && is_scalar($data[self::FIELD_MODE])) { - $this->setMode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_MODE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MODE])) { + $this->setMode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_MODE]] + $ext)); + } else if (is_array($data[self::FIELD_MODE])) { + $this->setMode(new FHIRCode(array_merge($ext, $data[self::FIELD_MODE]))); + } } else { $this->setMode(new FHIRCode($data[self::FIELD_MODE])); } @@ -273,6 +279,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SECTION])) { if (is_array($data[self::FIELD_SECTION])) { foreach($data[self::FIELD_SECTION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCompositionSection) { $this->addSection($v); } else { @@ -298,8 +307,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TITLE] instanceof FHIRString) { $this->setTitle($data[self::FIELD_TITLE]); - } elseif ($ext && is_scalar($data[self::FIELD_TITLE])) { - $this->setTitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TITLE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TITLE])) { + $this->setTitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TITLE]] + $ext)); + } else if (is_array($data[self::FIELD_TITLE])) { + $this->setTitle(new FHIRString(array_merge($ext, $data[self::FIELD_TITLE]))); + } } else { $this->setTitle(new FHIRString($data[self::FIELD_TITLE])); } @@ -785,15 +798,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getEmptyReason())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EMPTY_REASON, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getEntry())) { foreach($vs as $v) { if (null === $v) { @@ -802,14 +812,13 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_ENTRY, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getMode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MODE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOrderedBy())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ORDERED_BY, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getSection())) { foreach($vs as $v) { if (null === $v) { @@ -844,8 +853,15 @@ public function jsonSerialize() $a[self::FIELD_ENTRY] = $vs; } if (null !== ($v = $this->getMode())) { - $a[self::FIELD_MODE] = $v->getValue(); - $a[self::FIELD_MODE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MODE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MODE_EXT] = $enc; + } + } else { + $a[self::FIELD_MODE] = $v; + } } if (null !== ($v = $this->getOrderedBy())) { $a[self::FIELD_ORDERED_BY] = $v; @@ -857,8 +873,15 @@ public function jsonSerialize() $a[self::FIELD_TEXT] = $v; } if (null !== ($v = $this->getTitle())) { - $a[self::FIELD_TITLE] = $v->getValue(); - $a[self::FIELD_TITLE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TITLE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TITLE_EXT] = $enc; + } + } else { + $a[self::FIELD_TITLE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRConceptMap/FHIRConceptMapContact.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRConceptMap/FHIRConceptMapContact.php index c14359dbf6..9dc3138e2a 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRConceptMap/FHIRConceptMapContact.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRConceptMap/FHIRConceptMapContact.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRConceptMapContact extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONCEPT_MAP_DOT_CONTACT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_NAME = 'name'; const FIELD_NAME_EXT = '_name'; const FIELD_TELECOM = 'telecom'; @@ -111,6 +107,9 @@ class FHIRConceptMapContact extends FHIRBackboneElement */ protected $telecom = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRConceptMapContact Constructor * @param null|array $data @@ -133,8 +132,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -145,17 +148,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_TELECOM])) { foreach($data[self::FIELD_TELECOM] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContactPoint) { $this->addTelecom($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addTelecom(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addTelecom(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addTelecom(new FHIRContactPoint(array_merge($v, $ext[$i]))); + } } else { $this->addTelecom(new FHIRContactPoint($v)); } } } elseif ($data[self::FIELD_TELECOM] instanceof FHIRContactPoint) { $this->addTelecom($data[self::FIELD_TELECOM]); - } elseif ($ext && is_scalar($data[self::FIELD_TELECOM])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_TELECOM])) { $this->addTelecom(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $data[self::FIELD_TELECOM]] + $ext)); } else { $this->addTelecom(new FHIRContactPoint($data[self::FIELD_TELECOM])); @@ -373,7 +383,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NAME, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getTelecom())) { foreach($vs as $v) { if (null === $v) { @@ -382,6 +391,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_TELECOM, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } @@ -392,11 +402,34 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if ([] !== ($vs = $this->getTelecom())) { - $a[self::FIELD_TELECOM] = $vs; + $a[self::FIELD_TELECOM] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TELECOM][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TELECOM_EXT][] = $enc; + } else { + $a[self::FIELD_TELECOM_EXT][] = null; + } + } else { + $a[self::FIELD_TELECOM][] = $v; + } + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRConceptMap/FHIRConceptMapDependsOn.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRConceptMap/FHIRConceptMapDependsOn.php index bd17ad991b..b9b66cc46a 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRConceptMap/FHIRConceptMapDependsOn.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRConceptMap/FHIRConceptMapDependsOn.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRConceptMapDependsOn extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONCEPT_MAP_DOT_DEPENDS_ON; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CODE = 'code'; const FIELD_CODE_EXT = '_code'; const FIELD_CODE_SYSTEM = 'codeSystem'; @@ -128,6 +124,9 @@ class FHIRConceptMapDependsOn extends FHIRBackboneElement */ protected $element = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRConceptMapDependsOn Constructor * @param null|array $data @@ -150,8 +149,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CODE] instanceof FHIRString) { $this->setCode($data[self::FIELD_CODE]); - } elseif ($ext && is_scalar($data[self::FIELD_CODE])) { - $this->setCode(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_CODE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CODE])) { + $this->setCode(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_CODE]] + $ext)); + } else if (is_array($data[self::FIELD_CODE])) { + $this->setCode(new FHIRString(array_merge($ext, $data[self::FIELD_CODE]))); + } } else { $this->setCode(new FHIRString($data[self::FIELD_CODE])); } @@ -162,8 +165,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CODE_SYSTEM] instanceof FHIRUri) { $this->setCodeSystem($data[self::FIELD_CODE_SYSTEM]); - } elseif ($ext && is_scalar($data[self::FIELD_CODE_SYSTEM])) { - $this->setCodeSystem(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_CODE_SYSTEM]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CODE_SYSTEM])) { + $this->setCodeSystem(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_CODE_SYSTEM]] + $ext)); + } else if (is_array($data[self::FIELD_CODE_SYSTEM])) { + $this->setCodeSystem(new FHIRUri(array_merge($ext, $data[self::FIELD_CODE_SYSTEM]))); + } } else { $this->setCodeSystem(new FHIRUri($data[self::FIELD_CODE_SYSTEM])); } @@ -174,8 +181,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ELEMENT] instanceof FHIRUri) { $this->setElement($data[self::FIELD_ELEMENT]); - } elseif ($ext && is_scalar($data[self::FIELD_ELEMENT])) { - $this->setElement(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_ELEMENT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ELEMENT])) { + $this->setElement(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_ELEMENT]] + $ext)); + } else if (is_array($data[self::FIELD_ELEMENT])) { + $this->setElement(new FHIRUri(array_merge($ext, $data[self::FIELD_ELEMENT]))); + } } else { $this->setElement(new FHIRUri($data[self::FIELD_ELEMENT])); } @@ -442,16 +453,37 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getCode())) { - $a[self::FIELD_CODE] = $v->getValue(); - $a[self::FIELD_CODE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CODE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CODE_EXT] = $enc; + } + } else { + $a[self::FIELD_CODE] = $v; + } } if (null !== ($v = $this->getCodeSystem())) { - $a[self::FIELD_CODE_SYSTEM] = $v->getValue(); - $a[self::FIELD_CODE_SYSTEM_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CODE_SYSTEM] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CODE_SYSTEM_EXT] = $enc; + } + } else { + $a[self::FIELD_CODE_SYSTEM] = $v; + } } if (null !== ($v = $this->getElement())) { - $a[self::FIELD_ELEMENT] = $v->getValue(); - $a[self::FIELD_ELEMENT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ELEMENT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ELEMENT_EXT] = $enc; + } + } else { + $a[self::FIELD_ELEMENT] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRConceptMap/FHIRConceptMapElement.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRConceptMap/FHIRConceptMapElement.php index 5ceeb4fdd0..d23056bd4e 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRConceptMap/FHIRConceptMapElement.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRConceptMap/FHIRConceptMapElement.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRConceptMapElement extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONCEPT_MAP_DOT_ELEMENT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CODE = 'code'; const FIELD_CODE_EXT = '_code'; const FIELD_CODE_SYSTEM = 'codeSystem'; @@ -123,6 +119,9 @@ class FHIRConceptMapElement extends FHIRBackboneElement */ protected $target = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRConceptMapElement Constructor * @param null|array $data @@ -145,8 +144,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CODE] instanceof FHIRCode) { $this->setCode($data[self::FIELD_CODE]); - } elseif ($ext && is_scalar($data[self::FIELD_CODE])) { - $this->setCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_CODE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CODE])) { + $this->setCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_CODE]] + $ext)); + } else if (is_array($data[self::FIELD_CODE])) { + $this->setCode(new FHIRCode(array_merge($ext, $data[self::FIELD_CODE]))); + } } else { $this->setCode(new FHIRCode($data[self::FIELD_CODE])); } @@ -157,8 +160,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CODE_SYSTEM] instanceof FHIRUri) { $this->setCodeSystem($data[self::FIELD_CODE_SYSTEM]); - } elseif ($ext && is_scalar($data[self::FIELD_CODE_SYSTEM])) { - $this->setCodeSystem(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_CODE_SYSTEM]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CODE_SYSTEM])) { + $this->setCodeSystem(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_CODE_SYSTEM]] + $ext)); + } else if (is_array($data[self::FIELD_CODE_SYSTEM])) { + $this->setCodeSystem(new FHIRUri(array_merge($ext, $data[self::FIELD_CODE_SYSTEM]))); + } } else { $this->setCodeSystem(new FHIRUri($data[self::FIELD_CODE_SYSTEM])); } @@ -166,6 +173,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_TARGET])) { if (is_array($data[self::FIELD_TARGET])) { foreach($data[self::FIELD_TARGET] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRConceptMapTarget) { $this->addTarget($v); } else { @@ -435,7 +445,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getCodeSystem())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE_SYSTEM, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getTarget())) { foreach($vs as $v) { if (null === $v) { @@ -444,6 +453,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_TARGET, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } @@ -454,12 +464,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getCode())) { - $a[self::FIELD_CODE] = $v->getValue(); - $a[self::FIELD_CODE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CODE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CODE_EXT] = $enc; + } + } else { + $a[self::FIELD_CODE] = $v; + } } if (null !== ($v = $this->getCodeSystem())) { - $a[self::FIELD_CODE_SYSTEM] = $v->getValue(); - $a[self::FIELD_CODE_SYSTEM_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CODE_SYSTEM] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CODE_SYSTEM_EXT] = $enc; + } + } else { + $a[self::FIELD_CODE_SYSTEM] = $v; + } } if ([] !== ($vs = $this->getTarget())) { $a[self::FIELD_TARGET] = $vs; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRConceptMap/FHIRConceptMapTarget.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRConceptMap/FHIRConceptMapTarget.php index 6ca6832a1b..584783a38f 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRConceptMap/FHIRConceptMapTarget.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRConceptMap/FHIRConceptMapTarget.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRConceptMapTarget extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONCEPT_MAP_DOT_TARGET; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CODE = 'code'; const FIELD_CODE_EXT = '_code'; const FIELD_CODE_SYSTEM = 'codeSystem'; @@ -170,6 +166,9 @@ class FHIRConceptMapTarget extends FHIRBackboneElement */ protected $product = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRConceptMapTarget Constructor * @param null|array $data @@ -192,8 +191,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CODE] instanceof FHIRCode) { $this->setCode($data[self::FIELD_CODE]); - } elseif ($ext && is_scalar($data[self::FIELD_CODE])) { - $this->setCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_CODE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CODE])) { + $this->setCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_CODE]] + $ext)); + } else if (is_array($data[self::FIELD_CODE])) { + $this->setCode(new FHIRCode(array_merge($ext, $data[self::FIELD_CODE]))); + } } else { $this->setCode(new FHIRCode($data[self::FIELD_CODE])); } @@ -204,8 +207,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CODE_SYSTEM] instanceof FHIRUri) { $this->setCodeSystem($data[self::FIELD_CODE_SYSTEM]); - } elseif ($ext && is_scalar($data[self::FIELD_CODE_SYSTEM])) { - $this->setCodeSystem(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_CODE_SYSTEM]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CODE_SYSTEM])) { + $this->setCodeSystem(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_CODE_SYSTEM]] + $ext)); + } else if (is_array($data[self::FIELD_CODE_SYSTEM])) { + $this->setCodeSystem(new FHIRUri(array_merge($ext, $data[self::FIELD_CODE_SYSTEM]))); + } } else { $this->setCodeSystem(new FHIRUri($data[self::FIELD_CODE_SYSTEM])); } @@ -216,8 +223,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_COMMENTS] instanceof FHIRString) { $this->setComments($data[self::FIELD_COMMENTS]); - } elseif ($ext && is_scalar($data[self::FIELD_COMMENTS])) { - $this->setComments(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_COMMENTS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_COMMENTS])) { + $this->setComments(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_COMMENTS]] + $ext)); + } else if (is_array($data[self::FIELD_COMMENTS])) { + $this->setComments(new FHIRString(array_merge($ext, $data[self::FIELD_COMMENTS]))); + } } else { $this->setComments(new FHIRString($data[self::FIELD_COMMENTS])); } @@ -225,6 +236,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_DEPENDS_ON])) { if (is_array($data[self::FIELD_DEPENDS_ON])) { foreach($data[self::FIELD_DEPENDS_ON] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRConceptMapDependsOn) { $this->addDependsOn($v); } else { @@ -243,8 +257,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EQUIVALENCE] instanceof FHIRCode) { $this->setEquivalence($data[self::FIELD_EQUIVALENCE]); - } elseif ($ext && is_scalar($data[self::FIELD_EQUIVALENCE])) { - $this->setEquivalence(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_EQUIVALENCE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EQUIVALENCE])) { + $this->setEquivalence(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_EQUIVALENCE]] + $ext)); + } else if (is_array($data[self::FIELD_EQUIVALENCE])) { + $this->setEquivalence(new FHIRCode(array_merge($ext, $data[self::FIELD_EQUIVALENCE]))); + } } else { $this->setEquivalence(new FHIRCode($data[self::FIELD_EQUIVALENCE])); } @@ -252,6 +270,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PRODUCT])) { if (is_array($data[self::FIELD_PRODUCT])) { foreach($data[self::FIELD_PRODUCT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRConceptMapDependsOn) { $this->addProduct($v); } else { @@ -693,7 +714,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getComments())) { $v->xmlSerialize($sxe->addChild(self::FIELD_COMMENTS, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getDependsOn())) { foreach($vs as $v) { if (null === $v) { @@ -702,10 +722,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_DEPENDS_ON, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getEquivalence())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EQUIVALENCE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getProduct())) { foreach($vs as $v) { if (null === $v) { @@ -714,6 +734,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_PRODUCT, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } @@ -724,23 +745,51 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getCode())) { - $a[self::FIELD_CODE] = $v->getValue(); - $a[self::FIELD_CODE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CODE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CODE_EXT] = $enc; + } + } else { + $a[self::FIELD_CODE] = $v; + } } if (null !== ($v = $this->getCodeSystem())) { - $a[self::FIELD_CODE_SYSTEM] = $v->getValue(); - $a[self::FIELD_CODE_SYSTEM_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CODE_SYSTEM] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CODE_SYSTEM_EXT] = $enc; + } + } else { + $a[self::FIELD_CODE_SYSTEM] = $v; + } } if (null !== ($v = $this->getComments())) { - $a[self::FIELD_COMMENTS] = $v->getValue(); - $a[self::FIELD_COMMENTS_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_COMMENTS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_COMMENTS_EXT] = $enc; + } + } else { + $a[self::FIELD_COMMENTS] = $v; + } } if ([] !== ($vs = $this->getDependsOn())) { $a[self::FIELD_DEPENDS_ON] = $vs; } if (null !== ($v = $this->getEquivalence())) { - $a[self::FIELD_EQUIVALENCE] = $v->getValue(); - $a[self::FIELD_EQUIVALENCE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EQUIVALENCE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EQUIVALENCE_EXT] = $enc; + } + } else { + $a[self::FIELD_EQUIVALENCE] = $v; + } } if ([] !== ($vs = $this->getProduct())) { $a[self::FIELD_PRODUCT] = $vs; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRCondition/FHIRConditionEvidence.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRCondition/FHIRConditionEvidence.php index e796213a1a..660c1388fe 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRCondition/FHIRConditionEvidence.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRCondition/FHIRConditionEvidence.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -81,10 +81,6 @@ class FHIRConditionEvidence extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONDITION_DOT_EVIDENCE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CODE = 'code'; const FIELD_DETAIL = 'detail'; @@ -111,6 +107,9 @@ class FHIRConditionEvidence extends FHIRBackboneElement */ protected $detail = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRConditionEvidence Constructor * @param null|array $data @@ -137,6 +136,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_DETAIL])) { if (is_array($data[self::FIELD_DETAIL])) { foreach($data[self::FIELD_DETAIL] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addDetail($v); } else { @@ -346,11 +348,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getDetail())) { foreach($vs as $v) { if (null === $v) { @@ -359,6 +359,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_DETAIL, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRCondition/FHIRConditionStage.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRCondition/FHIRConditionStage.php index 69f2b3bcfb..0cbe200d1d 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRCondition/FHIRConditionStage.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRCondition/FHIRConditionStage.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -81,10 +81,6 @@ class FHIRConditionStage extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONDITION_DOT_STAGE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ASSESSMENT = 'assessment'; const FIELD_SUMMARY = 'summary'; @@ -113,6 +109,9 @@ class FHIRConditionStage extends FHIRBackboneElement */ protected $summary = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRConditionStage Constructor * @param null|array $data @@ -132,6 +131,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ASSESSMENT])) { if (is_array($data[self::FIELD_ASSESSMENT])) { foreach($data[self::FIELD_ASSESSMENT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addAssessment($v); } else { @@ -353,7 +355,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getAssessment())) { foreach($vs as $v) { if (null === $v) { diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceCertificate.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceCertificate.php index cef42f9d2c..775e825254 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceCertificate.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceCertificate.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRConformanceCertificate extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONFORMANCE_DOT_CERTIFICATE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_BLOB = 'blob'; const FIELD_BLOB_EXT = '_blob'; const FIELD_TYPE = 'type'; @@ -112,6 +108,9 @@ class FHIRConformanceCertificate extends FHIRBackboneElement */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRConformanceCertificate Constructor * @param null|array $data @@ -134,8 +133,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_BLOB] instanceof FHIRBase64Binary) { $this->setBlob($data[self::FIELD_BLOB]); - } elseif ($ext && is_scalar($data[self::FIELD_BLOB])) { - $this->setBlob(new FHIRBase64Binary([FHIRBase64Binary::FIELD_VALUE => $data[self::FIELD_BLOB]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_BLOB])) { + $this->setBlob(new FHIRBase64Binary([FHIRBase64Binary::FIELD_VALUE => $data[self::FIELD_BLOB]] + $ext)); + } else if (is_array($data[self::FIELD_BLOB])) { + $this->setBlob(new FHIRBase64Binary(array_merge($ext, $data[self::FIELD_BLOB]))); + } } else { $this->setBlob(new FHIRBase64Binary($data[self::FIELD_BLOB])); } @@ -146,8 +149,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TYPE] instanceof FHIRCode) { $this->setType($data[self::FIELD_TYPE]); - } elseif ($ext && is_scalar($data[self::FIELD_TYPE])) { - $this->setType(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TYPE])) { + $this->setType(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } else if (is_array($data[self::FIELD_TYPE])) { + $this->setType(new FHIRCode(array_merge($ext, $data[self::FIELD_TYPE]))); + } } else { $this->setType(new FHIRCode($data[self::FIELD_TYPE])); } @@ -359,12 +366,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getBlob())) { - $a[self::FIELD_BLOB] = $v->getValue(); - $a[self::FIELD_BLOB_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_BLOB] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_BLOB_EXT] = $enc; + } + } else { + $a[self::FIELD_BLOB] = $v; + } } if (null !== ($v = $this->getType())) { - $a[self::FIELD_TYPE] = $v->getValue(); - $a[self::FIELD_TYPE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TYPE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TYPE_EXT] = $enc; + } + } else { + $a[self::FIELD_TYPE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceContact.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceContact.php index a4b16851e6..1bea85c84f 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceContact.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceContact.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRConformanceContact extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONFORMANCE_DOT_CONTACT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_NAME = 'name'; const FIELD_NAME_EXT = '_name'; const FIELD_TELECOM = 'telecom'; @@ -112,6 +108,9 @@ class FHIRConformanceContact extends FHIRBackboneElement */ protected $telecom = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRConformanceContact Constructor * @param null|array $data @@ -134,8 +133,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -146,17 +149,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_TELECOM])) { foreach($data[self::FIELD_TELECOM] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContactPoint) { $this->addTelecom($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addTelecom(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addTelecom(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addTelecom(new FHIRContactPoint(array_merge($v, $ext[$i]))); + } } else { $this->addTelecom(new FHIRContactPoint($v)); } } } elseif ($data[self::FIELD_TELECOM] instanceof FHIRContactPoint) { $this->addTelecom($data[self::FIELD_TELECOM]); - } elseif ($ext && is_scalar($data[self::FIELD_TELECOM])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_TELECOM])) { $this->addTelecom(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $data[self::FIELD_TELECOM]] + $ext)); } else { $this->addTelecom(new FHIRContactPoint($data[self::FIELD_TELECOM])); @@ -374,7 +384,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NAME, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getTelecom())) { foreach($vs as $v) { if (null === $v) { @@ -383,6 +392,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_TELECOM, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } @@ -393,11 +403,34 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if ([] !== ($vs = $this->getTelecom())) { - $a[self::FIELD_TELECOM] = $vs; + $a[self::FIELD_TELECOM] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TELECOM][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TELECOM_EXT][] = $enc; + } else { + $a[self::FIELD_TELECOM_EXT][] = null; + } + } else { + $a[self::FIELD_TELECOM][] = $v; + } + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceDocument.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceDocument.php index d40cc17ed0..988846ac57 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceDocument.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceDocument.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -81,10 +81,6 @@ class FHIRConformanceDocument extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONFORMANCE_DOT_DOCUMENT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DOCUMENTATION = 'documentation'; const FIELD_DOCUMENTATION_EXT = '_documentation'; const FIELD_MODE = 'mode'; @@ -125,6 +121,9 @@ class FHIRConformanceDocument extends FHIRBackboneElement */ protected $profile = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRConformanceDocument Constructor * @param null|array $data @@ -147,8 +146,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DOCUMENTATION] instanceof FHIRString) { $this->setDocumentation($data[self::FIELD_DOCUMENTATION]); - } elseif ($ext && is_scalar($data[self::FIELD_DOCUMENTATION])) { - $this->setDocumentation(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DOCUMENTATION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DOCUMENTATION])) { + $this->setDocumentation(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DOCUMENTATION]] + $ext)); + } else if (is_array($data[self::FIELD_DOCUMENTATION])) { + $this->setDocumentation(new FHIRString(array_merge($ext, $data[self::FIELD_DOCUMENTATION]))); + } } else { $this->setDocumentation(new FHIRString($data[self::FIELD_DOCUMENTATION])); } @@ -159,8 +162,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MODE] instanceof FHIRDocumentMode) { $this->setMode($data[self::FIELD_MODE]); - } elseif ($ext && is_scalar($data[self::FIELD_MODE])) { - $this->setMode(new FHIRDocumentMode([FHIRDocumentMode::FIELD_VALUE => $data[self::FIELD_MODE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MODE])) { + $this->setMode(new FHIRDocumentMode([FHIRDocumentMode::FIELD_VALUE => $data[self::FIELD_MODE]] + $ext)); + } else if (is_array($data[self::FIELD_MODE])) { + $this->setMode(new FHIRDocumentMode(array_merge($ext, $data[self::FIELD_MODE]))); + } } else { $this->setMode(new FHIRDocumentMode($data[self::FIELD_MODE])); } @@ -388,11 +395,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDocumentation())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DOCUMENTATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getMode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MODE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getProfile())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PROFILE, null, $v->_getFHIRXMLNamespace())); } @@ -406,11 +411,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getDocumentation())) { - $a[self::FIELD_DOCUMENTATION] = $v->getValue(); - $a[self::FIELD_DOCUMENTATION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DOCUMENTATION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DOCUMENTATION_EXT] = $enc; + } + } else { + $a[self::FIELD_DOCUMENTATION] = $v; + } } if (null !== ($v = $this->getMode())) { - $a[self::FIELD_MODE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MODE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MODE_EXT] = $enc; + } + } else { + $a[self::FIELD_MODE] = $v; + } } if (null !== ($v = $this->getProfile())) { $a[self::FIELD_PROFILE] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceEndpoint.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceEndpoint.php index 6826742a71..b9321f2356 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceEndpoint.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceEndpoint.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRConformanceEndpoint extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONFORMANCE_DOT_ENDPOINT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ADDRESS = 'address'; const FIELD_ADDRESS_EXT = '_address'; const FIELD_PROTOCOL = 'protocol'; @@ -112,6 +108,9 @@ class FHIRConformanceEndpoint extends FHIRBackboneElement */ protected $protocol = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRConformanceEndpoint Constructor * @param null|array $data @@ -134,8 +133,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ADDRESS] instanceof FHIRUri) { $this->setAddress($data[self::FIELD_ADDRESS]); - } elseif ($ext && is_scalar($data[self::FIELD_ADDRESS])) { - $this->setAddress(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_ADDRESS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ADDRESS])) { + $this->setAddress(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_ADDRESS]] + $ext)); + } else if (is_array($data[self::FIELD_ADDRESS])) { + $this->setAddress(new FHIRUri(array_merge($ext, $data[self::FIELD_ADDRESS]))); + } } else { $this->setAddress(new FHIRUri($data[self::FIELD_ADDRESS])); } @@ -332,7 +335,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getAddress())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ADDRESS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getProtocol())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PROTOCOL, null, $v->_getFHIRXMLNamespace())); } @@ -346,8 +348,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getAddress())) { - $a[self::FIELD_ADDRESS] = $v->getValue(); - $a[self::FIELD_ADDRESS_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ADDRESS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ADDRESS_EXT] = $enc; + } + } else { + $a[self::FIELD_ADDRESS] = $v; + } } if (null !== ($v = $this->getProtocol())) { $a[self::FIELD_PROTOCOL] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceEvent.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceEvent.php index 1d1d4d235d..880601895f 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceEvent.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceEvent.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -84,10 +84,6 @@ class FHIRConformanceEvent extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONFORMANCE_DOT_EVENT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CATEGORY = 'category'; const FIELD_CATEGORY_EXT = '_category'; const FIELD_CODE = 'code'; @@ -178,6 +174,9 @@ class FHIRConformanceEvent extends FHIRBackboneElement */ protected $response = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRConformanceEvent Constructor * @param null|array $data @@ -200,8 +199,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CATEGORY] instanceof FHIRMessageSignificanceCategory) { $this->setCategory($data[self::FIELD_CATEGORY]); - } elseif ($ext && is_scalar($data[self::FIELD_CATEGORY])) { - $this->setCategory(new FHIRMessageSignificanceCategory([FHIRMessageSignificanceCategory::FIELD_VALUE => $data[self::FIELD_CATEGORY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CATEGORY])) { + $this->setCategory(new FHIRMessageSignificanceCategory([FHIRMessageSignificanceCategory::FIELD_VALUE => $data[self::FIELD_CATEGORY]] + $ext)); + } else if (is_array($data[self::FIELD_CATEGORY])) { + $this->setCategory(new FHIRMessageSignificanceCategory(array_merge($ext, $data[self::FIELD_CATEGORY]))); + } } else { $this->setCategory(new FHIRMessageSignificanceCategory($data[self::FIELD_CATEGORY])); } @@ -219,8 +222,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DOCUMENTATION] instanceof FHIRString) { $this->setDocumentation($data[self::FIELD_DOCUMENTATION]); - } elseif ($ext && is_scalar($data[self::FIELD_DOCUMENTATION])) { - $this->setDocumentation(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DOCUMENTATION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DOCUMENTATION])) { + $this->setDocumentation(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DOCUMENTATION]] + $ext)); + } else if (is_array($data[self::FIELD_DOCUMENTATION])) { + $this->setDocumentation(new FHIRString(array_merge($ext, $data[self::FIELD_DOCUMENTATION]))); + } } else { $this->setDocumentation(new FHIRString($data[self::FIELD_DOCUMENTATION])); } @@ -231,8 +238,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_FOCUS] instanceof FHIRCode) { $this->setFocus($data[self::FIELD_FOCUS]); - } elseif ($ext && is_scalar($data[self::FIELD_FOCUS])) { - $this->setFocus(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_FOCUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_FOCUS])) { + $this->setFocus(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_FOCUS]] + $ext)); + } else if (is_array($data[self::FIELD_FOCUS])) { + $this->setFocus(new FHIRCode(array_merge($ext, $data[self::FIELD_FOCUS]))); + } } else { $this->setFocus(new FHIRCode($data[self::FIELD_FOCUS])); } @@ -243,8 +254,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MODE] instanceof FHIRConformanceEventMode) { $this->setMode($data[self::FIELD_MODE]); - } elseif ($ext && is_scalar($data[self::FIELD_MODE])) { - $this->setMode(new FHIRConformanceEventMode([FHIRConformanceEventMode::FIELD_VALUE => $data[self::FIELD_MODE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MODE])) { + $this->setMode(new FHIRConformanceEventMode([FHIRConformanceEventMode::FIELD_VALUE => $data[self::FIELD_MODE]] + $ext)); + } else if (is_array($data[self::FIELD_MODE])) { + $this->setMode(new FHIRConformanceEventMode(array_merge($ext, $data[self::FIELD_MODE]))); + } } else { $this->setMode(new FHIRConformanceEventMode($data[self::FIELD_MODE])); } @@ -619,11 +634,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getCategory())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CATEGORY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } @@ -633,15 +646,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getFocus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FOCUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getMode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MODE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRequest())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REQUEST, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getResponse())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RESPONSE, null, $v->_getFHIRXMLNamespace())); } @@ -655,21 +665,51 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getCategory())) { - $a[self::FIELD_CATEGORY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CATEGORY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CATEGORY_EXT] = $enc; + } + } else { + $a[self::FIELD_CATEGORY] = $v; + } } if (null !== ($v = $this->getCode())) { $a[self::FIELD_CODE] = $v; } if (null !== ($v = $this->getDocumentation())) { - $a[self::FIELD_DOCUMENTATION] = $v->getValue(); - $a[self::FIELD_DOCUMENTATION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DOCUMENTATION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DOCUMENTATION_EXT] = $enc; + } + } else { + $a[self::FIELD_DOCUMENTATION] = $v; + } } if (null !== ($v = $this->getFocus())) { - $a[self::FIELD_FOCUS] = $v->getValue(); - $a[self::FIELD_FOCUS_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FOCUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FOCUS_EXT] = $enc; + } + } else { + $a[self::FIELD_FOCUS] = $v; + } } if (null !== ($v = $this->getMode())) { - $a[self::FIELD_MODE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MODE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MODE_EXT] = $enc; + } + } else { + $a[self::FIELD_MODE] = $v; + } } if (null !== ($v = $this->getRequest())) { $a[self::FIELD_REQUEST] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceImplementation.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceImplementation.php index bda7b00051..807ad5eba2 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceImplementation.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceImplementation.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRConformanceImplementation extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONFORMANCE_DOT_IMPLEMENTATION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DESCRIPTION = 'description'; const FIELD_DESCRIPTION_EXT = '_description'; const FIELD_URL = 'url'; @@ -113,6 +109,9 @@ class FHIRConformanceImplementation extends FHIRBackboneElement */ protected $url = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRConformanceImplementation Constructor * @param null|array $data @@ -135,8 +134,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -147,8 +150,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_URL] instanceof FHIRUri) { $this->setUrl($data[self::FIELD_URL]); - } elseif ($ext && is_scalar($data[self::FIELD_URL])) { - $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } else if (is_array($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri(array_merge($ext, $data[self::FIELD_URL]))); + } } else { $this->setUrl(new FHIRUri($data[self::FIELD_URL])); } @@ -362,12 +369,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if (null !== ($v = $this->getUrl())) { - $a[self::FIELD_URL] = $v->getValue(); - $a[self::FIELD_URL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_URL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_URL_EXT] = $enc; + } + } else { + $a[self::FIELD_URL] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceInteraction.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceInteraction.php index 2245f8890f..d101170ca4 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceInteraction.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceInteraction.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRConformanceInteraction extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONFORMANCE_DOT_INTERACTION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CODE = 'code'; const FIELD_CODE_EXT = '_code'; const FIELD_DOCUMENTATION = 'documentation'; @@ -112,6 +108,9 @@ class FHIRConformanceInteraction extends FHIRBackboneElement */ protected $documentation = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRConformanceInteraction Constructor * @param null|array $data @@ -134,8 +133,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CODE] instanceof FHIRTypeRestfulInteraction) { $this->setCode($data[self::FIELD_CODE]); - } elseif ($ext && is_scalar($data[self::FIELD_CODE])) { - $this->setCode(new FHIRTypeRestfulInteraction([FHIRTypeRestfulInteraction::FIELD_VALUE => $data[self::FIELD_CODE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CODE])) { + $this->setCode(new FHIRTypeRestfulInteraction([FHIRTypeRestfulInteraction::FIELD_VALUE => $data[self::FIELD_CODE]] + $ext)); + } else if (is_array($data[self::FIELD_CODE])) { + $this->setCode(new FHIRTypeRestfulInteraction(array_merge($ext, $data[self::FIELD_CODE]))); + } } else { $this->setCode(new FHIRTypeRestfulInteraction($data[self::FIELD_CODE])); } @@ -146,8 +149,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DOCUMENTATION] instanceof FHIRString) { $this->setDocumentation($data[self::FIELD_DOCUMENTATION]); - } elseif ($ext && is_scalar($data[self::FIELD_DOCUMENTATION])) { - $this->setDocumentation(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DOCUMENTATION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DOCUMENTATION])) { + $this->setDocumentation(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DOCUMENTATION]] + $ext)); + } else if (is_array($data[self::FIELD_DOCUMENTATION])) { + $this->setDocumentation(new FHIRString(array_merge($ext, $data[self::FIELD_DOCUMENTATION]))); + } } else { $this->setDocumentation(new FHIRString($data[self::FIELD_DOCUMENTATION])); } @@ -332,7 +339,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } @@ -349,11 +355,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getCode())) { - $a[self::FIELD_CODE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CODE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CODE_EXT] = $enc; + } + } else { + $a[self::FIELD_CODE] = $v; + } } if (null !== ($v = $this->getDocumentation())) { - $a[self::FIELD_DOCUMENTATION] = $v->getValue(); - $a[self::FIELD_DOCUMENTATION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DOCUMENTATION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DOCUMENTATION_EXT] = $enc; + } + } else { + $a[self::FIELD_DOCUMENTATION] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceInteraction1.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceInteraction1.php index b9891e42ff..959b531eba 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceInteraction1.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceInteraction1.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRConformanceInteraction1 extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONFORMANCE_DOT_INTERACTION_1; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CODE = 'code'; const FIELD_CODE_EXT = '_code'; const FIELD_DOCUMENTATION = 'documentation'; @@ -112,6 +108,9 @@ class FHIRConformanceInteraction1 extends FHIRBackboneElement */ protected $documentation = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRConformanceInteraction1 Constructor * @param null|array $data @@ -134,8 +133,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CODE] instanceof FHIRSystemRestfulInteraction) { $this->setCode($data[self::FIELD_CODE]); - } elseif ($ext && is_scalar($data[self::FIELD_CODE])) { - $this->setCode(new FHIRSystemRestfulInteraction([FHIRSystemRestfulInteraction::FIELD_VALUE => $data[self::FIELD_CODE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CODE])) { + $this->setCode(new FHIRSystemRestfulInteraction([FHIRSystemRestfulInteraction::FIELD_VALUE => $data[self::FIELD_CODE]] + $ext)); + } else if (is_array($data[self::FIELD_CODE])) { + $this->setCode(new FHIRSystemRestfulInteraction(array_merge($ext, $data[self::FIELD_CODE]))); + } } else { $this->setCode(new FHIRSystemRestfulInteraction($data[self::FIELD_CODE])); } @@ -146,8 +149,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DOCUMENTATION] instanceof FHIRString) { $this->setDocumentation($data[self::FIELD_DOCUMENTATION]); - } elseif ($ext && is_scalar($data[self::FIELD_DOCUMENTATION])) { - $this->setDocumentation(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DOCUMENTATION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DOCUMENTATION])) { + $this->setDocumentation(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DOCUMENTATION]] + $ext)); + } else if (is_array($data[self::FIELD_DOCUMENTATION])) { + $this->setDocumentation(new FHIRString(array_merge($ext, $data[self::FIELD_DOCUMENTATION]))); + } } else { $this->setDocumentation(new FHIRString($data[self::FIELD_DOCUMENTATION])); } @@ -332,7 +339,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } @@ -349,11 +355,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getCode())) { - $a[self::FIELD_CODE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CODE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CODE_EXT] = $enc; + } + } else { + $a[self::FIELD_CODE] = $v; + } } if (null !== ($v = $this->getDocumentation())) { - $a[self::FIELD_DOCUMENTATION] = $v->getValue(); - $a[self::FIELD_DOCUMENTATION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DOCUMENTATION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DOCUMENTATION_EXT] = $enc; + } + } else { + $a[self::FIELD_DOCUMENTATION] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceMessaging.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceMessaging.php index aa82f5097e..172b7e49f3 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceMessaging.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceMessaging.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRConformanceMessaging extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONFORMANCE_DOT_MESSAGING; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DOCUMENTATION = 'documentation'; const FIELD_DOCUMENTATION_EXT = '_documentation'; const FIELD_ENDPOINT = 'endpoint'; @@ -139,6 +135,9 @@ class FHIRConformanceMessaging extends FHIRBackboneElement */ protected $reliableCache = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRConformanceMessaging Constructor * @param null|array $data @@ -161,8 +160,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DOCUMENTATION] instanceof FHIRString) { $this->setDocumentation($data[self::FIELD_DOCUMENTATION]); - } elseif ($ext && is_scalar($data[self::FIELD_DOCUMENTATION])) { - $this->setDocumentation(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DOCUMENTATION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DOCUMENTATION])) { + $this->setDocumentation(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DOCUMENTATION]] + $ext)); + } else if (is_array($data[self::FIELD_DOCUMENTATION])) { + $this->setDocumentation(new FHIRString(array_merge($ext, $data[self::FIELD_DOCUMENTATION]))); + } } else { $this->setDocumentation(new FHIRString($data[self::FIELD_DOCUMENTATION])); } @@ -170,6 +173,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ENDPOINT])) { if (is_array($data[self::FIELD_ENDPOINT])) { foreach($data[self::FIELD_ENDPOINT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRConformanceEndpoint) { $this->addEndpoint($v); } else { @@ -185,6 +191,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_EVENT])) { if (is_array($data[self::FIELD_EVENT])) { foreach($data[self::FIELD_EVENT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRConformanceEvent) { $this->addEvent($v); } else { @@ -203,8 +212,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_RELIABLE_CACHE] instanceof FHIRUnsignedInt) { $this->setReliableCache($data[self::FIELD_RELIABLE_CACHE]); - } elseif ($ext && is_scalar($data[self::FIELD_RELIABLE_CACHE])) { - $this->setReliableCache(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_RELIABLE_CACHE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_RELIABLE_CACHE])) { + $this->setReliableCache(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_RELIABLE_CACHE]] + $ext)); + } else if (is_array($data[self::FIELD_RELIABLE_CACHE])) { + $this->setReliableCache(new FHIRUnsignedInt(array_merge($ext, $data[self::FIELD_RELIABLE_CACHE]))); + } } else { $this->setReliableCache(new FHIRUnsignedInt($data[self::FIELD_RELIABLE_CACHE])); } @@ -532,7 +545,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDocumentation())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DOCUMENTATION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getEndpoint())) { foreach($vs as $v) { if (null === $v) { @@ -550,6 +562,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_EVENT, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getReliableCache())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RELIABLE_CACHE, null, $v->_getFHIRXMLNamespace())); } @@ -563,8 +576,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getDocumentation())) { - $a[self::FIELD_DOCUMENTATION] = $v->getValue(); - $a[self::FIELD_DOCUMENTATION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DOCUMENTATION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DOCUMENTATION_EXT] = $enc; + } + } else { + $a[self::FIELD_DOCUMENTATION] = $v; + } } if ([] !== ($vs = $this->getEndpoint())) { $a[self::FIELD_ENDPOINT] = $vs; @@ -573,8 +593,15 @@ public function jsonSerialize() $a[self::FIELD_EVENT] = $vs; } if (null !== ($v = $this->getReliableCache())) { - $a[self::FIELD_RELIABLE_CACHE] = $v->getValue(); - $a[self::FIELD_RELIABLE_CACHE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_RELIABLE_CACHE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_RELIABLE_CACHE_EXT] = $enc; + } + } else { + $a[self::FIELD_RELIABLE_CACHE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceOperation.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceOperation.php index 61ad049d23..f1878d07fe 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceOperation.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceOperation.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRConformanceOperation extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONFORMANCE_DOT_OPERATION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DEFINITION = 'definition'; const FIELD_NAME = 'name'; const FIELD_NAME_EXT = '_name'; @@ -111,6 +107,9 @@ class FHIRConformanceOperation extends FHIRBackboneElement */ protected $name = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRConformanceOperation Constructor * @param null|array $data @@ -140,8 +139,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -326,7 +329,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getDefinition())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFINITION, null, $v->_getFHIRXMLNamespace())); } @@ -346,8 +348,15 @@ public function jsonSerialize() $a[self::FIELD_DEFINITION] = $v; } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceResource.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceResource.php index c7dac6ad11..505fa8c8cd 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceResource.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceResource.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -84,10 +84,6 @@ class FHIRConformanceResource extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONFORMANCE_DOT_RESOURCE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CONDITIONAL_CREATE = 'conditionalCreate'; const FIELD_CONDITIONAL_CREATE_EXT = '_conditionalCreate'; const FIELD_CONDITIONAL_DELETE = 'conditionalDelete'; @@ -251,6 +247,9 @@ class FHIRConformanceResource extends FHIRBackboneElement */ protected $versioning = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRConformanceResource Constructor * @param null|array $data @@ -273,8 +272,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CONDITIONAL_CREATE] instanceof FHIRBoolean) { $this->setConditionalCreate($data[self::FIELD_CONDITIONAL_CREATE]); - } elseif ($ext && is_scalar($data[self::FIELD_CONDITIONAL_CREATE])) { - $this->setConditionalCreate(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_CONDITIONAL_CREATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CONDITIONAL_CREATE])) { + $this->setConditionalCreate(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_CONDITIONAL_CREATE]] + $ext)); + } else if (is_array($data[self::FIELD_CONDITIONAL_CREATE])) { + $this->setConditionalCreate(new FHIRBoolean(array_merge($ext, $data[self::FIELD_CONDITIONAL_CREATE]))); + } } else { $this->setConditionalCreate(new FHIRBoolean($data[self::FIELD_CONDITIONAL_CREATE])); } @@ -285,8 +288,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CONDITIONAL_DELETE] instanceof FHIRConditionalDeleteStatus) { $this->setConditionalDelete($data[self::FIELD_CONDITIONAL_DELETE]); - } elseif ($ext && is_scalar($data[self::FIELD_CONDITIONAL_DELETE])) { - $this->setConditionalDelete(new FHIRConditionalDeleteStatus([FHIRConditionalDeleteStatus::FIELD_VALUE => $data[self::FIELD_CONDITIONAL_DELETE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CONDITIONAL_DELETE])) { + $this->setConditionalDelete(new FHIRConditionalDeleteStatus([FHIRConditionalDeleteStatus::FIELD_VALUE => $data[self::FIELD_CONDITIONAL_DELETE]] + $ext)); + } else if (is_array($data[self::FIELD_CONDITIONAL_DELETE])) { + $this->setConditionalDelete(new FHIRConditionalDeleteStatus(array_merge($ext, $data[self::FIELD_CONDITIONAL_DELETE]))); + } } else { $this->setConditionalDelete(new FHIRConditionalDeleteStatus($data[self::FIELD_CONDITIONAL_DELETE])); } @@ -297,8 +304,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CONDITIONAL_UPDATE] instanceof FHIRBoolean) { $this->setConditionalUpdate($data[self::FIELD_CONDITIONAL_UPDATE]); - } elseif ($ext && is_scalar($data[self::FIELD_CONDITIONAL_UPDATE])) { - $this->setConditionalUpdate(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_CONDITIONAL_UPDATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CONDITIONAL_UPDATE])) { + $this->setConditionalUpdate(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_CONDITIONAL_UPDATE]] + $ext)); + } else if (is_array($data[self::FIELD_CONDITIONAL_UPDATE])) { + $this->setConditionalUpdate(new FHIRBoolean(array_merge($ext, $data[self::FIELD_CONDITIONAL_UPDATE]))); + } } else { $this->setConditionalUpdate(new FHIRBoolean($data[self::FIELD_CONDITIONAL_UPDATE])); } @@ -306,6 +317,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_INTERACTION])) { if (is_array($data[self::FIELD_INTERACTION])) { foreach($data[self::FIELD_INTERACTION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRConformanceInteraction) { $this->addInteraction($v); } else { @@ -331,8 +345,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_READ_HISTORY] instanceof FHIRBoolean) { $this->setReadHistory($data[self::FIELD_READ_HISTORY]); - } elseif ($ext && is_scalar($data[self::FIELD_READ_HISTORY])) { - $this->setReadHistory(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_READ_HISTORY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_READ_HISTORY])) { + $this->setReadHistory(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_READ_HISTORY]] + $ext)); + } else if (is_array($data[self::FIELD_READ_HISTORY])) { + $this->setReadHistory(new FHIRBoolean(array_merge($ext, $data[self::FIELD_READ_HISTORY]))); + } } else { $this->setReadHistory(new FHIRBoolean($data[self::FIELD_READ_HISTORY])); } @@ -343,17 +361,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_SEARCH_INCLUDE])) { foreach($data[self::FIELD_SEARCH_INCLUDE] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRString) { $this->addSearchInclude($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addSearchInclude(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addSearchInclude(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addSearchInclude(new FHIRString(array_merge($v, $ext[$i]))); + } } else { $this->addSearchInclude(new FHIRString($v)); } } } elseif ($data[self::FIELD_SEARCH_INCLUDE] instanceof FHIRString) { $this->addSearchInclude($data[self::FIELD_SEARCH_INCLUDE]); - } elseif ($ext && is_scalar($data[self::FIELD_SEARCH_INCLUDE])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_SEARCH_INCLUDE])) { $this->addSearchInclude(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SEARCH_INCLUDE]] + $ext)); } else { $this->addSearchInclude(new FHIRString($data[self::FIELD_SEARCH_INCLUDE])); @@ -362,6 +387,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SEARCH_PARAM])) { if (is_array($data[self::FIELD_SEARCH_PARAM])) { foreach($data[self::FIELD_SEARCH_PARAM] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRConformanceSearchParam) { $this->addSearchParam($v); } else { @@ -380,17 +408,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_SEARCH_REV_INCLUDE])) { foreach($data[self::FIELD_SEARCH_REV_INCLUDE] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRString) { $this->addSearchRevInclude($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addSearchRevInclude(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addSearchRevInclude(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addSearchRevInclude(new FHIRString(array_merge($v, $ext[$i]))); + } } else { $this->addSearchRevInclude(new FHIRString($v)); } } } elseif ($data[self::FIELD_SEARCH_REV_INCLUDE] instanceof FHIRString) { $this->addSearchRevInclude($data[self::FIELD_SEARCH_REV_INCLUDE]); - } elseif ($ext && is_scalar($data[self::FIELD_SEARCH_REV_INCLUDE])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_SEARCH_REV_INCLUDE])) { $this->addSearchRevInclude(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SEARCH_REV_INCLUDE]] + $ext)); } else { $this->addSearchRevInclude(new FHIRString($data[self::FIELD_SEARCH_REV_INCLUDE])); @@ -402,8 +437,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TYPE] instanceof FHIRCode) { $this->setType($data[self::FIELD_TYPE]); - } elseif ($ext && is_scalar($data[self::FIELD_TYPE])) { - $this->setType(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TYPE])) { + $this->setType(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } else if (is_array($data[self::FIELD_TYPE])) { + $this->setType(new FHIRCode(array_merge($ext, $data[self::FIELD_TYPE]))); + } } else { $this->setType(new FHIRCode($data[self::FIELD_TYPE])); } @@ -414,8 +453,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_UPDATE_CREATE] instanceof FHIRBoolean) { $this->setUpdateCreate($data[self::FIELD_UPDATE_CREATE]); - } elseif ($ext && is_scalar($data[self::FIELD_UPDATE_CREATE])) { - $this->setUpdateCreate(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_UPDATE_CREATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_UPDATE_CREATE])) { + $this->setUpdateCreate(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_UPDATE_CREATE]] + $ext)); + } else if (is_array($data[self::FIELD_UPDATE_CREATE])) { + $this->setUpdateCreate(new FHIRBoolean(array_merge($ext, $data[self::FIELD_UPDATE_CREATE]))); + } } else { $this->setUpdateCreate(new FHIRBoolean($data[self::FIELD_UPDATE_CREATE])); } @@ -426,8 +469,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VERSIONING] instanceof FHIRResourceVersionPolicy) { $this->setVersioning($data[self::FIELD_VERSIONING]); - } elseif ($ext && is_scalar($data[self::FIELD_VERSIONING])) { - $this->setVersioning(new FHIRResourceVersionPolicy([FHIRResourceVersionPolicy::FIELD_VALUE => $data[self::FIELD_VERSIONING]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VERSIONING])) { + $this->setVersioning(new FHIRResourceVersionPolicy([FHIRResourceVersionPolicy::FIELD_VALUE => $data[self::FIELD_VERSIONING]] + $ext)); + } else if (is_array($data[self::FIELD_VERSIONING])) { + $this->setVersioning(new FHIRResourceVersionPolicy(array_merge($ext, $data[self::FIELD_VERSIONING]))); + } } else { $this->setVersioning(new FHIRResourceVersionPolicy($data[self::FIELD_VERSIONING])); } @@ -1141,14 +1188,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getConditionalCreate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CONDITIONAL_CREATE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getConditionalDelete())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CONDITIONAL_DELETE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getConditionalUpdate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CONDITIONAL_UPDATE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getInteraction())) { foreach($vs as $v) { if (null === $v) { @@ -1181,6 +1226,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_SEARCH_PARAM, null, $v->_getFHIRXMLNamespace())); } } + if ([] !== ($vs = $this->getSearchRevInclude())) { foreach($vs as $v) { if (null === $v) { @@ -1189,13 +1235,13 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_SEARCH_REV_INCLUDE, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getUpdateCreate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_UPDATE_CREATE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getVersioning())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VERSIONING, null, $v->_getFHIRXMLNamespace())); } @@ -1209,15 +1255,37 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getConditionalCreate())) { - $a[self::FIELD_CONDITIONAL_CREATE] = $v->getValue(); - $a[self::FIELD_CONDITIONAL_CREATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CONDITIONAL_CREATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CONDITIONAL_CREATE_EXT] = $enc; + } + } else { + $a[self::FIELD_CONDITIONAL_CREATE] = $v; + } } if (null !== ($v = $this->getConditionalDelete())) { - $a[self::FIELD_CONDITIONAL_DELETE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CONDITIONAL_DELETE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CONDITIONAL_DELETE_EXT] = $enc; + } + } else { + $a[self::FIELD_CONDITIONAL_DELETE] = $v; + } } if (null !== ($v = $this->getConditionalUpdate())) { - $a[self::FIELD_CONDITIONAL_UPDATE] = $v->getValue(); - $a[self::FIELD_CONDITIONAL_UPDATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CONDITIONAL_UPDATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CONDITIONAL_UPDATE_EXT] = $enc; + } + } else { + $a[self::FIELD_CONDITIONAL_UPDATE] = $v; + } } if ([] !== ($vs = $this->getInteraction())) { $a[self::FIELD_INTERACTION] = $vs; @@ -1226,8 +1294,15 @@ public function jsonSerialize() $a[self::FIELD_PROFILE] = $v; } if (null !== ($v = $this->getReadHistory())) { - $a[self::FIELD_READ_HISTORY] = $v->getValue(); - $a[self::FIELD_READ_HISTORY_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_READ_HISTORY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_READ_HISTORY_EXT] = $enc; + } + } else { + $a[self::FIELD_READ_HISTORY] = $v; + } } if ([] !== ($vs = $this->getSearchInclude())) { $a[self::FIELD_SEARCH_INCLUDE] = []; @@ -1235,8 +1310,17 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_SEARCH_INCLUDE][] = $v->getValue(); - $a[self::FIELD_SEARCH_INCLUDE_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SEARCH_INCLUDE][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SEARCH_INCLUDE_EXT][] = $enc; + } else { + $a[self::FIELD_SEARCH_INCLUDE_EXT][] = null; + } + } else { + $a[self::FIELD_SEARCH_INCLUDE][] = $v; + } } } if ([] !== ($vs = $this->getSearchParam())) { @@ -1248,20 +1332,51 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_SEARCH_REV_INCLUDE][] = $v->getValue(); - $a[self::FIELD_SEARCH_REV_INCLUDE_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SEARCH_REV_INCLUDE][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SEARCH_REV_INCLUDE_EXT][] = $enc; + } else { + $a[self::FIELD_SEARCH_REV_INCLUDE_EXT][] = null; + } + } else { + $a[self::FIELD_SEARCH_REV_INCLUDE][] = $v; + } } } if (null !== ($v = $this->getType())) { - $a[self::FIELD_TYPE] = $v->getValue(); - $a[self::FIELD_TYPE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TYPE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TYPE_EXT] = $enc; + } + } else { + $a[self::FIELD_TYPE] = $v; + } } if (null !== ($v = $this->getUpdateCreate())) { - $a[self::FIELD_UPDATE_CREATE] = $v->getValue(); - $a[self::FIELD_UPDATE_CREATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_UPDATE_CREATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_UPDATE_CREATE_EXT] = $enc; + } + } else { + $a[self::FIELD_UPDATE_CREATE] = $v; + } } if (null !== ($v = $this->getVersioning())) { - $a[self::FIELD_VERSIONING] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VERSIONING] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VERSIONING_EXT] = $enc; + } + } else { + $a[self::FIELD_VERSIONING] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceRest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceRest.php index d6c88fb878..ed45cfae81 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceRest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceRest.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -82,10 +82,6 @@ class FHIRConformanceRest extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONFORMANCE_DOT_REST; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_COMPARTMENT = 'compartment'; const FIELD_COMPARTMENT_EXT = '_compartment'; const FIELD_DOCUMENTATION = 'documentation'; @@ -206,6 +202,9 @@ class FHIRConformanceRest extends FHIRBackboneElement */ protected $transactionMode = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRConformanceRest Constructor * @param null|array $data @@ -228,17 +227,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_COMPARTMENT])) { foreach($data[self::FIELD_COMPARTMENT] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRUri) { $this->addCompartment($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addCompartment(new FHIRUri([FHIRUri::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addCompartment(new FHIRUri([FHIRUri::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addCompartment(new FHIRUri(array_merge($v, $ext[$i]))); + } } else { $this->addCompartment(new FHIRUri($v)); } } } elseif ($data[self::FIELD_COMPARTMENT] instanceof FHIRUri) { $this->addCompartment($data[self::FIELD_COMPARTMENT]); - } elseif ($ext && is_scalar($data[self::FIELD_COMPARTMENT])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_COMPARTMENT])) { $this->addCompartment(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_COMPARTMENT]] + $ext)); } else { $this->addCompartment(new FHIRUri($data[self::FIELD_COMPARTMENT])); @@ -250,8 +256,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DOCUMENTATION] instanceof FHIRString) { $this->setDocumentation($data[self::FIELD_DOCUMENTATION]); - } elseif ($ext && is_scalar($data[self::FIELD_DOCUMENTATION])) { - $this->setDocumentation(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DOCUMENTATION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DOCUMENTATION])) { + $this->setDocumentation(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DOCUMENTATION]] + $ext)); + } else if (is_array($data[self::FIELD_DOCUMENTATION])) { + $this->setDocumentation(new FHIRString(array_merge($ext, $data[self::FIELD_DOCUMENTATION]))); + } } else { $this->setDocumentation(new FHIRString($data[self::FIELD_DOCUMENTATION])); } @@ -259,6 +269,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_INTERACTION])) { if (is_array($data[self::FIELD_INTERACTION])) { foreach($data[self::FIELD_INTERACTION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRConformanceInteraction1) { $this->addInteraction($v); } else { @@ -277,8 +290,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MODE] instanceof FHIRRestfulConformanceMode) { $this->setMode($data[self::FIELD_MODE]); - } elseif ($ext && is_scalar($data[self::FIELD_MODE])) { - $this->setMode(new FHIRRestfulConformanceMode([FHIRRestfulConformanceMode::FIELD_VALUE => $data[self::FIELD_MODE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MODE])) { + $this->setMode(new FHIRRestfulConformanceMode([FHIRRestfulConformanceMode::FIELD_VALUE => $data[self::FIELD_MODE]] + $ext)); + } else if (is_array($data[self::FIELD_MODE])) { + $this->setMode(new FHIRRestfulConformanceMode(array_merge($ext, $data[self::FIELD_MODE]))); + } } else { $this->setMode(new FHIRRestfulConformanceMode($data[self::FIELD_MODE])); } @@ -286,6 +303,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_OPERATION])) { if (is_array($data[self::FIELD_OPERATION])) { foreach($data[self::FIELD_OPERATION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRConformanceOperation) { $this->addOperation($v); } else { @@ -301,6 +321,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_RESOURCE])) { if (is_array($data[self::FIELD_RESOURCE])) { foreach($data[self::FIELD_RESOURCE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRConformanceResource) { $this->addResource($v); } else { @@ -316,6 +339,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SEARCH_PARAM])) { if (is_array($data[self::FIELD_SEARCH_PARAM])) { foreach($data[self::FIELD_SEARCH_PARAM] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRConformanceSearchParam) { $this->addSearchParam($v); } else { @@ -341,8 +367,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TRANSACTION_MODE] instanceof FHIRTransactionMode) { $this->setTransactionMode($data[self::FIELD_TRANSACTION_MODE]); - } elseif ($ext && is_scalar($data[self::FIELD_TRANSACTION_MODE])) { - $this->setTransactionMode(new FHIRTransactionMode([FHIRTransactionMode::FIELD_VALUE => $data[self::FIELD_TRANSACTION_MODE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TRANSACTION_MODE])) { + $this->setTransactionMode(new FHIRTransactionMode([FHIRTransactionMode::FIELD_VALUE => $data[self::FIELD_TRANSACTION_MODE]] + $ext)); + } else if (is_array($data[self::FIELD_TRANSACTION_MODE])) { + $this->setTransactionMode(new FHIRTransactionMode(array_merge($ext, $data[self::FIELD_TRANSACTION_MODE]))); + } } else { $this->setTransactionMode(new FHIRTransactionMode($data[self::FIELD_TRANSACTION_MODE])); } @@ -935,10 +965,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_COMPARTMENT, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getDocumentation())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DOCUMENTATION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getInteraction())) { foreach($vs as $v) { if (null === $v) { @@ -951,7 +981,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getMode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MODE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getOperation())) { foreach($vs as $v) { if (null === $v) { @@ -982,7 +1011,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getSecurity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SECURITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getTransactionMode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TRANSACTION_MODE, null, $v->_getFHIRXMLNamespace())); } @@ -1001,19 +1029,43 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_COMPARTMENT][] = $v->getValue(); - $a[self::FIELD_COMPARTMENT_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_COMPARTMENT][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_COMPARTMENT_EXT][] = $enc; + } else { + $a[self::FIELD_COMPARTMENT_EXT][] = null; + } + } else { + $a[self::FIELD_COMPARTMENT][] = $v; + } } } if (null !== ($v = $this->getDocumentation())) { - $a[self::FIELD_DOCUMENTATION] = $v->getValue(); - $a[self::FIELD_DOCUMENTATION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DOCUMENTATION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DOCUMENTATION_EXT] = $enc; + } + } else { + $a[self::FIELD_DOCUMENTATION] = $v; + } } if ([] !== ($vs = $this->getInteraction())) { $a[self::FIELD_INTERACTION] = $vs; } if (null !== ($v = $this->getMode())) { - $a[self::FIELD_MODE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MODE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MODE_EXT] = $enc; + } + } else { + $a[self::FIELD_MODE] = $v; + } } if ([] !== ($vs = $this->getOperation())) { $a[self::FIELD_OPERATION] = $vs; @@ -1028,7 +1080,15 @@ public function jsonSerialize() $a[self::FIELD_SECURITY] = $v; } if (null !== ($v = $this->getTransactionMode())) { - $a[self::FIELD_TRANSACTION_MODE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TRANSACTION_MODE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TRANSACTION_MODE_EXT] = $enc; + } + } else { + $a[self::FIELD_TRANSACTION_MODE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceSearchParam.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceSearchParam.php index 361662a340..a68322e1c5 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceSearchParam.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceSearchParam.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -82,10 +82,6 @@ class FHIRConformanceSearchParam extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONFORMANCE_DOT_SEARCH_PARAM; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CHAIN = 'chain'; const FIELD_CHAIN_EXT = '_chain'; const FIELD_DEFINITION = 'definition'; @@ -188,6 +184,9 @@ class FHIRConformanceSearchParam extends FHIRBackboneElement */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRConformanceSearchParam Constructor * @param null|array $data @@ -210,17 +209,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_CHAIN])) { foreach($data[self::FIELD_CHAIN] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRString) { $this->addChain($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addChain(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addChain(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addChain(new FHIRString(array_merge($v, $ext[$i]))); + } } else { $this->addChain(new FHIRString($v)); } } } elseif ($data[self::FIELD_CHAIN] instanceof FHIRString) { $this->addChain($data[self::FIELD_CHAIN]); - } elseif ($ext && is_scalar($data[self::FIELD_CHAIN])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_CHAIN])) { $this->addChain(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_CHAIN]] + $ext)); } else { $this->addChain(new FHIRString($data[self::FIELD_CHAIN])); @@ -232,8 +238,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DEFINITION] instanceof FHIRUri) { $this->setDefinition($data[self::FIELD_DEFINITION]); - } elseif ($ext && is_scalar($data[self::FIELD_DEFINITION])) { - $this->setDefinition(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_DEFINITION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DEFINITION])) { + $this->setDefinition(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_DEFINITION]] + $ext)); + } else if (is_array($data[self::FIELD_DEFINITION])) { + $this->setDefinition(new FHIRUri(array_merge($ext, $data[self::FIELD_DEFINITION]))); + } } else { $this->setDefinition(new FHIRUri($data[self::FIELD_DEFINITION])); } @@ -244,8 +254,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DOCUMENTATION] instanceof FHIRString) { $this->setDocumentation($data[self::FIELD_DOCUMENTATION]); - } elseif ($ext && is_scalar($data[self::FIELD_DOCUMENTATION])) { - $this->setDocumentation(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DOCUMENTATION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DOCUMENTATION])) { + $this->setDocumentation(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DOCUMENTATION]] + $ext)); + } else if (is_array($data[self::FIELD_DOCUMENTATION])) { + $this->setDocumentation(new FHIRString(array_merge($ext, $data[self::FIELD_DOCUMENTATION]))); + } } else { $this->setDocumentation(new FHIRString($data[self::FIELD_DOCUMENTATION])); } @@ -256,17 +270,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_MODIFIER])) { foreach($data[self::FIELD_MODIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRSearchModifierCode) { $this->addModifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addModifier(new FHIRSearchModifierCode([FHIRSearchModifierCode::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addModifier(new FHIRSearchModifierCode([FHIRSearchModifierCode::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addModifier(new FHIRSearchModifierCode(array_merge($v, $ext[$i]))); + } } else { $this->addModifier(new FHIRSearchModifierCode($v)); } } } elseif ($data[self::FIELD_MODIFIER] instanceof FHIRSearchModifierCode) { $this->addModifier($data[self::FIELD_MODIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_MODIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_MODIFIER])) { $this->addModifier(new FHIRSearchModifierCode([FHIRSearchModifierCode::FIELD_VALUE => $data[self::FIELD_MODIFIER]] + $ext)); } else { $this->addModifier(new FHIRSearchModifierCode($data[self::FIELD_MODIFIER])); @@ -278,8 +299,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -290,17 +315,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_TARGET])) { foreach($data[self::FIELD_TARGET] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCode) { $this->addTarget($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addTarget(new FHIRCode([FHIRCode::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addTarget(new FHIRCode([FHIRCode::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addTarget(new FHIRCode(array_merge($v, $ext[$i]))); + } } else { $this->addTarget(new FHIRCode($v)); } } } elseif ($data[self::FIELD_TARGET] instanceof FHIRCode) { $this->addTarget($data[self::FIELD_TARGET]); - } elseif ($ext && is_scalar($data[self::FIELD_TARGET])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_TARGET])) { $this->addTarget(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_TARGET]] + $ext)); } else { $this->addTarget(new FHIRCode($data[self::FIELD_TARGET])); @@ -312,8 +344,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TYPE] instanceof FHIRCode) { $this->setType($data[self::FIELD_TYPE]); - } elseif ($ext && is_scalar($data[self::FIELD_TYPE])) { - $this->setType(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TYPE])) { + $this->setType(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } else if (is_array($data[self::FIELD_TYPE])) { + $this->setType(new FHIRCode(array_merge($ext, $data[self::FIELD_TYPE]))); + } } else { $this->setType(new FHIRCode($data[self::FIELD_TYPE])); } @@ -833,13 +869,13 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_CHAIN, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getDefinition())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFINITION, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getDocumentation())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DOCUMENTATION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getModifier())) { foreach($vs as $v) { if (null === $v) { @@ -848,6 +884,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_MODIFIER, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NAME, null, $v->_getFHIRXMLNamespace())); } @@ -859,6 +896,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_TARGET, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -877,24 +915,70 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_CHAIN][] = $v->getValue(); - $a[self::FIELD_CHAIN_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CHAIN][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CHAIN_EXT][] = $enc; + } else { + $a[self::FIELD_CHAIN_EXT][] = null; + } + } else { + $a[self::FIELD_CHAIN][] = $v; + } } } if (null !== ($v = $this->getDefinition())) { - $a[self::FIELD_DEFINITION] = $v->getValue(); - $a[self::FIELD_DEFINITION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DEFINITION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DEFINITION_EXT] = $enc; + } + } else { + $a[self::FIELD_DEFINITION] = $v; + } } if (null !== ($v = $this->getDocumentation())) { - $a[self::FIELD_DOCUMENTATION] = $v->getValue(); - $a[self::FIELD_DOCUMENTATION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DOCUMENTATION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DOCUMENTATION_EXT] = $enc; + } + } else { + $a[self::FIELD_DOCUMENTATION] = $v; + } } if ([] !== ($vs = $this->getModifier())) { - $a[self::FIELD_MODIFIER] = $vs; + $a[self::FIELD_MODIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MODIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MODIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_MODIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_MODIFIER][] = $v; + } + } } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if ([] !== ($vs = $this->getTarget())) { $a[self::FIELD_TARGET] = []; @@ -902,13 +986,29 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_TARGET][] = $v->getValue(); - $a[self::FIELD_TARGET_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TARGET][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TARGET_EXT][] = $enc; + } else { + $a[self::FIELD_TARGET_EXT][] = null; + } + } else { + $a[self::FIELD_TARGET][] = $v; + } } } if (null !== ($v = $this->getType())) { - $a[self::FIELD_TYPE] = $v->getValue(); - $a[self::FIELD_TYPE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TYPE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TYPE_EXT] = $enc; + } + } else { + $a[self::FIELD_TYPE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceSecurity.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceSecurity.php index 6621f200f5..62a8d002d8 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceSecurity.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceSecurity.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -81,10 +81,6 @@ class FHIRConformanceSecurity extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONFORMANCE_DOT_SECURITY; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CERTIFICATE = 'certificate'; const FIELD_CORS = 'cors'; const FIELD_CORS_EXT = '_cors'; @@ -137,6 +133,9 @@ class FHIRConformanceSecurity extends FHIRBackboneElement */ protected $service = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRConformanceSecurity Constructor * @param null|array $data @@ -156,6 +155,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CERTIFICATE])) { if (is_array($data[self::FIELD_CERTIFICATE])) { foreach($data[self::FIELD_CERTIFICATE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRConformanceCertificate) { $this->addCertificate($v); } else { @@ -174,8 +176,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CORS] instanceof FHIRBoolean) { $this->setCors($data[self::FIELD_CORS]); - } elseif ($ext && is_scalar($data[self::FIELD_CORS])) { - $this->setCors(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_CORS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CORS])) { + $this->setCors(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_CORS]] + $ext)); + } else if (is_array($data[self::FIELD_CORS])) { + $this->setCors(new FHIRBoolean(array_merge($ext, $data[self::FIELD_CORS]))); + } } else { $this->setCors(new FHIRBoolean($data[self::FIELD_CORS])); } @@ -186,8 +192,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -195,6 +205,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SERVICE])) { if (is_array($data[self::FIELD_SERVICE])) { foreach($data[self::FIELD_SERVICE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addService($v); } else { @@ -521,7 +534,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getCertificate())) { foreach($vs as $v) { if (null === $v) { @@ -530,13 +542,13 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_CERTIFICATE, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getCors())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CORS, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getDescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESCRIPTION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getService())) { foreach($vs as $v) { if (null === $v) { @@ -545,6 +557,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_SERVICE, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } @@ -558,12 +571,26 @@ public function jsonSerialize() $a[self::FIELD_CERTIFICATE] = $vs; } if (null !== ($v = $this->getCors())) { - $a[self::FIELD_CORS] = $v->getValue(); - $a[self::FIELD_CORS_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CORS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CORS_EXT] = $enc; + } + } else { + $a[self::FIELD_CORS] = $v; + } } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if ([] !== ($vs = $this->getService())) { $a[self::FIELD_SERVICE] = $vs; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceSoftware.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceSoftware.php index c40c3ef689..14cfa07ccf 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceSoftware.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceSoftware.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRConformanceSoftware extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONFORMANCE_DOT_SOFTWARE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_NAME = 'name'; const FIELD_NAME_EXT = '_name'; const FIELD_RELEASE_DATE = 'releaseDate'; @@ -127,6 +123,9 @@ class FHIRConformanceSoftware extends FHIRBackboneElement */ protected $version = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRConformanceSoftware Constructor * @param null|array $data @@ -149,8 +148,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -161,8 +164,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_RELEASE_DATE] instanceof FHIRDateTime) { $this->setReleaseDate($data[self::FIELD_RELEASE_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_RELEASE_DATE])) { - $this->setReleaseDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_RELEASE_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_RELEASE_DATE])) { + $this->setReleaseDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_RELEASE_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_RELEASE_DATE])) { + $this->setReleaseDate(new FHIRDateTime(array_merge($ext, $data[self::FIELD_RELEASE_DATE]))); + } } else { $this->setReleaseDate(new FHIRDateTime($data[self::FIELD_RELEASE_DATE])); } @@ -173,8 +180,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VERSION] instanceof FHIRString) { $this->setVersion($data[self::FIELD_VERSION]); - } elseif ($ext && is_scalar($data[self::FIELD_VERSION])) { - $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } else if (is_array($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString(array_merge($ext, $data[self::FIELD_VERSION]))); + } } else { $this->setVersion(new FHIRString($data[self::FIELD_VERSION])); } @@ -437,16 +448,37 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if (null !== ($v = $this->getReleaseDate())) { - $a[self::FIELD_RELEASE_DATE] = $v->getValue(); - $a[self::FIELD_RELEASE_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_RELEASE_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_RELEASE_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_RELEASE_DATE] = $v; + } } if (null !== ($v = $this->getVersion())) { - $a[self::FIELD_VERSION] = $v->getValue(); - $a[self::FIELD_VERSION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VERSION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VERSION_EXT] = $enc; + } + } else { + $a[self::FIELD_VERSION] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractActor.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractActor.php index 295b6d1cd0..04841470d8 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractActor.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractActor.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRContractActor extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONTRACT_DOT_ACTOR; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ENTITY = 'entity'; const FIELD_ROLE = 'role'; @@ -109,6 +105,9 @@ class FHIRContractActor extends FHIRBackboneElement */ protected $role = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRContractActor Constructor * @param null|array $data @@ -135,6 +134,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ROLE])) { if (is_array($data[self::FIELD_ROLE])) { foreach($data[self::FIELD_ROLE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addRole($v); } else { @@ -345,11 +347,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getEntity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ENTITY, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getRole())) { foreach($vs as $v) { if (null === $v) { @@ -358,6 +358,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_ROLE, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractActor1.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractActor1.php index e4b6f022d1..d65d30d57c 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractActor1.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractActor1.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRContractActor1 extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONTRACT_DOT_ACTOR_1; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ENTITY = 'entity'; const FIELD_ROLE = 'role'; @@ -109,6 +105,9 @@ class FHIRContractActor1 extends FHIRBackboneElement */ protected $role = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRContractActor1 Constructor * @param null|array $data @@ -135,6 +134,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ROLE])) { if (is_array($data[self::FIELD_ROLE])) { foreach($data[self::FIELD_ROLE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addRole($v); } else { @@ -345,11 +347,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getEntity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ENTITY, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getRole())) { foreach($vs as $v) { if (null === $v) { @@ -358,6 +358,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_ROLE, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractFriendly.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractFriendly.php index cb4bb9c2f6..b499e52d54 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractFriendly.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractFriendly.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRContractFriendly extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONTRACT_DOT_FRIENDLY; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CONTENT_ATTACHMENT = 'contentAttachment'; const FIELD_CONTENT_REFERENCE = 'contentReference'; @@ -110,6 +106,9 @@ class FHIRContractFriendly extends FHIRBackboneElement */ protected $contentReference = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRContractFriendly Constructor * @param null|array $data @@ -311,11 +310,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getContentAttachment())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CONTENT_ATTACHMENT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getContentReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CONTENT_REFERENCE, null, $v->_getFHIRXMLNamespace())); } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractLegal.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractLegal.php index 052e977358..8d979ac2e7 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractLegal.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractLegal.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRContractLegal extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONTRACT_DOT_LEGAL; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CONTENT_ATTACHMENT = 'contentAttachment'; const FIELD_CONTENT_REFERENCE = 'contentReference'; @@ -108,6 +104,9 @@ class FHIRContractLegal extends FHIRBackboneElement */ protected $contentReference = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRContractLegal Constructor * @param null|array $data @@ -305,11 +304,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getContentAttachment())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CONTENT_ATTACHMENT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getContentReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CONTENT_REFERENCE, null, $v->_getFHIRXMLNamespace())); } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractRule.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractRule.php index 7f6b8f1ba9..652c951189 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractRule.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractRule.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRContractRule extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONTRACT_DOT_RULE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CONTENT_ATTACHMENT = 'contentAttachment'; const FIELD_CONTENT_REFERENCE = 'contentReference'; @@ -110,6 +106,9 @@ class FHIRContractRule extends FHIRBackboneElement */ protected $contentReference = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRContractRule Constructor * @param null|array $data @@ -311,11 +310,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getContentAttachment())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CONTENT_ATTACHMENT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getContentReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CONTENT_REFERENCE, null, $v->_getFHIRXMLNamespace())); } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractSigner.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractSigner.php index 2ab87b931f..ccb99ed7a9 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractSigner.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractSigner.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRContractSigner extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONTRACT_DOT_SIGNER; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_PARTY = 'party'; const FIELD_SIGNATURE = 'signature'; const FIELD_SIGNATURE_EXT = '_signature'; @@ -122,6 +118,9 @@ class FHIRContractSigner extends FHIRBackboneElement */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRContractSigner Constructor * @param null|array $data @@ -151,8 +150,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SIGNATURE] instanceof FHIRString) { $this->setSignature($data[self::FIELD_SIGNATURE]); - } elseif ($ext && is_scalar($data[self::FIELD_SIGNATURE])) { - $this->setSignature(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SIGNATURE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SIGNATURE])) { + $this->setSignature(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SIGNATURE]] + $ext)); + } else if (is_array($data[self::FIELD_SIGNATURE])) { + $this->setSignature(new FHIRString(array_merge($ext, $data[self::FIELD_SIGNATURE]))); + } } else { $this->setSignature(new FHIRString($data[self::FIELD_SIGNATURE])); } @@ -375,14 +378,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getParty())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PARTY, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getSignature())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SIGNATURE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -399,8 +400,15 @@ public function jsonSerialize() $a[self::FIELD_PARTY] = $v; } if (null !== ($v = $this->getSignature())) { - $a[self::FIELD_SIGNATURE] = $v->getValue(); - $a[self::FIELD_SIGNATURE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SIGNATURE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SIGNATURE_EXT] = $enc; + } + } else { + $a[self::FIELD_SIGNATURE] = $v; + } } if (null !== ($v = $this->getType())) { $a[self::FIELD_TYPE] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractTerm.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractTerm.php index e6b9049074..a29fa0ea64 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractTerm.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractTerm.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -83,10 +83,6 @@ class FHIRContractTerm extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONTRACT_DOT_TERM; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ACTION = 'action'; const FIELD_ACTION_REASON = 'actionReason'; const FIELD_ACTOR = 'actor'; @@ -241,6 +237,9 @@ class FHIRContractTerm extends FHIRBackboneElement */ protected $valuedItem = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRContractTerm Constructor * @param null|array $data @@ -260,6 +259,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ACTION])) { if (is_array($data[self::FIELD_ACTION])) { foreach($data[self::FIELD_ACTION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addAction($v); } else { @@ -275,6 +277,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ACTION_REASON])) { if (is_array($data[self::FIELD_ACTION_REASON])) { foreach($data[self::FIELD_ACTION_REASON] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addActionReason($v); } else { @@ -290,6 +295,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ACTOR])) { if (is_array($data[self::FIELD_ACTOR])) { foreach($data[self::FIELD_ACTOR] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContractActor1) { $this->addActor($v); } else { @@ -312,6 +320,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_GROUP])) { if (is_array($data[self::FIELD_GROUP])) { foreach($data[self::FIELD_GROUP] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContractTerm) { $this->addGroup($v); } else { @@ -330,8 +341,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->setIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { - $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_IDENTIFIER]))); + } } else { $this->setIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); } @@ -342,8 +357,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ISSUED] instanceof FHIRDateTime) { $this->setIssued($data[self::FIELD_ISSUED]); - } elseif ($ext && is_scalar($data[self::FIELD_ISSUED])) { - $this->setIssued(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_ISSUED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ISSUED])) { + $this->setIssued(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_ISSUED]] + $ext)); + } else if (is_array($data[self::FIELD_ISSUED])) { + $this->setIssued(new FHIRDateTime(array_merge($ext, $data[self::FIELD_ISSUED]))); + } } else { $this->setIssued(new FHIRDateTime($data[self::FIELD_ISSUED])); } @@ -368,8 +387,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TEXT] instanceof FHIRString) { $this->setText($data[self::FIELD_TEXT]); - } elseif ($ext && is_scalar($data[self::FIELD_TEXT])) { - $this->setText(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TEXT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TEXT])) { + $this->setText(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TEXT]] + $ext)); + } else if (is_array($data[self::FIELD_TEXT])) { + $this->setText(new FHIRString(array_merge($ext, $data[self::FIELD_TEXT]))); + } } else { $this->setText(new FHIRString($data[self::FIELD_TEXT])); } @@ -384,6 +407,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_VALUED_ITEM])) { if (is_array($data[self::FIELD_VALUED_ITEM])) { foreach($data[self::FIELD_VALUED_ITEM] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContractValuedItem1) { $this->addValuedItem($v); } else { @@ -1066,7 +1092,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getAction())) { foreach($vs as $v) { if (null === $v) { @@ -1097,7 +1122,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getApplies())) { $v->xmlSerialize($sxe->addChild(self::FIELD_APPLIES, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getGroup())) { foreach($vs as $v) { if (null === $v) { @@ -1113,22 +1137,18 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getIssued())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ISSUED, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSubType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUB_TYPE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSubject())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBJECT, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getText())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TEXT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getValuedItem())) { foreach($vs as $v) { if (null === $v) { @@ -1137,6 +1157,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_VALUED_ITEM, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } @@ -1162,11 +1183,26 @@ public function jsonSerialize() $a[self::FIELD_GROUP] = $vs; } if (null !== ($v = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_IDENTIFIER] = $v; + } } if (null !== ($v = $this->getIssued())) { - $a[self::FIELD_ISSUED] = $v->getValue(); - $a[self::FIELD_ISSUED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ISSUED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ISSUED_EXT] = $enc; + } + } else { + $a[self::FIELD_ISSUED] = $v; + } } if (null !== ($v = $this->getSubType())) { $a[self::FIELD_SUB_TYPE] = $v; @@ -1175,8 +1211,15 @@ public function jsonSerialize() $a[self::FIELD_SUBJECT] = $v; } if (null !== ($v = $this->getText())) { - $a[self::FIELD_TEXT] = $v->getValue(); - $a[self::FIELD_TEXT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TEXT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TEXT_EXT] = $enc; + } + } else { + $a[self::FIELD_TEXT] = $v; + } } if (null !== ($v = $this->getType())) { $a[self::FIELD_TYPE] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractValuedItem.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractValuedItem.php index b245403263..f54d34e075 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractValuedItem.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractValuedItem.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -84,10 +84,6 @@ class FHIRContractValuedItem extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONTRACT_DOT_VALUED_ITEM; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_EFFECTIVE_TIME = 'effectiveTime'; const FIELD_EFFECTIVE_TIME_EXT = '_effectiveTime'; const FIELD_ENTITY_CODEABLE_CONCEPT = 'entityCodeableConcept'; @@ -97,10 +93,13 @@ class FHIRContractValuedItem extends FHIRBackboneElement const FIELD_IDENTIFIER = 'identifier'; const FIELD_IDENTIFIER_EXT = '_identifier'; const FIELD_NET = 'net'; + const FIELD_NET_EXT = '_net'; const FIELD_POINTS = 'points'; const FIELD_POINTS_EXT = '_points'; const FIELD_QUANTITY = 'quantity'; + const FIELD_QUANTITY_EXT = '_quantity'; const FIELD_UNIT_PRICE = 'unitPrice'; + const FIELD_UNIT_PRICE_EXT = '_unitPrice'; /** * A date, date-time or partial date (e.g. just year or year + month). If hours and @@ -205,6 +204,9 @@ class FHIRContractValuedItem extends FHIRBackboneElement */ protected $unitPrice = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRContractValuedItem Constructor * @param null|array $data @@ -227,8 +229,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EFFECTIVE_TIME] instanceof FHIRDateTime) { $this->setEffectiveTime($data[self::FIELD_EFFECTIVE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_EFFECTIVE_TIME])) { - $this->setEffectiveTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_EFFECTIVE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EFFECTIVE_TIME])) { + $this->setEffectiveTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_EFFECTIVE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_EFFECTIVE_TIME])) { + $this->setEffectiveTime(new FHIRDateTime(array_merge($ext, $data[self::FIELD_EFFECTIVE_TIME]))); + } } else { $this->setEffectiveTime(new FHIRDateTime($data[self::FIELD_EFFECTIVE_TIME])); } @@ -253,8 +259,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_FACTOR] instanceof FHIRDecimal) { $this->setFactor($data[self::FIELD_FACTOR]); - } elseif ($ext && is_scalar($data[self::FIELD_FACTOR])) { - $this->setFactor(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_FACTOR]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_FACTOR])) { + $this->setFactor(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_FACTOR]] + $ext)); + } else if (is_array($data[self::FIELD_FACTOR])) { + $this->setFactor(new FHIRDecimal(array_merge($ext, $data[self::FIELD_FACTOR]))); + } } else { $this->setFactor(new FHIRDecimal($data[self::FIELD_FACTOR])); } @@ -265,15 +275,28 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->setIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { - $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_IDENTIFIER]))); + } } else { $this->setIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); } } if (isset($data[self::FIELD_NET])) { + $ext = (isset($data[self::FIELD_NET_EXT]) && is_array($data[self::FIELD_NET_EXT])) + ? $data[self::FIELD_NET_EXT] + : null; if ($data[self::FIELD_NET] instanceof FHIRMoney) { $this->setNet($data[self::FIELD_NET]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NET])) { + $this->setNet(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_NET]] + $ext)); + } else if (is_array($data[self::FIELD_NET])) { + $this->setNet(new FHIRMoney(array_merge($ext, $data[self::FIELD_NET]))); + } } else { $this->setNet(new FHIRMoney($data[self::FIELD_NET])); } @@ -284,22 +307,44 @@ public function __construct($data = null) : null; if ($data[self::FIELD_POINTS] instanceof FHIRDecimal) { $this->setPoints($data[self::FIELD_POINTS]); - } elseif ($ext && is_scalar($data[self::FIELD_POINTS])) { - $this->setPoints(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_POINTS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_POINTS])) { + $this->setPoints(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_POINTS]] + $ext)); + } else if (is_array($data[self::FIELD_POINTS])) { + $this->setPoints(new FHIRDecimal(array_merge($ext, $data[self::FIELD_POINTS]))); + } } else { $this->setPoints(new FHIRDecimal($data[self::FIELD_POINTS])); } } if (isset($data[self::FIELD_QUANTITY])) { + $ext = (isset($data[self::FIELD_QUANTITY_EXT]) && is_array($data[self::FIELD_QUANTITY_EXT])) + ? $data[self::FIELD_QUANTITY_EXT] + : null; if ($data[self::FIELD_QUANTITY] instanceof FHIRSimpleQuantity) { $this->setQuantity($data[self::FIELD_QUANTITY]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_QUANTITY])) { + $this->setQuantity(new FHIRSimpleQuantity([FHIRSimpleQuantity::FIELD_VALUE => $data[self::FIELD_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_QUANTITY])) { + $this->setQuantity(new FHIRSimpleQuantity(array_merge($ext, $data[self::FIELD_QUANTITY]))); + } } else { $this->setQuantity(new FHIRSimpleQuantity($data[self::FIELD_QUANTITY])); } } if (isset($data[self::FIELD_UNIT_PRICE])) { + $ext = (isset($data[self::FIELD_UNIT_PRICE_EXT]) && is_array($data[self::FIELD_UNIT_PRICE_EXT])) + ? $data[self::FIELD_UNIT_PRICE_EXT] + : null; if ($data[self::FIELD_UNIT_PRICE] instanceof FHIRMoney) { $this->setUnitPrice($data[self::FIELD_UNIT_PRICE]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_UNIT_PRICE])) { + $this->setUnitPrice(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_UNIT_PRICE]] + $ext)); + } else if (is_array($data[self::FIELD_UNIT_PRICE])) { + $this->setUnitPrice(new FHIRMoney(array_merge($ext, $data[self::FIELD_UNIT_PRICE]))); + } } else { $this->setUnitPrice(new FHIRMoney($data[self::FIELD_UNIT_PRICE])); } @@ -746,33 +791,27 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getEffectiveTime())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EFFECTIVE_TIME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getEntityCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ENTITY_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getEntityReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ENTITY_REFERENCE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getFactor())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FACTOR, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getNet())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NET, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getPoints())) { $v->xmlSerialize($sxe->addChild(self::FIELD_POINTS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_QUANTITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getUnitPrice())) { $v->xmlSerialize($sxe->addChild(self::FIELD_UNIT_PRICE, null, $v->_getFHIRXMLNamespace())); } @@ -786,8 +825,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getEffectiveTime())) { - $a[self::FIELD_EFFECTIVE_TIME] = $v->getValue(); - $a[self::FIELD_EFFECTIVE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EFFECTIVE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EFFECTIVE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_EFFECTIVE_TIME] = $v; + } } if (null !== ($v = $this->getEntityCodeableConcept())) { $a[self::FIELD_ENTITY_CODEABLE_CONCEPT] = $v; @@ -796,24 +842,70 @@ public function jsonSerialize() $a[self::FIELD_ENTITY_REFERENCE] = $v; } if (null !== ($v = $this->getFactor())) { - $a[self::FIELD_FACTOR] = $v->getValue(); - $a[self::FIELD_FACTOR_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FACTOR] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FACTOR_EXT] = $enc; + } + } else { + $a[self::FIELD_FACTOR] = $v; + } } if (null !== ($v = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_IDENTIFIER] = $v; + } } if (null !== ($v = $this->getNet())) { - $a[self::FIELD_NET] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NET] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NET_EXT] = $enc; + } + } else { + $a[self::FIELD_NET] = $v; + } } if (null !== ($v = $this->getPoints())) { - $a[self::FIELD_POINTS] = $v->getValue(); - $a[self::FIELD_POINTS_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_POINTS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_POINTS_EXT] = $enc; + } + } else { + $a[self::FIELD_POINTS] = $v; + } } if (null !== ($v = $this->getQuantity())) { - $a[self::FIELD_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_QUANTITY] = $v; + } } if (null !== ($v = $this->getUnitPrice())) { - $a[self::FIELD_UNIT_PRICE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_UNIT_PRICE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_UNIT_PRICE_EXT] = $enc; + } + } else { + $a[self::FIELD_UNIT_PRICE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractValuedItem1.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractValuedItem1.php index 21495ebfd2..28e6a1189c 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractValuedItem1.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractValuedItem1.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -84,10 +84,6 @@ class FHIRContractValuedItem1 extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONTRACT_DOT_VALUED_ITEM_1; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_EFFECTIVE_TIME = 'effectiveTime'; const FIELD_EFFECTIVE_TIME_EXT = '_effectiveTime'; const FIELD_ENTITY_CODEABLE_CONCEPT = 'entityCodeableConcept'; @@ -97,10 +93,13 @@ class FHIRContractValuedItem1 extends FHIRBackboneElement const FIELD_IDENTIFIER = 'identifier'; const FIELD_IDENTIFIER_EXT = '_identifier'; const FIELD_NET = 'net'; + const FIELD_NET_EXT = '_net'; const FIELD_POINTS = 'points'; const FIELD_POINTS_EXT = '_points'; const FIELD_QUANTITY = 'quantity'; + const FIELD_QUANTITY_EXT = '_quantity'; const FIELD_UNIT_PRICE = 'unitPrice'; + const FIELD_UNIT_PRICE_EXT = '_unitPrice'; /** * A date, date-time or partial date (e.g. just year or year + month). If hours and @@ -207,6 +206,9 @@ class FHIRContractValuedItem1 extends FHIRBackboneElement */ protected $unitPrice = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRContractValuedItem1 Constructor * @param null|array $data @@ -229,8 +231,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EFFECTIVE_TIME] instanceof FHIRDateTime) { $this->setEffectiveTime($data[self::FIELD_EFFECTIVE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_EFFECTIVE_TIME])) { - $this->setEffectiveTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_EFFECTIVE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EFFECTIVE_TIME])) { + $this->setEffectiveTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_EFFECTIVE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_EFFECTIVE_TIME])) { + $this->setEffectiveTime(new FHIRDateTime(array_merge($ext, $data[self::FIELD_EFFECTIVE_TIME]))); + } } else { $this->setEffectiveTime(new FHIRDateTime($data[self::FIELD_EFFECTIVE_TIME])); } @@ -255,8 +261,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_FACTOR] instanceof FHIRDecimal) { $this->setFactor($data[self::FIELD_FACTOR]); - } elseif ($ext && is_scalar($data[self::FIELD_FACTOR])) { - $this->setFactor(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_FACTOR]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_FACTOR])) { + $this->setFactor(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_FACTOR]] + $ext)); + } else if (is_array($data[self::FIELD_FACTOR])) { + $this->setFactor(new FHIRDecimal(array_merge($ext, $data[self::FIELD_FACTOR]))); + } } else { $this->setFactor(new FHIRDecimal($data[self::FIELD_FACTOR])); } @@ -267,15 +277,28 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->setIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { - $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_IDENTIFIER]))); + } } else { $this->setIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); } } if (isset($data[self::FIELD_NET])) { + $ext = (isset($data[self::FIELD_NET_EXT]) && is_array($data[self::FIELD_NET_EXT])) + ? $data[self::FIELD_NET_EXT] + : null; if ($data[self::FIELD_NET] instanceof FHIRMoney) { $this->setNet($data[self::FIELD_NET]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NET])) { + $this->setNet(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_NET]] + $ext)); + } else if (is_array($data[self::FIELD_NET])) { + $this->setNet(new FHIRMoney(array_merge($ext, $data[self::FIELD_NET]))); + } } else { $this->setNet(new FHIRMoney($data[self::FIELD_NET])); } @@ -286,22 +309,44 @@ public function __construct($data = null) : null; if ($data[self::FIELD_POINTS] instanceof FHIRDecimal) { $this->setPoints($data[self::FIELD_POINTS]); - } elseif ($ext && is_scalar($data[self::FIELD_POINTS])) { - $this->setPoints(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_POINTS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_POINTS])) { + $this->setPoints(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_POINTS]] + $ext)); + } else if (is_array($data[self::FIELD_POINTS])) { + $this->setPoints(new FHIRDecimal(array_merge($ext, $data[self::FIELD_POINTS]))); + } } else { $this->setPoints(new FHIRDecimal($data[self::FIELD_POINTS])); } } if (isset($data[self::FIELD_QUANTITY])) { + $ext = (isset($data[self::FIELD_QUANTITY_EXT]) && is_array($data[self::FIELD_QUANTITY_EXT])) + ? $data[self::FIELD_QUANTITY_EXT] + : null; if ($data[self::FIELD_QUANTITY] instanceof FHIRSimpleQuantity) { $this->setQuantity($data[self::FIELD_QUANTITY]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_QUANTITY])) { + $this->setQuantity(new FHIRSimpleQuantity([FHIRSimpleQuantity::FIELD_VALUE => $data[self::FIELD_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_QUANTITY])) { + $this->setQuantity(new FHIRSimpleQuantity(array_merge($ext, $data[self::FIELD_QUANTITY]))); + } } else { $this->setQuantity(new FHIRSimpleQuantity($data[self::FIELD_QUANTITY])); } } if (isset($data[self::FIELD_UNIT_PRICE])) { + $ext = (isset($data[self::FIELD_UNIT_PRICE_EXT]) && is_array($data[self::FIELD_UNIT_PRICE_EXT])) + ? $data[self::FIELD_UNIT_PRICE_EXT] + : null; if ($data[self::FIELD_UNIT_PRICE] instanceof FHIRMoney) { $this->setUnitPrice($data[self::FIELD_UNIT_PRICE]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_UNIT_PRICE])) { + $this->setUnitPrice(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_UNIT_PRICE]] + $ext)); + } else if (is_array($data[self::FIELD_UNIT_PRICE])) { + $this->setUnitPrice(new FHIRMoney(array_merge($ext, $data[self::FIELD_UNIT_PRICE]))); + } } else { $this->setUnitPrice(new FHIRMoney($data[self::FIELD_UNIT_PRICE])); } @@ -752,33 +797,27 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getEffectiveTime())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EFFECTIVE_TIME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getEntityCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ENTITY_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getEntityReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ENTITY_REFERENCE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getFactor())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FACTOR, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getNet())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NET, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getPoints())) { $v->xmlSerialize($sxe->addChild(self::FIELD_POINTS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_QUANTITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getUnitPrice())) { $v->xmlSerialize($sxe->addChild(self::FIELD_UNIT_PRICE, null, $v->_getFHIRXMLNamespace())); } @@ -792,8 +831,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getEffectiveTime())) { - $a[self::FIELD_EFFECTIVE_TIME] = $v->getValue(); - $a[self::FIELD_EFFECTIVE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EFFECTIVE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EFFECTIVE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_EFFECTIVE_TIME] = $v; + } } if (null !== ($v = $this->getEntityCodeableConcept())) { $a[self::FIELD_ENTITY_CODEABLE_CONCEPT] = $v; @@ -802,24 +848,70 @@ public function jsonSerialize() $a[self::FIELD_ENTITY_REFERENCE] = $v; } if (null !== ($v = $this->getFactor())) { - $a[self::FIELD_FACTOR] = $v->getValue(); - $a[self::FIELD_FACTOR_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FACTOR] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FACTOR_EXT] = $enc; + } + } else { + $a[self::FIELD_FACTOR] = $v; + } } if (null !== ($v = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_IDENTIFIER] = $v; + } } if (null !== ($v = $this->getNet())) { - $a[self::FIELD_NET] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NET] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NET_EXT] = $enc; + } + } else { + $a[self::FIELD_NET] = $v; + } } if (null !== ($v = $this->getPoints())) { - $a[self::FIELD_POINTS] = $v->getValue(); - $a[self::FIELD_POINTS_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_POINTS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_POINTS_EXT] = $enc; + } + } else { + $a[self::FIELD_POINTS] = $v; + } } if (null !== ($v = $this->getQuantity())) { - $a[self::FIELD_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_QUANTITY] = $v; + } } if (null !== ($v = $this->getUnitPrice())) { - $a[self::FIELD_UNIT_PRICE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_UNIT_PRICE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_UNIT_PRICE_EXT] = $enc; + } + } else { + $a[self::FIELD_UNIT_PRICE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRDataElement/FHIRDataElementContact.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRDataElement/FHIRDataElementContact.php index 2d242b150a..21924bc162 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRDataElement/FHIRDataElementContact.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRDataElement/FHIRDataElementContact.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRDataElementContact extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DATA_ELEMENT_DOT_CONTACT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_NAME = 'name'; const FIELD_NAME_EXT = '_name'; const FIELD_TELECOM = 'telecom'; @@ -111,6 +107,9 @@ class FHIRDataElementContact extends FHIRBackboneElement */ protected $telecom = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRDataElementContact Constructor * @param null|array $data @@ -133,8 +132,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -145,17 +148,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_TELECOM])) { foreach($data[self::FIELD_TELECOM] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContactPoint) { $this->addTelecom($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addTelecom(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addTelecom(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addTelecom(new FHIRContactPoint(array_merge($v, $ext[$i]))); + } } else { $this->addTelecom(new FHIRContactPoint($v)); } } } elseif ($data[self::FIELD_TELECOM] instanceof FHIRContactPoint) { $this->addTelecom($data[self::FIELD_TELECOM]); - } elseif ($ext && is_scalar($data[self::FIELD_TELECOM])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_TELECOM])) { $this->addTelecom(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $data[self::FIELD_TELECOM]] + $ext)); } else { $this->addTelecom(new FHIRContactPoint($data[self::FIELD_TELECOM])); @@ -373,7 +383,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NAME, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getTelecom())) { foreach($vs as $v) { if (null === $v) { @@ -382,6 +391,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_TELECOM, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } @@ -392,11 +402,34 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if ([] !== ($vs = $this->getTelecom())) { - $a[self::FIELD_TELECOM] = $vs; + $a[self::FIELD_TELECOM] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TELECOM][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TELECOM_EXT][] = $enc; + } else { + $a[self::FIELD_TELECOM_EXT][] = null; + } + } else { + $a[self::FIELD_TELECOM][] = $v; + } + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRDataElement/FHIRDataElementMapping.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRDataElement/FHIRDataElementMapping.php index 5670704d9c..c4aebdf654 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRDataElement/FHIRDataElementMapping.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRDataElement/FHIRDataElementMapping.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRDataElementMapping extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DATA_ELEMENT_DOT_MAPPING; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_COMMENTS = 'comments'; const FIELD_COMMENTS_EXT = '_comments'; const FIELD_IDENTITY = 'identity'; @@ -143,6 +139,9 @@ class FHIRDataElementMapping extends FHIRBackboneElement */ protected $uri = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRDataElementMapping Constructor * @param null|array $data @@ -165,8 +164,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_COMMENTS] instanceof FHIRString) { $this->setComments($data[self::FIELD_COMMENTS]); - } elseif ($ext && is_scalar($data[self::FIELD_COMMENTS])) { - $this->setComments(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_COMMENTS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_COMMENTS])) { + $this->setComments(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_COMMENTS]] + $ext)); + } else if (is_array($data[self::FIELD_COMMENTS])) { + $this->setComments(new FHIRString(array_merge($ext, $data[self::FIELD_COMMENTS]))); + } } else { $this->setComments(new FHIRString($data[self::FIELD_COMMENTS])); } @@ -177,8 +180,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IDENTITY] instanceof FHIRId) { $this->setIdentity($data[self::FIELD_IDENTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTITY])) { - $this->setIdentity(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_IDENTITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IDENTITY])) { + $this->setIdentity(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_IDENTITY]] + $ext)); + } else if (is_array($data[self::FIELD_IDENTITY])) { + $this->setIdentity(new FHIRId(array_merge($ext, $data[self::FIELD_IDENTITY]))); + } } else { $this->setIdentity(new FHIRId($data[self::FIELD_IDENTITY])); } @@ -189,8 +196,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -201,8 +212,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_URI] instanceof FHIRUri) { $this->setUri($data[self::FIELD_URI]); - } elseif ($ext && is_scalar($data[self::FIELD_URI])) { - $this->setUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URI]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_URI])) { + $this->setUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URI]] + $ext)); + } else if (is_array($data[self::FIELD_URI])) { + $this->setUri(new FHIRUri(array_merge($ext, $data[self::FIELD_URI]))); + } } else { $this->setUri(new FHIRUri($data[self::FIELD_URI])); } @@ -518,20 +533,48 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getComments())) { - $a[self::FIELD_COMMENTS] = $v->getValue(); - $a[self::FIELD_COMMENTS_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_COMMENTS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_COMMENTS_EXT] = $enc; + } + } else { + $a[self::FIELD_COMMENTS] = $v; + } } if (null !== ($v = $this->getIdentity())) { - $a[self::FIELD_IDENTITY] = $v->getValue(); - $a[self::FIELD_IDENTITY_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_IDENTITY] = $v; + } } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if (null !== ($v = $this->getUri())) { - $a[self::FIELD_URI] = $v->getValue(); - $a[self::FIELD_URI_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_URI] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_URI_EXT] = $enc; + } + } else { + $a[self::FIELD_URI] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRDetectedIssue/FHIRDetectedIssueMitigation.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRDetectedIssue/FHIRDetectedIssueMitigation.php index e73c3623df..9f0dd2014c 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRDetectedIssue/FHIRDetectedIssueMitigation.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRDetectedIssue/FHIRDetectedIssueMitigation.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -81,10 +81,6 @@ class FHIRDetectedIssueMitigation extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DETECTED_ISSUE_DOT_MITIGATION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ACTION = 'action'; const FIELD_AUTHOR = 'author'; const FIELD_DATE = 'date'; @@ -129,6 +125,9 @@ class FHIRDetectedIssueMitigation extends FHIRBackboneElement */ protected $date = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRDetectedIssueMitigation Constructor * @param null|array $data @@ -165,8 +164,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATE] instanceof FHIRDateTime) { $this->setDate($data[self::FIELD_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_DATE])) { - $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime(array_merge($ext, $data[self::FIELD_DATE]))); + } } else { $this->setDate(new FHIRDateTime($data[self::FIELD_DATE])); } @@ -394,11 +397,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getAction())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ACTION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getAuthor())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AUTHOR, null, $v->_getFHIRXMLNamespace())); } @@ -421,8 +422,15 @@ public function jsonSerialize() $a[self::FIELD_AUTHOR] = $v; } if (null !== ($v = $this->getDate())) { - $a[self::FIELD_DATE] = $v->getValue(); - $a[self::FIELD_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_DATE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRDeviceComponent/FHIRDeviceComponentProductionSpecification.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRDeviceComponent/FHIRDeviceComponentProductionSpecification.php index ad2f819034..c8ac25db29 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRDeviceComponent/FHIRDeviceComponentProductionSpecification.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRDeviceComponent/FHIRDeviceComponentProductionSpecification.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRDeviceComponentProductionSpecification extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DEVICE_COMPONENT_DOT_PRODUCTION_SPECIFICATION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_COMPONENT_ID = 'componentId'; const FIELD_COMPONENT_ID_EXT = '_componentId'; const FIELD_PRODUCTION_SPEC = 'productionSpec'; @@ -127,6 +123,9 @@ class FHIRDeviceComponentProductionSpecification extends FHIRBackboneElement */ protected $specType = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRDeviceComponentProductionSpecification Constructor * @param null|array $data @@ -149,8 +148,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_COMPONENT_ID] instanceof FHIRIdentifier) { $this->setComponentId($data[self::FIELD_COMPONENT_ID]); - } elseif ($ext && is_scalar($data[self::FIELD_COMPONENT_ID])) { - $this->setComponentId(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_COMPONENT_ID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_COMPONENT_ID])) { + $this->setComponentId(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_COMPONENT_ID]] + $ext)); + } else if (is_array($data[self::FIELD_COMPONENT_ID])) { + $this->setComponentId(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_COMPONENT_ID]))); + } } else { $this->setComponentId(new FHIRIdentifier($data[self::FIELD_COMPONENT_ID])); } @@ -161,8 +164,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PRODUCTION_SPEC] instanceof FHIRString) { $this->setProductionSpec($data[self::FIELD_PRODUCTION_SPEC]); - } elseif ($ext && is_scalar($data[self::FIELD_PRODUCTION_SPEC])) { - $this->setProductionSpec(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PRODUCTION_SPEC]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PRODUCTION_SPEC])) { + $this->setProductionSpec(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PRODUCTION_SPEC]] + $ext)); + } else if (is_array($data[self::FIELD_PRODUCTION_SPEC])) { + $this->setProductionSpec(new FHIRString(array_merge($ext, $data[self::FIELD_PRODUCTION_SPEC]))); + } } else { $this->setProductionSpec(new FHIRString($data[self::FIELD_PRODUCTION_SPEC])); } @@ -393,14 +400,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getComponentId())) { $v->xmlSerialize($sxe->addChild(self::FIELD_COMPONENT_ID, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getProductionSpec())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PRODUCTION_SPEC, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSpecType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SPEC_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -414,11 +419,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getComponentId())) { - $a[self::FIELD_COMPONENT_ID] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_COMPONENT_ID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_COMPONENT_ID_EXT] = $enc; + } + } else { + $a[self::FIELD_COMPONENT_ID] = $v; + } } if (null !== ($v = $this->getProductionSpec())) { - $a[self::FIELD_PRODUCTION_SPEC] = $v->getValue(); - $a[self::FIELD_PRODUCTION_SPEC_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PRODUCTION_SPEC] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PRODUCTION_SPEC_EXT] = $enc; + } + } else { + $a[self::FIELD_PRODUCTION_SPEC] = $v; + } } if (null !== ($v = $this->getSpecType())) { $a[self::FIELD_SPEC_TYPE] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRDeviceMetric/FHIRDeviceMetricCalibration.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRDeviceMetric/FHIRDeviceMetricCalibration.php index 30a82556f2..bbd89cebb7 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRDeviceMetric/FHIRDeviceMetricCalibration.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRDeviceMetric/FHIRDeviceMetricCalibration.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRDeviceMetricCalibration extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DEVICE_METRIC_DOT_CALIBRATION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_STATE = 'state'; const FIELD_STATE_EXT = '_state'; const FIELD_TIME = 'time'; @@ -123,6 +119,9 @@ class FHIRDeviceMetricCalibration extends FHIRBackboneElement */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRDeviceMetricCalibration Constructor * @param null|array $data @@ -145,8 +144,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATE] instanceof FHIRDeviceMetricCalibrationState) { $this->setState($data[self::FIELD_STATE]); - } elseif ($ext && is_scalar($data[self::FIELD_STATE])) { - $this->setState(new FHIRDeviceMetricCalibrationState([FHIRDeviceMetricCalibrationState::FIELD_VALUE => $data[self::FIELD_STATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATE])) { + $this->setState(new FHIRDeviceMetricCalibrationState([FHIRDeviceMetricCalibrationState::FIELD_VALUE => $data[self::FIELD_STATE]] + $ext)); + } else if (is_array($data[self::FIELD_STATE])) { + $this->setState(new FHIRDeviceMetricCalibrationState(array_merge($ext, $data[self::FIELD_STATE]))); + } } else { $this->setState(new FHIRDeviceMetricCalibrationState($data[self::FIELD_STATE])); } @@ -157,8 +160,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TIME] instanceof FHIRInstant) { $this->setTime($data[self::FIELD_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_TIME])) { - $this->setTime(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TIME])) { + $this->setTime(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_TIME])) { + $this->setTime(new FHIRInstant(array_merge($ext, $data[self::FIELD_TIME]))); + } } else { $this->setTime(new FHIRInstant($data[self::FIELD_TIME])); } @@ -169,8 +176,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TYPE] instanceof FHIRDeviceMetricCalibrationType) { $this->setType($data[self::FIELD_TYPE]); - } elseif ($ext && is_scalar($data[self::FIELD_TYPE])) { - $this->setType(new FHIRDeviceMetricCalibrationType([FHIRDeviceMetricCalibrationType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TYPE])) { + $this->setType(new FHIRDeviceMetricCalibrationType([FHIRDeviceMetricCalibrationType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } else if (is_array($data[self::FIELD_TYPE])) { + $this->setType(new FHIRDeviceMetricCalibrationType(array_merge($ext, $data[self::FIELD_TYPE]))); + } } else { $this->setType(new FHIRDeviceMetricCalibrationType($data[self::FIELD_TYPE])); } @@ -386,14 +397,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getState())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getTime())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TIME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -407,14 +416,37 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getState())) { - $a[self::FIELD_STATE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATE_EXT] = $enc; + } + } else { + $a[self::FIELD_STATE] = $v; + } } if (null !== ($v = $this->getTime())) { - $a[self::FIELD_TIME] = $v->getValue(); - $a[self::FIELD_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_TIME] = $v; + } } if (null !== ($v = $this->getType())) { - $a[self::FIELD_TYPE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TYPE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TYPE_EXT] = $enc; + } + } else { + $a[self::FIELD_TYPE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRDiagnosticOrder/FHIRDiagnosticOrderEvent.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRDiagnosticOrder/FHIRDiagnosticOrderEvent.php index 66597e0533..e7f1ffad39 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRDiagnosticOrder/FHIRDiagnosticOrderEvent.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRDiagnosticOrder/FHIRDiagnosticOrderEvent.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRDiagnosticOrderEvent extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DIAGNOSTIC_ORDER_DOT_EVENT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ACTOR = 'actor'; const FIELD_DATE_TIME = 'dateTime'; const FIELD_DATE_TIME_EXT = '_dateTime'; @@ -139,6 +135,9 @@ class FHIRDiagnosticOrderEvent extends FHIRBackboneElement */ protected $status = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRDiagnosticOrderEvent Constructor * @param null|array $data @@ -168,8 +167,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATE_TIME] instanceof FHIRDateTime) { $this->setDateTime($data[self::FIELD_DATE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_DATE_TIME])) { - $this->setDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATE_TIME])) { + $this->setDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_DATE_TIME])) { + $this->setDateTime(new FHIRDateTime(array_merge($ext, $data[self::FIELD_DATE_TIME]))); + } } else { $this->setDateTime(new FHIRDateTime($data[self::FIELD_DATE_TIME])); } @@ -187,8 +190,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRDiagnosticOrderStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRDiagnosticOrderStatus([FHIRDiagnosticOrderStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRDiagnosticOrderStatus([FHIRDiagnosticOrderStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRDiagnosticOrderStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRDiagnosticOrderStatus($data[self::FIELD_STATUS])); } @@ -445,18 +452,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getActor())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ACTOR, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getDateTime())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DATE_TIME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESCRIPTION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } @@ -473,14 +477,29 @@ public function jsonSerialize() $a[self::FIELD_ACTOR] = $v; } if (null !== ($v = $this->getDateTime())) { - $a[self::FIELD_DATE_TIME] = $v->getValue(); - $a[self::FIELD_DATE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_DATE_TIME] = $v; + } } if (null !== ($v = $this->getDescription())) { $a[self::FIELD_DESCRIPTION] = $v; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRDiagnosticOrder/FHIRDiagnosticOrderItem.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRDiagnosticOrder/FHIRDiagnosticOrderItem.php index d65c420732..cbf614a41f 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRDiagnosticOrder/FHIRDiagnosticOrderItem.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRDiagnosticOrder/FHIRDiagnosticOrderItem.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRDiagnosticOrderItem extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DIAGNOSTIC_ORDER_DOT_ITEM; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_BODY_SITE = 'bodySite'; const FIELD_CODE = 'code'; const FIELD_EVENT = 'event'; @@ -147,6 +143,9 @@ class FHIRDiagnosticOrderItem extends FHIRBackboneElement */ protected $status = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRDiagnosticOrderItem Constructor * @param null|array $data @@ -180,6 +179,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_EVENT])) { if (is_array($data[self::FIELD_EVENT])) { foreach($data[self::FIELD_EVENT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRDiagnosticOrderEvent) { $this->addEvent($v); } else { @@ -195,6 +197,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SPECIMEN])) { if (is_array($data[self::FIELD_SPECIMEN])) { foreach($data[self::FIELD_SPECIMEN] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addSpecimen($v); } else { @@ -213,8 +218,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRDiagnosticOrderStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRDiagnosticOrderStatus([FHIRDiagnosticOrderStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRDiagnosticOrderStatus([FHIRDiagnosticOrderStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRDiagnosticOrderStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRDiagnosticOrderStatus($data[self::FIELD_STATUS])); } @@ -544,15 +553,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getBodySite())) { $v->xmlSerialize($sxe->addChild(self::FIELD_BODY_SITE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getEvent())) { foreach($vs as $v) { if (null === $v) { @@ -596,7 +602,15 @@ public function jsonSerialize() $a[self::FIELD_SPECIMEN] = $vs; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRDiagnosticReport/FHIRDiagnosticReportImage.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRDiagnosticReport/FHIRDiagnosticReportImage.php index d31aa36fe5..0c78779db4 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRDiagnosticReport/FHIRDiagnosticReportImage.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRDiagnosticReport/FHIRDiagnosticReportImage.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -82,10 +82,6 @@ class FHIRDiagnosticReportImage extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DIAGNOSTIC_REPORT_DOT_IMAGE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_COMMENT = 'comment'; const FIELD_COMMENT_EXT = '_comment'; const FIELD_LINK = 'link'; @@ -114,6 +110,9 @@ class FHIRDiagnosticReportImage extends FHIRBackboneElement */ protected $link = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRDiagnosticReportImage Constructor * @param null|array $data @@ -136,8 +135,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_COMMENT] instanceof FHIRString) { $this->setComment($data[self::FIELD_COMMENT]); - } elseif ($ext && is_scalar($data[self::FIELD_COMMENT])) { - $this->setComment(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_COMMENT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_COMMENT])) { + $this->setComment(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_COMMENT]] + $ext)); + } else if (is_array($data[self::FIELD_COMMENT])) { + $this->setComment(new FHIRString(array_merge($ext, $data[self::FIELD_COMMENT]))); + } } else { $this->setComment(new FHIRString($data[self::FIELD_COMMENT])); } @@ -334,7 +337,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getComment())) { $v->xmlSerialize($sxe->addChild(self::FIELD_COMMENT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getLink())) { $v->xmlSerialize($sxe->addChild(self::FIELD_LINK, null, $v->_getFHIRXMLNamespace())); } @@ -348,8 +350,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getComment())) { - $a[self::FIELD_COMMENT] = $v->getValue(); - $a[self::FIELD_COMMENT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_COMMENT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_COMMENT_EXT] = $enc; + } + } else { + $a[self::FIELD_COMMENT] = $v; + } } if (null !== ($v = $this->getLink())) { $a[self::FIELD_LINK] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRDocumentManifest/FHIRDocumentManifestContent.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRDocumentManifest/FHIRDocumentManifestContent.php index 36bf6c0e21..1950b93fbe 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRDocumentManifest/FHIRDocumentManifestContent.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRDocumentManifest/FHIRDocumentManifestContent.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRDocumentManifestContent extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DOCUMENT_MANIFEST_DOT_CONTENT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_P_ATTACHMENT = 'pAttachment'; const FIELD_P_REFERENCE = 'pReference'; @@ -111,6 +107,9 @@ class FHIRDocumentManifestContent extends FHIRBackboneElement */ protected $pReference = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRDocumentManifestContent Constructor * @param null|array $data @@ -316,11 +315,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getPAttachment())) { $v->xmlSerialize($sxe->addChild(self::FIELD_P_ATTACHMENT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_P_REFERENCE, null, $v->_getFHIRXMLNamespace())); } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRDocumentManifest/FHIRDocumentManifestRelated.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRDocumentManifest/FHIRDocumentManifestRelated.php index d12959f77c..d589ac0ea0 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRDocumentManifest/FHIRDocumentManifestRelated.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRDocumentManifest/FHIRDocumentManifestRelated.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRDocumentManifestRelated extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DOCUMENT_MANIFEST_DOT_RELATED; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_IDENTIFIER = 'identifier'; const FIELD_IDENTIFIER_EXT = '_identifier'; const FIELD_REF = 'ref'; @@ -110,6 +106,9 @@ class FHIRDocumentManifestRelated extends FHIRBackboneElement */ protected $ref = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRDocumentManifestRelated Constructor * @param null|array $data @@ -132,8 +131,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->setIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { - $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_IDENTIFIER]))); + } } else { $this->setIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); } @@ -316,11 +319,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRef())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REF, null, $v->_getFHIRXMLNamespace())); } @@ -334,7 +335,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_IDENTIFIER] = $v; + } } if (null !== ($v = $this->getRef())) { $a[self::FIELD_REF] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRDocumentReference/FHIRDocumentReferenceContent.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRDocumentReference/FHIRDocumentReferenceContent.php index 5aab3c16a3..748752b6f1 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRDocumentReference/FHIRDocumentReferenceContent.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRDocumentReference/FHIRDocumentReferenceContent.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRDocumentReferenceContent extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DOCUMENT_REFERENCE_DOT_CONTENT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ATTACHMENT = 'attachment'; const FIELD_FORMAT = 'format'; @@ -109,6 +105,9 @@ class FHIRDocumentReferenceContent extends FHIRBackboneElement */ protected $format = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRDocumentReferenceContent Constructor * @param null|array $data @@ -135,6 +134,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_FORMAT])) { if (is_array($data[self::FIELD_FORMAT])) { foreach($data[self::FIELD_FORMAT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCoding) { $this->addFormat($v); } else { @@ -347,11 +349,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getAttachment())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ATTACHMENT, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getFormat())) { foreach($vs as $v) { if (null === $v) { @@ -360,6 +360,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_FORMAT, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRDocumentReference/FHIRDocumentReferenceContext.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRDocumentReference/FHIRDocumentReferenceContext.php index 93afd70c2c..226a81933a 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRDocumentReference/FHIRDocumentReferenceContext.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRDocumentReference/FHIRDocumentReferenceContext.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRDocumentReferenceContext extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DOCUMENT_REFERENCE_DOT_CONTEXT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ENCOUNTER = 'encounter'; const FIELD_EVENT = 'event'; const FIELD_FACILITY_TYPE = 'facilityType'; @@ -176,6 +172,9 @@ class FHIRDocumentReferenceContext extends FHIRBackboneElement */ protected $sourcePatientInfo = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRDocumentReferenceContext Constructor * @param null|array $data @@ -202,6 +201,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_EVENT])) { if (is_array($data[self::FIELD_EVENT])) { foreach($data[self::FIELD_EVENT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addEvent($v); } else { @@ -238,6 +240,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_RELATED])) { if (is_array($data[self::FIELD_RELATED])) { foreach($data[self::FIELD_RELATED] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRDocumentReferenceRelated) { $this->addRelated($v); } else { @@ -663,11 +668,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getEncounter())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ENCOUNTER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getEvent())) { foreach($vs as $v) { if (null === $v) { @@ -680,15 +683,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getFacilityType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FACILITY_TYPE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPracticeSetting())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PRACTICE_SETTING, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getRelated())) { foreach($vs as $v) { if (null === $v) { diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRDocumentReference/FHIRDocumentReferenceRelated.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRDocumentReference/FHIRDocumentReferenceRelated.php index e287fd9134..537d1f9e35 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRDocumentReference/FHIRDocumentReferenceRelated.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRDocumentReference/FHIRDocumentReferenceRelated.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRDocumentReferenceRelated extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DOCUMENT_REFERENCE_DOT_RELATED; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_IDENTIFIER = 'identifier'; const FIELD_IDENTIFIER_EXT = '_identifier'; const FIELD_REF = 'ref'; @@ -110,6 +106,9 @@ class FHIRDocumentReferenceRelated extends FHIRBackboneElement */ protected $ref = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRDocumentReferenceRelated Constructor * @param null|array $data @@ -132,8 +131,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->setIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { - $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_IDENTIFIER]))); + } } else { $this->setIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); } @@ -316,11 +319,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRef())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REF, null, $v->_getFHIRXMLNamespace())); } @@ -334,7 +335,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_IDENTIFIER] = $v; + } } if (null !== ($v = $this->getRef())) { $a[self::FIELD_REF] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRDocumentReference/FHIRDocumentReferenceRelatesTo.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRDocumentReference/FHIRDocumentReferenceRelatesTo.php index a391009414..848f016472 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRDocumentReference/FHIRDocumentReferenceRelatesTo.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRDocumentReference/FHIRDocumentReferenceRelatesTo.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRDocumentReferenceRelatesTo extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DOCUMENT_REFERENCE_DOT_RELATES_TO; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CODE = 'code'; const FIELD_CODE_EXT = '_code'; const FIELD_TARGET = 'target'; @@ -107,6 +103,9 @@ class FHIRDocumentReferenceRelatesTo extends FHIRBackboneElement */ protected $target = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRDocumentReferenceRelatesTo Constructor * @param null|array $data @@ -129,8 +128,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CODE] instanceof FHIRDocumentRelationshipType) { $this->setCode($data[self::FIELD_CODE]); - } elseif ($ext && is_scalar($data[self::FIELD_CODE])) { - $this->setCode(new FHIRDocumentRelationshipType([FHIRDocumentRelationshipType::FIELD_VALUE => $data[self::FIELD_CODE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CODE])) { + $this->setCode(new FHIRDocumentRelationshipType([FHIRDocumentRelationshipType::FIELD_VALUE => $data[self::FIELD_CODE]] + $ext)); + } else if (is_array($data[self::FIELD_CODE])) { + $this->setCode(new FHIRDocumentRelationshipType(array_merge($ext, $data[self::FIELD_CODE]))); + } } else { $this->setCode(new FHIRDocumentRelationshipType($data[self::FIELD_CODE])); } @@ -307,11 +310,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getTarget())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TARGET, null, $v->_getFHIRXMLNamespace())); } @@ -325,7 +326,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getCode())) { - $a[self::FIELD_CODE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CODE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CODE_EXT] = $enc; + } + } else { + $a[self::FIELD_CODE] = $v; + } } if (null !== ($v = $this->getTarget())) { $a[self::FIELD_TARGET] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIREncounter/FHIREncounterHospitalization.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIREncounter/FHIREncounterHospitalization.php index de63ecdafc..cfea0b309a 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIREncounter/FHIREncounterHospitalization.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIREncounter/FHIREncounterHospitalization.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIREncounterHospitalization extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ENCOUNTER_DOT_HOSPITALIZATION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ADMIT_SOURCE = 'admitSource'; const FIELD_ADMITTING_DIAGNOSIS = 'admittingDiagnosis'; const FIELD_DESTINATION = 'destination'; @@ -227,6 +223,9 @@ class FHIREncounterHospitalization extends FHIRBackboneElement */ protected $specialCourtesy = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIREncounterHospitalization Constructor * @param null|array $data @@ -253,6 +252,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ADMITTING_DIAGNOSIS])) { if (is_array($data[self::FIELD_ADMITTING_DIAGNOSIS])) { foreach($data[self::FIELD_ADMITTING_DIAGNOSIS] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addAdmittingDiagnosis($v); } else { @@ -275,6 +277,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_DIET_PREFERENCE])) { if (is_array($data[self::FIELD_DIET_PREFERENCE])) { foreach($data[self::FIELD_DIET_PREFERENCE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addDietPreference($v); } else { @@ -290,6 +295,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_DISCHARGE_DIAGNOSIS])) { if (is_array($data[self::FIELD_DISCHARGE_DIAGNOSIS])) { foreach($data[self::FIELD_DISCHARGE_DIAGNOSIS] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addDischargeDiagnosis($v); } else { @@ -322,8 +330,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PRE_ADMISSION_IDENTIFIER] instanceof FHIRIdentifier) { $this->setPreAdmissionIdentifier($data[self::FIELD_PRE_ADMISSION_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_PRE_ADMISSION_IDENTIFIER])) { - $this->setPreAdmissionIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_PRE_ADMISSION_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PRE_ADMISSION_IDENTIFIER])) { + $this->setPreAdmissionIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_PRE_ADMISSION_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_PRE_ADMISSION_IDENTIFIER])) { + $this->setPreAdmissionIdentifier(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_PRE_ADMISSION_IDENTIFIER]))); + } } else { $this->setPreAdmissionIdentifier(new FHIRIdentifier($data[self::FIELD_PRE_ADMISSION_IDENTIFIER])); } @@ -338,6 +350,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SPECIAL_ARRANGEMENT])) { if (is_array($data[self::FIELD_SPECIAL_ARRANGEMENT])) { foreach($data[self::FIELD_SPECIAL_ARRANGEMENT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addSpecialArrangement($v); } else { @@ -353,6 +368,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SPECIAL_COURTESY])) { if (is_array($data[self::FIELD_SPECIAL_COURTESY])) { foreach($data[self::FIELD_SPECIAL_COURTESY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addSpecialCourtesy($v); } else { @@ -993,11 +1011,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getAdmitSource())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ADMIT_SOURCE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getAdmittingDiagnosis())) { foreach($vs as $v) { if (null === $v) { @@ -1010,7 +1026,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDestination())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESTINATION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getDietPreference())) { foreach($vs as $v) { if (null === $v) { @@ -1032,19 +1047,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDischargeDisposition())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DISCHARGE_DISPOSITION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOrigin())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ORIGIN, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPreAdmissionIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PRE_ADMISSION_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getReAdmission())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RE_ADMISSION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getSpecialArrangement())) { foreach($vs as $v) { if (null === $v) { @@ -1062,6 +1073,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_SPECIAL_COURTESY, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } @@ -1093,7 +1105,15 @@ public function jsonSerialize() $a[self::FIELD_ORIGIN] = $v; } if (null !== ($v = $this->getPreAdmissionIdentifier())) { - $a[self::FIELD_PRE_ADMISSION_IDENTIFIER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PRE_ADMISSION_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PRE_ADMISSION_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_PRE_ADMISSION_IDENTIFIER] = $v; + } } if (null !== ($v = $this->getReAdmission())) { $a[self::FIELD_RE_ADMISSION] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIREncounter/FHIREncounterLocation.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIREncounter/FHIREncounterLocation.php index 1247a94c2c..bce4f3641b 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIREncounter/FHIREncounterLocation.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIREncounter/FHIREncounterLocation.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIREncounterLocation extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ENCOUNTER_DOT_LOCATION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_LOCATION = 'location'; const FIELD_PERIOD = 'period'; const FIELD_STATUS = 'status'; @@ -123,6 +119,9 @@ class FHIREncounterLocation extends FHIRBackboneElement */ protected $status = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIREncounterLocation Constructor * @param null|array $data @@ -159,8 +158,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIREncounterLocationStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIREncounterLocationStatus([FHIREncounterLocationStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIREncounterLocationStatus([FHIREncounterLocationStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIREncounterLocationStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIREncounterLocationStatus($data[self::FIELD_STATUS])); } @@ -367,15 +370,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getLocation())) { $v->xmlSerialize($sxe->addChild(self::FIELD_LOCATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } @@ -395,7 +395,15 @@ public function jsonSerialize() $a[self::FIELD_PERIOD] = $v; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIREncounter/FHIREncounterParticipant.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIREncounter/FHIREncounterParticipant.php index 6e16cde3e9..231e5ed89b 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIREncounter/FHIREncounterParticipant.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIREncounter/FHIREncounterParticipant.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIREncounterParticipant extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ENCOUNTER_DOT_PARTICIPANT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_INDIVIDUAL = 'individual'; const FIELD_PERIOD = 'period'; const FIELD_TYPE = 'type'; @@ -123,6 +119,9 @@ class FHIREncounterParticipant extends FHIRBackboneElement */ protected $type = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIREncounterParticipant Constructor * @param null|array $data @@ -156,6 +155,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_TYPE])) { if (is_array($data[self::FIELD_TYPE])) { foreach($data[self::FIELD_TYPE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addType($v); } else { @@ -401,15 +403,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getIndividual())) { $v->xmlSerialize($sxe->addChild(self::FIELD_INDIVIDUAL, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getType())) { foreach($vs as $v) { if (null === $v) { @@ -418,6 +417,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIREncounter/FHIREncounterStatusHistory.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIREncounter/FHIREncounterStatusHistory.php index 08b5055a34..f3b286e632 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIREncounter/FHIREncounterStatusHistory.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIREncounter/FHIREncounterStatusHistory.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIREncounterStatusHistory extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ENCOUNTER_DOT_STATUS_HISTORY; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_PERIOD = 'period'; const FIELD_STATUS = 'status'; const FIELD_STATUS_EXT = '_status'; @@ -108,6 +104,9 @@ class FHIREncounterStatusHistory extends FHIRBackboneElement */ protected $status = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIREncounterStatusHistory Constructor * @param null|array $data @@ -137,8 +136,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIREncounterState) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIREncounterState([FHIREncounterState::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIREncounterState([FHIREncounterState::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIREncounterState(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIREncounterState($data[self::FIELD_STATUS])); } @@ -308,11 +311,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } @@ -329,7 +330,15 @@ public function jsonSerialize() $a[self::FIELD_PERIOD] = $v; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIREpisodeOfCare/FHIREpisodeOfCareCareTeam.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIREpisodeOfCare/FHIREpisodeOfCareCareTeam.php index f4cb7dafe7..dadb69c27d 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIREpisodeOfCare/FHIREpisodeOfCareCareTeam.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIREpisodeOfCare/FHIREpisodeOfCareCareTeam.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -81,10 +81,6 @@ class FHIREpisodeOfCareCareTeam extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_EPISODE_OF_CARE_DOT_CARE_TEAM; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_MEMBER = 'member'; const FIELD_PERIOD = 'period'; const FIELD_ROLE = 'role'; @@ -124,6 +120,9 @@ class FHIREpisodeOfCareCareTeam extends FHIRBackboneElement */ protected $role = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIREpisodeOfCareCareTeam Constructor * @param null|array $data @@ -157,6 +156,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ROLE])) { if (is_array($data[self::FIELD_ROLE])) { foreach($data[self::FIELD_ROLE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addRole($v); } else { @@ -402,15 +404,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getMember())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MEMBER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getRole())) { foreach($vs as $v) { if (null === $v) { @@ -419,6 +418,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_ROLE, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIREpisodeOfCare/FHIREpisodeOfCareStatusHistory.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIREpisodeOfCare/FHIREpisodeOfCareStatusHistory.php index d534c64679..c3fd08d40c 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIREpisodeOfCare/FHIREpisodeOfCareStatusHistory.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIREpisodeOfCare/FHIREpisodeOfCareStatusHistory.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIREpisodeOfCareStatusHistory extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_EPISODE_OF_CARE_DOT_STATUS_HISTORY; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_PERIOD = 'period'; const FIELD_STATUS = 'status'; const FIELD_STATUS_EXT = '_status'; @@ -109,6 +105,9 @@ class FHIREpisodeOfCareStatusHistory extends FHIRBackboneElement */ protected $status = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIREpisodeOfCareStatusHistory Constructor * @param null|array $data @@ -138,8 +137,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIREpisodeOfCareStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIREpisodeOfCareStatus([FHIREpisodeOfCareStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIREpisodeOfCareStatus([FHIREpisodeOfCareStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIREpisodeOfCareStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIREpisodeOfCareStatus($data[self::FIELD_STATUS])); } @@ -309,11 +312,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } @@ -330,7 +331,15 @@ public function jsonSerialize() $a[self::FIELD_PERIOD] = $v; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRFamilyMemberHistory/FHIRFamilyMemberHistoryCondition.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRFamilyMemberHistory/FHIRFamilyMemberHistoryCondition.php index 7d842f7ac3..0b87f41a31 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRFamilyMemberHistory/FHIRFamilyMemberHistoryCondition.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRFamilyMemberHistory/FHIRFamilyMemberHistoryCondition.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -83,14 +83,11 @@ class FHIRFamilyMemberHistoryCondition extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_FAMILY_MEMBER_HISTORY_DOT_CONDITION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CODE = 'code'; const FIELD_NOTE = 'note'; const FIELD_ONSET_PERIOD = 'onsetPeriod'; const FIELD_ONSET_QUANTITY = 'onsetQuantity'; + const FIELD_ONSET_QUANTITY_EXT = '_onsetQuantity'; const FIELD_ONSET_RANGE = 'onsetRange'; const FIELD_ONSET_STRING = 'onsetString'; const FIELD_ONSET_STRING_EXT = '_onsetString'; @@ -183,6 +180,9 @@ class FHIRFamilyMemberHistoryCondition extends FHIRBackboneElement */ protected $outcome = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRFamilyMemberHistoryCondition Constructor * @param null|array $data @@ -221,8 +221,17 @@ public function __construct($data = null) } } if (isset($data[self::FIELD_ONSET_QUANTITY])) { + $ext = (isset($data[self::FIELD_ONSET_QUANTITY_EXT]) && is_array($data[self::FIELD_ONSET_QUANTITY_EXT])) + ? $data[self::FIELD_ONSET_QUANTITY_EXT] + : null; if ($data[self::FIELD_ONSET_QUANTITY] instanceof FHIRAge) { $this->setOnsetQuantity($data[self::FIELD_ONSET_QUANTITY]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ONSET_QUANTITY])) { + $this->setOnsetQuantity(new FHIRAge([FHIRAge::FIELD_VALUE => $data[self::FIELD_ONSET_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_ONSET_QUANTITY])) { + $this->setOnsetQuantity(new FHIRAge(array_merge($ext, $data[self::FIELD_ONSET_QUANTITY]))); + } } else { $this->setOnsetQuantity(new FHIRAge($data[self::FIELD_ONSET_QUANTITY])); } @@ -240,8 +249,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ONSET_STRING] instanceof FHIRString) { $this->setOnsetString($data[self::FIELD_ONSET_STRING]); - } elseif ($ext && is_scalar($data[self::FIELD_ONSET_STRING])) { - $this->setOnsetString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_ONSET_STRING]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ONSET_STRING])) { + $this->setOnsetString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_ONSET_STRING]] + $ext)); + } else if (is_array($data[self::FIELD_ONSET_STRING])) { + $this->setOnsetString(new FHIRString(array_merge($ext, $data[self::FIELD_ONSET_STRING]))); + } } else { $this->setOnsetString(new FHIRString($data[self::FIELD_ONSET_STRING])); } @@ -616,30 +629,24 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getNote())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NOTE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOnsetPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ONSET_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOnsetQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ONSET_QUANTITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOnsetRange())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ONSET_RANGE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getOnsetString())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ONSET_STRING, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOutcome())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OUTCOME, null, $v->_getFHIRXMLNamespace())); } @@ -662,14 +669,29 @@ public function jsonSerialize() $a[self::FIELD_ONSET_PERIOD] = $v; } if (null !== ($v = $this->getOnsetQuantity())) { - $a[self::FIELD_ONSET_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ONSET_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ONSET_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_ONSET_QUANTITY] = $v; + } } if (null !== ($v = $this->getOnsetRange())) { $a[self::FIELD_ONSET_RANGE] = $v; } if (null !== ($v = $this->getOnsetString())) { - $a[self::FIELD_ONSET_STRING] = $v->getValue(); - $a[self::FIELD_ONSET_STRING_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ONSET_STRING] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ONSET_STRING_EXT] = $enc; + } + } else { + $a[self::FIELD_ONSET_STRING] = $v; + } } if (null !== ($v = $this->getOutcome())) { $a[self::FIELD_OUTCOME] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRGoal/FHIRGoalOutcome.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRGoal/FHIRGoalOutcome.php index 0694441dc8..e75c23c5bf 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRGoal/FHIRGoalOutcome.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRGoal/FHIRGoalOutcome.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRGoalOutcome extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_GOAL_DOT_OUTCOME; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_RESULT_CODEABLE_CONCEPT = 'resultCodeableConcept'; const FIELD_RESULT_REFERENCE = 'resultReference'; @@ -110,6 +106,9 @@ class FHIRGoalOutcome extends FHIRBackboneElement */ protected $resultReference = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRGoalOutcome Constructor * @param null|array $data @@ -309,11 +308,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getResultCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RESULT_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getResultReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RESULT_REFERENCE, null, $v->_getFHIRXMLNamespace())); } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRGroup/FHIRGroupCharacteristic.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRGroup/FHIRGroupCharacteristic.php index d89f4773b5..fc5300974f 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRGroup/FHIRGroupCharacteristic.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRGroup/FHIRGroupCharacteristic.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -83,10 +83,6 @@ class FHIRGroupCharacteristic extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_GROUP_DOT_CHARACTERISTIC; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CODE = 'code'; const FIELD_EXCLUDE = 'exclude'; const FIELD_EXCLUDE_EXT = '_exclude'; @@ -183,6 +179,9 @@ class FHIRGroupCharacteristic extends FHIRBackboneElement */ protected $valueRange = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRGroupCharacteristic Constructor * @param null|array $data @@ -212,8 +211,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EXCLUDE] instanceof FHIRBoolean) { $this->setExclude($data[self::FIELD_EXCLUDE]); - } elseif ($ext && is_scalar($data[self::FIELD_EXCLUDE])) { - $this->setExclude(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_EXCLUDE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EXCLUDE])) { + $this->setExclude(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_EXCLUDE]] + $ext)); + } else if (is_array($data[self::FIELD_EXCLUDE])) { + $this->setExclude(new FHIRBoolean(array_merge($ext, $data[self::FIELD_EXCLUDE]))); + } } else { $this->setExclude(new FHIRBoolean($data[self::FIELD_EXCLUDE])); } @@ -231,8 +234,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_BOOLEAN] instanceof FHIRBoolean) { $this->setValueBoolean($data[self::FIELD_VALUE_BOOLEAN]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_BOOLEAN])) { - $this->setValueBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_VALUE_BOOLEAN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_BOOLEAN])) { + $this->setValueBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_VALUE_BOOLEAN]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_BOOLEAN])) { + $this->setValueBoolean(new FHIRBoolean(array_merge($ext, $data[self::FIELD_VALUE_BOOLEAN]))); + } } else { $this->setValueBoolean(new FHIRBoolean($data[self::FIELD_VALUE_BOOLEAN])); } @@ -250,8 +257,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_QUANTITY] instanceof FHIRQuantity) { $this->setValueQuantity($data[self::FIELD_VALUE_QUANTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_QUANTITY])) { - $this->setValueQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_VALUE_QUANTITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_QUANTITY])) { + $this->setValueQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_VALUE_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_QUANTITY])) { + $this->setValueQuantity(new FHIRQuantity(array_merge($ext, $data[self::FIELD_VALUE_QUANTITY]))); + } } else { $this->setValueQuantity(new FHIRQuantity($data[self::FIELD_VALUE_QUANTITY])); } @@ -633,29 +644,24 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getExclude())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EXCLUDE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PERIOD, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getValueBoolean())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_BOOLEAN, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_QUANTITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueRange())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_RANGE, null, $v->_getFHIRXMLNamespace())); } @@ -672,21 +678,43 @@ public function jsonSerialize() $a[self::FIELD_CODE] = $v; } if (null !== ($v = $this->getExclude())) { - $a[self::FIELD_EXCLUDE] = $v->getValue(); - $a[self::FIELD_EXCLUDE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EXCLUDE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EXCLUDE_EXT] = $enc; + } + } else { + $a[self::FIELD_EXCLUDE] = $v; + } } if (null !== ($v = $this->getPeriod())) { $a[self::FIELD_PERIOD] = $v; } if (null !== ($v = $this->getValueBoolean())) { - $a[self::FIELD_VALUE_BOOLEAN] = $v->getValue(); - $a[self::FIELD_VALUE_BOOLEAN_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_BOOLEAN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_BOOLEAN_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_BOOLEAN] = $v; + } } if (null !== ($v = $this->getValueCodeableConcept())) { $a[self::FIELD_VALUE_CODEABLE_CONCEPT] = $v; } if (null !== ($v = $this->getValueQuantity())) { - $a[self::FIELD_VALUE_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_QUANTITY] = $v; + } } if (null !== ($v = $this->getValueRange())) { $a[self::FIELD_VALUE_RANGE] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRGroup/FHIRGroupMember.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRGroup/FHIRGroupMember.php index 2a09a0cc1a..027c02ed4f 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRGroup/FHIRGroupMember.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRGroup/FHIRGroupMember.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -81,10 +81,6 @@ class FHIRGroupMember extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_GROUP_DOT_MEMBER; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ENTITY = 'entity'; const FIELD_INACTIVE = 'inactive'; const FIELD_INACTIVE_EXT = '_inactive'; @@ -124,6 +120,9 @@ class FHIRGroupMember extends FHIRBackboneElement */ protected $period = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRGroupMember Constructor * @param null|array $data @@ -153,8 +152,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_INACTIVE] instanceof FHIRBoolean) { $this->setInactive($data[self::FIELD_INACTIVE]); - } elseif ($ext && is_scalar($data[self::FIELD_INACTIVE])) { - $this->setInactive(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_INACTIVE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_INACTIVE])) { + $this->setInactive(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_INACTIVE]] + $ext)); + } else if (is_array($data[self::FIELD_INACTIVE])) { + $this->setInactive(new FHIRBoolean(array_merge($ext, $data[self::FIELD_INACTIVE]))); + } } else { $this->setInactive(new FHIRBoolean($data[self::FIELD_INACTIVE])); } @@ -379,14 +382,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getEntity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ENTITY, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getInactive())) { $v->xmlSerialize($sxe->addChild(self::FIELD_INACTIVE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PERIOD, null, $v->_getFHIRXMLNamespace())); } @@ -403,8 +404,15 @@ public function jsonSerialize() $a[self::FIELD_ENTITY] = $v; } if (null !== ($v = $this->getInactive())) { - $a[self::FIELD_INACTIVE] = $v->getValue(); - $a[self::FIELD_INACTIVE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_INACTIVE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_INACTIVE_EXT] = $enc; + } + } else { + $a[self::FIELD_INACTIVE] = $v; + } } if (null !== ($v = $this->getPeriod())) { $a[self::FIELD_PERIOD] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRHealthcareService/FHIRHealthcareServiceAvailableTime.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRHealthcareService/FHIRHealthcareServiceAvailableTime.php index ebef8dab25..b3d27ff3fd 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRHealthcareService/FHIRHealthcareServiceAvailableTime.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRHealthcareService/FHIRHealthcareServiceAvailableTime.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRHealthcareServiceAvailableTime extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_HEALTHCARE_SERVICE_DOT_AVAILABLE_TIME; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ALL_DAY = 'allDay'; const FIELD_ALL_DAY_EXT = '_allDay'; const FIELD_AVAILABLE_END_TIME = 'availableEndTime'; @@ -134,6 +130,9 @@ class FHIRHealthcareServiceAvailableTime extends FHIRBackboneElement */ protected $daysOfWeek = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRHealthcareServiceAvailableTime Constructor * @param null|array $data @@ -156,8 +155,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ALL_DAY] instanceof FHIRBoolean) { $this->setAllDay($data[self::FIELD_ALL_DAY]); - } elseif ($ext && is_scalar($data[self::FIELD_ALL_DAY])) { - $this->setAllDay(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_ALL_DAY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ALL_DAY])) { + $this->setAllDay(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_ALL_DAY]] + $ext)); + } else if (is_array($data[self::FIELD_ALL_DAY])) { + $this->setAllDay(new FHIRBoolean(array_merge($ext, $data[self::FIELD_ALL_DAY]))); + } } else { $this->setAllDay(new FHIRBoolean($data[self::FIELD_ALL_DAY])); } @@ -168,8 +171,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_AVAILABLE_END_TIME] instanceof FHIRTime) { $this->setAvailableEndTime($data[self::FIELD_AVAILABLE_END_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_AVAILABLE_END_TIME])) { - $this->setAvailableEndTime(new FHIRTime([FHIRTime::FIELD_VALUE => $data[self::FIELD_AVAILABLE_END_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_AVAILABLE_END_TIME])) { + $this->setAvailableEndTime(new FHIRTime([FHIRTime::FIELD_VALUE => $data[self::FIELD_AVAILABLE_END_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_AVAILABLE_END_TIME])) { + $this->setAvailableEndTime(new FHIRTime(array_merge($ext, $data[self::FIELD_AVAILABLE_END_TIME]))); + } } else { $this->setAvailableEndTime(new FHIRTime($data[self::FIELD_AVAILABLE_END_TIME])); } @@ -180,8 +187,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_AVAILABLE_START_TIME] instanceof FHIRTime) { $this->setAvailableStartTime($data[self::FIELD_AVAILABLE_START_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_AVAILABLE_START_TIME])) { - $this->setAvailableStartTime(new FHIRTime([FHIRTime::FIELD_VALUE => $data[self::FIELD_AVAILABLE_START_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_AVAILABLE_START_TIME])) { + $this->setAvailableStartTime(new FHIRTime([FHIRTime::FIELD_VALUE => $data[self::FIELD_AVAILABLE_START_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_AVAILABLE_START_TIME])) { + $this->setAvailableStartTime(new FHIRTime(array_merge($ext, $data[self::FIELD_AVAILABLE_START_TIME]))); + } } else { $this->setAvailableStartTime(new FHIRTime($data[self::FIELD_AVAILABLE_START_TIME])); } @@ -192,17 +203,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_DAYS_OF_WEEK])) { foreach($data[self::FIELD_DAYS_OF_WEEK] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRDaysOfWeek) { $this->addDaysOfWeek($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addDaysOfWeek(new FHIRDaysOfWeek([FHIRDaysOfWeek::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addDaysOfWeek(new FHIRDaysOfWeek([FHIRDaysOfWeek::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addDaysOfWeek(new FHIRDaysOfWeek(array_merge($v, $ext[$i]))); + } } else { $this->addDaysOfWeek(new FHIRDaysOfWeek($v)); } } } elseif ($data[self::FIELD_DAYS_OF_WEEK] instanceof FHIRDaysOfWeek) { $this->addDaysOfWeek($data[self::FIELD_DAYS_OF_WEEK]); - } elseif ($ext && is_scalar($data[self::FIELD_DAYS_OF_WEEK])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_DAYS_OF_WEEK])) { $this->addDaysOfWeek(new FHIRDaysOfWeek([FHIRDaysOfWeek::FIELD_VALUE => $data[self::FIELD_DAYS_OF_WEEK]] + $ext)); } else { $this->addDaysOfWeek(new FHIRDaysOfWeek($data[self::FIELD_DAYS_OF_WEEK])); @@ -506,7 +524,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getAvailableStartTime())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AVAILABLE_START_TIME, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getDaysOfWeek())) { foreach($vs as $v) { if (null === $v) { @@ -515,6 +532,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_DAYS_OF_WEEK, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } @@ -525,19 +543,56 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getAllDay())) { - $a[self::FIELD_ALL_DAY] = $v->getValue(); - $a[self::FIELD_ALL_DAY_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ALL_DAY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ALL_DAY_EXT] = $enc; + } + } else { + $a[self::FIELD_ALL_DAY] = $v; + } } if (null !== ($v = $this->getAvailableEndTime())) { - $a[self::FIELD_AVAILABLE_END_TIME] = $v->getValue(); - $a[self::FIELD_AVAILABLE_END_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_AVAILABLE_END_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_AVAILABLE_END_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_AVAILABLE_END_TIME] = $v; + } } if (null !== ($v = $this->getAvailableStartTime())) { - $a[self::FIELD_AVAILABLE_START_TIME] = $v->getValue(); - $a[self::FIELD_AVAILABLE_START_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_AVAILABLE_START_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_AVAILABLE_START_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_AVAILABLE_START_TIME] = $v; + } } if ([] !== ($vs = $this->getDaysOfWeek())) { - $a[self::FIELD_DAYS_OF_WEEK] = $vs; + $a[self::FIELD_DAYS_OF_WEEK] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DAYS_OF_WEEK][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DAYS_OF_WEEK_EXT][] = $enc; + } else { + $a[self::FIELD_DAYS_OF_WEEK_EXT][] = null; + } + } else { + $a[self::FIELD_DAYS_OF_WEEK][] = $v; + } + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRHealthcareService/FHIRHealthcareServiceNotAvailable.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRHealthcareService/FHIRHealthcareServiceNotAvailable.php index 91323414ea..2d7bfca297 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRHealthcareService/FHIRHealthcareServiceNotAvailable.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRHealthcareService/FHIRHealthcareServiceNotAvailable.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRHealthcareServiceNotAvailable extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_HEALTHCARE_SERVICE_DOT_NOT_AVAILABLE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DESCRIPTION = 'description'; const FIELD_DESCRIPTION_EXT = '_description'; const FIELD_DURING = 'during'; @@ -109,6 +105,9 @@ class FHIRHealthcareServiceNotAvailable extends FHIRBackboneElement */ protected $during = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRHealthcareServiceNotAvailable Constructor * @param null|array $data @@ -131,8 +130,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -327,7 +330,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESCRIPTION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDuring())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DURING, null, $v->_getFHIRXMLNamespace())); } @@ -341,8 +343,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if (null !== ($v = $this->getDuring())) { $a[self::FIELD_DURING] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRHealthcareService/FHIRHealthcareServiceServiceType.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRHealthcareService/FHIRHealthcareServiceServiceType.php index 33c2c40f50..f134a52f9c 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRHealthcareService/FHIRHealthcareServiceServiceType.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRHealthcareService/FHIRHealthcareServiceServiceType.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -77,10 +77,6 @@ class FHIRHealthcareServiceServiceType extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_HEALTHCARE_SERVICE_DOT_SERVICE_TYPE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_SPECIALTY = 'specialty'; const FIELD_TYPE = 'type'; @@ -109,6 +105,9 @@ class FHIRHealthcareServiceServiceType extends FHIRBackboneElement */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRHealthcareServiceServiceType Constructor * @param null|array $data @@ -128,6 +127,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SPECIALTY])) { if (is_array($data[self::FIELD_SPECIALTY])) { foreach($data[self::FIELD_SPECIALTY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addSpecialty($v); } else { @@ -350,7 +352,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getSpecialty())) { foreach($vs as $v) { if (null === $v) { diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRImagingObjectSelection/FHIRImagingObjectSelectionFrames.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRImagingObjectSelection/FHIRImagingObjectSelectionFrames.php index 27448136e5..6497e2221d 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRImagingObjectSelection/FHIRImagingObjectSelectionFrames.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRImagingObjectSelection/FHIRImagingObjectSelectionFrames.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -87,10 +87,6 @@ class FHIRImagingObjectSelectionFrames extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_IMAGING_OBJECT_SELECTION_DOT_FRAMES; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_FRAME_NUMBERS = 'frameNumbers'; const FIELD_FRAME_NUMBERS_EXT = '_frameNumbers'; const FIELD_URL = 'url'; @@ -118,6 +114,9 @@ class FHIRImagingObjectSelectionFrames extends FHIRBackboneElement */ protected $url = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRImagingObjectSelectionFrames Constructor * @param null|array $data @@ -140,17 +139,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_FRAME_NUMBERS])) { foreach($data[self::FIELD_FRAME_NUMBERS] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRUnsignedInt) { $this->addFrameNumbers($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addFrameNumbers(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addFrameNumbers(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addFrameNumbers(new FHIRUnsignedInt(array_merge($v, $ext[$i]))); + } } else { $this->addFrameNumbers(new FHIRUnsignedInt($v)); } } } elseif ($data[self::FIELD_FRAME_NUMBERS] instanceof FHIRUnsignedInt) { $this->addFrameNumbers($data[self::FIELD_FRAME_NUMBERS]); - } elseif ($ext && is_scalar($data[self::FIELD_FRAME_NUMBERS])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_FRAME_NUMBERS])) { $this->addFrameNumbers(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_FRAME_NUMBERS]] + $ext)); } else { $this->addFrameNumbers(new FHIRUnsignedInt($data[self::FIELD_FRAME_NUMBERS])); @@ -162,8 +168,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_URL] instanceof FHIRUri) { $this->setUrl($data[self::FIELD_URL]); - } elseif ($ext && is_scalar($data[self::FIELD_URL])) { - $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } else if (is_array($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri(array_merge($ext, $data[self::FIELD_URL]))); + } } else { $this->setUrl(new FHIRUri($data[self::FIELD_URL])); } @@ -393,6 +403,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_FRAME_NUMBERS, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getUrl())) { $v->xmlSerialize($sxe->addChild(self::FIELD_URL, null, $v->_getFHIRXMLNamespace())); } @@ -411,13 +422,29 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_FRAME_NUMBERS][] = $v->getValue(); - $a[self::FIELD_FRAME_NUMBERS_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FRAME_NUMBERS][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FRAME_NUMBERS_EXT][] = $enc; + } else { + $a[self::FIELD_FRAME_NUMBERS_EXT][] = null; + } + } else { + $a[self::FIELD_FRAME_NUMBERS][] = $v; + } } } if (null !== ($v = $this->getUrl())) { - $a[self::FIELD_URL] = $v->getValue(); - $a[self::FIELD_URL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_URL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_URL_EXT] = $enc; + } + } else { + $a[self::FIELD_URL] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRImagingObjectSelection/FHIRImagingObjectSelectionInstance.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRImagingObjectSelection/FHIRImagingObjectSelectionInstance.php index b2e0596e8d..5a9666ef0a 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRImagingObjectSelection/FHIRImagingObjectSelectionInstance.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRImagingObjectSelection/FHIRImagingObjectSelectionInstance.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -87,10 +87,6 @@ class FHIRImagingObjectSelectionInstance extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_IMAGING_OBJECT_SELECTION_DOT_INSTANCE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_FRAMES = 'frames'; const FIELD_SOP_CLASS = 'sopClass'; const FIELD_SOP_CLASS_EXT = '_sopClass'; @@ -152,6 +148,9 @@ class FHIRImagingObjectSelectionInstance extends FHIRBackboneElement */ protected $url = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRImagingObjectSelectionInstance Constructor * @param null|array $data @@ -171,6 +170,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_FRAMES])) { if (is_array($data[self::FIELD_FRAMES])) { foreach($data[self::FIELD_FRAMES] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRImagingObjectSelectionFrames) { $this->addFrames($v); } else { @@ -189,8 +191,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SOP_CLASS] instanceof FHIROid) { $this->setSopClass($data[self::FIELD_SOP_CLASS]); - } elseif ($ext && is_scalar($data[self::FIELD_SOP_CLASS])) { - $this->setSopClass(new FHIROid([FHIROid::FIELD_VALUE => $data[self::FIELD_SOP_CLASS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SOP_CLASS])) { + $this->setSopClass(new FHIROid([FHIROid::FIELD_VALUE => $data[self::FIELD_SOP_CLASS]] + $ext)); + } else if (is_array($data[self::FIELD_SOP_CLASS])) { + $this->setSopClass(new FHIROid(array_merge($ext, $data[self::FIELD_SOP_CLASS]))); + } } else { $this->setSopClass(new FHIROid($data[self::FIELD_SOP_CLASS])); } @@ -201,8 +207,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_UID] instanceof FHIROid) { $this->setUid($data[self::FIELD_UID]); - } elseif ($ext && is_scalar($data[self::FIELD_UID])) { - $this->setUid(new FHIROid([FHIROid::FIELD_VALUE => $data[self::FIELD_UID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_UID])) { + $this->setUid(new FHIROid([FHIROid::FIELD_VALUE => $data[self::FIELD_UID]] + $ext)); + } else if (is_array($data[self::FIELD_UID])) { + $this->setUid(new FHIROid(array_merge($ext, $data[self::FIELD_UID]))); + } } else { $this->setUid(new FHIROid($data[self::FIELD_UID])); } @@ -213,8 +223,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_URL] instanceof FHIRUri) { $this->setUrl($data[self::FIELD_URL]); - } elseif ($ext && is_scalar($data[self::FIELD_URL])) { - $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } else if (is_array($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri(array_merge($ext, $data[self::FIELD_URL]))); + } } else { $this->setUrl(new FHIRUri($data[self::FIELD_URL])); } @@ -538,7 +552,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getFrames())) { foreach($vs as $v) { if (null === $v) { @@ -547,6 +560,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_FRAMES, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getSopClass())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SOP_CLASS, null, $v->_getFHIRXMLNamespace())); } @@ -569,16 +583,37 @@ public function jsonSerialize() $a[self::FIELD_FRAMES] = $vs; } if (null !== ($v = $this->getSopClass())) { - $a[self::FIELD_SOP_CLASS] = $v->getValue(); - $a[self::FIELD_SOP_CLASS_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SOP_CLASS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SOP_CLASS_EXT] = $enc; + } + } else { + $a[self::FIELD_SOP_CLASS] = $v; + } } if (null !== ($v = $this->getUid())) { - $a[self::FIELD_UID] = $v->getValue(); - $a[self::FIELD_UID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_UID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_UID_EXT] = $enc; + } + } else { + $a[self::FIELD_UID] = $v; + } } if (null !== ($v = $this->getUrl())) { - $a[self::FIELD_URL] = $v->getValue(); - $a[self::FIELD_URL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_URL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_URL_EXT] = $enc; + } + } else { + $a[self::FIELD_URL] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRImagingObjectSelection/FHIRImagingObjectSelectionSeries.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRImagingObjectSelection/FHIRImagingObjectSelectionSeries.php index 3929d1ad45..98c08d7943 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRImagingObjectSelection/FHIRImagingObjectSelectionSeries.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRImagingObjectSelection/FHIRImagingObjectSelectionSeries.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -87,10 +87,6 @@ class FHIRImagingObjectSelectionSeries extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_IMAGING_OBJECT_SELECTION_DOT_SERIES; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_INSTANCE = 'instance'; const FIELD_UID = 'uid'; const FIELD_UID_EXT = '_uid'; @@ -139,6 +135,9 @@ class FHIRImagingObjectSelectionSeries extends FHIRBackboneElement */ protected $url = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRImagingObjectSelectionSeries Constructor * @param null|array $data @@ -158,6 +157,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_INSTANCE])) { if (is_array($data[self::FIELD_INSTANCE])) { foreach($data[self::FIELD_INSTANCE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRImagingObjectSelectionInstance) { $this->addInstance($v); } else { @@ -176,8 +178,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_UID] instanceof FHIROid) { $this->setUid($data[self::FIELD_UID]); - } elseif ($ext && is_scalar($data[self::FIELD_UID])) { - $this->setUid(new FHIROid([FHIROid::FIELD_VALUE => $data[self::FIELD_UID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_UID])) { + $this->setUid(new FHIROid([FHIROid::FIELD_VALUE => $data[self::FIELD_UID]] + $ext)); + } else if (is_array($data[self::FIELD_UID])) { + $this->setUid(new FHIROid(array_merge($ext, $data[self::FIELD_UID]))); + } } else { $this->setUid(new FHIROid($data[self::FIELD_UID])); } @@ -188,8 +194,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_URL] instanceof FHIRUri) { $this->setUrl($data[self::FIELD_URL]); - } elseif ($ext && is_scalar($data[self::FIELD_URL])) { - $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } else if (is_array($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri(array_merge($ext, $data[self::FIELD_URL]))); + } } else { $this->setUrl(new FHIRUri($data[self::FIELD_URL])); } @@ -469,7 +479,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getInstance())) { foreach($vs as $v) { if (null === $v) { @@ -478,6 +487,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_INSTANCE, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getUid())) { $v->xmlSerialize($sxe->addChild(self::FIELD_UID, null, $v->_getFHIRXMLNamespace())); } @@ -497,12 +507,26 @@ public function jsonSerialize() $a[self::FIELD_INSTANCE] = $vs; } if (null !== ($v = $this->getUid())) { - $a[self::FIELD_UID] = $v->getValue(); - $a[self::FIELD_UID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_UID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_UID_EXT] = $enc; + } + } else { + $a[self::FIELD_UID] = $v; + } } if (null !== ($v = $this->getUrl())) { - $a[self::FIELD_URL] = $v->getValue(); - $a[self::FIELD_URL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_URL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_URL_EXT] = $enc; + } + } else { + $a[self::FIELD_URL] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRImagingObjectSelection/FHIRImagingObjectSelectionStudy.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRImagingObjectSelection/FHIRImagingObjectSelectionStudy.php index 7f864ef620..705a73283a 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRImagingObjectSelection/FHIRImagingObjectSelectionStudy.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRImagingObjectSelection/FHIRImagingObjectSelectionStudy.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -88,10 +88,6 @@ class FHIRImagingObjectSelectionStudy extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_IMAGING_OBJECT_SELECTION_DOT_STUDY; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_IMAGING_STUDY = 'imagingStudy'; const FIELD_SERIES = 'series'; const FIELD_UID = 'uid'; @@ -153,6 +149,9 @@ class FHIRImagingObjectSelectionStudy extends FHIRBackboneElement */ protected $url = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRImagingObjectSelectionStudy Constructor * @param null|array $data @@ -179,6 +178,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SERIES])) { if (is_array($data[self::FIELD_SERIES])) { foreach($data[self::FIELD_SERIES] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRImagingObjectSelectionSeries) { $this->addSeries($v); } else { @@ -197,8 +199,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_UID] instanceof FHIROid) { $this->setUid($data[self::FIELD_UID]); - } elseif ($ext && is_scalar($data[self::FIELD_UID])) { - $this->setUid(new FHIROid([FHIROid::FIELD_VALUE => $data[self::FIELD_UID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_UID])) { + $this->setUid(new FHIROid([FHIROid::FIELD_VALUE => $data[self::FIELD_UID]] + $ext)); + } else if (is_array($data[self::FIELD_UID])) { + $this->setUid(new FHIROid(array_merge($ext, $data[self::FIELD_UID]))); + } } else { $this->setUid(new FHIROid($data[self::FIELD_UID])); } @@ -209,8 +215,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_URL] instanceof FHIRUri) { $this->setUrl($data[self::FIELD_URL]); - } elseif ($ext && is_scalar($data[self::FIELD_URL])) { - $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } else if (is_array($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri(array_merge($ext, $data[self::FIELD_URL]))); + } } else { $this->setUrl(new FHIRUri($data[self::FIELD_URL])); } @@ -526,11 +536,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getImagingStudy())) { $v->xmlSerialize($sxe->addChild(self::FIELD_IMAGING_STUDY, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getSeries())) { foreach($vs as $v) { if (null === $v) { @@ -539,6 +547,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_SERIES, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getUid())) { $v->xmlSerialize($sxe->addChild(self::FIELD_UID, null, $v->_getFHIRXMLNamespace())); } @@ -561,12 +570,26 @@ public function jsonSerialize() $a[self::FIELD_SERIES] = $vs; } if (null !== ($v = $this->getUid())) { - $a[self::FIELD_UID] = $v->getValue(); - $a[self::FIELD_UID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_UID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_UID_EXT] = $enc; + } + } else { + $a[self::FIELD_UID] = $v; + } } if (null !== ($v = $this->getUrl())) { - $a[self::FIELD_URL] = $v->getValue(); - $a[self::FIELD_URL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_URL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_URL_EXT] = $enc; + } + } else { + $a[self::FIELD_URL] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRImagingStudy/FHIRImagingStudyInstance.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRImagingStudy/FHIRImagingStudyInstance.php index db1692f550..642a935f99 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRImagingStudy/FHIRImagingStudyInstance.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRImagingStudy/FHIRImagingStudyInstance.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -84,10 +84,6 @@ class FHIRImagingStudyInstance extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_IMAGING_STUDY_DOT_INSTANCE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CONTENT = 'content'; const FIELD_NUMBER = 'number'; const FIELD_NUMBER_EXT = '_number'; @@ -172,6 +168,9 @@ class FHIRImagingStudyInstance extends FHIRBackboneElement */ protected $uid = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRImagingStudyInstance Constructor * @param null|array $data @@ -191,6 +190,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CONTENT])) { if (is_array($data[self::FIELD_CONTENT])) { foreach($data[self::FIELD_CONTENT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRAttachment) { $this->addContent($v); } else { @@ -209,8 +211,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NUMBER] instanceof FHIRUnsignedInt) { $this->setNumber($data[self::FIELD_NUMBER]); - } elseif ($ext && is_scalar($data[self::FIELD_NUMBER])) { - $this->setNumber(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_NUMBER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NUMBER])) { + $this->setNumber(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_NUMBER]] + $ext)); + } else if (is_array($data[self::FIELD_NUMBER])) { + $this->setNumber(new FHIRUnsignedInt(array_merge($ext, $data[self::FIELD_NUMBER]))); + } } else { $this->setNumber(new FHIRUnsignedInt($data[self::FIELD_NUMBER])); } @@ -221,8 +227,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SOP_CLASS] instanceof FHIROid) { $this->setSopClass($data[self::FIELD_SOP_CLASS]); - } elseif ($ext && is_scalar($data[self::FIELD_SOP_CLASS])) { - $this->setSopClass(new FHIROid([FHIROid::FIELD_VALUE => $data[self::FIELD_SOP_CLASS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SOP_CLASS])) { + $this->setSopClass(new FHIROid([FHIROid::FIELD_VALUE => $data[self::FIELD_SOP_CLASS]] + $ext)); + } else if (is_array($data[self::FIELD_SOP_CLASS])) { + $this->setSopClass(new FHIROid(array_merge($ext, $data[self::FIELD_SOP_CLASS]))); + } } else { $this->setSopClass(new FHIROid($data[self::FIELD_SOP_CLASS])); } @@ -233,8 +243,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TITLE] instanceof FHIRString) { $this->setTitle($data[self::FIELD_TITLE]); - } elseif ($ext && is_scalar($data[self::FIELD_TITLE])) { - $this->setTitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TITLE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TITLE])) { + $this->setTitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TITLE]] + $ext)); + } else if (is_array($data[self::FIELD_TITLE])) { + $this->setTitle(new FHIRString(array_merge($ext, $data[self::FIELD_TITLE]))); + } } else { $this->setTitle(new FHIRString($data[self::FIELD_TITLE])); } @@ -245,8 +259,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TYPE] instanceof FHIRString) { $this->setType($data[self::FIELD_TYPE]); - } elseif ($ext && is_scalar($data[self::FIELD_TYPE])) { - $this->setType(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TYPE])) { + $this->setType(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } else if (is_array($data[self::FIELD_TYPE])) { + $this->setType(new FHIRString(array_merge($ext, $data[self::FIELD_TYPE]))); + } } else { $this->setType(new FHIRString($data[self::FIELD_TYPE])); } @@ -257,8 +275,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_UID] instanceof FHIROid) { $this->setUid($data[self::FIELD_UID]); - } elseif ($ext && is_scalar($data[self::FIELD_UID])) { - $this->setUid(new FHIROid([FHIROid::FIELD_VALUE => $data[self::FIELD_UID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_UID])) { + $this->setUid(new FHIROid([FHIROid::FIELD_VALUE => $data[self::FIELD_UID]] + $ext)); + } else if (is_array($data[self::FIELD_UID])) { + $this->setUid(new FHIROid(array_merge($ext, $data[self::FIELD_UID]))); + } } else { $this->setUid(new FHIROid($data[self::FIELD_UID])); } @@ -661,7 +683,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getContent())) { foreach($vs as $v) { if (null === $v) { @@ -670,6 +691,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_CONTENT, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getNumber())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NUMBER, null, $v->_getFHIRXMLNamespace())); } @@ -698,24 +720,59 @@ public function jsonSerialize() $a[self::FIELD_CONTENT] = $vs; } if (null !== ($v = $this->getNumber())) { - $a[self::FIELD_NUMBER] = $v->getValue(); - $a[self::FIELD_NUMBER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NUMBER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NUMBER_EXT] = $enc; + } + } else { + $a[self::FIELD_NUMBER] = $v; + } } if (null !== ($v = $this->getSopClass())) { - $a[self::FIELD_SOP_CLASS] = $v->getValue(); - $a[self::FIELD_SOP_CLASS_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SOP_CLASS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SOP_CLASS_EXT] = $enc; + } + } else { + $a[self::FIELD_SOP_CLASS] = $v; + } } if (null !== ($v = $this->getTitle())) { - $a[self::FIELD_TITLE] = $v->getValue(); - $a[self::FIELD_TITLE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TITLE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TITLE_EXT] = $enc; + } + } else { + $a[self::FIELD_TITLE] = $v; + } } if (null !== ($v = $this->getType())) { - $a[self::FIELD_TYPE] = $v->getValue(); - $a[self::FIELD_TYPE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TYPE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TYPE_EXT] = $enc; + } + } else { + $a[self::FIELD_TYPE] = $v; + } } if (null !== ($v = $this->getUid())) { - $a[self::FIELD_UID] = $v->getValue(); - $a[self::FIELD_UID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_UID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_UID_EXT] = $enc; + } + } else { + $a[self::FIELD_UID] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRImagingStudy/FHIRImagingStudySeries.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRImagingStudy/FHIRImagingStudySeries.php index a8d01bfc63..44eb0caa52 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRImagingStudy/FHIRImagingStudySeries.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRImagingStudy/FHIRImagingStudySeries.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -87,10 +87,6 @@ class FHIRImagingStudySeries extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_IMAGING_STUDY_DOT_SERIES; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_AVAILABILITY = 'availability'; const FIELD_AVAILABILITY_EXT = '_availability'; const FIELD_BODY_SITE = 'bodySite'; @@ -238,6 +234,9 @@ class FHIRImagingStudySeries extends FHIRBackboneElement */ protected $url = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRImagingStudySeries Constructor * @param null|array $data @@ -260,8 +259,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_AVAILABILITY] instanceof FHIRInstanceAvailability) { $this->setAvailability($data[self::FIELD_AVAILABILITY]); - } elseif ($ext && is_scalar($data[self::FIELD_AVAILABILITY])) { - $this->setAvailability(new FHIRInstanceAvailability([FHIRInstanceAvailability::FIELD_VALUE => $data[self::FIELD_AVAILABILITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_AVAILABILITY])) { + $this->setAvailability(new FHIRInstanceAvailability([FHIRInstanceAvailability::FIELD_VALUE => $data[self::FIELD_AVAILABILITY]] + $ext)); + } else if (is_array($data[self::FIELD_AVAILABILITY])) { + $this->setAvailability(new FHIRInstanceAvailability(array_merge($ext, $data[self::FIELD_AVAILABILITY]))); + } } else { $this->setAvailability(new FHIRInstanceAvailability($data[self::FIELD_AVAILABILITY])); } @@ -279,8 +282,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -288,6 +295,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_INSTANCE])) { if (is_array($data[self::FIELD_INSTANCE])) { foreach($data[self::FIELD_INSTANCE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRImagingStudyInstance) { $this->addInstance($v); } else { @@ -320,8 +330,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NUMBER] instanceof FHIRUnsignedInt) { $this->setNumber($data[self::FIELD_NUMBER]); - } elseif ($ext && is_scalar($data[self::FIELD_NUMBER])) { - $this->setNumber(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_NUMBER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NUMBER])) { + $this->setNumber(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_NUMBER]] + $ext)); + } else if (is_array($data[self::FIELD_NUMBER])) { + $this->setNumber(new FHIRUnsignedInt(array_merge($ext, $data[self::FIELD_NUMBER]))); + } } else { $this->setNumber(new FHIRUnsignedInt($data[self::FIELD_NUMBER])); } @@ -332,8 +346,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NUMBER_OF_INSTANCES] instanceof FHIRUnsignedInt) { $this->setNumberOfInstances($data[self::FIELD_NUMBER_OF_INSTANCES]); - } elseif ($ext && is_scalar($data[self::FIELD_NUMBER_OF_INSTANCES])) { - $this->setNumberOfInstances(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_NUMBER_OF_INSTANCES]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NUMBER_OF_INSTANCES])) { + $this->setNumberOfInstances(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_NUMBER_OF_INSTANCES]] + $ext)); + } else if (is_array($data[self::FIELD_NUMBER_OF_INSTANCES])) { + $this->setNumberOfInstances(new FHIRUnsignedInt(array_merge($ext, $data[self::FIELD_NUMBER_OF_INSTANCES]))); + } } else { $this->setNumberOfInstances(new FHIRUnsignedInt($data[self::FIELD_NUMBER_OF_INSTANCES])); } @@ -344,8 +362,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STARTED] instanceof FHIRDateTime) { $this->setStarted($data[self::FIELD_STARTED]); - } elseif ($ext && is_scalar($data[self::FIELD_STARTED])) { - $this->setStarted(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_STARTED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STARTED])) { + $this->setStarted(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_STARTED]] + $ext)); + } else if (is_array($data[self::FIELD_STARTED])) { + $this->setStarted(new FHIRDateTime(array_merge($ext, $data[self::FIELD_STARTED]))); + } } else { $this->setStarted(new FHIRDateTime($data[self::FIELD_STARTED])); } @@ -356,8 +378,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_UID] instanceof FHIROid) { $this->setUid($data[self::FIELD_UID]); - } elseif ($ext && is_scalar($data[self::FIELD_UID])) { - $this->setUid(new FHIROid([FHIROid::FIELD_VALUE => $data[self::FIELD_UID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_UID])) { + $this->setUid(new FHIROid([FHIROid::FIELD_VALUE => $data[self::FIELD_UID]] + $ext)); + } else if (is_array($data[self::FIELD_UID])) { + $this->setUid(new FHIROid(array_merge($ext, $data[self::FIELD_UID]))); + } } else { $this->setUid(new FHIROid($data[self::FIELD_UID])); } @@ -368,8 +394,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_URL] instanceof FHIRUri) { $this->setUrl($data[self::FIELD_URL]); - } elseif ($ext && is_scalar($data[self::FIELD_URL])) { - $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } else if (is_array($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri(array_merge($ext, $data[self::FIELD_URL]))); + } } else { $this->setUrl(new FHIRUri($data[self::FIELD_URL])); } @@ -948,18 +978,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getAvailability())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AVAILABILITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getBodySite())) { $v->xmlSerialize($sxe->addChild(self::FIELD_BODY_SITE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getDescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESCRIPTION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getInstance())) { foreach($vs as $v) { if (null === $v) { @@ -972,7 +999,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getLaterality())) { $v->xmlSerialize($sxe->addChild(self::FIELD_LATERALITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getModality())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MODALITY, null, $v->_getFHIRXMLNamespace())); } @@ -1001,14 +1027,29 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getAvailability())) { - $a[self::FIELD_AVAILABILITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_AVAILABILITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_AVAILABILITY_EXT] = $enc; + } + } else { + $a[self::FIELD_AVAILABILITY] = $v; + } } if (null !== ($v = $this->getBodySite())) { $a[self::FIELD_BODY_SITE] = $v; } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if ([] !== ($vs = $this->getInstance())) { $a[self::FIELD_INSTANCE] = $vs; @@ -1020,24 +1061,59 @@ public function jsonSerialize() $a[self::FIELD_MODALITY] = $v; } if (null !== ($v = $this->getNumber())) { - $a[self::FIELD_NUMBER] = $v->getValue(); - $a[self::FIELD_NUMBER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NUMBER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NUMBER_EXT] = $enc; + } + } else { + $a[self::FIELD_NUMBER] = $v; + } } if (null !== ($v = $this->getNumberOfInstances())) { - $a[self::FIELD_NUMBER_OF_INSTANCES] = $v->getValue(); - $a[self::FIELD_NUMBER_OF_INSTANCES_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NUMBER_OF_INSTANCES] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NUMBER_OF_INSTANCES_EXT] = $enc; + } + } else { + $a[self::FIELD_NUMBER_OF_INSTANCES] = $v; + } } if (null !== ($v = $this->getStarted())) { - $a[self::FIELD_STARTED] = $v->getValue(); - $a[self::FIELD_STARTED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STARTED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STARTED_EXT] = $enc; + } + } else { + $a[self::FIELD_STARTED] = $v; + } } if (null !== ($v = $this->getUid())) { - $a[self::FIELD_UID] = $v->getValue(); - $a[self::FIELD_UID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_UID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_UID_EXT] = $enc; + } + } else { + $a[self::FIELD_UID] = $v; + } } if (null !== ($v = $this->getUrl())) { - $a[self::FIELD_URL] = $v->getValue(); - $a[self::FIELD_URL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_URL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_URL_EXT] = $enc; + } + } else { + $a[self::FIELD_URL] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRImmunization/FHIRImmunizationExplanation.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRImmunization/FHIRImmunizationExplanation.php index 2d4ebe29c7..95b8420dfe 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRImmunization/FHIRImmunizationExplanation.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRImmunization/FHIRImmunizationExplanation.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRImmunizationExplanation extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_IMMUNIZATION_DOT_EXPLANATION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_REASON = 'reason'; const FIELD_REASON_NOT_GIVEN = 'reasonNotGiven'; @@ -110,6 +106,9 @@ class FHIRImmunizationExplanation extends FHIRBackboneElement */ protected $reasonNotGiven = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRImmunizationExplanation Constructor * @param null|array $data @@ -129,6 +128,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REASON])) { if (is_array($data[self::FIELD_REASON])) { foreach($data[self::FIELD_REASON] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addReason($v); } else { @@ -144,6 +146,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REASON_NOT_GIVEN])) { if (is_array($data[self::FIELD_REASON_NOT_GIVEN])) { foreach($data[self::FIELD_REASON_NOT_GIVEN] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addReasonNotGiven($v); } else { @@ -385,7 +390,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getReason())) { foreach($vs as $v) { if (null === $v) { @@ -403,6 +407,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_REASON_NOT_GIVEN, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRImmunization/FHIRImmunizationReaction.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRImmunization/FHIRImmunizationReaction.php index ca4b6c5490..bc581dbec0 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRImmunization/FHIRImmunizationReaction.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRImmunization/FHIRImmunizationReaction.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -81,10 +81,6 @@ class FHIRImmunizationReaction extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_IMMUNIZATION_DOT_REACTION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DATE = 'date'; const FIELD_DATE_EXT = '_date'; const FIELD_DETAIL = 'detail'; @@ -126,6 +122,9 @@ class FHIRImmunizationReaction extends FHIRBackboneElement */ protected $reported = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRImmunizationReaction Constructor * @param null|array $data @@ -148,8 +147,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATE] instanceof FHIRDateTime) { $this->setDate($data[self::FIELD_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_DATE])) { - $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime(array_merge($ext, $data[self::FIELD_DATE]))); + } } else { $this->setDate(new FHIRDateTime($data[self::FIELD_DATE])); } @@ -167,8 +170,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_REPORTED] instanceof FHIRBoolean) { $this->setReported($data[self::FIELD_REPORTED]); - } elseif ($ext && is_scalar($data[self::FIELD_REPORTED])) { - $this->setReported(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_REPORTED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_REPORTED])) { + $this->setReported(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_REPORTED]] + $ext)); + } else if (is_array($data[self::FIELD_REPORTED])) { + $this->setReported(new FHIRBoolean(array_merge($ext, $data[self::FIELD_REPORTED]))); + } } else { $this->setReported(new FHIRBoolean($data[self::FIELD_REPORTED])); } @@ -402,7 +409,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DATE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDetail())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DETAIL, null, $v->_getFHIRXMLNamespace())); } @@ -419,15 +425,29 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getDate())) { - $a[self::FIELD_DATE] = $v->getValue(); - $a[self::FIELD_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_DATE] = $v; + } } if (null !== ($v = $this->getDetail())) { $a[self::FIELD_DETAIL] = $v; } if (null !== ($v = $this->getReported())) { - $a[self::FIELD_REPORTED] = $v->getValue(); - $a[self::FIELD_REPORTED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_REPORTED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_REPORTED_EXT] = $enc; + } + } else { + $a[self::FIELD_REPORTED] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRImmunization/FHIRImmunizationVaccinationProtocol.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRImmunization/FHIRImmunizationVaccinationProtocol.php index 64810f20c9..61f92f92ea 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRImmunization/FHIRImmunizationVaccinationProtocol.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRImmunization/FHIRImmunizationVaccinationProtocol.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -82,10 +82,6 @@ class FHIRImmunizationVaccinationProtocol extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_IMMUNIZATION_DOT_VACCINATION_PROTOCOL; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_AUTHORITY = 'authority'; const FIELD_DESCRIPTION = 'description'; const FIELD_DESCRIPTION_EXT = '_description'; @@ -193,6 +189,9 @@ class FHIRImmunizationVaccinationProtocol extends FHIRBackboneElement */ protected $targetDisease = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRImmunizationVaccinationProtocol Constructor * @param null|array $data @@ -222,8 +221,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -234,8 +237,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DOSE_SEQUENCE] instanceof FHIRPositiveInt) { $this->setDoseSequence($data[self::FIELD_DOSE_SEQUENCE]); - } elseif ($ext && is_scalar($data[self::FIELD_DOSE_SEQUENCE])) { - $this->setDoseSequence(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_DOSE_SEQUENCE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DOSE_SEQUENCE])) { + $this->setDoseSequence(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_DOSE_SEQUENCE]] + $ext)); + } else if (is_array($data[self::FIELD_DOSE_SEQUENCE])) { + $this->setDoseSequence(new FHIRPositiveInt(array_merge($ext, $data[self::FIELD_DOSE_SEQUENCE]))); + } } else { $this->setDoseSequence(new FHIRPositiveInt($data[self::FIELD_DOSE_SEQUENCE])); } @@ -260,8 +267,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SERIES] instanceof FHIRString) { $this->setSeries($data[self::FIELD_SERIES]); - } elseif ($ext && is_scalar($data[self::FIELD_SERIES])) { - $this->setSeries(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SERIES]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SERIES])) { + $this->setSeries(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SERIES]] + $ext)); + } else if (is_array($data[self::FIELD_SERIES])) { + $this->setSeries(new FHIRString(array_merge($ext, $data[self::FIELD_SERIES]))); + } } else { $this->setSeries(new FHIRString($data[self::FIELD_SERIES])); } @@ -272,8 +283,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SERIES_DOSES] instanceof FHIRPositiveInt) { $this->setSeriesDoses($data[self::FIELD_SERIES_DOSES]); - } elseif ($ext && is_scalar($data[self::FIELD_SERIES_DOSES])) { - $this->setSeriesDoses(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_SERIES_DOSES]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SERIES_DOSES])) { + $this->setSeriesDoses(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_SERIES_DOSES]] + $ext)); + } else if (is_array($data[self::FIELD_SERIES_DOSES])) { + $this->setSeriesDoses(new FHIRPositiveInt(array_merge($ext, $data[self::FIELD_SERIES_DOSES]))); + } } else { $this->setSeriesDoses(new FHIRPositiveInt($data[self::FIELD_SERIES_DOSES])); } @@ -281,6 +296,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_TARGET_DISEASE])) { if (is_array($data[self::FIELD_TARGET_DISEASE])) { foreach($data[self::FIELD_TARGET_DISEASE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addTargetDisease($v); } else { @@ -743,7 +761,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getAuthority())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AUTHORITY, null, $v->_getFHIRXMLNamespace())); } @@ -753,11 +770,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDoseSequence())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DOSE_SEQUENCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDoseStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DOSE_STATUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDoseStatusReason())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DOSE_STATUS_REASON, null, $v->_getFHIRXMLNamespace())); } @@ -767,7 +782,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getSeriesDoses())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SERIES_DOSES, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getTargetDisease())) { foreach($vs as $v) { if (null === $v) { @@ -776,6 +790,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_TARGET_DISEASE, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } @@ -789,12 +804,26 @@ public function jsonSerialize() $a[self::FIELD_AUTHORITY] = $v; } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if (null !== ($v = $this->getDoseSequence())) { - $a[self::FIELD_DOSE_SEQUENCE] = $v->getValue(); - $a[self::FIELD_DOSE_SEQUENCE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DOSE_SEQUENCE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DOSE_SEQUENCE_EXT] = $enc; + } + } else { + $a[self::FIELD_DOSE_SEQUENCE] = $v; + } } if (null !== ($v = $this->getDoseStatus())) { $a[self::FIELD_DOSE_STATUS] = $v; @@ -803,12 +832,26 @@ public function jsonSerialize() $a[self::FIELD_DOSE_STATUS_REASON] = $v; } if (null !== ($v = $this->getSeries())) { - $a[self::FIELD_SERIES] = $v->getValue(); - $a[self::FIELD_SERIES_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SERIES] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SERIES_EXT] = $enc; + } + } else { + $a[self::FIELD_SERIES] = $v; + } } if (null !== ($v = $this->getSeriesDoses())) { - $a[self::FIELD_SERIES_DOSES] = $v->getValue(); - $a[self::FIELD_SERIES_DOSES_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SERIES_DOSES] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SERIES_DOSES_EXT] = $enc; + } + } else { + $a[self::FIELD_SERIES_DOSES] = $v; + } } if ([] !== ($vs = $this->getTargetDisease())) { $a[self::FIELD_TARGET_DISEASE] = $vs; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRImmunizationRecommendation/FHIRImmunizationRecommendationDateCriterion.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRImmunizationRecommendation/FHIRImmunizationRecommendationDateCriterion.php index 2bbd570a02..34b113839a 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRImmunizationRecommendation/FHIRImmunizationRecommendationDateCriterion.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRImmunizationRecommendation/FHIRImmunizationRecommendationDateCriterion.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRImmunizationRecommendationDateCriterion extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_IMMUNIZATION_RECOMMENDATION_DOT_DATE_CRITERION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CODE = 'code'; const FIELD_VALUE = 'value'; const FIELD_VALUE_EXT = '_value'; @@ -115,6 +111,9 @@ class FHIRImmunizationRecommendationDateCriterion extends FHIRBackboneElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRImmunizationRecommendationDateCriterion Constructor * @param null|array $data @@ -148,8 +147,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE] instanceof FHIRDateTime) { $this->setValue($data[self::FIELD_VALUE]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE])) { - $this->setValue(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_VALUE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE])) { + $this->setValue(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_VALUE]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE])) { + $this->setValue(new FHIRDateTime(array_merge($ext, $data[self::FIELD_VALUE]))); + } } else { $this->setValue(new FHIRDateTime($data[self::FIELD_VALUE])); } @@ -342,11 +345,11 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getValue())) { + $sxe->addAttribute(self::FIELD_VALUE, (string)$v); $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE, null, $v->_getFHIRXMLNamespace())); } return $sxe; @@ -362,8 +365,15 @@ public function jsonSerialize() $a[self::FIELD_CODE] = $v; } if (null !== ($v = $this->getValue())) { - $a[self::FIELD_VALUE] = $v->getValue(); - $a[self::FIELD_VALUE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRImmunizationRecommendation/FHIRImmunizationRecommendationProtocol.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRImmunizationRecommendation/FHIRImmunizationRecommendationProtocol.php index 2c12be1c7c..25574bc293 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRImmunizationRecommendation/FHIRImmunizationRecommendationProtocol.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRImmunizationRecommendation/FHIRImmunizationRecommendationProtocol.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -81,10 +81,6 @@ class FHIRImmunizationRecommendationProtocol extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_IMMUNIZATION_RECOMMENDATION_DOT_PROTOCOL; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_AUTHORITY = 'authority'; const FIELD_DESCRIPTION = 'description'; const FIELD_DESCRIPTION_EXT = '_description'; @@ -140,6 +136,9 @@ class FHIRImmunizationRecommendationProtocol extends FHIRBackboneElement */ protected $series = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRImmunizationRecommendationProtocol Constructor * @param null|array $data @@ -169,8 +168,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -181,8 +184,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DOSE_SEQUENCE] instanceof FHIRInteger) { $this->setDoseSequence($data[self::FIELD_DOSE_SEQUENCE]); - } elseif ($ext && is_scalar($data[self::FIELD_DOSE_SEQUENCE])) { - $this->setDoseSequence(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_DOSE_SEQUENCE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DOSE_SEQUENCE])) { + $this->setDoseSequence(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_DOSE_SEQUENCE]] + $ext)); + } else if (is_array($data[self::FIELD_DOSE_SEQUENCE])) { + $this->setDoseSequence(new FHIRInteger(array_merge($ext, $data[self::FIELD_DOSE_SEQUENCE]))); + } } else { $this->setDoseSequence(new FHIRInteger($data[self::FIELD_DOSE_SEQUENCE])); } @@ -193,8 +200,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SERIES] instanceof FHIRString) { $this->setSeries($data[self::FIELD_SERIES]); - } elseif ($ext && is_scalar($data[self::FIELD_SERIES])) { - $this->setSeries(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SERIES]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SERIES])) { + $this->setSeries(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SERIES]] + $ext)); + } else if (is_array($data[self::FIELD_SERIES])) { + $this->setSeries(new FHIRString(array_merge($ext, $data[self::FIELD_SERIES]))); + } } else { $this->setSeries(new FHIRString($data[self::FIELD_SERIES])); } @@ -471,7 +482,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getAuthority())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AUTHORITY, null, $v->_getFHIRXMLNamespace())); } @@ -497,16 +507,37 @@ public function jsonSerialize() $a[self::FIELD_AUTHORITY] = $v; } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if (null !== ($v = $this->getDoseSequence())) { - $a[self::FIELD_DOSE_SEQUENCE] = $v->getValue(); - $a[self::FIELD_DOSE_SEQUENCE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DOSE_SEQUENCE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DOSE_SEQUENCE_EXT] = $enc; + } + } else { + $a[self::FIELD_DOSE_SEQUENCE] = $v; + } } if (null !== ($v = $this->getSeries())) { - $a[self::FIELD_SERIES] = $v->getValue(); - $a[self::FIELD_SERIES_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SERIES] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SERIES_EXT] = $enc; + } + } else { + $a[self::FIELD_SERIES] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRImmunizationRecommendation/FHIRImmunizationRecommendationRecommendation.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRImmunizationRecommendation/FHIRImmunizationRecommendationRecommendation.php index 2a36c82907..3cf9e208fe 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRImmunizationRecommendation/FHIRImmunizationRecommendationRecommendation.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRImmunizationRecommendation/FHIRImmunizationRecommendationRecommendation.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -82,10 +82,6 @@ class FHIRImmunizationRecommendationRecommendation extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_IMMUNIZATION_RECOMMENDATION_DOT_RECOMMENDATION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DATE = 'date'; const FIELD_DATE_EXT = '_date'; const FIELD_DATE_CRITERION = 'dateCriterion'; @@ -195,6 +191,9 @@ class FHIRImmunizationRecommendationRecommendation extends FHIRBackboneElement */ protected $vaccineCode = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRImmunizationRecommendationRecommendation Constructor * @param null|array $data @@ -217,8 +216,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATE] instanceof FHIRDateTime) { $this->setDate($data[self::FIELD_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_DATE])) { - $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime(array_merge($ext, $data[self::FIELD_DATE]))); + } } else { $this->setDate(new FHIRDateTime($data[self::FIELD_DATE])); } @@ -229,17 +232,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_DATE_CRITERION])) { foreach($data[self::FIELD_DATE_CRITERION] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRImmunizationRecommendationDateCriterion) { $this->addDateCriterion($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addDateCriterion(new FHIRImmunizationRecommendationDateCriterion([FHIRImmunizationRecommendationDateCriterion::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addDateCriterion(new FHIRImmunizationRecommendationDateCriterion([FHIRImmunizationRecommendationDateCriterion::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addDateCriterion(new FHIRImmunizationRecommendationDateCriterion(array_merge($v, $ext[$i]))); + } } else { $this->addDateCriterion(new FHIRImmunizationRecommendationDateCriterion($v)); } } } elseif ($data[self::FIELD_DATE_CRITERION] instanceof FHIRImmunizationRecommendationDateCriterion) { $this->addDateCriterion($data[self::FIELD_DATE_CRITERION]); - } elseif ($ext && is_scalar($data[self::FIELD_DATE_CRITERION])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_DATE_CRITERION])) { $this->addDateCriterion(new FHIRImmunizationRecommendationDateCriterion([FHIRImmunizationRecommendationDateCriterion::FIELD_VALUE => $data[self::FIELD_DATE_CRITERION]] + $ext)); } else { $this->addDateCriterion(new FHIRImmunizationRecommendationDateCriterion($data[self::FIELD_DATE_CRITERION])); @@ -251,8 +261,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DOSE_NUMBER] instanceof FHIRPositiveInt) { $this->setDoseNumber($data[self::FIELD_DOSE_NUMBER]); - } elseif ($ext && is_scalar($data[self::FIELD_DOSE_NUMBER])) { - $this->setDoseNumber(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_DOSE_NUMBER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DOSE_NUMBER])) { + $this->setDoseNumber(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_DOSE_NUMBER]] + $ext)); + } else if (is_array($data[self::FIELD_DOSE_NUMBER])) { + $this->setDoseNumber(new FHIRPositiveInt(array_merge($ext, $data[self::FIELD_DOSE_NUMBER]))); + } } else { $this->setDoseNumber(new FHIRPositiveInt($data[self::FIELD_DOSE_NUMBER])); } @@ -274,6 +288,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SUPPORTING_IMMUNIZATION])) { if (is_array($data[self::FIELD_SUPPORTING_IMMUNIZATION])) { foreach($data[self::FIELD_SUPPORTING_IMMUNIZATION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addSupportingImmunization($v); } else { @@ -289,6 +306,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SUPPORTING_PATIENT_INFORMATION])) { if (is_array($data[self::FIELD_SUPPORTING_PATIENT_INFORMATION])) { foreach($data[self::FIELD_SUPPORTING_PATIENT_INFORMATION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addSupportingPatientInformation($v); } else { @@ -802,7 +822,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DATE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getDateCriterion())) { foreach($vs as $v) { if (null === $v) { @@ -811,18 +830,16 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_DATE_CRITERION, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getDoseNumber())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DOSE_NUMBER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getForecastStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FORECAST_STATUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getProtocol())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PROTOCOL, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getSupportingImmunization())) { foreach($vs as $v) { if (null === $v) { @@ -854,15 +871,45 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getDate())) { - $a[self::FIELD_DATE] = $v->getValue(); - $a[self::FIELD_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_DATE] = $v; + } } if ([] !== ($vs = $this->getDateCriterion())) { - $a[self::FIELD_DATE_CRITERION] = $vs; + $a[self::FIELD_DATE_CRITERION] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATE_CRITERION][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATE_CRITERION_EXT][] = $enc; + } else { + $a[self::FIELD_DATE_CRITERION_EXT][] = null; + } + } else { + $a[self::FIELD_DATE_CRITERION][] = $v; + } + } } if (null !== ($v = $this->getDoseNumber())) { - $a[self::FIELD_DOSE_NUMBER] = $v->getValue(); - $a[self::FIELD_DOSE_NUMBER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DOSE_NUMBER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DOSE_NUMBER_EXT] = $enc; + } + } else { + $a[self::FIELD_DOSE_NUMBER] = $v; + } } if (null !== ($v = $this->getForecastStatus())) { $a[self::FIELD_FORECAST_STATUS] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuideContact.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuideContact.php index c97e82c03e..dc8633ebc2 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuideContact.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuideContact.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRImplementationGuideContact extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_IMPLEMENTATION_GUIDE_DOT_CONTACT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_NAME = 'name'; const FIELD_NAME_EXT = '_name'; const FIELD_TELECOM = 'telecom'; @@ -112,6 +108,9 @@ class FHIRImplementationGuideContact extends FHIRBackboneElement */ protected $telecom = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRImplementationGuideContact Constructor * @param null|array $data @@ -134,8 +133,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -146,17 +149,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_TELECOM])) { foreach($data[self::FIELD_TELECOM] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContactPoint) { $this->addTelecom($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addTelecom(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addTelecom(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addTelecom(new FHIRContactPoint(array_merge($v, $ext[$i]))); + } } else { $this->addTelecom(new FHIRContactPoint($v)); } } } elseif ($data[self::FIELD_TELECOM] instanceof FHIRContactPoint) { $this->addTelecom($data[self::FIELD_TELECOM]); - } elseif ($ext && is_scalar($data[self::FIELD_TELECOM])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_TELECOM])) { $this->addTelecom(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $data[self::FIELD_TELECOM]] + $ext)); } else { $this->addTelecom(new FHIRContactPoint($data[self::FIELD_TELECOM])); @@ -374,7 +384,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NAME, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getTelecom())) { foreach($vs as $v) { if (null === $v) { @@ -383,6 +392,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_TELECOM, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } @@ -393,11 +403,34 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if ([] !== ($vs = $this->getTelecom())) { - $a[self::FIELD_TELECOM] = $vs; + $a[self::FIELD_TELECOM] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TELECOM][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TELECOM_EXT][] = $enc; + } else { + $a[self::FIELD_TELECOM_EXT][] = null; + } + } else { + $a[self::FIELD_TELECOM][] = $v; + } + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuideDependency.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuideDependency.php index 9d4793a29f..c880b30b41 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuideDependency.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuideDependency.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRImplementationGuideDependency extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_IMPLEMENTATION_GUIDE_DOT_DEPENDENCY; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_TYPE = 'type'; const FIELD_TYPE_EXT = '_type'; const FIELD_URI = 'uri'; @@ -110,6 +106,9 @@ class FHIRImplementationGuideDependency extends FHIRBackboneElement */ protected $uri = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRImplementationGuideDependency Constructor * @param null|array $data @@ -132,8 +131,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TYPE] instanceof FHIRGuideDependencyType) { $this->setType($data[self::FIELD_TYPE]); - } elseif ($ext && is_scalar($data[self::FIELD_TYPE])) { - $this->setType(new FHIRGuideDependencyType([FHIRGuideDependencyType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TYPE])) { + $this->setType(new FHIRGuideDependencyType([FHIRGuideDependencyType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } else if (is_array($data[self::FIELD_TYPE])) { + $this->setType(new FHIRGuideDependencyType(array_merge($ext, $data[self::FIELD_TYPE]))); + } } else { $this->setType(new FHIRGuideDependencyType($data[self::FIELD_TYPE])); } @@ -144,8 +147,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_URI] instanceof FHIRUri) { $this->setUri($data[self::FIELD_URI]); - } elseif ($ext && is_scalar($data[self::FIELD_URI])) { - $this->setUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URI]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_URI])) { + $this->setUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URI]] + $ext)); + } else if (is_array($data[self::FIELD_URI])) { + $this->setUri(new FHIRUri(array_merge($ext, $data[self::FIELD_URI]))); + } } else { $this->setUri(new FHIRUri($data[self::FIELD_URI])); } @@ -326,7 +333,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -343,11 +349,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getType())) { - $a[self::FIELD_TYPE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TYPE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TYPE_EXT] = $enc; + } + } else { + $a[self::FIELD_TYPE] = $v; + } } if (null !== ($v = $this->getUri())) { - $a[self::FIELD_URI] = $v->getValue(); - $a[self::FIELD_URI_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_URI] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_URI_EXT] = $enc; + } + } else { + $a[self::FIELD_URI] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuideGlobal.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuideGlobal.php index bb1c38ca6a..403dba9619 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuideGlobal.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuideGlobal.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRImplementationGuideGlobal extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_IMPLEMENTATION_GUIDE_DOT_GLOBAL; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_PROFILE = 'profile'; const FIELD_TYPE = 'type'; const FIELD_TYPE_EXT = '_type'; @@ -111,6 +107,9 @@ class FHIRImplementationGuideGlobal extends FHIRBackboneElement */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRImplementationGuideGlobal Constructor * @param null|array $data @@ -140,8 +139,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TYPE] instanceof FHIRCode) { $this->setType($data[self::FIELD_TYPE]); - } elseif ($ext && is_scalar($data[self::FIELD_TYPE])) { - $this->setType(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TYPE])) { + $this->setType(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } else if (is_array($data[self::FIELD_TYPE])) { + $this->setType(new FHIRCode(array_merge($ext, $data[self::FIELD_TYPE]))); + } } else { $this->setType(new FHIRCode($data[self::FIELD_TYPE])); } @@ -326,7 +329,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getProfile())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PROFILE, null, $v->_getFHIRXMLNamespace())); } @@ -346,8 +348,15 @@ public function jsonSerialize() $a[self::FIELD_PROFILE] = $v; } if (null !== ($v = $this->getType())) { - $a[self::FIELD_TYPE] = $v->getValue(); - $a[self::FIELD_TYPE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TYPE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TYPE_EXT] = $enc; + } + } else { + $a[self::FIELD_TYPE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuidePackage.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuidePackage.php index e07ba4d331..d7775da1d0 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuidePackage.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuidePackage.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRImplementationGuidePackage extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_IMPLEMENTATION_GUIDE_DOT_PACKAGE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DESCRIPTION = 'description'; const FIELD_DESCRIPTION_EXT = '_description'; const FIELD_NAME = 'name'; @@ -125,6 +121,9 @@ class FHIRImplementationGuidePackage extends FHIRBackboneElement */ protected $resource = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRImplementationGuidePackage Constructor * @param null|array $data @@ -147,8 +146,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -159,8 +162,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -168,6 +175,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_RESOURCE])) { if (is_array($data[self::FIELD_RESOURCE])) { foreach($data[self::FIELD_RESOURCE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRImplementationGuideResource) { $this->addResource($v); } else { @@ -445,7 +455,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NAME, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getResource())) { foreach($vs as $v) { if (null === $v) { @@ -454,6 +463,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_RESOURCE, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } @@ -464,12 +474,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if ([] !== ($vs = $this->getResource())) { $a[self::FIELD_RESOURCE] = $vs; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuidePage.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuidePage.php index 2672c814ae..e3ce21080d 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuidePage.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuidePage.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -82,10 +82,6 @@ class FHIRImplementationGuidePage extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_IMPLEMENTATION_GUIDE_DOT_PAGE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_FORMAT = 'format'; const FIELD_FORMAT_EXT = '_format'; const FIELD_KIND = 'kind'; @@ -182,6 +178,9 @@ class FHIRImplementationGuidePage extends FHIRBackboneElement */ protected $type = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRImplementationGuidePage Constructor * @param null|array $data @@ -204,8 +203,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_FORMAT] instanceof FHIRCode) { $this->setFormat($data[self::FIELD_FORMAT]); - } elseif ($ext && is_scalar($data[self::FIELD_FORMAT])) { - $this->setFormat(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_FORMAT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_FORMAT])) { + $this->setFormat(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_FORMAT]] + $ext)); + } else if (is_array($data[self::FIELD_FORMAT])) { + $this->setFormat(new FHIRCode(array_merge($ext, $data[self::FIELD_FORMAT]))); + } } else { $this->setFormat(new FHIRCode($data[self::FIELD_FORMAT])); } @@ -216,8 +219,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_KIND] instanceof FHIRGuidePageKind) { $this->setKind($data[self::FIELD_KIND]); - } elseif ($ext && is_scalar($data[self::FIELD_KIND])) { - $this->setKind(new FHIRGuidePageKind([FHIRGuidePageKind::FIELD_VALUE => $data[self::FIELD_KIND]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_KIND])) { + $this->setKind(new FHIRGuidePageKind([FHIRGuidePageKind::FIELD_VALUE => $data[self::FIELD_KIND]] + $ext)); + } else if (is_array($data[self::FIELD_KIND])) { + $this->setKind(new FHIRGuidePageKind(array_merge($ext, $data[self::FIELD_KIND]))); + } } else { $this->setKind(new FHIRGuidePageKind($data[self::FIELD_KIND])); } @@ -228,8 +235,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -240,17 +251,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_PACKAGE])) { foreach($data[self::FIELD_PACKAGE] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRString) { $this->addPackage($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addPackage(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addPackage(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addPackage(new FHIRString(array_merge($v, $ext[$i]))); + } } else { $this->addPackage(new FHIRString($v)); } } } elseif ($data[self::FIELD_PACKAGE] instanceof FHIRString) { $this->addPackage($data[self::FIELD_PACKAGE]); - } elseif ($ext && is_scalar($data[self::FIELD_PACKAGE])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_PACKAGE])) { $this->addPackage(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PACKAGE]] + $ext)); } else { $this->addPackage(new FHIRString($data[self::FIELD_PACKAGE])); @@ -259,6 +277,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PAGE])) { if (is_array($data[self::FIELD_PAGE])) { foreach($data[self::FIELD_PAGE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRImplementationGuidePage) { $this->addPage($v); } else { @@ -277,8 +298,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SOURCE] instanceof FHIRUri) { $this->setSource($data[self::FIELD_SOURCE]); - } elseif ($ext && is_scalar($data[self::FIELD_SOURCE])) { - $this->setSource(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_SOURCE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SOURCE])) { + $this->setSource(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_SOURCE]] + $ext)); + } else if (is_array($data[self::FIELD_SOURCE])) { + $this->setSource(new FHIRUri(array_merge($ext, $data[self::FIELD_SOURCE]))); + } } else { $this->setSource(new FHIRUri($data[self::FIELD_SOURCE])); } @@ -289,17 +314,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_TYPE])) { foreach($data[self::FIELD_TYPE] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCode) { $this->addType($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addType(new FHIRCode([FHIRCode::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addType(new FHIRCode([FHIRCode::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addType(new FHIRCode(array_merge($v, $ext[$i]))); + } } else { $this->addType(new FHIRCode($v)); } } } elseif ($data[self::FIELD_TYPE] instanceof FHIRCode) { $this->addType($data[self::FIELD_TYPE]); - } elseif ($ext && is_scalar($data[self::FIELD_TYPE])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_TYPE])) { $this->addType(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); } else { $this->addType(new FHIRCode($data[self::FIELD_TYPE])); @@ -791,7 +823,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getFormat())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FORMAT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getKind())) { $v->xmlSerialize($sxe->addChild(self::FIELD_KIND, null, $v->_getFHIRXMLNamespace())); } @@ -815,6 +846,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_PAGE, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getSource())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SOURCE, null, $v->_getFHIRXMLNamespace())); } @@ -826,6 +858,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } @@ -836,15 +869,37 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getFormat())) { - $a[self::FIELD_FORMAT] = $v->getValue(); - $a[self::FIELD_FORMAT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FORMAT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FORMAT_EXT] = $enc; + } + } else { + $a[self::FIELD_FORMAT] = $v; + } } if (null !== ($v = $this->getKind())) { - $a[self::FIELD_KIND] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_KIND] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_KIND_EXT] = $enc; + } + } else { + $a[self::FIELD_KIND] = $v; + } } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if ([] !== ($vs = $this->getPackage())) { $a[self::FIELD_PACKAGE] = []; @@ -852,16 +907,32 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_PACKAGE][] = $v->getValue(); - $a[self::FIELD_PACKAGE_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PACKAGE][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PACKAGE_EXT][] = $enc; + } else { + $a[self::FIELD_PACKAGE_EXT][] = null; + } + } else { + $a[self::FIELD_PACKAGE][] = $v; + } } } if ([] !== ($vs = $this->getPage())) { $a[self::FIELD_PAGE] = $vs; } if (null !== ($v = $this->getSource())) { - $a[self::FIELD_SOURCE] = $v->getValue(); - $a[self::FIELD_SOURCE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SOURCE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SOURCE_EXT] = $enc; + } + } else { + $a[self::FIELD_SOURCE] = $v; + } } if ([] !== ($vs = $this->getType())) { $a[self::FIELD_TYPE] = []; @@ -869,8 +940,17 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_TYPE][] = $v->getValue(); - $a[self::FIELD_TYPE_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TYPE][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TYPE_EXT][] = $enc; + } else { + $a[self::FIELD_TYPE_EXT][] = null; + } + } else { + $a[self::FIELD_TYPE][] = $v; + } } } return $a; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuideResource.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuideResource.php index ffd56c2090..b12a8224c6 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuideResource.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuideResource.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -82,10 +82,6 @@ class FHIRImplementationGuideResource extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_IMPLEMENTATION_GUIDE_DOT_RESOURCE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ACRONYM = 'acronym'; const FIELD_ACRONYM_EXT = '_acronym'; const FIELD_DESCRIPTION = 'description'; @@ -179,6 +175,9 @@ class FHIRImplementationGuideResource extends FHIRBackboneElement */ protected $sourceUri = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRImplementationGuideResource Constructor * @param null|array $data @@ -201,8 +200,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ACRONYM] instanceof FHIRString) { $this->setAcronym($data[self::FIELD_ACRONYM]); - } elseif ($ext && is_scalar($data[self::FIELD_ACRONYM])) { - $this->setAcronym(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_ACRONYM]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ACRONYM])) { + $this->setAcronym(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_ACRONYM]] + $ext)); + } else if (is_array($data[self::FIELD_ACRONYM])) { + $this->setAcronym(new FHIRString(array_merge($ext, $data[self::FIELD_ACRONYM]))); + } } else { $this->setAcronym(new FHIRString($data[self::FIELD_ACRONYM])); } @@ -213,8 +216,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -232,8 +239,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -244,8 +255,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PURPOSE] instanceof FHIRGuideResourcePurpose) { $this->setPurpose($data[self::FIELD_PURPOSE]); - } elseif ($ext && is_scalar($data[self::FIELD_PURPOSE])) { - $this->setPurpose(new FHIRGuideResourcePurpose([FHIRGuideResourcePurpose::FIELD_VALUE => $data[self::FIELD_PURPOSE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PURPOSE])) { + $this->setPurpose(new FHIRGuideResourcePurpose([FHIRGuideResourcePurpose::FIELD_VALUE => $data[self::FIELD_PURPOSE]] + $ext)); + } else if (is_array($data[self::FIELD_PURPOSE])) { + $this->setPurpose(new FHIRGuideResourcePurpose(array_merge($ext, $data[self::FIELD_PURPOSE]))); + } } else { $this->setPurpose(new FHIRGuideResourcePurpose($data[self::FIELD_PURPOSE])); } @@ -263,8 +278,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SOURCE_URI] instanceof FHIRUri) { $this->setSourceUri($data[self::FIELD_SOURCE_URI]); - } elseif ($ext && is_scalar($data[self::FIELD_SOURCE_URI])) { - $this->setSourceUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_SOURCE_URI]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SOURCE_URI])) { + $this->setSourceUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_SOURCE_URI]] + $ext)); + } else if (is_array($data[self::FIELD_SOURCE_URI])) { + $this->setSourceUri(new FHIRUri(array_merge($ext, $data[self::FIELD_SOURCE_URI]))); + } } else { $this->setSourceUri(new FHIRUri($data[self::FIELD_SOURCE_URI])); } @@ -657,18 +676,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESCRIPTION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getExampleFor())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EXAMPLE_FOR, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NAME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPurpose())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PURPOSE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSourceReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SOURCE_REFERENCE, null, $v->_getFHIRXMLNamespace())); } @@ -685,29 +701,65 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getAcronym())) { - $a[self::FIELD_ACRONYM] = $v->getValue(); - $a[self::FIELD_ACRONYM_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ACRONYM] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ACRONYM_EXT] = $enc; + } + } else { + $a[self::FIELD_ACRONYM] = $v; + } } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if (null !== ($v = $this->getExampleFor())) { $a[self::FIELD_EXAMPLE_FOR] = $v; } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if (null !== ($v = $this->getPurpose())) { - $a[self::FIELD_PURPOSE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PURPOSE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PURPOSE_EXT] = $enc; + } + } else { + $a[self::FIELD_PURPOSE] = $v; + } } if (null !== ($v = $this->getSourceReference())) { $a[self::FIELD_SOURCE_REFERENCE] = $v; } if (null !== ($v = $this->getSourceUri())) { - $a[self::FIELD_SOURCE_URI] = $v->getValue(); - $a[self::FIELD_SOURCE_URI_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SOURCE_URI] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SOURCE_URI_EXT] = $enc; + } + } else { + $a[self::FIELD_SOURCE_URI] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRList/FHIRListEntry.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRList/FHIRListEntry.php index 8630fbd316..1b5250e3dc 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRList/FHIRListEntry.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRList/FHIRListEntry.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRListEntry extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_LIST_DOT_ENTRY; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DATE = 'date'; const FIELD_DATE_EXT = '_date'; const FIELD_DELETED = 'deleted'; @@ -139,6 +135,9 @@ class FHIRListEntry extends FHIRBackboneElement */ protected $item = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRListEntry Constructor * @param null|array $data @@ -161,8 +160,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATE] instanceof FHIRDateTime) { $this->setDate($data[self::FIELD_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_DATE])) { - $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime(array_merge($ext, $data[self::FIELD_DATE]))); + } } else { $this->setDate(new FHIRDateTime($data[self::FIELD_DATE])); } @@ -173,8 +176,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DELETED] instanceof FHIRBoolean) { $this->setDeleted($data[self::FIELD_DELETED]); - } elseif ($ext && is_scalar($data[self::FIELD_DELETED])) { - $this->setDeleted(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_DELETED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DELETED])) { + $this->setDeleted(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_DELETED]] + $ext)); + } else if (is_array($data[self::FIELD_DELETED])) { + $this->setDeleted(new FHIRBoolean(array_merge($ext, $data[self::FIELD_DELETED]))); + } } else { $this->setDeleted(new FHIRBoolean($data[self::FIELD_DELETED])); } @@ -462,11 +469,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDeleted())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DELETED, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getFlag())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FLAG, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getItem())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ITEM, null, $v->_getFHIRXMLNamespace())); } @@ -480,12 +485,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getDate())) { - $a[self::FIELD_DATE] = $v->getValue(); - $a[self::FIELD_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_DATE] = $v; + } } if (null !== ($v = $this->getDeleted())) { - $a[self::FIELD_DELETED] = $v->getValue(); - $a[self::FIELD_DELETED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DELETED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DELETED_EXT] = $enc; + } + } else { + $a[self::FIELD_DELETED] = $v; + } } if (null !== ($v = $this->getFlag())) { $a[self::FIELD_FLAG] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRLocation/FHIRLocationPosition.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRLocation/FHIRLocationPosition.php index 9f1c8f5527..5da1a07011 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRLocation/FHIRLocationPosition.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRLocation/FHIRLocationPosition.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRLocationPosition extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_LOCATION_DOT_POSITION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ALTITUDE = 'altitude'; const FIELD_ALTITUDE_EXT = '_altitude'; const FIELD_LATITUDE = 'latitude'; @@ -129,6 +125,9 @@ class FHIRLocationPosition extends FHIRBackboneElement */ protected $longitude = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRLocationPosition Constructor * @param null|array $data @@ -151,8 +150,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ALTITUDE] instanceof FHIRDecimal) { $this->setAltitude($data[self::FIELD_ALTITUDE]); - } elseif ($ext && is_scalar($data[self::FIELD_ALTITUDE])) { - $this->setAltitude(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_ALTITUDE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ALTITUDE])) { + $this->setAltitude(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_ALTITUDE]] + $ext)); + } else if (is_array($data[self::FIELD_ALTITUDE])) { + $this->setAltitude(new FHIRDecimal(array_merge($ext, $data[self::FIELD_ALTITUDE]))); + } } else { $this->setAltitude(new FHIRDecimal($data[self::FIELD_ALTITUDE])); } @@ -163,8 +166,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_LATITUDE] instanceof FHIRDecimal) { $this->setLatitude($data[self::FIELD_LATITUDE]); - } elseif ($ext && is_scalar($data[self::FIELD_LATITUDE])) { - $this->setLatitude(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_LATITUDE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_LATITUDE])) { + $this->setLatitude(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_LATITUDE]] + $ext)); + } else if (is_array($data[self::FIELD_LATITUDE])) { + $this->setLatitude(new FHIRDecimal(array_merge($ext, $data[self::FIELD_LATITUDE]))); + } } else { $this->setLatitude(new FHIRDecimal($data[self::FIELD_LATITUDE])); } @@ -175,8 +182,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_LONGITUDE] instanceof FHIRDecimal) { $this->setLongitude($data[self::FIELD_LONGITUDE]); - } elseif ($ext && is_scalar($data[self::FIELD_LONGITUDE])) { - $this->setLongitude(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_LONGITUDE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_LONGITUDE])) { + $this->setLongitude(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_LONGITUDE]] + $ext)); + } else if (is_array($data[self::FIELD_LONGITUDE])) { + $this->setLongitude(new FHIRDecimal(array_merge($ext, $data[self::FIELD_LONGITUDE]))); + } } else { $this->setLongitude(new FHIRDecimal($data[self::FIELD_LONGITUDE])); } @@ -445,16 +456,37 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getAltitude())) { - $a[self::FIELD_ALTITUDE] = $v->getValue(); - $a[self::FIELD_ALTITUDE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ALTITUDE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ALTITUDE_EXT] = $enc; + } + } else { + $a[self::FIELD_ALTITUDE] = $v; + } } if (null !== ($v = $this->getLatitude())) { - $a[self::FIELD_LATITUDE] = $v->getValue(); - $a[self::FIELD_LATITUDE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_LATITUDE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_LATITUDE_EXT] = $enc; + } + } else { + $a[self::FIELD_LATITUDE] = $v; + } } if (null !== ($v = $this->getLongitude())) { - $a[self::FIELD_LONGITUDE] = $v->getValue(); - $a[self::FIELD_LONGITUDE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_LONGITUDE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_LONGITUDE_EXT] = $enc; + } + } else { + $a[self::FIELD_LONGITUDE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRMedication/FHIRMedicationBatch.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRMedication/FHIRMedicationBatch.php index 5c03e04a91..b51a9e5531 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRMedication/FHIRMedicationBatch.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRMedication/FHIRMedicationBatch.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRMedicationBatch extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MEDICATION_DOT_BATCH; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_EXPIRATION_DATE = 'expirationDate'; const FIELD_EXPIRATION_DATE_EXT = '_expirationDate'; const FIELD_LOT_NUMBER = 'lotNumber'; @@ -113,6 +109,9 @@ class FHIRMedicationBatch extends FHIRBackboneElement */ protected $lotNumber = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMedicationBatch Constructor * @param null|array $data @@ -135,8 +134,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EXPIRATION_DATE] instanceof FHIRDateTime) { $this->setExpirationDate($data[self::FIELD_EXPIRATION_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_EXPIRATION_DATE])) { - $this->setExpirationDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_EXPIRATION_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EXPIRATION_DATE])) { + $this->setExpirationDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_EXPIRATION_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_EXPIRATION_DATE])) { + $this->setExpirationDate(new FHIRDateTime(array_merge($ext, $data[self::FIELD_EXPIRATION_DATE]))); + } } else { $this->setExpirationDate(new FHIRDateTime($data[self::FIELD_EXPIRATION_DATE])); } @@ -147,8 +150,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_LOT_NUMBER] instanceof FHIRString) { $this->setLotNumber($data[self::FIELD_LOT_NUMBER]); - } elseif ($ext && is_scalar($data[self::FIELD_LOT_NUMBER])) { - $this->setLotNumber(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_LOT_NUMBER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_LOT_NUMBER])) { + $this->setLotNumber(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_LOT_NUMBER]] + $ext)); + } else if (is_array($data[self::FIELD_LOT_NUMBER])) { + $this->setLotNumber(new FHIRString(array_merge($ext, $data[self::FIELD_LOT_NUMBER]))); + } } else { $this->setLotNumber(new FHIRString($data[self::FIELD_LOT_NUMBER])); } @@ -364,12 +371,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getExpirationDate())) { - $a[self::FIELD_EXPIRATION_DATE] = $v->getValue(); - $a[self::FIELD_EXPIRATION_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EXPIRATION_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EXPIRATION_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_EXPIRATION_DATE] = $v; + } } if (null !== ($v = $this->getLotNumber())) { - $a[self::FIELD_LOT_NUMBER] = $v->getValue(); - $a[self::FIELD_LOT_NUMBER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_LOT_NUMBER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_LOT_NUMBER_EXT] = $enc; + } + } else { + $a[self::FIELD_LOT_NUMBER] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRMedication/FHIRMedicationContent.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRMedication/FHIRMedicationContent.php index 67f4e03f92..12c5136642 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRMedication/FHIRMedicationContent.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRMedication/FHIRMedicationContent.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,11 +79,8 @@ class FHIRMedicationContent extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MEDICATION_DOT_CONTENT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_AMOUNT = 'amount'; + const FIELD_AMOUNT_EXT = '_amount'; const FIELD_ITEM = 'item'; /** @@ -104,6 +101,9 @@ class FHIRMedicationContent extends FHIRBackboneElement */ protected $item = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMedicationContent Constructor * @param null|array $data @@ -121,8 +121,17 @@ public function __construct($data = null) } parent::__construct($data); if (isset($data[self::FIELD_AMOUNT])) { + $ext = (isset($data[self::FIELD_AMOUNT_EXT]) && is_array($data[self::FIELD_AMOUNT_EXT])) + ? $data[self::FIELD_AMOUNT_EXT] + : null; if ($data[self::FIELD_AMOUNT] instanceof FHIRSimpleQuantity) { $this->setAmount($data[self::FIELD_AMOUNT]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_AMOUNT])) { + $this->setAmount(new FHIRSimpleQuantity([FHIRSimpleQuantity::FIELD_VALUE => $data[self::FIELD_AMOUNT]] + $ext)); + } else if (is_array($data[self::FIELD_AMOUNT])) { + $this->setAmount(new FHIRSimpleQuantity(array_merge($ext, $data[self::FIELD_AMOUNT]))); + } } else { $this->setAmount(new FHIRSimpleQuantity($data[self::FIELD_AMOUNT])); } @@ -293,11 +302,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getAmount())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AMOUNT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getItem())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ITEM, null, $v->_getFHIRXMLNamespace())); } @@ -311,7 +318,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getAmount())) { - $a[self::FIELD_AMOUNT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_AMOUNT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_AMOUNT_EXT] = $enc; + } + } else { + $a[self::FIELD_AMOUNT] = $v; + } } if (null !== ($v = $this->getItem())) { $a[self::FIELD_ITEM] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRMedication/FHIRMedicationIngredient.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRMedication/FHIRMedicationIngredient.php index 706e95aab5..5b8e5deaf2 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRMedication/FHIRMedicationIngredient.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRMedication/FHIRMedicationIngredient.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRMedicationIngredient extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MEDICATION_DOT_INGREDIENT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_AMOUNT = 'amount'; const FIELD_ITEM = 'item'; @@ -111,6 +107,9 @@ class FHIRMedicationIngredient extends FHIRBackboneElement */ protected $item = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMedicationIngredient Constructor * @param null|array $data @@ -314,11 +313,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getAmount())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AMOUNT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getItem())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ITEM, null, $v->_getFHIRXMLNamespace())); } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRMedication/FHIRMedicationPackage.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRMedication/FHIRMedicationPackage.php index 9ece8e55e9..7001dd07a2 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRMedication/FHIRMedicationPackage.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRMedication/FHIRMedicationPackage.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRMedicationPackage extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MEDICATION_DOT_PACKAGE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CONTAINER = 'container'; const FIELD_CONTENT = 'content'; @@ -107,6 +103,9 @@ class FHIRMedicationPackage extends FHIRBackboneElement */ protected $content = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMedicationPackage Constructor * @param null|array $data @@ -133,6 +132,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CONTENT])) { if (is_array($data[self::FIELD_CONTENT])) { foreach($data[self::FIELD_CONTENT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRMedicationContent) { $this->addContent($v); } else { @@ -339,11 +341,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getContainer())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CONTAINER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getContent())) { foreach($vs as $v) { if (null === $v) { @@ -352,6 +352,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_CONTENT, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRMedication/FHIRMedicationProduct.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRMedication/FHIRMedicationProduct.php index 63328d833e..3cfa214a20 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRMedication/FHIRMedicationProduct.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRMedication/FHIRMedicationProduct.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRMedicationProduct extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MEDICATION_DOT_PRODUCT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_BATCH = 'batch'; const FIELD_FORM = 'form'; const FIELD_INGREDIENT = 'ingredient'; @@ -119,6 +115,9 @@ class FHIRMedicationProduct extends FHIRBackboneElement */ protected $ingredient = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMedicationProduct Constructor * @param null|array $data @@ -138,6 +137,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_BATCH])) { if (is_array($data[self::FIELD_BATCH])) { foreach($data[self::FIELD_BATCH] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRMedicationBatch) { $this->addBatch($v); } else { @@ -160,6 +162,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_INGREDIENT])) { if (is_array($data[self::FIELD_INGREDIENT])) { foreach($data[self::FIELD_INGREDIENT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRMedicationIngredient) { $this->addIngredient($v); } else { @@ -427,7 +432,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getBatch())) { foreach($vs as $v) { if (null === $v) { @@ -440,7 +444,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getForm())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FORM, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIngredient())) { foreach($vs as $v) { if (null === $v) { @@ -449,6 +452,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_INGREDIENT, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRMedicationAdministration/FHIRMedicationAdministrationDosage.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRMedicationAdministration/FHIRMedicationAdministrationDosage.php index 47ba83d934..210ab590ca 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRMedicationAdministration/FHIRMedicationAdministrationDosage.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRMedicationAdministration/FHIRMedicationAdministrationDosage.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -86,12 +86,9 @@ class FHIRMedicationAdministrationDosage extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MEDICATION_ADMINISTRATION_DOT_DOSAGE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_METHOD = 'method'; const FIELD_QUANTITY = 'quantity'; + const FIELD_QUANTITY_EXT = '_quantity'; const FIELD_RATE_RANGE = 'rateRange'; const FIELD_RATE_RATIO = 'rateRatio'; const FIELD_ROUTE = 'route'; @@ -210,6 +207,9 @@ class FHIRMedicationAdministrationDosage extends FHIRBackboneElement */ protected $text = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMedicationAdministrationDosage Constructor * @param null|array $data @@ -234,8 +234,17 @@ public function __construct($data = null) } } if (isset($data[self::FIELD_QUANTITY])) { + $ext = (isset($data[self::FIELD_QUANTITY_EXT]) && is_array($data[self::FIELD_QUANTITY_EXT])) + ? $data[self::FIELD_QUANTITY_EXT] + : null; if ($data[self::FIELD_QUANTITY] instanceof FHIRSimpleQuantity) { $this->setQuantity($data[self::FIELD_QUANTITY]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_QUANTITY])) { + $this->setQuantity(new FHIRSimpleQuantity([FHIRSimpleQuantity::FIELD_VALUE => $data[self::FIELD_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_QUANTITY])) { + $this->setQuantity(new FHIRSimpleQuantity(array_merge($ext, $data[self::FIELD_QUANTITY]))); + } } else { $this->setQuantity(new FHIRSimpleQuantity($data[self::FIELD_QUANTITY])); } @@ -281,8 +290,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TEXT] instanceof FHIRString) { $this->setText($data[self::FIELD_TEXT]); - } elseif ($ext && is_scalar($data[self::FIELD_TEXT])) { - $this->setText(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TEXT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TEXT])) { + $this->setText(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TEXT]] + $ext)); + } else if (is_array($data[self::FIELD_TEXT])) { + $this->setText(new FHIRString(array_merge($ext, $data[self::FIELD_TEXT]))); + } } else { $this->setText(new FHIRString($data[self::FIELD_TEXT])); } @@ -707,31 +720,24 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getMethod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_METHOD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_QUANTITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRateRange())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RATE_RANGE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRateRatio())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RATE_RATIO, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRoute())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ROUTE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSiteCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SITE_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSiteReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SITE_REFERENCE, null, $v->_getFHIRXMLNamespace())); } @@ -751,7 +757,15 @@ public function jsonSerialize() $a[self::FIELD_METHOD] = $v; } if (null !== ($v = $this->getQuantity())) { - $a[self::FIELD_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_QUANTITY] = $v; + } } if (null !== ($v = $this->getRateRange())) { $a[self::FIELD_RATE_RANGE] = $v; @@ -769,8 +783,15 @@ public function jsonSerialize() $a[self::FIELD_SITE_REFERENCE] = $v; } if (null !== ($v = $this->getText())) { - $a[self::FIELD_TEXT] = $v->getValue(); - $a[self::FIELD_TEXT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TEXT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TEXT_EXT] = $enc; + } + } else { + $a[self::FIELD_TEXT] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRMedicationDispense/FHIRMedicationDispenseDosageInstruction.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRMedicationDispense/FHIRMedicationDispenseDosageInstruction.php index d7a2a228bd..a229aba31a 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRMedicationDispense/FHIRMedicationDispenseDosageInstruction.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRMedicationDispense/FHIRMedicationDispenseDosageInstruction.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -87,15 +87,12 @@ class FHIRMedicationDispenseDosageInstruction extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MEDICATION_DISPENSE_DOT_DOSAGE_INSTRUCTION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ADDITIONAL_INSTRUCTIONS = 'additionalInstructions'; const FIELD_AS_NEEDED_BOOLEAN = 'asNeededBoolean'; const FIELD_AS_NEEDED_BOOLEAN_EXT = '_asNeededBoolean'; const FIELD_AS_NEEDED_CODEABLE_CONCEPT = 'asNeededCodeableConcept'; const FIELD_DOSE_QUANTITY = 'doseQuantity'; + const FIELD_DOSE_QUANTITY_EXT = '_doseQuantity'; const FIELD_DOSE_RANGE = 'doseRange'; const FIELD_MAX_DOSE_PER_PERIOD = 'maxDosePerPeriod'; const FIELD_METHOD = 'method'; @@ -297,6 +294,9 @@ class FHIRMedicationDispenseDosageInstruction extends FHIRBackboneElement */ protected $timing = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMedicationDispenseDosageInstruction Constructor * @param null|array $data @@ -326,8 +326,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_AS_NEEDED_BOOLEAN] instanceof FHIRBoolean) { $this->setAsNeededBoolean($data[self::FIELD_AS_NEEDED_BOOLEAN]); - } elseif ($ext && is_scalar($data[self::FIELD_AS_NEEDED_BOOLEAN])) { - $this->setAsNeededBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_AS_NEEDED_BOOLEAN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_AS_NEEDED_BOOLEAN])) { + $this->setAsNeededBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_AS_NEEDED_BOOLEAN]] + $ext)); + } else if (is_array($data[self::FIELD_AS_NEEDED_BOOLEAN])) { + $this->setAsNeededBoolean(new FHIRBoolean(array_merge($ext, $data[self::FIELD_AS_NEEDED_BOOLEAN]))); + } } else { $this->setAsNeededBoolean(new FHIRBoolean($data[self::FIELD_AS_NEEDED_BOOLEAN])); } @@ -340,8 +344,17 @@ public function __construct($data = null) } } if (isset($data[self::FIELD_DOSE_QUANTITY])) { + $ext = (isset($data[self::FIELD_DOSE_QUANTITY_EXT]) && is_array($data[self::FIELD_DOSE_QUANTITY_EXT])) + ? $data[self::FIELD_DOSE_QUANTITY_EXT] + : null; if ($data[self::FIELD_DOSE_QUANTITY] instanceof FHIRSimpleQuantity) { $this->setDoseQuantity($data[self::FIELD_DOSE_QUANTITY]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DOSE_QUANTITY])) { + $this->setDoseQuantity(new FHIRSimpleQuantity([FHIRSimpleQuantity::FIELD_VALUE => $data[self::FIELD_DOSE_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_DOSE_QUANTITY])) { + $this->setDoseQuantity(new FHIRSimpleQuantity(array_merge($ext, $data[self::FIELD_DOSE_QUANTITY]))); + } } else { $this->setDoseQuantity(new FHIRSimpleQuantity($data[self::FIELD_DOSE_QUANTITY])); } @@ -408,8 +421,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TEXT] instanceof FHIRString) { $this->setText($data[self::FIELD_TEXT]); - } elseif ($ext && is_scalar($data[self::FIELD_TEXT])) { - $this->setText(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TEXT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TEXT])) { + $this->setText(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TEXT]] + $ext)); + } else if (is_array($data[self::FIELD_TEXT])) { + $this->setText(new FHIRString(array_merge($ext, $data[self::FIELD_TEXT]))); + } } else { $this->setText(new FHIRString($data[self::FIELD_TEXT])); } @@ -1076,57 +1093,45 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getAdditionalInstructions())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ADDITIONAL_INSTRUCTIONS, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getAsNeededBoolean())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AS_NEEDED_BOOLEAN, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getAsNeededCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AS_NEEDED_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDoseQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DOSE_QUANTITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDoseRange())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DOSE_RANGE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getMaxDosePerPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MAX_DOSE_PER_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getMethod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_METHOD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRateRange())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RATE_RANGE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRateRatio())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RATE_RATIO, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRoute())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ROUTE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSiteCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SITE_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSiteReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SITE_REFERENCE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getText())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TEXT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getTiming())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TIMING, null, $v->_getFHIRXMLNamespace())); } @@ -1143,14 +1148,29 @@ public function jsonSerialize() $a[self::FIELD_ADDITIONAL_INSTRUCTIONS] = $v; } if (null !== ($v = $this->getAsNeededBoolean())) { - $a[self::FIELD_AS_NEEDED_BOOLEAN] = $v->getValue(); - $a[self::FIELD_AS_NEEDED_BOOLEAN_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_AS_NEEDED_BOOLEAN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_AS_NEEDED_BOOLEAN_EXT] = $enc; + } + } else { + $a[self::FIELD_AS_NEEDED_BOOLEAN] = $v; + } } if (null !== ($v = $this->getAsNeededCodeableConcept())) { $a[self::FIELD_AS_NEEDED_CODEABLE_CONCEPT] = $v; } if (null !== ($v = $this->getDoseQuantity())) { - $a[self::FIELD_DOSE_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DOSE_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DOSE_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_DOSE_QUANTITY] = $v; + } } if (null !== ($v = $this->getDoseRange())) { $a[self::FIELD_DOSE_RANGE] = $v; @@ -1177,8 +1197,15 @@ public function jsonSerialize() $a[self::FIELD_SITE_REFERENCE] = $v; } if (null !== ($v = $this->getText())) { - $a[self::FIELD_TEXT] = $v->getValue(); - $a[self::FIELD_TEXT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TEXT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TEXT_EXT] = $enc; + } + } else { + $a[self::FIELD_TEXT] = $v; + } } if (null !== ($v = $this->getTiming())) { $a[self::FIELD_TIMING] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRMedicationDispense/FHIRMedicationDispenseSubstitution.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRMedicationDispense/FHIRMedicationDispenseSubstitution.php index c99f99e220..a4dbf1654e 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRMedicationDispense/FHIRMedicationDispenseSubstitution.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRMedicationDispense/FHIRMedicationDispenseSubstitution.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -81,10 +81,6 @@ class FHIRMedicationDispenseSubstitution extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MEDICATION_DISPENSE_DOT_SUBSTITUTION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_REASON = 'reason'; const FIELD_RESPONSIBLE_PARTY = 'responsibleParty'; const FIELD_TYPE = 'type'; @@ -126,6 +122,9 @@ class FHIRMedicationDispenseSubstitution extends FHIRBackboneElement */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMedicationDispenseSubstitution Constructor * @param null|array $data @@ -145,6 +144,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REASON])) { if (is_array($data[self::FIELD_REASON])) { foreach($data[self::FIELD_REASON] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addReason($v); } else { @@ -160,6 +162,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_RESPONSIBLE_PARTY])) { if (is_array($data[self::FIELD_RESPONSIBLE_PARTY])) { foreach($data[self::FIELD_RESPONSIBLE_PARTY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addResponsibleParty($v); } else { @@ -445,7 +450,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getReason())) { foreach($vs as $v) { if (null === $v) { diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRMedicationOrder/FHIRMedicationOrderDispenseRequest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRMedicationOrder/FHIRMedicationOrderDispenseRequest.php index a9cef1cb91..890345ccd7 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRMedicationOrder/FHIRMedicationOrderDispenseRequest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRMedicationOrder/FHIRMedicationOrderDispenseRequest.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -85,16 +85,14 @@ class FHIRMedicationOrderDispenseRequest extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MEDICATION_ORDER_DOT_DISPENSE_REQUEST; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_EXPECTED_SUPPLY_DURATION = 'expectedSupplyDuration'; + const FIELD_EXPECTED_SUPPLY_DURATION_EXT = '_expectedSupplyDuration'; const FIELD_MEDICATION_CODEABLE_CONCEPT = 'medicationCodeableConcept'; const FIELD_MEDICATION_REFERENCE = 'medicationReference'; const FIELD_NUMBER_OF_REPEATS_ALLOWED = 'numberOfRepeatsAllowed'; const FIELD_NUMBER_OF_REPEATS_ALLOWED_EXT = '_numberOfRepeatsAllowed'; const FIELD_QUANTITY = 'quantity'; + const FIELD_QUANTITY_EXT = '_quantity'; const FIELD_VALIDITY_PERIOD = 'validityPeriod'; /** @@ -168,6 +166,9 @@ class FHIRMedicationOrderDispenseRequest extends FHIRBackboneElement */ protected $validityPeriod = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMedicationOrderDispenseRequest Constructor * @param null|array $data @@ -185,8 +186,17 @@ public function __construct($data = null) } parent::__construct($data); if (isset($data[self::FIELD_EXPECTED_SUPPLY_DURATION])) { + $ext = (isset($data[self::FIELD_EXPECTED_SUPPLY_DURATION_EXT]) && is_array($data[self::FIELD_EXPECTED_SUPPLY_DURATION_EXT])) + ? $data[self::FIELD_EXPECTED_SUPPLY_DURATION_EXT] + : null; if ($data[self::FIELD_EXPECTED_SUPPLY_DURATION] instanceof FHIRDuration) { $this->setExpectedSupplyDuration($data[self::FIELD_EXPECTED_SUPPLY_DURATION]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EXPECTED_SUPPLY_DURATION])) { + $this->setExpectedSupplyDuration(new FHIRDuration([FHIRDuration::FIELD_VALUE => $data[self::FIELD_EXPECTED_SUPPLY_DURATION]] + $ext)); + } else if (is_array($data[self::FIELD_EXPECTED_SUPPLY_DURATION])) { + $this->setExpectedSupplyDuration(new FHIRDuration(array_merge($ext, $data[self::FIELD_EXPECTED_SUPPLY_DURATION]))); + } } else { $this->setExpectedSupplyDuration(new FHIRDuration($data[self::FIELD_EXPECTED_SUPPLY_DURATION])); } @@ -211,15 +221,28 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NUMBER_OF_REPEATS_ALLOWED] instanceof FHIRPositiveInt) { $this->setNumberOfRepeatsAllowed($data[self::FIELD_NUMBER_OF_REPEATS_ALLOWED]); - } elseif ($ext && is_scalar($data[self::FIELD_NUMBER_OF_REPEATS_ALLOWED])) { - $this->setNumberOfRepeatsAllowed(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_NUMBER_OF_REPEATS_ALLOWED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NUMBER_OF_REPEATS_ALLOWED])) { + $this->setNumberOfRepeatsAllowed(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_NUMBER_OF_REPEATS_ALLOWED]] + $ext)); + } else if (is_array($data[self::FIELD_NUMBER_OF_REPEATS_ALLOWED])) { + $this->setNumberOfRepeatsAllowed(new FHIRPositiveInt(array_merge($ext, $data[self::FIELD_NUMBER_OF_REPEATS_ALLOWED]))); + } } else { $this->setNumberOfRepeatsAllowed(new FHIRPositiveInt($data[self::FIELD_NUMBER_OF_REPEATS_ALLOWED])); } } if (isset($data[self::FIELD_QUANTITY])) { + $ext = (isset($data[self::FIELD_QUANTITY_EXT]) && is_array($data[self::FIELD_QUANTITY_EXT])) + ? $data[self::FIELD_QUANTITY_EXT] + : null; if ($data[self::FIELD_QUANTITY] instanceof FHIRSimpleQuantity) { $this->setQuantity($data[self::FIELD_QUANTITY]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_QUANTITY])) { + $this->setQuantity(new FHIRSimpleQuantity([FHIRSimpleQuantity::FIELD_VALUE => $data[self::FIELD_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_QUANTITY])) { + $this->setQuantity(new FHIRSimpleQuantity(array_merge($ext, $data[self::FIELD_QUANTITY]))); + } } else { $this->setQuantity(new FHIRSimpleQuantity($data[self::FIELD_QUANTITY])); } @@ -551,26 +574,21 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getExpectedSupplyDuration())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EXPECTED_SUPPLY_DURATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getMedicationCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MEDICATION_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getMedicationReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MEDICATION_REFERENCE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getNumberOfRepeatsAllowed())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NUMBER_OF_REPEATS_ALLOWED, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_QUANTITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValidityPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALIDITY_PERIOD, null, $v->_getFHIRXMLNamespace())); } @@ -584,7 +602,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getExpectedSupplyDuration())) { - $a[self::FIELD_EXPECTED_SUPPLY_DURATION] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EXPECTED_SUPPLY_DURATION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EXPECTED_SUPPLY_DURATION_EXT] = $enc; + } + } else { + $a[self::FIELD_EXPECTED_SUPPLY_DURATION] = $v; + } } if (null !== ($v = $this->getMedicationCodeableConcept())) { $a[self::FIELD_MEDICATION_CODEABLE_CONCEPT] = $v; @@ -593,11 +619,26 @@ public function jsonSerialize() $a[self::FIELD_MEDICATION_REFERENCE] = $v; } if (null !== ($v = $this->getNumberOfRepeatsAllowed())) { - $a[self::FIELD_NUMBER_OF_REPEATS_ALLOWED] = $v->getValue(); - $a[self::FIELD_NUMBER_OF_REPEATS_ALLOWED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NUMBER_OF_REPEATS_ALLOWED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NUMBER_OF_REPEATS_ALLOWED_EXT] = $enc; + } + } else { + $a[self::FIELD_NUMBER_OF_REPEATS_ALLOWED] = $v; + } } if (null !== ($v = $this->getQuantity())) { - $a[self::FIELD_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_QUANTITY] = $v; + } } if (null !== ($v = $this->getValidityPeriod())) { $a[self::FIELD_VALIDITY_PERIOD] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRMedicationOrder/FHIRMedicationOrderDosageInstruction.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRMedicationOrder/FHIRMedicationOrderDosageInstruction.php index 1c828ee2cd..b7aad138de 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRMedicationOrder/FHIRMedicationOrderDosageInstruction.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRMedicationOrder/FHIRMedicationOrderDosageInstruction.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -87,15 +87,12 @@ class FHIRMedicationOrderDosageInstruction extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MEDICATION_ORDER_DOT_DOSAGE_INSTRUCTION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ADDITIONAL_INSTRUCTIONS = 'additionalInstructions'; const FIELD_AS_NEEDED_BOOLEAN = 'asNeededBoolean'; const FIELD_AS_NEEDED_BOOLEAN_EXT = '_asNeededBoolean'; const FIELD_AS_NEEDED_CODEABLE_CONCEPT = 'asNeededCodeableConcept'; const FIELD_DOSE_QUANTITY = 'doseQuantity'; + const FIELD_DOSE_QUANTITY_EXT = '_doseQuantity'; const FIELD_DOSE_RANGE = 'doseRange'; const FIELD_MAX_DOSE_PER_PERIOD = 'maxDosePerPeriod'; const FIELD_METHOD = 'method'; @@ -297,6 +294,9 @@ class FHIRMedicationOrderDosageInstruction extends FHIRBackboneElement */ protected $timing = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMedicationOrderDosageInstruction Constructor * @param null|array $data @@ -326,8 +326,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_AS_NEEDED_BOOLEAN] instanceof FHIRBoolean) { $this->setAsNeededBoolean($data[self::FIELD_AS_NEEDED_BOOLEAN]); - } elseif ($ext && is_scalar($data[self::FIELD_AS_NEEDED_BOOLEAN])) { - $this->setAsNeededBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_AS_NEEDED_BOOLEAN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_AS_NEEDED_BOOLEAN])) { + $this->setAsNeededBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_AS_NEEDED_BOOLEAN]] + $ext)); + } else if (is_array($data[self::FIELD_AS_NEEDED_BOOLEAN])) { + $this->setAsNeededBoolean(new FHIRBoolean(array_merge($ext, $data[self::FIELD_AS_NEEDED_BOOLEAN]))); + } } else { $this->setAsNeededBoolean(new FHIRBoolean($data[self::FIELD_AS_NEEDED_BOOLEAN])); } @@ -340,8 +344,17 @@ public function __construct($data = null) } } if (isset($data[self::FIELD_DOSE_QUANTITY])) { + $ext = (isset($data[self::FIELD_DOSE_QUANTITY_EXT]) && is_array($data[self::FIELD_DOSE_QUANTITY_EXT])) + ? $data[self::FIELD_DOSE_QUANTITY_EXT] + : null; if ($data[self::FIELD_DOSE_QUANTITY] instanceof FHIRSimpleQuantity) { $this->setDoseQuantity($data[self::FIELD_DOSE_QUANTITY]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DOSE_QUANTITY])) { + $this->setDoseQuantity(new FHIRSimpleQuantity([FHIRSimpleQuantity::FIELD_VALUE => $data[self::FIELD_DOSE_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_DOSE_QUANTITY])) { + $this->setDoseQuantity(new FHIRSimpleQuantity(array_merge($ext, $data[self::FIELD_DOSE_QUANTITY]))); + } } else { $this->setDoseQuantity(new FHIRSimpleQuantity($data[self::FIELD_DOSE_QUANTITY])); } @@ -408,8 +421,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TEXT] instanceof FHIRString) { $this->setText($data[self::FIELD_TEXT]); - } elseif ($ext && is_scalar($data[self::FIELD_TEXT])) { - $this->setText(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TEXT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TEXT])) { + $this->setText(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TEXT]] + $ext)); + } else if (is_array($data[self::FIELD_TEXT])) { + $this->setText(new FHIRString(array_merge($ext, $data[self::FIELD_TEXT]))); + } } else { $this->setText(new FHIRString($data[self::FIELD_TEXT])); } @@ -1076,57 +1093,45 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getAdditionalInstructions())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ADDITIONAL_INSTRUCTIONS, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getAsNeededBoolean())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AS_NEEDED_BOOLEAN, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getAsNeededCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AS_NEEDED_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDoseQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DOSE_QUANTITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDoseRange())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DOSE_RANGE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getMaxDosePerPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MAX_DOSE_PER_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getMethod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_METHOD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRateRange())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RATE_RANGE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRateRatio())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RATE_RATIO, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRoute())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ROUTE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSiteCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SITE_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSiteReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SITE_REFERENCE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getText())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TEXT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getTiming())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TIMING, null, $v->_getFHIRXMLNamespace())); } @@ -1143,14 +1148,29 @@ public function jsonSerialize() $a[self::FIELD_ADDITIONAL_INSTRUCTIONS] = $v; } if (null !== ($v = $this->getAsNeededBoolean())) { - $a[self::FIELD_AS_NEEDED_BOOLEAN] = $v->getValue(); - $a[self::FIELD_AS_NEEDED_BOOLEAN_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_AS_NEEDED_BOOLEAN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_AS_NEEDED_BOOLEAN_EXT] = $enc; + } + } else { + $a[self::FIELD_AS_NEEDED_BOOLEAN] = $v; + } } if (null !== ($v = $this->getAsNeededCodeableConcept())) { $a[self::FIELD_AS_NEEDED_CODEABLE_CONCEPT] = $v; } if (null !== ($v = $this->getDoseQuantity())) { - $a[self::FIELD_DOSE_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DOSE_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DOSE_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_DOSE_QUANTITY] = $v; + } } if (null !== ($v = $this->getDoseRange())) { $a[self::FIELD_DOSE_RANGE] = $v; @@ -1177,8 +1197,15 @@ public function jsonSerialize() $a[self::FIELD_SITE_REFERENCE] = $v; } if (null !== ($v = $this->getText())) { - $a[self::FIELD_TEXT] = $v->getValue(); - $a[self::FIELD_TEXT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TEXT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TEXT_EXT] = $enc; + } + } else { + $a[self::FIELD_TEXT] = $v; + } } if (null !== ($v = $this->getTiming())) { $a[self::FIELD_TIMING] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRMedicationOrder/FHIRMedicationOrderSubstitution.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRMedicationOrder/FHIRMedicationOrderSubstitution.php index 7f21745416..37d27ed6da 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRMedicationOrder/FHIRMedicationOrderSubstitution.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRMedicationOrder/FHIRMedicationOrderSubstitution.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRMedicationOrderSubstitution extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MEDICATION_ORDER_DOT_SUBSTITUTION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_REASON = 'reason'; const FIELD_TYPE = 'type'; @@ -113,6 +109,9 @@ class FHIRMedicationOrderSubstitution extends FHIRBackboneElement */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMedicationOrderSubstitution Constructor * @param null|array $data @@ -318,11 +317,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getReason())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REASON, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRMedicationStatement/FHIRMedicationStatementDosage.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRMedicationStatement/FHIRMedicationStatementDosage.php index 83c46e5faa..731895b2e0 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRMedicationStatement/FHIRMedicationStatementDosage.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRMedicationStatement/FHIRMedicationStatementDosage.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -103,16 +103,13 @@ class FHIRMedicationStatementDosage extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MEDICATION_STATEMENT_DOT_DOSAGE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_AS_NEEDED_BOOLEAN = 'asNeededBoolean'; const FIELD_AS_NEEDED_BOOLEAN_EXT = '_asNeededBoolean'; const FIELD_AS_NEEDED_CODEABLE_CONCEPT = 'asNeededCodeableConcept'; const FIELD_MAX_DOSE_PER_PERIOD = 'maxDosePerPeriod'; const FIELD_METHOD = 'method'; const FIELD_QUANTITY_QUANTITY = 'quantityQuantity'; + const FIELD_QUANTITY_QUANTITY_EXT = '_quantityQuantity'; const FIELD_QUANTITY_RANGE = 'quantityRange'; const FIELD_RATE_RANGE = 'rateRange'; const FIELD_RATE_RATIO = 'rateRatio'; @@ -300,6 +297,9 @@ class FHIRMedicationStatementDosage extends FHIRBackboneElement */ protected $timing = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMedicationStatementDosage Constructor * @param null|array $data @@ -322,8 +322,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_AS_NEEDED_BOOLEAN] instanceof FHIRBoolean) { $this->setAsNeededBoolean($data[self::FIELD_AS_NEEDED_BOOLEAN]); - } elseif ($ext && is_scalar($data[self::FIELD_AS_NEEDED_BOOLEAN])) { - $this->setAsNeededBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_AS_NEEDED_BOOLEAN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_AS_NEEDED_BOOLEAN])) { + $this->setAsNeededBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_AS_NEEDED_BOOLEAN]] + $ext)); + } else if (is_array($data[self::FIELD_AS_NEEDED_BOOLEAN])) { + $this->setAsNeededBoolean(new FHIRBoolean(array_merge($ext, $data[self::FIELD_AS_NEEDED_BOOLEAN]))); + } } else { $this->setAsNeededBoolean(new FHIRBoolean($data[self::FIELD_AS_NEEDED_BOOLEAN])); } @@ -350,8 +354,17 @@ public function __construct($data = null) } } if (isset($data[self::FIELD_QUANTITY_QUANTITY])) { + $ext = (isset($data[self::FIELD_QUANTITY_QUANTITY_EXT]) && is_array($data[self::FIELD_QUANTITY_QUANTITY_EXT])) + ? $data[self::FIELD_QUANTITY_QUANTITY_EXT] + : null; if ($data[self::FIELD_QUANTITY_QUANTITY] instanceof FHIRSimpleQuantity) { $this->setQuantityQuantity($data[self::FIELD_QUANTITY_QUANTITY]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_QUANTITY_QUANTITY])) { + $this->setQuantityQuantity(new FHIRSimpleQuantity([FHIRSimpleQuantity::FIELD_VALUE => $data[self::FIELD_QUANTITY_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_QUANTITY_QUANTITY])) { + $this->setQuantityQuantity(new FHIRSimpleQuantity(array_merge($ext, $data[self::FIELD_QUANTITY_QUANTITY]))); + } } else { $this->setQuantityQuantity(new FHIRSimpleQuantity($data[self::FIELD_QUANTITY_QUANTITY])); } @@ -404,8 +417,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TEXT] instanceof FHIRString) { $this->setText($data[self::FIELD_TEXT]); - } elseif ($ext && is_scalar($data[self::FIELD_TEXT])) { - $this->setText(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TEXT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TEXT])) { + $this->setText(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TEXT]] + $ext)); + } else if (is_array($data[self::FIELD_TEXT])) { + $this->setText(new FHIRString(array_merge($ext, $data[self::FIELD_TEXT]))); + } } else { $this->setText(new FHIRString($data[self::FIELD_TEXT])); } @@ -1040,50 +1057,39 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getAsNeededBoolean())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AS_NEEDED_BOOLEAN, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getAsNeededCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AS_NEEDED_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getMaxDosePerPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MAX_DOSE_PER_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getMethod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_METHOD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getQuantityQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_QUANTITY_QUANTITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getQuantityRange())) { $v->xmlSerialize($sxe->addChild(self::FIELD_QUANTITY_RANGE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRateRange())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RATE_RANGE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRateRatio())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RATE_RATIO, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRoute())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ROUTE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSiteCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SITE_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSiteReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SITE_REFERENCE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getText())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TEXT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getTiming())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TIMING, null, $v->_getFHIRXMLNamespace())); } @@ -1097,8 +1103,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getAsNeededBoolean())) { - $a[self::FIELD_AS_NEEDED_BOOLEAN] = $v->getValue(); - $a[self::FIELD_AS_NEEDED_BOOLEAN_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_AS_NEEDED_BOOLEAN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_AS_NEEDED_BOOLEAN_EXT] = $enc; + } + } else { + $a[self::FIELD_AS_NEEDED_BOOLEAN] = $v; + } } if (null !== ($v = $this->getAsNeededCodeableConcept())) { $a[self::FIELD_AS_NEEDED_CODEABLE_CONCEPT] = $v; @@ -1110,7 +1123,15 @@ public function jsonSerialize() $a[self::FIELD_METHOD] = $v; } if (null !== ($v = $this->getQuantityQuantity())) { - $a[self::FIELD_QUANTITY_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_QUANTITY_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_QUANTITY_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_QUANTITY_QUANTITY] = $v; + } } if (null !== ($v = $this->getQuantityRange())) { $a[self::FIELD_QUANTITY_RANGE] = $v; @@ -1131,8 +1152,15 @@ public function jsonSerialize() $a[self::FIELD_SITE_REFERENCE] = $v; } if (null !== ($v = $this->getText())) { - $a[self::FIELD_TEXT] = $v->getValue(); - $a[self::FIELD_TEXT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TEXT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TEXT_EXT] = $enc; + } + } else { + $a[self::FIELD_TEXT] = $v; + } } if (null !== ($v = $this->getTiming())) { $a[self::FIELD_TIMING] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRMessageHeader/FHIRMessageHeaderDestination.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRMessageHeader/FHIRMessageHeaderDestination.php index 48541bc6eb..d82821d314 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRMessageHeader/FHIRMessageHeaderDestination.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRMessageHeader/FHIRMessageHeaderDestination.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -82,10 +82,6 @@ class FHIRMessageHeaderDestination extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MESSAGE_HEADER_DOT_DESTINATION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ENDPOINT = 'endpoint'; const FIELD_ENDPOINT_EXT = '_endpoint'; const FIELD_NAME = 'name'; @@ -126,6 +122,9 @@ class FHIRMessageHeaderDestination extends FHIRBackboneElement */ protected $target = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMessageHeaderDestination Constructor * @param null|array $data @@ -148,8 +147,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ENDPOINT] instanceof FHIRUri) { $this->setEndpoint($data[self::FIELD_ENDPOINT]); - } elseif ($ext && is_scalar($data[self::FIELD_ENDPOINT])) { - $this->setEndpoint(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_ENDPOINT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ENDPOINT])) { + $this->setEndpoint(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_ENDPOINT]] + $ext)); + } else if (is_array($data[self::FIELD_ENDPOINT])) { + $this->setEndpoint(new FHIRUri(array_merge($ext, $data[self::FIELD_ENDPOINT]))); + } } else { $this->setEndpoint(new FHIRUri($data[self::FIELD_ENDPOINT])); } @@ -160,8 +163,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -403,7 +410,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NAME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getTarget())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TARGET, null, $v->_getFHIRXMLNamespace())); } @@ -417,12 +423,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getEndpoint())) { - $a[self::FIELD_ENDPOINT] = $v->getValue(); - $a[self::FIELD_ENDPOINT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ENDPOINT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ENDPOINT_EXT] = $enc; + } + } else { + $a[self::FIELD_ENDPOINT] = $v; + } } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if (null !== ($v = $this->getTarget())) { $a[self::FIELD_TARGET] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRMessageHeader/FHIRMessageHeaderResponse.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRMessageHeader/FHIRMessageHeaderResponse.php index 0b42964752..9807dd4ccb 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRMessageHeader/FHIRMessageHeaderResponse.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRMessageHeader/FHIRMessageHeaderResponse.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -82,10 +82,6 @@ class FHIRMessageHeaderResponse extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MESSAGE_HEADER_DOT_RESPONSE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CODE = 'code'; const FIELD_CODE_EXT = '_code'; const FIELD_DETAILS = 'details'; @@ -128,6 +124,9 @@ class FHIRMessageHeaderResponse extends FHIRBackboneElement */ protected $identifier = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMessageHeaderResponse Constructor * @param null|array $data @@ -150,8 +149,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CODE] instanceof FHIRResponseType) { $this->setCode($data[self::FIELD_CODE]); - } elseif ($ext && is_scalar($data[self::FIELD_CODE])) { - $this->setCode(new FHIRResponseType([FHIRResponseType::FIELD_VALUE => $data[self::FIELD_CODE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CODE])) { + $this->setCode(new FHIRResponseType([FHIRResponseType::FIELD_VALUE => $data[self::FIELD_CODE]] + $ext)); + } else if (is_array($data[self::FIELD_CODE])) { + $this->setCode(new FHIRResponseType(array_merge($ext, $data[self::FIELD_CODE]))); + } } else { $this->setCode(new FHIRResponseType($data[self::FIELD_CODE])); } @@ -169,8 +172,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IDENTIFIER] instanceof FHIRId) { $this->setIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { - $this->setIdentifier(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRId(array_merge($ext, $data[self::FIELD_IDENTIFIER]))); + } } else { $this->setIdentifier(new FHIRId($data[self::FIELD_IDENTIFIER])); } @@ -392,11 +399,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDetails())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DETAILS, null, $v->_getFHIRXMLNamespace())); } @@ -413,14 +418,29 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getCode())) { - $a[self::FIELD_CODE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CODE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CODE_EXT] = $enc; + } + } else { + $a[self::FIELD_CODE] = $v; + } } if (null !== ($v = $this->getDetails())) { $a[self::FIELD_DETAILS] = $v; } if (null !== ($v = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $v->getValue(); - $a[self::FIELD_IDENTIFIER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_IDENTIFIER] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRMessageHeader/FHIRMessageHeaderSource.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRMessageHeader/FHIRMessageHeaderSource.php index 124b0fd802..73cd11ec27 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRMessageHeader/FHIRMessageHeaderSource.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRMessageHeader/FHIRMessageHeaderSource.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -82,10 +82,6 @@ class FHIRMessageHeaderSource extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MESSAGE_HEADER_DOT_SOURCE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CONTACT = 'contact'; const FIELD_CONTACT_EXT = '_contact'; const FIELD_ENDPOINT = 'endpoint'; @@ -155,6 +151,9 @@ class FHIRMessageHeaderSource extends FHIRBackboneElement */ protected $version = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMessageHeaderSource Constructor * @param null|array $data @@ -177,8 +176,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CONTACT] instanceof FHIRContactPoint) { $this->setContact($data[self::FIELD_CONTACT]); - } elseif ($ext && is_scalar($data[self::FIELD_CONTACT])) { - $this->setContact(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $data[self::FIELD_CONTACT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CONTACT])) { + $this->setContact(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $data[self::FIELD_CONTACT]] + $ext)); + } else if (is_array($data[self::FIELD_CONTACT])) { + $this->setContact(new FHIRContactPoint(array_merge($ext, $data[self::FIELD_CONTACT]))); + } } else { $this->setContact(new FHIRContactPoint($data[self::FIELD_CONTACT])); } @@ -189,8 +192,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ENDPOINT] instanceof FHIRUri) { $this->setEndpoint($data[self::FIELD_ENDPOINT]); - } elseif ($ext && is_scalar($data[self::FIELD_ENDPOINT])) { - $this->setEndpoint(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_ENDPOINT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ENDPOINT])) { + $this->setEndpoint(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_ENDPOINT]] + $ext)); + } else if (is_array($data[self::FIELD_ENDPOINT])) { + $this->setEndpoint(new FHIRUri(array_merge($ext, $data[self::FIELD_ENDPOINT]))); + } } else { $this->setEndpoint(new FHIRUri($data[self::FIELD_ENDPOINT])); } @@ -201,8 +208,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -213,8 +224,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SOFTWARE] instanceof FHIRString) { $this->setSoftware($data[self::FIELD_SOFTWARE]); - } elseif ($ext && is_scalar($data[self::FIELD_SOFTWARE])) { - $this->setSoftware(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SOFTWARE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SOFTWARE])) { + $this->setSoftware(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SOFTWARE]] + $ext)); + } else if (is_array($data[self::FIELD_SOFTWARE])) { + $this->setSoftware(new FHIRString(array_merge($ext, $data[self::FIELD_SOFTWARE]))); + } } else { $this->setSoftware(new FHIRString($data[self::FIELD_SOFTWARE])); } @@ -225,8 +240,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VERSION] instanceof FHIRString) { $this->setVersion($data[self::FIELD_VERSION]); - } elseif ($ext && is_scalar($data[self::FIELD_VERSION])) { - $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } else if (is_array($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString(array_merge($ext, $data[self::FIELD_VERSION]))); + } } else { $this->setVersion(new FHIRString($data[self::FIELD_VERSION])); } @@ -547,7 +566,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getContact())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CONTACT, null, $v->_getFHIRXMLNamespace())); } @@ -573,23 +591,59 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getContact())) { - $a[self::FIELD_CONTACT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CONTACT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CONTACT_EXT] = $enc; + } + } else { + $a[self::FIELD_CONTACT] = $v; + } } if (null !== ($v = $this->getEndpoint())) { - $a[self::FIELD_ENDPOINT] = $v->getValue(); - $a[self::FIELD_ENDPOINT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ENDPOINT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ENDPOINT_EXT] = $enc; + } + } else { + $a[self::FIELD_ENDPOINT] = $v; + } } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if (null !== ($v = $this->getSoftware())) { - $a[self::FIELD_SOFTWARE] = $v->getValue(); - $a[self::FIELD_SOFTWARE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SOFTWARE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SOFTWARE_EXT] = $enc; + } + } else { + $a[self::FIELD_SOFTWARE] = $v; + } } if (null !== ($v = $this->getVersion())) { - $a[self::FIELD_VERSION] = $v->getValue(); - $a[self::FIELD_VERSION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VERSION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VERSION_EXT] = $enc; + } + } else { + $a[self::FIELD_VERSION] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRNamingSystem/FHIRNamingSystemContact.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRNamingSystem/FHIRNamingSystemContact.php index ff4811777c..71435117b6 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRNamingSystem/FHIRNamingSystemContact.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRNamingSystem/FHIRNamingSystemContact.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRNamingSystemContact extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_NAMING_SYSTEM_DOT_CONTACT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_NAME = 'name'; const FIELD_NAME_EXT = '_name'; const FIELD_TELECOM = 'telecom'; @@ -112,6 +108,9 @@ class FHIRNamingSystemContact extends FHIRBackboneElement */ protected $telecom = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRNamingSystemContact Constructor * @param null|array $data @@ -134,8 +133,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -146,17 +149,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_TELECOM])) { foreach($data[self::FIELD_TELECOM] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContactPoint) { $this->addTelecom($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addTelecom(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addTelecom(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addTelecom(new FHIRContactPoint(array_merge($v, $ext[$i]))); + } } else { $this->addTelecom(new FHIRContactPoint($v)); } } } elseif ($data[self::FIELD_TELECOM] instanceof FHIRContactPoint) { $this->addTelecom($data[self::FIELD_TELECOM]); - } elseif ($ext && is_scalar($data[self::FIELD_TELECOM])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_TELECOM])) { $this->addTelecom(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $data[self::FIELD_TELECOM]] + $ext)); } else { $this->addTelecom(new FHIRContactPoint($data[self::FIELD_TELECOM])); @@ -374,7 +384,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NAME, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getTelecom())) { foreach($vs as $v) { if (null === $v) { @@ -383,6 +392,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_TELECOM, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } @@ -393,11 +403,34 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if ([] !== ($vs = $this->getTelecom())) { - $a[self::FIELD_TELECOM] = $vs; + $a[self::FIELD_TELECOM] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TELECOM][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TELECOM_EXT][] = $enc; + } else { + $a[self::FIELD_TELECOM_EXT][] = null; + } + } else { + $a[self::FIELD_TELECOM][] = $v; + } + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRNamingSystem/FHIRNamingSystemUniqueId.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRNamingSystem/FHIRNamingSystemUniqueId.php index 3ec583085c..83015acb73 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRNamingSystem/FHIRNamingSystemUniqueId.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRNamingSystem/FHIRNamingSystemUniqueId.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -82,10 +82,6 @@ class FHIRNamingSystemUniqueId extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_NAMING_SYSTEM_DOT_UNIQUE_ID; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_PERIOD = 'period'; const FIELD_PREFERRED = 'preferred'; const FIELD_PREFERRED_EXT = '_preferred'; @@ -139,6 +135,9 @@ class FHIRNamingSystemUniqueId extends FHIRBackboneElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRNamingSystemUniqueId Constructor * @param null|array $data @@ -172,8 +171,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PREFERRED] instanceof FHIRBoolean) { $this->setPreferred($data[self::FIELD_PREFERRED]); - } elseif ($ext && is_scalar($data[self::FIELD_PREFERRED])) { - $this->setPreferred(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_PREFERRED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PREFERRED])) { + $this->setPreferred(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_PREFERRED]] + $ext)); + } else if (is_array($data[self::FIELD_PREFERRED])) { + $this->setPreferred(new FHIRBoolean(array_merge($ext, $data[self::FIELD_PREFERRED]))); + } } else { $this->setPreferred(new FHIRBoolean($data[self::FIELD_PREFERRED])); } @@ -184,8 +187,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TYPE] instanceof FHIRNamingSystemIdentifierType) { $this->setType($data[self::FIELD_TYPE]); - } elseif ($ext && is_scalar($data[self::FIELD_TYPE])) { - $this->setType(new FHIRNamingSystemIdentifierType([FHIRNamingSystemIdentifierType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TYPE])) { + $this->setType(new FHIRNamingSystemIdentifierType([FHIRNamingSystemIdentifierType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } else if (is_array($data[self::FIELD_TYPE])) { + $this->setType(new FHIRNamingSystemIdentifierType(array_merge($ext, $data[self::FIELD_TYPE]))); + } } else { $this->setType(new FHIRNamingSystemIdentifierType($data[self::FIELD_TYPE])); } @@ -196,8 +203,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE] instanceof FHIRString) { $this->setValue($data[self::FIELD_VALUE]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE])) { - $this->setValue(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VALUE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE])) { + $this->setValue(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VALUE]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE])) { + $this->setValue(new FHIRString(array_merge($ext, $data[self::FIELD_VALUE]))); + } } else { $this->setValue(new FHIRString($data[self::FIELD_VALUE])); } @@ -459,18 +470,17 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PERIOD, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getPreferred())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PREFERRED, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getValue())) { + $sxe->addAttribute(self::FIELD_VALUE, (string)$v); $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE, null, $v->_getFHIRXMLNamespace())); } return $sxe; @@ -486,15 +496,37 @@ public function jsonSerialize() $a[self::FIELD_PERIOD] = $v; } if (null !== ($v = $this->getPreferred())) { - $a[self::FIELD_PREFERRED] = $v->getValue(); - $a[self::FIELD_PREFERRED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PREFERRED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PREFERRED_EXT] = $enc; + } + } else { + $a[self::FIELD_PREFERRED] = $v; + } } if (null !== ($v = $this->getType())) { - $a[self::FIELD_TYPE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TYPE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TYPE_EXT] = $enc; + } + } else { + $a[self::FIELD_TYPE] = $v; + } } if (null !== ($v = $this->getValue())) { - $a[self::FIELD_VALUE] = $v->getValue(); - $a[self::FIELD_VALUE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRNutritionOrder/FHIRNutritionOrderAdministration.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRNutritionOrder/FHIRNutritionOrderAdministration.php index 1628289952..719c2d4154 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRNutritionOrder/FHIRNutritionOrderAdministration.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRNutritionOrder/FHIRNutritionOrderAdministration.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -80,12 +80,10 @@ class FHIRNutritionOrderAdministration extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_NUTRITION_ORDER_DOT_ADMINISTRATION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_QUANTITY = 'quantity'; + const FIELD_QUANTITY_EXT = '_quantity'; const FIELD_RATE_QUANTITY = 'rateQuantity'; + const FIELD_RATE_QUANTITY_EXT = '_rateQuantity'; const FIELD_RATE_RATIO = 'rateRatio'; const FIELD_SCHEDULE = 'schedule'; @@ -133,6 +131,9 @@ class FHIRNutritionOrderAdministration extends FHIRBackboneElement */ protected $schedule = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRNutritionOrderAdministration Constructor * @param null|array $data @@ -150,15 +151,33 @@ public function __construct($data = null) } parent::__construct($data); if (isset($data[self::FIELD_QUANTITY])) { + $ext = (isset($data[self::FIELD_QUANTITY_EXT]) && is_array($data[self::FIELD_QUANTITY_EXT])) + ? $data[self::FIELD_QUANTITY_EXT] + : null; if ($data[self::FIELD_QUANTITY] instanceof FHIRSimpleQuantity) { $this->setQuantity($data[self::FIELD_QUANTITY]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_QUANTITY])) { + $this->setQuantity(new FHIRSimpleQuantity([FHIRSimpleQuantity::FIELD_VALUE => $data[self::FIELD_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_QUANTITY])) { + $this->setQuantity(new FHIRSimpleQuantity(array_merge($ext, $data[self::FIELD_QUANTITY]))); + } } else { $this->setQuantity(new FHIRSimpleQuantity($data[self::FIELD_QUANTITY])); } } if (isset($data[self::FIELD_RATE_QUANTITY])) { + $ext = (isset($data[self::FIELD_RATE_QUANTITY_EXT]) && is_array($data[self::FIELD_RATE_QUANTITY_EXT])) + ? $data[self::FIELD_RATE_QUANTITY_EXT] + : null; if ($data[self::FIELD_RATE_QUANTITY] instanceof FHIRSimpleQuantity) { $this->setRateQuantity($data[self::FIELD_RATE_QUANTITY]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_RATE_QUANTITY])) { + $this->setRateQuantity(new FHIRSimpleQuantity([FHIRSimpleQuantity::FIELD_VALUE => $data[self::FIELD_RATE_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_RATE_QUANTITY])) { + $this->setRateQuantity(new FHIRSimpleQuantity(array_merge($ext, $data[self::FIELD_RATE_QUANTITY]))); + } } else { $this->setRateQuantity(new FHIRSimpleQuantity($data[self::FIELD_RATE_QUANTITY])); } @@ -410,19 +429,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_QUANTITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRateQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RATE_QUANTITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRateRatio())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RATE_RATIO, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSchedule())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SCHEDULE, null, $v->_getFHIRXMLNamespace())); } @@ -436,10 +451,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getQuantity())) { - $a[self::FIELD_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_QUANTITY] = $v; + } } if (null !== ($v = $this->getRateQuantity())) { - $a[self::FIELD_RATE_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_RATE_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_RATE_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_RATE_QUANTITY] = $v; + } } if (null !== ($v = $this->getRateRatio())) { $a[self::FIELD_RATE_RATIO] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRNutritionOrder/FHIRNutritionOrderEnteralFormula.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRNutritionOrder/FHIRNutritionOrderEnteralFormula.php index 084f04e1c6..3f090f6f8b 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRNutritionOrder/FHIRNutritionOrderEnteralFormula.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRNutritionOrder/FHIRNutritionOrderEnteralFormula.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRNutritionOrderEnteralFormula extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_NUTRITION_ORDER_DOT_ENTERAL_FORMULA; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ADDITIVE_PRODUCT_NAME = 'additiveProductName'; const FIELD_ADDITIVE_PRODUCT_NAME_EXT = '_additiveProductName'; const FIELD_ADDITIVE_TYPE = 'additiveType'; @@ -94,7 +90,9 @@ class FHIRNutritionOrderEnteralFormula extends FHIRBackboneElement const FIELD_BASE_FORMULA_PRODUCT_NAME_EXT = '_baseFormulaProductName'; const FIELD_BASE_FORMULA_TYPE = 'baseFormulaType'; const FIELD_CALORIC_DENSITY = 'caloricDensity'; + const FIELD_CALORIC_DENSITY_EXT = '_caloricDensity'; const FIELD_MAX_VOLUME_TO_DELIVER = 'maxVolumeToDeliver'; + const FIELD_MAX_VOLUME_TO_DELIVER_EXT = '_maxVolumeToDeliver'; const FIELD_ROUTEOF_ADMINISTRATION = 'routeofAdministration'; /** @@ -204,6 +202,9 @@ class FHIRNutritionOrderEnteralFormula extends FHIRBackboneElement */ protected $routeofAdministration = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRNutritionOrderEnteralFormula Constructor * @param null|array $data @@ -226,8 +227,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ADDITIVE_PRODUCT_NAME] instanceof FHIRString) { $this->setAdditiveProductName($data[self::FIELD_ADDITIVE_PRODUCT_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_ADDITIVE_PRODUCT_NAME])) { - $this->setAdditiveProductName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_ADDITIVE_PRODUCT_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ADDITIVE_PRODUCT_NAME])) { + $this->setAdditiveProductName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_ADDITIVE_PRODUCT_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_ADDITIVE_PRODUCT_NAME])) { + $this->setAdditiveProductName(new FHIRString(array_merge($ext, $data[self::FIELD_ADDITIVE_PRODUCT_NAME]))); + } } else { $this->setAdditiveProductName(new FHIRString($data[self::FIELD_ADDITIVE_PRODUCT_NAME])); } @@ -242,6 +247,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ADMINISTRATION])) { if (is_array($data[self::FIELD_ADMINISTRATION])) { foreach($data[self::FIELD_ADMINISTRATION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRNutritionOrderAdministration) { $this->addAdministration($v); } else { @@ -260,8 +268,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ADMINISTRATION_INSTRUCTION] instanceof FHIRString) { $this->setAdministrationInstruction($data[self::FIELD_ADMINISTRATION_INSTRUCTION]); - } elseif ($ext && is_scalar($data[self::FIELD_ADMINISTRATION_INSTRUCTION])) { - $this->setAdministrationInstruction(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_ADMINISTRATION_INSTRUCTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ADMINISTRATION_INSTRUCTION])) { + $this->setAdministrationInstruction(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_ADMINISTRATION_INSTRUCTION]] + $ext)); + } else if (is_array($data[self::FIELD_ADMINISTRATION_INSTRUCTION])) { + $this->setAdministrationInstruction(new FHIRString(array_merge($ext, $data[self::FIELD_ADMINISTRATION_INSTRUCTION]))); + } } else { $this->setAdministrationInstruction(new FHIRString($data[self::FIELD_ADMINISTRATION_INSTRUCTION])); } @@ -272,8 +284,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_BASE_FORMULA_PRODUCT_NAME] instanceof FHIRString) { $this->setBaseFormulaProductName($data[self::FIELD_BASE_FORMULA_PRODUCT_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_BASE_FORMULA_PRODUCT_NAME])) { - $this->setBaseFormulaProductName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_BASE_FORMULA_PRODUCT_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_BASE_FORMULA_PRODUCT_NAME])) { + $this->setBaseFormulaProductName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_BASE_FORMULA_PRODUCT_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_BASE_FORMULA_PRODUCT_NAME])) { + $this->setBaseFormulaProductName(new FHIRString(array_merge($ext, $data[self::FIELD_BASE_FORMULA_PRODUCT_NAME]))); + } } else { $this->setBaseFormulaProductName(new FHIRString($data[self::FIELD_BASE_FORMULA_PRODUCT_NAME])); } @@ -286,15 +302,33 @@ public function __construct($data = null) } } if (isset($data[self::FIELD_CALORIC_DENSITY])) { + $ext = (isset($data[self::FIELD_CALORIC_DENSITY_EXT]) && is_array($data[self::FIELD_CALORIC_DENSITY_EXT])) + ? $data[self::FIELD_CALORIC_DENSITY_EXT] + : null; if ($data[self::FIELD_CALORIC_DENSITY] instanceof FHIRSimpleQuantity) { $this->setCaloricDensity($data[self::FIELD_CALORIC_DENSITY]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CALORIC_DENSITY])) { + $this->setCaloricDensity(new FHIRSimpleQuantity([FHIRSimpleQuantity::FIELD_VALUE => $data[self::FIELD_CALORIC_DENSITY]] + $ext)); + } else if (is_array($data[self::FIELD_CALORIC_DENSITY])) { + $this->setCaloricDensity(new FHIRSimpleQuantity(array_merge($ext, $data[self::FIELD_CALORIC_DENSITY]))); + } } else { $this->setCaloricDensity(new FHIRSimpleQuantity($data[self::FIELD_CALORIC_DENSITY])); } } if (isset($data[self::FIELD_MAX_VOLUME_TO_DELIVER])) { + $ext = (isset($data[self::FIELD_MAX_VOLUME_TO_DELIVER_EXT]) && is_array($data[self::FIELD_MAX_VOLUME_TO_DELIVER_EXT])) + ? $data[self::FIELD_MAX_VOLUME_TO_DELIVER_EXT] + : null; if ($data[self::FIELD_MAX_VOLUME_TO_DELIVER] instanceof FHIRSimpleQuantity) { $this->setMaxVolumeToDeliver($data[self::FIELD_MAX_VOLUME_TO_DELIVER]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MAX_VOLUME_TO_DELIVER])) { + $this->setMaxVolumeToDeliver(new FHIRSimpleQuantity([FHIRSimpleQuantity::FIELD_VALUE => $data[self::FIELD_MAX_VOLUME_TO_DELIVER]] + $ext)); + } else if (is_array($data[self::FIELD_MAX_VOLUME_TO_DELIVER])) { + $this->setMaxVolumeToDeliver(new FHIRSimpleQuantity(array_merge($ext, $data[self::FIELD_MAX_VOLUME_TO_DELIVER]))); + } } else { $this->setMaxVolumeToDeliver(new FHIRSimpleQuantity($data[self::FIELD_MAX_VOLUME_TO_DELIVER])); } @@ -786,11 +820,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getAdditiveProductName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ADDITIVE_PRODUCT_NAME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getAdditiveType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ADDITIVE_TYPE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getAdministration())) { foreach($vs as $v) { if (null === $v) { @@ -799,25 +831,22 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_ADMINISTRATION, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getAdministrationInstruction())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ADMINISTRATION_INSTRUCTION, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getBaseFormulaProductName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_BASE_FORMULA_PRODUCT_NAME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getBaseFormulaType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_BASE_FORMULA_TYPE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getCaloricDensity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CALORIC_DENSITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getMaxVolumeToDeliver())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MAX_VOLUME_TO_DELIVER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRouteofAdministration())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ROUTEOF_ADMINISTRATION, null, $v->_getFHIRXMLNamespace())); } @@ -831,8 +860,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getAdditiveProductName())) { - $a[self::FIELD_ADDITIVE_PRODUCT_NAME] = $v->getValue(); - $a[self::FIELD_ADDITIVE_PRODUCT_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ADDITIVE_PRODUCT_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ADDITIVE_PRODUCT_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_ADDITIVE_PRODUCT_NAME] = $v; + } } if (null !== ($v = $this->getAdditiveType())) { $a[self::FIELD_ADDITIVE_TYPE] = $v; @@ -841,21 +877,51 @@ public function jsonSerialize() $a[self::FIELD_ADMINISTRATION] = $vs; } if (null !== ($v = $this->getAdministrationInstruction())) { - $a[self::FIELD_ADMINISTRATION_INSTRUCTION] = $v->getValue(); - $a[self::FIELD_ADMINISTRATION_INSTRUCTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ADMINISTRATION_INSTRUCTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ADMINISTRATION_INSTRUCTION_EXT] = $enc; + } + } else { + $a[self::FIELD_ADMINISTRATION_INSTRUCTION] = $v; + } } if (null !== ($v = $this->getBaseFormulaProductName())) { - $a[self::FIELD_BASE_FORMULA_PRODUCT_NAME] = $v->getValue(); - $a[self::FIELD_BASE_FORMULA_PRODUCT_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_BASE_FORMULA_PRODUCT_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_BASE_FORMULA_PRODUCT_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_BASE_FORMULA_PRODUCT_NAME] = $v; + } } if (null !== ($v = $this->getBaseFormulaType())) { $a[self::FIELD_BASE_FORMULA_TYPE] = $v; } if (null !== ($v = $this->getCaloricDensity())) { - $a[self::FIELD_CALORIC_DENSITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CALORIC_DENSITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CALORIC_DENSITY_EXT] = $enc; + } + } else { + $a[self::FIELD_CALORIC_DENSITY] = $v; + } } if (null !== ($v = $this->getMaxVolumeToDeliver())) { - $a[self::FIELD_MAX_VOLUME_TO_DELIVER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MAX_VOLUME_TO_DELIVER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MAX_VOLUME_TO_DELIVER_EXT] = $enc; + } + } else { + $a[self::FIELD_MAX_VOLUME_TO_DELIVER] = $v; + } } if (null !== ($v = $this->getRouteofAdministration())) { $a[self::FIELD_ROUTEOF_ADMINISTRATION] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRNutritionOrder/FHIRNutritionOrderNutrient.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRNutritionOrder/FHIRNutritionOrderNutrient.php index d2591b4e3b..1b1a7a15f0 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRNutritionOrder/FHIRNutritionOrderNutrient.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRNutritionOrder/FHIRNutritionOrderNutrient.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,11 +79,8 @@ class FHIRNutritionOrderNutrient extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_NUTRITION_ORDER_DOT_NUTRIENT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_AMOUNT = 'amount'; + const FIELD_AMOUNT_EXT = '_amount'; const FIELD_MODIFIER = 'modifier'; /** @@ -105,6 +102,9 @@ class FHIRNutritionOrderNutrient extends FHIRBackboneElement */ protected $modifier = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRNutritionOrderNutrient Constructor * @param null|array $data @@ -122,8 +122,17 @@ public function __construct($data = null) } parent::__construct($data); if (isset($data[self::FIELD_AMOUNT])) { + $ext = (isset($data[self::FIELD_AMOUNT_EXT]) && is_array($data[self::FIELD_AMOUNT_EXT])) + ? $data[self::FIELD_AMOUNT_EXT] + : null; if ($data[self::FIELD_AMOUNT] instanceof FHIRSimpleQuantity) { $this->setAmount($data[self::FIELD_AMOUNT]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_AMOUNT])) { + $this->setAmount(new FHIRSimpleQuantity([FHIRSimpleQuantity::FIELD_VALUE => $data[self::FIELD_AMOUNT]] + $ext)); + } else if (is_array($data[self::FIELD_AMOUNT])) { + $this->setAmount(new FHIRSimpleQuantity(array_merge($ext, $data[self::FIELD_AMOUNT]))); + } } else { $this->setAmount(new FHIRSimpleQuantity($data[self::FIELD_AMOUNT])); } @@ -296,11 +305,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getAmount())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AMOUNT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getModifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MODIFIER, null, $v->_getFHIRXMLNamespace())); } @@ -314,7 +321,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getAmount())) { - $a[self::FIELD_AMOUNT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_AMOUNT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_AMOUNT_EXT] = $enc; + } + } else { + $a[self::FIELD_AMOUNT] = $v; + } } if (null !== ($v = $this->getModifier())) { $a[self::FIELD_MODIFIER] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRNutritionOrder/FHIRNutritionOrderOralDiet.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRNutritionOrder/FHIRNutritionOrderOralDiet.php index 50322f4a2a..122b74c76f 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRNutritionOrder/FHIRNutritionOrderOralDiet.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRNutritionOrder/FHIRNutritionOrderOralDiet.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRNutritionOrderOralDiet extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_NUTRITION_ORDER_DOT_ORAL_DIET; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_FLUID_CONSISTENCY_TYPE = 'fluidConsistencyType'; const FIELD_INSTRUCTION = 'instruction'; const FIELD_INSTRUCTION_EXT = '_instruction'; @@ -165,6 +161,9 @@ class FHIRNutritionOrderOralDiet extends FHIRBackboneElement */ protected $type = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRNutritionOrderOralDiet Constructor * @param null|array $data @@ -184,6 +183,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_FLUID_CONSISTENCY_TYPE])) { if (is_array($data[self::FIELD_FLUID_CONSISTENCY_TYPE])) { foreach($data[self::FIELD_FLUID_CONSISTENCY_TYPE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addFluidConsistencyType($v); } else { @@ -202,8 +204,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_INSTRUCTION] instanceof FHIRString) { $this->setInstruction($data[self::FIELD_INSTRUCTION]); - } elseif ($ext && is_scalar($data[self::FIELD_INSTRUCTION])) { - $this->setInstruction(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_INSTRUCTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_INSTRUCTION])) { + $this->setInstruction(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_INSTRUCTION]] + $ext)); + } else if (is_array($data[self::FIELD_INSTRUCTION])) { + $this->setInstruction(new FHIRString(array_merge($ext, $data[self::FIELD_INSTRUCTION]))); + } } else { $this->setInstruction(new FHIRString($data[self::FIELD_INSTRUCTION])); } @@ -211,6 +217,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_NUTRIENT])) { if (is_array($data[self::FIELD_NUTRIENT])) { foreach($data[self::FIELD_NUTRIENT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRNutritionOrderNutrient) { $this->addNutrient($v); } else { @@ -226,6 +235,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SCHEDULE])) { if (is_array($data[self::FIELD_SCHEDULE])) { foreach($data[self::FIELD_SCHEDULE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRTiming) { $this->addSchedule($v); } else { @@ -241,6 +253,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_TEXTURE])) { if (is_array($data[self::FIELD_TEXTURE])) { foreach($data[self::FIELD_TEXTURE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRNutritionOrderTexture) { $this->addTexture($v); } else { @@ -256,6 +271,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_TYPE])) { if (is_array($data[self::FIELD_TYPE])) { foreach($data[self::FIELD_TYPE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addType($v); } else { @@ -739,7 +757,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getFluidConsistencyType())) { foreach($vs as $v) { if (null === $v) { @@ -748,10 +765,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_FLUID_CONSISTENCY_TYPE, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getInstruction())) { $v->xmlSerialize($sxe->addChild(self::FIELD_INSTRUCTION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getNutrient())) { foreach($vs as $v) { if (null === $v) { @@ -787,6 +804,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } @@ -800,8 +818,15 @@ public function jsonSerialize() $a[self::FIELD_FLUID_CONSISTENCY_TYPE] = $vs; } if (null !== ($v = $this->getInstruction())) { - $a[self::FIELD_INSTRUCTION] = $v->getValue(); - $a[self::FIELD_INSTRUCTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_INSTRUCTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_INSTRUCTION_EXT] = $enc; + } + } else { + $a[self::FIELD_INSTRUCTION] = $v; + } } if ([] !== ($vs = $this->getNutrient())) { $a[self::FIELD_NUTRIENT] = $vs; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRNutritionOrder/FHIRNutritionOrderSupplement.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRNutritionOrder/FHIRNutritionOrderSupplement.php index c1e219ea33..562112cd8d 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRNutritionOrder/FHIRNutritionOrderSupplement.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRNutritionOrder/FHIRNutritionOrderSupplement.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -81,15 +81,12 @@ class FHIRNutritionOrderSupplement extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_NUTRITION_ORDER_DOT_SUPPLEMENT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_INSTRUCTION = 'instruction'; const FIELD_INSTRUCTION_EXT = '_instruction'; const FIELD_PRODUCT_NAME = 'productName'; const FIELD_PRODUCT_NAME_EXT = '_productName'; const FIELD_QUANTITY = 'quantity'; + const FIELD_QUANTITY_EXT = '_quantity'; const FIELD_SCHEDULE = 'schedule'; const FIELD_TYPE = 'type'; @@ -151,6 +148,9 @@ class FHIRNutritionOrderSupplement extends FHIRBackboneElement */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRNutritionOrderSupplement Constructor * @param null|array $data @@ -173,8 +173,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_INSTRUCTION] instanceof FHIRString) { $this->setInstruction($data[self::FIELD_INSTRUCTION]); - } elseif ($ext && is_scalar($data[self::FIELD_INSTRUCTION])) { - $this->setInstruction(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_INSTRUCTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_INSTRUCTION])) { + $this->setInstruction(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_INSTRUCTION]] + $ext)); + } else if (is_array($data[self::FIELD_INSTRUCTION])) { + $this->setInstruction(new FHIRString(array_merge($ext, $data[self::FIELD_INSTRUCTION]))); + } } else { $this->setInstruction(new FHIRString($data[self::FIELD_INSTRUCTION])); } @@ -185,15 +189,28 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PRODUCT_NAME] instanceof FHIRString) { $this->setProductName($data[self::FIELD_PRODUCT_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_PRODUCT_NAME])) { - $this->setProductName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PRODUCT_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PRODUCT_NAME])) { + $this->setProductName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PRODUCT_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_PRODUCT_NAME])) { + $this->setProductName(new FHIRString(array_merge($ext, $data[self::FIELD_PRODUCT_NAME]))); + } } else { $this->setProductName(new FHIRString($data[self::FIELD_PRODUCT_NAME])); } } if (isset($data[self::FIELD_QUANTITY])) { + $ext = (isset($data[self::FIELD_QUANTITY_EXT]) && is_array($data[self::FIELD_QUANTITY_EXT])) + ? $data[self::FIELD_QUANTITY_EXT] + : null; if ($data[self::FIELD_QUANTITY] instanceof FHIRSimpleQuantity) { $this->setQuantity($data[self::FIELD_QUANTITY]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_QUANTITY])) { + $this->setQuantity(new FHIRSimpleQuantity([FHIRSimpleQuantity::FIELD_VALUE => $data[self::FIELD_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_QUANTITY])) { + $this->setQuantity(new FHIRSimpleQuantity(array_merge($ext, $data[self::FIELD_QUANTITY]))); + } } else { $this->setQuantity(new FHIRSimpleQuantity($data[self::FIELD_QUANTITY])); } @@ -201,6 +218,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SCHEDULE])) { if (is_array($data[self::FIELD_SCHEDULE])) { foreach($data[self::FIELD_SCHEDULE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRTiming) { $this->addSchedule($v); } else { @@ -551,11 +571,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getProductName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PRODUCT_NAME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_QUANTITY, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getSchedule())) { foreach($vs as $v) { if (null === $v) { @@ -578,15 +596,37 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getInstruction())) { - $a[self::FIELD_INSTRUCTION] = $v->getValue(); - $a[self::FIELD_INSTRUCTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_INSTRUCTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_INSTRUCTION_EXT] = $enc; + } + } else { + $a[self::FIELD_INSTRUCTION] = $v; + } } if (null !== ($v = $this->getProductName())) { - $a[self::FIELD_PRODUCT_NAME] = $v->getValue(); - $a[self::FIELD_PRODUCT_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PRODUCT_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PRODUCT_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_PRODUCT_NAME] = $v; + } } if (null !== ($v = $this->getQuantity())) { - $a[self::FIELD_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_QUANTITY] = $v; + } } if ([] !== ($vs = $this->getSchedule())) { $a[self::FIELD_SCHEDULE] = $vs; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRNutritionOrder/FHIRNutritionOrderTexture.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRNutritionOrder/FHIRNutritionOrderTexture.php index 911137704c..41eb2acc98 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRNutritionOrder/FHIRNutritionOrderTexture.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRNutritionOrder/FHIRNutritionOrderTexture.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRNutritionOrderTexture extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_NUTRITION_ORDER_DOT_TEXTURE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_FOOD_TYPE = 'foodType'; const FIELD_MODIFIER = 'modifier'; @@ -111,6 +107,9 @@ class FHIRNutritionOrderTexture extends FHIRBackboneElement */ protected $modifier = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRNutritionOrderTexture Constructor * @param null|array $data @@ -316,11 +315,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getFoodType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FOOD_TYPE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getModifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MODIFIER, null, $v->_getFHIRXMLNamespace())); } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRObservation/FHIRObservationComponent.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRObservation/FHIRObservationComponent.php index abd1946584..342538946d 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRObservation/FHIRObservationComponent.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRObservation/FHIRObservationComponent.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -87,10 +87,6 @@ class FHIRObservationComponent extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_OBSERVATION_DOT_COMPONENT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CODE = 'code'; const FIELD_DATA_ABSENT_REASON = 'dataAbsentReason'; const FIELD_REFERENCE_RANGE = 'referenceRange'; @@ -272,6 +268,9 @@ class FHIRObservationComponent extends FHIRBackboneElement */ protected $valueTime = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRObservationComponent Constructor * @param null|array $data @@ -305,6 +304,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REFERENCE_RANGE])) { if (is_array($data[self::FIELD_REFERENCE_RANGE])) { foreach($data[self::FIELD_REFERENCE_RANGE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRObservationReferenceRange) { $this->addReferenceRange($v); } else { @@ -337,8 +339,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_DATE_TIME] instanceof FHIRDateTime) { $this->setValueDateTime($data[self::FIELD_VALUE_DATE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_DATE_TIME])) { - $this->setValueDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_VALUE_DATE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_DATE_TIME])) { + $this->setValueDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_VALUE_DATE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_DATE_TIME])) { + $this->setValueDateTime(new FHIRDateTime(array_merge($ext, $data[self::FIELD_VALUE_DATE_TIME]))); + } } else { $this->setValueDateTime(new FHIRDateTime($data[self::FIELD_VALUE_DATE_TIME])); } @@ -356,8 +362,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_QUANTITY] instanceof FHIRQuantity) { $this->setValueQuantity($data[self::FIELD_VALUE_QUANTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_QUANTITY])) { - $this->setValueQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_VALUE_QUANTITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_QUANTITY])) { + $this->setValueQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_VALUE_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_QUANTITY])) { + $this->setValueQuantity(new FHIRQuantity(array_merge($ext, $data[self::FIELD_VALUE_QUANTITY]))); + } } else { $this->setValueQuantity(new FHIRQuantity($data[self::FIELD_VALUE_QUANTITY])); } @@ -389,8 +399,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_STRING] instanceof FHIRString) { $this->setValueString($data[self::FIELD_VALUE_STRING]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_STRING])) { - $this->setValueString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VALUE_STRING]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_STRING])) { + $this->setValueString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VALUE_STRING]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_STRING])) { + $this->setValueString(new FHIRString(array_merge($ext, $data[self::FIELD_VALUE_STRING]))); + } } else { $this->setValueString(new FHIRString($data[self::FIELD_VALUE_STRING])); } @@ -401,8 +415,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_TIME] instanceof FHIRTime) { $this->setValueTime($data[self::FIELD_VALUE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_TIME])) { - $this->setValueTime(new FHIRTime([FHIRTime::FIELD_VALUE => $data[self::FIELD_VALUE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_TIME])) { + $this->setValueTime(new FHIRTime([FHIRTime::FIELD_VALUE => $data[self::FIELD_VALUE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_TIME])) { + $this->setValueTime(new FHIRTime(array_merge($ext, $data[self::FIELD_VALUE_TIME]))); + } } else { $this->setValueTime(new FHIRTime($data[self::FIELD_VALUE_TIME])); } @@ -1038,15 +1056,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDataAbsentReason())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DATA_ABSENT_REASON, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getReferenceRange())) { foreach($vs as $v) { if (null === $v) { @@ -1059,30 +1074,24 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getValueAttachment())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_ATTACHMENT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getValueDateTime())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_DATE_TIME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValuePeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_QUANTITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueRange())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_RANGE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueRatio())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_RATIO, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueSampledData())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_SAMPLED_DATA, null, $v->_getFHIRXMLNamespace())); } @@ -1117,14 +1126,29 @@ public function jsonSerialize() $a[self::FIELD_VALUE_CODEABLE_CONCEPT] = $v; } if (null !== ($v = $this->getValueDateTime())) { - $a[self::FIELD_VALUE_DATE_TIME] = $v->getValue(); - $a[self::FIELD_VALUE_DATE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_DATE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_DATE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_DATE_TIME] = $v; + } } if (null !== ($v = $this->getValuePeriod())) { $a[self::FIELD_VALUE_PERIOD] = $v; } if (null !== ($v = $this->getValueQuantity())) { - $a[self::FIELD_VALUE_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_QUANTITY] = $v; + } } if (null !== ($v = $this->getValueRange())) { $a[self::FIELD_VALUE_RANGE] = $v; @@ -1136,12 +1160,26 @@ public function jsonSerialize() $a[self::FIELD_VALUE_SAMPLED_DATA] = $v; } if (null !== ($v = $this->getValueString())) { - $a[self::FIELD_VALUE_STRING] = $v->getValue(); - $a[self::FIELD_VALUE_STRING_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_STRING] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_STRING_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_STRING] = $v; + } } if (null !== ($v = $this->getValueTime())) { - $a[self::FIELD_VALUE_TIME] = $v->getValue(); - $a[self::FIELD_VALUE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_TIME] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRObservation/FHIRObservationReferenceRange.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRObservation/FHIRObservationReferenceRange.php index 05be0e265a..d5ace78141 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRObservation/FHIRObservationReferenceRange.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRObservation/FHIRObservationReferenceRange.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -81,13 +81,11 @@ class FHIRObservationReferenceRange extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_OBSERVATION_DOT_REFERENCE_RANGE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_AGE = 'age'; const FIELD_HIGH = 'high'; + const FIELD_HIGH_EXT = '_high'; const FIELD_LOW = 'low'; + const FIELD_LOW_EXT = '_low'; const FIELD_MEANING = 'meaning'; const FIELD_TEXT = 'text'; const FIELD_TEXT_EXT = '_text'; @@ -149,6 +147,9 @@ class FHIRObservationReferenceRange extends FHIRBackboneElement */ protected $text = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRObservationReferenceRange Constructor * @param null|array $data @@ -173,15 +174,33 @@ public function __construct($data = null) } } if (isset($data[self::FIELD_HIGH])) { + $ext = (isset($data[self::FIELD_HIGH_EXT]) && is_array($data[self::FIELD_HIGH_EXT])) + ? $data[self::FIELD_HIGH_EXT] + : null; if ($data[self::FIELD_HIGH] instanceof FHIRSimpleQuantity) { $this->setHigh($data[self::FIELD_HIGH]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_HIGH])) { + $this->setHigh(new FHIRSimpleQuantity([FHIRSimpleQuantity::FIELD_VALUE => $data[self::FIELD_HIGH]] + $ext)); + } else if (is_array($data[self::FIELD_HIGH])) { + $this->setHigh(new FHIRSimpleQuantity(array_merge($ext, $data[self::FIELD_HIGH]))); + } } else { $this->setHigh(new FHIRSimpleQuantity($data[self::FIELD_HIGH])); } } if (isset($data[self::FIELD_LOW])) { + $ext = (isset($data[self::FIELD_LOW_EXT]) && is_array($data[self::FIELD_LOW_EXT])) + ? $data[self::FIELD_LOW_EXT] + : null; if ($data[self::FIELD_LOW] instanceof FHIRSimpleQuantity) { $this->setLow($data[self::FIELD_LOW]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_LOW])) { + $this->setLow(new FHIRSimpleQuantity([FHIRSimpleQuantity::FIELD_VALUE => $data[self::FIELD_LOW]] + $ext)); + } else if (is_array($data[self::FIELD_LOW])) { + $this->setLow(new FHIRSimpleQuantity(array_merge($ext, $data[self::FIELD_LOW]))); + } } else { $this->setLow(new FHIRSimpleQuantity($data[self::FIELD_LOW])); } @@ -199,8 +218,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TEXT] instanceof FHIRString) { $this->setText($data[self::FIELD_TEXT]); - } elseif ($ext && is_scalar($data[self::FIELD_TEXT])) { - $this->setText(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TEXT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TEXT])) { + $this->setText(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TEXT]] + $ext)); + } else if (is_array($data[self::FIELD_TEXT])) { + $this->setText(new FHIRString(array_merge($ext, $data[self::FIELD_TEXT]))); + } } else { $this->setText(new FHIRString($data[self::FIELD_TEXT])); } @@ -486,19 +509,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getAge())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AGE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getHigh())) { $v->xmlSerialize($sxe->addChild(self::FIELD_HIGH, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getLow())) { $v->xmlSerialize($sxe->addChild(self::FIELD_LOW, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getMeaning())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MEANING, null, $v->_getFHIRXMLNamespace())); } @@ -518,17 +537,40 @@ public function jsonSerialize() $a[self::FIELD_AGE] = $v; } if (null !== ($v = $this->getHigh())) { - $a[self::FIELD_HIGH] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_HIGH] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_HIGH_EXT] = $enc; + } + } else { + $a[self::FIELD_HIGH] = $v; + } } if (null !== ($v = $this->getLow())) { - $a[self::FIELD_LOW] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_LOW] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_LOW_EXT] = $enc; + } + } else { + $a[self::FIELD_LOW] = $v; + } } if (null !== ($v = $this->getMeaning())) { $a[self::FIELD_MEANING] = $v; } if (null !== ($v = $this->getText())) { - $a[self::FIELD_TEXT] = $v->getValue(); - $a[self::FIELD_TEXT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TEXT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TEXT_EXT] = $enc; + } + } else { + $a[self::FIELD_TEXT] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRObservation/FHIRObservationRelated.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRObservation/FHIRObservationRelated.php index 089fa08867..4b1ded2247 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRObservation/FHIRObservationRelated.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRObservation/FHIRObservationRelated.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRObservationRelated extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_OBSERVATION_DOT_RELATED; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_TARGET = 'target'; const FIELD_TYPE = 'type'; const FIELD_TYPE_EXT = '_type'; @@ -109,6 +105,9 @@ class FHIRObservationRelated extends FHIRBackboneElement */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRObservationRelated Constructor * @param null|array $data @@ -138,8 +137,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TYPE] instanceof FHIRObservationRelationshipType) { $this->setType($data[self::FIELD_TYPE]); - } elseif ($ext && is_scalar($data[self::FIELD_TYPE])) { - $this->setType(new FHIRObservationRelationshipType([FHIRObservationRelationshipType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TYPE])) { + $this->setType(new FHIRObservationRelationshipType([FHIRObservationRelationshipType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } else if (is_array($data[self::FIELD_TYPE])) { + $this->setType(new FHIRObservationRelationshipType(array_merge($ext, $data[self::FIELD_TYPE]))); + } } else { $this->setType(new FHIRObservationRelationshipType($data[self::FIELD_TYPE])); } @@ -311,11 +314,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getTarget())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TARGET, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -332,7 +333,15 @@ public function jsonSerialize() $a[self::FIELD_TARGET] = $v; } if (null !== ($v = $this->getType())) { - $a[self::FIELD_TYPE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TYPE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TYPE_EXT] = $enc; + } + } else { + $a[self::FIELD_TYPE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIROperationDefinition/FHIROperationDefinitionBinding.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIROperationDefinition/FHIROperationDefinitionBinding.php index 9b7a284ba3..068ee90e29 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIROperationDefinition/FHIROperationDefinitionBinding.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIROperationDefinition/FHIROperationDefinitionBinding.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIROperationDefinitionBinding extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_OPERATION_DEFINITION_DOT_BINDING; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_STRENGTH = 'strength'; const FIELD_STRENGTH_EXT = '_strength'; const FIELD_VALUE_SET_REFERENCE = 'valueSetReference'; @@ -128,6 +124,9 @@ class FHIROperationDefinitionBinding extends FHIRBackboneElement */ protected $valueSetUri = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIROperationDefinitionBinding Constructor * @param null|array $data @@ -150,8 +149,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STRENGTH] instanceof FHIRCode) { $this->setStrength($data[self::FIELD_STRENGTH]); - } elseif ($ext && is_scalar($data[self::FIELD_STRENGTH])) { - $this->setStrength(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_STRENGTH]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STRENGTH])) { + $this->setStrength(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_STRENGTH]] + $ext)); + } else if (is_array($data[self::FIELD_STRENGTH])) { + $this->setStrength(new FHIRCode(array_merge($ext, $data[self::FIELD_STRENGTH]))); + } } else { $this->setStrength(new FHIRCode($data[self::FIELD_STRENGTH])); } @@ -169,8 +172,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_SET_URI] instanceof FHIRUri) { $this->setValueSetUri($data[self::FIELD_VALUE_SET_URI]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_SET_URI])) { - $this->setValueSetUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_VALUE_SET_URI]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_SET_URI])) { + $this->setValueSetUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_VALUE_SET_URI]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_SET_URI])) { + $this->setValueSetUri(new FHIRUri(array_merge($ext, $data[self::FIELD_VALUE_SET_URI]))); + } } else { $this->setValueSetUri(new FHIRUri($data[self::FIELD_VALUE_SET_URI])); } @@ -410,7 +417,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getStrength())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STRENGTH, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueSetReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_SET_REFERENCE, null, $v->_getFHIRXMLNamespace())); } @@ -427,15 +433,29 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getStrength())) { - $a[self::FIELD_STRENGTH] = $v->getValue(); - $a[self::FIELD_STRENGTH_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STRENGTH] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STRENGTH_EXT] = $enc; + } + } else { + $a[self::FIELD_STRENGTH] = $v; + } } if (null !== ($v = $this->getValueSetReference())) { $a[self::FIELD_VALUE_SET_REFERENCE] = $v; } if (null !== ($v = $this->getValueSetUri())) { - $a[self::FIELD_VALUE_SET_URI] = $v->getValue(); - $a[self::FIELD_VALUE_SET_URI_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_SET_URI] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_SET_URI_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_SET_URI] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIROperationDefinition/FHIROperationDefinitionContact.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIROperationDefinition/FHIROperationDefinitionContact.php index 4aa8565da7..3d829d8a1c 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIROperationDefinition/FHIROperationDefinitionContact.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIROperationDefinition/FHIROperationDefinitionContact.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIROperationDefinitionContact extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_OPERATION_DEFINITION_DOT_CONTACT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_NAME = 'name'; const FIELD_NAME_EXT = '_name'; const FIELD_TELECOM = 'telecom'; @@ -111,6 +107,9 @@ class FHIROperationDefinitionContact extends FHIRBackboneElement */ protected $telecom = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIROperationDefinitionContact Constructor * @param null|array $data @@ -133,8 +132,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -145,17 +148,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_TELECOM])) { foreach($data[self::FIELD_TELECOM] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContactPoint) { $this->addTelecom($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addTelecom(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addTelecom(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addTelecom(new FHIRContactPoint(array_merge($v, $ext[$i]))); + } } else { $this->addTelecom(new FHIRContactPoint($v)); } } } elseif ($data[self::FIELD_TELECOM] instanceof FHIRContactPoint) { $this->addTelecom($data[self::FIELD_TELECOM]); - } elseif ($ext && is_scalar($data[self::FIELD_TELECOM])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_TELECOM])) { $this->addTelecom(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $data[self::FIELD_TELECOM]] + $ext)); } else { $this->addTelecom(new FHIRContactPoint($data[self::FIELD_TELECOM])); @@ -373,7 +383,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NAME, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getTelecom())) { foreach($vs as $v) { if (null === $v) { @@ -382,6 +391,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_TELECOM, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } @@ -392,11 +402,34 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if ([] !== ($vs = $this->getTelecom())) { - $a[self::FIELD_TELECOM] = $vs; + $a[self::FIELD_TELECOM] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TELECOM][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TELECOM_EXT][] = $enc; + } else { + $a[self::FIELD_TELECOM_EXT][] = null; + } + } else { + $a[self::FIELD_TELECOM][] = $v; + } + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIROperationDefinition/FHIROperationDefinitionParameter.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIROperationDefinition/FHIROperationDefinitionParameter.php index 154faffc65..7eb073385c 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIROperationDefinition/FHIROperationDefinitionParameter.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIROperationDefinition/FHIROperationDefinitionParameter.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -82,10 +82,6 @@ class FHIROperationDefinitionParameter extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_OPERATION_DEFINITION_DOT_PARAMETER; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_BINDING = 'binding'; const FIELD_DOCUMENTATION = 'documentation'; const FIELD_DOCUMENTATION_EXT = '_documentation'; @@ -202,6 +198,9 @@ class FHIROperationDefinitionParameter extends FHIRBackboneElement */ protected $use = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIROperationDefinitionParameter Constructor * @param null|array $data @@ -231,8 +230,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DOCUMENTATION] instanceof FHIRString) { $this->setDocumentation($data[self::FIELD_DOCUMENTATION]); - } elseif ($ext && is_scalar($data[self::FIELD_DOCUMENTATION])) { - $this->setDocumentation(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DOCUMENTATION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DOCUMENTATION])) { + $this->setDocumentation(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DOCUMENTATION]] + $ext)); + } else if (is_array($data[self::FIELD_DOCUMENTATION])) { + $this->setDocumentation(new FHIRString(array_merge($ext, $data[self::FIELD_DOCUMENTATION]))); + } } else { $this->setDocumentation(new FHIRString($data[self::FIELD_DOCUMENTATION])); } @@ -243,8 +246,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MAX] instanceof FHIRString) { $this->setMax($data[self::FIELD_MAX]); - } elseif ($ext && is_scalar($data[self::FIELD_MAX])) { - $this->setMax(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_MAX]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MAX])) { + $this->setMax(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_MAX]] + $ext)); + } else if (is_array($data[self::FIELD_MAX])) { + $this->setMax(new FHIRString(array_merge($ext, $data[self::FIELD_MAX]))); + } } else { $this->setMax(new FHIRString($data[self::FIELD_MAX])); } @@ -255,8 +262,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MIN] instanceof FHIRInteger) { $this->setMin($data[self::FIELD_MIN]); - } elseif ($ext && is_scalar($data[self::FIELD_MIN])) { - $this->setMin(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_MIN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MIN])) { + $this->setMin(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_MIN]] + $ext)); + } else if (is_array($data[self::FIELD_MIN])) { + $this->setMin(new FHIRInteger(array_merge($ext, $data[self::FIELD_MIN]))); + } } else { $this->setMin(new FHIRInteger($data[self::FIELD_MIN])); } @@ -267,8 +278,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRCode) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRCode(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRCode($data[self::FIELD_NAME])); } @@ -276,6 +291,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PART])) { if (is_array($data[self::FIELD_PART])) { foreach($data[self::FIELD_PART] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIROperationDefinitionParameter) { $this->addPart($v); } else { @@ -301,8 +319,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TYPE] instanceof FHIRCode) { $this->setType($data[self::FIELD_TYPE]); - } elseif ($ext && is_scalar($data[self::FIELD_TYPE])) { - $this->setType(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TYPE])) { + $this->setType(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } else if (is_array($data[self::FIELD_TYPE])) { + $this->setType(new FHIRCode(array_merge($ext, $data[self::FIELD_TYPE]))); + } } else { $this->setType(new FHIRCode($data[self::FIELD_TYPE])); } @@ -313,8 +335,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_USE] instanceof FHIROperationParameterUse) { $this->setUse($data[self::FIELD_USE]); - } elseif ($ext && is_scalar($data[self::FIELD_USE])) { - $this->setUse(new FHIROperationParameterUse([FHIROperationParameterUse::FIELD_VALUE => $data[self::FIELD_USE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_USE])) { + $this->setUse(new FHIROperationParameterUse([FHIROperationParameterUse::FIELD_VALUE => $data[self::FIELD_USE]] + $ext)); + } else if (is_array($data[self::FIELD_USE])) { + $this->setUse(new FHIROperationParameterUse(array_merge($ext, $data[self::FIELD_USE]))); + } } else { $this->setUse(new FHIROperationParameterUse($data[self::FIELD_USE])); } @@ -801,7 +827,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getBinding())) { $v->xmlSerialize($sxe->addChild(self::FIELD_BINDING, null, $v->_getFHIRXMLNamespace())); } @@ -817,7 +842,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NAME, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getPart())) { foreach($vs as $v) { if (null === $v) { @@ -833,7 +857,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getUse())) { $v->xmlSerialize($sxe->addChild(self::FIELD_USE, null, $v->_getFHIRXMLNamespace())); } @@ -850,20 +873,48 @@ public function jsonSerialize() $a[self::FIELD_BINDING] = $v; } if (null !== ($v = $this->getDocumentation())) { - $a[self::FIELD_DOCUMENTATION] = $v->getValue(); - $a[self::FIELD_DOCUMENTATION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DOCUMENTATION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DOCUMENTATION_EXT] = $enc; + } + } else { + $a[self::FIELD_DOCUMENTATION] = $v; + } } if (null !== ($v = $this->getMax())) { - $a[self::FIELD_MAX] = $v->getValue(); - $a[self::FIELD_MAX_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MAX] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MAX_EXT] = $enc; + } + } else { + $a[self::FIELD_MAX] = $v; + } } if (null !== ($v = $this->getMin())) { - $a[self::FIELD_MIN] = $v->getValue(); - $a[self::FIELD_MIN_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MIN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MIN_EXT] = $enc; + } + } else { + $a[self::FIELD_MIN] = $v; + } } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if ([] !== ($vs = $this->getPart())) { $a[self::FIELD_PART] = $vs; @@ -872,11 +923,26 @@ public function jsonSerialize() $a[self::FIELD_PROFILE] = $v; } if (null !== ($v = $this->getType())) { - $a[self::FIELD_TYPE] = $v->getValue(); - $a[self::FIELD_TYPE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TYPE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TYPE_EXT] = $enc; + } + } else { + $a[self::FIELD_TYPE] = $v; + } } if (null !== ($v = $this->getUse())) { - $a[self::FIELD_USE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_USE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_USE_EXT] = $enc; + } + } else { + $a[self::FIELD_USE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIROperationOutcome/FHIROperationOutcomeIssue.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIROperationOutcome/FHIROperationOutcomeIssue.php index 3d4208118e..d48dccd210 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIROperationOutcome/FHIROperationOutcomeIssue.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIROperationOutcome/FHIROperationOutcomeIssue.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -81,10 +81,6 @@ class FHIROperationOutcomeIssue extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_OPERATION_OUTCOME_DOT_ISSUE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CODE = 'code'; const FIELD_CODE_EXT = '_code'; const FIELD_DETAILS = 'details'; @@ -156,6 +152,9 @@ class FHIROperationOutcomeIssue extends FHIRBackboneElement */ protected $severity = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIROperationOutcomeIssue Constructor * @param null|array $data @@ -178,8 +177,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CODE] instanceof FHIRIssueType) { $this->setCode($data[self::FIELD_CODE]); - } elseif ($ext && is_scalar($data[self::FIELD_CODE])) { - $this->setCode(new FHIRIssueType([FHIRIssueType::FIELD_VALUE => $data[self::FIELD_CODE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CODE])) { + $this->setCode(new FHIRIssueType([FHIRIssueType::FIELD_VALUE => $data[self::FIELD_CODE]] + $ext)); + } else if (is_array($data[self::FIELD_CODE])) { + $this->setCode(new FHIRIssueType(array_merge($ext, $data[self::FIELD_CODE]))); + } } else { $this->setCode(new FHIRIssueType($data[self::FIELD_CODE])); } @@ -197,8 +200,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DIAGNOSTICS] instanceof FHIRString) { $this->setDiagnostics($data[self::FIELD_DIAGNOSTICS]); - } elseif ($ext && is_scalar($data[self::FIELD_DIAGNOSTICS])) { - $this->setDiagnostics(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DIAGNOSTICS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DIAGNOSTICS])) { + $this->setDiagnostics(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DIAGNOSTICS]] + $ext)); + } else if (is_array($data[self::FIELD_DIAGNOSTICS])) { + $this->setDiagnostics(new FHIRString(array_merge($ext, $data[self::FIELD_DIAGNOSTICS]))); + } } else { $this->setDiagnostics(new FHIRString($data[self::FIELD_DIAGNOSTICS])); } @@ -209,17 +216,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_LOCATION])) { foreach($data[self::FIELD_LOCATION] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRString) { $this->addLocation($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addLocation(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addLocation(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addLocation(new FHIRString(array_merge($v, $ext[$i]))); + } } else { $this->addLocation(new FHIRString($v)); } } } elseif ($data[self::FIELD_LOCATION] instanceof FHIRString) { $this->addLocation($data[self::FIELD_LOCATION]); - } elseif ($ext && is_scalar($data[self::FIELD_LOCATION])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_LOCATION])) { $this->addLocation(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_LOCATION]] + $ext)); } else { $this->addLocation(new FHIRString($data[self::FIELD_LOCATION])); @@ -231,8 +245,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SEVERITY] instanceof FHIRIssueSeverity) { $this->setSeverity($data[self::FIELD_SEVERITY]); - } elseif ($ext && is_scalar($data[self::FIELD_SEVERITY])) { - $this->setSeverity(new FHIRIssueSeverity([FHIRIssueSeverity::FIELD_VALUE => $data[self::FIELD_SEVERITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SEVERITY])) { + $this->setSeverity(new FHIRIssueSeverity([FHIRIssueSeverity::FIELD_VALUE => $data[self::FIELD_SEVERITY]] + $ext)); + } else if (is_array($data[self::FIELD_SEVERITY])) { + $this->setSeverity(new FHIRIssueSeverity(array_merge($ext, $data[self::FIELD_SEVERITY]))); + } } else { $this->setSeverity(new FHIRIssueSeverity($data[self::FIELD_SEVERITY])); } @@ -567,11 +585,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDetails())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DETAILS, null, $v->_getFHIRXMLNamespace())); } @@ -600,14 +616,29 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getCode())) { - $a[self::FIELD_CODE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CODE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CODE_EXT] = $enc; + } + } else { + $a[self::FIELD_CODE] = $v; + } } if (null !== ($v = $this->getDetails())) { $a[self::FIELD_DETAILS] = $v; } if (null !== ($v = $this->getDiagnostics())) { - $a[self::FIELD_DIAGNOSTICS] = $v->getValue(); - $a[self::FIELD_DIAGNOSTICS_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DIAGNOSTICS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DIAGNOSTICS_EXT] = $enc; + } + } else { + $a[self::FIELD_DIAGNOSTICS] = $v; + } } if ([] !== ($vs = $this->getLocation())) { $a[self::FIELD_LOCATION] = []; @@ -615,12 +646,29 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_LOCATION][] = $v->getValue(); - $a[self::FIELD_LOCATION_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_LOCATION][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_LOCATION_EXT][] = $enc; + } else { + $a[self::FIELD_LOCATION_EXT][] = null; + } + } else { + $a[self::FIELD_LOCATION][] = $v; + } } } if (null !== ($v = $this->getSeverity())) { - $a[self::FIELD_SEVERITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SEVERITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SEVERITY_EXT] = $enc; + } + } else { + $a[self::FIELD_SEVERITY] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIROrder/FHIROrderWhen.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIROrder/FHIROrderWhen.php index a156066c67..92474f4670 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIROrder/FHIROrderWhen.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIROrder/FHIROrderWhen.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIROrderWhen extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ORDER_DOT_WHEN; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CODE = 'code'; const FIELD_SCHEDULE = 'schedule'; @@ -112,6 +108,9 @@ class FHIROrderWhen extends FHIRBackboneElement */ protected $schedule = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIROrderWhen Constructor * @param null|array $data @@ -319,11 +318,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSchedule())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SCHEDULE, null, $v->_getFHIRXMLNamespace())); } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIROrganization/FHIROrganizationContact.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIROrganization/FHIROrganizationContact.php index 0f55651e00..0294336d79 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIROrganization/FHIROrganizationContact.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIROrganization/FHIROrganizationContact.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -83,10 +83,6 @@ class FHIROrganizationContact extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ORGANIZATION_DOT_CONTACT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ADDRESS = 'address'; const FIELD_NAME = 'name'; const FIELD_PURPOSE = 'purpose'; @@ -141,6 +137,9 @@ class FHIROrganizationContact extends FHIRBackboneElement */ protected $telecom = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIROrganizationContact Constructor * @param null|array $data @@ -184,17 +183,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_TELECOM])) { foreach($data[self::FIELD_TELECOM] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContactPoint) { $this->addTelecom($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addTelecom(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addTelecom(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addTelecom(new FHIRContactPoint(array_merge($v, $ext[$i]))); + } } else { $this->addTelecom(new FHIRContactPoint($v)); } } } elseif ($data[self::FIELD_TELECOM] instanceof FHIRContactPoint) { $this->addTelecom($data[self::FIELD_TELECOM]); - } elseif ($ext && is_scalar($data[self::FIELD_TELECOM])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_TELECOM])) { $this->addTelecom(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $data[self::FIELD_TELECOM]] + $ext)); } else { $this->addTelecom(new FHIRContactPoint($data[self::FIELD_TELECOM])); @@ -471,19 +477,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getAddress())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ADDRESS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NAME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPurpose())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PURPOSE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getTelecom())) { foreach($vs as $v) { if (null === $v) { @@ -492,6 +494,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_TELECOM, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } @@ -511,7 +514,23 @@ public function jsonSerialize() $a[self::FIELD_PURPOSE] = $v; } if ([] !== ($vs = $this->getTelecom())) { - $a[self::FIELD_TELECOM] = $vs; + $a[self::FIELD_TELECOM] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TELECOM][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TELECOM_EXT][] = $enc; + } else { + $a[self::FIELD_TELECOM_EXT][] = null; + } + } else { + $a[self::FIELD_TELECOM][] = $v; + } + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRParameters/FHIRParametersParameter.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRParameters/FHIRParametersParameter.php index 09cc258646..0a9c1f2630 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRParameters/FHIRParametersParameter.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRParameters/FHIRParametersParameter.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -115,10 +115,6 @@ class FHIRParametersParameter extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_PARAMETERS_DOT_PARAMETER; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_NAME = 'name'; const FIELD_NAME_EXT = '_name'; const FIELD_PART = 'part'; @@ -627,6 +623,9 @@ class FHIRParametersParameter extends FHIRBackboneElement */ protected $valueUuid = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRParametersParameter Constructor * @param null|array $data @@ -649,8 +648,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -658,6 +661,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PART])) { if (is_array($data[self::FIELD_PART])) { foreach($data[self::FIELD_PART] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRParametersParameter) { $this->addPart($v); } else { @@ -723,8 +729,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_BASE_64BINARY] instanceof FHIRBase64Binary) { $this->setValueBase64Binary($data[self::FIELD_VALUE_BASE_64BINARY]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_BASE_64BINARY])) { - $this->setValueBase64Binary(new FHIRBase64Binary([FHIRBase64Binary::FIELD_VALUE => $data[self::FIELD_VALUE_BASE_64BINARY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_BASE_64BINARY])) { + $this->setValueBase64Binary(new FHIRBase64Binary([FHIRBase64Binary::FIELD_VALUE => $data[self::FIELD_VALUE_BASE_64BINARY]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_BASE_64BINARY])) { + $this->setValueBase64Binary(new FHIRBase64Binary(array_merge($ext, $data[self::FIELD_VALUE_BASE_64BINARY]))); + } } else { $this->setValueBase64Binary(new FHIRBase64Binary($data[self::FIELD_VALUE_BASE_64BINARY])); } @@ -735,8 +745,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_BOOLEAN] instanceof FHIRBoolean) { $this->setValueBoolean($data[self::FIELD_VALUE_BOOLEAN]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_BOOLEAN])) { - $this->setValueBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_VALUE_BOOLEAN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_BOOLEAN])) { + $this->setValueBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_VALUE_BOOLEAN]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_BOOLEAN])) { + $this->setValueBoolean(new FHIRBoolean(array_merge($ext, $data[self::FIELD_VALUE_BOOLEAN]))); + } } else { $this->setValueBoolean(new FHIRBoolean($data[self::FIELD_VALUE_BOOLEAN])); } @@ -747,8 +761,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_CODE] instanceof FHIRCode) { $this->setValueCode($data[self::FIELD_VALUE_CODE]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_CODE])) { - $this->setValueCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_VALUE_CODE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_CODE])) { + $this->setValueCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_VALUE_CODE]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_CODE])) { + $this->setValueCode(new FHIRCode(array_merge($ext, $data[self::FIELD_VALUE_CODE]))); + } } else { $this->setValueCode(new FHIRCode($data[self::FIELD_VALUE_CODE])); } @@ -773,8 +791,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_CONTACT_POINT] instanceof FHIRContactPoint) { $this->setValueContactPoint($data[self::FIELD_VALUE_CONTACT_POINT]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_CONTACT_POINT])) { - $this->setValueContactPoint(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $data[self::FIELD_VALUE_CONTACT_POINT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_CONTACT_POINT])) { + $this->setValueContactPoint(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $data[self::FIELD_VALUE_CONTACT_POINT]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_CONTACT_POINT])) { + $this->setValueContactPoint(new FHIRContactPoint(array_merge($ext, $data[self::FIELD_VALUE_CONTACT_POINT]))); + } } else { $this->setValueContactPoint(new FHIRContactPoint($data[self::FIELD_VALUE_CONTACT_POINT])); } @@ -785,8 +807,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_DATE] instanceof FHIRDate) { $this->setValueDate($data[self::FIELD_VALUE_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_DATE])) { - $this->setValueDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_VALUE_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_DATE])) { + $this->setValueDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_VALUE_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_DATE])) { + $this->setValueDate(new FHIRDate(array_merge($ext, $data[self::FIELD_VALUE_DATE]))); + } } else { $this->setValueDate(new FHIRDate($data[self::FIELD_VALUE_DATE])); } @@ -797,8 +823,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_DATE_TIME] instanceof FHIRDateTime) { $this->setValueDateTime($data[self::FIELD_VALUE_DATE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_DATE_TIME])) { - $this->setValueDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_VALUE_DATE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_DATE_TIME])) { + $this->setValueDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_VALUE_DATE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_DATE_TIME])) { + $this->setValueDateTime(new FHIRDateTime(array_merge($ext, $data[self::FIELD_VALUE_DATE_TIME]))); + } } else { $this->setValueDateTime(new FHIRDateTime($data[self::FIELD_VALUE_DATE_TIME])); } @@ -809,8 +839,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_DECIMAL] instanceof FHIRDecimal) { $this->setValueDecimal($data[self::FIELD_VALUE_DECIMAL]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_DECIMAL])) { - $this->setValueDecimal(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_VALUE_DECIMAL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_DECIMAL])) { + $this->setValueDecimal(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_VALUE_DECIMAL]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_DECIMAL])) { + $this->setValueDecimal(new FHIRDecimal(array_merge($ext, $data[self::FIELD_VALUE_DECIMAL]))); + } } else { $this->setValueDecimal(new FHIRDecimal($data[self::FIELD_VALUE_DECIMAL])); } @@ -835,8 +869,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_ID] instanceof FHIRId) { $this->setValueId($data[self::FIELD_VALUE_ID]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_ID])) { - $this->setValueId(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_VALUE_ID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_ID])) { + $this->setValueId(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_VALUE_ID]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_ID])) { + $this->setValueId(new FHIRId(array_merge($ext, $data[self::FIELD_VALUE_ID]))); + } } else { $this->setValueId(new FHIRId($data[self::FIELD_VALUE_ID])); } @@ -847,8 +885,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_IDENTIFIER] instanceof FHIRIdentifier) { $this->setValueIdentifier($data[self::FIELD_VALUE_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_IDENTIFIER])) { - $this->setValueIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_VALUE_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_IDENTIFIER])) { + $this->setValueIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_VALUE_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_IDENTIFIER])) { + $this->setValueIdentifier(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_VALUE_IDENTIFIER]))); + } } else { $this->setValueIdentifier(new FHIRIdentifier($data[self::FIELD_VALUE_IDENTIFIER])); } @@ -859,8 +901,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_INSTANT] instanceof FHIRInstant) { $this->setValueInstant($data[self::FIELD_VALUE_INSTANT]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_INSTANT])) { - $this->setValueInstant(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_VALUE_INSTANT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_INSTANT])) { + $this->setValueInstant(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_VALUE_INSTANT]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_INSTANT])) { + $this->setValueInstant(new FHIRInstant(array_merge($ext, $data[self::FIELD_VALUE_INSTANT]))); + } } else { $this->setValueInstant(new FHIRInstant($data[self::FIELD_VALUE_INSTANT])); } @@ -871,8 +917,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_INTEGER] instanceof FHIRInteger) { $this->setValueInteger($data[self::FIELD_VALUE_INTEGER]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_INTEGER])) { - $this->setValueInteger(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_VALUE_INTEGER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_INTEGER])) { + $this->setValueInteger(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_VALUE_INTEGER]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_INTEGER])) { + $this->setValueInteger(new FHIRInteger(array_merge($ext, $data[self::FIELD_VALUE_INTEGER]))); + } } else { $this->setValueInteger(new FHIRInteger($data[self::FIELD_VALUE_INTEGER])); } @@ -883,8 +933,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_MARKDOWN] instanceof FHIRMarkdown) { $this->setValueMarkdown($data[self::FIELD_VALUE_MARKDOWN]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_MARKDOWN])) { - $this->setValueMarkdown(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_VALUE_MARKDOWN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_MARKDOWN])) { + $this->setValueMarkdown(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_VALUE_MARKDOWN]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_MARKDOWN])) { + $this->setValueMarkdown(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_VALUE_MARKDOWN]))); + } } else { $this->setValueMarkdown(new FHIRMarkdown($data[self::FIELD_VALUE_MARKDOWN])); } @@ -902,8 +956,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_OID] instanceof FHIROid) { $this->setValueOid($data[self::FIELD_VALUE_OID]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_OID])) { - $this->setValueOid(new FHIROid([FHIROid::FIELD_VALUE => $data[self::FIELD_VALUE_OID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_OID])) { + $this->setValueOid(new FHIROid([FHIROid::FIELD_VALUE => $data[self::FIELD_VALUE_OID]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_OID])) { + $this->setValueOid(new FHIROid(array_merge($ext, $data[self::FIELD_VALUE_OID]))); + } } else { $this->setValueOid(new FHIROid($data[self::FIELD_VALUE_OID])); } @@ -921,8 +979,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_POSITIVE_INT] instanceof FHIRPositiveInt) { $this->setValuePositiveInt($data[self::FIELD_VALUE_POSITIVE_INT]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_POSITIVE_INT])) { - $this->setValuePositiveInt(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_VALUE_POSITIVE_INT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_POSITIVE_INT])) { + $this->setValuePositiveInt(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_VALUE_POSITIVE_INT]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_POSITIVE_INT])) { + $this->setValuePositiveInt(new FHIRPositiveInt(array_merge($ext, $data[self::FIELD_VALUE_POSITIVE_INT]))); + } } else { $this->setValuePositiveInt(new FHIRPositiveInt($data[self::FIELD_VALUE_POSITIVE_INT])); } @@ -933,8 +995,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_QUANTITY] instanceof FHIRQuantity) { $this->setValueQuantity($data[self::FIELD_VALUE_QUANTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_QUANTITY])) { - $this->setValueQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_VALUE_QUANTITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_QUANTITY])) { + $this->setValueQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_VALUE_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_QUANTITY])) { + $this->setValueQuantity(new FHIRQuantity(array_merge($ext, $data[self::FIELD_VALUE_QUANTITY]))); + } } else { $this->setValueQuantity(new FHIRQuantity($data[self::FIELD_VALUE_QUANTITY])); } @@ -980,8 +1046,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_STRING] instanceof FHIRString) { $this->setValueString($data[self::FIELD_VALUE_STRING]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_STRING])) { - $this->setValueString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VALUE_STRING]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_STRING])) { + $this->setValueString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VALUE_STRING]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_STRING])) { + $this->setValueString(new FHIRString(array_merge($ext, $data[self::FIELD_VALUE_STRING]))); + } } else { $this->setValueString(new FHIRString($data[self::FIELD_VALUE_STRING])); } @@ -992,8 +1062,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_TIME] instanceof FHIRTime) { $this->setValueTime($data[self::FIELD_VALUE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_TIME])) { - $this->setValueTime(new FHIRTime([FHIRTime::FIELD_VALUE => $data[self::FIELD_VALUE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_TIME])) { + $this->setValueTime(new FHIRTime([FHIRTime::FIELD_VALUE => $data[self::FIELD_VALUE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_TIME])) { + $this->setValueTime(new FHIRTime(array_merge($ext, $data[self::FIELD_VALUE_TIME]))); + } } else { $this->setValueTime(new FHIRTime($data[self::FIELD_VALUE_TIME])); } @@ -1011,8 +1085,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_UNSIGNED_INT] instanceof FHIRUnsignedInt) { $this->setValueUnsignedInt($data[self::FIELD_VALUE_UNSIGNED_INT]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_UNSIGNED_INT])) { - $this->setValueUnsignedInt(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_VALUE_UNSIGNED_INT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_UNSIGNED_INT])) { + $this->setValueUnsignedInt(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_VALUE_UNSIGNED_INT]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_UNSIGNED_INT])) { + $this->setValueUnsignedInt(new FHIRUnsignedInt(array_merge($ext, $data[self::FIELD_VALUE_UNSIGNED_INT]))); + } } else { $this->setValueUnsignedInt(new FHIRUnsignedInt($data[self::FIELD_VALUE_UNSIGNED_INT])); } @@ -1023,8 +1101,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_URI] instanceof FHIRUri) { $this->setValueUri($data[self::FIELD_VALUE_URI]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_URI])) { - $this->setValueUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_VALUE_URI]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_URI])) { + $this->setValueUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_VALUE_URI]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_URI])) { + $this->setValueUri(new FHIRUri(array_merge($ext, $data[self::FIELD_VALUE_URI]))); + } } else { $this->setValueUri(new FHIRUri($data[self::FIELD_VALUE_URI])); } @@ -1035,8 +1117,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_UUID] instanceof FHIRUuid) { $this->setValueUuid($data[self::FIELD_VALUE_UUID]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_UUID])) { - $this->setValueUuid(new FHIRUuid([FHIRUuid::FIELD_VALUE => $data[self::FIELD_VALUE_UUID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_UUID])) { + $this->setValueUuid(new FHIRUuid([FHIRUuid::FIELD_VALUE => $data[self::FIELD_VALUE_UUID]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_UUID])) { + $this->setValueUuid(new FHIRUuid(array_merge($ext, $data[self::FIELD_VALUE_UUID]))); + } } else { $this->setValueUuid(new FHIRUuid($data[self::FIELD_VALUE_UUID])); } @@ -2691,7 +2777,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NAME, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getPart())) { foreach($vs as $v) { if (null === $v) { @@ -2705,15 +2790,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $tsxe = $sxe->addChild(self::FIELD_RESOURCE); $v->xmlSerialize($tsxe->addChild($v->_getFHIRTypeName(), null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueAddress())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_ADDRESS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueAnnotation())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_ANNOTATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueAttachment())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_ATTACHMENT, null, $v->_getFHIRXMLNamespace())); } @@ -2726,15 +2808,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getValueCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_CODE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueCoding())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_CODING, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueContactPoint())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_CONTACT_POINT, null, $v->_getFHIRXMLNamespace())); } @@ -2747,18 +2826,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getValueDecimal())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_DECIMAL, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueElementDefinition())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_ELEMENT_DEFINITION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueHumanName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_HUMAN_NAME, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getValueId())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_ID, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } @@ -2771,41 +2847,33 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getValueMarkdown())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_MARKDOWN, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueMeta())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_META, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getValueOid())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_OID, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValuePeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_PERIOD, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getValuePositiveInt())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_POSITIVE_INT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_QUANTITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueRange())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_RANGE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueRatio())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_RATIO, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_REFERENCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueSampledData())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_SAMPLED_DATA, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueSignature())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_SIGNATURE, null, $v->_getFHIRXMLNamespace())); } @@ -2815,7 +2883,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getValueTime())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_TIME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueTiming())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_TIMING, null, $v->_getFHIRXMLNamespace())); } @@ -2838,8 +2905,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if ([] !== ($vs = $this->getPart())) { $a[self::FIELD_PART] = $vs; @@ -2857,16 +2931,37 @@ public function jsonSerialize() $a[self::FIELD_VALUE_ATTACHMENT] = $v; } if (null !== ($v = $this->getValueBase64Binary())) { - $a[self::FIELD_VALUE_BASE_64BINARY] = $v->getValue(); - $a[self::FIELD_VALUE_BASE_64BINARY_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_BASE_64BINARY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_BASE_64BINARY_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_BASE_64BINARY] = $v; + } } if (null !== ($v = $this->getValueBoolean())) { - $a[self::FIELD_VALUE_BOOLEAN] = $v->getValue(); - $a[self::FIELD_VALUE_BOOLEAN_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_BOOLEAN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_BOOLEAN_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_BOOLEAN] = $v; + } } if (null !== ($v = $this->getValueCode())) { - $a[self::FIELD_VALUE_CODE] = $v->getValue(); - $a[self::FIELD_VALUE_CODE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_CODE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_CODE_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_CODE] = $v; + } } if (null !== ($v = $this->getValueCodeableConcept())) { $a[self::FIELD_VALUE_CODEABLE_CONCEPT] = $v; @@ -2875,19 +2970,48 @@ public function jsonSerialize() $a[self::FIELD_VALUE_CODING] = $v; } if (null !== ($v = $this->getValueContactPoint())) { - $a[self::FIELD_VALUE_CONTACT_POINT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_CONTACT_POINT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_CONTACT_POINT_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_CONTACT_POINT] = $v; + } } if (null !== ($v = $this->getValueDate())) { - $a[self::FIELD_VALUE_DATE] = $v->getValue(); - $a[self::FIELD_VALUE_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_DATE] = $v; + } } if (null !== ($v = $this->getValueDateTime())) { - $a[self::FIELD_VALUE_DATE_TIME] = $v->getValue(); - $a[self::FIELD_VALUE_DATE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_DATE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_DATE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_DATE_TIME] = $v; + } } if (null !== ($v = $this->getValueDecimal())) { - $a[self::FIELD_VALUE_DECIMAL] = $v->getValue(); - $a[self::FIELD_VALUE_DECIMAL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_DECIMAL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_DECIMAL_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_DECIMAL] = $v; + } } if (null !== ($v = $this->getValueElementDefinition())) { $a[self::FIELD_VALUE_ELEMENT_DEFINITION] = $v; @@ -2896,40 +3020,98 @@ public function jsonSerialize() $a[self::FIELD_VALUE_HUMAN_NAME] = $v; } if (null !== ($v = $this->getValueId())) { - $a[self::FIELD_VALUE_ID] = $v->getValue(); - $a[self::FIELD_VALUE_ID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_ID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_ID_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_ID] = $v; + } } if (null !== ($v = $this->getValueIdentifier())) { - $a[self::FIELD_VALUE_IDENTIFIER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_IDENTIFIER] = $v; + } } if (null !== ($v = $this->getValueInstant())) { - $a[self::FIELD_VALUE_INSTANT] = $v->getValue(); - $a[self::FIELD_VALUE_INSTANT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_INSTANT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_INSTANT_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_INSTANT] = $v; + } } if (null !== ($v = $this->getValueInteger())) { - $a[self::FIELD_VALUE_INTEGER] = $v->getValue(); - $a[self::FIELD_VALUE_INTEGER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_INTEGER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_INTEGER_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_INTEGER] = $v; + } } if (null !== ($v = $this->getValueMarkdown())) { - $a[self::FIELD_VALUE_MARKDOWN] = $v->getValue(); - $a[self::FIELD_VALUE_MARKDOWN_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_MARKDOWN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_MARKDOWN_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_MARKDOWN] = $v; + } } if (null !== ($v = $this->getValueMeta())) { $a[self::FIELD_VALUE_META] = $v; } if (null !== ($v = $this->getValueOid())) { - $a[self::FIELD_VALUE_OID] = $v->getValue(); - $a[self::FIELD_VALUE_OID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_OID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_OID_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_OID] = $v; + } } if (null !== ($v = $this->getValuePeriod())) { $a[self::FIELD_VALUE_PERIOD] = $v; } if (null !== ($v = $this->getValuePositiveInt())) { - $a[self::FIELD_VALUE_POSITIVE_INT] = $v->getValue(); - $a[self::FIELD_VALUE_POSITIVE_INT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_POSITIVE_INT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_POSITIVE_INT_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_POSITIVE_INT] = $v; + } } if (null !== ($v = $this->getValueQuantity())) { - $a[self::FIELD_VALUE_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_QUANTITY] = $v; + } } if (null !== ($v = $this->getValueRange())) { $a[self::FIELD_VALUE_RANGE] = $v; @@ -2947,27 +3129,62 @@ public function jsonSerialize() $a[self::FIELD_VALUE_SIGNATURE] = $v; } if (null !== ($v = $this->getValueString())) { - $a[self::FIELD_VALUE_STRING] = $v->getValue(); - $a[self::FIELD_VALUE_STRING_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_STRING] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_STRING_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_STRING] = $v; + } } if (null !== ($v = $this->getValueTime())) { - $a[self::FIELD_VALUE_TIME] = $v->getValue(); - $a[self::FIELD_VALUE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_TIME] = $v; + } } if (null !== ($v = $this->getValueTiming())) { $a[self::FIELD_VALUE_TIMING] = $v; } if (null !== ($v = $this->getValueUnsignedInt())) { - $a[self::FIELD_VALUE_UNSIGNED_INT] = $v->getValue(); - $a[self::FIELD_VALUE_UNSIGNED_INT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_UNSIGNED_INT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_UNSIGNED_INT_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_UNSIGNED_INT] = $v; + } } if (null !== ($v = $this->getValueUri())) { - $a[self::FIELD_VALUE_URI] = $v->getValue(); - $a[self::FIELD_VALUE_URI_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_URI] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_URI_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_URI] = $v; + } } if (null !== ($v = $this->getValueUuid())) { - $a[self::FIELD_VALUE_UUID] = $v->getValue(); - $a[self::FIELD_VALUE_UUID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_UUID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_UUID_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_UUID] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRPatient/FHIRPatientAnimal.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRPatient/FHIRPatientAnimal.php index 8d71c22139..75a66559fa 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRPatient/FHIRPatientAnimal.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRPatient/FHIRPatientAnimal.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRPatientAnimal extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_PATIENT_DOT_ANIMAL; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_BREED = 'breed'; const FIELD_GENDER_STATUS = 'genderStatus'; const FIELD_SPECIES = 'species'; @@ -122,6 +118,9 @@ class FHIRPatientAnimal extends FHIRBackboneElement */ protected $species = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRPatientAnimal Constructor * @param null|array $data @@ -365,15 +364,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getBreed())) { $v->xmlSerialize($sxe->addChild(self::FIELD_BREED, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getGenderStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_GENDER_STATUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSpecies())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SPECIES, null, $v->_getFHIRXMLNamespace())); } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRPatient/FHIRPatientCommunication.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRPatient/FHIRPatientCommunication.php index 36f903682c..22d20bd67c 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRPatient/FHIRPatientCommunication.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRPatient/FHIRPatientCommunication.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRPatientCommunication extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_PATIENT_DOT_COMMUNICATION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_LANGUAGE = 'language'; const FIELD_PREFERRED = 'preferred'; const FIELD_PREFERRED_EXT = '_preferred'; @@ -113,6 +109,9 @@ class FHIRPatientCommunication extends FHIRBackboneElement */ protected $preferred = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRPatientCommunication Constructor * @param null|array $data @@ -142,8 +141,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PREFERRED] instanceof FHIRBoolean) { $this->setPreferred($data[self::FIELD_PREFERRED]); - } elseif ($ext && is_scalar($data[self::FIELD_PREFERRED])) { - $this->setPreferred(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_PREFERRED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PREFERRED])) { + $this->setPreferred(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_PREFERRED]] + $ext)); + } else if (is_array($data[self::FIELD_PREFERRED])) { + $this->setPreferred(new FHIRBoolean(array_merge($ext, $data[self::FIELD_PREFERRED]))); + } } else { $this->setPreferred(new FHIRBoolean($data[self::FIELD_PREFERRED])); } @@ -334,7 +337,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getLanguage())) { $v->xmlSerialize($sxe->addChild(self::FIELD_LANGUAGE, null, $v->_getFHIRXMLNamespace())); } @@ -354,8 +356,15 @@ public function jsonSerialize() $a[self::FIELD_LANGUAGE] = $v; } if (null !== ($v = $this->getPreferred())) { - $a[self::FIELD_PREFERRED] = $v->getValue(); - $a[self::FIELD_PREFERRED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PREFERRED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PREFERRED_EXT] = $enc; + } + } else { + $a[self::FIELD_PREFERRED] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRPatient/FHIRPatientContact.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRPatient/FHIRPatientContact.php index 513f2b0e71..559c7fb743 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRPatient/FHIRPatientContact.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRPatient/FHIRPatientContact.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -84,10 +84,6 @@ class FHIRPatientContact extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_PATIENT_DOT_CONTACT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ADDRESS = 'address'; const FIELD_GENDER = 'gender'; const FIELD_GENDER_EXT = '_gender'; @@ -182,6 +178,9 @@ class FHIRPatientContact extends FHIRBackboneElement */ protected $telecom = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRPatientContact Constructor * @param null|array $data @@ -211,8 +210,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_GENDER] instanceof FHIRCode) { $this->setGender($data[self::FIELD_GENDER]); - } elseif ($ext && is_scalar($data[self::FIELD_GENDER])) { - $this->setGender(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_GENDER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_GENDER])) { + $this->setGender(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_GENDER]] + $ext)); + } else if (is_array($data[self::FIELD_GENDER])) { + $this->setGender(new FHIRCode(array_merge($ext, $data[self::FIELD_GENDER]))); + } } else { $this->setGender(new FHIRCode($data[self::FIELD_GENDER])); } @@ -241,6 +244,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_RELATIONSHIP])) { if (is_array($data[self::FIELD_RELATIONSHIP])) { foreach($data[self::FIELD_RELATIONSHIP] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addRelationship($v); } else { @@ -259,17 +265,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_TELECOM])) { foreach($data[self::FIELD_TELECOM] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContactPoint) { $this->addTelecom($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addTelecom(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addTelecom(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addTelecom(new FHIRContactPoint(array_merge($v, $ext[$i]))); + } } else { $this->addTelecom(new FHIRContactPoint($v)); } } } elseif ($data[self::FIELD_TELECOM] instanceof FHIRContactPoint) { $this->addTelecom($data[self::FIELD_TELECOM]); - } elseif ($ext && is_scalar($data[self::FIELD_TELECOM])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_TELECOM])) { $this->addTelecom(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $data[self::FIELD_TELECOM]] + $ext)); } else { $this->addTelecom(new FHIRContactPoint($data[self::FIELD_TELECOM])); @@ -690,26 +703,21 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getAddress())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ADDRESS, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getGender())) { $v->xmlSerialize($sxe->addChild(self::FIELD_GENDER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NAME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOrganization())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ORGANIZATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getRelationship())) { foreach($vs as $v) { if (null === $v) { @@ -727,6 +735,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_TELECOM, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } @@ -740,8 +749,15 @@ public function jsonSerialize() $a[self::FIELD_ADDRESS] = $v; } if (null !== ($v = $this->getGender())) { - $a[self::FIELD_GENDER] = $v->getValue(); - $a[self::FIELD_GENDER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_GENDER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_GENDER_EXT] = $enc; + } + } else { + $a[self::FIELD_GENDER] = $v; + } } if (null !== ($v = $this->getName())) { $a[self::FIELD_NAME] = $v; @@ -756,7 +772,23 @@ public function jsonSerialize() $a[self::FIELD_RELATIONSHIP] = $vs; } if ([] !== ($vs = $this->getTelecom())) { - $a[self::FIELD_TELECOM] = $vs; + $a[self::FIELD_TELECOM] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TELECOM][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TELECOM_EXT][] = $enc; + } else { + $a[self::FIELD_TELECOM_EXT][] = null; + } + } else { + $a[self::FIELD_TELECOM][] = $v; + } + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRPatient/FHIRPatientLink.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRPatient/FHIRPatientLink.php index 61ae543238..cd4bb035b0 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRPatient/FHIRPatientLink.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRPatient/FHIRPatientLink.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRPatientLink extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_PATIENT_DOT_LINK; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_OTHER = 'other'; const FIELD_TYPE = 'type'; const FIELD_TYPE_EXT = '_type'; @@ -108,6 +104,9 @@ class FHIRPatientLink extends FHIRBackboneElement */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRPatientLink Constructor * @param null|array $data @@ -137,8 +136,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TYPE] instanceof FHIRLinkType) { $this->setType($data[self::FIELD_TYPE]); - } elseif ($ext && is_scalar($data[self::FIELD_TYPE])) { - $this->setType(new FHIRLinkType([FHIRLinkType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TYPE])) { + $this->setType(new FHIRLinkType([FHIRLinkType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } else if (is_array($data[self::FIELD_TYPE])) { + $this->setType(new FHIRLinkType(array_merge($ext, $data[self::FIELD_TYPE]))); + } } else { $this->setType(new FHIRLinkType($data[self::FIELD_TYPE])); } @@ -308,11 +311,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getOther())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OTHER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -329,7 +330,15 @@ public function jsonSerialize() $a[self::FIELD_OTHER] = $v; } if (null !== ($v = $this->getType())) { - $a[self::FIELD_TYPE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TYPE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TYPE_EXT] = $enc; + } + } else { + $a[self::FIELD_TYPE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRPaymentReconciliation/FHIRPaymentReconciliationDetail.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRPaymentReconciliation/FHIRPaymentReconciliationDetail.php index bbfc6ef9a3..156c148e83 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRPaymentReconciliation/FHIRPaymentReconciliationDetail.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRPaymentReconciliation/FHIRPaymentReconciliationDetail.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -81,11 +81,8 @@ class FHIRPaymentReconciliationDetail extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_PAYMENT_RECONCILIATION_DOT_DETAIL; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_AMOUNT = 'amount'; + const FIELD_AMOUNT_EXT = '_amount'; const FIELD_DATE = 'date'; const FIELD_DATE_EXT = '_date'; const FIELD_PAYEE = 'payee'; @@ -168,6 +165,9 @@ class FHIRPaymentReconciliationDetail extends FHIRBackboneElement */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRPaymentReconciliationDetail Constructor * @param null|array $data @@ -185,8 +185,17 @@ public function __construct($data = null) } parent::__construct($data); if (isset($data[self::FIELD_AMOUNT])) { + $ext = (isset($data[self::FIELD_AMOUNT_EXT]) && is_array($data[self::FIELD_AMOUNT_EXT])) + ? $data[self::FIELD_AMOUNT_EXT] + : null; if ($data[self::FIELD_AMOUNT] instanceof FHIRMoney) { $this->setAmount($data[self::FIELD_AMOUNT]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_AMOUNT])) { + $this->setAmount(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_AMOUNT]] + $ext)); + } else if (is_array($data[self::FIELD_AMOUNT])) { + $this->setAmount(new FHIRMoney(array_merge($ext, $data[self::FIELD_AMOUNT]))); + } } else { $this->setAmount(new FHIRMoney($data[self::FIELD_AMOUNT])); } @@ -197,8 +206,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATE] instanceof FHIRDate) { $this->setDate($data[self::FIELD_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_DATE])) { - $this->setDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDate(array_merge($ext, $data[self::FIELD_DATE]))); + } } else { $this->setDate(new FHIRDate($data[self::FIELD_DATE])); } @@ -575,30 +588,24 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getAmount())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AMOUNT, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DATE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPayee())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PAYEE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRequest())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REQUEST, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getResponce())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RESPONCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSubmitter())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBMITTER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -612,11 +619,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getAmount())) { - $a[self::FIELD_AMOUNT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_AMOUNT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_AMOUNT_EXT] = $enc; + } + } else { + $a[self::FIELD_AMOUNT] = $v; + } } if (null !== ($v = $this->getDate())) { - $a[self::FIELD_DATE] = $v->getValue(); - $a[self::FIELD_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_DATE] = $v; + } } if (null !== ($v = $this->getPayee())) { $a[self::FIELD_PAYEE] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRPaymentReconciliation/FHIRPaymentReconciliationNote.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRPaymentReconciliation/FHIRPaymentReconciliationNote.php index 99812a9179..86bc348543 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRPaymentReconciliation/FHIRPaymentReconciliationNote.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRPaymentReconciliation/FHIRPaymentReconciliationNote.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRPaymentReconciliationNote extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_PAYMENT_RECONCILIATION_DOT_NOTE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_TEXT = 'text'; const FIELD_TEXT_EXT = '_text'; const FIELD_TYPE = 'type'; @@ -109,6 +105,9 @@ class FHIRPaymentReconciliationNote extends FHIRBackboneElement */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRPaymentReconciliationNote Constructor * @param null|array $data @@ -131,8 +130,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TEXT] instanceof FHIRString) { $this->setText($data[self::FIELD_TEXT]); - } elseif ($ext && is_scalar($data[self::FIELD_TEXT])) { - $this->setText(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TEXT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TEXT])) { + $this->setText(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TEXT]] + $ext)); + } else if (is_array($data[self::FIELD_TEXT])) { + $this->setText(new FHIRString(array_merge($ext, $data[self::FIELD_TEXT]))); + } } else { $this->setText(new FHIRString($data[self::FIELD_TEXT])); } @@ -325,7 +328,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getText())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TEXT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -339,8 +341,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getText())) { - $a[self::FIELD_TEXT] = $v->getValue(); - $a[self::FIELD_TEXT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TEXT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TEXT_EXT] = $enc; + } + } else { + $a[self::FIELD_TEXT] = $v; + } } if (null !== ($v = $this->getType())) { $a[self::FIELD_TYPE] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRPerson/FHIRPersonLink.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRPerson/FHIRPersonLink.php index 1290bc4daf..6d421add9b 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRPerson/FHIRPersonLink.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRPerson/FHIRPersonLink.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRPersonLink extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_PERSON_DOT_LINK; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ASSURANCE = 'assurance'; const FIELD_ASSURANCE_EXT = '_assurance'; const FIELD_TARGET = 'target'; @@ -110,6 +106,9 @@ class FHIRPersonLink extends FHIRBackboneElement */ protected $target = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRPersonLink Constructor * @param null|array $data @@ -132,8 +131,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ASSURANCE] instanceof FHIRIdentityAssuranceLevel) { $this->setAssurance($data[self::FIELD_ASSURANCE]); - } elseif ($ext && is_scalar($data[self::FIELD_ASSURANCE])) { - $this->setAssurance(new FHIRIdentityAssuranceLevel([FHIRIdentityAssuranceLevel::FIELD_VALUE => $data[self::FIELD_ASSURANCE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ASSURANCE])) { + $this->setAssurance(new FHIRIdentityAssuranceLevel([FHIRIdentityAssuranceLevel::FIELD_VALUE => $data[self::FIELD_ASSURANCE]] + $ext)); + } else if (is_array($data[self::FIELD_ASSURANCE])) { + $this->setAssurance(new FHIRIdentityAssuranceLevel(array_merge($ext, $data[self::FIELD_ASSURANCE]))); + } } else { $this->setAssurance(new FHIRIdentityAssuranceLevel($data[self::FIELD_ASSURANCE])); } @@ -314,11 +317,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getAssurance())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ASSURANCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getTarget())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TARGET, null, $v->_getFHIRXMLNamespace())); } @@ -332,7 +333,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getAssurance())) { - $a[self::FIELD_ASSURANCE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ASSURANCE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ASSURANCE_EXT] = $enc; + } + } else { + $a[self::FIELD_ASSURANCE] = $v; + } } if (null !== ($v = $this->getTarget())) { $a[self::FIELD_TARGET] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRPractitioner/FHIRPractitionerPractitionerRole.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRPractitioner/FHIRPractitionerPractitionerRole.php index 25e7c7e880..eaeb28e71d 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRPractitioner/FHIRPractitionerPractitionerRole.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRPractitioner/FHIRPractitionerPractitionerRole.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRPractitionerPractitionerRole extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_PRACTITIONER_DOT_PRACTITIONER_ROLE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_HEALTHCARE_SERVICE = 'healthcareService'; const FIELD_LOCATION = 'location'; const FIELD_MANAGING_ORGANIZATION = 'managingOrganization'; @@ -161,6 +157,9 @@ class FHIRPractitionerPractitionerRole extends FHIRBackboneElement */ protected $specialty = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRPractitionerPractitionerRole Constructor * @param null|array $data @@ -180,6 +179,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_HEALTHCARE_SERVICE])) { if (is_array($data[self::FIELD_HEALTHCARE_SERVICE])) { foreach($data[self::FIELD_HEALTHCARE_SERVICE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addHealthcareService($v); } else { @@ -195,6 +197,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_LOCATION])) { if (is_array($data[self::FIELD_LOCATION])) { foreach($data[self::FIELD_LOCATION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addLocation($v); } else { @@ -231,6 +236,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SPECIALTY])) { if (is_array($data[self::FIELD_SPECIALTY])) { foreach($data[self::FIELD_SPECIALTY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addSpecialty($v); } else { @@ -636,7 +644,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getHealthcareService())) { foreach($vs as $v) { if (null === $v) { @@ -658,15 +665,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getManagingOrganization())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MANAGING_ORGANIZATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRole())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ROLE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getSpecialty())) { foreach($vs as $v) { if (null === $v) { @@ -675,6 +679,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_SPECIALTY, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRPractitioner/FHIRPractitionerQualification.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRPractitioner/FHIRPractitionerQualification.php index 3edfafc2d1..6b5ddd640c 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRPractitioner/FHIRPractitionerQualification.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRPractitioner/FHIRPractitionerQualification.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -81,10 +81,6 @@ class FHIRPractitionerQualification extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_PRACTITIONER_DOT_QUALIFICATION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CODE = 'code'; const FIELD_IDENTIFIER = 'identifier'; const FIELD_IDENTIFIER_EXT = '_identifier'; @@ -136,6 +132,9 @@ class FHIRPractitionerQualification extends FHIRBackboneElement */ protected $period = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRPractitionerQualification Constructor * @param null|array $data @@ -165,17 +164,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -458,11 +464,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -475,7 +479,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getIssuer())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ISSUER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PERIOD, null, $v->_getFHIRXMLNamespace())); } @@ -492,7 +495,23 @@ public function jsonSerialize() $a[self::FIELD_CODE] = $v; } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if (null !== ($v = $this->getIssuer())) { $a[self::FIELD_ISSUER] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRProcedure/FHIRProcedureFocalDevice.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRProcedure/FHIRProcedureFocalDevice.php index e0be19ec16..cb9a22ad77 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRProcedure/FHIRProcedureFocalDevice.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRProcedure/FHIRProcedureFocalDevice.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRProcedureFocalDevice extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_PROCEDURE_DOT_FOCAL_DEVICE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ACTION = 'action'; const FIELD_MANIPULATED = 'manipulated'; @@ -110,6 +106,9 @@ class FHIRProcedureFocalDevice extends FHIRBackboneElement */ protected $manipulated = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRProcedureFocalDevice Constructor * @param null|array $data @@ -309,11 +308,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getAction())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ACTION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getManipulated())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MANIPULATED, null, $v->_getFHIRXMLNamespace())); } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRProcedure/FHIRProcedurePerformer.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRProcedure/FHIRProcedurePerformer.php index 69d7cecd2c..985e4a383f 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRProcedure/FHIRProcedurePerformer.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRProcedure/FHIRProcedurePerformer.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRProcedurePerformer extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_PROCEDURE_DOT_PERFORMER; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ACTOR = 'actor'; const FIELD_ROLE = 'role'; @@ -110,6 +106,9 @@ class FHIRProcedurePerformer extends FHIRBackboneElement */ protected $role = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRProcedurePerformer Constructor * @param null|array $data @@ -309,11 +308,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getActor())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ACTOR, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRole())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ROLE, null, $v->_getFHIRXMLNamespace())); } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRProcessRequest/FHIRProcessRequestItem.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRProcessRequest/FHIRProcessRequestItem.php index ae2a3b8001..fe1b6fd939 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRProcessRequest/FHIRProcessRequestItem.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRProcessRequest/FHIRProcessRequestItem.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRProcessRequestItem extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_PROCESS_REQUEST_DOT_ITEM; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_SEQUENCE_LINK_ID = 'sequenceLinkId'; const FIELD_SEQUENCE_LINK_ID_EXT = '_sequenceLinkId'; @@ -96,6 +92,9 @@ class FHIRProcessRequestItem extends FHIRBackboneElement */ protected $sequenceLinkId = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRProcessRequestItem Constructor * @param null|array $data @@ -118,8 +117,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SEQUENCE_LINK_ID] instanceof FHIRInteger) { $this->setSequenceLinkId($data[self::FIELD_SEQUENCE_LINK_ID]); - } elseif ($ext && is_scalar($data[self::FIELD_SEQUENCE_LINK_ID])) { - $this->setSequenceLinkId(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_SEQUENCE_LINK_ID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SEQUENCE_LINK_ID])) { + $this->setSequenceLinkId(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_SEQUENCE_LINK_ID]] + $ext)); + } else if (is_array($data[self::FIELD_SEQUENCE_LINK_ID])) { + $this->setSequenceLinkId(new FHIRInteger(array_merge($ext, $data[self::FIELD_SEQUENCE_LINK_ID]))); + } } else { $this->setSequenceLinkId(new FHIRInteger($data[self::FIELD_SEQUENCE_LINK_ID])); } @@ -282,8 +285,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getSequenceLinkId())) { - $a[self::FIELD_SEQUENCE_LINK_ID] = $v->getValue(); - $a[self::FIELD_SEQUENCE_LINK_ID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SEQUENCE_LINK_ID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SEQUENCE_LINK_ID_EXT] = $enc; + } + } else { + $a[self::FIELD_SEQUENCE_LINK_ID] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRProcessResponse/FHIRProcessResponseNotes.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRProcessResponse/FHIRProcessResponseNotes.php index 6e2a5d8f0f..3b0c784c1c 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRProcessResponse/FHIRProcessResponseNotes.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRProcessResponse/FHIRProcessResponseNotes.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRProcessResponseNotes extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_PROCESS_RESPONSE_DOT_NOTES; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_TEXT = 'text'; const FIELD_TEXT_EXT = '_text'; const FIELD_TYPE = 'type'; @@ -109,6 +105,9 @@ class FHIRProcessResponseNotes extends FHIRBackboneElement */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRProcessResponseNotes Constructor * @param null|array $data @@ -131,8 +130,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TEXT] instanceof FHIRString) { $this->setText($data[self::FIELD_TEXT]); - } elseif ($ext && is_scalar($data[self::FIELD_TEXT])) { - $this->setText(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TEXT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TEXT])) { + $this->setText(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TEXT]] + $ext)); + } else if (is_array($data[self::FIELD_TEXT])) { + $this->setText(new FHIRString(array_merge($ext, $data[self::FIELD_TEXT]))); + } } else { $this->setText(new FHIRString($data[self::FIELD_TEXT])); } @@ -325,7 +328,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getText())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TEXT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -339,8 +341,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getText())) { - $a[self::FIELD_TEXT] = $v->getValue(); - $a[self::FIELD_TEXT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TEXT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TEXT_EXT] = $enc; + } + } else { + $a[self::FIELD_TEXT] = $v; + } } if (null !== ($v = $this->getType())) { $a[self::FIELD_TYPE] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRProvenance/FHIRProvenanceAgent.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRProvenance/FHIRProvenanceAgent.php index 4d4bb7addc..00a28965de 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRProvenance/FHIRProvenanceAgent.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRProvenance/FHIRProvenanceAgent.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -87,10 +87,6 @@ class FHIRProvenanceAgent extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_PROVENANCE_DOT_AGENT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ACTOR = 'actor'; const FIELD_RELATED_AGENT = 'relatedAgent'; const FIELD_ROLE = 'role'; @@ -150,6 +146,9 @@ class FHIRProvenanceAgent extends FHIRBackboneElement */ protected $userId = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRProvenanceAgent Constructor * @param null|array $data @@ -176,6 +175,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_RELATED_AGENT])) { if (is_array($data[self::FIELD_RELATED_AGENT])) { foreach($data[self::FIELD_RELATED_AGENT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRProvenanceRelatedAgent) { $this->addRelatedAgent($v); } else { @@ -201,8 +203,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_USER_ID] instanceof FHIRIdentifier) { $this->setUserId($data[self::FIELD_USER_ID]); - } elseif ($ext && is_scalar($data[self::FIELD_USER_ID])) { - $this->setUserId(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_USER_ID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_USER_ID])) { + $this->setUserId(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_USER_ID]] + $ext)); + } else if (is_array($data[self::FIELD_USER_ID])) { + $this->setUserId(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_USER_ID]))); + } } else { $this->setUserId(new FHIRIdentifier($data[self::FIELD_USER_ID])); } @@ -495,11 +501,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getActor())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ACTOR, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getRelatedAgent())) { foreach($vs as $v) { if (null === $v) { @@ -512,7 +516,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getRole())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ROLE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getUserId())) { $v->xmlSerialize($sxe->addChild(self::FIELD_USER_ID, null, $v->_getFHIRXMLNamespace())); } @@ -535,7 +538,15 @@ public function jsonSerialize() $a[self::FIELD_ROLE] = $v; } if (null !== ($v = $this->getUserId())) { - $a[self::FIELD_USER_ID] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_USER_ID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_USER_ID_EXT] = $enc; + } + } else { + $a[self::FIELD_USER_ID] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRProvenance/FHIRProvenanceEntity.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRProvenance/FHIRProvenanceEntity.php index 4ef80e37de..2b789c25b6 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRProvenance/FHIRProvenanceEntity.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRProvenance/FHIRProvenanceEntity.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -88,10 +88,6 @@ class FHIRProvenanceEntity extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_PROVENANCE_DOT_ENTITY; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_AGENT = 'agent'; const FIELD_DISPLAY = 'display'; const FIELD_DISPLAY_EXT = '_display'; @@ -166,6 +162,9 @@ class FHIRProvenanceEntity extends FHIRBackboneElement */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRProvenanceEntity Constructor * @param null|array $data @@ -195,8 +194,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DISPLAY] instanceof FHIRString) { $this->setDisplay($data[self::FIELD_DISPLAY]); - } elseif ($ext && is_scalar($data[self::FIELD_DISPLAY])) { - $this->setDisplay(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DISPLAY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DISPLAY])) { + $this->setDisplay(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DISPLAY]] + $ext)); + } else if (is_array($data[self::FIELD_DISPLAY])) { + $this->setDisplay(new FHIRString(array_merge($ext, $data[self::FIELD_DISPLAY]))); + } } else { $this->setDisplay(new FHIRString($data[self::FIELD_DISPLAY])); } @@ -207,8 +210,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_REFERENCE] instanceof FHIRUri) { $this->setReference($data[self::FIELD_REFERENCE]); - } elseif ($ext && is_scalar($data[self::FIELD_REFERENCE])) { - $this->setReference(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_REFERENCE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_REFERENCE])) { + $this->setReference(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_REFERENCE]] + $ext)); + } else if (is_array($data[self::FIELD_REFERENCE])) { + $this->setReference(new FHIRUri(array_merge($ext, $data[self::FIELD_REFERENCE]))); + } } else { $this->setReference(new FHIRUri($data[self::FIELD_REFERENCE])); } @@ -219,8 +226,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ROLE] instanceof FHIRProvenanceEntityRole) { $this->setRole($data[self::FIELD_ROLE]); - } elseif ($ext && is_scalar($data[self::FIELD_ROLE])) { - $this->setRole(new FHIRProvenanceEntityRole([FHIRProvenanceEntityRole::FIELD_VALUE => $data[self::FIELD_ROLE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ROLE])) { + $this->setRole(new FHIRProvenanceEntityRole([FHIRProvenanceEntityRole::FIELD_VALUE => $data[self::FIELD_ROLE]] + $ext)); + } else if (is_array($data[self::FIELD_ROLE])) { + $this->setRole(new FHIRProvenanceEntityRole(array_merge($ext, $data[self::FIELD_ROLE]))); + } } else { $this->setRole(new FHIRProvenanceEntityRole($data[self::FIELD_ROLE])); } @@ -540,7 +551,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getAgent())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AGENT, null, $v->_getFHIRXMLNamespace())); } @@ -550,11 +560,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REFERENCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRole())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ROLE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -571,15 +579,37 @@ public function jsonSerialize() $a[self::FIELD_AGENT] = $v; } if (null !== ($v = $this->getDisplay())) { - $a[self::FIELD_DISPLAY] = $v->getValue(); - $a[self::FIELD_DISPLAY_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DISPLAY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DISPLAY_EXT] = $enc; + } + } else { + $a[self::FIELD_DISPLAY] = $v; + } } if (null !== ($v = $this->getReference())) { - $a[self::FIELD_REFERENCE] = $v->getValue(); - $a[self::FIELD_REFERENCE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_REFERENCE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_REFERENCE_EXT] = $enc; + } + } else { + $a[self::FIELD_REFERENCE] = $v; + } } if (null !== ($v = $this->getRole())) { - $a[self::FIELD_ROLE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ROLE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ROLE_EXT] = $enc; + } + } else { + $a[self::FIELD_ROLE] = $v; + } } if (null !== ($v = $this->getType())) { $a[self::FIELD_TYPE] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRProvenance/FHIRProvenanceRelatedAgent.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRProvenance/FHIRProvenanceRelatedAgent.php index 5c4bab5cd8..ca6fed1abb 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRProvenance/FHIRProvenanceRelatedAgent.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRProvenance/FHIRProvenanceRelatedAgent.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -86,10 +86,6 @@ class FHIRProvenanceRelatedAgent extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_PROVENANCE_DOT_RELATED_AGENT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_TARGET = 'target'; const FIELD_TARGET_EXT = '_target'; const FIELD_TYPE = 'type'; @@ -118,6 +114,9 @@ class FHIRProvenanceRelatedAgent extends FHIRBackboneElement */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRProvenanceRelatedAgent Constructor * @param null|array $data @@ -140,8 +139,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TARGET] instanceof FHIRUri) { $this->setTarget($data[self::FIELD_TARGET]); - } elseif ($ext && is_scalar($data[self::FIELD_TARGET])) { - $this->setTarget(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_TARGET]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TARGET])) { + $this->setTarget(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_TARGET]] + $ext)); + } else if (is_array($data[self::FIELD_TARGET])) { + $this->setTarget(new FHIRUri(array_merge($ext, $data[self::FIELD_TARGET]))); + } } else { $this->setTarget(new FHIRUri($data[self::FIELD_TARGET])); } @@ -338,7 +341,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getTarget())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TARGET, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -352,8 +354,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getTarget())) { - $a[self::FIELD_TARGET] = $v->getValue(); - $a[self::FIELD_TARGET_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TARGET] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TARGET_EXT] = $enc; + } + } else { + $a[self::FIELD_TARGET] = $v; + } } if (null !== ($v = $this->getType())) { $a[self::FIELD_TYPE] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRQuestionnaire/FHIRQuestionnaireGroup.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRQuestionnaire/FHIRQuestionnaireGroup.php index 902165d5f5..09e95b9d5f 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRQuestionnaire/FHIRQuestionnaireGroup.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRQuestionnaire/FHIRQuestionnaireGroup.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -81,10 +81,6 @@ class FHIRQuestionnaireGroup extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_QUESTIONNAIRE_DOT_GROUP; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CONCEPT = 'concept'; const FIELD_GROUP = 'group'; const FIELD_LINK_ID = 'linkId'; @@ -192,6 +188,9 @@ class FHIRQuestionnaireGroup extends FHIRBackboneElement */ protected $title = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRQuestionnaireGroup Constructor * @param null|array $data @@ -211,6 +210,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CONCEPT])) { if (is_array($data[self::FIELD_CONCEPT])) { foreach($data[self::FIELD_CONCEPT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCoding) { $this->addConcept($v); } else { @@ -226,6 +228,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_GROUP])) { if (is_array($data[self::FIELD_GROUP])) { foreach($data[self::FIELD_GROUP] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRQuestionnaireGroup) { $this->addGroup($v); } else { @@ -244,8 +249,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_LINK_ID] instanceof FHIRString) { $this->setLinkId($data[self::FIELD_LINK_ID]); - } elseif ($ext && is_scalar($data[self::FIELD_LINK_ID])) { - $this->setLinkId(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_LINK_ID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_LINK_ID])) { + $this->setLinkId(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_LINK_ID]] + $ext)); + } else if (is_array($data[self::FIELD_LINK_ID])) { + $this->setLinkId(new FHIRString(array_merge($ext, $data[self::FIELD_LINK_ID]))); + } } else { $this->setLinkId(new FHIRString($data[self::FIELD_LINK_ID])); } @@ -253,6 +262,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_QUESTION])) { if (is_array($data[self::FIELD_QUESTION])) { foreach($data[self::FIELD_QUESTION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRQuestionnaireQuestion) { $this->addQuestion($v); } else { @@ -271,8 +283,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_REPEATS] instanceof FHIRBoolean) { $this->setRepeats($data[self::FIELD_REPEATS]); - } elseif ($ext && is_scalar($data[self::FIELD_REPEATS])) { - $this->setRepeats(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_REPEATS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_REPEATS])) { + $this->setRepeats(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_REPEATS]] + $ext)); + } else if (is_array($data[self::FIELD_REPEATS])) { + $this->setRepeats(new FHIRBoolean(array_merge($ext, $data[self::FIELD_REPEATS]))); + } } else { $this->setRepeats(new FHIRBoolean($data[self::FIELD_REPEATS])); } @@ -283,8 +299,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_REQUIRED] instanceof FHIRBoolean) { $this->setRequired($data[self::FIELD_REQUIRED]); - } elseif ($ext && is_scalar($data[self::FIELD_REQUIRED])) { - $this->setRequired(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_REQUIRED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_REQUIRED])) { + $this->setRequired(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_REQUIRED]] + $ext)); + } else if (is_array($data[self::FIELD_REQUIRED])) { + $this->setRequired(new FHIRBoolean(array_merge($ext, $data[self::FIELD_REQUIRED]))); + } } else { $this->setRequired(new FHIRBoolean($data[self::FIELD_REQUIRED])); } @@ -295,8 +315,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TEXT] instanceof FHIRString) { $this->setText($data[self::FIELD_TEXT]); - } elseif ($ext && is_scalar($data[self::FIELD_TEXT])) { - $this->setText(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TEXT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TEXT])) { + $this->setText(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TEXT]] + $ext)); + } else if (is_array($data[self::FIELD_TEXT])) { + $this->setText(new FHIRString(array_merge($ext, $data[self::FIELD_TEXT]))); + } } else { $this->setText(new FHIRString($data[self::FIELD_TEXT])); } @@ -307,8 +331,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TITLE] instanceof FHIRString) { $this->setTitle($data[self::FIELD_TITLE]); - } elseif ($ext && is_scalar($data[self::FIELD_TITLE])) { - $this->setTitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TITLE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TITLE])) { + $this->setTitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TITLE]] + $ext)); + } else if (is_array($data[self::FIELD_TITLE])) { + $this->setTitle(new FHIRString(array_merge($ext, $data[self::FIELD_TITLE]))); + } } else { $this->setTitle(new FHIRString($data[self::FIELD_TITLE])); } @@ -830,7 +858,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getConcept())) { foreach($vs as $v) { if (null === $v) { @@ -848,10 +875,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_GROUP, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getLinkId())) { $v->xmlSerialize($sxe->addChild(self::FIELD_LINK_ID, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getQuestion())) { foreach($vs as $v) { if (null === $v) { @@ -860,6 +887,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_QUESTION, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getRepeats())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REPEATS, null, $v->_getFHIRXMLNamespace())); } @@ -888,27 +916,62 @@ public function jsonSerialize() $a[self::FIELD_GROUP] = $vs; } if (null !== ($v = $this->getLinkId())) { - $a[self::FIELD_LINK_ID] = $v->getValue(); - $a[self::FIELD_LINK_ID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_LINK_ID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_LINK_ID_EXT] = $enc; + } + } else { + $a[self::FIELD_LINK_ID] = $v; + } } if ([] !== ($vs = $this->getQuestion())) { $a[self::FIELD_QUESTION] = $vs; } if (null !== ($v = $this->getRepeats())) { - $a[self::FIELD_REPEATS] = $v->getValue(); - $a[self::FIELD_REPEATS_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_REPEATS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_REPEATS_EXT] = $enc; + } + } else { + $a[self::FIELD_REPEATS] = $v; + } } if (null !== ($v = $this->getRequired())) { - $a[self::FIELD_REQUIRED] = $v->getValue(); - $a[self::FIELD_REQUIRED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_REQUIRED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_REQUIRED_EXT] = $enc; + } + } else { + $a[self::FIELD_REQUIRED] = $v; + } } if (null !== ($v = $this->getText())) { - $a[self::FIELD_TEXT] = $v->getValue(); - $a[self::FIELD_TEXT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TEXT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TEXT_EXT] = $enc; + } + } else { + $a[self::FIELD_TEXT] = $v; + } } if (null !== ($v = $this->getTitle())) { - $a[self::FIELD_TITLE] = $v->getValue(); - $a[self::FIELD_TITLE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TITLE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TITLE_EXT] = $enc; + } + } else { + $a[self::FIELD_TITLE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRQuestionnaire/FHIRQuestionnaireQuestion.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRQuestionnaire/FHIRQuestionnaireQuestion.php index c5b82df87c..77513df635 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRQuestionnaire/FHIRQuestionnaireQuestion.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRQuestionnaire/FHIRQuestionnaireQuestion.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -83,10 +83,6 @@ class FHIRQuestionnaireQuestion extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_QUESTIONNAIRE_DOT_QUESTION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CONCEPT = 'concept'; const FIELD_GROUP = 'group'; const FIELD_LINK_ID = 'linkId'; @@ -206,6 +202,9 @@ class FHIRQuestionnaireQuestion extends FHIRBackboneElement */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRQuestionnaireQuestion Constructor * @param null|array $data @@ -225,6 +224,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CONCEPT])) { if (is_array($data[self::FIELD_CONCEPT])) { foreach($data[self::FIELD_CONCEPT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCoding) { $this->addConcept($v); } else { @@ -240,6 +242,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_GROUP])) { if (is_array($data[self::FIELD_GROUP])) { foreach($data[self::FIELD_GROUP] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRQuestionnaireGroup) { $this->addGroup($v); } else { @@ -258,8 +263,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_LINK_ID] instanceof FHIRString) { $this->setLinkId($data[self::FIELD_LINK_ID]); - } elseif ($ext && is_scalar($data[self::FIELD_LINK_ID])) { - $this->setLinkId(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_LINK_ID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_LINK_ID])) { + $this->setLinkId(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_LINK_ID]] + $ext)); + } else if (is_array($data[self::FIELD_LINK_ID])) { + $this->setLinkId(new FHIRString(array_merge($ext, $data[self::FIELD_LINK_ID]))); + } } else { $this->setLinkId(new FHIRString($data[self::FIELD_LINK_ID])); } @@ -267,6 +276,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_OPTION])) { if (is_array($data[self::FIELD_OPTION])) { foreach($data[self::FIELD_OPTION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCoding) { $this->addOption($v); } else { @@ -292,8 +304,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_REPEATS] instanceof FHIRBoolean) { $this->setRepeats($data[self::FIELD_REPEATS]); - } elseif ($ext && is_scalar($data[self::FIELD_REPEATS])) { - $this->setRepeats(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_REPEATS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_REPEATS])) { + $this->setRepeats(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_REPEATS]] + $ext)); + } else if (is_array($data[self::FIELD_REPEATS])) { + $this->setRepeats(new FHIRBoolean(array_merge($ext, $data[self::FIELD_REPEATS]))); + } } else { $this->setRepeats(new FHIRBoolean($data[self::FIELD_REPEATS])); } @@ -304,8 +320,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_REQUIRED] instanceof FHIRBoolean) { $this->setRequired($data[self::FIELD_REQUIRED]); - } elseif ($ext && is_scalar($data[self::FIELD_REQUIRED])) { - $this->setRequired(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_REQUIRED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_REQUIRED])) { + $this->setRequired(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_REQUIRED]] + $ext)); + } else if (is_array($data[self::FIELD_REQUIRED])) { + $this->setRequired(new FHIRBoolean(array_merge($ext, $data[self::FIELD_REQUIRED]))); + } } else { $this->setRequired(new FHIRBoolean($data[self::FIELD_REQUIRED])); } @@ -316,8 +336,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TEXT] instanceof FHIRString) { $this->setText($data[self::FIELD_TEXT]); - } elseif ($ext && is_scalar($data[self::FIELD_TEXT])) { - $this->setText(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TEXT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TEXT])) { + $this->setText(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TEXT]] + $ext)); + } else if (is_array($data[self::FIELD_TEXT])) { + $this->setText(new FHIRString(array_merge($ext, $data[self::FIELD_TEXT]))); + } } else { $this->setText(new FHIRString($data[self::FIELD_TEXT])); } @@ -328,8 +352,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TYPE] instanceof FHIRAnswerFormat) { $this->setType($data[self::FIELD_TYPE]); - } elseif ($ext && is_scalar($data[self::FIELD_TYPE])) { - $this->setType(new FHIRAnswerFormat([FHIRAnswerFormat::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TYPE])) { + $this->setType(new FHIRAnswerFormat([FHIRAnswerFormat::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } else if (is_array($data[self::FIELD_TYPE])) { + $this->setType(new FHIRAnswerFormat(array_merge($ext, $data[self::FIELD_TYPE]))); + } } else { $this->setType(new FHIRAnswerFormat($data[self::FIELD_TYPE])); } @@ -873,7 +901,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getConcept())) { foreach($vs as $v) { if (null === $v) { @@ -891,10 +918,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_GROUP, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getLinkId())) { $v->xmlSerialize($sxe->addChild(self::FIELD_LINK_ID, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getOption())) { foreach($vs as $v) { if (null === $v) { @@ -916,7 +943,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getText())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TEXT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -936,8 +962,15 @@ public function jsonSerialize() $a[self::FIELD_GROUP] = $vs; } if (null !== ($v = $this->getLinkId())) { - $a[self::FIELD_LINK_ID] = $v->getValue(); - $a[self::FIELD_LINK_ID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_LINK_ID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_LINK_ID_EXT] = $enc; + } + } else { + $a[self::FIELD_LINK_ID] = $v; + } } if ([] !== ($vs = $this->getOption())) { $a[self::FIELD_OPTION] = $vs; @@ -946,19 +979,48 @@ public function jsonSerialize() $a[self::FIELD_OPTIONS] = $v; } if (null !== ($v = $this->getRepeats())) { - $a[self::FIELD_REPEATS] = $v->getValue(); - $a[self::FIELD_REPEATS_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_REPEATS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_REPEATS_EXT] = $enc; + } + } else { + $a[self::FIELD_REPEATS] = $v; + } } if (null !== ($v = $this->getRequired())) { - $a[self::FIELD_REQUIRED] = $v->getValue(); - $a[self::FIELD_REQUIRED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_REQUIRED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_REQUIRED_EXT] = $enc; + } + } else { + $a[self::FIELD_REQUIRED] = $v; + } } if (null !== ($v = $this->getText())) { - $a[self::FIELD_TEXT] = $v->getValue(); - $a[self::FIELD_TEXT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TEXT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TEXT_EXT] = $enc; + } + } else { + $a[self::FIELD_TEXT] = $v; + } } if (null !== ($v = $this->getType())) { - $a[self::FIELD_TYPE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TYPE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TYPE_EXT] = $enc; + } + } else { + $a[self::FIELD_TYPE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRQuestionnaireResponse/FHIRQuestionnaireResponseAnswer.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRQuestionnaireResponse/FHIRQuestionnaireResponseAnswer.php index 5d0ac036f1..958a391b86 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRQuestionnaireResponse/FHIRQuestionnaireResponseAnswer.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRQuestionnaireResponse/FHIRQuestionnaireResponseAnswer.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -91,10 +91,6 @@ class FHIRQuestionnaireResponseAnswer extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_QUESTIONNAIRE_RESPONSE_DOT_ANSWER; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_GROUP = 'group'; const FIELD_VALUE_ATTACHMENT = 'valueAttachment'; const FIELD_VALUE_BOOLEAN = 'valueBoolean'; @@ -282,6 +278,9 @@ class FHIRQuestionnaireResponseAnswer extends FHIRBackboneElement */ protected $valueUri = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRQuestionnaireResponseAnswer Constructor * @param null|array $data @@ -301,6 +300,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_GROUP])) { if (is_array($data[self::FIELD_GROUP])) { foreach($data[self::FIELD_GROUP] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRQuestionnaireResponseGroup) { $this->addGroup($v); } else { @@ -326,8 +328,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_BOOLEAN] instanceof FHIRBoolean) { $this->setValueBoolean($data[self::FIELD_VALUE_BOOLEAN]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_BOOLEAN])) { - $this->setValueBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_VALUE_BOOLEAN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_BOOLEAN])) { + $this->setValueBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_VALUE_BOOLEAN]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_BOOLEAN])) { + $this->setValueBoolean(new FHIRBoolean(array_merge($ext, $data[self::FIELD_VALUE_BOOLEAN]))); + } } else { $this->setValueBoolean(new FHIRBoolean($data[self::FIELD_VALUE_BOOLEAN])); } @@ -345,8 +351,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_DATE] instanceof FHIRDate) { $this->setValueDate($data[self::FIELD_VALUE_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_DATE])) { - $this->setValueDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_VALUE_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_DATE])) { + $this->setValueDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_VALUE_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_DATE])) { + $this->setValueDate(new FHIRDate(array_merge($ext, $data[self::FIELD_VALUE_DATE]))); + } } else { $this->setValueDate(new FHIRDate($data[self::FIELD_VALUE_DATE])); } @@ -357,8 +367,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_DATE_TIME] instanceof FHIRDateTime) { $this->setValueDateTime($data[self::FIELD_VALUE_DATE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_DATE_TIME])) { - $this->setValueDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_VALUE_DATE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_DATE_TIME])) { + $this->setValueDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_VALUE_DATE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_DATE_TIME])) { + $this->setValueDateTime(new FHIRDateTime(array_merge($ext, $data[self::FIELD_VALUE_DATE_TIME]))); + } } else { $this->setValueDateTime(new FHIRDateTime($data[self::FIELD_VALUE_DATE_TIME])); } @@ -369,8 +383,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_DECIMAL] instanceof FHIRDecimal) { $this->setValueDecimal($data[self::FIELD_VALUE_DECIMAL]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_DECIMAL])) { - $this->setValueDecimal(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_VALUE_DECIMAL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_DECIMAL])) { + $this->setValueDecimal(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_VALUE_DECIMAL]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_DECIMAL])) { + $this->setValueDecimal(new FHIRDecimal(array_merge($ext, $data[self::FIELD_VALUE_DECIMAL]))); + } } else { $this->setValueDecimal(new FHIRDecimal($data[self::FIELD_VALUE_DECIMAL])); } @@ -381,8 +399,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_INSTANT] instanceof FHIRInstant) { $this->setValueInstant($data[self::FIELD_VALUE_INSTANT]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_INSTANT])) { - $this->setValueInstant(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_VALUE_INSTANT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_INSTANT])) { + $this->setValueInstant(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_VALUE_INSTANT]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_INSTANT])) { + $this->setValueInstant(new FHIRInstant(array_merge($ext, $data[self::FIELD_VALUE_INSTANT]))); + } } else { $this->setValueInstant(new FHIRInstant($data[self::FIELD_VALUE_INSTANT])); } @@ -393,8 +415,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_INTEGER] instanceof FHIRInteger) { $this->setValueInteger($data[self::FIELD_VALUE_INTEGER]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_INTEGER])) { - $this->setValueInteger(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_VALUE_INTEGER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_INTEGER])) { + $this->setValueInteger(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_VALUE_INTEGER]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_INTEGER])) { + $this->setValueInteger(new FHIRInteger(array_merge($ext, $data[self::FIELD_VALUE_INTEGER]))); + } } else { $this->setValueInteger(new FHIRInteger($data[self::FIELD_VALUE_INTEGER])); } @@ -405,8 +431,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_QUANTITY] instanceof FHIRQuantity) { $this->setValueQuantity($data[self::FIELD_VALUE_QUANTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_QUANTITY])) { - $this->setValueQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_VALUE_QUANTITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_QUANTITY])) { + $this->setValueQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_VALUE_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_QUANTITY])) { + $this->setValueQuantity(new FHIRQuantity(array_merge($ext, $data[self::FIELD_VALUE_QUANTITY]))); + } } else { $this->setValueQuantity(new FHIRQuantity($data[self::FIELD_VALUE_QUANTITY])); } @@ -424,8 +454,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_STRING] instanceof FHIRString) { $this->setValueString($data[self::FIELD_VALUE_STRING]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_STRING])) { - $this->setValueString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VALUE_STRING]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_STRING])) { + $this->setValueString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VALUE_STRING]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_STRING])) { + $this->setValueString(new FHIRString(array_merge($ext, $data[self::FIELD_VALUE_STRING]))); + } } else { $this->setValueString(new FHIRString($data[self::FIELD_VALUE_STRING])); } @@ -436,8 +470,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_TIME] instanceof FHIRTime) { $this->setValueTime($data[self::FIELD_VALUE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_TIME])) { - $this->setValueTime(new FHIRTime([FHIRTime::FIELD_VALUE => $data[self::FIELD_VALUE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_TIME])) { + $this->setValueTime(new FHIRTime([FHIRTime::FIELD_VALUE => $data[self::FIELD_VALUE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_TIME])) { + $this->setValueTime(new FHIRTime(array_merge($ext, $data[self::FIELD_VALUE_TIME]))); + } } else { $this->setValueTime(new FHIRTime($data[self::FIELD_VALUE_TIME])); } @@ -448,8 +486,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_URI] instanceof FHIRUri) { $this->setValueUri($data[self::FIELD_VALUE_URI]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_URI])) { - $this->setValueUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_VALUE_URI]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_URI])) { + $this->setValueUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_VALUE_URI]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_URI])) { + $this->setValueUri(new FHIRUri(array_merge($ext, $data[self::FIELD_VALUE_URI]))); + } } else { $this->setValueUri(new FHIRUri($data[self::FIELD_VALUE_URI])); } @@ -1161,7 +1203,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getGroup())) { foreach($vs as $v) { if (null === $v) { @@ -1177,7 +1218,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getValueBoolean())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_BOOLEAN, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueCoding())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_CODING, null, $v->_getFHIRXMLNamespace())); } @@ -1196,11 +1236,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getValueInteger())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_INTEGER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_QUANTITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_REFERENCE, null, $v->_getFHIRXMLNamespace())); } @@ -1229,49 +1267,120 @@ public function jsonSerialize() $a[self::FIELD_VALUE_ATTACHMENT] = $v; } if (null !== ($v = $this->getValueBoolean())) { - $a[self::FIELD_VALUE_BOOLEAN] = $v->getValue(); - $a[self::FIELD_VALUE_BOOLEAN_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_BOOLEAN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_BOOLEAN_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_BOOLEAN] = $v; + } } if (null !== ($v = $this->getValueCoding())) { $a[self::FIELD_VALUE_CODING] = $v; } if (null !== ($v = $this->getValueDate())) { - $a[self::FIELD_VALUE_DATE] = $v->getValue(); - $a[self::FIELD_VALUE_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_DATE] = $v; + } } if (null !== ($v = $this->getValueDateTime())) { - $a[self::FIELD_VALUE_DATE_TIME] = $v->getValue(); - $a[self::FIELD_VALUE_DATE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_DATE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_DATE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_DATE_TIME] = $v; + } } if (null !== ($v = $this->getValueDecimal())) { - $a[self::FIELD_VALUE_DECIMAL] = $v->getValue(); - $a[self::FIELD_VALUE_DECIMAL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_DECIMAL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_DECIMAL_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_DECIMAL] = $v; + } } if (null !== ($v = $this->getValueInstant())) { - $a[self::FIELD_VALUE_INSTANT] = $v->getValue(); - $a[self::FIELD_VALUE_INSTANT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_INSTANT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_INSTANT_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_INSTANT] = $v; + } } if (null !== ($v = $this->getValueInteger())) { - $a[self::FIELD_VALUE_INTEGER] = $v->getValue(); - $a[self::FIELD_VALUE_INTEGER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_INTEGER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_INTEGER_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_INTEGER] = $v; + } } if (null !== ($v = $this->getValueQuantity())) { - $a[self::FIELD_VALUE_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_QUANTITY] = $v; + } } if (null !== ($v = $this->getValueReference())) { $a[self::FIELD_VALUE_REFERENCE] = $v; } if (null !== ($v = $this->getValueString())) { - $a[self::FIELD_VALUE_STRING] = $v->getValue(); - $a[self::FIELD_VALUE_STRING_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_STRING] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_STRING_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_STRING] = $v; + } } if (null !== ($v = $this->getValueTime())) { - $a[self::FIELD_VALUE_TIME] = $v->getValue(); - $a[self::FIELD_VALUE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_TIME] = $v; + } } if (null !== ($v = $this->getValueUri())) { - $a[self::FIELD_VALUE_URI] = $v->getValue(); - $a[self::FIELD_VALUE_URI_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_URI] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_URI_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_URI] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRQuestionnaireResponse/FHIRQuestionnaireResponseGroup.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRQuestionnaireResponse/FHIRQuestionnaireResponseGroup.php index c0cea3d786..73cd532fa3 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRQuestionnaireResponse/FHIRQuestionnaireResponseGroup.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRQuestionnaireResponse/FHIRQuestionnaireResponseGroup.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRQuestionnaireResponseGroup extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_QUESTIONNAIRE_RESPONSE_DOT_GROUP; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_GROUP = 'group'; const FIELD_LINK_ID = 'linkId'; const FIELD_LINK_ID_EXT = '_linkId'; @@ -164,6 +160,9 @@ class FHIRQuestionnaireResponseGroup extends FHIRBackboneElement */ protected $title = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRQuestionnaireResponseGroup Constructor * @param null|array $data @@ -183,6 +182,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_GROUP])) { if (is_array($data[self::FIELD_GROUP])) { foreach($data[self::FIELD_GROUP] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRQuestionnaireResponseGroup) { $this->addGroup($v); } else { @@ -201,8 +203,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_LINK_ID] instanceof FHIRString) { $this->setLinkId($data[self::FIELD_LINK_ID]); - } elseif ($ext && is_scalar($data[self::FIELD_LINK_ID])) { - $this->setLinkId(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_LINK_ID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_LINK_ID])) { + $this->setLinkId(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_LINK_ID]] + $ext)); + } else if (is_array($data[self::FIELD_LINK_ID])) { + $this->setLinkId(new FHIRString(array_merge($ext, $data[self::FIELD_LINK_ID]))); + } } else { $this->setLinkId(new FHIRString($data[self::FIELD_LINK_ID])); } @@ -210,6 +216,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_QUESTION])) { if (is_array($data[self::FIELD_QUESTION])) { foreach($data[self::FIELD_QUESTION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRQuestionnaireResponseQuestion) { $this->addQuestion($v); } else { @@ -235,8 +244,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TEXT] instanceof FHIRString) { $this->setText($data[self::FIELD_TEXT]); - } elseif ($ext && is_scalar($data[self::FIELD_TEXT])) { - $this->setText(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TEXT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TEXT])) { + $this->setText(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TEXT]] + $ext)); + } else if (is_array($data[self::FIELD_TEXT])) { + $this->setText(new FHIRString(array_merge($ext, $data[self::FIELD_TEXT]))); + } } else { $this->setText(new FHIRString($data[self::FIELD_TEXT])); } @@ -247,8 +260,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TITLE] instanceof FHIRString) { $this->setTitle($data[self::FIELD_TITLE]); - } elseif ($ext && is_scalar($data[self::FIELD_TITLE])) { - $this->setTitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TITLE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TITLE])) { + $this->setTitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TITLE]] + $ext)); + } else if (is_array($data[self::FIELD_TITLE])) { + $this->setTitle(new FHIRString(array_merge($ext, $data[self::FIELD_TITLE]))); + } } else { $this->setTitle(new FHIRString($data[self::FIELD_TITLE])); } @@ -651,7 +668,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getGroup())) { foreach($vs as $v) { if (null === $v) { @@ -660,10 +676,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_GROUP, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getLinkId())) { $v->xmlSerialize($sxe->addChild(self::FIELD_LINK_ID, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getQuestion())) { foreach($vs as $v) { if (null === $v) { @@ -695,8 +711,15 @@ public function jsonSerialize() $a[self::FIELD_GROUP] = $vs; } if (null !== ($v = $this->getLinkId())) { - $a[self::FIELD_LINK_ID] = $v->getValue(); - $a[self::FIELD_LINK_ID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_LINK_ID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_LINK_ID_EXT] = $enc; + } + } else { + $a[self::FIELD_LINK_ID] = $v; + } } if ([] !== ($vs = $this->getQuestion())) { $a[self::FIELD_QUESTION] = $vs; @@ -705,12 +728,26 @@ public function jsonSerialize() $a[self::FIELD_SUBJECT] = $v; } if (null !== ($v = $this->getText())) { - $a[self::FIELD_TEXT] = $v->getValue(); - $a[self::FIELD_TEXT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TEXT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TEXT_EXT] = $enc; + } + } else { + $a[self::FIELD_TEXT] = $v; + } } if (null !== ($v = $this->getTitle())) { - $a[self::FIELD_TITLE] = $v->getValue(); - $a[self::FIELD_TITLE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TITLE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TITLE_EXT] = $enc; + } + } else { + $a[self::FIELD_TITLE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRQuestionnaireResponse/FHIRQuestionnaireResponseQuestion.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRQuestionnaireResponse/FHIRQuestionnaireResponseQuestion.php index 93e883755a..e6e168fcd6 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRQuestionnaireResponse/FHIRQuestionnaireResponseQuestion.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRQuestionnaireResponse/FHIRQuestionnaireResponseQuestion.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRQuestionnaireResponseQuestion extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_QUESTIONNAIRE_RESPONSE_DOT_QUESTION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ANSWER = 'answer'; const FIELD_LINK_ID = 'linkId'; const FIELD_LINK_ID_EXT = '_linkId'; @@ -123,6 +119,9 @@ class FHIRQuestionnaireResponseQuestion extends FHIRBackboneElement */ protected $text = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRQuestionnaireResponseQuestion Constructor * @param null|array $data @@ -142,6 +141,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ANSWER])) { if (is_array($data[self::FIELD_ANSWER])) { foreach($data[self::FIELD_ANSWER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRQuestionnaireResponseAnswer) { $this->addAnswer($v); } else { @@ -160,8 +162,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_LINK_ID] instanceof FHIRString) { $this->setLinkId($data[self::FIELD_LINK_ID]); - } elseif ($ext && is_scalar($data[self::FIELD_LINK_ID])) { - $this->setLinkId(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_LINK_ID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_LINK_ID])) { + $this->setLinkId(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_LINK_ID]] + $ext)); + } else if (is_array($data[self::FIELD_LINK_ID])) { + $this->setLinkId(new FHIRString(array_merge($ext, $data[self::FIELD_LINK_ID]))); + } } else { $this->setLinkId(new FHIRString($data[self::FIELD_LINK_ID])); } @@ -172,8 +178,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TEXT] instanceof FHIRString) { $this->setText($data[self::FIELD_TEXT]); - } elseif ($ext && is_scalar($data[self::FIELD_TEXT])) { - $this->setText(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TEXT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TEXT])) { + $this->setText(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TEXT]] + $ext)); + } else if (is_array($data[self::FIELD_TEXT])) { + $this->setText(new FHIRString(array_merge($ext, $data[self::FIELD_TEXT]))); + } } else { $this->setText(new FHIRString($data[self::FIELD_TEXT])); } @@ -430,7 +440,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getAnswer())) { foreach($vs as $v) { if (null === $v) { @@ -439,6 +448,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_ANSWER, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getLinkId())) { $v->xmlSerialize($sxe->addChild(self::FIELD_LINK_ID, null, $v->_getFHIRXMLNamespace())); } @@ -458,12 +468,26 @@ public function jsonSerialize() $a[self::FIELD_ANSWER] = $vs; } if (null !== ($v = $this->getLinkId())) { - $a[self::FIELD_LINK_ID] = $v->getValue(); - $a[self::FIELD_LINK_ID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_LINK_ID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_LINK_ID_EXT] = $enc; + } + } else { + $a[self::FIELD_LINK_ID] = $v; + } } if (null !== ($v = $this->getText())) { - $a[self::FIELD_TEXT] = $v->getValue(); - $a[self::FIELD_TEXT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TEXT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TEXT_EXT] = $enc; + } + } else { + $a[self::FIELD_TEXT] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRRiskAssessment/FHIRRiskAssessmentPrediction.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRRiskAssessment/FHIRRiskAssessmentPrediction.php index 02a5637586..d9eb7dce22 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRRiskAssessment/FHIRRiskAssessmentPrediction.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRRiskAssessment/FHIRRiskAssessmentPrediction.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -82,10 +82,6 @@ class FHIRRiskAssessmentPrediction extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_RISK_ASSESSMENT_DOT_PREDICTION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_OUTCOME = 'outcome'; const FIELD_PROBABILITY_CODEABLE_CONCEPT = 'probabilityCodeableConcept'; const FIELD_PROBABILITY_DECIMAL = 'probabilityDecimal'; @@ -196,6 +192,9 @@ class FHIRRiskAssessmentPrediction extends FHIRBackboneElement */ protected $whenRange = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRRiskAssessmentPrediction Constructor * @param null|array $data @@ -232,8 +231,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PROBABILITY_DECIMAL] instanceof FHIRDecimal) { $this->setProbabilityDecimal($data[self::FIELD_PROBABILITY_DECIMAL]); - } elseif ($ext && is_scalar($data[self::FIELD_PROBABILITY_DECIMAL])) { - $this->setProbabilityDecimal(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_PROBABILITY_DECIMAL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PROBABILITY_DECIMAL])) { + $this->setProbabilityDecimal(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_PROBABILITY_DECIMAL]] + $ext)); + } else if (is_array($data[self::FIELD_PROBABILITY_DECIMAL])) { + $this->setProbabilityDecimal(new FHIRDecimal(array_merge($ext, $data[self::FIELD_PROBABILITY_DECIMAL]))); + } } else { $this->setProbabilityDecimal(new FHIRDecimal($data[self::FIELD_PROBABILITY_DECIMAL])); } @@ -251,8 +254,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_RATIONALE] instanceof FHIRString) { $this->setRationale($data[self::FIELD_RATIONALE]); - } elseif ($ext && is_scalar($data[self::FIELD_RATIONALE])) { - $this->setRationale(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_RATIONALE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_RATIONALE])) { + $this->setRationale(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_RATIONALE]] + $ext)); + } else if (is_array($data[self::FIELD_RATIONALE])) { + $this->setRationale(new FHIRString(array_merge($ext, $data[self::FIELD_RATIONALE]))); + } } else { $this->setRationale(new FHIRString($data[self::FIELD_RATIONALE])); } @@ -263,8 +270,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_RELATIVE_RISK] instanceof FHIRDecimal) { $this->setRelativeRisk($data[self::FIELD_RELATIVE_RISK]); - } elseif ($ext && is_scalar($data[self::FIELD_RELATIVE_RISK])) { - $this->setRelativeRisk(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_RELATIVE_RISK]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_RELATIVE_RISK])) { + $this->setRelativeRisk(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_RELATIVE_RISK]] + $ext)); + } else if (is_array($data[self::FIELD_RELATIVE_RISK])) { + $this->setRelativeRisk(new FHIRDecimal(array_merge($ext, $data[self::FIELD_RELATIVE_RISK]))); + } } else { $this->setRelativeRisk(new FHIRDecimal($data[self::FIELD_RELATIVE_RISK])); } @@ -701,18 +712,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getOutcome())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OUTCOME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getProbabilityCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PROBABILITY_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getProbabilityDecimal())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PROBABILITY_DECIMAL, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getProbabilityRange())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PROBABILITY_RANGE, null, $v->_getFHIRXMLNamespace())); } @@ -722,11 +730,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getRelativeRisk())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RELATIVE_RISK, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getWhenPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_WHEN_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getWhenRange())) { $v->xmlSerialize($sxe->addChild(self::FIELD_WHEN_RANGE, null, $v->_getFHIRXMLNamespace())); } @@ -746,19 +752,40 @@ public function jsonSerialize() $a[self::FIELD_PROBABILITY_CODEABLE_CONCEPT] = $v; } if (null !== ($v = $this->getProbabilityDecimal())) { - $a[self::FIELD_PROBABILITY_DECIMAL] = $v->getValue(); - $a[self::FIELD_PROBABILITY_DECIMAL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PROBABILITY_DECIMAL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PROBABILITY_DECIMAL_EXT] = $enc; + } + } else { + $a[self::FIELD_PROBABILITY_DECIMAL] = $v; + } } if (null !== ($v = $this->getProbabilityRange())) { $a[self::FIELD_PROBABILITY_RANGE] = $v; } if (null !== ($v = $this->getRationale())) { - $a[self::FIELD_RATIONALE] = $v->getValue(); - $a[self::FIELD_RATIONALE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_RATIONALE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_RATIONALE_EXT] = $enc; + } + } else { + $a[self::FIELD_RATIONALE] = $v; + } } if (null !== ($v = $this->getRelativeRisk())) { - $a[self::FIELD_RELATIVE_RISK] = $v->getValue(); - $a[self::FIELD_RELATIVE_RISK_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_RELATIVE_RISK] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_RELATIVE_RISK_EXT] = $enc; + } + } else { + $a[self::FIELD_RELATIVE_RISK] = $v; + } } if (null !== ($v = $this->getWhenPeriod())) { $a[self::FIELD_WHEN_PERIOD] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRSearchParameter/FHIRSearchParameterContact.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRSearchParameter/FHIRSearchParameterContact.php index 0329a8370d..54ad03e713 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRSearchParameter/FHIRSearchParameterContact.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRSearchParameter/FHIRSearchParameterContact.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRSearchParameterContact extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SEARCH_PARAMETER_DOT_CONTACT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_NAME = 'name'; const FIELD_NAME_EXT = '_name'; const FIELD_TELECOM = 'telecom'; @@ -111,6 +107,9 @@ class FHIRSearchParameterContact extends FHIRBackboneElement */ protected $telecom = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSearchParameterContact Constructor * @param null|array $data @@ -133,8 +132,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -145,17 +148,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_TELECOM])) { foreach($data[self::FIELD_TELECOM] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContactPoint) { $this->addTelecom($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addTelecom(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addTelecom(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addTelecom(new FHIRContactPoint(array_merge($v, $ext[$i]))); + } } else { $this->addTelecom(new FHIRContactPoint($v)); } } } elseif ($data[self::FIELD_TELECOM] instanceof FHIRContactPoint) { $this->addTelecom($data[self::FIELD_TELECOM]); - } elseif ($ext && is_scalar($data[self::FIELD_TELECOM])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_TELECOM])) { $this->addTelecom(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $data[self::FIELD_TELECOM]] + $ext)); } else { $this->addTelecom(new FHIRContactPoint($data[self::FIELD_TELECOM])); @@ -373,7 +383,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NAME, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getTelecom())) { foreach($vs as $v) { if (null === $v) { @@ -382,6 +391,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_TELECOM, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } @@ -392,11 +402,34 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if ([] !== ($vs = $this->getTelecom())) { - $a[self::FIELD_TELECOM] = $vs; + $a[self::FIELD_TELECOM] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TELECOM][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TELECOM_EXT][] = $enc; + } else { + $a[self::FIELD_TELECOM_EXT][] = null; + } + } else { + $a[self::FIELD_TELECOM][] = $v; + } + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRSpecimen/FHIRSpecimenCollection.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRSpecimen/FHIRSpecimenCollection.php index 27293d255b..5c58cbb4af 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRSpecimen/FHIRSpecimenCollection.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRSpecimen/FHIRSpecimenCollection.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -82,10 +82,6 @@ class FHIRSpecimenCollection extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SPECIMEN_DOT_COLLECTION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_BODY_SITE = 'bodySite'; const FIELD_COLLECTED_DATE_TIME = 'collectedDateTime'; const FIELD_COLLECTED_DATE_TIME_EXT = '_collectedDateTime'; @@ -95,6 +91,7 @@ class FHIRSpecimenCollection extends FHIRBackboneElement const FIELD_COMMENT_EXT = '_comment'; const FIELD_METHOD = 'method'; const FIELD_QUANTITY = 'quantity'; + const FIELD_QUANTITY_EXT = '_quantity'; /** * A concept that may be defined by a formal reference to a terminology or ontology @@ -180,6 +177,9 @@ class FHIRSpecimenCollection extends FHIRBackboneElement */ protected $quantity = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSpecimenCollection Constructor * @param null|array $data @@ -209,8 +209,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_COLLECTED_DATE_TIME] instanceof FHIRDateTime) { $this->setCollectedDateTime($data[self::FIELD_COLLECTED_DATE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_COLLECTED_DATE_TIME])) { - $this->setCollectedDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_COLLECTED_DATE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_COLLECTED_DATE_TIME])) { + $this->setCollectedDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_COLLECTED_DATE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_COLLECTED_DATE_TIME])) { + $this->setCollectedDateTime(new FHIRDateTime(array_merge($ext, $data[self::FIELD_COLLECTED_DATE_TIME]))); + } } else { $this->setCollectedDateTime(new FHIRDateTime($data[self::FIELD_COLLECTED_DATE_TIME])); } @@ -235,17 +239,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_COMMENT])) { foreach($data[self::FIELD_COMMENT] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRString) { $this->addComment($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addComment(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addComment(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addComment(new FHIRString(array_merge($v, $ext[$i]))); + } } else { $this->addComment(new FHIRString($v)); } } } elseif ($data[self::FIELD_COMMENT] instanceof FHIRString) { $this->addComment($data[self::FIELD_COMMENT]); - } elseif ($ext && is_scalar($data[self::FIELD_COMMENT])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_COMMENT])) { $this->addComment(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_COMMENT]] + $ext)); } else { $this->addComment(new FHIRString($data[self::FIELD_COMMENT])); @@ -259,8 +270,17 @@ public function __construct($data = null) } } if (isset($data[self::FIELD_QUANTITY])) { + $ext = (isset($data[self::FIELD_QUANTITY_EXT]) && is_array($data[self::FIELD_QUANTITY_EXT])) + ? $data[self::FIELD_QUANTITY_EXT] + : null; if ($data[self::FIELD_QUANTITY] instanceof FHIRSimpleQuantity) { $this->setQuantity($data[self::FIELD_QUANTITY]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_QUANTITY])) { + $this->setQuantity(new FHIRSimpleQuantity([FHIRSimpleQuantity::FIELD_VALUE => $data[self::FIELD_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_QUANTITY])) { + $this->setQuantity(new FHIRSimpleQuantity(array_merge($ext, $data[self::FIELD_QUANTITY]))); + } } else { $this->setQuantity(new FHIRSimpleQuantity($data[self::FIELD_QUANTITY])); } @@ -662,18 +682,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getBodySite())) { $v->xmlSerialize($sxe->addChild(self::FIELD_BODY_SITE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getCollectedDateTime())) { $v->xmlSerialize($sxe->addChild(self::FIELD_COLLECTED_DATE_TIME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getCollectedPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_COLLECTED_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getCollector())) { $v->xmlSerialize($sxe->addChild(self::FIELD_COLLECTOR, null, $v->_getFHIRXMLNamespace())); } @@ -689,7 +706,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getMethod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_METHOD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_QUANTITY, null, $v->_getFHIRXMLNamespace())); } @@ -706,8 +722,15 @@ public function jsonSerialize() $a[self::FIELD_BODY_SITE] = $v; } if (null !== ($v = $this->getCollectedDateTime())) { - $a[self::FIELD_COLLECTED_DATE_TIME] = $v->getValue(); - $a[self::FIELD_COLLECTED_DATE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_COLLECTED_DATE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_COLLECTED_DATE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_COLLECTED_DATE_TIME] = $v; + } } if (null !== ($v = $this->getCollectedPeriod())) { $a[self::FIELD_COLLECTED_PERIOD] = $v; @@ -721,15 +744,32 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_COMMENT][] = $v->getValue(); - $a[self::FIELD_COMMENT_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_COMMENT][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_COMMENT_EXT][] = $enc; + } else { + $a[self::FIELD_COMMENT_EXT][] = null; + } + } else { + $a[self::FIELD_COMMENT][] = $v; + } } } if (null !== ($v = $this->getMethod())) { $a[self::FIELD_METHOD] = $v; } if (null !== ($v = $this->getQuantity())) { - $a[self::FIELD_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_QUANTITY] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRSpecimen/FHIRSpecimenContainer.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRSpecimen/FHIRSpecimenContainer.php index 4d979dad87..387fd41471 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRSpecimen/FHIRSpecimenContainer.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRSpecimen/FHIRSpecimenContainer.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -81,18 +81,16 @@ class FHIRSpecimenContainer extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SPECIMEN_DOT_CONTAINER; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ADDITIVE_CODEABLE_CONCEPT = 'additiveCodeableConcept'; const FIELD_ADDITIVE_REFERENCE = 'additiveReference'; const FIELD_CAPACITY = 'capacity'; + const FIELD_CAPACITY_EXT = '_capacity'; const FIELD_DESCRIPTION = 'description'; const FIELD_DESCRIPTION_EXT = '_description'; const FIELD_IDENTIFIER = 'identifier'; const FIELD_IDENTIFIER_EXT = '_identifier'; const FIELD_SPECIMEN_QUANTITY = 'specimenQuantity'; + const FIELD_SPECIMEN_QUANTITY_EXT = '_specimenQuantity'; const FIELD_TYPE = 'type'; /** @@ -171,6 +169,9 @@ class FHIRSpecimenContainer extends FHIRBackboneElement */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSpecimenContainer Constructor * @param null|array $data @@ -202,8 +203,17 @@ public function __construct($data = null) } } if (isset($data[self::FIELD_CAPACITY])) { + $ext = (isset($data[self::FIELD_CAPACITY_EXT]) && is_array($data[self::FIELD_CAPACITY_EXT])) + ? $data[self::FIELD_CAPACITY_EXT] + : null; if ($data[self::FIELD_CAPACITY] instanceof FHIRSimpleQuantity) { $this->setCapacity($data[self::FIELD_CAPACITY]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CAPACITY])) { + $this->setCapacity(new FHIRSimpleQuantity([FHIRSimpleQuantity::FIELD_VALUE => $data[self::FIELD_CAPACITY]] + $ext)); + } else if (is_array($data[self::FIELD_CAPACITY])) { + $this->setCapacity(new FHIRSimpleQuantity(array_merge($ext, $data[self::FIELD_CAPACITY]))); + } } else { $this->setCapacity(new FHIRSimpleQuantity($data[self::FIELD_CAPACITY])); } @@ -214,8 +224,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -226,25 +240,41 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); } } if (isset($data[self::FIELD_SPECIMEN_QUANTITY])) { + $ext = (isset($data[self::FIELD_SPECIMEN_QUANTITY_EXT]) && is_array($data[self::FIELD_SPECIMEN_QUANTITY_EXT])) + ? $data[self::FIELD_SPECIMEN_QUANTITY_EXT] + : null; if ($data[self::FIELD_SPECIMEN_QUANTITY] instanceof FHIRSimpleQuantity) { $this->setSpecimenQuantity($data[self::FIELD_SPECIMEN_QUANTITY]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SPECIMEN_QUANTITY])) { + $this->setSpecimenQuantity(new FHIRSimpleQuantity([FHIRSimpleQuantity::FIELD_VALUE => $data[self::FIELD_SPECIMEN_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_SPECIMEN_QUANTITY])) { + $this->setSpecimenQuantity(new FHIRSimpleQuantity(array_merge($ext, $data[self::FIELD_SPECIMEN_QUANTITY]))); + } } else { $this->setSpecimenQuantity(new FHIRSimpleQuantity($data[self::FIELD_SPECIMEN_QUANTITY])); } @@ -627,22 +657,18 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getAdditiveCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ADDITIVE_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getAdditiveReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ADDITIVE_REFERENCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getCapacity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CAPACITY, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getDescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESCRIPTION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -655,7 +681,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getSpecimenQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SPECIMEN_QUANTITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -675,17 +700,56 @@ public function jsonSerialize() $a[self::FIELD_ADDITIVE_REFERENCE] = $v; } if (null !== ($v = $this->getCapacity())) { - $a[self::FIELD_CAPACITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CAPACITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CAPACITY_EXT] = $enc; + } + } else { + $a[self::FIELD_CAPACITY] = $v; + } } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if (null !== ($v = $this->getSpecimenQuantity())) { - $a[self::FIELD_SPECIMEN_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SPECIMEN_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SPECIMEN_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_SPECIMEN_QUANTITY] = $v; + } } if (null !== ($v = $this->getType())) { $a[self::FIELD_TYPE] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRSpecimen/FHIRSpecimenTreatment.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRSpecimen/FHIRSpecimenTreatment.php index 331c18fbe1..b5d95b59aa 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRSpecimen/FHIRSpecimenTreatment.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRSpecimen/FHIRSpecimenTreatment.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRSpecimenTreatment extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SPECIMEN_DOT_TREATMENT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ADDITIVE = 'additive'; const FIELD_DESCRIPTION = 'description'; const FIELD_DESCRIPTION_EXT = '_description'; @@ -122,6 +118,9 @@ class FHIRSpecimenTreatment extends FHIRBackboneElement */ protected $procedure = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSpecimenTreatment Constructor * @param null|array $data @@ -141,6 +140,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ADDITIVE])) { if (is_array($data[self::FIELD_ADDITIVE])) { foreach($data[self::FIELD_ADDITIVE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addAdditive($v); } else { @@ -159,8 +161,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -413,7 +419,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getAdditive())) { foreach($vs as $v) { if (null === $v) { @@ -422,10 +427,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_ADDITIVE, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getDescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESCRIPTION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getProcedure())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PROCEDURE, null, $v->_getFHIRXMLNamespace())); } @@ -442,8 +447,15 @@ public function jsonSerialize() $a[self::FIELD_ADDITIVE] = $vs; } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if (null !== ($v = $this->getProcedure())) { $a[self::FIELD_PROCEDURE] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRStructureDefinition/FHIRStructureDefinitionContact.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRStructureDefinition/FHIRStructureDefinitionContact.php index 5ae3ab66aa..0990a923e0 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRStructureDefinition/FHIRStructureDefinitionContact.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRStructureDefinition/FHIRStructureDefinitionContact.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRStructureDefinitionContact extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_STRUCTURE_DEFINITION_DOT_CONTACT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_NAME = 'name'; const FIELD_NAME_EXT = '_name'; const FIELD_TELECOM = 'telecom'; @@ -112,6 +108,9 @@ class FHIRStructureDefinitionContact extends FHIRBackboneElement */ protected $telecom = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRStructureDefinitionContact Constructor * @param null|array $data @@ -134,8 +133,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -146,17 +149,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_TELECOM])) { foreach($data[self::FIELD_TELECOM] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContactPoint) { $this->addTelecom($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addTelecom(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addTelecom(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addTelecom(new FHIRContactPoint(array_merge($v, $ext[$i]))); + } } else { $this->addTelecom(new FHIRContactPoint($v)); } } } elseif ($data[self::FIELD_TELECOM] instanceof FHIRContactPoint) { $this->addTelecom($data[self::FIELD_TELECOM]); - } elseif ($ext && is_scalar($data[self::FIELD_TELECOM])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_TELECOM])) { $this->addTelecom(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $data[self::FIELD_TELECOM]] + $ext)); } else { $this->addTelecom(new FHIRContactPoint($data[self::FIELD_TELECOM])); @@ -374,7 +384,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NAME, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getTelecom())) { foreach($vs as $v) { if (null === $v) { @@ -383,6 +392,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_TELECOM, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } @@ -393,11 +403,34 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if ([] !== ($vs = $this->getTelecom())) { - $a[self::FIELD_TELECOM] = $vs; + $a[self::FIELD_TELECOM] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TELECOM][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TELECOM_EXT][] = $enc; + } else { + $a[self::FIELD_TELECOM_EXT][] = null; + } + } else { + $a[self::FIELD_TELECOM][] = $v; + } + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRStructureDefinition/FHIRStructureDefinitionDifferential.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRStructureDefinition/FHIRStructureDefinitionDifferential.php index 00d17c487d..f1aa4bcdf7 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRStructureDefinition/FHIRStructureDefinitionDifferential.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRStructureDefinition/FHIRStructureDefinitionDifferential.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRStructureDefinitionDifferential extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_STRUCTURE_DEFINITION_DOT_DIFFERENTIAL; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ELEMENT = 'element'; /** @@ -96,6 +92,9 @@ class FHIRStructureDefinitionDifferential extends FHIRBackboneElement */ protected $element = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRStructureDefinitionDifferential Constructor * @param null|array $data @@ -115,6 +114,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ELEMENT])) { if (is_array($data[self::FIELD_ELEMENT])) { foreach($data[self::FIELD_ELEMENT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRElementDefinition) { $this->addElement($v); } else { @@ -289,7 +291,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getElement())) { foreach($vs as $v) { if (null === $v) { @@ -298,6 +299,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_ELEMENT, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRStructureDefinition/FHIRStructureDefinitionMapping.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRStructureDefinition/FHIRStructureDefinitionMapping.php index 82fd562771..0204c930e9 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRStructureDefinition/FHIRStructureDefinitionMapping.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRStructureDefinition/FHIRStructureDefinitionMapping.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -81,10 +81,6 @@ class FHIRStructureDefinitionMapping extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_STRUCTURE_DEFINITION_DOT_MAPPING; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_COMMENTS = 'comments'; const FIELD_COMMENTS_EXT = '_comments'; const FIELD_IDENTITY = 'identity'; @@ -144,6 +140,9 @@ class FHIRStructureDefinitionMapping extends FHIRBackboneElement */ protected $uri = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRStructureDefinitionMapping Constructor * @param null|array $data @@ -166,8 +165,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_COMMENTS] instanceof FHIRString) { $this->setComments($data[self::FIELD_COMMENTS]); - } elseif ($ext && is_scalar($data[self::FIELD_COMMENTS])) { - $this->setComments(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_COMMENTS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_COMMENTS])) { + $this->setComments(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_COMMENTS]] + $ext)); + } else if (is_array($data[self::FIELD_COMMENTS])) { + $this->setComments(new FHIRString(array_merge($ext, $data[self::FIELD_COMMENTS]))); + } } else { $this->setComments(new FHIRString($data[self::FIELD_COMMENTS])); } @@ -178,8 +181,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IDENTITY] instanceof FHIRId) { $this->setIdentity($data[self::FIELD_IDENTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTITY])) { - $this->setIdentity(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_IDENTITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IDENTITY])) { + $this->setIdentity(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_IDENTITY]] + $ext)); + } else if (is_array($data[self::FIELD_IDENTITY])) { + $this->setIdentity(new FHIRId(array_merge($ext, $data[self::FIELD_IDENTITY]))); + } } else { $this->setIdentity(new FHIRId($data[self::FIELD_IDENTITY])); } @@ -190,8 +197,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -202,8 +213,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_URI] instanceof FHIRUri) { $this->setUri($data[self::FIELD_URI]); - } elseif ($ext && is_scalar($data[self::FIELD_URI])) { - $this->setUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URI]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_URI])) { + $this->setUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URI]] + $ext)); + } else if (is_array($data[self::FIELD_URI])) { + $this->setUri(new FHIRUri(array_merge($ext, $data[self::FIELD_URI]))); + } } else { $this->setUri(new FHIRUri($data[self::FIELD_URI])); } @@ -519,20 +534,48 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getComments())) { - $a[self::FIELD_COMMENTS] = $v->getValue(); - $a[self::FIELD_COMMENTS_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_COMMENTS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_COMMENTS_EXT] = $enc; + } + } else { + $a[self::FIELD_COMMENTS] = $v; + } } if (null !== ($v = $this->getIdentity())) { - $a[self::FIELD_IDENTITY] = $v->getValue(); - $a[self::FIELD_IDENTITY_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_IDENTITY] = $v; + } } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if (null !== ($v = $this->getUri())) { - $a[self::FIELD_URI] = $v->getValue(); - $a[self::FIELD_URI_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_URI] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_URI_EXT] = $enc; + } + } else { + $a[self::FIELD_URI] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRStructureDefinition/FHIRStructureDefinitionSnapshot.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRStructureDefinition/FHIRStructureDefinitionSnapshot.php index 45285c1fba..aed79c2147 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRStructureDefinition/FHIRStructureDefinitionSnapshot.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRStructureDefinition/FHIRStructureDefinitionSnapshot.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRStructureDefinitionSnapshot extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_STRUCTURE_DEFINITION_DOT_SNAPSHOT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ELEMENT = 'element'; /** @@ -96,6 +92,9 @@ class FHIRStructureDefinitionSnapshot extends FHIRBackboneElement */ protected $element = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRStructureDefinitionSnapshot Constructor * @param null|array $data @@ -115,6 +114,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ELEMENT])) { if (is_array($data[self::FIELD_ELEMENT])) { foreach($data[self::FIELD_ELEMENT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRElementDefinition) { $this->addElement($v); } else { @@ -289,7 +291,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getElement())) { foreach($vs as $v) { if (null === $v) { @@ -298,6 +299,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_ELEMENT, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRSubscription/FHIRSubscriptionChannel.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRSubscription/FHIRSubscriptionChannel.php index 2b243e52b9..ca6b4a9cd2 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRSubscription/FHIRSubscriptionChannel.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRSubscription/FHIRSubscriptionChannel.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -83,10 +83,6 @@ class FHIRSubscriptionChannel extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SUBSCRIPTION_DOT_CHANNEL; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ENDPOINT = 'endpoint'; const FIELD_ENDPOINT_EXT = '_endpoint'; const FIELD_HEADER = 'header'; @@ -141,6 +137,9 @@ class FHIRSubscriptionChannel extends FHIRBackboneElement */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSubscriptionChannel Constructor * @param null|array $data @@ -163,8 +162,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ENDPOINT] instanceof FHIRUri) { $this->setEndpoint($data[self::FIELD_ENDPOINT]); - } elseif ($ext && is_scalar($data[self::FIELD_ENDPOINT])) { - $this->setEndpoint(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_ENDPOINT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ENDPOINT])) { + $this->setEndpoint(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_ENDPOINT]] + $ext)); + } else if (is_array($data[self::FIELD_ENDPOINT])) { + $this->setEndpoint(new FHIRUri(array_merge($ext, $data[self::FIELD_ENDPOINT]))); + } } else { $this->setEndpoint(new FHIRUri($data[self::FIELD_ENDPOINT])); } @@ -175,8 +178,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_HEADER] instanceof FHIRString) { $this->setHeader($data[self::FIELD_HEADER]); - } elseif ($ext && is_scalar($data[self::FIELD_HEADER])) { - $this->setHeader(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_HEADER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_HEADER])) { + $this->setHeader(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_HEADER]] + $ext)); + } else if (is_array($data[self::FIELD_HEADER])) { + $this->setHeader(new FHIRString(array_merge($ext, $data[self::FIELD_HEADER]))); + } } else { $this->setHeader(new FHIRString($data[self::FIELD_HEADER])); } @@ -187,8 +194,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PAYLOAD] instanceof FHIRString) { $this->setPayload($data[self::FIELD_PAYLOAD]); - } elseif ($ext && is_scalar($data[self::FIELD_PAYLOAD])) { - $this->setPayload(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PAYLOAD]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PAYLOAD])) { + $this->setPayload(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PAYLOAD]] + $ext)); + } else if (is_array($data[self::FIELD_PAYLOAD])) { + $this->setPayload(new FHIRString(array_merge($ext, $data[self::FIELD_PAYLOAD]))); + } } else { $this->setPayload(new FHIRString($data[self::FIELD_PAYLOAD])); } @@ -199,8 +210,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TYPE] instanceof FHIRSubscriptionChannelType) { $this->setType($data[self::FIELD_TYPE]); - } elseif ($ext && is_scalar($data[self::FIELD_TYPE])) { - $this->setType(new FHIRSubscriptionChannelType([FHIRSubscriptionChannelType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TYPE])) { + $this->setType(new FHIRSubscriptionChannelType([FHIRSubscriptionChannelType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } else if (is_array($data[self::FIELD_TYPE])) { + $this->setType(new FHIRSubscriptionChannelType(array_merge($ext, $data[self::FIELD_TYPE]))); + } } else { $this->setType(new FHIRSubscriptionChannelType($data[self::FIELD_TYPE])); } @@ -482,7 +497,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getPayload())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PAYLOAD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -496,19 +510,48 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getEndpoint())) { - $a[self::FIELD_ENDPOINT] = $v->getValue(); - $a[self::FIELD_ENDPOINT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ENDPOINT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ENDPOINT_EXT] = $enc; + } + } else { + $a[self::FIELD_ENDPOINT] = $v; + } } if (null !== ($v = $this->getHeader())) { - $a[self::FIELD_HEADER] = $v->getValue(); - $a[self::FIELD_HEADER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_HEADER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_HEADER_EXT] = $enc; + } + } else { + $a[self::FIELD_HEADER] = $v; + } } if (null !== ($v = $this->getPayload())) { - $a[self::FIELD_PAYLOAD] = $v->getValue(); - $a[self::FIELD_PAYLOAD_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PAYLOAD] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PAYLOAD_EXT] = $enc; + } + } else { + $a[self::FIELD_PAYLOAD] = $v; + } } if (null !== ($v = $this->getType())) { - $a[self::FIELD_TYPE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TYPE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TYPE_EXT] = $enc; + } + } else { + $a[self::FIELD_TYPE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRSubstance/FHIRSubstanceIngredient.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRSubstance/FHIRSubstanceIngredient.php index 76076b0149..f5f6cd2a51 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRSubstance/FHIRSubstanceIngredient.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRSubstance/FHIRSubstanceIngredient.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRSubstanceIngredient extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SUBSTANCE_DOT_INGREDIENT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_QUANTITY = 'quantity'; const FIELD_SUBSTANCE = 'substance'; @@ -108,6 +104,9 @@ class FHIRSubstanceIngredient extends FHIRBackboneElement */ protected $substance = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSubstanceIngredient Constructor * @param null|array $data @@ -307,11 +306,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_QUANTITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSubstance())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBSTANCE, null, $v->_getFHIRXMLNamespace())); } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRSubstance/FHIRSubstanceInstance.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRSubstance/FHIRSubstanceInstance.php index f80c565124..bc947f472f 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRSubstance/FHIRSubstanceInstance.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRSubstance/FHIRSubstanceInstance.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,15 +79,12 @@ class FHIRSubstanceInstance extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SUBSTANCE_DOT_INSTANCE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_EXPIRY = 'expiry'; const FIELD_EXPIRY_EXT = '_expiry'; const FIELD_IDENTIFIER = 'identifier'; const FIELD_IDENTIFIER_EXT = '_identifier'; const FIELD_QUANTITY = 'quantity'; + const FIELD_QUANTITY_EXT = '_quantity'; /** * A date, date-time or partial date (e.g. just year or year + month). If hours and @@ -123,6 +120,9 @@ class FHIRSubstanceInstance extends FHIRBackboneElement */ protected $quantity = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSubstanceInstance Constructor * @param null|array $data @@ -145,8 +145,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EXPIRY] instanceof FHIRDateTime) { $this->setExpiry($data[self::FIELD_EXPIRY]); - } elseif ($ext && is_scalar($data[self::FIELD_EXPIRY])) { - $this->setExpiry(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_EXPIRY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EXPIRY])) { + $this->setExpiry(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_EXPIRY]] + $ext)); + } else if (is_array($data[self::FIELD_EXPIRY])) { + $this->setExpiry(new FHIRDateTime(array_merge($ext, $data[self::FIELD_EXPIRY]))); + } } else { $this->setExpiry(new FHIRDateTime($data[self::FIELD_EXPIRY])); } @@ -157,15 +161,28 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->setIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { - $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_IDENTIFIER]))); + } } else { $this->setIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); } } if (isset($data[self::FIELD_QUANTITY])) { + $ext = (isset($data[self::FIELD_QUANTITY_EXT]) && is_array($data[self::FIELD_QUANTITY_EXT])) + ? $data[self::FIELD_QUANTITY_EXT] + : null; if ($data[self::FIELD_QUANTITY] instanceof FHIRSimpleQuantity) { $this->setQuantity($data[self::FIELD_QUANTITY]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_QUANTITY])) { + $this->setQuantity(new FHIRSimpleQuantity([FHIRSimpleQuantity::FIELD_VALUE => $data[self::FIELD_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_QUANTITY])) { + $this->setQuantity(new FHIRSimpleQuantity(array_merge($ext, $data[self::FIELD_QUANTITY]))); + } } else { $this->setQuantity(new FHIRSimpleQuantity($data[self::FIELD_QUANTITY])); } @@ -386,11 +403,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getExpiry())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EXPIRY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_QUANTITY, null, $v->_getFHIRXMLNamespace())); } @@ -404,14 +419,37 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getExpiry())) { - $a[self::FIELD_EXPIRY] = $v->getValue(); - $a[self::FIELD_EXPIRY_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EXPIRY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EXPIRY_EXT] = $enc; + } + } else { + $a[self::FIELD_EXPIRY] = $v; + } } if (null !== ($v = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_IDENTIFIER] = $v; + } } if (null !== ($v = $this->getQuantity())) { - $a[self::FIELD_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_QUANTITY] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRSupplyRequest/FHIRSupplyRequestWhen.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRSupplyRequest/FHIRSupplyRequestWhen.php index eb62c373a4..48f702e26e 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRSupplyRequest/FHIRSupplyRequestWhen.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRSupplyRequest/FHIRSupplyRequestWhen.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRSupplyRequestWhen extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SUPPLY_REQUEST_DOT_WHEN; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CODE = 'code'; const FIELD_SCHEDULE = 'schedule'; @@ -112,6 +108,9 @@ class FHIRSupplyRequestWhen extends FHIRBackboneElement */ protected $schedule = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSupplyRequestWhen Constructor * @param null|array $data @@ -317,11 +316,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSchedule())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SCHEDULE, null, $v->_getFHIRXMLNamespace())); } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptAction.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptAction.php index 0930d26d79..ec4b2d461c 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptAction.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptAction.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -77,10 +77,6 @@ class FHIRTestScriptAction extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_TEST_SCRIPT_DOT_ACTION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ASSERT = 'assert'; const FIELD_ASSERT_EXT = '_assert'; const FIELD_OPERATION = 'operation'; @@ -106,6 +102,9 @@ class FHIRTestScriptAction extends FHIRBackboneElement */ protected $operation = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRTestScriptAction Constructor * @param null|array $data @@ -128,8 +127,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ASSERT] instanceof FHIRTestScriptAssert) { $this->setAssert($data[self::FIELD_ASSERT]); - } elseif ($ext && is_scalar($data[self::FIELD_ASSERT])) { - $this->setAssert(new FHIRTestScriptAssert([FHIRTestScriptAssert::FIELD_VALUE => $data[self::FIELD_ASSERT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ASSERT])) { + $this->setAssert(new FHIRTestScriptAssert([FHIRTestScriptAssert::FIELD_VALUE => $data[self::FIELD_ASSERT]] + $ext)); + } else if (is_array($data[self::FIELD_ASSERT])) { + $this->setAssert(new FHIRTestScriptAssert(array_merge($ext, $data[self::FIELD_ASSERT]))); + } } else { $this->setAssert(new FHIRTestScriptAssert($data[self::FIELD_ASSERT])); } @@ -306,11 +309,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getAssert())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ASSERT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOperation())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OPERATION, null, $v->_getFHIRXMLNamespace())); } @@ -324,7 +325,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getAssert())) { - $a[self::FIELD_ASSERT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ASSERT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ASSERT_EXT] = $enc; + } + } else { + $a[self::FIELD_ASSERT] = $v; + } } if (null !== ($v = $this->getOperation())) { $a[self::FIELD_OPERATION] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptAction1.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptAction1.php index 37db831b72..fe9abf34ae 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptAction1.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptAction1.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -77,10 +77,6 @@ class FHIRTestScriptAction1 extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_TEST_SCRIPT_DOT_ACTION_1; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ASSERT = 'assert'; const FIELD_ASSERT_EXT = '_assert'; const FIELD_OPERATION = 'operation'; @@ -106,6 +102,9 @@ class FHIRTestScriptAction1 extends FHIRBackboneElement */ protected $operation = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRTestScriptAction1 Constructor * @param null|array $data @@ -128,8 +127,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ASSERT] instanceof FHIRTestScriptAssert) { $this->setAssert($data[self::FIELD_ASSERT]); - } elseif ($ext && is_scalar($data[self::FIELD_ASSERT])) { - $this->setAssert(new FHIRTestScriptAssert([FHIRTestScriptAssert::FIELD_VALUE => $data[self::FIELD_ASSERT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ASSERT])) { + $this->setAssert(new FHIRTestScriptAssert([FHIRTestScriptAssert::FIELD_VALUE => $data[self::FIELD_ASSERT]] + $ext)); + } else if (is_array($data[self::FIELD_ASSERT])) { + $this->setAssert(new FHIRTestScriptAssert(array_merge($ext, $data[self::FIELD_ASSERT]))); + } } else { $this->setAssert(new FHIRTestScriptAssert($data[self::FIELD_ASSERT])); } @@ -306,11 +309,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getAssert())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ASSERT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOperation())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OPERATION, null, $v->_getFHIRXMLNamespace())); } @@ -324,7 +325,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getAssert())) { - $a[self::FIELD_ASSERT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ASSERT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ASSERT_EXT] = $enc; + } + } else { + $a[self::FIELD_ASSERT] = $v; + } } if (null !== ($v = $this->getOperation())) { $a[self::FIELD_OPERATION] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptAction2.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptAction2.php index 9435eb8442..831433deda 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptAction2.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptAction2.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -77,10 +77,6 @@ class FHIRTestScriptAction2 extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_TEST_SCRIPT_DOT_ACTION_2; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_OPERATION = 'operation'; /** @@ -93,6 +89,9 @@ class FHIRTestScriptAction2 extends FHIRBackboneElement */ protected $operation = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRTestScriptAction2 Constructor * @param null|array $data @@ -248,7 +247,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getOperation())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OPERATION, null, $v->_getFHIRXMLNamespace())); } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptAssert.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptAssert.php index 94e0555230..6b539fc8b0 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptAssert.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptAssert.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -85,10 +85,6 @@ class FHIRTestScriptAssert extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_TEST_SCRIPT_DOT_ASSERT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_COMPARE_TO_SOURCE_ID = 'compareToSourceId'; const FIELD_COMPARE_TO_SOURCE_ID_EXT = '_compareToSourceId'; const FIELD_COMPARE_TO_SOURCE_PATH = 'compareToSourcePath'; @@ -333,6 +329,9 @@ class FHIRTestScriptAssert extends FHIRBackboneElement */ protected $warningOnly = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRTestScriptAssert Constructor * @param null|array $data @@ -359,8 +358,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_COMPARE_TO_SOURCE_ID] instanceof FHIRString) { $this->setCompareToSourceId($data[self::FIELD_COMPARE_TO_SOURCE_ID]); - } elseif ($ext && is_scalar($data[self::FIELD_COMPARE_TO_SOURCE_ID])) { - $this->setCompareToSourceId(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_COMPARE_TO_SOURCE_ID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_COMPARE_TO_SOURCE_ID])) { + $this->setCompareToSourceId(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_COMPARE_TO_SOURCE_ID]] + $ext)); + } else if (is_array($data[self::FIELD_COMPARE_TO_SOURCE_ID])) { + $this->setCompareToSourceId(new FHIRString(array_merge($ext, $data[self::FIELD_COMPARE_TO_SOURCE_ID]))); + } } else { $this->setCompareToSourceId(new FHIRString($data[self::FIELD_COMPARE_TO_SOURCE_ID])); } @@ -371,8 +374,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_COMPARE_TO_SOURCE_PATH] instanceof FHIRString) { $this->setCompareToSourcePath($data[self::FIELD_COMPARE_TO_SOURCE_PATH]); - } elseif ($ext && is_scalar($data[self::FIELD_COMPARE_TO_SOURCE_PATH])) { - $this->setCompareToSourcePath(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_COMPARE_TO_SOURCE_PATH]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_COMPARE_TO_SOURCE_PATH])) { + $this->setCompareToSourcePath(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_COMPARE_TO_SOURCE_PATH]] + $ext)); + } else if (is_array($data[self::FIELD_COMPARE_TO_SOURCE_PATH])) { + $this->setCompareToSourcePath(new FHIRString(array_merge($ext, $data[self::FIELD_COMPARE_TO_SOURCE_PATH]))); + } } else { $this->setCompareToSourcePath(new FHIRString($data[self::FIELD_COMPARE_TO_SOURCE_PATH])); } @@ -383,8 +390,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CONTENT_TYPE] instanceof FHIRContentType) { $this->setContentType($data[self::FIELD_CONTENT_TYPE]); - } elseif ($ext && is_scalar($data[self::FIELD_CONTENT_TYPE])) { - $this->setContentType(new FHIRContentType([FHIRContentType::FIELD_VALUE => $data[self::FIELD_CONTENT_TYPE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CONTENT_TYPE])) { + $this->setContentType(new FHIRContentType([FHIRContentType::FIELD_VALUE => $data[self::FIELD_CONTENT_TYPE]] + $ext)); + } else if (is_array($data[self::FIELD_CONTENT_TYPE])) { + $this->setContentType(new FHIRContentType(array_merge($ext, $data[self::FIELD_CONTENT_TYPE]))); + } } else { $this->setContentType(new FHIRContentType($data[self::FIELD_CONTENT_TYPE])); } @@ -395,8 +406,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -407,8 +422,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DIRECTION] instanceof FHIRAssertionDirectionType) { $this->setDirection($data[self::FIELD_DIRECTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DIRECTION])) { - $this->setDirection(new FHIRAssertionDirectionType([FHIRAssertionDirectionType::FIELD_VALUE => $data[self::FIELD_DIRECTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DIRECTION])) { + $this->setDirection(new FHIRAssertionDirectionType([FHIRAssertionDirectionType::FIELD_VALUE => $data[self::FIELD_DIRECTION]] + $ext)); + } else if (is_array($data[self::FIELD_DIRECTION])) { + $this->setDirection(new FHIRAssertionDirectionType(array_merge($ext, $data[self::FIELD_DIRECTION]))); + } } else { $this->setDirection(new FHIRAssertionDirectionType($data[self::FIELD_DIRECTION])); } @@ -419,8 +438,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_HEADER_FIELD] instanceof FHIRString) { $this->setHeaderField($data[self::FIELD_HEADER_FIELD]); - } elseif ($ext && is_scalar($data[self::FIELD_HEADER_FIELD])) { - $this->setHeaderField(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_HEADER_FIELD]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_HEADER_FIELD])) { + $this->setHeaderField(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_HEADER_FIELD]] + $ext)); + } else if (is_array($data[self::FIELD_HEADER_FIELD])) { + $this->setHeaderField(new FHIRString(array_merge($ext, $data[self::FIELD_HEADER_FIELD]))); + } } else { $this->setHeaderField(new FHIRString($data[self::FIELD_HEADER_FIELD])); } @@ -431,8 +454,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_LABEL] instanceof FHIRString) { $this->setLabel($data[self::FIELD_LABEL]); - } elseif ($ext && is_scalar($data[self::FIELD_LABEL])) { - $this->setLabel(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_LABEL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_LABEL])) { + $this->setLabel(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_LABEL]] + $ext)); + } else if (is_array($data[self::FIELD_LABEL])) { + $this->setLabel(new FHIRString(array_merge($ext, $data[self::FIELD_LABEL]))); + } } else { $this->setLabel(new FHIRString($data[self::FIELD_LABEL])); } @@ -443,8 +470,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MINIMUM_ID] instanceof FHIRString) { $this->setMinimumId($data[self::FIELD_MINIMUM_ID]); - } elseif ($ext && is_scalar($data[self::FIELD_MINIMUM_ID])) { - $this->setMinimumId(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_MINIMUM_ID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MINIMUM_ID])) { + $this->setMinimumId(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_MINIMUM_ID]] + $ext)); + } else if (is_array($data[self::FIELD_MINIMUM_ID])) { + $this->setMinimumId(new FHIRString(array_merge($ext, $data[self::FIELD_MINIMUM_ID]))); + } } else { $this->setMinimumId(new FHIRString($data[self::FIELD_MINIMUM_ID])); } @@ -455,8 +486,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAVIGATION_LINKS] instanceof FHIRBoolean) { $this->setNavigationLinks($data[self::FIELD_NAVIGATION_LINKS]); - } elseif ($ext && is_scalar($data[self::FIELD_NAVIGATION_LINKS])) { - $this->setNavigationLinks(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_NAVIGATION_LINKS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAVIGATION_LINKS])) { + $this->setNavigationLinks(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_NAVIGATION_LINKS]] + $ext)); + } else if (is_array($data[self::FIELD_NAVIGATION_LINKS])) { + $this->setNavigationLinks(new FHIRBoolean(array_merge($ext, $data[self::FIELD_NAVIGATION_LINKS]))); + } } else { $this->setNavigationLinks(new FHIRBoolean($data[self::FIELD_NAVIGATION_LINKS])); } @@ -467,8 +502,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_OPERATOR] instanceof FHIRAssertionOperatorType) { $this->setOperator($data[self::FIELD_OPERATOR]); - } elseif ($ext && is_scalar($data[self::FIELD_OPERATOR])) { - $this->setOperator(new FHIRAssertionOperatorType([FHIRAssertionOperatorType::FIELD_VALUE => $data[self::FIELD_OPERATOR]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_OPERATOR])) { + $this->setOperator(new FHIRAssertionOperatorType([FHIRAssertionOperatorType::FIELD_VALUE => $data[self::FIELD_OPERATOR]] + $ext)); + } else if (is_array($data[self::FIELD_OPERATOR])) { + $this->setOperator(new FHIRAssertionOperatorType(array_merge($ext, $data[self::FIELD_OPERATOR]))); + } } else { $this->setOperator(new FHIRAssertionOperatorType($data[self::FIELD_OPERATOR])); } @@ -479,8 +518,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PATH] instanceof FHIRString) { $this->setPath($data[self::FIELD_PATH]); - } elseif ($ext && is_scalar($data[self::FIELD_PATH])) { - $this->setPath(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PATH]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PATH])) { + $this->setPath(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PATH]] + $ext)); + } else if (is_array($data[self::FIELD_PATH])) { + $this->setPath(new FHIRString(array_merge($ext, $data[self::FIELD_PATH]))); + } } else { $this->setPath(new FHIRString($data[self::FIELD_PATH])); } @@ -491,8 +534,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_RESOURCE] instanceof FHIRCode) { $this->setResource($data[self::FIELD_RESOURCE]); - } elseif ($ext && is_scalar($data[self::FIELD_RESOURCE])) { - $this->setResource(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_RESOURCE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_RESOURCE])) { + $this->setResource(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_RESOURCE]] + $ext)); + } else if (is_array($data[self::FIELD_RESOURCE])) { + $this->setResource(new FHIRCode(array_merge($ext, $data[self::FIELD_RESOURCE]))); + } } else { $this->setResource(new FHIRCode($data[self::FIELD_RESOURCE])); } @@ -503,8 +550,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_RESPONSE] instanceof FHIRAssertionResponseTypes) { $this->setResponse($data[self::FIELD_RESPONSE]); - } elseif ($ext && is_scalar($data[self::FIELD_RESPONSE])) { - $this->setResponse(new FHIRAssertionResponseTypes([FHIRAssertionResponseTypes::FIELD_VALUE => $data[self::FIELD_RESPONSE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_RESPONSE])) { + $this->setResponse(new FHIRAssertionResponseTypes([FHIRAssertionResponseTypes::FIELD_VALUE => $data[self::FIELD_RESPONSE]] + $ext)); + } else if (is_array($data[self::FIELD_RESPONSE])) { + $this->setResponse(new FHIRAssertionResponseTypes(array_merge($ext, $data[self::FIELD_RESPONSE]))); + } } else { $this->setResponse(new FHIRAssertionResponseTypes($data[self::FIELD_RESPONSE])); } @@ -515,8 +566,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_RESPONSE_CODE] instanceof FHIRString) { $this->setResponseCode($data[self::FIELD_RESPONSE_CODE]); - } elseif ($ext && is_scalar($data[self::FIELD_RESPONSE_CODE])) { - $this->setResponseCode(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_RESPONSE_CODE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_RESPONSE_CODE])) { + $this->setResponseCode(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_RESPONSE_CODE]] + $ext)); + } else if (is_array($data[self::FIELD_RESPONSE_CODE])) { + $this->setResponseCode(new FHIRString(array_merge($ext, $data[self::FIELD_RESPONSE_CODE]))); + } } else { $this->setResponseCode(new FHIRString($data[self::FIELD_RESPONSE_CODE])); } @@ -527,8 +582,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SOURCE_ID] instanceof FHIRId) { $this->setSourceId($data[self::FIELD_SOURCE_ID]); - } elseif ($ext && is_scalar($data[self::FIELD_SOURCE_ID])) { - $this->setSourceId(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_SOURCE_ID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SOURCE_ID])) { + $this->setSourceId(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_SOURCE_ID]] + $ext)); + } else if (is_array($data[self::FIELD_SOURCE_ID])) { + $this->setSourceId(new FHIRId(array_merge($ext, $data[self::FIELD_SOURCE_ID]))); + } } else { $this->setSourceId(new FHIRId($data[self::FIELD_SOURCE_ID])); } @@ -539,8 +598,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALIDATE_PROFILE_ID] instanceof FHIRId) { $this->setValidateProfileId($data[self::FIELD_VALIDATE_PROFILE_ID]); - } elseif ($ext && is_scalar($data[self::FIELD_VALIDATE_PROFILE_ID])) { - $this->setValidateProfileId(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_VALIDATE_PROFILE_ID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALIDATE_PROFILE_ID])) { + $this->setValidateProfileId(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_VALIDATE_PROFILE_ID]] + $ext)); + } else if (is_array($data[self::FIELD_VALIDATE_PROFILE_ID])) { + $this->setValidateProfileId(new FHIRId(array_merge($ext, $data[self::FIELD_VALIDATE_PROFILE_ID]))); + } } else { $this->setValidateProfileId(new FHIRId($data[self::FIELD_VALIDATE_PROFILE_ID])); } @@ -551,8 +614,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE] instanceof FHIRString) { $this->setValue($data[self::FIELD_VALUE]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE])) { - $this->setValue(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VALUE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE])) { + $this->setValue(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VALUE]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE])) { + $this->setValue(new FHIRString(array_merge($ext, $data[self::FIELD_VALUE]))); + } } else { $this->setValue(new FHIRString($data[self::FIELD_VALUE])); } @@ -563,8 +630,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_WARNING_ONLY] instanceof FHIRBoolean) { $this->setWarningOnly($data[self::FIELD_WARNING_ONLY]); - } elseif ($ext && is_scalar($data[self::FIELD_WARNING_ONLY])) { - $this->setWarningOnly(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_WARNING_ONLY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_WARNING_ONLY])) { + $this->setWarningOnly(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_WARNING_ONLY]] + $ext)); + } else if (is_array($data[self::FIELD_WARNING_ONLY])) { + $this->setWarningOnly(new FHIRBoolean(array_merge($ext, $data[self::FIELD_WARNING_ONLY]))); + } } else { $this->setWarningOnly(new FHIRBoolean($data[self::FIELD_WARNING_ONLY])); } @@ -1442,14 +1513,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getCompareToSourcePath())) { $v->xmlSerialize($sxe->addChild(self::FIELD_COMPARE_TO_SOURCE_PATH, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getContentType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CONTENT_TYPE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getDescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESCRIPTION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDirection())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DIRECTION, null, $v->_getFHIRXMLNamespace())); } @@ -1465,7 +1534,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getNavigationLinks())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NAVIGATION_LINKS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOperator())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OPERATOR, null, $v->_getFHIRXMLNamespace())); } @@ -1475,7 +1543,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getResource())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RESOURCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getResponse())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RESPONSE, null, $v->_getFHIRXMLNamespace())); } @@ -1489,6 +1556,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_VALIDATE_PROFILE_ID, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getValue())) { + $sxe->addAttribute(self::FIELD_VALUE, (string)$v); $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getWarningOnly())) { @@ -1504,72 +1572,202 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getCompareToSourceId())) { - $a[self::FIELD_COMPARE_TO_SOURCE_ID] = $v->getValue(); - $a[self::FIELD_COMPARE_TO_SOURCE_ID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_COMPARE_TO_SOURCE_ID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_COMPARE_TO_SOURCE_ID_EXT] = $enc; + } + } else { + $a[self::FIELD_COMPARE_TO_SOURCE_ID] = $v; + } } if (null !== ($v = $this->getCompareToSourcePath())) { - $a[self::FIELD_COMPARE_TO_SOURCE_PATH] = $v->getValue(); - $a[self::FIELD_COMPARE_TO_SOURCE_PATH_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_COMPARE_TO_SOURCE_PATH] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_COMPARE_TO_SOURCE_PATH_EXT] = $enc; + } + } else { + $a[self::FIELD_COMPARE_TO_SOURCE_PATH] = $v; + } } if (null !== ($v = $this->getContentType())) { - $a[self::FIELD_CONTENT_TYPE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CONTENT_TYPE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CONTENT_TYPE_EXT] = $enc; + } + } else { + $a[self::FIELD_CONTENT_TYPE] = $v; + } } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if (null !== ($v = $this->getDirection())) { - $a[self::FIELD_DIRECTION] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DIRECTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DIRECTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DIRECTION] = $v; + } } if (null !== ($v = $this->getHeaderField())) { - $a[self::FIELD_HEADER_FIELD] = $v->getValue(); - $a[self::FIELD_HEADER_FIELD_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_HEADER_FIELD] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_HEADER_FIELD_EXT] = $enc; + } + } else { + $a[self::FIELD_HEADER_FIELD] = $v; + } } if (null !== ($v = $this->getLabel())) { - $a[self::FIELD_LABEL] = $v->getValue(); - $a[self::FIELD_LABEL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_LABEL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_LABEL_EXT] = $enc; + } + } else { + $a[self::FIELD_LABEL] = $v; + } } if (null !== ($v = $this->getMinimumId())) { - $a[self::FIELD_MINIMUM_ID] = $v->getValue(); - $a[self::FIELD_MINIMUM_ID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MINIMUM_ID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MINIMUM_ID_EXT] = $enc; + } + } else { + $a[self::FIELD_MINIMUM_ID] = $v; + } } if (null !== ($v = $this->getNavigationLinks())) { - $a[self::FIELD_NAVIGATION_LINKS] = $v->getValue(); - $a[self::FIELD_NAVIGATION_LINKS_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAVIGATION_LINKS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAVIGATION_LINKS_EXT] = $enc; + } + } else { + $a[self::FIELD_NAVIGATION_LINKS] = $v; + } } if (null !== ($v = $this->getOperator())) { - $a[self::FIELD_OPERATOR] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_OPERATOR] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_OPERATOR_EXT] = $enc; + } + } else { + $a[self::FIELD_OPERATOR] = $v; + } } if (null !== ($v = $this->getPath())) { - $a[self::FIELD_PATH] = $v->getValue(); - $a[self::FIELD_PATH_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PATH] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PATH_EXT] = $enc; + } + } else { + $a[self::FIELD_PATH] = $v; + } } if (null !== ($v = $this->getResource())) { - $a[self::FIELD_RESOURCE] = $v->getValue(); - $a[self::FIELD_RESOURCE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_RESOURCE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_RESOURCE_EXT] = $enc; + } + } else { + $a[self::FIELD_RESOURCE] = $v; + } } if (null !== ($v = $this->getResponse())) { - $a[self::FIELD_RESPONSE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_RESPONSE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_RESPONSE_EXT] = $enc; + } + } else { + $a[self::FIELD_RESPONSE] = $v; + } } if (null !== ($v = $this->getResponseCode())) { - $a[self::FIELD_RESPONSE_CODE] = $v->getValue(); - $a[self::FIELD_RESPONSE_CODE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_RESPONSE_CODE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_RESPONSE_CODE_EXT] = $enc; + } + } else { + $a[self::FIELD_RESPONSE_CODE] = $v; + } } if (null !== ($v = $this->getSourceId())) { - $a[self::FIELD_SOURCE_ID] = $v->getValue(); - $a[self::FIELD_SOURCE_ID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SOURCE_ID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SOURCE_ID_EXT] = $enc; + } + } else { + $a[self::FIELD_SOURCE_ID] = $v; + } } if (null !== ($v = $this->getValidateProfileId())) { - $a[self::FIELD_VALIDATE_PROFILE_ID] = $v->getValue(); - $a[self::FIELD_VALIDATE_PROFILE_ID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALIDATE_PROFILE_ID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALIDATE_PROFILE_ID_EXT] = $enc; + } + } else { + $a[self::FIELD_VALIDATE_PROFILE_ID] = $v; + } } if (null !== ($v = $this->getValue())) { - $a[self::FIELD_VALUE] = $v->getValue(); - $a[self::FIELD_VALUE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE] = $v; + } } if (null !== ($v = $this->getWarningOnly())) { - $a[self::FIELD_WARNING_ONLY] = $v->getValue(); - $a[self::FIELD_WARNING_ONLY_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_WARNING_ONLY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_WARNING_ONLY_EXT] = $enc; + } + } else { + $a[self::FIELD_WARNING_ONLY] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptCapability.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptCapability.php index 08c4786cfc..5cfd294be5 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptCapability.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptCapability.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -82,10 +82,6 @@ class FHIRTestScriptCapability extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_TEST_SCRIPT_DOT_CAPABILITY; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CONFORMANCE = 'conformance'; const FIELD_DESCRIPTION = 'description'; const FIELD_DESCRIPTION_EXT = '_description'; @@ -168,6 +164,9 @@ class FHIRTestScriptCapability extends FHIRBackboneElement */ protected $validated = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRTestScriptCapability Constructor * @param null|array $data @@ -197,8 +196,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -209,8 +212,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESTINATION] instanceof FHIRInteger) { $this->setDestination($data[self::FIELD_DESTINATION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESTINATION])) { - $this->setDestination(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_DESTINATION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESTINATION])) { + $this->setDestination(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_DESTINATION]] + $ext)); + } else if (is_array($data[self::FIELD_DESTINATION])) { + $this->setDestination(new FHIRInteger(array_merge($ext, $data[self::FIELD_DESTINATION]))); + } } else { $this->setDestination(new FHIRInteger($data[self::FIELD_DESTINATION])); } @@ -221,17 +228,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_LINK])) { foreach($data[self::FIELD_LINK] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRUri) { $this->addLink($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addLink(new FHIRUri([FHIRUri::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addLink(new FHIRUri([FHIRUri::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addLink(new FHIRUri(array_merge($v, $ext[$i]))); + } } else { $this->addLink(new FHIRUri($v)); } } } elseif ($data[self::FIELD_LINK] instanceof FHIRUri) { $this->addLink($data[self::FIELD_LINK]); - } elseif ($ext && is_scalar($data[self::FIELD_LINK])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_LINK])) { $this->addLink(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_LINK]] + $ext)); } else { $this->addLink(new FHIRUri($data[self::FIELD_LINK])); @@ -243,8 +257,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_REQUIRED] instanceof FHIRBoolean) { $this->setRequired($data[self::FIELD_REQUIRED]); - } elseif ($ext && is_scalar($data[self::FIELD_REQUIRED])) { - $this->setRequired(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_REQUIRED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_REQUIRED])) { + $this->setRequired(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_REQUIRED]] + $ext)); + } else if (is_array($data[self::FIELD_REQUIRED])) { + $this->setRequired(new FHIRBoolean(array_merge($ext, $data[self::FIELD_REQUIRED]))); + } } else { $this->setRequired(new FHIRBoolean($data[self::FIELD_REQUIRED])); } @@ -255,8 +273,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALIDATED] instanceof FHIRBoolean) { $this->setValidated($data[self::FIELD_VALIDATED]); - } elseif ($ext && is_scalar($data[self::FIELD_VALIDATED])) { - $this->setValidated(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_VALIDATED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALIDATED])) { + $this->setValidated(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_VALIDATED]] + $ext)); + } else if (is_array($data[self::FIELD_VALIDATED])) { + $this->setValidated(new FHIRBoolean(array_merge($ext, $data[self::FIELD_VALIDATED]))); + } } else { $this->setValidated(new FHIRBoolean($data[self::FIELD_VALIDATED])); } @@ -652,7 +674,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getConformance())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CONFORMANCE, null, $v->_getFHIRXMLNamespace())); } @@ -670,6 +691,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_LINK, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getRequired())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REQUIRED, null, $v->_getFHIRXMLNamespace())); } @@ -689,12 +711,26 @@ public function jsonSerialize() $a[self::FIELD_CONFORMANCE] = $v; } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if (null !== ($v = $this->getDestination())) { - $a[self::FIELD_DESTINATION] = $v->getValue(); - $a[self::FIELD_DESTINATION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESTINATION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESTINATION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESTINATION] = $v; + } } if ([] !== ($vs = $this->getLink())) { $a[self::FIELD_LINK] = []; @@ -702,17 +738,40 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_LINK][] = $v->getValue(); - $a[self::FIELD_LINK_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_LINK][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_LINK_EXT][] = $enc; + } else { + $a[self::FIELD_LINK_EXT][] = null; + } + } else { + $a[self::FIELD_LINK][] = $v; + } } } if (null !== ($v = $this->getRequired())) { - $a[self::FIELD_REQUIRED] = $v->getValue(); - $a[self::FIELD_REQUIRED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_REQUIRED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_REQUIRED_EXT] = $enc; + } + } else { + $a[self::FIELD_REQUIRED] = $v; + } } if (null !== ($v = $this->getValidated())) { - $a[self::FIELD_VALIDATED] = $v->getValue(); - $a[self::FIELD_VALIDATED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALIDATED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALIDATED_EXT] = $enc; + } + } else { + $a[self::FIELD_VALIDATED] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptContact.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptContact.php index 8e0b0b536e..6290c0ec75 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptContact.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptContact.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRTestScriptContact extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_TEST_SCRIPT_DOT_CONTACT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_NAME = 'name'; const FIELD_NAME_EXT = '_name'; const FIELD_TELECOM = 'telecom'; @@ -111,6 +107,9 @@ class FHIRTestScriptContact extends FHIRBackboneElement */ protected $telecom = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRTestScriptContact Constructor * @param null|array $data @@ -133,8 +132,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -145,17 +148,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_TELECOM])) { foreach($data[self::FIELD_TELECOM] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContactPoint) { $this->addTelecom($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addTelecom(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addTelecom(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addTelecom(new FHIRContactPoint(array_merge($v, $ext[$i]))); + } } else { $this->addTelecom(new FHIRContactPoint($v)); } } } elseif ($data[self::FIELD_TELECOM] instanceof FHIRContactPoint) { $this->addTelecom($data[self::FIELD_TELECOM]); - } elseif ($ext && is_scalar($data[self::FIELD_TELECOM])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_TELECOM])) { $this->addTelecom(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $data[self::FIELD_TELECOM]] + $ext)); } else { $this->addTelecom(new FHIRContactPoint($data[self::FIELD_TELECOM])); @@ -373,7 +383,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NAME, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getTelecom())) { foreach($vs as $v) { if (null === $v) { @@ -382,6 +391,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_TELECOM, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } @@ -392,11 +402,34 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if ([] !== ($vs = $this->getTelecom())) { - $a[self::FIELD_TELECOM] = $vs; + $a[self::FIELD_TELECOM] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TELECOM][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TELECOM_EXT][] = $enc; + } else { + $a[self::FIELD_TELECOM_EXT][] = null; + } + } else { + $a[self::FIELD_TELECOM][] = $v; + } + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptFixture.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptFixture.php index 86dcfb7b50..d960a7037e 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptFixture.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptFixture.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRTestScriptFixture extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_TEST_SCRIPT_DOT_FIXTURE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_AUTOCREATE = 'autocreate'; const FIELD_AUTOCREATE_EXT = '_autocreate'; const FIELD_AUTODELETE = 'autodelete'; @@ -127,6 +123,9 @@ class FHIRTestScriptFixture extends FHIRBackboneElement */ protected $resource = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRTestScriptFixture Constructor * @param null|array $data @@ -149,8 +148,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_AUTOCREATE] instanceof FHIRBoolean) { $this->setAutocreate($data[self::FIELD_AUTOCREATE]); - } elseif ($ext && is_scalar($data[self::FIELD_AUTOCREATE])) { - $this->setAutocreate(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_AUTOCREATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_AUTOCREATE])) { + $this->setAutocreate(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_AUTOCREATE]] + $ext)); + } else if (is_array($data[self::FIELD_AUTOCREATE])) { + $this->setAutocreate(new FHIRBoolean(array_merge($ext, $data[self::FIELD_AUTOCREATE]))); + } } else { $this->setAutocreate(new FHIRBoolean($data[self::FIELD_AUTOCREATE])); } @@ -161,8 +164,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_AUTODELETE] instanceof FHIRBoolean) { $this->setAutodelete($data[self::FIELD_AUTODELETE]); - } elseif ($ext && is_scalar($data[self::FIELD_AUTODELETE])) { - $this->setAutodelete(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_AUTODELETE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_AUTODELETE])) { + $this->setAutodelete(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_AUTODELETE]] + $ext)); + } else if (is_array($data[self::FIELD_AUTODELETE])) { + $this->setAutodelete(new FHIRBoolean(array_merge($ext, $data[self::FIELD_AUTODELETE]))); + } } else { $this->setAutodelete(new FHIRBoolean($data[self::FIELD_AUTODELETE])); } @@ -412,7 +419,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getAutodelete())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AUTODELETE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getResource())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RESOURCE, null, $v->_getFHIRXMLNamespace())); } @@ -426,12 +432,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getAutocreate())) { - $a[self::FIELD_AUTOCREATE] = $v->getValue(); - $a[self::FIELD_AUTOCREATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_AUTOCREATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_AUTOCREATE_EXT] = $enc; + } + } else { + $a[self::FIELD_AUTOCREATE] = $v; + } } if (null !== ($v = $this->getAutodelete())) { - $a[self::FIELD_AUTODELETE] = $v->getValue(); - $a[self::FIELD_AUTODELETE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_AUTODELETE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_AUTODELETE_EXT] = $enc; + } + } else { + $a[self::FIELD_AUTODELETE] = $v; + } } if (null !== ($v = $this->getResource())) { $a[self::FIELD_RESOURCE] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptLink.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptLink.php index 1acd61831a..91fc1d5211 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptLink.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptLink.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRTestScriptLink extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_TEST_SCRIPT_DOT_LINK; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DESCRIPTION = 'description'; const FIELD_DESCRIPTION_EXT = '_description'; const FIELD_URL = 'url'; @@ -110,6 +106,9 @@ class FHIRTestScriptLink extends FHIRBackboneElement */ protected $url = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRTestScriptLink Constructor * @param null|array $data @@ -132,8 +131,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -144,8 +147,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_URL] instanceof FHIRUri) { $this->setUrl($data[self::FIELD_URL]); - } elseif ($ext && is_scalar($data[self::FIELD_URL])) { - $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } else if (is_array($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri(array_merge($ext, $data[self::FIELD_URL]))); + } } else { $this->setUrl(new FHIRUri($data[self::FIELD_URL])); } @@ -355,12 +362,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if (null !== ($v = $this->getUrl())) { - $a[self::FIELD_URL] = $v->getValue(); - $a[self::FIELD_URL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_URL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_URL_EXT] = $enc; + } + } else { + $a[self::FIELD_URL] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptMetadata.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptMetadata.php index 50ae064ded..d8caf62c2f 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptMetadata.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptMetadata.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -77,10 +77,6 @@ class FHIRTestScriptMetadata extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_TEST_SCRIPT_DOT_METADATA; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CAPABILITY = 'capability'; const FIELD_LINK = 'link'; @@ -105,6 +101,9 @@ class FHIRTestScriptMetadata extends FHIRBackboneElement */ protected $link = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRTestScriptMetadata Constructor * @param null|array $data @@ -124,6 +123,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CAPABILITY])) { if (is_array($data[self::FIELD_CAPABILITY])) { foreach($data[self::FIELD_CAPABILITY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRTestScriptCapability) { $this->addCapability($v); } else { @@ -139,6 +141,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_LINK])) { if (is_array($data[self::FIELD_LINK])) { foreach($data[self::FIELD_LINK] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRTestScriptLink) { $this->addLink($v); } else { @@ -371,7 +376,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getCapability())) { foreach($vs as $v) { if (null === $v) { @@ -389,6 +393,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_LINK, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptOperation.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptOperation.php index 0b2ad525c7..357a05ab96 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptOperation.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptOperation.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -84,10 +84,6 @@ class FHIRTestScriptOperation extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_TEST_SCRIPT_DOT_OPERATION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ACCEPT = 'accept'; const FIELD_ACCEPT_EXT = '_accept'; const FIELD_CONTENT_TYPE = 'contentType'; @@ -282,6 +278,9 @@ class FHIRTestScriptOperation extends FHIRBackboneElement */ protected $url = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRTestScriptOperation Constructor * @param null|array $data @@ -304,8 +303,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ACCEPT] instanceof FHIRContentType) { $this->setAccept($data[self::FIELD_ACCEPT]); - } elseif ($ext && is_scalar($data[self::FIELD_ACCEPT])) { - $this->setAccept(new FHIRContentType([FHIRContentType::FIELD_VALUE => $data[self::FIELD_ACCEPT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ACCEPT])) { + $this->setAccept(new FHIRContentType([FHIRContentType::FIELD_VALUE => $data[self::FIELD_ACCEPT]] + $ext)); + } else if (is_array($data[self::FIELD_ACCEPT])) { + $this->setAccept(new FHIRContentType(array_merge($ext, $data[self::FIELD_ACCEPT]))); + } } else { $this->setAccept(new FHIRContentType($data[self::FIELD_ACCEPT])); } @@ -316,8 +319,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CONTENT_TYPE] instanceof FHIRContentType) { $this->setContentType($data[self::FIELD_CONTENT_TYPE]); - } elseif ($ext && is_scalar($data[self::FIELD_CONTENT_TYPE])) { - $this->setContentType(new FHIRContentType([FHIRContentType::FIELD_VALUE => $data[self::FIELD_CONTENT_TYPE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CONTENT_TYPE])) { + $this->setContentType(new FHIRContentType([FHIRContentType::FIELD_VALUE => $data[self::FIELD_CONTENT_TYPE]] + $ext)); + } else if (is_array($data[self::FIELD_CONTENT_TYPE])) { + $this->setContentType(new FHIRContentType(array_merge($ext, $data[self::FIELD_CONTENT_TYPE]))); + } } else { $this->setContentType(new FHIRContentType($data[self::FIELD_CONTENT_TYPE])); } @@ -328,8 +335,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -340,8 +351,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESTINATION] instanceof FHIRInteger) { $this->setDestination($data[self::FIELD_DESTINATION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESTINATION])) { - $this->setDestination(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_DESTINATION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESTINATION])) { + $this->setDestination(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_DESTINATION]] + $ext)); + } else if (is_array($data[self::FIELD_DESTINATION])) { + $this->setDestination(new FHIRInteger(array_merge($ext, $data[self::FIELD_DESTINATION]))); + } } else { $this->setDestination(new FHIRInteger($data[self::FIELD_DESTINATION])); } @@ -352,8 +367,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ENCODE_REQUEST_URL] instanceof FHIRBoolean) { $this->setEncodeRequestUrl($data[self::FIELD_ENCODE_REQUEST_URL]); - } elseif ($ext && is_scalar($data[self::FIELD_ENCODE_REQUEST_URL])) { - $this->setEncodeRequestUrl(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_ENCODE_REQUEST_URL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ENCODE_REQUEST_URL])) { + $this->setEncodeRequestUrl(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_ENCODE_REQUEST_URL]] + $ext)); + } else if (is_array($data[self::FIELD_ENCODE_REQUEST_URL])) { + $this->setEncodeRequestUrl(new FHIRBoolean(array_merge($ext, $data[self::FIELD_ENCODE_REQUEST_URL]))); + } } else { $this->setEncodeRequestUrl(new FHIRBoolean($data[self::FIELD_ENCODE_REQUEST_URL])); } @@ -364,8 +383,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_LABEL] instanceof FHIRString) { $this->setLabel($data[self::FIELD_LABEL]); - } elseif ($ext && is_scalar($data[self::FIELD_LABEL])) { - $this->setLabel(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_LABEL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_LABEL])) { + $this->setLabel(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_LABEL]] + $ext)); + } else if (is_array($data[self::FIELD_LABEL])) { + $this->setLabel(new FHIRString(array_merge($ext, $data[self::FIELD_LABEL]))); + } } else { $this->setLabel(new FHIRString($data[self::FIELD_LABEL])); } @@ -376,8 +399,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PARAMS] instanceof FHIRString) { $this->setParams($data[self::FIELD_PARAMS]); - } elseif ($ext && is_scalar($data[self::FIELD_PARAMS])) { - $this->setParams(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PARAMS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PARAMS])) { + $this->setParams(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PARAMS]] + $ext)); + } else if (is_array($data[self::FIELD_PARAMS])) { + $this->setParams(new FHIRString(array_merge($ext, $data[self::FIELD_PARAMS]))); + } } else { $this->setParams(new FHIRString($data[self::FIELD_PARAMS])); } @@ -388,17 +415,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_REQUEST_HEADER])) { foreach($data[self::FIELD_REQUEST_HEADER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRTestScriptRequestHeader) { $this->addRequestHeader($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addRequestHeader(new FHIRTestScriptRequestHeader([FHIRTestScriptRequestHeader::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addRequestHeader(new FHIRTestScriptRequestHeader([FHIRTestScriptRequestHeader::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addRequestHeader(new FHIRTestScriptRequestHeader(array_merge($v, $ext[$i]))); + } } else { $this->addRequestHeader(new FHIRTestScriptRequestHeader($v)); } } } elseif ($data[self::FIELD_REQUEST_HEADER] instanceof FHIRTestScriptRequestHeader) { $this->addRequestHeader($data[self::FIELD_REQUEST_HEADER]); - } elseif ($ext && is_scalar($data[self::FIELD_REQUEST_HEADER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_REQUEST_HEADER])) { $this->addRequestHeader(new FHIRTestScriptRequestHeader([FHIRTestScriptRequestHeader::FIELD_VALUE => $data[self::FIELD_REQUEST_HEADER]] + $ext)); } else { $this->addRequestHeader(new FHIRTestScriptRequestHeader($data[self::FIELD_REQUEST_HEADER])); @@ -410,8 +444,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_RESOURCE] instanceof FHIRCode) { $this->setResource($data[self::FIELD_RESOURCE]); - } elseif ($ext && is_scalar($data[self::FIELD_RESOURCE])) { - $this->setResource(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_RESOURCE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_RESOURCE])) { + $this->setResource(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_RESOURCE]] + $ext)); + } else if (is_array($data[self::FIELD_RESOURCE])) { + $this->setResource(new FHIRCode(array_merge($ext, $data[self::FIELD_RESOURCE]))); + } } else { $this->setResource(new FHIRCode($data[self::FIELD_RESOURCE])); } @@ -422,8 +460,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_RESPONSE_ID] instanceof FHIRId) { $this->setResponseId($data[self::FIELD_RESPONSE_ID]); - } elseif ($ext && is_scalar($data[self::FIELD_RESPONSE_ID])) { - $this->setResponseId(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_RESPONSE_ID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_RESPONSE_ID])) { + $this->setResponseId(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_RESPONSE_ID]] + $ext)); + } else if (is_array($data[self::FIELD_RESPONSE_ID])) { + $this->setResponseId(new FHIRId(array_merge($ext, $data[self::FIELD_RESPONSE_ID]))); + } } else { $this->setResponseId(new FHIRId($data[self::FIELD_RESPONSE_ID])); } @@ -434,8 +476,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SOURCE_ID] instanceof FHIRId) { $this->setSourceId($data[self::FIELD_SOURCE_ID]); - } elseif ($ext && is_scalar($data[self::FIELD_SOURCE_ID])) { - $this->setSourceId(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_SOURCE_ID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SOURCE_ID])) { + $this->setSourceId(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_SOURCE_ID]] + $ext)); + } else if (is_array($data[self::FIELD_SOURCE_ID])) { + $this->setSourceId(new FHIRId(array_merge($ext, $data[self::FIELD_SOURCE_ID]))); + } } else { $this->setSourceId(new FHIRId($data[self::FIELD_SOURCE_ID])); } @@ -446,8 +492,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TARGET_ID] instanceof FHIRId) { $this->setTargetId($data[self::FIELD_TARGET_ID]); - } elseif ($ext && is_scalar($data[self::FIELD_TARGET_ID])) { - $this->setTargetId(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_TARGET_ID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TARGET_ID])) { + $this->setTargetId(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_TARGET_ID]] + $ext)); + } else if (is_array($data[self::FIELD_TARGET_ID])) { + $this->setTargetId(new FHIRId(array_merge($ext, $data[self::FIELD_TARGET_ID]))); + } } else { $this->setTargetId(new FHIRId($data[self::FIELD_TARGET_ID])); } @@ -465,8 +515,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_URL] instanceof FHIRString) { $this->setUrl($data[self::FIELD_URL]); - } elseif ($ext && is_scalar($data[self::FIELD_URL])) { - $this->setUrl(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_URL])) { + $this->setUrl(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } else if (is_array($data[self::FIELD_URL])) { + $this->setUrl(new FHIRString(array_merge($ext, $data[self::FIELD_URL]))); + } } else { $this->setUrl(new FHIRString($data[self::FIELD_URL])); } @@ -1195,11 +1249,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getAccept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ACCEPT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getContentType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CONTENT_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -1218,7 +1270,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getParams())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PARAMS, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getRequestHeader())) { foreach($vs as $v) { if (null === $v) { @@ -1227,6 +1278,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_REQUEST_HEADER, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getResource())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RESOURCE, null, $v->_getFHIRXMLNamespace())); } @@ -1239,7 +1291,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getTargetId())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TARGET_ID, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -1256,56 +1307,158 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getAccept())) { - $a[self::FIELD_ACCEPT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ACCEPT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ACCEPT_EXT] = $enc; + } + } else { + $a[self::FIELD_ACCEPT] = $v; + } } if (null !== ($v = $this->getContentType())) { - $a[self::FIELD_CONTENT_TYPE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CONTENT_TYPE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CONTENT_TYPE_EXT] = $enc; + } + } else { + $a[self::FIELD_CONTENT_TYPE] = $v; + } } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if (null !== ($v = $this->getDestination())) { - $a[self::FIELD_DESTINATION] = $v->getValue(); - $a[self::FIELD_DESTINATION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESTINATION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESTINATION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESTINATION] = $v; + } } if (null !== ($v = $this->getEncodeRequestUrl())) { - $a[self::FIELD_ENCODE_REQUEST_URL] = $v->getValue(); - $a[self::FIELD_ENCODE_REQUEST_URL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ENCODE_REQUEST_URL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ENCODE_REQUEST_URL_EXT] = $enc; + } + } else { + $a[self::FIELD_ENCODE_REQUEST_URL] = $v; + } } if (null !== ($v = $this->getLabel())) { - $a[self::FIELD_LABEL] = $v->getValue(); - $a[self::FIELD_LABEL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_LABEL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_LABEL_EXT] = $enc; + } + } else { + $a[self::FIELD_LABEL] = $v; + } } if (null !== ($v = $this->getParams())) { - $a[self::FIELD_PARAMS] = $v->getValue(); - $a[self::FIELD_PARAMS_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PARAMS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PARAMS_EXT] = $enc; + } + } else { + $a[self::FIELD_PARAMS] = $v; + } } if ([] !== ($vs = $this->getRequestHeader())) { - $a[self::FIELD_REQUEST_HEADER] = $vs; + $a[self::FIELD_REQUEST_HEADER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_REQUEST_HEADER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_REQUEST_HEADER_EXT][] = $enc; + } else { + $a[self::FIELD_REQUEST_HEADER_EXT][] = null; + } + } else { + $a[self::FIELD_REQUEST_HEADER][] = $v; + } + } } if (null !== ($v = $this->getResource())) { - $a[self::FIELD_RESOURCE] = $v->getValue(); - $a[self::FIELD_RESOURCE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_RESOURCE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_RESOURCE_EXT] = $enc; + } + } else { + $a[self::FIELD_RESOURCE] = $v; + } } if (null !== ($v = $this->getResponseId())) { - $a[self::FIELD_RESPONSE_ID] = $v->getValue(); - $a[self::FIELD_RESPONSE_ID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_RESPONSE_ID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_RESPONSE_ID_EXT] = $enc; + } + } else { + $a[self::FIELD_RESPONSE_ID] = $v; + } } if (null !== ($v = $this->getSourceId())) { - $a[self::FIELD_SOURCE_ID] = $v->getValue(); - $a[self::FIELD_SOURCE_ID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SOURCE_ID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SOURCE_ID_EXT] = $enc; + } + } else { + $a[self::FIELD_SOURCE_ID] = $v; + } } if (null !== ($v = $this->getTargetId())) { - $a[self::FIELD_TARGET_ID] = $v->getValue(); - $a[self::FIELD_TARGET_ID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TARGET_ID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TARGET_ID_EXT] = $enc; + } + } else { + $a[self::FIELD_TARGET_ID] = $v; + } } if (null !== ($v = $this->getType())) { $a[self::FIELD_TYPE] = $v; } if (null !== ($v = $this->getUrl())) { - $a[self::FIELD_URL] = $v->getValue(); - $a[self::FIELD_URL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_URL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_URL_EXT] = $enc; + } + } else { + $a[self::FIELD_URL] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptRequestHeader.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptRequestHeader.php index 7902736a43..1c95c6cdca 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptRequestHeader.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptRequestHeader.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRTestScriptRequestHeader extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_TEST_SCRIPT_DOT_REQUEST_HEADER; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_FIELD = 'field'; const FIELD_FIELD_EXT = '_field'; const FIELD_VALUE = 'value'; @@ -109,6 +105,9 @@ class FHIRTestScriptRequestHeader extends FHIRBackboneElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRTestScriptRequestHeader Constructor * @param null|array $data @@ -135,8 +134,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_FIELD] instanceof FHIRString) { $this->setField($data[self::FIELD_FIELD]); - } elseif ($ext && is_scalar($data[self::FIELD_FIELD])) { - $this->setField(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_FIELD]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_FIELD])) { + $this->setField(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_FIELD]] + $ext)); + } else if (is_array($data[self::FIELD_FIELD])) { + $this->setField(new FHIRString(array_merge($ext, $data[self::FIELD_FIELD]))); + } } else { $this->setField(new FHIRString($data[self::FIELD_FIELD])); } @@ -147,8 +150,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE] instanceof FHIRString) { $this->setValue($data[self::FIELD_VALUE]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE])) { - $this->setValue(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VALUE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE])) { + $this->setValue(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VALUE]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE])) { + $this->setValue(new FHIRString(array_merge($ext, $data[self::FIELD_VALUE]))); + } } else { $this->setValue(new FHIRString($data[self::FIELD_VALUE])); } @@ -346,6 +353,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_FIELD, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getValue())) { + $sxe->addAttribute(self::FIELD_VALUE, (string)$v); $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE, null, $v->_getFHIRXMLNamespace())); } return $sxe; @@ -358,12 +366,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getField())) { - $a[self::FIELD_FIELD] = $v->getValue(); - $a[self::FIELD_FIELD_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FIELD] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FIELD_EXT] = $enc; + } + } else { + $a[self::FIELD_FIELD] = $v; + } } if (null !== ($v = $this->getValue())) { - $a[self::FIELD_VALUE] = $v->getValue(); - $a[self::FIELD_VALUE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptSetup.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptSetup.php index 57a220fe8c..eedf8a8c1f 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptSetup.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptSetup.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -77,10 +77,6 @@ class FHIRTestScriptSetup extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_TEST_SCRIPT_DOT_SETUP; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ACTION = 'action'; const FIELD_METADATA = 'metadata'; @@ -105,6 +101,9 @@ class FHIRTestScriptSetup extends FHIRBackboneElement */ protected $metadata = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRTestScriptSetup Constructor * @param null|array $data @@ -124,6 +123,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ACTION])) { if (is_array($data[self::FIELD_ACTION])) { foreach($data[self::FIELD_ACTION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRTestScriptAction) { $this->addAction($v); } else { @@ -335,7 +337,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getAction())) { foreach($vs as $v) { if (null === $v) { diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptTeardown.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptTeardown.php index e4730b9898..a612228e1e 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptTeardown.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptTeardown.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -77,10 +77,6 @@ class FHIRTestScriptTeardown extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_TEST_SCRIPT_DOT_TEARDOWN; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ACTION = 'action'; /** @@ -93,6 +89,9 @@ class FHIRTestScriptTeardown extends FHIRBackboneElement */ protected $action = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRTestScriptTeardown Constructor * @param null|array $data @@ -112,6 +111,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ACTION])) { if (is_array($data[self::FIELD_ACTION])) { foreach($data[self::FIELD_ACTION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRTestScriptAction2) { $this->addAction($v); } else { @@ -283,7 +285,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getAction())) { foreach($vs as $v) { if (null === $v) { @@ -292,6 +293,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_ACTION, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptTest.php index e2ac30f85e..b9f381d67d 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptTest.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRTestScriptTest extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_TEST_SCRIPT_DOT_TEST; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ACTION = 'action'; const FIELD_DESCRIPTION = 'description'; const FIELD_DESCRIPTION_EXT = '_description'; @@ -133,6 +129,9 @@ class FHIRTestScriptTest extends FHIRBackboneElement */ protected $name = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRTestScriptTest Constructor * @param null|array $data @@ -152,6 +151,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ACTION])) { if (is_array($data[self::FIELD_ACTION])) { foreach($data[self::FIELD_ACTION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRTestScriptAction1) { $this->addAction($v); } else { @@ -170,8 +172,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -189,8 +195,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -477,7 +487,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getAction())) { foreach($vs as $v) { if (null === $v) { @@ -486,10 +495,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_ACTION, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getDescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESCRIPTION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getMetadata())) { $v->xmlSerialize($sxe->addChild(self::FIELD_METADATA, null, $v->_getFHIRXMLNamespace())); } @@ -509,15 +518,29 @@ public function jsonSerialize() $a[self::FIELD_ACTION] = $vs; } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if (null !== ($v = $this->getMetadata())) { $a[self::FIELD_METADATA] = $v; } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptVariable.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptVariable.php index eefc7ba6a2..20e3877f7d 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptVariable.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptVariable.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRTestScriptVariable extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_TEST_SCRIPT_DOT_VARIABLE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_HEADER_FIELD = 'headerField'; const FIELD_HEADER_FIELD_EXT = '_headerField'; const FIELD_NAME = 'name'; @@ -142,6 +138,9 @@ class FHIRTestScriptVariable extends FHIRBackboneElement */ protected $sourceId = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRTestScriptVariable Constructor * @param null|array $data @@ -164,8 +163,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_HEADER_FIELD] instanceof FHIRString) { $this->setHeaderField($data[self::FIELD_HEADER_FIELD]); - } elseif ($ext && is_scalar($data[self::FIELD_HEADER_FIELD])) { - $this->setHeaderField(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_HEADER_FIELD]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_HEADER_FIELD])) { + $this->setHeaderField(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_HEADER_FIELD]] + $ext)); + } else if (is_array($data[self::FIELD_HEADER_FIELD])) { + $this->setHeaderField(new FHIRString(array_merge($ext, $data[self::FIELD_HEADER_FIELD]))); + } } else { $this->setHeaderField(new FHIRString($data[self::FIELD_HEADER_FIELD])); } @@ -176,8 +179,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -188,8 +195,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PATH] instanceof FHIRString) { $this->setPath($data[self::FIELD_PATH]); - } elseif ($ext && is_scalar($data[self::FIELD_PATH])) { - $this->setPath(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PATH]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PATH])) { + $this->setPath(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PATH]] + $ext)); + } else if (is_array($data[self::FIELD_PATH])) { + $this->setPath(new FHIRString(array_merge($ext, $data[self::FIELD_PATH]))); + } } else { $this->setPath(new FHIRString($data[self::FIELD_PATH])); } @@ -200,8 +211,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SOURCE_ID] instanceof FHIRId) { $this->setSourceId($data[self::FIELD_SOURCE_ID]); - } elseif ($ext && is_scalar($data[self::FIELD_SOURCE_ID])) { - $this->setSourceId(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_SOURCE_ID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SOURCE_ID])) { + $this->setSourceId(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_SOURCE_ID]] + $ext)); + } else if (is_array($data[self::FIELD_SOURCE_ID])) { + $this->setSourceId(new FHIRId(array_merge($ext, $data[self::FIELD_SOURCE_ID]))); + } } else { $this->setSourceId(new FHIRId($data[self::FIELD_SOURCE_ID])); } @@ -517,20 +532,48 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getHeaderField())) { - $a[self::FIELD_HEADER_FIELD] = $v->getValue(); - $a[self::FIELD_HEADER_FIELD_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_HEADER_FIELD] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_HEADER_FIELD_EXT] = $enc; + } + } else { + $a[self::FIELD_HEADER_FIELD] = $v; + } } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if (null !== ($v = $this->getPath())) { - $a[self::FIELD_PATH] = $v->getValue(); - $a[self::FIELD_PATH_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PATH] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PATH_EXT] = $enc; + } + } else { + $a[self::FIELD_PATH] = $v; + } } if (null !== ($v = $this->getSourceId())) { - $a[self::FIELD_SOURCE_ID] = $v->getValue(); - $a[self::FIELD_SOURCE_ID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SOURCE_ID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SOURCE_ID_EXT] = $enc; + } + } else { + $a[self::FIELD_SOURCE_ID] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetCodeSystem.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetCodeSystem.php index 5e44fd69f9..814d4f63da 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetCodeSystem.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetCodeSystem.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRValueSetCodeSystem extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_VALUE_SET_DOT_CODE_SYSTEM; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CASE_SENSITIVE = 'caseSensitive'; const FIELD_CASE_SENSITIVE_EXT = '_caseSensitive'; const FIELD_CONCEPT = 'concept'; @@ -140,6 +136,9 @@ class FHIRValueSetCodeSystem extends FHIRBackboneElement */ protected $version = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRValueSetCodeSystem Constructor * @param null|array $data @@ -162,8 +161,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CASE_SENSITIVE] instanceof FHIRBoolean) { $this->setCaseSensitive($data[self::FIELD_CASE_SENSITIVE]); - } elseif ($ext && is_scalar($data[self::FIELD_CASE_SENSITIVE])) { - $this->setCaseSensitive(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_CASE_SENSITIVE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CASE_SENSITIVE])) { + $this->setCaseSensitive(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_CASE_SENSITIVE]] + $ext)); + } else if (is_array($data[self::FIELD_CASE_SENSITIVE])) { + $this->setCaseSensitive(new FHIRBoolean(array_merge($ext, $data[self::FIELD_CASE_SENSITIVE]))); + } } else { $this->setCaseSensitive(new FHIRBoolean($data[self::FIELD_CASE_SENSITIVE])); } @@ -171,6 +174,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CONCEPT])) { if (is_array($data[self::FIELD_CONCEPT])) { foreach($data[self::FIELD_CONCEPT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRValueSetConcept) { $this->addConcept($v); } else { @@ -189,8 +195,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SYSTEM] instanceof FHIRUri) { $this->setSystem($data[self::FIELD_SYSTEM]); - } elseif ($ext && is_scalar($data[self::FIELD_SYSTEM])) { - $this->setSystem(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_SYSTEM]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SYSTEM])) { + $this->setSystem(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_SYSTEM]] + $ext)); + } else if (is_array($data[self::FIELD_SYSTEM])) { + $this->setSystem(new FHIRUri(array_merge($ext, $data[self::FIELD_SYSTEM]))); + } } else { $this->setSystem(new FHIRUri($data[self::FIELD_SYSTEM])); } @@ -201,8 +211,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VERSION] instanceof FHIRString) { $this->setVersion($data[self::FIELD_VERSION]); - } elseif ($ext && is_scalar($data[self::FIELD_VERSION])) { - $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } else if (is_array($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString(array_merge($ext, $data[self::FIELD_VERSION]))); + } } else { $this->setVersion(new FHIRString($data[self::FIELD_VERSION])); } @@ -514,7 +528,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getCaseSensitive())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CASE_SENSITIVE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getConcept())) { foreach($vs as $v) { if (null === $v) { @@ -523,6 +536,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_CONCEPT, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getSystem())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SYSTEM, null, $v->_getFHIRXMLNamespace())); } @@ -539,19 +553,40 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getCaseSensitive())) { - $a[self::FIELD_CASE_SENSITIVE] = $v->getValue(); - $a[self::FIELD_CASE_SENSITIVE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CASE_SENSITIVE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CASE_SENSITIVE_EXT] = $enc; + } + } else { + $a[self::FIELD_CASE_SENSITIVE] = $v; + } } if ([] !== ($vs = $this->getConcept())) { $a[self::FIELD_CONCEPT] = $vs; } if (null !== ($v = $this->getSystem())) { - $a[self::FIELD_SYSTEM] = $v->getValue(); - $a[self::FIELD_SYSTEM_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SYSTEM] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SYSTEM_EXT] = $enc; + } + } else { + $a[self::FIELD_SYSTEM] = $v; + } } if (null !== ($v = $this->getVersion())) { - $a[self::FIELD_VERSION] = $v->getValue(); - $a[self::FIELD_VERSION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VERSION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VERSION_EXT] = $enc; + } + } else { + $a[self::FIELD_VERSION] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetCompose.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetCompose.php index 6ed46faea6..1e9cb45ae6 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetCompose.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetCompose.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -77,10 +77,6 @@ class FHIRValueSetCompose extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_VALUE_SET_DOT_COMPOSE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_EXCLUDE = 'exclude'; const FIELD_IMPORT = 'import'; const FIELD_IMPORT_EXT = '_import'; @@ -116,6 +112,9 @@ class FHIRValueSetCompose extends FHIRBackboneElement */ protected $include = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRValueSetCompose Constructor * @param null|array $data @@ -135,6 +134,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_EXCLUDE])) { if (is_array($data[self::FIELD_EXCLUDE])) { foreach($data[self::FIELD_EXCLUDE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRValueSetInclude) { $this->addExclude($v); } else { @@ -153,17 +155,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IMPORT])) { foreach($data[self::FIELD_IMPORT] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRUri) { $this->addImport($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addImport(new FHIRUri([FHIRUri::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addImport(new FHIRUri([FHIRUri::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addImport(new FHIRUri(array_merge($v, $ext[$i]))); + } } else { $this->addImport(new FHIRUri($v)); } } } elseif ($data[self::FIELD_IMPORT] instanceof FHIRUri) { $this->addImport($data[self::FIELD_IMPORT]); - } elseif ($ext && is_scalar($data[self::FIELD_IMPORT])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IMPORT])) { $this->addImport(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_IMPORT]] + $ext)); } else { $this->addImport(new FHIRUri($data[self::FIELD_IMPORT])); @@ -172,6 +181,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_INCLUDE])) { if (is_array($data[self::FIELD_INCLUDE])) { foreach($data[self::FIELD_INCLUDE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRValueSetInclude) { $this->addInclude($v); } else { @@ -470,7 +482,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getExclude())) { foreach($vs as $v) { if (null === $v) { @@ -479,6 +490,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_EXCLUDE, null, $v->_getFHIRXMLNamespace())); } } + if ([] !== ($vs = $this->getImport())) { foreach($vs as $v) { if (null === $v) { @@ -496,6 +508,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_INCLUDE, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } @@ -514,8 +527,17 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_IMPORT][] = $v->getValue(); - $a[self::FIELD_IMPORT_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IMPORT][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IMPORT_EXT][] = $enc; + } else { + $a[self::FIELD_IMPORT_EXT][] = null; + } + } else { + $a[self::FIELD_IMPORT][] = $v; + } } } if ([] !== ($vs = $this->getInclude())) { diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetConcept.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetConcept.php index e1dfd66500..c8f5c21112 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetConcept.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetConcept.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRValueSetConcept extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_VALUE_SET_DOT_CONCEPT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ABSTRACT = 'abstract'; const FIELD_ABSTRACT_EXT = '_abstract'; const FIELD_CODE = 'code'; @@ -165,6 +161,9 @@ class FHIRValueSetConcept extends FHIRBackboneElement */ protected $display = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRValueSetConcept Constructor * @param null|array $data @@ -187,8 +186,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ABSTRACT] instanceof FHIRBoolean) { $this->setAbstract($data[self::FIELD_ABSTRACT]); - } elseif ($ext && is_scalar($data[self::FIELD_ABSTRACT])) { - $this->setAbstract(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_ABSTRACT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ABSTRACT])) { + $this->setAbstract(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_ABSTRACT]] + $ext)); + } else if (is_array($data[self::FIELD_ABSTRACT])) { + $this->setAbstract(new FHIRBoolean(array_merge($ext, $data[self::FIELD_ABSTRACT]))); + } } else { $this->setAbstract(new FHIRBoolean($data[self::FIELD_ABSTRACT])); } @@ -199,8 +202,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CODE] instanceof FHIRCode) { $this->setCode($data[self::FIELD_CODE]); - } elseif ($ext && is_scalar($data[self::FIELD_CODE])) { - $this->setCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_CODE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CODE])) { + $this->setCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_CODE]] + $ext)); + } else if (is_array($data[self::FIELD_CODE])) { + $this->setCode(new FHIRCode(array_merge($ext, $data[self::FIELD_CODE]))); + } } else { $this->setCode(new FHIRCode($data[self::FIELD_CODE])); } @@ -208,6 +215,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CONCEPT])) { if (is_array($data[self::FIELD_CONCEPT])) { foreach($data[self::FIELD_CONCEPT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRValueSetConcept) { $this->addConcept($v); } else { @@ -226,8 +236,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DEFINITION] instanceof FHIRString) { $this->setDefinition($data[self::FIELD_DEFINITION]); - } elseif ($ext && is_scalar($data[self::FIELD_DEFINITION])) { - $this->setDefinition(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DEFINITION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DEFINITION])) { + $this->setDefinition(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DEFINITION]] + $ext)); + } else if (is_array($data[self::FIELD_DEFINITION])) { + $this->setDefinition(new FHIRString(array_merge($ext, $data[self::FIELD_DEFINITION]))); + } } else { $this->setDefinition(new FHIRString($data[self::FIELD_DEFINITION])); } @@ -238,17 +252,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_DESIGNATION])) { foreach($data[self::FIELD_DESIGNATION] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRValueSetDesignation) { $this->addDesignation($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addDesignation(new FHIRValueSetDesignation([FHIRValueSetDesignation::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addDesignation(new FHIRValueSetDesignation([FHIRValueSetDesignation::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addDesignation(new FHIRValueSetDesignation(array_merge($v, $ext[$i]))); + } } else { $this->addDesignation(new FHIRValueSetDesignation($v)); } } } elseif ($data[self::FIELD_DESIGNATION] instanceof FHIRValueSetDesignation) { $this->addDesignation($data[self::FIELD_DESIGNATION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESIGNATION])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_DESIGNATION])) { $this->addDesignation(new FHIRValueSetDesignation([FHIRValueSetDesignation::FIELD_VALUE => $data[self::FIELD_DESIGNATION]] + $ext)); } else { $this->addDesignation(new FHIRValueSetDesignation($data[self::FIELD_DESIGNATION])); @@ -260,8 +281,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DISPLAY] instanceof FHIRString) { $this->setDisplay($data[self::FIELD_DISPLAY]); - } elseif ($ext && is_scalar($data[self::FIELD_DISPLAY])) { - $this->setDisplay(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DISPLAY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DISPLAY])) { + $this->setDisplay(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DISPLAY]] + $ext)); + } else if (is_array($data[self::FIELD_DISPLAY])) { + $this->setDisplay(new FHIRString(array_merge($ext, $data[self::FIELD_DISPLAY]))); + } } else { $this->setDisplay(new FHIRString($data[self::FIELD_DISPLAY])); } @@ -678,7 +703,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getConcept())) { foreach($vs as $v) { if (null === $v) { @@ -687,10 +711,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_CONCEPT, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getDefinition())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFINITION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getDesignation())) { foreach($vs as $v) { if (null === $v) { @@ -699,6 +723,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_DESIGNATION, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getDisplay())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DISPLAY, null, $v->_getFHIRXMLNamespace())); } @@ -712,26 +737,70 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getAbstract())) { - $a[self::FIELD_ABSTRACT] = $v->getValue(); - $a[self::FIELD_ABSTRACT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ABSTRACT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ABSTRACT_EXT] = $enc; + } + } else { + $a[self::FIELD_ABSTRACT] = $v; + } } if (null !== ($v = $this->getCode())) { - $a[self::FIELD_CODE] = $v->getValue(); - $a[self::FIELD_CODE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CODE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CODE_EXT] = $enc; + } + } else { + $a[self::FIELD_CODE] = $v; + } } if ([] !== ($vs = $this->getConcept())) { $a[self::FIELD_CONCEPT] = $vs; } if (null !== ($v = $this->getDefinition())) { - $a[self::FIELD_DEFINITION] = $v->getValue(); - $a[self::FIELD_DEFINITION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DEFINITION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DEFINITION_EXT] = $enc; + } + } else { + $a[self::FIELD_DEFINITION] = $v; + } } if ([] !== ($vs = $this->getDesignation())) { - $a[self::FIELD_DESIGNATION] = $vs; + $a[self::FIELD_DESIGNATION] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESIGNATION][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESIGNATION_EXT][] = $enc; + } else { + $a[self::FIELD_DESIGNATION_EXT][] = null; + } + } else { + $a[self::FIELD_DESIGNATION][] = $v; + } + } } if (null !== ($v = $this->getDisplay())) { - $a[self::FIELD_DISPLAY] = $v->getValue(); - $a[self::FIELD_DISPLAY_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DISPLAY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DISPLAY_EXT] = $enc; + } + } else { + $a[self::FIELD_DISPLAY] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetConcept1.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetConcept1.php index c39192ba47..3308d9ece6 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetConcept1.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetConcept1.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRValueSetConcept1 extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_VALUE_SET_DOT_CONCEPT_1; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CODE = 'code'; const FIELD_CODE_EXT = '_code'; const FIELD_DESIGNATION = 'designation'; @@ -124,6 +120,9 @@ class FHIRValueSetConcept1 extends FHIRBackboneElement */ protected $display = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRValueSetConcept1 Constructor * @param null|array $data @@ -146,8 +145,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CODE] instanceof FHIRCode) { $this->setCode($data[self::FIELD_CODE]); - } elseif ($ext && is_scalar($data[self::FIELD_CODE])) { - $this->setCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_CODE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CODE])) { + $this->setCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_CODE]] + $ext)); + } else if (is_array($data[self::FIELD_CODE])) { + $this->setCode(new FHIRCode(array_merge($ext, $data[self::FIELD_CODE]))); + } } else { $this->setCode(new FHIRCode($data[self::FIELD_CODE])); } @@ -158,17 +161,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_DESIGNATION])) { foreach($data[self::FIELD_DESIGNATION] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRValueSetDesignation) { $this->addDesignation($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addDesignation(new FHIRValueSetDesignation([FHIRValueSetDesignation::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addDesignation(new FHIRValueSetDesignation([FHIRValueSetDesignation::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addDesignation(new FHIRValueSetDesignation(array_merge($v, $ext[$i]))); + } } else { $this->addDesignation(new FHIRValueSetDesignation($v)); } } } elseif ($data[self::FIELD_DESIGNATION] instanceof FHIRValueSetDesignation) { $this->addDesignation($data[self::FIELD_DESIGNATION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESIGNATION])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_DESIGNATION])) { $this->addDesignation(new FHIRValueSetDesignation([FHIRValueSetDesignation::FIELD_VALUE => $data[self::FIELD_DESIGNATION]] + $ext)); } else { $this->addDesignation(new FHIRValueSetDesignation($data[self::FIELD_DESIGNATION])); @@ -180,8 +190,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DISPLAY] instanceof FHIRString) { $this->setDisplay($data[self::FIELD_DISPLAY]); - } elseif ($ext && is_scalar($data[self::FIELD_DISPLAY])) { - $this->setDisplay(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DISPLAY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DISPLAY])) { + $this->setDisplay(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DISPLAY]] + $ext)); + } else if (is_array($data[self::FIELD_DISPLAY])) { + $this->setDisplay(new FHIRString(array_merge($ext, $data[self::FIELD_DISPLAY]))); + } } else { $this->setDisplay(new FHIRString($data[self::FIELD_DISPLAY])); } @@ -442,7 +456,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getDesignation())) { foreach($vs as $v) { if (null === $v) { @@ -451,6 +464,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_DESIGNATION, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getDisplay())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DISPLAY, null, $v->_getFHIRXMLNamespace())); } @@ -464,15 +478,45 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getCode())) { - $a[self::FIELD_CODE] = $v->getValue(); - $a[self::FIELD_CODE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CODE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CODE_EXT] = $enc; + } + } else { + $a[self::FIELD_CODE] = $v; + } } if ([] !== ($vs = $this->getDesignation())) { - $a[self::FIELD_DESIGNATION] = $vs; + $a[self::FIELD_DESIGNATION] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESIGNATION][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESIGNATION_EXT][] = $enc; + } else { + $a[self::FIELD_DESIGNATION_EXT][] = null; + } + } else { + $a[self::FIELD_DESIGNATION][] = $v; + } + } } if (null !== ($v = $this->getDisplay())) { - $a[self::FIELD_DISPLAY] = $v->getValue(); - $a[self::FIELD_DISPLAY_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DISPLAY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DISPLAY_EXT] = $enc; + } + } else { + $a[self::FIELD_DISPLAY] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetContact.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetContact.php index 84a6a765dd..4f97605ab0 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetContact.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetContact.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRValueSetContact extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_VALUE_SET_DOT_CONTACT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_NAME = 'name'; const FIELD_NAME_EXT = '_name'; const FIELD_TELECOM = 'telecom'; @@ -110,6 +106,9 @@ class FHIRValueSetContact extends FHIRBackboneElement */ protected $telecom = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRValueSetContact Constructor * @param null|array $data @@ -132,8 +131,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -144,17 +147,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_TELECOM])) { foreach($data[self::FIELD_TELECOM] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContactPoint) { $this->addTelecom($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addTelecom(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addTelecom(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addTelecom(new FHIRContactPoint(array_merge($v, $ext[$i]))); + } } else { $this->addTelecom(new FHIRContactPoint($v)); } } } elseif ($data[self::FIELD_TELECOM] instanceof FHIRContactPoint) { $this->addTelecom($data[self::FIELD_TELECOM]); - } elseif ($ext && is_scalar($data[self::FIELD_TELECOM])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_TELECOM])) { $this->addTelecom(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $data[self::FIELD_TELECOM]] + $ext)); } else { $this->addTelecom(new FHIRContactPoint($data[self::FIELD_TELECOM])); @@ -372,7 +382,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NAME, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getTelecom())) { foreach($vs as $v) { if (null === $v) { @@ -381,6 +390,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_TELECOM, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } @@ -391,11 +401,34 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if ([] !== ($vs = $this->getTelecom())) { - $a[self::FIELD_TELECOM] = $vs; + $a[self::FIELD_TELECOM] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TELECOM][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TELECOM_EXT][] = $enc; + } else { + $a[self::FIELD_TELECOM_EXT][] = null; + } + } else { + $a[self::FIELD_TELECOM][] = $v; + } + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetContains.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetContains.php index 294f3eacdb..74c87eca4f 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetContains.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetContains.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRValueSetContains extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_VALUE_SET_DOT_CONTAINS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ABSTRACT = 'abstract'; const FIELD_ABSTRACT_EXT = '_abstract'; const FIELD_CODE = 'code'; @@ -165,6 +161,9 @@ class FHIRValueSetContains extends FHIRBackboneElement */ protected $version = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRValueSetContains Constructor * @param null|array $data @@ -187,8 +186,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ABSTRACT] instanceof FHIRBoolean) { $this->setAbstract($data[self::FIELD_ABSTRACT]); - } elseif ($ext && is_scalar($data[self::FIELD_ABSTRACT])) { - $this->setAbstract(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_ABSTRACT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ABSTRACT])) { + $this->setAbstract(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_ABSTRACT]] + $ext)); + } else if (is_array($data[self::FIELD_ABSTRACT])) { + $this->setAbstract(new FHIRBoolean(array_merge($ext, $data[self::FIELD_ABSTRACT]))); + } } else { $this->setAbstract(new FHIRBoolean($data[self::FIELD_ABSTRACT])); } @@ -199,8 +202,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CODE] instanceof FHIRCode) { $this->setCode($data[self::FIELD_CODE]); - } elseif ($ext && is_scalar($data[self::FIELD_CODE])) { - $this->setCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_CODE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CODE])) { + $this->setCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_CODE]] + $ext)); + } else if (is_array($data[self::FIELD_CODE])) { + $this->setCode(new FHIRCode(array_merge($ext, $data[self::FIELD_CODE]))); + } } else { $this->setCode(new FHIRCode($data[self::FIELD_CODE])); } @@ -208,6 +215,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CONTAINS])) { if (is_array($data[self::FIELD_CONTAINS])) { foreach($data[self::FIELD_CONTAINS] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRValueSetContains) { $this->addContains($v); } else { @@ -226,8 +236,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DISPLAY] instanceof FHIRString) { $this->setDisplay($data[self::FIELD_DISPLAY]); - } elseif ($ext && is_scalar($data[self::FIELD_DISPLAY])) { - $this->setDisplay(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DISPLAY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DISPLAY])) { + $this->setDisplay(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DISPLAY]] + $ext)); + } else if (is_array($data[self::FIELD_DISPLAY])) { + $this->setDisplay(new FHIRString(array_merge($ext, $data[self::FIELD_DISPLAY]))); + } } else { $this->setDisplay(new FHIRString($data[self::FIELD_DISPLAY])); } @@ -238,8 +252,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SYSTEM] instanceof FHIRUri) { $this->setSystem($data[self::FIELD_SYSTEM]); - } elseif ($ext && is_scalar($data[self::FIELD_SYSTEM])) { - $this->setSystem(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_SYSTEM]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SYSTEM])) { + $this->setSystem(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_SYSTEM]] + $ext)); + } else if (is_array($data[self::FIELD_SYSTEM])) { + $this->setSystem(new FHIRUri(array_merge($ext, $data[self::FIELD_SYSTEM]))); + } } else { $this->setSystem(new FHIRUri($data[self::FIELD_SYSTEM])); } @@ -250,8 +268,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VERSION] instanceof FHIRString) { $this->setVersion($data[self::FIELD_VERSION]); - } elseif ($ext && is_scalar($data[self::FIELD_VERSION])) { - $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } else if (is_array($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString(array_merge($ext, $data[self::FIELD_VERSION]))); + } } else { $this->setVersion(new FHIRString($data[self::FIELD_VERSION])); } @@ -648,7 +670,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getContains())) { foreach($vs as $v) { if (null === $v) { @@ -657,6 +678,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_CONTAINS, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getDisplay())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DISPLAY, null, $v->_getFHIRXMLNamespace())); } @@ -676,27 +698,62 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getAbstract())) { - $a[self::FIELD_ABSTRACT] = $v->getValue(); - $a[self::FIELD_ABSTRACT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ABSTRACT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ABSTRACT_EXT] = $enc; + } + } else { + $a[self::FIELD_ABSTRACT] = $v; + } } if (null !== ($v = $this->getCode())) { - $a[self::FIELD_CODE] = $v->getValue(); - $a[self::FIELD_CODE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CODE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CODE_EXT] = $enc; + } + } else { + $a[self::FIELD_CODE] = $v; + } } if ([] !== ($vs = $this->getContains())) { $a[self::FIELD_CONTAINS] = $vs; } if (null !== ($v = $this->getDisplay())) { - $a[self::FIELD_DISPLAY] = $v->getValue(); - $a[self::FIELD_DISPLAY_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DISPLAY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DISPLAY_EXT] = $enc; + } + } else { + $a[self::FIELD_DISPLAY] = $v; + } } if (null !== ($v = $this->getSystem())) { - $a[self::FIELD_SYSTEM] = $v->getValue(); - $a[self::FIELD_SYSTEM_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SYSTEM] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SYSTEM_EXT] = $enc; + } + } else { + $a[self::FIELD_SYSTEM] = $v; + } } if (null !== ($v = $this->getVersion())) { - $a[self::FIELD_VERSION] = $v->getValue(); - $a[self::FIELD_VERSION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VERSION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VERSION_EXT] = $enc; + } + } else { + $a[self::FIELD_VERSION] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetDesignation.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetDesignation.php index ea9296bab1..3339d72c21 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetDesignation.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetDesignation.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRValueSetDesignation extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_VALUE_SET_DOT_DESIGNATION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_LANGUAGE = 'language'; const FIELD_LANGUAGE_EXT = '_language'; const FIELD_USE = 'use'; @@ -123,6 +119,9 @@ class FHIRValueSetDesignation extends FHIRBackboneElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRValueSetDesignation Constructor * @param null|array $data @@ -149,8 +148,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_LANGUAGE] instanceof FHIRCode) { $this->setLanguage($data[self::FIELD_LANGUAGE]); - } elseif ($ext && is_scalar($data[self::FIELD_LANGUAGE])) { - $this->setLanguage(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_LANGUAGE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_LANGUAGE])) { + $this->setLanguage(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_LANGUAGE]] + $ext)); + } else if (is_array($data[self::FIELD_LANGUAGE])) { + $this->setLanguage(new FHIRCode(array_merge($ext, $data[self::FIELD_LANGUAGE]))); + } } else { $this->setLanguage(new FHIRCode($data[self::FIELD_LANGUAGE])); } @@ -168,8 +171,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE] instanceof FHIRString) { $this->setValue($data[self::FIELD_VALUE]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE])) { - $this->setValue(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VALUE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE])) { + $this->setValue(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VALUE]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE])) { + $this->setValue(new FHIRString(array_merge($ext, $data[self::FIELD_VALUE]))); + } } else { $this->setValue(new FHIRString($data[self::FIELD_VALUE])); } @@ -401,11 +408,11 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getLanguage())) { $v->xmlSerialize($sxe->addChild(self::FIELD_LANGUAGE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getUse())) { $v->xmlSerialize($sxe->addChild(self::FIELD_USE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getValue())) { + $sxe->addAttribute(self::FIELD_VALUE, (string)$v); $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE, null, $v->_getFHIRXMLNamespace())); } return $sxe; @@ -418,15 +425,29 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getLanguage())) { - $a[self::FIELD_LANGUAGE] = $v->getValue(); - $a[self::FIELD_LANGUAGE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_LANGUAGE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_LANGUAGE_EXT] = $enc; + } + } else { + $a[self::FIELD_LANGUAGE] = $v; + } } if (null !== ($v = $this->getUse())) { $a[self::FIELD_USE] = $v; } if (null !== ($v = $this->getValue())) { - $a[self::FIELD_VALUE] = $v->getValue(); - $a[self::FIELD_VALUE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetExpansion.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetExpansion.php index 618bdf8c0d..4225cf32da 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetExpansion.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetExpansion.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRValueSetExpansion extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_VALUE_SET_DOT_EXPANSION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CONTAINS = 'contains'; const FIELD_IDENTIFIER = 'identifier'; const FIELD_IDENTIFIER_EXT = '_identifier'; @@ -167,6 +163,9 @@ class FHIRValueSetExpansion extends FHIRBackboneElement */ protected $total = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRValueSetExpansion Constructor * @param null|array $data @@ -186,6 +185,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CONTAINS])) { if (is_array($data[self::FIELD_CONTAINS])) { foreach($data[self::FIELD_CONTAINS] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRValueSetContains) { $this->addContains($v); } else { @@ -204,8 +206,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IDENTIFIER] instanceof FHIRUri) { $this->setIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { - $this->setIdentifier(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRUri(array_merge($ext, $data[self::FIELD_IDENTIFIER]))); + } } else { $this->setIdentifier(new FHIRUri($data[self::FIELD_IDENTIFIER])); } @@ -216,8 +222,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_OFFSET] instanceof FHIRInteger) { $this->setOffset($data[self::FIELD_OFFSET]); - } elseif ($ext && is_scalar($data[self::FIELD_OFFSET])) { - $this->setOffset(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_OFFSET]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_OFFSET])) { + $this->setOffset(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_OFFSET]] + $ext)); + } else if (is_array($data[self::FIELD_OFFSET])) { + $this->setOffset(new FHIRInteger(array_merge($ext, $data[self::FIELD_OFFSET]))); + } } else { $this->setOffset(new FHIRInteger($data[self::FIELD_OFFSET])); } @@ -225,6 +235,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PARAMETER])) { if (is_array($data[self::FIELD_PARAMETER])) { foreach($data[self::FIELD_PARAMETER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRValueSetParameter) { $this->addParameter($v); } else { @@ -243,8 +256,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TIMESTAMP] instanceof FHIRDateTime) { $this->setTimestamp($data[self::FIELD_TIMESTAMP]); - } elseif ($ext && is_scalar($data[self::FIELD_TIMESTAMP])) { - $this->setTimestamp(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_TIMESTAMP]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TIMESTAMP])) { + $this->setTimestamp(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_TIMESTAMP]] + $ext)); + } else if (is_array($data[self::FIELD_TIMESTAMP])) { + $this->setTimestamp(new FHIRDateTime(array_merge($ext, $data[self::FIELD_TIMESTAMP]))); + } } else { $this->setTimestamp(new FHIRDateTime($data[self::FIELD_TIMESTAMP])); } @@ -255,8 +272,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TOTAL] instanceof FHIRInteger) { $this->setTotal($data[self::FIELD_TOTAL]); - } elseif ($ext && is_scalar($data[self::FIELD_TOTAL])) { - $this->setTotal(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_TOTAL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TOTAL])) { + $this->setTotal(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_TOTAL]] + $ext)); + } else if (is_array($data[self::FIELD_TOTAL])) { + $this->setTotal(new FHIRInteger(array_merge($ext, $data[self::FIELD_TOTAL]))); + } } else { $this->setTotal(new FHIRInteger($data[self::FIELD_TOTAL])); } @@ -672,7 +693,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getContains())) { foreach($vs as $v) { if (null === $v) { @@ -681,13 +701,13 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_CONTAINS, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getOffset())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OFFSET, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getParameter())) { foreach($vs as $v) { if (null === $v) { @@ -696,6 +716,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_PARAMETER, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getTimestamp())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TIMESTAMP, null, $v->_getFHIRXMLNamespace())); } @@ -715,23 +736,51 @@ public function jsonSerialize() $a[self::FIELD_CONTAINS] = $vs; } if (null !== ($v = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $v->getValue(); - $a[self::FIELD_IDENTIFIER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_IDENTIFIER] = $v; + } } if (null !== ($v = $this->getOffset())) { - $a[self::FIELD_OFFSET] = $v->getValue(); - $a[self::FIELD_OFFSET_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_OFFSET] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_OFFSET_EXT] = $enc; + } + } else { + $a[self::FIELD_OFFSET] = $v; + } } if ([] !== ($vs = $this->getParameter())) { $a[self::FIELD_PARAMETER] = $vs; } if (null !== ($v = $this->getTimestamp())) { - $a[self::FIELD_TIMESTAMP] = $v->getValue(); - $a[self::FIELD_TIMESTAMP_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TIMESTAMP] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TIMESTAMP_EXT] = $enc; + } + } else { + $a[self::FIELD_TIMESTAMP] = $v; + } } if (null !== ($v = $this->getTotal())) { - $a[self::FIELD_TOTAL] = $v->getValue(); - $a[self::FIELD_TOTAL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TOTAL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TOTAL_EXT] = $enc; + } + } else { + $a[self::FIELD_TOTAL] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetFilter.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetFilter.php index 0a00a645d3..bf12904bd4 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetFilter.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetFilter.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRValueSetFilter extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_VALUE_SET_DOT_FILTER; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_OP = 'op'; const FIELD_OP_EXT = '_op'; const FIELD_PROPERTY = 'property'; @@ -124,6 +120,9 @@ class FHIRValueSetFilter extends FHIRBackboneElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRValueSetFilter Constructor * @param null|array $data @@ -150,8 +149,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_OP] instanceof FHIRFilterOperator) { $this->setOp($data[self::FIELD_OP]); - } elseif ($ext && is_scalar($data[self::FIELD_OP])) { - $this->setOp(new FHIRFilterOperator([FHIRFilterOperator::FIELD_VALUE => $data[self::FIELD_OP]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_OP])) { + $this->setOp(new FHIRFilterOperator([FHIRFilterOperator::FIELD_VALUE => $data[self::FIELD_OP]] + $ext)); + } else if (is_array($data[self::FIELD_OP])) { + $this->setOp(new FHIRFilterOperator(array_merge($ext, $data[self::FIELD_OP]))); + } } else { $this->setOp(new FHIRFilterOperator($data[self::FIELD_OP])); } @@ -162,8 +165,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PROPERTY] instanceof FHIRCode) { $this->setProperty($data[self::FIELD_PROPERTY]); - } elseif ($ext && is_scalar($data[self::FIELD_PROPERTY])) { - $this->setProperty(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_PROPERTY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PROPERTY])) { + $this->setProperty(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_PROPERTY]] + $ext)); + } else if (is_array($data[self::FIELD_PROPERTY])) { + $this->setProperty(new FHIRCode(array_merge($ext, $data[self::FIELD_PROPERTY]))); + } } else { $this->setProperty(new FHIRCode($data[self::FIELD_PROPERTY])); } @@ -174,8 +181,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE] instanceof FHIRCode) { $this->setValue($data[self::FIELD_VALUE]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE])) { - $this->setValue(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_VALUE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE])) { + $this->setValue(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_VALUE]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE])) { + $this->setValue(new FHIRCode(array_merge($ext, $data[self::FIELD_VALUE]))); + } } else { $this->setValue(new FHIRCode($data[self::FIELD_VALUE])); } @@ -406,7 +417,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getOp())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OP, null, $v->_getFHIRXMLNamespace())); } @@ -414,6 +424,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_PROPERTY, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getValue())) { + $sxe->addAttribute(self::FIELD_VALUE, (string)$v); $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE, null, $v->_getFHIRXMLNamespace())); } return $sxe; @@ -426,15 +437,37 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getOp())) { - $a[self::FIELD_OP] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_OP] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_OP_EXT] = $enc; + } + } else { + $a[self::FIELD_OP] = $v; + } } if (null !== ($v = $this->getProperty())) { - $a[self::FIELD_PROPERTY] = $v->getValue(); - $a[self::FIELD_PROPERTY_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PROPERTY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PROPERTY_EXT] = $enc; + } + } else { + $a[self::FIELD_PROPERTY] = $v; + } } if (null !== ($v = $this->getValue())) { - $a[self::FIELD_VALUE] = $v->getValue(); - $a[self::FIELD_VALUE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetInclude.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetInclude.php index d6c14696b3..afa5bffa71 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetInclude.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetInclude.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRValueSetInclude extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_VALUE_SET_DOT_INCLUDE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CONCEPT = 'concept'; const FIELD_FILTER = 'filter'; const FIELD_FILTER_EXT = '_filter'; @@ -133,6 +129,9 @@ class FHIRValueSetInclude extends FHIRBackboneElement */ protected $version = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRValueSetInclude Constructor * @param null|array $data @@ -152,6 +151,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CONCEPT])) { if (is_array($data[self::FIELD_CONCEPT])) { foreach($data[self::FIELD_CONCEPT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRValueSetConcept1) { $this->addConcept($v); } else { @@ -170,17 +172,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_FILTER])) { foreach($data[self::FIELD_FILTER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRValueSetFilter) { $this->addFilter($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addFilter(new FHIRValueSetFilter([FHIRValueSetFilter::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addFilter(new FHIRValueSetFilter([FHIRValueSetFilter::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addFilter(new FHIRValueSetFilter(array_merge($v, $ext[$i]))); + } } else { $this->addFilter(new FHIRValueSetFilter($v)); } } } elseif ($data[self::FIELD_FILTER] instanceof FHIRValueSetFilter) { $this->addFilter($data[self::FIELD_FILTER]); - } elseif ($ext && is_scalar($data[self::FIELD_FILTER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_FILTER])) { $this->addFilter(new FHIRValueSetFilter([FHIRValueSetFilter::FIELD_VALUE => $data[self::FIELD_FILTER]] + $ext)); } else { $this->addFilter(new FHIRValueSetFilter($data[self::FIELD_FILTER])); @@ -192,8 +201,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SYSTEM] instanceof FHIRUri) { $this->setSystem($data[self::FIELD_SYSTEM]); - } elseif ($ext && is_scalar($data[self::FIELD_SYSTEM])) { - $this->setSystem(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_SYSTEM]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SYSTEM])) { + $this->setSystem(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_SYSTEM]] + $ext)); + } else if (is_array($data[self::FIELD_SYSTEM])) { + $this->setSystem(new FHIRUri(array_merge($ext, $data[self::FIELD_SYSTEM]))); + } } else { $this->setSystem(new FHIRUri($data[self::FIELD_SYSTEM])); } @@ -204,8 +217,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VERSION] instanceof FHIRString) { $this->setVersion($data[self::FIELD_VERSION]); - } elseif ($ext && is_scalar($data[self::FIELD_VERSION])) { - $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } else if (is_array($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString(array_merge($ext, $data[self::FIELD_VERSION]))); + } } else { $this->setVersion(new FHIRString($data[self::FIELD_VERSION])); } @@ -517,7 +534,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getConcept())) { foreach($vs as $v) { if (null === $v) { @@ -535,6 +551,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_FILTER, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getSystem())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SYSTEM, null, $v->_getFHIRXMLNamespace())); } @@ -554,15 +571,45 @@ public function jsonSerialize() $a[self::FIELD_CONCEPT] = $vs; } if ([] !== ($vs = $this->getFilter())) { - $a[self::FIELD_FILTER] = $vs; + $a[self::FIELD_FILTER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FILTER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FILTER_EXT][] = $enc; + } else { + $a[self::FIELD_FILTER_EXT][] = null; + } + } else { + $a[self::FIELD_FILTER][] = $v; + } + } } if (null !== ($v = $this->getSystem())) { - $a[self::FIELD_SYSTEM] = $v->getValue(); - $a[self::FIELD_SYSTEM_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SYSTEM] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SYSTEM_EXT] = $enc; + } + } else { + $a[self::FIELD_SYSTEM] = $v; + } } if (null !== ($v = $this->getVersion())) { - $a[self::FIELD_VERSION] = $v->getValue(); - $a[self::FIELD_VERSION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VERSION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VERSION_EXT] = $enc; + } + } else { + $a[self::FIELD_VERSION] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetParameter.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetParameter.php index 42d2621dd4..d5f239bcc9 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetParameter.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetParameter.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -82,10 +82,6 @@ class FHIRValueSetParameter extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_VALUE_SET_DOT_PARAMETER; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_NAME = 'name'; const FIELD_NAME_EXT = '_name'; const FIELD_VALUE_BOOLEAN = 'valueBoolean'; @@ -179,6 +175,9 @@ class FHIRValueSetParameter extends FHIRBackboneElement */ protected $valueUri = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRValueSetParameter Constructor * @param null|array $data @@ -201,8 +200,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -213,8 +216,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_BOOLEAN] instanceof FHIRBoolean) { $this->setValueBoolean($data[self::FIELD_VALUE_BOOLEAN]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_BOOLEAN])) { - $this->setValueBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_VALUE_BOOLEAN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_BOOLEAN])) { + $this->setValueBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_VALUE_BOOLEAN]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_BOOLEAN])) { + $this->setValueBoolean(new FHIRBoolean(array_merge($ext, $data[self::FIELD_VALUE_BOOLEAN]))); + } } else { $this->setValueBoolean(new FHIRBoolean($data[self::FIELD_VALUE_BOOLEAN])); } @@ -225,8 +232,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_CODE] instanceof FHIRCode) { $this->setValueCode($data[self::FIELD_VALUE_CODE]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_CODE])) { - $this->setValueCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_VALUE_CODE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_CODE])) { + $this->setValueCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_VALUE_CODE]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_CODE])) { + $this->setValueCode(new FHIRCode(array_merge($ext, $data[self::FIELD_VALUE_CODE]))); + } } else { $this->setValueCode(new FHIRCode($data[self::FIELD_VALUE_CODE])); } @@ -237,8 +248,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_DECIMAL] instanceof FHIRDecimal) { $this->setValueDecimal($data[self::FIELD_VALUE_DECIMAL]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_DECIMAL])) { - $this->setValueDecimal(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_VALUE_DECIMAL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_DECIMAL])) { + $this->setValueDecimal(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_VALUE_DECIMAL]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_DECIMAL])) { + $this->setValueDecimal(new FHIRDecimal(array_merge($ext, $data[self::FIELD_VALUE_DECIMAL]))); + } } else { $this->setValueDecimal(new FHIRDecimal($data[self::FIELD_VALUE_DECIMAL])); } @@ -249,8 +264,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_INTEGER] instanceof FHIRInteger) { $this->setValueInteger($data[self::FIELD_VALUE_INTEGER]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_INTEGER])) { - $this->setValueInteger(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_VALUE_INTEGER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_INTEGER])) { + $this->setValueInteger(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_VALUE_INTEGER]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_INTEGER])) { + $this->setValueInteger(new FHIRInteger(array_merge($ext, $data[self::FIELD_VALUE_INTEGER]))); + } } else { $this->setValueInteger(new FHIRInteger($data[self::FIELD_VALUE_INTEGER])); } @@ -261,8 +280,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_STRING] instanceof FHIRString) { $this->setValueString($data[self::FIELD_VALUE_STRING]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_STRING])) { - $this->setValueString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VALUE_STRING]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_STRING])) { + $this->setValueString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VALUE_STRING]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_STRING])) { + $this->setValueString(new FHIRString(array_merge($ext, $data[self::FIELD_VALUE_STRING]))); + } } else { $this->setValueString(new FHIRString($data[self::FIELD_VALUE_STRING])); } @@ -273,8 +296,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_URI] instanceof FHIRUri) { $this->setValueUri($data[self::FIELD_VALUE_URI]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_URI])) { - $this->setValueUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_VALUE_URI]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_URI])) { + $this->setValueUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_VALUE_URI]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_URI])) { + $this->setValueUri(new FHIRUri(array_merge($ext, $data[self::FIELD_VALUE_URI]))); + } } else { $this->setValueUri(new FHIRUri($data[self::FIELD_VALUE_URI])); } @@ -721,32 +748,81 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if (null !== ($v = $this->getValueBoolean())) { - $a[self::FIELD_VALUE_BOOLEAN] = $v->getValue(); - $a[self::FIELD_VALUE_BOOLEAN_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_BOOLEAN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_BOOLEAN_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_BOOLEAN] = $v; + } } if (null !== ($v = $this->getValueCode())) { - $a[self::FIELD_VALUE_CODE] = $v->getValue(); - $a[self::FIELD_VALUE_CODE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_CODE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_CODE_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_CODE] = $v; + } } if (null !== ($v = $this->getValueDecimal())) { - $a[self::FIELD_VALUE_DECIMAL] = $v->getValue(); - $a[self::FIELD_VALUE_DECIMAL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_DECIMAL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_DECIMAL_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_DECIMAL] = $v; + } } if (null !== ($v = $this->getValueInteger())) { - $a[self::FIELD_VALUE_INTEGER] = $v->getValue(); - $a[self::FIELD_VALUE_INTEGER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_INTEGER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_INTEGER_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_INTEGER] = $v; + } } if (null !== ($v = $this->getValueString())) { - $a[self::FIELD_VALUE_STRING] = $v->getValue(); - $a[self::FIELD_VALUE_STRING_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_STRING] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_STRING_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_STRING] = $v; + } } if (null !== ($v = $this->getValueUri())) { - $a[self::FIELD_VALUE_URI] = $v->getValue(); - $a[self::FIELD_VALUE_URI_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_URI] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_URI_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_URI] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRVisionPrescription/FHIRVisionPrescriptionDispense.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRVisionPrescription/FHIRVisionPrescriptionDispense.php index fca32412da..2d0c213603 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRVisionPrescription/FHIRVisionPrescriptionDispense.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBackboneElement/FHIRVisionPrescription/FHIRVisionPrescriptionDispense.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -83,10 +83,6 @@ class FHIRVisionPrescriptionDispense extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_VISION_PRESCRIPTION_DOT_DISPENSE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ADD = 'add'; const FIELD_ADD_EXT = '_add'; const FIELD_AXIS = 'axis'; @@ -104,6 +100,7 @@ class FHIRVisionPrescriptionDispense extends FHIRBackboneElement const FIELD_DIAMETER = 'diameter'; const FIELD_DIAMETER_EXT = '_diameter'; const FIELD_DURATION = 'duration'; + const FIELD_DURATION_EXT = '_duration'; const FIELD_EYE = 'eye'; const FIELD_EYE_EXT = '_eye'; const FIELD_NOTES = 'notes'; @@ -283,6 +280,9 @@ class FHIRVisionPrescriptionDispense extends FHIRBackboneElement */ protected $sphere = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRVisionPrescriptionDispense Constructor * @param null|array $data @@ -305,8 +305,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ADD] instanceof FHIRDecimal) { $this->setAdd($data[self::FIELD_ADD]); - } elseif ($ext && is_scalar($data[self::FIELD_ADD])) { - $this->setAdd(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_ADD]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ADD])) { + $this->setAdd(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_ADD]] + $ext)); + } else if (is_array($data[self::FIELD_ADD])) { + $this->setAdd(new FHIRDecimal(array_merge($ext, $data[self::FIELD_ADD]))); + } } else { $this->setAdd(new FHIRDecimal($data[self::FIELD_ADD])); } @@ -317,8 +321,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_AXIS] instanceof FHIRInteger) { $this->setAxis($data[self::FIELD_AXIS]); - } elseif ($ext && is_scalar($data[self::FIELD_AXIS])) { - $this->setAxis(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_AXIS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_AXIS])) { + $this->setAxis(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_AXIS]] + $ext)); + } else if (is_array($data[self::FIELD_AXIS])) { + $this->setAxis(new FHIRInteger(array_merge($ext, $data[self::FIELD_AXIS]))); + } } else { $this->setAxis(new FHIRInteger($data[self::FIELD_AXIS])); } @@ -329,8 +337,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_BACK_CURVE] instanceof FHIRDecimal) { $this->setBackCurve($data[self::FIELD_BACK_CURVE]); - } elseif ($ext && is_scalar($data[self::FIELD_BACK_CURVE])) { - $this->setBackCurve(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_BACK_CURVE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_BACK_CURVE])) { + $this->setBackCurve(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_BACK_CURVE]] + $ext)); + } else if (is_array($data[self::FIELD_BACK_CURVE])) { + $this->setBackCurve(new FHIRDecimal(array_merge($ext, $data[self::FIELD_BACK_CURVE]))); + } } else { $this->setBackCurve(new FHIRDecimal($data[self::FIELD_BACK_CURVE])); } @@ -341,8 +353,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_BASE] instanceof FHIRVisionBase) { $this->setBase($data[self::FIELD_BASE]); - } elseif ($ext && is_scalar($data[self::FIELD_BASE])) { - $this->setBase(new FHIRVisionBase([FHIRVisionBase::FIELD_VALUE => $data[self::FIELD_BASE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_BASE])) { + $this->setBase(new FHIRVisionBase([FHIRVisionBase::FIELD_VALUE => $data[self::FIELD_BASE]] + $ext)); + } else if (is_array($data[self::FIELD_BASE])) { + $this->setBase(new FHIRVisionBase(array_merge($ext, $data[self::FIELD_BASE]))); + } } else { $this->setBase(new FHIRVisionBase($data[self::FIELD_BASE])); } @@ -353,8 +369,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_BRAND] instanceof FHIRString) { $this->setBrand($data[self::FIELD_BRAND]); - } elseif ($ext && is_scalar($data[self::FIELD_BRAND])) { - $this->setBrand(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_BRAND]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_BRAND])) { + $this->setBrand(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_BRAND]] + $ext)); + } else if (is_array($data[self::FIELD_BRAND])) { + $this->setBrand(new FHIRString(array_merge($ext, $data[self::FIELD_BRAND]))); + } } else { $this->setBrand(new FHIRString($data[self::FIELD_BRAND])); } @@ -365,8 +385,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_COLOR] instanceof FHIRString) { $this->setColor($data[self::FIELD_COLOR]); - } elseif ($ext && is_scalar($data[self::FIELD_COLOR])) { - $this->setColor(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_COLOR]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_COLOR])) { + $this->setColor(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_COLOR]] + $ext)); + } else if (is_array($data[self::FIELD_COLOR])) { + $this->setColor(new FHIRString(array_merge($ext, $data[self::FIELD_COLOR]))); + } } else { $this->setColor(new FHIRString($data[self::FIELD_COLOR])); } @@ -377,8 +401,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CYLINDER] instanceof FHIRDecimal) { $this->setCylinder($data[self::FIELD_CYLINDER]); - } elseif ($ext && is_scalar($data[self::FIELD_CYLINDER])) { - $this->setCylinder(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_CYLINDER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CYLINDER])) { + $this->setCylinder(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_CYLINDER]] + $ext)); + } else if (is_array($data[self::FIELD_CYLINDER])) { + $this->setCylinder(new FHIRDecimal(array_merge($ext, $data[self::FIELD_CYLINDER]))); + } } else { $this->setCylinder(new FHIRDecimal($data[self::FIELD_CYLINDER])); } @@ -389,15 +417,28 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DIAMETER] instanceof FHIRDecimal) { $this->setDiameter($data[self::FIELD_DIAMETER]); - } elseif ($ext && is_scalar($data[self::FIELD_DIAMETER])) { - $this->setDiameter(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_DIAMETER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DIAMETER])) { + $this->setDiameter(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_DIAMETER]] + $ext)); + } else if (is_array($data[self::FIELD_DIAMETER])) { + $this->setDiameter(new FHIRDecimal(array_merge($ext, $data[self::FIELD_DIAMETER]))); + } } else { $this->setDiameter(new FHIRDecimal($data[self::FIELD_DIAMETER])); } } if (isset($data[self::FIELD_DURATION])) { + $ext = (isset($data[self::FIELD_DURATION_EXT]) && is_array($data[self::FIELD_DURATION_EXT])) + ? $data[self::FIELD_DURATION_EXT] + : null; if ($data[self::FIELD_DURATION] instanceof FHIRSimpleQuantity) { $this->setDuration($data[self::FIELD_DURATION]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DURATION])) { + $this->setDuration(new FHIRSimpleQuantity([FHIRSimpleQuantity::FIELD_VALUE => $data[self::FIELD_DURATION]] + $ext)); + } else if (is_array($data[self::FIELD_DURATION])) { + $this->setDuration(new FHIRSimpleQuantity(array_merge($ext, $data[self::FIELD_DURATION]))); + } } else { $this->setDuration(new FHIRSimpleQuantity($data[self::FIELD_DURATION])); } @@ -408,8 +449,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EYE] instanceof FHIRVisionEyes) { $this->setEye($data[self::FIELD_EYE]); - } elseif ($ext && is_scalar($data[self::FIELD_EYE])) { - $this->setEye(new FHIRVisionEyes([FHIRVisionEyes::FIELD_VALUE => $data[self::FIELD_EYE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EYE])) { + $this->setEye(new FHIRVisionEyes([FHIRVisionEyes::FIELD_VALUE => $data[self::FIELD_EYE]] + $ext)); + } else if (is_array($data[self::FIELD_EYE])) { + $this->setEye(new FHIRVisionEyes(array_merge($ext, $data[self::FIELD_EYE]))); + } } else { $this->setEye(new FHIRVisionEyes($data[self::FIELD_EYE])); } @@ -420,8 +465,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NOTES] instanceof FHIRString) { $this->setNotes($data[self::FIELD_NOTES]); - } elseif ($ext && is_scalar($data[self::FIELD_NOTES])) { - $this->setNotes(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NOTES]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NOTES])) { + $this->setNotes(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NOTES]] + $ext)); + } else if (is_array($data[self::FIELD_NOTES])) { + $this->setNotes(new FHIRString(array_merge($ext, $data[self::FIELD_NOTES]))); + } } else { $this->setNotes(new FHIRString($data[self::FIELD_NOTES])); } @@ -432,8 +481,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_POWER] instanceof FHIRDecimal) { $this->setPower($data[self::FIELD_POWER]); - } elseif ($ext && is_scalar($data[self::FIELD_POWER])) { - $this->setPower(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_POWER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_POWER])) { + $this->setPower(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_POWER]] + $ext)); + } else if (is_array($data[self::FIELD_POWER])) { + $this->setPower(new FHIRDecimal(array_merge($ext, $data[self::FIELD_POWER]))); + } } else { $this->setPower(new FHIRDecimal($data[self::FIELD_POWER])); } @@ -444,8 +497,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PRISM] instanceof FHIRDecimal) { $this->setPrism($data[self::FIELD_PRISM]); - } elseif ($ext && is_scalar($data[self::FIELD_PRISM])) { - $this->setPrism(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_PRISM]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PRISM])) { + $this->setPrism(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_PRISM]] + $ext)); + } else if (is_array($data[self::FIELD_PRISM])) { + $this->setPrism(new FHIRDecimal(array_merge($ext, $data[self::FIELD_PRISM]))); + } } else { $this->setPrism(new FHIRDecimal($data[self::FIELD_PRISM])); } @@ -463,8 +520,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SPHERE] instanceof FHIRDecimal) { $this->setSphere($data[self::FIELD_SPHERE]); - } elseif ($ext && is_scalar($data[self::FIELD_SPHERE])) { - $this->setSphere(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_SPHERE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SPHERE])) { + $this->setSphere(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_SPHERE]] + $ext)); + } else if (is_array($data[self::FIELD_SPHERE])) { + $this->setSphere(new FHIRDecimal(array_merge($ext, $data[self::FIELD_SPHERE]))); + } } else { $this->setSphere(new FHIRDecimal($data[self::FIELD_SPHERE])); } @@ -1199,7 +1260,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getBackCurve())) { $v->xmlSerialize($sxe->addChild(self::FIELD_BACK_CURVE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getBase())) { $v->xmlSerialize($sxe->addChild(self::FIELD_BASE, null, $v->_getFHIRXMLNamespace())); } @@ -1215,11 +1275,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDiameter())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DIAMETER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDuration())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DURATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getEye())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EYE, null, $v->_getFHIRXMLNamespace())); } @@ -1232,7 +1290,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getPrism())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PRISM, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getProduct())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PRODUCT, null, $v->_getFHIRXMLNamespace())); } @@ -1249,60 +1306,161 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getAdd())) { - $a[self::FIELD_ADD] = $v->getValue(); - $a[self::FIELD_ADD_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ADD] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ADD_EXT] = $enc; + } + } else { + $a[self::FIELD_ADD] = $v; + } } if (null !== ($v = $this->getAxis())) { - $a[self::FIELD_AXIS] = $v->getValue(); - $a[self::FIELD_AXIS_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_AXIS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_AXIS_EXT] = $enc; + } + } else { + $a[self::FIELD_AXIS] = $v; + } } if (null !== ($v = $this->getBackCurve())) { - $a[self::FIELD_BACK_CURVE] = $v->getValue(); - $a[self::FIELD_BACK_CURVE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_BACK_CURVE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_BACK_CURVE_EXT] = $enc; + } + } else { + $a[self::FIELD_BACK_CURVE] = $v; + } } if (null !== ($v = $this->getBase())) { - $a[self::FIELD_BASE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_BASE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_BASE_EXT] = $enc; + } + } else { + $a[self::FIELD_BASE] = $v; + } } if (null !== ($v = $this->getBrand())) { - $a[self::FIELD_BRAND] = $v->getValue(); - $a[self::FIELD_BRAND_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_BRAND] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_BRAND_EXT] = $enc; + } + } else { + $a[self::FIELD_BRAND] = $v; + } } if (null !== ($v = $this->getColor())) { - $a[self::FIELD_COLOR] = $v->getValue(); - $a[self::FIELD_COLOR_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_COLOR] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_COLOR_EXT] = $enc; + } + } else { + $a[self::FIELD_COLOR] = $v; + } } if (null !== ($v = $this->getCylinder())) { - $a[self::FIELD_CYLINDER] = $v->getValue(); - $a[self::FIELD_CYLINDER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CYLINDER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CYLINDER_EXT] = $enc; + } + } else { + $a[self::FIELD_CYLINDER] = $v; + } } if (null !== ($v = $this->getDiameter())) { - $a[self::FIELD_DIAMETER] = $v->getValue(); - $a[self::FIELD_DIAMETER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DIAMETER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DIAMETER_EXT] = $enc; + } + } else { + $a[self::FIELD_DIAMETER] = $v; + } } if (null !== ($v = $this->getDuration())) { - $a[self::FIELD_DURATION] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DURATION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DURATION_EXT] = $enc; + } + } else { + $a[self::FIELD_DURATION] = $v; + } } if (null !== ($v = $this->getEye())) { - $a[self::FIELD_EYE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EYE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EYE_EXT] = $enc; + } + } else { + $a[self::FIELD_EYE] = $v; + } } if (null !== ($v = $this->getNotes())) { - $a[self::FIELD_NOTES] = $v->getValue(); - $a[self::FIELD_NOTES_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NOTES] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NOTES_EXT] = $enc; + } + } else { + $a[self::FIELD_NOTES] = $v; + } } if (null !== ($v = $this->getPower())) { - $a[self::FIELD_POWER] = $v->getValue(); - $a[self::FIELD_POWER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_POWER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_POWER_EXT] = $enc; + } + } else { + $a[self::FIELD_POWER] = $v; + } } if (null !== ($v = $this->getPrism())) { - $a[self::FIELD_PRISM] = $v->getValue(); - $a[self::FIELD_PRISM_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PRISM] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PRISM_EXT] = $enc; + } + } else { + $a[self::FIELD_PRISM] = $v; + } } if (null !== ($v = $this->getProduct())) { $a[self::FIELD_PRODUCT] = $v; } if (null !== ($v = $this->getSphere())) { - $a[self::FIELD_SPHERE] = $v->getValue(); - $a[self::FIELD_SPHERE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SPHERE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SPHERE_EXT] = $enc; + } + } else { + $a[self::FIELD_SPHERE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBase64Binary.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBase64Binary.php index 4108150df0..f6c31f4308 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBase64Binary.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBase64Binary.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRBase64Binary extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_BASE_64BINARY; - - /** @var string */ - protected $_xmlns = ''; - const FIELD_VALUE = 'value'; /** @@ -90,6 +86,8 @@ class FHIRBase64Binary extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; /** * FHIRBase64Binary Constructor @@ -247,8 +245,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBindingStrength.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBindingStrength.php index c10e65f9f0..8f113a3737 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBindingStrength.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBindingStrength.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRBindingStrength extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_BINDING_STRENGTH; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRBindingStrength extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRBindingStrength Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBoolean.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBoolean.php index f07f254557..62a2bd7761 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBoolean.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBoolean.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRBoolean extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_BOOLEAN; - - /** @var string */ - protected $_xmlns = ''; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,8 @@ class FHIRBoolean extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; /** * FHIRBoolean Constructor @@ -246,8 +244,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBundleType.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBundleType.php index 982d14c272..82d67452bb 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBundleType.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRBundleType.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRBundleType extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_BUNDLE_TYPE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRBundleType extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRBundleType Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRCarePlanActivityStatus.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRCarePlanActivityStatus.php index 27906d4aee..d73926ceb5 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRCarePlanActivityStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRCarePlanActivityStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRCarePlanActivityStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CARE_PLAN_ACTIVITY_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRCarePlanActivityStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRCarePlanActivityStatus Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRCarePlanRelationship.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRCarePlanRelationship.php index e838e7b02a..320a27d5de 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRCarePlanRelationship.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRCarePlanRelationship.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRCarePlanRelationship extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CARE_PLAN_RELATIONSHIP; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRCarePlanRelationship extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRCarePlanRelationship Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRCarePlanStatus.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRCarePlanStatus.php index f6ba86b483..d71d26d195 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRCarePlanStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRCarePlanStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRCarePlanStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CARE_PLAN_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -90,6 +86,9 @@ class FHIRCarePlanStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRCarePlanStatus Constructor * @param null|array $data @@ -245,8 +244,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRClaimType.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRClaimType.php index c8f64eaa62..e90f944abd 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRClaimType.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRClaimType.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRClaimType extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CLAIM_TYPE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRClaimType extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRClaimType Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRClinicalImpressionStatus.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRClinicalImpressionStatus.php index f0e438a648..47889d06f6 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRClinicalImpressionStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRClinicalImpressionStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRClinicalImpressionStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CLINICAL_IMPRESSION_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRClinicalImpressionStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRClinicalImpressionStatus Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRCode.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRCode.php index fd77533a5f..576c946fd5 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRCode.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRCode.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRCode extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CODE; - - /** @var string */ - protected $_xmlns = ''; - const FIELD_VALUE = 'value'; /** @@ -91,6 +87,8 @@ class FHIRCode extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; /** * FHIRCode Constructor @@ -248,8 +246,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRCodeableConcept.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRCodeableConcept.php index 1941044e17..a3001fa3cf 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRCodeableConcept.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRCodeableConcept.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRCodeableConcept extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CODEABLE_CONCEPT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CODING = 'coding'; const FIELD_TEXT = 'text'; const FIELD_TEXT_EXT = '_text'; @@ -111,6 +107,9 @@ class FHIRCodeableConcept extends FHIRElement */ protected $text = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRCodeableConcept Constructor * @param null|array $data @@ -130,6 +129,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CODING])) { if (is_array($data[self::FIELD_CODING])) { foreach($data[self::FIELD_CODING] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCoding) { $this->addCoding($v); } else { @@ -148,8 +150,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TEXT] instanceof FHIRString) { $this->setText($data[self::FIELD_TEXT]); - } elseif ($ext && is_scalar($data[self::FIELD_TEXT])) { - $this->setText(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TEXT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TEXT])) { + $this->setText(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TEXT]] + $ext)); + } else if (is_array($data[self::FIELD_TEXT])) { + $this->setText(new FHIRString(array_merge($ext, $data[self::FIELD_TEXT]))); + } } else { $this->setText(new FHIRString($data[self::FIELD_TEXT])); } @@ -364,7 +370,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getCoding())) { foreach($vs as $v) { if (null === $v) { @@ -373,6 +378,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_CODING, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getText())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TEXT, null, $v->_getFHIRXMLNamespace())); } @@ -389,8 +395,15 @@ public function jsonSerialize() $a[self::FIELD_CODING] = $vs; } if (null !== ($v = $this->getText())) { - $a[self::FIELD_TEXT] = $v->getValue(); - $a[self::FIELD_TEXT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TEXT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TEXT_EXT] = $enc; + } + } else { + $a[self::FIELD_TEXT] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRCoding.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRCoding.php index 1c85914e76..f124d1a88d 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRCoding.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRCoding.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRCoding extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CODING; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CODE = 'code'; const FIELD_CODE_EXT = '_code'; const FIELD_DISPLAY = 'display'; @@ -156,6 +152,9 @@ class FHIRCoding extends FHIRElement */ protected $version = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRCoding Constructor * @param null|array $data @@ -178,8 +177,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CODE] instanceof FHIRCode) { $this->setCode($data[self::FIELD_CODE]); - } elseif ($ext && is_scalar($data[self::FIELD_CODE])) { - $this->setCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_CODE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CODE])) { + $this->setCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_CODE]] + $ext)); + } else if (is_array($data[self::FIELD_CODE])) { + $this->setCode(new FHIRCode(array_merge($ext, $data[self::FIELD_CODE]))); + } } else { $this->setCode(new FHIRCode($data[self::FIELD_CODE])); } @@ -190,8 +193,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DISPLAY] instanceof FHIRString) { $this->setDisplay($data[self::FIELD_DISPLAY]); - } elseif ($ext && is_scalar($data[self::FIELD_DISPLAY])) { - $this->setDisplay(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DISPLAY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DISPLAY])) { + $this->setDisplay(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DISPLAY]] + $ext)); + } else if (is_array($data[self::FIELD_DISPLAY])) { + $this->setDisplay(new FHIRString(array_merge($ext, $data[self::FIELD_DISPLAY]))); + } } else { $this->setDisplay(new FHIRString($data[self::FIELD_DISPLAY])); } @@ -202,8 +209,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SYSTEM] instanceof FHIRUri) { $this->setSystem($data[self::FIELD_SYSTEM]); - } elseif ($ext && is_scalar($data[self::FIELD_SYSTEM])) { - $this->setSystem(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_SYSTEM]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SYSTEM])) { + $this->setSystem(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_SYSTEM]] + $ext)); + } else if (is_array($data[self::FIELD_SYSTEM])) { + $this->setSystem(new FHIRUri(array_merge($ext, $data[self::FIELD_SYSTEM]))); + } } else { $this->setSystem(new FHIRUri($data[self::FIELD_SYSTEM])); } @@ -214,8 +225,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_USER_SELECTED] instanceof FHIRBoolean) { $this->setUserSelected($data[self::FIELD_USER_SELECTED]); - } elseif ($ext && is_scalar($data[self::FIELD_USER_SELECTED])) { - $this->setUserSelected(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_USER_SELECTED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_USER_SELECTED])) { + $this->setUserSelected(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_USER_SELECTED]] + $ext)); + } else if (is_array($data[self::FIELD_USER_SELECTED])) { + $this->setUserSelected(new FHIRBoolean(array_merge($ext, $data[self::FIELD_USER_SELECTED]))); + } } else { $this->setUserSelected(new FHIRBoolean($data[self::FIELD_USER_SELECTED])); } @@ -226,8 +241,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VERSION] instanceof FHIRString) { $this->setVersion($data[self::FIELD_VERSION]); - } elseif ($ext && is_scalar($data[self::FIELD_VERSION])) { - $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } else if (is_array($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString(array_merge($ext, $data[self::FIELD_VERSION]))); + } } else { $this->setVersion(new FHIRString($data[self::FIELD_VERSION])); } @@ -594,24 +613,59 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getCode())) { - $a[self::FIELD_CODE] = $v->getValue(); - $a[self::FIELD_CODE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CODE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CODE_EXT] = $enc; + } + } else { + $a[self::FIELD_CODE] = $v; + } } if (null !== ($v = $this->getDisplay())) { - $a[self::FIELD_DISPLAY] = $v->getValue(); - $a[self::FIELD_DISPLAY_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DISPLAY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DISPLAY_EXT] = $enc; + } + } else { + $a[self::FIELD_DISPLAY] = $v; + } } if (null !== ($v = $this->getSystem())) { - $a[self::FIELD_SYSTEM] = $v->getValue(); - $a[self::FIELD_SYSTEM_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SYSTEM] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SYSTEM_EXT] = $enc; + } + } else { + $a[self::FIELD_SYSTEM] = $v; + } } if (null !== ($v = $this->getUserSelected())) { - $a[self::FIELD_USER_SELECTED] = $v->getValue(); - $a[self::FIELD_USER_SELECTED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_USER_SELECTED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_USER_SELECTED_EXT] = $enc; + } + } else { + $a[self::FIELD_USER_SELECTED] = $v; + } } if (null !== ($v = $this->getVersion())) { - $a[self::FIELD_VERSION] = $v->getValue(); - $a[self::FIELD_VERSION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VERSION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VERSION_EXT] = $enc; + } + } else { + $a[self::FIELD_VERSION] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRCommunicationRequestStatus.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRCommunicationRequestStatus.php index 32b7004d14..f0321f175a 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRCommunicationRequestStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRCommunicationRequestStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRCommunicationRequestStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_COMMUNICATION_REQUEST_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRCommunicationRequestStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRCommunicationRequestStatus Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRCommunicationStatus.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRCommunicationStatus.php index af9614c9b6..aa9984c236 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRCommunicationStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRCommunicationStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRCommunicationStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_COMMUNICATION_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRCommunicationStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRCommunicationStatus Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRCompositionAttestationMode.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRCompositionAttestationMode.php index 22ae5dffde..b0e9136c80 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRCompositionAttestationMode.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRCompositionAttestationMode.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRCompositionAttestationMode extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_COMPOSITION_ATTESTATION_MODE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRCompositionAttestationMode extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRCompositionAttestationMode Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRCompositionStatus.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRCompositionStatus.php index b989785a34..bd0e9f53a9 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRCompositionStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRCompositionStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRCompositionStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_COMPOSITION_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRCompositionStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRCompositionStatus Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRConceptMapEquivalence.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRConceptMapEquivalence.php index 2b5e010815..f3de0da4cd 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRConceptMapEquivalence.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRConceptMapEquivalence.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -77,10 +77,6 @@ class FHIRConceptMapEquivalence extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONCEPT_MAP_EQUIVALENCE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -88,6 +84,9 @@ class FHIRConceptMapEquivalence extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRConceptMapEquivalence Constructor * @param null|array $data @@ -243,8 +242,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRConditionVerificationStatus.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRConditionVerificationStatus.php index 6c54b8602b..e06efbbae1 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRConditionVerificationStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRConditionVerificationStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRConditionVerificationStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONDITION_VERIFICATION_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -90,6 +86,9 @@ class FHIRConditionVerificationStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRConditionVerificationStatus Constructor * @param null|array $data @@ -245,8 +244,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRConditionalDeleteStatus.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRConditionalDeleteStatus.php index db5af48a18..09526663a3 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRConditionalDeleteStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRConditionalDeleteStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRConditionalDeleteStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONDITIONAL_DELETE_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRConditionalDeleteStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRConditionalDeleteStatus Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRConformanceEventMode.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRConformanceEventMode.php index 6616f357db..6b0c33530b 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRConformanceEventMode.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRConformanceEventMode.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRConformanceEventMode extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONFORMANCE_EVENT_MODE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRConformanceEventMode extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRConformanceEventMode Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRConformanceResourceStatus.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRConformanceResourceStatus.php index 1d39384a43..d0346178d1 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRConformanceResourceStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRConformanceResourceStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -77,10 +77,6 @@ class FHIRConformanceResourceStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONFORMANCE_RESOURCE_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -88,6 +84,9 @@ class FHIRConformanceResourceStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRConformanceResourceStatus Constructor * @param null|array $data @@ -243,8 +242,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRConformanceStatementKind.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRConformanceStatementKind.php index e79ae84119..cf526512ef 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRConformanceStatementKind.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRConformanceStatementKind.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRConformanceStatementKind extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONFORMANCE_STATEMENT_KIND; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRConformanceStatementKind extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRConformanceStatementKind Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRConstraintSeverity.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRConstraintSeverity.php index 6d76cdde28..310ddde7b3 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRConstraintSeverity.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRConstraintSeverity.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRConstraintSeverity extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONSTRAINT_SEVERITY; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRConstraintSeverity extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRConstraintSeverity Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRContactPoint.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRContactPoint.php index 364d33d91b..e3a62f5b83 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRContactPoint.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRContactPoint.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRContactPoint extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONTACT_POINT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_PERIOD = 'period'; const FIELD_RANK = 'rank'; const FIELD_RANK_EXT = '_rank'; @@ -149,6 +145,9 @@ class FHIRContactPoint extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRContactPoint Constructor * @param null|array $data @@ -182,8 +181,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_RANK] instanceof FHIRPositiveInt) { $this->setRank($data[self::FIELD_RANK]); - } elseif ($ext && is_scalar($data[self::FIELD_RANK])) { - $this->setRank(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_RANK]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_RANK])) { + $this->setRank(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_RANK]] + $ext)); + } else if (is_array($data[self::FIELD_RANK])) { + $this->setRank(new FHIRPositiveInt(array_merge($ext, $data[self::FIELD_RANK]))); + } } else { $this->setRank(new FHIRPositiveInt($data[self::FIELD_RANK])); } @@ -194,8 +197,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SYSTEM] instanceof FHIRContactPointSystem) { $this->setSystem($data[self::FIELD_SYSTEM]); - } elseif ($ext && is_scalar($data[self::FIELD_SYSTEM])) { - $this->setSystem(new FHIRContactPointSystem([FHIRContactPointSystem::FIELD_VALUE => $data[self::FIELD_SYSTEM]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SYSTEM])) { + $this->setSystem(new FHIRContactPointSystem([FHIRContactPointSystem::FIELD_VALUE => $data[self::FIELD_SYSTEM]] + $ext)); + } else if (is_array($data[self::FIELD_SYSTEM])) { + $this->setSystem(new FHIRContactPointSystem(array_merge($ext, $data[self::FIELD_SYSTEM]))); + } } else { $this->setSystem(new FHIRContactPointSystem($data[self::FIELD_SYSTEM])); } @@ -206,8 +213,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_USE] instanceof FHIRContactPointUse) { $this->setUse($data[self::FIELD_USE]); - } elseif ($ext && is_scalar($data[self::FIELD_USE])) { - $this->setUse(new FHIRContactPointUse([FHIRContactPointUse::FIELD_VALUE => $data[self::FIELD_USE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_USE])) { + $this->setUse(new FHIRContactPointUse([FHIRContactPointUse::FIELD_VALUE => $data[self::FIELD_USE]] + $ext)); + } else if (is_array($data[self::FIELD_USE])) { + $this->setUse(new FHIRContactPointUse(array_merge($ext, $data[self::FIELD_USE]))); + } } else { $this->setUse(new FHIRContactPointUse($data[self::FIELD_USE])); } @@ -218,8 +229,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE] instanceof FHIRString) { $this->setValue($data[self::FIELD_VALUE]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE])) { - $this->setValue(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VALUE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE])) { + $this->setValue(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VALUE]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE])) { + $this->setValue(new FHIRString(array_merge($ext, $data[self::FIELD_VALUE]))); + } } else { $this->setValue(new FHIRString($data[self::FIELD_VALUE])); } @@ -514,22 +529,20 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PERIOD, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getRank())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RANK, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSystem())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SYSTEM, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getUse())) { $v->xmlSerialize($sxe->addChild(self::FIELD_USE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getValue())) { + $sxe->addAttribute(self::FIELD_VALUE, (string)$v); $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE, null, $v->_getFHIRXMLNamespace())); } return $sxe; @@ -545,18 +558,48 @@ public function jsonSerialize() $a[self::FIELD_PERIOD] = $v; } if (null !== ($v = $this->getRank())) { - $a[self::FIELD_RANK] = $v->getValue(); - $a[self::FIELD_RANK_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_RANK] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_RANK_EXT] = $enc; + } + } else { + $a[self::FIELD_RANK] = $v; + } } if (null !== ($v = $this->getSystem())) { - $a[self::FIELD_SYSTEM] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SYSTEM] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SYSTEM_EXT] = $enc; + } + } else { + $a[self::FIELD_SYSTEM] = $v; + } } if (null !== ($v = $this->getUse())) { - $a[self::FIELD_USE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_USE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_USE_EXT] = $enc; + } + } else { + $a[self::FIELD_USE] = $v; + } } if (null !== ($v = $this->getValue())) { - $a[self::FIELD_VALUE] = $v->getValue(); - $a[self::FIELD_VALUE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRContactPointSystem.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRContactPointSystem.php index 5797dffc91..de622b97a3 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRContactPointSystem.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRContactPointSystem.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRContactPointSystem extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONTACT_POINT_SYSTEM; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRContactPointSystem extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRContactPointSystem Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRContactPointUse.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRContactPointUse.php index f3db75cb15..690f173510 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRContactPointUse.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRContactPointUse.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRContactPointUse extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONTACT_POINT_USE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRContactPointUse extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRContactPointUse Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRContentType.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRContentType.php index 3af8487807..acdd5c6d1c 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRContentType.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRContentType.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRContentType extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONTENT_TYPE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRContentType extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRContentType Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRDataElementStringency.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRDataElementStringency.php index 634d76faf6..d91ab95e54 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRDataElementStringency.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRDataElementStringency.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRDataElementStringency extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DATA_ELEMENT_STRINGENCY; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRDataElementStringency extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRDataElementStringency Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRDate.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRDate.php index b13916c2f7..5293c74dc6 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRDate.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRDate.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRDate extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DATE; - - /** @var string */ - protected $_xmlns = ''; - const FIELD_VALUE = 'value'; /** @@ -91,6 +87,8 @@ class FHIRDate extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; /** * FHIRDate Constructor @@ -248,8 +246,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRDateTime.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRDateTime.php index 8a95bc5d6a..a19865ad3c 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRDateTime.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRDateTime.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -82,10 +82,6 @@ class FHIRDateTime extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DATE_TIME; - - /** @var string */ - protected $_xmlns = ''; - const FIELD_VALUE = 'value'; /** @@ -93,6 +89,8 @@ class FHIRDateTime extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; /** * FHIRDateTime Constructor @@ -250,8 +248,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRDaysOfWeek.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRDaysOfWeek.php index 2221bef61a..573403d5c1 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRDaysOfWeek.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRDaysOfWeek.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRDaysOfWeek extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DAYS_OF_WEEK; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRDaysOfWeek extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRDaysOfWeek Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRDecimal.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRDecimal.php index 9b0d81cb4f..1cff68f8e5 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRDecimal.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRDecimal.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRDecimal extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DECIMAL; - - /** @var string */ - protected $_xmlns = ''; - const FIELD_VALUE = 'value'; /** @@ -91,6 +87,8 @@ class FHIRDecimal extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; /** * FHIRDecimal Constructor @@ -248,8 +246,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRDetectedIssueSeverity.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRDetectedIssueSeverity.php index 8133dd078c..a1a84748ad 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRDetectedIssueSeverity.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRDetectedIssueSeverity.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRDetectedIssueSeverity extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DETECTED_ISSUE_SEVERITY; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRDetectedIssueSeverity extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRDetectedIssueSeverity Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRDeviceMetricCalibrationState.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRDeviceMetricCalibrationState.php index b542eb569f..0f5a801f44 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRDeviceMetricCalibrationState.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRDeviceMetricCalibrationState.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRDeviceMetricCalibrationState extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DEVICE_METRIC_CALIBRATION_STATE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRDeviceMetricCalibrationState extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRDeviceMetricCalibrationState Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRDeviceMetricCalibrationType.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRDeviceMetricCalibrationType.php index bc1cf36689..7591cbe569 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRDeviceMetricCalibrationType.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRDeviceMetricCalibrationType.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRDeviceMetricCalibrationType extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DEVICE_METRIC_CALIBRATION_TYPE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRDeviceMetricCalibrationType extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRDeviceMetricCalibrationType Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRDeviceMetricCategory.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRDeviceMetricCategory.php index b8412b4d01..e024456f80 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRDeviceMetricCategory.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRDeviceMetricCategory.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRDeviceMetricCategory extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DEVICE_METRIC_CATEGORY; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRDeviceMetricCategory extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRDeviceMetricCategory Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRDeviceMetricColor.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRDeviceMetricColor.php index e63d65d8ee..66d9eb0b87 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRDeviceMetricColor.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRDeviceMetricColor.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRDeviceMetricColor extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DEVICE_METRIC_COLOR; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRDeviceMetricColor extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRDeviceMetricColor Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRDeviceMetricOperationalStatus.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRDeviceMetricOperationalStatus.php index dde5115fc2..740a73343a 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRDeviceMetricOperationalStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRDeviceMetricOperationalStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRDeviceMetricOperationalStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DEVICE_METRIC_OPERATIONAL_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRDeviceMetricOperationalStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRDeviceMetricOperationalStatus Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRDeviceStatus.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRDeviceStatus.php index dc50a7b9cf..9628f881fe 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRDeviceStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRDeviceStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRDeviceStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DEVICE_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRDeviceStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRDeviceStatus Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRDeviceUseRequestPriority.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRDeviceUseRequestPriority.php index 5b4e68f282..09c1076196 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRDeviceUseRequestPriority.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRDeviceUseRequestPriority.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRDeviceUseRequestPriority extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DEVICE_USE_REQUEST_PRIORITY; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRDeviceUseRequestPriority extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRDeviceUseRequestPriority Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRDeviceUseRequestStatus.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRDeviceUseRequestStatus.php index 1bafb14ad8..13d84d8143 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRDeviceUseRequestStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRDeviceUseRequestStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRDeviceUseRequestStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DEVICE_USE_REQUEST_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRDeviceUseRequestStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRDeviceUseRequestStatus Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRDiagnosticOrderPriority.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRDiagnosticOrderPriority.php index 4d0fc67c71..53ea50b94e 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRDiagnosticOrderPriority.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRDiagnosticOrderPriority.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRDiagnosticOrderPriority extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DIAGNOSTIC_ORDER_PRIORITY; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRDiagnosticOrderPriority extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRDiagnosticOrderPriority Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRDiagnosticOrderStatus.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRDiagnosticOrderStatus.php index ec98c21910..26050d5c35 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRDiagnosticOrderStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRDiagnosticOrderStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRDiagnosticOrderStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DIAGNOSTIC_ORDER_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRDiagnosticOrderStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRDiagnosticOrderStatus Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRDiagnosticReportStatus.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRDiagnosticReportStatus.php index 5488e9920d..506d109539 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRDiagnosticReportStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRDiagnosticReportStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRDiagnosticReportStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DIAGNOSTIC_REPORT_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRDiagnosticReportStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRDiagnosticReportStatus Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRDigitalMediaType.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRDigitalMediaType.php index 95743a66bb..63fa629b68 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRDigitalMediaType.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRDigitalMediaType.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRDigitalMediaType extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DIGITAL_MEDIA_TYPE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRDigitalMediaType extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRDigitalMediaType Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRDocumentMode.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRDocumentMode.php index 1c951bb881..e0609f00eb 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRDocumentMode.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRDocumentMode.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRDocumentMode extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DOCUMENT_MODE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRDocumentMode extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRDocumentMode Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRDocumentReferenceStatus.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRDocumentReferenceStatus.php index dfe62e01fc..92fdada193 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRDocumentReferenceStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRDocumentReferenceStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -77,10 +77,6 @@ class FHIRDocumentReferenceStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DOCUMENT_REFERENCE_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -88,6 +84,9 @@ class FHIRDocumentReferenceStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRDocumentReferenceStatus Constructor * @param null|array $data @@ -243,8 +242,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRDocumentRelationshipType.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRDocumentRelationshipType.php index f77e14b8cb..d15840815b 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRDocumentRelationshipType.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRDocumentRelationshipType.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRDocumentRelationshipType extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DOCUMENT_RELATIONSHIP_TYPE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRDocumentRelationshipType extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRDocumentRelationshipType Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRElementDefinition.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRElementDefinition.php index e3b5978bff..5070a0ae41 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRElementDefinition.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRElementDefinition.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -84,10 +84,6 @@ class FHIRElementDefinition extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ELEMENT_DEFINITION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ALIAS = 'alias'; const FIELD_ALIAS_EXT = '_alias'; const FIELD_BASE = 'base'; @@ -3678,6 +3674,9 @@ class FHIRElementDefinition extends FHIRElement */ protected $type = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRElementDefinition Constructor * @param null|array $data @@ -3700,17 +3699,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_ALIAS])) { foreach($data[self::FIELD_ALIAS] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRString) { $this->addAlias($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addAlias(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addAlias(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addAlias(new FHIRString(array_merge($v, $ext[$i]))); + } } else { $this->addAlias(new FHIRString($v)); } } } elseif ($data[self::FIELD_ALIAS] instanceof FHIRString) { $this->addAlias($data[self::FIELD_ALIAS]); - } elseif ($ext && is_scalar($data[self::FIELD_ALIAS])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_ALIAS])) { $this->addAlias(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_ALIAS]] + $ext)); } else { $this->addAlias(new FHIRString($data[self::FIELD_ALIAS])); @@ -3733,6 +3739,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CODE])) { if (is_array($data[self::FIELD_CODE])) { foreach($data[self::FIELD_CODE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCoding) { $this->addCode($v); } else { @@ -3751,8 +3760,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_COMMENTS] instanceof FHIRMarkdown) { $this->setComments($data[self::FIELD_COMMENTS]); - } elseif ($ext && is_scalar($data[self::FIELD_COMMENTS])) { - $this->setComments(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_COMMENTS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_COMMENTS])) { + $this->setComments(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_COMMENTS]] + $ext)); + } else if (is_array($data[self::FIELD_COMMENTS])) { + $this->setComments(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_COMMENTS]))); + } } else { $this->setComments(new FHIRMarkdown($data[self::FIELD_COMMENTS])); } @@ -3763,17 +3776,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_CONDITION])) { foreach($data[self::FIELD_CONDITION] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRId) { $this->addCondition($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addCondition(new FHIRId([FHIRId::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addCondition(new FHIRId([FHIRId::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addCondition(new FHIRId(array_merge($v, $ext[$i]))); + } } else { $this->addCondition(new FHIRId($v)); } } } elseif ($data[self::FIELD_CONDITION] instanceof FHIRId) { $this->addCondition($data[self::FIELD_CONDITION]); - } elseif ($ext && is_scalar($data[self::FIELD_CONDITION])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_CONDITION])) { $this->addCondition(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_CONDITION]] + $ext)); } else { $this->addCondition(new FHIRId($data[self::FIELD_CONDITION])); @@ -3782,6 +3802,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CONSTRAINT])) { if (is_array($data[self::FIELD_CONSTRAINT])) { foreach($data[self::FIELD_CONSTRAINT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRElementDefinitionConstraint) { $this->addConstraint($v); } else { @@ -3821,8 +3844,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DEFAULT_VALUE_BASE_64BINARY] instanceof FHIRBase64Binary) { $this->setDefaultValueBase64Binary($data[self::FIELD_DEFAULT_VALUE_BASE_64BINARY]); - } elseif ($ext && is_scalar($data[self::FIELD_DEFAULT_VALUE_BASE_64BINARY])) { - $this->setDefaultValueBase64Binary(new FHIRBase64Binary([FHIRBase64Binary::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_BASE_64BINARY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DEFAULT_VALUE_BASE_64BINARY])) { + $this->setDefaultValueBase64Binary(new FHIRBase64Binary([FHIRBase64Binary::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_BASE_64BINARY]] + $ext)); + } else if (is_array($data[self::FIELD_DEFAULT_VALUE_BASE_64BINARY])) { + $this->setDefaultValueBase64Binary(new FHIRBase64Binary(array_merge($ext, $data[self::FIELD_DEFAULT_VALUE_BASE_64BINARY]))); + } } else { $this->setDefaultValueBase64Binary(new FHIRBase64Binary($data[self::FIELD_DEFAULT_VALUE_BASE_64BINARY])); } @@ -3833,8 +3860,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DEFAULT_VALUE_BOOLEAN] instanceof FHIRBoolean) { $this->setDefaultValueBoolean($data[self::FIELD_DEFAULT_VALUE_BOOLEAN]); - } elseif ($ext && is_scalar($data[self::FIELD_DEFAULT_VALUE_BOOLEAN])) { - $this->setDefaultValueBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_BOOLEAN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DEFAULT_VALUE_BOOLEAN])) { + $this->setDefaultValueBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_BOOLEAN]] + $ext)); + } else if (is_array($data[self::FIELD_DEFAULT_VALUE_BOOLEAN])) { + $this->setDefaultValueBoolean(new FHIRBoolean(array_merge($ext, $data[self::FIELD_DEFAULT_VALUE_BOOLEAN]))); + } } else { $this->setDefaultValueBoolean(new FHIRBoolean($data[self::FIELD_DEFAULT_VALUE_BOOLEAN])); } @@ -3845,8 +3876,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DEFAULT_VALUE_CODE] instanceof FHIRCode) { $this->setDefaultValueCode($data[self::FIELD_DEFAULT_VALUE_CODE]); - } elseif ($ext && is_scalar($data[self::FIELD_DEFAULT_VALUE_CODE])) { - $this->setDefaultValueCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_CODE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DEFAULT_VALUE_CODE])) { + $this->setDefaultValueCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_CODE]] + $ext)); + } else if (is_array($data[self::FIELD_DEFAULT_VALUE_CODE])) { + $this->setDefaultValueCode(new FHIRCode(array_merge($ext, $data[self::FIELD_DEFAULT_VALUE_CODE]))); + } } else { $this->setDefaultValueCode(new FHIRCode($data[self::FIELD_DEFAULT_VALUE_CODE])); } @@ -3871,8 +3906,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DEFAULT_VALUE_CONTACT_POINT] instanceof FHIRContactPoint) { $this->setDefaultValueContactPoint($data[self::FIELD_DEFAULT_VALUE_CONTACT_POINT]); - } elseif ($ext && is_scalar($data[self::FIELD_DEFAULT_VALUE_CONTACT_POINT])) { - $this->setDefaultValueContactPoint(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_CONTACT_POINT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DEFAULT_VALUE_CONTACT_POINT])) { + $this->setDefaultValueContactPoint(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_CONTACT_POINT]] + $ext)); + } else if (is_array($data[self::FIELD_DEFAULT_VALUE_CONTACT_POINT])) { + $this->setDefaultValueContactPoint(new FHIRContactPoint(array_merge($ext, $data[self::FIELD_DEFAULT_VALUE_CONTACT_POINT]))); + } } else { $this->setDefaultValueContactPoint(new FHIRContactPoint($data[self::FIELD_DEFAULT_VALUE_CONTACT_POINT])); } @@ -3883,8 +3922,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DEFAULT_VALUE_DATE] instanceof FHIRDate) { $this->setDefaultValueDate($data[self::FIELD_DEFAULT_VALUE_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_DEFAULT_VALUE_DATE])) { - $this->setDefaultValueDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DEFAULT_VALUE_DATE])) { + $this->setDefaultValueDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_DEFAULT_VALUE_DATE])) { + $this->setDefaultValueDate(new FHIRDate(array_merge($ext, $data[self::FIELD_DEFAULT_VALUE_DATE]))); + } } else { $this->setDefaultValueDate(new FHIRDate($data[self::FIELD_DEFAULT_VALUE_DATE])); } @@ -3895,8 +3938,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DEFAULT_VALUE_DATE_TIME] instanceof FHIRDateTime) { $this->setDefaultValueDateTime($data[self::FIELD_DEFAULT_VALUE_DATE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_DEFAULT_VALUE_DATE_TIME])) { - $this->setDefaultValueDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_DATE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DEFAULT_VALUE_DATE_TIME])) { + $this->setDefaultValueDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_DATE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_DEFAULT_VALUE_DATE_TIME])) { + $this->setDefaultValueDateTime(new FHIRDateTime(array_merge($ext, $data[self::FIELD_DEFAULT_VALUE_DATE_TIME]))); + } } else { $this->setDefaultValueDateTime(new FHIRDateTime($data[self::FIELD_DEFAULT_VALUE_DATE_TIME])); } @@ -3907,8 +3954,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DEFAULT_VALUE_DECIMAL] instanceof FHIRDecimal) { $this->setDefaultValueDecimal($data[self::FIELD_DEFAULT_VALUE_DECIMAL]); - } elseif ($ext && is_scalar($data[self::FIELD_DEFAULT_VALUE_DECIMAL])) { - $this->setDefaultValueDecimal(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_DECIMAL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DEFAULT_VALUE_DECIMAL])) { + $this->setDefaultValueDecimal(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_DECIMAL]] + $ext)); + } else if (is_array($data[self::FIELD_DEFAULT_VALUE_DECIMAL])) { + $this->setDefaultValueDecimal(new FHIRDecimal(array_merge($ext, $data[self::FIELD_DEFAULT_VALUE_DECIMAL]))); + } } else { $this->setDefaultValueDecimal(new FHIRDecimal($data[self::FIELD_DEFAULT_VALUE_DECIMAL])); } @@ -3926,8 +3977,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DEFAULT_VALUE_ID] instanceof FHIRId) { $this->setDefaultValueId($data[self::FIELD_DEFAULT_VALUE_ID]); - } elseif ($ext && is_scalar($data[self::FIELD_DEFAULT_VALUE_ID])) { - $this->setDefaultValueId(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_ID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DEFAULT_VALUE_ID])) { + $this->setDefaultValueId(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_ID]] + $ext)); + } else if (is_array($data[self::FIELD_DEFAULT_VALUE_ID])) { + $this->setDefaultValueId(new FHIRId(array_merge($ext, $data[self::FIELD_DEFAULT_VALUE_ID]))); + } } else { $this->setDefaultValueId(new FHIRId($data[self::FIELD_DEFAULT_VALUE_ID])); } @@ -3938,8 +3993,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DEFAULT_VALUE_IDENTIFIER] instanceof FHIRIdentifier) { $this->setDefaultValueIdentifier($data[self::FIELD_DEFAULT_VALUE_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_DEFAULT_VALUE_IDENTIFIER])) { - $this->setDefaultValueIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DEFAULT_VALUE_IDENTIFIER])) { + $this->setDefaultValueIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_DEFAULT_VALUE_IDENTIFIER])) { + $this->setDefaultValueIdentifier(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_DEFAULT_VALUE_IDENTIFIER]))); + } } else { $this->setDefaultValueIdentifier(new FHIRIdentifier($data[self::FIELD_DEFAULT_VALUE_IDENTIFIER])); } @@ -3950,8 +4009,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DEFAULT_VALUE_INSTANT] instanceof FHIRInstant) { $this->setDefaultValueInstant($data[self::FIELD_DEFAULT_VALUE_INSTANT]); - } elseif ($ext && is_scalar($data[self::FIELD_DEFAULT_VALUE_INSTANT])) { - $this->setDefaultValueInstant(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_INSTANT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DEFAULT_VALUE_INSTANT])) { + $this->setDefaultValueInstant(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_INSTANT]] + $ext)); + } else if (is_array($data[self::FIELD_DEFAULT_VALUE_INSTANT])) { + $this->setDefaultValueInstant(new FHIRInstant(array_merge($ext, $data[self::FIELD_DEFAULT_VALUE_INSTANT]))); + } } else { $this->setDefaultValueInstant(new FHIRInstant($data[self::FIELD_DEFAULT_VALUE_INSTANT])); } @@ -3962,8 +4025,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DEFAULT_VALUE_INTEGER] instanceof FHIRInteger) { $this->setDefaultValueInteger($data[self::FIELD_DEFAULT_VALUE_INTEGER]); - } elseif ($ext && is_scalar($data[self::FIELD_DEFAULT_VALUE_INTEGER])) { - $this->setDefaultValueInteger(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_INTEGER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DEFAULT_VALUE_INTEGER])) { + $this->setDefaultValueInteger(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_INTEGER]] + $ext)); + } else if (is_array($data[self::FIELD_DEFAULT_VALUE_INTEGER])) { + $this->setDefaultValueInteger(new FHIRInteger(array_merge($ext, $data[self::FIELD_DEFAULT_VALUE_INTEGER]))); + } } else { $this->setDefaultValueInteger(new FHIRInteger($data[self::FIELD_DEFAULT_VALUE_INTEGER])); } @@ -3974,8 +4041,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DEFAULT_VALUE_MARKDOWN] instanceof FHIRMarkdown) { $this->setDefaultValueMarkdown($data[self::FIELD_DEFAULT_VALUE_MARKDOWN]); - } elseif ($ext && is_scalar($data[self::FIELD_DEFAULT_VALUE_MARKDOWN])) { - $this->setDefaultValueMarkdown(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_MARKDOWN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DEFAULT_VALUE_MARKDOWN])) { + $this->setDefaultValueMarkdown(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_MARKDOWN]] + $ext)); + } else if (is_array($data[self::FIELD_DEFAULT_VALUE_MARKDOWN])) { + $this->setDefaultValueMarkdown(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_DEFAULT_VALUE_MARKDOWN]))); + } } else { $this->setDefaultValueMarkdown(new FHIRMarkdown($data[self::FIELD_DEFAULT_VALUE_MARKDOWN])); } @@ -3993,8 +4064,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DEFAULT_VALUE_OID] instanceof FHIROid) { $this->setDefaultValueOid($data[self::FIELD_DEFAULT_VALUE_OID]); - } elseif ($ext && is_scalar($data[self::FIELD_DEFAULT_VALUE_OID])) { - $this->setDefaultValueOid(new FHIROid([FHIROid::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_OID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DEFAULT_VALUE_OID])) { + $this->setDefaultValueOid(new FHIROid([FHIROid::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_OID]] + $ext)); + } else if (is_array($data[self::FIELD_DEFAULT_VALUE_OID])) { + $this->setDefaultValueOid(new FHIROid(array_merge($ext, $data[self::FIELD_DEFAULT_VALUE_OID]))); + } } else { $this->setDefaultValueOid(new FHIROid($data[self::FIELD_DEFAULT_VALUE_OID])); } @@ -4012,8 +4087,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DEFAULT_VALUE_POSITIVE_INT] instanceof FHIRPositiveInt) { $this->setDefaultValuePositiveInt($data[self::FIELD_DEFAULT_VALUE_POSITIVE_INT]); - } elseif ($ext && is_scalar($data[self::FIELD_DEFAULT_VALUE_POSITIVE_INT])) { - $this->setDefaultValuePositiveInt(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_POSITIVE_INT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DEFAULT_VALUE_POSITIVE_INT])) { + $this->setDefaultValuePositiveInt(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_POSITIVE_INT]] + $ext)); + } else if (is_array($data[self::FIELD_DEFAULT_VALUE_POSITIVE_INT])) { + $this->setDefaultValuePositiveInt(new FHIRPositiveInt(array_merge($ext, $data[self::FIELD_DEFAULT_VALUE_POSITIVE_INT]))); + } } else { $this->setDefaultValuePositiveInt(new FHIRPositiveInt($data[self::FIELD_DEFAULT_VALUE_POSITIVE_INT])); } @@ -4024,8 +4103,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DEFAULT_VALUE_QUANTITY] instanceof FHIRQuantity) { $this->setDefaultValueQuantity($data[self::FIELD_DEFAULT_VALUE_QUANTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_DEFAULT_VALUE_QUANTITY])) { - $this->setDefaultValueQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_QUANTITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DEFAULT_VALUE_QUANTITY])) { + $this->setDefaultValueQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_DEFAULT_VALUE_QUANTITY])) { + $this->setDefaultValueQuantity(new FHIRQuantity(array_merge($ext, $data[self::FIELD_DEFAULT_VALUE_QUANTITY]))); + } } else { $this->setDefaultValueQuantity(new FHIRQuantity($data[self::FIELD_DEFAULT_VALUE_QUANTITY])); } @@ -4071,8 +4154,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DEFAULT_VALUE_STRING] instanceof FHIRString) { $this->setDefaultValueString($data[self::FIELD_DEFAULT_VALUE_STRING]); - } elseif ($ext && is_scalar($data[self::FIELD_DEFAULT_VALUE_STRING])) { - $this->setDefaultValueString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_STRING]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DEFAULT_VALUE_STRING])) { + $this->setDefaultValueString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_STRING]] + $ext)); + } else if (is_array($data[self::FIELD_DEFAULT_VALUE_STRING])) { + $this->setDefaultValueString(new FHIRString(array_merge($ext, $data[self::FIELD_DEFAULT_VALUE_STRING]))); + } } else { $this->setDefaultValueString(new FHIRString($data[self::FIELD_DEFAULT_VALUE_STRING])); } @@ -4083,8 +4170,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DEFAULT_VALUE_TIME] instanceof FHIRTime) { $this->setDefaultValueTime($data[self::FIELD_DEFAULT_VALUE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_DEFAULT_VALUE_TIME])) { - $this->setDefaultValueTime(new FHIRTime([FHIRTime::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DEFAULT_VALUE_TIME])) { + $this->setDefaultValueTime(new FHIRTime([FHIRTime::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_DEFAULT_VALUE_TIME])) { + $this->setDefaultValueTime(new FHIRTime(array_merge($ext, $data[self::FIELD_DEFAULT_VALUE_TIME]))); + } } else { $this->setDefaultValueTime(new FHIRTime($data[self::FIELD_DEFAULT_VALUE_TIME])); } @@ -4102,8 +4193,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DEFAULT_VALUE_UNSIGNED_INT] instanceof FHIRUnsignedInt) { $this->setDefaultValueUnsignedInt($data[self::FIELD_DEFAULT_VALUE_UNSIGNED_INT]); - } elseif ($ext && is_scalar($data[self::FIELD_DEFAULT_VALUE_UNSIGNED_INT])) { - $this->setDefaultValueUnsignedInt(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_UNSIGNED_INT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DEFAULT_VALUE_UNSIGNED_INT])) { + $this->setDefaultValueUnsignedInt(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_UNSIGNED_INT]] + $ext)); + } else if (is_array($data[self::FIELD_DEFAULT_VALUE_UNSIGNED_INT])) { + $this->setDefaultValueUnsignedInt(new FHIRUnsignedInt(array_merge($ext, $data[self::FIELD_DEFAULT_VALUE_UNSIGNED_INT]))); + } } else { $this->setDefaultValueUnsignedInt(new FHIRUnsignedInt($data[self::FIELD_DEFAULT_VALUE_UNSIGNED_INT])); } @@ -4114,8 +4209,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DEFAULT_VALUE_URI] instanceof FHIRUri) { $this->setDefaultValueUri($data[self::FIELD_DEFAULT_VALUE_URI]); - } elseif ($ext && is_scalar($data[self::FIELD_DEFAULT_VALUE_URI])) { - $this->setDefaultValueUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_URI]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DEFAULT_VALUE_URI])) { + $this->setDefaultValueUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_URI]] + $ext)); + } else if (is_array($data[self::FIELD_DEFAULT_VALUE_URI])) { + $this->setDefaultValueUri(new FHIRUri(array_merge($ext, $data[self::FIELD_DEFAULT_VALUE_URI]))); + } } else { $this->setDefaultValueUri(new FHIRUri($data[self::FIELD_DEFAULT_VALUE_URI])); } @@ -4126,8 +4225,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DEFAULT_VALUE_UUID] instanceof FHIRUuid) { $this->setDefaultValueUuid($data[self::FIELD_DEFAULT_VALUE_UUID]); - } elseif ($ext && is_scalar($data[self::FIELD_DEFAULT_VALUE_UUID])) { - $this->setDefaultValueUuid(new FHIRUuid([FHIRUuid::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_UUID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DEFAULT_VALUE_UUID])) { + $this->setDefaultValueUuid(new FHIRUuid([FHIRUuid::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_UUID]] + $ext)); + } else if (is_array($data[self::FIELD_DEFAULT_VALUE_UUID])) { + $this->setDefaultValueUuid(new FHIRUuid(array_merge($ext, $data[self::FIELD_DEFAULT_VALUE_UUID]))); + } } else { $this->setDefaultValueUuid(new FHIRUuid($data[self::FIELD_DEFAULT_VALUE_UUID])); } @@ -4138,8 +4241,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DEFINITION] instanceof FHIRMarkdown) { $this->setDefinition($data[self::FIELD_DEFINITION]); - } elseif ($ext && is_scalar($data[self::FIELD_DEFINITION])) { - $this->setDefinition(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_DEFINITION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DEFINITION])) { + $this->setDefinition(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_DEFINITION]] + $ext)); + } else if (is_array($data[self::FIELD_DEFINITION])) { + $this->setDefinition(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_DEFINITION]))); + } } else { $this->setDefinition(new FHIRMarkdown($data[self::FIELD_DEFINITION])); } @@ -4171,8 +4278,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EXAMPLE_BASE_64BINARY] instanceof FHIRBase64Binary) { $this->setExampleBase64Binary($data[self::FIELD_EXAMPLE_BASE_64BINARY]); - } elseif ($ext && is_scalar($data[self::FIELD_EXAMPLE_BASE_64BINARY])) { - $this->setExampleBase64Binary(new FHIRBase64Binary([FHIRBase64Binary::FIELD_VALUE => $data[self::FIELD_EXAMPLE_BASE_64BINARY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EXAMPLE_BASE_64BINARY])) { + $this->setExampleBase64Binary(new FHIRBase64Binary([FHIRBase64Binary::FIELD_VALUE => $data[self::FIELD_EXAMPLE_BASE_64BINARY]] + $ext)); + } else if (is_array($data[self::FIELD_EXAMPLE_BASE_64BINARY])) { + $this->setExampleBase64Binary(new FHIRBase64Binary(array_merge($ext, $data[self::FIELD_EXAMPLE_BASE_64BINARY]))); + } } else { $this->setExampleBase64Binary(new FHIRBase64Binary($data[self::FIELD_EXAMPLE_BASE_64BINARY])); } @@ -4183,8 +4294,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EXAMPLE_BOOLEAN] instanceof FHIRBoolean) { $this->setExampleBoolean($data[self::FIELD_EXAMPLE_BOOLEAN]); - } elseif ($ext && is_scalar($data[self::FIELD_EXAMPLE_BOOLEAN])) { - $this->setExampleBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_EXAMPLE_BOOLEAN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EXAMPLE_BOOLEAN])) { + $this->setExampleBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_EXAMPLE_BOOLEAN]] + $ext)); + } else if (is_array($data[self::FIELD_EXAMPLE_BOOLEAN])) { + $this->setExampleBoolean(new FHIRBoolean(array_merge($ext, $data[self::FIELD_EXAMPLE_BOOLEAN]))); + } } else { $this->setExampleBoolean(new FHIRBoolean($data[self::FIELD_EXAMPLE_BOOLEAN])); } @@ -4195,8 +4310,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EXAMPLE_CODE] instanceof FHIRCode) { $this->setExampleCode($data[self::FIELD_EXAMPLE_CODE]); - } elseif ($ext && is_scalar($data[self::FIELD_EXAMPLE_CODE])) { - $this->setExampleCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_EXAMPLE_CODE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EXAMPLE_CODE])) { + $this->setExampleCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_EXAMPLE_CODE]] + $ext)); + } else if (is_array($data[self::FIELD_EXAMPLE_CODE])) { + $this->setExampleCode(new FHIRCode(array_merge($ext, $data[self::FIELD_EXAMPLE_CODE]))); + } } else { $this->setExampleCode(new FHIRCode($data[self::FIELD_EXAMPLE_CODE])); } @@ -4221,8 +4340,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EXAMPLE_CONTACT_POINT] instanceof FHIRContactPoint) { $this->setExampleContactPoint($data[self::FIELD_EXAMPLE_CONTACT_POINT]); - } elseif ($ext && is_scalar($data[self::FIELD_EXAMPLE_CONTACT_POINT])) { - $this->setExampleContactPoint(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $data[self::FIELD_EXAMPLE_CONTACT_POINT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EXAMPLE_CONTACT_POINT])) { + $this->setExampleContactPoint(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $data[self::FIELD_EXAMPLE_CONTACT_POINT]] + $ext)); + } else if (is_array($data[self::FIELD_EXAMPLE_CONTACT_POINT])) { + $this->setExampleContactPoint(new FHIRContactPoint(array_merge($ext, $data[self::FIELD_EXAMPLE_CONTACT_POINT]))); + } } else { $this->setExampleContactPoint(new FHIRContactPoint($data[self::FIELD_EXAMPLE_CONTACT_POINT])); } @@ -4233,8 +4356,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EXAMPLE_DATE] instanceof FHIRDate) { $this->setExampleDate($data[self::FIELD_EXAMPLE_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_EXAMPLE_DATE])) { - $this->setExampleDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_EXAMPLE_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EXAMPLE_DATE])) { + $this->setExampleDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_EXAMPLE_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_EXAMPLE_DATE])) { + $this->setExampleDate(new FHIRDate(array_merge($ext, $data[self::FIELD_EXAMPLE_DATE]))); + } } else { $this->setExampleDate(new FHIRDate($data[self::FIELD_EXAMPLE_DATE])); } @@ -4245,8 +4372,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EXAMPLE_DATE_TIME] instanceof FHIRDateTime) { $this->setExampleDateTime($data[self::FIELD_EXAMPLE_DATE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_EXAMPLE_DATE_TIME])) { - $this->setExampleDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_EXAMPLE_DATE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EXAMPLE_DATE_TIME])) { + $this->setExampleDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_EXAMPLE_DATE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_EXAMPLE_DATE_TIME])) { + $this->setExampleDateTime(new FHIRDateTime(array_merge($ext, $data[self::FIELD_EXAMPLE_DATE_TIME]))); + } } else { $this->setExampleDateTime(new FHIRDateTime($data[self::FIELD_EXAMPLE_DATE_TIME])); } @@ -4257,8 +4388,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EXAMPLE_DECIMAL] instanceof FHIRDecimal) { $this->setExampleDecimal($data[self::FIELD_EXAMPLE_DECIMAL]); - } elseif ($ext && is_scalar($data[self::FIELD_EXAMPLE_DECIMAL])) { - $this->setExampleDecimal(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_EXAMPLE_DECIMAL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EXAMPLE_DECIMAL])) { + $this->setExampleDecimal(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_EXAMPLE_DECIMAL]] + $ext)); + } else if (is_array($data[self::FIELD_EXAMPLE_DECIMAL])) { + $this->setExampleDecimal(new FHIRDecimal(array_merge($ext, $data[self::FIELD_EXAMPLE_DECIMAL]))); + } } else { $this->setExampleDecimal(new FHIRDecimal($data[self::FIELD_EXAMPLE_DECIMAL])); } @@ -4276,8 +4411,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EXAMPLE_ID] instanceof FHIRId) { $this->setExampleId($data[self::FIELD_EXAMPLE_ID]); - } elseif ($ext && is_scalar($data[self::FIELD_EXAMPLE_ID])) { - $this->setExampleId(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_EXAMPLE_ID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EXAMPLE_ID])) { + $this->setExampleId(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_EXAMPLE_ID]] + $ext)); + } else if (is_array($data[self::FIELD_EXAMPLE_ID])) { + $this->setExampleId(new FHIRId(array_merge($ext, $data[self::FIELD_EXAMPLE_ID]))); + } } else { $this->setExampleId(new FHIRId($data[self::FIELD_EXAMPLE_ID])); } @@ -4288,8 +4427,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EXAMPLE_IDENTIFIER] instanceof FHIRIdentifier) { $this->setExampleIdentifier($data[self::FIELD_EXAMPLE_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_EXAMPLE_IDENTIFIER])) { - $this->setExampleIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_EXAMPLE_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EXAMPLE_IDENTIFIER])) { + $this->setExampleIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_EXAMPLE_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_EXAMPLE_IDENTIFIER])) { + $this->setExampleIdentifier(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_EXAMPLE_IDENTIFIER]))); + } } else { $this->setExampleIdentifier(new FHIRIdentifier($data[self::FIELD_EXAMPLE_IDENTIFIER])); } @@ -4300,8 +4443,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EXAMPLE_INSTANT] instanceof FHIRInstant) { $this->setExampleInstant($data[self::FIELD_EXAMPLE_INSTANT]); - } elseif ($ext && is_scalar($data[self::FIELD_EXAMPLE_INSTANT])) { - $this->setExampleInstant(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_EXAMPLE_INSTANT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EXAMPLE_INSTANT])) { + $this->setExampleInstant(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_EXAMPLE_INSTANT]] + $ext)); + } else if (is_array($data[self::FIELD_EXAMPLE_INSTANT])) { + $this->setExampleInstant(new FHIRInstant(array_merge($ext, $data[self::FIELD_EXAMPLE_INSTANT]))); + } } else { $this->setExampleInstant(new FHIRInstant($data[self::FIELD_EXAMPLE_INSTANT])); } @@ -4312,8 +4459,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EXAMPLE_INTEGER] instanceof FHIRInteger) { $this->setExampleInteger($data[self::FIELD_EXAMPLE_INTEGER]); - } elseif ($ext && is_scalar($data[self::FIELD_EXAMPLE_INTEGER])) { - $this->setExampleInteger(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_EXAMPLE_INTEGER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EXAMPLE_INTEGER])) { + $this->setExampleInteger(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_EXAMPLE_INTEGER]] + $ext)); + } else if (is_array($data[self::FIELD_EXAMPLE_INTEGER])) { + $this->setExampleInteger(new FHIRInteger(array_merge($ext, $data[self::FIELD_EXAMPLE_INTEGER]))); + } } else { $this->setExampleInteger(new FHIRInteger($data[self::FIELD_EXAMPLE_INTEGER])); } @@ -4324,8 +4475,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EXAMPLE_MARKDOWN] instanceof FHIRMarkdown) { $this->setExampleMarkdown($data[self::FIELD_EXAMPLE_MARKDOWN]); - } elseif ($ext && is_scalar($data[self::FIELD_EXAMPLE_MARKDOWN])) { - $this->setExampleMarkdown(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_EXAMPLE_MARKDOWN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EXAMPLE_MARKDOWN])) { + $this->setExampleMarkdown(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_EXAMPLE_MARKDOWN]] + $ext)); + } else if (is_array($data[self::FIELD_EXAMPLE_MARKDOWN])) { + $this->setExampleMarkdown(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_EXAMPLE_MARKDOWN]))); + } } else { $this->setExampleMarkdown(new FHIRMarkdown($data[self::FIELD_EXAMPLE_MARKDOWN])); } @@ -4343,8 +4498,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EXAMPLE_OID] instanceof FHIROid) { $this->setExampleOid($data[self::FIELD_EXAMPLE_OID]); - } elseif ($ext && is_scalar($data[self::FIELD_EXAMPLE_OID])) { - $this->setExampleOid(new FHIROid([FHIROid::FIELD_VALUE => $data[self::FIELD_EXAMPLE_OID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EXAMPLE_OID])) { + $this->setExampleOid(new FHIROid([FHIROid::FIELD_VALUE => $data[self::FIELD_EXAMPLE_OID]] + $ext)); + } else if (is_array($data[self::FIELD_EXAMPLE_OID])) { + $this->setExampleOid(new FHIROid(array_merge($ext, $data[self::FIELD_EXAMPLE_OID]))); + } } else { $this->setExampleOid(new FHIROid($data[self::FIELD_EXAMPLE_OID])); } @@ -4362,8 +4521,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EXAMPLE_POSITIVE_INT] instanceof FHIRPositiveInt) { $this->setExamplePositiveInt($data[self::FIELD_EXAMPLE_POSITIVE_INT]); - } elseif ($ext && is_scalar($data[self::FIELD_EXAMPLE_POSITIVE_INT])) { - $this->setExamplePositiveInt(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_EXAMPLE_POSITIVE_INT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EXAMPLE_POSITIVE_INT])) { + $this->setExamplePositiveInt(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_EXAMPLE_POSITIVE_INT]] + $ext)); + } else if (is_array($data[self::FIELD_EXAMPLE_POSITIVE_INT])) { + $this->setExamplePositiveInt(new FHIRPositiveInt(array_merge($ext, $data[self::FIELD_EXAMPLE_POSITIVE_INT]))); + } } else { $this->setExamplePositiveInt(new FHIRPositiveInt($data[self::FIELD_EXAMPLE_POSITIVE_INT])); } @@ -4374,8 +4537,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EXAMPLE_QUANTITY] instanceof FHIRQuantity) { $this->setExampleQuantity($data[self::FIELD_EXAMPLE_QUANTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_EXAMPLE_QUANTITY])) { - $this->setExampleQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_EXAMPLE_QUANTITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EXAMPLE_QUANTITY])) { + $this->setExampleQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_EXAMPLE_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_EXAMPLE_QUANTITY])) { + $this->setExampleQuantity(new FHIRQuantity(array_merge($ext, $data[self::FIELD_EXAMPLE_QUANTITY]))); + } } else { $this->setExampleQuantity(new FHIRQuantity($data[self::FIELD_EXAMPLE_QUANTITY])); } @@ -4421,8 +4588,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EXAMPLE_STRING] instanceof FHIRString) { $this->setExampleString($data[self::FIELD_EXAMPLE_STRING]); - } elseif ($ext && is_scalar($data[self::FIELD_EXAMPLE_STRING])) { - $this->setExampleString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_EXAMPLE_STRING]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EXAMPLE_STRING])) { + $this->setExampleString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_EXAMPLE_STRING]] + $ext)); + } else if (is_array($data[self::FIELD_EXAMPLE_STRING])) { + $this->setExampleString(new FHIRString(array_merge($ext, $data[self::FIELD_EXAMPLE_STRING]))); + } } else { $this->setExampleString(new FHIRString($data[self::FIELD_EXAMPLE_STRING])); } @@ -4433,8 +4604,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EXAMPLE_TIME] instanceof FHIRTime) { $this->setExampleTime($data[self::FIELD_EXAMPLE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_EXAMPLE_TIME])) { - $this->setExampleTime(new FHIRTime([FHIRTime::FIELD_VALUE => $data[self::FIELD_EXAMPLE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EXAMPLE_TIME])) { + $this->setExampleTime(new FHIRTime([FHIRTime::FIELD_VALUE => $data[self::FIELD_EXAMPLE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_EXAMPLE_TIME])) { + $this->setExampleTime(new FHIRTime(array_merge($ext, $data[self::FIELD_EXAMPLE_TIME]))); + } } else { $this->setExampleTime(new FHIRTime($data[self::FIELD_EXAMPLE_TIME])); } @@ -4452,8 +4627,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EXAMPLE_UNSIGNED_INT] instanceof FHIRUnsignedInt) { $this->setExampleUnsignedInt($data[self::FIELD_EXAMPLE_UNSIGNED_INT]); - } elseif ($ext && is_scalar($data[self::FIELD_EXAMPLE_UNSIGNED_INT])) { - $this->setExampleUnsignedInt(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_EXAMPLE_UNSIGNED_INT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EXAMPLE_UNSIGNED_INT])) { + $this->setExampleUnsignedInt(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_EXAMPLE_UNSIGNED_INT]] + $ext)); + } else if (is_array($data[self::FIELD_EXAMPLE_UNSIGNED_INT])) { + $this->setExampleUnsignedInt(new FHIRUnsignedInt(array_merge($ext, $data[self::FIELD_EXAMPLE_UNSIGNED_INT]))); + } } else { $this->setExampleUnsignedInt(new FHIRUnsignedInt($data[self::FIELD_EXAMPLE_UNSIGNED_INT])); } @@ -4464,8 +4643,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EXAMPLE_URI] instanceof FHIRUri) { $this->setExampleUri($data[self::FIELD_EXAMPLE_URI]); - } elseif ($ext && is_scalar($data[self::FIELD_EXAMPLE_URI])) { - $this->setExampleUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_EXAMPLE_URI]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EXAMPLE_URI])) { + $this->setExampleUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_EXAMPLE_URI]] + $ext)); + } else if (is_array($data[self::FIELD_EXAMPLE_URI])) { + $this->setExampleUri(new FHIRUri(array_merge($ext, $data[self::FIELD_EXAMPLE_URI]))); + } } else { $this->setExampleUri(new FHIRUri($data[self::FIELD_EXAMPLE_URI])); } @@ -4476,8 +4659,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EXAMPLE_UUID] instanceof FHIRUuid) { $this->setExampleUuid($data[self::FIELD_EXAMPLE_UUID]); - } elseif ($ext && is_scalar($data[self::FIELD_EXAMPLE_UUID])) { - $this->setExampleUuid(new FHIRUuid([FHIRUuid::FIELD_VALUE => $data[self::FIELD_EXAMPLE_UUID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EXAMPLE_UUID])) { + $this->setExampleUuid(new FHIRUuid([FHIRUuid::FIELD_VALUE => $data[self::FIELD_EXAMPLE_UUID]] + $ext)); + } else if (is_array($data[self::FIELD_EXAMPLE_UUID])) { + $this->setExampleUuid(new FHIRUuid(array_merge($ext, $data[self::FIELD_EXAMPLE_UUID]))); + } } else { $this->setExampleUuid(new FHIRUuid($data[self::FIELD_EXAMPLE_UUID])); } @@ -4509,8 +4696,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_FIXED_BASE_64BINARY] instanceof FHIRBase64Binary) { $this->setFixedBase64Binary($data[self::FIELD_FIXED_BASE_64BINARY]); - } elseif ($ext && is_scalar($data[self::FIELD_FIXED_BASE_64BINARY])) { - $this->setFixedBase64Binary(new FHIRBase64Binary([FHIRBase64Binary::FIELD_VALUE => $data[self::FIELD_FIXED_BASE_64BINARY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_FIXED_BASE_64BINARY])) { + $this->setFixedBase64Binary(new FHIRBase64Binary([FHIRBase64Binary::FIELD_VALUE => $data[self::FIELD_FIXED_BASE_64BINARY]] + $ext)); + } else if (is_array($data[self::FIELD_FIXED_BASE_64BINARY])) { + $this->setFixedBase64Binary(new FHIRBase64Binary(array_merge($ext, $data[self::FIELD_FIXED_BASE_64BINARY]))); + } } else { $this->setFixedBase64Binary(new FHIRBase64Binary($data[self::FIELD_FIXED_BASE_64BINARY])); } @@ -4521,8 +4712,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_FIXED_BOOLEAN] instanceof FHIRBoolean) { $this->setFixedBoolean($data[self::FIELD_FIXED_BOOLEAN]); - } elseif ($ext && is_scalar($data[self::FIELD_FIXED_BOOLEAN])) { - $this->setFixedBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_FIXED_BOOLEAN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_FIXED_BOOLEAN])) { + $this->setFixedBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_FIXED_BOOLEAN]] + $ext)); + } else if (is_array($data[self::FIELD_FIXED_BOOLEAN])) { + $this->setFixedBoolean(new FHIRBoolean(array_merge($ext, $data[self::FIELD_FIXED_BOOLEAN]))); + } } else { $this->setFixedBoolean(new FHIRBoolean($data[self::FIELD_FIXED_BOOLEAN])); } @@ -4533,8 +4728,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_FIXED_CODE] instanceof FHIRCode) { $this->setFixedCode($data[self::FIELD_FIXED_CODE]); - } elseif ($ext && is_scalar($data[self::FIELD_FIXED_CODE])) { - $this->setFixedCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_FIXED_CODE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_FIXED_CODE])) { + $this->setFixedCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_FIXED_CODE]] + $ext)); + } else if (is_array($data[self::FIELD_FIXED_CODE])) { + $this->setFixedCode(new FHIRCode(array_merge($ext, $data[self::FIELD_FIXED_CODE]))); + } } else { $this->setFixedCode(new FHIRCode($data[self::FIELD_FIXED_CODE])); } @@ -4559,8 +4758,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_FIXED_CONTACT_POINT] instanceof FHIRContactPoint) { $this->setFixedContactPoint($data[self::FIELD_FIXED_CONTACT_POINT]); - } elseif ($ext && is_scalar($data[self::FIELD_FIXED_CONTACT_POINT])) { - $this->setFixedContactPoint(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $data[self::FIELD_FIXED_CONTACT_POINT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_FIXED_CONTACT_POINT])) { + $this->setFixedContactPoint(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $data[self::FIELD_FIXED_CONTACT_POINT]] + $ext)); + } else if (is_array($data[self::FIELD_FIXED_CONTACT_POINT])) { + $this->setFixedContactPoint(new FHIRContactPoint(array_merge($ext, $data[self::FIELD_FIXED_CONTACT_POINT]))); + } } else { $this->setFixedContactPoint(new FHIRContactPoint($data[self::FIELD_FIXED_CONTACT_POINT])); } @@ -4571,8 +4774,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_FIXED_DATE] instanceof FHIRDate) { $this->setFixedDate($data[self::FIELD_FIXED_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_FIXED_DATE])) { - $this->setFixedDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_FIXED_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_FIXED_DATE])) { + $this->setFixedDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_FIXED_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_FIXED_DATE])) { + $this->setFixedDate(new FHIRDate(array_merge($ext, $data[self::FIELD_FIXED_DATE]))); + } } else { $this->setFixedDate(new FHIRDate($data[self::FIELD_FIXED_DATE])); } @@ -4583,8 +4790,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_FIXED_DATE_TIME] instanceof FHIRDateTime) { $this->setFixedDateTime($data[self::FIELD_FIXED_DATE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_FIXED_DATE_TIME])) { - $this->setFixedDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_FIXED_DATE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_FIXED_DATE_TIME])) { + $this->setFixedDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_FIXED_DATE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_FIXED_DATE_TIME])) { + $this->setFixedDateTime(new FHIRDateTime(array_merge($ext, $data[self::FIELD_FIXED_DATE_TIME]))); + } } else { $this->setFixedDateTime(new FHIRDateTime($data[self::FIELD_FIXED_DATE_TIME])); } @@ -4595,8 +4806,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_FIXED_DECIMAL] instanceof FHIRDecimal) { $this->setFixedDecimal($data[self::FIELD_FIXED_DECIMAL]); - } elseif ($ext && is_scalar($data[self::FIELD_FIXED_DECIMAL])) { - $this->setFixedDecimal(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_FIXED_DECIMAL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_FIXED_DECIMAL])) { + $this->setFixedDecimal(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_FIXED_DECIMAL]] + $ext)); + } else if (is_array($data[self::FIELD_FIXED_DECIMAL])) { + $this->setFixedDecimal(new FHIRDecimal(array_merge($ext, $data[self::FIELD_FIXED_DECIMAL]))); + } } else { $this->setFixedDecimal(new FHIRDecimal($data[self::FIELD_FIXED_DECIMAL])); } @@ -4614,8 +4829,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_FIXED_ID] instanceof FHIRId) { $this->setFixedId($data[self::FIELD_FIXED_ID]); - } elseif ($ext && is_scalar($data[self::FIELD_FIXED_ID])) { - $this->setFixedId(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_FIXED_ID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_FIXED_ID])) { + $this->setFixedId(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_FIXED_ID]] + $ext)); + } else if (is_array($data[self::FIELD_FIXED_ID])) { + $this->setFixedId(new FHIRId(array_merge($ext, $data[self::FIELD_FIXED_ID]))); + } } else { $this->setFixedId(new FHIRId($data[self::FIELD_FIXED_ID])); } @@ -4626,8 +4845,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_FIXED_IDENTIFIER] instanceof FHIRIdentifier) { $this->setFixedIdentifier($data[self::FIELD_FIXED_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_FIXED_IDENTIFIER])) { - $this->setFixedIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_FIXED_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_FIXED_IDENTIFIER])) { + $this->setFixedIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_FIXED_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_FIXED_IDENTIFIER])) { + $this->setFixedIdentifier(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_FIXED_IDENTIFIER]))); + } } else { $this->setFixedIdentifier(new FHIRIdentifier($data[self::FIELD_FIXED_IDENTIFIER])); } @@ -4638,8 +4861,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_FIXED_INSTANT] instanceof FHIRInstant) { $this->setFixedInstant($data[self::FIELD_FIXED_INSTANT]); - } elseif ($ext && is_scalar($data[self::FIELD_FIXED_INSTANT])) { - $this->setFixedInstant(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_FIXED_INSTANT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_FIXED_INSTANT])) { + $this->setFixedInstant(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_FIXED_INSTANT]] + $ext)); + } else if (is_array($data[self::FIELD_FIXED_INSTANT])) { + $this->setFixedInstant(new FHIRInstant(array_merge($ext, $data[self::FIELD_FIXED_INSTANT]))); + } } else { $this->setFixedInstant(new FHIRInstant($data[self::FIELD_FIXED_INSTANT])); } @@ -4650,8 +4877,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_FIXED_INTEGER] instanceof FHIRInteger) { $this->setFixedInteger($data[self::FIELD_FIXED_INTEGER]); - } elseif ($ext && is_scalar($data[self::FIELD_FIXED_INTEGER])) { - $this->setFixedInteger(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_FIXED_INTEGER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_FIXED_INTEGER])) { + $this->setFixedInteger(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_FIXED_INTEGER]] + $ext)); + } else if (is_array($data[self::FIELD_FIXED_INTEGER])) { + $this->setFixedInteger(new FHIRInteger(array_merge($ext, $data[self::FIELD_FIXED_INTEGER]))); + } } else { $this->setFixedInteger(new FHIRInteger($data[self::FIELD_FIXED_INTEGER])); } @@ -4662,8 +4893,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_FIXED_MARKDOWN] instanceof FHIRMarkdown) { $this->setFixedMarkdown($data[self::FIELD_FIXED_MARKDOWN]); - } elseif ($ext && is_scalar($data[self::FIELD_FIXED_MARKDOWN])) { - $this->setFixedMarkdown(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_FIXED_MARKDOWN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_FIXED_MARKDOWN])) { + $this->setFixedMarkdown(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_FIXED_MARKDOWN]] + $ext)); + } else if (is_array($data[self::FIELD_FIXED_MARKDOWN])) { + $this->setFixedMarkdown(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_FIXED_MARKDOWN]))); + } } else { $this->setFixedMarkdown(new FHIRMarkdown($data[self::FIELD_FIXED_MARKDOWN])); } @@ -4681,8 +4916,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_FIXED_OID] instanceof FHIROid) { $this->setFixedOid($data[self::FIELD_FIXED_OID]); - } elseif ($ext && is_scalar($data[self::FIELD_FIXED_OID])) { - $this->setFixedOid(new FHIROid([FHIROid::FIELD_VALUE => $data[self::FIELD_FIXED_OID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_FIXED_OID])) { + $this->setFixedOid(new FHIROid([FHIROid::FIELD_VALUE => $data[self::FIELD_FIXED_OID]] + $ext)); + } else if (is_array($data[self::FIELD_FIXED_OID])) { + $this->setFixedOid(new FHIROid(array_merge($ext, $data[self::FIELD_FIXED_OID]))); + } } else { $this->setFixedOid(new FHIROid($data[self::FIELD_FIXED_OID])); } @@ -4700,8 +4939,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_FIXED_POSITIVE_INT] instanceof FHIRPositiveInt) { $this->setFixedPositiveInt($data[self::FIELD_FIXED_POSITIVE_INT]); - } elseif ($ext && is_scalar($data[self::FIELD_FIXED_POSITIVE_INT])) { - $this->setFixedPositiveInt(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_FIXED_POSITIVE_INT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_FIXED_POSITIVE_INT])) { + $this->setFixedPositiveInt(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_FIXED_POSITIVE_INT]] + $ext)); + } else if (is_array($data[self::FIELD_FIXED_POSITIVE_INT])) { + $this->setFixedPositiveInt(new FHIRPositiveInt(array_merge($ext, $data[self::FIELD_FIXED_POSITIVE_INT]))); + } } else { $this->setFixedPositiveInt(new FHIRPositiveInt($data[self::FIELD_FIXED_POSITIVE_INT])); } @@ -4712,8 +4955,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_FIXED_QUANTITY] instanceof FHIRQuantity) { $this->setFixedQuantity($data[self::FIELD_FIXED_QUANTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_FIXED_QUANTITY])) { - $this->setFixedQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_FIXED_QUANTITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_FIXED_QUANTITY])) { + $this->setFixedQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_FIXED_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_FIXED_QUANTITY])) { + $this->setFixedQuantity(new FHIRQuantity(array_merge($ext, $data[self::FIELD_FIXED_QUANTITY]))); + } } else { $this->setFixedQuantity(new FHIRQuantity($data[self::FIELD_FIXED_QUANTITY])); } @@ -4759,8 +5006,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_FIXED_STRING] instanceof FHIRString) { $this->setFixedString($data[self::FIELD_FIXED_STRING]); - } elseif ($ext && is_scalar($data[self::FIELD_FIXED_STRING])) { - $this->setFixedString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_FIXED_STRING]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_FIXED_STRING])) { + $this->setFixedString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_FIXED_STRING]] + $ext)); + } else if (is_array($data[self::FIELD_FIXED_STRING])) { + $this->setFixedString(new FHIRString(array_merge($ext, $data[self::FIELD_FIXED_STRING]))); + } } else { $this->setFixedString(new FHIRString($data[self::FIELD_FIXED_STRING])); } @@ -4771,8 +5022,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_FIXED_TIME] instanceof FHIRTime) { $this->setFixedTime($data[self::FIELD_FIXED_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_FIXED_TIME])) { - $this->setFixedTime(new FHIRTime([FHIRTime::FIELD_VALUE => $data[self::FIELD_FIXED_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_FIXED_TIME])) { + $this->setFixedTime(new FHIRTime([FHIRTime::FIELD_VALUE => $data[self::FIELD_FIXED_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_FIXED_TIME])) { + $this->setFixedTime(new FHIRTime(array_merge($ext, $data[self::FIELD_FIXED_TIME]))); + } } else { $this->setFixedTime(new FHIRTime($data[self::FIELD_FIXED_TIME])); } @@ -4790,8 +5045,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_FIXED_UNSIGNED_INT] instanceof FHIRUnsignedInt) { $this->setFixedUnsignedInt($data[self::FIELD_FIXED_UNSIGNED_INT]); - } elseif ($ext && is_scalar($data[self::FIELD_FIXED_UNSIGNED_INT])) { - $this->setFixedUnsignedInt(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_FIXED_UNSIGNED_INT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_FIXED_UNSIGNED_INT])) { + $this->setFixedUnsignedInt(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_FIXED_UNSIGNED_INT]] + $ext)); + } else if (is_array($data[self::FIELD_FIXED_UNSIGNED_INT])) { + $this->setFixedUnsignedInt(new FHIRUnsignedInt(array_merge($ext, $data[self::FIELD_FIXED_UNSIGNED_INT]))); + } } else { $this->setFixedUnsignedInt(new FHIRUnsignedInt($data[self::FIELD_FIXED_UNSIGNED_INT])); } @@ -4802,8 +5061,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_FIXED_URI] instanceof FHIRUri) { $this->setFixedUri($data[self::FIELD_FIXED_URI]); - } elseif ($ext && is_scalar($data[self::FIELD_FIXED_URI])) { - $this->setFixedUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_FIXED_URI]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_FIXED_URI])) { + $this->setFixedUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_FIXED_URI]] + $ext)); + } else if (is_array($data[self::FIELD_FIXED_URI])) { + $this->setFixedUri(new FHIRUri(array_merge($ext, $data[self::FIELD_FIXED_URI]))); + } } else { $this->setFixedUri(new FHIRUri($data[self::FIELD_FIXED_URI])); } @@ -4814,8 +5077,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_FIXED_UUID] instanceof FHIRUuid) { $this->setFixedUuid($data[self::FIELD_FIXED_UUID]); - } elseif ($ext && is_scalar($data[self::FIELD_FIXED_UUID])) { - $this->setFixedUuid(new FHIRUuid([FHIRUuid::FIELD_VALUE => $data[self::FIELD_FIXED_UUID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_FIXED_UUID])) { + $this->setFixedUuid(new FHIRUuid([FHIRUuid::FIELD_VALUE => $data[self::FIELD_FIXED_UUID]] + $ext)); + } else if (is_array($data[self::FIELD_FIXED_UUID])) { + $this->setFixedUuid(new FHIRUuid(array_merge($ext, $data[self::FIELD_FIXED_UUID]))); + } } else { $this->setFixedUuid(new FHIRUuid($data[self::FIELD_FIXED_UUID])); } @@ -4826,8 +5093,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IS_MODIFIER] instanceof FHIRBoolean) { $this->setIsModifier($data[self::FIELD_IS_MODIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IS_MODIFIER])) { - $this->setIsModifier(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_IS_MODIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IS_MODIFIER])) { + $this->setIsModifier(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_IS_MODIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_IS_MODIFIER])) { + $this->setIsModifier(new FHIRBoolean(array_merge($ext, $data[self::FIELD_IS_MODIFIER]))); + } } else { $this->setIsModifier(new FHIRBoolean($data[self::FIELD_IS_MODIFIER])); } @@ -4838,8 +5109,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IS_SUMMARY] instanceof FHIRBoolean) { $this->setIsSummary($data[self::FIELD_IS_SUMMARY]); - } elseif ($ext && is_scalar($data[self::FIELD_IS_SUMMARY])) { - $this->setIsSummary(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_IS_SUMMARY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IS_SUMMARY])) { + $this->setIsSummary(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_IS_SUMMARY]] + $ext)); + } else if (is_array($data[self::FIELD_IS_SUMMARY])) { + $this->setIsSummary(new FHIRBoolean(array_merge($ext, $data[self::FIELD_IS_SUMMARY]))); + } } else { $this->setIsSummary(new FHIRBoolean($data[self::FIELD_IS_SUMMARY])); } @@ -4850,8 +5125,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_LABEL] instanceof FHIRString) { $this->setLabel($data[self::FIELD_LABEL]); - } elseif ($ext && is_scalar($data[self::FIELD_LABEL])) { - $this->setLabel(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_LABEL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_LABEL])) { + $this->setLabel(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_LABEL]] + $ext)); + } else if (is_array($data[self::FIELD_LABEL])) { + $this->setLabel(new FHIRString(array_merge($ext, $data[self::FIELD_LABEL]))); + } } else { $this->setLabel(new FHIRString($data[self::FIELD_LABEL])); } @@ -4859,6 +5138,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_MAPPING])) { if (is_array($data[self::FIELD_MAPPING])) { foreach($data[self::FIELD_MAPPING] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRElementDefinitionMapping) { $this->addMapping($v); } else { @@ -4877,8 +5159,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MAX] instanceof FHIRString) { $this->setMax($data[self::FIELD_MAX]); - } elseif ($ext && is_scalar($data[self::FIELD_MAX])) { - $this->setMax(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_MAX]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MAX])) { + $this->setMax(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_MAX]] + $ext)); + } else if (is_array($data[self::FIELD_MAX])) { + $this->setMax(new FHIRString(array_merge($ext, $data[self::FIELD_MAX]))); + } } else { $this->setMax(new FHIRString($data[self::FIELD_MAX])); } @@ -4889,8 +5175,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MAX_LENGTH] instanceof FHIRInteger) { $this->setMaxLength($data[self::FIELD_MAX_LENGTH]); - } elseif ($ext && is_scalar($data[self::FIELD_MAX_LENGTH])) { - $this->setMaxLength(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_MAX_LENGTH]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MAX_LENGTH])) { + $this->setMaxLength(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_MAX_LENGTH]] + $ext)); + } else if (is_array($data[self::FIELD_MAX_LENGTH])) { + $this->setMaxLength(new FHIRInteger(array_merge($ext, $data[self::FIELD_MAX_LENGTH]))); + } } else { $this->setMaxLength(new FHIRInteger($data[self::FIELD_MAX_LENGTH])); } @@ -4922,8 +5212,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MAX_VALUE_BASE_64BINARY] instanceof FHIRBase64Binary) { $this->setMaxValueBase64Binary($data[self::FIELD_MAX_VALUE_BASE_64BINARY]); - } elseif ($ext && is_scalar($data[self::FIELD_MAX_VALUE_BASE_64BINARY])) { - $this->setMaxValueBase64Binary(new FHIRBase64Binary([FHIRBase64Binary::FIELD_VALUE => $data[self::FIELD_MAX_VALUE_BASE_64BINARY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MAX_VALUE_BASE_64BINARY])) { + $this->setMaxValueBase64Binary(new FHIRBase64Binary([FHIRBase64Binary::FIELD_VALUE => $data[self::FIELD_MAX_VALUE_BASE_64BINARY]] + $ext)); + } else if (is_array($data[self::FIELD_MAX_VALUE_BASE_64BINARY])) { + $this->setMaxValueBase64Binary(new FHIRBase64Binary(array_merge($ext, $data[self::FIELD_MAX_VALUE_BASE_64BINARY]))); + } } else { $this->setMaxValueBase64Binary(new FHIRBase64Binary($data[self::FIELD_MAX_VALUE_BASE_64BINARY])); } @@ -4934,8 +5228,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MAX_VALUE_BOOLEAN] instanceof FHIRBoolean) { $this->setMaxValueBoolean($data[self::FIELD_MAX_VALUE_BOOLEAN]); - } elseif ($ext && is_scalar($data[self::FIELD_MAX_VALUE_BOOLEAN])) { - $this->setMaxValueBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_MAX_VALUE_BOOLEAN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MAX_VALUE_BOOLEAN])) { + $this->setMaxValueBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_MAX_VALUE_BOOLEAN]] + $ext)); + } else if (is_array($data[self::FIELD_MAX_VALUE_BOOLEAN])) { + $this->setMaxValueBoolean(new FHIRBoolean(array_merge($ext, $data[self::FIELD_MAX_VALUE_BOOLEAN]))); + } } else { $this->setMaxValueBoolean(new FHIRBoolean($data[self::FIELD_MAX_VALUE_BOOLEAN])); } @@ -4946,8 +5244,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MAX_VALUE_CODE] instanceof FHIRCode) { $this->setMaxValueCode($data[self::FIELD_MAX_VALUE_CODE]); - } elseif ($ext && is_scalar($data[self::FIELD_MAX_VALUE_CODE])) { - $this->setMaxValueCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_MAX_VALUE_CODE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MAX_VALUE_CODE])) { + $this->setMaxValueCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_MAX_VALUE_CODE]] + $ext)); + } else if (is_array($data[self::FIELD_MAX_VALUE_CODE])) { + $this->setMaxValueCode(new FHIRCode(array_merge($ext, $data[self::FIELD_MAX_VALUE_CODE]))); + } } else { $this->setMaxValueCode(new FHIRCode($data[self::FIELD_MAX_VALUE_CODE])); } @@ -4972,8 +5274,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MAX_VALUE_CONTACT_POINT] instanceof FHIRContactPoint) { $this->setMaxValueContactPoint($data[self::FIELD_MAX_VALUE_CONTACT_POINT]); - } elseif ($ext && is_scalar($data[self::FIELD_MAX_VALUE_CONTACT_POINT])) { - $this->setMaxValueContactPoint(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $data[self::FIELD_MAX_VALUE_CONTACT_POINT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MAX_VALUE_CONTACT_POINT])) { + $this->setMaxValueContactPoint(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $data[self::FIELD_MAX_VALUE_CONTACT_POINT]] + $ext)); + } else if (is_array($data[self::FIELD_MAX_VALUE_CONTACT_POINT])) { + $this->setMaxValueContactPoint(new FHIRContactPoint(array_merge($ext, $data[self::FIELD_MAX_VALUE_CONTACT_POINT]))); + } } else { $this->setMaxValueContactPoint(new FHIRContactPoint($data[self::FIELD_MAX_VALUE_CONTACT_POINT])); } @@ -4984,8 +5290,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MAX_VALUE_DATE] instanceof FHIRDate) { $this->setMaxValueDate($data[self::FIELD_MAX_VALUE_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_MAX_VALUE_DATE])) { - $this->setMaxValueDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_MAX_VALUE_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MAX_VALUE_DATE])) { + $this->setMaxValueDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_MAX_VALUE_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_MAX_VALUE_DATE])) { + $this->setMaxValueDate(new FHIRDate(array_merge($ext, $data[self::FIELD_MAX_VALUE_DATE]))); + } } else { $this->setMaxValueDate(new FHIRDate($data[self::FIELD_MAX_VALUE_DATE])); } @@ -4996,8 +5306,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MAX_VALUE_DATE_TIME] instanceof FHIRDateTime) { $this->setMaxValueDateTime($data[self::FIELD_MAX_VALUE_DATE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_MAX_VALUE_DATE_TIME])) { - $this->setMaxValueDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_MAX_VALUE_DATE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MAX_VALUE_DATE_TIME])) { + $this->setMaxValueDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_MAX_VALUE_DATE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_MAX_VALUE_DATE_TIME])) { + $this->setMaxValueDateTime(new FHIRDateTime(array_merge($ext, $data[self::FIELD_MAX_VALUE_DATE_TIME]))); + } } else { $this->setMaxValueDateTime(new FHIRDateTime($data[self::FIELD_MAX_VALUE_DATE_TIME])); } @@ -5008,8 +5322,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MAX_VALUE_DECIMAL] instanceof FHIRDecimal) { $this->setMaxValueDecimal($data[self::FIELD_MAX_VALUE_DECIMAL]); - } elseif ($ext && is_scalar($data[self::FIELD_MAX_VALUE_DECIMAL])) { - $this->setMaxValueDecimal(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_MAX_VALUE_DECIMAL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MAX_VALUE_DECIMAL])) { + $this->setMaxValueDecimal(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_MAX_VALUE_DECIMAL]] + $ext)); + } else if (is_array($data[self::FIELD_MAX_VALUE_DECIMAL])) { + $this->setMaxValueDecimal(new FHIRDecimal(array_merge($ext, $data[self::FIELD_MAX_VALUE_DECIMAL]))); + } } else { $this->setMaxValueDecimal(new FHIRDecimal($data[self::FIELD_MAX_VALUE_DECIMAL])); } @@ -5027,8 +5345,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MAX_VALUE_ID] instanceof FHIRId) { $this->setMaxValueId($data[self::FIELD_MAX_VALUE_ID]); - } elseif ($ext && is_scalar($data[self::FIELD_MAX_VALUE_ID])) { - $this->setMaxValueId(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_MAX_VALUE_ID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MAX_VALUE_ID])) { + $this->setMaxValueId(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_MAX_VALUE_ID]] + $ext)); + } else if (is_array($data[self::FIELD_MAX_VALUE_ID])) { + $this->setMaxValueId(new FHIRId(array_merge($ext, $data[self::FIELD_MAX_VALUE_ID]))); + } } else { $this->setMaxValueId(new FHIRId($data[self::FIELD_MAX_VALUE_ID])); } @@ -5039,8 +5361,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MAX_VALUE_IDENTIFIER] instanceof FHIRIdentifier) { $this->setMaxValueIdentifier($data[self::FIELD_MAX_VALUE_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_MAX_VALUE_IDENTIFIER])) { - $this->setMaxValueIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_MAX_VALUE_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MAX_VALUE_IDENTIFIER])) { + $this->setMaxValueIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_MAX_VALUE_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_MAX_VALUE_IDENTIFIER])) { + $this->setMaxValueIdentifier(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_MAX_VALUE_IDENTIFIER]))); + } } else { $this->setMaxValueIdentifier(new FHIRIdentifier($data[self::FIELD_MAX_VALUE_IDENTIFIER])); } @@ -5051,8 +5377,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MAX_VALUE_INSTANT] instanceof FHIRInstant) { $this->setMaxValueInstant($data[self::FIELD_MAX_VALUE_INSTANT]); - } elseif ($ext && is_scalar($data[self::FIELD_MAX_VALUE_INSTANT])) { - $this->setMaxValueInstant(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_MAX_VALUE_INSTANT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MAX_VALUE_INSTANT])) { + $this->setMaxValueInstant(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_MAX_VALUE_INSTANT]] + $ext)); + } else if (is_array($data[self::FIELD_MAX_VALUE_INSTANT])) { + $this->setMaxValueInstant(new FHIRInstant(array_merge($ext, $data[self::FIELD_MAX_VALUE_INSTANT]))); + } } else { $this->setMaxValueInstant(new FHIRInstant($data[self::FIELD_MAX_VALUE_INSTANT])); } @@ -5063,8 +5393,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MAX_VALUE_INTEGER] instanceof FHIRInteger) { $this->setMaxValueInteger($data[self::FIELD_MAX_VALUE_INTEGER]); - } elseif ($ext && is_scalar($data[self::FIELD_MAX_VALUE_INTEGER])) { - $this->setMaxValueInteger(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_MAX_VALUE_INTEGER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MAX_VALUE_INTEGER])) { + $this->setMaxValueInteger(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_MAX_VALUE_INTEGER]] + $ext)); + } else if (is_array($data[self::FIELD_MAX_VALUE_INTEGER])) { + $this->setMaxValueInteger(new FHIRInteger(array_merge($ext, $data[self::FIELD_MAX_VALUE_INTEGER]))); + } } else { $this->setMaxValueInteger(new FHIRInteger($data[self::FIELD_MAX_VALUE_INTEGER])); } @@ -5075,8 +5409,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MAX_VALUE_MARKDOWN] instanceof FHIRMarkdown) { $this->setMaxValueMarkdown($data[self::FIELD_MAX_VALUE_MARKDOWN]); - } elseif ($ext && is_scalar($data[self::FIELD_MAX_VALUE_MARKDOWN])) { - $this->setMaxValueMarkdown(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_MAX_VALUE_MARKDOWN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MAX_VALUE_MARKDOWN])) { + $this->setMaxValueMarkdown(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_MAX_VALUE_MARKDOWN]] + $ext)); + } else if (is_array($data[self::FIELD_MAX_VALUE_MARKDOWN])) { + $this->setMaxValueMarkdown(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_MAX_VALUE_MARKDOWN]))); + } } else { $this->setMaxValueMarkdown(new FHIRMarkdown($data[self::FIELD_MAX_VALUE_MARKDOWN])); } @@ -5094,8 +5432,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MAX_VALUE_OID] instanceof FHIROid) { $this->setMaxValueOid($data[self::FIELD_MAX_VALUE_OID]); - } elseif ($ext && is_scalar($data[self::FIELD_MAX_VALUE_OID])) { - $this->setMaxValueOid(new FHIROid([FHIROid::FIELD_VALUE => $data[self::FIELD_MAX_VALUE_OID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MAX_VALUE_OID])) { + $this->setMaxValueOid(new FHIROid([FHIROid::FIELD_VALUE => $data[self::FIELD_MAX_VALUE_OID]] + $ext)); + } else if (is_array($data[self::FIELD_MAX_VALUE_OID])) { + $this->setMaxValueOid(new FHIROid(array_merge($ext, $data[self::FIELD_MAX_VALUE_OID]))); + } } else { $this->setMaxValueOid(new FHIROid($data[self::FIELD_MAX_VALUE_OID])); } @@ -5113,8 +5455,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MAX_VALUE_POSITIVE_INT] instanceof FHIRPositiveInt) { $this->setMaxValuePositiveInt($data[self::FIELD_MAX_VALUE_POSITIVE_INT]); - } elseif ($ext && is_scalar($data[self::FIELD_MAX_VALUE_POSITIVE_INT])) { - $this->setMaxValuePositiveInt(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_MAX_VALUE_POSITIVE_INT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MAX_VALUE_POSITIVE_INT])) { + $this->setMaxValuePositiveInt(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_MAX_VALUE_POSITIVE_INT]] + $ext)); + } else if (is_array($data[self::FIELD_MAX_VALUE_POSITIVE_INT])) { + $this->setMaxValuePositiveInt(new FHIRPositiveInt(array_merge($ext, $data[self::FIELD_MAX_VALUE_POSITIVE_INT]))); + } } else { $this->setMaxValuePositiveInt(new FHIRPositiveInt($data[self::FIELD_MAX_VALUE_POSITIVE_INT])); } @@ -5125,8 +5471,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MAX_VALUE_QUANTITY] instanceof FHIRQuantity) { $this->setMaxValueQuantity($data[self::FIELD_MAX_VALUE_QUANTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_MAX_VALUE_QUANTITY])) { - $this->setMaxValueQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_MAX_VALUE_QUANTITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MAX_VALUE_QUANTITY])) { + $this->setMaxValueQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_MAX_VALUE_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_MAX_VALUE_QUANTITY])) { + $this->setMaxValueQuantity(new FHIRQuantity(array_merge($ext, $data[self::FIELD_MAX_VALUE_QUANTITY]))); + } } else { $this->setMaxValueQuantity(new FHIRQuantity($data[self::FIELD_MAX_VALUE_QUANTITY])); } @@ -5172,8 +5522,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MAX_VALUE_STRING] instanceof FHIRString) { $this->setMaxValueString($data[self::FIELD_MAX_VALUE_STRING]); - } elseif ($ext && is_scalar($data[self::FIELD_MAX_VALUE_STRING])) { - $this->setMaxValueString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_MAX_VALUE_STRING]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MAX_VALUE_STRING])) { + $this->setMaxValueString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_MAX_VALUE_STRING]] + $ext)); + } else if (is_array($data[self::FIELD_MAX_VALUE_STRING])) { + $this->setMaxValueString(new FHIRString(array_merge($ext, $data[self::FIELD_MAX_VALUE_STRING]))); + } } else { $this->setMaxValueString(new FHIRString($data[self::FIELD_MAX_VALUE_STRING])); } @@ -5184,8 +5538,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MAX_VALUE_TIME] instanceof FHIRTime) { $this->setMaxValueTime($data[self::FIELD_MAX_VALUE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_MAX_VALUE_TIME])) { - $this->setMaxValueTime(new FHIRTime([FHIRTime::FIELD_VALUE => $data[self::FIELD_MAX_VALUE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MAX_VALUE_TIME])) { + $this->setMaxValueTime(new FHIRTime([FHIRTime::FIELD_VALUE => $data[self::FIELD_MAX_VALUE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_MAX_VALUE_TIME])) { + $this->setMaxValueTime(new FHIRTime(array_merge($ext, $data[self::FIELD_MAX_VALUE_TIME]))); + } } else { $this->setMaxValueTime(new FHIRTime($data[self::FIELD_MAX_VALUE_TIME])); } @@ -5203,8 +5561,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MAX_VALUE_UNSIGNED_INT] instanceof FHIRUnsignedInt) { $this->setMaxValueUnsignedInt($data[self::FIELD_MAX_VALUE_UNSIGNED_INT]); - } elseif ($ext && is_scalar($data[self::FIELD_MAX_VALUE_UNSIGNED_INT])) { - $this->setMaxValueUnsignedInt(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_MAX_VALUE_UNSIGNED_INT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MAX_VALUE_UNSIGNED_INT])) { + $this->setMaxValueUnsignedInt(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_MAX_VALUE_UNSIGNED_INT]] + $ext)); + } else if (is_array($data[self::FIELD_MAX_VALUE_UNSIGNED_INT])) { + $this->setMaxValueUnsignedInt(new FHIRUnsignedInt(array_merge($ext, $data[self::FIELD_MAX_VALUE_UNSIGNED_INT]))); + } } else { $this->setMaxValueUnsignedInt(new FHIRUnsignedInt($data[self::FIELD_MAX_VALUE_UNSIGNED_INT])); } @@ -5215,8 +5577,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MAX_VALUE_URI] instanceof FHIRUri) { $this->setMaxValueUri($data[self::FIELD_MAX_VALUE_URI]); - } elseif ($ext && is_scalar($data[self::FIELD_MAX_VALUE_URI])) { - $this->setMaxValueUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_MAX_VALUE_URI]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MAX_VALUE_URI])) { + $this->setMaxValueUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_MAX_VALUE_URI]] + $ext)); + } else if (is_array($data[self::FIELD_MAX_VALUE_URI])) { + $this->setMaxValueUri(new FHIRUri(array_merge($ext, $data[self::FIELD_MAX_VALUE_URI]))); + } } else { $this->setMaxValueUri(new FHIRUri($data[self::FIELD_MAX_VALUE_URI])); } @@ -5227,8 +5593,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MAX_VALUE_UUID] instanceof FHIRUuid) { $this->setMaxValueUuid($data[self::FIELD_MAX_VALUE_UUID]); - } elseif ($ext && is_scalar($data[self::FIELD_MAX_VALUE_UUID])) { - $this->setMaxValueUuid(new FHIRUuid([FHIRUuid::FIELD_VALUE => $data[self::FIELD_MAX_VALUE_UUID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MAX_VALUE_UUID])) { + $this->setMaxValueUuid(new FHIRUuid([FHIRUuid::FIELD_VALUE => $data[self::FIELD_MAX_VALUE_UUID]] + $ext)); + } else if (is_array($data[self::FIELD_MAX_VALUE_UUID])) { + $this->setMaxValueUuid(new FHIRUuid(array_merge($ext, $data[self::FIELD_MAX_VALUE_UUID]))); + } } else { $this->setMaxValueUuid(new FHIRUuid($data[self::FIELD_MAX_VALUE_UUID])); } @@ -5239,8 +5609,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MEANING_WHEN_MISSING] instanceof FHIRMarkdown) { $this->setMeaningWhenMissing($data[self::FIELD_MEANING_WHEN_MISSING]); - } elseif ($ext && is_scalar($data[self::FIELD_MEANING_WHEN_MISSING])) { - $this->setMeaningWhenMissing(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_MEANING_WHEN_MISSING]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MEANING_WHEN_MISSING])) { + $this->setMeaningWhenMissing(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_MEANING_WHEN_MISSING]] + $ext)); + } else if (is_array($data[self::FIELD_MEANING_WHEN_MISSING])) { + $this->setMeaningWhenMissing(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_MEANING_WHEN_MISSING]))); + } } else { $this->setMeaningWhenMissing(new FHIRMarkdown($data[self::FIELD_MEANING_WHEN_MISSING])); } @@ -5251,8 +5625,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MIN] instanceof FHIRInteger) { $this->setMin($data[self::FIELD_MIN]); - } elseif ($ext && is_scalar($data[self::FIELD_MIN])) { - $this->setMin(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_MIN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MIN])) { + $this->setMin(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_MIN]] + $ext)); + } else if (is_array($data[self::FIELD_MIN])) { + $this->setMin(new FHIRInteger(array_merge($ext, $data[self::FIELD_MIN]))); + } } else { $this->setMin(new FHIRInteger($data[self::FIELD_MIN])); } @@ -5284,8 +5662,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MIN_VALUE_BASE_64BINARY] instanceof FHIRBase64Binary) { $this->setMinValueBase64Binary($data[self::FIELD_MIN_VALUE_BASE_64BINARY]); - } elseif ($ext && is_scalar($data[self::FIELD_MIN_VALUE_BASE_64BINARY])) { - $this->setMinValueBase64Binary(new FHIRBase64Binary([FHIRBase64Binary::FIELD_VALUE => $data[self::FIELD_MIN_VALUE_BASE_64BINARY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MIN_VALUE_BASE_64BINARY])) { + $this->setMinValueBase64Binary(new FHIRBase64Binary([FHIRBase64Binary::FIELD_VALUE => $data[self::FIELD_MIN_VALUE_BASE_64BINARY]] + $ext)); + } else if (is_array($data[self::FIELD_MIN_VALUE_BASE_64BINARY])) { + $this->setMinValueBase64Binary(new FHIRBase64Binary(array_merge($ext, $data[self::FIELD_MIN_VALUE_BASE_64BINARY]))); + } } else { $this->setMinValueBase64Binary(new FHIRBase64Binary($data[self::FIELD_MIN_VALUE_BASE_64BINARY])); } @@ -5296,8 +5678,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MIN_VALUE_BOOLEAN] instanceof FHIRBoolean) { $this->setMinValueBoolean($data[self::FIELD_MIN_VALUE_BOOLEAN]); - } elseif ($ext && is_scalar($data[self::FIELD_MIN_VALUE_BOOLEAN])) { - $this->setMinValueBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_MIN_VALUE_BOOLEAN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MIN_VALUE_BOOLEAN])) { + $this->setMinValueBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_MIN_VALUE_BOOLEAN]] + $ext)); + } else if (is_array($data[self::FIELD_MIN_VALUE_BOOLEAN])) { + $this->setMinValueBoolean(new FHIRBoolean(array_merge($ext, $data[self::FIELD_MIN_VALUE_BOOLEAN]))); + } } else { $this->setMinValueBoolean(new FHIRBoolean($data[self::FIELD_MIN_VALUE_BOOLEAN])); } @@ -5308,8 +5694,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MIN_VALUE_CODE] instanceof FHIRCode) { $this->setMinValueCode($data[self::FIELD_MIN_VALUE_CODE]); - } elseif ($ext && is_scalar($data[self::FIELD_MIN_VALUE_CODE])) { - $this->setMinValueCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_MIN_VALUE_CODE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MIN_VALUE_CODE])) { + $this->setMinValueCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_MIN_VALUE_CODE]] + $ext)); + } else if (is_array($data[self::FIELD_MIN_VALUE_CODE])) { + $this->setMinValueCode(new FHIRCode(array_merge($ext, $data[self::FIELD_MIN_VALUE_CODE]))); + } } else { $this->setMinValueCode(new FHIRCode($data[self::FIELD_MIN_VALUE_CODE])); } @@ -5334,8 +5724,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MIN_VALUE_CONTACT_POINT] instanceof FHIRContactPoint) { $this->setMinValueContactPoint($data[self::FIELD_MIN_VALUE_CONTACT_POINT]); - } elseif ($ext && is_scalar($data[self::FIELD_MIN_VALUE_CONTACT_POINT])) { - $this->setMinValueContactPoint(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $data[self::FIELD_MIN_VALUE_CONTACT_POINT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MIN_VALUE_CONTACT_POINT])) { + $this->setMinValueContactPoint(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $data[self::FIELD_MIN_VALUE_CONTACT_POINT]] + $ext)); + } else if (is_array($data[self::FIELD_MIN_VALUE_CONTACT_POINT])) { + $this->setMinValueContactPoint(new FHIRContactPoint(array_merge($ext, $data[self::FIELD_MIN_VALUE_CONTACT_POINT]))); + } } else { $this->setMinValueContactPoint(new FHIRContactPoint($data[self::FIELD_MIN_VALUE_CONTACT_POINT])); } @@ -5346,8 +5740,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MIN_VALUE_DATE] instanceof FHIRDate) { $this->setMinValueDate($data[self::FIELD_MIN_VALUE_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_MIN_VALUE_DATE])) { - $this->setMinValueDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_MIN_VALUE_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MIN_VALUE_DATE])) { + $this->setMinValueDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_MIN_VALUE_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_MIN_VALUE_DATE])) { + $this->setMinValueDate(new FHIRDate(array_merge($ext, $data[self::FIELD_MIN_VALUE_DATE]))); + } } else { $this->setMinValueDate(new FHIRDate($data[self::FIELD_MIN_VALUE_DATE])); } @@ -5358,8 +5756,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MIN_VALUE_DATE_TIME] instanceof FHIRDateTime) { $this->setMinValueDateTime($data[self::FIELD_MIN_VALUE_DATE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_MIN_VALUE_DATE_TIME])) { - $this->setMinValueDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_MIN_VALUE_DATE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MIN_VALUE_DATE_TIME])) { + $this->setMinValueDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_MIN_VALUE_DATE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_MIN_VALUE_DATE_TIME])) { + $this->setMinValueDateTime(new FHIRDateTime(array_merge($ext, $data[self::FIELD_MIN_VALUE_DATE_TIME]))); + } } else { $this->setMinValueDateTime(new FHIRDateTime($data[self::FIELD_MIN_VALUE_DATE_TIME])); } @@ -5370,8 +5772,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MIN_VALUE_DECIMAL] instanceof FHIRDecimal) { $this->setMinValueDecimal($data[self::FIELD_MIN_VALUE_DECIMAL]); - } elseif ($ext && is_scalar($data[self::FIELD_MIN_VALUE_DECIMAL])) { - $this->setMinValueDecimal(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_MIN_VALUE_DECIMAL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MIN_VALUE_DECIMAL])) { + $this->setMinValueDecimal(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_MIN_VALUE_DECIMAL]] + $ext)); + } else if (is_array($data[self::FIELD_MIN_VALUE_DECIMAL])) { + $this->setMinValueDecimal(new FHIRDecimal(array_merge($ext, $data[self::FIELD_MIN_VALUE_DECIMAL]))); + } } else { $this->setMinValueDecimal(new FHIRDecimal($data[self::FIELD_MIN_VALUE_DECIMAL])); } @@ -5389,8 +5795,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MIN_VALUE_ID] instanceof FHIRId) { $this->setMinValueId($data[self::FIELD_MIN_VALUE_ID]); - } elseif ($ext && is_scalar($data[self::FIELD_MIN_VALUE_ID])) { - $this->setMinValueId(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_MIN_VALUE_ID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MIN_VALUE_ID])) { + $this->setMinValueId(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_MIN_VALUE_ID]] + $ext)); + } else if (is_array($data[self::FIELD_MIN_VALUE_ID])) { + $this->setMinValueId(new FHIRId(array_merge($ext, $data[self::FIELD_MIN_VALUE_ID]))); + } } else { $this->setMinValueId(new FHIRId($data[self::FIELD_MIN_VALUE_ID])); } @@ -5401,8 +5811,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MIN_VALUE_IDENTIFIER] instanceof FHIRIdentifier) { $this->setMinValueIdentifier($data[self::FIELD_MIN_VALUE_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_MIN_VALUE_IDENTIFIER])) { - $this->setMinValueIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_MIN_VALUE_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MIN_VALUE_IDENTIFIER])) { + $this->setMinValueIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_MIN_VALUE_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_MIN_VALUE_IDENTIFIER])) { + $this->setMinValueIdentifier(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_MIN_VALUE_IDENTIFIER]))); + } } else { $this->setMinValueIdentifier(new FHIRIdentifier($data[self::FIELD_MIN_VALUE_IDENTIFIER])); } @@ -5413,8 +5827,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MIN_VALUE_INSTANT] instanceof FHIRInstant) { $this->setMinValueInstant($data[self::FIELD_MIN_VALUE_INSTANT]); - } elseif ($ext && is_scalar($data[self::FIELD_MIN_VALUE_INSTANT])) { - $this->setMinValueInstant(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_MIN_VALUE_INSTANT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MIN_VALUE_INSTANT])) { + $this->setMinValueInstant(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_MIN_VALUE_INSTANT]] + $ext)); + } else if (is_array($data[self::FIELD_MIN_VALUE_INSTANT])) { + $this->setMinValueInstant(new FHIRInstant(array_merge($ext, $data[self::FIELD_MIN_VALUE_INSTANT]))); + } } else { $this->setMinValueInstant(new FHIRInstant($data[self::FIELD_MIN_VALUE_INSTANT])); } @@ -5425,8 +5843,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MIN_VALUE_INTEGER] instanceof FHIRInteger) { $this->setMinValueInteger($data[self::FIELD_MIN_VALUE_INTEGER]); - } elseif ($ext && is_scalar($data[self::FIELD_MIN_VALUE_INTEGER])) { - $this->setMinValueInteger(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_MIN_VALUE_INTEGER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MIN_VALUE_INTEGER])) { + $this->setMinValueInteger(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_MIN_VALUE_INTEGER]] + $ext)); + } else if (is_array($data[self::FIELD_MIN_VALUE_INTEGER])) { + $this->setMinValueInteger(new FHIRInteger(array_merge($ext, $data[self::FIELD_MIN_VALUE_INTEGER]))); + } } else { $this->setMinValueInteger(new FHIRInteger($data[self::FIELD_MIN_VALUE_INTEGER])); } @@ -5437,8 +5859,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MIN_VALUE_MARKDOWN] instanceof FHIRMarkdown) { $this->setMinValueMarkdown($data[self::FIELD_MIN_VALUE_MARKDOWN]); - } elseif ($ext && is_scalar($data[self::FIELD_MIN_VALUE_MARKDOWN])) { - $this->setMinValueMarkdown(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_MIN_VALUE_MARKDOWN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MIN_VALUE_MARKDOWN])) { + $this->setMinValueMarkdown(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_MIN_VALUE_MARKDOWN]] + $ext)); + } else if (is_array($data[self::FIELD_MIN_VALUE_MARKDOWN])) { + $this->setMinValueMarkdown(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_MIN_VALUE_MARKDOWN]))); + } } else { $this->setMinValueMarkdown(new FHIRMarkdown($data[self::FIELD_MIN_VALUE_MARKDOWN])); } @@ -5456,8 +5882,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MIN_VALUE_OID] instanceof FHIROid) { $this->setMinValueOid($data[self::FIELD_MIN_VALUE_OID]); - } elseif ($ext && is_scalar($data[self::FIELD_MIN_VALUE_OID])) { - $this->setMinValueOid(new FHIROid([FHIROid::FIELD_VALUE => $data[self::FIELD_MIN_VALUE_OID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MIN_VALUE_OID])) { + $this->setMinValueOid(new FHIROid([FHIROid::FIELD_VALUE => $data[self::FIELD_MIN_VALUE_OID]] + $ext)); + } else if (is_array($data[self::FIELD_MIN_VALUE_OID])) { + $this->setMinValueOid(new FHIROid(array_merge($ext, $data[self::FIELD_MIN_VALUE_OID]))); + } } else { $this->setMinValueOid(new FHIROid($data[self::FIELD_MIN_VALUE_OID])); } @@ -5475,8 +5905,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MIN_VALUE_POSITIVE_INT] instanceof FHIRPositiveInt) { $this->setMinValuePositiveInt($data[self::FIELD_MIN_VALUE_POSITIVE_INT]); - } elseif ($ext && is_scalar($data[self::FIELD_MIN_VALUE_POSITIVE_INT])) { - $this->setMinValuePositiveInt(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_MIN_VALUE_POSITIVE_INT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MIN_VALUE_POSITIVE_INT])) { + $this->setMinValuePositiveInt(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_MIN_VALUE_POSITIVE_INT]] + $ext)); + } else if (is_array($data[self::FIELD_MIN_VALUE_POSITIVE_INT])) { + $this->setMinValuePositiveInt(new FHIRPositiveInt(array_merge($ext, $data[self::FIELD_MIN_VALUE_POSITIVE_INT]))); + } } else { $this->setMinValuePositiveInt(new FHIRPositiveInt($data[self::FIELD_MIN_VALUE_POSITIVE_INT])); } @@ -5487,8 +5921,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MIN_VALUE_QUANTITY] instanceof FHIRQuantity) { $this->setMinValueQuantity($data[self::FIELD_MIN_VALUE_QUANTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_MIN_VALUE_QUANTITY])) { - $this->setMinValueQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_MIN_VALUE_QUANTITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MIN_VALUE_QUANTITY])) { + $this->setMinValueQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_MIN_VALUE_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_MIN_VALUE_QUANTITY])) { + $this->setMinValueQuantity(new FHIRQuantity(array_merge($ext, $data[self::FIELD_MIN_VALUE_QUANTITY]))); + } } else { $this->setMinValueQuantity(new FHIRQuantity($data[self::FIELD_MIN_VALUE_QUANTITY])); } @@ -5534,8 +5972,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MIN_VALUE_STRING] instanceof FHIRString) { $this->setMinValueString($data[self::FIELD_MIN_VALUE_STRING]); - } elseif ($ext && is_scalar($data[self::FIELD_MIN_VALUE_STRING])) { - $this->setMinValueString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_MIN_VALUE_STRING]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MIN_VALUE_STRING])) { + $this->setMinValueString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_MIN_VALUE_STRING]] + $ext)); + } else if (is_array($data[self::FIELD_MIN_VALUE_STRING])) { + $this->setMinValueString(new FHIRString(array_merge($ext, $data[self::FIELD_MIN_VALUE_STRING]))); + } } else { $this->setMinValueString(new FHIRString($data[self::FIELD_MIN_VALUE_STRING])); } @@ -5546,8 +5988,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MIN_VALUE_TIME] instanceof FHIRTime) { $this->setMinValueTime($data[self::FIELD_MIN_VALUE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_MIN_VALUE_TIME])) { - $this->setMinValueTime(new FHIRTime([FHIRTime::FIELD_VALUE => $data[self::FIELD_MIN_VALUE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MIN_VALUE_TIME])) { + $this->setMinValueTime(new FHIRTime([FHIRTime::FIELD_VALUE => $data[self::FIELD_MIN_VALUE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_MIN_VALUE_TIME])) { + $this->setMinValueTime(new FHIRTime(array_merge($ext, $data[self::FIELD_MIN_VALUE_TIME]))); + } } else { $this->setMinValueTime(new FHIRTime($data[self::FIELD_MIN_VALUE_TIME])); } @@ -5565,8 +6011,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MIN_VALUE_UNSIGNED_INT] instanceof FHIRUnsignedInt) { $this->setMinValueUnsignedInt($data[self::FIELD_MIN_VALUE_UNSIGNED_INT]); - } elseif ($ext && is_scalar($data[self::FIELD_MIN_VALUE_UNSIGNED_INT])) { - $this->setMinValueUnsignedInt(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_MIN_VALUE_UNSIGNED_INT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MIN_VALUE_UNSIGNED_INT])) { + $this->setMinValueUnsignedInt(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_MIN_VALUE_UNSIGNED_INT]] + $ext)); + } else if (is_array($data[self::FIELD_MIN_VALUE_UNSIGNED_INT])) { + $this->setMinValueUnsignedInt(new FHIRUnsignedInt(array_merge($ext, $data[self::FIELD_MIN_VALUE_UNSIGNED_INT]))); + } } else { $this->setMinValueUnsignedInt(new FHIRUnsignedInt($data[self::FIELD_MIN_VALUE_UNSIGNED_INT])); } @@ -5577,8 +6027,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MIN_VALUE_URI] instanceof FHIRUri) { $this->setMinValueUri($data[self::FIELD_MIN_VALUE_URI]); - } elseif ($ext && is_scalar($data[self::FIELD_MIN_VALUE_URI])) { - $this->setMinValueUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_MIN_VALUE_URI]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MIN_VALUE_URI])) { + $this->setMinValueUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_MIN_VALUE_URI]] + $ext)); + } else if (is_array($data[self::FIELD_MIN_VALUE_URI])) { + $this->setMinValueUri(new FHIRUri(array_merge($ext, $data[self::FIELD_MIN_VALUE_URI]))); + } } else { $this->setMinValueUri(new FHIRUri($data[self::FIELD_MIN_VALUE_URI])); } @@ -5589,8 +6043,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MIN_VALUE_UUID] instanceof FHIRUuid) { $this->setMinValueUuid($data[self::FIELD_MIN_VALUE_UUID]); - } elseif ($ext && is_scalar($data[self::FIELD_MIN_VALUE_UUID])) { - $this->setMinValueUuid(new FHIRUuid([FHIRUuid::FIELD_VALUE => $data[self::FIELD_MIN_VALUE_UUID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MIN_VALUE_UUID])) { + $this->setMinValueUuid(new FHIRUuid([FHIRUuid::FIELD_VALUE => $data[self::FIELD_MIN_VALUE_UUID]] + $ext)); + } else if (is_array($data[self::FIELD_MIN_VALUE_UUID])) { + $this->setMinValueUuid(new FHIRUuid(array_merge($ext, $data[self::FIELD_MIN_VALUE_UUID]))); + } } else { $this->setMinValueUuid(new FHIRUuid($data[self::FIELD_MIN_VALUE_UUID])); } @@ -5601,8 +6059,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MUST_SUPPORT] instanceof FHIRBoolean) { $this->setMustSupport($data[self::FIELD_MUST_SUPPORT]); - } elseif ($ext && is_scalar($data[self::FIELD_MUST_SUPPORT])) { - $this->setMustSupport(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_MUST_SUPPORT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MUST_SUPPORT])) { + $this->setMustSupport(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_MUST_SUPPORT]] + $ext)); + } else if (is_array($data[self::FIELD_MUST_SUPPORT])) { + $this->setMustSupport(new FHIRBoolean(array_merge($ext, $data[self::FIELD_MUST_SUPPORT]))); + } } else { $this->setMustSupport(new FHIRBoolean($data[self::FIELD_MUST_SUPPORT])); } @@ -5613,8 +6075,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -5625,8 +6091,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME_REFERENCE] instanceof FHIRString) { $this->setNameReference($data[self::FIELD_NAME_REFERENCE]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME_REFERENCE])) { - $this->setNameReference(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME_REFERENCE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME_REFERENCE])) { + $this->setNameReference(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME_REFERENCE]] + $ext)); + } else if (is_array($data[self::FIELD_NAME_REFERENCE])) { + $this->setNameReference(new FHIRString(array_merge($ext, $data[self::FIELD_NAME_REFERENCE]))); + } } else { $this->setNameReference(new FHIRString($data[self::FIELD_NAME_REFERENCE])); } @@ -5637,8 +6107,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PATH] instanceof FHIRString) { $this->setPath($data[self::FIELD_PATH]); - } elseif ($ext && is_scalar($data[self::FIELD_PATH])) { - $this->setPath(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PATH]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PATH])) { + $this->setPath(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PATH]] + $ext)); + } else if (is_array($data[self::FIELD_PATH])) { + $this->setPath(new FHIRString(array_merge($ext, $data[self::FIELD_PATH]))); + } } else { $this->setPath(new FHIRString($data[self::FIELD_PATH])); } @@ -5670,8 +6144,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PATTERN_BASE_64BINARY] instanceof FHIRBase64Binary) { $this->setPatternBase64Binary($data[self::FIELD_PATTERN_BASE_64BINARY]); - } elseif ($ext && is_scalar($data[self::FIELD_PATTERN_BASE_64BINARY])) { - $this->setPatternBase64Binary(new FHIRBase64Binary([FHIRBase64Binary::FIELD_VALUE => $data[self::FIELD_PATTERN_BASE_64BINARY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PATTERN_BASE_64BINARY])) { + $this->setPatternBase64Binary(new FHIRBase64Binary([FHIRBase64Binary::FIELD_VALUE => $data[self::FIELD_PATTERN_BASE_64BINARY]] + $ext)); + } else if (is_array($data[self::FIELD_PATTERN_BASE_64BINARY])) { + $this->setPatternBase64Binary(new FHIRBase64Binary(array_merge($ext, $data[self::FIELD_PATTERN_BASE_64BINARY]))); + } } else { $this->setPatternBase64Binary(new FHIRBase64Binary($data[self::FIELD_PATTERN_BASE_64BINARY])); } @@ -5682,8 +6160,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PATTERN_BOOLEAN] instanceof FHIRBoolean) { $this->setPatternBoolean($data[self::FIELD_PATTERN_BOOLEAN]); - } elseif ($ext && is_scalar($data[self::FIELD_PATTERN_BOOLEAN])) { - $this->setPatternBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_PATTERN_BOOLEAN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PATTERN_BOOLEAN])) { + $this->setPatternBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_PATTERN_BOOLEAN]] + $ext)); + } else if (is_array($data[self::FIELD_PATTERN_BOOLEAN])) { + $this->setPatternBoolean(new FHIRBoolean(array_merge($ext, $data[self::FIELD_PATTERN_BOOLEAN]))); + } } else { $this->setPatternBoolean(new FHIRBoolean($data[self::FIELD_PATTERN_BOOLEAN])); } @@ -5694,8 +6176,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PATTERN_CODE] instanceof FHIRCode) { $this->setPatternCode($data[self::FIELD_PATTERN_CODE]); - } elseif ($ext && is_scalar($data[self::FIELD_PATTERN_CODE])) { - $this->setPatternCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_PATTERN_CODE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PATTERN_CODE])) { + $this->setPatternCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_PATTERN_CODE]] + $ext)); + } else if (is_array($data[self::FIELD_PATTERN_CODE])) { + $this->setPatternCode(new FHIRCode(array_merge($ext, $data[self::FIELD_PATTERN_CODE]))); + } } else { $this->setPatternCode(new FHIRCode($data[self::FIELD_PATTERN_CODE])); } @@ -5720,8 +6206,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PATTERN_CONTACT_POINT] instanceof FHIRContactPoint) { $this->setPatternContactPoint($data[self::FIELD_PATTERN_CONTACT_POINT]); - } elseif ($ext && is_scalar($data[self::FIELD_PATTERN_CONTACT_POINT])) { - $this->setPatternContactPoint(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $data[self::FIELD_PATTERN_CONTACT_POINT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PATTERN_CONTACT_POINT])) { + $this->setPatternContactPoint(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $data[self::FIELD_PATTERN_CONTACT_POINT]] + $ext)); + } else if (is_array($data[self::FIELD_PATTERN_CONTACT_POINT])) { + $this->setPatternContactPoint(new FHIRContactPoint(array_merge($ext, $data[self::FIELD_PATTERN_CONTACT_POINT]))); + } } else { $this->setPatternContactPoint(new FHIRContactPoint($data[self::FIELD_PATTERN_CONTACT_POINT])); } @@ -5732,8 +6222,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PATTERN_DATE] instanceof FHIRDate) { $this->setPatternDate($data[self::FIELD_PATTERN_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_PATTERN_DATE])) { - $this->setPatternDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_PATTERN_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PATTERN_DATE])) { + $this->setPatternDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_PATTERN_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_PATTERN_DATE])) { + $this->setPatternDate(new FHIRDate(array_merge($ext, $data[self::FIELD_PATTERN_DATE]))); + } } else { $this->setPatternDate(new FHIRDate($data[self::FIELD_PATTERN_DATE])); } @@ -5744,8 +6238,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PATTERN_DATE_TIME] instanceof FHIRDateTime) { $this->setPatternDateTime($data[self::FIELD_PATTERN_DATE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_PATTERN_DATE_TIME])) { - $this->setPatternDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_PATTERN_DATE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PATTERN_DATE_TIME])) { + $this->setPatternDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_PATTERN_DATE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_PATTERN_DATE_TIME])) { + $this->setPatternDateTime(new FHIRDateTime(array_merge($ext, $data[self::FIELD_PATTERN_DATE_TIME]))); + } } else { $this->setPatternDateTime(new FHIRDateTime($data[self::FIELD_PATTERN_DATE_TIME])); } @@ -5756,8 +6254,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PATTERN_DECIMAL] instanceof FHIRDecimal) { $this->setPatternDecimal($data[self::FIELD_PATTERN_DECIMAL]); - } elseif ($ext && is_scalar($data[self::FIELD_PATTERN_DECIMAL])) { - $this->setPatternDecimal(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_PATTERN_DECIMAL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PATTERN_DECIMAL])) { + $this->setPatternDecimal(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_PATTERN_DECIMAL]] + $ext)); + } else if (is_array($data[self::FIELD_PATTERN_DECIMAL])) { + $this->setPatternDecimal(new FHIRDecimal(array_merge($ext, $data[self::FIELD_PATTERN_DECIMAL]))); + } } else { $this->setPatternDecimal(new FHIRDecimal($data[self::FIELD_PATTERN_DECIMAL])); } @@ -5775,8 +6277,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PATTERN_ID] instanceof FHIRId) { $this->setPatternId($data[self::FIELD_PATTERN_ID]); - } elseif ($ext && is_scalar($data[self::FIELD_PATTERN_ID])) { - $this->setPatternId(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_PATTERN_ID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PATTERN_ID])) { + $this->setPatternId(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_PATTERN_ID]] + $ext)); + } else if (is_array($data[self::FIELD_PATTERN_ID])) { + $this->setPatternId(new FHIRId(array_merge($ext, $data[self::FIELD_PATTERN_ID]))); + } } else { $this->setPatternId(new FHIRId($data[self::FIELD_PATTERN_ID])); } @@ -5787,8 +6293,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PATTERN_IDENTIFIER] instanceof FHIRIdentifier) { $this->setPatternIdentifier($data[self::FIELD_PATTERN_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_PATTERN_IDENTIFIER])) { - $this->setPatternIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_PATTERN_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PATTERN_IDENTIFIER])) { + $this->setPatternIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_PATTERN_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_PATTERN_IDENTIFIER])) { + $this->setPatternIdentifier(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_PATTERN_IDENTIFIER]))); + } } else { $this->setPatternIdentifier(new FHIRIdentifier($data[self::FIELD_PATTERN_IDENTIFIER])); } @@ -5799,8 +6309,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PATTERN_INSTANT] instanceof FHIRInstant) { $this->setPatternInstant($data[self::FIELD_PATTERN_INSTANT]); - } elseif ($ext && is_scalar($data[self::FIELD_PATTERN_INSTANT])) { - $this->setPatternInstant(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_PATTERN_INSTANT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PATTERN_INSTANT])) { + $this->setPatternInstant(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_PATTERN_INSTANT]] + $ext)); + } else if (is_array($data[self::FIELD_PATTERN_INSTANT])) { + $this->setPatternInstant(new FHIRInstant(array_merge($ext, $data[self::FIELD_PATTERN_INSTANT]))); + } } else { $this->setPatternInstant(new FHIRInstant($data[self::FIELD_PATTERN_INSTANT])); } @@ -5811,8 +6325,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PATTERN_INTEGER] instanceof FHIRInteger) { $this->setPatternInteger($data[self::FIELD_PATTERN_INTEGER]); - } elseif ($ext && is_scalar($data[self::FIELD_PATTERN_INTEGER])) { - $this->setPatternInteger(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_PATTERN_INTEGER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PATTERN_INTEGER])) { + $this->setPatternInteger(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_PATTERN_INTEGER]] + $ext)); + } else if (is_array($data[self::FIELD_PATTERN_INTEGER])) { + $this->setPatternInteger(new FHIRInteger(array_merge($ext, $data[self::FIELD_PATTERN_INTEGER]))); + } } else { $this->setPatternInteger(new FHIRInteger($data[self::FIELD_PATTERN_INTEGER])); } @@ -5823,8 +6341,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PATTERN_MARKDOWN] instanceof FHIRMarkdown) { $this->setPatternMarkdown($data[self::FIELD_PATTERN_MARKDOWN]); - } elseif ($ext && is_scalar($data[self::FIELD_PATTERN_MARKDOWN])) { - $this->setPatternMarkdown(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_PATTERN_MARKDOWN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PATTERN_MARKDOWN])) { + $this->setPatternMarkdown(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_PATTERN_MARKDOWN]] + $ext)); + } else if (is_array($data[self::FIELD_PATTERN_MARKDOWN])) { + $this->setPatternMarkdown(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_PATTERN_MARKDOWN]))); + } } else { $this->setPatternMarkdown(new FHIRMarkdown($data[self::FIELD_PATTERN_MARKDOWN])); } @@ -5842,8 +6364,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PATTERN_OID] instanceof FHIROid) { $this->setPatternOid($data[self::FIELD_PATTERN_OID]); - } elseif ($ext && is_scalar($data[self::FIELD_PATTERN_OID])) { - $this->setPatternOid(new FHIROid([FHIROid::FIELD_VALUE => $data[self::FIELD_PATTERN_OID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PATTERN_OID])) { + $this->setPatternOid(new FHIROid([FHIROid::FIELD_VALUE => $data[self::FIELD_PATTERN_OID]] + $ext)); + } else if (is_array($data[self::FIELD_PATTERN_OID])) { + $this->setPatternOid(new FHIROid(array_merge($ext, $data[self::FIELD_PATTERN_OID]))); + } } else { $this->setPatternOid(new FHIROid($data[self::FIELD_PATTERN_OID])); } @@ -5861,8 +6387,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PATTERN_POSITIVE_INT] instanceof FHIRPositiveInt) { $this->setPatternPositiveInt($data[self::FIELD_PATTERN_POSITIVE_INT]); - } elseif ($ext && is_scalar($data[self::FIELD_PATTERN_POSITIVE_INT])) { - $this->setPatternPositiveInt(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_PATTERN_POSITIVE_INT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PATTERN_POSITIVE_INT])) { + $this->setPatternPositiveInt(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_PATTERN_POSITIVE_INT]] + $ext)); + } else if (is_array($data[self::FIELD_PATTERN_POSITIVE_INT])) { + $this->setPatternPositiveInt(new FHIRPositiveInt(array_merge($ext, $data[self::FIELD_PATTERN_POSITIVE_INT]))); + } } else { $this->setPatternPositiveInt(new FHIRPositiveInt($data[self::FIELD_PATTERN_POSITIVE_INT])); } @@ -5873,8 +6403,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PATTERN_QUANTITY] instanceof FHIRQuantity) { $this->setPatternQuantity($data[self::FIELD_PATTERN_QUANTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_PATTERN_QUANTITY])) { - $this->setPatternQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_PATTERN_QUANTITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PATTERN_QUANTITY])) { + $this->setPatternQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_PATTERN_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_PATTERN_QUANTITY])) { + $this->setPatternQuantity(new FHIRQuantity(array_merge($ext, $data[self::FIELD_PATTERN_QUANTITY]))); + } } else { $this->setPatternQuantity(new FHIRQuantity($data[self::FIELD_PATTERN_QUANTITY])); } @@ -5920,8 +6454,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PATTERN_STRING] instanceof FHIRString) { $this->setPatternString($data[self::FIELD_PATTERN_STRING]); - } elseif ($ext && is_scalar($data[self::FIELD_PATTERN_STRING])) { - $this->setPatternString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PATTERN_STRING]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PATTERN_STRING])) { + $this->setPatternString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PATTERN_STRING]] + $ext)); + } else if (is_array($data[self::FIELD_PATTERN_STRING])) { + $this->setPatternString(new FHIRString(array_merge($ext, $data[self::FIELD_PATTERN_STRING]))); + } } else { $this->setPatternString(new FHIRString($data[self::FIELD_PATTERN_STRING])); } @@ -5932,8 +6470,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PATTERN_TIME] instanceof FHIRTime) { $this->setPatternTime($data[self::FIELD_PATTERN_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_PATTERN_TIME])) { - $this->setPatternTime(new FHIRTime([FHIRTime::FIELD_VALUE => $data[self::FIELD_PATTERN_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PATTERN_TIME])) { + $this->setPatternTime(new FHIRTime([FHIRTime::FIELD_VALUE => $data[self::FIELD_PATTERN_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_PATTERN_TIME])) { + $this->setPatternTime(new FHIRTime(array_merge($ext, $data[self::FIELD_PATTERN_TIME]))); + } } else { $this->setPatternTime(new FHIRTime($data[self::FIELD_PATTERN_TIME])); } @@ -5951,8 +6493,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PATTERN_UNSIGNED_INT] instanceof FHIRUnsignedInt) { $this->setPatternUnsignedInt($data[self::FIELD_PATTERN_UNSIGNED_INT]); - } elseif ($ext && is_scalar($data[self::FIELD_PATTERN_UNSIGNED_INT])) { - $this->setPatternUnsignedInt(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_PATTERN_UNSIGNED_INT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PATTERN_UNSIGNED_INT])) { + $this->setPatternUnsignedInt(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_PATTERN_UNSIGNED_INT]] + $ext)); + } else if (is_array($data[self::FIELD_PATTERN_UNSIGNED_INT])) { + $this->setPatternUnsignedInt(new FHIRUnsignedInt(array_merge($ext, $data[self::FIELD_PATTERN_UNSIGNED_INT]))); + } } else { $this->setPatternUnsignedInt(new FHIRUnsignedInt($data[self::FIELD_PATTERN_UNSIGNED_INT])); } @@ -5963,8 +6509,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PATTERN_URI] instanceof FHIRUri) { $this->setPatternUri($data[self::FIELD_PATTERN_URI]); - } elseif ($ext && is_scalar($data[self::FIELD_PATTERN_URI])) { - $this->setPatternUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_PATTERN_URI]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PATTERN_URI])) { + $this->setPatternUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_PATTERN_URI]] + $ext)); + } else if (is_array($data[self::FIELD_PATTERN_URI])) { + $this->setPatternUri(new FHIRUri(array_merge($ext, $data[self::FIELD_PATTERN_URI]))); + } } else { $this->setPatternUri(new FHIRUri($data[self::FIELD_PATTERN_URI])); } @@ -5975,8 +6525,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PATTERN_UUID] instanceof FHIRUuid) { $this->setPatternUuid($data[self::FIELD_PATTERN_UUID]); - } elseif ($ext && is_scalar($data[self::FIELD_PATTERN_UUID])) { - $this->setPatternUuid(new FHIRUuid([FHIRUuid::FIELD_VALUE => $data[self::FIELD_PATTERN_UUID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PATTERN_UUID])) { + $this->setPatternUuid(new FHIRUuid([FHIRUuid::FIELD_VALUE => $data[self::FIELD_PATTERN_UUID]] + $ext)); + } else if (is_array($data[self::FIELD_PATTERN_UUID])) { + $this->setPatternUuid(new FHIRUuid(array_merge($ext, $data[self::FIELD_PATTERN_UUID]))); + } } else { $this->setPatternUuid(new FHIRUuid($data[self::FIELD_PATTERN_UUID])); } @@ -5987,17 +6541,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_REPRESENTATION])) { foreach($data[self::FIELD_REPRESENTATION] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRPropertyRepresentation) { $this->addRepresentation($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addRepresentation(new FHIRPropertyRepresentation([FHIRPropertyRepresentation::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addRepresentation(new FHIRPropertyRepresentation([FHIRPropertyRepresentation::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addRepresentation(new FHIRPropertyRepresentation(array_merge($v, $ext[$i]))); + } } else { $this->addRepresentation(new FHIRPropertyRepresentation($v)); } } } elseif ($data[self::FIELD_REPRESENTATION] instanceof FHIRPropertyRepresentation) { $this->addRepresentation($data[self::FIELD_REPRESENTATION]); - } elseif ($ext && is_scalar($data[self::FIELD_REPRESENTATION])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_REPRESENTATION])) { $this->addRepresentation(new FHIRPropertyRepresentation([FHIRPropertyRepresentation::FIELD_VALUE => $data[self::FIELD_REPRESENTATION]] + $ext)); } else { $this->addRepresentation(new FHIRPropertyRepresentation($data[self::FIELD_REPRESENTATION])); @@ -6009,8 +6570,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_REQUIREMENTS] instanceof FHIRMarkdown) { $this->setRequirements($data[self::FIELD_REQUIREMENTS]); - } elseif ($ext && is_scalar($data[self::FIELD_REQUIREMENTS])) { - $this->setRequirements(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_REQUIREMENTS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_REQUIREMENTS])) { + $this->setRequirements(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_REQUIREMENTS]] + $ext)); + } else if (is_array($data[self::FIELD_REQUIREMENTS])) { + $this->setRequirements(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_REQUIREMENTS]))); + } } else { $this->setRequirements(new FHIRMarkdown($data[self::FIELD_REQUIREMENTS])); } @@ -6021,8 +6586,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SHORT] instanceof FHIRString) { $this->setShort($data[self::FIELD_SHORT]); - } elseif ($ext && is_scalar($data[self::FIELD_SHORT])) { - $this->setShort(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SHORT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SHORT])) { + $this->setShort(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SHORT]] + $ext)); + } else if (is_array($data[self::FIELD_SHORT])) { + $this->setShort(new FHIRString(array_merge($ext, $data[self::FIELD_SHORT]))); + } } else { $this->setShort(new FHIRString($data[self::FIELD_SHORT])); } @@ -6037,6 +6606,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_TYPE])) { if (is_array($data[self::FIELD_TYPE])) { foreach($data[self::FIELD_TYPE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRElementDefinitionType) { $this->addType($v); } else { @@ -16637,11 +17209,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getBase())) { $v->xmlSerialize($sxe->addChild(self::FIELD_BASE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getBinding())) { $v->xmlSerialize($sxe->addChild(self::FIELD_BINDING, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getCode())) { foreach($vs as $v) { if (null === $v) { @@ -16650,6 +17220,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getComments())) { $v->xmlSerialize($sxe->addChild(self::FIELD_COMMENTS, null, $v->_getFHIRXMLNamespace())); } @@ -16674,11 +17245,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDefaultValueAddress())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFAULT_VALUE_ADDRESS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDefaultValueAnnotation())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFAULT_VALUE_ANNOTATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDefaultValueAttachment())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFAULT_VALUE_ATTACHMENT, null, $v->_getFHIRXMLNamespace())); } @@ -16691,15 +17260,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDefaultValueCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFAULT_VALUE_CODE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDefaultValueCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFAULT_VALUE_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDefaultValueCoding())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFAULT_VALUE_CODING, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDefaultValueContactPoint())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFAULT_VALUE_CONTACT_POINT, null, $v->_getFHIRXMLNamespace())); } @@ -16712,14 +17278,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDefaultValueDecimal())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFAULT_VALUE_DECIMAL, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDefaultValueHumanName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFAULT_VALUE_HUMAN_NAME, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getDefaultValueId())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFAULT_VALUE_ID, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDefaultValueIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFAULT_VALUE_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } @@ -16732,41 +17296,33 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDefaultValueMarkdown())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFAULT_VALUE_MARKDOWN, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDefaultValueMeta())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFAULT_VALUE_META, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getDefaultValueOid())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFAULT_VALUE_OID, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDefaultValuePeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFAULT_VALUE_PERIOD, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getDefaultValuePositiveInt())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFAULT_VALUE_POSITIVE_INT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDefaultValueQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFAULT_VALUE_QUANTITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDefaultValueRange())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFAULT_VALUE_RANGE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDefaultValueRatio())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFAULT_VALUE_RATIO, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDefaultValueReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFAULT_VALUE_REFERENCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDefaultValueSampledData())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFAULT_VALUE_SAMPLED_DATA, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDefaultValueSignature())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFAULT_VALUE_SIGNATURE, null, $v->_getFHIRXMLNamespace())); } @@ -16776,7 +17332,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDefaultValueTime())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFAULT_VALUE_TIME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDefaultValueTiming())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFAULT_VALUE_TIMING, null, $v->_getFHIRXMLNamespace())); } @@ -16792,15 +17347,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDefinition())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFINITION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getExampleAddress())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EXAMPLE_ADDRESS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getExampleAnnotation())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EXAMPLE_ANNOTATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getExampleAttachment())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EXAMPLE_ATTACHMENT, null, $v->_getFHIRXMLNamespace())); } @@ -16813,15 +17365,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getExampleCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EXAMPLE_CODE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getExampleCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EXAMPLE_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getExampleCoding())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EXAMPLE_CODING, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getExampleContactPoint())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EXAMPLE_CONTACT_POINT, null, $v->_getFHIRXMLNamespace())); } @@ -16834,14 +17383,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getExampleDecimal())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EXAMPLE_DECIMAL, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getExampleHumanName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EXAMPLE_HUMAN_NAME, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getExampleId())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EXAMPLE_ID, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getExampleIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EXAMPLE_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } @@ -16854,41 +17401,33 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getExampleMarkdown())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EXAMPLE_MARKDOWN, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getExampleMeta())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EXAMPLE_META, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getExampleOid())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EXAMPLE_OID, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getExamplePeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EXAMPLE_PERIOD, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getExamplePositiveInt())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EXAMPLE_POSITIVE_INT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getExampleQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EXAMPLE_QUANTITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getExampleRange())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EXAMPLE_RANGE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getExampleRatio())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EXAMPLE_RATIO, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getExampleReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EXAMPLE_REFERENCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getExampleSampledData())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EXAMPLE_SAMPLED_DATA, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getExampleSignature())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EXAMPLE_SIGNATURE, null, $v->_getFHIRXMLNamespace())); } @@ -16898,7 +17437,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getExampleTime())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EXAMPLE_TIME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getExampleTiming())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EXAMPLE_TIMING, null, $v->_getFHIRXMLNamespace())); } @@ -16911,15 +17449,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getExampleUuid())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EXAMPLE_UUID, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getFixedAddress())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FIXED_ADDRESS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getFixedAnnotation())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FIXED_ANNOTATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getFixedAttachment())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FIXED_ATTACHMENT, null, $v->_getFHIRXMLNamespace())); } @@ -16932,15 +17467,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getFixedCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FIXED_CODE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getFixedCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FIXED_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getFixedCoding())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FIXED_CODING, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getFixedContactPoint())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FIXED_CONTACT_POINT, null, $v->_getFHIRXMLNamespace())); } @@ -16953,14 +17485,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getFixedDecimal())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FIXED_DECIMAL, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getFixedHumanName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FIXED_HUMAN_NAME, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getFixedId())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FIXED_ID, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getFixedIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FIXED_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } @@ -16973,41 +17503,33 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getFixedMarkdown())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FIXED_MARKDOWN, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getFixedMeta())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FIXED_META, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getFixedOid())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FIXED_OID, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getFixedPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FIXED_PERIOD, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getFixedPositiveInt())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FIXED_POSITIVE_INT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getFixedQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FIXED_QUANTITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getFixedRange())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FIXED_RANGE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getFixedRatio())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FIXED_RATIO, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getFixedReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FIXED_REFERENCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getFixedSampledData())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FIXED_SAMPLED_DATA, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getFixedSignature())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FIXED_SIGNATURE, null, $v->_getFHIRXMLNamespace())); } @@ -17017,7 +17539,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getFixedTime())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FIXED_TIME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getFixedTiming())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FIXED_TIMING, null, $v->_getFHIRXMLNamespace())); } @@ -17039,7 +17560,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getLabel())) { $v->xmlSerialize($sxe->addChild(self::FIELD_LABEL, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getMapping())) { foreach($vs as $v) { if (null === $v) { @@ -17048,21 +17568,19 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_MAPPING, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getMax())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MAX, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getMaxLength())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MAX_LENGTH, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getMaxValueAddress())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MAX_VALUE_ADDRESS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getMaxValueAnnotation())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MAX_VALUE_ANNOTATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getMaxValueAttachment())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MAX_VALUE_ATTACHMENT, null, $v->_getFHIRXMLNamespace())); } @@ -17075,15 +17593,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getMaxValueCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MAX_VALUE_CODE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getMaxValueCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MAX_VALUE_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getMaxValueCoding())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MAX_VALUE_CODING, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getMaxValueContactPoint())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MAX_VALUE_CONTACT_POINT, null, $v->_getFHIRXMLNamespace())); } @@ -17096,14 +17611,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getMaxValueDecimal())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MAX_VALUE_DECIMAL, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getMaxValueHumanName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MAX_VALUE_HUMAN_NAME, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getMaxValueId())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MAX_VALUE_ID, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getMaxValueIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MAX_VALUE_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } @@ -17116,41 +17629,33 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getMaxValueMarkdown())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MAX_VALUE_MARKDOWN, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getMaxValueMeta())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MAX_VALUE_META, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getMaxValueOid())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MAX_VALUE_OID, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getMaxValuePeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MAX_VALUE_PERIOD, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getMaxValuePositiveInt())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MAX_VALUE_POSITIVE_INT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getMaxValueQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MAX_VALUE_QUANTITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getMaxValueRange())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MAX_VALUE_RANGE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getMaxValueRatio())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MAX_VALUE_RATIO, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getMaxValueReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MAX_VALUE_REFERENCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getMaxValueSampledData())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MAX_VALUE_SAMPLED_DATA, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getMaxValueSignature())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MAX_VALUE_SIGNATURE, null, $v->_getFHIRXMLNamespace())); } @@ -17160,7 +17665,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getMaxValueTime())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MAX_VALUE_TIME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getMaxValueTiming())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MAX_VALUE_TIMING, null, $v->_getFHIRXMLNamespace())); } @@ -17179,15 +17683,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getMin())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MIN, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getMinValueAddress())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MIN_VALUE_ADDRESS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getMinValueAnnotation())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MIN_VALUE_ANNOTATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getMinValueAttachment())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MIN_VALUE_ATTACHMENT, null, $v->_getFHIRXMLNamespace())); } @@ -17200,15 +17701,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getMinValueCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MIN_VALUE_CODE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getMinValueCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MIN_VALUE_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getMinValueCoding())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MIN_VALUE_CODING, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getMinValueContactPoint())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MIN_VALUE_CONTACT_POINT, null, $v->_getFHIRXMLNamespace())); } @@ -17221,14 +17719,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getMinValueDecimal())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MIN_VALUE_DECIMAL, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getMinValueHumanName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MIN_VALUE_HUMAN_NAME, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getMinValueId())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MIN_VALUE_ID, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getMinValueIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MIN_VALUE_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } @@ -17241,41 +17737,33 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getMinValueMarkdown())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MIN_VALUE_MARKDOWN, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getMinValueMeta())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MIN_VALUE_META, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getMinValueOid())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MIN_VALUE_OID, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getMinValuePeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MIN_VALUE_PERIOD, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getMinValuePositiveInt())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MIN_VALUE_POSITIVE_INT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getMinValueQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MIN_VALUE_QUANTITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getMinValueRange())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MIN_VALUE_RANGE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getMinValueRatio())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MIN_VALUE_RATIO, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getMinValueReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MIN_VALUE_REFERENCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getMinValueSampledData())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MIN_VALUE_SAMPLED_DATA, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getMinValueSignature())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MIN_VALUE_SIGNATURE, null, $v->_getFHIRXMLNamespace())); } @@ -17285,7 +17773,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getMinValueTime())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MIN_VALUE_TIME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getMinValueTiming())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MIN_VALUE_TIMING, null, $v->_getFHIRXMLNamespace())); } @@ -17310,15 +17797,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getPath())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATH, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPatternAddress())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATTERN_ADDRESS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPatternAnnotation())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATTERN_ANNOTATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPatternAttachment())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATTERN_ATTACHMENT, null, $v->_getFHIRXMLNamespace())); } @@ -17331,15 +17815,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getPatternCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATTERN_CODE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPatternCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATTERN_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPatternCoding())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATTERN_CODING, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPatternContactPoint())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATTERN_CONTACT_POINT, null, $v->_getFHIRXMLNamespace())); } @@ -17352,14 +17833,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getPatternDecimal())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATTERN_DECIMAL, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPatternHumanName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATTERN_HUMAN_NAME, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getPatternId())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATTERN_ID, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPatternIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATTERN_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } @@ -17372,41 +17851,33 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getPatternMarkdown())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATTERN_MARKDOWN, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPatternMeta())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATTERN_META, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getPatternOid())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATTERN_OID, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPatternPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATTERN_PERIOD, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getPatternPositiveInt())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATTERN_POSITIVE_INT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPatternQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATTERN_QUANTITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPatternRange())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATTERN_RANGE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPatternRatio())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATTERN_RATIO, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPatternReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATTERN_REFERENCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPatternSampledData())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATTERN_SAMPLED_DATA, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPatternSignature())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATTERN_SIGNATURE, null, $v->_getFHIRXMLNamespace())); } @@ -17416,7 +17887,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getPatternTime())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATTERN_TIME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPatternTiming())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATTERN_TIMING, null, $v->_getFHIRXMLNamespace())); } @@ -17429,7 +17899,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getPatternUuid())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATTERN_UUID, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getRepresentation())) { foreach($vs as $v) { if (null === $v) { @@ -17438,17 +17907,16 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_REPRESENTATION, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getRequirements())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REQUIREMENTS, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getShort())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SHORT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSlicing())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SLICING, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getType())) { foreach($vs as $v) { if (null === $v) { @@ -17457,6 +17925,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } @@ -17472,8 +17941,17 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_ALIAS][] = $v->getValue(); - $a[self::FIELD_ALIAS_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ALIAS][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ALIAS_EXT][] = $enc; + } else { + $a[self::FIELD_ALIAS_EXT][] = null; + } + } else { + $a[self::FIELD_ALIAS][] = $v; + } } } if (null !== ($v = $this->getBase())) { @@ -17486,8 +17964,15 @@ public function jsonSerialize() $a[self::FIELD_CODE] = $vs; } if (null !== ($v = $this->getComments())) { - $a[self::FIELD_COMMENTS] = $v->getValue(); - $a[self::FIELD_COMMENTS_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_COMMENTS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_COMMENTS_EXT] = $enc; + } + } else { + $a[self::FIELD_COMMENTS] = $v; + } } if ([] !== ($vs = $this->getCondition())) { $a[self::FIELD_CONDITION] = []; @@ -17495,8 +17980,17 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_CONDITION][] = $v->getValue(); - $a[self::FIELD_CONDITION_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CONDITION][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CONDITION_EXT][] = $enc; + } else { + $a[self::FIELD_CONDITION_EXT][] = null; + } + } else { + $a[self::FIELD_CONDITION][] = $v; + } } } if ([] !== ($vs = $this->getConstraint())) { @@ -17512,16 +18006,37 @@ public function jsonSerialize() $a[self::FIELD_DEFAULT_VALUE_ATTACHMENT] = $v; } if (null !== ($v = $this->getDefaultValueBase64Binary())) { - $a[self::FIELD_DEFAULT_VALUE_BASE_64BINARY] = $v->getValue(); - $a[self::FIELD_DEFAULT_VALUE_BASE_64BINARY_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DEFAULT_VALUE_BASE_64BINARY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DEFAULT_VALUE_BASE_64BINARY_EXT] = $enc; + } + } else { + $a[self::FIELD_DEFAULT_VALUE_BASE_64BINARY] = $v; + } } if (null !== ($v = $this->getDefaultValueBoolean())) { - $a[self::FIELD_DEFAULT_VALUE_BOOLEAN] = $v->getValue(); - $a[self::FIELD_DEFAULT_VALUE_BOOLEAN_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DEFAULT_VALUE_BOOLEAN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DEFAULT_VALUE_BOOLEAN_EXT] = $enc; + } + } else { + $a[self::FIELD_DEFAULT_VALUE_BOOLEAN] = $v; + } } if (null !== ($v = $this->getDefaultValueCode())) { - $a[self::FIELD_DEFAULT_VALUE_CODE] = $v->getValue(); - $a[self::FIELD_DEFAULT_VALUE_CODE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DEFAULT_VALUE_CODE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DEFAULT_VALUE_CODE_EXT] = $enc; + } + } else { + $a[self::FIELD_DEFAULT_VALUE_CODE] = $v; + } } if (null !== ($v = $this->getDefaultValueCodeableConcept())) { $a[self::FIELD_DEFAULT_VALUE_CODEABLE_CONCEPT] = $v; @@ -17530,58 +18045,145 @@ public function jsonSerialize() $a[self::FIELD_DEFAULT_VALUE_CODING] = $v; } if (null !== ($v = $this->getDefaultValueContactPoint())) { - $a[self::FIELD_DEFAULT_VALUE_CONTACT_POINT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DEFAULT_VALUE_CONTACT_POINT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DEFAULT_VALUE_CONTACT_POINT_EXT] = $enc; + } + } else { + $a[self::FIELD_DEFAULT_VALUE_CONTACT_POINT] = $v; + } } if (null !== ($v = $this->getDefaultValueDate())) { - $a[self::FIELD_DEFAULT_VALUE_DATE] = $v->getValue(); - $a[self::FIELD_DEFAULT_VALUE_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DEFAULT_VALUE_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DEFAULT_VALUE_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_DEFAULT_VALUE_DATE] = $v; + } } if (null !== ($v = $this->getDefaultValueDateTime())) { - $a[self::FIELD_DEFAULT_VALUE_DATE_TIME] = $v->getValue(); - $a[self::FIELD_DEFAULT_VALUE_DATE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DEFAULT_VALUE_DATE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DEFAULT_VALUE_DATE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_DEFAULT_VALUE_DATE_TIME] = $v; + } } if (null !== ($v = $this->getDefaultValueDecimal())) { - $a[self::FIELD_DEFAULT_VALUE_DECIMAL] = $v->getValue(); - $a[self::FIELD_DEFAULT_VALUE_DECIMAL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DEFAULT_VALUE_DECIMAL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DEFAULT_VALUE_DECIMAL_EXT] = $enc; + } + } else { + $a[self::FIELD_DEFAULT_VALUE_DECIMAL] = $v; + } } if (null !== ($v = $this->getDefaultValueHumanName())) { $a[self::FIELD_DEFAULT_VALUE_HUMAN_NAME] = $v; } if (null !== ($v = $this->getDefaultValueId())) { - $a[self::FIELD_DEFAULT_VALUE_ID] = $v->getValue(); - $a[self::FIELD_DEFAULT_VALUE_ID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DEFAULT_VALUE_ID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DEFAULT_VALUE_ID_EXT] = $enc; + } + } else { + $a[self::FIELD_DEFAULT_VALUE_ID] = $v; + } } if (null !== ($v = $this->getDefaultValueIdentifier())) { - $a[self::FIELD_DEFAULT_VALUE_IDENTIFIER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DEFAULT_VALUE_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DEFAULT_VALUE_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_DEFAULT_VALUE_IDENTIFIER] = $v; + } } if (null !== ($v = $this->getDefaultValueInstant())) { - $a[self::FIELD_DEFAULT_VALUE_INSTANT] = $v->getValue(); - $a[self::FIELD_DEFAULT_VALUE_INSTANT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DEFAULT_VALUE_INSTANT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DEFAULT_VALUE_INSTANT_EXT] = $enc; + } + } else { + $a[self::FIELD_DEFAULT_VALUE_INSTANT] = $v; + } } if (null !== ($v = $this->getDefaultValueInteger())) { - $a[self::FIELD_DEFAULT_VALUE_INTEGER] = $v->getValue(); - $a[self::FIELD_DEFAULT_VALUE_INTEGER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DEFAULT_VALUE_INTEGER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DEFAULT_VALUE_INTEGER_EXT] = $enc; + } + } else { + $a[self::FIELD_DEFAULT_VALUE_INTEGER] = $v; + } } if (null !== ($v = $this->getDefaultValueMarkdown())) { - $a[self::FIELD_DEFAULT_VALUE_MARKDOWN] = $v->getValue(); - $a[self::FIELD_DEFAULT_VALUE_MARKDOWN_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DEFAULT_VALUE_MARKDOWN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DEFAULT_VALUE_MARKDOWN_EXT] = $enc; + } + } else { + $a[self::FIELD_DEFAULT_VALUE_MARKDOWN] = $v; + } } if (null !== ($v = $this->getDefaultValueMeta())) { $a[self::FIELD_DEFAULT_VALUE_META] = $v; } if (null !== ($v = $this->getDefaultValueOid())) { - $a[self::FIELD_DEFAULT_VALUE_OID] = $v->getValue(); - $a[self::FIELD_DEFAULT_VALUE_OID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DEFAULT_VALUE_OID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DEFAULT_VALUE_OID_EXT] = $enc; + } + } else { + $a[self::FIELD_DEFAULT_VALUE_OID] = $v; + } } if (null !== ($v = $this->getDefaultValuePeriod())) { $a[self::FIELD_DEFAULT_VALUE_PERIOD] = $v; } if (null !== ($v = $this->getDefaultValuePositiveInt())) { - $a[self::FIELD_DEFAULT_VALUE_POSITIVE_INT] = $v->getValue(); - $a[self::FIELD_DEFAULT_VALUE_POSITIVE_INT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DEFAULT_VALUE_POSITIVE_INT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DEFAULT_VALUE_POSITIVE_INT_EXT] = $enc; + } + } else { + $a[self::FIELD_DEFAULT_VALUE_POSITIVE_INT] = $v; + } } if (null !== ($v = $this->getDefaultValueQuantity())) { - $a[self::FIELD_DEFAULT_VALUE_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DEFAULT_VALUE_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DEFAULT_VALUE_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_DEFAULT_VALUE_QUANTITY] = $v; + } } if (null !== ($v = $this->getDefaultValueRange())) { $a[self::FIELD_DEFAULT_VALUE_RANGE] = $v; @@ -17599,31 +18201,73 @@ public function jsonSerialize() $a[self::FIELD_DEFAULT_VALUE_SIGNATURE] = $v; } if (null !== ($v = $this->getDefaultValueString())) { - $a[self::FIELD_DEFAULT_VALUE_STRING] = $v->getValue(); - $a[self::FIELD_DEFAULT_VALUE_STRING_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DEFAULT_VALUE_STRING] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DEFAULT_VALUE_STRING_EXT] = $enc; + } + } else { + $a[self::FIELD_DEFAULT_VALUE_STRING] = $v; + } } if (null !== ($v = $this->getDefaultValueTime())) { - $a[self::FIELD_DEFAULT_VALUE_TIME] = $v->getValue(); - $a[self::FIELD_DEFAULT_VALUE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DEFAULT_VALUE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DEFAULT_VALUE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_DEFAULT_VALUE_TIME] = $v; + } } if (null !== ($v = $this->getDefaultValueTiming())) { $a[self::FIELD_DEFAULT_VALUE_TIMING] = $v; } if (null !== ($v = $this->getDefaultValueUnsignedInt())) { - $a[self::FIELD_DEFAULT_VALUE_UNSIGNED_INT] = $v->getValue(); - $a[self::FIELD_DEFAULT_VALUE_UNSIGNED_INT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DEFAULT_VALUE_UNSIGNED_INT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DEFAULT_VALUE_UNSIGNED_INT_EXT] = $enc; + } + } else { + $a[self::FIELD_DEFAULT_VALUE_UNSIGNED_INT] = $v; + } } if (null !== ($v = $this->getDefaultValueUri())) { - $a[self::FIELD_DEFAULT_VALUE_URI] = $v->getValue(); - $a[self::FIELD_DEFAULT_VALUE_URI_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DEFAULT_VALUE_URI] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DEFAULT_VALUE_URI_EXT] = $enc; + } + } else { + $a[self::FIELD_DEFAULT_VALUE_URI] = $v; + } } if (null !== ($v = $this->getDefaultValueUuid())) { - $a[self::FIELD_DEFAULT_VALUE_UUID] = $v->getValue(); - $a[self::FIELD_DEFAULT_VALUE_UUID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DEFAULT_VALUE_UUID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DEFAULT_VALUE_UUID_EXT] = $enc; + } + } else { + $a[self::FIELD_DEFAULT_VALUE_UUID] = $v; + } } if (null !== ($v = $this->getDefinition())) { - $a[self::FIELD_DEFINITION] = $v->getValue(); - $a[self::FIELD_DEFINITION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DEFINITION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DEFINITION_EXT] = $enc; + } + } else { + $a[self::FIELD_DEFINITION] = $v; + } } if (null !== ($v = $this->getExampleAddress())) { $a[self::FIELD_EXAMPLE_ADDRESS] = $v; @@ -17635,16 +18279,37 @@ public function jsonSerialize() $a[self::FIELD_EXAMPLE_ATTACHMENT] = $v; } if (null !== ($v = $this->getExampleBase64Binary())) { - $a[self::FIELD_EXAMPLE_BASE_64BINARY] = $v->getValue(); - $a[self::FIELD_EXAMPLE_BASE_64BINARY_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EXAMPLE_BASE_64BINARY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EXAMPLE_BASE_64BINARY_EXT] = $enc; + } + } else { + $a[self::FIELD_EXAMPLE_BASE_64BINARY] = $v; + } } if (null !== ($v = $this->getExampleBoolean())) { - $a[self::FIELD_EXAMPLE_BOOLEAN] = $v->getValue(); - $a[self::FIELD_EXAMPLE_BOOLEAN_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EXAMPLE_BOOLEAN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EXAMPLE_BOOLEAN_EXT] = $enc; + } + } else { + $a[self::FIELD_EXAMPLE_BOOLEAN] = $v; + } } if (null !== ($v = $this->getExampleCode())) { - $a[self::FIELD_EXAMPLE_CODE] = $v->getValue(); - $a[self::FIELD_EXAMPLE_CODE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EXAMPLE_CODE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EXAMPLE_CODE_EXT] = $enc; + } + } else { + $a[self::FIELD_EXAMPLE_CODE] = $v; + } } if (null !== ($v = $this->getExampleCodeableConcept())) { $a[self::FIELD_EXAMPLE_CODEABLE_CONCEPT] = $v; @@ -17653,58 +18318,145 @@ public function jsonSerialize() $a[self::FIELD_EXAMPLE_CODING] = $v; } if (null !== ($v = $this->getExampleContactPoint())) { - $a[self::FIELD_EXAMPLE_CONTACT_POINT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EXAMPLE_CONTACT_POINT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EXAMPLE_CONTACT_POINT_EXT] = $enc; + } + } else { + $a[self::FIELD_EXAMPLE_CONTACT_POINT] = $v; + } } if (null !== ($v = $this->getExampleDate())) { - $a[self::FIELD_EXAMPLE_DATE] = $v->getValue(); - $a[self::FIELD_EXAMPLE_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EXAMPLE_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EXAMPLE_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_EXAMPLE_DATE] = $v; + } } if (null !== ($v = $this->getExampleDateTime())) { - $a[self::FIELD_EXAMPLE_DATE_TIME] = $v->getValue(); - $a[self::FIELD_EXAMPLE_DATE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EXAMPLE_DATE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EXAMPLE_DATE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_EXAMPLE_DATE_TIME] = $v; + } } if (null !== ($v = $this->getExampleDecimal())) { - $a[self::FIELD_EXAMPLE_DECIMAL] = $v->getValue(); - $a[self::FIELD_EXAMPLE_DECIMAL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EXAMPLE_DECIMAL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EXAMPLE_DECIMAL_EXT] = $enc; + } + } else { + $a[self::FIELD_EXAMPLE_DECIMAL] = $v; + } } if (null !== ($v = $this->getExampleHumanName())) { $a[self::FIELD_EXAMPLE_HUMAN_NAME] = $v; } if (null !== ($v = $this->getExampleId())) { - $a[self::FIELD_EXAMPLE_ID] = $v->getValue(); - $a[self::FIELD_EXAMPLE_ID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EXAMPLE_ID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EXAMPLE_ID_EXT] = $enc; + } + } else { + $a[self::FIELD_EXAMPLE_ID] = $v; + } } if (null !== ($v = $this->getExampleIdentifier())) { - $a[self::FIELD_EXAMPLE_IDENTIFIER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EXAMPLE_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EXAMPLE_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_EXAMPLE_IDENTIFIER] = $v; + } } if (null !== ($v = $this->getExampleInstant())) { - $a[self::FIELD_EXAMPLE_INSTANT] = $v->getValue(); - $a[self::FIELD_EXAMPLE_INSTANT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EXAMPLE_INSTANT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EXAMPLE_INSTANT_EXT] = $enc; + } + } else { + $a[self::FIELD_EXAMPLE_INSTANT] = $v; + } } if (null !== ($v = $this->getExampleInteger())) { - $a[self::FIELD_EXAMPLE_INTEGER] = $v->getValue(); - $a[self::FIELD_EXAMPLE_INTEGER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EXAMPLE_INTEGER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EXAMPLE_INTEGER_EXT] = $enc; + } + } else { + $a[self::FIELD_EXAMPLE_INTEGER] = $v; + } } if (null !== ($v = $this->getExampleMarkdown())) { - $a[self::FIELD_EXAMPLE_MARKDOWN] = $v->getValue(); - $a[self::FIELD_EXAMPLE_MARKDOWN_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EXAMPLE_MARKDOWN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EXAMPLE_MARKDOWN_EXT] = $enc; + } + } else { + $a[self::FIELD_EXAMPLE_MARKDOWN] = $v; + } } if (null !== ($v = $this->getExampleMeta())) { $a[self::FIELD_EXAMPLE_META] = $v; } if (null !== ($v = $this->getExampleOid())) { - $a[self::FIELD_EXAMPLE_OID] = $v->getValue(); - $a[self::FIELD_EXAMPLE_OID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EXAMPLE_OID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EXAMPLE_OID_EXT] = $enc; + } + } else { + $a[self::FIELD_EXAMPLE_OID] = $v; + } } if (null !== ($v = $this->getExamplePeriod())) { $a[self::FIELD_EXAMPLE_PERIOD] = $v; } if (null !== ($v = $this->getExamplePositiveInt())) { - $a[self::FIELD_EXAMPLE_POSITIVE_INT] = $v->getValue(); - $a[self::FIELD_EXAMPLE_POSITIVE_INT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EXAMPLE_POSITIVE_INT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EXAMPLE_POSITIVE_INT_EXT] = $enc; + } + } else { + $a[self::FIELD_EXAMPLE_POSITIVE_INT] = $v; + } } if (null !== ($v = $this->getExampleQuantity())) { - $a[self::FIELD_EXAMPLE_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EXAMPLE_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EXAMPLE_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_EXAMPLE_QUANTITY] = $v; + } } if (null !== ($v = $this->getExampleRange())) { $a[self::FIELD_EXAMPLE_RANGE] = $v; @@ -17722,27 +18474,62 @@ public function jsonSerialize() $a[self::FIELD_EXAMPLE_SIGNATURE] = $v; } if (null !== ($v = $this->getExampleString())) { - $a[self::FIELD_EXAMPLE_STRING] = $v->getValue(); - $a[self::FIELD_EXAMPLE_STRING_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EXAMPLE_STRING] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EXAMPLE_STRING_EXT] = $enc; + } + } else { + $a[self::FIELD_EXAMPLE_STRING] = $v; + } } if (null !== ($v = $this->getExampleTime())) { - $a[self::FIELD_EXAMPLE_TIME] = $v->getValue(); - $a[self::FIELD_EXAMPLE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EXAMPLE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EXAMPLE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_EXAMPLE_TIME] = $v; + } } if (null !== ($v = $this->getExampleTiming())) { $a[self::FIELD_EXAMPLE_TIMING] = $v; } if (null !== ($v = $this->getExampleUnsignedInt())) { - $a[self::FIELD_EXAMPLE_UNSIGNED_INT] = $v->getValue(); - $a[self::FIELD_EXAMPLE_UNSIGNED_INT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EXAMPLE_UNSIGNED_INT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EXAMPLE_UNSIGNED_INT_EXT] = $enc; + } + } else { + $a[self::FIELD_EXAMPLE_UNSIGNED_INT] = $v; + } } if (null !== ($v = $this->getExampleUri())) { - $a[self::FIELD_EXAMPLE_URI] = $v->getValue(); - $a[self::FIELD_EXAMPLE_URI_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EXAMPLE_URI] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EXAMPLE_URI_EXT] = $enc; + } + } else { + $a[self::FIELD_EXAMPLE_URI] = $v; + } } if (null !== ($v = $this->getExampleUuid())) { - $a[self::FIELD_EXAMPLE_UUID] = $v->getValue(); - $a[self::FIELD_EXAMPLE_UUID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EXAMPLE_UUID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EXAMPLE_UUID_EXT] = $enc; + } + } else { + $a[self::FIELD_EXAMPLE_UUID] = $v; + } } if (null !== ($v = $this->getFixedAddress())) { $a[self::FIELD_FIXED_ADDRESS] = $v; @@ -17754,16 +18541,37 @@ public function jsonSerialize() $a[self::FIELD_FIXED_ATTACHMENT] = $v; } if (null !== ($v = $this->getFixedBase64Binary())) { - $a[self::FIELD_FIXED_BASE_64BINARY] = $v->getValue(); - $a[self::FIELD_FIXED_BASE_64BINARY_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FIXED_BASE_64BINARY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FIXED_BASE_64BINARY_EXT] = $enc; + } + } else { + $a[self::FIELD_FIXED_BASE_64BINARY] = $v; + } } if (null !== ($v = $this->getFixedBoolean())) { - $a[self::FIELD_FIXED_BOOLEAN] = $v->getValue(); - $a[self::FIELD_FIXED_BOOLEAN_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FIXED_BOOLEAN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FIXED_BOOLEAN_EXT] = $enc; + } + } else { + $a[self::FIELD_FIXED_BOOLEAN] = $v; + } } if (null !== ($v = $this->getFixedCode())) { - $a[self::FIELD_FIXED_CODE] = $v->getValue(); - $a[self::FIELD_FIXED_CODE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FIXED_CODE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FIXED_CODE_EXT] = $enc; + } + } else { + $a[self::FIELD_FIXED_CODE] = $v; + } } if (null !== ($v = $this->getFixedCodeableConcept())) { $a[self::FIELD_FIXED_CODEABLE_CONCEPT] = $v; @@ -17772,58 +18580,145 @@ public function jsonSerialize() $a[self::FIELD_FIXED_CODING] = $v; } if (null !== ($v = $this->getFixedContactPoint())) { - $a[self::FIELD_FIXED_CONTACT_POINT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FIXED_CONTACT_POINT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FIXED_CONTACT_POINT_EXT] = $enc; + } + } else { + $a[self::FIELD_FIXED_CONTACT_POINT] = $v; + } } if (null !== ($v = $this->getFixedDate())) { - $a[self::FIELD_FIXED_DATE] = $v->getValue(); - $a[self::FIELD_FIXED_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FIXED_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FIXED_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_FIXED_DATE] = $v; + } } if (null !== ($v = $this->getFixedDateTime())) { - $a[self::FIELD_FIXED_DATE_TIME] = $v->getValue(); - $a[self::FIELD_FIXED_DATE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FIXED_DATE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FIXED_DATE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_FIXED_DATE_TIME] = $v; + } } if (null !== ($v = $this->getFixedDecimal())) { - $a[self::FIELD_FIXED_DECIMAL] = $v->getValue(); - $a[self::FIELD_FIXED_DECIMAL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FIXED_DECIMAL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FIXED_DECIMAL_EXT] = $enc; + } + } else { + $a[self::FIELD_FIXED_DECIMAL] = $v; + } } if (null !== ($v = $this->getFixedHumanName())) { $a[self::FIELD_FIXED_HUMAN_NAME] = $v; } if (null !== ($v = $this->getFixedId())) { - $a[self::FIELD_FIXED_ID] = $v->getValue(); - $a[self::FIELD_FIXED_ID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FIXED_ID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FIXED_ID_EXT] = $enc; + } + } else { + $a[self::FIELD_FIXED_ID] = $v; + } } if (null !== ($v = $this->getFixedIdentifier())) { - $a[self::FIELD_FIXED_IDENTIFIER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FIXED_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FIXED_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_FIXED_IDENTIFIER] = $v; + } } if (null !== ($v = $this->getFixedInstant())) { - $a[self::FIELD_FIXED_INSTANT] = $v->getValue(); - $a[self::FIELD_FIXED_INSTANT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FIXED_INSTANT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FIXED_INSTANT_EXT] = $enc; + } + } else { + $a[self::FIELD_FIXED_INSTANT] = $v; + } } if (null !== ($v = $this->getFixedInteger())) { - $a[self::FIELD_FIXED_INTEGER] = $v->getValue(); - $a[self::FIELD_FIXED_INTEGER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FIXED_INTEGER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FIXED_INTEGER_EXT] = $enc; + } + } else { + $a[self::FIELD_FIXED_INTEGER] = $v; + } } if (null !== ($v = $this->getFixedMarkdown())) { - $a[self::FIELD_FIXED_MARKDOWN] = $v->getValue(); - $a[self::FIELD_FIXED_MARKDOWN_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FIXED_MARKDOWN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FIXED_MARKDOWN_EXT] = $enc; + } + } else { + $a[self::FIELD_FIXED_MARKDOWN] = $v; + } } if (null !== ($v = $this->getFixedMeta())) { $a[self::FIELD_FIXED_META] = $v; } if (null !== ($v = $this->getFixedOid())) { - $a[self::FIELD_FIXED_OID] = $v->getValue(); - $a[self::FIELD_FIXED_OID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FIXED_OID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FIXED_OID_EXT] = $enc; + } + } else { + $a[self::FIELD_FIXED_OID] = $v; + } } if (null !== ($v = $this->getFixedPeriod())) { $a[self::FIELD_FIXED_PERIOD] = $v; } if (null !== ($v = $this->getFixedPositiveInt())) { - $a[self::FIELD_FIXED_POSITIVE_INT] = $v->getValue(); - $a[self::FIELD_FIXED_POSITIVE_INT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FIXED_POSITIVE_INT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FIXED_POSITIVE_INT_EXT] = $enc; + } + } else { + $a[self::FIELD_FIXED_POSITIVE_INT] = $v; + } } if (null !== ($v = $this->getFixedQuantity())) { - $a[self::FIELD_FIXED_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FIXED_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FIXED_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_FIXED_QUANTITY] = $v; + } } if (null !== ($v = $this->getFixedRange())) { $a[self::FIELD_FIXED_RANGE] = $v; @@ -17841,50 +18736,120 @@ public function jsonSerialize() $a[self::FIELD_FIXED_SIGNATURE] = $v; } if (null !== ($v = $this->getFixedString())) { - $a[self::FIELD_FIXED_STRING] = $v->getValue(); - $a[self::FIELD_FIXED_STRING_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FIXED_STRING] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FIXED_STRING_EXT] = $enc; + } + } else { + $a[self::FIELD_FIXED_STRING] = $v; + } } if (null !== ($v = $this->getFixedTime())) { - $a[self::FIELD_FIXED_TIME] = $v->getValue(); - $a[self::FIELD_FIXED_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FIXED_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FIXED_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_FIXED_TIME] = $v; + } } if (null !== ($v = $this->getFixedTiming())) { $a[self::FIELD_FIXED_TIMING] = $v; } if (null !== ($v = $this->getFixedUnsignedInt())) { - $a[self::FIELD_FIXED_UNSIGNED_INT] = $v->getValue(); - $a[self::FIELD_FIXED_UNSIGNED_INT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FIXED_UNSIGNED_INT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FIXED_UNSIGNED_INT_EXT] = $enc; + } + } else { + $a[self::FIELD_FIXED_UNSIGNED_INT] = $v; + } } if (null !== ($v = $this->getFixedUri())) { - $a[self::FIELD_FIXED_URI] = $v->getValue(); - $a[self::FIELD_FIXED_URI_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FIXED_URI] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FIXED_URI_EXT] = $enc; + } + } else { + $a[self::FIELD_FIXED_URI] = $v; + } } if (null !== ($v = $this->getFixedUuid())) { - $a[self::FIELD_FIXED_UUID] = $v->getValue(); - $a[self::FIELD_FIXED_UUID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FIXED_UUID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FIXED_UUID_EXT] = $enc; + } + } else { + $a[self::FIELD_FIXED_UUID] = $v; + } } if (null !== ($v = $this->getIsModifier())) { - $a[self::FIELD_IS_MODIFIER] = $v->getValue(); - $a[self::FIELD_IS_MODIFIER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IS_MODIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IS_MODIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_IS_MODIFIER] = $v; + } } if (null !== ($v = $this->getIsSummary())) { - $a[self::FIELD_IS_SUMMARY] = $v->getValue(); - $a[self::FIELD_IS_SUMMARY_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IS_SUMMARY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IS_SUMMARY_EXT] = $enc; + } + } else { + $a[self::FIELD_IS_SUMMARY] = $v; + } } if (null !== ($v = $this->getLabel())) { - $a[self::FIELD_LABEL] = $v->getValue(); - $a[self::FIELD_LABEL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_LABEL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_LABEL_EXT] = $enc; + } + } else { + $a[self::FIELD_LABEL] = $v; + } } if ([] !== ($vs = $this->getMapping())) { $a[self::FIELD_MAPPING] = $vs; } if (null !== ($v = $this->getMax())) { - $a[self::FIELD_MAX] = $v->getValue(); - $a[self::FIELD_MAX_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MAX] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MAX_EXT] = $enc; + } + } else { + $a[self::FIELD_MAX] = $v; + } } if (null !== ($v = $this->getMaxLength())) { - $a[self::FIELD_MAX_LENGTH] = $v->getValue(); - $a[self::FIELD_MAX_LENGTH_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MAX_LENGTH] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MAX_LENGTH_EXT] = $enc; + } + } else { + $a[self::FIELD_MAX_LENGTH] = $v; + } } if (null !== ($v = $this->getMaxValueAddress())) { $a[self::FIELD_MAX_VALUE_ADDRESS] = $v; @@ -17896,16 +18861,37 @@ public function jsonSerialize() $a[self::FIELD_MAX_VALUE_ATTACHMENT] = $v; } if (null !== ($v = $this->getMaxValueBase64Binary())) { - $a[self::FIELD_MAX_VALUE_BASE_64BINARY] = $v->getValue(); - $a[self::FIELD_MAX_VALUE_BASE_64BINARY_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MAX_VALUE_BASE_64BINARY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MAX_VALUE_BASE_64BINARY_EXT] = $enc; + } + } else { + $a[self::FIELD_MAX_VALUE_BASE_64BINARY] = $v; + } } if (null !== ($v = $this->getMaxValueBoolean())) { - $a[self::FIELD_MAX_VALUE_BOOLEAN] = $v->getValue(); - $a[self::FIELD_MAX_VALUE_BOOLEAN_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MAX_VALUE_BOOLEAN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MAX_VALUE_BOOLEAN_EXT] = $enc; + } + } else { + $a[self::FIELD_MAX_VALUE_BOOLEAN] = $v; + } } if (null !== ($v = $this->getMaxValueCode())) { - $a[self::FIELD_MAX_VALUE_CODE] = $v->getValue(); - $a[self::FIELD_MAX_VALUE_CODE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MAX_VALUE_CODE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MAX_VALUE_CODE_EXT] = $enc; + } + } else { + $a[self::FIELD_MAX_VALUE_CODE] = $v; + } } if (null !== ($v = $this->getMaxValueCodeableConcept())) { $a[self::FIELD_MAX_VALUE_CODEABLE_CONCEPT] = $v; @@ -17914,58 +18900,145 @@ public function jsonSerialize() $a[self::FIELD_MAX_VALUE_CODING] = $v; } if (null !== ($v = $this->getMaxValueContactPoint())) { - $a[self::FIELD_MAX_VALUE_CONTACT_POINT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MAX_VALUE_CONTACT_POINT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MAX_VALUE_CONTACT_POINT_EXT] = $enc; + } + } else { + $a[self::FIELD_MAX_VALUE_CONTACT_POINT] = $v; + } } if (null !== ($v = $this->getMaxValueDate())) { - $a[self::FIELD_MAX_VALUE_DATE] = $v->getValue(); - $a[self::FIELD_MAX_VALUE_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MAX_VALUE_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MAX_VALUE_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_MAX_VALUE_DATE] = $v; + } } if (null !== ($v = $this->getMaxValueDateTime())) { - $a[self::FIELD_MAX_VALUE_DATE_TIME] = $v->getValue(); - $a[self::FIELD_MAX_VALUE_DATE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MAX_VALUE_DATE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MAX_VALUE_DATE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_MAX_VALUE_DATE_TIME] = $v; + } } if (null !== ($v = $this->getMaxValueDecimal())) { - $a[self::FIELD_MAX_VALUE_DECIMAL] = $v->getValue(); - $a[self::FIELD_MAX_VALUE_DECIMAL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MAX_VALUE_DECIMAL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MAX_VALUE_DECIMAL_EXT] = $enc; + } + } else { + $a[self::FIELD_MAX_VALUE_DECIMAL] = $v; + } } if (null !== ($v = $this->getMaxValueHumanName())) { $a[self::FIELD_MAX_VALUE_HUMAN_NAME] = $v; } if (null !== ($v = $this->getMaxValueId())) { - $a[self::FIELD_MAX_VALUE_ID] = $v->getValue(); - $a[self::FIELD_MAX_VALUE_ID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MAX_VALUE_ID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MAX_VALUE_ID_EXT] = $enc; + } + } else { + $a[self::FIELD_MAX_VALUE_ID] = $v; + } } if (null !== ($v = $this->getMaxValueIdentifier())) { - $a[self::FIELD_MAX_VALUE_IDENTIFIER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MAX_VALUE_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MAX_VALUE_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_MAX_VALUE_IDENTIFIER] = $v; + } } if (null !== ($v = $this->getMaxValueInstant())) { - $a[self::FIELD_MAX_VALUE_INSTANT] = $v->getValue(); - $a[self::FIELD_MAX_VALUE_INSTANT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MAX_VALUE_INSTANT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MAX_VALUE_INSTANT_EXT] = $enc; + } + } else { + $a[self::FIELD_MAX_VALUE_INSTANT] = $v; + } } if (null !== ($v = $this->getMaxValueInteger())) { - $a[self::FIELD_MAX_VALUE_INTEGER] = $v->getValue(); - $a[self::FIELD_MAX_VALUE_INTEGER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MAX_VALUE_INTEGER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MAX_VALUE_INTEGER_EXT] = $enc; + } + } else { + $a[self::FIELD_MAX_VALUE_INTEGER] = $v; + } } if (null !== ($v = $this->getMaxValueMarkdown())) { - $a[self::FIELD_MAX_VALUE_MARKDOWN] = $v->getValue(); - $a[self::FIELD_MAX_VALUE_MARKDOWN_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MAX_VALUE_MARKDOWN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MAX_VALUE_MARKDOWN_EXT] = $enc; + } + } else { + $a[self::FIELD_MAX_VALUE_MARKDOWN] = $v; + } } if (null !== ($v = $this->getMaxValueMeta())) { $a[self::FIELD_MAX_VALUE_META] = $v; } if (null !== ($v = $this->getMaxValueOid())) { - $a[self::FIELD_MAX_VALUE_OID] = $v->getValue(); - $a[self::FIELD_MAX_VALUE_OID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MAX_VALUE_OID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MAX_VALUE_OID_EXT] = $enc; + } + } else { + $a[self::FIELD_MAX_VALUE_OID] = $v; + } } if (null !== ($v = $this->getMaxValuePeriod())) { $a[self::FIELD_MAX_VALUE_PERIOD] = $v; } if (null !== ($v = $this->getMaxValuePositiveInt())) { - $a[self::FIELD_MAX_VALUE_POSITIVE_INT] = $v->getValue(); - $a[self::FIELD_MAX_VALUE_POSITIVE_INT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MAX_VALUE_POSITIVE_INT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MAX_VALUE_POSITIVE_INT_EXT] = $enc; + } + } else { + $a[self::FIELD_MAX_VALUE_POSITIVE_INT] = $v; + } } if (null !== ($v = $this->getMaxValueQuantity())) { - $a[self::FIELD_MAX_VALUE_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MAX_VALUE_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MAX_VALUE_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_MAX_VALUE_QUANTITY] = $v; + } } if (null !== ($v = $this->getMaxValueRange())) { $a[self::FIELD_MAX_VALUE_RANGE] = $v; @@ -17983,35 +19056,84 @@ public function jsonSerialize() $a[self::FIELD_MAX_VALUE_SIGNATURE] = $v; } if (null !== ($v = $this->getMaxValueString())) { - $a[self::FIELD_MAX_VALUE_STRING] = $v->getValue(); - $a[self::FIELD_MAX_VALUE_STRING_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MAX_VALUE_STRING] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MAX_VALUE_STRING_EXT] = $enc; + } + } else { + $a[self::FIELD_MAX_VALUE_STRING] = $v; + } } if (null !== ($v = $this->getMaxValueTime())) { - $a[self::FIELD_MAX_VALUE_TIME] = $v->getValue(); - $a[self::FIELD_MAX_VALUE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MAX_VALUE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MAX_VALUE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_MAX_VALUE_TIME] = $v; + } } if (null !== ($v = $this->getMaxValueTiming())) { $a[self::FIELD_MAX_VALUE_TIMING] = $v; } if (null !== ($v = $this->getMaxValueUnsignedInt())) { - $a[self::FIELD_MAX_VALUE_UNSIGNED_INT] = $v->getValue(); - $a[self::FIELD_MAX_VALUE_UNSIGNED_INT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MAX_VALUE_UNSIGNED_INT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MAX_VALUE_UNSIGNED_INT_EXT] = $enc; + } + } else { + $a[self::FIELD_MAX_VALUE_UNSIGNED_INT] = $v; + } } if (null !== ($v = $this->getMaxValueUri())) { - $a[self::FIELD_MAX_VALUE_URI] = $v->getValue(); - $a[self::FIELD_MAX_VALUE_URI_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MAX_VALUE_URI] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MAX_VALUE_URI_EXT] = $enc; + } + } else { + $a[self::FIELD_MAX_VALUE_URI] = $v; + } } if (null !== ($v = $this->getMaxValueUuid())) { - $a[self::FIELD_MAX_VALUE_UUID] = $v->getValue(); - $a[self::FIELD_MAX_VALUE_UUID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MAX_VALUE_UUID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MAX_VALUE_UUID_EXT] = $enc; + } + } else { + $a[self::FIELD_MAX_VALUE_UUID] = $v; + } } if (null !== ($v = $this->getMeaningWhenMissing())) { - $a[self::FIELD_MEANING_WHEN_MISSING] = $v->getValue(); - $a[self::FIELD_MEANING_WHEN_MISSING_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MEANING_WHEN_MISSING] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MEANING_WHEN_MISSING_EXT] = $enc; + } + } else { + $a[self::FIELD_MEANING_WHEN_MISSING] = $v; + } } if (null !== ($v = $this->getMin())) { - $a[self::FIELD_MIN] = $v->getValue(); - $a[self::FIELD_MIN_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MIN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MIN_EXT] = $enc; + } + } else { + $a[self::FIELD_MIN] = $v; + } } if (null !== ($v = $this->getMinValueAddress())) { $a[self::FIELD_MIN_VALUE_ADDRESS] = $v; @@ -18023,16 +19145,37 @@ public function jsonSerialize() $a[self::FIELD_MIN_VALUE_ATTACHMENT] = $v; } if (null !== ($v = $this->getMinValueBase64Binary())) { - $a[self::FIELD_MIN_VALUE_BASE_64BINARY] = $v->getValue(); - $a[self::FIELD_MIN_VALUE_BASE_64BINARY_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MIN_VALUE_BASE_64BINARY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MIN_VALUE_BASE_64BINARY_EXT] = $enc; + } + } else { + $a[self::FIELD_MIN_VALUE_BASE_64BINARY] = $v; + } } if (null !== ($v = $this->getMinValueBoolean())) { - $a[self::FIELD_MIN_VALUE_BOOLEAN] = $v->getValue(); - $a[self::FIELD_MIN_VALUE_BOOLEAN_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MIN_VALUE_BOOLEAN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MIN_VALUE_BOOLEAN_EXT] = $enc; + } + } else { + $a[self::FIELD_MIN_VALUE_BOOLEAN] = $v; + } } if (null !== ($v = $this->getMinValueCode())) { - $a[self::FIELD_MIN_VALUE_CODE] = $v->getValue(); - $a[self::FIELD_MIN_VALUE_CODE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MIN_VALUE_CODE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MIN_VALUE_CODE_EXT] = $enc; + } + } else { + $a[self::FIELD_MIN_VALUE_CODE] = $v; + } } if (null !== ($v = $this->getMinValueCodeableConcept())) { $a[self::FIELD_MIN_VALUE_CODEABLE_CONCEPT] = $v; @@ -18041,58 +19184,145 @@ public function jsonSerialize() $a[self::FIELD_MIN_VALUE_CODING] = $v; } if (null !== ($v = $this->getMinValueContactPoint())) { - $a[self::FIELD_MIN_VALUE_CONTACT_POINT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MIN_VALUE_CONTACT_POINT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MIN_VALUE_CONTACT_POINT_EXT] = $enc; + } + } else { + $a[self::FIELD_MIN_VALUE_CONTACT_POINT] = $v; + } } if (null !== ($v = $this->getMinValueDate())) { - $a[self::FIELD_MIN_VALUE_DATE] = $v->getValue(); - $a[self::FIELD_MIN_VALUE_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MIN_VALUE_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MIN_VALUE_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_MIN_VALUE_DATE] = $v; + } } if (null !== ($v = $this->getMinValueDateTime())) { - $a[self::FIELD_MIN_VALUE_DATE_TIME] = $v->getValue(); - $a[self::FIELD_MIN_VALUE_DATE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MIN_VALUE_DATE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MIN_VALUE_DATE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_MIN_VALUE_DATE_TIME] = $v; + } } if (null !== ($v = $this->getMinValueDecimal())) { - $a[self::FIELD_MIN_VALUE_DECIMAL] = $v->getValue(); - $a[self::FIELD_MIN_VALUE_DECIMAL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MIN_VALUE_DECIMAL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MIN_VALUE_DECIMAL_EXT] = $enc; + } + } else { + $a[self::FIELD_MIN_VALUE_DECIMAL] = $v; + } } if (null !== ($v = $this->getMinValueHumanName())) { $a[self::FIELD_MIN_VALUE_HUMAN_NAME] = $v; } if (null !== ($v = $this->getMinValueId())) { - $a[self::FIELD_MIN_VALUE_ID] = $v->getValue(); - $a[self::FIELD_MIN_VALUE_ID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MIN_VALUE_ID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MIN_VALUE_ID_EXT] = $enc; + } + } else { + $a[self::FIELD_MIN_VALUE_ID] = $v; + } } if (null !== ($v = $this->getMinValueIdentifier())) { - $a[self::FIELD_MIN_VALUE_IDENTIFIER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MIN_VALUE_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MIN_VALUE_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_MIN_VALUE_IDENTIFIER] = $v; + } } if (null !== ($v = $this->getMinValueInstant())) { - $a[self::FIELD_MIN_VALUE_INSTANT] = $v->getValue(); - $a[self::FIELD_MIN_VALUE_INSTANT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MIN_VALUE_INSTANT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MIN_VALUE_INSTANT_EXT] = $enc; + } + } else { + $a[self::FIELD_MIN_VALUE_INSTANT] = $v; + } } if (null !== ($v = $this->getMinValueInteger())) { - $a[self::FIELD_MIN_VALUE_INTEGER] = $v->getValue(); - $a[self::FIELD_MIN_VALUE_INTEGER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MIN_VALUE_INTEGER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MIN_VALUE_INTEGER_EXT] = $enc; + } + } else { + $a[self::FIELD_MIN_VALUE_INTEGER] = $v; + } } if (null !== ($v = $this->getMinValueMarkdown())) { - $a[self::FIELD_MIN_VALUE_MARKDOWN] = $v->getValue(); - $a[self::FIELD_MIN_VALUE_MARKDOWN_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MIN_VALUE_MARKDOWN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MIN_VALUE_MARKDOWN_EXT] = $enc; + } + } else { + $a[self::FIELD_MIN_VALUE_MARKDOWN] = $v; + } } if (null !== ($v = $this->getMinValueMeta())) { $a[self::FIELD_MIN_VALUE_META] = $v; } if (null !== ($v = $this->getMinValueOid())) { - $a[self::FIELD_MIN_VALUE_OID] = $v->getValue(); - $a[self::FIELD_MIN_VALUE_OID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MIN_VALUE_OID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MIN_VALUE_OID_EXT] = $enc; + } + } else { + $a[self::FIELD_MIN_VALUE_OID] = $v; + } } if (null !== ($v = $this->getMinValuePeriod())) { $a[self::FIELD_MIN_VALUE_PERIOD] = $v; } if (null !== ($v = $this->getMinValuePositiveInt())) { - $a[self::FIELD_MIN_VALUE_POSITIVE_INT] = $v->getValue(); - $a[self::FIELD_MIN_VALUE_POSITIVE_INT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MIN_VALUE_POSITIVE_INT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MIN_VALUE_POSITIVE_INT_EXT] = $enc; + } + } else { + $a[self::FIELD_MIN_VALUE_POSITIVE_INT] = $v; + } } if (null !== ($v = $this->getMinValueQuantity())) { - $a[self::FIELD_MIN_VALUE_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MIN_VALUE_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MIN_VALUE_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_MIN_VALUE_QUANTITY] = $v; + } } if (null !== ($v = $this->getMinValueRange())) { $a[self::FIELD_MIN_VALUE_RANGE] = $v; @@ -18110,43 +19340,106 @@ public function jsonSerialize() $a[self::FIELD_MIN_VALUE_SIGNATURE] = $v; } if (null !== ($v = $this->getMinValueString())) { - $a[self::FIELD_MIN_VALUE_STRING] = $v->getValue(); - $a[self::FIELD_MIN_VALUE_STRING_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MIN_VALUE_STRING] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MIN_VALUE_STRING_EXT] = $enc; + } + } else { + $a[self::FIELD_MIN_VALUE_STRING] = $v; + } } if (null !== ($v = $this->getMinValueTime())) { - $a[self::FIELD_MIN_VALUE_TIME] = $v->getValue(); - $a[self::FIELD_MIN_VALUE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MIN_VALUE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MIN_VALUE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_MIN_VALUE_TIME] = $v; + } } if (null !== ($v = $this->getMinValueTiming())) { $a[self::FIELD_MIN_VALUE_TIMING] = $v; } if (null !== ($v = $this->getMinValueUnsignedInt())) { - $a[self::FIELD_MIN_VALUE_UNSIGNED_INT] = $v->getValue(); - $a[self::FIELD_MIN_VALUE_UNSIGNED_INT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MIN_VALUE_UNSIGNED_INT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MIN_VALUE_UNSIGNED_INT_EXT] = $enc; + } + } else { + $a[self::FIELD_MIN_VALUE_UNSIGNED_INT] = $v; + } } if (null !== ($v = $this->getMinValueUri())) { - $a[self::FIELD_MIN_VALUE_URI] = $v->getValue(); - $a[self::FIELD_MIN_VALUE_URI_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MIN_VALUE_URI] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MIN_VALUE_URI_EXT] = $enc; + } + } else { + $a[self::FIELD_MIN_VALUE_URI] = $v; + } } if (null !== ($v = $this->getMinValueUuid())) { - $a[self::FIELD_MIN_VALUE_UUID] = $v->getValue(); - $a[self::FIELD_MIN_VALUE_UUID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MIN_VALUE_UUID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MIN_VALUE_UUID_EXT] = $enc; + } + } else { + $a[self::FIELD_MIN_VALUE_UUID] = $v; + } } if (null !== ($v = $this->getMustSupport())) { - $a[self::FIELD_MUST_SUPPORT] = $v->getValue(); - $a[self::FIELD_MUST_SUPPORT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MUST_SUPPORT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MUST_SUPPORT_EXT] = $enc; + } + } else { + $a[self::FIELD_MUST_SUPPORT] = $v; + } } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if (null !== ($v = $this->getNameReference())) { - $a[self::FIELD_NAME_REFERENCE] = $v->getValue(); - $a[self::FIELD_NAME_REFERENCE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME_REFERENCE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_REFERENCE_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME_REFERENCE] = $v; + } } if (null !== ($v = $this->getPath())) { - $a[self::FIELD_PATH] = $v->getValue(); - $a[self::FIELD_PATH_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PATH] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PATH_EXT] = $enc; + } + } else { + $a[self::FIELD_PATH] = $v; + } } if (null !== ($v = $this->getPatternAddress())) { $a[self::FIELD_PATTERN_ADDRESS] = $v; @@ -18158,16 +19451,37 @@ public function jsonSerialize() $a[self::FIELD_PATTERN_ATTACHMENT] = $v; } if (null !== ($v = $this->getPatternBase64Binary())) { - $a[self::FIELD_PATTERN_BASE_64BINARY] = $v->getValue(); - $a[self::FIELD_PATTERN_BASE_64BINARY_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PATTERN_BASE_64BINARY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PATTERN_BASE_64BINARY_EXT] = $enc; + } + } else { + $a[self::FIELD_PATTERN_BASE_64BINARY] = $v; + } } if (null !== ($v = $this->getPatternBoolean())) { - $a[self::FIELD_PATTERN_BOOLEAN] = $v->getValue(); - $a[self::FIELD_PATTERN_BOOLEAN_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PATTERN_BOOLEAN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PATTERN_BOOLEAN_EXT] = $enc; + } + } else { + $a[self::FIELD_PATTERN_BOOLEAN] = $v; + } } if (null !== ($v = $this->getPatternCode())) { - $a[self::FIELD_PATTERN_CODE] = $v->getValue(); - $a[self::FIELD_PATTERN_CODE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PATTERN_CODE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PATTERN_CODE_EXT] = $enc; + } + } else { + $a[self::FIELD_PATTERN_CODE] = $v; + } } if (null !== ($v = $this->getPatternCodeableConcept())) { $a[self::FIELD_PATTERN_CODEABLE_CONCEPT] = $v; @@ -18176,58 +19490,145 @@ public function jsonSerialize() $a[self::FIELD_PATTERN_CODING] = $v; } if (null !== ($v = $this->getPatternContactPoint())) { - $a[self::FIELD_PATTERN_CONTACT_POINT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PATTERN_CONTACT_POINT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PATTERN_CONTACT_POINT_EXT] = $enc; + } + } else { + $a[self::FIELD_PATTERN_CONTACT_POINT] = $v; + } } if (null !== ($v = $this->getPatternDate())) { - $a[self::FIELD_PATTERN_DATE] = $v->getValue(); - $a[self::FIELD_PATTERN_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PATTERN_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PATTERN_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_PATTERN_DATE] = $v; + } } if (null !== ($v = $this->getPatternDateTime())) { - $a[self::FIELD_PATTERN_DATE_TIME] = $v->getValue(); - $a[self::FIELD_PATTERN_DATE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PATTERN_DATE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PATTERN_DATE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_PATTERN_DATE_TIME] = $v; + } } if (null !== ($v = $this->getPatternDecimal())) { - $a[self::FIELD_PATTERN_DECIMAL] = $v->getValue(); - $a[self::FIELD_PATTERN_DECIMAL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PATTERN_DECIMAL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PATTERN_DECIMAL_EXT] = $enc; + } + } else { + $a[self::FIELD_PATTERN_DECIMAL] = $v; + } } if (null !== ($v = $this->getPatternHumanName())) { $a[self::FIELD_PATTERN_HUMAN_NAME] = $v; } if (null !== ($v = $this->getPatternId())) { - $a[self::FIELD_PATTERN_ID] = $v->getValue(); - $a[self::FIELD_PATTERN_ID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PATTERN_ID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PATTERN_ID_EXT] = $enc; + } + } else { + $a[self::FIELD_PATTERN_ID] = $v; + } } if (null !== ($v = $this->getPatternIdentifier())) { - $a[self::FIELD_PATTERN_IDENTIFIER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PATTERN_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PATTERN_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_PATTERN_IDENTIFIER] = $v; + } } if (null !== ($v = $this->getPatternInstant())) { - $a[self::FIELD_PATTERN_INSTANT] = $v->getValue(); - $a[self::FIELD_PATTERN_INSTANT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PATTERN_INSTANT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PATTERN_INSTANT_EXT] = $enc; + } + } else { + $a[self::FIELD_PATTERN_INSTANT] = $v; + } } if (null !== ($v = $this->getPatternInteger())) { - $a[self::FIELD_PATTERN_INTEGER] = $v->getValue(); - $a[self::FIELD_PATTERN_INTEGER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PATTERN_INTEGER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PATTERN_INTEGER_EXT] = $enc; + } + } else { + $a[self::FIELD_PATTERN_INTEGER] = $v; + } } if (null !== ($v = $this->getPatternMarkdown())) { - $a[self::FIELD_PATTERN_MARKDOWN] = $v->getValue(); - $a[self::FIELD_PATTERN_MARKDOWN_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PATTERN_MARKDOWN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PATTERN_MARKDOWN_EXT] = $enc; + } + } else { + $a[self::FIELD_PATTERN_MARKDOWN] = $v; + } } if (null !== ($v = $this->getPatternMeta())) { $a[self::FIELD_PATTERN_META] = $v; } if (null !== ($v = $this->getPatternOid())) { - $a[self::FIELD_PATTERN_OID] = $v->getValue(); - $a[self::FIELD_PATTERN_OID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PATTERN_OID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PATTERN_OID_EXT] = $enc; + } + } else { + $a[self::FIELD_PATTERN_OID] = $v; + } } if (null !== ($v = $this->getPatternPeriod())) { $a[self::FIELD_PATTERN_PERIOD] = $v; } if (null !== ($v = $this->getPatternPositiveInt())) { - $a[self::FIELD_PATTERN_POSITIVE_INT] = $v->getValue(); - $a[self::FIELD_PATTERN_POSITIVE_INT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PATTERN_POSITIVE_INT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PATTERN_POSITIVE_INT_EXT] = $enc; + } + } else { + $a[self::FIELD_PATTERN_POSITIVE_INT] = $v; + } } if (null !== ($v = $this->getPatternQuantity())) { - $a[self::FIELD_PATTERN_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PATTERN_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PATTERN_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_PATTERN_QUANTITY] = $v; + } } if (null !== ($v = $this->getPatternRange())) { $a[self::FIELD_PATTERN_RANGE] = $v; @@ -18245,38 +19646,103 @@ public function jsonSerialize() $a[self::FIELD_PATTERN_SIGNATURE] = $v; } if (null !== ($v = $this->getPatternString())) { - $a[self::FIELD_PATTERN_STRING] = $v->getValue(); - $a[self::FIELD_PATTERN_STRING_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PATTERN_STRING] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PATTERN_STRING_EXT] = $enc; + } + } else { + $a[self::FIELD_PATTERN_STRING] = $v; + } } if (null !== ($v = $this->getPatternTime())) { - $a[self::FIELD_PATTERN_TIME] = $v->getValue(); - $a[self::FIELD_PATTERN_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PATTERN_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PATTERN_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_PATTERN_TIME] = $v; + } } if (null !== ($v = $this->getPatternTiming())) { $a[self::FIELD_PATTERN_TIMING] = $v; } if (null !== ($v = $this->getPatternUnsignedInt())) { - $a[self::FIELD_PATTERN_UNSIGNED_INT] = $v->getValue(); - $a[self::FIELD_PATTERN_UNSIGNED_INT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PATTERN_UNSIGNED_INT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PATTERN_UNSIGNED_INT_EXT] = $enc; + } + } else { + $a[self::FIELD_PATTERN_UNSIGNED_INT] = $v; + } } if (null !== ($v = $this->getPatternUri())) { - $a[self::FIELD_PATTERN_URI] = $v->getValue(); - $a[self::FIELD_PATTERN_URI_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PATTERN_URI] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PATTERN_URI_EXT] = $enc; + } + } else { + $a[self::FIELD_PATTERN_URI] = $v; + } } if (null !== ($v = $this->getPatternUuid())) { - $a[self::FIELD_PATTERN_UUID] = $v->getValue(); - $a[self::FIELD_PATTERN_UUID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PATTERN_UUID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PATTERN_UUID_EXT] = $enc; + } + } else { + $a[self::FIELD_PATTERN_UUID] = $v; + } } if ([] !== ($vs = $this->getRepresentation())) { - $a[self::FIELD_REPRESENTATION] = $vs; + $a[self::FIELD_REPRESENTATION] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_REPRESENTATION][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_REPRESENTATION_EXT][] = $enc; + } else { + $a[self::FIELD_REPRESENTATION_EXT][] = null; + } + } else { + $a[self::FIELD_REPRESENTATION][] = $v; + } + } } if (null !== ($v = $this->getRequirements())) { - $a[self::FIELD_REQUIREMENTS] = $v->getValue(); - $a[self::FIELD_REQUIREMENTS_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_REQUIREMENTS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_REQUIREMENTS_EXT] = $enc; + } + } else { + $a[self::FIELD_REQUIREMENTS] = $v; + } } if (null !== ($v = $this->getShort())) { - $a[self::FIELD_SHORT] = $v->getValue(); - $a[self::FIELD_SHORT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SHORT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SHORT_EXT] = $enc; + } + } else { + $a[self::FIELD_SHORT] = $v; + } } if (null !== ($v = $this->getSlicing())) { $a[self::FIELD_SLICING] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRElementDefinition/FHIRElementDefinitionBase.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRElementDefinition/FHIRElementDefinitionBase.php index 119cfec691..cd5415fb71 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRElementDefinition/FHIRElementDefinitionBase.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRElementDefinition/FHIRElementDefinitionBase.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRElementDefinitionBase extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ELEMENT_DEFINITION_DOT_BASE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_MAX = 'max'; const FIELD_MAX_EXT = '_max'; const FIELD_MIN = 'min'; @@ -127,6 +123,9 @@ class FHIRElementDefinitionBase extends FHIRElement */ protected $path = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRElementDefinitionBase Constructor * @param null|array $data @@ -149,8 +148,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MAX] instanceof FHIRString) { $this->setMax($data[self::FIELD_MAX]); - } elseif ($ext && is_scalar($data[self::FIELD_MAX])) { - $this->setMax(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_MAX]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MAX])) { + $this->setMax(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_MAX]] + $ext)); + } else if (is_array($data[self::FIELD_MAX])) { + $this->setMax(new FHIRString(array_merge($ext, $data[self::FIELD_MAX]))); + } } else { $this->setMax(new FHIRString($data[self::FIELD_MAX])); } @@ -161,8 +164,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MIN] instanceof FHIRInteger) { $this->setMin($data[self::FIELD_MIN]); - } elseif ($ext && is_scalar($data[self::FIELD_MIN])) { - $this->setMin(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_MIN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MIN])) { + $this->setMin(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_MIN]] + $ext)); + } else if (is_array($data[self::FIELD_MIN])) { + $this->setMin(new FHIRInteger(array_merge($ext, $data[self::FIELD_MIN]))); + } } else { $this->setMin(new FHIRInteger($data[self::FIELD_MIN])); } @@ -173,8 +180,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PATH] instanceof FHIRString) { $this->setPath($data[self::FIELD_PATH]); - } elseif ($ext && is_scalar($data[self::FIELD_PATH])) { - $this->setPath(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PATH]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PATH])) { + $this->setPath(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PATH]] + $ext)); + } else if (is_array($data[self::FIELD_PATH])) { + $this->setPath(new FHIRString(array_merge($ext, $data[self::FIELD_PATH]))); + } } else { $this->setPath(new FHIRString($data[self::FIELD_PATH])); } @@ -437,16 +448,37 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getMax())) { - $a[self::FIELD_MAX] = $v->getValue(); - $a[self::FIELD_MAX_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MAX] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MAX_EXT] = $enc; + } + } else { + $a[self::FIELD_MAX] = $v; + } } if (null !== ($v = $this->getMin())) { - $a[self::FIELD_MIN] = $v->getValue(); - $a[self::FIELD_MIN_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MIN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MIN_EXT] = $enc; + } + } else { + $a[self::FIELD_MIN] = $v; + } } if (null !== ($v = $this->getPath())) { - $a[self::FIELD_PATH] = $v->getValue(); - $a[self::FIELD_PATH_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PATH] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PATH_EXT] = $enc; + } + } else { + $a[self::FIELD_PATH] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRElementDefinition/FHIRElementDefinitionBinding.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRElementDefinition/FHIRElementDefinitionBinding.php index 863291f585..0ed1f8f4ea 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRElementDefinition/FHIRElementDefinitionBinding.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRElementDefinition/FHIRElementDefinitionBinding.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -82,10 +82,6 @@ class FHIRElementDefinitionBinding extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ELEMENT_DEFINITION_DOT_BINDING; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DESCRIPTION = 'description'; const FIELD_DESCRIPTION_EXT = '_description'; const FIELD_STRENGTH = 'strength'; @@ -141,6 +137,9 @@ class FHIRElementDefinitionBinding extends FHIRElement */ protected $valueSetUri = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRElementDefinitionBinding Constructor * @param null|array $data @@ -163,8 +162,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -175,8 +178,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STRENGTH] instanceof FHIRBindingStrength) { $this->setStrength($data[self::FIELD_STRENGTH]); - } elseif ($ext && is_scalar($data[self::FIELD_STRENGTH])) { - $this->setStrength(new FHIRBindingStrength([FHIRBindingStrength::FIELD_VALUE => $data[self::FIELD_STRENGTH]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STRENGTH])) { + $this->setStrength(new FHIRBindingStrength([FHIRBindingStrength::FIELD_VALUE => $data[self::FIELD_STRENGTH]] + $ext)); + } else if (is_array($data[self::FIELD_STRENGTH])) { + $this->setStrength(new FHIRBindingStrength(array_merge($ext, $data[self::FIELD_STRENGTH]))); + } } else { $this->setStrength(new FHIRBindingStrength($data[self::FIELD_STRENGTH])); } @@ -194,8 +201,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_SET_URI] instanceof FHIRUri) { $this->setValueSetUri($data[self::FIELD_VALUE_SET_URI]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_SET_URI])) { - $this->setValueSetUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_VALUE_SET_URI]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_SET_URI])) { + $this->setValueSetUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_VALUE_SET_URI]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_SET_URI])) { + $this->setValueSetUri(new FHIRUri(array_merge($ext, $data[self::FIELD_VALUE_SET_URI]))); + } } else { $this->setValueSetUri(new FHIRUri($data[self::FIELD_VALUE_SET_URI])); } @@ -464,11 +475,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESCRIPTION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStrength())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STRENGTH, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueSetReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_SET_REFERENCE, null, $v->_getFHIRXMLNamespace())); } @@ -485,18 +494,40 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if (null !== ($v = $this->getStrength())) { - $a[self::FIELD_STRENGTH] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STRENGTH] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STRENGTH_EXT] = $enc; + } + } else { + $a[self::FIELD_STRENGTH] = $v; + } } if (null !== ($v = $this->getValueSetReference())) { $a[self::FIELD_VALUE_SET_REFERENCE] = $v; } if (null !== ($v = $this->getValueSetUri())) { - $a[self::FIELD_VALUE_SET_URI] = $v->getValue(); - $a[self::FIELD_VALUE_SET_URI_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_SET_URI] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_SET_URI_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_SET_URI] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRElementDefinition/FHIRElementDefinitionConstraint.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRElementDefinition/FHIRElementDefinitionConstraint.php index 3ed66b46aa..03064b4675 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRElementDefinition/FHIRElementDefinitionConstraint.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRElementDefinition/FHIRElementDefinitionConstraint.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -81,10 +81,6 @@ class FHIRElementDefinitionConstraint extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ELEMENT_DEFINITION_DOT_CONSTRAINT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_HUMAN = 'human'; const FIELD_HUMAN_EXT = '_human'; const FIELD_KEY = 'key'; @@ -158,6 +154,9 @@ class FHIRElementDefinitionConstraint extends FHIRElement */ protected $xpath = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRElementDefinitionConstraint Constructor * @param null|array $data @@ -180,8 +179,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_HUMAN] instanceof FHIRString) { $this->setHuman($data[self::FIELD_HUMAN]); - } elseif ($ext && is_scalar($data[self::FIELD_HUMAN])) { - $this->setHuman(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_HUMAN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_HUMAN])) { + $this->setHuman(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_HUMAN]] + $ext)); + } else if (is_array($data[self::FIELD_HUMAN])) { + $this->setHuman(new FHIRString(array_merge($ext, $data[self::FIELD_HUMAN]))); + } } else { $this->setHuman(new FHIRString($data[self::FIELD_HUMAN])); } @@ -192,8 +195,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_KEY] instanceof FHIRId) { $this->setKey($data[self::FIELD_KEY]); - } elseif ($ext && is_scalar($data[self::FIELD_KEY])) { - $this->setKey(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_KEY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_KEY])) { + $this->setKey(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_KEY]] + $ext)); + } else if (is_array($data[self::FIELD_KEY])) { + $this->setKey(new FHIRId(array_merge($ext, $data[self::FIELD_KEY]))); + } } else { $this->setKey(new FHIRId($data[self::FIELD_KEY])); } @@ -204,8 +211,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_REQUIREMENTS] instanceof FHIRString) { $this->setRequirements($data[self::FIELD_REQUIREMENTS]); - } elseif ($ext && is_scalar($data[self::FIELD_REQUIREMENTS])) { - $this->setRequirements(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_REQUIREMENTS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_REQUIREMENTS])) { + $this->setRequirements(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_REQUIREMENTS]] + $ext)); + } else if (is_array($data[self::FIELD_REQUIREMENTS])) { + $this->setRequirements(new FHIRString(array_merge($ext, $data[self::FIELD_REQUIREMENTS]))); + } } else { $this->setRequirements(new FHIRString($data[self::FIELD_REQUIREMENTS])); } @@ -216,8 +227,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SEVERITY] instanceof FHIRConstraintSeverity) { $this->setSeverity($data[self::FIELD_SEVERITY]); - } elseif ($ext && is_scalar($data[self::FIELD_SEVERITY])) { - $this->setSeverity(new FHIRConstraintSeverity([FHIRConstraintSeverity::FIELD_VALUE => $data[self::FIELD_SEVERITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SEVERITY])) { + $this->setSeverity(new FHIRConstraintSeverity([FHIRConstraintSeverity::FIELD_VALUE => $data[self::FIELD_SEVERITY]] + $ext)); + } else if (is_array($data[self::FIELD_SEVERITY])) { + $this->setSeverity(new FHIRConstraintSeverity(array_merge($ext, $data[self::FIELD_SEVERITY]))); + } } else { $this->setSeverity(new FHIRConstraintSeverity($data[self::FIELD_SEVERITY])); } @@ -228,8 +243,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_XPATH] instanceof FHIRString) { $this->setXpath($data[self::FIELD_XPATH]); - } elseif ($ext && is_scalar($data[self::FIELD_XPATH])) { - $this->setXpath(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_XPATH]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_XPATH])) { + $this->setXpath(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_XPATH]] + $ext)); + } else if (is_array($data[self::FIELD_XPATH])) { + $this->setXpath(new FHIRString(array_merge($ext, $data[self::FIELD_XPATH]))); + } } else { $this->setXpath(new FHIRString($data[self::FIELD_XPATH])); } @@ -567,7 +586,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getRequirements())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REQUIREMENTS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSeverity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SEVERITY, null, $v->_getFHIRXMLNamespace())); } @@ -584,23 +602,59 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getHuman())) { - $a[self::FIELD_HUMAN] = $v->getValue(); - $a[self::FIELD_HUMAN_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_HUMAN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_HUMAN_EXT] = $enc; + } + } else { + $a[self::FIELD_HUMAN] = $v; + } } if (null !== ($v = $this->getKey())) { - $a[self::FIELD_KEY] = $v->getValue(); - $a[self::FIELD_KEY_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_KEY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_KEY_EXT] = $enc; + } + } else { + $a[self::FIELD_KEY] = $v; + } } if (null !== ($v = $this->getRequirements())) { - $a[self::FIELD_REQUIREMENTS] = $v->getValue(); - $a[self::FIELD_REQUIREMENTS_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_REQUIREMENTS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_REQUIREMENTS_EXT] = $enc; + } + } else { + $a[self::FIELD_REQUIREMENTS] = $v; + } } if (null !== ($v = $this->getSeverity())) { - $a[self::FIELD_SEVERITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SEVERITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SEVERITY_EXT] = $enc; + } + } else { + $a[self::FIELD_SEVERITY] = $v; + } } if (null !== ($v = $this->getXpath())) { - $a[self::FIELD_XPATH] = $v->getValue(); - $a[self::FIELD_XPATH_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_XPATH] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_XPATH_EXT] = $enc; + } + } else { + $a[self::FIELD_XPATH] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRElementDefinition/FHIRElementDefinitionMapping.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRElementDefinition/FHIRElementDefinitionMapping.php index 086fcd210d..8d04bbb3dc 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRElementDefinition/FHIRElementDefinitionMapping.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRElementDefinition/FHIRElementDefinitionMapping.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -81,10 +81,6 @@ class FHIRElementDefinitionMapping extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ELEMENT_DEFINITION_DOT_MAPPING; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_IDENTITY = 'identity'; const FIELD_IDENTITY_EXT = '_identity'; const FIELD_LANGUAGE = 'language'; @@ -129,6 +125,9 @@ class FHIRElementDefinitionMapping extends FHIRElement */ protected $map = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRElementDefinitionMapping Constructor * @param null|array $data @@ -151,8 +150,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IDENTITY] instanceof FHIRId) { $this->setIdentity($data[self::FIELD_IDENTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTITY])) { - $this->setIdentity(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_IDENTITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IDENTITY])) { + $this->setIdentity(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_IDENTITY]] + $ext)); + } else if (is_array($data[self::FIELD_IDENTITY])) { + $this->setIdentity(new FHIRId(array_merge($ext, $data[self::FIELD_IDENTITY]))); + } } else { $this->setIdentity(new FHIRId($data[self::FIELD_IDENTITY])); } @@ -163,8 +166,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_LANGUAGE] instanceof FHIRCode) { $this->setLanguage($data[self::FIELD_LANGUAGE]); - } elseif ($ext && is_scalar($data[self::FIELD_LANGUAGE])) { - $this->setLanguage(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_LANGUAGE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_LANGUAGE])) { + $this->setLanguage(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_LANGUAGE]] + $ext)); + } else if (is_array($data[self::FIELD_LANGUAGE])) { + $this->setLanguage(new FHIRCode(array_merge($ext, $data[self::FIELD_LANGUAGE]))); + } } else { $this->setLanguage(new FHIRCode($data[self::FIELD_LANGUAGE])); } @@ -175,8 +182,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MAP] instanceof FHIRString) { $this->setMap($data[self::FIELD_MAP]); - } elseif ($ext && is_scalar($data[self::FIELD_MAP])) { - $this->setMap(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_MAP]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MAP])) { + $this->setMap(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_MAP]] + $ext)); + } else if (is_array($data[self::FIELD_MAP])) { + $this->setMap(new FHIRString(array_merge($ext, $data[self::FIELD_MAP]))); + } } else { $this->setMap(new FHIRString($data[self::FIELD_MAP])); } @@ -441,16 +452,37 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getIdentity())) { - $a[self::FIELD_IDENTITY] = $v->getValue(); - $a[self::FIELD_IDENTITY_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_IDENTITY] = $v; + } } if (null !== ($v = $this->getLanguage())) { - $a[self::FIELD_LANGUAGE] = $v->getValue(); - $a[self::FIELD_LANGUAGE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_LANGUAGE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_LANGUAGE_EXT] = $enc; + } + } else { + $a[self::FIELD_LANGUAGE] = $v; + } } if (null !== ($v = $this->getMap())) { - $a[self::FIELD_MAP] = $v->getValue(); - $a[self::FIELD_MAP_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MAP] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MAP_EXT] = $enc; + } + } else { + $a[self::FIELD_MAP] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRElementDefinition/FHIRElementDefinitionSlicing.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRElementDefinition/FHIRElementDefinitionSlicing.php index b51721858e..3f92d57d6d 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRElementDefinition/FHIRElementDefinitionSlicing.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRElementDefinition/FHIRElementDefinitionSlicing.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -81,10 +81,6 @@ class FHIRElementDefinitionSlicing extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ELEMENT_DEFINITION_DOT_SLICING; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DESCRIPTION = 'description'; const FIELD_DESCRIPTION_EXT = '_description'; const FIELD_DISCRIMINATOR = 'discriminator'; @@ -144,6 +140,9 @@ class FHIRElementDefinitionSlicing extends FHIRElement */ protected $rules = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRElementDefinitionSlicing Constructor * @param null|array $data @@ -166,8 +165,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -178,17 +181,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_DISCRIMINATOR])) { foreach($data[self::FIELD_DISCRIMINATOR] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRString) { $this->addDiscriminator($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addDiscriminator(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addDiscriminator(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addDiscriminator(new FHIRString(array_merge($v, $ext[$i]))); + } } else { $this->addDiscriminator(new FHIRString($v)); } } } elseif ($data[self::FIELD_DISCRIMINATOR] instanceof FHIRString) { $this->addDiscriminator($data[self::FIELD_DISCRIMINATOR]); - } elseif ($ext && is_scalar($data[self::FIELD_DISCRIMINATOR])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_DISCRIMINATOR])) { $this->addDiscriminator(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DISCRIMINATOR]] + $ext)); } else { $this->addDiscriminator(new FHIRString($data[self::FIELD_DISCRIMINATOR])); @@ -200,8 +210,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ORDERED] instanceof FHIRBoolean) { $this->setOrdered($data[self::FIELD_ORDERED]); - } elseif ($ext && is_scalar($data[self::FIELD_ORDERED])) { - $this->setOrdered(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_ORDERED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ORDERED])) { + $this->setOrdered(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_ORDERED]] + $ext)); + } else if (is_array($data[self::FIELD_ORDERED])) { + $this->setOrdered(new FHIRBoolean(array_merge($ext, $data[self::FIELD_ORDERED]))); + } } else { $this->setOrdered(new FHIRBoolean($data[self::FIELD_ORDERED])); } @@ -212,8 +226,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_RULES] instanceof FHIRSlicingRules) { $this->setRules($data[self::FIELD_RULES]); - } elseif ($ext && is_scalar($data[self::FIELD_RULES])) { - $this->setRules(new FHIRSlicingRules([FHIRSlicingRules::FIELD_VALUE => $data[self::FIELD_RULES]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_RULES])) { + $this->setRules(new FHIRSlicingRules([FHIRSlicingRules::FIELD_VALUE => $data[self::FIELD_RULES]] + $ext)); + } else if (is_array($data[self::FIELD_RULES])) { + $this->setRules(new FHIRSlicingRules(array_merge($ext, $data[self::FIELD_RULES]))); + } } else { $this->setRules(new FHIRSlicingRules($data[self::FIELD_RULES])); } @@ -539,10 +557,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_DISCRIMINATOR, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getOrdered())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ORDERED, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRules())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RULES, null, $v->_getFHIRXMLNamespace())); } @@ -556,8 +574,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if ([] !== ($vs = $this->getDiscriminator())) { $a[self::FIELD_DISCRIMINATOR] = []; @@ -565,16 +590,40 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_DISCRIMINATOR][] = $v->getValue(); - $a[self::FIELD_DISCRIMINATOR_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DISCRIMINATOR][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DISCRIMINATOR_EXT][] = $enc; + } else { + $a[self::FIELD_DISCRIMINATOR_EXT][] = null; + } + } else { + $a[self::FIELD_DISCRIMINATOR][] = $v; + } } } if (null !== ($v = $this->getOrdered())) { - $a[self::FIELD_ORDERED] = $v->getValue(); - $a[self::FIELD_ORDERED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ORDERED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ORDERED_EXT] = $enc; + } + } else { + $a[self::FIELD_ORDERED] = $v; + } } if (null !== ($v = $this->getRules())) { - $a[self::FIELD_RULES] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_RULES] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_RULES_EXT] = $enc; + } + } else { + $a[self::FIELD_RULES] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRElementDefinition/FHIRElementDefinitionType.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRElementDefinition/FHIRElementDefinitionType.php index 200592bb17..129fc88ff1 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRElementDefinition/FHIRElementDefinitionType.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRElementDefinition/FHIRElementDefinitionType.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -81,10 +81,6 @@ class FHIRElementDefinitionType extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ELEMENT_DEFINITION_DOT_TYPE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_AGGREGATION = 'aggregation'; const FIELD_AGGREGATION_EXT = '_aggregation'; const FIELD_CODE = 'code'; @@ -132,6 +128,9 @@ class FHIRElementDefinitionType extends FHIRElement */ protected $profile = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRElementDefinitionType Constructor * @param null|array $data @@ -154,17 +153,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_AGGREGATION])) { foreach($data[self::FIELD_AGGREGATION] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRAggregationMode) { $this->addAggregation($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addAggregation(new FHIRAggregationMode([FHIRAggregationMode::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addAggregation(new FHIRAggregationMode([FHIRAggregationMode::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addAggregation(new FHIRAggregationMode(array_merge($v, $ext[$i]))); + } } else { $this->addAggregation(new FHIRAggregationMode($v)); } } } elseif ($data[self::FIELD_AGGREGATION] instanceof FHIRAggregationMode) { $this->addAggregation($data[self::FIELD_AGGREGATION]); - } elseif ($ext && is_scalar($data[self::FIELD_AGGREGATION])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_AGGREGATION])) { $this->addAggregation(new FHIRAggregationMode([FHIRAggregationMode::FIELD_VALUE => $data[self::FIELD_AGGREGATION]] + $ext)); } else { $this->addAggregation(new FHIRAggregationMode($data[self::FIELD_AGGREGATION])); @@ -176,8 +182,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CODE] instanceof FHIRCode) { $this->setCode($data[self::FIELD_CODE]); - } elseif ($ext && is_scalar($data[self::FIELD_CODE])) { - $this->setCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_CODE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CODE])) { + $this->setCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_CODE]] + $ext)); + } else if (is_array($data[self::FIELD_CODE])) { + $this->setCode(new FHIRCode(array_merge($ext, $data[self::FIELD_CODE]))); + } } else { $this->setCode(new FHIRCode($data[self::FIELD_CODE])); } @@ -188,17 +198,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_PROFILE])) { foreach($data[self::FIELD_PROFILE] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRUri) { $this->addProfile($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addProfile(new FHIRUri([FHIRUri::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addProfile(new FHIRUri([FHIRUri::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addProfile(new FHIRUri(array_merge($v, $ext[$i]))); + } } else { $this->addProfile(new FHIRUri($v)); } } } elseif ($data[self::FIELD_PROFILE] instanceof FHIRUri) { $this->addProfile($data[self::FIELD_PROFILE]); - } elseif ($ext && is_scalar($data[self::FIELD_PROFILE])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_PROFILE])) { $this->addProfile(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_PROFILE]] + $ext)); } else { $this->addProfile(new FHIRUri($data[self::FIELD_PROFILE])); @@ -502,7 +519,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getAggregation())) { foreach($vs as $v) { if (null === $v) { @@ -511,6 +527,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_AGGREGATION, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } @@ -522,6 +539,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_PROFILE, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } @@ -532,11 +550,34 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if ([] !== ($vs = $this->getAggregation())) { - $a[self::FIELD_AGGREGATION] = $vs; + $a[self::FIELD_AGGREGATION] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_AGGREGATION][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_AGGREGATION_EXT][] = $enc; + } else { + $a[self::FIELD_AGGREGATION_EXT][] = null; + } + } else { + $a[self::FIELD_AGGREGATION][] = $v; + } + } } if (null !== ($v = $this->getCode())) { - $a[self::FIELD_CODE] = $v->getValue(); - $a[self::FIELD_CODE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CODE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CODE_EXT] = $enc; + } + } else { + $a[self::FIELD_CODE] = $v; + } } if ([] !== ($vs = $this->getProfile())) { $a[self::FIELD_PROFILE] = []; @@ -544,8 +585,17 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_PROFILE][] = $v->getValue(); - $a[self::FIELD_PROFILE_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PROFILE][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PROFILE_EXT][] = $enc; + } else { + $a[self::FIELD_PROFILE_EXT][] = null; + } + } else { + $a[self::FIELD_PROFILE][] = $v; + } } } return $a; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIREncounterClass.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIREncounterClass.php index d7534531b1..6dd095c48b 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIREncounterClass.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIREncounterClass.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIREncounterClass extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ENCOUNTER_CLASS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIREncounterClass extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIREncounterClass Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIREncounterLocationStatus.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIREncounterLocationStatus.php index dbe7ca2bae..0b80d61f06 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIREncounterLocationStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIREncounterLocationStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIREncounterLocationStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ENCOUNTER_LOCATION_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIREncounterLocationStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIREncounterLocationStatus Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIREncounterState.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIREncounterState.php index 6c7e7464e1..c75159a21f 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIREncounterState.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIREncounterState.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIREncounterState extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ENCOUNTER_STATE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIREncounterState extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIREncounterState Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIREpisodeOfCareStatus.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIREpisodeOfCareStatus.php index 31a55ef33a..3d450ac3c3 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIREpisodeOfCareStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIREpisodeOfCareStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIREpisodeOfCareStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_EPISODE_OF_CARE_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIREpisodeOfCareStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIREpisodeOfCareStatus Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIREventTiming.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIREventTiming.php index 345b4b768f..4ed58b57e8 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIREventTiming.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIREventTiming.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIREventTiming extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_EVENT_TIMING; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIREventTiming extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIREventTiming Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRExtension.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRExtension.php index 8a45982938..c1cc302b5e 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRExtension.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRExtension.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRExtension extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_EXTENSION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_URL = 'url'; const FIELD_VALUE_ADDRESS = 'valueAddress'; const FIELD_VALUE_ANNOTATION = 'valueAnnotation'; @@ -585,6 +581,9 @@ class FHIRExtension extends FHIRElement */ protected $valueUuid = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRExtension Constructor * @param null|array $data @@ -631,8 +630,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_BASE_64BINARY] instanceof FHIRBase64Binary) { $this->setValueBase64Binary($data[self::FIELD_VALUE_BASE_64BINARY]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_BASE_64BINARY])) { - $this->setValueBase64Binary(new FHIRBase64Binary([FHIRBase64Binary::FIELD_VALUE => $data[self::FIELD_VALUE_BASE_64BINARY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_BASE_64BINARY])) { + $this->setValueBase64Binary(new FHIRBase64Binary([FHIRBase64Binary::FIELD_VALUE => $data[self::FIELD_VALUE_BASE_64BINARY]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_BASE_64BINARY])) { + $this->setValueBase64Binary(new FHIRBase64Binary(array_merge($ext, $data[self::FIELD_VALUE_BASE_64BINARY]))); + } } else { $this->setValueBase64Binary(new FHIRBase64Binary($data[self::FIELD_VALUE_BASE_64BINARY])); } @@ -643,8 +646,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_BOOLEAN] instanceof FHIRBoolean) { $this->setValueBoolean($data[self::FIELD_VALUE_BOOLEAN]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_BOOLEAN])) { - $this->setValueBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_VALUE_BOOLEAN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_BOOLEAN])) { + $this->setValueBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_VALUE_BOOLEAN]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_BOOLEAN])) { + $this->setValueBoolean(new FHIRBoolean(array_merge($ext, $data[self::FIELD_VALUE_BOOLEAN]))); + } } else { $this->setValueBoolean(new FHIRBoolean($data[self::FIELD_VALUE_BOOLEAN])); } @@ -655,8 +662,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_CODE] instanceof FHIRCode) { $this->setValueCode($data[self::FIELD_VALUE_CODE]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_CODE])) { - $this->setValueCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_VALUE_CODE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_CODE])) { + $this->setValueCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_VALUE_CODE]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_CODE])) { + $this->setValueCode(new FHIRCode(array_merge($ext, $data[self::FIELD_VALUE_CODE]))); + } } else { $this->setValueCode(new FHIRCode($data[self::FIELD_VALUE_CODE])); } @@ -681,8 +692,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_CONTACT_POINT] instanceof FHIRContactPoint) { $this->setValueContactPoint($data[self::FIELD_VALUE_CONTACT_POINT]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_CONTACT_POINT])) { - $this->setValueContactPoint(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $data[self::FIELD_VALUE_CONTACT_POINT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_CONTACT_POINT])) { + $this->setValueContactPoint(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $data[self::FIELD_VALUE_CONTACT_POINT]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_CONTACT_POINT])) { + $this->setValueContactPoint(new FHIRContactPoint(array_merge($ext, $data[self::FIELD_VALUE_CONTACT_POINT]))); + } } else { $this->setValueContactPoint(new FHIRContactPoint($data[self::FIELD_VALUE_CONTACT_POINT])); } @@ -693,8 +708,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_DATE] instanceof FHIRDate) { $this->setValueDate($data[self::FIELD_VALUE_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_DATE])) { - $this->setValueDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_VALUE_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_DATE])) { + $this->setValueDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_VALUE_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_DATE])) { + $this->setValueDate(new FHIRDate(array_merge($ext, $data[self::FIELD_VALUE_DATE]))); + } } else { $this->setValueDate(new FHIRDate($data[self::FIELD_VALUE_DATE])); } @@ -705,8 +724,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_DATE_TIME] instanceof FHIRDateTime) { $this->setValueDateTime($data[self::FIELD_VALUE_DATE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_DATE_TIME])) { - $this->setValueDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_VALUE_DATE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_DATE_TIME])) { + $this->setValueDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_VALUE_DATE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_DATE_TIME])) { + $this->setValueDateTime(new FHIRDateTime(array_merge($ext, $data[self::FIELD_VALUE_DATE_TIME]))); + } } else { $this->setValueDateTime(new FHIRDateTime($data[self::FIELD_VALUE_DATE_TIME])); } @@ -717,8 +740,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_DECIMAL] instanceof FHIRDecimal) { $this->setValueDecimal($data[self::FIELD_VALUE_DECIMAL]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_DECIMAL])) { - $this->setValueDecimal(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_VALUE_DECIMAL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_DECIMAL])) { + $this->setValueDecimal(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_VALUE_DECIMAL]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_DECIMAL])) { + $this->setValueDecimal(new FHIRDecimal(array_merge($ext, $data[self::FIELD_VALUE_DECIMAL]))); + } } else { $this->setValueDecimal(new FHIRDecimal($data[self::FIELD_VALUE_DECIMAL])); } @@ -736,8 +763,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_ID] instanceof FHIRId) { $this->setValueId($data[self::FIELD_VALUE_ID]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_ID])) { - $this->setValueId(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_VALUE_ID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_ID])) { + $this->setValueId(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_VALUE_ID]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_ID])) { + $this->setValueId(new FHIRId(array_merge($ext, $data[self::FIELD_VALUE_ID]))); + } } else { $this->setValueId(new FHIRId($data[self::FIELD_VALUE_ID])); } @@ -748,8 +779,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_IDENTIFIER] instanceof FHIRIdentifier) { $this->setValueIdentifier($data[self::FIELD_VALUE_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_IDENTIFIER])) { - $this->setValueIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_VALUE_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_IDENTIFIER])) { + $this->setValueIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_VALUE_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_IDENTIFIER])) { + $this->setValueIdentifier(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_VALUE_IDENTIFIER]))); + } } else { $this->setValueIdentifier(new FHIRIdentifier($data[self::FIELD_VALUE_IDENTIFIER])); } @@ -760,8 +795,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_INSTANT] instanceof FHIRInstant) { $this->setValueInstant($data[self::FIELD_VALUE_INSTANT]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_INSTANT])) { - $this->setValueInstant(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_VALUE_INSTANT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_INSTANT])) { + $this->setValueInstant(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_VALUE_INSTANT]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_INSTANT])) { + $this->setValueInstant(new FHIRInstant(array_merge($ext, $data[self::FIELD_VALUE_INSTANT]))); + } } else { $this->setValueInstant(new FHIRInstant($data[self::FIELD_VALUE_INSTANT])); } @@ -772,8 +811,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_INTEGER] instanceof FHIRInteger) { $this->setValueInteger($data[self::FIELD_VALUE_INTEGER]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_INTEGER])) { - $this->setValueInteger(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_VALUE_INTEGER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_INTEGER])) { + $this->setValueInteger(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_VALUE_INTEGER]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_INTEGER])) { + $this->setValueInteger(new FHIRInteger(array_merge($ext, $data[self::FIELD_VALUE_INTEGER]))); + } } else { $this->setValueInteger(new FHIRInteger($data[self::FIELD_VALUE_INTEGER])); } @@ -784,8 +827,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_MARKDOWN] instanceof FHIRMarkdown) { $this->setValueMarkdown($data[self::FIELD_VALUE_MARKDOWN]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_MARKDOWN])) { - $this->setValueMarkdown(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_VALUE_MARKDOWN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_MARKDOWN])) { + $this->setValueMarkdown(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_VALUE_MARKDOWN]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_MARKDOWN])) { + $this->setValueMarkdown(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_VALUE_MARKDOWN]))); + } } else { $this->setValueMarkdown(new FHIRMarkdown($data[self::FIELD_VALUE_MARKDOWN])); } @@ -803,8 +850,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_OID] instanceof FHIROid) { $this->setValueOid($data[self::FIELD_VALUE_OID]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_OID])) { - $this->setValueOid(new FHIROid([FHIROid::FIELD_VALUE => $data[self::FIELD_VALUE_OID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_OID])) { + $this->setValueOid(new FHIROid([FHIROid::FIELD_VALUE => $data[self::FIELD_VALUE_OID]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_OID])) { + $this->setValueOid(new FHIROid(array_merge($ext, $data[self::FIELD_VALUE_OID]))); + } } else { $this->setValueOid(new FHIROid($data[self::FIELD_VALUE_OID])); } @@ -822,8 +873,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_POSITIVE_INT] instanceof FHIRPositiveInt) { $this->setValuePositiveInt($data[self::FIELD_VALUE_POSITIVE_INT]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_POSITIVE_INT])) { - $this->setValuePositiveInt(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_VALUE_POSITIVE_INT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_POSITIVE_INT])) { + $this->setValuePositiveInt(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_VALUE_POSITIVE_INT]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_POSITIVE_INT])) { + $this->setValuePositiveInt(new FHIRPositiveInt(array_merge($ext, $data[self::FIELD_VALUE_POSITIVE_INT]))); + } } else { $this->setValuePositiveInt(new FHIRPositiveInt($data[self::FIELD_VALUE_POSITIVE_INT])); } @@ -834,8 +889,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_QUANTITY] instanceof FHIRQuantity) { $this->setValueQuantity($data[self::FIELD_VALUE_QUANTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_QUANTITY])) { - $this->setValueQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_VALUE_QUANTITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_QUANTITY])) { + $this->setValueQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_VALUE_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_QUANTITY])) { + $this->setValueQuantity(new FHIRQuantity(array_merge($ext, $data[self::FIELD_VALUE_QUANTITY]))); + } } else { $this->setValueQuantity(new FHIRQuantity($data[self::FIELD_VALUE_QUANTITY])); } @@ -881,8 +940,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_STRING] instanceof FHIRString) { $this->setValueString($data[self::FIELD_VALUE_STRING]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_STRING])) { - $this->setValueString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VALUE_STRING]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_STRING])) { + $this->setValueString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VALUE_STRING]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_STRING])) { + $this->setValueString(new FHIRString(array_merge($ext, $data[self::FIELD_VALUE_STRING]))); + } } else { $this->setValueString(new FHIRString($data[self::FIELD_VALUE_STRING])); } @@ -893,8 +956,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_TIME] instanceof FHIRTime) { $this->setValueTime($data[self::FIELD_VALUE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_TIME])) { - $this->setValueTime(new FHIRTime([FHIRTime::FIELD_VALUE => $data[self::FIELD_VALUE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_TIME])) { + $this->setValueTime(new FHIRTime([FHIRTime::FIELD_VALUE => $data[self::FIELD_VALUE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_TIME])) { + $this->setValueTime(new FHIRTime(array_merge($ext, $data[self::FIELD_VALUE_TIME]))); + } } else { $this->setValueTime(new FHIRTime($data[self::FIELD_VALUE_TIME])); } @@ -912,8 +979,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_UNSIGNED_INT] instanceof FHIRUnsignedInt) { $this->setValueUnsignedInt($data[self::FIELD_VALUE_UNSIGNED_INT]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_UNSIGNED_INT])) { - $this->setValueUnsignedInt(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_VALUE_UNSIGNED_INT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_UNSIGNED_INT])) { + $this->setValueUnsignedInt(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_VALUE_UNSIGNED_INT]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_UNSIGNED_INT])) { + $this->setValueUnsignedInt(new FHIRUnsignedInt(array_merge($ext, $data[self::FIELD_VALUE_UNSIGNED_INT]))); + } } else { $this->setValueUnsignedInt(new FHIRUnsignedInt($data[self::FIELD_VALUE_UNSIGNED_INT])); } @@ -924,8 +995,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_URI] instanceof FHIRUri) { $this->setValueUri($data[self::FIELD_VALUE_URI]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_URI])) { - $this->setValueUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_VALUE_URI]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_URI])) { + $this->setValueUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_VALUE_URI]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_URI])) { + $this->setValueUri(new FHIRUri(array_merge($ext, $data[self::FIELD_VALUE_URI]))); + } } else { $this->setValueUri(new FHIRUri($data[self::FIELD_VALUE_URI])); } @@ -936,8 +1011,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_UUID] instanceof FHIRUuid) { $this->setValueUuid($data[self::FIELD_VALUE_UUID]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_UUID])) { - $this->setValueUuid(new FHIRUuid([FHIRUuid::FIELD_VALUE => $data[self::FIELD_VALUE_UUID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_UUID])) { + $this->setValueUuid(new FHIRUuid([FHIRUuid::FIELD_VALUE => $data[self::FIELD_VALUE_UUID]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_UUID])) { + $this->setValueUuid(new FHIRUuid(array_merge($ext, $data[self::FIELD_VALUE_UUID]))); + } } else { $this->setValueUuid(new FHIRUuid($data[self::FIELD_VALUE_UUID])); } @@ -2517,19 +2596,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getUrl())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getUrl())) { $sxe->addAttribute(self::FIELD_URL, (string)$v); } - if (null !== ($v = $this->getValueAddress())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_ADDRESS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueAnnotation())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_ANNOTATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueAttachment())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_ATTACHMENT, null, $v->_getFHIRXMLNamespace())); } @@ -2542,15 +2617,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getValueCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_CODE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueCoding())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_CODING, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueContactPoint())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_CONTACT_POINT, null, $v->_getFHIRXMLNamespace())); } @@ -2563,14 +2635,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getValueDecimal())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_DECIMAL, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueHumanName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_HUMAN_NAME, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getValueId())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_ID, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } @@ -2583,41 +2653,33 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getValueMarkdown())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_MARKDOWN, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueMeta())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_META, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getValueOid())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_OID, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValuePeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_PERIOD, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getValuePositiveInt())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_POSITIVE_INT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_QUANTITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueRange())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_RANGE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueRatio())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_RATIO, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_REFERENCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueSampledData())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_SAMPLED_DATA, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueSignature())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_SIGNATURE, null, $v->_getFHIRXMLNamespace())); } @@ -2627,7 +2689,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getValueTime())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_TIME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueTiming())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_TIMING, null, $v->_getFHIRXMLNamespace())); } @@ -2662,16 +2723,37 @@ public function jsonSerialize() $a[self::FIELD_VALUE_ATTACHMENT] = $v; } if (null !== ($v = $this->getValueBase64Binary())) { - $a[self::FIELD_VALUE_BASE_64BINARY] = $v->getValue(); - $a[self::FIELD_VALUE_BASE_64BINARY_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_BASE_64BINARY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_BASE_64BINARY_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_BASE_64BINARY] = $v; + } } if (null !== ($v = $this->getValueBoolean())) { - $a[self::FIELD_VALUE_BOOLEAN] = $v->getValue(); - $a[self::FIELD_VALUE_BOOLEAN_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_BOOLEAN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_BOOLEAN_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_BOOLEAN] = $v; + } } if (null !== ($v = $this->getValueCode())) { - $a[self::FIELD_VALUE_CODE] = $v->getValue(); - $a[self::FIELD_VALUE_CODE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_CODE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_CODE_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_CODE] = $v; + } } if (null !== ($v = $this->getValueCodeableConcept())) { $a[self::FIELD_VALUE_CODEABLE_CONCEPT] = $v; @@ -2680,58 +2762,145 @@ public function jsonSerialize() $a[self::FIELD_VALUE_CODING] = $v; } if (null !== ($v = $this->getValueContactPoint())) { - $a[self::FIELD_VALUE_CONTACT_POINT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_CONTACT_POINT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_CONTACT_POINT_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_CONTACT_POINT] = $v; + } } if (null !== ($v = $this->getValueDate())) { - $a[self::FIELD_VALUE_DATE] = $v->getValue(); - $a[self::FIELD_VALUE_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_DATE] = $v; + } } if (null !== ($v = $this->getValueDateTime())) { - $a[self::FIELD_VALUE_DATE_TIME] = $v->getValue(); - $a[self::FIELD_VALUE_DATE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_DATE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_DATE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_DATE_TIME] = $v; + } } if (null !== ($v = $this->getValueDecimal())) { - $a[self::FIELD_VALUE_DECIMAL] = $v->getValue(); - $a[self::FIELD_VALUE_DECIMAL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_DECIMAL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_DECIMAL_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_DECIMAL] = $v; + } } if (null !== ($v = $this->getValueHumanName())) { $a[self::FIELD_VALUE_HUMAN_NAME] = $v; } if (null !== ($v = $this->getValueId())) { - $a[self::FIELD_VALUE_ID] = $v->getValue(); - $a[self::FIELD_VALUE_ID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_ID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_ID_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_ID] = $v; + } } if (null !== ($v = $this->getValueIdentifier())) { - $a[self::FIELD_VALUE_IDENTIFIER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_IDENTIFIER] = $v; + } } if (null !== ($v = $this->getValueInstant())) { - $a[self::FIELD_VALUE_INSTANT] = $v->getValue(); - $a[self::FIELD_VALUE_INSTANT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_INSTANT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_INSTANT_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_INSTANT] = $v; + } } if (null !== ($v = $this->getValueInteger())) { - $a[self::FIELD_VALUE_INTEGER] = $v->getValue(); - $a[self::FIELD_VALUE_INTEGER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_INTEGER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_INTEGER_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_INTEGER] = $v; + } } if (null !== ($v = $this->getValueMarkdown())) { - $a[self::FIELD_VALUE_MARKDOWN] = $v->getValue(); - $a[self::FIELD_VALUE_MARKDOWN_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_MARKDOWN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_MARKDOWN_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_MARKDOWN] = $v; + } } if (null !== ($v = $this->getValueMeta())) { $a[self::FIELD_VALUE_META] = $v; } if (null !== ($v = $this->getValueOid())) { - $a[self::FIELD_VALUE_OID] = $v->getValue(); - $a[self::FIELD_VALUE_OID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_OID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_OID_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_OID] = $v; + } } if (null !== ($v = $this->getValuePeriod())) { $a[self::FIELD_VALUE_PERIOD] = $v; } if (null !== ($v = $this->getValuePositiveInt())) { - $a[self::FIELD_VALUE_POSITIVE_INT] = $v->getValue(); - $a[self::FIELD_VALUE_POSITIVE_INT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_POSITIVE_INT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_POSITIVE_INT_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_POSITIVE_INT] = $v; + } } if (null !== ($v = $this->getValueQuantity())) { - $a[self::FIELD_VALUE_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_QUANTITY] = $v; + } } if (null !== ($v = $this->getValueRange())) { $a[self::FIELD_VALUE_RANGE] = $v; @@ -2749,27 +2918,62 @@ public function jsonSerialize() $a[self::FIELD_VALUE_SIGNATURE] = $v; } if (null !== ($v = $this->getValueString())) { - $a[self::FIELD_VALUE_STRING] = $v->getValue(); - $a[self::FIELD_VALUE_STRING_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_STRING] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_STRING_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_STRING] = $v; + } } if (null !== ($v = $this->getValueTime())) { - $a[self::FIELD_VALUE_TIME] = $v->getValue(); - $a[self::FIELD_VALUE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_TIME] = $v; + } } if (null !== ($v = $this->getValueTiming())) { $a[self::FIELD_VALUE_TIMING] = $v; } if (null !== ($v = $this->getValueUnsignedInt())) { - $a[self::FIELD_VALUE_UNSIGNED_INT] = $v->getValue(); - $a[self::FIELD_VALUE_UNSIGNED_INT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_UNSIGNED_INT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_UNSIGNED_INT_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_UNSIGNED_INT] = $v; + } } if (null !== ($v = $this->getValueUri())) { - $a[self::FIELD_VALUE_URI] = $v->getValue(); - $a[self::FIELD_VALUE_URI_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_URI] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_URI_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_URI] = $v; + } } if (null !== ($v = $this->getValueUuid())) { - $a[self::FIELD_VALUE_UUID] = $v->getValue(); - $a[self::FIELD_VALUE_UUID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_UUID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_UUID_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_UUID] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRExtensionContext.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRExtensionContext.php index 23849684f8..7eecefdc0f 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRExtensionContext.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRExtensionContext.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRExtensionContext extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_EXTENSION_CONTEXT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRExtensionContext extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRExtensionContext Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRFamilyHistoryStatus.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRFamilyHistoryStatus.php index 2f6c7d3ff5..d7477da7ec 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRFamilyHistoryStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRFamilyHistoryStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRFamilyHistoryStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_FAMILY_HISTORY_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRFamilyHistoryStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRFamilyHistoryStatus Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRFilterOperator.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRFilterOperator.php index ce6e101af7..00914e10a1 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRFilterOperator.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRFilterOperator.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRFilterOperator extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_FILTER_OPERATOR; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRFilterOperator extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRFilterOperator Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRFlagStatus.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRFlagStatus.php index e0a23b596a..2bf9fb03ae 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRFlagStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRFlagStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRFlagStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_FLAG_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -90,6 +86,9 @@ class FHIRFlagStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRFlagStatus Constructor * @param null|array $data @@ -245,8 +244,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRGoalStatus.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRGoalStatus.php index fc02b6dc8f..ac33bfd706 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRGoalStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRGoalStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRGoalStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_GOAL_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRGoalStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRGoalStatus Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRGroupType.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRGroupType.php index ed4c517198..62c685b893 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRGroupType.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRGroupType.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRGroupType extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_GROUP_TYPE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRGroupType extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRGroupType Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRGuideDependencyType.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRGuideDependencyType.php index eb94312074..98e27b8771 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRGuideDependencyType.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRGuideDependencyType.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRGuideDependencyType extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_GUIDE_DEPENDENCY_TYPE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRGuideDependencyType extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRGuideDependencyType Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRGuidePageKind.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRGuidePageKind.php index 33e89a41d8..085cadec48 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRGuidePageKind.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRGuidePageKind.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRGuidePageKind extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_GUIDE_PAGE_KIND; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRGuidePageKind extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRGuidePageKind Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRGuideResourcePurpose.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRGuideResourcePurpose.php index aa86a0fb8b..a6471c69de 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRGuideResourcePurpose.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRGuideResourcePurpose.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRGuideResourcePurpose extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_GUIDE_RESOURCE_PURPOSE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRGuideResourcePurpose extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRGuideResourcePurpose Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRHTTPVerb.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRHTTPVerb.php index aaf31937a2..7a5adbb1bb 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRHTTPVerb.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRHTTPVerb.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRHTTPVerb extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_HTTPVERB; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRHTTPVerb extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRHTTPVerb Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRHumanName.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRHumanName.php index fc553788d2..7d2282b700 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRHumanName.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRHumanName.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRHumanName extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_HUMAN_NAME; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_FAMILY = 'family'; const FIELD_FAMILY_EXT = '_family'; const FIELD_GIVEN = 'given'; @@ -175,6 +171,9 @@ class FHIRHumanName extends FHIRElement */ protected $use = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRHumanName Constructor * @param null|array $data @@ -197,17 +196,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_FAMILY])) { foreach($data[self::FIELD_FAMILY] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRString) { $this->addFamily($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addFamily(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addFamily(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addFamily(new FHIRString(array_merge($v, $ext[$i]))); + } } else { $this->addFamily(new FHIRString($v)); } } } elseif ($data[self::FIELD_FAMILY] instanceof FHIRString) { $this->addFamily($data[self::FIELD_FAMILY]); - } elseif ($ext && is_scalar($data[self::FIELD_FAMILY])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_FAMILY])) { $this->addFamily(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_FAMILY]] + $ext)); } else { $this->addFamily(new FHIRString($data[self::FIELD_FAMILY])); @@ -219,17 +225,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_GIVEN])) { foreach($data[self::FIELD_GIVEN] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRString) { $this->addGiven($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addGiven(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addGiven(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addGiven(new FHIRString(array_merge($v, $ext[$i]))); + } } else { $this->addGiven(new FHIRString($v)); } } } elseif ($data[self::FIELD_GIVEN] instanceof FHIRString) { $this->addGiven($data[self::FIELD_GIVEN]); - } elseif ($ext && is_scalar($data[self::FIELD_GIVEN])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_GIVEN])) { $this->addGiven(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_GIVEN]] + $ext)); } else { $this->addGiven(new FHIRString($data[self::FIELD_GIVEN])); @@ -248,17 +261,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_PREFIX])) { foreach($data[self::FIELD_PREFIX] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRString) { $this->addPrefix($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addPrefix(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addPrefix(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addPrefix(new FHIRString(array_merge($v, $ext[$i]))); + } } else { $this->addPrefix(new FHIRString($v)); } } } elseif ($data[self::FIELD_PREFIX] instanceof FHIRString) { $this->addPrefix($data[self::FIELD_PREFIX]); - } elseif ($ext && is_scalar($data[self::FIELD_PREFIX])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_PREFIX])) { $this->addPrefix(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PREFIX]] + $ext)); } else { $this->addPrefix(new FHIRString($data[self::FIELD_PREFIX])); @@ -270,17 +290,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_SUFFIX])) { foreach($data[self::FIELD_SUFFIX] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRString) { $this->addSuffix($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addSuffix(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addSuffix(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addSuffix(new FHIRString(array_merge($v, $ext[$i]))); + } } else { $this->addSuffix(new FHIRString($v)); } } } elseif ($data[self::FIELD_SUFFIX] instanceof FHIRString) { $this->addSuffix($data[self::FIELD_SUFFIX]); - } elseif ($ext && is_scalar($data[self::FIELD_SUFFIX])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_SUFFIX])) { $this->addSuffix(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SUFFIX]] + $ext)); } else { $this->addSuffix(new FHIRString($data[self::FIELD_SUFFIX])); @@ -292,8 +319,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TEXT] instanceof FHIRString) { $this->setText($data[self::FIELD_TEXT]); - } elseif ($ext && is_scalar($data[self::FIELD_TEXT])) { - $this->setText(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TEXT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TEXT])) { + $this->setText(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TEXT]] + $ext)); + } else if (is_array($data[self::FIELD_TEXT])) { + $this->setText(new FHIRString(array_merge($ext, $data[self::FIELD_TEXT]))); + } } else { $this->setText(new FHIRString($data[self::FIELD_TEXT])); } @@ -304,8 +335,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_USE] instanceof FHIRNameUse) { $this->setUse($data[self::FIELD_USE]); - } elseif ($ext && is_scalar($data[self::FIELD_USE])) { - $this->setUse(new FHIRNameUse([FHIRNameUse::FIELD_VALUE => $data[self::FIELD_USE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_USE])) { + $this->setUse(new FHIRNameUse([FHIRNameUse::FIELD_VALUE => $data[self::FIELD_USE]] + $ext)); + } else if (is_array($data[self::FIELD_USE])) { + $this->setUse(new FHIRNameUse(array_merge($ext, $data[self::FIELD_USE]))); + } } else { $this->setUse(new FHIRNameUse($data[self::FIELD_USE])); } @@ -824,6 +859,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_FAMILY, null, $v->_getFHIRXMLNamespace())); } } + if ([] !== ($vs = $this->getGiven())) { foreach($vs as $v) { if (null === $v) { @@ -844,6 +880,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_PREFIX, null, $v->_getFHIRXMLNamespace())); } } + if ([] !== ($vs = $this->getSuffix())) { foreach($vs as $v) { if (null === $v) { @@ -852,10 +889,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_SUFFIX, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getText())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TEXT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getUse())) { $v->xmlSerialize($sxe->addChild(self::FIELD_USE, null, $v->_getFHIRXMLNamespace())); } @@ -874,8 +911,17 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_FAMILY][] = $v->getValue(); - $a[self::FIELD_FAMILY_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FAMILY][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FAMILY_EXT][] = $enc; + } else { + $a[self::FIELD_FAMILY_EXT][] = null; + } + } else { + $a[self::FIELD_FAMILY][] = $v; + } } } if ([] !== ($vs = $this->getGiven())) { @@ -884,8 +930,17 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_GIVEN][] = $v->getValue(); - $a[self::FIELD_GIVEN_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_GIVEN][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_GIVEN_EXT][] = $enc; + } else { + $a[self::FIELD_GIVEN_EXT][] = null; + } + } else { + $a[self::FIELD_GIVEN][] = $v; + } } } if (null !== ($v = $this->getPeriod())) { @@ -897,8 +952,17 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_PREFIX][] = $v->getValue(); - $a[self::FIELD_PREFIX_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PREFIX][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PREFIX_EXT][] = $enc; + } else { + $a[self::FIELD_PREFIX_EXT][] = null; + } + } else { + $a[self::FIELD_PREFIX][] = $v; + } } } if ([] !== ($vs = $this->getSuffix())) { @@ -907,16 +971,40 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_SUFFIX][] = $v->getValue(); - $a[self::FIELD_SUFFIX_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SUFFIX][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SUFFIX_EXT][] = $enc; + } else { + $a[self::FIELD_SUFFIX_EXT][] = null; + } + } else { + $a[self::FIELD_SUFFIX][] = $v; + } } } if (null !== ($v = $this->getText())) { - $a[self::FIELD_TEXT] = $v->getValue(); - $a[self::FIELD_TEXT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TEXT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TEXT_EXT] = $enc; + } + } else { + $a[self::FIELD_TEXT] = $v; + } } if (null !== ($v = $this->getUse())) { - $a[self::FIELD_USE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_USE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_USE_EXT] = $enc; + } + } else { + $a[self::FIELD_USE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRId.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRId.php index 689ab12526..b7ac7f99a0 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRId.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRId.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -82,10 +82,6 @@ class FHIRId extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ID; - - /** @var string */ - protected $_xmlns = ''; - const FIELD_VALUE = 'value'; /** @@ -93,6 +89,8 @@ class FHIRId extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; /** * FHIRId Constructor @@ -250,8 +248,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRIdentifier.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRIdentifier.php index 5d2b401a43..af1d7cd924 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRIdentifier.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRIdentifier.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRIdentifier extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_IDENTIFIER; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ASSIGNER = 'assigner'; const FIELD_PERIOD = 'period'; const FIELD_SYSTEM = 'system'; @@ -160,6 +156,9 @@ class FHIRIdentifier extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRIdentifier Constructor * @param null|array $data @@ -200,8 +199,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SYSTEM] instanceof FHIRUri) { $this->setSystem($data[self::FIELD_SYSTEM]); - } elseif ($ext && is_scalar($data[self::FIELD_SYSTEM])) { - $this->setSystem(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_SYSTEM]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SYSTEM])) { + $this->setSystem(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_SYSTEM]] + $ext)); + } else if (is_array($data[self::FIELD_SYSTEM])) { + $this->setSystem(new FHIRUri(array_merge($ext, $data[self::FIELD_SYSTEM]))); + } } else { $this->setSystem(new FHIRUri($data[self::FIELD_SYSTEM])); } @@ -219,8 +222,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_USE] instanceof FHIRIdentifierUse) { $this->setUse($data[self::FIELD_USE]); - } elseif ($ext && is_scalar($data[self::FIELD_USE])) { - $this->setUse(new FHIRIdentifierUse([FHIRIdentifierUse::FIELD_VALUE => $data[self::FIELD_USE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_USE])) { + $this->setUse(new FHIRIdentifierUse([FHIRIdentifierUse::FIELD_VALUE => $data[self::FIELD_USE]] + $ext)); + } else if (is_array($data[self::FIELD_USE])) { + $this->setUse(new FHIRIdentifierUse(array_merge($ext, $data[self::FIELD_USE]))); + } } else { $this->setUse(new FHIRIdentifierUse($data[self::FIELD_USE])); } @@ -231,8 +238,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE] instanceof FHIRString) { $this->setValue($data[self::FIELD_VALUE]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE])) { - $this->setValue(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VALUE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE])) { + $this->setValue(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VALUE]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE])) { + $this->setValue(new FHIRString(array_merge($ext, $data[self::FIELD_VALUE]))); + } } else { $this->setValue(new FHIRString($data[self::FIELD_VALUE])); } @@ -562,26 +573,23 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getAssigner())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ASSIGNER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PERIOD, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getSystem())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SYSTEM, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getUse())) { $v->xmlSerialize($sxe->addChild(self::FIELD_USE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getValue())) { + $sxe->addAttribute(self::FIELD_VALUE, (string)$v); $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE, null, $v->_getFHIRXMLNamespace())); } return $sxe; @@ -600,18 +608,40 @@ public function jsonSerialize() $a[self::FIELD_PERIOD] = $v; } if (null !== ($v = $this->getSystem())) { - $a[self::FIELD_SYSTEM] = $v->getValue(); - $a[self::FIELD_SYSTEM_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SYSTEM] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SYSTEM_EXT] = $enc; + } + } else { + $a[self::FIELD_SYSTEM] = $v; + } } if (null !== ($v = $this->getType())) { $a[self::FIELD_TYPE] = $v; } if (null !== ($v = $this->getUse())) { - $a[self::FIELD_USE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_USE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_USE_EXT] = $enc; + } + } else { + $a[self::FIELD_USE] = $v; + } } if (null !== ($v = $this->getValue())) { - $a[self::FIELD_VALUE] = $v->getValue(); - $a[self::FIELD_VALUE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRIdentifierUse.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRIdentifierUse.php index 5c9517717a..efcb60caee 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRIdentifierUse.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRIdentifierUse.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRIdentifierUse extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_IDENTIFIER_USE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRIdentifierUse extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRIdentifierUse Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRIdentityAssuranceLevel.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRIdentityAssuranceLevel.php index 45c0eded11..a2884ea3e1 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRIdentityAssuranceLevel.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRIdentityAssuranceLevel.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRIdentityAssuranceLevel extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_IDENTITY_ASSURANCE_LEVEL; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -90,6 +86,9 @@ class FHIRIdentityAssuranceLevel extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRIdentityAssuranceLevel Constructor * @param null|array $data @@ -245,8 +244,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRInstanceAvailability.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRInstanceAvailability.php index bd3edc0c69..3ee720099d 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRInstanceAvailability.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRInstanceAvailability.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRInstanceAvailability extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_INSTANCE_AVAILABILITY; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRInstanceAvailability extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRInstanceAvailability Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRInstant.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRInstant.php index ead6e823ff..1fd5b9b460 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRInstant.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRInstant.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -81,10 +81,6 @@ class FHIRInstant extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_INSTANT; - - /** @var string */ - protected $_xmlns = ''; - const FIELD_VALUE = 'value'; /** @@ -92,6 +88,8 @@ class FHIRInstant extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; /** * FHIRInstant Constructor @@ -249,8 +247,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRInteger.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRInteger.php index e55a6ee514..02ebb53e53 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRInteger.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRInteger.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRInteger extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_INTEGER; - - /** @var string */ - protected $_xmlns = ''; - const FIELD_VALUE = 'value'; /** @@ -90,6 +86,8 @@ class FHIRInteger extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; /** * FHIRInteger Constructor @@ -247,8 +245,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRIssueSeverity.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRIssueSeverity.php index a2948d572d..e93b8a908a 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRIssueSeverity.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRIssueSeverity.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRIssueSeverity extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ISSUE_SEVERITY; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRIssueSeverity extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRIssueSeverity Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRIssueType.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRIssueType.php index 4f84eba500..431f7a5ae2 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRIssueType.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRIssueType.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRIssueType extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ISSUE_TYPE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRIssueType extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRIssueType Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRLinkType.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRLinkType.php index 30744ccbda..bbe8de4edd 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRLinkType.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRLinkType.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRLinkType extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_LINK_TYPE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRLinkType extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRLinkType Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRListMode.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRListMode.php index 18a4850df4..7426e6dcd0 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRListMode.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRListMode.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRListMode extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_LIST_MODE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRListMode extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRListMode Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRListStatus.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRListStatus.php index 6022302db9..7ea21b3003 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRListStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRListStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRListStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_LIST_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRListStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRListStatus Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRLocationMode.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRLocationMode.php index 8a430f2855..9c6ec1c722 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRLocationMode.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRLocationMode.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRLocationMode extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_LOCATION_MODE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -90,6 +86,9 @@ class FHIRLocationMode extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRLocationMode Constructor * @param null|array $data @@ -245,8 +244,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRLocationStatus.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRLocationStatus.php index 61b6d47028..91fa6bbc3f 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRLocationStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRLocationStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRLocationStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_LOCATION_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRLocationStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRLocationStatus Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRMarkdown.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRMarkdown.php index 785dabebea..e799fd2b80 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRMarkdown.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRMarkdown.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -85,10 +85,6 @@ class FHIRMarkdown extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MARKDOWN; - - /** @var string */ - protected $_xmlns = ''; - const FIELD_VALUE = 'value'; /** @@ -96,6 +92,8 @@ class FHIRMarkdown extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; /** * FHIRMarkdown Constructor @@ -253,8 +251,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRMeasmnt_Principle.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRMeasmnt_Principle.php index 3559e10f45..12bc5201a6 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRMeasmnt_Principle.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRMeasmnt_Principle.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRMeasmnt_Principle extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MEASMNT_HYPHEN_PRINCIPLE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRMeasmnt_Principle extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMeasmnt_Principle Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRMedicationAdministrationStatus.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRMedicationAdministrationStatus.php index a7bd27c538..6d0caff54e 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRMedicationAdministrationStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRMedicationAdministrationStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRMedicationAdministrationStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MEDICATION_ADMINISTRATION_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRMedicationAdministrationStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMedicationAdministrationStatus Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRMedicationDispenseStatus.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRMedicationDispenseStatus.php index 85f7c0f889..e1808a1061 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRMedicationDispenseStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRMedicationDispenseStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRMedicationDispenseStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MEDICATION_DISPENSE_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRMedicationDispenseStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMedicationDispenseStatus Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRMedicationOrderStatus.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRMedicationOrderStatus.php index 205f107031..7c5a917e2f 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRMedicationOrderStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRMedicationOrderStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRMedicationOrderStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MEDICATION_ORDER_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -90,6 +86,9 @@ class FHIRMedicationOrderStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMedicationOrderStatus Constructor * @param null|array $data @@ -245,8 +244,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRMedicationStatementStatus.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRMedicationStatementStatus.php index 327229e805..318e6753fa 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRMedicationStatementStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRMedicationStatementStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRMedicationStatementStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MEDICATION_STATEMENT_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRMedicationStatementStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMedicationStatementStatus Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRMessageSignificanceCategory.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRMessageSignificanceCategory.php index cd94b3a73a..9a6e057a61 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRMessageSignificanceCategory.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRMessageSignificanceCategory.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRMessageSignificanceCategory extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MESSAGE_SIGNIFICANCE_CATEGORY; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRMessageSignificanceCategory extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMessageSignificanceCategory Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRMeta.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRMeta.php index 3cdde60b93..723445c90d 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRMeta.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRMeta.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRMeta extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_META; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_LAST_UPDATED = 'lastUpdated'; const FIELD_LAST_UPDATED_EXT = '_lastUpdated'; const FIELD_PROFILE = 'profile'; @@ -158,6 +154,9 @@ class FHIRMeta extends FHIRElement */ protected $versionId = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMeta Constructor * @param null|array $data @@ -180,8 +179,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_LAST_UPDATED] instanceof FHIRInstant) { $this->setLastUpdated($data[self::FIELD_LAST_UPDATED]); - } elseif ($ext && is_scalar($data[self::FIELD_LAST_UPDATED])) { - $this->setLastUpdated(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_LAST_UPDATED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_LAST_UPDATED])) { + $this->setLastUpdated(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_LAST_UPDATED]] + $ext)); + } else if (is_array($data[self::FIELD_LAST_UPDATED])) { + $this->setLastUpdated(new FHIRInstant(array_merge($ext, $data[self::FIELD_LAST_UPDATED]))); + } } else { $this->setLastUpdated(new FHIRInstant($data[self::FIELD_LAST_UPDATED])); } @@ -192,17 +195,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_PROFILE])) { foreach($data[self::FIELD_PROFILE] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRUri) { $this->addProfile($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addProfile(new FHIRUri([FHIRUri::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addProfile(new FHIRUri([FHIRUri::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addProfile(new FHIRUri(array_merge($v, $ext[$i]))); + } } else { $this->addProfile(new FHIRUri($v)); } } } elseif ($data[self::FIELD_PROFILE] instanceof FHIRUri) { $this->addProfile($data[self::FIELD_PROFILE]); - } elseif ($ext && is_scalar($data[self::FIELD_PROFILE])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_PROFILE])) { $this->addProfile(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_PROFILE]] + $ext)); } else { $this->addProfile(new FHIRUri($data[self::FIELD_PROFILE])); @@ -211,6 +221,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SECURITY])) { if (is_array($data[self::FIELD_SECURITY])) { foreach($data[self::FIELD_SECURITY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCoding) { $this->addSecurity($v); } else { @@ -226,6 +239,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_TAG])) { if (is_array($data[self::FIELD_TAG])) { foreach($data[self::FIELD_TAG] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCoding) { $this->addTag($v); } else { @@ -244,8 +260,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VERSION_ID] instanceof FHIRId) { $this->setVersionId($data[self::FIELD_VERSION_ID]); - } elseif ($ext && is_scalar($data[self::FIELD_VERSION_ID])) { - $this->setVersionId(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_VERSION_ID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VERSION_ID])) { + $this->setVersionId(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_VERSION_ID]] + $ext)); + } else if (is_array($data[self::FIELD_VERSION_ID])) { + $this->setVersionId(new FHIRId(array_merge($ext, $data[self::FIELD_VERSION_ID]))); + } } else { $this->setVersionId(new FHIRId($data[self::FIELD_VERSION_ID])); } @@ -686,6 +706,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_TAG, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getVersionId())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VERSION_ID, null, $v->_getFHIRXMLNamespace())); } @@ -699,8 +720,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getLastUpdated())) { - $a[self::FIELD_LAST_UPDATED] = $v->getValue(); - $a[self::FIELD_LAST_UPDATED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_LAST_UPDATED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_LAST_UPDATED_EXT] = $enc; + } + } else { + $a[self::FIELD_LAST_UPDATED] = $v; + } } if ([] !== ($vs = $this->getProfile())) { $a[self::FIELD_PROFILE] = []; @@ -708,8 +736,17 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_PROFILE][] = $v->getValue(); - $a[self::FIELD_PROFILE_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PROFILE][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PROFILE_EXT][] = $enc; + } else { + $a[self::FIELD_PROFILE_EXT][] = null; + } + } else { + $a[self::FIELD_PROFILE][] = $v; + } } } if ([] !== ($vs = $this->getSecurity())) { @@ -719,8 +756,15 @@ public function jsonSerialize() $a[self::FIELD_TAG] = $vs; } if (null !== ($v = $this->getVersionId())) { - $a[self::FIELD_VERSION_ID] = $v->getValue(); - $a[self::FIELD_VERSION_ID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VERSION_ID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VERSION_ID_EXT] = $enc; + } + } else { + $a[self::FIELD_VERSION_ID] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRNameUse.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRNameUse.php index ad5597ba3e..339a6a624a 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRNameUse.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRNameUse.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRNameUse extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_NAME_USE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRNameUse extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRNameUse Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRNamingSystemIdentifierType.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRNamingSystemIdentifierType.php index 8d2fdbd8fb..b73501b3fc 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRNamingSystemIdentifierType.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRNamingSystemIdentifierType.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRNamingSystemIdentifierType extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_NAMING_SYSTEM_IDENTIFIER_TYPE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRNamingSystemIdentifierType extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRNamingSystemIdentifierType Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRNamingSystemType.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRNamingSystemType.php index 032e0afad8..4604e26d2b 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRNamingSystemType.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRNamingSystemType.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRNamingSystemType extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_NAMING_SYSTEM_TYPE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRNamingSystemType extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRNamingSystemType Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRNarrative.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRNarrative.php index 4b5052d956..64b2eb41b1 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRNarrative.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRNarrative.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRNarrative extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_NARRATIVE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DIV = 'div'; const FIELD_STATUS = 'status'; const FIELD_STATUS_EXT = '_status'; @@ -106,6 +102,9 @@ class FHIRNarrative extends FHIRElement */ protected $status = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRNarrative Constructor * @param null|array $data @@ -131,8 +130,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRNarrativeStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRNarrativeStatus([FHIRNarrativeStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRNarrativeStatus([FHIRNarrativeStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRNarrativeStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRNarrativeStatus($data[self::FIELD_STATUS])); } @@ -308,11 +311,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getDiv())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getDiv())) { $sxe->addAttribute(self::FIELD_DIV, (string)$v); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } @@ -329,7 +330,15 @@ public function jsonSerialize() $a[self::FIELD_DIV] = $v; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRNarrativeStatus.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRNarrativeStatus.php index 15f35a4a84..02c1822856 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRNarrativeStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRNarrativeStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRNarrativeStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_NARRATIVE_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRNarrativeStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRNarrativeStatus Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRNoteType.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRNoteType.php index 5ba06b1036..7247f77b6e 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRNoteType.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRNoteType.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -77,10 +77,6 @@ class FHIRNoteType extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_NOTE_TYPE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -88,6 +84,9 @@ class FHIRNoteType extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRNoteType Constructor * @param null|array $data @@ -243,8 +242,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRNutritionOrderStatus.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRNutritionOrderStatus.php index 5318514e83..bdc5bc26d6 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRNutritionOrderStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRNutritionOrderStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRNutritionOrderStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_NUTRITION_ORDER_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -90,6 +86,9 @@ class FHIRNutritionOrderStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRNutritionOrderStatus Constructor * @param null|array $data @@ -245,8 +244,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRObservationRelationshipType.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRObservationRelationshipType.php index b17afba9e5..7852af69d8 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRObservationRelationshipType.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRObservationRelationshipType.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRObservationRelationshipType extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_OBSERVATION_RELATIONSHIP_TYPE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRObservationRelationshipType extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRObservationRelationshipType Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRObservationStatus.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRObservationStatus.php index 34dfe57a82..590214277d 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRObservationStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRObservationStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRObservationStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_OBSERVATION_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRObservationStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRObservationStatus Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIROid.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIROid.php index 70f89b7965..25fc1d3fce 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIROid.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIROid.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIROid extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_OID; - - /** @var string */ - protected $_xmlns = ''; - const FIELD_VALUE = 'value'; /** @@ -91,6 +87,8 @@ class FHIROid extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; /** * FHIROid Constructor @@ -248,8 +246,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIROperationKind.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIROperationKind.php index 9c7516ccba..f7df532977 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIROperationKind.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIROperationKind.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIROperationKind extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_OPERATION_KIND; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIROperationKind extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIROperationKind Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIROperationParameterUse.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIROperationParameterUse.php index a232c8876b..976a809c08 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIROperationParameterUse.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIROperationParameterUse.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIROperationParameterUse extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_OPERATION_PARAMETER_USE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIROperationParameterUse extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIROperationParameterUse Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIROrderStatus.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIROrderStatus.php index 3dd7a7524f..0acf123524 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIROrderStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIROrderStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIROrderStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ORDER_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIROrderStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIROrderStatus Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRParticipantRequired.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRParticipantRequired.php index 6190c98ee2..18931cc304 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRParticipantRequired.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRParticipantRequired.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRParticipantRequired extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_PARTICIPANT_REQUIRED; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRParticipantRequired extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRParticipantRequired Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRParticipantStatus.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRParticipantStatus.php index 6cade7d8bd..6dd0b74dc6 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRParticipantStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRParticipantStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRParticipantStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_PARTICIPANT_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRParticipantStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRParticipantStatus Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRParticipationStatus.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRParticipationStatus.php index f82505a953..69566953d6 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRParticipationStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRParticipationStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRParticipationStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_PARTICIPATION_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRParticipationStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRParticipationStatus Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRPeriod.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRPeriod.php index 5fdb6bf67d..43abb2e6fa 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRPeriod.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRPeriod.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRPeriod extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_PERIOD; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_END = 'end'; const FIELD_END_EXT = '_end'; const FIELD_START = 'start'; @@ -117,6 +113,9 @@ class FHIRPeriod extends FHIRElement */ protected $start = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRPeriod Constructor * @param null|array $data @@ -139,8 +138,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_END] instanceof FHIRDateTime) { $this->setEnd($data[self::FIELD_END]); - } elseif ($ext && is_scalar($data[self::FIELD_END])) { - $this->setEnd(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_END]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_END])) { + $this->setEnd(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_END]] + $ext)); + } else if (is_array($data[self::FIELD_END])) { + $this->setEnd(new FHIRDateTime(array_merge($ext, $data[self::FIELD_END]))); + } } else { $this->setEnd(new FHIRDateTime($data[self::FIELD_END])); } @@ -151,8 +154,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_START] instanceof FHIRDateTime) { $this->setStart($data[self::FIELD_START]); - } elseif ($ext && is_scalar($data[self::FIELD_START])) { - $this->setStart(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_START]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_START])) { + $this->setStart(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_START]] + $ext)); + } else if (is_array($data[self::FIELD_START])) { + $this->setStart(new FHIRDateTime(array_merge($ext, $data[self::FIELD_START]))); + } } else { $this->setStart(new FHIRDateTime($data[self::FIELD_START])); } @@ -378,12 +385,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getEnd())) { - $a[self::FIELD_END] = $v->getValue(); - $a[self::FIELD_END_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_END] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_END_EXT] = $enc; + } + } else { + $a[self::FIELD_END] = $v; + } } if (null !== ($v = $this->getStart())) { - $a[self::FIELD_START] = $v->getValue(); - $a[self::FIELD_START_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_START] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_START_EXT] = $enc; + } + } else { + $a[self::FIELD_START] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRPositiveInt.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRPositiveInt.php index 1155c5aab2..da6fc9938a 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRPositiveInt.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRPositiveInt.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRPositiveInt extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_POSITIVE_INT; - - /** @var string */ - protected $_xmlns = ''; - const FIELD_VALUE = 'value'; /** @@ -90,6 +86,8 @@ class FHIRPositiveInt extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; /** * FHIRPositiveInt Constructor @@ -247,8 +245,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRProcedureRequestPriority.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRProcedureRequestPriority.php index 5011655878..78557366b1 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRProcedureRequestPriority.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRProcedureRequestPriority.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRProcedureRequestPriority extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_PROCEDURE_REQUEST_PRIORITY; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRProcedureRequestPriority extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRProcedureRequestPriority Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRProcedureRequestStatus.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRProcedureRequestStatus.php index 211a5f0b98..0a2418365f 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRProcedureRequestStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRProcedureRequestStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRProcedureRequestStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_PROCEDURE_REQUEST_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRProcedureRequestStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRProcedureRequestStatus Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRProcedureStatus.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRProcedureStatus.php index 02fa4af04c..5e72e2a176 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRProcedureStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRProcedureStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRProcedureStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_PROCEDURE_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRProcedureStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRProcedureStatus Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRPropertyRepresentation.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRPropertyRepresentation.php index 2da4b74acf..180e27dc67 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRPropertyRepresentation.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRPropertyRepresentation.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRPropertyRepresentation extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_PROPERTY_REPRESENTATION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRPropertyRepresentation extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRPropertyRepresentation Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRProvenanceEntityRole.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRProvenanceEntityRole.php index 381979f5d3..b87c1a5216 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRProvenanceEntityRole.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRProvenanceEntityRole.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRProvenanceEntityRole extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_PROVENANCE_ENTITY_ROLE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRProvenanceEntityRole extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRProvenanceEntityRole Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRQuantity.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRQuantity.php index a7e408e613..c658109fc9 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRQuantity.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRQuantity.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRQuantity extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_QUANTITY; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CODE = 'code'; const FIELD_CODE_EXT = '_code'; const FIELD_COMPARATOR = 'comparator'; @@ -154,6 +150,9 @@ class FHIRQuantity extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRQuantity Constructor * @param null|array $data @@ -180,8 +179,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CODE] instanceof FHIRCode) { $this->setCode($data[self::FIELD_CODE]); - } elseif ($ext && is_scalar($data[self::FIELD_CODE])) { - $this->setCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_CODE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CODE])) { + $this->setCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_CODE]] + $ext)); + } else if (is_array($data[self::FIELD_CODE])) { + $this->setCode(new FHIRCode(array_merge($ext, $data[self::FIELD_CODE]))); + } } else { $this->setCode(new FHIRCode($data[self::FIELD_CODE])); } @@ -192,8 +195,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_COMPARATOR] instanceof FHIRQuantityComparator) { $this->setComparator($data[self::FIELD_COMPARATOR]); - } elseif ($ext && is_scalar($data[self::FIELD_COMPARATOR])) { - $this->setComparator(new FHIRQuantityComparator([FHIRQuantityComparator::FIELD_VALUE => $data[self::FIELD_COMPARATOR]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_COMPARATOR])) { + $this->setComparator(new FHIRQuantityComparator([FHIRQuantityComparator::FIELD_VALUE => $data[self::FIELD_COMPARATOR]] + $ext)); + } else if (is_array($data[self::FIELD_COMPARATOR])) { + $this->setComparator(new FHIRQuantityComparator(array_merge($ext, $data[self::FIELD_COMPARATOR]))); + } } else { $this->setComparator(new FHIRQuantityComparator($data[self::FIELD_COMPARATOR])); } @@ -204,8 +211,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SYSTEM] instanceof FHIRUri) { $this->setSystem($data[self::FIELD_SYSTEM]); - } elseif ($ext && is_scalar($data[self::FIELD_SYSTEM])) { - $this->setSystem(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_SYSTEM]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SYSTEM])) { + $this->setSystem(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_SYSTEM]] + $ext)); + } else if (is_array($data[self::FIELD_SYSTEM])) { + $this->setSystem(new FHIRUri(array_merge($ext, $data[self::FIELD_SYSTEM]))); + } } else { $this->setSystem(new FHIRUri($data[self::FIELD_SYSTEM])); } @@ -216,8 +227,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_UNIT] instanceof FHIRString) { $this->setUnit($data[self::FIELD_UNIT]); - } elseif ($ext && is_scalar($data[self::FIELD_UNIT])) { - $this->setUnit(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_UNIT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_UNIT])) { + $this->setUnit(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_UNIT]] + $ext)); + } else if (is_array($data[self::FIELD_UNIT])) { + $this->setUnit(new FHIRString(array_merge($ext, $data[self::FIELD_UNIT]))); + } } else { $this->setUnit(new FHIRString($data[self::FIELD_UNIT])); } @@ -228,8 +243,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE] instanceof FHIRDecimal) { $this->setValue($data[self::FIELD_VALUE]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE])) { - $this->setValue(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_VALUE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE])) { + $this->setValue(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_VALUE]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE])) { + $this->setValue(new FHIRDecimal(array_merge($ext, $data[self::FIELD_VALUE]))); + } } else { $this->setValue(new FHIRDecimal($data[self::FIELD_VALUE])); } @@ -555,7 +574,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getComparator())) { $v->xmlSerialize($sxe->addChild(self::FIELD_COMPARATOR, null, $v->_getFHIRXMLNamespace())); } @@ -566,6 +584,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_UNIT, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getValue())) { + $sxe->addAttribute(self::FIELD_VALUE, (string)$v); $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE, null, $v->_getFHIRXMLNamespace())); } return $sxe; @@ -578,23 +597,59 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getCode())) { - $a[self::FIELD_CODE] = $v->getValue(); - $a[self::FIELD_CODE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CODE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CODE_EXT] = $enc; + } + } else { + $a[self::FIELD_CODE] = $v; + } } if (null !== ($v = $this->getComparator())) { - $a[self::FIELD_COMPARATOR] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_COMPARATOR] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_COMPARATOR_EXT] = $enc; + } + } else { + $a[self::FIELD_COMPARATOR] = $v; + } } if (null !== ($v = $this->getSystem())) { - $a[self::FIELD_SYSTEM] = $v->getValue(); - $a[self::FIELD_SYSTEM_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SYSTEM] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SYSTEM_EXT] = $enc; + } + } else { + $a[self::FIELD_SYSTEM] = $v; + } } if (null !== ($v = $this->getUnit())) { - $a[self::FIELD_UNIT] = $v->getValue(); - $a[self::FIELD_UNIT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_UNIT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_UNIT_EXT] = $enc; + } + } else { + $a[self::FIELD_UNIT] = $v; + } } if (null !== ($v = $this->getValue())) { - $a[self::FIELD_VALUE] = $v->getValue(); - $a[self::FIELD_VALUE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRQuantity/FHIRAge.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRQuantity/FHIRAge.php index b53d2ae948..ee6db7a7d6 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRQuantity/FHIRAge.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRQuantity/FHIRAge.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -74,7 +74,6 @@ class FHIRAge extends FHIRQuantity { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_AGE; - /** @var string */ protected $_xmlns = 'http://hl7.org/fhir'; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRQuantity/FHIRCount.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRQuantity/FHIRCount.php index 9e1b025eb4..4f7f4ee73b 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRQuantity/FHIRCount.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRQuantity/FHIRCount.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -74,7 +74,6 @@ class FHIRCount extends FHIRQuantity { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_COUNT; - /** @var string */ protected $_xmlns = 'http://hl7.org/fhir'; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRQuantity/FHIRDistance.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRQuantity/FHIRDistance.php index fef2795d03..0ec7321cb3 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRQuantity/FHIRDistance.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRQuantity/FHIRDistance.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -74,7 +74,6 @@ class FHIRDistance extends FHIRQuantity { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DISTANCE; - /** @var string */ protected $_xmlns = 'http://hl7.org/fhir'; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRQuantity/FHIRDuration.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRQuantity/FHIRDuration.php index 25840476d0..e8f13e3fa9 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRQuantity/FHIRDuration.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRQuantity/FHIRDuration.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -74,7 +74,6 @@ class FHIRDuration extends FHIRQuantity { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DURATION; - /** @var string */ protected $_xmlns = 'http://hl7.org/fhir'; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRQuantity/FHIRMoney.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRQuantity/FHIRMoney.php index d61a00bd6c..75908347fa 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRQuantity/FHIRMoney.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRQuantity/FHIRMoney.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -74,7 +74,6 @@ class FHIRMoney extends FHIRQuantity { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MONEY; - /** @var string */ protected $_xmlns = 'http://hl7.org/fhir'; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRQuantity/FHIRSimpleQuantity.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRQuantity/FHIRSimpleQuantity.php index f85fad3e65..3384110e5b 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRQuantity/FHIRSimpleQuantity.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRQuantity/FHIRSimpleQuantity.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -74,7 +74,6 @@ class FHIRSimpleQuantity extends FHIRQuantity { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SIMPLE_QUANTITY; - /** @var string */ protected $_xmlns = 'http://hl7.org/fhir'; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRQuantityComparator.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRQuantityComparator.php index eb41c58136..21579811d3 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRQuantityComparator.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRQuantityComparator.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRQuantityComparator extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_QUANTITY_COMPARATOR; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRQuantityComparator extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRQuantityComparator Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRQuestionnaireResponseStatus.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRQuestionnaireResponseStatus.php index 1caf75f775..dd32135650 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRQuestionnaireResponseStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRQuestionnaireResponseStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRQuestionnaireResponseStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_QUESTIONNAIRE_RESPONSE_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRQuestionnaireResponseStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRQuestionnaireResponseStatus Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRQuestionnaireStatus.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRQuestionnaireStatus.php index 1b803f1133..11c08feda5 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRQuestionnaireStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRQuestionnaireStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRQuestionnaireStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_QUESTIONNAIRE_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRQuestionnaireStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRQuestionnaireStatus Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRRange.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRRange.php index 247d3dffc0..d0ae783aab 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRRange.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRRange.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,12 +79,10 @@ class FHIRRange extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_RANGE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_HIGH = 'high'; + const FIELD_HIGH_EXT = '_high'; const FIELD_LOW = 'low'; + const FIELD_LOW_EXT = '_low'; /** * The high limit. The boundary is inclusive. @@ -100,6 +98,9 @@ class FHIRRange extends FHIRElement */ protected $low = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRRange Constructor * @param null|array $data @@ -117,15 +118,33 @@ public function __construct($data = null) } parent::__construct($data); if (isset($data[self::FIELD_HIGH])) { + $ext = (isset($data[self::FIELD_HIGH_EXT]) && is_array($data[self::FIELD_HIGH_EXT])) + ? $data[self::FIELD_HIGH_EXT] + : null; if ($data[self::FIELD_HIGH] instanceof FHIRSimpleQuantity) { $this->setHigh($data[self::FIELD_HIGH]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_HIGH])) { + $this->setHigh(new FHIRSimpleQuantity([FHIRSimpleQuantity::FIELD_VALUE => $data[self::FIELD_HIGH]] + $ext)); + } else if (is_array($data[self::FIELD_HIGH])) { + $this->setHigh(new FHIRSimpleQuantity(array_merge($ext, $data[self::FIELD_HIGH]))); + } } else { $this->setHigh(new FHIRSimpleQuantity($data[self::FIELD_HIGH])); } } if (isset($data[self::FIELD_LOW])) { + $ext = (isset($data[self::FIELD_LOW_EXT]) && is_array($data[self::FIELD_LOW_EXT])) + ? $data[self::FIELD_LOW_EXT] + : null; if ($data[self::FIELD_LOW] instanceof FHIRSimpleQuantity) { $this->setLow($data[self::FIELD_LOW]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_LOW])) { + $this->setLow(new FHIRSimpleQuantity([FHIRSimpleQuantity::FIELD_VALUE => $data[self::FIELD_LOW]] + $ext)); + } else if (is_array($data[self::FIELD_LOW])) { + $this->setLow(new FHIRSimpleQuantity(array_merge($ext, $data[self::FIELD_LOW]))); + } } else { $this->setLow(new FHIRSimpleQuantity($data[self::FIELD_LOW])); } @@ -281,11 +300,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getHigh())) { $v->xmlSerialize($sxe->addChild(self::FIELD_HIGH, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getLow())) { $v->xmlSerialize($sxe->addChild(self::FIELD_LOW, null, $v->_getFHIRXMLNamespace())); } @@ -299,10 +316,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getHigh())) { - $a[self::FIELD_HIGH] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_HIGH] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_HIGH_EXT] = $enc; + } + } else { + $a[self::FIELD_HIGH] = $v; + } } if (null !== ($v = $this->getLow())) { - $a[self::FIELD_LOW] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_LOW] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_LOW_EXT] = $enc; + } + } else { + $a[self::FIELD_LOW] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRRatio.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRRatio.php index 770e7fede0..37a22d93cb 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRRatio.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRRatio.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRRatio extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_RATIO; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DENOMINATOR = 'denominator'; const FIELD_DENOMINATOR_EXT = '_denominator'; const FIELD_NUMERATOR = 'numerator'; @@ -114,6 +110,9 @@ class FHIRRatio extends FHIRElement */ protected $numerator = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRRatio Constructor * @param null|array $data @@ -136,8 +135,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DENOMINATOR] instanceof FHIRQuantity) { $this->setDenominator($data[self::FIELD_DENOMINATOR]); - } elseif ($ext && is_scalar($data[self::FIELD_DENOMINATOR])) { - $this->setDenominator(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_DENOMINATOR]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DENOMINATOR])) { + $this->setDenominator(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_DENOMINATOR]] + $ext)); + } else if (is_array($data[self::FIELD_DENOMINATOR])) { + $this->setDenominator(new FHIRQuantity(array_merge($ext, $data[self::FIELD_DENOMINATOR]))); + } } else { $this->setDenominator(new FHIRQuantity($data[self::FIELD_DENOMINATOR])); } @@ -148,8 +151,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NUMERATOR] instanceof FHIRQuantity) { $this->setNumerator($data[self::FIELD_NUMERATOR]); - } elseif ($ext && is_scalar($data[self::FIELD_NUMERATOR])) { - $this->setNumerator(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_NUMERATOR]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NUMERATOR])) { + $this->setNumerator(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_NUMERATOR]] + $ext)); + } else if (is_array($data[self::FIELD_NUMERATOR])) { + $this->setNumerator(new FHIRQuantity(array_merge($ext, $data[self::FIELD_NUMERATOR]))); + } } else { $this->setNumerator(new FHIRQuantity($data[self::FIELD_NUMERATOR])); } @@ -329,11 +336,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getDenominator())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DENOMINATOR, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getNumerator())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NUMERATOR, null, $v->_getFHIRXMLNamespace())); } @@ -347,10 +352,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getDenominator())) { - $a[self::FIELD_DENOMINATOR] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DENOMINATOR] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DENOMINATOR_EXT] = $enc; + } + } else { + $a[self::FIELD_DENOMINATOR] = $v; + } } if (null !== ($v = $this->getNumerator())) { - $a[self::FIELD_NUMERATOR] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NUMERATOR] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NUMERATOR_EXT] = $enc; + } + } else { + $a[self::FIELD_NUMERATOR] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRReference.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRReference.php index 6e95d97b68..f2f706e01a 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRReference.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRReference.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRReference extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_REFERENCE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DISPLAY = 'display'; const FIELD_DISPLAY_EXT = '_display'; const FIELD_REFERENCE = 'reference'; @@ -115,6 +111,9 @@ class FHIRReference extends FHIRElement */ protected $reference = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRReference Constructor * @param null|array $data @@ -137,8 +136,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DISPLAY] instanceof FHIRString) { $this->setDisplay($data[self::FIELD_DISPLAY]); - } elseif ($ext && is_scalar($data[self::FIELD_DISPLAY])) { - $this->setDisplay(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DISPLAY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DISPLAY])) { + $this->setDisplay(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DISPLAY]] + $ext)); + } else if (is_array($data[self::FIELD_DISPLAY])) { + $this->setDisplay(new FHIRString(array_merge($ext, $data[self::FIELD_DISPLAY]))); + } } else { $this->setDisplay(new FHIRString($data[self::FIELD_DISPLAY])); } @@ -149,8 +152,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_REFERENCE] instanceof FHIRString) { $this->setReference($data[self::FIELD_REFERENCE]); - } elseif ($ext && is_scalar($data[self::FIELD_REFERENCE])) { - $this->setReference(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_REFERENCE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_REFERENCE])) { + $this->setReference(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_REFERENCE]] + $ext)); + } else if (is_array($data[self::FIELD_REFERENCE])) { + $this->setReference(new FHIRString(array_merge($ext, $data[self::FIELD_REFERENCE]))); + } } else { $this->setReference(new FHIRString($data[self::FIELD_REFERENCE])); } @@ -372,12 +379,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getDisplay())) { - $a[self::FIELD_DISPLAY] = $v->getValue(); - $a[self::FIELD_DISPLAY_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DISPLAY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DISPLAY_EXT] = $enc; + } + } else { + $a[self::FIELD_DISPLAY] = $v; + } } if (null !== ($v = $this->getReference())) { - $a[self::FIELD_REFERENCE] = $v->getValue(); - $a[self::FIELD_REFERENCE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_REFERENCE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_REFERENCE_EXT] = $enc; + } + } else { + $a[self::FIELD_REFERENCE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRReferralStatus.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRReferralStatus.php index c8eaa1ed5a..9e60e8e273 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRReferralStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRReferralStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRReferralStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_REFERRAL_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRReferralStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRReferralStatus Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRRemittanceOutcome.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRRemittanceOutcome.php index 1e1284328a..8d3728b86e 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRRemittanceOutcome.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRRemittanceOutcome.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -77,10 +77,6 @@ class FHIRRemittanceOutcome extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_REMITTANCE_OUTCOME; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -88,6 +84,9 @@ class FHIRRemittanceOutcome extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRRemittanceOutcome Constructor * @param null|array $data @@ -243,8 +242,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRResourceVersionPolicy.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRResourceVersionPolicy.php index 1e595be36b..2c2e1b7c9e 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRResourceVersionPolicy.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRResourceVersionPolicy.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRResourceVersionPolicy extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_RESOURCE_VERSION_POLICY; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRResourceVersionPolicy extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRResourceVersionPolicy Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRResponseType.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRResponseType.php index 0af9bdf7c0..d443e8eceb 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRResponseType.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRResponseType.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRResponseType extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_RESPONSE_TYPE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRResponseType extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRResponseType Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRRestfulConformanceMode.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRRestfulConformanceMode.php index c4430fbf68..b3246573ac 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRRestfulConformanceMode.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRRestfulConformanceMode.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRRestfulConformanceMode extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_RESTFUL_CONFORMANCE_MODE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRRestfulConformanceMode extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRRestfulConformanceMode Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRSampledData.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRSampledData.php index 8dce7bae3d..f54bf2de08 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRSampledData.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRSampledData.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRSampledData extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SAMPLED_DATA; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DATA = 'data'; const FIELD_DATA_EXT = '_data'; const FIELD_DIMENSIONS = 'dimensions'; @@ -93,6 +89,7 @@ class FHIRSampledData extends FHIRElement const FIELD_LOWER_LIMIT = 'lowerLimit'; const FIELD_LOWER_LIMIT_EXT = '_lowerLimit'; const FIELD_ORIGIN = 'origin'; + const FIELD_ORIGIN_EXT = '_origin'; const FIELD_PERIOD = 'period'; const FIELD_PERIOD_EXT = '_period'; const FIELD_UPPER_LIMIT = 'upperLimit'; @@ -179,6 +176,9 @@ class FHIRSampledData extends FHIRElement */ protected $upperLimit = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSampledData Constructor * @param null|array $data @@ -201,8 +201,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATA] instanceof FHIRSampledDataDataType) { $this->setData($data[self::FIELD_DATA]); - } elseif ($ext && is_scalar($data[self::FIELD_DATA])) { - $this->setData(new FHIRSampledDataDataType([FHIRSampledDataDataType::FIELD_VALUE => $data[self::FIELD_DATA]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATA])) { + $this->setData(new FHIRSampledDataDataType([FHIRSampledDataDataType::FIELD_VALUE => $data[self::FIELD_DATA]] + $ext)); + } else if (is_array($data[self::FIELD_DATA])) { + $this->setData(new FHIRSampledDataDataType(array_merge($ext, $data[self::FIELD_DATA]))); + } } else { $this->setData(new FHIRSampledDataDataType($data[self::FIELD_DATA])); } @@ -213,8 +217,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DIMENSIONS] instanceof FHIRPositiveInt) { $this->setDimensions($data[self::FIELD_DIMENSIONS]); - } elseif ($ext && is_scalar($data[self::FIELD_DIMENSIONS])) { - $this->setDimensions(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_DIMENSIONS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DIMENSIONS])) { + $this->setDimensions(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_DIMENSIONS]] + $ext)); + } else if (is_array($data[self::FIELD_DIMENSIONS])) { + $this->setDimensions(new FHIRPositiveInt(array_merge($ext, $data[self::FIELD_DIMENSIONS]))); + } } else { $this->setDimensions(new FHIRPositiveInt($data[self::FIELD_DIMENSIONS])); } @@ -225,8 +233,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_FACTOR] instanceof FHIRDecimal) { $this->setFactor($data[self::FIELD_FACTOR]); - } elseif ($ext && is_scalar($data[self::FIELD_FACTOR])) { - $this->setFactor(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_FACTOR]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_FACTOR])) { + $this->setFactor(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_FACTOR]] + $ext)); + } else if (is_array($data[self::FIELD_FACTOR])) { + $this->setFactor(new FHIRDecimal(array_merge($ext, $data[self::FIELD_FACTOR]))); + } } else { $this->setFactor(new FHIRDecimal($data[self::FIELD_FACTOR])); } @@ -237,15 +249,28 @@ public function __construct($data = null) : null; if ($data[self::FIELD_LOWER_LIMIT] instanceof FHIRDecimal) { $this->setLowerLimit($data[self::FIELD_LOWER_LIMIT]); - } elseif ($ext && is_scalar($data[self::FIELD_LOWER_LIMIT])) { - $this->setLowerLimit(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_LOWER_LIMIT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_LOWER_LIMIT])) { + $this->setLowerLimit(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_LOWER_LIMIT]] + $ext)); + } else if (is_array($data[self::FIELD_LOWER_LIMIT])) { + $this->setLowerLimit(new FHIRDecimal(array_merge($ext, $data[self::FIELD_LOWER_LIMIT]))); + } } else { $this->setLowerLimit(new FHIRDecimal($data[self::FIELD_LOWER_LIMIT])); } } if (isset($data[self::FIELD_ORIGIN])) { + $ext = (isset($data[self::FIELD_ORIGIN_EXT]) && is_array($data[self::FIELD_ORIGIN_EXT])) + ? $data[self::FIELD_ORIGIN_EXT] + : null; if ($data[self::FIELD_ORIGIN] instanceof FHIRSimpleQuantity) { $this->setOrigin($data[self::FIELD_ORIGIN]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ORIGIN])) { + $this->setOrigin(new FHIRSimpleQuantity([FHIRSimpleQuantity::FIELD_VALUE => $data[self::FIELD_ORIGIN]] + $ext)); + } else if (is_array($data[self::FIELD_ORIGIN])) { + $this->setOrigin(new FHIRSimpleQuantity(array_merge($ext, $data[self::FIELD_ORIGIN]))); + } } else { $this->setOrigin(new FHIRSimpleQuantity($data[self::FIELD_ORIGIN])); } @@ -256,8 +281,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PERIOD] instanceof FHIRDecimal) { $this->setPeriod($data[self::FIELD_PERIOD]); - } elseif ($ext && is_scalar($data[self::FIELD_PERIOD])) { - $this->setPeriod(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_PERIOD]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PERIOD])) { + $this->setPeriod(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_PERIOD]] + $ext)); + } else if (is_array($data[self::FIELD_PERIOD])) { + $this->setPeriod(new FHIRDecimal(array_merge($ext, $data[self::FIELD_PERIOD]))); + } } else { $this->setPeriod(new FHIRDecimal($data[self::FIELD_PERIOD])); } @@ -268,8 +297,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_UPPER_LIMIT] instanceof FHIRDecimal) { $this->setUpperLimit($data[self::FIELD_UPPER_LIMIT]); - } elseif ($ext && is_scalar($data[self::FIELD_UPPER_LIMIT])) { - $this->setUpperLimit(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_UPPER_LIMIT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_UPPER_LIMIT])) { + $this->setUpperLimit(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_UPPER_LIMIT]] + $ext)); + } else if (is_array($data[self::FIELD_UPPER_LIMIT])) { + $this->setUpperLimit(new FHIRDecimal(array_merge($ext, $data[self::FIELD_UPPER_LIMIT]))); + } } else { $this->setUpperLimit(new FHIRDecimal($data[self::FIELD_UPPER_LIMIT])); } @@ -692,7 +725,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getLowerLimit())) { $v->xmlSerialize($sxe->addChild(self::FIELD_LOWER_LIMIT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOrigin())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ORIGIN, null, $v->_getFHIRXMLNamespace())); } @@ -712,31 +744,81 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getData())) { - $a[self::FIELD_DATA] = $v->getValue(); - $a[self::FIELD_DATA_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATA] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATA_EXT] = $enc; + } + } else { + $a[self::FIELD_DATA] = $v; + } } if (null !== ($v = $this->getDimensions())) { - $a[self::FIELD_DIMENSIONS] = $v->getValue(); - $a[self::FIELD_DIMENSIONS_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DIMENSIONS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DIMENSIONS_EXT] = $enc; + } + } else { + $a[self::FIELD_DIMENSIONS] = $v; + } } if (null !== ($v = $this->getFactor())) { - $a[self::FIELD_FACTOR] = $v->getValue(); - $a[self::FIELD_FACTOR_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FACTOR] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FACTOR_EXT] = $enc; + } + } else { + $a[self::FIELD_FACTOR] = $v; + } } if (null !== ($v = $this->getLowerLimit())) { - $a[self::FIELD_LOWER_LIMIT] = $v->getValue(); - $a[self::FIELD_LOWER_LIMIT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_LOWER_LIMIT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_LOWER_LIMIT_EXT] = $enc; + } + } else { + $a[self::FIELD_LOWER_LIMIT] = $v; + } } if (null !== ($v = $this->getOrigin())) { - $a[self::FIELD_ORIGIN] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ORIGIN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ORIGIN_EXT] = $enc; + } + } else { + $a[self::FIELD_ORIGIN] = $v; + } } if (null !== ($v = $this->getPeriod())) { - $a[self::FIELD_PERIOD] = $v->getValue(); - $a[self::FIELD_PERIOD_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PERIOD] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PERIOD_EXT] = $enc; + } + } else { + $a[self::FIELD_PERIOD] = $v; + } } if (null !== ($v = $this->getUpperLimit())) { - $a[self::FIELD_UPPER_LIMIT] = $v->getValue(); - $a[self::FIELD_UPPER_LIMIT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_UPPER_LIMIT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_UPPER_LIMIT_EXT] = $enc; + } + } else { + $a[self::FIELD_UPPER_LIMIT] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRSampledDataDataType.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRSampledDataDataType.php index 9e431ab321..842dc51116 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRSampledDataDataType.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRSampledDataDataType.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -75,10 +75,6 @@ class FHIRSampledDataDataType extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SAMPLED_DATA_DATA_TYPE; - - /** @var string */ - protected $_xmlns = ''; - const FIELD_VALUE = 'value'; /** @@ -86,6 +82,8 @@ class FHIRSampledDataDataType extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; /** * FHIRSampledDataDataType Constructor @@ -243,8 +241,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRSearchEntryMode.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRSearchEntryMode.php index b2807a593c..347f828088 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRSearchEntryMode.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRSearchEntryMode.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRSearchEntryMode extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SEARCH_ENTRY_MODE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -90,6 +86,9 @@ class FHIRSearchEntryMode extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSearchEntryMode Constructor * @param null|array $data @@ -245,8 +244,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRSearchModifierCode.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRSearchModifierCode.php index c3e74498de..179e5a0bd4 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRSearchModifierCode.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRSearchModifierCode.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRSearchModifierCode extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SEARCH_MODIFIER_CODE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRSearchModifierCode extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSearchModifierCode Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRSearchParamType.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRSearchParamType.php index b1d218cf0b..4f08c5b34a 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRSearchParamType.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRSearchParamType.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -77,10 +77,6 @@ class FHIRSearchParamType extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SEARCH_PARAM_TYPE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -88,6 +84,9 @@ class FHIRSearchParamType extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSearchParamType Constructor * @param null|array $data @@ -243,8 +242,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRSignature.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRSignature.php index 9244fd809e..cae3a0eb1e 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRSignature.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRSignature.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -81,10 +81,6 @@ class FHIRSignature extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SIGNATURE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_BLOB = 'blob'; const FIELD_BLOB_EXT = '_blob'; const FIELD_CONTENT_TYPE = 'contentType'; @@ -171,6 +167,9 @@ class FHIRSignature extends FHIRElement */ protected $whoUri = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSignature Constructor * @param null|array $data @@ -193,8 +192,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_BLOB] instanceof FHIRBase64Binary) { $this->setBlob($data[self::FIELD_BLOB]); - } elseif ($ext && is_scalar($data[self::FIELD_BLOB])) { - $this->setBlob(new FHIRBase64Binary([FHIRBase64Binary::FIELD_VALUE => $data[self::FIELD_BLOB]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_BLOB])) { + $this->setBlob(new FHIRBase64Binary([FHIRBase64Binary::FIELD_VALUE => $data[self::FIELD_BLOB]] + $ext)); + } else if (is_array($data[self::FIELD_BLOB])) { + $this->setBlob(new FHIRBase64Binary(array_merge($ext, $data[self::FIELD_BLOB]))); + } } else { $this->setBlob(new FHIRBase64Binary($data[self::FIELD_BLOB])); } @@ -205,8 +208,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CONTENT_TYPE] instanceof FHIRCode) { $this->setContentType($data[self::FIELD_CONTENT_TYPE]); - } elseif ($ext && is_scalar($data[self::FIELD_CONTENT_TYPE])) { - $this->setContentType(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_CONTENT_TYPE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CONTENT_TYPE])) { + $this->setContentType(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_CONTENT_TYPE]] + $ext)); + } else if (is_array($data[self::FIELD_CONTENT_TYPE])) { + $this->setContentType(new FHIRCode(array_merge($ext, $data[self::FIELD_CONTENT_TYPE]))); + } } else { $this->setContentType(new FHIRCode($data[self::FIELD_CONTENT_TYPE])); } @@ -214,6 +221,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_TYPE])) { if (is_array($data[self::FIELD_TYPE])) { foreach($data[self::FIELD_TYPE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCoding) { $this->addType($v); } else { @@ -232,8 +242,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_WHEN] instanceof FHIRInstant) { $this->setWhen($data[self::FIELD_WHEN]); - } elseif ($ext && is_scalar($data[self::FIELD_WHEN])) { - $this->setWhen(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_WHEN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_WHEN])) { + $this->setWhen(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_WHEN]] + $ext)); + } else if (is_array($data[self::FIELD_WHEN])) { + $this->setWhen(new FHIRInstant(array_merge($ext, $data[self::FIELD_WHEN]))); + } } else { $this->setWhen(new FHIRInstant($data[self::FIELD_WHEN])); } @@ -251,8 +265,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_WHO_URI] instanceof FHIRUri) { $this->setWhoUri($data[self::FIELD_WHO_URI]); - } elseif ($ext && is_scalar($data[self::FIELD_WHO_URI])) { - $this->setWhoUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_WHO_URI]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_WHO_URI])) { + $this->setWhoUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_WHO_URI]] + $ext)); + } else if (is_array($data[self::FIELD_WHO_URI])) { + $this->setWhoUri(new FHIRUri(array_merge($ext, $data[self::FIELD_WHO_URI]))); + } } else { $this->setWhoUri(new FHIRUri($data[self::FIELD_WHO_URI])); } @@ -654,7 +672,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getContentType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CONTENT_TYPE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getType())) { foreach($vs as $v) { if (null === $v) { @@ -663,10 +680,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getWhen())) { $v->xmlSerialize($sxe->addChild(self::FIELD_WHEN, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getWhoReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_WHO_REFERENCE, null, $v->_getFHIRXMLNamespace())); } @@ -683,26 +700,54 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getBlob())) { - $a[self::FIELD_BLOB] = $v->getValue(); - $a[self::FIELD_BLOB_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_BLOB] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_BLOB_EXT] = $enc; + } + } else { + $a[self::FIELD_BLOB] = $v; + } } if (null !== ($v = $this->getContentType())) { - $a[self::FIELD_CONTENT_TYPE] = $v->getValue(); - $a[self::FIELD_CONTENT_TYPE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CONTENT_TYPE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CONTENT_TYPE_EXT] = $enc; + } + } else { + $a[self::FIELD_CONTENT_TYPE] = $v; + } } if ([] !== ($vs = $this->getType())) { $a[self::FIELD_TYPE] = $vs; } if (null !== ($v = $this->getWhen())) { - $a[self::FIELD_WHEN] = $v->getValue(); - $a[self::FIELD_WHEN_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_WHEN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_WHEN_EXT] = $enc; + } + } else { + $a[self::FIELD_WHEN] = $v; + } } if (null !== ($v = $this->getWhoReference())) { $a[self::FIELD_WHO_REFERENCE] = $v; } if (null !== ($v = $this->getWhoUri())) { - $a[self::FIELD_WHO_URI] = $v->getValue(); - $a[self::FIELD_WHO_URI_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_WHO_URI] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_WHO_URI_EXT] = $enc; + } + } else { + $a[self::FIELD_WHO_URI] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRSlicingRules.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRSlicingRules.php index ddf60bd91a..6287eefcb8 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRSlicingRules.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRSlicingRules.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRSlicingRules extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SLICING_RULES; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRSlicingRules extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSlicingRules Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRSlotStatus.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRSlotStatus.php index 11feb19bb6..bc069837b0 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRSlotStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRSlotStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRSlotStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SLOT_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRSlotStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSlotStatus Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRSpecimenStatus.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRSpecimenStatus.php index f6f98b4ebc..7187d7205f 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRSpecimenStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRSpecimenStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRSpecimenStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SPECIMEN_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRSpecimenStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSpecimenStatus Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRString.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRString.php index bfdaac91bc..679c09eb7c 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRString.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRString.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRString extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_STRING; - - /** @var string */ - protected $_xmlns = ''; - const FIELD_VALUE = 'value'; /** @@ -90,6 +86,8 @@ class FHIRString extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; /** * FHIRString Constructor @@ -247,8 +245,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRStructureDefinitionKind.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRStructureDefinitionKind.php index cc28e3dc84..42012491ad 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRStructureDefinitionKind.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRStructureDefinitionKind.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRStructureDefinitionKind extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_STRUCTURE_DEFINITION_KIND; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRStructureDefinitionKind extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRStructureDefinitionKind Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRSubscriptionChannelType.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRSubscriptionChannelType.php index 5fccfe0f95..2a27349b84 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRSubscriptionChannelType.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRSubscriptionChannelType.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRSubscriptionChannelType extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SUBSCRIPTION_CHANNEL_TYPE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRSubscriptionChannelType extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSubscriptionChannelType Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRSubscriptionStatus.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRSubscriptionStatus.php index 8991e5ea5b..7417cdaa2e 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRSubscriptionStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRSubscriptionStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRSubscriptionStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SUBSCRIPTION_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRSubscriptionStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSubscriptionStatus Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRSupplyDeliveryStatus.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRSupplyDeliveryStatus.php index 9b74f17100..5c2d282237 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRSupplyDeliveryStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRSupplyDeliveryStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRSupplyDeliveryStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SUPPLY_DELIVERY_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRSupplyDeliveryStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSupplyDeliveryStatus Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRSupplyRequestStatus.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRSupplyRequestStatus.php index c72324d1c4..58215c032e 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRSupplyRequestStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRSupplyRequestStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRSupplyRequestStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SUPPLY_REQUEST_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRSupplyRequestStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSupplyRequestStatus Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRSystemRestfulInteraction.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRSystemRestfulInteraction.php index 18db10b562..e6b431d4f6 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRSystemRestfulInteraction.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRSystemRestfulInteraction.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRSystemRestfulInteraction extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SYSTEM_RESTFUL_INTERACTION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRSystemRestfulInteraction extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSystemRestfulInteraction Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRTime.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRTime.php index 076cc3e0a9..5338041a69 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRTime.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRTime.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRTime extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_TIME; - - /** @var string */ - protected $_xmlns = ''; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,8 @@ class FHIRTime extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; /** * FHIRTime Constructor @@ -246,8 +244,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRTiming.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRTiming.php index e999c74d33..9751edde70 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRTiming.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRTiming.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -82,10 +82,6 @@ class FHIRTiming extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_TIMING; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CODE = 'code'; const FIELD_EVENT = 'event'; const FIELD_EVENT_EXT = '_event'; @@ -132,6 +128,9 @@ class FHIRTiming extends FHIRElement */ protected $repeat = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRTiming Constructor * @param null|array $data @@ -161,17 +160,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_EVENT])) { foreach($data[self::FIELD_EVENT] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRDateTime) { $this->addEvent($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addEvent(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addEvent(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addEvent(new FHIRDateTime(array_merge($v, $ext[$i]))); + } } else { $this->addEvent(new FHIRDateTime($v)); } } } elseif ($data[self::FIELD_EVENT] instanceof FHIRDateTime) { $this->addEvent($data[self::FIELD_EVENT]); - } elseif ($ext && is_scalar($data[self::FIELD_EVENT])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_EVENT])) { $this->addEvent(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_EVENT]] + $ext)); } else { $this->addEvent(new FHIRDateTime($data[self::FIELD_EVENT])); @@ -442,7 +448,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } @@ -476,8 +481,17 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_EVENT][] = $v->getValue(); - $a[self::FIELD_EVENT_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EVENT][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EVENT_EXT][] = $enc; + } else { + $a[self::FIELD_EVENT_EXT][] = null; + } + } else { + $a[self::FIELD_EVENT][] = $v; + } } } if (null !== ($v = $this->getRepeat())) { diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRTiming/FHIRTimingRepeat.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRTiming/FHIRTimingRepeat.php index a2e8193dd4..052ba7478c 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRTiming/FHIRTimingRepeat.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRTiming/FHIRTimingRepeat.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -88,12 +88,9 @@ class FHIRTimingRepeat extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_TIMING_DOT_REPEAT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_BOUNDS_PERIOD = 'boundsPeriod'; const FIELD_BOUNDS_QUANTITY = 'boundsQuantity'; + const FIELD_BOUNDS_QUANTITY_EXT = '_boundsQuantity'; const FIELD_BOUNDS_RANGE = 'boundsRange'; const FIELD_COUNT = 'count'; const FIELD_COUNT_EXT = '_count'; @@ -264,6 +261,9 @@ class FHIRTimingRepeat extends FHIRElement */ protected $when = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRTimingRepeat Constructor * @param null|array $data @@ -288,8 +288,17 @@ public function __construct($data = null) } } if (isset($data[self::FIELD_BOUNDS_QUANTITY])) { + $ext = (isset($data[self::FIELD_BOUNDS_QUANTITY_EXT]) && is_array($data[self::FIELD_BOUNDS_QUANTITY_EXT])) + ? $data[self::FIELD_BOUNDS_QUANTITY_EXT] + : null; if ($data[self::FIELD_BOUNDS_QUANTITY] instanceof FHIRDuration) { $this->setBoundsQuantity($data[self::FIELD_BOUNDS_QUANTITY]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_BOUNDS_QUANTITY])) { + $this->setBoundsQuantity(new FHIRDuration([FHIRDuration::FIELD_VALUE => $data[self::FIELD_BOUNDS_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_BOUNDS_QUANTITY])) { + $this->setBoundsQuantity(new FHIRDuration(array_merge($ext, $data[self::FIELD_BOUNDS_QUANTITY]))); + } } else { $this->setBoundsQuantity(new FHIRDuration($data[self::FIELD_BOUNDS_QUANTITY])); } @@ -307,8 +316,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_COUNT] instanceof FHIRInteger) { $this->setCount($data[self::FIELD_COUNT]); - } elseif ($ext && is_scalar($data[self::FIELD_COUNT])) { - $this->setCount(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_COUNT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_COUNT])) { + $this->setCount(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_COUNT]] + $ext)); + } else if (is_array($data[self::FIELD_COUNT])) { + $this->setCount(new FHIRInteger(array_merge($ext, $data[self::FIELD_COUNT]))); + } } else { $this->setCount(new FHIRInteger($data[self::FIELD_COUNT])); } @@ -319,8 +332,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DURATION] instanceof FHIRDecimal) { $this->setDuration($data[self::FIELD_DURATION]); - } elseif ($ext && is_scalar($data[self::FIELD_DURATION])) { - $this->setDuration(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_DURATION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DURATION])) { + $this->setDuration(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_DURATION]] + $ext)); + } else if (is_array($data[self::FIELD_DURATION])) { + $this->setDuration(new FHIRDecimal(array_merge($ext, $data[self::FIELD_DURATION]))); + } } else { $this->setDuration(new FHIRDecimal($data[self::FIELD_DURATION])); } @@ -331,8 +348,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DURATION_MAX] instanceof FHIRDecimal) { $this->setDurationMax($data[self::FIELD_DURATION_MAX]); - } elseif ($ext && is_scalar($data[self::FIELD_DURATION_MAX])) { - $this->setDurationMax(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_DURATION_MAX]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DURATION_MAX])) { + $this->setDurationMax(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_DURATION_MAX]] + $ext)); + } else if (is_array($data[self::FIELD_DURATION_MAX])) { + $this->setDurationMax(new FHIRDecimal(array_merge($ext, $data[self::FIELD_DURATION_MAX]))); + } } else { $this->setDurationMax(new FHIRDecimal($data[self::FIELD_DURATION_MAX])); } @@ -343,8 +364,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DURATION_UNITS] instanceof FHIRUnitsOfTime) { $this->setDurationUnits($data[self::FIELD_DURATION_UNITS]); - } elseif ($ext && is_scalar($data[self::FIELD_DURATION_UNITS])) { - $this->setDurationUnits(new FHIRUnitsOfTime([FHIRUnitsOfTime::FIELD_VALUE => $data[self::FIELD_DURATION_UNITS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DURATION_UNITS])) { + $this->setDurationUnits(new FHIRUnitsOfTime([FHIRUnitsOfTime::FIELD_VALUE => $data[self::FIELD_DURATION_UNITS]] + $ext)); + } else if (is_array($data[self::FIELD_DURATION_UNITS])) { + $this->setDurationUnits(new FHIRUnitsOfTime(array_merge($ext, $data[self::FIELD_DURATION_UNITS]))); + } } else { $this->setDurationUnits(new FHIRUnitsOfTime($data[self::FIELD_DURATION_UNITS])); } @@ -355,8 +380,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_FREQUENCY] instanceof FHIRInteger) { $this->setFrequency($data[self::FIELD_FREQUENCY]); - } elseif ($ext && is_scalar($data[self::FIELD_FREQUENCY])) { - $this->setFrequency(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_FREQUENCY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_FREQUENCY])) { + $this->setFrequency(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_FREQUENCY]] + $ext)); + } else if (is_array($data[self::FIELD_FREQUENCY])) { + $this->setFrequency(new FHIRInteger(array_merge($ext, $data[self::FIELD_FREQUENCY]))); + } } else { $this->setFrequency(new FHIRInteger($data[self::FIELD_FREQUENCY])); } @@ -367,8 +396,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_FREQUENCY_MAX] instanceof FHIRInteger) { $this->setFrequencyMax($data[self::FIELD_FREQUENCY_MAX]); - } elseif ($ext && is_scalar($data[self::FIELD_FREQUENCY_MAX])) { - $this->setFrequencyMax(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_FREQUENCY_MAX]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_FREQUENCY_MAX])) { + $this->setFrequencyMax(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_FREQUENCY_MAX]] + $ext)); + } else if (is_array($data[self::FIELD_FREQUENCY_MAX])) { + $this->setFrequencyMax(new FHIRInteger(array_merge($ext, $data[self::FIELD_FREQUENCY_MAX]))); + } } else { $this->setFrequencyMax(new FHIRInteger($data[self::FIELD_FREQUENCY_MAX])); } @@ -379,8 +412,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PERIOD] instanceof FHIRDecimal) { $this->setPeriod($data[self::FIELD_PERIOD]); - } elseif ($ext && is_scalar($data[self::FIELD_PERIOD])) { - $this->setPeriod(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_PERIOD]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PERIOD])) { + $this->setPeriod(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_PERIOD]] + $ext)); + } else if (is_array($data[self::FIELD_PERIOD])) { + $this->setPeriod(new FHIRDecimal(array_merge($ext, $data[self::FIELD_PERIOD]))); + } } else { $this->setPeriod(new FHIRDecimal($data[self::FIELD_PERIOD])); } @@ -391,8 +428,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PERIOD_MAX] instanceof FHIRDecimal) { $this->setPeriodMax($data[self::FIELD_PERIOD_MAX]); - } elseif ($ext && is_scalar($data[self::FIELD_PERIOD_MAX])) { - $this->setPeriodMax(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_PERIOD_MAX]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PERIOD_MAX])) { + $this->setPeriodMax(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_PERIOD_MAX]] + $ext)); + } else if (is_array($data[self::FIELD_PERIOD_MAX])) { + $this->setPeriodMax(new FHIRDecimal(array_merge($ext, $data[self::FIELD_PERIOD_MAX]))); + } } else { $this->setPeriodMax(new FHIRDecimal($data[self::FIELD_PERIOD_MAX])); } @@ -403,8 +444,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PERIOD_UNITS] instanceof FHIRUnitsOfTime) { $this->setPeriodUnits($data[self::FIELD_PERIOD_UNITS]); - } elseif ($ext && is_scalar($data[self::FIELD_PERIOD_UNITS])) { - $this->setPeriodUnits(new FHIRUnitsOfTime([FHIRUnitsOfTime::FIELD_VALUE => $data[self::FIELD_PERIOD_UNITS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PERIOD_UNITS])) { + $this->setPeriodUnits(new FHIRUnitsOfTime([FHIRUnitsOfTime::FIELD_VALUE => $data[self::FIELD_PERIOD_UNITS]] + $ext)); + } else if (is_array($data[self::FIELD_PERIOD_UNITS])) { + $this->setPeriodUnits(new FHIRUnitsOfTime(array_merge($ext, $data[self::FIELD_PERIOD_UNITS]))); + } } else { $this->setPeriodUnits(new FHIRUnitsOfTime($data[self::FIELD_PERIOD_UNITS])); } @@ -415,8 +460,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_WHEN] instanceof FHIREventTiming) { $this->setWhen($data[self::FIELD_WHEN]); - } elseif ($ext && is_scalar($data[self::FIELD_WHEN])) { - $this->setWhen(new FHIREventTiming([FHIREventTiming::FIELD_VALUE => $data[self::FIELD_WHEN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_WHEN])) { + $this->setWhen(new FHIREventTiming([FHIREventTiming::FIELD_VALUE => $data[self::FIELD_WHEN]] + $ext)); + } else if (is_array($data[self::FIELD_WHEN])) { + $this->setWhen(new FHIREventTiming(array_merge($ext, $data[self::FIELD_WHEN]))); + } } else { $this->setWhen(new FHIREventTiming($data[self::FIELD_WHEN])); } @@ -1038,15 +1087,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getBoundsPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_BOUNDS_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getBoundsQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_BOUNDS_QUANTITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getBoundsRange())) { $v->xmlSerialize($sxe->addChild(self::FIELD_BOUNDS_RANGE, null, $v->_getFHIRXMLNamespace())); } @@ -1059,7 +1105,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDurationMax())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DURATION_MAX, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDurationUnits())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DURATION_UNITS, null, $v->_getFHIRXMLNamespace())); } @@ -1075,11 +1120,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getPeriodMax())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PERIOD_MAX, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPeriodUnits())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PERIOD_UNITS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getWhen())) { $v->xmlSerialize($sxe->addChild(self::FIELD_WHEN, null, $v->_getFHIRXMLNamespace())); } @@ -1096,47 +1139,128 @@ public function jsonSerialize() $a[self::FIELD_BOUNDS_PERIOD] = $v; } if (null !== ($v = $this->getBoundsQuantity())) { - $a[self::FIELD_BOUNDS_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_BOUNDS_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_BOUNDS_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_BOUNDS_QUANTITY] = $v; + } } if (null !== ($v = $this->getBoundsRange())) { $a[self::FIELD_BOUNDS_RANGE] = $v; } if (null !== ($v = $this->getCount())) { - $a[self::FIELD_COUNT] = $v->getValue(); - $a[self::FIELD_COUNT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_COUNT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_COUNT_EXT] = $enc; + } + } else { + $a[self::FIELD_COUNT] = $v; + } } if (null !== ($v = $this->getDuration())) { - $a[self::FIELD_DURATION] = $v->getValue(); - $a[self::FIELD_DURATION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DURATION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DURATION_EXT] = $enc; + } + } else { + $a[self::FIELD_DURATION] = $v; + } } if (null !== ($v = $this->getDurationMax())) { - $a[self::FIELD_DURATION_MAX] = $v->getValue(); - $a[self::FIELD_DURATION_MAX_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DURATION_MAX] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DURATION_MAX_EXT] = $enc; + } + } else { + $a[self::FIELD_DURATION_MAX] = $v; + } } if (null !== ($v = $this->getDurationUnits())) { - $a[self::FIELD_DURATION_UNITS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DURATION_UNITS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DURATION_UNITS_EXT] = $enc; + } + } else { + $a[self::FIELD_DURATION_UNITS] = $v; + } } if (null !== ($v = $this->getFrequency())) { - $a[self::FIELD_FREQUENCY] = $v->getValue(); - $a[self::FIELD_FREQUENCY_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FREQUENCY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FREQUENCY_EXT] = $enc; + } + } else { + $a[self::FIELD_FREQUENCY] = $v; + } } if (null !== ($v = $this->getFrequencyMax())) { - $a[self::FIELD_FREQUENCY_MAX] = $v->getValue(); - $a[self::FIELD_FREQUENCY_MAX_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FREQUENCY_MAX] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FREQUENCY_MAX_EXT] = $enc; + } + } else { + $a[self::FIELD_FREQUENCY_MAX] = $v; + } } if (null !== ($v = $this->getPeriod())) { - $a[self::FIELD_PERIOD] = $v->getValue(); - $a[self::FIELD_PERIOD_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PERIOD] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PERIOD_EXT] = $enc; + } + } else { + $a[self::FIELD_PERIOD] = $v; + } } if (null !== ($v = $this->getPeriodMax())) { - $a[self::FIELD_PERIOD_MAX] = $v->getValue(); - $a[self::FIELD_PERIOD_MAX_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PERIOD_MAX] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PERIOD_MAX_EXT] = $enc; + } + } else { + $a[self::FIELD_PERIOD_MAX] = $v; + } } if (null !== ($v = $this->getPeriodUnits())) { - $a[self::FIELD_PERIOD_UNITS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PERIOD_UNITS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PERIOD_UNITS_EXT] = $enc; + } + } else { + $a[self::FIELD_PERIOD_UNITS] = $v; + } } if (null !== ($v = $this->getWhen())) { - $a[self::FIELD_WHEN] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_WHEN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_WHEN_EXT] = $enc; + } + } else { + $a[self::FIELD_WHEN] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRTransactionMode.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRTransactionMode.php index d13b72cb59..f570c88727 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRTransactionMode.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRTransactionMode.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRTransactionMode extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_TRANSACTION_MODE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRTransactionMode extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRTransactionMode Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRTypeRestfulInteraction.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRTypeRestfulInteraction.php index 36850aa69c..5d621cbe22 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRTypeRestfulInteraction.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRTypeRestfulInteraction.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRTypeRestfulInteraction extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_TYPE_RESTFUL_INTERACTION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRTypeRestfulInteraction extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRTypeRestfulInteraction Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRUnitsOfTime.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRUnitsOfTime.php index 4bff956b90..18e8a0a7e4 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRUnitsOfTime.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRUnitsOfTime.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRUnitsOfTime extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_UNITS_OF_TIME; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRUnitsOfTime extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRUnitsOfTime Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRUnknownContentCode.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRUnknownContentCode.php index 9a66bbbb5c..ef98dcd18e 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRUnknownContentCode.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRUnknownContentCode.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRUnknownContentCode extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_UNKNOWN_CONTENT_CODE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -90,6 +86,9 @@ class FHIRUnknownContentCode extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRUnknownContentCode Constructor * @param null|array $data @@ -245,8 +244,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRUnsignedInt.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRUnsignedInt.php index 1820ac7b87..a42b84ca91 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRUnsignedInt.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRUnsignedInt.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRUnsignedInt extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_UNSIGNED_INT; - - /** @var string */ - protected $_xmlns = ''; - const FIELD_VALUE = 'value'; /** @@ -90,6 +86,8 @@ class FHIRUnsignedInt extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; /** * FHIRUnsignedInt Constructor @@ -247,8 +245,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRUri.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRUri.php index b4c5f49f58..27c016b7ef 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRUri.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRUri.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRUri extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_URI; - - /** @var string */ - protected $_xmlns = ''; - const FIELD_VALUE = 'value'; /** @@ -90,6 +86,8 @@ class FHIRUri extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; /** * FHIRUri Constructor @@ -247,8 +245,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRUse.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRUse.php index 52aa07b942..6c7d56c1e2 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRUse.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRUse.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRUse extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_USE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRUse extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRUse Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRUuid.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRUuid.php index 4f61729ef9..9e3e54d2c2 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRUuid.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRUuid.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRUuid extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_UUID; - - /** @var string */ - protected $_xmlns = ''; - const FIELD_VALUE = 'value'; /** @@ -91,6 +87,8 @@ class FHIRUuid extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; /** * FHIRUuid Constructor @@ -248,8 +246,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRVisionBase.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRVisionBase.php index ee7818eaf0..fcbe6e01f7 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRVisionBase.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRVisionBase.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRVisionBase extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_VISION_BASE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRVisionBase extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRVisionBase Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRVisionEyes.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRVisionEyes.php index 0a352d21d5..7f697ef027 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRVisionEyes.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRVisionEyes.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRVisionEyes extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_VISION_EYES; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRVisionEyes extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRVisionEyes Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRXPathUsageType.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRXPathUsageType.php index 5b495849bb..b1ca1f0bbc 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRXPathUsageType.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRElement/FHIRXPathUsageType.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRXPathUsageType extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_XPATH_USAGE_TYPE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -90,6 +86,9 @@ class FHIRXPathUsageType extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRXPathUsageType Constructor * @param null|array $data @@ -245,8 +244,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIREncounterClassList.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIREncounterClassList.php index 1ab7b433b2..cdb7a4acfc 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIREncounterClassList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIREncounterClassList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -252,6 +252,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIREncounterLocationStatusList.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIREncounterLocationStatusList.php index f55f9497ce..a7a8b69f79 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIREncounterLocationStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIREncounterLocationStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -247,6 +247,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIREncounterStateList.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIREncounterStateList.php index 98aa01b456..ac45198420 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIREncounterStateList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIREncounterStateList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -249,6 +249,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIREpisodeOfCareStatusList.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIREpisodeOfCareStatusList.php index 67a23c71b0..14699c3d60 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIREpisodeOfCareStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIREpisodeOfCareStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -249,6 +249,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIREventTimingList.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIREventTimingList.php index 3ea2491d21..f8924d06a4 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIREventTimingList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIREventTimingList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -257,6 +257,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRExtensionContextList.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRExtensionContextList.php index e69380a24a..c44c33b998 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRExtensionContextList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRExtensionContextList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -247,6 +247,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRFamilyHistoryStatusList.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRFamilyHistoryStatusList.php index 6e005686f7..6df0f8bd87 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRFamilyHistoryStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRFamilyHistoryStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -247,6 +247,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRFilterOperatorList.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRFilterOperatorList.php index 0290c80958..3e9bd74ff9 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRFilterOperatorList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRFilterOperatorList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -249,6 +249,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRFlagStatusList.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRFlagStatusList.php index ab93f37b7b..6e70a00d4e 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRFlagStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRFlagStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -246,6 +246,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRGoalStatusList.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRGoalStatusList.php index 831e20e48c..a99d5415dc 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRGoalStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRGoalStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -252,6 +252,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRGroupTypeList.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRGroupTypeList.php index 1083be4d1e..8ae632a1cd 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRGroupTypeList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRGroupTypeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -249,6 +249,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRGuideDependencyTypeList.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRGuideDependencyTypeList.php index 06416465e2..b1913dcf4f 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRGuideDependencyTypeList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRGuideDependencyTypeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -245,6 +245,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRGuidePageKindList.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRGuidePageKindList.php index 1e20abd44f..767aea17e6 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRGuidePageKindList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRGuidePageKindList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -251,6 +251,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRGuideResourcePurposeList.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRGuideResourcePurposeList.php index 41b5a0260c..d33ba251c4 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRGuideResourcePurposeList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRGuideResourcePurposeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -249,6 +249,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRHTTPVerbList.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRHTTPVerbList.php index 85f328cb44..91fb6eef53 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRHTTPVerbList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRHTTPVerbList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -247,6 +247,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRIdPrimitive.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRIdPrimitive.php index e666b5d6ac..fd470cb47e 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRIdPrimitive.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRIdPrimitive.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -229,6 +229,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRIdentifierUseList.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRIdentifierUseList.php index a4ed1ead43..086a73c2cd 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRIdentifierUseList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRIdentifierUseList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -247,6 +247,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRIdentityAssuranceLevelList.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRIdentityAssuranceLevelList.php index 99e5c3a717..420a8eab4d 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRIdentityAssuranceLevelList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRIdentityAssuranceLevelList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -247,6 +247,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRInstanceAvailabilityList.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRInstanceAvailabilityList.php index 4127496852..f7421f1de0 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRInstanceAvailabilityList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRInstanceAvailabilityList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -247,6 +247,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRInstantPrimitive.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRInstantPrimitive.php index b9e99d1385..9f2e26e082 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRInstantPrimitive.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRInstantPrimitive.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -256,6 +256,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRIntegerPrimitive.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRIntegerPrimitive.php index 74e1b62c57..bd15e8e152 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRIntegerPrimitive.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRIntegerPrimitive.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -244,6 +244,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRIssueSeverityList.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRIssueSeverityList.php index 18da387dfe..636cec11ef 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRIssueSeverityList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRIssueSeverityList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -247,6 +247,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRIssueTypeList.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRIssueTypeList.php index 956e23f311..4cfa2a4c76 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRIssueTypeList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRIssueTypeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -272,6 +272,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRLinkTypeList.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRLinkTypeList.php index 5ceef962c5..fca974eb43 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRLinkTypeList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRLinkTypeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -246,6 +246,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRListModeList.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRListModeList.php index c5918ba41c..f78e7857d6 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRListModeList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRListModeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -246,6 +246,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRListStatusList.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRListStatusList.php index b173b8c874..d2c183a7e7 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRListStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRListStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -246,6 +246,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRLocationModeList.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRLocationModeList.php index 81520d7bc6..751ec0ae38 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRLocationModeList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRLocationModeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -245,6 +245,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRLocationStatusList.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRLocationStatusList.php index c685cff02e..c956c9c485 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRLocationStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRLocationStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -246,6 +246,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRMarkdownPrimitive.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRMarkdownPrimitive.php index 276a8ceff7..3fb4d215cc 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRMarkdownPrimitive.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRMarkdownPrimitive.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -228,6 +228,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRMeasmnt_PrincipleList.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRMeasmnt_PrincipleList.php index bea9ff5a28..dc38040e93 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRMeasmnt_PrincipleList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRMeasmnt_PrincipleList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -254,6 +254,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRMedicationAdministrationStatusList.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRMedicationAdministrationStatusList.php index c627f675de..7b4882bdb8 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRMedicationAdministrationStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRMedicationAdministrationStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -248,6 +248,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRMedicationDispenseStatusList.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRMedicationDispenseStatusList.php index 5709d1a7d9..10aa86c9a5 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRMedicationDispenseStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRMedicationDispenseStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -248,6 +248,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRMedicationOrderStatusList.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRMedicationOrderStatusList.php index a023be2aee..2d0852c27b 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRMedicationOrderStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRMedicationOrderStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -249,6 +249,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRMedicationStatementStatusList.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRMedicationStatementStatusList.php index a41ef3c9d5..5dc8164066 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRMedicationStatementStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRMedicationStatementStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -247,6 +247,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRMessageSignificanceCategoryList.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRMessageSignificanceCategoryList.php index 269f3004a4..3d51c6a0f4 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRMessageSignificanceCategoryList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRMessageSignificanceCategoryList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -246,6 +246,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRNameUseList.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRNameUseList.php index b7df5bb744..f49098c845 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRNameUseList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRNameUseList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -250,6 +250,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRNamingSystemIdentifierTypeList.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRNamingSystemIdentifierTypeList.php index 868f74b4c4..5b0544f368 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRNamingSystemIdentifierTypeList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRNamingSystemIdentifierTypeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -247,6 +247,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRNamingSystemTypeList.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRNamingSystemTypeList.php index a591814995..2f2c545c93 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRNamingSystemTypeList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRNamingSystemTypeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -246,6 +246,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRNarrativeStatusList.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRNarrativeStatusList.php index 56d6d8d729..4e6af8efa6 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRNarrativeStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRNarrativeStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -247,6 +247,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRNoteTypeList.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRNoteTypeList.php index 153b3c5f29..be73baa0c5 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRNoteTypeList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRNoteTypeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -246,6 +246,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRNutritionOrderStatusList.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRNutritionOrderStatusList.php index 0e79d3ce01..a2be8d46e0 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRNutritionOrderStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRNutritionOrderStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -251,6 +251,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRObservationRelationshipTypeList.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRObservationRelationshipTypeList.php index 5fd6560b66..22a53ad6a3 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRObservationRelationshipTypeList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRObservationRelationshipTypeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -249,6 +249,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRObservationStatusList.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRObservationStatusList.php index 59f46619b1..14178e4b35 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRObservationStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRObservationStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -250,6 +250,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIROidPrimitive.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIROidPrimitive.php index eee3c298d2..80e89b9383 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIROidPrimitive.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIROidPrimitive.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -229,6 +229,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIROperationKindList.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIROperationKindList.php index d4144c9e24..3f5a6aaca8 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIROperationKindList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIROperationKindList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -245,6 +245,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIROperationParameterUseList.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIROperationParameterUseList.php index dcd87a069d..d7dc377a95 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIROperationParameterUseList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIROperationParameterUseList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -245,6 +245,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIROrderStatusList.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIROrderStatusList.php index 3ac75ae80b..83128fd67a 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIROrderStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIROrderStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -252,6 +252,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRParticipantRequiredList.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRParticipantRequiredList.php index b4947f4d47..112a248920 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRParticipantRequiredList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRParticipantRequiredList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -246,6 +246,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRParticipantStatusList.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRParticipantStatusList.php index 928283d667..d808438b9e 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRParticipantStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRParticipantStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -249,6 +249,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRParticipationStatusList.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRParticipationStatusList.php index 7df25fb05f..3cd0dde970 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRParticipationStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRParticipationStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -247,6 +247,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRPositiveIntPrimitive.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRPositiveIntPrimitive.php index 285795784d..ca84a3e20a 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRPositiveIntPrimitive.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRPositiveIntPrimitive.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -244,6 +244,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRProcedureRequestPriorityList.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRProcedureRequestPriorityList.php index 3317ebc502..f9e6bfddf9 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRProcedureRequestPriorityList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRProcedureRequestPriorityList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -247,6 +247,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRProcedureRequestStatusList.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRProcedureRequestStatusList.php index c390d4c378..86b4faa665 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRProcedureRequestStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRProcedureRequestStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -253,6 +253,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRProcedureStatusList.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRProcedureStatusList.php index 14e3d2f537..8966651535 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRProcedureStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRProcedureStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -247,6 +247,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRPropertyRepresentationList.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRPropertyRepresentationList.php index 07c241df1d..2480f8b4c6 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRPropertyRepresentationList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRPropertyRepresentationList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -244,6 +244,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRProvenanceEntityRoleList.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRProvenanceEntityRoleList.php index 00b4bc18cf..18fbe503c7 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRProvenanceEntityRoleList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRProvenanceEntityRoleList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -247,6 +247,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRQuantityComparatorList.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRQuantityComparatorList.php index a16121e0d6..4f83f866ac 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRQuantityComparatorList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRQuantityComparatorList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -247,6 +247,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRQuestionnaireResponseStatusList.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRQuestionnaireResponseStatusList.php index 880adc108c..456cd64f8a 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRQuestionnaireResponseStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRQuestionnaireResponseStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -246,6 +246,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRQuestionnaireStatusList.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRQuestionnaireStatusList.php index d3b88caa92..bdbd87ca45 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRQuestionnaireStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRQuestionnaireStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -246,6 +246,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRReferralStatusList.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRReferralStatusList.php index 14e3d0582c..c736a607ea 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRReferralStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRReferralStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -250,6 +250,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRRemittanceOutcomeList.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRRemittanceOutcomeList.php index dea9ebfe12..4d70db54ad 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRRemittanceOutcomeList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRRemittanceOutcomeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -245,6 +245,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource.php index 6989406db7..24b2443d97 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,9 +79,7 @@ class FHIRResource implements PHPFHIRCommentContainerInterface, PHPFHIRTypeInter // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_RESOURCE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; + const FIELD_FHIR_COMMENTS = 'fhir_comments'; const FIELD_ID = 'id'; const FIELD_ID_EXT = '_id'; @@ -145,6 +143,9 @@ class FHIRResource implements PHPFHIRCommentContainerInterface, PHPFHIRTypeInter */ protected $meta = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRResource Constructor * @param null|array $data @@ -160,14 +161,25 @@ public function __construct($data = null) gettype($data) )); } + if (isset($data[self::FIELD_FHIR_COMMENTS])) { + if (is_array($data[self::FIELD_FHIR_COMMENTS])) { + $this->_setFHIRComments($data[self::FIELD_FHIR_COMMENTS]); + } else if (is_string($data[self::FIELD_FHIR_COMMENTS])) { + $this->_addFHIRComment($data[self::FIELD_FHIR_COMMENTS]); + } + } if (isset($data[self::FIELD_ID])) { $ext = (isset($data[self::FIELD_ID_EXT]) && is_array($data[self::FIELD_ID_EXT])) ? $data[self::FIELD_ID_EXT] : null; if ($data[self::FIELD_ID] instanceof FHIRId) { $this->setId($data[self::FIELD_ID]); - } elseif ($ext && is_scalar($data[self::FIELD_ID])) { - $this->setId(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_ID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ID])) { + $this->setId(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_ID]] + $ext)); + } else if (is_array($data[self::FIELD_ID])) { + $this->setId(new FHIRId(array_merge($ext, $data[self::FIELD_ID]))); + } } else { $this->setId(new FHIRId($data[self::FIELD_ID])); } @@ -178,8 +190,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IMPLICIT_RULES] instanceof FHIRUri) { $this->setImplicitRules($data[self::FIELD_IMPLICIT_RULES]); - } elseif ($ext && is_scalar($data[self::FIELD_IMPLICIT_RULES])) { - $this->setImplicitRules(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_IMPLICIT_RULES]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IMPLICIT_RULES])) { + $this->setImplicitRules(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_IMPLICIT_RULES]] + $ext)); + } else if (is_array($data[self::FIELD_IMPLICIT_RULES])) { + $this->setImplicitRules(new FHIRUri(array_merge($ext, $data[self::FIELD_IMPLICIT_RULES]))); + } } else { $this->setImplicitRules(new FHIRUri($data[self::FIELD_IMPLICIT_RULES])); } @@ -190,8 +206,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_LANGUAGE] instanceof FHIRCode) { $this->setLanguage($data[self::FIELD_LANGUAGE]); - } elseif ($ext && is_scalar($data[self::FIELD_LANGUAGE])) { - $this->setLanguage(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_LANGUAGE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_LANGUAGE])) { + $this->setLanguage(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_LANGUAGE]] + $ext)); + } else if (is_array($data[self::FIELD_LANGUAGE])) { + $this->setLanguage(new FHIRCode(array_merge($ext, $data[self::FIELD_LANGUAGE]))); + } } else { $this->setLanguage(new FHIRCode($data[self::FIELD_LANGUAGE])); } @@ -487,6 +507,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } + if (null !== ($v = $this->getId())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ID, null, $v->_getFHIRXMLNamespace())); } @@ -496,7 +517,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getLanguage())) { $v->xmlSerialize($sxe->addChild(self::FIELD_LANGUAGE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getMeta())) { $v->xmlSerialize($sxe->addChild(self::FIELD_META, null, $v->_getFHIRXMLNamespace())); } @@ -509,17 +529,41 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 public function jsonSerialize() { $a = []; + if ([] !== ($vs = $this->_getFHIRComments())) { + $a[self::FIELD_FHIR_COMMENTS] = $vs; + } if (null !== ($v = $this->getId())) { - $a[self::FIELD_ID] = $v->getValue(); - $a[self::FIELD_ID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ID_EXT] = $enc; + } + } else { + $a[self::FIELD_ID] = $v; + } } if (null !== ($v = $this->getImplicitRules())) { - $a[self::FIELD_IMPLICIT_RULES] = $v->getValue(); - $a[self::FIELD_IMPLICIT_RULES_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IMPLICIT_RULES] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IMPLICIT_RULES_EXT] = $enc; + } + } else { + $a[self::FIELD_IMPLICIT_RULES] = $v; + } } if (null !== ($v = $this->getLanguage())) { - $a[self::FIELD_LANGUAGE] = $v->getValue(); - $a[self::FIELD_LANGUAGE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_LANGUAGE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_LANGUAGE_EXT] = $enc; + } + } else { + $a[self::FIELD_LANGUAGE] = $v; + } } if (null !== ($v = $this->getMeta())) { $a[self::FIELD_META] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRBinary.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRBinary.php index 5bb4d355b7..7f62a4a18d 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRBinary.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRBinary.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -81,10 +81,6 @@ class FHIRBinary extends FHIRResource implements PHPFHIRContainedTypeInterface { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_BINARY; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CONTENT = 'content'; const FIELD_CONTENT_EXT = '_content'; const FIELD_CONTENT_TYPE = 'contentType'; @@ -113,6 +109,9 @@ class FHIRBinary extends FHIRResource implements PHPFHIRContainedTypeInterface */ protected $contentType = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRBinary Constructor * @param null|array $data @@ -135,8 +134,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CONTENT] instanceof FHIRBase64Binary) { $this->setContent($data[self::FIELD_CONTENT]); - } elseif ($ext && is_scalar($data[self::FIELD_CONTENT])) { - $this->setContent(new FHIRBase64Binary([FHIRBase64Binary::FIELD_VALUE => $data[self::FIELD_CONTENT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CONTENT])) { + $this->setContent(new FHIRBase64Binary([FHIRBase64Binary::FIELD_VALUE => $data[self::FIELD_CONTENT]] + $ext)); + } else if (is_array($data[self::FIELD_CONTENT])) { + $this->setContent(new FHIRBase64Binary(array_merge($ext, $data[self::FIELD_CONTENT]))); + } } else { $this->setContent(new FHIRBase64Binary($data[self::FIELD_CONTENT])); } @@ -147,8 +150,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CONTENT_TYPE] instanceof FHIRCode) { $this->setContentType($data[self::FIELD_CONTENT_TYPE]); - } elseif ($ext && is_scalar($data[self::FIELD_CONTENT_TYPE])) { - $this->setContentType(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_CONTENT_TYPE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CONTENT_TYPE])) { + $this->setContentType(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_CONTENT_TYPE]] + $ext)); + } else if (is_array($data[self::FIELD_CONTENT_TYPE])) { + $this->setContentType(new FHIRCode(array_merge($ext, $data[self::FIELD_CONTENT_TYPE]))); + } } else { $this->setContentType(new FHIRCode($data[self::FIELD_CONTENT_TYPE])); } @@ -368,12 +375,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getContent())) { - $a[self::FIELD_CONTENT] = $v->getValue(); - $a[self::FIELD_CONTENT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CONTENT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CONTENT_EXT] = $enc; + } + } else { + $a[self::FIELD_CONTENT] = $v; + } } if (null !== ($v = $this->getContentType())) { - $a[self::FIELD_CONTENT_TYPE] = $v->getValue(); - $a[self::FIELD_CONTENT_TYPE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CONTENT_TYPE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CONTENT_TYPE_EXT] = $enc; + } + } else { + $a[self::FIELD_CONTENT_TYPE] = $v; + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRBundle.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRBundle.php index 84ece80e0c..6b65136dac 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRBundle.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRBundle.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -83,10 +83,6 @@ class FHIRBundle extends FHIRResource implements PHPFHIRContainedTypeInterface { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_BUNDLE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ENTRY = 'entry'; const FIELD_LINK = 'link'; const FIELD_SIGNATURE = 'signature'; @@ -150,6 +146,9 @@ class FHIRBundle extends FHIRResource implements PHPFHIRContainedTypeInterface */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRBundle Constructor * @param null|array $data @@ -169,6 +168,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ENTRY])) { if (is_array($data[self::FIELD_ENTRY])) { foreach($data[self::FIELD_ENTRY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRBundleEntry) { $this->addEntry($v); } else { @@ -184,6 +186,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_LINK])) { if (is_array($data[self::FIELD_LINK])) { foreach($data[self::FIELD_LINK] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRBundleLink) { $this->addLink($v); } else { @@ -209,8 +214,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TOTAL] instanceof FHIRUnsignedInt) { $this->setTotal($data[self::FIELD_TOTAL]); - } elseif ($ext && is_scalar($data[self::FIELD_TOTAL])) { - $this->setTotal(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_TOTAL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TOTAL])) { + $this->setTotal(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_TOTAL]] + $ext)); + } else if (is_array($data[self::FIELD_TOTAL])) { + $this->setTotal(new FHIRUnsignedInt(array_merge($ext, $data[self::FIELD_TOTAL]))); + } } else { $this->setTotal(new FHIRUnsignedInt($data[self::FIELD_TOTAL])); } @@ -221,8 +230,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TYPE] instanceof FHIRBundleType) { $this->setType($data[self::FIELD_TYPE]); - } elseif ($ext && is_scalar($data[self::FIELD_TYPE])) { - $this->setType(new FHIRBundleType([FHIRBundleType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TYPE])) { + $this->setType(new FHIRBundleType([FHIRBundleType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } else if (is_array($data[self::FIELD_TYPE])) { + $this->setType(new FHIRBundleType(array_merge($ext, $data[self::FIELD_TYPE]))); + } } else { $this->setType(new FHIRBundleType($data[self::FIELD_TYPE])); } @@ -565,7 +578,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getEntry())) { foreach($vs as $v) { if (null === $v) { @@ -590,7 +602,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getTotal())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TOTAL, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -613,11 +624,26 @@ public function jsonSerialize() $a[self::FIELD_SIGNATURE] = $v; } if (null !== ($v = $this->getTotal())) { - $a[self::FIELD_TOTAL] = $v->getValue(); - $a[self::FIELD_TOTAL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TOTAL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TOTAL_EXT] = $enc; + } + } else { + $a[self::FIELD_TOTAL] = $v; + } } if (null !== ($v = $this->getType())) { - $a[self::FIELD_TYPE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TYPE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TYPE_EXT] = $enc; + } + } else { + $a[self::FIELD_TYPE] = $v; + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource.php index df1f03d19b..8dedd97a03 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRDomainResource extends FHIRResource { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DOMAIN_RESOURCE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CONTAINED = 'contained'; const FIELD_EXTENSION = 'extension'; const FIELD_MODIFIER_EXTENSION = 'modifierExtension'; @@ -148,6 +144,9 @@ class FHIRDomainResource extends FHIRResource */ protected $text = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRDomainResource Constructor * @param null|array $data @@ -185,6 +184,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_EXTENSION])) { if (is_array($data[self::FIELD_EXTENSION])) { foreach($data[self::FIELD_EXTENSION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRExtension) { $this->addExtension($v); } else { @@ -200,6 +202,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_MODIFIER_EXTENSION])) { if (is_array($data[self::FIELD_MODIFIER_EXTENSION])) { foreach($data[self::FIELD_MODIFIER_EXTENSION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRExtension) { $this->addModifierExtension($v); } else { @@ -601,7 +606,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getContained())) { foreach($vs as $v) { if (null === $v) { diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRAccount.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRAccount.php index d85d682ba1..6ba647ee2c 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRAccount.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRAccount.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -87,12 +87,9 @@ class FHIRAccount extends FHIRDomainResource implements PHPFHIRContainedTypeInte { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ACCOUNT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ACTIVE_PERIOD = 'activePeriod'; const FIELD_BALANCE = 'balance'; + const FIELD_BALANCE_EXT = '_balance'; const FIELD_COVERAGE_PERIOD = 'coveragePeriod'; const FIELD_CURRENCY = 'currency'; const FIELD_DESCRIPTION = 'description'; @@ -231,6 +228,9 @@ class FHIRAccount extends FHIRDomainResource implements PHPFHIRContainedTypeInte */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRAccount Constructor * @param null|array $data @@ -255,8 +255,17 @@ public function __construct($data = null) } } if (isset($data[self::FIELD_BALANCE])) { + $ext = (isset($data[self::FIELD_BALANCE_EXT]) && is_array($data[self::FIELD_BALANCE_EXT])) + ? $data[self::FIELD_BALANCE_EXT] + : null; if ($data[self::FIELD_BALANCE] instanceof FHIRMoney) { $this->setBalance($data[self::FIELD_BALANCE]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_BALANCE])) { + $this->setBalance(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_BALANCE]] + $ext)); + } else if (is_array($data[self::FIELD_BALANCE])) { + $this->setBalance(new FHIRMoney(array_merge($ext, $data[self::FIELD_BALANCE]))); + } } else { $this->setBalance(new FHIRMoney($data[self::FIELD_BALANCE])); } @@ -281,8 +290,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -293,17 +306,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -315,8 +335,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -334,8 +358,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRAccountStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRAccountStatus([FHIRAccountStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRAccountStatus([FHIRAccountStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRAccountStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRAccountStatus($data[self::FIELD_STATUS])); } @@ -883,26 +911,21 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getActivePeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ACTIVE_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getBalance())) { $v->xmlSerialize($sxe->addChild(self::FIELD_BALANCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getCoveragePeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_COVERAGE_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getCurrency())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CURRENCY, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getDescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESCRIPTION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -911,22 +934,19 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NAME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOwner())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OWNER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSubject())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBJECT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -943,7 +963,15 @@ public function jsonSerialize() $a[self::FIELD_ACTIVE_PERIOD] = $v; } if (null !== ($v = $this->getBalance())) { - $a[self::FIELD_BALANCE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_BALANCE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_BALANCE_EXT] = $enc; + } + } else { + $a[self::FIELD_BALANCE] = $v; + } } if (null !== ($v = $this->getCoveragePeriod())) { $a[self::FIELD_COVERAGE_PERIOD] = $v; @@ -952,21 +980,59 @@ public function jsonSerialize() $a[self::FIELD_CURRENCY] = $v; } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if (null !== ($v = $this->getOwner())) { $a[self::FIELD_OWNER] = $v; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getSubject())) { $a[self::FIELD_SUBJECT] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRAllergyIntolerance.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRAllergyIntolerance.php index 4c26cbe731..fd5dae9881 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRAllergyIntolerance.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRAllergyIntolerance.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -89,10 +89,6 @@ class FHIRAllergyIntolerance extends FHIRDomainResource implements PHPFHIRContai { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ALLERGY_INTOLERANCE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CATEGORY = 'category'; const FIELD_CATEGORY_EXT = '_category'; const FIELD_CRITICALITY = 'criticality'; @@ -287,6 +283,9 @@ class FHIRAllergyIntolerance extends FHIRDomainResource implements PHPFHIRContai */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRAllergyIntolerance Constructor * @param null|array $data @@ -309,8 +308,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CATEGORY] instanceof FHIRAllergyIntoleranceCategory) { $this->setCategory($data[self::FIELD_CATEGORY]); - } elseif ($ext && is_scalar($data[self::FIELD_CATEGORY])) { - $this->setCategory(new FHIRAllergyIntoleranceCategory([FHIRAllergyIntoleranceCategory::FIELD_VALUE => $data[self::FIELD_CATEGORY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CATEGORY])) { + $this->setCategory(new FHIRAllergyIntoleranceCategory([FHIRAllergyIntoleranceCategory::FIELD_VALUE => $data[self::FIELD_CATEGORY]] + $ext)); + } else if (is_array($data[self::FIELD_CATEGORY])) { + $this->setCategory(new FHIRAllergyIntoleranceCategory(array_merge($ext, $data[self::FIELD_CATEGORY]))); + } } else { $this->setCategory(new FHIRAllergyIntoleranceCategory($data[self::FIELD_CATEGORY])); } @@ -321,8 +324,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CRITICALITY] instanceof FHIRAllergyIntoleranceCriticality) { $this->setCriticality($data[self::FIELD_CRITICALITY]); - } elseif ($ext && is_scalar($data[self::FIELD_CRITICALITY])) { - $this->setCriticality(new FHIRAllergyIntoleranceCriticality([FHIRAllergyIntoleranceCriticality::FIELD_VALUE => $data[self::FIELD_CRITICALITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CRITICALITY])) { + $this->setCriticality(new FHIRAllergyIntoleranceCriticality([FHIRAllergyIntoleranceCriticality::FIELD_VALUE => $data[self::FIELD_CRITICALITY]] + $ext)); + } else if (is_array($data[self::FIELD_CRITICALITY])) { + $this->setCriticality(new FHIRAllergyIntoleranceCriticality(array_merge($ext, $data[self::FIELD_CRITICALITY]))); + } } else { $this->setCriticality(new FHIRAllergyIntoleranceCriticality($data[self::FIELD_CRITICALITY])); } @@ -333,17 +340,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -355,8 +369,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_LAST_OCCURENCE] instanceof FHIRDateTime) { $this->setLastOccurence($data[self::FIELD_LAST_OCCURENCE]); - } elseif ($ext && is_scalar($data[self::FIELD_LAST_OCCURENCE])) { - $this->setLastOccurence(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_LAST_OCCURENCE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_LAST_OCCURENCE])) { + $this->setLastOccurence(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_LAST_OCCURENCE]] + $ext)); + } else if (is_array($data[self::FIELD_LAST_OCCURENCE])) { + $this->setLastOccurence(new FHIRDateTime(array_merge($ext, $data[self::FIELD_LAST_OCCURENCE]))); + } } else { $this->setLastOccurence(new FHIRDateTime($data[self::FIELD_LAST_OCCURENCE])); } @@ -374,8 +392,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ONSET] instanceof FHIRDateTime) { $this->setOnset($data[self::FIELD_ONSET]); - } elseif ($ext && is_scalar($data[self::FIELD_ONSET])) { - $this->setOnset(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_ONSET]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ONSET])) { + $this->setOnset(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_ONSET]] + $ext)); + } else if (is_array($data[self::FIELD_ONSET])) { + $this->setOnset(new FHIRDateTime(array_merge($ext, $data[self::FIELD_ONSET]))); + } } else { $this->setOnset(new FHIRDateTime($data[self::FIELD_ONSET])); } @@ -390,6 +412,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REACTION])) { if (is_array($data[self::FIELD_REACTION])) { foreach($data[self::FIELD_REACTION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRAllergyIntoleranceReaction) { $this->addReaction($v); } else { @@ -408,8 +433,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_RECORDED_DATE] instanceof FHIRDateTime) { $this->setRecordedDate($data[self::FIELD_RECORDED_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_RECORDED_DATE])) { - $this->setRecordedDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_RECORDED_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_RECORDED_DATE])) { + $this->setRecordedDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_RECORDED_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_RECORDED_DATE])) { + $this->setRecordedDate(new FHIRDateTime(array_merge($ext, $data[self::FIELD_RECORDED_DATE]))); + } } else { $this->setRecordedDate(new FHIRDateTime($data[self::FIELD_RECORDED_DATE])); } @@ -434,8 +463,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRAllergyIntoleranceStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRAllergyIntoleranceStatus([FHIRAllergyIntoleranceStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRAllergyIntoleranceStatus([FHIRAllergyIntoleranceStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRAllergyIntoleranceStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRAllergyIntoleranceStatus($data[self::FIELD_STATUS])); } @@ -453,8 +486,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TYPE] instanceof FHIRAllergyIntoleranceType) { $this->setType($data[self::FIELD_TYPE]); - } elseif ($ext && is_scalar($data[self::FIELD_TYPE])) { - $this->setType(new FHIRAllergyIntoleranceType([FHIRAllergyIntoleranceType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TYPE])) { + $this->setType(new FHIRAllergyIntoleranceType([FHIRAllergyIntoleranceType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } else if (is_array($data[self::FIELD_TYPE])) { + $this->setType(new FHIRAllergyIntoleranceType(array_merge($ext, $data[self::FIELD_TYPE]))); + } } else { $this->setType(new FHIRAllergyIntoleranceType($data[self::FIELD_TYPE])); } @@ -1156,15 +1193,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getCategory())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CATEGORY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getCriticality())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CRITICALITY, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -1173,21 +1207,19 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getLastOccurence())) { $v->xmlSerialize($sxe->addChild(self::FIELD_LAST_OCCURENCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getNote())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NOTE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getOnset())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ONSET, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPatient())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATIENT, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getReaction())) { foreach($vs as $v) { if (null === $v) { @@ -1196,26 +1228,22 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_REACTION, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getRecordedDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RECORDED_DATE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRecorder())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RECORDER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getReporter())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REPORTER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSubstance())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBSTANCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -1229,24 +1257,70 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getCategory())) { - $a[self::FIELD_CATEGORY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CATEGORY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CATEGORY_EXT] = $enc; + } + } else { + $a[self::FIELD_CATEGORY] = $v; + } } if (null !== ($v = $this->getCriticality())) { - $a[self::FIELD_CRITICALITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CRITICALITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CRITICALITY_EXT] = $enc; + } + } else { + $a[self::FIELD_CRITICALITY] = $v; + } } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if (null !== ($v = $this->getLastOccurence())) { - $a[self::FIELD_LAST_OCCURENCE] = $v->getValue(); - $a[self::FIELD_LAST_OCCURENCE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_LAST_OCCURENCE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_LAST_OCCURENCE_EXT] = $enc; + } + } else { + $a[self::FIELD_LAST_OCCURENCE] = $v; + } } if (null !== ($v = $this->getNote())) { $a[self::FIELD_NOTE] = $v; } if (null !== ($v = $this->getOnset())) { - $a[self::FIELD_ONSET] = $v->getValue(); - $a[self::FIELD_ONSET_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ONSET] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ONSET_EXT] = $enc; + } + } else { + $a[self::FIELD_ONSET] = $v; + } } if (null !== ($v = $this->getPatient())) { $a[self::FIELD_PATIENT] = $v; @@ -1255,8 +1329,15 @@ public function jsonSerialize() $a[self::FIELD_REACTION] = $vs; } if (null !== ($v = $this->getRecordedDate())) { - $a[self::FIELD_RECORDED_DATE] = $v->getValue(); - $a[self::FIELD_RECORDED_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_RECORDED_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_RECORDED_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_RECORDED_DATE] = $v; + } } if (null !== ($v = $this->getRecorder())) { $a[self::FIELD_RECORDER] = $v; @@ -1265,13 +1346,29 @@ public function jsonSerialize() $a[self::FIELD_REPORTER] = $v; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getSubstance())) { $a[self::FIELD_SUBSTANCE] = $v; } if (null !== ($v = $this->getType())) { - $a[self::FIELD_TYPE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TYPE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TYPE_EXT] = $enc; + } + } else { + $a[self::FIELD_TYPE] = $v; + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRAppointment.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRAppointment.php index b95d3da1a2..5c2d2bb134 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRAppointment.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRAppointment.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -89,10 +89,6 @@ class FHIRAppointment extends FHIRDomainResource implements PHPFHIRContainedType { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_APPOINTMENT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_COMMENT = 'comment'; const FIELD_COMMENT_EXT = '_comment'; const FIELD_DESCRIPTION = 'description'; @@ -266,6 +262,9 @@ class FHIRAppointment extends FHIRDomainResource implements PHPFHIRContainedType */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRAppointment Constructor * @param null|array $data @@ -288,8 +287,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_COMMENT] instanceof FHIRString) { $this->setComment($data[self::FIELD_COMMENT]); - } elseif ($ext && is_scalar($data[self::FIELD_COMMENT])) { - $this->setComment(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_COMMENT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_COMMENT])) { + $this->setComment(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_COMMENT]] + $ext)); + } else if (is_array($data[self::FIELD_COMMENT])) { + $this->setComment(new FHIRString(array_merge($ext, $data[self::FIELD_COMMENT]))); + } } else { $this->setComment(new FHIRString($data[self::FIELD_COMMENT])); } @@ -300,8 +303,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -312,8 +319,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_END] instanceof FHIRInstant) { $this->setEnd($data[self::FIELD_END]); - } elseif ($ext && is_scalar($data[self::FIELD_END])) { - $this->setEnd(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_END]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_END])) { + $this->setEnd(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_END]] + $ext)); + } else if (is_array($data[self::FIELD_END])) { + $this->setEnd(new FHIRInstant(array_merge($ext, $data[self::FIELD_END]))); + } } else { $this->setEnd(new FHIRInstant($data[self::FIELD_END])); } @@ -324,17 +335,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -346,8 +364,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MINUTES_DURATION] instanceof FHIRPositiveInt) { $this->setMinutesDuration($data[self::FIELD_MINUTES_DURATION]); - } elseif ($ext && is_scalar($data[self::FIELD_MINUTES_DURATION])) { - $this->setMinutesDuration(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_MINUTES_DURATION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MINUTES_DURATION])) { + $this->setMinutesDuration(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_MINUTES_DURATION]] + $ext)); + } else if (is_array($data[self::FIELD_MINUTES_DURATION])) { + $this->setMinutesDuration(new FHIRPositiveInt(array_merge($ext, $data[self::FIELD_MINUTES_DURATION]))); + } } else { $this->setMinutesDuration(new FHIRPositiveInt($data[self::FIELD_MINUTES_DURATION])); } @@ -355,6 +377,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PARTICIPANT])) { if (is_array($data[self::FIELD_PARTICIPANT])) { foreach($data[self::FIELD_PARTICIPANT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRAppointmentParticipant) { $this->addParticipant($v); } else { @@ -373,8 +398,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PRIORITY] instanceof FHIRUnsignedInt) { $this->setPriority($data[self::FIELD_PRIORITY]); - } elseif ($ext && is_scalar($data[self::FIELD_PRIORITY])) { - $this->setPriority(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_PRIORITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PRIORITY])) { + $this->setPriority(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_PRIORITY]] + $ext)); + } else if (is_array($data[self::FIELD_PRIORITY])) { + $this->setPriority(new FHIRUnsignedInt(array_merge($ext, $data[self::FIELD_PRIORITY]))); + } } else { $this->setPriority(new FHIRUnsignedInt($data[self::FIELD_PRIORITY])); } @@ -389,6 +418,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SLOT])) { if (is_array($data[self::FIELD_SLOT])) { foreach($data[self::FIELD_SLOT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addSlot($v); } else { @@ -407,8 +439,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_START] instanceof FHIRInstant) { $this->setStart($data[self::FIELD_START]); - } elseif ($ext && is_scalar($data[self::FIELD_START])) { - $this->setStart(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_START]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_START])) { + $this->setStart(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_START]] + $ext)); + } else if (is_array($data[self::FIELD_START])) { + $this->setStart(new FHIRInstant(array_merge($ext, $data[self::FIELD_START]))); + } } else { $this->setStart(new FHIRInstant($data[self::FIELD_START])); } @@ -419,8 +455,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRAppointmentStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRAppointmentStatus([FHIRAppointmentStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRAppointmentStatus([FHIRAppointmentStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRAppointmentStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRAppointmentStatus($data[self::FIELD_STATUS])); } @@ -1141,7 +1181,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getEnd())) { $v->xmlSerialize($sxe->addChild(self::FIELD_END, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -1150,10 +1189,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getMinutesDuration())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MINUTES_DURATION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getParticipant())) { foreach($vs as $v) { if (null === $v) { @@ -1162,14 +1201,13 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_PARTICIPANT, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getPriority())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PRIORITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getReason())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REASON, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getSlot())) { foreach($vs as $v) { if (null === $v) { @@ -1178,14 +1216,13 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_SLOT, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getStart())) { $v->xmlSerialize($sxe->addChild(self::FIELD_START, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -1199,30 +1236,81 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getComment())) { - $a[self::FIELD_COMMENT] = $v->getValue(); - $a[self::FIELD_COMMENT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_COMMENT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_COMMENT_EXT] = $enc; + } + } else { + $a[self::FIELD_COMMENT] = $v; + } } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if (null !== ($v = $this->getEnd())) { - $a[self::FIELD_END] = $v->getValue(); - $a[self::FIELD_END_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_END] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_END_EXT] = $enc; + } + } else { + $a[self::FIELD_END] = $v; + } } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if (null !== ($v = $this->getMinutesDuration())) { - $a[self::FIELD_MINUTES_DURATION] = $v->getValue(); - $a[self::FIELD_MINUTES_DURATION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MINUTES_DURATION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MINUTES_DURATION_EXT] = $enc; + } + } else { + $a[self::FIELD_MINUTES_DURATION] = $v; + } } if ([] !== ($vs = $this->getParticipant())) { $a[self::FIELD_PARTICIPANT] = $vs; } if (null !== ($v = $this->getPriority())) { - $a[self::FIELD_PRIORITY] = $v->getValue(); - $a[self::FIELD_PRIORITY_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PRIORITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PRIORITY_EXT] = $enc; + } + } else { + $a[self::FIELD_PRIORITY] = $v; + } } if (null !== ($v = $this->getReason())) { $a[self::FIELD_REASON] = $v; @@ -1231,11 +1319,26 @@ public function jsonSerialize() $a[self::FIELD_SLOT] = $vs; } if (null !== ($v = $this->getStart())) { - $a[self::FIELD_START] = $v->getValue(); - $a[self::FIELD_START_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_START] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_START_EXT] = $enc; + } + } else { + $a[self::FIELD_START] = $v; + } } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getType())) { $a[self::FIELD_TYPE] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRAppointmentResponse.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRAppointmentResponse.php index ab7c2aeae3..4e385d4ed7 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRAppointmentResponse.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRAppointmentResponse.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -85,10 +85,6 @@ class FHIRAppointmentResponse extends FHIRDomainResource implements PHPFHIRConta { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_APPOINTMENT_RESPONSE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ACTOR = 'actor'; const FIELD_APPOINTMENT = 'appointment'; const FIELD_COMMENT = 'comment'; @@ -204,6 +200,9 @@ class FHIRAppointmentResponse extends FHIRDomainResource implements PHPFHIRConta */ protected $start = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRAppointmentResponse Constructor * @param null|array $data @@ -240,8 +239,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_COMMENT] instanceof FHIRString) { $this->setComment($data[self::FIELD_COMMENT]); - } elseif ($ext && is_scalar($data[self::FIELD_COMMENT])) { - $this->setComment(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_COMMENT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_COMMENT])) { + $this->setComment(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_COMMENT]] + $ext)); + } else if (is_array($data[self::FIELD_COMMENT])) { + $this->setComment(new FHIRString(array_merge($ext, $data[self::FIELD_COMMENT]))); + } } else { $this->setComment(new FHIRString($data[self::FIELD_COMMENT])); } @@ -252,8 +255,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_END] instanceof FHIRInstant) { $this->setEnd($data[self::FIELD_END]); - } elseif ($ext && is_scalar($data[self::FIELD_END])) { - $this->setEnd(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_END]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_END])) { + $this->setEnd(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_END]] + $ext)); + } else if (is_array($data[self::FIELD_END])) { + $this->setEnd(new FHIRInstant(array_merge($ext, $data[self::FIELD_END]))); + } } else { $this->setEnd(new FHIRInstant($data[self::FIELD_END])); } @@ -264,17 +271,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -286,8 +300,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PARTICIPANT_STATUS] instanceof FHIRParticipantStatus) { $this->setParticipantStatus($data[self::FIELD_PARTICIPANT_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_PARTICIPANT_STATUS])) { - $this->setParticipantStatus(new FHIRParticipantStatus([FHIRParticipantStatus::FIELD_VALUE => $data[self::FIELD_PARTICIPANT_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PARTICIPANT_STATUS])) { + $this->setParticipantStatus(new FHIRParticipantStatus([FHIRParticipantStatus::FIELD_VALUE => $data[self::FIELD_PARTICIPANT_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_PARTICIPANT_STATUS])) { + $this->setParticipantStatus(new FHIRParticipantStatus(array_merge($ext, $data[self::FIELD_PARTICIPANT_STATUS]))); + } } else { $this->setParticipantStatus(new FHIRParticipantStatus($data[self::FIELD_PARTICIPANT_STATUS])); } @@ -295,6 +313,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PARTICIPANT_TYPE])) { if (is_array($data[self::FIELD_PARTICIPANT_TYPE])) { foreach($data[self::FIELD_PARTICIPANT_TYPE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addParticipantType($v); } else { @@ -313,8 +334,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_START] instanceof FHIRInstant) { $this->setStart($data[self::FIELD_START]); - } elseif ($ext && is_scalar($data[self::FIELD_START])) { - $this->setStart(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_START]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_START])) { + $this->setStart(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_START]] + $ext)); + } else if (is_array($data[self::FIELD_START])) { + $this->setStart(new FHIRInstant(array_merge($ext, $data[self::FIELD_START]))); + } } else { $this->setStart(new FHIRInstant($data[self::FIELD_START])); } @@ -810,11 +835,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getActor())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ACTOR, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getAppointment())) { $v->xmlSerialize($sxe->addChild(self::FIELD_APPOINTMENT, null, $v->_getFHIRXMLNamespace())); } @@ -824,7 +847,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getEnd())) { $v->xmlSerialize($sxe->addChild(self::FIELD_END, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -837,7 +859,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getParticipantStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PARTICIPANT_STATUS, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getParticipantType())) { foreach($vs as $v) { if (null === $v) { @@ -846,6 +867,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_PARTICIPANT_TYPE, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getStart())) { $v->xmlSerialize($sxe->addChild(self::FIELD_START, null, $v->_getFHIRXMLNamespace())); } @@ -865,25 +887,70 @@ public function jsonSerialize() $a[self::FIELD_APPOINTMENT] = $v; } if (null !== ($v = $this->getComment())) { - $a[self::FIELD_COMMENT] = $v->getValue(); - $a[self::FIELD_COMMENT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_COMMENT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_COMMENT_EXT] = $enc; + } + } else { + $a[self::FIELD_COMMENT] = $v; + } } if (null !== ($v = $this->getEnd())) { - $a[self::FIELD_END] = $v->getValue(); - $a[self::FIELD_END_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_END] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_END_EXT] = $enc; + } + } else { + $a[self::FIELD_END] = $v; + } } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if (null !== ($v = $this->getParticipantStatus())) { - $a[self::FIELD_PARTICIPANT_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PARTICIPANT_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PARTICIPANT_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_PARTICIPANT_STATUS] = $v; + } } if ([] !== ($vs = $this->getParticipantType())) { $a[self::FIELD_PARTICIPANT_TYPE] = $vs; } if (null !== ($v = $this->getStart())) { - $a[self::FIELD_START] = $v->getValue(); - $a[self::FIELD_START_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_START] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_START_EXT] = $enc; + } + } else { + $a[self::FIELD_START] = $v; + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRAuditEvent.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRAuditEvent.php index a9ce1f1c51..8c9d8abacd 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRAuditEvent.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRAuditEvent.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -84,10 +84,6 @@ class FHIRAuditEvent extends FHIRDomainResource implements PHPFHIRContainedTypeI { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_AUDIT_EVENT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_EVENT = 'event'; const FIELD_OBJECT = 'object'; const FIELD_PARTICIPANT = 'participant'; @@ -137,6 +133,9 @@ class FHIRAuditEvent extends FHIRDomainResource implements PHPFHIRContainedTypeI */ protected $source = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRAuditEvent Constructor * @param null|array $data @@ -163,6 +162,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_OBJECT])) { if (is_array($data[self::FIELD_OBJECT])) { foreach($data[self::FIELD_OBJECT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRAuditEventObject) { $this->addObject($v); } else { @@ -178,6 +180,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PARTICIPANT])) { if (is_array($data[self::FIELD_PARTICIPANT])) { foreach($data[self::FIELD_PARTICIPANT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRAuditEventParticipant) { $this->addParticipant($v); } else { @@ -494,11 +499,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getEvent())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EVENT, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getObject())) { foreach($vs as $v) { if (null === $v) { diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRBasic.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRBasic.php index 5d7706b792..082901fdde 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRBasic.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRBasic.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -84,10 +84,6 @@ class FHIRBasic extends FHIRDomainResource implements PHPFHIRContainedTypeInterf { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_BASIC; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_AUTHOR = 'author'; const FIELD_CODE = 'code'; const FIELD_CREATED = 'created'; @@ -156,6 +152,9 @@ class FHIRBasic extends FHIRDomainResource implements PHPFHIRContainedTypeInterf */ protected $subject = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRBasic Constructor * @param null|array $data @@ -192,8 +191,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CREATED] instanceof FHIRDate) { $this->setCreated($data[self::FIELD_CREATED]); - } elseif ($ext && is_scalar($data[self::FIELD_CREATED])) { - $this->setCreated(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_CREATED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CREATED])) { + $this->setCreated(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_CREATED]] + $ext)); + } else if (is_array($data[self::FIELD_CREATED])) { + $this->setCreated(new FHIRDate(array_merge($ext, $data[self::FIELD_CREATED]))); + } } else { $this->setCreated(new FHIRDate($data[self::FIELD_CREATED])); } @@ -204,17 +207,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -551,18 +561,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getAuthor())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AUTHOR, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getCreated())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CREATED, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -591,11 +598,34 @@ public function jsonSerialize() $a[self::FIELD_CODE] = $v; } if (null !== ($v = $this->getCreated())) { - $a[self::FIELD_CREATED] = $v->getValue(); - $a[self::FIELD_CREATED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CREATED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CREATED_EXT] = $enc; + } + } else { + $a[self::FIELD_CREATED] = $v; + } } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if (null !== ($v = $this->getSubject())) { $a[self::FIELD_SUBJECT] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRBodySite.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRBodySite.php index f09ae39ce7..36f86ce4d9 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRBodySite.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRBodySite.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -85,10 +85,6 @@ class FHIRBodySite extends FHIRDomainResource implements PHPFHIRContainedTypeInt { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_BODY_SITE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CODE = 'code'; const FIELD_DESCRIPTION = 'description'; const FIELD_DESCRIPTION_EXT = '_description'; @@ -167,6 +163,9 @@ class FHIRBodySite extends FHIRDomainResource implements PHPFHIRContainedTypeInt */ protected $patient = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRBodySite Constructor * @param null|array $data @@ -196,8 +195,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -208,17 +211,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -227,6 +237,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_IMAGE])) { if (is_array($data[self::FIELD_IMAGE])) { foreach($data[self::FIELD_IMAGE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRAttachment) { $this->addImage($v); } else { @@ -242,6 +255,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_MODIFIER])) { if (is_array($data[self::FIELD_MODIFIER])) { foreach($data[self::FIELD_MODIFIER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addModifier($v); } else { @@ -671,14 +687,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getDescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESCRIPTION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -722,11 +736,34 @@ public function jsonSerialize() $a[self::FIELD_CODE] = $v; } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if ([] !== ($vs = $this->getImage())) { $a[self::FIELD_IMAGE] = $vs; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRCarePlan.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRCarePlan.php index 7447607155..b1edafbb1b 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRCarePlan.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRCarePlan.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -91,10 +91,6 @@ class FHIRCarePlan extends FHIRDomainResource implements PHPFHIRContainedTypeInt { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CARE_PLAN; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ACTIVITY = 'activity'; const FIELD_ADDRESSES = 'addresses'; const FIELD_AUTHOR = 'author'; @@ -309,6 +305,9 @@ class FHIRCarePlan extends FHIRDomainResource implements PHPFHIRContainedTypeInt */ protected $support = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRCarePlan Constructor * @param null|array $data @@ -328,6 +327,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ACTIVITY])) { if (is_array($data[self::FIELD_ACTIVITY])) { foreach($data[self::FIELD_ACTIVITY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCarePlanActivity) { $this->addActivity($v); } else { @@ -343,6 +345,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ADDRESSES])) { if (is_array($data[self::FIELD_ADDRESSES])) { foreach($data[self::FIELD_ADDRESSES] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addAddresses($v); } else { @@ -358,6 +363,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_AUTHOR])) { if (is_array($data[self::FIELD_AUTHOR])) { foreach($data[self::FIELD_AUTHOR] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addAuthor($v); } else { @@ -373,6 +381,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CATEGORY])) { if (is_array($data[self::FIELD_CATEGORY])) { foreach($data[self::FIELD_CATEGORY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addCategory($v); } else { @@ -398,8 +409,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -407,6 +422,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_GOAL])) { if (is_array($data[self::FIELD_GOAL])) { foreach($data[self::FIELD_GOAL] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addGoal($v); } else { @@ -425,17 +443,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -447,8 +472,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MODIFIED] instanceof FHIRDateTime) { $this->setModified($data[self::FIELD_MODIFIED]); - } elseif ($ext && is_scalar($data[self::FIELD_MODIFIED])) { - $this->setModified(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_MODIFIED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MODIFIED])) { + $this->setModified(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_MODIFIED]] + $ext)); + } else if (is_array($data[self::FIELD_MODIFIED])) { + $this->setModified(new FHIRDateTime(array_merge($ext, $data[self::FIELD_MODIFIED]))); + } } else { $this->setModified(new FHIRDateTime($data[self::FIELD_MODIFIED])); } @@ -463,6 +492,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PARTICIPANT])) { if (is_array($data[self::FIELD_PARTICIPANT])) { foreach($data[self::FIELD_PARTICIPANT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCarePlanParticipant) { $this->addParticipant($v); } else { @@ -485,6 +517,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_RELATED_PLAN])) { if (is_array($data[self::FIELD_RELATED_PLAN])) { foreach($data[self::FIELD_RELATED_PLAN] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCarePlanRelatedPlan) { $this->addRelatedPlan($v); } else { @@ -503,8 +538,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRCarePlanStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRCarePlanStatus([FHIRCarePlanStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRCarePlanStatus([FHIRCarePlanStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRCarePlanStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRCarePlanStatus($data[self::FIELD_STATUS])); } @@ -519,6 +558,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SUPPORT])) { if (is_array($data[self::FIELD_SUPPORT])) { foreach($data[self::FIELD_SUPPORT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addSupport($v); } else { @@ -1488,7 +1530,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getActivity())) { foreach($vs as $v) { if (null === $v) { @@ -1531,7 +1572,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESCRIPTION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getGoal())) { foreach($vs as $v) { if (null === $v) { @@ -1549,14 +1589,13 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getModified())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MODIFIED, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getNote())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NOTE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getParticipant())) { foreach($vs as $v) { if (null === $v) { @@ -1569,7 +1608,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getRelatedPlan())) { foreach($vs as $v) { if (null === $v) { @@ -1582,11 +1620,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSubject())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBJECT, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getSupport())) { foreach($vs as $v) { if (null === $v) { @@ -1595,6 +1631,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_SUPPORT, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } @@ -1620,18 +1657,48 @@ public function jsonSerialize() $a[self::FIELD_CONTEXT] = $v; } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if ([] !== ($vs = $this->getGoal())) { $a[self::FIELD_GOAL] = $vs; } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if (null !== ($v = $this->getModified())) { - $a[self::FIELD_MODIFIED] = $v->getValue(); - $a[self::FIELD_MODIFIED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MODIFIED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MODIFIED_EXT] = $enc; + } + } else { + $a[self::FIELD_MODIFIED] = $v; + } } if (null !== ($v = $this->getNote())) { $a[self::FIELD_NOTE] = $v; @@ -1646,7 +1713,15 @@ public function jsonSerialize() $a[self::FIELD_RELATED_PLAN] = $vs; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getSubject())) { $a[self::FIELD_SUBJECT] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRClaim.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRClaim.php index 0ef7b482d5..381be7c0a6 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRClaim.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRClaim.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -92,10 +92,6 @@ class FHIRClaim extends FHIRDomainResource implements PHPFHIRContainedTypeInterf { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CLAIM; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ACCIDENT = 'accident'; const FIELD_ACCIDENT_EXT = '_accident'; const FIELD_ACCIDENT_TYPE = 'accidentType'; @@ -460,6 +456,9 @@ class FHIRClaim extends FHIRDomainResource implements PHPFHIRContainedTypeInterf */ protected $use = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRClaim Constructor * @param null|array $data @@ -482,8 +481,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ACCIDENT] instanceof FHIRDate) { $this->setAccident($data[self::FIELD_ACCIDENT]); - } elseif ($ext && is_scalar($data[self::FIELD_ACCIDENT])) { - $this->setAccident(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_ACCIDENT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ACCIDENT])) { + $this->setAccident(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_ACCIDENT]] + $ext)); + } else if (is_array($data[self::FIELD_ACCIDENT])) { + $this->setAccident(new FHIRDate(array_merge($ext, $data[self::FIELD_ACCIDENT]))); + } } else { $this->setAccident(new FHIRDate($data[self::FIELD_ACCIDENT])); } @@ -498,6 +501,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ADDITIONAL_MATERIALS])) { if (is_array($data[self::FIELD_ADDITIONAL_MATERIALS])) { foreach($data[self::FIELD_ADDITIONAL_MATERIALS] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCoding) { $this->addAdditionalMaterials($v); } else { @@ -513,6 +519,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CONDITION])) { if (is_array($data[self::FIELD_CONDITION])) { foreach($data[self::FIELD_CONDITION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCoding) { $this->addCondition($v); } else { @@ -528,6 +537,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_COVERAGE])) { if (is_array($data[self::FIELD_COVERAGE])) { foreach($data[self::FIELD_COVERAGE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRClaimCoverage) { $this->addCoverage($v); } else { @@ -546,8 +558,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CREATED] instanceof FHIRDateTime) { $this->setCreated($data[self::FIELD_CREATED]); - } elseif ($ext && is_scalar($data[self::FIELD_CREATED])) { - $this->setCreated(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_CREATED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CREATED])) { + $this->setCreated(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_CREATED]] + $ext)); + } else if (is_array($data[self::FIELD_CREATED])) { + $this->setCreated(new FHIRDateTime(array_merge($ext, $data[self::FIELD_CREATED]))); + } } else { $this->setCreated(new FHIRDateTime($data[self::FIELD_CREATED])); } @@ -555,6 +571,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_DIAGNOSIS])) { if (is_array($data[self::FIELD_DIAGNOSIS])) { foreach($data[self::FIELD_DIAGNOSIS] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRClaimDiagnosis) { $this->addDiagnosis($v); } else { @@ -577,6 +596,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_EXCEPTION])) { if (is_array($data[self::FIELD_EXCEPTION])) { foreach($data[self::FIELD_EXCEPTION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCoding) { $this->addException($v); } else { @@ -609,17 +631,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -628,6 +657,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_INTERVENTION_EXCEPTION])) { if (is_array($data[self::FIELD_INTERVENTION_EXCEPTION])) { foreach($data[self::FIELD_INTERVENTION_EXCEPTION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCoding) { $this->addInterventionException($v); } else { @@ -643,6 +675,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ITEM])) { if (is_array($data[self::FIELD_ITEM])) { foreach($data[self::FIELD_ITEM] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRClaimItem) { $this->addItem($v); } else { @@ -658,6 +693,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_MISSING_TEETH])) { if (is_array($data[self::FIELD_MISSING_TEETH])) { foreach($data[self::FIELD_MISSING_TEETH] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRClaimMissingTeeth) { $this->addMissingTeeth($v); } else { @@ -746,8 +784,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SCHOOL] instanceof FHIRString) { $this->setSchool($data[self::FIELD_SCHOOL]); - } elseif ($ext && is_scalar($data[self::FIELD_SCHOOL])) { - $this->setSchool(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SCHOOL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SCHOOL])) { + $this->setSchool(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SCHOOL]] + $ext)); + } else if (is_array($data[self::FIELD_SCHOOL])) { + $this->setSchool(new FHIRString(array_merge($ext, $data[self::FIELD_SCHOOL]))); + } } else { $this->setSchool(new FHIRString($data[self::FIELD_SCHOOL])); } @@ -765,8 +807,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TYPE] instanceof FHIRClaimType) { $this->setType($data[self::FIELD_TYPE]); - } elseif ($ext && is_scalar($data[self::FIELD_TYPE])) { - $this->setType(new FHIRClaimType([FHIRClaimType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TYPE])) { + $this->setType(new FHIRClaimType([FHIRClaimType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } else if (is_array($data[self::FIELD_TYPE])) { + $this->setType(new FHIRClaimType(array_merge($ext, $data[self::FIELD_TYPE]))); + } } else { $this->setType(new FHIRClaimType($data[self::FIELD_TYPE])); } @@ -777,8 +823,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_USE] instanceof FHIRUse) { $this->setUse($data[self::FIELD_USE]); - } elseif ($ext && is_scalar($data[self::FIELD_USE])) { - $this->setUse(new FHIRUse([FHIRUse::FIELD_VALUE => $data[self::FIELD_USE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_USE])) { + $this->setUse(new FHIRUse([FHIRUse::FIELD_VALUE => $data[self::FIELD_USE]] + $ext)); + } else if (is_array($data[self::FIELD_USE])) { + $this->setUse(new FHIRUse(array_merge($ext, $data[self::FIELD_USE]))); + } } else { $this->setUse(new FHIRUse($data[self::FIELD_USE])); } @@ -2155,11 +2205,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getAccident())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ACCIDENT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getAccidentType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ACCIDENT_TYPE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getAdditionalMaterials())) { foreach($vs as $v) { if (null === $v) { @@ -2186,10 +2234,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_COVERAGE, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getCreated())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CREATED, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getDiagnosis())) { foreach($vs as $v) { if (null === $v) { @@ -2202,7 +2250,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getEnterer())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ENTERER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getException())) { foreach($vs as $v) { if (null === $v) { @@ -2215,11 +2262,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getFacility())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FACILITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getFundsReserve())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FUNDS_RESERVE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -2259,54 +2304,42 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getOrganization())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ORGANIZATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOriginalPrescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ORIGINAL_PRESCRIPTION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOriginalRuleset())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ORIGINAL_RULESET, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPatient())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATIENT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPayee())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PAYEE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPrescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PRESCRIPTION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPriority())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PRIORITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getProvider())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PROVIDER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getReferral())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REFERRAL, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRuleset())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RULESET, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getSchool())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SCHOOL, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getTarget())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TARGET, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getUse())) { $v->xmlSerialize($sxe->addChild(self::FIELD_USE, null, $v->_getFHIRXMLNamespace())); } @@ -2320,8 +2353,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getAccident())) { - $a[self::FIELD_ACCIDENT] = $v->getValue(); - $a[self::FIELD_ACCIDENT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ACCIDENT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ACCIDENT_EXT] = $enc; + } + } else { + $a[self::FIELD_ACCIDENT] = $v; + } } if (null !== ($v = $this->getAccidentType())) { $a[self::FIELD_ACCIDENT_TYPE] = $v; @@ -2336,8 +2376,15 @@ public function jsonSerialize() $a[self::FIELD_COVERAGE] = $vs; } if (null !== ($v = $this->getCreated())) { - $a[self::FIELD_CREATED] = $v->getValue(); - $a[self::FIELD_CREATED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CREATED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CREATED_EXT] = $enc; + } + } else { + $a[self::FIELD_CREATED] = $v; + } } if ([] !== ($vs = $this->getDiagnosis())) { $a[self::FIELD_DIAGNOSIS] = $vs; @@ -2355,7 +2402,23 @@ public function jsonSerialize() $a[self::FIELD_FUNDS_RESERVE] = $v; } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if ([] !== ($vs = $this->getInterventionException())) { $a[self::FIELD_INTERVENTION_EXCEPTION] = $vs; @@ -2397,17 +2460,40 @@ public function jsonSerialize() $a[self::FIELD_RULESET] = $v; } if (null !== ($v = $this->getSchool())) { - $a[self::FIELD_SCHOOL] = $v->getValue(); - $a[self::FIELD_SCHOOL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SCHOOL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SCHOOL_EXT] = $enc; + } + } else { + $a[self::FIELD_SCHOOL] = $v; + } } if (null !== ($v = $this->getTarget())) { $a[self::FIELD_TARGET] = $v; } if (null !== ($v = $this->getType())) { - $a[self::FIELD_TYPE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TYPE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TYPE_EXT] = $enc; + } + } else { + $a[self::FIELD_TYPE] = $v; + } } if (null !== ($v = $this->getUse())) { - $a[self::FIELD_USE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_USE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_USE_EXT] = $enc; + } + } else { + $a[self::FIELD_USE] = $v; + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRClaimResponse.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRClaimResponse.php index d3027ca0ea..e8d26f68db 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRClaimResponse.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRClaimResponse.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -92,10 +92,6 @@ class FHIRClaimResponse extends FHIRDomainResource implements PHPFHIRContainedTy { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CLAIM_RESPONSE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ADD_ITEM = 'addItem'; const FIELD_COVERAGE = 'coverage'; const FIELD_CREATED = 'created'; @@ -114,8 +110,10 @@ class FHIRClaimResponse extends FHIRDomainResource implements PHPFHIRContainedTy const FIELD_OUTCOME_EXT = '_outcome'; const FIELD_PAYEE_TYPE = 'payeeType'; const FIELD_PAYMENT_ADJUSTMENT = 'paymentAdjustment'; + const FIELD_PAYMENT_ADJUSTMENT_EXT = '_paymentAdjustment'; const FIELD_PAYMENT_ADJUSTMENT_REASON = 'paymentAdjustmentReason'; const FIELD_PAYMENT_AMOUNT = 'paymentAmount'; + const FIELD_PAYMENT_AMOUNT_EXT = '_paymentAmount'; const FIELD_PAYMENT_DATE = 'paymentDate'; const FIELD_PAYMENT_DATE_EXT = '_paymentDate'; const FIELD_PAYMENT_REF = 'paymentRef'; @@ -126,8 +124,11 @@ class FHIRClaimResponse extends FHIRDomainResource implements PHPFHIRContainedTy const FIELD_RESERVED = 'reserved'; const FIELD_RULESET = 'ruleset'; const FIELD_TOTAL_BENEFIT = 'totalBenefit'; + const FIELD_TOTAL_BENEFIT_EXT = '_totalBenefit'; const FIELD_TOTAL_COST = 'totalCost'; + const FIELD_TOTAL_COST_EXT = '_totalCost'; const FIELD_UNALLOC_DEDUCTABLE = 'unallocDeductable'; + const FIELD_UNALLOC_DEDUCTABLE_EXT = '_unallocDeductable'; /** * This resource provides the adjudication details from the processing of a Claim @@ -400,6 +401,9 @@ class FHIRClaimResponse extends FHIRDomainResource implements PHPFHIRContainedTy */ protected $unallocDeductable = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRClaimResponse Constructor * @param null|array $data @@ -419,6 +423,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ADD_ITEM])) { if (is_array($data[self::FIELD_ADD_ITEM])) { foreach($data[self::FIELD_ADD_ITEM] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRClaimResponseAddItem) { $this->addAddItem($v); } else { @@ -434,6 +441,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_COVERAGE])) { if (is_array($data[self::FIELD_COVERAGE])) { foreach($data[self::FIELD_COVERAGE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRClaimResponseCoverage) { $this->addCoverage($v); } else { @@ -452,8 +462,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CREATED] instanceof FHIRDateTime) { $this->setCreated($data[self::FIELD_CREATED]); - } elseif ($ext && is_scalar($data[self::FIELD_CREATED])) { - $this->setCreated(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_CREATED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CREATED])) { + $this->setCreated(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_CREATED]] + $ext)); + } else if (is_array($data[self::FIELD_CREATED])) { + $this->setCreated(new FHIRDateTime(array_merge($ext, $data[self::FIELD_CREATED]))); + } } else { $this->setCreated(new FHIRDateTime($data[self::FIELD_CREATED])); } @@ -464,8 +478,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DISPOSITION] instanceof FHIRString) { $this->setDisposition($data[self::FIELD_DISPOSITION]); - } elseif ($ext && is_scalar($data[self::FIELD_DISPOSITION])) { - $this->setDisposition(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DISPOSITION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DISPOSITION])) { + $this->setDisposition(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DISPOSITION]] + $ext)); + } else if (is_array($data[self::FIELD_DISPOSITION])) { + $this->setDisposition(new FHIRString(array_merge($ext, $data[self::FIELD_DISPOSITION]))); + } } else { $this->setDisposition(new FHIRString($data[self::FIELD_DISPOSITION])); } @@ -473,6 +491,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ERROR])) { if (is_array($data[self::FIELD_ERROR])) { foreach($data[self::FIELD_ERROR] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRClaimResponseError) { $this->addError($v); } else { @@ -498,17 +519,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -517,6 +545,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ITEM])) { if (is_array($data[self::FIELD_ITEM])) { foreach($data[self::FIELD_ITEM] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRClaimResponseItem) { $this->addItem($v); } else { @@ -532,6 +563,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_NOTE])) { if (is_array($data[self::FIELD_NOTE])) { foreach($data[self::FIELD_NOTE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRClaimResponseNote) { $this->addNote($v); } else { @@ -564,8 +598,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_OUTCOME] instanceof FHIRCode) { $this->setOutcome($data[self::FIELD_OUTCOME]); - } elseif ($ext && is_scalar($data[self::FIELD_OUTCOME])) { - $this->setOutcome(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_OUTCOME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_OUTCOME])) { + $this->setOutcome(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_OUTCOME]] + $ext)); + } else if (is_array($data[self::FIELD_OUTCOME])) { + $this->setOutcome(new FHIRCode(array_merge($ext, $data[self::FIELD_OUTCOME]))); + } } else { $this->setOutcome(new FHIRCode($data[self::FIELD_OUTCOME])); } @@ -578,8 +616,17 @@ public function __construct($data = null) } } if (isset($data[self::FIELD_PAYMENT_ADJUSTMENT])) { + $ext = (isset($data[self::FIELD_PAYMENT_ADJUSTMENT_EXT]) && is_array($data[self::FIELD_PAYMENT_ADJUSTMENT_EXT])) + ? $data[self::FIELD_PAYMENT_ADJUSTMENT_EXT] + : null; if ($data[self::FIELD_PAYMENT_ADJUSTMENT] instanceof FHIRMoney) { $this->setPaymentAdjustment($data[self::FIELD_PAYMENT_ADJUSTMENT]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PAYMENT_ADJUSTMENT])) { + $this->setPaymentAdjustment(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_PAYMENT_ADJUSTMENT]] + $ext)); + } else if (is_array($data[self::FIELD_PAYMENT_ADJUSTMENT])) { + $this->setPaymentAdjustment(new FHIRMoney(array_merge($ext, $data[self::FIELD_PAYMENT_ADJUSTMENT]))); + } } else { $this->setPaymentAdjustment(new FHIRMoney($data[self::FIELD_PAYMENT_ADJUSTMENT])); } @@ -592,8 +639,17 @@ public function __construct($data = null) } } if (isset($data[self::FIELD_PAYMENT_AMOUNT])) { + $ext = (isset($data[self::FIELD_PAYMENT_AMOUNT_EXT]) && is_array($data[self::FIELD_PAYMENT_AMOUNT_EXT])) + ? $data[self::FIELD_PAYMENT_AMOUNT_EXT] + : null; if ($data[self::FIELD_PAYMENT_AMOUNT] instanceof FHIRMoney) { $this->setPaymentAmount($data[self::FIELD_PAYMENT_AMOUNT]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PAYMENT_AMOUNT])) { + $this->setPaymentAmount(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_PAYMENT_AMOUNT]] + $ext)); + } else if (is_array($data[self::FIELD_PAYMENT_AMOUNT])) { + $this->setPaymentAmount(new FHIRMoney(array_merge($ext, $data[self::FIELD_PAYMENT_AMOUNT]))); + } } else { $this->setPaymentAmount(new FHIRMoney($data[self::FIELD_PAYMENT_AMOUNT])); } @@ -604,8 +660,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PAYMENT_DATE] instanceof FHIRDate) { $this->setPaymentDate($data[self::FIELD_PAYMENT_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_PAYMENT_DATE])) { - $this->setPaymentDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_PAYMENT_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PAYMENT_DATE])) { + $this->setPaymentDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_PAYMENT_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_PAYMENT_DATE])) { + $this->setPaymentDate(new FHIRDate(array_merge($ext, $data[self::FIELD_PAYMENT_DATE]))); + } } else { $this->setPaymentDate(new FHIRDate($data[self::FIELD_PAYMENT_DATE])); } @@ -616,8 +676,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PAYMENT_REF] instanceof FHIRIdentifier) { $this->setPaymentRef($data[self::FIELD_PAYMENT_REF]); - } elseif ($ext && is_scalar($data[self::FIELD_PAYMENT_REF])) { - $this->setPaymentRef(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_PAYMENT_REF]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PAYMENT_REF])) { + $this->setPaymentRef(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_PAYMENT_REF]] + $ext)); + } else if (is_array($data[self::FIELD_PAYMENT_REF])) { + $this->setPaymentRef(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_PAYMENT_REF]))); + } } else { $this->setPaymentRef(new FHIRIdentifier($data[self::FIELD_PAYMENT_REF])); } @@ -658,22 +722,49 @@ public function __construct($data = null) } } if (isset($data[self::FIELD_TOTAL_BENEFIT])) { + $ext = (isset($data[self::FIELD_TOTAL_BENEFIT_EXT]) && is_array($data[self::FIELD_TOTAL_BENEFIT_EXT])) + ? $data[self::FIELD_TOTAL_BENEFIT_EXT] + : null; if ($data[self::FIELD_TOTAL_BENEFIT] instanceof FHIRMoney) { $this->setTotalBenefit($data[self::FIELD_TOTAL_BENEFIT]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TOTAL_BENEFIT])) { + $this->setTotalBenefit(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_TOTAL_BENEFIT]] + $ext)); + } else if (is_array($data[self::FIELD_TOTAL_BENEFIT])) { + $this->setTotalBenefit(new FHIRMoney(array_merge($ext, $data[self::FIELD_TOTAL_BENEFIT]))); + } } else { $this->setTotalBenefit(new FHIRMoney($data[self::FIELD_TOTAL_BENEFIT])); } } if (isset($data[self::FIELD_TOTAL_COST])) { + $ext = (isset($data[self::FIELD_TOTAL_COST_EXT]) && is_array($data[self::FIELD_TOTAL_COST_EXT])) + ? $data[self::FIELD_TOTAL_COST_EXT] + : null; if ($data[self::FIELD_TOTAL_COST] instanceof FHIRMoney) { $this->setTotalCost($data[self::FIELD_TOTAL_COST]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TOTAL_COST])) { + $this->setTotalCost(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_TOTAL_COST]] + $ext)); + } else if (is_array($data[self::FIELD_TOTAL_COST])) { + $this->setTotalCost(new FHIRMoney(array_merge($ext, $data[self::FIELD_TOTAL_COST]))); + } } else { $this->setTotalCost(new FHIRMoney($data[self::FIELD_TOTAL_COST])); } } if (isset($data[self::FIELD_UNALLOC_DEDUCTABLE])) { + $ext = (isset($data[self::FIELD_UNALLOC_DEDUCTABLE_EXT]) && is_array($data[self::FIELD_UNALLOC_DEDUCTABLE_EXT])) + ? $data[self::FIELD_UNALLOC_DEDUCTABLE_EXT] + : null; if ($data[self::FIELD_UNALLOC_DEDUCTABLE] instanceof FHIRMoney) { $this->setUnallocDeductable($data[self::FIELD_UNALLOC_DEDUCTABLE]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_UNALLOC_DEDUCTABLE])) { + $this->setUnallocDeductable(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_UNALLOC_DEDUCTABLE]] + $ext)); + } else if (is_array($data[self::FIELD_UNALLOC_DEDUCTABLE])) { + $this->setUnallocDeductable(new FHIRMoney(array_merge($ext, $data[self::FIELD_UNALLOC_DEDUCTABLE]))); + } } else { $this->setUnallocDeductable(new FHIRMoney($data[self::FIELD_UNALLOC_DEDUCTABLE])); } @@ -1822,7 +1913,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getAddItem())) { foreach($vs as $v) { if (null === $v) { @@ -1840,13 +1930,13 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_COVERAGE, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getCreated())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CREATED, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getDisposition())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DISPOSITION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getError())) { foreach($vs as $v) { if (null === $v) { @@ -1859,7 +1949,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getForm())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FORM, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -1890,65 +1979,51 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getOrganization())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ORGANIZATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOriginalRuleset())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ORIGINAL_RULESET, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getOutcome())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OUTCOME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPayeeType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PAYEE_TYPE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPaymentAdjustment())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PAYMENT_ADJUSTMENT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPaymentAdjustmentReason())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PAYMENT_ADJUSTMENT_REASON, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPaymentAmount())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PAYMENT_AMOUNT, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getPaymentDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PAYMENT_DATE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPaymentRef())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PAYMENT_REF, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRequest())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REQUEST, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRequestOrganization())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REQUEST_ORGANIZATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRequestProvider())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REQUEST_PROVIDER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getReserved())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RESERVED, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRuleset())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RULESET, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getTotalBenefit())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TOTAL_BENEFIT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getTotalCost())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TOTAL_COST, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getUnallocDeductable())) { $v->xmlSerialize($sxe->addChild(self::FIELD_UNALLOC_DEDUCTABLE, null, $v->_getFHIRXMLNamespace())); } @@ -1968,12 +2043,26 @@ public function jsonSerialize() $a[self::FIELD_COVERAGE] = $vs; } if (null !== ($v = $this->getCreated())) { - $a[self::FIELD_CREATED] = $v->getValue(); - $a[self::FIELD_CREATED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CREATED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CREATED_EXT] = $enc; + } + } else { + $a[self::FIELD_CREATED] = $v; + } } if (null !== ($v = $this->getDisposition())) { - $a[self::FIELD_DISPOSITION] = $v->getValue(); - $a[self::FIELD_DISPOSITION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DISPOSITION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DISPOSITION_EXT] = $enc; + } + } else { + $a[self::FIELD_DISPOSITION] = $v; + } } if ([] !== ($vs = $this->getError())) { $a[self::FIELD_ERROR] = $vs; @@ -1982,7 +2071,23 @@ public function jsonSerialize() $a[self::FIELD_FORM] = $v; } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if ([] !== ($vs = $this->getItem())) { $a[self::FIELD_ITEM] = $vs; @@ -1997,27 +2102,65 @@ public function jsonSerialize() $a[self::FIELD_ORIGINAL_RULESET] = $v; } if (null !== ($v = $this->getOutcome())) { - $a[self::FIELD_OUTCOME] = $v->getValue(); - $a[self::FIELD_OUTCOME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_OUTCOME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_OUTCOME_EXT] = $enc; + } + } else { + $a[self::FIELD_OUTCOME] = $v; + } } if (null !== ($v = $this->getPayeeType())) { $a[self::FIELD_PAYEE_TYPE] = $v; } if (null !== ($v = $this->getPaymentAdjustment())) { - $a[self::FIELD_PAYMENT_ADJUSTMENT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PAYMENT_ADJUSTMENT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PAYMENT_ADJUSTMENT_EXT] = $enc; + } + } else { + $a[self::FIELD_PAYMENT_ADJUSTMENT] = $v; + } } if (null !== ($v = $this->getPaymentAdjustmentReason())) { $a[self::FIELD_PAYMENT_ADJUSTMENT_REASON] = $v; } if (null !== ($v = $this->getPaymentAmount())) { - $a[self::FIELD_PAYMENT_AMOUNT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PAYMENT_AMOUNT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PAYMENT_AMOUNT_EXT] = $enc; + } + } else { + $a[self::FIELD_PAYMENT_AMOUNT] = $v; + } } if (null !== ($v = $this->getPaymentDate())) { - $a[self::FIELD_PAYMENT_DATE] = $v->getValue(); - $a[self::FIELD_PAYMENT_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PAYMENT_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PAYMENT_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_PAYMENT_DATE] = $v; + } } if (null !== ($v = $this->getPaymentRef())) { - $a[self::FIELD_PAYMENT_REF] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PAYMENT_REF] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PAYMENT_REF_EXT] = $enc; + } + } else { + $a[self::FIELD_PAYMENT_REF] = $v; + } } if (null !== ($v = $this->getRequest())) { $a[self::FIELD_REQUEST] = $v; @@ -2035,13 +2178,37 @@ public function jsonSerialize() $a[self::FIELD_RULESET] = $v; } if (null !== ($v = $this->getTotalBenefit())) { - $a[self::FIELD_TOTAL_BENEFIT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TOTAL_BENEFIT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TOTAL_BENEFIT_EXT] = $enc; + } + } else { + $a[self::FIELD_TOTAL_BENEFIT] = $v; + } } if (null !== ($v = $this->getTotalCost())) { - $a[self::FIELD_TOTAL_COST] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TOTAL_COST] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TOTAL_COST_EXT] = $enc; + } + } else { + $a[self::FIELD_TOTAL_COST] = $v; + } } if (null !== ($v = $this->getUnallocDeductable())) { - $a[self::FIELD_UNALLOC_DEDUCTABLE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_UNALLOC_DEDUCTABLE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_UNALLOC_DEDUCTABLE_EXT] = $enc; + } + } else { + $a[self::FIELD_UNALLOC_DEDUCTABLE] = $v; + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRClinicalImpression.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRClinicalImpression.php index ac152b47ad..a50f33272a 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRClinicalImpression.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRClinicalImpression.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -93,10 +93,6 @@ class FHIRClinicalImpression extends FHIRDomainResource implements PHPFHIRContai { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CLINICAL_IMPRESSION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ACTION = 'action'; const FIELD_ASSESSOR = 'assessor'; const FIELD_DATE = 'date'; @@ -349,6 +345,9 @@ class FHIRClinicalImpression extends FHIRDomainResource implements PHPFHIRContai */ protected $triggerReference = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRClinicalImpression Constructor * @param null|array $data @@ -368,6 +367,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ACTION])) { if (is_array($data[self::FIELD_ACTION])) { foreach($data[self::FIELD_ACTION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addAction($v); } else { @@ -393,8 +395,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATE] instanceof FHIRDateTime) { $this->setDate($data[self::FIELD_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_DATE])) { - $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime(array_merge($ext, $data[self::FIELD_DATE]))); + } } else { $this->setDate(new FHIRDateTime($data[self::FIELD_DATE])); } @@ -405,8 +411,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -414,6 +424,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_FINDING])) { if (is_array($data[self::FIELD_FINDING])) { foreach($data[self::FIELD_FINDING] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRClinicalImpressionFinding) { $this->addFinding($v); } else { @@ -429,6 +442,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_INVESTIGATIONS])) { if (is_array($data[self::FIELD_INVESTIGATIONS])) { foreach($data[self::FIELD_INVESTIGATIONS] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRClinicalImpressionInvestigations) { $this->addInvestigations($v); } else { @@ -451,6 +467,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PLAN])) { if (is_array($data[self::FIELD_PLAN])) { foreach($data[self::FIELD_PLAN] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addPlan($v); } else { @@ -473,6 +492,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PROBLEM])) { if (is_array($data[self::FIELD_PROBLEM])) { foreach($data[self::FIELD_PROBLEM] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addProblem($v); } else { @@ -491,8 +513,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PROGNOSIS] instanceof FHIRString) { $this->setPrognosis($data[self::FIELD_PROGNOSIS]); - } elseif ($ext && is_scalar($data[self::FIELD_PROGNOSIS])) { - $this->setPrognosis(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PROGNOSIS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PROGNOSIS])) { + $this->setPrognosis(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PROGNOSIS]] + $ext)); + } else if (is_array($data[self::FIELD_PROGNOSIS])) { + $this->setPrognosis(new FHIRString(array_merge($ext, $data[self::FIELD_PROGNOSIS]))); + } } else { $this->setPrognosis(new FHIRString($data[self::FIELD_PROGNOSIS])); } @@ -503,8 +529,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PROTOCOL] instanceof FHIRUri) { $this->setProtocol($data[self::FIELD_PROTOCOL]); - } elseif ($ext && is_scalar($data[self::FIELD_PROTOCOL])) { - $this->setProtocol(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_PROTOCOL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PROTOCOL])) { + $this->setProtocol(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_PROTOCOL]] + $ext)); + } else if (is_array($data[self::FIELD_PROTOCOL])) { + $this->setProtocol(new FHIRUri(array_merge($ext, $data[self::FIELD_PROTOCOL]))); + } } else { $this->setProtocol(new FHIRUri($data[self::FIELD_PROTOCOL])); } @@ -512,6 +542,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_RESOLVED])) { if (is_array($data[self::FIELD_RESOLVED])) { foreach($data[self::FIELD_RESOLVED] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addResolved($v); } else { @@ -527,6 +560,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_RULED_OUT])) { if (is_array($data[self::FIELD_RULED_OUT])) { foreach($data[self::FIELD_RULED_OUT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRClinicalImpressionRuledOut) { $this->addRuledOut($v); } else { @@ -545,8 +581,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRClinicalImpressionStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRClinicalImpressionStatus([FHIRClinicalImpressionStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRClinicalImpressionStatus([FHIRClinicalImpressionStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRClinicalImpressionStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRClinicalImpressionStatus($data[self::FIELD_STATUS])); } @@ -557,8 +597,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SUMMARY] instanceof FHIRString) { $this->setSummary($data[self::FIELD_SUMMARY]); - } elseif ($ext && is_scalar($data[self::FIELD_SUMMARY])) { - $this->setSummary(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SUMMARY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SUMMARY])) { + $this->setSummary(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SUMMARY]] + $ext)); + } else if (is_array($data[self::FIELD_SUMMARY])) { + $this->setSummary(new FHIRString(array_merge($ext, $data[self::FIELD_SUMMARY]))); + } } else { $this->setSummary(new FHIRString($data[self::FIELD_SUMMARY])); } @@ -1607,7 +1651,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getAction())) { foreach($vs as $v) { if (null === $v) { @@ -1626,7 +1669,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESCRIPTION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getFinding())) { foreach($vs as $v) { if (null === $v) { @@ -1648,7 +1690,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getPatient())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATIENT, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getPlan())) { foreach($vs as $v) { if (null === $v) { @@ -1661,7 +1702,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getPrevious())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PREVIOUS, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getProblem())) { foreach($vs as $v) { if (null === $v) { @@ -1670,13 +1710,13 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_PROBLEM, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getPrognosis())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PROGNOSIS, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getProtocol())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PROTOCOL, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getResolved())) { foreach($vs as $v) { if (null === $v) { @@ -1701,11 +1741,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getSummary())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUMMARY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getTriggerCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TRIGGER_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getTriggerReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TRIGGER_REFERENCE, null, $v->_getFHIRXMLNamespace())); } @@ -1725,12 +1763,26 @@ public function jsonSerialize() $a[self::FIELD_ASSESSOR] = $v; } if (null !== ($v = $this->getDate())) { - $a[self::FIELD_DATE] = $v->getValue(); - $a[self::FIELD_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_DATE] = $v; + } } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if ([] !== ($vs = $this->getFinding())) { $a[self::FIELD_FINDING] = $vs; @@ -1751,12 +1803,26 @@ public function jsonSerialize() $a[self::FIELD_PROBLEM] = $vs; } if (null !== ($v = $this->getPrognosis())) { - $a[self::FIELD_PROGNOSIS] = $v->getValue(); - $a[self::FIELD_PROGNOSIS_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PROGNOSIS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PROGNOSIS_EXT] = $enc; + } + } else { + $a[self::FIELD_PROGNOSIS] = $v; + } } if (null !== ($v = $this->getProtocol())) { - $a[self::FIELD_PROTOCOL] = $v->getValue(); - $a[self::FIELD_PROTOCOL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PROTOCOL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PROTOCOL_EXT] = $enc; + } + } else { + $a[self::FIELD_PROTOCOL] = $v; + } } if ([] !== ($vs = $this->getResolved())) { $a[self::FIELD_RESOLVED] = $vs; @@ -1765,11 +1831,26 @@ public function jsonSerialize() $a[self::FIELD_RULED_OUT] = $vs; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getSummary())) { - $a[self::FIELD_SUMMARY] = $v->getValue(); - $a[self::FIELD_SUMMARY_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SUMMARY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SUMMARY_EXT] = $enc; + } + } else { + $a[self::FIELD_SUMMARY] = $v; + } } if (null !== ($v = $this->getTriggerCodeableConcept())) { $a[self::FIELD_TRIGGER_CODEABLE_CONCEPT] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRCommunication.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRCommunication.php index 98c90491e0..3666c4b90d 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRCommunication.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRCommunication.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -86,10 +86,6 @@ class FHIRCommunication extends FHIRDomainResource implements PHPFHIRContainedTy { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_COMMUNICATION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CATEGORY = 'category'; const FIELD_ENCOUNTER = 'encounter'; const FIELD_IDENTIFIER = 'identifier'; @@ -269,6 +265,9 @@ class FHIRCommunication extends FHIRDomainResource implements PHPFHIRContainedTy */ protected $subject = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRCommunication Constructor * @param null|array $data @@ -305,17 +304,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -324,6 +330,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_MEDIUM])) { if (is_array($data[self::FIELD_MEDIUM])) { foreach($data[self::FIELD_MEDIUM] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addMedium($v); } else { @@ -339,6 +348,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PAYLOAD])) { if (is_array($data[self::FIELD_PAYLOAD])) { foreach($data[self::FIELD_PAYLOAD] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCommunicationPayload) { $this->addPayload($v); } else { @@ -354,6 +366,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REASON])) { if (is_array($data[self::FIELD_REASON])) { foreach($data[self::FIELD_REASON] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addReason($v); } else { @@ -372,8 +387,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_RECEIVED] instanceof FHIRDateTime) { $this->setReceived($data[self::FIELD_RECEIVED]); - } elseif ($ext && is_scalar($data[self::FIELD_RECEIVED])) { - $this->setReceived(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_RECEIVED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_RECEIVED])) { + $this->setReceived(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_RECEIVED]] + $ext)); + } else if (is_array($data[self::FIELD_RECEIVED])) { + $this->setReceived(new FHIRDateTime(array_merge($ext, $data[self::FIELD_RECEIVED]))); + } } else { $this->setReceived(new FHIRDateTime($data[self::FIELD_RECEIVED])); } @@ -381,6 +400,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_RECIPIENT])) { if (is_array($data[self::FIELD_RECIPIENT])) { foreach($data[self::FIELD_RECIPIENT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addRecipient($v); } else { @@ -413,8 +435,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SENT] instanceof FHIRDateTime) { $this->setSent($data[self::FIELD_SENT]); - } elseif ($ext && is_scalar($data[self::FIELD_SENT])) { - $this->setSent(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_SENT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SENT])) { + $this->setSent(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_SENT]] + $ext)); + } else if (is_array($data[self::FIELD_SENT])) { + $this->setSent(new FHIRDateTime(array_merge($ext, $data[self::FIELD_SENT]))); + } } else { $this->setSent(new FHIRDateTime($data[self::FIELD_SENT])); } @@ -425,8 +451,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRCommunicationStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRCommunicationStatus([FHIRCommunicationStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRCommunicationStatus([FHIRCommunicationStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRCommunicationStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRCommunicationStatus($data[self::FIELD_STATUS])); } @@ -1184,15 +1214,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getCategory())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CATEGORY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getEncounter())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ENCOUNTER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -1228,10 +1255,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_REASON, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getReceived())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RECEIVED, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getRecipient())) { foreach($vs as $v) { if (null === $v) { @@ -1244,18 +1271,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getRequestDetail())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REQUEST_DETAIL, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSender())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SENDER, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getSent())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SENT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSubject())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBJECT, null, $v->_getFHIRXMLNamespace())); } @@ -1275,7 +1299,23 @@ public function jsonSerialize() $a[self::FIELD_ENCOUNTER] = $v; } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if ([] !== ($vs = $this->getMedium())) { $a[self::FIELD_MEDIUM] = $vs; @@ -1287,8 +1327,15 @@ public function jsonSerialize() $a[self::FIELD_REASON] = $vs; } if (null !== ($v = $this->getReceived())) { - $a[self::FIELD_RECEIVED] = $v->getValue(); - $a[self::FIELD_RECEIVED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_RECEIVED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_RECEIVED_EXT] = $enc; + } + } else { + $a[self::FIELD_RECEIVED] = $v; + } } if ([] !== ($vs = $this->getRecipient())) { $a[self::FIELD_RECIPIENT] = $vs; @@ -1300,11 +1347,26 @@ public function jsonSerialize() $a[self::FIELD_SENDER] = $v; } if (null !== ($v = $this->getSent())) { - $a[self::FIELD_SENT] = $v->getValue(); - $a[self::FIELD_SENT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SENT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SENT_EXT] = $enc; + } + } else { + $a[self::FIELD_SENT] = $v; + } } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getSubject())) { $a[self::FIELD_SUBJECT] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRCommunicationRequest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRCommunicationRequest.php index 58138ea508..27919be0f4 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRCommunicationRequest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRCommunicationRequest.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -87,10 +87,6 @@ class FHIRCommunicationRequest extends FHIRDomainResource implements PHPFHIRCont { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_COMMUNICATION_REQUEST; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CATEGORY = 'category'; const FIELD_ENCOUNTER = 'encounter'; const FIELD_IDENTIFIER = 'identifier'; @@ -293,6 +289,9 @@ class FHIRCommunicationRequest extends FHIRDomainResource implements PHPFHIRCont */ protected $subject = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRCommunicationRequest Constructor * @param null|array $data @@ -329,17 +328,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -348,6 +354,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_MEDIUM])) { if (is_array($data[self::FIELD_MEDIUM])) { foreach($data[self::FIELD_MEDIUM] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addMedium($v); } else { @@ -363,6 +372,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PAYLOAD])) { if (is_array($data[self::FIELD_PAYLOAD])) { foreach($data[self::FIELD_PAYLOAD] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCommunicationRequestPayload) { $this->addPayload($v); } else { @@ -385,6 +397,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REASON])) { if (is_array($data[self::FIELD_REASON])) { foreach($data[self::FIELD_REASON] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addReason($v); } else { @@ -400,6 +415,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_RECIPIENT])) { if (is_array($data[self::FIELD_RECIPIENT])) { foreach($data[self::FIELD_RECIPIENT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addRecipient($v); } else { @@ -418,8 +436,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_REQUESTED_ON] instanceof FHIRDateTime) { $this->setRequestedOn($data[self::FIELD_REQUESTED_ON]); - } elseif ($ext && is_scalar($data[self::FIELD_REQUESTED_ON])) { - $this->setRequestedOn(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_REQUESTED_ON]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_REQUESTED_ON])) { + $this->setRequestedOn(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_REQUESTED_ON]] + $ext)); + } else if (is_array($data[self::FIELD_REQUESTED_ON])) { + $this->setRequestedOn(new FHIRDateTime(array_merge($ext, $data[self::FIELD_REQUESTED_ON]))); + } } else { $this->setRequestedOn(new FHIRDateTime($data[self::FIELD_REQUESTED_ON])); } @@ -437,8 +459,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SCHEDULED_DATE_TIME] instanceof FHIRDateTime) { $this->setScheduledDateTime($data[self::FIELD_SCHEDULED_DATE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_SCHEDULED_DATE_TIME])) { - $this->setScheduledDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_SCHEDULED_DATE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SCHEDULED_DATE_TIME])) { + $this->setScheduledDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_SCHEDULED_DATE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_SCHEDULED_DATE_TIME])) { + $this->setScheduledDateTime(new FHIRDateTime(array_merge($ext, $data[self::FIELD_SCHEDULED_DATE_TIME]))); + } } else { $this->setScheduledDateTime(new FHIRDateTime($data[self::FIELD_SCHEDULED_DATE_TIME])); } @@ -463,8 +489,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRCommunicationRequestStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRCommunicationRequestStatus([FHIRCommunicationRequestStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRCommunicationRequestStatus([FHIRCommunicationRequestStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRCommunicationRequestStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRCommunicationRequestStatus($data[self::FIELD_STATUS])); } @@ -1281,15 +1311,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getCategory())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CATEGORY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getEncounter())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ENCOUNTER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -1320,7 +1347,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getPriority())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PRIORITY, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getReason())) { foreach($vs as $v) { if (null === $v) { @@ -1338,29 +1364,25 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_RECIPIENT, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getRequestedOn())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REQUESTED_ON, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRequester())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REQUESTER, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getScheduledDateTime())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SCHEDULED_DATE_TIME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getScheduledPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SCHEDULED_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSender())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SENDER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSubject())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBJECT, null, $v->_getFHIRXMLNamespace())); } @@ -1380,7 +1402,23 @@ public function jsonSerialize() $a[self::FIELD_ENCOUNTER] = $v; } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if ([] !== ($vs = $this->getMedium())) { $a[self::FIELD_MEDIUM] = $vs; @@ -1398,15 +1436,29 @@ public function jsonSerialize() $a[self::FIELD_RECIPIENT] = $vs; } if (null !== ($v = $this->getRequestedOn())) { - $a[self::FIELD_REQUESTED_ON] = $v->getValue(); - $a[self::FIELD_REQUESTED_ON_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_REQUESTED_ON] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_REQUESTED_ON_EXT] = $enc; + } + } else { + $a[self::FIELD_REQUESTED_ON] = $v; + } } if (null !== ($v = $this->getRequester())) { $a[self::FIELD_REQUESTER] = $v; } if (null !== ($v = $this->getScheduledDateTime())) { - $a[self::FIELD_SCHEDULED_DATE_TIME] = $v->getValue(); - $a[self::FIELD_SCHEDULED_DATE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SCHEDULED_DATE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SCHEDULED_DATE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_SCHEDULED_DATE_TIME] = $v; + } } if (null !== ($v = $this->getScheduledPeriod())) { $a[self::FIELD_SCHEDULED_PERIOD] = $v; @@ -1415,7 +1467,15 @@ public function jsonSerialize() $a[self::FIELD_SENDER] = $v; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getSubject())) { $a[self::FIELD_SUBJECT] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRComposition.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRComposition.php index b498978036..41fd124fc8 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRComposition.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRComposition.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -93,10 +93,6 @@ class FHIRComposition extends FHIRDomainResource implements PHPFHIRContainedType { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_COMPOSITION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ATTESTER = 'attester'; const FIELD_AUTHOR = 'author'; const FIELD_CLASS = 'class'; @@ -299,6 +295,9 @@ class FHIRComposition extends FHIRDomainResource implements PHPFHIRContainedType */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRComposition Constructor * @param null|array $data @@ -318,6 +317,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ATTESTER])) { if (is_array($data[self::FIELD_ATTESTER])) { foreach($data[self::FIELD_ATTESTER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCompositionAttester) { $this->addAttester($v); } else { @@ -333,6 +335,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_AUTHOR])) { if (is_array($data[self::FIELD_AUTHOR])) { foreach($data[self::FIELD_AUTHOR] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addAuthor($v); } else { @@ -358,8 +363,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CONFIDENTIALITY] instanceof FHIRCode) { $this->setConfidentiality($data[self::FIELD_CONFIDENTIALITY]); - } elseif ($ext && is_scalar($data[self::FIELD_CONFIDENTIALITY])) { - $this->setConfidentiality(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_CONFIDENTIALITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CONFIDENTIALITY])) { + $this->setConfidentiality(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_CONFIDENTIALITY]] + $ext)); + } else if (is_array($data[self::FIELD_CONFIDENTIALITY])) { + $this->setConfidentiality(new FHIRCode(array_merge($ext, $data[self::FIELD_CONFIDENTIALITY]))); + } } else { $this->setConfidentiality(new FHIRCode($data[self::FIELD_CONFIDENTIALITY])); } @@ -377,8 +386,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATE] instanceof FHIRDateTime) { $this->setDate($data[self::FIELD_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_DATE])) { - $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime(array_merge($ext, $data[self::FIELD_DATE]))); + } } else { $this->setDate(new FHIRDateTime($data[self::FIELD_DATE])); } @@ -393,6 +406,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_EVENT])) { if (is_array($data[self::FIELD_EVENT])) { foreach($data[self::FIELD_EVENT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCompositionEvent) { $this->addEvent($v); } else { @@ -411,8 +427,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->setIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { - $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_IDENTIFIER]))); + } } else { $this->setIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); } @@ -420,6 +440,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SECTION])) { if (is_array($data[self::FIELD_SECTION])) { foreach($data[self::FIELD_SECTION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCompositionSection) { $this->addSection($v); } else { @@ -438,8 +461,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRCompositionStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRCompositionStatus([FHIRCompositionStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRCompositionStatus([FHIRCompositionStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRCompositionStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRCompositionStatus($data[self::FIELD_STATUS])); } @@ -457,8 +484,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TITLE] instanceof FHIRString) { $this->setTitle($data[self::FIELD_TITLE]); - } elseif ($ext && is_scalar($data[self::FIELD_TITLE])) { - $this->setTitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TITLE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TITLE])) { + $this->setTitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TITLE]] + $ext)); + } else if (is_array($data[self::FIELD_TITLE])) { + $this->setTitle(new FHIRString(array_merge($ext, $data[self::FIELD_TITLE]))); + } } else { $this->setTitle(new FHIRString($data[self::FIELD_TITLE])); } @@ -1253,7 +1284,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getAttester())) { foreach($vs as $v) { if (null === $v) { @@ -1278,18 +1308,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getConfidentiality())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CONFIDENTIALITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getCustodian())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CUSTODIAN, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DATE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getEncounter())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ENCOUNTER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getEvent())) { foreach($vs as $v) { if (null === $v) { @@ -1302,7 +1329,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getSection())) { foreach($vs as $v) { if (null === $v) { @@ -1315,14 +1341,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSubject())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBJECT, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getTitle())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TITLE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -1345,15 +1369,29 @@ public function jsonSerialize() $a[self::FIELD_CLASS] = $v; } if (null !== ($v = $this->getConfidentiality())) { - $a[self::FIELD_CONFIDENTIALITY] = $v->getValue(); - $a[self::FIELD_CONFIDENTIALITY_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CONFIDENTIALITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CONFIDENTIALITY_EXT] = $enc; + } + } else { + $a[self::FIELD_CONFIDENTIALITY] = $v; + } } if (null !== ($v = $this->getCustodian())) { $a[self::FIELD_CUSTODIAN] = $v; } if (null !== ($v = $this->getDate())) { - $a[self::FIELD_DATE] = $v->getValue(); - $a[self::FIELD_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_DATE] = $v; + } } if (null !== ($v = $this->getEncounter())) { $a[self::FIELD_ENCOUNTER] = $v; @@ -1362,20 +1400,43 @@ public function jsonSerialize() $a[self::FIELD_EVENT] = $vs; } if (null !== ($v = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_IDENTIFIER] = $v; + } } if ([] !== ($vs = $this->getSection())) { $a[self::FIELD_SECTION] = $vs; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getSubject())) { $a[self::FIELD_SUBJECT] = $v; } if (null !== ($v = $this->getTitle())) { - $a[self::FIELD_TITLE] = $v->getValue(); - $a[self::FIELD_TITLE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TITLE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TITLE_EXT] = $enc; + } + } else { + $a[self::FIELD_TITLE] = $v; + } } if (null !== ($v = $this->getType())) { $a[self::FIELD_TYPE] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRConceptMap.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRConceptMap.php index aa569bb799..06082b98b4 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRConceptMap.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRConceptMap.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -89,10 +89,6 @@ class FHIRConceptMap extends FHIRDomainResource implements PHPFHIRContainedTypeI { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONCEPT_MAP; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CONTACT = 'contact'; const FIELD_COPYRIGHT = 'copyright'; const FIELD_COPYRIGHT_EXT = '_copyright'; @@ -347,6 +343,9 @@ class FHIRConceptMap extends FHIRDomainResource implements PHPFHIRContainedTypeI */ protected $version = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRConceptMap Constructor * @param null|array $data @@ -366,6 +365,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CONTACT])) { if (is_array($data[self::FIELD_CONTACT])) { foreach($data[self::FIELD_CONTACT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRConceptMapContact) { $this->addContact($v); } else { @@ -384,8 +386,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_COPYRIGHT] instanceof FHIRString) { $this->setCopyright($data[self::FIELD_COPYRIGHT]); - } elseif ($ext && is_scalar($data[self::FIELD_COPYRIGHT])) { - $this->setCopyright(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_COPYRIGHT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_COPYRIGHT])) { + $this->setCopyright(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_COPYRIGHT]] + $ext)); + } else if (is_array($data[self::FIELD_COPYRIGHT])) { + $this->setCopyright(new FHIRString(array_merge($ext, $data[self::FIELD_COPYRIGHT]))); + } } else { $this->setCopyright(new FHIRString($data[self::FIELD_COPYRIGHT])); } @@ -396,8 +402,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATE] instanceof FHIRDateTime) { $this->setDate($data[self::FIELD_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_DATE])) { - $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime(array_merge($ext, $data[self::FIELD_DATE]))); + } } else { $this->setDate(new FHIRDateTime($data[self::FIELD_DATE])); } @@ -408,8 +418,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -417,6 +431,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ELEMENT])) { if (is_array($data[self::FIELD_ELEMENT])) { foreach($data[self::FIELD_ELEMENT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRConceptMapElement) { $this->addElement($v); } else { @@ -435,8 +452,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EXPERIMENTAL] instanceof FHIRBoolean) { $this->setExperimental($data[self::FIELD_EXPERIMENTAL]); - } elseif ($ext && is_scalar($data[self::FIELD_EXPERIMENTAL])) { - $this->setExperimental(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_EXPERIMENTAL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EXPERIMENTAL])) { + $this->setExperimental(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_EXPERIMENTAL]] + $ext)); + } else if (is_array($data[self::FIELD_EXPERIMENTAL])) { + $this->setExperimental(new FHIRBoolean(array_merge($ext, $data[self::FIELD_EXPERIMENTAL]))); + } } else { $this->setExperimental(new FHIRBoolean($data[self::FIELD_EXPERIMENTAL])); } @@ -447,8 +468,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->setIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { - $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_IDENTIFIER]))); + } } else { $this->setIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); } @@ -459,8 +484,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -471,8 +500,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PUBLISHER] instanceof FHIRString) { $this->setPublisher($data[self::FIELD_PUBLISHER]); - } elseif ($ext && is_scalar($data[self::FIELD_PUBLISHER])) { - $this->setPublisher(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PUBLISHER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PUBLISHER])) { + $this->setPublisher(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PUBLISHER]] + $ext)); + } else if (is_array($data[self::FIELD_PUBLISHER])) { + $this->setPublisher(new FHIRString(array_merge($ext, $data[self::FIELD_PUBLISHER]))); + } } else { $this->setPublisher(new FHIRString($data[self::FIELD_PUBLISHER])); } @@ -483,8 +516,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_REQUIREMENTS] instanceof FHIRString) { $this->setRequirements($data[self::FIELD_REQUIREMENTS]); - } elseif ($ext && is_scalar($data[self::FIELD_REQUIREMENTS])) { - $this->setRequirements(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_REQUIREMENTS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_REQUIREMENTS])) { + $this->setRequirements(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_REQUIREMENTS]] + $ext)); + } else if (is_array($data[self::FIELD_REQUIREMENTS])) { + $this->setRequirements(new FHIRString(array_merge($ext, $data[self::FIELD_REQUIREMENTS]))); + } } else { $this->setRequirements(new FHIRString($data[self::FIELD_REQUIREMENTS])); } @@ -502,8 +539,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SOURCE_URI] instanceof FHIRUri) { $this->setSourceUri($data[self::FIELD_SOURCE_URI]); - } elseif ($ext && is_scalar($data[self::FIELD_SOURCE_URI])) { - $this->setSourceUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_SOURCE_URI]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SOURCE_URI])) { + $this->setSourceUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_SOURCE_URI]] + $ext)); + } else if (is_array($data[self::FIELD_SOURCE_URI])) { + $this->setSourceUri(new FHIRUri(array_merge($ext, $data[self::FIELD_SOURCE_URI]))); + } } else { $this->setSourceUri(new FHIRUri($data[self::FIELD_SOURCE_URI])); } @@ -514,8 +555,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRCode) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRCode(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRCode($data[self::FIELD_STATUS])); } @@ -533,8 +578,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TARGET_URI] instanceof FHIRUri) { $this->setTargetUri($data[self::FIELD_TARGET_URI]); - } elseif ($ext && is_scalar($data[self::FIELD_TARGET_URI])) { - $this->setTargetUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_TARGET_URI]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TARGET_URI])) { + $this->setTargetUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_TARGET_URI]] + $ext)); + } else if (is_array($data[self::FIELD_TARGET_URI])) { + $this->setTargetUri(new FHIRUri(array_merge($ext, $data[self::FIELD_TARGET_URI]))); + } } else { $this->setTargetUri(new FHIRUri($data[self::FIELD_TARGET_URI])); } @@ -545,8 +594,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_URL] instanceof FHIRUri) { $this->setUrl($data[self::FIELD_URL]); - } elseif ($ext && is_scalar($data[self::FIELD_URL])) { - $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } else if (is_array($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri(array_merge($ext, $data[self::FIELD_URL]))); + } } else { $this->setUrl(new FHIRUri($data[self::FIELD_URL])); } @@ -554,6 +607,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_USE_CONTEXT])) { if (is_array($data[self::FIELD_USE_CONTEXT])) { foreach($data[self::FIELD_USE_CONTEXT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addUseContext($v); } else { @@ -572,8 +628,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VERSION] instanceof FHIRString) { $this->setVersion($data[self::FIELD_VERSION]); - } elseif ($ext && is_scalar($data[self::FIELD_VERSION])) { - $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } else if (is_array($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString(array_merge($ext, $data[self::FIELD_VERSION]))); + } } else { $this->setVersion(new FHIRString($data[self::FIELD_VERSION])); } @@ -1547,7 +1607,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getContact())) { foreach($vs as $v) { if (null === $v) { @@ -1556,6 +1615,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_CONTACT, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getCopyright())) { $v->xmlSerialize($sxe->addChild(self::FIELD_COPYRIGHT, null, $v->_getFHIRXMLNamespace())); } @@ -1565,7 +1625,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESCRIPTION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getElement())) { foreach($vs as $v) { if (null === $v) { @@ -1574,10 +1633,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_ELEMENT, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getExperimental())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EXPERIMENTAL, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } @@ -1590,7 +1649,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getRequirements())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REQUIREMENTS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSourceReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SOURCE_REFERENCE, null, $v->_getFHIRXMLNamespace())); } @@ -1600,7 +1658,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getTargetReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TARGET_REFERENCE, null, $v->_getFHIRXMLNamespace())); } @@ -1610,7 +1667,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getUrl())) { $v->xmlSerialize($sxe->addChild(self::FIELD_URL, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getUseContext())) { foreach($vs as $v) { if (null === $v) { @@ -1619,6 +1675,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_USE_CONTEXT, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getVersion())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VERSION, null, $v->_getFHIRXMLNamespace())); } @@ -1635,67 +1692,159 @@ public function jsonSerialize() $a[self::FIELD_CONTACT] = $vs; } if (null !== ($v = $this->getCopyright())) { - $a[self::FIELD_COPYRIGHT] = $v->getValue(); - $a[self::FIELD_COPYRIGHT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_COPYRIGHT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_COPYRIGHT_EXT] = $enc; + } + } else { + $a[self::FIELD_COPYRIGHT] = $v; + } } if (null !== ($v = $this->getDate())) { - $a[self::FIELD_DATE] = $v->getValue(); - $a[self::FIELD_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_DATE] = $v; + } } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if ([] !== ($vs = $this->getElement())) { $a[self::FIELD_ELEMENT] = $vs; } if (null !== ($v = $this->getExperimental())) { - $a[self::FIELD_EXPERIMENTAL] = $v->getValue(); - $a[self::FIELD_EXPERIMENTAL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EXPERIMENTAL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EXPERIMENTAL_EXT] = $enc; + } + } else { + $a[self::FIELD_EXPERIMENTAL] = $v; + } } if (null !== ($v = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_IDENTIFIER] = $v; + } } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if (null !== ($v = $this->getPublisher())) { - $a[self::FIELD_PUBLISHER] = $v->getValue(); - $a[self::FIELD_PUBLISHER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PUBLISHER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PUBLISHER_EXT] = $enc; + } + } else { + $a[self::FIELD_PUBLISHER] = $v; + } } if (null !== ($v = $this->getRequirements())) { - $a[self::FIELD_REQUIREMENTS] = $v->getValue(); - $a[self::FIELD_REQUIREMENTS_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_REQUIREMENTS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_REQUIREMENTS_EXT] = $enc; + } + } else { + $a[self::FIELD_REQUIREMENTS] = $v; + } } if (null !== ($v = $this->getSourceReference())) { $a[self::FIELD_SOURCE_REFERENCE] = $v; } if (null !== ($v = $this->getSourceUri())) { - $a[self::FIELD_SOURCE_URI] = $v->getValue(); - $a[self::FIELD_SOURCE_URI_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SOURCE_URI] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SOURCE_URI_EXT] = $enc; + } + } else { + $a[self::FIELD_SOURCE_URI] = $v; + } } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v->getValue(); - $a[self::FIELD_STATUS_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getTargetReference())) { $a[self::FIELD_TARGET_REFERENCE] = $v; } if (null !== ($v = $this->getTargetUri())) { - $a[self::FIELD_TARGET_URI] = $v->getValue(); - $a[self::FIELD_TARGET_URI_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TARGET_URI] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TARGET_URI_EXT] = $enc; + } + } else { + $a[self::FIELD_TARGET_URI] = $v; + } } if (null !== ($v = $this->getUrl())) { - $a[self::FIELD_URL] = $v->getValue(); - $a[self::FIELD_URL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_URL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_URL_EXT] = $enc; + } + } else { + $a[self::FIELD_URL] = $v; + } } if ([] !== ($vs = $this->getUseContext())) { $a[self::FIELD_USE_CONTEXT] = $vs; } if (null !== ($v = $this->getVersion())) { - $a[self::FIELD_VERSION] = $v->getValue(); - $a[self::FIELD_VERSION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VERSION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VERSION_EXT] = $enc; + } + } else { + $a[self::FIELD_VERSION] = $v; + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRCondition.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRCondition.php index c8c3be6eb6..b5ad7d8bdd 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRCondition.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRCondition.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -95,16 +95,13 @@ class FHIRCondition extends FHIRDomainResource implements PHPFHIRContainedTypeIn { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONDITION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ABATEMENT_BOOLEAN = 'abatementBoolean'; const FIELD_ABATEMENT_BOOLEAN_EXT = '_abatementBoolean'; const FIELD_ABATEMENT_DATE_TIME = 'abatementDateTime'; const FIELD_ABATEMENT_DATE_TIME_EXT = '_abatementDateTime'; const FIELD_ABATEMENT_PERIOD = 'abatementPeriod'; const FIELD_ABATEMENT_QUANTITY = 'abatementQuantity'; + const FIELD_ABATEMENT_QUANTITY_EXT = '_abatementQuantity'; const FIELD_ABATEMENT_RANGE = 'abatementRange'; const FIELD_ABATEMENT_STRING = 'abatementString'; const FIELD_ABATEMENT_STRING_EXT = '_abatementString'; @@ -126,6 +123,7 @@ class FHIRCondition extends FHIRDomainResource implements PHPFHIRContainedTypeIn const FIELD_ONSET_DATE_TIME_EXT = '_onsetDateTime'; const FIELD_ONSET_PERIOD = 'onsetPeriod'; const FIELD_ONSET_QUANTITY = 'onsetQuantity'; + const FIELD_ONSET_QUANTITY_EXT = '_onsetQuantity'; const FIELD_ONSET_RANGE = 'onsetRange'; const FIELD_ONSET_STRING = 'onsetString'; const FIELD_ONSET_STRING_EXT = '_onsetString'; @@ -444,6 +442,9 @@ class FHIRCondition extends FHIRDomainResource implements PHPFHIRContainedTypeIn */ protected $verificationStatus = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRCondition Constructor * @param null|array $data @@ -466,8 +467,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ABATEMENT_BOOLEAN] instanceof FHIRBoolean) { $this->setAbatementBoolean($data[self::FIELD_ABATEMENT_BOOLEAN]); - } elseif ($ext && is_scalar($data[self::FIELD_ABATEMENT_BOOLEAN])) { - $this->setAbatementBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_ABATEMENT_BOOLEAN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ABATEMENT_BOOLEAN])) { + $this->setAbatementBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_ABATEMENT_BOOLEAN]] + $ext)); + } else if (is_array($data[self::FIELD_ABATEMENT_BOOLEAN])) { + $this->setAbatementBoolean(new FHIRBoolean(array_merge($ext, $data[self::FIELD_ABATEMENT_BOOLEAN]))); + } } else { $this->setAbatementBoolean(new FHIRBoolean($data[self::FIELD_ABATEMENT_BOOLEAN])); } @@ -478,8 +483,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ABATEMENT_DATE_TIME] instanceof FHIRDateTime) { $this->setAbatementDateTime($data[self::FIELD_ABATEMENT_DATE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_ABATEMENT_DATE_TIME])) { - $this->setAbatementDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_ABATEMENT_DATE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ABATEMENT_DATE_TIME])) { + $this->setAbatementDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_ABATEMENT_DATE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_ABATEMENT_DATE_TIME])) { + $this->setAbatementDateTime(new FHIRDateTime(array_merge($ext, $data[self::FIELD_ABATEMENT_DATE_TIME]))); + } } else { $this->setAbatementDateTime(new FHIRDateTime($data[self::FIELD_ABATEMENT_DATE_TIME])); } @@ -492,8 +501,17 @@ public function __construct($data = null) } } if (isset($data[self::FIELD_ABATEMENT_QUANTITY])) { + $ext = (isset($data[self::FIELD_ABATEMENT_QUANTITY_EXT]) && is_array($data[self::FIELD_ABATEMENT_QUANTITY_EXT])) + ? $data[self::FIELD_ABATEMENT_QUANTITY_EXT] + : null; if ($data[self::FIELD_ABATEMENT_QUANTITY] instanceof FHIRAge) { $this->setAbatementQuantity($data[self::FIELD_ABATEMENT_QUANTITY]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ABATEMENT_QUANTITY])) { + $this->setAbatementQuantity(new FHIRAge([FHIRAge::FIELD_VALUE => $data[self::FIELD_ABATEMENT_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_ABATEMENT_QUANTITY])) { + $this->setAbatementQuantity(new FHIRAge(array_merge($ext, $data[self::FIELD_ABATEMENT_QUANTITY]))); + } } else { $this->setAbatementQuantity(new FHIRAge($data[self::FIELD_ABATEMENT_QUANTITY])); } @@ -511,8 +529,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ABATEMENT_STRING] instanceof FHIRString) { $this->setAbatementString($data[self::FIELD_ABATEMENT_STRING]); - } elseif ($ext && is_scalar($data[self::FIELD_ABATEMENT_STRING])) { - $this->setAbatementString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_ABATEMENT_STRING]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ABATEMENT_STRING])) { + $this->setAbatementString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_ABATEMENT_STRING]] + $ext)); + } else if (is_array($data[self::FIELD_ABATEMENT_STRING])) { + $this->setAbatementString(new FHIRString(array_merge($ext, $data[self::FIELD_ABATEMENT_STRING]))); + } } else { $this->setAbatementString(new FHIRString($data[self::FIELD_ABATEMENT_STRING])); } @@ -527,6 +549,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_BODY_SITE])) { if (is_array($data[self::FIELD_BODY_SITE])) { foreach($data[self::FIELD_BODY_SITE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addBodySite($v); } else { @@ -552,8 +577,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CLINICAL_STATUS] instanceof FHIRCode) { $this->setClinicalStatus($data[self::FIELD_CLINICAL_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_CLINICAL_STATUS])) { - $this->setClinicalStatus(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_CLINICAL_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CLINICAL_STATUS])) { + $this->setClinicalStatus(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_CLINICAL_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_CLINICAL_STATUS])) { + $this->setClinicalStatus(new FHIRCode(array_merge($ext, $data[self::FIELD_CLINICAL_STATUS]))); + } } else { $this->setClinicalStatus(new FHIRCode($data[self::FIELD_CLINICAL_STATUS])); } @@ -571,8 +600,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATE_RECORDED] instanceof FHIRDate) { $this->setDateRecorded($data[self::FIELD_DATE_RECORDED]); - } elseif ($ext && is_scalar($data[self::FIELD_DATE_RECORDED])) { - $this->setDateRecorded(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_DATE_RECORDED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATE_RECORDED])) { + $this->setDateRecorded(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_DATE_RECORDED]] + $ext)); + } else if (is_array($data[self::FIELD_DATE_RECORDED])) { + $this->setDateRecorded(new FHIRDate(array_merge($ext, $data[self::FIELD_DATE_RECORDED]))); + } } else { $this->setDateRecorded(new FHIRDate($data[self::FIELD_DATE_RECORDED])); } @@ -587,6 +620,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_EVIDENCE])) { if (is_array($data[self::FIELD_EVIDENCE])) { foreach($data[self::FIELD_EVIDENCE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRConditionEvidence) { $this->addEvidence($v); } else { @@ -605,17 +641,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -627,8 +670,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NOTES] instanceof FHIRString) { $this->setNotes($data[self::FIELD_NOTES]); - } elseif ($ext && is_scalar($data[self::FIELD_NOTES])) { - $this->setNotes(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NOTES]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NOTES])) { + $this->setNotes(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NOTES]] + $ext)); + } else if (is_array($data[self::FIELD_NOTES])) { + $this->setNotes(new FHIRString(array_merge($ext, $data[self::FIELD_NOTES]))); + } } else { $this->setNotes(new FHIRString($data[self::FIELD_NOTES])); } @@ -639,8 +686,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ONSET_DATE_TIME] instanceof FHIRDateTime) { $this->setOnsetDateTime($data[self::FIELD_ONSET_DATE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_ONSET_DATE_TIME])) { - $this->setOnsetDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_ONSET_DATE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ONSET_DATE_TIME])) { + $this->setOnsetDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_ONSET_DATE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_ONSET_DATE_TIME])) { + $this->setOnsetDateTime(new FHIRDateTime(array_merge($ext, $data[self::FIELD_ONSET_DATE_TIME]))); + } } else { $this->setOnsetDateTime(new FHIRDateTime($data[self::FIELD_ONSET_DATE_TIME])); } @@ -653,8 +704,17 @@ public function __construct($data = null) } } if (isset($data[self::FIELD_ONSET_QUANTITY])) { + $ext = (isset($data[self::FIELD_ONSET_QUANTITY_EXT]) && is_array($data[self::FIELD_ONSET_QUANTITY_EXT])) + ? $data[self::FIELD_ONSET_QUANTITY_EXT] + : null; if ($data[self::FIELD_ONSET_QUANTITY] instanceof FHIRAge) { $this->setOnsetQuantity($data[self::FIELD_ONSET_QUANTITY]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ONSET_QUANTITY])) { + $this->setOnsetQuantity(new FHIRAge([FHIRAge::FIELD_VALUE => $data[self::FIELD_ONSET_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_ONSET_QUANTITY])) { + $this->setOnsetQuantity(new FHIRAge(array_merge($ext, $data[self::FIELD_ONSET_QUANTITY]))); + } } else { $this->setOnsetQuantity(new FHIRAge($data[self::FIELD_ONSET_QUANTITY])); } @@ -672,8 +732,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ONSET_STRING] instanceof FHIRString) { $this->setOnsetString($data[self::FIELD_ONSET_STRING]); - } elseif ($ext && is_scalar($data[self::FIELD_ONSET_STRING])) { - $this->setOnsetString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_ONSET_STRING]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ONSET_STRING])) { + $this->setOnsetString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_ONSET_STRING]] + $ext)); + } else if (is_array($data[self::FIELD_ONSET_STRING])) { + $this->setOnsetString(new FHIRString(array_merge($ext, $data[self::FIELD_ONSET_STRING]))); + } } else { $this->setOnsetString(new FHIRString($data[self::FIELD_ONSET_STRING])); } @@ -705,8 +769,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VERIFICATION_STATUS] instanceof FHIRConditionVerificationStatus) { $this->setVerificationStatus($data[self::FIELD_VERIFICATION_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_VERIFICATION_STATUS])) { - $this->setVerificationStatus(new FHIRConditionVerificationStatus([FHIRConditionVerificationStatus::FIELD_VALUE => $data[self::FIELD_VERIFICATION_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VERIFICATION_STATUS])) { + $this->setVerificationStatus(new FHIRConditionVerificationStatus([FHIRConditionVerificationStatus::FIELD_VALUE => $data[self::FIELD_VERIFICATION_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_VERIFICATION_STATUS])) { + $this->setVerificationStatus(new FHIRConditionVerificationStatus(array_merge($ext, $data[self::FIELD_VERIFICATION_STATUS]))); + } } else { $this->setVerificationStatus(new FHIRConditionVerificationStatus($data[self::FIELD_VERIFICATION_STATUS])); } @@ -1897,26 +1965,21 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getAbatementDateTime())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ABATEMENT_DATE_TIME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getAbatementPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ABATEMENT_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getAbatementQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ABATEMENT_QUANTITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getAbatementRange())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ABATEMENT_RANGE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getAbatementString())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ABATEMENT_STRING, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getAsserter())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ASSERTER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getBodySite())) { foreach($vs as $v) { if (null === $v) { @@ -1932,18 +1995,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getClinicalStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CLINICAL_STATUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getDateRecorded())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DATE_RECORDED, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getEncounter())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ENCOUNTER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getEvidence())) { foreach($vs as $v) { if (null === $v) { @@ -1961,40 +2021,34 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getNotes())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NOTES, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getOnsetDateTime())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ONSET_DATE_TIME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOnsetPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ONSET_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOnsetQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ONSET_QUANTITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOnsetRange())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ONSET_RANGE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getOnsetString())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ONSET_STRING, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPatient())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATIENT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSeverity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SEVERITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStage())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STAGE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getVerificationStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VERIFICATION_STATUS, null, $v->_getFHIRXMLNamespace())); } @@ -2008,25 +2062,54 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getAbatementBoolean())) { - $a[self::FIELD_ABATEMENT_BOOLEAN] = $v->getValue(); - $a[self::FIELD_ABATEMENT_BOOLEAN_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ABATEMENT_BOOLEAN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ABATEMENT_BOOLEAN_EXT] = $enc; + } + } else { + $a[self::FIELD_ABATEMENT_BOOLEAN] = $v; + } } if (null !== ($v = $this->getAbatementDateTime())) { - $a[self::FIELD_ABATEMENT_DATE_TIME] = $v->getValue(); - $a[self::FIELD_ABATEMENT_DATE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ABATEMENT_DATE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ABATEMENT_DATE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_ABATEMENT_DATE_TIME] = $v; + } } if (null !== ($v = $this->getAbatementPeriod())) { $a[self::FIELD_ABATEMENT_PERIOD] = $v; } if (null !== ($v = $this->getAbatementQuantity())) { - $a[self::FIELD_ABATEMENT_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ABATEMENT_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ABATEMENT_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_ABATEMENT_QUANTITY] = $v; + } } if (null !== ($v = $this->getAbatementRange())) { $a[self::FIELD_ABATEMENT_RANGE] = $v; } if (null !== ($v = $this->getAbatementString())) { - $a[self::FIELD_ABATEMENT_STRING] = $v->getValue(); - $a[self::FIELD_ABATEMENT_STRING_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ABATEMENT_STRING] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ABATEMENT_STRING_EXT] = $enc; + } + } else { + $a[self::FIELD_ABATEMENT_STRING] = $v; + } } if (null !== ($v = $this->getAsserter())) { $a[self::FIELD_ASSERTER] = $v; @@ -2038,15 +2121,29 @@ public function jsonSerialize() $a[self::FIELD_CATEGORY] = $v; } if (null !== ($v = $this->getClinicalStatus())) { - $a[self::FIELD_CLINICAL_STATUS] = $v->getValue(); - $a[self::FIELD_CLINICAL_STATUS_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CLINICAL_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CLINICAL_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_CLINICAL_STATUS] = $v; + } } if (null !== ($v = $this->getCode())) { $a[self::FIELD_CODE] = $v; } if (null !== ($v = $this->getDateRecorded())) { - $a[self::FIELD_DATE_RECORDED] = $v->getValue(); - $a[self::FIELD_DATE_RECORDED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATE_RECORDED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATE_RECORDED_EXT] = $enc; + } + } else { + $a[self::FIELD_DATE_RECORDED] = $v; + } } if (null !== ($v = $this->getEncounter())) { $a[self::FIELD_ENCOUNTER] = $v; @@ -2055,28 +2152,73 @@ public function jsonSerialize() $a[self::FIELD_EVIDENCE] = $vs; } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if (null !== ($v = $this->getNotes())) { - $a[self::FIELD_NOTES] = $v->getValue(); - $a[self::FIELD_NOTES_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NOTES] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NOTES_EXT] = $enc; + } + } else { + $a[self::FIELD_NOTES] = $v; + } } if (null !== ($v = $this->getOnsetDateTime())) { - $a[self::FIELD_ONSET_DATE_TIME] = $v->getValue(); - $a[self::FIELD_ONSET_DATE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ONSET_DATE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ONSET_DATE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_ONSET_DATE_TIME] = $v; + } } if (null !== ($v = $this->getOnsetPeriod())) { $a[self::FIELD_ONSET_PERIOD] = $v; } if (null !== ($v = $this->getOnsetQuantity())) { - $a[self::FIELD_ONSET_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ONSET_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ONSET_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_ONSET_QUANTITY] = $v; + } } if (null !== ($v = $this->getOnsetRange())) { $a[self::FIELD_ONSET_RANGE] = $v; } if (null !== ($v = $this->getOnsetString())) { - $a[self::FIELD_ONSET_STRING] = $v->getValue(); - $a[self::FIELD_ONSET_STRING_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ONSET_STRING] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ONSET_STRING_EXT] = $enc; + } + } else { + $a[self::FIELD_ONSET_STRING] = $v; + } } if (null !== ($v = $this->getPatient())) { $a[self::FIELD_PATIENT] = $v; @@ -2088,7 +2230,15 @@ public function jsonSerialize() $a[self::FIELD_STAGE] = $v; } if (null !== ($v = $this->getVerificationStatus())) { - $a[self::FIELD_VERIFICATION_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VERIFICATION_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VERIFICATION_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_VERIFICATION_STATUS] = $v; + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRConformance.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRConformance.php index bcf7d82123..95cf0c1bac 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRConformance.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRConformance.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -95,10 +95,6 @@ class FHIRConformance extends FHIRDomainResource implements PHPFHIRContainedType { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONFORMANCE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ACCEPT_UNKNOWN = 'acceptUnknown'; const FIELD_ACCEPT_UNKNOWN_EXT = '_acceptUnknown'; const FIELD_CONTACT = 'contact'; @@ -404,6 +400,9 @@ class FHIRConformance extends FHIRDomainResource implements PHPFHIRContainedType */ protected $version = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRConformance Constructor * @param null|array $data @@ -426,8 +425,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ACCEPT_UNKNOWN] instanceof FHIRUnknownContentCode) { $this->setAcceptUnknown($data[self::FIELD_ACCEPT_UNKNOWN]); - } elseif ($ext && is_scalar($data[self::FIELD_ACCEPT_UNKNOWN])) { - $this->setAcceptUnknown(new FHIRUnknownContentCode([FHIRUnknownContentCode::FIELD_VALUE => $data[self::FIELD_ACCEPT_UNKNOWN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ACCEPT_UNKNOWN])) { + $this->setAcceptUnknown(new FHIRUnknownContentCode([FHIRUnknownContentCode::FIELD_VALUE => $data[self::FIELD_ACCEPT_UNKNOWN]] + $ext)); + } else if (is_array($data[self::FIELD_ACCEPT_UNKNOWN])) { + $this->setAcceptUnknown(new FHIRUnknownContentCode(array_merge($ext, $data[self::FIELD_ACCEPT_UNKNOWN]))); + } } else { $this->setAcceptUnknown(new FHIRUnknownContentCode($data[self::FIELD_ACCEPT_UNKNOWN])); } @@ -435,6 +438,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CONTACT])) { if (is_array($data[self::FIELD_CONTACT])) { foreach($data[self::FIELD_CONTACT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRConformanceContact) { $this->addContact($v); } else { @@ -453,8 +459,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_COPYRIGHT] instanceof FHIRString) { $this->setCopyright($data[self::FIELD_COPYRIGHT]); - } elseif ($ext && is_scalar($data[self::FIELD_COPYRIGHT])) { - $this->setCopyright(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_COPYRIGHT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_COPYRIGHT])) { + $this->setCopyright(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_COPYRIGHT]] + $ext)); + } else if (is_array($data[self::FIELD_COPYRIGHT])) { + $this->setCopyright(new FHIRString(array_merge($ext, $data[self::FIELD_COPYRIGHT]))); + } } else { $this->setCopyright(new FHIRString($data[self::FIELD_COPYRIGHT])); } @@ -465,8 +475,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATE] instanceof FHIRDateTime) { $this->setDate($data[self::FIELD_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_DATE])) { - $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime(array_merge($ext, $data[self::FIELD_DATE]))); + } } else { $this->setDate(new FHIRDateTime($data[self::FIELD_DATE])); } @@ -477,8 +491,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -486,6 +504,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_DOCUMENT])) { if (is_array($data[self::FIELD_DOCUMENT])) { foreach($data[self::FIELD_DOCUMENT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRConformanceDocument) { $this->addDocument($v); } else { @@ -504,8 +525,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EXPERIMENTAL] instanceof FHIRBoolean) { $this->setExperimental($data[self::FIELD_EXPERIMENTAL]); - } elseif ($ext && is_scalar($data[self::FIELD_EXPERIMENTAL])) { - $this->setExperimental(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_EXPERIMENTAL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EXPERIMENTAL])) { + $this->setExperimental(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_EXPERIMENTAL]] + $ext)); + } else if (is_array($data[self::FIELD_EXPERIMENTAL])) { + $this->setExperimental(new FHIRBoolean(array_merge($ext, $data[self::FIELD_EXPERIMENTAL]))); + } } else { $this->setExperimental(new FHIRBoolean($data[self::FIELD_EXPERIMENTAL])); } @@ -516,8 +541,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_FHIR_VERSION] instanceof FHIRId) { $this->setFhirVersion($data[self::FIELD_FHIR_VERSION]); - } elseif ($ext && is_scalar($data[self::FIELD_FHIR_VERSION])) { - $this->setFhirVersion(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_FHIR_VERSION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_FHIR_VERSION])) { + $this->setFhirVersion(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_FHIR_VERSION]] + $ext)); + } else if (is_array($data[self::FIELD_FHIR_VERSION])) { + $this->setFhirVersion(new FHIRId(array_merge($ext, $data[self::FIELD_FHIR_VERSION]))); + } } else { $this->setFhirVersion(new FHIRId($data[self::FIELD_FHIR_VERSION])); } @@ -528,17 +557,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_FORMAT])) { foreach($data[self::FIELD_FORMAT] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCode) { $this->addFormat($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addFormat(new FHIRCode([FHIRCode::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addFormat(new FHIRCode([FHIRCode::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addFormat(new FHIRCode(array_merge($v, $ext[$i]))); + } } else { $this->addFormat(new FHIRCode($v)); } } } elseif ($data[self::FIELD_FORMAT] instanceof FHIRCode) { $this->addFormat($data[self::FIELD_FORMAT]); - } elseif ($ext && is_scalar($data[self::FIELD_FORMAT])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_FORMAT])) { $this->addFormat(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_FORMAT]] + $ext)); } else { $this->addFormat(new FHIRCode($data[self::FIELD_FORMAT])); @@ -557,8 +593,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_KIND] instanceof FHIRConformanceStatementKind) { $this->setKind($data[self::FIELD_KIND]); - } elseif ($ext && is_scalar($data[self::FIELD_KIND])) { - $this->setKind(new FHIRConformanceStatementKind([FHIRConformanceStatementKind::FIELD_VALUE => $data[self::FIELD_KIND]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_KIND])) { + $this->setKind(new FHIRConformanceStatementKind([FHIRConformanceStatementKind::FIELD_VALUE => $data[self::FIELD_KIND]] + $ext)); + } else if (is_array($data[self::FIELD_KIND])) { + $this->setKind(new FHIRConformanceStatementKind(array_merge($ext, $data[self::FIELD_KIND]))); + } } else { $this->setKind(new FHIRConformanceStatementKind($data[self::FIELD_KIND])); } @@ -566,6 +606,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_MESSAGING])) { if (is_array($data[self::FIELD_MESSAGING])) { foreach($data[self::FIELD_MESSAGING] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRConformanceMessaging) { $this->addMessaging($v); } else { @@ -584,8 +627,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -593,6 +640,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PROFILE])) { if (is_array($data[self::FIELD_PROFILE])) { foreach($data[self::FIELD_PROFILE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addProfile($v); } else { @@ -611,8 +661,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PUBLISHER] instanceof FHIRString) { $this->setPublisher($data[self::FIELD_PUBLISHER]); - } elseif ($ext && is_scalar($data[self::FIELD_PUBLISHER])) { - $this->setPublisher(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PUBLISHER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PUBLISHER])) { + $this->setPublisher(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PUBLISHER]] + $ext)); + } else if (is_array($data[self::FIELD_PUBLISHER])) { + $this->setPublisher(new FHIRString(array_merge($ext, $data[self::FIELD_PUBLISHER]))); + } } else { $this->setPublisher(new FHIRString($data[self::FIELD_PUBLISHER])); } @@ -623,8 +677,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_REQUIREMENTS] instanceof FHIRString) { $this->setRequirements($data[self::FIELD_REQUIREMENTS]); - } elseif ($ext && is_scalar($data[self::FIELD_REQUIREMENTS])) { - $this->setRequirements(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_REQUIREMENTS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_REQUIREMENTS])) { + $this->setRequirements(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_REQUIREMENTS]] + $ext)); + } else if (is_array($data[self::FIELD_REQUIREMENTS])) { + $this->setRequirements(new FHIRString(array_merge($ext, $data[self::FIELD_REQUIREMENTS]))); + } } else { $this->setRequirements(new FHIRString($data[self::FIELD_REQUIREMENTS])); } @@ -632,6 +690,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REST])) { if (is_array($data[self::FIELD_REST])) { foreach($data[self::FIELD_REST] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRConformanceRest) { $this->addRest($v); } else { @@ -657,8 +718,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRCode) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRCode(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRCode($data[self::FIELD_STATUS])); } @@ -669,8 +734,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_URL] instanceof FHIRUri) { $this->setUrl($data[self::FIELD_URL]); - } elseif ($ext && is_scalar($data[self::FIELD_URL])) { - $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } else if (is_array($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri(array_merge($ext, $data[self::FIELD_URL]))); + } } else { $this->setUrl(new FHIRUri($data[self::FIELD_URL])); } @@ -681,8 +750,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VERSION] instanceof FHIRString) { $this->setVersion($data[self::FIELD_VERSION]); - } elseif ($ext && is_scalar($data[self::FIELD_VERSION])) { - $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } else if (is_array($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString(array_merge($ext, $data[self::FIELD_VERSION]))); + } } else { $this->setVersion(new FHIRString($data[self::FIELD_VERSION])); } @@ -1873,11 +1946,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getAcceptUnknown())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ACCEPT_UNKNOWN, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getContact())) { foreach($vs as $v) { if (null === $v) { @@ -1886,6 +1957,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_CONTACT, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getCopyright())) { $v->xmlSerialize($sxe->addChild(self::FIELD_COPYRIGHT, null, $v->_getFHIRXMLNamespace())); } @@ -1895,7 +1967,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESCRIPTION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getDocument())) { foreach($vs as $v) { if (null === $v) { @@ -1904,6 +1975,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_DOCUMENT, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getExperimental())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EXPERIMENTAL, null, $v->_getFHIRXMLNamespace())); } @@ -1922,11 +1994,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getImplementation())) { $v->xmlSerialize($sxe->addChild(self::FIELD_IMPLEMENTATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getKind())) { $v->xmlSerialize($sxe->addChild(self::FIELD_KIND, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getMessaging())) { foreach($vs as $v) { if (null === $v) { @@ -1935,10 +2005,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_MESSAGING, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NAME, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getProfile())) { foreach($vs as $v) { if (null === $v) { @@ -1947,13 +2017,13 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_PROFILE, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getPublisher())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PUBLISHER, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getRequirements())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REQUIREMENTS, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getRest())) { foreach($vs as $v) { if (null === $v) { @@ -1985,33 +2055,76 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getAcceptUnknown())) { - $a[self::FIELD_ACCEPT_UNKNOWN] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ACCEPT_UNKNOWN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ACCEPT_UNKNOWN_EXT] = $enc; + } + } else { + $a[self::FIELD_ACCEPT_UNKNOWN] = $v; + } } if ([] !== ($vs = $this->getContact())) { $a[self::FIELD_CONTACT] = $vs; } if (null !== ($v = $this->getCopyright())) { - $a[self::FIELD_COPYRIGHT] = $v->getValue(); - $a[self::FIELD_COPYRIGHT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_COPYRIGHT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_COPYRIGHT_EXT] = $enc; + } + } else { + $a[self::FIELD_COPYRIGHT] = $v; + } } if (null !== ($v = $this->getDate())) { - $a[self::FIELD_DATE] = $v->getValue(); - $a[self::FIELD_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_DATE] = $v; + } } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if ([] !== ($vs = $this->getDocument())) { $a[self::FIELD_DOCUMENT] = $vs; } if (null !== ($v = $this->getExperimental())) { - $a[self::FIELD_EXPERIMENTAL] = $v->getValue(); - $a[self::FIELD_EXPERIMENTAL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EXPERIMENTAL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EXPERIMENTAL_EXT] = $enc; + } + } else { + $a[self::FIELD_EXPERIMENTAL] = $v; + } } if (null !== ($v = $this->getFhirVersion())) { - $a[self::FIELD_FHIR_VERSION] = $v->getValue(); - $a[self::FIELD_FHIR_VERSION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FHIR_VERSION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FHIR_VERSION_EXT] = $enc; + } + } else { + $a[self::FIELD_FHIR_VERSION] = $v; + } } if ([] !== ($vs = $this->getFormat())) { $a[self::FIELD_FORMAT] = []; @@ -2019,33 +2132,71 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_FORMAT][] = $v->getValue(); - $a[self::FIELD_FORMAT_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FORMAT][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FORMAT_EXT][] = $enc; + } else { + $a[self::FIELD_FORMAT_EXT][] = null; + } + } else { + $a[self::FIELD_FORMAT][] = $v; + } } } if (null !== ($v = $this->getImplementation())) { $a[self::FIELD_IMPLEMENTATION] = $v; } if (null !== ($v = $this->getKind())) { - $a[self::FIELD_KIND] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_KIND] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_KIND_EXT] = $enc; + } + } else { + $a[self::FIELD_KIND] = $v; + } } if ([] !== ($vs = $this->getMessaging())) { $a[self::FIELD_MESSAGING] = $vs; } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if ([] !== ($vs = $this->getProfile())) { $a[self::FIELD_PROFILE] = $vs; } if (null !== ($v = $this->getPublisher())) { - $a[self::FIELD_PUBLISHER] = $v->getValue(); - $a[self::FIELD_PUBLISHER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PUBLISHER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PUBLISHER_EXT] = $enc; + } + } else { + $a[self::FIELD_PUBLISHER] = $v; + } } if (null !== ($v = $this->getRequirements())) { - $a[self::FIELD_REQUIREMENTS] = $v->getValue(); - $a[self::FIELD_REQUIREMENTS_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_REQUIREMENTS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_REQUIREMENTS_EXT] = $enc; + } + } else { + $a[self::FIELD_REQUIREMENTS] = $v; + } } if ([] !== ($vs = $this->getRest())) { $a[self::FIELD_REST] = $vs; @@ -2054,16 +2205,37 @@ public function jsonSerialize() $a[self::FIELD_SOFTWARE] = $v; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v->getValue(); - $a[self::FIELD_STATUS_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getUrl())) { - $a[self::FIELD_URL] = $v->getValue(); - $a[self::FIELD_URL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_URL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_URL_EXT] = $enc; + } + } else { + $a[self::FIELD_URL] = $v; + } } if (null !== ($v = $this->getVersion())) { - $a[self::FIELD_VERSION] = $v->getValue(); - $a[self::FIELD_VERSION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VERSION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VERSION_EXT] = $enc; + } + } else { + $a[self::FIELD_VERSION] = $v; + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRContract.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRContract.php index 104754424c..9b06dd5e22 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRContract.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRContract.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -92,10 +92,6 @@ class FHIRContract extends FHIRDomainResource implements PHPFHIRContainedTypeInt { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONTRACT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ACTION = 'action'; const FIELD_ACTION_REASON = 'actionReason'; const FIELD_ACTOR = 'actor'; @@ -349,6 +345,9 @@ class FHIRContract extends FHIRDomainResource implements PHPFHIRContainedTypeInt */ protected $valuedItem = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRContract Constructor * @param null|array $data @@ -368,6 +367,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ACTION])) { if (is_array($data[self::FIELD_ACTION])) { foreach($data[self::FIELD_ACTION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addAction($v); } else { @@ -383,6 +385,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ACTION_REASON])) { if (is_array($data[self::FIELD_ACTION_REASON])) { foreach($data[self::FIELD_ACTION_REASON] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addActionReason($v); } else { @@ -398,6 +403,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ACTOR])) { if (is_array($data[self::FIELD_ACTOR])) { foreach($data[self::FIELD_ACTOR] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContractActor) { $this->addActor($v); } else { @@ -420,6 +428,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_AUTHORITY])) { if (is_array($data[self::FIELD_AUTHORITY])) { foreach($data[self::FIELD_AUTHORITY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addAuthority($v); } else { @@ -449,6 +460,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_DOMAIN])) { if (is_array($data[self::FIELD_DOMAIN])) { foreach($data[self::FIELD_DOMAIN] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addDomain($v); } else { @@ -464,6 +478,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_FRIENDLY])) { if (is_array($data[self::FIELD_FRIENDLY])) { foreach($data[self::FIELD_FRIENDLY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContractFriendly) { $this->addFriendly($v); } else { @@ -482,8 +499,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->setIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { - $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_IDENTIFIER]))); + } } else { $this->setIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); } @@ -494,8 +515,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ISSUED] instanceof FHIRDateTime) { $this->setIssued($data[self::FIELD_ISSUED]); - } elseif ($ext && is_scalar($data[self::FIELD_ISSUED])) { - $this->setIssued(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_ISSUED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ISSUED])) { + $this->setIssued(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_ISSUED]] + $ext)); + } else if (is_array($data[self::FIELD_ISSUED])) { + $this->setIssued(new FHIRDateTime(array_merge($ext, $data[self::FIELD_ISSUED]))); + } } else { $this->setIssued(new FHIRDateTime($data[self::FIELD_ISSUED])); } @@ -503,6 +528,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_LEGAL])) { if (is_array($data[self::FIELD_LEGAL])) { foreach($data[self::FIELD_LEGAL] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContractLegal) { $this->addLegal($v); } else { @@ -518,6 +546,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_RULE])) { if (is_array($data[self::FIELD_RULE])) { foreach($data[self::FIELD_RULE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContractRule) { $this->addRule($v); } else { @@ -533,6 +564,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SIGNER])) { if (is_array($data[self::FIELD_SIGNER])) { foreach($data[self::FIELD_SIGNER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContractSigner) { $this->addSigner($v); } else { @@ -548,6 +582,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SUB_TYPE])) { if (is_array($data[self::FIELD_SUB_TYPE])) { foreach($data[self::FIELD_SUB_TYPE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addSubType($v); } else { @@ -563,6 +600,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SUBJECT])) { if (is_array($data[self::FIELD_SUBJECT])) { foreach($data[self::FIELD_SUBJECT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addSubject($v); } else { @@ -578,6 +618,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_TERM])) { if (is_array($data[self::FIELD_TERM])) { foreach($data[self::FIELD_TERM] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContractTerm) { $this->addTerm($v); } else { @@ -600,6 +643,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_VALUED_ITEM])) { if (is_array($data[self::FIELD_VALUED_ITEM])) { foreach($data[self::FIELD_VALUED_ITEM] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContractValuedItem) { $this->addValuedItem($v); } else { @@ -1778,7 +1824,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getAction())) { foreach($vs as $v) { if (null === $v) { @@ -1809,7 +1854,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getApplies())) { $v->xmlSerialize($sxe->addChild(self::FIELD_APPLIES, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getAuthority())) { foreach($vs as $v) { if (null === $v) { @@ -1822,11 +1866,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getBindingAttachment())) { $v->xmlSerialize($sxe->addChild(self::FIELD_BINDING_ATTACHMENT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getBindingReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_BINDING_REFERENCE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getDomain())) { foreach($vs as $v) { if (null === $v) { @@ -1851,7 +1893,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getIssued())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ISSUED, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getLegal())) { foreach($vs as $v) { if (null === $v) { @@ -1909,7 +1950,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getValuedItem())) { foreach($vs as $v) { if (null === $v) { @@ -1918,6 +1958,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_VALUED_ITEM, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } @@ -1955,11 +1996,26 @@ public function jsonSerialize() $a[self::FIELD_FRIENDLY] = $vs; } if (null !== ($v = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_IDENTIFIER] = $v; + } } if (null !== ($v = $this->getIssued())) { - $a[self::FIELD_ISSUED] = $v->getValue(); - $a[self::FIELD_ISSUED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ISSUED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ISSUED_EXT] = $enc; + } + } else { + $a[self::FIELD_ISSUED] = $v; + } } if ([] !== ($vs = $this->getLegal())) { $a[self::FIELD_LEGAL] = $vs; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRCoverage.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRCoverage.php index c7b24da291..ac07fd6b53 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRCoverage.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRCoverage.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -85,10 +85,6 @@ class FHIRCoverage extends FHIRDomainResource implements PHPFHIRContainedTypeInt { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_COVERAGE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_BIN = 'bin'; const FIELD_BIN_EXT = '_bin'; const FIELD_CONTRACT = 'contract'; @@ -282,6 +278,9 @@ class FHIRCoverage extends FHIRDomainResource implements PHPFHIRContainedTypeInt */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRCoverage Constructor * @param null|array $data @@ -304,8 +303,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_BIN] instanceof FHIRIdentifier) { $this->setBin($data[self::FIELD_BIN]); - } elseif ($ext && is_scalar($data[self::FIELD_BIN])) { - $this->setBin(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_BIN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_BIN])) { + $this->setBin(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_BIN]] + $ext)); + } else if (is_array($data[self::FIELD_BIN])) { + $this->setBin(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_BIN]))); + } } else { $this->setBin(new FHIRIdentifier($data[self::FIELD_BIN])); } @@ -313,6 +316,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CONTRACT])) { if (is_array($data[self::FIELD_CONTRACT])) { foreach($data[self::FIELD_CONTRACT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addContract($v); } else { @@ -331,8 +337,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DEPENDENT] instanceof FHIRPositiveInt) { $this->setDependent($data[self::FIELD_DEPENDENT]); - } elseif ($ext && is_scalar($data[self::FIELD_DEPENDENT])) { - $this->setDependent(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_DEPENDENT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DEPENDENT])) { + $this->setDependent(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_DEPENDENT]] + $ext)); + } else if (is_array($data[self::FIELD_DEPENDENT])) { + $this->setDependent(new FHIRPositiveInt(array_merge($ext, $data[self::FIELD_DEPENDENT]))); + } } else { $this->setDependent(new FHIRPositiveInt($data[self::FIELD_DEPENDENT])); } @@ -343,8 +353,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_GROUP] instanceof FHIRString) { $this->setGroup($data[self::FIELD_GROUP]); - } elseif ($ext && is_scalar($data[self::FIELD_GROUP])) { - $this->setGroup(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_GROUP]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_GROUP])) { + $this->setGroup(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_GROUP]] + $ext)); + } else if (is_array($data[self::FIELD_GROUP])) { + $this->setGroup(new FHIRString(array_merge($ext, $data[self::FIELD_GROUP]))); + } } else { $this->setGroup(new FHIRString($data[self::FIELD_GROUP])); } @@ -355,17 +369,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -384,8 +405,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NETWORK] instanceof FHIRIdentifier) { $this->setNetwork($data[self::FIELD_NETWORK]); - } elseif ($ext && is_scalar($data[self::FIELD_NETWORK])) { - $this->setNetwork(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_NETWORK]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NETWORK])) { + $this->setNetwork(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_NETWORK]] + $ext)); + } else if (is_array($data[self::FIELD_NETWORK])) { + $this->setNetwork(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_NETWORK]))); + } } else { $this->setNetwork(new FHIRIdentifier($data[self::FIELD_NETWORK])); } @@ -403,8 +428,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PLAN] instanceof FHIRString) { $this->setPlan($data[self::FIELD_PLAN]); - } elseif ($ext && is_scalar($data[self::FIELD_PLAN])) { - $this->setPlan(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PLAN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PLAN])) { + $this->setPlan(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PLAN]] + $ext)); + } else if (is_array($data[self::FIELD_PLAN])) { + $this->setPlan(new FHIRString(array_merge($ext, $data[self::FIELD_PLAN]))); + } } else { $this->setPlan(new FHIRString($data[self::FIELD_PLAN])); } @@ -415,8 +444,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SEQUENCE] instanceof FHIRPositiveInt) { $this->setSequence($data[self::FIELD_SEQUENCE]); - } elseif ($ext && is_scalar($data[self::FIELD_SEQUENCE])) { - $this->setSequence(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_SEQUENCE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SEQUENCE])) { + $this->setSequence(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_SEQUENCE]] + $ext)); + } else if (is_array($data[self::FIELD_SEQUENCE])) { + $this->setSequence(new FHIRPositiveInt(array_merge($ext, $data[self::FIELD_SEQUENCE]))); + } } else { $this->setSequence(new FHIRPositiveInt($data[self::FIELD_SEQUENCE])); } @@ -427,8 +460,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SUB_PLAN] instanceof FHIRString) { $this->setSubPlan($data[self::FIELD_SUB_PLAN]); - } elseif ($ext && is_scalar($data[self::FIELD_SUB_PLAN])) { - $this->setSubPlan(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SUB_PLAN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SUB_PLAN])) { + $this->setSubPlan(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SUB_PLAN]] + $ext)); + } else if (is_array($data[self::FIELD_SUB_PLAN])) { + $this->setSubPlan(new FHIRString(array_merge($ext, $data[self::FIELD_SUB_PLAN]))); + } } else { $this->setSubPlan(new FHIRString($data[self::FIELD_SUB_PLAN])); } @@ -446,8 +483,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SUBSCRIBER_ID] instanceof FHIRIdentifier) { $this->setSubscriberId($data[self::FIELD_SUBSCRIBER_ID]); - } elseif ($ext && is_scalar($data[self::FIELD_SUBSCRIBER_ID])) { - $this->setSubscriberId(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_SUBSCRIBER_ID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SUBSCRIBER_ID])) { + $this->setSubscriberId(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_SUBSCRIBER_ID]] + $ext)); + } else if (is_array($data[self::FIELD_SUBSCRIBER_ID])) { + $this->setSubscriberId(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_SUBSCRIBER_ID]))); + } } else { $this->setSubscriberId(new FHIRIdentifier($data[self::FIELD_SUBSCRIBER_ID])); } @@ -1173,11 +1214,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getBin())) { $v->xmlSerialize($sxe->addChild(self::FIELD_BIN, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getContract())) { foreach($vs as $v) { if (null === $v) { @@ -1186,13 +1225,13 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_CONTRACT, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getDependent())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEPENDENT, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getGroup())) { $v->xmlSerialize($sxe->addChild(self::FIELD_GROUP, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -1205,11 +1244,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getIssuer())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ISSUER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getNetwork())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NETWORK, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PERIOD, null, $v->_getFHIRXMLNamespace())); } @@ -1222,15 +1259,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getSubPlan())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUB_PLAN, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSubscriber())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBSCRIBER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSubscriberId())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBSCRIBER_ID, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -1244,48 +1278,123 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getBin())) { - $a[self::FIELD_BIN] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_BIN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_BIN_EXT] = $enc; + } + } else { + $a[self::FIELD_BIN] = $v; + } } if ([] !== ($vs = $this->getContract())) { $a[self::FIELD_CONTRACT] = $vs; } if (null !== ($v = $this->getDependent())) { - $a[self::FIELD_DEPENDENT] = $v->getValue(); - $a[self::FIELD_DEPENDENT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DEPENDENT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DEPENDENT_EXT] = $enc; + } + } else { + $a[self::FIELD_DEPENDENT] = $v; + } } if (null !== ($v = $this->getGroup())) { - $a[self::FIELD_GROUP] = $v->getValue(); - $a[self::FIELD_GROUP_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_GROUP] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_GROUP_EXT] = $enc; + } + } else { + $a[self::FIELD_GROUP] = $v; + } } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if (null !== ($v = $this->getIssuer())) { $a[self::FIELD_ISSUER] = $v; } if (null !== ($v = $this->getNetwork())) { - $a[self::FIELD_NETWORK] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NETWORK] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NETWORK_EXT] = $enc; + } + } else { + $a[self::FIELD_NETWORK] = $v; + } } if (null !== ($v = $this->getPeriod())) { $a[self::FIELD_PERIOD] = $v; } if (null !== ($v = $this->getPlan())) { - $a[self::FIELD_PLAN] = $v->getValue(); - $a[self::FIELD_PLAN_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PLAN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PLAN_EXT] = $enc; + } + } else { + $a[self::FIELD_PLAN] = $v; + } } if (null !== ($v = $this->getSequence())) { - $a[self::FIELD_SEQUENCE] = $v->getValue(); - $a[self::FIELD_SEQUENCE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SEQUENCE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SEQUENCE_EXT] = $enc; + } + } else { + $a[self::FIELD_SEQUENCE] = $v; + } } if (null !== ($v = $this->getSubPlan())) { - $a[self::FIELD_SUB_PLAN] = $v->getValue(); - $a[self::FIELD_SUB_PLAN_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SUB_PLAN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SUB_PLAN_EXT] = $enc; + } + } else { + $a[self::FIELD_SUB_PLAN] = $v; + } } if (null !== ($v = $this->getSubscriber())) { $a[self::FIELD_SUBSCRIBER] = $v; } if (null !== ($v = $this->getSubscriberId())) { - $a[self::FIELD_SUBSCRIBER_ID] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SUBSCRIBER_ID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SUBSCRIBER_ID_EXT] = $enc; + } + } else { + $a[self::FIELD_SUBSCRIBER_ID] = $v; + } } if (null !== ($v = $this->getType())) { $a[self::FIELD_TYPE] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRDataElement.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRDataElement.php index 5689ae78a3..2301db6daf 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRDataElement.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRDataElement.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -90,10 +90,6 @@ class FHIRDataElement extends FHIRDomainResource implements PHPFHIRContainedType { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DATA_ELEMENT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CONTACT = 'contact'; const FIELD_COPYRIGHT = 'copyright'; const FIELD_COPYRIGHT_EXT = '_copyright'; @@ -293,6 +289,9 @@ class FHIRDataElement extends FHIRDomainResource implements PHPFHIRContainedType */ protected $version = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRDataElement Constructor * @param null|array $data @@ -312,6 +311,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CONTACT])) { if (is_array($data[self::FIELD_CONTACT])) { foreach($data[self::FIELD_CONTACT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRDataElementContact) { $this->addContact($v); } else { @@ -330,8 +332,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_COPYRIGHT] instanceof FHIRString) { $this->setCopyright($data[self::FIELD_COPYRIGHT]); - } elseif ($ext && is_scalar($data[self::FIELD_COPYRIGHT])) { - $this->setCopyright(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_COPYRIGHT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_COPYRIGHT])) { + $this->setCopyright(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_COPYRIGHT]] + $ext)); + } else if (is_array($data[self::FIELD_COPYRIGHT])) { + $this->setCopyright(new FHIRString(array_merge($ext, $data[self::FIELD_COPYRIGHT]))); + } } else { $this->setCopyright(new FHIRString($data[self::FIELD_COPYRIGHT])); } @@ -342,8 +348,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATE] instanceof FHIRDateTime) { $this->setDate($data[self::FIELD_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_DATE])) { - $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime(array_merge($ext, $data[self::FIELD_DATE]))); + } } else { $this->setDate(new FHIRDateTime($data[self::FIELD_DATE])); } @@ -351,6 +361,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ELEMENT])) { if (is_array($data[self::FIELD_ELEMENT])) { foreach($data[self::FIELD_ELEMENT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRElementDefinition) { $this->addElement($v); } else { @@ -369,8 +382,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EXPERIMENTAL] instanceof FHIRBoolean) { $this->setExperimental($data[self::FIELD_EXPERIMENTAL]); - } elseif ($ext && is_scalar($data[self::FIELD_EXPERIMENTAL])) { - $this->setExperimental(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_EXPERIMENTAL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EXPERIMENTAL])) { + $this->setExperimental(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_EXPERIMENTAL]] + $ext)); + } else if (is_array($data[self::FIELD_EXPERIMENTAL])) { + $this->setExperimental(new FHIRBoolean(array_merge($ext, $data[self::FIELD_EXPERIMENTAL]))); + } } else { $this->setExperimental(new FHIRBoolean($data[self::FIELD_EXPERIMENTAL])); } @@ -381,17 +398,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -400,6 +424,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_MAPPING])) { if (is_array($data[self::FIELD_MAPPING])) { foreach($data[self::FIELD_MAPPING] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRDataElementMapping) { $this->addMapping($v); } else { @@ -418,8 +445,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -430,8 +461,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PUBLISHER] instanceof FHIRString) { $this->setPublisher($data[self::FIELD_PUBLISHER]); - } elseif ($ext && is_scalar($data[self::FIELD_PUBLISHER])) { - $this->setPublisher(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PUBLISHER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PUBLISHER])) { + $this->setPublisher(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PUBLISHER]] + $ext)); + } else if (is_array($data[self::FIELD_PUBLISHER])) { + $this->setPublisher(new FHIRString(array_merge($ext, $data[self::FIELD_PUBLISHER]))); + } } else { $this->setPublisher(new FHIRString($data[self::FIELD_PUBLISHER])); } @@ -442,8 +477,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRCode) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRCode(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRCode($data[self::FIELD_STATUS])); } @@ -454,8 +493,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STRINGENCY] instanceof FHIRDataElementStringency) { $this->setStringency($data[self::FIELD_STRINGENCY]); - } elseif ($ext && is_scalar($data[self::FIELD_STRINGENCY])) { - $this->setStringency(new FHIRDataElementStringency([FHIRDataElementStringency::FIELD_VALUE => $data[self::FIELD_STRINGENCY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STRINGENCY])) { + $this->setStringency(new FHIRDataElementStringency([FHIRDataElementStringency::FIELD_VALUE => $data[self::FIELD_STRINGENCY]] + $ext)); + } else if (is_array($data[self::FIELD_STRINGENCY])) { + $this->setStringency(new FHIRDataElementStringency(array_merge($ext, $data[self::FIELD_STRINGENCY]))); + } } else { $this->setStringency(new FHIRDataElementStringency($data[self::FIELD_STRINGENCY])); } @@ -466,8 +509,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_URL] instanceof FHIRUri) { $this->setUrl($data[self::FIELD_URL]); - } elseif ($ext && is_scalar($data[self::FIELD_URL])) { - $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } else if (is_array($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri(array_merge($ext, $data[self::FIELD_URL]))); + } } else { $this->setUrl(new FHIRUri($data[self::FIELD_URL])); } @@ -475,6 +522,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_USE_CONTEXT])) { if (is_array($data[self::FIELD_USE_CONTEXT])) { foreach($data[self::FIELD_USE_CONTEXT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addUseContext($v); } else { @@ -493,8 +543,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VERSION] instanceof FHIRString) { $this->setVersion($data[self::FIELD_VERSION]); - } elseif ($ext && is_scalar($data[self::FIELD_VERSION])) { - $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } else if (is_array($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString(array_merge($ext, $data[self::FIELD_VERSION]))); + } } else { $this->setVersion(new FHIRString($data[self::FIELD_VERSION])); } @@ -1343,7 +1397,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getContact())) { foreach($vs as $v) { if (null === $v) { @@ -1352,13 +1405,13 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_CONTACT, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getCopyright())) { $v->xmlSerialize($sxe->addChild(self::FIELD_COPYRIGHT, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DATE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getElement())) { foreach($vs as $v) { if (null === $v) { @@ -1367,10 +1420,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_ELEMENT, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getExperimental())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EXPERIMENTAL, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -1388,6 +1441,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_MAPPING, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NAME, null, $v->_getFHIRXMLNamespace())); } @@ -1397,14 +1451,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStringency())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STRINGENCY, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getUrl())) { $v->xmlSerialize($sxe->addChild(self::FIELD_URL, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getUseContext())) { foreach($vs as $v) { if (null === $v) { @@ -1413,6 +1465,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_USE_CONTEXT, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getVersion())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VERSION, null, $v->_getFHIRXMLNamespace())); } @@ -1429,51 +1482,131 @@ public function jsonSerialize() $a[self::FIELD_CONTACT] = $vs; } if (null !== ($v = $this->getCopyright())) { - $a[self::FIELD_COPYRIGHT] = $v->getValue(); - $a[self::FIELD_COPYRIGHT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_COPYRIGHT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_COPYRIGHT_EXT] = $enc; + } + } else { + $a[self::FIELD_COPYRIGHT] = $v; + } } if (null !== ($v = $this->getDate())) { - $a[self::FIELD_DATE] = $v->getValue(); - $a[self::FIELD_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_DATE] = $v; + } } if ([] !== ($vs = $this->getElement())) { $a[self::FIELD_ELEMENT] = $vs; } if (null !== ($v = $this->getExperimental())) { - $a[self::FIELD_EXPERIMENTAL] = $v->getValue(); - $a[self::FIELD_EXPERIMENTAL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EXPERIMENTAL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EXPERIMENTAL_EXT] = $enc; + } + } else { + $a[self::FIELD_EXPERIMENTAL] = $v; + } } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if ([] !== ($vs = $this->getMapping())) { $a[self::FIELD_MAPPING] = $vs; } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if (null !== ($v = $this->getPublisher())) { - $a[self::FIELD_PUBLISHER] = $v->getValue(); - $a[self::FIELD_PUBLISHER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PUBLISHER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PUBLISHER_EXT] = $enc; + } + } else { + $a[self::FIELD_PUBLISHER] = $v; + } } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v->getValue(); - $a[self::FIELD_STATUS_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getStringency())) { - $a[self::FIELD_STRINGENCY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STRINGENCY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STRINGENCY_EXT] = $enc; + } + } else { + $a[self::FIELD_STRINGENCY] = $v; + } } if (null !== ($v = $this->getUrl())) { - $a[self::FIELD_URL] = $v->getValue(); - $a[self::FIELD_URL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_URL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_URL_EXT] = $enc; + } + } else { + $a[self::FIELD_URL] = $v; + } } if ([] !== ($vs = $this->getUseContext())) { $a[self::FIELD_USE_CONTEXT] = $vs; } if (null !== ($v = $this->getVersion())) { - $a[self::FIELD_VERSION] = $v->getValue(); - $a[self::FIELD_VERSION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VERSION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VERSION_EXT] = $enc; + } + } else { + $a[self::FIELD_VERSION] = $v; + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRDetectedIssue.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRDetectedIssue.php index fa41fb8382..99de32920a 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRDetectedIssue.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRDetectedIssue.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -88,10 +88,6 @@ class FHIRDetectedIssue extends FHIRDomainResource implements PHPFHIRContainedTy { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DETECTED_ISSUE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_AUTHOR = 'author'; const FIELD_CATEGORY = 'category'; const FIELD_DATE = 'date'; @@ -228,6 +224,9 @@ class FHIRDetectedIssue extends FHIRDomainResource implements PHPFHIRContainedTy */ protected $severity = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRDetectedIssue Constructor * @param null|array $data @@ -264,8 +263,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATE] instanceof FHIRDateTime) { $this->setDate($data[self::FIELD_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_DATE])) { - $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime(array_merge($ext, $data[self::FIELD_DATE]))); + } } else { $this->setDate(new FHIRDateTime($data[self::FIELD_DATE])); } @@ -276,8 +279,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DETAIL] instanceof FHIRString) { $this->setDetail($data[self::FIELD_DETAIL]); - } elseif ($ext && is_scalar($data[self::FIELD_DETAIL])) { - $this->setDetail(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DETAIL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DETAIL])) { + $this->setDetail(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DETAIL]] + $ext)); + } else if (is_array($data[self::FIELD_DETAIL])) { + $this->setDetail(new FHIRString(array_merge($ext, $data[self::FIELD_DETAIL]))); + } } else { $this->setDetail(new FHIRString($data[self::FIELD_DETAIL])); } @@ -288,8 +295,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->setIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { - $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_IDENTIFIER]))); + } } else { $this->setIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); } @@ -297,6 +308,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_IMPLICATED])) { if (is_array($data[self::FIELD_IMPLICATED])) { foreach($data[self::FIELD_IMPLICATED] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addImplicated($v); } else { @@ -312,6 +326,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_MITIGATION])) { if (is_array($data[self::FIELD_MITIGATION])) { foreach($data[self::FIELD_MITIGATION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRDetectedIssueMitigation) { $this->addMitigation($v); } else { @@ -337,8 +354,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_REFERENCE] instanceof FHIRUri) { $this->setReference($data[self::FIELD_REFERENCE]); - } elseif ($ext && is_scalar($data[self::FIELD_REFERENCE])) { - $this->setReference(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_REFERENCE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_REFERENCE])) { + $this->setReference(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_REFERENCE]] + $ext)); + } else if (is_array($data[self::FIELD_REFERENCE])) { + $this->setReference(new FHIRUri(array_merge($ext, $data[self::FIELD_REFERENCE]))); + } } else { $this->setReference(new FHIRUri($data[self::FIELD_REFERENCE])); } @@ -349,8 +370,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SEVERITY] instanceof FHIRDetectedIssueSeverity) { $this->setSeverity($data[self::FIELD_SEVERITY]); - } elseif ($ext && is_scalar($data[self::FIELD_SEVERITY])) { - $this->setSeverity(new FHIRDetectedIssueSeverity([FHIRDetectedIssueSeverity::FIELD_VALUE => $data[self::FIELD_SEVERITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SEVERITY])) { + $this->setSeverity(new FHIRDetectedIssueSeverity([FHIRDetectedIssueSeverity::FIELD_VALUE => $data[self::FIELD_SEVERITY]] + $ext)); + } else if (is_array($data[self::FIELD_SEVERITY])) { + $this->setSeverity(new FHIRDetectedIssueSeverity(array_merge($ext, $data[self::FIELD_SEVERITY]))); + } } else { $this->setSeverity(new FHIRDetectedIssueSeverity($data[self::FIELD_SEVERITY])); } @@ -907,11 +932,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getAuthor())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AUTHOR, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getCategory())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CATEGORY, null, $v->_getFHIRXMLNamespace())); } @@ -921,11 +944,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDetail())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DETAIL, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getImplicated())) { foreach($vs as $v) { if (null === $v) { @@ -950,7 +971,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REFERENCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSeverity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SEVERITY, null, $v->_getFHIRXMLNamespace())); } @@ -970,15 +990,37 @@ public function jsonSerialize() $a[self::FIELD_CATEGORY] = $v; } if (null !== ($v = $this->getDate())) { - $a[self::FIELD_DATE] = $v->getValue(); - $a[self::FIELD_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_DATE] = $v; + } } if (null !== ($v = $this->getDetail())) { - $a[self::FIELD_DETAIL] = $v->getValue(); - $a[self::FIELD_DETAIL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DETAIL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DETAIL_EXT] = $enc; + } + } else { + $a[self::FIELD_DETAIL] = $v; + } } if (null !== ($v = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_IDENTIFIER] = $v; + } } if ([] !== ($vs = $this->getImplicated())) { $a[self::FIELD_IMPLICATED] = $vs; @@ -990,11 +1032,26 @@ public function jsonSerialize() $a[self::FIELD_PATIENT] = $v; } if (null !== ($v = $this->getReference())) { - $a[self::FIELD_REFERENCE] = $v->getValue(); - $a[self::FIELD_REFERENCE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_REFERENCE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_REFERENCE_EXT] = $enc; + } + } else { + $a[self::FIELD_REFERENCE] = $v; + } } if (null !== ($v = $this->getSeverity())) { - $a[self::FIELD_SEVERITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SEVERITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SEVERITY_EXT] = $enc; + } + } else { + $a[self::FIELD_SEVERITY] = $v; + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRDevice.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRDevice.php index 8af4d39ffb..7b1d6f4a70 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRDevice.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRDevice.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -93,10 +93,6 @@ class FHIRDevice extends FHIRDomainResource implements PHPFHIRContainedTypeInter { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DEVICE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CONTACT = 'contact'; const FIELD_CONTACT_EXT = '_contact'; const FIELD_EXPIRY = 'expiry'; @@ -321,6 +317,9 @@ class FHIRDevice extends FHIRDomainResource implements PHPFHIRContainedTypeInter */ protected $version = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRDevice Constructor * @param null|array $data @@ -343,17 +342,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_CONTACT])) { foreach($data[self::FIELD_CONTACT] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContactPoint) { $this->addContact($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addContact(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addContact(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addContact(new FHIRContactPoint(array_merge($v, $ext[$i]))); + } } else { $this->addContact(new FHIRContactPoint($v)); } } } elseif ($data[self::FIELD_CONTACT] instanceof FHIRContactPoint) { $this->addContact($data[self::FIELD_CONTACT]); - } elseif ($ext && is_scalar($data[self::FIELD_CONTACT])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_CONTACT])) { $this->addContact(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $data[self::FIELD_CONTACT]] + $ext)); } else { $this->addContact(new FHIRContactPoint($data[self::FIELD_CONTACT])); @@ -365,8 +371,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EXPIRY] instanceof FHIRDateTime) { $this->setExpiry($data[self::FIELD_EXPIRY]); - } elseif ($ext && is_scalar($data[self::FIELD_EXPIRY])) { - $this->setExpiry(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_EXPIRY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EXPIRY])) { + $this->setExpiry(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_EXPIRY]] + $ext)); + } else if (is_array($data[self::FIELD_EXPIRY])) { + $this->setExpiry(new FHIRDateTime(array_merge($ext, $data[self::FIELD_EXPIRY]))); + } } else { $this->setExpiry(new FHIRDateTime($data[self::FIELD_EXPIRY])); } @@ -377,17 +387,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -406,8 +423,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_LOT_NUMBER] instanceof FHIRString) { $this->setLotNumber($data[self::FIELD_LOT_NUMBER]); - } elseif ($ext && is_scalar($data[self::FIELD_LOT_NUMBER])) { - $this->setLotNumber(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_LOT_NUMBER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_LOT_NUMBER])) { + $this->setLotNumber(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_LOT_NUMBER]] + $ext)); + } else if (is_array($data[self::FIELD_LOT_NUMBER])) { + $this->setLotNumber(new FHIRString(array_merge($ext, $data[self::FIELD_LOT_NUMBER]))); + } } else { $this->setLotNumber(new FHIRString($data[self::FIELD_LOT_NUMBER])); } @@ -418,8 +439,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MANUFACTURE_DATE] instanceof FHIRDateTime) { $this->setManufactureDate($data[self::FIELD_MANUFACTURE_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_MANUFACTURE_DATE])) { - $this->setManufactureDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_MANUFACTURE_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MANUFACTURE_DATE])) { + $this->setManufactureDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_MANUFACTURE_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_MANUFACTURE_DATE])) { + $this->setManufactureDate(new FHIRDateTime(array_merge($ext, $data[self::FIELD_MANUFACTURE_DATE]))); + } } else { $this->setManufactureDate(new FHIRDateTime($data[self::FIELD_MANUFACTURE_DATE])); } @@ -430,8 +455,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MANUFACTURER] instanceof FHIRString) { $this->setManufacturer($data[self::FIELD_MANUFACTURER]); - } elseif ($ext && is_scalar($data[self::FIELD_MANUFACTURER])) { - $this->setManufacturer(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_MANUFACTURER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MANUFACTURER])) { + $this->setManufacturer(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_MANUFACTURER]] + $ext)); + } else if (is_array($data[self::FIELD_MANUFACTURER])) { + $this->setManufacturer(new FHIRString(array_merge($ext, $data[self::FIELD_MANUFACTURER]))); + } } else { $this->setManufacturer(new FHIRString($data[self::FIELD_MANUFACTURER])); } @@ -442,8 +471,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MODEL] instanceof FHIRString) { $this->setModel($data[self::FIELD_MODEL]); - } elseif ($ext && is_scalar($data[self::FIELD_MODEL])) { - $this->setModel(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_MODEL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MODEL])) { + $this->setModel(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_MODEL]] + $ext)); + } else if (is_array($data[self::FIELD_MODEL])) { + $this->setModel(new FHIRString(array_merge($ext, $data[self::FIELD_MODEL]))); + } } else { $this->setModel(new FHIRString($data[self::FIELD_MODEL])); } @@ -451,6 +484,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_NOTE])) { if (is_array($data[self::FIELD_NOTE])) { foreach($data[self::FIELD_NOTE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRAnnotation) { $this->addNote($v); } else { @@ -483,8 +519,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRDeviceStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRDeviceStatus([FHIRDeviceStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRDeviceStatus([FHIRDeviceStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRDeviceStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRDeviceStatus($data[self::FIELD_STATUS])); } @@ -502,8 +542,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_UDI] instanceof FHIRString) { $this->setUdi($data[self::FIELD_UDI]); - } elseif ($ext && is_scalar($data[self::FIELD_UDI])) { - $this->setUdi(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_UDI]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_UDI])) { + $this->setUdi(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_UDI]] + $ext)); + } else if (is_array($data[self::FIELD_UDI])) { + $this->setUdi(new FHIRString(array_merge($ext, $data[self::FIELD_UDI]))); + } } else { $this->setUdi(new FHIRString($data[self::FIELD_UDI])); } @@ -514,8 +558,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_URL] instanceof FHIRUri) { $this->setUrl($data[self::FIELD_URL]); - } elseif ($ext && is_scalar($data[self::FIELD_URL])) { - $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } else if (is_array($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri(array_merge($ext, $data[self::FIELD_URL]))); + } } else { $this->setUrl(new FHIRUri($data[self::FIELD_URL])); } @@ -526,8 +574,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VERSION] instanceof FHIRString) { $this->setVersion($data[self::FIELD_VERSION]); - } elseif ($ext && is_scalar($data[self::FIELD_VERSION])) { - $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } else if (is_array($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString(array_merge($ext, $data[self::FIELD_VERSION]))); + } } else { $this->setVersion(new FHIRString($data[self::FIELD_VERSION])); } @@ -1387,7 +1439,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getContact())) { foreach($vs as $v) { if (null === $v) { @@ -1396,10 +1447,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_CONTACT, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getExpiry())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EXPIRY, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -1424,7 +1475,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getModel())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MODEL, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getNote())) { foreach($vs as $v) { if (null === $v) { @@ -1437,15 +1487,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getOwner())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OWNER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPatient())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATIENT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -1468,33 +1515,100 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if ([] !== ($vs = $this->getContact())) { - $a[self::FIELD_CONTACT] = $vs; + $a[self::FIELD_CONTACT] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CONTACT][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CONTACT_EXT][] = $enc; + } else { + $a[self::FIELD_CONTACT_EXT][] = null; + } + } else { + $a[self::FIELD_CONTACT][] = $v; + } + } } if (null !== ($v = $this->getExpiry())) { - $a[self::FIELD_EXPIRY] = $v->getValue(); - $a[self::FIELD_EXPIRY_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EXPIRY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EXPIRY_EXT] = $enc; + } + } else { + $a[self::FIELD_EXPIRY] = $v; + } } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if (null !== ($v = $this->getLocation())) { $a[self::FIELD_LOCATION] = $v; } if (null !== ($v = $this->getLotNumber())) { - $a[self::FIELD_LOT_NUMBER] = $v->getValue(); - $a[self::FIELD_LOT_NUMBER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_LOT_NUMBER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_LOT_NUMBER_EXT] = $enc; + } + } else { + $a[self::FIELD_LOT_NUMBER] = $v; + } } if (null !== ($v = $this->getManufactureDate())) { - $a[self::FIELD_MANUFACTURE_DATE] = $v->getValue(); - $a[self::FIELD_MANUFACTURE_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MANUFACTURE_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MANUFACTURE_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_MANUFACTURE_DATE] = $v; + } } if (null !== ($v = $this->getManufacturer())) { - $a[self::FIELD_MANUFACTURER] = $v->getValue(); - $a[self::FIELD_MANUFACTURER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MANUFACTURER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MANUFACTURER_EXT] = $enc; + } + } else { + $a[self::FIELD_MANUFACTURER] = $v; + } } if (null !== ($v = $this->getModel())) { - $a[self::FIELD_MODEL] = $v->getValue(); - $a[self::FIELD_MODEL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MODEL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MODEL_EXT] = $enc; + } + } else { + $a[self::FIELD_MODEL] = $v; + } } if ([] !== ($vs = $this->getNote())) { $a[self::FIELD_NOTE] = $vs; @@ -1506,22 +1620,51 @@ public function jsonSerialize() $a[self::FIELD_PATIENT] = $v; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getType())) { $a[self::FIELD_TYPE] = $v; } if (null !== ($v = $this->getUdi())) { - $a[self::FIELD_UDI] = $v->getValue(); - $a[self::FIELD_UDI_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_UDI] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_UDI_EXT] = $enc; + } + } else { + $a[self::FIELD_UDI] = $v; + } } if (null !== ($v = $this->getUrl())) { - $a[self::FIELD_URL] = $v->getValue(); - $a[self::FIELD_URL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_URL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_URL_EXT] = $enc; + } + } else { + $a[self::FIELD_URL] = $v; + } } if (null !== ($v = $this->getVersion())) { - $a[self::FIELD_VERSION] = $v->getValue(); - $a[self::FIELD_VERSION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VERSION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VERSION_EXT] = $enc; + } + } else { + $a[self::FIELD_VERSION] = $v; + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRDeviceComponent.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRDeviceComponent.php index 6ff984d4b9..938da54989 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRDeviceComponent.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRDeviceComponent.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -85,10 +85,6 @@ class FHIRDeviceComponent extends FHIRDomainResource implements PHPFHIRContained { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DEVICE_COMPONENT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_IDENTIFIER = 'identifier'; const FIELD_IDENTIFIER_EXT = '_identifier'; const FIELD_LANGUAGE_CODE = 'languageCode'; @@ -227,6 +223,9 @@ class FHIRDeviceComponent extends FHIRDomainResource implements PHPFHIRContained */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRDeviceComponent Constructor * @param null|array $data @@ -249,8 +248,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->setIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { - $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_IDENTIFIER]))); + } } else { $this->setIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); } @@ -268,8 +271,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_LAST_SYSTEM_CHANGE] instanceof FHIRInstant) { $this->setLastSystemChange($data[self::FIELD_LAST_SYSTEM_CHANGE]); - } elseif ($ext && is_scalar($data[self::FIELD_LAST_SYSTEM_CHANGE])) { - $this->setLastSystemChange(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_LAST_SYSTEM_CHANGE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_LAST_SYSTEM_CHANGE])) { + $this->setLastSystemChange(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_LAST_SYSTEM_CHANGE]] + $ext)); + } else if (is_array($data[self::FIELD_LAST_SYSTEM_CHANGE])) { + $this->setLastSystemChange(new FHIRInstant(array_merge($ext, $data[self::FIELD_LAST_SYSTEM_CHANGE]))); + } } else { $this->setLastSystemChange(new FHIRInstant($data[self::FIELD_LAST_SYSTEM_CHANGE])); } @@ -280,8 +287,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MEASUREMENT_PRINCIPLE] instanceof FHIRMeasmnt_Principle) { $this->setMeasurementPrinciple($data[self::FIELD_MEASUREMENT_PRINCIPLE]); - } elseif ($ext && is_scalar($data[self::FIELD_MEASUREMENT_PRINCIPLE])) { - $this->setMeasurementPrinciple(new FHIRMeasmnt_Principle([FHIRMeasmnt_Principle::FIELD_VALUE => $data[self::FIELD_MEASUREMENT_PRINCIPLE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MEASUREMENT_PRINCIPLE])) { + $this->setMeasurementPrinciple(new FHIRMeasmnt_Principle([FHIRMeasmnt_Principle::FIELD_VALUE => $data[self::FIELD_MEASUREMENT_PRINCIPLE]] + $ext)); + } else if (is_array($data[self::FIELD_MEASUREMENT_PRINCIPLE])) { + $this->setMeasurementPrinciple(new FHIRMeasmnt_Principle(array_merge($ext, $data[self::FIELD_MEASUREMENT_PRINCIPLE]))); + } } else { $this->setMeasurementPrinciple(new FHIRMeasmnt_Principle($data[self::FIELD_MEASUREMENT_PRINCIPLE])); } @@ -289,6 +300,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_OPERATIONAL_STATUS])) { if (is_array($data[self::FIELD_OPERATIONAL_STATUS])) { foreach($data[self::FIELD_OPERATIONAL_STATUS] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addOperationalStatus($v); } else { @@ -318,6 +332,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PRODUCTION_SPECIFICATION])) { if (is_array($data[self::FIELD_PRODUCTION_SPECIFICATION])) { foreach($data[self::FIELD_PRODUCTION_SPECIFICATION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRDeviceComponentProductionSpecification) { $this->addProductionSpecification($v); } else { @@ -880,22 +897,18 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getLanguageCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_LANGUAGE_CODE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getLastSystemChange())) { $v->xmlSerialize($sxe->addChild(self::FIELD_LAST_SYSTEM_CHANGE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getMeasurementPrinciple())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MEASUREMENT_PRINCIPLE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getOperationalStatus())) { foreach($vs as $v) { if (null === $v) { @@ -908,11 +921,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getParameterGroup())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PARAMETER_GROUP, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getParent())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PARENT, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getProductionSpecification())) { foreach($vs as $v) { if (null === $v) { @@ -925,7 +936,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getSource())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SOURCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -939,17 +949,40 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_IDENTIFIER] = $v; + } } if (null !== ($v = $this->getLanguageCode())) { $a[self::FIELD_LANGUAGE_CODE] = $v; } if (null !== ($v = $this->getLastSystemChange())) { - $a[self::FIELD_LAST_SYSTEM_CHANGE] = $v->getValue(); - $a[self::FIELD_LAST_SYSTEM_CHANGE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_LAST_SYSTEM_CHANGE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_LAST_SYSTEM_CHANGE_EXT] = $enc; + } + } else { + $a[self::FIELD_LAST_SYSTEM_CHANGE] = $v; + } } if (null !== ($v = $this->getMeasurementPrinciple())) { - $a[self::FIELD_MEASUREMENT_PRINCIPLE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MEASUREMENT_PRINCIPLE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MEASUREMENT_PRINCIPLE_EXT] = $enc; + } + } else { + $a[self::FIELD_MEASUREMENT_PRINCIPLE] = $v; + } } if ([] !== ($vs = $this->getOperationalStatus())) { $a[self::FIELD_OPERATIONAL_STATUS] = $vs; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRDeviceMetric.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRDeviceMetric.php index a71722199d..7ae3b937c9 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRDeviceMetric.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRDeviceMetric.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -86,10 +86,6 @@ class FHIRDeviceMetric extends FHIRDomainResource implements PHPFHIRContainedTyp { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DEVICE_METRIC; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CALIBRATION = 'calibration'; const FIELD_CATEGORY = 'category'; const FIELD_CATEGORY_EXT = '_category'; @@ -240,6 +236,9 @@ class FHIRDeviceMetric extends FHIRDomainResource implements PHPFHIRContainedTyp */ protected $unit = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRDeviceMetric Constructor * @param null|array $data @@ -259,6 +258,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CALIBRATION])) { if (is_array($data[self::FIELD_CALIBRATION])) { foreach($data[self::FIELD_CALIBRATION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRDeviceMetricCalibration) { $this->addCalibration($v); } else { @@ -277,8 +279,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CATEGORY] instanceof FHIRDeviceMetricCategory) { $this->setCategory($data[self::FIELD_CATEGORY]); - } elseif ($ext && is_scalar($data[self::FIELD_CATEGORY])) { - $this->setCategory(new FHIRDeviceMetricCategory([FHIRDeviceMetricCategory::FIELD_VALUE => $data[self::FIELD_CATEGORY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CATEGORY])) { + $this->setCategory(new FHIRDeviceMetricCategory([FHIRDeviceMetricCategory::FIELD_VALUE => $data[self::FIELD_CATEGORY]] + $ext)); + } else if (is_array($data[self::FIELD_CATEGORY])) { + $this->setCategory(new FHIRDeviceMetricCategory(array_merge($ext, $data[self::FIELD_CATEGORY]))); + } } else { $this->setCategory(new FHIRDeviceMetricCategory($data[self::FIELD_CATEGORY])); } @@ -289,8 +295,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_COLOR] instanceof FHIRDeviceMetricColor) { $this->setColor($data[self::FIELD_COLOR]); - } elseif ($ext && is_scalar($data[self::FIELD_COLOR])) { - $this->setColor(new FHIRDeviceMetricColor([FHIRDeviceMetricColor::FIELD_VALUE => $data[self::FIELD_COLOR]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_COLOR])) { + $this->setColor(new FHIRDeviceMetricColor([FHIRDeviceMetricColor::FIELD_VALUE => $data[self::FIELD_COLOR]] + $ext)); + } else if (is_array($data[self::FIELD_COLOR])) { + $this->setColor(new FHIRDeviceMetricColor(array_merge($ext, $data[self::FIELD_COLOR]))); + } } else { $this->setColor(new FHIRDeviceMetricColor($data[self::FIELD_COLOR])); } @@ -301,8 +311,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->setIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { - $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_IDENTIFIER]))); + } } else { $this->setIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); } @@ -320,8 +334,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_OPERATIONAL_STATUS] instanceof FHIRDeviceMetricOperationalStatus) { $this->setOperationalStatus($data[self::FIELD_OPERATIONAL_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_OPERATIONAL_STATUS])) { - $this->setOperationalStatus(new FHIRDeviceMetricOperationalStatus([FHIRDeviceMetricOperationalStatus::FIELD_VALUE => $data[self::FIELD_OPERATIONAL_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_OPERATIONAL_STATUS])) { + $this->setOperationalStatus(new FHIRDeviceMetricOperationalStatus([FHIRDeviceMetricOperationalStatus::FIELD_VALUE => $data[self::FIELD_OPERATIONAL_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_OPERATIONAL_STATUS])) { + $this->setOperationalStatus(new FHIRDeviceMetricOperationalStatus(array_merge($ext, $data[self::FIELD_OPERATIONAL_STATUS]))); + } } else { $this->setOperationalStatus(new FHIRDeviceMetricOperationalStatus($data[self::FIELD_OPERATIONAL_STATUS])); } @@ -870,7 +888,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getCalibration())) { foreach($vs as $v) { if (null === $v) { @@ -883,35 +900,27 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getCategory())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CATEGORY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getColor())) { $v->xmlSerialize($sxe->addChild(self::FIELD_COLOR, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getMeasurementPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MEASUREMENT_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOperationalStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OPERATIONAL_STATUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getParent())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PARENT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSource())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SOURCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getUnit())) { $v->xmlSerialize($sxe->addChild(self::FIELD_UNIT, null, $v->_getFHIRXMLNamespace())); } @@ -928,19 +937,51 @@ public function jsonSerialize() $a[self::FIELD_CALIBRATION] = $vs; } if (null !== ($v = $this->getCategory())) { - $a[self::FIELD_CATEGORY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CATEGORY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CATEGORY_EXT] = $enc; + } + } else { + $a[self::FIELD_CATEGORY] = $v; + } } if (null !== ($v = $this->getColor())) { - $a[self::FIELD_COLOR] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_COLOR] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_COLOR_EXT] = $enc; + } + } else { + $a[self::FIELD_COLOR] = $v; + } } if (null !== ($v = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_IDENTIFIER] = $v; + } } if (null !== ($v = $this->getMeasurementPeriod())) { $a[self::FIELD_MEASUREMENT_PERIOD] = $v; } if (null !== ($v = $this->getOperationalStatus())) { - $a[self::FIELD_OPERATIONAL_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_OPERATIONAL_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_OPERATIONAL_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_OPERATIONAL_STATUS] = $v; + } } if (null !== ($v = $this->getParent())) { $a[self::FIELD_PARENT] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRDeviceUseRequest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRDeviceUseRequest.php index 65b8d5a948..d107019eb7 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRDeviceUseRequest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRDeviceUseRequest.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -88,10 +88,6 @@ class FHIRDeviceUseRequest extends FHIRDomainResource implements PHPFHIRContaine { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DEVICE_USE_REQUEST; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_BODY_SITE_CODEABLE_CONCEPT = 'bodySiteCodeableConcept'; const FIELD_BODY_SITE_REFERENCE = 'bodySiteReference'; const FIELD_DEVICE = 'device'; @@ -320,6 +316,9 @@ class FHIRDeviceUseRequest extends FHIRDomainResource implements PHPFHIRContaine */ protected $timingTiming = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRDeviceUseRequest Constructor * @param null|array $data @@ -370,17 +369,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -389,6 +395,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_INDICATION])) { if (is_array($data[self::FIELD_INDICATION])) { foreach($data[self::FIELD_INDICATION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addIndication($v); } else { @@ -407,17 +416,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_NOTES])) { foreach($data[self::FIELD_NOTES] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRString) { $this->addNotes($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addNotes(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addNotes(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addNotes(new FHIRString(array_merge($v, $ext[$i]))); + } } else { $this->addNotes(new FHIRString($v)); } } } elseif ($data[self::FIELD_NOTES] instanceof FHIRString) { $this->addNotes($data[self::FIELD_NOTES]); - } elseif ($ext && is_scalar($data[self::FIELD_NOTES])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_NOTES])) { $this->addNotes(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NOTES]] + $ext)); } else { $this->addNotes(new FHIRString($data[self::FIELD_NOTES])); @@ -429,8 +445,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ORDERED_ON] instanceof FHIRDateTime) { $this->setOrderedOn($data[self::FIELD_ORDERED_ON]); - } elseif ($ext && is_scalar($data[self::FIELD_ORDERED_ON])) { - $this->setOrderedOn(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_ORDERED_ON]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ORDERED_ON])) { + $this->setOrderedOn(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_ORDERED_ON]] + $ext)); + } else if (is_array($data[self::FIELD_ORDERED_ON])) { + $this->setOrderedOn(new FHIRDateTime(array_merge($ext, $data[self::FIELD_ORDERED_ON]))); + } } else { $this->setOrderedOn(new FHIRDateTime($data[self::FIELD_ORDERED_ON])); } @@ -441,8 +461,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PRIORITY] instanceof FHIRDeviceUseRequestPriority) { $this->setPriority($data[self::FIELD_PRIORITY]); - } elseif ($ext && is_scalar($data[self::FIELD_PRIORITY])) { - $this->setPriority(new FHIRDeviceUseRequestPriority([FHIRDeviceUseRequestPriority::FIELD_VALUE => $data[self::FIELD_PRIORITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PRIORITY])) { + $this->setPriority(new FHIRDeviceUseRequestPriority([FHIRDeviceUseRequestPriority::FIELD_VALUE => $data[self::FIELD_PRIORITY]] + $ext)); + } else if (is_array($data[self::FIELD_PRIORITY])) { + $this->setPriority(new FHIRDeviceUseRequestPriority(array_merge($ext, $data[self::FIELD_PRIORITY]))); + } } else { $this->setPriority(new FHIRDeviceUseRequestPriority($data[self::FIELD_PRIORITY])); } @@ -450,6 +474,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PRN_REASON])) { if (is_array($data[self::FIELD_PRN_REASON])) { foreach($data[self::FIELD_PRN_REASON] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addPrnReason($v); } else { @@ -468,8 +495,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_RECORDED_ON] instanceof FHIRDateTime) { $this->setRecordedOn($data[self::FIELD_RECORDED_ON]); - } elseif ($ext && is_scalar($data[self::FIELD_RECORDED_ON])) { - $this->setRecordedOn(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_RECORDED_ON]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_RECORDED_ON])) { + $this->setRecordedOn(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_RECORDED_ON]] + $ext)); + } else if (is_array($data[self::FIELD_RECORDED_ON])) { + $this->setRecordedOn(new FHIRDateTime(array_merge($ext, $data[self::FIELD_RECORDED_ON]))); + } } else { $this->setRecordedOn(new FHIRDateTime($data[self::FIELD_RECORDED_ON])); } @@ -480,8 +511,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRDeviceUseRequestStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRDeviceUseRequestStatus([FHIRDeviceUseRequestStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRDeviceUseRequestStatus([FHIRDeviceUseRequestStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRDeviceUseRequestStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRDeviceUseRequestStatus($data[self::FIELD_STATUS])); } @@ -499,8 +534,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TIMING_DATE_TIME] instanceof FHIRDateTime) { $this->setTimingDateTime($data[self::FIELD_TIMING_DATE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_TIMING_DATE_TIME])) { - $this->setTimingDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_TIMING_DATE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TIMING_DATE_TIME])) { + $this->setTimingDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_TIMING_DATE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_TIMING_DATE_TIME])) { + $this->setTimingDateTime(new FHIRDateTime(array_merge($ext, $data[self::FIELD_TIMING_DATE_TIME]))); + } } else { $this->setTimingDateTime(new FHIRDateTime($data[self::FIELD_TIMING_DATE_TIME])); } @@ -1373,23 +1412,18 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getBodySiteCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_BODY_SITE_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getBodySiteReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_BODY_SITE_REFERENCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDevice())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEVICE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getEncounter())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ENCOUNTER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -1407,6 +1441,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_INDICATION, null, $v->_getFHIRXMLNamespace())); } } + if ([] !== ($vs = $this->getNotes())) { foreach($vs as $v) { if (null === $v) { @@ -1415,14 +1450,13 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_NOTES, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getOrderedOn())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ORDERED_ON, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPriority())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PRIORITY, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getPrnReason())) { foreach($vs as $v) { if (null === $v) { @@ -1431,25 +1465,22 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_PRN_REASON, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getRecordedOn())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RECORDED_ON, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSubject())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBJECT, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getTimingDateTime())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TIMING_DATE_TIME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getTimingPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TIMING_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getTimingTiming())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TIMING_TIMING, null, $v->_getFHIRXMLNamespace())); } @@ -1475,7 +1506,23 @@ public function jsonSerialize() $a[self::FIELD_ENCOUNTER] = $v; } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if ([] !== ($vs = $this->getIndication())) { $a[self::FIELD_INDICATION] = $vs; @@ -1486,33 +1533,79 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_NOTES][] = $v->getValue(); - $a[self::FIELD_NOTES_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NOTES][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NOTES_EXT][] = $enc; + } else { + $a[self::FIELD_NOTES_EXT][] = null; + } + } else { + $a[self::FIELD_NOTES][] = $v; + } } } if (null !== ($v = $this->getOrderedOn())) { - $a[self::FIELD_ORDERED_ON] = $v->getValue(); - $a[self::FIELD_ORDERED_ON_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ORDERED_ON] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ORDERED_ON_EXT] = $enc; + } + } else { + $a[self::FIELD_ORDERED_ON] = $v; + } } if (null !== ($v = $this->getPriority())) { - $a[self::FIELD_PRIORITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PRIORITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PRIORITY_EXT] = $enc; + } + } else { + $a[self::FIELD_PRIORITY] = $v; + } } if ([] !== ($vs = $this->getPrnReason())) { $a[self::FIELD_PRN_REASON] = $vs; } if (null !== ($v = $this->getRecordedOn())) { - $a[self::FIELD_RECORDED_ON] = $v->getValue(); - $a[self::FIELD_RECORDED_ON_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_RECORDED_ON] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_RECORDED_ON_EXT] = $enc; + } + } else { + $a[self::FIELD_RECORDED_ON] = $v; + } } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getSubject())) { $a[self::FIELD_SUBJECT] = $v; } if (null !== ($v = $this->getTimingDateTime())) { - $a[self::FIELD_TIMING_DATE_TIME] = $v->getValue(); - $a[self::FIELD_TIMING_DATE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TIMING_DATE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TIMING_DATE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_TIMING_DATE_TIME] = $v; + } } if (null !== ($v = $this->getTimingPeriod())) { $a[self::FIELD_TIMING_PERIOD] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRDeviceUseStatement.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRDeviceUseStatement.php index e83cb7e08f..af03dbd120 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRDeviceUseStatement.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRDeviceUseStatement.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -86,10 +86,6 @@ class FHIRDeviceUseStatement extends FHIRDomainResource implements PHPFHIRContai { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DEVICE_USE_STATEMENT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_BODY_SITE_CODEABLE_CONCEPT = 'bodySiteCodeableConcept'; const FIELD_BODY_SITE_REFERENCE = 'bodySiteReference'; const FIELD_DEVICE = 'device'; @@ -254,6 +250,9 @@ class FHIRDeviceUseStatement extends FHIRDomainResource implements PHPFHIRContai */ protected $whenUsed = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRDeviceUseStatement Constructor * @param null|array $data @@ -297,17 +296,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -316,6 +322,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_INDICATION])) { if (is_array($data[self::FIELD_INDICATION])) { foreach($data[self::FIELD_INDICATION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addIndication($v); } else { @@ -334,17 +343,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_NOTES])) { foreach($data[self::FIELD_NOTES] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRString) { $this->addNotes($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addNotes(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addNotes(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addNotes(new FHIRString(array_merge($v, $ext[$i]))); + } } else { $this->addNotes(new FHIRString($v)); } } } elseif ($data[self::FIELD_NOTES] instanceof FHIRString) { $this->addNotes($data[self::FIELD_NOTES]); - } elseif ($ext && is_scalar($data[self::FIELD_NOTES])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_NOTES])) { $this->addNotes(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NOTES]] + $ext)); } else { $this->addNotes(new FHIRString($data[self::FIELD_NOTES])); @@ -356,8 +372,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_RECORDED_ON] instanceof FHIRDateTime) { $this->setRecordedOn($data[self::FIELD_RECORDED_ON]); - } elseif ($ext && is_scalar($data[self::FIELD_RECORDED_ON])) { - $this->setRecordedOn(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_RECORDED_ON]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_RECORDED_ON])) { + $this->setRecordedOn(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_RECORDED_ON]] + $ext)); + } else if (is_array($data[self::FIELD_RECORDED_ON])) { + $this->setRecordedOn(new FHIRDateTime(array_merge($ext, $data[self::FIELD_RECORDED_ON]))); + } } else { $this->setRecordedOn(new FHIRDateTime($data[self::FIELD_RECORDED_ON])); } @@ -375,8 +395,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TIMING_DATE_TIME] instanceof FHIRDateTime) { $this->setTimingDateTime($data[self::FIELD_TIMING_DATE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_TIMING_DATE_TIME])) { - $this->setTimingDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_TIMING_DATE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TIMING_DATE_TIME])) { + $this->setTimingDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_TIMING_DATE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_TIMING_DATE_TIME])) { + $this->setTimingDateTime(new FHIRDateTime(array_merge($ext, $data[self::FIELD_TIMING_DATE_TIME]))); + } } else { $this->setTimingDateTime(new FHIRDateTime($data[self::FIELD_TIMING_DATE_TIME])); } @@ -1057,19 +1081,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getBodySiteCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_BODY_SITE_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getBodySiteReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_BODY_SITE_REFERENCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDevice())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEVICE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -1087,6 +1107,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_INDICATION, null, $v->_getFHIRXMLNamespace())); } } + if ([] !== ($vs = $this->getNotes())) { foreach($vs as $v) { if (null === $v) { @@ -1095,25 +1116,22 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_NOTES, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getRecordedOn())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RECORDED_ON, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSubject())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBJECT, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getTimingDateTime())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TIMING_DATE_TIME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getTimingPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TIMING_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getTimingTiming())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TIMING_TIMING, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getWhenUsed())) { $v->xmlSerialize($sxe->addChild(self::FIELD_WHEN_USED, null, $v->_getFHIRXMLNamespace())); } @@ -1136,7 +1154,23 @@ public function jsonSerialize() $a[self::FIELD_DEVICE] = $v; } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if ([] !== ($vs = $this->getIndication())) { $a[self::FIELD_INDICATION] = $vs; @@ -1147,20 +1181,43 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_NOTES][] = $v->getValue(); - $a[self::FIELD_NOTES_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NOTES][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NOTES_EXT][] = $enc; + } else { + $a[self::FIELD_NOTES_EXT][] = null; + } + } else { + $a[self::FIELD_NOTES][] = $v; + } } } if (null !== ($v = $this->getRecordedOn())) { - $a[self::FIELD_RECORDED_ON] = $v->getValue(); - $a[self::FIELD_RECORDED_ON_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_RECORDED_ON] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_RECORDED_ON_EXT] = $enc; + } + } else { + $a[self::FIELD_RECORDED_ON] = $v; + } } if (null !== ($v = $this->getSubject())) { $a[self::FIELD_SUBJECT] = $v; } if (null !== ($v = $this->getTimingDateTime())) { - $a[self::FIELD_TIMING_DATE_TIME] = $v->getValue(); - $a[self::FIELD_TIMING_DATE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TIMING_DATE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TIMING_DATE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_TIMING_DATE_TIME] = $v; + } } if (null !== ($v = $this->getTimingPeriod())) { $a[self::FIELD_TIMING_PERIOD] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRDiagnosticOrder.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRDiagnosticOrder.php index 97e5b84785..d9775c13c1 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRDiagnosticOrder.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRDiagnosticOrder.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -86,10 +86,6 @@ class FHIRDiagnosticOrder extends FHIRDomainResource implements PHPFHIRContained { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DIAGNOSTIC_ORDER; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ENCOUNTER = 'encounter'; const FIELD_EVENT = 'event'; const FIELD_IDENTIFIER = 'identifier'; @@ -249,6 +245,9 @@ class FHIRDiagnosticOrder extends FHIRDomainResource implements PHPFHIRContained */ protected $supportingInformation = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRDiagnosticOrder Constructor * @param null|array $data @@ -275,6 +274,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_EVENT])) { if (is_array($data[self::FIELD_EVENT])) { foreach($data[self::FIELD_EVENT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRDiagnosticOrderEvent) { $this->addEvent($v); } else { @@ -293,17 +295,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -312,6 +321,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ITEM])) { if (is_array($data[self::FIELD_ITEM])) { foreach($data[self::FIELD_ITEM] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRDiagnosticOrderItem) { $this->addItem($v); } else { @@ -327,6 +339,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_NOTE])) { if (is_array($data[self::FIELD_NOTE])) { foreach($data[self::FIELD_NOTE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRAnnotation) { $this->addNote($v); } else { @@ -352,8 +367,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PRIORITY] instanceof FHIRDiagnosticOrderPriority) { $this->setPriority($data[self::FIELD_PRIORITY]); - } elseif ($ext && is_scalar($data[self::FIELD_PRIORITY])) { - $this->setPriority(new FHIRDiagnosticOrderPriority([FHIRDiagnosticOrderPriority::FIELD_VALUE => $data[self::FIELD_PRIORITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PRIORITY])) { + $this->setPriority(new FHIRDiagnosticOrderPriority([FHIRDiagnosticOrderPriority::FIELD_VALUE => $data[self::FIELD_PRIORITY]] + $ext)); + } else if (is_array($data[self::FIELD_PRIORITY])) { + $this->setPriority(new FHIRDiagnosticOrderPriority(array_merge($ext, $data[self::FIELD_PRIORITY]))); + } } else { $this->setPriority(new FHIRDiagnosticOrderPriority($data[self::FIELD_PRIORITY])); } @@ -361,6 +380,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REASON])) { if (is_array($data[self::FIELD_REASON])) { foreach($data[self::FIELD_REASON] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addReason($v); } else { @@ -376,6 +398,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SPECIMEN])) { if (is_array($data[self::FIELD_SPECIMEN])) { foreach($data[self::FIELD_SPECIMEN] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addSpecimen($v); } else { @@ -394,8 +419,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRDiagnosticOrderStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRDiagnosticOrderStatus([FHIRDiagnosticOrderStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRDiagnosticOrderStatus([FHIRDiagnosticOrderStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRDiagnosticOrderStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRDiagnosticOrderStatus($data[self::FIELD_STATUS])); } @@ -410,6 +439,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SUPPORTING_INFORMATION])) { if (is_array($data[self::FIELD_SUPPORTING_INFORMATION])) { foreach($data[self::FIELD_SUPPORTING_INFORMATION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addSupportingInformation($v); } else { @@ -1154,11 +1186,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getEncounter())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ENCOUNTER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getEvent())) { foreach($vs as $v) { if (null === $v) { @@ -1198,11 +1228,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getOrderer())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ORDERER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPriority())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PRIORITY, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getReason())) { foreach($vs as $v) { if (null === $v) { @@ -1224,11 +1252,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSubject())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBJECT, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getSupportingInformation())) { foreach($vs as $v) { if (null === $v) { @@ -1237,6 +1263,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_SUPPORTING_INFORMATION, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } @@ -1253,7 +1280,23 @@ public function jsonSerialize() $a[self::FIELD_EVENT] = $vs; } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if ([] !== ($vs = $this->getItem())) { $a[self::FIELD_ITEM] = $vs; @@ -1265,7 +1308,15 @@ public function jsonSerialize() $a[self::FIELD_ORDERER] = $v; } if (null !== ($v = $this->getPriority())) { - $a[self::FIELD_PRIORITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PRIORITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PRIORITY_EXT] = $enc; + } + } else { + $a[self::FIELD_PRIORITY] = $v; + } } if ([] !== ($vs = $this->getReason())) { $a[self::FIELD_REASON] = $vs; @@ -1274,7 +1325,15 @@ public function jsonSerialize() $a[self::FIELD_SPECIMEN] = $vs; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getSubject())) { $a[self::FIELD_SUBJECT] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRDiagnosticReport.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRDiagnosticReport.php index 310bb5f401..824e6f9906 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRDiagnosticReport.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRDiagnosticReport.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -92,10 +92,6 @@ class FHIRDiagnosticReport extends FHIRDomainResource implements PHPFHIRContaine { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DIAGNOSTIC_REPORT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CATEGORY = 'category'; const FIELD_CODE = 'code'; const FIELD_CODED_DIAGNOSIS = 'codedDiagnosis'; @@ -348,6 +344,9 @@ class FHIRDiagnosticReport extends FHIRDomainResource implements PHPFHIRContaine */ protected $subject = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRDiagnosticReport Constructor * @param null|array $data @@ -381,6 +380,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CODED_DIAGNOSIS])) { if (is_array($data[self::FIELD_CODED_DIAGNOSIS])) { foreach($data[self::FIELD_CODED_DIAGNOSIS] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addCodedDiagnosis($v); } else { @@ -399,8 +401,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CONCLUSION] instanceof FHIRString) { $this->setConclusion($data[self::FIELD_CONCLUSION]); - } elseif ($ext && is_scalar($data[self::FIELD_CONCLUSION])) { - $this->setConclusion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_CONCLUSION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CONCLUSION])) { + $this->setConclusion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_CONCLUSION]] + $ext)); + } else if (is_array($data[self::FIELD_CONCLUSION])) { + $this->setConclusion(new FHIRString(array_merge($ext, $data[self::FIELD_CONCLUSION]))); + } } else { $this->setConclusion(new FHIRString($data[self::FIELD_CONCLUSION])); } @@ -411,8 +417,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EFFECTIVE_DATE_TIME] instanceof FHIRDateTime) { $this->setEffectiveDateTime($data[self::FIELD_EFFECTIVE_DATE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_EFFECTIVE_DATE_TIME])) { - $this->setEffectiveDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_EFFECTIVE_DATE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EFFECTIVE_DATE_TIME])) { + $this->setEffectiveDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_EFFECTIVE_DATE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_EFFECTIVE_DATE_TIME])) { + $this->setEffectiveDateTime(new FHIRDateTime(array_merge($ext, $data[self::FIELD_EFFECTIVE_DATE_TIME]))); + } } else { $this->setEffectiveDateTime(new FHIRDateTime($data[self::FIELD_EFFECTIVE_DATE_TIME])); } @@ -437,17 +447,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -456,6 +473,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_IMAGE])) { if (is_array($data[self::FIELD_IMAGE])) { foreach($data[self::FIELD_IMAGE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRDiagnosticReportImage) { $this->addImage($v); } else { @@ -471,6 +491,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_IMAGING_STUDY])) { if (is_array($data[self::FIELD_IMAGING_STUDY])) { foreach($data[self::FIELD_IMAGING_STUDY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addImagingStudy($v); } else { @@ -489,8 +512,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ISSUED] instanceof FHIRInstant) { $this->setIssued($data[self::FIELD_ISSUED]); - } elseif ($ext && is_scalar($data[self::FIELD_ISSUED])) { - $this->setIssued(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_ISSUED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ISSUED])) { + $this->setIssued(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_ISSUED]] + $ext)); + } else if (is_array($data[self::FIELD_ISSUED])) { + $this->setIssued(new FHIRInstant(array_merge($ext, $data[self::FIELD_ISSUED]))); + } } else { $this->setIssued(new FHIRInstant($data[self::FIELD_ISSUED])); } @@ -505,6 +532,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PRESENTED_FORM])) { if (is_array($data[self::FIELD_PRESENTED_FORM])) { foreach($data[self::FIELD_PRESENTED_FORM] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRAttachment) { $this->addPresentedForm($v); } else { @@ -520,6 +550,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REQUEST])) { if (is_array($data[self::FIELD_REQUEST])) { foreach($data[self::FIELD_REQUEST] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addRequest($v); } else { @@ -535,6 +568,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_RESULT])) { if (is_array($data[self::FIELD_RESULT])) { foreach($data[self::FIELD_RESULT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addResult($v); } else { @@ -550,6 +586,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SPECIMEN])) { if (is_array($data[self::FIELD_SPECIMEN])) { foreach($data[self::FIELD_SPECIMEN] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addSpecimen($v); } else { @@ -568,8 +607,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRDiagnosticReportStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRDiagnosticReportStatus([FHIRDiagnosticReportStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRDiagnosticReportStatus([FHIRDiagnosticReportStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRDiagnosticReportStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRDiagnosticReportStatus($data[self::FIELD_STATUS])); } @@ -1613,15 +1656,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getCategory())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CATEGORY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getCodedDiagnosis())) { foreach($vs as $v) { if (null === $v) { @@ -1630,21 +1670,19 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_CODED_DIAGNOSIS, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getConclusion())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CONCLUSION, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getEffectiveDateTime())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EFFECTIVE_DATE_TIME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getEffectivePeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EFFECTIVE_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getEncounter())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ENCOUNTER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -1671,14 +1709,13 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_IMAGING_STUDY, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getIssued())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ISSUED, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPerformer())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PERFORMER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getPresentedForm())) { foreach($vs as $v) { if (null === $v) { @@ -1718,7 +1755,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSubject())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBJECT, null, $v->_getFHIRXMLNamespace())); } @@ -1741,12 +1777,26 @@ public function jsonSerialize() $a[self::FIELD_CODED_DIAGNOSIS] = $vs; } if (null !== ($v = $this->getConclusion())) { - $a[self::FIELD_CONCLUSION] = $v->getValue(); - $a[self::FIELD_CONCLUSION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CONCLUSION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CONCLUSION_EXT] = $enc; + } + } else { + $a[self::FIELD_CONCLUSION] = $v; + } } if (null !== ($v = $this->getEffectiveDateTime())) { - $a[self::FIELD_EFFECTIVE_DATE_TIME] = $v->getValue(); - $a[self::FIELD_EFFECTIVE_DATE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EFFECTIVE_DATE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EFFECTIVE_DATE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_EFFECTIVE_DATE_TIME] = $v; + } } if (null !== ($v = $this->getEffectivePeriod())) { $a[self::FIELD_EFFECTIVE_PERIOD] = $v; @@ -1755,7 +1805,23 @@ public function jsonSerialize() $a[self::FIELD_ENCOUNTER] = $v; } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if ([] !== ($vs = $this->getImage())) { $a[self::FIELD_IMAGE] = $vs; @@ -1764,8 +1830,15 @@ public function jsonSerialize() $a[self::FIELD_IMAGING_STUDY] = $vs; } if (null !== ($v = $this->getIssued())) { - $a[self::FIELD_ISSUED] = $v->getValue(); - $a[self::FIELD_ISSUED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ISSUED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ISSUED_EXT] = $enc; + } + } else { + $a[self::FIELD_ISSUED] = $v; + } } if (null !== ($v = $this->getPerformer())) { $a[self::FIELD_PERFORMER] = $v; @@ -1783,7 +1856,15 @@ public function jsonSerialize() $a[self::FIELD_SPECIMEN] = $vs; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getSubject())) { $a[self::FIELD_SUBJECT] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRDocumentManifest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRDocumentManifest.php index af61741063..b16abe5dba 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRDocumentManifest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRDocumentManifest.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -87,10 +87,6 @@ class FHIRDocumentManifest extends FHIRDomainResource implements PHPFHIRContaine { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DOCUMENT_MANIFEST; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_AUTHOR = 'author'; const FIELD_CONTENT = 'content'; const FIELD_CREATED = 'created'; @@ -258,6 +254,9 @@ class FHIRDocumentManifest extends FHIRDomainResource implements PHPFHIRContaine */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRDocumentManifest Constructor * @param null|array $data @@ -277,6 +276,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_AUTHOR])) { if (is_array($data[self::FIELD_AUTHOR])) { foreach($data[self::FIELD_AUTHOR] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addAuthor($v); } else { @@ -292,6 +294,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CONTENT])) { if (is_array($data[self::FIELD_CONTENT])) { foreach($data[self::FIELD_CONTENT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRDocumentManifestContent) { $this->addContent($v); } else { @@ -310,8 +315,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CREATED] instanceof FHIRDateTime) { $this->setCreated($data[self::FIELD_CREATED]); - } elseif ($ext && is_scalar($data[self::FIELD_CREATED])) { - $this->setCreated(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_CREATED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CREATED])) { + $this->setCreated(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_CREATED]] + $ext)); + } else if (is_array($data[self::FIELD_CREATED])) { + $this->setCreated(new FHIRDateTime(array_merge($ext, $data[self::FIELD_CREATED]))); + } } else { $this->setCreated(new FHIRDateTime($data[self::FIELD_CREATED])); } @@ -322,8 +331,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -334,17 +347,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -356,8 +376,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MASTER_IDENTIFIER] instanceof FHIRIdentifier) { $this->setMasterIdentifier($data[self::FIELD_MASTER_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_MASTER_IDENTIFIER])) { - $this->setMasterIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_MASTER_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MASTER_IDENTIFIER])) { + $this->setMasterIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_MASTER_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_MASTER_IDENTIFIER])) { + $this->setMasterIdentifier(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_MASTER_IDENTIFIER]))); + } } else { $this->setMasterIdentifier(new FHIRIdentifier($data[self::FIELD_MASTER_IDENTIFIER])); } @@ -365,6 +389,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_RECIPIENT])) { if (is_array($data[self::FIELD_RECIPIENT])) { foreach($data[self::FIELD_RECIPIENT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addRecipient($v); } else { @@ -380,6 +407,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_RELATED])) { if (is_array($data[self::FIELD_RELATED])) { foreach($data[self::FIELD_RELATED] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRDocumentManifestRelated) { $this->addRelated($v); } else { @@ -398,8 +428,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SOURCE] instanceof FHIRUri) { $this->setSource($data[self::FIELD_SOURCE]); - } elseif ($ext && is_scalar($data[self::FIELD_SOURCE])) { - $this->setSource(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_SOURCE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SOURCE])) { + $this->setSource(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_SOURCE]] + $ext)); + } else if (is_array($data[self::FIELD_SOURCE])) { + $this->setSource(new FHIRUri(array_merge($ext, $data[self::FIELD_SOURCE]))); + } } else { $this->setSource(new FHIRUri($data[self::FIELD_SOURCE])); } @@ -410,8 +444,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRCode) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRCode(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRCode($data[self::FIELD_STATUS])); } @@ -1150,7 +1188,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getAuthor())) { foreach($vs as $v) { if (null === $v) { @@ -1168,13 +1205,13 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_CONTENT, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getCreated())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CREATED, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getDescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESCRIPTION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -1187,7 +1224,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getMasterIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MASTER_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getRecipient())) { foreach($vs as $v) { if (null === $v) { @@ -1205,17 +1241,16 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_RELATED, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getSource())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SOURCE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSubject())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBJECT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -1235,18 +1270,56 @@ public function jsonSerialize() $a[self::FIELD_CONTENT] = $vs; } if (null !== ($v = $this->getCreated())) { - $a[self::FIELD_CREATED] = $v->getValue(); - $a[self::FIELD_CREATED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CREATED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CREATED_EXT] = $enc; + } + } else { + $a[self::FIELD_CREATED] = $v; + } } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if (null !== ($v = $this->getMasterIdentifier())) { - $a[self::FIELD_MASTER_IDENTIFIER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MASTER_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MASTER_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_MASTER_IDENTIFIER] = $v; + } } if ([] !== ($vs = $this->getRecipient())) { $a[self::FIELD_RECIPIENT] = $vs; @@ -1255,12 +1328,26 @@ public function jsonSerialize() $a[self::FIELD_RELATED] = $vs; } if (null !== ($v = $this->getSource())) { - $a[self::FIELD_SOURCE] = $v->getValue(); - $a[self::FIELD_SOURCE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SOURCE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SOURCE_EXT] = $enc; + } + } else { + $a[self::FIELD_SOURCE] = $v; + } } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v->getValue(); - $a[self::FIELD_STATUS_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getSubject())) { $a[self::FIELD_SUBJECT] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRDocumentReference.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRDocumentReference.php index d3f37ee48d..51856600db 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRDocumentReference.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRDocumentReference.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -88,10 +88,6 @@ class FHIRDocumentReference extends FHIRDomainResource implements PHPFHIRContain { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DOCUMENT_REFERENCE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_AUTHENTICATOR = 'authenticator'; const FIELD_AUTHOR = 'author'; const FIELD_CLASS = 'class'; @@ -325,6 +321,9 @@ class FHIRDocumentReference extends FHIRDomainResource implements PHPFHIRContain */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRDocumentReference Constructor * @param null|array $data @@ -351,6 +350,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_AUTHOR])) { if (is_array($data[self::FIELD_AUTHOR])) { foreach($data[self::FIELD_AUTHOR] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addAuthor($v); } else { @@ -373,6 +375,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CONTENT])) { if (is_array($data[self::FIELD_CONTENT])) { foreach($data[self::FIELD_CONTENT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRDocumentReferenceContent) { $this->addContent($v); } else { @@ -398,8 +403,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CREATED] instanceof FHIRDateTime) { $this->setCreated($data[self::FIELD_CREATED]); - } elseif ($ext && is_scalar($data[self::FIELD_CREATED])) { - $this->setCreated(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_CREATED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CREATED])) { + $this->setCreated(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_CREATED]] + $ext)); + } else if (is_array($data[self::FIELD_CREATED])) { + $this->setCreated(new FHIRDateTime(array_merge($ext, $data[self::FIELD_CREATED]))); + } } else { $this->setCreated(new FHIRDateTime($data[self::FIELD_CREATED])); } @@ -417,8 +426,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -436,17 +449,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -458,8 +478,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_INDEXED] instanceof FHIRInstant) { $this->setIndexed($data[self::FIELD_INDEXED]); - } elseif ($ext && is_scalar($data[self::FIELD_INDEXED])) { - $this->setIndexed(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_INDEXED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_INDEXED])) { + $this->setIndexed(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_INDEXED]] + $ext)); + } else if (is_array($data[self::FIELD_INDEXED])) { + $this->setIndexed(new FHIRInstant(array_merge($ext, $data[self::FIELD_INDEXED]))); + } } else { $this->setIndexed(new FHIRInstant($data[self::FIELD_INDEXED])); } @@ -470,8 +494,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MASTER_IDENTIFIER] instanceof FHIRIdentifier) { $this->setMasterIdentifier($data[self::FIELD_MASTER_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_MASTER_IDENTIFIER])) { - $this->setMasterIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_MASTER_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MASTER_IDENTIFIER])) { + $this->setMasterIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_MASTER_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_MASTER_IDENTIFIER])) { + $this->setMasterIdentifier(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_MASTER_IDENTIFIER]))); + } } else { $this->setMasterIdentifier(new FHIRIdentifier($data[self::FIELD_MASTER_IDENTIFIER])); } @@ -479,6 +507,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_RELATES_TO])) { if (is_array($data[self::FIELD_RELATES_TO])) { foreach($data[self::FIELD_RELATES_TO] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRDocumentReferenceRelatesTo) { $this->addRelatesTo($v); } else { @@ -494,6 +525,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SECURITY_LABEL])) { if (is_array($data[self::FIELD_SECURITY_LABEL])) { foreach($data[self::FIELD_SECURITY_LABEL] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addSecurityLabel($v); } else { @@ -512,8 +546,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRCode) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRCode(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRCode($data[self::FIELD_STATUS])); } @@ -1434,11 +1472,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getAuthenticator())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AUTHENTICATOR, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getAuthor())) { foreach($vs as $v) { if (null === $v) { @@ -1451,7 +1487,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getClass())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CLASS, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getContent())) { foreach($vs as $v) { if (null === $v) { @@ -1467,18 +1502,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getCreated())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CREATED, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getCustodian())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CUSTODIAN, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getDescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESCRIPTION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDocStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DOC_STATUS, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -1487,14 +1519,13 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getIndexed())) { $v->xmlSerialize($sxe->addChild(self::FIELD_INDEXED, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getMasterIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MASTER_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getRelatesTo())) { foreach($vs as $v) { if (null === $v) { @@ -1512,14 +1543,13 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_SECURITY_LABEL, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSubject())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBJECT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -1548,28 +1578,73 @@ public function jsonSerialize() $a[self::FIELD_CONTEXT] = $v; } if (null !== ($v = $this->getCreated())) { - $a[self::FIELD_CREATED] = $v->getValue(); - $a[self::FIELD_CREATED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CREATED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CREATED_EXT] = $enc; + } + } else { + $a[self::FIELD_CREATED] = $v; + } } if (null !== ($v = $this->getCustodian())) { $a[self::FIELD_CUSTODIAN] = $v; } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if (null !== ($v = $this->getDocStatus())) { $a[self::FIELD_DOC_STATUS] = $v; } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if (null !== ($v = $this->getIndexed())) { - $a[self::FIELD_INDEXED] = $v->getValue(); - $a[self::FIELD_INDEXED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_INDEXED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_INDEXED_EXT] = $enc; + } + } else { + $a[self::FIELD_INDEXED] = $v; + } } if (null !== ($v = $this->getMasterIdentifier())) { - $a[self::FIELD_MASTER_IDENTIFIER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MASTER_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MASTER_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_MASTER_IDENTIFIER] = $v; + } } if ([] !== ($vs = $this->getRelatesTo())) { $a[self::FIELD_RELATES_TO] = $vs; @@ -1578,8 +1653,15 @@ public function jsonSerialize() $a[self::FIELD_SECURITY_LABEL] = $vs; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v->getValue(); - $a[self::FIELD_STATUS_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getSubject())) { $a[self::FIELD_SUBJECT] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIREligibilityRequest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIREligibilityRequest.php index 7e9baf50b9..fb5be21638 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIREligibilityRequest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIREligibilityRequest.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -83,10 +83,6 @@ class FHIREligibilityRequest extends FHIRDomainResource implements PHPFHIRContai { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ELIGIBILITY_REQUEST; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CREATED = 'created'; const FIELD_CREATED_EXT = '_created'; const FIELD_IDENTIFIER = 'identifier'; @@ -179,6 +175,9 @@ class FHIREligibilityRequest extends FHIRDomainResource implements PHPFHIRContai */ protected $target = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIREligibilityRequest Constructor * @param null|array $data @@ -201,8 +200,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CREATED] instanceof FHIRDateTime) { $this->setCreated($data[self::FIELD_CREATED]); - } elseif ($ext && is_scalar($data[self::FIELD_CREATED])) { - $this->setCreated(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_CREATED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CREATED])) { + $this->setCreated(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_CREATED]] + $ext)); + } else if (is_array($data[self::FIELD_CREATED])) { + $this->setCreated(new FHIRDateTime(array_merge($ext, $data[self::FIELD_CREATED]))); + } } else { $this->setCreated(new FHIRDateTime($data[self::FIELD_CREATED])); } @@ -213,17 +216,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -656,7 +666,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getCreated())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CREATED, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -669,19 +678,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getOrganization())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ORGANIZATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOriginalRuleset())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ORIGINAL_RULESET, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getProvider())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PROVIDER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRuleset())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RULESET, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getTarget())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TARGET, null, $v->_getFHIRXMLNamespace())); } @@ -695,11 +700,34 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getCreated())) { - $a[self::FIELD_CREATED] = $v->getValue(); - $a[self::FIELD_CREATED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CREATED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CREATED_EXT] = $enc; + } + } else { + $a[self::FIELD_CREATED] = $v; + } } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if (null !== ($v = $this->getOrganization())) { $a[self::FIELD_ORGANIZATION] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIREligibilityResponse.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIREligibilityResponse.php index 7b72bc6efb..905da6a977 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIREligibilityResponse.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIREligibilityResponse.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -85,10 +85,6 @@ class FHIREligibilityResponse extends FHIRDomainResource implements PHPFHIRConta { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ELIGIBILITY_RESPONSE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CREATED = 'created'; const FIELD_CREATED_EXT = '_created'; const FIELD_DISPOSITION = 'disposition'; @@ -220,6 +216,9 @@ class FHIREligibilityResponse extends FHIRDomainResource implements PHPFHIRConta */ protected $ruleset = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIREligibilityResponse Constructor * @param null|array $data @@ -242,8 +241,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CREATED] instanceof FHIRDateTime) { $this->setCreated($data[self::FIELD_CREATED]); - } elseif ($ext && is_scalar($data[self::FIELD_CREATED])) { - $this->setCreated(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_CREATED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CREATED])) { + $this->setCreated(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_CREATED]] + $ext)); + } else if (is_array($data[self::FIELD_CREATED])) { + $this->setCreated(new FHIRDateTime(array_merge($ext, $data[self::FIELD_CREATED]))); + } } else { $this->setCreated(new FHIRDateTime($data[self::FIELD_CREATED])); } @@ -254,8 +257,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DISPOSITION] instanceof FHIRString) { $this->setDisposition($data[self::FIELD_DISPOSITION]); - } elseif ($ext && is_scalar($data[self::FIELD_DISPOSITION])) { - $this->setDisposition(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DISPOSITION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DISPOSITION])) { + $this->setDisposition(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DISPOSITION]] + $ext)); + } else if (is_array($data[self::FIELD_DISPOSITION])) { + $this->setDisposition(new FHIRString(array_merge($ext, $data[self::FIELD_DISPOSITION]))); + } } else { $this->setDisposition(new FHIRString($data[self::FIELD_DISPOSITION])); } @@ -266,17 +273,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -302,8 +316,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_OUTCOME] instanceof FHIRCode) { $this->setOutcome($data[self::FIELD_OUTCOME]); - } elseif ($ext && is_scalar($data[self::FIELD_OUTCOME])) { - $this->setOutcome(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_OUTCOME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_OUTCOME])) { + $this->setOutcome(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_OUTCOME]] + $ext)); + } else if (is_array($data[self::FIELD_OUTCOME])) { + $this->setOutcome(new FHIRCode(array_merge($ext, $data[self::FIELD_OUTCOME]))); + } } else { $this->setOutcome(new FHIRCode($data[self::FIELD_OUTCOME])); } @@ -854,7 +872,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDisposition())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DISPOSITION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -867,26 +884,21 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getOrganization())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ORGANIZATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOriginalRuleset())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ORIGINAL_RULESET, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getOutcome())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OUTCOME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRequest())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REQUEST, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRequestOrganization())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REQUEST_ORGANIZATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRequestProvider())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REQUEST_PROVIDER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRuleset())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RULESET, null, $v->_getFHIRXMLNamespace())); } @@ -900,15 +912,45 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getCreated())) { - $a[self::FIELD_CREATED] = $v->getValue(); - $a[self::FIELD_CREATED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CREATED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CREATED_EXT] = $enc; + } + } else { + $a[self::FIELD_CREATED] = $v; + } } if (null !== ($v = $this->getDisposition())) { - $a[self::FIELD_DISPOSITION] = $v->getValue(); - $a[self::FIELD_DISPOSITION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DISPOSITION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DISPOSITION_EXT] = $enc; + } + } else { + $a[self::FIELD_DISPOSITION] = $v; + } } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if (null !== ($v = $this->getOrganization())) { $a[self::FIELD_ORGANIZATION] = $v; @@ -917,8 +959,15 @@ public function jsonSerialize() $a[self::FIELD_ORIGINAL_RULESET] = $v; } if (null !== ($v = $this->getOutcome())) { - $a[self::FIELD_OUTCOME] = $v->getValue(); - $a[self::FIELD_OUTCOME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_OUTCOME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_OUTCOME_EXT] = $enc; + } + } else { + $a[self::FIELD_OUTCOME] = $v; + } } if (null !== ($v = $this->getRequest())) { $a[self::FIELD_REQUEST] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIREncounter.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIREncounter.php index 8721624c9a..805d8c15f7 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIREncounter.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIREncounter.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -90,10 +90,6 @@ class FHIREncounter extends FHIRDomainResource implements PHPFHIRContainedTypeIn { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ENCOUNTER; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_APPOINTMENT = 'appointment'; const FIELD_CLASS = 'class'; const FIELD_CLASS_EXT = '_class'; @@ -104,6 +100,7 @@ class FHIREncounter extends FHIRDomainResource implements PHPFHIRContainedTypeIn const FIELD_INCOMING_REFERRAL = 'incomingReferral'; const FIELD_INDICATION = 'indication'; const FIELD_LENGTH = 'length'; + const FIELD_LENGTH_EXT = '_length'; const FIELD_LOCATION = 'location'; const FIELD_PART_OF = 'partOf'; const FIELD_PARTICIPANT = 'participant'; @@ -338,6 +335,9 @@ class FHIREncounter extends FHIRDomainResource implements PHPFHIRContainedTypeIn */ protected $type = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIREncounter Constructor * @param null|array $data @@ -367,8 +367,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CLASS] instanceof FHIREncounterClass) { $this->setClass($data[self::FIELD_CLASS]); - } elseif ($ext && is_scalar($data[self::FIELD_CLASS])) { - $this->setClass(new FHIREncounterClass([FHIREncounterClass::FIELD_VALUE => $data[self::FIELD_CLASS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CLASS])) { + $this->setClass(new FHIREncounterClass([FHIREncounterClass::FIELD_VALUE => $data[self::FIELD_CLASS]] + $ext)); + } else if (is_array($data[self::FIELD_CLASS])) { + $this->setClass(new FHIREncounterClass(array_merge($ext, $data[self::FIELD_CLASS]))); + } } else { $this->setClass(new FHIREncounterClass($data[self::FIELD_CLASS])); } @@ -376,6 +380,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_EPISODE_OF_CARE])) { if (is_array($data[self::FIELD_EPISODE_OF_CARE])) { foreach($data[self::FIELD_EPISODE_OF_CARE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addEpisodeOfCare($v); } else { @@ -401,17 +408,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -420,6 +434,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_INCOMING_REFERRAL])) { if (is_array($data[self::FIELD_INCOMING_REFERRAL])) { foreach($data[self::FIELD_INCOMING_REFERRAL] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addIncomingReferral($v); } else { @@ -435,6 +452,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_INDICATION])) { if (is_array($data[self::FIELD_INDICATION])) { foreach($data[self::FIELD_INDICATION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addIndication($v); } else { @@ -448,8 +468,17 @@ public function __construct($data = null) } } if (isset($data[self::FIELD_LENGTH])) { + $ext = (isset($data[self::FIELD_LENGTH_EXT]) && is_array($data[self::FIELD_LENGTH_EXT])) + ? $data[self::FIELD_LENGTH_EXT] + : null; if ($data[self::FIELD_LENGTH] instanceof FHIRDuration) { $this->setLength($data[self::FIELD_LENGTH]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_LENGTH])) { + $this->setLength(new FHIRDuration([FHIRDuration::FIELD_VALUE => $data[self::FIELD_LENGTH]] + $ext)); + } else if (is_array($data[self::FIELD_LENGTH])) { + $this->setLength(new FHIRDuration(array_merge($ext, $data[self::FIELD_LENGTH]))); + } } else { $this->setLength(new FHIRDuration($data[self::FIELD_LENGTH])); } @@ -457,6 +486,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_LOCATION])) { if (is_array($data[self::FIELD_LOCATION])) { foreach($data[self::FIELD_LOCATION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIREncounterLocation) { $this->addLocation($v); } else { @@ -479,6 +511,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PARTICIPANT])) { if (is_array($data[self::FIELD_PARTICIPANT])) { foreach($data[self::FIELD_PARTICIPANT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIREncounterParticipant) { $this->addParticipant($v); } else { @@ -515,6 +550,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REASON])) { if (is_array($data[self::FIELD_REASON])) { foreach($data[self::FIELD_REASON] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addReason($v); } else { @@ -540,8 +578,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIREncounterState) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIREncounterState([FHIREncounterState::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIREncounterState([FHIREncounterState::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIREncounterState(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIREncounterState($data[self::FIELD_STATUS])); } @@ -549,6 +591,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_STATUS_HISTORY])) { if (is_array($data[self::FIELD_STATUS_HISTORY])) { foreach($data[self::FIELD_STATUS_HISTORY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIREncounterStatusHistory) { $this->addStatusHistory($v); } else { @@ -564,6 +609,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_TYPE])) { if (is_array($data[self::FIELD_TYPE])) { foreach($data[self::FIELD_TYPE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addType($v); } else { @@ -1600,15 +1648,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getAppointment())) { $v->xmlSerialize($sxe->addChild(self::FIELD_APPOINTMENT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getClass())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CLASS, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getEpisodeOfCare())) { foreach($vs as $v) { if (null === $v) { @@ -1621,7 +1666,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getHospitalization())) { $v->xmlSerialize($sxe->addChild(self::FIELD_HOSPITALIZATION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -1652,7 +1696,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getLength())) { $v->xmlSerialize($sxe->addChild(self::FIELD_LENGTH, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getLocation())) { foreach($vs as $v) { if (null === $v) { @@ -1665,7 +1708,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getPartOf())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PART_OF, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getParticipant())) { foreach($vs as $v) { if (null === $v) { @@ -1678,15 +1720,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getPatient())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATIENT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPriority())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PRIORITY, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getReason())) { foreach($vs as $v) { if (null === $v) { @@ -1699,11 +1738,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getServiceProvider())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SERVICE_PROVIDER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getStatusHistory())) { foreach($vs as $v) { if (null === $v) { @@ -1721,6 +1758,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } @@ -1734,7 +1772,15 @@ public function jsonSerialize() $a[self::FIELD_APPOINTMENT] = $v; } if (null !== ($v = $this->getClass())) { - $a[self::FIELD_CLASS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CLASS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CLASS_EXT] = $enc; + } + } else { + $a[self::FIELD_CLASS] = $v; + } } if ([] !== ($vs = $this->getEpisodeOfCare())) { $a[self::FIELD_EPISODE_OF_CARE] = $vs; @@ -1743,7 +1789,23 @@ public function jsonSerialize() $a[self::FIELD_HOSPITALIZATION] = $v; } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if ([] !== ($vs = $this->getIncomingReferral())) { $a[self::FIELD_INCOMING_REFERRAL] = $vs; @@ -1752,7 +1814,15 @@ public function jsonSerialize() $a[self::FIELD_INDICATION] = $vs; } if (null !== ($v = $this->getLength())) { - $a[self::FIELD_LENGTH] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_LENGTH] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_LENGTH_EXT] = $enc; + } + } else { + $a[self::FIELD_LENGTH] = $v; + } } if ([] !== ($vs = $this->getLocation())) { $a[self::FIELD_LOCATION] = $vs; @@ -1779,7 +1849,15 @@ public function jsonSerialize() $a[self::FIELD_SERVICE_PROVIDER] = $v; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if ([] !== ($vs = $this->getStatusHistory())) { $a[self::FIELD_STATUS_HISTORY] = $vs; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIREnrollmentRequest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIREnrollmentRequest.php index f8f1144294..1aa2fa6a34 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIREnrollmentRequest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIREnrollmentRequest.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -83,10 +83,6 @@ class FHIREnrollmentRequest extends FHIRDomainResource implements PHPFHIRContain { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ENROLLMENT_REQUEST; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_COVERAGE = 'coverage'; const FIELD_CREATED = 'created'; const FIELD_CREATED_EXT = '_created'; @@ -215,6 +211,9 @@ class FHIREnrollmentRequest extends FHIRDomainResource implements PHPFHIRContain */ protected $target = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIREnrollmentRequest Constructor * @param null|array $data @@ -244,8 +243,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CREATED] instanceof FHIRDateTime) { $this->setCreated($data[self::FIELD_CREATED]); - } elseif ($ext && is_scalar($data[self::FIELD_CREATED])) { - $this->setCreated(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_CREATED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CREATED])) { + $this->setCreated(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_CREATED]] + $ext)); + } else if (is_array($data[self::FIELD_CREATED])) { + $this->setCreated(new FHIRDateTime(array_merge($ext, $data[self::FIELD_CREATED]))); + } } else { $this->setCreated(new FHIRDateTime($data[self::FIELD_CREATED])); } @@ -256,17 +259,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -809,14 +819,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getCoverage())) { $v->xmlSerialize($sxe->addChild(self::FIELD_COVERAGE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getCreated())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CREATED, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -829,27 +837,21 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getOrganization())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ORGANIZATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOriginalRuleset())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ORIGINAL_RULESET, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getProvider())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PROVIDER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRelationship())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RELATIONSHIP, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRuleset())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RULESET, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSubject())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBJECT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getTarget())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TARGET, null, $v->_getFHIRXMLNamespace())); } @@ -866,11 +868,34 @@ public function jsonSerialize() $a[self::FIELD_COVERAGE] = $v; } if (null !== ($v = $this->getCreated())) { - $a[self::FIELD_CREATED] = $v->getValue(); - $a[self::FIELD_CREATED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CREATED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CREATED_EXT] = $enc; + } + } else { + $a[self::FIELD_CREATED] = $v; + } } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if (null !== ($v = $this->getOrganization())) { $a[self::FIELD_ORGANIZATION] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIREnrollmentResponse.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIREnrollmentResponse.php index 39113978fb..7323f9555a 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIREnrollmentResponse.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIREnrollmentResponse.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -85,10 +85,6 @@ class FHIREnrollmentResponse extends FHIRDomainResource implements PHPFHIRContai { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ENROLLMENT_RESPONSE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CREATED = 'created'; const FIELD_CREATED_EXT = '_created'; const FIELD_DISPOSITION = 'disposition'; @@ -220,6 +216,9 @@ class FHIREnrollmentResponse extends FHIRDomainResource implements PHPFHIRContai */ protected $ruleset = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIREnrollmentResponse Constructor * @param null|array $data @@ -242,8 +241,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CREATED] instanceof FHIRDateTime) { $this->setCreated($data[self::FIELD_CREATED]); - } elseif ($ext && is_scalar($data[self::FIELD_CREATED])) { - $this->setCreated(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_CREATED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CREATED])) { + $this->setCreated(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_CREATED]] + $ext)); + } else if (is_array($data[self::FIELD_CREATED])) { + $this->setCreated(new FHIRDateTime(array_merge($ext, $data[self::FIELD_CREATED]))); + } } else { $this->setCreated(new FHIRDateTime($data[self::FIELD_CREATED])); } @@ -254,8 +257,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DISPOSITION] instanceof FHIRString) { $this->setDisposition($data[self::FIELD_DISPOSITION]); - } elseif ($ext && is_scalar($data[self::FIELD_DISPOSITION])) { - $this->setDisposition(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DISPOSITION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DISPOSITION])) { + $this->setDisposition(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DISPOSITION]] + $ext)); + } else if (is_array($data[self::FIELD_DISPOSITION])) { + $this->setDisposition(new FHIRString(array_merge($ext, $data[self::FIELD_DISPOSITION]))); + } } else { $this->setDisposition(new FHIRString($data[self::FIELD_DISPOSITION])); } @@ -266,17 +273,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -302,8 +316,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_OUTCOME] instanceof FHIRCode) { $this->setOutcome($data[self::FIELD_OUTCOME]); - } elseif ($ext && is_scalar($data[self::FIELD_OUTCOME])) { - $this->setOutcome(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_OUTCOME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_OUTCOME])) { + $this->setOutcome(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_OUTCOME]] + $ext)); + } else if (is_array($data[self::FIELD_OUTCOME])) { + $this->setOutcome(new FHIRCode(array_merge($ext, $data[self::FIELD_OUTCOME]))); + } } else { $this->setOutcome(new FHIRCode($data[self::FIELD_OUTCOME])); } @@ -854,7 +872,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDisposition())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DISPOSITION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -867,26 +884,21 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getOrganization())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ORGANIZATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOriginalRuleset())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ORIGINAL_RULESET, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getOutcome())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OUTCOME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRequest())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REQUEST, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRequestOrganization())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REQUEST_ORGANIZATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRequestProvider())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REQUEST_PROVIDER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRuleset())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RULESET, null, $v->_getFHIRXMLNamespace())); } @@ -900,15 +912,45 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getCreated())) { - $a[self::FIELD_CREATED] = $v->getValue(); - $a[self::FIELD_CREATED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CREATED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CREATED_EXT] = $enc; + } + } else { + $a[self::FIELD_CREATED] = $v; + } } if (null !== ($v = $this->getDisposition())) { - $a[self::FIELD_DISPOSITION] = $v->getValue(); - $a[self::FIELD_DISPOSITION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DISPOSITION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DISPOSITION_EXT] = $enc; + } + } else { + $a[self::FIELD_DISPOSITION] = $v; + } } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if (null !== ($v = $this->getOrganization())) { $a[self::FIELD_ORGANIZATION] = $v; @@ -917,8 +959,15 @@ public function jsonSerialize() $a[self::FIELD_ORIGINAL_RULESET] = $v; } if (null !== ($v = $this->getOutcome())) { - $a[self::FIELD_OUTCOME] = $v->getValue(); - $a[self::FIELD_OUTCOME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_OUTCOME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_OUTCOME_EXT] = $enc; + } + } else { + $a[self::FIELD_OUTCOME] = $v; + } } if (null !== ($v = $this->getRequest())) { $a[self::FIELD_REQUEST] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIREpisodeOfCare.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIREpisodeOfCare.php index bc588791e2..9f05a532a7 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIREpisodeOfCare.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIREpisodeOfCare.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -87,10 +87,6 @@ class FHIREpisodeOfCare extends FHIRDomainResource implements PHPFHIRContainedTy { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_EPISODE_OF_CARE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CARE_MANAGER = 'careManager'; const FIELD_CARE_TEAM = 'careTeam'; const FIELD_CONDITION = 'condition'; @@ -233,6 +229,9 @@ class FHIREpisodeOfCare extends FHIRDomainResource implements PHPFHIRContainedTy */ protected $type = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIREpisodeOfCare Constructor * @param null|array $data @@ -259,6 +258,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CARE_TEAM])) { if (is_array($data[self::FIELD_CARE_TEAM])) { foreach($data[self::FIELD_CARE_TEAM] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIREpisodeOfCareCareTeam) { $this->addCareTeam($v); } else { @@ -274,6 +276,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CONDITION])) { if (is_array($data[self::FIELD_CONDITION])) { foreach($data[self::FIELD_CONDITION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addCondition($v); } else { @@ -292,17 +297,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -332,6 +344,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REFERRAL_REQUEST])) { if (is_array($data[self::FIELD_REFERRAL_REQUEST])) { foreach($data[self::FIELD_REFERRAL_REQUEST] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addReferralRequest($v); } else { @@ -350,8 +365,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIREpisodeOfCareStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIREpisodeOfCareStatus([FHIREpisodeOfCareStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIREpisodeOfCareStatus([FHIREpisodeOfCareStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIREpisodeOfCareStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIREpisodeOfCareStatus($data[self::FIELD_STATUS])); } @@ -359,6 +378,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_STATUS_HISTORY])) { if (is_array($data[self::FIELD_STATUS_HISTORY])) { foreach($data[self::FIELD_STATUS_HISTORY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIREpisodeOfCareStatusHistory) { $this->addStatusHistory($v); } else { @@ -374,6 +396,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_TYPE])) { if (is_array($data[self::FIELD_TYPE])) { foreach($data[self::FIELD_TYPE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addType($v); } else { @@ -1046,11 +1071,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getCareManager())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CARE_MANAGER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getCareTeam())) { foreach($vs as $v) { if (null === $v) { @@ -1081,15 +1104,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getManagingOrganization())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MANAGING_ORGANIZATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPatient())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATIENT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getReferralRequest())) { foreach($vs as $v) { if (null === $v) { @@ -1102,7 +1122,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getStatusHistory())) { foreach($vs as $v) { if (null === $v) { @@ -1120,6 +1139,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } @@ -1139,7 +1159,23 @@ public function jsonSerialize() $a[self::FIELD_CONDITION] = $vs; } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if (null !== ($v = $this->getManagingOrganization())) { $a[self::FIELD_MANAGING_ORGANIZATION] = $v; @@ -1154,7 +1190,15 @@ public function jsonSerialize() $a[self::FIELD_REFERRAL_REQUEST] = $vs; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if ([] !== ($vs = $this->getStatusHistory())) { $a[self::FIELD_STATUS_HISTORY] = $vs; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRExplanationOfBenefit.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRExplanationOfBenefit.php index efb6dcceef..f0c79e076e 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRExplanationOfBenefit.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRExplanationOfBenefit.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -86,10 +86,6 @@ class FHIRExplanationOfBenefit extends FHIRDomainResource implements PHPFHIRCont { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_EXPLANATION_OF_BENEFIT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CREATED = 'created'; const FIELD_CREATED_EXT = '_created'; const FIELD_DISPOSITION = 'disposition'; @@ -221,6 +217,9 @@ class FHIRExplanationOfBenefit extends FHIRDomainResource implements PHPFHIRCont */ protected $ruleset = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRExplanationOfBenefit Constructor * @param null|array $data @@ -243,8 +242,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CREATED] instanceof FHIRDateTime) { $this->setCreated($data[self::FIELD_CREATED]); - } elseif ($ext && is_scalar($data[self::FIELD_CREATED])) { - $this->setCreated(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_CREATED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CREATED])) { + $this->setCreated(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_CREATED]] + $ext)); + } else if (is_array($data[self::FIELD_CREATED])) { + $this->setCreated(new FHIRDateTime(array_merge($ext, $data[self::FIELD_CREATED]))); + } } else { $this->setCreated(new FHIRDateTime($data[self::FIELD_CREATED])); } @@ -255,8 +258,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DISPOSITION] instanceof FHIRString) { $this->setDisposition($data[self::FIELD_DISPOSITION]); - } elseif ($ext && is_scalar($data[self::FIELD_DISPOSITION])) { - $this->setDisposition(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DISPOSITION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DISPOSITION])) { + $this->setDisposition(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DISPOSITION]] + $ext)); + } else if (is_array($data[self::FIELD_DISPOSITION])) { + $this->setDisposition(new FHIRString(array_merge($ext, $data[self::FIELD_DISPOSITION]))); + } } else { $this->setDisposition(new FHIRString($data[self::FIELD_DISPOSITION])); } @@ -267,17 +274,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -303,8 +317,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_OUTCOME] instanceof FHIRCode) { $this->setOutcome($data[self::FIELD_OUTCOME]); - } elseif ($ext && is_scalar($data[self::FIELD_OUTCOME])) { - $this->setOutcome(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_OUTCOME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_OUTCOME])) { + $this->setOutcome(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_OUTCOME]] + $ext)); + } else if (is_array($data[self::FIELD_OUTCOME])) { + $this->setOutcome(new FHIRCode(array_merge($ext, $data[self::FIELD_OUTCOME]))); + } } else { $this->setOutcome(new FHIRCode($data[self::FIELD_OUTCOME])); } @@ -855,7 +873,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDisposition())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DISPOSITION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -868,26 +885,21 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getOrganization())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ORGANIZATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOriginalRuleset())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ORIGINAL_RULESET, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getOutcome())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OUTCOME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRequest())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REQUEST, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRequestOrganization())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REQUEST_ORGANIZATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRequestProvider())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REQUEST_PROVIDER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRuleset())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RULESET, null, $v->_getFHIRXMLNamespace())); } @@ -901,15 +913,45 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getCreated())) { - $a[self::FIELD_CREATED] = $v->getValue(); - $a[self::FIELD_CREATED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CREATED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CREATED_EXT] = $enc; + } + } else { + $a[self::FIELD_CREATED] = $v; + } } if (null !== ($v = $this->getDisposition())) { - $a[self::FIELD_DISPOSITION] = $v->getValue(); - $a[self::FIELD_DISPOSITION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DISPOSITION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DISPOSITION_EXT] = $enc; + } + } else { + $a[self::FIELD_DISPOSITION] = $v; + } } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if (null !== ($v = $this->getOrganization())) { $a[self::FIELD_ORGANIZATION] = $v; @@ -918,8 +960,15 @@ public function jsonSerialize() $a[self::FIELD_ORIGINAL_RULESET] = $v; } if (null !== ($v = $this->getOutcome())) { - $a[self::FIELD_OUTCOME] = $v->getValue(); - $a[self::FIELD_OUTCOME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_OUTCOME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_OUTCOME_EXT] = $enc; + } + } else { + $a[self::FIELD_OUTCOME] = $v; + } } if (null !== ($v = $this->getRequest())) { $a[self::FIELD_REQUEST] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRFamilyMemberHistory.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRFamilyMemberHistory.php index 00a1f18b98..01ff098c56 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRFamilyMemberHistory.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRFamilyMemberHistory.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -93,11 +93,8 @@ class FHIRFamilyMemberHistory extends FHIRDomainResource implements PHPFHIRConta { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_FAMILY_MEMBER_HISTORY; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_AGE_QUANTITY = 'ageQuantity'; + const FIELD_AGE_QUANTITY_EXT = '_ageQuantity'; const FIELD_AGE_RANGE = 'ageRange'; const FIELD_AGE_STRING = 'ageString'; const FIELD_AGE_STRING_EXT = '_ageString'; @@ -114,6 +111,7 @@ class FHIRFamilyMemberHistory extends FHIRDomainResource implements PHPFHIRConta const FIELD_DECEASED_DATE = 'deceasedDate'; const FIELD_DECEASED_DATE_EXT = '_deceasedDate'; const FIELD_DECEASED_QUANTITY = 'deceasedQuantity'; + const FIELD_DECEASED_QUANTITY_EXT = '_deceasedQuantity'; const FIELD_DECEASED_RANGE = 'deceasedRange'; const FIELD_DECEASED_STRING = 'deceasedString'; const FIELD_DECEASED_STRING_EXT = '_deceasedString'; @@ -365,6 +363,9 @@ class FHIRFamilyMemberHistory extends FHIRDomainResource implements PHPFHIRConta */ protected $status = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRFamilyMemberHistory Constructor * @param null|array $data @@ -382,8 +383,17 @@ public function __construct($data = null) } parent::__construct($data); if (isset($data[self::FIELD_AGE_QUANTITY])) { + $ext = (isset($data[self::FIELD_AGE_QUANTITY_EXT]) && is_array($data[self::FIELD_AGE_QUANTITY_EXT])) + ? $data[self::FIELD_AGE_QUANTITY_EXT] + : null; if ($data[self::FIELD_AGE_QUANTITY] instanceof FHIRAge) { $this->setAgeQuantity($data[self::FIELD_AGE_QUANTITY]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_AGE_QUANTITY])) { + $this->setAgeQuantity(new FHIRAge([FHIRAge::FIELD_VALUE => $data[self::FIELD_AGE_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_AGE_QUANTITY])) { + $this->setAgeQuantity(new FHIRAge(array_merge($ext, $data[self::FIELD_AGE_QUANTITY]))); + } } else { $this->setAgeQuantity(new FHIRAge($data[self::FIELD_AGE_QUANTITY])); } @@ -401,8 +411,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_AGE_STRING] instanceof FHIRString) { $this->setAgeString($data[self::FIELD_AGE_STRING]); - } elseif ($ext && is_scalar($data[self::FIELD_AGE_STRING])) { - $this->setAgeString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_AGE_STRING]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_AGE_STRING])) { + $this->setAgeString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_AGE_STRING]] + $ext)); + } else if (is_array($data[self::FIELD_AGE_STRING])) { + $this->setAgeString(new FHIRString(array_merge($ext, $data[self::FIELD_AGE_STRING]))); + } } else { $this->setAgeString(new FHIRString($data[self::FIELD_AGE_STRING])); } @@ -413,8 +427,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_BORN_DATE] instanceof FHIRDate) { $this->setBornDate($data[self::FIELD_BORN_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_BORN_DATE])) { - $this->setBornDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_BORN_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_BORN_DATE])) { + $this->setBornDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_BORN_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_BORN_DATE])) { + $this->setBornDate(new FHIRDate(array_merge($ext, $data[self::FIELD_BORN_DATE]))); + } } else { $this->setBornDate(new FHIRDate($data[self::FIELD_BORN_DATE])); } @@ -432,8 +450,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_BORN_STRING] instanceof FHIRString) { $this->setBornString($data[self::FIELD_BORN_STRING]); - } elseif ($ext && is_scalar($data[self::FIELD_BORN_STRING])) { - $this->setBornString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_BORN_STRING]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_BORN_STRING])) { + $this->setBornString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_BORN_STRING]] + $ext)); + } else if (is_array($data[self::FIELD_BORN_STRING])) { + $this->setBornString(new FHIRString(array_merge($ext, $data[self::FIELD_BORN_STRING]))); + } } else { $this->setBornString(new FHIRString($data[self::FIELD_BORN_STRING])); } @@ -441,6 +463,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CONDITION])) { if (is_array($data[self::FIELD_CONDITION])) { foreach($data[self::FIELD_CONDITION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRFamilyMemberHistoryCondition) { $this->addCondition($v); } else { @@ -459,8 +484,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATE] instanceof FHIRDateTime) { $this->setDate($data[self::FIELD_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_DATE])) { - $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime(array_merge($ext, $data[self::FIELD_DATE]))); + } } else { $this->setDate(new FHIRDateTime($data[self::FIELD_DATE])); } @@ -471,8 +500,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DECEASED_BOOLEAN] instanceof FHIRBoolean) { $this->setDeceasedBoolean($data[self::FIELD_DECEASED_BOOLEAN]); - } elseif ($ext && is_scalar($data[self::FIELD_DECEASED_BOOLEAN])) { - $this->setDeceasedBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_DECEASED_BOOLEAN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DECEASED_BOOLEAN])) { + $this->setDeceasedBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_DECEASED_BOOLEAN]] + $ext)); + } else if (is_array($data[self::FIELD_DECEASED_BOOLEAN])) { + $this->setDeceasedBoolean(new FHIRBoolean(array_merge($ext, $data[self::FIELD_DECEASED_BOOLEAN]))); + } } else { $this->setDeceasedBoolean(new FHIRBoolean($data[self::FIELD_DECEASED_BOOLEAN])); } @@ -483,15 +516,28 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DECEASED_DATE] instanceof FHIRDate) { $this->setDeceasedDate($data[self::FIELD_DECEASED_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_DECEASED_DATE])) { - $this->setDeceasedDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_DECEASED_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DECEASED_DATE])) { + $this->setDeceasedDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_DECEASED_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_DECEASED_DATE])) { + $this->setDeceasedDate(new FHIRDate(array_merge($ext, $data[self::FIELD_DECEASED_DATE]))); + } } else { $this->setDeceasedDate(new FHIRDate($data[self::FIELD_DECEASED_DATE])); } } if (isset($data[self::FIELD_DECEASED_QUANTITY])) { + $ext = (isset($data[self::FIELD_DECEASED_QUANTITY_EXT]) && is_array($data[self::FIELD_DECEASED_QUANTITY_EXT])) + ? $data[self::FIELD_DECEASED_QUANTITY_EXT] + : null; if ($data[self::FIELD_DECEASED_QUANTITY] instanceof FHIRAge) { $this->setDeceasedQuantity($data[self::FIELD_DECEASED_QUANTITY]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DECEASED_QUANTITY])) { + $this->setDeceasedQuantity(new FHIRAge([FHIRAge::FIELD_VALUE => $data[self::FIELD_DECEASED_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_DECEASED_QUANTITY])) { + $this->setDeceasedQuantity(new FHIRAge(array_merge($ext, $data[self::FIELD_DECEASED_QUANTITY]))); + } } else { $this->setDeceasedQuantity(new FHIRAge($data[self::FIELD_DECEASED_QUANTITY])); } @@ -509,8 +555,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DECEASED_STRING] instanceof FHIRString) { $this->setDeceasedString($data[self::FIELD_DECEASED_STRING]); - } elseif ($ext && is_scalar($data[self::FIELD_DECEASED_STRING])) { - $this->setDeceasedString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DECEASED_STRING]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DECEASED_STRING])) { + $this->setDeceasedString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DECEASED_STRING]] + $ext)); + } else if (is_array($data[self::FIELD_DECEASED_STRING])) { + $this->setDeceasedString(new FHIRString(array_merge($ext, $data[self::FIELD_DECEASED_STRING]))); + } } else { $this->setDeceasedString(new FHIRString($data[self::FIELD_DECEASED_STRING])); } @@ -521,8 +571,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_GENDER] instanceof FHIRCode) { $this->setGender($data[self::FIELD_GENDER]); - } elseif ($ext && is_scalar($data[self::FIELD_GENDER])) { - $this->setGender(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_GENDER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_GENDER])) { + $this->setGender(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_GENDER]] + $ext)); + } else if (is_array($data[self::FIELD_GENDER])) { + $this->setGender(new FHIRCode(array_merge($ext, $data[self::FIELD_GENDER]))); + } } else { $this->setGender(new FHIRCode($data[self::FIELD_GENDER])); } @@ -533,17 +587,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -555,8 +616,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -588,8 +653,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRFamilyHistoryStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRFamilyHistoryStatus([FHIRFamilyHistoryStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRFamilyHistoryStatus([FHIRFamilyHistoryStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRFamilyHistoryStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRFamilyHistoryStatus($data[self::FIELD_STATUS])); } @@ -1555,11 +1624,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getAgeQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AGE_QUANTITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getAgeRange())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AGE_RANGE, null, $v->_getFHIRXMLNamespace())); } @@ -1569,14 +1636,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getBornDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_BORN_DATE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getBornPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_BORN_PERIOD, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getBornString())) { $v->xmlSerialize($sxe->addChild(self::FIELD_BORN_STRING, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getCondition())) { foreach($vs as $v) { if (null === $v) { @@ -1585,6 +1650,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_CONDITION, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DATE, null, $v->_getFHIRXMLNamespace())); } @@ -1594,11 +1660,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDeceasedDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DECEASED_DATE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDeceasedQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DECEASED_QUANTITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDeceasedRange())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DECEASED_RANGE, null, $v->_getFHIRXMLNamespace())); } @@ -1608,7 +1672,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getGender())) { $v->xmlSerialize($sxe->addChild(self::FIELD_GENDER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -1617,22 +1680,19 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NAME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getNote())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NOTE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPatient())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATIENT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRelationship())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RELATIONSHIP, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } @@ -1646,61 +1706,156 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getAgeQuantity())) { - $a[self::FIELD_AGE_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_AGE_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_AGE_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_AGE_QUANTITY] = $v; + } } if (null !== ($v = $this->getAgeRange())) { $a[self::FIELD_AGE_RANGE] = $v; } if (null !== ($v = $this->getAgeString())) { - $a[self::FIELD_AGE_STRING] = $v->getValue(); - $a[self::FIELD_AGE_STRING_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_AGE_STRING] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_AGE_STRING_EXT] = $enc; + } + } else { + $a[self::FIELD_AGE_STRING] = $v; + } } if (null !== ($v = $this->getBornDate())) { - $a[self::FIELD_BORN_DATE] = $v->getValue(); - $a[self::FIELD_BORN_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_BORN_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_BORN_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_BORN_DATE] = $v; + } } if (null !== ($v = $this->getBornPeriod())) { $a[self::FIELD_BORN_PERIOD] = $v; } if (null !== ($v = $this->getBornString())) { - $a[self::FIELD_BORN_STRING] = $v->getValue(); - $a[self::FIELD_BORN_STRING_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_BORN_STRING] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_BORN_STRING_EXT] = $enc; + } + } else { + $a[self::FIELD_BORN_STRING] = $v; + } } if ([] !== ($vs = $this->getCondition())) { $a[self::FIELD_CONDITION] = $vs; } if (null !== ($v = $this->getDate())) { - $a[self::FIELD_DATE] = $v->getValue(); - $a[self::FIELD_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_DATE] = $v; + } } if (null !== ($v = $this->getDeceasedBoolean())) { - $a[self::FIELD_DECEASED_BOOLEAN] = $v->getValue(); - $a[self::FIELD_DECEASED_BOOLEAN_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DECEASED_BOOLEAN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DECEASED_BOOLEAN_EXT] = $enc; + } + } else { + $a[self::FIELD_DECEASED_BOOLEAN] = $v; + } } if (null !== ($v = $this->getDeceasedDate())) { - $a[self::FIELD_DECEASED_DATE] = $v->getValue(); - $a[self::FIELD_DECEASED_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DECEASED_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DECEASED_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_DECEASED_DATE] = $v; + } } if (null !== ($v = $this->getDeceasedQuantity())) { - $a[self::FIELD_DECEASED_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DECEASED_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DECEASED_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_DECEASED_QUANTITY] = $v; + } } if (null !== ($v = $this->getDeceasedRange())) { $a[self::FIELD_DECEASED_RANGE] = $v; } if (null !== ($v = $this->getDeceasedString())) { - $a[self::FIELD_DECEASED_STRING] = $v->getValue(); - $a[self::FIELD_DECEASED_STRING_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DECEASED_STRING] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DECEASED_STRING_EXT] = $enc; + } + } else { + $a[self::FIELD_DECEASED_STRING] = $v; + } } if (null !== ($v = $this->getGender())) { - $a[self::FIELD_GENDER] = $v->getValue(); - $a[self::FIELD_GENDER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_GENDER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_GENDER_EXT] = $enc; + } + } else { + $a[self::FIELD_GENDER] = $v; + } } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if (null !== ($v = $this->getNote())) { $a[self::FIELD_NOTE] = $v; @@ -1712,7 +1867,15 @@ public function jsonSerialize() $a[self::FIELD_RELATIONSHIP] = $v; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRFlag.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRFlag.php index 6baaa1c87a..78f47eb9ed 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRFlag.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRFlag.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -83,10 +83,6 @@ class FHIRFlag extends FHIRDomainResource implements PHPFHIRContainedTypeInterfa { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_FLAG; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_AUTHOR = 'author'; const FIELD_CATEGORY = 'category'; const FIELD_CODE = 'code'; @@ -192,6 +188,9 @@ class FHIRFlag extends FHIRDomainResource implements PHPFHIRContainedTypeInterfa */ protected $subject = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRFlag Constructor * @param null|array $data @@ -242,17 +241,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -271,8 +277,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRFlagStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRFlagStatus([FHIRFlagStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRFlagStatus([FHIRFlagStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRFlagStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRFlagStatus($data[self::FIELD_STATUS])); } @@ -697,23 +707,18 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getAuthor())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AUTHOR, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getCategory())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CATEGORY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getEncounter())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ENCOUNTER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -726,11 +731,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSubject())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBJECT, null, $v->_getFHIRXMLNamespace())); } @@ -756,13 +759,37 @@ public function jsonSerialize() $a[self::FIELD_ENCOUNTER] = $v; } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if (null !== ($v = $this->getPeriod())) { $a[self::FIELD_PERIOD] = $v; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getSubject())) { $a[self::FIELD_SUBJECT] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRGoal.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRGoal.php index e4caf21913..d322c36ba9 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRGoal.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRGoal.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -89,10 +89,6 @@ class FHIRGoal extends FHIRDomainResource implements PHPFHIRContainedTypeInterfa { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_GOAL; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ADDRESSES = 'addresses'; const FIELD_AUTHOR = 'author'; const FIELD_CATEGORY = 'category'; @@ -115,6 +111,7 @@ class FHIRGoal extends FHIRDomainResource implements PHPFHIRContainedTypeInterfa const FIELD_TARGET_DATE = 'targetDate'; const FIELD_TARGET_DATE_EXT = '_targetDate'; const FIELD_TARGET_QUANTITY = 'targetQuantity'; + const FIELD_TARGET_QUANTITY_EXT = '_targetQuantity'; /** * A reference from one resource to another. @@ -305,6 +302,9 @@ class FHIRGoal extends FHIRDomainResource implements PHPFHIRContainedTypeInterfa */ protected $targetQuantity = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRGoal Constructor * @param null|array $data @@ -324,6 +324,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ADDRESSES])) { if (is_array($data[self::FIELD_ADDRESSES])) { foreach($data[self::FIELD_ADDRESSES] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addAddresses($v); } else { @@ -346,6 +349,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CATEGORY])) { if (is_array($data[self::FIELD_CATEGORY])) { foreach($data[self::FIELD_CATEGORY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addCategory($v); } else { @@ -364,8 +370,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -376,17 +386,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -395,6 +412,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_NOTE])) { if (is_array($data[self::FIELD_NOTE])) { foreach($data[self::FIELD_NOTE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRAnnotation) { $this->addNote($v); } else { @@ -410,6 +430,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_OUTCOME])) { if (is_array($data[self::FIELD_OUTCOME])) { foreach($data[self::FIELD_OUTCOME] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRGoalOutcome) { $this->addOutcome($v); } else { @@ -442,8 +465,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_START_DATE] instanceof FHIRDate) { $this->setStartDate($data[self::FIELD_START_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_START_DATE])) { - $this->setStartDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_START_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_START_DATE])) { + $this->setStartDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_START_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_START_DATE])) { + $this->setStartDate(new FHIRDate(array_merge($ext, $data[self::FIELD_START_DATE]))); + } } else { $this->setStartDate(new FHIRDate($data[self::FIELD_START_DATE])); } @@ -454,8 +481,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRGoalStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRGoalStatus([FHIRGoalStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRGoalStatus([FHIRGoalStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRGoalStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRGoalStatus($data[self::FIELD_STATUS])); } @@ -466,8 +497,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS_DATE] instanceof FHIRDate) { $this->setStatusDate($data[self::FIELD_STATUS_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS_DATE])) { - $this->setStatusDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_STATUS_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS_DATE])) { + $this->setStatusDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_STATUS_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS_DATE])) { + $this->setStatusDate(new FHIRDate(array_merge($ext, $data[self::FIELD_STATUS_DATE]))); + } } else { $this->setStatusDate(new FHIRDate($data[self::FIELD_STATUS_DATE])); } @@ -492,15 +527,28 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TARGET_DATE] instanceof FHIRDate) { $this->setTargetDate($data[self::FIELD_TARGET_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_TARGET_DATE])) { - $this->setTargetDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_TARGET_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TARGET_DATE])) { + $this->setTargetDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_TARGET_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_TARGET_DATE])) { + $this->setTargetDate(new FHIRDate(array_merge($ext, $data[self::FIELD_TARGET_DATE]))); + } } else { $this->setTargetDate(new FHIRDate($data[self::FIELD_TARGET_DATE])); } } if (isset($data[self::FIELD_TARGET_QUANTITY])) { + $ext = (isset($data[self::FIELD_TARGET_QUANTITY_EXT]) && is_array($data[self::FIELD_TARGET_QUANTITY_EXT])) + ? $data[self::FIELD_TARGET_QUANTITY_EXT] + : null; if ($data[self::FIELD_TARGET_QUANTITY] instanceof FHIRDuration) { $this->setTargetQuantity($data[self::FIELD_TARGET_QUANTITY]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TARGET_QUANTITY])) { + $this->setTargetQuantity(new FHIRDuration([FHIRDuration::FIELD_VALUE => $data[self::FIELD_TARGET_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_TARGET_QUANTITY])) { + $this->setTargetQuantity(new FHIRDuration(array_merge($ext, $data[self::FIELD_TARGET_QUANTITY]))); + } } else { $this->setTargetQuantity(new FHIRDuration($data[self::FIELD_TARGET_QUANTITY])); } @@ -1359,7 +1407,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getAddresses())) { foreach($vs as $v) { if (null === $v) { @@ -1372,7 +1419,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getAuthor())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AUTHOR, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getCategory())) { foreach($vs as $v) { if (null === $v) { @@ -1381,10 +1427,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_CATEGORY, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getDescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESCRIPTION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -1415,32 +1461,27 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getPriority())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PRIORITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStartCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_START_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getStartDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_START_DATE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getStatusDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS_DATE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatusReason())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS_REASON, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSubject())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBJECT, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getTargetDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TARGET_DATE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getTargetQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TARGET_QUANTITY, null, $v->_getFHIRXMLNamespace())); } @@ -1463,11 +1504,34 @@ public function jsonSerialize() $a[self::FIELD_CATEGORY] = $vs; } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if ([] !== ($vs = $this->getNote())) { $a[self::FIELD_NOTE] = $vs; @@ -1482,15 +1546,37 @@ public function jsonSerialize() $a[self::FIELD_START_CODEABLE_CONCEPT] = $v; } if (null !== ($v = $this->getStartDate())) { - $a[self::FIELD_START_DATE] = $v->getValue(); - $a[self::FIELD_START_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_START_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_START_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_START_DATE] = $v; + } } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getStatusDate())) { - $a[self::FIELD_STATUS_DATE] = $v->getValue(); - $a[self::FIELD_STATUS_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS_DATE] = $v; + } } if (null !== ($v = $this->getStatusReason())) { $a[self::FIELD_STATUS_REASON] = $v; @@ -1499,11 +1585,26 @@ public function jsonSerialize() $a[self::FIELD_SUBJECT] = $v; } if (null !== ($v = $this->getTargetDate())) { - $a[self::FIELD_TARGET_DATE] = $v->getValue(); - $a[self::FIELD_TARGET_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TARGET_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TARGET_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_TARGET_DATE] = $v; + } } if (null !== ($v = $this->getTargetQuantity())) { - $a[self::FIELD_TARGET_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TARGET_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TARGET_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_TARGET_QUANTITY] = $v; + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRGroup.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRGroup.php index a20ddea2b3..ee97b0f00b 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRGroup.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRGroup.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -88,10 +88,6 @@ class FHIRGroup extends FHIRDomainResource implements PHPFHIRContainedTypeInterf { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_GROUP; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ACTUAL = 'actual'; const FIELD_ACTUAL_EXT = '_actual'; const FIELD_CHARACTERISTIC = 'characteristic'; @@ -195,6 +191,9 @@ class FHIRGroup extends FHIRDomainResource implements PHPFHIRContainedTypeInterf */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRGroup Constructor * @param null|array $data @@ -217,8 +216,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ACTUAL] instanceof FHIRBoolean) { $this->setActual($data[self::FIELD_ACTUAL]); - } elseif ($ext && is_scalar($data[self::FIELD_ACTUAL])) { - $this->setActual(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_ACTUAL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ACTUAL])) { + $this->setActual(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_ACTUAL]] + $ext)); + } else if (is_array($data[self::FIELD_ACTUAL])) { + $this->setActual(new FHIRBoolean(array_merge($ext, $data[self::FIELD_ACTUAL]))); + } } else { $this->setActual(new FHIRBoolean($data[self::FIELD_ACTUAL])); } @@ -226,6 +229,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CHARACTERISTIC])) { if (is_array($data[self::FIELD_CHARACTERISTIC])) { foreach($data[self::FIELD_CHARACTERISTIC] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRGroupCharacteristic) { $this->addCharacteristic($v); } else { @@ -251,17 +257,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -270,6 +283,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_MEMBER])) { if (is_array($data[self::FIELD_MEMBER])) { foreach($data[self::FIELD_MEMBER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRGroupMember) { $this->addMember($v); } else { @@ -288,8 +304,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -300,8 +320,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_QUANTITY] instanceof FHIRUnsignedInt) { $this->setQuantity($data[self::FIELD_QUANTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_QUANTITY])) { - $this->setQuantity(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_QUANTITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_QUANTITY])) { + $this->setQuantity(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_QUANTITY])) { + $this->setQuantity(new FHIRUnsignedInt(array_merge($ext, $data[self::FIELD_QUANTITY]))); + } } else { $this->setQuantity(new FHIRUnsignedInt($data[self::FIELD_QUANTITY])); } @@ -312,8 +336,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TYPE] instanceof FHIRGroupType) { $this->setType($data[self::FIELD_TYPE]); - } elseif ($ext && is_scalar($data[self::FIELD_TYPE])) { - $this->setType(new FHIRGroupType([FHIRGroupType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TYPE])) { + $this->setType(new FHIRGroupType([FHIRGroupType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } else if (is_array($data[self::FIELD_TYPE])) { + $this->setType(new FHIRGroupType(array_merge($ext, $data[self::FIELD_TYPE]))); + } } else { $this->setType(new FHIRGroupType($data[self::FIELD_TYPE])); } @@ -813,7 +841,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getActual())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ACTUAL, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getCharacteristic())) { foreach($vs as $v) { if (null === $v) { @@ -826,7 +853,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -844,13 +870,13 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_MEMBER, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NAME, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_QUANTITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -864,8 +890,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getActual())) { - $a[self::FIELD_ACTUAL] = $v->getValue(); - $a[self::FIELD_ACTUAL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ACTUAL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ACTUAL_EXT] = $enc; + } + } else { + $a[self::FIELD_ACTUAL] = $v; + } } if ([] !== ($vs = $this->getCharacteristic())) { $a[self::FIELD_CHARACTERISTIC] = $vs; @@ -874,21 +907,59 @@ public function jsonSerialize() $a[self::FIELD_CODE] = $v; } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if ([] !== ($vs = $this->getMember())) { $a[self::FIELD_MEMBER] = $vs; } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if (null !== ($v = $this->getQuantity())) { - $a[self::FIELD_QUANTITY] = $v->getValue(); - $a[self::FIELD_QUANTITY_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_QUANTITY] = $v; + } } if (null !== ($v = $this->getType())) { - $a[self::FIELD_TYPE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TYPE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TYPE_EXT] = $enc; + } + } else { + $a[self::FIELD_TYPE] = $v; + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRHealthcareService.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRHealthcareService.php index ad8841399a..11a86df340 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRHealthcareService.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRHealthcareService.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -88,10 +88,6 @@ class FHIRHealthcareService extends FHIRDomainResource implements PHPFHIRContain { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_HEALTHCARE_SERVICE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_APPOINTMENT_REQUIRED = 'appointmentRequired'; const FIELD_APPOINTMENT_REQUIRED_EXT = '_appointmentRequired'; const FIELD_AVAILABILITY_EXCEPTIONS = 'availabilityExceptions'; @@ -381,6 +377,9 @@ class FHIRHealthcareService extends FHIRDomainResource implements PHPFHIRContain */ protected $telecom = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRHealthcareService Constructor * @param null|array $data @@ -403,8 +402,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_APPOINTMENT_REQUIRED] instanceof FHIRBoolean) { $this->setAppointmentRequired($data[self::FIELD_APPOINTMENT_REQUIRED]); - } elseif ($ext && is_scalar($data[self::FIELD_APPOINTMENT_REQUIRED])) { - $this->setAppointmentRequired(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_APPOINTMENT_REQUIRED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_APPOINTMENT_REQUIRED])) { + $this->setAppointmentRequired(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_APPOINTMENT_REQUIRED]] + $ext)); + } else if (is_array($data[self::FIELD_APPOINTMENT_REQUIRED])) { + $this->setAppointmentRequired(new FHIRBoolean(array_merge($ext, $data[self::FIELD_APPOINTMENT_REQUIRED]))); + } } else { $this->setAppointmentRequired(new FHIRBoolean($data[self::FIELD_APPOINTMENT_REQUIRED])); } @@ -415,8 +418,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_AVAILABILITY_EXCEPTIONS] instanceof FHIRString) { $this->setAvailabilityExceptions($data[self::FIELD_AVAILABILITY_EXCEPTIONS]); - } elseif ($ext && is_scalar($data[self::FIELD_AVAILABILITY_EXCEPTIONS])) { - $this->setAvailabilityExceptions(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_AVAILABILITY_EXCEPTIONS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_AVAILABILITY_EXCEPTIONS])) { + $this->setAvailabilityExceptions(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_AVAILABILITY_EXCEPTIONS]] + $ext)); + } else if (is_array($data[self::FIELD_AVAILABILITY_EXCEPTIONS])) { + $this->setAvailabilityExceptions(new FHIRString(array_merge($ext, $data[self::FIELD_AVAILABILITY_EXCEPTIONS]))); + } } else { $this->setAvailabilityExceptions(new FHIRString($data[self::FIELD_AVAILABILITY_EXCEPTIONS])); } @@ -424,6 +431,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_AVAILABLE_TIME])) { if (is_array($data[self::FIELD_AVAILABLE_TIME])) { foreach($data[self::FIELD_AVAILABLE_TIME] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRHealthcareServiceAvailableTime) { $this->addAvailableTime($v); } else { @@ -439,6 +449,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CHARACTERISTIC])) { if (is_array($data[self::FIELD_CHARACTERISTIC])) { foreach($data[self::FIELD_CHARACTERISTIC] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addCharacteristic($v); } else { @@ -457,8 +470,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_COMMENT] instanceof FHIRString) { $this->setComment($data[self::FIELD_COMMENT]); - } elseif ($ext && is_scalar($data[self::FIELD_COMMENT])) { - $this->setComment(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_COMMENT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_COMMENT])) { + $this->setComment(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_COMMENT]] + $ext)); + } else if (is_array($data[self::FIELD_COMMENT])) { + $this->setComment(new FHIRString(array_merge($ext, $data[self::FIELD_COMMENT]))); + } } else { $this->setComment(new FHIRString($data[self::FIELD_COMMENT])); } @@ -466,6 +483,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_COVERAGE_AREA])) { if (is_array($data[self::FIELD_COVERAGE_AREA])) { foreach($data[self::FIELD_COVERAGE_AREA] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addCoverageArea($v); } else { @@ -491,8 +511,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ELIGIBILITY_NOTE] instanceof FHIRString) { $this->setEligibilityNote($data[self::FIELD_ELIGIBILITY_NOTE]); - } elseif ($ext && is_scalar($data[self::FIELD_ELIGIBILITY_NOTE])) { - $this->setEligibilityNote(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_ELIGIBILITY_NOTE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ELIGIBILITY_NOTE])) { + $this->setEligibilityNote(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_ELIGIBILITY_NOTE]] + $ext)); + } else if (is_array($data[self::FIELD_ELIGIBILITY_NOTE])) { + $this->setEligibilityNote(new FHIRString(array_merge($ext, $data[self::FIELD_ELIGIBILITY_NOTE]))); + } } else { $this->setEligibilityNote(new FHIRString($data[self::FIELD_ELIGIBILITY_NOTE])); } @@ -503,8 +527,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EXTRA_DETAILS] instanceof FHIRString) { $this->setExtraDetails($data[self::FIELD_EXTRA_DETAILS]); - } elseif ($ext && is_scalar($data[self::FIELD_EXTRA_DETAILS])) { - $this->setExtraDetails(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_EXTRA_DETAILS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EXTRA_DETAILS])) { + $this->setExtraDetails(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_EXTRA_DETAILS]] + $ext)); + } else if (is_array($data[self::FIELD_EXTRA_DETAILS])) { + $this->setExtraDetails(new FHIRString(array_merge($ext, $data[self::FIELD_EXTRA_DETAILS]))); + } } else { $this->setExtraDetails(new FHIRString($data[self::FIELD_EXTRA_DETAILS])); } @@ -515,17 +543,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -541,6 +576,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_NOT_AVAILABLE])) { if (is_array($data[self::FIELD_NOT_AVAILABLE])) { foreach($data[self::FIELD_NOT_AVAILABLE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRHealthcareServiceNotAvailable) { $this->addNotAvailable($v); } else { @@ -566,17 +604,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_PROGRAM_NAME])) { foreach($data[self::FIELD_PROGRAM_NAME] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRString) { $this->addProgramName($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addProgramName(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addProgramName(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addProgramName(new FHIRString(array_merge($v, $ext[$i]))); + } } else { $this->addProgramName(new FHIRString($v)); } } } elseif ($data[self::FIELD_PROGRAM_NAME] instanceof FHIRString) { $this->addProgramName($data[self::FIELD_PROGRAM_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_PROGRAM_NAME])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_PROGRAM_NAME])) { $this->addProgramName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PROGRAM_NAME]] + $ext)); } else { $this->addProgramName(new FHIRString($data[self::FIELD_PROGRAM_NAME])); @@ -595,8 +640,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PUBLIC_KEY] instanceof FHIRString) { $this->setPublicKey($data[self::FIELD_PUBLIC_KEY]); - } elseif ($ext && is_scalar($data[self::FIELD_PUBLIC_KEY])) { - $this->setPublicKey(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PUBLIC_KEY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PUBLIC_KEY])) { + $this->setPublicKey(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PUBLIC_KEY]] + $ext)); + } else if (is_array($data[self::FIELD_PUBLIC_KEY])) { + $this->setPublicKey(new FHIRString(array_merge($ext, $data[self::FIELD_PUBLIC_KEY]))); + } } else { $this->setPublicKey(new FHIRString($data[self::FIELD_PUBLIC_KEY])); } @@ -604,6 +653,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REFERRAL_METHOD])) { if (is_array($data[self::FIELD_REFERRAL_METHOD])) { foreach($data[self::FIELD_REFERRAL_METHOD] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addReferralMethod($v); } else { @@ -629,8 +681,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SERVICE_NAME] instanceof FHIRString) { $this->setServiceName($data[self::FIELD_SERVICE_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_SERVICE_NAME])) { - $this->setServiceName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SERVICE_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SERVICE_NAME])) { + $this->setServiceName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SERVICE_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_SERVICE_NAME])) { + $this->setServiceName(new FHIRString(array_merge($ext, $data[self::FIELD_SERVICE_NAME]))); + } } else { $this->setServiceName(new FHIRString($data[self::FIELD_SERVICE_NAME])); } @@ -638,6 +694,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SERVICE_PROVISION_CODE])) { if (is_array($data[self::FIELD_SERVICE_PROVISION_CODE])) { foreach($data[self::FIELD_SERVICE_PROVISION_CODE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addServiceProvisionCode($v); } else { @@ -653,6 +712,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SERVICE_TYPE])) { if (is_array($data[self::FIELD_SERVICE_TYPE])) { foreach($data[self::FIELD_SERVICE_TYPE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRHealthcareServiceServiceType) { $this->addServiceType($v); } else { @@ -671,17 +733,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_TELECOM])) { foreach($data[self::FIELD_TELECOM] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContactPoint) { $this->addTelecom($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addTelecom(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addTelecom(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addTelecom(new FHIRContactPoint(array_merge($v, $ext[$i]))); + } } else { $this->addTelecom(new FHIRContactPoint($v)); } } } elseif ($data[self::FIELD_TELECOM] instanceof FHIRContactPoint) { $this->addTelecom($data[self::FIELD_TELECOM]); - } elseif ($ext && is_scalar($data[self::FIELD_TELECOM])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_TELECOM])) { $this->addTelecom(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $data[self::FIELD_TELECOM]] + $ext)); } else { $this->addTelecom(new FHIRContactPoint($data[self::FIELD_TELECOM])); @@ -1926,7 +1995,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getAvailabilityExceptions())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AVAILABILITY_EXCEPTIONS, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getAvailableTime())) { foreach($vs as $v) { if (null === $v) { @@ -1944,10 +2012,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_CHARACTERISTIC, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getComment())) { $v->xmlSerialize($sxe->addChild(self::FIELD_COMMENT, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getCoverageArea())) { foreach($vs as $v) { if (null === $v) { @@ -1966,7 +2034,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getExtraDetails())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EXTRA_DETAILS, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -1979,7 +2046,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getLocation())) { $v->xmlSerialize($sxe->addChild(self::FIELD_LOCATION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getNotAvailable())) { foreach($vs as $v) { if (null === $v) { @@ -2007,7 +2073,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getPublicKey())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PUBLIC_KEY, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getReferralMethod())) { foreach($vs as $v) { if (null === $v) { @@ -2023,7 +2088,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getServiceName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SERVICE_NAME, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getServiceProvisionCode())) { foreach($vs as $v) { if (null === $v) { @@ -2050,6 +2114,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_TELECOM, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } @@ -2060,12 +2125,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getAppointmentRequired())) { - $a[self::FIELD_APPOINTMENT_REQUIRED] = $v->getValue(); - $a[self::FIELD_APPOINTMENT_REQUIRED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_APPOINTMENT_REQUIRED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_APPOINTMENT_REQUIRED_EXT] = $enc; + } + } else { + $a[self::FIELD_APPOINTMENT_REQUIRED] = $v; + } } if (null !== ($v = $this->getAvailabilityExceptions())) { - $a[self::FIELD_AVAILABILITY_EXCEPTIONS] = $v->getValue(); - $a[self::FIELD_AVAILABILITY_EXCEPTIONS_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_AVAILABILITY_EXCEPTIONS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_AVAILABILITY_EXCEPTIONS_EXT] = $enc; + } + } else { + $a[self::FIELD_AVAILABILITY_EXCEPTIONS] = $v; + } } if ([] !== ($vs = $this->getAvailableTime())) { $a[self::FIELD_AVAILABLE_TIME] = $vs; @@ -2074,8 +2153,15 @@ public function jsonSerialize() $a[self::FIELD_CHARACTERISTIC] = $vs; } if (null !== ($v = $this->getComment())) { - $a[self::FIELD_COMMENT] = $v->getValue(); - $a[self::FIELD_COMMENT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_COMMENT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_COMMENT_EXT] = $enc; + } + } else { + $a[self::FIELD_COMMENT] = $v; + } } if ([] !== ($vs = $this->getCoverageArea())) { $a[self::FIELD_COVERAGE_AREA] = $vs; @@ -2084,15 +2170,45 @@ public function jsonSerialize() $a[self::FIELD_ELIGIBILITY] = $v; } if (null !== ($v = $this->getEligibilityNote())) { - $a[self::FIELD_ELIGIBILITY_NOTE] = $v->getValue(); - $a[self::FIELD_ELIGIBILITY_NOTE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ELIGIBILITY_NOTE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ELIGIBILITY_NOTE_EXT] = $enc; + } + } else { + $a[self::FIELD_ELIGIBILITY_NOTE] = $v; + } } if (null !== ($v = $this->getExtraDetails())) { - $a[self::FIELD_EXTRA_DETAILS] = $v->getValue(); - $a[self::FIELD_EXTRA_DETAILS_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EXTRA_DETAILS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EXTRA_DETAILS_EXT] = $enc; + } + } else { + $a[self::FIELD_EXTRA_DETAILS] = $v; + } } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if (null !== ($v = $this->getLocation())) { $a[self::FIELD_LOCATION] = $v; @@ -2109,16 +2225,32 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_PROGRAM_NAME][] = $v->getValue(); - $a[self::FIELD_PROGRAM_NAME_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PROGRAM_NAME][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PROGRAM_NAME_EXT][] = $enc; + } else { + $a[self::FIELD_PROGRAM_NAME_EXT][] = null; + } + } else { + $a[self::FIELD_PROGRAM_NAME][] = $v; + } } } if (null !== ($v = $this->getProvidedBy())) { $a[self::FIELD_PROVIDED_BY] = $v; } if (null !== ($v = $this->getPublicKey())) { - $a[self::FIELD_PUBLIC_KEY] = $v->getValue(); - $a[self::FIELD_PUBLIC_KEY_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PUBLIC_KEY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PUBLIC_KEY_EXT] = $enc; + } + } else { + $a[self::FIELD_PUBLIC_KEY] = $v; + } } if ([] !== ($vs = $this->getReferralMethod())) { $a[self::FIELD_REFERRAL_METHOD] = $vs; @@ -2127,8 +2259,15 @@ public function jsonSerialize() $a[self::FIELD_SERVICE_CATEGORY] = $v; } if (null !== ($v = $this->getServiceName())) { - $a[self::FIELD_SERVICE_NAME] = $v->getValue(); - $a[self::FIELD_SERVICE_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SERVICE_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SERVICE_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_SERVICE_NAME] = $v; + } } if ([] !== ($vs = $this->getServiceProvisionCode())) { $a[self::FIELD_SERVICE_PROVISION_CODE] = $vs; @@ -2137,7 +2276,23 @@ public function jsonSerialize() $a[self::FIELD_SERVICE_TYPE] = $vs; } if ([] !== ($vs = $this->getTelecom())) { - $a[self::FIELD_TELECOM] = $vs; + $a[self::FIELD_TELECOM] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TELECOM][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TELECOM_EXT][] = $enc; + } else { + $a[self::FIELD_TELECOM_EXT][] = null; + } + } else { + $a[self::FIELD_TELECOM][] = $v; + } + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRImagingObjectSelection.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRImagingObjectSelection.php index 768bf46d4d..069e36a318 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRImagingObjectSelection.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRImagingObjectSelection.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -93,10 +93,6 @@ class FHIRImagingObjectSelection extends FHIRDomainResource implements PHPFHIRCo { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_IMAGING_OBJECT_SELECTION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_AUTHOR = 'author'; const FIELD_AUTHORING_TIME = 'authoringTime'; const FIELD_AUTHORING_TIME_EXT = '_authoringTime'; @@ -210,6 +206,9 @@ class FHIRImagingObjectSelection extends FHIRDomainResource implements PHPFHIRCo */ protected $uid = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRImagingObjectSelection Constructor * @param null|array $data @@ -239,8 +238,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_AUTHORING_TIME] instanceof FHIRDateTime) { $this->setAuthoringTime($data[self::FIELD_AUTHORING_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_AUTHORING_TIME])) { - $this->setAuthoringTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_AUTHORING_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_AUTHORING_TIME])) { + $this->setAuthoringTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_AUTHORING_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_AUTHORING_TIME])) { + $this->setAuthoringTime(new FHIRDateTime(array_merge($ext, $data[self::FIELD_AUTHORING_TIME]))); + } } else { $this->setAuthoringTime(new FHIRDateTime($data[self::FIELD_AUTHORING_TIME])); } @@ -251,8 +254,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -267,6 +274,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_STUDY])) { if (is_array($data[self::FIELD_STUDY])) { foreach($data[self::FIELD_STUDY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRImagingObjectSelectionStudy) { $this->addStudy($v); } else { @@ -292,8 +302,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_UID] instanceof FHIROid) { $this->setUid($data[self::FIELD_UID]); - } elseif ($ext && is_scalar($data[self::FIELD_UID])) { - $this->setUid(new FHIROid([FHIROid::FIELD_VALUE => $data[self::FIELD_UID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_UID])) { + $this->setUid(new FHIROid([FHIROid::FIELD_VALUE => $data[self::FIELD_UID]] + $ext)); + } else if (is_array($data[self::FIELD_UID])) { + $this->setUid(new FHIROid(array_merge($ext, $data[self::FIELD_UID]))); + } } else { $this->setUid(new FHIROid($data[self::FIELD_UID])); } @@ -757,7 +771,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getAuthor())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AUTHOR, null, $v->_getFHIRXMLNamespace())); } @@ -767,11 +780,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESCRIPTION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPatient())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATIENT, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getStudy())) { foreach($vs as $v) { if (null === $v) { @@ -800,12 +811,26 @@ public function jsonSerialize() $a[self::FIELD_AUTHOR] = $v; } if (null !== ($v = $this->getAuthoringTime())) { - $a[self::FIELD_AUTHORING_TIME] = $v->getValue(); - $a[self::FIELD_AUTHORING_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_AUTHORING_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_AUTHORING_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_AUTHORING_TIME] = $v; + } } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if (null !== ($v = $this->getPatient())) { $a[self::FIELD_PATIENT] = $v; @@ -817,8 +842,15 @@ public function jsonSerialize() $a[self::FIELD_TITLE] = $v; } if (null !== ($v = $this->getUid())) { - $a[self::FIELD_UID] = $v->getValue(); - $a[self::FIELD_UID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_UID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_UID_EXT] = $enc; + } + } else { + $a[self::FIELD_UID] = $v; + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRImagingStudy.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRImagingStudy.php index 95df8fead2..81d12154b5 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRImagingStudy.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRImagingStudy.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -92,10 +92,6 @@ class FHIRImagingStudy extends FHIRDomainResource implements PHPFHIRContainedTyp { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_IMAGING_STUDY; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ACCESSION = 'accession'; const FIELD_ACCESSION_EXT = '_accession'; const FIELD_AVAILABILITY = 'availability'; @@ -309,6 +305,9 @@ class FHIRImagingStudy extends FHIRDomainResource implements PHPFHIRContainedTyp */ protected $url = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRImagingStudy Constructor * @param null|array $data @@ -331,8 +330,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ACCESSION] instanceof FHIRIdentifier) { $this->setAccession($data[self::FIELD_ACCESSION]); - } elseif ($ext && is_scalar($data[self::FIELD_ACCESSION])) { - $this->setAccession(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_ACCESSION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ACCESSION])) { + $this->setAccession(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_ACCESSION]] + $ext)); + } else if (is_array($data[self::FIELD_ACCESSION])) { + $this->setAccession(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_ACCESSION]))); + } } else { $this->setAccession(new FHIRIdentifier($data[self::FIELD_ACCESSION])); } @@ -343,8 +346,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_AVAILABILITY] instanceof FHIRInstanceAvailability) { $this->setAvailability($data[self::FIELD_AVAILABILITY]); - } elseif ($ext && is_scalar($data[self::FIELD_AVAILABILITY])) { - $this->setAvailability(new FHIRInstanceAvailability([FHIRInstanceAvailability::FIELD_VALUE => $data[self::FIELD_AVAILABILITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_AVAILABILITY])) { + $this->setAvailability(new FHIRInstanceAvailability([FHIRInstanceAvailability::FIELD_VALUE => $data[self::FIELD_AVAILABILITY]] + $ext)); + } else if (is_array($data[self::FIELD_AVAILABILITY])) { + $this->setAvailability(new FHIRInstanceAvailability(array_merge($ext, $data[self::FIELD_AVAILABILITY]))); + } } else { $this->setAvailability(new FHIRInstanceAvailability($data[self::FIELD_AVAILABILITY])); } @@ -355,8 +362,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -367,17 +378,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -393,6 +411,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_MODALITY_LIST])) { if (is_array($data[self::FIELD_MODALITY_LIST])) { foreach($data[self::FIELD_MODALITY_LIST] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCoding) { $this->addModalityList($v); } else { @@ -411,8 +432,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NUMBER_OF_INSTANCES] instanceof FHIRUnsignedInt) { $this->setNumberOfInstances($data[self::FIELD_NUMBER_OF_INSTANCES]); - } elseif ($ext && is_scalar($data[self::FIELD_NUMBER_OF_INSTANCES])) { - $this->setNumberOfInstances(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_NUMBER_OF_INSTANCES]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NUMBER_OF_INSTANCES])) { + $this->setNumberOfInstances(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_NUMBER_OF_INSTANCES]] + $ext)); + } else if (is_array($data[self::FIELD_NUMBER_OF_INSTANCES])) { + $this->setNumberOfInstances(new FHIRUnsignedInt(array_merge($ext, $data[self::FIELD_NUMBER_OF_INSTANCES]))); + } } else { $this->setNumberOfInstances(new FHIRUnsignedInt($data[self::FIELD_NUMBER_OF_INSTANCES])); } @@ -423,8 +448,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NUMBER_OF_SERIES] instanceof FHIRUnsignedInt) { $this->setNumberOfSeries($data[self::FIELD_NUMBER_OF_SERIES]); - } elseif ($ext && is_scalar($data[self::FIELD_NUMBER_OF_SERIES])) { - $this->setNumberOfSeries(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_NUMBER_OF_SERIES]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NUMBER_OF_SERIES])) { + $this->setNumberOfSeries(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_NUMBER_OF_SERIES]] + $ext)); + } else if (is_array($data[self::FIELD_NUMBER_OF_SERIES])) { + $this->setNumberOfSeries(new FHIRUnsignedInt(array_merge($ext, $data[self::FIELD_NUMBER_OF_SERIES]))); + } } else { $this->setNumberOfSeries(new FHIRUnsignedInt($data[self::FIELD_NUMBER_OF_SERIES])); } @@ -432,6 +461,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ORDER])) { if (is_array($data[self::FIELD_ORDER])) { foreach($data[self::FIELD_ORDER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addOrder($v); } else { @@ -454,6 +486,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PROCEDURE])) { if (is_array($data[self::FIELD_PROCEDURE])) { foreach($data[self::FIELD_PROCEDURE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addProcedure($v); } else { @@ -476,6 +511,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SERIES])) { if (is_array($data[self::FIELD_SERIES])) { foreach($data[self::FIELD_SERIES] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRImagingStudySeries) { $this->addSeries($v); } else { @@ -494,8 +532,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STARTED] instanceof FHIRDateTime) { $this->setStarted($data[self::FIELD_STARTED]); - } elseif ($ext && is_scalar($data[self::FIELD_STARTED])) { - $this->setStarted(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_STARTED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STARTED])) { + $this->setStarted(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_STARTED]] + $ext)); + } else if (is_array($data[self::FIELD_STARTED])) { + $this->setStarted(new FHIRDateTime(array_merge($ext, $data[self::FIELD_STARTED]))); + } } else { $this->setStarted(new FHIRDateTime($data[self::FIELD_STARTED])); } @@ -506,8 +548,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_UID] instanceof FHIROid) { $this->setUid($data[self::FIELD_UID]); - } elseif ($ext && is_scalar($data[self::FIELD_UID])) { - $this->setUid(new FHIROid([FHIROid::FIELD_VALUE => $data[self::FIELD_UID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_UID])) { + $this->setUid(new FHIROid([FHIROid::FIELD_VALUE => $data[self::FIELD_UID]] + $ext)); + } else if (is_array($data[self::FIELD_UID])) { + $this->setUid(new FHIROid(array_merge($ext, $data[self::FIELD_UID]))); + } } else { $this->setUid(new FHIROid($data[self::FIELD_UID])); } @@ -518,8 +564,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_URL] instanceof FHIRUri) { $this->setUrl($data[self::FIELD_URL]); - } elseif ($ext && is_scalar($data[self::FIELD_URL])) { - $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } else if (is_array($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri(array_merge($ext, $data[self::FIELD_URL]))); + } } else { $this->setUrl(new FHIRUri($data[self::FIELD_URL])); } @@ -1394,18 +1444,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getAccession())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ACCESSION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getAvailability())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AVAILABILITY, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getDescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESCRIPTION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -1418,7 +1465,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getInterpreter())) { $v->xmlSerialize($sxe->addChild(self::FIELD_INTERPRETER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getModalityList())) { foreach($vs as $v) { if (null === $v) { @@ -1427,13 +1473,13 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_MODALITY_LIST, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getNumberOfInstances())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NUMBER_OF_INSTANCES, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getNumberOfSeries())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NUMBER_OF_SERIES, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getOrder())) { foreach($vs as $v) { if (null === $v) { @@ -1446,7 +1492,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getPatient())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATIENT, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getProcedure())) { foreach($vs as $v) { if (null === $v) { @@ -1459,7 +1504,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getReferrer())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REFERRER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getSeries())) { foreach($vs as $v) { if (null === $v) { @@ -1468,6 +1512,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_SERIES, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getStarted())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STARTED, null, $v->_getFHIRXMLNamespace())); } @@ -1487,17 +1532,56 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getAccession())) { - $a[self::FIELD_ACCESSION] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ACCESSION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ACCESSION_EXT] = $enc; + } + } else { + $a[self::FIELD_ACCESSION] = $v; + } } if (null !== ($v = $this->getAvailability())) { - $a[self::FIELD_AVAILABILITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_AVAILABILITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_AVAILABILITY_EXT] = $enc; + } + } else { + $a[self::FIELD_AVAILABILITY] = $v; + } } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if (null !== ($v = $this->getInterpreter())) { $a[self::FIELD_INTERPRETER] = $v; @@ -1506,12 +1590,26 @@ public function jsonSerialize() $a[self::FIELD_MODALITY_LIST] = $vs; } if (null !== ($v = $this->getNumberOfInstances())) { - $a[self::FIELD_NUMBER_OF_INSTANCES] = $v->getValue(); - $a[self::FIELD_NUMBER_OF_INSTANCES_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NUMBER_OF_INSTANCES] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NUMBER_OF_INSTANCES_EXT] = $enc; + } + } else { + $a[self::FIELD_NUMBER_OF_INSTANCES] = $v; + } } if (null !== ($v = $this->getNumberOfSeries())) { - $a[self::FIELD_NUMBER_OF_SERIES] = $v->getValue(); - $a[self::FIELD_NUMBER_OF_SERIES_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NUMBER_OF_SERIES] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NUMBER_OF_SERIES_EXT] = $enc; + } + } else { + $a[self::FIELD_NUMBER_OF_SERIES] = $v; + } } if ([] !== ($vs = $this->getOrder())) { $a[self::FIELD_ORDER] = $vs; @@ -1529,16 +1627,37 @@ public function jsonSerialize() $a[self::FIELD_SERIES] = $vs; } if (null !== ($v = $this->getStarted())) { - $a[self::FIELD_STARTED] = $v->getValue(); - $a[self::FIELD_STARTED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STARTED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STARTED_EXT] = $enc; + } + } else { + $a[self::FIELD_STARTED] = $v; + } } if (null !== ($v = $this->getUid())) { - $a[self::FIELD_UID] = $v->getValue(); - $a[self::FIELD_UID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_UID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_UID_EXT] = $enc; + } + } else { + $a[self::FIELD_UID] = $v; + } } if (null !== ($v = $this->getUrl())) { - $a[self::FIELD_URL] = $v->getValue(); - $a[self::FIELD_URL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_URL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_URL_EXT] = $enc; + } + } else { + $a[self::FIELD_URL] = $v; + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRImmunization.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRImmunization.php index d1f55e37b7..6c6fa1a0f4 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRImmunization.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRImmunization.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -93,13 +93,10 @@ class FHIRImmunization extends FHIRDomainResource implements PHPFHIRContainedTyp { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_IMMUNIZATION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DATE = 'date'; const FIELD_DATE_EXT = '_date'; const FIELD_DOSE_QUANTITY = 'doseQuantity'; + const FIELD_DOSE_QUANTITY_EXT = '_doseQuantity'; const FIELD_ENCOUNTER = 'encounter'; const FIELD_EXPIRATION_DATE = 'expirationDate'; const FIELD_EXPIRATION_DATE_EXT = '_expirationDate'; @@ -364,6 +361,9 @@ class FHIRImmunization extends FHIRDomainResource implements PHPFHIRContainedTyp */ protected $wasNotGiven = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRImmunization Constructor * @param null|array $data @@ -386,15 +386,28 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATE] instanceof FHIRDateTime) { $this->setDate($data[self::FIELD_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_DATE])) { - $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime(array_merge($ext, $data[self::FIELD_DATE]))); + } } else { $this->setDate(new FHIRDateTime($data[self::FIELD_DATE])); } } if (isset($data[self::FIELD_DOSE_QUANTITY])) { + $ext = (isset($data[self::FIELD_DOSE_QUANTITY_EXT]) && is_array($data[self::FIELD_DOSE_QUANTITY_EXT])) + ? $data[self::FIELD_DOSE_QUANTITY_EXT] + : null; if ($data[self::FIELD_DOSE_QUANTITY] instanceof FHIRSimpleQuantity) { $this->setDoseQuantity($data[self::FIELD_DOSE_QUANTITY]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DOSE_QUANTITY])) { + $this->setDoseQuantity(new FHIRSimpleQuantity([FHIRSimpleQuantity::FIELD_VALUE => $data[self::FIELD_DOSE_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_DOSE_QUANTITY])) { + $this->setDoseQuantity(new FHIRSimpleQuantity(array_merge($ext, $data[self::FIELD_DOSE_QUANTITY]))); + } } else { $this->setDoseQuantity(new FHIRSimpleQuantity($data[self::FIELD_DOSE_QUANTITY])); } @@ -412,8 +425,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EXPIRATION_DATE] instanceof FHIRDate) { $this->setExpirationDate($data[self::FIELD_EXPIRATION_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_EXPIRATION_DATE])) { - $this->setExpirationDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_EXPIRATION_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EXPIRATION_DATE])) { + $this->setExpirationDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_EXPIRATION_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_EXPIRATION_DATE])) { + $this->setExpirationDate(new FHIRDate(array_merge($ext, $data[self::FIELD_EXPIRATION_DATE]))); + } } else { $this->setExpirationDate(new FHIRDate($data[self::FIELD_EXPIRATION_DATE])); } @@ -431,17 +448,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -460,8 +484,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_LOT_NUMBER] instanceof FHIRString) { $this->setLotNumber($data[self::FIELD_LOT_NUMBER]); - } elseif ($ext && is_scalar($data[self::FIELD_LOT_NUMBER])) { - $this->setLotNumber(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_LOT_NUMBER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_LOT_NUMBER])) { + $this->setLotNumber(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_LOT_NUMBER]] + $ext)); + } else if (is_array($data[self::FIELD_LOT_NUMBER])) { + $this->setLotNumber(new FHIRString(array_merge($ext, $data[self::FIELD_LOT_NUMBER]))); + } } else { $this->setLotNumber(new FHIRString($data[self::FIELD_LOT_NUMBER])); } @@ -476,6 +504,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_NOTE])) { if (is_array($data[self::FIELD_NOTE])) { foreach($data[self::FIELD_NOTE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRAnnotation) { $this->addNote($v); } else { @@ -505,6 +536,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REACTION])) { if (is_array($data[self::FIELD_REACTION])) { foreach($data[self::FIELD_REACTION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRImmunizationReaction) { $this->addReaction($v); } else { @@ -523,8 +557,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_REPORTED] instanceof FHIRBoolean) { $this->setReported($data[self::FIELD_REPORTED]); - } elseif ($ext && is_scalar($data[self::FIELD_REPORTED])) { - $this->setReported(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_REPORTED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_REPORTED])) { + $this->setReported(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_REPORTED]] + $ext)); + } else if (is_array($data[self::FIELD_REPORTED])) { + $this->setReported(new FHIRBoolean(array_merge($ext, $data[self::FIELD_REPORTED]))); + } } else { $this->setReported(new FHIRBoolean($data[self::FIELD_REPORTED])); } @@ -556,8 +594,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRCode) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRCode(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRCode($data[self::FIELD_STATUS])); } @@ -565,6 +607,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_VACCINATION_PROTOCOL])) { if (is_array($data[self::FIELD_VACCINATION_PROTOCOL])) { foreach($data[self::FIELD_VACCINATION_PROTOCOL] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRImmunizationVaccinationProtocol) { $this->addVaccinationProtocol($v); } else { @@ -590,8 +635,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_WAS_NOT_GIVEN] instanceof FHIRBoolean) { $this->setWasNotGiven($data[self::FIELD_WAS_NOT_GIVEN]); - } elseif ($ext && is_scalar($data[self::FIELD_WAS_NOT_GIVEN])) { - $this->setWasNotGiven(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_WAS_NOT_GIVEN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_WAS_NOT_GIVEN])) { + $this->setWasNotGiven(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_WAS_NOT_GIVEN]] + $ext)); + } else if (is_array($data[self::FIELD_WAS_NOT_GIVEN])) { + $this->setWasNotGiven(new FHIRBoolean(array_merge($ext, $data[self::FIELD_WAS_NOT_GIVEN]))); + } } else { $this->setWasNotGiven(new FHIRBoolean($data[self::FIELD_WAS_NOT_GIVEN])); } @@ -1597,22 +1646,18 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DATE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDoseQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DOSE_QUANTITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getEncounter())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ENCOUNTER, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getExpirationDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EXPIRATION_DATE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getExplanation())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EXPLANATION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -1628,11 +1673,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getLotNumber())) { $v->xmlSerialize($sxe->addChild(self::FIELD_LOT_NUMBER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getManufacturer())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MANUFACTURER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getNote())) { foreach($vs as $v) { if (null === $v) { @@ -1645,11 +1688,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getPatient())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATIENT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPerformer())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PERFORMER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getReaction())) { foreach($vs as $v) { if (null === $v) { @@ -1658,25 +1699,22 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_REACTION, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getReported())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REPORTED, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRequester())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REQUESTER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRoute())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ROUTE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSite())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SITE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getVaccinationProtocol())) { foreach($vs as $v) { if (null === $v) { @@ -1702,31 +1740,76 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getDate())) { - $a[self::FIELD_DATE] = $v->getValue(); - $a[self::FIELD_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_DATE] = $v; + } } if (null !== ($v = $this->getDoseQuantity())) { - $a[self::FIELD_DOSE_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DOSE_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DOSE_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_DOSE_QUANTITY] = $v; + } } if (null !== ($v = $this->getEncounter())) { $a[self::FIELD_ENCOUNTER] = $v; } if (null !== ($v = $this->getExpirationDate())) { - $a[self::FIELD_EXPIRATION_DATE] = $v->getValue(); - $a[self::FIELD_EXPIRATION_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EXPIRATION_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EXPIRATION_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_EXPIRATION_DATE] = $v; + } } if (null !== ($v = $this->getExplanation())) { $a[self::FIELD_EXPLANATION] = $v; } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if (null !== ($v = $this->getLocation())) { $a[self::FIELD_LOCATION] = $v; } if (null !== ($v = $this->getLotNumber())) { - $a[self::FIELD_LOT_NUMBER] = $v->getValue(); - $a[self::FIELD_LOT_NUMBER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_LOT_NUMBER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_LOT_NUMBER_EXT] = $enc; + } + } else { + $a[self::FIELD_LOT_NUMBER] = $v; + } } if (null !== ($v = $this->getManufacturer())) { $a[self::FIELD_MANUFACTURER] = $v; @@ -1744,8 +1827,15 @@ public function jsonSerialize() $a[self::FIELD_REACTION] = $vs; } if (null !== ($v = $this->getReported())) { - $a[self::FIELD_REPORTED] = $v->getValue(); - $a[self::FIELD_REPORTED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_REPORTED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_REPORTED_EXT] = $enc; + } + } else { + $a[self::FIELD_REPORTED] = $v; + } } if (null !== ($v = $this->getRequester())) { $a[self::FIELD_REQUESTER] = $v; @@ -1757,8 +1847,15 @@ public function jsonSerialize() $a[self::FIELD_SITE] = $v; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v->getValue(); - $a[self::FIELD_STATUS_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if ([] !== ($vs = $this->getVaccinationProtocol())) { $a[self::FIELD_VACCINATION_PROTOCOL] = $vs; @@ -1767,8 +1864,15 @@ public function jsonSerialize() $a[self::FIELD_VACCINE_CODE] = $v; } if (null !== ($v = $this->getWasNotGiven())) { - $a[self::FIELD_WAS_NOT_GIVEN] = $v->getValue(); - $a[self::FIELD_WAS_NOT_GIVEN_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_WAS_NOT_GIVEN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_WAS_NOT_GIVEN_EXT] = $enc; + } + } else { + $a[self::FIELD_WAS_NOT_GIVEN] = $v; + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRImmunizationRecommendation.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRImmunizationRecommendation.php index 277274707c..7eb2102c02 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRImmunizationRecommendation.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRImmunizationRecommendation.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -83,10 +83,6 @@ class FHIRImmunizationRecommendation extends FHIRDomainResource implements PHPFH { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_IMMUNIZATION_RECOMMENDATION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_IDENTIFIER = 'identifier'; const FIELD_IDENTIFIER_EXT = '_identifier'; const FIELD_PATIENT = 'patient'; @@ -125,6 +121,9 @@ class FHIRImmunizationRecommendation extends FHIRDomainResource implements PHPFH */ protected $recommendation = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRImmunizationRecommendation Constructor * @param null|array $data @@ -147,17 +146,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -173,6 +179,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_RECOMMENDATION])) { if (is_array($data[self::FIELD_RECOMMENDATION])) { foreach($data[self::FIELD_RECOMMENDATION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRImmunizationRecommendationRecommendation) { $this->addRecommendation($v); } else { @@ -449,7 +458,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -462,7 +470,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getPatient())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATIENT, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getRecommendation())) { foreach($vs as $v) { if (null === $v) { @@ -471,6 +478,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_RECOMMENDATION, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } @@ -481,7 +489,23 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if (null !== ($v = $this->getPatient())) { $a[self::FIELD_PATIENT] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRImplementationGuide.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRImplementationGuide.php index 895c866e1c..a3edec8aa0 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRImplementationGuide.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRImplementationGuide.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -92,10 +92,6 @@ class FHIRImplementationGuide extends FHIRDomainResource implements PHPFHIRConta { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_IMPLEMENTATION_GUIDE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_BINARY = 'binary'; const FIELD_BINARY_EXT = '_binary'; const FIELD_CONTACT = 'contact'; @@ -342,6 +338,9 @@ class FHIRImplementationGuide extends FHIRDomainResource implements PHPFHIRConta */ protected $version = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRImplementationGuide Constructor * @param null|array $data @@ -364,17 +363,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_BINARY])) { foreach($data[self::FIELD_BINARY] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRUri) { $this->addBinary($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addBinary(new FHIRUri([FHIRUri::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addBinary(new FHIRUri([FHIRUri::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addBinary(new FHIRUri(array_merge($v, $ext[$i]))); + } } else { $this->addBinary(new FHIRUri($v)); } } } elseif ($data[self::FIELD_BINARY] instanceof FHIRUri) { $this->addBinary($data[self::FIELD_BINARY]); - } elseif ($ext && is_scalar($data[self::FIELD_BINARY])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_BINARY])) { $this->addBinary(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_BINARY]] + $ext)); } else { $this->addBinary(new FHIRUri($data[self::FIELD_BINARY])); @@ -383,6 +389,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CONTACT])) { if (is_array($data[self::FIELD_CONTACT])) { foreach($data[self::FIELD_CONTACT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRImplementationGuideContact) { $this->addContact($v); } else { @@ -401,8 +410,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_COPYRIGHT] instanceof FHIRString) { $this->setCopyright($data[self::FIELD_COPYRIGHT]); - } elseif ($ext && is_scalar($data[self::FIELD_COPYRIGHT])) { - $this->setCopyright(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_COPYRIGHT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_COPYRIGHT])) { + $this->setCopyright(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_COPYRIGHT]] + $ext)); + } else if (is_array($data[self::FIELD_COPYRIGHT])) { + $this->setCopyright(new FHIRString(array_merge($ext, $data[self::FIELD_COPYRIGHT]))); + } } else { $this->setCopyright(new FHIRString($data[self::FIELD_COPYRIGHT])); } @@ -413,8 +426,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATE] instanceof FHIRDateTime) { $this->setDate($data[self::FIELD_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_DATE])) { - $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime(array_merge($ext, $data[self::FIELD_DATE]))); + } } else { $this->setDate(new FHIRDateTime($data[self::FIELD_DATE])); } @@ -422,6 +439,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_DEPENDENCY])) { if (is_array($data[self::FIELD_DEPENDENCY])) { foreach($data[self::FIELD_DEPENDENCY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRImplementationGuideDependency) { $this->addDependency($v); } else { @@ -440,8 +460,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -452,8 +476,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EXPERIMENTAL] instanceof FHIRBoolean) { $this->setExperimental($data[self::FIELD_EXPERIMENTAL]); - } elseif ($ext && is_scalar($data[self::FIELD_EXPERIMENTAL])) { - $this->setExperimental(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_EXPERIMENTAL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EXPERIMENTAL])) { + $this->setExperimental(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_EXPERIMENTAL]] + $ext)); + } else if (is_array($data[self::FIELD_EXPERIMENTAL])) { + $this->setExperimental(new FHIRBoolean(array_merge($ext, $data[self::FIELD_EXPERIMENTAL]))); + } } else { $this->setExperimental(new FHIRBoolean($data[self::FIELD_EXPERIMENTAL])); } @@ -464,8 +492,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_FHIR_VERSION] instanceof FHIRId) { $this->setFhirVersion($data[self::FIELD_FHIR_VERSION]); - } elseif ($ext && is_scalar($data[self::FIELD_FHIR_VERSION])) { - $this->setFhirVersion(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_FHIR_VERSION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_FHIR_VERSION])) { + $this->setFhirVersion(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_FHIR_VERSION]] + $ext)); + } else if (is_array($data[self::FIELD_FHIR_VERSION])) { + $this->setFhirVersion(new FHIRId(array_merge($ext, $data[self::FIELD_FHIR_VERSION]))); + } } else { $this->setFhirVersion(new FHIRId($data[self::FIELD_FHIR_VERSION])); } @@ -473,6 +505,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_GLOBAL])) { if (is_array($data[self::FIELD_GLOBAL])) { foreach($data[self::FIELD_GLOBAL] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRImplementationGuideGlobal) { $this->addGlobal($v); } else { @@ -491,8 +526,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -500,6 +539,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PACKAGE])) { if (is_array($data[self::FIELD_PACKAGE])) { foreach($data[self::FIELD_PACKAGE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRImplementationGuidePackage) { $this->addPackage($v); } else { @@ -525,8 +567,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PUBLISHER] instanceof FHIRString) { $this->setPublisher($data[self::FIELD_PUBLISHER]); - } elseif ($ext && is_scalar($data[self::FIELD_PUBLISHER])) { - $this->setPublisher(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PUBLISHER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PUBLISHER])) { + $this->setPublisher(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PUBLISHER]] + $ext)); + } else if (is_array($data[self::FIELD_PUBLISHER])) { + $this->setPublisher(new FHIRString(array_merge($ext, $data[self::FIELD_PUBLISHER]))); + } } else { $this->setPublisher(new FHIRString($data[self::FIELD_PUBLISHER])); } @@ -537,8 +583,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRCode) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRCode(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRCode($data[self::FIELD_STATUS])); } @@ -549,8 +599,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_URL] instanceof FHIRUri) { $this->setUrl($data[self::FIELD_URL]); - } elseif ($ext && is_scalar($data[self::FIELD_URL])) { - $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } else if (is_array($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri(array_merge($ext, $data[self::FIELD_URL]))); + } } else { $this->setUrl(new FHIRUri($data[self::FIELD_URL])); } @@ -558,6 +612,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_USE_CONTEXT])) { if (is_array($data[self::FIELD_USE_CONTEXT])) { foreach($data[self::FIELD_USE_CONTEXT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addUseContext($v); } else { @@ -576,8 +633,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VERSION] instanceof FHIRString) { $this->setVersion($data[self::FIELD_VERSION]); - } elseif ($ext && is_scalar($data[self::FIELD_VERSION])) { - $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } else if (is_array($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString(array_merge($ext, $data[self::FIELD_VERSION]))); + } } else { $this->setVersion(new FHIRString($data[self::FIELD_VERSION])); } @@ -1625,13 +1686,13 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_CONTACT, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getCopyright())) { $v->xmlSerialize($sxe->addChild(self::FIELD_COPYRIGHT, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DATE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getDependency())) { foreach($vs as $v) { if (null === $v) { @@ -1640,6 +1701,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_DEPENDENCY, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getDescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESCRIPTION, null, $v->_getFHIRXMLNamespace())); } @@ -1649,7 +1711,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getFhirVersion())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FHIR_VERSION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getGlobal())) { foreach($vs as $v) { if (null === $v) { @@ -1658,10 +1719,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_GLOBAL, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NAME, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getPackage())) { foreach($vs as $v) { if (null === $v) { @@ -1683,7 +1744,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getUrl())) { $v->xmlSerialize($sxe->addChild(self::FIELD_URL, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getUseContext())) { foreach($vs as $v) { if (null === $v) { @@ -1692,6 +1752,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_USE_CONTEXT, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getVersion())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VERSION, null, $v->_getFHIRXMLNamespace())); } @@ -1710,42 +1771,93 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_BINARY][] = $v->getValue(); - $a[self::FIELD_BINARY_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_BINARY][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_BINARY_EXT][] = $enc; + } else { + $a[self::FIELD_BINARY_EXT][] = null; + } + } else { + $a[self::FIELD_BINARY][] = $v; + } } } if ([] !== ($vs = $this->getContact())) { $a[self::FIELD_CONTACT] = $vs; } if (null !== ($v = $this->getCopyright())) { - $a[self::FIELD_COPYRIGHT] = $v->getValue(); - $a[self::FIELD_COPYRIGHT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_COPYRIGHT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_COPYRIGHT_EXT] = $enc; + } + } else { + $a[self::FIELD_COPYRIGHT] = $v; + } } if (null !== ($v = $this->getDate())) { - $a[self::FIELD_DATE] = $v->getValue(); - $a[self::FIELD_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_DATE] = $v; + } } if ([] !== ($vs = $this->getDependency())) { $a[self::FIELD_DEPENDENCY] = $vs; } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if (null !== ($v = $this->getExperimental())) { - $a[self::FIELD_EXPERIMENTAL] = $v->getValue(); - $a[self::FIELD_EXPERIMENTAL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EXPERIMENTAL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EXPERIMENTAL_EXT] = $enc; + } + } else { + $a[self::FIELD_EXPERIMENTAL] = $v; + } } if (null !== ($v = $this->getFhirVersion())) { - $a[self::FIELD_FHIR_VERSION] = $v->getValue(); - $a[self::FIELD_FHIR_VERSION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FHIR_VERSION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FHIR_VERSION_EXT] = $enc; + } + } else { + $a[self::FIELD_FHIR_VERSION] = $v; + } } if ([] !== ($vs = $this->getGlobal())) { $a[self::FIELD_GLOBAL] = $vs; } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if ([] !== ($vs = $this->getPackage())) { $a[self::FIELD_PACKAGE] = $vs; @@ -1754,23 +1866,51 @@ public function jsonSerialize() $a[self::FIELD_PAGE] = $v; } if (null !== ($v = $this->getPublisher())) { - $a[self::FIELD_PUBLISHER] = $v->getValue(); - $a[self::FIELD_PUBLISHER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PUBLISHER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PUBLISHER_EXT] = $enc; + } + } else { + $a[self::FIELD_PUBLISHER] = $v; + } } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v->getValue(); - $a[self::FIELD_STATUS_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getUrl())) { - $a[self::FIELD_URL] = $v->getValue(); - $a[self::FIELD_URL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_URL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_URL_EXT] = $enc; + } + } else { + $a[self::FIELD_URL] = $v; + } } if ([] !== ($vs = $this->getUseContext())) { $a[self::FIELD_USE_CONTEXT] = $vs; } if (null !== ($v = $this->getVersion())) { - $a[self::FIELD_VERSION] = $v->getValue(); - $a[self::FIELD_VERSION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VERSION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VERSION_EXT] = $enc; + } + } else { + $a[self::FIELD_VERSION] = $v; + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRList.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRList.php index 0e58f185cb..2bb92fc393 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -86,10 +86,6 @@ class FHIRList extends FHIRDomainResource implements PHPFHIRContainedTypeInterfa { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_LIST; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CODE = 'code'; const FIELD_DATE = 'date'; const FIELD_DATE_EXT = '_date'; @@ -261,6 +257,9 @@ class FHIRList extends FHIRDomainResource implements PHPFHIRContainedTypeInterfa */ protected $title = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRList Constructor * @param null|array $data @@ -290,8 +289,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATE] instanceof FHIRDateTime) { $this->setDate($data[self::FIELD_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_DATE])) { - $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime(array_merge($ext, $data[self::FIELD_DATE]))); + } } else { $this->setDate(new FHIRDateTime($data[self::FIELD_DATE])); } @@ -313,6 +316,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ENTRY])) { if (is_array($data[self::FIELD_ENTRY])) { foreach($data[self::FIELD_ENTRY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRListEntry) { $this->addEntry($v); } else { @@ -331,17 +337,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -353,8 +366,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MODE] instanceof FHIRListMode) { $this->setMode($data[self::FIELD_MODE]); - } elseif ($ext && is_scalar($data[self::FIELD_MODE])) { - $this->setMode(new FHIRListMode([FHIRListMode::FIELD_VALUE => $data[self::FIELD_MODE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MODE])) { + $this->setMode(new FHIRListMode([FHIRListMode::FIELD_VALUE => $data[self::FIELD_MODE]] + $ext)); + } else if (is_array($data[self::FIELD_MODE])) { + $this->setMode(new FHIRListMode(array_merge($ext, $data[self::FIELD_MODE]))); + } } else { $this->setMode(new FHIRListMode($data[self::FIELD_MODE])); } @@ -365,8 +382,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NOTE] instanceof FHIRString) { $this->setNote($data[self::FIELD_NOTE]); - } elseif ($ext && is_scalar($data[self::FIELD_NOTE])) { - $this->setNote(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NOTE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NOTE])) { + $this->setNote(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NOTE]] + $ext)); + } else if (is_array($data[self::FIELD_NOTE])) { + $this->setNote(new FHIRString(array_merge($ext, $data[self::FIELD_NOTE]))); + } } else { $this->setNote(new FHIRString($data[self::FIELD_NOTE])); } @@ -391,8 +412,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRListStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRListStatus([FHIRListStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRListStatus([FHIRListStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRListStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRListStatus($data[self::FIELD_STATUS])); } @@ -410,8 +435,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TITLE] instanceof FHIRString) { $this->setTitle($data[self::FIELD_TITLE]); - } elseif ($ext && is_scalar($data[self::FIELD_TITLE])) { - $this->setTitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TITLE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TITLE])) { + $this->setTitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TITLE]] + $ext)); + } else if (is_array($data[self::FIELD_TITLE])) { + $this->setTitle(new FHIRString(array_merge($ext, $data[self::FIELD_TITLE]))); + } } else { $this->setTitle(new FHIRString($data[self::FIELD_TITLE])); } @@ -1058,22 +1087,18 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DATE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getEmptyReason())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EMPTY_REASON, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getEncounter())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ENCOUNTER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getEntry())) { foreach($vs as $v) { if (null === $v) { @@ -1098,19 +1123,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getNote())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NOTE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOrderedBy())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ORDERED_BY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSource())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SOURCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSubject())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBJECT, null, $v->_getFHIRXMLNamespace())); } @@ -1130,8 +1151,15 @@ public function jsonSerialize() $a[self::FIELD_CODE] = $v; } if (null !== ($v = $this->getDate())) { - $a[self::FIELD_DATE] = $v->getValue(); - $a[self::FIELD_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_DATE] = $v; + } } if (null !== ($v = $this->getEmptyReason())) { $a[self::FIELD_EMPTY_REASON] = $v; @@ -1143,14 +1171,45 @@ public function jsonSerialize() $a[self::FIELD_ENTRY] = $vs; } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if (null !== ($v = $this->getMode())) { - $a[self::FIELD_MODE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MODE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MODE_EXT] = $enc; + } + } else { + $a[self::FIELD_MODE] = $v; + } } if (null !== ($v = $this->getNote())) { - $a[self::FIELD_NOTE] = $v->getValue(); - $a[self::FIELD_NOTE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NOTE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NOTE_EXT] = $enc; + } + } else { + $a[self::FIELD_NOTE] = $v; + } } if (null !== ($v = $this->getOrderedBy())) { $a[self::FIELD_ORDERED_BY] = $v; @@ -1159,14 +1218,29 @@ public function jsonSerialize() $a[self::FIELD_SOURCE] = $v; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getSubject())) { $a[self::FIELD_SUBJECT] = $v; } if (null !== ($v = $this->getTitle())) { - $a[self::FIELD_TITLE] = $v->getValue(); - $a[self::FIELD_TITLE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TITLE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TITLE_EXT] = $enc; + } + } else { + $a[self::FIELD_TITLE] = $v; + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRLocation.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRLocation.php index 9683d7ca3b..f4ed2ef17a 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRLocation.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRLocation.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -89,10 +89,6 @@ class FHIRLocation extends FHIRDomainResource implements PHPFHIRContainedTypeInt { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_LOCATION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ADDRESS = 'address'; const FIELD_DESCRIPTION = 'description'; const FIELD_DESCRIPTION_EXT = '_description'; @@ -251,6 +247,9 @@ class FHIRLocation extends FHIRDomainResource implements PHPFHIRContainedTypeInt */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRLocation Constructor * @param null|array $data @@ -280,8 +279,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -292,17 +295,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -321,8 +331,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MODE] instanceof FHIRLocationMode) { $this->setMode($data[self::FIELD_MODE]); - } elseif ($ext && is_scalar($data[self::FIELD_MODE])) { - $this->setMode(new FHIRLocationMode([FHIRLocationMode::FIELD_VALUE => $data[self::FIELD_MODE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MODE])) { + $this->setMode(new FHIRLocationMode([FHIRLocationMode::FIELD_VALUE => $data[self::FIELD_MODE]] + $ext)); + } else if (is_array($data[self::FIELD_MODE])) { + $this->setMode(new FHIRLocationMode(array_merge($ext, $data[self::FIELD_MODE]))); + } } else { $this->setMode(new FHIRLocationMode($data[self::FIELD_MODE])); } @@ -333,8 +347,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -366,8 +384,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRLocationStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRLocationStatus([FHIRLocationStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRLocationStatus([FHIRLocationStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRLocationStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRLocationStatus($data[self::FIELD_STATUS])); } @@ -378,17 +400,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_TELECOM])) { foreach($data[self::FIELD_TELECOM] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContactPoint) { $this->addTelecom($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addTelecom(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addTelecom(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addTelecom(new FHIRContactPoint(array_merge($v, $ext[$i]))); + } } else { $this->addTelecom(new FHIRContactPoint($v)); } } } elseif ($data[self::FIELD_TELECOM] instanceof FHIRContactPoint) { $this->addTelecom($data[self::FIELD_TELECOM]); - } elseif ($ext && is_scalar($data[self::FIELD_TELECOM])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_TELECOM])) { $this->addTelecom(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $data[self::FIELD_TELECOM]] + $ext)); } else { $this->addTelecom(new FHIRContactPoint($data[self::FIELD_TELECOM])); @@ -1001,14 +1030,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getAddress())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ADDRESS, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getDescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESCRIPTION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -1021,30 +1048,24 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getManagingOrganization())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MANAGING_ORGANIZATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getMode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MODE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NAME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPartOf())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PART_OF, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPhysicalType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PHYSICAL_TYPE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPosition())) { $v->xmlSerialize($sxe->addChild(self::FIELD_POSITION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getTelecom())) { foreach($vs as $v) { if (null === $v) { @@ -1070,21 +1091,59 @@ public function jsonSerialize() $a[self::FIELD_ADDRESS] = $v; } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if (null !== ($v = $this->getManagingOrganization())) { $a[self::FIELD_MANAGING_ORGANIZATION] = $v; } if (null !== ($v = $this->getMode())) { - $a[self::FIELD_MODE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MODE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MODE_EXT] = $enc; + } + } else { + $a[self::FIELD_MODE] = $v; + } } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if (null !== ($v = $this->getPartOf())) { $a[self::FIELD_PART_OF] = $v; @@ -1096,10 +1155,34 @@ public function jsonSerialize() $a[self::FIELD_POSITION] = $v; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if ([] !== ($vs = $this->getTelecom())) { - $a[self::FIELD_TELECOM] = $vs; + $a[self::FIELD_TELECOM] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TELECOM][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TELECOM_EXT][] = $enc; + } else { + $a[self::FIELD_TELECOM_EXT][] = null; + } + } else { + $a[self::FIELD_TELECOM][] = $v; + } + } } if (null !== ($v = $this->getType())) { $a[self::FIELD_TYPE] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRMedia.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRMedia.php index 716319f88e..f60a8604bc 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRMedia.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRMedia.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -87,10 +87,6 @@ class FHIRMedia extends FHIRDomainResource implements PHPFHIRContainedTypeInterf { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MEDIA; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CONTENT = 'content'; const FIELD_DEVICE_NAME = 'deviceName'; const FIELD_DEVICE_NAME_EXT = '_deviceName'; @@ -255,6 +251,9 @@ class FHIRMedia extends FHIRDomainResource implements PHPFHIRContainedTypeInterf */ protected $width = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMedia Constructor * @param null|array $data @@ -284,8 +283,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DEVICE_NAME] instanceof FHIRString) { $this->setDeviceName($data[self::FIELD_DEVICE_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_DEVICE_NAME])) { - $this->setDeviceName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DEVICE_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DEVICE_NAME])) { + $this->setDeviceName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DEVICE_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_DEVICE_NAME])) { + $this->setDeviceName(new FHIRString(array_merge($ext, $data[self::FIELD_DEVICE_NAME]))); + } } else { $this->setDeviceName(new FHIRString($data[self::FIELD_DEVICE_NAME])); } @@ -296,8 +299,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DURATION] instanceof FHIRUnsignedInt) { $this->setDuration($data[self::FIELD_DURATION]); - } elseif ($ext && is_scalar($data[self::FIELD_DURATION])) { - $this->setDuration(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_DURATION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DURATION])) { + $this->setDuration(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_DURATION]] + $ext)); + } else if (is_array($data[self::FIELD_DURATION])) { + $this->setDuration(new FHIRUnsignedInt(array_merge($ext, $data[self::FIELD_DURATION]))); + } } else { $this->setDuration(new FHIRUnsignedInt($data[self::FIELD_DURATION])); } @@ -308,8 +315,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_FRAMES] instanceof FHIRPositiveInt) { $this->setFrames($data[self::FIELD_FRAMES]); - } elseif ($ext && is_scalar($data[self::FIELD_FRAMES])) { - $this->setFrames(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_FRAMES]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_FRAMES])) { + $this->setFrames(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_FRAMES]] + $ext)); + } else if (is_array($data[self::FIELD_FRAMES])) { + $this->setFrames(new FHIRPositiveInt(array_merge($ext, $data[self::FIELD_FRAMES]))); + } } else { $this->setFrames(new FHIRPositiveInt($data[self::FIELD_FRAMES])); } @@ -320,8 +331,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_HEIGHT] instanceof FHIRPositiveInt) { $this->setHeight($data[self::FIELD_HEIGHT]); - } elseif ($ext && is_scalar($data[self::FIELD_HEIGHT])) { - $this->setHeight(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_HEIGHT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_HEIGHT])) { + $this->setHeight(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_HEIGHT]] + $ext)); + } else if (is_array($data[self::FIELD_HEIGHT])) { + $this->setHeight(new FHIRPositiveInt(array_merge($ext, $data[self::FIELD_HEIGHT]))); + } } else { $this->setHeight(new FHIRPositiveInt($data[self::FIELD_HEIGHT])); } @@ -332,17 +347,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -375,8 +397,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TYPE] instanceof FHIRDigitalMediaType) { $this->setType($data[self::FIELD_TYPE]); - } elseif ($ext && is_scalar($data[self::FIELD_TYPE])) { - $this->setType(new FHIRDigitalMediaType([FHIRDigitalMediaType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TYPE])) { + $this->setType(new FHIRDigitalMediaType([FHIRDigitalMediaType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } else if (is_array($data[self::FIELD_TYPE])) { + $this->setType(new FHIRDigitalMediaType(array_merge($ext, $data[self::FIELD_TYPE]))); + } } else { $this->setType(new FHIRDigitalMediaType($data[self::FIELD_TYPE])); } @@ -394,8 +420,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_WIDTH] instanceof FHIRPositiveInt) { $this->setWidth($data[self::FIELD_WIDTH]); - } elseif ($ext && is_scalar($data[self::FIELD_WIDTH])) { - $this->setWidth(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_WIDTH]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_WIDTH])) { + $this->setWidth(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_WIDTH]] + $ext)); + } else if (is_array($data[self::FIELD_WIDTH])) { + $this->setWidth(new FHIRPositiveInt(array_merge($ext, $data[self::FIELD_WIDTH]))); + } } else { $this->setWidth(new FHIRPositiveInt($data[self::FIELD_WIDTH])); } @@ -1014,7 +1044,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getContent())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CONTENT, null, $v->_getFHIRXMLNamespace())); } @@ -1030,7 +1059,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getHeight())) { $v->xmlSerialize($sxe->addChild(self::FIELD_HEIGHT, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -1043,19 +1071,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getOperator())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OPERATOR, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSubject())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBJECT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSubtype())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBTYPE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getView())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VIEW, null, $v->_getFHIRXMLNamespace())); } @@ -1075,23 +1099,67 @@ public function jsonSerialize() $a[self::FIELD_CONTENT] = $v; } if (null !== ($v = $this->getDeviceName())) { - $a[self::FIELD_DEVICE_NAME] = $v->getValue(); - $a[self::FIELD_DEVICE_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DEVICE_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DEVICE_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_DEVICE_NAME] = $v; + } } if (null !== ($v = $this->getDuration())) { - $a[self::FIELD_DURATION] = $v->getValue(); - $a[self::FIELD_DURATION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DURATION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DURATION_EXT] = $enc; + } + } else { + $a[self::FIELD_DURATION] = $v; + } } if (null !== ($v = $this->getFrames())) { - $a[self::FIELD_FRAMES] = $v->getValue(); - $a[self::FIELD_FRAMES_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FRAMES] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FRAMES_EXT] = $enc; + } + } else { + $a[self::FIELD_FRAMES] = $v; + } } if (null !== ($v = $this->getHeight())) { - $a[self::FIELD_HEIGHT] = $v->getValue(); - $a[self::FIELD_HEIGHT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_HEIGHT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_HEIGHT_EXT] = $enc; + } + } else { + $a[self::FIELD_HEIGHT] = $v; + } } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if (null !== ($v = $this->getOperator())) { $a[self::FIELD_OPERATOR] = $v; @@ -1103,14 +1171,29 @@ public function jsonSerialize() $a[self::FIELD_SUBTYPE] = $v; } if (null !== ($v = $this->getType())) { - $a[self::FIELD_TYPE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TYPE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TYPE_EXT] = $enc; + } + } else { + $a[self::FIELD_TYPE] = $v; + } } if (null !== ($v = $this->getView())) { $a[self::FIELD_VIEW] = $v; } if (null !== ($v = $this->getWidth())) { - $a[self::FIELD_WIDTH] = $v->getValue(); - $a[self::FIELD_WIDTH_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_WIDTH] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_WIDTH_EXT] = $enc; + } + } else { + $a[self::FIELD_WIDTH] = $v; + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRMedication.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRMedication.php index 2147cf8791..20593d85f3 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRMedication.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRMedication.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -84,10 +84,6 @@ class FHIRMedication extends FHIRDomainResource implements PHPFHIRContainedTypeI { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MEDICATION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CODE = 'code'; const FIELD_IS_BRAND = 'isBrand'; const FIELD_IS_BRAND_EXT = '_isBrand'; @@ -151,6 +147,9 @@ class FHIRMedication extends FHIRDomainResource implements PHPFHIRContainedTypeI */ protected $product = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMedication Constructor * @param null|array $data @@ -180,8 +179,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IS_BRAND] instanceof FHIRBoolean) { $this->setIsBrand($data[self::FIELD_IS_BRAND]); - } elseif ($ext && is_scalar($data[self::FIELD_IS_BRAND])) { - $this->setIsBrand(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_IS_BRAND]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IS_BRAND])) { + $this->setIsBrand(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_IS_BRAND]] + $ext)); + } else if (is_array($data[self::FIELD_IS_BRAND])) { + $this->setIsBrand(new FHIRBoolean(array_merge($ext, $data[self::FIELD_IS_BRAND]))); + } } else { $this->setIsBrand(new FHIRBoolean($data[self::FIELD_IS_BRAND])); } @@ -494,22 +497,18 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getIsBrand())) { $v->xmlSerialize($sxe->addChild(self::FIELD_IS_BRAND, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getManufacturer())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MANUFACTURER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPackage())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PACKAGE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getProduct())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PRODUCT, null, $v->_getFHIRXMLNamespace())); } @@ -526,8 +525,15 @@ public function jsonSerialize() $a[self::FIELD_CODE] = $v; } if (null !== ($v = $this->getIsBrand())) { - $a[self::FIELD_IS_BRAND] = $v->getValue(); - $a[self::FIELD_IS_BRAND_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IS_BRAND] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IS_BRAND_EXT] = $enc; + } + } else { + $a[self::FIELD_IS_BRAND] = $v; + } } if (null !== ($v = $this->getManufacturer())) { $a[self::FIELD_MANUFACTURER] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRMedicationAdministration.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRMedicationAdministration.php index a1d2c37d83..d310e77853 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRMedicationAdministration.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRMedicationAdministration.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -91,10 +91,6 @@ class FHIRMedicationAdministration extends FHIRDomainResource implements PHPFHIR { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MEDICATION_ADMINISTRATION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DEVICE = 'device'; const FIELD_DOSAGE = 'dosage'; const FIELD_EFFECTIVE_TIME_DATE_TIME = 'effectiveTimeDateTime'; @@ -323,6 +319,9 @@ class FHIRMedicationAdministration extends FHIRDomainResource implements PHPFHIR */ protected $wasNotGiven = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMedicationAdministration Constructor * @param null|array $data @@ -342,6 +341,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_DEVICE])) { if (is_array($data[self::FIELD_DEVICE])) { foreach($data[self::FIELD_DEVICE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addDevice($v); } else { @@ -367,8 +369,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EFFECTIVE_TIME_DATE_TIME] instanceof FHIRDateTime) { $this->setEffectiveTimeDateTime($data[self::FIELD_EFFECTIVE_TIME_DATE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_EFFECTIVE_TIME_DATE_TIME])) { - $this->setEffectiveTimeDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_EFFECTIVE_TIME_DATE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EFFECTIVE_TIME_DATE_TIME])) { + $this->setEffectiveTimeDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_EFFECTIVE_TIME_DATE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_EFFECTIVE_TIME_DATE_TIME])) { + $this->setEffectiveTimeDateTime(new FHIRDateTime(array_merge($ext, $data[self::FIELD_EFFECTIVE_TIME_DATE_TIME]))); + } } else { $this->setEffectiveTimeDateTime(new FHIRDateTime($data[self::FIELD_EFFECTIVE_TIME_DATE_TIME])); } @@ -393,17 +399,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -429,8 +442,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NOTE] instanceof FHIRString) { $this->setNote($data[self::FIELD_NOTE]); - } elseif ($ext && is_scalar($data[self::FIELD_NOTE])) { - $this->setNote(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NOTE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NOTE])) { + $this->setNote(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NOTE]] + $ext)); + } else if (is_array($data[self::FIELD_NOTE])) { + $this->setNote(new FHIRString(array_merge($ext, $data[self::FIELD_NOTE]))); + } } else { $this->setNote(new FHIRString($data[self::FIELD_NOTE])); } @@ -459,6 +476,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REASON_GIVEN])) { if (is_array($data[self::FIELD_REASON_GIVEN])) { foreach($data[self::FIELD_REASON_GIVEN] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addReasonGiven($v); } else { @@ -474,6 +494,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REASON_NOT_GIVEN])) { if (is_array($data[self::FIELD_REASON_NOT_GIVEN])) { foreach($data[self::FIELD_REASON_NOT_GIVEN] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addReasonNotGiven($v); } else { @@ -492,8 +515,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRMedicationAdministrationStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRMedicationAdministrationStatus([FHIRMedicationAdministrationStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRMedicationAdministrationStatus([FHIRMedicationAdministrationStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRMedicationAdministrationStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRMedicationAdministrationStatus($data[self::FIELD_STATUS])); } @@ -504,8 +531,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_WAS_NOT_GIVEN] instanceof FHIRBoolean) { $this->setWasNotGiven($data[self::FIELD_WAS_NOT_GIVEN]); - } elseif ($ext && is_scalar($data[self::FIELD_WAS_NOT_GIVEN])) { - $this->setWasNotGiven(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_WAS_NOT_GIVEN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_WAS_NOT_GIVEN])) { + $this->setWasNotGiven(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_WAS_NOT_GIVEN]] + $ext)); + } else if (is_array($data[self::FIELD_WAS_NOT_GIVEN])) { + $this->setWasNotGiven(new FHIRBoolean(array_merge($ext, $data[self::FIELD_WAS_NOT_GIVEN]))); + } } else { $this->setWasNotGiven(new FHIRBoolean($data[self::FIELD_WAS_NOT_GIVEN])); } @@ -1361,7 +1392,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getDevice())) { foreach($vs as $v) { if (null === $v) { @@ -1377,15 +1407,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getEffectiveTimeDateTime())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EFFECTIVE_TIME_DATE_TIME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getEffectiveTimePeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EFFECTIVE_TIME_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getEncounter())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ENCOUNTER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -1398,26 +1425,21 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getMedicationCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MEDICATION_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getMedicationReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MEDICATION_REFERENCE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getNote())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NOTE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPatient())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATIENT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPractitioner())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PRACTITIONER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPrescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PRESCRIPTION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getReasonGiven())) { foreach($vs as $v) { if (null === $v) { @@ -1458,8 +1480,15 @@ public function jsonSerialize() $a[self::FIELD_DOSAGE] = $v; } if (null !== ($v = $this->getEffectiveTimeDateTime())) { - $a[self::FIELD_EFFECTIVE_TIME_DATE_TIME] = $v->getValue(); - $a[self::FIELD_EFFECTIVE_TIME_DATE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EFFECTIVE_TIME_DATE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EFFECTIVE_TIME_DATE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_EFFECTIVE_TIME_DATE_TIME] = $v; + } } if (null !== ($v = $this->getEffectiveTimePeriod())) { $a[self::FIELD_EFFECTIVE_TIME_PERIOD] = $v; @@ -1468,7 +1497,23 @@ public function jsonSerialize() $a[self::FIELD_ENCOUNTER] = $v; } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if (null !== ($v = $this->getMedicationCodeableConcept())) { $a[self::FIELD_MEDICATION_CODEABLE_CONCEPT] = $v; @@ -1477,8 +1522,15 @@ public function jsonSerialize() $a[self::FIELD_MEDICATION_REFERENCE] = $v; } if (null !== ($v = $this->getNote())) { - $a[self::FIELD_NOTE] = $v->getValue(); - $a[self::FIELD_NOTE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NOTE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NOTE_EXT] = $enc; + } + } else { + $a[self::FIELD_NOTE] = $v; + } } if (null !== ($v = $this->getPatient())) { $a[self::FIELD_PATIENT] = $v; @@ -1496,11 +1548,26 @@ public function jsonSerialize() $a[self::FIELD_REASON_NOT_GIVEN] = $vs; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getWasNotGiven())) { - $a[self::FIELD_WAS_NOT_GIVEN] = $v->getValue(); - $a[self::FIELD_WAS_NOT_GIVEN_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_WAS_NOT_GIVEN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_WAS_NOT_GIVEN_EXT] = $enc; + } + } else { + $a[self::FIELD_WAS_NOT_GIVEN] = $v; + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRMedicationDispense.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRMedicationDispense.php index 5d35659152..cdee5a25c1 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRMedicationDispense.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRMedicationDispense.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -90,12 +90,9 @@ class FHIRMedicationDispense extends FHIRDomainResource implements PHPFHIRContai { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MEDICATION_DISPENSE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_AUTHORIZING_PRESCRIPTION = 'authorizingPrescription'; const FIELD_DAYS_SUPPLY = 'daysSupply'; + const FIELD_DAYS_SUPPLY_EXT = '_daysSupply'; const FIELD_DESTINATION = 'destination'; const FIELD_DISPENSER = 'dispenser'; const FIELD_DOSAGE_INSTRUCTION = 'dosageInstruction'; @@ -107,6 +104,7 @@ class FHIRMedicationDispense extends FHIRDomainResource implements PHPFHIRContai const FIELD_NOTE_EXT = '_note'; const FIELD_PATIENT = 'patient'; const FIELD_QUANTITY = 'quantity'; + const FIELD_QUANTITY_EXT = '_quantity'; const FIELD_RECEIVER = 'receiver'; const FIELD_STATUS = 'status'; const FIELD_STATUS_EXT = '_status'; @@ -320,6 +318,9 @@ class FHIRMedicationDispense extends FHIRDomainResource implements PHPFHIRContai */ protected $whenPrepared = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMedicationDispense Constructor * @param null|array $data @@ -339,6 +340,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_AUTHORIZING_PRESCRIPTION])) { if (is_array($data[self::FIELD_AUTHORIZING_PRESCRIPTION])) { foreach($data[self::FIELD_AUTHORIZING_PRESCRIPTION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addAuthorizingPrescription($v); } else { @@ -352,8 +356,17 @@ public function __construct($data = null) } } if (isset($data[self::FIELD_DAYS_SUPPLY])) { + $ext = (isset($data[self::FIELD_DAYS_SUPPLY_EXT]) && is_array($data[self::FIELD_DAYS_SUPPLY_EXT])) + ? $data[self::FIELD_DAYS_SUPPLY_EXT] + : null; if ($data[self::FIELD_DAYS_SUPPLY] instanceof FHIRSimpleQuantity) { $this->setDaysSupply($data[self::FIELD_DAYS_SUPPLY]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DAYS_SUPPLY])) { + $this->setDaysSupply(new FHIRSimpleQuantity([FHIRSimpleQuantity::FIELD_VALUE => $data[self::FIELD_DAYS_SUPPLY]] + $ext)); + } else if (is_array($data[self::FIELD_DAYS_SUPPLY])) { + $this->setDaysSupply(new FHIRSimpleQuantity(array_merge($ext, $data[self::FIELD_DAYS_SUPPLY]))); + } } else { $this->setDaysSupply(new FHIRSimpleQuantity($data[self::FIELD_DAYS_SUPPLY])); } @@ -375,6 +388,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_DOSAGE_INSTRUCTION])) { if (is_array($data[self::FIELD_DOSAGE_INSTRUCTION])) { foreach($data[self::FIELD_DOSAGE_INSTRUCTION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRMedicationDispenseDosageInstruction) { $this->addDosageInstruction($v); } else { @@ -393,8 +409,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->setIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { - $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_IDENTIFIER]))); + } } else { $this->setIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); } @@ -419,8 +439,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NOTE] instanceof FHIRString) { $this->setNote($data[self::FIELD_NOTE]); - } elseif ($ext && is_scalar($data[self::FIELD_NOTE])) { - $this->setNote(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NOTE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NOTE])) { + $this->setNote(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NOTE]] + $ext)); + } else if (is_array($data[self::FIELD_NOTE])) { + $this->setNote(new FHIRString(array_merge($ext, $data[self::FIELD_NOTE]))); + } } else { $this->setNote(new FHIRString($data[self::FIELD_NOTE])); } @@ -433,8 +457,17 @@ public function __construct($data = null) } } if (isset($data[self::FIELD_QUANTITY])) { + $ext = (isset($data[self::FIELD_QUANTITY_EXT]) && is_array($data[self::FIELD_QUANTITY_EXT])) + ? $data[self::FIELD_QUANTITY_EXT] + : null; if ($data[self::FIELD_QUANTITY] instanceof FHIRSimpleQuantity) { $this->setQuantity($data[self::FIELD_QUANTITY]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_QUANTITY])) { + $this->setQuantity(new FHIRSimpleQuantity([FHIRSimpleQuantity::FIELD_VALUE => $data[self::FIELD_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_QUANTITY])) { + $this->setQuantity(new FHIRSimpleQuantity(array_merge($ext, $data[self::FIELD_QUANTITY]))); + } } else { $this->setQuantity(new FHIRSimpleQuantity($data[self::FIELD_QUANTITY])); } @@ -442,6 +475,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_RECEIVER])) { if (is_array($data[self::FIELD_RECEIVER])) { foreach($data[self::FIELD_RECEIVER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addReceiver($v); } else { @@ -460,8 +496,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRMedicationDispenseStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRMedicationDispenseStatus([FHIRMedicationDispenseStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRMedicationDispenseStatus([FHIRMedicationDispenseStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRMedicationDispenseStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRMedicationDispenseStatus($data[self::FIELD_STATUS])); } @@ -486,8 +526,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_WHEN_HANDED_OVER] instanceof FHIRDateTime) { $this->setWhenHandedOver($data[self::FIELD_WHEN_HANDED_OVER]); - } elseif ($ext && is_scalar($data[self::FIELD_WHEN_HANDED_OVER])) { - $this->setWhenHandedOver(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_WHEN_HANDED_OVER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_WHEN_HANDED_OVER])) { + $this->setWhenHandedOver(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_WHEN_HANDED_OVER]] + $ext)); + } else if (is_array($data[self::FIELD_WHEN_HANDED_OVER])) { + $this->setWhenHandedOver(new FHIRDateTime(array_merge($ext, $data[self::FIELD_WHEN_HANDED_OVER]))); + } } else { $this->setWhenHandedOver(new FHIRDateTime($data[self::FIELD_WHEN_HANDED_OVER])); } @@ -498,8 +542,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_WHEN_PREPARED] instanceof FHIRDateTime) { $this->setWhenPrepared($data[self::FIELD_WHEN_PREPARED]); - } elseif ($ext && is_scalar($data[self::FIELD_WHEN_PREPARED])) { - $this->setWhenPrepared(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_WHEN_PREPARED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_WHEN_PREPARED])) { + $this->setWhenPrepared(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_WHEN_PREPARED]] + $ext)); + } else if (is_array($data[self::FIELD_WHEN_PREPARED])) { + $this->setWhenPrepared(new FHIRDateTime(array_merge($ext, $data[self::FIELD_WHEN_PREPARED]))); + } } else { $this->setWhenPrepared(new FHIRDateTime($data[self::FIELD_WHEN_PREPARED])); } @@ -1326,7 +1374,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getAuthorizingPrescription())) { foreach($vs as $v) { if (null === $v) { @@ -1339,15 +1386,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDaysSupply())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DAYS_SUPPLY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDestination())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESTINATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDispenser())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DISPENSER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getDosageInstruction())) { foreach($vs as $v) { if (null === $v) { @@ -1360,26 +1404,21 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getMedicationCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MEDICATION_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getMedicationReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MEDICATION_REFERENCE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getNote())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NOTE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPatient())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATIENT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_QUANTITY, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getReceiver())) { foreach($vs as $v) { if (null === $v) { @@ -1392,11 +1431,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSubstitution())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBSTITUTION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -1419,7 +1456,15 @@ public function jsonSerialize() $a[self::FIELD_AUTHORIZING_PRESCRIPTION] = $vs; } if (null !== ($v = $this->getDaysSupply())) { - $a[self::FIELD_DAYS_SUPPLY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DAYS_SUPPLY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DAYS_SUPPLY_EXT] = $enc; + } + } else { + $a[self::FIELD_DAYS_SUPPLY] = $v; + } } if (null !== ($v = $this->getDestination())) { $a[self::FIELD_DESTINATION] = $v; @@ -1431,7 +1476,15 @@ public function jsonSerialize() $a[self::FIELD_DOSAGE_INSTRUCTION] = $vs; } if (null !== ($v = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_IDENTIFIER] = $v; + } } if (null !== ($v = $this->getMedicationCodeableConcept())) { $a[self::FIELD_MEDICATION_CODEABLE_CONCEPT] = $v; @@ -1440,20 +1493,43 @@ public function jsonSerialize() $a[self::FIELD_MEDICATION_REFERENCE] = $v; } if (null !== ($v = $this->getNote())) { - $a[self::FIELD_NOTE] = $v->getValue(); - $a[self::FIELD_NOTE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NOTE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NOTE_EXT] = $enc; + } + } else { + $a[self::FIELD_NOTE] = $v; + } } if (null !== ($v = $this->getPatient())) { $a[self::FIELD_PATIENT] = $v; } if (null !== ($v = $this->getQuantity())) { - $a[self::FIELD_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_QUANTITY] = $v; + } } if ([] !== ($vs = $this->getReceiver())) { $a[self::FIELD_RECEIVER] = $vs; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getSubstitution())) { $a[self::FIELD_SUBSTITUTION] = $v; @@ -1462,12 +1538,26 @@ public function jsonSerialize() $a[self::FIELD_TYPE] = $v; } if (null !== ($v = $this->getWhenHandedOver())) { - $a[self::FIELD_WHEN_HANDED_OVER] = $v->getValue(); - $a[self::FIELD_WHEN_HANDED_OVER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_WHEN_HANDED_OVER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_WHEN_HANDED_OVER_EXT] = $enc; + } + } else { + $a[self::FIELD_WHEN_HANDED_OVER] = $v; + } } if (null !== ($v = $this->getWhenPrepared())) { - $a[self::FIELD_WHEN_PREPARED] = $v->getValue(); - $a[self::FIELD_WHEN_PREPARED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_WHEN_PREPARED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_WHEN_PREPARED_EXT] = $enc; + } + } else { + $a[self::FIELD_WHEN_PREPARED] = $v; + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRMedicationOrder.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRMedicationOrder.php index e4a34c4263..d1c83e88e0 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRMedicationOrder.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRMedicationOrder.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -90,10 +90,6 @@ class FHIRMedicationOrder extends FHIRDomainResource implements PHPFHIRContained { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MEDICATION_ORDER; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DATE_ENDED = 'dateEnded'; const FIELD_DATE_ENDED_EXT = '_dateEnded'; const FIELD_DATE_WRITTEN = 'dateWritten'; @@ -338,6 +334,9 @@ class FHIRMedicationOrder extends FHIRDomainResource implements PHPFHIRContained */ protected $substitution = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMedicationOrder Constructor * @param null|array $data @@ -360,8 +359,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATE_ENDED] instanceof FHIRDateTime) { $this->setDateEnded($data[self::FIELD_DATE_ENDED]); - } elseif ($ext && is_scalar($data[self::FIELD_DATE_ENDED])) { - $this->setDateEnded(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE_ENDED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATE_ENDED])) { + $this->setDateEnded(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE_ENDED]] + $ext)); + } else if (is_array($data[self::FIELD_DATE_ENDED])) { + $this->setDateEnded(new FHIRDateTime(array_merge($ext, $data[self::FIELD_DATE_ENDED]))); + } } else { $this->setDateEnded(new FHIRDateTime($data[self::FIELD_DATE_ENDED])); } @@ -372,8 +375,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATE_WRITTEN] instanceof FHIRDateTime) { $this->setDateWritten($data[self::FIELD_DATE_WRITTEN]); - } elseif ($ext && is_scalar($data[self::FIELD_DATE_WRITTEN])) { - $this->setDateWritten(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE_WRITTEN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATE_WRITTEN])) { + $this->setDateWritten(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE_WRITTEN]] + $ext)); + } else if (is_array($data[self::FIELD_DATE_WRITTEN])) { + $this->setDateWritten(new FHIRDateTime(array_merge($ext, $data[self::FIELD_DATE_WRITTEN]))); + } } else { $this->setDateWritten(new FHIRDateTime($data[self::FIELD_DATE_WRITTEN])); } @@ -388,6 +395,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_DOSAGE_INSTRUCTION])) { if (is_array($data[self::FIELD_DOSAGE_INSTRUCTION])) { foreach($data[self::FIELD_DOSAGE_INSTRUCTION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRMedicationOrderDosageInstruction) { $this->addDosageInstruction($v); } else { @@ -413,17 +423,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -449,8 +466,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NOTE] instanceof FHIRString) { $this->setNote($data[self::FIELD_NOTE]); - } elseif ($ext && is_scalar($data[self::FIELD_NOTE])) { - $this->setNote(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NOTE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NOTE])) { + $this->setNote(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NOTE]] + $ext)); + } else if (is_array($data[self::FIELD_NOTE])) { + $this->setNote(new FHIRString(array_merge($ext, $data[self::FIELD_NOTE]))); + } } else { $this->setNote(new FHIRString($data[self::FIELD_NOTE])); } @@ -503,8 +524,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRMedicationOrderStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRMedicationOrderStatus([FHIRMedicationOrderStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRMedicationOrderStatus([FHIRMedicationOrderStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRMedicationOrderStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRMedicationOrderStatus($data[self::FIELD_STATUS])); } @@ -1354,11 +1379,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDateWritten())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DATE_WRITTEN, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDispenseRequest())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DISPENSE_REQUEST, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getDosageInstruction())) { foreach($vs as $v) { if (null === $v) { @@ -1371,7 +1394,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getEncounter())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ENCOUNTER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -1384,42 +1406,33 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getMedicationCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MEDICATION_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getMedicationReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MEDICATION_REFERENCE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getNote())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NOTE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPatient())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATIENT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPrescriber())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PRESCRIBER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPriorPrescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PRIOR_PRESCRIPTION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getReasonCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REASON_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getReasonEnded())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REASON_ENDED, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getReasonReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REASON_REFERENCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSubstitution())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBSTITUTION, null, $v->_getFHIRXMLNamespace())); } @@ -1433,12 +1446,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getDateEnded())) { - $a[self::FIELD_DATE_ENDED] = $v->getValue(); - $a[self::FIELD_DATE_ENDED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATE_ENDED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATE_ENDED_EXT] = $enc; + } + } else { + $a[self::FIELD_DATE_ENDED] = $v; + } } if (null !== ($v = $this->getDateWritten())) { - $a[self::FIELD_DATE_WRITTEN] = $v->getValue(); - $a[self::FIELD_DATE_WRITTEN_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATE_WRITTEN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATE_WRITTEN_EXT] = $enc; + } + } else { + $a[self::FIELD_DATE_WRITTEN] = $v; + } } if (null !== ($v = $this->getDispenseRequest())) { $a[self::FIELD_DISPENSE_REQUEST] = $v; @@ -1450,7 +1477,23 @@ public function jsonSerialize() $a[self::FIELD_ENCOUNTER] = $v; } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if (null !== ($v = $this->getMedicationCodeableConcept())) { $a[self::FIELD_MEDICATION_CODEABLE_CONCEPT] = $v; @@ -1459,8 +1502,15 @@ public function jsonSerialize() $a[self::FIELD_MEDICATION_REFERENCE] = $v; } if (null !== ($v = $this->getNote())) { - $a[self::FIELD_NOTE] = $v->getValue(); - $a[self::FIELD_NOTE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NOTE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NOTE_EXT] = $enc; + } + } else { + $a[self::FIELD_NOTE] = $v; + } } if (null !== ($v = $this->getPatient())) { $a[self::FIELD_PATIENT] = $v; @@ -1481,7 +1531,15 @@ public function jsonSerialize() $a[self::FIELD_REASON_REFERENCE] = $v; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getSubstitution())) { $a[self::FIELD_SUBSTITUTION] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRMedicationStatement.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRMedicationStatement.php index 799f613f12..e79ba3f1e2 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRMedicationStatement.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRMedicationStatement.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -106,10 +106,6 @@ class FHIRMedicationStatement extends FHIRDomainResource implements PHPFHIRConta { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MEDICATION_STATEMENT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DATE_ASSERTED = 'dateAsserted'; const FIELD_DATE_ASSERTED_EXT = '_dateAsserted'; const FIELD_DOSAGE = 'dosage'; @@ -349,6 +345,9 @@ class FHIRMedicationStatement extends FHIRDomainResource implements PHPFHIRConta */ protected $wasNotTaken = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMedicationStatement Constructor * @param null|array $data @@ -371,8 +370,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATE_ASSERTED] instanceof FHIRDateTime) { $this->setDateAsserted($data[self::FIELD_DATE_ASSERTED]); - } elseif ($ext && is_scalar($data[self::FIELD_DATE_ASSERTED])) { - $this->setDateAsserted(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE_ASSERTED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATE_ASSERTED])) { + $this->setDateAsserted(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE_ASSERTED]] + $ext)); + } else if (is_array($data[self::FIELD_DATE_ASSERTED])) { + $this->setDateAsserted(new FHIRDateTime(array_merge($ext, $data[self::FIELD_DATE_ASSERTED]))); + } } else { $this->setDateAsserted(new FHIRDateTime($data[self::FIELD_DATE_ASSERTED])); } @@ -380,6 +383,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_DOSAGE])) { if (is_array($data[self::FIELD_DOSAGE])) { foreach($data[self::FIELD_DOSAGE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRMedicationStatementDosage) { $this->addDosage($v); } else { @@ -398,8 +404,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EFFECTIVE_DATE_TIME] instanceof FHIRDateTime) { $this->setEffectiveDateTime($data[self::FIELD_EFFECTIVE_DATE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_EFFECTIVE_DATE_TIME])) { - $this->setEffectiveDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_EFFECTIVE_DATE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EFFECTIVE_DATE_TIME])) { + $this->setEffectiveDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_EFFECTIVE_DATE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_EFFECTIVE_DATE_TIME])) { + $this->setEffectiveDateTime(new FHIRDateTime(array_merge($ext, $data[self::FIELD_EFFECTIVE_DATE_TIME]))); + } } else { $this->setEffectiveDateTime(new FHIRDateTime($data[self::FIELD_EFFECTIVE_DATE_TIME])); } @@ -417,17 +427,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -460,8 +477,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NOTE] instanceof FHIRString) { $this->setNote($data[self::FIELD_NOTE]); - } elseif ($ext && is_scalar($data[self::FIELD_NOTE])) { - $this->setNote(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NOTE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NOTE])) { + $this->setNote(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NOTE]] + $ext)); + } else if (is_array($data[self::FIELD_NOTE])) { + $this->setNote(new FHIRString(array_merge($ext, $data[self::FIELD_NOTE]))); + } } else { $this->setNote(new FHIRString($data[self::FIELD_NOTE])); } @@ -490,6 +511,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REASON_NOT_TAKEN])) { if (is_array($data[self::FIELD_REASON_NOT_TAKEN])) { foreach($data[self::FIELD_REASON_NOT_TAKEN] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addReasonNotTaken($v); } else { @@ -508,8 +532,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRMedicationStatementStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRMedicationStatementStatus([FHIRMedicationStatementStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRMedicationStatementStatus([FHIRMedicationStatementStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRMedicationStatementStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRMedicationStatementStatus($data[self::FIELD_STATUS])); } @@ -517,6 +545,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SUPPORTING_INFORMATION])) { if (is_array($data[self::FIELD_SUPPORTING_INFORMATION])) { foreach($data[self::FIELD_SUPPORTING_INFORMATION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addSupportingInformation($v); } else { @@ -535,8 +566,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_WAS_NOT_TAKEN] instanceof FHIRBoolean) { $this->setWasNotTaken($data[self::FIELD_WAS_NOT_TAKEN]); - } elseif ($ext && is_scalar($data[self::FIELD_WAS_NOT_TAKEN])) { - $this->setWasNotTaken(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_WAS_NOT_TAKEN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_WAS_NOT_TAKEN])) { + $this->setWasNotTaken(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_WAS_NOT_TAKEN]] + $ext)); + } else if (is_array($data[self::FIELD_WAS_NOT_TAKEN])) { + $this->setWasNotTaken(new FHIRBoolean(array_merge($ext, $data[self::FIELD_WAS_NOT_TAKEN]))); + } } else { $this->setWasNotTaken(new FHIRBoolean($data[self::FIELD_WAS_NOT_TAKEN])); } @@ -1442,7 +1477,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDateAsserted())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DATE_ASSERTED, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getDosage())) { foreach($vs as $v) { if (null === $v) { @@ -1451,14 +1485,13 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_DOSAGE, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getEffectiveDateTime())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EFFECTIVE_DATE_TIME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getEffectivePeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EFFECTIVE_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -1471,30 +1504,24 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getInformationSource())) { $v->xmlSerialize($sxe->addChild(self::FIELD_INFORMATION_SOURCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getMedicationCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MEDICATION_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getMedicationReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MEDICATION_REFERENCE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getNote())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NOTE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPatient())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATIENT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getReasonForUseCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REASON_FOR_USE_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getReasonForUseReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REASON_FOR_USE_REFERENCE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getReasonNotTaken())) { foreach($vs as $v) { if (null === $v) { @@ -1507,7 +1534,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getSupportingInformation())) { foreach($vs as $v) { if (null === $v) { @@ -1516,6 +1542,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_SUPPORTING_INFORMATION, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getWasNotTaken())) { $v->xmlSerialize($sxe->addChild(self::FIELD_WAS_NOT_TAKEN, null, $v->_getFHIRXMLNamespace())); } @@ -1529,21 +1556,51 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getDateAsserted())) { - $a[self::FIELD_DATE_ASSERTED] = $v->getValue(); - $a[self::FIELD_DATE_ASSERTED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATE_ASSERTED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATE_ASSERTED_EXT] = $enc; + } + } else { + $a[self::FIELD_DATE_ASSERTED] = $v; + } } if ([] !== ($vs = $this->getDosage())) { $a[self::FIELD_DOSAGE] = $vs; } if (null !== ($v = $this->getEffectiveDateTime())) { - $a[self::FIELD_EFFECTIVE_DATE_TIME] = $v->getValue(); - $a[self::FIELD_EFFECTIVE_DATE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EFFECTIVE_DATE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EFFECTIVE_DATE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_EFFECTIVE_DATE_TIME] = $v; + } } if (null !== ($v = $this->getEffectivePeriod())) { $a[self::FIELD_EFFECTIVE_PERIOD] = $v; } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if (null !== ($v = $this->getInformationSource())) { $a[self::FIELD_INFORMATION_SOURCE] = $v; @@ -1555,8 +1612,15 @@ public function jsonSerialize() $a[self::FIELD_MEDICATION_REFERENCE] = $v; } if (null !== ($v = $this->getNote())) { - $a[self::FIELD_NOTE] = $v->getValue(); - $a[self::FIELD_NOTE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NOTE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NOTE_EXT] = $enc; + } + } else { + $a[self::FIELD_NOTE] = $v; + } } if (null !== ($v = $this->getPatient())) { $a[self::FIELD_PATIENT] = $v; @@ -1571,14 +1635,29 @@ public function jsonSerialize() $a[self::FIELD_REASON_NOT_TAKEN] = $vs; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if ([] !== ($vs = $this->getSupportingInformation())) { $a[self::FIELD_SUPPORTING_INFORMATION] = $vs; } if (null !== ($v = $this->getWasNotTaken())) { - $a[self::FIELD_WAS_NOT_TAKEN] = $v->getValue(); - $a[self::FIELD_WAS_NOT_TAKEN_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_WAS_NOT_TAKEN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_WAS_NOT_TAKEN_EXT] = $enc; + } + } else { + $a[self::FIELD_WAS_NOT_TAKEN] = $v; + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRMessageHeader.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRMessageHeader.php index 46a6a6b91e..0e04a65cb7 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRMessageHeader.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRMessageHeader.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -88,10 +88,6 @@ class FHIRMessageHeader extends FHIRDomainResource implements PHPFHIRContainedTy { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MESSAGE_HEADER; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_AUTHOR = 'author'; const FIELD_DATA = 'data'; const FIELD_DESTINATION = 'destination'; @@ -244,6 +240,9 @@ class FHIRMessageHeader extends FHIRDomainResource implements PHPFHIRContainedTy */ protected $timestamp = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMessageHeader Constructor * @param null|array $data @@ -270,6 +269,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_DATA])) { if (is_array($data[self::FIELD_DATA])) { foreach($data[self::FIELD_DATA] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addData($v); } else { @@ -285,6 +287,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_DESTINATION])) { if (is_array($data[self::FIELD_DESTINATION])) { foreach($data[self::FIELD_DESTINATION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRMessageHeaderDestination) { $this->addDestination($v); } else { @@ -352,8 +357,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TIMESTAMP] instanceof FHIRInstant) { $this->setTimestamp($data[self::FIELD_TIMESTAMP]); - } elseif ($ext && is_scalar($data[self::FIELD_TIMESTAMP])) { - $this->setTimestamp(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_TIMESTAMP]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TIMESTAMP])) { + $this->setTimestamp(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_TIMESTAMP]] + $ext)); + } else if (is_array($data[self::FIELD_TIMESTAMP])) { + $this->setTimestamp(new FHIRInstant(array_merge($ext, $data[self::FIELD_TIMESTAMP]))); + } } else { $this->setTimestamp(new FHIRInstant($data[self::FIELD_TIMESTAMP])); } @@ -935,11 +944,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getAuthor())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AUTHOR, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getData())) { foreach($vs as $v) { if (null === $v) { @@ -961,27 +968,21 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getEnterer())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ENTERER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getEvent())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EVENT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getReason())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REASON, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getReceiver())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RECEIVER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getResponse())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RESPONSE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getResponsible())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RESPONSIBLE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSource())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SOURCE, null, $v->_getFHIRXMLNamespace())); } @@ -1028,8 +1029,15 @@ public function jsonSerialize() $a[self::FIELD_SOURCE] = $v; } if (null !== ($v = $this->getTimestamp())) { - $a[self::FIELD_TIMESTAMP] = $v->getValue(); - $a[self::FIELD_TIMESTAMP_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TIMESTAMP] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TIMESTAMP_EXT] = $enc; + } + } else { + $a[self::FIELD_TIMESTAMP] = $v; + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRNamingSystem.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRNamingSystem.php index 183f9e6271..5af997db3f 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRNamingSystem.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRNamingSystem.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -88,10 +88,6 @@ class FHIRNamingSystem extends FHIRDomainResource implements PHPFHIRContainedTyp { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_NAMING_SYSTEM; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CONTACT = 'contact'; const FIELD_DATE = 'date'; const FIELD_DATE_EXT = '_date'; @@ -275,6 +271,9 @@ class FHIRNamingSystem extends FHIRDomainResource implements PHPFHIRContainedTyp */ protected $useContext = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRNamingSystem Constructor * @param null|array $data @@ -294,6 +293,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CONTACT])) { if (is_array($data[self::FIELD_CONTACT])) { foreach($data[self::FIELD_CONTACT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRNamingSystemContact) { $this->addContact($v); } else { @@ -312,8 +314,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATE] instanceof FHIRDateTime) { $this->setDate($data[self::FIELD_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_DATE])) { - $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime(array_merge($ext, $data[self::FIELD_DATE]))); + } } else { $this->setDate(new FHIRDateTime($data[self::FIELD_DATE])); } @@ -324,8 +330,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -336,8 +346,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_KIND] instanceof FHIRNamingSystemType) { $this->setKind($data[self::FIELD_KIND]); - } elseif ($ext && is_scalar($data[self::FIELD_KIND])) { - $this->setKind(new FHIRNamingSystemType([FHIRNamingSystemType::FIELD_VALUE => $data[self::FIELD_KIND]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_KIND])) { + $this->setKind(new FHIRNamingSystemType([FHIRNamingSystemType::FIELD_VALUE => $data[self::FIELD_KIND]] + $ext)); + } else if (is_array($data[self::FIELD_KIND])) { + $this->setKind(new FHIRNamingSystemType(array_merge($ext, $data[self::FIELD_KIND]))); + } } else { $this->setKind(new FHIRNamingSystemType($data[self::FIELD_KIND])); } @@ -348,8 +362,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -360,8 +378,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PUBLISHER] instanceof FHIRString) { $this->setPublisher($data[self::FIELD_PUBLISHER]); - } elseif ($ext && is_scalar($data[self::FIELD_PUBLISHER])) { - $this->setPublisher(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PUBLISHER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PUBLISHER])) { + $this->setPublisher(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PUBLISHER]] + $ext)); + } else if (is_array($data[self::FIELD_PUBLISHER])) { + $this->setPublisher(new FHIRString(array_merge($ext, $data[self::FIELD_PUBLISHER]))); + } } else { $this->setPublisher(new FHIRString($data[self::FIELD_PUBLISHER])); } @@ -379,8 +401,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_RESPONSIBLE] instanceof FHIRString) { $this->setResponsible($data[self::FIELD_RESPONSIBLE]); - } elseif ($ext && is_scalar($data[self::FIELD_RESPONSIBLE])) { - $this->setResponsible(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_RESPONSIBLE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_RESPONSIBLE])) { + $this->setResponsible(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_RESPONSIBLE]] + $ext)); + } else if (is_array($data[self::FIELD_RESPONSIBLE])) { + $this->setResponsible(new FHIRString(array_merge($ext, $data[self::FIELD_RESPONSIBLE]))); + } } else { $this->setResponsible(new FHIRString($data[self::FIELD_RESPONSIBLE])); } @@ -391,8 +417,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRCode) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRCode(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRCode($data[self::FIELD_STATUS])); } @@ -410,17 +440,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_UNIQUE_ID])) { foreach($data[self::FIELD_UNIQUE_ID] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRNamingSystemUniqueId) { $this->addUniqueId($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addUniqueId(new FHIRNamingSystemUniqueId([FHIRNamingSystemUniqueId::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addUniqueId(new FHIRNamingSystemUniqueId([FHIRNamingSystemUniqueId::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addUniqueId(new FHIRNamingSystemUniqueId(array_merge($v, $ext[$i]))); + } } else { $this->addUniqueId(new FHIRNamingSystemUniqueId($v)); } } } elseif ($data[self::FIELD_UNIQUE_ID] instanceof FHIRNamingSystemUniqueId) { $this->addUniqueId($data[self::FIELD_UNIQUE_ID]); - } elseif ($ext && is_scalar($data[self::FIELD_UNIQUE_ID])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_UNIQUE_ID])) { $this->addUniqueId(new FHIRNamingSystemUniqueId([FHIRNamingSystemUniqueId::FIELD_VALUE => $data[self::FIELD_UNIQUE_ID]] + $ext)); } else { $this->addUniqueId(new FHIRNamingSystemUniqueId($data[self::FIELD_UNIQUE_ID])); @@ -432,8 +469,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_USAGE] instanceof FHIRString) { $this->setUsage($data[self::FIELD_USAGE]); - } elseif ($ext && is_scalar($data[self::FIELD_USAGE])) { - $this->setUsage(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_USAGE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_USAGE])) { + $this->setUsage(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_USAGE]] + $ext)); + } else if (is_array($data[self::FIELD_USAGE])) { + $this->setUsage(new FHIRString(array_merge($ext, $data[self::FIELD_USAGE]))); + } } else { $this->setUsage(new FHIRString($data[self::FIELD_USAGE])); } @@ -441,6 +482,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_USE_CONTEXT])) { if (is_array($data[self::FIELD_USE_CONTEXT])) { foreach($data[self::FIELD_USE_CONTEXT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addUseContext($v); } else { @@ -1190,7 +1234,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getContact())) { foreach($vs as $v) { if (null === $v) { @@ -1199,13 +1242,13 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_CONTACT, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DATE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getDescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESCRIPTION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getKind())) { $v->xmlSerialize($sxe->addChild(self::FIELD_KIND, null, $v->_getFHIRXMLNamespace())); } @@ -1215,7 +1258,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getPublisher())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PUBLISHER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getReplacedBy())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REPLACED_BY, null, $v->_getFHIRXMLNamespace())); } @@ -1225,11 +1267,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getUniqueId())) { foreach($vs as $v) { if (null === $v) { @@ -1238,10 +1278,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_UNIQUE_ID, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getUsage())) { $v->xmlSerialize($sxe->addChild(self::FIELD_USAGE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getUseContext())) { foreach($vs as $v) { if (null === $v) { @@ -1250,6 +1290,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_USE_CONTEXT, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } @@ -1263,44 +1304,117 @@ public function jsonSerialize() $a[self::FIELD_CONTACT] = $vs; } if (null !== ($v = $this->getDate())) { - $a[self::FIELD_DATE] = $v->getValue(); - $a[self::FIELD_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_DATE] = $v; + } } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if (null !== ($v = $this->getKind())) { - $a[self::FIELD_KIND] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_KIND] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_KIND_EXT] = $enc; + } + } else { + $a[self::FIELD_KIND] = $v; + } } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if (null !== ($v = $this->getPublisher())) { - $a[self::FIELD_PUBLISHER] = $v->getValue(); - $a[self::FIELD_PUBLISHER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PUBLISHER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PUBLISHER_EXT] = $enc; + } + } else { + $a[self::FIELD_PUBLISHER] = $v; + } } if (null !== ($v = $this->getReplacedBy())) { $a[self::FIELD_REPLACED_BY] = $v; } if (null !== ($v = $this->getResponsible())) { - $a[self::FIELD_RESPONSIBLE] = $v->getValue(); - $a[self::FIELD_RESPONSIBLE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_RESPONSIBLE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_RESPONSIBLE_EXT] = $enc; + } + } else { + $a[self::FIELD_RESPONSIBLE] = $v; + } } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v->getValue(); - $a[self::FIELD_STATUS_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getType())) { $a[self::FIELD_TYPE] = $v; } if ([] !== ($vs = $this->getUniqueId())) { - $a[self::FIELD_UNIQUE_ID] = $vs; + $a[self::FIELD_UNIQUE_ID] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_UNIQUE_ID][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_UNIQUE_ID_EXT][] = $enc; + } else { + $a[self::FIELD_UNIQUE_ID_EXT][] = null; + } + } else { + $a[self::FIELD_UNIQUE_ID][] = $v; + } + } } if (null !== ($v = $this->getUsage())) { - $a[self::FIELD_USAGE] = $v->getValue(); - $a[self::FIELD_USAGE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_USAGE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_USAGE_EXT] = $enc; + } + } else { + $a[self::FIELD_USAGE] = $v; + } } if ([] !== ($vs = $this->getUseContext())) { $a[self::FIELD_USE_CONTEXT] = $vs; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRNutritionOrder.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRNutritionOrder.php index 94e014312c..0ae212c13b 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRNutritionOrder.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRNutritionOrder.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -87,10 +87,6 @@ class FHIRNutritionOrder extends FHIRDomainResource implements PHPFHIRContainedT { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_NUTRITION_ORDER; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ALLERGY_INTOLERANCE = 'allergyIntolerance'; const FIELD_DATE_TIME = 'dateTime'; const FIELD_DATE_TIME_EXT = '_dateTime'; @@ -259,6 +255,9 @@ class FHIRNutritionOrder extends FHIRDomainResource implements PHPFHIRContainedT */ protected $supplement = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRNutritionOrder Constructor * @param null|array $data @@ -278,6 +277,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ALLERGY_INTOLERANCE])) { if (is_array($data[self::FIELD_ALLERGY_INTOLERANCE])) { foreach($data[self::FIELD_ALLERGY_INTOLERANCE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addAllergyIntolerance($v); } else { @@ -296,8 +298,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATE_TIME] instanceof FHIRDateTime) { $this->setDateTime($data[self::FIELD_DATE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_DATE_TIME])) { - $this->setDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATE_TIME])) { + $this->setDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_DATE_TIME])) { + $this->setDateTime(new FHIRDateTime(array_merge($ext, $data[self::FIELD_DATE_TIME]))); + } } else { $this->setDateTime(new FHIRDateTime($data[self::FIELD_DATE_TIME])); } @@ -319,6 +325,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_EXCLUDE_FOOD_MODIFIER])) { if (is_array($data[self::FIELD_EXCLUDE_FOOD_MODIFIER])) { foreach($data[self::FIELD_EXCLUDE_FOOD_MODIFIER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addExcludeFoodModifier($v); } else { @@ -334,6 +343,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_FOOD_PREFERENCE_MODIFIER])) { if (is_array($data[self::FIELD_FOOD_PREFERENCE_MODIFIER])) { foreach($data[self::FIELD_FOOD_PREFERENCE_MODIFIER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addFoodPreferenceModifier($v); } else { @@ -352,17 +364,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -395,8 +414,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRNutritionOrderStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRNutritionOrderStatus([FHIRNutritionOrderStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRNutritionOrderStatus([FHIRNutritionOrderStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRNutritionOrderStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRNutritionOrderStatus($data[self::FIELD_STATUS])); } @@ -404,6 +427,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SUPPLEMENT])) { if (is_array($data[self::FIELD_SUPPLEMENT])) { foreach($data[self::FIELD_SUPPLEMENT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRNutritionOrderSupplement) { $this->addSupplement($v); } else { @@ -1127,7 +1153,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getAllergyIntolerance())) { foreach($vs as $v) { if (null === $v) { @@ -1136,18 +1161,16 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_ALLERGY_INTOLERANCE, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getDateTime())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DATE_TIME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getEncounter())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ENCOUNTER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getEnteralFormula())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ENTERAL_FORMULA, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getExcludeFoodModifier())) { foreach($vs as $v) { if (null === $v) { @@ -1178,19 +1201,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getOralDiet())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ORAL_DIET, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOrderer())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ORDERER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPatient())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATIENT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getSupplement())) { foreach($vs as $v) { if (null === $v) { @@ -1199,6 +1218,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_SUPPLEMENT, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } @@ -1212,8 +1232,15 @@ public function jsonSerialize() $a[self::FIELD_ALLERGY_INTOLERANCE] = $vs; } if (null !== ($v = $this->getDateTime())) { - $a[self::FIELD_DATE_TIME] = $v->getValue(); - $a[self::FIELD_DATE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_DATE_TIME] = $v; + } } if (null !== ($v = $this->getEncounter())) { $a[self::FIELD_ENCOUNTER] = $v; @@ -1228,7 +1255,23 @@ public function jsonSerialize() $a[self::FIELD_FOOD_PREFERENCE_MODIFIER] = $vs; } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if (null !== ($v = $this->getOralDiet())) { $a[self::FIELD_ORAL_DIET] = $v; @@ -1240,7 +1283,15 @@ public function jsonSerialize() $a[self::FIELD_PATIENT] = $v; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if ([] !== ($vs = $this->getSupplement())) { $a[self::FIELD_SUPPLEMENT] = $vs; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRObservation.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRObservation.php index 5d8ce6e3d5..e45f2b74c4 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRObservation.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRObservation.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -96,10 +96,6 @@ class FHIRObservation extends FHIRDomainResource implements PHPFHIRContainedType { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_OBSERVATION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_BODY_SITE = 'bodySite'; const FIELD_CATEGORY = 'category'; const FIELD_CODE = 'code'; @@ -523,6 +519,9 @@ class FHIRObservation extends FHIRDomainResource implements PHPFHIRContainedType */ protected $valueTime = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRObservation Constructor * @param null|array $data @@ -566,8 +565,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_COMMENTS] instanceof FHIRString) { $this->setComments($data[self::FIELD_COMMENTS]); - } elseif ($ext && is_scalar($data[self::FIELD_COMMENTS])) { - $this->setComments(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_COMMENTS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_COMMENTS])) { + $this->setComments(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_COMMENTS]] + $ext)); + } else if (is_array($data[self::FIELD_COMMENTS])) { + $this->setComments(new FHIRString(array_merge($ext, $data[self::FIELD_COMMENTS]))); + } } else { $this->setComments(new FHIRString($data[self::FIELD_COMMENTS])); } @@ -575,6 +578,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_COMPONENT])) { if (is_array($data[self::FIELD_COMPONENT])) { foreach($data[self::FIELD_COMPONENT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRObservationComponent) { $this->addComponent($v); } else { @@ -607,8 +613,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EFFECTIVE_DATE_TIME] instanceof FHIRDateTime) { $this->setEffectiveDateTime($data[self::FIELD_EFFECTIVE_DATE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_EFFECTIVE_DATE_TIME])) { - $this->setEffectiveDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_EFFECTIVE_DATE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EFFECTIVE_DATE_TIME])) { + $this->setEffectiveDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_EFFECTIVE_DATE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_EFFECTIVE_DATE_TIME])) { + $this->setEffectiveDateTime(new FHIRDateTime(array_merge($ext, $data[self::FIELD_EFFECTIVE_DATE_TIME]))); + } } else { $this->setEffectiveDateTime(new FHIRDateTime($data[self::FIELD_EFFECTIVE_DATE_TIME])); } @@ -633,17 +643,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -662,8 +679,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ISSUED] instanceof FHIRInstant) { $this->setIssued($data[self::FIELD_ISSUED]); - } elseif ($ext && is_scalar($data[self::FIELD_ISSUED])) { - $this->setIssued(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_ISSUED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ISSUED])) { + $this->setIssued(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_ISSUED]] + $ext)); + } else if (is_array($data[self::FIELD_ISSUED])) { + $this->setIssued(new FHIRInstant(array_merge($ext, $data[self::FIELD_ISSUED]))); + } } else { $this->setIssued(new FHIRInstant($data[self::FIELD_ISSUED])); } @@ -678,6 +699,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PERFORMER])) { if (is_array($data[self::FIELD_PERFORMER])) { foreach($data[self::FIELD_PERFORMER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addPerformer($v); } else { @@ -693,6 +717,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REFERENCE_RANGE])) { if (is_array($data[self::FIELD_REFERENCE_RANGE])) { foreach($data[self::FIELD_REFERENCE_RANGE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRObservationReferenceRange) { $this->addReferenceRange($v); } else { @@ -708,6 +735,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_RELATED])) { if (is_array($data[self::FIELD_RELATED])) { foreach($data[self::FIELD_RELATED] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRObservationRelated) { $this->addRelated($v); } else { @@ -733,8 +763,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRObservationStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRObservationStatus([FHIRObservationStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRObservationStatus([FHIRObservationStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRObservationStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRObservationStatus($data[self::FIELD_STATUS])); } @@ -766,8 +800,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_DATE_TIME] instanceof FHIRDateTime) { $this->setValueDateTime($data[self::FIELD_VALUE_DATE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_DATE_TIME])) { - $this->setValueDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_VALUE_DATE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_DATE_TIME])) { + $this->setValueDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_VALUE_DATE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_DATE_TIME])) { + $this->setValueDateTime(new FHIRDateTime(array_merge($ext, $data[self::FIELD_VALUE_DATE_TIME]))); + } } else { $this->setValueDateTime(new FHIRDateTime($data[self::FIELD_VALUE_DATE_TIME])); } @@ -785,8 +823,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_QUANTITY] instanceof FHIRQuantity) { $this->setValueQuantity($data[self::FIELD_VALUE_QUANTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_QUANTITY])) { - $this->setValueQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_VALUE_QUANTITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_QUANTITY])) { + $this->setValueQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_VALUE_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_QUANTITY])) { + $this->setValueQuantity(new FHIRQuantity(array_merge($ext, $data[self::FIELD_VALUE_QUANTITY]))); + } } else { $this->setValueQuantity(new FHIRQuantity($data[self::FIELD_VALUE_QUANTITY])); } @@ -818,8 +860,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_STRING] instanceof FHIRString) { $this->setValueString($data[self::FIELD_VALUE_STRING]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_STRING])) { - $this->setValueString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VALUE_STRING]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_STRING])) { + $this->setValueString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VALUE_STRING]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_STRING])) { + $this->setValueString(new FHIRString(array_merge($ext, $data[self::FIELD_VALUE_STRING]))); + } } else { $this->setValueString(new FHIRString($data[self::FIELD_VALUE_STRING])); } @@ -830,8 +876,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_TIME] instanceof FHIRTime) { $this->setValueTime($data[self::FIELD_VALUE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_TIME])) { - $this->setValueTime(new FHIRTime([FHIRTime::FIELD_VALUE => $data[self::FIELD_VALUE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_TIME])) { + $this->setValueTime(new FHIRTime([FHIRTime::FIELD_VALUE => $data[self::FIELD_VALUE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_TIME])) { + $this->setValueTime(new FHIRTime(array_merge($ext, $data[self::FIELD_VALUE_TIME]))); + } } else { $this->setValueTime(new FHIRTime($data[self::FIELD_VALUE_TIME])); } @@ -2251,22 +2301,18 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getBodySite())) { $v->xmlSerialize($sxe->addChild(self::FIELD_BODY_SITE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getCategory())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CATEGORY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getComments())) { $v->xmlSerialize($sxe->addChild(self::FIELD_COMMENTS, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getComponent())) { foreach($vs as $v) { if (null === $v) { @@ -2279,22 +2325,18 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDataAbsentReason())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DATA_ABSENT_REASON, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDevice())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEVICE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getEffectiveDateTime())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EFFECTIVE_DATE_TIME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getEffectivePeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EFFECTIVE_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getEncounter())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ENCOUNTER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -2310,11 +2352,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getIssued())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ISSUED, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getMethod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_METHOD, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getPerformer())) { foreach($vs as $v) { if (null === $v) { @@ -2345,42 +2385,33 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getSpecimen())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SPECIMEN, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSubject())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBJECT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueAttachment())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_ATTACHMENT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getValueDateTime())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_DATE_TIME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValuePeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_QUANTITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueRange())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_RANGE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueRatio())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_RATIO, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueSampledData())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_SAMPLED_DATA, null, $v->_getFHIRXMLNamespace())); } @@ -2409,8 +2440,15 @@ public function jsonSerialize() $a[self::FIELD_CODE] = $v; } if (null !== ($v = $this->getComments())) { - $a[self::FIELD_COMMENTS] = $v->getValue(); - $a[self::FIELD_COMMENTS_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_COMMENTS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_COMMENTS_EXT] = $enc; + } + } else { + $a[self::FIELD_COMMENTS] = $v; + } } if ([] !== ($vs = $this->getComponent())) { $a[self::FIELD_COMPONENT] = $vs; @@ -2422,8 +2460,15 @@ public function jsonSerialize() $a[self::FIELD_DEVICE] = $v; } if (null !== ($v = $this->getEffectiveDateTime())) { - $a[self::FIELD_EFFECTIVE_DATE_TIME] = $v->getValue(); - $a[self::FIELD_EFFECTIVE_DATE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EFFECTIVE_DATE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EFFECTIVE_DATE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_EFFECTIVE_DATE_TIME] = $v; + } } if (null !== ($v = $this->getEffectivePeriod())) { $a[self::FIELD_EFFECTIVE_PERIOD] = $v; @@ -2432,14 +2477,37 @@ public function jsonSerialize() $a[self::FIELD_ENCOUNTER] = $v; } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if (null !== ($v = $this->getInterpretation())) { $a[self::FIELD_INTERPRETATION] = $v; } if (null !== ($v = $this->getIssued())) { - $a[self::FIELD_ISSUED] = $v->getValue(); - $a[self::FIELD_ISSUED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ISSUED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ISSUED_EXT] = $enc; + } + } else { + $a[self::FIELD_ISSUED] = $v; + } } if (null !== ($v = $this->getMethod())) { $a[self::FIELD_METHOD] = $v; @@ -2457,7 +2525,15 @@ public function jsonSerialize() $a[self::FIELD_SPECIMEN] = $v; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getSubject())) { $a[self::FIELD_SUBJECT] = $v; @@ -2469,14 +2545,29 @@ public function jsonSerialize() $a[self::FIELD_VALUE_CODEABLE_CONCEPT] = $v; } if (null !== ($v = $this->getValueDateTime())) { - $a[self::FIELD_VALUE_DATE_TIME] = $v->getValue(); - $a[self::FIELD_VALUE_DATE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_DATE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_DATE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_DATE_TIME] = $v; + } } if (null !== ($v = $this->getValuePeriod())) { $a[self::FIELD_VALUE_PERIOD] = $v; } if (null !== ($v = $this->getValueQuantity())) { - $a[self::FIELD_VALUE_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_QUANTITY] = $v; + } } if (null !== ($v = $this->getValueRange())) { $a[self::FIELD_VALUE_RANGE] = $v; @@ -2488,12 +2579,26 @@ public function jsonSerialize() $a[self::FIELD_VALUE_SAMPLED_DATA] = $v; } if (null !== ($v = $this->getValueString())) { - $a[self::FIELD_VALUE_STRING] = $v->getValue(); - $a[self::FIELD_VALUE_STRING_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_STRING] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_STRING_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_STRING] = $v; + } } if (null !== ($v = $this->getValueTime())) { - $a[self::FIELD_VALUE_TIME] = $v->getValue(); - $a[self::FIELD_VALUE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_TIME] = $v; + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIROperationDefinition.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIROperationDefinition.php index b8c4b6588c..08531382cd 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIROperationDefinition.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIROperationDefinition.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -88,10 +88,6 @@ class FHIROperationDefinition extends FHIRDomainResource implements PHPFHIRConta { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_OPERATION_DEFINITION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_BASE = 'base'; const FIELD_CODE = 'code'; const FIELD_CODE_EXT = '_code'; @@ -355,6 +351,9 @@ class FHIROperationDefinition extends FHIRDomainResource implements PHPFHIRConta */ protected $version = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIROperationDefinition Constructor * @param null|array $data @@ -384,8 +383,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CODE] instanceof FHIRCode) { $this->setCode($data[self::FIELD_CODE]); - } elseif ($ext && is_scalar($data[self::FIELD_CODE])) { - $this->setCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_CODE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CODE])) { + $this->setCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_CODE]] + $ext)); + } else if (is_array($data[self::FIELD_CODE])) { + $this->setCode(new FHIRCode(array_merge($ext, $data[self::FIELD_CODE]))); + } } else { $this->setCode(new FHIRCode($data[self::FIELD_CODE])); } @@ -393,6 +396,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CONTACT])) { if (is_array($data[self::FIELD_CONTACT])) { foreach($data[self::FIELD_CONTACT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIROperationDefinitionContact) { $this->addContact($v); } else { @@ -411,8 +417,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATE] instanceof FHIRDateTime) { $this->setDate($data[self::FIELD_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_DATE])) { - $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime(array_merge($ext, $data[self::FIELD_DATE]))); + } } else { $this->setDate(new FHIRDateTime($data[self::FIELD_DATE])); } @@ -423,8 +433,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -435,8 +449,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EXPERIMENTAL] instanceof FHIRBoolean) { $this->setExperimental($data[self::FIELD_EXPERIMENTAL]); - } elseif ($ext && is_scalar($data[self::FIELD_EXPERIMENTAL])) { - $this->setExperimental(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_EXPERIMENTAL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EXPERIMENTAL])) { + $this->setExperimental(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_EXPERIMENTAL]] + $ext)); + } else if (is_array($data[self::FIELD_EXPERIMENTAL])) { + $this->setExperimental(new FHIRBoolean(array_merge($ext, $data[self::FIELD_EXPERIMENTAL]))); + } } else { $this->setExperimental(new FHIRBoolean($data[self::FIELD_EXPERIMENTAL])); } @@ -447,8 +465,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IDEMPOTENT] instanceof FHIRBoolean) { $this->setIdempotent($data[self::FIELD_IDEMPOTENT]); - } elseif ($ext && is_scalar($data[self::FIELD_IDEMPOTENT])) { - $this->setIdempotent(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_IDEMPOTENT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IDEMPOTENT])) { + $this->setIdempotent(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_IDEMPOTENT]] + $ext)); + } else if (is_array($data[self::FIELD_IDEMPOTENT])) { + $this->setIdempotent(new FHIRBoolean(array_merge($ext, $data[self::FIELD_IDEMPOTENT]))); + } } else { $this->setIdempotent(new FHIRBoolean($data[self::FIELD_IDEMPOTENT])); } @@ -459,8 +481,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_INSTANCE] instanceof FHIRBoolean) { $this->setInstance($data[self::FIELD_INSTANCE]); - } elseif ($ext && is_scalar($data[self::FIELD_INSTANCE])) { - $this->setInstance(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_INSTANCE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_INSTANCE])) { + $this->setInstance(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_INSTANCE]] + $ext)); + } else if (is_array($data[self::FIELD_INSTANCE])) { + $this->setInstance(new FHIRBoolean(array_merge($ext, $data[self::FIELD_INSTANCE]))); + } } else { $this->setInstance(new FHIRBoolean($data[self::FIELD_INSTANCE])); } @@ -471,8 +497,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_KIND] instanceof FHIROperationKind) { $this->setKind($data[self::FIELD_KIND]); - } elseif ($ext && is_scalar($data[self::FIELD_KIND])) { - $this->setKind(new FHIROperationKind([FHIROperationKind::FIELD_VALUE => $data[self::FIELD_KIND]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_KIND])) { + $this->setKind(new FHIROperationKind([FHIROperationKind::FIELD_VALUE => $data[self::FIELD_KIND]] + $ext)); + } else if (is_array($data[self::FIELD_KIND])) { + $this->setKind(new FHIROperationKind(array_merge($ext, $data[self::FIELD_KIND]))); + } } else { $this->setKind(new FHIROperationKind($data[self::FIELD_KIND])); } @@ -483,8 +513,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -495,8 +529,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NOTES] instanceof FHIRString) { $this->setNotes($data[self::FIELD_NOTES]); - } elseif ($ext && is_scalar($data[self::FIELD_NOTES])) { - $this->setNotes(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NOTES]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NOTES])) { + $this->setNotes(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NOTES]] + $ext)); + } else if (is_array($data[self::FIELD_NOTES])) { + $this->setNotes(new FHIRString(array_merge($ext, $data[self::FIELD_NOTES]))); + } } else { $this->setNotes(new FHIRString($data[self::FIELD_NOTES])); } @@ -504,6 +542,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PARAMETER])) { if (is_array($data[self::FIELD_PARAMETER])) { foreach($data[self::FIELD_PARAMETER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIROperationDefinitionParameter) { $this->addParameter($v); } else { @@ -522,8 +563,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PUBLISHER] instanceof FHIRString) { $this->setPublisher($data[self::FIELD_PUBLISHER]); - } elseif ($ext && is_scalar($data[self::FIELD_PUBLISHER])) { - $this->setPublisher(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PUBLISHER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PUBLISHER])) { + $this->setPublisher(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PUBLISHER]] + $ext)); + } else if (is_array($data[self::FIELD_PUBLISHER])) { + $this->setPublisher(new FHIRString(array_merge($ext, $data[self::FIELD_PUBLISHER]))); + } } else { $this->setPublisher(new FHIRString($data[self::FIELD_PUBLISHER])); } @@ -534,8 +579,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_REQUIREMENTS] instanceof FHIRString) { $this->setRequirements($data[self::FIELD_REQUIREMENTS]); - } elseif ($ext && is_scalar($data[self::FIELD_REQUIREMENTS])) { - $this->setRequirements(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_REQUIREMENTS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_REQUIREMENTS])) { + $this->setRequirements(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_REQUIREMENTS]] + $ext)); + } else if (is_array($data[self::FIELD_REQUIREMENTS])) { + $this->setRequirements(new FHIRString(array_merge($ext, $data[self::FIELD_REQUIREMENTS]))); + } } else { $this->setRequirements(new FHIRString($data[self::FIELD_REQUIREMENTS])); } @@ -546,8 +595,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRCode) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRCode(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRCode($data[self::FIELD_STATUS])); } @@ -558,8 +611,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SYSTEM] instanceof FHIRBoolean) { $this->setSystem($data[self::FIELD_SYSTEM]); - } elseif ($ext && is_scalar($data[self::FIELD_SYSTEM])) { - $this->setSystem(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_SYSTEM]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SYSTEM])) { + $this->setSystem(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_SYSTEM]] + $ext)); + } else if (is_array($data[self::FIELD_SYSTEM])) { + $this->setSystem(new FHIRBoolean(array_merge($ext, $data[self::FIELD_SYSTEM]))); + } } else { $this->setSystem(new FHIRBoolean($data[self::FIELD_SYSTEM])); } @@ -570,17 +627,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_TYPE])) { foreach($data[self::FIELD_TYPE] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCode) { $this->addType($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addType(new FHIRCode([FHIRCode::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addType(new FHIRCode([FHIRCode::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addType(new FHIRCode(array_merge($v, $ext[$i]))); + } } else { $this->addType(new FHIRCode($v)); } } } elseif ($data[self::FIELD_TYPE] instanceof FHIRCode) { $this->addType($data[self::FIELD_TYPE]); - } elseif ($ext && is_scalar($data[self::FIELD_TYPE])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_TYPE])) { $this->addType(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); } else { $this->addType(new FHIRCode($data[self::FIELD_TYPE])); @@ -592,8 +656,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_URL] instanceof FHIRUri) { $this->setUrl($data[self::FIELD_URL]); - } elseif ($ext && is_scalar($data[self::FIELD_URL])) { - $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } else if (is_array($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri(array_merge($ext, $data[self::FIELD_URL]))); + } } else { $this->setUrl(new FHIRUri($data[self::FIELD_URL])); } @@ -604,8 +672,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VERSION] instanceof FHIRString) { $this->setVersion($data[self::FIELD_VERSION]); - } elseif ($ext && is_scalar($data[self::FIELD_VERSION])) { - $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } else if (is_array($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString(array_merge($ext, $data[self::FIELD_VERSION]))); + } } else { $this->setVersion(new FHIRString($data[self::FIELD_VERSION])); } @@ -1632,14 +1704,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getBase())) { $v->xmlSerialize($sxe->addChild(self::FIELD_BASE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getContact())) { foreach($vs as $v) { if (null === $v) { @@ -1648,6 +1718,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_CONTACT, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DATE, null, $v->_getFHIRXMLNamespace())); } @@ -1663,7 +1734,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getInstance())) { $v->xmlSerialize($sxe->addChild(self::FIELD_INSTANCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getKind())) { $v->xmlSerialize($sxe->addChild(self::FIELD_KIND, null, $v->_getFHIRXMLNamespace())); } @@ -1673,7 +1743,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getNotes())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NOTES, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getParameter())) { foreach($vs as $v) { if (null === $v) { @@ -1682,6 +1751,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_PARAMETER, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getPublisher())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PUBLISHER, null, $v->_getFHIRXMLNamespace())); } @@ -1702,6 +1772,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getUrl())) { $v->xmlSerialize($sxe->addChild(self::FIELD_URL, null, $v->_getFHIRXMLNamespace())); } @@ -1721,61 +1792,153 @@ public function jsonSerialize() $a[self::FIELD_BASE] = $v; } if (null !== ($v = $this->getCode())) { - $a[self::FIELD_CODE] = $v->getValue(); - $a[self::FIELD_CODE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CODE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CODE_EXT] = $enc; + } + } else { + $a[self::FIELD_CODE] = $v; + } } if ([] !== ($vs = $this->getContact())) { $a[self::FIELD_CONTACT] = $vs; } if (null !== ($v = $this->getDate())) { - $a[self::FIELD_DATE] = $v->getValue(); - $a[self::FIELD_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_DATE] = $v; + } } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if (null !== ($v = $this->getExperimental())) { - $a[self::FIELD_EXPERIMENTAL] = $v->getValue(); - $a[self::FIELD_EXPERIMENTAL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EXPERIMENTAL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EXPERIMENTAL_EXT] = $enc; + } + } else { + $a[self::FIELD_EXPERIMENTAL] = $v; + } } if (null !== ($v = $this->getIdempotent())) { - $a[self::FIELD_IDEMPOTENT] = $v->getValue(); - $a[self::FIELD_IDEMPOTENT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDEMPOTENT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDEMPOTENT_EXT] = $enc; + } + } else { + $a[self::FIELD_IDEMPOTENT] = $v; + } } if (null !== ($v = $this->getInstance())) { - $a[self::FIELD_INSTANCE] = $v->getValue(); - $a[self::FIELD_INSTANCE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_INSTANCE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_INSTANCE_EXT] = $enc; + } + } else { + $a[self::FIELD_INSTANCE] = $v; + } } if (null !== ($v = $this->getKind())) { - $a[self::FIELD_KIND] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_KIND] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_KIND_EXT] = $enc; + } + } else { + $a[self::FIELD_KIND] = $v; + } } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if (null !== ($v = $this->getNotes())) { - $a[self::FIELD_NOTES] = $v->getValue(); - $a[self::FIELD_NOTES_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NOTES] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NOTES_EXT] = $enc; + } + } else { + $a[self::FIELD_NOTES] = $v; + } } if ([] !== ($vs = $this->getParameter())) { $a[self::FIELD_PARAMETER] = $vs; } if (null !== ($v = $this->getPublisher())) { - $a[self::FIELD_PUBLISHER] = $v->getValue(); - $a[self::FIELD_PUBLISHER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PUBLISHER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PUBLISHER_EXT] = $enc; + } + } else { + $a[self::FIELD_PUBLISHER] = $v; + } } if (null !== ($v = $this->getRequirements())) { - $a[self::FIELD_REQUIREMENTS] = $v->getValue(); - $a[self::FIELD_REQUIREMENTS_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_REQUIREMENTS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_REQUIREMENTS_EXT] = $enc; + } + } else { + $a[self::FIELD_REQUIREMENTS] = $v; + } } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v->getValue(); - $a[self::FIELD_STATUS_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getSystem())) { - $a[self::FIELD_SYSTEM] = $v->getValue(); - $a[self::FIELD_SYSTEM_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SYSTEM] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SYSTEM_EXT] = $enc; + } + } else { + $a[self::FIELD_SYSTEM] = $v; + } } if ([] !== ($vs = $this->getType())) { $a[self::FIELD_TYPE] = []; @@ -1783,17 +1946,40 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_TYPE][] = $v->getValue(); - $a[self::FIELD_TYPE_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TYPE][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TYPE_EXT][] = $enc; + } else { + $a[self::FIELD_TYPE_EXT][] = null; + } + } else { + $a[self::FIELD_TYPE][] = $v; + } } } if (null !== ($v = $this->getUrl())) { - $a[self::FIELD_URL] = $v->getValue(); - $a[self::FIELD_URL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_URL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_URL_EXT] = $enc; + } + } else { + $a[self::FIELD_URL] = $v; + } } if (null !== ($v = $this->getVersion())) { - $a[self::FIELD_VERSION] = $v->getValue(); - $a[self::FIELD_VERSION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VERSION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VERSION_EXT] = $enc; + } + } else { + $a[self::FIELD_VERSION] = $v; + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIROperationOutcome.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIROperationOutcome.php index 2d03e6350c..cf45257e1c 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIROperationOutcome.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIROperationOutcome.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIROperationOutcome extends FHIRDomainResource implements PHPFHIRContaine { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_OPERATION_OUTCOME; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ISSUE = 'issue'; /** @@ -96,6 +92,9 @@ class FHIROperationOutcome extends FHIRDomainResource implements PHPFHIRContaine */ protected $issue = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIROperationOutcome Constructor * @param null|array $data @@ -115,6 +114,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ISSUE])) { if (is_array($data[self::FIELD_ISSUE])) { foreach($data[self::FIELD_ISSUE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIROperationOutcomeIssue) { $this->addIssue($v); } else { @@ -294,7 +296,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getIssue())) { foreach($vs as $v) { if (null === $v) { @@ -303,6 +304,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_ISSUE, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIROrder.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIROrder.php index bd68b1991b..850c9e4a60 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIROrder.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIROrder.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -83,10 +83,6 @@ class FHIROrder extends FHIRDomainResource implements PHPFHIRContainedTypeInterf { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ORDER; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DATE = 'date'; const FIELD_DATE_EXT = '_date'; const FIELD_DETAIL = 'detail'; @@ -200,6 +196,9 @@ class FHIROrder extends FHIRDomainResource implements PHPFHIRContainedTypeInterf */ protected $when = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIROrder Constructor * @param null|array $data @@ -222,8 +221,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATE] instanceof FHIRDateTime) { $this->setDate($data[self::FIELD_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_DATE])) { - $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime(array_merge($ext, $data[self::FIELD_DATE]))); + } } else { $this->setDate(new FHIRDateTime($data[self::FIELD_DATE])); } @@ -231,6 +234,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_DETAIL])) { if (is_array($data[self::FIELD_DETAIL])) { foreach($data[self::FIELD_DETAIL] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addDetail($v); } else { @@ -249,17 +255,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -787,7 +800,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DATE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getDetail())) { foreach($vs as $v) { if (null === $v) { @@ -809,23 +821,18 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getReasonCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REASON_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getReasonReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REASON_REFERENCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSource())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SOURCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSubject())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBJECT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getTarget())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TARGET, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getWhen())) { $v->xmlSerialize($sxe->addChild(self::FIELD_WHEN, null, $v->_getFHIRXMLNamespace())); } @@ -839,14 +846,37 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getDate())) { - $a[self::FIELD_DATE] = $v->getValue(); - $a[self::FIELD_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_DATE] = $v; + } } if ([] !== ($vs = $this->getDetail())) { $a[self::FIELD_DETAIL] = $vs; } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if (null !== ($v = $this->getReasonCodeableConcept())) { $a[self::FIELD_REASON_CODEABLE_CONCEPT] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIROrderResponse.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIROrderResponse.php index 994904cd11..1b225ff236 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIROrderResponse.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIROrderResponse.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -83,10 +83,6 @@ class FHIROrderResponse extends FHIRDomainResource implements PHPFHIRContainedTy { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ORDER_RESPONSE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DATE = 'date'; const FIELD_DATE_EXT = '_date'; const FIELD_DESCRIPTION = 'description'; @@ -183,6 +179,9 @@ class FHIROrderResponse extends FHIRDomainResource implements PHPFHIRContainedTy */ protected $who = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIROrderResponse Constructor * @param null|array $data @@ -205,8 +204,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATE] instanceof FHIRDateTime) { $this->setDate($data[self::FIELD_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_DATE])) { - $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime(array_merge($ext, $data[self::FIELD_DATE]))); + } } else { $this->setDate(new FHIRDateTime($data[self::FIELD_DATE])); } @@ -217,8 +220,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -226,6 +233,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_FULFILLMENT])) { if (is_array($data[self::FIELD_FULFILLMENT])) { foreach($data[self::FIELD_FULFILLMENT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addFulfillment($v); } else { @@ -244,17 +254,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -266,8 +283,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ORDER_STATUS] instanceof FHIROrderStatus) { $this->setOrderStatus($data[self::FIELD_ORDER_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_ORDER_STATUS])) { - $this->setOrderStatus(new FHIROrderStatus([FHIROrderStatus::FIELD_VALUE => $data[self::FIELD_ORDER_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ORDER_STATUS])) { + $this->setOrderStatus(new FHIROrderStatus([FHIROrderStatus::FIELD_VALUE => $data[self::FIELD_ORDER_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_ORDER_STATUS])) { + $this->setOrderStatus(new FHIROrderStatus(array_merge($ext, $data[self::FIELD_ORDER_STATUS]))); + } } else { $this->setOrderStatus(new FHIROrderStatus($data[self::FIELD_ORDER_STATUS])); } @@ -728,7 +749,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESCRIPTION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getFulfillment())) { foreach($vs as $v) { if (null === $v) { @@ -750,11 +770,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getOrderStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ORDER_STATUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRequest())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REQUEST, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getWho())) { $v->xmlSerialize($sxe->addChild(self::FIELD_WHO, null, $v->_getFHIRXMLNamespace())); } @@ -768,21 +786,59 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getDate())) { - $a[self::FIELD_DATE] = $v->getValue(); - $a[self::FIELD_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_DATE] = $v; + } } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if ([] !== ($vs = $this->getFulfillment())) { $a[self::FIELD_FULFILLMENT] = $vs; } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if (null !== ($v = $this->getOrderStatus())) { - $a[self::FIELD_ORDER_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ORDER_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ORDER_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_ORDER_STATUS] = $v; + } } if (null !== ($v = $this->getRequest())) { $a[self::FIELD_REQUEST] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIROrganization.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIROrganization.php index b5ca2bf500..4b48f70c0a 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIROrganization.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIROrganization.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -89,10 +89,6 @@ class FHIROrganization extends FHIRDomainResource implements PHPFHIRContainedTyp { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ORGANIZATION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ACTIVE = 'active'; const FIELD_ACTIVE_EXT = '_active'; const FIELD_ADDRESS = 'address'; @@ -198,6 +194,9 @@ class FHIROrganization extends FHIRDomainResource implements PHPFHIRContainedTyp */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIROrganization Constructor * @param null|array $data @@ -220,8 +219,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ACTIVE] instanceof FHIRBoolean) { $this->setActive($data[self::FIELD_ACTIVE]); - } elseif ($ext && is_scalar($data[self::FIELD_ACTIVE])) { - $this->setActive(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_ACTIVE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ACTIVE])) { + $this->setActive(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_ACTIVE]] + $ext)); + } else if (is_array($data[self::FIELD_ACTIVE])) { + $this->setActive(new FHIRBoolean(array_merge($ext, $data[self::FIELD_ACTIVE]))); + } } else { $this->setActive(new FHIRBoolean($data[self::FIELD_ACTIVE])); } @@ -229,6 +232,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ADDRESS])) { if (is_array($data[self::FIELD_ADDRESS])) { foreach($data[self::FIELD_ADDRESS] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRAddress) { $this->addAddress($v); } else { @@ -244,6 +250,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CONTACT])) { if (is_array($data[self::FIELD_CONTACT])) { foreach($data[self::FIELD_CONTACT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIROrganizationContact) { $this->addContact($v); } else { @@ -262,17 +271,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -284,8 +300,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -303,17 +323,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_TELECOM])) { foreach($data[self::FIELD_TELECOM] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContactPoint) { $this->addTelecom($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addTelecom(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addTelecom(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addTelecom(new FHIRContactPoint(array_merge($v, $ext[$i]))); + } } else { $this->addTelecom(new FHIRContactPoint($v)); } } } elseif ($data[self::FIELD_TELECOM] instanceof FHIRContactPoint) { $this->addTelecom($data[self::FIELD_TELECOM]); - } elseif ($ext && is_scalar($data[self::FIELD_TELECOM])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_TELECOM])) { $this->addTelecom(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $data[self::FIELD_TELECOM]] + $ext)); } else { $this->addTelecom(new FHIRContactPoint($data[self::FIELD_TELECOM])); @@ -848,7 +875,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getActive())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ACTIVE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getAddress())) { foreach($vs as $v) { if (null === $v) { @@ -875,14 +901,13 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NAME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPartOf())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PART_OF, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getTelecom())) { foreach($vs as $v) { if (null === $v) { @@ -905,8 +930,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getActive())) { - $a[self::FIELD_ACTIVE] = $v->getValue(); - $a[self::FIELD_ACTIVE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ACTIVE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ACTIVE_EXT] = $enc; + } + } else { + $a[self::FIELD_ACTIVE] = $v; + } } if ([] !== ($vs = $this->getAddress())) { $a[self::FIELD_ADDRESS] = $vs; @@ -915,17 +947,56 @@ public function jsonSerialize() $a[self::FIELD_CONTACT] = $vs; } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if (null !== ($v = $this->getPartOf())) { $a[self::FIELD_PART_OF] = $v; } if ([] !== ($vs = $this->getTelecom())) { - $a[self::FIELD_TELECOM] = $vs; + $a[self::FIELD_TELECOM] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TELECOM][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TELECOM_EXT][] = $enc; + } else { + $a[self::FIELD_TELECOM_EXT][] = null; + } + } else { + $a[self::FIELD_TELECOM][] = $v; + } + } } if (null !== ($v = $this->getType())) { $a[self::FIELD_TYPE] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRPatient.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRPatient.php index cc85d37288..e4f2187ecf 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRPatient.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRPatient.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -95,10 +95,6 @@ class FHIRPatient extends FHIRDomainResource implements PHPFHIRContainedTypeInte { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_PATIENT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ACTIVE = 'active'; const FIELD_ACTIVE_EXT = '_active'; const FIELD_ADDRESS = 'address'; @@ -343,6 +339,9 @@ class FHIRPatient extends FHIRDomainResource implements PHPFHIRContainedTypeInte */ protected $telecom = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRPatient Constructor * @param null|array $data @@ -365,8 +364,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ACTIVE] instanceof FHIRBoolean) { $this->setActive($data[self::FIELD_ACTIVE]); - } elseif ($ext && is_scalar($data[self::FIELD_ACTIVE])) { - $this->setActive(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_ACTIVE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ACTIVE])) { + $this->setActive(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_ACTIVE]] + $ext)); + } else if (is_array($data[self::FIELD_ACTIVE])) { + $this->setActive(new FHIRBoolean(array_merge($ext, $data[self::FIELD_ACTIVE]))); + } } else { $this->setActive(new FHIRBoolean($data[self::FIELD_ACTIVE])); } @@ -374,6 +377,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ADDRESS])) { if (is_array($data[self::FIELD_ADDRESS])) { foreach($data[self::FIELD_ADDRESS] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRAddress) { $this->addAddress($v); } else { @@ -399,8 +405,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_BIRTH_DATE] instanceof FHIRDate) { $this->setBirthDate($data[self::FIELD_BIRTH_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_BIRTH_DATE])) { - $this->setBirthDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_BIRTH_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_BIRTH_DATE])) { + $this->setBirthDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_BIRTH_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_BIRTH_DATE])) { + $this->setBirthDate(new FHIRDate(array_merge($ext, $data[self::FIELD_BIRTH_DATE]))); + } } else { $this->setBirthDate(new FHIRDate($data[self::FIELD_BIRTH_DATE])); } @@ -408,6 +418,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CARE_PROVIDER])) { if (is_array($data[self::FIELD_CARE_PROVIDER])) { foreach($data[self::FIELD_CARE_PROVIDER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addCareProvider($v); } else { @@ -423,6 +436,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_COMMUNICATION])) { if (is_array($data[self::FIELD_COMMUNICATION])) { foreach($data[self::FIELD_COMMUNICATION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRPatientCommunication) { $this->addCommunication($v); } else { @@ -438,6 +454,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CONTACT])) { if (is_array($data[self::FIELD_CONTACT])) { foreach($data[self::FIELD_CONTACT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRPatientContact) { $this->addContact($v); } else { @@ -456,8 +475,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DECEASED_BOOLEAN] instanceof FHIRBoolean) { $this->setDeceasedBoolean($data[self::FIELD_DECEASED_BOOLEAN]); - } elseif ($ext && is_scalar($data[self::FIELD_DECEASED_BOOLEAN])) { - $this->setDeceasedBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_DECEASED_BOOLEAN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DECEASED_BOOLEAN])) { + $this->setDeceasedBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_DECEASED_BOOLEAN]] + $ext)); + } else if (is_array($data[self::FIELD_DECEASED_BOOLEAN])) { + $this->setDeceasedBoolean(new FHIRBoolean(array_merge($ext, $data[self::FIELD_DECEASED_BOOLEAN]))); + } } else { $this->setDeceasedBoolean(new FHIRBoolean($data[self::FIELD_DECEASED_BOOLEAN])); } @@ -468,8 +491,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DECEASED_DATE_TIME] instanceof FHIRDateTime) { $this->setDeceasedDateTime($data[self::FIELD_DECEASED_DATE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_DECEASED_DATE_TIME])) { - $this->setDeceasedDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DECEASED_DATE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DECEASED_DATE_TIME])) { + $this->setDeceasedDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DECEASED_DATE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_DECEASED_DATE_TIME])) { + $this->setDeceasedDateTime(new FHIRDateTime(array_merge($ext, $data[self::FIELD_DECEASED_DATE_TIME]))); + } } else { $this->setDeceasedDateTime(new FHIRDateTime($data[self::FIELD_DECEASED_DATE_TIME])); } @@ -480,8 +507,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_GENDER] instanceof FHIRCode) { $this->setGender($data[self::FIELD_GENDER]); - } elseif ($ext && is_scalar($data[self::FIELD_GENDER])) { - $this->setGender(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_GENDER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_GENDER])) { + $this->setGender(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_GENDER]] + $ext)); + } else if (is_array($data[self::FIELD_GENDER])) { + $this->setGender(new FHIRCode(array_merge($ext, $data[self::FIELD_GENDER]))); + } } else { $this->setGender(new FHIRCode($data[self::FIELD_GENDER])); } @@ -492,17 +523,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -511,6 +549,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_LINK])) { if (is_array($data[self::FIELD_LINK])) { foreach($data[self::FIELD_LINK] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRPatientLink) { $this->addLink($v); } else { @@ -543,8 +584,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MULTIPLE_BIRTH_BOOLEAN] instanceof FHIRBoolean) { $this->setMultipleBirthBoolean($data[self::FIELD_MULTIPLE_BIRTH_BOOLEAN]); - } elseif ($ext && is_scalar($data[self::FIELD_MULTIPLE_BIRTH_BOOLEAN])) { - $this->setMultipleBirthBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_MULTIPLE_BIRTH_BOOLEAN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MULTIPLE_BIRTH_BOOLEAN])) { + $this->setMultipleBirthBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_MULTIPLE_BIRTH_BOOLEAN]] + $ext)); + } else if (is_array($data[self::FIELD_MULTIPLE_BIRTH_BOOLEAN])) { + $this->setMultipleBirthBoolean(new FHIRBoolean(array_merge($ext, $data[self::FIELD_MULTIPLE_BIRTH_BOOLEAN]))); + } } else { $this->setMultipleBirthBoolean(new FHIRBoolean($data[self::FIELD_MULTIPLE_BIRTH_BOOLEAN])); } @@ -555,8 +600,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MULTIPLE_BIRTH_INTEGER] instanceof FHIRInteger) { $this->setMultipleBirthInteger($data[self::FIELD_MULTIPLE_BIRTH_INTEGER]); - } elseif ($ext && is_scalar($data[self::FIELD_MULTIPLE_BIRTH_INTEGER])) { - $this->setMultipleBirthInteger(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_MULTIPLE_BIRTH_INTEGER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MULTIPLE_BIRTH_INTEGER])) { + $this->setMultipleBirthInteger(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_MULTIPLE_BIRTH_INTEGER]] + $ext)); + } else if (is_array($data[self::FIELD_MULTIPLE_BIRTH_INTEGER])) { + $this->setMultipleBirthInteger(new FHIRInteger(array_merge($ext, $data[self::FIELD_MULTIPLE_BIRTH_INTEGER]))); + } } else { $this->setMultipleBirthInteger(new FHIRInteger($data[self::FIELD_MULTIPLE_BIRTH_INTEGER])); } @@ -564,6 +613,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_NAME])) { if (is_array($data[self::FIELD_NAME])) { foreach($data[self::FIELD_NAME] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRHumanName) { $this->addName($v); } else { @@ -579,6 +631,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PHOTO])) { if (is_array($data[self::FIELD_PHOTO])) { foreach($data[self::FIELD_PHOTO] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRAttachment) { $this->addPhoto($v); } else { @@ -597,17 +652,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_TELECOM])) { foreach($data[self::FIELD_TELECOM] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContactPoint) { $this->addTelecom($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addTelecom(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addTelecom(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addTelecom(new FHIRContactPoint(array_merge($v, $ext[$i]))); + } } else { $this->addTelecom(new FHIRContactPoint($v)); } } } elseif ($data[self::FIELD_TELECOM] instanceof FHIRContactPoint) { $this->addTelecom($data[self::FIELD_TELECOM]); - } elseif ($ext && is_scalar($data[self::FIELD_TELECOM])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_TELECOM])) { $this->addTelecom(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $data[self::FIELD_TELECOM]] + $ext)); } else { $this->addTelecom(new FHIRContactPoint($data[self::FIELD_TELECOM])); @@ -1694,7 +1756,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getActive())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ACTIVE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getAddress())) { foreach($vs as $v) { if (null === $v) { @@ -1710,7 +1771,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getBirthDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_BIRTH_DATE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getCareProvider())) { foreach($vs as $v) { if (null === $v) { @@ -1737,6 +1797,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_CONTACT, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getDeceasedBoolean())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DECEASED_BOOLEAN, null, $v->_getFHIRXMLNamespace())); } @@ -1746,7 +1807,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getGender())) { $v->xmlSerialize($sxe->addChild(self::FIELD_GENDER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -1768,7 +1828,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getManagingOrganization())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MANAGING_ORGANIZATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getMaritalStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MARITAL_STATUS, null, $v->_getFHIRXMLNamespace())); } @@ -1778,7 +1837,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getMultipleBirthInteger())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MULTIPLE_BIRTH_INTEGER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getName())) { foreach($vs as $v) { if (null === $v) { @@ -1805,6 +1863,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_TELECOM, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } @@ -1815,8 +1874,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getActive())) { - $a[self::FIELD_ACTIVE] = $v->getValue(); - $a[self::FIELD_ACTIVE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ACTIVE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ACTIVE_EXT] = $enc; + } + } else { + $a[self::FIELD_ACTIVE] = $v; + } } if ([] !== ($vs = $this->getAddress())) { $a[self::FIELD_ADDRESS] = $vs; @@ -1825,8 +1891,15 @@ public function jsonSerialize() $a[self::FIELD_ANIMAL] = $v; } if (null !== ($v = $this->getBirthDate())) { - $a[self::FIELD_BIRTH_DATE] = $v->getValue(); - $a[self::FIELD_BIRTH_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_BIRTH_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_BIRTH_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_BIRTH_DATE] = $v; + } } if ([] !== ($vs = $this->getCareProvider())) { $a[self::FIELD_CARE_PROVIDER] = $vs; @@ -1838,19 +1911,56 @@ public function jsonSerialize() $a[self::FIELD_CONTACT] = $vs; } if (null !== ($v = $this->getDeceasedBoolean())) { - $a[self::FIELD_DECEASED_BOOLEAN] = $v->getValue(); - $a[self::FIELD_DECEASED_BOOLEAN_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DECEASED_BOOLEAN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DECEASED_BOOLEAN_EXT] = $enc; + } + } else { + $a[self::FIELD_DECEASED_BOOLEAN] = $v; + } } if (null !== ($v = $this->getDeceasedDateTime())) { - $a[self::FIELD_DECEASED_DATE_TIME] = $v->getValue(); - $a[self::FIELD_DECEASED_DATE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DECEASED_DATE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DECEASED_DATE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_DECEASED_DATE_TIME] = $v; + } } if (null !== ($v = $this->getGender())) { - $a[self::FIELD_GENDER] = $v->getValue(); - $a[self::FIELD_GENDER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_GENDER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_GENDER_EXT] = $enc; + } + } else { + $a[self::FIELD_GENDER] = $v; + } } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if ([] !== ($vs = $this->getLink())) { $a[self::FIELD_LINK] = $vs; @@ -1862,12 +1972,26 @@ public function jsonSerialize() $a[self::FIELD_MARITAL_STATUS] = $v; } if (null !== ($v = $this->getMultipleBirthBoolean())) { - $a[self::FIELD_MULTIPLE_BIRTH_BOOLEAN] = $v->getValue(); - $a[self::FIELD_MULTIPLE_BIRTH_BOOLEAN_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MULTIPLE_BIRTH_BOOLEAN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MULTIPLE_BIRTH_BOOLEAN_EXT] = $enc; + } + } else { + $a[self::FIELD_MULTIPLE_BIRTH_BOOLEAN] = $v; + } } if (null !== ($v = $this->getMultipleBirthInteger())) { - $a[self::FIELD_MULTIPLE_BIRTH_INTEGER] = $v->getValue(); - $a[self::FIELD_MULTIPLE_BIRTH_INTEGER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MULTIPLE_BIRTH_INTEGER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MULTIPLE_BIRTH_INTEGER_EXT] = $enc; + } + } else { + $a[self::FIELD_MULTIPLE_BIRTH_INTEGER] = $v; + } } if ([] !== ($vs = $this->getName())) { $a[self::FIELD_NAME] = $vs; @@ -1876,7 +2000,23 @@ public function jsonSerialize() $a[self::FIELD_PHOTO] = $vs; } if ([] !== ($vs = $this->getTelecom())) { - $a[self::FIELD_TELECOM] = $vs; + $a[self::FIELD_TELECOM] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TELECOM][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TELECOM_EXT][] = $enc; + } else { + $a[self::FIELD_TELECOM_EXT][] = null; + } + } else { + $a[self::FIELD_TELECOM][] = $v; + } + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRPaymentNotice.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRPaymentNotice.php index e216931c31..bee29ff70e 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRPaymentNotice.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRPaymentNotice.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -83,10 +83,6 @@ class FHIRPaymentNotice extends FHIRDomainResource implements PHPFHIRContainedTy { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_PAYMENT_NOTICE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CREATED = 'created'; const FIELD_CREATED_EXT = '_created'; const FIELD_IDENTIFIER = 'identifier'; @@ -215,6 +211,9 @@ class FHIRPaymentNotice extends FHIRDomainResource implements PHPFHIRContainedTy */ protected $target = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRPaymentNotice Constructor * @param null|array $data @@ -237,8 +236,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CREATED] instanceof FHIRDateTime) { $this->setCreated($data[self::FIELD_CREATED]); - } elseif ($ext && is_scalar($data[self::FIELD_CREATED])) { - $this->setCreated(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_CREATED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CREATED])) { + $this->setCreated(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_CREATED]] + $ext)); + } else if (is_array($data[self::FIELD_CREATED])) { + $this->setCreated(new FHIRDateTime(array_merge($ext, $data[self::FIELD_CREATED]))); + } } else { $this->setCreated(new FHIRDateTime($data[self::FIELD_CREATED])); } @@ -249,17 +252,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -812,7 +822,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getCreated())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CREATED, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -825,31 +834,24 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getOrganization())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ORGANIZATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOriginalRuleset())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ORIGINAL_RULESET, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPaymentStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PAYMENT_STATUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getProvider())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PROVIDER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRequest())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REQUEST, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getResponse())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RESPONSE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRuleset())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RULESET, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getTarget())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TARGET, null, $v->_getFHIRXMLNamespace())); } @@ -863,11 +865,34 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getCreated())) { - $a[self::FIELD_CREATED] = $v->getValue(); - $a[self::FIELD_CREATED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CREATED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CREATED_EXT] = $enc; + } + } else { + $a[self::FIELD_CREATED] = $v; + } } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if (null !== ($v = $this->getOrganization())) { $a[self::FIELD_ORGANIZATION] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRPaymentReconciliation.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRPaymentReconciliation.php index 2b4afd1a77..837171aef2 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRPaymentReconciliation.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRPaymentReconciliation.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -89,10 +89,6 @@ class FHIRPaymentReconciliation extends FHIRDomainResource implements PHPFHIRCon { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_PAYMENT_RECONCILIATION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CREATED = 'created'; const FIELD_CREATED_EXT = '_created'; const FIELD_DETAIL = 'detail'; @@ -112,6 +108,7 @@ class FHIRPaymentReconciliation extends FHIRDomainResource implements PHPFHIRCon const FIELD_REQUEST_PROVIDER = 'requestProvider'; const FIELD_RULESET = 'ruleset'; const FIELD_TOTAL = 'total'; + const FIELD_TOTAL_EXT = '_total'; /** * A date, date-time or partial date (e.g. just year or year + month). If hours and @@ -279,6 +276,9 @@ class FHIRPaymentReconciliation extends FHIRDomainResource implements PHPFHIRCon */ protected $total = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRPaymentReconciliation Constructor * @param null|array $data @@ -301,8 +301,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CREATED] instanceof FHIRDateTime) { $this->setCreated($data[self::FIELD_CREATED]); - } elseif ($ext && is_scalar($data[self::FIELD_CREATED])) { - $this->setCreated(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_CREATED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CREATED])) { + $this->setCreated(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_CREATED]] + $ext)); + } else if (is_array($data[self::FIELD_CREATED])) { + $this->setCreated(new FHIRDateTime(array_merge($ext, $data[self::FIELD_CREATED]))); + } } else { $this->setCreated(new FHIRDateTime($data[self::FIELD_CREATED])); } @@ -310,6 +314,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_DETAIL])) { if (is_array($data[self::FIELD_DETAIL])) { foreach($data[self::FIELD_DETAIL] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRPaymentReconciliationDetail) { $this->addDetail($v); } else { @@ -328,8 +335,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DISPOSITION] instanceof FHIRString) { $this->setDisposition($data[self::FIELD_DISPOSITION]); - } elseif ($ext && is_scalar($data[self::FIELD_DISPOSITION])) { - $this->setDisposition(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DISPOSITION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DISPOSITION])) { + $this->setDisposition(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DISPOSITION]] + $ext)); + } else if (is_array($data[self::FIELD_DISPOSITION])) { + $this->setDisposition(new FHIRString(array_merge($ext, $data[self::FIELD_DISPOSITION]))); + } } else { $this->setDisposition(new FHIRString($data[self::FIELD_DISPOSITION])); } @@ -347,17 +358,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -366,6 +384,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_NOTE])) { if (is_array($data[self::FIELD_NOTE])) { foreach($data[self::FIELD_NOTE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRPaymentReconciliationNote) { $this->addNote($v); } else { @@ -398,8 +419,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_OUTCOME] instanceof FHIRCode) { $this->setOutcome($data[self::FIELD_OUTCOME]); - } elseif ($ext && is_scalar($data[self::FIELD_OUTCOME])) { - $this->setOutcome(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_OUTCOME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_OUTCOME])) { + $this->setOutcome(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_OUTCOME]] + $ext)); + } else if (is_array($data[self::FIELD_OUTCOME])) { + $this->setOutcome(new FHIRCode(array_merge($ext, $data[self::FIELD_OUTCOME]))); + } } else { $this->setOutcome(new FHIRCode($data[self::FIELD_OUTCOME])); } @@ -440,8 +465,17 @@ public function __construct($data = null) } } if (isset($data[self::FIELD_TOTAL])) { + $ext = (isset($data[self::FIELD_TOTAL_EXT]) && is_array($data[self::FIELD_TOTAL_EXT])) + ? $data[self::FIELD_TOTAL_EXT] + : null; if ($data[self::FIELD_TOTAL] instanceof FHIRMoney) { $this->setTotal($data[self::FIELD_TOTAL]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TOTAL])) { + $this->setTotal(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_TOTAL]] + $ext)); + } else if (is_array($data[self::FIELD_TOTAL])) { + $this->setTotal(new FHIRMoney(array_merge($ext, $data[self::FIELD_TOTAL]))); + } } else { $this->setTotal(new FHIRMoney($data[self::FIELD_TOTAL])); } @@ -1170,7 +1204,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getCreated())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CREATED, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getDetail())) { foreach($vs as $v) { if (null === $v) { @@ -1179,14 +1212,13 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_DETAIL, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getDisposition())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DISPOSITION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getForm())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FORM, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -1208,34 +1240,27 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getOrganization())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ORGANIZATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOriginalRuleset())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ORIGINAL_RULESET, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getOutcome())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OUTCOME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRequest())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REQUEST, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRequestOrganization())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REQUEST_ORGANIZATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRequestProvider())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REQUEST_PROVIDER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRuleset())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RULESET, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getTotal())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TOTAL, null, $v->_getFHIRXMLNamespace())); } @@ -1249,21 +1274,51 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getCreated())) { - $a[self::FIELD_CREATED] = $v->getValue(); - $a[self::FIELD_CREATED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CREATED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CREATED_EXT] = $enc; + } + } else { + $a[self::FIELD_CREATED] = $v; + } } if ([] !== ($vs = $this->getDetail())) { $a[self::FIELD_DETAIL] = $vs; } if (null !== ($v = $this->getDisposition())) { - $a[self::FIELD_DISPOSITION] = $v->getValue(); - $a[self::FIELD_DISPOSITION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DISPOSITION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DISPOSITION_EXT] = $enc; + } + } else { + $a[self::FIELD_DISPOSITION] = $v; + } } if (null !== ($v = $this->getForm())) { $a[self::FIELD_FORM] = $v; } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if ([] !== ($vs = $this->getNote())) { $a[self::FIELD_NOTE] = $vs; @@ -1275,8 +1330,15 @@ public function jsonSerialize() $a[self::FIELD_ORIGINAL_RULESET] = $v; } if (null !== ($v = $this->getOutcome())) { - $a[self::FIELD_OUTCOME] = $v->getValue(); - $a[self::FIELD_OUTCOME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_OUTCOME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_OUTCOME_EXT] = $enc; + } + } else { + $a[self::FIELD_OUTCOME] = $v; + } } if (null !== ($v = $this->getPeriod())) { $a[self::FIELD_PERIOD] = $v; @@ -1294,7 +1356,15 @@ public function jsonSerialize() $a[self::FIELD_RULESET] = $v; } if (null !== ($v = $this->getTotal())) { - $a[self::FIELD_TOTAL] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TOTAL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TOTAL_EXT] = $enc; + } + } else { + $a[self::FIELD_TOTAL] = $v; + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRPerson.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRPerson.php index cf585135f5..80d790d8ee 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRPerson.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRPerson.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -89,10 +89,6 @@ class FHIRPerson extends FHIRDomainResource implements PHPFHIRContainedTypeInter { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_PERSON; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ACTIVE = 'active'; const FIELD_ACTIVE_EXT = '_active'; const FIELD_ADDRESS = 'address'; @@ -222,6 +218,9 @@ class FHIRPerson extends FHIRDomainResource implements PHPFHIRContainedTypeInter */ protected $telecom = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRPerson Constructor * @param null|array $data @@ -244,8 +243,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ACTIVE] instanceof FHIRBoolean) { $this->setActive($data[self::FIELD_ACTIVE]); - } elseif ($ext && is_scalar($data[self::FIELD_ACTIVE])) { - $this->setActive(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_ACTIVE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ACTIVE])) { + $this->setActive(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_ACTIVE]] + $ext)); + } else if (is_array($data[self::FIELD_ACTIVE])) { + $this->setActive(new FHIRBoolean(array_merge($ext, $data[self::FIELD_ACTIVE]))); + } } else { $this->setActive(new FHIRBoolean($data[self::FIELD_ACTIVE])); } @@ -253,6 +256,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ADDRESS])) { if (is_array($data[self::FIELD_ADDRESS])) { foreach($data[self::FIELD_ADDRESS] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRAddress) { $this->addAddress($v); } else { @@ -271,8 +277,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_BIRTH_DATE] instanceof FHIRDate) { $this->setBirthDate($data[self::FIELD_BIRTH_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_BIRTH_DATE])) { - $this->setBirthDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_BIRTH_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_BIRTH_DATE])) { + $this->setBirthDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_BIRTH_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_BIRTH_DATE])) { + $this->setBirthDate(new FHIRDate(array_merge($ext, $data[self::FIELD_BIRTH_DATE]))); + } } else { $this->setBirthDate(new FHIRDate($data[self::FIELD_BIRTH_DATE])); } @@ -283,8 +293,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_GENDER] instanceof FHIRCode) { $this->setGender($data[self::FIELD_GENDER]); - } elseif ($ext && is_scalar($data[self::FIELD_GENDER])) { - $this->setGender(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_GENDER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_GENDER])) { + $this->setGender(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_GENDER]] + $ext)); + } else if (is_array($data[self::FIELD_GENDER])) { + $this->setGender(new FHIRCode(array_merge($ext, $data[self::FIELD_GENDER]))); + } } else { $this->setGender(new FHIRCode($data[self::FIELD_GENDER])); } @@ -295,17 +309,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -314,6 +335,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_LINK])) { if (is_array($data[self::FIELD_LINK])) { foreach($data[self::FIELD_LINK] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRPersonLink) { $this->addLink($v); } else { @@ -336,6 +360,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_NAME])) { if (is_array($data[self::FIELD_NAME])) { foreach($data[self::FIELD_NAME] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRHumanName) { $this->addName($v); } else { @@ -361,17 +388,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_TELECOM])) { foreach($data[self::FIELD_TELECOM] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContactPoint) { $this->addTelecom($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addTelecom(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addTelecom(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addTelecom(new FHIRContactPoint(array_merge($v, $ext[$i]))); + } } else { $this->addTelecom(new FHIRContactPoint($v)); } } } elseif ($data[self::FIELD_TELECOM] instanceof FHIRContactPoint) { $this->addTelecom($data[self::FIELD_TELECOM]); - } elseif ($ext && is_scalar($data[self::FIELD_TELECOM])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_TELECOM])) { $this->addTelecom(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $data[self::FIELD_TELECOM]] + $ext)); } else { $this->addTelecom(new FHIRContactPoint($data[self::FIELD_TELECOM])); @@ -999,7 +1033,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getActive())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ACTIVE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getAddress())) { foreach($vs as $v) { if (null === $v) { @@ -1008,13 +1041,13 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_ADDRESS, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getBirthDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_BIRTH_DATE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getGender())) { $v->xmlSerialize($sxe->addChild(self::FIELD_GENDER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -1036,7 +1069,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getManagingOrganization())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MANAGING_ORGANIZATION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getName())) { foreach($vs as $v) { if (null === $v) { @@ -1049,7 +1081,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getPhoto())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PHOTO, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getTelecom())) { foreach($vs as $v) { if (null === $v) { @@ -1058,6 +1089,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_TELECOM, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } @@ -1068,22 +1100,59 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getActive())) { - $a[self::FIELD_ACTIVE] = $v->getValue(); - $a[self::FIELD_ACTIVE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ACTIVE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ACTIVE_EXT] = $enc; + } + } else { + $a[self::FIELD_ACTIVE] = $v; + } } if ([] !== ($vs = $this->getAddress())) { $a[self::FIELD_ADDRESS] = $vs; } if (null !== ($v = $this->getBirthDate())) { - $a[self::FIELD_BIRTH_DATE] = $v->getValue(); - $a[self::FIELD_BIRTH_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_BIRTH_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_BIRTH_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_BIRTH_DATE] = $v; + } } if (null !== ($v = $this->getGender())) { - $a[self::FIELD_GENDER] = $v->getValue(); - $a[self::FIELD_GENDER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_GENDER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_GENDER_EXT] = $enc; + } + } else { + $a[self::FIELD_GENDER] = $v; + } } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if ([] !== ($vs = $this->getLink())) { $a[self::FIELD_LINK] = $vs; @@ -1098,7 +1167,23 @@ public function jsonSerialize() $a[self::FIELD_PHOTO] = $v; } if ([] !== ($vs = $this->getTelecom())) { - $a[self::FIELD_TELECOM] = $vs; + $a[self::FIELD_TELECOM] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TELECOM][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TELECOM_EXT][] = $enc; + } else { + $a[self::FIELD_TELECOM_EXT][] = null; + } + } else { + $a[self::FIELD_TELECOM][] = $v; + } + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRPractitioner.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRPractitioner.php index 0d237fe98c..6586f4cbbe 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRPractitioner.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRPractitioner.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -90,10 +90,6 @@ class FHIRPractitioner extends FHIRDomainResource implements PHPFHIRContainedTyp { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_PRACTITIONER; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ACTIVE = 'active'; const FIELD_ACTIVE_EXT = '_active'; const FIELD_ADDRESS = 'address'; @@ -237,6 +233,9 @@ class FHIRPractitioner extends FHIRDomainResource implements PHPFHIRContainedTyp */ protected $telecom = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRPractitioner Constructor * @param null|array $data @@ -259,8 +258,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ACTIVE] instanceof FHIRBoolean) { $this->setActive($data[self::FIELD_ACTIVE]); - } elseif ($ext && is_scalar($data[self::FIELD_ACTIVE])) { - $this->setActive(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_ACTIVE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ACTIVE])) { + $this->setActive(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_ACTIVE]] + $ext)); + } else if (is_array($data[self::FIELD_ACTIVE])) { + $this->setActive(new FHIRBoolean(array_merge($ext, $data[self::FIELD_ACTIVE]))); + } } else { $this->setActive(new FHIRBoolean($data[self::FIELD_ACTIVE])); } @@ -268,6 +271,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ADDRESS])) { if (is_array($data[self::FIELD_ADDRESS])) { foreach($data[self::FIELD_ADDRESS] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRAddress) { $this->addAddress($v); } else { @@ -286,8 +292,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_BIRTH_DATE] instanceof FHIRDate) { $this->setBirthDate($data[self::FIELD_BIRTH_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_BIRTH_DATE])) { - $this->setBirthDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_BIRTH_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_BIRTH_DATE])) { + $this->setBirthDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_BIRTH_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_BIRTH_DATE])) { + $this->setBirthDate(new FHIRDate(array_merge($ext, $data[self::FIELD_BIRTH_DATE]))); + } } else { $this->setBirthDate(new FHIRDate($data[self::FIELD_BIRTH_DATE])); } @@ -295,6 +305,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_COMMUNICATION])) { if (is_array($data[self::FIELD_COMMUNICATION])) { foreach($data[self::FIELD_COMMUNICATION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addCommunication($v); } else { @@ -313,8 +326,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_GENDER] instanceof FHIRCode) { $this->setGender($data[self::FIELD_GENDER]); - } elseif ($ext && is_scalar($data[self::FIELD_GENDER])) { - $this->setGender(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_GENDER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_GENDER])) { + $this->setGender(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_GENDER]] + $ext)); + } else if (is_array($data[self::FIELD_GENDER])) { + $this->setGender(new FHIRCode(array_merge($ext, $data[self::FIELD_GENDER]))); + } } else { $this->setGender(new FHIRCode($data[self::FIELD_GENDER])); } @@ -325,17 +342,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -351,6 +375,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PHOTO])) { if (is_array($data[self::FIELD_PHOTO])) { foreach($data[self::FIELD_PHOTO] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRAttachment) { $this->addPhoto($v); } else { @@ -366,6 +393,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PRACTITIONER_ROLE])) { if (is_array($data[self::FIELD_PRACTITIONER_ROLE])) { foreach($data[self::FIELD_PRACTITIONER_ROLE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRPractitionerPractitionerRole) { $this->addPractitionerRole($v); } else { @@ -381,6 +411,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_QUALIFICATION])) { if (is_array($data[self::FIELD_QUALIFICATION])) { foreach($data[self::FIELD_QUALIFICATION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRPractitionerQualification) { $this->addQualification($v); } else { @@ -399,17 +432,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_TELECOM])) { foreach($data[self::FIELD_TELECOM] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContactPoint) { $this->addTelecom($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addTelecom(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addTelecom(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addTelecom(new FHIRContactPoint(array_merge($v, $ext[$i]))); + } } else { $this->addTelecom(new FHIRContactPoint($v)); } } } elseif ($data[self::FIELD_TELECOM] instanceof FHIRContactPoint) { $this->addTelecom($data[self::FIELD_TELECOM]); - } elseif ($ext && is_scalar($data[self::FIELD_TELECOM])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_TELECOM])) { $this->addTelecom(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $data[self::FIELD_TELECOM]] + $ext)); } else { $this->addTelecom(new FHIRContactPoint($data[self::FIELD_TELECOM])); @@ -1132,7 +1172,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getActive())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ACTIVE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getAddress())) { foreach($vs as $v) { if (null === $v) { @@ -1141,10 +1180,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_ADDRESS, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getBirthDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_BIRTH_DATE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getCommunication())) { foreach($vs as $v) { if (null === $v) { @@ -1153,10 +1192,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_COMMUNICATION, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getGender())) { $v->xmlSerialize($sxe->addChild(self::FIELD_GENDER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -1169,7 +1208,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NAME, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getPhoto())) { foreach($vs as $v) { if (null === $v) { @@ -1205,6 +1243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_TELECOM, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } @@ -1215,25 +1254,62 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getActive())) { - $a[self::FIELD_ACTIVE] = $v->getValue(); - $a[self::FIELD_ACTIVE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ACTIVE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ACTIVE_EXT] = $enc; + } + } else { + $a[self::FIELD_ACTIVE] = $v; + } } if ([] !== ($vs = $this->getAddress())) { $a[self::FIELD_ADDRESS] = $vs; } if (null !== ($v = $this->getBirthDate())) { - $a[self::FIELD_BIRTH_DATE] = $v->getValue(); - $a[self::FIELD_BIRTH_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_BIRTH_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_BIRTH_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_BIRTH_DATE] = $v; + } } if ([] !== ($vs = $this->getCommunication())) { $a[self::FIELD_COMMUNICATION] = $vs; } if (null !== ($v = $this->getGender())) { - $a[self::FIELD_GENDER] = $v->getValue(); - $a[self::FIELD_GENDER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_GENDER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_GENDER_EXT] = $enc; + } + } else { + $a[self::FIELD_GENDER] = $v; + } } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if (null !== ($v = $this->getName())) { $a[self::FIELD_NAME] = $v; @@ -1248,7 +1324,23 @@ public function jsonSerialize() $a[self::FIELD_QUALIFICATION] = $vs; } if ([] !== ($vs = $this->getTelecom())) { - $a[self::FIELD_TELECOM] = $vs; + $a[self::FIELD_TELECOM] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TELECOM][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TELECOM_EXT][] = $enc; + } else { + $a[self::FIELD_TELECOM_EXT][] = null; + } + } else { + $a[self::FIELD_TELECOM][] = $v; + } + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRProcedure.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRProcedure.php index 3fe2024059..0553849e30 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRProcedure.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRProcedure.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -90,10 +90,6 @@ class FHIRProcedure extends FHIRDomainResource implements PHPFHIRContainedTypeIn { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_PROCEDURE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_BODY_SITE = 'bodySite'; const FIELD_CATEGORY = 'category'; const FIELD_CODE = 'code'; @@ -409,6 +405,9 @@ class FHIRProcedure extends FHIRDomainResource implements PHPFHIRContainedTypeIn */ protected $used = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRProcedure Constructor * @param null|array $data @@ -428,6 +427,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_BODY_SITE])) { if (is_array($data[self::FIELD_BODY_SITE])) { foreach($data[self::FIELD_BODY_SITE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addBodySite($v); } else { @@ -457,6 +459,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_COMPLICATION])) { if (is_array($data[self::FIELD_COMPLICATION])) { foreach($data[self::FIELD_COMPLICATION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addComplication($v); } else { @@ -479,6 +484,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_FOCAL_DEVICE])) { if (is_array($data[self::FIELD_FOCAL_DEVICE])) { foreach($data[self::FIELD_FOCAL_DEVICE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRProcedureFocalDevice) { $this->addFocalDevice($v); } else { @@ -494,6 +502,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_FOLLOW_UP])) { if (is_array($data[self::FIELD_FOLLOW_UP])) { foreach($data[self::FIELD_FOLLOW_UP] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addFollowUp($v); } else { @@ -512,17 +523,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -541,8 +559,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NOT_PERFORMED] instanceof FHIRBoolean) { $this->setNotPerformed($data[self::FIELD_NOT_PERFORMED]); - } elseif ($ext && is_scalar($data[self::FIELD_NOT_PERFORMED])) { - $this->setNotPerformed(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_NOT_PERFORMED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NOT_PERFORMED])) { + $this->setNotPerformed(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_NOT_PERFORMED]] + $ext)); + } else if (is_array($data[self::FIELD_NOT_PERFORMED])) { + $this->setNotPerformed(new FHIRBoolean(array_merge($ext, $data[self::FIELD_NOT_PERFORMED]))); + } } else { $this->setNotPerformed(new FHIRBoolean($data[self::FIELD_NOT_PERFORMED])); } @@ -550,6 +572,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_NOTES])) { if (is_array($data[self::FIELD_NOTES])) { foreach($data[self::FIELD_NOTES] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRAnnotation) { $this->addNotes($v); } else { @@ -575,8 +600,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PERFORMED_DATE_TIME] instanceof FHIRDateTime) { $this->setPerformedDateTime($data[self::FIELD_PERFORMED_DATE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_PERFORMED_DATE_TIME])) { - $this->setPerformedDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_PERFORMED_DATE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PERFORMED_DATE_TIME])) { + $this->setPerformedDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_PERFORMED_DATE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_PERFORMED_DATE_TIME])) { + $this->setPerformedDateTime(new FHIRDateTime(array_merge($ext, $data[self::FIELD_PERFORMED_DATE_TIME]))); + } } else { $this->setPerformedDateTime(new FHIRDateTime($data[self::FIELD_PERFORMED_DATE_TIME])); } @@ -591,6 +620,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PERFORMER])) { if (is_array($data[self::FIELD_PERFORMER])) { foreach($data[self::FIELD_PERFORMER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRProcedurePerformer) { $this->addPerformer($v); } else { @@ -613,6 +645,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REASON_NOT_PERFORMED])) { if (is_array($data[self::FIELD_REASON_NOT_PERFORMED])) { foreach($data[self::FIELD_REASON_NOT_PERFORMED] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addReasonNotPerformed($v); } else { @@ -635,6 +670,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REPORT])) { if (is_array($data[self::FIELD_REPORT])) { foreach($data[self::FIELD_REPORT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addReport($v); } else { @@ -660,8 +698,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRProcedureStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRProcedureStatus([FHIRProcedureStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRProcedureStatus([FHIRProcedureStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRProcedureStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRProcedureStatus($data[self::FIELD_STATUS])); } @@ -676,6 +718,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_USED])) { if (is_array($data[self::FIELD_USED])) { foreach($data[self::FIELD_USED] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addUsed($v); } else { @@ -1943,7 +1988,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getBodySite())) { foreach($vs as $v) { if (null === $v) { @@ -1956,11 +2000,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getCategory())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CATEGORY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getComplication())) { foreach($vs as $v) { if (null === $v) { @@ -1973,7 +2015,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getEncounter())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ENCOUNTER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getFocalDevice())) { foreach($vs as $v) { if (null === $v) { @@ -2007,7 +2048,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getNotPerformed())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NOT_PERFORMED, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getNotes())) { foreach($vs as $v) { if (null === $v) { @@ -2023,11 +2063,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getPerformedDateTime())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PERFORMED_DATE_TIME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPerformedPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PERFORMED_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getPerformer())) { foreach($vs as $v) { if (null === $v) { @@ -2040,7 +2078,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getReasonCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REASON_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getReasonNotPerformed())) { foreach($vs as $v) { if (null === $v) { @@ -2053,7 +2090,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getReasonReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REASON_REFERENCE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getReport())) { foreach($vs as $v) { if (null === $v) { @@ -2066,15 +2102,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getRequest())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REQUEST, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSubject())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBJECT, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getUsed())) { foreach($vs as $v) { if (null === $v) { @@ -2083,6 +2116,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_USED, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } @@ -2114,14 +2148,37 @@ public function jsonSerialize() $a[self::FIELD_FOLLOW_UP] = $vs; } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if (null !== ($v = $this->getLocation())) { $a[self::FIELD_LOCATION] = $v; } if (null !== ($v = $this->getNotPerformed())) { - $a[self::FIELD_NOT_PERFORMED] = $v->getValue(); - $a[self::FIELD_NOT_PERFORMED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NOT_PERFORMED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NOT_PERFORMED_EXT] = $enc; + } + } else { + $a[self::FIELD_NOT_PERFORMED] = $v; + } } if ([] !== ($vs = $this->getNotes())) { $a[self::FIELD_NOTES] = $vs; @@ -2130,8 +2187,15 @@ public function jsonSerialize() $a[self::FIELD_OUTCOME] = $v; } if (null !== ($v = $this->getPerformedDateTime())) { - $a[self::FIELD_PERFORMED_DATE_TIME] = $v->getValue(); - $a[self::FIELD_PERFORMED_DATE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PERFORMED_DATE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PERFORMED_DATE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_PERFORMED_DATE_TIME] = $v; + } } if (null !== ($v = $this->getPerformedPeriod())) { $a[self::FIELD_PERFORMED_PERIOD] = $v; @@ -2155,7 +2219,15 @@ public function jsonSerialize() $a[self::FIELD_REQUEST] = $v; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getSubject())) { $a[self::FIELD_SUBJECT] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRProcedureRequest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRProcedureRequest.php index 0ca15791fc..8a37ba9b29 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRProcedureRequest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRProcedureRequest.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -88,10 +88,6 @@ class FHIRProcedureRequest extends FHIRDomainResource implements PHPFHIRContaine { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_PROCEDURE_REQUEST; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_AS_NEEDED_BOOLEAN = 'asNeededBoolean'; const FIELD_AS_NEEDED_BOOLEAN_EXT = '_asNeededBoolean'; const FIELD_AS_NEEDED_CODEABLE_CONCEPT = 'asNeededCodeableConcept'; @@ -342,6 +338,9 @@ class FHIRProcedureRequest extends FHIRDomainResource implements PHPFHIRContaine */ protected $subject = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRProcedureRequest Constructor * @param null|array $data @@ -364,8 +363,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_AS_NEEDED_BOOLEAN] instanceof FHIRBoolean) { $this->setAsNeededBoolean($data[self::FIELD_AS_NEEDED_BOOLEAN]); - } elseif ($ext && is_scalar($data[self::FIELD_AS_NEEDED_BOOLEAN])) { - $this->setAsNeededBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_AS_NEEDED_BOOLEAN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_AS_NEEDED_BOOLEAN])) { + $this->setAsNeededBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_AS_NEEDED_BOOLEAN]] + $ext)); + } else if (is_array($data[self::FIELD_AS_NEEDED_BOOLEAN])) { + $this->setAsNeededBoolean(new FHIRBoolean(array_merge($ext, $data[self::FIELD_AS_NEEDED_BOOLEAN]))); + } } else { $this->setAsNeededBoolean(new FHIRBoolean($data[self::FIELD_AS_NEEDED_BOOLEAN])); } @@ -380,6 +383,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_BODY_SITE])) { if (is_array($data[self::FIELD_BODY_SITE])) { foreach($data[self::FIELD_BODY_SITE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addBodySite($v); } else { @@ -412,17 +418,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -431,6 +444,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_NOTES])) { if (is_array($data[self::FIELD_NOTES])) { foreach($data[self::FIELD_NOTES] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRAnnotation) { $this->addNotes($v); } else { @@ -449,8 +465,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ORDERED_ON] instanceof FHIRDateTime) { $this->setOrderedOn($data[self::FIELD_ORDERED_ON]); - } elseif ($ext && is_scalar($data[self::FIELD_ORDERED_ON])) { - $this->setOrderedOn(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_ORDERED_ON]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ORDERED_ON])) { + $this->setOrderedOn(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_ORDERED_ON]] + $ext)); + } else if (is_array($data[self::FIELD_ORDERED_ON])) { + $this->setOrderedOn(new FHIRDateTime(array_merge($ext, $data[self::FIELD_ORDERED_ON]))); + } } else { $this->setOrderedOn(new FHIRDateTime($data[self::FIELD_ORDERED_ON])); } @@ -475,8 +495,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PRIORITY] instanceof FHIRProcedureRequestPriority) { $this->setPriority($data[self::FIELD_PRIORITY]); - } elseif ($ext && is_scalar($data[self::FIELD_PRIORITY])) { - $this->setPriority(new FHIRProcedureRequestPriority([FHIRProcedureRequestPriority::FIELD_VALUE => $data[self::FIELD_PRIORITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PRIORITY])) { + $this->setPriority(new FHIRProcedureRequestPriority([FHIRProcedureRequestPriority::FIELD_VALUE => $data[self::FIELD_PRIORITY]] + $ext)); + } else if (is_array($data[self::FIELD_PRIORITY])) { + $this->setPriority(new FHIRProcedureRequestPriority(array_merge($ext, $data[self::FIELD_PRIORITY]))); + } } else { $this->setPriority(new FHIRProcedureRequestPriority($data[self::FIELD_PRIORITY])); } @@ -501,8 +525,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SCHEDULED_DATE_TIME] instanceof FHIRDateTime) { $this->setScheduledDateTime($data[self::FIELD_SCHEDULED_DATE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_SCHEDULED_DATE_TIME])) { - $this->setScheduledDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_SCHEDULED_DATE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SCHEDULED_DATE_TIME])) { + $this->setScheduledDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_SCHEDULED_DATE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_SCHEDULED_DATE_TIME])) { + $this->setScheduledDateTime(new FHIRDateTime(array_merge($ext, $data[self::FIELD_SCHEDULED_DATE_TIME]))); + } } else { $this->setScheduledDateTime(new FHIRDateTime($data[self::FIELD_SCHEDULED_DATE_TIME])); } @@ -527,8 +555,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRProcedureRequestStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRProcedureRequestStatus([FHIRProcedureRequestStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRProcedureRequestStatus([FHIRProcedureRequestStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRProcedureRequestStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRProcedureRequestStatus($data[self::FIELD_STATUS])); } @@ -1421,11 +1453,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getAsNeededBoolean())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AS_NEEDED_BOOLEAN, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getAsNeededCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AS_NEEDED_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getBodySite())) { foreach($vs as $v) { if (null === $v) { @@ -1438,11 +1468,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getEncounter())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ENCOUNTER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -1460,45 +1488,37 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_NOTES, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getOrderedOn())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ORDERED_ON, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOrderer())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ORDERER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPerformer())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PERFORMER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPriority())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PRIORITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getReasonCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REASON_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getReasonReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REASON_REFERENCE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getScheduledDateTime())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SCHEDULED_DATE_TIME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getScheduledPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SCHEDULED_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getScheduledTiming())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SCHEDULED_TIMING, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSubject())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBJECT, null, $v->_getFHIRXMLNamespace())); } @@ -1512,8 +1532,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getAsNeededBoolean())) { - $a[self::FIELD_AS_NEEDED_BOOLEAN] = $v->getValue(); - $a[self::FIELD_AS_NEEDED_BOOLEAN_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_AS_NEEDED_BOOLEAN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_AS_NEEDED_BOOLEAN_EXT] = $enc; + } + } else { + $a[self::FIELD_AS_NEEDED_BOOLEAN] = $v; + } } if (null !== ($v = $this->getAsNeededCodeableConcept())) { $a[self::FIELD_AS_NEEDED_CODEABLE_CONCEPT] = $v; @@ -1528,14 +1555,37 @@ public function jsonSerialize() $a[self::FIELD_ENCOUNTER] = $v; } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if ([] !== ($vs = $this->getNotes())) { $a[self::FIELD_NOTES] = $vs; } if (null !== ($v = $this->getOrderedOn())) { - $a[self::FIELD_ORDERED_ON] = $v->getValue(); - $a[self::FIELD_ORDERED_ON_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ORDERED_ON] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ORDERED_ON_EXT] = $enc; + } + } else { + $a[self::FIELD_ORDERED_ON] = $v; + } } if (null !== ($v = $this->getOrderer())) { $a[self::FIELD_ORDERER] = $v; @@ -1544,7 +1594,15 @@ public function jsonSerialize() $a[self::FIELD_PERFORMER] = $v; } if (null !== ($v = $this->getPriority())) { - $a[self::FIELD_PRIORITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PRIORITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PRIORITY_EXT] = $enc; + } + } else { + $a[self::FIELD_PRIORITY] = $v; + } } if (null !== ($v = $this->getReasonCodeableConcept())) { $a[self::FIELD_REASON_CODEABLE_CONCEPT] = $v; @@ -1553,8 +1611,15 @@ public function jsonSerialize() $a[self::FIELD_REASON_REFERENCE] = $v; } if (null !== ($v = $this->getScheduledDateTime())) { - $a[self::FIELD_SCHEDULED_DATE_TIME] = $v->getValue(); - $a[self::FIELD_SCHEDULED_DATE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SCHEDULED_DATE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SCHEDULED_DATE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_SCHEDULED_DATE_TIME] = $v; + } } if (null !== ($v = $this->getScheduledPeriod())) { $a[self::FIELD_SCHEDULED_PERIOD] = $v; @@ -1563,7 +1628,15 @@ public function jsonSerialize() $a[self::FIELD_SCHEDULED_TIMING] = $v; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getSubject())) { $a[self::FIELD_SUBJECT] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRProcessRequest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRProcessRequest.php index 16bef897bd..4b7d7ddfa1 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRProcessRequest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRProcessRequest.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -88,10 +88,6 @@ class FHIRProcessRequest extends FHIRDomainResource implements PHPFHIRContainedT { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_PROCESS_REQUEST; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ACTION = 'action'; const FIELD_ACTION_EXT = '_action'; const FIELD_CREATED = 'created'; @@ -298,6 +294,9 @@ class FHIRProcessRequest extends FHIRDomainResource implements PHPFHIRContainedT */ protected $target = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRProcessRequest Constructor * @param null|array $data @@ -320,8 +319,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ACTION] instanceof FHIRActionList) { $this->setAction($data[self::FIELD_ACTION]); - } elseif ($ext && is_scalar($data[self::FIELD_ACTION])) { - $this->setAction(new FHIRActionList([FHIRActionList::FIELD_VALUE => $data[self::FIELD_ACTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ACTION])) { + $this->setAction(new FHIRActionList([FHIRActionList::FIELD_VALUE => $data[self::FIELD_ACTION]] + $ext)); + } else if (is_array($data[self::FIELD_ACTION])) { + $this->setAction(new FHIRActionList(array_merge($ext, $data[self::FIELD_ACTION]))); + } } else { $this->setAction(new FHIRActionList($data[self::FIELD_ACTION])); } @@ -332,8 +335,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CREATED] instanceof FHIRDateTime) { $this->setCreated($data[self::FIELD_CREATED]); - } elseif ($ext && is_scalar($data[self::FIELD_CREATED])) { - $this->setCreated(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_CREATED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CREATED])) { + $this->setCreated(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_CREATED]] + $ext)); + } else if (is_array($data[self::FIELD_CREATED])) { + $this->setCreated(new FHIRDateTime(array_merge($ext, $data[self::FIELD_CREATED]))); + } } else { $this->setCreated(new FHIRDateTime($data[self::FIELD_CREATED])); } @@ -344,17 +351,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_EXCLUDE])) { foreach($data[self::FIELD_EXCLUDE] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRString) { $this->addExclude($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addExclude(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addExclude(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addExclude(new FHIRString(array_merge($v, $ext[$i]))); + } } else { $this->addExclude(new FHIRString($v)); } } } elseif ($data[self::FIELD_EXCLUDE] instanceof FHIRString) { $this->addExclude($data[self::FIELD_EXCLUDE]); - } elseif ($ext && is_scalar($data[self::FIELD_EXCLUDE])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_EXCLUDE])) { $this->addExclude(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_EXCLUDE]] + $ext)); } else { $this->addExclude(new FHIRString($data[self::FIELD_EXCLUDE])); @@ -366,17 +380,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -388,17 +409,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_INCLUDE])) { foreach($data[self::FIELD_INCLUDE] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRString) { $this->addInclude($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addInclude(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addInclude(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addInclude(new FHIRString(array_merge($v, $ext[$i]))); + } } else { $this->addInclude(new FHIRString($v)); } } } elseif ($data[self::FIELD_INCLUDE] instanceof FHIRString) { $this->addInclude($data[self::FIELD_INCLUDE]); - } elseif ($ext && is_scalar($data[self::FIELD_INCLUDE])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_INCLUDE])) { $this->addInclude(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_INCLUDE]] + $ext)); } else { $this->addInclude(new FHIRString($data[self::FIELD_INCLUDE])); @@ -407,6 +435,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ITEM])) { if (is_array($data[self::FIELD_ITEM])) { foreach($data[self::FIELD_ITEM] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRProcessRequestItem) { $this->addItem($v); } else { @@ -425,8 +456,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NULLIFY] instanceof FHIRBoolean) { $this->setNullify($data[self::FIELD_NULLIFY]); - } elseif ($ext && is_scalar($data[self::FIELD_NULLIFY])) { - $this->setNullify(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_NULLIFY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NULLIFY])) { + $this->setNullify(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_NULLIFY]] + $ext)); + } else if (is_array($data[self::FIELD_NULLIFY])) { + $this->setNullify(new FHIRBoolean(array_merge($ext, $data[self::FIELD_NULLIFY]))); + } } else { $this->setNullify(new FHIRBoolean($data[self::FIELD_NULLIFY])); } @@ -465,8 +500,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_REFERENCE] instanceof FHIRString) { $this->setReference($data[self::FIELD_REFERENCE]); - } elseif ($ext && is_scalar($data[self::FIELD_REFERENCE])) { - $this->setReference(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_REFERENCE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_REFERENCE])) { + $this->setReference(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_REFERENCE]] + $ext)); + } else if (is_array($data[self::FIELD_REFERENCE])) { + $this->setReference(new FHIRString(array_merge($ext, $data[self::FIELD_REFERENCE]))); + } } else { $this->setReference(new FHIRString($data[self::FIELD_REFERENCE])); } @@ -1315,7 +1354,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getAction())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ACTION, null, $v->_getFHIRXMLNamespace())); } @@ -1339,6 +1377,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } } + if ([] !== ($vs = $this->getInclude())) { foreach($vs as $v) { if (null === $v) { @@ -1356,41 +1395,34 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_ITEM, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getNullify())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NULLIFY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOrganization())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ORGANIZATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOriginalRuleset())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ORIGINAL_RULESET, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getProvider())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PROVIDER, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REFERENCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRequest())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REQUEST, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getResponse())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RESPONSE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRuleset())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RULESET, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getTarget())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TARGET, null, $v->_getFHIRXMLNamespace())); } @@ -1404,11 +1436,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getAction())) { - $a[self::FIELD_ACTION] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ACTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ACTION_EXT] = $enc; + } + } else { + $a[self::FIELD_ACTION] = $v; + } } if (null !== ($v = $this->getCreated())) { - $a[self::FIELD_CREATED] = $v->getValue(); - $a[self::FIELD_CREATED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CREATED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CREATED_EXT] = $enc; + } + } else { + $a[self::FIELD_CREATED] = $v; + } } if ([] !== ($vs = $this->getExclude())) { $a[self::FIELD_EXCLUDE] = []; @@ -1416,12 +1463,37 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_EXCLUDE][] = $v->getValue(); - $a[self::FIELD_EXCLUDE_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EXCLUDE][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EXCLUDE_EXT][] = $enc; + } else { + $a[self::FIELD_EXCLUDE_EXT][] = null; + } + } else { + $a[self::FIELD_EXCLUDE][] = $v; + } } } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if ([] !== ($vs = $this->getInclude())) { $a[self::FIELD_INCLUDE] = []; @@ -1429,16 +1501,32 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_INCLUDE][] = $v->getValue(); - $a[self::FIELD_INCLUDE_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_INCLUDE][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_INCLUDE_EXT][] = $enc; + } else { + $a[self::FIELD_INCLUDE_EXT][] = null; + } + } else { + $a[self::FIELD_INCLUDE][] = $v; + } } } if ([] !== ($vs = $this->getItem())) { $a[self::FIELD_ITEM] = $vs; } if (null !== ($v = $this->getNullify())) { - $a[self::FIELD_NULLIFY] = $v->getValue(); - $a[self::FIELD_NULLIFY_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NULLIFY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NULLIFY_EXT] = $enc; + } + } else { + $a[self::FIELD_NULLIFY] = $v; + } } if (null !== ($v = $this->getOrganization())) { $a[self::FIELD_ORGANIZATION] = $v; @@ -1453,8 +1541,15 @@ public function jsonSerialize() $a[self::FIELD_PROVIDER] = $v; } if (null !== ($v = $this->getReference())) { - $a[self::FIELD_REFERENCE] = $v->getValue(); - $a[self::FIELD_REFERENCE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_REFERENCE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_REFERENCE_EXT] = $enc; + } + } else { + $a[self::FIELD_REFERENCE] = $v; + } } if (null !== ($v = $this->getRequest())) { $a[self::FIELD_REQUEST] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRProcessResponse.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRProcessResponse.php index d7c4380165..62a8362dfc 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRProcessResponse.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRProcessResponse.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -85,10 +85,6 @@ class FHIRProcessResponse extends FHIRDomainResource implements PHPFHIRContained { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_PROCESS_RESPONSE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CREATED = 'created'; const FIELD_CREATED_EXT = '_created'; const FIELD_DISPOSITION = 'disposition'; @@ -254,6 +250,9 @@ class FHIRProcessResponse extends FHIRDomainResource implements PHPFHIRContained */ protected $ruleset = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRProcessResponse Constructor * @param null|array $data @@ -276,8 +275,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CREATED] instanceof FHIRDateTime) { $this->setCreated($data[self::FIELD_CREATED]); - } elseif ($ext && is_scalar($data[self::FIELD_CREATED])) { - $this->setCreated(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_CREATED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CREATED])) { + $this->setCreated(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_CREATED]] + $ext)); + } else if (is_array($data[self::FIELD_CREATED])) { + $this->setCreated(new FHIRDateTime(array_merge($ext, $data[self::FIELD_CREATED]))); + } } else { $this->setCreated(new FHIRDateTime($data[self::FIELD_CREATED])); } @@ -288,8 +291,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DISPOSITION] instanceof FHIRString) { $this->setDisposition($data[self::FIELD_DISPOSITION]); - } elseif ($ext && is_scalar($data[self::FIELD_DISPOSITION])) { - $this->setDisposition(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DISPOSITION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DISPOSITION])) { + $this->setDisposition(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DISPOSITION]] + $ext)); + } else if (is_array($data[self::FIELD_DISPOSITION])) { + $this->setDisposition(new FHIRString(array_merge($ext, $data[self::FIELD_DISPOSITION]))); + } } else { $this->setDisposition(new FHIRString($data[self::FIELD_DISPOSITION])); } @@ -297,6 +304,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ERROR])) { if (is_array($data[self::FIELD_ERROR])) { foreach($data[self::FIELD_ERROR] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCoding) { $this->addError($v); } else { @@ -322,17 +332,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -341,6 +358,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_NOTES])) { if (is_array($data[self::FIELD_NOTES])) { foreach($data[self::FIELD_NOTES] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRProcessResponseNotes) { $this->addNotes($v); } else { @@ -1062,7 +1082,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDisposition())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DISPOSITION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getError())) { foreach($vs as $v) { if (null === $v) { @@ -1075,7 +1094,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getForm())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FORM, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -1097,27 +1115,21 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getOrganization())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ORGANIZATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOriginalRuleset())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ORIGINAL_RULESET, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOutcome())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OUTCOME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRequest())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REQUEST, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRequestOrganization())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REQUEST_ORGANIZATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRequestProvider())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REQUEST_PROVIDER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRuleset())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RULESET, null, $v->_getFHIRXMLNamespace())); } @@ -1131,12 +1143,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getCreated())) { - $a[self::FIELD_CREATED] = $v->getValue(); - $a[self::FIELD_CREATED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CREATED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CREATED_EXT] = $enc; + } + } else { + $a[self::FIELD_CREATED] = $v; + } } if (null !== ($v = $this->getDisposition())) { - $a[self::FIELD_DISPOSITION] = $v->getValue(); - $a[self::FIELD_DISPOSITION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DISPOSITION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DISPOSITION_EXT] = $enc; + } + } else { + $a[self::FIELD_DISPOSITION] = $v; + } } if ([] !== ($vs = $this->getError())) { $a[self::FIELD_ERROR] = $vs; @@ -1145,7 +1171,23 @@ public function jsonSerialize() $a[self::FIELD_FORM] = $v; } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if ([] !== ($vs = $this->getNotes())) { $a[self::FIELD_NOTES] = $vs; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRProvenance.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRProvenance.php index 4eaacf2156..8fa82d6221 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRProvenance.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRProvenance.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -94,10 +94,6 @@ class FHIRProvenance extends FHIRDomainResource implements PHPFHIRContainedTypeI { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_PROVENANCE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ACTIVITY = 'activity'; const FIELD_AGENT = 'agent'; const FIELD_ENTITY = 'entity'; @@ -250,6 +246,9 @@ class FHIRProvenance extends FHIRDomainResource implements PHPFHIRContainedTypeI */ protected $target = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRProvenance Constructor * @param null|array $data @@ -276,6 +275,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_AGENT])) { if (is_array($data[self::FIELD_AGENT])) { foreach($data[self::FIELD_AGENT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRProvenanceAgent) { $this->addAgent($v); } else { @@ -291,6 +293,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ENTITY])) { if (is_array($data[self::FIELD_ENTITY])) { foreach($data[self::FIELD_ENTITY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRProvenanceEntity) { $this->addEntity($v); } else { @@ -323,17 +328,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_POLICY])) { foreach($data[self::FIELD_POLICY] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRUri) { $this->addPolicy($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addPolicy(new FHIRUri([FHIRUri::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addPolicy(new FHIRUri([FHIRUri::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addPolicy(new FHIRUri(array_merge($v, $ext[$i]))); + } } else { $this->addPolicy(new FHIRUri($v)); } } } elseif ($data[self::FIELD_POLICY] instanceof FHIRUri) { $this->addPolicy($data[self::FIELD_POLICY]); - } elseif ($ext && is_scalar($data[self::FIELD_POLICY])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_POLICY])) { $this->addPolicy(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_POLICY]] + $ext)); } else { $this->addPolicy(new FHIRUri($data[self::FIELD_POLICY])); @@ -342,6 +354,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REASON])) { if (is_array($data[self::FIELD_REASON])) { foreach($data[self::FIELD_REASON] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addReason($v); } else { @@ -360,8 +375,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_RECORDED] instanceof FHIRInstant) { $this->setRecorded($data[self::FIELD_RECORDED]); - } elseif ($ext && is_scalar($data[self::FIELD_RECORDED])) { - $this->setRecorded(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_RECORDED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_RECORDED])) { + $this->setRecorded(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_RECORDED]] + $ext)); + } else if (is_array($data[self::FIELD_RECORDED])) { + $this->setRecorded(new FHIRInstant(array_merge($ext, $data[self::FIELD_RECORDED]))); + } } else { $this->setRecorded(new FHIRInstant($data[self::FIELD_RECORDED])); } @@ -369,6 +388,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SIGNATURE])) { if (is_array($data[self::FIELD_SIGNATURE])) { foreach($data[self::FIELD_SIGNATURE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRSignature) { $this->addSignature($v); } else { @@ -384,6 +406,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_TARGET])) { if (is_array($data[self::FIELD_TARGET])) { foreach($data[self::FIELD_TARGET] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addTarget($v); } else { @@ -1107,11 +1132,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getActivity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ACTIVITY, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getAgent())) { foreach($vs as $v) { if (null === $v) { @@ -1133,7 +1156,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getLocation())) { $v->xmlSerialize($sxe->addChild(self::FIELD_LOCATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PERIOD, null, $v->_getFHIRXMLNamespace())); } @@ -1154,10 +1176,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_REASON, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getRecorded())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RECORDED, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getSignature())) { foreach($vs as $v) { if (null === $v) { @@ -1175,6 +1197,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_TARGET, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } @@ -1205,16 +1228,32 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_POLICY][] = $v->getValue(); - $a[self::FIELD_POLICY_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_POLICY][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_POLICY_EXT][] = $enc; + } else { + $a[self::FIELD_POLICY_EXT][] = null; + } + } else { + $a[self::FIELD_POLICY][] = $v; + } } } if ([] !== ($vs = $this->getReason())) { $a[self::FIELD_REASON] = $vs; } if (null !== ($v = $this->getRecorded())) { - $a[self::FIELD_RECORDED] = $v->getValue(); - $a[self::FIELD_RECORDED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_RECORDED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_RECORDED_EXT] = $enc; + } + } else { + $a[self::FIELD_RECORDED] = $v; + } } if ([] !== ($vs = $this->getSignature())) { $a[self::FIELD_SIGNATURE] = $vs; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRQuestionnaire.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRQuestionnaire.php index 9e8ca94e59..bc9b805fc9 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRQuestionnaire.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRQuestionnaire.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -87,10 +87,6 @@ class FHIRQuestionnaire extends FHIRDomainResource implements PHPFHIRContainedTy { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_QUESTIONNAIRE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DATE = 'date'; const FIELD_DATE_EXT = '_date'; const FIELD_GROUP = 'group'; @@ -205,6 +201,9 @@ class FHIRQuestionnaire extends FHIRDomainResource implements PHPFHIRContainedTy */ protected $version = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRQuestionnaire Constructor * @param null|array $data @@ -227,8 +226,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATE] instanceof FHIRDateTime) { $this->setDate($data[self::FIELD_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_DATE])) { - $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime(array_merge($ext, $data[self::FIELD_DATE]))); + } } else { $this->setDate(new FHIRDateTime($data[self::FIELD_DATE])); } @@ -246,17 +249,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -268,8 +278,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PUBLISHER] instanceof FHIRString) { $this->setPublisher($data[self::FIELD_PUBLISHER]); - } elseif ($ext && is_scalar($data[self::FIELD_PUBLISHER])) { - $this->setPublisher(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PUBLISHER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PUBLISHER])) { + $this->setPublisher(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PUBLISHER]] + $ext)); + } else if (is_array($data[self::FIELD_PUBLISHER])) { + $this->setPublisher(new FHIRString(array_merge($ext, $data[self::FIELD_PUBLISHER]))); + } } else { $this->setPublisher(new FHIRString($data[self::FIELD_PUBLISHER])); } @@ -280,8 +294,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRQuestionnaireStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRQuestionnaireStatus([FHIRQuestionnaireStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRQuestionnaireStatus([FHIRQuestionnaireStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRQuestionnaireStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRQuestionnaireStatus($data[self::FIELD_STATUS])); } @@ -292,17 +310,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_SUBJECT_TYPE])) { foreach($data[self::FIELD_SUBJECT_TYPE] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCode) { $this->addSubjectType($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addSubjectType(new FHIRCode([FHIRCode::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addSubjectType(new FHIRCode([FHIRCode::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addSubjectType(new FHIRCode(array_merge($v, $ext[$i]))); + } } else { $this->addSubjectType(new FHIRCode($v)); } } } elseif ($data[self::FIELD_SUBJECT_TYPE] instanceof FHIRCode) { $this->addSubjectType($data[self::FIELD_SUBJECT_TYPE]); - } elseif ($ext && is_scalar($data[self::FIELD_SUBJECT_TYPE])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_SUBJECT_TYPE])) { $this->addSubjectType(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_SUBJECT_TYPE]] + $ext)); } else { $this->addSubjectType(new FHIRCode($data[self::FIELD_SUBJECT_TYPE])); @@ -314,17 +339,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_TELECOM])) { foreach($data[self::FIELD_TELECOM] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContactPoint) { $this->addTelecom($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addTelecom(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addTelecom(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addTelecom(new FHIRContactPoint(array_merge($v, $ext[$i]))); + } } else { $this->addTelecom(new FHIRContactPoint($v)); } } } elseif ($data[self::FIELD_TELECOM] instanceof FHIRContactPoint) { $this->addTelecom($data[self::FIELD_TELECOM]); - } elseif ($ext && is_scalar($data[self::FIELD_TELECOM])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_TELECOM])) { $this->addTelecom(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $data[self::FIELD_TELECOM]] + $ext)); } else { $this->addTelecom(new FHIRContactPoint($data[self::FIELD_TELECOM])); @@ -336,8 +368,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VERSION] instanceof FHIRString) { $this->setVersion($data[self::FIELD_VERSION]); - } elseif ($ext && is_scalar($data[self::FIELD_VERSION])) { - $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } else if (is_array($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString(array_merge($ext, $data[self::FIELD_VERSION]))); + } } else { $this->setVersion(new FHIRString($data[self::FIELD_VERSION])); } @@ -872,11 +908,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DATE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getGroup())) { $v->xmlSerialize($sxe->addChild(self::FIELD_GROUP, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -885,10 +919,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getPublisher())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PUBLISHER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } @@ -909,6 +943,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_TELECOM, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getVersion())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VERSION, null, $v->_getFHIRXMLNamespace())); } @@ -922,21 +957,59 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getDate())) { - $a[self::FIELD_DATE] = $v->getValue(); - $a[self::FIELD_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_DATE] = $v; + } } if (null !== ($v = $this->getGroup())) { $a[self::FIELD_GROUP] = $v; } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if (null !== ($v = $this->getPublisher())) { - $a[self::FIELD_PUBLISHER] = $v->getValue(); - $a[self::FIELD_PUBLISHER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PUBLISHER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PUBLISHER_EXT] = $enc; + } + } else { + $a[self::FIELD_PUBLISHER] = $v; + } } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if ([] !== ($vs = $this->getSubjectType())) { $a[self::FIELD_SUBJECT_TYPE] = []; @@ -944,16 +1017,48 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_SUBJECT_TYPE][] = $v->getValue(); - $a[self::FIELD_SUBJECT_TYPE_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SUBJECT_TYPE][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SUBJECT_TYPE_EXT][] = $enc; + } else { + $a[self::FIELD_SUBJECT_TYPE_EXT][] = null; + } + } else { + $a[self::FIELD_SUBJECT_TYPE][] = $v; + } } } if ([] !== ($vs = $this->getTelecom())) { - $a[self::FIELD_TELECOM] = $vs; + $a[self::FIELD_TELECOM] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TELECOM][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TELECOM_EXT][] = $enc; + } else { + $a[self::FIELD_TELECOM_EXT][] = null; + } + } else { + $a[self::FIELD_TELECOM][] = $v; + } + } } if (null !== ($v = $this->getVersion())) { - $a[self::FIELD_VERSION] = $v->getValue(); - $a[self::FIELD_VERSION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VERSION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VERSION_EXT] = $enc; + } + } else { + $a[self::FIELD_VERSION] = $v; + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRQuestionnaireResponse.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRQuestionnaireResponse.php index 54beb82db2..98b5b16b85 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRQuestionnaireResponse.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRQuestionnaireResponse.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -85,10 +85,6 @@ class FHIRQuestionnaireResponse extends FHIRDomainResource implements PHPFHIRCon { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_QUESTIONNAIRE_RESPONSE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_AUTHOR = 'author'; const FIELD_AUTHORED = 'authored'; const FIELD_AUTHORED_EXT = '_authored'; @@ -212,6 +208,9 @@ class FHIRQuestionnaireResponse extends FHIRDomainResource implements PHPFHIRCon */ protected $subject = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRQuestionnaireResponse Constructor * @param null|array $data @@ -241,8 +240,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_AUTHORED] instanceof FHIRDateTime) { $this->setAuthored($data[self::FIELD_AUTHORED]); - } elseif ($ext && is_scalar($data[self::FIELD_AUTHORED])) { - $this->setAuthored(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_AUTHORED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_AUTHORED])) { + $this->setAuthored(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_AUTHORED]] + $ext)); + } else if (is_array($data[self::FIELD_AUTHORED])) { + $this->setAuthored(new FHIRDateTime(array_merge($ext, $data[self::FIELD_AUTHORED]))); + } } else { $this->setAuthored(new FHIRDateTime($data[self::FIELD_AUTHORED])); } @@ -267,8 +270,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->setIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { - $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_IDENTIFIER]))); + } } else { $this->setIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); } @@ -293,8 +300,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRQuestionnaireResponseStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRQuestionnaireResponseStatus([FHIRQuestionnaireResponseStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRQuestionnaireResponseStatus([FHIRQuestionnaireResponseStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRQuestionnaireResponseStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRQuestionnaireResponseStatus($data[self::FIELD_STATUS])); } @@ -745,38 +756,30 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getAuthor())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AUTHOR, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getAuthored())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AUTHORED, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getEncounter())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ENCOUNTER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getGroup())) { $v->xmlSerialize($sxe->addChild(self::FIELD_GROUP, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getQuestionnaire())) { $v->xmlSerialize($sxe->addChild(self::FIELD_QUESTIONNAIRE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSource())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SOURCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSubject())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBJECT, null, $v->_getFHIRXMLNamespace())); } @@ -793,8 +796,15 @@ public function jsonSerialize() $a[self::FIELD_AUTHOR] = $v; } if (null !== ($v = $this->getAuthored())) { - $a[self::FIELD_AUTHORED] = $v->getValue(); - $a[self::FIELD_AUTHORED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_AUTHORED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_AUTHORED_EXT] = $enc; + } + } else { + $a[self::FIELD_AUTHORED] = $v; + } } if (null !== ($v = $this->getEncounter())) { $a[self::FIELD_ENCOUNTER] = $v; @@ -803,7 +813,15 @@ public function jsonSerialize() $a[self::FIELD_GROUP] = $v; } if (null !== ($v = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_IDENTIFIER] = $v; + } } if (null !== ($v = $this->getQuestionnaire())) { $a[self::FIELD_QUESTIONNAIRE] = $v; @@ -812,7 +830,15 @@ public function jsonSerialize() $a[self::FIELD_SOURCE] = $v; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getSubject())) { $a[self::FIELD_SUBJECT] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRReferralRequest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRReferralRequest.php index 8a400a0f8f..376f332bfb 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRReferralRequest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRReferralRequest.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -86,10 +86,6 @@ class FHIRReferralRequest extends FHIRDomainResource implements PHPFHIRContained { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_REFERRAL_REQUEST; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DATE = 'date'; const FIELD_DATE_EXT = '_date'; const FIELD_DATE_SENT = 'dateSent'; @@ -317,6 +313,9 @@ class FHIRReferralRequest extends FHIRDomainResource implements PHPFHIRContained */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRReferralRequest Constructor * @param null|array $data @@ -339,8 +338,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATE] instanceof FHIRDateTime) { $this->setDate($data[self::FIELD_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_DATE])) { - $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime(array_merge($ext, $data[self::FIELD_DATE]))); + } } else { $this->setDate(new FHIRDateTime($data[self::FIELD_DATE])); } @@ -351,8 +354,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATE_SENT] instanceof FHIRDateTime) { $this->setDateSent($data[self::FIELD_DATE_SENT]); - } elseif ($ext && is_scalar($data[self::FIELD_DATE_SENT])) { - $this->setDateSent(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE_SENT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATE_SENT])) { + $this->setDateSent(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE_SENT]] + $ext)); + } else if (is_array($data[self::FIELD_DATE_SENT])) { + $this->setDateSent(new FHIRDateTime(array_merge($ext, $data[self::FIELD_DATE_SENT]))); + } } else { $this->setDateSent(new FHIRDateTime($data[self::FIELD_DATE_SENT])); } @@ -363,8 +370,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -389,17 +400,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -429,6 +447,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_RECIPIENT])) { if (is_array($data[self::FIELD_RECIPIENT])) { foreach($data[self::FIELD_RECIPIENT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addRecipient($v); } else { @@ -451,6 +472,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SERVICE_REQUESTED])) { if (is_array($data[self::FIELD_SERVICE_REQUESTED])) { foreach($data[self::FIELD_SERVICE_REQUESTED] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addServiceRequested($v); } else { @@ -476,8 +500,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRReferralStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRReferralStatus([FHIRReferralStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRReferralStatus([FHIRReferralStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRReferralStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRReferralStatus($data[self::FIELD_STATUS])); } @@ -485,6 +513,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SUPPORTING_INFORMATION])) { if (is_array($data[self::FIELD_SUPPORTING_INFORMATION])) { foreach($data[self::FIELD_SUPPORTING_INFORMATION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addSupportingInformation($v); } else { @@ -1361,15 +1392,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESCRIPTION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getEncounter())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ENCOUNTER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getFulfillmentTime())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FULFILLMENT_TIME, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -1382,15 +1410,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getPatient())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATIENT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPriority())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PRIORITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getReason())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REASON, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getRecipient())) { foreach($vs as $v) { if (null === $v) { @@ -1403,7 +1428,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getRequester())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REQUESTER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getServiceRequested())) { foreach($vs as $v) { if (null === $v) { @@ -1416,11 +1440,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getSpecialty())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SPECIALTY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getSupportingInformation())) { foreach($vs as $v) { if (null === $v) { @@ -1443,16 +1465,37 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getDate())) { - $a[self::FIELD_DATE] = $v->getValue(); - $a[self::FIELD_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_DATE] = $v; + } } if (null !== ($v = $this->getDateSent())) { - $a[self::FIELD_DATE_SENT] = $v->getValue(); - $a[self::FIELD_DATE_SENT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATE_SENT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATE_SENT_EXT] = $enc; + } + } else { + $a[self::FIELD_DATE_SENT] = $v; + } } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if (null !== ($v = $this->getEncounter())) { $a[self::FIELD_ENCOUNTER] = $v; @@ -1461,7 +1504,23 @@ public function jsonSerialize() $a[self::FIELD_FULFILLMENT_TIME] = $v; } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if (null !== ($v = $this->getPatient())) { $a[self::FIELD_PATIENT] = $v; @@ -1485,7 +1544,15 @@ public function jsonSerialize() $a[self::FIELD_SPECIALTY] = $v; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if ([] !== ($vs = $this->getSupportingInformation())) { $a[self::FIELD_SUPPORTING_INFORMATION] = $vs; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRRelatedPerson.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRRelatedPerson.php index 1137ef3eb5..967c11a4df 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRRelatedPerson.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRRelatedPerson.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -90,10 +90,6 @@ class FHIRRelatedPerson extends FHIRDomainResource implements PHPFHIRContainedTy { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_RELATED_PERSON; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ADDRESS = 'address'; const FIELD_BIRTH_DATE = 'birthDate'; const FIELD_BIRTH_DATE_EXT = '_birthDate'; @@ -226,6 +222,9 @@ class FHIRRelatedPerson extends FHIRDomainResource implements PHPFHIRContainedTy */ protected $telecom = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRRelatedPerson Constructor * @param null|array $data @@ -245,6 +244,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ADDRESS])) { if (is_array($data[self::FIELD_ADDRESS])) { foreach($data[self::FIELD_ADDRESS] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRAddress) { $this->addAddress($v); } else { @@ -263,8 +265,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_BIRTH_DATE] instanceof FHIRDate) { $this->setBirthDate($data[self::FIELD_BIRTH_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_BIRTH_DATE])) { - $this->setBirthDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_BIRTH_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_BIRTH_DATE])) { + $this->setBirthDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_BIRTH_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_BIRTH_DATE])) { + $this->setBirthDate(new FHIRDate(array_merge($ext, $data[self::FIELD_BIRTH_DATE]))); + } } else { $this->setBirthDate(new FHIRDate($data[self::FIELD_BIRTH_DATE])); } @@ -275,8 +281,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_GENDER] instanceof FHIRCode) { $this->setGender($data[self::FIELD_GENDER]); - } elseif ($ext && is_scalar($data[self::FIELD_GENDER])) { - $this->setGender(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_GENDER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_GENDER])) { + $this->setGender(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_GENDER]] + $ext)); + } else if (is_array($data[self::FIELD_GENDER])) { + $this->setGender(new FHIRCode(array_merge($ext, $data[self::FIELD_GENDER]))); + } } else { $this->setGender(new FHIRCode($data[self::FIELD_GENDER])); } @@ -287,17 +297,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -327,6 +344,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PHOTO])) { if (is_array($data[self::FIELD_PHOTO])) { foreach($data[self::FIELD_PHOTO] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRAttachment) { $this->addPhoto($v); } else { @@ -352,17 +372,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_TELECOM])) { foreach($data[self::FIELD_TELECOM] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContactPoint) { $this->addTelecom($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addTelecom(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addTelecom(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addTelecom(new FHIRContactPoint(array_merge($v, $ext[$i]))); + } } else { $this->addTelecom(new FHIRContactPoint($v)); } } } elseif ($data[self::FIELD_TELECOM] instanceof FHIRContactPoint) { $this->addTelecom($data[self::FIELD_TELECOM]); - } elseif ($ext && is_scalar($data[self::FIELD_TELECOM])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_TELECOM])) { $this->addTelecom(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $data[self::FIELD_TELECOM]] + $ext)); } else { $this->addTelecom(new FHIRContactPoint($data[self::FIELD_TELECOM])); @@ -957,7 +984,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getAddress())) { foreach($vs as $v) { if (null === $v) { @@ -966,13 +992,13 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_ADDRESS, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getBirthDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_BIRTH_DATE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getGender())) { $v->xmlSerialize($sxe->addChild(self::FIELD_GENDER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -985,15 +1011,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NAME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPatient())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATIENT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getPhoto())) { foreach($vs as $v) { if (null === $v) { @@ -1006,7 +1029,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getRelationship())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RELATIONSHIP, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getTelecom())) { foreach($vs as $v) { if (null === $v) { @@ -1015,6 +1037,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_TELECOM, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } @@ -1028,15 +1051,45 @@ public function jsonSerialize() $a[self::FIELD_ADDRESS] = $vs; } if (null !== ($v = $this->getBirthDate())) { - $a[self::FIELD_BIRTH_DATE] = $v->getValue(); - $a[self::FIELD_BIRTH_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_BIRTH_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_BIRTH_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_BIRTH_DATE] = $v; + } } if (null !== ($v = $this->getGender())) { - $a[self::FIELD_GENDER] = $v->getValue(); - $a[self::FIELD_GENDER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_GENDER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_GENDER_EXT] = $enc; + } + } else { + $a[self::FIELD_GENDER] = $v; + } } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if (null !== ($v = $this->getName())) { $a[self::FIELD_NAME] = $v; @@ -1054,7 +1107,23 @@ public function jsonSerialize() $a[self::FIELD_RELATIONSHIP] = $v; } if ([] !== ($vs = $this->getTelecom())) { - $a[self::FIELD_TELECOM] = $vs; + $a[self::FIELD_TELECOM] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TELECOM][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TELECOM_EXT][] = $enc; + } else { + $a[self::FIELD_TELECOM_EXT][] = null; + } + } else { + $a[self::FIELD_TELECOM][] = $v; + } + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRRiskAssessment.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRRiskAssessment.php index b1f47a6bae..76616ee85d 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRRiskAssessment.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRRiskAssessment.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -85,10 +85,6 @@ class FHIRRiskAssessment extends FHIRDomainResource implements PHPFHIRContainedT { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_RISK_ASSESSMENT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_BASIS = 'basis'; const FIELD_CONDITION = 'condition'; const FIELD_DATE = 'date'; @@ -218,6 +214,9 @@ class FHIRRiskAssessment extends FHIRDomainResource implements PHPFHIRContainedT */ protected $subject = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRRiskAssessment Constructor * @param null|array $data @@ -237,6 +236,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_BASIS])) { if (is_array($data[self::FIELD_BASIS])) { foreach($data[self::FIELD_BASIS] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addBasis($v); } else { @@ -262,8 +264,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATE] instanceof FHIRDateTime) { $this->setDate($data[self::FIELD_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_DATE])) { - $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime(array_merge($ext, $data[self::FIELD_DATE]))); + } } else { $this->setDate(new FHIRDateTime($data[self::FIELD_DATE])); } @@ -281,8 +287,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->setIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { - $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_IDENTIFIER]))); + } } else { $this->setIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); } @@ -300,8 +310,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MITIGATION] instanceof FHIRString) { $this->setMitigation($data[self::FIELD_MITIGATION]); - } elseif ($ext && is_scalar($data[self::FIELD_MITIGATION])) { - $this->setMitigation(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_MITIGATION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MITIGATION])) { + $this->setMitigation(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_MITIGATION]] + $ext)); + } else if (is_array($data[self::FIELD_MITIGATION])) { + $this->setMitigation(new FHIRString(array_merge($ext, $data[self::FIELD_MITIGATION]))); + } } else { $this->setMitigation(new FHIRString($data[self::FIELD_MITIGATION])); } @@ -316,6 +330,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PREDICTION])) { if (is_array($data[self::FIELD_PREDICTION])) { foreach($data[self::FIELD_PREDICTION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRRiskAssessmentPrediction) { $this->addPrediction($v); } else { @@ -862,7 +879,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getBasis())) { foreach($vs as $v) { if (null === $v) { @@ -878,26 +894,21 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DATE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getEncounter())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ENCOUNTER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getMethod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_METHOD, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getMitigation())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MITIGATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPerformer())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PERFORMER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getPrediction())) { foreach($vs as $v) { if (null === $v) { @@ -926,21 +937,43 @@ public function jsonSerialize() $a[self::FIELD_CONDITION] = $v; } if (null !== ($v = $this->getDate())) { - $a[self::FIELD_DATE] = $v->getValue(); - $a[self::FIELD_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_DATE] = $v; + } } if (null !== ($v = $this->getEncounter())) { $a[self::FIELD_ENCOUNTER] = $v; } if (null !== ($v = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_IDENTIFIER] = $v; + } } if (null !== ($v = $this->getMethod())) { $a[self::FIELD_METHOD] = $v; } if (null !== ($v = $this->getMitigation())) { - $a[self::FIELD_MITIGATION] = $v->getValue(); - $a[self::FIELD_MITIGATION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MITIGATION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MITIGATION_EXT] = $enc; + } + } else { + $a[self::FIELD_MITIGATION] = $v; + } } if (null !== ($v = $this->getPerformer())) { $a[self::FIELD_PERFORMER] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRSchedule.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRSchedule.php index 4f4e4fca83..a819e014d9 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRSchedule.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRSchedule.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -83,10 +83,6 @@ class FHIRSchedule extends FHIRDomainResource implements PHPFHIRContainedTypeInt { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SCHEDULE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ACTOR = 'actor'; const FIELD_COMMENT = 'comment'; const FIELD_COMMENT_EXT = '_comment'; @@ -159,6 +155,9 @@ class FHIRSchedule extends FHIRDomainResource implements PHPFHIRContainedTypeInt */ protected $type = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSchedule Constructor * @param null|array $data @@ -188,8 +187,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_COMMENT] instanceof FHIRString) { $this->setComment($data[self::FIELD_COMMENT]); - } elseif ($ext && is_scalar($data[self::FIELD_COMMENT])) { - $this->setComment(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_COMMENT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_COMMENT])) { + $this->setComment(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_COMMENT]] + $ext)); + } else if (is_array($data[self::FIELD_COMMENT])) { + $this->setComment(new FHIRString(array_merge($ext, $data[self::FIELD_COMMENT]))); + } } else { $this->setComment(new FHIRString($data[self::FIELD_COMMENT])); } @@ -200,17 +203,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -226,6 +236,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_TYPE])) { if (is_array($data[self::FIELD_TYPE])) { foreach($data[self::FIELD_TYPE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addType($v); } else { @@ -599,14 +612,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getActor())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ACTOR, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getComment())) { $v->xmlSerialize($sxe->addChild(self::FIELD_COMMENT, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -619,7 +630,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getPlanningHorizon())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PLANNING_HORIZON, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getType())) { foreach($vs as $v) { if (null === $v) { @@ -628,6 +638,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } @@ -641,11 +652,34 @@ public function jsonSerialize() $a[self::FIELD_ACTOR] = $v; } if (null !== ($v = $this->getComment())) { - $a[self::FIELD_COMMENT] = $v->getValue(); - $a[self::FIELD_COMMENT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_COMMENT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_COMMENT_EXT] = $enc; + } + } else { + $a[self::FIELD_COMMENT] = $v; + } } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if (null !== ($v = $this->getPlanningHorizon())) { $a[self::FIELD_PLANNING_HORIZON] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRSearchParameter.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRSearchParameter.php index 998040e2c7..f0223fc6b2 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRSearchParameter.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRSearchParameter.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -86,10 +86,6 @@ class FHIRSearchParameter extends FHIRDomainResource implements PHPFHIRContained { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SEARCH_PARAMETER; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_BASE = 'base'; const FIELD_BASE_EXT = '_base'; const FIELD_CODE = 'code'; @@ -302,6 +298,9 @@ class FHIRSearchParameter extends FHIRDomainResource implements PHPFHIRContained */ protected $xpathUsage = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSearchParameter Constructor * @param null|array $data @@ -324,8 +323,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_BASE] instanceof FHIRCode) { $this->setBase($data[self::FIELD_BASE]); - } elseif ($ext && is_scalar($data[self::FIELD_BASE])) { - $this->setBase(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_BASE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_BASE])) { + $this->setBase(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_BASE]] + $ext)); + } else if (is_array($data[self::FIELD_BASE])) { + $this->setBase(new FHIRCode(array_merge($ext, $data[self::FIELD_BASE]))); + } } else { $this->setBase(new FHIRCode($data[self::FIELD_BASE])); } @@ -336,8 +339,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CODE] instanceof FHIRCode) { $this->setCode($data[self::FIELD_CODE]); - } elseif ($ext && is_scalar($data[self::FIELD_CODE])) { - $this->setCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_CODE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CODE])) { + $this->setCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_CODE]] + $ext)); + } else if (is_array($data[self::FIELD_CODE])) { + $this->setCode(new FHIRCode(array_merge($ext, $data[self::FIELD_CODE]))); + } } else { $this->setCode(new FHIRCode($data[self::FIELD_CODE])); } @@ -345,6 +352,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CONTACT])) { if (is_array($data[self::FIELD_CONTACT])) { foreach($data[self::FIELD_CONTACT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRSearchParameterContact) { $this->addContact($v); } else { @@ -363,8 +373,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATE] instanceof FHIRDateTime) { $this->setDate($data[self::FIELD_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_DATE])) { - $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime(array_merge($ext, $data[self::FIELD_DATE]))); + } } else { $this->setDate(new FHIRDateTime($data[self::FIELD_DATE])); } @@ -375,8 +389,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -387,8 +405,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EXPERIMENTAL] instanceof FHIRBoolean) { $this->setExperimental($data[self::FIELD_EXPERIMENTAL]); - } elseif ($ext && is_scalar($data[self::FIELD_EXPERIMENTAL])) { - $this->setExperimental(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_EXPERIMENTAL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EXPERIMENTAL])) { + $this->setExperimental(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_EXPERIMENTAL]] + $ext)); + } else if (is_array($data[self::FIELD_EXPERIMENTAL])) { + $this->setExperimental(new FHIRBoolean(array_merge($ext, $data[self::FIELD_EXPERIMENTAL]))); + } } else { $this->setExperimental(new FHIRBoolean($data[self::FIELD_EXPERIMENTAL])); } @@ -399,8 +421,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -411,8 +437,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PUBLISHER] instanceof FHIRString) { $this->setPublisher($data[self::FIELD_PUBLISHER]); - } elseif ($ext && is_scalar($data[self::FIELD_PUBLISHER])) { - $this->setPublisher(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PUBLISHER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PUBLISHER])) { + $this->setPublisher(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PUBLISHER]] + $ext)); + } else if (is_array($data[self::FIELD_PUBLISHER])) { + $this->setPublisher(new FHIRString(array_merge($ext, $data[self::FIELD_PUBLISHER]))); + } } else { $this->setPublisher(new FHIRString($data[self::FIELD_PUBLISHER])); } @@ -423,8 +453,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_REQUIREMENTS] instanceof FHIRString) { $this->setRequirements($data[self::FIELD_REQUIREMENTS]); - } elseif ($ext && is_scalar($data[self::FIELD_REQUIREMENTS])) { - $this->setRequirements(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_REQUIREMENTS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_REQUIREMENTS])) { + $this->setRequirements(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_REQUIREMENTS]] + $ext)); + } else if (is_array($data[self::FIELD_REQUIREMENTS])) { + $this->setRequirements(new FHIRString(array_merge($ext, $data[self::FIELD_REQUIREMENTS]))); + } } else { $this->setRequirements(new FHIRString($data[self::FIELD_REQUIREMENTS])); } @@ -435,8 +469,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRCode) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRCode(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRCode($data[self::FIELD_STATUS])); } @@ -447,17 +485,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_TARGET])) { foreach($data[self::FIELD_TARGET] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCode) { $this->addTarget($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addTarget(new FHIRCode([FHIRCode::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addTarget(new FHIRCode([FHIRCode::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addTarget(new FHIRCode(array_merge($v, $ext[$i]))); + } } else { $this->addTarget(new FHIRCode($v)); } } } elseif ($data[self::FIELD_TARGET] instanceof FHIRCode) { $this->addTarget($data[self::FIELD_TARGET]); - } elseif ($ext && is_scalar($data[self::FIELD_TARGET])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_TARGET])) { $this->addTarget(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_TARGET]] + $ext)); } else { $this->addTarget(new FHIRCode($data[self::FIELD_TARGET])); @@ -469,8 +514,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TYPE] instanceof FHIRCode) { $this->setType($data[self::FIELD_TYPE]); - } elseif ($ext && is_scalar($data[self::FIELD_TYPE])) { - $this->setType(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TYPE])) { + $this->setType(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } else if (is_array($data[self::FIELD_TYPE])) { + $this->setType(new FHIRCode(array_merge($ext, $data[self::FIELD_TYPE]))); + } } else { $this->setType(new FHIRCode($data[self::FIELD_TYPE])); } @@ -481,8 +530,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_URL] instanceof FHIRUri) { $this->setUrl($data[self::FIELD_URL]); - } elseif ($ext && is_scalar($data[self::FIELD_URL])) { - $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } else if (is_array($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri(array_merge($ext, $data[self::FIELD_URL]))); + } } else { $this->setUrl(new FHIRUri($data[self::FIELD_URL])); } @@ -493,8 +546,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_XPATH] instanceof FHIRString) { $this->setXpath($data[self::FIELD_XPATH]); - } elseif ($ext && is_scalar($data[self::FIELD_XPATH])) { - $this->setXpath(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_XPATH]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_XPATH])) { + $this->setXpath(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_XPATH]] + $ext)); + } else if (is_array($data[self::FIELD_XPATH])) { + $this->setXpath(new FHIRString(array_merge($ext, $data[self::FIELD_XPATH]))); + } } else { $this->setXpath(new FHIRString($data[self::FIELD_XPATH])); } @@ -505,8 +562,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_XPATH_USAGE] instanceof FHIRXPathUsageType) { $this->setXpathUsage($data[self::FIELD_XPATH_USAGE]); - } elseif ($ext && is_scalar($data[self::FIELD_XPATH_USAGE])) { - $this->setXpathUsage(new FHIRXPathUsageType([FHIRXPathUsageType::FIELD_VALUE => $data[self::FIELD_XPATH_USAGE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_XPATH_USAGE])) { + $this->setXpathUsage(new FHIRXPathUsageType([FHIRXPathUsageType::FIELD_VALUE => $data[self::FIELD_XPATH_USAGE]] + $ext)); + } else if (is_array($data[self::FIELD_XPATH_USAGE])) { + $this->setXpathUsage(new FHIRXPathUsageType(array_merge($ext, $data[self::FIELD_XPATH_USAGE]))); + } } else { $this->setXpathUsage(new FHIRXPathUsageType($data[self::FIELD_XPATH_USAGE])); } @@ -1354,7 +1415,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getContact())) { foreach($vs as $v) { if (null === $v) { @@ -1363,6 +1423,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_CONTACT, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DATE, null, $v->_getFHIRXMLNamespace())); } @@ -1392,6 +1453,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_TARGET, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -1401,7 +1463,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getXpath())) { $v->xmlSerialize($sxe->addChild(self::FIELD_XPATH, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getXpathUsage())) { $v->xmlSerialize($sxe->addChild(self::FIELD_XPATH_USAGE, null, $v->_getFHIRXMLNamespace())); } @@ -1415,43 +1476,106 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getBase())) { - $a[self::FIELD_BASE] = $v->getValue(); - $a[self::FIELD_BASE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_BASE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_BASE_EXT] = $enc; + } + } else { + $a[self::FIELD_BASE] = $v; + } } if (null !== ($v = $this->getCode())) { - $a[self::FIELD_CODE] = $v->getValue(); - $a[self::FIELD_CODE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CODE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CODE_EXT] = $enc; + } + } else { + $a[self::FIELD_CODE] = $v; + } } if ([] !== ($vs = $this->getContact())) { $a[self::FIELD_CONTACT] = $vs; } if (null !== ($v = $this->getDate())) { - $a[self::FIELD_DATE] = $v->getValue(); - $a[self::FIELD_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_DATE] = $v; + } } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if (null !== ($v = $this->getExperimental())) { - $a[self::FIELD_EXPERIMENTAL] = $v->getValue(); - $a[self::FIELD_EXPERIMENTAL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EXPERIMENTAL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EXPERIMENTAL_EXT] = $enc; + } + } else { + $a[self::FIELD_EXPERIMENTAL] = $v; + } } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if (null !== ($v = $this->getPublisher())) { - $a[self::FIELD_PUBLISHER] = $v->getValue(); - $a[self::FIELD_PUBLISHER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PUBLISHER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PUBLISHER_EXT] = $enc; + } + } else { + $a[self::FIELD_PUBLISHER] = $v; + } } if (null !== ($v = $this->getRequirements())) { - $a[self::FIELD_REQUIREMENTS] = $v->getValue(); - $a[self::FIELD_REQUIREMENTS_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_REQUIREMENTS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_REQUIREMENTS_EXT] = $enc; + } + } else { + $a[self::FIELD_REQUIREMENTS] = $v; + } } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v->getValue(); - $a[self::FIELD_STATUS_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if ([] !== ($vs = $this->getTarget())) { $a[self::FIELD_TARGET] = []; @@ -1459,24 +1583,62 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_TARGET][] = $v->getValue(); - $a[self::FIELD_TARGET_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TARGET][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TARGET_EXT][] = $enc; + } else { + $a[self::FIELD_TARGET_EXT][] = null; + } + } else { + $a[self::FIELD_TARGET][] = $v; + } } } if (null !== ($v = $this->getType())) { - $a[self::FIELD_TYPE] = $v->getValue(); - $a[self::FIELD_TYPE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TYPE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TYPE_EXT] = $enc; + } + } else { + $a[self::FIELD_TYPE] = $v; + } } if (null !== ($v = $this->getUrl())) { - $a[self::FIELD_URL] = $v->getValue(); - $a[self::FIELD_URL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_URL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_URL_EXT] = $enc; + } + } else { + $a[self::FIELD_URL] = $v; + } } if (null !== ($v = $this->getXpath())) { - $a[self::FIELD_XPATH] = $v->getValue(); - $a[self::FIELD_XPATH_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_XPATH] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_XPATH_EXT] = $enc; + } + } else { + $a[self::FIELD_XPATH] = $v; + } } if (null !== ($v = $this->getXpathUsage())) { - $a[self::FIELD_XPATH_USAGE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_XPATH_USAGE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_XPATH_USAGE_EXT] = $enc; + } + } else { + $a[self::FIELD_XPATH_USAGE] = $v; + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRSlot.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRSlot.php index 33b4243f1a..df4b30c028 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRSlot.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRSlot.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -85,10 +85,6 @@ class FHIRSlot extends FHIRDomainResource implements PHPFHIRContainedTypeInterfa { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SLOT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_COMMENT = 'comment'; const FIELD_COMMENT_EXT = '_comment'; const FIELD_END = 'end'; @@ -200,6 +196,9 @@ class FHIRSlot extends FHIRDomainResource implements PHPFHIRContainedTypeInterfa */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSlot Constructor * @param null|array $data @@ -222,8 +221,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_COMMENT] instanceof FHIRString) { $this->setComment($data[self::FIELD_COMMENT]); - } elseif ($ext && is_scalar($data[self::FIELD_COMMENT])) { - $this->setComment(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_COMMENT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_COMMENT])) { + $this->setComment(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_COMMENT]] + $ext)); + } else if (is_array($data[self::FIELD_COMMENT])) { + $this->setComment(new FHIRString(array_merge($ext, $data[self::FIELD_COMMENT]))); + } } else { $this->setComment(new FHIRString($data[self::FIELD_COMMENT])); } @@ -234,8 +237,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_END] instanceof FHIRInstant) { $this->setEnd($data[self::FIELD_END]); - } elseif ($ext && is_scalar($data[self::FIELD_END])) { - $this->setEnd(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_END]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_END])) { + $this->setEnd(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_END]] + $ext)); + } else if (is_array($data[self::FIELD_END])) { + $this->setEnd(new FHIRInstant(array_merge($ext, $data[self::FIELD_END]))); + } } else { $this->setEnd(new FHIRInstant($data[self::FIELD_END])); } @@ -246,8 +253,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_FREE_BUSY_TYPE] instanceof FHIRSlotStatus) { $this->setFreeBusyType($data[self::FIELD_FREE_BUSY_TYPE]); - } elseif ($ext && is_scalar($data[self::FIELD_FREE_BUSY_TYPE])) { - $this->setFreeBusyType(new FHIRSlotStatus([FHIRSlotStatus::FIELD_VALUE => $data[self::FIELD_FREE_BUSY_TYPE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_FREE_BUSY_TYPE])) { + $this->setFreeBusyType(new FHIRSlotStatus([FHIRSlotStatus::FIELD_VALUE => $data[self::FIELD_FREE_BUSY_TYPE]] + $ext)); + } else if (is_array($data[self::FIELD_FREE_BUSY_TYPE])) { + $this->setFreeBusyType(new FHIRSlotStatus(array_merge($ext, $data[self::FIELD_FREE_BUSY_TYPE]))); + } } else { $this->setFreeBusyType(new FHIRSlotStatus($data[self::FIELD_FREE_BUSY_TYPE])); } @@ -258,17 +269,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -280,8 +298,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_OVERBOOKED] instanceof FHIRBoolean) { $this->setOverbooked($data[self::FIELD_OVERBOOKED]); - } elseif ($ext && is_scalar($data[self::FIELD_OVERBOOKED])) { - $this->setOverbooked(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_OVERBOOKED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_OVERBOOKED])) { + $this->setOverbooked(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_OVERBOOKED]] + $ext)); + } else if (is_array($data[self::FIELD_OVERBOOKED])) { + $this->setOverbooked(new FHIRBoolean(array_merge($ext, $data[self::FIELD_OVERBOOKED]))); + } } else { $this->setOverbooked(new FHIRBoolean($data[self::FIELD_OVERBOOKED])); } @@ -299,8 +321,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_START] instanceof FHIRInstant) { $this->setStart($data[self::FIELD_START]); - } elseif ($ext && is_scalar($data[self::FIELD_START])) { - $this->setStart(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_START]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_START])) { + $this->setStart(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_START]] + $ext)); + } else if (is_array($data[self::FIELD_START])) { + $this->setStart(new FHIRInstant(array_merge($ext, $data[self::FIELD_START]))); + } } else { $this->setStart(new FHIRInstant($data[self::FIELD_START])); } @@ -779,11 +805,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getEnd())) { $v->xmlSerialize($sxe->addChild(self::FIELD_END, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getFreeBusyType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FREE_BUSY_TYPE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -792,17 +816,16 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getOverbooked())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OVERBOOKED, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSchedule())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SCHEDULE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getStart())) { $v->xmlSerialize($sxe->addChild(self::FIELD_START, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -816,29 +839,81 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getComment())) { - $a[self::FIELD_COMMENT] = $v->getValue(); - $a[self::FIELD_COMMENT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_COMMENT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_COMMENT_EXT] = $enc; + } + } else { + $a[self::FIELD_COMMENT] = $v; + } } if (null !== ($v = $this->getEnd())) { - $a[self::FIELD_END] = $v->getValue(); - $a[self::FIELD_END_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_END] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_END_EXT] = $enc; + } + } else { + $a[self::FIELD_END] = $v; + } } if (null !== ($v = $this->getFreeBusyType())) { - $a[self::FIELD_FREE_BUSY_TYPE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FREE_BUSY_TYPE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FREE_BUSY_TYPE_EXT] = $enc; + } + } else { + $a[self::FIELD_FREE_BUSY_TYPE] = $v; + } } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if (null !== ($v = $this->getOverbooked())) { - $a[self::FIELD_OVERBOOKED] = $v->getValue(); - $a[self::FIELD_OVERBOOKED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_OVERBOOKED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_OVERBOOKED_EXT] = $enc; + } + } else { + $a[self::FIELD_OVERBOOKED] = $v; + } } if (null !== ($v = $this->getSchedule())) { $a[self::FIELD_SCHEDULE] = $v; } if (null !== ($v = $this->getStart())) { - $a[self::FIELD_START] = $v->getValue(); - $a[self::FIELD_START_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_START] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_START_EXT] = $enc; + } + } else { + $a[self::FIELD_START] = $v; + } } if (null !== ($v = $this->getType())) { $a[self::FIELD_TYPE] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRSpecimen.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRSpecimen.php index 9ef5d56d76..30c870c856 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRSpecimen.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRSpecimen.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -86,10 +86,6 @@ class FHIRSpecimen extends FHIRDomainResource implements PHPFHIRContainedTypeInt { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SPECIMEN; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ACCESSION_IDENTIFIER = 'accessionIdentifier'; const FIELD_ACCESSION_IDENTIFIER_EXT = '_accessionIdentifier'; const FIELD_COLLECTION = 'collection'; @@ -217,6 +213,9 @@ class FHIRSpecimen extends FHIRDomainResource implements PHPFHIRContainedTypeInt */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSpecimen Constructor * @param null|array $data @@ -239,8 +238,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ACCESSION_IDENTIFIER] instanceof FHIRIdentifier) { $this->setAccessionIdentifier($data[self::FIELD_ACCESSION_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_ACCESSION_IDENTIFIER])) { - $this->setAccessionIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_ACCESSION_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ACCESSION_IDENTIFIER])) { + $this->setAccessionIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_ACCESSION_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_ACCESSION_IDENTIFIER])) { + $this->setAccessionIdentifier(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_ACCESSION_IDENTIFIER]))); + } } else { $this->setAccessionIdentifier(new FHIRIdentifier($data[self::FIELD_ACCESSION_IDENTIFIER])); } @@ -255,6 +258,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CONTAINER])) { if (is_array($data[self::FIELD_CONTAINER])) { foreach($data[self::FIELD_CONTAINER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRSpecimenContainer) { $this->addContainer($v); } else { @@ -273,17 +279,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -292,6 +305,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PARENT])) { if (is_array($data[self::FIELD_PARENT])) { foreach($data[self::FIELD_PARENT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addParent($v); } else { @@ -310,8 +326,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_RECEIVED_TIME] instanceof FHIRDateTime) { $this->setReceivedTime($data[self::FIELD_RECEIVED_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_RECEIVED_TIME])) { - $this->setReceivedTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_RECEIVED_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_RECEIVED_TIME])) { + $this->setReceivedTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_RECEIVED_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_RECEIVED_TIME])) { + $this->setReceivedTime(new FHIRDateTime(array_merge($ext, $data[self::FIELD_RECEIVED_TIME]))); + } } else { $this->setReceivedTime(new FHIRDateTime($data[self::FIELD_RECEIVED_TIME])); } @@ -322,8 +342,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRSpecimenStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRSpecimenStatus([FHIRSpecimenStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRSpecimenStatus([FHIRSpecimenStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRSpecimenStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRSpecimenStatus($data[self::FIELD_STATUS])); } @@ -338,6 +362,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_TREATMENT])) { if (is_array($data[self::FIELD_TREATMENT])) { foreach($data[self::FIELD_TREATMENT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRSpecimenTreatment) { $this->addTreatment($v); } else { @@ -921,15 +948,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getAccessionIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ACCESSION_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getCollection())) { $v->xmlSerialize($sxe->addChild(self::FIELD_COLLECTION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getContainer())) { foreach($vs as $v) { if (null === $v) { @@ -956,18 +980,16 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_PARENT, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getReceivedTime())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RECEIVED_TIME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSubject())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBJECT, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getTreatment())) { foreach($vs as $v) { if (null === $v) { @@ -990,7 +1012,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getAccessionIdentifier())) { - $a[self::FIELD_ACCESSION_IDENTIFIER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ACCESSION_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ACCESSION_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_ACCESSION_IDENTIFIER] = $v; + } } if (null !== ($v = $this->getCollection())) { $a[self::FIELD_COLLECTION] = $v; @@ -999,17 +1029,48 @@ public function jsonSerialize() $a[self::FIELD_CONTAINER] = $vs; } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if ([] !== ($vs = $this->getParent())) { $a[self::FIELD_PARENT] = $vs; } if (null !== ($v = $this->getReceivedTime())) { - $a[self::FIELD_RECEIVED_TIME] = $v->getValue(); - $a[self::FIELD_RECEIVED_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_RECEIVED_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_RECEIVED_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_RECEIVED_TIME] = $v; + } } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getSubject())) { $a[self::FIELD_SUBJECT] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRStructureDefinition.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRStructureDefinition.php index b43be8aeb9..22ae382af3 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRStructureDefinition.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRStructureDefinition.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -95,10 +95,6 @@ class FHIRStructureDefinition extends FHIRDomainResource implements PHPFHIRConta { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_STRUCTURE_DEFINITION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ABSTRACT = 'abstract'; const FIELD_ABSTRACT_EXT = '_abstract'; const FIELD_BASE = 'base'; @@ -456,6 +452,9 @@ class FHIRStructureDefinition extends FHIRDomainResource implements PHPFHIRConta */ protected $version = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRStructureDefinition Constructor * @param null|array $data @@ -478,8 +477,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ABSTRACT] instanceof FHIRBoolean) { $this->setAbstract($data[self::FIELD_ABSTRACT]); - } elseif ($ext && is_scalar($data[self::FIELD_ABSTRACT])) { - $this->setAbstract(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_ABSTRACT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ABSTRACT])) { + $this->setAbstract(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_ABSTRACT]] + $ext)); + } else if (is_array($data[self::FIELD_ABSTRACT])) { + $this->setAbstract(new FHIRBoolean(array_merge($ext, $data[self::FIELD_ABSTRACT]))); + } } else { $this->setAbstract(new FHIRBoolean($data[self::FIELD_ABSTRACT])); } @@ -490,8 +493,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_BASE] instanceof FHIRUri) { $this->setBase($data[self::FIELD_BASE]); - } elseif ($ext && is_scalar($data[self::FIELD_BASE])) { - $this->setBase(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_BASE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_BASE])) { + $this->setBase(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_BASE]] + $ext)); + } else if (is_array($data[self::FIELD_BASE])) { + $this->setBase(new FHIRUri(array_merge($ext, $data[self::FIELD_BASE]))); + } } else { $this->setBase(new FHIRUri($data[self::FIELD_BASE])); } @@ -499,6 +506,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CODE])) { if (is_array($data[self::FIELD_CODE])) { foreach($data[self::FIELD_CODE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCoding) { $this->addCode($v); } else { @@ -517,8 +527,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CONSTRAINED_TYPE] instanceof FHIRCode) { $this->setConstrainedType($data[self::FIELD_CONSTRAINED_TYPE]); - } elseif ($ext && is_scalar($data[self::FIELD_CONSTRAINED_TYPE])) { - $this->setConstrainedType(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_CONSTRAINED_TYPE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CONSTRAINED_TYPE])) { + $this->setConstrainedType(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_CONSTRAINED_TYPE]] + $ext)); + } else if (is_array($data[self::FIELD_CONSTRAINED_TYPE])) { + $this->setConstrainedType(new FHIRCode(array_merge($ext, $data[self::FIELD_CONSTRAINED_TYPE]))); + } } else { $this->setConstrainedType(new FHIRCode($data[self::FIELD_CONSTRAINED_TYPE])); } @@ -526,6 +540,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CONTACT])) { if (is_array($data[self::FIELD_CONTACT])) { foreach($data[self::FIELD_CONTACT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRStructureDefinitionContact) { $this->addContact($v); } else { @@ -544,17 +561,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_CONTEXT])) { foreach($data[self::FIELD_CONTEXT] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRString) { $this->addContext($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addContext(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addContext(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addContext(new FHIRString(array_merge($v, $ext[$i]))); + } } else { $this->addContext(new FHIRString($v)); } } } elseif ($data[self::FIELD_CONTEXT] instanceof FHIRString) { $this->addContext($data[self::FIELD_CONTEXT]); - } elseif ($ext && is_scalar($data[self::FIELD_CONTEXT])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_CONTEXT])) { $this->addContext(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_CONTEXT]] + $ext)); } else { $this->addContext(new FHIRString($data[self::FIELD_CONTEXT])); @@ -566,8 +590,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CONTEXT_TYPE] instanceof FHIRExtensionContext) { $this->setContextType($data[self::FIELD_CONTEXT_TYPE]); - } elseif ($ext && is_scalar($data[self::FIELD_CONTEXT_TYPE])) { - $this->setContextType(new FHIRExtensionContext([FHIRExtensionContext::FIELD_VALUE => $data[self::FIELD_CONTEXT_TYPE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CONTEXT_TYPE])) { + $this->setContextType(new FHIRExtensionContext([FHIRExtensionContext::FIELD_VALUE => $data[self::FIELD_CONTEXT_TYPE]] + $ext)); + } else if (is_array($data[self::FIELD_CONTEXT_TYPE])) { + $this->setContextType(new FHIRExtensionContext(array_merge($ext, $data[self::FIELD_CONTEXT_TYPE]))); + } } else { $this->setContextType(new FHIRExtensionContext($data[self::FIELD_CONTEXT_TYPE])); } @@ -578,8 +606,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_COPYRIGHT] instanceof FHIRString) { $this->setCopyright($data[self::FIELD_COPYRIGHT]); - } elseif ($ext && is_scalar($data[self::FIELD_COPYRIGHT])) { - $this->setCopyright(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_COPYRIGHT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_COPYRIGHT])) { + $this->setCopyright(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_COPYRIGHT]] + $ext)); + } else if (is_array($data[self::FIELD_COPYRIGHT])) { + $this->setCopyright(new FHIRString(array_merge($ext, $data[self::FIELD_COPYRIGHT]))); + } } else { $this->setCopyright(new FHIRString($data[self::FIELD_COPYRIGHT])); } @@ -590,8 +622,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATE] instanceof FHIRDateTime) { $this->setDate($data[self::FIELD_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_DATE])) { - $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime(array_merge($ext, $data[self::FIELD_DATE]))); + } } else { $this->setDate(new FHIRDateTime($data[self::FIELD_DATE])); } @@ -602,8 +638,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -621,8 +661,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DISPLAY] instanceof FHIRString) { $this->setDisplay($data[self::FIELD_DISPLAY]); - } elseif ($ext && is_scalar($data[self::FIELD_DISPLAY])) { - $this->setDisplay(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DISPLAY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DISPLAY])) { + $this->setDisplay(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DISPLAY]] + $ext)); + } else if (is_array($data[self::FIELD_DISPLAY])) { + $this->setDisplay(new FHIRString(array_merge($ext, $data[self::FIELD_DISPLAY]))); + } } else { $this->setDisplay(new FHIRString($data[self::FIELD_DISPLAY])); } @@ -633,8 +677,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EXPERIMENTAL] instanceof FHIRBoolean) { $this->setExperimental($data[self::FIELD_EXPERIMENTAL]); - } elseif ($ext && is_scalar($data[self::FIELD_EXPERIMENTAL])) { - $this->setExperimental(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_EXPERIMENTAL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EXPERIMENTAL])) { + $this->setExperimental(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_EXPERIMENTAL]] + $ext)); + } else if (is_array($data[self::FIELD_EXPERIMENTAL])) { + $this->setExperimental(new FHIRBoolean(array_merge($ext, $data[self::FIELD_EXPERIMENTAL]))); + } } else { $this->setExperimental(new FHIRBoolean($data[self::FIELD_EXPERIMENTAL])); } @@ -645,8 +693,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_FHIR_VERSION] instanceof FHIRId) { $this->setFhirVersion($data[self::FIELD_FHIR_VERSION]); - } elseif ($ext && is_scalar($data[self::FIELD_FHIR_VERSION])) { - $this->setFhirVersion(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_FHIR_VERSION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_FHIR_VERSION])) { + $this->setFhirVersion(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_FHIR_VERSION]] + $ext)); + } else if (is_array($data[self::FIELD_FHIR_VERSION])) { + $this->setFhirVersion(new FHIRId(array_merge($ext, $data[self::FIELD_FHIR_VERSION]))); + } } else { $this->setFhirVersion(new FHIRId($data[self::FIELD_FHIR_VERSION])); } @@ -657,17 +709,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -679,8 +738,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_KIND] instanceof FHIRStructureDefinitionKind) { $this->setKind($data[self::FIELD_KIND]); - } elseif ($ext && is_scalar($data[self::FIELD_KIND])) { - $this->setKind(new FHIRStructureDefinitionKind([FHIRStructureDefinitionKind::FIELD_VALUE => $data[self::FIELD_KIND]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_KIND])) { + $this->setKind(new FHIRStructureDefinitionKind([FHIRStructureDefinitionKind::FIELD_VALUE => $data[self::FIELD_KIND]] + $ext)); + } else if (is_array($data[self::FIELD_KIND])) { + $this->setKind(new FHIRStructureDefinitionKind(array_merge($ext, $data[self::FIELD_KIND]))); + } } else { $this->setKind(new FHIRStructureDefinitionKind($data[self::FIELD_KIND])); } @@ -688,6 +751,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_MAPPING])) { if (is_array($data[self::FIELD_MAPPING])) { foreach($data[self::FIELD_MAPPING] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRStructureDefinitionMapping) { $this->addMapping($v); } else { @@ -706,8 +772,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -718,8 +788,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PUBLISHER] instanceof FHIRString) { $this->setPublisher($data[self::FIELD_PUBLISHER]); - } elseif ($ext && is_scalar($data[self::FIELD_PUBLISHER])) { - $this->setPublisher(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PUBLISHER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PUBLISHER])) { + $this->setPublisher(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PUBLISHER]] + $ext)); + } else if (is_array($data[self::FIELD_PUBLISHER])) { + $this->setPublisher(new FHIRString(array_merge($ext, $data[self::FIELD_PUBLISHER]))); + } } else { $this->setPublisher(new FHIRString($data[self::FIELD_PUBLISHER])); } @@ -730,8 +804,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_REQUIREMENTS] instanceof FHIRString) { $this->setRequirements($data[self::FIELD_REQUIREMENTS]); - } elseif ($ext && is_scalar($data[self::FIELD_REQUIREMENTS])) { - $this->setRequirements(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_REQUIREMENTS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_REQUIREMENTS])) { + $this->setRequirements(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_REQUIREMENTS]] + $ext)); + } else if (is_array($data[self::FIELD_REQUIREMENTS])) { + $this->setRequirements(new FHIRString(array_merge($ext, $data[self::FIELD_REQUIREMENTS]))); + } } else { $this->setRequirements(new FHIRString($data[self::FIELD_REQUIREMENTS])); } @@ -749,8 +827,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRCode) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRCode(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRCode($data[self::FIELD_STATUS])); } @@ -761,8 +843,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_URL] instanceof FHIRUri) { $this->setUrl($data[self::FIELD_URL]); - } elseif ($ext && is_scalar($data[self::FIELD_URL])) { - $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } else if (is_array($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri(array_merge($ext, $data[self::FIELD_URL]))); + } } else { $this->setUrl(new FHIRUri($data[self::FIELD_URL])); } @@ -770,6 +856,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_USE_CONTEXT])) { if (is_array($data[self::FIELD_USE_CONTEXT])) { foreach($data[self::FIELD_USE_CONTEXT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addUseContext($v); } else { @@ -788,8 +877,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VERSION] instanceof FHIRString) { $this->setVersion($data[self::FIELD_VERSION]); - } elseif ($ext && is_scalar($data[self::FIELD_VERSION])) { - $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } else if (is_array($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString(array_merge($ext, $data[self::FIELD_VERSION]))); + } } else { $this->setVersion(new FHIRString($data[self::FIELD_VERSION])); } @@ -2160,7 +2253,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getBase())) { $v->xmlSerialize($sxe->addChild(self::FIELD_BASE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getCode())) { foreach($vs as $v) { if (null === $v) { @@ -2169,10 +2261,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getConstrainedType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CONSTRAINED_TYPE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getContact())) { foreach($vs as $v) { if (null === $v) { @@ -2181,6 +2273,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_CONTACT, null, $v->_getFHIRXMLNamespace())); } } + if ([] !== ($vs = $this->getContext())) { foreach($vs as $v) { if (null === $v) { @@ -2202,7 +2295,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESCRIPTION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDifferential())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DIFFERENTIAL, null, $v->_getFHIRXMLNamespace())); } @@ -2215,7 +2307,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getFhirVersion())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FHIR_VERSION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -2228,7 +2319,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getKind())) { $v->xmlSerialize($sxe->addChild(self::FIELD_KIND, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getMapping())) { foreach($vs as $v) { if (null === $v) { @@ -2237,6 +2327,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_MAPPING, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NAME, null, $v->_getFHIRXMLNamespace())); } @@ -2246,7 +2337,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getRequirements())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REQUIREMENTS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSnapshot())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SNAPSHOT, null, $v->_getFHIRXMLNamespace())); } @@ -2256,7 +2346,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getUrl())) { $v->xmlSerialize($sxe->addChild(self::FIELD_URL, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getUseContext())) { foreach($vs as $v) { if (null === $v) { @@ -2265,6 +2354,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_USE_CONTEXT, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getVersion())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VERSION, null, $v->_getFHIRXMLNamespace())); } @@ -2278,19 +2368,40 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getAbstract())) { - $a[self::FIELD_ABSTRACT] = $v->getValue(); - $a[self::FIELD_ABSTRACT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ABSTRACT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ABSTRACT_EXT] = $enc; + } + } else { + $a[self::FIELD_ABSTRACT] = $v; + } } if (null !== ($v = $this->getBase())) { - $a[self::FIELD_BASE] = $v->getValue(); - $a[self::FIELD_BASE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_BASE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_BASE_EXT] = $enc; + } + } else { + $a[self::FIELD_BASE] = $v; + } } if ([] !== ($vs = $this->getCode())) { $a[self::FIELD_CODE] = $vs; } if (null !== ($v = $this->getConstrainedType())) { - $a[self::FIELD_CONSTRAINED_TYPE] = $v->getValue(); - $a[self::FIELD_CONSTRAINED_TYPE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CONSTRAINED_TYPE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CONSTRAINED_TYPE_EXT] = $enc; + } + } else { + $a[self::FIELD_CONSTRAINED_TYPE] = $v; + } } if ([] !== ($vs = $this->getContact())) { $a[self::FIELD_CONTACT] = $vs; @@ -2301,78 +2412,203 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_CONTEXT][] = $v->getValue(); - $a[self::FIELD_CONTEXT_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CONTEXT][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CONTEXT_EXT][] = $enc; + } else { + $a[self::FIELD_CONTEXT_EXT][] = null; + } + } else { + $a[self::FIELD_CONTEXT][] = $v; + } } } if (null !== ($v = $this->getContextType())) { - $a[self::FIELD_CONTEXT_TYPE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CONTEXT_TYPE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CONTEXT_TYPE_EXT] = $enc; + } + } else { + $a[self::FIELD_CONTEXT_TYPE] = $v; + } } if (null !== ($v = $this->getCopyright())) { - $a[self::FIELD_COPYRIGHT] = $v->getValue(); - $a[self::FIELD_COPYRIGHT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_COPYRIGHT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_COPYRIGHT_EXT] = $enc; + } + } else { + $a[self::FIELD_COPYRIGHT] = $v; + } } if (null !== ($v = $this->getDate())) { - $a[self::FIELD_DATE] = $v->getValue(); - $a[self::FIELD_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_DATE] = $v; + } } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if (null !== ($v = $this->getDifferential())) { $a[self::FIELD_DIFFERENTIAL] = $v; } if (null !== ($v = $this->getDisplay())) { - $a[self::FIELD_DISPLAY] = $v->getValue(); - $a[self::FIELD_DISPLAY_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DISPLAY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DISPLAY_EXT] = $enc; + } + } else { + $a[self::FIELD_DISPLAY] = $v; + } } if (null !== ($v = $this->getExperimental())) { - $a[self::FIELD_EXPERIMENTAL] = $v->getValue(); - $a[self::FIELD_EXPERIMENTAL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EXPERIMENTAL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EXPERIMENTAL_EXT] = $enc; + } + } else { + $a[self::FIELD_EXPERIMENTAL] = $v; + } } if (null !== ($v = $this->getFhirVersion())) { - $a[self::FIELD_FHIR_VERSION] = $v->getValue(); - $a[self::FIELD_FHIR_VERSION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FHIR_VERSION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FHIR_VERSION_EXT] = $enc; + } + } else { + $a[self::FIELD_FHIR_VERSION] = $v; + } } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if (null !== ($v = $this->getKind())) { - $a[self::FIELD_KIND] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_KIND] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_KIND_EXT] = $enc; + } + } else { + $a[self::FIELD_KIND] = $v; + } } if ([] !== ($vs = $this->getMapping())) { $a[self::FIELD_MAPPING] = $vs; } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if (null !== ($v = $this->getPublisher())) { - $a[self::FIELD_PUBLISHER] = $v->getValue(); - $a[self::FIELD_PUBLISHER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PUBLISHER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PUBLISHER_EXT] = $enc; + } + } else { + $a[self::FIELD_PUBLISHER] = $v; + } } if (null !== ($v = $this->getRequirements())) { - $a[self::FIELD_REQUIREMENTS] = $v->getValue(); - $a[self::FIELD_REQUIREMENTS_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_REQUIREMENTS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_REQUIREMENTS_EXT] = $enc; + } + } else { + $a[self::FIELD_REQUIREMENTS] = $v; + } } if (null !== ($v = $this->getSnapshot())) { $a[self::FIELD_SNAPSHOT] = $v; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v->getValue(); - $a[self::FIELD_STATUS_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getUrl())) { - $a[self::FIELD_URL] = $v->getValue(); - $a[self::FIELD_URL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_URL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_URL_EXT] = $enc; + } + } else { + $a[self::FIELD_URL] = $v; + } } if ([] !== ($vs = $this->getUseContext())) { $a[self::FIELD_USE_CONTEXT] = $vs; } if (null !== ($v = $this->getVersion())) { - $a[self::FIELD_VERSION] = $v->getValue(); - $a[self::FIELD_VERSION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VERSION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VERSION_EXT] = $enc; + } + } else { + $a[self::FIELD_VERSION] = $v; + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRSubscription.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRSubscription.php index bdb75960e5..da45ca8689 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRSubscription.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRSubscription.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -88,10 +88,6 @@ class FHIRSubscription extends FHIRDomainResource implements PHPFHIRContainedTyp { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SUBSCRIPTION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CHANNEL = 'channel'; const FIELD_CONTACT = 'contact'; const FIELD_CONTACT_EXT = '_contact'; @@ -205,6 +201,9 @@ class FHIRSubscription extends FHIRDomainResource implements PHPFHIRContainedTyp */ protected $tag = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSubscription Constructor * @param null|array $data @@ -234,17 +233,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_CONTACT])) { foreach($data[self::FIELD_CONTACT] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContactPoint) { $this->addContact($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addContact(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addContact(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addContact(new FHIRContactPoint(array_merge($v, $ext[$i]))); + } } else { $this->addContact(new FHIRContactPoint($v)); } } } elseif ($data[self::FIELD_CONTACT] instanceof FHIRContactPoint) { $this->addContact($data[self::FIELD_CONTACT]); - } elseif ($ext && is_scalar($data[self::FIELD_CONTACT])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_CONTACT])) { $this->addContact(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $data[self::FIELD_CONTACT]] + $ext)); } else { $this->addContact(new FHIRContactPoint($data[self::FIELD_CONTACT])); @@ -256,8 +262,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CRITERIA] instanceof FHIRString) { $this->setCriteria($data[self::FIELD_CRITERIA]); - } elseif ($ext && is_scalar($data[self::FIELD_CRITERIA])) { - $this->setCriteria(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_CRITERIA]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CRITERIA])) { + $this->setCriteria(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_CRITERIA]] + $ext)); + } else if (is_array($data[self::FIELD_CRITERIA])) { + $this->setCriteria(new FHIRString(array_merge($ext, $data[self::FIELD_CRITERIA]))); + } } else { $this->setCriteria(new FHIRString($data[self::FIELD_CRITERIA])); } @@ -268,8 +278,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_END] instanceof FHIRInstant) { $this->setEnd($data[self::FIELD_END]); - } elseif ($ext && is_scalar($data[self::FIELD_END])) { - $this->setEnd(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_END]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_END])) { + $this->setEnd(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_END]] + $ext)); + } else if (is_array($data[self::FIELD_END])) { + $this->setEnd(new FHIRInstant(array_merge($ext, $data[self::FIELD_END]))); + } } else { $this->setEnd(new FHIRInstant($data[self::FIELD_END])); } @@ -280,8 +294,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ERROR] instanceof FHIRString) { $this->setError($data[self::FIELD_ERROR]); - } elseif ($ext && is_scalar($data[self::FIELD_ERROR])) { - $this->setError(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_ERROR]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ERROR])) { + $this->setError(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_ERROR]] + $ext)); + } else if (is_array($data[self::FIELD_ERROR])) { + $this->setError(new FHIRString(array_merge($ext, $data[self::FIELD_ERROR]))); + } } else { $this->setError(new FHIRString($data[self::FIELD_ERROR])); } @@ -292,8 +310,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_REASON] instanceof FHIRString) { $this->setReason($data[self::FIELD_REASON]); - } elseif ($ext && is_scalar($data[self::FIELD_REASON])) { - $this->setReason(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_REASON]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_REASON])) { + $this->setReason(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_REASON]] + $ext)); + } else if (is_array($data[self::FIELD_REASON])) { + $this->setReason(new FHIRString(array_merge($ext, $data[self::FIELD_REASON]))); + } } else { $this->setReason(new FHIRString($data[self::FIELD_REASON])); } @@ -304,8 +326,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRSubscriptionStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRSubscriptionStatus([FHIRSubscriptionStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRSubscriptionStatus([FHIRSubscriptionStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRSubscriptionStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRSubscriptionStatus($data[self::FIELD_STATUS])); } @@ -313,6 +339,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_TAG])) { if (is_array($data[self::FIELD_TAG])) { foreach($data[self::FIELD_TAG] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCoding) { $this->addTag($v); } else { @@ -821,11 +850,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getChannel())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CHANNEL, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getContact())) { foreach($vs as $v) { if (null === $v) { @@ -834,6 +861,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_CONTACT, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getCriteria())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CRITERIA, null, $v->_getFHIRXMLNamespace())); } @@ -846,11 +874,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getReason())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REASON, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getTag())) { foreach($vs as $v) { if (null === $v) { @@ -859,6 +885,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_TAG, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } @@ -872,26 +899,78 @@ public function jsonSerialize() $a[self::FIELD_CHANNEL] = $v; } if ([] !== ($vs = $this->getContact())) { - $a[self::FIELD_CONTACT] = $vs; + $a[self::FIELD_CONTACT] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CONTACT][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CONTACT_EXT][] = $enc; + } else { + $a[self::FIELD_CONTACT_EXT][] = null; + } + } else { + $a[self::FIELD_CONTACT][] = $v; + } + } } if (null !== ($v = $this->getCriteria())) { - $a[self::FIELD_CRITERIA] = $v->getValue(); - $a[self::FIELD_CRITERIA_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CRITERIA] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CRITERIA_EXT] = $enc; + } + } else { + $a[self::FIELD_CRITERIA] = $v; + } } if (null !== ($v = $this->getEnd())) { - $a[self::FIELD_END] = $v->getValue(); - $a[self::FIELD_END_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_END] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_END_EXT] = $enc; + } + } else { + $a[self::FIELD_END] = $v; + } } if (null !== ($v = $this->getError())) { - $a[self::FIELD_ERROR] = $v->getValue(); - $a[self::FIELD_ERROR_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ERROR] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ERROR_EXT] = $enc; + } + } else { + $a[self::FIELD_ERROR] = $v; + } } if (null !== ($v = $this->getReason())) { - $a[self::FIELD_REASON] = $v->getValue(); - $a[self::FIELD_REASON_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_REASON] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_REASON_EXT] = $enc; + } + } else { + $a[self::FIELD_REASON] = $v; + } } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if ([] !== ($vs = $this->getTag())) { $a[self::FIELD_TAG] = $vs; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRSubstance.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRSubstance.php index ef253208f2..4c7a96f830 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRSubstance.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRSubstance.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -83,10 +83,6 @@ class FHIRSubstance extends FHIRDomainResource implements PHPFHIRContainedTypeIn { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SUBSTANCE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CATEGORY = 'category'; const FIELD_CODE = 'code'; const FIELD_DESCRIPTION = 'description'; @@ -163,6 +159,9 @@ class FHIRSubstance extends FHIRDomainResource implements PHPFHIRContainedTypeIn */ protected $instance = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSubstance Constructor * @param null|array $data @@ -182,6 +181,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CATEGORY])) { if (is_array($data[self::FIELD_CATEGORY])) { foreach($data[self::FIELD_CATEGORY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addCategory($v); } else { @@ -207,8 +209,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -219,17 +225,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -238,6 +251,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_INGREDIENT])) { if (is_array($data[self::FIELD_INGREDIENT])) { foreach($data[self::FIELD_INGREDIENT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRSubstanceIngredient) { $this->addIngredient($v); } else { @@ -253,6 +269,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_INSTANCE])) { if (is_array($data[self::FIELD_INSTANCE])) { foreach($data[self::FIELD_INSTANCE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRSubstanceInstance) { $this->addInstance($v); } else { @@ -696,7 +715,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getCategory())) { foreach($vs as $v) { if (null === $v) { @@ -712,7 +730,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESCRIPTION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -739,6 +756,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_INSTANCE, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } @@ -755,11 +773,34 @@ public function jsonSerialize() $a[self::FIELD_CODE] = $v; } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if ([] !== ($vs = $this->getIngredient())) { $a[self::FIELD_INGREDIENT] = $vs; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRSupplyDelivery.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRSupplyDelivery.php index 8fd39e023e..49646f3246 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRSupplyDelivery.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRSupplyDelivery.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -85,15 +85,12 @@ class FHIRSupplyDelivery extends FHIRDomainResource implements PHPFHIRContainedT { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SUPPLY_DELIVERY; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DESTINATION = 'destination'; const FIELD_IDENTIFIER = 'identifier'; const FIELD_IDENTIFIER_EXT = '_identifier'; const FIELD_PATIENT = 'patient'; const FIELD_QUANTITY = 'quantity'; + const FIELD_QUANTITY_EXT = '_quantity'; const FIELD_RECEIVER = 'receiver'; const FIELD_STATUS = 'status'; const FIELD_STATUS_EXT = '_status'; @@ -228,6 +225,9 @@ class FHIRSupplyDelivery extends FHIRDomainResource implements PHPFHIRContainedT */ protected $whenPrepared = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSupplyDelivery Constructor * @param null|array $data @@ -257,8 +257,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->setIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { - $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_IDENTIFIER]))); + } } else { $this->setIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); } @@ -271,8 +275,17 @@ public function __construct($data = null) } } if (isset($data[self::FIELD_QUANTITY])) { + $ext = (isset($data[self::FIELD_QUANTITY_EXT]) && is_array($data[self::FIELD_QUANTITY_EXT])) + ? $data[self::FIELD_QUANTITY_EXT] + : null; if ($data[self::FIELD_QUANTITY] instanceof FHIRSimpleQuantity) { $this->setQuantity($data[self::FIELD_QUANTITY]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_QUANTITY])) { + $this->setQuantity(new FHIRSimpleQuantity([FHIRSimpleQuantity::FIELD_VALUE => $data[self::FIELD_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_QUANTITY])) { + $this->setQuantity(new FHIRSimpleQuantity(array_merge($ext, $data[self::FIELD_QUANTITY]))); + } } else { $this->setQuantity(new FHIRSimpleQuantity($data[self::FIELD_QUANTITY])); } @@ -280,6 +293,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_RECEIVER])) { if (is_array($data[self::FIELD_RECEIVER])) { foreach($data[self::FIELD_RECEIVER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addReceiver($v); } else { @@ -298,8 +314,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRSupplyDeliveryStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRSupplyDeliveryStatus([FHIRSupplyDeliveryStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRSupplyDeliveryStatus([FHIRSupplyDeliveryStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRSupplyDeliveryStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRSupplyDeliveryStatus($data[self::FIELD_STATUS])); } @@ -324,8 +344,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TIME] instanceof FHIRDateTime) { $this->setTime($data[self::FIELD_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_TIME])) { - $this->setTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TIME])) { + $this->setTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_TIME])) { + $this->setTime(new FHIRDateTime(array_merge($ext, $data[self::FIELD_TIME]))); + } } else { $this->setTime(new FHIRDateTime($data[self::FIELD_TIME])); } @@ -861,23 +885,18 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getDestination())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESTINATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPatient())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATIENT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_QUANTITY, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getReceiver())) { foreach($vs as $v) { if (null === $v) { @@ -890,22 +909,18 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSuppliedItem())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUPPLIED_ITEM, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSupplier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUPPLIER, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getTime())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TIME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getWhenPrepared())) { $v->xmlSerialize($sxe->addChild(self::FIELD_WHEN_PREPARED, null, $v->_getFHIRXMLNamespace())); } @@ -922,19 +937,43 @@ public function jsonSerialize() $a[self::FIELD_DESTINATION] = $v; } if (null !== ($v = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_IDENTIFIER] = $v; + } } if (null !== ($v = $this->getPatient())) { $a[self::FIELD_PATIENT] = $v; } if (null !== ($v = $this->getQuantity())) { - $a[self::FIELD_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_QUANTITY] = $v; + } } if ([] !== ($vs = $this->getReceiver())) { $a[self::FIELD_RECEIVER] = $vs; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getSuppliedItem())) { $a[self::FIELD_SUPPLIED_ITEM] = $v; @@ -943,8 +982,15 @@ public function jsonSerialize() $a[self::FIELD_SUPPLIER] = $v; } if (null !== ($v = $this->getTime())) { - $a[self::FIELD_TIME] = $v->getValue(); - $a[self::FIELD_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_TIME] = $v; + } } if (null !== ($v = $this->getType())) { $a[self::FIELD_TYPE] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRSupplyRequest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRSupplyRequest.php index 224f9a9b0d..440105285e 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRSupplyRequest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRSupplyRequest.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -85,10 +85,6 @@ class FHIRSupplyRequest extends FHIRDomainResource implements PHPFHIRContainedTy { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SUPPLY_REQUEST; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DATE = 'date'; const FIELD_DATE_EXT = '_date'; const FIELD_IDENTIFIER = 'identifier'; @@ -230,6 +226,9 @@ class FHIRSupplyRequest extends FHIRDomainResource implements PHPFHIRContainedTy */ protected $when = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSupplyRequest Constructor * @param null|array $data @@ -252,8 +251,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATE] instanceof FHIRDateTime) { $this->setDate($data[self::FIELD_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_DATE])) { - $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime(array_merge($ext, $data[self::FIELD_DATE]))); + } } else { $this->setDate(new FHIRDateTime($data[self::FIELD_DATE])); } @@ -264,8 +267,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->setIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { - $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_IDENTIFIER]))); + } } else { $this->setIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); } @@ -318,8 +325,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRSupplyRequestStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRSupplyRequestStatus([FHIRSupplyRequestStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRSupplyRequestStatus([FHIRSupplyRequestStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRSupplyRequestStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRSupplyRequestStatus($data[self::FIELD_STATUS])); } @@ -327,6 +338,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SUPPLIER])) { if (is_array($data[self::FIELD_SUPPLIER])) { foreach($data[self::FIELD_SUPPLIER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addSupplier($v); } else { @@ -870,39 +884,30 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DATE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getKind())) { $v->xmlSerialize($sxe->addChild(self::FIELD_KIND, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOrderedItem())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ORDERED_ITEM, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPatient())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATIENT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getReasonCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REASON_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getReasonReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REASON_REFERENCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSource())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SOURCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getSupplier())) { foreach($vs as $v) { if (null === $v) { @@ -925,11 +930,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getDate())) { - $a[self::FIELD_DATE] = $v->getValue(); - $a[self::FIELD_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_DATE] = $v; + } } if (null !== ($v = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_IDENTIFIER] = $v; + } } if (null !== ($v = $this->getKind())) { $a[self::FIELD_KIND] = $v; @@ -950,7 +970,15 @@ public function jsonSerialize() $a[self::FIELD_SOURCE] = $v; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if ([] !== ($vs = $this->getSupplier())) { $a[self::FIELD_SUPPLIER] = $vs; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRTestScript.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRTestScript.php index b18ab8b2f1..2fc64c0834 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRTestScript.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRTestScript.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -94,10 +94,6 @@ class FHIRTestScript extends FHIRDomainResource implements PHPFHIRContainedTypeI { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_TEST_SCRIPT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CONTACT = 'contact'; const FIELD_COPYRIGHT = 'copyright'; const FIELD_COPYRIGHT_EXT = '_copyright'; @@ -378,6 +374,9 @@ class FHIRTestScript extends FHIRDomainResource implements PHPFHIRContainedTypeI */ protected $version = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRTestScript Constructor * @param null|array $data @@ -397,6 +396,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CONTACT])) { if (is_array($data[self::FIELD_CONTACT])) { foreach($data[self::FIELD_CONTACT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRTestScriptContact) { $this->addContact($v); } else { @@ -415,8 +417,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_COPYRIGHT] instanceof FHIRString) { $this->setCopyright($data[self::FIELD_COPYRIGHT]); - } elseif ($ext && is_scalar($data[self::FIELD_COPYRIGHT])) { - $this->setCopyright(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_COPYRIGHT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_COPYRIGHT])) { + $this->setCopyright(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_COPYRIGHT]] + $ext)); + } else if (is_array($data[self::FIELD_COPYRIGHT])) { + $this->setCopyright(new FHIRString(array_merge($ext, $data[self::FIELD_COPYRIGHT]))); + } } else { $this->setCopyright(new FHIRString($data[self::FIELD_COPYRIGHT])); } @@ -427,8 +433,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATE] instanceof FHIRDateTime) { $this->setDate($data[self::FIELD_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_DATE])) { - $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime(array_merge($ext, $data[self::FIELD_DATE]))); + } } else { $this->setDate(new FHIRDateTime($data[self::FIELD_DATE])); } @@ -439,8 +449,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -451,8 +465,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EXPERIMENTAL] instanceof FHIRBoolean) { $this->setExperimental($data[self::FIELD_EXPERIMENTAL]); - } elseif ($ext && is_scalar($data[self::FIELD_EXPERIMENTAL])) { - $this->setExperimental(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_EXPERIMENTAL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EXPERIMENTAL])) { + $this->setExperimental(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_EXPERIMENTAL]] + $ext)); + } else if (is_array($data[self::FIELD_EXPERIMENTAL])) { + $this->setExperimental(new FHIRBoolean(array_merge($ext, $data[self::FIELD_EXPERIMENTAL]))); + } } else { $this->setExperimental(new FHIRBoolean($data[self::FIELD_EXPERIMENTAL])); } @@ -460,6 +478,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_FIXTURE])) { if (is_array($data[self::FIELD_FIXTURE])) { foreach($data[self::FIELD_FIXTURE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRTestScriptFixture) { $this->addFixture($v); } else { @@ -478,8 +499,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->setIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { - $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_IDENTIFIER]))); + } } else { $this->setIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); } @@ -497,8 +522,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MULTISERVER] instanceof FHIRBoolean) { $this->setMultiserver($data[self::FIELD_MULTISERVER]); - } elseif ($ext && is_scalar($data[self::FIELD_MULTISERVER])) { - $this->setMultiserver(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_MULTISERVER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MULTISERVER])) { + $this->setMultiserver(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_MULTISERVER]] + $ext)); + } else if (is_array($data[self::FIELD_MULTISERVER])) { + $this->setMultiserver(new FHIRBoolean(array_merge($ext, $data[self::FIELD_MULTISERVER]))); + } } else { $this->setMultiserver(new FHIRBoolean($data[self::FIELD_MULTISERVER])); } @@ -509,8 +538,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -518,6 +551,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PROFILE])) { if (is_array($data[self::FIELD_PROFILE])) { foreach($data[self::FIELD_PROFILE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addProfile($v); } else { @@ -536,8 +572,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PUBLISHER] instanceof FHIRString) { $this->setPublisher($data[self::FIELD_PUBLISHER]); - } elseif ($ext && is_scalar($data[self::FIELD_PUBLISHER])) { - $this->setPublisher(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PUBLISHER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PUBLISHER])) { + $this->setPublisher(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PUBLISHER]] + $ext)); + } else if (is_array($data[self::FIELD_PUBLISHER])) { + $this->setPublisher(new FHIRString(array_merge($ext, $data[self::FIELD_PUBLISHER]))); + } } else { $this->setPublisher(new FHIRString($data[self::FIELD_PUBLISHER])); } @@ -548,8 +588,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_REQUIREMENTS] instanceof FHIRString) { $this->setRequirements($data[self::FIELD_REQUIREMENTS]); - } elseif ($ext && is_scalar($data[self::FIELD_REQUIREMENTS])) { - $this->setRequirements(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_REQUIREMENTS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_REQUIREMENTS])) { + $this->setRequirements(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_REQUIREMENTS]] + $ext)); + } else if (is_array($data[self::FIELD_REQUIREMENTS])) { + $this->setRequirements(new FHIRString(array_merge($ext, $data[self::FIELD_REQUIREMENTS]))); + } } else { $this->setRequirements(new FHIRString($data[self::FIELD_REQUIREMENTS])); } @@ -567,8 +611,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRCode) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRCode(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRCode($data[self::FIELD_STATUS])); } @@ -583,6 +631,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_TEST])) { if (is_array($data[self::FIELD_TEST])) { foreach($data[self::FIELD_TEST] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRTestScriptTest) { $this->addTest($v); } else { @@ -601,8 +652,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_URL] instanceof FHIRUri) { $this->setUrl($data[self::FIELD_URL]); - } elseif ($ext && is_scalar($data[self::FIELD_URL])) { - $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } else if (is_array($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri(array_merge($ext, $data[self::FIELD_URL]))); + } } else { $this->setUrl(new FHIRUri($data[self::FIELD_URL])); } @@ -610,6 +665,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_USE_CONTEXT])) { if (is_array($data[self::FIELD_USE_CONTEXT])) { foreach($data[self::FIELD_USE_CONTEXT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addUseContext($v); } else { @@ -625,6 +683,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_VARIABLE])) { if (is_array($data[self::FIELD_VARIABLE])) { foreach($data[self::FIELD_VARIABLE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRTestScriptVariable) { $this->addVariable($v); } else { @@ -643,8 +704,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VERSION] instanceof FHIRString) { $this->setVersion($data[self::FIELD_VERSION]); - } elseif ($ext && is_scalar($data[self::FIELD_VERSION])) { - $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } else if (is_array($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString(array_merge($ext, $data[self::FIELD_VERSION]))); + } } else { $this->setVersion(new FHIRString($data[self::FIELD_VERSION])); } @@ -1771,7 +1836,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getContact())) { foreach($vs as $v) { if (null === $v) { @@ -1780,6 +1844,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_CONTACT, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getCopyright())) { $v->xmlSerialize($sxe->addChild(self::FIELD_COPYRIGHT, null, $v->_getFHIRXMLNamespace())); } @@ -1792,7 +1857,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getExperimental())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EXPERIMENTAL, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getFixture())) { foreach($vs as $v) { if (null === $v) { @@ -1805,7 +1869,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getMetadata())) { $v->xmlSerialize($sxe->addChild(self::FIELD_METADATA, null, $v->_getFHIRXMLNamespace())); } @@ -1815,7 +1878,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NAME, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getProfile())) { foreach($vs as $v) { if (null === $v) { @@ -1824,24 +1886,22 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_PROFILE, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getPublisher())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PUBLISHER, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getRequirements())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REQUIREMENTS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSetup())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SETUP, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getTeardown())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TEARDOWN, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getTest())) { foreach($vs as $v) { if (null === $v) { @@ -1850,10 +1910,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_TEST, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getUrl())) { $v->xmlSerialize($sxe->addChild(self::FIELD_URL, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getUseContext())) { foreach($vs as $v) { if (null === $v) { @@ -1871,6 +1931,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_VARIABLE, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getVersion())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VERSION, null, $v->_getFHIRXMLNamespace())); } @@ -1887,55 +1948,126 @@ public function jsonSerialize() $a[self::FIELD_CONTACT] = $vs; } if (null !== ($v = $this->getCopyright())) { - $a[self::FIELD_COPYRIGHT] = $v->getValue(); - $a[self::FIELD_COPYRIGHT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_COPYRIGHT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_COPYRIGHT_EXT] = $enc; + } + } else { + $a[self::FIELD_COPYRIGHT] = $v; + } } if (null !== ($v = $this->getDate())) { - $a[self::FIELD_DATE] = $v->getValue(); - $a[self::FIELD_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_DATE] = $v; + } } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if (null !== ($v = $this->getExperimental())) { - $a[self::FIELD_EXPERIMENTAL] = $v->getValue(); - $a[self::FIELD_EXPERIMENTAL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EXPERIMENTAL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EXPERIMENTAL_EXT] = $enc; + } + } else { + $a[self::FIELD_EXPERIMENTAL] = $v; + } } if ([] !== ($vs = $this->getFixture())) { $a[self::FIELD_FIXTURE] = $vs; } if (null !== ($v = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_IDENTIFIER] = $v; + } } if (null !== ($v = $this->getMetadata())) { $a[self::FIELD_METADATA] = $v; } if (null !== ($v = $this->getMultiserver())) { - $a[self::FIELD_MULTISERVER] = $v->getValue(); - $a[self::FIELD_MULTISERVER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MULTISERVER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MULTISERVER_EXT] = $enc; + } + } else { + $a[self::FIELD_MULTISERVER] = $v; + } } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if ([] !== ($vs = $this->getProfile())) { $a[self::FIELD_PROFILE] = $vs; } if (null !== ($v = $this->getPublisher())) { - $a[self::FIELD_PUBLISHER] = $v->getValue(); - $a[self::FIELD_PUBLISHER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PUBLISHER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PUBLISHER_EXT] = $enc; + } + } else { + $a[self::FIELD_PUBLISHER] = $v; + } } if (null !== ($v = $this->getRequirements())) { - $a[self::FIELD_REQUIREMENTS] = $v->getValue(); - $a[self::FIELD_REQUIREMENTS_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_REQUIREMENTS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_REQUIREMENTS_EXT] = $enc; + } + } else { + $a[self::FIELD_REQUIREMENTS] = $v; + } } if (null !== ($v = $this->getSetup())) { $a[self::FIELD_SETUP] = $v; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v->getValue(); - $a[self::FIELD_STATUS_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getTeardown())) { $a[self::FIELD_TEARDOWN] = $v; @@ -1944,8 +2076,15 @@ public function jsonSerialize() $a[self::FIELD_TEST] = $vs; } if (null !== ($v = $this->getUrl())) { - $a[self::FIELD_URL] = $v->getValue(); - $a[self::FIELD_URL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_URL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_URL_EXT] = $enc; + } + } else { + $a[self::FIELD_URL] = $v; + } } if ([] !== ($vs = $this->getUseContext())) { $a[self::FIELD_USE_CONTEXT] = $vs; @@ -1954,8 +2093,15 @@ public function jsonSerialize() $a[self::FIELD_VARIABLE] = $vs; } if (null !== ($v = $this->getVersion())) { - $a[self::FIELD_VERSION] = $v->getValue(); - $a[self::FIELD_VERSION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VERSION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VERSION_EXT] = $enc; + } + } else { + $a[self::FIELD_VERSION] = $v; + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRValueSet.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRValueSet.php index 9c5fbc1a1a..7ee34f0d73 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRValueSet.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRValueSet.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -90,10 +90,6 @@ class FHIRValueSet extends FHIRDomainResource implements PHPFHIRContainedTypeInt { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_VALUE_SET; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CODE_SYSTEM = 'codeSystem'; const FIELD_COMPOSE = 'compose'; const FIELD_CONTACT = 'contact'; @@ -359,6 +355,9 @@ class FHIRValueSet extends FHIRDomainResource implements PHPFHIRContainedTypeInt */ protected $version = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRValueSet Constructor * @param null|array $data @@ -392,6 +391,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CONTACT])) { if (is_array($data[self::FIELD_CONTACT])) { foreach($data[self::FIELD_CONTACT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRValueSetContact) { $this->addContact($v); } else { @@ -410,8 +412,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_COPYRIGHT] instanceof FHIRString) { $this->setCopyright($data[self::FIELD_COPYRIGHT]); - } elseif ($ext && is_scalar($data[self::FIELD_COPYRIGHT])) { - $this->setCopyright(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_COPYRIGHT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_COPYRIGHT])) { + $this->setCopyright(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_COPYRIGHT]] + $ext)); + } else if (is_array($data[self::FIELD_COPYRIGHT])) { + $this->setCopyright(new FHIRString(array_merge($ext, $data[self::FIELD_COPYRIGHT]))); + } } else { $this->setCopyright(new FHIRString($data[self::FIELD_COPYRIGHT])); } @@ -422,8 +428,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATE] instanceof FHIRDateTime) { $this->setDate($data[self::FIELD_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_DATE])) { - $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime(array_merge($ext, $data[self::FIELD_DATE]))); + } } else { $this->setDate(new FHIRDateTime($data[self::FIELD_DATE])); } @@ -434,8 +444,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -453,8 +467,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EXPERIMENTAL] instanceof FHIRBoolean) { $this->setExperimental($data[self::FIELD_EXPERIMENTAL]); - } elseif ($ext && is_scalar($data[self::FIELD_EXPERIMENTAL])) { - $this->setExperimental(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_EXPERIMENTAL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EXPERIMENTAL])) { + $this->setExperimental(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_EXPERIMENTAL]] + $ext)); + } else if (is_array($data[self::FIELD_EXPERIMENTAL])) { + $this->setExperimental(new FHIRBoolean(array_merge($ext, $data[self::FIELD_EXPERIMENTAL]))); + } } else { $this->setExperimental(new FHIRBoolean($data[self::FIELD_EXPERIMENTAL])); } @@ -465,8 +483,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EXTENSIBLE] instanceof FHIRBoolean) { $this->setExtensible($data[self::FIELD_EXTENSIBLE]); - } elseif ($ext && is_scalar($data[self::FIELD_EXTENSIBLE])) { - $this->setExtensible(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_EXTENSIBLE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EXTENSIBLE])) { + $this->setExtensible(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_EXTENSIBLE]] + $ext)); + } else if (is_array($data[self::FIELD_EXTENSIBLE])) { + $this->setExtensible(new FHIRBoolean(array_merge($ext, $data[self::FIELD_EXTENSIBLE]))); + } } else { $this->setExtensible(new FHIRBoolean($data[self::FIELD_EXTENSIBLE])); } @@ -477,8 +499,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->setIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { - $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_IDENTIFIER]))); + } } else { $this->setIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); } @@ -489,8 +515,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IMMUTABLE] instanceof FHIRBoolean) { $this->setImmutable($data[self::FIELD_IMMUTABLE]); - } elseif ($ext && is_scalar($data[self::FIELD_IMMUTABLE])) { - $this->setImmutable(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_IMMUTABLE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IMMUTABLE])) { + $this->setImmutable(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_IMMUTABLE]] + $ext)); + } else if (is_array($data[self::FIELD_IMMUTABLE])) { + $this->setImmutable(new FHIRBoolean(array_merge($ext, $data[self::FIELD_IMMUTABLE]))); + } } else { $this->setImmutable(new FHIRBoolean($data[self::FIELD_IMMUTABLE])); } @@ -501,8 +531,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_LOCKED_DATE] instanceof FHIRDate) { $this->setLockedDate($data[self::FIELD_LOCKED_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_LOCKED_DATE])) { - $this->setLockedDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_LOCKED_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_LOCKED_DATE])) { + $this->setLockedDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_LOCKED_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_LOCKED_DATE])) { + $this->setLockedDate(new FHIRDate(array_merge($ext, $data[self::FIELD_LOCKED_DATE]))); + } } else { $this->setLockedDate(new FHIRDate($data[self::FIELD_LOCKED_DATE])); } @@ -513,8 +547,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -525,8 +563,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PUBLISHER] instanceof FHIRString) { $this->setPublisher($data[self::FIELD_PUBLISHER]); - } elseif ($ext && is_scalar($data[self::FIELD_PUBLISHER])) { - $this->setPublisher(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PUBLISHER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PUBLISHER])) { + $this->setPublisher(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PUBLISHER]] + $ext)); + } else if (is_array($data[self::FIELD_PUBLISHER])) { + $this->setPublisher(new FHIRString(array_merge($ext, $data[self::FIELD_PUBLISHER]))); + } } else { $this->setPublisher(new FHIRString($data[self::FIELD_PUBLISHER])); } @@ -537,8 +579,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_REQUIREMENTS] instanceof FHIRString) { $this->setRequirements($data[self::FIELD_REQUIREMENTS]); - } elseif ($ext && is_scalar($data[self::FIELD_REQUIREMENTS])) { - $this->setRequirements(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_REQUIREMENTS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_REQUIREMENTS])) { + $this->setRequirements(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_REQUIREMENTS]] + $ext)); + } else if (is_array($data[self::FIELD_REQUIREMENTS])) { + $this->setRequirements(new FHIRString(array_merge($ext, $data[self::FIELD_REQUIREMENTS]))); + } } else { $this->setRequirements(new FHIRString($data[self::FIELD_REQUIREMENTS])); } @@ -549,8 +595,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRCode) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRCode(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRCode($data[self::FIELD_STATUS])); } @@ -561,8 +611,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_URL] instanceof FHIRUri) { $this->setUrl($data[self::FIELD_URL]); - } elseif ($ext && is_scalar($data[self::FIELD_URL])) { - $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } else if (is_array($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri(array_merge($ext, $data[self::FIELD_URL]))); + } } else { $this->setUrl(new FHIRUri($data[self::FIELD_URL])); } @@ -570,6 +624,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_USE_CONTEXT])) { if (is_array($data[self::FIELD_USE_CONTEXT])) { foreach($data[self::FIELD_USE_CONTEXT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addUseContext($v); } else { @@ -588,8 +645,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VERSION] instanceof FHIRString) { $this->setVersion($data[self::FIELD_VERSION]); - } elseif ($ext && is_scalar($data[self::FIELD_VERSION])) { - $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } else if (is_array($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString(array_merge($ext, $data[self::FIELD_VERSION]))); + } } else { $this->setVersion(new FHIRString($data[self::FIELD_VERSION])); } @@ -1574,15 +1635,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getCodeSystem())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE_SYSTEM, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getCompose())) { $v->xmlSerialize($sxe->addChild(self::FIELD_COMPOSE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getContact())) { foreach($vs as $v) { if (null === $v) { @@ -1591,6 +1649,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_CONTACT, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getCopyright())) { $v->xmlSerialize($sxe->addChild(self::FIELD_COPYRIGHT, null, $v->_getFHIRXMLNamespace())); } @@ -1600,7 +1659,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESCRIPTION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getExpansion())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EXPANSION, null, $v->_getFHIRXMLNamespace())); } @@ -1610,7 +1668,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getExtensible())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EXTENSIBLE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } @@ -1635,7 +1692,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getUrl())) { $v->xmlSerialize($sxe->addChild(self::FIELD_URL, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getUseContext())) { foreach($vs as $v) { if (null === $v) { @@ -1644,6 +1700,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_USE_CONTEXT, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getVersion())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VERSION, null, $v->_getFHIRXMLNamespace())); } @@ -1666,65 +1723,164 @@ public function jsonSerialize() $a[self::FIELD_CONTACT] = $vs; } if (null !== ($v = $this->getCopyright())) { - $a[self::FIELD_COPYRIGHT] = $v->getValue(); - $a[self::FIELD_COPYRIGHT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_COPYRIGHT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_COPYRIGHT_EXT] = $enc; + } + } else { + $a[self::FIELD_COPYRIGHT] = $v; + } } if (null !== ($v = $this->getDate())) { - $a[self::FIELD_DATE] = $v->getValue(); - $a[self::FIELD_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_DATE] = $v; + } } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if (null !== ($v = $this->getExpansion())) { $a[self::FIELD_EXPANSION] = $v; } if (null !== ($v = $this->getExperimental())) { - $a[self::FIELD_EXPERIMENTAL] = $v->getValue(); - $a[self::FIELD_EXPERIMENTAL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EXPERIMENTAL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EXPERIMENTAL_EXT] = $enc; + } + } else { + $a[self::FIELD_EXPERIMENTAL] = $v; + } } if (null !== ($v = $this->getExtensible())) { - $a[self::FIELD_EXTENSIBLE] = $v->getValue(); - $a[self::FIELD_EXTENSIBLE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EXTENSIBLE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EXTENSIBLE_EXT] = $enc; + } + } else { + $a[self::FIELD_EXTENSIBLE] = $v; + } } if (null !== ($v = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_IDENTIFIER] = $v; + } } if (null !== ($v = $this->getImmutable())) { - $a[self::FIELD_IMMUTABLE] = $v->getValue(); - $a[self::FIELD_IMMUTABLE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IMMUTABLE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IMMUTABLE_EXT] = $enc; + } + } else { + $a[self::FIELD_IMMUTABLE] = $v; + } } if (null !== ($v = $this->getLockedDate())) { - $a[self::FIELD_LOCKED_DATE] = $v->getValue(); - $a[self::FIELD_LOCKED_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_LOCKED_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_LOCKED_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_LOCKED_DATE] = $v; + } } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if (null !== ($v = $this->getPublisher())) { - $a[self::FIELD_PUBLISHER] = $v->getValue(); - $a[self::FIELD_PUBLISHER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PUBLISHER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PUBLISHER_EXT] = $enc; + } + } else { + $a[self::FIELD_PUBLISHER] = $v; + } } if (null !== ($v = $this->getRequirements())) { - $a[self::FIELD_REQUIREMENTS] = $v->getValue(); - $a[self::FIELD_REQUIREMENTS_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_REQUIREMENTS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_REQUIREMENTS_EXT] = $enc; + } + } else { + $a[self::FIELD_REQUIREMENTS] = $v; + } } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v->getValue(); - $a[self::FIELD_STATUS_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getUrl())) { - $a[self::FIELD_URL] = $v->getValue(); - $a[self::FIELD_URL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_URL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_URL_EXT] = $enc; + } + } else { + $a[self::FIELD_URL] = $v; + } } if ([] !== ($vs = $this->getUseContext())) { $a[self::FIELD_USE_CONTEXT] = $vs; } if (null !== ($v = $this->getVersion())) { - $a[self::FIELD_VERSION] = $v->getValue(); - $a[self::FIELD_VERSION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VERSION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VERSION_EXT] = $enc; + } + } else { + $a[self::FIELD_VERSION] = $v; + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRVisionPrescription.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRVisionPrescription.php index 1fc3ad1661..c4a9895eec 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRVisionPrescription.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRDomainResource/FHIRVisionPrescription.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -83,10 +83,6 @@ class FHIRVisionPrescription extends FHIRDomainResource implements PHPFHIRContai { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_VISION_PRESCRIPTION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DATE_WRITTEN = 'dateWritten'; const FIELD_DATE_WRITTEN_EXT = '_dateWritten'; const FIELD_DISPENSE = 'dispense'; @@ -191,6 +187,9 @@ class FHIRVisionPrescription extends FHIRDomainResource implements PHPFHIRContai */ protected $reasonReference = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRVisionPrescription Constructor * @param null|array $data @@ -213,8 +212,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATE_WRITTEN] instanceof FHIRDateTime) { $this->setDateWritten($data[self::FIELD_DATE_WRITTEN]); - } elseif ($ext && is_scalar($data[self::FIELD_DATE_WRITTEN])) { - $this->setDateWritten(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE_WRITTEN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATE_WRITTEN])) { + $this->setDateWritten(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE_WRITTEN]] + $ext)); + } else if (is_array($data[self::FIELD_DATE_WRITTEN])) { + $this->setDateWritten(new FHIRDateTime(array_merge($ext, $data[self::FIELD_DATE_WRITTEN]))); + } } else { $this->setDateWritten(new FHIRDateTime($data[self::FIELD_DATE_WRITTEN])); } @@ -222,6 +225,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_DISPENSE])) { if (is_array($data[self::FIELD_DISPENSE])) { foreach($data[self::FIELD_DISPENSE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRVisionPrescriptionDispense) { $this->addDispense($v); } else { @@ -247,17 +253,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -743,7 +756,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDateWritten())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DATE_WRITTEN, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getDispense())) { foreach($vs as $v) { if (null === $v) { @@ -756,7 +768,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getEncounter())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ENCOUNTER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -769,15 +780,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getPatient())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATIENT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPrescriber())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PRESCRIBER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getReasonCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REASON_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getReasonReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REASON_REFERENCE, null, $v->_getFHIRXMLNamespace())); } @@ -791,8 +799,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getDateWritten())) { - $a[self::FIELD_DATE_WRITTEN] = $v->getValue(); - $a[self::FIELD_DATE_WRITTEN_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATE_WRITTEN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATE_WRITTEN_EXT] = $enc; + } + } else { + $a[self::FIELD_DATE_WRITTEN] = $v; + } } if ([] !== ($vs = $this->getDispense())) { $a[self::FIELD_DISPENSE] = $vs; @@ -801,7 +816,23 @@ public function jsonSerialize() $a[self::FIELD_ENCOUNTER] = $v; } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if (null !== ($v = $this->getPatient())) { $a[self::FIELD_PATIENT] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRParameters.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRParameters.php index af5a7602e7..fc5be88238 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRParameters.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResource/FHIRParameters.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -81,10 +81,6 @@ class FHIRParameters extends FHIRResource implements PHPFHIRContainedTypeInterfa { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_PARAMETERS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_PARAMETER = 'parameter'; /** @@ -98,6 +94,9 @@ class FHIRParameters extends FHIRResource implements PHPFHIRContainedTypeInterfa */ protected $parameter = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRParameters Constructor * @param null|array $data @@ -117,6 +116,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PARAMETER])) { if (is_array($data[self::FIELD_PARAMETER])) { foreach($data[self::FIELD_PARAMETER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRParametersParameter) { $this->addParameter($v); } else { @@ -299,7 +301,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getParameter())) { foreach($vs as $v) { if (null === $v) { @@ -308,6 +309,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_PARAMETER, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResourceContainer.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResourceContainer.php index cd2e660163..0f4d159982 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResourceContainer.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResourceContainer.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -167,9 +167,7 @@ class FHIRResourceContainer implements PHPFHIRCommentContainerInterface, PHPFHIR // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_RESOURCE_CONTAINER; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; + const FIELD_FHIR_COMMENTS = 'fhir_comments'; const FIELD_ACCOUNT = 'Account'; const FIELD_ALLERGY_INTOLERANCE = 'AllergyIntolerance'; @@ -1187,6 +1185,9 @@ class FHIRResourceContainer implements PHPFHIRCommentContainerInterface, PHPFHIR */ protected $VisionPrescription = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRResourceContainer Constructor * @param null|array $data @@ -1202,6 +1203,13 @@ public function __construct($data = null) gettype($data) )); } + if (isset($data[self::FIELD_FHIR_COMMENTS])) { + if (is_array($data[self::FIELD_FHIR_COMMENTS])) { + $this->_setFHIRComments($data[self::FIELD_FHIR_COMMENTS]); + } else if (is_string($data[self::FIELD_FHIR_COMMENTS])) { + $this->_addFHIRComment($data[self::FIELD_FHIR_COMMENTS]); + } + } if (isset($data[self::FIELD_ACCOUNT])) { if ($data[self::FIELD_ACCOUNT] instanceof FHIRAccount) { $this->setAccount($data[self::FIELD_ACCOUNT]); @@ -5211,6 +5219,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResourceVersionPolicyList.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResourceVersionPolicyList.php index 4cfdbfef2e..7d47dbfee6 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResourceVersionPolicyList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResourceVersionPolicyList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -246,6 +246,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResponseTypeList.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResponseTypeList.php index a6cf92098e..d710db850a 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResponseTypeList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRResponseTypeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -246,6 +246,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRRestfulConformanceModeList.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRRestfulConformanceModeList.php index 066ae3e331..e177ea3275 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRRestfulConformanceModeList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRRestfulConformanceModeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -245,6 +245,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRSampledDataDataTypePrimitive.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRSampledDataDataTypePrimitive.php index dfee9768a0..eb7e051b29 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRSampledDataDataTypePrimitive.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRSampledDataDataTypePrimitive.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -229,6 +229,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRSearchEntryModeList.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRSearchEntryModeList.php index 504efd68ed..1f4881e56e 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRSearchEntryModeList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRSearchEntryModeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -246,6 +246,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRSearchModifierCodeList.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRSearchModifierCodeList.php index d404c9468e..8a449a7df8 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRSearchModifierCodeList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRSearchModifierCodeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -253,6 +253,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRSearchParamTypeList.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRSearchParamTypeList.php index 9d234127e7..fb32614ac1 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRSearchParamTypeList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRSearchParamTypeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -251,6 +251,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRSlicingRulesList.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRSlicingRulesList.php index 2faf729db8..e1d6977c51 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRSlicingRulesList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRSlicingRulesList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -246,6 +246,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRSlotStatusList.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRSlotStatusList.php index 1ab16d9db9..cccbd0ccd7 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRSlotStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRSlotStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -247,6 +247,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRSpecimenStatusList.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRSpecimenStatusList.php index a0311a7772..870c46d31a 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRSpecimenStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRSpecimenStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -247,6 +247,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRStringPrimitive.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRStringPrimitive.php index e07fbd681b..cd480deb13 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRStringPrimitive.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRStringPrimitive.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -229,6 +229,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRStructureDefinitionKindList.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRStructureDefinitionKindList.php index b5d5d4f057..bb7e66c57a 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRStructureDefinitionKindList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRStructureDefinitionKindList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -246,6 +246,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRSubscriptionChannelTypeList.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRSubscriptionChannelTypeList.php index 9c2d647dce..8f356e7721 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRSubscriptionChannelTypeList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRSubscriptionChannelTypeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -248,6 +248,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRSubscriptionStatusList.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRSubscriptionStatusList.php index 0c406ba404..faaa32b44e 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRSubscriptionStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRSubscriptionStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -247,6 +247,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRSupplyDeliveryStatusList.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRSupplyDeliveryStatusList.php index 744ad9b159..7c95ab9728 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRSupplyDeliveryStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRSupplyDeliveryStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -246,6 +246,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRSupplyRequestStatusList.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRSupplyRequestStatusList.php index b25143b5b4..8b0bff31ad 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRSupplyRequestStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRSupplyRequestStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -247,6 +247,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRSystemRestfulInteractionList.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRSystemRestfulInteractionList.php index 7303571731..58bf4befc2 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRSystemRestfulInteractionList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRSystemRestfulInteractionList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -246,6 +246,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRTimePrimitive.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRTimePrimitive.php index 84584ad9a2..2990bef31f 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRTimePrimitive.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRTimePrimitive.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -256,6 +256,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRTransactionModeList.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRTransactionModeList.php index 4731d3343d..3b9c20ff92 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRTransactionModeList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRTransactionModeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -247,6 +247,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRTypeRestfulInteractionList.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRTypeRestfulInteractionList.php index 8e03a6b027..ad1273272e 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRTypeRestfulInteractionList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRTypeRestfulInteractionList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -252,6 +252,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRUnitsOfTimeList.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRUnitsOfTimeList.php index 6685d76e66..2ed6a2d646 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRUnitsOfTimeList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRUnitsOfTimeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -250,6 +250,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRUnknownContentCodeList.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRUnknownContentCodeList.php index 494c8debb6..af7ecd93bd 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRUnknownContentCodeList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRUnknownContentCodeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -247,6 +247,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRUnsignedIntPrimitive.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRUnsignedIntPrimitive.php index 997162d51e..63c4e96854 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRUnsignedIntPrimitive.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRUnsignedIntPrimitive.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -241,6 +241,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRUriPrimitive.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRUriPrimitive.php index bc2e550334..7f138fa489 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRUriPrimitive.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRUriPrimitive.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -229,6 +229,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRUseList.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRUseList.php index a4d21515ac..2c632c1c75 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRUseList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRUseList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -247,6 +247,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRUuidPrimitive.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRUuidPrimitive.php index fb5dded935..82e82a9681 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRUuidPrimitive.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRUuidPrimitive.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -229,6 +229,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRVisionBaseList.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRVisionBaseList.php index 1071bb0053..b7aabe771a 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRVisionBaseList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRVisionBaseList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -247,6 +247,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRVisionEyesList.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRVisionEyesList.php index 1648cfbfb2..f5c0ddea42 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRVisionEyesList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRVisionEyesList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -245,6 +245,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRXPathUsageTypeList.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRXPathUsageTypeList.php index 7f9a07a299..be7a811e9d 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRXPathUsageTypeList.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/FHIRXPathUsageTypeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -248,6 +248,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRAutoloader.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRAutoloader.php index 5f135606ca..ba03171c08 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRAutoloader.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRAutoloader.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRCommentContainerInterface.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRCommentContainerInterface.php index e1f6da21d0..94baa37697 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRCommentContainerInterface.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRCommentContainerInterface.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRCommentContainerTrait.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRCommentContainerTrait.php index 9150956025..241ab4e39d 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRCommentContainerTrait.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRCommentContainerTrait.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -69,7 +69,7 @@ trait PHPFHIRCommentContainerTrait { /** @var array */ - private $_fhirComments = []; + protected $_fhirComments = []; /** * Arbitrary comments of a hopefully useful nature diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRConstants.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRConstants.php index 1b1aa20cbe..c8467209a1 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRConstants.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRConstants.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -73,7 +73,7 @@ abstract class PHPFHIRConstants const SOURCE_GENERATION_DATE = 'Sat, Oct 24, 2015 07:41+1100'; // PHPFHIR - const CODE_GENERATION_DATE = 'November 10th, 2019 18:12+0000'; + const CODE_GENERATION_DATE = 'November 17th, 2019 04:21+0000'; // Common const JSON_FIELD_RESOURCE_TYPE = 'resourceType'; diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRContainedTypeInterface.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRContainedTypeInterface.php index 6912b44963..bb7a8f2260 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRContainedTypeInterface.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRContainedTypeInterface.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRResponseParser.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRResponseParser.php index 21fe6a42fc..f7a65deea5 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRResponseParser.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRResponseParser.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRResponseParserConfig.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRResponseParserConfig.php index ac9f628832..4be1341ff4 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRResponseParserConfig.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRResponseParserConfig.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRAccountStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRAccountStatusListTest.php index f0838b33f5..38f9071077 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRAccountStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRAccountStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRActionListListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRActionListListTest.php index f722ffbbc4..9bfbc409c0 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRActionListListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRActionListListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRAddressTypeListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRAddressTypeListTest.php index 60649f493f..2d13a5a544 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRAddressTypeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRAddressTypeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRAddressUseListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRAddressUseListTest.php index f86075278d..4944d0fe99 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRAddressUseListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRAddressUseListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRAdministrativeGenderListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRAdministrativeGenderListTest.php index 06d184e0d2..d0ca6017c0 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRAdministrativeGenderListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRAdministrativeGenderListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRAggregationModeListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRAggregationModeListTest.php index 8c88000f79..bbd87c0a9e 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRAggregationModeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRAggregationModeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRAllergyIntoleranceCategoryListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRAllergyIntoleranceCategoryListTest.php index 4336bbdac6..8fc936b7fe 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRAllergyIntoleranceCategoryListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRAllergyIntoleranceCategoryListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRAllergyIntoleranceCertaintyListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRAllergyIntoleranceCertaintyListTest.php index ee35e426f5..f01a24d7e4 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRAllergyIntoleranceCertaintyListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRAllergyIntoleranceCertaintyListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRAllergyIntoleranceCriticalityListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRAllergyIntoleranceCriticalityListTest.php index 76e8f497d5..25f0b7d896 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRAllergyIntoleranceCriticalityListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRAllergyIntoleranceCriticalityListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRAllergyIntoleranceSeverityListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRAllergyIntoleranceSeverityListTest.php index 02964930ee..a9a588221e 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRAllergyIntoleranceSeverityListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRAllergyIntoleranceSeverityListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRAllergyIntoleranceStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRAllergyIntoleranceStatusListTest.php index 8539c8b1f9..e08cd5d8a5 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRAllergyIntoleranceStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRAllergyIntoleranceStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRAllergyIntoleranceTypeListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRAllergyIntoleranceTypeListTest.php index 0b153c9a91..d2d95e6521 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRAllergyIntoleranceTypeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRAllergyIntoleranceTypeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRAnswerFormatListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRAnswerFormatListTest.php index 370555ffc5..6d1e534441 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRAnswerFormatListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRAnswerFormatListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRAppointmentStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRAppointmentStatusListTest.php index b9c443c49c..35381dbab7 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRAppointmentStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRAppointmentStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRAssertionDirectionTypeListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRAssertionDirectionTypeListTest.php index c83e00040e..2dcd20b298 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRAssertionDirectionTypeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRAssertionDirectionTypeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRAssertionOperatorTypeListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRAssertionOperatorTypeListTest.php index 230ae79abb..a9c4d447a3 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRAssertionOperatorTypeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRAssertionOperatorTypeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRAssertionResponseTypesListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRAssertionResponseTypesListTest.php index e0de25d84e..dab25f832d 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRAssertionResponseTypesListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRAssertionResponseTypesListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRAuditEventActionListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRAuditEventActionListTest.php index 6f824b6376..56d1cf9023 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRAuditEventActionListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRAuditEventActionListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRAuditEventOutcomeListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRAuditEventOutcomeListTest.php index 18d81d6d44..51cd7b61b8 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRAuditEventOutcomeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRAuditEventOutcomeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRAuditEventParticipantNetworkTypeListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRAuditEventParticipantNetworkTypeListTest.php index 9a9a13f1a9..14b0f47260 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRAuditEventParticipantNetworkTypeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRAuditEventParticipantNetworkTypeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRBase64BinaryPrimitiveTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRBase64BinaryPrimitiveTest.php index ca376985c5..be8eaff074 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRBase64BinaryPrimitiveTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRBase64BinaryPrimitiveTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRBindingStrengthListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRBindingStrengthListTest.php index 3aea546195..23fe7f5408 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRBindingStrengthListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRBindingStrengthListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRBooleanPrimitiveTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRBooleanPrimitiveTest.php index a8eeda88e7..a02aa87f82 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRBooleanPrimitiveTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRBooleanPrimitiveTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRBundleTypeListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRBundleTypeListTest.php index b102c11910..e8af14edc6 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRBundleTypeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRBundleTypeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRCarePlanActivityStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRCarePlanActivityStatusListTest.php index 7d4ce8ff32..033498a128 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRCarePlanActivityStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRCarePlanActivityStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRCarePlanRelationshipListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRCarePlanRelationshipListTest.php index 1aa5357faa..c512cf92f5 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRCarePlanRelationshipListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRCarePlanRelationshipListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRCarePlanStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRCarePlanStatusListTest.php index f014d29166..d8ba6cde49 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRCarePlanStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRCarePlanStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRClaimTypeListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRClaimTypeListTest.php index c53eb017af..4ca6ef2dbf 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRClaimTypeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRClaimTypeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRClinicalImpressionStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRClinicalImpressionStatusListTest.php index 2fcace423c..70917d85f0 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRClinicalImpressionStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRClinicalImpressionStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRCodePrimitiveTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRCodePrimitiveTest.php index b694b4324c..a7fdad16e1 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRCodePrimitiveTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRCodePrimitiveTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRCommunicationRequestStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRCommunicationRequestStatusListTest.php index e91fda0890..eb371a9cc0 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRCommunicationRequestStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRCommunicationRequestStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRCommunicationStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRCommunicationStatusListTest.php index fa9873b793..8c6ce5781f 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRCommunicationStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRCommunicationStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRCompositionAttestationModeListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRCompositionAttestationModeListTest.php index 233ca9d13c..47cbd268f9 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRCompositionAttestationModeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRCompositionAttestationModeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRCompositionStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRCompositionStatusListTest.php index 5b40b87ed3..dedb6e9a28 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRCompositionStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRCompositionStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRConceptMapEquivalenceListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRConceptMapEquivalenceListTest.php index da1b68eb82..200c19047b 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRConceptMapEquivalenceListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRConceptMapEquivalenceListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRConditionVerificationStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRConditionVerificationStatusListTest.php index 5add9f3208..5dd6514489 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRConditionVerificationStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRConditionVerificationStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRConditionalDeleteStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRConditionalDeleteStatusListTest.php index 8fc309fefc..e6979d76ec 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRConditionalDeleteStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRConditionalDeleteStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRConformanceEventModeListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRConformanceEventModeListTest.php index 54ca71e6a7..4d29ebe967 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRConformanceEventModeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRConformanceEventModeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRConformanceResourceStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRConformanceResourceStatusListTest.php index 91ebebc56e..e0dfa21a37 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRConformanceResourceStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRConformanceResourceStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRConformanceStatementKindListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRConformanceStatementKindListTest.php index aabd4beebc..094f693a5b 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRConformanceStatementKindListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRConformanceStatementKindListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRConstraintSeverityListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRConstraintSeverityListTest.php index 6d972d5e9e..d173d0ab45 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRConstraintSeverityListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRConstraintSeverityListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRContactPointSystemListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRContactPointSystemListTest.php index ed873df3e1..18365d9f78 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRContactPointSystemListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRContactPointSystemListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRContactPointUseListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRContactPointUseListTest.php index eda174c8c7..4ce8a2cf58 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRContactPointUseListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRContactPointUseListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRContentTypeListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRContentTypeListTest.php index ef07fcaa08..0aa451738f 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRContentTypeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRContentTypeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRDataElementStringencyListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRDataElementStringencyListTest.php index afe804b31a..a8668c9a2d 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRDataElementStringencyListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRDataElementStringencyListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRDatePrimitiveTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRDatePrimitiveTest.php index 19a5e299c5..0ab682f3de 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRDatePrimitiveTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRDatePrimitiveTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRDateTimePrimitiveTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRDateTimePrimitiveTest.php index 502f13641d..e195413d0f 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRDateTimePrimitiveTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRDateTimePrimitiveTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRDaysOfWeekListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRDaysOfWeekListTest.php index b957a04191..b7cb6c606e 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRDaysOfWeekListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRDaysOfWeekListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRDecimalPrimitiveTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRDecimalPrimitiveTest.php index 30a1d7dd0f..d55130df3d 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRDecimalPrimitiveTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRDecimalPrimitiveTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRDetectedIssueSeverityListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRDetectedIssueSeverityListTest.php index 9cdffa5cd0..8927201d58 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRDetectedIssueSeverityListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRDetectedIssueSeverityListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRDeviceMetricCalibrationStateListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRDeviceMetricCalibrationStateListTest.php index 51104ea3fc..9430231054 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRDeviceMetricCalibrationStateListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRDeviceMetricCalibrationStateListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRDeviceMetricCalibrationTypeListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRDeviceMetricCalibrationTypeListTest.php index 0743af4ce1..1604c49996 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRDeviceMetricCalibrationTypeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRDeviceMetricCalibrationTypeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRDeviceMetricCategoryListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRDeviceMetricCategoryListTest.php index b0ecc8c748..120fd68471 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRDeviceMetricCategoryListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRDeviceMetricCategoryListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRDeviceMetricColorListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRDeviceMetricColorListTest.php index 3ff2a20eb8..6b877a87ea 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRDeviceMetricColorListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRDeviceMetricColorListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRDeviceMetricOperationalStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRDeviceMetricOperationalStatusListTest.php index 7a6de3fa2e..97361cd4a2 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRDeviceMetricOperationalStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRDeviceMetricOperationalStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRDeviceStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRDeviceStatusListTest.php index 9204813185..e07f1c6c7a 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRDeviceStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRDeviceStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRDeviceUseRequestPriorityListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRDeviceUseRequestPriorityListTest.php index 6ff864e76e..d02e71d5d2 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRDeviceUseRequestPriorityListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRDeviceUseRequestPriorityListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRDeviceUseRequestStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRDeviceUseRequestStatusListTest.php index 433d11fb1e..afdf78b540 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRDeviceUseRequestStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRDeviceUseRequestStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRDiagnosticOrderPriorityListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRDiagnosticOrderPriorityListTest.php index 1d9c697a9e..a89509bf2a 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRDiagnosticOrderPriorityListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRDiagnosticOrderPriorityListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRDiagnosticOrderStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRDiagnosticOrderStatusListTest.php index 9bfd76a2c8..910af9126d 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRDiagnosticOrderStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRDiagnosticOrderStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRDiagnosticReportStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRDiagnosticReportStatusListTest.php index 7bc8c7b489..7374703c5d 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRDiagnosticReportStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRDiagnosticReportStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRDigitalMediaTypeListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRDigitalMediaTypeListTest.php index ff90fd40ce..d87e5bfcfa 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRDigitalMediaTypeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRDigitalMediaTypeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRDocumentModeListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRDocumentModeListTest.php index fc6d7161db..a7b03133e8 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRDocumentModeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRDocumentModeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRDocumentReferenceStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRDocumentReferenceStatusListTest.php index 23bfe8d8c8..24cc905aa5 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRDocumentReferenceStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRDocumentReferenceStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRDocumentRelationshipTypeListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRDocumentRelationshipTypeListTest.php index 7565cb3037..3de35cc767 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRDocumentRelationshipTypeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRDocumentRelationshipTypeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRAccountStatusTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRAccountStatusTest.php index e071e32471..888e2fce12 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRAccountStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRAccountStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRActionListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRActionListTest.php index 54f2d15c35..06de716973 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRActionListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRActionListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRAddressTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRAddressTest.php index 5ae525e4d0..70c397cbe5 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRAddressTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRAddressTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRAddressTypeTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRAddressTypeTest.php index 045b2aa502..b4f3941bc4 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRAddressTypeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRAddressTypeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRAddressUseTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRAddressUseTest.php index 6983a6b026..e9e3c4c8f7 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRAddressUseTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRAddressUseTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRAdministrativeGenderTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRAdministrativeGenderTest.php index b001eb9cff..465b00c560 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRAdministrativeGenderTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRAdministrativeGenderTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRAggregationModeTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRAggregationModeTest.php index f631d9a63f..a2407bc964 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRAggregationModeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRAggregationModeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRAllergyIntoleranceCategoryTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRAllergyIntoleranceCategoryTest.php index efff4eb4fa..97bee08ccf 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRAllergyIntoleranceCategoryTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRAllergyIntoleranceCategoryTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRAllergyIntoleranceCertaintyTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRAllergyIntoleranceCertaintyTest.php index 6db2095fa5..b1a9960c5b 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRAllergyIntoleranceCertaintyTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRAllergyIntoleranceCertaintyTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRAllergyIntoleranceCriticalityTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRAllergyIntoleranceCriticalityTest.php index be5bb781f3..0f749efaa5 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRAllergyIntoleranceCriticalityTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRAllergyIntoleranceCriticalityTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRAllergyIntoleranceSeverityTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRAllergyIntoleranceSeverityTest.php index 270fbd8a2a..9c5ccbee81 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRAllergyIntoleranceSeverityTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRAllergyIntoleranceSeverityTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRAllergyIntoleranceStatusTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRAllergyIntoleranceStatusTest.php index 4cc5de6783..a33162ce56 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRAllergyIntoleranceStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRAllergyIntoleranceStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRAllergyIntoleranceTypeTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRAllergyIntoleranceTypeTest.php index 64c211c6bf..4023bd7c45 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRAllergyIntoleranceTypeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRAllergyIntoleranceTypeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRAnnotationTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRAnnotationTest.php index d68b9ab537..cb6fa52b48 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRAnnotationTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRAnnotationTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRAnswerFormatTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRAnswerFormatTest.php index 4271ff5d14..50061e187a 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRAnswerFormatTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRAnswerFormatTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRAppointmentStatusTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRAppointmentStatusTest.php index 737904ed6f..01013a58ce 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRAppointmentStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRAppointmentStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRAssertionDirectionTypeTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRAssertionDirectionTypeTest.php index 0127ae5a46..fc3d69ac03 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRAssertionDirectionTypeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRAssertionDirectionTypeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRAssertionOperatorTypeTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRAssertionOperatorTypeTest.php index 68922a382a..948dbc748a 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRAssertionOperatorTypeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRAssertionOperatorTypeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRAssertionResponseTypesTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRAssertionResponseTypesTest.php index 33266d8054..75abc44528 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRAssertionResponseTypesTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRAssertionResponseTypesTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRAttachmentTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRAttachmentTest.php index df26dd893f..492495d008 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRAttachmentTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRAttachmentTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRAuditEventActionTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRAuditEventActionTest.php index eac52851cc..2795f9622c 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRAuditEventActionTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRAuditEventActionTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRAuditEventOutcomeTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRAuditEventOutcomeTest.php index 35138b59df..4fa5f757f6 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRAuditEventOutcomeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRAuditEventOutcomeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRAuditEventParticipantNetworkTypeTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRAuditEventParticipantNetworkTypeTest.php index 7842909592..7aa8843624 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRAuditEventParticipantNetworkTypeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRAuditEventParticipantNetworkTypeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRAllergyIntolerance/FHIRAllergyIntoleranceReactionTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRAllergyIntolerance/FHIRAllergyIntoleranceReactionTest.php index e50fc2e086..fff81f0bd5 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRAllergyIntolerance/FHIRAllergyIntoleranceReactionTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRAllergyIntolerance/FHIRAllergyIntoleranceReactionTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRAppointment/FHIRAppointmentParticipantTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRAppointment/FHIRAppointmentParticipantTest.php index ef52269a8b..036526046f 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRAppointment/FHIRAppointmentParticipantTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRAppointment/FHIRAppointmentParticipantTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRAuditEvent/FHIRAuditEventDetailTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRAuditEvent/FHIRAuditEventDetailTest.php index c9bc9814bb..8c63ce671b 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRAuditEvent/FHIRAuditEventDetailTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRAuditEvent/FHIRAuditEventDetailTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRAuditEvent/FHIRAuditEventEventTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRAuditEvent/FHIRAuditEventEventTest.php index 37d6e13b7d..13b15a8ec9 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRAuditEvent/FHIRAuditEventEventTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRAuditEvent/FHIRAuditEventEventTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRAuditEvent/FHIRAuditEventNetworkTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRAuditEvent/FHIRAuditEventNetworkTest.php index cae7ee9351..13c3561725 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRAuditEvent/FHIRAuditEventNetworkTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRAuditEvent/FHIRAuditEventNetworkTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRAuditEvent/FHIRAuditEventObjectTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRAuditEvent/FHIRAuditEventObjectTest.php index cde8cdeae8..0d676f8b54 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRAuditEvent/FHIRAuditEventObjectTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRAuditEvent/FHIRAuditEventObjectTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRAuditEvent/FHIRAuditEventParticipantTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRAuditEvent/FHIRAuditEventParticipantTest.php index 9c435a648a..f2506de1fc 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRAuditEvent/FHIRAuditEventParticipantTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRAuditEvent/FHIRAuditEventParticipantTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRAuditEvent/FHIRAuditEventSourceTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRAuditEvent/FHIRAuditEventSourceTest.php index 259780f7b3..01d1790769 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRAuditEvent/FHIRAuditEventSourceTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRAuditEvent/FHIRAuditEventSourceTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRBundle/FHIRBundleEntryTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRBundle/FHIRBundleEntryTest.php index e1ae0e1ba0..17e2ec3e6b 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRBundle/FHIRBundleEntryTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRBundle/FHIRBundleEntryTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRBundle/FHIRBundleLinkTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRBundle/FHIRBundleLinkTest.php index 30c9f5155d..1b44be36fc 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRBundle/FHIRBundleLinkTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRBundle/FHIRBundleLinkTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRBundle/FHIRBundleRequestTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRBundle/FHIRBundleRequestTest.php index 4572332237..1284a57d55 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRBundle/FHIRBundleRequestTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRBundle/FHIRBundleRequestTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRBundle/FHIRBundleResponseTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRBundle/FHIRBundleResponseTest.php index d3fe1af80d..1581e3e271 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRBundle/FHIRBundleResponseTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRBundle/FHIRBundleResponseTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRBundle/FHIRBundleSearchTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRBundle/FHIRBundleSearchTest.php index dcb6833305..619740fe52 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRBundle/FHIRBundleSearchTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRBundle/FHIRBundleSearchTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCarePlan/FHIRCarePlanActivityTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCarePlan/FHIRCarePlanActivityTest.php index c04388afda..826d699ffa 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCarePlan/FHIRCarePlanActivityTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCarePlan/FHIRCarePlanActivityTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCarePlan/FHIRCarePlanDetailTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCarePlan/FHIRCarePlanDetailTest.php index bbcbe4f847..29371f1d7b 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCarePlan/FHIRCarePlanDetailTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCarePlan/FHIRCarePlanDetailTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCarePlan/FHIRCarePlanParticipantTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCarePlan/FHIRCarePlanParticipantTest.php index 7dd1decf9f..42c6982936 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCarePlan/FHIRCarePlanParticipantTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCarePlan/FHIRCarePlanParticipantTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCarePlan/FHIRCarePlanRelatedPlanTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCarePlan/FHIRCarePlanRelatedPlanTest.php index b4b15d9a04..7229b8017e 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCarePlan/FHIRCarePlanRelatedPlanTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCarePlan/FHIRCarePlanRelatedPlanTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimCoverageTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimCoverageTest.php index 7aa4c49208..606e98a737 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimCoverageTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimCoverageTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimDetailTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimDetailTest.php index b766c22e9b..06476a99f4 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimDetailTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimDetailTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimDiagnosisTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimDiagnosisTest.php index 554a5a67bc..c24d27f9bd 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimDiagnosisTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimDiagnosisTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimItemTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimItemTest.php index 92f6376e48..bc53c0a53e 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimItemTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimItemTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimMissingTeethTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimMissingTeethTest.php index 0ff2ab977b..3d985c2d03 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimMissingTeethTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimMissingTeethTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimPayeeTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimPayeeTest.php index 5e9abedf1c..767e7be88d 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimPayeeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimPayeeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimProsthesisTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimProsthesisTest.php index d8aded5c06..ac45ade524 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimProsthesisTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimProsthesisTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimSubDetailTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimSubDetailTest.php index 00d3a74ed1..79bd9a6b6e 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimSubDetailTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimSubDetailTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseAddItemTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseAddItemTest.php index 4a12639a16..f3d71a9f8e 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseAddItemTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseAddItemTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseAdjudication1Test.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseAdjudication1Test.php index cd110d7cd5..80b6b9549d 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseAdjudication1Test.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseAdjudication1Test.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseAdjudication2Test.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseAdjudication2Test.php index bcc0f415b5..41ea9065de 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseAdjudication2Test.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseAdjudication2Test.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseAdjudication3Test.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseAdjudication3Test.php index 056993059b..ce1bd79825 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseAdjudication3Test.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseAdjudication3Test.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseAdjudication4Test.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseAdjudication4Test.php index 8471398e52..61328ab7a9 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseAdjudication4Test.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseAdjudication4Test.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseAdjudicationTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseAdjudicationTest.php index a7f0e98b13..96c288c815 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseAdjudicationTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseAdjudicationTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseCoverageTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseCoverageTest.php index dcdcd9071a..6ebd4c88e2 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseCoverageTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseCoverageTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseDetail1Test.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseDetail1Test.php index f555b69566..9e181b46e0 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseDetail1Test.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseDetail1Test.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseDetailTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseDetailTest.php index 2fb0983aed..6e3d7574fc 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseDetailTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseDetailTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseErrorTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseErrorTest.php index 884aad7933..2ba6ba65b4 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseErrorTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseErrorTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseItemTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseItemTest.php index 6c266f4d65..6057172fb2 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseItemTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseItemTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseNoteTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseNoteTest.php index 546cece4a8..3bb465170d 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseNoteTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseNoteTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseSubDetailTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseSubDetailTest.php index b42b12ebda..9068c927f2 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseSubDetailTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseSubDetailTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClinicalImpression/FHIRClinicalImpressionFindingTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClinicalImpression/FHIRClinicalImpressionFindingTest.php index c8eaccb806..010998772b 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClinicalImpression/FHIRClinicalImpressionFindingTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClinicalImpression/FHIRClinicalImpressionFindingTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClinicalImpression/FHIRClinicalImpressionInvestigationsTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClinicalImpression/FHIRClinicalImpressionInvestigationsTest.php index 301134808b..5ab5f891e3 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClinicalImpression/FHIRClinicalImpressionInvestigationsTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClinicalImpression/FHIRClinicalImpressionInvestigationsTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClinicalImpression/FHIRClinicalImpressionRuledOutTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClinicalImpression/FHIRClinicalImpressionRuledOutTest.php index 82d822ad54..a88fb98143 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClinicalImpression/FHIRClinicalImpressionRuledOutTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClinicalImpression/FHIRClinicalImpressionRuledOutTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCommunication/FHIRCommunicationPayloadTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCommunication/FHIRCommunicationPayloadTest.php index 9009e1c9fc..a14aca0618 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCommunication/FHIRCommunicationPayloadTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCommunication/FHIRCommunicationPayloadTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCommunicationRequest/FHIRCommunicationRequestPayloadTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCommunicationRequest/FHIRCommunicationRequestPayloadTest.php index 492e16acf6..70286f9977 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCommunicationRequest/FHIRCommunicationRequestPayloadTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCommunicationRequest/FHIRCommunicationRequestPayloadTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRComposition/FHIRCompositionAttesterTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRComposition/FHIRCompositionAttesterTest.php index b03f2386c7..8965da7ea0 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRComposition/FHIRCompositionAttesterTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRComposition/FHIRCompositionAttesterTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRComposition/FHIRCompositionEventTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRComposition/FHIRCompositionEventTest.php index 7f11c6fe37..16834fb049 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRComposition/FHIRCompositionEventTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRComposition/FHIRCompositionEventTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRComposition/FHIRCompositionSectionTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRComposition/FHIRCompositionSectionTest.php index 9098aa4019..e04996657e 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRComposition/FHIRCompositionSectionTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRComposition/FHIRCompositionSectionTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConceptMap/FHIRConceptMapContactTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConceptMap/FHIRConceptMapContactTest.php index b59e1bac0a..ac8d75ff1e 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConceptMap/FHIRConceptMapContactTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConceptMap/FHIRConceptMapContactTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConceptMap/FHIRConceptMapDependsOnTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConceptMap/FHIRConceptMapDependsOnTest.php index 80fc145e5f..ef2f41cf0c 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConceptMap/FHIRConceptMapDependsOnTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConceptMap/FHIRConceptMapDependsOnTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConceptMap/FHIRConceptMapElementTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConceptMap/FHIRConceptMapElementTest.php index 00f9efccc5..342ef267e9 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConceptMap/FHIRConceptMapElementTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConceptMap/FHIRConceptMapElementTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConceptMap/FHIRConceptMapTargetTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConceptMap/FHIRConceptMapTargetTest.php index c5bd254d7b..e2df4b6b67 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConceptMap/FHIRConceptMapTargetTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConceptMap/FHIRConceptMapTargetTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCondition/FHIRConditionEvidenceTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCondition/FHIRConditionEvidenceTest.php index 2c4ff647f8..16e61fe4c3 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCondition/FHIRConditionEvidenceTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCondition/FHIRConditionEvidenceTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCondition/FHIRConditionStageTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCondition/FHIRConditionStageTest.php index c2d71d6b82..9d9e2bba22 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCondition/FHIRConditionStageTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCondition/FHIRConditionStageTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceCertificateTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceCertificateTest.php index d1807c9615..935ce7cc33 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceCertificateTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceCertificateTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceContactTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceContactTest.php index 4cc37ae7f8..8dcf7ab83c 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceContactTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceContactTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceDocumentTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceDocumentTest.php index cbe5dc023c..d09fdb5cdc 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceDocumentTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceDocumentTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceEndpointTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceEndpointTest.php index eeb9a6ab46..65a2892bd6 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceEndpointTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceEndpointTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceEventTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceEventTest.php index 11161f2366..e8ca03cf74 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceEventTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceEventTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceImplementationTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceImplementationTest.php index bf9feafc2b..b1100db0ae 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceImplementationTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceImplementationTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceInteraction1Test.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceInteraction1Test.php index 7a69ded727..2f134681ea 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceInteraction1Test.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceInteraction1Test.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceInteractionTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceInteractionTest.php index f218b5e0af..e6536b123f 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceInteractionTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceInteractionTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceMessagingTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceMessagingTest.php index 6f6e54c020..a9efd46537 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceMessagingTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceMessagingTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceOperationTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceOperationTest.php index 863ceea122..6e10a35a9d 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceOperationTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceOperationTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceResourceTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceResourceTest.php index 39b49afeaa..3d618c7ce7 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceResourceTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceResourceTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceRestTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceRestTest.php index a603fa193a..ec4369ac84 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceRestTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceRestTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceSearchParamTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceSearchParamTest.php index 6163ad8df0..1c0959629d 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceSearchParamTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceSearchParamTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceSecurityTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceSecurityTest.php index f93b77670a..6e39c001af 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceSecurityTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceSecurityTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceSoftwareTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceSoftwareTest.php index d7a7159add..b3a9c1b0aa 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceSoftwareTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConformance/FHIRConformanceSoftwareTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractActor1Test.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractActor1Test.php index 377b89cc4c..9064cb3e7d 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractActor1Test.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractActor1Test.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractActorTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractActorTest.php index 45fa4b22c3..0fd30da49c 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractActorTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractActorTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractFriendlyTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractFriendlyTest.php index e18df915a0..3b935beaf7 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractFriendlyTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractFriendlyTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractLegalTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractLegalTest.php index 607e802b00..e14f59f1b9 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractLegalTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractLegalTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractRuleTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractRuleTest.php index 6176406958..9e69d081fe 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractRuleTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractRuleTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractSignerTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractSignerTest.php index bb552b96fd..d9e8f1c541 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractSignerTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractSignerTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractTermTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractTermTest.php index a4393912dd..ad0b924952 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractTermTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractTermTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractValuedItem1Test.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractValuedItem1Test.php index dd7745d658..01e993f28a 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractValuedItem1Test.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractValuedItem1Test.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractValuedItemTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractValuedItemTest.php index ff185b0359..5b300a315f 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractValuedItemTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractValuedItemTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDataElement/FHIRDataElementContactTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDataElement/FHIRDataElementContactTest.php index 7a50663183..62afcf97fe 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDataElement/FHIRDataElementContactTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDataElement/FHIRDataElementContactTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDataElement/FHIRDataElementMappingTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDataElement/FHIRDataElementMappingTest.php index ddd50e847f..dbad3f6dff 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDataElement/FHIRDataElementMappingTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDataElement/FHIRDataElementMappingTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDetectedIssue/FHIRDetectedIssueMitigationTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDetectedIssue/FHIRDetectedIssueMitigationTest.php index 9703cab6ec..e01c013fa7 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDetectedIssue/FHIRDetectedIssueMitigationTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDetectedIssue/FHIRDetectedIssueMitigationTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDeviceComponent/FHIRDeviceComponentProductionSpecificationTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDeviceComponent/FHIRDeviceComponentProductionSpecificationTest.php index b206d655b0..2f2843901a 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDeviceComponent/FHIRDeviceComponentProductionSpecificationTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDeviceComponent/FHIRDeviceComponentProductionSpecificationTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDeviceMetric/FHIRDeviceMetricCalibrationTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDeviceMetric/FHIRDeviceMetricCalibrationTest.php index 05ec8aff9a..bf932030c3 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDeviceMetric/FHIRDeviceMetricCalibrationTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDeviceMetric/FHIRDeviceMetricCalibrationTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDiagnosticOrder/FHIRDiagnosticOrderEventTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDiagnosticOrder/FHIRDiagnosticOrderEventTest.php index 2358a48cc1..fb9430b41e 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDiagnosticOrder/FHIRDiagnosticOrderEventTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDiagnosticOrder/FHIRDiagnosticOrderEventTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDiagnosticOrder/FHIRDiagnosticOrderItemTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDiagnosticOrder/FHIRDiagnosticOrderItemTest.php index 5300b37872..f43368977b 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDiagnosticOrder/FHIRDiagnosticOrderItemTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDiagnosticOrder/FHIRDiagnosticOrderItemTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDiagnosticReport/FHIRDiagnosticReportImageTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDiagnosticReport/FHIRDiagnosticReportImageTest.php index 59598c839b..62d1a635a2 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDiagnosticReport/FHIRDiagnosticReportImageTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDiagnosticReport/FHIRDiagnosticReportImageTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDocumentManifest/FHIRDocumentManifestContentTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDocumentManifest/FHIRDocumentManifestContentTest.php index 9c50a377fe..8977d80ab1 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDocumentManifest/FHIRDocumentManifestContentTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDocumentManifest/FHIRDocumentManifestContentTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDocumentManifest/FHIRDocumentManifestRelatedTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDocumentManifest/FHIRDocumentManifestRelatedTest.php index 77e5c008a3..d5079cd24f 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDocumentManifest/FHIRDocumentManifestRelatedTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDocumentManifest/FHIRDocumentManifestRelatedTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDocumentReference/FHIRDocumentReferenceContentTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDocumentReference/FHIRDocumentReferenceContentTest.php index 650b75658f..0717f7b4d9 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDocumentReference/FHIRDocumentReferenceContentTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDocumentReference/FHIRDocumentReferenceContentTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDocumentReference/FHIRDocumentReferenceContextTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDocumentReference/FHIRDocumentReferenceContextTest.php index 38f290a40b..41adf47fac 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDocumentReference/FHIRDocumentReferenceContextTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDocumentReference/FHIRDocumentReferenceContextTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDocumentReference/FHIRDocumentReferenceRelatedTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDocumentReference/FHIRDocumentReferenceRelatedTest.php index 20c392f7ca..d7aeacf467 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDocumentReference/FHIRDocumentReferenceRelatedTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDocumentReference/FHIRDocumentReferenceRelatedTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDocumentReference/FHIRDocumentReferenceRelatesToTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDocumentReference/FHIRDocumentReferenceRelatesToTest.php index f5e232e1c7..7dee1565cc 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDocumentReference/FHIRDocumentReferenceRelatesToTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDocumentReference/FHIRDocumentReferenceRelatesToTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIREncounter/FHIREncounterHospitalizationTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIREncounter/FHIREncounterHospitalizationTest.php index 2af9d04172..80c818a4d1 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIREncounter/FHIREncounterHospitalizationTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIREncounter/FHIREncounterHospitalizationTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIREncounter/FHIREncounterLocationTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIREncounter/FHIREncounterLocationTest.php index 36cce92b64..794e4674a5 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIREncounter/FHIREncounterLocationTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIREncounter/FHIREncounterLocationTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIREncounter/FHIREncounterParticipantTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIREncounter/FHIREncounterParticipantTest.php index 8b1ac9f42c..c96f1df6c8 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIREncounter/FHIREncounterParticipantTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIREncounter/FHIREncounterParticipantTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIREncounter/FHIREncounterStatusHistoryTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIREncounter/FHIREncounterStatusHistoryTest.php index faa43fed8a..a605c4a3e8 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIREncounter/FHIREncounterStatusHistoryTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIREncounter/FHIREncounterStatusHistoryTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIREpisodeOfCare/FHIREpisodeOfCareCareTeamTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIREpisodeOfCare/FHIREpisodeOfCareCareTeamTest.php index 615f0d2abe..3fe3ebd905 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIREpisodeOfCare/FHIREpisodeOfCareCareTeamTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIREpisodeOfCare/FHIREpisodeOfCareCareTeamTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIREpisodeOfCare/FHIREpisodeOfCareStatusHistoryTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIREpisodeOfCare/FHIREpisodeOfCareStatusHistoryTest.php index 81795dd2f8..84b9ae1863 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIREpisodeOfCare/FHIREpisodeOfCareStatusHistoryTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIREpisodeOfCare/FHIREpisodeOfCareStatusHistoryTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRFamilyMemberHistory/FHIRFamilyMemberHistoryConditionTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRFamilyMemberHistory/FHIRFamilyMemberHistoryConditionTest.php index d353b0b057..00e51b4e5e 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRFamilyMemberHistory/FHIRFamilyMemberHistoryConditionTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRFamilyMemberHistory/FHIRFamilyMemberHistoryConditionTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRGoal/FHIRGoalOutcomeTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRGoal/FHIRGoalOutcomeTest.php index 4881b6cfb0..a53dcb5b22 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRGoal/FHIRGoalOutcomeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRGoal/FHIRGoalOutcomeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRGroup/FHIRGroupCharacteristicTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRGroup/FHIRGroupCharacteristicTest.php index 279c8d565f..f4d15b07f9 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRGroup/FHIRGroupCharacteristicTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRGroup/FHIRGroupCharacteristicTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRGroup/FHIRGroupMemberTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRGroup/FHIRGroupMemberTest.php index b071a4e342..1958aed1cc 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRGroup/FHIRGroupMemberTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRGroup/FHIRGroupMemberTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRHealthcareService/FHIRHealthcareServiceAvailableTimeTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRHealthcareService/FHIRHealthcareServiceAvailableTimeTest.php index 9f3fd2b843..fe9d1b6b69 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRHealthcareService/FHIRHealthcareServiceAvailableTimeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRHealthcareService/FHIRHealthcareServiceAvailableTimeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRHealthcareService/FHIRHealthcareServiceNotAvailableTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRHealthcareService/FHIRHealthcareServiceNotAvailableTest.php index b0d361e468..e23069b8f9 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRHealthcareService/FHIRHealthcareServiceNotAvailableTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRHealthcareService/FHIRHealthcareServiceNotAvailableTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRHealthcareService/FHIRHealthcareServiceServiceTypeTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRHealthcareService/FHIRHealthcareServiceServiceTypeTest.php index ec5f005c1d..4f5eab02c2 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRHealthcareService/FHIRHealthcareServiceServiceTypeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRHealthcareService/FHIRHealthcareServiceServiceTypeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImagingObjectSelection/FHIRImagingObjectSelectionFramesTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImagingObjectSelection/FHIRImagingObjectSelectionFramesTest.php index a3a5741f70..99498c8c98 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImagingObjectSelection/FHIRImagingObjectSelectionFramesTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImagingObjectSelection/FHIRImagingObjectSelectionFramesTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImagingObjectSelection/FHIRImagingObjectSelectionInstanceTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImagingObjectSelection/FHIRImagingObjectSelectionInstanceTest.php index 83c5675da0..f8abf58560 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImagingObjectSelection/FHIRImagingObjectSelectionInstanceTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImagingObjectSelection/FHIRImagingObjectSelectionInstanceTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImagingObjectSelection/FHIRImagingObjectSelectionSeriesTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImagingObjectSelection/FHIRImagingObjectSelectionSeriesTest.php index 3a63912b11..f5a4788b86 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImagingObjectSelection/FHIRImagingObjectSelectionSeriesTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImagingObjectSelection/FHIRImagingObjectSelectionSeriesTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImagingObjectSelection/FHIRImagingObjectSelectionStudyTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImagingObjectSelection/FHIRImagingObjectSelectionStudyTest.php index a397bf903f..f581289157 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImagingObjectSelection/FHIRImagingObjectSelectionStudyTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImagingObjectSelection/FHIRImagingObjectSelectionStudyTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImagingStudy/FHIRImagingStudyInstanceTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImagingStudy/FHIRImagingStudyInstanceTest.php index cee572776d..be10313e2b 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImagingStudy/FHIRImagingStudyInstanceTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImagingStudy/FHIRImagingStudyInstanceTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImagingStudy/FHIRImagingStudySeriesTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImagingStudy/FHIRImagingStudySeriesTest.php index 642b9ae272..3d05587e31 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImagingStudy/FHIRImagingStudySeriesTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImagingStudy/FHIRImagingStudySeriesTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImmunization/FHIRImmunizationExplanationTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImmunization/FHIRImmunizationExplanationTest.php index db825923ef..ff5efa9362 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImmunization/FHIRImmunizationExplanationTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImmunization/FHIRImmunizationExplanationTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImmunization/FHIRImmunizationReactionTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImmunization/FHIRImmunizationReactionTest.php index 399b03c6ba..549dcf4ec2 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImmunization/FHIRImmunizationReactionTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImmunization/FHIRImmunizationReactionTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImmunization/FHIRImmunizationVaccinationProtocolTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImmunization/FHIRImmunizationVaccinationProtocolTest.php index 67841de480..0cbdfb33d3 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImmunization/FHIRImmunizationVaccinationProtocolTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImmunization/FHIRImmunizationVaccinationProtocolTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImmunizationRecommendation/FHIRImmunizationRecommendationDateCriterionTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImmunizationRecommendation/FHIRImmunizationRecommendationDateCriterionTest.php index f73f8ddcec..9de4b56238 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImmunizationRecommendation/FHIRImmunizationRecommendationDateCriterionTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImmunizationRecommendation/FHIRImmunizationRecommendationDateCriterionTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImmunizationRecommendation/FHIRImmunizationRecommendationProtocolTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImmunizationRecommendation/FHIRImmunizationRecommendationProtocolTest.php index c7ddc6dfb8..1eb0929464 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImmunizationRecommendation/FHIRImmunizationRecommendationProtocolTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImmunizationRecommendation/FHIRImmunizationRecommendationProtocolTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImmunizationRecommendation/FHIRImmunizationRecommendationRecommendationTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImmunizationRecommendation/FHIRImmunizationRecommendationRecommendationTest.php index 26b6dfa46f..942a679685 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImmunizationRecommendation/FHIRImmunizationRecommendationRecommendationTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImmunizationRecommendation/FHIRImmunizationRecommendationRecommendationTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuideContactTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuideContactTest.php index 1c6fbc85d2..2baa464008 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuideContactTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuideContactTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuideDependencyTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuideDependencyTest.php index 39b8bc9452..bf8ca211d6 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuideDependencyTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuideDependencyTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuideGlobalTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuideGlobalTest.php index 68dedbab94..7ddfac4dba 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuideGlobalTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuideGlobalTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuidePackageTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuidePackageTest.php index 4d6e93faa3..8852c2cf91 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuidePackageTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuidePackageTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuidePageTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuidePageTest.php index 9a5b098580..4c619514be 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuidePageTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuidePageTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuideResourceTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuideResourceTest.php index 68ee0b0259..f265ce94c9 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuideResourceTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuideResourceTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRList/FHIRListEntryTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRList/FHIRListEntryTest.php index db4d05a798..14256d14b2 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRList/FHIRListEntryTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRList/FHIRListEntryTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRLocation/FHIRLocationPositionTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRLocation/FHIRLocationPositionTest.php index 1b3fe3cf73..45a7277be5 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRLocation/FHIRLocationPositionTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRLocation/FHIRLocationPositionTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedication/FHIRMedicationBatchTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedication/FHIRMedicationBatchTest.php index 2d0342458a..fc696e98d6 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedication/FHIRMedicationBatchTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedication/FHIRMedicationBatchTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedication/FHIRMedicationContentTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedication/FHIRMedicationContentTest.php index 661b87c496..efb7202b5c 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedication/FHIRMedicationContentTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedication/FHIRMedicationContentTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedication/FHIRMedicationIngredientTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedication/FHIRMedicationIngredientTest.php index b953b351b7..e1a773b10e 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedication/FHIRMedicationIngredientTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedication/FHIRMedicationIngredientTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedication/FHIRMedicationPackageTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedication/FHIRMedicationPackageTest.php index e2882fbbe0..7997fbdd67 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedication/FHIRMedicationPackageTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedication/FHIRMedicationPackageTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedication/FHIRMedicationProductTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedication/FHIRMedicationProductTest.php index 045856f108..9b2cac7273 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedication/FHIRMedicationProductTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedication/FHIRMedicationProductTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationAdministration/FHIRMedicationAdministrationDosageTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationAdministration/FHIRMedicationAdministrationDosageTest.php index 2e9c0af3f4..ab37f40f51 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationAdministration/FHIRMedicationAdministrationDosageTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationAdministration/FHIRMedicationAdministrationDosageTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationDispense/FHIRMedicationDispenseDosageInstructionTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationDispense/FHIRMedicationDispenseDosageInstructionTest.php index 250e02f295..0a23ba7e9b 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationDispense/FHIRMedicationDispenseDosageInstructionTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationDispense/FHIRMedicationDispenseDosageInstructionTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationDispense/FHIRMedicationDispenseSubstitutionTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationDispense/FHIRMedicationDispenseSubstitutionTest.php index fe8f69431f..89cd9d4385 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationDispense/FHIRMedicationDispenseSubstitutionTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationDispense/FHIRMedicationDispenseSubstitutionTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationOrder/FHIRMedicationOrderDispenseRequestTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationOrder/FHIRMedicationOrderDispenseRequestTest.php index f396cdecf4..9e58799b50 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationOrder/FHIRMedicationOrderDispenseRequestTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationOrder/FHIRMedicationOrderDispenseRequestTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationOrder/FHIRMedicationOrderDosageInstructionTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationOrder/FHIRMedicationOrderDosageInstructionTest.php index cbca8e9df7..55335c12ad 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationOrder/FHIRMedicationOrderDosageInstructionTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationOrder/FHIRMedicationOrderDosageInstructionTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationOrder/FHIRMedicationOrderSubstitutionTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationOrder/FHIRMedicationOrderSubstitutionTest.php index 152d963871..c2d7b8081b 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationOrder/FHIRMedicationOrderSubstitutionTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationOrder/FHIRMedicationOrderSubstitutionTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationStatement/FHIRMedicationStatementDosageTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationStatement/FHIRMedicationStatementDosageTest.php index 68a7c43883..8bb757ce22 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationStatement/FHIRMedicationStatementDosageTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationStatement/FHIRMedicationStatementDosageTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMessageHeader/FHIRMessageHeaderDestinationTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMessageHeader/FHIRMessageHeaderDestinationTest.php index aa3e120be8..facb565318 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMessageHeader/FHIRMessageHeaderDestinationTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMessageHeader/FHIRMessageHeaderDestinationTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMessageHeader/FHIRMessageHeaderResponseTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMessageHeader/FHIRMessageHeaderResponseTest.php index f2b598090d..87a3c9bbc8 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMessageHeader/FHIRMessageHeaderResponseTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMessageHeader/FHIRMessageHeaderResponseTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMessageHeader/FHIRMessageHeaderSourceTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMessageHeader/FHIRMessageHeaderSourceTest.php index 750332e16e..df6f5366e6 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMessageHeader/FHIRMessageHeaderSourceTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMessageHeader/FHIRMessageHeaderSourceTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRNamingSystem/FHIRNamingSystemContactTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRNamingSystem/FHIRNamingSystemContactTest.php index 64f7fc937c..b8fddcf3b5 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRNamingSystem/FHIRNamingSystemContactTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRNamingSystem/FHIRNamingSystemContactTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRNamingSystem/FHIRNamingSystemUniqueIdTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRNamingSystem/FHIRNamingSystemUniqueIdTest.php index 72e3c52fc4..ae4a59a74b 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRNamingSystem/FHIRNamingSystemUniqueIdTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRNamingSystem/FHIRNamingSystemUniqueIdTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRNutritionOrder/FHIRNutritionOrderAdministrationTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRNutritionOrder/FHIRNutritionOrderAdministrationTest.php index d3fa6504bc..148279594a 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRNutritionOrder/FHIRNutritionOrderAdministrationTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRNutritionOrder/FHIRNutritionOrderAdministrationTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRNutritionOrder/FHIRNutritionOrderEnteralFormulaTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRNutritionOrder/FHIRNutritionOrderEnteralFormulaTest.php index 3112fa92a6..65cec32bcc 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRNutritionOrder/FHIRNutritionOrderEnteralFormulaTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRNutritionOrder/FHIRNutritionOrderEnteralFormulaTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRNutritionOrder/FHIRNutritionOrderNutrientTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRNutritionOrder/FHIRNutritionOrderNutrientTest.php index 1ca2fc45bb..eddb45da58 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRNutritionOrder/FHIRNutritionOrderNutrientTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRNutritionOrder/FHIRNutritionOrderNutrientTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRNutritionOrder/FHIRNutritionOrderOralDietTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRNutritionOrder/FHIRNutritionOrderOralDietTest.php index c037a65f6d..c151c2e00c 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRNutritionOrder/FHIRNutritionOrderOralDietTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRNutritionOrder/FHIRNutritionOrderOralDietTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRNutritionOrder/FHIRNutritionOrderSupplementTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRNutritionOrder/FHIRNutritionOrderSupplementTest.php index 1f6e6dfa8e..b1eef0b32b 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRNutritionOrder/FHIRNutritionOrderSupplementTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRNutritionOrder/FHIRNutritionOrderSupplementTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRNutritionOrder/FHIRNutritionOrderTextureTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRNutritionOrder/FHIRNutritionOrderTextureTest.php index 40607fb1da..c8ca14f498 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRNutritionOrder/FHIRNutritionOrderTextureTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRNutritionOrder/FHIRNutritionOrderTextureTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRObservation/FHIRObservationComponentTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRObservation/FHIRObservationComponentTest.php index 69f29057a4..26a5ea2350 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRObservation/FHIRObservationComponentTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRObservation/FHIRObservationComponentTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRObservation/FHIRObservationReferenceRangeTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRObservation/FHIRObservationReferenceRangeTest.php index ece3c4cfb6..972fe443cb 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRObservation/FHIRObservationReferenceRangeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRObservation/FHIRObservationReferenceRangeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRObservation/FHIRObservationRelatedTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRObservation/FHIRObservationRelatedTest.php index 9ecb6b4be7..6b9622d29e 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRObservation/FHIRObservationRelatedTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRObservation/FHIRObservationRelatedTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIROperationDefinition/FHIROperationDefinitionBindingTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIROperationDefinition/FHIROperationDefinitionBindingTest.php index c951fede70..93a202d149 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIROperationDefinition/FHIROperationDefinitionBindingTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIROperationDefinition/FHIROperationDefinitionBindingTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIROperationDefinition/FHIROperationDefinitionContactTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIROperationDefinition/FHIROperationDefinitionContactTest.php index 688de3407d..5798332ea4 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIROperationDefinition/FHIROperationDefinitionContactTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIROperationDefinition/FHIROperationDefinitionContactTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIROperationDefinition/FHIROperationDefinitionParameterTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIROperationDefinition/FHIROperationDefinitionParameterTest.php index 3da489ebef..de38ff2b43 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIROperationDefinition/FHIROperationDefinitionParameterTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIROperationDefinition/FHIROperationDefinitionParameterTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIROperationOutcome/FHIROperationOutcomeIssueTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIROperationOutcome/FHIROperationOutcomeIssueTest.php index 12141b2a0b..db219fa56b 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIROperationOutcome/FHIROperationOutcomeIssueTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIROperationOutcome/FHIROperationOutcomeIssueTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIROrder/FHIROrderWhenTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIROrder/FHIROrderWhenTest.php index ad03c3e2de..41e596cd20 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIROrder/FHIROrderWhenTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIROrder/FHIROrderWhenTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIROrganization/FHIROrganizationContactTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIROrganization/FHIROrganizationContactTest.php index 149eee059e..dea53345f2 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIROrganization/FHIROrganizationContactTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIROrganization/FHIROrganizationContactTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRParameters/FHIRParametersParameterTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRParameters/FHIRParametersParameterTest.php index e91ef2ea35..24d2a5f882 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRParameters/FHIRParametersParameterTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRParameters/FHIRParametersParameterTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPatient/FHIRPatientAnimalTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPatient/FHIRPatientAnimalTest.php index ba817dbf79..a5401cb04b 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPatient/FHIRPatientAnimalTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPatient/FHIRPatientAnimalTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPatient/FHIRPatientCommunicationTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPatient/FHIRPatientCommunicationTest.php index 919eb86e18..d61e20a418 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPatient/FHIRPatientCommunicationTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPatient/FHIRPatientCommunicationTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPatient/FHIRPatientContactTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPatient/FHIRPatientContactTest.php index 83ea3d05b4..63b2ca541f 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPatient/FHIRPatientContactTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPatient/FHIRPatientContactTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPatient/FHIRPatientLinkTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPatient/FHIRPatientLinkTest.php index b5fba4a1cf..0059ff37a3 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPatient/FHIRPatientLinkTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPatient/FHIRPatientLinkTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPaymentReconciliation/FHIRPaymentReconciliationDetailTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPaymentReconciliation/FHIRPaymentReconciliationDetailTest.php index 643f3d378d..2bde840498 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPaymentReconciliation/FHIRPaymentReconciliationDetailTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPaymentReconciliation/FHIRPaymentReconciliationDetailTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPaymentReconciliation/FHIRPaymentReconciliationNoteTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPaymentReconciliation/FHIRPaymentReconciliationNoteTest.php index 04bd1d4cc9..85785103d7 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPaymentReconciliation/FHIRPaymentReconciliationNoteTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPaymentReconciliation/FHIRPaymentReconciliationNoteTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPerson/FHIRPersonLinkTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPerson/FHIRPersonLinkTest.php index 7f58e62f42..54479389fa 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPerson/FHIRPersonLinkTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPerson/FHIRPersonLinkTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPractitioner/FHIRPractitionerPractitionerRoleTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPractitioner/FHIRPractitionerPractitionerRoleTest.php index e8365e95a8..42c52cc154 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPractitioner/FHIRPractitionerPractitionerRoleTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPractitioner/FHIRPractitionerPractitionerRoleTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPractitioner/FHIRPractitionerQualificationTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPractitioner/FHIRPractitionerQualificationTest.php index 0245d24553..91eb2b9ab0 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPractitioner/FHIRPractitionerQualificationTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPractitioner/FHIRPractitionerQualificationTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRProcedure/FHIRProcedureFocalDeviceTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRProcedure/FHIRProcedureFocalDeviceTest.php index 3f6baef616..abb0b263ff 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRProcedure/FHIRProcedureFocalDeviceTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRProcedure/FHIRProcedureFocalDeviceTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRProcedure/FHIRProcedurePerformerTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRProcedure/FHIRProcedurePerformerTest.php index 6fc9a5b7ba..f01a6c6bb0 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRProcedure/FHIRProcedurePerformerTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRProcedure/FHIRProcedurePerformerTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRProcessRequest/FHIRProcessRequestItemTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRProcessRequest/FHIRProcessRequestItemTest.php index 3f2588b8d2..e695d85ccf 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRProcessRequest/FHIRProcessRequestItemTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRProcessRequest/FHIRProcessRequestItemTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRProcessResponse/FHIRProcessResponseNotesTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRProcessResponse/FHIRProcessResponseNotesTest.php index 06e3fb550b..abc0e01dd4 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRProcessResponse/FHIRProcessResponseNotesTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRProcessResponse/FHIRProcessResponseNotesTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRProvenance/FHIRProvenanceAgentTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRProvenance/FHIRProvenanceAgentTest.php index d1ea28d8fd..0613316ad8 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRProvenance/FHIRProvenanceAgentTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRProvenance/FHIRProvenanceAgentTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRProvenance/FHIRProvenanceEntityTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRProvenance/FHIRProvenanceEntityTest.php index 80e595c41d..d56723684c 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRProvenance/FHIRProvenanceEntityTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRProvenance/FHIRProvenanceEntityTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRProvenance/FHIRProvenanceRelatedAgentTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRProvenance/FHIRProvenanceRelatedAgentTest.php index 393281dd7c..ad9b16cd78 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRProvenance/FHIRProvenanceRelatedAgentTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRProvenance/FHIRProvenanceRelatedAgentTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRQuestionnaire/FHIRQuestionnaireGroupTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRQuestionnaire/FHIRQuestionnaireGroupTest.php index 57c244833d..5c60e06f24 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRQuestionnaire/FHIRQuestionnaireGroupTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRQuestionnaire/FHIRQuestionnaireGroupTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRQuestionnaire/FHIRQuestionnaireQuestionTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRQuestionnaire/FHIRQuestionnaireQuestionTest.php index 019c71c828..187695dec1 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRQuestionnaire/FHIRQuestionnaireQuestionTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRQuestionnaire/FHIRQuestionnaireQuestionTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRQuestionnaireResponse/FHIRQuestionnaireResponseAnswerTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRQuestionnaireResponse/FHIRQuestionnaireResponseAnswerTest.php index 2c8afb0795..10e69c05e6 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRQuestionnaireResponse/FHIRQuestionnaireResponseAnswerTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRQuestionnaireResponse/FHIRQuestionnaireResponseAnswerTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRQuestionnaireResponse/FHIRQuestionnaireResponseGroupTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRQuestionnaireResponse/FHIRQuestionnaireResponseGroupTest.php index 061b635e70..920184ecc8 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRQuestionnaireResponse/FHIRQuestionnaireResponseGroupTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRQuestionnaireResponse/FHIRQuestionnaireResponseGroupTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRQuestionnaireResponse/FHIRQuestionnaireResponseQuestionTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRQuestionnaireResponse/FHIRQuestionnaireResponseQuestionTest.php index fe53b9a616..ef00284c30 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRQuestionnaireResponse/FHIRQuestionnaireResponseQuestionTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRQuestionnaireResponse/FHIRQuestionnaireResponseQuestionTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRRiskAssessment/FHIRRiskAssessmentPredictionTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRRiskAssessment/FHIRRiskAssessmentPredictionTest.php index 31c2308787..36664c679f 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRRiskAssessment/FHIRRiskAssessmentPredictionTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRRiskAssessment/FHIRRiskAssessmentPredictionTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSearchParameter/FHIRSearchParameterContactTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSearchParameter/FHIRSearchParameterContactTest.php index 28a37adcc9..b7ef876353 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSearchParameter/FHIRSearchParameterContactTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSearchParameter/FHIRSearchParameterContactTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSpecimen/FHIRSpecimenCollectionTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSpecimen/FHIRSpecimenCollectionTest.php index 30fe4dd50c..dcf0750cbb 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSpecimen/FHIRSpecimenCollectionTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSpecimen/FHIRSpecimenCollectionTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSpecimen/FHIRSpecimenContainerTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSpecimen/FHIRSpecimenContainerTest.php index b162557dcb..6095f2ee82 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSpecimen/FHIRSpecimenContainerTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSpecimen/FHIRSpecimenContainerTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSpecimen/FHIRSpecimenTreatmentTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSpecimen/FHIRSpecimenTreatmentTest.php index 5d52944eab..ac37acb8c1 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSpecimen/FHIRSpecimenTreatmentTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSpecimen/FHIRSpecimenTreatmentTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRStructureDefinition/FHIRStructureDefinitionContactTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRStructureDefinition/FHIRStructureDefinitionContactTest.php index edbe8f96a9..4ebbc1c707 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRStructureDefinition/FHIRStructureDefinitionContactTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRStructureDefinition/FHIRStructureDefinitionContactTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRStructureDefinition/FHIRStructureDefinitionDifferentialTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRStructureDefinition/FHIRStructureDefinitionDifferentialTest.php index 36d0c2a59d..bf0252aa69 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRStructureDefinition/FHIRStructureDefinitionDifferentialTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRStructureDefinition/FHIRStructureDefinitionDifferentialTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRStructureDefinition/FHIRStructureDefinitionMappingTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRStructureDefinition/FHIRStructureDefinitionMappingTest.php index 74dd6cfa90..105d423dd6 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRStructureDefinition/FHIRStructureDefinitionMappingTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRStructureDefinition/FHIRStructureDefinitionMappingTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRStructureDefinition/FHIRStructureDefinitionSnapshotTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRStructureDefinition/FHIRStructureDefinitionSnapshotTest.php index 5f7e51f1d9..78ec69e805 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRStructureDefinition/FHIRStructureDefinitionSnapshotTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRStructureDefinition/FHIRStructureDefinitionSnapshotTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubscription/FHIRSubscriptionChannelTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubscription/FHIRSubscriptionChannelTest.php index 0eb5dc3e4b..0480890e41 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubscription/FHIRSubscriptionChannelTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubscription/FHIRSubscriptionChannelTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubstance/FHIRSubstanceIngredientTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubstance/FHIRSubstanceIngredientTest.php index 22a2dd8ba3..8408dd87be 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubstance/FHIRSubstanceIngredientTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubstance/FHIRSubstanceIngredientTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubstance/FHIRSubstanceInstanceTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubstance/FHIRSubstanceInstanceTest.php index 2c71d6cdc6..352211f39f 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubstance/FHIRSubstanceInstanceTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubstance/FHIRSubstanceInstanceTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSupplyRequest/FHIRSupplyRequestWhenTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSupplyRequest/FHIRSupplyRequestWhenTest.php index a8edb638b0..7ccc193454 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSupplyRequest/FHIRSupplyRequestWhenTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSupplyRequest/FHIRSupplyRequestWhenTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptAction1Test.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptAction1Test.php index 44b3656d16..d842b2e239 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptAction1Test.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptAction1Test.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptAction2Test.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptAction2Test.php index 7f07b4fee9..f2aa410068 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptAction2Test.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptAction2Test.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptActionTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptActionTest.php index f735123227..4a07586b0f 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptActionTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptActionTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptAssertTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptAssertTest.php index fd393abf3c..4073bcddff 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptAssertTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptAssertTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptCapabilityTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptCapabilityTest.php index 03e2b434b8..6177f3b939 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptCapabilityTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptCapabilityTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptContactTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptContactTest.php index 3898906566..1addf59c47 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptContactTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptContactTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptFixtureTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptFixtureTest.php index 1fe190a24a..2c777f553e 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptFixtureTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptFixtureTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptLinkTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptLinkTest.php index b40d0e2245..429eca4a90 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptLinkTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptLinkTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptMetadataTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptMetadataTest.php index c45d4f67ac..c69bb97ef2 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptMetadataTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptMetadataTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptOperationTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptOperationTest.php index 27600d8769..ee7ebcb8e5 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptOperationTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptOperationTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptRequestHeaderTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptRequestHeaderTest.php index 79ef5aac3e..45398fbe45 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptRequestHeaderTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptRequestHeaderTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptSetupTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptSetupTest.php index 8a7428a8de..0e3be9fe02 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptSetupTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptSetupTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptTeardownTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptTeardownTest.php index fd530da8a6..c88946db78 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptTeardownTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptTeardownTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptTestTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptTestTest.php index fb63fb1708..52e1106bf5 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptTestTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptTestTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptVariableTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptVariableTest.php index 391d7b6337..8379e0fc8d 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptVariableTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptVariableTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetCodeSystemTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetCodeSystemTest.php index 0cb4efc70b..8cbffdce29 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetCodeSystemTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetCodeSystemTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetComposeTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetComposeTest.php index 6993eecc5d..d1e6afdac8 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetComposeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetComposeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetConcept1Test.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetConcept1Test.php index b7b5561ff5..bb8fc6d780 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetConcept1Test.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetConcept1Test.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetConceptTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetConceptTest.php index 8dfead4587..66eebecd2b 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetConceptTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetConceptTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetContactTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetContactTest.php index b759893e1a..4daef7bd3f 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetContactTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetContactTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetContainsTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetContainsTest.php index e249cc76dd..695b6b1c68 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetContainsTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetContainsTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetDesignationTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetDesignationTest.php index 6a4760f26a..d5de1a4fdf 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetDesignationTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetDesignationTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetExpansionTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetExpansionTest.php index 8e2cc14ffb..645d24de93 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetExpansionTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetExpansionTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetFilterTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetFilterTest.php index 546f9a36bc..208471cc87 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetFilterTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetFilterTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetIncludeTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetIncludeTest.php index 56e2025887..9334e7caf6 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetIncludeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetIncludeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetParameterTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetParameterTest.php index 210154394d..69aead5a7f 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetParameterTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetParameterTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRVisionPrescription/FHIRVisionPrescriptionDispenseTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRVisionPrescription/FHIRVisionPrescriptionDispenseTest.php index c7452bca90..d6dacee004 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRVisionPrescription/FHIRVisionPrescriptionDispenseTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRVisionPrescription/FHIRVisionPrescriptionDispenseTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElementTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElementTest.php index aee7c96655..722330f384 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElementTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBackboneElementTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBase64BinaryTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBase64BinaryTest.php index e879304a07..91486dabac 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBase64BinaryTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBase64BinaryTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBindingStrengthTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBindingStrengthTest.php index c5c2082594..fb2efac1d1 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBindingStrengthTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBindingStrengthTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBooleanTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBooleanTest.php index 01b8ea1728..fb63ba097a 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBooleanTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBooleanTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBundleTypeTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBundleTypeTest.php index 6d41bb3244..30e70d349f 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBundleTypeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRBundleTypeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRCarePlanActivityStatusTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRCarePlanActivityStatusTest.php index f6124fb4ad..d61dda7eec 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRCarePlanActivityStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRCarePlanActivityStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRCarePlanRelationshipTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRCarePlanRelationshipTest.php index eeb647743e..a7cecb324e 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRCarePlanRelationshipTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRCarePlanRelationshipTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRCarePlanStatusTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRCarePlanStatusTest.php index 769ca99a82..c274ed4aad 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRCarePlanStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRCarePlanStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRClaimTypeTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRClaimTypeTest.php index 6a88259c82..d3baa9305b 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRClaimTypeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRClaimTypeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRClinicalImpressionStatusTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRClinicalImpressionStatusTest.php index 74178b4f11..81ed2bd090 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRClinicalImpressionStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRClinicalImpressionStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRCodeTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRCodeTest.php index 1aea3538fa..4cfd10a36b 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRCodeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRCodeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRCodeableConceptTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRCodeableConceptTest.php index a5b2c493bf..b9cf18525b 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRCodeableConceptTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRCodeableConceptTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRCodingTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRCodingTest.php index 69db4fca57..a5031a0e4c 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRCodingTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRCodingTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRCommunicationRequestStatusTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRCommunicationRequestStatusTest.php index f108af2a96..5b92c1aec7 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRCommunicationRequestStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRCommunicationRequestStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRCommunicationStatusTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRCommunicationStatusTest.php index 481d672933..b6d1eaeff7 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRCommunicationStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRCommunicationStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRCompositionAttestationModeTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRCompositionAttestationModeTest.php index 9283f21e35..381a0e9a00 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRCompositionAttestationModeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRCompositionAttestationModeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRCompositionStatusTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRCompositionStatusTest.php index f20e3f589c..ddf2c8c460 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRCompositionStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRCompositionStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRConceptMapEquivalenceTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRConceptMapEquivalenceTest.php index 19f3ab951a..8140e8bd16 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRConceptMapEquivalenceTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRConceptMapEquivalenceTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRConditionVerificationStatusTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRConditionVerificationStatusTest.php index 1e63184a3c..e8da6607bc 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRConditionVerificationStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRConditionVerificationStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRConditionalDeleteStatusTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRConditionalDeleteStatusTest.php index 2690069f21..bede0fa170 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRConditionalDeleteStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRConditionalDeleteStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRConformanceEventModeTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRConformanceEventModeTest.php index a7b069ee54..d14a877ae0 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRConformanceEventModeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRConformanceEventModeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRConformanceResourceStatusTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRConformanceResourceStatusTest.php index bc6cab6332..5d7159c6ae 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRConformanceResourceStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRConformanceResourceStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRConformanceStatementKindTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRConformanceStatementKindTest.php index 5eb5283436..11ed48bc53 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRConformanceStatementKindTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRConformanceStatementKindTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRConstraintSeverityTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRConstraintSeverityTest.php index 1a9376db51..df0e833e28 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRConstraintSeverityTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRConstraintSeverityTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRContactPointSystemTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRContactPointSystemTest.php index 0c1cd99f71..aa416bef8a 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRContactPointSystemTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRContactPointSystemTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRContactPointTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRContactPointTest.php index b2f47f1777..779e12107b 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRContactPointTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRContactPointTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRContactPointUseTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRContactPointUseTest.php index 509f3bd71c..e830a75dff 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRContactPointUseTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRContactPointUseTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRContentTypeTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRContentTypeTest.php index 2303b9556c..7fbb7c72a0 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRContentTypeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRContentTypeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRDataElementStringencyTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRDataElementStringencyTest.php index 350001590d..5f89849bcd 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRDataElementStringencyTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRDataElementStringencyTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRDateTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRDateTest.php index d61ebf66dd..1c92b3b12f 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRDateTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRDateTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRDateTimeTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRDateTimeTest.php index c69111cef5..d9350c8aa6 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRDateTimeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRDateTimeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRDaysOfWeekTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRDaysOfWeekTest.php index eae5773276..8a2762e1ba 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRDaysOfWeekTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRDaysOfWeekTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRDecimalTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRDecimalTest.php index ef44735c3d..76d2621c4b 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRDecimalTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRDecimalTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRDetectedIssueSeverityTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRDetectedIssueSeverityTest.php index bf49c40340..5c2c0c86b9 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRDetectedIssueSeverityTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRDetectedIssueSeverityTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRDeviceMetricCalibrationStateTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRDeviceMetricCalibrationStateTest.php index 24175e485b..5c56b3642c 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRDeviceMetricCalibrationStateTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRDeviceMetricCalibrationStateTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRDeviceMetricCalibrationTypeTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRDeviceMetricCalibrationTypeTest.php index 54ea6fa06b..846f5ef194 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRDeviceMetricCalibrationTypeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRDeviceMetricCalibrationTypeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRDeviceMetricCategoryTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRDeviceMetricCategoryTest.php index 8479d8f2a0..10e31a939a 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRDeviceMetricCategoryTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRDeviceMetricCategoryTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRDeviceMetricColorTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRDeviceMetricColorTest.php index e5073d9ea1..ba9e4e0fd6 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRDeviceMetricColorTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRDeviceMetricColorTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRDeviceMetricOperationalStatusTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRDeviceMetricOperationalStatusTest.php index e1ad761076..484d36988c 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRDeviceMetricOperationalStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRDeviceMetricOperationalStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRDeviceStatusTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRDeviceStatusTest.php index d1d8a0aed8..b14dbc7971 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRDeviceStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRDeviceStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRDeviceUseRequestPriorityTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRDeviceUseRequestPriorityTest.php index 3df31b4a31..0993a73746 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRDeviceUseRequestPriorityTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRDeviceUseRequestPriorityTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRDeviceUseRequestStatusTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRDeviceUseRequestStatusTest.php index 44429d5102..ec27e4ad46 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRDeviceUseRequestStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRDeviceUseRequestStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRDiagnosticOrderPriorityTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRDiagnosticOrderPriorityTest.php index 702646e189..b4ae37851a 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRDiagnosticOrderPriorityTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRDiagnosticOrderPriorityTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRDiagnosticOrderStatusTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRDiagnosticOrderStatusTest.php index cface6cc3c..f4e6047c49 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRDiagnosticOrderStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRDiagnosticOrderStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRDiagnosticReportStatusTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRDiagnosticReportStatusTest.php index 4c2a24e9e2..bb9deffec1 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRDiagnosticReportStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRDiagnosticReportStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRDigitalMediaTypeTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRDigitalMediaTypeTest.php index 3295272e8e..3ab2b76505 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRDigitalMediaTypeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRDigitalMediaTypeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRDocumentModeTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRDocumentModeTest.php index c75c34f671..8bd99380bd 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRDocumentModeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRDocumentModeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRDocumentReferenceStatusTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRDocumentReferenceStatusTest.php index bf252a001c..a97cc572ad 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRDocumentReferenceStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRDocumentReferenceStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRDocumentRelationshipTypeTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRDocumentRelationshipTypeTest.php index 42740ca163..6ee87a6c9d 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRDocumentRelationshipTypeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRDocumentRelationshipTypeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRElementDefinition/FHIRElementDefinitionBaseTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRElementDefinition/FHIRElementDefinitionBaseTest.php index c53a1cf469..fecd63fb49 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRElementDefinition/FHIRElementDefinitionBaseTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRElementDefinition/FHIRElementDefinitionBaseTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRElementDefinition/FHIRElementDefinitionBindingTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRElementDefinition/FHIRElementDefinitionBindingTest.php index da89bc8f8e..0a8ddf4e28 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRElementDefinition/FHIRElementDefinitionBindingTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRElementDefinition/FHIRElementDefinitionBindingTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRElementDefinition/FHIRElementDefinitionConstraintTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRElementDefinition/FHIRElementDefinitionConstraintTest.php index a10cf6d515..ab2f792e0f 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRElementDefinition/FHIRElementDefinitionConstraintTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRElementDefinition/FHIRElementDefinitionConstraintTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRElementDefinition/FHIRElementDefinitionMappingTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRElementDefinition/FHIRElementDefinitionMappingTest.php index f8ae2a7e95..785c376f03 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRElementDefinition/FHIRElementDefinitionMappingTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRElementDefinition/FHIRElementDefinitionMappingTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRElementDefinition/FHIRElementDefinitionSlicingTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRElementDefinition/FHIRElementDefinitionSlicingTest.php index 4729c3432b..5f5508be92 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRElementDefinition/FHIRElementDefinitionSlicingTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRElementDefinition/FHIRElementDefinitionSlicingTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRElementDefinition/FHIRElementDefinitionTypeTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRElementDefinition/FHIRElementDefinitionTypeTest.php index dab55cf395..a42c8b3d99 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRElementDefinition/FHIRElementDefinitionTypeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRElementDefinition/FHIRElementDefinitionTypeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRElementDefinitionTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRElementDefinitionTest.php index bccb4006e2..412638263e 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRElementDefinitionTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRElementDefinitionTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIREncounterClassTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIREncounterClassTest.php index 3e60058074..eb0651d99c 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIREncounterClassTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIREncounterClassTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIREncounterLocationStatusTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIREncounterLocationStatusTest.php index 99b2f4a887..9bd30c507a 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIREncounterLocationStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIREncounterLocationStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIREncounterStateTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIREncounterStateTest.php index 5f3b232852..c41a5e96f2 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIREncounterStateTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIREncounterStateTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIREpisodeOfCareStatusTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIREpisodeOfCareStatusTest.php index 9ca2340a0f..16db5e80e6 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIREpisodeOfCareStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIREpisodeOfCareStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIREventTimingTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIREventTimingTest.php index b785991e8b..8eeefce2d2 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIREventTimingTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIREventTimingTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRExtensionContextTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRExtensionContextTest.php index df18182e01..32ed0f78a9 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRExtensionContextTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRExtensionContextTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRExtensionTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRExtensionTest.php index 8ca3613a35..aff739e7cd 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRExtensionTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRExtensionTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRFamilyHistoryStatusTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRFamilyHistoryStatusTest.php index e5c76a2764..03d09dfc3f 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRFamilyHistoryStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRFamilyHistoryStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRFilterOperatorTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRFilterOperatorTest.php index 64eb51602f..ceb77e5242 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRFilterOperatorTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRFilterOperatorTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRFlagStatusTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRFlagStatusTest.php index 3a7185e0b5..1620c65dd6 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRFlagStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRFlagStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRGoalStatusTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRGoalStatusTest.php index 85cc1bf7e6..85b1201605 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRGoalStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRGoalStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRGroupTypeTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRGroupTypeTest.php index cb602e4428..a193e6a928 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRGroupTypeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRGroupTypeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRGuideDependencyTypeTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRGuideDependencyTypeTest.php index 52fef103b7..0585e6d08b 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRGuideDependencyTypeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRGuideDependencyTypeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRGuidePageKindTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRGuidePageKindTest.php index 95c4c646f6..d542483962 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRGuidePageKindTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRGuidePageKindTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRGuideResourcePurposeTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRGuideResourcePurposeTest.php index caf1977767..85a1efee92 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRGuideResourcePurposeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRGuideResourcePurposeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRHTTPVerbTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRHTTPVerbTest.php index d7edc40d2e..9aeab775cf 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRHTTPVerbTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRHTTPVerbTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRHumanNameTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRHumanNameTest.php index 5db6562fa8..cf010276f8 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRHumanNameTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRHumanNameTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRIdTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRIdTest.php index 39b9d9e894..b4d54b0578 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRIdTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRIdTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRIdentifierTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRIdentifierTest.php index ae8e5d0acd..c24616f990 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRIdentifierTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRIdentifierTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRIdentifierUseTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRIdentifierUseTest.php index d0abda09ac..56f1635ba6 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRIdentifierUseTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRIdentifierUseTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRIdentityAssuranceLevelTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRIdentityAssuranceLevelTest.php index aef767da3d..b32026ef54 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRIdentityAssuranceLevelTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRIdentityAssuranceLevelTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRInstanceAvailabilityTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRInstanceAvailabilityTest.php index 8a6de57058..27c5f5aafc 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRInstanceAvailabilityTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRInstanceAvailabilityTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRInstantTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRInstantTest.php index 2c1608207a..3a206ca3d4 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRInstantTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRInstantTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRIntegerTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRIntegerTest.php index 4ffdc5ed3a..c514652776 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRIntegerTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRIntegerTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRIssueSeverityTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRIssueSeverityTest.php index 7ab189a8b3..b66920ce4f 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRIssueSeverityTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRIssueSeverityTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRIssueTypeTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRIssueTypeTest.php index 1d78d14c07..52c8c37516 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRIssueTypeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRIssueTypeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRLinkTypeTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRLinkTypeTest.php index 330a65c46c..70f0ded261 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRLinkTypeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRLinkTypeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRListModeTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRListModeTest.php index e665c16b99..a6470eefd5 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRListModeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRListModeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRListStatusTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRListStatusTest.php index 3c36d30fca..75cf599a8f 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRListStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRListStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRLocationModeTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRLocationModeTest.php index 60a7cfe11e..d8ca1c512c 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRLocationModeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRLocationModeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRLocationStatusTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRLocationStatusTest.php index 141b1316c5..bb05313c00 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRLocationStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRLocationStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRMarkdownTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRMarkdownTest.php index 7992f66bac..20de983b66 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRMarkdownTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRMarkdownTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRMeasmnt_PrincipleTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRMeasmnt_PrincipleTest.php index 27f34c041b..a3648b1669 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRMeasmnt_PrincipleTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRMeasmnt_PrincipleTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRMedicationAdministrationStatusTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRMedicationAdministrationStatusTest.php index d85e882805..4e5b8be1d0 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRMedicationAdministrationStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRMedicationAdministrationStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRMedicationDispenseStatusTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRMedicationDispenseStatusTest.php index da5e5325df..7873234792 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRMedicationDispenseStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRMedicationDispenseStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRMedicationOrderStatusTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRMedicationOrderStatusTest.php index c3704e925e..44c576460c 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRMedicationOrderStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRMedicationOrderStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRMedicationStatementStatusTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRMedicationStatementStatusTest.php index e676bf52f5..97bdf005c5 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRMedicationStatementStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRMedicationStatementStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRMessageSignificanceCategoryTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRMessageSignificanceCategoryTest.php index 97e73645ed..ab5bdab223 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRMessageSignificanceCategoryTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRMessageSignificanceCategoryTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRMetaTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRMetaTest.php index df43c87a18..e7536220d3 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRMetaTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRMetaTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRNameUseTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRNameUseTest.php index 9f30bbb283..e210972ac4 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRNameUseTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRNameUseTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRNamingSystemIdentifierTypeTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRNamingSystemIdentifierTypeTest.php index 1c4287f5e1..c006b0baf0 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRNamingSystemIdentifierTypeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRNamingSystemIdentifierTypeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRNamingSystemTypeTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRNamingSystemTypeTest.php index 595ddb1f9b..909ae03379 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRNamingSystemTypeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRNamingSystemTypeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRNarrativeStatusTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRNarrativeStatusTest.php index 649a2759b5..1d06a704b0 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRNarrativeStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRNarrativeStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRNarrativeTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRNarrativeTest.php index 52a4222f64..7198d02888 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRNarrativeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRNarrativeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRNoteTypeTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRNoteTypeTest.php index f7475387ec..e1f2f07a0f 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRNoteTypeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRNoteTypeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRNutritionOrderStatusTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRNutritionOrderStatusTest.php index 80627fcd2d..4ee6338775 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRNutritionOrderStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRNutritionOrderStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRObservationRelationshipTypeTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRObservationRelationshipTypeTest.php index 90f317198b..75a9ca20f9 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRObservationRelationshipTypeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRObservationRelationshipTypeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRObservationStatusTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRObservationStatusTest.php index c06ecd0c98..94ff9fdcac 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRObservationStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRObservationStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIROidTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIROidTest.php index e69cde8136..b4ee3ae464 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIROidTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIROidTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIROperationKindTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIROperationKindTest.php index 6182e1ce7c..04a18469f0 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIROperationKindTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIROperationKindTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIROperationParameterUseTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIROperationParameterUseTest.php index c5057ed769..ab1aab6373 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIROperationParameterUseTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIROperationParameterUseTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIROrderStatusTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIROrderStatusTest.php index 61893a199a..027d3d5460 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIROrderStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIROrderStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRParticipantRequiredTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRParticipantRequiredTest.php index ce71598c30..76935a762d 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRParticipantRequiredTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRParticipantRequiredTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRParticipantStatusTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRParticipantStatusTest.php index 651c731b71..89f4fc6495 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRParticipantStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRParticipantStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRParticipationStatusTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRParticipationStatusTest.php index 92ace238f9..6a18e7cec3 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRParticipationStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRParticipationStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRPeriodTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRPeriodTest.php index 67edc2e1a7..b06d88e1ca 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRPeriodTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRPeriodTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRPositiveIntTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRPositiveIntTest.php index 2834f242d6..49c3e2d025 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRPositiveIntTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRPositiveIntTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRProcedureRequestPriorityTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRProcedureRequestPriorityTest.php index 6051506324..831e8b1a60 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRProcedureRequestPriorityTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRProcedureRequestPriorityTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRProcedureRequestStatusTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRProcedureRequestStatusTest.php index d03e49bf34..deaa66582d 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRProcedureRequestStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRProcedureRequestStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRProcedureStatusTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRProcedureStatusTest.php index 0bc62c6a84..b5b2894e79 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRProcedureStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRProcedureStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRPropertyRepresentationTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRPropertyRepresentationTest.php index 9351ffdb8f..82b77b182f 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRPropertyRepresentationTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRPropertyRepresentationTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRProvenanceEntityRoleTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRProvenanceEntityRoleTest.php index 30f1da14b1..42f08e8d35 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRProvenanceEntityRoleTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRProvenanceEntityRoleTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRQuantity/FHIRAgeTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRQuantity/FHIRAgeTest.php index f2090744bd..a47786e896 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRQuantity/FHIRAgeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRQuantity/FHIRAgeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRQuantity/FHIRCountTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRQuantity/FHIRCountTest.php index d4676f6ac7..908e52d277 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRQuantity/FHIRCountTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRQuantity/FHIRCountTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRQuantity/FHIRDistanceTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRQuantity/FHIRDistanceTest.php index 558b31c54a..a8921fa54e 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRQuantity/FHIRDistanceTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRQuantity/FHIRDistanceTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRQuantity/FHIRDurationTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRQuantity/FHIRDurationTest.php index e4467f8ed1..af6fc722c2 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRQuantity/FHIRDurationTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRQuantity/FHIRDurationTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRQuantity/FHIRMoneyTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRQuantity/FHIRMoneyTest.php index df70415a65..605692e819 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRQuantity/FHIRMoneyTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRQuantity/FHIRMoneyTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRQuantity/FHIRSimpleQuantityTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRQuantity/FHIRSimpleQuantityTest.php index cc55ebb8c9..b2ad984cdb 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRQuantity/FHIRSimpleQuantityTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRQuantity/FHIRSimpleQuantityTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRQuantityComparatorTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRQuantityComparatorTest.php index bdbf227fda..d3427530e0 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRQuantityComparatorTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRQuantityComparatorTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRQuantityTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRQuantityTest.php index 108e5c003d..2e29d2945c 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRQuantityTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRQuantityTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRQuestionnaireResponseStatusTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRQuestionnaireResponseStatusTest.php index 6699737b9b..d1e365c568 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRQuestionnaireResponseStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRQuestionnaireResponseStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRQuestionnaireStatusTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRQuestionnaireStatusTest.php index e583fb0dc5..e9ab0a2c94 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRQuestionnaireStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRQuestionnaireStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRRangeTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRRangeTest.php index 30a58f64b2..ae43800068 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRRangeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRRangeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRRatioTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRRatioTest.php index 27ac066995..0954496eb4 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRRatioTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRRatioTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRReferenceTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRReferenceTest.php index d00714c983..3283420963 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRReferenceTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRReferenceTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRReferralStatusTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRReferralStatusTest.php index 27a3694a1e..fefff9cff9 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRReferralStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRReferralStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRRemittanceOutcomeTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRRemittanceOutcomeTest.php index 59229f1589..2cf0c6bb44 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRRemittanceOutcomeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRRemittanceOutcomeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRResourceVersionPolicyTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRResourceVersionPolicyTest.php index 2278e0d844..f64850ce20 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRResourceVersionPolicyTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRResourceVersionPolicyTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRResponseTypeTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRResponseTypeTest.php index 7d46608842..de4d8e1d5d 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRResponseTypeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRResponseTypeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRRestfulConformanceModeTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRRestfulConformanceModeTest.php index 9a9868ea22..e17bd943bb 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRRestfulConformanceModeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRRestfulConformanceModeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRSampledDataDataTypeTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRSampledDataDataTypeTest.php index b6a5226d7f..c3d5837a2e 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRSampledDataDataTypeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRSampledDataDataTypeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRSampledDataTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRSampledDataTest.php index cbf7c9d673..84c7a37176 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRSampledDataTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRSampledDataTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRSearchEntryModeTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRSearchEntryModeTest.php index 26d3bcb6cb..cb5fbb90ef 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRSearchEntryModeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRSearchEntryModeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRSearchModifierCodeTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRSearchModifierCodeTest.php index 0be86c669f..87534446f9 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRSearchModifierCodeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRSearchModifierCodeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRSearchParamTypeTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRSearchParamTypeTest.php index 310cd50899..b8d8449446 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRSearchParamTypeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRSearchParamTypeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRSignatureTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRSignatureTest.php index fcde20bb2a..9bd30d2715 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRSignatureTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRSignatureTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRSlicingRulesTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRSlicingRulesTest.php index 39f540613b..d828abf46b 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRSlicingRulesTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRSlicingRulesTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRSlotStatusTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRSlotStatusTest.php index 10cd331d19..536cc991b9 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRSlotStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRSlotStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRSpecimenStatusTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRSpecimenStatusTest.php index 53dd591006..da80023423 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRSpecimenStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRSpecimenStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRStringTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRStringTest.php index 8efa041ce0..963ca1189f 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRStringTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRStringTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRStructureDefinitionKindTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRStructureDefinitionKindTest.php index f6ae5591b7..c8465311ee 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRStructureDefinitionKindTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRStructureDefinitionKindTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRSubscriptionChannelTypeTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRSubscriptionChannelTypeTest.php index 1d862cfdaa..f8e0652408 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRSubscriptionChannelTypeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRSubscriptionChannelTypeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRSubscriptionStatusTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRSubscriptionStatusTest.php index 8f05242a8c..df469d5e74 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRSubscriptionStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRSubscriptionStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRSupplyDeliveryStatusTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRSupplyDeliveryStatusTest.php index dbe5df0be3..eb3fff1769 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRSupplyDeliveryStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRSupplyDeliveryStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRSupplyRequestStatusTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRSupplyRequestStatusTest.php index e399117d50..c64fb6be7e 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRSupplyRequestStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRSupplyRequestStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRSystemRestfulInteractionTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRSystemRestfulInteractionTest.php index 4296295d58..e6aedaaac2 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRSystemRestfulInteractionTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRSystemRestfulInteractionTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRTimeTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRTimeTest.php index 038320b599..0ee6299827 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRTimeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRTimeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRTiming/FHIRTimingRepeatTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRTiming/FHIRTimingRepeatTest.php index 43e0a38529..1131c9f9b0 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRTiming/FHIRTimingRepeatTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRTiming/FHIRTimingRepeatTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRTimingTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRTimingTest.php index 6dc0bc4fba..6ea9574f2e 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRTimingTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRTimingTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRTransactionModeTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRTransactionModeTest.php index b90b014a8f..e0e987e4c3 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRTransactionModeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRTransactionModeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRTypeRestfulInteractionTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRTypeRestfulInteractionTest.php index 1d57a094c7..d0e71712ab 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRTypeRestfulInteractionTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRTypeRestfulInteractionTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRUnitsOfTimeTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRUnitsOfTimeTest.php index d5430ad415..2a739dd48e 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRUnitsOfTimeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRUnitsOfTimeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRUnknownContentCodeTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRUnknownContentCodeTest.php index 31a9ac4460..adc9e5ff46 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRUnknownContentCodeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRUnknownContentCodeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRUnsignedIntTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRUnsignedIntTest.php index 2e761d0505..0de48fe947 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRUnsignedIntTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRUnsignedIntTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRUriTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRUriTest.php index 791e4cf1cd..809b2ff09b 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRUriTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRUriTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRUseTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRUseTest.php index 4d5c64da46..c0230621ab 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRUseTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRUseTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRUuidTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRUuidTest.php index 2137af3ab7..224c7ccdd3 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRUuidTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRUuidTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRVisionBaseTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRVisionBaseTest.php index 3db5686e53..92caeee316 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRVisionBaseTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRVisionBaseTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRVisionEyesTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRVisionEyesTest.php index 7488bcd891..0040c9136b 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRVisionEyesTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRVisionEyesTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRXPathUsageTypeTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRXPathUsageTypeTest.php index 634f38e979..b832e2a126 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRXPathUsageTypeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElement/FHIRXPathUsageTypeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElementTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElementTest.php index 51c35424c9..776483f459 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElementTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRElementTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIREncounterClassListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIREncounterClassListTest.php index 8402b200c7..99271b8654 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIREncounterClassListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIREncounterClassListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIREncounterLocationStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIREncounterLocationStatusListTest.php index 5c9531a45c..83fff2535e 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIREncounterLocationStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIREncounterLocationStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIREncounterStateListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIREncounterStateListTest.php index d7b9bf1a88..373878ffe1 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIREncounterStateListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIREncounterStateListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIREpisodeOfCareStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIREpisodeOfCareStatusListTest.php index a224713963..7a967e1ca3 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIREpisodeOfCareStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIREpisodeOfCareStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIREventTimingListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIREventTimingListTest.php index 353f6d8ca8..42d0e6ffcc 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIREventTimingListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIREventTimingListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRExtensionContextListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRExtensionContextListTest.php index b4e3626fab..a912d40143 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRExtensionContextListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRExtensionContextListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRFamilyHistoryStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRFamilyHistoryStatusListTest.php index a90c3f8bcc..c3d5b0c99c 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRFamilyHistoryStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRFamilyHistoryStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRFilterOperatorListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRFilterOperatorListTest.php index 4f2c159f22..6f4abab081 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRFilterOperatorListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRFilterOperatorListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRFlagStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRFlagStatusListTest.php index 49eeb08ff9..0e9c6a99a7 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRFlagStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRFlagStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRGoalStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRGoalStatusListTest.php index 7ffa89a82c..c48af5216d 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRGoalStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRGoalStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRGroupTypeListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRGroupTypeListTest.php index 00af0ac75b..3be4c4055a 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRGroupTypeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRGroupTypeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRGuideDependencyTypeListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRGuideDependencyTypeListTest.php index be7e1dac68..be07708791 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRGuideDependencyTypeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRGuideDependencyTypeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRGuidePageKindListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRGuidePageKindListTest.php index ced5b5ea6d..f748364ab6 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRGuidePageKindListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRGuidePageKindListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRGuideResourcePurposeListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRGuideResourcePurposeListTest.php index ed9962fc05..45d1a3272a 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRGuideResourcePurposeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRGuideResourcePurposeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRHTTPVerbListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRHTTPVerbListTest.php index 5e527610b9..ade6332c31 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRHTTPVerbListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRHTTPVerbListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRIdPrimitiveTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRIdPrimitiveTest.php index 71918d4ec4..f2fa483fc8 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRIdPrimitiveTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRIdPrimitiveTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRIdentifierUseListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRIdentifierUseListTest.php index 4387155b8a..5b9b4f7f07 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRIdentifierUseListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRIdentifierUseListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRIdentityAssuranceLevelListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRIdentityAssuranceLevelListTest.php index a2ad2e380d..93fb411c15 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRIdentityAssuranceLevelListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRIdentityAssuranceLevelListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRInstanceAvailabilityListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRInstanceAvailabilityListTest.php index 22cc553ca0..28f0bcf3fc 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRInstanceAvailabilityListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRInstanceAvailabilityListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRInstantPrimitiveTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRInstantPrimitiveTest.php index 6e89f02cb9..6794307bfc 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRInstantPrimitiveTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRInstantPrimitiveTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRIntegerPrimitiveTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRIntegerPrimitiveTest.php index 54caf07519..81d55c63e6 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRIntegerPrimitiveTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRIntegerPrimitiveTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRIssueSeverityListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRIssueSeverityListTest.php index 4a65289397..f695b4899d 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRIssueSeverityListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRIssueSeverityListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRIssueTypeListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRIssueTypeListTest.php index 1216974505..7b1394cd4a 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRIssueTypeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRIssueTypeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRLinkTypeListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRLinkTypeListTest.php index 6ddd4bb016..a55856e7e7 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRLinkTypeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRLinkTypeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRListModeListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRListModeListTest.php index fecd354f09..a09bb85c68 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRListModeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRListModeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRListStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRListStatusListTest.php index ca63863f7d..2101f80260 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRListStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRListStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRLocationModeListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRLocationModeListTest.php index 7d2dadadcb..6305fd0d20 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRLocationModeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRLocationModeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRLocationStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRLocationStatusListTest.php index a91867890b..475affef3f 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRLocationStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRLocationStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRMarkdownPrimitiveTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRMarkdownPrimitiveTest.php index 467ebb04d9..c3c98cc525 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRMarkdownPrimitiveTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRMarkdownPrimitiveTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRMeasmnt_PrincipleListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRMeasmnt_PrincipleListTest.php index f97cd57e46..3de9dac81c 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRMeasmnt_PrincipleListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRMeasmnt_PrincipleListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRMedicationAdministrationStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRMedicationAdministrationStatusListTest.php index 6d71cfe98b..8c2ad16aac 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRMedicationAdministrationStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRMedicationAdministrationStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRMedicationDispenseStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRMedicationDispenseStatusListTest.php index 1709cb553e..940f006b63 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRMedicationDispenseStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRMedicationDispenseStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRMedicationOrderStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRMedicationOrderStatusListTest.php index fa5f69e272..d7ef24615b 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRMedicationOrderStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRMedicationOrderStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRMedicationStatementStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRMedicationStatementStatusListTest.php index c415b74c5a..8360ec728a 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRMedicationStatementStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRMedicationStatementStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRMessageSignificanceCategoryListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRMessageSignificanceCategoryListTest.php index b4d7f2d64a..979fcd64be 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRMessageSignificanceCategoryListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRMessageSignificanceCategoryListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRNameUseListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRNameUseListTest.php index 4ff430f9c3..bb6e56d88e 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRNameUseListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRNameUseListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRNamingSystemIdentifierTypeListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRNamingSystemIdentifierTypeListTest.php index ba7310ddc0..0259b0962f 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRNamingSystemIdentifierTypeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRNamingSystemIdentifierTypeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRNamingSystemTypeListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRNamingSystemTypeListTest.php index ebe074e622..7839506d37 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRNamingSystemTypeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRNamingSystemTypeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRNarrativeStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRNarrativeStatusListTest.php index d12e2931b9..f0d679c708 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRNarrativeStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRNarrativeStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRNoteTypeListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRNoteTypeListTest.php index 4a86caf954..f9d8cd3d1b 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRNoteTypeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRNoteTypeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRNutritionOrderStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRNutritionOrderStatusListTest.php index 2be24d83ab..cdae423e75 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRNutritionOrderStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRNutritionOrderStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRObservationRelationshipTypeListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRObservationRelationshipTypeListTest.php index d5a4874d90..23d5d59bfc 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRObservationRelationshipTypeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRObservationRelationshipTypeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRObservationStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRObservationStatusListTest.php index d88ab64cfe..82ca97d3e5 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRObservationStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRObservationStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIROidPrimitiveTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIROidPrimitiveTest.php index d30d5ff45d..cc5d6f0bbe 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIROidPrimitiveTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIROidPrimitiveTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIROperationKindListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIROperationKindListTest.php index 8abae85a3b..7a53d08890 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIROperationKindListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIROperationKindListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIROperationParameterUseListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIROperationParameterUseListTest.php index 15b720c7ea..b196a1d3f2 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIROperationParameterUseListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIROperationParameterUseListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIROrderStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIROrderStatusListTest.php index b0b394c397..cd5628b648 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIROrderStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIROrderStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRParticipantRequiredListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRParticipantRequiredListTest.php index 6e27da71be..8b3f47d319 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRParticipantRequiredListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRParticipantRequiredListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRParticipantStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRParticipantStatusListTest.php index 8e99a55825..2613bec154 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRParticipantStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRParticipantStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRParticipationStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRParticipationStatusListTest.php index 8b3685ae67..632e6e89c5 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRParticipationStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRParticipationStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRPositiveIntPrimitiveTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRPositiveIntPrimitiveTest.php index 4c2e50f35f..72edca6194 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRPositiveIntPrimitiveTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRPositiveIntPrimitiveTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRProcedureRequestPriorityListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRProcedureRequestPriorityListTest.php index 9d3c3301fe..b5180770b5 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRProcedureRequestPriorityListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRProcedureRequestPriorityListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRProcedureRequestStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRProcedureRequestStatusListTest.php index 1e0d51ed5f..400650c119 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRProcedureRequestStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRProcedureRequestStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRProcedureStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRProcedureStatusListTest.php index b2a7f4471b..48ed92c462 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRProcedureStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRProcedureStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRPropertyRepresentationListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRPropertyRepresentationListTest.php index 8074c29c68..1efbe152c8 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRPropertyRepresentationListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRPropertyRepresentationListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRProvenanceEntityRoleListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRProvenanceEntityRoleListTest.php index 9cc0cac53d..356688788e 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRProvenanceEntityRoleListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRProvenanceEntityRoleListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRQuantityComparatorListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRQuantityComparatorListTest.php index 8a85a82467..1eeb198579 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRQuantityComparatorListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRQuantityComparatorListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRQuestionnaireResponseStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRQuestionnaireResponseStatusListTest.php index 5f44e1bfb2..d10d194b0a 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRQuestionnaireResponseStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRQuestionnaireResponseStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRQuestionnaireStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRQuestionnaireStatusListTest.php index 3203f2a8ef..11edce96b8 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRQuestionnaireStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRQuestionnaireStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRReferralStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRReferralStatusListTest.php index 8ccf503777..f0b1de3852 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRReferralStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRReferralStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRRemittanceOutcomeListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRRemittanceOutcomeListTest.php index 42b3b4da4d..98d777bfd6 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRRemittanceOutcomeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRRemittanceOutcomeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRBinaryTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRBinaryTest.php index 2442ddedcf..a603d08119 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRBinaryTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRBinaryTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRBundleTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRBundleTest.php index 775e2085d5..29bc3b7f11 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRBundleTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRBundleTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRAccountTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRAccountTest.php index c76d957007..f7f5512825 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRAccountTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRAccountTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRAllergyIntoleranceTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRAllergyIntoleranceTest.php index c2973a63a4..856de63b70 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRAllergyIntoleranceTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRAllergyIntoleranceTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRAppointmentResponseTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRAppointmentResponseTest.php index 240efaecb7..d5590519a3 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRAppointmentResponseTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRAppointmentResponseTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRAppointmentTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRAppointmentTest.php index 17813dcba1..9922c98c6d 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRAppointmentTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRAppointmentTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRAuditEventTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRAuditEventTest.php index 72fc6413fe..a083149b12 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRAuditEventTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRAuditEventTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRBasicTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRBasicTest.php index 9ffd5d9d76..dd1170f395 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRBasicTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRBasicTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRBodySiteTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRBodySiteTest.php index b2dc8e039a..33ad8dcfe1 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRBodySiteTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRBodySiteTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRCarePlanTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRCarePlanTest.php index 01bac0497a..0944f082bf 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRCarePlanTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRCarePlanTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRClaimResponseTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRClaimResponseTest.php index 24731d9bff..650e4bb656 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRClaimResponseTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRClaimResponseTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRClaimTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRClaimTest.php index 0afa5285a4..0fa6d2b6cc 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRClaimTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRClaimTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRClinicalImpressionTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRClinicalImpressionTest.php index fcaaebe0d0..831aa0bd3d 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRClinicalImpressionTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRClinicalImpressionTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRCommunicationRequestTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRCommunicationRequestTest.php index 4ed9c7eb57..f74769a8aa 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRCommunicationRequestTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRCommunicationRequestTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRCommunicationTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRCommunicationTest.php index ea2230c5ba..c8b5ca77b9 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRCommunicationTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRCommunicationTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRCompositionTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRCompositionTest.php index 6ca839ed0c..2a8fa01977 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRCompositionTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRCompositionTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRConceptMapTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRConceptMapTest.php index 0a7451d833..347b47246d 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRConceptMapTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRConceptMapTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRConditionTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRConditionTest.php index f63cf2787f..5c415a85a8 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRConditionTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRConditionTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRConformanceTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRConformanceTest.php index d31a3d0f0d..5fb813707d 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRConformanceTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRConformanceTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRContractTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRContractTest.php index 6354f49d12..92a1b056a4 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRContractTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRContractTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRCoverageTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRCoverageTest.php index 0337057c07..300e894341 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRCoverageTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRCoverageTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRDataElementTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRDataElementTest.php index 28179446ee..57ed64f64d 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRDataElementTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRDataElementTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRDetectedIssueTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRDetectedIssueTest.php index ed2a383edd..c718ffea40 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRDetectedIssueTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRDetectedIssueTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRDeviceComponentTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRDeviceComponentTest.php index bada98a89c..5a29085c48 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRDeviceComponentTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRDeviceComponentTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRDeviceMetricTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRDeviceMetricTest.php index e28ea0c6c3..d4f9f08763 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRDeviceMetricTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRDeviceMetricTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRDeviceTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRDeviceTest.php index df63f8ffb3..3697034dfc 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRDeviceTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRDeviceTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRDeviceUseRequestTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRDeviceUseRequestTest.php index 0f18c288a4..1452c10670 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRDeviceUseRequestTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRDeviceUseRequestTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRDeviceUseStatementTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRDeviceUseStatementTest.php index a4311d2270..7d8425499c 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRDeviceUseStatementTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRDeviceUseStatementTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRDiagnosticOrderTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRDiagnosticOrderTest.php index 87fd6fa586..b65498c77a 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRDiagnosticOrderTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRDiagnosticOrderTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRDiagnosticReportTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRDiagnosticReportTest.php index 29db02cec8..d49ac8ace8 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRDiagnosticReportTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRDiagnosticReportTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRDocumentManifestTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRDocumentManifestTest.php index d30ee12d85..1abaaf94d2 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRDocumentManifestTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRDocumentManifestTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRDocumentReferenceTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRDocumentReferenceTest.php index feccaecb68..40486e4073 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRDocumentReferenceTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRDocumentReferenceTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIREligibilityRequestTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIREligibilityRequestTest.php index 9a622640fd..87613020b2 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIREligibilityRequestTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIREligibilityRequestTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIREligibilityResponseTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIREligibilityResponseTest.php index 7ba947abf2..3f114018bb 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIREligibilityResponseTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIREligibilityResponseTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIREncounterTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIREncounterTest.php index 9d79a2783f..b8d039d30f 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIREncounterTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIREncounterTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIREnrollmentRequestTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIREnrollmentRequestTest.php index 9abb016afd..9adf906dba 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIREnrollmentRequestTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIREnrollmentRequestTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIREnrollmentResponseTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIREnrollmentResponseTest.php index 3f6fa22469..88ae4354bd 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIREnrollmentResponseTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIREnrollmentResponseTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIREpisodeOfCareTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIREpisodeOfCareTest.php index be4119bfb2..bca63377e6 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIREpisodeOfCareTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIREpisodeOfCareTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRExplanationOfBenefitTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRExplanationOfBenefitTest.php index 5eaa4fcc77..97c6872fa6 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRExplanationOfBenefitTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRExplanationOfBenefitTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRFamilyMemberHistoryTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRFamilyMemberHistoryTest.php index d543a07848..e15f6f4c9b 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRFamilyMemberHistoryTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRFamilyMemberHistoryTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRFlagTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRFlagTest.php index a0b7e7f0fd..0c9aed84cf 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRFlagTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRFlagTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRGoalTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRGoalTest.php index db59f45317..306634a4aa 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRGoalTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRGoalTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRGroupTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRGroupTest.php index 0f6708fd4e..5e3ddaf05c 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRGroupTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRGroupTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRHealthcareServiceTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRHealthcareServiceTest.php index 46a42b3cc8..29454f98f5 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRHealthcareServiceTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRHealthcareServiceTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRImagingObjectSelectionTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRImagingObjectSelectionTest.php index f298d73c54..8c83486cf9 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRImagingObjectSelectionTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRImagingObjectSelectionTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRImagingStudyTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRImagingStudyTest.php index a067585902..40d37fb654 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRImagingStudyTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRImagingStudyTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRImmunizationRecommendationTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRImmunizationRecommendationTest.php index a1a967d1b0..8c39629331 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRImmunizationRecommendationTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRImmunizationRecommendationTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRImmunizationTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRImmunizationTest.php index 279862d4c7..2237f7bb0b 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRImmunizationTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRImmunizationTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRImplementationGuideTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRImplementationGuideTest.php index 5e02ec7707..306652da88 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRImplementationGuideTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRImplementationGuideTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRListTest.php index 3b981ebc5f..0fe3ed081b 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRLocationTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRLocationTest.php index b788db712c..7e7d3bbcaf 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRLocationTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRLocationTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRMediaTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRMediaTest.php index e2843edb07..50809fc439 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRMediaTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRMediaTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRMedicationAdministrationTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRMedicationAdministrationTest.php index 4ad9599f45..b229a0ea42 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRMedicationAdministrationTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRMedicationAdministrationTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRMedicationDispenseTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRMedicationDispenseTest.php index 2b5d2c1fa4..0be15fbea9 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRMedicationDispenseTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRMedicationDispenseTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRMedicationOrderTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRMedicationOrderTest.php index a6b40e4aa7..244b8a7cbf 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRMedicationOrderTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRMedicationOrderTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRMedicationStatementTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRMedicationStatementTest.php index ee8f052294..7b34b04e6a 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRMedicationStatementTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRMedicationStatementTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRMedicationTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRMedicationTest.php index 51815d91f2..d7b9173195 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRMedicationTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRMedicationTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRMessageHeaderTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRMessageHeaderTest.php index 5709ef072e..4767a6adf3 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRMessageHeaderTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRMessageHeaderTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRNamingSystemTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRNamingSystemTest.php index fcff2d0b0d..42257dd7de 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRNamingSystemTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRNamingSystemTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRNutritionOrderTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRNutritionOrderTest.php index 6e4ca2be36..cfa57aef8d 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRNutritionOrderTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRNutritionOrderTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRObservationTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRObservationTest.php index b051e1a762..2b1c9df618 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRObservationTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRObservationTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIROperationDefinitionTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIROperationDefinitionTest.php index 0dd16773b4..1df77a130b 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIROperationDefinitionTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIROperationDefinitionTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIROperationOutcomeTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIROperationOutcomeTest.php index 36f23894fc..34a7bfdbcf 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIROperationOutcomeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIROperationOutcomeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIROrderResponseTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIROrderResponseTest.php index f89aa4966f..4fbe0943e3 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIROrderResponseTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIROrderResponseTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIROrderTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIROrderTest.php index bd568108e7..d659cd73de 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIROrderTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIROrderTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIROrganizationTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIROrganizationTest.php index 081babd370..e23333c8a4 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIROrganizationTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIROrganizationTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRPatientTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRPatientTest.php index cda86cdc56..3fec34fd5b 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRPatientTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRPatientTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRPaymentNoticeTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRPaymentNoticeTest.php index 3696b26fb8..2933fbb2b0 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRPaymentNoticeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRPaymentNoticeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRPaymentReconciliationTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRPaymentReconciliationTest.php index f7520c7433..e6d2792398 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRPaymentReconciliationTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRPaymentReconciliationTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRPersonTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRPersonTest.php index 750ebc96a4..275737131e 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRPersonTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRPersonTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRPractitionerTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRPractitionerTest.php index 65064dd017..0923d1f58c 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRPractitionerTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRPractitionerTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRProcedureRequestTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRProcedureRequestTest.php index 6fc9e6848c..f75e02060a 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRProcedureRequestTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRProcedureRequestTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRProcedureTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRProcedureTest.php index 1fa15cab64..8ec3b7f35e 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRProcedureTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRProcedureTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRProcessRequestTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRProcessRequestTest.php index 0742f97a63..5c3539879e 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRProcessRequestTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRProcessRequestTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRProcessResponseTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRProcessResponseTest.php index 0f17f2f313..0f4f20c5c9 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRProcessResponseTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRProcessResponseTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRProvenanceTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRProvenanceTest.php index cd2ce56421..ce7027b717 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRProvenanceTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRProvenanceTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRQuestionnaireResponseTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRQuestionnaireResponseTest.php index e959c18a17..32b026e7e8 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRQuestionnaireResponseTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRQuestionnaireResponseTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRQuestionnaireTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRQuestionnaireTest.php index 2acf54385f..4b5728d826 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRQuestionnaireTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRQuestionnaireTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRReferralRequestTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRReferralRequestTest.php index 29081aa4ec..0fc9b21a27 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRReferralRequestTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRReferralRequestTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRRelatedPersonTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRRelatedPersonTest.php index 848f5b8a56..52d7eb0d80 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRRelatedPersonTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRRelatedPersonTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRRiskAssessmentTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRRiskAssessmentTest.php index 6d7d26a5fe..da7ac7e592 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRRiskAssessmentTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRRiskAssessmentTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRScheduleTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRScheduleTest.php index 99763d20ea..aa9e626e3e 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRScheduleTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRScheduleTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRSearchParameterTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRSearchParameterTest.php index 8adf6f6f6e..d40582397f 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRSearchParameterTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRSearchParameterTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRSlotTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRSlotTest.php index 640d9e773f..cc67a07d54 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRSlotTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRSlotTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRSpecimenTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRSpecimenTest.php index 0dc0ddee2e..437b697266 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRSpecimenTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRSpecimenTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRStructureDefinitionTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRStructureDefinitionTest.php index c64283acf4..1cf23484af 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRStructureDefinitionTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRStructureDefinitionTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRSubscriptionTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRSubscriptionTest.php index 3cddf1226b..4ec43453d0 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRSubscriptionTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRSubscriptionTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRSubstanceTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRSubstanceTest.php index 8352956e50..64b2d021a9 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRSubstanceTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRSubstanceTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRSupplyDeliveryTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRSupplyDeliveryTest.php index 7c9bd4c3ed..b1ff9f9380 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRSupplyDeliveryTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRSupplyDeliveryTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRSupplyRequestTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRSupplyRequestTest.php index 9f3887910e..1ada2e0244 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRSupplyRequestTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRSupplyRequestTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRTestScriptTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRTestScriptTest.php index 258fc499f9..36f34cfbcc 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRTestScriptTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRTestScriptTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRValueSetTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRValueSetTest.php index aeee8e4978..d66aaa2734 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRValueSetTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRValueSetTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRVisionPrescriptionTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRVisionPrescriptionTest.php index 08666ed1e8..c2019a7f8d 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRVisionPrescriptionTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRVisionPrescriptionTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResourceTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResourceTest.php index f80752909a..8cffa93a1e 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResourceTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRDomainResourceTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRParametersTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRParametersTest.php index fa0effa599..3e9d7e4925 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRParametersTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResource/FHIRParametersTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResourceContainerTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResourceContainerTest.php index d3e2f754b5..cff242a8f6 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResourceContainerTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResourceContainerTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResourceTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResourceTest.php index 2ae6749b4c..0b938916f8 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResourceTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResourceTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResourceVersionPolicyListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResourceVersionPolicyListTest.php index 4f927d39d1..4329b571b4 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResourceVersionPolicyListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResourceVersionPolicyListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResponseTypeListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResponseTypeListTest.php index 7665173adb..1e9550e618 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResponseTypeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRResponseTypeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRRestfulConformanceModeListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRRestfulConformanceModeListTest.php index ac6ccf8dec..01e0eed830 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRRestfulConformanceModeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRRestfulConformanceModeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRSampledDataDataTypePrimitiveTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRSampledDataDataTypePrimitiveTest.php index 38fbe23a7a..f9446e30e8 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRSampledDataDataTypePrimitiveTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRSampledDataDataTypePrimitiveTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRSearchEntryModeListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRSearchEntryModeListTest.php index 19285ea7c7..ecef41d96b 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRSearchEntryModeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRSearchEntryModeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRSearchModifierCodeListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRSearchModifierCodeListTest.php index 8c22e2c4ae..59785fa4ab 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRSearchModifierCodeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRSearchModifierCodeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRSearchParamTypeListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRSearchParamTypeListTest.php index 19d70adba0..7b3e14974e 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRSearchParamTypeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRSearchParamTypeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRSlicingRulesListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRSlicingRulesListTest.php index cd534a2997..00a633c758 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRSlicingRulesListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRSlicingRulesListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRSlotStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRSlotStatusListTest.php index 4f5d20a6c9..3cc4b8e1e0 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRSlotStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRSlotStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRSpecimenStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRSpecimenStatusListTest.php index 9c28791ebd..f852b01316 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRSpecimenStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRSpecimenStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRStringPrimitiveTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRStringPrimitiveTest.php index 469d62efa0..fe16fc7929 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRStringPrimitiveTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRStringPrimitiveTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRStructureDefinitionKindListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRStructureDefinitionKindListTest.php index 1857aa8961..ed9aaebe8d 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRStructureDefinitionKindListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRStructureDefinitionKindListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRSubscriptionChannelTypeListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRSubscriptionChannelTypeListTest.php index bb46c8c822..741e1ffbc7 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRSubscriptionChannelTypeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRSubscriptionChannelTypeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRSubscriptionStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRSubscriptionStatusListTest.php index 036b8d06ca..64b231e9cf 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRSubscriptionStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRSubscriptionStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRSupplyDeliveryStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRSupplyDeliveryStatusListTest.php index 4cb1521627..8bc0efe214 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRSupplyDeliveryStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRSupplyDeliveryStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRSupplyRequestStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRSupplyRequestStatusListTest.php index a48f7371a1..8f983d95f5 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRSupplyRequestStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRSupplyRequestStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRSystemRestfulInteractionListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRSystemRestfulInteractionListTest.php index 70f163c406..1c5fb72e4d 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRSystemRestfulInteractionListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRSystemRestfulInteractionListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRTimePrimitiveTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRTimePrimitiveTest.php index f9c7a8bbcd..fecde0befa 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRTimePrimitiveTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRTimePrimitiveTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRTransactionModeListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRTransactionModeListTest.php index dce3d6da07..ce947f15b5 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRTransactionModeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRTransactionModeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRTypeRestfulInteractionListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRTypeRestfulInteractionListTest.php index 0c6724415b..2547bac4cb 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRTypeRestfulInteractionListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRTypeRestfulInteractionListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRUnitsOfTimeListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRUnitsOfTimeListTest.php index 01be56e7f8..ac6725fe6b 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRUnitsOfTimeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRUnitsOfTimeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRUnknownContentCodeListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRUnknownContentCodeListTest.php index 490bdd0474..15e745335d 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRUnknownContentCodeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRUnknownContentCodeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRUnsignedIntPrimitiveTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRUnsignedIntPrimitiveTest.php index 663be25ce3..ba2b6e5be0 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRUnsignedIntPrimitiveTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRUnsignedIntPrimitiveTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRUriPrimitiveTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRUriPrimitiveTest.php index e8d64f9286..d791221196 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRUriPrimitiveTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRUriPrimitiveTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRUseListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRUseListTest.php index 7bda8c4dad..24c5e3350a 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRUseListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRUseListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRUuidPrimitiveTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRUuidPrimitiveTest.php index 8c2038d3da..51e51e70a8 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRUuidPrimitiveTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRUuidPrimitiveTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRVisionBaseListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRVisionBaseListTest.php index 253004246e..7def1634e9 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRVisionBaseListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRVisionBaseListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRVisionEyesListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRVisionEyesListTest.php index 0464ab6a21..5c9c2fddc4 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRVisionEyesListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRVisionEyesListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRXPathUsageTypeListTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRXPathUsageTypeListTest.php index 34519f6385..b5cbcf2726 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRXPathUsageTypeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/FHIRXPathUsageTypeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/PHPFHIRConstantsTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/PHPFHIRConstantsTest.php index cccbb3f542..bf6795ac59 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/PHPFHIRConstantsTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/PHPFHIRConstantsTest.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/PHPFHIRTypeMapTest.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/PHPFHIRTypeMapTest.php index a45bd2a7dd..056f9d3289 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/PHPFHIRTypeMapTest.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTests/PHPFHIRTypeMapTest.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTypeInterface.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTypeInterface.php index 0d03a6d5c8..4bc7edab7b 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTypeInterface.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTypeInterface.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTypeMap.php b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTypeMap.php index 20448fad26..066f6bd267 100644 --- a/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTypeMap.php +++ b/src/DCarbone/PHPFHIRGenerated/DSTU2/PHPFHIRTypeMap.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRAccountStatusList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRAccountStatusList.php index 42e970c397..ee9adb1982 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRAccountStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRAccountStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -248,6 +248,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRActionCardinalityBehaviorList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRActionCardinalityBehaviorList.php index 5ac2dd70c6..ae887c7ba2 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRActionCardinalityBehaviorList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRActionCardinalityBehaviorList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -245,6 +245,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRActionConditionKindList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRActionConditionKindList.php index 21fd45313a..8053c56f2d 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRActionConditionKindList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRActionConditionKindList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -246,6 +246,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRActionGroupingBehaviorList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRActionGroupingBehaviorList.php index d5a3f9646a..235f3d000d 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRActionGroupingBehaviorList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRActionGroupingBehaviorList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -246,6 +246,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRActionParticipantTypeList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRActionParticipantTypeList.php index 562b1a9520..6db86ee5d3 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRActionParticipantTypeList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRActionParticipantTypeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -247,6 +247,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRActionPrecheckBehaviorList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRActionPrecheckBehaviorList.php index 4cfb03dd8a..faf3d07f12 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRActionPrecheckBehaviorList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRActionPrecheckBehaviorList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -245,6 +245,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRActionRelationshipTypeList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRActionRelationshipTypeList.php index 8ad5fec1ee..d06a305e30 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRActionRelationshipTypeList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRActionRelationshipTypeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -252,6 +252,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRActionRequiredBehaviorList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRActionRequiredBehaviorList.php index df002bf9f2..7deaa473f5 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRActionRequiredBehaviorList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRActionRequiredBehaviorList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -246,6 +246,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRActionSelectionBehaviorList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRActionSelectionBehaviorList.php index 08beefada2..05d23a74e7 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRActionSelectionBehaviorList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRActionSelectionBehaviorList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -249,6 +249,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRAddressTypeList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRAddressTypeList.php index a0bc1c251e..41e6d7cfc7 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRAddressTypeList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRAddressTypeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -246,6 +246,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRAddressUseList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRAddressUseList.php index 6e62d0d676..c37418bc74 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRAddressUseList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRAddressUseList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -248,6 +248,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRAdministrativeGenderList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRAdministrativeGenderList.php index 01a32cf5b8..c600e12bf2 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRAdministrativeGenderList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRAdministrativeGenderList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -247,6 +247,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRAdverseEventActualityList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRAdverseEventActualityList.php index 7fadf070a6..e1e132fe05 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRAdverseEventActualityList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRAdverseEventActualityList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -245,6 +245,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRAggregationModeList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRAggregationModeList.php index 4c7aca69ee..3bccbbcf0e 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRAggregationModeList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRAggregationModeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -246,6 +246,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRAllergyIntoleranceCategoryList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRAllergyIntoleranceCategoryList.php index 2cb18c8314..0842b307e3 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRAllergyIntoleranceCategoryList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRAllergyIntoleranceCategoryList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -247,6 +247,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRAllergyIntoleranceCriticalityList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRAllergyIntoleranceCriticalityList.php index e332c10b6d..b2e1f44c4b 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRAllergyIntoleranceCriticalityList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRAllergyIntoleranceCriticalityList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -246,6 +246,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRAllergyIntoleranceSeverityList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRAllergyIntoleranceSeverityList.php index 8904c3d7b4..c702395260 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRAllergyIntoleranceSeverityList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRAllergyIntoleranceSeverityList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -246,6 +246,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRAllergyIntoleranceTypeList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRAllergyIntoleranceTypeList.php index 7484ff78dd..9ec0a53caa 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRAllergyIntoleranceTypeList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRAllergyIntoleranceTypeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -245,6 +245,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRAppointmentStatusList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRAppointmentStatusList.php index 3481115b85..a793a04ae8 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRAppointmentStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRAppointmentStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -253,6 +253,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRAssertionDirectionTypeList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRAssertionDirectionTypeList.php index 09b1b63c24..41ecf4154a 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRAssertionDirectionTypeList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRAssertionDirectionTypeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -245,6 +245,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRAssertionOperatorTypeList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRAssertionOperatorTypeList.php index f15f51abbb..d3c4444015 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRAssertionOperatorTypeList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRAssertionOperatorTypeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -254,6 +254,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRAssertionResponseTypesList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRAssertionResponseTypesList.php index 45aa444951..f33904d1b8 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRAssertionResponseTypesList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRAssertionResponseTypesList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -255,6 +255,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRAuditEventActionList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRAuditEventActionList.php index baedeec30b..760385ea77 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRAuditEventActionList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRAuditEventActionList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -248,6 +248,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRAuditEventAgentNetworkTypeList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRAuditEventAgentNetworkTypeList.php index f83dd8aee3..f0f41da741 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRAuditEventAgentNetworkTypeList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRAuditEventAgentNetworkTypeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -248,6 +248,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRAuditEventOutcomeList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRAuditEventOutcomeList.php index 7bd386d97b..2389cccfd2 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRAuditEventOutcomeList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRAuditEventOutcomeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -247,6 +247,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRBase64BinaryPrimitive.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRBase64BinaryPrimitive.php index 0019d941be..d5219bf883 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRBase64BinaryPrimitive.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRBase64BinaryPrimitive.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -229,6 +229,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRBindingStrengthList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRBindingStrengthList.php index c68c7643ee..3ad60f2e6a 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRBindingStrengthList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRBindingStrengthList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -247,6 +247,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRBiologicallyDerivedProductCategoryList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRBiologicallyDerivedProductCategoryList.php index ac14cc2588..dd7c599800 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRBiologicallyDerivedProductCategoryList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRBiologicallyDerivedProductCategoryList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -248,6 +248,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRBiologicallyDerivedProductStatusList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRBiologicallyDerivedProductStatusList.php index f8975047d6..511ad41851 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRBiologicallyDerivedProductStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRBiologicallyDerivedProductStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -245,6 +245,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRBiologicallyDerivedProductStorageScaleList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRBiologicallyDerivedProductStorageScaleList.php index 40dfe08d3f..eabddd7efc 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRBiologicallyDerivedProductStorageScaleList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRBiologicallyDerivedProductStorageScaleList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -246,6 +246,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRBooleanPrimitive.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRBooleanPrimitive.php index 2db380c8a7..e70c0ae78f 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRBooleanPrimitive.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRBooleanPrimitive.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -225,6 +225,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRBundleTypeList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRBundleTypeList.php index 4a87c77423..cb583456ea 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRBundleTypeList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRBundleTypeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -252,6 +252,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRCanonicalPrimitive.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRCanonicalPrimitive.php index cb77f53a06..b5b9d43185 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRCanonicalPrimitive.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRCanonicalPrimitive.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -229,6 +229,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRCapabilityStatementKindList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRCapabilityStatementKindList.php index cd7c9be73d..e089a136b5 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRCapabilityStatementKindList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRCapabilityStatementKindList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -246,6 +246,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRCarePlanActivityKindList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRCarePlanActivityKindList.php index ff6a5534e9..e10fc3feca 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRCarePlanActivityKindList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRCarePlanActivityKindList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -251,6 +251,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRCarePlanActivityStatusList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRCarePlanActivityStatusList.php index 581caf20b0..651c092976 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRCarePlanActivityStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRCarePlanActivityStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -252,6 +252,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRCarePlanIntentList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRCarePlanIntentList.php index c1487104d3..5b509c1806 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRCarePlanIntentList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRCarePlanIntentList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -247,6 +247,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRCareTeamStatusList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRCareTeamStatusList.php index 5c312cd6b6..0fa9a0dce4 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRCareTeamStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRCareTeamStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -248,6 +248,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRCatalogEntryRelationTypeList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRCatalogEntryRelationTypeList.php index 144622abbf..13262bd86d 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRCatalogEntryRelationTypeList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRCatalogEntryRelationTypeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -245,6 +245,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRChargeItemStatusList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRChargeItemStatusList.php index 3b56d803aa..d726ca8d8f 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRChargeItemStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRChargeItemStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -250,6 +250,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRClaimProcessingCodesList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRClaimProcessingCodesList.php index 6026dbb400..edee302efe 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRClaimProcessingCodesList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRClaimProcessingCodesList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -247,6 +247,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRClinicalImpressionStatusList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRClinicalImpressionStatusList.php index bec56285e1..3548e26891 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRClinicalImpressionStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRClinicalImpressionStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -246,6 +246,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRCodePrimitive.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRCodePrimitive.php index 4d3372842a..cb4db355d7 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRCodePrimitive.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRCodePrimitive.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -229,6 +229,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRCodeSearchSupportList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRCodeSearchSupportList.php index 77066d4b0e..4d51b984cd 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRCodeSearchSupportList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRCodeSearchSupportList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -245,6 +245,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRCodeSystemContentModeList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRCodeSystemContentModeList.php index 9cec8bdbce..dfb5649895 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRCodeSystemContentModeList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRCodeSystemContentModeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -248,6 +248,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRCodeSystemHierarchyMeaningList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRCodeSystemHierarchyMeaningList.php index fe6eef579b..f7f1aeda8e 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRCodeSystemHierarchyMeaningList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRCodeSystemHierarchyMeaningList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -247,6 +247,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRCompartmentTypeList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRCompartmentTypeList.php index 786d4e72e7..134947a2c5 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRCompartmentTypeList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRCompartmentTypeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -248,6 +248,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRCompositionAttestationModeList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRCompositionAttestationModeList.php index 552e67d2ea..aaf638651f 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRCompositionAttestationModeList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRCompositionAttestationModeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -247,6 +247,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRCompositionStatusList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRCompositionStatusList.php index 8ed02ef29f..cb6d12754e 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRCompositionStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRCompositionStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -247,6 +247,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRConceptMapEquivalenceList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRConceptMapEquivalenceList.php index 32cc9920f9..94b0a6617b 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRConceptMapEquivalenceList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRConceptMapEquivalenceList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -253,6 +253,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRConceptMapGroupUnmappedModeList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRConceptMapGroupUnmappedModeList.php index 0feb82e000..e7335b0074 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRConceptMapGroupUnmappedModeList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRConceptMapGroupUnmappedModeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -246,6 +246,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRConditionalDeleteStatusList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRConditionalDeleteStatusList.php index aa4a36f6ec..39353d40aa 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRConditionalDeleteStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRConditionalDeleteStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -246,6 +246,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRConditionalReadStatusList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRConditionalReadStatusList.php index 915c4ba316..09ffe3cece 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRConditionalReadStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRConditionalReadStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -247,6 +247,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRConsentDataMeaningList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRConsentDataMeaningList.php index a8644fb879..9f993b1674 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRConsentDataMeaningList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRConsentDataMeaningList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -247,6 +247,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRConsentProvisionTypeList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRConsentProvisionTypeList.php index e031943bb4..f05dd59848 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRConsentProvisionTypeList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRConsentProvisionTypeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -245,6 +245,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRConsentStateList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRConsentStateList.php index 36e48b2e06..bc66ff1ce9 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRConsentStateList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRConsentStateList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -249,6 +249,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRConstraintSeverityList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRConstraintSeverityList.php index dc65ae2acb..0b65955de2 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRConstraintSeverityList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRConstraintSeverityList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -245,6 +245,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRContactPointSystemList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRContactPointSystemList.php index 24abfdb6a8..6178084ee8 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRContactPointSystemList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRContactPointSystemList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -250,6 +250,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRContactPointUseList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRContactPointUseList.php index c77298e6bd..b0215f65c2 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRContactPointUseList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRContactPointUseList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -248,6 +248,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRContractResourcePublicationStatusCodesList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRContractResourcePublicationStatusCodesList.php index 56d9d5a88a..e019978ec9 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRContractResourcePublicationStatusCodesList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRContractResourcePublicationStatusCodesList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -258,6 +258,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRContractResourceStatusCodesList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRContractResourceStatusCodesList.php index 42ce07b99b..869085bd99 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRContractResourceStatusCodesList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRContractResourceStatusCodesList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -258,6 +258,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRContributorTypeList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRContributorTypeList.php index f61f30192b..d3a6f5cab1 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRContributorTypeList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRContributorTypeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -247,6 +247,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRDatePrimitive.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRDatePrimitive.php index 5908dfa0f2..11e106849f 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRDatePrimitive.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRDatePrimitive.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -271,6 +271,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRDateTimePrimitive.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRDateTimePrimitive.php index a66cb67ea9..564f1b3aba 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRDateTimePrimitive.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRDateTimePrimitive.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -273,6 +273,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRDaysOfWeekList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRDaysOfWeekList.php index bf54798ee4..f5d5648f08 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRDaysOfWeekList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRDaysOfWeekList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -250,6 +250,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRDecimalPrimitive.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRDecimalPrimitive.php index d58615b8d8..456240e3cc 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRDecimalPrimitive.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRDecimalPrimitive.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -224,6 +224,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRDetectedIssueSeverityList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRDetectedIssueSeverityList.php index 6606d00209..4d2baa5530 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRDetectedIssueSeverityList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRDetectedIssueSeverityList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -246,6 +246,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRDeviceMetricCalibrationStateList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRDeviceMetricCalibrationStateList.php index e350a7910d..c7e5799f9b 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRDeviceMetricCalibrationStateList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRDeviceMetricCalibrationStateList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -247,6 +247,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRDeviceMetricCalibrationTypeList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRDeviceMetricCalibrationTypeList.php index a83bd3ecad..7da3f842b1 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRDeviceMetricCalibrationTypeList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRDeviceMetricCalibrationTypeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -247,6 +247,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRDeviceMetricCategoryList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRDeviceMetricCategoryList.php index 75bfee65eb..295b219c72 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRDeviceMetricCategoryList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRDeviceMetricCategoryList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -247,6 +247,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRDeviceMetricColorList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRDeviceMetricColorList.php index c9cd5190f0..c09b4e167f 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRDeviceMetricColorList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRDeviceMetricColorList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -251,6 +251,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRDeviceMetricOperationalStatusList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRDeviceMetricOperationalStatusList.php index af41ab55a0..8a8b80f1dc 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRDeviceMetricOperationalStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRDeviceMetricOperationalStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -247,6 +247,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRDeviceNameTypeList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRDeviceNameTypeList.php index 0766c004b7..f293f596d7 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRDeviceNameTypeList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRDeviceNameTypeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -249,6 +249,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRDeviceUseStatementStatusList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRDeviceUseStatementStatusList.php index e5ea741e61..fcf639deaa 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRDeviceUseStatementStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRDeviceUseStatementStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -249,6 +249,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRDiagnosticReportStatusList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRDiagnosticReportStatusList.php index e906266a73..d7bface369 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRDiagnosticReportStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRDiagnosticReportStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -253,6 +253,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRDiscriminatorTypeList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRDiscriminatorTypeList.php index 57ffd770d3..5f71868ee5 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRDiscriminatorTypeList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRDiscriminatorTypeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -248,6 +248,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRDocumentModeList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRDocumentModeList.php index fe1d542e47..2ab7750cd5 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRDocumentModeList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRDocumentModeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -245,6 +245,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRDocumentReferenceStatusList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRDocumentReferenceStatusList.php index 75366db0eb..19ff6d24f5 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRDocumentReferenceStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRDocumentReferenceStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -246,6 +246,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRDocumentRelationshipTypeList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRDocumentRelationshipTypeList.php index 25991fbc58..05fc41165d 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRDocumentRelationshipTypeList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRDocumentRelationshipTypeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -247,6 +247,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement.php index f7464ae1f2..0af042135d 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,9 +78,7 @@ class FHIRElement implements PHPFHIRCommentContainerInterface, PHPFHIRTypeInterf // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ELEMENT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; + const FIELD_FHIR_COMMENTS = 'fhir_comments'; const FIELD_EXTENSION = 'extension'; const FIELD_ID = 'id'; @@ -105,6 +103,9 @@ class FHIRElement implements PHPFHIRCommentContainerInterface, PHPFHIRTypeInterf */ protected $id = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRElement Constructor * @param null|array $data @@ -120,9 +121,19 @@ public function __construct($data = null) gettype($data) )); } + if (isset($data[self::FIELD_FHIR_COMMENTS])) { + if (is_array($data[self::FIELD_FHIR_COMMENTS])) { + $this->_setFHIRComments($data[self::FIELD_FHIR_COMMENTS]); + } else if (is_string($data[self::FIELD_FHIR_COMMENTS])) { + $this->_addFHIRComment($data[self::FIELD_FHIR_COMMENTS]); + } + } if (isset($data[self::FIELD_EXTENSION])) { if (is_array($data[self::FIELD_EXTENSION])) { foreach($data[self::FIELD_EXTENSION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRExtension) { $this->addExtension($v); } else { @@ -363,6 +374,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 public function jsonSerialize() { $a = []; + if ([] !== ($vs = $this->_getFHIRComments())) { + $a[self::FIELD_FHIR_COMMENTS] = $vs; + } if ([] !== ($vs = $this->getExtension())) { $a[self::FIELD_EXTENSION] = $vs; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRAccountStatus.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRAccountStatus.php index 52359fe7a8..f3ae0e2bc9 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRAccountStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRAccountStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRAccountStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ACCOUNT_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRAccountStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRAccountStatus Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRActionCardinalityBehavior.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRActionCardinalityBehavior.php index c94df7bc96..e4b4640d83 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRActionCardinalityBehavior.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRActionCardinalityBehavior.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRActionCardinalityBehavior extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ACTION_CARDINALITY_BEHAVIOR; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -90,6 +86,9 @@ class FHIRActionCardinalityBehavior extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRActionCardinalityBehavior Constructor * @param null|array $data @@ -245,8 +244,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRActionConditionKind.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRActionConditionKind.php index c80a58e3a5..8bddaafaf7 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRActionConditionKind.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRActionConditionKind.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRActionConditionKind extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ACTION_CONDITION_KIND; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRActionConditionKind extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRActionConditionKind Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRActionGroupingBehavior.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRActionGroupingBehavior.php index c10b6dd66e..9b085b6bcd 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRActionGroupingBehavior.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRActionGroupingBehavior.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRActionGroupingBehavior extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ACTION_GROUPING_BEHAVIOR; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRActionGroupingBehavior extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRActionGroupingBehavior Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRActionParticipantType.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRActionParticipantType.php index 9cb4c0fc8a..a7cacca6c1 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRActionParticipantType.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRActionParticipantType.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRActionParticipantType extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ACTION_PARTICIPANT_TYPE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRActionParticipantType extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRActionParticipantType Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRActionPrecheckBehavior.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRActionPrecheckBehavior.php index b39060d5c0..a28f1e3607 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRActionPrecheckBehavior.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRActionPrecheckBehavior.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRActionPrecheckBehavior extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ACTION_PRECHECK_BEHAVIOR; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRActionPrecheckBehavior extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRActionPrecheckBehavior Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRActionRelationshipType.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRActionRelationshipType.php index fa2b843b66..1222c60b68 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRActionRelationshipType.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRActionRelationshipType.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRActionRelationshipType extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ACTION_RELATIONSHIP_TYPE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRActionRelationshipType extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRActionRelationshipType Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRActionRequiredBehavior.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRActionRequiredBehavior.php index 0b9761e447..f9924e8713 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRActionRequiredBehavior.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRActionRequiredBehavior.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRActionRequiredBehavior extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ACTION_REQUIRED_BEHAVIOR; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRActionRequiredBehavior extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRActionRequiredBehavior Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRActionSelectionBehavior.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRActionSelectionBehavior.php index 26b9a1e294..34fe0fae87 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRActionSelectionBehavior.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRActionSelectionBehavior.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRActionSelectionBehavior extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ACTION_SELECTION_BEHAVIOR; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRActionSelectionBehavior extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRActionSelectionBehavior Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRAddress.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRAddress.php index b09342f4c7..76f442e84d 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRAddress.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRAddress.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -82,10 +82,6 @@ class FHIRAddress extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ADDRESS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CITY = 'city'; const FIELD_CITY_EXT = '_city'; const FIELD_COUNTRY = 'country'; @@ -219,6 +215,9 @@ class FHIRAddress extends FHIRElement */ protected $use = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRAddress Constructor * @param null|array $data @@ -241,8 +240,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CITY] instanceof FHIRString) { $this->setCity($data[self::FIELD_CITY]); - } elseif ($ext && is_scalar($data[self::FIELD_CITY])) { - $this->setCity(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_CITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CITY])) { + $this->setCity(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_CITY]] + $ext)); + } else if (is_array($data[self::FIELD_CITY])) { + $this->setCity(new FHIRString(array_merge($ext, $data[self::FIELD_CITY]))); + } } else { $this->setCity(new FHIRString($data[self::FIELD_CITY])); } @@ -253,8 +256,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_COUNTRY] instanceof FHIRString) { $this->setCountry($data[self::FIELD_COUNTRY]); - } elseif ($ext && is_scalar($data[self::FIELD_COUNTRY])) { - $this->setCountry(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_COUNTRY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_COUNTRY])) { + $this->setCountry(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_COUNTRY]] + $ext)); + } else if (is_array($data[self::FIELD_COUNTRY])) { + $this->setCountry(new FHIRString(array_merge($ext, $data[self::FIELD_COUNTRY]))); + } } else { $this->setCountry(new FHIRString($data[self::FIELD_COUNTRY])); } @@ -265,8 +272,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DISTRICT] instanceof FHIRString) { $this->setDistrict($data[self::FIELD_DISTRICT]); - } elseif ($ext && is_scalar($data[self::FIELD_DISTRICT])) { - $this->setDistrict(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DISTRICT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DISTRICT])) { + $this->setDistrict(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DISTRICT]] + $ext)); + } else if (is_array($data[self::FIELD_DISTRICT])) { + $this->setDistrict(new FHIRString(array_merge($ext, $data[self::FIELD_DISTRICT]))); + } } else { $this->setDistrict(new FHIRString($data[self::FIELD_DISTRICT])); } @@ -277,17 +288,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_LINE])) { foreach($data[self::FIELD_LINE] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRString) { $this->addLine($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addLine(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addLine(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addLine(new FHIRString(array_merge($v, $ext[$i]))); + } } else { $this->addLine(new FHIRString($v)); } } } elseif ($data[self::FIELD_LINE] instanceof FHIRString) { $this->addLine($data[self::FIELD_LINE]); - } elseif ($ext && is_scalar($data[self::FIELD_LINE])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_LINE])) { $this->addLine(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_LINE]] + $ext)); } else { $this->addLine(new FHIRString($data[self::FIELD_LINE])); @@ -306,8 +324,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_POSTAL_CODE] instanceof FHIRString) { $this->setPostalCode($data[self::FIELD_POSTAL_CODE]); - } elseif ($ext && is_scalar($data[self::FIELD_POSTAL_CODE])) { - $this->setPostalCode(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_POSTAL_CODE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_POSTAL_CODE])) { + $this->setPostalCode(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_POSTAL_CODE]] + $ext)); + } else if (is_array($data[self::FIELD_POSTAL_CODE])) { + $this->setPostalCode(new FHIRString(array_merge($ext, $data[self::FIELD_POSTAL_CODE]))); + } } else { $this->setPostalCode(new FHIRString($data[self::FIELD_POSTAL_CODE])); } @@ -318,8 +340,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATE] instanceof FHIRString) { $this->setState($data[self::FIELD_STATE]); - } elseif ($ext && is_scalar($data[self::FIELD_STATE])) { - $this->setState(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_STATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATE])) { + $this->setState(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_STATE]] + $ext)); + } else if (is_array($data[self::FIELD_STATE])) { + $this->setState(new FHIRString(array_merge($ext, $data[self::FIELD_STATE]))); + } } else { $this->setState(new FHIRString($data[self::FIELD_STATE])); } @@ -330,8 +356,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TEXT] instanceof FHIRString) { $this->setText($data[self::FIELD_TEXT]); - } elseif ($ext && is_scalar($data[self::FIELD_TEXT])) { - $this->setText(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TEXT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TEXT])) { + $this->setText(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TEXT]] + $ext)); + } else if (is_array($data[self::FIELD_TEXT])) { + $this->setText(new FHIRString(array_merge($ext, $data[self::FIELD_TEXT]))); + } } else { $this->setText(new FHIRString($data[self::FIELD_TEXT])); } @@ -342,8 +372,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TYPE] instanceof FHIRAddressType) { $this->setType($data[self::FIELD_TYPE]); - } elseif ($ext && is_scalar($data[self::FIELD_TYPE])) { - $this->setType(new FHIRAddressType([FHIRAddressType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TYPE])) { + $this->setType(new FHIRAddressType([FHIRAddressType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } else if (is_array($data[self::FIELD_TYPE])) { + $this->setType(new FHIRAddressType(array_merge($ext, $data[self::FIELD_TYPE]))); + } } else { $this->setType(new FHIRAddressType($data[self::FIELD_TYPE])); } @@ -354,8 +388,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_USE] instanceof FHIRAddressUse) { $this->setUse($data[self::FIELD_USE]); - } elseif ($ext && is_scalar($data[self::FIELD_USE])) { - $this->setUse(new FHIRAddressUse([FHIRAddressUse::FIELD_VALUE => $data[self::FIELD_USE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_USE])) { + $this->setUse(new FHIRAddressUse([FHIRAddressUse::FIELD_VALUE => $data[self::FIELD_USE]] + $ext)); + } else if (is_array($data[self::FIELD_USE])) { + $this->setUse(new FHIRAddressUse(array_merge($ext, $data[self::FIELD_USE]))); + } } else { $this->setUse(new FHIRAddressUse($data[self::FIELD_USE])); } @@ -933,11 +971,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getText())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TEXT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getUse())) { $v->xmlSerialize($sxe->addChild(self::FIELD_USE, null, $v->_getFHIRXMLNamespace())); } @@ -951,16 +987,37 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getCity())) { - $a[self::FIELD_CITY] = $v->getValue(); - $a[self::FIELD_CITY_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CITY_EXT] = $enc; + } + } else { + $a[self::FIELD_CITY] = $v; + } } if (null !== ($v = $this->getCountry())) { - $a[self::FIELD_COUNTRY] = $v->getValue(); - $a[self::FIELD_COUNTRY_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_COUNTRY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_COUNTRY_EXT] = $enc; + } + } else { + $a[self::FIELD_COUNTRY] = $v; + } } if (null !== ($v = $this->getDistrict())) { - $a[self::FIELD_DISTRICT] = $v->getValue(); - $a[self::FIELD_DISTRICT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DISTRICT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DISTRICT_EXT] = $enc; + } + } else { + $a[self::FIELD_DISTRICT] = $v; + } } if ([] !== ($vs = $this->getLine())) { $a[self::FIELD_LINE] = []; @@ -968,30 +1025,76 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_LINE][] = $v->getValue(); - $a[self::FIELD_LINE_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_LINE][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_LINE_EXT][] = $enc; + } else { + $a[self::FIELD_LINE_EXT][] = null; + } + } else { + $a[self::FIELD_LINE][] = $v; + } } } if (null !== ($v = $this->getPeriod())) { $a[self::FIELD_PERIOD] = $v; } if (null !== ($v = $this->getPostalCode())) { - $a[self::FIELD_POSTAL_CODE] = $v->getValue(); - $a[self::FIELD_POSTAL_CODE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_POSTAL_CODE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_POSTAL_CODE_EXT] = $enc; + } + } else { + $a[self::FIELD_POSTAL_CODE] = $v; + } } if (null !== ($v = $this->getState())) { - $a[self::FIELD_STATE] = $v->getValue(); - $a[self::FIELD_STATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATE_EXT] = $enc; + } + } else { + $a[self::FIELD_STATE] = $v; + } } if (null !== ($v = $this->getText())) { - $a[self::FIELD_TEXT] = $v->getValue(); - $a[self::FIELD_TEXT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TEXT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TEXT_EXT] = $enc; + } + } else { + $a[self::FIELD_TEXT] = $v; + } } if (null !== ($v = $this->getType())) { - $a[self::FIELD_TYPE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TYPE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TYPE_EXT] = $enc; + } + } else { + $a[self::FIELD_TYPE] = $v; + } } if (null !== ($v = $this->getUse())) { - $a[self::FIELD_USE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_USE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_USE_EXT] = $enc; + } + } else { + $a[self::FIELD_USE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRAddressType.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRAddressType.php index c47ad232f5..a3542f5008 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRAddressType.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRAddressType.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRAddressType extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ADDRESS_TYPE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRAddressType extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRAddressType Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRAddressUse.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRAddressUse.php index e93f263654..90bcb4ee66 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRAddressUse.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRAddressUse.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRAddressUse extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ADDRESS_USE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRAddressUse extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRAddressUse Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRAdministrativeGender.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRAdministrativeGender.php index ba5c56efa9..725a826f1e 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRAdministrativeGender.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRAdministrativeGender.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -77,10 +77,6 @@ class FHIRAdministrativeGender extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ADMINISTRATIVE_GENDER; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -88,6 +84,9 @@ class FHIRAdministrativeGender extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRAdministrativeGender Constructor * @param null|array $data @@ -243,8 +242,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRAdverseEventActuality.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRAdverseEventActuality.php index 3ef61074a9..569dcf02d0 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRAdverseEventActuality.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRAdverseEventActuality.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRAdverseEventActuality extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ADVERSE_EVENT_ACTUALITY; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRAdverseEventActuality extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRAdverseEventActuality Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRAggregationMode.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRAggregationMode.php index 69f685a945..9153455d57 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRAggregationMode.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRAggregationMode.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRAggregationMode extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_AGGREGATION_MODE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRAggregationMode extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRAggregationMode Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRAllergyIntoleranceCategory.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRAllergyIntoleranceCategory.php index b3af32357d..02f44386db 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRAllergyIntoleranceCategory.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRAllergyIntoleranceCategory.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRAllergyIntoleranceCategory extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ALLERGY_INTOLERANCE_CATEGORY; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRAllergyIntoleranceCategory extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRAllergyIntoleranceCategory Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRAllergyIntoleranceCriticality.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRAllergyIntoleranceCriticality.php index d34df8c3c4..95f119d92a 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRAllergyIntoleranceCriticality.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRAllergyIntoleranceCriticality.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRAllergyIntoleranceCriticality extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ALLERGY_INTOLERANCE_CRITICALITY; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -90,6 +86,9 @@ class FHIRAllergyIntoleranceCriticality extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRAllergyIntoleranceCriticality Constructor * @param null|array $data @@ -245,8 +244,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRAllergyIntoleranceSeverity.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRAllergyIntoleranceSeverity.php index 9c9e89e42e..f405fd0160 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRAllergyIntoleranceSeverity.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRAllergyIntoleranceSeverity.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRAllergyIntoleranceSeverity extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ALLERGY_INTOLERANCE_SEVERITY; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -90,6 +86,9 @@ class FHIRAllergyIntoleranceSeverity extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRAllergyIntoleranceSeverity Constructor * @param null|array $data @@ -245,8 +244,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRAllergyIntoleranceType.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRAllergyIntoleranceType.php index 6fd6bc65fb..0379ec56cd 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRAllergyIntoleranceType.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRAllergyIntoleranceType.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRAllergyIntoleranceType extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ALLERGY_INTOLERANCE_TYPE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRAllergyIntoleranceType extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRAllergyIntoleranceType Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRAnnotation.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRAnnotation.php index 7628818165..b17add8bfc 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRAnnotation.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRAnnotation.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRAnnotation extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ANNOTATION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_AUTHOR_REFERENCE = 'authorReference'; const FIELD_AUTHOR_STRING = 'authorString'; const FIELD_AUTHOR_STRING_EXT = '_authorString'; @@ -144,6 +140,9 @@ class FHIRAnnotation extends FHIRElement */ protected $time = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRAnnotation Constructor * @param null|array $data @@ -173,8 +172,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_AUTHOR_STRING] instanceof FHIRString) { $this->setAuthorString($data[self::FIELD_AUTHOR_STRING]); - } elseif ($ext && is_scalar($data[self::FIELD_AUTHOR_STRING])) { - $this->setAuthorString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_AUTHOR_STRING]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_AUTHOR_STRING])) { + $this->setAuthorString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_AUTHOR_STRING]] + $ext)); + } else if (is_array($data[self::FIELD_AUTHOR_STRING])) { + $this->setAuthorString(new FHIRString(array_merge($ext, $data[self::FIELD_AUTHOR_STRING]))); + } } else { $this->setAuthorString(new FHIRString($data[self::FIELD_AUTHOR_STRING])); } @@ -185,8 +188,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TEXT] instanceof FHIRMarkdown) { $this->setText($data[self::FIELD_TEXT]); - } elseif ($ext && is_scalar($data[self::FIELD_TEXT])) { - $this->setText(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_TEXT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TEXT])) { + $this->setText(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_TEXT]] + $ext)); + } else if (is_array($data[self::FIELD_TEXT])) { + $this->setText(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_TEXT]))); + } } else { $this->setText(new FHIRMarkdown($data[self::FIELD_TEXT])); } @@ -197,8 +204,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TIME] instanceof FHIRDateTime) { $this->setTime($data[self::FIELD_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_TIME])) { - $this->setTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TIME])) { + $this->setTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_TIME])) { + $this->setTime(new FHIRDateTime(array_merge($ext, $data[self::FIELD_TIME]))); + } } else { $this->setTime(new FHIRDateTime($data[self::FIELD_TIME])); } @@ -487,7 +498,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getAuthorReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AUTHOR_REFERENCE, null, $v->_getFHIRXMLNamespace())); } @@ -513,16 +523,37 @@ public function jsonSerialize() $a[self::FIELD_AUTHOR_REFERENCE] = $v; } if (null !== ($v = $this->getAuthorString())) { - $a[self::FIELD_AUTHOR_STRING] = $v->getValue(); - $a[self::FIELD_AUTHOR_STRING_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_AUTHOR_STRING] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_AUTHOR_STRING_EXT] = $enc; + } + } else { + $a[self::FIELD_AUTHOR_STRING] = $v; + } } if (null !== ($v = $this->getText())) { - $a[self::FIELD_TEXT] = $v->getValue(); - $a[self::FIELD_TEXT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TEXT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TEXT_EXT] = $enc; + } + } else { + $a[self::FIELD_TEXT] = $v; + } } if (null !== ($v = $this->getTime())) { - $a[self::FIELD_TIME] = $v->getValue(); - $a[self::FIELD_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_TIME] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRAppointmentStatus.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRAppointmentStatus.php index 255b906119..8b047ba937 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRAppointmentStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRAppointmentStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRAppointmentStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_APPOINTMENT_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRAppointmentStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRAppointmentStatus Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRAssertionDirectionType.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRAssertionDirectionType.php index 6641773567..bc8a1996d6 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRAssertionDirectionType.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRAssertionDirectionType.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRAssertionDirectionType extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ASSERTION_DIRECTION_TYPE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRAssertionDirectionType extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRAssertionDirectionType Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRAssertionOperatorType.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRAssertionOperatorType.php index 03af030d07..8332f62643 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRAssertionOperatorType.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRAssertionOperatorType.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRAssertionOperatorType extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ASSERTION_OPERATOR_TYPE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRAssertionOperatorType extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRAssertionOperatorType Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRAssertionResponseTypes.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRAssertionResponseTypes.php index 4b615c8354..ab54f6ade4 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRAssertionResponseTypes.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRAssertionResponseTypes.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRAssertionResponseTypes extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ASSERTION_RESPONSE_TYPES; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRAssertionResponseTypes extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRAssertionResponseTypes Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRAttachment.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRAttachment.php index 677da88202..8b8180ab30 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRAttachment.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRAttachment.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRAttachment extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ATTACHMENT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CONTENT_TYPE = 'contentType'; const FIELD_CONTENT_TYPE_EXT = '_contentType'; const FIELD_CREATION = 'creation'; @@ -196,6 +192,9 @@ class FHIRAttachment extends FHIRElement */ protected $url = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRAttachment Constructor * @param null|array $data @@ -218,8 +217,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CONTENT_TYPE] instanceof FHIRCode) { $this->setContentType($data[self::FIELD_CONTENT_TYPE]); - } elseif ($ext && is_scalar($data[self::FIELD_CONTENT_TYPE])) { - $this->setContentType(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_CONTENT_TYPE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CONTENT_TYPE])) { + $this->setContentType(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_CONTENT_TYPE]] + $ext)); + } else if (is_array($data[self::FIELD_CONTENT_TYPE])) { + $this->setContentType(new FHIRCode(array_merge($ext, $data[self::FIELD_CONTENT_TYPE]))); + } } else { $this->setContentType(new FHIRCode($data[self::FIELD_CONTENT_TYPE])); } @@ -230,8 +233,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CREATION] instanceof FHIRDateTime) { $this->setCreation($data[self::FIELD_CREATION]); - } elseif ($ext && is_scalar($data[self::FIELD_CREATION])) { - $this->setCreation(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_CREATION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CREATION])) { + $this->setCreation(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_CREATION]] + $ext)); + } else if (is_array($data[self::FIELD_CREATION])) { + $this->setCreation(new FHIRDateTime(array_merge($ext, $data[self::FIELD_CREATION]))); + } } else { $this->setCreation(new FHIRDateTime($data[self::FIELD_CREATION])); } @@ -242,8 +249,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATA] instanceof FHIRBase64Binary) { $this->setData($data[self::FIELD_DATA]); - } elseif ($ext && is_scalar($data[self::FIELD_DATA])) { - $this->setData(new FHIRBase64Binary([FHIRBase64Binary::FIELD_VALUE => $data[self::FIELD_DATA]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATA])) { + $this->setData(new FHIRBase64Binary([FHIRBase64Binary::FIELD_VALUE => $data[self::FIELD_DATA]] + $ext)); + } else if (is_array($data[self::FIELD_DATA])) { + $this->setData(new FHIRBase64Binary(array_merge($ext, $data[self::FIELD_DATA]))); + } } else { $this->setData(new FHIRBase64Binary($data[self::FIELD_DATA])); } @@ -254,8 +265,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_HASH] instanceof FHIRBase64Binary) { $this->setHash($data[self::FIELD_HASH]); - } elseif ($ext && is_scalar($data[self::FIELD_HASH])) { - $this->setHash(new FHIRBase64Binary([FHIRBase64Binary::FIELD_VALUE => $data[self::FIELD_HASH]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_HASH])) { + $this->setHash(new FHIRBase64Binary([FHIRBase64Binary::FIELD_VALUE => $data[self::FIELD_HASH]] + $ext)); + } else if (is_array($data[self::FIELD_HASH])) { + $this->setHash(new FHIRBase64Binary(array_merge($ext, $data[self::FIELD_HASH]))); + } } else { $this->setHash(new FHIRBase64Binary($data[self::FIELD_HASH])); } @@ -266,8 +281,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_LANGUAGE] instanceof FHIRCode) { $this->setLanguage($data[self::FIELD_LANGUAGE]); - } elseif ($ext && is_scalar($data[self::FIELD_LANGUAGE])) { - $this->setLanguage(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_LANGUAGE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_LANGUAGE])) { + $this->setLanguage(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_LANGUAGE]] + $ext)); + } else if (is_array($data[self::FIELD_LANGUAGE])) { + $this->setLanguage(new FHIRCode(array_merge($ext, $data[self::FIELD_LANGUAGE]))); + } } else { $this->setLanguage(new FHIRCode($data[self::FIELD_LANGUAGE])); } @@ -278,8 +297,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SIZE] instanceof FHIRUnsignedInt) { $this->setSize($data[self::FIELD_SIZE]); - } elseif ($ext && is_scalar($data[self::FIELD_SIZE])) { - $this->setSize(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_SIZE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SIZE])) { + $this->setSize(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_SIZE]] + $ext)); + } else if (is_array($data[self::FIELD_SIZE])) { + $this->setSize(new FHIRUnsignedInt(array_merge($ext, $data[self::FIELD_SIZE]))); + } } else { $this->setSize(new FHIRUnsignedInt($data[self::FIELD_SIZE])); } @@ -290,8 +313,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TITLE] instanceof FHIRString) { $this->setTitle($data[self::FIELD_TITLE]); - } elseif ($ext && is_scalar($data[self::FIELD_TITLE])) { - $this->setTitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TITLE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TITLE])) { + $this->setTitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TITLE]] + $ext)); + } else if (is_array($data[self::FIELD_TITLE])) { + $this->setTitle(new FHIRString(array_merge($ext, $data[self::FIELD_TITLE]))); + } } else { $this->setTitle(new FHIRString($data[self::FIELD_TITLE])); } @@ -302,8 +329,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_URL] instanceof FHIRUrl) { $this->setUrl($data[self::FIELD_URL]); - } elseif ($ext && is_scalar($data[self::FIELD_URL])) { - $this->setUrl(new FHIRUrl([FHIRUrl::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUrl([FHIRUrl::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } else if (is_array($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUrl(array_merge($ext, $data[self::FIELD_URL]))); + } } else { $this->setUrl(new FHIRUrl($data[self::FIELD_URL])); } @@ -813,36 +844,92 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getContentType())) { - $a[self::FIELD_CONTENT_TYPE] = $v->getValue(); - $a[self::FIELD_CONTENT_TYPE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CONTENT_TYPE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CONTENT_TYPE_EXT] = $enc; + } + } else { + $a[self::FIELD_CONTENT_TYPE] = $v; + } } if (null !== ($v = $this->getCreation())) { - $a[self::FIELD_CREATION] = $v->getValue(); - $a[self::FIELD_CREATION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CREATION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CREATION_EXT] = $enc; + } + } else { + $a[self::FIELD_CREATION] = $v; + } } if (null !== ($v = $this->getData())) { - $a[self::FIELD_DATA] = $v->getValue(); - $a[self::FIELD_DATA_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATA] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATA_EXT] = $enc; + } + } else { + $a[self::FIELD_DATA] = $v; + } } if (null !== ($v = $this->getHash())) { - $a[self::FIELD_HASH] = $v->getValue(); - $a[self::FIELD_HASH_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_HASH] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_HASH_EXT] = $enc; + } + } else { + $a[self::FIELD_HASH] = $v; + } } if (null !== ($v = $this->getLanguage())) { - $a[self::FIELD_LANGUAGE] = $v->getValue(); - $a[self::FIELD_LANGUAGE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_LANGUAGE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_LANGUAGE_EXT] = $enc; + } + } else { + $a[self::FIELD_LANGUAGE] = $v; + } } if (null !== ($v = $this->getSize())) { - $a[self::FIELD_SIZE] = $v->getValue(); - $a[self::FIELD_SIZE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SIZE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SIZE_EXT] = $enc; + } + } else { + $a[self::FIELD_SIZE] = $v; + } } if (null !== ($v = $this->getTitle())) { - $a[self::FIELD_TITLE] = $v->getValue(); - $a[self::FIELD_TITLE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TITLE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TITLE_EXT] = $enc; + } + } else { + $a[self::FIELD_TITLE] = $v; + } } if (null !== ($v = $this->getUrl())) { - $a[self::FIELD_URL] = $v->getValue(); - $a[self::FIELD_URL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_URL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_URL_EXT] = $enc; + } + } else { + $a[self::FIELD_URL] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRAuditEventAction.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRAuditEventAction.php index 5d9eab5f70..d179e2e2e5 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRAuditEventAction.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRAuditEventAction.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRAuditEventAction extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_AUDIT_EVENT_ACTION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -90,6 +86,9 @@ class FHIRAuditEventAction extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRAuditEventAction Constructor * @param null|array $data @@ -245,8 +244,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRAuditEventAgentNetworkType.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRAuditEventAgentNetworkType.php index aaad7f07bc..50c732b791 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRAuditEventAgentNetworkType.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRAuditEventAgentNetworkType.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRAuditEventAgentNetworkType extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_AUDIT_EVENT_AGENT_NETWORK_TYPE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRAuditEventAgentNetworkType extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRAuditEventAgentNetworkType Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRAuditEventOutcome.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRAuditEventOutcome.php index 4f08918d9e..a95aceaec2 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRAuditEventOutcome.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRAuditEventOutcome.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRAuditEventOutcome extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_AUDIT_EVENT_OUTCOME; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRAuditEventOutcome extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRAuditEventOutcome Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement.php index 4c7a33d4e8..d21c3bf584 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRBackboneElement extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_BACKBONE_ELEMENT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_MODIFIER_EXTENSION = 'modifierExtension'; /** @@ -106,6 +102,9 @@ class FHIRBackboneElement extends FHIRElement */ protected $modifierExtension = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRBackboneElement Constructor * @param null|array $data @@ -125,6 +124,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_MODIFIER_EXTENSION])) { if (is_array($data[self::FIELD_MODIFIER_EXTENSION])) { foreach($data[self::FIELD_MODIFIER_EXTENSION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRExtension) { $this->addModifierExtension($v); } else { @@ -329,7 +331,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getModifierExtension())) { foreach($vs as $v) { if (null === $v) { @@ -338,6 +339,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_MODIFIER_EXTENSION, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRAccount/FHIRAccountCoverage.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRAccount/FHIRAccountCoverage.php index dcd0e8bab3..26c112dbae 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRAccount/FHIRAccountCoverage.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRAccount/FHIRAccountCoverage.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRAccountCoverage extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ACCOUNT_DOT_COVERAGE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_COVERAGE = 'coverage'; const FIELD_PRIORITY = 'priority'; const FIELD_PRIORITY_EXT = '_priority'; @@ -112,6 +108,9 @@ class FHIRAccountCoverage extends FHIRBackboneElement */ protected $priority = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRAccountCoverage Constructor * @param null|array $data @@ -141,8 +140,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PRIORITY] instanceof FHIRPositiveInt) { $this->setPriority($data[self::FIELD_PRIORITY]); - } elseif ($ext && is_scalar($data[self::FIELD_PRIORITY])) { - $this->setPriority(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_PRIORITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PRIORITY])) { + $this->setPriority(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_PRIORITY]] + $ext)); + } else if (is_array($data[self::FIELD_PRIORITY])) { + $this->setPriority(new FHIRPositiveInt(array_merge($ext, $data[self::FIELD_PRIORITY]))); + } } else { $this->setPriority(new FHIRPositiveInt($data[self::FIELD_PRIORITY])); } @@ -331,7 +334,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getCoverage())) { $v->xmlSerialize($sxe->addChild(self::FIELD_COVERAGE, null, $v->_getFHIRXMLNamespace())); } @@ -351,8 +353,15 @@ public function jsonSerialize() $a[self::FIELD_COVERAGE] = $v; } if (null !== ($v = $this->getPriority())) { - $a[self::FIELD_PRIORITY] = $v->getValue(); - $a[self::FIELD_PRIORITY_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PRIORITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PRIORITY_EXT] = $enc; + } + } else { + $a[self::FIELD_PRIORITY] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRAccount/FHIRAccountGuarantor.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRAccount/FHIRAccountGuarantor.php index 03adf5c1ed..1e5d11afa1 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRAccount/FHIRAccountGuarantor.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRAccount/FHIRAccountGuarantor.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRAccountGuarantor extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ACCOUNT_DOT_GUARANTOR; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ON_HOLD = 'onHold'; const FIELD_ON_HOLD_EXT = '_onHold'; const FIELD_PARTY = 'party'; @@ -122,6 +118,9 @@ class FHIRAccountGuarantor extends FHIRBackboneElement */ protected $period = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRAccountGuarantor Constructor * @param null|array $data @@ -144,8 +143,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ON_HOLD] instanceof FHIRBoolean) { $this->setOnHold($data[self::FIELD_ON_HOLD]); - } elseif ($ext && is_scalar($data[self::FIELD_ON_HOLD])) { - $this->setOnHold(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_ON_HOLD]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ON_HOLD])) { + $this->setOnHold(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_ON_HOLD]] + $ext)); + } else if (is_array($data[self::FIELD_ON_HOLD])) { + $this->setOnHold(new FHIRBoolean(array_merge($ext, $data[self::FIELD_ON_HOLD]))); + } } else { $this->setOnHold(new FHIRBoolean($data[self::FIELD_ON_HOLD])); } @@ -378,11 +381,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getOnHold())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ON_HOLD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getParty())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PARTY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PERIOD, null, $v->_getFHIRXMLNamespace())); } @@ -396,8 +397,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getOnHold())) { - $a[self::FIELD_ON_HOLD] = $v->getValue(); - $a[self::FIELD_ON_HOLD_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ON_HOLD] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ON_HOLD_EXT] = $enc; + } + } else { + $a[self::FIELD_ON_HOLD] = $v; + } } if (null !== ($v = $this->getParty())) { $a[self::FIELD_PARTY] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRActivityDefinition/FHIRActivityDefinitionDynamicValue.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRActivityDefinition/FHIRActivityDefinitionDynamicValue.php index ac7f8f1d7c..4e89c48cff 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRActivityDefinition/FHIRActivityDefinitionDynamicValue.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRActivityDefinition/FHIRActivityDefinitionDynamicValue.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRActivityDefinitionDynamicValue extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ACTIVITY_DEFINITION_DOT_DYNAMIC_VALUE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_EXPRESSION = 'expression'; const FIELD_PATH = 'path'; const FIELD_PATH_EXT = '_path'; @@ -118,6 +114,9 @@ class FHIRActivityDefinitionDynamicValue extends FHIRBackboneElement */ protected $path = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRActivityDefinitionDynamicValue Constructor * @param null|array $data @@ -147,8 +146,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PATH] instanceof FHIRString) { $this->setPath($data[self::FIELD_PATH]); - } elseif ($ext && is_scalar($data[self::FIELD_PATH])) { - $this->setPath(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PATH]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PATH])) { + $this->setPath(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PATH]] + $ext)); + } else if (is_array($data[self::FIELD_PATH])) { + $this->setPath(new FHIRString(array_merge($ext, $data[self::FIELD_PATH]))); + } } else { $this->setPath(new FHIRString($data[self::FIELD_PATH])); } @@ -349,7 +352,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getExpression())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EXPRESSION, null, $v->_getFHIRXMLNamespace())); } @@ -369,8 +371,15 @@ public function jsonSerialize() $a[self::FIELD_EXPRESSION] = $v; } if (null !== ($v = $this->getPath())) { - $a[self::FIELD_PATH] = $v->getValue(); - $a[self::FIELD_PATH_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PATH] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PATH_EXT] = $enc; + } + } else { + $a[self::FIELD_PATH] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRActivityDefinition/FHIRActivityDefinitionParticipant.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRActivityDefinition/FHIRActivityDefinitionParticipant.php index d4efd0efc6..c11c32f0c6 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRActivityDefinition/FHIRActivityDefinitionParticipant.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRActivityDefinition/FHIRActivityDefinitionParticipant.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRActivityDefinitionParticipant extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ACTIVITY_DEFINITION_DOT_PARTICIPANT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ROLE = 'role'; const FIELD_TYPE = 'type'; const FIELD_TYPE_EXT = '_type'; @@ -109,6 +105,9 @@ class FHIRActivityDefinitionParticipant extends FHIRBackboneElement */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRActivityDefinitionParticipant Constructor * @param null|array $data @@ -138,8 +137,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TYPE] instanceof FHIRActionParticipantType) { $this->setType($data[self::FIELD_TYPE]); - } elseif ($ext && is_scalar($data[self::FIELD_TYPE])) { - $this->setType(new FHIRActionParticipantType([FHIRActionParticipantType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TYPE])) { + $this->setType(new FHIRActionParticipantType([FHIRActionParticipantType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } else if (is_array($data[self::FIELD_TYPE])) { + $this->setType(new FHIRActionParticipantType(array_merge($ext, $data[self::FIELD_TYPE]))); + } } else { $this->setType(new FHIRActionParticipantType($data[self::FIELD_TYPE])); } @@ -311,11 +314,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getRole())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ROLE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -332,7 +333,15 @@ public function jsonSerialize() $a[self::FIELD_ROLE] = $v; } if (null !== ($v = $this->getType())) { - $a[self::FIELD_TYPE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TYPE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TYPE_EXT] = $enc; + } + } else { + $a[self::FIELD_TYPE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRAdverseEvent/FHIRAdverseEventCausality.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRAdverseEvent/FHIRAdverseEventCausality.php index e72f016135..5f3586009d 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRAdverseEvent/FHIRAdverseEventCausality.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRAdverseEvent/FHIRAdverseEventCausality.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -82,10 +82,6 @@ class FHIRAdverseEventCausality extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ADVERSE_EVENT_DOT_CAUSALITY; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ASSESSMENT = 'assessment'; const FIELD_AUTHOR = 'author'; const FIELD_METHOD = 'method'; @@ -138,6 +134,9 @@ class FHIRAdverseEventCausality extends FHIRBackboneElement */ protected $productRelatedness = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRAdverseEventCausality Constructor * @param null|array $data @@ -181,8 +180,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PRODUCT_RELATEDNESS] instanceof FHIRString) { $this->setProductRelatedness($data[self::FIELD_PRODUCT_RELATEDNESS]); - } elseif ($ext && is_scalar($data[self::FIELD_PRODUCT_RELATEDNESS])) { - $this->setProductRelatedness(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PRODUCT_RELATEDNESS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PRODUCT_RELATEDNESS])) { + $this->setProductRelatedness(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PRODUCT_RELATEDNESS]] + $ext)); + } else if (is_array($data[self::FIELD_PRODUCT_RELATEDNESS])) { + $this->setProductRelatedness(new FHIRString(array_merge($ext, $data[self::FIELD_PRODUCT_RELATEDNESS]))); + } } else { $this->setProductRelatedness(new FHIRString($data[self::FIELD_PRODUCT_RELATEDNESS])); } @@ -435,15 +438,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getAssessment())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ASSESSMENT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getAuthor())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AUTHOR, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getMethod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_METHOD, null, $v->_getFHIRXMLNamespace())); } @@ -469,8 +469,15 @@ public function jsonSerialize() $a[self::FIELD_METHOD] = $v; } if (null !== ($v = $this->getProductRelatedness())) { - $a[self::FIELD_PRODUCT_RELATEDNESS] = $v->getValue(); - $a[self::FIELD_PRODUCT_RELATEDNESS_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PRODUCT_RELATEDNESS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PRODUCT_RELATEDNESS_EXT] = $enc; + } + } else { + $a[self::FIELD_PRODUCT_RELATEDNESS] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRAdverseEvent/FHIRAdverseEventSuspectEntity.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRAdverseEvent/FHIRAdverseEventSuspectEntity.php index 56d84f9169..a6f44e81bd 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRAdverseEvent/FHIRAdverseEventSuspectEntity.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRAdverseEvent/FHIRAdverseEventSuspectEntity.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRAdverseEventSuspectEntity extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ADVERSE_EVENT_DOT_SUSPECT_ENTITY; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CAUSALITY = 'causality'; const FIELD_INSTANCE = 'instance'; @@ -112,6 +108,9 @@ class FHIRAdverseEventSuspectEntity extends FHIRBackboneElement */ protected $instance = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRAdverseEventSuspectEntity Constructor * @param null|array $data @@ -131,6 +130,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CAUSALITY])) { if (is_array($data[self::FIELD_CAUSALITY])) { foreach($data[self::FIELD_CAUSALITY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRAdverseEventCausality) { $this->addCausality($v); } else { @@ -352,7 +354,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getCausality())) { foreach($vs as $v) { if (null === $v) { diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRAllergyIntolerance/FHIRAllergyIntoleranceReaction.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRAllergyIntolerance/FHIRAllergyIntoleranceReaction.php index 6d86893640..4388e512b9 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRAllergyIntolerance/FHIRAllergyIntoleranceReaction.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRAllergyIntolerance/FHIRAllergyIntoleranceReaction.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -82,10 +82,6 @@ class FHIRAllergyIntoleranceReaction extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ALLERGY_INTOLERANCE_DOT_REACTION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DESCRIPTION = 'description'; const FIELD_DESCRIPTION_EXT = '_description'; const FIELD_EXPOSURE_ROUTE = 'exposureRoute'; @@ -193,6 +189,9 @@ class FHIRAllergyIntoleranceReaction extends FHIRBackboneElement */ protected $substance = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRAllergyIntoleranceReaction Constructor * @param null|array $data @@ -215,8 +214,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -231,6 +234,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_MANIFESTATION])) { if (is_array($data[self::FIELD_MANIFESTATION])) { foreach($data[self::FIELD_MANIFESTATION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addManifestation($v); } else { @@ -246,6 +252,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_NOTE])) { if (is_array($data[self::FIELD_NOTE])) { foreach($data[self::FIELD_NOTE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRAnnotation) { $this->addNote($v); } else { @@ -264,8 +273,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ONSET] instanceof FHIRDateTime) { $this->setOnset($data[self::FIELD_ONSET]); - } elseif ($ext && is_scalar($data[self::FIELD_ONSET])) { - $this->setOnset(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_ONSET]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ONSET])) { + $this->setOnset(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_ONSET]] + $ext)); + } else if (is_array($data[self::FIELD_ONSET])) { + $this->setOnset(new FHIRDateTime(array_merge($ext, $data[self::FIELD_ONSET]))); + } } else { $this->setOnset(new FHIRDateTime($data[self::FIELD_ONSET])); } @@ -276,8 +289,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SEVERITY] instanceof FHIRAllergyIntoleranceSeverity) { $this->setSeverity($data[self::FIELD_SEVERITY]); - } elseif ($ext && is_scalar($data[self::FIELD_SEVERITY])) { - $this->setSeverity(new FHIRAllergyIntoleranceSeverity([FHIRAllergyIntoleranceSeverity::FIELD_VALUE => $data[self::FIELD_SEVERITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SEVERITY])) { + $this->setSeverity(new FHIRAllergyIntoleranceSeverity([FHIRAllergyIntoleranceSeverity::FIELD_VALUE => $data[self::FIELD_SEVERITY]] + $ext)); + } else if (is_array($data[self::FIELD_SEVERITY])) { + $this->setSeverity(new FHIRAllergyIntoleranceSeverity(array_merge($ext, $data[self::FIELD_SEVERITY]))); + } } else { $this->setSeverity(new FHIRAllergyIntoleranceSeverity($data[self::FIELD_SEVERITY])); } @@ -743,11 +760,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESCRIPTION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getExposureRoute())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EXPOSURE_ROUTE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getManifestation())) { foreach($vs as $v) { if (null === $v) { @@ -765,14 +780,13 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_NOTE, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getOnset())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ONSET, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSeverity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SEVERITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSubstance())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBSTANCE, null, $v->_getFHIRXMLNamespace())); } @@ -786,8 +800,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if (null !== ($v = $this->getExposureRoute())) { $a[self::FIELD_EXPOSURE_ROUTE] = $v; @@ -799,11 +820,26 @@ public function jsonSerialize() $a[self::FIELD_NOTE] = $vs; } if (null !== ($v = $this->getOnset())) { - $a[self::FIELD_ONSET] = $v->getValue(); - $a[self::FIELD_ONSET_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ONSET] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ONSET_EXT] = $enc; + } + } else { + $a[self::FIELD_ONSET] = $v; + } } if (null !== ($v = $this->getSeverity())) { - $a[self::FIELD_SEVERITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SEVERITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SEVERITY_EXT] = $enc; + } + } else { + $a[self::FIELD_SEVERITY] = $v; + } } if (null !== ($v = $this->getSubstance())) { $a[self::FIELD_SUBSTANCE] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRAppointment/FHIRAppointmentParticipant.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRAppointment/FHIRAppointmentParticipant.php index dd33a0733e..4465726a88 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRAppointment/FHIRAppointmentParticipant.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRAppointment/FHIRAppointmentParticipant.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -83,10 +83,6 @@ class FHIRAppointmentParticipant extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_APPOINTMENT_DOT_PARTICIPANT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ACTOR = 'actor'; const FIELD_PERIOD = 'period'; const FIELD_REQUIRED = 'required'; @@ -152,6 +148,9 @@ class FHIRAppointmentParticipant extends FHIRBackboneElement */ protected $type = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRAppointmentParticipant Constructor * @param null|array $data @@ -188,8 +187,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_REQUIRED] instanceof FHIRParticipantRequired) { $this->setRequired($data[self::FIELD_REQUIRED]); - } elseif ($ext && is_scalar($data[self::FIELD_REQUIRED])) { - $this->setRequired(new FHIRParticipantRequired([FHIRParticipantRequired::FIELD_VALUE => $data[self::FIELD_REQUIRED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_REQUIRED])) { + $this->setRequired(new FHIRParticipantRequired([FHIRParticipantRequired::FIELD_VALUE => $data[self::FIELD_REQUIRED]] + $ext)); + } else if (is_array($data[self::FIELD_REQUIRED])) { + $this->setRequired(new FHIRParticipantRequired(array_merge($ext, $data[self::FIELD_REQUIRED]))); + } } else { $this->setRequired(new FHIRParticipantRequired($data[self::FIELD_REQUIRED])); } @@ -200,8 +203,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRParticipationStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRParticipationStatus([FHIRParticipationStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRParticipationStatus([FHIRParticipationStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRParticipationStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRParticipationStatus($data[self::FIELD_STATUS])); } @@ -209,6 +216,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_TYPE])) { if (is_array($data[self::FIELD_TYPE])) { foreach($data[self::FIELD_TYPE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addType($v); } else { @@ -520,23 +530,18 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getActor())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ACTOR, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRequired())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REQUIRED, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getType())) { foreach($vs as $v) { if (null === $v) { @@ -545,6 +550,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } @@ -561,10 +567,26 @@ public function jsonSerialize() $a[self::FIELD_PERIOD] = $v; } if (null !== ($v = $this->getRequired())) { - $a[self::FIELD_REQUIRED] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_REQUIRED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_REQUIRED_EXT] = $enc; + } + } else { + $a[self::FIELD_REQUIRED] = $v; + } } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if ([] !== ($vs = $this->getType())) { $a[self::FIELD_TYPE] = $vs; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRAuditEvent/FHIRAuditEventAgent.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRAuditEvent/FHIRAuditEventAgent.php index 40e0fdaaee..3a6affc3e0 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRAuditEvent/FHIRAuditEventAgent.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRAuditEvent/FHIRAuditEventAgent.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -84,10 +84,6 @@ class FHIRAuditEventAgent extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_AUDIT_EVENT_DOT_AGENT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ALT_ID = 'altId'; const FIELD_ALT_ID_EXT = '_altId'; const FIELD_LOCATION = 'location'; @@ -238,6 +234,9 @@ class FHIRAuditEventAgent extends FHIRBackboneElement */ protected $who = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRAuditEventAgent Constructor * @param null|array $data @@ -260,8 +259,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ALT_ID] instanceof FHIRString) { $this->setAltId($data[self::FIELD_ALT_ID]); - } elseif ($ext && is_scalar($data[self::FIELD_ALT_ID])) { - $this->setAltId(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_ALT_ID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ALT_ID])) { + $this->setAltId(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_ALT_ID]] + $ext)); + } else if (is_array($data[self::FIELD_ALT_ID])) { + $this->setAltId(new FHIRString(array_merge($ext, $data[self::FIELD_ALT_ID]))); + } } else { $this->setAltId(new FHIRString($data[self::FIELD_ALT_ID])); } @@ -286,8 +289,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -305,17 +312,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_POLICY])) { foreach($data[self::FIELD_POLICY] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRUri) { $this->addPolicy($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addPolicy(new FHIRUri([FHIRUri::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addPolicy(new FHIRUri([FHIRUri::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addPolicy(new FHIRUri(array_merge($v, $ext[$i]))); + } } else { $this->addPolicy(new FHIRUri($v)); } } } elseif ($data[self::FIELD_POLICY] instanceof FHIRUri) { $this->addPolicy($data[self::FIELD_POLICY]); - } elseif ($ext && is_scalar($data[self::FIELD_POLICY])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_POLICY])) { $this->addPolicy(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_POLICY]] + $ext)); } else { $this->addPolicy(new FHIRUri($data[self::FIELD_POLICY])); @@ -324,6 +338,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PURPOSE_OF_USE])) { if (is_array($data[self::FIELD_PURPOSE_OF_USE])) { foreach($data[self::FIELD_PURPOSE_OF_USE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addPurposeOfUse($v); } else { @@ -342,8 +359,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_REQUESTOR] instanceof FHIRBoolean) { $this->setRequestor($data[self::FIELD_REQUESTOR]); - } elseif ($ext && is_scalar($data[self::FIELD_REQUESTOR])) { - $this->setRequestor(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_REQUESTOR]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_REQUESTOR])) { + $this->setRequestor(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_REQUESTOR]] + $ext)); + } else if (is_array($data[self::FIELD_REQUESTOR])) { + $this->setRequestor(new FHIRBoolean(array_merge($ext, $data[self::FIELD_REQUESTOR]))); + } } else { $this->setRequestor(new FHIRBoolean($data[self::FIELD_REQUESTOR])); } @@ -351,6 +372,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ROLE])) { if (is_array($data[self::FIELD_ROLE])) { foreach($data[self::FIELD_ROLE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addRole($v); } else { @@ -1005,18 +1029,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getAltId())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ALT_ID, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getLocation())) { $v->xmlSerialize($sxe->addChild(self::FIELD_LOCATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getMedia())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MEDIA, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NAME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getNetwork())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NETWORK, null, $v->_getFHIRXMLNamespace())); } @@ -1037,10 +1058,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_PURPOSE_OF_USE, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getRequestor())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REQUESTOR, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getRole())) { foreach($vs as $v) { if (null === $v) { @@ -1053,7 +1074,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getWho())) { $v->xmlSerialize($sxe->addChild(self::FIELD_WHO, null, $v->_getFHIRXMLNamespace())); } @@ -1067,8 +1087,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getAltId())) { - $a[self::FIELD_ALT_ID] = $v->getValue(); - $a[self::FIELD_ALT_ID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ALT_ID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ALT_ID_EXT] = $enc; + } + } else { + $a[self::FIELD_ALT_ID] = $v; + } } if (null !== ($v = $this->getLocation())) { $a[self::FIELD_LOCATION] = $v; @@ -1077,8 +1104,15 @@ public function jsonSerialize() $a[self::FIELD_MEDIA] = $v; } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if (null !== ($v = $this->getNetwork())) { $a[self::FIELD_NETWORK] = $v; @@ -1089,16 +1123,32 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_POLICY][] = $v->getValue(); - $a[self::FIELD_POLICY_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_POLICY][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_POLICY_EXT][] = $enc; + } else { + $a[self::FIELD_POLICY_EXT][] = null; + } + } else { + $a[self::FIELD_POLICY][] = $v; + } } } if ([] !== ($vs = $this->getPurposeOfUse())) { $a[self::FIELD_PURPOSE_OF_USE] = $vs; } if (null !== ($v = $this->getRequestor())) { - $a[self::FIELD_REQUESTOR] = $v->getValue(); - $a[self::FIELD_REQUESTOR_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_REQUESTOR] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_REQUESTOR_EXT] = $enc; + } + } else { + $a[self::FIELD_REQUESTOR] = $v; + } } if ([] !== ($vs = $this->getRole())) { $a[self::FIELD_ROLE] = $vs; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRAuditEvent/FHIRAuditEventDetail.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRAuditEvent/FHIRAuditEventDetail.php index 70881a0150..33c8cc5672 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRAuditEvent/FHIRAuditEventDetail.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRAuditEvent/FHIRAuditEventDetail.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRAuditEventDetail extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_AUDIT_EVENT_DOT_DETAIL; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_TYPE = 'type'; const FIELD_TYPE_EXT = '_type'; const FIELD_VALUE_BASE_64BINARY = 'valueBase64Binary'; @@ -124,6 +120,9 @@ class FHIRAuditEventDetail extends FHIRBackboneElement */ protected $valueString = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRAuditEventDetail Constructor * @param null|array $data @@ -146,8 +145,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TYPE] instanceof FHIRString) { $this->setType($data[self::FIELD_TYPE]); - } elseif ($ext && is_scalar($data[self::FIELD_TYPE])) { - $this->setType(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TYPE])) { + $this->setType(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } else if (is_array($data[self::FIELD_TYPE])) { + $this->setType(new FHIRString(array_merge($ext, $data[self::FIELD_TYPE]))); + } } else { $this->setType(new FHIRString($data[self::FIELD_TYPE])); } @@ -158,8 +161,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_BASE_64BINARY] instanceof FHIRBase64Binary) { $this->setValueBase64Binary($data[self::FIELD_VALUE_BASE_64BINARY]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_BASE_64BINARY])) { - $this->setValueBase64Binary(new FHIRBase64Binary([FHIRBase64Binary::FIELD_VALUE => $data[self::FIELD_VALUE_BASE_64BINARY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_BASE_64BINARY])) { + $this->setValueBase64Binary(new FHIRBase64Binary([FHIRBase64Binary::FIELD_VALUE => $data[self::FIELD_VALUE_BASE_64BINARY]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_BASE_64BINARY])) { + $this->setValueBase64Binary(new FHIRBase64Binary(array_merge($ext, $data[self::FIELD_VALUE_BASE_64BINARY]))); + } } else { $this->setValueBase64Binary(new FHIRBase64Binary($data[self::FIELD_VALUE_BASE_64BINARY])); } @@ -170,8 +177,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_STRING] instanceof FHIRString) { $this->setValueString($data[self::FIELD_VALUE_STRING]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_STRING])) { - $this->setValueString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VALUE_STRING]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_STRING])) { + $this->setValueString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VALUE_STRING]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_STRING])) { + $this->setValueString(new FHIRString(array_merge($ext, $data[self::FIELD_VALUE_STRING]))); + } } else { $this->setValueString(new FHIRString($data[self::FIELD_VALUE_STRING])); } @@ -428,16 +439,37 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getType())) { - $a[self::FIELD_TYPE] = $v->getValue(); - $a[self::FIELD_TYPE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TYPE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TYPE_EXT] = $enc; + } + } else { + $a[self::FIELD_TYPE] = $v; + } } if (null !== ($v = $this->getValueBase64Binary())) { - $a[self::FIELD_VALUE_BASE_64BINARY] = $v->getValue(); - $a[self::FIELD_VALUE_BASE_64BINARY_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_BASE_64BINARY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_BASE_64BINARY_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_BASE_64BINARY] = $v; + } } if (null !== ($v = $this->getValueString())) { - $a[self::FIELD_VALUE_STRING] = $v->getValue(); - $a[self::FIELD_VALUE_STRING_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_STRING] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_STRING_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_STRING] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRAuditEvent/FHIRAuditEventEntity.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRAuditEvent/FHIRAuditEventEntity.php index 373d21f003..e77a742b72 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRAuditEvent/FHIRAuditEventEntity.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRAuditEvent/FHIRAuditEventEntity.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -82,10 +82,6 @@ class FHIRAuditEventEntity extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_AUDIT_EVENT_DOT_ENTITY; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DESCRIPTION = 'description'; const FIELD_DESCRIPTION_EXT = '_description'; const FIELD_DETAIL = 'detail'; @@ -199,6 +195,9 @@ class FHIRAuditEventEntity extends FHIRBackboneElement */ protected $what = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRAuditEventEntity Constructor * @param null|array $data @@ -221,8 +220,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -230,6 +233,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_DETAIL])) { if (is_array($data[self::FIELD_DETAIL])) { foreach($data[self::FIELD_DETAIL] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRAuditEventDetail) { $this->addDetail($v); } else { @@ -255,8 +261,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -267,8 +277,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_QUERY] instanceof FHIRBase64Binary) { $this->setQuery($data[self::FIELD_QUERY]); - } elseif ($ext && is_scalar($data[self::FIELD_QUERY])) { - $this->setQuery(new FHIRBase64Binary([FHIRBase64Binary::FIELD_VALUE => $data[self::FIELD_QUERY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_QUERY])) { + $this->setQuery(new FHIRBase64Binary([FHIRBase64Binary::FIELD_VALUE => $data[self::FIELD_QUERY]] + $ext)); + } else if (is_array($data[self::FIELD_QUERY])) { + $this->setQuery(new FHIRBase64Binary(array_merge($ext, $data[self::FIELD_QUERY]))); + } } else { $this->setQuery(new FHIRBase64Binary($data[self::FIELD_QUERY])); } @@ -283,6 +297,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SECURITY_LABEL])) { if (is_array($data[self::FIELD_SECURITY_LABEL])) { foreach($data[self::FIELD_SECURITY_LABEL] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCoding) { $this->addSecurityLabel($v); } else { @@ -801,7 +818,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESCRIPTION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getDetail())) { foreach($vs as $v) { if (null === $v) { @@ -820,11 +836,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getQuery())) { $v->xmlSerialize($sxe->addChild(self::FIELD_QUERY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRole())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ROLE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getSecurityLabel())) { foreach($vs as $v) { if (null === $v) { @@ -837,7 +851,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getWhat())) { $v->xmlSerialize($sxe->addChild(self::FIELD_WHAT, null, $v->_getFHIRXMLNamespace())); } @@ -851,8 +864,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if ([] !== ($vs = $this->getDetail())) { $a[self::FIELD_DETAIL] = $vs; @@ -861,12 +881,26 @@ public function jsonSerialize() $a[self::FIELD_LIFECYCLE] = $v; } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if (null !== ($v = $this->getQuery())) { - $a[self::FIELD_QUERY] = $v->getValue(); - $a[self::FIELD_QUERY_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_QUERY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_QUERY_EXT] = $enc; + } + } else { + $a[self::FIELD_QUERY] = $v; + } } if (null !== ($v = $this->getRole())) { $a[self::FIELD_ROLE] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRAuditEvent/FHIRAuditEventNetwork.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRAuditEvent/FHIRAuditEventNetwork.php index 19f6bd7afb..0dda1d271d 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRAuditEvent/FHIRAuditEventNetwork.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRAuditEvent/FHIRAuditEventNetwork.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRAuditEventNetwork extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_AUDIT_EVENT_DOT_NETWORK; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ADDRESS = 'address'; const FIELD_ADDRESS_EXT = '_address'; const FIELD_TYPE = 'type'; @@ -112,6 +108,9 @@ class FHIRAuditEventNetwork extends FHIRBackboneElement */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRAuditEventNetwork Constructor * @param null|array $data @@ -134,8 +133,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ADDRESS] instanceof FHIRString) { $this->setAddress($data[self::FIELD_ADDRESS]); - } elseif ($ext && is_scalar($data[self::FIELD_ADDRESS])) { - $this->setAddress(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_ADDRESS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ADDRESS])) { + $this->setAddress(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_ADDRESS]] + $ext)); + } else if (is_array($data[self::FIELD_ADDRESS])) { + $this->setAddress(new FHIRString(array_merge($ext, $data[self::FIELD_ADDRESS]))); + } } else { $this->setAddress(new FHIRString($data[self::FIELD_ADDRESS])); } @@ -146,8 +149,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TYPE] instanceof FHIRAuditEventAgentNetworkType) { $this->setType($data[self::FIELD_TYPE]); - } elseif ($ext && is_scalar($data[self::FIELD_TYPE])) { - $this->setType(new FHIRAuditEventAgentNetworkType([FHIRAuditEventAgentNetworkType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TYPE])) { + $this->setType(new FHIRAuditEventAgentNetworkType([FHIRAuditEventAgentNetworkType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } else if (is_array($data[self::FIELD_TYPE])) { + $this->setType(new FHIRAuditEventAgentNetworkType(array_merge($ext, $data[self::FIELD_TYPE]))); + } } else { $this->setType(new FHIRAuditEventAgentNetworkType($data[self::FIELD_TYPE])); } @@ -335,7 +342,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getAddress())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ADDRESS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -349,11 +355,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getAddress())) { - $a[self::FIELD_ADDRESS] = $v->getValue(); - $a[self::FIELD_ADDRESS_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ADDRESS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ADDRESS_EXT] = $enc; + } + } else { + $a[self::FIELD_ADDRESS] = $v; + } } if (null !== ($v = $this->getType())) { - $a[self::FIELD_TYPE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TYPE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TYPE_EXT] = $enc; + } + } else { + $a[self::FIELD_TYPE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRAuditEvent/FHIRAuditEventSource.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRAuditEvent/FHIRAuditEventSource.php index 445c90193f..4420e8de3c 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRAuditEvent/FHIRAuditEventSource.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRAuditEvent/FHIRAuditEventSource.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -81,10 +81,6 @@ class FHIRAuditEventSource extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_AUDIT_EVENT_DOT_SOURCE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_OBSERVER = 'observer'; const FIELD_SITE = 'site'; const FIELD_SITE_EXT = '_site'; @@ -124,6 +120,9 @@ class FHIRAuditEventSource extends FHIRBackboneElement */ protected $type = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRAuditEventSource Constructor * @param null|array $data @@ -153,8 +152,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SITE] instanceof FHIRString) { $this->setSite($data[self::FIELD_SITE]); - } elseif ($ext && is_scalar($data[self::FIELD_SITE])) { - $this->setSite(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SITE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SITE])) { + $this->setSite(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SITE]] + $ext)); + } else if (is_array($data[self::FIELD_SITE])) { + $this->setSite(new FHIRString(array_merge($ext, $data[self::FIELD_SITE]))); + } } else { $this->setSite(new FHIRString($data[self::FIELD_SITE])); } @@ -162,6 +165,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_TYPE])) { if (is_array($data[self::FIELD_TYPE])) { foreach($data[self::FIELD_TYPE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCoding) { $this->addType($v); } else { @@ -415,14 +421,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getObserver())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OBSERVER, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getSite())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SITE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getType())) { foreach($vs as $v) { if (null === $v) { @@ -431,6 +435,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } @@ -444,8 +449,15 @@ public function jsonSerialize() $a[self::FIELD_OBSERVER] = $v; } if (null !== ($v = $this->getSite())) { - $a[self::FIELD_SITE] = $v->getValue(); - $a[self::FIELD_SITE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SITE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SITE_EXT] = $enc; + } + } else { + $a[self::FIELD_SITE] = $v; + } } if ([] !== ($vs = $this->getType())) { $a[self::FIELD_TYPE] = $vs; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRBiologicallyDerivedProduct/FHIRBiologicallyDerivedProductCollection.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRBiologicallyDerivedProduct/FHIRBiologicallyDerivedProductCollection.php index 2994891ef9..3407c583b3 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRBiologicallyDerivedProduct/FHIRBiologicallyDerivedProductCollection.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRBiologicallyDerivedProduct/FHIRBiologicallyDerivedProductCollection.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRBiologicallyDerivedProductCollection extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_BIOLOGICALLY_DERIVED_PRODUCT_DOT_COLLECTION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_COLLECTED_DATE_TIME = 'collectedDateTime'; const FIELD_COLLECTED_DATE_TIME_EXT = '_collectedDateTime'; const FIELD_COLLECTED_PERIOD = 'collectedPeriod'; @@ -138,6 +134,9 @@ class FHIRBiologicallyDerivedProductCollection extends FHIRBackboneElement */ protected $source = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRBiologicallyDerivedProductCollection Constructor * @param null|array $data @@ -160,8 +159,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_COLLECTED_DATE_TIME] instanceof FHIRDateTime) { $this->setCollectedDateTime($data[self::FIELD_COLLECTED_DATE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_COLLECTED_DATE_TIME])) { - $this->setCollectedDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_COLLECTED_DATE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_COLLECTED_DATE_TIME])) { + $this->setCollectedDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_COLLECTED_DATE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_COLLECTED_DATE_TIME])) { + $this->setCollectedDateTime(new FHIRDateTime(array_merge($ext, $data[self::FIELD_COLLECTED_DATE_TIME]))); + } } else { $this->setCollectedDateTime(new FHIRDateTime($data[self::FIELD_COLLECTED_DATE_TIME])); } @@ -442,15 +445,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getCollectedDateTime())) { $v->xmlSerialize($sxe->addChild(self::FIELD_COLLECTED_DATE_TIME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getCollectedPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_COLLECTED_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getCollector())) { $v->xmlSerialize($sxe->addChild(self::FIELD_COLLECTOR, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSource())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SOURCE, null, $v->_getFHIRXMLNamespace())); } @@ -464,8 +464,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getCollectedDateTime())) { - $a[self::FIELD_COLLECTED_DATE_TIME] = $v->getValue(); - $a[self::FIELD_COLLECTED_DATE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_COLLECTED_DATE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_COLLECTED_DATE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_COLLECTED_DATE_TIME] = $v; + } } if (null !== ($v = $this->getCollectedPeriod())) { $a[self::FIELD_COLLECTED_PERIOD] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRBiologicallyDerivedProduct/FHIRBiologicallyDerivedProductManipulation.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRBiologicallyDerivedProduct/FHIRBiologicallyDerivedProductManipulation.php index 99b162fb8a..e5613fc1f5 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRBiologicallyDerivedProduct/FHIRBiologicallyDerivedProductManipulation.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRBiologicallyDerivedProduct/FHIRBiologicallyDerivedProductManipulation.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRBiologicallyDerivedProductManipulation extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_BIOLOGICALLY_DERIVED_PRODUCT_DOT_MANIPULATION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DESCRIPTION = 'description'; const FIELD_DESCRIPTION_EXT = '_description'; const FIELD_TIME_DATE_TIME = 'timeDateTime'; @@ -126,6 +122,9 @@ class FHIRBiologicallyDerivedProductManipulation extends FHIRBackboneElement */ protected $timePeriod = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRBiologicallyDerivedProductManipulation Constructor * @param null|array $data @@ -148,8 +147,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -160,8 +163,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TIME_DATE_TIME] instanceof FHIRDateTime) { $this->setTimeDateTime($data[self::FIELD_TIME_DATE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_TIME_DATE_TIME])) { - $this->setTimeDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_TIME_DATE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TIME_DATE_TIME])) { + $this->setTimeDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_TIME_DATE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_TIME_DATE_TIME])) { + $this->setTimeDateTime(new FHIRDateTime(array_merge($ext, $data[self::FIELD_TIME_DATE_TIME]))); + } } else { $this->setTimeDateTime(new FHIRDateTime($data[self::FIELD_TIME_DATE_TIME])); } @@ -407,7 +414,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getTimeDateTime())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TIME_DATE_TIME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getTimePeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TIME_PERIOD, null, $v->_getFHIRXMLNamespace())); } @@ -421,12 +427,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if (null !== ($v = $this->getTimeDateTime())) { - $a[self::FIELD_TIME_DATE_TIME] = $v->getValue(); - $a[self::FIELD_TIME_DATE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TIME_DATE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TIME_DATE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_TIME_DATE_TIME] = $v; + } } if (null !== ($v = $this->getTimePeriod())) { $a[self::FIELD_TIME_PERIOD] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRBiologicallyDerivedProduct/FHIRBiologicallyDerivedProductProcessing.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRBiologicallyDerivedProduct/FHIRBiologicallyDerivedProductProcessing.php index 4873a002ef..91710791da 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRBiologicallyDerivedProduct/FHIRBiologicallyDerivedProductProcessing.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRBiologicallyDerivedProduct/FHIRBiologicallyDerivedProductProcessing.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -82,10 +82,6 @@ class FHIRBiologicallyDerivedProductProcessing extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_BIOLOGICALLY_DERIVED_PRODUCT_DOT_PROCESSING; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ADDITIVE = 'additive'; const FIELD_DESCRIPTION = 'description'; const FIELD_DESCRIPTION_EXT = '_description'; @@ -153,6 +149,9 @@ class FHIRBiologicallyDerivedProductProcessing extends FHIRBackboneElement */ protected $timePeriod = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRBiologicallyDerivedProductProcessing Constructor * @param null|array $data @@ -182,8 +181,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -201,8 +204,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TIME_DATE_TIME] instanceof FHIRDateTime) { $this->setTimeDateTime($data[self::FIELD_TIME_DATE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_TIME_DATE_TIME])) { - $this->setTimeDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_TIME_DATE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TIME_DATE_TIME])) { + $this->setTimeDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_TIME_DATE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_TIME_DATE_TIME])) { + $this->setTimeDateTime(new FHIRDateTime(array_merge($ext, $data[self::FIELD_TIME_DATE_TIME]))); + } } else { $this->setTimeDateTime(new FHIRDateTime($data[self::FIELD_TIME_DATE_TIME])); } @@ -510,21 +517,18 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getAdditive())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ADDITIVE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getDescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESCRIPTION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getProcedure())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PROCEDURE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getTimeDateTime())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TIME_DATE_TIME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getTimePeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TIME_PERIOD, null, $v->_getFHIRXMLNamespace())); } @@ -541,15 +545,29 @@ public function jsonSerialize() $a[self::FIELD_ADDITIVE] = $v; } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if (null !== ($v = $this->getProcedure())) { $a[self::FIELD_PROCEDURE] = $v; } if (null !== ($v = $this->getTimeDateTime())) { - $a[self::FIELD_TIME_DATE_TIME] = $v->getValue(); - $a[self::FIELD_TIME_DATE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TIME_DATE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TIME_DATE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_TIME_DATE_TIME] = $v; + } } if (null !== ($v = $this->getTimePeriod())) { $a[self::FIELD_TIME_PERIOD] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRBiologicallyDerivedProduct/FHIRBiologicallyDerivedProductStorage.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRBiologicallyDerivedProduct/FHIRBiologicallyDerivedProductStorage.php index f2cedcd420..d3d6b49532 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRBiologicallyDerivedProduct/FHIRBiologicallyDerivedProductStorage.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRBiologicallyDerivedProduct/FHIRBiologicallyDerivedProductStorage.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -81,10 +81,6 @@ class FHIRBiologicallyDerivedProductStorage extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_BIOLOGICALLY_DERIVED_PRODUCT_DOT_STORAGE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DESCRIPTION = 'description'; const FIELD_DESCRIPTION_EXT = '_description'; const FIELD_DURATION = 'duration'; @@ -137,6 +133,9 @@ class FHIRBiologicallyDerivedProductStorage extends FHIRBackboneElement */ protected $temperature = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRBiologicallyDerivedProductStorage Constructor * @param null|array $data @@ -159,8 +158,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -178,8 +181,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SCALE] instanceof FHIRBiologicallyDerivedProductStorageScale) { $this->setScale($data[self::FIELD_SCALE]); - } elseif ($ext && is_scalar($data[self::FIELD_SCALE])) { - $this->setScale(new FHIRBiologicallyDerivedProductStorageScale([FHIRBiologicallyDerivedProductStorageScale::FIELD_VALUE => $data[self::FIELD_SCALE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SCALE])) { + $this->setScale(new FHIRBiologicallyDerivedProductStorageScale([FHIRBiologicallyDerivedProductStorageScale::FIELD_VALUE => $data[self::FIELD_SCALE]] + $ext)); + } else if (is_array($data[self::FIELD_SCALE])) { + $this->setScale(new FHIRBiologicallyDerivedProductStorageScale(array_merge($ext, $data[self::FIELD_SCALE]))); + } } else { $this->setScale(new FHIRBiologicallyDerivedProductStorageScale($data[self::FIELD_SCALE])); } @@ -190,8 +197,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TEMPERATURE] instanceof FHIRDecimal) { $this->setTemperature($data[self::FIELD_TEMPERATURE]); - } elseif ($ext && is_scalar($data[self::FIELD_TEMPERATURE])) { - $this->setTemperature(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_TEMPERATURE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TEMPERATURE])) { + $this->setTemperature(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_TEMPERATURE]] + $ext)); + } else if (is_array($data[self::FIELD_TEMPERATURE])) { + $this->setTemperature(new FHIRDecimal(array_merge($ext, $data[self::FIELD_TEMPERATURE]))); + } } else { $this->setTemperature(new FHIRDecimal($data[self::FIELD_TEMPERATURE])); } @@ -454,11 +465,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESCRIPTION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDuration())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DURATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getScale())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SCALE, null, $v->_getFHIRXMLNamespace())); } @@ -475,18 +484,40 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if (null !== ($v = $this->getDuration())) { $a[self::FIELD_DURATION] = $v; } if (null !== ($v = $this->getScale())) { - $a[self::FIELD_SCALE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SCALE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SCALE_EXT] = $enc; + } + } else { + $a[self::FIELD_SCALE] = $v; + } } if (null !== ($v = $this->getTemperature())) { - $a[self::FIELD_TEMPERATURE] = $v->getValue(); - $a[self::FIELD_TEMPERATURE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TEMPERATURE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TEMPERATURE_EXT] = $enc; + } + } else { + $a[self::FIELD_TEMPERATURE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRBundle/FHIRBundleEntry.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRBundle/FHIRBundleEntry.php index c1e1a83a67..54a8a8a18f 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRBundle/FHIRBundleEntry.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRBundle/FHIRBundleEntry.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRBundleEntry extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_BUNDLE_DOT_ENTRY; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_FULL_URL = 'fullUrl'; const FIELD_FULL_URL_EXT = '_fullUrl'; const FIELD_LINK = 'link'; @@ -158,6 +154,9 @@ class FHIRBundleEntry extends FHIRBackboneElement */ protected $search = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRBundleEntry Constructor * @param null|array $data @@ -180,8 +179,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_FULL_URL] instanceof FHIRUri) { $this->setFullUrl($data[self::FIELD_FULL_URL]); - } elseif ($ext && is_scalar($data[self::FIELD_FULL_URL])) { - $this->setFullUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_FULL_URL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_FULL_URL])) { + $this->setFullUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_FULL_URL]] + $ext)); + } else if (is_array($data[self::FIELD_FULL_URL])) { + $this->setFullUrl(new FHIRUri(array_merge($ext, $data[self::FIELD_FULL_URL]))); + } } else { $this->setFullUrl(new FHIRUri($data[self::FIELD_FULL_URL])); } @@ -189,6 +192,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_LINK])) { if (is_array($data[self::FIELD_LINK])) { foreach($data[self::FIELD_LINK] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRBundleLink) { $this->addLink($v); } else { @@ -594,7 +600,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getFullUrl())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FULL_URL, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getLink())) { foreach($vs as $v) { if (null === $v) { @@ -607,16 +612,13 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getRequest())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REQUEST, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getResource())) { $tsxe = $sxe->addChild(self::FIELD_RESOURCE); $v->xmlSerialize($tsxe->addChild($v->_getFHIRTypeName(), null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getResponse())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RESPONSE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSearch())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SEARCH, null, $v->_getFHIRXMLNamespace())); } @@ -630,8 +632,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getFullUrl())) { - $a[self::FIELD_FULL_URL] = $v->getValue(); - $a[self::FIELD_FULL_URL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FULL_URL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FULL_URL_EXT] = $enc; + } + } else { + $a[self::FIELD_FULL_URL] = $v; + } } if ([] !== ($vs = $this->getLink())) { $a[self::FIELD_LINK] = $vs; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRBundle/FHIRBundleLink.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRBundle/FHIRBundleLink.php index e9facdca0d..11fd865cc0 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRBundle/FHIRBundleLink.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRBundle/FHIRBundleLink.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRBundleLink extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_BUNDLE_DOT_LINK; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_RELATION = 'relation'; const FIELD_RELATION_EXT = '_relation'; const FIELD_URL = 'url'; @@ -110,6 +106,9 @@ class FHIRBundleLink extends FHIRBackboneElement */ protected $url = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRBundleLink Constructor * @param null|array $data @@ -132,8 +131,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_RELATION] instanceof FHIRString) { $this->setRelation($data[self::FIELD_RELATION]); - } elseif ($ext && is_scalar($data[self::FIELD_RELATION])) { - $this->setRelation(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_RELATION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_RELATION])) { + $this->setRelation(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_RELATION]] + $ext)); + } else if (is_array($data[self::FIELD_RELATION])) { + $this->setRelation(new FHIRString(array_merge($ext, $data[self::FIELD_RELATION]))); + } } else { $this->setRelation(new FHIRString($data[self::FIELD_RELATION])); } @@ -144,8 +147,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_URL] instanceof FHIRUri) { $this->setUrl($data[self::FIELD_URL]); - } elseif ($ext && is_scalar($data[self::FIELD_URL])) { - $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } else if (is_array($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri(array_merge($ext, $data[self::FIELD_URL]))); + } } else { $this->setUrl(new FHIRUri($data[self::FIELD_URL])); } @@ -357,12 +364,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getRelation())) { - $a[self::FIELD_RELATION] = $v->getValue(); - $a[self::FIELD_RELATION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_RELATION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_RELATION_EXT] = $enc; + } + } else { + $a[self::FIELD_RELATION] = $v; + } } if (null !== ($v = $this->getUrl())) { - $a[self::FIELD_URL] = $v->getValue(); - $a[self::FIELD_URL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_URL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_URL_EXT] = $enc; + } + } else { + $a[self::FIELD_URL] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRBundle/FHIRBundleRequest.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRBundle/FHIRBundleRequest.php index 44cada1f33..ffb7ca4d58 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRBundle/FHIRBundleRequest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRBundle/FHIRBundleRequest.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRBundleRequest extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_BUNDLE_DOT_REQUEST; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_IF_MATCH = 'ifMatch'; const FIELD_IF_MATCH_EXT = '_ifMatch'; const FIELD_IF_MODIFIED_SINCE = 'ifModifiedSince'; @@ -174,6 +170,9 @@ class FHIRBundleRequest extends FHIRBackboneElement */ protected $url = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRBundleRequest Constructor * @param null|array $data @@ -196,8 +195,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IF_MATCH] instanceof FHIRString) { $this->setIfMatch($data[self::FIELD_IF_MATCH]); - } elseif ($ext && is_scalar($data[self::FIELD_IF_MATCH])) { - $this->setIfMatch(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_IF_MATCH]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IF_MATCH])) { + $this->setIfMatch(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_IF_MATCH]] + $ext)); + } else if (is_array($data[self::FIELD_IF_MATCH])) { + $this->setIfMatch(new FHIRString(array_merge($ext, $data[self::FIELD_IF_MATCH]))); + } } else { $this->setIfMatch(new FHIRString($data[self::FIELD_IF_MATCH])); } @@ -208,8 +211,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IF_MODIFIED_SINCE] instanceof FHIRInstant) { $this->setIfModifiedSince($data[self::FIELD_IF_MODIFIED_SINCE]); - } elseif ($ext && is_scalar($data[self::FIELD_IF_MODIFIED_SINCE])) { - $this->setIfModifiedSince(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_IF_MODIFIED_SINCE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IF_MODIFIED_SINCE])) { + $this->setIfModifiedSince(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_IF_MODIFIED_SINCE]] + $ext)); + } else if (is_array($data[self::FIELD_IF_MODIFIED_SINCE])) { + $this->setIfModifiedSince(new FHIRInstant(array_merge($ext, $data[self::FIELD_IF_MODIFIED_SINCE]))); + } } else { $this->setIfModifiedSince(new FHIRInstant($data[self::FIELD_IF_MODIFIED_SINCE])); } @@ -220,8 +227,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IF_NONE_EXIST] instanceof FHIRString) { $this->setIfNoneExist($data[self::FIELD_IF_NONE_EXIST]); - } elseif ($ext && is_scalar($data[self::FIELD_IF_NONE_EXIST])) { - $this->setIfNoneExist(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_IF_NONE_EXIST]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IF_NONE_EXIST])) { + $this->setIfNoneExist(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_IF_NONE_EXIST]] + $ext)); + } else if (is_array($data[self::FIELD_IF_NONE_EXIST])) { + $this->setIfNoneExist(new FHIRString(array_merge($ext, $data[self::FIELD_IF_NONE_EXIST]))); + } } else { $this->setIfNoneExist(new FHIRString($data[self::FIELD_IF_NONE_EXIST])); } @@ -232,8 +243,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IF_NONE_MATCH] instanceof FHIRString) { $this->setIfNoneMatch($data[self::FIELD_IF_NONE_MATCH]); - } elseif ($ext && is_scalar($data[self::FIELD_IF_NONE_MATCH])) { - $this->setIfNoneMatch(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_IF_NONE_MATCH]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IF_NONE_MATCH])) { + $this->setIfNoneMatch(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_IF_NONE_MATCH]] + $ext)); + } else if (is_array($data[self::FIELD_IF_NONE_MATCH])) { + $this->setIfNoneMatch(new FHIRString(array_merge($ext, $data[self::FIELD_IF_NONE_MATCH]))); + } } else { $this->setIfNoneMatch(new FHIRString($data[self::FIELD_IF_NONE_MATCH])); } @@ -244,8 +259,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_METHOD] instanceof FHIRHTTPVerb) { $this->setMethod($data[self::FIELD_METHOD]); - } elseif ($ext && is_scalar($data[self::FIELD_METHOD])) { - $this->setMethod(new FHIRHTTPVerb([FHIRHTTPVerb::FIELD_VALUE => $data[self::FIELD_METHOD]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_METHOD])) { + $this->setMethod(new FHIRHTTPVerb([FHIRHTTPVerb::FIELD_VALUE => $data[self::FIELD_METHOD]] + $ext)); + } else if (is_array($data[self::FIELD_METHOD])) { + $this->setMethod(new FHIRHTTPVerb(array_merge($ext, $data[self::FIELD_METHOD]))); + } } else { $this->setMethod(new FHIRHTTPVerb($data[self::FIELD_METHOD])); } @@ -256,8 +275,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_URL] instanceof FHIRUri) { $this->setUrl($data[self::FIELD_URL]); - } elseif ($ext && is_scalar($data[self::FIELD_URL])) { - $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } else if (is_array($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri(array_merge($ext, $data[self::FIELD_URL]))); + } } else { $this->setUrl(new FHIRUri($data[self::FIELD_URL])); } @@ -650,7 +673,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getIfNoneMatch())) { $v->xmlSerialize($sxe->addChild(self::FIELD_IF_NONE_MATCH, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getMethod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_METHOD, null, $v->_getFHIRXMLNamespace())); } @@ -667,27 +689,70 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getIfMatch())) { - $a[self::FIELD_IF_MATCH] = $v->getValue(); - $a[self::FIELD_IF_MATCH_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IF_MATCH] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IF_MATCH_EXT] = $enc; + } + } else { + $a[self::FIELD_IF_MATCH] = $v; + } } if (null !== ($v = $this->getIfModifiedSince())) { - $a[self::FIELD_IF_MODIFIED_SINCE] = $v->getValue(); - $a[self::FIELD_IF_MODIFIED_SINCE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IF_MODIFIED_SINCE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IF_MODIFIED_SINCE_EXT] = $enc; + } + } else { + $a[self::FIELD_IF_MODIFIED_SINCE] = $v; + } } if (null !== ($v = $this->getIfNoneExist())) { - $a[self::FIELD_IF_NONE_EXIST] = $v->getValue(); - $a[self::FIELD_IF_NONE_EXIST_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IF_NONE_EXIST] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IF_NONE_EXIST_EXT] = $enc; + } + } else { + $a[self::FIELD_IF_NONE_EXIST] = $v; + } } if (null !== ($v = $this->getIfNoneMatch())) { - $a[self::FIELD_IF_NONE_MATCH] = $v->getValue(); - $a[self::FIELD_IF_NONE_MATCH_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IF_NONE_MATCH] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IF_NONE_MATCH_EXT] = $enc; + } + } else { + $a[self::FIELD_IF_NONE_MATCH] = $v; + } } if (null !== ($v = $this->getMethod())) { - $a[self::FIELD_METHOD] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_METHOD] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_METHOD_EXT] = $enc; + } + } else { + $a[self::FIELD_METHOD] = $v; + } } if (null !== ($v = $this->getUrl())) { - $a[self::FIELD_URL] = $v->getValue(); - $a[self::FIELD_URL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_URL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_URL_EXT] = $enc; + } + } else { + $a[self::FIELD_URL] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRBundle/FHIRBundleResponse.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRBundle/FHIRBundleResponse.php index 660df1bafb..1eadd0254f 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRBundle/FHIRBundleResponse.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRBundle/FHIRBundleResponse.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -81,10 +81,6 @@ class FHIRBundleResponse extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_BUNDLE_DOT_RESPONSE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ETAG = 'etag'; const FIELD_ETAG_EXT = '_etag'; const FIELD_LAST_MODIFIED = 'lastModified'; @@ -157,6 +153,9 @@ class FHIRBundleResponse extends FHIRBackboneElement */ protected $status = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRBundleResponse Constructor * @param null|array $data @@ -179,8 +178,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ETAG] instanceof FHIRString) { $this->setEtag($data[self::FIELD_ETAG]); - } elseif ($ext && is_scalar($data[self::FIELD_ETAG])) { - $this->setEtag(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_ETAG]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ETAG])) { + $this->setEtag(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_ETAG]] + $ext)); + } else if (is_array($data[self::FIELD_ETAG])) { + $this->setEtag(new FHIRString(array_merge($ext, $data[self::FIELD_ETAG]))); + } } else { $this->setEtag(new FHIRString($data[self::FIELD_ETAG])); } @@ -191,8 +194,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_LAST_MODIFIED] instanceof FHIRInstant) { $this->setLastModified($data[self::FIELD_LAST_MODIFIED]); - } elseif ($ext && is_scalar($data[self::FIELD_LAST_MODIFIED])) { - $this->setLastModified(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_LAST_MODIFIED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_LAST_MODIFIED])) { + $this->setLastModified(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_LAST_MODIFIED]] + $ext)); + } else if (is_array($data[self::FIELD_LAST_MODIFIED])) { + $this->setLastModified(new FHIRInstant(array_merge($ext, $data[self::FIELD_LAST_MODIFIED]))); + } } else { $this->setLastModified(new FHIRInstant($data[self::FIELD_LAST_MODIFIED])); } @@ -203,8 +210,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_LOCATION] instanceof FHIRUri) { $this->setLocation($data[self::FIELD_LOCATION]); - } elseif ($ext && is_scalar($data[self::FIELD_LOCATION])) { - $this->setLocation(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_LOCATION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_LOCATION])) { + $this->setLocation(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_LOCATION]] + $ext)); + } else if (is_array($data[self::FIELD_LOCATION])) { + $this->setLocation(new FHIRUri(array_merge($ext, $data[self::FIELD_LOCATION]))); + } } else { $this->setLocation(new FHIRUri($data[self::FIELD_LOCATION])); } @@ -241,8 +252,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRString) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRString(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRString($data[self::FIELD_STATUS])); } @@ -585,7 +600,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getLocation())) { $v->xmlSerialize($sxe->addChild(self::FIELD_LOCATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOutcome())) { $tsxe = $sxe->addChild(self::FIELD_OUTCOME); $v->xmlSerialize($tsxe->addChild($v->_getFHIRTypeName(), null, $v->_getFHIRXMLNamespace())); @@ -603,23 +617,51 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getEtag())) { - $a[self::FIELD_ETAG] = $v->getValue(); - $a[self::FIELD_ETAG_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ETAG] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ETAG_EXT] = $enc; + } + } else { + $a[self::FIELD_ETAG] = $v; + } } if (null !== ($v = $this->getLastModified())) { - $a[self::FIELD_LAST_MODIFIED] = $v->getValue(); - $a[self::FIELD_LAST_MODIFIED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_LAST_MODIFIED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_LAST_MODIFIED_EXT] = $enc; + } + } else { + $a[self::FIELD_LAST_MODIFIED] = $v; + } } if (null !== ($v = $this->getLocation())) { - $a[self::FIELD_LOCATION] = $v->getValue(); - $a[self::FIELD_LOCATION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_LOCATION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_LOCATION_EXT] = $enc; + } + } else { + $a[self::FIELD_LOCATION] = $v; + } } if (null !== ($v = $this->getOutcome())) { $a[self::FIELD_OUTCOME] = $v; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v->getValue(); - $a[self::FIELD_STATUS_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRBundle/FHIRBundleSearch.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRBundle/FHIRBundleSearch.php index 4c6ea9eaa6..da0394b657 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRBundle/FHIRBundleSearch.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRBundle/FHIRBundleSearch.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRBundleSearch extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_BUNDLE_DOT_SEARCH; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_MODE = 'mode'; const FIELD_MODE_EXT = '_mode'; const FIELD_SCORE = 'score'; @@ -113,6 +109,9 @@ class FHIRBundleSearch extends FHIRBackboneElement */ protected $score = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRBundleSearch Constructor * @param null|array $data @@ -135,8 +134,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MODE] instanceof FHIRSearchEntryMode) { $this->setMode($data[self::FIELD_MODE]); - } elseif ($ext && is_scalar($data[self::FIELD_MODE])) { - $this->setMode(new FHIRSearchEntryMode([FHIRSearchEntryMode::FIELD_VALUE => $data[self::FIELD_MODE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MODE])) { + $this->setMode(new FHIRSearchEntryMode([FHIRSearchEntryMode::FIELD_VALUE => $data[self::FIELD_MODE]] + $ext)); + } else if (is_array($data[self::FIELD_MODE])) { + $this->setMode(new FHIRSearchEntryMode(array_merge($ext, $data[self::FIELD_MODE]))); + } } else { $this->setMode(new FHIRSearchEntryMode($data[self::FIELD_MODE])); } @@ -147,8 +150,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SCORE] instanceof FHIRDecimal) { $this->setScore($data[self::FIELD_SCORE]); - } elseif ($ext && is_scalar($data[self::FIELD_SCORE])) { - $this->setScore(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_SCORE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SCORE])) { + $this->setScore(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_SCORE]] + $ext)); + } else if (is_array($data[self::FIELD_SCORE])) { + $this->setScore(new FHIRDecimal(array_merge($ext, $data[self::FIELD_SCORE]))); + } } else { $this->setScore(new FHIRDecimal($data[self::FIELD_SCORE])); } @@ -339,7 +346,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getMode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MODE, null, $v->_getFHIRXMLNamespace())); } @@ -356,11 +362,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getMode())) { - $a[self::FIELD_MODE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MODE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MODE_EXT] = $enc; + } + } else { + $a[self::FIELD_MODE] = $v; + } } if (null !== ($v = $this->getScore())) { - $a[self::FIELD_SCORE] = $v->getValue(); - $a[self::FIELD_SCORE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SCORE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SCORE_EXT] = $enc; + } + } else { + $a[self::FIELD_SCORE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementDocument.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementDocument.php index afdd9471ea..56b6931767 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementDocument.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementDocument.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -82,10 +82,6 @@ class FHIRCapabilityStatementDocument extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CAPABILITY_STATEMENT_DOT_DOCUMENT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DOCUMENTATION = 'documentation'; const FIELD_DOCUMENTATION_EXT = '_documentation'; const FIELD_MODE = 'mode'; @@ -134,6 +130,9 @@ class FHIRCapabilityStatementDocument extends FHIRBackboneElement */ protected $profile = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRCapabilityStatementDocument Constructor * @param null|array $data @@ -156,8 +155,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DOCUMENTATION] instanceof FHIRMarkdown) { $this->setDocumentation($data[self::FIELD_DOCUMENTATION]); - } elseif ($ext && is_scalar($data[self::FIELD_DOCUMENTATION])) { - $this->setDocumentation(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_DOCUMENTATION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DOCUMENTATION])) { + $this->setDocumentation(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_DOCUMENTATION]] + $ext)); + } else if (is_array($data[self::FIELD_DOCUMENTATION])) { + $this->setDocumentation(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_DOCUMENTATION]))); + } } else { $this->setDocumentation(new FHIRMarkdown($data[self::FIELD_DOCUMENTATION])); } @@ -168,8 +171,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MODE] instanceof FHIRDocumentMode) { $this->setMode($data[self::FIELD_MODE]); - } elseif ($ext && is_scalar($data[self::FIELD_MODE])) { - $this->setMode(new FHIRDocumentMode([FHIRDocumentMode::FIELD_VALUE => $data[self::FIELD_MODE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MODE])) { + $this->setMode(new FHIRDocumentMode([FHIRDocumentMode::FIELD_VALUE => $data[self::FIELD_MODE]] + $ext)); + } else if (is_array($data[self::FIELD_MODE])) { + $this->setMode(new FHIRDocumentMode(array_merge($ext, $data[self::FIELD_MODE]))); + } } else { $this->setMode(new FHIRDocumentMode($data[self::FIELD_MODE])); } @@ -180,8 +187,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PROFILE] instanceof FHIRCanonical) { $this->setProfile($data[self::FIELD_PROFILE]); - } elseif ($ext && is_scalar($data[self::FIELD_PROFILE])) { - $this->setProfile(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $data[self::FIELD_PROFILE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PROFILE])) { + $this->setProfile(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $data[self::FIELD_PROFILE]] + $ext)); + } else if (is_array($data[self::FIELD_PROFILE])) { + $this->setProfile(new FHIRCanonical(array_merge($ext, $data[self::FIELD_PROFILE]))); + } } else { $this->setProfile(new FHIRCanonical($data[self::FIELD_PROFILE])); } @@ -427,7 +438,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDocumentation())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DOCUMENTATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getMode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MODE, null, $v->_getFHIRXMLNamespace())); } @@ -444,15 +454,37 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getDocumentation())) { - $a[self::FIELD_DOCUMENTATION] = $v->getValue(); - $a[self::FIELD_DOCUMENTATION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DOCUMENTATION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DOCUMENTATION_EXT] = $enc; + } + } else { + $a[self::FIELD_DOCUMENTATION] = $v; + } } if (null !== ($v = $this->getMode())) { - $a[self::FIELD_MODE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MODE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MODE_EXT] = $enc; + } + } else { + $a[self::FIELD_MODE] = $v; + } } if (null !== ($v = $this->getProfile())) { - $a[self::FIELD_PROFILE] = $v->getValue(); - $a[self::FIELD_PROFILE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PROFILE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PROFILE_EXT] = $enc; + } + } else { + $a[self::FIELD_PROFILE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementEndpoint.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementEndpoint.php index de6c9cd35b..1376968342 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementEndpoint.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementEndpoint.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -81,10 +81,6 @@ class FHIRCapabilityStatementEndpoint extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CAPABILITY_STATEMENT_DOT_ENDPOINT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ADDRESS = 'address'; const FIELD_ADDRESS_EXT = '_address'; const FIELD_PROTOCOL = 'protocol'; @@ -113,6 +109,9 @@ class FHIRCapabilityStatementEndpoint extends FHIRBackboneElement */ protected $protocol = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRCapabilityStatementEndpoint Constructor * @param null|array $data @@ -135,8 +134,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ADDRESS] instanceof FHIRUrl) { $this->setAddress($data[self::FIELD_ADDRESS]); - } elseif ($ext && is_scalar($data[self::FIELD_ADDRESS])) { - $this->setAddress(new FHIRUrl([FHIRUrl::FIELD_VALUE => $data[self::FIELD_ADDRESS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ADDRESS])) { + $this->setAddress(new FHIRUrl([FHIRUrl::FIELD_VALUE => $data[self::FIELD_ADDRESS]] + $ext)); + } else if (is_array($data[self::FIELD_ADDRESS])) { + $this->setAddress(new FHIRUrl(array_merge($ext, $data[self::FIELD_ADDRESS]))); + } } else { $this->setAddress(new FHIRUrl($data[self::FIELD_ADDRESS])); } @@ -333,7 +336,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getAddress())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ADDRESS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getProtocol())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PROTOCOL, null, $v->_getFHIRXMLNamespace())); } @@ -347,8 +349,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getAddress())) { - $a[self::FIELD_ADDRESS] = $v->getValue(); - $a[self::FIELD_ADDRESS_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ADDRESS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ADDRESS_EXT] = $enc; + } + } else { + $a[self::FIELD_ADDRESS] = $v; + } } if (null !== ($v = $this->getProtocol())) { $a[self::FIELD_PROTOCOL] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementImplementation.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementImplementation.php index d200226308..dd6d14c8ed 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementImplementation.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementImplementation.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -82,10 +82,6 @@ class FHIRCapabilityStatementImplementation extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CAPABILITY_STATEMENT_DOT_IMPLEMENTATION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CUSTODIAN = 'custodian'; const FIELD_DESCRIPTION = 'description'; const FIELD_DESCRIPTION_EXT = '_description'; @@ -128,6 +124,9 @@ class FHIRCapabilityStatementImplementation extends FHIRBackboneElement */ protected $url = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRCapabilityStatementImplementation Constructor * @param null|array $data @@ -157,8 +156,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -169,8 +172,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_URL] instanceof FHIRUrl) { $this->setUrl($data[self::FIELD_URL]); - } elseif ($ext && is_scalar($data[self::FIELD_URL])) { - $this->setUrl(new FHIRUrl([FHIRUrl::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUrl([FHIRUrl::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } else if (is_array($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUrl(array_merge($ext, $data[self::FIELD_URL]))); + } } else { $this->setUrl(new FHIRUrl($data[self::FIELD_URL])); } @@ -403,7 +410,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getCustodian())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CUSTODIAN, null, $v->_getFHIRXMLNamespace())); } @@ -426,12 +432,26 @@ public function jsonSerialize() $a[self::FIELD_CUSTODIAN] = $v; } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if (null !== ($v = $this->getUrl())) { - $a[self::FIELD_URL] = $v->getValue(); - $a[self::FIELD_URL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_URL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_URL_EXT] = $enc; + } + } else { + $a[self::FIELD_URL] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementInteraction.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementInteraction.php index 71534b8b07..536d19e31d 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementInteraction.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementInteraction.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -81,10 +81,6 @@ class FHIRCapabilityStatementInteraction extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CAPABILITY_STATEMENT_DOT_INTERACTION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CODE = 'code'; const FIELD_CODE_EXT = '_code'; const FIELD_DOCUMENTATION = 'documentation'; @@ -117,6 +113,9 @@ class FHIRCapabilityStatementInteraction extends FHIRBackboneElement */ protected $documentation = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRCapabilityStatementInteraction Constructor * @param null|array $data @@ -139,8 +138,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CODE] instanceof FHIRTypeRestfulInteraction) { $this->setCode($data[self::FIELD_CODE]); - } elseif ($ext && is_scalar($data[self::FIELD_CODE])) { - $this->setCode(new FHIRTypeRestfulInteraction([FHIRTypeRestfulInteraction::FIELD_VALUE => $data[self::FIELD_CODE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CODE])) { + $this->setCode(new FHIRTypeRestfulInteraction([FHIRTypeRestfulInteraction::FIELD_VALUE => $data[self::FIELD_CODE]] + $ext)); + } else if (is_array($data[self::FIELD_CODE])) { + $this->setCode(new FHIRTypeRestfulInteraction(array_merge($ext, $data[self::FIELD_CODE]))); + } } else { $this->setCode(new FHIRTypeRestfulInteraction($data[self::FIELD_CODE])); } @@ -151,8 +154,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DOCUMENTATION] instanceof FHIRMarkdown) { $this->setDocumentation($data[self::FIELD_DOCUMENTATION]); - } elseif ($ext && is_scalar($data[self::FIELD_DOCUMENTATION])) { - $this->setDocumentation(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_DOCUMENTATION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DOCUMENTATION])) { + $this->setDocumentation(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_DOCUMENTATION]] + $ext)); + } else if (is_array($data[self::FIELD_DOCUMENTATION])) { + $this->setDocumentation(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_DOCUMENTATION]))); + } } else { $this->setDocumentation(new FHIRMarkdown($data[self::FIELD_DOCUMENTATION])); } @@ -345,7 +352,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } @@ -362,11 +368,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getCode())) { - $a[self::FIELD_CODE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CODE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CODE_EXT] = $enc; + } + } else { + $a[self::FIELD_CODE] = $v; + } } if (null !== ($v = $this->getDocumentation())) { - $a[self::FIELD_DOCUMENTATION] = $v->getValue(); - $a[self::FIELD_DOCUMENTATION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DOCUMENTATION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DOCUMENTATION_EXT] = $enc; + } + } else { + $a[self::FIELD_DOCUMENTATION] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementInteraction1.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementInteraction1.php index 3658f0561d..ba45bbc78d 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementInteraction1.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementInteraction1.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -81,10 +81,6 @@ class FHIRCapabilityStatementInteraction1 extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CAPABILITY_STATEMENT_DOT_INTERACTION_1; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CODE = 'code'; const FIELD_CODE_EXT = '_code'; const FIELD_DOCUMENTATION = 'documentation'; @@ -117,6 +113,9 @@ class FHIRCapabilityStatementInteraction1 extends FHIRBackboneElement */ protected $documentation = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRCapabilityStatementInteraction1 Constructor * @param null|array $data @@ -139,8 +138,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CODE] instanceof FHIRSystemRestfulInteraction) { $this->setCode($data[self::FIELD_CODE]); - } elseif ($ext && is_scalar($data[self::FIELD_CODE])) { - $this->setCode(new FHIRSystemRestfulInteraction([FHIRSystemRestfulInteraction::FIELD_VALUE => $data[self::FIELD_CODE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CODE])) { + $this->setCode(new FHIRSystemRestfulInteraction([FHIRSystemRestfulInteraction::FIELD_VALUE => $data[self::FIELD_CODE]] + $ext)); + } else if (is_array($data[self::FIELD_CODE])) { + $this->setCode(new FHIRSystemRestfulInteraction(array_merge($ext, $data[self::FIELD_CODE]))); + } } else { $this->setCode(new FHIRSystemRestfulInteraction($data[self::FIELD_CODE])); } @@ -151,8 +154,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DOCUMENTATION] instanceof FHIRMarkdown) { $this->setDocumentation($data[self::FIELD_DOCUMENTATION]); - } elseif ($ext && is_scalar($data[self::FIELD_DOCUMENTATION])) { - $this->setDocumentation(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_DOCUMENTATION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DOCUMENTATION])) { + $this->setDocumentation(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_DOCUMENTATION]] + $ext)); + } else if (is_array($data[self::FIELD_DOCUMENTATION])) { + $this->setDocumentation(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_DOCUMENTATION]))); + } } else { $this->setDocumentation(new FHIRMarkdown($data[self::FIELD_DOCUMENTATION])); } @@ -345,7 +352,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } @@ -362,11 +368,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getCode())) { - $a[self::FIELD_CODE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CODE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CODE_EXT] = $enc; + } + } else { + $a[self::FIELD_CODE] = $v; + } } if (null !== ($v = $this->getDocumentation())) { - $a[self::FIELD_DOCUMENTATION] = $v->getValue(); - $a[self::FIELD_DOCUMENTATION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DOCUMENTATION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DOCUMENTATION_EXT] = $enc; + } + } else { + $a[self::FIELD_DOCUMENTATION] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementMessaging.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementMessaging.php index 8d46b34cdc..229ad805be 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementMessaging.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementMessaging.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -81,10 +81,6 @@ class FHIRCapabilityStatementMessaging extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CAPABILITY_STATEMENT_DOT_MESSAGING; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DOCUMENTATION = 'documentation'; const FIELD_DOCUMENTATION_EXT = '_documentation'; const FIELD_ENDPOINT = 'endpoint'; @@ -146,6 +142,9 @@ class FHIRCapabilityStatementMessaging extends FHIRBackboneElement */ protected $supportedMessage = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRCapabilityStatementMessaging Constructor * @param null|array $data @@ -168,8 +167,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DOCUMENTATION] instanceof FHIRMarkdown) { $this->setDocumentation($data[self::FIELD_DOCUMENTATION]); - } elseif ($ext && is_scalar($data[self::FIELD_DOCUMENTATION])) { - $this->setDocumentation(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_DOCUMENTATION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DOCUMENTATION])) { + $this->setDocumentation(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_DOCUMENTATION]] + $ext)); + } else if (is_array($data[self::FIELD_DOCUMENTATION])) { + $this->setDocumentation(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_DOCUMENTATION]))); + } } else { $this->setDocumentation(new FHIRMarkdown($data[self::FIELD_DOCUMENTATION])); } @@ -177,6 +180,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ENDPOINT])) { if (is_array($data[self::FIELD_ENDPOINT])) { foreach($data[self::FIELD_ENDPOINT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCapabilityStatementEndpoint) { $this->addEndpoint($v); } else { @@ -195,8 +201,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_RELIABLE_CACHE] instanceof FHIRUnsignedInt) { $this->setReliableCache($data[self::FIELD_RELIABLE_CACHE]); - } elseif ($ext && is_scalar($data[self::FIELD_RELIABLE_CACHE])) { - $this->setReliableCache(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_RELIABLE_CACHE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_RELIABLE_CACHE])) { + $this->setReliableCache(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_RELIABLE_CACHE]] + $ext)); + } else if (is_array($data[self::FIELD_RELIABLE_CACHE])) { + $this->setReliableCache(new FHIRUnsignedInt(array_merge($ext, $data[self::FIELD_RELIABLE_CACHE]))); + } } else { $this->setReliableCache(new FHIRUnsignedInt($data[self::FIELD_RELIABLE_CACHE])); } @@ -204,6 +214,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SUPPORTED_MESSAGE])) { if (is_array($data[self::FIELD_SUPPORTED_MESSAGE])) { foreach($data[self::FIELD_SUPPORTED_MESSAGE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCapabilityStatementSupportedMessage) { $this->addSupportedMessage($v); } else { @@ -553,7 +566,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDocumentation())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DOCUMENTATION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getEndpoint())) { foreach($vs as $v) { if (null === $v) { @@ -562,10 +574,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_ENDPOINT, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getReliableCache())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RELIABLE_CACHE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getSupportedMessage())) { foreach($vs as $v) { if (null === $v) { @@ -574,6 +586,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_SUPPORTED_MESSAGE, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } @@ -584,15 +597,29 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getDocumentation())) { - $a[self::FIELD_DOCUMENTATION] = $v->getValue(); - $a[self::FIELD_DOCUMENTATION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DOCUMENTATION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DOCUMENTATION_EXT] = $enc; + } + } else { + $a[self::FIELD_DOCUMENTATION] = $v; + } } if ([] !== ($vs = $this->getEndpoint())) { $a[self::FIELD_ENDPOINT] = $vs; } if (null !== ($v = $this->getReliableCache())) { - $a[self::FIELD_RELIABLE_CACHE] = $v->getValue(); - $a[self::FIELD_RELIABLE_CACHE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_RELIABLE_CACHE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_RELIABLE_CACHE_EXT] = $enc; + } + } else { + $a[self::FIELD_RELIABLE_CACHE] = $v; + } } if ([] !== ($vs = $this->getSupportedMessage())) { $a[self::FIELD_SUPPORTED_MESSAGE] = $vs; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementOperation.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementOperation.php index 065c81b65e..fd279d0065 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementOperation.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementOperation.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -82,10 +82,6 @@ class FHIRCapabilityStatementOperation extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CAPABILITY_STATEMENT_DOT_OPERATION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DEFINITION = 'definition'; const FIELD_DEFINITION_EXT = '_definition'; const FIELD_DOCUMENTATION = 'documentation'; @@ -141,6 +137,9 @@ class FHIRCapabilityStatementOperation extends FHIRBackboneElement */ protected $name = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRCapabilityStatementOperation Constructor * @param null|array $data @@ -163,8 +162,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DEFINITION] instanceof FHIRCanonical) { $this->setDefinition($data[self::FIELD_DEFINITION]); - } elseif ($ext && is_scalar($data[self::FIELD_DEFINITION])) { - $this->setDefinition(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $data[self::FIELD_DEFINITION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DEFINITION])) { + $this->setDefinition(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $data[self::FIELD_DEFINITION]] + $ext)); + } else if (is_array($data[self::FIELD_DEFINITION])) { + $this->setDefinition(new FHIRCanonical(array_merge($ext, $data[self::FIELD_DEFINITION]))); + } } else { $this->setDefinition(new FHIRCanonical($data[self::FIELD_DEFINITION])); } @@ -175,8 +178,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DOCUMENTATION] instanceof FHIRMarkdown) { $this->setDocumentation($data[self::FIELD_DOCUMENTATION]); - } elseif ($ext && is_scalar($data[self::FIELD_DOCUMENTATION])) { - $this->setDocumentation(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_DOCUMENTATION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DOCUMENTATION])) { + $this->setDocumentation(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_DOCUMENTATION]] + $ext)); + } else if (is_array($data[self::FIELD_DOCUMENTATION])) { + $this->setDocumentation(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_DOCUMENTATION]))); + } } else { $this->setDocumentation(new FHIRMarkdown($data[self::FIELD_DOCUMENTATION])); } @@ -187,8 +194,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -475,16 +486,37 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getDefinition())) { - $a[self::FIELD_DEFINITION] = $v->getValue(); - $a[self::FIELD_DEFINITION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DEFINITION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DEFINITION_EXT] = $enc; + } + } else { + $a[self::FIELD_DEFINITION] = $v; + } } if (null !== ($v = $this->getDocumentation())) { - $a[self::FIELD_DOCUMENTATION] = $v->getValue(); - $a[self::FIELD_DOCUMENTATION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DOCUMENTATION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DOCUMENTATION_EXT] = $enc; + } + } else { + $a[self::FIELD_DOCUMENTATION] = $v; + } } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementResource.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementResource.php index 65bc87a5f3..d1ac2197bf 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementResource.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementResource.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -88,10 +88,6 @@ class FHIRCapabilityStatementResource extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CAPABILITY_STATEMENT_DOT_RESOURCE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CONDITIONAL_CREATE = 'conditionalCreate'; const FIELD_CONDITIONAL_CREATE_EXT = '_conditionalCreate'; const FIELD_CONDITIONAL_DELETE = 'conditionalDelete'; @@ -335,6 +331,9 @@ class FHIRCapabilityStatementResource extends FHIRBackboneElement */ protected $versioning = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRCapabilityStatementResource Constructor * @param null|array $data @@ -357,8 +356,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CONDITIONAL_CREATE] instanceof FHIRBoolean) { $this->setConditionalCreate($data[self::FIELD_CONDITIONAL_CREATE]); - } elseif ($ext && is_scalar($data[self::FIELD_CONDITIONAL_CREATE])) { - $this->setConditionalCreate(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_CONDITIONAL_CREATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CONDITIONAL_CREATE])) { + $this->setConditionalCreate(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_CONDITIONAL_CREATE]] + $ext)); + } else if (is_array($data[self::FIELD_CONDITIONAL_CREATE])) { + $this->setConditionalCreate(new FHIRBoolean(array_merge($ext, $data[self::FIELD_CONDITIONAL_CREATE]))); + } } else { $this->setConditionalCreate(new FHIRBoolean($data[self::FIELD_CONDITIONAL_CREATE])); } @@ -369,8 +372,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CONDITIONAL_DELETE] instanceof FHIRConditionalDeleteStatus) { $this->setConditionalDelete($data[self::FIELD_CONDITIONAL_DELETE]); - } elseif ($ext && is_scalar($data[self::FIELD_CONDITIONAL_DELETE])) { - $this->setConditionalDelete(new FHIRConditionalDeleteStatus([FHIRConditionalDeleteStatus::FIELD_VALUE => $data[self::FIELD_CONDITIONAL_DELETE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CONDITIONAL_DELETE])) { + $this->setConditionalDelete(new FHIRConditionalDeleteStatus([FHIRConditionalDeleteStatus::FIELD_VALUE => $data[self::FIELD_CONDITIONAL_DELETE]] + $ext)); + } else if (is_array($data[self::FIELD_CONDITIONAL_DELETE])) { + $this->setConditionalDelete(new FHIRConditionalDeleteStatus(array_merge($ext, $data[self::FIELD_CONDITIONAL_DELETE]))); + } } else { $this->setConditionalDelete(new FHIRConditionalDeleteStatus($data[self::FIELD_CONDITIONAL_DELETE])); } @@ -381,8 +388,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CONDITIONAL_READ] instanceof FHIRConditionalReadStatus) { $this->setConditionalRead($data[self::FIELD_CONDITIONAL_READ]); - } elseif ($ext && is_scalar($data[self::FIELD_CONDITIONAL_READ])) { - $this->setConditionalRead(new FHIRConditionalReadStatus([FHIRConditionalReadStatus::FIELD_VALUE => $data[self::FIELD_CONDITIONAL_READ]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CONDITIONAL_READ])) { + $this->setConditionalRead(new FHIRConditionalReadStatus([FHIRConditionalReadStatus::FIELD_VALUE => $data[self::FIELD_CONDITIONAL_READ]] + $ext)); + } else if (is_array($data[self::FIELD_CONDITIONAL_READ])) { + $this->setConditionalRead(new FHIRConditionalReadStatus(array_merge($ext, $data[self::FIELD_CONDITIONAL_READ]))); + } } else { $this->setConditionalRead(new FHIRConditionalReadStatus($data[self::FIELD_CONDITIONAL_READ])); } @@ -393,8 +404,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CONDITIONAL_UPDATE] instanceof FHIRBoolean) { $this->setConditionalUpdate($data[self::FIELD_CONDITIONAL_UPDATE]); - } elseif ($ext && is_scalar($data[self::FIELD_CONDITIONAL_UPDATE])) { - $this->setConditionalUpdate(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_CONDITIONAL_UPDATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CONDITIONAL_UPDATE])) { + $this->setConditionalUpdate(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_CONDITIONAL_UPDATE]] + $ext)); + } else if (is_array($data[self::FIELD_CONDITIONAL_UPDATE])) { + $this->setConditionalUpdate(new FHIRBoolean(array_merge($ext, $data[self::FIELD_CONDITIONAL_UPDATE]))); + } } else { $this->setConditionalUpdate(new FHIRBoolean($data[self::FIELD_CONDITIONAL_UPDATE])); } @@ -405,8 +420,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DOCUMENTATION] instanceof FHIRMarkdown) { $this->setDocumentation($data[self::FIELD_DOCUMENTATION]); - } elseif ($ext && is_scalar($data[self::FIELD_DOCUMENTATION])) { - $this->setDocumentation(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_DOCUMENTATION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DOCUMENTATION])) { + $this->setDocumentation(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_DOCUMENTATION]] + $ext)); + } else if (is_array($data[self::FIELD_DOCUMENTATION])) { + $this->setDocumentation(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_DOCUMENTATION]))); + } } else { $this->setDocumentation(new FHIRMarkdown($data[self::FIELD_DOCUMENTATION])); } @@ -414,6 +433,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_INTERACTION])) { if (is_array($data[self::FIELD_INTERACTION])) { foreach($data[self::FIELD_INTERACTION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCapabilityStatementInteraction) { $this->addInteraction($v); } else { @@ -429,6 +451,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_OPERATION])) { if (is_array($data[self::FIELD_OPERATION])) { foreach($data[self::FIELD_OPERATION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCapabilityStatementOperation) { $this->addOperation($v); } else { @@ -447,8 +472,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PROFILE] instanceof FHIRCanonical) { $this->setProfile($data[self::FIELD_PROFILE]); - } elseif ($ext && is_scalar($data[self::FIELD_PROFILE])) { - $this->setProfile(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $data[self::FIELD_PROFILE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PROFILE])) { + $this->setProfile(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $data[self::FIELD_PROFILE]] + $ext)); + } else if (is_array($data[self::FIELD_PROFILE])) { + $this->setProfile(new FHIRCanonical(array_merge($ext, $data[self::FIELD_PROFILE]))); + } } else { $this->setProfile(new FHIRCanonical($data[self::FIELD_PROFILE])); } @@ -459,8 +488,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_READ_HISTORY] instanceof FHIRBoolean) { $this->setReadHistory($data[self::FIELD_READ_HISTORY]); - } elseif ($ext && is_scalar($data[self::FIELD_READ_HISTORY])) { - $this->setReadHistory(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_READ_HISTORY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_READ_HISTORY])) { + $this->setReadHistory(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_READ_HISTORY]] + $ext)); + } else if (is_array($data[self::FIELD_READ_HISTORY])) { + $this->setReadHistory(new FHIRBoolean(array_merge($ext, $data[self::FIELD_READ_HISTORY]))); + } } else { $this->setReadHistory(new FHIRBoolean($data[self::FIELD_READ_HISTORY])); } @@ -471,17 +504,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_REFERENCE_POLICY])) { foreach($data[self::FIELD_REFERENCE_POLICY] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReferenceHandlingPolicy) { $this->addReferencePolicy($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addReferencePolicy(new FHIRReferenceHandlingPolicy([FHIRReferenceHandlingPolicy::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addReferencePolicy(new FHIRReferenceHandlingPolicy([FHIRReferenceHandlingPolicy::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addReferencePolicy(new FHIRReferenceHandlingPolicy(array_merge($v, $ext[$i]))); + } } else { $this->addReferencePolicy(new FHIRReferenceHandlingPolicy($v)); } } } elseif ($data[self::FIELD_REFERENCE_POLICY] instanceof FHIRReferenceHandlingPolicy) { $this->addReferencePolicy($data[self::FIELD_REFERENCE_POLICY]); - } elseif ($ext && is_scalar($data[self::FIELD_REFERENCE_POLICY])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_REFERENCE_POLICY])) { $this->addReferencePolicy(new FHIRReferenceHandlingPolicy([FHIRReferenceHandlingPolicy::FIELD_VALUE => $data[self::FIELD_REFERENCE_POLICY]] + $ext)); } else { $this->addReferencePolicy(new FHIRReferenceHandlingPolicy($data[self::FIELD_REFERENCE_POLICY])); @@ -493,17 +533,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_SEARCH_INCLUDE])) { foreach($data[self::FIELD_SEARCH_INCLUDE] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRString) { $this->addSearchInclude($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addSearchInclude(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addSearchInclude(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addSearchInclude(new FHIRString(array_merge($v, $ext[$i]))); + } } else { $this->addSearchInclude(new FHIRString($v)); } } } elseif ($data[self::FIELD_SEARCH_INCLUDE] instanceof FHIRString) { $this->addSearchInclude($data[self::FIELD_SEARCH_INCLUDE]); - } elseif ($ext && is_scalar($data[self::FIELD_SEARCH_INCLUDE])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_SEARCH_INCLUDE])) { $this->addSearchInclude(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SEARCH_INCLUDE]] + $ext)); } else { $this->addSearchInclude(new FHIRString($data[self::FIELD_SEARCH_INCLUDE])); @@ -512,6 +559,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SEARCH_PARAM])) { if (is_array($data[self::FIELD_SEARCH_PARAM])) { foreach($data[self::FIELD_SEARCH_PARAM] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCapabilityStatementSearchParam) { $this->addSearchParam($v); } else { @@ -530,17 +580,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_SEARCH_REV_INCLUDE])) { foreach($data[self::FIELD_SEARCH_REV_INCLUDE] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRString) { $this->addSearchRevInclude($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addSearchRevInclude(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addSearchRevInclude(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addSearchRevInclude(new FHIRString(array_merge($v, $ext[$i]))); + } } else { $this->addSearchRevInclude(new FHIRString($v)); } } } elseif ($data[self::FIELD_SEARCH_REV_INCLUDE] instanceof FHIRString) { $this->addSearchRevInclude($data[self::FIELD_SEARCH_REV_INCLUDE]); - } elseif ($ext && is_scalar($data[self::FIELD_SEARCH_REV_INCLUDE])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_SEARCH_REV_INCLUDE])) { $this->addSearchRevInclude(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SEARCH_REV_INCLUDE]] + $ext)); } else { $this->addSearchRevInclude(new FHIRString($data[self::FIELD_SEARCH_REV_INCLUDE])); @@ -552,17 +609,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_SUPPORTED_PROFILE])) { foreach($data[self::FIELD_SUPPORTED_PROFILE] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCanonical) { $this->addSupportedProfile($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addSupportedProfile(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addSupportedProfile(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addSupportedProfile(new FHIRCanonical(array_merge($v, $ext[$i]))); + } } else { $this->addSupportedProfile(new FHIRCanonical($v)); } } } elseif ($data[self::FIELD_SUPPORTED_PROFILE] instanceof FHIRCanonical) { $this->addSupportedProfile($data[self::FIELD_SUPPORTED_PROFILE]); - } elseif ($ext && is_scalar($data[self::FIELD_SUPPORTED_PROFILE])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_SUPPORTED_PROFILE])) { $this->addSupportedProfile(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $data[self::FIELD_SUPPORTED_PROFILE]] + $ext)); } else { $this->addSupportedProfile(new FHIRCanonical($data[self::FIELD_SUPPORTED_PROFILE])); @@ -574,8 +638,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TYPE] instanceof FHIRCode) { $this->setType($data[self::FIELD_TYPE]); - } elseif ($ext && is_scalar($data[self::FIELD_TYPE])) { - $this->setType(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TYPE])) { + $this->setType(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } else if (is_array($data[self::FIELD_TYPE])) { + $this->setType(new FHIRCode(array_merge($ext, $data[self::FIELD_TYPE]))); + } } else { $this->setType(new FHIRCode($data[self::FIELD_TYPE])); } @@ -586,8 +654,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_UPDATE_CREATE] instanceof FHIRBoolean) { $this->setUpdateCreate($data[self::FIELD_UPDATE_CREATE]); - } elseif ($ext && is_scalar($data[self::FIELD_UPDATE_CREATE])) { - $this->setUpdateCreate(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_UPDATE_CREATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_UPDATE_CREATE])) { + $this->setUpdateCreate(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_UPDATE_CREATE]] + $ext)); + } else if (is_array($data[self::FIELD_UPDATE_CREATE])) { + $this->setUpdateCreate(new FHIRBoolean(array_merge($ext, $data[self::FIELD_UPDATE_CREATE]))); + } } else { $this->setUpdateCreate(new FHIRBoolean($data[self::FIELD_UPDATE_CREATE])); } @@ -598,8 +670,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VERSIONING] instanceof FHIRResourceVersionPolicy) { $this->setVersioning($data[self::FIELD_VERSIONING]); - } elseif ($ext && is_scalar($data[self::FIELD_VERSIONING])) { - $this->setVersioning(new FHIRResourceVersionPolicy([FHIRResourceVersionPolicy::FIELD_VALUE => $data[self::FIELD_VERSIONING]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VERSIONING])) { + $this->setVersioning(new FHIRResourceVersionPolicy([FHIRResourceVersionPolicy::FIELD_VALUE => $data[self::FIELD_VERSIONING]] + $ext)); + } else if (is_array($data[self::FIELD_VERSIONING])) { + $this->setVersioning(new FHIRResourceVersionPolicy(array_merge($ext, $data[self::FIELD_VERSIONING]))); + } } else { $this->setVersioning(new FHIRResourceVersionPolicy($data[self::FIELD_VERSIONING])); } @@ -1636,11 +1712,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getConditionalCreate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CONDITIONAL_CREATE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getConditionalDelete())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CONDITIONAL_DELETE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getConditionalRead())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CONDITIONAL_READ, null, $v->_getFHIRXMLNamespace())); } @@ -1650,7 +1724,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDocumentation())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DOCUMENTATION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getInteraction())) { foreach($vs as $v) { if (null === $v) { @@ -1668,13 +1741,13 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_OPERATION, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getProfile())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PROFILE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getReadHistory())) { $v->xmlSerialize($sxe->addChild(self::FIELD_READ_HISTORY, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getReferencePolicy())) { foreach($vs as $v) { if (null === $v) { @@ -1683,6 +1756,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_REFERENCE_POLICY, null, $v->_getFHIRXMLNamespace())); } } + if ([] !== ($vs = $this->getSearchInclude())) { foreach($vs as $v) { if (null === $v) { @@ -1700,6 +1774,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_SEARCH_PARAM, null, $v->_getFHIRXMLNamespace())); } } + if ([] !== ($vs = $this->getSearchRevInclude())) { foreach($vs as $v) { if (null === $v) { @@ -1708,6 +1783,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_SEARCH_REV_INCLUDE, null, $v->_getFHIRXMLNamespace())); } } + if ([] !== ($vs = $this->getSupportedProfile())) { foreach($vs as $v) { if (null === $v) { @@ -1716,13 +1792,13 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_SUPPORTED_PROFILE, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getUpdateCreate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_UPDATE_CREATE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getVersioning())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VERSIONING, null, $v->_getFHIRXMLNamespace())); } @@ -1736,22 +1812,59 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getConditionalCreate())) { - $a[self::FIELD_CONDITIONAL_CREATE] = $v->getValue(); - $a[self::FIELD_CONDITIONAL_CREATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CONDITIONAL_CREATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CONDITIONAL_CREATE_EXT] = $enc; + } + } else { + $a[self::FIELD_CONDITIONAL_CREATE] = $v; + } } if (null !== ($v = $this->getConditionalDelete())) { - $a[self::FIELD_CONDITIONAL_DELETE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CONDITIONAL_DELETE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CONDITIONAL_DELETE_EXT] = $enc; + } + } else { + $a[self::FIELD_CONDITIONAL_DELETE] = $v; + } } if (null !== ($v = $this->getConditionalRead())) { - $a[self::FIELD_CONDITIONAL_READ] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CONDITIONAL_READ] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CONDITIONAL_READ_EXT] = $enc; + } + } else { + $a[self::FIELD_CONDITIONAL_READ] = $v; + } } if (null !== ($v = $this->getConditionalUpdate())) { - $a[self::FIELD_CONDITIONAL_UPDATE] = $v->getValue(); - $a[self::FIELD_CONDITIONAL_UPDATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CONDITIONAL_UPDATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CONDITIONAL_UPDATE_EXT] = $enc; + } + } else { + $a[self::FIELD_CONDITIONAL_UPDATE] = $v; + } } if (null !== ($v = $this->getDocumentation())) { - $a[self::FIELD_DOCUMENTATION] = $v->getValue(); - $a[self::FIELD_DOCUMENTATION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DOCUMENTATION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DOCUMENTATION_EXT] = $enc; + } + } else { + $a[self::FIELD_DOCUMENTATION] = $v; + } } if ([] !== ($vs = $this->getInteraction())) { $a[self::FIELD_INTERACTION] = $vs; @@ -1760,15 +1873,45 @@ public function jsonSerialize() $a[self::FIELD_OPERATION] = $vs; } if (null !== ($v = $this->getProfile())) { - $a[self::FIELD_PROFILE] = $v->getValue(); - $a[self::FIELD_PROFILE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PROFILE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PROFILE_EXT] = $enc; + } + } else { + $a[self::FIELD_PROFILE] = $v; + } } if (null !== ($v = $this->getReadHistory())) { - $a[self::FIELD_READ_HISTORY] = $v->getValue(); - $a[self::FIELD_READ_HISTORY_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_READ_HISTORY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_READ_HISTORY_EXT] = $enc; + } + } else { + $a[self::FIELD_READ_HISTORY] = $v; + } } if ([] !== ($vs = $this->getReferencePolicy())) { - $a[self::FIELD_REFERENCE_POLICY] = $vs; + $a[self::FIELD_REFERENCE_POLICY] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_REFERENCE_POLICY][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_REFERENCE_POLICY_EXT][] = $enc; + } else { + $a[self::FIELD_REFERENCE_POLICY_EXT][] = null; + } + } else { + $a[self::FIELD_REFERENCE_POLICY][] = $v; + } + } } if ([] !== ($vs = $this->getSearchInclude())) { $a[self::FIELD_SEARCH_INCLUDE] = []; @@ -1776,8 +1919,17 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_SEARCH_INCLUDE][] = $v->getValue(); - $a[self::FIELD_SEARCH_INCLUDE_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SEARCH_INCLUDE][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SEARCH_INCLUDE_EXT][] = $enc; + } else { + $a[self::FIELD_SEARCH_INCLUDE_EXT][] = null; + } + } else { + $a[self::FIELD_SEARCH_INCLUDE][] = $v; + } } } if ([] !== ($vs = $this->getSearchParam())) { @@ -1789,8 +1941,17 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_SEARCH_REV_INCLUDE][] = $v->getValue(); - $a[self::FIELD_SEARCH_REV_INCLUDE_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SEARCH_REV_INCLUDE][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SEARCH_REV_INCLUDE_EXT][] = $enc; + } else { + $a[self::FIELD_SEARCH_REV_INCLUDE_EXT][] = null; + } + } else { + $a[self::FIELD_SEARCH_REV_INCLUDE][] = $v; + } } } if ([] !== ($vs = $this->getSupportedProfile())) { @@ -1799,20 +1960,51 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_SUPPORTED_PROFILE][] = $v->getValue(); - $a[self::FIELD_SUPPORTED_PROFILE_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SUPPORTED_PROFILE][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SUPPORTED_PROFILE_EXT][] = $enc; + } else { + $a[self::FIELD_SUPPORTED_PROFILE_EXT][] = null; + } + } else { + $a[self::FIELD_SUPPORTED_PROFILE][] = $v; + } } } if (null !== ($v = $this->getType())) { - $a[self::FIELD_TYPE] = $v->getValue(); - $a[self::FIELD_TYPE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TYPE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TYPE_EXT] = $enc; + } + } else { + $a[self::FIELD_TYPE] = $v; + } } if (null !== ($v = $this->getUpdateCreate())) { - $a[self::FIELD_UPDATE_CREATE] = $v->getValue(); - $a[self::FIELD_UPDATE_CREATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_UPDATE_CREATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_UPDATE_CREATE_EXT] = $enc; + } + } else { + $a[self::FIELD_UPDATE_CREATE] = $v; + } } if (null !== ($v = $this->getVersioning())) { - $a[self::FIELD_VERSIONING] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VERSIONING] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VERSIONING_EXT] = $enc; + } + } else { + $a[self::FIELD_VERSIONING] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementRest.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementRest.php index 3b19c9333c..f561299ae8 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementRest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementRest.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -82,10 +82,6 @@ class FHIRCapabilityStatementRest extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CAPABILITY_STATEMENT_DOT_REST; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_COMPARTMENT = 'compartment'; const FIELD_COMPARTMENT_EXT = '_compartment'; const FIELD_DOCUMENTATION = 'documentation'; @@ -205,6 +201,9 @@ class FHIRCapabilityStatementRest extends FHIRBackboneElement */ protected $security = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRCapabilityStatementRest Constructor * @param null|array $data @@ -227,17 +226,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_COMPARTMENT])) { foreach($data[self::FIELD_COMPARTMENT] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCanonical) { $this->addCompartment($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addCompartment(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addCompartment(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addCompartment(new FHIRCanonical(array_merge($v, $ext[$i]))); + } } else { $this->addCompartment(new FHIRCanonical($v)); } } } elseif ($data[self::FIELD_COMPARTMENT] instanceof FHIRCanonical) { $this->addCompartment($data[self::FIELD_COMPARTMENT]); - } elseif ($ext && is_scalar($data[self::FIELD_COMPARTMENT])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_COMPARTMENT])) { $this->addCompartment(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $data[self::FIELD_COMPARTMENT]] + $ext)); } else { $this->addCompartment(new FHIRCanonical($data[self::FIELD_COMPARTMENT])); @@ -249,8 +255,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DOCUMENTATION] instanceof FHIRMarkdown) { $this->setDocumentation($data[self::FIELD_DOCUMENTATION]); - } elseif ($ext && is_scalar($data[self::FIELD_DOCUMENTATION])) { - $this->setDocumentation(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_DOCUMENTATION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DOCUMENTATION])) { + $this->setDocumentation(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_DOCUMENTATION]] + $ext)); + } else if (is_array($data[self::FIELD_DOCUMENTATION])) { + $this->setDocumentation(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_DOCUMENTATION]))); + } } else { $this->setDocumentation(new FHIRMarkdown($data[self::FIELD_DOCUMENTATION])); } @@ -258,6 +268,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_INTERACTION])) { if (is_array($data[self::FIELD_INTERACTION])) { foreach($data[self::FIELD_INTERACTION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCapabilityStatementInteraction1) { $this->addInteraction($v); } else { @@ -276,8 +289,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MODE] instanceof FHIRRestfulCapabilityMode) { $this->setMode($data[self::FIELD_MODE]); - } elseif ($ext && is_scalar($data[self::FIELD_MODE])) { - $this->setMode(new FHIRRestfulCapabilityMode([FHIRRestfulCapabilityMode::FIELD_VALUE => $data[self::FIELD_MODE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MODE])) { + $this->setMode(new FHIRRestfulCapabilityMode([FHIRRestfulCapabilityMode::FIELD_VALUE => $data[self::FIELD_MODE]] + $ext)); + } else if (is_array($data[self::FIELD_MODE])) { + $this->setMode(new FHIRRestfulCapabilityMode(array_merge($ext, $data[self::FIELD_MODE]))); + } } else { $this->setMode(new FHIRRestfulCapabilityMode($data[self::FIELD_MODE])); } @@ -285,6 +302,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_OPERATION])) { if (is_array($data[self::FIELD_OPERATION])) { foreach($data[self::FIELD_OPERATION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCapabilityStatementOperation) { $this->addOperation($v); } else { @@ -300,6 +320,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_RESOURCE])) { if (is_array($data[self::FIELD_RESOURCE])) { foreach($data[self::FIELD_RESOURCE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCapabilityStatementResource) { $this->addResource($v); } else { @@ -315,6 +338,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SEARCH_PARAM])) { if (is_array($data[self::FIELD_SEARCH_PARAM])) { foreach($data[self::FIELD_SEARCH_PARAM] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCapabilityStatementSearchParam) { $this->addSearchParam($v); } else { @@ -919,10 +945,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_COMPARTMENT, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getDocumentation())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DOCUMENTATION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getInteraction())) { foreach($vs as $v) { if (null === $v) { @@ -935,7 +961,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getMode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MODE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getOperation())) { foreach($vs as $v) { if (null === $v) { @@ -981,19 +1006,43 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_COMPARTMENT][] = $v->getValue(); - $a[self::FIELD_COMPARTMENT_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_COMPARTMENT][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_COMPARTMENT_EXT][] = $enc; + } else { + $a[self::FIELD_COMPARTMENT_EXT][] = null; + } + } else { + $a[self::FIELD_COMPARTMENT][] = $v; + } } } if (null !== ($v = $this->getDocumentation())) { - $a[self::FIELD_DOCUMENTATION] = $v->getValue(); - $a[self::FIELD_DOCUMENTATION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DOCUMENTATION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DOCUMENTATION_EXT] = $enc; + } + } else { + $a[self::FIELD_DOCUMENTATION] = $v; + } } if ([] !== ($vs = $this->getInteraction())) { $a[self::FIELD_INTERACTION] = $vs; } if (null !== ($v = $this->getMode())) { - $a[self::FIELD_MODE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MODE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MODE_EXT] = $enc; + } + } else { + $a[self::FIELD_MODE] = $v; + } } if ([] !== ($vs = $this->getOperation())) { $a[self::FIELD_OPERATION] = $vs; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementSearchParam.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementSearchParam.php index b8c30bdb8c..becb2fc24b 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementSearchParam.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementSearchParam.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -83,10 +83,6 @@ class FHIRCapabilityStatementSearchParam extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CAPABILITY_STATEMENT_DOT_SEARCH_PARAM; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DEFINITION = 'definition'; const FIELD_DEFINITION_EXT = '_definition'; const FIELD_DOCUMENTATION = 'documentation'; @@ -149,6 +145,9 @@ class FHIRCapabilityStatementSearchParam extends FHIRBackboneElement */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRCapabilityStatementSearchParam Constructor * @param null|array $data @@ -171,8 +170,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DEFINITION] instanceof FHIRCanonical) { $this->setDefinition($data[self::FIELD_DEFINITION]); - } elseif ($ext && is_scalar($data[self::FIELD_DEFINITION])) { - $this->setDefinition(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $data[self::FIELD_DEFINITION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DEFINITION])) { + $this->setDefinition(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $data[self::FIELD_DEFINITION]] + $ext)); + } else if (is_array($data[self::FIELD_DEFINITION])) { + $this->setDefinition(new FHIRCanonical(array_merge($ext, $data[self::FIELD_DEFINITION]))); + } } else { $this->setDefinition(new FHIRCanonical($data[self::FIELD_DEFINITION])); } @@ -183,8 +186,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DOCUMENTATION] instanceof FHIRMarkdown) { $this->setDocumentation($data[self::FIELD_DOCUMENTATION]); - } elseif ($ext && is_scalar($data[self::FIELD_DOCUMENTATION])) { - $this->setDocumentation(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_DOCUMENTATION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DOCUMENTATION])) { + $this->setDocumentation(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_DOCUMENTATION]] + $ext)); + } else if (is_array($data[self::FIELD_DOCUMENTATION])) { + $this->setDocumentation(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_DOCUMENTATION]))); + } } else { $this->setDocumentation(new FHIRMarkdown($data[self::FIELD_DOCUMENTATION])); } @@ -195,8 +202,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -207,8 +218,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TYPE] instanceof FHIRSearchParamType) { $this->setType($data[self::FIELD_TYPE]); - } elseif ($ext && is_scalar($data[self::FIELD_TYPE])) { - $this->setType(new FHIRSearchParamType([FHIRSearchParamType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TYPE])) { + $this->setType(new FHIRSearchParamType([FHIRSearchParamType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } else if (is_array($data[self::FIELD_TYPE])) { + $this->setType(new FHIRSearchParamType(array_merge($ext, $data[self::FIELD_TYPE]))); + } } else { $this->setType(new FHIRSearchParamType($data[self::FIELD_TYPE])); } @@ -506,7 +521,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NAME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -520,19 +534,48 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getDefinition())) { - $a[self::FIELD_DEFINITION] = $v->getValue(); - $a[self::FIELD_DEFINITION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DEFINITION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DEFINITION_EXT] = $enc; + } + } else { + $a[self::FIELD_DEFINITION] = $v; + } } if (null !== ($v = $this->getDocumentation())) { - $a[self::FIELD_DOCUMENTATION] = $v->getValue(); - $a[self::FIELD_DOCUMENTATION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DOCUMENTATION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DOCUMENTATION_EXT] = $enc; + } + } else { + $a[self::FIELD_DOCUMENTATION] = $v; + } } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if (null !== ($v = $this->getType())) { - $a[self::FIELD_TYPE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TYPE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TYPE_EXT] = $enc; + } + } else { + $a[self::FIELD_TYPE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementSecurity.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementSecurity.php index 9dbac9bd88..4aebca14fc 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementSecurity.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementSecurity.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -82,10 +82,6 @@ class FHIRCapabilityStatementSecurity extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CAPABILITY_STATEMENT_DOT_SECURITY; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CORS = 'cors'; const FIELD_CORS_EXT = '_cors'; const FIELD_DESCRIPTION = 'description'; @@ -130,6 +126,9 @@ class FHIRCapabilityStatementSecurity extends FHIRBackboneElement */ protected $service = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRCapabilityStatementSecurity Constructor * @param null|array $data @@ -152,8 +151,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CORS] instanceof FHIRBoolean) { $this->setCors($data[self::FIELD_CORS]); - } elseif ($ext && is_scalar($data[self::FIELD_CORS])) { - $this->setCors(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_CORS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CORS])) { + $this->setCors(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_CORS]] + $ext)); + } else if (is_array($data[self::FIELD_CORS])) { + $this->setCors(new FHIRBoolean(array_merge($ext, $data[self::FIELD_CORS]))); + } } else { $this->setCors(new FHIRBoolean($data[self::FIELD_CORS])); } @@ -164,8 +167,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRMarkdown) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRMarkdown($data[self::FIELD_DESCRIPTION])); } @@ -173,6 +180,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SERVICE])) { if (is_array($data[self::FIELD_SERVICE])) { foreach($data[self::FIELD_SERVICE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addService($v); } else { @@ -452,7 +462,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESCRIPTION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getService())) { foreach($vs as $v) { if (null === $v) { @@ -461,6 +470,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_SERVICE, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } @@ -471,12 +481,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getCors())) { - $a[self::FIELD_CORS] = $v->getValue(); - $a[self::FIELD_CORS_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CORS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CORS_EXT] = $enc; + } + } else { + $a[self::FIELD_CORS] = $v; + } } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if ([] !== ($vs = $this->getService())) { $a[self::FIELD_SERVICE] = $vs; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementSoftware.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementSoftware.php index 4d5946aa0b..960be0f283 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementSoftware.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementSoftware.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -81,10 +81,6 @@ class FHIRCapabilityStatementSoftware extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CAPABILITY_STATEMENT_DOT_SOFTWARE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_NAME = 'name'; const FIELD_NAME_EXT = '_name'; const FIELD_RELEASE_DATE = 'releaseDate'; @@ -128,6 +124,9 @@ class FHIRCapabilityStatementSoftware extends FHIRBackboneElement */ protected $version = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRCapabilityStatementSoftware Constructor * @param null|array $data @@ -150,8 +149,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -162,8 +165,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_RELEASE_DATE] instanceof FHIRDateTime) { $this->setReleaseDate($data[self::FIELD_RELEASE_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_RELEASE_DATE])) { - $this->setReleaseDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_RELEASE_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_RELEASE_DATE])) { + $this->setReleaseDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_RELEASE_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_RELEASE_DATE])) { + $this->setReleaseDate(new FHIRDateTime(array_merge($ext, $data[self::FIELD_RELEASE_DATE]))); + } } else { $this->setReleaseDate(new FHIRDateTime($data[self::FIELD_RELEASE_DATE])); } @@ -174,8 +181,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VERSION] instanceof FHIRString) { $this->setVersion($data[self::FIELD_VERSION]); - } elseif ($ext && is_scalar($data[self::FIELD_VERSION])) { - $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } else if (is_array($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString(array_merge($ext, $data[self::FIELD_VERSION]))); + } } else { $this->setVersion(new FHIRString($data[self::FIELD_VERSION])); } @@ -438,16 +449,37 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if (null !== ($v = $this->getReleaseDate())) { - $a[self::FIELD_RELEASE_DATE] = $v->getValue(); - $a[self::FIELD_RELEASE_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_RELEASE_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_RELEASE_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_RELEASE_DATE] = $v; + } } if (null !== ($v = $this->getVersion())) { - $a[self::FIELD_VERSION] = $v->getValue(); - $a[self::FIELD_VERSION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VERSION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VERSION_EXT] = $enc; + } + } else { + $a[self::FIELD_VERSION] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementSupportedMessage.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementSupportedMessage.php index 246ecf3411..de2db7b838 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementSupportedMessage.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementSupportedMessage.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -81,10 +81,6 @@ class FHIRCapabilityStatementSupportedMessage extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CAPABILITY_STATEMENT_DOT_SUPPORTED_MESSAGE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DEFINITION = 'definition'; const FIELD_DEFINITION_EXT = '_definition'; const FIELD_MODE = 'mode'; @@ -113,6 +109,9 @@ class FHIRCapabilityStatementSupportedMessage extends FHIRBackboneElement */ protected $mode = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRCapabilityStatementSupportedMessage Constructor * @param null|array $data @@ -135,8 +134,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DEFINITION] instanceof FHIRCanonical) { $this->setDefinition($data[self::FIELD_DEFINITION]); - } elseif ($ext && is_scalar($data[self::FIELD_DEFINITION])) { - $this->setDefinition(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $data[self::FIELD_DEFINITION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DEFINITION])) { + $this->setDefinition(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $data[self::FIELD_DEFINITION]] + $ext)); + } else if (is_array($data[self::FIELD_DEFINITION])) { + $this->setDefinition(new FHIRCanonical(array_merge($ext, $data[self::FIELD_DEFINITION]))); + } } else { $this->setDefinition(new FHIRCanonical($data[self::FIELD_DEFINITION])); } @@ -147,8 +150,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MODE] instanceof FHIREventCapabilityMode) { $this->setMode($data[self::FIELD_MODE]); - } elseif ($ext && is_scalar($data[self::FIELD_MODE])) { - $this->setMode(new FHIREventCapabilityMode([FHIREventCapabilityMode::FIELD_VALUE => $data[self::FIELD_MODE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MODE])) { + $this->setMode(new FHIREventCapabilityMode([FHIREventCapabilityMode::FIELD_VALUE => $data[self::FIELD_MODE]] + $ext)); + } else if (is_array($data[self::FIELD_MODE])) { + $this->setMode(new FHIREventCapabilityMode(array_merge($ext, $data[self::FIELD_MODE]))); + } } else { $this->setMode(new FHIREventCapabilityMode($data[self::FIELD_MODE])); } @@ -336,7 +343,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDefinition())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFINITION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getMode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MODE, null, $v->_getFHIRXMLNamespace())); } @@ -350,11 +356,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getDefinition())) { - $a[self::FIELD_DEFINITION] = $v->getValue(); - $a[self::FIELD_DEFINITION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DEFINITION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DEFINITION_EXT] = $enc; + } + } else { + $a[self::FIELD_DEFINITION] = $v; + } } if (null !== ($v = $this->getMode())) { - $a[self::FIELD_MODE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MODE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MODE_EXT] = $enc; + } + } else { + $a[self::FIELD_MODE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRCarePlan/FHIRCarePlanActivity.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRCarePlan/FHIRCarePlanActivity.php index 1efab192ea..f033764d7b 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRCarePlan/FHIRCarePlanActivity.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRCarePlan/FHIRCarePlanActivity.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -81,10 +81,6 @@ class FHIRCarePlanActivity extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CARE_PLAN_DOT_ACTIVITY; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DETAIL = 'detail'; const FIELD_OUTCOME_CODEABLE_CONCEPT = 'outcomeCodeableConcept'; const FIELD_OUTCOME_REFERENCE = 'outcomeReference'; @@ -156,6 +152,9 @@ class FHIRCarePlanActivity extends FHIRBackboneElement */ protected $reference = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRCarePlanActivity Constructor * @param null|array $data @@ -182,6 +181,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_OUTCOME_CODEABLE_CONCEPT])) { if (is_array($data[self::FIELD_OUTCOME_CODEABLE_CONCEPT])) { foreach($data[self::FIELD_OUTCOME_CODEABLE_CONCEPT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addOutcomeCodeableConcept($v); } else { @@ -197,6 +199,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_OUTCOME_REFERENCE])) { if (is_array($data[self::FIELD_OUTCOME_REFERENCE])) { foreach($data[self::FIELD_OUTCOME_REFERENCE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addOutcomeReference($v); } else { @@ -212,6 +217,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PROGRESS])) { if (is_array($data[self::FIELD_PROGRESS])) { foreach($data[self::FIELD_PROGRESS] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRAnnotation) { $this->addProgress($v); } else { @@ -609,11 +617,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getDetail())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DETAIL, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getOutcomeCodeableConcept())) { foreach($vs as $v) { if (null === $v) { diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRCarePlan/FHIRCarePlanDetail.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRCarePlan/FHIRCarePlanDetail.php index 66d1048d97..392c1347f8 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRCarePlan/FHIRCarePlanDetail.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRCarePlan/FHIRCarePlanDetail.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -89,10 +89,6 @@ class FHIRCarePlanDetail extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CARE_PLAN_DOT_DETAIL; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CODE = 'code'; const FIELD_DAILY_AMOUNT = 'dailyAmount'; const FIELD_DAILY_AMOUNT_EXT = '_dailyAmount'; @@ -379,6 +375,9 @@ class FHIRCarePlanDetail extends FHIRBackboneElement */ protected $statusReason = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRCarePlanDetail Constructor * @param null|array $data @@ -408,8 +407,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DAILY_AMOUNT] instanceof FHIRQuantity) { $this->setDailyAmount($data[self::FIELD_DAILY_AMOUNT]); - } elseif ($ext && is_scalar($data[self::FIELD_DAILY_AMOUNT])) { - $this->setDailyAmount(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_DAILY_AMOUNT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DAILY_AMOUNT])) { + $this->setDailyAmount(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_DAILY_AMOUNT]] + $ext)); + } else if (is_array($data[self::FIELD_DAILY_AMOUNT])) { + $this->setDailyAmount(new FHIRQuantity(array_merge($ext, $data[self::FIELD_DAILY_AMOUNT]))); + } } else { $this->setDailyAmount(new FHIRQuantity($data[self::FIELD_DAILY_AMOUNT])); } @@ -420,8 +423,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -432,8 +439,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DO_NOT_PERFORM] instanceof FHIRBoolean) { $this->setDoNotPerform($data[self::FIELD_DO_NOT_PERFORM]); - } elseif ($ext && is_scalar($data[self::FIELD_DO_NOT_PERFORM])) { - $this->setDoNotPerform(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_DO_NOT_PERFORM]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DO_NOT_PERFORM])) { + $this->setDoNotPerform(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_DO_NOT_PERFORM]] + $ext)); + } else if (is_array($data[self::FIELD_DO_NOT_PERFORM])) { + $this->setDoNotPerform(new FHIRBoolean(array_merge($ext, $data[self::FIELD_DO_NOT_PERFORM]))); + } } else { $this->setDoNotPerform(new FHIRBoolean($data[self::FIELD_DO_NOT_PERFORM])); } @@ -441,6 +452,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_GOAL])) { if (is_array($data[self::FIELD_GOAL])) { foreach($data[self::FIELD_GOAL] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addGoal($v); } else { @@ -459,17 +473,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_INSTANTIATES_CANONICAL])) { foreach($data[self::FIELD_INSTANTIATES_CANONICAL] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCanonical) { $this->addInstantiatesCanonical($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addInstantiatesCanonical(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addInstantiatesCanonical(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addInstantiatesCanonical(new FHIRCanonical(array_merge($v, $ext[$i]))); + } } else { $this->addInstantiatesCanonical(new FHIRCanonical($v)); } } } elseif ($data[self::FIELD_INSTANTIATES_CANONICAL] instanceof FHIRCanonical) { $this->addInstantiatesCanonical($data[self::FIELD_INSTANTIATES_CANONICAL]); - } elseif ($ext && is_scalar($data[self::FIELD_INSTANTIATES_CANONICAL])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_INSTANTIATES_CANONICAL])) { $this->addInstantiatesCanonical(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $data[self::FIELD_INSTANTIATES_CANONICAL]] + $ext)); } else { $this->addInstantiatesCanonical(new FHIRCanonical($data[self::FIELD_INSTANTIATES_CANONICAL])); @@ -481,17 +502,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_INSTANTIATES_URI])) { foreach($data[self::FIELD_INSTANTIATES_URI] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRUri) { $this->addInstantiatesUri($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addInstantiatesUri(new FHIRUri([FHIRUri::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addInstantiatesUri(new FHIRUri([FHIRUri::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addInstantiatesUri(new FHIRUri(array_merge($v, $ext[$i]))); + } } else { $this->addInstantiatesUri(new FHIRUri($v)); } } } elseif ($data[self::FIELD_INSTANTIATES_URI] instanceof FHIRUri) { $this->addInstantiatesUri($data[self::FIELD_INSTANTIATES_URI]); - } elseif ($ext && is_scalar($data[self::FIELD_INSTANTIATES_URI])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_INSTANTIATES_URI])) { $this->addInstantiatesUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_INSTANTIATES_URI]] + $ext)); } else { $this->addInstantiatesUri(new FHIRUri($data[self::FIELD_INSTANTIATES_URI])); @@ -503,8 +531,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_KIND] instanceof FHIRCarePlanActivityKind) { $this->setKind($data[self::FIELD_KIND]); - } elseif ($ext && is_scalar($data[self::FIELD_KIND])) { - $this->setKind(new FHIRCarePlanActivityKind([FHIRCarePlanActivityKind::FIELD_VALUE => $data[self::FIELD_KIND]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_KIND])) { + $this->setKind(new FHIRCarePlanActivityKind([FHIRCarePlanActivityKind::FIELD_VALUE => $data[self::FIELD_KIND]] + $ext)); + } else if (is_array($data[self::FIELD_KIND])) { + $this->setKind(new FHIRCarePlanActivityKind(array_merge($ext, $data[self::FIELD_KIND]))); + } } else { $this->setKind(new FHIRCarePlanActivityKind($data[self::FIELD_KIND])); } @@ -519,6 +551,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PERFORMER])) { if (is_array($data[self::FIELD_PERFORMER])) { foreach($data[self::FIELD_PERFORMER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addPerformer($v); } else { @@ -551,8 +586,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_QUANTITY] instanceof FHIRQuantity) { $this->setQuantity($data[self::FIELD_QUANTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_QUANTITY])) { - $this->setQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_QUANTITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_QUANTITY])) { + $this->setQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_QUANTITY])) { + $this->setQuantity(new FHIRQuantity(array_merge($ext, $data[self::FIELD_QUANTITY]))); + } } else { $this->setQuantity(new FHIRQuantity($data[self::FIELD_QUANTITY])); } @@ -560,6 +599,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REASON_CODE])) { if (is_array($data[self::FIELD_REASON_CODE])) { foreach($data[self::FIELD_REASON_CODE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addReasonCode($v); } else { @@ -575,6 +617,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REASON_REFERENCE])) { if (is_array($data[self::FIELD_REASON_REFERENCE])) { foreach($data[self::FIELD_REASON_REFERENCE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addReasonReference($v); } else { @@ -600,8 +645,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SCHEDULED_STRING] instanceof FHIRString) { $this->setScheduledString($data[self::FIELD_SCHEDULED_STRING]); - } elseif ($ext && is_scalar($data[self::FIELD_SCHEDULED_STRING])) { - $this->setScheduledString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SCHEDULED_STRING]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SCHEDULED_STRING])) { + $this->setScheduledString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SCHEDULED_STRING]] + $ext)); + } else if (is_array($data[self::FIELD_SCHEDULED_STRING])) { + $this->setScheduledString(new FHIRString(array_merge($ext, $data[self::FIELD_SCHEDULED_STRING]))); + } } else { $this->setScheduledString(new FHIRString($data[self::FIELD_SCHEDULED_STRING])); } @@ -619,8 +668,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRCarePlanActivityStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRCarePlanActivityStatus([FHIRCarePlanActivityStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRCarePlanActivityStatus([FHIRCarePlanActivityStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRCarePlanActivityStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRCarePlanActivityStatus($data[self::FIELD_STATUS])); } @@ -1697,11 +1750,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDailyAmount())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DAILY_AMOUNT, null, $v->_getFHIRXMLNamespace())); } @@ -1711,7 +1762,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDoNotPerform())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DO_NOT_PERFORM, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getGoal())) { foreach($vs as $v) { if (null === $v) { @@ -1720,6 +1770,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_GOAL, null, $v->_getFHIRXMLNamespace())); } } + if ([] !== ($vs = $this->getInstantiatesCanonical())) { foreach($vs as $v) { if (null === $v) { @@ -1728,6 +1779,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_INSTANTIATES_CANONICAL, null, $v->_getFHIRXMLNamespace())); } } + if ([] !== ($vs = $this->getInstantiatesUri())) { foreach($vs as $v) { if (null === $v) { @@ -1740,11 +1792,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getKind())) { $v->xmlSerialize($sxe->addChild(self::FIELD_KIND, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getLocation())) { $v->xmlSerialize($sxe->addChild(self::FIELD_LOCATION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getPerformer())) { foreach($vs as $v) { if (null === $v) { @@ -1757,15 +1807,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getProductCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PRODUCT_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getProductReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PRODUCT_REFERENCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_QUANTITY, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getReasonCode())) { foreach($vs as $v) { if (null === $v) { @@ -1790,15 +1837,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getScheduledString())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SCHEDULED_STRING, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getScheduledTiming())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SCHEDULED_TIMING, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatusReason())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS_REASON, null, $v->_getFHIRXMLNamespace())); } @@ -1815,15 +1859,37 @@ public function jsonSerialize() $a[self::FIELD_CODE] = $v; } if (null !== ($v = $this->getDailyAmount())) { - $a[self::FIELD_DAILY_AMOUNT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DAILY_AMOUNT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DAILY_AMOUNT_EXT] = $enc; + } + } else { + $a[self::FIELD_DAILY_AMOUNT] = $v; + } } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if (null !== ($v = $this->getDoNotPerform())) { - $a[self::FIELD_DO_NOT_PERFORM] = $v->getValue(); - $a[self::FIELD_DO_NOT_PERFORM_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DO_NOT_PERFORM] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DO_NOT_PERFORM_EXT] = $enc; + } + } else { + $a[self::FIELD_DO_NOT_PERFORM] = $v; + } } if ([] !== ($vs = $this->getGoal())) { $a[self::FIELD_GOAL] = $vs; @@ -1834,8 +1900,17 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_INSTANTIATES_CANONICAL][] = $v->getValue(); - $a[self::FIELD_INSTANTIATES_CANONICAL_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_INSTANTIATES_CANONICAL][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_INSTANTIATES_CANONICAL_EXT][] = $enc; + } else { + $a[self::FIELD_INSTANTIATES_CANONICAL_EXT][] = null; + } + } else { + $a[self::FIELD_INSTANTIATES_CANONICAL][] = $v; + } } } if ([] !== ($vs = $this->getInstantiatesUri())) { @@ -1844,12 +1919,29 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_INSTANTIATES_URI][] = $v->getValue(); - $a[self::FIELD_INSTANTIATES_URI_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_INSTANTIATES_URI][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_INSTANTIATES_URI_EXT][] = $enc; + } else { + $a[self::FIELD_INSTANTIATES_URI_EXT][] = null; + } + } else { + $a[self::FIELD_INSTANTIATES_URI][] = $v; + } } } if (null !== ($v = $this->getKind())) { - $a[self::FIELD_KIND] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_KIND] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_KIND_EXT] = $enc; + } + } else { + $a[self::FIELD_KIND] = $v; + } } if (null !== ($v = $this->getLocation())) { $a[self::FIELD_LOCATION] = $v; @@ -1864,7 +1956,15 @@ public function jsonSerialize() $a[self::FIELD_PRODUCT_REFERENCE] = $v; } if (null !== ($v = $this->getQuantity())) { - $a[self::FIELD_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_QUANTITY] = $v; + } } if ([] !== ($vs = $this->getReasonCode())) { $a[self::FIELD_REASON_CODE] = $vs; @@ -1876,14 +1976,29 @@ public function jsonSerialize() $a[self::FIELD_SCHEDULED_PERIOD] = $v; } if (null !== ($v = $this->getScheduledString())) { - $a[self::FIELD_SCHEDULED_STRING] = $v->getValue(); - $a[self::FIELD_SCHEDULED_STRING_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SCHEDULED_STRING] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SCHEDULED_STRING_EXT] = $enc; + } + } else { + $a[self::FIELD_SCHEDULED_STRING] = $v; + } } if (null !== ($v = $this->getScheduledTiming())) { $a[self::FIELD_SCHEDULED_TIMING] = $v; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getStatusReason())) { $a[self::FIELD_STATUS_REASON] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRCareTeam/FHIRCareTeamParticipant.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRCareTeam/FHIRCareTeamParticipant.php index 0271b7be09..bc40b63b0d 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRCareTeam/FHIRCareTeamParticipant.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRCareTeam/FHIRCareTeamParticipant.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRCareTeamParticipant extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CARE_TEAM_DOT_PARTICIPANT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_MEMBER = 'member'; const FIELD_ON_BEHALF_OF = 'onBehalfOf'; const FIELD_PERIOD = 'period'; @@ -137,6 +133,9 @@ class FHIRCareTeamParticipant extends FHIRBackboneElement */ protected $role = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRCareTeamParticipant Constructor * @param null|array $data @@ -177,6 +176,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ROLE])) { if (is_array($data[self::FIELD_ROLE])) { foreach($data[self::FIELD_ROLE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addRole($v); } else { @@ -460,19 +462,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getMember())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MEMBER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOnBehalfOf())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ON_BEHALF_OF, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getRole())) { foreach($vs as $v) { if (null === $v) { @@ -481,6 +479,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_ROLE, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRCatalogEntry/FHIRCatalogEntryRelatedEntry.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRCatalogEntry/FHIRCatalogEntryRelatedEntry.php index ab0e07aa4a..797b6e7fe4 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRCatalogEntry/FHIRCatalogEntryRelatedEntry.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRCatalogEntry/FHIRCatalogEntryRelatedEntry.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRCatalogEntryRelatedEntry extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CATALOG_ENTRY_DOT_RELATED_ENTRY; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ITEM = 'item'; const FIELD_RELATIONTYPE = 'relationtype'; const FIELD_RELATIONTYPE_EXT = '_relationtype'; @@ -108,6 +104,9 @@ class FHIRCatalogEntryRelatedEntry extends FHIRBackboneElement */ protected $relationtype = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRCatalogEntryRelatedEntry Constructor * @param null|array $data @@ -137,8 +136,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_RELATIONTYPE] instanceof FHIRCatalogEntryRelationType) { $this->setRelationtype($data[self::FIELD_RELATIONTYPE]); - } elseif ($ext && is_scalar($data[self::FIELD_RELATIONTYPE])) { - $this->setRelationtype(new FHIRCatalogEntryRelationType([FHIRCatalogEntryRelationType::FIELD_VALUE => $data[self::FIELD_RELATIONTYPE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_RELATIONTYPE])) { + $this->setRelationtype(new FHIRCatalogEntryRelationType([FHIRCatalogEntryRelationType::FIELD_VALUE => $data[self::FIELD_RELATIONTYPE]] + $ext)); + } else if (is_array($data[self::FIELD_RELATIONTYPE])) { + $this->setRelationtype(new FHIRCatalogEntryRelationType(array_merge($ext, $data[self::FIELD_RELATIONTYPE]))); + } } else { $this->setRelationtype(new FHIRCatalogEntryRelationType($data[self::FIELD_RELATIONTYPE])); } @@ -310,11 +313,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getItem())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ITEM, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRelationtype())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RELATIONTYPE, null, $v->_getFHIRXMLNamespace())); } @@ -331,7 +332,15 @@ public function jsonSerialize() $a[self::FIELD_ITEM] = $v; } if (null !== ($v = $this->getRelationtype())) { - $a[self::FIELD_RELATIONTYPE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_RELATIONTYPE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_RELATIONTYPE_EXT] = $enc; + } + } else { + $a[self::FIELD_RELATIONTYPE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRChargeItem/FHIRChargeItemPerformer.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRChargeItem/FHIRChargeItemPerformer.php index 3ec10eb45b..8300347838 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRChargeItem/FHIRChargeItemPerformer.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRChargeItem/FHIRChargeItemPerformer.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -82,10 +82,6 @@ class FHIRChargeItemPerformer extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CHARGE_ITEM_DOT_PERFORMER; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ACTOR = 'actor'; const FIELD_FUNCTION = 'function'; @@ -113,6 +109,9 @@ class FHIRChargeItemPerformer extends FHIRBackboneElement */ protected $function = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRChargeItemPerformer Constructor * @param null|array $data @@ -314,11 +313,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getActor())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ACTOR, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getFunction())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FUNCTION, null, $v->_getFHIRXMLNamespace())); } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRChargeItemDefinition/FHIRChargeItemDefinitionApplicability.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRChargeItemDefinition/FHIRChargeItemDefinitionApplicability.php index db532e9977..730d7616eb 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRChargeItemDefinition/FHIRChargeItemDefinitionApplicability.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRChargeItemDefinition/FHIRChargeItemDefinitionApplicability.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRChargeItemDefinitionApplicability extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CHARGE_ITEM_DEFINITION_DOT_APPLICABILITY; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DESCRIPTION = 'description'; const FIELD_DESCRIPTION_EXT = '_description'; const FIELD_EXPRESSION = 'expression'; @@ -129,6 +125,9 @@ class FHIRChargeItemDefinitionApplicability extends FHIRBackboneElement */ protected $language = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRChargeItemDefinitionApplicability Constructor * @param null|array $data @@ -151,8 +150,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -163,8 +166,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EXPRESSION] instanceof FHIRString) { $this->setExpression($data[self::FIELD_EXPRESSION]); - } elseif ($ext && is_scalar($data[self::FIELD_EXPRESSION])) { - $this->setExpression(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_EXPRESSION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EXPRESSION])) { + $this->setExpression(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_EXPRESSION]] + $ext)); + } else if (is_array($data[self::FIELD_EXPRESSION])) { + $this->setExpression(new FHIRString(array_merge($ext, $data[self::FIELD_EXPRESSION]))); + } } else { $this->setExpression(new FHIRString($data[self::FIELD_EXPRESSION])); } @@ -175,8 +182,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_LANGUAGE] instanceof FHIRString) { $this->setLanguage($data[self::FIELD_LANGUAGE]); - } elseif ($ext && is_scalar($data[self::FIELD_LANGUAGE])) { - $this->setLanguage(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_LANGUAGE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_LANGUAGE])) { + $this->setLanguage(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_LANGUAGE]] + $ext)); + } else if (is_array($data[self::FIELD_LANGUAGE])) { + $this->setLanguage(new FHIRString(array_merge($ext, $data[self::FIELD_LANGUAGE]))); + } } else { $this->setLanguage(new FHIRString($data[self::FIELD_LANGUAGE])); } @@ -443,16 +454,37 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if (null !== ($v = $this->getExpression())) { - $a[self::FIELD_EXPRESSION] = $v->getValue(); - $a[self::FIELD_EXPRESSION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EXPRESSION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EXPRESSION_EXT] = $enc; + } + } else { + $a[self::FIELD_EXPRESSION] = $v; + } } if (null !== ($v = $this->getLanguage())) { - $a[self::FIELD_LANGUAGE] = $v->getValue(); - $a[self::FIELD_LANGUAGE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_LANGUAGE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_LANGUAGE_EXT] = $enc; + } + } else { + $a[self::FIELD_LANGUAGE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRChargeItemDefinition/FHIRChargeItemDefinitionPriceComponent.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRChargeItemDefinition/FHIRChargeItemDefinitionPriceComponent.php index aa8b2a1720..c55fa13617 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRChargeItemDefinition/FHIRChargeItemDefinitionPriceComponent.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRChargeItemDefinition/FHIRChargeItemDefinitionPriceComponent.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -83,10 +83,6 @@ class FHIRChargeItemDefinitionPriceComponent extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CHARGE_ITEM_DEFINITION_DOT_PRICE_COMPONENT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_AMOUNT = 'amount'; const FIELD_AMOUNT_EXT = '_amount'; const FIELD_CODE = 'code'; @@ -142,6 +138,9 @@ class FHIRChargeItemDefinitionPriceComponent extends FHIRBackboneElement */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRChargeItemDefinitionPriceComponent Constructor * @param null|array $data @@ -164,8 +163,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_AMOUNT] instanceof FHIRMoney) { $this->setAmount($data[self::FIELD_AMOUNT]); - } elseif ($ext && is_scalar($data[self::FIELD_AMOUNT])) { - $this->setAmount(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_AMOUNT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_AMOUNT])) { + $this->setAmount(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_AMOUNT]] + $ext)); + } else if (is_array($data[self::FIELD_AMOUNT])) { + $this->setAmount(new FHIRMoney(array_merge($ext, $data[self::FIELD_AMOUNT]))); + } } else { $this->setAmount(new FHIRMoney($data[self::FIELD_AMOUNT])); } @@ -183,8 +186,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_FACTOR] instanceof FHIRDecimal) { $this->setFactor($data[self::FIELD_FACTOR]); - } elseif ($ext && is_scalar($data[self::FIELD_FACTOR])) { - $this->setFactor(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_FACTOR]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_FACTOR])) { + $this->setFactor(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_FACTOR]] + $ext)); + } else if (is_array($data[self::FIELD_FACTOR])) { + $this->setFactor(new FHIRDecimal(array_merge($ext, $data[self::FIELD_FACTOR]))); + } } else { $this->setFactor(new FHIRDecimal($data[self::FIELD_FACTOR])); } @@ -195,8 +202,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TYPE] instanceof FHIRInvoicePriceComponentType) { $this->setType($data[self::FIELD_TYPE]); - } elseif ($ext && is_scalar($data[self::FIELD_TYPE])) { - $this->setType(new FHIRInvoicePriceComponentType([FHIRInvoicePriceComponentType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TYPE])) { + $this->setType(new FHIRInvoicePriceComponentType([FHIRInvoicePriceComponentType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } else if (is_array($data[self::FIELD_TYPE])) { + $this->setType(new FHIRInvoicePriceComponentType(array_merge($ext, $data[self::FIELD_TYPE]))); + } } else { $this->setType(new FHIRInvoicePriceComponentType($data[self::FIELD_TYPE])); } @@ -451,18 +462,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getAmount())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AMOUNT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getFactor())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FACTOR, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -476,17 +484,40 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getAmount())) { - $a[self::FIELD_AMOUNT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_AMOUNT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_AMOUNT_EXT] = $enc; + } + } else { + $a[self::FIELD_AMOUNT] = $v; + } } if (null !== ($v = $this->getCode())) { $a[self::FIELD_CODE] = $v; } if (null !== ($v = $this->getFactor())) { - $a[self::FIELD_FACTOR] = $v->getValue(); - $a[self::FIELD_FACTOR_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FACTOR] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FACTOR_EXT] = $enc; + } + } else { + $a[self::FIELD_FACTOR] = $v; + } } if (null !== ($v = $this->getType())) { - $a[self::FIELD_TYPE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TYPE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TYPE_EXT] = $enc; + } + } else { + $a[self::FIELD_TYPE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRChargeItemDefinition/FHIRChargeItemDefinitionPropertyGroup.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRChargeItemDefinition/FHIRChargeItemDefinitionPropertyGroup.php index 91cf6ce34f..0496e2ba84 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRChargeItemDefinition/FHIRChargeItemDefinitionPropertyGroup.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRChargeItemDefinition/FHIRChargeItemDefinitionPropertyGroup.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRChargeItemDefinitionPropertyGroup extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CHARGE_ITEM_DEFINITION_DOT_PROPERTY_GROUP; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_APPLICABILITY = 'applicability'; const FIELD_PRICE_COMPONENT = 'priceComponent'; @@ -115,6 +111,9 @@ class FHIRChargeItemDefinitionPropertyGroup extends FHIRBackboneElement */ protected $priceComponent = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRChargeItemDefinitionPropertyGroup Constructor * @param null|array $data @@ -134,6 +133,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_APPLICABILITY])) { if (is_array($data[self::FIELD_APPLICABILITY])) { foreach($data[self::FIELD_APPLICABILITY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRChargeItemDefinitionApplicability) { $this->addApplicability($v); } else { @@ -149,6 +151,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PRICE_COMPONENT])) { if (is_array($data[self::FIELD_PRICE_COMPONENT])) { foreach($data[self::FIELD_PRICE_COMPONENT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRChargeItemDefinitionPriceComponent) { $this->addPriceComponent($v); } else { @@ -405,7 +410,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getApplicability())) { foreach($vs as $v) { if (null === $v) { @@ -423,6 +427,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_PRICE_COMPONENT, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimAccident.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimAccident.php index d9f0a0967c..e4b3926e6d 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimAccident.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimAccident.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -82,10 +82,6 @@ class FHIRClaimAccident extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CLAIM_DOT_ACCIDENT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DATE = 'date'; const FIELD_DATE_EXT = '_date'; const FIELD_LOCATION_ADDRESS = 'locationAddress'; @@ -147,6 +143,9 @@ class FHIRClaimAccident extends FHIRBackboneElement */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRClaimAccident Constructor * @param null|array $data @@ -169,8 +168,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATE] instanceof FHIRDate) { $this->setDate($data[self::FIELD_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_DATE])) { - $this->setDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDate(array_merge($ext, $data[self::FIELD_DATE]))); + } } else { $this->setDate(new FHIRDate($data[self::FIELD_DATE])); } @@ -465,15 +468,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DATE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getLocationAddress())) { $v->xmlSerialize($sxe->addChild(self::FIELD_LOCATION_ADDRESS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getLocationReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_LOCATION_REFERENCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -487,8 +487,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getDate())) { - $a[self::FIELD_DATE] = $v->getValue(); - $a[self::FIELD_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_DATE] = $v; + } } if (null !== ($v = $this->getLocationAddress())) { $a[self::FIELD_LOCATION_ADDRESS] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimCareTeam.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimCareTeam.php index 0c88890868..44f01990e7 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimCareTeam.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimCareTeam.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -82,10 +82,6 @@ class FHIRClaimCareTeam extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CLAIM_DOT_CARE_TEAM; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_PROVIDER = 'provider'; const FIELD_QUALIFICATION = 'qualification'; const FIELD_RESPONSIBLE = 'responsible'; @@ -152,6 +148,9 @@ class FHIRClaimCareTeam extends FHIRBackboneElement */ protected $sequence = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRClaimCareTeam Constructor * @param null|array $data @@ -188,8 +187,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_RESPONSIBLE] instanceof FHIRBoolean) { $this->setResponsible($data[self::FIELD_RESPONSIBLE]); - } elseif ($ext && is_scalar($data[self::FIELD_RESPONSIBLE])) { - $this->setResponsible(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_RESPONSIBLE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_RESPONSIBLE])) { + $this->setResponsible(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_RESPONSIBLE]] + $ext)); + } else if (is_array($data[self::FIELD_RESPONSIBLE])) { + $this->setResponsible(new FHIRBoolean(array_merge($ext, $data[self::FIELD_RESPONSIBLE]))); + } } else { $this->setResponsible(new FHIRBoolean($data[self::FIELD_RESPONSIBLE])); } @@ -207,8 +210,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SEQUENCE] instanceof FHIRPositiveInt) { $this->setSequence($data[self::FIELD_SEQUENCE]); - } elseif ($ext && is_scalar($data[self::FIELD_SEQUENCE])) { - $this->setSequence(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_SEQUENCE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SEQUENCE])) { + $this->setSequence(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_SEQUENCE]] + $ext)); + } else if (is_array($data[self::FIELD_SEQUENCE])) { + $this->setSequence(new FHIRPositiveInt(array_merge($ext, $data[self::FIELD_SEQUENCE]))); + } } else { $this->setSequence(new FHIRPositiveInt($data[self::FIELD_SEQUENCE])); } @@ -507,18 +514,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getProvider())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PROVIDER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getQualification())) { $v->xmlSerialize($sxe->addChild(self::FIELD_QUALIFICATION, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getResponsible())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RESPONSIBLE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRole())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ROLE, null, $v->_getFHIRXMLNamespace())); } @@ -541,15 +545,29 @@ public function jsonSerialize() $a[self::FIELD_QUALIFICATION] = $v; } if (null !== ($v = $this->getResponsible())) { - $a[self::FIELD_RESPONSIBLE] = $v->getValue(); - $a[self::FIELD_RESPONSIBLE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_RESPONSIBLE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_RESPONSIBLE_EXT] = $enc; + } + } else { + $a[self::FIELD_RESPONSIBLE] = $v; + } } if (null !== ($v = $this->getRole())) { $a[self::FIELD_ROLE] = $v; } if (null !== ($v = $this->getSequence())) { - $a[self::FIELD_SEQUENCE] = $v->getValue(); - $a[self::FIELD_SEQUENCE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SEQUENCE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SEQUENCE_EXT] = $enc; + } + } else { + $a[self::FIELD_SEQUENCE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimDetail.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimDetail.php index 28b1df7f96..f5cfc3bae6 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimDetail.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimDetail.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -84,10 +84,6 @@ class FHIRClaimDetail extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CLAIM_DOT_DETAIL; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CATEGORY = 'category'; const FIELD_FACTOR = 'factor'; const FIELD_FACTOR_EXT = '_factor'; @@ -255,6 +251,9 @@ class FHIRClaimDetail extends FHIRBackboneElement */ protected $unitPrice = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRClaimDetail Constructor * @param null|array $data @@ -284,8 +283,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_FACTOR] instanceof FHIRDecimal) { $this->setFactor($data[self::FIELD_FACTOR]); - } elseif ($ext && is_scalar($data[self::FIELD_FACTOR])) { - $this->setFactor(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_FACTOR]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_FACTOR])) { + $this->setFactor(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_FACTOR]] + $ext)); + } else if (is_array($data[self::FIELD_FACTOR])) { + $this->setFactor(new FHIRDecimal(array_merge($ext, $data[self::FIELD_FACTOR]))); + } } else { $this->setFactor(new FHIRDecimal($data[self::FIELD_FACTOR])); } @@ -293,6 +296,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_MODIFIER])) { if (is_array($data[self::FIELD_MODIFIER])) { foreach($data[self::FIELD_MODIFIER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addModifier($v); } else { @@ -311,8 +317,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NET] instanceof FHIRMoney) { $this->setNet($data[self::FIELD_NET]); - } elseif ($ext && is_scalar($data[self::FIELD_NET])) { - $this->setNet(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_NET]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NET])) { + $this->setNet(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_NET]] + $ext)); + } else if (is_array($data[self::FIELD_NET])) { + $this->setNet(new FHIRMoney(array_merge($ext, $data[self::FIELD_NET]))); + } } else { $this->setNet(new FHIRMoney($data[self::FIELD_NET])); } @@ -327,6 +337,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PROGRAM_CODE])) { if (is_array($data[self::FIELD_PROGRAM_CODE])) { foreach($data[self::FIELD_PROGRAM_CODE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addProgramCode($v); } else { @@ -345,8 +358,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_QUANTITY] instanceof FHIRQuantity) { $this->setQuantity($data[self::FIELD_QUANTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_QUANTITY])) { - $this->setQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_QUANTITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_QUANTITY])) { + $this->setQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_QUANTITY])) { + $this->setQuantity(new FHIRQuantity(array_merge($ext, $data[self::FIELD_QUANTITY]))); + } } else { $this->setQuantity(new FHIRQuantity($data[self::FIELD_QUANTITY])); } @@ -364,8 +381,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SEQUENCE] instanceof FHIRPositiveInt) { $this->setSequence($data[self::FIELD_SEQUENCE]); - } elseif ($ext && is_scalar($data[self::FIELD_SEQUENCE])) { - $this->setSequence(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_SEQUENCE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SEQUENCE])) { + $this->setSequence(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_SEQUENCE]] + $ext)); + } else if (is_array($data[self::FIELD_SEQUENCE])) { + $this->setSequence(new FHIRPositiveInt(array_merge($ext, $data[self::FIELD_SEQUENCE]))); + } } else { $this->setSequence(new FHIRPositiveInt($data[self::FIELD_SEQUENCE])); } @@ -373,6 +394,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SUB_DETAIL])) { if (is_array($data[self::FIELD_SUB_DETAIL])) { foreach($data[self::FIELD_SUB_DETAIL] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRClaimSubDetail) { $this->addSubDetail($v); } else { @@ -388,6 +412,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_UDI])) { if (is_array($data[self::FIELD_UDI])) { foreach($data[self::FIELD_UDI] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addUdi($v); } else { @@ -406,8 +433,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_UNIT_PRICE] instanceof FHIRMoney) { $this->setUnitPrice($data[self::FIELD_UNIT_PRICE]); - } elseif ($ext && is_scalar($data[self::FIELD_UNIT_PRICE])) { - $this->setUnitPrice(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_UNIT_PRICE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_UNIT_PRICE])) { + $this->setUnitPrice(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_UNIT_PRICE]] + $ext)); + } else if (is_array($data[self::FIELD_UNIT_PRICE])) { + $this->setUnitPrice(new FHIRMoney(array_merge($ext, $data[self::FIELD_UNIT_PRICE]))); + } } else { $this->setUnitPrice(new FHIRMoney($data[self::FIELD_UNIT_PRICE])); } @@ -1081,14 +1112,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getCategory())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CATEGORY, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getFactor())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FACTOR, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getModifier())) { foreach($vs as $v) { if (null === $v) { @@ -1101,11 +1130,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getNet())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NET, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getProductOrService())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PRODUCT_OR_SERVICE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getProgramCode())) { foreach($vs as $v) { if (null === $v) { @@ -1118,14 +1145,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_QUANTITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRevenue())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REVENUE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getSequence())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SEQUENCE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getSubDetail())) { foreach($vs as $v) { if (null === $v) { @@ -1160,14 +1185,29 @@ public function jsonSerialize() $a[self::FIELD_CATEGORY] = $v; } if (null !== ($v = $this->getFactor())) { - $a[self::FIELD_FACTOR] = $v->getValue(); - $a[self::FIELD_FACTOR_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FACTOR] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FACTOR_EXT] = $enc; + } + } else { + $a[self::FIELD_FACTOR] = $v; + } } if ([] !== ($vs = $this->getModifier())) { $a[self::FIELD_MODIFIER] = $vs; } if (null !== ($v = $this->getNet())) { - $a[self::FIELD_NET] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NET] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NET_EXT] = $enc; + } + } else { + $a[self::FIELD_NET] = $v; + } } if (null !== ($v = $this->getProductOrService())) { $a[self::FIELD_PRODUCT_OR_SERVICE] = $v; @@ -1176,14 +1216,29 @@ public function jsonSerialize() $a[self::FIELD_PROGRAM_CODE] = $vs; } if (null !== ($v = $this->getQuantity())) { - $a[self::FIELD_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_QUANTITY] = $v; + } } if (null !== ($v = $this->getRevenue())) { $a[self::FIELD_REVENUE] = $v; } if (null !== ($v = $this->getSequence())) { - $a[self::FIELD_SEQUENCE] = $v->getValue(); - $a[self::FIELD_SEQUENCE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SEQUENCE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SEQUENCE_EXT] = $enc; + } + } else { + $a[self::FIELD_SEQUENCE] = $v; + } } if ([] !== ($vs = $this->getSubDetail())) { $a[self::FIELD_SUB_DETAIL] = $vs; @@ -1192,7 +1247,15 @@ public function jsonSerialize() $a[self::FIELD_UDI] = $vs; } if (null !== ($v = $this->getUnitPrice())) { - $a[self::FIELD_UNIT_PRICE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_UNIT_PRICE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_UNIT_PRICE_EXT] = $enc; + } + } else { + $a[self::FIELD_UNIT_PRICE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimDiagnosis.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimDiagnosis.php index 68162fbeb9..3d039b6a0e 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimDiagnosis.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimDiagnosis.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -81,10 +81,6 @@ class FHIRClaimDiagnosis extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CLAIM_DOT_DIAGNOSIS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DIAGNOSIS_CODEABLE_CONCEPT = 'diagnosisCodeableConcept'; const FIELD_DIAGNOSIS_REFERENCE = 'diagnosisReference'; const FIELD_ON_ADMISSION = 'onAdmission'; @@ -167,6 +163,9 @@ class FHIRClaimDiagnosis extends FHIRBackboneElement */ protected $type = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRClaimDiagnosis Constructor * @param null|array $data @@ -217,8 +216,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SEQUENCE] instanceof FHIRPositiveInt) { $this->setSequence($data[self::FIELD_SEQUENCE]); - } elseif ($ext && is_scalar($data[self::FIELD_SEQUENCE])) { - $this->setSequence(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_SEQUENCE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SEQUENCE])) { + $this->setSequence(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_SEQUENCE]] + $ext)); + } else if (is_array($data[self::FIELD_SEQUENCE])) { + $this->setSequence(new FHIRPositiveInt(array_merge($ext, $data[self::FIELD_SEQUENCE]))); + } } else { $this->setSequence(new FHIRPositiveInt($data[self::FIELD_SEQUENCE])); } @@ -226,6 +229,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_TYPE])) { if (is_array($data[self::FIELD_TYPE])) { foreach($data[self::FIELD_TYPE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addType($v); } else { @@ -593,26 +599,21 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getDiagnosisCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DIAGNOSIS_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDiagnosisReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DIAGNOSIS_REFERENCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOnAdmission())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ON_ADMISSION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPackageCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PACKAGE_CODE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getSequence())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SEQUENCE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getType())) { foreach($vs as $v) { if (null === $v) { @@ -621,6 +622,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } @@ -643,8 +645,15 @@ public function jsonSerialize() $a[self::FIELD_PACKAGE_CODE] = $v; } if (null !== ($v = $this->getSequence())) { - $a[self::FIELD_SEQUENCE] = $v->getValue(); - $a[self::FIELD_SEQUENCE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SEQUENCE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SEQUENCE_EXT] = $enc; + } + } else { + $a[self::FIELD_SEQUENCE] = $v; + } } if ([] !== ($vs = $this->getType())) { $a[self::FIELD_TYPE] = $vs; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimInsurance.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimInsurance.php index 3df680e486..c5a6754053 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimInsurance.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimInsurance.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -83,10 +83,6 @@ class FHIRClaimInsurance extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CLAIM_DOT_INSURANCE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_BUSINESS_ARRANGEMENT = 'businessArrangement'; const FIELD_BUSINESS_ARRANGEMENT_EXT = '_businessArrangement'; const FIELD_CLAIM_RESPONSE = 'claimResponse'; @@ -186,6 +182,9 @@ class FHIRClaimInsurance extends FHIRBackboneElement */ protected $sequence = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRClaimInsurance Constructor * @param null|array $data @@ -208,8 +207,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_BUSINESS_ARRANGEMENT] instanceof FHIRString) { $this->setBusinessArrangement($data[self::FIELD_BUSINESS_ARRANGEMENT]); - } elseif ($ext && is_scalar($data[self::FIELD_BUSINESS_ARRANGEMENT])) { - $this->setBusinessArrangement(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_BUSINESS_ARRANGEMENT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_BUSINESS_ARRANGEMENT])) { + $this->setBusinessArrangement(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_BUSINESS_ARRANGEMENT]] + $ext)); + } else if (is_array($data[self::FIELD_BUSINESS_ARRANGEMENT])) { + $this->setBusinessArrangement(new FHIRString(array_merge($ext, $data[self::FIELD_BUSINESS_ARRANGEMENT]))); + } } else { $this->setBusinessArrangement(new FHIRString($data[self::FIELD_BUSINESS_ARRANGEMENT])); } @@ -234,8 +237,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_FOCAL] instanceof FHIRBoolean) { $this->setFocal($data[self::FIELD_FOCAL]); - } elseif ($ext && is_scalar($data[self::FIELD_FOCAL])) { - $this->setFocal(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_FOCAL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_FOCAL])) { + $this->setFocal(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_FOCAL]] + $ext)); + } else if (is_array($data[self::FIELD_FOCAL])) { + $this->setFocal(new FHIRBoolean(array_merge($ext, $data[self::FIELD_FOCAL]))); + } } else { $this->setFocal(new FHIRBoolean($data[self::FIELD_FOCAL])); } @@ -246,8 +253,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->setIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { - $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_IDENTIFIER]))); + } } else { $this->setIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); } @@ -258,17 +269,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_PRE_AUTH_REF])) { foreach($data[self::FIELD_PRE_AUTH_REF] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRString) { $this->addPreAuthRef($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addPreAuthRef(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addPreAuthRef(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addPreAuthRef(new FHIRString(array_merge($v, $ext[$i]))); + } } else { $this->addPreAuthRef(new FHIRString($v)); } } } elseif ($data[self::FIELD_PRE_AUTH_REF] instanceof FHIRString) { $this->addPreAuthRef($data[self::FIELD_PRE_AUTH_REF]); - } elseif ($ext && is_scalar($data[self::FIELD_PRE_AUTH_REF])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_PRE_AUTH_REF])) { $this->addPreAuthRef(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PRE_AUTH_REF]] + $ext)); } else { $this->addPreAuthRef(new FHIRString($data[self::FIELD_PRE_AUTH_REF])); @@ -280,8 +298,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SEQUENCE] instanceof FHIRPositiveInt) { $this->setSequence($data[self::FIELD_SEQUENCE]); - } elseif ($ext && is_scalar($data[self::FIELD_SEQUENCE])) { - $this->setSequence(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_SEQUENCE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SEQUENCE])) { + $this->setSequence(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_SEQUENCE]] + $ext)); + } else if (is_array($data[self::FIELD_SEQUENCE])) { + $this->setSequence(new FHIRPositiveInt(array_merge($ext, $data[self::FIELD_SEQUENCE]))); + } } else { $this->setSequence(new FHIRPositiveInt($data[self::FIELD_SEQUENCE])); } @@ -713,18 +735,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getBusinessArrangement())) { $v->xmlSerialize($sxe->addChild(self::FIELD_BUSINESS_ARRANGEMENT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getClaimResponse())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CLAIM_RESPONSE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getCoverage())) { $v->xmlSerialize($sxe->addChild(self::FIELD_COVERAGE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getFocal())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FOCAL, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } @@ -736,6 +755,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_PRE_AUTH_REF, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getSequence())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SEQUENCE, null, $v->_getFHIRXMLNamespace())); } @@ -749,8 +769,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getBusinessArrangement())) { - $a[self::FIELD_BUSINESS_ARRANGEMENT] = $v->getValue(); - $a[self::FIELD_BUSINESS_ARRANGEMENT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_BUSINESS_ARRANGEMENT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_BUSINESS_ARRANGEMENT_EXT] = $enc; + } + } else { + $a[self::FIELD_BUSINESS_ARRANGEMENT] = $v; + } } if (null !== ($v = $this->getClaimResponse())) { $a[self::FIELD_CLAIM_RESPONSE] = $v; @@ -759,11 +786,26 @@ public function jsonSerialize() $a[self::FIELD_COVERAGE] = $v; } if (null !== ($v = $this->getFocal())) { - $a[self::FIELD_FOCAL] = $v->getValue(); - $a[self::FIELD_FOCAL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FOCAL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FOCAL_EXT] = $enc; + } + } else { + $a[self::FIELD_FOCAL] = $v; + } } if (null !== ($v = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_IDENTIFIER] = $v; + } } if ([] !== ($vs = $this->getPreAuthRef())) { $a[self::FIELD_PRE_AUTH_REF] = []; @@ -771,13 +813,29 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_PRE_AUTH_REF][] = $v->getValue(); - $a[self::FIELD_PRE_AUTH_REF_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PRE_AUTH_REF][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PRE_AUTH_REF_EXT][] = $enc; + } else { + $a[self::FIELD_PRE_AUTH_REF_EXT][] = null; + } + } else { + $a[self::FIELD_PRE_AUTH_REF][] = $v; + } } } if (null !== ($v = $this->getSequence())) { - $a[self::FIELD_SEQUENCE] = $v->getValue(); - $a[self::FIELD_SEQUENCE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SEQUENCE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SEQUENCE_EXT] = $enc; + } + } else { + $a[self::FIELD_SEQUENCE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimItem.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimItem.php index 7bb08c7e54..4c6c40da72 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimItem.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimItem.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -87,10 +87,6 @@ class FHIRClaimItem extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CLAIM_DOT_ITEM; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_BODY_SITE = 'bodySite'; const FIELD_CARE_TEAM_SEQUENCE = 'careTeamSequence'; const FIELD_CARE_TEAM_SEQUENCE_EXT = '_careTeamSequence'; @@ -422,6 +418,9 @@ class FHIRClaimItem extends FHIRBackboneElement */ protected $unitPrice = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRClaimItem Constructor * @param null|array $data @@ -451,17 +450,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_CARE_TEAM_SEQUENCE])) { foreach($data[self::FIELD_CARE_TEAM_SEQUENCE] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRPositiveInt) { $this->addCareTeamSequence($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addCareTeamSequence(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addCareTeamSequence(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addCareTeamSequence(new FHIRPositiveInt(array_merge($v, $ext[$i]))); + } } else { $this->addCareTeamSequence(new FHIRPositiveInt($v)); } } } elseif ($data[self::FIELD_CARE_TEAM_SEQUENCE] instanceof FHIRPositiveInt) { $this->addCareTeamSequence($data[self::FIELD_CARE_TEAM_SEQUENCE]); - } elseif ($ext && is_scalar($data[self::FIELD_CARE_TEAM_SEQUENCE])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_CARE_TEAM_SEQUENCE])) { $this->addCareTeamSequence(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_CARE_TEAM_SEQUENCE]] + $ext)); } else { $this->addCareTeamSequence(new FHIRPositiveInt($data[self::FIELD_CARE_TEAM_SEQUENCE])); @@ -477,6 +483,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_DETAIL])) { if (is_array($data[self::FIELD_DETAIL])) { foreach($data[self::FIELD_DETAIL] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRClaimDetail) { $this->addDetail($v); } else { @@ -495,17 +504,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_DIAGNOSIS_SEQUENCE])) { foreach($data[self::FIELD_DIAGNOSIS_SEQUENCE] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRPositiveInt) { $this->addDiagnosisSequence($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addDiagnosisSequence(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addDiagnosisSequence(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addDiagnosisSequence(new FHIRPositiveInt(array_merge($v, $ext[$i]))); + } } else { $this->addDiagnosisSequence(new FHIRPositiveInt($v)); } } } elseif ($data[self::FIELD_DIAGNOSIS_SEQUENCE] instanceof FHIRPositiveInt) { $this->addDiagnosisSequence($data[self::FIELD_DIAGNOSIS_SEQUENCE]); - } elseif ($ext && is_scalar($data[self::FIELD_DIAGNOSIS_SEQUENCE])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_DIAGNOSIS_SEQUENCE])) { $this->addDiagnosisSequence(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_DIAGNOSIS_SEQUENCE]] + $ext)); } else { $this->addDiagnosisSequence(new FHIRPositiveInt($data[self::FIELD_DIAGNOSIS_SEQUENCE])); @@ -514,6 +530,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ENCOUNTER])) { if (is_array($data[self::FIELD_ENCOUNTER])) { foreach($data[self::FIELD_ENCOUNTER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addEncounter($v); } else { @@ -532,8 +551,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_FACTOR] instanceof FHIRDecimal) { $this->setFactor($data[self::FIELD_FACTOR]); - } elseif ($ext && is_scalar($data[self::FIELD_FACTOR])) { - $this->setFactor(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_FACTOR]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_FACTOR])) { + $this->setFactor(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_FACTOR]] + $ext)); + } else if (is_array($data[self::FIELD_FACTOR])) { + $this->setFactor(new FHIRDecimal(array_merge($ext, $data[self::FIELD_FACTOR]))); + } } else { $this->setFactor(new FHIRDecimal($data[self::FIELD_FACTOR])); } @@ -544,17 +567,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_INFORMATION_SEQUENCE])) { foreach($data[self::FIELD_INFORMATION_SEQUENCE] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRPositiveInt) { $this->addInformationSequence($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addInformationSequence(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addInformationSequence(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addInformationSequence(new FHIRPositiveInt(array_merge($v, $ext[$i]))); + } } else { $this->addInformationSequence(new FHIRPositiveInt($v)); } } } elseif ($data[self::FIELD_INFORMATION_SEQUENCE] instanceof FHIRPositiveInt) { $this->addInformationSequence($data[self::FIELD_INFORMATION_SEQUENCE]); - } elseif ($ext && is_scalar($data[self::FIELD_INFORMATION_SEQUENCE])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_INFORMATION_SEQUENCE])) { $this->addInformationSequence(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_INFORMATION_SEQUENCE]] + $ext)); } else { $this->addInformationSequence(new FHIRPositiveInt($data[self::FIELD_INFORMATION_SEQUENCE])); @@ -584,6 +614,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_MODIFIER])) { if (is_array($data[self::FIELD_MODIFIER])) { foreach($data[self::FIELD_MODIFIER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addModifier($v); } else { @@ -602,8 +635,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NET] instanceof FHIRMoney) { $this->setNet($data[self::FIELD_NET]); - } elseif ($ext && is_scalar($data[self::FIELD_NET])) { - $this->setNet(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_NET]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NET])) { + $this->setNet(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_NET]] + $ext)); + } else if (is_array($data[self::FIELD_NET])) { + $this->setNet(new FHIRMoney(array_merge($ext, $data[self::FIELD_NET]))); + } } else { $this->setNet(new FHIRMoney($data[self::FIELD_NET])); } @@ -614,17 +651,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_PROCEDURE_SEQUENCE])) { foreach($data[self::FIELD_PROCEDURE_SEQUENCE] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRPositiveInt) { $this->addProcedureSequence($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addProcedureSequence(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addProcedureSequence(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addProcedureSequence(new FHIRPositiveInt(array_merge($v, $ext[$i]))); + } } else { $this->addProcedureSequence(new FHIRPositiveInt($v)); } } } elseif ($data[self::FIELD_PROCEDURE_SEQUENCE] instanceof FHIRPositiveInt) { $this->addProcedureSequence($data[self::FIELD_PROCEDURE_SEQUENCE]); - } elseif ($ext && is_scalar($data[self::FIELD_PROCEDURE_SEQUENCE])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_PROCEDURE_SEQUENCE])) { $this->addProcedureSequence(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_PROCEDURE_SEQUENCE]] + $ext)); } else { $this->addProcedureSequence(new FHIRPositiveInt($data[self::FIELD_PROCEDURE_SEQUENCE])); @@ -640,6 +684,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PROGRAM_CODE])) { if (is_array($data[self::FIELD_PROGRAM_CODE])) { foreach($data[self::FIELD_PROGRAM_CODE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addProgramCode($v); } else { @@ -658,8 +705,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_QUANTITY] instanceof FHIRQuantity) { $this->setQuantity($data[self::FIELD_QUANTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_QUANTITY])) { - $this->setQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_QUANTITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_QUANTITY])) { + $this->setQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_QUANTITY])) { + $this->setQuantity(new FHIRQuantity(array_merge($ext, $data[self::FIELD_QUANTITY]))); + } } else { $this->setQuantity(new FHIRQuantity($data[self::FIELD_QUANTITY])); } @@ -677,8 +728,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SEQUENCE] instanceof FHIRPositiveInt) { $this->setSequence($data[self::FIELD_SEQUENCE]); - } elseif ($ext && is_scalar($data[self::FIELD_SEQUENCE])) { - $this->setSequence(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_SEQUENCE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SEQUENCE])) { + $this->setSequence(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_SEQUENCE]] + $ext)); + } else if (is_array($data[self::FIELD_SEQUENCE])) { + $this->setSequence(new FHIRPositiveInt(array_merge($ext, $data[self::FIELD_SEQUENCE]))); + } } else { $this->setSequence(new FHIRPositiveInt($data[self::FIELD_SEQUENCE])); } @@ -689,8 +744,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SERVICED_DATE] instanceof FHIRDate) { $this->setServicedDate($data[self::FIELD_SERVICED_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_SERVICED_DATE])) { - $this->setServicedDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_SERVICED_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SERVICED_DATE])) { + $this->setServicedDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_SERVICED_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_SERVICED_DATE])) { + $this->setServicedDate(new FHIRDate(array_merge($ext, $data[self::FIELD_SERVICED_DATE]))); + } } else { $this->setServicedDate(new FHIRDate($data[self::FIELD_SERVICED_DATE])); } @@ -705,6 +764,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SUB_SITE])) { if (is_array($data[self::FIELD_SUB_SITE])) { foreach($data[self::FIELD_SUB_SITE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addSubSite($v); } else { @@ -720,6 +782,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_UDI])) { if (is_array($data[self::FIELD_UDI])) { foreach($data[self::FIELD_UDI] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addUdi($v); } else { @@ -738,8 +803,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_UNIT_PRICE] instanceof FHIRMoney) { $this->setUnitPrice($data[self::FIELD_UNIT_PRICE]); - } elseif ($ext && is_scalar($data[self::FIELD_UNIT_PRICE])) { - $this->setUnitPrice(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_UNIT_PRICE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_UNIT_PRICE])) { + $this->setUnitPrice(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_UNIT_PRICE]] + $ext)); + } else if (is_array($data[self::FIELD_UNIT_PRICE])) { + $this->setUnitPrice(new FHIRMoney(array_merge($ext, $data[self::FIELD_UNIT_PRICE]))); + } } else { $this->setUnitPrice(new FHIRMoney($data[self::FIELD_UNIT_PRICE])); } @@ -2065,7 +2134,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getBodySite())) { $v->xmlSerialize($sxe->addChild(self::FIELD_BODY_SITE, null, $v->_getFHIRXMLNamespace())); } @@ -2081,7 +2149,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getCategory())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CATEGORY, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getDetail())) { foreach($vs as $v) { if (null === $v) { @@ -2090,6 +2157,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_DETAIL, null, $v->_getFHIRXMLNamespace())); } } + if ([] !== ($vs = $this->getDiagnosisSequence())) { foreach($vs as $v) { if (null === $v) { @@ -2107,6 +2175,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_ENCOUNTER, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getFactor())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FACTOR, null, $v->_getFHIRXMLNamespace())); } @@ -2122,15 +2191,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getLocationAddress())) { $v->xmlSerialize($sxe->addChild(self::FIELD_LOCATION_ADDRESS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getLocationCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_LOCATION_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getLocationReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_LOCATION_REFERENCE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getModifier())) { foreach($vs as $v) { if (null === $v) { @@ -2155,7 +2221,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getProductOrService())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PRODUCT_OR_SERVICE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getProgramCode())) { foreach($vs as $v) { if (null === $v) { @@ -2168,7 +2233,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_QUANTITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRevenue())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REVENUE, null, $v->_getFHIRXMLNamespace())); } @@ -2178,11 +2242,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getServicedDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SERVICED_DATE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getServicedPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SERVICED_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getSubSite())) { foreach($vs as $v) { if (null === $v) { @@ -2222,8 +2284,17 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_CARE_TEAM_SEQUENCE][] = $v->getValue(); - $a[self::FIELD_CARE_TEAM_SEQUENCE_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CARE_TEAM_SEQUENCE][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CARE_TEAM_SEQUENCE_EXT][] = $enc; + } else { + $a[self::FIELD_CARE_TEAM_SEQUENCE_EXT][] = null; + } + } else { + $a[self::FIELD_CARE_TEAM_SEQUENCE][] = $v; + } } } if (null !== ($v = $this->getCategory())) { @@ -2238,16 +2309,32 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_DIAGNOSIS_SEQUENCE][] = $v->getValue(); - $a[self::FIELD_DIAGNOSIS_SEQUENCE_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DIAGNOSIS_SEQUENCE][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DIAGNOSIS_SEQUENCE_EXT][] = $enc; + } else { + $a[self::FIELD_DIAGNOSIS_SEQUENCE_EXT][] = null; + } + } else { + $a[self::FIELD_DIAGNOSIS_SEQUENCE][] = $v; + } } } if ([] !== ($vs = $this->getEncounter())) { $a[self::FIELD_ENCOUNTER] = $vs; } if (null !== ($v = $this->getFactor())) { - $a[self::FIELD_FACTOR] = $v->getValue(); - $a[self::FIELD_FACTOR_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FACTOR] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FACTOR_EXT] = $enc; + } + } else { + $a[self::FIELD_FACTOR] = $v; + } } if ([] !== ($vs = $this->getInformationSequence())) { $a[self::FIELD_INFORMATION_SEQUENCE] = []; @@ -2255,8 +2342,17 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_INFORMATION_SEQUENCE][] = $v->getValue(); - $a[self::FIELD_INFORMATION_SEQUENCE_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_INFORMATION_SEQUENCE][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_INFORMATION_SEQUENCE_EXT][] = $enc; + } else { + $a[self::FIELD_INFORMATION_SEQUENCE_EXT][] = null; + } + } else { + $a[self::FIELD_INFORMATION_SEQUENCE][] = $v; + } } } if (null !== ($v = $this->getLocationAddress())) { @@ -2272,7 +2368,15 @@ public function jsonSerialize() $a[self::FIELD_MODIFIER] = $vs; } if (null !== ($v = $this->getNet())) { - $a[self::FIELD_NET] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NET] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NET_EXT] = $enc; + } + } else { + $a[self::FIELD_NET] = $v; + } } if ([] !== ($vs = $this->getProcedureSequence())) { $a[self::FIELD_PROCEDURE_SEQUENCE] = []; @@ -2280,8 +2384,17 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_PROCEDURE_SEQUENCE][] = $v->getValue(); - $a[self::FIELD_PROCEDURE_SEQUENCE_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PROCEDURE_SEQUENCE][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PROCEDURE_SEQUENCE_EXT][] = $enc; + } else { + $a[self::FIELD_PROCEDURE_SEQUENCE_EXT][] = null; + } + } else { + $a[self::FIELD_PROCEDURE_SEQUENCE][] = $v; + } } } if (null !== ($v = $this->getProductOrService())) { @@ -2291,18 +2404,40 @@ public function jsonSerialize() $a[self::FIELD_PROGRAM_CODE] = $vs; } if (null !== ($v = $this->getQuantity())) { - $a[self::FIELD_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_QUANTITY] = $v; + } } if (null !== ($v = $this->getRevenue())) { $a[self::FIELD_REVENUE] = $v; } if (null !== ($v = $this->getSequence())) { - $a[self::FIELD_SEQUENCE] = $v->getValue(); - $a[self::FIELD_SEQUENCE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SEQUENCE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SEQUENCE_EXT] = $enc; + } + } else { + $a[self::FIELD_SEQUENCE] = $v; + } } if (null !== ($v = $this->getServicedDate())) { - $a[self::FIELD_SERVICED_DATE] = $v->getValue(); - $a[self::FIELD_SERVICED_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SERVICED_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SERVICED_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_SERVICED_DATE] = $v; + } } if (null !== ($v = $this->getServicedPeriod())) { $a[self::FIELD_SERVICED_PERIOD] = $v; @@ -2314,7 +2449,15 @@ public function jsonSerialize() $a[self::FIELD_UDI] = $vs; } if (null !== ($v = $this->getUnitPrice())) { - $a[self::FIELD_UNIT_PRICE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_UNIT_PRICE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_UNIT_PRICE_EXT] = $enc; + } + } else { + $a[self::FIELD_UNIT_PRICE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimPayee.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimPayee.php index 693ad01f63..c47ec54ffa 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimPayee.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimPayee.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRClaimPayee extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CLAIM_DOT_PAYEE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_PARTY = 'party'; const FIELD_TYPE = 'type'; @@ -110,6 +106,9 @@ class FHIRClaimPayee extends FHIRBackboneElement */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRClaimPayee Constructor * @param null|array $data @@ -309,11 +308,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getParty())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PARTY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimProcedure.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimProcedure.php index 19e6b91b14..27248b3688 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimProcedure.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimProcedure.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -82,10 +82,6 @@ class FHIRClaimProcedure extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CLAIM_DOT_PROCEDURE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DATE = 'date'; const FIELD_DATE_EXT = '_date'; const FIELD_PROCEDURE_CODEABLE_CONCEPT = 'procedureCodeableConcept'; @@ -168,6 +164,9 @@ class FHIRClaimProcedure extends FHIRBackboneElement */ protected $udi = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRClaimProcedure Constructor * @param null|array $data @@ -190,8 +189,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATE] instanceof FHIRDateTime) { $this->setDate($data[self::FIELD_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_DATE])) { - $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime(array_merge($ext, $data[self::FIELD_DATE]))); + } } else { $this->setDate(new FHIRDateTime($data[self::FIELD_DATE])); } @@ -216,8 +219,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SEQUENCE] instanceof FHIRPositiveInt) { $this->setSequence($data[self::FIELD_SEQUENCE]); - } elseif ($ext && is_scalar($data[self::FIELD_SEQUENCE])) { - $this->setSequence(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_SEQUENCE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SEQUENCE])) { + $this->setSequence(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_SEQUENCE]] + $ext)); + } else if (is_array($data[self::FIELD_SEQUENCE])) { + $this->setSequence(new FHIRPositiveInt(array_merge($ext, $data[self::FIELD_SEQUENCE]))); + } } else { $this->setSequence(new FHIRPositiveInt($data[self::FIELD_SEQUENCE])); } @@ -225,6 +232,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_TYPE])) { if (is_array($data[self::FIELD_TYPE])) { foreach($data[self::FIELD_TYPE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addType($v); } else { @@ -240,6 +250,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_UDI])) { if (is_array($data[self::FIELD_UDI])) { foreach($data[self::FIELD_UDI] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addUdi($v); } else { @@ -647,18 +660,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DATE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getProcedureCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PROCEDURE_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getProcedureReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PROCEDURE_REFERENCE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getSequence())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SEQUENCE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getType())) { foreach($vs as $v) { if (null === $v) { @@ -676,6 +686,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_UDI, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } @@ -686,8 +697,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getDate())) { - $a[self::FIELD_DATE] = $v->getValue(); - $a[self::FIELD_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_DATE] = $v; + } } if (null !== ($v = $this->getProcedureCodeableConcept())) { $a[self::FIELD_PROCEDURE_CODEABLE_CONCEPT] = $v; @@ -696,8 +714,15 @@ public function jsonSerialize() $a[self::FIELD_PROCEDURE_REFERENCE] = $v; } if (null !== ($v = $this->getSequence())) { - $a[self::FIELD_SEQUENCE] = $v->getValue(); - $a[self::FIELD_SEQUENCE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SEQUENCE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SEQUENCE_EXT] = $enc; + } + } else { + $a[self::FIELD_SEQUENCE] = $v; + } } if ([] !== ($vs = $this->getType())) { $a[self::FIELD_TYPE] = $vs; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimRelated.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimRelated.php index e9cd98aa28..82badf3445 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimRelated.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimRelated.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -81,10 +81,6 @@ class FHIRClaimRelated extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CLAIM_DOT_RELATED; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CLAIM = 'claim'; const FIELD_REFERENCE = 'reference'; const FIELD_REFERENCE_EXT = '_reference'; @@ -126,6 +122,9 @@ class FHIRClaimRelated extends FHIRBackboneElement */ protected $relationship = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRClaimRelated Constructor * @param null|array $data @@ -155,8 +154,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_REFERENCE] instanceof FHIRIdentifier) { $this->setReference($data[self::FIELD_REFERENCE]); - } elseif ($ext && is_scalar($data[self::FIELD_REFERENCE])) { - $this->setReference(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_REFERENCE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_REFERENCE])) { + $this->setReference(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_REFERENCE]] + $ext)); + } else if (is_array($data[self::FIELD_REFERENCE])) { + $this->setReference(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_REFERENCE]))); + } } else { $this->setReference(new FHIRIdentifier($data[self::FIELD_REFERENCE])); } @@ -374,15 +377,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getClaim())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CLAIM, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REFERENCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRelationship())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RELATIONSHIP, null, $v->_getFHIRXMLNamespace())); } @@ -399,7 +399,15 @@ public function jsonSerialize() $a[self::FIELD_CLAIM] = $v; } if (null !== ($v = $this->getReference())) { - $a[self::FIELD_REFERENCE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_REFERENCE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_REFERENCE_EXT] = $enc; + } + } else { + $a[self::FIELD_REFERENCE] = $v; + } } if (null !== ($v = $this->getRelationship())) { $a[self::FIELD_RELATIONSHIP] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimSubDetail.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimSubDetail.php index d2705210c2..c5a8f7c698 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimSubDetail.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimSubDetail.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -84,10 +84,6 @@ class FHIRClaimSubDetail extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CLAIM_DOT_SUB_DETAIL; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CATEGORY = 'category'; const FIELD_FACTOR = 'factor'; const FIELD_FACTOR_EXT = '_factor'; @@ -242,6 +238,9 @@ class FHIRClaimSubDetail extends FHIRBackboneElement */ protected $unitPrice = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRClaimSubDetail Constructor * @param null|array $data @@ -271,8 +270,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_FACTOR] instanceof FHIRDecimal) { $this->setFactor($data[self::FIELD_FACTOR]); - } elseif ($ext && is_scalar($data[self::FIELD_FACTOR])) { - $this->setFactor(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_FACTOR]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_FACTOR])) { + $this->setFactor(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_FACTOR]] + $ext)); + } else if (is_array($data[self::FIELD_FACTOR])) { + $this->setFactor(new FHIRDecimal(array_merge($ext, $data[self::FIELD_FACTOR]))); + } } else { $this->setFactor(new FHIRDecimal($data[self::FIELD_FACTOR])); } @@ -280,6 +283,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_MODIFIER])) { if (is_array($data[self::FIELD_MODIFIER])) { foreach($data[self::FIELD_MODIFIER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addModifier($v); } else { @@ -298,8 +304,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NET] instanceof FHIRMoney) { $this->setNet($data[self::FIELD_NET]); - } elseif ($ext && is_scalar($data[self::FIELD_NET])) { - $this->setNet(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_NET]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NET])) { + $this->setNet(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_NET]] + $ext)); + } else if (is_array($data[self::FIELD_NET])) { + $this->setNet(new FHIRMoney(array_merge($ext, $data[self::FIELD_NET]))); + } } else { $this->setNet(new FHIRMoney($data[self::FIELD_NET])); } @@ -314,6 +324,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PROGRAM_CODE])) { if (is_array($data[self::FIELD_PROGRAM_CODE])) { foreach($data[self::FIELD_PROGRAM_CODE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addProgramCode($v); } else { @@ -332,8 +345,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_QUANTITY] instanceof FHIRQuantity) { $this->setQuantity($data[self::FIELD_QUANTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_QUANTITY])) { - $this->setQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_QUANTITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_QUANTITY])) { + $this->setQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_QUANTITY])) { + $this->setQuantity(new FHIRQuantity(array_merge($ext, $data[self::FIELD_QUANTITY]))); + } } else { $this->setQuantity(new FHIRQuantity($data[self::FIELD_QUANTITY])); } @@ -351,8 +368,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SEQUENCE] instanceof FHIRPositiveInt) { $this->setSequence($data[self::FIELD_SEQUENCE]); - } elseif ($ext && is_scalar($data[self::FIELD_SEQUENCE])) { - $this->setSequence(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_SEQUENCE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SEQUENCE])) { + $this->setSequence(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_SEQUENCE]] + $ext)); + } else if (is_array($data[self::FIELD_SEQUENCE])) { + $this->setSequence(new FHIRPositiveInt(array_merge($ext, $data[self::FIELD_SEQUENCE]))); + } } else { $this->setSequence(new FHIRPositiveInt($data[self::FIELD_SEQUENCE])); } @@ -360,6 +381,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_UDI])) { if (is_array($data[self::FIELD_UDI])) { foreach($data[self::FIELD_UDI] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addUdi($v); } else { @@ -378,8 +402,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_UNIT_PRICE] instanceof FHIRMoney) { $this->setUnitPrice($data[self::FIELD_UNIT_PRICE]); - } elseif ($ext && is_scalar($data[self::FIELD_UNIT_PRICE])) { - $this->setUnitPrice(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_UNIT_PRICE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_UNIT_PRICE])) { + $this->setUnitPrice(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_UNIT_PRICE]] + $ext)); + } else if (is_array($data[self::FIELD_UNIT_PRICE])) { + $this->setUnitPrice(new FHIRMoney(array_merge($ext, $data[self::FIELD_UNIT_PRICE]))); + } } else { $this->setUnitPrice(new FHIRMoney($data[self::FIELD_UNIT_PRICE])); } @@ -989,14 +1017,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getCategory())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CATEGORY, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getFactor())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FACTOR, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getModifier())) { foreach($vs as $v) { if (null === $v) { @@ -1009,11 +1035,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getNet())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NET, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getProductOrService())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PRODUCT_OR_SERVICE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getProgramCode())) { foreach($vs as $v) { if (null === $v) { @@ -1026,14 +1050,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_QUANTITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRevenue())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REVENUE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getSequence())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SEQUENCE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getUdi())) { foreach($vs as $v) { if (null === $v) { @@ -1059,14 +1081,29 @@ public function jsonSerialize() $a[self::FIELD_CATEGORY] = $v; } if (null !== ($v = $this->getFactor())) { - $a[self::FIELD_FACTOR] = $v->getValue(); - $a[self::FIELD_FACTOR_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FACTOR] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FACTOR_EXT] = $enc; + } + } else { + $a[self::FIELD_FACTOR] = $v; + } } if ([] !== ($vs = $this->getModifier())) { $a[self::FIELD_MODIFIER] = $vs; } if (null !== ($v = $this->getNet())) { - $a[self::FIELD_NET] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NET] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NET_EXT] = $enc; + } + } else { + $a[self::FIELD_NET] = $v; + } } if (null !== ($v = $this->getProductOrService())) { $a[self::FIELD_PRODUCT_OR_SERVICE] = $v; @@ -1075,20 +1112,43 @@ public function jsonSerialize() $a[self::FIELD_PROGRAM_CODE] = $vs; } if (null !== ($v = $this->getQuantity())) { - $a[self::FIELD_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_QUANTITY] = $v; + } } if (null !== ($v = $this->getRevenue())) { $a[self::FIELD_REVENUE] = $v; } if (null !== ($v = $this->getSequence())) { - $a[self::FIELD_SEQUENCE] = $v->getValue(); - $a[self::FIELD_SEQUENCE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SEQUENCE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SEQUENCE_EXT] = $enc; + } + } else { + $a[self::FIELD_SEQUENCE] = $v; + } } if ([] !== ($vs = $this->getUdi())) { $a[self::FIELD_UDI] = $vs; } if (null !== ($v = $this->getUnitPrice())) { - $a[self::FIELD_UNIT_PRICE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_UNIT_PRICE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_UNIT_PRICE_EXT] = $enc; + } + } else { + $a[self::FIELD_UNIT_PRICE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimSupportingInfo.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimSupportingInfo.php index aba49ed46e..7b92202b67 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimSupportingInfo.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimSupportingInfo.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -87,10 +87,6 @@ class FHIRClaimSupportingInfo extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CLAIM_DOT_SUPPORTING_INFO; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CATEGORY = 'category'; const FIELD_CODE = 'code'; const FIELD_REASON = 'reason'; @@ -250,6 +246,9 @@ class FHIRClaimSupportingInfo extends FHIRBackboneElement */ protected $valueString = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRClaimSupportingInfo Constructor * @param null|array $data @@ -293,8 +292,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SEQUENCE] instanceof FHIRPositiveInt) { $this->setSequence($data[self::FIELD_SEQUENCE]); - } elseif ($ext && is_scalar($data[self::FIELD_SEQUENCE])) { - $this->setSequence(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_SEQUENCE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SEQUENCE])) { + $this->setSequence(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_SEQUENCE]] + $ext)); + } else if (is_array($data[self::FIELD_SEQUENCE])) { + $this->setSequence(new FHIRPositiveInt(array_merge($ext, $data[self::FIELD_SEQUENCE]))); + } } else { $this->setSequence(new FHIRPositiveInt($data[self::FIELD_SEQUENCE])); } @@ -305,8 +308,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TIMING_DATE] instanceof FHIRDate) { $this->setTimingDate($data[self::FIELD_TIMING_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_TIMING_DATE])) { - $this->setTimingDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_TIMING_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TIMING_DATE])) { + $this->setTimingDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_TIMING_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_TIMING_DATE])) { + $this->setTimingDate(new FHIRDate(array_merge($ext, $data[self::FIELD_TIMING_DATE]))); + } } else { $this->setTimingDate(new FHIRDate($data[self::FIELD_TIMING_DATE])); } @@ -331,8 +338,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_BOOLEAN] instanceof FHIRBoolean) { $this->setValueBoolean($data[self::FIELD_VALUE_BOOLEAN]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_BOOLEAN])) { - $this->setValueBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_VALUE_BOOLEAN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_BOOLEAN])) { + $this->setValueBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_VALUE_BOOLEAN]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_BOOLEAN])) { + $this->setValueBoolean(new FHIRBoolean(array_merge($ext, $data[self::FIELD_VALUE_BOOLEAN]))); + } } else { $this->setValueBoolean(new FHIRBoolean($data[self::FIELD_VALUE_BOOLEAN])); } @@ -343,8 +354,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_QUANTITY] instanceof FHIRQuantity) { $this->setValueQuantity($data[self::FIELD_VALUE_QUANTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_QUANTITY])) { - $this->setValueQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_VALUE_QUANTITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_QUANTITY])) { + $this->setValueQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_VALUE_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_QUANTITY])) { + $this->setValueQuantity(new FHIRQuantity(array_merge($ext, $data[self::FIELD_VALUE_QUANTITY]))); + } } else { $this->setValueQuantity(new FHIRQuantity($data[self::FIELD_VALUE_QUANTITY])); } @@ -362,8 +377,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_STRING] instanceof FHIRString) { $this->setValueString($data[self::FIELD_VALUE_STRING]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_STRING])) { - $this->setValueString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VALUE_STRING]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_STRING])) { + $this->setValueString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VALUE_STRING]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_STRING])) { + $this->setValueString(new FHIRString(array_merge($ext, $data[self::FIELD_VALUE_STRING]))); + } } else { $this->setValueString(new FHIRString($data[self::FIELD_VALUE_STRING])); } @@ -918,15 +937,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getCategory())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CATEGORY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getReason())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REASON, null, $v->_getFHIRXMLNamespace())); } @@ -936,22 +952,18 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getTimingDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TIMING_DATE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getTimingPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TIMING_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueAttachment())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_ATTACHMENT, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getValueBoolean())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_BOOLEAN, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_QUANTITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_REFERENCE, null, $v->_getFHIRXMLNamespace())); } @@ -977,12 +989,26 @@ public function jsonSerialize() $a[self::FIELD_REASON] = $v; } if (null !== ($v = $this->getSequence())) { - $a[self::FIELD_SEQUENCE] = $v->getValue(); - $a[self::FIELD_SEQUENCE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SEQUENCE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SEQUENCE_EXT] = $enc; + } + } else { + $a[self::FIELD_SEQUENCE] = $v; + } } if (null !== ($v = $this->getTimingDate())) { - $a[self::FIELD_TIMING_DATE] = $v->getValue(); - $a[self::FIELD_TIMING_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TIMING_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TIMING_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_TIMING_DATE] = $v; + } } if (null !== ($v = $this->getTimingPeriod())) { $a[self::FIELD_TIMING_PERIOD] = $v; @@ -991,18 +1017,40 @@ public function jsonSerialize() $a[self::FIELD_VALUE_ATTACHMENT] = $v; } if (null !== ($v = $this->getValueBoolean())) { - $a[self::FIELD_VALUE_BOOLEAN] = $v->getValue(); - $a[self::FIELD_VALUE_BOOLEAN_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_BOOLEAN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_BOOLEAN_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_BOOLEAN] = $v; + } } if (null !== ($v = $this->getValueQuantity())) { - $a[self::FIELD_VALUE_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_QUANTITY] = $v; + } } if (null !== ($v = $this->getValueReference())) { $a[self::FIELD_VALUE_REFERENCE] = $v; } if (null !== ($v = $this->getValueString())) { - $a[self::FIELD_VALUE_STRING] = $v->getValue(); - $a[self::FIELD_VALUE_STRING_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_STRING] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_STRING_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_STRING] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseAddItem.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseAddItem.php index b849913a85..e0919fe1f3 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseAddItem.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseAddItem.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -86,10 +86,6 @@ class FHIRClaimResponseAddItem extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CLAIM_RESPONSE_DOT_ADD_ITEM; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ADJUDICATION = 'adjudication'; const FIELD_ADJUDICATION_EXT = '_adjudication'; const FIELD_BODY_SITE = 'bodySite'; @@ -380,6 +376,9 @@ class FHIRClaimResponseAddItem extends FHIRBackboneElement */ protected $unitPrice = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRClaimResponseAddItem Constructor * @param null|array $data @@ -402,17 +401,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_ADJUDICATION])) { foreach($data[self::FIELD_ADJUDICATION] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRClaimResponseAdjudication) { $this->addAdjudication($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addAdjudication(new FHIRClaimResponseAdjudication([FHIRClaimResponseAdjudication::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addAdjudication(new FHIRClaimResponseAdjudication([FHIRClaimResponseAdjudication::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addAdjudication(new FHIRClaimResponseAdjudication(array_merge($v, $ext[$i]))); + } } else { $this->addAdjudication(new FHIRClaimResponseAdjudication($v)); } } } elseif ($data[self::FIELD_ADJUDICATION] instanceof FHIRClaimResponseAdjudication) { $this->addAdjudication($data[self::FIELD_ADJUDICATION]); - } elseif ($ext && is_scalar($data[self::FIELD_ADJUDICATION])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_ADJUDICATION])) { $this->addAdjudication(new FHIRClaimResponseAdjudication([FHIRClaimResponseAdjudication::FIELD_VALUE => $data[self::FIELD_ADJUDICATION]] + $ext)); } else { $this->addAdjudication(new FHIRClaimResponseAdjudication($data[self::FIELD_ADJUDICATION])); @@ -428,6 +434,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_DETAIL])) { if (is_array($data[self::FIELD_DETAIL])) { foreach($data[self::FIELD_DETAIL] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRClaimResponseDetail1) { $this->addDetail($v); } else { @@ -446,17 +455,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_DETAIL_SEQUENCE])) { foreach($data[self::FIELD_DETAIL_SEQUENCE] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRPositiveInt) { $this->addDetailSequence($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addDetailSequence(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addDetailSequence(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addDetailSequence(new FHIRPositiveInt(array_merge($v, $ext[$i]))); + } } else { $this->addDetailSequence(new FHIRPositiveInt($v)); } } } elseif ($data[self::FIELD_DETAIL_SEQUENCE] instanceof FHIRPositiveInt) { $this->addDetailSequence($data[self::FIELD_DETAIL_SEQUENCE]); - } elseif ($ext && is_scalar($data[self::FIELD_DETAIL_SEQUENCE])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_DETAIL_SEQUENCE])) { $this->addDetailSequence(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_DETAIL_SEQUENCE]] + $ext)); } else { $this->addDetailSequence(new FHIRPositiveInt($data[self::FIELD_DETAIL_SEQUENCE])); @@ -468,8 +484,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_FACTOR] instanceof FHIRDecimal) { $this->setFactor($data[self::FIELD_FACTOR]); - } elseif ($ext && is_scalar($data[self::FIELD_FACTOR])) { - $this->setFactor(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_FACTOR]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_FACTOR])) { + $this->setFactor(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_FACTOR]] + $ext)); + } else if (is_array($data[self::FIELD_FACTOR])) { + $this->setFactor(new FHIRDecimal(array_merge($ext, $data[self::FIELD_FACTOR]))); + } } else { $this->setFactor(new FHIRDecimal($data[self::FIELD_FACTOR])); } @@ -480,17 +500,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_ITEM_SEQUENCE])) { foreach($data[self::FIELD_ITEM_SEQUENCE] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRPositiveInt) { $this->addItemSequence($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addItemSequence(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addItemSequence(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addItemSequence(new FHIRPositiveInt(array_merge($v, $ext[$i]))); + } } else { $this->addItemSequence(new FHIRPositiveInt($v)); } } } elseif ($data[self::FIELD_ITEM_SEQUENCE] instanceof FHIRPositiveInt) { $this->addItemSequence($data[self::FIELD_ITEM_SEQUENCE]); - } elseif ($ext && is_scalar($data[self::FIELD_ITEM_SEQUENCE])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_ITEM_SEQUENCE])) { $this->addItemSequence(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_ITEM_SEQUENCE]] + $ext)); } else { $this->addItemSequence(new FHIRPositiveInt($data[self::FIELD_ITEM_SEQUENCE])); @@ -520,6 +547,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_MODIFIER])) { if (is_array($data[self::FIELD_MODIFIER])) { foreach($data[self::FIELD_MODIFIER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addModifier($v); } else { @@ -538,8 +568,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NET] instanceof FHIRMoney) { $this->setNet($data[self::FIELD_NET]); - } elseif ($ext && is_scalar($data[self::FIELD_NET])) { - $this->setNet(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_NET]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NET])) { + $this->setNet(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_NET]] + $ext)); + } else if (is_array($data[self::FIELD_NET])) { + $this->setNet(new FHIRMoney(array_merge($ext, $data[self::FIELD_NET]))); + } } else { $this->setNet(new FHIRMoney($data[self::FIELD_NET])); } @@ -550,17 +584,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_NOTE_NUMBER])) { foreach($data[self::FIELD_NOTE_NUMBER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRPositiveInt) { $this->addNoteNumber($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addNoteNumber(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addNoteNumber(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addNoteNumber(new FHIRPositiveInt(array_merge($v, $ext[$i]))); + } } else { $this->addNoteNumber(new FHIRPositiveInt($v)); } } } elseif ($data[self::FIELD_NOTE_NUMBER] instanceof FHIRPositiveInt) { $this->addNoteNumber($data[self::FIELD_NOTE_NUMBER]); - } elseif ($ext && is_scalar($data[self::FIELD_NOTE_NUMBER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_NOTE_NUMBER])) { $this->addNoteNumber(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_NOTE_NUMBER]] + $ext)); } else { $this->addNoteNumber(new FHIRPositiveInt($data[self::FIELD_NOTE_NUMBER])); @@ -576,6 +617,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PROGRAM_CODE])) { if (is_array($data[self::FIELD_PROGRAM_CODE])) { foreach($data[self::FIELD_PROGRAM_CODE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addProgramCode($v); } else { @@ -591,6 +635,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PROVIDER])) { if (is_array($data[self::FIELD_PROVIDER])) { foreach($data[self::FIELD_PROVIDER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addProvider($v); } else { @@ -609,8 +656,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_QUANTITY] instanceof FHIRQuantity) { $this->setQuantity($data[self::FIELD_QUANTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_QUANTITY])) { - $this->setQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_QUANTITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_QUANTITY])) { + $this->setQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_QUANTITY])) { + $this->setQuantity(new FHIRQuantity(array_merge($ext, $data[self::FIELD_QUANTITY]))); + } } else { $this->setQuantity(new FHIRQuantity($data[self::FIELD_QUANTITY])); } @@ -621,8 +672,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SERVICED_DATE] instanceof FHIRDate) { $this->setServicedDate($data[self::FIELD_SERVICED_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_SERVICED_DATE])) { - $this->setServicedDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_SERVICED_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SERVICED_DATE])) { + $this->setServicedDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_SERVICED_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_SERVICED_DATE])) { + $this->setServicedDate(new FHIRDate(array_merge($ext, $data[self::FIELD_SERVICED_DATE]))); + } } else { $this->setServicedDate(new FHIRDate($data[self::FIELD_SERVICED_DATE])); } @@ -637,6 +692,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SUB_SITE])) { if (is_array($data[self::FIELD_SUB_SITE])) { foreach($data[self::FIELD_SUB_SITE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addSubSite($v); } else { @@ -655,17 +713,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_SUBDETAIL_SEQUENCE])) { foreach($data[self::FIELD_SUBDETAIL_SEQUENCE] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRPositiveInt) { $this->addSubdetailSequence($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addSubdetailSequence(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addSubdetailSequence(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addSubdetailSequence(new FHIRPositiveInt(array_merge($v, $ext[$i]))); + } } else { $this->addSubdetailSequence(new FHIRPositiveInt($v)); } } } elseif ($data[self::FIELD_SUBDETAIL_SEQUENCE] instanceof FHIRPositiveInt) { $this->addSubdetailSequence($data[self::FIELD_SUBDETAIL_SEQUENCE]); - } elseif ($ext && is_scalar($data[self::FIELD_SUBDETAIL_SEQUENCE])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_SUBDETAIL_SEQUENCE])) { $this->addSubdetailSequence(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_SUBDETAIL_SEQUENCE]] + $ext)); } else { $this->addSubdetailSequence(new FHIRPositiveInt($data[self::FIELD_SUBDETAIL_SEQUENCE])); @@ -677,8 +742,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_UNIT_PRICE] instanceof FHIRMoney) { $this->setUnitPrice($data[self::FIELD_UNIT_PRICE]); - } elseif ($ext && is_scalar($data[self::FIELD_UNIT_PRICE])) { - $this->setUnitPrice(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_UNIT_PRICE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_UNIT_PRICE])) { + $this->setUnitPrice(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_UNIT_PRICE]] + $ext)); + } else if (is_array($data[self::FIELD_UNIT_PRICE])) { + $this->setUnitPrice(new FHIRMoney(array_merge($ext, $data[self::FIELD_UNIT_PRICE]))); + } } else { $this->setUnitPrice(new FHIRMoney($data[self::FIELD_UNIT_PRICE])); } @@ -1882,7 +1951,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getAdjudication())) { foreach($vs as $v) { if (null === $v) { @@ -1895,7 +1963,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getBodySite())) { $v->xmlSerialize($sxe->addChild(self::FIELD_BODY_SITE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getDetail())) { foreach($vs as $v) { if (null === $v) { @@ -1904,6 +1971,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_DETAIL, null, $v->_getFHIRXMLNamespace())); } } + if ([] !== ($vs = $this->getDetailSequence())) { foreach($vs as $v) { if (null === $v) { @@ -1912,6 +1980,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_DETAIL_SEQUENCE, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getFactor())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FACTOR, null, $v->_getFHIRXMLNamespace())); } @@ -1927,15 +1996,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getLocationAddress())) { $v->xmlSerialize($sxe->addChild(self::FIELD_LOCATION_ADDRESS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getLocationCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_LOCATION_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getLocationReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_LOCATION_REFERENCE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getModifier())) { foreach($vs as $v) { if (null === $v) { @@ -1960,7 +2026,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getProductOrService())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PRODUCT_OR_SERVICE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getProgramCode())) { foreach($vs as $v) { if (null === $v) { @@ -1985,11 +2050,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getServicedDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SERVICED_DATE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getServicedPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SERVICED_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getSubSite())) { foreach($vs as $v) { if (null === $v) { @@ -1998,6 +2061,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_SUB_SITE, null, $v->_getFHIRXMLNamespace())); } } + if ([] !== ($vs = $this->getSubdetailSequence())) { foreach($vs as $v) { if (null === $v) { @@ -2020,7 +2084,23 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if ([] !== ($vs = $this->getAdjudication())) { - $a[self::FIELD_ADJUDICATION] = $vs; + $a[self::FIELD_ADJUDICATION] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ADJUDICATION][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ADJUDICATION_EXT][] = $enc; + } else { + $a[self::FIELD_ADJUDICATION_EXT][] = null; + } + } else { + $a[self::FIELD_ADJUDICATION][] = $v; + } + } } if (null !== ($v = $this->getBodySite())) { $a[self::FIELD_BODY_SITE] = $v; @@ -2034,13 +2114,29 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_DETAIL_SEQUENCE][] = $v->getValue(); - $a[self::FIELD_DETAIL_SEQUENCE_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DETAIL_SEQUENCE][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DETAIL_SEQUENCE_EXT][] = $enc; + } else { + $a[self::FIELD_DETAIL_SEQUENCE_EXT][] = null; + } + } else { + $a[self::FIELD_DETAIL_SEQUENCE][] = $v; + } } } if (null !== ($v = $this->getFactor())) { - $a[self::FIELD_FACTOR] = $v->getValue(); - $a[self::FIELD_FACTOR_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FACTOR] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FACTOR_EXT] = $enc; + } + } else { + $a[self::FIELD_FACTOR] = $v; + } } if ([] !== ($vs = $this->getItemSequence())) { $a[self::FIELD_ITEM_SEQUENCE] = []; @@ -2048,8 +2144,17 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_ITEM_SEQUENCE][] = $v->getValue(); - $a[self::FIELD_ITEM_SEQUENCE_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ITEM_SEQUENCE][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ITEM_SEQUENCE_EXT][] = $enc; + } else { + $a[self::FIELD_ITEM_SEQUENCE_EXT][] = null; + } + } else { + $a[self::FIELD_ITEM_SEQUENCE][] = $v; + } } } if (null !== ($v = $this->getLocationAddress())) { @@ -2065,7 +2170,15 @@ public function jsonSerialize() $a[self::FIELD_MODIFIER] = $vs; } if (null !== ($v = $this->getNet())) { - $a[self::FIELD_NET] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NET] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NET_EXT] = $enc; + } + } else { + $a[self::FIELD_NET] = $v; + } } if ([] !== ($vs = $this->getNoteNumber())) { $a[self::FIELD_NOTE_NUMBER] = []; @@ -2073,8 +2186,17 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_NOTE_NUMBER][] = $v->getValue(); - $a[self::FIELD_NOTE_NUMBER_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NOTE_NUMBER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NOTE_NUMBER_EXT][] = $enc; + } else { + $a[self::FIELD_NOTE_NUMBER_EXT][] = null; + } + } else { + $a[self::FIELD_NOTE_NUMBER][] = $v; + } } } if (null !== ($v = $this->getProductOrService())) { @@ -2087,11 +2209,26 @@ public function jsonSerialize() $a[self::FIELD_PROVIDER] = $vs; } if (null !== ($v = $this->getQuantity())) { - $a[self::FIELD_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_QUANTITY] = $v; + } } if (null !== ($v = $this->getServicedDate())) { - $a[self::FIELD_SERVICED_DATE] = $v->getValue(); - $a[self::FIELD_SERVICED_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SERVICED_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SERVICED_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_SERVICED_DATE] = $v; + } } if (null !== ($v = $this->getServicedPeriod())) { $a[self::FIELD_SERVICED_PERIOD] = $v; @@ -2105,12 +2242,29 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_SUBDETAIL_SEQUENCE][] = $v->getValue(); - $a[self::FIELD_SUBDETAIL_SEQUENCE_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SUBDETAIL_SEQUENCE][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SUBDETAIL_SEQUENCE_EXT][] = $enc; + } else { + $a[self::FIELD_SUBDETAIL_SEQUENCE_EXT][] = null; + } + } else { + $a[self::FIELD_SUBDETAIL_SEQUENCE][] = $v; + } } } if (null !== ($v = $this->getUnitPrice())) { - $a[self::FIELD_UNIT_PRICE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_UNIT_PRICE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_UNIT_PRICE_EXT] = $enc; + } + } else { + $a[self::FIELD_UNIT_PRICE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseAdjudication.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseAdjudication.php index 2e7608a82a..d68a83ca57 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseAdjudication.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseAdjudication.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRClaimResponseAdjudication extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CLAIM_RESPONSE_DOT_ADJUDICATION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_AMOUNT = 'amount'; const FIELD_AMOUNT_EXT = '_amount'; const FIELD_CATEGORY = 'category'; @@ -144,6 +140,9 @@ class FHIRClaimResponseAdjudication extends FHIRBackboneElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRClaimResponseAdjudication Constructor * @param null|array $data @@ -170,8 +169,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_AMOUNT] instanceof FHIRMoney) { $this->setAmount($data[self::FIELD_AMOUNT]); - } elseif ($ext && is_scalar($data[self::FIELD_AMOUNT])) { - $this->setAmount(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_AMOUNT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_AMOUNT])) { + $this->setAmount(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_AMOUNT]] + $ext)); + } else if (is_array($data[self::FIELD_AMOUNT])) { + $this->setAmount(new FHIRMoney(array_merge($ext, $data[self::FIELD_AMOUNT]))); + } } else { $this->setAmount(new FHIRMoney($data[self::FIELD_AMOUNT])); } @@ -196,8 +199,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE] instanceof FHIRDecimal) { $this->setValue($data[self::FIELD_VALUE]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE])) { - $this->setValue(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_VALUE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE])) { + $this->setValue(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_VALUE]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE])) { + $this->setValue(new FHIRDecimal(array_merge($ext, $data[self::FIELD_VALUE]))); + } } else { $this->setValue(new FHIRDecimal($data[self::FIELD_VALUE])); } @@ -464,19 +471,17 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getAmount())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AMOUNT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getCategory())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CATEGORY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getReason())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REASON, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getValue())) { + $sxe->addAttribute(self::FIELD_VALUE, (string)$v); $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE, null, $v->_getFHIRXMLNamespace())); } return $sxe; @@ -489,7 +494,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getAmount())) { - $a[self::FIELD_AMOUNT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_AMOUNT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_AMOUNT_EXT] = $enc; + } + } else { + $a[self::FIELD_AMOUNT] = $v; + } } if (null !== ($v = $this->getCategory())) { $a[self::FIELD_CATEGORY] = $v; @@ -498,8 +511,15 @@ public function jsonSerialize() $a[self::FIELD_REASON] = $v; } if (null !== ($v = $this->getValue())) { - $a[self::FIELD_VALUE] = $v->getValue(); - $a[self::FIELD_VALUE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseDetail.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseDetail.php index 21766c806e..06e6543e2f 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseDetail.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseDetail.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRClaimResponseDetail extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CLAIM_RESPONSE_DOT_DETAIL; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ADJUDICATION = 'adjudication'; const FIELD_ADJUDICATION_EXT = '_adjudication'; const FIELD_DETAIL_SEQUENCE = 'detailSequence'; @@ -133,6 +129,9 @@ class FHIRClaimResponseDetail extends FHIRBackboneElement */ protected $subDetail = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRClaimResponseDetail Constructor * @param null|array $data @@ -155,17 +154,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_ADJUDICATION])) { foreach($data[self::FIELD_ADJUDICATION] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRClaimResponseAdjudication) { $this->addAdjudication($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addAdjudication(new FHIRClaimResponseAdjudication([FHIRClaimResponseAdjudication::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addAdjudication(new FHIRClaimResponseAdjudication([FHIRClaimResponseAdjudication::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addAdjudication(new FHIRClaimResponseAdjudication(array_merge($v, $ext[$i]))); + } } else { $this->addAdjudication(new FHIRClaimResponseAdjudication($v)); } } } elseif ($data[self::FIELD_ADJUDICATION] instanceof FHIRClaimResponseAdjudication) { $this->addAdjudication($data[self::FIELD_ADJUDICATION]); - } elseif ($ext && is_scalar($data[self::FIELD_ADJUDICATION])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_ADJUDICATION])) { $this->addAdjudication(new FHIRClaimResponseAdjudication([FHIRClaimResponseAdjudication::FIELD_VALUE => $data[self::FIELD_ADJUDICATION]] + $ext)); } else { $this->addAdjudication(new FHIRClaimResponseAdjudication($data[self::FIELD_ADJUDICATION])); @@ -177,8 +183,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DETAIL_SEQUENCE] instanceof FHIRPositiveInt) { $this->setDetailSequence($data[self::FIELD_DETAIL_SEQUENCE]); - } elseif ($ext && is_scalar($data[self::FIELD_DETAIL_SEQUENCE])) { - $this->setDetailSequence(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_DETAIL_SEQUENCE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DETAIL_SEQUENCE])) { + $this->setDetailSequence(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_DETAIL_SEQUENCE]] + $ext)); + } else if (is_array($data[self::FIELD_DETAIL_SEQUENCE])) { + $this->setDetailSequence(new FHIRPositiveInt(array_merge($ext, $data[self::FIELD_DETAIL_SEQUENCE]))); + } } else { $this->setDetailSequence(new FHIRPositiveInt($data[self::FIELD_DETAIL_SEQUENCE])); } @@ -189,17 +199,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_NOTE_NUMBER])) { foreach($data[self::FIELD_NOTE_NUMBER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRPositiveInt) { $this->addNoteNumber($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addNoteNumber(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addNoteNumber(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addNoteNumber(new FHIRPositiveInt(array_merge($v, $ext[$i]))); + } } else { $this->addNoteNumber(new FHIRPositiveInt($v)); } } } elseif ($data[self::FIELD_NOTE_NUMBER] instanceof FHIRPositiveInt) { $this->addNoteNumber($data[self::FIELD_NOTE_NUMBER]); - } elseif ($ext && is_scalar($data[self::FIELD_NOTE_NUMBER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_NOTE_NUMBER])) { $this->addNoteNumber(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_NOTE_NUMBER]] + $ext)); } else { $this->addNoteNumber(new FHIRPositiveInt($data[self::FIELD_NOTE_NUMBER])); @@ -208,6 +225,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SUB_DETAIL])) { if (is_array($data[self::FIELD_SUB_DETAIL])) { foreach($data[self::FIELD_SUB_DETAIL] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRClaimResponseSubDetail) { $this->addSubDetail($v); } else { @@ -556,7 +576,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getAdjudication())) { foreach($vs as $v) { if (null === $v) { @@ -565,6 +584,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_ADJUDICATION, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getDetailSequence())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DETAIL_SEQUENCE, null, $v->_getFHIRXMLNamespace())); } @@ -585,6 +605,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_SUB_DETAIL, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } @@ -595,11 +616,34 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if ([] !== ($vs = $this->getAdjudication())) { - $a[self::FIELD_ADJUDICATION] = $vs; + $a[self::FIELD_ADJUDICATION] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ADJUDICATION][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ADJUDICATION_EXT][] = $enc; + } else { + $a[self::FIELD_ADJUDICATION_EXT][] = null; + } + } else { + $a[self::FIELD_ADJUDICATION][] = $v; + } + } } if (null !== ($v = $this->getDetailSequence())) { - $a[self::FIELD_DETAIL_SEQUENCE] = $v->getValue(); - $a[self::FIELD_DETAIL_SEQUENCE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DETAIL_SEQUENCE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DETAIL_SEQUENCE_EXT] = $enc; + } + } else { + $a[self::FIELD_DETAIL_SEQUENCE] = $v; + } } if ([] !== ($vs = $this->getNoteNumber())) { $a[self::FIELD_NOTE_NUMBER] = []; @@ -607,8 +651,17 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_NOTE_NUMBER][] = $v->getValue(); - $a[self::FIELD_NOTE_NUMBER_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NOTE_NUMBER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NOTE_NUMBER_EXT][] = $enc; + } else { + $a[self::FIELD_NOTE_NUMBER_EXT][] = null; + } + } else { + $a[self::FIELD_NOTE_NUMBER][] = $v; + } } } if ([] !== ($vs = $this->getSubDetail())) { diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseDetail1.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseDetail1.php index 75871c91f1..f255175624 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseDetail1.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseDetail1.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -82,10 +82,6 @@ class FHIRClaimResponseDetail1 extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CLAIM_RESPONSE_DOT_DETAIL_1; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ADJUDICATION = 'adjudication'; const FIELD_ADJUDICATION_EXT = '_adjudication'; const FIELD_FACTOR = 'factor'; @@ -212,6 +208,9 @@ class FHIRClaimResponseDetail1 extends FHIRBackboneElement */ protected $unitPrice = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRClaimResponseDetail1 Constructor * @param null|array $data @@ -234,17 +233,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_ADJUDICATION])) { foreach($data[self::FIELD_ADJUDICATION] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRClaimResponseAdjudication) { $this->addAdjudication($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addAdjudication(new FHIRClaimResponseAdjudication([FHIRClaimResponseAdjudication::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addAdjudication(new FHIRClaimResponseAdjudication([FHIRClaimResponseAdjudication::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addAdjudication(new FHIRClaimResponseAdjudication(array_merge($v, $ext[$i]))); + } } else { $this->addAdjudication(new FHIRClaimResponseAdjudication($v)); } } } elseif ($data[self::FIELD_ADJUDICATION] instanceof FHIRClaimResponseAdjudication) { $this->addAdjudication($data[self::FIELD_ADJUDICATION]); - } elseif ($ext && is_scalar($data[self::FIELD_ADJUDICATION])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_ADJUDICATION])) { $this->addAdjudication(new FHIRClaimResponseAdjudication([FHIRClaimResponseAdjudication::FIELD_VALUE => $data[self::FIELD_ADJUDICATION]] + $ext)); } else { $this->addAdjudication(new FHIRClaimResponseAdjudication($data[self::FIELD_ADJUDICATION])); @@ -256,8 +262,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_FACTOR] instanceof FHIRDecimal) { $this->setFactor($data[self::FIELD_FACTOR]); - } elseif ($ext && is_scalar($data[self::FIELD_FACTOR])) { - $this->setFactor(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_FACTOR]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_FACTOR])) { + $this->setFactor(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_FACTOR]] + $ext)); + } else if (is_array($data[self::FIELD_FACTOR])) { + $this->setFactor(new FHIRDecimal(array_merge($ext, $data[self::FIELD_FACTOR]))); + } } else { $this->setFactor(new FHIRDecimal($data[self::FIELD_FACTOR])); } @@ -265,6 +275,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_MODIFIER])) { if (is_array($data[self::FIELD_MODIFIER])) { foreach($data[self::FIELD_MODIFIER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addModifier($v); } else { @@ -283,8 +296,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NET] instanceof FHIRMoney) { $this->setNet($data[self::FIELD_NET]); - } elseif ($ext && is_scalar($data[self::FIELD_NET])) { - $this->setNet(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_NET]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NET])) { + $this->setNet(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_NET]] + $ext)); + } else if (is_array($data[self::FIELD_NET])) { + $this->setNet(new FHIRMoney(array_merge($ext, $data[self::FIELD_NET]))); + } } else { $this->setNet(new FHIRMoney($data[self::FIELD_NET])); } @@ -295,17 +312,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_NOTE_NUMBER])) { foreach($data[self::FIELD_NOTE_NUMBER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRPositiveInt) { $this->addNoteNumber($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addNoteNumber(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addNoteNumber(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addNoteNumber(new FHIRPositiveInt(array_merge($v, $ext[$i]))); + } } else { $this->addNoteNumber(new FHIRPositiveInt($v)); } } } elseif ($data[self::FIELD_NOTE_NUMBER] instanceof FHIRPositiveInt) { $this->addNoteNumber($data[self::FIELD_NOTE_NUMBER]); - } elseif ($ext && is_scalar($data[self::FIELD_NOTE_NUMBER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_NOTE_NUMBER])) { $this->addNoteNumber(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_NOTE_NUMBER]] + $ext)); } else { $this->addNoteNumber(new FHIRPositiveInt($data[self::FIELD_NOTE_NUMBER])); @@ -324,8 +348,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_QUANTITY] instanceof FHIRQuantity) { $this->setQuantity($data[self::FIELD_QUANTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_QUANTITY])) { - $this->setQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_QUANTITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_QUANTITY])) { + $this->setQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_QUANTITY])) { + $this->setQuantity(new FHIRQuantity(array_merge($ext, $data[self::FIELD_QUANTITY]))); + } } else { $this->setQuantity(new FHIRQuantity($data[self::FIELD_QUANTITY])); } @@ -333,6 +361,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SUB_DETAIL])) { if (is_array($data[self::FIELD_SUB_DETAIL])) { foreach($data[self::FIELD_SUB_DETAIL] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRClaimResponseSubDetail1) { $this->addSubDetail($v); } else { @@ -351,8 +382,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_UNIT_PRICE] instanceof FHIRMoney) { $this->setUnitPrice($data[self::FIELD_UNIT_PRICE]); - } elseif ($ext && is_scalar($data[self::FIELD_UNIT_PRICE])) { - $this->setUnitPrice(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_UNIT_PRICE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_UNIT_PRICE])) { + $this->setUnitPrice(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_UNIT_PRICE]] + $ext)); + } else if (is_array($data[self::FIELD_UNIT_PRICE])) { + $this->setUnitPrice(new FHIRMoney(array_merge($ext, $data[self::FIELD_UNIT_PRICE]))); + } } else { $this->setUnitPrice(new FHIRMoney($data[self::FIELD_UNIT_PRICE])); } @@ -912,7 +947,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getAdjudication())) { foreach($vs as $v) { if (null === $v) { @@ -921,10 +955,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_ADJUDICATION, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getFactor())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FACTOR, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getModifier())) { foreach($vs as $v) { if (null === $v) { @@ -949,11 +983,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getProductOrService())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PRODUCT_OR_SERVICE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_QUANTITY, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getSubDetail())) { foreach($vs as $v) { if (null === $v) { @@ -976,17 +1008,48 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if ([] !== ($vs = $this->getAdjudication())) { - $a[self::FIELD_ADJUDICATION] = $vs; + $a[self::FIELD_ADJUDICATION] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ADJUDICATION][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ADJUDICATION_EXT][] = $enc; + } else { + $a[self::FIELD_ADJUDICATION_EXT][] = null; + } + } else { + $a[self::FIELD_ADJUDICATION][] = $v; + } + } } if (null !== ($v = $this->getFactor())) { - $a[self::FIELD_FACTOR] = $v->getValue(); - $a[self::FIELD_FACTOR_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FACTOR] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FACTOR_EXT] = $enc; + } + } else { + $a[self::FIELD_FACTOR] = $v; + } } if ([] !== ($vs = $this->getModifier())) { $a[self::FIELD_MODIFIER] = $vs; } if (null !== ($v = $this->getNet())) { - $a[self::FIELD_NET] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NET] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NET_EXT] = $enc; + } + } else { + $a[self::FIELD_NET] = $v; + } } if ([] !== ($vs = $this->getNoteNumber())) { $a[self::FIELD_NOTE_NUMBER] = []; @@ -994,21 +1057,46 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_NOTE_NUMBER][] = $v->getValue(); - $a[self::FIELD_NOTE_NUMBER_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NOTE_NUMBER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NOTE_NUMBER_EXT][] = $enc; + } else { + $a[self::FIELD_NOTE_NUMBER_EXT][] = null; + } + } else { + $a[self::FIELD_NOTE_NUMBER][] = $v; + } } } if (null !== ($v = $this->getProductOrService())) { $a[self::FIELD_PRODUCT_OR_SERVICE] = $v; } if (null !== ($v = $this->getQuantity())) { - $a[self::FIELD_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_QUANTITY] = $v; + } } if ([] !== ($vs = $this->getSubDetail())) { $a[self::FIELD_SUB_DETAIL] = $vs; } if (null !== ($v = $this->getUnitPrice())) { - $a[self::FIELD_UNIT_PRICE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_UNIT_PRICE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_UNIT_PRICE_EXT] = $enc; + } + } else { + $a[self::FIELD_UNIT_PRICE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseError.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseError.php index 344a0558d1..bc3db55ba9 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseError.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseError.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRClaimResponseError extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CLAIM_RESPONSE_DOT_ERROR; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CODE = 'code'; const FIELD_DETAIL_SEQUENCE = 'detailSequence'; const FIELD_DETAIL_SEQUENCE_EXT = '_detailSequence'; @@ -142,6 +138,9 @@ class FHIRClaimResponseError extends FHIRBackboneElement */ protected $subDetailSequence = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRClaimResponseError Constructor * @param null|array $data @@ -171,8 +170,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DETAIL_SEQUENCE] instanceof FHIRPositiveInt) { $this->setDetailSequence($data[self::FIELD_DETAIL_SEQUENCE]); - } elseif ($ext && is_scalar($data[self::FIELD_DETAIL_SEQUENCE])) { - $this->setDetailSequence(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_DETAIL_SEQUENCE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DETAIL_SEQUENCE])) { + $this->setDetailSequence(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_DETAIL_SEQUENCE]] + $ext)); + } else if (is_array($data[self::FIELD_DETAIL_SEQUENCE])) { + $this->setDetailSequence(new FHIRPositiveInt(array_merge($ext, $data[self::FIELD_DETAIL_SEQUENCE]))); + } } else { $this->setDetailSequence(new FHIRPositiveInt($data[self::FIELD_DETAIL_SEQUENCE])); } @@ -183,8 +186,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ITEM_SEQUENCE] instanceof FHIRPositiveInt) { $this->setItemSequence($data[self::FIELD_ITEM_SEQUENCE]); - } elseif ($ext && is_scalar($data[self::FIELD_ITEM_SEQUENCE])) { - $this->setItemSequence(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_ITEM_SEQUENCE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ITEM_SEQUENCE])) { + $this->setItemSequence(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_ITEM_SEQUENCE]] + $ext)); + } else if (is_array($data[self::FIELD_ITEM_SEQUENCE])) { + $this->setItemSequence(new FHIRPositiveInt(array_merge($ext, $data[self::FIELD_ITEM_SEQUENCE]))); + } } else { $this->setItemSequence(new FHIRPositiveInt($data[self::FIELD_ITEM_SEQUENCE])); } @@ -195,8 +202,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SUB_DETAIL_SEQUENCE] instanceof FHIRPositiveInt) { $this->setSubDetailSequence($data[self::FIELD_SUB_DETAIL_SEQUENCE]); - } elseif ($ext && is_scalar($data[self::FIELD_SUB_DETAIL_SEQUENCE])) { - $this->setSubDetailSequence(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_SUB_DETAIL_SEQUENCE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SUB_DETAIL_SEQUENCE])) { + $this->setSubDetailSequence(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_SUB_DETAIL_SEQUENCE]] + $ext)); + } else if (is_array($data[self::FIELD_SUB_DETAIL_SEQUENCE])) { + $this->setSubDetailSequence(new FHIRPositiveInt(array_merge($ext, $data[self::FIELD_SUB_DETAIL_SEQUENCE]))); + } } else { $this->setSubDetailSequence(new FHIRPositiveInt($data[self::FIELD_SUB_DETAIL_SEQUENCE])); } @@ -481,7 +492,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } @@ -507,16 +517,37 @@ public function jsonSerialize() $a[self::FIELD_CODE] = $v; } if (null !== ($v = $this->getDetailSequence())) { - $a[self::FIELD_DETAIL_SEQUENCE] = $v->getValue(); - $a[self::FIELD_DETAIL_SEQUENCE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DETAIL_SEQUENCE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DETAIL_SEQUENCE_EXT] = $enc; + } + } else { + $a[self::FIELD_DETAIL_SEQUENCE] = $v; + } } if (null !== ($v = $this->getItemSequence())) { - $a[self::FIELD_ITEM_SEQUENCE] = $v->getValue(); - $a[self::FIELD_ITEM_SEQUENCE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ITEM_SEQUENCE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ITEM_SEQUENCE_EXT] = $enc; + } + } else { + $a[self::FIELD_ITEM_SEQUENCE] = $v; + } } if (null !== ($v = $this->getSubDetailSequence())) { - $a[self::FIELD_SUB_DETAIL_SEQUENCE] = $v->getValue(); - $a[self::FIELD_SUB_DETAIL_SEQUENCE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SUB_DETAIL_SEQUENCE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SUB_DETAIL_SEQUENCE_EXT] = $enc; + } + } else { + $a[self::FIELD_SUB_DETAIL_SEQUENCE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseInsurance.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseInsurance.php index bfab0f0f56..2caf2e3004 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseInsurance.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseInsurance.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -81,10 +81,6 @@ class FHIRClaimResponseInsurance extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CLAIM_RESPONSE_DOT_INSURANCE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_BUSINESS_ARRANGEMENT = 'businessArrangement'; const FIELD_BUSINESS_ARRANGEMENT_EXT = '_businessArrangement'; const FIELD_CLAIM_RESPONSE = 'claimResponse'; @@ -154,6 +150,9 @@ class FHIRClaimResponseInsurance extends FHIRBackboneElement */ protected $sequence = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRClaimResponseInsurance Constructor * @param null|array $data @@ -176,8 +175,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_BUSINESS_ARRANGEMENT] instanceof FHIRString) { $this->setBusinessArrangement($data[self::FIELD_BUSINESS_ARRANGEMENT]); - } elseif ($ext && is_scalar($data[self::FIELD_BUSINESS_ARRANGEMENT])) { - $this->setBusinessArrangement(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_BUSINESS_ARRANGEMENT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_BUSINESS_ARRANGEMENT])) { + $this->setBusinessArrangement(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_BUSINESS_ARRANGEMENT]] + $ext)); + } else if (is_array($data[self::FIELD_BUSINESS_ARRANGEMENT])) { + $this->setBusinessArrangement(new FHIRString(array_merge($ext, $data[self::FIELD_BUSINESS_ARRANGEMENT]))); + } } else { $this->setBusinessArrangement(new FHIRString($data[self::FIELD_BUSINESS_ARRANGEMENT])); } @@ -202,8 +205,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_FOCAL] instanceof FHIRBoolean) { $this->setFocal($data[self::FIELD_FOCAL]); - } elseif ($ext && is_scalar($data[self::FIELD_FOCAL])) { - $this->setFocal(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_FOCAL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_FOCAL])) { + $this->setFocal(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_FOCAL]] + $ext)); + } else if (is_array($data[self::FIELD_FOCAL])) { + $this->setFocal(new FHIRBoolean(array_merge($ext, $data[self::FIELD_FOCAL]))); + } } else { $this->setFocal(new FHIRBoolean($data[self::FIELD_FOCAL])); } @@ -214,8 +221,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SEQUENCE] instanceof FHIRPositiveInt) { $this->setSequence($data[self::FIELD_SEQUENCE]); - } elseif ($ext && is_scalar($data[self::FIELD_SEQUENCE])) { - $this->setSequence(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_SEQUENCE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SEQUENCE])) { + $this->setSequence(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_SEQUENCE]] + $ext)); + } else if (is_array($data[self::FIELD_SEQUENCE])) { + $this->setSequence(new FHIRPositiveInt(array_merge($ext, $data[self::FIELD_SEQUENCE]))); + } } else { $this->setSequence(new FHIRPositiveInt($data[self::FIELD_SEQUENCE])); } @@ -532,11 +543,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getBusinessArrangement())) { $v->xmlSerialize($sxe->addChild(self::FIELD_BUSINESS_ARRANGEMENT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getClaimResponse())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CLAIM_RESPONSE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getCoverage())) { $v->xmlSerialize($sxe->addChild(self::FIELD_COVERAGE, null, $v->_getFHIRXMLNamespace())); } @@ -556,8 +565,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getBusinessArrangement())) { - $a[self::FIELD_BUSINESS_ARRANGEMENT] = $v->getValue(); - $a[self::FIELD_BUSINESS_ARRANGEMENT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_BUSINESS_ARRANGEMENT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_BUSINESS_ARRANGEMENT_EXT] = $enc; + } + } else { + $a[self::FIELD_BUSINESS_ARRANGEMENT] = $v; + } } if (null !== ($v = $this->getClaimResponse())) { $a[self::FIELD_CLAIM_RESPONSE] = $v; @@ -566,12 +582,26 @@ public function jsonSerialize() $a[self::FIELD_COVERAGE] = $v; } if (null !== ($v = $this->getFocal())) { - $a[self::FIELD_FOCAL] = $v->getValue(); - $a[self::FIELD_FOCAL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FOCAL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FOCAL_EXT] = $enc; + } + } else { + $a[self::FIELD_FOCAL] = $v; + } } if (null !== ($v = $this->getSequence())) { - $a[self::FIELD_SEQUENCE] = $v->getValue(); - $a[self::FIELD_SEQUENCE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SEQUENCE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SEQUENCE_EXT] = $enc; + } + } else { + $a[self::FIELD_SEQUENCE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseItem.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseItem.php index d4ce5b94da..52fd02563e 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseItem.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseItem.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRClaimResponseItem extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CLAIM_RESPONSE_DOT_ITEM; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ADJUDICATION = 'adjudication'; const FIELD_ADJUDICATION_EXT = '_adjudication'; const FIELD_DETAIL = 'detail'; @@ -136,6 +132,9 @@ class FHIRClaimResponseItem extends FHIRBackboneElement */ protected $noteNumber = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRClaimResponseItem Constructor * @param null|array $data @@ -158,17 +157,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_ADJUDICATION])) { foreach($data[self::FIELD_ADJUDICATION] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRClaimResponseAdjudication) { $this->addAdjudication($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addAdjudication(new FHIRClaimResponseAdjudication([FHIRClaimResponseAdjudication::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addAdjudication(new FHIRClaimResponseAdjudication([FHIRClaimResponseAdjudication::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addAdjudication(new FHIRClaimResponseAdjudication(array_merge($v, $ext[$i]))); + } } else { $this->addAdjudication(new FHIRClaimResponseAdjudication($v)); } } } elseif ($data[self::FIELD_ADJUDICATION] instanceof FHIRClaimResponseAdjudication) { $this->addAdjudication($data[self::FIELD_ADJUDICATION]); - } elseif ($ext && is_scalar($data[self::FIELD_ADJUDICATION])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_ADJUDICATION])) { $this->addAdjudication(new FHIRClaimResponseAdjudication([FHIRClaimResponseAdjudication::FIELD_VALUE => $data[self::FIELD_ADJUDICATION]] + $ext)); } else { $this->addAdjudication(new FHIRClaimResponseAdjudication($data[self::FIELD_ADJUDICATION])); @@ -177,6 +183,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_DETAIL])) { if (is_array($data[self::FIELD_DETAIL])) { foreach($data[self::FIELD_DETAIL] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRClaimResponseDetail) { $this->addDetail($v); } else { @@ -195,8 +204,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ITEM_SEQUENCE] instanceof FHIRPositiveInt) { $this->setItemSequence($data[self::FIELD_ITEM_SEQUENCE]); - } elseif ($ext && is_scalar($data[self::FIELD_ITEM_SEQUENCE])) { - $this->setItemSequence(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_ITEM_SEQUENCE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ITEM_SEQUENCE])) { + $this->setItemSequence(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_ITEM_SEQUENCE]] + $ext)); + } else if (is_array($data[self::FIELD_ITEM_SEQUENCE])) { + $this->setItemSequence(new FHIRPositiveInt(array_merge($ext, $data[self::FIELD_ITEM_SEQUENCE]))); + } } else { $this->setItemSequence(new FHIRPositiveInt($data[self::FIELD_ITEM_SEQUENCE])); } @@ -207,17 +220,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_NOTE_NUMBER])) { foreach($data[self::FIELD_NOTE_NUMBER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRPositiveInt) { $this->addNoteNumber($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addNoteNumber(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addNoteNumber(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addNoteNumber(new FHIRPositiveInt(array_merge($v, $ext[$i]))); + } } else { $this->addNoteNumber(new FHIRPositiveInt($v)); } } } elseif ($data[self::FIELD_NOTE_NUMBER] instanceof FHIRPositiveInt) { $this->addNoteNumber($data[self::FIELD_NOTE_NUMBER]); - } elseif ($ext && is_scalar($data[self::FIELD_NOTE_NUMBER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_NOTE_NUMBER])) { $this->addNoteNumber(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_NOTE_NUMBER]] + $ext)); } else { $this->addNoteNumber(new FHIRPositiveInt($data[self::FIELD_NOTE_NUMBER])); @@ -568,7 +588,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getAdjudication())) { foreach($vs as $v) { if (null === $v) { @@ -586,6 +605,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_DETAIL, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getItemSequence())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ITEM_SEQUENCE, null, $v->_getFHIRXMLNamespace())); } @@ -597,6 +617,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_NOTE_NUMBER, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } @@ -607,14 +628,37 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if ([] !== ($vs = $this->getAdjudication())) { - $a[self::FIELD_ADJUDICATION] = $vs; + $a[self::FIELD_ADJUDICATION] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ADJUDICATION][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ADJUDICATION_EXT][] = $enc; + } else { + $a[self::FIELD_ADJUDICATION_EXT][] = null; + } + } else { + $a[self::FIELD_ADJUDICATION][] = $v; + } + } } if ([] !== ($vs = $this->getDetail())) { $a[self::FIELD_DETAIL] = $vs; } if (null !== ($v = $this->getItemSequence())) { - $a[self::FIELD_ITEM_SEQUENCE] = $v->getValue(); - $a[self::FIELD_ITEM_SEQUENCE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ITEM_SEQUENCE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ITEM_SEQUENCE_EXT] = $enc; + } + } else { + $a[self::FIELD_ITEM_SEQUENCE] = $v; + } } if ([] !== ($vs = $this->getNoteNumber())) { $a[self::FIELD_NOTE_NUMBER] = []; @@ -622,8 +666,17 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_NOTE_NUMBER][] = $v->getValue(); - $a[self::FIELD_NOTE_NUMBER_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NOTE_NUMBER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NOTE_NUMBER_EXT][] = $enc; + } else { + $a[self::FIELD_NOTE_NUMBER_EXT][] = null; + } + } else { + $a[self::FIELD_NOTE_NUMBER][] = $v; + } } } return $a; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponsePayment.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponsePayment.php index bbe0aece4b..422bbd7958 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponsePayment.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponsePayment.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -81,10 +81,6 @@ class FHIRClaimResponsePayment extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CLAIM_RESPONSE_DOT_PAYMENT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ADJUSTMENT = 'adjustment'; const FIELD_ADJUSTMENT_EXT = '_adjustment'; const FIELD_ADJUSTMENT_REASON = 'adjustmentReason'; @@ -167,6 +163,9 @@ class FHIRClaimResponsePayment extends FHIRBackboneElement */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRClaimResponsePayment Constructor * @param null|array $data @@ -189,8 +188,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ADJUSTMENT] instanceof FHIRMoney) { $this->setAdjustment($data[self::FIELD_ADJUSTMENT]); - } elseif ($ext && is_scalar($data[self::FIELD_ADJUSTMENT])) { - $this->setAdjustment(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_ADJUSTMENT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ADJUSTMENT])) { + $this->setAdjustment(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_ADJUSTMENT]] + $ext)); + } else if (is_array($data[self::FIELD_ADJUSTMENT])) { + $this->setAdjustment(new FHIRMoney(array_merge($ext, $data[self::FIELD_ADJUSTMENT]))); + } } else { $this->setAdjustment(new FHIRMoney($data[self::FIELD_ADJUSTMENT])); } @@ -208,8 +211,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_AMOUNT] instanceof FHIRMoney) { $this->setAmount($data[self::FIELD_AMOUNT]); - } elseif ($ext && is_scalar($data[self::FIELD_AMOUNT])) { - $this->setAmount(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_AMOUNT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_AMOUNT])) { + $this->setAmount(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_AMOUNT]] + $ext)); + } else if (is_array($data[self::FIELD_AMOUNT])) { + $this->setAmount(new FHIRMoney(array_merge($ext, $data[self::FIELD_AMOUNT]))); + } } else { $this->setAmount(new FHIRMoney($data[self::FIELD_AMOUNT])); } @@ -220,8 +227,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATE] instanceof FHIRDate) { $this->setDate($data[self::FIELD_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_DATE])) { - $this->setDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDate(array_merge($ext, $data[self::FIELD_DATE]))); + } } else { $this->setDate(new FHIRDate($data[self::FIELD_DATE])); } @@ -232,8 +243,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->setIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { - $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_IDENTIFIER]))); + } } else { $this->setIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); } @@ -565,26 +580,21 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getAdjustment())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ADJUSTMENT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getAdjustmentReason())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ADJUSTMENT_REASON, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getAmount())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AMOUNT, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DATE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -598,20 +608,51 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getAdjustment())) { - $a[self::FIELD_ADJUSTMENT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ADJUSTMENT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ADJUSTMENT_EXT] = $enc; + } + } else { + $a[self::FIELD_ADJUSTMENT] = $v; + } } if (null !== ($v = $this->getAdjustmentReason())) { $a[self::FIELD_ADJUSTMENT_REASON] = $v; } if (null !== ($v = $this->getAmount())) { - $a[self::FIELD_AMOUNT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_AMOUNT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_AMOUNT_EXT] = $enc; + } + } else { + $a[self::FIELD_AMOUNT] = $v; + } } if (null !== ($v = $this->getDate())) { - $a[self::FIELD_DATE] = $v->getValue(); - $a[self::FIELD_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_DATE] = $v; + } } if (null !== ($v = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_IDENTIFIER] = $v; + } } if (null !== ($v = $this->getType())) { $a[self::FIELD_TYPE] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseProcessNote.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseProcessNote.php index ede6a0a3cf..b4b96e96ff 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseProcessNote.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseProcessNote.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -81,10 +81,6 @@ class FHIRClaimResponseProcessNote extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CLAIM_RESPONSE_DOT_PROCESS_NOTE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_LANGUAGE = 'language'; const FIELD_NUMBER = 'number'; const FIELD_NUMBER_EXT = '_number'; @@ -136,6 +132,9 @@ class FHIRClaimResponseProcessNote extends FHIRBackboneElement */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRClaimResponseProcessNote Constructor * @param null|array $data @@ -165,8 +164,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NUMBER] instanceof FHIRPositiveInt) { $this->setNumber($data[self::FIELD_NUMBER]); - } elseif ($ext && is_scalar($data[self::FIELD_NUMBER])) { - $this->setNumber(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_NUMBER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NUMBER])) { + $this->setNumber(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_NUMBER]] + $ext)); + } else if (is_array($data[self::FIELD_NUMBER])) { + $this->setNumber(new FHIRPositiveInt(array_merge($ext, $data[self::FIELD_NUMBER]))); + } } else { $this->setNumber(new FHIRPositiveInt($data[self::FIELD_NUMBER])); } @@ -177,8 +180,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TEXT] instanceof FHIRString) { $this->setText($data[self::FIELD_TEXT]); - } elseif ($ext && is_scalar($data[self::FIELD_TEXT])) { - $this->setText(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TEXT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TEXT])) { + $this->setText(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TEXT]] + $ext)); + } else if (is_array($data[self::FIELD_TEXT])) { + $this->setText(new FHIRString(array_merge($ext, $data[self::FIELD_TEXT]))); + } } else { $this->setText(new FHIRString($data[self::FIELD_TEXT])); } @@ -189,8 +196,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TYPE] instanceof FHIRNoteType) { $this->setType($data[self::FIELD_TYPE]); - } elseif ($ext && is_scalar($data[self::FIELD_TYPE])) { - $this->setType(new FHIRNoteType([FHIRNoteType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TYPE])) { + $this->setType(new FHIRNoteType([FHIRNoteType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } else if (is_array($data[self::FIELD_TYPE])) { + $this->setType(new FHIRNoteType(array_merge($ext, $data[self::FIELD_TYPE]))); + } } else { $this->setType(new FHIRNoteType($data[self::FIELD_TYPE])); } @@ -448,7 +459,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getLanguage())) { $v->xmlSerialize($sxe->addChild(self::FIELD_LANGUAGE, null, $v->_getFHIRXMLNamespace())); } @@ -458,7 +468,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getText())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TEXT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -475,15 +484,37 @@ public function jsonSerialize() $a[self::FIELD_LANGUAGE] = $v; } if (null !== ($v = $this->getNumber())) { - $a[self::FIELD_NUMBER] = $v->getValue(); - $a[self::FIELD_NUMBER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NUMBER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NUMBER_EXT] = $enc; + } + } else { + $a[self::FIELD_NUMBER] = $v; + } } if (null !== ($v = $this->getText())) { - $a[self::FIELD_TEXT] = $v->getValue(); - $a[self::FIELD_TEXT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TEXT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TEXT_EXT] = $enc; + } + } else { + $a[self::FIELD_TEXT] = $v; + } } if (null !== ($v = $this->getType())) { - $a[self::FIELD_TYPE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TYPE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TYPE_EXT] = $enc; + } + } else { + $a[self::FIELD_TYPE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseSubDetail.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseSubDetail.php index ae2d792ebf..abdc98176b 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseSubDetail.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseSubDetail.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRClaimResponseSubDetail extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CLAIM_RESPONSE_DOT_SUB_DETAIL; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ADJUDICATION = 'adjudication'; const FIELD_ADJUDICATION_EXT = '_adjudication'; const FIELD_NOTE_NUMBER = 'noteNumber'; @@ -122,6 +118,9 @@ class FHIRClaimResponseSubDetail extends FHIRBackboneElement */ protected $subDetailSequence = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRClaimResponseSubDetail Constructor * @param null|array $data @@ -144,17 +143,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_ADJUDICATION])) { foreach($data[self::FIELD_ADJUDICATION] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRClaimResponseAdjudication) { $this->addAdjudication($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addAdjudication(new FHIRClaimResponseAdjudication([FHIRClaimResponseAdjudication::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addAdjudication(new FHIRClaimResponseAdjudication([FHIRClaimResponseAdjudication::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addAdjudication(new FHIRClaimResponseAdjudication(array_merge($v, $ext[$i]))); + } } else { $this->addAdjudication(new FHIRClaimResponseAdjudication($v)); } } } elseif ($data[self::FIELD_ADJUDICATION] instanceof FHIRClaimResponseAdjudication) { $this->addAdjudication($data[self::FIELD_ADJUDICATION]); - } elseif ($ext && is_scalar($data[self::FIELD_ADJUDICATION])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_ADJUDICATION])) { $this->addAdjudication(new FHIRClaimResponseAdjudication([FHIRClaimResponseAdjudication::FIELD_VALUE => $data[self::FIELD_ADJUDICATION]] + $ext)); } else { $this->addAdjudication(new FHIRClaimResponseAdjudication($data[self::FIELD_ADJUDICATION])); @@ -166,17 +172,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_NOTE_NUMBER])) { foreach($data[self::FIELD_NOTE_NUMBER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRPositiveInt) { $this->addNoteNumber($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addNoteNumber(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addNoteNumber(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addNoteNumber(new FHIRPositiveInt(array_merge($v, $ext[$i]))); + } } else { $this->addNoteNumber(new FHIRPositiveInt($v)); } } } elseif ($data[self::FIELD_NOTE_NUMBER] instanceof FHIRPositiveInt) { $this->addNoteNumber($data[self::FIELD_NOTE_NUMBER]); - } elseif ($ext && is_scalar($data[self::FIELD_NOTE_NUMBER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_NOTE_NUMBER])) { $this->addNoteNumber(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_NOTE_NUMBER]] + $ext)); } else { $this->addNoteNumber(new FHIRPositiveInt($data[self::FIELD_NOTE_NUMBER])); @@ -188,8 +201,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SUB_DETAIL_SEQUENCE] instanceof FHIRPositiveInt) { $this->setSubDetailSequence($data[self::FIELD_SUB_DETAIL_SEQUENCE]); - } elseif ($ext && is_scalar($data[self::FIELD_SUB_DETAIL_SEQUENCE])) { - $this->setSubDetailSequence(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_SUB_DETAIL_SEQUENCE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SUB_DETAIL_SEQUENCE])) { + $this->setSubDetailSequence(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_SUB_DETAIL_SEQUENCE]] + $ext)); + } else if (is_array($data[self::FIELD_SUB_DETAIL_SEQUENCE])) { + $this->setSubDetailSequence(new FHIRPositiveInt(array_merge($ext, $data[self::FIELD_SUB_DETAIL_SEQUENCE]))); + } } else { $this->setSubDetailSequence(new FHIRPositiveInt($data[self::FIELD_SUB_DETAIL_SEQUENCE])); } @@ -472,7 +489,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getAdjudication())) { foreach($vs as $v) { if (null === $v) { @@ -481,6 +497,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_ADJUDICATION, null, $v->_getFHIRXMLNamespace())); } } + if ([] !== ($vs = $this->getNoteNumber())) { foreach($vs as $v) { if (null === $v) { @@ -489,6 +506,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_NOTE_NUMBER, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getSubDetailSequence())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUB_DETAIL_SEQUENCE, null, $v->_getFHIRXMLNamespace())); } @@ -502,7 +520,23 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if ([] !== ($vs = $this->getAdjudication())) { - $a[self::FIELD_ADJUDICATION] = $vs; + $a[self::FIELD_ADJUDICATION] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ADJUDICATION][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ADJUDICATION_EXT][] = $enc; + } else { + $a[self::FIELD_ADJUDICATION_EXT][] = null; + } + } else { + $a[self::FIELD_ADJUDICATION][] = $v; + } + } } if ([] !== ($vs = $this->getNoteNumber())) { $a[self::FIELD_NOTE_NUMBER] = []; @@ -510,13 +544,29 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_NOTE_NUMBER][] = $v->getValue(); - $a[self::FIELD_NOTE_NUMBER_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NOTE_NUMBER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NOTE_NUMBER_EXT][] = $enc; + } else { + $a[self::FIELD_NOTE_NUMBER_EXT][] = null; + } + } else { + $a[self::FIELD_NOTE_NUMBER][] = $v; + } } } if (null !== ($v = $this->getSubDetailSequence())) { - $a[self::FIELD_SUB_DETAIL_SEQUENCE] = $v->getValue(); - $a[self::FIELD_SUB_DETAIL_SEQUENCE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SUB_DETAIL_SEQUENCE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SUB_DETAIL_SEQUENCE_EXT] = $enc; + } + } else { + $a[self::FIELD_SUB_DETAIL_SEQUENCE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseSubDetail1.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseSubDetail1.php index 30e3e641f1..7ee62a1002 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseSubDetail1.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseSubDetail1.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -82,10 +82,6 @@ class FHIRClaimResponseSubDetail1 extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CLAIM_RESPONSE_DOT_SUB_DETAIL_1; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ADJUDICATION = 'adjudication'; const FIELD_ADJUDICATION_EXT = '_adjudication'; const FIELD_FACTOR = 'factor'; @@ -201,6 +197,9 @@ class FHIRClaimResponseSubDetail1 extends FHIRBackboneElement */ protected $unitPrice = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRClaimResponseSubDetail1 Constructor * @param null|array $data @@ -223,17 +222,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_ADJUDICATION])) { foreach($data[self::FIELD_ADJUDICATION] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRClaimResponseAdjudication) { $this->addAdjudication($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addAdjudication(new FHIRClaimResponseAdjudication([FHIRClaimResponseAdjudication::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addAdjudication(new FHIRClaimResponseAdjudication([FHIRClaimResponseAdjudication::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addAdjudication(new FHIRClaimResponseAdjudication(array_merge($v, $ext[$i]))); + } } else { $this->addAdjudication(new FHIRClaimResponseAdjudication($v)); } } } elseif ($data[self::FIELD_ADJUDICATION] instanceof FHIRClaimResponseAdjudication) { $this->addAdjudication($data[self::FIELD_ADJUDICATION]); - } elseif ($ext && is_scalar($data[self::FIELD_ADJUDICATION])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_ADJUDICATION])) { $this->addAdjudication(new FHIRClaimResponseAdjudication([FHIRClaimResponseAdjudication::FIELD_VALUE => $data[self::FIELD_ADJUDICATION]] + $ext)); } else { $this->addAdjudication(new FHIRClaimResponseAdjudication($data[self::FIELD_ADJUDICATION])); @@ -245,8 +251,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_FACTOR] instanceof FHIRDecimal) { $this->setFactor($data[self::FIELD_FACTOR]); - } elseif ($ext && is_scalar($data[self::FIELD_FACTOR])) { - $this->setFactor(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_FACTOR]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_FACTOR])) { + $this->setFactor(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_FACTOR]] + $ext)); + } else if (is_array($data[self::FIELD_FACTOR])) { + $this->setFactor(new FHIRDecimal(array_merge($ext, $data[self::FIELD_FACTOR]))); + } } else { $this->setFactor(new FHIRDecimal($data[self::FIELD_FACTOR])); } @@ -254,6 +264,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_MODIFIER])) { if (is_array($data[self::FIELD_MODIFIER])) { foreach($data[self::FIELD_MODIFIER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addModifier($v); } else { @@ -272,8 +285,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NET] instanceof FHIRMoney) { $this->setNet($data[self::FIELD_NET]); - } elseif ($ext && is_scalar($data[self::FIELD_NET])) { - $this->setNet(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_NET]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NET])) { + $this->setNet(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_NET]] + $ext)); + } else if (is_array($data[self::FIELD_NET])) { + $this->setNet(new FHIRMoney(array_merge($ext, $data[self::FIELD_NET]))); + } } else { $this->setNet(new FHIRMoney($data[self::FIELD_NET])); } @@ -284,17 +301,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_NOTE_NUMBER])) { foreach($data[self::FIELD_NOTE_NUMBER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRPositiveInt) { $this->addNoteNumber($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addNoteNumber(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addNoteNumber(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addNoteNumber(new FHIRPositiveInt(array_merge($v, $ext[$i]))); + } } else { $this->addNoteNumber(new FHIRPositiveInt($v)); } } } elseif ($data[self::FIELD_NOTE_NUMBER] instanceof FHIRPositiveInt) { $this->addNoteNumber($data[self::FIELD_NOTE_NUMBER]); - } elseif ($ext && is_scalar($data[self::FIELD_NOTE_NUMBER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_NOTE_NUMBER])) { $this->addNoteNumber(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_NOTE_NUMBER]] + $ext)); } else { $this->addNoteNumber(new FHIRPositiveInt($data[self::FIELD_NOTE_NUMBER])); @@ -313,8 +337,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_QUANTITY] instanceof FHIRQuantity) { $this->setQuantity($data[self::FIELD_QUANTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_QUANTITY])) { - $this->setQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_QUANTITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_QUANTITY])) { + $this->setQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_QUANTITY])) { + $this->setQuantity(new FHIRQuantity(array_merge($ext, $data[self::FIELD_QUANTITY]))); + } } else { $this->setQuantity(new FHIRQuantity($data[self::FIELD_QUANTITY])); } @@ -325,8 +353,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_UNIT_PRICE] instanceof FHIRMoney) { $this->setUnitPrice($data[self::FIELD_UNIT_PRICE]); - } elseif ($ext && is_scalar($data[self::FIELD_UNIT_PRICE])) { - $this->setUnitPrice(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_UNIT_PRICE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_UNIT_PRICE])) { + $this->setUnitPrice(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_UNIT_PRICE]] + $ext)); + } else if (is_array($data[self::FIELD_UNIT_PRICE])) { + $this->setUnitPrice(new FHIRMoney(array_merge($ext, $data[self::FIELD_UNIT_PRICE]))); + } } else { $this->setUnitPrice(new FHIRMoney($data[self::FIELD_UNIT_PRICE])); } @@ -828,7 +860,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getAdjudication())) { foreach($vs as $v) { if (null === $v) { @@ -837,10 +868,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_ADJUDICATION, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getFactor())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FACTOR, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getModifier())) { foreach($vs as $v) { if (null === $v) { @@ -865,11 +896,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getProductOrService())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PRODUCT_OR_SERVICE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_QUANTITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getUnitPrice())) { $v->xmlSerialize($sxe->addChild(self::FIELD_UNIT_PRICE, null, $v->_getFHIRXMLNamespace())); } @@ -883,17 +912,48 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if ([] !== ($vs = $this->getAdjudication())) { - $a[self::FIELD_ADJUDICATION] = $vs; + $a[self::FIELD_ADJUDICATION] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ADJUDICATION][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ADJUDICATION_EXT][] = $enc; + } else { + $a[self::FIELD_ADJUDICATION_EXT][] = null; + } + } else { + $a[self::FIELD_ADJUDICATION][] = $v; + } + } } if (null !== ($v = $this->getFactor())) { - $a[self::FIELD_FACTOR] = $v->getValue(); - $a[self::FIELD_FACTOR_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FACTOR] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FACTOR_EXT] = $enc; + } + } else { + $a[self::FIELD_FACTOR] = $v; + } } if ([] !== ($vs = $this->getModifier())) { $a[self::FIELD_MODIFIER] = $vs; } if (null !== ($v = $this->getNet())) { - $a[self::FIELD_NET] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NET] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NET_EXT] = $enc; + } + } else { + $a[self::FIELD_NET] = $v; + } } if ([] !== ($vs = $this->getNoteNumber())) { $a[self::FIELD_NOTE_NUMBER] = []; @@ -901,18 +961,43 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_NOTE_NUMBER][] = $v->getValue(); - $a[self::FIELD_NOTE_NUMBER_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NOTE_NUMBER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NOTE_NUMBER_EXT][] = $enc; + } else { + $a[self::FIELD_NOTE_NUMBER_EXT][] = null; + } + } else { + $a[self::FIELD_NOTE_NUMBER][] = $v; + } } } if (null !== ($v = $this->getProductOrService())) { $a[self::FIELD_PRODUCT_OR_SERVICE] = $v; } if (null !== ($v = $this->getQuantity())) { - $a[self::FIELD_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_QUANTITY] = $v; + } } if (null !== ($v = $this->getUnitPrice())) { - $a[self::FIELD_UNIT_PRICE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_UNIT_PRICE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_UNIT_PRICE_EXT] = $enc; + } + } else { + $a[self::FIELD_UNIT_PRICE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseTotal.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseTotal.php index 4239974888..718f4e14f5 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseTotal.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseTotal.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRClaimResponseTotal extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CLAIM_RESPONSE_DOT_TOTAL; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_AMOUNT = 'amount'; const FIELD_AMOUNT_EXT = '_amount'; const FIELD_CATEGORY = 'category'; @@ -114,6 +110,9 @@ class FHIRClaimResponseTotal extends FHIRBackboneElement */ protected $category = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRClaimResponseTotal Constructor * @param null|array $data @@ -136,8 +135,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_AMOUNT] instanceof FHIRMoney) { $this->setAmount($data[self::FIELD_AMOUNT]); - } elseif ($ext && is_scalar($data[self::FIELD_AMOUNT])) { - $this->setAmount(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_AMOUNT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_AMOUNT])) { + $this->setAmount(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_AMOUNT]] + $ext)); + } else if (is_array($data[self::FIELD_AMOUNT])) { + $this->setAmount(new FHIRMoney(array_merge($ext, $data[self::FIELD_AMOUNT]))); + } } else { $this->setAmount(new FHIRMoney($data[self::FIELD_AMOUNT])); } @@ -326,11 +329,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getAmount())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AMOUNT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getCategory())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CATEGORY, null, $v->_getFHIRXMLNamespace())); } @@ -344,7 +345,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getAmount())) { - $a[self::FIELD_AMOUNT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_AMOUNT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_AMOUNT_EXT] = $enc; + } + } else { + $a[self::FIELD_AMOUNT] = $v; + } } if (null !== ($v = $this->getCategory())) { $a[self::FIELD_CATEGORY] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRClinicalImpression/FHIRClinicalImpressionFinding.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRClinicalImpression/FHIRClinicalImpressionFinding.php index 1206845040..554c2ae4f7 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRClinicalImpression/FHIRClinicalImpressionFinding.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRClinicalImpression/FHIRClinicalImpressionFinding.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -85,10 +85,6 @@ class FHIRClinicalImpressionFinding extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CLINICAL_IMPRESSION_DOT_FINDING; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_BASIS = 'basis'; const FIELD_BASIS_EXT = '_basis'; const FIELD_ITEM_CODEABLE_CONCEPT = 'itemCodeableConcept'; @@ -130,6 +126,9 @@ class FHIRClinicalImpressionFinding extends FHIRBackboneElement */ protected $itemReference = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRClinicalImpressionFinding Constructor * @param null|array $data @@ -152,8 +151,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_BASIS] instanceof FHIRString) { $this->setBasis($data[self::FIELD_BASIS]); - } elseif ($ext && is_scalar($data[self::FIELD_BASIS])) { - $this->setBasis(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_BASIS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_BASIS])) { + $this->setBasis(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_BASIS]] + $ext)); + } else if (is_array($data[self::FIELD_BASIS])) { + $this->setBasis(new FHIRString(array_merge($ext, $data[self::FIELD_BASIS]))); + } } else { $this->setBasis(new FHIRString($data[self::FIELD_BASIS])); } @@ -392,11 +395,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getBasis())) { $v->xmlSerialize($sxe->addChild(self::FIELD_BASIS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getItemCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ITEM_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getItemReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ITEM_REFERENCE, null, $v->_getFHIRXMLNamespace())); } @@ -410,8 +411,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getBasis())) { - $a[self::FIELD_BASIS] = $v->getValue(); - $a[self::FIELD_BASIS_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_BASIS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_BASIS_EXT] = $enc; + } + } else { + $a[self::FIELD_BASIS] = $v; + } } if (null !== ($v = $this->getItemCodeableConcept())) { $a[self::FIELD_ITEM_CODEABLE_CONCEPT] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRClinicalImpression/FHIRClinicalImpressionInvestigation.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRClinicalImpression/FHIRClinicalImpressionInvestigation.php index 26617e9361..2810e5f248 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRClinicalImpression/FHIRClinicalImpressionInvestigation.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRClinicalImpression/FHIRClinicalImpressionInvestigation.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -84,10 +84,6 @@ class FHIRClinicalImpressionInvestigation extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CLINICAL_IMPRESSION_DOT_INVESTIGATION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CODE = 'code'; const FIELD_ITEM = 'item'; @@ -117,6 +113,9 @@ class FHIRClinicalImpressionInvestigation extends FHIRBackboneElement */ protected $item = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRClinicalImpressionInvestigation Constructor * @param null|array $data @@ -143,6 +142,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ITEM])) { if (is_array($data[self::FIELD_ITEM])) { foreach($data[self::FIELD_ITEM] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addItem($v); } else { @@ -358,11 +360,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getItem())) { foreach($vs as $v) { if (null === $v) { @@ -371,6 +371,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_ITEM, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRCodeSystem/FHIRCodeSystemConcept.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRCodeSystem/FHIRCodeSystemConcept.php index 4d825b1066..1b942e11be 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRCodeSystem/FHIRCodeSystemConcept.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRCodeSystem/FHIRCodeSystemConcept.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRCodeSystemConcept extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CODE_SYSTEM_DOT_CONCEPT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CODE = 'code'; const FIELD_CODE_EXT = '_code'; const FIELD_CONCEPT = 'concept'; @@ -170,6 +166,9 @@ class FHIRCodeSystemConcept extends FHIRBackboneElement */ protected $property = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRCodeSystemConcept Constructor * @param null|array $data @@ -192,8 +191,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CODE] instanceof FHIRCode) { $this->setCode($data[self::FIELD_CODE]); - } elseif ($ext && is_scalar($data[self::FIELD_CODE])) { - $this->setCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_CODE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CODE])) { + $this->setCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_CODE]] + $ext)); + } else if (is_array($data[self::FIELD_CODE])) { + $this->setCode(new FHIRCode(array_merge($ext, $data[self::FIELD_CODE]))); + } } else { $this->setCode(new FHIRCode($data[self::FIELD_CODE])); } @@ -201,6 +204,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CONCEPT])) { if (is_array($data[self::FIELD_CONCEPT])) { foreach($data[self::FIELD_CONCEPT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeSystemConcept) { $this->addConcept($v); } else { @@ -219,8 +225,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DEFINITION] instanceof FHIRString) { $this->setDefinition($data[self::FIELD_DEFINITION]); - } elseif ($ext && is_scalar($data[self::FIELD_DEFINITION])) { - $this->setDefinition(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DEFINITION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DEFINITION])) { + $this->setDefinition(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DEFINITION]] + $ext)); + } else if (is_array($data[self::FIELD_DEFINITION])) { + $this->setDefinition(new FHIRString(array_merge($ext, $data[self::FIELD_DEFINITION]))); + } } else { $this->setDefinition(new FHIRString($data[self::FIELD_DEFINITION])); } @@ -231,17 +241,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_DESIGNATION])) { foreach($data[self::FIELD_DESIGNATION] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeSystemDesignation) { $this->addDesignation($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addDesignation(new FHIRCodeSystemDesignation([FHIRCodeSystemDesignation::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addDesignation(new FHIRCodeSystemDesignation([FHIRCodeSystemDesignation::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addDesignation(new FHIRCodeSystemDesignation(array_merge($v, $ext[$i]))); + } } else { $this->addDesignation(new FHIRCodeSystemDesignation($v)); } } } elseif ($data[self::FIELD_DESIGNATION] instanceof FHIRCodeSystemDesignation) { $this->addDesignation($data[self::FIELD_DESIGNATION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESIGNATION])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_DESIGNATION])) { $this->addDesignation(new FHIRCodeSystemDesignation([FHIRCodeSystemDesignation::FIELD_VALUE => $data[self::FIELD_DESIGNATION]] + $ext)); } else { $this->addDesignation(new FHIRCodeSystemDesignation($data[self::FIELD_DESIGNATION])); @@ -253,8 +270,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DISPLAY] instanceof FHIRString) { $this->setDisplay($data[self::FIELD_DISPLAY]); - } elseif ($ext && is_scalar($data[self::FIELD_DISPLAY])) { - $this->setDisplay(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DISPLAY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DISPLAY])) { + $this->setDisplay(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DISPLAY]] + $ext)); + } else if (is_array($data[self::FIELD_DISPLAY])) { + $this->setDisplay(new FHIRString(array_merge($ext, $data[self::FIELD_DISPLAY]))); + } } else { $this->setDisplay(new FHIRString($data[self::FIELD_DISPLAY])); } @@ -262,6 +283,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PROPERTY])) { if (is_array($data[self::FIELD_PROPERTY])) { foreach($data[self::FIELD_PROPERTY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeSystemProperty1) { $this->addProperty($v); } else { @@ -714,7 +738,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getConcept())) { foreach($vs as $v) { if (null === $v) { @@ -723,10 +746,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_CONCEPT, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getDefinition())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFINITION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getDesignation())) { foreach($vs as $v) { if (null === $v) { @@ -735,10 +758,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_DESIGNATION, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getDisplay())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DISPLAY, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getProperty())) { foreach($vs as $v) { if (null === $v) { @@ -747,6 +770,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_PROPERTY, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } @@ -757,22 +781,59 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getCode())) { - $a[self::FIELD_CODE] = $v->getValue(); - $a[self::FIELD_CODE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CODE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CODE_EXT] = $enc; + } + } else { + $a[self::FIELD_CODE] = $v; + } } if ([] !== ($vs = $this->getConcept())) { $a[self::FIELD_CONCEPT] = $vs; } if (null !== ($v = $this->getDefinition())) { - $a[self::FIELD_DEFINITION] = $v->getValue(); - $a[self::FIELD_DEFINITION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DEFINITION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DEFINITION_EXT] = $enc; + } + } else { + $a[self::FIELD_DEFINITION] = $v; + } } if ([] !== ($vs = $this->getDesignation())) { - $a[self::FIELD_DESIGNATION] = $vs; + $a[self::FIELD_DESIGNATION] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESIGNATION][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESIGNATION_EXT][] = $enc; + } else { + $a[self::FIELD_DESIGNATION_EXT][] = null; + } + } else { + $a[self::FIELD_DESIGNATION][] = $v; + } + } } if (null !== ($v = $this->getDisplay())) { - $a[self::FIELD_DISPLAY] = $v->getValue(); - $a[self::FIELD_DISPLAY_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DISPLAY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DISPLAY_EXT] = $enc; + } + } else { + $a[self::FIELD_DISPLAY] = $v; + } } if ([] !== ($vs = $this->getProperty())) { $a[self::FIELD_PROPERTY] = $vs; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRCodeSystem/FHIRCodeSystemDesignation.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRCodeSystem/FHIRCodeSystemDesignation.php index e2c6589169..fc5b56df11 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRCodeSystem/FHIRCodeSystemDesignation.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRCodeSystem/FHIRCodeSystemDesignation.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -81,10 +81,6 @@ class FHIRCodeSystemDesignation extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CODE_SYSTEM_DOT_DESIGNATION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_LANGUAGE = 'language'; const FIELD_LANGUAGE_EXT = '_language'; const FIELD_USE = 'use'; @@ -125,6 +121,9 @@ class FHIRCodeSystemDesignation extends FHIRBackboneElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRCodeSystemDesignation Constructor * @param null|array $data @@ -151,8 +150,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_LANGUAGE] instanceof FHIRCode) { $this->setLanguage($data[self::FIELD_LANGUAGE]); - } elseif ($ext && is_scalar($data[self::FIELD_LANGUAGE])) { - $this->setLanguage(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_LANGUAGE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_LANGUAGE])) { + $this->setLanguage(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_LANGUAGE]] + $ext)); + } else if (is_array($data[self::FIELD_LANGUAGE])) { + $this->setLanguage(new FHIRCode(array_merge($ext, $data[self::FIELD_LANGUAGE]))); + } } else { $this->setLanguage(new FHIRCode($data[self::FIELD_LANGUAGE])); } @@ -170,8 +173,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE] instanceof FHIRString) { $this->setValue($data[self::FIELD_VALUE]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE])) { - $this->setValue(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VALUE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE])) { + $this->setValue(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VALUE]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE])) { + $this->setValue(new FHIRString(array_merge($ext, $data[self::FIELD_VALUE]))); + } } else { $this->setValue(new FHIRString($data[self::FIELD_VALUE])); } @@ -403,11 +410,11 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getLanguage())) { $v->xmlSerialize($sxe->addChild(self::FIELD_LANGUAGE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getUse())) { $v->xmlSerialize($sxe->addChild(self::FIELD_USE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getValue())) { + $sxe->addAttribute(self::FIELD_VALUE, (string)$v); $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE, null, $v->_getFHIRXMLNamespace())); } return $sxe; @@ -420,15 +427,29 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getLanguage())) { - $a[self::FIELD_LANGUAGE] = $v->getValue(); - $a[self::FIELD_LANGUAGE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_LANGUAGE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_LANGUAGE_EXT] = $enc; + } + } else { + $a[self::FIELD_LANGUAGE] = $v; + } } if (null !== ($v = $this->getUse())) { $a[self::FIELD_USE] = $v; } if (null !== ($v = $this->getValue())) { - $a[self::FIELD_VALUE] = $v->getValue(); - $a[self::FIELD_VALUE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRCodeSystem/FHIRCodeSystemFilter.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRCodeSystem/FHIRCodeSystemFilter.php index ab1b5b927f..3d20e593e5 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRCodeSystem/FHIRCodeSystemFilter.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRCodeSystem/FHIRCodeSystemFilter.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -81,10 +81,6 @@ class FHIRCodeSystemFilter extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CODE_SYSTEM_DOT_FILTER; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CODE = 'code'; const FIELD_CODE_EXT = '_code'; const FIELD_DESCRIPTION = 'description'; @@ -139,6 +135,9 @@ class FHIRCodeSystemFilter extends FHIRBackboneElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRCodeSystemFilter Constructor * @param null|array $data @@ -165,8 +164,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CODE] instanceof FHIRCode) { $this->setCode($data[self::FIELD_CODE]); - } elseif ($ext && is_scalar($data[self::FIELD_CODE])) { - $this->setCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_CODE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CODE])) { + $this->setCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_CODE]] + $ext)); + } else if (is_array($data[self::FIELD_CODE])) { + $this->setCode(new FHIRCode(array_merge($ext, $data[self::FIELD_CODE]))); + } } else { $this->setCode(new FHIRCode($data[self::FIELD_CODE])); } @@ -177,8 +180,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -189,17 +196,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_OPERATOR])) { foreach($data[self::FIELD_OPERATOR] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRFilterOperator) { $this->addOperator($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addOperator(new FHIRFilterOperator([FHIRFilterOperator::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addOperator(new FHIRFilterOperator([FHIRFilterOperator::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addOperator(new FHIRFilterOperator(array_merge($v, $ext[$i]))); + } } else { $this->addOperator(new FHIRFilterOperator($v)); } } } elseif ($data[self::FIELD_OPERATOR] instanceof FHIRFilterOperator) { $this->addOperator($data[self::FIELD_OPERATOR]); - } elseif ($ext && is_scalar($data[self::FIELD_OPERATOR])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_OPERATOR])) { $this->addOperator(new FHIRFilterOperator([FHIRFilterOperator::FIELD_VALUE => $data[self::FIELD_OPERATOR]] + $ext)); } else { $this->addOperator(new FHIRFilterOperator($data[self::FIELD_OPERATOR])); @@ -211,8 +225,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE] instanceof FHIRString) { $this->setValue($data[self::FIELD_VALUE]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE])) { - $this->setValue(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VALUE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE])) { + $this->setValue(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VALUE]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE])) { + $this->setValue(new FHIRString(array_merge($ext, $data[self::FIELD_VALUE]))); + } } else { $this->setValue(new FHIRString($data[self::FIELD_VALUE])); } @@ -518,7 +536,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESCRIPTION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getOperator())) { foreach($vs as $v) { if (null === $v) { @@ -527,7 +544,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_OPERATOR, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getValue())) { + $sxe->addAttribute(self::FIELD_VALUE, (string)$v); $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE, null, $v->_getFHIRXMLNamespace())); } return $sxe; @@ -540,19 +559,56 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getCode())) { - $a[self::FIELD_CODE] = $v->getValue(); - $a[self::FIELD_CODE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CODE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CODE_EXT] = $enc; + } + } else { + $a[self::FIELD_CODE] = $v; + } } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if ([] !== ($vs = $this->getOperator())) { - $a[self::FIELD_OPERATOR] = $vs; + $a[self::FIELD_OPERATOR] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_OPERATOR][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_OPERATOR_EXT][] = $enc; + } else { + $a[self::FIELD_OPERATOR_EXT][] = null; + } + } else { + $a[self::FIELD_OPERATOR][] = $v; + } + } } if (null !== ($v = $this->getValue())) { - $a[self::FIELD_VALUE] = $v->getValue(); - $a[self::FIELD_VALUE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRCodeSystem/FHIRCodeSystemProperty.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRCodeSystem/FHIRCodeSystemProperty.php index f88d0cd15d..bc870ab761 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRCodeSystem/FHIRCodeSystemProperty.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRCodeSystem/FHIRCodeSystemProperty.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -82,10 +82,6 @@ class FHIRCodeSystemProperty extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CODE_SYSTEM_DOT_PROPERTY; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CODE = 'code'; const FIELD_CODE_EXT = '_code'; const FIELD_DESCRIPTION = 'description'; @@ -144,6 +140,9 @@ class FHIRCodeSystemProperty extends FHIRBackboneElement */ protected $uri = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRCodeSystemProperty Constructor * @param null|array $data @@ -166,8 +165,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CODE] instanceof FHIRCode) { $this->setCode($data[self::FIELD_CODE]); - } elseif ($ext && is_scalar($data[self::FIELD_CODE])) { - $this->setCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_CODE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CODE])) { + $this->setCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_CODE]] + $ext)); + } else if (is_array($data[self::FIELD_CODE])) { + $this->setCode(new FHIRCode(array_merge($ext, $data[self::FIELD_CODE]))); + } } else { $this->setCode(new FHIRCode($data[self::FIELD_CODE])); } @@ -178,8 +181,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -190,8 +197,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TYPE] instanceof FHIRPropertyType) { $this->setType($data[self::FIELD_TYPE]); - } elseif ($ext && is_scalar($data[self::FIELD_TYPE])) { - $this->setType(new FHIRPropertyType([FHIRPropertyType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TYPE])) { + $this->setType(new FHIRPropertyType([FHIRPropertyType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } else if (is_array($data[self::FIELD_TYPE])) { + $this->setType(new FHIRPropertyType(array_merge($ext, $data[self::FIELD_TYPE]))); + } } else { $this->setType(new FHIRPropertyType($data[self::FIELD_TYPE])); } @@ -202,8 +213,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_URI] instanceof FHIRUri) { $this->setUri($data[self::FIELD_URI]); - } elseif ($ext && is_scalar($data[self::FIELD_URI])) { - $this->setUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URI]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_URI])) { + $this->setUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URI]] + $ext)); + } else if (is_array($data[self::FIELD_URI])) { + $this->setUri(new FHIRUri(array_merge($ext, $data[self::FIELD_URI]))); + } } else { $this->setUri(new FHIRUri($data[self::FIELD_URI])); } @@ -490,7 +505,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESCRIPTION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -507,19 +521,48 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getCode())) { - $a[self::FIELD_CODE] = $v->getValue(); - $a[self::FIELD_CODE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CODE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CODE_EXT] = $enc; + } + } else { + $a[self::FIELD_CODE] = $v; + } } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if (null !== ($v = $this->getType())) { - $a[self::FIELD_TYPE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TYPE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TYPE_EXT] = $enc; + } + } else { + $a[self::FIELD_TYPE] = $v; + } } if (null !== ($v = $this->getUri())) { - $a[self::FIELD_URI] = $v->getValue(); - $a[self::FIELD_URI_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_URI] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_URI_EXT] = $enc; + } + } else { + $a[self::FIELD_URI] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRCodeSystem/FHIRCodeSystemProperty1.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRCodeSystem/FHIRCodeSystemProperty1.php index f4437fbc9c..23909b68d2 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRCodeSystem/FHIRCodeSystemProperty1.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRCodeSystem/FHIRCodeSystemProperty1.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -85,10 +85,6 @@ class FHIRCodeSystemProperty1 extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CODE_SYSTEM_DOT_PROPERTY_1; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CODE = 'code'; const FIELD_CODE_EXT = '_code'; const FIELD_VALUE_BOOLEAN = 'valueBoolean'; @@ -198,6 +194,9 @@ class FHIRCodeSystemProperty1 extends FHIRBackboneElement */ protected $valueString = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRCodeSystemProperty1 Constructor * @param null|array $data @@ -220,8 +219,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CODE] instanceof FHIRCode) { $this->setCode($data[self::FIELD_CODE]); - } elseif ($ext && is_scalar($data[self::FIELD_CODE])) { - $this->setCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_CODE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CODE])) { + $this->setCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_CODE]] + $ext)); + } else if (is_array($data[self::FIELD_CODE])) { + $this->setCode(new FHIRCode(array_merge($ext, $data[self::FIELD_CODE]))); + } } else { $this->setCode(new FHIRCode($data[self::FIELD_CODE])); } @@ -232,8 +235,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_BOOLEAN] instanceof FHIRBoolean) { $this->setValueBoolean($data[self::FIELD_VALUE_BOOLEAN]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_BOOLEAN])) { - $this->setValueBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_VALUE_BOOLEAN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_BOOLEAN])) { + $this->setValueBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_VALUE_BOOLEAN]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_BOOLEAN])) { + $this->setValueBoolean(new FHIRBoolean(array_merge($ext, $data[self::FIELD_VALUE_BOOLEAN]))); + } } else { $this->setValueBoolean(new FHIRBoolean($data[self::FIELD_VALUE_BOOLEAN])); } @@ -244,8 +251,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_CODE] instanceof FHIRCode) { $this->setValueCode($data[self::FIELD_VALUE_CODE]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_CODE])) { - $this->setValueCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_VALUE_CODE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_CODE])) { + $this->setValueCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_VALUE_CODE]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_CODE])) { + $this->setValueCode(new FHIRCode(array_merge($ext, $data[self::FIELD_VALUE_CODE]))); + } } else { $this->setValueCode(new FHIRCode($data[self::FIELD_VALUE_CODE])); } @@ -263,8 +274,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_DATE_TIME] instanceof FHIRDateTime) { $this->setValueDateTime($data[self::FIELD_VALUE_DATE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_DATE_TIME])) { - $this->setValueDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_VALUE_DATE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_DATE_TIME])) { + $this->setValueDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_VALUE_DATE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_DATE_TIME])) { + $this->setValueDateTime(new FHIRDateTime(array_merge($ext, $data[self::FIELD_VALUE_DATE_TIME]))); + } } else { $this->setValueDateTime(new FHIRDateTime($data[self::FIELD_VALUE_DATE_TIME])); } @@ -275,8 +290,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_DECIMAL] instanceof FHIRDecimal) { $this->setValueDecimal($data[self::FIELD_VALUE_DECIMAL]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_DECIMAL])) { - $this->setValueDecimal(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_VALUE_DECIMAL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_DECIMAL])) { + $this->setValueDecimal(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_VALUE_DECIMAL]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_DECIMAL])) { + $this->setValueDecimal(new FHIRDecimal(array_merge($ext, $data[self::FIELD_VALUE_DECIMAL]))); + } } else { $this->setValueDecimal(new FHIRDecimal($data[self::FIELD_VALUE_DECIMAL])); } @@ -287,8 +306,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_INTEGER] instanceof FHIRInteger) { $this->setValueInteger($data[self::FIELD_VALUE_INTEGER]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_INTEGER])) { - $this->setValueInteger(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_VALUE_INTEGER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_INTEGER])) { + $this->setValueInteger(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_VALUE_INTEGER]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_INTEGER])) { + $this->setValueInteger(new FHIRInteger(array_merge($ext, $data[self::FIELD_VALUE_INTEGER]))); + } } else { $this->setValueInteger(new FHIRInteger($data[self::FIELD_VALUE_INTEGER])); } @@ -299,8 +322,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_STRING] instanceof FHIRString) { $this->setValueString($data[self::FIELD_VALUE_STRING]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_STRING])) { - $this->setValueString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VALUE_STRING]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_STRING])) { + $this->setValueString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VALUE_STRING]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_STRING])) { + $this->setValueString(new FHIRString(array_merge($ext, $data[self::FIELD_VALUE_STRING]))); + } } else { $this->setValueString(new FHIRString($data[self::FIELD_VALUE_STRING])); } @@ -766,7 +793,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getValueCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_CODE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueCoding())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_CODING, null, $v->_getFHIRXMLNamespace())); } @@ -792,35 +818,84 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getCode())) { - $a[self::FIELD_CODE] = $v->getValue(); - $a[self::FIELD_CODE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CODE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CODE_EXT] = $enc; + } + } else { + $a[self::FIELD_CODE] = $v; + } } if (null !== ($v = $this->getValueBoolean())) { - $a[self::FIELD_VALUE_BOOLEAN] = $v->getValue(); - $a[self::FIELD_VALUE_BOOLEAN_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_BOOLEAN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_BOOLEAN_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_BOOLEAN] = $v; + } } if (null !== ($v = $this->getValueCode())) { - $a[self::FIELD_VALUE_CODE] = $v->getValue(); - $a[self::FIELD_VALUE_CODE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_CODE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_CODE_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_CODE] = $v; + } } if (null !== ($v = $this->getValueCoding())) { $a[self::FIELD_VALUE_CODING] = $v; } if (null !== ($v = $this->getValueDateTime())) { - $a[self::FIELD_VALUE_DATE_TIME] = $v->getValue(); - $a[self::FIELD_VALUE_DATE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_DATE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_DATE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_DATE_TIME] = $v; + } } if (null !== ($v = $this->getValueDecimal())) { - $a[self::FIELD_VALUE_DECIMAL] = $v->getValue(); - $a[self::FIELD_VALUE_DECIMAL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_DECIMAL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_DECIMAL_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_DECIMAL] = $v; + } } if (null !== ($v = $this->getValueInteger())) { - $a[self::FIELD_VALUE_INTEGER] = $v->getValue(); - $a[self::FIELD_VALUE_INTEGER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_INTEGER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_INTEGER_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_INTEGER] = $v; + } } if (null !== ($v = $this->getValueString())) { - $a[self::FIELD_VALUE_STRING] = $v->getValue(); - $a[self::FIELD_VALUE_STRING_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_STRING] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_STRING_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_STRING] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRCommunication/FHIRCommunicationPayload.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRCommunication/FHIRCommunicationPayload.php index 2239bce2fa..eba600eac8 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRCommunication/FHIRCommunicationPayload.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRCommunication/FHIRCommunicationPayload.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -81,10 +81,6 @@ class FHIRCommunicationPayload extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_COMMUNICATION_DOT_PAYLOAD; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CONTENT_ATTACHMENT = 'contentAttachment'; const FIELD_CONTENT_REFERENCE = 'contentReference'; const FIELD_CONTENT_STRING = 'contentString'; @@ -126,6 +122,9 @@ class FHIRCommunicationPayload extends FHIRBackboneElement */ protected $contentString = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRCommunicationPayload Constructor * @param null|array $data @@ -162,8 +161,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CONTENT_STRING] instanceof FHIRString) { $this->setContentString($data[self::FIELD_CONTENT_STRING]); - } elseif ($ext && is_scalar($data[self::FIELD_CONTENT_STRING])) { - $this->setContentString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_CONTENT_STRING]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CONTENT_STRING])) { + $this->setContentString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_CONTENT_STRING]] + $ext)); + } else if (is_array($data[self::FIELD_CONTENT_STRING])) { + $this->setContentString(new FHIRString(array_merge($ext, $data[self::FIELD_CONTENT_STRING]))); + } } else { $this->setContentString(new FHIRString($data[self::FIELD_CONTENT_STRING])); } @@ -385,11 +388,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getContentAttachment())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CONTENT_ATTACHMENT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getContentReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CONTENT_REFERENCE, null, $v->_getFHIRXMLNamespace())); } @@ -412,8 +413,15 @@ public function jsonSerialize() $a[self::FIELD_CONTENT_REFERENCE] = $v; } if (null !== ($v = $this->getContentString())) { - $a[self::FIELD_CONTENT_STRING] = $v->getValue(); - $a[self::FIELD_CONTENT_STRING_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CONTENT_STRING] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CONTENT_STRING_EXT] = $enc; + } + } else { + $a[self::FIELD_CONTENT_STRING] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRCommunicationRequest/FHIRCommunicationRequestPayload.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRCommunicationRequest/FHIRCommunicationRequestPayload.php index bd5e20607d..51b23c7a93 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRCommunicationRequest/FHIRCommunicationRequestPayload.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRCommunicationRequest/FHIRCommunicationRequestPayload.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -81,10 +81,6 @@ class FHIRCommunicationRequestPayload extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_COMMUNICATION_REQUEST_DOT_PAYLOAD; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CONTENT_ATTACHMENT = 'contentAttachment'; const FIELD_CONTENT_REFERENCE = 'contentReference'; const FIELD_CONTENT_STRING = 'contentString'; @@ -126,6 +122,9 @@ class FHIRCommunicationRequestPayload extends FHIRBackboneElement */ protected $contentString = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRCommunicationRequestPayload Constructor * @param null|array $data @@ -162,8 +161,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CONTENT_STRING] instanceof FHIRString) { $this->setContentString($data[self::FIELD_CONTENT_STRING]); - } elseif ($ext && is_scalar($data[self::FIELD_CONTENT_STRING])) { - $this->setContentString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_CONTENT_STRING]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CONTENT_STRING])) { + $this->setContentString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_CONTENT_STRING]] + $ext)); + } else if (is_array($data[self::FIELD_CONTENT_STRING])) { + $this->setContentString(new FHIRString(array_merge($ext, $data[self::FIELD_CONTENT_STRING]))); + } } else { $this->setContentString(new FHIRString($data[self::FIELD_CONTENT_STRING])); } @@ -385,11 +388,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getContentAttachment())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CONTENT_ATTACHMENT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getContentReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CONTENT_REFERENCE, null, $v->_getFHIRXMLNamespace())); } @@ -412,8 +413,15 @@ public function jsonSerialize() $a[self::FIELD_CONTENT_REFERENCE] = $v; } if (null !== ($v = $this->getContentString())) { - $a[self::FIELD_CONTENT_STRING] = $v->getValue(); - $a[self::FIELD_CONTENT_STRING_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CONTENT_STRING] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CONTENT_STRING_EXT] = $enc; + } + } else { + $a[self::FIELD_CONTENT_STRING] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRCompartmentDefinition/FHIRCompartmentDefinitionResource.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRCompartmentDefinition/FHIRCompartmentDefinitionResource.php index 90f8612433..6a0b4cb4e0 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRCompartmentDefinition/FHIRCompartmentDefinitionResource.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRCompartmentDefinition/FHIRCompartmentDefinitionResource.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRCompartmentDefinitionResource extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_COMPARTMENT_DEFINITION_DOT_RESOURCE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CODE = 'code'; const FIELD_CODE_EXT = '_code'; const FIELD_DOCUMENTATION = 'documentation'; @@ -125,6 +121,9 @@ class FHIRCompartmentDefinitionResource extends FHIRBackboneElement */ protected $param = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRCompartmentDefinitionResource Constructor * @param null|array $data @@ -147,8 +146,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CODE] instanceof FHIRCode) { $this->setCode($data[self::FIELD_CODE]); - } elseif ($ext && is_scalar($data[self::FIELD_CODE])) { - $this->setCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_CODE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CODE])) { + $this->setCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_CODE]] + $ext)); + } else if (is_array($data[self::FIELD_CODE])) { + $this->setCode(new FHIRCode(array_merge($ext, $data[self::FIELD_CODE]))); + } } else { $this->setCode(new FHIRCode($data[self::FIELD_CODE])); } @@ -159,8 +162,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DOCUMENTATION] instanceof FHIRString) { $this->setDocumentation($data[self::FIELD_DOCUMENTATION]); - } elseif ($ext && is_scalar($data[self::FIELD_DOCUMENTATION])) { - $this->setDocumentation(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DOCUMENTATION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DOCUMENTATION])) { + $this->setDocumentation(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DOCUMENTATION]] + $ext)); + } else if (is_array($data[self::FIELD_DOCUMENTATION])) { + $this->setDocumentation(new FHIRString(array_merge($ext, $data[self::FIELD_DOCUMENTATION]))); + } } else { $this->setDocumentation(new FHIRString($data[self::FIELD_DOCUMENTATION])); } @@ -171,17 +178,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_PARAM])) { foreach($data[self::FIELD_PARAM] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRString) { $this->addParam($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addParam(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addParam(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addParam(new FHIRString(array_merge($v, $ext[$i]))); + } } else { $this->addParam(new FHIRString($v)); } } } elseif ($data[self::FIELD_PARAM] instanceof FHIRString) { $this->addParam($data[self::FIELD_PARAM]); - } elseif ($ext && is_scalar($data[self::FIELD_PARAM])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_PARAM])) { $this->addParam(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PARAM]] + $ext)); } else { $this->addParam(new FHIRString($data[self::FIELD_PARAM])); @@ -470,6 +484,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_PARAM, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } @@ -480,12 +495,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getCode())) { - $a[self::FIELD_CODE] = $v->getValue(); - $a[self::FIELD_CODE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CODE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CODE_EXT] = $enc; + } + } else { + $a[self::FIELD_CODE] = $v; + } } if (null !== ($v = $this->getDocumentation())) { - $a[self::FIELD_DOCUMENTATION] = $v->getValue(); - $a[self::FIELD_DOCUMENTATION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DOCUMENTATION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DOCUMENTATION_EXT] = $enc; + } + } else { + $a[self::FIELD_DOCUMENTATION] = $v; + } } if ([] !== ($vs = $this->getParam())) { $a[self::FIELD_PARAM] = []; @@ -493,8 +522,17 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_PARAM][] = $v->getValue(); - $a[self::FIELD_PARAM_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PARAM][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PARAM_EXT][] = $enc; + } else { + $a[self::FIELD_PARAM_EXT][] = null; + } + } else { + $a[self::FIELD_PARAM][] = $v; + } } } return $a; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRComposition/FHIRCompositionAttester.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRComposition/FHIRCompositionAttester.php index cb71cca54c..a6ba7e64f8 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRComposition/FHIRCompositionAttester.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRComposition/FHIRCompositionAttester.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -87,10 +87,6 @@ class FHIRCompositionAttester extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_COMPOSITION_DOT_ATTESTER; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_MODE = 'mode'; const FIELD_MODE_EXT = '_mode'; const FIELD_PARTY = 'party'; @@ -132,6 +128,9 @@ class FHIRCompositionAttester extends FHIRBackboneElement */ protected $time = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRCompositionAttester Constructor * @param null|array $data @@ -154,8 +153,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MODE] instanceof FHIRCompositionAttestationMode) { $this->setMode($data[self::FIELD_MODE]); - } elseif ($ext && is_scalar($data[self::FIELD_MODE])) { - $this->setMode(new FHIRCompositionAttestationMode([FHIRCompositionAttestationMode::FIELD_VALUE => $data[self::FIELD_MODE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MODE])) { + $this->setMode(new FHIRCompositionAttestationMode([FHIRCompositionAttestationMode::FIELD_VALUE => $data[self::FIELD_MODE]] + $ext)); + } else if (is_array($data[self::FIELD_MODE])) { + $this->setMode(new FHIRCompositionAttestationMode(array_merge($ext, $data[self::FIELD_MODE]))); + } } else { $this->setMode(new FHIRCompositionAttestationMode($data[self::FIELD_MODE])); } @@ -173,8 +176,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TIME] instanceof FHIRDateTime) { $this->setTime($data[self::FIELD_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_TIME])) { - $this->setTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TIME])) { + $this->setTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_TIME])) { + $this->setTime(new FHIRDateTime(array_merge($ext, $data[self::FIELD_TIME]))); + } } else { $this->setTime(new FHIRDateTime($data[self::FIELD_TIME])); } @@ -394,11 +401,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getMode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MODE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getParty())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PARTY, null, $v->_getFHIRXMLNamespace())); } @@ -415,14 +420,29 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getMode())) { - $a[self::FIELD_MODE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MODE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MODE_EXT] = $enc; + } + } else { + $a[self::FIELD_MODE] = $v; + } } if (null !== ($v = $this->getParty())) { $a[self::FIELD_PARTY] = $v; } if (null !== ($v = $this->getTime())) { - $a[self::FIELD_TIME] = $v->getValue(); - $a[self::FIELD_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_TIME] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRComposition/FHIRCompositionEvent.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRComposition/FHIRCompositionEvent.php index a7d8239346..14a9d7a5e0 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRComposition/FHIRCompositionEvent.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRComposition/FHIRCompositionEvent.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -87,10 +87,6 @@ class FHIRCompositionEvent extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_COMPOSITION_DOT_EVENT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CODE = 'code'; const FIELD_DETAIL = 'detail'; const FIELD_PERIOD = 'period'; @@ -135,6 +131,9 @@ class FHIRCompositionEvent extends FHIRBackboneElement */ protected $period = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRCompositionEvent Constructor * @param null|array $data @@ -154,6 +153,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CODE])) { if (is_array($data[self::FIELD_CODE])) { foreach($data[self::FIELD_CODE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addCode($v); } else { @@ -169,6 +171,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_DETAIL])) { if (is_array($data[self::FIELD_DETAIL])) { foreach($data[self::FIELD_DETAIL] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addDetail($v); } else { @@ -463,7 +468,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getCode())) { foreach($vs as $v) { if (null === $v) { diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRComposition/FHIRCompositionRelatesTo.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRComposition/FHIRCompositionRelatesTo.php index 827b514bad..db60bdb8dc 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRComposition/FHIRCompositionRelatesTo.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRComposition/FHIRCompositionRelatesTo.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -87,10 +87,6 @@ class FHIRCompositionRelatesTo extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_COMPOSITION_DOT_RELATES_TO; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CODE = 'code'; const FIELD_CODE_EXT = '_code'; const FIELD_TARGET_IDENTIFIER = 'targetIdentifier'; @@ -133,6 +129,9 @@ class FHIRCompositionRelatesTo extends FHIRBackboneElement */ protected $targetReference = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRCompositionRelatesTo Constructor * @param null|array $data @@ -155,8 +154,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CODE] instanceof FHIRDocumentRelationshipType) { $this->setCode($data[self::FIELD_CODE]); - } elseif ($ext && is_scalar($data[self::FIELD_CODE])) { - $this->setCode(new FHIRDocumentRelationshipType([FHIRDocumentRelationshipType::FIELD_VALUE => $data[self::FIELD_CODE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CODE])) { + $this->setCode(new FHIRDocumentRelationshipType([FHIRDocumentRelationshipType::FIELD_VALUE => $data[self::FIELD_CODE]] + $ext)); + } else if (is_array($data[self::FIELD_CODE])) { + $this->setCode(new FHIRDocumentRelationshipType(array_merge($ext, $data[self::FIELD_CODE]))); + } } else { $this->setCode(new FHIRDocumentRelationshipType($data[self::FIELD_CODE])); } @@ -167,8 +170,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TARGET_IDENTIFIER] instanceof FHIRIdentifier) { $this->setTargetIdentifier($data[self::FIELD_TARGET_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_TARGET_IDENTIFIER])) { - $this->setTargetIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_TARGET_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TARGET_IDENTIFIER])) { + $this->setTargetIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_TARGET_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_TARGET_IDENTIFIER])) { + $this->setTargetIdentifier(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_TARGET_IDENTIFIER]))); + } } else { $this->setTargetIdentifier(new FHIRIdentifier($data[self::FIELD_TARGET_IDENTIFIER])); } @@ -386,15 +393,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getTargetIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TARGET_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getTargetReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TARGET_REFERENCE, null, $v->_getFHIRXMLNamespace())); } @@ -408,10 +412,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getCode())) { - $a[self::FIELD_CODE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CODE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CODE_EXT] = $enc; + } + } else { + $a[self::FIELD_CODE] = $v; + } } if (null !== ($v = $this->getTargetIdentifier())) { - $a[self::FIELD_TARGET_IDENTIFIER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TARGET_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TARGET_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_TARGET_IDENTIFIER] = $v; + } } if (null !== ($v = $this->getTargetReference())) { $a[self::FIELD_TARGET_REFERENCE] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRComposition/FHIRCompositionSection.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRComposition/FHIRCompositionSection.php index 7c9844bff1..1ef99f1bcf 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRComposition/FHIRCompositionSection.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRComposition/FHIRCompositionSection.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -89,10 +89,6 @@ class FHIRCompositionSection extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_COMPOSITION_DOT_SECTION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_AUTHOR = 'author'; const FIELD_CODE = 'code'; const FIELD_EMPTY_REASON = 'emptyReason'; @@ -243,6 +239,9 @@ class FHIRCompositionSection extends FHIRBackboneElement */ protected $title = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRCompositionSection Constructor * @param null|array $data @@ -262,6 +261,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_AUTHOR])) { if (is_array($data[self::FIELD_AUTHOR])) { foreach($data[self::FIELD_AUTHOR] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addAuthor($v); } else { @@ -291,6 +293,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ENTRY])) { if (is_array($data[self::FIELD_ENTRY])) { foreach($data[self::FIELD_ENTRY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addEntry($v); } else { @@ -316,8 +321,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MODE] instanceof FHIRListMode) { $this->setMode($data[self::FIELD_MODE]); - } elseif ($ext && is_scalar($data[self::FIELD_MODE])) { - $this->setMode(new FHIRListMode([FHIRListMode::FIELD_VALUE => $data[self::FIELD_MODE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MODE])) { + $this->setMode(new FHIRListMode([FHIRListMode::FIELD_VALUE => $data[self::FIELD_MODE]] + $ext)); + } else if (is_array($data[self::FIELD_MODE])) { + $this->setMode(new FHIRListMode(array_merge($ext, $data[self::FIELD_MODE]))); + } } else { $this->setMode(new FHIRListMode($data[self::FIELD_MODE])); } @@ -332,6 +341,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SECTION])) { if (is_array($data[self::FIELD_SECTION])) { foreach($data[self::FIELD_SECTION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCompositionSection) { $this->addSection($v); } else { @@ -357,8 +369,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TITLE] instanceof FHIRString) { $this->setTitle($data[self::FIELD_TITLE]); - } elseif ($ext && is_scalar($data[self::FIELD_TITLE])) { - $this->setTitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TITLE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TITLE])) { + $this->setTitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TITLE]] + $ext)); + } else if (is_array($data[self::FIELD_TITLE])) { + $this->setTitle(new FHIRString(array_merge($ext, $data[self::FIELD_TITLE]))); + } } else { $this->setTitle(new FHIRString($data[self::FIELD_TITLE])); } @@ -951,7 +967,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getAuthor())) { foreach($vs as $v) { if (null === $v) { @@ -964,11 +979,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getEmptyReason())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EMPTY_REASON, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getEntry())) { foreach($vs as $v) { if (null === $v) { @@ -981,15 +994,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getFocus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FOCUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getMode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MODE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOrderedBy())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ORDERED_BY, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getSection())) { foreach($vs as $v) { if (null === $v) { @@ -1030,7 +1040,15 @@ public function jsonSerialize() $a[self::FIELD_FOCUS] = $v; } if (null !== ($v = $this->getMode())) { - $a[self::FIELD_MODE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MODE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MODE_EXT] = $enc; + } + } else { + $a[self::FIELD_MODE] = $v; + } } if (null !== ($v = $this->getOrderedBy())) { $a[self::FIELD_ORDERED_BY] = $v; @@ -1042,8 +1060,15 @@ public function jsonSerialize() $a[self::FIELD_TEXT] = $v; } if (null !== ($v = $this->getTitle())) { - $a[self::FIELD_TITLE] = $v->getValue(); - $a[self::FIELD_TITLE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TITLE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TITLE_EXT] = $enc; + } + } else { + $a[self::FIELD_TITLE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRConceptMap/FHIRConceptMapDependsOn.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRConceptMap/FHIRConceptMapDependsOn.php index bee3d57a60..1af22c7093 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRConceptMap/FHIRConceptMapDependsOn.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRConceptMap/FHIRConceptMapDependsOn.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -81,10 +81,6 @@ class FHIRConceptMapDependsOn extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONCEPT_MAP_DOT_DEPENDS_ON; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DISPLAY = 'display'; const FIELD_DISPLAY_EXT = '_display'; const FIELD_PROPERTY = 'property'; @@ -144,6 +140,9 @@ class FHIRConceptMapDependsOn extends FHIRBackboneElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRConceptMapDependsOn Constructor * @param null|array $data @@ -170,8 +169,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DISPLAY] instanceof FHIRString) { $this->setDisplay($data[self::FIELD_DISPLAY]); - } elseif ($ext && is_scalar($data[self::FIELD_DISPLAY])) { - $this->setDisplay(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DISPLAY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DISPLAY])) { + $this->setDisplay(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DISPLAY]] + $ext)); + } else if (is_array($data[self::FIELD_DISPLAY])) { + $this->setDisplay(new FHIRString(array_merge($ext, $data[self::FIELD_DISPLAY]))); + } } else { $this->setDisplay(new FHIRString($data[self::FIELD_DISPLAY])); } @@ -182,8 +185,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PROPERTY] instanceof FHIRUri) { $this->setProperty($data[self::FIELD_PROPERTY]); - } elseif ($ext && is_scalar($data[self::FIELD_PROPERTY])) { - $this->setProperty(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_PROPERTY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PROPERTY])) { + $this->setProperty(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_PROPERTY]] + $ext)); + } else if (is_array($data[self::FIELD_PROPERTY])) { + $this->setProperty(new FHIRUri(array_merge($ext, $data[self::FIELD_PROPERTY]))); + } } else { $this->setProperty(new FHIRUri($data[self::FIELD_PROPERTY])); } @@ -194,8 +201,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SYSTEM] instanceof FHIRCanonical) { $this->setSystem($data[self::FIELD_SYSTEM]); - } elseif ($ext && is_scalar($data[self::FIELD_SYSTEM])) { - $this->setSystem(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $data[self::FIELD_SYSTEM]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SYSTEM])) { + $this->setSystem(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $data[self::FIELD_SYSTEM]] + $ext)); + } else if (is_array($data[self::FIELD_SYSTEM])) { + $this->setSystem(new FHIRCanonical(array_merge($ext, $data[self::FIELD_SYSTEM]))); + } } else { $this->setSystem(new FHIRCanonical($data[self::FIELD_SYSTEM])); } @@ -206,8 +217,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE] instanceof FHIRString) { $this->setValue($data[self::FIELD_VALUE]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE])) { - $this->setValue(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VALUE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE])) { + $this->setValue(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VALUE]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE])) { + $this->setValue(new FHIRString(array_merge($ext, $data[self::FIELD_VALUE]))); + } } else { $this->setValue(new FHIRString($data[self::FIELD_VALUE])); } @@ -511,6 +526,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_SYSTEM, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getValue())) { + $sxe->addAttribute(self::FIELD_VALUE, (string)$v); $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE, null, $v->_getFHIRXMLNamespace())); } return $sxe; @@ -523,20 +539,48 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getDisplay())) { - $a[self::FIELD_DISPLAY] = $v->getValue(); - $a[self::FIELD_DISPLAY_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DISPLAY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DISPLAY_EXT] = $enc; + } + } else { + $a[self::FIELD_DISPLAY] = $v; + } } if (null !== ($v = $this->getProperty())) { - $a[self::FIELD_PROPERTY] = $v->getValue(); - $a[self::FIELD_PROPERTY_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PROPERTY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PROPERTY_EXT] = $enc; + } + } else { + $a[self::FIELD_PROPERTY] = $v; + } } if (null !== ($v = $this->getSystem())) { - $a[self::FIELD_SYSTEM] = $v->getValue(); - $a[self::FIELD_SYSTEM_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SYSTEM] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SYSTEM_EXT] = $enc; + } + } else { + $a[self::FIELD_SYSTEM] = $v; + } } if (null !== ($v = $this->getValue())) { - $a[self::FIELD_VALUE] = $v->getValue(); - $a[self::FIELD_VALUE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRConceptMap/FHIRConceptMapElement.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRConceptMap/FHIRConceptMapElement.php index 98ce9fc4c6..d3ab0e9132 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRConceptMap/FHIRConceptMapElement.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRConceptMap/FHIRConceptMapElement.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRConceptMapElement extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONCEPT_MAP_DOT_ELEMENT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CODE = 'code'; const FIELD_CODE_EXT = '_code'; const FIELD_DISPLAY = 'display'; @@ -125,6 +121,9 @@ class FHIRConceptMapElement extends FHIRBackboneElement */ protected $target = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRConceptMapElement Constructor * @param null|array $data @@ -147,8 +146,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CODE] instanceof FHIRCode) { $this->setCode($data[self::FIELD_CODE]); - } elseif ($ext && is_scalar($data[self::FIELD_CODE])) { - $this->setCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_CODE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CODE])) { + $this->setCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_CODE]] + $ext)); + } else if (is_array($data[self::FIELD_CODE])) { + $this->setCode(new FHIRCode(array_merge($ext, $data[self::FIELD_CODE]))); + } } else { $this->setCode(new FHIRCode($data[self::FIELD_CODE])); } @@ -159,8 +162,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DISPLAY] instanceof FHIRString) { $this->setDisplay($data[self::FIELD_DISPLAY]); - } elseif ($ext && is_scalar($data[self::FIELD_DISPLAY])) { - $this->setDisplay(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DISPLAY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DISPLAY])) { + $this->setDisplay(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DISPLAY]] + $ext)); + } else if (is_array($data[self::FIELD_DISPLAY])) { + $this->setDisplay(new FHIRString(array_merge($ext, $data[self::FIELD_DISPLAY]))); + } } else { $this->setDisplay(new FHIRString($data[self::FIELD_DISPLAY])); } @@ -168,6 +175,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_TARGET])) { if (is_array($data[self::FIELD_TARGET])) { foreach($data[self::FIELD_TARGET] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRConceptMapTarget) { $this->addTarget($v); } else { @@ -440,7 +450,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDisplay())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DISPLAY, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getTarget())) { foreach($vs as $v) { if (null === $v) { @@ -449,6 +458,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_TARGET, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } @@ -459,12 +469,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getCode())) { - $a[self::FIELD_CODE] = $v->getValue(); - $a[self::FIELD_CODE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CODE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CODE_EXT] = $enc; + } + } else { + $a[self::FIELD_CODE] = $v; + } } if (null !== ($v = $this->getDisplay())) { - $a[self::FIELD_DISPLAY] = $v->getValue(); - $a[self::FIELD_DISPLAY_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DISPLAY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DISPLAY_EXT] = $enc; + } + } else { + $a[self::FIELD_DISPLAY] = $v; + } } if ([] !== ($vs = $this->getTarget())) { $a[self::FIELD_TARGET] = $vs; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRConceptMap/FHIRConceptMapGroup.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRConceptMap/FHIRConceptMapGroup.php index 994d8d8123..18e24c8a27 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRConceptMap/FHIRConceptMapGroup.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRConceptMap/FHIRConceptMapGroup.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRConceptMapGroup extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONCEPT_MAP_DOT_GROUP; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ELEMENT = 'element'; const FIELD_SOURCE = 'source'; const FIELD_SOURCE_EXT = '_source'; @@ -168,6 +164,9 @@ class FHIRConceptMapGroup extends FHIRBackboneElement */ protected $unmapped = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRConceptMapGroup Constructor * @param null|array $data @@ -187,6 +186,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ELEMENT])) { if (is_array($data[self::FIELD_ELEMENT])) { foreach($data[self::FIELD_ELEMENT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRConceptMapElement) { $this->addElement($v); } else { @@ -205,8 +207,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SOURCE] instanceof FHIRUri) { $this->setSource($data[self::FIELD_SOURCE]); - } elseif ($ext && is_scalar($data[self::FIELD_SOURCE])) { - $this->setSource(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_SOURCE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SOURCE])) { + $this->setSource(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_SOURCE]] + $ext)); + } else if (is_array($data[self::FIELD_SOURCE])) { + $this->setSource(new FHIRUri(array_merge($ext, $data[self::FIELD_SOURCE]))); + } } else { $this->setSource(new FHIRUri($data[self::FIELD_SOURCE])); } @@ -217,8 +223,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SOURCE_VERSION] instanceof FHIRString) { $this->setSourceVersion($data[self::FIELD_SOURCE_VERSION]); - } elseif ($ext && is_scalar($data[self::FIELD_SOURCE_VERSION])) { - $this->setSourceVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SOURCE_VERSION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SOURCE_VERSION])) { + $this->setSourceVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SOURCE_VERSION]] + $ext)); + } else if (is_array($data[self::FIELD_SOURCE_VERSION])) { + $this->setSourceVersion(new FHIRString(array_merge($ext, $data[self::FIELD_SOURCE_VERSION]))); + } } else { $this->setSourceVersion(new FHIRString($data[self::FIELD_SOURCE_VERSION])); } @@ -229,8 +239,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TARGET] instanceof FHIRUri) { $this->setTarget($data[self::FIELD_TARGET]); - } elseif ($ext && is_scalar($data[self::FIELD_TARGET])) { - $this->setTarget(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_TARGET]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TARGET])) { + $this->setTarget(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_TARGET]] + $ext)); + } else if (is_array($data[self::FIELD_TARGET])) { + $this->setTarget(new FHIRUri(array_merge($ext, $data[self::FIELD_TARGET]))); + } } else { $this->setTarget(new FHIRUri($data[self::FIELD_TARGET])); } @@ -241,8 +255,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TARGET_VERSION] instanceof FHIRString) { $this->setTargetVersion($data[self::FIELD_TARGET_VERSION]); - } elseif ($ext && is_scalar($data[self::FIELD_TARGET_VERSION])) { - $this->setTargetVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TARGET_VERSION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TARGET_VERSION])) { + $this->setTargetVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TARGET_VERSION]] + $ext)); + } else if (is_array($data[self::FIELD_TARGET_VERSION])) { + $this->setTargetVersion(new FHIRString(array_merge($ext, $data[self::FIELD_TARGET_VERSION]))); + } } else { $this->setTargetVersion(new FHIRString($data[self::FIELD_TARGET_VERSION])); } @@ -640,7 +658,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getElement())) { foreach($vs as $v) { if (null === $v) { @@ -649,6 +666,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_ELEMENT, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getSource())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SOURCE, null, $v->_getFHIRXMLNamespace())); } @@ -661,7 +679,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getTargetVersion())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TARGET_VERSION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getUnmapped())) { $v->xmlSerialize($sxe->addChild(self::FIELD_UNMAPPED, null, $v->_getFHIRXMLNamespace())); } @@ -678,20 +695,48 @@ public function jsonSerialize() $a[self::FIELD_ELEMENT] = $vs; } if (null !== ($v = $this->getSource())) { - $a[self::FIELD_SOURCE] = $v->getValue(); - $a[self::FIELD_SOURCE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SOURCE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SOURCE_EXT] = $enc; + } + } else { + $a[self::FIELD_SOURCE] = $v; + } } if (null !== ($v = $this->getSourceVersion())) { - $a[self::FIELD_SOURCE_VERSION] = $v->getValue(); - $a[self::FIELD_SOURCE_VERSION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SOURCE_VERSION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SOURCE_VERSION_EXT] = $enc; + } + } else { + $a[self::FIELD_SOURCE_VERSION] = $v; + } } if (null !== ($v = $this->getTarget())) { - $a[self::FIELD_TARGET] = $v->getValue(); - $a[self::FIELD_TARGET_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TARGET] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TARGET_EXT] = $enc; + } + } else { + $a[self::FIELD_TARGET] = $v; + } } if (null !== ($v = $this->getTargetVersion())) { - $a[self::FIELD_TARGET_VERSION] = $v->getValue(); - $a[self::FIELD_TARGET_VERSION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TARGET_VERSION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TARGET_VERSION_EXT] = $enc; + } + } else { + $a[self::FIELD_TARGET_VERSION] = $v; + } } if (null !== ($v = $this->getUnmapped())) { $a[self::FIELD_UNMAPPED] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRConceptMap/FHIRConceptMapTarget.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRConceptMap/FHIRConceptMapTarget.php index ba9f98b5e5..06fc93b417 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRConceptMap/FHIRConceptMapTarget.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRConceptMap/FHIRConceptMapTarget.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -81,10 +81,6 @@ class FHIRConceptMapTarget extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONCEPT_MAP_DOT_TARGET; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CODE = 'code'; const FIELD_CODE_EXT = '_code'; const FIELD_COMMENT = 'comment'; @@ -172,6 +168,9 @@ class FHIRConceptMapTarget extends FHIRBackboneElement */ protected $product = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRConceptMapTarget Constructor * @param null|array $data @@ -194,8 +193,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CODE] instanceof FHIRCode) { $this->setCode($data[self::FIELD_CODE]); - } elseif ($ext && is_scalar($data[self::FIELD_CODE])) { - $this->setCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_CODE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CODE])) { + $this->setCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_CODE]] + $ext)); + } else if (is_array($data[self::FIELD_CODE])) { + $this->setCode(new FHIRCode(array_merge($ext, $data[self::FIELD_CODE]))); + } } else { $this->setCode(new FHIRCode($data[self::FIELD_CODE])); } @@ -206,8 +209,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_COMMENT] instanceof FHIRString) { $this->setComment($data[self::FIELD_COMMENT]); - } elseif ($ext && is_scalar($data[self::FIELD_COMMENT])) { - $this->setComment(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_COMMENT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_COMMENT])) { + $this->setComment(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_COMMENT]] + $ext)); + } else if (is_array($data[self::FIELD_COMMENT])) { + $this->setComment(new FHIRString(array_merge($ext, $data[self::FIELD_COMMENT]))); + } } else { $this->setComment(new FHIRString($data[self::FIELD_COMMENT])); } @@ -218,17 +225,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_DEPENDS_ON])) { foreach($data[self::FIELD_DEPENDS_ON] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRConceptMapDependsOn) { $this->addDependsOn($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addDependsOn(new FHIRConceptMapDependsOn([FHIRConceptMapDependsOn::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addDependsOn(new FHIRConceptMapDependsOn([FHIRConceptMapDependsOn::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addDependsOn(new FHIRConceptMapDependsOn(array_merge($v, $ext[$i]))); + } } else { $this->addDependsOn(new FHIRConceptMapDependsOn($v)); } } } elseif ($data[self::FIELD_DEPENDS_ON] instanceof FHIRConceptMapDependsOn) { $this->addDependsOn($data[self::FIELD_DEPENDS_ON]); - } elseif ($ext && is_scalar($data[self::FIELD_DEPENDS_ON])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_DEPENDS_ON])) { $this->addDependsOn(new FHIRConceptMapDependsOn([FHIRConceptMapDependsOn::FIELD_VALUE => $data[self::FIELD_DEPENDS_ON]] + $ext)); } else { $this->addDependsOn(new FHIRConceptMapDependsOn($data[self::FIELD_DEPENDS_ON])); @@ -240,8 +254,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DISPLAY] instanceof FHIRString) { $this->setDisplay($data[self::FIELD_DISPLAY]); - } elseif ($ext && is_scalar($data[self::FIELD_DISPLAY])) { - $this->setDisplay(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DISPLAY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DISPLAY])) { + $this->setDisplay(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DISPLAY]] + $ext)); + } else if (is_array($data[self::FIELD_DISPLAY])) { + $this->setDisplay(new FHIRString(array_merge($ext, $data[self::FIELD_DISPLAY]))); + } } else { $this->setDisplay(new FHIRString($data[self::FIELD_DISPLAY])); } @@ -252,8 +270,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EQUIVALENCE] instanceof FHIRConceptMapEquivalence) { $this->setEquivalence($data[self::FIELD_EQUIVALENCE]); - } elseif ($ext && is_scalar($data[self::FIELD_EQUIVALENCE])) { - $this->setEquivalence(new FHIRConceptMapEquivalence([FHIRConceptMapEquivalence::FIELD_VALUE => $data[self::FIELD_EQUIVALENCE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EQUIVALENCE])) { + $this->setEquivalence(new FHIRConceptMapEquivalence([FHIRConceptMapEquivalence::FIELD_VALUE => $data[self::FIELD_EQUIVALENCE]] + $ext)); + } else if (is_array($data[self::FIELD_EQUIVALENCE])) { + $this->setEquivalence(new FHIRConceptMapEquivalence(array_merge($ext, $data[self::FIELD_EQUIVALENCE]))); + } } else { $this->setEquivalence(new FHIRConceptMapEquivalence($data[self::FIELD_EQUIVALENCE])); } @@ -264,17 +286,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_PRODUCT])) { foreach($data[self::FIELD_PRODUCT] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRConceptMapDependsOn) { $this->addProduct($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addProduct(new FHIRConceptMapDependsOn([FHIRConceptMapDependsOn::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addProduct(new FHIRConceptMapDependsOn([FHIRConceptMapDependsOn::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addProduct(new FHIRConceptMapDependsOn(array_merge($v, $ext[$i]))); + } } else { $this->addProduct(new FHIRConceptMapDependsOn($v)); } } } elseif ($data[self::FIELD_PRODUCT] instanceof FHIRConceptMapDependsOn) { $this->addProduct($data[self::FIELD_PRODUCT]); - } elseif ($ext && is_scalar($data[self::FIELD_PRODUCT])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_PRODUCT])) { $this->addProduct(new FHIRConceptMapDependsOn([FHIRConceptMapDependsOn::FIELD_VALUE => $data[self::FIELD_PRODUCT]] + $ext)); } else { $this->addProduct(new FHIRConceptMapDependsOn($data[self::FIELD_PRODUCT])); @@ -695,7 +724,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getComment())) { $v->xmlSerialize($sxe->addChild(self::FIELD_COMMENT, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getDependsOn())) { foreach($vs as $v) { if (null === $v) { @@ -704,14 +732,13 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_DEPENDS_ON, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getDisplay())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DISPLAY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getEquivalence())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EQUIVALENCE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getProduct())) { foreach($vs as $v) { if (null === $v) { @@ -720,6 +747,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_PRODUCT, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } @@ -730,25 +758,86 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getCode())) { - $a[self::FIELD_CODE] = $v->getValue(); - $a[self::FIELD_CODE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CODE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CODE_EXT] = $enc; + } + } else { + $a[self::FIELD_CODE] = $v; + } } if (null !== ($v = $this->getComment())) { - $a[self::FIELD_COMMENT] = $v->getValue(); - $a[self::FIELD_COMMENT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_COMMENT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_COMMENT_EXT] = $enc; + } + } else { + $a[self::FIELD_COMMENT] = $v; + } } if ([] !== ($vs = $this->getDependsOn())) { - $a[self::FIELD_DEPENDS_ON] = $vs; + $a[self::FIELD_DEPENDS_ON] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DEPENDS_ON][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DEPENDS_ON_EXT][] = $enc; + } else { + $a[self::FIELD_DEPENDS_ON_EXT][] = null; + } + } else { + $a[self::FIELD_DEPENDS_ON][] = $v; + } + } } if (null !== ($v = $this->getDisplay())) { - $a[self::FIELD_DISPLAY] = $v->getValue(); - $a[self::FIELD_DISPLAY_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DISPLAY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DISPLAY_EXT] = $enc; + } + } else { + $a[self::FIELD_DISPLAY] = $v; + } } if (null !== ($v = $this->getEquivalence())) { - $a[self::FIELD_EQUIVALENCE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EQUIVALENCE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EQUIVALENCE_EXT] = $enc; + } + } else { + $a[self::FIELD_EQUIVALENCE] = $v; + } } if ([] !== ($vs = $this->getProduct())) { - $a[self::FIELD_PRODUCT] = $vs; + $a[self::FIELD_PRODUCT] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PRODUCT][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PRODUCT_EXT][] = $enc; + } else { + $a[self::FIELD_PRODUCT_EXT][] = null; + } + } else { + $a[self::FIELD_PRODUCT][] = $v; + } + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRConceptMap/FHIRConceptMapUnmapped.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRConceptMap/FHIRConceptMapUnmapped.php index 5599d13ada..8caf209400 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRConceptMap/FHIRConceptMapUnmapped.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRConceptMap/FHIRConceptMapUnmapped.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -82,10 +82,6 @@ class FHIRConceptMapUnmapped extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONCEPT_MAP_DOT_UNMAPPED; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CODE = 'code'; const FIELD_CODE_EXT = '_code'; const FIELD_DISPLAY = 'display'; @@ -148,6 +144,9 @@ class FHIRConceptMapUnmapped extends FHIRBackboneElement */ protected $url = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRConceptMapUnmapped Constructor * @param null|array $data @@ -170,8 +169,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CODE] instanceof FHIRCode) { $this->setCode($data[self::FIELD_CODE]); - } elseif ($ext && is_scalar($data[self::FIELD_CODE])) { - $this->setCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_CODE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CODE])) { + $this->setCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_CODE]] + $ext)); + } else if (is_array($data[self::FIELD_CODE])) { + $this->setCode(new FHIRCode(array_merge($ext, $data[self::FIELD_CODE]))); + } } else { $this->setCode(new FHIRCode($data[self::FIELD_CODE])); } @@ -182,8 +185,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DISPLAY] instanceof FHIRString) { $this->setDisplay($data[self::FIELD_DISPLAY]); - } elseif ($ext && is_scalar($data[self::FIELD_DISPLAY])) { - $this->setDisplay(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DISPLAY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DISPLAY])) { + $this->setDisplay(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DISPLAY]] + $ext)); + } else if (is_array($data[self::FIELD_DISPLAY])) { + $this->setDisplay(new FHIRString(array_merge($ext, $data[self::FIELD_DISPLAY]))); + } } else { $this->setDisplay(new FHIRString($data[self::FIELD_DISPLAY])); } @@ -194,8 +201,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MODE] instanceof FHIRConceptMapGroupUnmappedMode) { $this->setMode($data[self::FIELD_MODE]); - } elseif ($ext && is_scalar($data[self::FIELD_MODE])) { - $this->setMode(new FHIRConceptMapGroupUnmappedMode([FHIRConceptMapGroupUnmappedMode::FIELD_VALUE => $data[self::FIELD_MODE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MODE])) { + $this->setMode(new FHIRConceptMapGroupUnmappedMode([FHIRConceptMapGroupUnmappedMode::FIELD_VALUE => $data[self::FIELD_MODE]] + $ext)); + } else if (is_array($data[self::FIELD_MODE])) { + $this->setMode(new FHIRConceptMapGroupUnmappedMode(array_merge($ext, $data[self::FIELD_MODE]))); + } } else { $this->setMode(new FHIRConceptMapGroupUnmappedMode($data[self::FIELD_MODE])); } @@ -206,8 +217,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_URL] instanceof FHIRCanonical) { $this->setUrl($data[self::FIELD_URL]); - } elseif ($ext && is_scalar($data[self::FIELD_URL])) { - $this->setUrl(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_URL])) { + $this->setUrl(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } else if (is_array($data[self::FIELD_URL])) { + $this->setUrl(new FHIRCanonical(array_merge($ext, $data[self::FIELD_URL]))); + } } else { $this->setUrl(new FHIRCanonical($data[self::FIELD_URL])); } @@ -502,7 +517,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDisplay())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DISPLAY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getMode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MODE, null, $v->_getFHIRXMLNamespace())); } @@ -519,19 +533,48 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getCode())) { - $a[self::FIELD_CODE] = $v->getValue(); - $a[self::FIELD_CODE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CODE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CODE_EXT] = $enc; + } + } else { + $a[self::FIELD_CODE] = $v; + } } if (null !== ($v = $this->getDisplay())) { - $a[self::FIELD_DISPLAY] = $v->getValue(); - $a[self::FIELD_DISPLAY_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DISPLAY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DISPLAY_EXT] = $enc; + } + } else { + $a[self::FIELD_DISPLAY] = $v; + } } if (null !== ($v = $this->getMode())) { - $a[self::FIELD_MODE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MODE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MODE_EXT] = $enc; + } + } else { + $a[self::FIELD_MODE] = $v; + } } if (null !== ($v = $this->getUrl())) { - $a[self::FIELD_URL] = $v->getValue(); - $a[self::FIELD_URL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_URL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_URL_EXT] = $enc; + } + } else { + $a[self::FIELD_URL] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRCondition/FHIRConditionEvidence.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRCondition/FHIRConditionEvidence.php index a817357a29..e927762511 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRCondition/FHIRConditionEvidence.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRCondition/FHIRConditionEvidence.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRConditionEvidence extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONDITION_DOT_EVIDENCE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CODE = 'code'; const FIELD_DETAIL = 'detail'; @@ -109,6 +105,9 @@ class FHIRConditionEvidence extends FHIRBackboneElement */ protected $detail = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRConditionEvidence Constructor * @param null|array $data @@ -128,6 +127,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CODE])) { if (is_array($data[self::FIELD_CODE])) { foreach($data[self::FIELD_CODE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addCode($v); } else { @@ -143,6 +145,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_DETAIL])) { if (is_array($data[self::FIELD_DETAIL])) { foreach($data[self::FIELD_DETAIL] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addDetail($v); } else { @@ -381,7 +386,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getCode())) { foreach($vs as $v) { if (null === $v) { @@ -399,6 +403,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_DETAIL, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRCondition/FHIRConditionStage.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRCondition/FHIRConditionStage.php index e5dab8d909..447d601979 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRCondition/FHIRConditionStage.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRCondition/FHIRConditionStage.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRConditionStage extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONDITION_DOT_STAGE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ASSESSMENT = 'assessment'; const FIELD_SUMMARY = 'summary'; const FIELD_TYPE = 'type'; @@ -124,6 +120,9 @@ class FHIRConditionStage extends FHIRBackboneElement */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRConditionStage Constructor * @param null|array $data @@ -143,6 +142,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ASSESSMENT])) { if (is_array($data[self::FIELD_ASSESSMENT])) { foreach($data[self::FIELD_ASSESSMENT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addAssessment($v); } else { @@ -406,7 +408,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getAssessment())) { foreach($vs as $v) { if (null === $v) { @@ -419,7 +420,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getSummary())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUMMARY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRConsent/FHIRConsentActor.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRConsent/FHIRConsentActor.php index e991aeae4b..4ae5912f96 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRConsent/FHIRConsentActor.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRConsent/FHIRConsentActor.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRConsentActor extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONSENT_DOT_ACTOR; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_REFERENCE = 'reference'; const FIELD_ROLE = 'role'; @@ -113,6 +109,9 @@ class FHIRConsentActor extends FHIRBackboneElement */ protected $role = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRConsentActor Constructor * @param null|array $data @@ -318,11 +317,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REFERENCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRole())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ROLE, null, $v->_getFHIRXMLNamespace())); } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRConsent/FHIRConsentData.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRConsent/FHIRConsentData.php index e8b868045f..c05fdd9921 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRConsent/FHIRConsentData.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRConsent/FHIRConsentData.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRConsentData extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONSENT_DOT_DATA; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_MEANING = 'meaning'; const FIELD_MEANING_EXT = '_meaning'; const FIELD_REFERENCE = 'reference'; @@ -110,6 +106,9 @@ class FHIRConsentData extends FHIRBackboneElement */ protected $reference = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRConsentData Constructor * @param null|array $data @@ -132,8 +131,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MEANING] instanceof FHIRConsentDataMeaning) { $this->setMeaning($data[self::FIELD_MEANING]); - } elseif ($ext && is_scalar($data[self::FIELD_MEANING])) { - $this->setMeaning(new FHIRConsentDataMeaning([FHIRConsentDataMeaning::FIELD_VALUE => $data[self::FIELD_MEANING]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MEANING])) { + $this->setMeaning(new FHIRConsentDataMeaning([FHIRConsentDataMeaning::FIELD_VALUE => $data[self::FIELD_MEANING]] + $ext)); + } else if (is_array($data[self::FIELD_MEANING])) { + $this->setMeaning(new FHIRConsentDataMeaning(array_merge($ext, $data[self::FIELD_MEANING]))); + } } else { $this->setMeaning(new FHIRConsentDataMeaning($data[self::FIELD_MEANING])); } @@ -312,11 +315,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getMeaning())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MEANING, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REFERENCE, null, $v->_getFHIRXMLNamespace())); } @@ -330,7 +331,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getMeaning())) { - $a[self::FIELD_MEANING] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MEANING] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MEANING_EXT] = $enc; + } + } else { + $a[self::FIELD_MEANING] = $v; + } } if (null !== ($v = $this->getReference())) { $a[self::FIELD_REFERENCE] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRConsent/FHIRConsentPolicy.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRConsent/FHIRConsentPolicy.php index eae3c5d60d..6bba2c4211 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRConsent/FHIRConsentPolicy.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRConsent/FHIRConsentPolicy.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRConsentPolicy extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONSENT_DOT_POLICY; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_AUTHORITY = 'authority'; const FIELD_AUTHORITY_EXT = '_authority'; const FIELD_URI = 'uri'; @@ -112,6 +108,9 @@ class FHIRConsentPolicy extends FHIRBackboneElement */ protected $uri = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRConsentPolicy Constructor * @param null|array $data @@ -134,8 +133,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_AUTHORITY] instanceof FHIRUri) { $this->setAuthority($data[self::FIELD_AUTHORITY]); - } elseif ($ext && is_scalar($data[self::FIELD_AUTHORITY])) { - $this->setAuthority(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_AUTHORITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_AUTHORITY])) { + $this->setAuthority(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_AUTHORITY]] + $ext)); + } else if (is_array($data[self::FIELD_AUTHORITY])) { + $this->setAuthority(new FHIRUri(array_merge($ext, $data[self::FIELD_AUTHORITY]))); + } } else { $this->setAuthority(new FHIRUri($data[self::FIELD_AUTHORITY])); } @@ -146,8 +149,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_URI] instanceof FHIRUri) { $this->setUri($data[self::FIELD_URI]); - } elseif ($ext && is_scalar($data[self::FIELD_URI])) { - $this->setUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URI]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_URI])) { + $this->setUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URI]] + $ext)); + } else if (is_array($data[self::FIELD_URI])) { + $this->setUri(new FHIRUri(array_merge($ext, $data[self::FIELD_URI]))); + } } else { $this->setUri(new FHIRUri($data[self::FIELD_URI])); } @@ -361,12 +368,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getAuthority())) { - $a[self::FIELD_AUTHORITY] = $v->getValue(); - $a[self::FIELD_AUTHORITY_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_AUTHORITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_AUTHORITY_EXT] = $enc; + } + } else { + $a[self::FIELD_AUTHORITY] = $v; + } } if (null !== ($v = $this->getUri())) { - $a[self::FIELD_URI] = $v->getValue(); - $a[self::FIELD_URI_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_URI] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_URI_EXT] = $enc; + } + } else { + $a[self::FIELD_URI] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRConsent/FHIRConsentProvision.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRConsent/FHIRConsentProvision.php index 928791f727..f1daa1cc80 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRConsent/FHIRConsentProvision.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRConsent/FHIRConsentProvision.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -82,10 +82,6 @@ class FHIRConsentProvision extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONSENT_DOT_PROVISION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ACTION = 'action'; const FIELD_ACTOR = 'actor'; const FIELD_CLASS = 'class'; @@ -229,6 +225,9 @@ class FHIRConsentProvision extends FHIRBackboneElement */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRConsentProvision Constructor * @param null|array $data @@ -248,6 +247,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ACTION])) { if (is_array($data[self::FIELD_ACTION])) { foreach($data[self::FIELD_ACTION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addAction($v); } else { @@ -263,6 +265,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ACTOR])) { if (is_array($data[self::FIELD_ACTOR])) { foreach($data[self::FIELD_ACTOR] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRConsentActor) { $this->addActor($v); } else { @@ -278,6 +283,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CLASS])) { if (is_array($data[self::FIELD_CLASS])) { foreach($data[self::FIELD_CLASS] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCoding) { $this->addClass($v); } else { @@ -293,6 +301,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CODE])) { if (is_array($data[self::FIELD_CODE])) { foreach($data[self::FIELD_CODE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addCode($v); } else { @@ -308,6 +319,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_DATA])) { if (is_array($data[self::FIELD_DATA])) { foreach($data[self::FIELD_DATA] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRConsentData) { $this->addData($v); } else { @@ -337,6 +351,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PROVISION])) { if (is_array($data[self::FIELD_PROVISION])) { foreach($data[self::FIELD_PROVISION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRConsentProvision) { $this->addProvision($v); } else { @@ -352,6 +369,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PURPOSE])) { if (is_array($data[self::FIELD_PURPOSE])) { foreach($data[self::FIELD_PURPOSE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCoding) { $this->addPurpose($v); } else { @@ -367,6 +387,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SECURITY_LABEL])) { if (is_array($data[self::FIELD_SECURITY_LABEL])) { foreach($data[self::FIELD_SECURITY_LABEL] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCoding) { $this->addSecurityLabel($v); } else { @@ -385,8 +408,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TYPE] instanceof FHIRConsentProvisionType) { $this->setType($data[self::FIELD_TYPE]); - } elseif ($ext && is_scalar($data[self::FIELD_TYPE])) { - $this->setType(new FHIRConsentProvisionType([FHIRConsentProvisionType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TYPE])) { + $this->setType(new FHIRConsentProvisionType([FHIRConsentProvisionType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } else if (is_array($data[self::FIELD_TYPE])) { + $this->setType(new FHIRConsentProvisionType(array_merge($ext, $data[self::FIELD_TYPE]))); + } } else { $this->setType(new FHIRConsentProvisionType($data[self::FIELD_TYPE])); } @@ -1104,7 +1131,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getAction())) { foreach($vs as $v) { if (null === $v) { @@ -1153,11 +1179,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDataPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DATA_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getProvision())) { foreach($vs as $v) { if (null === $v) { @@ -1228,7 +1252,15 @@ public function jsonSerialize() $a[self::FIELD_SECURITY_LABEL] = $vs; } if (null !== ($v = $this->getType())) { - $a[self::FIELD_TYPE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TYPE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TYPE_EXT] = $enc; + } + } else { + $a[self::FIELD_TYPE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRConsent/FHIRConsentVerification.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRConsent/FHIRConsentVerification.php index e70d5813d9..51dab1e2b1 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRConsent/FHIRConsentVerification.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRConsent/FHIRConsentVerification.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -81,10 +81,6 @@ class FHIRConsentVerification extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONSENT_DOT_VERIFICATION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VERIFICATION_DATE = 'verificationDate'; const FIELD_VERIFICATION_DATE_EXT = '_verificationDate'; const FIELD_VERIFIED = 'verified'; @@ -126,6 +122,9 @@ class FHIRConsentVerification extends FHIRBackboneElement */ protected $verifiedWith = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRConsentVerification Constructor * @param null|array $data @@ -148,8 +147,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VERIFICATION_DATE] instanceof FHIRDateTime) { $this->setVerificationDate($data[self::FIELD_VERIFICATION_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_VERIFICATION_DATE])) { - $this->setVerificationDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_VERIFICATION_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VERIFICATION_DATE])) { + $this->setVerificationDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_VERIFICATION_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_VERIFICATION_DATE])) { + $this->setVerificationDate(new FHIRDateTime(array_merge($ext, $data[self::FIELD_VERIFICATION_DATE]))); + } } else { $this->setVerificationDate(new FHIRDateTime($data[self::FIELD_VERIFICATION_DATE])); } @@ -160,8 +163,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VERIFIED] instanceof FHIRBoolean) { $this->setVerified($data[self::FIELD_VERIFIED]); - } elseif ($ext && is_scalar($data[self::FIELD_VERIFIED])) { - $this->setVerified(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_VERIFIED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VERIFIED])) { + $this->setVerified(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_VERIFIED]] + $ext)); + } else if (is_array($data[self::FIELD_VERIFIED])) { + $this->setVerified(new FHIRBoolean(array_merge($ext, $data[self::FIELD_VERIFIED]))); + } } else { $this->setVerified(new FHIRBoolean($data[self::FIELD_VERIFIED])); } @@ -405,7 +412,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getVerified())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VERIFIED, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getVerifiedWith())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VERIFIED_WITH, null, $v->_getFHIRXMLNamespace())); } @@ -419,12 +425,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getVerificationDate())) { - $a[self::FIELD_VERIFICATION_DATE] = $v->getValue(); - $a[self::FIELD_VERIFICATION_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VERIFICATION_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VERIFICATION_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_VERIFICATION_DATE] = $v; + } } if (null !== ($v = $this->getVerified())) { - $a[self::FIELD_VERIFIED] = $v->getValue(); - $a[self::FIELD_VERIFIED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VERIFIED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VERIFIED_EXT] = $enc; + } + } else { + $a[self::FIELD_VERIFIED] = $v; + } } if (null !== ($v = $this->getVerifiedWith())) { $a[self::FIELD_VERIFIED_WITH] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractAction.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractAction.php index d17fac5df1..579b4e387f 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractAction.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractAction.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -86,10 +86,6 @@ class FHIRContractAction extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONTRACT_DOT_ACTION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CONTEXT = 'context'; const FIELD_CONTEXT_LINK_ID = 'contextLinkId'; const FIELD_CONTEXT_LINK_ID_EXT = '_contextLinkId'; @@ -399,6 +395,9 @@ class FHIRContractAction extends FHIRBackboneElement */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRContractAction Constructor * @param null|array $data @@ -428,17 +427,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_CONTEXT_LINK_ID])) { foreach($data[self::FIELD_CONTEXT_LINK_ID] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRString) { $this->addContextLinkId($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addContextLinkId(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addContextLinkId(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addContextLinkId(new FHIRString(array_merge($v, $ext[$i]))); + } } else { $this->addContextLinkId(new FHIRString($v)); } } } elseif ($data[self::FIELD_CONTEXT_LINK_ID] instanceof FHIRString) { $this->addContextLinkId($data[self::FIELD_CONTEXT_LINK_ID]); - } elseif ($ext && is_scalar($data[self::FIELD_CONTEXT_LINK_ID])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_CONTEXT_LINK_ID])) { $this->addContextLinkId(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_CONTEXT_LINK_ID]] + $ext)); } else { $this->addContextLinkId(new FHIRString($data[self::FIELD_CONTEXT_LINK_ID])); @@ -450,8 +456,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DO_NOT_PERFORM] instanceof FHIRBoolean) { $this->setDoNotPerform($data[self::FIELD_DO_NOT_PERFORM]); - } elseif ($ext && is_scalar($data[self::FIELD_DO_NOT_PERFORM])) { - $this->setDoNotPerform(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_DO_NOT_PERFORM]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DO_NOT_PERFORM])) { + $this->setDoNotPerform(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_DO_NOT_PERFORM]] + $ext)); + } else if (is_array($data[self::FIELD_DO_NOT_PERFORM])) { + $this->setDoNotPerform(new FHIRBoolean(array_merge($ext, $data[self::FIELD_DO_NOT_PERFORM]))); + } } else { $this->setDoNotPerform(new FHIRBoolean($data[self::FIELD_DO_NOT_PERFORM])); } @@ -469,17 +479,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_LINK_ID])) { foreach($data[self::FIELD_LINK_ID] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRString) { $this->addLinkId($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addLinkId(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addLinkId(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addLinkId(new FHIRString(array_merge($v, $ext[$i]))); + } } else { $this->addLinkId(new FHIRString($v)); } } } elseif ($data[self::FIELD_LINK_ID] instanceof FHIRString) { $this->addLinkId($data[self::FIELD_LINK_ID]); - } elseif ($ext && is_scalar($data[self::FIELD_LINK_ID])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_LINK_ID])) { $this->addLinkId(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_LINK_ID]] + $ext)); } else { $this->addLinkId(new FHIRString($data[self::FIELD_LINK_ID])); @@ -488,6 +505,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_NOTE])) { if (is_array($data[self::FIELD_NOTE])) { foreach($data[self::FIELD_NOTE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRAnnotation) { $this->addNote($v); } else { @@ -506,8 +526,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_OCCURRENCE_DATE_TIME] instanceof FHIRDateTime) { $this->setOccurrenceDateTime($data[self::FIELD_OCCURRENCE_DATE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_OCCURRENCE_DATE_TIME])) { - $this->setOccurrenceDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_OCCURRENCE_DATE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_OCCURRENCE_DATE_TIME])) { + $this->setOccurrenceDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_OCCURRENCE_DATE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_OCCURRENCE_DATE_TIME])) { + $this->setOccurrenceDateTime(new FHIRDateTime(array_merge($ext, $data[self::FIELD_OCCURRENCE_DATE_TIME]))); + } } else { $this->setOccurrenceDateTime(new FHIRDateTime($data[self::FIELD_OCCURRENCE_DATE_TIME])); } @@ -539,17 +563,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_PERFORMER_LINK_ID])) { foreach($data[self::FIELD_PERFORMER_LINK_ID] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRString) { $this->addPerformerLinkId($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addPerformerLinkId(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addPerformerLinkId(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addPerformerLinkId(new FHIRString(array_merge($v, $ext[$i]))); + } } else { $this->addPerformerLinkId(new FHIRString($v)); } } } elseif ($data[self::FIELD_PERFORMER_LINK_ID] instanceof FHIRString) { $this->addPerformerLinkId($data[self::FIELD_PERFORMER_LINK_ID]); - } elseif ($ext && is_scalar($data[self::FIELD_PERFORMER_LINK_ID])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_PERFORMER_LINK_ID])) { $this->addPerformerLinkId(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PERFORMER_LINK_ID]] + $ext)); } else { $this->addPerformerLinkId(new FHIRString($data[self::FIELD_PERFORMER_LINK_ID])); @@ -565,6 +596,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PERFORMER_TYPE])) { if (is_array($data[self::FIELD_PERFORMER_TYPE])) { foreach($data[self::FIELD_PERFORMER_TYPE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addPerformerType($v); } else { @@ -583,17 +617,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_REASON])) { foreach($data[self::FIELD_REASON] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRString) { $this->addReason($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addReason(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addReason(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addReason(new FHIRString(array_merge($v, $ext[$i]))); + } } else { $this->addReason(new FHIRString($v)); } } } elseif ($data[self::FIELD_REASON] instanceof FHIRString) { $this->addReason($data[self::FIELD_REASON]); - } elseif ($ext && is_scalar($data[self::FIELD_REASON])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_REASON])) { $this->addReason(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_REASON]] + $ext)); } else { $this->addReason(new FHIRString($data[self::FIELD_REASON])); @@ -602,6 +643,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REASON_CODE])) { if (is_array($data[self::FIELD_REASON_CODE])) { foreach($data[self::FIELD_REASON_CODE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addReasonCode($v); } else { @@ -620,17 +664,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_REASON_LINK_ID])) { foreach($data[self::FIELD_REASON_LINK_ID] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRString) { $this->addReasonLinkId($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addReasonLinkId(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addReasonLinkId(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addReasonLinkId(new FHIRString(array_merge($v, $ext[$i]))); + } } else { $this->addReasonLinkId(new FHIRString($v)); } } } elseif ($data[self::FIELD_REASON_LINK_ID] instanceof FHIRString) { $this->addReasonLinkId($data[self::FIELD_REASON_LINK_ID]); - } elseif ($ext && is_scalar($data[self::FIELD_REASON_LINK_ID])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_REASON_LINK_ID])) { $this->addReasonLinkId(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_REASON_LINK_ID]] + $ext)); } else { $this->addReasonLinkId(new FHIRString($data[self::FIELD_REASON_LINK_ID])); @@ -639,6 +690,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REASON_REFERENCE])) { if (is_array($data[self::FIELD_REASON_REFERENCE])) { foreach($data[self::FIELD_REASON_REFERENCE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addReasonReference($v); } else { @@ -654,6 +708,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REQUESTER])) { if (is_array($data[self::FIELD_REQUESTER])) { foreach($data[self::FIELD_REQUESTER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addRequester($v); } else { @@ -672,17 +729,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_REQUESTER_LINK_ID])) { foreach($data[self::FIELD_REQUESTER_LINK_ID] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRString) { $this->addRequesterLinkId($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addRequesterLinkId(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addRequesterLinkId(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addRequesterLinkId(new FHIRString(array_merge($v, $ext[$i]))); + } } else { $this->addRequesterLinkId(new FHIRString($v)); } } } elseif ($data[self::FIELD_REQUESTER_LINK_ID] instanceof FHIRString) { $this->addRequesterLinkId($data[self::FIELD_REQUESTER_LINK_ID]); - } elseif ($ext && is_scalar($data[self::FIELD_REQUESTER_LINK_ID])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_REQUESTER_LINK_ID])) { $this->addRequesterLinkId(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_REQUESTER_LINK_ID]] + $ext)); } else { $this->addRequesterLinkId(new FHIRString($data[self::FIELD_REQUESTER_LINK_ID])); @@ -694,17 +758,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_SECURITY_LABEL_NUMBER])) { foreach($data[self::FIELD_SECURITY_LABEL_NUMBER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRUnsignedInt) { $this->addSecurityLabelNumber($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addSecurityLabelNumber(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addSecurityLabelNumber(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addSecurityLabelNumber(new FHIRUnsignedInt(array_merge($v, $ext[$i]))); + } } else { $this->addSecurityLabelNumber(new FHIRUnsignedInt($v)); } } } elseif ($data[self::FIELD_SECURITY_LABEL_NUMBER] instanceof FHIRUnsignedInt) { $this->addSecurityLabelNumber($data[self::FIELD_SECURITY_LABEL_NUMBER]); - } elseif ($ext && is_scalar($data[self::FIELD_SECURITY_LABEL_NUMBER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_SECURITY_LABEL_NUMBER])) { $this->addSecurityLabelNumber(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_SECURITY_LABEL_NUMBER]] + $ext)); } else { $this->addSecurityLabelNumber(new FHIRUnsignedInt($data[self::FIELD_SECURITY_LABEL_NUMBER])); @@ -720,6 +791,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SUBJECT])) { if (is_array($data[self::FIELD_SUBJECT])) { foreach($data[self::FIELD_SUBJECT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContractSubject) { $this->addSubject($v); } else { @@ -2119,7 +2193,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getContext())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CONTEXT, null, $v->_getFHIRXMLNamespace())); } @@ -2131,10 +2204,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_CONTEXT_LINK_ID, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getDoNotPerform())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DO_NOT_PERFORM, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getIntent())) { $v->xmlSerialize($sxe->addChild(self::FIELD_INTENT, null, $v->_getFHIRXMLNamespace())); } @@ -2155,18 +2228,16 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_NOTE, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getOccurrenceDateTime())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OCCURRENCE_DATE_TIME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOccurrencePeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OCCURRENCE_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOccurrenceTiming())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OCCURRENCE_TIMING, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPerformer())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PERFORMER, null, $v->_getFHIRXMLNamespace())); } @@ -2182,7 +2253,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getPerformerRole())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PERFORMER_ROLE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getPerformerType())) { foreach($vs as $v) { if (null === $v) { @@ -2191,6 +2261,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_PERFORMER_TYPE, null, $v->_getFHIRXMLNamespace())); } } + if ([] !== ($vs = $this->getReason())) { foreach($vs as $v) { if (null === $v) { @@ -2208,6 +2279,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_REASON_CODE, null, $v->_getFHIRXMLNamespace())); } } + if ([] !== ($vs = $this->getReasonLinkId())) { foreach($vs as $v) { if (null === $v) { @@ -2234,6 +2306,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_REQUESTER, null, $v->_getFHIRXMLNamespace())); } } + if ([] !== ($vs = $this->getRequesterLinkId())) { foreach($vs as $v) { if (null === $v) { @@ -2242,6 +2315,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_REQUESTER_LINK_ID, null, $v->_getFHIRXMLNamespace())); } } + if ([] !== ($vs = $this->getSecurityLabelNumber())) { foreach($vs as $v) { if (null === $v) { @@ -2254,7 +2328,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getSubject())) { foreach($vs as $v) { if (null === $v) { @@ -2285,13 +2358,29 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_CONTEXT_LINK_ID][] = $v->getValue(); - $a[self::FIELD_CONTEXT_LINK_ID_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CONTEXT_LINK_ID][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CONTEXT_LINK_ID_EXT][] = $enc; + } else { + $a[self::FIELD_CONTEXT_LINK_ID_EXT][] = null; + } + } else { + $a[self::FIELD_CONTEXT_LINK_ID][] = $v; + } } } if (null !== ($v = $this->getDoNotPerform())) { - $a[self::FIELD_DO_NOT_PERFORM] = $v->getValue(); - $a[self::FIELD_DO_NOT_PERFORM_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DO_NOT_PERFORM] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DO_NOT_PERFORM_EXT] = $enc; + } + } else { + $a[self::FIELD_DO_NOT_PERFORM] = $v; + } } if (null !== ($v = $this->getIntent())) { $a[self::FIELD_INTENT] = $v; @@ -2302,16 +2391,32 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_LINK_ID][] = $v->getValue(); - $a[self::FIELD_LINK_ID_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_LINK_ID][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_LINK_ID_EXT][] = $enc; + } else { + $a[self::FIELD_LINK_ID_EXT][] = null; + } + } else { + $a[self::FIELD_LINK_ID][] = $v; + } } } if ([] !== ($vs = $this->getNote())) { $a[self::FIELD_NOTE] = $vs; } if (null !== ($v = $this->getOccurrenceDateTime())) { - $a[self::FIELD_OCCURRENCE_DATE_TIME] = $v->getValue(); - $a[self::FIELD_OCCURRENCE_DATE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_OCCURRENCE_DATE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_OCCURRENCE_DATE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_OCCURRENCE_DATE_TIME] = $v; + } } if (null !== ($v = $this->getOccurrencePeriod())) { $a[self::FIELD_OCCURRENCE_PERIOD] = $v; @@ -2328,8 +2433,17 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_PERFORMER_LINK_ID][] = $v->getValue(); - $a[self::FIELD_PERFORMER_LINK_ID_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PERFORMER_LINK_ID][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PERFORMER_LINK_ID_EXT][] = $enc; + } else { + $a[self::FIELD_PERFORMER_LINK_ID_EXT][] = null; + } + } else { + $a[self::FIELD_PERFORMER_LINK_ID][] = $v; + } } } if (null !== ($v = $this->getPerformerRole())) { @@ -2344,8 +2458,17 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_REASON][] = $v->getValue(); - $a[self::FIELD_REASON_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_REASON][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_REASON_EXT][] = $enc; + } else { + $a[self::FIELD_REASON_EXT][] = null; + } + } else { + $a[self::FIELD_REASON][] = $v; + } } } if ([] !== ($vs = $this->getReasonCode())) { @@ -2357,8 +2480,17 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_REASON_LINK_ID][] = $v->getValue(); - $a[self::FIELD_REASON_LINK_ID_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_REASON_LINK_ID][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_REASON_LINK_ID_EXT][] = $enc; + } else { + $a[self::FIELD_REASON_LINK_ID_EXT][] = null; + } + } else { + $a[self::FIELD_REASON_LINK_ID][] = $v; + } } } if ([] !== ($vs = $this->getReasonReference())) { @@ -2373,8 +2505,17 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_REQUESTER_LINK_ID][] = $v->getValue(); - $a[self::FIELD_REQUESTER_LINK_ID_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_REQUESTER_LINK_ID][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_REQUESTER_LINK_ID_EXT][] = $enc; + } else { + $a[self::FIELD_REQUESTER_LINK_ID_EXT][] = null; + } + } else { + $a[self::FIELD_REQUESTER_LINK_ID][] = $v; + } } } if ([] !== ($vs = $this->getSecurityLabelNumber())) { @@ -2383,8 +2524,17 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_SECURITY_LABEL_NUMBER][] = $v->getValue(); - $a[self::FIELD_SECURITY_LABEL_NUMBER_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SECURITY_LABEL_NUMBER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SECURITY_LABEL_NUMBER_EXT][] = $enc; + } else { + $a[self::FIELD_SECURITY_LABEL_NUMBER_EXT][] = null; + } + } else { + $a[self::FIELD_SECURITY_LABEL_NUMBER][] = $v; + } } } if (null !== ($v = $this->getStatus())) { diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractAnswer.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractAnswer.php index 8e8440413a..93b20602f1 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractAnswer.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractAnswer.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -89,10 +89,6 @@ class FHIRContractAnswer extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONTRACT_DOT_ANSWER; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE_ATTACHMENT = 'valueAttachment'; const FIELD_VALUE_BOOLEAN = 'valueBoolean'; const FIELD_VALUE_BOOLEAN_EXT = '_valueBoolean'; @@ -288,6 +284,9 @@ class FHIRContractAnswer extends FHIRBackboneElement */ protected $valueUri = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRContractAnswer Constructor * @param null|array $data @@ -317,8 +316,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_BOOLEAN] instanceof FHIRBoolean) { $this->setValueBoolean($data[self::FIELD_VALUE_BOOLEAN]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_BOOLEAN])) { - $this->setValueBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_VALUE_BOOLEAN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_BOOLEAN])) { + $this->setValueBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_VALUE_BOOLEAN]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_BOOLEAN])) { + $this->setValueBoolean(new FHIRBoolean(array_merge($ext, $data[self::FIELD_VALUE_BOOLEAN]))); + } } else { $this->setValueBoolean(new FHIRBoolean($data[self::FIELD_VALUE_BOOLEAN])); } @@ -336,8 +339,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_DATE] instanceof FHIRDate) { $this->setValueDate($data[self::FIELD_VALUE_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_DATE])) { - $this->setValueDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_VALUE_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_DATE])) { + $this->setValueDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_VALUE_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_DATE])) { + $this->setValueDate(new FHIRDate(array_merge($ext, $data[self::FIELD_VALUE_DATE]))); + } } else { $this->setValueDate(new FHIRDate($data[self::FIELD_VALUE_DATE])); } @@ -348,8 +355,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_DATE_TIME] instanceof FHIRDateTime) { $this->setValueDateTime($data[self::FIELD_VALUE_DATE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_DATE_TIME])) { - $this->setValueDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_VALUE_DATE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_DATE_TIME])) { + $this->setValueDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_VALUE_DATE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_DATE_TIME])) { + $this->setValueDateTime(new FHIRDateTime(array_merge($ext, $data[self::FIELD_VALUE_DATE_TIME]))); + } } else { $this->setValueDateTime(new FHIRDateTime($data[self::FIELD_VALUE_DATE_TIME])); } @@ -360,8 +371,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_DECIMAL] instanceof FHIRDecimal) { $this->setValueDecimal($data[self::FIELD_VALUE_DECIMAL]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_DECIMAL])) { - $this->setValueDecimal(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_VALUE_DECIMAL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_DECIMAL])) { + $this->setValueDecimal(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_VALUE_DECIMAL]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_DECIMAL])) { + $this->setValueDecimal(new FHIRDecimal(array_merge($ext, $data[self::FIELD_VALUE_DECIMAL]))); + } } else { $this->setValueDecimal(new FHIRDecimal($data[self::FIELD_VALUE_DECIMAL])); } @@ -372,8 +387,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_INTEGER] instanceof FHIRInteger) { $this->setValueInteger($data[self::FIELD_VALUE_INTEGER]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_INTEGER])) { - $this->setValueInteger(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_VALUE_INTEGER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_INTEGER])) { + $this->setValueInteger(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_VALUE_INTEGER]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_INTEGER])) { + $this->setValueInteger(new FHIRInteger(array_merge($ext, $data[self::FIELD_VALUE_INTEGER]))); + } } else { $this->setValueInteger(new FHIRInteger($data[self::FIELD_VALUE_INTEGER])); } @@ -384,8 +403,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_QUANTITY] instanceof FHIRQuantity) { $this->setValueQuantity($data[self::FIELD_VALUE_QUANTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_QUANTITY])) { - $this->setValueQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_VALUE_QUANTITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_QUANTITY])) { + $this->setValueQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_VALUE_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_QUANTITY])) { + $this->setValueQuantity(new FHIRQuantity(array_merge($ext, $data[self::FIELD_VALUE_QUANTITY]))); + } } else { $this->setValueQuantity(new FHIRQuantity($data[self::FIELD_VALUE_QUANTITY])); } @@ -403,8 +426,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_STRING] instanceof FHIRString) { $this->setValueString($data[self::FIELD_VALUE_STRING]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_STRING])) { - $this->setValueString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VALUE_STRING]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_STRING])) { + $this->setValueString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VALUE_STRING]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_STRING])) { + $this->setValueString(new FHIRString(array_merge($ext, $data[self::FIELD_VALUE_STRING]))); + } } else { $this->setValueString(new FHIRString($data[self::FIELD_VALUE_STRING])); } @@ -415,8 +442,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_TIME] instanceof FHIRTime) { $this->setValueTime($data[self::FIELD_VALUE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_TIME])) { - $this->setValueTime(new FHIRTime([FHIRTime::FIELD_VALUE => $data[self::FIELD_VALUE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_TIME])) { + $this->setValueTime(new FHIRTime([FHIRTime::FIELD_VALUE => $data[self::FIELD_VALUE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_TIME])) { + $this->setValueTime(new FHIRTime(array_merge($ext, $data[self::FIELD_VALUE_TIME]))); + } } else { $this->setValueTime(new FHIRTime($data[self::FIELD_VALUE_TIME])); } @@ -427,8 +458,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_URI] instanceof FHIRUri) { $this->setValueUri($data[self::FIELD_VALUE_URI]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_URI])) { - $this->setValueUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_VALUE_URI]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_URI])) { + $this->setValueUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_VALUE_URI]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_URI])) { + $this->setValueUri(new FHIRUri(array_merge($ext, $data[self::FIELD_VALUE_URI]))); + } } else { $this->setValueUri(new FHIRUri($data[self::FIELD_VALUE_URI])); } @@ -1100,14 +1135,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValueAttachment())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_ATTACHMENT, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getValueBoolean())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_BOOLEAN, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueCoding())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_CODING, null, $v->_getFHIRXMLNamespace())); } @@ -1123,11 +1156,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getValueInteger())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_INTEGER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_QUANTITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_REFERENCE, null, $v->_getFHIRXMLNamespace())); } @@ -1153,45 +1184,109 @@ public function jsonSerialize() $a[self::FIELD_VALUE_ATTACHMENT] = $v; } if (null !== ($v = $this->getValueBoolean())) { - $a[self::FIELD_VALUE_BOOLEAN] = $v->getValue(); - $a[self::FIELD_VALUE_BOOLEAN_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_BOOLEAN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_BOOLEAN_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_BOOLEAN] = $v; + } } if (null !== ($v = $this->getValueCoding())) { $a[self::FIELD_VALUE_CODING] = $v; } if (null !== ($v = $this->getValueDate())) { - $a[self::FIELD_VALUE_DATE] = $v->getValue(); - $a[self::FIELD_VALUE_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_DATE] = $v; + } } if (null !== ($v = $this->getValueDateTime())) { - $a[self::FIELD_VALUE_DATE_TIME] = $v->getValue(); - $a[self::FIELD_VALUE_DATE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_DATE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_DATE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_DATE_TIME] = $v; + } } if (null !== ($v = $this->getValueDecimal())) { - $a[self::FIELD_VALUE_DECIMAL] = $v->getValue(); - $a[self::FIELD_VALUE_DECIMAL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_DECIMAL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_DECIMAL_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_DECIMAL] = $v; + } } if (null !== ($v = $this->getValueInteger())) { - $a[self::FIELD_VALUE_INTEGER] = $v->getValue(); - $a[self::FIELD_VALUE_INTEGER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_INTEGER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_INTEGER_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_INTEGER] = $v; + } } if (null !== ($v = $this->getValueQuantity())) { - $a[self::FIELD_VALUE_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_QUANTITY] = $v; + } } if (null !== ($v = $this->getValueReference())) { $a[self::FIELD_VALUE_REFERENCE] = $v; } if (null !== ($v = $this->getValueString())) { - $a[self::FIELD_VALUE_STRING] = $v->getValue(); - $a[self::FIELD_VALUE_STRING_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_STRING] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_STRING_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_STRING] = $v; + } } if (null !== ($v = $this->getValueTime())) { - $a[self::FIELD_VALUE_TIME] = $v->getValue(); - $a[self::FIELD_VALUE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_TIME] = $v; + } } if (null !== ($v = $this->getValueUri())) { - $a[self::FIELD_VALUE_URI] = $v->getValue(); - $a[self::FIELD_VALUE_URI_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_URI] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_URI_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_URI] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractAsset.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractAsset.php index d6652bab1b..a13c48e9da 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractAsset.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractAsset.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -83,10 +83,6 @@ class FHIRContractAsset extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONTRACT_DOT_ASSET; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ANSWER = 'answer'; const FIELD_CONDITION = 'condition'; const FIELD_CONDITION_EXT = '_condition'; @@ -278,6 +274,9 @@ class FHIRContractAsset extends FHIRBackboneElement */ protected $valuedItem = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRContractAsset Constructor * @param null|array $data @@ -297,6 +296,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ANSWER])) { if (is_array($data[self::FIELD_ANSWER])) { foreach($data[self::FIELD_ANSWER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContractAnswer) { $this->addAnswer($v); } else { @@ -315,8 +317,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CONDITION] instanceof FHIRString) { $this->setCondition($data[self::FIELD_CONDITION]); - } elseif ($ext && is_scalar($data[self::FIELD_CONDITION])) { - $this->setCondition(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_CONDITION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CONDITION])) { + $this->setCondition(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_CONDITION]] + $ext)); + } else if (is_array($data[self::FIELD_CONDITION])) { + $this->setCondition(new FHIRString(array_merge($ext, $data[self::FIELD_CONDITION]))); + } } else { $this->setCondition(new FHIRString($data[self::FIELD_CONDITION])); } @@ -324,6 +330,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CONTEXT])) { if (is_array($data[self::FIELD_CONTEXT])) { foreach($data[self::FIELD_CONTEXT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContractContext) { $this->addContext($v); } else { @@ -342,17 +351,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_LINK_ID])) { foreach($data[self::FIELD_LINK_ID] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRString) { $this->addLinkId($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addLinkId(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addLinkId(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addLinkId(new FHIRString(array_merge($v, $ext[$i]))); + } } else { $this->addLinkId(new FHIRString($v)); } } } elseif ($data[self::FIELD_LINK_ID] instanceof FHIRString) { $this->addLinkId($data[self::FIELD_LINK_ID]); - } elseif ($ext && is_scalar($data[self::FIELD_LINK_ID])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_LINK_ID])) { $this->addLinkId(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_LINK_ID]] + $ext)); } else { $this->addLinkId(new FHIRString($data[self::FIELD_LINK_ID])); @@ -361,6 +377,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PERIOD])) { if (is_array($data[self::FIELD_PERIOD])) { foreach($data[self::FIELD_PERIOD] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRPeriod) { $this->addPeriod($v); } else { @@ -376,6 +395,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PERIOD_TYPE])) { if (is_array($data[self::FIELD_PERIOD_TYPE])) { foreach($data[self::FIELD_PERIOD_TYPE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addPeriodType($v); } else { @@ -408,17 +430,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_SECURITY_LABEL_NUMBER])) { foreach($data[self::FIELD_SECURITY_LABEL_NUMBER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRUnsignedInt) { $this->addSecurityLabelNumber($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addSecurityLabelNumber(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addSecurityLabelNumber(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addSecurityLabelNumber(new FHIRUnsignedInt(array_merge($v, $ext[$i]))); + } } else { $this->addSecurityLabelNumber(new FHIRUnsignedInt($v)); } } } elseif ($data[self::FIELD_SECURITY_LABEL_NUMBER] instanceof FHIRUnsignedInt) { $this->addSecurityLabelNumber($data[self::FIELD_SECURITY_LABEL_NUMBER]); - } elseif ($ext && is_scalar($data[self::FIELD_SECURITY_LABEL_NUMBER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_SECURITY_LABEL_NUMBER])) { $this->addSecurityLabelNumber(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_SECURITY_LABEL_NUMBER]] + $ext)); } else { $this->addSecurityLabelNumber(new FHIRUnsignedInt($data[self::FIELD_SECURITY_LABEL_NUMBER])); @@ -427,6 +456,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SUBTYPE])) { if (is_array($data[self::FIELD_SUBTYPE])) { foreach($data[self::FIELD_SUBTYPE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addSubtype($v); } else { @@ -445,8 +477,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TEXT] instanceof FHIRString) { $this->setText($data[self::FIELD_TEXT]); - } elseif ($ext && is_scalar($data[self::FIELD_TEXT])) { - $this->setText(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TEXT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TEXT])) { + $this->setText(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TEXT]] + $ext)); + } else if (is_array($data[self::FIELD_TEXT])) { + $this->setText(new FHIRString(array_merge($ext, $data[self::FIELD_TEXT]))); + } } else { $this->setText(new FHIRString($data[self::FIELD_TEXT])); } @@ -454,6 +490,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_TYPE])) { if (is_array($data[self::FIELD_TYPE])) { foreach($data[self::FIELD_TYPE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addType($v); } else { @@ -469,6 +508,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_TYPE_REFERENCE])) { if (is_array($data[self::FIELD_TYPE_REFERENCE])) { foreach($data[self::FIELD_TYPE_REFERENCE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addTypeReference($v); } else { @@ -484,6 +526,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_USE_PERIOD])) { if (is_array($data[self::FIELD_USE_PERIOD])) { foreach($data[self::FIELD_USE_PERIOD] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRPeriod) { $this->addUsePeriod($v); } else { @@ -499,6 +544,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_VALUED_ITEM])) { if (is_array($data[self::FIELD_VALUED_ITEM])) { foreach($data[self::FIELD_VALUED_ITEM] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContractValuedItem) { $this->addValuedItem($v); } else { @@ -1472,7 +1520,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getAnswer())) { foreach($vs as $v) { if (null === $v) { @@ -1481,10 +1528,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_ANSWER, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getCondition())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CONDITION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getContext())) { foreach($vs as $v) { if (null === $v) { @@ -1493,6 +1540,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_CONTEXT, null, $v->_getFHIRXMLNamespace())); } } + if ([] !== ($vs = $this->getLinkId())) { foreach($vs as $v) { if (null === $v) { @@ -1523,7 +1571,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getRelationship())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RELATIONSHIP, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getScope())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SCOPE, null, $v->_getFHIRXMLNamespace())); } @@ -1544,10 +1591,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_SUBTYPE, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getText())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TEXT, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getType())) { foreach($vs as $v) { if (null === $v) { @@ -1583,6 +1630,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_VALUED_ITEM, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } @@ -1596,8 +1644,15 @@ public function jsonSerialize() $a[self::FIELD_ANSWER] = $vs; } if (null !== ($v = $this->getCondition())) { - $a[self::FIELD_CONDITION] = $v->getValue(); - $a[self::FIELD_CONDITION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CONDITION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CONDITION_EXT] = $enc; + } + } else { + $a[self::FIELD_CONDITION] = $v; + } } if ([] !== ($vs = $this->getContext())) { $a[self::FIELD_CONTEXT] = $vs; @@ -1608,8 +1663,17 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_LINK_ID][] = $v->getValue(); - $a[self::FIELD_LINK_ID_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_LINK_ID][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_LINK_ID_EXT][] = $enc; + } else { + $a[self::FIELD_LINK_ID_EXT][] = null; + } + } else { + $a[self::FIELD_LINK_ID][] = $v; + } } } if ([] !== ($vs = $this->getPeriod())) { @@ -1630,16 +1694,32 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_SECURITY_LABEL_NUMBER][] = $v->getValue(); - $a[self::FIELD_SECURITY_LABEL_NUMBER_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SECURITY_LABEL_NUMBER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SECURITY_LABEL_NUMBER_EXT][] = $enc; + } else { + $a[self::FIELD_SECURITY_LABEL_NUMBER_EXT][] = null; + } + } else { + $a[self::FIELD_SECURITY_LABEL_NUMBER][] = $v; + } } } if ([] !== ($vs = $this->getSubtype())) { $a[self::FIELD_SUBTYPE] = $vs; } if (null !== ($v = $this->getText())) { - $a[self::FIELD_TEXT] = $v->getValue(); - $a[self::FIELD_TEXT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TEXT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TEXT_EXT] = $enc; + } + } else { + $a[self::FIELD_TEXT] = $v; + } } if ([] !== ($vs = $this->getType())) { $a[self::FIELD_TYPE] = $vs; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractContentDefinition.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractContentDefinition.php index 903be0b613..c3885112d1 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractContentDefinition.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractContentDefinition.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -82,10 +82,6 @@ class FHIRContractContentDefinition extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONTRACT_DOT_CONTENT_DEFINITION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_COPYRIGHT = 'copyright'; const FIELD_COPYRIGHT_EXT = '_copyright'; const FIELD_PUBLICATION_DATE = 'publicationDate'; @@ -179,6 +175,9 @@ class FHIRContractContentDefinition extends FHIRBackboneElement */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRContractContentDefinition Constructor * @param null|array $data @@ -201,8 +200,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_COPYRIGHT] instanceof FHIRMarkdown) { $this->setCopyright($data[self::FIELD_COPYRIGHT]); - } elseif ($ext && is_scalar($data[self::FIELD_COPYRIGHT])) { - $this->setCopyright(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_COPYRIGHT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_COPYRIGHT])) { + $this->setCopyright(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_COPYRIGHT]] + $ext)); + } else if (is_array($data[self::FIELD_COPYRIGHT])) { + $this->setCopyright(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_COPYRIGHT]))); + } } else { $this->setCopyright(new FHIRMarkdown($data[self::FIELD_COPYRIGHT])); } @@ -213,8 +216,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PUBLICATION_DATE] instanceof FHIRDateTime) { $this->setPublicationDate($data[self::FIELD_PUBLICATION_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_PUBLICATION_DATE])) { - $this->setPublicationDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_PUBLICATION_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PUBLICATION_DATE])) { + $this->setPublicationDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_PUBLICATION_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_PUBLICATION_DATE])) { + $this->setPublicationDate(new FHIRDateTime(array_merge($ext, $data[self::FIELD_PUBLICATION_DATE]))); + } } else { $this->setPublicationDate(new FHIRDateTime($data[self::FIELD_PUBLICATION_DATE])); } @@ -225,8 +232,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PUBLICATION_STATUS] instanceof FHIRContractResourcePublicationStatusCodes) { $this->setPublicationStatus($data[self::FIELD_PUBLICATION_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_PUBLICATION_STATUS])) { - $this->setPublicationStatus(new FHIRContractResourcePublicationStatusCodes([FHIRContractResourcePublicationStatusCodes::FIELD_VALUE => $data[self::FIELD_PUBLICATION_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PUBLICATION_STATUS])) { + $this->setPublicationStatus(new FHIRContractResourcePublicationStatusCodes([FHIRContractResourcePublicationStatusCodes::FIELD_VALUE => $data[self::FIELD_PUBLICATION_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_PUBLICATION_STATUS])) { + $this->setPublicationStatus(new FHIRContractResourcePublicationStatusCodes(array_merge($ext, $data[self::FIELD_PUBLICATION_STATUS]))); + } } else { $this->setPublicationStatus(new FHIRContractResourcePublicationStatusCodes($data[self::FIELD_PUBLICATION_STATUS])); } @@ -613,19 +624,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getPublicationDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PUBLICATION_DATE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPublicationStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PUBLICATION_STATUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPublisher())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PUBLISHER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSubType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUB_TYPE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -639,15 +646,37 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getCopyright())) { - $a[self::FIELD_COPYRIGHT] = $v->getValue(); - $a[self::FIELD_COPYRIGHT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_COPYRIGHT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_COPYRIGHT_EXT] = $enc; + } + } else { + $a[self::FIELD_COPYRIGHT] = $v; + } } if (null !== ($v = $this->getPublicationDate())) { - $a[self::FIELD_PUBLICATION_DATE] = $v->getValue(); - $a[self::FIELD_PUBLICATION_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PUBLICATION_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PUBLICATION_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_PUBLICATION_DATE] = $v; + } } if (null !== ($v = $this->getPublicationStatus())) { - $a[self::FIELD_PUBLICATION_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PUBLICATION_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PUBLICATION_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_PUBLICATION_STATUS] = $v; + } } if (null !== ($v = $this->getPublisher())) { $a[self::FIELD_PUBLISHER] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractContext.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractContext.php index 7874807591..cfea7dfafe 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractContext.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractContext.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRContractContext extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONTRACT_DOT_CONTEXT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CODE = 'code'; const FIELD_REFERENCE = 'reference'; const FIELD_TEXT = 'text'; @@ -126,6 +122,9 @@ class FHIRContractContext extends FHIRBackboneElement */ protected $text = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRContractContext Constructor * @param null|array $data @@ -145,6 +144,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CODE])) { if (is_array($data[self::FIELD_CODE])) { foreach($data[self::FIELD_CODE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addCode($v); } else { @@ -170,8 +172,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TEXT] instanceof FHIRString) { $this->setText($data[self::FIELD_TEXT]); - } elseif ($ext && is_scalar($data[self::FIELD_TEXT])) { - $this->setText(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TEXT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TEXT])) { + $this->setText(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TEXT]] + $ext)); + } else if (is_array($data[self::FIELD_TEXT])) { + $this->setText(new FHIRString(array_merge($ext, $data[self::FIELD_TEXT]))); + } } else { $this->setText(new FHIRString($data[self::FIELD_TEXT])); } @@ -425,7 +431,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getCode())) { foreach($vs as $v) { if (null === $v) { @@ -457,8 +462,15 @@ public function jsonSerialize() $a[self::FIELD_REFERENCE] = $v; } if (null !== ($v = $this->getText())) { - $a[self::FIELD_TEXT] = $v->getValue(); - $a[self::FIELD_TEXT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TEXT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TEXT_EXT] = $enc; + } + } else { + $a[self::FIELD_TEXT] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractFriendly.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractFriendly.php index 226b19f877..2119f0a858 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractFriendly.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractFriendly.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRContractFriendly extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONTRACT_DOT_FRIENDLY; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CONTENT_ATTACHMENT = 'contentAttachment'; const FIELD_CONTENT_REFERENCE = 'contentReference'; @@ -112,6 +108,9 @@ class FHIRContractFriendly extends FHIRBackboneElement */ protected $contentReference = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRContractFriendly Constructor * @param null|array $data @@ -317,11 +316,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getContentAttachment())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CONTENT_ATTACHMENT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getContentReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CONTENT_REFERENCE, null, $v->_getFHIRXMLNamespace())); } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractLegal.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractLegal.php index 0efc7e1231..b6b284170b 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractLegal.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractLegal.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRContractLegal extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONTRACT_DOT_LEGAL; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CONTENT_ATTACHMENT = 'contentAttachment'; const FIELD_CONTENT_REFERENCE = 'contentReference'; @@ -110,6 +106,9 @@ class FHIRContractLegal extends FHIRBackboneElement */ protected $contentReference = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRContractLegal Constructor * @param null|array $data @@ -311,11 +310,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getContentAttachment())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CONTENT_ATTACHMENT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getContentReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CONTENT_REFERENCE, null, $v->_getFHIRXMLNamespace())); } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractOffer.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractOffer.php index c6bfc183aa..bd3fd6e25d 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractOffer.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractOffer.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -82,10 +82,6 @@ class FHIRContractOffer extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONTRACT_DOT_OFFER; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ANSWER = 'answer'; const FIELD_DECISION = 'decision'; const FIELD_DECISION_MODE = 'decisionMode'; @@ -218,6 +214,9 @@ class FHIRContractOffer extends FHIRBackboneElement */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRContractOffer Constructor * @param null|array $data @@ -237,6 +236,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ANSWER])) { if (is_array($data[self::FIELD_ANSWER])) { foreach($data[self::FIELD_ANSWER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContractAnswer) { $this->addAnswer($v); } else { @@ -259,6 +261,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_DECISION_MODE])) { if (is_array($data[self::FIELD_DECISION_MODE])) { foreach($data[self::FIELD_DECISION_MODE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addDecisionMode($v); } else { @@ -277,17 +282,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -299,17 +311,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_LINK_ID])) { foreach($data[self::FIELD_LINK_ID] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRString) { $this->addLinkId($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addLinkId(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addLinkId(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addLinkId(new FHIRString(array_merge($v, $ext[$i]))); + } } else { $this->addLinkId(new FHIRString($v)); } } } elseif ($data[self::FIELD_LINK_ID] instanceof FHIRString) { $this->addLinkId($data[self::FIELD_LINK_ID]); - } elseif ($ext && is_scalar($data[self::FIELD_LINK_ID])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_LINK_ID])) { $this->addLinkId(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_LINK_ID]] + $ext)); } else { $this->addLinkId(new FHIRString($data[self::FIELD_LINK_ID])); @@ -318,6 +337,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PARTY])) { if (is_array($data[self::FIELD_PARTY])) { foreach($data[self::FIELD_PARTY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContractParty) { $this->addParty($v); } else { @@ -336,17 +358,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_SECURITY_LABEL_NUMBER])) { foreach($data[self::FIELD_SECURITY_LABEL_NUMBER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRUnsignedInt) { $this->addSecurityLabelNumber($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addSecurityLabelNumber(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addSecurityLabelNumber(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addSecurityLabelNumber(new FHIRUnsignedInt(array_merge($v, $ext[$i]))); + } } else { $this->addSecurityLabelNumber(new FHIRUnsignedInt($v)); } } } elseif ($data[self::FIELD_SECURITY_LABEL_NUMBER] instanceof FHIRUnsignedInt) { $this->addSecurityLabelNumber($data[self::FIELD_SECURITY_LABEL_NUMBER]); - } elseif ($ext && is_scalar($data[self::FIELD_SECURITY_LABEL_NUMBER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_SECURITY_LABEL_NUMBER])) { $this->addSecurityLabelNumber(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_SECURITY_LABEL_NUMBER]] + $ext)); } else { $this->addSecurityLabelNumber(new FHIRUnsignedInt($data[self::FIELD_SECURITY_LABEL_NUMBER])); @@ -358,8 +387,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TEXT] instanceof FHIRString) { $this->setText($data[self::FIELD_TEXT]); - } elseif ($ext && is_scalar($data[self::FIELD_TEXT])) { - $this->setText(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TEXT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TEXT])) { + $this->setText(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TEXT]] + $ext)); + } else if (is_array($data[self::FIELD_TEXT])) { + $this->setText(new FHIRString(array_merge($ext, $data[self::FIELD_TEXT]))); + } } else { $this->setText(new FHIRString($data[self::FIELD_TEXT])); } @@ -1025,7 +1058,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getAnswer())) { foreach($vs as $v) { if (null === $v) { @@ -1038,7 +1070,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDecision())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DECISION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getDecisionMode())) { foreach($vs as $v) { if (null === $v) { @@ -1056,6 +1087,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } } + if ([] !== ($vs = $this->getLinkId())) { foreach($vs as $v) { if (null === $v) { @@ -1073,6 +1105,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_PARTY, null, $v->_getFHIRXMLNamespace())); } } + if ([] !== ($vs = $this->getSecurityLabelNumber())) { foreach($vs as $v) { if (null === $v) { @@ -1081,14 +1114,13 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_SECURITY_LABEL_NUMBER, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getText())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TEXT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getTopic())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TOPIC, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -1111,7 +1143,23 @@ public function jsonSerialize() $a[self::FIELD_DECISION_MODE] = $vs; } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if ([] !== ($vs = $this->getLinkId())) { $a[self::FIELD_LINK_ID] = []; @@ -1119,8 +1167,17 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_LINK_ID][] = $v->getValue(); - $a[self::FIELD_LINK_ID_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_LINK_ID][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_LINK_ID_EXT][] = $enc; + } else { + $a[self::FIELD_LINK_ID_EXT][] = null; + } + } else { + $a[self::FIELD_LINK_ID][] = $v; + } } } if ([] !== ($vs = $this->getParty())) { @@ -1132,13 +1189,29 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_SECURITY_LABEL_NUMBER][] = $v->getValue(); - $a[self::FIELD_SECURITY_LABEL_NUMBER_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SECURITY_LABEL_NUMBER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SECURITY_LABEL_NUMBER_EXT][] = $enc; + } else { + $a[self::FIELD_SECURITY_LABEL_NUMBER_EXT][] = null; + } + } else { + $a[self::FIELD_SECURITY_LABEL_NUMBER][] = $v; + } } } if (null !== ($v = $this->getText())) { - $a[self::FIELD_TEXT] = $v->getValue(); - $a[self::FIELD_TEXT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TEXT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TEXT_EXT] = $enc; + } + } else { + $a[self::FIELD_TEXT] = $v; + } } if (null !== ($v = $this->getTopic())) { $a[self::FIELD_TOPIC] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractParty.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractParty.php index 9c76386e7d..be62cd718e 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractParty.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractParty.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRContractParty extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONTRACT_DOT_PARTY; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_REFERENCE = 'reference'; const FIELD_ROLE = 'role'; @@ -109,6 +105,9 @@ class FHIRContractParty extends FHIRBackboneElement */ protected $role = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRContractParty Constructor * @param null|array $data @@ -128,6 +127,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REFERENCE])) { if (is_array($data[self::FIELD_REFERENCE])) { foreach($data[self::FIELD_REFERENCE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addReference($v); } else { @@ -344,7 +346,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getReference())) { foreach($vs as $v) { if (null === $v) { diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractRule.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractRule.php index 52645afe95..d2dd89cbf7 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractRule.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractRule.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRContractRule extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONTRACT_DOT_RULE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CONTENT_ATTACHMENT = 'contentAttachment'; const FIELD_CONTENT_REFERENCE = 'contentReference'; @@ -110,6 +106,9 @@ class FHIRContractRule extends FHIRBackboneElement */ protected $contentReference = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRContractRule Constructor * @param null|array $data @@ -311,11 +310,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getContentAttachment())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CONTENT_ATTACHMENT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getContentReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CONTENT_REFERENCE, null, $v->_getFHIRXMLNamespace())); } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractSecurityLabel.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractSecurityLabel.php index 1f42236b10..c7292b9f88 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractSecurityLabel.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractSecurityLabel.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRContractSecurityLabel extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONTRACT_DOT_SECURITY_LABEL; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CATEGORY = 'category'; const FIELD_CLASSIFICATION = 'classification'; const FIELD_CONTROL = 'control'; @@ -136,6 +132,9 @@ class FHIRContractSecurityLabel extends FHIRBackboneElement */ protected $number = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRContractSecurityLabel Constructor * @param null|array $data @@ -155,6 +154,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CATEGORY])) { if (is_array($data[self::FIELD_CATEGORY])) { foreach($data[self::FIELD_CATEGORY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCoding) { $this->addCategory($v); } else { @@ -177,6 +179,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CONTROL])) { if (is_array($data[self::FIELD_CONTROL])) { foreach($data[self::FIELD_CONTROL] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCoding) { $this->addControl($v); } else { @@ -195,17 +200,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_NUMBER])) { foreach($data[self::FIELD_NUMBER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRUnsignedInt) { $this->addNumber($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addNumber(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addNumber(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addNumber(new FHIRUnsignedInt(array_merge($v, $ext[$i]))); + } } else { $this->addNumber(new FHIRUnsignedInt($v)); } } } elseif ($data[self::FIELD_NUMBER] instanceof FHIRUnsignedInt) { $this->addNumber($data[self::FIELD_NUMBER]); - } elseif ($ext && is_scalar($data[self::FIELD_NUMBER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_NUMBER])) { $this->addNumber(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_NUMBER]] + $ext)); } else { $this->addNumber(new FHIRUnsignedInt($data[self::FIELD_NUMBER])); @@ -547,7 +559,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getCategory())) { foreach($vs as $v) { if (null === $v) { @@ -560,7 +571,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getClassification())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CLASSIFICATION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getControl())) { foreach($vs as $v) { if (null === $v) { @@ -569,6 +579,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_CONTROL, null, $v->_getFHIRXMLNamespace())); } } + if ([] !== ($vs = $this->getNumber())) { foreach($vs as $v) { if (null === $v) { @@ -577,6 +588,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_NUMBER, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } @@ -601,8 +613,17 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_NUMBER][] = $v->getValue(); - $a[self::FIELD_NUMBER_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NUMBER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NUMBER_EXT][] = $enc; + } else { + $a[self::FIELD_NUMBER_EXT][] = null; + } + } else { + $a[self::FIELD_NUMBER][] = $v; + } } } return $a; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractSigner.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractSigner.php index 91f10db212..95a2ba6e33 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractSigner.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractSigner.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRContractSigner extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONTRACT_DOT_SIGNER; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_PARTY = 'party'; const FIELD_SIGNATURE = 'signature'; const FIELD_TYPE = 'type'; @@ -125,6 +121,9 @@ class FHIRContractSigner extends FHIRBackboneElement */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRContractSigner Constructor * @param null|array $data @@ -151,6 +150,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SIGNATURE])) { if (is_array($data[self::FIELD_SIGNATURE])) { foreach($data[self::FIELD_SIGNATURE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRSignature) { $this->addSignature($v); } else { @@ -410,11 +412,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getParty())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PARTY, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getSignature())) { foreach($vs as $v) { if (null === $v) { diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractSubject.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractSubject.php index e03d5a91a1..e5637defd5 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractSubject.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractSubject.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRContractSubject extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONTRACT_DOT_SUBJECT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_REFERENCE = 'reference'; const FIELD_ROLE = 'role'; @@ -109,6 +105,9 @@ class FHIRContractSubject extends FHIRBackboneElement */ protected $role = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRContractSubject Constructor * @param null|array $data @@ -128,6 +127,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REFERENCE])) { if (is_array($data[self::FIELD_REFERENCE])) { foreach($data[self::FIELD_REFERENCE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addReference($v); } else { @@ -344,7 +346,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getReference())) { foreach($vs as $v) { if (null === $v) { diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractTerm.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractTerm.php index 36b651cece..5a8a5a3f3e 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractTerm.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractTerm.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -83,10 +83,6 @@ class FHIRContractTerm extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONTRACT_DOT_TERM; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ACTION = 'action'; const FIELD_APPLIES = 'applies'; const FIELD_ASSET = 'asset'; @@ -254,6 +250,9 @@ class FHIRContractTerm extends FHIRBackboneElement */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRContractTerm Constructor * @param null|array $data @@ -273,6 +272,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ACTION])) { if (is_array($data[self::FIELD_ACTION])) { foreach($data[self::FIELD_ACTION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContractAction) { $this->addAction($v); } else { @@ -295,6 +297,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ASSET])) { if (is_array($data[self::FIELD_ASSET])) { foreach($data[self::FIELD_ASSET] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContractAsset) { $this->addAsset($v); } else { @@ -310,6 +315,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_GROUP])) { if (is_array($data[self::FIELD_GROUP])) { foreach($data[self::FIELD_GROUP] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContractTerm) { $this->addGroup($v); } else { @@ -328,8 +336,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->setIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { - $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_IDENTIFIER]))); + } } else { $this->setIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); } @@ -340,8 +352,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ISSUED] instanceof FHIRDateTime) { $this->setIssued($data[self::FIELD_ISSUED]); - } elseif ($ext && is_scalar($data[self::FIELD_ISSUED])) { - $this->setIssued(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_ISSUED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ISSUED])) { + $this->setIssued(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_ISSUED]] + $ext)); + } else if (is_array($data[self::FIELD_ISSUED])) { + $this->setIssued(new FHIRDateTime(array_merge($ext, $data[self::FIELD_ISSUED]))); + } } else { $this->setIssued(new FHIRDateTime($data[self::FIELD_ISSUED])); } @@ -356,6 +372,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SECURITY_LABEL])) { if (is_array($data[self::FIELD_SECURITY_LABEL])) { foreach($data[self::FIELD_SECURITY_LABEL] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContractSecurityLabel) { $this->addSecurityLabel($v); } else { @@ -381,8 +400,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TEXT] instanceof FHIRString) { $this->setText($data[self::FIELD_TEXT]); - } elseif ($ext && is_scalar($data[self::FIELD_TEXT])) { - $this->setText(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TEXT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TEXT])) { + $this->setText(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TEXT]] + $ext)); + } else if (is_array($data[self::FIELD_TEXT])) { + $this->setText(new FHIRString(array_merge($ext, $data[self::FIELD_TEXT]))); + } } else { $this->setText(new FHIRString($data[self::FIELD_TEXT])); } @@ -1084,7 +1107,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getAction())) { foreach($vs as $v) { if (null === $v) { @@ -1097,7 +1119,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getApplies())) { $v->xmlSerialize($sxe->addChild(self::FIELD_APPLIES, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getAsset())) { foreach($vs as $v) { if (null === $v) { @@ -1122,11 +1143,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getIssued())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ISSUED, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOffer())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OFFER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getSecurityLabel())) { foreach($vs as $v) { if (null === $v) { @@ -1142,15 +1161,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getText())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TEXT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getTopicCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TOPIC_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getTopicReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TOPIC_REFERENCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -1176,11 +1192,26 @@ public function jsonSerialize() $a[self::FIELD_GROUP] = $vs; } if (null !== ($v = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_IDENTIFIER] = $v; + } } if (null !== ($v = $this->getIssued())) { - $a[self::FIELD_ISSUED] = $v->getValue(); - $a[self::FIELD_ISSUED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ISSUED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ISSUED_EXT] = $enc; + } + } else { + $a[self::FIELD_ISSUED] = $v; + } } if (null !== ($v = $this->getOffer())) { $a[self::FIELD_OFFER] = $v; @@ -1192,8 +1223,15 @@ public function jsonSerialize() $a[self::FIELD_SUB_TYPE] = $v; } if (null !== ($v = $this->getText())) { - $a[self::FIELD_TEXT] = $v->getValue(); - $a[self::FIELD_TEXT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TEXT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TEXT_EXT] = $enc; + } + } else { + $a[self::FIELD_TEXT] = $v; + } } if (null !== ($v = $this->getTopicCodeableConcept())) { $a[self::FIELD_TOPIC_CODEABLE_CONCEPT] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractValuedItem.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractValuedItem.php index f97a164c51..58185aa926 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractValuedItem.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractValuedItem.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -86,10 +86,6 @@ class FHIRContractValuedItem extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONTRACT_DOT_VALUED_ITEM; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_EFFECTIVE_TIME = 'effectiveTime'; const FIELD_EFFECTIVE_TIME_EXT = '_effectiveTime'; const FIELD_ENTITY_CODEABLE_CONCEPT = 'entityCodeableConcept'; @@ -308,6 +304,9 @@ class FHIRContractValuedItem extends FHIRBackboneElement */ protected $unitPrice = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRContractValuedItem Constructor * @param null|array $data @@ -330,8 +329,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EFFECTIVE_TIME] instanceof FHIRDateTime) { $this->setEffectiveTime($data[self::FIELD_EFFECTIVE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_EFFECTIVE_TIME])) { - $this->setEffectiveTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_EFFECTIVE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EFFECTIVE_TIME])) { + $this->setEffectiveTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_EFFECTIVE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_EFFECTIVE_TIME])) { + $this->setEffectiveTime(new FHIRDateTime(array_merge($ext, $data[self::FIELD_EFFECTIVE_TIME]))); + } } else { $this->setEffectiveTime(new FHIRDateTime($data[self::FIELD_EFFECTIVE_TIME])); } @@ -356,8 +359,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_FACTOR] instanceof FHIRDecimal) { $this->setFactor($data[self::FIELD_FACTOR]); - } elseif ($ext && is_scalar($data[self::FIELD_FACTOR])) { - $this->setFactor(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_FACTOR]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_FACTOR])) { + $this->setFactor(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_FACTOR]] + $ext)); + } else if (is_array($data[self::FIELD_FACTOR])) { + $this->setFactor(new FHIRDecimal(array_merge($ext, $data[self::FIELD_FACTOR]))); + } } else { $this->setFactor(new FHIRDecimal($data[self::FIELD_FACTOR])); } @@ -368,8 +375,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->setIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { - $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_IDENTIFIER]))); + } } else { $this->setIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); } @@ -380,17 +391,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_LINK_ID])) { foreach($data[self::FIELD_LINK_ID] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRString) { $this->addLinkId($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addLinkId(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addLinkId(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addLinkId(new FHIRString(array_merge($v, $ext[$i]))); + } } else { $this->addLinkId(new FHIRString($v)); } } } elseif ($data[self::FIELD_LINK_ID] instanceof FHIRString) { $this->addLinkId($data[self::FIELD_LINK_ID]); - } elseif ($ext && is_scalar($data[self::FIELD_LINK_ID])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_LINK_ID])) { $this->addLinkId(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_LINK_ID]] + $ext)); } else { $this->addLinkId(new FHIRString($data[self::FIELD_LINK_ID])); @@ -402,8 +420,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NET] instanceof FHIRMoney) { $this->setNet($data[self::FIELD_NET]); - } elseif ($ext && is_scalar($data[self::FIELD_NET])) { - $this->setNet(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_NET]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NET])) { + $this->setNet(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_NET]] + $ext)); + } else if (is_array($data[self::FIELD_NET])) { + $this->setNet(new FHIRMoney(array_merge($ext, $data[self::FIELD_NET]))); + } } else { $this->setNet(new FHIRMoney($data[self::FIELD_NET])); } @@ -414,8 +436,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PAYMENT] instanceof FHIRString) { $this->setPayment($data[self::FIELD_PAYMENT]); - } elseif ($ext && is_scalar($data[self::FIELD_PAYMENT])) { - $this->setPayment(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PAYMENT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PAYMENT])) { + $this->setPayment(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PAYMENT]] + $ext)); + } else if (is_array($data[self::FIELD_PAYMENT])) { + $this->setPayment(new FHIRString(array_merge($ext, $data[self::FIELD_PAYMENT]))); + } } else { $this->setPayment(new FHIRString($data[self::FIELD_PAYMENT])); } @@ -426,8 +452,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PAYMENT_DATE] instanceof FHIRDateTime) { $this->setPaymentDate($data[self::FIELD_PAYMENT_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_PAYMENT_DATE])) { - $this->setPaymentDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_PAYMENT_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PAYMENT_DATE])) { + $this->setPaymentDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_PAYMENT_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_PAYMENT_DATE])) { + $this->setPaymentDate(new FHIRDateTime(array_merge($ext, $data[self::FIELD_PAYMENT_DATE]))); + } } else { $this->setPaymentDate(new FHIRDateTime($data[self::FIELD_PAYMENT_DATE])); } @@ -438,8 +468,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_POINTS] instanceof FHIRDecimal) { $this->setPoints($data[self::FIELD_POINTS]); - } elseif ($ext && is_scalar($data[self::FIELD_POINTS])) { - $this->setPoints(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_POINTS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_POINTS])) { + $this->setPoints(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_POINTS]] + $ext)); + } else if (is_array($data[self::FIELD_POINTS])) { + $this->setPoints(new FHIRDecimal(array_merge($ext, $data[self::FIELD_POINTS]))); + } } else { $this->setPoints(new FHIRDecimal($data[self::FIELD_POINTS])); } @@ -450,8 +484,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_QUANTITY] instanceof FHIRQuantity) { $this->setQuantity($data[self::FIELD_QUANTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_QUANTITY])) { - $this->setQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_QUANTITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_QUANTITY])) { + $this->setQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_QUANTITY])) { + $this->setQuantity(new FHIRQuantity(array_merge($ext, $data[self::FIELD_QUANTITY]))); + } } else { $this->setQuantity(new FHIRQuantity($data[self::FIELD_QUANTITY])); } @@ -476,17 +514,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_SECURITY_LABEL_NUMBER])) { foreach($data[self::FIELD_SECURITY_LABEL_NUMBER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRUnsignedInt) { $this->addSecurityLabelNumber($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addSecurityLabelNumber(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addSecurityLabelNumber(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addSecurityLabelNumber(new FHIRUnsignedInt(array_merge($v, $ext[$i]))); + } } else { $this->addSecurityLabelNumber(new FHIRUnsignedInt($v)); } } } elseif ($data[self::FIELD_SECURITY_LABEL_NUMBER] instanceof FHIRUnsignedInt) { $this->addSecurityLabelNumber($data[self::FIELD_SECURITY_LABEL_NUMBER]); - } elseif ($ext && is_scalar($data[self::FIELD_SECURITY_LABEL_NUMBER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_SECURITY_LABEL_NUMBER])) { $this->addSecurityLabelNumber(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_SECURITY_LABEL_NUMBER]] + $ext)); } else { $this->addSecurityLabelNumber(new FHIRUnsignedInt($data[self::FIELD_SECURITY_LABEL_NUMBER])); @@ -498,8 +543,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_UNIT_PRICE] instanceof FHIRMoney) { $this->setUnitPrice($data[self::FIELD_UNIT_PRICE]); - } elseif ($ext && is_scalar($data[self::FIELD_UNIT_PRICE])) { - $this->setUnitPrice(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_UNIT_PRICE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_UNIT_PRICE])) { + $this->setUnitPrice(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_UNIT_PRICE]] + $ext)); + } else if (is_array($data[self::FIELD_UNIT_PRICE])) { + $this->setUnitPrice(new FHIRMoney(array_merge($ext, $data[self::FIELD_UNIT_PRICE]))); + } } else { $this->setUnitPrice(new FHIRMoney($data[self::FIELD_UNIT_PRICE])); } @@ -1290,18 +1339,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getEffectiveTime())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EFFECTIVE_TIME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getEntityCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ENTITY_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getEntityReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ENTITY_REFERENCE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getFactor())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FACTOR, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } @@ -1326,15 +1372,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getPoints())) { $v->xmlSerialize($sxe->addChild(self::FIELD_POINTS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_QUANTITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRecipient())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RECIPIENT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getResponsible())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RESPONSIBLE, null, $v->_getFHIRXMLNamespace())); } @@ -1360,8 +1403,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getEffectiveTime())) { - $a[self::FIELD_EFFECTIVE_TIME] = $v->getValue(); - $a[self::FIELD_EFFECTIVE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EFFECTIVE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EFFECTIVE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_EFFECTIVE_TIME] = $v; + } } if (null !== ($v = $this->getEntityCodeableConcept())) { $a[self::FIELD_ENTITY_CODEABLE_CONCEPT] = $v; @@ -1370,11 +1420,26 @@ public function jsonSerialize() $a[self::FIELD_ENTITY_REFERENCE] = $v; } if (null !== ($v = $this->getFactor())) { - $a[self::FIELD_FACTOR] = $v->getValue(); - $a[self::FIELD_FACTOR_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FACTOR] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FACTOR_EXT] = $enc; + } + } else { + $a[self::FIELD_FACTOR] = $v; + } } if (null !== ($v = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_IDENTIFIER] = $v; + } } if ([] !== ($vs = $this->getLinkId())) { $a[self::FIELD_LINK_ID] = []; @@ -1382,27 +1447,73 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_LINK_ID][] = $v->getValue(); - $a[self::FIELD_LINK_ID_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_LINK_ID][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_LINK_ID_EXT][] = $enc; + } else { + $a[self::FIELD_LINK_ID_EXT][] = null; + } + } else { + $a[self::FIELD_LINK_ID][] = $v; + } } } if (null !== ($v = $this->getNet())) { - $a[self::FIELD_NET] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NET] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NET_EXT] = $enc; + } + } else { + $a[self::FIELD_NET] = $v; + } } if (null !== ($v = $this->getPayment())) { - $a[self::FIELD_PAYMENT] = $v->getValue(); - $a[self::FIELD_PAYMENT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PAYMENT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PAYMENT_EXT] = $enc; + } + } else { + $a[self::FIELD_PAYMENT] = $v; + } } if (null !== ($v = $this->getPaymentDate())) { - $a[self::FIELD_PAYMENT_DATE] = $v->getValue(); - $a[self::FIELD_PAYMENT_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PAYMENT_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PAYMENT_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_PAYMENT_DATE] = $v; + } } if (null !== ($v = $this->getPoints())) { - $a[self::FIELD_POINTS] = $v->getValue(); - $a[self::FIELD_POINTS_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_POINTS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_POINTS_EXT] = $enc; + } + } else { + $a[self::FIELD_POINTS] = $v; + } } if (null !== ($v = $this->getQuantity())) { - $a[self::FIELD_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_QUANTITY] = $v; + } } if (null !== ($v = $this->getRecipient())) { $a[self::FIELD_RECIPIENT] = $v; @@ -1416,12 +1527,29 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_SECURITY_LABEL_NUMBER][] = $v->getValue(); - $a[self::FIELD_SECURITY_LABEL_NUMBER_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SECURITY_LABEL_NUMBER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SECURITY_LABEL_NUMBER_EXT][] = $enc; + } else { + $a[self::FIELD_SECURITY_LABEL_NUMBER_EXT][] = null; + } + } else { + $a[self::FIELD_SECURITY_LABEL_NUMBER][] = $v; + } } } if (null !== ($v = $this->getUnitPrice())) { - $a[self::FIELD_UNIT_PRICE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_UNIT_PRICE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_UNIT_PRICE_EXT] = $enc; + } + } else { + $a[self::FIELD_UNIT_PRICE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRCoverage/FHIRCoverageClass.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRCoverage/FHIRCoverageClass.php index 4ad9723b48..16019b6ec7 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRCoverage/FHIRCoverageClass.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRCoverage/FHIRCoverageClass.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRCoverageClass extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_COVERAGE_DOT_CLASS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_NAME = 'name'; const FIELD_NAME_EXT = '_name'; const FIELD_TYPE = 'type'; @@ -125,6 +121,9 @@ class FHIRCoverageClass extends FHIRBackboneElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRCoverageClass Constructor * @param null|array $data @@ -151,8 +150,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -170,8 +173,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE] instanceof FHIRString) { $this->setValue($data[self::FIELD_VALUE]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE])) { - $this->setValue(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VALUE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE])) { + $this->setValue(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VALUE]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE])) { + $this->setValue(new FHIRString(array_merge($ext, $data[self::FIELD_VALUE]))); + } } else { $this->setValue(new FHIRString($data[self::FIELD_VALUE])); } @@ -407,11 +414,11 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NAME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getValue())) { + $sxe->addAttribute(self::FIELD_VALUE, (string)$v); $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE, null, $v->_getFHIRXMLNamespace())); } return $sxe; @@ -424,15 +431,29 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if (null !== ($v = $this->getType())) { $a[self::FIELD_TYPE] = $v; } if (null !== ($v = $this->getValue())) { - $a[self::FIELD_VALUE] = $v->getValue(); - $a[self::FIELD_VALUE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRCoverage/FHIRCoverageCostToBeneficiary.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRCoverage/FHIRCoverageCostToBeneficiary.php index f2d2f87309..03e04e2a71 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRCoverage/FHIRCoverageCostToBeneficiary.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRCoverage/FHIRCoverageCostToBeneficiary.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRCoverageCostToBeneficiary extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_COVERAGE_DOT_COST_TO_BENEFICIARY; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_EXCEPTION = 'exception'; const FIELD_TYPE = 'type'; const FIELD_VALUE_MONEY = 'valueMoney'; @@ -140,6 +136,9 @@ class FHIRCoverageCostToBeneficiary extends FHIRBackboneElement */ protected $valueQuantity = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRCoverageCostToBeneficiary Constructor * @param null|array $data @@ -159,6 +158,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_EXCEPTION])) { if (is_array($data[self::FIELD_EXCEPTION])) { foreach($data[self::FIELD_EXCEPTION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCoverageException) { $this->addException($v); } else { @@ -184,8 +186,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_MONEY] instanceof FHIRMoney) { $this->setValueMoney($data[self::FIELD_VALUE_MONEY]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_MONEY])) { - $this->setValueMoney(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_VALUE_MONEY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_MONEY])) { + $this->setValueMoney(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_VALUE_MONEY]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_MONEY])) { + $this->setValueMoney(new FHIRMoney(array_merge($ext, $data[self::FIELD_VALUE_MONEY]))); + } } else { $this->setValueMoney(new FHIRMoney($data[self::FIELD_VALUE_MONEY])); } @@ -196,8 +202,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_QUANTITY] instanceof FHIRQuantity) { $this->setValueQuantity($data[self::FIELD_VALUE_QUANTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_QUANTITY])) { - $this->setValueQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_VALUE_QUANTITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_QUANTITY])) { + $this->setValueQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_VALUE_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_QUANTITY])) { + $this->setValueQuantity(new FHIRQuantity(array_merge($ext, $data[self::FIELD_VALUE_QUANTITY]))); + } } else { $this->setValueQuantity(new FHIRQuantity($data[self::FIELD_VALUE_QUANTITY])); } @@ -473,7 +483,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getException())) { foreach($vs as $v) { if (null === $v) { @@ -486,11 +495,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueMoney())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_MONEY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_QUANTITY, null, $v->_getFHIRXMLNamespace())); } @@ -510,10 +517,26 @@ public function jsonSerialize() $a[self::FIELD_TYPE] = $v; } if (null !== ($v = $this->getValueMoney())) { - $a[self::FIELD_VALUE_MONEY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_MONEY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_MONEY_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_MONEY] = $v; + } } if (null !== ($v = $this->getValueQuantity())) { - $a[self::FIELD_VALUE_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_QUANTITY] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRCoverage/FHIRCoverageException.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRCoverage/FHIRCoverageException.php index 412d9c8a14..9c021f7ecb 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRCoverage/FHIRCoverageException.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRCoverage/FHIRCoverageException.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRCoverageException extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_COVERAGE_DOT_EXCEPTION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_PERIOD = 'period'; const FIELD_TYPE = 'type'; @@ -109,6 +105,9 @@ class FHIRCoverageException extends FHIRBackboneElement */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRCoverageException Constructor * @param null|array $data @@ -308,11 +307,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRCoverageEligibilityRequest/FHIRCoverageEligibilityRequestDiagnosis.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRCoverageEligibilityRequest/FHIRCoverageEligibilityRequestDiagnosis.php index d60adad3a4..eac9c31288 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRCoverageEligibilityRequest/FHIRCoverageEligibilityRequestDiagnosis.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRCoverageEligibilityRequest/FHIRCoverageEligibilityRequestDiagnosis.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -82,10 +82,6 @@ class FHIRCoverageEligibilityRequestDiagnosis extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_COVERAGE_ELIGIBILITY_REQUEST_DOT_DIAGNOSIS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DIAGNOSIS_CODEABLE_CONCEPT = 'diagnosisCodeableConcept'; const FIELD_DIAGNOSIS_REFERENCE = 'diagnosisReference'; @@ -114,6 +110,9 @@ class FHIRCoverageEligibilityRequestDiagnosis extends FHIRBackboneElement */ protected $diagnosisReference = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRCoverageEligibilityRequestDiagnosis Constructor * @param null|array $data @@ -317,11 +316,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getDiagnosisCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DIAGNOSIS_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDiagnosisReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DIAGNOSIS_REFERENCE, null, $v->_getFHIRXMLNamespace())); } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRCoverageEligibilityRequest/FHIRCoverageEligibilityRequestInsurance.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRCoverageEligibilityRequest/FHIRCoverageEligibilityRequestInsurance.php index 7451364792..3c7becc00f 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRCoverageEligibilityRequest/FHIRCoverageEligibilityRequestInsurance.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRCoverageEligibilityRequest/FHIRCoverageEligibilityRequestInsurance.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -83,10 +83,6 @@ class FHIRCoverageEligibilityRequestInsurance extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_COVERAGE_ELIGIBILITY_REQUEST_DOT_INSURANCE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_BUSINESS_ARRANGEMENT = 'businessArrangement'; const FIELD_BUSINESS_ARRANGEMENT_EXT = '_businessArrangement'; const FIELD_COVERAGE = 'coverage'; @@ -129,6 +125,9 @@ class FHIRCoverageEligibilityRequestInsurance extends FHIRBackboneElement */ protected $focal = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRCoverageEligibilityRequestInsurance Constructor * @param null|array $data @@ -151,8 +150,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_BUSINESS_ARRANGEMENT] instanceof FHIRString) { $this->setBusinessArrangement($data[self::FIELD_BUSINESS_ARRANGEMENT]); - } elseif ($ext && is_scalar($data[self::FIELD_BUSINESS_ARRANGEMENT])) { - $this->setBusinessArrangement(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_BUSINESS_ARRANGEMENT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_BUSINESS_ARRANGEMENT])) { + $this->setBusinessArrangement(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_BUSINESS_ARRANGEMENT]] + $ext)); + } else if (is_array($data[self::FIELD_BUSINESS_ARRANGEMENT])) { + $this->setBusinessArrangement(new FHIRString(array_merge($ext, $data[self::FIELD_BUSINESS_ARRANGEMENT]))); + } } else { $this->setBusinessArrangement(new FHIRString($data[self::FIELD_BUSINESS_ARRANGEMENT])); } @@ -170,8 +173,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_FOCAL] instanceof FHIRBoolean) { $this->setFocal($data[self::FIELD_FOCAL]); - } elseif ($ext && is_scalar($data[self::FIELD_FOCAL])) { - $this->setFocal(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_FOCAL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_FOCAL])) { + $this->setFocal(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_FOCAL]] + $ext)); + } else if (is_array($data[self::FIELD_FOCAL])) { + $this->setFocal(new FHIRBoolean(array_merge($ext, $data[self::FIELD_FOCAL]))); + } } else { $this->setFocal(new FHIRBoolean($data[self::FIELD_FOCAL])); } @@ -407,7 +414,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getBusinessArrangement())) { $v->xmlSerialize($sxe->addChild(self::FIELD_BUSINESS_ARRANGEMENT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getCoverage())) { $v->xmlSerialize($sxe->addChild(self::FIELD_COVERAGE, null, $v->_getFHIRXMLNamespace())); } @@ -424,15 +430,29 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getBusinessArrangement())) { - $a[self::FIELD_BUSINESS_ARRANGEMENT] = $v->getValue(); - $a[self::FIELD_BUSINESS_ARRANGEMENT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_BUSINESS_ARRANGEMENT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_BUSINESS_ARRANGEMENT_EXT] = $enc; + } + } else { + $a[self::FIELD_BUSINESS_ARRANGEMENT] = $v; + } } if (null !== ($v = $this->getCoverage())) { $a[self::FIELD_COVERAGE] = $v; } if (null !== ($v = $this->getFocal())) { - $a[self::FIELD_FOCAL] = $v->getValue(); - $a[self::FIELD_FOCAL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FOCAL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FOCAL_EXT] = $enc; + } + } else { + $a[self::FIELD_FOCAL] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRCoverageEligibilityRequest/FHIRCoverageEligibilityRequestItem.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRCoverageEligibilityRequest/FHIRCoverageEligibilityRequestItem.php index e4c0468b56..50ea26fb57 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRCoverageEligibilityRequest/FHIRCoverageEligibilityRequestItem.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRCoverageEligibilityRequest/FHIRCoverageEligibilityRequestItem.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -85,10 +85,6 @@ class FHIRCoverageEligibilityRequestItem extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_COVERAGE_ELIGIBILITY_REQUEST_DOT_ITEM; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CATEGORY = 'category'; const FIELD_DETAIL = 'detail'; const FIELD_DIAGNOSIS = 'diagnosis'; @@ -224,6 +220,9 @@ class FHIRCoverageEligibilityRequestItem extends FHIRBackboneElement */ protected $unitPrice = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRCoverageEligibilityRequestItem Constructor * @param null|array $data @@ -250,6 +249,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_DETAIL])) { if (is_array($data[self::FIELD_DETAIL])) { foreach($data[self::FIELD_DETAIL] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addDetail($v); } else { @@ -265,6 +267,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_DIAGNOSIS])) { if (is_array($data[self::FIELD_DIAGNOSIS])) { foreach($data[self::FIELD_DIAGNOSIS] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCoverageEligibilityRequestDiagnosis) { $this->addDiagnosis($v); } else { @@ -287,6 +292,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_MODIFIER])) { if (is_array($data[self::FIELD_MODIFIER])) { foreach($data[self::FIELD_MODIFIER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addModifier($v); } else { @@ -319,8 +327,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_QUANTITY] instanceof FHIRQuantity) { $this->setQuantity($data[self::FIELD_QUANTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_QUANTITY])) { - $this->setQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_QUANTITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_QUANTITY])) { + $this->setQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_QUANTITY])) { + $this->setQuantity(new FHIRQuantity(array_merge($ext, $data[self::FIELD_QUANTITY]))); + } } else { $this->setQuantity(new FHIRQuantity($data[self::FIELD_QUANTITY])); } @@ -331,17 +343,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_SUPPORTING_INFO_SEQUENCE])) { foreach($data[self::FIELD_SUPPORTING_INFO_SEQUENCE] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRPositiveInt) { $this->addSupportingInfoSequence($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addSupportingInfoSequence(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addSupportingInfoSequence(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addSupportingInfoSequence(new FHIRPositiveInt(array_merge($v, $ext[$i]))); + } } else { $this->addSupportingInfoSequence(new FHIRPositiveInt($v)); } } } elseif ($data[self::FIELD_SUPPORTING_INFO_SEQUENCE] instanceof FHIRPositiveInt) { $this->addSupportingInfoSequence($data[self::FIELD_SUPPORTING_INFO_SEQUENCE]); - } elseif ($ext && is_scalar($data[self::FIELD_SUPPORTING_INFO_SEQUENCE])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_SUPPORTING_INFO_SEQUENCE])) { $this->addSupportingInfoSequence(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_SUPPORTING_INFO_SEQUENCE]] + $ext)); } else { $this->addSupportingInfoSequence(new FHIRPositiveInt($data[self::FIELD_SUPPORTING_INFO_SEQUENCE])); @@ -353,8 +372,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_UNIT_PRICE] instanceof FHIRMoney) { $this->setUnitPrice($data[self::FIELD_UNIT_PRICE]); - } elseif ($ext && is_scalar($data[self::FIELD_UNIT_PRICE])) { - $this->setUnitPrice(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_UNIT_PRICE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_UNIT_PRICE])) { + $this->setUnitPrice(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_UNIT_PRICE]] + $ext)); + } else if (is_array($data[self::FIELD_UNIT_PRICE])) { + $this->setUnitPrice(new FHIRMoney(array_merge($ext, $data[self::FIELD_UNIT_PRICE]))); + } } else { $this->setUnitPrice(new FHIRMoney($data[self::FIELD_UNIT_PRICE])); } @@ -940,11 +963,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getCategory())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CATEGORY, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getDetail())) { foreach($vs as $v) { if (null === $v) { @@ -966,7 +987,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getFacility())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FACILITY, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getModifier())) { foreach($vs as $v) { if (null === $v) { @@ -979,11 +999,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getProductOrService())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PRODUCT_OR_SERVICE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getProvider())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PROVIDER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_QUANTITY, null, $v->_getFHIRXMLNamespace())); } @@ -1030,7 +1048,15 @@ public function jsonSerialize() $a[self::FIELD_PROVIDER] = $v; } if (null !== ($v = $this->getQuantity())) { - $a[self::FIELD_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_QUANTITY] = $v; + } } if ([] !== ($vs = $this->getSupportingInfoSequence())) { $a[self::FIELD_SUPPORTING_INFO_SEQUENCE] = []; @@ -1038,12 +1064,29 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_SUPPORTING_INFO_SEQUENCE][] = $v->getValue(); - $a[self::FIELD_SUPPORTING_INFO_SEQUENCE_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SUPPORTING_INFO_SEQUENCE][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SUPPORTING_INFO_SEQUENCE_EXT][] = $enc; + } else { + $a[self::FIELD_SUPPORTING_INFO_SEQUENCE_EXT][] = null; + } + } else { + $a[self::FIELD_SUPPORTING_INFO_SEQUENCE][] = $v; + } } } if (null !== ($v = $this->getUnitPrice())) { - $a[self::FIELD_UNIT_PRICE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_UNIT_PRICE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_UNIT_PRICE_EXT] = $enc; + } + } else { + $a[self::FIELD_UNIT_PRICE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRCoverageEligibilityRequest/FHIRCoverageEligibilityRequestSupportingInfo.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRCoverageEligibilityRequest/FHIRCoverageEligibilityRequestSupportingInfo.php index c1a0157703..e38065ba22 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRCoverageEligibilityRequest/FHIRCoverageEligibilityRequestSupportingInfo.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRCoverageEligibilityRequest/FHIRCoverageEligibilityRequestSupportingInfo.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -83,10 +83,6 @@ class FHIRCoverageEligibilityRequestSupportingInfo extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_COVERAGE_ELIGIBILITY_REQUEST_DOT_SUPPORTING_INFO; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_APPLIES_TO_ALL = 'appliesToAll'; const FIELD_APPLIES_TO_ALL_EXT = '_appliesToAll'; const FIELD_INFORMATION = 'information'; @@ -127,6 +123,9 @@ class FHIRCoverageEligibilityRequestSupportingInfo extends FHIRBackboneElement */ protected $sequence = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRCoverageEligibilityRequestSupportingInfo Constructor * @param null|array $data @@ -149,8 +148,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_APPLIES_TO_ALL] instanceof FHIRBoolean) { $this->setAppliesToAll($data[self::FIELD_APPLIES_TO_ALL]); - } elseif ($ext && is_scalar($data[self::FIELD_APPLIES_TO_ALL])) { - $this->setAppliesToAll(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_APPLIES_TO_ALL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_APPLIES_TO_ALL])) { + $this->setAppliesToAll(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_APPLIES_TO_ALL]] + $ext)); + } else if (is_array($data[self::FIELD_APPLIES_TO_ALL])) { + $this->setAppliesToAll(new FHIRBoolean(array_merge($ext, $data[self::FIELD_APPLIES_TO_ALL]))); + } } else { $this->setAppliesToAll(new FHIRBoolean($data[self::FIELD_APPLIES_TO_ALL])); } @@ -168,8 +171,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SEQUENCE] instanceof FHIRPositiveInt) { $this->setSequence($data[self::FIELD_SEQUENCE]); - } elseif ($ext && is_scalar($data[self::FIELD_SEQUENCE])) { - $this->setSequence(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_SEQUENCE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SEQUENCE])) { + $this->setSequence(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_SEQUENCE]] + $ext)); + } else if (is_array($data[self::FIELD_SEQUENCE])) { + $this->setSequence(new FHIRPositiveInt(array_merge($ext, $data[self::FIELD_SEQUENCE]))); + } } else { $this->setSequence(new FHIRPositiveInt($data[self::FIELD_SEQUENCE])); } @@ -401,7 +408,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getAppliesToAll())) { $v->xmlSerialize($sxe->addChild(self::FIELD_APPLIES_TO_ALL, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getInformation())) { $v->xmlSerialize($sxe->addChild(self::FIELD_INFORMATION, null, $v->_getFHIRXMLNamespace())); } @@ -418,15 +424,29 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getAppliesToAll())) { - $a[self::FIELD_APPLIES_TO_ALL] = $v->getValue(); - $a[self::FIELD_APPLIES_TO_ALL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_APPLIES_TO_ALL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_APPLIES_TO_ALL_EXT] = $enc; + } + } else { + $a[self::FIELD_APPLIES_TO_ALL] = $v; + } } if (null !== ($v = $this->getInformation())) { $a[self::FIELD_INFORMATION] = $v; } if (null !== ($v = $this->getSequence())) { - $a[self::FIELD_SEQUENCE] = $v->getValue(); - $a[self::FIELD_SEQUENCE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SEQUENCE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SEQUENCE_EXT] = $enc; + } + } else { + $a[self::FIELD_SEQUENCE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRCoverageEligibilityResponse/FHIRCoverageEligibilityResponseBenefit.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRCoverageEligibilityResponse/FHIRCoverageEligibilityResponseBenefit.php index afcad1ae3a..8aa618e81e 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRCoverageEligibilityResponse/FHIRCoverageEligibilityResponseBenefit.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRCoverageEligibilityResponse/FHIRCoverageEligibilityResponseBenefit.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -81,10 +81,6 @@ class FHIRCoverageEligibilityResponseBenefit extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_COVERAGE_ELIGIBILITY_RESPONSE_DOT_BENEFIT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ALLOWED_MONEY = 'allowedMoney'; const FIELD_ALLOWED_MONEY_EXT = '_allowedMoney'; const FIELD_ALLOWED_STRING = 'allowedString'; @@ -183,6 +179,9 @@ class FHIRCoverageEligibilityResponseBenefit extends FHIRBackboneElement */ protected $usedUnsignedInt = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRCoverageEligibilityResponseBenefit Constructor * @param null|array $data @@ -205,8 +204,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ALLOWED_MONEY] instanceof FHIRMoney) { $this->setAllowedMoney($data[self::FIELD_ALLOWED_MONEY]); - } elseif ($ext && is_scalar($data[self::FIELD_ALLOWED_MONEY])) { - $this->setAllowedMoney(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_ALLOWED_MONEY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ALLOWED_MONEY])) { + $this->setAllowedMoney(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_ALLOWED_MONEY]] + $ext)); + } else if (is_array($data[self::FIELD_ALLOWED_MONEY])) { + $this->setAllowedMoney(new FHIRMoney(array_merge($ext, $data[self::FIELD_ALLOWED_MONEY]))); + } } else { $this->setAllowedMoney(new FHIRMoney($data[self::FIELD_ALLOWED_MONEY])); } @@ -217,8 +220,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ALLOWED_STRING] instanceof FHIRString) { $this->setAllowedString($data[self::FIELD_ALLOWED_STRING]); - } elseif ($ext && is_scalar($data[self::FIELD_ALLOWED_STRING])) { - $this->setAllowedString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_ALLOWED_STRING]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ALLOWED_STRING])) { + $this->setAllowedString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_ALLOWED_STRING]] + $ext)); + } else if (is_array($data[self::FIELD_ALLOWED_STRING])) { + $this->setAllowedString(new FHIRString(array_merge($ext, $data[self::FIELD_ALLOWED_STRING]))); + } } else { $this->setAllowedString(new FHIRString($data[self::FIELD_ALLOWED_STRING])); } @@ -229,8 +236,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ALLOWED_UNSIGNED_INT] instanceof FHIRUnsignedInt) { $this->setAllowedUnsignedInt($data[self::FIELD_ALLOWED_UNSIGNED_INT]); - } elseif ($ext && is_scalar($data[self::FIELD_ALLOWED_UNSIGNED_INT])) { - $this->setAllowedUnsignedInt(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_ALLOWED_UNSIGNED_INT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ALLOWED_UNSIGNED_INT])) { + $this->setAllowedUnsignedInt(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_ALLOWED_UNSIGNED_INT]] + $ext)); + } else if (is_array($data[self::FIELD_ALLOWED_UNSIGNED_INT])) { + $this->setAllowedUnsignedInt(new FHIRUnsignedInt(array_merge($ext, $data[self::FIELD_ALLOWED_UNSIGNED_INT]))); + } } else { $this->setAllowedUnsignedInt(new FHIRUnsignedInt($data[self::FIELD_ALLOWED_UNSIGNED_INT])); } @@ -248,8 +259,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_USED_MONEY] instanceof FHIRMoney) { $this->setUsedMoney($data[self::FIELD_USED_MONEY]); - } elseif ($ext && is_scalar($data[self::FIELD_USED_MONEY])) { - $this->setUsedMoney(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_USED_MONEY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_USED_MONEY])) { + $this->setUsedMoney(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_USED_MONEY]] + $ext)); + } else if (is_array($data[self::FIELD_USED_MONEY])) { + $this->setUsedMoney(new FHIRMoney(array_merge($ext, $data[self::FIELD_USED_MONEY]))); + } } else { $this->setUsedMoney(new FHIRMoney($data[self::FIELD_USED_MONEY])); } @@ -260,8 +275,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_USED_STRING] instanceof FHIRString) { $this->setUsedString($data[self::FIELD_USED_STRING]); - } elseif ($ext && is_scalar($data[self::FIELD_USED_STRING])) { - $this->setUsedString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_USED_STRING]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_USED_STRING])) { + $this->setUsedString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_USED_STRING]] + $ext)); + } else if (is_array($data[self::FIELD_USED_STRING])) { + $this->setUsedString(new FHIRString(array_merge($ext, $data[self::FIELD_USED_STRING]))); + } } else { $this->setUsedString(new FHIRString($data[self::FIELD_USED_STRING])); } @@ -272,8 +291,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_USED_UNSIGNED_INT] instanceof FHIRUnsignedInt) { $this->setUsedUnsignedInt($data[self::FIELD_USED_UNSIGNED_INT]); - } elseif ($ext && is_scalar($data[self::FIELD_USED_UNSIGNED_INT])) { - $this->setUsedUnsignedInt(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_USED_UNSIGNED_INT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_USED_UNSIGNED_INT])) { + $this->setUsedUnsignedInt(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_USED_UNSIGNED_INT]] + $ext)); + } else if (is_array($data[self::FIELD_USED_UNSIGNED_INT])) { + $this->setUsedUnsignedInt(new FHIRUnsignedInt(array_merge($ext, $data[self::FIELD_USED_UNSIGNED_INT]))); + } } else { $this->setUsedUnsignedInt(new FHIRUnsignedInt($data[self::FIELD_USED_UNSIGNED_INT])); } @@ -668,7 +691,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getAllowedMoney())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ALLOWED_MONEY, null, $v->_getFHIRXMLNamespace())); } @@ -678,11 +700,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getAllowedUnsignedInt())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ALLOWED_UNSIGNED_INT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getUsedMoney())) { $v->xmlSerialize($sxe->addChild(self::FIELD_USED_MONEY, null, $v->_getFHIRXMLNamespace())); } @@ -702,29 +722,73 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getAllowedMoney())) { - $a[self::FIELD_ALLOWED_MONEY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ALLOWED_MONEY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ALLOWED_MONEY_EXT] = $enc; + } + } else { + $a[self::FIELD_ALLOWED_MONEY] = $v; + } } if (null !== ($v = $this->getAllowedString())) { - $a[self::FIELD_ALLOWED_STRING] = $v->getValue(); - $a[self::FIELD_ALLOWED_STRING_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ALLOWED_STRING] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ALLOWED_STRING_EXT] = $enc; + } + } else { + $a[self::FIELD_ALLOWED_STRING] = $v; + } } if (null !== ($v = $this->getAllowedUnsignedInt())) { - $a[self::FIELD_ALLOWED_UNSIGNED_INT] = $v->getValue(); - $a[self::FIELD_ALLOWED_UNSIGNED_INT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ALLOWED_UNSIGNED_INT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ALLOWED_UNSIGNED_INT_EXT] = $enc; + } + } else { + $a[self::FIELD_ALLOWED_UNSIGNED_INT] = $v; + } } if (null !== ($v = $this->getType())) { $a[self::FIELD_TYPE] = $v; } if (null !== ($v = $this->getUsedMoney())) { - $a[self::FIELD_USED_MONEY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_USED_MONEY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_USED_MONEY_EXT] = $enc; + } + } else { + $a[self::FIELD_USED_MONEY] = $v; + } } if (null !== ($v = $this->getUsedString())) { - $a[self::FIELD_USED_STRING] = $v->getValue(); - $a[self::FIELD_USED_STRING_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_USED_STRING] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_USED_STRING_EXT] = $enc; + } + } else { + $a[self::FIELD_USED_STRING] = $v; + } } if (null !== ($v = $this->getUsedUnsignedInt())) { - $a[self::FIELD_USED_UNSIGNED_INT] = $v->getValue(); - $a[self::FIELD_USED_UNSIGNED_INT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_USED_UNSIGNED_INT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_USED_UNSIGNED_INT_EXT] = $enc; + } + } else { + $a[self::FIELD_USED_UNSIGNED_INT] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRCoverageEligibilityResponse/FHIRCoverageEligibilityResponseError.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRCoverageEligibilityResponse/FHIRCoverageEligibilityResponseError.php index 35c12aec3e..9205f4d3ca 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRCoverageEligibilityResponse/FHIRCoverageEligibilityResponseError.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRCoverageEligibilityResponse/FHIRCoverageEligibilityResponseError.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRCoverageEligibilityResponseError extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_COVERAGE_ELIGIBILITY_RESPONSE_DOT_ERROR; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CODE = 'code'; /** @@ -97,6 +93,9 @@ class FHIRCoverageEligibilityResponseError extends FHIRBackboneElement */ protected $code = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRCoverageEligibilityResponseError Constructor * @param null|array $data @@ -258,7 +257,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRCoverageEligibilityResponse/FHIRCoverageEligibilityResponseInsurance.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRCoverageEligibilityResponse/FHIRCoverageEligibilityResponseInsurance.php index 4ff0438f06..858b9090f7 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRCoverageEligibilityResponse/FHIRCoverageEligibilityResponseInsurance.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRCoverageEligibilityResponse/FHIRCoverageEligibilityResponseInsurance.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRCoverageEligibilityResponseInsurance extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_COVERAGE_ELIGIBILITY_RESPONSE_DOT_INSURANCE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_BENEFIT_PERIOD = 'benefitPeriod'; const FIELD_COVERAGE = 'coverage'; const FIELD_INFORCE = 'inforce'; @@ -136,6 +132,9 @@ class FHIRCoverageEligibilityResponseInsurance extends FHIRBackboneElement */ protected $item = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRCoverageEligibilityResponseInsurance Constructor * @param null|array $data @@ -172,8 +171,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_INFORCE] instanceof FHIRBoolean) { $this->setInforce($data[self::FIELD_INFORCE]); - } elseif ($ext && is_scalar($data[self::FIELD_INFORCE])) { - $this->setInforce(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_INFORCE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_INFORCE])) { + $this->setInforce(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_INFORCE]] + $ext)); + } else if (is_array($data[self::FIELD_INFORCE])) { + $this->setInforce(new FHIRBoolean(array_merge($ext, $data[self::FIELD_INFORCE]))); + } } else { $this->setInforce(new FHIRBoolean($data[self::FIELD_INFORCE])); } @@ -181,6 +184,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ITEM])) { if (is_array($data[self::FIELD_ITEM])) { foreach($data[self::FIELD_ITEM] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCoverageEligibilityResponseItem) { $this->addItem($v); } else { @@ -469,18 +475,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getBenefitPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_BENEFIT_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getCoverage())) { $v->xmlSerialize($sxe->addChild(self::FIELD_COVERAGE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getInforce())) { $v->xmlSerialize($sxe->addChild(self::FIELD_INFORCE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getItem())) { foreach($vs as $v) { if (null === $v) { @@ -489,6 +492,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_ITEM, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } @@ -505,8 +509,15 @@ public function jsonSerialize() $a[self::FIELD_COVERAGE] = $v; } if (null !== ($v = $this->getInforce())) { - $a[self::FIELD_INFORCE] = $v->getValue(); - $a[self::FIELD_INFORCE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_INFORCE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_INFORCE_EXT] = $enc; + } + } else { + $a[self::FIELD_INFORCE] = $v; + } } if ([] !== ($vs = $this->getItem())) { $a[self::FIELD_ITEM] = $vs; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRCoverageEligibilityResponse/FHIRCoverageEligibilityResponseItem.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRCoverageEligibilityResponse/FHIRCoverageEligibilityResponseItem.php index da24602deb..ad6af3f9c0 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRCoverageEligibilityResponse/FHIRCoverageEligibilityResponseItem.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRCoverageEligibilityResponse/FHIRCoverageEligibilityResponseItem.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -82,10 +82,6 @@ class FHIRCoverageEligibilityResponseItem extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_COVERAGE_ELIGIBILITY_RESPONSE_DOT_ITEM; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_AUTHORIZATION_REQUIRED = 'authorizationRequired'; const FIELD_AUTHORIZATION_REQUIRED_EXT = '_authorizationRequired'; const FIELD_AUTHORIZATION_SUPPORTING = 'authorizationSupporting'; @@ -272,6 +268,9 @@ class FHIRCoverageEligibilityResponseItem extends FHIRBackboneElement */ protected $unit = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRCoverageEligibilityResponseItem Constructor * @param null|array $data @@ -294,8 +293,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_AUTHORIZATION_REQUIRED] instanceof FHIRBoolean) { $this->setAuthorizationRequired($data[self::FIELD_AUTHORIZATION_REQUIRED]); - } elseif ($ext && is_scalar($data[self::FIELD_AUTHORIZATION_REQUIRED])) { - $this->setAuthorizationRequired(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_AUTHORIZATION_REQUIRED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_AUTHORIZATION_REQUIRED])) { + $this->setAuthorizationRequired(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_AUTHORIZATION_REQUIRED]] + $ext)); + } else if (is_array($data[self::FIELD_AUTHORIZATION_REQUIRED])) { + $this->setAuthorizationRequired(new FHIRBoolean(array_merge($ext, $data[self::FIELD_AUTHORIZATION_REQUIRED]))); + } } else { $this->setAuthorizationRequired(new FHIRBoolean($data[self::FIELD_AUTHORIZATION_REQUIRED])); } @@ -303,6 +306,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_AUTHORIZATION_SUPPORTING])) { if (is_array($data[self::FIELD_AUTHORIZATION_SUPPORTING])) { foreach($data[self::FIELD_AUTHORIZATION_SUPPORTING] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addAuthorizationSupporting($v); } else { @@ -321,8 +327,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_AUTHORIZATION_URL] instanceof FHIRUri) { $this->setAuthorizationUrl($data[self::FIELD_AUTHORIZATION_URL]); - } elseif ($ext && is_scalar($data[self::FIELD_AUTHORIZATION_URL])) { - $this->setAuthorizationUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_AUTHORIZATION_URL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_AUTHORIZATION_URL])) { + $this->setAuthorizationUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_AUTHORIZATION_URL]] + $ext)); + } else if (is_array($data[self::FIELD_AUTHORIZATION_URL])) { + $this->setAuthorizationUrl(new FHIRUri(array_merge($ext, $data[self::FIELD_AUTHORIZATION_URL]))); + } } else { $this->setAuthorizationUrl(new FHIRUri($data[self::FIELD_AUTHORIZATION_URL])); } @@ -330,6 +340,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_BENEFIT])) { if (is_array($data[self::FIELD_BENEFIT])) { foreach($data[self::FIELD_BENEFIT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCoverageEligibilityResponseBenefit) { $this->addBenefit($v); } else { @@ -355,8 +368,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -367,8 +384,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EXCLUDED] instanceof FHIRBoolean) { $this->setExcluded($data[self::FIELD_EXCLUDED]); - } elseif ($ext && is_scalar($data[self::FIELD_EXCLUDED])) { - $this->setExcluded(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_EXCLUDED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EXCLUDED])) { + $this->setExcluded(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_EXCLUDED]] + $ext)); + } else if (is_array($data[self::FIELD_EXCLUDED])) { + $this->setExcluded(new FHIRBoolean(array_merge($ext, $data[self::FIELD_EXCLUDED]))); + } } else { $this->setExcluded(new FHIRBoolean($data[self::FIELD_EXCLUDED])); } @@ -376,6 +397,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_MODIFIER])) { if (is_array($data[self::FIELD_MODIFIER])) { foreach($data[self::FIELD_MODIFIER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addModifier($v); } else { @@ -394,8 +418,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -1167,7 +1195,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getAuthorizationRequired())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AUTHORIZATION_REQUIRED, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getAuthorizationSupporting())) { foreach($vs as $v) { if (null === $v) { @@ -1176,10 +1203,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_AUTHORIZATION_SUPPORTING, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getAuthorizationUrl())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AUTHORIZATION_URL, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getBenefit())) { foreach($vs as $v) { if (null === $v) { @@ -1198,7 +1225,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getExcluded())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EXCLUDED, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getModifier())) { foreach($vs as $v) { if (null === $v) { @@ -1207,26 +1233,22 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_MODIFIER, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NAME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getNetwork())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NETWORK, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getProductOrService())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PRODUCT_OR_SERVICE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getProvider())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PROVIDER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getTerm())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TERM, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getUnit())) { $v->xmlSerialize($sxe->addChild(self::FIELD_UNIT, null, $v->_getFHIRXMLNamespace())); } @@ -1240,15 +1262,29 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getAuthorizationRequired())) { - $a[self::FIELD_AUTHORIZATION_REQUIRED] = $v->getValue(); - $a[self::FIELD_AUTHORIZATION_REQUIRED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_AUTHORIZATION_REQUIRED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_AUTHORIZATION_REQUIRED_EXT] = $enc; + } + } else { + $a[self::FIELD_AUTHORIZATION_REQUIRED] = $v; + } } if ([] !== ($vs = $this->getAuthorizationSupporting())) { $a[self::FIELD_AUTHORIZATION_SUPPORTING] = $vs; } if (null !== ($v = $this->getAuthorizationUrl())) { - $a[self::FIELD_AUTHORIZATION_URL] = $v->getValue(); - $a[self::FIELD_AUTHORIZATION_URL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_AUTHORIZATION_URL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_AUTHORIZATION_URL_EXT] = $enc; + } + } else { + $a[self::FIELD_AUTHORIZATION_URL] = $v; + } } if ([] !== ($vs = $this->getBenefit())) { $a[self::FIELD_BENEFIT] = $vs; @@ -1257,19 +1293,40 @@ public function jsonSerialize() $a[self::FIELD_CATEGORY] = $v; } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if (null !== ($v = $this->getExcluded())) { - $a[self::FIELD_EXCLUDED] = $v->getValue(); - $a[self::FIELD_EXCLUDED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EXCLUDED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EXCLUDED_EXT] = $enc; + } + } else { + $a[self::FIELD_EXCLUDED] = $v; + } } if ([] !== ($vs = $this->getModifier())) { $a[self::FIELD_MODIFIER] = $vs; } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if (null !== ($v = $this->getNetwork())) { $a[self::FIELD_NETWORK] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRDetectedIssue/FHIRDetectedIssueEvidence.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRDetectedIssue/FHIRDetectedIssueEvidence.php index 3d01899e87..fb1af87296 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRDetectedIssue/FHIRDetectedIssueEvidence.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRDetectedIssue/FHIRDetectedIssueEvidence.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRDetectedIssueEvidence extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DETECTED_ISSUE_DOT_EVIDENCE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CODE = 'code'; const FIELD_DETAIL = 'detail'; @@ -111,6 +107,9 @@ class FHIRDetectedIssueEvidence extends FHIRBackboneElement */ protected $detail = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRDetectedIssueEvidence Constructor * @param null|array $data @@ -130,6 +129,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CODE])) { if (is_array($data[self::FIELD_CODE])) { foreach($data[self::FIELD_CODE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addCode($v); } else { @@ -145,6 +147,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_DETAIL])) { if (is_array($data[self::FIELD_DETAIL])) { foreach($data[self::FIELD_DETAIL] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addDetail($v); } else { @@ -386,7 +391,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getCode())) { foreach($vs as $v) { if (null === $v) { @@ -404,6 +408,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_DETAIL, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRDetectedIssue/FHIRDetectedIssueMitigation.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRDetectedIssue/FHIRDetectedIssueMitigation.php index 5e5d9155b8..3f2f3c1c21 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRDetectedIssue/FHIRDetectedIssueMitigation.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRDetectedIssue/FHIRDetectedIssueMitigation.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -81,10 +81,6 @@ class FHIRDetectedIssueMitigation extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DETECTED_ISSUE_DOT_MITIGATION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ACTION = 'action'; const FIELD_AUTHOR = 'author'; const FIELD_DATE = 'date'; @@ -129,6 +125,9 @@ class FHIRDetectedIssueMitigation extends FHIRBackboneElement */ protected $date = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRDetectedIssueMitigation Constructor * @param null|array $data @@ -165,8 +164,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATE] instanceof FHIRDateTime) { $this->setDate($data[self::FIELD_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_DATE])) { - $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime(array_merge($ext, $data[self::FIELD_DATE]))); + } } else { $this->setDate(new FHIRDateTime($data[self::FIELD_DATE])); } @@ -394,11 +397,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getAction())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ACTION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getAuthor())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AUTHOR, null, $v->_getFHIRXMLNamespace())); } @@ -421,8 +422,15 @@ public function jsonSerialize() $a[self::FIELD_AUTHOR] = $v; } if (null !== ($v = $this->getDate())) { - $a[self::FIELD_DATE] = $v->getValue(); - $a[self::FIELD_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_DATE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRDevice/FHIRDeviceDeviceName.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRDevice/FHIRDeviceDeviceName.php index 97d60aa503..d8488fac4a 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRDevice/FHIRDeviceDeviceName.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRDevice/FHIRDeviceDeviceName.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRDeviceDeviceName extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DEVICE_DOT_DEVICE_NAME; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_NAME = 'name'; const FIELD_NAME_EXT = '_name'; const FIELD_TYPE = 'type'; @@ -111,6 +107,9 @@ class FHIRDeviceDeviceName extends FHIRBackboneElement */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRDeviceDeviceName Constructor * @param null|array $data @@ -133,8 +132,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -145,8 +148,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TYPE] instanceof FHIRDeviceNameType) { $this->setType($data[self::FIELD_TYPE]); - } elseif ($ext && is_scalar($data[self::FIELD_TYPE])) { - $this->setType(new FHIRDeviceNameType([FHIRDeviceNameType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TYPE])) { + $this->setType(new FHIRDeviceNameType([FHIRDeviceNameType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } else if (is_array($data[self::FIELD_TYPE])) { + $this->setType(new FHIRDeviceNameType(array_merge($ext, $data[self::FIELD_TYPE]))); + } } else { $this->setType(new FHIRDeviceNameType($data[self::FIELD_TYPE])); } @@ -332,7 +339,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NAME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -346,11 +352,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if (null !== ($v = $this->getType())) { - $a[self::FIELD_TYPE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TYPE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TYPE_EXT] = $enc; + } + } else { + $a[self::FIELD_TYPE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRDevice/FHIRDeviceProperty.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRDevice/FHIRDeviceProperty.php index 9e3201f939..9b60deb41a 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRDevice/FHIRDeviceProperty.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRDevice/FHIRDeviceProperty.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRDeviceProperty extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DEVICE_DOT_PROPERTY; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_TYPE = 'type'; const FIELD_VALUE_CODE = 'valueCode'; const FIELD_VALUE_QUANTITY = 'valueQuantity'; @@ -126,6 +122,9 @@ class FHIRDeviceProperty extends FHIRBackboneElement */ protected $valueQuantity = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRDeviceProperty Constructor * @param null|array $data @@ -152,6 +151,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_VALUE_CODE])) { if (is_array($data[self::FIELD_VALUE_CODE])) { foreach($data[self::FIELD_VALUE_CODE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addValueCode($v); } else { @@ -170,17 +172,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_VALUE_QUANTITY])) { foreach($data[self::FIELD_VALUE_QUANTITY] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRQuantity) { $this->addValueQuantity($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addValueQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addValueQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addValueQuantity(new FHIRQuantity(array_merge($v, $ext[$i]))); + } } else { $this->addValueQuantity(new FHIRQuantity($v)); } } } elseif ($data[self::FIELD_VALUE_QUANTITY] instanceof FHIRQuantity) { $this->addValueQuantity($data[self::FIELD_VALUE_QUANTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_QUANTITY])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_VALUE_QUANTITY])) { $this->addValueQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_VALUE_QUANTITY]] + $ext)); } else { $this->addValueQuantity(new FHIRQuantity($data[self::FIELD_VALUE_QUANTITY])); @@ -453,11 +462,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getValueCode())) { foreach($vs as $v) { if (null === $v) { @@ -475,6 +482,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_QUANTITY, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } @@ -491,7 +499,23 @@ public function jsonSerialize() $a[self::FIELD_VALUE_CODE] = $vs; } if ([] !== ($vs = $this->getValueQuantity())) { - $a[self::FIELD_VALUE_QUANTITY] = $vs; + $a[self::FIELD_VALUE_QUANTITY] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_QUANTITY][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_QUANTITY_EXT][] = $enc; + } else { + $a[self::FIELD_VALUE_QUANTITY_EXT][] = null; + } + } else { + $a[self::FIELD_VALUE_QUANTITY][] = $v; + } + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRDevice/FHIRDeviceSpecialization.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRDevice/FHIRDeviceSpecialization.php index d8f01c7c0d..8a8520711e 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRDevice/FHIRDeviceSpecialization.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRDevice/FHIRDeviceSpecialization.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRDeviceSpecialization extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DEVICE_DOT_SPECIALIZATION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_SYSTEM_TYPE = 'systemType'; const FIELD_VERSION = 'version'; const FIELD_VERSION_EXT = '_version'; @@ -111,6 +107,9 @@ class FHIRDeviceSpecialization extends FHIRBackboneElement */ protected $version = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRDeviceSpecialization Constructor * @param null|array $data @@ -140,8 +139,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VERSION] instanceof FHIRString) { $this->setVersion($data[self::FIELD_VERSION]); - } elseif ($ext && is_scalar($data[self::FIELD_VERSION])) { - $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } else if (is_array($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString(array_merge($ext, $data[self::FIELD_VERSION]))); + } } else { $this->setVersion(new FHIRString($data[self::FIELD_VERSION])); } @@ -326,7 +329,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getSystemType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SYSTEM_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -346,8 +348,15 @@ public function jsonSerialize() $a[self::FIELD_SYSTEM_TYPE] = $v; } if (null !== ($v = $this->getVersion())) { - $a[self::FIELD_VERSION] = $v->getValue(); - $a[self::FIELD_VERSION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VERSION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VERSION_EXT] = $enc; + } + } else { + $a[self::FIELD_VERSION] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRDevice/FHIRDeviceUdiCarrier.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRDevice/FHIRDeviceUdiCarrier.php index 5a20325495..8a7128275b 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRDevice/FHIRDeviceUdiCarrier.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRDevice/FHIRDeviceUdiCarrier.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -82,10 +82,6 @@ class FHIRDeviceUdiCarrier extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DEVICE_DOT_UDI_CARRIER; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CARRIER_AIDC = 'carrierAIDC'; const FIELD_CARRIER_AIDC_EXT = '_carrierAIDC'; const FIELD_CARRIER_HRF = 'carrierHRF'; @@ -177,6 +173,9 @@ class FHIRDeviceUdiCarrier extends FHIRBackboneElement */ protected $jurisdiction = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRDeviceUdiCarrier Constructor * @param null|array $data @@ -199,8 +198,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CARRIER_AIDC] instanceof FHIRBase64Binary) { $this->setCarrierAIDC($data[self::FIELD_CARRIER_AIDC]); - } elseif ($ext && is_scalar($data[self::FIELD_CARRIER_AIDC])) { - $this->setCarrierAIDC(new FHIRBase64Binary([FHIRBase64Binary::FIELD_VALUE => $data[self::FIELD_CARRIER_AIDC]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CARRIER_AIDC])) { + $this->setCarrierAIDC(new FHIRBase64Binary([FHIRBase64Binary::FIELD_VALUE => $data[self::FIELD_CARRIER_AIDC]] + $ext)); + } else if (is_array($data[self::FIELD_CARRIER_AIDC])) { + $this->setCarrierAIDC(new FHIRBase64Binary(array_merge($ext, $data[self::FIELD_CARRIER_AIDC]))); + } } else { $this->setCarrierAIDC(new FHIRBase64Binary($data[self::FIELD_CARRIER_AIDC])); } @@ -211,8 +214,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CARRIER_HRF] instanceof FHIRString) { $this->setCarrierHRF($data[self::FIELD_CARRIER_HRF]); - } elseif ($ext && is_scalar($data[self::FIELD_CARRIER_HRF])) { - $this->setCarrierHRF(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_CARRIER_HRF]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CARRIER_HRF])) { + $this->setCarrierHRF(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_CARRIER_HRF]] + $ext)); + } else if (is_array($data[self::FIELD_CARRIER_HRF])) { + $this->setCarrierHRF(new FHIRString(array_merge($ext, $data[self::FIELD_CARRIER_HRF]))); + } } else { $this->setCarrierHRF(new FHIRString($data[self::FIELD_CARRIER_HRF])); } @@ -223,8 +230,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DEVICE_IDENTIFIER] instanceof FHIRString) { $this->setDeviceIdentifier($data[self::FIELD_DEVICE_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_DEVICE_IDENTIFIER])) { - $this->setDeviceIdentifier(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DEVICE_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DEVICE_IDENTIFIER])) { + $this->setDeviceIdentifier(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DEVICE_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_DEVICE_IDENTIFIER])) { + $this->setDeviceIdentifier(new FHIRString(array_merge($ext, $data[self::FIELD_DEVICE_IDENTIFIER]))); + } } else { $this->setDeviceIdentifier(new FHIRString($data[self::FIELD_DEVICE_IDENTIFIER])); } @@ -235,8 +246,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ENTRY_TYPE] instanceof FHIRUDIEntryType) { $this->setEntryType($data[self::FIELD_ENTRY_TYPE]); - } elseif ($ext && is_scalar($data[self::FIELD_ENTRY_TYPE])) { - $this->setEntryType(new FHIRUDIEntryType([FHIRUDIEntryType::FIELD_VALUE => $data[self::FIELD_ENTRY_TYPE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ENTRY_TYPE])) { + $this->setEntryType(new FHIRUDIEntryType([FHIRUDIEntryType::FIELD_VALUE => $data[self::FIELD_ENTRY_TYPE]] + $ext)); + } else if (is_array($data[self::FIELD_ENTRY_TYPE])) { + $this->setEntryType(new FHIRUDIEntryType(array_merge($ext, $data[self::FIELD_ENTRY_TYPE]))); + } } else { $this->setEntryType(new FHIRUDIEntryType($data[self::FIELD_ENTRY_TYPE])); } @@ -247,8 +262,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ISSUER] instanceof FHIRUri) { $this->setIssuer($data[self::FIELD_ISSUER]); - } elseif ($ext && is_scalar($data[self::FIELD_ISSUER])) { - $this->setIssuer(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_ISSUER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ISSUER])) { + $this->setIssuer(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_ISSUER]] + $ext)); + } else if (is_array($data[self::FIELD_ISSUER])) { + $this->setIssuer(new FHIRUri(array_merge($ext, $data[self::FIELD_ISSUER]))); + } } else { $this->setIssuer(new FHIRUri($data[self::FIELD_ISSUER])); } @@ -259,8 +278,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_JURISDICTION] instanceof FHIRUri) { $this->setJurisdiction($data[self::FIELD_JURISDICTION]); - } elseif ($ext && is_scalar($data[self::FIELD_JURISDICTION])) { - $this->setJurisdiction(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_JURISDICTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_JURISDICTION])) { + $this->setJurisdiction(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_JURISDICTION]] + $ext)); + } else if (is_array($data[self::FIELD_JURISDICTION])) { + $this->setJurisdiction(new FHIRUri(array_merge($ext, $data[self::FIELD_JURISDICTION]))); + } } else { $this->setJurisdiction(new FHIRUri($data[self::FIELD_JURISDICTION])); } @@ -652,7 +675,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDeviceIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEVICE_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getEntryType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ENTRY_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -672,27 +694,70 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getCarrierAIDC())) { - $a[self::FIELD_CARRIER_AIDC] = $v->getValue(); - $a[self::FIELD_CARRIER_AIDC_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CARRIER_AIDC] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CARRIER_AIDC_EXT] = $enc; + } + } else { + $a[self::FIELD_CARRIER_AIDC] = $v; + } } if (null !== ($v = $this->getCarrierHRF())) { - $a[self::FIELD_CARRIER_HRF] = $v->getValue(); - $a[self::FIELD_CARRIER_HRF_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CARRIER_HRF] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CARRIER_HRF_EXT] = $enc; + } + } else { + $a[self::FIELD_CARRIER_HRF] = $v; + } } if (null !== ($v = $this->getDeviceIdentifier())) { - $a[self::FIELD_DEVICE_IDENTIFIER] = $v->getValue(); - $a[self::FIELD_DEVICE_IDENTIFIER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DEVICE_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DEVICE_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_DEVICE_IDENTIFIER] = $v; + } } if (null !== ($v = $this->getEntryType())) { - $a[self::FIELD_ENTRY_TYPE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ENTRY_TYPE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ENTRY_TYPE_EXT] = $enc; + } + } else { + $a[self::FIELD_ENTRY_TYPE] = $v; + } } if (null !== ($v = $this->getIssuer())) { - $a[self::FIELD_ISSUER] = $v->getValue(); - $a[self::FIELD_ISSUER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ISSUER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ISSUER_EXT] = $enc; + } + } else { + $a[self::FIELD_ISSUER] = $v; + } } if (null !== ($v = $this->getJurisdiction())) { - $a[self::FIELD_JURISDICTION] = $v->getValue(); - $a[self::FIELD_JURISDICTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_JURISDICTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_JURISDICTION_EXT] = $enc; + } + } else { + $a[self::FIELD_JURISDICTION] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRDevice/FHIRDeviceVersion.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRDevice/FHIRDeviceVersion.php index bc3d91f03a..b47d70495e 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRDevice/FHIRDeviceVersion.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRDevice/FHIRDeviceVersion.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -81,10 +81,6 @@ class FHIRDeviceVersion extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DEVICE_DOT_VERSION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_COMPONENT = 'component'; const FIELD_COMPONENT_EXT = '_component'; const FIELD_TYPE = 'type'; @@ -126,6 +122,9 @@ class FHIRDeviceVersion extends FHIRBackboneElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRDeviceVersion Constructor * @param null|array $data @@ -152,8 +151,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_COMPONENT] instanceof FHIRIdentifier) { $this->setComponent($data[self::FIELD_COMPONENT]); - } elseif ($ext && is_scalar($data[self::FIELD_COMPONENT])) { - $this->setComponent(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_COMPONENT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_COMPONENT])) { + $this->setComponent(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_COMPONENT]] + $ext)); + } else if (is_array($data[self::FIELD_COMPONENT])) { + $this->setComponent(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_COMPONENT]))); + } } else { $this->setComponent(new FHIRIdentifier($data[self::FIELD_COMPONENT])); } @@ -171,8 +174,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE] instanceof FHIRString) { $this->setValue($data[self::FIELD_VALUE]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE])) { - $this->setValue(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VALUE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE])) { + $this->setValue(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VALUE]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE])) { + $this->setValue(new FHIRString(array_merge($ext, $data[self::FIELD_VALUE]))); + } } else { $this->setValue(new FHIRString($data[self::FIELD_VALUE])); } @@ -392,15 +399,14 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getComponent())) { $v->xmlSerialize($sxe->addChild(self::FIELD_COMPONENT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getValue())) { + $sxe->addAttribute(self::FIELD_VALUE, (string)$v); $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE, null, $v->_getFHIRXMLNamespace())); } return $sxe; @@ -413,14 +419,29 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getComponent())) { - $a[self::FIELD_COMPONENT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_COMPONENT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_COMPONENT_EXT] = $enc; + } + } else { + $a[self::FIELD_COMPONENT] = $v; + } } if (null !== ($v = $this->getType())) { $a[self::FIELD_TYPE] = $v; } if (null !== ($v = $this->getValue())) { - $a[self::FIELD_VALUE] = $v->getValue(); - $a[self::FIELD_VALUE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRDeviceDefinition/FHIRDeviceDefinitionCapability.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRDeviceDefinition/FHIRDeviceDefinitionCapability.php index 778d9c0629..2ed00a4676 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRDeviceDefinition/FHIRDeviceDefinitionCapability.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRDeviceDefinition/FHIRDeviceDefinitionCapability.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRDeviceDefinitionCapability extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DEVICE_DEFINITION_DOT_CAPABILITY; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DESCRIPTION = 'description'; const FIELD_TYPE = 'type'; @@ -109,6 +105,9 @@ class FHIRDeviceDefinitionCapability extends FHIRBackboneElement */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRDeviceDefinitionCapability Constructor * @param null|array $data @@ -128,6 +127,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_DESCRIPTION])) { if (is_array($data[self::FIELD_DESCRIPTION])) { foreach($data[self::FIELD_DESCRIPTION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addDescription($v); } else { @@ -347,7 +349,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getDescription())) { foreach($vs as $v) { if (null === $v) { diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRDeviceDefinition/FHIRDeviceDefinitionDeviceName.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRDeviceDefinition/FHIRDeviceDefinitionDeviceName.php index d910c2f7ec..8337e2aa15 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRDeviceDefinition/FHIRDeviceDefinitionDeviceName.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRDeviceDefinition/FHIRDeviceDefinitionDeviceName.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRDeviceDefinitionDeviceName extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DEVICE_DEFINITION_DOT_DEVICE_NAME; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_NAME = 'name'; const FIELD_NAME_EXT = '_name'; const FIELD_TYPE = 'type'; @@ -110,6 +106,9 @@ class FHIRDeviceDefinitionDeviceName extends FHIRBackboneElement */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRDeviceDefinitionDeviceName Constructor * @param null|array $data @@ -132,8 +131,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -144,8 +147,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TYPE] instanceof FHIRDeviceNameType) { $this->setType($data[self::FIELD_TYPE]); - } elseif ($ext && is_scalar($data[self::FIELD_TYPE])) { - $this->setType(new FHIRDeviceNameType([FHIRDeviceNameType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TYPE])) { + $this->setType(new FHIRDeviceNameType([FHIRDeviceNameType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } else if (is_array($data[self::FIELD_TYPE])) { + $this->setType(new FHIRDeviceNameType(array_merge($ext, $data[self::FIELD_TYPE]))); + } } else { $this->setType(new FHIRDeviceNameType($data[self::FIELD_TYPE])); } @@ -331,7 +338,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NAME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -345,11 +351,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if (null !== ($v = $this->getType())) { - $a[self::FIELD_TYPE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TYPE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TYPE_EXT] = $enc; + } + } else { + $a[self::FIELD_TYPE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRDeviceDefinition/FHIRDeviceDefinitionMaterial.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRDeviceDefinition/FHIRDeviceDefinitionMaterial.php index ecf7797218..ecd45d8da5 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRDeviceDefinition/FHIRDeviceDefinitionMaterial.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRDeviceDefinition/FHIRDeviceDefinitionMaterial.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRDeviceDefinitionMaterial extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DEVICE_DEFINITION_DOT_MATERIAL; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ALLERGENIC_INDICATOR = 'allergenicIndicator'; const FIELD_ALLERGENIC_INDICATOR_EXT = '_allergenicIndicator'; const FIELD_ALTERNATE = 'alternate'; @@ -121,6 +117,9 @@ class FHIRDeviceDefinitionMaterial extends FHIRBackboneElement */ protected $substance = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRDeviceDefinitionMaterial Constructor * @param null|array $data @@ -143,8 +142,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ALLERGENIC_INDICATOR] instanceof FHIRBoolean) { $this->setAllergenicIndicator($data[self::FIELD_ALLERGENIC_INDICATOR]); - } elseif ($ext && is_scalar($data[self::FIELD_ALLERGENIC_INDICATOR])) { - $this->setAllergenicIndicator(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_ALLERGENIC_INDICATOR]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ALLERGENIC_INDICATOR])) { + $this->setAllergenicIndicator(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_ALLERGENIC_INDICATOR]] + $ext)); + } else if (is_array($data[self::FIELD_ALLERGENIC_INDICATOR])) { + $this->setAllergenicIndicator(new FHIRBoolean(array_merge($ext, $data[self::FIELD_ALLERGENIC_INDICATOR]))); + } } else { $this->setAllergenicIndicator(new FHIRBoolean($data[self::FIELD_ALLERGENIC_INDICATOR])); } @@ -155,8 +158,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ALTERNATE] instanceof FHIRBoolean) { $this->setAlternate($data[self::FIELD_ALTERNATE]); - } elseif ($ext && is_scalar($data[self::FIELD_ALTERNATE])) { - $this->setAlternate(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_ALTERNATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ALTERNATE])) { + $this->setAlternate(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_ALTERNATE]] + $ext)); + } else if (is_array($data[self::FIELD_ALTERNATE])) { + $this->setAlternate(new FHIRBoolean(array_merge($ext, $data[self::FIELD_ALTERNATE]))); + } } else { $this->setAlternate(new FHIRBoolean($data[self::FIELD_ALTERNATE])); } @@ -394,7 +401,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getAlternate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ALTERNATE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSubstance())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBSTANCE, null, $v->_getFHIRXMLNamespace())); } @@ -408,12 +414,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getAllergenicIndicator())) { - $a[self::FIELD_ALLERGENIC_INDICATOR] = $v->getValue(); - $a[self::FIELD_ALLERGENIC_INDICATOR_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ALLERGENIC_INDICATOR] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ALLERGENIC_INDICATOR_EXT] = $enc; + } + } else { + $a[self::FIELD_ALLERGENIC_INDICATOR] = $v; + } } if (null !== ($v = $this->getAlternate())) { - $a[self::FIELD_ALTERNATE] = $v->getValue(); - $a[self::FIELD_ALTERNATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ALTERNATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ALTERNATE_EXT] = $enc; + } + } else { + $a[self::FIELD_ALTERNATE] = $v; + } } if (null !== ($v = $this->getSubstance())) { $a[self::FIELD_SUBSTANCE] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRDeviceDefinition/FHIRDeviceDefinitionProperty.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRDeviceDefinition/FHIRDeviceDefinitionProperty.php index 6fe6f3cceb..0ac683d326 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRDeviceDefinition/FHIRDeviceDefinitionProperty.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRDeviceDefinition/FHIRDeviceDefinitionProperty.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRDeviceDefinitionProperty extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DEVICE_DEFINITION_DOT_PROPERTY; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_TYPE = 'type'; const FIELD_VALUE_CODE = 'valueCode'; const FIELD_VALUE_QUANTITY = 'valueQuantity'; @@ -125,6 +121,9 @@ class FHIRDeviceDefinitionProperty extends FHIRBackboneElement */ protected $valueQuantity = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRDeviceDefinitionProperty Constructor * @param null|array $data @@ -151,6 +150,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_VALUE_CODE])) { if (is_array($data[self::FIELD_VALUE_CODE])) { foreach($data[self::FIELD_VALUE_CODE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addValueCode($v); } else { @@ -169,17 +171,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_VALUE_QUANTITY])) { foreach($data[self::FIELD_VALUE_QUANTITY] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRQuantity) { $this->addValueQuantity($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addValueQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addValueQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addValueQuantity(new FHIRQuantity(array_merge($v, $ext[$i]))); + } } else { $this->addValueQuantity(new FHIRQuantity($v)); } } } elseif ($data[self::FIELD_VALUE_QUANTITY] instanceof FHIRQuantity) { $this->addValueQuantity($data[self::FIELD_VALUE_QUANTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_QUANTITY])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_VALUE_QUANTITY])) { $this->addValueQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_VALUE_QUANTITY]] + $ext)); } else { $this->addValueQuantity(new FHIRQuantity($data[self::FIELD_VALUE_QUANTITY])); @@ -452,11 +461,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getValueCode())) { foreach($vs as $v) { if (null === $v) { @@ -474,6 +481,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_QUANTITY, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } @@ -490,7 +498,23 @@ public function jsonSerialize() $a[self::FIELD_VALUE_CODE] = $vs; } if ([] !== ($vs = $this->getValueQuantity())) { - $a[self::FIELD_VALUE_QUANTITY] = $vs; + $a[self::FIELD_VALUE_QUANTITY] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_QUANTITY][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_QUANTITY_EXT][] = $enc; + } else { + $a[self::FIELD_VALUE_QUANTITY_EXT][] = null; + } + } else { + $a[self::FIELD_VALUE_QUANTITY][] = $v; + } + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRDeviceDefinition/FHIRDeviceDefinitionSpecialization.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRDeviceDefinition/FHIRDeviceDefinitionSpecialization.php index 4eeb9e67b7..4d5565f4ca 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRDeviceDefinition/FHIRDeviceDefinitionSpecialization.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRDeviceDefinition/FHIRDeviceDefinitionSpecialization.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRDeviceDefinitionSpecialization extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DEVICE_DEFINITION_DOT_SPECIALIZATION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_SYSTEM_TYPE = 'systemType'; const FIELD_SYSTEM_TYPE_EXT = '_systemType'; const FIELD_VERSION = 'version'; @@ -109,6 +105,9 @@ class FHIRDeviceDefinitionSpecialization extends FHIRBackboneElement */ protected $version = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRDeviceDefinitionSpecialization Constructor * @param null|array $data @@ -131,8 +130,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SYSTEM_TYPE] instanceof FHIRString) { $this->setSystemType($data[self::FIELD_SYSTEM_TYPE]); - } elseif ($ext && is_scalar($data[self::FIELD_SYSTEM_TYPE])) { - $this->setSystemType(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SYSTEM_TYPE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SYSTEM_TYPE])) { + $this->setSystemType(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SYSTEM_TYPE]] + $ext)); + } else if (is_array($data[self::FIELD_SYSTEM_TYPE])) { + $this->setSystemType(new FHIRString(array_merge($ext, $data[self::FIELD_SYSTEM_TYPE]))); + } } else { $this->setSystemType(new FHIRString($data[self::FIELD_SYSTEM_TYPE])); } @@ -143,8 +146,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VERSION] instanceof FHIRString) { $this->setVersion($data[self::FIELD_VERSION]); - } elseif ($ext && is_scalar($data[self::FIELD_VERSION])) { - $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } else if (is_array($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString(array_merge($ext, $data[self::FIELD_VERSION]))); + } } else { $this->setVersion(new FHIRString($data[self::FIELD_VERSION])); } @@ -354,12 +361,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getSystemType())) { - $a[self::FIELD_SYSTEM_TYPE] = $v->getValue(); - $a[self::FIELD_SYSTEM_TYPE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SYSTEM_TYPE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SYSTEM_TYPE_EXT] = $enc; + } + } else { + $a[self::FIELD_SYSTEM_TYPE] = $v; + } } if (null !== ($v = $this->getVersion())) { - $a[self::FIELD_VERSION] = $v->getValue(); - $a[self::FIELD_VERSION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VERSION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VERSION_EXT] = $enc; + } + } else { + $a[self::FIELD_VERSION] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRDeviceDefinition/FHIRDeviceDefinitionUdiDeviceIdentifier.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRDeviceDefinition/FHIRDeviceDefinitionUdiDeviceIdentifier.php index 1efef7f7df..e913a741e8 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRDeviceDefinition/FHIRDeviceDefinitionUdiDeviceIdentifier.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRDeviceDefinition/FHIRDeviceDefinitionUdiDeviceIdentifier.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRDeviceDefinitionUdiDeviceIdentifier extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DEVICE_DEFINITION_DOT_UDI_DEVICE_IDENTIFIER; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DEVICE_IDENTIFIER = 'deviceIdentifier'; const FIELD_DEVICE_IDENTIFIER_EXT = '_deviceIdentifier'; const FIELD_ISSUER = 'issuer'; @@ -125,6 +121,9 @@ class FHIRDeviceDefinitionUdiDeviceIdentifier extends FHIRBackboneElement */ protected $jurisdiction = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRDeviceDefinitionUdiDeviceIdentifier Constructor * @param null|array $data @@ -147,8 +146,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DEVICE_IDENTIFIER] instanceof FHIRString) { $this->setDeviceIdentifier($data[self::FIELD_DEVICE_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_DEVICE_IDENTIFIER])) { - $this->setDeviceIdentifier(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DEVICE_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DEVICE_IDENTIFIER])) { + $this->setDeviceIdentifier(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DEVICE_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_DEVICE_IDENTIFIER])) { + $this->setDeviceIdentifier(new FHIRString(array_merge($ext, $data[self::FIELD_DEVICE_IDENTIFIER]))); + } } else { $this->setDeviceIdentifier(new FHIRString($data[self::FIELD_DEVICE_IDENTIFIER])); } @@ -159,8 +162,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ISSUER] instanceof FHIRUri) { $this->setIssuer($data[self::FIELD_ISSUER]); - } elseif ($ext && is_scalar($data[self::FIELD_ISSUER])) { - $this->setIssuer(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_ISSUER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ISSUER])) { + $this->setIssuer(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_ISSUER]] + $ext)); + } else if (is_array($data[self::FIELD_ISSUER])) { + $this->setIssuer(new FHIRUri(array_merge($ext, $data[self::FIELD_ISSUER]))); + } } else { $this->setIssuer(new FHIRUri($data[self::FIELD_ISSUER])); } @@ -171,8 +178,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_JURISDICTION] instanceof FHIRUri) { $this->setJurisdiction($data[self::FIELD_JURISDICTION]); - } elseif ($ext && is_scalar($data[self::FIELD_JURISDICTION])) { - $this->setJurisdiction(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_JURISDICTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_JURISDICTION])) { + $this->setJurisdiction(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_JURISDICTION]] + $ext)); + } else if (is_array($data[self::FIELD_JURISDICTION])) { + $this->setJurisdiction(new FHIRUri(array_merge($ext, $data[self::FIELD_JURISDICTION]))); + } } else { $this->setJurisdiction(new FHIRUri($data[self::FIELD_JURISDICTION])); } @@ -433,16 +444,37 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getDeviceIdentifier())) { - $a[self::FIELD_DEVICE_IDENTIFIER] = $v->getValue(); - $a[self::FIELD_DEVICE_IDENTIFIER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DEVICE_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DEVICE_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_DEVICE_IDENTIFIER] = $v; + } } if (null !== ($v = $this->getIssuer())) { - $a[self::FIELD_ISSUER] = $v->getValue(); - $a[self::FIELD_ISSUER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ISSUER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ISSUER_EXT] = $enc; + } + } else { + $a[self::FIELD_ISSUER] = $v; + } } if (null !== ($v = $this->getJurisdiction())) { - $a[self::FIELD_JURISDICTION] = $v->getValue(); - $a[self::FIELD_JURISDICTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_JURISDICTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_JURISDICTION_EXT] = $enc; + } + } else { + $a[self::FIELD_JURISDICTION] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRDeviceMetric/FHIRDeviceMetricCalibration.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRDeviceMetric/FHIRDeviceMetricCalibration.php index 97e0c039a5..81e0ab395a 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRDeviceMetric/FHIRDeviceMetricCalibration.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRDeviceMetric/FHIRDeviceMetricCalibration.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRDeviceMetricCalibration extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DEVICE_METRIC_DOT_CALIBRATION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_STATE = 'state'; const FIELD_STATE_EXT = '_state'; const FIELD_TIME = 'time'; @@ -124,6 +120,9 @@ class FHIRDeviceMetricCalibration extends FHIRBackboneElement */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRDeviceMetricCalibration Constructor * @param null|array $data @@ -146,8 +145,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATE] instanceof FHIRDeviceMetricCalibrationState) { $this->setState($data[self::FIELD_STATE]); - } elseif ($ext && is_scalar($data[self::FIELD_STATE])) { - $this->setState(new FHIRDeviceMetricCalibrationState([FHIRDeviceMetricCalibrationState::FIELD_VALUE => $data[self::FIELD_STATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATE])) { + $this->setState(new FHIRDeviceMetricCalibrationState([FHIRDeviceMetricCalibrationState::FIELD_VALUE => $data[self::FIELD_STATE]] + $ext)); + } else if (is_array($data[self::FIELD_STATE])) { + $this->setState(new FHIRDeviceMetricCalibrationState(array_merge($ext, $data[self::FIELD_STATE]))); + } } else { $this->setState(new FHIRDeviceMetricCalibrationState($data[self::FIELD_STATE])); } @@ -158,8 +161,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TIME] instanceof FHIRInstant) { $this->setTime($data[self::FIELD_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_TIME])) { - $this->setTime(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TIME])) { + $this->setTime(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_TIME])) { + $this->setTime(new FHIRInstant(array_merge($ext, $data[self::FIELD_TIME]))); + } } else { $this->setTime(new FHIRInstant($data[self::FIELD_TIME])); } @@ -170,8 +177,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TYPE] instanceof FHIRDeviceMetricCalibrationType) { $this->setType($data[self::FIELD_TYPE]); - } elseif ($ext && is_scalar($data[self::FIELD_TYPE])) { - $this->setType(new FHIRDeviceMetricCalibrationType([FHIRDeviceMetricCalibrationType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TYPE])) { + $this->setType(new FHIRDeviceMetricCalibrationType([FHIRDeviceMetricCalibrationType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } else if (is_array($data[self::FIELD_TYPE])) { + $this->setType(new FHIRDeviceMetricCalibrationType(array_merge($ext, $data[self::FIELD_TYPE]))); + } } else { $this->setType(new FHIRDeviceMetricCalibrationType($data[self::FIELD_TYPE])); } @@ -389,14 +400,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getState())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getTime())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TIME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -410,14 +419,37 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getState())) { - $a[self::FIELD_STATE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATE_EXT] = $enc; + } + } else { + $a[self::FIELD_STATE] = $v; + } } if (null !== ($v = $this->getTime())) { - $a[self::FIELD_TIME] = $v->getValue(); - $a[self::FIELD_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_TIME] = $v; + } } if (null !== ($v = $this->getType())) { - $a[self::FIELD_TYPE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TYPE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TYPE_EXT] = $enc; + } + } else { + $a[self::FIELD_TYPE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRDeviceRequest/FHIRDeviceRequestParameter.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRDeviceRequest/FHIRDeviceRequestParameter.php index 869a674e2b..a57284f2d6 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRDeviceRequest/FHIRDeviceRequestParameter.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRDeviceRequest/FHIRDeviceRequestParameter.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -81,10 +81,6 @@ class FHIRDeviceRequestParameter extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DEVICE_REQUEST_DOT_PARAMETER; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CODE = 'code'; const FIELD_VALUE_BOOLEAN = 'valueBoolean'; const FIELD_VALUE_BOOLEAN_EXT = '_valueBoolean'; @@ -151,6 +147,9 @@ class FHIRDeviceRequestParameter extends FHIRBackboneElement */ protected $valueRange = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRDeviceRequestParameter Constructor * @param null|array $data @@ -180,8 +179,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_BOOLEAN] instanceof FHIRBoolean) { $this->setValueBoolean($data[self::FIELD_VALUE_BOOLEAN]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_BOOLEAN])) { - $this->setValueBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_VALUE_BOOLEAN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_BOOLEAN])) { + $this->setValueBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_VALUE_BOOLEAN]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_BOOLEAN])) { + $this->setValueBoolean(new FHIRBoolean(array_merge($ext, $data[self::FIELD_VALUE_BOOLEAN]))); + } } else { $this->setValueBoolean(new FHIRBoolean($data[self::FIELD_VALUE_BOOLEAN])); } @@ -199,8 +202,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_QUANTITY] instanceof FHIRQuantity) { $this->setValueQuantity($data[self::FIELD_VALUE_QUANTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_QUANTITY])) { - $this->setValueQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_VALUE_QUANTITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_QUANTITY])) { + $this->setValueQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_VALUE_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_QUANTITY])) { + $this->setValueQuantity(new FHIRQuantity(array_merge($ext, $data[self::FIELD_VALUE_QUANTITY]))); + } } else { $this->setValueQuantity(new FHIRQuantity($data[self::FIELD_VALUE_QUANTITY])); } @@ -495,22 +502,18 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getValueBoolean())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_BOOLEAN, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_QUANTITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueRange())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_RANGE, null, $v->_getFHIRXMLNamespace())); } @@ -527,14 +530,29 @@ public function jsonSerialize() $a[self::FIELD_CODE] = $v; } if (null !== ($v = $this->getValueBoolean())) { - $a[self::FIELD_VALUE_BOOLEAN] = $v->getValue(); - $a[self::FIELD_VALUE_BOOLEAN_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_BOOLEAN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_BOOLEAN_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_BOOLEAN] = $v; + } } if (null !== ($v = $this->getValueCodeableConcept())) { $a[self::FIELD_VALUE_CODEABLE_CONCEPT] = $v; } if (null !== ($v = $this->getValueQuantity())) { - $a[self::FIELD_VALUE_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_QUANTITY] = $v; + } } if (null !== ($v = $this->getValueRange())) { $a[self::FIELD_VALUE_RANGE] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRDiagnosticReport/FHIRDiagnosticReportMedia.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRDiagnosticReport/FHIRDiagnosticReportMedia.php index 4b4da41102..de75eab39a 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRDiagnosticReport/FHIRDiagnosticReportMedia.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRDiagnosticReport/FHIRDiagnosticReportMedia.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -82,10 +82,6 @@ class FHIRDiagnosticReportMedia extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DIAGNOSTIC_REPORT_DOT_MEDIA; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_COMMENT = 'comment'; const FIELD_COMMENT_EXT = '_comment'; const FIELD_LINK = 'link'; @@ -114,6 +110,9 @@ class FHIRDiagnosticReportMedia extends FHIRBackboneElement */ protected $link = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRDiagnosticReportMedia Constructor * @param null|array $data @@ -136,8 +135,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_COMMENT] instanceof FHIRString) { $this->setComment($data[self::FIELD_COMMENT]); - } elseif ($ext && is_scalar($data[self::FIELD_COMMENT])) { - $this->setComment(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_COMMENT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_COMMENT])) { + $this->setComment(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_COMMENT]] + $ext)); + } else if (is_array($data[self::FIELD_COMMENT])) { + $this->setComment(new FHIRString(array_merge($ext, $data[self::FIELD_COMMENT]))); + } } else { $this->setComment(new FHIRString($data[self::FIELD_COMMENT])); } @@ -334,7 +337,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getComment())) { $v->xmlSerialize($sxe->addChild(self::FIELD_COMMENT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getLink())) { $v->xmlSerialize($sxe->addChild(self::FIELD_LINK, null, $v->_getFHIRXMLNamespace())); } @@ -348,8 +350,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getComment())) { - $a[self::FIELD_COMMENT] = $v->getValue(); - $a[self::FIELD_COMMENT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_COMMENT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_COMMENT_EXT] = $enc; + } + } else { + $a[self::FIELD_COMMENT] = $v; + } } if (null !== ($v = $this->getLink())) { $a[self::FIELD_LINK] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRDocumentManifest/FHIRDocumentManifestRelated.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRDocumentManifest/FHIRDocumentManifestRelated.php index e75c1dd5ae..f2335ba408 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRDocumentManifest/FHIRDocumentManifestRelated.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRDocumentManifest/FHIRDocumentManifestRelated.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRDocumentManifestRelated extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DOCUMENT_MANIFEST_DOT_RELATED; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_IDENTIFIER = 'identifier'; const FIELD_IDENTIFIER_EXT = '_identifier'; const FIELD_REF = 'ref'; @@ -112,6 +108,9 @@ class FHIRDocumentManifestRelated extends FHIRBackboneElement */ protected $ref = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRDocumentManifestRelated Constructor * @param null|array $data @@ -134,8 +133,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->setIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { - $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_IDENTIFIER]))); + } } else { $this->setIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); } @@ -320,11 +323,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRef())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REF, null, $v->_getFHIRXMLNamespace())); } @@ -338,7 +339,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_IDENTIFIER] = $v; + } } if (null !== ($v = $this->getRef())) { $a[self::FIELD_REF] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRDocumentReference/FHIRDocumentReferenceContent.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRDocumentReference/FHIRDocumentReferenceContent.php index 6fe6fee97e..1051f620ef 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRDocumentReference/FHIRDocumentReferenceContent.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRDocumentReference/FHIRDocumentReferenceContent.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -82,10 +82,6 @@ class FHIRDocumentReferenceContent extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DOCUMENT_REFERENCE_DOT_CONTENT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ATTACHMENT = 'attachment'; const FIELD_FORMAT = 'format'; @@ -113,6 +109,9 @@ class FHIRDocumentReferenceContent extends FHIRBackboneElement */ protected $format = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRDocumentReferenceContent Constructor * @param null|array $data @@ -314,11 +313,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getAttachment())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ATTACHMENT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getFormat())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FORMAT, null, $v->_getFHIRXMLNamespace())); } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRDocumentReference/FHIRDocumentReferenceContext.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRDocumentReference/FHIRDocumentReferenceContext.php index 3d2eb51c6d..3b0004dcbd 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRDocumentReference/FHIRDocumentReferenceContext.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRDocumentReference/FHIRDocumentReferenceContext.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -83,10 +83,6 @@ class FHIRDocumentReferenceContext extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DOCUMENT_REFERENCE_DOT_CONTEXT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ENCOUNTER = 'encounter'; const FIELD_EVENT = 'event'; const FIELD_FACILITY_TYPE = 'facilityType'; @@ -182,6 +178,9 @@ class FHIRDocumentReferenceContext extends FHIRBackboneElement */ protected $sourcePatientInfo = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRDocumentReferenceContext Constructor * @param null|array $data @@ -201,6 +200,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ENCOUNTER])) { if (is_array($data[self::FIELD_ENCOUNTER])) { foreach($data[self::FIELD_ENCOUNTER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addEncounter($v); } else { @@ -216,6 +218,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_EVENT])) { if (is_array($data[self::FIELD_EVENT])) { foreach($data[self::FIELD_EVENT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addEvent($v); } else { @@ -252,6 +257,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_RELATED])) { if (is_array($data[self::FIELD_RELATED])) { foreach($data[self::FIELD_RELATED] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addRelated($v); } else { @@ -712,7 +720,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getEncounter())) { foreach($vs as $v) { if (null === $v) { @@ -734,15 +741,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getFacilityType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FACILITY_TYPE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPracticeSetting())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PRACTICE_SETTING, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getRelated())) { foreach($vs as $v) { if (null === $v) { diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRDocumentReference/FHIRDocumentReferenceRelatesTo.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRDocumentReference/FHIRDocumentReferenceRelatesTo.php index cbfdb9b4d6..99aed2765c 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRDocumentReference/FHIRDocumentReferenceRelatesTo.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRDocumentReference/FHIRDocumentReferenceRelatesTo.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -82,10 +82,6 @@ class FHIRDocumentReferenceRelatesTo extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DOCUMENT_REFERENCE_DOT_RELATES_TO; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CODE = 'code'; const FIELD_CODE_EXT = '_code'; const FIELD_TARGET = 'target'; @@ -111,6 +107,9 @@ class FHIRDocumentReferenceRelatesTo extends FHIRBackboneElement */ protected $target = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRDocumentReferenceRelatesTo Constructor * @param null|array $data @@ -133,8 +132,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CODE] instanceof FHIRDocumentRelationshipType) { $this->setCode($data[self::FIELD_CODE]); - } elseif ($ext && is_scalar($data[self::FIELD_CODE])) { - $this->setCode(new FHIRDocumentRelationshipType([FHIRDocumentRelationshipType::FIELD_VALUE => $data[self::FIELD_CODE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CODE])) { + $this->setCode(new FHIRDocumentRelationshipType([FHIRDocumentRelationshipType::FIELD_VALUE => $data[self::FIELD_CODE]] + $ext)); + } else if (is_array($data[self::FIELD_CODE])) { + $this->setCode(new FHIRDocumentRelationshipType(array_merge($ext, $data[self::FIELD_CODE]))); + } } else { $this->setCode(new FHIRDocumentRelationshipType($data[self::FIELD_CODE])); } @@ -311,11 +314,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getTarget())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TARGET, null, $v->_getFHIRXMLNamespace())); } @@ -329,7 +330,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getCode())) { - $a[self::FIELD_CODE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CODE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CODE_EXT] = $enc; + } + } else { + $a[self::FIELD_CODE] = $v; + } } if (null !== ($v = $this->getTarget())) { $a[self::FIELD_TARGET] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRDosage.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRDosage.php index 9099726a49..5995e0c815 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRDosage.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRDosage.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -85,10 +85,6 @@ class FHIRDosage extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DOSAGE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ADDITIONAL_INSTRUCTION = 'additionalInstruction'; const FIELD_AS_NEEDED_BOOLEAN = 'asNeededBoolean'; const FIELD_AS_NEEDED_BOOLEAN_EXT = '_asNeededBoolean'; @@ -285,6 +281,9 @@ class FHIRDosage extends FHIRBackboneElement */ protected $timing = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRDosage Constructor * @param null|array $data @@ -304,6 +303,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ADDITIONAL_INSTRUCTION])) { if (is_array($data[self::FIELD_ADDITIONAL_INSTRUCTION])) { foreach($data[self::FIELD_ADDITIONAL_INSTRUCTION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addAdditionalInstruction($v); } else { @@ -322,8 +324,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_AS_NEEDED_BOOLEAN] instanceof FHIRBoolean) { $this->setAsNeededBoolean($data[self::FIELD_AS_NEEDED_BOOLEAN]); - } elseif ($ext && is_scalar($data[self::FIELD_AS_NEEDED_BOOLEAN])) { - $this->setAsNeededBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_AS_NEEDED_BOOLEAN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_AS_NEEDED_BOOLEAN])) { + $this->setAsNeededBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_AS_NEEDED_BOOLEAN]] + $ext)); + } else if (is_array($data[self::FIELD_AS_NEEDED_BOOLEAN])) { + $this->setAsNeededBoolean(new FHIRBoolean(array_merge($ext, $data[self::FIELD_AS_NEEDED_BOOLEAN]))); + } } else { $this->setAsNeededBoolean(new FHIRBoolean($data[self::FIELD_AS_NEEDED_BOOLEAN])); } @@ -338,6 +344,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_DOSE_AND_RATE])) { if (is_array($data[self::FIELD_DOSE_AND_RATE])) { foreach($data[self::FIELD_DOSE_AND_RATE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRDosageDoseAndRate) { $this->addDoseAndRate($v); } else { @@ -356,8 +365,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MAX_DOSE_PER_ADMINISTRATION] instanceof FHIRQuantity) { $this->setMaxDosePerAdministration($data[self::FIELD_MAX_DOSE_PER_ADMINISTRATION]); - } elseif ($ext && is_scalar($data[self::FIELD_MAX_DOSE_PER_ADMINISTRATION])) { - $this->setMaxDosePerAdministration(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_MAX_DOSE_PER_ADMINISTRATION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MAX_DOSE_PER_ADMINISTRATION])) { + $this->setMaxDosePerAdministration(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_MAX_DOSE_PER_ADMINISTRATION]] + $ext)); + } else if (is_array($data[self::FIELD_MAX_DOSE_PER_ADMINISTRATION])) { + $this->setMaxDosePerAdministration(new FHIRQuantity(array_merge($ext, $data[self::FIELD_MAX_DOSE_PER_ADMINISTRATION]))); + } } else { $this->setMaxDosePerAdministration(new FHIRQuantity($data[self::FIELD_MAX_DOSE_PER_ADMINISTRATION])); } @@ -368,8 +381,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MAX_DOSE_PER_LIFETIME] instanceof FHIRQuantity) { $this->setMaxDosePerLifetime($data[self::FIELD_MAX_DOSE_PER_LIFETIME]); - } elseif ($ext && is_scalar($data[self::FIELD_MAX_DOSE_PER_LIFETIME])) { - $this->setMaxDosePerLifetime(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_MAX_DOSE_PER_LIFETIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MAX_DOSE_PER_LIFETIME])) { + $this->setMaxDosePerLifetime(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_MAX_DOSE_PER_LIFETIME]] + $ext)); + } else if (is_array($data[self::FIELD_MAX_DOSE_PER_LIFETIME])) { + $this->setMaxDosePerLifetime(new FHIRQuantity(array_merge($ext, $data[self::FIELD_MAX_DOSE_PER_LIFETIME]))); + } } else { $this->setMaxDosePerLifetime(new FHIRQuantity($data[self::FIELD_MAX_DOSE_PER_LIFETIME])); } @@ -394,8 +411,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PATIENT_INSTRUCTION] instanceof FHIRString) { $this->setPatientInstruction($data[self::FIELD_PATIENT_INSTRUCTION]); - } elseif ($ext && is_scalar($data[self::FIELD_PATIENT_INSTRUCTION])) { - $this->setPatientInstruction(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PATIENT_INSTRUCTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PATIENT_INSTRUCTION])) { + $this->setPatientInstruction(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PATIENT_INSTRUCTION]] + $ext)); + } else if (is_array($data[self::FIELD_PATIENT_INSTRUCTION])) { + $this->setPatientInstruction(new FHIRString(array_merge($ext, $data[self::FIELD_PATIENT_INSTRUCTION]))); + } } else { $this->setPatientInstruction(new FHIRString($data[self::FIELD_PATIENT_INSTRUCTION])); } @@ -413,8 +434,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SEQUENCE] instanceof FHIRInteger) { $this->setSequence($data[self::FIELD_SEQUENCE]); - } elseif ($ext && is_scalar($data[self::FIELD_SEQUENCE])) { - $this->setSequence(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_SEQUENCE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SEQUENCE])) { + $this->setSequence(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_SEQUENCE]] + $ext)); + } else if (is_array($data[self::FIELD_SEQUENCE])) { + $this->setSequence(new FHIRInteger(array_merge($ext, $data[self::FIELD_SEQUENCE]))); + } } else { $this->setSequence(new FHIRInteger($data[self::FIELD_SEQUENCE])); } @@ -432,8 +457,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TEXT] instanceof FHIRString) { $this->setText($data[self::FIELD_TEXT]); - } elseif ($ext && is_scalar($data[self::FIELD_TEXT])) { - $this->setText(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TEXT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TEXT])) { + $this->setText(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TEXT]] + $ext)); + } else if (is_array($data[self::FIELD_TEXT])) { + $this->setText(new FHIRString(array_merge($ext, $data[self::FIELD_TEXT]))); + } } else { $this->setText(new FHIRString($data[self::FIELD_TEXT])); } @@ -1154,7 +1183,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getAdditionalInstruction())) { foreach($vs as $v) { if (null === $v) { @@ -1163,14 +1191,13 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_ADDITIONAL_INSTRUCTION, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getAsNeededBoolean())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AS_NEEDED_BOOLEAN, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getAsNeededCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AS_NEEDED_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getDoseAndRate())) { foreach($vs as $v) { if (null === $v) { @@ -1183,36 +1210,30 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getMaxDosePerAdministration())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MAX_DOSE_PER_ADMINISTRATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getMaxDosePerLifetime())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MAX_DOSE_PER_LIFETIME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getMaxDosePerPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MAX_DOSE_PER_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getMethod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_METHOD, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getPatientInstruction())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATIENT_INSTRUCTION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRoute())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ROUTE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getSequence())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SEQUENCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSite())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SITE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getText())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TEXT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getTiming())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TIMING, null, $v->_getFHIRXMLNamespace())); } @@ -1229,8 +1250,15 @@ public function jsonSerialize() $a[self::FIELD_ADDITIONAL_INSTRUCTION] = $vs; } if (null !== ($v = $this->getAsNeededBoolean())) { - $a[self::FIELD_AS_NEEDED_BOOLEAN] = $v->getValue(); - $a[self::FIELD_AS_NEEDED_BOOLEAN_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_AS_NEEDED_BOOLEAN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_AS_NEEDED_BOOLEAN_EXT] = $enc; + } + } else { + $a[self::FIELD_AS_NEEDED_BOOLEAN] = $v; + } } if (null !== ($v = $this->getAsNeededCodeableConcept())) { $a[self::FIELD_AS_NEEDED_CODEABLE_CONCEPT] = $v; @@ -1239,10 +1267,26 @@ public function jsonSerialize() $a[self::FIELD_DOSE_AND_RATE] = $vs; } if (null !== ($v = $this->getMaxDosePerAdministration())) { - $a[self::FIELD_MAX_DOSE_PER_ADMINISTRATION] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MAX_DOSE_PER_ADMINISTRATION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MAX_DOSE_PER_ADMINISTRATION_EXT] = $enc; + } + } else { + $a[self::FIELD_MAX_DOSE_PER_ADMINISTRATION] = $v; + } } if (null !== ($v = $this->getMaxDosePerLifetime())) { - $a[self::FIELD_MAX_DOSE_PER_LIFETIME] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MAX_DOSE_PER_LIFETIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MAX_DOSE_PER_LIFETIME_EXT] = $enc; + } + } else { + $a[self::FIELD_MAX_DOSE_PER_LIFETIME] = $v; + } } if (null !== ($v = $this->getMaxDosePerPeriod())) { $a[self::FIELD_MAX_DOSE_PER_PERIOD] = $v; @@ -1251,22 +1295,43 @@ public function jsonSerialize() $a[self::FIELD_METHOD] = $v; } if (null !== ($v = $this->getPatientInstruction())) { - $a[self::FIELD_PATIENT_INSTRUCTION] = $v->getValue(); - $a[self::FIELD_PATIENT_INSTRUCTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PATIENT_INSTRUCTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PATIENT_INSTRUCTION_EXT] = $enc; + } + } else { + $a[self::FIELD_PATIENT_INSTRUCTION] = $v; + } } if (null !== ($v = $this->getRoute())) { $a[self::FIELD_ROUTE] = $v; } if (null !== ($v = $this->getSequence())) { - $a[self::FIELD_SEQUENCE] = $v->getValue(); - $a[self::FIELD_SEQUENCE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SEQUENCE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SEQUENCE_EXT] = $enc; + } + } else { + $a[self::FIELD_SEQUENCE] = $v; + } } if (null !== ($v = $this->getSite())) { $a[self::FIELD_SITE] = $v; } if (null !== ($v = $this->getText())) { - $a[self::FIELD_TEXT] = $v->getValue(); - $a[self::FIELD_TEXT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TEXT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TEXT_EXT] = $enc; + } + } else { + $a[self::FIELD_TEXT] = $v; + } } if (null !== ($v = $this->getTiming())) { $a[self::FIELD_TIMING] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRDosage/FHIRDosageDoseAndRate.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRDosage/FHIRDosageDoseAndRate.php index ac4156c1e3..06f58591c9 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRDosage/FHIRDosageDoseAndRate.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRDosage/FHIRDosageDoseAndRate.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -82,10 +82,6 @@ class FHIRDosageDoseAndRate extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DOSAGE_DOT_DOSE_AND_RATE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DOSE_QUANTITY = 'doseQuantity'; const FIELD_DOSE_QUANTITY_EXT = '_doseQuantity'; const FIELD_DOSE_RANGE = 'doseRange'; @@ -167,6 +163,9 @@ class FHIRDosageDoseAndRate extends FHIRBackboneElement */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRDosageDoseAndRate Constructor * @param null|array $data @@ -189,8 +188,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DOSE_QUANTITY] instanceof FHIRQuantity) { $this->setDoseQuantity($data[self::FIELD_DOSE_QUANTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_DOSE_QUANTITY])) { - $this->setDoseQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_DOSE_QUANTITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DOSE_QUANTITY])) { + $this->setDoseQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_DOSE_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_DOSE_QUANTITY])) { + $this->setDoseQuantity(new FHIRQuantity(array_merge($ext, $data[self::FIELD_DOSE_QUANTITY]))); + } } else { $this->setDoseQuantity(new FHIRQuantity($data[self::FIELD_DOSE_QUANTITY])); } @@ -208,8 +211,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_RATE_QUANTITY] instanceof FHIRQuantity) { $this->setRateQuantity($data[self::FIELD_RATE_QUANTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_RATE_QUANTITY])) { - $this->setRateQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_RATE_QUANTITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_RATE_QUANTITY])) { + $this->setRateQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_RATE_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_RATE_QUANTITY])) { + $this->setRateQuantity(new FHIRQuantity(array_merge($ext, $data[self::FIELD_RATE_QUANTITY]))); + } } else { $this->setRateQuantity(new FHIRQuantity($data[self::FIELD_RATE_QUANTITY])); } @@ -546,27 +553,21 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getDoseQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DOSE_QUANTITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDoseRange())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DOSE_RANGE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRateQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RATE_QUANTITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRateRange())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RATE_RANGE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRateRatio())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RATE_RATIO, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -580,13 +581,29 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getDoseQuantity())) { - $a[self::FIELD_DOSE_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DOSE_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DOSE_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_DOSE_QUANTITY] = $v; + } } if (null !== ($v = $this->getDoseRange())) { $a[self::FIELD_DOSE_RANGE] = $v; } if (null !== ($v = $this->getRateQuantity())) { - $a[self::FIELD_RATE_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_RATE_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_RATE_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_RATE_QUANTITY] = $v; + } } if (null !== ($v = $this->getRateRange())) { $a[self::FIELD_RATE_RANGE] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIREffectEvidenceSynthesis/FHIREffectEvidenceSynthesisCertainty.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIREffectEvidenceSynthesis/FHIREffectEvidenceSynthesisCertainty.php index 0c9f88dee7..f2b001f84b 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIREffectEvidenceSynthesis/FHIREffectEvidenceSynthesisCertainty.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIREffectEvidenceSynthesis/FHIREffectEvidenceSynthesisCertainty.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIREffectEvidenceSynthesisCertainty extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_EFFECT_EVIDENCE_SYNTHESIS_DOT_CERTAINTY; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CERTAINTY_SUBCOMPONENT = 'certaintySubcomponent'; const FIELD_NOTE = 'note'; const FIELD_RATING = 'rating'; @@ -123,6 +119,9 @@ class FHIREffectEvidenceSynthesisCertainty extends FHIRBackboneElement */ protected $rating = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIREffectEvidenceSynthesisCertainty Constructor * @param null|array $data @@ -142,6 +141,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CERTAINTY_SUBCOMPONENT])) { if (is_array($data[self::FIELD_CERTAINTY_SUBCOMPONENT])) { foreach($data[self::FIELD_CERTAINTY_SUBCOMPONENT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIREffectEvidenceSynthesisCertaintySubcomponent) { $this->addCertaintySubcomponent($v); } else { @@ -157,6 +159,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_NOTE])) { if (is_array($data[self::FIELD_NOTE])) { foreach($data[self::FIELD_NOTE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRAnnotation) { $this->addNote($v); } else { @@ -172,6 +177,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_RATING])) { if (is_array($data[self::FIELD_RATING])) { foreach($data[self::FIELD_RATING] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addRating($v); } else { @@ -474,7 +482,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getCertaintySubcomponent())) { foreach($vs as $v) { if (null === $v) { @@ -501,6 +508,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_RATING, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIREffectEvidenceSynthesis/FHIREffectEvidenceSynthesisCertaintySubcomponent.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIREffectEvidenceSynthesis/FHIREffectEvidenceSynthesisCertaintySubcomponent.php index 08a73d949b..3a7f684c6f 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIREffectEvidenceSynthesis/FHIREffectEvidenceSynthesisCertaintySubcomponent.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIREffectEvidenceSynthesis/FHIREffectEvidenceSynthesisCertaintySubcomponent.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIREffectEvidenceSynthesisCertaintySubcomponent extends FHIRBackboneEleme { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_EFFECT_EVIDENCE_SYNTHESIS_DOT_CERTAINTY_SUBCOMPONENT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_NOTE = 'note'; const FIELD_RATING = 'rating'; const FIELD_TYPE = 'type'; @@ -124,6 +120,9 @@ class FHIREffectEvidenceSynthesisCertaintySubcomponent extends FHIRBackboneEleme */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIREffectEvidenceSynthesisCertaintySubcomponent Constructor * @param null|array $data @@ -143,6 +142,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_NOTE])) { if (is_array($data[self::FIELD_NOTE])) { foreach($data[self::FIELD_NOTE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRAnnotation) { $this->addNote($v); } else { @@ -158,6 +160,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_RATING])) { if (is_array($data[self::FIELD_RATING])) { foreach($data[self::FIELD_RATING] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addRating($v); } else { @@ -441,7 +446,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getNote())) { foreach($vs as $v) { if (null === $v) { diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIREffectEvidenceSynthesis/FHIREffectEvidenceSynthesisEffectEstimate.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIREffectEvidenceSynthesis/FHIREffectEvidenceSynthesisEffectEstimate.php index 2cfd1a4600..7cd2a0a4f5 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIREffectEvidenceSynthesis/FHIREffectEvidenceSynthesisEffectEstimate.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIREffectEvidenceSynthesis/FHIREffectEvidenceSynthesisEffectEstimate.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -81,10 +81,6 @@ class FHIREffectEvidenceSynthesisEffectEstimate extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_EFFECT_EVIDENCE_SYNTHESIS_DOT_EFFECT_ESTIMATE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DESCRIPTION = 'description'; const FIELD_DESCRIPTION_EXT = '_description'; const FIELD_PRECISION_ESTIMATE = 'precisionEstimate'; @@ -164,6 +160,9 @@ class FHIREffectEvidenceSynthesisEffectEstimate extends FHIRBackboneElement */ protected $variantState = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIREffectEvidenceSynthesisEffectEstimate Constructor * @param null|array $data @@ -190,8 +189,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -199,6 +202,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PRECISION_ESTIMATE])) { if (is_array($data[self::FIELD_PRECISION_ESTIMATE])) { foreach($data[self::FIELD_PRECISION_ESTIMATE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIREffectEvidenceSynthesisPrecisionEstimate) { $this->addPrecisionEstimate($v); } else { @@ -231,8 +237,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE] instanceof FHIRDecimal) { $this->setValue($data[self::FIELD_VALUE]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE])) { - $this->setValue(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_VALUE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE])) { + $this->setValue(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_VALUE]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE])) { + $this->setValue(new FHIRDecimal(array_merge($ext, $data[self::FIELD_VALUE]))); + } } else { $this->setValue(new FHIRDecimal($data[self::FIELD_VALUE])); } @@ -604,7 +614,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESCRIPTION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getPrecisionEstimate())) { foreach($vs as $v) { if (null === $v) { @@ -617,14 +626,13 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getUnitOfMeasure())) { $v->xmlSerialize($sxe->addChild(self::FIELD_UNIT_OF_MEASURE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getValue())) { + $sxe->addAttribute(self::FIELD_VALUE, (string)$v); $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getVariantState())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VARIANT_STATE, null, $v->_getFHIRXMLNamespace())); } @@ -638,8 +646,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if ([] !== ($vs = $this->getPrecisionEstimate())) { $a[self::FIELD_PRECISION_ESTIMATE] = $vs; @@ -651,8 +666,15 @@ public function jsonSerialize() $a[self::FIELD_UNIT_OF_MEASURE] = $v; } if (null !== ($v = $this->getValue())) { - $a[self::FIELD_VALUE] = $v->getValue(); - $a[self::FIELD_VALUE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE] = $v; + } } if (null !== ($v = $this->getVariantState())) { $a[self::FIELD_VARIANT_STATE] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIREffectEvidenceSynthesis/FHIREffectEvidenceSynthesisPrecisionEstimate.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIREffectEvidenceSynthesis/FHIREffectEvidenceSynthesisPrecisionEstimate.php index bce0e6ed06..bb63d496fc 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIREffectEvidenceSynthesis/FHIREffectEvidenceSynthesisPrecisionEstimate.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIREffectEvidenceSynthesis/FHIREffectEvidenceSynthesisPrecisionEstimate.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIREffectEvidenceSynthesisPrecisionEstimate extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_EFFECT_EVIDENCE_SYNTHESIS_DOT_PRECISION_ESTIMATE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_FROM = 'from'; const FIELD_FROM_EXT = '_from'; const FIELD_LEVEL = 'level'; @@ -140,6 +136,9 @@ class FHIREffectEvidenceSynthesisPrecisionEstimate extends FHIRBackboneElement */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIREffectEvidenceSynthesisPrecisionEstimate Constructor * @param null|array $data @@ -162,8 +161,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_FROM] instanceof FHIRDecimal) { $this->setFrom($data[self::FIELD_FROM]); - } elseif ($ext && is_scalar($data[self::FIELD_FROM])) { - $this->setFrom(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_FROM]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_FROM])) { + $this->setFrom(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_FROM]] + $ext)); + } else if (is_array($data[self::FIELD_FROM])) { + $this->setFrom(new FHIRDecimal(array_merge($ext, $data[self::FIELD_FROM]))); + } } else { $this->setFrom(new FHIRDecimal($data[self::FIELD_FROM])); } @@ -174,8 +177,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_LEVEL] instanceof FHIRDecimal) { $this->setLevel($data[self::FIELD_LEVEL]); - } elseif ($ext && is_scalar($data[self::FIELD_LEVEL])) { - $this->setLevel(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_LEVEL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_LEVEL])) { + $this->setLevel(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_LEVEL]] + $ext)); + } else if (is_array($data[self::FIELD_LEVEL])) { + $this->setLevel(new FHIRDecimal(array_merge($ext, $data[self::FIELD_LEVEL]))); + } } else { $this->setLevel(new FHIRDecimal($data[self::FIELD_LEVEL])); } @@ -186,8 +193,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TO] instanceof FHIRDecimal) { $this->setTo($data[self::FIELD_TO]); - } elseif ($ext && is_scalar($data[self::FIELD_TO])) { - $this->setTo(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_TO]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TO])) { + $this->setTo(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_TO]] + $ext)); + } else if (is_array($data[self::FIELD_TO])) { + $this->setTo(new FHIRDecimal(array_merge($ext, $data[self::FIELD_TO]))); + } } else { $this->setTo(new FHIRDecimal($data[self::FIELD_TO])); } @@ -482,7 +493,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getTo())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TO, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -496,16 +506,37 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getFrom())) { - $a[self::FIELD_FROM] = $v->getValue(); - $a[self::FIELD_FROM_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FROM] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FROM_EXT] = $enc; + } + } else { + $a[self::FIELD_FROM] = $v; + } } if (null !== ($v = $this->getLevel())) { - $a[self::FIELD_LEVEL] = $v->getValue(); - $a[self::FIELD_LEVEL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_LEVEL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_LEVEL_EXT] = $enc; + } + } else { + $a[self::FIELD_LEVEL] = $v; + } } if (null !== ($v = $this->getTo())) { - $a[self::FIELD_TO] = $v->getValue(); - $a[self::FIELD_TO_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TO] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TO_EXT] = $enc; + } + } else { + $a[self::FIELD_TO] = $v; + } } if (null !== ($v = $this->getType())) { $a[self::FIELD_TYPE] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIREffectEvidenceSynthesis/FHIREffectEvidenceSynthesisResultsByExposure.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIREffectEvidenceSynthesis/FHIREffectEvidenceSynthesisResultsByExposure.php index 8d1f1cbdc2..0d67450b1b 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIREffectEvidenceSynthesis/FHIREffectEvidenceSynthesisResultsByExposure.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIREffectEvidenceSynthesis/FHIREffectEvidenceSynthesisResultsByExposure.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -82,10 +82,6 @@ class FHIREffectEvidenceSynthesisResultsByExposure extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_EFFECT_EVIDENCE_SYNTHESIS_DOT_RESULTS_BY_EXPOSURE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DESCRIPTION = 'description'; const FIELD_DESCRIPTION_EXT = '_description'; const FIELD_EXPOSURE_STATE = 'exposureState'; @@ -138,6 +134,9 @@ class FHIREffectEvidenceSynthesisResultsByExposure extends FHIRBackboneElement */ protected $variantState = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIREffectEvidenceSynthesisResultsByExposure Constructor * @param null|array $data @@ -160,8 +159,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -172,8 +175,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EXPOSURE_STATE] instanceof FHIRExposureState) { $this->setExposureState($data[self::FIELD_EXPOSURE_STATE]); - } elseif ($ext && is_scalar($data[self::FIELD_EXPOSURE_STATE])) { - $this->setExposureState(new FHIRExposureState([FHIRExposureState::FIELD_VALUE => $data[self::FIELD_EXPOSURE_STATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EXPOSURE_STATE])) { + $this->setExposureState(new FHIRExposureState([FHIRExposureState::FIELD_VALUE => $data[self::FIELD_EXPOSURE_STATE]] + $ext)); + } else if (is_array($data[self::FIELD_EXPOSURE_STATE])) { + $this->setExposureState(new FHIRExposureState(array_merge($ext, $data[self::FIELD_EXPOSURE_STATE]))); + } } else { $this->setExposureState(new FHIRExposureState($data[self::FIELD_EXPOSURE_STATE])); } @@ -441,15 +448,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESCRIPTION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getExposureState())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EXPOSURE_STATE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRiskEvidenceSynthesis())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RISK_EVIDENCE_SYNTHESIS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getVariantState())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VARIANT_STATE, null, $v->_getFHIRXMLNamespace())); } @@ -463,11 +467,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if (null !== ($v = $this->getExposureState())) { - $a[self::FIELD_EXPOSURE_STATE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EXPOSURE_STATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EXPOSURE_STATE_EXT] = $enc; + } + } else { + $a[self::FIELD_EXPOSURE_STATE] = $v; + } } if (null !== ($v = $this->getRiskEvidenceSynthesis())) { $a[self::FIELD_RISK_EVIDENCE_SYNTHESIS] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIREffectEvidenceSynthesis/FHIREffectEvidenceSynthesisSampleSize.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIREffectEvidenceSynthesis/FHIREffectEvidenceSynthesisSampleSize.php index c74f79a2c9..c6110710f6 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIREffectEvidenceSynthesis/FHIREffectEvidenceSynthesisSampleSize.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIREffectEvidenceSynthesis/FHIREffectEvidenceSynthesisSampleSize.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIREffectEvidenceSynthesisSampleSize extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_EFFECT_EVIDENCE_SYNTHESIS_DOT_SAMPLE_SIZE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DESCRIPTION = 'description'; const FIELD_DESCRIPTION_EXT = '_description'; const FIELD_NUMBER_OF_PARTICIPANTS = 'numberOfParticipants'; @@ -124,6 +120,9 @@ class FHIREffectEvidenceSynthesisSampleSize extends FHIRBackboneElement */ protected $numberOfStudies = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIREffectEvidenceSynthesisSampleSize Constructor * @param null|array $data @@ -146,8 +145,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -158,8 +161,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NUMBER_OF_PARTICIPANTS] instanceof FHIRInteger) { $this->setNumberOfParticipants($data[self::FIELD_NUMBER_OF_PARTICIPANTS]); - } elseif ($ext && is_scalar($data[self::FIELD_NUMBER_OF_PARTICIPANTS])) { - $this->setNumberOfParticipants(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_NUMBER_OF_PARTICIPANTS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NUMBER_OF_PARTICIPANTS])) { + $this->setNumberOfParticipants(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_NUMBER_OF_PARTICIPANTS]] + $ext)); + } else if (is_array($data[self::FIELD_NUMBER_OF_PARTICIPANTS])) { + $this->setNumberOfParticipants(new FHIRInteger(array_merge($ext, $data[self::FIELD_NUMBER_OF_PARTICIPANTS]))); + } } else { $this->setNumberOfParticipants(new FHIRInteger($data[self::FIELD_NUMBER_OF_PARTICIPANTS])); } @@ -170,8 +177,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NUMBER_OF_STUDIES] instanceof FHIRInteger) { $this->setNumberOfStudies($data[self::FIELD_NUMBER_OF_STUDIES]); - } elseif ($ext && is_scalar($data[self::FIELD_NUMBER_OF_STUDIES])) { - $this->setNumberOfStudies(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_NUMBER_OF_STUDIES]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NUMBER_OF_STUDIES])) { + $this->setNumberOfStudies(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_NUMBER_OF_STUDIES]] + $ext)); + } else if (is_array($data[self::FIELD_NUMBER_OF_STUDIES])) { + $this->setNumberOfStudies(new FHIRInteger(array_merge($ext, $data[self::FIELD_NUMBER_OF_STUDIES]))); + } } else { $this->setNumberOfStudies(new FHIRInteger($data[self::FIELD_NUMBER_OF_STUDIES])); } @@ -428,16 +439,37 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if (null !== ($v = $this->getNumberOfParticipants())) { - $a[self::FIELD_NUMBER_OF_PARTICIPANTS] = $v->getValue(); - $a[self::FIELD_NUMBER_OF_PARTICIPANTS_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NUMBER_OF_PARTICIPANTS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NUMBER_OF_PARTICIPANTS_EXT] = $enc; + } + } else { + $a[self::FIELD_NUMBER_OF_PARTICIPANTS] = $v; + } } if (null !== ($v = $this->getNumberOfStudies())) { - $a[self::FIELD_NUMBER_OF_STUDIES] = $v->getValue(); - $a[self::FIELD_NUMBER_OF_STUDIES_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NUMBER_OF_STUDIES] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NUMBER_OF_STUDIES_EXT] = $enc; + } + } else { + $a[self::FIELD_NUMBER_OF_STUDIES] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRElementDefinition.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRElementDefinition.php index 14c9b51427..646f2f42c0 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRElementDefinition.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRElementDefinition.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -134,10 +134,6 @@ class FHIRElementDefinition extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ELEMENT_DEFINITION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ALIAS = 'alias'; const FIELD_ALIAS_EXT = '_alias'; const FIELD_BASE = 'base'; @@ -152,6 +148,7 @@ class FHIRElementDefinition extends FHIRBackboneElement const FIELD_CONTENT_REFERENCE_EXT = '_contentReference'; const FIELD_DEFAULT_VALUE_ADDRESS = 'defaultValueAddress'; const FIELD_DEFAULT_VALUE_AGE = 'defaultValueAge'; + const FIELD_DEFAULT_VALUE_AGE_EXT = '_defaultValueAge'; const FIELD_DEFAULT_VALUE_ANNOTATION = 'defaultValueAnnotation'; const FIELD_DEFAULT_VALUE_ATTACHMENT = 'defaultValueAttachment'; const FIELD_DEFAULT_VALUE_BASE_64BINARY = 'defaultValueBase64Binary'; @@ -169,6 +166,7 @@ class FHIRElementDefinition extends FHIRBackboneElement const FIELD_DEFAULT_VALUE_CONTACT_POINT_EXT = '_defaultValueContactPoint'; const FIELD_DEFAULT_VALUE_CONTRIBUTOR = 'defaultValueContributor'; const FIELD_DEFAULT_VALUE_COUNT = 'defaultValueCount'; + const FIELD_DEFAULT_VALUE_COUNT_EXT = '_defaultValueCount'; const FIELD_DEFAULT_VALUE_DATA_REQUIREMENT = 'defaultValueDataRequirement'; const FIELD_DEFAULT_VALUE_DATE = 'defaultValueDate'; const FIELD_DEFAULT_VALUE_DATE_EXT = '_defaultValueDate'; @@ -177,8 +175,10 @@ class FHIRElementDefinition extends FHIRBackboneElement const FIELD_DEFAULT_VALUE_DECIMAL = 'defaultValueDecimal'; const FIELD_DEFAULT_VALUE_DECIMAL_EXT = '_defaultValueDecimal'; const FIELD_DEFAULT_VALUE_DISTANCE = 'defaultValueDistance'; + const FIELD_DEFAULT_VALUE_DISTANCE_EXT = '_defaultValueDistance'; const FIELD_DEFAULT_VALUE_DOSAGE = 'defaultValueDosage'; const FIELD_DEFAULT_VALUE_DURATION = 'defaultValueDuration'; + const FIELD_DEFAULT_VALUE_DURATION_EXT = '_defaultValueDuration'; const FIELD_DEFAULT_VALUE_EXPRESSION = 'defaultValueExpression'; const FIELD_DEFAULT_VALUE_HUMAN_NAME = 'defaultValueHumanName'; const FIELD_DEFAULT_VALUE_ID = 'defaultValueId'; @@ -228,6 +228,7 @@ class FHIRElementDefinition extends FHIRBackboneElement const FIELD_EXAMPLE = 'example'; const FIELD_FIXED_ADDRESS = 'fixedAddress'; const FIELD_FIXED_AGE = 'fixedAge'; + const FIELD_FIXED_AGE_EXT = '_fixedAge'; const FIELD_FIXED_ANNOTATION = 'fixedAnnotation'; const FIELD_FIXED_ATTACHMENT = 'fixedAttachment'; const FIELD_FIXED_BASE_64BINARY = 'fixedBase64Binary'; @@ -245,6 +246,7 @@ class FHIRElementDefinition extends FHIRBackboneElement const FIELD_FIXED_CONTACT_POINT_EXT = '_fixedContactPoint'; const FIELD_FIXED_CONTRIBUTOR = 'fixedContributor'; const FIELD_FIXED_COUNT = 'fixedCount'; + const FIELD_FIXED_COUNT_EXT = '_fixedCount'; const FIELD_FIXED_DATA_REQUIREMENT = 'fixedDataRequirement'; const FIELD_FIXED_DATE = 'fixedDate'; const FIELD_FIXED_DATE_EXT = '_fixedDate'; @@ -253,8 +255,10 @@ class FHIRElementDefinition extends FHIRBackboneElement const FIELD_FIXED_DECIMAL = 'fixedDecimal'; const FIELD_FIXED_DECIMAL_EXT = '_fixedDecimal'; const FIELD_FIXED_DISTANCE = 'fixedDistance'; + const FIELD_FIXED_DISTANCE_EXT = '_fixedDistance'; const FIELD_FIXED_DOSAGE = 'fixedDosage'; const FIELD_FIXED_DURATION = 'fixedDuration'; + const FIELD_FIXED_DURATION_EXT = '_fixedDuration'; const FIELD_FIXED_EXPRESSION = 'fixedExpression'; const FIELD_FIXED_HUMAN_NAME = 'fixedHumanName'; const FIELD_FIXED_ID = 'fixedId'; @@ -360,6 +364,7 @@ class FHIRElementDefinition extends FHIRBackboneElement const FIELD_PATH_EXT = '_path'; const FIELD_PATTERN_ADDRESS = 'patternAddress'; const FIELD_PATTERN_AGE = 'patternAge'; + const FIELD_PATTERN_AGE_EXT = '_patternAge'; const FIELD_PATTERN_ANNOTATION = 'patternAnnotation'; const FIELD_PATTERN_ATTACHMENT = 'patternAttachment'; const FIELD_PATTERN_BASE_64BINARY = 'patternBase64Binary'; @@ -377,6 +382,7 @@ class FHIRElementDefinition extends FHIRBackboneElement const FIELD_PATTERN_CONTACT_POINT_EXT = '_patternContactPoint'; const FIELD_PATTERN_CONTRIBUTOR = 'patternContributor'; const FIELD_PATTERN_COUNT = 'patternCount'; + const FIELD_PATTERN_COUNT_EXT = '_patternCount'; const FIELD_PATTERN_DATA_REQUIREMENT = 'patternDataRequirement'; const FIELD_PATTERN_DATE = 'patternDate'; const FIELD_PATTERN_DATE_EXT = '_patternDate'; @@ -385,8 +391,10 @@ class FHIRElementDefinition extends FHIRBackboneElement const FIELD_PATTERN_DECIMAL = 'patternDecimal'; const FIELD_PATTERN_DECIMAL_EXT = '_patternDecimal'; const FIELD_PATTERN_DISTANCE = 'patternDistance'; + const FIELD_PATTERN_DISTANCE_EXT = '_patternDistance'; const FIELD_PATTERN_DOSAGE = 'patternDosage'; const FIELD_PATTERN_DURATION = 'patternDuration'; + const FIELD_PATTERN_DURATION_EXT = '_patternDuration'; const FIELD_PATTERN_EXPRESSION = 'patternExpression'; const FIELD_PATTERN_HUMAN_NAME = 'patternHumanName'; const FIELD_PATTERN_ID = 'patternId'; @@ -3791,6 +3799,9 @@ class FHIRElementDefinition extends FHIRBackboneElement */ protected $type = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRElementDefinition Constructor * @param null|array $data @@ -3813,17 +3824,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_ALIAS])) { foreach($data[self::FIELD_ALIAS] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRString) { $this->addAlias($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addAlias(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addAlias(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addAlias(new FHIRString(array_merge($v, $ext[$i]))); + } } else { $this->addAlias(new FHIRString($v)); } } } elseif ($data[self::FIELD_ALIAS] instanceof FHIRString) { $this->addAlias($data[self::FIELD_ALIAS]); - } elseif ($ext && is_scalar($data[self::FIELD_ALIAS])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_ALIAS])) { $this->addAlias(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_ALIAS]] + $ext)); } else { $this->addAlias(new FHIRString($data[self::FIELD_ALIAS])); @@ -3846,6 +3864,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CODE])) { if (is_array($data[self::FIELD_CODE])) { foreach($data[self::FIELD_CODE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCoding) { $this->addCode($v); } else { @@ -3864,8 +3885,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_COMMENT] instanceof FHIRMarkdown) { $this->setComment($data[self::FIELD_COMMENT]); - } elseif ($ext && is_scalar($data[self::FIELD_COMMENT])) { - $this->setComment(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_COMMENT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_COMMENT])) { + $this->setComment(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_COMMENT]] + $ext)); + } else if (is_array($data[self::FIELD_COMMENT])) { + $this->setComment(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_COMMENT]))); + } } else { $this->setComment(new FHIRMarkdown($data[self::FIELD_COMMENT])); } @@ -3876,17 +3901,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_CONDITION])) { foreach($data[self::FIELD_CONDITION] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRId) { $this->addCondition($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addCondition(new FHIRId([FHIRId::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addCondition(new FHIRId([FHIRId::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addCondition(new FHIRId(array_merge($v, $ext[$i]))); + } } else { $this->addCondition(new FHIRId($v)); } } } elseif ($data[self::FIELD_CONDITION] instanceof FHIRId) { $this->addCondition($data[self::FIELD_CONDITION]); - } elseif ($ext && is_scalar($data[self::FIELD_CONDITION])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_CONDITION])) { $this->addCondition(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_CONDITION]] + $ext)); } else { $this->addCondition(new FHIRId($data[self::FIELD_CONDITION])); @@ -3895,6 +3927,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CONSTRAINT])) { if (is_array($data[self::FIELD_CONSTRAINT])) { foreach($data[self::FIELD_CONSTRAINT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRElementDefinitionConstraint) { $this->addConstraint($v); } else { @@ -3913,8 +3948,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CONTENT_REFERENCE] instanceof FHIRUri) { $this->setContentReference($data[self::FIELD_CONTENT_REFERENCE]); - } elseif ($ext && is_scalar($data[self::FIELD_CONTENT_REFERENCE])) { - $this->setContentReference(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_CONTENT_REFERENCE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CONTENT_REFERENCE])) { + $this->setContentReference(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_CONTENT_REFERENCE]] + $ext)); + } else if (is_array($data[self::FIELD_CONTENT_REFERENCE])) { + $this->setContentReference(new FHIRUri(array_merge($ext, $data[self::FIELD_CONTENT_REFERENCE]))); + } } else { $this->setContentReference(new FHIRUri($data[self::FIELD_CONTENT_REFERENCE])); } @@ -3927,8 +3966,17 @@ public function __construct($data = null) } } if (isset($data[self::FIELD_DEFAULT_VALUE_AGE])) { + $ext = (isset($data[self::FIELD_DEFAULT_VALUE_AGE_EXT]) && is_array($data[self::FIELD_DEFAULT_VALUE_AGE_EXT])) + ? $data[self::FIELD_DEFAULT_VALUE_AGE_EXT] + : null; if ($data[self::FIELD_DEFAULT_VALUE_AGE] instanceof FHIRAge) { $this->setDefaultValueAge($data[self::FIELD_DEFAULT_VALUE_AGE]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DEFAULT_VALUE_AGE])) { + $this->setDefaultValueAge(new FHIRAge([FHIRAge::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_AGE]] + $ext)); + } else if (is_array($data[self::FIELD_DEFAULT_VALUE_AGE])) { + $this->setDefaultValueAge(new FHIRAge(array_merge($ext, $data[self::FIELD_DEFAULT_VALUE_AGE]))); + } } else { $this->setDefaultValueAge(new FHIRAge($data[self::FIELD_DEFAULT_VALUE_AGE])); } @@ -3953,8 +4001,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DEFAULT_VALUE_BASE_64BINARY] instanceof FHIRBase64Binary) { $this->setDefaultValueBase64Binary($data[self::FIELD_DEFAULT_VALUE_BASE_64BINARY]); - } elseif ($ext && is_scalar($data[self::FIELD_DEFAULT_VALUE_BASE_64BINARY])) { - $this->setDefaultValueBase64Binary(new FHIRBase64Binary([FHIRBase64Binary::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_BASE_64BINARY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DEFAULT_VALUE_BASE_64BINARY])) { + $this->setDefaultValueBase64Binary(new FHIRBase64Binary([FHIRBase64Binary::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_BASE_64BINARY]] + $ext)); + } else if (is_array($data[self::FIELD_DEFAULT_VALUE_BASE_64BINARY])) { + $this->setDefaultValueBase64Binary(new FHIRBase64Binary(array_merge($ext, $data[self::FIELD_DEFAULT_VALUE_BASE_64BINARY]))); + } } else { $this->setDefaultValueBase64Binary(new FHIRBase64Binary($data[self::FIELD_DEFAULT_VALUE_BASE_64BINARY])); } @@ -3965,8 +4017,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DEFAULT_VALUE_BOOLEAN] instanceof FHIRBoolean) { $this->setDefaultValueBoolean($data[self::FIELD_DEFAULT_VALUE_BOOLEAN]); - } elseif ($ext && is_scalar($data[self::FIELD_DEFAULT_VALUE_BOOLEAN])) { - $this->setDefaultValueBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_BOOLEAN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DEFAULT_VALUE_BOOLEAN])) { + $this->setDefaultValueBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_BOOLEAN]] + $ext)); + } else if (is_array($data[self::FIELD_DEFAULT_VALUE_BOOLEAN])) { + $this->setDefaultValueBoolean(new FHIRBoolean(array_merge($ext, $data[self::FIELD_DEFAULT_VALUE_BOOLEAN]))); + } } else { $this->setDefaultValueBoolean(new FHIRBoolean($data[self::FIELD_DEFAULT_VALUE_BOOLEAN])); } @@ -3977,8 +4033,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DEFAULT_VALUE_CANONICAL] instanceof FHIRCanonical) { $this->setDefaultValueCanonical($data[self::FIELD_DEFAULT_VALUE_CANONICAL]); - } elseif ($ext && is_scalar($data[self::FIELD_DEFAULT_VALUE_CANONICAL])) { - $this->setDefaultValueCanonical(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_CANONICAL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DEFAULT_VALUE_CANONICAL])) { + $this->setDefaultValueCanonical(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_CANONICAL]] + $ext)); + } else if (is_array($data[self::FIELD_DEFAULT_VALUE_CANONICAL])) { + $this->setDefaultValueCanonical(new FHIRCanonical(array_merge($ext, $data[self::FIELD_DEFAULT_VALUE_CANONICAL]))); + } } else { $this->setDefaultValueCanonical(new FHIRCanonical($data[self::FIELD_DEFAULT_VALUE_CANONICAL])); } @@ -3989,8 +4049,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DEFAULT_VALUE_CODE] instanceof FHIRCode) { $this->setDefaultValueCode($data[self::FIELD_DEFAULT_VALUE_CODE]); - } elseif ($ext && is_scalar($data[self::FIELD_DEFAULT_VALUE_CODE])) { - $this->setDefaultValueCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_CODE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DEFAULT_VALUE_CODE])) { + $this->setDefaultValueCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_CODE]] + $ext)); + } else if (is_array($data[self::FIELD_DEFAULT_VALUE_CODE])) { + $this->setDefaultValueCode(new FHIRCode(array_merge($ext, $data[self::FIELD_DEFAULT_VALUE_CODE]))); + } } else { $this->setDefaultValueCode(new FHIRCode($data[self::FIELD_DEFAULT_VALUE_CODE])); } @@ -4022,8 +4086,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DEFAULT_VALUE_CONTACT_POINT] instanceof FHIRContactPoint) { $this->setDefaultValueContactPoint($data[self::FIELD_DEFAULT_VALUE_CONTACT_POINT]); - } elseif ($ext && is_scalar($data[self::FIELD_DEFAULT_VALUE_CONTACT_POINT])) { - $this->setDefaultValueContactPoint(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_CONTACT_POINT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DEFAULT_VALUE_CONTACT_POINT])) { + $this->setDefaultValueContactPoint(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_CONTACT_POINT]] + $ext)); + } else if (is_array($data[self::FIELD_DEFAULT_VALUE_CONTACT_POINT])) { + $this->setDefaultValueContactPoint(new FHIRContactPoint(array_merge($ext, $data[self::FIELD_DEFAULT_VALUE_CONTACT_POINT]))); + } } else { $this->setDefaultValueContactPoint(new FHIRContactPoint($data[self::FIELD_DEFAULT_VALUE_CONTACT_POINT])); } @@ -4036,8 +4104,17 @@ public function __construct($data = null) } } if (isset($data[self::FIELD_DEFAULT_VALUE_COUNT])) { + $ext = (isset($data[self::FIELD_DEFAULT_VALUE_COUNT_EXT]) && is_array($data[self::FIELD_DEFAULT_VALUE_COUNT_EXT])) + ? $data[self::FIELD_DEFAULT_VALUE_COUNT_EXT] + : null; if ($data[self::FIELD_DEFAULT_VALUE_COUNT] instanceof FHIRCount) { $this->setDefaultValueCount($data[self::FIELD_DEFAULT_VALUE_COUNT]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DEFAULT_VALUE_COUNT])) { + $this->setDefaultValueCount(new FHIRCount([FHIRCount::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_COUNT]] + $ext)); + } else if (is_array($data[self::FIELD_DEFAULT_VALUE_COUNT])) { + $this->setDefaultValueCount(new FHIRCount(array_merge($ext, $data[self::FIELD_DEFAULT_VALUE_COUNT]))); + } } else { $this->setDefaultValueCount(new FHIRCount($data[self::FIELD_DEFAULT_VALUE_COUNT])); } @@ -4055,8 +4132,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DEFAULT_VALUE_DATE] instanceof FHIRDate) { $this->setDefaultValueDate($data[self::FIELD_DEFAULT_VALUE_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_DEFAULT_VALUE_DATE])) { - $this->setDefaultValueDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DEFAULT_VALUE_DATE])) { + $this->setDefaultValueDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_DEFAULT_VALUE_DATE])) { + $this->setDefaultValueDate(new FHIRDate(array_merge($ext, $data[self::FIELD_DEFAULT_VALUE_DATE]))); + } } else { $this->setDefaultValueDate(new FHIRDate($data[self::FIELD_DEFAULT_VALUE_DATE])); } @@ -4067,8 +4148,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DEFAULT_VALUE_DATE_TIME] instanceof FHIRDateTime) { $this->setDefaultValueDateTime($data[self::FIELD_DEFAULT_VALUE_DATE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_DEFAULT_VALUE_DATE_TIME])) { - $this->setDefaultValueDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_DATE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DEFAULT_VALUE_DATE_TIME])) { + $this->setDefaultValueDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_DATE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_DEFAULT_VALUE_DATE_TIME])) { + $this->setDefaultValueDateTime(new FHIRDateTime(array_merge($ext, $data[self::FIELD_DEFAULT_VALUE_DATE_TIME]))); + } } else { $this->setDefaultValueDateTime(new FHIRDateTime($data[self::FIELD_DEFAULT_VALUE_DATE_TIME])); } @@ -4079,15 +4164,28 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DEFAULT_VALUE_DECIMAL] instanceof FHIRDecimal) { $this->setDefaultValueDecimal($data[self::FIELD_DEFAULT_VALUE_DECIMAL]); - } elseif ($ext && is_scalar($data[self::FIELD_DEFAULT_VALUE_DECIMAL])) { - $this->setDefaultValueDecimal(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_DECIMAL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DEFAULT_VALUE_DECIMAL])) { + $this->setDefaultValueDecimal(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_DECIMAL]] + $ext)); + } else if (is_array($data[self::FIELD_DEFAULT_VALUE_DECIMAL])) { + $this->setDefaultValueDecimal(new FHIRDecimal(array_merge($ext, $data[self::FIELD_DEFAULT_VALUE_DECIMAL]))); + } } else { $this->setDefaultValueDecimal(new FHIRDecimal($data[self::FIELD_DEFAULT_VALUE_DECIMAL])); } } if (isset($data[self::FIELD_DEFAULT_VALUE_DISTANCE])) { + $ext = (isset($data[self::FIELD_DEFAULT_VALUE_DISTANCE_EXT]) && is_array($data[self::FIELD_DEFAULT_VALUE_DISTANCE_EXT])) + ? $data[self::FIELD_DEFAULT_VALUE_DISTANCE_EXT] + : null; if ($data[self::FIELD_DEFAULT_VALUE_DISTANCE] instanceof FHIRDistance) { $this->setDefaultValueDistance($data[self::FIELD_DEFAULT_VALUE_DISTANCE]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DEFAULT_VALUE_DISTANCE])) { + $this->setDefaultValueDistance(new FHIRDistance([FHIRDistance::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_DISTANCE]] + $ext)); + } else if (is_array($data[self::FIELD_DEFAULT_VALUE_DISTANCE])) { + $this->setDefaultValueDistance(new FHIRDistance(array_merge($ext, $data[self::FIELD_DEFAULT_VALUE_DISTANCE]))); + } } else { $this->setDefaultValueDistance(new FHIRDistance($data[self::FIELD_DEFAULT_VALUE_DISTANCE])); } @@ -4100,8 +4198,17 @@ public function __construct($data = null) } } if (isset($data[self::FIELD_DEFAULT_VALUE_DURATION])) { + $ext = (isset($data[self::FIELD_DEFAULT_VALUE_DURATION_EXT]) && is_array($data[self::FIELD_DEFAULT_VALUE_DURATION_EXT])) + ? $data[self::FIELD_DEFAULT_VALUE_DURATION_EXT] + : null; if ($data[self::FIELD_DEFAULT_VALUE_DURATION] instanceof FHIRDuration) { $this->setDefaultValueDuration($data[self::FIELD_DEFAULT_VALUE_DURATION]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DEFAULT_VALUE_DURATION])) { + $this->setDefaultValueDuration(new FHIRDuration([FHIRDuration::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_DURATION]] + $ext)); + } else if (is_array($data[self::FIELD_DEFAULT_VALUE_DURATION])) { + $this->setDefaultValueDuration(new FHIRDuration(array_merge($ext, $data[self::FIELD_DEFAULT_VALUE_DURATION]))); + } } else { $this->setDefaultValueDuration(new FHIRDuration($data[self::FIELD_DEFAULT_VALUE_DURATION])); } @@ -4126,8 +4233,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DEFAULT_VALUE_ID] instanceof FHIRId) { $this->setDefaultValueId($data[self::FIELD_DEFAULT_VALUE_ID]); - } elseif ($ext && is_scalar($data[self::FIELD_DEFAULT_VALUE_ID])) { - $this->setDefaultValueId(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_ID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DEFAULT_VALUE_ID])) { + $this->setDefaultValueId(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_ID]] + $ext)); + } else if (is_array($data[self::FIELD_DEFAULT_VALUE_ID])) { + $this->setDefaultValueId(new FHIRId(array_merge($ext, $data[self::FIELD_DEFAULT_VALUE_ID]))); + } } else { $this->setDefaultValueId(new FHIRId($data[self::FIELD_DEFAULT_VALUE_ID])); } @@ -4138,8 +4249,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DEFAULT_VALUE_IDENTIFIER] instanceof FHIRIdentifier) { $this->setDefaultValueIdentifier($data[self::FIELD_DEFAULT_VALUE_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_DEFAULT_VALUE_IDENTIFIER])) { - $this->setDefaultValueIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DEFAULT_VALUE_IDENTIFIER])) { + $this->setDefaultValueIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_DEFAULT_VALUE_IDENTIFIER])) { + $this->setDefaultValueIdentifier(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_DEFAULT_VALUE_IDENTIFIER]))); + } } else { $this->setDefaultValueIdentifier(new FHIRIdentifier($data[self::FIELD_DEFAULT_VALUE_IDENTIFIER])); } @@ -4150,8 +4265,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DEFAULT_VALUE_INSTANT] instanceof FHIRInstant) { $this->setDefaultValueInstant($data[self::FIELD_DEFAULT_VALUE_INSTANT]); - } elseif ($ext && is_scalar($data[self::FIELD_DEFAULT_VALUE_INSTANT])) { - $this->setDefaultValueInstant(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_INSTANT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DEFAULT_VALUE_INSTANT])) { + $this->setDefaultValueInstant(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_INSTANT]] + $ext)); + } else if (is_array($data[self::FIELD_DEFAULT_VALUE_INSTANT])) { + $this->setDefaultValueInstant(new FHIRInstant(array_merge($ext, $data[self::FIELD_DEFAULT_VALUE_INSTANT]))); + } } else { $this->setDefaultValueInstant(new FHIRInstant($data[self::FIELD_DEFAULT_VALUE_INSTANT])); } @@ -4162,8 +4281,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DEFAULT_VALUE_INTEGER] instanceof FHIRInteger) { $this->setDefaultValueInteger($data[self::FIELD_DEFAULT_VALUE_INTEGER]); - } elseif ($ext && is_scalar($data[self::FIELD_DEFAULT_VALUE_INTEGER])) { - $this->setDefaultValueInteger(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_INTEGER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DEFAULT_VALUE_INTEGER])) { + $this->setDefaultValueInteger(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_INTEGER]] + $ext)); + } else if (is_array($data[self::FIELD_DEFAULT_VALUE_INTEGER])) { + $this->setDefaultValueInteger(new FHIRInteger(array_merge($ext, $data[self::FIELD_DEFAULT_VALUE_INTEGER]))); + } } else { $this->setDefaultValueInteger(new FHIRInteger($data[self::FIELD_DEFAULT_VALUE_INTEGER])); } @@ -4174,8 +4297,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DEFAULT_VALUE_MARKDOWN] instanceof FHIRMarkdown) { $this->setDefaultValueMarkdown($data[self::FIELD_DEFAULT_VALUE_MARKDOWN]); - } elseif ($ext && is_scalar($data[self::FIELD_DEFAULT_VALUE_MARKDOWN])) { - $this->setDefaultValueMarkdown(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_MARKDOWN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DEFAULT_VALUE_MARKDOWN])) { + $this->setDefaultValueMarkdown(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_MARKDOWN]] + $ext)); + } else if (is_array($data[self::FIELD_DEFAULT_VALUE_MARKDOWN])) { + $this->setDefaultValueMarkdown(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_DEFAULT_VALUE_MARKDOWN]))); + } } else { $this->setDefaultValueMarkdown(new FHIRMarkdown($data[self::FIELD_DEFAULT_VALUE_MARKDOWN])); } @@ -4193,8 +4320,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DEFAULT_VALUE_MONEY] instanceof FHIRMoney) { $this->setDefaultValueMoney($data[self::FIELD_DEFAULT_VALUE_MONEY]); - } elseif ($ext && is_scalar($data[self::FIELD_DEFAULT_VALUE_MONEY])) { - $this->setDefaultValueMoney(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_MONEY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DEFAULT_VALUE_MONEY])) { + $this->setDefaultValueMoney(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_MONEY]] + $ext)); + } else if (is_array($data[self::FIELD_DEFAULT_VALUE_MONEY])) { + $this->setDefaultValueMoney(new FHIRMoney(array_merge($ext, $data[self::FIELD_DEFAULT_VALUE_MONEY]))); + } } else { $this->setDefaultValueMoney(new FHIRMoney($data[self::FIELD_DEFAULT_VALUE_MONEY])); } @@ -4205,8 +4336,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DEFAULT_VALUE_OID] instanceof FHIROid) { $this->setDefaultValueOid($data[self::FIELD_DEFAULT_VALUE_OID]); - } elseif ($ext && is_scalar($data[self::FIELD_DEFAULT_VALUE_OID])) { - $this->setDefaultValueOid(new FHIROid([FHIROid::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_OID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DEFAULT_VALUE_OID])) { + $this->setDefaultValueOid(new FHIROid([FHIROid::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_OID]] + $ext)); + } else if (is_array($data[self::FIELD_DEFAULT_VALUE_OID])) { + $this->setDefaultValueOid(new FHIROid(array_merge($ext, $data[self::FIELD_DEFAULT_VALUE_OID]))); + } } else { $this->setDefaultValueOid(new FHIROid($data[self::FIELD_DEFAULT_VALUE_OID])); } @@ -4231,8 +4366,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DEFAULT_VALUE_POSITIVE_INT] instanceof FHIRPositiveInt) { $this->setDefaultValuePositiveInt($data[self::FIELD_DEFAULT_VALUE_POSITIVE_INT]); - } elseif ($ext && is_scalar($data[self::FIELD_DEFAULT_VALUE_POSITIVE_INT])) { - $this->setDefaultValuePositiveInt(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_POSITIVE_INT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DEFAULT_VALUE_POSITIVE_INT])) { + $this->setDefaultValuePositiveInt(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_POSITIVE_INT]] + $ext)); + } else if (is_array($data[self::FIELD_DEFAULT_VALUE_POSITIVE_INT])) { + $this->setDefaultValuePositiveInt(new FHIRPositiveInt(array_merge($ext, $data[self::FIELD_DEFAULT_VALUE_POSITIVE_INT]))); + } } else { $this->setDefaultValuePositiveInt(new FHIRPositiveInt($data[self::FIELD_DEFAULT_VALUE_POSITIVE_INT])); } @@ -4243,8 +4382,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DEFAULT_VALUE_QUANTITY] instanceof FHIRQuantity) { $this->setDefaultValueQuantity($data[self::FIELD_DEFAULT_VALUE_QUANTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_DEFAULT_VALUE_QUANTITY])) { - $this->setDefaultValueQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_QUANTITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DEFAULT_VALUE_QUANTITY])) { + $this->setDefaultValueQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_DEFAULT_VALUE_QUANTITY])) { + $this->setDefaultValueQuantity(new FHIRQuantity(array_merge($ext, $data[self::FIELD_DEFAULT_VALUE_QUANTITY]))); + } } else { $this->setDefaultValueQuantity(new FHIRQuantity($data[self::FIELD_DEFAULT_VALUE_QUANTITY])); } @@ -4297,8 +4440,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DEFAULT_VALUE_STRING] instanceof FHIRString) { $this->setDefaultValueString($data[self::FIELD_DEFAULT_VALUE_STRING]); - } elseif ($ext && is_scalar($data[self::FIELD_DEFAULT_VALUE_STRING])) { - $this->setDefaultValueString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_STRING]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DEFAULT_VALUE_STRING])) { + $this->setDefaultValueString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_STRING]] + $ext)); + } else if (is_array($data[self::FIELD_DEFAULT_VALUE_STRING])) { + $this->setDefaultValueString(new FHIRString(array_merge($ext, $data[self::FIELD_DEFAULT_VALUE_STRING]))); + } } else { $this->setDefaultValueString(new FHIRString($data[self::FIELD_DEFAULT_VALUE_STRING])); } @@ -4309,8 +4456,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DEFAULT_VALUE_TIME] instanceof FHIRTime) { $this->setDefaultValueTime($data[self::FIELD_DEFAULT_VALUE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_DEFAULT_VALUE_TIME])) { - $this->setDefaultValueTime(new FHIRTime([FHIRTime::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DEFAULT_VALUE_TIME])) { + $this->setDefaultValueTime(new FHIRTime([FHIRTime::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_DEFAULT_VALUE_TIME])) { + $this->setDefaultValueTime(new FHIRTime(array_merge($ext, $data[self::FIELD_DEFAULT_VALUE_TIME]))); + } } else { $this->setDefaultValueTime(new FHIRTime($data[self::FIELD_DEFAULT_VALUE_TIME])); } @@ -4335,8 +4486,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DEFAULT_VALUE_UNSIGNED_INT] instanceof FHIRUnsignedInt) { $this->setDefaultValueUnsignedInt($data[self::FIELD_DEFAULT_VALUE_UNSIGNED_INT]); - } elseif ($ext && is_scalar($data[self::FIELD_DEFAULT_VALUE_UNSIGNED_INT])) { - $this->setDefaultValueUnsignedInt(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_UNSIGNED_INT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DEFAULT_VALUE_UNSIGNED_INT])) { + $this->setDefaultValueUnsignedInt(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_UNSIGNED_INT]] + $ext)); + } else if (is_array($data[self::FIELD_DEFAULT_VALUE_UNSIGNED_INT])) { + $this->setDefaultValueUnsignedInt(new FHIRUnsignedInt(array_merge($ext, $data[self::FIELD_DEFAULT_VALUE_UNSIGNED_INT]))); + } } else { $this->setDefaultValueUnsignedInt(new FHIRUnsignedInt($data[self::FIELD_DEFAULT_VALUE_UNSIGNED_INT])); } @@ -4347,8 +4502,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DEFAULT_VALUE_URI] instanceof FHIRUri) { $this->setDefaultValueUri($data[self::FIELD_DEFAULT_VALUE_URI]); - } elseif ($ext && is_scalar($data[self::FIELD_DEFAULT_VALUE_URI])) { - $this->setDefaultValueUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_URI]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DEFAULT_VALUE_URI])) { + $this->setDefaultValueUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_URI]] + $ext)); + } else if (is_array($data[self::FIELD_DEFAULT_VALUE_URI])) { + $this->setDefaultValueUri(new FHIRUri(array_merge($ext, $data[self::FIELD_DEFAULT_VALUE_URI]))); + } } else { $this->setDefaultValueUri(new FHIRUri($data[self::FIELD_DEFAULT_VALUE_URI])); } @@ -4359,8 +4518,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DEFAULT_VALUE_URL] instanceof FHIRUrl) { $this->setDefaultValueUrl($data[self::FIELD_DEFAULT_VALUE_URL]); - } elseif ($ext && is_scalar($data[self::FIELD_DEFAULT_VALUE_URL])) { - $this->setDefaultValueUrl(new FHIRUrl([FHIRUrl::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_URL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DEFAULT_VALUE_URL])) { + $this->setDefaultValueUrl(new FHIRUrl([FHIRUrl::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_URL]] + $ext)); + } else if (is_array($data[self::FIELD_DEFAULT_VALUE_URL])) { + $this->setDefaultValueUrl(new FHIRUrl(array_merge($ext, $data[self::FIELD_DEFAULT_VALUE_URL]))); + } } else { $this->setDefaultValueUrl(new FHIRUrl($data[self::FIELD_DEFAULT_VALUE_URL])); } @@ -4378,8 +4541,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DEFAULT_VALUE_UUID] instanceof FHIRUuid) { $this->setDefaultValueUuid($data[self::FIELD_DEFAULT_VALUE_UUID]); - } elseif ($ext && is_scalar($data[self::FIELD_DEFAULT_VALUE_UUID])) { - $this->setDefaultValueUuid(new FHIRUuid([FHIRUuid::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_UUID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DEFAULT_VALUE_UUID])) { + $this->setDefaultValueUuid(new FHIRUuid([FHIRUuid::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_UUID]] + $ext)); + } else if (is_array($data[self::FIELD_DEFAULT_VALUE_UUID])) { + $this->setDefaultValueUuid(new FHIRUuid(array_merge($ext, $data[self::FIELD_DEFAULT_VALUE_UUID]))); + } } else { $this->setDefaultValueUuid(new FHIRUuid($data[self::FIELD_DEFAULT_VALUE_UUID])); } @@ -4390,8 +4557,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DEFINITION] instanceof FHIRMarkdown) { $this->setDefinition($data[self::FIELD_DEFINITION]); - } elseif ($ext && is_scalar($data[self::FIELD_DEFINITION])) { - $this->setDefinition(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_DEFINITION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DEFINITION])) { + $this->setDefinition(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_DEFINITION]] + $ext)); + } else if (is_array($data[self::FIELD_DEFINITION])) { + $this->setDefinition(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_DEFINITION]))); + } } else { $this->setDefinition(new FHIRMarkdown($data[self::FIELD_DEFINITION])); } @@ -4399,6 +4570,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_EXAMPLE])) { if (is_array($data[self::FIELD_EXAMPLE])) { foreach($data[self::FIELD_EXAMPLE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRElementDefinitionExample) { $this->addExample($v); } else { @@ -4419,8 +4593,17 @@ public function __construct($data = null) } } if (isset($data[self::FIELD_FIXED_AGE])) { + $ext = (isset($data[self::FIELD_FIXED_AGE_EXT]) && is_array($data[self::FIELD_FIXED_AGE_EXT])) + ? $data[self::FIELD_FIXED_AGE_EXT] + : null; if ($data[self::FIELD_FIXED_AGE] instanceof FHIRAge) { $this->setFixedAge($data[self::FIELD_FIXED_AGE]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_FIXED_AGE])) { + $this->setFixedAge(new FHIRAge([FHIRAge::FIELD_VALUE => $data[self::FIELD_FIXED_AGE]] + $ext)); + } else if (is_array($data[self::FIELD_FIXED_AGE])) { + $this->setFixedAge(new FHIRAge(array_merge($ext, $data[self::FIELD_FIXED_AGE]))); + } } else { $this->setFixedAge(new FHIRAge($data[self::FIELD_FIXED_AGE])); } @@ -4445,8 +4628,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_FIXED_BASE_64BINARY] instanceof FHIRBase64Binary) { $this->setFixedBase64Binary($data[self::FIELD_FIXED_BASE_64BINARY]); - } elseif ($ext && is_scalar($data[self::FIELD_FIXED_BASE_64BINARY])) { - $this->setFixedBase64Binary(new FHIRBase64Binary([FHIRBase64Binary::FIELD_VALUE => $data[self::FIELD_FIXED_BASE_64BINARY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_FIXED_BASE_64BINARY])) { + $this->setFixedBase64Binary(new FHIRBase64Binary([FHIRBase64Binary::FIELD_VALUE => $data[self::FIELD_FIXED_BASE_64BINARY]] + $ext)); + } else if (is_array($data[self::FIELD_FIXED_BASE_64BINARY])) { + $this->setFixedBase64Binary(new FHIRBase64Binary(array_merge($ext, $data[self::FIELD_FIXED_BASE_64BINARY]))); + } } else { $this->setFixedBase64Binary(new FHIRBase64Binary($data[self::FIELD_FIXED_BASE_64BINARY])); } @@ -4457,8 +4644,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_FIXED_BOOLEAN] instanceof FHIRBoolean) { $this->setFixedBoolean($data[self::FIELD_FIXED_BOOLEAN]); - } elseif ($ext && is_scalar($data[self::FIELD_FIXED_BOOLEAN])) { - $this->setFixedBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_FIXED_BOOLEAN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_FIXED_BOOLEAN])) { + $this->setFixedBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_FIXED_BOOLEAN]] + $ext)); + } else if (is_array($data[self::FIELD_FIXED_BOOLEAN])) { + $this->setFixedBoolean(new FHIRBoolean(array_merge($ext, $data[self::FIELD_FIXED_BOOLEAN]))); + } } else { $this->setFixedBoolean(new FHIRBoolean($data[self::FIELD_FIXED_BOOLEAN])); } @@ -4469,8 +4660,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_FIXED_CANONICAL] instanceof FHIRCanonical) { $this->setFixedCanonical($data[self::FIELD_FIXED_CANONICAL]); - } elseif ($ext && is_scalar($data[self::FIELD_FIXED_CANONICAL])) { - $this->setFixedCanonical(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $data[self::FIELD_FIXED_CANONICAL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_FIXED_CANONICAL])) { + $this->setFixedCanonical(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $data[self::FIELD_FIXED_CANONICAL]] + $ext)); + } else if (is_array($data[self::FIELD_FIXED_CANONICAL])) { + $this->setFixedCanonical(new FHIRCanonical(array_merge($ext, $data[self::FIELD_FIXED_CANONICAL]))); + } } else { $this->setFixedCanonical(new FHIRCanonical($data[self::FIELD_FIXED_CANONICAL])); } @@ -4481,8 +4676,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_FIXED_CODE] instanceof FHIRCode) { $this->setFixedCode($data[self::FIELD_FIXED_CODE]); - } elseif ($ext && is_scalar($data[self::FIELD_FIXED_CODE])) { - $this->setFixedCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_FIXED_CODE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_FIXED_CODE])) { + $this->setFixedCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_FIXED_CODE]] + $ext)); + } else if (is_array($data[self::FIELD_FIXED_CODE])) { + $this->setFixedCode(new FHIRCode(array_merge($ext, $data[self::FIELD_FIXED_CODE]))); + } } else { $this->setFixedCode(new FHIRCode($data[self::FIELD_FIXED_CODE])); } @@ -4514,8 +4713,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_FIXED_CONTACT_POINT] instanceof FHIRContactPoint) { $this->setFixedContactPoint($data[self::FIELD_FIXED_CONTACT_POINT]); - } elseif ($ext && is_scalar($data[self::FIELD_FIXED_CONTACT_POINT])) { - $this->setFixedContactPoint(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $data[self::FIELD_FIXED_CONTACT_POINT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_FIXED_CONTACT_POINT])) { + $this->setFixedContactPoint(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $data[self::FIELD_FIXED_CONTACT_POINT]] + $ext)); + } else if (is_array($data[self::FIELD_FIXED_CONTACT_POINT])) { + $this->setFixedContactPoint(new FHIRContactPoint(array_merge($ext, $data[self::FIELD_FIXED_CONTACT_POINT]))); + } } else { $this->setFixedContactPoint(new FHIRContactPoint($data[self::FIELD_FIXED_CONTACT_POINT])); } @@ -4528,8 +4731,17 @@ public function __construct($data = null) } } if (isset($data[self::FIELD_FIXED_COUNT])) { + $ext = (isset($data[self::FIELD_FIXED_COUNT_EXT]) && is_array($data[self::FIELD_FIXED_COUNT_EXT])) + ? $data[self::FIELD_FIXED_COUNT_EXT] + : null; if ($data[self::FIELD_FIXED_COUNT] instanceof FHIRCount) { $this->setFixedCount($data[self::FIELD_FIXED_COUNT]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_FIXED_COUNT])) { + $this->setFixedCount(new FHIRCount([FHIRCount::FIELD_VALUE => $data[self::FIELD_FIXED_COUNT]] + $ext)); + } else if (is_array($data[self::FIELD_FIXED_COUNT])) { + $this->setFixedCount(new FHIRCount(array_merge($ext, $data[self::FIELD_FIXED_COUNT]))); + } } else { $this->setFixedCount(new FHIRCount($data[self::FIELD_FIXED_COUNT])); } @@ -4547,8 +4759,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_FIXED_DATE] instanceof FHIRDate) { $this->setFixedDate($data[self::FIELD_FIXED_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_FIXED_DATE])) { - $this->setFixedDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_FIXED_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_FIXED_DATE])) { + $this->setFixedDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_FIXED_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_FIXED_DATE])) { + $this->setFixedDate(new FHIRDate(array_merge($ext, $data[self::FIELD_FIXED_DATE]))); + } } else { $this->setFixedDate(new FHIRDate($data[self::FIELD_FIXED_DATE])); } @@ -4559,8 +4775,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_FIXED_DATE_TIME] instanceof FHIRDateTime) { $this->setFixedDateTime($data[self::FIELD_FIXED_DATE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_FIXED_DATE_TIME])) { - $this->setFixedDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_FIXED_DATE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_FIXED_DATE_TIME])) { + $this->setFixedDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_FIXED_DATE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_FIXED_DATE_TIME])) { + $this->setFixedDateTime(new FHIRDateTime(array_merge($ext, $data[self::FIELD_FIXED_DATE_TIME]))); + } } else { $this->setFixedDateTime(new FHIRDateTime($data[self::FIELD_FIXED_DATE_TIME])); } @@ -4571,15 +4791,28 @@ public function __construct($data = null) : null; if ($data[self::FIELD_FIXED_DECIMAL] instanceof FHIRDecimal) { $this->setFixedDecimal($data[self::FIELD_FIXED_DECIMAL]); - } elseif ($ext && is_scalar($data[self::FIELD_FIXED_DECIMAL])) { - $this->setFixedDecimal(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_FIXED_DECIMAL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_FIXED_DECIMAL])) { + $this->setFixedDecimal(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_FIXED_DECIMAL]] + $ext)); + } else if (is_array($data[self::FIELD_FIXED_DECIMAL])) { + $this->setFixedDecimal(new FHIRDecimal(array_merge($ext, $data[self::FIELD_FIXED_DECIMAL]))); + } } else { $this->setFixedDecimal(new FHIRDecimal($data[self::FIELD_FIXED_DECIMAL])); } } if (isset($data[self::FIELD_FIXED_DISTANCE])) { + $ext = (isset($data[self::FIELD_FIXED_DISTANCE_EXT]) && is_array($data[self::FIELD_FIXED_DISTANCE_EXT])) + ? $data[self::FIELD_FIXED_DISTANCE_EXT] + : null; if ($data[self::FIELD_FIXED_DISTANCE] instanceof FHIRDistance) { $this->setFixedDistance($data[self::FIELD_FIXED_DISTANCE]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_FIXED_DISTANCE])) { + $this->setFixedDistance(new FHIRDistance([FHIRDistance::FIELD_VALUE => $data[self::FIELD_FIXED_DISTANCE]] + $ext)); + } else if (is_array($data[self::FIELD_FIXED_DISTANCE])) { + $this->setFixedDistance(new FHIRDistance(array_merge($ext, $data[self::FIELD_FIXED_DISTANCE]))); + } } else { $this->setFixedDistance(new FHIRDistance($data[self::FIELD_FIXED_DISTANCE])); } @@ -4592,8 +4825,17 @@ public function __construct($data = null) } } if (isset($data[self::FIELD_FIXED_DURATION])) { + $ext = (isset($data[self::FIELD_FIXED_DURATION_EXT]) && is_array($data[self::FIELD_FIXED_DURATION_EXT])) + ? $data[self::FIELD_FIXED_DURATION_EXT] + : null; if ($data[self::FIELD_FIXED_DURATION] instanceof FHIRDuration) { $this->setFixedDuration($data[self::FIELD_FIXED_DURATION]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_FIXED_DURATION])) { + $this->setFixedDuration(new FHIRDuration([FHIRDuration::FIELD_VALUE => $data[self::FIELD_FIXED_DURATION]] + $ext)); + } else if (is_array($data[self::FIELD_FIXED_DURATION])) { + $this->setFixedDuration(new FHIRDuration(array_merge($ext, $data[self::FIELD_FIXED_DURATION]))); + } } else { $this->setFixedDuration(new FHIRDuration($data[self::FIELD_FIXED_DURATION])); } @@ -4618,8 +4860,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_FIXED_ID] instanceof FHIRId) { $this->setFixedId($data[self::FIELD_FIXED_ID]); - } elseif ($ext && is_scalar($data[self::FIELD_FIXED_ID])) { - $this->setFixedId(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_FIXED_ID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_FIXED_ID])) { + $this->setFixedId(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_FIXED_ID]] + $ext)); + } else if (is_array($data[self::FIELD_FIXED_ID])) { + $this->setFixedId(new FHIRId(array_merge($ext, $data[self::FIELD_FIXED_ID]))); + } } else { $this->setFixedId(new FHIRId($data[self::FIELD_FIXED_ID])); } @@ -4630,8 +4876,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_FIXED_IDENTIFIER] instanceof FHIRIdentifier) { $this->setFixedIdentifier($data[self::FIELD_FIXED_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_FIXED_IDENTIFIER])) { - $this->setFixedIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_FIXED_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_FIXED_IDENTIFIER])) { + $this->setFixedIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_FIXED_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_FIXED_IDENTIFIER])) { + $this->setFixedIdentifier(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_FIXED_IDENTIFIER]))); + } } else { $this->setFixedIdentifier(new FHIRIdentifier($data[self::FIELD_FIXED_IDENTIFIER])); } @@ -4642,8 +4892,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_FIXED_INSTANT] instanceof FHIRInstant) { $this->setFixedInstant($data[self::FIELD_FIXED_INSTANT]); - } elseif ($ext && is_scalar($data[self::FIELD_FIXED_INSTANT])) { - $this->setFixedInstant(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_FIXED_INSTANT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_FIXED_INSTANT])) { + $this->setFixedInstant(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_FIXED_INSTANT]] + $ext)); + } else if (is_array($data[self::FIELD_FIXED_INSTANT])) { + $this->setFixedInstant(new FHIRInstant(array_merge($ext, $data[self::FIELD_FIXED_INSTANT]))); + } } else { $this->setFixedInstant(new FHIRInstant($data[self::FIELD_FIXED_INSTANT])); } @@ -4654,8 +4908,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_FIXED_INTEGER] instanceof FHIRInteger) { $this->setFixedInteger($data[self::FIELD_FIXED_INTEGER]); - } elseif ($ext && is_scalar($data[self::FIELD_FIXED_INTEGER])) { - $this->setFixedInteger(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_FIXED_INTEGER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_FIXED_INTEGER])) { + $this->setFixedInteger(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_FIXED_INTEGER]] + $ext)); + } else if (is_array($data[self::FIELD_FIXED_INTEGER])) { + $this->setFixedInteger(new FHIRInteger(array_merge($ext, $data[self::FIELD_FIXED_INTEGER]))); + } } else { $this->setFixedInteger(new FHIRInteger($data[self::FIELD_FIXED_INTEGER])); } @@ -4666,8 +4924,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_FIXED_MARKDOWN] instanceof FHIRMarkdown) { $this->setFixedMarkdown($data[self::FIELD_FIXED_MARKDOWN]); - } elseif ($ext && is_scalar($data[self::FIELD_FIXED_MARKDOWN])) { - $this->setFixedMarkdown(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_FIXED_MARKDOWN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_FIXED_MARKDOWN])) { + $this->setFixedMarkdown(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_FIXED_MARKDOWN]] + $ext)); + } else if (is_array($data[self::FIELD_FIXED_MARKDOWN])) { + $this->setFixedMarkdown(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_FIXED_MARKDOWN]))); + } } else { $this->setFixedMarkdown(new FHIRMarkdown($data[self::FIELD_FIXED_MARKDOWN])); } @@ -4685,8 +4947,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_FIXED_MONEY] instanceof FHIRMoney) { $this->setFixedMoney($data[self::FIELD_FIXED_MONEY]); - } elseif ($ext && is_scalar($data[self::FIELD_FIXED_MONEY])) { - $this->setFixedMoney(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_FIXED_MONEY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_FIXED_MONEY])) { + $this->setFixedMoney(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_FIXED_MONEY]] + $ext)); + } else if (is_array($data[self::FIELD_FIXED_MONEY])) { + $this->setFixedMoney(new FHIRMoney(array_merge($ext, $data[self::FIELD_FIXED_MONEY]))); + } } else { $this->setFixedMoney(new FHIRMoney($data[self::FIELD_FIXED_MONEY])); } @@ -4697,8 +4963,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_FIXED_OID] instanceof FHIROid) { $this->setFixedOid($data[self::FIELD_FIXED_OID]); - } elseif ($ext && is_scalar($data[self::FIELD_FIXED_OID])) { - $this->setFixedOid(new FHIROid([FHIROid::FIELD_VALUE => $data[self::FIELD_FIXED_OID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_FIXED_OID])) { + $this->setFixedOid(new FHIROid([FHIROid::FIELD_VALUE => $data[self::FIELD_FIXED_OID]] + $ext)); + } else if (is_array($data[self::FIELD_FIXED_OID])) { + $this->setFixedOid(new FHIROid(array_merge($ext, $data[self::FIELD_FIXED_OID]))); + } } else { $this->setFixedOid(new FHIROid($data[self::FIELD_FIXED_OID])); } @@ -4723,8 +4993,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_FIXED_POSITIVE_INT] instanceof FHIRPositiveInt) { $this->setFixedPositiveInt($data[self::FIELD_FIXED_POSITIVE_INT]); - } elseif ($ext && is_scalar($data[self::FIELD_FIXED_POSITIVE_INT])) { - $this->setFixedPositiveInt(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_FIXED_POSITIVE_INT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_FIXED_POSITIVE_INT])) { + $this->setFixedPositiveInt(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_FIXED_POSITIVE_INT]] + $ext)); + } else if (is_array($data[self::FIELD_FIXED_POSITIVE_INT])) { + $this->setFixedPositiveInt(new FHIRPositiveInt(array_merge($ext, $data[self::FIELD_FIXED_POSITIVE_INT]))); + } } else { $this->setFixedPositiveInt(new FHIRPositiveInt($data[self::FIELD_FIXED_POSITIVE_INT])); } @@ -4735,8 +5009,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_FIXED_QUANTITY] instanceof FHIRQuantity) { $this->setFixedQuantity($data[self::FIELD_FIXED_QUANTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_FIXED_QUANTITY])) { - $this->setFixedQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_FIXED_QUANTITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_FIXED_QUANTITY])) { + $this->setFixedQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_FIXED_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_FIXED_QUANTITY])) { + $this->setFixedQuantity(new FHIRQuantity(array_merge($ext, $data[self::FIELD_FIXED_QUANTITY]))); + } } else { $this->setFixedQuantity(new FHIRQuantity($data[self::FIELD_FIXED_QUANTITY])); } @@ -4789,8 +5067,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_FIXED_STRING] instanceof FHIRString) { $this->setFixedString($data[self::FIELD_FIXED_STRING]); - } elseif ($ext && is_scalar($data[self::FIELD_FIXED_STRING])) { - $this->setFixedString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_FIXED_STRING]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_FIXED_STRING])) { + $this->setFixedString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_FIXED_STRING]] + $ext)); + } else if (is_array($data[self::FIELD_FIXED_STRING])) { + $this->setFixedString(new FHIRString(array_merge($ext, $data[self::FIELD_FIXED_STRING]))); + } } else { $this->setFixedString(new FHIRString($data[self::FIELD_FIXED_STRING])); } @@ -4801,8 +5083,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_FIXED_TIME] instanceof FHIRTime) { $this->setFixedTime($data[self::FIELD_FIXED_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_FIXED_TIME])) { - $this->setFixedTime(new FHIRTime([FHIRTime::FIELD_VALUE => $data[self::FIELD_FIXED_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_FIXED_TIME])) { + $this->setFixedTime(new FHIRTime([FHIRTime::FIELD_VALUE => $data[self::FIELD_FIXED_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_FIXED_TIME])) { + $this->setFixedTime(new FHIRTime(array_merge($ext, $data[self::FIELD_FIXED_TIME]))); + } } else { $this->setFixedTime(new FHIRTime($data[self::FIELD_FIXED_TIME])); } @@ -4827,8 +5113,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_FIXED_UNSIGNED_INT] instanceof FHIRUnsignedInt) { $this->setFixedUnsignedInt($data[self::FIELD_FIXED_UNSIGNED_INT]); - } elseif ($ext && is_scalar($data[self::FIELD_FIXED_UNSIGNED_INT])) { - $this->setFixedUnsignedInt(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_FIXED_UNSIGNED_INT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_FIXED_UNSIGNED_INT])) { + $this->setFixedUnsignedInt(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_FIXED_UNSIGNED_INT]] + $ext)); + } else if (is_array($data[self::FIELD_FIXED_UNSIGNED_INT])) { + $this->setFixedUnsignedInt(new FHIRUnsignedInt(array_merge($ext, $data[self::FIELD_FIXED_UNSIGNED_INT]))); + } } else { $this->setFixedUnsignedInt(new FHIRUnsignedInt($data[self::FIELD_FIXED_UNSIGNED_INT])); } @@ -4839,8 +5129,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_FIXED_URI] instanceof FHIRUri) { $this->setFixedUri($data[self::FIELD_FIXED_URI]); - } elseif ($ext && is_scalar($data[self::FIELD_FIXED_URI])) { - $this->setFixedUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_FIXED_URI]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_FIXED_URI])) { + $this->setFixedUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_FIXED_URI]] + $ext)); + } else if (is_array($data[self::FIELD_FIXED_URI])) { + $this->setFixedUri(new FHIRUri(array_merge($ext, $data[self::FIELD_FIXED_URI]))); + } } else { $this->setFixedUri(new FHIRUri($data[self::FIELD_FIXED_URI])); } @@ -4851,8 +5145,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_FIXED_URL] instanceof FHIRUrl) { $this->setFixedUrl($data[self::FIELD_FIXED_URL]); - } elseif ($ext && is_scalar($data[self::FIELD_FIXED_URL])) { - $this->setFixedUrl(new FHIRUrl([FHIRUrl::FIELD_VALUE => $data[self::FIELD_FIXED_URL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_FIXED_URL])) { + $this->setFixedUrl(new FHIRUrl([FHIRUrl::FIELD_VALUE => $data[self::FIELD_FIXED_URL]] + $ext)); + } else if (is_array($data[self::FIELD_FIXED_URL])) { + $this->setFixedUrl(new FHIRUrl(array_merge($ext, $data[self::FIELD_FIXED_URL]))); + } } else { $this->setFixedUrl(new FHIRUrl($data[self::FIELD_FIXED_URL])); } @@ -4870,8 +5168,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_FIXED_UUID] instanceof FHIRUuid) { $this->setFixedUuid($data[self::FIELD_FIXED_UUID]); - } elseif ($ext && is_scalar($data[self::FIELD_FIXED_UUID])) { - $this->setFixedUuid(new FHIRUuid([FHIRUuid::FIELD_VALUE => $data[self::FIELD_FIXED_UUID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_FIXED_UUID])) { + $this->setFixedUuid(new FHIRUuid([FHIRUuid::FIELD_VALUE => $data[self::FIELD_FIXED_UUID]] + $ext)); + } else if (is_array($data[self::FIELD_FIXED_UUID])) { + $this->setFixedUuid(new FHIRUuid(array_merge($ext, $data[self::FIELD_FIXED_UUID]))); + } } else { $this->setFixedUuid(new FHIRUuid($data[self::FIELD_FIXED_UUID])); } @@ -4882,8 +5184,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IS_MODIFIER] instanceof FHIRBoolean) { $this->setIsModifier($data[self::FIELD_IS_MODIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IS_MODIFIER])) { - $this->setIsModifier(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_IS_MODIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IS_MODIFIER])) { + $this->setIsModifier(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_IS_MODIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_IS_MODIFIER])) { + $this->setIsModifier(new FHIRBoolean(array_merge($ext, $data[self::FIELD_IS_MODIFIER]))); + } } else { $this->setIsModifier(new FHIRBoolean($data[self::FIELD_IS_MODIFIER])); } @@ -4894,8 +5200,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IS_MODIFIER_REASON] instanceof FHIRString) { $this->setIsModifierReason($data[self::FIELD_IS_MODIFIER_REASON]); - } elseif ($ext && is_scalar($data[self::FIELD_IS_MODIFIER_REASON])) { - $this->setIsModifierReason(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_IS_MODIFIER_REASON]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IS_MODIFIER_REASON])) { + $this->setIsModifierReason(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_IS_MODIFIER_REASON]] + $ext)); + } else if (is_array($data[self::FIELD_IS_MODIFIER_REASON])) { + $this->setIsModifierReason(new FHIRString(array_merge($ext, $data[self::FIELD_IS_MODIFIER_REASON]))); + } } else { $this->setIsModifierReason(new FHIRString($data[self::FIELD_IS_MODIFIER_REASON])); } @@ -4906,8 +5216,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IS_SUMMARY] instanceof FHIRBoolean) { $this->setIsSummary($data[self::FIELD_IS_SUMMARY]); - } elseif ($ext && is_scalar($data[self::FIELD_IS_SUMMARY])) { - $this->setIsSummary(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_IS_SUMMARY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IS_SUMMARY])) { + $this->setIsSummary(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_IS_SUMMARY]] + $ext)); + } else if (is_array($data[self::FIELD_IS_SUMMARY])) { + $this->setIsSummary(new FHIRBoolean(array_merge($ext, $data[self::FIELD_IS_SUMMARY]))); + } } else { $this->setIsSummary(new FHIRBoolean($data[self::FIELD_IS_SUMMARY])); } @@ -4918,8 +5232,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_LABEL] instanceof FHIRString) { $this->setLabel($data[self::FIELD_LABEL]); - } elseif ($ext && is_scalar($data[self::FIELD_LABEL])) { - $this->setLabel(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_LABEL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_LABEL])) { + $this->setLabel(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_LABEL]] + $ext)); + } else if (is_array($data[self::FIELD_LABEL])) { + $this->setLabel(new FHIRString(array_merge($ext, $data[self::FIELD_LABEL]))); + } } else { $this->setLabel(new FHIRString($data[self::FIELD_LABEL])); } @@ -4927,6 +5245,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_MAPPING])) { if (is_array($data[self::FIELD_MAPPING])) { foreach($data[self::FIELD_MAPPING] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRElementDefinitionMapping) { $this->addMapping($v); } else { @@ -4945,8 +5266,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MAX] instanceof FHIRString) { $this->setMax($data[self::FIELD_MAX]); - } elseif ($ext && is_scalar($data[self::FIELD_MAX])) { - $this->setMax(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_MAX]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MAX])) { + $this->setMax(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_MAX]] + $ext)); + } else if (is_array($data[self::FIELD_MAX])) { + $this->setMax(new FHIRString(array_merge($ext, $data[self::FIELD_MAX]))); + } } else { $this->setMax(new FHIRString($data[self::FIELD_MAX])); } @@ -4957,8 +5282,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MAX_LENGTH] instanceof FHIRInteger) { $this->setMaxLength($data[self::FIELD_MAX_LENGTH]); - } elseif ($ext && is_scalar($data[self::FIELD_MAX_LENGTH])) { - $this->setMaxLength(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_MAX_LENGTH]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MAX_LENGTH])) { + $this->setMaxLength(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_MAX_LENGTH]] + $ext)); + } else if (is_array($data[self::FIELD_MAX_LENGTH])) { + $this->setMaxLength(new FHIRInteger(array_merge($ext, $data[self::FIELD_MAX_LENGTH]))); + } } else { $this->setMaxLength(new FHIRInteger($data[self::FIELD_MAX_LENGTH])); } @@ -4969,8 +5298,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MAX_VALUE_DATE] instanceof FHIRDate) { $this->setMaxValueDate($data[self::FIELD_MAX_VALUE_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_MAX_VALUE_DATE])) { - $this->setMaxValueDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_MAX_VALUE_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MAX_VALUE_DATE])) { + $this->setMaxValueDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_MAX_VALUE_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_MAX_VALUE_DATE])) { + $this->setMaxValueDate(new FHIRDate(array_merge($ext, $data[self::FIELD_MAX_VALUE_DATE]))); + } } else { $this->setMaxValueDate(new FHIRDate($data[self::FIELD_MAX_VALUE_DATE])); } @@ -4981,8 +5314,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MAX_VALUE_DATE_TIME] instanceof FHIRDateTime) { $this->setMaxValueDateTime($data[self::FIELD_MAX_VALUE_DATE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_MAX_VALUE_DATE_TIME])) { - $this->setMaxValueDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_MAX_VALUE_DATE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MAX_VALUE_DATE_TIME])) { + $this->setMaxValueDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_MAX_VALUE_DATE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_MAX_VALUE_DATE_TIME])) { + $this->setMaxValueDateTime(new FHIRDateTime(array_merge($ext, $data[self::FIELD_MAX_VALUE_DATE_TIME]))); + } } else { $this->setMaxValueDateTime(new FHIRDateTime($data[self::FIELD_MAX_VALUE_DATE_TIME])); } @@ -4993,8 +5330,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MAX_VALUE_DECIMAL] instanceof FHIRDecimal) { $this->setMaxValueDecimal($data[self::FIELD_MAX_VALUE_DECIMAL]); - } elseif ($ext && is_scalar($data[self::FIELD_MAX_VALUE_DECIMAL])) { - $this->setMaxValueDecimal(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_MAX_VALUE_DECIMAL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MAX_VALUE_DECIMAL])) { + $this->setMaxValueDecimal(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_MAX_VALUE_DECIMAL]] + $ext)); + } else if (is_array($data[self::FIELD_MAX_VALUE_DECIMAL])) { + $this->setMaxValueDecimal(new FHIRDecimal(array_merge($ext, $data[self::FIELD_MAX_VALUE_DECIMAL]))); + } } else { $this->setMaxValueDecimal(new FHIRDecimal($data[self::FIELD_MAX_VALUE_DECIMAL])); } @@ -5005,8 +5346,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MAX_VALUE_INSTANT] instanceof FHIRInstant) { $this->setMaxValueInstant($data[self::FIELD_MAX_VALUE_INSTANT]); - } elseif ($ext && is_scalar($data[self::FIELD_MAX_VALUE_INSTANT])) { - $this->setMaxValueInstant(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_MAX_VALUE_INSTANT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MAX_VALUE_INSTANT])) { + $this->setMaxValueInstant(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_MAX_VALUE_INSTANT]] + $ext)); + } else if (is_array($data[self::FIELD_MAX_VALUE_INSTANT])) { + $this->setMaxValueInstant(new FHIRInstant(array_merge($ext, $data[self::FIELD_MAX_VALUE_INSTANT]))); + } } else { $this->setMaxValueInstant(new FHIRInstant($data[self::FIELD_MAX_VALUE_INSTANT])); } @@ -5017,8 +5362,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MAX_VALUE_INTEGER] instanceof FHIRInteger) { $this->setMaxValueInteger($data[self::FIELD_MAX_VALUE_INTEGER]); - } elseif ($ext && is_scalar($data[self::FIELD_MAX_VALUE_INTEGER])) { - $this->setMaxValueInteger(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_MAX_VALUE_INTEGER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MAX_VALUE_INTEGER])) { + $this->setMaxValueInteger(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_MAX_VALUE_INTEGER]] + $ext)); + } else if (is_array($data[self::FIELD_MAX_VALUE_INTEGER])) { + $this->setMaxValueInteger(new FHIRInteger(array_merge($ext, $data[self::FIELD_MAX_VALUE_INTEGER]))); + } } else { $this->setMaxValueInteger(new FHIRInteger($data[self::FIELD_MAX_VALUE_INTEGER])); } @@ -5029,8 +5378,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MAX_VALUE_POSITIVE_INT] instanceof FHIRPositiveInt) { $this->setMaxValuePositiveInt($data[self::FIELD_MAX_VALUE_POSITIVE_INT]); - } elseif ($ext && is_scalar($data[self::FIELD_MAX_VALUE_POSITIVE_INT])) { - $this->setMaxValuePositiveInt(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_MAX_VALUE_POSITIVE_INT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MAX_VALUE_POSITIVE_INT])) { + $this->setMaxValuePositiveInt(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_MAX_VALUE_POSITIVE_INT]] + $ext)); + } else if (is_array($data[self::FIELD_MAX_VALUE_POSITIVE_INT])) { + $this->setMaxValuePositiveInt(new FHIRPositiveInt(array_merge($ext, $data[self::FIELD_MAX_VALUE_POSITIVE_INT]))); + } } else { $this->setMaxValuePositiveInt(new FHIRPositiveInt($data[self::FIELD_MAX_VALUE_POSITIVE_INT])); } @@ -5041,8 +5394,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MAX_VALUE_QUANTITY] instanceof FHIRQuantity) { $this->setMaxValueQuantity($data[self::FIELD_MAX_VALUE_QUANTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_MAX_VALUE_QUANTITY])) { - $this->setMaxValueQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_MAX_VALUE_QUANTITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MAX_VALUE_QUANTITY])) { + $this->setMaxValueQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_MAX_VALUE_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_MAX_VALUE_QUANTITY])) { + $this->setMaxValueQuantity(new FHIRQuantity(array_merge($ext, $data[self::FIELD_MAX_VALUE_QUANTITY]))); + } } else { $this->setMaxValueQuantity(new FHIRQuantity($data[self::FIELD_MAX_VALUE_QUANTITY])); } @@ -5053,8 +5410,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MAX_VALUE_TIME] instanceof FHIRTime) { $this->setMaxValueTime($data[self::FIELD_MAX_VALUE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_MAX_VALUE_TIME])) { - $this->setMaxValueTime(new FHIRTime([FHIRTime::FIELD_VALUE => $data[self::FIELD_MAX_VALUE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MAX_VALUE_TIME])) { + $this->setMaxValueTime(new FHIRTime([FHIRTime::FIELD_VALUE => $data[self::FIELD_MAX_VALUE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_MAX_VALUE_TIME])) { + $this->setMaxValueTime(new FHIRTime(array_merge($ext, $data[self::FIELD_MAX_VALUE_TIME]))); + } } else { $this->setMaxValueTime(new FHIRTime($data[self::FIELD_MAX_VALUE_TIME])); } @@ -5065,8 +5426,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MAX_VALUE_UNSIGNED_INT] instanceof FHIRUnsignedInt) { $this->setMaxValueUnsignedInt($data[self::FIELD_MAX_VALUE_UNSIGNED_INT]); - } elseif ($ext && is_scalar($data[self::FIELD_MAX_VALUE_UNSIGNED_INT])) { - $this->setMaxValueUnsignedInt(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_MAX_VALUE_UNSIGNED_INT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MAX_VALUE_UNSIGNED_INT])) { + $this->setMaxValueUnsignedInt(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_MAX_VALUE_UNSIGNED_INT]] + $ext)); + } else if (is_array($data[self::FIELD_MAX_VALUE_UNSIGNED_INT])) { + $this->setMaxValueUnsignedInt(new FHIRUnsignedInt(array_merge($ext, $data[self::FIELD_MAX_VALUE_UNSIGNED_INT]))); + } } else { $this->setMaxValueUnsignedInt(new FHIRUnsignedInt($data[self::FIELD_MAX_VALUE_UNSIGNED_INT])); } @@ -5077,8 +5442,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MEANING_WHEN_MISSING] instanceof FHIRMarkdown) { $this->setMeaningWhenMissing($data[self::FIELD_MEANING_WHEN_MISSING]); - } elseif ($ext && is_scalar($data[self::FIELD_MEANING_WHEN_MISSING])) { - $this->setMeaningWhenMissing(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_MEANING_WHEN_MISSING]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MEANING_WHEN_MISSING])) { + $this->setMeaningWhenMissing(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_MEANING_WHEN_MISSING]] + $ext)); + } else if (is_array($data[self::FIELD_MEANING_WHEN_MISSING])) { + $this->setMeaningWhenMissing(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_MEANING_WHEN_MISSING]))); + } } else { $this->setMeaningWhenMissing(new FHIRMarkdown($data[self::FIELD_MEANING_WHEN_MISSING])); } @@ -5089,8 +5458,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MIN] instanceof FHIRUnsignedInt) { $this->setMin($data[self::FIELD_MIN]); - } elseif ($ext && is_scalar($data[self::FIELD_MIN])) { - $this->setMin(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_MIN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MIN])) { + $this->setMin(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_MIN]] + $ext)); + } else if (is_array($data[self::FIELD_MIN])) { + $this->setMin(new FHIRUnsignedInt(array_merge($ext, $data[self::FIELD_MIN]))); + } } else { $this->setMin(new FHIRUnsignedInt($data[self::FIELD_MIN])); } @@ -5101,8 +5474,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MIN_VALUE_DATE] instanceof FHIRDate) { $this->setMinValueDate($data[self::FIELD_MIN_VALUE_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_MIN_VALUE_DATE])) { - $this->setMinValueDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_MIN_VALUE_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MIN_VALUE_DATE])) { + $this->setMinValueDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_MIN_VALUE_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_MIN_VALUE_DATE])) { + $this->setMinValueDate(new FHIRDate(array_merge($ext, $data[self::FIELD_MIN_VALUE_DATE]))); + } } else { $this->setMinValueDate(new FHIRDate($data[self::FIELD_MIN_VALUE_DATE])); } @@ -5113,8 +5490,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MIN_VALUE_DATE_TIME] instanceof FHIRDateTime) { $this->setMinValueDateTime($data[self::FIELD_MIN_VALUE_DATE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_MIN_VALUE_DATE_TIME])) { - $this->setMinValueDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_MIN_VALUE_DATE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MIN_VALUE_DATE_TIME])) { + $this->setMinValueDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_MIN_VALUE_DATE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_MIN_VALUE_DATE_TIME])) { + $this->setMinValueDateTime(new FHIRDateTime(array_merge($ext, $data[self::FIELD_MIN_VALUE_DATE_TIME]))); + } } else { $this->setMinValueDateTime(new FHIRDateTime($data[self::FIELD_MIN_VALUE_DATE_TIME])); } @@ -5125,8 +5506,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MIN_VALUE_DECIMAL] instanceof FHIRDecimal) { $this->setMinValueDecimal($data[self::FIELD_MIN_VALUE_DECIMAL]); - } elseif ($ext && is_scalar($data[self::FIELD_MIN_VALUE_DECIMAL])) { - $this->setMinValueDecimal(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_MIN_VALUE_DECIMAL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MIN_VALUE_DECIMAL])) { + $this->setMinValueDecimal(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_MIN_VALUE_DECIMAL]] + $ext)); + } else if (is_array($data[self::FIELD_MIN_VALUE_DECIMAL])) { + $this->setMinValueDecimal(new FHIRDecimal(array_merge($ext, $data[self::FIELD_MIN_VALUE_DECIMAL]))); + } } else { $this->setMinValueDecimal(new FHIRDecimal($data[self::FIELD_MIN_VALUE_DECIMAL])); } @@ -5137,8 +5522,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MIN_VALUE_INSTANT] instanceof FHIRInstant) { $this->setMinValueInstant($data[self::FIELD_MIN_VALUE_INSTANT]); - } elseif ($ext && is_scalar($data[self::FIELD_MIN_VALUE_INSTANT])) { - $this->setMinValueInstant(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_MIN_VALUE_INSTANT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MIN_VALUE_INSTANT])) { + $this->setMinValueInstant(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_MIN_VALUE_INSTANT]] + $ext)); + } else if (is_array($data[self::FIELD_MIN_VALUE_INSTANT])) { + $this->setMinValueInstant(new FHIRInstant(array_merge($ext, $data[self::FIELD_MIN_VALUE_INSTANT]))); + } } else { $this->setMinValueInstant(new FHIRInstant($data[self::FIELD_MIN_VALUE_INSTANT])); } @@ -5149,8 +5538,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MIN_VALUE_INTEGER] instanceof FHIRInteger) { $this->setMinValueInteger($data[self::FIELD_MIN_VALUE_INTEGER]); - } elseif ($ext && is_scalar($data[self::FIELD_MIN_VALUE_INTEGER])) { - $this->setMinValueInteger(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_MIN_VALUE_INTEGER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MIN_VALUE_INTEGER])) { + $this->setMinValueInteger(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_MIN_VALUE_INTEGER]] + $ext)); + } else if (is_array($data[self::FIELD_MIN_VALUE_INTEGER])) { + $this->setMinValueInteger(new FHIRInteger(array_merge($ext, $data[self::FIELD_MIN_VALUE_INTEGER]))); + } } else { $this->setMinValueInteger(new FHIRInteger($data[self::FIELD_MIN_VALUE_INTEGER])); } @@ -5161,8 +5554,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MIN_VALUE_POSITIVE_INT] instanceof FHIRPositiveInt) { $this->setMinValuePositiveInt($data[self::FIELD_MIN_VALUE_POSITIVE_INT]); - } elseif ($ext && is_scalar($data[self::FIELD_MIN_VALUE_POSITIVE_INT])) { - $this->setMinValuePositiveInt(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_MIN_VALUE_POSITIVE_INT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MIN_VALUE_POSITIVE_INT])) { + $this->setMinValuePositiveInt(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_MIN_VALUE_POSITIVE_INT]] + $ext)); + } else if (is_array($data[self::FIELD_MIN_VALUE_POSITIVE_INT])) { + $this->setMinValuePositiveInt(new FHIRPositiveInt(array_merge($ext, $data[self::FIELD_MIN_VALUE_POSITIVE_INT]))); + } } else { $this->setMinValuePositiveInt(new FHIRPositiveInt($data[self::FIELD_MIN_VALUE_POSITIVE_INT])); } @@ -5173,8 +5570,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MIN_VALUE_QUANTITY] instanceof FHIRQuantity) { $this->setMinValueQuantity($data[self::FIELD_MIN_VALUE_QUANTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_MIN_VALUE_QUANTITY])) { - $this->setMinValueQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_MIN_VALUE_QUANTITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MIN_VALUE_QUANTITY])) { + $this->setMinValueQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_MIN_VALUE_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_MIN_VALUE_QUANTITY])) { + $this->setMinValueQuantity(new FHIRQuantity(array_merge($ext, $data[self::FIELD_MIN_VALUE_QUANTITY]))); + } } else { $this->setMinValueQuantity(new FHIRQuantity($data[self::FIELD_MIN_VALUE_QUANTITY])); } @@ -5185,8 +5586,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MIN_VALUE_TIME] instanceof FHIRTime) { $this->setMinValueTime($data[self::FIELD_MIN_VALUE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_MIN_VALUE_TIME])) { - $this->setMinValueTime(new FHIRTime([FHIRTime::FIELD_VALUE => $data[self::FIELD_MIN_VALUE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MIN_VALUE_TIME])) { + $this->setMinValueTime(new FHIRTime([FHIRTime::FIELD_VALUE => $data[self::FIELD_MIN_VALUE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_MIN_VALUE_TIME])) { + $this->setMinValueTime(new FHIRTime(array_merge($ext, $data[self::FIELD_MIN_VALUE_TIME]))); + } } else { $this->setMinValueTime(new FHIRTime($data[self::FIELD_MIN_VALUE_TIME])); } @@ -5197,8 +5602,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MIN_VALUE_UNSIGNED_INT] instanceof FHIRUnsignedInt) { $this->setMinValueUnsignedInt($data[self::FIELD_MIN_VALUE_UNSIGNED_INT]); - } elseif ($ext && is_scalar($data[self::FIELD_MIN_VALUE_UNSIGNED_INT])) { - $this->setMinValueUnsignedInt(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_MIN_VALUE_UNSIGNED_INT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MIN_VALUE_UNSIGNED_INT])) { + $this->setMinValueUnsignedInt(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_MIN_VALUE_UNSIGNED_INT]] + $ext)); + } else if (is_array($data[self::FIELD_MIN_VALUE_UNSIGNED_INT])) { + $this->setMinValueUnsignedInt(new FHIRUnsignedInt(array_merge($ext, $data[self::FIELD_MIN_VALUE_UNSIGNED_INT]))); + } } else { $this->setMinValueUnsignedInt(new FHIRUnsignedInt($data[self::FIELD_MIN_VALUE_UNSIGNED_INT])); } @@ -5209,8 +5618,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MUST_SUPPORT] instanceof FHIRBoolean) { $this->setMustSupport($data[self::FIELD_MUST_SUPPORT]); - } elseif ($ext && is_scalar($data[self::FIELD_MUST_SUPPORT])) { - $this->setMustSupport(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_MUST_SUPPORT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MUST_SUPPORT])) { + $this->setMustSupport(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_MUST_SUPPORT]] + $ext)); + } else if (is_array($data[self::FIELD_MUST_SUPPORT])) { + $this->setMustSupport(new FHIRBoolean(array_merge($ext, $data[self::FIELD_MUST_SUPPORT]))); + } } else { $this->setMustSupport(new FHIRBoolean($data[self::FIELD_MUST_SUPPORT])); } @@ -5221,8 +5634,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ORDER_MEANING] instanceof FHIRString) { $this->setOrderMeaning($data[self::FIELD_ORDER_MEANING]); - } elseif ($ext && is_scalar($data[self::FIELD_ORDER_MEANING])) { - $this->setOrderMeaning(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_ORDER_MEANING]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ORDER_MEANING])) { + $this->setOrderMeaning(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_ORDER_MEANING]] + $ext)); + } else if (is_array($data[self::FIELD_ORDER_MEANING])) { + $this->setOrderMeaning(new FHIRString(array_merge($ext, $data[self::FIELD_ORDER_MEANING]))); + } } else { $this->setOrderMeaning(new FHIRString($data[self::FIELD_ORDER_MEANING])); } @@ -5233,8 +5650,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PATH] instanceof FHIRString) { $this->setPath($data[self::FIELD_PATH]); - } elseif ($ext && is_scalar($data[self::FIELD_PATH])) { - $this->setPath(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PATH]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PATH])) { + $this->setPath(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PATH]] + $ext)); + } else if (is_array($data[self::FIELD_PATH])) { + $this->setPath(new FHIRString(array_merge($ext, $data[self::FIELD_PATH]))); + } } else { $this->setPath(new FHIRString($data[self::FIELD_PATH])); } @@ -5247,8 +5668,17 @@ public function __construct($data = null) } } if (isset($data[self::FIELD_PATTERN_AGE])) { + $ext = (isset($data[self::FIELD_PATTERN_AGE_EXT]) && is_array($data[self::FIELD_PATTERN_AGE_EXT])) + ? $data[self::FIELD_PATTERN_AGE_EXT] + : null; if ($data[self::FIELD_PATTERN_AGE] instanceof FHIRAge) { $this->setPatternAge($data[self::FIELD_PATTERN_AGE]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PATTERN_AGE])) { + $this->setPatternAge(new FHIRAge([FHIRAge::FIELD_VALUE => $data[self::FIELD_PATTERN_AGE]] + $ext)); + } else if (is_array($data[self::FIELD_PATTERN_AGE])) { + $this->setPatternAge(new FHIRAge(array_merge($ext, $data[self::FIELD_PATTERN_AGE]))); + } } else { $this->setPatternAge(new FHIRAge($data[self::FIELD_PATTERN_AGE])); } @@ -5273,8 +5703,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PATTERN_BASE_64BINARY] instanceof FHIRBase64Binary) { $this->setPatternBase64Binary($data[self::FIELD_PATTERN_BASE_64BINARY]); - } elseif ($ext && is_scalar($data[self::FIELD_PATTERN_BASE_64BINARY])) { - $this->setPatternBase64Binary(new FHIRBase64Binary([FHIRBase64Binary::FIELD_VALUE => $data[self::FIELD_PATTERN_BASE_64BINARY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PATTERN_BASE_64BINARY])) { + $this->setPatternBase64Binary(new FHIRBase64Binary([FHIRBase64Binary::FIELD_VALUE => $data[self::FIELD_PATTERN_BASE_64BINARY]] + $ext)); + } else if (is_array($data[self::FIELD_PATTERN_BASE_64BINARY])) { + $this->setPatternBase64Binary(new FHIRBase64Binary(array_merge($ext, $data[self::FIELD_PATTERN_BASE_64BINARY]))); + } } else { $this->setPatternBase64Binary(new FHIRBase64Binary($data[self::FIELD_PATTERN_BASE_64BINARY])); } @@ -5285,8 +5719,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PATTERN_BOOLEAN] instanceof FHIRBoolean) { $this->setPatternBoolean($data[self::FIELD_PATTERN_BOOLEAN]); - } elseif ($ext && is_scalar($data[self::FIELD_PATTERN_BOOLEAN])) { - $this->setPatternBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_PATTERN_BOOLEAN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PATTERN_BOOLEAN])) { + $this->setPatternBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_PATTERN_BOOLEAN]] + $ext)); + } else if (is_array($data[self::FIELD_PATTERN_BOOLEAN])) { + $this->setPatternBoolean(new FHIRBoolean(array_merge($ext, $data[self::FIELD_PATTERN_BOOLEAN]))); + } } else { $this->setPatternBoolean(new FHIRBoolean($data[self::FIELD_PATTERN_BOOLEAN])); } @@ -5297,8 +5735,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PATTERN_CANONICAL] instanceof FHIRCanonical) { $this->setPatternCanonical($data[self::FIELD_PATTERN_CANONICAL]); - } elseif ($ext && is_scalar($data[self::FIELD_PATTERN_CANONICAL])) { - $this->setPatternCanonical(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $data[self::FIELD_PATTERN_CANONICAL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PATTERN_CANONICAL])) { + $this->setPatternCanonical(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $data[self::FIELD_PATTERN_CANONICAL]] + $ext)); + } else if (is_array($data[self::FIELD_PATTERN_CANONICAL])) { + $this->setPatternCanonical(new FHIRCanonical(array_merge($ext, $data[self::FIELD_PATTERN_CANONICAL]))); + } } else { $this->setPatternCanonical(new FHIRCanonical($data[self::FIELD_PATTERN_CANONICAL])); } @@ -5309,8 +5751,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PATTERN_CODE] instanceof FHIRCode) { $this->setPatternCode($data[self::FIELD_PATTERN_CODE]); - } elseif ($ext && is_scalar($data[self::FIELD_PATTERN_CODE])) { - $this->setPatternCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_PATTERN_CODE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PATTERN_CODE])) { + $this->setPatternCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_PATTERN_CODE]] + $ext)); + } else if (is_array($data[self::FIELD_PATTERN_CODE])) { + $this->setPatternCode(new FHIRCode(array_merge($ext, $data[self::FIELD_PATTERN_CODE]))); + } } else { $this->setPatternCode(new FHIRCode($data[self::FIELD_PATTERN_CODE])); } @@ -5342,8 +5788,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PATTERN_CONTACT_POINT] instanceof FHIRContactPoint) { $this->setPatternContactPoint($data[self::FIELD_PATTERN_CONTACT_POINT]); - } elseif ($ext && is_scalar($data[self::FIELD_PATTERN_CONTACT_POINT])) { - $this->setPatternContactPoint(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $data[self::FIELD_PATTERN_CONTACT_POINT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PATTERN_CONTACT_POINT])) { + $this->setPatternContactPoint(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $data[self::FIELD_PATTERN_CONTACT_POINT]] + $ext)); + } else if (is_array($data[self::FIELD_PATTERN_CONTACT_POINT])) { + $this->setPatternContactPoint(new FHIRContactPoint(array_merge($ext, $data[self::FIELD_PATTERN_CONTACT_POINT]))); + } } else { $this->setPatternContactPoint(new FHIRContactPoint($data[self::FIELD_PATTERN_CONTACT_POINT])); } @@ -5356,8 +5806,17 @@ public function __construct($data = null) } } if (isset($data[self::FIELD_PATTERN_COUNT])) { + $ext = (isset($data[self::FIELD_PATTERN_COUNT_EXT]) && is_array($data[self::FIELD_PATTERN_COUNT_EXT])) + ? $data[self::FIELD_PATTERN_COUNT_EXT] + : null; if ($data[self::FIELD_PATTERN_COUNT] instanceof FHIRCount) { $this->setPatternCount($data[self::FIELD_PATTERN_COUNT]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PATTERN_COUNT])) { + $this->setPatternCount(new FHIRCount([FHIRCount::FIELD_VALUE => $data[self::FIELD_PATTERN_COUNT]] + $ext)); + } else if (is_array($data[self::FIELD_PATTERN_COUNT])) { + $this->setPatternCount(new FHIRCount(array_merge($ext, $data[self::FIELD_PATTERN_COUNT]))); + } } else { $this->setPatternCount(new FHIRCount($data[self::FIELD_PATTERN_COUNT])); } @@ -5375,8 +5834,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PATTERN_DATE] instanceof FHIRDate) { $this->setPatternDate($data[self::FIELD_PATTERN_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_PATTERN_DATE])) { - $this->setPatternDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_PATTERN_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PATTERN_DATE])) { + $this->setPatternDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_PATTERN_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_PATTERN_DATE])) { + $this->setPatternDate(new FHIRDate(array_merge($ext, $data[self::FIELD_PATTERN_DATE]))); + } } else { $this->setPatternDate(new FHIRDate($data[self::FIELD_PATTERN_DATE])); } @@ -5387,8 +5850,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PATTERN_DATE_TIME] instanceof FHIRDateTime) { $this->setPatternDateTime($data[self::FIELD_PATTERN_DATE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_PATTERN_DATE_TIME])) { - $this->setPatternDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_PATTERN_DATE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PATTERN_DATE_TIME])) { + $this->setPatternDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_PATTERN_DATE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_PATTERN_DATE_TIME])) { + $this->setPatternDateTime(new FHIRDateTime(array_merge($ext, $data[self::FIELD_PATTERN_DATE_TIME]))); + } } else { $this->setPatternDateTime(new FHIRDateTime($data[self::FIELD_PATTERN_DATE_TIME])); } @@ -5399,15 +5866,28 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PATTERN_DECIMAL] instanceof FHIRDecimal) { $this->setPatternDecimal($data[self::FIELD_PATTERN_DECIMAL]); - } elseif ($ext && is_scalar($data[self::FIELD_PATTERN_DECIMAL])) { - $this->setPatternDecimal(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_PATTERN_DECIMAL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PATTERN_DECIMAL])) { + $this->setPatternDecimal(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_PATTERN_DECIMAL]] + $ext)); + } else if (is_array($data[self::FIELD_PATTERN_DECIMAL])) { + $this->setPatternDecimal(new FHIRDecimal(array_merge($ext, $data[self::FIELD_PATTERN_DECIMAL]))); + } } else { $this->setPatternDecimal(new FHIRDecimal($data[self::FIELD_PATTERN_DECIMAL])); } } if (isset($data[self::FIELD_PATTERN_DISTANCE])) { + $ext = (isset($data[self::FIELD_PATTERN_DISTANCE_EXT]) && is_array($data[self::FIELD_PATTERN_DISTANCE_EXT])) + ? $data[self::FIELD_PATTERN_DISTANCE_EXT] + : null; if ($data[self::FIELD_PATTERN_DISTANCE] instanceof FHIRDistance) { $this->setPatternDistance($data[self::FIELD_PATTERN_DISTANCE]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PATTERN_DISTANCE])) { + $this->setPatternDistance(new FHIRDistance([FHIRDistance::FIELD_VALUE => $data[self::FIELD_PATTERN_DISTANCE]] + $ext)); + } else if (is_array($data[self::FIELD_PATTERN_DISTANCE])) { + $this->setPatternDistance(new FHIRDistance(array_merge($ext, $data[self::FIELD_PATTERN_DISTANCE]))); + } } else { $this->setPatternDistance(new FHIRDistance($data[self::FIELD_PATTERN_DISTANCE])); } @@ -5420,8 +5900,17 @@ public function __construct($data = null) } } if (isset($data[self::FIELD_PATTERN_DURATION])) { + $ext = (isset($data[self::FIELD_PATTERN_DURATION_EXT]) && is_array($data[self::FIELD_PATTERN_DURATION_EXT])) + ? $data[self::FIELD_PATTERN_DURATION_EXT] + : null; if ($data[self::FIELD_PATTERN_DURATION] instanceof FHIRDuration) { $this->setPatternDuration($data[self::FIELD_PATTERN_DURATION]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PATTERN_DURATION])) { + $this->setPatternDuration(new FHIRDuration([FHIRDuration::FIELD_VALUE => $data[self::FIELD_PATTERN_DURATION]] + $ext)); + } else if (is_array($data[self::FIELD_PATTERN_DURATION])) { + $this->setPatternDuration(new FHIRDuration(array_merge($ext, $data[self::FIELD_PATTERN_DURATION]))); + } } else { $this->setPatternDuration(new FHIRDuration($data[self::FIELD_PATTERN_DURATION])); } @@ -5446,8 +5935,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PATTERN_ID] instanceof FHIRId) { $this->setPatternId($data[self::FIELD_PATTERN_ID]); - } elseif ($ext && is_scalar($data[self::FIELD_PATTERN_ID])) { - $this->setPatternId(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_PATTERN_ID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PATTERN_ID])) { + $this->setPatternId(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_PATTERN_ID]] + $ext)); + } else if (is_array($data[self::FIELD_PATTERN_ID])) { + $this->setPatternId(new FHIRId(array_merge($ext, $data[self::FIELD_PATTERN_ID]))); + } } else { $this->setPatternId(new FHIRId($data[self::FIELD_PATTERN_ID])); } @@ -5458,8 +5951,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PATTERN_IDENTIFIER] instanceof FHIRIdentifier) { $this->setPatternIdentifier($data[self::FIELD_PATTERN_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_PATTERN_IDENTIFIER])) { - $this->setPatternIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_PATTERN_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PATTERN_IDENTIFIER])) { + $this->setPatternIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_PATTERN_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_PATTERN_IDENTIFIER])) { + $this->setPatternIdentifier(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_PATTERN_IDENTIFIER]))); + } } else { $this->setPatternIdentifier(new FHIRIdentifier($data[self::FIELD_PATTERN_IDENTIFIER])); } @@ -5470,8 +5967,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PATTERN_INSTANT] instanceof FHIRInstant) { $this->setPatternInstant($data[self::FIELD_PATTERN_INSTANT]); - } elseif ($ext && is_scalar($data[self::FIELD_PATTERN_INSTANT])) { - $this->setPatternInstant(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_PATTERN_INSTANT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PATTERN_INSTANT])) { + $this->setPatternInstant(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_PATTERN_INSTANT]] + $ext)); + } else if (is_array($data[self::FIELD_PATTERN_INSTANT])) { + $this->setPatternInstant(new FHIRInstant(array_merge($ext, $data[self::FIELD_PATTERN_INSTANT]))); + } } else { $this->setPatternInstant(new FHIRInstant($data[self::FIELD_PATTERN_INSTANT])); } @@ -5482,8 +5983,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PATTERN_INTEGER] instanceof FHIRInteger) { $this->setPatternInteger($data[self::FIELD_PATTERN_INTEGER]); - } elseif ($ext && is_scalar($data[self::FIELD_PATTERN_INTEGER])) { - $this->setPatternInteger(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_PATTERN_INTEGER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PATTERN_INTEGER])) { + $this->setPatternInteger(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_PATTERN_INTEGER]] + $ext)); + } else if (is_array($data[self::FIELD_PATTERN_INTEGER])) { + $this->setPatternInteger(new FHIRInteger(array_merge($ext, $data[self::FIELD_PATTERN_INTEGER]))); + } } else { $this->setPatternInteger(new FHIRInteger($data[self::FIELD_PATTERN_INTEGER])); } @@ -5494,8 +5999,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PATTERN_MARKDOWN] instanceof FHIRMarkdown) { $this->setPatternMarkdown($data[self::FIELD_PATTERN_MARKDOWN]); - } elseif ($ext && is_scalar($data[self::FIELD_PATTERN_MARKDOWN])) { - $this->setPatternMarkdown(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_PATTERN_MARKDOWN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PATTERN_MARKDOWN])) { + $this->setPatternMarkdown(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_PATTERN_MARKDOWN]] + $ext)); + } else if (is_array($data[self::FIELD_PATTERN_MARKDOWN])) { + $this->setPatternMarkdown(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_PATTERN_MARKDOWN]))); + } } else { $this->setPatternMarkdown(new FHIRMarkdown($data[self::FIELD_PATTERN_MARKDOWN])); } @@ -5513,8 +6022,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PATTERN_MONEY] instanceof FHIRMoney) { $this->setPatternMoney($data[self::FIELD_PATTERN_MONEY]); - } elseif ($ext && is_scalar($data[self::FIELD_PATTERN_MONEY])) { - $this->setPatternMoney(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_PATTERN_MONEY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PATTERN_MONEY])) { + $this->setPatternMoney(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_PATTERN_MONEY]] + $ext)); + } else if (is_array($data[self::FIELD_PATTERN_MONEY])) { + $this->setPatternMoney(new FHIRMoney(array_merge($ext, $data[self::FIELD_PATTERN_MONEY]))); + } } else { $this->setPatternMoney(new FHIRMoney($data[self::FIELD_PATTERN_MONEY])); } @@ -5525,8 +6038,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PATTERN_OID] instanceof FHIROid) { $this->setPatternOid($data[self::FIELD_PATTERN_OID]); - } elseif ($ext && is_scalar($data[self::FIELD_PATTERN_OID])) { - $this->setPatternOid(new FHIROid([FHIROid::FIELD_VALUE => $data[self::FIELD_PATTERN_OID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PATTERN_OID])) { + $this->setPatternOid(new FHIROid([FHIROid::FIELD_VALUE => $data[self::FIELD_PATTERN_OID]] + $ext)); + } else if (is_array($data[self::FIELD_PATTERN_OID])) { + $this->setPatternOid(new FHIROid(array_merge($ext, $data[self::FIELD_PATTERN_OID]))); + } } else { $this->setPatternOid(new FHIROid($data[self::FIELD_PATTERN_OID])); } @@ -5551,8 +6068,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PATTERN_POSITIVE_INT] instanceof FHIRPositiveInt) { $this->setPatternPositiveInt($data[self::FIELD_PATTERN_POSITIVE_INT]); - } elseif ($ext && is_scalar($data[self::FIELD_PATTERN_POSITIVE_INT])) { - $this->setPatternPositiveInt(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_PATTERN_POSITIVE_INT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PATTERN_POSITIVE_INT])) { + $this->setPatternPositiveInt(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_PATTERN_POSITIVE_INT]] + $ext)); + } else if (is_array($data[self::FIELD_PATTERN_POSITIVE_INT])) { + $this->setPatternPositiveInt(new FHIRPositiveInt(array_merge($ext, $data[self::FIELD_PATTERN_POSITIVE_INT]))); + } } else { $this->setPatternPositiveInt(new FHIRPositiveInt($data[self::FIELD_PATTERN_POSITIVE_INT])); } @@ -5563,8 +6084,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PATTERN_QUANTITY] instanceof FHIRQuantity) { $this->setPatternQuantity($data[self::FIELD_PATTERN_QUANTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_PATTERN_QUANTITY])) { - $this->setPatternQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_PATTERN_QUANTITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PATTERN_QUANTITY])) { + $this->setPatternQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_PATTERN_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_PATTERN_QUANTITY])) { + $this->setPatternQuantity(new FHIRQuantity(array_merge($ext, $data[self::FIELD_PATTERN_QUANTITY]))); + } } else { $this->setPatternQuantity(new FHIRQuantity($data[self::FIELD_PATTERN_QUANTITY])); } @@ -5617,8 +6142,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PATTERN_STRING] instanceof FHIRString) { $this->setPatternString($data[self::FIELD_PATTERN_STRING]); - } elseif ($ext && is_scalar($data[self::FIELD_PATTERN_STRING])) { - $this->setPatternString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PATTERN_STRING]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PATTERN_STRING])) { + $this->setPatternString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PATTERN_STRING]] + $ext)); + } else if (is_array($data[self::FIELD_PATTERN_STRING])) { + $this->setPatternString(new FHIRString(array_merge($ext, $data[self::FIELD_PATTERN_STRING]))); + } } else { $this->setPatternString(new FHIRString($data[self::FIELD_PATTERN_STRING])); } @@ -5629,8 +6158,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PATTERN_TIME] instanceof FHIRTime) { $this->setPatternTime($data[self::FIELD_PATTERN_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_PATTERN_TIME])) { - $this->setPatternTime(new FHIRTime([FHIRTime::FIELD_VALUE => $data[self::FIELD_PATTERN_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PATTERN_TIME])) { + $this->setPatternTime(new FHIRTime([FHIRTime::FIELD_VALUE => $data[self::FIELD_PATTERN_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_PATTERN_TIME])) { + $this->setPatternTime(new FHIRTime(array_merge($ext, $data[self::FIELD_PATTERN_TIME]))); + } } else { $this->setPatternTime(new FHIRTime($data[self::FIELD_PATTERN_TIME])); } @@ -5655,8 +6188,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PATTERN_UNSIGNED_INT] instanceof FHIRUnsignedInt) { $this->setPatternUnsignedInt($data[self::FIELD_PATTERN_UNSIGNED_INT]); - } elseif ($ext && is_scalar($data[self::FIELD_PATTERN_UNSIGNED_INT])) { - $this->setPatternUnsignedInt(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_PATTERN_UNSIGNED_INT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PATTERN_UNSIGNED_INT])) { + $this->setPatternUnsignedInt(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_PATTERN_UNSIGNED_INT]] + $ext)); + } else if (is_array($data[self::FIELD_PATTERN_UNSIGNED_INT])) { + $this->setPatternUnsignedInt(new FHIRUnsignedInt(array_merge($ext, $data[self::FIELD_PATTERN_UNSIGNED_INT]))); + } } else { $this->setPatternUnsignedInt(new FHIRUnsignedInt($data[self::FIELD_PATTERN_UNSIGNED_INT])); } @@ -5667,8 +6204,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PATTERN_URI] instanceof FHIRUri) { $this->setPatternUri($data[self::FIELD_PATTERN_URI]); - } elseif ($ext && is_scalar($data[self::FIELD_PATTERN_URI])) { - $this->setPatternUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_PATTERN_URI]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PATTERN_URI])) { + $this->setPatternUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_PATTERN_URI]] + $ext)); + } else if (is_array($data[self::FIELD_PATTERN_URI])) { + $this->setPatternUri(new FHIRUri(array_merge($ext, $data[self::FIELD_PATTERN_URI]))); + } } else { $this->setPatternUri(new FHIRUri($data[self::FIELD_PATTERN_URI])); } @@ -5679,8 +6220,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PATTERN_URL] instanceof FHIRUrl) { $this->setPatternUrl($data[self::FIELD_PATTERN_URL]); - } elseif ($ext && is_scalar($data[self::FIELD_PATTERN_URL])) { - $this->setPatternUrl(new FHIRUrl([FHIRUrl::FIELD_VALUE => $data[self::FIELD_PATTERN_URL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PATTERN_URL])) { + $this->setPatternUrl(new FHIRUrl([FHIRUrl::FIELD_VALUE => $data[self::FIELD_PATTERN_URL]] + $ext)); + } else if (is_array($data[self::FIELD_PATTERN_URL])) { + $this->setPatternUrl(new FHIRUrl(array_merge($ext, $data[self::FIELD_PATTERN_URL]))); + } } else { $this->setPatternUrl(new FHIRUrl($data[self::FIELD_PATTERN_URL])); } @@ -5698,8 +6243,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PATTERN_UUID] instanceof FHIRUuid) { $this->setPatternUuid($data[self::FIELD_PATTERN_UUID]); - } elseif ($ext && is_scalar($data[self::FIELD_PATTERN_UUID])) { - $this->setPatternUuid(new FHIRUuid([FHIRUuid::FIELD_VALUE => $data[self::FIELD_PATTERN_UUID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PATTERN_UUID])) { + $this->setPatternUuid(new FHIRUuid([FHIRUuid::FIELD_VALUE => $data[self::FIELD_PATTERN_UUID]] + $ext)); + } else if (is_array($data[self::FIELD_PATTERN_UUID])) { + $this->setPatternUuid(new FHIRUuid(array_merge($ext, $data[self::FIELD_PATTERN_UUID]))); + } } else { $this->setPatternUuid(new FHIRUuid($data[self::FIELD_PATTERN_UUID])); } @@ -5710,17 +6259,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_REPRESENTATION])) { foreach($data[self::FIELD_REPRESENTATION] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRPropertyRepresentation) { $this->addRepresentation($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addRepresentation(new FHIRPropertyRepresentation([FHIRPropertyRepresentation::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addRepresentation(new FHIRPropertyRepresentation([FHIRPropertyRepresentation::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addRepresentation(new FHIRPropertyRepresentation(array_merge($v, $ext[$i]))); + } } else { $this->addRepresentation(new FHIRPropertyRepresentation($v)); } } } elseif ($data[self::FIELD_REPRESENTATION] instanceof FHIRPropertyRepresentation) { $this->addRepresentation($data[self::FIELD_REPRESENTATION]); - } elseif ($ext && is_scalar($data[self::FIELD_REPRESENTATION])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_REPRESENTATION])) { $this->addRepresentation(new FHIRPropertyRepresentation([FHIRPropertyRepresentation::FIELD_VALUE => $data[self::FIELD_REPRESENTATION]] + $ext)); } else { $this->addRepresentation(new FHIRPropertyRepresentation($data[self::FIELD_REPRESENTATION])); @@ -5732,8 +6288,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_REQUIREMENTS] instanceof FHIRMarkdown) { $this->setRequirements($data[self::FIELD_REQUIREMENTS]); - } elseif ($ext && is_scalar($data[self::FIELD_REQUIREMENTS])) { - $this->setRequirements(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_REQUIREMENTS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_REQUIREMENTS])) { + $this->setRequirements(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_REQUIREMENTS]] + $ext)); + } else if (is_array($data[self::FIELD_REQUIREMENTS])) { + $this->setRequirements(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_REQUIREMENTS]))); + } } else { $this->setRequirements(new FHIRMarkdown($data[self::FIELD_REQUIREMENTS])); } @@ -5744,8 +6304,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SHORT] instanceof FHIRString) { $this->setShort($data[self::FIELD_SHORT]); - } elseif ($ext && is_scalar($data[self::FIELD_SHORT])) { - $this->setShort(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SHORT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SHORT])) { + $this->setShort(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SHORT]] + $ext)); + } else if (is_array($data[self::FIELD_SHORT])) { + $this->setShort(new FHIRString(array_merge($ext, $data[self::FIELD_SHORT]))); + } } else { $this->setShort(new FHIRString($data[self::FIELD_SHORT])); } @@ -5756,8 +6320,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SLICE_IS_CONSTRAINING] instanceof FHIRBoolean) { $this->setSliceIsConstraining($data[self::FIELD_SLICE_IS_CONSTRAINING]); - } elseif ($ext && is_scalar($data[self::FIELD_SLICE_IS_CONSTRAINING])) { - $this->setSliceIsConstraining(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_SLICE_IS_CONSTRAINING]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SLICE_IS_CONSTRAINING])) { + $this->setSliceIsConstraining(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_SLICE_IS_CONSTRAINING]] + $ext)); + } else if (is_array($data[self::FIELD_SLICE_IS_CONSTRAINING])) { + $this->setSliceIsConstraining(new FHIRBoolean(array_merge($ext, $data[self::FIELD_SLICE_IS_CONSTRAINING]))); + } } else { $this->setSliceIsConstraining(new FHIRBoolean($data[self::FIELD_SLICE_IS_CONSTRAINING])); } @@ -5768,8 +6336,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SLICE_NAME] instanceof FHIRString) { $this->setSliceName($data[self::FIELD_SLICE_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_SLICE_NAME])) { - $this->setSliceName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SLICE_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SLICE_NAME])) { + $this->setSliceName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SLICE_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_SLICE_NAME])) { + $this->setSliceName(new FHIRString(array_merge($ext, $data[self::FIELD_SLICE_NAME]))); + } } else { $this->setSliceName(new FHIRString($data[self::FIELD_SLICE_NAME])); } @@ -5784,6 +6356,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_TYPE])) { if (is_array($data[self::FIELD_TYPE])) { foreach($data[self::FIELD_TYPE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRElementDefinitionType) { $this->addType($v); } else { @@ -16024,11 +16599,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getBase())) { $v->xmlSerialize($sxe->addChild(self::FIELD_BASE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getBinding())) { $v->xmlSerialize($sxe->addChild(self::FIELD_BINDING, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getCode())) { foreach($vs as $v) { if (null === $v) { @@ -16037,6 +16610,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getComment())) { $v->xmlSerialize($sxe->addChild(self::FIELD_COMMENT, null, $v->_getFHIRXMLNamespace())); } @@ -16057,22 +16631,19 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_CONSTRAINT, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getContentReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CONTENT_REFERENCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDefaultValueAddress())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFAULT_VALUE_ADDRESS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDefaultValueAge())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFAULT_VALUE_AGE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDefaultValueAnnotation())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFAULT_VALUE_ANNOTATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDefaultValueAttachment())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFAULT_VALUE_ATTACHMENT, null, $v->_getFHIRXMLNamespace())); } @@ -16088,31 +16659,24 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDefaultValueCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFAULT_VALUE_CODE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDefaultValueCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFAULT_VALUE_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDefaultValueCoding())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFAULT_VALUE_CODING, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDefaultValueContactDetail())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFAULT_VALUE_CONTACT_DETAIL, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDefaultValueContactPoint())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFAULT_VALUE_CONTACT_POINT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDefaultValueContributor())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFAULT_VALUE_CONTRIBUTOR, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDefaultValueCount())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFAULT_VALUE_COUNT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDefaultValueDataRequirement())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFAULT_VALUE_DATA_REQUIREMENT, null, $v->_getFHIRXMLNamespace())); } @@ -16125,30 +16689,24 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDefaultValueDecimal())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFAULT_VALUE_DECIMAL, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDefaultValueDistance())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFAULT_VALUE_DISTANCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDefaultValueDosage())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFAULT_VALUE_DOSAGE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDefaultValueDuration())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFAULT_VALUE_DURATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDefaultValueExpression())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFAULT_VALUE_EXPRESSION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDefaultValueHumanName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFAULT_VALUE_HUMAN_NAME, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getDefaultValueId())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFAULT_VALUE_ID, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDefaultValueIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFAULT_VALUE_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } @@ -16161,53 +16719,42 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDefaultValueMarkdown())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFAULT_VALUE_MARKDOWN, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDefaultValueMeta())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFAULT_VALUE_META, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDefaultValueMoney())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFAULT_VALUE_MONEY, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getDefaultValueOid())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFAULT_VALUE_OID, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDefaultValueParameterDefinition())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFAULT_VALUE_PARAMETER_DEFINITION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDefaultValuePeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFAULT_VALUE_PERIOD, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getDefaultValuePositiveInt())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFAULT_VALUE_POSITIVE_INT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDefaultValueQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFAULT_VALUE_QUANTITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDefaultValueRange())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFAULT_VALUE_RANGE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDefaultValueRatio())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFAULT_VALUE_RATIO, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDefaultValueReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFAULT_VALUE_REFERENCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDefaultValueRelatedArtifact())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFAULT_VALUE_RELATED_ARTIFACT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDefaultValueSampledData())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFAULT_VALUE_SAMPLED_DATA, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDefaultValueSignature())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFAULT_VALUE_SIGNATURE, null, $v->_getFHIRXMLNamespace())); } @@ -16217,11 +16764,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDefaultValueTime())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFAULT_VALUE_TIME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDefaultValueTiming())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFAULT_VALUE_TIMING, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDefaultValueTriggerDefinition())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFAULT_VALUE_TRIGGER_DEFINITION, null, $v->_getFHIRXMLNamespace())); } @@ -16234,7 +16779,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDefaultValueUrl())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFAULT_VALUE_URL, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDefaultValueUsageContext())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFAULT_VALUE_USAGE_CONTEXT, null, $v->_getFHIRXMLNamespace())); } @@ -16244,7 +16788,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDefinition())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFINITION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getExample())) { foreach($vs as $v) { if (null === $v) { @@ -16257,15 +16800,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getFixedAddress())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FIXED_ADDRESS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getFixedAge())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FIXED_AGE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getFixedAnnotation())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FIXED_ANNOTATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getFixedAttachment())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FIXED_ATTACHMENT, null, $v->_getFHIRXMLNamespace())); } @@ -16281,31 +16821,24 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getFixedCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FIXED_CODE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getFixedCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FIXED_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getFixedCoding())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FIXED_CODING, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getFixedContactDetail())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FIXED_CONTACT_DETAIL, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getFixedContactPoint())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FIXED_CONTACT_POINT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getFixedContributor())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FIXED_CONTRIBUTOR, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getFixedCount())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FIXED_COUNT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getFixedDataRequirement())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FIXED_DATA_REQUIREMENT, null, $v->_getFHIRXMLNamespace())); } @@ -16318,30 +16851,24 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getFixedDecimal())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FIXED_DECIMAL, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getFixedDistance())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FIXED_DISTANCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getFixedDosage())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FIXED_DOSAGE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getFixedDuration())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FIXED_DURATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getFixedExpression())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FIXED_EXPRESSION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getFixedHumanName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FIXED_HUMAN_NAME, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getFixedId())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FIXED_ID, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getFixedIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FIXED_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } @@ -16354,53 +16881,42 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getFixedMarkdown())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FIXED_MARKDOWN, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getFixedMeta())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FIXED_META, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getFixedMoney())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FIXED_MONEY, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getFixedOid())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FIXED_OID, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getFixedParameterDefinition())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FIXED_PARAMETER_DEFINITION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getFixedPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FIXED_PERIOD, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getFixedPositiveInt())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FIXED_POSITIVE_INT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getFixedQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FIXED_QUANTITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getFixedRange())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FIXED_RANGE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getFixedRatio())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FIXED_RATIO, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getFixedReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FIXED_REFERENCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getFixedRelatedArtifact())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FIXED_RELATED_ARTIFACT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getFixedSampledData())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FIXED_SAMPLED_DATA, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getFixedSignature())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FIXED_SIGNATURE, null, $v->_getFHIRXMLNamespace())); } @@ -16410,11 +16926,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getFixedTime())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FIXED_TIME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getFixedTiming())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FIXED_TIMING, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getFixedTriggerDefinition())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FIXED_TRIGGER_DEFINITION, null, $v->_getFHIRXMLNamespace())); } @@ -16427,7 +16941,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getFixedUrl())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FIXED_URL, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getFixedUsageContext())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FIXED_USAGE_CONTEXT, null, $v->_getFHIRXMLNamespace())); } @@ -16446,7 +16959,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getLabel())) { $v->xmlSerialize($sxe->addChild(self::FIELD_LABEL, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getMapping())) { foreach($vs as $v) { if (null === $v) { @@ -16455,6 +16967,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_MAPPING, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getMax())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MAX, null, $v->_getFHIRXMLNamespace())); } @@ -16479,7 +16992,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getMaxValuePositiveInt())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MAX_VALUE_POSITIVE_INT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getMaxValueQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MAX_VALUE_QUANTITY, null, $v->_getFHIRXMLNamespace())); } @@ -16513,7 +17025,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getMinValuePositiveInt())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MIN_VALUE_POSITIVE_INT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getMinValueQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MIN_VALUE_QUANTITY, null, $v->_getFHIRXMLNamespace())); } @@ -16532,19 +17043,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getPath())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATH, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPatternAddress())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATTERN_ADDRESS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPatternAge())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATTERN_AGE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPatternAnnotation())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATTERN_ANNOTATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPatternAttachment())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATTERN_ATTACHMENT, null, $v->_getFHIRXMLNamespace())); } @@ -16560,31 +17067,24 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getPatternCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATTERN_CODE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPatternCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATTERN_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPatternCoding())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATTERN_CODING, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPatternContactDetail())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATTERN_CONTACT_DETAIL, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPatternContactPoint())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATTERN_CONTACT_POINT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPatternContributor())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATTERN_CONTRIBUTOR, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPatternCount())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATTERN_COUNT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPatternDataRequirement())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATTERN_DATA_REQUIREMENT, null, $v->_getFHIRXMLNamespace())); } @@ -16597,30 +17097,24 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getPatternDecimal())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATTERN_DECIMAL, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPatternDistance())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATTERN_DISTANCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPatternDosage())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATTERN_DOSAGE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPatternDuration())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATTERN_DURATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPatternExpression())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATTERN_EXPRESSION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPatternHumanName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATTERN_HUMAN_NAME, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getPatternId())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATTERN_ID, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPatternIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATTERN_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } @@ -16633,53 +17127,42 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getPatternMarkdown())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATTERN_MARKDOWN, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPatternMeta())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATTERN_META, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPatternMoney())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATTERN_MONEY, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getPatternOid())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATTERN_OID, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPatternParameterDefinition())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATTERN_PARAMETER_DEFINITION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPatternPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATTERN_PERIOD, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getPatternPositiveInt())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATTERN_POSITIVE_INT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPatternQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATTERN_QUANTITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPatternRange())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATTERN_RANGE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPatternRatio())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATTERN_RATIO, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPatternReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATTERN_REFERENCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPatternRelatedArtifact())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATTERN_RELATED_ARTIFACT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPatternSampledData())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATTERN_SAMPLED_DATA, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPatternSignature())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATTERN_SIGNATURE, null, $v->_getFHIRXMLNamespace())); } @@ -16689,11 +17172,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getPatternTime())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATTERN_TIME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPatternTiming())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATTERN_TIMING, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPatternTriggerDefinition())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATTERN_TRIGGER_DEFINITION, null, $v->_getFHIRXMLNamespace())); } @@ -16706,14 +17187,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getPatternUrl())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATTERN_URL, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPatternUsageContext())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATTERN_USAGE_CONTEXT, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getPatternUuid())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATTERN_UUID, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getRepresentation())) { foreach($vs as $v) { if (null === $v) { @@ -16722,6 +17201,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_REPRESENTATION, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getRequirements())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REQUIREMENTS, null, $v->_getFHIRXMLNamespace())); } @@ -16734,11 +17214,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getSliceName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SLICE_NAME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSlicing())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SLICING, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getType())) { foreach($vs as $v) { if (null === $v) { @@ -16747,6 +17225,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } @@ -16762,8 +17241,17 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_ALIAS][] = $v->getValue(); - $a[self::FIELD_ALIAS_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ALIAS][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ALIAS_EXT][] = $enc; + } else { + $a[self::FIELD_ALIAS_EXT][] = null; + } + } else { + $a[self::FIELD_ALIAS][] = $v; + } } } if (null !== ($v = $this->getBase())) { @@ -16776,8 +17264,15 @@ public function jsonSerialize() $a[self::FIELD_CODE] = $vs; } if (null !== ($v = $this->getComment())) { - $a[self::FIELD_COMMENT] = $v->getValue(); - $a[self::FIELD_COMMENT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_COMMENT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_COMMENT_EXT] = $enc; + } + } else { + $a[self::FIELD_COMMENT] = $v; + } } if ([] !== ($vs = $this->getCondition())) { $a[self::FIELD_CONDITION] = []; @@ -16785,22 +17280,46 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_CONDITION][] = $v->getValue(); - $a[self::FIELD_CONDITION_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CONDITION][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CONDITION_EXT][] = $enc; + } else { + $a[self::FIELD_CONDITION_EXT][] = null; + } + } else { + $a[self::FIELD_CONDITION][] = $v; + } } } if ([] !== ($vs = $this->getConstraint())) { $a[self::FIELD_CONSTRAINT] = $vs; } if (null !== ($v = $this->getContentReference())) { - $a[self::FIELD_CONTENT_REFERENCE] = $v->getValue(); - $a[self::FIELD_CONTENT_REFERENCE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CONTENT_REFERENCE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CONTENT_REFERENCE_EXT] = $enc; + } + } else { + $a[self::FIELD_CONTENT_REFERENCE] = $v; + } } if (null !== ($v = $this->getDefaultValueAddress())) { $a[self::FIELD_DEFAULT_VALUE_ADDRESS] = $v; } if (null !== ($v = $this->getDefaultValueAge())) { - $a[self::FIELD_DEFAULT_VALUE_AGE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DEFAULT_VALUE_AGE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DEFAULT_VALUE_AGE_EXT] = $enc; + } + } else { + $a[self::FIELD_DEFAULT_VALUE_AGE] = $v; + } } if (null !== ($v = $this->getDefaultValueAnnotation())) { $a[self::FIELD_DEFAULT_VALUE_ANNOTATION] = $v; @@ -16809,20 +17328,48 @@ public function jsonSerialize() $a[self::FIELD_DEFAULT_VALUE_ATTACHMENT] = $v; } if (null !== ($v = $this->getDefaultValueBase64Binary())) { - $a[self::FIELD_DEFAULT_VALUE_BASE_64BINARY] = $v->getValue(); - $a[self::FIELD_DEFAULT_VALUE_BASE_64BINARY_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DEFAULT_VALUE_BASE_64BINARY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DEFAULT_VALUE_BASE_64BINARY_EXT] = $enc; + } + } else { + $a[self::FIELD_DEFAULT_VALUE_BASE_64BINARY] = $v; + } } if (null !== ($v = $this->getDefaultValueBoolean())) { - $a[self::FIELD_DEFAULT_VALUE_BOOLEAN] = $v->getValue(); - $a[self::FIELD_DEFAULT_VALUE_BOOLEAN_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DEFAULT_VALUE_BOOLEAN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DEFAULT_VALUE_BOOLEAN_EXT] = $enc; + } + } else { + $a[self::FIELD_DEFAULT_VALUE_BOOLEAN] = $v; + } } if (null !== ($v = $this->getDefaultValueCanonical())) { - $a[self::FIELD_DEFAULT_VALUE_CANONICAL] = $v->getValue(); - $a[self::FIELD_DEFAULT_VALUE_CANONICAL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DEFAULT_VALUE_CANONICAL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DEFAULT_VALUE_CANONICAL_EXT] = $enc; + } + } else { + $a[self::FIELD_DEFAULT_VALUE_CANONICAL] = $v; + } } if (null !== ($v = $this->getDefaultValueCode())) { - $a[self::FIELD_DEFAULT_VALUE_CODE] = $v->getValue(); - $a[self::FIELD_DEFAULT_VALUE_CODE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DEFAULT_VALUE_CODE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DEFAULT_VALUE_CODE_EXT] = $enc; + } + } else { + $a[self::FIELD_DEFAULT_VALUE_CODE] = $v; + } } if (null !== ($v = $this->getDefaultValueCodeableConcept())) { $a[self::FIELD_DEFAULT_VALUE_CODEABLE_CONCEPT] = $v; @@ -16834,37 +17381,90 @@ public function jsonSerialize() $a[self::FIELD_DEFAULT_VALUE_CONTACT_DETAIL] = $v; } if (null !== ($v = $this->getDefaultValueContactPoint())) { - $a[self::FIELD_DEFAULT_VALUE_CONTACT_POINT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DEFAULT_VALUE_CONTACT_POINT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DEFAULT_VALUE_CONTACT_POINT_EXT] = $enc; + } + } else { + $a[self::FIELD_DEFAULT_VALUE_CONTACT_POINT] = $v; + } } if (null !== ($v = $this->getDefaultValueContributor())) { $a[self::FIELD_DEFAULT_VALUE_CONTRIBUTOR] = $v; } if (null !== ($v = $this->getDefaultValueCount())) { - $a[self::FIELD_DEFAULT_VALUE_COUNT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DEFAULT_VALUE_COUNT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DEFAULT_VALUE_COUNT_EXT] = $enc; + } + } else { + $a[self::FIELD_DEFAULT_VALUE_COUNT] = $v; + } } if (null !== ($v = $this->getDefaultValueDataRequirement())) { $a[self::FIELD_DEFAULT_VALUE_DATA_REQUIREMENT] = $v; } if (null !== ($v = $this->getDefaultValueDate())) { - $a[self::FIELD_DEFAULT_VALUE_DATE] = $v->getValue(); - $a[self::FIELD_DEFAULT_VALUE_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DEFAULT_VALUE_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DEFAULT_VALUE_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_DEFAULT_VALUE_DATE] = $v; + } } if (null !== ($v = $this->getDefaultValueDateTime())) { - $a[self::FIELD_DEFAULT_VALUE_DATE_TIME] = $v->getValue(); - $a[self::FIELD_DEFAULT_VALUE_DATE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DEFAULT_VALUE_DATE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DEFAULT_VALUE_DATE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_DEFAULT_VALUE_DATE_TIME] = $v; + } } if (null !== ($v = $this->getDefaultValueDecimal())) { - $a[self::FIELD_DEFAULT_VALUE_DECIMAL] = $v->getValue(); - $a[self::FIELD_DEFAULT_VALUE_DECIMAL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DEFAULT_VALUE_DECIMAL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DEFAULT_VALUE_DECIMAL_EXT] = $enc; + } + } else { + $a[self::FIELD_DEFAULT_VALUE_DECIMAL] = $v; + } } if (null !== ($v = $this->getDefaultValueDistance())) { - $a[self::FIELD_DEFAULT_VALUE_DISTANCE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DEFAULT_VALUE_DISTANCE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DEFAULT_VALUE_DISTANCE_EXT] = $enc; + } + } else { + $a[self::FIELD_DEFAULT_VALUE_DISTANCE] = $v; + } } if (null !== ($v = $this->getDefaultValueDosage())) { $a[self::FIELD_DEFAULT_VALUE_DOSAGE] = $v; } if (null !== ($v = $this->getDefaultValueDuration())) { - $a[self::FIELD_DEFAULT_VALUE_DURATION] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DEFAULT_VALUE_DURATION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DEFAULT_VALUE_DURATION_EXT] = $enc; + } + } else { + $a[self::FIELD_DEFAULT_VALUE_DURATION] = $v; + } } if (null !== ($v = $this->getDefaultValueExpression())) { $a[self::FIELD_DEFAULT_VALUE_EXPRESSION] = $v; @@ -16873,33 +17473,84 @@ public function jsonSerialize() $a[self::FIELD_DEFAULT_VALUE_HUMAN_NAME] = $v; } if (null !== ($v = $this->getDefaultValueId())) { - $a[self::FIELD_DEFAULT_VALUE_ID] = $v->getValue(); - $a[self::FIELD_DEFAULT_VALUE_ID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DEFAULT_VALUE_ID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DEFAULT_VALUE_ID_EXT] = $enc; + } + } else { + $a[self::FIELD_DEFAULT_VALUE_ID] = $v; + } } if (null !== ($v = $this->getDefaultValueIdentifier())) { - $a[self::FIELD_DEFAULT_VALUE_IDENTIFIER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DEFAULT_VALUE_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DEFAULT_VALUE_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_DEFAULT_VALUE_IDENTIFIER] = $v; + } } if (null !== ($v = $this->getDefaultValueInstant())) { - $a[self::FIELD_DEFAULT_VALUE_INSTANT] = $v->getValue(); - $a[self::FIELD_DEFAULT_VALUE_INSTANT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DEFAULT_VALUE_INSTANT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DEFAULT_VALUE_INSTANT_EXT] = $enc; + } + } else { + $a[self::FIELD_DEFAULT_VALUE_INSTANT] = $v; + } } if (null !== ($v = $this->getDefaultValueInteger())) { - $a[self::FIELD_DEFAULT_VALUE_INTEGER] = $v->getValue(); - $a[self::FIELD_DEFAULT_VALUE_INTEGER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DEFAULT_VALUE_INTEGER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DEFAULT_VALUE_INTEGER_EXT] = $enc; + } + } else { + $a[self::FIELD_DEFAULT_VALUE_INTEGER] = $v; + } } if (null !== ($v = $this->getDefaultValueMarkdown())) { - $a[self::FIELD_DEFAULT_VALUE_MARKDOWN] = $v->getValue(); - $a[self::FIELD_DEFAULT_VALUE_MARKDOWN_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DEFAULT_VALUE_MARKDOWN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DEFAULT_VALUE_MARKDOWN_EXT] = $enc; + } + } else { + $a[self::FIELD_DEFAULT_VALUE_MARKDOWN] = $v; + } } if (null !== ($v = $this->getDefaultValueMeta())) { $a[self::FIELD_DEFAULT_VALUE_META] = $v; } if (null !== ($v = $this->getDefaultValueMoney())) { - $a[self::FIELD_DEFAULT_VALUE_MONEY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DEFAULT_VALUE_MONEY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DEFAULT_VALUE_MONEY_EXT] = $enc; + } + } else { + $a[self::FIELD_DEFAULT_VALUE_MONEY] = $v; + } } if (null !== ($v = $this->getDefaultValueOid())) { - $a[self::FIELD_DEFAULT_VALUE_OID] = $v->getValue(); - $a[self::FIELD_DEFAULT_VALUE_OID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DEFAULT_VALUE_OID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DEFAULT_VALUE_OID_EXT] = $enc; + } + } else { + $a[self::FIELD_DEFAULT_VALUE_OID] = $v; + } } if (null !== ($v = $this->getDefaultValueParameterDefinition())) { $a[self::FIELD_DEFAULT_VALUE_PARAMETER_DEFINITION] = $v; @@ -16908,11 +17559,26 @@ public function jsonSerialize() $a[self::FIELD_DEFAULT_VALUE_PERIOD] = $v; } if (null !== ($v = $this->getDefaultValuePositiveInt())) { - $a[self::FIELD_DEFAULT_VALUE_POSITIVE_INT] = $v->getValue(); - $a[self::FIELD_DEFAULT_VALUE_POSITIVE_INT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DEFAULT_VALUE_POSITIVE_INT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DEFAULT_VALUE_POSITIVE_INT_EXT] = $enc; + } + } else { + $a[self::FIELD_DEFAULT_VALUE_POSITIVE_INT] = $v; + } } if (null !== ($v = $this->getDefaultValueQuantity())) { - $a[self::FIELD_DEFAULT_VALUE_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DEFAULT_VALUE_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DEFAULT_VALUE_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_DEFAULT_VALUE_QUANTITY] = $v; + } } if (null !== ($v = $this->getDefaultValueRange())) { $a[self::FIELD_DEFAULT_VALUE_RANGE] = $v; @@ -16933,12 +17599,26 @@ public function jsonSerialize() $a[self::FIELD_DEFAULT_VALUE_SIGNATURE] = $v; } if (null !== ($v = $this->getDefaultValueString())) { - $a[self::FIELD_DEFAULT_VALUE_STRING] = $v->getValue(); - $a[self::FIELD_DEFAULT_VALUE_STRING_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DEFAULT_VALUE_STRING] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DEFAULT_VALUE_STRING_EXT] = $enc; + } + } else { + $a[self::FIELD_DEFAULT_VALUE_STRING] = $v; + } } if (null !== ($v = $this->getDefaultValueTime())) { - $a[self::FIELD_DEFAULT_VALUE_TIME] = $v->getValue(); - $a[self::FIELD_DEFAULT_VALUE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DEFAULT_VALUE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DEFAULT_VALUE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_DEFAULT_VALUE_TIME] = $v; + } } if (null !== ($v = $this->getDefaultValueTiming())) { $a[self::FIELD_DEFAULT_VALUE_TIMING] = $v; @@ -16947,27 +17627,62 @@ public function jsonSerialize() $a[self::FIELD_DEFAULT_VALUE_TRIGGER_DEFINITION] = $v; } if (null !== ($v = $this->getDefaultValueUnsignedInt())) { - $a[self::FIELD_DEFAULT_VALUE_UNSIGNED_INT] = $v->getValue(); - $a[self::FIELD_DEFAULT_VALUE_UNSIGNED_INT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DEFAULT_VALUE_UNSIGNED_INT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DEFAULT_VALUE_UNSIGNED_INT_EXT] = $enc; + } + } else { + $a[self::FIELD_DEFAULT_VALUE_UNSIGNED_INT] = $v; + } } if (null !== ($v = $this->getDefaultValueUri())) { - $a[self::FIELD_DEFAULT_VALUE_URI] = $v->getValue(); - $a[self::FIELD_DEFAULT_VALUE_URI_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DEFAULT_VALUE_URI] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DEFAULT_VALUE_URI_EXT] = $enc; + } + } else { + $a[self::FIELD_DEFAULT_VALUE_URI] = $v; + } } if (null !== ($v = $this->getDefaultValueUrl())) { - $a[self::FIELD_DEFAULT_VALUE_URL] = $v->getValue(); - $a[self::FIELD_DEFAULT_VALUE_URL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DEFAULT_VALUE_URL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DEFAULT_VALUE_URL_EXT] = $enc; + } + } else { + $a[self::FIELD_DEFAULT_VALUE_URL] = $v; + } } if (null !== ($v = $this->getDefaultValueUsageContext())) { $a[self::FIELD_DEFAULT_VALUE_USAGE_CONTEXT] = $v; } if (null !== ($v = $this->getDefaultValueUuid())) { - $a[self::FIELD_DEFAULT_VALUE_UUID] = $v->getValue(); - $a[self::FIELD_DEFAULT_VALUE_UUID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DEFAULT_VALUE_UUID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DEFAULT_VALUE_UUID_EXT] = $enc; + } + } else { + $a[self::FIELD_DEFAULT_VALUE_UUID] = $v; + } } if (null !== ($v = $this->getDefinition())) { - $a[self::FIELD_DEFINITION] = $v->getValue(); - $a[self::FIELD_DEFINITION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DEFINITION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DEFINITION_EXT] = $enc; + } + } else { + $a[self::FIELD_DEFINITION] = $v; + } } if ([] !== ($vs = $this->getExample())) { $a[self::FIELD_EXAMPLE] = $vs; @@ -16976,7 +17691,15 @@ public function jsonSerialize() $a[self::FIELD_FIXED_ADDRESS] = $v; } if (null !== ($v = $this->getFixedAge())) { - $a[self::FIELD_FIXED_AGE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FIXED_AGE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FIXED_AGE_EXT] = $enc; + } + } else { + $a[self::FIELD_FIXED_AGE] = $v; + } } if (null !== ($v = $this->getFixedAnnotation())) { $a[self::FIELD_FIXED_ANNOTATION] = $v; @@ -16985,20 +17708,48 @@ public function jsonSerialize() $a[self::FIELD_FIXED_ATTACHMENT] = $v; } if (null !== ($v = $this->getFixedBase64Binary())) { - $a[self::FIELD_FIXED_BASE_64BINARY] = $v->getValue(); - $a[self::FIELD_FIXED_BASE_64BINARY_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FIXED_BASE_64BINARY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FIXED_BASE_64BINARY_EXT] = $enc; + } + } else { + $a[self::FIELD_FIXED_BASE_64BINARY] = $v; + } } if (null !== ($v = $this->getFixedBoolean())) { - $a[self::FIELD_FIXED_BOOLEAN] = $v->getValue(); - $a[self::FIELD_FIXED_BOOLEAN_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FIXED_BOOLEAN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FIXED_BOOLEAN_EXT] = $enc; + } + } else { + $a[self::FIELD_FIXED_BOOLEAN] = $v; + } } if (null !== ($v = $this->getFixedCanonical())) { - $a[self::FIELD_FIXED_CANONICAL] = $v->getValue(); - $a[self::FIELD_FIXED_CANONICAL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FIXED_CANONICAL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FIXED_CANONICAL_EXT] = $enc; + } + } else { + $a[self::FIELD_FIXED_CANONICAL] = $v; + } } if (null !== ($v = $this->getFixedCode())) { - $a[self::FIELD_FIXED_CODE] = $v->getValue(); - $a[self::FIELD_FIXED_CODE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FIXED_CODE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FIXED_CODE_EXT] = $enc; + } + } else { + $a[self::FIELD_FIXED_CODE] = $v; + } } if (null !== ($v = $this->getFixedCodeableConcept())) { $a[self::FIELD_FIXED_CODEABLE_CONCEPT] = $v; @@ -17010,37 +17761,90 @@ public function jsonSerialize() $a[self::FIELD_FIXED_CONTACT_DETAIL] = $v; } if (null !== ($v = $this->getFixedContactPoint())) { - $a[self::FIELD_FIXED_CONTACT_POINT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FIXED_CONTACT_POINT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FIXED_CONTACT_POINT_EXT] = $enc; + } + } else { + $a[self::FIELD_FIXED_CONTACT_POINT] = $v; + } } if (null !== ($v = $this->getFixedContributor())) { $a[self::FIELD_FIXED_CONTRIBUTOR] = $v; } if (null !== ($v = $this->getFixedCount())) { - $a[self::FIELD_FIXED_COUNT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FIXED_COUNT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FIXED_COUNT_EXT] = $enc; + } + } else { + $a[self::FIELD_FIXED_COUNT] = $v; + } } if (null !== ($v = $this->getFixedDataRequirement())) { $a[self::FIELD_FIXED_DATA_REQUIREMENT] = $v; } if (null !== ($v = $this->getFixedDate())) { - $a[self::FIELD_FIXED_DATE] = $v->getValue(); - $a[self::FIELD_FIXED_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FIXED_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FIXED_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_FIXED_DATE] = $v; + } } if (null !== ($v = $this->getFixedDateTime())) { - $a[self::FIELD_FIXED_DATE_TIME] = $v->getValue(); - $a[self::FIELD_FIXED_DATE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FIXED_DATE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FIXED_DATE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_FIXED_DATE_TIME] = $v; + } } if (null !== ($v = $this->getFixedDecimal())) { - $a[self::FIELD_FIXED_DECIMAL] = $v->getValue(); - $a[self::FIELD_FIXED_DECIMAL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FIXED_DECIMAL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FIXED_DECIMAL_EXT] = $enc; + } + } else { + $a[self::FIELD_FIXED_DECIMAL] = $v; + } } if (null !== ($v = $this->getFixedDistance())) { - $a[self::FIELD_FIXED_DISTANCE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FIXED_DISTANCE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FIXED_DISTANCE_EXT] = $enc; + } + } else { + $a[self::FIELD_FIXED_DISTANCE] = $v; + } } if (null !== ($v = $this->getFixedDosage())) { $a[self::FIELD_FIXED_DOSAGE] = $v; } if (null !== ($v = $this->getFixedDuration())) { - $a[self::FIELD_FIXED_DURATION] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FIXED_DURATION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FIXED_DURATION_EXT] = $enc; + } + } else { + $a[self::FIELD_FIXED_DURATION] = $v; + } } if (null !== ($v = $this->getFixedExpression())) { $a[self::FIELD_FIXED_EXPRESSION] = $v; @@ -17049,33 +17853,84 @@ public function jsonSerialize() $a[self::FIELD_FIXED_HUMAN_NAME] = $v; } if (null !== ($v = $this->getFixedId())) { - $a[self::FIELD_FIXED_ID] = $v->getValue(); - $a[self::FIELD_FIXED_ID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FIXED_ID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FIXED_ID_EXT] = $enc; + } + } else { + $a[self::FIELD_FIXED_ID] = $v; + } } if (null !== ($v = $this->getFixedIdentifier())) { - $a[self::FIELD_FIXED_IDENTIFIER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FIXED_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FIXED_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_FIXED_IDENTIFIER] = $v; + } } if (null !== ($v = $this->getFixedInstant())) { - $a[self::FIELD_FIXED_INSTANT] = $v->getValue(); - $a[self::FIELD_FIXED_INSTANT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FIXED_INSTANT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FIXED_INSTANT_EXT] = $enc; + } + } else { + $a[self::FIELD_FIXED_INSTANT] = $v; + } } if (null !== ($v = $this->getFixedInteger())) { - $a[self::FIELD_FIXED_INTEGER] = $v->getValue(); - $a[self::FIELD_FIXED_INTEGER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FIXED_INTEGER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FIXED_INTEGER_EXT] = $enc; + } + } else { + $a[self::FIELD_FIXED_INTEGER] = $v; + } } if (null !== ($v = $this->getFixedMarkdown())) { - $a[self::FIELD_FIXED_MARKDOWN] = $v->getValue(); - $a[self::FIELD_FIXED_MARKDOWN_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FIXED_MARKDOWN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FIXED_MARKDOWN_EXT] = $enc; + } + } else { + $a[self::FIELD_FIXED_MARKDOWN] = $v; + } } if (null !== ($v = $this->getFixedMeta())) { $a[self::FIELD_FIXED_META] = $v; } if (null !== ($v = $this->getFixedMoney())) { - $a[self::FIELD_FIXED_MONEY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FIXED_MONEY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FIXED_MONEY_EXT] = $enc; + } + } else { + $a[self::FIELD_FIXED_MONEY] = $v; + } } if (null !== ($v = $this->getFixedOid())) { - $a[self::FIELD_FIXED_OID] = $v->getValue(); - $a[self::FIELD_FIXED_OID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FIXED_OID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FIXED_OID_EXT] = $enc; + } + } else { + $a[self::FIELD_FIXED_OID] = $v; + } } if (null !== ($v = $this->getFixedParameterDefinition())) { $a[self::FIELD_FIXED_PARAMETER_DEFINITION] = $v; @@ -17084,11 +17939,26 @@ public function jsonSerialize() $a[self::FIELD_FIXED_PERIOD] = $v; } if (null !== ($v = $this->getFixedPositiveInt())) { - $a[self::FIELD_FIXED_POSITIVE_INT] = $v->getValue(); - $a[self::FIELD_FIXED_POSITIVE_INT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FIXED_POSITIVE_INT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FIXED_POSITIVE_INT_EXT] = $enc; + } + } else { + $a[self::FIELD_FIXED_POSITIVE_INT] = $v; + } } if (null !== ($v = $this->getFixedQuantity())) { - $a[self::FIELD_FIXED_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FIXED_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FIXED_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_FIXED_QUANTITY] = $v; + } } if (null !== ($v = $this->getFixedRange())) { $a[self::FIELD_FIXED_RANGE] = $v; @@ -17109,12 +17979,26 @@ public function jsonSerialize() $a[self::FIELD_FIXED_SIGNATURE] = $v; } if (null !== ($v = $this->getFixedString())) { - $a[self::FIELD_FIXED_STRING] = $v->getValue(); - $a[self::FIELD_FIXED_STRING_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FIXED_STRING] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FIXED_STRING_EXT] = $enc; + } + } else { + $a[self::FIELD_FIXED_STRING] = $v; + } } if (null !== ($v = $this->getFixedTime())) { - $a[self::FIELD_FIXED_TIME] = $v->getValue(); - $a[self::FIELD_FIXED_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FIXED_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FIXED_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_FIXED_TIME] = $v; + } } if (null !== ($v = $this->getFixedTiming())) { $a[self::FIELD_FIXED_TIMING] = $v; @@ -17123,146 +18007,387 @@ public function jsonSerialize() $a[self::FIELD_FIXED_TRIGGER_DEFINITION] = $v; } if (null !== ($v = $this->getFixedUnsignedInt())) { - $a[self::FIELD_FIXED_UNSIGNED_INT] = $v->getValue(); - $a[self::FIELD_FIXED_UNSIGNED_INT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FIXED_UNSIGNED_INT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FIXED_UNSIGNED_INT_EXT] = $enc; + } + } else { + $a[self::FIELD_FIXED_UNSIGNED_INT] = $v; + } } if (null !== ($v = $this->getFixedUri())) { - $a[self::FIELD_FIXED_URI] = $v->getValue(); - $a[self::FIELD_FIXED_URI_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FIXED_URI] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FIXED_URI_EXT] = $enc; + } + } else { + $a[self::FIELD_FIXED_URI] = $v; + } } if (null !== ($v = $this->getFixedUrl())) { - $a[self::FIELD_FIXED_URL] = $v->getValue(); - $a[self::FIELD_FIXED_URL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FIXED_URL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FIXED_URL_EXT] = $enc; + } + } else { + $a[self::FIELD_FIXED_URL] = $v; + } } if (null !== ($v = $this->getFixedUsageContext())) { $a[self::FIELD_FIXED_USAGE_CONTEXT] = $v; } if (null !== ($v = $this->getFixedUuid())) { - $a[self::FIELD_FIXED_UUID] = $v->getValue(); - $a[self::FIELD_FIXED_UUID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FIXED_UUID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FIXED_UUID_EXT] = $enc; + } + } else { + $a[self::FIELD_FIXED_UUID] = $v; + } } if (null !== ($v = $this->getIsModifier())) { - $a[self::FIELD_IS_MODIFIER] = $v->getValue(); - $a[self::FIELD_IS_MODIFIER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IS_MODIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IS_MODIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_IS_MODIFIER] = $v; + } } if (null !== ($v = $this->getIsModifierReason())) { - $a[self::FIELD_IS_MODIFIER_REASON] = $v->getValue(); - $a[self::FIELD_IS_MODIFIER_REASON_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IS_MODIFIER_REASON] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IS_MODIFIER_REASON_EXT] = $enc; + } + } else { + $a[self::FIELD_IS_MODIFIER_REASON] = $v; + } } if (null !== ($v = $this->getIsSummary())) { - $a[self::FIELD_IS_SUMMARY] = $v->getValue(); - $a[self::FIELD_IS_SUMMARY_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IS_SUMMARY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IS_SUMMARY_EXT] = $enc; + } + } else { + $a[self::FIELD_IS_SUMMARY] = $v; + } } if (null !== ($v = $this->getLabel())) { - $a[self::FIELD_LABEL] = $v->getValue(); - $a[self::FIELD_LABEL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_LABEL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_LABEL_EXT] = $enc; + } + } else { + $a[self::FIELD_LABEL] = $v; + } } if ([] !== ($vs = $this->getMapping())) { $a[self::FIELD_MAPPING] = $vs; } if (null !== ($v = $this->getMax())) { - $a[self::FIELD_MAX] = $v->getValue(); - $a[self::FIELD_MAX_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MAX] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MAX_EXT] = $enc; + } + } else { + $a[self::FIELD_MAX] = $v; + } } if (null !== ($v = $this->getMaxLength())) { - $a[self::FIELD_MAX_LENGTH] = $v->getValue(); - $a[self::FIELD_MAX_LENGTH_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MAX_LENGTH] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MAX_LENGTH_EXT] = $enc; + } + } else { + $a[self::FIELD_MAX_LENGTH] = $v; + } } if (null !== ($v = $this->getMaxValueDate())) { - $a[self::FIELD_MAX_VALUE_DATE] = $v->getValue(); - $a[self::FIELD_MAX_VALUE_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MAX_VALUE_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MAX_VALUE_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_MAX_VALUE_DATE] = $v; + } } if (null !== ($v = $this->getMaxValueDateTime())) { - $a[self::FIELD_MAX_VALUE_DATE_TIME] = $v->getValue(); - $a[self::FIELD_MAX_VALUE_DATE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MAX_VALUE_DATE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MAX_VALUE_DATE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_MAX_VALUE_DATE_TIME] = $v; + } } if (null !== ($v = $this->getMaxValueDecimal())) { - $a[self::FIELD_MAX_VALUE_DECIMAL] = $v->getValue(); - $a[self::FIELD_MAX_VALUE_DECIMAL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MAX_VALUE_DECIMAL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MAX_VALUE_DECIMAL_EXT] = $enc; + } + } else { + $a[self::FIELD_MAX_VALUE_DECIMAL] = $v; + } } if (null !== ($v = $this->getMaxValueInstant())) { - $a[self::FIELD_MAX_VALUE_INSTANT] = $v->getValue(); - $a[self::FIELD_MAX_VALUE_INSTANT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MAX_VALUE_INSTANT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MAX_VALUE_INSTANT_EXT] = $enc; + } + } else { + $a[self::FIELD_MAX_VALUE_INSTANT] = $v; + } } if (null !== ($v = $this->getMaxValueInteger())) { - $a[self::FIELD_MAX_VALUE_INTEGER] = $v->getValue(); - $a[self::FIELD_MAX_VALUE_INTEGER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MAX_VALUE_INTEGER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MAX_VALUE_INTEGER_EXT] = $enc; + } + } else { + $a[self::FIELD_MAX_VALUE_INTEGER] = $v; + } } if (null !== ($v = $this->getMaxValuePositiveInt())) { - $a[self::FIELD_MAX_VALUE_POSITIVE_INT] = $v->getValue(); - $a[self::FIELD_MAX_VALUE_POSITIVE_INT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MAX_VALUE_POSITIVE_INT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MAX_VALUE_POSITIVE_INT_EXT] = $enc; + } + } else { + $a[self::FIELD_MAX_VALUE_POSITIVE_INT] = $v; + } } if (null !== ($v = $this->getMaxValueQuantity())) { - $a[self::FIELD_MAX_VALUE_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MAX_VALUE_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MAX_VALUE_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_MAX_VALUE_QUANTITY] = $v; + } } if (null !== ($v = $this->getMaxValueTime())) { - $a[self::FIELD_MAX_VALUE_TIME] = $v->getValue(); - $a[self::FIELD_MAX_VALUE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MAX_VALUE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MAX_VALUE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_MAX_VALUE_TIME] = $v; + } } if (null !== ($v = $this->getMaxValueUnsignedInt())) { - $a[self::FIELD_MAX_VALUE_UNSIGNED_INT] = $v->getValue(); - $a[self::FIELD_MAX_VALUE_UNSIGNED_INT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MAX_VALUE_UNSIGNED_INT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MAX_VALUE_UNSIGNED_INT_EXT] = $enc; + } + } else { + $a[self::FIELD_MAX_VALUE_UNSIGNED_INT] = $v; + } } if (null !== ($v = $this->getMeaningWhenMissing())) { - $a[self::FIELD_MEANING_WHEN_MISSING] = $v->getValue(); - $a[self::FIELD_MEANING_WHEN_MISSING_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MEANING_WHEN_MISSING] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MEANING_WHEN_MISSING_EXT] = $enc; + } + } else { + $a[self::FIELD_MEANING_WHEN_MISSING] = $v; + } } if (null !== ($v = $this->getMin())) { - $a[self::FIELD_MIN] = $v->getValue(); - $a[self::FIELD_MIN_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MIN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MIN_EXT] = $enc; + } + } else { + $a[self::FIELD_MIN] = $v; + } } if (null !== ($v = $this->getMinValueDate())) { - $a[self::FIELD_MIN_VALUE_DATE] = $v->getValue(); - $a[self::FIELD_MIN_VALUE_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MIN_VALUE_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MIN_VALUE_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_MIN_VALUE_DATE] = $v; + } } if (null !== ($v = $this->getMinValueDateTime())) { - $a[self::FIELD_MIN_VALUE_DATE_TIME] = $v->getValue(); - $a[self::FIELD_MIN_VALUE_DATE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MIN_VALUE_DATE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MIN_VALUE_DATE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_MIN_VALUE_DATE_TIME] = $v; + } } if (null !== ($v = $this->getMinValueDecimal())) { - $a[self::FIELD_MIN_VALUE_DECIMAL] = $v->getValue(); - $a[self::FIELD_MIN_VALUE_DECIMAL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MIN_VALUE_DECIMAL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MIN_VALUE_DECIMAL_EXT] = $enc; + } + } else { + $a[self::FIELD_MIN_VALUE_DECIMAL] = $v; + } } if (null !== ($v = $this->getMinValueInstant())) { - $a[self::FIELD_MIN_VALUE_INSTANT] = $v->getValue(); - $a[self::FIELD_MIN_VALUE_INSTANT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MIN_VALUE_INSTANT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MIN_VALUE_INSTANT_EXT] = $enc; + } + } else { + $a[self::FIELD_MIN_VALUE_INSTANT] = $v; + } } if (null !== ($v = $this->getMinValueInteger())) { - $a[self::FIELD_MIN_VALUE_INTEGER] = $v->getValue(); - $a[self::FIELD_MIN_VALUE_INTEGER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MIN_VALUE_INTEGER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MIN_VALUE_INTEGER_EXT] = $enc; + } + } else { + $a[self::FIELD_MIN_VALUE_INTEGER] = $v; + } } if (null !== ($v = $this->getMinValuePositiveInt())) { - $a[self::FIELD_MIN_VALUE_POSITIVE_INT] = $v->getValue(); - $a[self::FIELD_MIN_VALUE_POSITIVE_INT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MIN_VALUE_POSITIVE_INT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MIN_VALUE_POSITIVE_INT_EXT] = $enc; + } + } else { + $a[self::FIELD_MIN_VALUE_POSITIVE_INT] = $v; + } } if (null !== ($v = $this->getMinValueQuantity())) { - $a[self::FIELD_MIN_VALUE_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MIN_VALUE_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MIN_VALUE_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_MIN_VALUE_QUANTITY] = $v; + } } if (null !== ($v = $this->getMinValueTime())) { - $a[self::FIELD_MIN_VALUE_TIME] = $v->getValue(); - $a[self::FIELD_MIN_VALUE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MIN_VALUE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MIN_VALUE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_MIN_VALUE_TIME] = $v; + } } if (null !== ($v = $this->getMinValueUnsignedInt())) { - $a[self::FIELD_MIN_VALUE_UNSIGNED_INT] = $v->getValue(); - $a[self::FIELD_MIN_VALUE_UNSIGNED_INT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MIN_VALUE_UNSIGNED_INT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MIN_VALUE_UNSIGNED_INT_EXT] = $enc; + } + } else { + $a[self::FIELD_MIN_VALUE_UNSIGNED_INT] = $v; + } } if (null !== ($v = $this->getMustSupport())) { - $a[self::FIELD_MUST_SUPPORT] = $v->getValue(); - $a[self::FIELD_MUST_SUPPORT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MUST_SUPPORT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MUST_SUPPORT_EXT] = $enc; + } + } else { + $a[self::FIELD_MUST_SUPPORT] = $v; + } } if (null !== ($v = $this->getOrderMeaning())) { - $a[self::FIELD_ORDER_MEANING] = $v->getValue(); - $a[self::FIELD_ORDER_MEANING_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ORDER_MEANING] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ORDER_MEANING_EXT] = $enc; + } + } else { + $a[self::FIELD_ORDER_MEANING] = $v; + } } if (null !== ($v = $this->getPath())) { - $a[self::FIELD_PATH] = $v->getValue(); - $a[self::FIELD_PATH_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PATH] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PATH_EXT] = $enc; + } + } else { + $a[self::FIELD_PATH] = $v; + } } if (null !== ($v = $this->getPatternAddress())) { $a[self::FIELD_PATTERN_ADDRESS] = $v; } if (null !== ($v = $this->getPatternAge())) { - $a[self::FIELD_PATTERN_AGE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PATTERN_AGE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PATTERN_AGE_EXT] = $enc; + } + } else { + $a[self::FIELD_PATTERN_AGE] = $v; + } } if (null !== ($v = $this->getPatternAnnotation())) { $a[self::FIELD_PATTERN_ANNOTATION] = $v; @@ -17271,20 +18396,48 @@ public function jsonSerialize() $a[self::FIELD_PATTERN_ATTACHMENT] = $v; } if (null !== ($v = $this->getPatternBase64Binary())) { - $a[self::FIELD_PATTERN_BASE_64BINARY] = $v->getValue(); - $a[self::FIELD_PATTERN_BASE_64BINARY_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PATTERN_BASE_64BINARY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PATTERN_BASE_64BINARY_EXT] = $enc; + } + } else { + $a[self::FIELD_PATTERN_BASE_64BINARY] = $v; + } } if (null !== ($v = $this->getPatternBoolean())) { - $a[self::FIELD_PATTERN_BOOLEAN] = $v->getValue(); - $a[self::FIELD_PATTERN_BOOLEAN_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PATTERN_BOOLEAN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PATTERN_BOOLEAN_EXT] = $enc; + } + } else { + $a[self::FIELD_PATTERN_BOOLEAN] = $v; + } } if (null !== ($v = $this->getPatternCanonical())) { - $a[self::FIELD_PATTERN_CANONICAL] = $v->getValue(); - $a[self::FIELD_PATTERN_CANONICAL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PATTERN_CANONICAL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PATTERN_CANONICAL_EXT] = $enc; + } + } else { + $a[self::FIELD_PATTERN_CANONICAL] = $v; + } } if (null !== ($v = $this->getPatternCode())) { - $a[self::FIELD_PATTERN_CODE] = $v->getValue(); - $a[self::FIELD_PATTERN_CODE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PATTERN_CODE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PATTERN_CODE_EXT] = $enc; + } + } else { + $a[self::FIELD_PATTERN_CODE] = $v; + } } if (null !== ($v = $this->getPatternCodeableConcept())) { $a[self::FIELD_PATTERN_CODEABLE_CONCEPT] = $v; @@ -17296,37 +18449,90 @@ public function jsonSerialize() $a[self::FIELD_PATTERN_CONTACT_DETAIL] = $v; } if (null !== ($v = $this->getPatternContactPoint())) { - $a[self::FIELD_PATTERN_CONTACT_POINT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PATTERN_CONTACT_POINT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PATTERN_CONTACT_POINT_EXT] = $enc; + } + } else { + $a[self::FIELD_PATTERN_CONTACT_POINT] = $v; + } } if (null !== ($v = $this->getPatternContributor())) { $a[self::FIELD_PATTERN_CONTRIBUTOR] = $v; } if (null !== ($v = $this->getPatternCount())) { - $a[self::FIELD_PATTERN_COUNT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PATTERN_COUNT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PATTERN_COUNT_EXT] = $enc; + } + } else { + $a[self::FIELD_PATTERN_COUNT] = $v; + } } if (null !== ($v = $this->getPatternDataRequirement())) { $a[self::FIELD_PATTERN_DATA_REQUIREMENT] = $v; } if (null !== ($v = $this->getPatternDate())) { - $a[self::FIELD_PATTERN_DATE] = $v->getValue(); - $a[self::FIELD_PATTERN_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PATTERN_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PATTERN_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_PATTERN_DATE] = $v; + } } if (null !== ($v = $this->getPatternDateTime())) { - $a[self::FIELD_PATTERN_DATE_TIME] = $v->getValue(); - $a[self::FIELD_PATTERN_DATE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PATTERN_DATE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PATTERN_DATE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_PATTERN_DATE_TIME] = $v; + } } if (null !== ($v = $this->getPatternDecimal())) { - $a[self::FIELD_PATTERN_DECIMAL] = $v->getValue(); - $a[self::FIELD_PATTERN_DECIMAL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PATTERN_DECIMAL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PATTERN_DECIMAL_EXT] = $enc; + } + } else { + $a[self::FIELD_PATTERN_DECIMAL] = $v; + } } if (null !== ($v = $this->getPatternDistance())) { - $a[self::FIELD_PATTERN_DISTANCE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PATTERN_DISTANCE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PATTERN_DISTANCE_EXT] = $enc; + } + } else { + $a[self::FIELD_PATTERN_DISTANCE] = $v; + } } if (null !== ($v = $this->getPatternDosage())) { $a[self::FIELD_PATTERN_DOSAGE] = $v; } if (null !== ($v = $this->getPatternDuration())) { - $a[self::FIELD_PATTERN_DURATION] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PATTERN_DURATION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PATTERN_DURATION_EXT] = $enc; + } + } else { + $a[self::FIELD_PATTERN_DURATION] = $v; + } } if (null !== ($v = $this->getPatternExpression())) { $a[self::FIELD_PATTERN_EXPRESSION] = $v; @@ -17335,33 +18541,84 @@ public function jsonSerialize() $a[self::FIELD_PATTERN_HUMAN_NAME] = $v; } if (null !== ($v = $this->getPatternId())) { - $a[self::FIELD_PATTERN_ID] = $v->getValue(); - $a[self::FIELD_PATTERN_ID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PATTERN_ID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PATTERN_ID_EXT] = $enc; + } + } else { + $a[self::FIELD_PATTERN_ID] = $v; + } } if (null !== ($v = $this->getPatternIdentifier())) { - $a[self::FIELD_PATTERN_IDENTIFIER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PATTERN_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PATTERN_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_PATTERN_IDENTIFIER] = $v; + } } if (null !== ($v = $this->getPatternInstant())) { - $a[self::FIELD_PATTERN_INSTANT] = $v->getValue(); - $a[self::FIELD_PATTERN_INSTANT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PATTERN_INSTANT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PATTERN_INSTANT_EXT] = $enc; + } + } else { + $a[self::FIELD_PATTERN_INSTANT] = $v; + } } if (null !== ($v = $this->getPatternInteger())) { - $a[self::FIELD_PATTERN_INTEGER] = $v->getValue(); - $a[self::FIELD_PATTERN_INTEGER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PATTERN_INTEGER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PATTERN_INTEGER_EXT] = $enc; + } + } else { + $a[self::FIELD_PATTERN_INTEGER] = $v; + } } if (null !== ($v = $this->getPatternMarkdown())) { - $a[self::FIELD_PATTERN_MARKDOWN] = $v->getValue(); - $a[self::FIELD_PATTERN_MARKDOWN_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PATTERN_MARKDOWN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PATTERN_MARKDOWN_EXT] = $enc; + } + } else { + $a[self::FIELD_PATTERN_MARKDOWN] = $v; + } } if (null !== ($v = $this->getPatternMeta())) { $a[self::FIELD_PATTERN_META] = $v; } if (null !== ($v = $this->getPatternMoney())) { - $a[self::FIELD_PATTERN_MONEY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PATTERN_MONEY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PATTERN_MONEY_EXT] = $enc; + } + } else { + $a[self::FIELD_PATTERN_MONEY] = $v; + } } if (null !== ($v = $this->getPatternOid())) { - $a[self::FIELD_PATTERN_OID] = $v->getValue(); - $a[self::FIELD_PATTERN_OID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PATTERN_OID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PATTERN_OID_EXT] = $enc; + } + } else { + $a[self::FIELD_PATTERN_OID] = $v; + } } if (null !== ($v = $this->getPatternParameterDefinition())) { $a[self::FIELD_PATTERN_PARAMETER_DEFINITION] = $v; @@ -17370,11 +18627,26 @@ public function jsonSerialize() $a[self::FIELD_PATTERN_PERIOD] = $v; } if (null !== ($v = $this->getPatternPositiveInt())) { - $a[self::FIELD_PATTERN_POSITIVE_INT] = $v->getValue(); - $a[self::FIELD_PATTERN_POSITIVE_INT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PATTERN_POSITIVE_INT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PATTERN_POSITIVE_INT_EXT] = $enc; + } + } else { + $a[self::FIELD_PATTERN_POSITIVE_INT] = $v; + } } if (null !== ($v = $this->getPatternQuantity())) { - $a[self::FIELD_PATTERN_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PATTERN_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PATTERN_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_PATTERN_QUANTITY] = $v; + } } if (null !== ($v = $this->getPatternRange())) { $a[self::FIELD_PATTERN_RANGE] = $v; @@ -17395,12 +18667,26 @@ public function jsonSerialize() $a[self::FIELD_PATTERN_SIGNATURE] = $v; } if (null !== ($v = $this->getPatternString())) { - $a[self::FIELD_PATTERN_STRING] = $v->getValue(); - $a[self::FIELD_PATTERN_STRING_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PATTERN_STRING] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PATTERN_STRING_EXT] = $enc; + } + } else { + $a[self::FIELD_PATTERN_STRING] = $v; + } } if (null !== ($v = $this->getPatternTime())) { - $a[self::FIELD_PATTERN_TIME] = $v->getValue(); - $a[self::FIELD_PATTERN_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PATTERN_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PATTERN_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_PATTERN_TIME] = $v; + } } if (null !== ($v = $this->getPatternTiming())) { $a[self::FIELD_PATTERN_TIMING] = $v; @@ -17409,42 +18695,114 @@ public function jsonSerialize() $a[self::FIELD_PATTERN_TRIGGER_DEFINITION] = $v; } if (null !== ($v = $this->getPatternUnsignedInt())) { - $a[self::FIELD_PATTERN_UNSIGNED_INT] = $v->getValue(); - $a[self::FIELD_PATTERN_UNSIGNED_INT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PATTERN_UNSIGNED_INT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PATTERN_UNSIGNED_INT_EXT] = $enc; + } + } else { + $a[self::FIELD_PATTERN_UNSIGNED_INT] = $v; + } } if (null !== ($v = $this->getPatternUri())) { - $a[self::FIELD_PATTERN_URI] = $v->getValue(); - $a[self::FIELD_PATTERN_URI_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PATTERN_URI] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PATTERN_URI_EXT] = $enc; + } + } else { + $a[self::FIELD_PATTERN_URI] = $v; + } } if (null !== ($v = $this->getPatternUrl())) { - $a[self::FIELD_PATTERN_URL] = $v->getValue(); - $a[self::FIELD_PATTERN_URL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PATTERN_URL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PATTERN_URL_EXT] = $enc; + } + } else { + $a[self::FIELD_PATTERN_URL] = $v; + } } if (null !== ($v = $this->getPatternUsageContext())) { $a[self::FIELD_PATTERN_USAGE_CONTEXT] = $v; } if (null !== ($v = $this->getPatternUuid())) { - $a[self::FIELD_PATTERN_UUID] = $v->getValue(); - $a[self::FIELD_PATTERN_UUID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PATTERN_UUID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PATTERN_UUID_EXT] = $enc; + } + } else { + $a[self::FIELD_PATTERN_UUID] = $v; + } } if ([] !== ($vs = $this->getRepresentation())) { - $a[self::FIELD_REPRESENTATION] = $vs; + $a[self::FIELD_REPRESENTATION] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_REPRESENTATION][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_REPRESENTATION_EXT][] = $enc; + } else { + $a[self::FIELD_REPRESENTATION_EXT][] = null; + } + } else { + $a[self::FIELD_REPRESENTATION][] = $v; + } + } } if (null !== ($v = $this->getRequirements())) { - $a[self::FIELD_REQUIREMENTS] = $v->getValue(); - $a[self::FIELD_REQUIREMENTS_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_REQUIREMENTS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_REQUIREMENTS_EXT] = $enc; + } + } else { + $a[self::FIELD_REQUIREMENTS] = $v; + } } if (null !== ($v = $this->getShort())) { - $a[self::FIELD_SHORT] = $v->getValue(); - $a[self::FIELD_SHORT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SHORT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SHORT_EXT] = $enc; + } + } else { + $a[self::FIELD_SHORT] = $v; + } } if (null !== ($v = $this->getSliceIsConstraining())) { - $a[self::FIELD_SLICE_IS_CONSTRAINING] = $v->getValue(); - $a[self::FIELD_SLICE_IS_CONSTRAINING_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SLICE_IS_CONSTRAINING] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SLICE_IS_CONSTRAINING_EXT] = $enc; + } + } else { + $a[self::FIELD_SLICE_IS_CONSTRAINING] = $v; + } } if (null !== ($v = $this->getSliceName())) { - $a[self::FIELD_SLICE_NAME] = $v->getValue(); - $a[self::FIELD_SLICE_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SLICE_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SLICE_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_SLICE_NAME] = $v; + } } if (null !== ($v = $this->getSlicing())) { $a[self::FIELD_SLICING] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRElementDefinition/FHIRElementDefinitionBase.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRElementDefinition/FHIRElementDefinitionBase.php index b6bac83970..ec018499fa 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRElementDefinition/FHIRElementDefinitionBase.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRElementDefinition/FHIRElementDefinitionBase.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRElementDefinitionBase extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ELEMENT_DEFINITION_DOT_BASE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_MAX = 'max'; const FIELD_MAX_EXT = '_max'; const FIELD_MIN = 'min'; @@ -127,6 +123,9 @@ class FHIRElementDefinitionBase extends FHIRBackboneElement */ protected $path = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRElementDefinitionBase Constructor * @param null|array $data @@ -149,8 +148,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MAX] instanceof FHIRString) { $this->setMax($data[self::FIELD_MAX]); - } elseif ($ext && is_scalar($data[self::FIELD_MAX])) { - $this->setMax(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_MAX]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MAX])) { + $this->setMax(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_MAX]] + $ext)); + } else if (is_array($data[self::FIELD_MAX])) { + $this->setMax(new FHIRString(array_merge($ext, $data[self::FIELD_MAX]))); + } } else { $this->setMax(new FHIRString($data[self::FIELD_MAX])); } @@ -161,8 +164,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MIN] instanceof FHIRUnsignedInt) { $this->setMin($data[self::FIELD_MIN]); - } elseif ($ext && is_scalar($data[self::FIELD_MIN])) { - $this->setMin(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_MIN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MIN])) { + $this->setMin(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_MIN]] + $ext)); + } else if (is_array($data[self::FIELD_MIN])) { + $this->setMin(new FHIRUnsignedInt(array_merge($ext, $data[self::FIELD_MIN]))); + } } else { $this->setMin(new FHIRUnsignedInt($data[self::FIELD_MIN])); } @@ -173,8 +180,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PATH] instanceof FHIRString) { $this->setPath($data[self::FIELD_PATH]); - } elseif ($ext && is_scalar($data[self::FIELD_PATH])) { - $this->setPath(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PATH]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PATH])) { + $this->setPath(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PATH]] + $ext)); + } else if (is_array($data[self::FIELD_PATH])) { + $this->setPath(new FHIRString(array_merge($ext, $data[self::FIELD_PATH]))); + } } else { $this->setPath(new FHIRString($data[self::FIELD_PATH])); } @@ -437,16 +448,37 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getMax())) { - $a[self::FIELD_MAX] = $v->getValue(); - $a[self::FIELD_MAX_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MAX] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MAX_EXT] = $enc; + } + } else { + $a[self::FIELD_MAX] = $v; + } } if (null !== ($v = $this->getMin())) { - $a[self::FIELD_MIN] = $v->getValue(); - $a[self::FIELD_MIN_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MIN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MIN_EXT] = $enc; + } + } else { + $a[self::FIELD_MIN] = $v; + } } if (null !== ($v = $this->getPath())) { - $a[self::FIELD_PATH] = $v->getValue(); - $a[self::FIELD_PATH_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PATH] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PATH_EXT] = $enc; + } + } else { + $a[self::FIELD_PATH] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRElementDefinition/FHIRElementDefinitionBinding.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRElementDefinition/FHIRElementDefinitionBinding.php index 937ed4bdc6..e2bcf5f744 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRElementDefinition/FHIRElementDefinitionBinding.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRElementDefinition/FHIRElementDefinitionBinding.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -81,10 +81,6 @@ class FHIRElementDefinitionBinding extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ELEMENT_DEFINITION_DOT_BINDING; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DESCRIPTION = 'description'; const FIELD_DESCRIPTION_EXT = '_description'; const FIELD_STRENGTH = 'strength'; @@ -127,6 +123,9 @@ class FHIRElementDefinitionBinding extends FHIRBackboneElement */ protected $valueSet = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRElementDefinitionBinding Constructor * @param null|array $data @@ -149,8 +148,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -161,8 +164,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STRENGTH] instanceof FHIRBindingStrength) { $this->setStrength($data[self::FIELD_STRENGTH]); - } elseif ($ext && is_scalar($data[self::FIELD_STRENGTH])) { - $this->setStrength(new FHIRBindingStrength([FHIRBindingStrength::FIELD_VALUE => $data[self::FIELD_STRENGTH]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STRENGTH])) { + $this->setStrength(new FHIRBindingStrength([FHIRBindingStrength::FIELD_VALUE => $data[self::FIELD_STRENGTH]] + $ext)); + } else if (is_array($data[self::FIELD_STRENGTH])) { + $this->setStrength(new FHIRBindingStrength(array_merge($ext, $data[self::FIELD_STRENGTH]))); + } } else { $this->setStrength(new FHIRBindingStrength($data[self::FIELD_STRENGTH])); } @@ -173,8 +180,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_SET] instanceof FHIRCanonical) { $this->setValueSet($data[self::FIELD_VALUE_SET]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_SET])) { - $this->setValueSet(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $data[self::FIELD_VALUE_SET]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_SET])) { + $this->setValueSet(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $data[self::FIELD_VALUE_SET]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_SET])) { + $this->setValueSet(new FHIRCanonical(array_merge($ext, $data[self::FIELD_VALUE_SET]))); + } } else { $this->setValueSet(new FHIRCanonical($data[self::FIELD_VALUE_SET])); } @@ -408,7 +419,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESCRIPTION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStrength())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STRENGTH, null, $v->_getFHIRXMLNamespace())); } @@ -425,15 +435,37 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if (null !== ($v = $this->getStrength())) { - $a[self::FIELD_STRENGTH] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STRENGTH] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STRENGTH_EXT] = $enc; + } + } else { + $a[self::FIELD_STRENGTH] = $v; + } } if (null !== ($v = $this->getValueSet())) { - $a[self::FIELD_VALUE_SET] = $v->getValue(); - $a[self::FIELD_VALUE_SET_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_SET] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_SET_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_SET] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRElementDefinition/FHIRElementDefinitionConstraint.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRElementDefinition/FHIRElementDefinitionConstraint.php index ae53080954..ec0fa629b3 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRElementDefinition/FHIRElementDefinitionConstraint.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRElementDefinition/FHIRElementDefinitionConstraint.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -82,10 +82,6 @@ class FHIRElementDefinitionConstraint extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ELEMENT_DEFINITION_DOT_CONSTRAINT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_EXPRESSION = 'expression'; const FIELD_EXPRESSION_EXT = '_expression'; const FIELD_HUMAN = 'human'; @@ -187,6 +183,9 @@ class FHIRElementDefinitionConstraint extends FHIRBackboneElement */ protected $xpath = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRElementDefinitionConstraint Constructor * @param null|array $data @@ -209,8 +208,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EXPRESSION] instanceof FHIRString) { $this->setExpression($data[self::FIELD_EXPRESSION]); - } elseif ($ext && is_scalar($data[self::FIELD_EXPRESSION])) { - $this->setExpression(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_EXPRESSION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EXPRESSION])) { + $this->setExpression(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_EXPRESSION]] + $ext)); + } else if (is_array($data[self::FIELD_EXPRESSION])) { + $this->setExpression(new FHIRString(array_merge($ext, $data[self::FIELD_EXPRESSION]))); + } } else { $this->setExpression(new FHIRString($data[self::FIELD_EXPRESSION])); } @@ -221,8 +224,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_HUMAN] instanceof FHIRString) { $this->setHuman($data[self::FIELD_HUMAN]); - } elseif ($ext && is_scalar($data[self::FIELD_HUMAN])) { - $this->setHuman(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_HUMAN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_HUMAN])) { + $this->setHuman(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_HUMAN]] + $ext)); + } else if (is_array($data[self::FIELD_HUMAN])) { + $this->setHuman(new FHIRString(array_merge($ext, $data[self::FIELD_HUMAN]))); + } } else { $this->setHuman(new FHIRString($data[self::FIELD_HUMAN])); } @@ -233,8 +240,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_KEY] instanceof FHIRId) { $this->setKey($data[self::FIELD_KEY]); - } elseif ($ext && is_scalar($data[self::FIELD_KEY])) { - $this->setKey(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_KEY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_KEY])) { + $this->setKey(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_KEY]] + $ext)); + } else if (is_array($data[self::FIELD_KEY])) { + $this->setKey(new FHIRId(array_merge($ext, $data[self::FIELD_KEY]))); + } } else { $this->setKey(new FHIRId($data[self::FIELD_KEY])); } @@ -245,8 +256,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_REQUIREMENTS] instanceof FHIRString) { $this->setRequirements($data[self::FIELD_REQUIREMENTS]); - } elseif ($ext && is_scalar($data[self::FIELD_REQUIREMENTS])) { - $this->setRequirements(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_REQUIREMENTS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_REQUIREMENTS])) { + $this->setRequirements(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_REQUIREMENTS]] + $ext)); + } else if (is_array($data[self::FIELD_REQUIREMENTS])) { + $this->setRequirements(new FHIRString(array_merge($ext, $data[self::FIELD_REQUIREMENTS]))); + } } else { $this->setRequirements(new FHIRString($data[self::FIELD_REQUIREMENTS])); } @@ -257,8 +272,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SEVERITY] instanceof FHIRConstraintSeverity) { $this->setSeverity($data[self::FIELD_SEVERITY]); - } elseif ($ext && is_scalar($data[self::FIELD_SEVERITY])) { - $this->setSeverity(new FHIRConstraintSeverity([FHIRConstraintSeverity::FIELD_VALUE => $data[self::FIELD_SEVERITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SEVERITY])) { + $this->setSeverity(new FHIRConstraintSeverity([FHIRConstraintSeverity::FIELD_VALUE => $data[self::FIELD_SEVERITY]] + $ext)); + } else if (is_array($data[self::FIELD_SEVERITY])) { + $this->setSeverity(new FHIRConstraintSeverity(array_merge($ext, $data[self::FIELD_SEVERITY]))); + } } else { $this->setSeverity(new FHIRConstraintSeverity($data[self::FIELD_SEVERITY])); } @@ -269,8 +288,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SOURCE] instanceof FHIRCanonical) { $this->setSource($data[self::FIELD_SOURCE]); - } elseif ($ext && is_scalar($data[self::FIELD_SOURCE])) { - $this->setSource(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $data[self::FIELD_SOURCE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SOURCE])) { + $this->setSource(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $data[self::FIELD_SOURCE]] + $ext)); + } else if (is_array($data[self::FIELD_SOURCE])) { + $this->setSource(new FHIRCanonical(array_merge($ext, $data[self::FIELD_SOURCE]))); + } } else { $this->setSource(new FHIRCanonical($data[self::FIELD_SOURCE])); } @@ -281,8 +304,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_XPATH] instanceof FHIRString) { $this->setXpath($data[self::FIELD_XPATH]); - } elseif ($ext && is_scalar($data[self::FIELD_XPATH])) { - $this->setXpath(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_XPATH]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_XPATH])) { + $this->setXpath(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_XPATH]] + $ext)); + } else if (is_array($data[self::FIELD_XPATH])) { + $this->setXpath(new FHIRString(array_merge($ext, $data[self::FIELD_XPATH]))); + } } else { $this->setXpath(new FHIRString($data[self::FIELD_XPATH])); } @@ -715,7 +742,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getRequirements())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REQUIREMENTS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSeverity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SEVERITY, null, $v->_getFHIRXMLNamespace())); } @@ -735,31 +761,81 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getExpression())) { - $a[self::FIELD_EXPRESSION] = $v->getValue(); - $a[self::FIELD_EXPRESSION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EXPRESSION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EXPRESSION_EXT] = $enc; + } + } else { + $a[self::FIELD_EXPRESSION] = $v; + } } if (null !== ($v = $this->getHuman())) { - $a[self::FIELD_HUMAN] = $v->getValue(); - $a[self::FIELD_HUMAN_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_HUMAN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_HUMAN_EXT] = $enc; + } + } else { + $a[self::FIELD_HUMAN] = $v; + } } if (null !== ($v = $this->getKey())) { - $a[self::FIELD_KEY] = $v->getValue(); - $a[self::FIELD_KEY_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_KEY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_KEY_EXT] = $enc; + } + } else { + $a[self::FIELD_KEY] = $v; + } } if (null !== ($v = $this->getRequirements())) { - $a[self::FIELD_REQUIREMENTS] = $v->getValue(); - $a[self::FIELD_REQUIREMENTS_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_REQUIREMENTS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_REQUIREMENTS_EXT] = $enc; + } + } else { + $a[self::FIELD_REQUIREMENTS] = $v; + } } if (null !== ($v = $this->getSeverity())) { - $a[self::FIELD_SEVERITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SEVERITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SEVERITY_EXT] = $enc; + } + } else { + $a[self::FIELD_SEVERITY] = $v; + } } if (null !== ($v = $this->getSource())) { - $a[self::FIELD_SOURCE] = $v->getValue(); - $a[self::FIELD_SOURCE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SOURCE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SOURCE_EXT] = $enc; + } + } else { + $a[self::FIELD_SOURCE] = $v; + } } if (null !== ($v = $this->getXpath())) { - $a[self::FIELD_XPATH] = $v->getValue(); - $a[self::FIELD_XPATH_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_XPATH] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_XPATH_EXT] = $enc; + } + } else { + $a[self::FIELD_XPATH] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRElementDefinition/FHIRElementDefinitionDiscriminator.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRElementDefinition/FHIRElementDefinitionDiscriminator.php index 4cb8814b55..a7243e461d 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRElementDefinition/FHIRElementDefinitionDiscriminator.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRElementDefinition/FHIRElementDefinitionDiscriminator.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRElementDefinitionDiscriminator extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ELEMENT_DEFINITION_DOT_DISCRIMINATOR; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_PATH = 'path'; const FIELD_PATH_EXT = '_path'; const FIELD_TYPE = 'type'; @@ -112,6 +108,9 @@ class FHIRElementDefinitionDiscriminator extends FHIRBackboneElement */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRElementDefinitionDiscriminator Constructor * @param null|array $data @@ -134,8 +133,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PATH] instanceof FHIRString) { $this->setPath($data[self::FIELD_PATH]); - } elseif ($ext && is_scalar($data[self::FIELD_PATH])) { - $this->setPath(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PATH]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PATH])) { + $this->setPath(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PATH]] + $ext)); + } else if (is_array($data[self::FIELD_PATH])) { + $this->setPath(new FHIRString(array_merge($ext, $data[self::FIELD_PATH]))); + } } else { $this->setPath(new FHIRString($data[self::FIELD_PATH])); } @@ -146,8 +149,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TYPE] instanceof FHIRDiscriminatorType) { $this->setType($data[self::FIELD_TYPE]); - } elseif ($ext && is_scalar($data[self::FIELD_TYPE])) { - $this->setType(new FHIRDiscriminatorType([FHIRDiscriminatorType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TYPE])) { + $this->setType(new FHIRDiscriminatorType([FHIRDiscriminatorType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } else if (is_array($data[self::FIELD_TYPE])) { + $this->setType(new FHIRDiscriminatorType(array_merge($ext, $data[self::FIELD_TYPE]))); + } } else { $this->setType(new FHIRDiscriminatorType($data[self::FIELD_TYPE])); } @@ -335,7 +342,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getPath())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATH, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -349,11 +355,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getPath())) { - $a[self::FIELD_PATH] = $v->getValue(); - $a[self::FIELD_PATH_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PATH] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PATH_EXT] = $enc; + } + } else { + $a[self::FIELD_PATH] = $v; + } } if (null !== ($v = $this->getType())) { - $a[self::FIELD_TYPE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TYPE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TYPE_EXT] = $enc; + } + } else { + $a[self::FIELD_TYPE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRElementDefinition/FHIRElementDefinitionExample.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRElementDefinition/FHIRElementDefinitionExample.php index d62ffba704..1da70af8b1 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRElementDefinition/FHIRElementDefinitionExample.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRElementDefinition/FHIRElementDefinitionExample.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -128,14 +128,11 @@ class FHIRElementDefinitionExample extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ELEMENT_DEFINITION_DOT_EXAMPLE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_LABEL = 'label'; const FIELD_LABEL_EXT = '_label'; const FIELD_VALUE_ADDRESS = 'valueAddress'; const FIELD_VALUE_AGE = 'valueAge'; + const FIELD_VALUE_AGE_EXT = '_valueAge'; const FIELD_VALUE_ANNOTATION = 'valueAnnotation'; const FIELD_VALUE_ATTACHMENT = 'valueAttachment'; const FIELD_VALUE_BASE_64BINARY = 'valueBase64Binary'; @@ -153,6 +150,7 @@ class FHIRElementDefinitionExample extends FHIRBackboneElement const FIELD_VALUE_CONTACT_POINT_EXT = '_valueContactPoint'; const FIELD_VALUE_CONTRIBUTOR = 'valueContributor'; const FIELD_VALUE_COUNT = 'valueCount'; + const FIELD_VALUE_COUNT_EXT = '_valueCount'; const FIELD_VALUE_DATA_REQUIREMENT = 'valueDataRequirement'; const FIELD_VALUE_DATE = 'valueDate'; const FIELD_VALUE_DATE_EXT = '_valueDate'; @@ -161,8 +159,10 @@ class FHIRElementDefinitionExample extends FHIRBackboneElement const FIELD_VALUE_DECIMAL = 'valueDecimal'; const FIELD_VALUE_DECIMAL_EXT = '_valueDecimal'; const FIELD_VALUE_DISTANCE = 'valueDistance'; + const FIELD_VALUE_DISTANCE_EXT = '_valueDistance'; const FIELD_VALUE_DOSAGE = 'valueDosage'; const FIELD_VALUE_DURATION = 'valueDuration'; + const FIELD_VALUE_DURATION_EXT = '_valueDuration'; const FIELD_VALUE_EXPRESSION = 'valueExpression'; const FIELD_VALUE_HUMAN_NAME = 'valueHumanName'; const FIELD_VALUE_ID = 'valueId'; @@ -871,6 +871,9 @@ class FHIRElementDefinitionExample extends FHIRBackboneElement */ protected $valueUuid = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRElementDefinitionExample Constructor * @param null|array $data @@ -893,8 +896,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_LABEL] instanceof FHIRString) { $this->setLabel($data[self::FIELD_LABEL]); - } elseif ($ext && is_scalar($data[self::FIELD_LABEL])) { - $this->setLabel(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_LABEL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_LABEL])) { + $this->setLabel(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_LABEL]] + $ext)); + } else if (is_array($data[self::FIELD_LABEL])) { + $this->setLabel(new FHIRString(array_merge($ext, $data[self::FIELD_LABEL]))); + } } else { $this->setLabel(new FHIRString($data[self::FIELD_LABEL])); } @@ -907,8 +914,17 @@ public function __construct($data = null) } } if (isset($data[self::FIELD_VALUE_AGE])) { + $ext = (isset($data[self::FIELD_VALUE_AGE_EXT]) && is_array($data[self::FIELD_VALUE_AGE_EXT])) + ? $data[self::FIELD_VALUE_AGE_EXT] + : null; if ($data[self::FIELD_VALUE_AGE] instanceof FHIRAge) { $this->setValueAge($data[self::FIELD_VALUE_AGE]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_AGE])) { + $this->setValueAge(new FHIRAge([FHIRAge::FIELD_VALUE => $data[self::FIELD_VALUE_AGE]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_AGE])) { + $this->setValueAge(new FHIRAge(array_merge($ext, $data[self::FIELD_VALUE_AGE]))); + } } else { $this->setValueAge(new FHIRAge($data[self::FIELD_VALUE_AGE])); } @@ -933,8 +949,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_BASE_64BINARY] instanceof FHIRBase64Binary) { $this->setValueBase64Binary($data[self::FIELD_VALUE_BASE_64BINARY]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_BASE_64BINARY])) { - $this->setValueBase64Binary(new FHIRBase64Binary([FHIRBase64Binary::FIELD_VALUE => $data[self::FIELD_VALUE_BASE_64BINARY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_BASE_64BINARY])) { + $this->setValueBase64Binary(new FHIRBase64Binary([FHIRBase64Binary::FIELD_VALUE => $data[self::FIELD_VALUE_BASE_64BINARY]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_BASE_64BINARY])) { + $this->setValueBase64Binary(new FHIRBase64Binary(array_merge($ext, $data[self::FIELD_VALUE_BASE_64BINARY]))); + } } else { $this->setValueBase64Binary(new FHIRBase64Binary($data[self::FIELD_VALUE_BASE_64BINARY])); } @@ -945,8 +965,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_BOOLEAN] instanceof FHIRBoolean) { $this->setValueBoolean($data[self::FIELD_VALUE_BOOLEAN]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_BOOLEAN])) { - $this->setValueBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_VALUE_BOOLEAN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_BOOLEAN])) { + $this->setValueBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_VALUE_BOOLEAN]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_BOOLEAN])) { + $this->setValueBoolean(new FHIRBoolean(array_merge($ext, $data[self::FIELD_VALUE_BOOLEAN]))); + } } else { $this->setValueBoolean(new FHIRBoolean($data[self::FIELD_VALUE_BOOLEAN])); } @@ -957,8 +981,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_CANONICAL] instanceof FHIRCanonical) { $this->setValueCanonical($data[self::FIELD_VALUE_CANONICAL]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_CANONICAL])) { - $this->setValueCanonical(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $data[self::FIELD_VALUE_CANONICAL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_CANONICAL])) { + $this->setValueCanonical(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $data[self::FIELD_VALUE_CANONICAL]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_CANONICAL])) { + $this->setValueCanonical(new FHIRCanonical(array_merge($ext, $data[self::FIELD_VALUE_CANONICAL]))); + } } else { $this->setValueCanonical(new FHIRCanonical($data[self::FIELD_VALUE_CANONICAL])); } @@ -969,8 +997,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_CODE] instanceof FHIRCode) { $this->setValueCode($data[self::FIELD_VALUE_CODE]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_CODE])) { - $this->setValueCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_VALUE_CODE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_CODE])) { + $this->setValueCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_VALUE_CODE]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_CODE])) { + $this->setValueCode(new FHIRCode(array_merge($ext, $data[self::FIELD_VALUE_CODE]))); + } } else { $this->setValueCode(new FHIRCode($data[self::FIELD_VALUE_CODE])); } @@ -1002,8 +1034,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_CONTACT_POINT] instanceof FHIRContactPoint) { $this->setValueContactPoint($data[self::FIELD_VALUE_CONTACT_POINT]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_CONTACT_POINT])) { - $this->setValueContactPoint(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $data[self::FIELD_VALUE_CONTACT_POINT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_CONTACT_POINT])) { + $this->setValueContactPoint(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $data[self::FIELD_VALUE_CONTACT_POINT]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_CONTACT_POINT])) { + $this->setValueContactPoint(new FHIRContactPoint(array_merge($ext, $data[self::FIELD_VALUE_CONTACT_POINT]))); + } } else { $this->setValueContactPoint(new FHIRContactPoint($data[self::FIELD_VALUE_CONTACT_POINT])); } @@ -1016,8 +1052,17 @@ public function __construct($data = null) } } if (isset($data[self::FIELD_VALUE_COUNT])) { + $ext = (isset($data[self::FIELD_VALUE_COUNT_EXT]) && is_array($data[self::FIELD_VALUE_COUNT_EXT])) + ? $data[self::FIELD_VALUE_COUNT_EXT] + : null; if ($data[self::FIELD_VALUE_COUNT] instanceof FHIRCount) { $this->setValueCount($data[self::FIELD_VALUE_COUNT]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_COUNT])) { + $this->setValueCount(new FHIRCount([FHIRCount::FIELD_VALUE => $data[self::FIELD_VALUE_COUNT]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_COUNT])) { + $this->setValueCount(new FHIRCount(array_merge($ext, $data[self::FIELD_VALUE_COUNT]))); + } } else { $this->setValueCount(new FHIRCount($data[self::FIELD_VALUE_COUNT])); } @@ -1035,8 +1080,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_DATE] instanceof FHIRDate) { $this->setValueDate($data[self::FIELD_VALUE_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_DATE])) { - $this->setValueDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_VALUE_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_DATE])) { + $this->setValueDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_VALUE_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_DATE])) { + $this->setValueDate(new FHIRDate(array_merge($ext, $data[self::FIELD_VALUE_DATE]))); + } } else { $this->setValueDate(new FHIRDate($data[self::FIELD_VALUE_DATE])); } @@ -1047,8 +1096,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_DATE_TIME] instanceof FHIRDateTime) { $this->setValueDateTime($data[self::FIELD_VALUE_DATE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_DATE_TIME])) { - $this->setValueDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_VALUE_DATE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_DATE_TIME])) { + $this->setValueDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_VALUE_DATE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_DATE_TIME])) { + $this->setValueDateTime(new FHIRDateTime(array_merge($ext, $data[self::FIELD_VALUE_DATE_TIME]))); + } } else { $this->setValueDateTime(new FHIRDateTime($data[self::FIELD_VALUE_DATE_TIME])); } @@ -1059,15 +1112,28 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_DECIMAL] instanceof FHIRDecimal) { $this->setValueDecimal($data[self::FIELD_VALUE_DECIMAL]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_DECIMAL])) { - $this->setValueDecimal(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_VALUE_DECIMAL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_DECIMAL])) { + $this->setValueDecimal(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_VALUE_DECIMAL]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_DECIMAL])) { + $this->setValueDecimal(new FHIRDecimal(array_merge($ext, $data[self::FIELD_VALUE_DECIMAL]))); + } } else { $this->setValueDecimal(new FHIRDecimal($data[self::FIELD_VALUE_DECIMAL])); } } if (isset($data[self::FIELD_VALUE_DISTANCE])) { + $ext = (isset($data[self::FIELD_VALUE_DISTANCE_EXT]) && is_array($data[self::FIELD_VALUE_DISTANCE_EXT])) + ? $data[self::FIELD_VALUE_DISTANCE_EXT] + : null; if ($data[self::FIELD_VALUE_DISTANCE] instanceof FHIRDistance) { $this->setValueDistance($data[self::FIELD_VALUE_DISTANCE]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_DISTANCE])) { + $this->setValueDistance(new FHIRDistance([FHIRDistance::FIELD_VALUE => $data[self::FIELD_VALUE_DISTANCE]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_DISTANCE])) { + $this->setValueDistance(new FHIRDistance(array_merge($ext, $data[self::FIELD_VALUE_DISTANCE]))); + } } else { $this->setValueDistance(new FHIRDistance($data[self::FIELD_VALUE_DISTANCE])); } @@ -1080,8 +1146,17 @@ public function __construct($data = null) } } if (isset($data[self::FIELD_VALUE_DURATION])) { + $ext = (isset($data[self::FIELD_VALUE_DURATION_EXT]) && is_array($data[self::FIELD_VALUE_DURATION_EXT])) + ? $data[self::FIELD_VALUE_DURATION_EXT] + : null; if ($data[self::FIELD_VALUE_DURATION] instanceof FHIRDuration) { $this->setValueDuration($data[self::FIELD_VALUE_DURATION]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_DURATION])) { + $this->setValueDuration(new FHIRDuration([FHIRDuration::FIELD_VALUE => $data[self::FIELD_VALUE_DURATION]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_DURATION])) { + $this->setValueDuration(new FHIRDuration(array_merge($ext, $data[self::FIELD_VALUE_DURATION]))); + } } else { $this->setValueDuration(new FHIRDuration($data[self::FIELD_VALUE_DURATION])); } @@ -1106,8 +1181,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_ID] instanceof FHIRId) { $this->setValueId($data[self::FIELD_VALUE_ID]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_ID])) { - $this->setValueId(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_VALUE_ID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_ID])) { + $this->setValueId(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_VALUE_ID]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_ID])) { + $this->setValueId(new FHIRId(array_merge($ext, $data[self::FIELD_VALUE_ID]))); + } } else { $this->setValueId(new FHIRId($data[self::FIELD_VALUE_ID])); } @@ -1118,8 +1197,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_IDENTIFIER] instanceof FHIRIdentifier) { $this->setValueIdentifier($data[self::FIELD_VALUE_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_IDENTIFIER])) { - $this->setValueIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_VALUE_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_IDENTIFIER])) { + $this->setValueIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_VALUE_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_IDENTIFIER])) { + $this->setValueIdentifier(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_VALUE_IDENTIFIER]))); + } } else { $this->setValueIdentifier(new FHIRIdentifier($data[self::FIELD_VALUE_IDENTIFIER])); } @@ -1130,8 +1213,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_INSTANT] instanceof FHIRInstant) { $this->setValueInstant($data[self::FIELD_VALUE_INSTANT]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_INSTANT])) { - $this->setValueInstant(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_VALUE_INSTANT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_INSTANT])) { + $this->setValueInstant(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_VALUE_INSTANT]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_INSTANT])) { + $this->setValueInstant(new FHIRInstant(array_merge($ext, $data[self::FIELD_VALUE_INSTANT]))); + } } else { $this->setValueInstant(new FHIRInstant($data[self::FIELD_VALUE_INSTANT])); } @@ -1142,8 +1229,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_INTEGER] instanceof FHIRInteger) { $this->setValueInteger($data[self::FIELD_VALUE_INTEGER]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_INTEGER])) { - $this->setValueInteger(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_VALUE_INTEGER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_INTEGER])) { + $this->setValueInteger(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_VALUE_INTEGER]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_INTEGER])) { + $this->setValueInteger(new FHIRInteger(array_merge($ext, $data[self::FIELD_VALUE_INTEGER]))); + } } else { $this->setValueInteger(new FHIRInteger($data[self::FIELD_VALUE_INTEGER])); } @@ -1154,8 +1245,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_MARKDOWN] instanceof FHIRMarkdown) { $this->setValueMarkdown($data[self::FIELD_VALUE_MARKDOWN]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_MARKDOWN])) { - $this->setValueMarkdown(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_VALUE_MARKDOWN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_MARKDOWN])) { + $this->setValueMarkdown(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_VALUE_MARKDOWN]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_MARKDOWN])) { + $this->setValueMarkdown(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_VALUE_MARKDOWN]))); + } } else { $this->setValueMarkdown(new FHIRMarkdown($data[self::FIELD_VALUE_MARKDOWN])); } @@ -1173,8 +1268,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_MONEY] instanceof FHIRMoney) { $this->setValueMoney($data[self::FIELD_VALUE_MONEY]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_MONEY])) { - $this->setValueMoney(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_VALUE_MONEY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_MONEY])) { + $this->setValueMoney(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_VALUE_MONEY]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_MONEY])) { + $this->setValueMoney(new FHIRMoney(array_merge($ext, $data[self::FIELD_VALUE_MONEY]))); + } } else { $this->setValueMoney(new FHIRMoney($data[self::FIELD_VALUE_MONEY])); } @@ -1185,8 +1284,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_OID] instanceof FHIROid) { $this->setValueOid($data[self::FIELD_VALUE_OID]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_OID])) { - $this->setValueOid(new FHIROid([FHIROid::FIELD_VALUE => $data[self::FIELD_VALUE_OID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_OID])) { + $this->setValueOid(new FHIROid([FHIROid::FIELD_VALUE => $data[self::FIELD_VALUE_OID]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_OID])) { + $this->setValueOid(new FHIROid(array_merge($ext, $data[self::FIELD_VALUE_OID]))); + } } else { $this->setValueOid(new FHIROid($data[self::FIELD_VALUE_OID])); } @@ -1211,8 +1314,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_POSITIVE_INT] instanceof FHIRPositiveInt) { $this->setValuePositiveInt($data[self::FIELD_VALUE_POSITIVE_INT]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_POSITIVE_INT])) { - $this->setValuePositiveInt(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_VALUE_POSITIVE_INT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_POSITIVE_INT])) { + $this->setValuePositiveInt(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_VALUE_POSITIVE_INT]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_POSITIVE_INT])) { + $this->setValuePositiveInt(new FHIRPositiveInt(array_merge($ext, $data[self::FIELD_VALUE_POSITIVE_INT]))); + } } else { $this->setValuePositiveInt(new FHIRPositiveInt($data[self::FIELD_VALUE_POSITIVE_INT])); } @@ -1223,8 +1330,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_QUANTITY] instanceof FHIRQuantity) { $this->setValueQuantity($data[self::FIELD_VALUE_QUANTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_QUANTITY])) { - $this->setValueQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_VALUE_QUANTITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_QUANTITY])) { + $this->setValueQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_VALUE_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_QUANTITY])) { + $this->setValueQuantity(new FHIRQuantity(array_merge($ext, $data[self::FIELD_VALUE_QUANTITY]))); + } } else { $this->setValueQuantity(new FHIRQuantity($data[self::FIELD_VALUE_QUANTITY])); } @@ -1277,8 +1388,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_STRING] instanceof FHIRString) { $this->setValueString($data[self::FIELD_VALUE_STRING]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_STRING])) { - $this->setValueString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VALUE_STRING]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_STRING])) { + $this->setValueString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VALUE_STRING]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_STRING])) { + $this->setValueString(new FHIRString(array_merge($ext, $data[self::FIELD_VALUE_STRING]))); + } } else { $this->setValueString(new FHIRString($data[self::FIELD_VALUE_STRING])); } @@ -1289,8 +1404,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_TIME] instanceof FHIRTime) { $this->setValueTime($data[self::FIELD_VALUE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_TIME])) { - $this->setValueTime(new FHIRTime([FHIRTime::FIELD_VALUE => $data[self::FIELD_VALUE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_TIME])) { + $this->setValueTime(new FHIRTime([FHIRTime::FIELD_VALUE => $data[self::FIELD_VALUE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_TIME])) { + $this->setValueTime(new FHIRTime(array_merge($ext, $data[self::FIELD_VALUE_TIME]))); + } } else { $this->setValueTime(new FHIRTime($data[self::FIELD_VALUE_TIME])); } @@ -1315,8 +1434,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_UNSIGNED_INT] instanceof FHIRUnsignedInt) { $this->setValueUnsignedInt($data[self::FIELD_VALUE_UNSIGNED_INT]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_UNSIGNED_INT])) { - $this->setValueUnsignedInt(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_VALUE_UNSIGNED_INT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_UNSIGNED_INT])) { + $this->setValueUnsignedInt(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_VALUE_UNSIGNED_INT]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_UNSIGNED_INT])) { + $this->setValueUnsignedInt(new FHIRUnsignedInt(array_merge($ext, $data[self::FIELD_VALUE_UNSIGNED_INT]))); + } } else { $this->setValueUnsignedInt(new FHIRUnsignedInt($data[self::FIELD_VALUE_UNSIGNED_INT])); } @@ -1327,8 +1450,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_URI] instanceof FHIRUri) { $this->setValueUri($data[self::FIELD_VALUE_URI]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_URI])) { - $this->setValueUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_VALUE_URI]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_URI])) { + $this->setValueUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_VALUE_URI]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_URI])) { + $this->setValueUri(new FHIRUri(array_merge($ext, $data[self::FIELD_VALUE_URI]))); + } } else { $this->setValueUri(new FHIRUri($data[self::FIELD_VALUE_URI])); } @@ -1339,8 +1466,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_URL] instanceof FHIRUrl) { $this->setValueUrl($data[self::FIELD_VALUE_URL]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_URL])) { - $this->setValueUrl(new FHIRUrl([FHIRUrl::FIELD_VALUE => $data[self::FIELD_VALUE_URL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_URL])) { + $this->setValueUrl(new FHIRUrl([FHIRUrl::FIELD_VALUE => $data[self::FIELD_VALUE_URL]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_URL])) { + $this->setValueUrl(new FHIRUrl(array_merge($ext, $data[self::FIELD_VALUE_URL]))); + } } else { $this->setValueUrl(new FHIRUrl($data[self::FIELD_VALUE_URL])); } @@ -1358,8 +1489,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_UUID] instanceof FHIRUuid) { $this->setValueUuid($data[self::FIELD_VALUE_UUID]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_UUID])) { - $this->setValueUuid(new FHIRUuid([FHIRUuid::FIELD_VALUE => $data[self::FIELD_VALUE_UUID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_UUID])) { + $this->setValueUuid(new FHIRUuid([FHIRUuid::FIELD_VALUE => $data[self::FIELD_VALUE_UUID]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_UUID])) { + $this->setValueUuid(new FHIRUuid(array_merge($ext, $data[self::FIELD_VALUE_UUID]))); + } } else { $this->setValueUuid(new FHIRUuid($data[self::FIELD_VALUE_UUID])); } @@ -3575,19 +3710,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getLabel())) { $v->xmlSerialize($sxe->addChild(self::FIELD_LABEL, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueAddress())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_ADDRESS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueAge())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_AGE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueAnnotation())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_ANNOTATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueAttachment())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_ATTACHMENT, null, $v->_getFHIRXMLNamespace())); } @@ -3603,31 +3734,24 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getValueCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_CODE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueCoding())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_CODING, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueContactDetail())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_CONTACT_DETAIL, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueContactPoint())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_CONTACT_POINT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueContributor())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_CONTRIBUTOR, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueCount())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_COUNT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueDataRequirement())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_DATA_REQUIREMENT, null, $v->_getFHIRXMLNamespace())); } @@ -3640,30 +3764,24 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getValueDecimal())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_DECIMAL, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueDistance())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_DISTANCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueDosage())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_DOSAGE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueDuration())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_DURATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueExpression())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_EXPRESSION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueHumanName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_HUMAN_NAME, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getValueId())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_ID, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } @@ -3676,53 +3794,42 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getValueMarkdown())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_MARKDOWN, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueMeta())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_META, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueMoney())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_MONEY, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getValueOid())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_OID, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueParameterDefinition())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_PARAMETER_DEFINITION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValuePeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_PERIOD, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getValuePositiveInt())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_POSITIVE_INT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_QUANTITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueRange())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_RANGE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueRatio())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_RATIO, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_REFERENCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueRelatedArtifact())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_RELATED_ARTIFACT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueSampledData())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_SAMPLED_DATA, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueSignature())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_SIGNATURE, null, $v->_getFHIRXMLNamespace())); } @@ -3732,11 +3839,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getValueTime())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_TIME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueTiming())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_TIMING, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueTriggerDefinition())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_TRIGGER_DEFINITION, null, $v->_getFHIRXMLNamespace())); } @@ -3749,7 +3854,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getValueUrl())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_URL, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueUsageContext())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_USAGE_CONTEXT, null, $v->_getFHIRXMLNamespace())); } @@ -3766,14 +3870,29 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getLabel())) { - $a[self::FIELD_LABEL] = $v->getValue(); - $a[self::FIELD_LABEL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_LABEL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_LABEL_EXT] = $enc; + } + } else { + $a[self::FIELD_LABEL] = $v; + } } if (null !== ($v = $this->getValueAddress())) { $a[self::FIELD_VALUE_ADDRESS] = $v; } if (null !== ($v = $this->getValueAge())) { - $a[self::FIELD_VALUE_AGE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_AGE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_AGE_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_AGE] = $v; + } } if (null !== ($v = $this->getValueAnnotation())) { $a[self::FIELD_VALUE_ANNOTATION] = $v; @@ -3782,20 +3901,48 @@ public function jsonSerialize() $a[self::FIELD_VALUE_ATTACHMENT] = $v; } if (null !== ($v = $this->getValueBase64Binary())) { - $a[self::FIELD_VALUE_BASE_64BINARY] = $v->getValue(); - $a[self::FIELD_VALUE_BASE_64BINARY_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_BASE_64BINARY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_BASE_64BINARY_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_BASE_64BINARY] = $v; + } } if (null !== ($v = $this->getValueBoolean())) { - $a[self::FIELD_VALUE_BOOLEAN] = $v->getValue(); - $a[self::FIELD_VALUE_BOOLEAN_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_BOOLEAN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_BOOLEAN_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_BOOLEAN] = $v; + } } if (null !== ($v = $this->getValueCanonical())) { - $a[self::FIELD_VALUE_CANONICAL] = $v->getValue(); - $a[self::FIELD_VALUE_CANONICAL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_CANONICAL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_CANONICAL_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_CANONICAL] = $v; + } } if (null !== ($v = $this->getValueCode())) { - $a[self::FIELD_VALUE_CODE] = $v->getValue(); - $a[self::FIELD_VALUE_CODE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_CODE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_CODE_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_CODE] = $v; + } } if (null !== ($v = $this->getValueCodeableConcept())) { $a[self::FIELD_VALUE_CODEABLE_CONCEPT] = $v; @@ -3807,37 +3954,90 @@ public function jsonSerialize() $a[self::FIELD_VALUE_CONTACT_DETAIL] = $v; } if (null !== ($v = $this->getValueContactPoint())) { - $a[self::FIELD_VALUE_CONTACT_POINT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_CONTACT_POINT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_CONTACT_POINT_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_CONTACT_POINT] = $v; + } } if (null !== ($v = $this->getValueContributor())) { $a[self::FIELD_VALUE_CONTRIBUTOR] = $v; } if (null !== ($v = $this->getValueCount())) { - $a[self::FIELD_VALUE_COUNT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_COUNT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_COUNT_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_COUNT] = $v; + } } if (null !== ($v = $this->getValueDataRequirement())) { $a[self::FIELD_VALUE_DATA_REQUIREMENT] = $v; } if (null !== ($v = $this->getValueDate())) { - $a[self::FIELD_VALUE_DATE] = $v->getValue(); - $a[self::FIELD_VALUE_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_DATE] = $v; + } } if (null !== ($v = $this->getValueDateTime())) { - $a[self::FIELD_VALUE_DATE_TIME] = $v->getValue(); - $a[self::FIELD_VALUE_DATE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_DATE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_DATE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_DATE_TIME] = $v; + } } if (null !== ($v = $this->getValueDecimal())) { - $a[self::FIELD_VALUE_DECIMAL] = $v->getValue(); - $a[self::FIELD_VALUE_DECIMAL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_DECIMAL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_DECIMAL_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_DECIMAL] = $v; + } } if (null !== ($v = $this->getValueDistance())) { - $a[self::FIELD_VALUE_DISTANCE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_DISTANCE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_DISTANCE_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_DISTANCE] = $v; + } } if (null !== ($v = $this->getValueDosage())) { $a[self::FIELD_VALUE_DOSAGE] = $v; } if (null !== ($v = $this->getValueDuration())) { - $a[self::FIELD_VALUE_DURATION] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_DURATION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_DURATION_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_DURATION] = $v; + } } if (null !== ($v = $this->getValueExpression())) { $a[self::FIELD_VALUE_EXPRESSION] = $v; @@ -3846,33 +4046,84 @@ public function jsonSerialize() $a[self::FIELD_VALUE_HUMAN_NAME] = $v; } if (null !== ($v = $this->getValueId())) { - $a[self::FIELD_VALUE_ID] = $v->getValue(); - $a[self::FIELD_VALUE_ID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_ID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_ID_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_ID] = $v; + } } if (null !== ($v = $this->getValueIdentifier())) { - $a[self::FIELD_VALUE_IDENTIFIER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_IDENTIFIER] = $v; + } } if (null !== ($v = $this->getValueInstant())) { - $a[self::FIELD_VALUE_INSTANT] = $v->getValue(); - $a[self::FIELD_VALUE_INSTANT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_INSTANT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_INSTANT_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_INSTANT] = $v; + } } if (null !== ($v = $this->getValueInteger())) { - $a[self::FIELD_VALUE_INTEGER] = $v->getValue(); - $a[self::FIELD_VALUE_INTEGER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_INTEGER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_INTEGER_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_INTEGER] = $v; + } } if (null !== ($v = $this->getValueMarkdown())) { - $a[self::FIELD_VALUE_MARKDOWN] = $v->getValue(); - $a[self::FIELD_VALUE_MARKDOWN_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_MARKDOWN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_MARKDOWN_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_MARKDOWN] = $v; + } } if (null !== ($v = $this->getValueMeta())) { $a[self::FIELD_VALUE_META] = $v; } if (null !== ($v = $this->getValueMoney())) { - $a[self::FIELD_VALUE_MONEY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_MONEY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_MONEY_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_MONEY] = $v; + } } if (null !== ($v = $this->getValueOid())) { - $a[self::FIELD_VALUE_OID] = $v->getValue(); - $a[self::FIELD_VALUE_OID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_OID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_OID_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_OID] = $v; + } } if (null !== ($v = $this->getValueParameterDefinition())) { $a[self::FIELD_VALUE_PARAMETER_DEFINITION] = $v; @@ -3881,11 +4132,26 @@ public function jsonSerialize() $a[self::FIELD_VALUE_PERIOD] = $v; } if (null !== ($v = $this->getValuePositiveInt())) { - $a[self::FIELD_VALUE_POSITIVE_INT] = $v->getValue(); - $a[self::FIELD_VALUE_POSITIVE_INT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_POSITIVE_INT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_POSITIVE_INT_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_POSITIVE_INT] = $v; + } } if (null !== ($v = $this->getValueQuantity())) { - $a[self::FIELD_VALUE_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_QUANTITY] = $v; + } } if (null !== ($v = $this->getValueRange())) { $a[self::FIELD_VALUE_RANGE] = $v; @@ -3906,12 +4172,26 @@ public function jsonSerialize() $a[self::FIELD_VALUE_SIGNATURE] = $v; } if (null !== ($v = $this->getValueString())) { - $a[self::FIELD_VALUE_STRING] = $v->getValue(); - $a[self::FIELD_VALUE_STRING_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_STRING] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_STRING_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_STRING] = $v; + } } if (null !== ($v = $this->getValueTime())) { - $a[self::FIELD_VALUE_TIME] = $v->getValue(); - $a[self::FIELD_VALUE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_TIME] = $v; + } } if (null !== ($v = $this->getValueTiming())) { $a[self::FIELD_VALUE_TIMING] = $v; @@ -3920,23 +4200,51 @@ public function jsonSerialize() $a[self::FIELD_VALUE_TRIGGER_DEFINITION] = $v; } if (null !== ($v = $this->getValueUnsignedInt())) { - $a[self::FIELD_VALUE_UNSIGNED_INT] = $v->getValue(); - $a[self::FIELD_VALUE_UNSIGNED_INT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_UNSIGNED_INT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_UNSIGNED_INT_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_UNSIGNED_INT] = $v; + } } if (null !== ($v = $this->getValueUri())) { - $a[self::FIELD_VALUE_URI] = $v->getValue(); - $a[self::FIELD_VALUE_URI_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_URI] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_URI_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_URI] = $v; + } } if (null !== ($v = $this->getValueUrl())) { - $a[self::FIELD_VALUE_URL] = $v->getValue(); - $a[self::FIELD_VALUE_URL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_URL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_URL_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_URL] = $v; + } } if (null !== ($v = $this->getValueUsageContext())) { $a[self::FIELD_VALUE_USAGE_CONTEXT] = $v; } if (null !== ($v = $this->getValueUuid())) { - $a[self::FIELD_VALUE_UUID] = $v->getValue(); - $a[self::FIELD_VALUE_UUID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_UUID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_UUID_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_UUID] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRElementDefinition/FHIRElementDefinitionMapping.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRElementDefinition/FHIRElementDefinitionMapping.php index 23957b0899..0e51efa903 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRElementDefinition/FHIRElementDefinitionMapping.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRElementDefinition/FHIRElementDefinitionMapping.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -81,10 +81,6 @@ class FHIRElementDefinitionMapping extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ELEMENT_DEFINITION_DOT_MAPPING; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_COMMENT = 'comment'; const FIELD_COMMENT_EXT = '_comment'; const FIELD_IDENTITY = 'identity'; @@ -142,6 +138,9 @@ class FHIRElementDefinitionMapping extends FHIRBackboneElement */ protected $map = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRElementDefinitionMapping Constructor * @param null|array $data @@ -164,8 +163,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_COMMENT] instanceof FHIRString) { $this->setComment($data[self::FIELD_COMMENT]); - } elseif ($ext && is_scalar($data[self::FIELD_COMMENT])) { - $this->setComment(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_COMMENT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_COMMENT])) { + $this->setComment(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_COMMENT]] + $ext)); + } else if (is_array($data[self::FIELD_COMMENT])) { + $this->setComment(new FHIRString(array_merge($ext, $data[self::FIELD_COMMENT]))); + } } else { $this->setComment(new FHIRString($data[self::FIELD_COMMENT])); } @@ -176,8 +179,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IDENTITY] instanceof FHIRId) { $this->setIdentity($data[self::FIELD_IDENTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTITY])) { - $this->setIdentity(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_IDENTITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IDENTITY])) { + $this->setIdentity(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_IDENTITY]] + $ext)); + } else if (is_array($data[self::FIELD_IDENTITY])) { + $this->setIdentity(new FHIRId(array_merge($ext, $data[self::FIELD_IDENTITY]))); + } } else { $this->setIdentity(new FHIRId($data[self::FIELD_IDENTITY])); } @@ -188,8 +195,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_LANGUAGE] instanceof FHIRCode) { $this->setLanguage($data[self::FIELD_LANGUAGE]); - } elseif ($ext && is_scalar($data[self::FIELD_LANGUAGE])) { - $this->setLanguage(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_LANGUAGE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_LANGUAGE])) { + $this->setLanguage(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_LANGUAGE]] + $ext)); + } else if (is_array($data[self::FIELD_LANGUAGE])) { + $this->setLanguage(new FHIRCode(array_merge($ext, $data[self::FIELD_LANGUAGE]))); + } } else { $this->setLanguage(new FHIRCode($data[self::FIELD_LANGUAGE])); } @@ -200,8 +211,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MAP] instanceof FHIRString) { $this->setMap($data[self::FIELD_MAP]); - } elseif ($ext && is_scalar($data[self::FIELD_MAP])) { - $this->setMap(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_MAP]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MAP])) { + $this->setMap(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_MAP]] + $ext)); + } else if (is_array($data[self::FIELD_MAP])) { + $this->setMap(new FHIRString(array_merge($ext, $data[self::FIELD_MAP]))); + } } else { $this->setMap(new FHIRString($data[self::FIELD_MAP])); } @@ -513,20 +528,48 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getComment())) { - $a[self::FIELD_COMMENT] = $v->getValue(); - $a[self::FIELD_COMMENT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_COMMENT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_COMMENT_EXT] = $enc; + } + } else { + $a[self::FIELD_COMMENT] = $v; + } } if (null !== ($v = $this->getIdentity())) { - $a[self::FIELD_IDENTITY] = $v->getValue(); - $a[self::FIELD_IDENTITY_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_IDENTITY] = $v; + } } if (null !== ($v = $this->getLanguage())) { - $a[self::FIELD_LANGUAGE] = $v->getValue(); - $a[self::FIELD_LANGUAGE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_LANGUAGE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_LANGUAGE_EXT] = $enc; + } + } else { + $a[self::FIELD_LANGUAGE] = $v; + } } if (null !== ($v = $this->getMap())) { - $a[self::FIELD_MAP] = $v->getValue(); - $a[self::FIELD_MAP_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MAP] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MAP_EXT] = $enc; + } + } else { + $a[self::FIELD_MAP] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRElementDefinition/FHIRElementDefinitionSlicing.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRElementDefinition/FHIRElementDefinitionSlicing.php index 0d70b206c8..c48b78b2d8 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRElementDefinition/FHIRElementDefinitionSlicing.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRElementDefinition/FHIRElementDefinitionSlicing.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -81,10 +81,6 @@ class FHIRElementDefinitionSlicing extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ELEMENT_DEFINITION_DOT_SLICING; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DESCRIPTION = 'description'; const FIELD_DESCRIPTION_EXT = '_description'; const FIELD_DISCRIMINATOR = 'discriminator'; @@ -143,6 +139,9 @@ class FHIRElementDefinitionSlicing extends FHIRBackboneElement */ protected $rules = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRElementDefinitionSlicing Constructor * @param null|array $data @@ -165,8 +164,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -174,6 +177,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_DISCRIMINATOR])) { if (is_array($data[self::FIELD_DISCRIMINATOR])) { foreach($data[self::FIELD_DISCRIMINATOR] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRElementDefinitionDiscriminator) { $this->addDiscriminator($v); } else { @@ -192,8 +198,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ORDERED] instanceof FHIRBoolean) { $this->setOrdered($data[self::FIELD_ORDERED]); - } elseif ($ext && is_scalar($data[self::FIELD_ORDERED])) { - $this->setOrdered(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_ORDERED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ORDERED])) { + $this->setOrdered(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_ORDERED]] + $ext)); + } else if (is_array($data[self::FIELD_ORDERED])) { + $this->setOrdered(new FHIRBoolean(array_merge($ext, $data[self::FIELD_ORDERED]))); + } } else { $this->setOrdered(new FHIRBoolean($data[self::FIELD_ORDERED])); } @@ -204,8 +214,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_RULES] instanceof FHIRSlicingRules) { $this->setRules($data[self::FIELD_RULES]); - } elseif ($ext && is_scalar($data[self::FIELD_RULES])) { - $this->setRules(new FHIRSlicingRules([FHIRSlicingRules::FIELD_VALUE => $data[self::FIELD_RULES]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_RULES])) { + $this->setRules(new FHIRSlicingRules([FHIRSlicingRules::FIELD_VALUE => $data[self::FIELD_RULES]] + $ext)); + } else if (is_array($data[self::FIELD_RULES])) { + $this->setRules(new FHIRSlicingRules(array_merge($ext, $data[self::FIELD_RULES]))); + } } else { $this->setRules(new FHIRSlicingRules($data[self::FIELD_RULES])); } @@ -512,7 +526,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESCRIPTION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getDiscriminator())) { foreach($vs as $v) { if (null === $v) { @@ -521,10 +534,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_DISCRIMINATOR, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getOrdered())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ORDERED, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRules())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RULES, null, $v->_getFHIRXMLNamespace())); } @@ -538,18 +551,40 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if ([] !== ($vs = $this->getDiscriminator())) { $a[self::FIELD_DISCRIMINATOR] = $vs; } if (null !== ($v = $this->getOrdered())) { - $a[self::FIELD_ORDERED] = $v->getValue(); - $a[self::FIELD_ORDERED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ORDERED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ORDERED_EXT] = $enc; + } + } else { + $a[self::FIELD_ORDERED] = $v; + } } if (null !== ($v = $this->getRules())) { - $a[self::FIELD_RULES] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_RULES] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_RULES_EXT] = $enc; + } + } else { + $a[self::FIELD_RULES] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRElementDefinition/FHIRElementDefinitionType.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRElementDefinition/FHIRElementDefinitionType.php index 4c339c616f..d303a2d692 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRElementDefinition/FHIRElementDefinitionType.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRElementDefinition/FHIRElementDefinitionType.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -82,10 +82,6 @@ class FHIRElementDefinitionType extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ELEMENT_DEFINITION_DOT_TYPE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_AGGREGATION = 'aggregation'; const FIELD_AGGREGATION_EXT = '_aggregation'; const FIELD_CODE = 'code'; @@ -172,6 +168,9 @@ class FHIRElementDefinitionType extends FHIRBackboneElement */ protected $versioning = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRElementDefinitionType Constructor * @param null|array $data @@ -194,17 +193,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_AGGREGATION])) { foreach($data[self::FIELD_AGGREGATION] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRAggregationMode) { $this->addAggregation($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addAggregation(new FHIRAggregationMode([FHIRAggregationMode::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addAggregation(new FHIRAggregationMode([FHIRAggregationMode::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addAggregation(new FHIRAggregationMode(array_merge($v, $ext[$i]))); + } } else { $this->addAggregation(new FHIRAggregationMode($v)); } } } elseif ($data[self::FIELD_AGGREGATION] instanceof FHIRAggregationMode) { $this->addAggregation($data[self::FIELD_AGGREGATION]); - } elseif ($ext && is_scalar($data[self::FIELD_AGGREGATION])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_AGGREGATION])) { $this->addAggregation(new FHIRAggregationMode([FHIRAggregationMode::FIELD_VALUE => $data[self::FIELD_AGGREGATION]] + $ext)); } else { $this->addAggregation(new FHIRAggregationMode($data[self::FIELD_AGGREGATION])); @@ -216,8 +222,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CODE] instanceof FHIRUri) { $this->setCode($data[self::FIELD_CODE]); - } elseif ($ext && is_scalar($data[self::FIELD_CODE])) { - $this->setCode(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_CODE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CODE])) { + $this->setCode(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_CODE]] + $ext)); + } else if (is_array($data[self::FIELD_CODE])) { + $this->setCode(new FHIRUri(array_merge($ext, $data[self::FIELD_CODE]))); + } } else { $this->setCode(new FHIRUri($data[self::FIELD_CODE])); } @@ -228,17 +238,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_PROFILE])) { foreach($data[self::FIELD_PROFILE] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCanonical) { $this->addProfile($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addProfile(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addProfile(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addProfile(new FHIRCanonical(array_merge($v, $ext[$i]))); + } } else { $this->addProfile(new FHIRCanonical($v)); } } } elseif ($data[self::FIELD_PROFILE] instanceof FHIRCanonical) { $this->addProfile($data[self::FIELD_PROFILE]); - } elseif ($ext && is_scalar($data[self::FIELD_PROFILE])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_PROFILE])) { $this->addProfile(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $data[self::FIELD_PROFILE]] + $ext)); } else { $this->addProfile(new FHIRCanonical($data[self::FIELD_PROFILE])); @@ -250,17 +267,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_TARGET_PROFILE])) { foreach($data[self::FIELD_TARGET_PROFILE] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCanonical) { $this->addTargetProfile($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addTargetProfile(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addTargetProfile(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addTargetProfile(new FHIRCanonical(array_merge($v, $ext[$i]))); + } } else { $this->addTargetProfile(new FHIRCanonical($v)); } } } elseif ($data[self::FIELD_TARGET_PROFILE] instanceof FHIRCanonical) { $this->addTargetProfile($data[self::FIELD_TARGET_PROFILE]); - } elseif ($ext && is_scalar($data[self::FIELD_TARGET_PROFILE])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_TARGET_PROFILE])) { $this->addTargetProfile(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $data[self::FIELD_TARGET_PROFILE]] + $ext)); } else { $this->addTargetProfile(new FHIRCanonical($data[self::FIELD_TARGET_PROFILE])); @@ -272,8 +296,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VERSIONING] instanceof FHIRReferenceVersionRules) { $this->setVersioning($data[self::FIELD_VERSIONING]); - } elseif ($ext && is_scalar($data[self::FIELD_VERSIONING])) { - $this->setVersioning(new FHIRReferenceVersionRules([FHIRReferenceVersionRules::FIELD_VALUE => $data[self::FIELD_VERSIONING]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VERSIONING])) { + $this->setVersioning(new FHIRReferenceVersionRules([FHIRReferenceVersionRules::FIELD_VALUE => $data[self::FIELD_VERSIONING]] + $ext)); + } else if (is_array($data[self::FIELD_VERSIONING])) { + $this->setVersioning(new FHIRReferenceVersionRules(array_merge($ext, $data[self::FIELD_VERSIONING]))); + } } else { $this->setVersioning(new FHIRReferenceVersionRules($data[self::FIELD_VERSIONING])); } @@ -717,7 +745,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getAggregation())) { foreach($vs as $v) { if (null === $v) { @@ -726,6 +753,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_AGGREGATION, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } @@ -737,6 +765,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_PROFILE, null, $v->_getFHIRXMLNamespace())); } } + if ([] !== ($vs = $this->getTargetProfile())) { foreach($vs as $v) { if (null === $v) { @@ -759,11 +788,34 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if ([] !== ($vs = $this->getAggregation())) { - $a[self::FIELD_AGGREGATION] = $vs; + $a[self::FIELD_AGGREGATION] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_AGGREGATION][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_AGGREGATION_EXT][] = $enc; + } else { + $a[self::FIELD_AGGREGATION_EXT][] = null; + } + } else { + $a[self::FIELD_AGGREGATION][] = $v; + } + } } if (null !== ($v = $this->getCode())) { - $a[self::FIELD_CODE] = $v->getValue(); - $a[self::FIELD_CODE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CODE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CODE_EXT] = $enc; + } + } else { + $a[self::FIELD_CODE] = $v; + } } if ([] !== ($vs = $this->getProfile())) { $a[self::FIELD_PROFILE] = []; @@ -771,8 +823,17 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_PROFILE][] = $v->getValue(); - $a[self::FIELD_PROFILE_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PROFILE][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PROFILE_EXT][] = $enc; + } else { + $a[self::FIELD_PROFILE_EXT][] = null; + } + } else { + $a[self::FIELD_PROFILE][] = $v; + } } } if ([] !== ($vs = $this->getTargetProfile())) { @@ -781,12 +842,29 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_TARGET_PROFILE][] = $v->getValue(); - $a[self::FIELD_TARGET_PROFILE_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TARGET_PROFILE][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TARGET_PROFILE_EXT][] = $enc; + } else { + $a[self::FIELD_TARGET_PROFILE_EXT][] = null; + } + } else { + $a[self::FIELD_TARGET_PROFILE][] = $v; + } } } if (null !== ($v = $this->getVersioning())) { - $a[self::FIELD_VERSIONING] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VERSIONING] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VERSIONING_EXT] = $enc; + } + } else { + $a[self::FIELD_VERSIONING] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIREncounter/FHIREncounterClassHistory.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIREncounter/FHIREncounterClassHistory.php index 70b894441d..f73cfd9486 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIREncounter/FHIREncounterClassHistory.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIREncounter/FHIREncounterClassHistory.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIREncounterClassHistory extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ENCOUNTER_DOT_CLASS_HISTORY; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CLASS = 'class'; const FIELD_PERIOD = 'period'; @@ -108,6 +104,9 @@ class FHIREncounterClassHistory extends FHIRBackboneElement */ protected $period = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIREncounterClassHistory Constructor * @param null|array $data @@ -305,11 +304,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getClass())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CLASS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PERIOD, null, $v->_getFHIRXMLNamespace())); } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIREncounter/FHIREncounterDiagnosis.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIREncounter/FHIREncounterDiagnosis.php index 9eecd248e0..f6b1d91849 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIREncounter/FHIREncounterDiagnosis.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIREncounter/FHIREncounterDiagnosis.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIREncounterDiagnosis extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ENCOUNTER_DOT_DIAGNOSIS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CONDITION = 'condition'; const FIELD_RANK = 'rank'; const FIELD_RANK_EXT = '_rank'; @@ -127,6 +123,9 @@ class FHIREncounterDiagnosis extends FHIRBackboneElement */ protected $use = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIREncounterDiagnosis Constructor * @param null|array $data @@ -156,8 +155,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_RANK] instanceof FHIRPositiveInt) { $this->setRank($data[self::FIELD_RANK]); - } elseif ($ext && is_scalar($data[self::FIELD_RANK])) { - $this->setRank(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_RANK]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_RANK])) { + $this->setRank(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_RANK]] + $ext)); + } else if (is_array($data[self::FIELD_RANK])) { + $this->setRank(new FHIRPositiveInt(array_merge($ext, $data[self::FIELD_RANK]))); + } } else { $this->setRank(new FHIRPositiveInt($data[self::FIELD_RANK])); } @@ -390,14 +393,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getCondition())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CONDITION, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getRank())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RANK, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getUse())) { $v->xmlSerialize($sxe->addChild(self::FIELD_USE, null, $v->_getFHIRXMLNamespace())); } @@ -414,8 +415,15 @@ public function jsonSerialize() $a[self::FIELD_CONDITION] = $v; } if (null !== ($v = $this->getRank())) { - $a[self::FIELD_RANK] = $v->getValue(); - $a[self::FIELD_RANK_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_RANK] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_RANK_EXT] = $enc; + } + } else { + $a[self::FIELD_RANK] = $v; + } } if (null !== ($v = $this->getUse())) { $a[self::FIELD_USE] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIREncounter/FHIREncounterHospitalization.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIREncounter/FHIREncounterHospitalization.php index 134b659fa3..f88ae8e410 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIREncounter/FHIREncounterHospitalization.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIREncounter/FHIREncounterHospitalization.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIREncounterHospitalization extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ENCOUNTER_DOT_HOSPITALIZATION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ADMIT_SOURCE = 'admitSource'; const FIELD_DESTINATION = 'destination'; const FIELD_DIET_PREFERENCE = 'dietPreference'; @@ -202,6 +198,9 @@ class FHIREncounterHospitalization extends FHIRBackboneElement */ protected $specialCourtesy = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIREncounterHospitalization Constructor * @param null|array $data @@ -235,6 +234,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_DIET_PREFERENCE])) { if (is_array($data[self::FIELD_DIET_PREFERENCE])) { foreach($data[self::FIELD_DIET_PREFERENCE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addDietPreference($v); } else { @@ -267,8 +269,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PRE_ADMISSION_IDENTIFIER] instanceof FHIRIdentifier) { $this->setPreAdmissionIdentifier($data[self::FIELD_PRE_ADMISSION_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_PRE_ADMISSION_IDENTIFIER])) { - $this->setPreAdmissionIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_PRE_ADMISSION_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PRE_ADMISSION_IDENTIFIER])) { + $this->setPreAdmissionIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_PRE_ADMISSION_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_PRE_ADMISSION_IDENTIFIER])) { + $this->setPreAdmissionIdentifier(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_PRE_ADMISSION_IDENTIFIER]))); + } } else { $this->setPreAdmissionIdentifier(new FHIRIdentifier($data[self::FIELD_PRE_ADMISSION_IDENTIFIER])); } @@ -283,6 +289,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SPECIAL_ARRANGEMENT])) { if (is_array($data[self::FIELD_SPECIAL_ARRANGEMENT])) { foreach($data[self::FIELD_SPECIAL_ARRANGEMENT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addSpecialArrangement($v); } else { @@ -298,6 +307,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SPECIAL_COURTESY])) { if (is_array($data[self::FIELD_SPECIAL_COURTESY])) { foreach($data[self::FIELD_SPECIAL_COURTESY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addSpecialCourtesy($v); } else { @@ -812,15 +824,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getAdmitSource())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ADMIT_SOURCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDestination())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESTINATION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getDietPreference())) { foreach($vs as $v) { if (null === $v) { @@ -833,19 +842,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDischargeDisposition())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DISCHARGE_DISPOSITION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOrigin())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ORIGIN, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPreAdmissionIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PRE_ADMISSION_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getReAdmission())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RE_ADMISSION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getSpecialArrangement())) { foreach($vs as $v) { if (null === $v) { @@ -863,6 +868,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_SPECIAL_COURTESY, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } @@ -888,7 +894,15 @@ public function jsonSerialize() $a[self::FIELD_ORIGIN] = $v; } if (null !== ($v = $this->getPreAdmissionIdentifier())) { - $a[self::FIELD_PRE_ADMISSION_IDENTIFIER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PRE_ADMISSION_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PRE_ADMISSION_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_PRE_ADMISSION_IDENTIFIER] = $v; + } } if (null !== ($v = $this->getReAdmission())) { $a[self::FIELD_RE_ADMISSION] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIREncounter/FHIREncounterLocation.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIREncounter/FHIREncounterLocation.php index a098561f4f..4fa27aff31 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIREncounter/FHIREncounterLocation.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIREncounter/FHIREncounterLocation.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -81,10 +81,6 @@ class FHIREncounterLocation extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ENCOUNTER_DOT_LOCATION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_LOCATION = 'location'; const FIELD_PERIOD = 'period'; const FIELD_PHYSICAL_TYPE = 'physicalType'; @@ -138,6 +134,9 @@ class FHIREncounterLocation extends FHIRBackboneElement */ protected $status = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIREncounterLocation Constructor * @param null|array $data @@ -181,8 +180,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIREncounterLocationStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIREncounterLocationStatus([FHIREncounterLocationStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIREncounterLocationStatus([FHIREncounterLocationStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIREncounterLocationStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIREncounterLocationStatus($data[self::FIELD_STATUS])); } @@ -426,19 +429,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getLocation())) { $v->xmlSerialize($sxe->addChild(self::FIELD_LOCATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPhysicalType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PHYSICAL_TYPE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } @@ -461,7 +460,15 @@ public function jsonSerialize() $a[self::FIELD_PHYSICAL_TYPE] = $v; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIREncounter/FHIREncounterParticipant.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIREncounter/FHIREncounterParticipant.php index 3f711252a0..ba2c33e1cb 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIREncounter/FHIREncounterParticipant.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIREncounter/FHIREncounterParticipant.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIREncounterParticipant extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ENCOUNTER_DOT_PARTICIPANT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_INDIVIDUAL = 'individual'; const FIELD_PERIOD = 'period'; const FIELD_TYPE = 'type'; @@ -123,6 +119,9 @@ class FHIREncounterParticipant extends FHIRBackboneElement */ protected $type = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIREncounterParticipant Constructor * @param null|array $data @@ -156,6 +155,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_TYPE])) { if (is_array($data[self::FIELD_TYPE])) { foreach($data[self::FIELD_TYPE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addType($v); } else { @@ -401,15 +403,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getIndividual())) { $v->xmlSerialize($sxe->addChild(self::FIELD_INDIVIDUAL, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getType())) { foreach($vs as $v) { if (null === $v) { @@ -418,6 +417,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIREncounter/FHIREncounterStatusHistory.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIREncounter/FHIREncounterStatusHistory.php index 3e676d0cc8..4e1344f9a5 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIREncounter/FHIREncounterStatusHistory.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIREncounter/FHIREncounterStatusHistory.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIREncounterStatusHistory extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ENCOUNTER_DOT_STATUS_HISTORY; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_PERIOD = 'period'; const FIELD_STATUS = 'status'; const FIELD_STATUS_EXT = '_status'; @@ -108,6 +104,9 @@ class FHIREncounterStatusHistory extends FHIRBackboneElement */ protected $status = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIREncounterStatusHistory Constructor * @param null|array $data @@ -137,8 +136,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIREncounterStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIREncounterStatus([FHIREncounterStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIREncounterStatus([FHIREncounterStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIREncounterStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIREncounterStatus($data[self::FIELD_STATUS])); } @@ -308,11 +311,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } @@ -329,7 +330,15 @@ public function jsonSerialize() $a[self::FIELD_PERIOD] = $v; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIREpisodeOfCare/FHIREpisodeOfCareDiagnosis.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIREpisodeOfCare/FHIREpisodeOfCareDiagnosis.php index 74aa12d608..6d6cb9ba20 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIREpisodeOfCare/FHIREpisodeOfCareDiagnosis.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIREpisodeOfCare/FHIREpisodeOfCareDiagnosis.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -81,10 +81,6 @@ class FHIREpisodeOfCareDiagnosis extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_EPISODE_OF_CARE_DOT_DIAGNOSIS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CONDITION = 'condition'; const FIELD_RANK = 'rank'; const FIELD_RANK_EXT = '_rank'; @@ -126,6 +122,9 @@ class FHIREpisodeOfCareDiagnosis extends FHIRBackboneElement */ protected $role = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIREpisodeOfCareDiagnosis Constructor * @param null|array $data @@ -155,8 +154,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_RANK] instanceof FHIRPositiveInt) { $this->setRank($data[self::FIELD_RANK]); - } elseif ($ext && is_scalar($data[self::FIELD_RANK])) { - $this->setRank(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_RANK]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_RANK])) { + $this->setRank(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_RANK]] + $ext)); + } else if (is_array($data[self::FIELD_RANK])) { + $this->setRank(new FHIRPositiveInt(array_merge($ext, $data[self::FIELD_RANK]))); + } } else { $this->setRank(new FHIRPositiveInt($data[self::FIELD_RANK])); } @@ -385,14 +388,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getCondition())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CONDITION, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getRank())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RANK, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRole())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ROLE, null, $v->_getFHIRXMLNamespace())); } @@ -409,8 +410,15 @@ public function jsonSerialize() $a[self::FIELD_CONDITION] = $v; } if (null !== ($v = $this->getRank())) { - $a[self::FIELD_RANK] = $v->getValue(); - $a[self::FIELD_RANK_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_RANK] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_RANK_EXT] = $enc; + } + } else { + $a[self::FIELD_RANK] = $v; + } } if (null !== ($v = $this->getRole())) { $a[self::FIELD_ROLE] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIREpisodeOfCare/FHIREpisodeOfCareStatusHistory.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIREpisodeOfCare/FHIREpisodeOfCareStatusHistory.php index 9bebd6a871..3816b176ce 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIREpisodeOfCare/FHIREpisodeOfCareStatusHistory.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIREpisodeOfCare/FHIREpisodeOfCareStatusHistory.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIREpisodeOfCareStatusHistory extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_EPISODE_OF_CARE_DOT_STATUS_HISTORY; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_PERIOD = 'period'; const FIELD_STATUS = 'status'; const FIELD_STATUS_EXT = '_status'; @@ -109,6 +105,9 @@ class FHIREpisodeOfCareStatusHistory extends FHIRBackboneElement */ protected $status = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIREpisodeOfCareStatusHistory Constructor * @param null|array $data @@ -138,8 +137,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIREpisodeOfCareStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIREpisodeOfCareStatus([FHIREpisodeOfCareStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIREpisodeOfCareStatus([FHIREpisodeOfCareStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIREpisodeOfCareStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIREpisodeOfCareStatus($data[self::FIELD_STATUS])); } @@ -309,11 +312,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } @@ -330,7 +331,15 @@ public function jsonSerialize() $a[self::FIELD_PERIOD] = $v; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIREvidenceVariable/FHIREvidenceVariableCharacteristic.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIREvidenceVariable/FHIREvidenceVariableCharacteristic.php index a2832e4b0b..e2b942bcf5 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIREvidenceVariable/FHIREvidenceVariableCharacteristic.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIREvidenceVariable/FHIREvidenceVariableCharacteristic.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -91,10 +91,6 @@ class FHIREvidenceVariableCharacteristic extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_EVIDENCE_VARIABLE_DOT_CHARACTERISTIC; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DEFINITION_CANONICAL = 'definitionCanonical'; const FIELD_DEFINITION_CANONICAL_EXT = '_definitionCanonical'; const FIELD_DEFINITION_CODEABLE_CONCEPT = 'definitionCodeableConcept'; @@ -111,9 +107,11 @@ class FHIREvidenceVariableCharacteristic extends FHIRBackboneElement const FIELD_PARTICIPANT_EFFECTIVE_DATE_TIME = 'participantEffectiveDateTime'; const FIELD_PARTICIPANT_EFFECTIVE_DATE_TIME_EXT = '_participantEffectiveDateTime'; const FIELD_PARTICIPANT_EFFECTIVE_DURATION = 'participantEffectiveDuration'; + const FIELD_PARTICIPANT_EFFECTIVE_DURATION_EXT = '_participantEffectiveDuration'; const FIELD_PARTICIPANT_EFFECTIVE_PERIOD = 'participantEffectivePeriod'; const FIELD_PARTICIPANT_EFFECTIVE_TIMING = 'participantEffectiveTiming'; const FIELD_TIME_FROM_START = 'timeFromStart'; + const FIELD_TIME_FROM_START_EXT = '_timeFromStart'; const FIELD_USAGE_CONTEXT = 'usageContext'; /** @@ -319,6 +317,9 @@ class FHIREvidenceVariableCharacteristic extends FHIRBackboneElement */ protected $usageContext = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIREvidenceVariableCharacteristic Constructor * @param null|array $data @@ -341,8 +342,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DEFINITION_CANONICAL] instanceof FHIRCanonical) { $this->setDefinitionCanonical($data[self::FIELD_DEFINITION_CANONICAL]); - } elseif ($ext && is_scalar($data[self::FIELD_DEFINITION_CANONICAL])) { - $this->setDefinitionCanonical(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $data[self::FIELD_DEFINITION_CANONICAL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DEFINITION_CANONICAL])) { + $this->setDefinitionCanonical(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $data[self::FIELD_DEFINITION_CANONICAL]] + $ext)); + } else if (is_array($data[self::FIELD_DEFINITION_CANONICAL])) { + $this->setDefinitionCanonical(new FHIRCanonical(array_merge($ext, $data[self::FIELD_DEFINITION_CANONICAL]))); + } } else { $this->setDefinitionCanonical(new FHIRCanonical($data[self::FIELD_DEFINITION_CANONICAL])); } @@ -388,8 +393,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -400,8 +409,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EXCLUDE] instanceof FHIRBoolean) { $this->setExclude($data[self::FIELD_EXCLUDE]); - } elseif ($ext && is_scalar($data[self::FIELD_EXCLUDE])) { - $this->setExclude(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_EXCLUDE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EXCLUDE])) { + $this->setExclude(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_EXCLUDE]] + $ext)); + } else if (is_array($data[self::FIELD_EXCLUDE])) { + $this->setExclude(new FHIRBoolean(array_merge($ext, $data[self::FIELD_EXCLUDE]))); + } } else { $this->setExclude(new FHIRBoolean($data[self::FIELD_EXCLUDE])); } @@ -412,8 +425,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_GROUP_MEASURE] instanceof FHIRGroupMeasure) { $this->setGroupMeasure($data[self::FIELD_GROUP_MEASURE]); - } elseif ($ext && is_scalar($data[self::FIELD_GROUP_MEASURE])) { - $this->setGroupMeasure(new FHIRGroupMeasure([FHIRGroupMeasure::FIELD_VALUE => $data[self::FIELD_GROUP_MEASURE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_GROUP_MEASURE])) { + $this->setGroupMeasure(new FHIRGroupMeasure([FHIRGroupMeasure::FIELD_VALUE => $data[self::FIELD_GROUP_MEASURE]] + $ext)); + } else if (is_array($data[self::FIELD_GROUP_MEASURE])) { + $this->setGroupMeasure(new FHIRGroupMeasure(array_merge($ext, $data[self::FIELD_GROUP_MEASURE]))); + } } else { $this->setGroupMeasure(new FHIRGroupMeasure($data[self::FIELD_GROUP_MEASURE])); } @@ -424,15 +441,28 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PARTICIPANT_EFFECTIVE_DATE_TIME] instanceof FHIRDateTime) { $this->setParticipantEffectiveDateTime($data[self::FIELD_PARTICIPANT_EFFECTIVE_DATE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_PARTICIPANT_EFFECTIVE_DATE_TIME])) { - $this->setParticipantEffectiveDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_PARTICIPANT_EFFECTIVE_DATE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PARTICIPANT_EFFECTIVE_DATE_TIME])) { + $this->setParticipantEffectiveDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_PARTICIPANT_EFFECTIVE_DATE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_PARTICIPANT_EFFECTIVE_DATE_TIME])) { + $this->setParticipantEffectiveDateTime(new FHIRDateTime(array_merge($ext, $data[self::FIELD_PARTICIPANT_EFFECTIVE_DATE_TIME]))); + } } else { $this->setParticipantEffectiveDateTime(new FHIRDateTime($data[self::FIELD_PARTICIPANT_EFFECTIVE_DATE_TIME])); } } if (isset($data[self::FIELD_PARTICIPANT_EFFECTIVE_DURATION])) { + $ext = (isset($data[self::FIELD_PARTICIPANT_EFFECTIVE_DURATION_EXT]) && is_array($data[self::FIELD_PARTICIPANT_EFFECTIVE_DURATION_EXT])) + ? $data[self::FIELD_PARTICIPANT_EFFECTIVE_DURATION_EXT] + : null; if ($data[self::FIELD_PARTICIPANT_EFFECTIVE_DURATION] instanceof FHIRDuration) { $this->setParticipantEffectiveDuration($data[self::FIELD_PARTICIPANT_EFFECTIVE_DURATION]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PARTICIPANT_EFFECTIVE_DURATION])) { + $this->setParticipantEffectiveDuration(new FHIRDuration([FHIRDuration::FIELD_VALUE => $data[self::FIELD_PARTICIPANT_EFFECTIVE_DURATION]] + $ext)); + } else if (is_array($data[self::FIELD_PARTICIPANT_EFFECTIVE_DURATION])) { + $this->setParticipantEffectiveDuration(new FHIRDuration(array_merge($ext, $data[self::FIELD_PARTICIPANT_EFFECTIVE_DURATION]))); + } } else { $this->setParticipantEffectiveDuration(new FHIRDuration($data[self::FIELD_PARTICIPANT_EFFECTIVE_DURATION])); } @@ -452,8 +482,17 @@ public function __construct($data = null) } } if (isset($data[self::FIELD_TIME_FROM_START])) { + $ext = (isset($data[self::FIELD_TIME_FROM_START_EXT]) && is_array($data[self::FIELD_TIME_FROM_START_EXT])) + ? $data[self::FIELD_TIME_FROM_START_EXT] + : null; if ($data[self::FIELD_TIME_FROM_START] instanceof FHIRDuration) { $this->setTimeFromStart($data[self::FIELD_TIME_FROM_START]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TIME_FROM_START])) { + $this->setTimeFromStart(new FHIRDuration([FHIRDuration::FIELD_VALUE => $data[self::FIELD_TIME_FROM_START]] + $ext)); + } else if (is_array($data[self::FIELD_TIME_FROM_START])) { + $this->setTimeFromStart(new FHIRDuration(array_merge($ext, $data[self::FIELD_TIME_FROM_START]))); + } } else { $this->setTimeFromStart(new FHIRDuration($data[self::FIELD_TIME_FROM_START])); } @@ -461,6 +500,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_USAGE_CONTEXT])) { if (is_array($data[self::FIELD_USAGE_CONTEXT])) { foreach($data[self::FIELD_USAGE_CONTEXT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRUsageContext) { $this->addUsageContext($v); } else { @@ -1224,23 +1266,18 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDefinitionCanonical())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFINITION_CANONICAL, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDefinitionCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFINITION_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDefinitionDataRequirement())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFINITION_DATA_REQUIREMENT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDefinitionExpression())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFINITION_EXPRESSION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDefinitionReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFINITION_REFERENCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDefinitionTriggerDefinition())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFINITION_TRIGGER_DEFINITION, null, $v->_getFHIRXMLNamespace())); } @@ -1250,30 +1287,24 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getExclude())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EXCLUDE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getGroupMeasure())) { $v->xmlSerialize($sxe->addChild(self::FIELD_GROUP_MEASURE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getParticipantEffectiveDateTime())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PARTICIPANT_EFFECTIVE_DATE_TIME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getParticipantEffectiveDuration())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PARTICIPANT_EFFECTIVE_DURATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getParticipantEffectivePeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PARTICIPANT_EFFECTIVE_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getParticipantEffectiveTiming())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PARTICIPANT_EFFECTIVE_TIMING, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getTimeFromStart())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TIME_FROM_START, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getUsageContext())) { foreach($vs as $v) { if (null === $v) { @@ -1282,6 +1313,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_USAGE_CONTEXT, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } @@ -1292,8 +1324,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getDefinitionCanonical())) { - $a[self::FIELD_DEFINITION_CANONICAL] = $v->getValue(); - $a[self::FIELD_DEFINITION_CANONICAL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DEFINITION_CANONICAL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DEFINITION_CANONICAL_EXT] = $enc; + } + } else { + $a[self::FIELD_DEFINITION_CANONICAL] = $v; + } } if (null !== ($v = $this->getDefinitionCodeableConcept())) { $a[self::FIELD_DEFINITION_CODEABLE_CONCEPT] = $v; @@ -1311,22 +1350,59 @@ public function jsonSerialize() $a[self::FIELD_DEFINITION_TRIGGER_DEFINITION] = $v; } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if (null !== ($v = $this->getExclude())) { - $a[self::FIELD_EXCLUDE] = $v->getValue(); - $a[self::FIELD_EXCLUDE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EXCLUDE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EXCLUDE_EXT] = $enc; + } + } else { + $a[self::FIELD_EXCLUDE] = $v; + } } if (null !== ($v = $this->getGroupMeasure())) { - $a[self::FIELD_GROUP_MEASURE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_GROUP_MEASURE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_GROUP_MEASURE_EXT] = $enc; + } + } else { + $a[self::FIELD_GROUP_MEASURE] = $v; + } } if (null !== ($v = $this->getParticipantEffectiveDateTime())) { - $a[self::FIELD_PARTICIPANT_EFFECTIVE_DATE_TIME] = $v->getValue(); - $a[self::FIELD_PARTICIPANT_EFFECTIVE_DATE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PARTICIPANT_EFFECTIVE_DATE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PARTICIPANT_EFFECTIVE_DATE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_PARTICIPANT_EFFECTIVE_DATE_TIME] = $v; + } } if (null !== ($v = $this->getParticipantEffectiveDuration())) { - $a[self::FIELD_PARTICIPANT_EFFECTIVE_DURATION] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PARTICIPANT_EFFECTIVE_DURATION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PARTICIPANT_EFFECTIVE_DURATION_EXT] = $enc; + } + } else { + $a[self::FIELD_PARTICIPANT_EFFECTIVE_DURATION] = $v; + } } if (null !== ($v = $this->getParticipantEffectivePeriod())) { $a[self::FIELD_PARTICIPANT_EFFECTIVE_PERIOD] = $v; @@ -1335,7 +1411,15 @@ public function jsonSerialize() $a[self::FIELD_PARTICIPANT_EFFECTIVE_TIMING] = $v; } if (null !== ($v = $this->getTimeFromStart())) { - $a[self::FIELD_TIME_FROM_START] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TIME_FROM_START] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TIME_FROM_START_EXT] = $enc; + } + } else { + $a[self::FIELD_TIME_FROM_START] = $v; + } } if ([] !== ($vs = $this->getUsageContext())) { $a[self::FIELD_USAGE_CONTEXT] = $vs; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRExampleScenario/FHIRExampleScenarioActor.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRExampleScenario/FHIRExampleScenarioActor.php index a1c1824cfb..e1aef6a65c 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRExampleScenario/FHIRExampleScenarioActor.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRExampleScenario/FHIRExampleScenarioActor.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRExampleScenarioActor extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_EXAMPLE_SCENARIO_DOT_ACTOR; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ACTOR_ID = 'actorId'; const FIELD_ACTOR_ID_EXT = '_actorId'; const FIELD_DESCRIPTION = 'description'; @@ -139,6 +135,9 @@ class FHIRExampleScenarioActor extends FHIRBackboneElement */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRExampleScenarioActor Constructor * @param null|array $data @@ -161,8 +160,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ACTOR_ID] instanceof FHIRString) { $this->setActorId($data[self::FIELD_ACTOR_ID]); - } elseif ($ext && is_scalar($data[self::FIELD_ACTOR_ID])) { - $this->setActorId(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_ACTOR_ID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ACTOR_ID])) { + $this->setActorId(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_ACTOR_ID]] + $ext)); + } else if (is_array($data[self::FIELD_ACTOR_ID])) { + $this->setActorId(new FHIRString(array_merge($ext, $data[self::FIELD_ACTOR_ID]))); + } } else { $this->setActorId(new FHIRString($data[self::FIELD_ACTOR_ID])); } @@ -173,8 +176,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRMarkdown) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRMarkdown($data[self::FIELD_DESCRIPTION])); } @@ -185,8 +192,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -197,8 +208,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TYPE] instanceof FHIRExampleScenarioActorType) { $this->setType($data[self::FIELD_TYPE]); - } elseif ($ext && is_scalar($data[self::FIELD_TYPE])) { - $this->setType(new FHIRExampleScenarioActorType([FHIRExampleScenarioActorType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TYPE])) { + $this->setType(new FHIRExampleScenarioActorType([FHIRExampleScenarioActorType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } else if (is_array($data[self::FIELD_TYPE])) { + $this->setType(new FHIRExampleScenarioActorType(array_merge($ext, $data[self::FIELD_TYPE]))); + } } else { $this->setType(new FHIRExampleScenarioActorType($data[self::FIELD_TYPE])); } @@ -484,7 +499,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NAME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -498,19 +512,48 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getActorId())) { - $a[self::FIELD_ACTOR_ID] = $v->getValue(); - $a[self::FIELD_ACTOR_ID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ACTOR_ID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ACTOR_ID_EXT] = $enc; + } + } else { + $a[self::FIELD_ACTOR_ID] = $v; + } } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if (null !== ($v = $this->getType())) { - $a[self::FIELD_TYPE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TYPE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TYPE_EXT] = $enc; + } + } else { + $a[self::FIELD_TYPE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRExampleScenario/FHIRExampleScenarioAlternative.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRExampleScenario/FHIRExampleScenarioAlternative.php index adc2a42aa2..2f6dfda500 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRExampleScenario/FHIRExampleScenarioAlternative.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRExampleScenario/FHIRExampleScenarioAlternative.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRExampleScenarioAlternative extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_EXAMPLE_SCENARIO_DOT_ALTERNATIVE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DESCRIPTION = 'description'; const FIELD_DESCRIPTION_EXT = '_description'; const FIELD_STEP = 'step'; @@ -125,6 +121,9 @@ class FHIRExampleScenarioAlternative extends FHIRBackboneElement */ protected $title = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRExampleScenarioAlternative Constructor * @param null|array $data @@ -147,8 +146,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRMarkdown) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRMarkdown($data[self::FIELD_DESCRIPTION])); } @@ -156,6 +159,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_STEP])) { if (is_array($data[self::FIELD_STEP])) { foreach($data[self::FIELD_STEP] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRExampleScenarioStep) { $this->addStep($v); } else { @@ -174,8 +180,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TITLE] instanceof FHIRString) { $this->setTitle($data[self::FIELD_TITLE]); - } elseif ($ext && is_scalar($data[self::FIELD_TITLE])) { - $this->setTitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TITLE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TITLE])) { + $this->setTitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TITLE]] + $ext)); + } else if (is_array($data[self::FIELD_TITLE])) { + $this->setTitle(new FHIRString(array_merge($ext, $data[self::FIELD_TITLE]))); + } } else { $this->setTitle(new FHIRString($data[self::FIELD_TITLE])); } @@ -439,7 +449,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESCRIPTION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getStep())) { foreach($vs as $v) { if (null === $v) { @@ -448,6 +457,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_STEP, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getTitle())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TITLE, null, $v->_getFHIRXMLNamespace())); } @@ -461,15 +471,29 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if ([] !== ($vs = $this->getStep())) { $a[self::FIELD_STEP] = $vs; } if (null !== ($v = $this->getTitle())) { - $a[self::FIELD_TITLE] = $v->getValue(); - $a[self::FIELD_TITLE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TITLE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TITLE_EXT] = $enc; + } + } else { + $a[self::FIELD_TITLE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRExampleScenario/FHIRExampleScenarioContainedInstance.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRExampleScenario/FHIRExampleScenarioContainedInstance.php index 93342cc246..97e8044b90 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRExampleScenario/FHIRExampleScenarioContainedInstance.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRExampleScenario/FHIRExampleScenarioContainedInstance.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -77,10 +77,6 @@ class FHIRExampleScenarioContainedInstance extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_EXAMPLE_SCENARIO_DOT_CONTAINED_INSTANCE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_RESOURCE_ID = 'resourceId'; const FIELD_RESOURCE_ID_EXT = '_resourceId'; const FIELD_VERSION_ID = 'versionId'; @@ -108,6 +104,9 @@ class FHIRExampleScenarioContainedInstance extends FHIRBackboneElement */ protected $versionId = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRExampleScenarioContainedInstance Constructor * @param null|array $data @@ -130,8 +129,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_RESOURCE_ID] instanceof FHIRString) { $this->setResourceId($data[self::FIELD_RESOURCE_ID]); - } elseif ($ext && is_scalar($data[self::FIELD_RESOURCE_ID])) { - $this->setResourceId(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_RESOURCE_ID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_RESOURCE_ID])) { + $this->setResourceId(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_RESOURCE_ID]] + $ext)); + } else if (is_array($data[self::FIELD_RESOURCE_ID])) { + $this->setResourceId(new FHIRString(array_merge($ext, $data[self::FIELD_RESOURCE_ID]))); + } } else { $this->setResourceId(new FHIRString($data[self::FIELD_RESOURCE_ID])); } @@ -142,8 +145,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VERSION_ID] instanceof FHIRString) { $this->setVersionId($data[self::FIELD_VERSION_ID]); - } elseif ($ext && is_scalar($data[self::FIELD_VERSION_ID])) { - $this->setVersionId(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION_ID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VERSION_ID])) { + $this->setVersionId(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION_ID]] + $ext)); + } else if (is_array($data[self::FIELD_VERSION_ID])) { + $this->setVersionId(new FHIRString(array_merge($ext, $data[self::FIELD_VERSION_ID]))); + } } else { $this->setVersionId(new FHIRString($data[self::FIELD_VERSION_ID])); } @@ -353,12 +360,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getResourceId())) { - $a[self::FIELD_RESOURCE_ID] = $v->getValue(); - $a[self::FIELD_RESOURCE_ID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_RESOURCE_ID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_RESOURCE_ID_EXT] = $enc; + } + } else { + $a[self::FIELD_RESOURCE_ID] = $v; + } } if (null !== ($v = $this->getVersionId())) { - $a[self::FIELD_VERSION_ID] = $v->getValue(); - $a[self::FIELD_VERSION_ID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VERSION_ID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VERSION_ID_EXT] = $enc; + } + } else { + $a[self::FIELD_VERSION_ID] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRExampleScenario/FHIRExampleScenarioInstance.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRExampleScenario/FHIRExampleScenarioInstance.php index 3b24b11aee..bbb3c91860 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRExampleScenario/FHIRExampleScenarioInstance.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRExampleScenario/FHIRExampleScenarioInstance.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRExampleScenarioInstance extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_EXAMPLE_SCENARIO_DOT_INSTANCE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CONTAINED_INSTANCE = 'containedInstance'; const FIELD_DESCRIPTION = 'description'; const FIELD_DESCRIPTION_EXT = '_description'; @@ -159,6 +155,9 @@ class FHIRExampleScenarioInstance extends FHIRBackboneElement */ protected $version = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRExampleScenarioInstance Constructor * @param null|array $data @@ -178,6 +177,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CONTAINED_INSTANCE])) { if (is_array($data[self::FIELD_CONTAINED_INSTANCE])) { foreach($data[self::FIELD_CONTAINED_INSTANCE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRExampleScenarioContainedInstance) { $this->addContainedInstance($v); } else { @@ -196,8 +198,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRMarkdown) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRMarkdown($data[self::FIELD_DESCRIPTION])); } @@ -208,8 +214,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -220,8 +230,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_RESOURCE_ID] instanceof FHIRString) { $this->setResourceId($data[self::FIELD_RESOURCE_ID]); - } elseif ($ext && is_scalar($data[self::FIELD_RESOURCE_ID])) { - $this->setResourceId(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_RESOURCE_ID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_RESOURCE_ID])) { + $this->setResourceId(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_RESOURCE_ID]] + $ext)); + } else if (is_array($data[self::FIELD_RESOURCE_ID])) { + $this->setResourceId(new FHIRString(array_merge($ext, $data[self::FIELD_RESOURCE_ID]))); + } } else { $this->setResourceId(new FHIRString($data[self::FIELD_RESOURCE_ID])); } @@ -232,6 +246,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_VERSION])) { if (is_array($data[self::FIELD_VERSION])) { foreach($data[self::FIELD_VERSION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRExampleScenarioVersion) { $this->addVersion($v); } else { @@ -640,7 +657,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getContainedInstance())) { foreach($vs as $v) { if (null === $v) { @@ -649,6 +665,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_CONTAINED_INSTANCE, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getDescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESCRIPTION, null, $v->_getFHIRXMLNamespace())); } @@ -657,11 +674,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 } if (null !== ($v = $this->getResourceId())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RESOURCE_ID, null, $v->_getFHIRXMLNamespace())); - } - if (null !== ($v = $this->getResourceType())) { + } if (null !== ($v = $this->getResourceType())) { $sxe->addAttribute(self::FIELD_RESOURCE_TYPE, (string)$v); } - if ([] !== ($vs = $this->getVersion())) { foreach($vs as $v) { if (null === $v) { @@ -670,6 +685,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_VERSION, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } @@ -683,16 +699,37 @@ public function jsonSerialize() $a[self::FIELD_CONTAINED_INSTANCE] = $vs; } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if (null !== ($v = $this->getResourceId())) { - $a[self::FIELD_RESOURCE_ID] = $v->getValue(); - $a[self::FIELD_RESOURCE_ID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_RESOURCE_ID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_RESOURCE_ID_EXT] = $enc; + } + } else { + $a[self::FIELD_RESOURCE_ID] = $v; + } } if (null !== ($v = $this->getResourceType())) { $a[self::FIELD_RESOURCE_TYPE] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRExampleScenario/FHIRExampleScenarioOperation.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRExampleScenario/FHIRExampleScenarioOperation.php index 806fae8404..85509ae52a 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRExampleScenario/FHIRExampleScenarioOperation.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRExampleScenario/FHIRExampleScenarioOperation.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRExampleScenarioOperation extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_EXAMPLE_SCENARIO_DOT_OPERATION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DESCRIPTION = 'description'; const FIELD_DESCRIPTION_EXT = '_description'; const FIELD_INITIATOR = 'initiator'; @@ -210,6 +206,9 @@ class FHIRExampleScenarioOperation extends FHIRBackboneElement */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRExampleScenarioOperation Constructor * @param null|array $data @@ -232,8 +231,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRMarkdown) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRMarkdown($data[self::FIELD_DESCRIPTION])); } @@ -244,8 +247,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_INITIATOR] instanceof FHIRString) { $this->setInitiator($data[self::FIELD_INITIATOR]); - } elseif ($ext && is_scalar($data[self::FIELD_INITIATOR])) { - $this->setInitiator(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_INITIATOR]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_INITIATOR])) { + $this->setInitiator(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_INITIATOR]] + $ext)); + } else if (is_array($data[self::FIELD_INITIATOR])) { + $this->setInitiator(new FHIRString(array_merge($ext, $data[self::FIELD_INITIATOR]))); + } } else { $this->setInitiator(new FHIRString($data[self::FIELD_INITIATOR])); } @@ -256,8 +263,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_INITIATOR_ACTIVE] instanceof FHIRBoolean) { $this->setInitiatorActive($data[self::FIELD_INITIATOR_ACTIVE]); - } elseif ($ext && is_scalar($data[self::FIELD_INITIATOR_ACTIVE])) { - $this->setInitiatorActive(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_INITIATOR_ACTIVE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_INITIATOR_ACTIVE])) { + $this->setInitiatorActive(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_INITIATOR_ACTIVE]] + $ext)); + } else if (is_array($data[self::FIELD_INITIATOR_ACTIVE])) { + $this->setInitiatorActive(new FHIRBoolean(array_merge($ext, $data[self::FIELD_INITIATOR_ACTIVE]))); + } } else { $this->setInitiatorActive(new FHIRBoolean($data[self::FIELD_INITIATOR_ACTIVE])); } @@ -268,8 +279,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -280,8 +295,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NUMBER] instanceof FHIRString) { $this->setNumber($data[self::FIELD_NUMBER]); - } elseif ($ext && is_scalar($data[self::FIELD_NUMBER])) { - $this->setNumber(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NUMBER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NUMBER])) { + $this->setNumber(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NUMBER]] + $ext)); + } else if (is_array($data[self::FIELD_NUMBER])) { + $this->setNumber(new FHIRString(array_merge($ext, $data[self::FIELD_NUMBER]))); + } } else { $this->setNumber(new FHIRString($data[self::FIELD_NUMBER])); } @@ -292,8 +311,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_RECEIVER] instanceof FHIRString) { $this->setReceiver($data[self::FIELD_RECEIVER]); - } elseif ($ext && is_scalar($data[self::FIELD_RECEIVER])) { - $this->setReceiver(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_RECEIVER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_RECEIVER])) { + $this->setReceiver(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_RECEIVER]] + $ext)); + } else if (is_array($data[self::FIELD_RECEIVER])) { + $this->setReceiver(new FHIRString(array_merge($ext, $data[self::FIELD_RECEIVER]))); + } } else { $this->setReceiver(new FHIRString($data[self::FIELD_RECEIVER])); } @@ -304,8 +327,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_RECEIVER_ACTIVE] instanceof FHIRBoolean) { $this->setReceiverActive($data[self::FIELD_RECEIVER_ACTIVE]); - } elseif ($ext && is_scalar($data[self::FIELD_RECEIVER_ACTIVE])) { - $this->setReceiverActive(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_RECEIVER_ACTIVE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_RECEIVER_ACTIVE])) { + $this->setReceiverActive(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_RECEIVER_ACTIVE]] + $ext)); + } else if (is_array($data[self::FIELD_RECEIVER_ACTIVE])) { + $this->setReceiverActive(new FHIRBoolean(array_merge($ext, $data[self::FIELD_RECEIVER_ACTIVE]))); + } } else { $this->setReceiverActive(new FHIRBoolean($data[self::FIELD_RECEIVER_ACTIVE])); } @@ -330,8 +357,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TYPE] instanceof FHIRString) { $this->setType($data[self::FIELD_TYPE]); - } elseif ($ext && is_scalar($data[self::FIELD_TYPE])) { - $this->setType(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TYPE])) { + $this->setType(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } else if (is_array($data[self::FIELD_TYPE])) { + $this->setType(new FHIRString(array_merge($ext, $data[self::FIELD_TYPE]))); + } } else { $this->setType(new FHIRString($data[self::FIELD_TYPE])); } @@ -872,11 +903,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getReceiverActive())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RECEIVER_ACTIVE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRequest())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REQUEST, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getResponse())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RESPONSE, null, $v->_getFHIRXMLNamespace())); } @@ -893,32 +922,81 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if (null !== ($v = $this->getInitiator())) { - $a[self::FIELD_INITIATOR] = $v->getValue(); - $a[self::FIELD_INITIATOR_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_INITIATOR] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_INITIATOR_EXT] = $enc; + } + } else { + $a[self::FIELD_INITIATOR] = $v; + } } if (null !== ($v = $this->getInitiatorActive())) { - $a[self::FIELD_INITIATOR_ACTIVE] = $v->getValue(); - $a[self::FIELD_INITIATOR_ACTIVE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_INITIATOR_ACTIVE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_INITIATOR_ACTIVE_EXT] = $enc; + } + } else { + $a[self::FIELD_INITIATOR_ACTIVE] = $v; + } } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if (null !== ($v = $this->getNumber())) { - $a[self::FIELD_NUMBER] = $v->getValue(); - $a[self::FIELD_NUMBER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NUMBER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NUMBER_EXT] = $enc; + } + } else { + $a[self::FIELD_NUMBER] = $v; + } } if (null !== ($v = $this->getReceiver())) { - $a[self::FIELD_RECEIVER] = $v->getValue(); - $a[self::FIELD_RECEIVER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_RECEIVER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_RECEIVER_EXT] = $enc; + } + } else { + $a[self::FIELD_RECEIVER] = $v; + } } if (null !== ($v = $this->getReceiverActive())) { - $a[self::FIELD_RECEIVER_ACTIVE] = $v->getValue(); - $a[self::FIELD_RECEIVER_ACTIVE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_RECEIVER_ACTIVE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_RECEIVER_ACTIVE_EXT] = $enc; + } + } else { + $a[self::FIELD_RECEIVER_ACTIVE] = $v; + } } if (null !== ($v = $this->getRequest())) { $a[self::FIELD_REQUEST] = $v; @@ -927,8 +1005,15 @@ public function jsonSerialize() $a[self::FIELD_RESPONSE] = $v; } if (null !== ($v = $this->getType())) { - $a[self::FIELD_TYPE] = $v->getValue(); - $a[self::FIELD_TYPE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TYPE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TYPE_EXT] = $enc; + } + } else { + $a[self::FIELD_TYPE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRExampleScenario/FHIRExampleScenarioProcess.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRExampleScenario/FHIRExampleScenarioProcess.php index fa028ab587..3ebf0ef1a4 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRExampleScenario/FHIRExampleScenarioProcess.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRExampleScenario/FHIRExampleScenarioProcess.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRExampleScenarioProcess extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_EXAMPLE_SCENARIO_DOT_PROCESS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DESCRIPTION = 'description'; const FIELD_DESCRIPTION_EXT = '_description'; const FIELD_POST_CONDITIONS = 'postConditions'; @@ -157,6 +153,9 @@ class FHIRExampleScenarioProcess extends FHIRBackboneElement */ protected $title = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRExampleScenarioProcess Constructor * @param null|array $data @@ -179,8 +178,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRMarkdown) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRMarkdown($data[self::FIELD_DESCRIPTION])); } @@ -191,8 +194,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_POST_CONDITIONS] instanceof FHIRMarkdown) { $this->setPostConditions($data[self::FIELD_POST_CONDITIONS]); - } elseif ($ext && is_scalar($data[self::FIELD_POST_CONDITIONS])) { - $this->setPostConditions(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_POST_CONDITIONS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_POST_CONDITIONS])) { + $this->setPostConditions(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_POST_CONDITIONS]] + $ext)); + } else if (is_array($data[self::FIELD_POST_CONDITIONS])) { + $this->setPostConditions(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_POST_CONDITIONS]))); + } } else { $this->setPostConditions(new FHIRMarkdown($data[self::FIELD_POST_CONDITIONS])); } @@ -203,8 +210,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PRE_CONDITIONS] instanceof FHIRMarkdown) { $this->setPreConditions($data[self::FIELD_PRE_CONDITIONS]); - } elseif ($ext && is_scalar($data[self::FIELD_PRE_CONDITIONS])) { - $this->setPreConditions(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_PRE_CONDITIONS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PRE_CONDITIONS])) { + $this->setPreConditions(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_PRE_CONDITIONS]] + $ext)); + } else if (is_array($data[self::FIELD_PRE_CONDITIONS])) { + $this->setPreConditions(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_PRE_CONDITIONS]))); + } } else { $this->setPreConditions(new FHIRMarkdown($data[self::FIELD_PRE_CONDITIONS])); } @@ -212,6 +223,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_STEP])) { if (is_array($data[self::FIELD_STEP])) { foreach($data[self::FIELD_STEP] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRExampleScenarioStep) { $this->addStep($v); } else { @@ -230,8 +244,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TITLE] instanceof FHIRString) { $this->setTitle($data[self::FIELD_TITLE]); - } elseif ($ext && is_scalar($data[self::FIELD_TITLE])) { - $this->setTitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TITLE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TITLE])) { + $this->setTitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TITLE]] + $ext)); + } else if (is_array($data[self::FIELD_TITLE])) { + $this->setTitle(new FHIRString(array_merge($ext, $data[self::FIELD_TITLE]))); + } } else { $this->setTitle(new FHIRString($data[self::FIELD_TITLE])); } @@ -601,7 +619,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getPreConditions())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PRE_CONDITIONS, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getStep())) { foreach($vs as $v) { if (null === $v) { @@ -610,6 +627,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_STEP, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getTitle())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TITLE, null, $v->_getFHIRXMLNamespace())); } @@ -623,23 +641,51 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if (null !== ($v = $this->getPostConditions())) { - $a[self::FIELD_POST_CONDITIONS] = $v->getValue(); - $a[self::FIELD_POST_CONDITIONS_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_POST_CONDITIONS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_POST_CONDITIONS_EXT] = $enc; + } + } else { + $a[self::FIELD_POST_CONDITIONS] = $v; + } } if (null !== ($v = $this->getPreConditions())) { - $a[self::FIELD_PRE_CONDITIONS] = $v->getValue(); - $a[self::FIELD_PRE_CONDITIONS_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PRE_CONDITIONS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PRE_CONDITIONS_EXT] = $enc; + } + } else { + $a[self::FIELD_PRE_CONDITIONS] = $v; + } } if ([] !== ($vs = $this->getStep())) { $a[self::FIELD_STEP] = $vs; } if (null !== ($v = $this->getTitle())) { - $a[self::FIELD_TITLE] = $v->getValue(); - $a[self::FIELD_TITLE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TITLE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TITLE_EXT] = $enc; + } + } else { + $a[self::FIELD_TITLE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRExampleScenario/FHIRExampleScenarioStep.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRExampleScenario/FHIRExampleScenarioStep.php index c7360e2db6..ecabd35a87 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRExampleScenario/FHIRExampleScenarioStep.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRExampleScenario/FHIRExampleScenarioStep.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -77,10 +77,6 @@ class FHIRExampleScenarioStep extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_EXAMPLE_SCENARIO_DOT_STEP; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ALTERNATIVE = 'alternative'; const FIELD_OPERATION = 'operation'; const FIELD_PAUSE = 'pause'; @@ -125,6 +121,9 @@ class FHIRExampleScenarioStep extends FHIRBackboneElement */ protected $process = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRExampleScenarioStep Constructor * @param null|array $data @@ -144,6 +143,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ALTERNATIVE])) { if (is_array($data[self::FIELD_ALTERNATIVE])) { foreach($data[self::FIELD_ALTERNATIVE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRExampleScenarioAlternative) { $this->addAlternative($v); } else { @@ -169,8 +171,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PAUSE] instanceof FHIRBoolean) { $this->setPause($data[self::FIELD_PAUSE]); - } elseif ($ext && is_scalar($data[self::FIELD_PAUSE])) { - $this->setPause(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_PAUSE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PAUSE])) { + $this->setPause(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_PAUSE]] + $ext)); + } else if (is_array($data[self::FIELD_PAUSE])) { + $this->setPause(new FHIRBoolean(array_merge($ext, $data[self::FIELD_PAUSE]))); + } } else { $this->setPause(new FHIRBoolean($data[self::FIELD_PAUSE])); } @@ -178,6 +184,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PROCESS])) { if (is_array($data[self::FIELD_PROCESS])) { foreach($data[self::FIELD_PROCESS] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRExampleScenarioProcess) { $this->addProcess($v); } else { @@ -475,7 +484,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getAlternative())) { foreach($vs as $v) { if (null === $v) { @@ -491,7 +499,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getPause())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PAUSE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getProcess())) { foreach($vs as $v) { if (null === $v) { @@ -500,6 +507,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_PROCESS, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } @@ -516,8 +524,15 @@ public function jsonSerialize() $a[self::FIELD_OPERATION] = $v; } if (null !== ($v = $this->getPause())) { - $a[self::FIELD_PAUSE] = $v->getValue(); - $a[self::FIELD_PAUSE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PAUSE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PAUSE_EXT] = $enc; + } + } else { + $a[self::FIELD_PAUSE] = $v; + } } if ([] !== ($vs = $this->getProcess())) { $a[self::FIELD_PROCESS] = $vs; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRExampleScenario/FHIRExampleScenarioVersion.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRExampleScenario/FHIRExampleScenarioVersion.php index bc9bf7c3bb..bc43eea21a 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRExampleScenario/FHIRExampleScenarioVersion.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRExampleScenario/FHIRExampleScenarioVersion.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRExampleScenarioVersion extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_EXAMPLE_SCENARIO_DOT_VERSION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DESCRIPTION = 'description'; const FIELD_DESCRIPTION_EXT = '_description'; const FIELD_VERSION_ID = 'versionId'; @@ -113,6 +109,9 @@ class FHIRExampleScenarioVersion extends FHIRBackboneElement */ protected $versionId = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRExampleScenarioVersion Constructor * @param null|array $data @@ -135,8 +134,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRMarkdown) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRMarkdown($data[self::FIELD_DESCRIPTION])); } @@ -147,8 +150,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VERSION_ID] instanceof FHIRString) { $this->setVersionId($data[self::FIELD_VERSION_ID]); - } elseif ($ext && is_scalar($data[self::FIELD_VERSION_ID])) { - $this->setVersionId(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION_ID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VERSION_ID])) { + $this->setVersionId(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION_ID]] + $ext)); + } else if (is_array($data[self::FIELD_VERSION_ID])) { + $this->setVersionId(new FHIRString(array_merge($ext, $data[self::FIELD_VERSION_ID]))); + } } else { $this->setVersionId(new FHIRString($data[self::FIELD_VERSION_ID])); } @@ -366,12 +373,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if (null !== ($v = $this->getVersionId())) { - $a[self::FIELD_VERSION_ID] = $v->getValue(); - $a[self::FIELD_VERSION_ID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VERSION_ID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VERSION_ID_EXT] = $enc; + } + } else { + $a[self::FIELD_VERSION_ID] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitAccident.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitAccident.php index 7c3f0302a2..f4edd76246 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitAccident.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitAccident.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -82,10 +82,6 @@ class FHIRExplanationOfBenefitAccident extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_EXPLANATION_OF_BENEFIT_DOT_ACCIDENT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DATE = 'date'; const FIELD_DATE_EXT = '_date'; const FIELD_LOCATION_ADDRESS = 'locationAddress'; @@ -147,6 +143,9 @@ class FHIRExplanationOfBenefitAccident extends FHIRBackboneElement */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRExplanationOfBenefitAccident Constructor * @param null|array $data @@ -169,8 +168,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATE] instanceof FHIRDate) { $this->setDate($data[self::FIELD_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_DATE])) { - $this->setDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDate(array_merge($ext, $data[self::FIELD_DATE]))); + } } else { $this->setDate(new FHIRDate($data[self::FIELD_DATE])); } @@ -465,15 +468,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DATE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getLocationAddress())) { $v->xmlSerialize($sxe->addChild(self::FIELD_LOCATION_ADDRESS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getLocationReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_LOCATION_REFERENCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -487,8 +487,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getDate())) { - $a[self::FIELD_DATE] = $v->getValue(); - $a[self::FIELD_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_DATE] = $v; + } } if (null !== ($v = $this->getLocationAddress())) { $a[self::FIELD_LOCATION_ADDRESS] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitAddItem.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitAddItem.php index 741ccaaf62..63948aa94b 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitAddItem.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitAddItem.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -87,10 +87,6 @@ class FHIRExplanationOfBenefitAddItem extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_EXPLANATION_OF_BENEFIT_DOT_ADD_ITEM; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ADJUDICATION = 'adjudication'; const FIELD_ADJUDICATION_EXT = '_adjudication'; const FIELD_BODY_SITE = 'bodySite'; @@ -383,6 +379,9 @@ class FHIRExplanationOfBenefitAddItem extends FHIRBackboneElement */ protected $unitPrice = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRExplanationOfBenefitAddItem Constructor * @param null|array $data @@ -405,17 +404,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_ADJUDICATION])) { foreach($data[self::FIELD_ADJUDICATION] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRExplanationOfBenefitAdjudication) { $this->addAdjudication($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addAdjudication(new FHIRExplanationOfBenefitAdjudication([FHIRExplanationOfBenefitAdjudication::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addAdjudication(new FHIRExplanationOfBenefitAdjudication([FHIRExplanationOfBenefitAdjudication::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addAdjudication(new FHIRExplanationOfBenefitAdjudication(array_merge($v, $ext[$i]))); + } } else { $this->addAdjudication(new FHIRExplanationOfBenefitAdjudication($v)); } } } elseif ($data[self::FIELD_ADJUDICATION] instanceof FHIRExplanationOfBenefitAdjudication) { $this->addAdjudication($data[self::FIELD_ADJUDICATION]); - } elseif ($ext && is_scalar($data[self::FIELD_ADJUDICATION])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_ADJUDICATION])) { $this->addAdjudication(new FHIRExplanationOfBenefitAdjudication([FHIRExplanationOfBenefitAdjudication::FIELD_VALUE => $data[self::FIELD_ADJUDICATION]] + $ext)); } else { $this->addAdjudication(new FHIRExplanationOfBenefitAdjudication($data[self::FIELD_ADJUDICATION])); @@ -431,6 +437,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_DETAIL])) { if (is_array($data[self::FIELD_DETAIL])) { foreach($data[self::FIELD_DETAIL] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRExplanationOfBenefitDetail1) { $this->addDetail($v); } else { @@ -449,17 +458,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_DETAIL_SEQUENCE])) { foreach($data[self::FIELD_DETAIL_SEQUENCE] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRPositiveInt) { $this->addDetailSequence($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addDetailSequence(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addDetailSequence(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addDetailSequence(new FHIRPositiveInt(array_merge($v, $ext[$i]))); + } } else { $this->addDetailSequence(new FHIRPositiveInt($v)); } } } elseif ($data[self::FIELD_DETAIL_SEQUENCE] instanceof FHIRPositiveInt) { $this->addDetailSequence($data[self::FIELD_DETAIL_SEQUENCE]); - } elseif ($ext && is_scalar($data[self::FIELD_DETAIL_SEQUENCE])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_DETAIL_SEQUENCE])) { $this->addDetailSequence(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_DETAIL_SEQUENCE]] + $ext)); } else { $this->addDetailSequence(new FHIRPositiveInt($data[self::FIELD_DETAIL_SEQUENCE])); @@ -471,8 +487,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_FACTOR] instanceof FHIRDecimal) { $this->setFactor($data[self::FIELD_FACTOR]); - } elseif ($ext && is_scalar($data[self::FIELD_FACTOR])) { - $this->setFactor(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_FACTOR]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_FACTOR])) { + $this->setFactor(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_FACTOR]] + $ext)); + } else if (is_array($data[self::FIELD_FACTOR])) { + $this->setFactor(new FHIRDecimal(array_merge($ext, $data[self::FIELD_FACTOR]))); + } } else { $this->setFactor(new FHIRDecimal($data[self::FIELD_FACTOR])); } @@ -483,17 +503,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_ITEM_SEQUENCE])) { foreach($data[self::FIELD_ITEM_SEQUENCE] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRPositiveInt) { $this->addItemSequence($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addItemSequence(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addItemSequence(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addItemSequence(new FHIRPositiveInt(array_merge($v, $ext[$i]))); + } } else { $this->addItemSequence(new FHIRPositiveInt($v)); } } } elseif ($data[self::FIELD_ITEM_SEQUENCE] instanceof FHIRPositiveInt) { $this->addItemSequence($data[self::FIELD_ITEM_SEQUENCE]); - } elseif ($ext && is_scalar($data[self::FIELD_ITEM_SEQUENCE])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_ITEM_SEQUENCE])) { $this->addItemSequence(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_ITEM_SEQUENCE]] + $ext)); } else { $this->addItemSequence(new FHIRPositiveInt($data[self::FIELD_ITEM_SEQUENCE])); @@ -523,6 +550,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_MODIFIER])) { if (is_array($data[self::FIELD_MODIFIER])) { foreach($data[self::FIELD_MODIFIER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addModifier($v); } else { @@ -541,8 +571,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NET] instanceof FHIRMoney) { $this->setNet($data[self::FIELD_NET]); - } elseif ($ext && is_scalar($data[self::FIELD_NET])) { - $this->setNet(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_NET]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NET])) { + $this->setNet(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_NET]] + $ext)); + } else if (is_array($data[self::FIELD_NET])) { + $this->setNet(new FHIRMoney(array_merge($ext, $data[self::FIELD_NET]))); + } } else { $this->setNet(new FHIRMoney($data[self::FIELD_NET])); } @@ -553,17 +587,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_NOTE_NUMBER])) { foreach($data[self::FIELD_NOTE_NUMBER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRPositiveInt) { $this->addNoteNumber($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addNoteNumber(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addNoteNumber(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addNoteNumber(new FHIRPositiveInt(array_merge($v, $ext[$i]))); + } } else { $this->addNoteNumber(new FHIRPositiveInt($v)); } } } elseif ($data[self::FIELD_NOTE_NUMBER] instanceof FHIRPositiveInt) { $this->addNoteNumber($data[self::FIELD_NOTE_NUMBER]); - } elseif ($ext && is_scalar($data[self::FIELD_NOTE_NUMBER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_NOTE_NUMBER])) { $this->addNoteNumber(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_NOTE_NUMBER]] + $ext)); } else { $this->addNoteNumber(new FHIRPositiveInt($data[self::FIELD_NOTE_NUMBER])); @@ -579,6 +620,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PROGRAM_CODE])) { if (is_array($data[self::FIELD_PROGRAM_CODE])) { foreach($data[self::FIELD_PROGRAM_CODE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addProgramCode($v); } else { @@ -594,6 +638,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PROVIDER])) { if (is_array($data[self::FIELD_PROVIDER])) { foreach($data[self::FIELD_PROVIDER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addProvider($v); } else { @@ -612,8 +659,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_QUANTITY] instanceof FHIRQuantity) { $this->setQuantity($data[self::FIELD_QUANTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_QUANTITY])) { - $this->setQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_QUANTITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_QUANTITY])) { + $this->setQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_QUANTITY])) { + $this->setQuantity(new FHIRQuantity(array_merge($ext, $data[self::FIELD_QUANTITY]))); + } } else { $this->setQuantity(new FHIRQuantity($data[self::FIELD_QUANTITY])); } @@ -624,8 +675,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SERVICED_DATE] instanceof FHIRDate) { $this->setServicedDate($data[self::FIELD_SERVICED_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_SERVICED_DATE])) { - $this->setServicedDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_SERVICED_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SERVICED_DATE])) { + $this->setServicedDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_SERVICED_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_SERVICED_DATE])) { + $this->setServicedDate(new FHIRDate(array_merge($ext, $data[self::FIELD_SERVICED_DATE]))); + } } else { $this->setServicedDate(new FHIRDate($data[self::FIELD_SERVICED_DATE])); } @@ -643,17 +698,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_SUB_DETAIL_SEQUENCE])) { foreach($data[self::FIELD_SUB_DETAIL_SEQUENCE] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRPositiveInt) { $this->addSubDetailSequence($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addSubDetailSequence(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addSubDetailSequence(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addSubDetailSequence(new FHIRPositiveInt(array_merge($v, $ext[$i]))); + } } else { $this->addSubDetailSequence(new FHIRPositiveInt($v)); } } } elseif ($data[self::FIELD_SUB_DETAIL_SEQUENCE] instanceof FHIRPositiveInt) { $this->addSubDetailSequence($data[self::FIELD_SUB_DETAIL_SEQUENCE]); - } elseif ($ext && is_scalar($data[self::FIELD_SUB_DETAIL_SEQUENCE])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_SUB_DETAIL_SEQUENCE])) { $this->addSubDetailSequence(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_SUB_DETAIL_SEQUENCE]] + $ext)); } else { $this->addSubDetailSequence(new FHIRPositiveInt($data[self::FIELD_SUB_DETAIL_SEQUENCE])); @@ -662,6 +724,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SUB_SITE])) { if (is_array($data[self::FIELD_SUB_SITE])) { foreach($data[self::FIELD_SUB_SITE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addSubSite($v); } else { @@ -680,8 +745,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_UNIT_PRICE] instanceof FHIRMoney) { $this->setUnitPrice($data[self::FIELD_UNIT_PRICE]); - } elseif ($ext && is_scalar($data[self::FIELD_UNIT_PRICE])) { - $this->setUnitPrice(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_UNIT_PRICE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_UNIT_PRICE])) { + $this->setUnitPrice(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_UNIT_PRICE]] + $ext)); + } else if (is_array($data[self::FIELD_UNIT_PRICE])) { + $this->setUnitPrice(new FHIRMoney(array_merge($ext, $data[self::FIELD_UNIT_PRICE]))); + } } else { $this->setUnitPrice(new FHIRMoney($data[self::FIELD_UNIT_PRICE])); } @@ -1891,7 +1960,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getAdjudication())) { foreach($vs as $v) { if (null === $v) { @@ -1904,7 +1972,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getBodySite())) { $v->xmlSerialize($sxe->addChild(self::FIELD_BODY_SITE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getDetail())) { foreach($vs as $v) { if (null === $v) { @@ -1913,6 +1980,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_DETAIL, null, $v->_getFHIRXMLNamespace())); } } + if ([] !== ($vs = $this->getDetailSequence())) { foreach($vs as $v) { if (null === $v) { @@ -1921,6 +1989,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_DETAIL_SEQUENCE, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getFactor())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FACTOR, null, $v->_getFHIRXMLNamespace())); } @@ -1936,15 +2005,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getLocationAddress())) { $v->xmlSerialize($sxe->addChild(self::FIELD_LOCATION_ADDRESS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getLocationCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_LOCATION_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getLocationReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_LOCATION_REFERENCE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getModifier())) { foreach($vs as $v) { if (null === $v) { @@ -1969,7 +2035,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getProductOrService())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PRODUCT_OR_SERVICE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getProgramCode())) { foreach($vs as $v) { if (null === $v) { @@ -1994,7 +2059,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getServicedDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SERVICED_DATE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getServicedPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SERVICED_PERIOD, null, $v->_getFHIRXMLNamespace())); } @@ -2029,7 +2093,23 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if ([] !== ($vs = $this->getAdjudication())) { - $a[self::FIELD_ADJUDICATION] = $vs; + $a[self::FIELD_ADJUDICATION] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ADJUDICATION][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ADJUDICATION_EXT][] = $enc; + } else { + $a[self::FIELD_ADJUDICATION_EXT][] = null; + } + } else { + $a[self::FIELD_ADJUDICATION][] = $v; + } + } } if (null !== ($v = $this->getBodySite())) { $a[self::FIELD_BODY_SITE] = $v; @@ -2043,13 +2123,29 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_DETAIL_SEQUENCE][] = $v->getValue(); - $a[self::FIELD_DETAIL_SEQUENCE_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DETAIL_SEQUENCE][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DETAIL_SEQUENCE_EXT][] = $enc; + } else { + $a[self::FIELD_DETAIL_SEQUENCE_EXT][] = null; + } + } else { + $a[self::FIELD_DETAIL_SEQUENCE][] = $v; + } } } if (null !== ($v = $this->getFactor())) { - $a[self::FIELD_FACTOR] = $v->getValue(); - $a[self::FIELD_FACTOR_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FACTOR] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FACTOR_EXT] = $enc; + } + } else { + $a[self::FIELD_FACTOR] = $v; + } } if ([] !== ($vs = $this->getItemSequence())) { $a[self::FIELD_ITEM_SEQUENCE] = []; @@ -2057,8 +2153,17 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_ITEM_SEQUENCE][] = $v->getValue(); - $a[self::FIELD_ITEM_SEQUENCE_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ITEM_SEQUENCE][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ITEM_SEQUENCE_EXT][] = $enc; + } else { + $a[self::FIELD_ITEM_SEQUENCE_EXT][] = null; + } + } else { + $a[self::FIELD_ITEM_SEQUENCE][] = $v; + } } } if (null !== ($v = $this->getLocationAddress())) { @@ -2074,7 +2179,15 @@ public function jsonSerialize() $a[self::FIELD_MODIFIER] = $vs; } if (null !== ($v = $this->getNet())) { - $a[self::FIELD_NET] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NET] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NET_EXT] = $enc; + } + } else { + $a[self::FIELD_NET] = $v; + } } if ([] !== ($vs = $this->getNoteNumber())) { $a[self::FIELD_NOTE_NUMBER] = []; @@ -2082,8 +2195,17 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_NOTE_NUMBER][] = $v->getValue(); - $a[self::FIELD_NOTE_NUMBER_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NOTE_NUMBER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NOTE_NUMBER_EXT][] = $enc; + } else { + $a[self::FIELD_NOTE_NUMBER_EXT][] = null; + } + } else { + $a[self::FIELD_NOTE_NUMBER][] = $v; + } } } if (null !== ($v = $this->getProductOrService())) { @@ -2096,11 +2218,26 @@ public function jsonSerialize() $a[self::FIELD_PROVIDER] = $vs; } if (null !== ($v = $this->getQuantity())) { - $a[self::FIELD_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_QUANTITY] = $v; + } } if (null !== ($v = $this->getServicedDate())) { - $a[self::FIELD_SERVICED_DATE] = $v->getValue(); - $a[self::FIELD_SERVICED_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SERVICED_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SERVICED_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_SERVICED_DATE] = $v; + } } if (null !== ($v = $this->getServicedPeriod())) { $a[self::FIELD_SERVICED_PERIOD] = $v; @@ -2111,15 +2248,32 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_SUB_DETAIL_SEQUENCE][] = $v->getValue(); - $a[self::FIELD_SUB_DETAIL_SEQUENCE_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SUB_DETAIL_SEQUENCE][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SUB_DETAIL_SEQUENCE_EXT][] = $enc; + } else { + $a[self::FIELD_SUB_DETAIL_SEQUENCE_EXT][] = null; + } + } else { + $a[self::FIELD_SUB_DETAIL_SEQUENCE][] = $v; + } } } if ([] !== ($vs = $this->getSubSite())) { $a[self::FIELD_SUB_SITE] = $vs; } if (null !== ($v = $this->getUnitPrice())) { - $a[self::FIELD_UNIT_PRICE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_UNIT_PRICE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_UNIT_PRICE_EXT] = $enc; + } + } else { + $a[self::FIELD_UNIT_PRICE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitAdjudication.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitAdjudication.php index 681f12bec1..da511aceba 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitAdjudication.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitAdjudication.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -81,10 +81,6 @@ class FHIRExplanationOfBenefitAdjudication extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_EXPLANATION_OF_BENEFIT_DOT_ADJUDICATION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_AMOUNT = 'amount'; const FIELD_AMOUNT_EXT = '_amount'; const FIELD_CATEGORY = 'category'; @@ -145,6 +141,9 @@ class FHIRExplanationOfBenefitAdjudication extends FHIRBackboneElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRExplanationOfBenefitAdjudication Constructor * @param null|array $data @@ -171,8 +170,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_AMOUNT] instanceof FHIRMoney) { $this->setAmount($data[self::FIELD_AMOUNT]); - } elseif ($ext && is_scalar($data[self::FIELD_AMOUNT])) { - $this->setAmount(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_AMOUNT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_AMOUNT])) { + $this->setAmount(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_AMOUNT]] + $ext)); + } else if (is_array($data[self::FIELD_AMOUNT])) { + $this->setAmount(new FHIRMoney(array_merge($ext, $data[self::FIELD_AMOUNT]))); + } } else { $this->setAmount(new FHIRMoney($data[self::FIELD_AMOUNT])); } @@ -197,8 +200,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE] instanceof FHIRDecimal) { $this->setValue($data[self::FIELD_VALUE]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE])) { - $this->setValue(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_VALUE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE])) { + $this->setValue(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_VALUE]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE])) { + $this->setValue(new FHIRDecimal(array_merge($ext, $data[self::FIELD_VALUE]))); + } } else { $this->setValue(new FHIRDecimal($data[self::FIELD_VALUE])); } @@ -465,19 +472,17 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getAmount())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AMOUNT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getCategory())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CATEGORY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getReason())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REASON, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getValue())) { + $sxe->addAttribute(self::FIELD_VALUE, (string)$v); $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE, null, $v->_getFHIRXMLNamespace())); } return $sxe; @@ -490,7 +495,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getAmount())) { - $a[self::FIELD_AMOUNT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_AMOUNT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_AMOUNT_EXT] = $enc; + } + } else { + $a[self::FIELD_AMOUNT] = $v; + } } if (null !== ($v = $this->getCategory())) { $a[self::FIELD_CATEGORY] = $v; @@ -499,8 +512,15 @@ public function jsonSerialize() $a[self::FIELD_REASON] = $v; } if (null !== ($v = $this->getValue())) { - $a[self::FIELD_VALUE] = $v->getValue(); - $a[self::FIELD_VALUE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitBenefitBalance.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitBenefitBalance.php index 5f6301e39b..e97667e0bb 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitBenefitBalance.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitBenefitBalance.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -81,10 +81,6 @@ class FHIRExplanationOfBenefitBenefitBalance extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_EXPLANATION_OF_BENEFIT_DOT_BENEFIT_BALANCE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CATEGORY = 'category'; const FIELD_DESCRIPTION = 'description'; const FIELD_DESCRIPTION_EXT = '_description'; @@ -192,6 +188,9 @@ class FHIRExplanationOfBenefitBenefitBalance extends FHIRBackboneElement */ protected $unit = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRExplanationOfBenefitBenefitBalance Constructor * @param null|array $data @@ -221,8 +220,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -233,8 +236,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EXCLUDED] instanceof FHIRBoolean) { $this->setExcluded($data[self::FIELD_EXCLUDED]); - } elseif ($ext && is_scalar($data[self::FIELD_EXCLUDED])) { - $this->setExcluded(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_EXCLUDED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EXCLUDED])) { + $this->setExcluded(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_EXCLUDED]] + $ext)); + } else if (is_array($data[self::FIELD_EXCLUDED])) { + $this->setExcluded(new FHIRBoolean(array_merge($ext, $data[self::FIELD_EXCLUDED]))); + } } else { $this->setExcluded(new FHIRBoolean($data[self::FIELD_EXCLUDED])); } @@ -242,6 +249,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_FINANCIAL])) { if (is_array($data[self::FIELD_FINANCIAL])) { foreach($data[self::FIELD_FINANCIAL] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRExplanationOfBenefitFinancial) { $this->addFinancial($v); } else { @@ -260,8 +270,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -727,7 +741,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getCategory())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CATEGORY, null, $v->_getFHIRXMLNamespace())); } @@ -737,7 +750,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getExcluded())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EXCLUDED, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getFinancial())) { foreach($vs as $v) { if (null === $v) { @@ -746,18 +758,16 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_FINANCIAL, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NAME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getNetwork())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NETWORK, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getTerm())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TERM, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getUnit())) { $v->xmlSerialize($sxe->addChild(self::FIELD_UNIT, null, $v->_getFHIRXMLNamespace())); } @@ -774,19 +784,40 @@ public function jsonSerialize() $a[self::FIELD_CATEGORY] = $v; } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if (null !== ($v = $this->getExcluded())) { - $a[self::FIELD_EXCLUDED] = $v->getValue(); - $a[self::FIELD_EXCLUDED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EXCLUDED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EXCLUDED_EXT] = $enc; + } + } else { + $a[self::FIELD_EXCLUDED] = $v; + } } if ([] !== ($vs = $this->getFinancial())) { $a[self::FIELD_FINANCIAL] = $vs; } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if (null !== ($v = $this->getNetwork())) { $a[self::FIELD_NETWORK] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitCareTeam.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitCareTeam.php index b8a844ef35..3b4b886f9a 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitCareTeam.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitCareTeam.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -82,10 +82,6 @@ class FHIRExplanationOfBenefitCareTeam extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_EXPLANATION_OF_BENEFIT_DOT_CARE_TEAM; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_PROVIDER = 'provider'; const FIELD_QUALIFICATION = 'qualification'; const FIELD_RESPONSIBLE = 'responsible'; @@ -152,6 +148,9 @@ class FHIRExplanationOfBenefitCareTeam extends FHIRBackboneElement */ protected $sequence = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRExplanationOfBenefitCareTeam Constructor * @param null|array $data @@ -188,8 +187,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_RESPONSIBLE] instanceof FHIRBoolean) { $this->setResponsible($data[self::FIELD_RESPONSIBLE]); - } elseif ($ext && is_scalar($data[self::FIELD_RESPONSIBLE])) { - $this->setResponsible(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_RESPONSIBLE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_RESPONSIBLE])) { + $this->setResponsible(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_RESPONSIBLE]] + $ext)); + } else if (is_array($data[self::FIELD_RESPONSIBLE])) { + $this->setResponsible(new FHIRBoolean(array_merge($ext, $data[self::FIELD_RESPONSIBLE]))); + } } else { $this->setResponsible(new FHIRBoolean($data[self::FIELD_RESPONSIBLE])); } @@ -207,8 +210,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SEQUENCE] instanceof FHIRPositiveInt) { $this->setSequence($data[self::FIELD_SEQUENCE]); - } elseif ($ext && is_scalar($data[self::FIELD_SEQUENCE])) { - $this->setSequence(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_SEQUENCE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SEQUENCE])) { + $this->setSequence(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_SEQUENCE]] + $ext)); + } else if (is_array($data[self::FIELD_SEQUENCE])) { + $this->setSequence(new FHIRPositiveInt(array_merge($ext, $data[self::FIELD_SEQUENCE]))); + } } else { $this->setSequence(new FHIRPositiveInt($data[self::FIELD_SEQUENCE])); } @@ -507,18 +514,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getProvider())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PROVIDER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getQualification())) { $v->xmlSerialize($sxe->addChild(self::FIELD_QUALIFICATION, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getResponsible())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RESPONSIBLE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRole())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ROLE, null, $v->_getFHIRXMLNamespace())); } @@ -541,15 +545,29 @@ public function jsonSerialize() $a[self::FIELD_QUALIFICATION] = $v; } if (null !== ($v = $this->getResponsible())) { - $a[self::FIELD_RESPONSIBLE] = $v->getValue(); - $a[self::FIELD_RESPONSIBLE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_RESPONSIBLE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_RESPONSIBLE_EXT] = $enc; + } + } else { + $a[self::FIELD_RESPONSIBLE] = $v; + } } if (null !== ($v = $this->getRole())) { $a[self::FIELD_ROLE] = $v; } if (null !== ($v = $this->getSequence())) { - $a[self::FIELD_SEQUENCE] = $v->getValue(); - $a[self::FIELD_SEQUENCE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SEQUENCE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SEQUENCE_EXT] = $enc; + } + } else { + $a[self::FIELD_SEQUENCE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitDetail.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitDetail.php index 7ad30c3028..36428ba9a2 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitDetail.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitDetail.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -84,10 +84,6 @@ class FHIRExplanationOfBenefitDetail extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_EXPLANATION_OF_BENEFIT_DOT_DETAIL; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ADJUDICATION = 'adjudication'; const FIELD_ADJUDICATION_EXT = '_adjudication'; const FIELD_CATEGORY = 'category'; @@ -282,6 +278,9 @@ class FHIRExplanationOfBenefitDetail extends FHIRBackboneElement */ protected $unitPrice = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRExplanationOfBenefitDetail Constructor * @param null|array $data @@ -304,17 +303,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_ADJUDICATION])) { foreach($data[self::FIELD_ADJUDICATION] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRExplanationOfBenefitAdjudication) { $this->addAdjudication($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addAdjudication(new FHIRExplanationOfBenefitAdjudication([FHIRExplanationOfBenefitAdjudication::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addAdjudication(new FHIRExplanationOfBenefitAdjudication([FHIRExplanationOfBenefitAdjudication::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addAdjudication(new FHIRExplanationOfBenefitAdjudication(array_merge($v, $ext[$i]))); + } } else { $this->addAdjudication(new FHIRExplanationOfBenefitAdjudication($v)); } } } elseif ($data[self::FIELD_ADJUDICATION] instanceof FHIRExplanationOfBenefitAdjudication) { $this->addAdjudication($data[self::FIELD_ADJUDICATION]); - } elseif ($ext && is_scalar($data[self::FIELD_ADJUDICATION])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_ADJUDICATION])) { $this->addAdjudication(new FHIRExplanationOfBenefitAdjudication([FHIRExplanationOfBenefitAdjudication::FIELD_VALUE => $data[self::FIELD_ADJUDICATION]] + $ext)); } else { $this->addAdjudication(new FHIRExplanationOfBenefitAdjudication($data[self::FIELD_ADJUDICATION])); @@ -333,8 +339,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_FACTOR] instanceof FHIRDecimal) { $this->setFactor($data[self::FIELD_FACTOR]); - } elseif ($ext && is_scalar($data[self::FIELD_FACTOR])) { - $this->setFactor(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_FACTOR]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_FACTOR])) { + $this->setFactor(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_FACTOR]] + $ext)); + } else if (is_array($data[self::FIELD_FACTOR])) { + $this->setFactor(new FHIRDecimal(array_merge($ext, $data[self::FIELD_FACTOR]))); + } } else { $this->setFactor(new FHIRDecimal($data[self::FIELD_FACTOR])); } @@ -342,6 +352,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_MODIFIER])) { if (is_array($data[self::FIELD_MODIFIER])) { foreach($data[self::FIELD_MODIFIER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addModifier($v); } else { @@ -360,8 +373,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NET] instanceof FHIRMoney) { $this->setNet($data[self::FIELD_NET]); - } elseif ($ext && is_scalar($data[self::FIELD_NET])) { - $this->setNet(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_NET]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NET])) { + $this->setNet(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_NET]] + $ext)); + } else if (is_array($data[self::FIELD_NET])) { + $this->setNet(new FHIRMoney(array_merge($ext, $data[self::FIELD_NET]))); + } } else { $this->setNet(new FHIRMoney($data[self::FIELD_NET])); } @@ -372,17 +389,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_NOTE_NUMBER])) { foreach($data[self::FIELD_NOTE_NUMBER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRPositiveInt) { $this->addNoteNumber($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addNoteNumber(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addNoteNumber(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addNoteNumber(new FHIRPositiveInt(array_merge($v, $ext[$i]))); + } } else { $this->addNoteNumber(new FHIRPositiveInt($v)); } } } elseif ($data[self::FIELD_NOTE_NUMBER] instanceof FHIRPositiveInt) { $this->addNoteNumber($data[self::FIELD_NOTE_NUMBER]); - } elseif ($ext && is_scalar($data[self::FIELD_NOTE_NUMBER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_NOTE_NUMBER])) { $this->addNoteNumber(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_NOTE_NUMBER]] + $ext)); } else { $this->addNoteNumber(new FHIRPositiveInt($data[self::FIELD_NOTE_NUMBER])); @@ -398,6 +422,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PROGRAM_CODE])) { if (is_array($data[self::FIELD_PROGRAM_CODE])) { foreach($data[self::FIELD_PROGRAM_CODE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addProgramCode($v); } else { @@ -416,8 +443,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_QUANTITY] instanceof FHIRQuantity) { $this->setQuantity($data[self::FIELD_QUANTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_QUANTITY])) { - $this->setQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_QUANTITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_QUANTITY])) { + $this->setQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_QUANTITY])) { + $this->setQuantity(new FHIRQuantity(array_merge($ext, $data[self::FIELD_QUANTITY]))); + } } else { $this->setQuantity(new FHIRQuantity($data[self::FIELD_QUANTITY])); } @@ -435,8 +466,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SEQUENCE] instanceof FHIRPositiveInt) { $this->setSequence($data[self::FIELD_SEQUENCE]); - } elseif ($ext && is_scalar($data[self::FIELD_SEQUENCE])) { - $this->setSequence(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_SEQUENCE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SEQUENCE])) { + $this->setSequence(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_SEQUENCE]] + $ext)); + } else if (is_array($data[self::FIELD_SEQUENCE])) { + $this->setSequence(new FHIRPositiveInt(array_merge($ext, $data[self::FIELD_SEQUENCE]))); + } } else { $this->setSequence(new FHIRPositiveInt($data[self::FIELD_SEQUENCE])); } @@ -444,6 +479,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SUB_DETAIL])) { if (is_array($data[self::FIELD_SUB_DETAIL])) { foreach($data[self::FIELD_SUB_DETAIL] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRExplanationOfBenefitSubDetail) { $this->addSubDetail($v); } else { @@ -459,6 +497,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_UDI])) { if (is_array($data[self::FIELD_UDI])) { foreach($data[self::FIELD_UDI] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addUdi($v); } else { @@ -477,8 +518,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_UNIT_PRICE] instanceof FHIRMoney) { $this->setUnitPrice($data[self::FIELD_UNIT_PRICE]); - } elseif ($ext && is_scalar($data[self::FIELD_UNIT_PRICE])) { - $this->setUnitPrice(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_UNIT_PRICE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_UNIT_PRICE])) { + $this->setUnitPrice(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_UNIT_PRICE]] + $ext)); + } else if (is_array($data[self::FIELD_UNIT_PRICE])) { + $this->setUnitPrice(new FHIRMoney(array_merge($ext, $data[self::FIELD_UNIT_PRICE]))); + } } else { $this->setUnitPrice(new FHIRMoney($data[self::FIELD_UNIT_PRICE])); } @@ -1287,7 +1332,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getAdjudication())) { foreach($vs as $v) { if (null === $v) { @@ -1303,7 +1347,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getFactor())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FACTOR, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getModifier())) { foreach($vs as $v) { if (null === $v) { @@ -1328,7 +1371,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getProductOrService())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PRODUCT_OR_SERVICE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getProgramCode())) { foreach($vs as $v) { if (null === $v) { @@ -1341,14 +1383,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_QUANTITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRevenue())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REVENUE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getSequence())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SEQUENCE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getSubDetail())) { foreach($vs as $v) { if (null === $v) { @@ -1380,20 +1420,51 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if ([] !== ($vs = $this->getAdjudication())) { - $a[self::FIELD_ADJUDICATION] = $vs; + $a[self::FIELD_ADJUDICATION] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ADJUDICATION][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ADJUDICATION_EXT][] = $enc; + } else { + $a[self::FIELD_ADJUDICATION_EXT][] = null; + } + } else { + $a[self::FIELD_ADJUDICATION][] = $v; + } + } } if (null !== ($v = $this->getCategory())) { $a[self::FIELD_CATEGORY] = $v; } if (null !== ($v = $this->getFactor())) { - $a[self::FIELD_FACTOR] = $v->getValue(); - $a[self::FIELD_FACTOR_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FACTOR] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FACTOR_EXT] = $enc; + } + } else { + $a[self::FIELD_FACTOR] = $v; + } } if ([] !== ($vs = $this->getModifier())) { $a[self::FIELD_MODIFIER] = $vs; } if (null !== ($v = $this->getNet())) { - $a[self::FIELD_NET] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NET] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NET_EXT] = $enc; + } + } else { + $a[self::FIELD_NET] = $v; + } } if ([] !== ($vs = $this->getNoteNumber())) { $a[self::FIELD_NOTE_NUMBER] = []; @@ -1401,8 +1472,17 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_NOTE_NUMBER][] = $v->getValue(); - $a[self::FIELD_NOTE_NUMBER_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NOTE_NUMBER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NOTE_NUMBER_EXT][] = $enc; + } else { + $a[self::FIELD_NOTE_NUMBER_EXT][] = null; + } + } else { + $a[self::FIELD_NOTE_NUMBER][] = $v; + } } } if (null !== ($v = $this->getProductOrService())) { @@ -1412,14 +1492,29 @@ public function jsonSerialize() $a[self::FIELD_PROGRAM_CODE] = $vs; } if (null !== ($v = $this->getQuantity())) { - $a[self::FIELD_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_QUANTITY] = $v; + } } if (null !== ($v = $this->getRevenue())) { $a[self::FIELD_REVENUE] = $v; } if (null !== ($v = $this->getSequence())) { - $a[self::FIELD_SEQUENCE] = $v->getValue(); - $a[self::FIELD_SEQUENCE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SEQUENCE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SEQUENCE_EXT] = $enc; + } + } else { + $a[self::FIELD_SEQUENCE] = $v; + } } if ([] !== ($vs = $this->getSubDetail())) { $a[self::FIELD_SUB_DETAIL] = $vs; @@ -1428,7 +1523,15 @@ public function jsonSerialize() $a[self::FIELD_UDI] = $vs; } if (null !== ($v = $this->getUnitPrice())) { - $a[self::FIELD_UNIT_PRICE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_UNIT_PRICE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_UNIT_PRICE_EXT] = $enc; + } + } else { + $a[self::FIELD_UNIT_PRICE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitDetail1.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitDetail1.php index d42d8744f8..06efd8c56a 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitDetail1.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitDetail1.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -83,10 +83,6 @@ class FHIRExplanationOfBenefitDetail1 extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_EXPLANATION_OF_BENEFIT_DOT_DETAIL_1; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ADJUDICATION = 'adjudication'; const FIELD_ADJUDICATION_EXT = '_adjudication'; const FIELD_FACTOR = 'factor'; @@ -215,6 +211,9 @@ class FHIRExplanationOfBenefitDetail1 extends FHIRBackboneElement */ protected $unitPrice = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRExplanationOfBenefitDetail1 Constructor * @param null|array $data @@ -237,17 +236,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_ADJUDICATION])) { foreach($data[self::FIELD_ADJUDICATION] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRExplanationOfBenefitAdjudication) { $this->addAdjudication($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addAdjudication(new FHIRExplanationOfBenefitAdjudication([FHIRExplanationOfBenefitAdjudication::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addAdjudication(new FHIRExplanationOfBenefitAdjudication([FHIRExplanationOfBenefitAdjudication::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addAdjudication(new FHIRExplanationOfBenefitAdjudication(array_merge($v, $ext[$i]))); + } } else { $this->addAdjudication(new FHIRExplanationOfBenefitAdjudication($v)); } } } elseif ($data[self::FIELD_ADJUDICATION] instanceof FHIRExplanationOfBenefitAdjudication) { $this->addAdjudication($data[self::FIELD_ADJUDICATION]); - } elseif ($ext && is_scalar($data[self::FIELD_ADJUDICATION])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_ADJUDICATION])) { $this->addAdjudication(new FHIRExplanationOfBenefitAdjudication([FHIRExplanationOfBenefitAdjudication::FIELD_VALUE => $data[self::FIELD_ADJUDICATION]] + $ext)); } else { $this->addAdjudication(new FHIRExplanationOfBenefitAdjudication($data[self::FIELD_ADJUDICATION])); @@ -259,8 +265,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_FACTOR] instanceof FHIRDecimal) { $this->setFactor($data[self::FIELD_FACTOR]); - } elseif ($ext && is_scalar($data[self::FIELD_FACTOR])) { - $this->setFactor(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_FACTOR]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_FACTOR])) { + $this->setFactor(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_FACTOR]] + $ext)); + } else if (is_array($data[self::FIELD_FACTOR])) { + $this->setFactor(new FHIRDecimal(array_merge($ext, $data[self::FIELD_FACTOR]))); + } } else { $this->setFactor(new FHIRDecimal($data[self::FIELD_FACTOR])); } @@ -268,6 +278,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_MODIFIER])) { if (is_array($data[self::FIELD_MODIFIER])) { foreach($data[self::FIELD_MODIFIER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addModifier($v); } else { @@ -286,8 +299,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NET] instanceof FHIRMoney) { $this->setNet($data[self::FIELD_NET]); - } elseif ($ext && is_scalar($data[self::FIELD_NET])) { - $this->setNet(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_NET]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NET])) { + $this->setNet(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_NET]] + $ext)); + } else if (is_array($data[self::FIELD_NET])) { + $this->setNet(new FHIRMoney(array_merge($ext, $data[self::FIELD_NET]))); + } } else { $this->setNet(new FHIRMoney($data[self::FIELD_NET])); } @@ -298,17 +315,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_NOTE_NUMBER])) { foreach($data[self::FIELD_NOTE_NUMBER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRPositiveInt) { $this->addNoteNumber($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addNoteNumber(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addNoteNumber(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addNoteNumber(new FHIRPositiveInt(array_merge($v, $ext[$i]))); + } } else { $this->addNoteNumber(new FHIRPositiveInt($v)); } } } elseif ($data[self::FIELD_NOTE_NUMBER] instanceof FHIRPositiveInt) { $this->addNoteNumber($data[self::FIELD_NOTE_NUMBER]); - } elseif ($ext && is_scalar($data[self::FIELD_NOTE_NUMBER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_NOTE_NUMBER])) { $this->addNoteNumber(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_NOTE_NUMBER]] + $ext)); } else { $this->addNoteNumber(new FHIRPositiveInt($data[self::FIELD_NOTE_NUMBER])); @@ -327,8 +351,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_QUANTITY] instanceof FHIRQuantity) { $this->setQuantity($data[self::FIELD_QUANTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_QUANTITY])) { - $this->setQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_QUANTITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_QUANTITY])) { + $this->setQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_QUANTITY])) { + $this->setQuantity(new FHIRQuantity(array_merge($ext, $data[self::FIELD_QUANTITY]))); + } } else { $this->setQuantity(new FHIRQuantity($data[self::FIELD_QUANTITY])); } @@ -336,6 +364,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SUB_DETAIL])) { if (is_array($data[self::FIELD_SUB_DETAIL])) { foreach($data[self::FIELD_SUB_DETAIL] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRExplanationOfBenefitSubDetail1) { $this->addSubDetail($v); } else { @@ -354,8 +385,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_UNIT_PRICE] instanceof FHIRMoney) { $this->setUnitPrice($data[self::FIELD_UNIT_PRICE]); - } elseif ($ext && is_scalar($data[self::FIELD_UNIT_PRICE])) { - $this->setUnitPrice(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_UNIT_PRICE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_UNIT_PRICE])) { + $this->setUnitPrice(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_UNIT_PRICE]] + $ext)); + } else if (is_array($data[self::FIELD_UNIT_PRICE])) { + $this->setUnitPrice(new FHIRMoney(array_merge($ext, $data[self::FIELD_UNIT_PRICE]))); + } } else { $this->setUnitPrice(new FHIRMoney($data[self::FIELD_UNIT_PRICE])); } @@ -921,7 +956,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getAdjudication())) { foreach($vs as $v) { if (null === $v) { @@ -930,10 +964,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_ADJUDICATION, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getFactor())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FACTOR, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getModifier())) { foreach($vs as $v) { if (null === $v) { @@ -958,11 +992,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getProductOrService())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PRODUCT_OR_SERVICE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_QUANTITY, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getSubDetail())) { foreach($vs as $v) { if (null === $v) { @@ -985,17 +1017,48 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if ([] !== ($vs = $this->getAdjudication())) { - $a[self::FIELD_ADJUDICATION] = $vs; + $a[self::FIELD_ADJUDICATION] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ADJUDICATION][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ADJUDICATION_EXT][] = $enc; + } else { + $a[self::FIELD_ADJUDICATION_EXT][] = null; + } + } else { + $a[self::FIELD_ADJUDICATION][] = $v; + } + } } if (null !== ($v = $this->getFactor())) { - $a[self::FIELD_FACTOR] = $v->getValue(); - $a[self::FIELD_FACTOR_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FACTOR] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FACTOR_EXT] = $enc; + } + } else { + $a[self::FIELD_FACTOR] = $v; + } } if ([] !== ($vs = $this->getModifier())) { $a[self::FIELD_MODIFIER] = $vs; } if (null !== ($v = $this->getNet())) { - $a[self::FIELD_NET] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NET] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NET_EXT] = $enc; + } + } else { + $a[self::FIELD_NET] = $v; + } } if ([] !== ($vs = $this->getNoteNumber())) { $a[self::FIELD_NOTE_NUMBER] = []; @@ -1003,21 +1066,46 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_NOTE_NUMBER][] = $v->getValue(); - $a[self::FIELD_NOTE_NUMBER_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NOTE_NUMBER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NOTE_NUMBER_EXT][] = $enc; + } else { + $a[self::FIELD_NOTE_NUMBER_EXT][] = null; + } + } else { + $a[self::FIELD_NOTE_NUMBER][] = $v; + } } } if (null !== ($v = $this->getProductOrService())) { $a[self::FIELD_PRODUCT_OR_SERVICE] = $v; } if (null !== ($v = $this->getQuantity())) { - $a[self::FIELD_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_QUANTITY] = $v; + } } if ([] !== ($vs = $this->getSubDetail())) { $a[self::FIELD_SUB_DETAIL] = $vs; } if (null !== ($v = $this->getUnitPrice())) { - $a[self::FIELD_UNIT_PRICE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_UNIT_PRICE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_UNIT_PRICE_EXT] = $enc; + } + } else { + $a[self::FIELD_UNIT_PRICE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitDiagnosis.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitDiagnosis.php index bd45647078..e2a9833d6b 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitDiagnosis.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitDiagnosis.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -81,10 +81,6 @@ class FHIRExplanationOfBenefitDiagnosis extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_EXPLANATION_OF_BENEFIT_DOT_DIAGNOSIS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DIAGNOSIS_CODEABLE_CONCEPT = 'diagnosisCodeableConcept'; const FIELD_DIAGNOSIS_REFERENCE = 'diagnosisReference'; const FIELD_ON_ADMISSION = 'onAdmission'; @@ -167,6 +163,9 @@ class FHIRExplanationOfBenefitDiagnosis extends FHIRBackboneElement */ protected $type = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRExplanationOfBenefitDiagnosis Constructor * @param null|array $data @@ -217,8 +216,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SEQUENCE] instanceof FHIRPositiveInt) { $this->setSequence($data[self::FIELD_SEQUENCE]); - } elseif ($ext && is_scalar($data[self::FIELD_SEQUENCE])) { - $this->setSequence(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_SEQUENCE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SEQUENCE])) { + $this->setSequence(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_SEQUENCE]] + $ext)); + } else if (is_array($data[self::FIELD_SEQUENCE])) { + $this->setSequence(new FHIRPositiveInt(array_merge($ext, $data[self::FIELD_SEQUENCE]))); + } } else { $this->setSequence(new FHIRPositiveInt($data[self::FIELD_SEQUENCE])); } @@ -226,6 +229,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_TYPE])) { if (is_array($data[self::FIELD_TYPE])) { foreach($data[self::FIELD_TYPE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addType($v); } else { @@ -593,26 +599,21 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getDiagnosisCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DIAGNOSIS_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDiagnosisReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DIAGNOSIS_REFERENCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOnAdmission())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ON_ADMISSION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPackageCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PACKAGE_CODE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getSequence())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SEQUENCE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getType())) { foreach($vs as $v) { if (null === $v) { @@ -621,6 +622,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } @@ -643,8 +645,15 @@ public function jsonSerialize() $a[self::FIELD_PACKAGE_CODE] = $v; } if (null !== ($v = $this->getSequence())) { - $a[self::FIELD_SEQUENCE] = $v->getValue(); - $a[self::FIELD_SEQUENCE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SEQUENCE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SEQUENCE_EXT] = $enc; + } + } else { + $a[self::FIELD_SEQUENCE] = $v; + } } if ([] !== ($vs = $this->getType())) { $a[self::FIELD_TYPE] = $vs; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitFinancial.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitFinancial.php index 75fd24d30c..7e80ee99aa 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitFinancial.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitFinancial.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -82,10 +82,6 @@ class FHIRExplanationOfBenefitFinancial extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_EXPLANATION_OF_BENEFIT_DOT_FINANCIAL; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ALLOWED_MONEY = 'allowedMoney'; const FIELD_ALLOWED_MONEY_EXT = '_allowedMoney'; const FIELD_ALLOWED_STRING = 'allowedString'; @@ -170,6 +166,9 @@ class FHIRExplanationOfBenefitFinancial extends FHIRBackboneElement */ protected $usedUnsignedInt = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRExplanationOfBenefitFinancial Constructor * @param null|array $data @@ -192,8 +191,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ALLOWED_MONEY] instanceof FHIRMoney) { $this->setAllowedMoney($data[self::FIELD_ALLOWED_MONEY]); - } elseif ($ext && is_scalar($data[self::FIELD_ALLOWED_MONEY])) { - $this->setAllowedMoney(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_ALLOWED_MONEY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ALLOWED_MONEY])) { + $this->setAllowedMoney(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_ALLOWED_MONEY]] + $ext)); + } else if (is_array($data[self::FIELD_ALLOWED_MONEY])) { + $this->setAllowedMoney(new FHIRMoney(array_merge($ext, $data[self::FIELD_ALLOWED_MONEY]))); + } } else { $this->setAllowedMoney(new FHIRMoney($data[self::FIELD_ALLOWED_MONEY])); } @@ -204,8 +207,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ALLOWED_STRING] instanceof FHIRString) { $this->setAllowedString($data[self::FIELD_ALLOWED_STRING]); - } elseif ($ext && is_scalar($data[self::FIELD_ALLOWED_STRING])) { - $this->setAllowedString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_ALLOWED_STRING]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ALLOWED_STRING])) { + $this->setAllowedString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_ALLOWED_STRING]] + $ext)); + } else if (is_array($data[self::FIELD_ALLOWED_STRING])) { + $this->setAllowedString(new FHIRString(array_merge($ext, $data[self::FIELD_ALLOWED_STRING]))); + } } else { $this->setAllowedString(new FHIRString($data[self::FIELD_ALLOWED_STRING])); } @@ -216,8 +223,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ALLOWED_UNSIGNED_INT] instanceof FHIRUnsignedInt) { $this->setAllowedUnsignedInt($data[self::FIELD_ALLOWED_UNSIGNED_INT]); - } elseif ($ext && is_scalar($data[self::FIELD_ALLOWED_UNSIGNED_INT])) { - $this->setAllowedUnsignedInt(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_ALLOWED_UNSIGNED_INT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ALLOWED_UNSIGNED_INT])) { + $this->setAllowedUnsignedInt(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_ALLOWED_UNSIGNED_INT]] + $ext)); + } else if (is_array($data[self::FIELD_ALLOWED_UNSIGNED_INT])) { + $this->setAllowedUnsignedInt(new FHIRUnsignedInt(array_merge($ext, $data[self::FIELD_ALLOWED_UNSIGNED_INT]))); + } } else { $this->setAllowedUnsignedInt(new FHIRUnsignedInt($data[self::FIELD_ALLOWED_UNSIGNED_INT])); } @@ -235,8 +246,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_USED_MONEY] instanceof FHIRMoney) { $this->setUsedMoney($data[self::FIELD_USED_MONEY]); - } elseif ($ext && is_scalar($data[self::FIELD_USED_MONEY])) { - $this->setUsedMoney(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_USED_MONEY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_USED_MONEY])) { + $this->setUsedMoney(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_USED_MONEY]] + $ext)); + } else if (is_array($data[self::FIELD_USED_MONEY])) { + $this->setUsedMoney(new FHIRMoney(array_merge($ext, $data[self::FIELD_USED_MONEY]))); + } } else { $this->setUsedMoney(new FHIRMoney($data[self::FIELD_USED_MONEY])); } @@ -247,8 +262,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_USED_UNSIGNED_INT] instanceof FHIRUnsignedInt) { $this->setUsedUnsignedInt($data[self::FIELD_USED_UNSIGNED_INT]); - } elseif ($ext && is_scalar($data[self::FIELD_USED_UNSIGNED_INT])) { - $this->setUsedUnsignedInt(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_USED_UNSIGNED_INT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_USED_UNSIGNED_INT])) { + $this->setUsedUnsignedInt(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_USED_UNSIGNED_INT]] + $ext)); + } else if (is_array($data[self::FIELD_USED_UNSIGNED_INT])) { + $this->setUsedUnsignedInt(new FHIRUnsignedInt(array_merge($ext, $data[self::FIELD_USED_UNSIGNED_INT]))); + } } else { $this->setUsedUnsignedInt(new FHIRUnsignedInt($data[self::FIELD_USED_UNSIGNED_INT])); } @@ -597,7 +616,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getAllowedMoney())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ALLOWED_MONEY, null, $v->_getFHIRXMLNamespace())); } @@ -607,11 +625,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getAllowedUnsignedInt())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ALLOWED_UNSIGNED_INT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getUsedMoney())) { $v->xmlSerialize($sxe->addChild(self::FIELD_USED_MONEY, null, $v->_getFHIRXMLNamespace())); } @@ -628,25 +644,62 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getAllowedMoney())) { - $a[self::FIELD_ALLOWED_MONEY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ALLOWED_MONEY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ALLOWED_MONEY_EXT] = $enc; + } + } else { + $a[self::FIELD_ALLOWED_MONEY] = $v; + } } if (null !== ($v = $this->getAllowedString())) { - $a[self::FIELD_ALLOWED_STRING] = $v->getValue(); - $a[self::FIELD_ALLOWED_STRING_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ALLOWED_STRING] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ALLOWED_STRING_EXT] = $enc; + } + } else { + $a[self::FIELD_ALLOWED_STRING] = $v; + } } if (null !== ($v = $this->getAllowedUnsignedInt())) { - $a[self::FIELD_ALLOWED_UNSIGNED_INT] = $v->getValue(); - $a[self::FIELD_ALLOWED_UNSIGNED_INT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ALLOWED_UNSIGNED_INT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ALLOWED_UNSIGNED_INT_EXT] = $enc; + } + } else { + $a[self::FIELD_ALLOWED_UNSIGNED_INT] = $v; + } } if (null !== ($v = $this->getType())) { $a[self::FIELD_TYPE] = $v; } if (null !== ($v = $this->getUsedMoney())) { - $a[self::FIELD_USED_MONEY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_USED_MONEY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_USED_MONEY_EXT] = $enc; + } + } else { + $a[self::FIELD_USED_MONEY] = $v; + } } if (null !== ($v = $this->getUsedUnsignedInt())) { - $a[self::FIELD_USED_UNSIGNED_INT] = $v->getValue(); - $a[self::FIELD_USED_UNSIGNED_INT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_USED_UNSIGNED_INT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_USED_UNSIGNED_INT_EXT] = $enc; + } + } else { + $a[self::FIELD_USED_UNSIGNED_INT] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitInsurance.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitInsurance.php index ad5fc753f4..e17508ff60 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitInsurance.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitInsurance.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -81,10 +81,6 @@ class FHIRExplanationOfBenefitInsurance extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_EXPLANATION_OF_BENEFIT_DOT_INSURANCE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_COVERAGE = 'coverage'; const FIELD_FOCAL = 'focal'; const FIELD_FOCAL_EXT = '_focal'; @@ -128,6 +124,9 @@ class FHIRExplanationOfBenefitInsurance extends FHIRBackboneElement */ protected $preAuthRef = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRExplanationOfBenefitInsurance Constructor * @param null|array $data @@ -157,8 +156,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_FOCAL] instanceof FHIRBoolean) { $this->setFocal($data[self::FIELD_FOCAL]); - } elseif ($ext && is_scalar($data[self::FIELD_FOCAL])) { - $this->setFocal(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_FOCAL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_FOCAL])) { + $this->setFocal(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_FOCAL]] + $ext)); + } else if (is_array($data[self::FIELD_FOCAL])) { + $this->setFocal(new FHIRBoolean(array_merge($ext, $data[self::FIELD_FOCAL]))); + } } else { $this->setFocal(new FHIRBoolean($data[self::FIELD_FOCAL])); } @@ -169,17 +172,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_PRE_AUTH_REF])) { foreach($data[self::FIELD_PRE_AUTH_REF] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRString) { $this->addPreAuthRef($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addPreAuthRef(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addPreAuthRef(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addPreAuthRef(new FHIRString(array_merge($v, $ext[$i]))); + } } else { $this->addPreAuthRef(new FHIRString($v)); } } } elseif ($data[self::FIELD_PRE_AUTH_REF] instanceof FHIRString) { $this->addPreAuthRef($data[self::FIELD_PRE_AUTH_REF]); - } elseif ($ext && is_scalar($data[self::FIELD_PRE_AUTH_REF])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_PRE_AUTH_REF])) { $this->addPreAuthRef(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PRE_AUTH_REF]] + $ext)); } else { $this->addPreAuthRef(new FHIRString($data[self::FIELD_PRE_AUTH_REF])); @@ -445,7 +455,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getCoverage())) { $v->xmlSerialize($sxe->addChild(self::FIELD_COVERAGE, null, $v->_getFHIRXMLNamespace())); } @@ -460,6 +469,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_PRE_AUTH_REF, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } @@ -473,8 +483,15 @@ public function jsonSerialize() $a[self::FIELD_COVERAGE] = $v; } if (null !== ($v = $this->getFocal())) { - $a[self::FIELD_FOCAL] = $v->getValue(); - $a[self::FIELD_FOCAL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FOCAL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FOCAL_EXT] = $enc; + } + } else { + $a[self::FIELD_FOCAL] = $v; + } } if ([] !== ($vs = $this->getPreAuthRef())) { $a[self::FIELD_PRE_AUTH_REF] = []; @@ -482,8 +499,17 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_PRE_AUTH_REF][] = $v->getValue(); - $a[self::FIELD_PRE_AUTH_REF_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PRE_AUTH_REF][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PRE_AUTH_REF_EXT][] = $enc; + } else { + $a[self::FIELD_PRE_AUTH_REF_EXT][] = null; + } + } else { + $a[self::FIELD_PRE_AUTH_REF][] = $v; + } } } return $a; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitItem.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitItem.php index 72628d36b4..34f2640235 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitItem.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitItem.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -87,10 +87,6 @@ class FHIRExplanationOfBenefitItem extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_EXPLANATION_OF_BENEFIT_DOT_ITEM; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ADJUDICATION = 'adjudication'; const FIELD_ADJUDICATION_EXT = '_adjudication'; const FIELD_BODY_SITE = 'bodySite'; @@ -449,6 +445,9 @@ class FHIRExplanationOfBenefitItem extends FHIRBackboneElement */ protected $unitPrice = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRExplanationOfBenefitItem Constructor * @param null|array $data @@ -471,17 +470,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_ADJUDICATION])) { foreach($data[self::FIELD_ADJUDICATION] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRExplanationOfBenefitAdjudication) { $this->addAdjudication($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addAdjudication(new FHIRExplanationOfBenefitAdjudication([FHIRExplanationOfBenefitAdjudication::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addAdjudication(new FHIRExplanationOfBenefitAdjudication([FHIRExplanationOfBenefitAdjudication::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addAdjudication(new FHIRExplanationOfBenefitAdjudication(array_merge($v, $ext[$i]))); + } } else { $this->addAdjudication(new FHIRExplanationOfBenefitAdjudication($v)); } } } elseif ($data[self::FIELD_ADJUDICATION] instanceof FHIRExplanationOfBenefitAdjudication) { $this->addAdjudication($data[self::FIELD_ADJUDICATION]); - } elseif ($ext && is_scalar($data[self::FIELD_ADJUDICATION])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_ADJUDICATION])) { $this->addAdjudication(new FHIRExplanationOfBenefitAdjudication([FHIRExplanationOfBenefitAdjudication::FIELD_VALUE => $data[self::FIELD_ADJUDICATION]] + $ext)); } else { $this->addAdjudication(new FHIRExplanationOfBenefitAdjudication($data[self::FIELD_ADJUDICATION])); @@ -500,17 +506,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_CARE_TEAM_SEQUENCE])) { foreach($data[self::FIELD_CARE_TEAM_SEQUENCE] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRPositiveInt) { $this->addCareTeamSequence($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addCareTeamSequence(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addCareTeamSequence(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addCareTeamSequence(new FHIRPositiveInt(array_merge($v, $ext[$i]))); + } } else { $this->addCareTeamSequence(new FHIRPositiveInt($v)); } } } elseif ($data[self::FIELD_CARE_TEAM_SEQUENCE] instanceof FHIRPositiveInt) { $this->addCareTeamSequence($data[self::FIELD_CARE_TEAM_SEQUENCE]); - } elseif ($ext && is_scalar($data[self::FIELD_CARE_TEAM_SEQUENCE])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_CARE_TEAM_SEQUENCE])) { $this->addCareTeamSequence(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_CARE_TEAM_SEQUENCE]] + $ext)); } else { $this->addCareTeamSequence(new FHIRPositiveInt($data[self::FIELD_CARE_TEAM_SEQUENCE])); @@ -526,6 +539,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_DETAIL])) { if (is_array($data[self::FIELD_DETAIL])) { foreach($data[self::FIELD_DETAIL] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRExplanationOfBenefitDetail) { $this->addDetail($v); } else { @@ -544,17 +560,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_DIAGNOSIS_SEQUENCE])) { foreach($data[self::FIELD_DIAGNOSIS_SEQUENCE] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRPositiveInt) { $this->addDiagnosisSequence($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addDiagnosisSequence(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addDiagnosisSequence(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addDiagnosisSequence(new FHIRPositiveInt(array_merge($v, $ext[$i]))); + } } else { $this->addDiagnosisSequence(new FHIRPositiveInt($v)); } } } elseif ($data[self::FIELD_DIAGNOSIS_SEQUENCE] instanceof FHIRPositiveInt) { $this->addDiagnosisSequence($data[self::FIELD_DIAGNOSIS_SEQUENCE]); - } elseif ($ext && is_scalar($data[self::FIELD_DIAGNOSIS_SEQUENCE])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_DIAGNOSIS_SEQUENCE])) { $this->addDiagnosisSequence(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_DIAGNOSIS_SEQUENCE]] + $ext)); } else { $this->addDiagnosisSequence(new FHIRPositiveInt($data[self::FIELD_DIAGNOSIS_SEQUENCE])); @@ -563,6 +586,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ENCOUNTER])) { if (is_array($data[self::FIELD_ENCOUNTER])) { foreach($data[self::FIELD_ENCOUNTER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addEncounter($v); } else { @@ -581,8 +607,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_FACTOR] instanceof FHIRDecimal) { $this->setFactor($data[self::FIELD_FACTOR]); - } elseif ($ext && is_scalar($data[self::FIELD_FACTOR])) { - $this->setFactor(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_FACTOR]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_FACTOR])) { + $this->setFactor(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_FACTOR]] + $ext)); + } else if (is_array($data[self::FIELD_FACTOR])) { + $this->setFactor(new FHIRDecimal(array_merge($ext, $data[self::FIELD_FACTOR]))); + } } else { $this->setFactor(new FHIRDecimal($data[self::FIELD_FACTOR])); } @@ -593,17 +623,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_INFORMATION_SEQUENCE])) { foreach($data[self::FIELD_INFORMATION_SEQUENCE] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRPositiveInt) { $this->addInformationSequence($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addInformationSequence(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addInformationSequence(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addInformationSequence(new FHIRPositiveInt(array_merge($v, $ext[$i]))); + } } else { $this->addInformationSequence(new FHIRPositiveInt($v)); } } } elseif ($data[self::FIELD_INFORMATION_SEQUENCE] instanceof FHIRPositiveInt) { $this->addInformationSequence($data[self::FIELD_INFORMATION_SEQUENCE]); - } elseif ($ext && is_scalar($data[self::FIELD_INFORMATION_SEQUENCE])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_INFORMATION_SEQUENCE])) { $this->addInformationSequence(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_INFORMATION_SEQUENCE]] + $ext)); } else { $this->addInformationSequence(new FHIRPositiveInt($data[self::FIELD_INFORMATION_SEQUENCE])); @@ -633,6 +670,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_MODIFIER])) { if (is_array($data[self::FIELD_MODIFIER])) { foreach($data[self::FIELD_MODIFIER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addModifier($v); } else { @@ -651,8 +691,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NET] instanceof FHIRMoney) { $this->setNet($data[self::FIELD_NET]); - } elseif ($ext && is_scalar($data[self::FIELD_NET])) { - $this->setNet(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_NET]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NET])) { + $this->setNet(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_NET]] + $ext)); + } else if (is_array($data[self::FIELD_NET])) { + $this->setNet(new FHIRMoney(array_merge($ext, $data[self::FIELD_NET]))); + } } else { $this->setNet(new FHIRMoney($data[self::FIELD_NET])); } @@ -663,17 +707,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_NOTE_NUMBER])) { foreach($data[self::FIELD_NOTE_NUMBER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRPositiveInt) { $this->addNoteNumber($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addNoteNumber(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addNoteNumber(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addNoteNumber(new FHIRPositiveInt(array_merge($v, $ext[$i]))); + } } else { $this->addNoteNumber(new FHIRPositiveInt($v)); } } } elseif ($data[self::FIELD_NOTE_NUMBER] instanceof FHIRPositiveInt) { $this->addNoteNumber($data[self::FIELD_NOTE_NUMBER]); - } elseif ($ext && is_scalar($data[self::FIELD_NOTE_NUMBER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_NOTE_NUMBER])) { $this->addNoteNumber(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_NOTE_NUMBER]] + $ext)); } else { $this->addNoteNumber(new FHIRPositiveInt($data[self::FIELD_NOTE_NUMBER])); @@ -685,17 +736,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_PROCEDURE_SEQUENCE])) { foreach($data[self::FIELD_PROCEDURE_SEQUENCE] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRPositiveInt) { $this->addProcedureSequence($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addProcedureSequence(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addProcedureSequence(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addProcedureSequence(new FHIRPositiveInt(array_merge($v, $ext[$i]))); + } } else { $this->addProcedureSequence(new FHIRPositiveInt($v)); } } } elseif ($data[self::FIELD_PROCEDURE_SEQUENCE] instanceof FHIRPositiveInt) { $this->addProcedureSequence($data[self::FIELD_PROCEDURE_SEQUENCE]); - } elseif ($ext && is_scalar($data[self::FIELD_PROCEDURE_SEQUENCE])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_PROCEDURE_SEQUENCE])) { $this->addProcedureSequence(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_PROCEDURE_SEQUENCE]] + $ext)); } else { $this->addProcedureSequence(new FHIRPositiveInt($data[self::FIELD_PROCEDURE_SEQUENCE])); @@ -711,6 +769,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PROGRAM_CODE])) { if (is_array($data[self::FIELD_PROGRAM_CODE])) { foreach($data[self::FIELD_PROGRAM_CODE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addProgramCode($v); } else { @@ -729,8 +790,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_QUANTITY] instanceof FHIRQuantity) { $this->setQuantity($data[self::FIELD_QUANTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_QUANTITY])) { - $this->setQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_QUANTITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_QUANTITY])) { + $this->setQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_QUANTITY])) { + $this->setQuantity(new FHIRQuantity(array_merge($ext, $data[self::FIELD_QUANTITY]))); + } } else { $this->setQuantity(new FHIRQuantity($data[self::FIELD_QUANTITY])); } @@ -748,8 +813,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SEQUENCE] instanceof FHIRPositiveInt) { $this->setSequence($data[self::FIELD_SEQUENCE]); - } elseif ($ext && is_scalar($data[self::FIELD_SEQUENCE])) { - $this->setSequence(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_SEQUENCE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SEQUENCE])) { + $this->setSequence(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_SEQUENCE]] + $ext)); + } else if (is_array($data[self::FIELD_SEQUENCE])) { + $this->setSequence(new FHIRPositiveInt(array_merge($ext, $data[self::FIELD_SEQUENCE]))); + } } else { $this->setSequence(new FHIRPositiveInt($data[self::FIELD_SEQUENCE])); } @@ -760,8 +829,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SERVICED_DATE] instanceof FHIRDate) { $this->setServicedDate($data[self::FIELD_SERVICED_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_SERVICED_DATE])) { - $this->setServicedDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_SERVICED_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SERVICED_DATE])) { + $this->setServicedDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_SERVICED_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_SERVICED_DATE])) { + $this->setServicedDate(new FHIRDate(array_merge($ext, $data[self::FIELD_SERVICED_DATE]))); + } } else { $this->setServicedDate(new FHIRDate($data[self::FIELD_SERVICED_DATE])); } @@ -776,6 +849,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SUB_SITE])) { if (is_array($data[self::FIELD_SUB_SITE])) { foreach($data[self::FIELD_SUB_SITE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addSubSite($v); } else { @@ -791,6 +867,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_UDI])) { if (is_array($data[self::FIELD_UDI])) { foreach($data[self::FIELD_UDI] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addUdi($v); } else { @@ -809,8 +888,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_UNIT_PRICE] instanceof FHIRMoney) { $this->setUnitPrice($data[self::FIELD_UNIT_PRICE]); - } elseif ($ext && is_scalar($data[self::FIELD_UNIT_PRICE])) { - $this->setUnitPrice(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_UNIT_PRICE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_UNIT_PRICE])) { + $this->setUnitPrice(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_UNIT_PRICE]] + $ext)); + } else if (is_array($data[self::FIELD_UNIT_PRICE])) { + $this->setUnitPrice(new FHIRMoney(array_merge($ext, $data[self::FIELD_UNIT_PRICE]))); + } } else { $this->setUnitPrice(new FHIRMoney($data[self::FIELD_UNIT_PRICE])); } @@ -2272,7 +2355,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getAdjudication())) { foreach($vs as $v) { if (null === $v) { @@ -2297,7 +2379,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getCategory())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CATEGORY, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getDetail())) { foreach($vs as $v) { if (null === $v) { @@ -2306,6 +2387,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_DETAIL, null, $v->_getFHIRXMLNamespace())); } } + if ([] !== ($vs = $this->getDiagnosisSequence())) { foreach($vs as $v) { if (null === $v) { @@ -2323,6 +2405,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_ENCOUNTER, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getFactor())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FACTOR, null, $v->_getFHIRXMLNamespace())); } @@ -2338,15 +2421,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getLocationAddress())) { $v->xmlSerialize($sxe->addChild(self::FIELD_LOCATION_ADDRESS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getLocationCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_LOCATION_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getLocationReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_LOCATION_REFERENCE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getModifier())) { foreach($vs as $v) { if (null === $v) { @@ -2367,6 +2447,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_NOTE_NUMBER, null, $v->_getFHIRXMLNamespace())); } } + if ([] !== ($vs = $this->getProcedureSequence())) { foreach($vs as $v) { if (null === $v) { @@ -2379,7 +2460,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getProductOrService())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PRODUCT_OR_SERVICE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getProgramCode())) { foreach($vs as $v) { if (null === $v) { @@ -2392,7 +2472,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_QUANTITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRevenue())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REVENUE, null, $v->_getFHIRXMLNamespace())); } @@ -2402,11 +2481,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getServicedDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SERVICED_DATE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getServicedPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SERVICED_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getSubSite())) { foreach($vs as $v) { if (null === $v) { @@ -2438,7 +2515,23 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if ([] !== ($vs = $this->getAdjudication())) { - $a[self::FIELD_ADJUDICATION] = $vs; + $a[self::FIELD_ADJUDICATION] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ADJUDICATION][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ADJUDICATION_EXT][] = $enc; + } else { + $a[self::FIELD_ADJUDICATION_EXT][] = null; + } + } else { + $a[self::FIELD_ADJUDICATION][] = $v; + } + } } if (null !== ($v = $this->getBodySite())) { $a[self::FIELD_BODY_SITE] = $v; @@ -2449,8 +2542,17 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_CARE_TEAM_SEQUENCE][] = $v->getValue(); - $a[self::FIELD_CARE_TEAM_SEQUENCE_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CARE_TEAM_SEQUENCE][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CARE_TEAM_SEQUENCE_EXT][] = $enc; + } else { + $a[self::FIELD_CARE_TEAM_SEQUENCE_EXT][] = null; + } + } else { + $a[self::FIELD_CARE_TEAM_SEQUENCE][] = $v; + } } } if (null !== ($v = $this->getCategory())) { @@ -2465,16 +2567,32 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_DIAGNOSIS_SEQUENCE][] = $v->getValue(); - $a[self::FIELD_DIAGNOSIS_SEQUENCE_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DIAGNOSIS_SEQUENCE][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DIAGNOSIS_SEQUENCE_EXT][] = $enc; + } else { + $a[self::FIELD_DIAGNOSIS_SEQUENCE_EXT][] = null; + } + } else { + $a[self::FIELD_DIAGNOSIS_SEQUENCE][] = $v; + } } } if ([] !== ($vs = $this->getEncounter())) { $a[self::FIELD_ENCOUNTER] = $vs; } if (null !== ($v = $this->getFactor())) { - $a[self::FIELD_FACTOR] = $v->getValue(); - $a[self::FIELD_FACTOR_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FACTOR] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FACTOR_EXT] = $enc; + } + } else { + $a[self::FIELD_FACTOR] = $v; + } } if ([] !== ($vs = $this->getInformationSequence())) { $a[self::FIELD_INFORMATION_SEQUENCE] = []; @@ -2482,8 +2600,17 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_INFORMATION_SEQUENCE][] = $v->getValue(); - $a[self::FIELD_INFORMATION_SEQUENCE_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_INFORMATION_SEQUENCE][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_INFORMATION_SEQUENCE_EXT][] = $enc; + } else { + $a[self::FIELD_INFORMATION_SEQUENCE_EXT][] = null; + } + } else { + $a[self::FIELD_INFORMATION_SEQUENCE][] = $v; + } } } if (null !== ($v = $this->getLocationAddress())) { @@ -2499,7 +2626,15 @@ public function jsonSerialize() $a[self::FIELD_MODIFIER] = $vs; } if (null !== ($v = $this->getNet())) { - $a[self::FIELD_NET] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NET] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NET_EXT] = $enc; + } + } else { + $a[self::FIELD_NET] = $v; + } } if ([] !== ($vs = $this->getNoteNumber())) { $a[self::FIELD_NOTE_NUMBER] = []; @@ -2507,8 +2642,17 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_NOTE_NUMBER][] = $v->getValue(); - $a[self::FIELD_NOTE_NUMBER_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NOTE_NUMBER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NOTE_NUMBER_EXT][] = $enc; + } else { + $a[self::FIELD_NOTE_NUMBER_EXT][] = null; + } + } else { + $a[self::FIELD_NOTE_NUMBER][] = $v; + } } } if ([] !== ($vs = $this->getProcedureSequence())) { @@ -2517,8 +2661,17 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_PROCEDURE_SEQUENCE][] = $v->getValue(); - $a[self::FIELD_PROCEDURE_SEQUENCE_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PROCEDURE_SEQUENCE][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PROCEDURE_SEQUENCE_EXT][] = $enc; + } else { + $a[self::FIELD_PROCEDURE_SEQUENCE_EXT][] = null; + } + } else { + $a[self::FIELD_PROCEDURE_SEQUENCE][] = $v; + } } } if (null !== ($v = $this->getProductOrService())) { @@ -2528,18 +2681,40 @@ public function jsonSerialize() $a[self::FIELD_PROGRAM_CODE] = $vs; } if (null !== ($v = $this->getQuantity())) { - $a[self::FIELD_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_QUANTITY] = $v; + } } if (null !== ($v = $this->getRevenue())) { $a[self::FIELD_REVENUE] = $v; } if (null !== ($v = $this->getSequence())) { - $a[self::FIELD_SEQUENCE] = $v->getValue(); - $a[self::FIELD_SEQUENCE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SEQUENCE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SEQUENCE_EXT] = $enc; + } + } else { + $a[self::FIELD_SEQUENCE] = $v; + } } if (null !== ($v = $this->getServicedDate())) { - $a[self::FIELD_SERVICED_DATE] = $v->getValue(); - $a[self::FIELD_SERVICED_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SERVICED_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SERVICED_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_SERVICED_DATE] = $v; + } } if (null !== ($v = $this->getServicedPeriod())) { $a[self::FIELD_SERVICED_PERIOD] = $v; @@ -2551,7 +2726,15 @@ public function jsonSerialize() $a[self::FIELD_UDI] = $vs; } if (null !== ($v = $this->getUnitPrice())) { - $a[self::FIELD_UNIT_PRICE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_UNIT_PRICE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_UNIT_PRICE_EXT] = $enc; + } + } else { + $a[self::FIELD_UNIT_PRICE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitPayee.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitPayee.php index 45579222d7..0c50a4ba09 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitPayee.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitPayee.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRExplanationOfBenefitPayee extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_EXPLANATION_OF_BENEFIT_DOT_PAYEE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_PARTY = 'party'; const FIELD_TYPE = 'type'; @@ -110,6 +106,9 @@ class FHIRExplanationOfBenefitPayee extends FHIRBackboneElement */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRExplanationOfBenefitPayee Constructor * @param null|array $data @@ -309,11 +308,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getParty())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PARTY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitPayment.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitPayment.php index 6595c7f2ac..f05674eb13 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitPayment.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitPayment.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -82,10 +82,6 @@ class FHIRExplanationOfBenefitPayment extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_EXPLANATION_OF_BENEFIT_DOT_PAYMENT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ADJUSTMENT = 'adjustment'; const FIELD_ADJUSTMENT_EXT = '_adjustment'; const FIELD_ADJUSTMENT_REASON = 'adjustmentReason'; @@ -168,6 +164,9 @@ class FHIRExplanationOfBenefitPayment extends FHIRBackboneElement */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRExplanationOfBenefitPayment Constructor * @param null|array $data @@ -190,8 +189,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ADJUSTMENT] instanceof FHIRMoney) { $this->setAdjustment($data[self::FIELD_ADJUSTMENT]); - } elseif ($ext && is_scalar($data[self::FIELD_ADJUSTMENT])) { - $this->setAdjustment(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_ADJUSTMENT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ADJUSTMENT])) { + $this->setAdjustment(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_ADJUSTMENT]] + $ext)); + } else if (is_array($data[self::FIELD_ADJUSTMENT])) { + $this->setAdjustment(new FHIRMoney(array_merge($ext, $data[self::FIELD_ADJUSTMENT]))); + } } else { $this->setAdjustment(new FHIRMoney($data[self::FIELD_ADJUSTMENT])); } @@ -209,8 +212,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_AMOUNT] instanceof FHIRMoney) { $this->setAmount($data[self::FIELD_AMOUNT]); - } elseif ($ext && is_scalar($data[self::FIELD_AMOUNT])) { - $this->setAmount(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_AMOUNT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_AMOUNT])) { + $this->setAmount(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_AMOUNT]] + $ext)); + } else if (is_array($data[self::FIELD_AMOUNT])) { + $this->setAmount(new FHIRMoney(array_merge($ext, $data[self::FIELD_AMOUNT]))); + } } else { $this->setAmount(new FHIRMoney($data[self::FIELD_AMOUNT])); } @@ -221,8 +228,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATE] instanceof FHIRDate) { $this->setDate($data[self::FIELD_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_DATE])) { - $this->setDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDate(array_merge($ext, $data[self::FIELD_DATE]))); + } } else { $this->setDate(new FHIRDate($data[self::FIELD_DATE])); } @@ -233,8 +244,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->setIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { - $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_IDENTIFIER]))); + } } else { $this->setIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); } @@ -566,26 +581,21 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getAdjustment())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ADJUSTMENT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getAdjustmentReason())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ADJUSTMENT_REASON, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getAmount())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AMOUNT, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DATE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -599,20 +609,51 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getAdjustment())) { - $a[self::FIELD_ADJUSTMENT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ADJUSTMENT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ADJUSTMENT_EXT] = $enc; + } + } else { + $a[self::FIELD_ADJUSTMENT] = $v; + } } if (null !== ($v = $this->getAdjustmentReason())) { $a[self::FIELD_ADJUSTMENT_REASON] = $v; } if (null !== ($v = $this->getAmount())) { - $a[self::FIELD_AMOUNT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_AMOUNT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_AMOUNT_EXT] = $enc; + } + } else { + $a[self::FIELD_AMOUNT] = $v; + } } if (null !== ($v = $this->getDate())) { - $a[self::FIELD_DATE] = $v->getValue(); - $a[self::FIELD_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_DATE] = $v; + } } if (null !== ($v = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_IDENTIFIER] = $v; + } } if (null !== ($v = $this->getType())) { $a[self::FIELD_TYPE] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitProcedure.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitProcedure.php index 6247ff8a2f..f6ea01843d 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitProcedure.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitProcedure.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -82,10 +82,6 @@ class FHIRExplanationOfBenefitProcedure extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_EXPLANATION_OF_BENEFIT_DOT_PROCEDURE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DATE = 'date'; const FIELD_DATE_EXT = '_date'; const FIELD_PROCEDURE_CODEABLE_CONCEPT = 'procedureCodeableConcept'; @@ -168,6 +164,9 @@ class FHIRExplanationOfBenefitProcedure extends FHIRBackboneElement */ protected $udi = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRExplanationOfBenefitProcedure Constructor * @param null|array $data @@ -190,8 +189,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATE] instanceof FHIRDateTime) { $this->setDate($data[self::FIELD_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_DATE])) { - $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime(array_merge($ext, $data[self::FIELD_DATE]))); + } } else { $this->setDate(new FHIRDateTime($data[self::FIELD_DATE])); } @@ -216,8 +219,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SEQUENCE] instanceof FHIRPositiveInt) { $this->setSequence($data[self::FIELD_SEQUENCE]); - } elseif ($ext && is_scalar($data[self::FIELD_SEQUENCE])) { - $this->setSequence(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_SEQUENCE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SEQUENCE])) { + $this->setSequence(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_SEQUENCE]] + $ext)); + } else if (is_array($data[self::FIELD_SEQUENCE])) { + $this->setSequence(new FHIRPositiveInt(array_merge($ext, $data[self::FIELD_SEQUENCE]))); + } } else { $this->setSequence(new FHIRPositiveInt($data[self::FIELD_SEQUENCE])); } @@ -225,6 +232,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_TYPE])) { if (is_array($data[self::FIELD_TYPE])) { foreach($data[self::FIELD_TYPE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addType($v); } else { @@ -240,6 +250,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_UDI])) { if (is_array($data[self::FIELD_UDI])) { foreach($data[self::FIELD_UDI] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addUdi($v); } else { @@ -647,18 +660,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DATE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getProcedureCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PROCEDURE_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getProcedureReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PROCEDURE_REFERENCE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getSequence())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SEQUENCE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getType())) { foreach($vs as $v) { if (null === $v) { @@ -676,6 +686,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_UDI, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } @@ -686,8 +697,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getDate())) { - $a[self::FIELD_DATE] = $v->getValue(); - $a[self::FIELD_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_DATE] = $v; + } } if (null !== ($v = $this->getProcedureCodeableConcept())) { $a[self::FIELD_PROCEDURE_CODEABLE_CONCEPT] = $v; @@ -696,8 +714,15 @@ public function jsonSerialize() $a[self::FIELD_PROCEDURE_REFERENCE] = $v; } if (null !== ($v = $this->getSequence())) { - $a[self::FIELD_SEQUENCE] = $v->getValue(); - $a[self::FIELD_SEQUENCE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SEQUENCE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SEQUENCE_EXT] = $enc; + } + } else { + $a[self::FIELD_SEQUENCE] = $v; + } } if ([] !== ($vs = $this->getType())) { $a[self::FIELD_TYPE] = $vs; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitProcessNote.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitProcessNote.php index 13e6fc64aa..17ed8f21bb 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitProcessNote.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitProcessNote.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -82,10 +82,6 @@ class FHIRExplanationOfBenefitProcessNote extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_EXPLANATION_OF_BENEFIT_DOT_PROCESS_NOTE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_LANGUAGE = 'language'; const FIELD_NUMBER = 'number'; const FIELD_NUMBER_EXT = '_number'; @@ -137,6 +133,9 @@ class FHIRExplanationOfBenefitProcessNote extends FHIRBackboneElement */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRExplanationOfBenefitProcessNote Constructor * @param null|array $data @@ -166,8 +165,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NUMBER] instanceof FHIRPositiveInt) { $this->setNumber($data[self::FIELD_NUMBER]); - } elseif ($ext && is_scalar($data[self::FIELD_NUMBER])) { - $this->setNumber(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_NUMBER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NUMBER])) { + $this->setNumber(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_NUMBER]] + $ext)); + } else if (is_array($data[self::FIELD_NUMBER])) { + $this->setNumber(new FHIRPositiveInt(array_merge($ext, $data[self::FIELD_NUMBER]))); + } } else { $this->setNumber(new FHIRPositiveInt($data[self::FIELD_NUMBER])); } @@ -178,8 +181,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TEXT] instanceof FHIRString) { $this->setText($data[self::FIELD_TEXT]); - } elseif ($ext && is_scalar($data[self::FIELD_TEXT])) { - $this->setText(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TEXT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TEXT])) { + $this->setText(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TEXT]] + $ext)); + } else if (is_array($data[self::FIELD_TEXT])) { + $this->setText(new FHIRString(array_merge($ext, $data[self::FIELD_TEXT]))); + } } else { $this->setText(new FHIRString($data[self::FIELD_TEXT])); } @@ -190,8 +197,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TYPE] instanceof FHIRNoteType) { $this->setType($data[self::FIELD_TYPE]); - } elseif ($ext && is_scalar($data[self::FIELD_TYPE])) { - $this->setType(new FHIRNoteType([FHIRNoteType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TYPE])) { + $this->setType(new FHIRNoteType([FHIRNoteType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } else if (is_array($data[self::FIELD_TYPE])) { + $this->setType(new FHIRNoteType(array_merge($ext, $data[self::FIELD_TYPE]))); + } } else { $this->setType(new FHIRNoteType($data[self::FIELD_TYPE])); } @@ -449,7 +460,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getLanguage())) { $v->xmlSerialize($sxe->addChild(self::FIELD_LANGUAGE, null, $v->_getFHIRXMLNamespace())); } @@ -459,7 +469,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getText())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TEXT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -476,15 +485,37 @@ public function jsonSerialize() $a[self::FIELD_LANGUAGE] = $v; } if (null !== ($v = $this->getNumber())) { - $a[self::FIELD_NUMBER] = $v->getValue(); - $a[self::FIELD_NUMBER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NUMBER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NUMBER_EXT] = $enc; + } + } else { + $a[self::FIELD_NUMBER] = $v; + } } if (null !== ($v = $this->getText())) { - $a[self::FIELD_TEXT] = $v->getValue(); - $a[self::FIELD_TEXT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TEXT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TEXT_EXT] = $enc; + } + } else { + $a[self::FIELD_TEXT] = $v; + } } if (null !== ($v = $this->getType())) { - $a[self::FIELD_TYPE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TYPE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TYPE_EXT] = $enc; + } + } else { + $a[self::FIELD_TYPE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitRelated.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitRelated.php index a571f83e7d..3d45a283c9 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitRelated.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitRelated.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -81,10 +81,6 @@ class FHIRExplanationOfBenefitRelated extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_EXPLANATION_OF_BENEFIT_DOT_RELATED; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CLAIM = 'claim'; const FIELD_REFERENCE = 'reference'; const FIELD_REFERENCE_EXT = '_reference'; @@ -126,6 +122,9 @@ class FHIRExplanationOfBenefitRelated extends FHIRBackboneElement */ protected $relationship = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRExplanationOfBenefitRelated Constructor * @param null|array $data @@ -155,8 +154,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_REFERENCE] instanceof FHIRIdentifier) { $this->setReference($data[self::FIELD_REFERENCE]); - } elseif ($ext && is_scalar($data[self::FIELD_REFERENCE])) { - $this->setReference(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_REFERENCE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_REFERENCE])) { + $this->setReference(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_REFERENCE]] + $ext)); + } else if (is_array($data[self::FIELD_REFERENCE])) { + $this->setReference(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_REFERENCE]))); + } } else { $this->setReference(new FHIRIdentifier($data[self::FIELD_REFERENCE])); } @@ -374,15 +377,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getClaim())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CLAIM, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REFERENCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRelationship())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RELATIONSHIP, null, $v->_getFHIRXMLNamespace())); } @@ -399,7 +399,15 @@ public function jsonSerialize() $a[self::FIELD_CLAIM] = $v; } if (null !== ($v = $this->getReference())) { - $a[self::FIELD_REFERENCE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_REFERENCE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_REFERENCE_EXT] = $enc; + } + } else { + $a[self::FIELD_REFERENCE] = $v; + } } if (null !== ($v = $this->getRelationship())) { $a[self::FIELD_RELATIONSHIP] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitSubDetail.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitSubDetail.php index b5fee56e5f..61e8e39c26 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitSubDetail.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitSubDetail.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -84,10 +84,6 @@ class FHIRExplanationOfBenefitSubDetail extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_EXPLANATION_OF_BENEFIT_DOT_SUB_DETAIL; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ADJUDICATION = 'adjudication'; const FIELD_ADJUDICATION_EXT = '_adjudication'; const FIELD_CATEGORY = 'category'; @@ -270,6 +266,9 @@ class FHIRExplanationOfBenefitSubDetail extends FHIRBackboneElement */ protected $unitPrice = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRExplanationOfBenefitSubDetail Constructor * @param null|array $data @@ -292,17 +291,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_ADJUDICATION])) { foreach($data[self::FIELD_ADJUDICATION] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRExplanationOfBenefitAdjudication) { $this->addAdjudication($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addAdjudication(new FHIRExplanationOfBenefitAdjudication([FHIRExplanationOfBenefitAdjudication::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addAdjudication(new FHIRExplanationOfBenefitAdjudication([FHIRExplanationOfBenefitAdjudication::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addAdjudication(new FHIRExplanationOfBenefitAdjudication(array_merge($v, $ext[$i]))); + } } else { $this->addAdjudication(new FHIRExplanationOfBenefitAdjudication($v)); } } } elseif ($data[self::FIELD_ADJUDICATION] instanceof FHIRExplanationOfBenefitAdjudication) { $this->addAdjudication($data[self::FIELD_ADJUDICATION]); - } elseif ($ext && is_scalar($data[self::FIELD_ADJUDICATION])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_ADJUDICATION])) { $this->addAdjudication(new FHIRExplanationOfBenefitAdjudication([FHIRExplanationOfBenefitAdjudication::FIELD_VALUE => $data[self::FIELD_ADJUDICATION]] + $ext)); } else { $this->addAdjudication(new FHIRExplanationOfBenefitAdjudication($data[self::FIELD_ADJUDICATION])); @@ -321,8 +327,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_FACTOR] instanceof FHIRDecimal) { $this->setFactor($data[self::FIELD_FACTOR]); - } elseif ($ext && is_scalar($data[self::FIELD_FACTOR])) { - $this->setFactor(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_FACTOR]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_FACTOR])) { + $this->setFactor(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_FACTOR]] + $ext)); + } else if (is_array($data[self::FIELD_FACTOR])) { + $this->setFactor(new FHIRDecimal(array_merge($ext, $data[self::FIELD_FACTOR]))); + } } else { $this->setFactor(new FHIRDecimal($data[self::FIELD_FACTOR])); } @@ -330,6 +340,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_MODIFIER])) { if (is_array($data[self::FIELD_MODIFIER])) { foreach($data[self::FIELD_MODIFIER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addModifier($v); } else { @@ -348,8 +361,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NET] instanceof FHIRMoney) { $this->setNet($data[self::FIELD_NET]); - } elseif ($ext && is_scalar($data[self::FIELD_NET])) { - $this->setNet(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_NET]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NET])) { + $this->setNet(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_NET]] + $ext)); + } else if (is_array($data[self::FIELD_NET])) { + $this->setNet(new FHIRMoney(array_merge($ext, $data[self::FIELD_NET]))); + } } else { $this->setNet(new FHIRMoney($data[self::FIELD_NET])); } @@ -360,17 +377,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_NOTE_NUMBER])) { foreach($data[self::FIELD_NOTE_NUMBER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRPositiveInt) { $this->addNoteNumber($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addNoteNumber(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addNoteNumber(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addNoteNumber(new FHIRPositiveInt(array_merge($v, $ext[$i]))); + } } else { $this->addNoteNumber(new FHIRPositiveInt($v)); } } } elseif ($data[self::FIELD_NOTE_NUMBER] instanceof FHIRPositiveInt) { $this->addNoteNumber($data[self::FIELD_NOTE_NUMBER]); - } elseif ($ext && is_scalar($data[self::FIELD_NOTE_NUMBER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_NOTE_NUMBER])) { $this->addNoteNumber(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_NOTE_NUMBER]] + $ext)); } else { $this->addNoteNumber(new FHIRPositiveInt($data[self::FIELD_NOTE_NUMBER])); @@ -386,6 +410,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PROGRAM_CODE])) { if (is_array($data[self::FIELD_PROGRAM_CODE])) { foreach($data[self::FIELD_PROGRAM_CODE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addProgramCode($v); } else { @@ -404,8 +431,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_QUANTITY] instanceof FHIRQuantity) { $this->setQuantity($data[self::FIELD_QUANTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_QUANTITY])) { - $this->setQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_QUANTITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_QUANTITY])) { + $this->setQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_QUANTITY])) { + $this->setQuantity(new FHIRQuantity(array_merge($ext, $data[self::FIELD_QUANTITY]))); + } } else { $this->setQuantity(new FHIRQuantity($data[self::FIELD_QUANTITY])); } @@ -423,8 +454,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SEQUENCE] instanceof FHIRPositiveInt) { $this->setSequence($data[self::FIELD_SEQUENCE]); - } elseif ($ext && is_scalar($data[self::FIELD_SEQUENCE])) { - $this->setSequence(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_SEQUENCE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SEQUENCE])) { + $this->setSequence(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_SEQUENCE]] + $ext)); + } else if (is_array($data[self::FIELD_SEQUENCE])) { + $this->setSequence(new FHIRPositiveInt(array_merge($ext, $data[self::FIELD_SEQUENCE]))); + } } else { $this->setSequence(new FHIRPositiveInt($data[self::FIELD_SEQUENCE])); } @@ -432,6 +467,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_UDI])) { if (is_array($data[self::FIELD_UDI])) { foreach($data[self::FIELD_UDI] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addUdi($v); } else { @@ -450,8 +488,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_UNIT_PRICE] instanceof FHIRMoney) { $this->setUnitPrice($data[self::FIELD_UNIT_PRICE]); - } elseif ($ext && is_scalar($data[self::FIELD_UNIT_PRICE])) { - $this->setUnitPrice(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_UNIT_PRICE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_UNIT_PRICE])) { + $this->setUnitPrice(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_UNIT_PRICE]] + $ext)); + } else if (is_array($data[self::FIELD_UNIT_PRICE])) { + $this->setUnitPrice(new FHIRMoney(array_merge($ext, $data[self::FIELD_UNIT_PRICE]))); + } } else { $this->setUnitPrice(new FHIRMoney($data[self::FIELD_UNIT_PRICE])); } @@ -1199,7 +1241,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getAdjudication())) { foreach($vs as $v) { if (null === $v) { @@ -1215,7 +1256,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getFactor())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FACTOR, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getModifier())) { foreach($vs as $v) { if (null === $v) { @@ -1240,7 +1280,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getProductOrService())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PRODUCT_OR_SERVICE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getProgramCode())) { foreach($vs as $v) { if (null === $v) { @@ -1253,14 +1292,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_QUANTITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRevenue())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REVENUE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getSequence())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SEQUENCE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getUdi())) { foreach($vs as $v) { if (null === $v) { @@ -1283,20 +1320,51 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if ([] !== ($vs = $this->getAdjudication())) { - $a[self::FIELD_ADJUDICATION] = $vs; + $a[self::FIELD_ADJUDICATION] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ADJUDICATION][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ADJUDICATION_EXT][] = $enc; + } else { + $a[self::FIELD_ADJUDICATION_EXT][] = null; + } + } else { + $a[self::FIELD_ADJUDICATION][] = $v; + } + } } if (null !== ($v = $this->getCategory())) { $a[self::FIELD_CATEGORY] = $v; } if (null !== ($v = $this->getFactor())) { - $a[self::FIELD_FACTOR] = $v->getValue(); - $a[self::FIELD_FACTOR_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FACTOR] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FACTOR_EXT] = $enc; + } + } else { + $a[self::FIELD_FACTOR] = $v; + } } if ([] !== ($vs = $this->getModifier())) { $a[self::FIELD_MODIFIER] = $vs; } if (null !== ($v = $this->getNet())) { - $a[self::FIELD_NET] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NET] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NET_EXT] = $enc; + } + } else { + $a[self::FIELD_NET] = $v; + } } if ([] !== ($vs = $this->getNoteNumber())) { $a[self::FIELD_NOTE_NUMBER] = []; @@ -1304,8 +1372,17 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_NOTE_NUMBER][] = $v->getValue(); - $a[self::FIELD_NOTE_NUMBER_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NOTE_NUMBER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NOTE_NUMBER_EXT][] = $enc; + } else { + $a[self::FIELD_NOTE_NUMBER_EXT][] = null; + } + } else { + $a[self::FIELD_NOTE_NUMBER][] = $v; + } } } if (null !== ($v = $this->getProductOrService())) { @@ -1315,20 +1392,43 @@ public function jsonSerialize() $a[self::FIELD_PROGRAM_CODE] = $vs; } if (null !== ($v = $this->getQuantity())) { - $a[self::FIELD_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_QUANTITY] = $v; + } } if (null !== ($v = $this->getRevenue())) { $a[self::FIELD_REVENUE] = $v; } if (null !== ($v = $this->getSequence())) { - $a[self::FIELD_SEQUENCE] = $v->getValue(); - $a[self::FIELD_SEQUENCE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SEQUENCE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SEQUENCE_EXT] = $enc; + } + } else { + $a[self::FIELD_SEQUENCE] = $v; + } } if ([] !== ($vs = $this->getUdi())) { $a[self::FIELD_UDI] = $vs; } if (null !== ($v = $this->getUnitPrice())) { - $a[self::FIELD_UNIT_PRICE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_UNIT_PRICE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_UNIT_PRICE_EXT] = $enc; + } + } else { + $a[self::FIELD_UNIT_PRICE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitSubDetail1.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitSubDetail1.php index 769790e0b8..f5fc93bdd4 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitSubDetail1.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitSubDetail1.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -83,10 +83,6 @@ class FHIRExplanationOfBenefitSubDetail1 extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_EXPLANATION_OF_BENEFIT_DOT_SUB_DETAIL_1; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ADJUDICATION = 'adjudication'; const FIELD_ADJUDICATION_EXT = '_adjudication'; const FIELD_FACTOR = 'factor'; @@ -203,6 +199,9 @@ class FHIRExplanationOfBenefitSubDetail1 extends FHIRBackboneElement */ protected $unitPrice = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRExplanationOfBenefitSubDetail1 Constructor * @param null|array $data @@ -225,17 +224,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_ADJUDICATION])) { foreach($data[self::FIELD_ADJUDICATION] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRExplanationOfBenefitAdjudication) { $this->addAdjudication($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addAdjudication(new FHIRExplanationOfBenefitAdjudication([FHIRExplanationOfBenefitAdjudication::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addAdjudication(new FHIRExplanationOfBenefitAdjudication([FHIRExplanationOfBenefitAdjudication::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addAdjudication(new FHIRExplanationOfBenefitAdjudication(array_merge($v, $ext[$i]))); + } } else { $this->addAdjudication(new FHIRExplanationOfBenefitAdjudication($v)); } } } elseif ($data[self::FIELD_ADJUDICATION] instanceof FHIRExplanationOfBenefitAdjudication) { $this->addAdjudication($data[self::FIELD_ADJUDICATION]); - } elseif ($ext && is_scalar($data[self::FIELD_ADJUDICATION])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_ADJUDICATION])) { $this->addAdjudication(new FHIRExplanationOfBenefitAdjudication([FHIRExplanationOfBenefitAdjudication::FIELD_VALUE => $data[self::FIELD_ADJUDICATION]] + $ext)); } else { $this->addAdjudication(new FHIRExplanationOfBenefitAdjudication($data[self::FIELD_ADJUDICATION])); @@ -247,8 +253,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_FACTOR] instanceof FHIRDecimal) { $this->setFactor($data[self::FIELD_FACTOR]); - } elseif ($ext && is_scalar($data[self::FIELD_FACTOR])) { - $this->setFactor(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_FACTOR]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_FACTOR])) { + $this->setFactor(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_FACTOR]] + $ext)); + } else if (is_array($data[self::FIELD_FACTOR])) { + $this->setFactor(new FHIRDecimal(array_merge($ext, $data[self::FIELD_FACTOR]))); + } } else { $this->setFactor(new FHIRDecimal($data[self::FIELD_FACTOR])); } @@ -256,6 +266,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_MODIFIER])) { if (is_array($data[self::FIELD_MODIFIER])) { foreach($data[self::FIELD_MODIFIER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addModifier($v); } else { @@ -274,8 +287,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NET] instanceof FHIRMoney) { $this->setNet($data[self::FIELD_NET]); - } elseif ($ext && is_scalar($data[self::FIELD_NET])) { - $this->setNet(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_NET]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NET])) { + $this->setNet(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_NET]] + $ext)); + } else if (is_array($data[self::FIELD_NET])) { + $this->setNet(new FHIRMoney(array_merge($ext, $data[self::FIELD_NET]))); + } } else { $this->setNet(new FHIRMoney($data[self::FIELD_NET])); } @@ -286,17 +303,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_NOTE_NUMBER])) { foreach($data[self::FIELD_NOTE_NUMBER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRPositiveInt) { $this->addNoteNumber($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addNoteNumber(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addNoteNumber(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addNoteNumber(new FHIRPositiveInt(array_merge($v, $ext[$i]))); + } } else { $this->addNoteNumber(new FHIRPositiveInt($v)); } } } elseif ($data[self::FIELD_NOTE_NUMBER] instanceof FHIRPositiveInt) { $this->addNoteNumber($data[self::FIELD_NOTE_NUMBER]); - } elseif ($ext && is_scalar($data[self::FIELD_NOTE_NUMBER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_NOTE_NUMBER])) { $this->addNoteNumber(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_NOTE_NUMBER]] + $ext)); } else { $this->addNoteNumber(new FHIRPositiveInt($data[self::FIELD_NOTE_NUMBER])); @@ -315,8 +339,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_QUANTITY] instanceof FHIRQuantity) { $this->setQuantity($data[self::FIELD_QUANTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_QUANTITY])) { - $this->setQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_QUANTITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_QUANTITY])) { + $this->setQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_QUANTITY])) { + $this->setQuantity(new FHIRQuantity(array_merge($ext, $data[self::FIELD_QUANTITY]))); + } } else { $this->setQuantity(new FHIRQuantity($data[self::FIELD_QUANTITY])); } @@ -327,8 +355,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_UNIT_PRICE] instanceof FHIRMoney) { $this->setUnitPrice($data[self::FIELD_UNIT_PRICE]); - } elseif ($ext && is_scalar($data[self::FIELD_UNIT_PRICE])) { - $this->setUnitPrice(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_UNIT_PRICE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_UNIT_PRICE])) { + $this->setUnitPrice(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_UNIT_PRICE]] + $ext)); + } else if (is_array($data[self::FIELD_UNIT_PRICE])) { + $this->setUnitPrice(new FHIRMoney(array_merge($ext, $data[self::FIELD_UNIT_PRICE]))); + } } else { $this->setUnitPrice(new FHIRMoney($data[self::FIELD_UNIT_PRICE])); } @@ -833,7 +865,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getAdjudication())) { foreach($vs as $v) { if (null === $v) { @@ -842,10 +873,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_ADJUDICATION, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getFactor())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FACTOR, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getModifier())) { foreach($vs as $v) { if (null === $v) { @@ -870,11 +901,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getProductOrService())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PRODUCT_OR_SERVICE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_QUANTITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getUnitPrice())) { $v->xmlSerialize($sxe->addChild(self::FIELD_UNIT_PRICE, null, $v->_getFHIRXMLNamespace())); } @@ -888,17 +917,48 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if ([] !== ($vs = $this->getAdjudication())) { - $a[self::FIELD_ADJUDICATION] = $vs; + $a[self::FIELD_ADJUDICATION] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ADJUDICATION][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ADJUDICATION_EXT][] = $enc; + } else { + $a[self::FIELD_ADJUDICATION_EXT][] = null; + } + } else { + $a[self::FIELD_ADJUDICATION][] = $v; + } + } } if (null !== ($v = $this->getFactor())) { - $a[self::FIELD_FACTOR] = $v->getValue(); - $a[self::FIELD_FACTOR_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FACTOR] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FACTOR_EXT] = $enc; + } + } else { + $a[self::FIELD_FACTOR] = $v; + } } if ([] !== ($vs = $this->getModifier())) { $a[self::FIELD_MODIFIER] = $vs; } if (null !== ($v = $this->getNet())) { - $a[self::FIELD_NET] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NET] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NET_EXT] = $enc; + } + } else { + $a[self::FIELD_NET] = $v; + } } if ([] !== ($vs = $this->getNoteNumber())) { $a[self::FIELD_NOTE_NUMBER] = []; @@ -906,18 +966,43 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_NOTE_NUMBER][] = $v->getValue(); - $a[self::FIELD_NOTE_NUMBER_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NOTE_NUMBER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NOTE_NUMBER_EXT][] = $enc; + } else { + $a[self::FIELD_NOTE_NUMBER_EXT][] = null; + } + } else { + $a[self::FIELD_NOTE_NUMBER][] = $v; + } } } if (null !== ($v = $this->getProductOrService())) { $a[self::FIELD_PRODUCT_OR_SERVICE] = $v; } if (null !== ($v = $this->getQuantity())) { - $a[self::FIELD_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_QUANTITY] = $v; + } } if (null !== ($v = $this->getUnitPrice())) { - $a[self::FIELD_UNIT_PRICE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_UNIT_PRICE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_UNIT_PRICE_EXT] = $enc; + } + } else { + $a[self::FIELD_UNIT_PRICE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitSupportingInfo.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitSupportingInfo.php index 3f29862862..052784b510 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitSupportingInfo.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitSupportingInfo.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -88,10 +88,6 @@ class FHIRExplanationOfBenefitSupportingInfo extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_EXPLANATION_OF_BENEFIT_DOT_SUPPORTING_INFO; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CATEGORY = 'category'; const FIELD_CODE = 'code'; const FIELD_REASON = 'reason'; @@ -250,6 +246,9 @@ class FHIRExplanationOfBenefitSupportingInfo extends FHIRBackboneElement */ protected $valueString = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRExplanationOfBenefitSupportingInfo Constructor * @param null|array $data @@ -293,8 +292,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SEQUENCE] instanceof FHIRPositiveInt) { $this->setSequence($data[self::FIELD_SEQUENCE]); - } elseif ($ext && is_scalar($data[self::FIELD_SEQUENCE])) { - $this->setSequence(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_SEQUENCE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SEQUENCE])) { + $this->setSequence(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_SEQUENCE]] + $ext)); + } else if (is_array($data[self::FIELD_SEQUENCE])) { + $this->setSequence(new FHIRPositiveInt(array_merge($ext, $data[self::FIELD_SEQUENCE]))); + } } else { $this->setSequence(new FHIRPositiveInt($data[self::FIELD_SEQUENCE])); } @@ -305,8 +308,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TIMING_DATE] instanceof FHIRDate) { $this->setTimingDate($data[self::FIELD_TIMING_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_TIMING_DATE])) { - $this->setTimingDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_TIMING_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TIMING_DATE])) { + $this->setTimingDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_TIMING_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_TIMING_DATE])) { + $this->setTimingDate(new FHIRDate(array_merge($ext, $data[self::FIELD_TIMING_DATE]))); + } } else { $this->setTimingDate(new FHIRDate($data[self::FIELD_TIMING_DATE])); } @@ -331,8 +338,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_BOOLEAN] instanceof FHIRBoolean) { $this->setValueBoolean($data[self::FIELD_VALUE_BOOLEAN]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_BOOLEAN])) { - $this->setValueBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_VALUE_BOOLEAN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_BOOLEAN])) { + $this->setValueBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_VALUE_BOOLEAN]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_BOOLEAN])) { + $this->setValueBoolean(new FHIRBoolean(array_merge($ext, $data[self::FIELD_VALUE_BOOLEAN]))); + } } else { $this->setValueBoolean(new FHIRBoolean($data[self::FIELD_VALUE_BOOLEAN])); } @@ -343,8 +354,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_QUANTITY] instanceof FHIRQuantity) { $this->setValueQuantity($data[self::FIELD_VALUE_QUANTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_QUANTITY])) { - $this->setValueQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_VALUE_QUANTITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_QUANTITY])) { + $this->setValueQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_VALUE_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_QUANTITY])) { + $this->setValueQuantity(new FHIRQuantity(array_merge($ext, $data[self::FIELD_VALUE_QUANTITY]))); + } } else { $this->setValueQuantity(new FHIRQuantity($data[self::FIELD_VALUE_QUANTITY])); } @@ -362,8 +377,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_STRING] instanceof FHIRString) { $this->setValueString($data[self::FIELD_VALUE_STRING]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_STRING])) { - $this->setValueString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VALUE_STRING]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_STRING])) { + $this->setValueString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VALUE_STRING]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_STRING])) { + $this->setValueString(new FHIRString(array_merge($ext, $data[self::FIELD_VALUE_STRING]))); + } } else { $this->setValueString(new FHIRString($data[self::FIELD_VALUE_STRING])); } @@ -916,15 +935,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getCategory())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CATEGORY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getReason())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REASON, null, $v->_getFHIRXMLNamespace())); } @@ -934,22 +950,18 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getTimingDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TIMING_DATE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getTimingPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TIMING_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueAttachment())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_ATTACHMENT, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getValueBoolean())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_BOOLEAN, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_QUANTITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_REFERENCE, null, $v->_getFHIRXMLNamespace())); } @@ -975,12 +987,26 @@ public function jsonSerialize() $a[self::FIELD_REASON] = $v; } if (null !== ($v = $this->getSequence())) { - $a[self::FIELD_SEQUENCE] = $v->getValue(); - $a[self::FIELD_SEQUENCE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SEQUENCE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SEQUENCE_EXT] = $enc; + } + } else { + $a[self::FIELD_SEQUENCE] = $v; + } } if (null !== ($v = $this->getTimingDate())) { - $a[self::FIELD_TIMING_DATE] = $v->getValue(); - $a[self::FIELD_TIMING_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TIMING_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TIMING_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_TIMING_DATE] = $v; + } } if (null !== ($v = $this->getTimingPeriod())) { $a[self::FIELD_TIMING_PERIOD] = $v; @@ -989,18 +1015,40 @@ public function jsonSerialize() $a[self::FIELD_VALUE_ATTACHMENT] = $v; } if (null !== ($v = $this->getValueBoolean())) { - $a[self::FIELD_VALUE_BOOLEAN] = $v->getValue(); - $a[self::FIELD_VALUE_BOOLEAN_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_BOOLEAN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_BOOLEAN_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_BOOLEAN] = $v; + } } if (null !== ($v = $this->getValueQuantity())) { - $a[self::FIELD_VALUE_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_QUANTITY] = $v; + } } if (null !== ($v = $this->getValueReference())) { $a[self::FIELD_VALUE_REFERENCE] = $v; } if (null !== ($v = $this->getValueString())) { - $a[self::FIELD_VALUE_STRING] = $v->getValue(); - $a[self::FIELD_VALUE_STRING_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_STRING] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_STRING_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_STRING] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitTotal.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitTotal.php index 6348bdded7..8ca7b5a68b 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitTotal.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitTotal.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRExplanationOfBenefitTotal extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_EXPLANATION_OF_BENEFIT_DOT_TOTAL; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_AMOUNT = 'amount'; const FIELD_AMOUNT_EXT = '_amount'; const FIELD_CATEGORY = 'category'; @@ -115,6 +111,9 @@ class FHIRExplanationOfBenefitTotal extends FHIRBackboneElement */ protected $category = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRExplanationOfBenefitTotal Constructor * @param null|array $data @@ -137,8 +136,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_AMOUNT] instanceof FHIRMoney) { $this->setAmount($data[self::FIELD_AMOUNT]); - } elseif ($ext && is_scalar($data[self::FIELD_AMOUNT])) { - $this->setAmount(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_AMOUNT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_AMOUNT])) { + $this->setAmount(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_AMOUNT]] + $ext)); + } else if (is_array($data[self::FIELD_AMOUNT])) { + $this->setAmount(new FHIRMoney(array_merge($ext, $data[self::FIELD_AMOUNT]))); + } } else { $this->setAmount(new FHIRMoney($data[self::FIELD_AMOUNT])); } @@ -327,11 +330,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getAmount())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AMOUNT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getCategory())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CATEGORY, null, $v->_getFHIRXMLNamespace())); } @@ -345,7 +346,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getAmount())) { - $a[self::FIELD_AMOUNT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_AMOUNT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_AMOUNT_EXT] = $enc; + } + } else { + $a[self::FIELD_AMOUNT] = $v; + } } if (null !== ($v = $this->getCategory())) { $a[self::FIELD_CATEGORY] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRFamilyMemberHistory/FHIRFamilyMemberHistoryCondition.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRFamilyMemberHistory/FHIRFamilyMemberHistoryCondition.php index d4adc2934a..876ea61e9d 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRFamilyMemberHistory/FHIRFamilyMemberHistoryCondition.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRFamilyMemberHistory/FHIRFamilyMemberHistoryCondition.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -84,15 +84,12 @@ class FHIRFamilyMemberHistoryCondition extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_FAMILY_MEMBER_HISTORY_DOT_CONDITION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CODE = 'code'; const FIELD_CONTRIBUTED_TO_DEATH = 'contributedToDeath'; const FIELD_CONTRIBUTED_TO_DEATH_EXT = '_contributedToDeath'; const FIELD_NOTE = 'note'; const FIELD_ONSET_AGE = 'onsetAge'; + const FIELD_ONSET_AGE_EXT = '_onsetAge'; const FIELD_ONSET_PERIOD = 'onsetPeriod'; const FIELD_ONSET_RANGE = 'onsetRange'; const FIELD_ONSET_STRING = 'onsetString'; @@ -201,6 +198,9 @@ class FHIRFamilyMemberHistoryCondition extends FHIRBackboneElement */ protected $outcome = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRFamilyMemberHistoryCondition Constructor * @param null|array $data @@ -230,8 +230,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CONTRIBUTED_TO_DEATH] instanceof FHIRBoolean) { $this->setContributedToDeath($data[self::FIELD_CONTRIBUTED_TO_DEATH]); - } elseif ($ext && is_scalar($data[self::FIELD_CONTRIBUTED_TO_DEATH])) { - $this->setContributedToDeath(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_CONTRIBUTED_TO_DEATH]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CONTRIBUTED_TO_DEATH])) { + $this->setContributedToDeath(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_CONTRIBUTED_TO_DEATH]] + $ext)); + } else if (is_array($data[self::FIELD_CONTRIBUTED_TO_DEATH])) { + $this->setContributedToDeath(new FHIRBoolean(array_merge($ext, $data[self::FIELD_CONTRIBUTED_TO_DEATH]))); + } } else { $this->setContributedToDeath(new FHIRBoolean($data[self::FIELD_CONTRIBUTED_TO_DEATH])); } @@ -239,6 +243,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_NOTE])) { if (is_array($data[self::FIELD_NOTE])) { foreach($data[self::FIELD_NOTE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRAnnotation) { $this->addNote($v); } else { @@ -252,8 +259,17 @@ public function __construct($data = null) } } if (isset($data[self::FIELD_ONSET_AGE])) { + $ext = (isset($data[self::FIELD_ONSET_AGE_EXT]) && is_array($data[self::FIELD_ONSET_AGE_EXT])) + ? $data[self::FIELD_ONSET_AGE_EXT] + : null; if ($data[self::FIELD_ONSET_AGE] instanceof FHIRAge) { $this->setOnsetAge($data[self::FIELD_ONSET_AGE]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ONSET_AGE])) { + $this->setOnsetAge(new FHIRAge([FHIRAge::FIELD_VALUE => $data[self::FIELD_ONSET_AGE]] + $ext)); + } else if (is_array($data[self::FIELD_ONSET_AGE])) { + $this->setOnsetAge(new FHIRAge(array_merge($ext, $data[self::FIELD_ONSET_AGE]))); + } } else { $this->setOnsetAge(new FHIRAge($data[self::FIELD_ONSET_AGE])); } @@ -278,8 +294,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ONSET_STRING] instanceof FHIRString) { $this->setOnsetString($data[self::FIELD_ONSET_STRING]); - } elseif ($ext && is_scalar($data[self::FIELD_ONSET_STRING])) { - $this->setOnsetString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_ONSET_STRING]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ONSET_STRING])) { + $this->setOnsetString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_ONSET_STRING]] + $ext)); + } else if (is_array($data[self::FIELD_ONSET_STRING])) { + $this->setOnsetString(new FHIRString(array_merge($ext, $data[self::FIELD_ONSET_STRING]))); + } } else { $this->setOnsetString(new FHIRString($data[self::FIELD_ONSET_STRING])); } @@ -735,14 +755,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getContributedToDeath())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CONTRIBUTED_TO_DEATH, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getNote())) { foreach($vs as $v) { if (null === $v) { @@ -755,18 +773,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getOnsetAge())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ONSET_AGE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOnsetPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ONSET_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOnsetRange())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ONSET_RANGE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getOnsetString())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ONSET_STRING, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOutcome())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OUTCOME, null, $v->_getFHIRXMLNamespace())); } @@ -783,14 +798,29 @@ public function jsonSerialize() $a[self::FIELD_CODE] = $v; } if (null !== ($v = $this->getContributedToDeath())) { - $a[self::FIELD_CONTRIBUTED_TO_DEATH] = $v->getValue(); - $a[self::FIELD_CONTRIBUTED_TO_DEATH_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CONTRIBUTED_TO_DEATH] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CONTRIBUTED_TO_DEATH_EXT] = $enc; + } + } else { + $a[self::FIELD_CONTRIBUTED_TO_DEATH] = $v; + } } if ([] !== ($vs = $this->getNote())) { $a[self::FIELD_NOTE] = $vs; } if (null !== ($v = $this->getOnsetAge())) { - $a[self::FIELD_ONSET_AGE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ONSET_AGE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ONSET_AGE_EXT] = $enc; + } + } else { + $a[self::FIELD_ONSET_AGE] = $v; + } } if (null !== ($v = $this->getOnsetPeriod())) { $a[self::FIELD_ONSET_PERIOD] = $v; @@ -799,8 +829,15 @@ public function jsonSerialize() $a[self::FIELD_ONSET_RANGE] = $v; } if (null !== ($v = $this->getOnsetString())) { - $a[self::FIELD_ONSET_STRING] = $v->getValue(); - $a[self::FIELD_ONSET_STRING_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ONSET_STRING] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ONSET_STRING_EXT] = $enc; + } + } else { + $a[self::FIELD_ONSET_STRING] = $v; + } } if (null !== ($v = $this->getOutcome())) { $a[self::FIELD_OUTCOME] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRGoal/FHIRGoalTarget.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRGoal/FHIRGoalTarget.php index 6da2a79404..d5488267c0 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRGoal/FHIRGoalTarget.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRGoal/FHIRGoalTarget.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -87,10 +87,6 @@ class FHIRGoalTarget extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_GOAL_DOT_TARGET; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DETAIL_BOOLEAN = 'detailBoolean'; const FIELD_DETAIL_BOOLEAN_EXT = '_detailBoolean'; const FIELD_DETAIL_CODEABLE_CONCEPT = 'detailCodeableConcept'; @@ -105,6 +101,7 @@ class FHIRGoalTarget extends FHIRBackboneElement const FIELD_DUE_DATE = 'dueDate'; const FIELD_DUE_DATE_EXT = '_dueDate'; const FIELD_DUE_DURATION = 'dueDuration'; + const FIELD_DUE_DURATION_EXT = '_dueDuration'; const FIELD_MEASURE = 'measure'; /** @@ -260,6 +257,9 @@ class FHIRGoalTarget extends FHIRBackboneElement */ protected $measure = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRGoalTarget Constructor * @param null|array $data @@ -282,8 +282,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DETAIL_BOOLEAN] instanceof FHIRBoolean) { $this->setDetailBoolean($data[self::FIELD_DETAIL_BOOLEAN]); - } elseif ($ext && is_scalar($data[self::FIELD_DETAIL_BOOLEAN])) { - $this->setDetailBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_DETAIL_BOOLEAN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DETAIL_BOOLEAN])) { + $this->setDetailBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_DETAIL_BOOLEAN]] + $ext)); + } else if (is_array($data[self::FIELD_DETAIL_BOOLEAN])) { + $this->setDetailBoolean(new FHIRBoolean(array_merge($ext, $data[self::FIELD_DETAIL_BOOLEAN]))); + } } else { $this->setDetailBoolean(new FHIRBoolean($data[self::FIELD_DETAIL_BOOLEAN])); } @@ -301,8 +305,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DETAIL_INTEGER] instanceof FHIRInteger) { $this->setDetailInteger($data[self::FIELD_DETAIL_INTEGER]); - } elseif ($ext && is_scalar($data[self::FIELD_DETAIL_INTEGER])) { - $this->setDetailInteger(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_DETAIL_INTEGER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DETAIL_INTEGER])) { + $this->setDetailInteger(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_DETAIL_INTEGER]] + $ext)); + } else if (is_array($data[self::FIELD_DETAIL_INTEGER])) { + $this->setDetailInteger(new FHIRInteger(array_merge($ext, $data[self::FIELD_DETAIL_INTEGER]))); + } } else { $this->setDetailInteger(new FHIRInteger($data[self::FIELD_DETAIL_INTEGER])); } @@ -313,8 +321,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DETAIL_QUANTITY] instanceof FHIRQuantity) { $this->setDetailQuantity($data[self::FIELD_DETAIL_QUANTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_DETAIL_QUANTITY])) { - $this->setDetailQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_DETAIL_QUANTITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DETAIL_QUANTITY])) { + $this->setDetailQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_DETAIL_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_DETAIL_QUANTITY])) { + $this->setDetailQuantity(new FHIRQuantity(array_merge($ext, $data[self::FIELD_DETAIL_QUANTITY]))); + } } else { $this->setDetailQuantity(new FHIRQuantity($data[self::FIELD_DETAIL_QUANTITY])); } @@ -339,8 +351,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DETAIL_STRING] instanceof FHIRString) { $this->setDetailString($data[self::FIELD_DETAIL_STRING]); - } elseif ($ext && is_scalar($data[self::FIELD_DETAIL_STRING])) { - $this->setDetailString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DETAIL_STRING]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DETAIL_STRING])) { + $this->setDetailString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DETAIL_STRING]] + $ext)); + } else if (is_array($data[self::FIELD_DETAIL_STRING])) { + $this->setDetailString(new FHIRString(array_merge($ext, $data[self::FIELD_DETAIL_STRING]))); + } } else { $this->setDetailString(new FHIRString($data[self::FIELD_DETAIL_STRING])); } @@ -351,15 +367,28 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DUE_DATE] instanceof FHIRDate) { $this->setDueDate($data[self::FIELD_DUE_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_DUE_DATE])) { - $this->setDueDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_DUE_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DUE_DATE])) { + $this->setDueDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_DUE_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_DUE_DATE])) { + $this->setDueDate(new FHIRDate(array_merge($ext, $data[self::FIELD_DUE_DATE]))); + } } else { $this->setDueDate(new FHIRDate($data[self::FIELD_DUE_DATE])); } } if (isset($data[self::FIELD_DUE_DURATION])) { + $ext = (isset($data[self::FIELD_DUE_DURATION_EXT]) && is_array($data[self::FIELD_DUE_DURATION_EXT])) + ? $data[self::FIELD_DUE_DURATION_EXT] + : null; if ($data[self::FIELD_DUE_DURATION] instanceof FHIRDuration) { $this->setDueDuration($data[self::FIELD_DUE_DURATION]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DUE_DURATION])) { + $this->setDueDuration(new FHIRDuration([FHIRDuration::FIELD_VALUE => $data[self::FIELD_DUE_DURATION]] + $ext)); + } else if (is_array($data[self::FIELD_DUE_DURATION])) { + $this->setDueDuration(new FHIRDuration(array_merge($ext, $data[self::FIELD_DUE_DURATION]))); + } } else { $this->setDueDuration(new FHIRDuration($data[self::FIELD_DUE_DURATION])); } @@ -935,22 +964,18 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDetailBoolean())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DETAIL_BOOLEAN, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDetailCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DETAIL_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getDetailInteger())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DETAIL_INTEGER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDetailQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DETAIL_QUANTITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDetailRange())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DETAIL_RANGE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDetailRatio())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DETAIL_RATIO, null, $v->_getFHIRXMLNamespace())); } @@ -960,11 +985,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDueDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DUE_DATE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDueDuration())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DUE_DURATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getMeasure())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MEASURE, null, $v->_getFHIRXMLNamespace())); } @@ -978,18 +1001,40 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getDetailBoolean())) { - $a[self::FIELD_DETAIL_BOOLEAN] = $v->getValue(); - $a[self::FIELD_DETAIL_BOOLEAN_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DETAIL_BOOLEAN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DETAIL_BOOLEAN_EXT] = $enc; + } + } else { + $a[self::FIELD_DETAIL_BOOLEAN] = $v; + } } if (null !== ($v = $this->getDetailCodeableConcept())) { $a[self::FIELD_DETAIL_CODEABLE_CONCEPT] = $v; } if (null !== ($v = $this->getDetailInteger())) { - $a[self::FIELD_DETAIL_INTEGER] = $v->getValue(); - $a[self::FIELD_DETAIL_INTEGER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DETAIL_INTEGER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DETAIL_INTEGER_EXT] = $enc; + } + } else { + $a[self::FIELD_DETAIL_INTEGER] = $v; + } } if (null !== ($v = $this->getDetailQuantity())) { - $a[self::FIELD_DETAIL_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DETAIL_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DETAIL_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_DETAIL_QUANTITY] = $v; + } } if (null !== ($v = $this->getDetailRange())) { $a[self::FIELD_DETAIL_RANGE] = $v; @@ -998,15 +1043,37 @@ public function jsonSerialize() $a[self::FIELD_DETAIL_RATIO] = $v; } if (null !== ($v = $this->getDetailString())) { - $a[self::FIELD_DETAIL_STRING] = $v->getValue(); - $a[self::FIELD_DETAIL_STRING_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DETAIL_STRING] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DETAIL_STRING_EXT] = $enc; + } + } else { + $a[self::FIELD_DETAIL_STRING] = $v; + } } if (null !== ($v = $this->getDueDate())) { - $a[self::FIELD_DUE_DATE] = $v->getValue(); - $a[self::FIELD_DUE_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DUE_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DUE_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_DUE_DATE] = $v; + } } if (null !== ($v = $this->getDueDuration())) { - $a[self::FIELD_DUE_DURATION] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DUE_DURATION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DUE_DURATION_EXT] = $enc; + } + } else { + $a[self::FIELD_DUE_DURATION] = $v; + } } if (null !== ($v = $this->getMeasure())) { $a[self::FIELD_MEASURE] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRGraphDefinition/FHIRGraphDefinitionCompartment.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRGraphDefinition/FHIRGraphDefinitionCompartment.php index 1a6e072f8f..1e1404b31e 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRGraphDefinition/FHIRGraphDefinitionCompartment.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRGraphDefinition/FHIRGraphDefinitionCompartment.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -82,10 +82,6 @@ class FHIRGraphDefinitionCompartment extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_GRAPH_DEFINITION_DOT_COMPARTMENT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CODE = 'code'; const FIELD_CODE_EXT = '_code'; const FIELD_DESCRIPTION = 'description'; @@ -151,6 +147,9 @@ class FHIRGraphDefinitionCompartment extends FHIRBackboneElement */ protected $use = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRGraphDefinitionCompartment Constructor * @param null|array $data @@ -173,8 +172,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CODE] instanceof FHIRCompartmentType) { $this->setCode($data[self::FIELD_CODE]); - } elseif ($ext && is_scalar($data[self::FIELD_CODE])) { - $this->setCode(new FHIRCompartmentType([FHIRCompartmentType::FIELD_VALUE => $data[self::FIELD_CODE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CODE])) { + $this->setCode(new FHIRCompartmentType([FHIRCompartmentType::FIELD_VALUE => $data[self::FIELD_CODE]] + $ext)); + } else if (is_array($data[self::FIELD_CODE])) { + $this->setCode(new FHIRCompartmentType(array_merge($ext, $data[self::FIELD_CODE]))); + } } else { $this->setCode(new FHIRCompartmentType($data[self::FIELD_CODE])); } @@ -185,8 +188,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -197,8 +204,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EXPRESSION] instanceof FHIRString) { $this->setExpression($data[self::FIELD_EXPRESSION]); - } elseif ($ext && is_scalar($data[self::FIELD_EXPRESSION])) { - $this->setExpression(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_EXPRESSION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EXPRESSION])) { + $this->setExpression(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_EXPRESSION]] + $ext)); + } else if (is_array($data[self::FIELD_EXPRESSION])) { + $this->setExpression(new FHIRString(array_merge($ext, $data[self::FIELD_EXPRESSION]))); + } } else { $this->setExpression(new FHIRString($data[self::FIELD_EXPRESSION])); } @@ -209,8 +220,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_RULE] instanceof FHIRGraphCompartmentRule) { $this->setRule($data[self::FIELD_RULE]); - } elseif ($ext && is_scalar($data[self::FIELD_RULE])) { - $this->setRule(new FHIRGraphCompartmentRule([FHIRGraphCompartmentRule::FIELD_VALUE => $data[self::FIELD_RULE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_RULE])) { + $this->setRule(new FHIRGraphCompartmentRule([FHIRGraphCompartmentRule::FIELD_VALUE => $data[self::FIELD_RULE]] + $ext)); + } else if (is_array($data[self::FIELD_RULE])) { + $this->setRule(new FHIRGraphCompartmentRule(array_merge($ext, $data[self::FIELD_RULE]))); + } } else { $this->setRule(new FHIRGraphCompartmentRule($data[self::FIELD_RULE])); } @@ -221,8 +236,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_USE] instanceof FHIRGraphCompartmentUse) { $this->setUse($data[self::FIELD_USE]); - } elseif ($ext && is_scalar($data[self::FIELD_USE])) { - $this->setUse(new FHIRGraphCompartmentUse([FHIRGraphCompartmentUse::FIELD_VALUE => $data[self::FIELD_USE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_USE])) { + $this->setUse(new FHIRGraphCompartmentUse([FHIRGraphCompartmentUse::FIELD_VALUE => $data[self::FIELD_USE]] + $ext)); + } else if (is_array($data[self::FIELD_USE])) { + $this->setUse(new FHIRGraphCompartmentUse(array_merge($ext, $data[self::FIELD_USE]))); + } } else { $this->setUse(new FHIRGraphCompartmentUse($data[self::FIELD_USE])); } @@ -513,7 +532,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } @@ -523,11 +541,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getExpression())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EXPRESSION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRule())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RULE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getUse())) { $v->xmlSerialize($sxe->addChild(self::FIELD_USE, null, $v->_getFHIRXMLNamespace())); } @@ -541,21 +557,59 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getCode())) { - $a[self::FIELD_CODE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CODE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CODE_EXT] = $enc; + } + } else { + $a[self::FIELD_CODE] = $v; + } } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if (null !== ($v = $this->getExpression())) { - $a[self::FIELD_EXPRESSION] = $v->getValue(); - $a[self::FIELD_EXPRESSION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EXPRESSION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EXPRESSION_EXT] = $enc; + } + } else { + $a[self::FIELD_EXPRESSION] = $v; + } } if (null !== ($v = $this->getRule())) { - $a[self::FIELD_RULE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_RULE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_RULE_EXT] = $enc; + } + } else { + $a[self::FIELD_RULE] = $v; + } } if (null !== ($v = $this->getUse())) { - $a[self::FIELD_USE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_USE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_USE_EXT] = $enc; + } + } else { + $a[self::FIELD_USE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRGraphDefinition/FHIRGraphDefinitionLink.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRGraphDefinition/FHIRGraphDefinitionLink.php index 8c6f5ca1b4..d80816430f 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRGraphDefinition/FHIRGraphDefinitionLink.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRGraphDefinition/FHIRGraphDefinitionLink.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRGraphDefinitionLink extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_GRAPH_DEFINITION_DOT_LINK; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DESCRIPTION = 'description'; const FIELD_DESCRIPTION_EXT = '_description'; const FIELD_MAX = 'max'; @@ -162,6 +158,9 @@ class FHIRGraphDefinitionLink extends FHIRBackboneElement */ protected $target = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRGraphDefinitionLink Constructor * @param null|array $data @@ -184,8 +183,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -196,8 +199,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MAX] instanceof FHIRString) { $this->setMax($data[self::FIELD_MAX]); - } elseif ($ext && is_scalar($data[self::FIELD_MAX])) { - $this->setMax(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_MAX]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MAX])) { + $this->setMax(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_MAX]] + $ext)); + } else if (is_array($data[self::FIELD_MAX])) { + $this->setMax(new FHIRString(array_merge($ext, $data[self::FIELD_MAX]))); + } } else { $this->setMax(new FHIRString($data[self::FIELD_MAX])); } @@ -208,8 +215,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MIN] instanceof FHIRInteger) { $this->setMin($data[self::FIELD_MIN]); - } elseif ($ext && is_scalar($data[self::FIELD_MIN])) { - $this->setMin(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_MIN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MIN])) { + $this->setMin(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_MIN]] + $ext)); + } else if (is_array($data[self::FIELD_MIN])) { + $this->setMin(new FHIRInteger(array_merge($ext, $data[self::FIELD_MIN]))); + } } else { $this->setMin(new FHIRInteger($data[self::FIELD_MIN])); } @@ -220,8 +231,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PATH] instanceof FHIRString) { $this->setPath($data[self::FIELD_PATH]); - } elseif ($ext && is_scalar($data[self::FIELD_PATH])) { - $this->setPath(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PATH]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PATH])) { + $this->setPath(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PATH]] + $ext)); + } else if (is_array($data[self::FIELD_PATH])) { + $this->setPath(new FHIRString(array_merge($ext, $data[self::FIELD_PATH]))); + } } else { $this->setPath(new FHIRString($data[self::FIELD_PATH])); } @@ -232,8 +247,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SLICE_NAME] instanceof FHIRString) { $this->setSliceName($data[self::FIELD_SLICE_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_SLICE_NAME])) { - $this->setSliceName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SLICE_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SLICE_NAME])) { + $this->setSliceName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SLICE_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_SLICE_NAME])) { + $this->setSliceName(new FHIRString(array_merge($ext, $data[self::FIELD_SLICE_NAME]))); + } } else { $this->setSliceName(new FHIRString($data[self::FIELD_SLICE_NAME])); } @@ -241,6 +260,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_TARGET])) { if (is_array($data[self::FIELD_TARGET])) { foreach($data[self::FIELD_TARGET] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRGraphDefinitionTarget) { $this->addTarget($v); } else { @@ -650,7 +672,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getSliceName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SLICE_NAME, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getTarget())) { foreach($vs as $v) { if (null === $v) { @@ -659,6 +680,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_TARGET, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } @@ -669,24 +691,59 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if (null !== ($v = $this->getMax())) { - $a[self::FIELD_MAX] = $v->getValue(); - $a[self::FIELD_MAX_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MAX] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MAX_EXT] = $enc; + } + } else { + $a[self::FIELD_MAX] = $v; + } } if (null !== ($v = $this->getMin())) { - $a[self::FIELD_MIN] = $v->getValue(); - $a[self::FIELD_MIN_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MIN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MIN_EXT] = $enc; + } + } else { + $a[self::FIELD_MIN] = $v; + } } if (null !== ($v = $this->getPath())) { - $a[self::FIELD_PATH] = $v->getValue(); - $a[self::FIELD_PATH_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PATH] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PATH_EXT] = $enc; + } + } else { + $a[self::FIELD_PATH] = $v; + } } if (null !== ($v = $this->getSliceName())) { - $a[self::FIELD_SLICE_NAME] = $v->getValue(); - $a[self::FIELD_SLICE_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SLICE_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SLICE_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_SLICE_NAME] = $v; + } } if ([] !== ($vs = $this->getTarget())) { $a[self::FIELD_TARGET] = $vs; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRGraphDefinition/FHIRGraphDefinitionTarget.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRGraphDefinition/FHIRGraphDefinitionTarget.php index ec08b919f7..b53185af93 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRGraphDefinition/FHIRGraphDefinitionTarget.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRGraphDefinition/FHIRGraphDefinitionTarget.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -81,10 +81,6 @@ class FHIRGraphDefinitionTarget extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_GRAPH_DEFINITION_DOT_TARGET; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_COMPARTMENT = 'compartment'; const FIELD_LINK = 'link'; const FIELD_PARAMS = 'params'; @@ -151,6 +147,9 @@ class FHIRGraphDefinitionTarget extends FHIRBackboneElement */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRGraphDefinitionTarget Constructor * @param null|array $data @@ -170,6 +169,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_COMPARTMENT])) { if (is_array($data[self::FIELD_COMPARTMENT])) { foreach($data[self::FIELD_COMPARTMENT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRGraphDefinitionCompartment) { $this->addCompartment($v); } else { @@ -185,6 +187,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_LINK])) { if (is_array($data[self::FIELD_LINK])) { foreach($data[self::FIELD_LINK] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRGraphDefinitionLink) { $this->addLink($v); } else { @@ -203,8 +208,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PARAMS] instanceof FHIRString) { $this->setParams($data[self::FIELD_PARAMS]); - } elseif ($ext && is_scalar($data[self::FIELD_PARAMS])) { - $this->setParams(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PARAMS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PARAMS])) { + $this->setParams(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PARAMS]] + $ext)); + } else if (is_array($data[self::FIELD_PARAMS])) { + $this->setParams(new FHIRString(array_merge($ext, $data[self::FIELD_PARAMS]))); + } } else { $this->setParams(new FHIRString($data[self::FIELD_PARAMS])); } @@ -215,8 +224,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PROFILE] instanceof FHIRCanonical) { $this->setProfile($data[self::FIELD_PROFILE]); - } elseif ($ext && is_scalar($data[self::FIELD_PROFILE])) { - $this->setProfile(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $data[self::FIELD_PROFILE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PROFILE])) { + $this->setProfile(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $data[self::FIELD_PROFILE]] + $ext)); + } else if (is_array($data[self::FIELD_PROFILE])) { + $this->setProfile(new FHIRCanonical(array_merge($ext, $data[self::FIELD_PROFILE]))); + } } else { $this->setProfile(new FHIRCanonical($data[self::FIELD_PROFILE])); } @@ -227,8 +240,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TYPE] instanceof FHIRCode) { $this->setType($data[self::FIELD_TYPE]); - } elseif ($ext && is_scalar($data[self::FIELD_TYPE])) { - $this->setType(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TYPE])) { + $this->setType(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } else if (is_array($data[self::FIELD_TYPE])) { + $this->setType(new FHIRCode(array_merge($ext, $data[self::FIELD_TYPE]))); + } } else { $this->setType(new FHIRCode($data[self::FIELD_TYPE])); } @@ -592,7 +609,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getCompartment())) { foreach($vs as $v) { if (null === $v) { @@ -610,6 +626,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_LINK, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getParams())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PARAMS, null, $v->_getFHIRXMLNamespace())); } @@ -635,16 +652,37 @@ public function jsonSerialize() $a[self::FIELD_LINK] = $vs; } if (null !== ($v = $this->getParams())) { - $a[self::FIELD_PARAMS] = $v->getValue(); - $a[self::FIELD_PARAMS_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PARAMS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PARAMS_EXT] = $enc; + } + } else { + $a[self::FIELD_PARAMS] = $v; + } } if (null !== ($v = $this->getProfile())) { - $a[self::FIELD_PROFILE] = $v->getValue(); - $a[self::FIELD_PROFILE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PROFILE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PROFILE_EXT] = $enc; + } + } else { + $a[self::FIELD_PROFILE] = $v; + } } if (null !== ($v = $this->getType())) { - $a[self::FIELD_TYPE] = $v->getValue(); - $a[self::FIELD_TYPE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TYPE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TYPE_EXT] = $enc; + } + } else { + $a[self::FIELD_TYPE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRGroup/FHIRGroupCharacteristic.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRGroup/FHIRGroupCharacteristic.php index a7a5725633..46efc2516c 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRGroup/FHIRGroupCharacteristic.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRGroup/FHIRGroupCharacteristic.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -85,10 +85,6 @@ class FHIRGroupCharacteristic extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_GROUP_DOT_CHARACTERISTIC; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CODE = 'code'; const FIELD_EXCLUDE = 'exclude'; const FIELD_EXCLUDE_EXT = '_exclude'; @@ -198,6 +194,9 @@ class FHIRGroupCharacteristic extends FHIRBackboneElement */ protected $valueReference = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRGroupCharacteristic Constructor * @param null|array $data @@ -227,8 +226,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EXCLUDE] instanceof FHIRBoolean) { $this->setExclude($data[self::FIELD_EXCLUDE]); - } elseif ($ext && is_scalar($data[self::FIELD_EXCLUDE])) { - $this->setExclude(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_EXCLUDE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EXCLUDE])) { + $this->setExclude(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_EXCLUDE]] + $ext)); + } else if (is_array($data[self::FIELD_EXCLUDE])) { + $this->setExclude(new FHIRBoolean(array_merge($ext, $data[self::FIELD_EXCLUDE]))); + } } else { $this->setExclude(new FHIRBoolean($data[self::FIELD_EXCLUDE])); } @@ -246,8 +249,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_BOOLEAN] instanceof FHIRBoolean) { $this->setValueBoolean($data[self::FIELD_VALUE_BOOLEAN]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_BOOLEAN])) { - $this->setValueBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_VALUE_BOOLEAN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_BOOLEAN])) { + $this->setValueBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_VALUE_BOOLEAN]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_BOOLEAN])) { + $this->setValueBoolean(new FHIRBoolean(array_merge($ext, $data[self::FIELD_VALUE_BOOLEAN]))); + } } else { $this->setValueBoolean(new FHIRBoolean($data[self::FIELD_VALUE_BOOLEAN])); } @@ -265,8 +272,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_QUANTITY] instanceof FHIRQuantity) { $this->setValueQuantity($data[self::FIELD_VALUE_QUANTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_QUANTITY])) { - $this->setValueQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_VALUE_QUANTITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_QUANTITY])) { + $this->setValueQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_VALUE_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_QUANTITY])) { + $this->setValueQuantity(new FHIRQuantity(array_merge($ext, $data[self::FIELD_VALUE_QUANTITY]))); + } } else { $this->setValueQuantity(new FHIRQuantity($data[self::FIELD_VALUE_QUANTITY])); } @@ -690,33 +701,27 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getExclude())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EXCLUDE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PERIOD, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getValueBoolean())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_BOOLEAN, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_QUANTITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueRange())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_RANGE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_REFERENCE, null, $v->_getFHIRXMLNamespace())); } @@ -733,21 +738,43 @@ public function jsonSerialize() $a[self::FIELD_CODE] = $v; } if (null !== ($v = $this->getExclude())) { - $a[self::FIELD_EXCLUDE] = $v->getValue(); - $a[self::FIELD_EXCLUDE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EXCLUDE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EXCLUDE_EXT] = $enc; + } + } else { + $a[self::FIELD_EXCLUDE] = $v; + } } if (null !== ($v = $this->getPeriod())) { $a[self::FIELD_PERIOD] = $v; } if (null !== ($v = $this->getValueBoolean())) { - $a[self::FIELD_VALUE_BOOLEAN] = $v->getValue(); - $a[self::FIELD_VALUE_BOOLEAN_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_BOOLEAN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_BOOLEAN_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_BOOLEAN] = $v; + } } if (null !== ($v = $this->getValueCodeableConcept())) { $a[self::FIELD_VALUE_CODEABLE_CONCEPT] = $v; } if (null !== ($v = $this->getValueQuantity())) { - $a[self::FIELD_VALUE_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_QUANTITY] = $v; + } } if (null !== ($v = $this->getValueRange())) { $a[self::FIELD_VALUE_RANGE] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRGroup/FHIRGroupMember.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRGroup/FHIRGroupMember.php index 7e1efbe487..e957231a11 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRGroup/FHIRGroupMember.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRGroup/FHIRGroupMember.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -82,10 +82,6 @@ class FHIRGroupMember extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_GROUP_DOT_MEMBER; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ENTITY = 'entity'; const FIELD_INACTIVE = 'inactive'; const FIELD_INACTIVE_EXT = '_inactive'; @@ -125,6 +121,9 @@ class FHIRGroupMember extends FHIRBackboneElement */ protected $period = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRGroupMember Constructor * @param null|array $data @@ -154,8 +153,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_INACTIVE] instanceof FHIRBoolean) { $this->setInactive($data[self::FIELD_INACTIVE]); - } elseif ($ext && is_scalar($data[self::FIELD_INACTIVE])) { - $this->setInactive(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_INACTIVE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_INACTIVE])) { + $this->setInactive(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_INACTIVE]] + $ext)); + } else if (is_array($data[self::FIELD_INACTIVE])) { + $this->setInactive(new FHIRBoolean(array_merge($ext, $data[self::FIELD_INACTIVE]))); + } } else { $this->setInactive(new FHIRBoolean($data[self::FIELD_INACTIVE])); } @@ -380,14 +383,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getEntity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ENTITY, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getInactive())) { $v->xmlSerialize($sxe->addChild(self::FIELD_INACTIVE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PERIOD, null, $v->_getFHIRXMLNamespace())); } @@ -404,8 +405,15 @@ public function jsonSerialize() $a[self::FIELD_ENTITY] = $v; } if (null !== ($v = $this->getInactive())) { - $a[self::FIELD_INACTIVE] = $v->getValue(); - $a[self::FIELD_INACTIVE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_INACTIVE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_INACTIVE_EXT] = $enc; + } + } else { + $a[self::FIELD_INACTIVE] = $v; + } } if (null !== ($v = $this->getPeriod())) { $a[self::FIELD_PERIOD] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRHealthcareService/FHIRHealthcareServiceAvailableTime.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRHealthcareService/FHIRHealthcareServiceAvailableTime.php index f2ef3a4270..64c2e066c2 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRHealthcareService/FHIRHealthcareServiceAvailableTime.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRHealthcareService/FHIRHealthcareServiceAvailableTime.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRHealthcareServiceAvailableTime extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_HEALTHCARE_SERVICE_DOT_AVAILABLE_TIME; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ALL_DAY = 'allDay'; const FIELD_ALL_DAY_EXT = '_allDay'; const FIELD_AVAILABLE_END_TIME = 'availableEndTime'; @@ -134,6 +130,9 @@ class FHIRHealthcareServiceAvailableTime extends FHIRBackboneElement */ protected $daysOfWeek = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRHealthcareServiceAvailableTime Constructor * @param null|array $data @@ -156,8 +155,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ALL_DAY] instanceof FHIRBoolean) { $this->setAllDay($data[self::FIELD_ALL_DAY]); - } elseif ($ext && is_scalar($data[self::FIELD_ALL_DAY])) { - $this->setAllDay(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_ALL_DAY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ALL_DAY])) { + $this->setAllDay(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_ALL_DAY]] + $ext)); + } else if (is_array($data[self::FIELD_ALL_DAY])) { + $this->setAllDay(new FHIRBoolean(array_merge($ext, $data[self::FIELD_ALL_DAY]))); + } } else { $this->setAllDay(new FHIRBoolean($data[self::FIELD_ALL_DAY])); } @@ -168,8 +171,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_AVAILABLE_END_TIME] instanceof FHIRTime) { $this->setAvailableEndTime($data[self::FIELD_AVAILABLE_END_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_AVAILABLE_END_TIME])) { - $this->setAvailableEndTime(new FHIRTime([FHIRTime::FIELD_VALUE => $data[self::FIELD_AVAILABLE_END_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_AVAILABLE_END_TIME])) { + $this->setAvailableEndTime(new FHIRTime([FHIRTime::FIELD_VALUE => $data[self::FIELD_AVAILABLE_END_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_AVAILABLE_END_TIME])) { + $this->setAvailableEndTime(new FHIRTime(array_merge($ext, $data[self::FIELD_AVAILABLE_END_TIME]))); + } } else { $this->setAvailableEndTime(new FHIRTime($data[self::FIELD_AVAILABLE_END_TIME])); } @@ -180,8 +187,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_AVAILABLE_START_TIME] instanceof FHIRTime) { $this->setAvailableStartTime($data[self::FIELD_AVAILABLE_START_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_AVAILABLE_START_TIME])) { - $this->setAvailableStartTime(new FHIRTime([FHIRTime::FIELD_VALUE => $data[self::FIELD_AVAILABLE_START_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_AVAILABLE_START_TIME])) { + $this->setAvailableStartTime(new FHIRTime([FHIRTime::FIELD_VALUE => $data[self::FIELD_AVAILABLE_START_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_AVAILABLE_START_TIME])) { + $this->setAvailableStartTime(new FHIRTime(array_merge($ext, $data[self::FIELD_AVAILABLE_START_TIME]))); + } } else { $this->setAvailableStartTime(new FHIRTime($data[self::FIELD_AVAILABLE_START_TIME])); } @@ -192,17 +203,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_DAYS_OF_WEEK])) { foreach($data[self::FIELD_DAYS_OF_WEEK] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRDaysOfWeek) { $this->addDaysOfWeek($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addDaysOfWeek(new FHIRDaysOfWeek([FHIRDaysOfWeek::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addDaysOfWeek(new FHIRDaysOfWeek([FHIRDaysOfWeek::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addDaysOfWeek(new FHIRDaysOfWeek(array_merge($v, $ext[$i]))); + } } else { $this->addDaysOfWeek(new FHIRDaysOfWeek($v)); } } } elseif ($data[self::FIELD_DAYS_OF_WEEK] instanceof FHIRDaysOfWeek) { $this->addDaysOfWeek($data[self::FIELD_DAYS_OF_WEEK]); - } elseif ($ext && is_scalar($data[self::FIELD_DAYS_OF_WEEK])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_DAYS_OF_WEEK])) { $this->addDaysOfWeek(new FHIRDaysOfWeek([FHIRDaysOfWeek::FIELD_VALUE => $data[self::FIELD_DAYS_OF_WEEK]] + $ext)); } else { $this->addDaysOfWeek(new FHIRDaysOfWeek($data[self::FIELD_DAYS_OF_WEEK])); @@ -506,7 +524,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getAvailableStartTime())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AVAILABLE_START_TIME, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getDaysOfWeek())) { foreach($vs as $v) { if (null === $v) { @@ -515,6 +532,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_DAYS_OF_WEEK, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } @@ -525,19 +543,56 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getAllDay())) { - $a[self::FIELD_ALL_DAY] = $v->getValue(); - $a[self::FIELD_ALL_DAY_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ALL_DAY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ALL_DAY_EXT] = $enc; + } + } else { + $a[self::FIELD_ALL_DAY] = $v; + } } if (null !== ($v = $this->getAvailableEndTime())) { - $a[self::FIELD_AVAILABLE_END_TIME] = $v->getValue(); - $a[self::FIELD_AVAILABLE_END_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_AVAILABLE_END_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_AVAILABLE_END_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_AVAILABLE_END_TIME] = $v; + } } if (null !== ($v = $this->getAvailableStartTime())) { - $a[self::FIELD_AVAILABLE_START_TIME] = $v->getValue(); - $a[self::FIELD_AVAILABLE_START_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_AVAILABLE_START_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_AVAILABLE_START_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_AVAILABLE_START_TIME] = $v; + } } if ([] !== ($vs = $this->getDaysOfWeek())) { - $a[self::FIELD_DAYS_OF_WEEK] = $vs; + $a[self::FIELD_DAYS_OF_WEEK] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DAYS_OF_WEEK][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DAYS_OF_WEEK_EXT][] = $enc; + } else { + $a[self::FIELD_DAYS_OF_WEEK_EXT][] = null; + } + } else { + $a[self::FIELD_DAYS_OF_WEEK][] = $v; + } + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRHealthcareService/FHIRHealthcareServiceEligibility.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRHealthcareService/FHIRHealthcareServiceEligibility.php index fdc62ee468..1f3c6f2dfa 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRHealthcareService/FHIRHealthcareServiceEligibility.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRHealthcareService/FHIRHealthcareServiceEligibility.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRHealthcareServiceEligibility extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_HEALTHCARE_SERVICE_DOT_ELIGIBILITY; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CODE = 'code'; const FIELD_COMMENT = 'comment'; const FIELD_COMMENT_EXT = '_comment'; @@ -113,6 +109,9 @@ class FHIRHealthcareServiceEligibility extends FHIRBackboneElement */ protected $comment = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRHealthcareServiceEligibility Constructor * @param null|array $data @@ -142,8 +141,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_COMMENT] instanceof FHIRMarkdown) { $this->setComment($data[self::FIELD_COMMENT]); - } elseif ($ext && is_scalar($data[self::FIELD_COMMENT])) { - $this->setComment(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_COMMENT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_COMMENT])) { + $this->setComment(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_COMMENT]] + $ext)); + } else if (is_array($data[self::FIELD_COMMENT])) { + $this->setComment(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_COMMENT]))); + } } else { $this->setComment(new FHIRMarkdown($data[self::FIELD_COMMENT])); } @@ -336,7 +339,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } @@ -356,8 +358,15 @@ public function jsonSerialize() $a[self::FIELD_CODE] = $v; } if (null !== ($v = $this->getComment())) { - $a[self::FIELD_COMMENT] = $v->getValue(); - $a[self::FIELD_COMMENT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_COMMENT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_COMMENT_EXT] = $enc; + } + } else { + $a[self::FIELD_COMMENT] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRHealthcareService/FHIRHealthcareServiceNotAvailable.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRHealthcareService/FHIRHealthcareServiceNotAvailable.php index 70ce030a74..587a7224b8 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRHealthcareService/FHIRHealthcareServiceNotAvailable.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRHealthcareService/FHIRHealthcareServiceNotAvailable.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRHealthcareServiceNotAvailable extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_HEALTHCARE_SERVICE_DOT_NOT_AVAILABLE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DESCRIPTION = 'description'; const FIELD_DESCRIPTION_EXT = '_description'; const FIELD_DURING = 'during'; @@ -109,6 +105,9 @@ class FHIRHealthcareServiceNotAvailable extends FHIRBackboneElement */ protected $during = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRHealthcareServiceNotAvailable Constructor * @param null|array $data @@ -131,8 +130,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -327,7 +330,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESCRIPTION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDuring())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DURING, null, $v->_getFHIRXMLNamespace())); } @@ -341,8 +343,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if (null !== ($v = $this->getDuring())) { $a[self::FIELD_DURING] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRImagingStudy/FHIRImagingStudyInstance.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRImagingStudy/FHIRImagingStudyInstance.php index 71d863f694..b60fb32fd2 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRImagingStudy/FHIRImagingStudyInstance.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRImagingStudy/FHIRImagingStudyInstance.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -84,10 +84,6 @@ class FHIRImagingStudyInstance extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_IMAGING_STUDY_DOT_INSTANCE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_NUMBER = 'number'; const FIELD_NUMBER_EXT = '_number'; const FIELD_SOP_CLASS = 'sopClass'; @@ -143,6 +139,9 @@ class FHIRImagingStudyInstance extends FHIRBackboneElement */ protected $uid = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRImagingStudyInstance Constructor * @param null|array $data @@ -165,8 +164,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NUMBER] instanceof FHIRUnsignedInt) { $this->setNumber($data[self::FIELD_NUMBER]); - } elseif ($ext && is_scalar($data[self::FIELD_NUMBER])) { - $this->setNumber(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_NUMBER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NUMBER])) { + $this->setNumber(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_NUMBER]] + $ext)); + } else if (is_array($data[self::FIELD_NUMBER])) { + $this->setNumber(new FHIRUnsignedInt(array_merge($ext, $data[self::FIELD_NUMBER]))); + } } else { $this->setNumber(new FHIRUnsignedInt($data[self::FIELD_NUMBER])); } @@ -184,8 +187,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TITLE] instanceof FHIRString) { $this->setTitle($data[self::FIELD_TITLE]); - } elseif ($ext && is_scalar($data[self::FIELD_TITLE])) { - $this->setTitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TITLE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TITLE])) { + $this->setTitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TITLE]] + $ext)); + } else if (is_array($data[self::FIELD_TITLE])) { + $this->setTitle(new FHIRString(array_merge($ext, $data[self::FIELD_TITLE]))); + } } else { $this->setTitle(new FHIRString($data[self::FIELD_TITLE])); } @@ -196,8 +203,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_UID] instanceof FHIRId) { $this->setUid($data[self::FIELD_UID]); - } elseif ($ext && is_scalar($data[self::FIELD_UID])) { - $this->setUid(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_UID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_UID])) { + $this->setUid(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_UID]] + $ext)); + } else if (is_array($data[self::FIELD_UID])) { + $this->setUid(new FHIRId(array_merge($ext, $data[self::FIELD_UID]))); + } } else { $this->setUid(new FHIRId($data[self::FIELD_UID])); } @@ -477,7 +488,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getNumber())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NUMBER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSopClass())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SOP_CLASS, null, $v->_getFHIRXMLNamespace())); } @@ -497,19 +507,40 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getNumber())) { - $a[self::FIELD_NUMBER] = $v->getValue(); - $a[self::FIELD_NUMBER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NUMBER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NUMBER_EXT] = $enc; + } + } else { + $a[self::FIELD_NUMBER] = $v; + } } if (null !== ($v = $this->getSopClass())) { $a[self::FIELD_SOP_CLASS] = $v; } if (null !== ($v = $this->getTitle())) { - $a[self::FIELD_TITLE] = $v->getValue(); - $a[self::FIELD_TITLE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TITLE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TITLE_EXT] = $enc; + } + } else { + $a[self::FIELD_TITLE] = $v; + } } if (null !== ($v = $this->getUid())) { - $a[self::FIELD_UID] = $v->getValue(); - $a[self::FIELD_UID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_UID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_UID_EXT] = $enc; + } + } else { + $a[self::FIELD_UID] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRImagingStudy/FHIRImagingStudyPerformer.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRImagingStudy/FHIRImagingStudyPerformer.php index 94d7dc0029..b437dfecd3 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRImagingStudy/FHIRImagingStudyPerformer.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRImagingStudy/FHIRImagingStudyPerformer.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -82,10 +82,6 @@ class FHIRImagingStudyPerformer extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_IMAGING_STUDY_DOT_PERFORMER; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ACTOR = 'actor'; const FIELD_FUNCTION = 'function'; @@ -112,6 +108,9 @@ class FHIRImagingStudyPerformer extends FHIRBackboneElement */ protected $function = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRImagingStudyPerformer Constructor * @param null|array $data @@ -311,11 +310,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getActor())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ACTOR, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getFunction())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FUNCTION, null, $v->_getFHIRXMLNamespace())); } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRImagingStudy/FHIRImagingStudySeries.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRImagingStudy/FHIRImagingStudySeries.php index 447b1bdf0d..bc2f9e33f1 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRImagingStudy/FHIRImagingStudySeries.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRImagingStudy/FHIRImagingStudySeries.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -86,10 +86,6 @@ class FHIRImagingStudySeries extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_IMAGING_STUDY_DOT_SERIES; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_BODY_SITE = 'bodySite'; const FIELD_DESCRIPTION = 'description'; const FIELD_DESCRIPTION_EXT = '_description'; @@ -262,6 +258,9 @@ class FHIRImagingStudySeries extends FHIRBackboneElement */ protected $uid = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRImagingStudySeries Constructor * @param null|array $data @@ -291,8 +290,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -300,6 +303,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ENDPOINT])) { if (is_array($data[self::FIELD_ENDPOINT])) { foreach($data[self::FIELD_ENDPOINT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addEndpoint($v); } else { @@ -315,6 +321,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_INSTANCE])) { if (is_array($data[self::FIELD_INSTANCE])) { foreach($data[self::FIELD_INSTANCE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRImagingStudyInstance) { $this->addInstance($v); } else { @@ -347,8 +356,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NUMBER] instanceof FHIRUnsignedInt) { $this->setNumber($data[self::FIELD_NUMBER]); - } elseif ($ext && is_scalar($data[self::FIELD_NUMBER])) { - $this->setNumber(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_NUMBER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NUMBER])) { + $this->setNumber(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_NUMBER]] + $ext)); + } else if (is_array($data[self::FIELD_NUMBER])) { + $this->setNumber(new FHIRUnsignedInt(array_merge($ext, $data[self::FIELD_NUMBER]))); + } } else { $this->setNumber(new FHIRUnsignedInt($data[self::FIELD_NUMBER])); } @@ -359,8 +372,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NUMBER_OF_INSTANCES] instanceof FHIRUnsignedInt) { $this->setNumberOfInstances($data[self::FIELD_NUMBER_OF_INSTANCES]); - } elseif ($ext && is_scalar($data[self::FIELD_NUMBER_OF_INSTANCES])) { - $this->setNumberOfInstances(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_NUMBER_OF_INSTANCES]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NUMBER_OF_INSTANCES])) { + $this->setNumberOfInstances(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_NUMBER_OF_INSTANCES]] + $ext)); + } else if (is_array($data[self::FIELD_NUMBER_OF_INSTANCES])) { + $this->setNumberOfInstances(new FHIRUnsignedInt(array_merge($ext, $data[self::FIELD_NUMBER_OF_INSTANCES]))); + } } else { $this->setNumberOfInstances(new FHIRUnsignedInt($data[self::FIELD_NUMBER_OF_INSTANCES])); } @@ -368,6 +385,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PERFORMER])) { if (is_array($data[self::FIELD_PERFORMER])) { foreach($data[self::FIELD_PERFORMER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRImagingStudyPerformer) { $this->addPerformer($v); } else { @@ -383,6 +403,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SPECIMEN])) { if (is_array($data[self::FIELD_SPECIMEN])) { foreach($data[self::FIELD_SPECIMEN] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addSpecimen($v); } else { @@ -401,8 +424,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STARTED] instanceof FHIRDateTime) { $this->setStarted($data[self::FIELD_STARTED]); - } elseif ($ext && is_scalar($data[self::FIELD_STARTED])) { - $this->setStarted(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_STARTED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STARTED])) { + $this->setStarted(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_STARTED]] + $ext)); + } else if (is_array($data[self::FIELD_STARTED])) { + $this->setStarted(new FHIRDateTime(array_merge($ext, $data[self::FIELD_STARTED]))); + } } else { $this->setStarted(new FHIRDateTime($data[self::FIELD_STARTED])); } @@ -413,8 +440,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_UID] instanceof FHIRId) { $this->setUid($data[self::FIELD_UID]); - } elseif ($ext && is_scalar($data[self::FIELD_UID])) { - $this->setUid(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_UID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_UID])) { + $this->setUid(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_UID]] + $ext)); + } else if (is_array($data[self::FIELD_UID])) { + $this->setUid(new FHIRId(array_merge($ext, $data[self::FIELD_UID]))); + } } else { $this->setUid(new FHIRId($data[self::FIELD_UID])); } @@ -1134,14 +1165,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getBodySite())) { $v->xmlSerialize($sxe->addChild(self::FIELD_BODY_SITE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getDescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESCRIPTION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getEndpoint())) { foreach($vs as $v) { if (null === $v) { @@ -1163,7 +1192,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getLaterality())) { $v->xmlSerialize($sxe->addChild(self::FIELD_LATERALITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getModality())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MODALITY, null, $v->_getFHIRXMLNamespace())); } @@ -1173,7 +1201,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getNumberOfInstances())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NUMBER_OF_INSTANCES, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getPerformer())) { foreach($vs as $v) { if (null === $v) { @@ -1191,6 +1218,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_SPECIMEN, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getStarted())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STARTED, null, $v->_getFHIRXMLNamespace())); } @@ -1210,8 +1238,15 @@ public function jsonSerialize() $a[self::FIELD_BODY_SITE] = $v; } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if ([] !== ($vs = $this->getEndpoint())) { $a[self::FIELD_ENDPOINT] = $vs; @@ -1226,12 +1261,26 @@ public function jsonSerialize() $a[self::FIELD_MODALITY] = $v; } if (null !== ($v = $this->getNumber())) { - $a[self::FIELD_NUMBER] = $v->getValue(); - $a[self::FIELD_NUMBER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NUMBER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NUMBER_EXT] = $enc; + } + } else { + $a[self::FIELD_NUMBER] = $v; + } } if (null !== ($v = $this->getNumberOfInstances())) { - $a[self::FIELD_NUMBER_OF_INSTANCES] = $v->getValue(); - $a[self::FIELD_NUMBER_OF_INSTANCES_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NUMBER_OF_INSTANCES] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NUMBER_OF_INSTANCES_EXT] = $enc; + } + } else { + $a[self::FIELD_NUMBER_OF_INSTANCES] = $v; + } } if ([] !== ($vs = $this->getPerformer())) { $a[self::FIELD_PERFORMER] = $vs; @@ -1240,12 +1289,26 @@ public function jsonSerialize() $a[self::FIELD_SPECIMEN] = $vs; } if (null !== ($v = $this->getStarted())) { - $a[self::FIELD_STARTED] = $v->getValue(); - $a[self::FIELD_STARTED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STARTED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STARTED_EXT] = $enc; + } + } else { + $a[self::FIELD_STARTED] = $v; + } } if (null !== ($v = $this->getUid())) { - $a[self::FIELD_UID] = $v->getValue(); - $a[self::FIELD_UID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_UID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_UID_EXT] = $enc; + } + } else { + $a[self::FIELD_UID] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRImmunization/FHIRImmunizationEducation.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRImmunization/FHIRImmunizationEducation.php index 19b6380d5e..b98b7120b7 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRImmunization/FHIRImmunizationEducation.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRImmunization/FHIRImmunizationEducation.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRImmunizationEducation extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_IMMUNIZATION_DOT_EDUCATION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DOCUMENT_TYPE = 'documentType'; const FIELD_DOCUMENT_TYPE_EXT = '_documentType'; const FIELD_PRESENTATION_DATE = 'presentationDate'; @@ -144,6 +140,9 @@ class FHIRImmunizationEducation extends FHIRBackboneElement */ protected $reference = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRImmunizationEducation Constructor * @param null|array $data @@ -166,8 +165,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DOCUMENT_TYPE] instanceof FHIRString) { $this->setDocumentType($data[self::FIELD_DOCUMENT_TYPE]); - } elseif ($ext && is_scalar($data[self::FIELD_DOCUMENT_TYPE])) { - $this->setDocumentType(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DOCUMENT_TYPE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DOCUMENT_TYPE])) { + $this->setDocumentType(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DOCUMENT_TYPE]] + $ext)); + } else if (is_array($data[self::FIELD_DOCUMENT_TYPE])) { + $this->setDocumentType(new FHIRString(array_merge($ext, $data[self::FIELD_DOCUMENT_TYPE]))); + } } else { $this->setDocumentType(new FHIRString($data[self::FIELD_DOCUMENT_TYPE])); } @@ -178,8 +181,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PRESENTATION_DATE] instanceof FHIRDateTime) { $this->setPresentationDate($data[self::FIELD_PRESENTATION_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_PRESENTATION_DATE])) { - $this->setPresentationDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_PRESENTATION_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PRESENTATION_DATE])) { + $this->setPresentationDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_PRESENTATION_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_PRESENTATION_DATE])) { + $this->setPresentationDate(new FHIRDateTime(array_merge($ext, $data[self::FIELD_PRESENTATION_DATE]))); + } } else { $this->setPresentationDate(new FHIRDateTime($data[self::FIELD_PRESENTATION_DATE])); } @@ -190,8 +197,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PUBLICATION_DATE] instanceof FHIRDateTime) { $this->setPublicationDate($data[self::FIELD_PUBLICATION_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_PUBLICATION_DATE])) { - $this->setPublicationDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_PUBLICATION_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PUBLICATION_DATE])) { + $this->setPublicationDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_PUBLICATION_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_PUBLICATION_DATE])) { + $this->setPublicationDate(new FHIRDateTime(array_merge($ext, $data[self::FIELD_PUBLICATION_DATE]))); + } } else { $this->setPublicationDate(new FHIRDateTime($data[self::FIELD_PUBLICATION_DATE])); } @@ -202,8 +213,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_REFERENCE] instanceof FHIRUri) { $this->setReference($data[self::FIELD_REFERENCE]); - } elseif ($ext && is_scalar($data[self::FIELD_REFERENCE])) { - $this->setReference(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_REFERENCE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_REFERENCE])) { + $this->setReference(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_REFERENCE]] + $ext)); + } else if (is_array($data[self::FIELD_REFERENCE])) { + $this->setReference(new FHIRUri(array_merge($ext, $data[self::FIELD_REFERENCE]))); + } } else { $this->setReference(new FHIRUri($data[self::FIELD_REFERENCE])); } @@ -521,20 +536,48 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getDocumentType())) { - $a[self::FIELD_DOCUMENT_TYPE] = $v->getValue(); - $a[self::FIELD_DOCUMENT_TYPE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DOCUMENT_TYPE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DOCUMENT_TYPE_EXT] = $enc; + } + } else { + $a[self::FIELD_DOCUMENT_TYPE] = $v; + } } if (null !== ($v = $this->getPresentationDate())) { - $a[self::FIELD_PRESENTATION_DATE] = $v->getValue(); - $a[self::FIELD_PRESENTATION_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PRESENTATION_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PRESENTATION_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_PRESENTATION_DATE] = $v; + } } if (null !== ($v = $this->getPublicationDate())) { - $a[self::FIELD_PUBLICATION_DATE] = $v->getValue(); - $a[self::FIELD_PUBLICATION_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PUBLICATION_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PUBLICATION_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_PUBLICATION_DATE] = $v; + } } if (null !== ($v = $this->getReference())) { - $a[self::FIELD_REFERENCE] = $v->getValue(); - $a[self::FIELD_REFERENCE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_REFERENCE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_REFERENCE_EXT] = $enc; + } + } else { + $a[self::FIELD_REFERENCE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRImmunization/FHIRImmunizationPerformer.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRImmunization/FHIRImmunizationPerformer.php index b5b08649e5..7dbb0cb05c 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRImmunization/FHIRImmunizationPerformer.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRImmunization/FHIRImmunizationPerformer.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRImmunizationPerformer extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_IMMUNIZATION_DOT_PERFORMER; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ACTOR = 'actor'; const FIELD_FUNCTION = 'function'; @@ -110,6 +106,9 @@ class FHIRImmunizationPerformer extends FHIRBackboneElement */ protected $function = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRImmunizationPerformer Constructor * @param null|array $data @@ -311,11 +310,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getActor())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ACTOR, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getFunction())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FUNCTION, null, $v->_getFHIRXMLNamespace())); } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRImmunization/FHIRImmunizationProtocolApplied.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRImmunization/FHIRImmunizationProtocolApplied.php index 1b48ecdbcd..1adb2412d6 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRImmunization/FHIRImmunizationProtocolApplied.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRImmunization/FHIRImmunizationProtocolApplied.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -81,10 +81,6 @@ class FHIRImmunizationProtocolApplied extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_IMMUNIZATION_DOT_PROTOCOL_APPLIED; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_AUTHORITY = 'authority'; const FIELD_DOSE_NUMBER_POSITIVE_INT = 'doseNumberPositiveInt'; const FIELD_DOSE_NUMBER_POSITIVE_INT_EXT = '_doseNumberPositiveInt'; @@ -180,6 +176,9 @@ class FHIRImmunizationProtocolApplied extends FHIRBackboneElement */ protected $targetDisease = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRImmunizationProtocolApplied Constructor * @param null|array $data @@ -209,8 +208,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DOSE_NUMBER_POSITIVE_INT] instanceof FHIRPositiveInt) { $this->setDoseNumberPositiveInt($data[self::FIELD_DOSE_NUMBER_POSITIVE_INT]); - } elseif ($ext && is_scalar($data[self::FIELD_DOSE_NUMBER_POSITIVE_INT])) { - $this->setDoseNumberPositiveInt(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_DOSE_NUMBER_POSITIVE_INT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DOSE_NUMBER_POSITIVE_INT])) { + $this->setDoseNumberPositiveInt(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_DOSE_NUMBER_POSITIVE_INT]] + $ext)); + } else if (is_array($data[self::FIELD_DOSE_NUMBER_POSITIVE_INT])) { + $this->setDoseNumberPositiveInt(new FHIRPositiveInt(array_merge($ext, $data[self::FIELD_DOSE_NUMBER_POSITIVE_INT]))); + } } else { $this->setDoseNumberPositiveInt(new FHIRPositiveInt($data[self::FIELD_DOSE_NUMBER_POSITIVE_INT])); } @@ -221,8 +224,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DOSE_NUMBER_STRING] instanceof FHIRString) { $this->setDoseNumberString($data[self::FIELD_DOSE_NUMBER_STRING]); - } elseif ($ext && is_scalar($data[self::FIELD_DOSE_NUMBER_STRING])) { - $this->setDoseNumberString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DOSE_NUMBER_STRING]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DOSE_NUMBER_STRING])) { + $this->setDoseNumberString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DOSE_NUMBER_STRING]] + $ext)); + } else if (is_array($data[self::FIELD_DOSE_NUMBER_STRING])) { + $this->setDoseNumberString(new FHIRString(array_merge($ext, $data[self::FIELD_DOSE_NUMBER_STRING]))); + } } else { $this->setDoseNumberString(new FHIRString($data[self::FIELD_DOSE_NUMBER_STRING])); } @@ -233,8 +240,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SERIES] instanceof FHIRString) { $this->setSeries($data[self::FIELD_SERIES]); - } elseif ($ext && is_scalar($data[self::FIELD_SERIES])) { - $this->setSeries(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SERIES]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SERIES])) { + $this->setSeries(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SERIES]] + $ext)); + } else if (is_array($data[self::FIELD_SERIES])) { + $this->setSeries(new FHIRString(array_merge($ext, $data[self::FIELD_SERIES]))); + } } else { $this->setSeries(new FHIRString($data[self::FIELD_SERIES])); } @@ -245,8 +256,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SERIES_DOSES_POSITIVE_INT] instanceof FHIRPositiveInt) { $this->setSeriesDosesPositiveInt($data[self::FIELD_SERIES_DOSES_POSITIVE_INT]); - } elseif ($ext && is_scalar($data[self::FIELD_SERIES_DOSES_POSITIVE_INT])) { - $this->setSeriesDosesPositiveInt(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_SERIES_DOSES_POSITIVE_INT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SERIES_DOSES_POSITIVE_INT])) { + $this->setSeriesDosesPositiveInt(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_SERIES_DOSES_POSITIVE_INT]] + $ext)); + } else if (is_array($data[self::FIELD_SERIES_DOSES_POSITIVE_INT])) { + $this->setSeriesDosesPositiveInt(new FHIRPositiveInt(array_merge($ext, $data[self::FIELD_SERIES_DOSES_POSITIVE_INT]))); + } } else { $this->setSeriesDosesPositiveInt(new FHIRPositiveInt($data[self::FIELD_SERIES_DOSES_POSITIVE_INT])); } @@ -257,8 +272,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SERIES_DOSES_STRING] instanceof FHIRString) { $this->setSeriesDosesString($data[self::FIELD_SERIES_DOSES_STRING]); - } elseif ($ext && is_scalar($data[self::FIELD_SERIES_DOSES_STRING])) { - $this->setSeriesDosesString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SERIES_DOSES_STRING]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SERIES_DOSES_STRING])) { + $this->setSeriesDosesString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SERIES_DOSES_STRING]] + $ext)); + } else if (is_array($data[self::FIELD_SERIES_DOSES_STRING])) { + $this->setSeriesDosesString(new FHIRString(array_merge($ext, $data[self::FIELD_SERIES_DOSES_STRING]))); + } } else { $this->setSeriesDosesString(new FHIRString($data[self::FIELD_SERIES_DOSES_STRING])); } @@ -266,6 +285,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_TARGET_DISEASE])) { if (is_array($data[self::FIELD_TARGET_DISEASE])) { foreach($data[self::FIELD_TARGET_DISEASE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addTargetDisease($v); } else { @@ -704,7 +726,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getAuthority())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AUTHORITY, null, $v->_getFHIRXMLNamespace())); } @@ -723,7 +744,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getSeriesDosesString())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SERIES_DOSES_STRING, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getTargetDisease())) { foreach($vs as $v) { if (null === $v) { @@ -732,6 +752,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_TARGET_DISEASE, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } @@ -745,24 +766,59 @@ public function jsonSerialize() $a[self::FIELD_AUTHORITY] = $v; } if (null !== ($v = $this->getDoseNumberPositiveInt())) { - $a[self::FIELD_DOSE_NUMBER_POSITIVE_INT] = $v->getValue(); - $a[self::FIELD_DOSE_NUMBER_POSITIVE_INT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DOSE_NUMBER_POSITIVE_INT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DOSE_NUMBER_POSITIVE_INT_EXT] = $enc; + } + } else { + $a[self::FIELD_DOSE_NUMBER_POSITIVE_INT] = $v; + } } if (null !== ($v = $this->getDoseNumberString())) { - $a[self::FIELD_DOSE_NUMBER_STRING] = $v->getValue(); - $a[self::FIELD_DOSE_NUMBER_STRING_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DOSE_NUMBER_STRING] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DOSE_NUMBER_STRING_EXT] = $enc; + } + } else { + $a[self::FIELD_DOSE_NUMBER_STRING] = $v; + } } if (null !== ($v = $this->getSeries())) { - $a[self::FIELD_SERIES] = $v->getValue(); - $a[self::FIELD_SERIES_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SERIES] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SERIES_EXT] = $enc; + } + } else { + $a[self::FIELD_SERIES] = $v; + } } if (null !== ($v = $this->getSeriesDosesPositiveInt())) { - $a[self::FIELD_SERIES_DOSES_POSITIVE_INT] = $v->getValue(); - $a[self::FIELD_SERIES_DOSES_POSITIVE_INT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SERIES_DOSES_POSITIVE_INT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SERIES_DOSES_POSITIVE_INT_EXT] = $enc; + } + } else { + $a[self::FIELD_SERIES_DOSES_POSITIVE_INT] = $v; + } } if (null !== ($v = $this->getSeriesDosesString())) { - $a[self::FIELD_SERIES_DOSES_STRING] = $v->getValue(); - $a[self::FIELD_SERIES_DOSES_STRING_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SERIES_DOSES_STRING] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SERIES_DOSES_STRING_EXT] = $enc; + } + } else { + $a[self::FIELD_SERIES_DOSES_STRING] = $v; + } } if ([] !== ($vs = $this->getTargetDisease())) { $a[self::FIELD_TARGET_DISEASE] = $vs; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRImmunization/FHIRImmunizationReaction.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRImmunization/FHIRImmunizationReaction.php index 50723d426f..9bfe36728c 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRImmunization/FHIRImmunizationReaction.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRImmunization/FHIRImmunizationReaction.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRImmunizationReaction extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_IMMUNIZATION_DOT_REACTION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DATE = 'date'; const FIELD_DATE_EXT = '_date'; const FIELD_DETAIL = 'detail'; @@ -125,6 +121,9 @@ class FHIRImmunizationReaction extends FHIRBackboneElement */ protected $reported = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRImmunizationReaction Constructor * @param null|array $data @@ -147,8 +146,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATE] instanceof FHIRDateTime) { $this->setDate($data[self::FIELD_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_DATE])) { - $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime(array_merge($ext, $data[self::FIELD_DATE]))); + } } else { $this->setDate(new FHIRDateTime($data[self::FIELD_DATE])); } @@ -166,8 +169,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_REPORTED] instanceof FHIRBoolean) { $this->setReported($data[self::FIELD_REPORTED]); - } elseif ($ext && is_scalar($data[self::FIELD_REPORTED])) { - $this->setReported(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_REPORTED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_REPORTED])) { + $this->setReported(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_REPORTED]] + $ext)); + } else if (is_array($data[self::FIELD_REPORTED])) { + $this->setReported(new FHIRBoolean(array_merge($ext, $data[self::FIELD_REPORTED]))); + } } else { $this->setReported(new FHIRBoolean($data[self::FIELD_REPORTED])); } @@ -401,7 +408,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DATE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDetail())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DETAIL, null, $v->_getFHIRXMLNamespace())); } @@ -418,15 +424,29 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getDate())) { - $a[self::FIELD_DATE] = $v->getValue(); - $a[self::FIELD_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_DATE] = $v; + } } if (null !== ($v = $this->getDetail())) { $a[self::FIELD_DETAIL] = $v; } if (null !== ($v = $this->getReported())) { - $a[self::FIELD_REPORTED] = $v->getValue(); - $a[self::FIELD_REPORTED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_REPORTED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_REPORTED_EXT] = $enc; + } + } else { + $a[self::FIELD_REPORTED] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRImmunizationRecommendation/FHIRImmunizationRecommendationDateCriterion.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRImmunizationRecommendation/FHIRImmunizationRecommendationDateCriterion.php index e14e83131e..06acd84dca 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRImmunizationRecommendation/FHIRImmunizationRecommendationDateCriterion.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRImmunizationRecommendation/FHIRImmunizationRecommendationDateCriterion.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRImmunizationRecommendationDateCriterion extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_IMMUNIZATION_RECOMMENDATION_DOT_DATE_CRITERION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CODE = 'code'; const FIELD_VALUE = 'value'; const FIELD_VALUE_EXT = '_value'; @@ -114,6 +110,9 @@ class FHIRImmunizationRecommendationDateCriterion extends FHIRBackboneElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRImmunizationRecommendationDateCriterion Constructor * @param null|array $data @@ -147,8 +146,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE] instanceof FHIRDateTime) { $this->setValue($data[self::FIELD_VALUE]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE])) { - $this->setValue(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_VALUE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE])) { + $this->setValue(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_VALUE]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE])) { + $this->setValue(new FHIRDateTime(array_merge($ext, $data[self::FIELD_VALUE]))); + } } else { $this->setValue(new FHIRDateTime($data[self::FIELD_VALUE])); } @@ -341,11 +344,11 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getValue())) { + $sxe->addAttribute(self::FIELD_VALUE, (string)$v); $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE, null, $v->_getFHIRXMLNamespace())); } return $sxe; @@ -361,8 +364,15 @@ public function jsonSerialize() $a[self::FIELD_CODE] = $v; } if (null !== ($v = $this->getValue())) { - $a[self::FIELD_VALUE] = $v->getValue(); - $a[self::FIELD_VALUE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRImmunizationRecommendation/FHIRImmunizationRecommendationRecommendation.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRImmunizationRecommendation/FHIRImmunizationRecommendationRecommendation.php index 867d3e4aa0..099be02ec0 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRImmunizationRecommendation/FHIRImmunizationRecommendationRecommendation.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRImmunizationRecommendation/FHIRImmunizationRecommendationRecommendation.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -81,10 +81,6 @@ class FHIRImmunizationRecommendationRecommendation extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_IMMUNIZATION_RECOMMENDATION_DOT_RECOMMENDATION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CONTRAINDICATED_VACCINE_CODE = 'contraindicatedVaccineCode'; const FIELD_DATE_CRITERION = 'dateCriterion'; const FIELD_DATE_CRITERION_EXT = '_dateCriterion'; @@ -275,6 +271,9 @@ class FHIRImmunizationRecommendationRecommendation extends FHIRBackboneElement */ protected $vaccineCode = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRImmunizationRecommendationRecommendation Constructor * @param null|array $data @@ -294,6 +293,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CONTRAINDICATED_VACCINE_CODE])) { if (is_array($data[self::FIELD_CONTRAINDICATED_VACCINE_CODE])) { foreach($data[self::FIELD_CONTRAINDICATED_VACCINE_CODE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addContraindicatedVaccineCode($v); } else { @@ -312,17 +314,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_DATE_CRITERION])) { foreach($data[self::FIELD_DATE_CRITERION] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRImmunizationRecommendationDateCriterion) { $this->addDateCriterion($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addDateCriterion(new FHIRImmunizationRecommendationDateCriterion([FHIRImmunizationRecommendationDateCriterion::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addDateCriterion(new FHIRImmunizationRecommendationDateCriterion([FHIRImmunizationRecommendationDateCriterion::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addDateCriterion(new FHIRImmunizationRecommendationDateCriterion(array_merge($v, $ext[$i]))); + } } else { $this->addDateCriterion(new FHIRImmunizationRecommendationDateCriterion($v)); } } } elseif ($data[self::FIELD_DATE_CRITERION] instanceof FHIRImmunizationRecommendationDateCriterion) { $this->addDateCriterion($data[self::FIELD_DATE_CRITERION]); - } elseif ($ext && is_scalar($data[self::FIELD_DATE_CRITERION])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_DATE_CRITERION])) { $this->addDateCriterion(new FHIRImmunizationRecommendationDateCriterion([FHIRImmunizationRecommendationDateCriterion::FIELD_VALUE => $data[self::FIELD_DATE_CRITERION]] + $ext)); } else { $this->addDateCriterion(new FHIRImmunizationRecommendationDateCriterion($data[self::FIELD_DATE_CRITERION])); @@ -334,8 +343,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -346,8 +359,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DOSE_NUMBER_POSITIVE_INT] instanceof FHIRPositiveInt) { $this->setDoseNumberPositiveInt($data[self::FIELD_DOSE_NUMBER_POSITIVE_INT]); - } elseif ($ext && is_scalar($data[self::FIELD_DOSE_NUMBER_POSITIVE_INT])) { - $this->setDoseNumberPositiveInt(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_DOSE_NUMBER_POSITIVE_INT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DOSE_NUMBER_POSITIVE_INT])) { + $this->setDoseNumberPositiveInt(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_DOSE_NUMBER_POSITIVE_INT]] + $ext)); + } else if (is_array($data[self::FIELD_DOSE_NUMBER_POSITIVE_INT])) { + $this->setDoseNumberPositiveInt(new FHIRPositiveInt(array_merge($ext, $data[self::FIELD_DOSE_NUMBER_POSITIVE_INT]))); + } } else { $this->setDoseNumberPositiveInt(new FHIRPositiveInt($data[self::FIELD_DOSE_NUMBER_POSITIVE_INT])); } @@ -358,8 +375,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DOSE_NUMBER_STRING] instanceof FHIRString) { $this->setDoseNumberString($data[self::FIELD_DOSE_NUMBER_STRING]); - } elseif ($ext && is_scalar($data[self::FIELD_DOSE_NUMBER_STRING])) { - $this->setDoseNumberString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DOSE_NUMBER_STRING]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DOSE_NUMBER_STRING])) { + $this->setDoseNumberString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DOSE_NUMBER_STRING]] + $ext)); + } else if (is_array($data[self::FIELD_DOSE_NUMBER_STRING])) { + $this->setDoseNumberString(new FHIRString(array_merge($ext, $data[self::FIELD_DOSE_NUMBER_STRING]))); + } } else { $this->setDoseNumberString(new FHIRString($data[self::FIELD_DOSE_NUMBER_STRING])); } @@ -367,6 +388,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_FORECAST_REASON])) { if (is_array($data[self::FIELD_FORECAST_REASON])) { foreach($data[self::FIELD_FORECAST_REASON] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addForecastReason($v); } else { @@ -392,8 +416,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SERIES] instanceof FHIRString) { $this->setSeries($data[self::FIELD_SERIES]); - } elseif ($ext && is_scalar($data[self::FIELD_SERIES])) { - $this->setSeries(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SERIES]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SERIES])) { + $this->setSeries(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SERIES]] + $ext)); + } else if (is_array($data[self::FIELD_SERIES])) { + $this->setSeries(new FHIRString(array_merge($ext, $data[self::FIELD_SERIES]))); + } } else { $this->setSeries(new FHIRString($data[self::FIELD_SERIES])); } @@ -404,8 +432,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SERIES_DOSES_POSITIVE_INT] instanceof FHIRPositiveInt) { $this->setSeriesDosesPositiveInt($data[self::FIELD_SERIES_DOSES_POSITIVE_INT]); - } elseif ($ext && is_scalar($data[self::FIELD_SERIES_DOSES_POSITIVE_INT])) { - $this->setSeriesDosesPositiveInt(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_SERIES_DOSES_POSITIVE_INT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SERIES_DOSES_POSITIVE_INT])) { + $this->setSeriesDosesPositiveInt(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_SERIES_DOSES_POSITIVE_INT]] + $ext)); + } else if (is_array($data[self::FIELD_SERIES_DOSES_POSITIVE_INT])) { + $this->setSeriesDosesPositiveInt(new FHIRPositiveInt(array_merge($ext, $data[self::FIELD_SERIES_DOSES_POSITIVE_INT]))); + } } else { $this->setSeriesDosesPositiveInt(new FHIRPositiveInt($data[self::FIELD_SERIES_DOSES_POSITIVE_INT])); } @@ -416,8 +448,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SERIES_DOSES_STRING] instanceof FHIRString) { $this->setSeriesDosesString($data[self::FIELD_SERIES_DOSES_STRING]); - } elseif ($ext && is_scalar($data[self::FIELD_SERIES_DOSES_STRING])) { - $this->setSeriesDosesString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SERIES_DOSES_STRING]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SERIES_DOSES_STRING])) { + $this->setSeriesDosesString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SERIES_DOSES_STRING]] + $ext)); + } else if (is_array($data[self::FIELD_SERIES_DOSES_STRING])) { + $this->setSeriesDosesString(new FHIRString(array_merge($ext, $data[self::FIELD_SERIES_DOSES_STRING]))); + } } else { $this->setSeriesDosesString(new FHIRString($data[self::FIELD_SERIES_DOSES_STRING])); } @@ -425,6 +461,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SUPPORTING_IMMUNIZATION])) { if (is_array($data[self::FIELD_SUPPORTING_IMMUNIZATION])) { foreach($data[self::FIELD_SUPPORTING_IMMUNIZATION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addSupportingImmunization($v); } else { @@ -440,6 +479,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SUPPORTING_PATIENT_INFORMATION])) { if (is_array($data[self::FIELD_SUPPORTING_PATIENT_INFORMATION])) { foreach($data[self::FIELD_SUPPORTING_PATIENT_INFORMATION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addSupportingPatientInformation($v); } else { @@ -462,6 +504,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_VACCINE_CODE])) { if (is_array($data[self::FIELD_VACCINE_CODE])) { foreach($data[self::FIELD_VACCINE_CODE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addVaccineCode($v); } else { @@ -1304,7 +1349,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getContraindicatedVaccineCode())) { foreach($vs as $v) { if (null === $v) { @@ -1322,6 +1366,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_DATE_CRITERION, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getDescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESCRIPTION, null, $v->_getFHIRXMLNamespace())); } @@ -1331,7 +1376,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDoseNumberString())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DOSE_NUMBER_STRING, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getForecastReason())) { foreach($vs as $v) { if (null === $v) { @@ -1353,7 +1397,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getSeriesDosesString())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SERIES_DOSES_STRING, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getSupportingImmunization())) { foreach($vs as $v) { if (null === $v) { @@ -1375,7 +1418,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getTargetDisease())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TARGET_DISEASE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getVaccineCode())) { foreach($vs as $v) { if (null === $v) { @@ -1384,6 +1426,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_VACCINE_CODE, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } @@ -1397,19 +1440,56 @@ public function jsonSerialize() $a[self::FIELD_CONTRAINDICATED_VACCINE_CODE] = $vs; } if ([] !== ($vs = $this->getDateCriterion())) { - $a[self::FIELD_DATE_CRITERION] = $vs; + $a[self::FIELD_DATE_CRITERION] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATE_CRITERION][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATE_CRITERION_EXT][] = $enc; + } else { + $a[self::FIELD_DATE_CRITERION_EXT][] = null; + } + } else { + $a[self::FIELD_DATE_CRITERION][] = $v; + } + } } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if (null !== ($v = $this->getDoseNumberPositiveInt())) { - $a[self::FIELD_DOSE_NUMBER_POSITIVE_INT] = $v->getValue(); - $a[self::FIELD_DOSE_NUMBER_POSITIVE_INT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DOSE_NUMBER_POSITIVE_INT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DOSE_NUMBER_POSITIVE_INT_EXT] = $enc; + } + } else { + $a[self::FIELD_DOSE_NUMBER_POSITIVE_INT] = $v; + } } if (null !== ($v = $this->getDoseNumberString())) { - $a[self::FIELD_DOSE_NUMBER_STRING] = $v->getValue(); - $a[self::FIELD_DOSE_NUMBER_STRING_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DOSE_NUMBER_STRING] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DOSE_NUMBER_STRING_EXT] = $enc; + } + } else { + $a[self::FIELD_DOSE_NUMBER_STRING] = $v; + } } if ([] !== ($vs = $this->getForecastReason())) { $a[self::FIELD_FORECAST_REASON] = $vs; @@ -1418,16 +1498,37 @@ public function jsonSerialize() $a[self::FIELD_FORECAST_STATUS] = $v; } if (null !== ($v = $this->getSeries())) { - $a[self::FIELD_SERIES] = $v->getValue(); - $a[self::FIELD_SERIES_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SERIES] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SERIES_EXT] = $enc; + } + } else { + $a[self::FIELD_SERIES] = $v; + } } if (null !== ($v = $this->getSeriesDosesPositiveInt())) { - $a[self::FIELD_SERIES_DOSES_POSITIVE_INT] = $v->getValue(); - $a[self::FIELD_SERIES_DOSES_POSITIVE_INT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SERIES_DOSES_POSITIVE_INT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SERIES_DOSES_POSITIVE_INT_EXT] = $enc; + } + } else { + $a[self::FIELD_SERIES_DOSES_POSITIVE_INT] = $v; + } } if (null !== ($v = $this->getSeriesDosesString())) { - $a[self::FIELD_SERIES_DOSES_STRING] = $v->getValue(); - $a[self::FIELD_SERIES_DOSES_STRING_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SERIES_DOSES_STRING] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SERIES_DOSES_STRING_EXT] = $enc; + } + } else { + $a[self::FIELD_SERIES_DOSES_STRING] = $v; + } } if ([] !== ($vs = $this->getSupportingImmunization())) { $a[self::FIELD_SUPPORTING_IMMUNIZATION] = $vs; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuideDefinition.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuideDefinition.php index 1bf4021c39..8b4ab6b28d 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuideDefinition.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuideDefinition.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRImplementationGuideDefinition extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_IMPLEMENTATION_GUIDE_DOT_DEFINITION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_GROUPING = 'grouping'; const FIELD_PAGE = 'page'; const FIELD_PARAMETER = 'parameter'; @@ -154,6 +150,9 @@ class FHIRImplementationGuideDefinition extends FHIRBackboneElement */ protected $template = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRImplementationGuideDefinition Constructor * @param null|array $data @@ -173,6 +172,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_GROUPING])) { if (is_array($data[self::FIELD_GROUPING])) { foreach($data[self::FIELD_GROUPING] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRImplementationGuideGrouping) { $this->addGrouping($v); } else { @@ -198,17 +200,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_PARAMETER])) { foreach($data[self::FIELD_PARAMETER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRImplementationGuideParameter) { $this->addParameter($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addParameter(new FHIRImplementationGuideParameter([FHIRImplementationGuideParameter::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addParameter(new FHIRImplementationGuideParameter([FHIRImplementationGuideParameter::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addParameter(new FHIRImplementationGuideParameter(array_merge($v, $ext[$i]))); + } } else { $this->addParameter(new FHIRImplementationGuideParameter($v)); } } } elseif ($data[self::FIELD_PARAMETER] instanceof FHIRImplementationGuideParameter) { $this->addParameter($data[self::FIELD_PARAMETER]); - } elseif ($ext && is_scalar($data[self::FIELD_PARAMETER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_PARAMETER])) { $this->addParameter(new FHIRImplementationGuideParameter([FHIRImplementationGuideParameter::FIELD_VALUE => $data[self::FIELD_PARAMETER]] + $ext)); } else { $this->addParameter(new FHIRImplementationGuideParameter($data[self::FIELD_PARAMETER])); @@ -217,6 +226,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_RESOURCE])) { if (is_array($data[self::FIELD_RESOURCE])) { foreach($data[self::FIELD_RESOURCE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRImplementationGuideResource) { $this->addResource($v); } else { @@ -232,6 +244,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_TEMPLATE])) { if (is_array($data[self::FIELD_TEMPLATE])) { foreach($data[self::FIELD_TEMPLATE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRImplementationGuideTemplate) { $this->addTemplate($v); } else { @@ -647,7 +662,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getGrouping())) { foreach($vs as $v) { if (null === $v) { @@ -660,7 +674,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getPage())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PAGE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getParameter())) { foreach($vs as $v) { if (null === $v) { @@ -687,6 +700,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_TEMPLATE, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } @@ -703,7 +717,23 @@ public function jsonSerialize() $a[self::FIELD_PAGE] = $v; } if ([] !== ($vs = $this->getParameter())) { - $a[self::FIELD_PARAMETER] = $vs; + $a[self::FIELD_PARAMETER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PARAMETER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PARAMETER_EXT][] = $enc; + } else { + $a[self::FIELD_PARAMETER_EXT][] = null; + } + } else { + $a[self::FIELD_PARAMETER][] = $v; + } + } } if ([] !== ($vs = $this->getResource())) { $a[self::FIELD_RESOURCE] = $vs; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuideDependsOn.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuideDependsOn.php index 946a9fc5e2..cb9458fc16 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuideDependsOn.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuideDependsOn.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -82,10 +82,6 @@ class FHIRImplementationGuideDependsOn extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_IMPLEMENTATION_GUIDE_DOT_DEPENDS_ON; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_PACKAGE_ID = 'packageId'; const FIELD_PACKAGE_ID_EXT = '_packageId'; const FIELD_URI = 'uri'; @@ -131,6 +127,9 @@ class FHIRImplementationGuideDependsOn extends FHIRBackboneElement */ protected $version = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRImplementationGuideDependsOn Constructor * @param null|array $data @@ -153,8 +152,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PACKAGE_ID] instanceof FHIRId) { $this->setPackageId($data[self::FIELD_PACKAGE_ID]); - } elseif ($ext && is_scalar($data[self::FIELD_PACKAGE_ID])) { - $this->setPackageId(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_PACKAGE_ID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PACKAGE_ID])) { + $this->setPackageId(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_PACKAGE_ID]] + $ext)); + } else if (is_array($data[self::FIELD_PACKAGE_ID])) { + $this->setPackageId(new FHIRId(array_merge($ext, $data[self::FIELD_PACKAGE_ID]))); + } } else { $this->setPackageId(new FHIRId($data[self::FIELD_PACKAGE_ID])); } @@ -165,8 +168,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_URI] instanceof FHIRCanonical) { $this->setUri($data[self::FIELD_URI]); - } elseif ($ext && is_scalar($data[self::FIELD_URI])) { - $this->setUri(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $data[self::FIELD_URI]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_URI])) { + $this->setUri(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $data[self::FIELD_URI]] + $ext)); + } else if (is_array($data[self::FIELD_URI])) { + $this->setUri(new FHIRCanonical(array_merge($ext, $data[self::FIELD_URI]))); + } } else { $this->setUri(new FHIRCanonical($data[self::FIELD_URI])); } @@ -177,8 +184,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VERSION] instanceof FHIRString) { $this->setVersion($data[self::FIELD_VERSION]); - } elseif ($ext && is_scalar($data[self::FIELD_VERSION])) { - $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } else if (is_array($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString(array_merge($ext, $data[self::FIELD_VERSION]))); + } } else { $this->setVersion(new FHIRString($data[self::FIELD_VERSION])); } @@ -445,16 +456,37 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getPackageId())) { - $a[self::FIELD_PACKAGE_ID] = $v->getValue(); - $a[self::FIELD_PACKAGE_ID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PACKAGE_ID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PACKAGE_ID_EXT] = $enc; + } + } else { + $a[self::FIELD_PACKAGE_ID] = $v; + } } if (null !== ($v = $this->getUri())) { - $a[self::FIELD_URI] = $v->getValue(); - $a[self::FIELD_URI_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_URI] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_URI_EXT] = $enc; + } + } else { + $a[self::FIELD_URI] = $v; + } } if (null !== ($v = $this->getVersion())) { - $a[self::FIELD_VERSION] = $v->getValue(); - $a[self::FIELD_VERSION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VERSION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VERSION_EXT] = $enc; + } + } else { + $a[self::FIELD_VERSION] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuideGlobal.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuideGlobal.php index fc5ab5ee25..a5d3c13924 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuideGlobal.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuideGlobal.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -81,10 +81,6 @@ class FHIRImplementationGuideGlobal extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_IMPLEMENTATION_GUIDE_DOT_GLOBAL; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_PROFILE = 'profile'; const FIELD_PROFILE_EXT = '_profile'; const FIELD_TYPE = 'type'; @@ -114,6 +110,9 @@ class FHIRImplementationGuideGlobal extends FHIRBackboneElement */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRImplementationGuideGlobal Constructor * @param null|array $data @@ -136,8 +135,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PROFILE] instanceof FHIRCanonical) { $this->setProfile($data[self::FIELD_PROFILE]); - } elseif ($ext && is_scalar($data[self::FIELD_PROFILE])) { - $this->setProfile(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $data[self::FIELD_PROFILE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PROFILE])) { + $this->setProfile(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $data[self::FIELD_PROFILE]] + $ext)); + } else if (is_array($data[self::FIELD_PROFILE])) { + $this->setProfile(new FHIRCanonical(array_merge($ext, $data[self::FIELD_PROFILE]))); + } } else { $this->setProfile(new FHIRCanonical($data[self::FIELD_PROFILE])); } @@ -148,8 +151,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TYPE] instanceof FHIRCode) { $this->setType($data[self::FIELD_TYPE]); - } elseif ($ext && is_scalar($data[self::FIELD_TYPE])) { - $this->setType(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TYPE])) { + $this->setType(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } else if (is_array($data[self::FIELD_TYPE])) { + $this->setType(new FHIRCode(array_merge($ext, $data[self::FIELD_TYPE]))); + } } else { $this->setType(new FHIRCode($data[self::FIELD_TYPE])); } @@ -363,12 +370,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getProfile())) { - $a[self::FIELD_PROFILE] = $v->getValue(); - $a[self::FIELD_PROFILE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PROFILE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PROFILE_EXT] = $enc; + } + } else { + $a[self::FIELD_PROFILE] = $v; + } } if (null !== ($v = $this->getType())) { - $a[self::FIELD_TYPE] = $v->getValue(); - $a[self::FIELD_TYPE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TYPE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TYPE_EXT] = $enc; + } + } else { + $a[self::FIELD_TYPE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuideGrouping.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuideGrouping.php index a6804ff99d..690a9ff926 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuideGrouping.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuideGrouping.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRImplementationGuideGrouping extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_IMPLEMENTATION_GUIDE_DOT_GROUPING; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DESCRIPTION = 'description'; const FIELD_DESCRIPTION_EXT = '_description'; const FIELD_NAME = 'name'; @@ -112,6 +108,9 @@ class FHIRImplementationGuideGrouping extends FHIRBackboneElement */ protected $name = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRImplementationGuideGrouping Constructor * @param null|array $data @@ -134,8 +133,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -146,8 +149,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -359,12 +366,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuideManifest.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuideManifest.php index 0fbff6dafa..28e7c38060 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuideManifest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuideManifest.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -81,10 +81,6 @@ class FHIRImplementationGuideManifest extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_IMPLEMENTATION_GUIDE_DOT_MANIFEST; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_IMAGE = 'image'; const FIELD_IMAGE_EXT = '_image'; const FIELD_OTHER = 'other'; @@ -157,6 +153,9 @@ class FHIRImplementationGuideManifest extends FHIRBackboneElement */ protected $resource = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRImplementationGuideManifest Constructor * @param null|array $data @@ -179,17 +178,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IMAGE])) { foreach($data[self::FIELD_IMAGE] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRString) { $this->addImage($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addImage(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addImage(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addImage(new FHIRString(array_merge($v, $ext[$i]))); + } } else { $this->addImage(new FHIRString($v)); } } } elseif ($data[self::FIELD_IMAGE] instanceof FHIRString) { $this->addImage($data[self::FIELD_IMAGE]); - } elseif ($ext && is_scalar($data[self::FIELD_IMAGE])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IMAGE])) { $this->addImage(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_IMAGE]] + $ext)); } else { $this->addImage(new FHIRString($data[self::FIELD_IMAGE])); @@ -201,17 +207,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_OTHER])) { foreach($data[self::FIELD_OTHER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRString) { $this->addOther($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addOther(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addOther(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addOther(new FHIRString(array_merge($v, $ext[$i]))); + } } else { $this->addOther(new FHIRString($v)); } } } elseif ($data[self::FIELD_OTHER] instanceof FHIRString) { $this->addOther($data[self::FIELD_OTHER]); - } elseif ($ext && is_scalar($data[self::FIELD_OTHER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_OTHER])) { $this->addOther(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_OTHER]] + $ext)); } else { $this->addOther(new FHIRString($data[self::FIELD_OTHER])); @@ -220,6 +233,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PAGE])) { if (is_array($data[self::FIELD_PAGE])) { foreach($data[self::FIELD_PAGE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRImplementationGuidePage1) { $this->addPage($v); } else { @@ -238,8 +254,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_RENDERING] instanceof FHIRUrl) { $this->setRendering($data[self::FIELD_RENDERING]); - } elseif ($ext && is_scalar($data[self::FIELD_RENDERING])) { - $this->setRendering(new FHIRUrl([FHIRUrl::FIELD_VALUE => $data[self::FIELD_RENDERING]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_RENDERING])) { + $this->setRendering(new FHIRUrl([FHIRUrl::FIELD_VALUE => $data[self::FIELD_RENDERING]] + $ext)); + } else if (is_array($data[self::FIELD_RENDERING])) { + $this->setRendering(new FHIRUrl(array_merge($ext, $data[self::FIELD_RENDERING]))); + } } else { $this->setRendering(new FHIRUrl($data[self::FIELD_RENDERING])); } @@ -247,6 +267,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_RESOURCE])) { if (is_array($data[self::FIELD_RESOURCE])) { foreach($data[self::FIELD_RESOURCE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRImplementationGuideResource1) { $this->addResource($v); } else { @@ -701,6 +724,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_IMAGE, null, $v->_getFHIRXMLNamespace())); } } + if ([] !== ($vs = $this->getOther())) { foreach($vs as $v) { if (null === $v) { @@ -718,10 +742,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_PAGE, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getRendering())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RENDERING, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getResource())) { foreach($vs as $v) { if (null === $v) { @@ -730,6 +754,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_RESOURCE, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } @@ -745,8 +770,17 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_IMAGE][] = $v->getValue(); - $a[self::FIELD_IMAGE_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IMAGE][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IMAGE_EXT][] = $enc; + } else { + $a[self::FIELD_IMAGE_EXT][] = null; + } + } else { + $a[self::FIELD_IMAGE][] = $v; + } } } if ([] !== ($vs = $this->getOther())) { @@ -755,16 +789,32 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_OTHER][] = $v->getValue(); - $a[self::FIELD_OTHER_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_OTHER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_OTHER_EXT][] = $enc; + } else { + $a[self::FIELD_OTHER_EXT][] = null; + } + } else { + $a[self::FIELD_OTHER][] = $v; + } } } if ([] !== ($vs = $this->getPage())) { $a[self::FIELD_PAGE] = $vs; } if (null !== ($v = $this->getRendering())) { - $a[self::FIELD_RENDERING] = $v->getValue(); - $a[self::FIELD_RENDERING_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_RENDERING] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_RENDERING_EXT] = $enc; + } + } else { + $a[self::FIELD_RENDERING] = $v; + } } if ([] !== ($vs = $this->getResource())) { $a[self::FIELD_RESOURCE] = $vs; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuidePage.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuidePage.php index afee9c2711..b5c4df0321 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuidePage.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuidePage.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -83,10 +83,6 @@ class FHIRImplementationGuidePage extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_IMPLEMENTATION_GUIDE_DOT_PAGE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_GENERATION = 'generation'; const FIELD_GENERATION_EXT = '_generation'; const FIELD_NAME_REFERENCE = 'nameReference'; @@ -152,6 +148,9 @@ class FHIRImplementationGuidePage extends FHIRBackboneElement */ protected $title = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRImplementationGuidePage Constructor * @param null|array $data @@ -174,8 +173,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_GENERATION] instanceof FHIRGuidePageGeneration) { $this->setGeneration($data[self::FIELD_GENERATION]); - } elseif ($ext && is_scalar($data[self::FIELD_GENERATION])) { - $this->setGeneration(new FHIRGuidePageGeneration([FHIRGuidePageGeneration::FIELD_VALUE => $data[self::FIELD_GENERATION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_GENERATION])) { + $this->setGeneration(new FHIRGuidePageGeneration([FHIRGuidePageGeneration::FIELD_VALUE => $data[self::FIELD_GENERATION]] + $ext)); + } else if (is_array($data[self::FIELD_GENERATION])) { + $this->setGeneration(new FHIRGuidePageGeneration(array_merge($ext, $data[self::FIELD_GENERATION]))); + } } else { $this->setGeneration(new FHIRGuidePageGeneration($data[self::FIELD_GENERATION])); } @@ -193,8 +196,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME_URL] instanceof FHIRUrl) { $this->setNameUrl($data[self::FIELD_NAME_URL]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME_URL])) { - $this->setNameUrl(new FHIRUrl([FHIRUrl::FIELD_VALUE => $data[self::FIELD_NAME_URL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME_URL])) { + $this->setNameUrl(new FHIRUrl([FHIRUrl::FIELD_VALUE => $data[self::FIELD_NAME_URL]] + $ext)); + } else if (is_array($data[self::FIELD_NAME_URL])) { + $this->setNameUrl(new FHIRUrl(array_merge($ext, $data[self::FIELD_NAME_URL]))); + } } else { $this->setNameUrl(new FHIRUrl($data[self::FIELD_NAME_URL])); } @@ -202,6 +209,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PAGE])) { if (is_array($data[self::FIELD_PAGE])) { foreach($data[self::FIELD_PAGE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRImplementationGuidePage) { $this->addPage($v); } else { @@ -220,8 +230,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TITLE] instanceof FHIRString) { $this->setTitle($data[self::FIELD_TITLE]); - } elseif ($ext && is_scalar($data[self::FIELD_TITLE])) { - $this->setTitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TITLE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TITLE])) { + $this->setTitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TITLE]] + $ext)); + } else if (is_array($data[self::FIELD_TITLE])) { + $this->setTitle(new FHIRString(array_merge($ext, $data[self::FIELD_TITLE]))); + } } else { $this->setTitle(new FHIRString($data[self::FIELD_TITLE])); } @@ -545,18 +559,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getGeneration())) { $v->xmlSerialize($sxe->addChild(self::FIELD_GENERATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getNameReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NAME_REFERENCE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getNameUrl())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NAME_URL, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getPage())) { foreach($vs as $v) { if (null === $v) { @@ -565,6 +576,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_PAGE, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getTitle())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TITLE, null, $v->_getFHIRXMLNamespace())); } @@ -578,21 +590,43 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getGeneration())) { - $a[self::FIELD_GENERATION] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_GENERATION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_GENERATION_EXT] = $enc; + } + } else { + $a[self::FIELD_GENERATION] = $v; + } } if (null !== ($v = $this->getNameReference())) { $a[self::FIELD_NAME_REFERENCE] = $v; } if (null !== ($v = $this->getNameUrl())) { - $a[self::FIELD_NAME_URL] = $v->getValue(); - $a[self::FIELD_NAME_URL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME_URL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_URL_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME_URL] = $v; + } } if ([] !== ($vs = $this->getPage())) { $a[self::FIELD_PAGE] = $vs; } if (null !== ($v = $this->getTitle())) { - $a[self::FIELD_TITLE] = $v->getValue(); - $a[self::FIELD_TITLE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TITLE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TITLE_EXT] = $enc; + } + } else { + $a[self::FIELD_TITLE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuidePage1.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuidePage1.php index b5fb12e1e8..e3c58510d2 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuidePage1.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuidePage1.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRImplementationGuidePage1 extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_IMPLEMENTATION_GUIDE_DOT_PAGE_1; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ANCHOR = 'anchor'; const FIELD_ANCHOR_EXT = '_anchor'; const FIELD_NAME = 'name'; @@ -124,6 +120,9 @@ class FHIRImplementationGuidePage1 extends FHIRBackboneElement */ protected $title = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRImplementationGuidePage1 Constructor * @param null|array $data @@ -146,17 +145,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_ANCHOR])) { foreach($data[self::FIELD_ANCHOR] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRString) { $this->addAnchor($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addAnchor(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addAnchor(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addAnchor(new FHIRString(array_merge($v, $ext[$i]))); + } } else { $this->addAnchor(new FHIRString($v)); } } } elseif ($data[self::FIELD_ANCHOR] instanceof FHIRString) { $this->addAnchor($data[self::FIELD_ANCHOR]); - } elseif ($ext && is_scalar($data[self::FIELD_ANCHOR])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_ANCHOR])) { $this->addAnchor(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_ANCHOR]] + $ext)); } else { $this->addAnchor(new FHIRString($data[self::FIELD_ANCHOR])); @@ -168,8 +174,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -180,8 +190,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TITLE] instanceof FHIRString) { $this->setTitle($data[self::FIELD_TITLE]); - } elseif ($ext && is_scalar($data[self::FIELD_TITLE])) { - $this->setTitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TITLE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TITLE])) { + $this->setTitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TITLE]] + $ext)); + } else if (is_array($data[self::FIELD_TITLE])) { + $this->setTitle(new FHIRString(array_merge($ext, $data[self::FIELD_TITLE]))); + } } else { $this->setTitle(new FHIRString($data[self::FIELD_TITLE])); } @@ -455,6 +469,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_ANCHOR, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NAME, null, $v->_getFHIRXMLNamespace())); } @@ -476,17 +491,40 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_ANCHOR][] = $v->getValue(); - $a[self::FIELD_ANCHOR_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ANCHOR][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ANCHOR_EXT][] = $enc; + } else { + $a[self::FIELD_ANCHOR_EXT][] = null; + } + } else { + $a[self::FIELD_ANCHOR][] = $v; + } } } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if (null !== ($v = $this->getTitle())) { - $a[self::FIELD_TITLE] = $v->getValue(); - $a[self::FIELD_TITLE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TITLE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TITLE_EXT] = $enc; + } + } else { + $a[self::FIELD_TITLE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuideParameter.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuideParameter.php index 59ec42de41..f782fc6938 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuideParameter.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuideParameter.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -81,10 +81,6 @@ class FHIRImplementationGuideParameter extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_IMPLEMENTATION_GUIDE_DOT_PARAMETER; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CODE = 'code'; const FIELD_CODE_EXT = '_code'; const FIELD_VALUE = 'value'; @@ -113,6 +109,9 @@ class FHIRImplementationGuideParameter extends FHIRBackboneElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRImplementationGuideParameter Constructor * @param null|array $data @@ -139,8 +138,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CODE] instanceof FHIRGuideParameterCode) { $this->setCode($data[self::FIELD_CODE]); - } elseif ($ext && is_scalar($data[self::FIELD_CODE])) { - $this->setCode(new FHIRGuideParameterCode([FHIRGuideParameterCode::FIELD_VALUE => $data[self::FIELD_CODE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CODE])) { + $this->setCode(new FHIRGuideParameterCode([FHIRGuideParameterCode::FIELD_VALUE => $data[self::FIELD_CODE]] + $ext)); + } else if (is_array($data[self::FIELD_CODE])) { + $this->setCode(new FHIRGuideParameterCode(array_merge($ext, $data[self::FIELD_CODE]))); + } } else { $this->setCode(new FHIRGuideParameterCode($data[self::FIELD_CODE])); } @@ -151,8 +154,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE] instanceof FHIRString) { $this->setValue($data[self::FIELD_VALUE]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE])) { - $this->setValue(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VALUE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE])) { + $this->setValue(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VALUE]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE])) { + $this->setValue(new FHIRString(array_merge($ext, $data[self::FIELD_VALUE]))); + } } else { $this->setValue(new FHIRString($data[self::FIELD_VALUE])); } @@ -337,11 +344,11 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getValue())) { + $sxe->addAttribute(self::FIELD_VALUE, (string)$v); $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE, null, $v->_getFHIRXMLNamespace())); } return $sxe; @@ -354,11 +361,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getCode())) { - $a[self::FIELD_CODE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CODE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CODE_EXT] = $enc; + } + } else { + $a[self::FIELD_CODE] = $v; + } } if (null !== ($v = $this->getValue())) { - $a[self::FIELD_VALUE] = $v->getValue(); - $a[self::FIELD_VALUE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuideResource.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuideResource.php index b19df2572e..98a70abe39 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuideResource.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuideResource.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -85,10 +85,6 @@ class FHIRImplementationGuideResource extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_IMPLEMENTATION_GUIDE_DOT_RESOURCE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DESCRIPTION = 'description'; const FIELD_DESCRIPTION_EXT = '_description'; const FIELD_EXAMPLE_BOOLEAN = 'exampleBoolean'; @@ -189,6 +185,9 @@ class FHIRImplementationGuideResource extends FHIRBackboneElement */ protected $reference = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRImplementationGuideResource Constructor * @param null|array $data @@ -211,8 +210,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -223,8 +226,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EXAMPLE_BOOLEAN] instanceof FHIRBoolean) { $this->setExampleBoolean($data[self::FIELD_EXAMPLE_BOOLEAN]); - } elseif ($ext && is_scalar($data[self::FIELD_EXAMPLE_BOOLEAN])) { - $this->setExampleBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_EXAMPLE_BOOLEAN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EXAMPLE_BOOLEAN])) { + $this->setExampleBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_EXAMPLE_BOOLEAN]] + $ext)); + } else if (is_array($data[self::FIELD_EXAMPLE_BOOLEAN])) { + $this->setExampleBoolean(new FHIRBoolean(array_merge($ext, $data[self::FIELD_EXAMPLE_BOOLEAN]))); + } } else { $this->setExampleBoolean(new FHIRBoolean($data[self::FIELD_EXAMPLE_BOOLEAN])); } @@ -235,8 +242,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EXAMPLE_CANONICAL] instanceof FHIRCanonical) { $this->setExampleCanonical($data[self::FIELD_EXAMPLE_CANONICAL]); - } elseif ($ext && is_scalar($data[self::FIELD_EXAMPLE_CANONICAL])) { - $this->setExampleCanonical(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $data[self::FIELD_EXAMPLE_CANONICAL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EXAMPLE_CANONICAL])) { + $this->setExampleCanonical(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $data[self::FIELD_EXAMPLE_CANONICAL]] + $ext)); + } else if (is_array($data[self::FIELD_EXAMPLE_CANONICAL])) { + $this->setExampleCanonical(new FHIRCanonical(array_merge($ext, $data[self::FIELD_EXAMPLE_CANONICAL]))); + } } else { $this->setExampleCanonical(new FHIRCanonical($data[self::FIELD_EXAMPLE_CANONICAL])); } @@ -247,17 +258,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_FHIR_VERSION])) { foreach($data[self::FIELD_FHIR_VERSION] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRFHIRVersion) { $this->addFhirVersion($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addFhirVersion(new FHIRFHIRVersion([FHIRFHIRVersion::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addFhirVersion(new FHIRFHIRVersion([FHIRFHIRVersion::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addFhirVersion(new FHIRFHIRVersion(array_merge($v, $ext[$i]))); + } } else { $this->addFhirVersion(new FHIRFHIRVersion($v)); } } } elseif ($data[self::FIELD_FHIR_VERSION] instanceof FHIRFHIRVersion) { $this->addFhirVersion($data[self::FIELD_FHIR_VERSION]); - } elseif ($ext && is_scalar($data[self::FIELD_FHIR_VERSION])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_FHIR_VERSION])) { $this->addFhirVersion(new FHIRFHIRVersion([FHIRFHIRVersion::FIELD_VALUE => $data[self::FIELD_FHIR_VERSION]] + $ext)); } else { $this->addFhirVersion(new FHIRFHIRVersion($data[self::FIELD_FHIR_VERSION])); @@ -269,8 +287,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_GROUPING_ID] instanceof FHIRId) { $this->setGroupingId($data[self::FIELD_GROUPING_ID]); - } elseif ($ext && is_scalar($data[self::FIELD_GROUPING_ID])) { - $this->setGroupingId(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_GROUPING_ID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_GROUPING_ID])) { + $this->setGroupingId(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_GROUPING_ID]] + $ext)); + } else if (is_array($data[self::FIELD_GROUPING_ID])) { + $this->setGroupingId(new FHIRId(array_merge($ext, $data[self::FIELD_GROUPING_ID]))); + } } else { $this->setGroupingId(new FHIRId($data[self::FIELD_GROUPING_ID])); } @@ -281,8 +303,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -736,7 +762,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getExampleCanonical())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EXAMPLE_CANONICAL, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getFhirVersion())) { foreach($vs as $v) { if (null === $v) { @@ -745,13 +770,13 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_FHIR_VERSION, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getGroupingId())) { $v->xmlSerialize($sxe->addChild(self::FIELD_GROUPING_ID, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NAME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REFERENCE, null, $v->_getFHIRXMLNamespace())); } @@ -765,27 +790,78 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if (null !== ($v = $this->getExampleBoolean())) { - $a[self::FIELD_EXAMPLE_BOOLEAN] = $v->getValue(); - $a[self::FIELD_EXAMPLE_BOOLEAN_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EXAMPLE_BOOLEAN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EXAMPLE_BOOLEAN_EXT] = $enc; + } + } else { + $a[self::FIELD_EXAMPLE_BOOLEAN] = $v; + } } if (null !== ($v = $this->getExampleCanonical())) { - $a[self::FIELD_EXAMPLE_CANONICAL] = $v->getValue(); - $a[self::FIELD_EXAMPLE_CANONICAL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EXAMPLE_CANONICAL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EXAMPLE_CANONICAL_EXT] = $enc; + } + } else { + $a[self::FIELD_EXAMPLE_CANONICAL] = $v; + } } if ([] !== ($vs = $this->getFhirVersion())) { - $a[self::FIELD_FHIR_VERSION] = $vs; + $a[self::FIELD_FHIR_VERSION] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FHIR_VERSION][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FHIR_VERSION_EXT][] = $enc; + } else { + $a[self::FIELD_FHIR_VERSION_EXT][] = null; + } + } else { + $a[self::FIELD_FHIR_VERSION][] = $v; + } + } } if (null !== ($v = $this->getGroupingId())) { - $a[self::FIELD_GROUPING_ID] = $v->getValue(); - $a[self::FIELD_GROUPING_ID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_GROUPING_ID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_GROUPING_ID_EXT] = $enc; + } + } else { + $a[self::FIELD_GROUPING_ID] = $v; + } } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if (null !== ($v = $this->getReference())) { $a[self::FIELD_REFERENCE] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuideResource1.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuideResource1.php index 15d395115a..3f951d021d 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuideResource1.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuideResource1.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -83,10 +83,6 @@ class FHIRImplementationGuideResource1 extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_IMPLEMENTATION_GUIDE_DOT_RESOURCE_1; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_EXAMPLE_BOOLEAN = 'exampleBoolean'; const FIELD_EXAMPLE_BOOLEAN_EXT = '_exampleBoolean'; const FIELD_EXAMPLE_CANONICAL = 'exampleCanonical'; @@ -143,6 +139,9 @@ class FHIRImplementationGuideResource1 extends FHIRBackboneElement */ protected $relativePath = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRImplementationGuideResource1 Constructor * @param null|array $data @@ -165,8 +164,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EXAMPLE_BOOLEAN] instanceof FHIRBoolean) { $this->setExampleBoolean($data[self::FIELD_EXAMPLE_BOOLEAN]); - } elseif ($ext && is_scalar($data[self::FIELD_EXAMPLE_BOOLEAN])) { - $this->setExampleBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_EXAMPLE_BOOLEAN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EXAMPLE_BOOLEAN])) { + $this->setExampleBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_EXAMPLE_BOOLEAN]] + $ext)); + } else if (is_array($data[self::FIELD_EXAMPLE_BOOLEAN])) { + $this->setExampleBoolean(new FHIRBoolean(array_merge($ext, $data[self::FIELD_EXAMPLE_BOOLEAN]))); + } } else { $this->setExampleBoolean(new FHIRBoolean($data[self::FIELD_EXAMPLE_BOOLEAN])); } @@ -177,8 +180,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EXAMPLE_CANONICAL] instanceof FHIRCanonical) { $this->setExampleCanonical($data[self::FIELD_EXAMPLE_CANONICAL]); - } elseif ($ext && is_scalar($data[self::FIELD_EXAMPLE_CANONICAL])) { - $this->setExampleCanonical(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $data[self::FIELD_EXAMPLE_CANONICAL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EXAMPLE_CANONICAL])) { + $this->setExampleCanonical(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $data[self::FIELD_EXAMPLE_CANONICAL]] + $ext)); + } else if (is_array($data[self::FIELD_EXAMPLE_CANONICAL])) { + $this->setExampleCanonical(new FHIRCanonical(array_merge($ext, $data[self::FIELD_EXAMPLE_CANONICAL]))); + } } else { $this->setExampleCanonical(new FHIRCanonical($data[self::FIELD_EXAMPLE_CANONICAL])); } @@ -196,8 +203,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_RELATIVE_PATH] instanceof FHIRUrl) { $this->setRelativePath($data[self::FIELD_RELATIVE_PATH]); - } elseif ($ext && is_scalar($data[self::FIELD_RELATIVE_PATH])) { - $this->setRelativePath(new FHIRUrl([FHIRUrl::FIELD_VALUE => $data[self::FIELD_RELATIVE_PATH]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_RELATIVE_PATH])) { + $this->setRelativePath(new FHIRUrl([FHIRUrl::FIELD_VALUE => $data[self::FIELD_RELATIVE_PATH]] + $ext)); + } else if (is_array($data[self::FIELD_RELATIVE_PATH])) { + $this->setRelativePath(new FHIRUrl(array_merge($ext, $data[self::FIELD_RELATIVE_PATH]))); + } } else { $this->setRelativePath(new FHIRUrl($data[self::FIELD_RELATIVE_PATH])); } @@ -482,7 +493,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getExampleCanonical())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EXAMPLE_CANONICAL, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REFERENCE, null, $v->_getFHIRXMLNamespace())); } @@ -499,19 +509,40 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getExampleBoolean())) { - $a[self::FIELD_EXAMPLE_BOOLEAN] = $v->getValue(); - $a[self::FIELD_EXAMPLE_BOOLEAN_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EXAMPLE_BOOLEAN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EXAMPLE_BOOLEAN_EXT] = $enc; + } + } else { + $a[self::FIELD_EXAMPLE_BOOLEAN] = $v; + } } if (null !== ($v = $this->getExampleCanonical())) { - $a[self::FIELD_EXAMPLE_CANONICAL] = $v->getValue(); - $a[self::FIELD_EXAMPLE_CANONICAL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EXAMPLE_CANONICAL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EXAMPLE_CANONICAL_EXT] = $enc; + } + } else { + $a[self::FIELD_EXAMPLE_CANONICAL] = $v; + } } if (null !== ($v = $this->getReference())) { $a[self::FIELD_REFERENCE] = $v; } if (null !== ($v = $this->getRelativePath())) { - $a[self::FIELD_RELATIVE_PATH] = $v->getValue(); - $a[self::FIELD_RELATIVE_PATH_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_RELATIVE_PATH] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_RELATIVE_PATH_EXT] = $enc; + } + } else { + $a[self::FIELD_RELATIVE_PATH] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuideTemplate.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuideTemplate.php index d3d929f3a1..0d569b36b9 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuideTemplate.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuideTemplate.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -81,10 +81,6 @@ class FHIRImplementationGuideTemplate extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_IMPLEMENTATION_GUIDE_DOT_TEMPLATE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CODE = 'code'; const FIELD_CODE_EXT = '_code'; const FIELD_SCOPE = 'scope'; @@ -126,6 +122,9 @@ class FHIRImplementationGuideTemplate extends FHIRBackboneElement */ protected $source = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRImplementationGuideTemplate Constructor * @param null|array $data @@ -148,8 +147,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CODE] instanceof FHIRCode) { $this->setCode($data[self::FIELD_CODE]); - } elseif ($ext && is_scalar($data[self::FIELD_CODE])) { - $this->setCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_CODE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CODE])) { + $this->setCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_CODE]] + $ext)); + } else if (is_array($data[self::FIELD_CODE])) { + $this->setCode(new FHIRCode(array_merge($ext, $data[self::FIELD_CODE]))); + } } else { $this->setCode(new FHIRCode($data[self::FIELD_CODE])); } @@ -160,8 +163,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SCOPE] instanceof FHIRString) { $this->setScope($data[self::FIELD_SCOPE]); - } elseif ($ext && is_scalar($data[self::FIELD_SCOPE])) { - $this->setScope(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SCOPE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SCOPE])) { + $this->setScope(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SCOPE]] + $ext)); + } else if (is_array($data[self::FIELD_SCOPE])) { + $this->setScope(new FHIRString(array_merge($ext, $data[self::FIELD_SCOPE]))); + } } else { $this->setScope(new FHIRString($data[self::FIELD_SCOPE])); } @@ -172,8 +179,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SOURCE] instanceof FHIRString) { $this->setSource($data[self::FIELD_SOURCE]); - } elseif ($ext && is_scalar($data[self::FIELD_SOURCE])) { - $this->setSource(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SOURCE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SOURCE])) { + $this->setSource(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SOURCE]] + $ext)); + } else if (is_array($data[self::FIELD_SOURCE])) { + $this->setSource(new FHIRString(array_merge($ext, $data[self::FIELD_SOURCE]))); + } } else { $this->setSource(new FHIRString($data[self::FIELD_SOURCE])); } @@ -432,16 +443,37 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getCode())) { - $a[self::FIELD_CODE] = $v->getValue(); - $a[self::FIELD_CODE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CODE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CODE_EXT] = $enc; + } + } else { + $a[self::FIELD_CODE] = $v; + } } if (null !== ($v = $this->getScope())) { - $a[self::FIELD_SCOPE] = $v->getValue(); - $a[self::FIELD_SCOPE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SCOPE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SCOPE_EXT] = $enc; + } + } else { + $a[self::FIELD_SCOPE] = $v; + } } if (null !== ($v = $this->getSource())) { - $a[self::FIELD_SOURCE] = $v->getValue(); - $a[self::FIELD_SOURCE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SOURCE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SOURCE_EXT] = $enc; + } + } else { + $a[self::FIELD_SOURCE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRInsurancePlan/FHIRInsurancePlanBenefit.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRInsurancePlan/FHIRInsurancePlanBenefit.php index 30dc6ca3c6..7f0c19918b 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRInsurancePlan/FHIRInsurancePlanBenefit.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRInsurancePlan/FHIRInsurancePlanBenefit.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRInsurancePlanBenefit extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_INSURANCE_PLAN_DOT_BENEFIT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_LIMIT = 'limit'; const FIELD_LIMIT_EXT = '_limit'; const FIELD_REQUIREMENT = 'requirement'; @@ -120,6 +116,9 @@ class FHIRInsurancePlanBenefit extends FHIRBackboneElement */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRInsurancePlanBenefit Constructor * @param null|array $data @@ -142,17 +141,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_LIMIT])) { foreach($data[self::FIELD_LIMIT] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRInsurancePlanLimit) { $this->addLimit($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addLimit(new FHIRInsurancePlanLimit([FHIRInsurancePlanLimit::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addLimit(new FHIRInsurancePlanLimit([FHIRInsurancePlanLimit::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addLimit(new FHIRInsurancePlanLimit(array_merge($v, $ext[$i]))); + } } else { $this->addLimit(new FHIRInsurancePlanLimit($v)); } } } elseif ($data[self::FIELD_LIMIT] instanceof FHIRInsurancePlanLimit) { $this->addLimit($data[self::FIELD_LIMIT]); - } elseif ($ext && is_scalar($data[self::FIELD_LIMIT])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_LIMIT])) { $this->addLimit(new FHIRInsurancePlanLimit([FHIRInsurancePlanLimit::FIELD_VALUE => $data[self::FIELD_LIMIT]] + $ext)); } else { $this->addLimit(new FHIRInsurancePlanLimit($data[self::FIELD_LIMIT])); @@ -164,8 +170,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_REQUIREMENT] instanceof FHIRString) { $this->setRequirement($data[self::FIELD_REQUIREMENT]); - } elseif ($ext && is_scalar($data[self::FIELD_REQUIREMENT])) { - $this->setRequirement(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_REQUIREMENT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_REQUIREMENT])) { + $this->setRequirement(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_REQUIREMENT]] + $ext)); + } else if (is_array($data[self::FIELD_REQUIREMENT])) { + $this->setRequirement(new FHIRString(array_merge($ext, $data[self::FIELD_REQUIREMENT]))); + } } else { $this->setRequirement(new FHIRString($data[self::FIELD_REQUIREMENT])); } @@ -412,7 +422,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getLimit())) { foreach($vs as $v) { if (null === $v) { @@ -421,10 +430,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_LIMIT, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getRequirement())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REQUIREMENT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -438,11 +447,34 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if ([] !== ($vs = $this->getLimit())) { - $a[self::FIELD_LIMIT] = $vs; + $a[self::FIELD_LIMIT] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_LIMIT][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_LIMIT_EXT][] = $enc; + } else { + $a[self::FIELD_LIMIT_EXT][] = null; + } + } else { + $a[self::FIELD_LIMIT][] = $v; + } + } } if (null !== ($v = $this->getRequirement())) { - $a[self::FIELD_REQUIREMENT] = $v->getValue(); - $a[self::FIELD_REQUIREMENT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_REQUIREMENT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_REQUIREMENT_EXT] = $enc; + } + } else { + $a[self::FIELD_REQUIREMENT] = $v; + } } if (null !== ($v = $this->getType())) { $a[self::FIELD_TYPE] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRInsurancePlan/FHIRInsurancePlanBenefit1.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRInsurancePlan/FHIRInsurancePlanBenefit1.php index c6852023a6..a9e2bd844e 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRInsurancePlan/FHIRInsurancePlanBenefit1.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRInsurancePlan/FHIRInsurancePlanBenefit1.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -77,10 +77,6 @@ class FHIRInsurancePlanBenefit1 extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_INSURANCE_PLAN_DOT_BENEFIT_1; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_COST = 'cost'; const FIELD_COST_EXT = '_cost'; const FIELD_TYPE = 'type'; @@ -107,6 +103,9 @@ class FHIRInsurancePlanBenefit1 extends FHIRBackboneElement */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRInsurancePlanBenefit1 Constructor * @param null|array $data @@ -129,17 +128,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_COST])) { foreach($data[self::FIELD_COST] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRInsurancePlanCost) { $this->addCost($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addCost(new FHIRInsurancePlanCost([FHIRInsurancePlanCost::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addCost(new FHIRInsurancePlanCost([FHIRInsurancePlanCost::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addCost(new FHIRInsurancePlanCost(array_merge($v, $ext[$i]))); + } } else { $this->addCost(new FHIRInsurancePlanCost($v)); } } } elseif ($data[self::FIELD_COST] instanceof FHIRInsurancePlanCost) { $this->addCost($data[self::FIELD_COST]); - } elseif ($ext && is_scalar($data[self::FIELD_COST])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_COST])) { $this->addCost(new FHIRInsurancePlanCost([FHIRInsurancePlanCost::FIELD_VALUE => $data[self::FIELD_COST]] + $ext)); } else { $this->addCost(new FHIRInsurancePlanCost($data[self::FIELD_COST])); @@ -345,7 +351,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getCost())) { foreach($vs as $v) { if (null === $v) { @@ -368,7 +373,23 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if ([] !== ($vs = $this->getCost())) { - $a[self::FIELD_COST] = $vs; + $a[self::FIELD_COST] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_COST][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_COST_EXT][] = $enc; + } else { + $a[self::FIELD_COST_EXT][] = null; + } + } else { + $a[self::FIELD_COST][] = $v; + } + } } if (null !== ($v = $this->getType())) { $a[self::FIELD_TYPE] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRInsurancePlan/FHIRInsurancePlanContact.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRInsurancePlan/FHIRInsurancePlanContact.php index f62f31506a..5b4167a38d 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRInsurancePlan/FHIRInsurancePlanContact.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRInsurancePlan/FHIRInsurancePlanContact.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRInsurancePlanContact extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_INSURANCE_PLAN_DOT_CONTACT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ADDRESS = 'address'; const FIELD_NAME = 'name'; const FIELD_PURPOSE = 'purpose'; @@ -141,6 +137,9 @@ class FHIRInsurancePlanContact extends FHIRBackboneElement */ protected $telecom = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRInsurancePlanContact Constructor * @param null|array $data @@ -184,17 +183,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_TELECOM])) { foreach($data[self::FIELD_TELECOM] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContactPoint) { $this->addTelecom($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addTelecom(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addTelecom(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addTelecom(new FHIRContactPoint(array_merge($v, $ext[$i]))); + } } else { $this->addTelecom(new FHIRContactPoint($v)); } } } elseif ($data[self::FIELD_TELECOM] instanceof FHIRContactPoint) { $this->addTelecom($data[self::FIELD_TELECOM]); - } elseif ($ext && is_scalar($data[self::FIELD_TELECOM])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_TELECOM])) { $this->addTelecom(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $data[self::FIELD_TELECOM]] + $ext)); } else { $this->addTelecom(new FHIRContactPoint($data[self::FIELD_TELECOM])); @@ -477,19 +483,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getAddress())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ADDRESS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NAME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPurpose())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PURPOSE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getTelecom())) { foreach($vs as $v) { if (null === $v) { @@ -498,6 +500,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_TELECOM, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } @@ -517,7 +520,23 @@ public function jsonSerialize() $a[self::FIELD_PURPOSE] = $v; } if ([] !== ($vs = $this->getTelecom())) { - $a[self::FIELD_TELECOM] = $vs; + $a[self::FIELD_TELECOM] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TELECOM][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TELECOM_EXT][] = $enc; + } else { + $a[self::FIELD_TELECOM_EXT][] = null; + } + } else { + $a[self::FIELD_TELECOM][] = $v; + } + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRInsurancePlan/FHIRInsurancePlanCost.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRInsurancePlan/FHIRInsurancePlanCost.php index a0ded8d698..8aade35050 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRInsurancePlan/FHIRInsurancePlanCost.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRInsurancePlan/FHIRInsurancePlanCost.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRInsurancePlanCost extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_INSURANCE_PLAN_DOT_COST; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_APPLICABILITY = 'applicability'; const FIELD_QUALIFIERS = 'qualifiers'; const FIELD_TYPE = 'type'; @@ -140,6 +136,9 @@ class FHIRInsurancePlanCost extends FHIRBackboneElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRInsurancePlanCost Constructor * @param null|array $data @@ -170,6 +169,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_QUALIFIERS])) { if (is_array($data[self::FIELD_QUALIFIERS])) { foreach($data[self::FIELD_QUALIFIERS] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addQualifiers($v); } else { @@ -195,8 +197,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE] instanceof FHIRQuantity) { $this->setValue($data[self::FIELD_VALUE]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE])) { - $this->setValue(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_VALUE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE])) { + $this->setValue(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_VALUE]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE])) { + $this->setValue(new FHIRQuantity(array_merge($ext, $data[self::FIELD_VALUE]))); + } } else { $this->setValue(new FHIRQuantity($data[self::FIELD_VALUE])); } @@ -480,11 +486,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getApplicability())) { $v->xmlSerialize($sxe->addChild(self::FIELD_APPLICABILITY, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getQualifiers())) { foreach($vs as $v) { if (null === $v) { @@ -497,8 +501,8 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValue())) { + $sxe->addAttribute(self::FIELD_VALUE, (string)$v); $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE, null, $v->_getFHIRXMLNamespace())); } return $sxe; @@ -520,7 +524,15 @@ public function jsonSerialize() $a[self::FIELD_TYPE] = $v; } if (null !== ($v = $this->getValue())) { - $a[self::FIELD_VALUE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRInsurancePlan/FHIRInsurancePlanCoverage.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRInsurancePlan/FHIRInsurancePlanCoverage.php index 72d0d3adc9..f25c274e9d 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRInsurancePlan/FHIRInsurancePlanCoverage.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRInsurancePlan/FHIRInsurancePlanCoverage.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRInsurancePlanCoverage extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_INSURANCE_PLAN_DOT_COVERAGE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_BENEFIT = 'benefit'; const FIELD_NETWORK = 'network'; const FIELD_TYPE = 'type'; @@ -119,6 +115,9 @@ class FHIRInsurancePlanCoverage extends FHIRBackboneElement */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRInsurancePlanCoverage Constructor * @param null|array $data @@ -138,6 +137,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_BENEFIT])) { if (is_array($data[self::FIELD_BENEFIT])) { foreach($data[self::FIELD_BENEFIT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRInsurancePlanBenefit) { $this->addBenefit($v); } else { @@ -153,6 +155,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_NETWORK])) { if (is_array($data[self::FIELD_NETWORK])) { foreach($data[self::FIELD_NETWORK] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addNetwork($v); } else { @@ -426,7 +431,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getBenefit())) { foreach($vs as $v) { if (null === $v) { diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRInsurancePlan/FHIRInsurancePlanGeneralCost.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRInsurancePlan/FHIRInsurancePlanGeneralCost.php index 1185ea9f5e..ff43406269 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRInsurancePlan/FHIRInsurancePlanGeneralCost.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRInsurancePlan/FHIRInsurancePlanGeneralCost.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRInsurancePlanGeneralCost extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_INSURANCE_PLAN_DOT_GENERAL_COST; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_COMMENT = 'comment'; const FIELD_COMMENT_EXT = '_comment'; const FIELD_COST = 'cost'; @@ -137,6 +133,9 @@ class FHIRInsurancePlanGeneralCost extends FHIRBackboneElement */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRInsurancePlanGeneralCost Constructor * @param null|array $data @@ -159,8 +158,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_COMMENT] instanceof FHIRString) { $this->setComment($data[self::FIELD_COMMENT]); - } elseif ($ext && is_scalar($data[self::FIELD_COMMENT])) { - $this->setComment(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_COMMENT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_COMMENT])) { + $this->setComment(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_COMMENT]] + $ext)); + } else if (is_array($data[self::FIELD_COMMENT])) { + $this->setComment(new FHIRString(array_merge($ext, $data[self::FIELD_COMMENT]))); + } } else { $this->setComment(new FHIRString($data[self::FIELD_COMMENT])); } @@ -171,8 +174,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_COST] instanceof FHIRMoney) { $this->setCost($data[self::FIELD_COST]); - } elseif ($ext && is_scalar($data[self::FIELD_COST])) { - $this->setCost(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_COST]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_COST])) { + $this->setCost(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_COST]] + $ext)); + } else if (is_array($data[self::FIELD_COST])) { + $this->setCost(new FHIRMoney(array_merge($ext, $data[self::FIELD_COST]))); + } } else { $this->setCost(new FHIRMoney($data[self::FIELD_COST])); } @@ -183,8 +190,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_GROUP_SIZE] instanceof FHIRPositiveInt) { $this->setGroupSize($data[self::FIELD_GROUP_SIZE]); - } elseif ($ext && is_scalar($data[self::FIELD_GROUP_SIZE])) { - $this->setGroupSize(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_GROUP_SIZE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_GROUP_SIZE])) { + $this->setGroupSize(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_GROUP_SIZE]] + $ext)); + } else if (is_array($data[self::FIELD_GROUP_SIZE])) { + $this->setGroupSize(new FHIRPositiveInt(array_merge($ext, $data[self::FIELD_GROUP_SIZE]))); + } } else { $this->setGroupSize(new FHIRPositiveInt($data[self::FIELD_GROUP_SIZE])); } @@ -456,14 +467,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getComment())) { $v->xmlSerialize($sxe->addChild(self::FIELD_COMMENT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getCost())) { $v->xmlSerialize($sxe->addChild(self::FIELD_COST, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getGroupSize())) { $v->xmlSerialize($sxe->addChild(self::FIELD_GROUP_SIZE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -477,15 +486,37 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getComment())) { - $a[self::FIELD_COMMENT] = $v->getValue(); - $a[self::FIELD_COMMENT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_COMMENT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_COMMENT_EXT] = $enc; + } + } else { + $a[self::FIELD_COMMENT] = $v; + } } if (null !== ($v = $this->getCost())) { - $a[self::FIELD_COST] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_COST] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_COST_EXT] = $enc; + } + } else { + $a[self::FIELD_COST] = $v; + } } if (null !== ($v = $this->getGroupSize())) { - $a[self::FIELD_GROUP_SIZE] = $v->getValue(); - $a[self::FIELD_GROUP_SIZE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_GROUP_SIZE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_GROUP_SIZE_EXT] = $enc; + } + } else { + $a[self::FIELD_GROUP_SIZE] = $v; + } } if (null !== ($v = $this->getType())) { $a[self::FIELD_TYPE] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRInsurancePlan/FHIRInsurancePlanLimit.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRInsurancePlan/FHIRInsurancePlanLimit.php index 9c5cac8a81..484e5bb674 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRInsurancePlan/FHIRInsurancePlanLimit.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRInsurancePlan/FHIRInsurancePlanLimit.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRInsurancePlanLimit extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_INSURANCE_PLAN_DOT_LIMIT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CODE = 'code'; const FIELD_VALUE = 'value'; const FIELD_VALUE_EXT = '_value'; @@ -112,6 +108,9 @@ class FHIRInsurancePlanLimit extends FHIRBackboneElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRInsurancePlanLimit Constructor * @param null|array $data @@ -145,8 +144,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE] instanceof FHIRQuantity) { $this->setValue($data[self::FIELD_VALUE]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE])) { - $this->setValue(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_VALUE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE])) { + $this->setValue(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_VALUE]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE])) { + $this->setValue(new FHIRQuantity(array_merge($ext, $data[self::FIELD_VALUE]))); + } } else { $this->setValue(new FHIRQuantity($data[self::FIELD_VALUE])); } @@ -326,12 +329,11 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValue())) { + $sxe->addAttribute(self::FIELD_VALUE, (string)$v); $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE, null, $v->_getFHIRXMLNamespace())); } return $sxe; @@ -347,7 +349,15 @@ public function jsonSerialize() $a[self::FIELD_CODE] = $v; } if (null !== ($v = $this->getValue())) { - $a[self::FIELD_VALUE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRInsurancePlan/FHIRInsurancePlanPlan.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRInsurancePlan/FHIRInsurancePlanPlan.php index cf8fcbbcf5..957ab818b3 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRInsurancePlan/FHIRInsurancePlanPlan.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRInsurancePlan/FHIRInsurancePlanPlan.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRInsurancePlanPlan extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_INSURANCE_PLAN_DOT_PLAN; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_COVERAGE_AREA = 'coverageArea'; const FIELD_GENERAL_COST = 'generalCost'; const FIELD_IDENTIFIER = 'identifier'; @@ -156,6 +152,9 @@ class FHIRInsurancePlanPlan extends FHIRBackboneElement */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRInsurancePlanPlan Constructor * @param null|array $data @@ -175,6 +174,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_COVERAGE_AREA])) { if (is_array($data[self::FIELD_COVERAGE_AREA])) { foreach($data[self::FIELD_COVERAGE_AREA] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addCoverageArea($v); } else { @@ -190,6 +192,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_GENERAL_COST])) { if (is_array($data[self::FIELD_GENERAL_COST])) { foreach($data[self::FIELD_GENERAL_COST] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRInsurancePlanGeneralCost) { $this->addGeneralCost($v); } else { @@ -208,17 +213,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -227,6 +239,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_NETWORK])) { if (is_array($data[self::FIELD_NETWORK])) { foreach($data[self::FIELD_NETWORK] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addNetwork($v); } else { @@ -242,6 +257,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SPECIFIC_COST])) { if (is_array($data[self::FIELD_SPECIFIC_COST])) { foreach($data[self::FIELD_SPECIFIC_COST] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRInsurancePlanSpecificCost) { $this->addSpecificCost($v); } else { @@ -696,7 +714,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getCoverageArea())) { foreach($vs as $v) { if (null === $v) { @@ -761,7 +778,23 @@ public function jsonSerialize() $a[self::FIELD_GENERAL_COST] = $vs; } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if ([] !== ($vs = $this->getNetwork())) { $a[self::FIELD_NETWORK] = $vs; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRInsurancePlan/FHIRInsurancePlanSpecificCost.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRInsurancePlan/FHIRInsurancePlanSpecificCost.php index d7689902a2..fc4b9ec8bb 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRInsurancePlan/FHIRInsurancePlanSpecificCost.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRInsurancePlan/FHIRInsurancePlanSpecificCost.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -77,10 +77,6 @@ class FHIRInsurancePlanSpecificCost extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_INSURANCE_PLAN_DOT_SPECIFIC_COST; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_BENEFIT = 'benefit'; const FIELD_CATEGORY = 'category'; @@ -106,6 +102,9 @@ class FHIRInsurancePlanSpecificCost extends FHIRBackboneElement */ protected $category = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRInsurancePlanSpecificCost Constructor * @param null|array $data @@ -125,6 +124,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_BENEFIT])) { if (is_array($data[self::FIELD_BENEFIT])) { foreach($data[self::FIELD_BENEFIT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRInsurancePlanBenefit1) { $this->addBenefit($v); } else { @@ -337,7 +339,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getBenefit())) { foreach($vs as $v) { if (null === $v) { diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRInvoice/FHIRInvoiceLineItem.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRInvoice/FHIRInvoiceLineItem.php index ada98cfefe..b2b116524d 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRInvoice/FHIRInvoiceLineItem.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRInvoice/FHIRInvoiceLineItem.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRInvoiceLineItem extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_INVOICE_DOT_LINE_ITEM; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CHARGE_ITEM_CODEABLE_CONCEPT = 'chargeItemCodeableConcept'; const FIELD_CHARGE_ITEM_REFERENCE = 'chargeItemReference'; const FIELD_PRICE_COMPONENT = 'priceComponent'; @@ -145,6 +141,9 @@ class FHIRInvoiceLineItem extends FHIRBackboneElement */ protected $sequence = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRInvoiceLineItem Constructor * @param null|array $data @@ -178,6 +177,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PRICE_COMPONENT])) { if (is_array($data[self::FIELD_PRICE_COMPONENT])) { foreach($data[self::FIELD_PRICE_COMPONENT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRInvoicePriceComponent) { $this->addPriceComponent($v); } else { @@ -196,8 +198,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SEQUENCE] instanceof FHIRPositiveInt) { $this->setSequence($data[self::FIELD_SEQUENCE]); - } elseif ($ext && is_scalar($data[self::FIELD_SEQUENCE])) { - $this->setSequence(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_SEQUENCE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SEQUENCE])) { + $this->setSequence(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_SEQUENCE]] + $ext)); + } else if (is_array($data[self::FIELD_SEQUENCE])) { + $this->setSequence(new FHIRPositiveInt(array_merge($ext, $data[self::FIELD_SEQUENCE]))); + } } else { $this->setSequence(new FHIRPositiveInt($data[self::FIELD_SEQUENCE])); } @@ -500,15 +506,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getChargeItemCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CHARGE_ITEM_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getChargeItemReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CHARGE_ITEM_REFERENCE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getPriceComponent())) { foreach($vs as $v) { if (null === $v) { @@ -517,6 +520,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_PRICE_COMPONENT, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getSequence())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SEQUENCE, null, $v->_getFHIRXMLNamespace())); } @@ -539,8 +543,15 @@ public function jsonSerialize() $a[self::FIELD_PRICE_COMPONENT] = $vs; } if (null !== ($v = $this->getSequence())) { - $a[self::FIELD_SEQUENCE] = $v->getValue(); - $a[self::FIELD_SEQUENCE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SEQUENCE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SEQUENCE_EXT] = $enc; + } + } else { + $a[self::FIELD_SEQUENCE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRInvoice/FHIRInvoiceParticipant.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRInvoice/FHIRInvoiceParticipant.php index c078d42622..b3b1aa0c20 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRInvoice/FHIRInvoiceParticipant.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRInvoice/FHIRInvoiceParticipant.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRInvoiceParticipant extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_INVOICE_DOT_PARTICIPANT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ACTOR = 'actor'; const FIELD_ROLE = 'role'; @@ -111,6 +107,9 @@ class FHIRInvoiceParticipant extends FHIRBackboneElement */ protected $role = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRInvoiceParticipant Constructor * @param null|array $data @@ -314,11 +313,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getActor())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ACTOR, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRole())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ROLE, null, $v->_getFHIRXMLNamespace())); } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRInvoice/FHIRInvoicePriceComponent.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRInvoice/FHIRInvoicePriceComponent.php index 31ca452034..dad973d6d3 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRInvoice/FHIRInvoicePriceComponent.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRInvoice/FHIRInvoicePriceComponent.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -81,10 +81,6 @@ class FHIRInvoicePriceComponent extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_INVOICE_DOT_PRICE_COMPONENT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_AMOUNT = 'amount'; const FIELD_AMOUNT_EXT = '_amount'; const FIELD_CODE = 'code'; @@ -140,6 +136,9 @@ class FHIRInvoicePriceComponent extends FHIRBackboneElement */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRInvoicePriceComponent Constructor * @param null|array $data @@ -162,8 +161,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_AMOUNT] instanceof FHIRMoney) { $this->setAmount($data[self::FIELD_AMOUNT]); - } elseif ($ext && is_scalar($data[self::FIELD_AMOUNT])) { - $this->setAmount(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_AMOUNT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_AMOUNT])) { + $this->setAmount(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_AMOUNT]] + $ext)); + } else if (is_array($data[self::FIELD_AMOUNT])) { + $this->setAmount(new FHIRMoney(array_merge($ext, $data[self::FIELD_AMOUNT]))); + } } else { $this->setAmount(new FHIRMoney($data[self::FIELD_AMOUNT])); } @@ -181,8 +184,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_FACTOR] instanceof FHIRDecimal) { $this->setFactor($data[self::FIELD_FACTOR]); - } elseif ($ext && is_scalar($data[self::FIELD_FACTOR])) { - $this->setFactor(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_FACTOR]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_FACTOR])) { + $this->setFactor(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_FACTOR]] + $ext)); + } else if (is_array($data[self::FIELD_FACTOR])) { + $this->setFactor(new FHIRDecimal(array_merge($ext, $data[self::FIELD_FACTOR]))); + } } else { $this->setFactor(new FHIRDecimal($data[self::FIELD_FACTOR])); } @@ -193,8 +200,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TYPE] instanceof FHIRInvoicePriceComponentType) { $this->setType($data[self::FIELD_TYPE]); - } elseif ($ext && is_scalar($data[self::FIELD_TYPE])) { - $this->setType(new FHIRInvoicePriceComponentType([FHIRInvoicePriceComponentType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TYPE])) { + $this->setType(new FHIRInvoicePriceComponentType([FHIRInvoicePriceComponentType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } else if (is_array($data[self::FIELD_TYPE])) { + $this->setType(new FHIRInvoicePriceComponentType(array_merge($ext, $data[self::FIELD_TYPE]))); + } } else { $this->setType(new FHIRInvoicePriceComponentType($data[self::FIELD_TYPE])); } @@ -449,18 +460,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getAmount())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AMOUNT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getFactor())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FACTOR, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -474,17 +482,40 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getAmount())) { - $a[self::FIELD_AMOUNT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_AMOUNT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_AMOUNT_EXT] = $enc; + } + } else { + $a[self::FIELD_AMOUNT] = $v; + } } if (null !== ($v = $this->getCode())) { $a[self::FIELD_CODE] = $v; } if (null !== ($v = $this->getFactor())) { - $a[self::FIELD_FACTOR] = $v->getValue(); - $a[self::FIELD_FACTOR_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FACTOR] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FACTOR_EXT] = $enc; + } + } else { + $a[self::FIELD_FACTOR] = $v; + } } if (null !== ($v = $this->getType())) { - $a[self::FIELD_TYPE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TYPE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TYPE_EXT] = $enc; + } + } else { + $a[self::FIELD_TYPE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRLinkage/FHIRLinkageItem.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRLinkage/FHIRLinkageItem.php index 32b90bf3ad..c9a9c4e325 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRLinkage/FHIRLinkageItem.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRLinkage/FHIRLinkageItem.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRLinkageItem extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_LINKAGE_DOT_ITEM; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_RESOURCE = 'resource'; const FIELD_TYPE = 'type'; const FIELD_TYPE_EXT = '_type'; @@ -110,6 +106,9 @@ class FHIRLinkageItem extends FHIRBackboneElement */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRLinkageItem Constructor * @param null|array $data @@ -139,8 +138,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TYPE] instanceof FHIRLinkageType) { $this->setType($data[self::FIELD_TYPE]); - } elseif ($ext && is_scalar($data[self::FIELD_TYPE])) { - $this->setType(new FHIRLinkageType([FHIRLinkageType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TYPE])) { + $this->setType(new FHIRLinkageType([FHIRLinkageType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } else if (is_array($data[self::FIELD_TYPE])) { + $this->setType(new FHIRLinkageType(array_merge($ext, $data[self::FIELD_TYPE]))); + } } else { $this->setType(new FHIRLinkageType($data[self::FIELD_TYPE])); } @@ -314,11 +317,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getResource())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RESOURCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -335,7 +336,15 @@ public function jsonSerialize() $a[self::FIELD_RESOURCE] = $v; } if (null !== ($v = $this->getType())) { - $a[self::FIELD_TYPE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TYPE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TYPE_EXT] = $enc; + } + } else { + $a[self::FIELD_TYPE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRList/FHIRListEntry.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRList/FHIRListEntry.php index 5916519713..bb8a66ac24 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRList/FHIRListEntry.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRList/FHIRListEntry.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRListEntry extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_LIST_DOT_ENTRY; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DATE = 'date'; const FIELD_DATE_EXT = '_date'; const FIELD_DELETED = 'deleted'; @@ -139,6 +135,9 @@ class FHIRListEntry extends FHIRBackboneElement */ protected $item = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRListEntry Constructor * @param null|array $data @@ -161,8 +160,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATE] instanceof FHIRDateTime) { $this->setDate($data[self::FIELD_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_DATE])) { - $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime(array_merge($ext, $data[self::FIELD_DATE]))); + } } else { $this->setDate(new FHIRDateTime($data[self::FIELD_DATE])); } @@ -173,8 +176,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DELETED] instanceof FHIRBoolean) { $this->setDeleted($data[self::FIELD_DELETED]); - } elseif ($ext && is_scalar($data[self::FIELD_DELETED])) { - $this->setDeleted(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_DELETED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DELETED])) { + $this->setDeleted(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_DELETED]] + $ext)); + } else if (is_array($data[self::FIELD_DELETED])) { + $this->setDeleted(new FHIRBoolean(array_merge($ext, $data[self::FIELD_DELETED]))); + } } else { $this->setDeleted(new FHIRBoolean($data[self::FIELD_DELETED])); } @@ -462,11 +469,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDeleted())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DELETED, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getFlag())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FLAG, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getItem())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ITEM, null, $v->_getFHIRXMLNamespace())); } @@ -480,12 +485,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getDate())) { - $a[self::FIELD_DATE] = $v->getValue(); - $a[self::FIELD_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_DATE] = $v; + } } if (null !== ($v = $this->getDeleted())) { - $a[self::FIELD_DELETED] = $v->getValue(); - $a[self::FIELD_DELETED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DELETED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DELETED_EXT] = $enc; + } + } else { + $a[self::FIELD_DELETED] = $v; + } } if (null !== ($v = $this->getFlag())) { $a[self::FIELD_FLAG] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRLocation/FHIRLocationHoursOfOperation.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRLocation/FHIRLocationHoursOfOperation.php index 749b4af2c2..f169c7c403 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRLocation/FHIRLocationHoursOfOperation.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRLocation/FHIRLocationHoursOfOperation.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -81,10 +81,6 @@ class FHIRLocationHoursOfOperation extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_LOCATION_DOT_HOURS_OF_OPERATION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ALL_DAY = 'allDay'; const FIELD_ALL_DAY_EXT = '_allDay'; const FIELD_CLOSING_TIME = 'closingTime'; @@ -134,6 +130,9 @@ class FHIRLocationHoursOfOperation extends FHIRBackboneElement */ protected $openingTime = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRLocationHoursOfOperation Constructor * @param null|array $data @@ -156,8 +155,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ALL_DAY] instanceof FHIRBoolean) { $this->setAllDay($data[self::FIELD_ALL_DAY]); - } elseif ($ext && is_scalar($data[self::FIELD_ALL_DAY])) { - $this->setAllDay(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_ALL_DAY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ALL_DAY])) { + $this->setAllDay(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_ALL_DAY]] + $ext)); + } else if (is_array($data[self::FIELD_ALL_DAY])) { + $this->setAllDay(new FHIRBoolean(array_merge($ext, $data[self::FIELD_ALL_DAY]))); + } } else { $this->setAllDay(new FHIRBoolean($data[self::FIELD_ALL_DAY])); } @@ -168,8 +171,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CLOSING_TIME] instanceof FHIRTime) { $this->setClosingTime($data[self::FIELD_CLOSING_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_CLOSING_TIME])) { - $this->setClosingTime(new FHIRTime([FHIRTime::FIELD_VALUE => $data[self::FIELD_CLOSING_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CLOSING_TIME])) { + $this->setClosingTime(new FHIRTime([FHIRTime::FIELD_VALUE => $data[self::FIELD_CLOSING_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_CLOSING_TIME])) { + $this->setClosingTime(new FHIRTime(array_merge($ext, $data[self::FIELD_CLOSING_TIME]))); + } } else { $this->setClosingTime(new FHIRTime($data[self::FIELD_CLOSING_TIME])); } @@ -180,17 +187,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_DAYS_OF_WEEK])) { foreach($data[self::FIELD_DAYS_OF_WEEK] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRDaysOfWeek) { $this->addDaysOfWeek($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addDaysOfWeek(new FHIRDaysOfWeek([FHIRDaysOfWeek::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addDaysOfWeek(new FHIRDaysOfWeek([FHIRDaysOfWeek::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addDaysOfWeek(new FHIRDaysOfWeek(array_merge($v, $ext[$i]))); + } } else { $this->addDaysOfWeek(new FHIRDaysOfWeek($v)); } } } elseif ($data[self::FIELD_DAYS_OF_WEEK] instanceof FHIRDaysOfWeek) { $this->addDaysOfWeek($data[self::FIELD_DAYS_OF_WEEK]); - } elseif ($ext && is_scalar($data[self::FIELD_DAYS_OF_WEEK])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_DAYS_OF_WEEK])) { $this->addDaysOfWeek(new FHIRDaysOfWeek([FHIRDaysOfWeek::FIELD_VALUE => $data[self::FIELD_DAYS_OF_WEEK]] + $ext)); } else { $this->addDaysOfWeek(new FHIRDaysOfWeek($data[self::FIELD_DAYS_OF_WEEK])); @@ -202,8 +216,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_OPENING_TIME] instanceof FHIRTime) { $this->setOpeningTime($data[self::FIELD_OPENING_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_OPENING_TIME])) { - $this->setOpeningTime(new FHIRTime([FHIRTime::FIELD_VALUE => $data[self::FIELD_OPENING_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_OPENING_TIME])) { + $this->setOpeningTime(new FHIRTime([FHIRTime::FIELD_VALUE => $data[self::FIELD_OPENING_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_OPENING_TIME])) { + $this->setOpeningTime(new FHIRTime(array_merge($ext, $data[self::FIELD_OPENING_TIME]))); + } } else { $this->setOpeningTime(new FHIRTime($data[self::FIELD_OPENING_TIME])); } @@ -499,7 +517,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getClosingTime())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CLOSING_TIME, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getDaysOfWeek())) { foreach($vs as $v) { if (null === $v) { @@ -508,6 +525,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_DAYS_OF_WEEK, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getOpeningTime())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OPENING_TIME, null, $v->_getFHIRXMLNamespace())); } @@ -521,19 +539,56 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getAllDay())) { - $a[self::FIELD_ALL_DAY] = $v->getValue(); - $a[self::FIELD_ALL_DAY_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ALL_DAY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ALL_DAY_EXT] = $enc; + } + } else { + $a[self::FIELD_ALL_DAY] = $v; + } } if (null !== ($v = $this->getClosingTime())) { - $a[self::FIELD_CLOSING_TIME] = $v->getValue(); - $a[self::FIELD_CLOSING_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CLOSING_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CLOSING_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_CLOSING_TIME] = $v; + } } if ([] !== ($vs = $this->getDaysOfWeek())) { - $a[self::FIELD_DAYS_OF_WEEK] = $vs; + $a[self::FIELD_DAYS_OF_WEEK] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DAYS_OF_WEEK][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DAYS_OF_WEEK_EXT][] = $enc; + } else { + $a[self::FIELD_DAYS_OF_WEEK_EXT][] = null; + } + } else { + $a[self::FIELD_DAYS_OF_WEEK][] = $v; + } + } } if (null !== ($v = $this->getOpeningTime())) { - $a[self::FIELD_OPENING_TIME] = $v->getValue(); - $a[self::FIELD_OPENING_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_OPENING_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_OPENING_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_OPENING_TIME] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRLocation/FHIRLocationPosition.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRLocation/FHIRLocationPosition.php index 4f775df598..848e09aaa3 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRLocation/FHIRLocationPosition.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRLocation/FHIRLocationPosition.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRLocationPosition extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_LOCATION_DOT_POSITION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ALTITUDE = 'altitude'; const FIELD_ALTITUDE_EXT = '_altitude'; const FIELD_LATITUDE = 'latitude'; @@ -129,6 +125,9 @@ class FHIRLocationPosition extends FHIRBackboneElement */ protected $longitude = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRLocationPosition Constructor * @param null|array $data @@ -151,8 +150,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ALTITUDE] instanceof FHIRDecimal) { $this->setAltitude($data[self::FIELD_ALTITUDE]); - } elseif ($ext && is_scalar($data[self::FIELD_ALTITUDE])) { - $this->setAltitude(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_ALTITUDE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ALTITUDE])) { + $this->setAltitude(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_ALTITUDE]] + $ext)); + } else if (is_array($data[self::FIELD_ALTITUDE])) { + $this->setAltitude(new FHIRDecimal(array_merge($ext, $data[self::FIELD_ALTITUDE]))); + } } else { $this->setAltitude(new FHIRDecimal($data[self::FIELD_ALTITUDE])); } @@ -163,8 +166,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_LATITUDE] instanceof FHIRDecimal) { $this->setLatitude($data[self::FIELD_LATITUDE]); - } elseif ($ext && is_scalar($data[self::FIELD_LATITUDE])) { - $this->setLatitude(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_LATITUDE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_LATITUDE])) { + $this->setLatitude(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_LATITUDE]] + $ext)); + } else if (is_array($data[self::FIELD_LATITUDE])) { + $this->setLatitude(new FHIRDecimal(array_merge($ext, $data[self::FIELD_LATITUDE]))); + } } else { $this->setLatitude(new FHIRDecimal($data[self::FIELD_LATITUDE])); } @@ -175,8 +182,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_LONGITUDE] instanceof FHIRDecimal) { $this->setLongitude($data[self::FIELD_LONGITUDE]); - } elseif ($ext && is_scalar($data[self::FIELD_LONGITUDE])) { - $this->setLongitude(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_LONGITUDE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_LONGITUDE])) { + $this->setLongitude(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_LONGITUDE]] + $ext)); + } else if (is_array($data[self::FIELD_LONGITUDE])) { + $this->setLongitude(new FHIRDecimal(array_merge($ext, $data[self::FIELD_LONGITUDE]))); + } } else { $this->setLongitude(new FHIRDecimal($data[self::FIELD_LONGITUDE])); } @@ -445,16 +456,37 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getAltitude())) { - $a[self::FIELD_ALTITUDE] = $v->getValue(); - $a[self::FIELD_ALTITUDE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ALTITUDE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ALTITUDE_EXT] = $enc; + } + } else { + $a[self::FIELD_ALTITUDE] = $v; + } } if (null !== ($v = $this->getLatitude())) { - $a[self::FIELD_LATITUDE] = $v->getValue(); - $a[self::FIELD_LATITUDE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_LATITUDE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_LATITUDE_EXT] = $enc; + } + } else { + $a[self::FIELD_LATITUDE] = $v; + } } if (null !== ($v = $this->getLongitude())) { - $a[self::FIELD_LONGITUDE] = $v->getValue(); - $a[self::FIELD_LONGITUDE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_LONGITUDE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_LONGITUDE_EXT] = $enc; + } + } else { + $a[self::FIELD_LONGITUDE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMarketingStatus.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMarketingStatus.php index 93c591edb5..d951c7960a 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMarketingStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMarketingStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -82,10 +82,6 @@ class FHIRMarketingStatus extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MARKETING_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_COUNTRY = 'country'; const FIELD_DATE_RANGE = 'dateRange'; const FIELD_JURISDICTION = 'jurisdiction'; @@ -169,6 +165,9 @@ class FHIRMarketingStatus extends FHIRBackboneElement */ protected $status = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMarketingStatus Constructor * @param null|array $data @@ -212,8 +211,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_RESTORE_DATE] instanceof FHIRDateTime) { $this->setRestoreDate($data[self::FIELD_RESTORE_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_RESTORE_DATE])) { - $this->setRestoreDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_RESTORE_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_RESTORE_DATE])) { + $this->setRestoreDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_RESTORE_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_RESTORE_DATE])) { + $this->setRestoreDate(new FHIRDateTime(array_merge($ext, $data[self::FIELD_RESTORE_DATE]))); + } } else { $this->setRestoreDate(new FHIRDateTime($data[self::FIELD_RESTORE_DATE])); } @@ -544,22 +547,18 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getCountry())) { $v->xmlSerialize($sxe->addChild(self::FIELD_COUNTRY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDateRange())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DATE_RANGE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getJurisdiction())) { $v->xmlSerialize($sxe->addChild(self::FIELD_JURISDICTION, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getRestoreDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RESTORE_DATE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } @@ -582,8 +581,15 @@ public function jsonSerialize() $a[self::FIELD_JURISDICTION] = $v; } if (null !== ($v = $this->getRestoreDate())) { - $a[self::FIELD_RESTORE_DATE] = $v->getValue(); - $a[self::FIELD_RESTORE_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_RESTORE_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_RESTORE_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_RESTORE_DATE] = $v; + } } if (null !== ($v = $this->getStatus())) { $a[self::FIELD_STATUS] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMeasure/FHIRMeasureComponent.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMeasure/FHIRMeasureComponent.php index 8e743b692f..b134a57a77 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMeasure/FHIRMeasureComponent.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMeasure/FHIRMeasureComponent.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRMeasureComponent extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MEASURE_DOT_COMPONENT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CODE = 'code'; const FIELD_CRITERIA = 'criteria'; const FIELD_DESCRIPTION = 'description'; @@ -128,6 +124,9 @@ class FHIRMeasureComponent extends FHIRBackboneElement */ protected $description = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMeasureComponent Constructor * @param null|array $data @@ -164,8 +163,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -395,11 +398,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getCriteria())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CRITERIA, null, $v->_getFHIRXMLNamespace())); } @@ -422,8 +423,15 @@ public function jsonSerialize() $a[self::FIELD_CRITERIA] = $v; } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMeasure/FHIRMeasureGroup.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMeasure/FHIRMeasureGroup.php index ac10ec1202..1f6e0422d1 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMeasure/FHIRMeasureGroup.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMeasure/FHIRMeasureGroup.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRMeasureGroup extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MEASURE_DOT_GROUP; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CODE = 'code'; const FIELD_DESCRIPTION = 'description'; const FIELD_DESCRIPTION_EXT = '_description'; @@ -133,6 +129,9 @@ class FHIRMeasureGroup extends FHIRBackboneElement */ protected $stratifier = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMeasureGroup Constructor * @param null|array $data @@ -162,8 +161,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -171,6 +174,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_POPULATION])) { if (is_array($data[self::FIELD_POPULATION])) { foreach($data[self::FIELD_POPULATION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRMeasurePopulation) { $this->addPopulation($v); } else { @@ -186,6 +192,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_STRATIFIER])) { if (is_array($data[self::FIELD_STRATIFIER])) { foreach($data[self::FIELD_STRATIFIER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRMeasureStratifier) { $this->addStratifier($v); } else { @@ -498,14 +507,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getDescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESCRIPTION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getPopulation())) { foreach($vs as $v) { if (null === $v) { @@ -523,6 +530,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_STRATIFIER, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } @@ -536,8 +544,15 @@ public function jsonSerialize() $a[self::FIELD_CODE] = $v; } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if ([] !== ($vs = $this->getPopulation())) { $a[self::FIELD_POPULATION] = $vs; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMeasure/FHIRMeasurePopulation.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMeasure/FHIRMeasurePopulation.php index 7369104f3d..7d1ffc5f5a 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMeasure/FHIRMeasurePopulation.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMeasure/FHIRMeasurePopulation.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRMeasurePopulation extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MEASURE_DOT_POPULATION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CODE = 'code'; const FIELD_CRITERIA = 'criteria'; const FIELD_DESCRIPTION = 'description'; @@ -125,6 +121,9 @@ class FHIRMeasurePopulation extends FHIRBackboneElement */ protected $description = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMeasurePopulation Constructor * @param null|array $data @@ -161,8 +160,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -386,11 +389,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getCriteria())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CRITERIA, null, $v->_getFHIRXMLNamespace())); } @@ -413,8 +414,15 @@ public function jsonSerialize() $a[self::FIELD_CRITERIA] = $v; } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMeasure/FHIRMeasureStratifier.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMeasure/FHIRMeasureStratifier.php index 5bc964048b..99ba07a481 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMeasure/FHIRMeasureStratifier.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMeasure/FHIRMeasureStratifier.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRMeasureStratifier extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MEASURE_DOT_STRATIFIER; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CODE = 'code'; const FIELD_COMPONENT = 'component'; const FIELD_CRITERIA = 'criteria'; @@ -140,6 +136,9 @@ class FHIRMeasureStratifier extends FHIRBackboneElement */ protected $description = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMeasureStratifier Constructor * @param null|array $data @@ -166,6 +165,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_COMPONENT])) { if (is_array($data[self::FIELD_COMPONENT])) { foreach($data[self::FIELD_COMPONENT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRMeasureComponent) { $this->addComponent($v); } else { @@ -191,8 +193,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -483,11 +489,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getComponent())) { foreach($vs as $v) { if (null === $v) { @@ -522,8 +526,15 @@ public function jsonSerialize() $a[self::FIELD_CRITERIA] = $v; } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMeasure/FHIRMeasureSupplementalData.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMeasure/FHIRMeasureSupplementalData.php index 9e72226bd4..bd2af6ac9c 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMeasure/FHIRMeasureSupplementalData.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMeasure/FHIRMeasureSupplementalData.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRMeasureSupplementalData extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MEASURE_DOT_SUPPLEMENTAL_DATA; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CODE = 'code'; const FIELD_CRITERIA = 'criteria'; const FIELD_DESCRIPTION = 'description'; @@ -146,6 +142,9 @@ class FHIRMeasureSupplementalData extends FHIRBackboneElement */ protected $usage = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMeasureSupplementalData Constructor * @param null|array $data @@ -182,8 +181,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -191,6 +194,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_USAGE])) { if (is_array($data[self::FIELD_USAGE])) { foreach($data[self::FIELD_USAGE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addUsage($v); } else { @@ -506,18 +512,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getCriteria())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CRITERIA, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getDescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESCRIPTION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getUsage())) { foreach($vs as $v) { if (null === $v) { @@ -526,6 +529,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_USAGE, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } @@ -542,8 +546,15 @@ public function jsonSerialize() $a[self::FIELD_CRITERIA] = $v; } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if ([] !== ($vs = $this->getUsage())) { $a[self::FIELD_USAGE] = $vs; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMeasureReport/FHIRMeasureReportComponent.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMeasureReport/FHIRMeasureReportComponent.php index 2f162ae21a..766e4abefe 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMeasureReport/FHIRMeasureReportComponent.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMeasureReport/FHIRMeasureReportComponent.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRMeasureReportComponent extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MEASURE_REPORT_DOT_COMPONENT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CODE = 'code'; const FIELD_VALUE = 'value'; @@ -109,6 +105,9 @@ class FHIRMeasureReportComponent extends FHIRBackboneElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMeasureReportComponent Constructor * @param null|array $data @@ -314,12 +313,11 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValue())) { + $sxe->addAttribute(self::FIELD_VALUE, (string)$v); $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE, null, $v->_getFHIRXMLNamespace())); } return $sxe; @@ -335,7 +333,10 @@ public function jsonSerialize() $a[self::FIELD_CODE] = $v; } if (null !== ($v = $this->getValue())) { - $a[self::FIELD_VALUE] = $v; + $a[self::FIELD_VALUE] = $v->getValue(); + if (1 < count($enc = $v->jsonSerialize())) { + $a[self::FIELD_VALUE_EXT] = $enc; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMeasureReport/FHIRMeasureReportGroup.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMeasureReport/FHIRMeasureReportGroup.php index 87bb086428..5a162415e5 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMeasureReport/FHIRMeasureReportGroup.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMeasureReport/FHIRMeasureReportGroup.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRMeasureReportGroup extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MEASURE_REPORT_DOT_GROUP; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CODE = 'code'; const FIELD_MEASURE_SCORE = 'measureScore'; const FIELD_MEASURE_SCORE_EXT = '_measureScore'; @@ -138,6 +134,9 @@ class FHIRMeasureReportGroup extends FHIRBackboneElement */ protected $stratifier = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMeasureReportGroup Constructor * @param null|array $data @@ -167,8 +166,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MEASURE_SCORE] instanceof FHIRQuantity) { $this->setMeasureScore($data[self::FIELD_MEASURE_SCORE]); - } elseif ($ext && is_scalar($data[self::FIELD_MEASURE_SCORE])) { - $this->setMeasureScore(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_MEASURE_SCORE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MEASURE_SCORE])) { + $this->setMeasureScore(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_MEASURE_SCORE]] + $ext)); + } else if (is_array($data[self::FIELD_MEASURE_SCORE])) { + $this->setMeasureScore(new FHIRQuantity(array_merge($ext, $data[self::FIELD_MEASURE_SCORE]))); + } } else { $this->setMeasureScore(new FHIRQuantity($data[self::FIELD_MEASURE_SCORE])); } @@ -176,6 +179,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_POPULATION])) { if (is_array($data[self::FIELD_POPULATION])) { foreach($data[self::FIELD_POPULATION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRMeasureReportPopulation) { $this->addPopulation($v); } else { @@ -191,6 +197,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_STRATIFIER])) { if (is_array($data[self::FIELD_STRATIFIER])) { foreach($data[self::FIELD_STRATIFIER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRMeasureReportStratifier) { $this->addStratifier($v); } else { @@ -502,15 +511,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getMeasureScore())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MEASURE_SCORE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getPopulation())) { foreach($vs as $v) { if (null === $v) { @@ -528,6 +534,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_STRATIFIER, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } @@ -541,7 +548,15 @@ public function jsonSerialize() $a[self::FIELD_CODE] = $v; } if (null !== ($v = $this->getMeasureScore())) { - $a[self::FIELD_MEASURE_SCORE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MEASURE_SCORE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MEASURE_SCORE_EXT] = $enc; + } + } else { + $a[self::FIELD_MEASURE_SCORE] = $v; + } } if ([] !== ($vs = $this->getPopulation())) { $a[self::FIELD_POPULATION] = $vs; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMeasureReport/FHIRMeasureReportPopulation.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMeasureReport/FHIRMeasureReportPopulation.php index 391088bd12..6b06417105 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMeasureReport/FHIRMeasureReportPopulation.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMeasureReport/FHIRMeasureReportPopulation.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRMeasureReportPopulation extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MEASURE_REPORT_DOT_POPULATION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CODE = 'code'; const FIELD_COUNT = 'count'; const FIELD_COUNT_EXT = '_count'; @@ -124,6 +120,9 @@ class FHIRMeasureReportPopulation extends FHIRBackboneElement */ protected $subjectResults = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMeasureReportPopulation Constructor * @param null|array $data @@ -153,8 +152,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_COUNT] instanceof FHIRInteger) { $this->setCount($data[self::FIELD_COUNT]); - } elseif ($ext && is_scalar($data[self::FIELD_COUNT])) { - $this->setCount(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_COUNT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_COUNT])) { + $this->setCount(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_COUNT]] + $ext)); + } else if (is_array($data[self::FIELD_COUNT])) { + $this->setCount(new FHIRInteger(array_merge($ext, $data[self::FIELD_COUNT]))); + } } else { $this->setCount(new FHIRInteger($data[self::FIELD_COUNT])); } @@ -381,14 +384,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getCount())) { $v->xmlSerialize($sxe->addChild(self::FIELD_COUNT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSubjectResults())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBJECT_RESULTS, null, $v->_getFHIRXMLNamespace())); } @@ -405,8 +406,15 @@ public function jsonSerialize() $a[self::FIELD_CODE] = $v; } if (null !== ($v = $this->getCount())) { - $a[self::FIELD_COUNT] = $v->getValue(); - $a[self::FIELD_COUNT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_COUNT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_COUNT_EXT] = $enc; + } + } else { + $a[self::FIELD_COUNT] = $v; + } } if (null !== ($v = $this->getSubjectResults())) { $a[self::FIELD_SUBJECT_RESULTS] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMeasureReport/FHIRMeasureReportPopulation1.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMeasureReport/FHIRMeasureReportPopulation1.php index 845977b753..94ffc72ce1 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMeasureReport/FHIRMeasureReportPopulation1.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMeasureReport/FHIRMeasureReportPopulation1.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRMeasureReportPopulation1 extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MEASURE_REPORT_DOT_POPULATION_1; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CODE = 'code'; const FIELD_COUNT = 'count'; const FIELD_COUNT_EXT = '_count'; @@ -124,6 +120,9 @@ class FHIRMeasureReportPopulation1 extends FHIRBackboneElement */ protected $subjectResults = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMeasureReportPopulation1 Constructor * @param null|array $data @@ -153,8 +152,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_COUNT] instanceof FHIRInteger) { $this->setCount($data[self::FIELD_COUNT]); - } elseif ($ext && is_scalar($data[self::FIELD_COUNT])) { - $this->setCount(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_COUNT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_COUNT])) { + $this->setCount(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_COUNT]] + $ext)); + } else if (is_array($data[self::FIELD_COUNT])) { + $this->setCount(new FHIRInteger(array_merge($ext, $data[self::FIELD_COUNT]))); + } } else { $this->setCount(new FHIRInteger($data[self::FIELD_COUNT])); } @@ -381,14 +384,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getCount())) { $v->xmlSerialize($sxe->addChild(self::FIELD_COUNT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSubjectResults())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBJECT_RESULTS, null, $v->_getFHIRXMLNamespace())); } @@ -405,8 +406,15 @@ public function jsonSerialize() $a[self::FIELD_CODE] = $v; } if (null !== ($v = $this->getCount())) { - $a[self::FIELD_COUNT] = $v->getValue(); - $a[self::FIELD_COUNT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_COUNT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_COUNT_EXT] = $enc; + } + } else { + $a[self::FIELD_COUNT] = $v; + } } if (null !== ($v = $this->getSubjectResults())) { $a[self::FIELD_SUBJECT_RESULTS] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMeasureReport/FHIRMeasureReportStratifier.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMeasureReport/FHIRMeasureReportStratifier.php index 6a0fa9229d..2c0f485c66 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMeasureReport/FHIRMeasureReportStratifier.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMeasureReport/FHIRMeasureReportStratifier.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRMeasureReportStratifier extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MEASURE_REPORT_DOT_STRATIFIER; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CODE = 'code'; const FIELD_STRATUM = 'stratum'; const FIELD_STRATUM_EXT = '_stratum'; @@ -110,6 +106,9 @@ class FHIRMeasureReportStratifier extends FHIRBackboneElement */ protected $stratum = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMeasureReportStratifier Constructor * @param null|array $data @@ -129,6 +128,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CODE])) { if (is_array($data[self::FIELD_CODE])) { foreach($data[self::FIELD_CODE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addCode($v); } else { @@ -147,17 +149,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_STRATUM])) { foreach($data[self::FIELD_STRATUM] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRMeasureReportStratum) { $this->addStratum($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addStratum(new FHIRMeasureReportStratum([FHIRMeasureReportStratum::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addStratum(new FHIRMeasureReportStratum([FHIRMeasureReportStratum::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addStratum(new FHIRMeasureReportStratum(array_merge($v, $ext[$i]))); + } } else { $this->addStratum(new FHIRMeasureReportStratum($v)); } } } elseif ($data[self::FIELD_STRATUM] instanceof FHIRMeasureReportStratum) { $this->addStratum($data[self::FIELD_STRATUM]); - } elseif ($ext && is_scalar($data[self::FIELD_STRATUM])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_STRATUM])) { $this->addStratum(new FHIRMeasureReportStratum([FHIRMeasureReportStratum::FIELD_VALUE => $data[self::FIELD_STRATUM]] + $ext)); } else { $this->addStratum(new FHIRMeasureReportStratum($data[self::FIELD_STRATUM])); @@ -392,7 +401,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getCode())) { foreach($vs as $v) { if (null === $v) { @@ -410,6 +418,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_STRATUM, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } @@ -423,7 +432,23 @@ public function jsonSerialize() $a[self::FIELD_CODE] = $vs; } if ([] !== ($vs = $this->getStratum())) { - $a[self::FIELD_STRATUM] = $vs; + $a[self::FIELD_STRATUM] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STRATUM][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STRATUM_EXT][] = $enc; + } else { + $a[self::FIELD_STRATUM_EXT][] = null; + } + } else { + $a[self::FIELD_STRATUM][] = $v; + } + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMeasureReport/FHIRMeasureReportStratum.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMeasureReport/FHIRMeasureReportStratum.php index 4271a2b26f..7ce5634d0c 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMeasureReport/FHIRMeasureReportStratum.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMeasureReport/FHIRMeasureReportStratum.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRMeasureReportStratum extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MEASURE_REPORT_DOT_STRATUM; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_COMPONENT = 'component'; const FIELD_COMPONENT_EXT = '_component'; const FIELD_MEASURE_SCORE = 'measureScore'; @@ -139,6 +135,9 @@ class FHIRMeasureReportStratum extends FHIRBackboneElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMeasureReportStratum Constructor * @param null|array $data @@ -165,17 +164,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_COMPONENT])) { foreach($data[self::FIELD_COMPONENT] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRMeasureReportComponent) { $this->addComponent($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addComponent(new FHIRMeasureReportComponent([FHIRMeasureReportComponent::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addComponent(new FHIRMeasureReportComponent([FHIRMeasureReportComponent::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addComponent(new FHIRMeasureReportComponent(array_merge($v, $ext[$i]))); + } } else { $this->addComponent(new FHIRMeasureReportComponent($v)); } } } elseif ($data[self::FIELD_COMPONENT] instanceof FHIRMeasureReportComponent) { $this->addComponent($data[self::FIELD_COMPONENT]); - } elseif ($ext && is_scalar($data[self::FIELD_COMPONENT])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_COMPONENT])) { $this->addComponent(new FHIRMeasureReportComponent([FHIRMeasureReportComponent::FIELD_VALUE => $data[self::FIELD_COMPONENT]] + $ext)); } else { $this->addComponent(new FHIRMeasureReportComponent($data[self::FIELD_COMPONENT])); @@ -187,8 +193,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MEASURE_SCORE] instanceof FHIRQuantity) { $this->setMeasureScore($data[self::FIELD_MEASURE_SCORE]); - } elseif ($ext && is_scalar($data[self::FIELD_MEASURE_SCORE])) { - $this->setMeasureScore(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_MEASURE_SCORE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MEASURE_SCORE])) { + $this->setMeasureScore(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_MEASURE_SCORE]] + $ext)); + } else if (is_array($data[self::FIELD_MEASURE_SCORE])) { + $this->setMeasureScore(new FHIRQuantity(array_merge($ext, $data[self::FIELD_MEASURE_SCORE]))); + } } else { $this->setMeasureScore(new FHIRQuantity($data[self::FIELD_MEASURE_SCORE])); } @@ -196,6 +206,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_POPULATION])) { if (is_array($data[self::FIELD_POPULATION])) { foreach($data[self::FIELD_POPULATION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRMeasureReportPopulation1) { $this->addPopulation($v); } else { @@ -513,7 +526,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getComponent())) { foreach($vs as $v) { if (null === $v) { @@ -526,7 +538,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getMeasureScore())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MEASURE_SCORE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getPopulation())) { foreach($vs as $v) { if (null === $v) { @@ -537,6 +548,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 } if (null !== ($v = $this->getValue())) { + $sxe->addAttribute(self::FIELD_VALUE, (string)$v); $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE, null, $v->_getFHIRXMLNamespace())); } return $sxe; @@ -549,16 +561,43 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if ([] !== ($vs = $this->getComponent())) { - $a[self::FIELD_COMPONENT] = $vs; + $a[self::FIELD_COMPONENT] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_COMPONENT][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_COMPONENT_EXT][] = $enc; + } else { + $a[self::FIELD_COMPONENT_EXT][] = null; + } + } else { + $a[self::FIELD_COMPONENT][] = $v; + } + } } if (null !== ($v = $this->getMeasureScore())) { - $a[self::FIELD_MEASURE_SCORE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MEASURE_SCORE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MEASURE_SCORE_EXT] = $enc; + } + } else { + $a[self::FIELD_MEASURE_SCORE] = $v; + } } if ([] !== ($vs = $this->getPopulation())) { $a[self::FIELD_POPULATION] = $vs; } if (null !== ($v = $this->getValue())) { - $a[self::FIELD_VALUE] = $v; + $a[self::FIELD_VALUE] = $v->getValue(); + if (1 < count($enc = $v->jsonSerialize())) { + $a[self::FIELD_VALUE_EXT] = $enc; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedication/FHIRMedicationBatch.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedication/FHIRMedicationBatch.php index cf866b03db..98241fca61 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedication/FHIRMedicationBatch.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedication/FHIRMedicationBatch.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRMedicationBatch extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MEDICATION_DOT_BATCH; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_EXPIRATION_DATE = 'expirationDate'; const FIELD_EXPIRATION_DATE_EXT = '_expirationDate'; const FIELD_LOT_NUMBER = 'lotNumber'; @@ -114,6 +110,9 @@ class FHIRMedicationBatch extends FHIRBackboneElement */ protected $lotNumber = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMedicationBatch Constructor * @param null|array $data @@ -136,8 +135,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EXPIRATION_DATE] instanceof FHIRDateTime) { $this->setExpirationDate($data[self::FIELD_EXPIRATION_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_EXPIRATION_DATE])) { - $this->setExpirationDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_EXPIRATION_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EXPIRATION_DATE])) { + $this->setExpirationDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_EXPIRATION_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_EXPIRATION_DATE])) { + $this->setExpirationDate(new FHIRDateTime(array_merge($ext, $data[self::FIELD_EXPIRATION_DATE]))); + } } else { $this->setExpirationDate(new FHIRDateTime($data[self::FIELD_EXPIRATION_DATE])); } @@ -148,8 +151,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_LOT_NUMBER] instanceof FHIRString) { $this->setLotNumber($data[self::FIELD_LOT_NUMBER]); - } elseif ($ext && is_scalar($data[self::FIELD_LOT_NUMBER])) { - $this->setLotNumber(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_LOT_NUMBER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_LOT_NUMBER])) { + $this->setLotNumber(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_LOT_NUMBER]] + $ext)); + } else if (is_array($data[self::FIELD_LOT_NUMBER])) { + $this->setLotNumber(new FHIRString(array_merge($ext, $data[self::FIELD_LOT_NUMBER]))); + } } else { $this->setLotNumber(new FHIRString($data[self::FIELD_LOT_NUMBER])); } @@ -365,12 +372,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getExpirationDate())) { - $a[self::FIELD_EXPIRATION_DATE] = $v->getValue(); - $a[self::FIELD_EXPIRATION_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EXPIRATION_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EXPIRATION_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_EXPIRATION_DATE] = $v; + } } if (null !== ($v = $this->getLotNumber())) { - $a[self::FIELD_LOT_NUMBER] = $v->getValue(); - $a[self::FIELD_LOT_NUMBER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_LOT_NUMBER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_LOT_NUMBER_EXT] = $enc; + } + } else { + $a[self::FIELD_LOT_NUMBER] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedication/FHIRMedicationIngredient.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedication/FHIRMedicationIngredient.php index 43de64cf39..778f8caacb 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedication/FHIRMedicationIngredient.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedication/FHIRMedicationIngredient.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -82,10 +82,6 @@ class FHIRMedicationIngredient extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MEDICATION_DOT_INGREDIENT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_IS_ACTIVE = 'isActive'; const FIELD_IS_ACTIVE_EXT = '_isActive'; const FIELD_ITEM_CODEABLE_CONCEPT = 'itemCodeableConcept'; @@ -142,6 +138,9 @@ class FHIRMedicationIngredient extends FHIRBackboneElement */ protected $strength = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMedicationIngredient Constructor * @param null|array $data @@ -164,8 +163,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IS_ACTIVE] instanceof FHIRBoolean) { $this->setIsActive($data[self::FIELD_IS_ACTIVE]); - } elseif ($ext && is_scalar($data[self::FIELD_IS_ACTIVE])) { - $this->setIsActive(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_IS_ACTIVE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IS_ACTIVE])) { + $this->setIsActive(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_IS_ACTIVE]] + $ext)); + } else if (is_array($data[self::FIELD_IS_ACTIVE])) { + $this->setIsActive(new FHIRBoolean(array_merge($ext, $data[self::FIELD_IS_ACTIVE]))); + } } else { $this->setIsActive(new FHIRBoolean($data[self::FIELD_IS_ACTIVE])); } @@ -450,15 +453,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getIsActive())) { $v->xmlSerialize($sxe->addChild(self::FIELD_IS_ACTIVE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getItemCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ITEM_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getItemReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ITEM_REFERENCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStrength())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STRENGTH, null, $v->_getFHIRXMLNamespace())); } @@ -472,8 +472,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getIsActive())) { - $a[self::FIELD_IS_ACTIVE] = $v->getValue(); - $a[self::FIELD_IS_ACTIVE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IS_ACTIVE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IS_ACTIVE_EXT] = $enc; + } + } else { + $a[self::FIELD_IS_ACTIVE] = $v; + } } if (null !== ($v = $this->getItemCodeableConcept())) { $a[self::FIELD_ITEM_CODEABLE_CONCEPT] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicationAdministration/FHIRMedicationAdministrationDosage.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicationAdministration/FHIRMedicationAdministrationDosage.php index c26008dde8..52c1d54737 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicationAdministration/FHIRMedicationAdministrationDosage.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicationAdministration/FHIRMedicationAdministrationDosage.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -84,10 +84,6 @@ class FHIRMedicationAdministrationDosage extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MEDICATION_ADMINISTRATION_DOT_DOSAGE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DOSE = 'dose'; const FIELD_DOSE_EXT = '_dose'; const FIELD_METHOD = 'method'; @@ -203,6 +199,9 @@ class FHIRMedicationAdministrationDosage extends FHIRBackboneElement */ protected $text = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMedicationAdministrationDosage Constructor * @param null|array $data @@ -225,8 +224,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DOSE] instanceof FHIRQuantity) { $this->setDose($data[self::FIELD_DOSE]); - } elseif ($ext && is_scalar($data[self::FIELD_DOSE])) { - $this->setDose(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_DOSE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DOSE])) { + $this->setDose(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_DOSE]] + $ext)); + } else if (is_array($data[self::FIELD_DOSE])) { + $this->setDose(new FHIRQuantity(array_merge($ext, $data[self::FIELD_DOSE]))); + } } else { $this->setDose(new FHIRQuantity($data[self::FIELD_DOSE])); } @@ -244,8 +247,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_RATE_QUANTITY] instanceof FHIRQuantity) { $this->setRateQuantity($data[self::FIELD_RATE_QUANTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_RATE_QUANTITY])) { - $this->setRateQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_RATE_QUANTITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_RATE_QUANTITY])) { + $this->setRateQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_RATE_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_RATE_QUANTITY])) { + $this->setRateQuantity(new FHIRQuantity(array_merge($ext, $data[self::FIELD_RATE_QUANTITY]))); + } } else { $this->setRateQuantity(new FHIRQuantity($data[self::FIELD_RATE_QUANTITY])); } @@ -277,8 +284,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TEXT] instanceof FHIRString) { $this->setText($data[self::FIELD_TEXT]); - } elseif ($ext && is_scalar($data[self::FIELD_TEXT])) { - $this->setText(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TEXT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TEXT])) { + $this->setText(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TEXT]] + $ext)); + } else if (is_array($data[self::FIELD_TEXT])) { + $this->setText(new FHIRString(array_merge($ext, $data[self::FIELD_TEXT]))); + } } else { $this->setText(new FHIRString($data[self::FIELD_TEXT])); } @@ -680,27 +691,21 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getDose())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DOSE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getMethod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_METHOD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRateQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RATE_QUANTITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRateRatio())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RATE_RATIO, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRoute())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ROUTE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSite())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SITE, null, $v->_getFHIRXMLNamespace())); } @@ -717,13 +722,29 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getDose())) { - $a[self::FIELD_DOSE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DOSE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DOSE_EXT] = $enc; + } + } else { + $a[self::FIELD_DOSE] = $v; + } } if (null !== ($v = $this->getMethod())) { $a[self::FIELD_METHOD] = $v; } if (null !== ($v = $this->getRateQuantity())) { - $a[self::FIELD_RATE_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_RATE_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_RATE_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_RATE_QUANTITY] = $v; + } } if (null !== ($v = $this->getRateRatio())) { $a[self::FIELD_RATE_RATIO] = $v; @@ -735,8 +756,15 @@ public function jsonSerialize() $a[self::FIELD_SITE] = $v; } if (null !== ($v = $this->getText())) { - $a[self::FIELD_TEXT] = $v->getValue(); - $a[self::FIELD_TEXT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TEXT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TEXT_EXT] = $enc; + } + } else { + $a[self::FIELD_TEXT] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicationAdministration/FHIRMedicationAdministrationPerformer.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicationAdministration/FHIRMedicationAdministrationPerformer.php index dd8454fcce..714519f4ec 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicationAdministration/FHIRMedicationAdministrationPerformer.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicationAdministration/FHIRMedicationAdministrationPerformer.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -82,10 +82,6 @@ class FHIRMedicationAdministrationPerformer extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MEDICATION_ADMINISTRATION_DOT_PERFORMER; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ACTOR = 'actor'; const FIELD_FUNCTION = 'function'; @@ -113,6 +109,9 @@ class FHIRMedicationAdministrationPerformer extends FHIRBackboneElement */ protected $function = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMedicationAdministrationPerformer Constructor * @param null|array $data @@ -314,11 +313,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getActor())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ACTOR, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getFunction())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FUNCTION, null, $v->_getFHIRXMLNamespace())); } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicationDispense/FHIRMedicationDispensePerformer.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicationDispense/FHIRMedicationDispensePerformer.php index 67ba5de56f..172289d289 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicationDispense/FHIRMedicationDispensePerformer.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicationDispense/FHIRMedicationDispensePerformer.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -81,10 +81,6 @@ class FHIRMedicationDispensePerformer extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MEDICATION_DISPENSE_DOT_PERFORMER; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ACTOR = 'actor'; const FIELD_FUNCTION = 'function'; @@ -113,6 +109,9 @@ class FHIRMedicationDispensePerformer extends FHIRBackboneElement */ protected $function = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMedicationDispensePerformer Constructor * @param null|array $data @@ -316,11 +315,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getActor())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ACTOR, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getFunction())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FUNCTION, null, $v->_getFHIRXMLNamespace())); } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicationDispense/FHIRMedicationDispenseSubstitution.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicationDispense/FHIRMedicationDispenseSubstitution.php index 3d9d1a5a94..580af60d99 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicationDispense/FHIRMedicationDispenseSubstitution.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicationDispense/FHIRMedicationDispenseSubstitution.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -82,10 +82,6 @@ class FHIRMedicationDispenseSubstitution extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MEDICATION_DISPENSE_DOT_SUBSTITUTION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_REASON = 'reason'; const FIELD_RESPONSIBLE_PARTY = 'responsibleParty'; const FIELD_TYPE = 'type'; @@ -140,6 +136,9 @@ class FHIRMedicationDispenseSubstitution extends FHIRBackboneElement */ protected $wasSubstituted = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMedicationDispenseSubstitution Constructor * @param null|array $data @@ -159,6 +158,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REASON])) { if (is_array($data[self::FIELD_REASON])) { foreach($data[self::FIELD_REASON] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addReason($v); } else { @@ -174,6 +176,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_RESPONSIBLE_PARTY])) { if (is_array($data[self::FIELD_RESPONSIBLE_PARTY])) { foreach($data[self::FIELD_RESPONSIBLE_PARTY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addResponsibleParty($v); } else { @@ -199,8 +204,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_WAS_SUBSTITUTED] instanceof FHIRBoolean) { $this->setWasSubstituted($data[self::FIELD_WAS_SUBSTITUTED]); - } elseif ($ext && is_scalar($data[self::FIELD_WAS_SUBSTITUTED])) { - $this->setWasSubstituted(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_WAS_SUBSTITUTED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_WAS_SUBSTITUTED])) { + $this->setWasSubstituted(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_WAS_SUBSTITUTED]] + $ext)); + } else if (is_array($data[self::FIELD_WAS_SUBSTITUTED])) { + $this->setWasSubstituted(new FHIRBoolean(array_merge($ext, $data[self::FIELD_WAS_SUBSTITUTED]))); + } } else { $this->setWasSubstituted(new FHIRBoolean($data[self::FIELD_WAS_SUBSTITUTED])); } @@ -515,7 +524,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getReason())) { foreach($vs as $v) { if (null === $v) { @@ -559,8 +567,15 @@ public function jsonSerialize() $a[self::FIELD_TYPE] = $v; } if (null !== ($v = $this->getWasSubstituted())) { - $a[self::FIELD_WAS_SUBSTITUTED] = $v->getValue(); - $a[self::FIELD_WAS_SUBSTITUTED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_WAS_SUBSTITUTED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_WAS_SUBSTITUTED_EXT] = $enc; + } + } else { + $a[self::FIELD_WAS_SUBSTITUTED] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicationKnowledge/FHIRMedicationKnowledgeAdministrationGuidelines.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicationKnowledge/FHIRMedicationKnowledgeAdministrationGuidelines.php index e47d90e2b9..ad0406b599 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicationKnowledge/FHIRMedicationKnowledgeAdministrationGuidelines.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicationKnowledge/FHIRMedicationKnowledgeAdministrationGuidelines.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRMedicationKnowledgeAdministrationGuidelines extends FHIRBackboneElemen { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MEDICATION_KNOWLEDGE_DOT_ADMINISTRATION_GUIDELINES; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DOSAGE = 'dosage'; const FIELD_INDICATION_CODEABLE_CONCEPT = 'indicationCodeableConcept'; const FIELD_INDICATION_REFERENCE = 'indicationReference'; @@ -132,6 +128,9 @@ class FHIRMedicationKnowledgeAdministrationGuidelines extends FHIRBackboneElemen */ protected $patientCharacteristics = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMedicationKnowledgeAdministrationGuidelines Constructor * @param null|array $data @@ -151,6 +150,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_DOSAGE])) { if (is_array($data[self::FIELD_DOSAGE])) { foreach($data[self::FIELD_DOSAGE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRMedicationKnowledgeDosage) { $this->addDosage($v); } else { @@ -183,17 +185,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_PATIENT_CHARACTERISTICS])) { foreach($data[self::FIELD_PATIENT_CHARACTERISTICS] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRMedicationKnowledgePatientCharacteristics) { $this->addPatientCharacteristics($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addPatientCharacteristics(new FHIRMedicationKnowledgePatientCharacteristics([FHIRMedicationKnowledgePatientCharacteristics::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addPatientCharacteristics(new FHIRMedicationKnowledgePatientCharacteristics([FHIRMedicationKnowledgePatientCharacteristics::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addPatientCharacteristics(new FHIRMedicationKnowledgePatientCharacteristics(array_merge($v, $ext[$i]))); + } } else { $this->addPatientCharacteristics(new FHIRMedicationKnowledgePatientCharacteristics($v)); } } } elseif ($data[self::FIELD_PATIENT_CHARACTERISTICS] instanceof FHIRMedicationKnowledgePatientCharacteristics) { $this->addPatientCharacteristics($data[self::FIELD_PATIENT_CHARACTERISTICS]); - } elseif ($ext && is_scalar($data[self::FIELD_PATIENT_CHARACTERISTICS])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_PATIENT_CHARACTERISTICS])) { $this->addPatientCharacteristics(new FHIRMedicationKnowledgePatientCharacteristics([FHIRMedicationKnowledgePatientCharacteristics::FIELD_VALUE => $data[self::FIELD_PATIENT_CHARACTERISTICS]] + $ext)); } else { $this->addPatientCharacteristics(new FHIRMedicationKnowledgePatientCharacteristics($data[self::FIELD_PATIENT_CHARACTERISTICS])); @@ -485,7 +494,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getDosage())) { foreach($vs as $v) { if (null === $v) { @@ -498,11 +506,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getIndicationCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_INDICATION_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getIndicationReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_INDICATION_REFERENCE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getPatientCharacteristics())) { foreach($vs as $v) { if (null === $v) { @@ -511,6 +517,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_PATIENT_CHARACTERISTICS, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } @@ -530,7 +537,23 @@ public function jsonSerialize() $a[self::FIELD_INDICATION_REFERENCE] = $v; } if ([] !== ($vs = $this->getPatientCharacteristics())) { - $a[self::FIELD_PATIENT_CHARACTERISTICS] = $vs; + $a[self::FIELD_PATIENT_CHARACTERISTICS] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PATIENT_CHARACTERISTICS][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PATIENT_CHARACTERISTICS_EXT][] = $enc; + } else { + $a[self::FIELD_PATIENT_CHARACTERISTICS_EXT][] = null; + } + } else { + $a[self::FIELD_PATIENT_CHARACTERISTICS][] = $v; + } + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicationKnowledge/FHIRMedicationKnowledgeCost.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicationKnowledge/FHIRMedicationKnowledgeCost.php index 027851db41..5323ff1647 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicationKnowledge/FHIRMedicationKnowledgeCost.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicationKnowledge/FHIRMedicationKnowledgeCost.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRMedicationKnowledgeCost extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MEDICATION_KNOWLEDGE_DOT_COST; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_COST = 'cost'; const FIELD_COST_EXT = '_cost'; const FIELD_SOURCE = 'source'; @@ -124,6 +120,9 @@ class FHIRMedicationKnowledgeCost extends FHIRBackboneElement */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMedicationKnowledgeCost Constructor * @param null|array $data @@ -146,8 +145,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_COST] instanceof FHIRMoney) { $this->setCost($data[self::FIELD_COST]); - } elseif ($ext && is_scalar($data[self::FIELD_COST])) { - $this->setCost(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_COST]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_COST])) { + $this->setCost(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_COST]] + $ext)); + } else if (is_array($data[self::FIELD_COST])) { + $this->setCost(new FHIRMoney(array_merge($ext, $data[self::FIELD_COST]))); + } } else { $this->setCost(new FHIRMoney($data[self::FIELD_COST])); } @@ -158,8 +161,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SOURCE] instanceof FHIRString) { $this->setSource($data[self::FIELD_SOURCE]); - } elseif ($ext && is_scalar($data[self::FIELD_SOURCE])) { - $this->setSource(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SOURCE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SOURCE])) { + $this->setSource(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SOURCE]] + $ext)); + } else if (is_array($data[self::FIELD_SOURCE])) { + $this->setSource(new FHIRString(array_merge($ext, $data[self::FIELD_SOURCE]))); + } } else { $this->setSource(new FHIRString($data[self::FIELD_SOURCE])); } @@ -386,14 +393,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getCost())) { $v->xmlSerialize($sxe->addChild(self::FIELD_COST, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getSource())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SOURCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -407,11 +412,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getCost())) { - $a[self::FIELD_COST] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_COST] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_COST_EXT] = $enc; + } + } else { + $a[self::FIELD_COST] = $v; + } } if (null !== ($v = $this->getSource())) { - $a[self::FIELD_SOURCE] = $v->getValue(); - $a[self::FIELD_SOURCE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SOURCE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SOURCE_EXT] = $enc; + } + } else { + $a[self::FIELD_SOURCE] = $v; + } } if (null !== ($v = $this->getType())) { $a[self::FIELD_TYPE] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicationKnowledge/FHIRMedicationKnowledgeDosage.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicationKnowledge/FHIRMedicationKnowledgeDosage.php index 79445e853c..4ca7e67fed 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicationKnowledge/FHIRMedicationKnowledgeDosage.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicationKnowledge/FHIRMedicationKnowledgeDosage.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRMedicationKnowledgeDosage extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MEDICATION_KNOWLEDGE_DOT_DOSAGE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DOSAGE = 'dosage'; const FIELD_TYPE = 'type'; @@ -108,6 +104,9 @@ class FHIRMedicationKnowledgeDosage extends FHIRBackboneElement */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMedicationKnowledgeDosage Constructor * @param null|array $data @@ -127,6 +126,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_DOSAGE])) { if (is_array($data[self::FIELD_DOSAGE])) { foreach($data[self::FIELD_DOSAGE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRDosage) { $this->addDosage($v); } else { @@ -343,7 +345,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getDosage())) { foreach($vs as $v) { if (null === $v) { diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicationKnowledge/FHIRMedicationKnowledgeDrugCharacteristic.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicationKnowledge/FHIRMedicationKnowledgeDrugCharacteristic.php index 5ae3b7cdfc..9d749c1dcc 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicationKnowledge/FHIRMedicationKnowledgeDrugCharacteristic.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicationKnowledge/FHIRMedicationKnowledgeDrugCharacteristic.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRMedicationKnowledgeDrugCharacteristic extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MEDICATION_KNOWLEDGE_DOT_DRUG_CHARACTERISTIC; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_TYPE = 'type'; const FIELD_VALUE_BASE_64BINARY = 'valueBase64Binary'; const FIELD_VALUE_BASE_64BINARY_EXT = '_valueBase64Binary'; @@ -153,6 +149,9 @@ class FHIRMedicationKnowledgeDrugCharacteristic extends FHIRBackboneElement */ protected $valueString = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMedicationKnowledgeDrugCharacteristic Constructor * @param null|array $data @@ -182,8 +181,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_BASE_64BINARY] instanceof FHIRBase64Binary) { $this->setValueBase64Binary($data[self::FIELD_VALUE_BASE_64BINARY]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_BASE_64BINARY])) { - $this->setValueBase64Binary(new FHIRBase64Binary([FHIRBase64Binary::FIELD_VALUE => $data[self::FIELD_VALUE_BASE_64BINARY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_BASE_64BINARY])) { + $this->setValueBase64Binary(new FHIRBase64Binary([FHIRBase64Binary::FIELD_VALUE => $data[self::FIELD_VALUE_BASE_64BINARY]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_BASE_64BINARY])) { + $this->setValueBase64Binary(new FHIRBase64Binary(array_merge($ext, $data[self::FIELD_VALUE_BASE_64BINARY]))); + } } else { $this->setValueBase64Binary(new FHIRBase64Binary($data[self::FIELD_VALUE_BASE_64BINARY])); } @@ -201,8 +204,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_QUANTITY] instanceof FHIRQuantity) { $this->setValueQuantity($data[self::FIELD_VALUE_QUANTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_QUANTITY])) { - $this->setValueQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_VALUE_QUANTITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_QUANTITY])) { + $this->setValueQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_VALUE_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_QUANTITY])) { + $this->setValueQuantity(new FHIRQuantity(array_merge($ext, $data[self::FIELD_VALUE_QUANTITY]))); + } } else { $this->setValueQuantity(new FHIRQuantity($data[self::FIELD_VALUE_QUANTITY])); } @@ -213,8 +220,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_STRING] instanceof FHIRString) { $this->setValueString($data[self::FIELD_VALUE_STRING]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_STRING])) { - $this->setValueString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VALUE_STRING]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_STRING])) { + $this->setValueString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VALUE_STRING]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_STRING])) { + $this->setValueString(new FHIRString(array_merge($ext, $data[self::FIELD_VALUE_STRING]))); + } } else { $this->setValueString(new FHIRString($data[self::FIELD_VALUE_STRING])); } @@ -517,18 +528,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getValueBase64Binary())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_BASE_64BINARY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_QUANTITY, null, $v->_getFHIRXMLNamespace())); } @@ -548,18 +556,40 @@ public function jsonSerialize() $a[self::FIELD_TYPE] = $v; } if (null !== ($v = $this->getValueBase64Binary())) { - $a[self::FIELD_VALUE_BASE_64BINARY] = $v->getValue(); - $a[self::FIELD_VALUE_BASE_64BINARY_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_BASE_64BINARY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_BASE_64BINARY_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_BASE_64BINARY] = $v; + } } if (null !== ($v = $this->getValueCodeableConcept())) { $a[self::FIELD_VALUE_CODEABLE_CONCEPT] = $v; } if (null !== ($v = $this->getValueQuantity())) { - $a[self::FIELD_VALUE_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_QUANTITY] = $v; + } } if (null !== ($v = $this->getValueString())) { - $a[self::FIELD_VALUE_STRING] = $v->getValue(); - $a[self::FIELD_VALUE_STRING_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_STRING] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_STRING_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_STRING] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicationKnowledge/FHIRMedicationKnowledgeIngredient.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicationKnowledge/FHIRMedicationKnowledgeIngredient.php index 685c87da95..b3c70e1bf5 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicationKnowledge/FHIRMedicationKnowledgeIngredient.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicationKnowledge/FHIRMedicationKnowledgeIngredient.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRMedicationKnowledgeIngredient extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MEDICATION_KNOWLEDGE_DOT_INGREDIENT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_IS_ACTIVE = 'isActive'; const FIELD_IS_ACTIVE_EXT = '_isActive'; const FIELD_ITEM_CODEABLE_CONCEPT = 'itemCodeableConcept'; @@ -140,6 +136,9 @@ class FHIRMedicationKnowledgeIngredient extends FHIRBackboneElement */ protected $strength = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMedicationKnowledgeIngredient Constructor * @param null|array $data @@ -162,8 +161,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IS_ACTIVE] instanceof FHIRBoolean) { $this->setIsActive($data[self::FIELD_IS_ACTIVE]); - } elseif ($ext && is_scalar($data[self::FIELD_IS_ACTIVE])) { - $this->setIsActive(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_IS_ACTIVE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IS_ACTIVE])) { + $this->setIsActive(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_IS_ACTIVE]] + $ext)); + } else if (is_array($data[self::FIELD_IS_ACTIVE])) { + $this->setIsActive(new FHIRBoolean(array_merge($ext, $data[self::FIELD_IS_ACTIVE]))); + } } else { $this->setIsActive(new FHIRBoolean($data[self::FIELD_IS_ACTIVE])); } @@ -448,15 +451,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getIsActive())) { $v->xmlSerialize($sxe->addChild(self::FIELD_IS_ACTIVE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getItemCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ITEM_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getItemReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ITEM_REFERENCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStrength())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STRENGTH, null, $v->_getFHIRXMLNamespace())); } @@ -470,8 +470,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getIsActive())) { - $a[self::FIELD_IS_ACTIVE] = $v->getValue(); - $a[self::FIELD_IS_ACTIVE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IS_ACTIVE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IS_ACTIVE_EXT] = $enc; + } + } else { + $a[self::FIELD_IS_ACTIVE] = $v; + } } if (null !== ($v = $this->getItemCodeableConcept())) { $a[self::FIELD_ITEM_CODEABLE_CONCEPT] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicationKnowledge/FHIRMedicationKnowledgeKinetics.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicationKnowledge/FHIRMedicationKnowledgeKinetics.php index f854f1c9aa..25de383349 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicationKnowledge/FHIRMedicationKnowledgeKinetics.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicationKnowledge/FHIRMedicationKnowledgeKinetics.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,13 +78,10 @@ class FHIRMedicationKnowledgeKinetics extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MEDICATION_KNOWLEDGE_DOT_KINETICS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_AREA_UNDER_CURVE = 'areaUnderCurve'; const FIELD_AREA_UNDER_CURVE_EXT = '_areaUnderCurve'; const FIELD_HALF_LIFE_PERIOD = 'halfLifePeriod'; + const FIELD_HALF_LIFE_PERIOD_EXT = '_halfLifePeriod'; const FIELD_LETHAL_DOSE_50 = 'lethalDose50'; const FIELD_LETHAL_DOSE_50_EXT = '_lethalDose50'; @@ -126,6 +123,9 @@ class FHIRMedicationKnowledgeKinetics extends FHIRBackboneElement */ protected $lethalDose50 = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMedicationKnowledgeKinetics Constructor * @param null|array $data @@ -148,25 +148,41 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_AREA_UNDER_CURVE])) { foreach($data[self::FIELD_AREA_UNDER_CURVE] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRQuantity) { $this->addAreaUnderCurve($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addAreaUnderCurve(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addAreaUnderCurve(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addAreaUnderCurve(new FHIRQuantity(array_merge($v, $ext[$i]))); + } } else { $this->addAreaUnderCurve(new FHIRQuantity($v)); } } } elseif ($data[self::FIELD_AREA_UNDER_CURVE] instanceof FHIRQuantity) { $this->addAreaUnderCurve($data[self::FIELD_AREA_UNDER_CURVE]); - } elseif ($ext && is_scalar($data[self::FIELD_AREA_UNDER_CURVE])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_AREA_UNDER_CURVE])) { $this->addAreaUnderCurve(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_AREA_UNDER_CURVE]] + $ext)); } else { $this->addAreaUnderCurve(new FHIRQuantity($data[self::FIELD_AREA_UNDER_CURVE])); } } if (isset($data[self::FIELD_HALF_LIFE_PERIOD])) { + $ext = (isset($data[self::FIELD_HALF_LIFE_PERIOD_EXT]) && is_array($data[self::FIELD_HALF_LIFE_PERIOD_EXT])) + ? $data[self::FIELD_HALF_LIFE_PERIOD_EXT] + : null; if ($data[self::FIELD_HALF_LIFE_PERIOD] instanceof FHIRDuration) { $this->setHalfLifePeriod($data[self::FIELD_HALF_LIFE_PERIOD]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_HALF_LIFE_PERIOD])) { + $this->setHalfLifePeriod(new FHIRDuration([FHIRDuration::FIELD_VALUE => $data[self::FIELD_HALF_LIFE_PERIOD]] + $ext)); + } else if (is_array($data[self::FIELD_HALF_LIFE_PERIOD])) { + $this->setHalfLifePeriod(new FHIRDuration(array_merge($ext, $data[self::FIELD_HALF_LIFE_PERIOD]))); + } } else { $this->setHalfLifePeriod(new FHIRDuration($data[self::FIELD_HALF_LIFE_PERIOD])); } @@ -177,17 +193,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_LETHAL_DOSE_50])) { foreach($data[self::FIELD_LETHAL_DOSE_50] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRQuantity) { $this->addLethalDose50($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addLethalDose50(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addLethalDose50(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addLethalDose50(new FHIRQuantity(array_merge($v, $ext[$i]))); + } } else { $this->addLethalDose50(new FHIRQuantity($v)); } } } elseif ($data[self::FIELD_LETHAL_DOSE_50] instanceof FHIRQuantity) { $this->addLethalDose50($data[self::FIELD_LETHAL_DOSE_50]); - } elseif ($ext && is_scalar($data[self::FIELD_LETHAL_DOSE_50])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_LETHAL_DOSE_50])) { $this->addLethalDose50(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_LETHAL_DOSE_50]] + $ext)); } else { $this->addLethalDose50(new FHIRQuantity($data[self::FIELD_LETHAL_DOSE_50])); @@ -463,7 +486,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getAreaUnderCurve())) { foreach($vs as $v) { if (null === $v) { @@ -476,7 +498,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getHalfLifePeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_HALF_LIFE_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getLethalDose50())) { foreach($vs as $v) { if (null === $v) { @@ -485,6 +506,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_LETHAL_DOSE_50, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } @@ -495,13 +517,53 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if ([] !== ($vs = $this->getAreaUnderCurve())) { - $a[self::FIELD_AREA_UNDER_CURVE] = $vs; + $a[self::FIELD_AREA_UNDER_CURVE] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_AREA_UNDER_CURVE][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_AREA_UNDER_CURVE_EXT][] = $enc; + } else { + $a[self::FIELD_AREA_UNDER_CURVE_EXT][] = null; + } + } else { + $a[self::FIELD_AREA_UNDER_CURVE][] = $v; + } + } } if (null !== ($v = $this->getHalfLifePeriod())) { - $a[self::FIELD_HALF_LIFE_PERIOD] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_HALF_LIFE_PERIOD] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_HALF_LIFE_PERIOD_EXT] = $enc; + } + } else { + $a[self::FIELD_HALF_LIFE_PERIOD] = $v; + } } if ([] !== ($vs = $this->getLethalDose50())) { - $a[self::FIELD_LETHAL_DOSE_50] = $vs; + $a[self::FIELD_LETHAL_DOSE_50] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_LETHAL_DOSE_50][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_LETHAL_DOSE_50_EXT][] = $enc; + } else { + $a[self::FIELD_LETHAL_DOSE_50_EXT][] = null; + } + } else { + $a[self::FIELD_LETHAL_DOSE_50][] = $v; + } + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicationKnowledge/FHIRMedicationKnowledgeMaxDispense.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicationKnowledge/FHIRMedicationKnowledgeMaxDispense.php index c6b1a1ef22..6db82f6e36 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicationKnowledge/FHIRMedicationKnowledgeMaxDispense.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicationKnowledge/FHIRMedicationKnowledgeMaxDispense.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,11 +78,8 @@ class FHIRMedicationKnowledgeMaxDispense extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MEDICATION_KNOWLEDGE_DOT_MAX_DISPENSE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_PERIOD = 'period'; + const FIELD_PERIOD_EXT = '_period'; const FIELD_QUANTITY = 'quantity'; const FIELD_QUANTITY_EXT = '_quantity'; @@ -110,6 +107,9 @@ class FHIRMedicationKnowledgeMaxDispense extends FHIRBackboneElement */ protected $quantity = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMedicationKnowledgeMaxDispense Constructor * @param null|array $data @@ -127,8 +127,17 @@ public function __construct($data = null) } parent::__construct($data); if (isset($data[self::FIELD_PERIOD])) { + $ext = (isset($data[self::FIELD_PERIOD_EXT]) && is_array($data[self::FIELD_PERIOD_EXT])) + ? $data[self::FIELD_PERIOD_EXT] + : null; if ($data[self::FIELD_PERIOD] instanceof FHIRDuration) { $this->setPeriod($data[self::FIELD_PERIOD]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PERIOD])) { + $this->setPeriod(new FHIRDuration([FHIRDuration::FIELD_VALUE => $data[self::FIELD_PERIOD]] + $ext)); + } else if (is_array($data[self::FIELD_PERIOD])) { + $this->setPeriod(new FHIRDuration(array_merge($ext, $data[self::FIELD_PERIOD]))); + } } else { $this->setPeriod(new FHIRDuration($data[self::FIELD_PERIOD])); } @@ -139,8 +148,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_QUANTITY] instanceof FHIRQuantity) { $this->setQuantity($data[self::FIELD_QUANTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_QUANTITY])) { - $this->setQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_QUANTITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_QUANTITY])) { + $this->setQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_QUANTITY])) { + $this->setQuantity(new FHIRQuantity(array_merge($ext, $data[self::FIELD_QUANTITY]))); + } } else { $this->setQuantity(new FHIRQuantity($data[self::FIELD_QUANTITY])); } @@ -316,11 +329,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_QUANTITY, null, $v->_getFHIRXMLNamespace())); } @@ -334,10 +345,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getPeriod())) { - $a[self::FIELD_PERIOD] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PERIOD] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PERIOD_EXT] = $enc; + } + } else { + $a[self::FIELD_PERIOD] = $v; + } } if (null !== ($v = $this->getQuantity())) { - $a[self::FIELD_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_QUANTITY] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicationKnowledge/FHIRMedicationKnowledgeMedicineClassification.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicationKnowledge/FHIRMedicationKnowledgeMedicineClassification.php index d8b73150fd..72ce08cf28 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicationKnowledge/FHIRMedicationKnowledgeMedicineClassification.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicationKnowledge/FHIRMedicationKnowledgeMedicineClassification.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -77,10 +77,6 @@ class FHIRMedicationKnowledgeMedicineClassification extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MEDICATION_KNOWLEDGE_DOT_MEDICINE_CLASSIFICATION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CLASSIFICATION = 'classification'; const FIELD_TYPE = 'type'; @@ -110,6 +106,9 @@ class FHIRMedicationKnowledgeMedicineClassification extends FHIRBackboneElement */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMedicationKnowledgeMedicineClassification Constructor * @param null|array $data @@ -129,6 +128,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CLASSIFICATION])) { if (is_array($data[self::FIELD_CLASSIFICATION])) { foreach($data[self::FIELD_CLASSIFICATION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addClassification($v); } else { @@ -353,7 +355,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getClassification())) { foreach($vs as $v) { if (null === $v) { diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicationKnowledge/FHIRMedicationKnowledgeMonitoringProgram.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicationKnowledge/FHIRMedicationKnowledgeMonitoringProgram.php index 575ed11943..e48f64d767 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicationKnowledge/FHIRMedicationKnowledgeMonitoringProgram.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicationKnowledge/FHIRMedicationKnowledgeMonitoringProgram.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRMedicationKnowledgeMonitoringProgram extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MEDICATION_KNOWLEDGE_DOT_MONITORING_PROGRAM; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_NAME = 'name'; const FIELD_NAME_EXT = '_name'; const FIELD_TYPE = 'type'; @@ -109,6 +105,9 @@ class FHIRMedicationKnowledgeMonitoringProgram extends FHIRBackboneElement */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMedicationKnowledgeMonitoringProgram Constructor * @param null|array $data @@ -131,8 +130,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -327,7 +330,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NAME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -341,8 +343,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if (null !== ($v = $this->getType())) { $a[self::FIELD_TYPE] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicationKnowledge/FHIRMedicationKnowledgeMonograph.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicationKnowledge/FHIRMedicationKnowledgeMonograph.php index a0dd74db18..eef029ab5a 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicationKnowledge/FHIRMedicationKnowledgeMonograph.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicationKnowledge/FHIRMedicationKnowledgeMonograph.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRMedicationKnowledgeMonograph extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MEDICATION_KNOWLEDGE_DOT_MONOGRAPH; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_SOURCE = 'source'; const FIELD_TYPE = 'type'; @@ -109,6 +105,9 @@ class FHIRMedicationKnowledgeMonograph extends FHIRBackboneElement */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMedicationKnowledgeMonograph Constructor * @param null|array $data @@ -310,11 +309,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getSource())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SOURCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicationKnowledge/FHIRMedicationKnowledgePackaging.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicationKnowledge/FHIRMedicationKnowledgePackaging.php index f3b1b06afe..8fbb309cac 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicationKnowledge/FHIRMedicationKnowledgePackaging.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicationKnowledge/FHIRMedicationKnowledgePackaging.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRMedicationKnowledgePackaging extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MEDICATION_KNOWLEDGE_DOT_PACKAGING; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_QUANTITY = 'quantity'; const FIELD_QUANTITY_EXT = '_quantity'; const FIELD_TYPE = 'type'; @@ -112,6 +108,9 @@ class FHIRMedicationKnowledgePackaging extends FHIRBackboneElement */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMedicationKnowledgePackaging Constructor * @param null|array $data @@ -134,8 +133,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_QUANTITY] instanceof FHIRQuantity) { $this->setQuantity($data[self::FIELD_QUANTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_QUANTITY])) { - $this->setQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_QUANTITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_QUANTITY])) { + $this->setQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_QUANTITY])) { + $this->setQuantity(new FHIRQuantity(array_merge($ext, $data[self::FIELD_QUANTITY]))); + } } else { $this->setQuantity(new FHIRQuantity($data[self::FIELD_QUANTITY])); } @@ -322,11 +325,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_QUANTITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -340,7 +341,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getQuantity())) { - $a[self::FIELD_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_QUANTITY] = $v; + } } if (null !== ($v = $this->getType())) { $a[self::FIELD_TYPE] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicationKnowledge/FHIRMedicationKnowledgePatientCharacteristics.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicationKnowledge/FHIRMedicationKnowledgePatientCharacteristics.php index c07727b0ec..1021baa17f 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicationKnowledge/FHIRMedicationKnowledgePatientCharacteristics.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicationKnowledge/FHIRMedicationKnowledgePatientCharacteristics.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRMedicationKnowledgePatientCharacteristics extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MEDICATION_KNOWLEDGE_DOT_PATIENT_CHARACTERISTICS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CHARACTERISTIC_CODEABLE_CONCEPT = 'characteristicCodeableConcept'; const FIELD_CHARACTERISTIC_QUANTITY = 'characteristicQuantity'; const FIELD_CHARACTERISTIC_QUANTITY_EXT = '_characteristicQuantity'; @@ -127,6 +123,9 @@ class FHIRMedicationKnowledgePatientCharacteristics extends FHIRBackboneElement */ protected $value = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMedicationKnowledgePatientCharacteristics Constructor * @param null|array $data @@ -160,8 +159,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CHARACTERISTIC_QUANTITY] instanceof FHIRQuantity) { $this->setCharacteristicQuantity($data[self::FIELD_CHARACTERISTIC_QUANTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_CHARACTERISTIC_QUANTITY])) { - $this->setCharacteristicQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_CHARACTERISTIC_QUANTITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CHARACTERISTIC_QUANTITY])) { + $this->setCharacteristicQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_CHARACTERISTIC_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_CHARACTERISTIC_QUANTITY])) { + $this->setCharacteristicQuantity(new FHIRQuantity(array_merge($ext, $data[self::FIELD_CHARACTERISTIC_QUANTITY]))); + } } else { $this->setCharacteristicQuantity(new FHIRQuantity($data[self::FIELD_CHARACTERISTIC_QUANTITY])); } @@ -172,17 +175,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_VALUE])) { foreach($data[self::FIELD_VALUE] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRString) { $this->addValue($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addValue(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addValue(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addValue(new FHIRString(array_merge($v, $ext[$i]))); + } } else { $this->addValue(new FHIRString($v)); } } } elseif ($data[self::FIELD_VALUE] instanceof FHIRString) { $this->addValue($data[self::FIELD_VALUE]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_VALUE])) { $this->addValue(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VALUE]] + $ext)); } else { $this->addValue(new FHIRString($data[self::FIELD_VALUE])); @@ -437,11 +447,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getCharacteristicCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CHARACTERISTIC_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getCharacteristicQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CHARACTERISTIC_QUANTITY, null, $v->_getFHIRXMLNamespace())); } @@ -453,6 +461,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } @@ -466,7 +475,15 @@ public function jsonSerialize() $a[self::FIELD_CHARACTERISTIC_CODEABLE_CONCEPT] = $v; } if (null !== ($v = $this->getCharacteristicQuantity())) { - $a[self::FIELD_CHARACTERISTIC_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CHARACTERISTIC_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CHARACTERISTIC_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_CHARACTERISTIC_QUANTITY] = $v; + } } if ([] !== ($vs = $this->getValue())) { $a[self::FIELD_VALUE] = []; @@ -474,8 +491,17 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_VALUE][] = $v->getValue(); - $a[self::FIELD_VALUE_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_EXT][] = $enc; + } else { + $a[self::FIELD_VALUE_EXT][] = null; + } + } else { + $a[self::FIELD_VALUE][] = $v; + } } } return $a; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicationKnowledge/FHIRMedicationKnowledgeRegulatory.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicationKnowledge/FHIRMedicationKnowledgeRegulatory.php index 2e708a75f8..c5178fc547 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicationKnowledge/FHIRMedicationKnowledgeRegulatory.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicationKnowledge/FHIRMedicationKnowledgeRegulatory.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -77,10 +77,6 @@ class FHIRMedicationKnowledgeRegulatory extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MEDICATION_KNOWLEDGE_DOT_REGULATORY; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_MAX_DISPENSE = 'maxDispense'; const FIELD_REGULATORY_AUTHORITY = 'regulatoryAuthority'; const FIELD_SCHEDULE = 'schedule'; @@ -125,6 +121,9 @@ class FHIRMedicationKnowledgeRegulatory extends FHIRBackboneElement */ protected $substitution = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMedicationKnowledgeRegulatory Constructor * @param null|array $data @@ -158,6 +157,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SCHEDULE])) { if (is_array($data[self::FIELD_SCHEDULE])) { foreach($data[self::FIELD_SCHEDULE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRMedicationKnowledgeSchedule) { $this->addSchedule($v); } else { @@ -173,6 +175,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SUBSTITUTION])) { if (is_array($data[self::FIELD_SUBSTITUTION])) { foreach($data[self::FIELD_SUBSTITUTION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRMedicationKnowledgeSubstitution) { $this->addSubstitution($v); } else { @@ -461,15 +466,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getMaxDispense())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MAX_DISPENSE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRegulatoryAuthority())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REGULATORY_AUTHORITY, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getSchedule())) { foreach($vs as $v) { if (null === $v) { @@ -487,6 +489,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_SUBSTITUTION, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicationKnowledge/FHIRMedicationKnowledgeRelatedMedicationKnowledge.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicationKnowledge/FHIRMedicationKnowledgeRelatedMedicationKnowledge.php index 45aee12d25..3dc4f1cbf0 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicationKnowledge/FHIRMedicationKnowledgeRelatedMedicationKnowledge.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicationKnowledge/FHIRMedicationKnowledgeRelatedMedicationKnowledge.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRMedicationKnowledgeRelatedMedicationKnowledge extends FHIRBackboneElem { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MEDICATION_KNOWLEDGE_DOT_RELATED_MEDICATION_KNOWLEDGE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_REFERENCE = 'reference'; const FIELD_TYPE = 'type'; @@ -108,6 +104,9 @@ class FHIRMedicationKnowledgeRelatedMedicationKnowledge extends FHIRBackboneElem */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMedicationKnowledgeRelatedMedicationKnowledge Constructor * @param null|array $data @@ -127,6 +126,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REFERENCE])) { if (is_array($data[self::FIELD_REFERENCE])) { foreach($data[self::FIELD_REFERENCE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addReference($v); } else { @@ -343,7 +345,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getReference())) { foreach($vs as $v) { if (null === $v) { diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicationKnowledge/FHIRMedicationKnowledgeSchedule.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicationKnowledge/FHIRMedicationKnowledgeSchedule.php index 7a6f6185c2..8cec877fd2 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicationKnowledge/FHIRMedicationKnowledgeSchedule.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicationKnowledge/FHIRMedicationKnowledgeSchedule.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -77,10 +77,6 @@ class FHIRMedicationKnowledgeSchedule extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MEDICATION_KNOWLEDGE_DOT_SCHEDULE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_SCHEDULE = 'schedule'; /** @@ -95,6 +91,9 @@ class FHIRMedicationKnowledgeSchedule extends FHIRBackboneElement */ protected $schedule = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMedicationKnowledgeSchedule Constructor * @param null|array $data @@ -254,7 +253,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getSchedule())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SCHEDULE, null, $v->_getFHIRXMLNamespace())); } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicationKnowledge/FHIRMedicationKnowledgeSubstitution.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicationKnowledge/FHIRMedicationKnowledgeSubstitution.php index 2e02802547..8035aa381c 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicationKnowledge/FHIRMedicationKnowledgeSubstitution.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicationKnowledge/FHIRMedicationKnowledgeSubstitution.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRMedicationKnowledgeSubstitution extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MEDICATION_KNOWLEDGE_DOT_SUBSTITUTION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ALLOWED = 'allowed'; const FIELD_ALLOWED_EXT = '_allowed'; const FIELD_TYPE = 'type'; @@ -108,6 +104,9 @@ class FHIRMedicationKnowledgeSubstitution extends FHIRBackboneElement */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMedicationKnowledgeSubstitution Constructor * @param null|array $data @@ -130,8 +129,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ALLOWED] instanceof FHIRBoolean) { $this->setAllowed($data[self::FIELD_ALLOWED]); - } elseif ($ext && is_scalar($data[self::FIELD_ALLOWED])) { - $this->setAllowed(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_ALLOWED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ALLOWED])) { + $this->setAllowed(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_ALLOWED]] + $ext)); + } else if (is_array($data[self::FIELD_ALLOWED])) { + $this->setAllowed(new FHIRBoolean(array_merge($ext, $data[self::FIELD_ALLOWED]))); + } } else { $this->setAllowed(new FHIRBoolean($data[self::FIELD_ALLOWED])); } @@ -324,7 +327,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getAllowed())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ALLOWED, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -338,8 +340,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getAllowed())) { - $a[self::FIELD_ALLOWED] = $v->getValue(); - $a[self::FIELD_ALLOWED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ALLOWED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ALLOWED_EXT] = $enc; + } + } else { + $a[self::FIELD_ALLOWED] = $v; + } } if (null !== ($v = $this->getType())) { $a[self::FIELD_TYPE] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicationRequest/FHIRMedicationRequestDispenseRequest.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicationRequest/FHIRMedicationRequestDispenseRequest.php index 42ea69efa9..248c764a7e 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicationRequest/FHIRMedicationRequestDispenseRequest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicationRequest/FHIRMedicationRequestDispenseRequest.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -85,12 +85,10 @@ class FHIRMedicationRequestDispenseRequest extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MEDICATION_REQUEST_DOT_DISPENSE_REQUEST; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DISPENSE_INTERVAL = 'dispenseInterval'; + const FIELD_DISPENSE_INTERVAL_EXT = '_dispenseInterval'; const FIELD_EXPECTED_SUPPLY_DURATION = 'expectedSupplyDuration'; + const FIELD_EXPECTED_SUPPLY_DURATION_EXT = '_expectedSupplyDuration'; const FIELD_INITIAL_FILL = 'initialFill'; const FIELD_NUMBER_OF_REPEATS_ALLOWED = 'numberOfRepeatsAllowed'; const FIELD_NUMBER_OF_REPEATS_ALLOWED_EXT = '_numberOfRepeatsAllowed'; @@ -188,6 +186,9 @@ class FHIRMedicationRequestDispenseRequest extends FHIRBackboneElement */ protected $validityPeriod = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMedicationRequestDispenseRequest Constructor * @param null|array $data @@ -205,15 +206,33 @@ public function __construct($data = null) } parent::__construct($data); if (isset($data[self::FIELD_DISPENSE_INTERVAL])) { + $ext = (isset($data[self::FIELD_DISPENSE_INTERVAL_EXT]) && is_array($data[self::FIELD_DISPENSE_INTERVAL_EXT])) + ? $data[self::FIELD_DISPENSE_INTERVAL_EXT] + : null; if ($data[self::FIELD_DISPENSE_INTERVAL] instanceof FHIRDuration) { $this->setDispenseInterval($data[self::FIELD_DISPENSE_INTERVAL]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DISPENSE_INTERVAL])) { + $this->setDispenseInterval(new FHIRDuration([FHIRDuration::FIELD_VALUE => $data[self::FIELD_DISPENSE_INTERVAL]] + $ext)); + } else if (is_array($data[self::FIELD_DISPENSE_INTERVAL])) { + $this->setDispenseInterval(new FHIRDuration(array_merge($ext, $data[self::FIELD_DISPENSE_INTERVAL]))); + } } else { $this->setDispenseInterval(new FHIRDuration($data[self::FIELD_DISPENSE_INTERVAL])); } } if (isset($data[self::FIELD_EXPECTED_SUPPLY_DURATION])) { + $ext = (isset($data[self::FIELD_EXPECTED_SUPPLY_DURATION_EXT]) && is_array($data[self::FIELD_EXPECTED_SUPPLY_DURATION_EXT])) + ? $data[self::FIELD_EXPECTED_SUPPLY_DURATION_EXT] + : null; if ($data[self::FIELD_EXPECTED_SUPPLY_DURATION] instanceof FHIRDuration) { $this->setExpectedSupplyDuration($data[self::FIELD_EXPECTED_SUPPLY_DURATION]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EXPECTED_SUPPLY_DURATION])) { + $this->setExpectedSupplyDuration(new FHIRDuration([FHIRDuration::FIELD_VALUE => $data[self::FIELD_EXPECTED_SUPPLY_DURATION]] + $ext)); + } else if (is_array($data[self::FIELD_EXPECTED_SUPPLY_DURATION])) { + $this->setExpectedSupplyDuration(new FHIRDuration(array_merge($ext, $data[self::FIELD_EXPECTED_SUPPLY_DURATION]))); + } } else { $this->setExpectedSupplyDuration(new FHIRDuration($data[self::FIELD_EXPECTED_SUPPLY_DURATION])); } @@ -231,8 +250,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NUMBER_OF_REPEATS_ALLOWED] instanceof FHIRUnsignedInt) { $this->setNumberOfRepeatsAllowed($data[self::FIELD_NUMBER_OF_REPEATS_ALLOWED]); - } elseif ($ext && is_scalar($data[self::FIELD_NUMBER_OF_REPEATS_ALLOWED])) { - $this->setNumberOfRepeatsAllowed(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_NUMBER_OF_REPEATS_ALLOWED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NUMBER_OF_REPEATS_ALLOWED])) { + $this->setNumberOfRepeatsAllowed(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_NUMBER_OF_REPEATS_ALLOWED]] + $ext)); + } else if (is_array($data[self::FIELD_NUMBER_OF_REPEATS_ALLOWED])) { + $this->setNumberOfRepeatsAllowed(new FHIRUnsignedInt(array_merge($ext, $data[self::FIELD_NUMBER_OF_REPEATS_ALLOWED]))); + } } else { $this->setNumberOfRepeatsAllowed(new FHIRUnsignedInt($data[self::FIELD_NUMBER_OF_REPEATS_ALLOWED])); } @@ -250,8 +273,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_QUANTITY] instanceof FHIRQuantity) { $this->setQuantity($data[self::FIELD_QUANTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_QUANTITY])) { - $this->setQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_QUANTITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_QUANTITY])) { + $this->setQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_QUANTITY])) { + $this->setQuantity(new FHIRQuantity(array_merge($ext, $data[self::FIELD_QUANTITY]))); + } } else { $this->setQuantity(new FHIRQuantity($data[self::FIELD_QUANTITY])); } @@ -630,30 +657,24 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getDispenseInterval())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DISPENSE_INTERVAL, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getExpectedSupplyDuration())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EXPECTED_SUPPLY_DURATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getInitialFill())) { $v->xmlSerialize($sxe->addChild(self::FIELD_INITIAL_FILL, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getNumberOfRepeatsAllowed())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NUMBER_OF_REPEATS_ALLOWED, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPerformer())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PERFORMER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_QUANTITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValidityPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALIDITY_PERIOD, null, $v->_getFHIRXMLNamespace())); } @@ -667,23 +688,54 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getDispenseInterval())) { - $a[self::FIELD_DISPENSE_INTERVAL] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DISPENSE_INTERVAL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DISPENSE_INTERVAL_EXT] = $enc; + } + } else { + $a[self::FIELD_DISPENSE_INTERVAL] = $v; + } } if (null !== ($v = $this->getExpectedSupplyDuration())) { - $a[self::FIELD_EXPECTED_SUPPLY_DURATION] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EXPECTED_SUPPLY_DURATION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EXPECTED_SUPPLY_DURATION_EXT] = $enc; + } + } else { + $a[self::FIELD_EXPECTED_SUPPLY_DURATION] = $v; + } } if (null !== ($v = $this->getInitialFill())) { $a[self::FIELD_INITIAL_FILL] = $v; } if (null !== ($v = $this->getNumberOfRepeatsAllowed())) { - $a[self::FIELD_NUMBER_OF_REPEATS_ALLOWED] = $v->getValue(); - $a[self::FIELD_NUMBER_OF_REPEATS_ALLOWED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NUMBER_OF_REPEATS_ALLOWED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NUMBER_OF_REPEATS_ALLOWED_EXT] = $enc; + } + } else { + $a[self::FIELD_NUMBER_OF_REPEATS_ALLOWED] = $v; + } } if (null !== ($v = $this->getPerformer())) { $a[self::FIELD_PERFORMER] = $v; } if (null !== ($v = $this->getQuantity())) { - $a[self::FIELD_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_QUANTITY] = $v; + } } if (null !== ($v = $this->getValidityPeriod())) { $a[self::FIELD_VALIDITY_PERIOD] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicationRequest/FHIRMedicationRequestInitialFill.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicationRequest/FHIRMedicationRequestInitialFill.php index 2194936324..4701650b0a 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicationRequest/FHIRMedicationRequestInitialFill.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicationRequest/FHIRMedicationRequestInitialFill.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -82,11 +82,8 @@ class FHIRMedicationRequestInitialFill extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MEDICATION_REQUEST_DOT_INITIAL_FILL; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DURATION = 'duration'; + const FIELD_DURATION_EXT = '_duration'; const FIELD_QUANTITY = 'quantity'; const FIELD_QUANTITY_EXT = '_quantity'; @@ -114,6 +111,9 @@ class FHIRMedicationRequestInitialFill extends FHIRBackboneElement */ protected $quantity = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMedicationRequestInitialFill Constructor * @param null|array $data @@ -131,8 +131,17 @@ public function __construct($data = null) } parent::__construct($data); if (isset($data[self::FIELD_DURATION])) { + $ext = (isset($data[self::FIELD_DURATION_EXT]) && is_array($data[self::FIELD_DURATION_EXT])) + ? $data[self::FIELD_DURATION_EXT] + : null; if ($data[self::FIELD_DURATION] instanceof FHIRDuration) { $this->setDuration($data[self::FIELD_DURATION]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DURATION])) { + $this->setDuration(new FHIRDuration([FHIRDuration::FIELD_VALUE => $data[self::FIELD_DURATION]] + $ext)); + } else if (is_array($data[self::FIELD_DURATION])) { + $this->setDuration(new FHIRDuration(array_merge($ext, $data[self::FIELD_DURATION]))); + } } else { $this->setDuration(new FHIRDuration($data[self::FIELD_DURATION])); } @@ -143,8 +152,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_QUANTITY] instanceof FHIRQuantity) { $this->setQuantity($data[self::FIELD_QUANTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_QUANTITY])) { - $this->setQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_QUANTITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_QUANTITY])) { + $this->setQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_QUANTITY])) { + $this->setQuantity(new FHIRQuantity(array_merge($ext, $data[self::FIELD_QUANTITY]))); + } } else { $this->setQuantity(new FHIRQuantity($data[self::FIELD_QUANTITY])); } @@ -320,11 +333,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getDuration())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DURATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_QUANTITY, null, $v->_getFHIRXMLNamespace())); } @@ -338,10 +349,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getDuration())) { - $a[self::FIELD_DURATION] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DURATION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DURATION_EXT] = $enc; + } + } else { + $a[self::FIELD_DURATION] = $v; + } } if (null !== ($v = $this->getQuantity())) { - $a[self::FIELD_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_QUANTITY] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicationRequest/FHIRMedicationRequestSubstitution.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicationRequest/FHIRMedicationRequestSubstitution.php index c356436e28..957b652cf0 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicationRequest/FHIRMedicationRequestSubstitution.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicationRequest/FHIRMedicationRequestSubstitution.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -82,10 +82,6 @@ class FHIRMedicationRequestSubstitution extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MEDICATION_REQUEST_DOT_SUBSTITUTION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ALLOWED_BOOLEAN = 'allowedBoolean'; const FIELD_ALLOWED_BOOLEAN_EXT = '_allowedBoolean'; const FIELD_ALLOWED_CODEABLE_CONCEPT = 'allowedCodeableConcept'; @@ -128,6 +124,9 @@ class FHIRMedicationRequestSubstitution extends FHIRBackboneElement */ protected $reason = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMedicationRequestSubstitution Constructor * @param null|array $data @@ -150,8 +149,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ALLOWED_BOOLEAN] instanceof FHIRBoolean) { $this->setAllowedBoolean($data[self::FIELD_ALLOWED_BOOLEAN]); - } elseif ($ext && is_scalar($data[self::FIELD_ALLOWED_BOOLEAN])) { - $this->setAllowedBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_ALLOWED_BOOLEAN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ALLOWED_BOOLEAN])) { + $this->setAllowedBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_ALLOWED_BOOLEAN]] + $ext)); + } else if (is_array($data[self::FIELD_ALLOWED_BOOLEAN])) { + $this->setAllowedBoolean(new FHIRBoolean(array_merge($ext, $data[self::FIELD_ALLOWED_BOOLEAN]))); + } } else { $this->setAllowedBoolean(new FHIRBoolean($data[self::FIELD_ALLOWED_BOOLEAN])); } @@ -392,11 +395,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getAllowedBoolean())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ALLOWED_BOOLEAN, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getAllowedCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ALLOWED_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getReason())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REASON, null, $v->_getFHIRXMLNamespace())); } @@ -410,8 +411,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getAllowedBoolean())) { - $a[self::FIELD_ALLOWED_BOOLEAN] = $v->getValue(); - $a[self::FIELD_ALLOWED_BOOLEAN_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ALLOWED_BOOLEAN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ALLOWED_BOOLEAN_EXT] = $enc; + } + } else { + $a[self::FIELD_ALLOWED_BOOLEAN] = $v; + } } if (null !== ($v = $this->getAllowedCodeableConcept())) { $a[self::FIELD_ALLOWED_CODEABLE_CONCEPT] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicinalProduct/FHIRMedicinalProductCountryLanguage.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicinalProduct/FHIRMedicinalProductCountryLanguage.php index 6cb3612e8a..5b9a0f698a 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicinalProduct/FHIRMedicinalProductCountryLanguage.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicinalProduct/FHIRMedicinalProductCountryLanguage.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRMedicinalProductCountryLanguage extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MEDICINAL_PRODUCT_DOT_COUNTRY_LANGUAGE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_COUNTRY = 'country'; const FIELD_JURISDICTION = 'jurisdiction'; const FIELD_LANGUAGE = 'language'; @@ -122,6 +118,9 @@ class FHIRMedicinalProductCountryLanguage extends FHIRBackboneElement */ protected $language = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMedicinalProductCountryLanguage Constructor * @param null|array $data @@ -365,15 +364,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getCountry())) { $v->xmlSerialize($sxe->addChild(self::FIELD_COUNTRY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getJurisdiction())) { $v->xmlSerialize($sxe->addChild(self::FIELD_JURISDICTION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getLanguage())) { $v->xmlSerialize($sxe->addChild(self::FIELD_LANGUAGE, null, $v->_getFHIRXMLNamespace())); } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicinalProduct/FHIRMedicinalProductManufacturingBusinessOperation.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicinalProduct/FHIRMedicinalProductManufacturingBusinessOperation.php index 2b7cd6fc3b..67ead00df6 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicinalProduct/FHIRMedicinalProductManufacturingBusinessOperation.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicinalProduct/FHIRMedicinalProductManufacturingBusinessOperation.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -81,10 +81,6 @@ class FHIRMedicinalProductManufacturingBusinessOperation extends FHIRBackboneEle { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MEDICINAL_PRODUCT_DOT_MANUFACTURING_BUSINESS_OPERATION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_AUTHORISATION_REFERENCE_NUMBER = 'authorisationReferenceNumber'; const FIELD_AUTHORISATION_REFERENCE_NUMBER_EXT = '_authorisationReferenceNumber'; const FIELD_CONFIDENTIALITY_INDICATOR = 'confidentialityIndicator'; @@ -166,6 +162,9 @@ class FHIRMedicinalProductManufacturingBusinessOperation extends FHIRBackboneEle */ protected $regulator = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMedicinalProductManufacturingBusinessOperation Constructor * @param null|array $data @@ -188,8 +187,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_AUTHORISATION_REFERENCE_NUMBER] instanceof FHIRIdentifier) { $this->setAuthorisationReferenceNumber($data[self::FIELD_AUTHORISATION_REFERENCE_NUMBER]); - } elseif ($ext && is_scalar($data[self::FIELD_AUTHORISATION_REFERENCE_NUMBER])) { - $this->setAuthorisationReferenceNumber(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_AUTHORISATION_REFERENCE_NUMBER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_AUTHORISATION_REFERENCE_NUMBER])) { + $this->setAuthorisationReferenceNumber(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_AUTHORISATION_REFERENCE_NUMBER]] + $ext)); + } else if (is_array($data[self::FIELD_AUTHORISATION_REFERENCE_NUMBER])) { + $this->setAuthorisationReferenceNumber(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_AUTHORISATION_REFERENCE_NUMBER]))); + } } else { $this->setAuthorisationReferenceNumber(new FHIRIdentifier($data[self::FIELD_AUTHORISATION_REFERENCE_NUMBER])); } @@ -207,8 +210,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EFFECTIVE_DATE] instanceof FHIRDateTime) { $this->setEffectiveDate($data[self::FIELD_EFFECTIVE_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_EFFECTIVE_DATE])) { - $this->setEffectiveDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_EFFECTIVE_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EFFECTIVE_DATE])) { + $this->setEffectiveDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_EFFECTIVE_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_EFFECTIVE_DATE])) { + $this->setEffectiveDate(new FHIRDateTime(array_merge($ext, $data[self::FIELD_EFFECTIVE_DATE]))); + } } else { $this->setEffectiveDate(new FHIRDateTime($data[self::FIELD_EFFECTIVE_DATE])); } @@ -216,6 +223,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_MANUFACTURER])) { if (is_array($data[self::FIELD_MANUFACTURER])) { foreach($data[self::FIELD_MANUFACTURER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addManufacturer($v); } else { @@ -592,18 +602,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getAuthorisationReferenceNumber())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AUTHORISATION_REFERENCE_NUMBER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getConfidentialityIndicator())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CONFIDENTIALITY_INDICATOR, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getEffectiveDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EFFECTIVE_DATE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getManufacturer())) { foreach($vs as $v) { if (null === $v) { @@ -616,7 +623,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getOperationType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OPERATION_TYPE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRegulator())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REGULATOR, null, $v->_getFHIRXMLNamespace())); } @@ -630,14 +636,29 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getAuthorisationReferenceNumber())) { - $a[self::FIELD_AUTHORISATION_REFERENCE_NUMBER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_AUTHORISATION_REFERENCE_NUMBER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_AUTHORISATION_REFERENCE_NUMBER_EXT] = $enc; + } + } else { + $a[self::FIELD_AUTHORISATION_REFERENCE_NUMBER] = $v; + } } if (null !== ($v = $this->getConfidentialityIndicator())) { $a[self::FIELD_CONFIDENTIALITY_INDICATOR] = $v; } if (null !== ($v = $this->getEffectiveDate())) { - $a[self::FIELD_EFFECTIVE_DATE] = $v->getValue(); - $a[self::FIELD_EFFECTIVE_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EFFECTIVE_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EFFECTIVE_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_EFFECTIVE_DATE] = $v; + } } if ([] !== ($vs = $this->getManufacturer())) { $a[self::FIELD_MANUFACTURER] = $vs; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicinalProduct/FHIRMedicinalProductName.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicinalProduct/FHIRMedicinalProductName.php index d97a6ed701..1096940a13 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicinalProduct/FHIRMedicinalProductName.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicinalProduct/FHIRMedicinalProductName.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRMedicinalProductName extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MEDICINAL_PRODUCT_DOT_NAME; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_COUNTRY_LANGUAGE = 'countryLanguage'; const FIELD_NAME_PART = 'namePart'; const FIELD_PRODUCT_NAME = 'productName'; @@ -118,6 +114,9 @@ class FHIRMedicinalProductName extends FHIRBackboneElement */ protected $productName = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMedicinalProductName Constructor * @param null|array $data @@ -137,6 +136,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_COUNTRY_LANGUAGE])) { if (is_array($data[self::FIELD_COUNTRY_LANGUAGE])) { foreach($data[self::FIELD_COUNTRY_LANGUAGE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRMedicinalProductCountryLanguage) { $this->addCountryLanguage($v); } else { @@ -152,6 +154,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_NAME_PART])) { if (is_array($data[self::FIELD_NAME_PART])) { foreach($data[self::FIELD_NAME_PART] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRMedicinalProductNamePart) { $this->addNamePart($v); } else { @@ -170,8 +175,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PRODUCT_NAME] instanceof FHIRString) { $this->setProductName($data[self::FIELD_PRODUCT_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_PRODUCT_NAME])) { - $this->setProductName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PRODUCT_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PRODUCT_NAME])) { + $this->setProductName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PRODUCT_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_PRODUCT_NAME])) { + $this->setProductName(new FHIRString(array_merge($ext, $data[self::FIELD_PRODUCT_NAME]))); + } } else { $this->setProductName(new FHIRString($data[self::FIELD_PRODUCT_NAME])); } @@ -437,7 +446,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getCountryLanguage())) { foreach($vs as $v) { if (null === $v) { @@ -455,6 +463,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_NAME_PART, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getProductName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PRODUCT_NAME, null, $v->_getFHIRXMLNamespace())); } @@ -474,8 +483,15 @@ public function jsonSerialize() $a[self::FIELD_NAME_PART] = $vs; } if (null !== ($v = $this->getProductName())) { - $a[self::FIELD_PRODUCT_NAME] = $v->getValue(); - $a[self::FIELD_PRODUCT_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PRODUCT_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PRODUCT_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_PRODUCT_NAME] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicinalProduct/FHIRMedicinalProductNamePart.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicinalProduct/FHIRMedicinalProductNamePart.php index c2b06b9efa..8320ab854c 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicinalProduct/FHIRMedicinalProductNamePart.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicinalProduct/FHIRMedicinalProductNamePart.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRMedicinalProductNamePart extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MEDICINAL_PRODUCT_DOT_NAME_PART; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_PART = 'part'; const FIELD_PART_EXT = '_part'; const FIELD_TYPE = 'type'; @@ -109,6 +105,9 @@ class FHIRMedicinalProductNamePart extends FHIRBackboneElement */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMedicinalProductNamePart Constructor * @param null|array $data @@ -131,8 +130,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PART] instanceof FHIRString) { $this->setPart($data[self::FIELD_PART]); - } elseif ($ext && is_scalar($data[self::FIELD_PART])) { - $this->setPart(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PART]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PART])) { + $this->setPart(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PART]] + $ext)); + } else if (is_array($data[self::FIELD_PART])) { + $this->setPart(new FHIRString(array_merge($ext, $data[self::FIELD_PART]))); + } } else { $this->setPart(new FHIRString($data[self::FIELD_PART])); } @@ -325,7 +328,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getPart())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PART, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -339,8 +341,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getPart())) { - $a[self::FIELD_PART] = $v->getValue(); - $a[self::FIELD_PART_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PART] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PART_EXT] = $enc; + } + } else { + $a[self::FIELD_PART] = $v; + } } if (null !== ($v = $this->getType())) { $a[self::FIELD_TYPE] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicinalProduct/FHIRMedicinalProductSpecialDesignation.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicinalProduct/FHIRMedicinalProductSpecialDesignation.php index d871171a69..1453ba3c3b 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicinalProduct/FHIRMedicinalProductSpecialDesignation.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicinalProduct/FHIRMedicinalProductSpecialDesignation.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -81,10 +81,6 @@ class FHIRMedicinalProductSpecialDesignation extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MEDICINAL_PRODUCT_DOT_SPECIAL_DESIGNATION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DATE = 'date'; const FIELD_DATE_EXT = '_date'; const FIELD_IDENTIFIER = 'identifier'; @@ -195,6 +191,9 @@ class FHIRMedicinalProductSpecialDesignation extends FHIRBackboneElement */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMedicinalProductSpecialDesignation Constructor * @param null|array $data @@ -217,8 +216,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATE] instanceof FHIRDateTime) { $this->setDate($data[self::FIELD_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_DATE])) { - $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime(array_merge($ext, $data[self::FIELD_DATE]))); + } } else { $this->setDate(new FHIRDateTime($data[self::FIELD_DATE])); } @@ -229,17 +232,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -717,7 +727,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DATE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -730,23 +739,18 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getIndicationCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_INDICATION_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getIndicationReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_INDICATION_REFERENCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getIntendedUse())) { $v->xmlSerialize($sxe->addChild(self::FIELD_INTENDED_USE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSpecies())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SPECIES, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -760,11 +764,34 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getDate())) { - $a[self::FIELD_DATE] = $v->getValue(); - $a[self::FIELD_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_DATE] = $v; + } } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if (null !== ($v = $this->getIndicationCodeableConcept())) { $a[self::FIELD_INDICATION_CODEABLE_CONCEPT] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicinalProductAuthorization/FHIRMedicinalProductAuthorizationJurisdictionalAuthorization.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicinalProductAuthorization/FHIRMedicinalProductAuthorizationJurisdictionalAuthorization.php index 22bae69725..da956f7826 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicinalProductAuthorization/FHIRMedicinalProductAuthorizationJurisdictionalAuthorization.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicinalProductAuthorization/FHIRMedicinalProductAuthorizationJurisdictionalAuthorization.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRMedicinalProductAuthorizationJurisdictionalAuthorization extends FHIRB { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MEDICINAL_PRODUCT_AUTHORIZATION_DOT_JURISDICTIONAL_AUTHORIZATION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_COUNTRY = 'country'; const FIELD_IDENTIFIER = 'identifier'; const FIELD_IDENTIFIER_EXT = '_identifier'; @@ -149,6 +145,9 @@ class FHIRMedicinalProductAuthorizationJurisdictionalAuthorization extends FHIRB */ protected $validityPeriod = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMedicinalProductAuthorizationJurisdictionalAuthorization Constructor * @param null|array $data @@ -178,17 +177,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -197,6 +203,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_JURISDICTION])) { if (is_array($data[self::FIELD_JURISDICTION])) { foreach($data[self::FIELD_JURISDICTION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addJurisdiction($v); } else { @@ -555,11 +564,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getCountry())) { $v->xmlSerialize($sxe->addChild(self::FIELD_COUNTRY, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -581,7 +588,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getLegalStatusOfSupply())) { $v->xmlSerialize($sxe->addChild(self::FIELD_LEGAL_STATUS_OF_SUPPLY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValidityPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALIDITY_PERIOD, null, $v->_getFHIRXMLNamespace())); } @@ -598,7 +604,23 @@ public function jsonSerialize() $a[self::FIELD_COUNTRY] = $v; } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if ([] !== ($vs = $this->getJurisdiction())) { $a[self::FIELD_JURISDICTION] = $vs; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicinalProductAuthorization/FHIRMedicinalProductAuthorizationProcedure.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicinalProductAuthorization/FHIRMedicinalProductAuthorizationProcedure.php index dcc39a8281..14a7d5d57b 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicinalProductAuthorization/FHIRMedicinalProductAuthorizationProcedure.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicinalProductAuthorization/FHIRMedicinalProductAuthorizationProcedure.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRMedicinalProductAuthorizationProcedure extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MEDICINAL_PRODUCT_AUTHORIZATION_DOT_PROCEDURE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_APPLICATION = 'application'; const FIELD_DATE_DATE_TIME = 'dateDateTime'; const FIELD_DATE_DATE_TIME_EXT = '_dateDateTime'; @@ -150,6 +146,9 @@ class FHIRMedicinalProductAuthorizationProcedure extends FHIRBackboneElement */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMedicinalProductAuthorizationProcedure Constructor * @param null|array $data @@ -169,6 +168,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_APPLICATION])) { if (is_array($data[self::FIELD_APPLICATION])) { foreach($data[self::FIELD_APPLICATION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRMedicinalProductAuthorizationProcedure) { $this->addApplication($v); } else { @@ -187,8 +189,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATE_DATE_TIME] instanceof FHIRDateTime) { $this->setDateDateTime($data[self::FIELD_DATE_DATE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_DATE_DATE_TIME])) { - $this->setDateDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE_DATE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATE_DATE_TIME])) { + $this->setDateDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE_DATE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_DATE_DATE_TIME])) { + $this->setDateDateTime(new FHIRDateTime(array_merge($ext, $data[self::FIELD_DATE_DATE_TIME]))); + } } else { $this->setDateDateTime(new FHIRDateTime($data[self::FIELD_DATE_DATE_TIME])); } @@ -206,8 +212,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->setIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { - $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_IDENTIFIER]))); + } } else { $this->setIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); } @@ -528,7 +538,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getApplication())) { foreach($vs as $v) { if (null === $v) { @@ -537,18 +546,16 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_APPLICATION, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getDateDateTime())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DATE_DATE_TIME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDatePeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DATE_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -565,14 +572,29 @@ public function jsonSerialize() $a[self::FIELD_APPLICATION] = $vs; } if (null !== ($v = $this->getDateDateTime())) { - $a[self::FIELD_DATE_DATE_TIME] = $v->getValue(); - $a[self::FIELD_DATE_DATE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATE_DATE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATE_DATE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_DATE_DATE_TIME] = $v; + } } if (null !== ($v = $this->getDatePeriod())) { $a[self::FIELD_DATE_PERIOD] = $v; } if (null !== ($v = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_IDENTIFIER] = $v; + } } if (null !== ($v = $this->getType())) { $a[self::FIELD_TYPE] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicinalProductContraindication/FHIRMedicinalProductContraindicationOtherTherapy.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicinalProductContraindication/FHIRMedicinalProductContraindicationOtherTherapy.php index b992d577ce..f81321cd70 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicinalProductContraindication/FHIRMedicinalProductContraindicationOtherTherapy.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicinalProductContraindication/FHIRMedicinalProductContraindicationOtherTherapy.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRMedicinalProductContraindicationOtherTherapy extends FHIRBackboneEleme { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MEDICINAL_PRODUCT_CONTRAINDICATION_DOT_OTHER_THERAPY; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_MEDICATION_CODEABLE_CONCEPT = 'medicationCodeableConcept'; const FIELD_MEDICATION_REFERENCE = 'medicationReference'; const FIELD_THERAPY_RELATIONSHIP_TYPE = 'therapyRelationshipType'; @@ -127,6 +123,9 @@ class FHIRMedicinalProductContraindicationOtherTherapy extends FHIRBackboneEleme */ protected $therapyRelationshipType = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMedicinalProductContraindicationOtherTherapy Constructor * @param null|array $data @@ -378,15 +377,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getMedicationCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MEDICATION_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getMedicationReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MEDICATION_REFERENCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getTherapyRelationshipType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_THERAPY_RELATIONSHIP_TYPE, null, $v->_getFHIRXMLNamespace())); } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicinalProductIndication/FHIRMedicinalProductIndicationOtherTherapy.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicinalProductIndication/FHIRMedicinalProductIndicationOtherTherapy.php index ae2e201854..44ccb0583a 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicinalProductIndication/FHIRMedicinalProductIndicationOtherTherapy.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicinalProductIndication/FHIRMedicinalProductIndicationOtherTherapy.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRMedicinalProductIndicationOtherTherapy extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MEDICINAL_PRODUCT_INDICATION_DOT_OTHER_THERAPY; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_MEDICATION_CODEABLE_CONCEPT = 'medicationCodeableConcept'; const FIELD_MEDICATION_REFERENCE = 'medicationReference'; const FIELD_THERAPY_RELATIONSHIP_TYPE = 'therapyRelationshipType'; @@ -126,6 +122,9 @@ class FHIRMedicinalProductIndicationOtherTherapy extends FHIRBackboneElement */ protected $therapyRelationshipType = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMedicinalProductIndicationOtherTherapy Constructor * @param null|array $data @@ -377,15 +376,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getMedicationCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MEDICATION_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getMedicationReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MEDICATION_REFERENCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getTherapyRelationshipType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_THERAPY_RELATIONSHIP_TYPE, null, $v->_getFHIRXMLNamespace())); } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicinalProductIngredient/FHIRMedicinalProductIngredientReferenceStrength.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicinalProductIngredient/FHIRMedicinalProductIngredientReferenceStrength.php index 3d95ad9efd..bc8e1fac2d 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicinalProductIngredient/FHIRMedicinalProductIngredientReferenceStrength.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicinalProductIngredient/FHIRMedicinalProductIngredientReferenceStrength.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRMedicinalProductIngredientReferenceStrength extends FHIRBackboneElemen { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MEDICINAL_PRODUCT_INGREDIENT_DOT_REFERENCE_STRENGTH; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_COUNTRY = 'country'; const FIELD_MEASUREMENT_POINT = 'measurementPoint'; const FIELD_MEASUREMENT_POINT_EXT = '_measurementPoint'; @@ -149,6 +145,9 @@ class FHIRMedicinalProductIngredientReferenceStrength extends FHIRBackboneElemen */ protected $substance = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMedicinalProductIngredientReferenceStrength Constructor * @param null|array $data @@ -168,6 +167,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_COUNTRY])) { if (is_array($data[self::FIELD_COUNTRY])) { foreach($data[self::FIELD_COUNTRY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addCountry($v); } else { @@ -186,8 +188,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MEASUREMENT_POINT] instanceof FHIRString) { $this->setMeasurementPoint($data[self::FIELD_MEASUREMENT_POINT]); - } elseif ($ext && is_scalar($data[self::FIELD_MEASUREMENT_POINT])) { - $this->setMeasurementPoint(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_MEASUREMENT_POINT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MEASUREMENT_POINT])) { + $this->setMeasurementPoint(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_MEASUREMENT_POINT]] + $ext)); + } else if (is_array($data[self::FIELD_MEASUREMENT_POINT])) { + $this->setMeasurementPoint(new FHIRString(array_merge($ext, $data[self::FIELD_MEASUREMENT_POINT]))); + } } else { $this->setMeasurementPoint(new FHIRString($data[self::FIELD_MEASUREMENT_POINT])); } @@ -527,7 +533,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getCountry())) { foreach($vs as $v) { if (null === $v) { @@ -536,18 +541,16 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_COUNTRY, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getMeasurementPoint())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MEASUREMENT_POINT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStrength())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STRENGTH, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStrengthLowLimit())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STRENGTH_LOW_LIMIT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSubstance())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBSTANCE, null, $v->_getFHIRXMLNamespace())); } @@ -564,8 +567,15 @@ public function jsonSerialize() $a[self::FIELD_COUNTRY] = $vs; } if (null !== ($v = $this->getMeasurementPoint())) { - $a[self::FIELD_MEASUREMENT_POINT] = $v->getValue(); - $a[self::FIELD_MEASUREMENT_POINT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MEASUREMENT_POINT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MEASUREMENT_POINT_EXT] = $enc; + } + } else { + $a[self::FIELD_MEASUREMENT_POINT] = $v; + } } if (null !== ($v = $this->getStrength())) { $a[self::FIELD_STRENGTH] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicinalProductIngredient/FHIRMedicinalProductIngredientSpecifiedSubstance.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicinalProductIngredient/FHIRMedicinalProductIngredientSpecifiedSubstance.php index 229bb938e3..0ff7eb6afa 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicinalProductIngredient/FHIRMedicinalProductIngredientSpecifiedSubstance.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicinalProductIngredient/FHIRMedicinalProductIngredientSpecifiedSubstance.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -77,10 +77,6 @@ class FHIRMedicinalProductIngredientSpecifiedSubstance extends FHIRBackboneEleme { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MEDICINAL_PRODUCT_INGREDIENT_DOT_SPECIFIED_SUBSTANCE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CODE = 'code'; const FIELD_CONFIDENTIALITY = 'confidentiality'; const FIELD_GROUP = 'group'; @@ -132,6 +128,9 @@ class FHIRMedicinalProductIngredientSpecifiedSubstance extends FHIRBackboneEleme */ protected $strength = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMedicinalProductIngredientSpecifiedSubstance Constructor * @param null|array $data @@ -172,6 +171,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_STRENGTH])) { if (is_array($data[self::FIELD_STRENGTH])) { foreach($data[self::FIELD_STRENGTH] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRMedicinalProductIngredientStrength) { $this->addStrength($v); } else { @@ -448,19 +450,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getConfidentiality())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CONFIDENTIALITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getGroup())) { $v->xmlSerialize($sxe->addChild(self::FIELD_GROUP, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getStrength())) { foreach($vs as $v) { if (null === $v) { @@ -469,6 +467,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_STRENGTH, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicinalProductIngredient/FHIRMedicinalProductIngredientStrength.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicinalProductIngredient/FHIRMedicinalProductIngredientStrength.php index 75f6576540..19896049d6 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicinalProductIngredient/FHIRMedicinalProductIngredientStrength.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicinalProductIngredient/FHIRMedicinalProductIngredientStrength.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRMedicinalProductIngredientStrength extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MEDICINAL_PRODUCT_INGREDIENT_DOT_STRENGTH; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CONCENTRATION = 'concentration'; const FIELD_CONCENTRATION_LOW_LIMIT = 'concentrationLowLimit'; const FIELD_COUNTRY = 'country'; @@ -176,6 +172,9 @@ class FHIRMedicinalProductIngredientStrength extends FHIRBackboneElement */ protected $referenceStrength = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMedicinalProductIngredientStrength Constructor * @param null|array $data @@ -209,6 +208,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_COUNTRY])) { if (is_array($data[self::FIELD_COUNTRY])) { foreach($data[self::FIELD_COUNTRY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addCountry($v); } else { @@ -227,8 +229,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MEASUREMENT_POINT] instanceof FHIRString) { $this->setMeasurementPoint($data[self::FIELD_MEASUREMENT_POINT]); - } elseif ($ext && is_scalar($data[self::FIELD_MEASUREMENT_POINT])) { - $this->setMeasurementPoint(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_MEASUREMENT_POINT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MEASUREMENT_POINT])) { + $this->setMeasurementPoint(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_MEASUREMENT_POINT]] + $ext)); + } else if (is_array($data[self::FIELD_MEASUREMENT_POINT])) { + $this->setMeasurementPoint(new FHIRString(array_merge($ext, $data[self::FIELD_MEASUREMENT_POINT]))); + } } else { $this->setMeasurementPoint(new FHIRString($data[self::FIELD_MEASUREMENT_POINT])); } @@ -250,6 +256,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REFERENCE_STRENGTH])) { if (is_array($data[self::FIELD_REFERENCE_STRENGTH])) { foreach($data[self::FIELD_REFERENCE_STRENGTH] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRMedicinalProductIngredientReferenceStrength) { $this->addReferenceStrength($v); } else { @@ -674,15 +683,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getConcentration())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CONCENTRATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getConcentrationLowLimit())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CONCENTRATION_LOW_LIMIT, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getCountry())) { foreach($vs as $v) { if (null === $v) { @@ -691,18 +697,16 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_COUNTRY, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getMeasurementPoint())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MEASUREMENT_POINT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPresentation())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PRESENTATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPresentationLowLimit())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PRESENTATION_LOW_LIMIT, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getReferenceStrength())) { foreach($vs as $v) { if (null === $v) { @@ -711,6 +715,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_REFERENCE_STRENGTH, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } @@ -730,8 +735,15 @@ public function jsonSerialize() $a[self::FIELD_COUNTRY] = $vs; } if (null !== ($v = $this->getMeasurementPoint())) { - $a[self::FIELD_MEASUREMENT_POINT] = $v->getValue(); - $a[self::FIELD_MEASUREMENT_POINT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MEASUREMENT_POINT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MEASUREMENT_POINT_EXT] = $enc; + } + } else { + $a[self::FIELD_MEASUREMENT_POINT] = $v; + } } if (null !== ($v = $this->getPresentation())) { $a[self::FIELD_PRESENTATION] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicinalProductIngredient/FHIRMedicinalProductIngredientSubstance.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicinalProductIngredient/FHIRMedicinalProductIngredientSubstance.php index aace7b5ba8..a8715b650c 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicinalProductIngredient/FHIRMedicinalProductIngredientSubstance.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicinalProductIngredient/FHIRMedicinalProductIngredientSubstance.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -77,10 +77,6 @@ class FHIRMedicinalProductIngredientSubstance extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MEDICINAL_PRODUCT_INGREDIENT_DOT_SUBSTANCE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CODE = 'code'; const FIELD_STRENGTH = 'strength'; @@ -106,6 +102,9 @@ class FHIRMedicinalProductIngredientSubstance extends FHIRBackboneElement */ protected $strength = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMedicinalProductIngredientSubstance Constructor * @param null|array $data @@ -132,6 +131,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_STRENGTH])) { if (is_array($data[self::FIELD_STRENGTH])) { foreach($data[self::FIELD_STRENGTH] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRMedicinalProductIngredientStrength) { $this->addStrength($v); } else { @@ -338,11 +340,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getStrength())) { foreach($vs as $v) { if (null === $v) { @@ -351,6 +351,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_STRENGTH, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicinalProductInteraction/FHIRMedicinalProductInteractionInteractant.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicinalProductInteraction/FHIRMedicinalProductInteractionInteractant.php index 01756cd6de..2ba4f13ce2 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicinalProductInteraction/FHIRMedicinalProductInteractionInteractant.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicinalProductInteraction/FHIRMedicinalProductInteractionInteractant.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRMedicinalProductInteractionInteractant extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MEDICINAL_PRODUCT_INTERACTION_DOT_INTERACTANT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ITEM_CODEABLE_CONCEPT = 'itemCodeableConcept'; const FIELD_ITEM_REFERENCE = 'itemReference'; @@ -111,6 +107,9 @@ class FHIRMedicinalProductInteractionInteractant extends FHIRBackboneElement */ protected $itemReference = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMedicinalProductInteractionInteractant Constructor * @param null|array $data @@ -314,11 +313,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getItemCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ITEM_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getItemReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ITEM_REFERENCE, null, $v->_getFHIRXMLNamespace())); } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicinalProductPackaged/FHIRMedicinalProductPackagedBatchIdentifier.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicinalProductPackaged/FHIRMedicinalProductPackagedBatchIdentifier.php index ac816ecafb..84d34ef0dc 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicinalProductPackaged/FHIRMedicinalProductPackagedBatchIdentifier.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicinalProductPackaged/FHIRMedicinalProductPackagedBatchIdentifier.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -77,10 +77,6 @@ class FHIRMedicinalProductPackagedBatchIdentifier extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MEDICINAL_PRODUCT_PACKAGED_DOT_BATCH_IDENTIFIER; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_IMMEDIATE_PACKAGING = 'immediatePackaging'; const FIELD_IMMEDIATE_PACKAGING_EXT = '_immediatePackaging'; const FIELD_OUTER_PACKAGING = 'outerPackaging'; @@ -110,6 +106,9 @@ class FHIRMedicinalProductPackagedBatchIdentifier extends FHIRBackboneElement */ protected $outerPackaging = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMedicinalProductPackagedBatchIdentifier Constructor * @param null|array $data @@ -132,8 +131,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IMMEDIATE_PACKAGING] instanceof FHIRIdentifier) { $this->setImmediatePackaging($data[self::FIELD_IMMEDIATE_PACKAGING]); - } elseif ($ext && is_scalar($data[self::FIELD_IMMEDIATE_PACKAGING])) { - $this->setImmediatePackaging(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IMMEDIATE_PACKAGING]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IMMEDIATE_PACKAGING])) { + $this->setImmediatePackaging(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IMMEDIATE_PACKAGING]] + $ext)); + } else if (is_array($data[self::FIELD_IMMEDIATE_PACKAGING])) { + $this->setImmediatePackaging(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_IMMEDIATE_PACKAGING]))); + } } else { $this->setImmediatePackaging(new FHIRIdentifier($data[self::FIELD_IMMEDIATE_PACKAGING])); } @@ -144,8 +147,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_OUTER_PACKAGING] instanceof FHIRIdentifier) { $this->setOuterPackaging($data[self::FIELD_OUTER_PACKAGING]); - } elseif ($ext && is_scalar($data[self::FIELD_OUTER_PACKAGING])) { - $this->setOuterPackaging(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_OUTER_PACKAGING]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_OUTER_PACKAGING])) { + $this->setOuterPackaging(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_OUTER_PACKAGING]] + $ext)); + } else if (is_array($data[self::FIELD_OUTER_PACKAGING])) { + $this->setOuterPackaging(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_OUTER_PACKAGING]))); + } } else { $this->setOuterPackaging(new FHIRIdentifier($data[self::FIELD_OUTER_PACKAGING])); } @@ -321,11 +328,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getImmediatePackaging())) { $v->xmlSerialize($sxe->addChild(self::FIELD_IMMEDIATE_PACKAGING, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOuterPackaging())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OUTER_PACKAGING, null, $v->_getFHIRXMLNamespace())); } @@ -339,10 +344,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getImmediatePackaging())) { - $a[self::FIELD_IMMEDIATE_PACKAGING] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IMMEDIATE_PACKAGING] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IMMEDIATE_PACKAGING_EXT] = $enc; + } + } else { + $a[self::FIELD_IMMEDIATE_PACKAGING] = $v; + } } if (null !== ($v = $this->getOuterPackaging())) { - $a[self::FIELD_OUTER_PACKAGING] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_OUTER_PACKAGING] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_OUTER_PACKAGING_EXT] = $enc; + } + } else { + $a[self::FIELD_OUTER_PACKAGING] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicinalProductPackaged/FHIRMedicinalProductPackagedPackageItem.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicinalProductPackaged/FHIRMedicinalProductPackagedPackageItem.php index 64c92d2ab9..0c8159d05e 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicinalProductPackaged/FHIRMedicinalProductPackagedPackageItem.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicinalProductPackaged/FHIRMedicinalProductPackagedPackageItem.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -82,10 +82,6 @@ class FHIRMedicinalProductPackagedPackageItem extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MEDICINAL_PRODUCT_PACKAGED_DOT_PACKAGE_ITEM; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ALTERNATE_MATERIAL = 'alternateMaterial'; const FIELD_DEVICE = 'device'; const FIELD_IDENTIFIER = 'identifier'; @@ -241,6 +237,9 @@ class FHIRMedicinalProductPackagedPackageItem extends FHIRBackboneElement */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMedicinalProductPackagedPackageItem Constructor * @param null|array $data @@ -260,6 +259,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ALTERNATE_MATERIAL])) { if (is_array($data[self::FIELD_ALTERNATE_MATERIAL])) { foreach($data[self::FIELD_ALTERNATE_MATERIAL] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addAlternateMaterial($v); } else { @@ -275,6 +277,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_DEVICE])) { if (is_array($data[self::FIELD_DEVICE])) { foreach($data[self::FIELD_DEVICE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addDevice($v); } else { @@ -293,17 +298,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -312,6 +324,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_MANUFACTURED_ITEM])) { if (is_array($data[self::FIELD_MANUFACTURED_ITEM])) { foreach($data[self::FIELD_MANUFACTURED_ITEM] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addManufacturedItem($v); } else { @@ -327,6 +342,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_MANUFACTURER])) { if (is_array($data[self::FIELD_MANUFACTURER])) { foreach($data[self::FIELD_MANUFACTURER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addManufacturer($v); } else { @@ -342,6 +360,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_MATERIAL])) { if (is_array($data[self::FIELD_MATERIAL])) { foreach($data[self::FIELD_MATERIAL] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addMaterial($v); } else { @@ -357,6 +378,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_OTHER_CHARACTERISTICS])) { if (is_array($data[self::FIELD_OTHER_CHARACTERISTICS])) { foreach($data[self::FIELD_OTHER_CHARACTERISTICS] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addOtherCharacteristics($v); } else { @@ -372,6 +396,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PACKAGE_ITEM])) { if (is_array($data[self::FIELD_PACKAGE_ITEM])) { foreach($data[self::FIELD_PACKAGE_ITEM] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRMedicinalProductPackagedPackageItem) { $this->addPackageItem($v); } else { @@ -397,8 +424,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_QUANTITY] instanceof FHIRQuantity) { $this->setQuantity($data[self::FIELD_QUANTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_QUANTITY])) { - $this->setQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_QUANTITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_QUANTITY])) { + $this->setQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_QUANTITY])) { + $this->setQuantity(new FHIRQuantity(array_merge($ext, $data[self::FIELD_QUANTITY]))); + } } else { $this->setQuantity(new FHIRQuantity($data[self::FIELD_QUANTITY])); } @@ -406,6 +437,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SHELF_LIFE_STORAGE])) { if (is_array($data[self::FIELD_SHELF_LIFE_STORAGE])) { foreach($data[self::FIELD_SHELF_LIFE_STORAGE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRProductShelfLife) { $this->addShelfLifeStorage($v); } else { @@ -1193,7 +1227,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getAlternateMaterial())) { foreach($vs as $v) { if (null === $v) { @@ -1269,11 +1302,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getPhysicalCharacteristics())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PHYSICAL_CHARACTERISTICS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_QUANTITY, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getShelfLifeStorage())) { foreach($vs as $v) { if (null === $v) { @@ -1302,7 +1333,23 @@ public function jsonSerialize() $a[self::FIELD_DEVICE] = $vs; } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if ([] !== ($vs = $this->getManufacturedItem())) { $a[self::FIELD_MANUFACTURED_ITEM] = $vs; @@ -1323,7 +1370,15 @@ public function jsonSerialize() $a[self::FIELD_PHYSICAL_CHARACTERISTICS] = $v; } if (null !== ($v = $this->getQuantity())) { - $a[self::FIELD_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_QUANTITY] = $v; + } } if ([] !== ($vs = $this->getShelfLifeStorage())) { $a[self::FIELD_SHELF_LIFE_STORAGE] = $vs; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicinalProductPharmaceutical/FHIRMedicinalProductPharmaceuticalCharacteristics.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicinalProductPharmaceutical/FHIRMedicinalProductPharmaceuticalCharacteristics.php index 598529c0c3..5feeaaf4a2 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicinalProductPharmaceutical/FHIRMedicinalProductPharmaceuticalCharacteristics.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicinalProductPharmaceutical/FHIRMedicinalProductPharmaceuticalCharacteristics.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -77,10 +77,6 @@ class FHIRMedicinalProductPharmaceuticalCharacteristics extends FHIRBackboneElem { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MEDICINAL_PRODUCT_PHARMACEUTICAL_DOT_CHARACTERISTICS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CODE = 'code'; const FIELD_STATUS = 'status'; @@ -108,6 +104,9 @@ class FHIRMedicinalProductPharmaceuticalCharacteristics extends FHIRBackboneElem */ protected $status = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMedicinalProductPharmaceuticalCharacteristics Constructor * @param null|array $data @@ -309,11 +308,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicinalProductPharmaceutical/FHIRMedicinalProductPharmaceuticalRouteOfAdministration.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicinalProductPharmaceutical/FHIRMedicinalProductPharmaceuticalRouteOfAdministration.php index 0c1bc875b2..2122845e26 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicinalProductPharmaceutical/FHIRMedicinalProductPharmaceuticalRouteOfAdministration.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicinalProductPharmaceutical/FHIRMedicinalProductPharmaceuticalRouteOfAdministration.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRMedicinalProductPharmaceuticalRouteOfAdministration extends FHIRBackbo { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MEDICINAL_PRODUCT_PHARMACEUTICAL_DOT_ROUTE_OF_ADMINISTRATION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CODE = 'code'; const FIELD_FIRST_DOSE = 'firstDose'; const FIELD_FIRST_DOSE_EXT = '_firstDose'; @@ -93,6 +89,7 @@ class FHIRMedicinalProductPharmaceuticalRouteOfAdministration extends FHIRBackbo const FIELD_MAX_SINGLE_DOSE = 'maxSingleDose'; const FIELD_MAX_SINGLE_DOSE_EXT = '_maxSingleDose'; const FIELD_MAX_TREATMENT_PERIOD = 'maxTreatmentPeriod'; + const FIELD_MAX_TREATMENT_PERIOD_EXT = '_maxTreatmentPeriod'; const FIELD_TARGET_SPECIES = 'targetSpecies'; /** @@ -187,6 +184,9 @@ class FHIRMedicinalProductPharmaceuticalRouteOfAdministration extends FHIRBackbo */ protected $targetSpecies = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMedicinalProductPharmaceuticalRouteOfAdministration Constructor * @param null|array $data @@ -216,8 +216,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_FIRST_DOSE] instanceof FHIRQuantity) { $this->setFirstDose($data[self::FIELD_FIRST_DOSE]); - } elseif ($ext && is_scalar($data[self::FIELD_FIRST_DOSE])) { - $this->setFirstDose(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_FIRST_DOSE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_FIRST_DOSE])) { + $this->setFirstDose(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_FIRST_DOSE]] + $ext)); + } else if (is_array($data[self::FIELD_FIRST_DOSE])) { + $this->setFirstDose(new FHIRQuantity(array_merge($ext, $data[self::FIELD_FIRST_DOSE]))); + } } else { $this->setFirstDose(new FHIRQuantity($data[self::FIELD_FIRST_DOSE])); } @@ -228,8 +232,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MAX_DOSE_PER_DAY] instanceof FHIRQuantity) { $this->setMaxDosePerDay($data[self::FIELD_MAX_DOSE_PER_DAY]); - } elseif ($ext && is_scalar($data[self::FIELD_MAX_DOSE_PER_DAY])) { - $this->setMaxDosePerDay(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_MAX_DOSE_PER_DAY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MAX_DOSE_PER_DAY])) { + $this->setMaxDosePerDay(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_MAX_DOSE_PER_DAY]] + $ext)); + } else if (is_array($data[self::FIELD_MAX_DOSE_PER_DAY])) { + $this->setMaxDosePerDay(new FHIRQuantity(array_merge($ext, $data[self::FIELD_MAX_DOSE_PER_DAY]))); + } } else { $this->setMaxDosePerDay(new FHIRQuantity($data[self::FIELD_MAX_DOSE_PER_DAY])); } @@ -247,15 +255,28 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MAX_SINGLE_DOSE] instanceof FHIRQuantity) { $this->setMaxSingleDose($data[self::FIELD_MAX_SINGLE_DOSE]); - } elseif ($ext && is_scalar($data[self::FIELD_MAX_SINGLE_DOSE])) { - $this->setMaxSingleDose(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_MAX_SINGLE_DOSE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MAX_SINGLE_DOSE])) { + $this->setMaxSingleDose(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_MAX_SINGLE_DOSE]] + $ext)); + } else if (is_array($data[self::FIELD_MAX_SINGLE_DOSE])) { + $this->setMaxSingleDose(new FHIRQuantity(array_merge($ext, $data[self::FIELD_MAX_SINGLE_DOSE]))); + } } else { $this->setMaxSingleDose(new FHIRQuantity($data[self::FIELD_MAX_SINGLE_DOSE])); } } if (isset($data[self::FIELD_MAX_TREATMENT_PERIOD])) { + $ext = (isset($data[self::FIELD_MAX_TREATMENT_PERIOD_EXT]) && is_array($data[self::FIELD_MAX_TREATMENT_PERIOD_EXT])) + ? $data[self::FIELD_MAX_TREATMENT_PERIOD_EXT] + : null; if ($data[self::FIELD_MAX_TREATMENT_PERIOD] instanceof FHIRDuration) { $this->setMaxTreatmentPeriod($data[self::FIELD_MAX_TREATMENT_PERIOD]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MAX_TREATMENT_PERIOD])) { + $this->setMaxTreatmentPeriod(new FHIRDuration([FHIRDuration::FIELD_VALUE => $data[self::FIELD_MAX_TREATMENT_PERIOD]] + $ext)); + } else if (is_array($data[self::FIELD_MAX_TREATMENT_PERIOD])) { + $this->setMaxTreatmentPeriod(new FHIRDuration(array_merge($ext, $data[self::FIELD_MAX_TREATMENT_PERIOD]))); + } } else { $this->setMaxTreatmentPeriod(new FHIRDuration($data[self::FIELD_MAX_TREATMENT_PERIOD])); } @@ -263,6 +284,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_TARGET_SPECIES])) { if (is_array($data[self::FIELD_TARGET_SPECIES])) { foreach($data[self::FIELD_TARGET_SPECIES] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRMedicinalProductPharmaceuticalTargetSpecies) { $this->addTargetSpecies($v); } else { @@ -663,31 +687,24 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getFirstDose())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FIRST_DOSE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getMaxDosePerDay())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MAX_DOSE_PER_DAY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getMaxDosePerTreatmentPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MAX_DOSE_PER_TREATMENT_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getMaxSingleDose())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MAX_SINGLE_DOSE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getMaxTreatmentPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MAX_TREATMENT_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getTargetSpecies())) { foreach($vs as $v) { if (null === $v) { @@ -696,6 +713,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_TARGET_SPECIES, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } @@ -709,19 +727,51 @@ public function jsonSerialize() $a[self::FIELD_CODE] = $v; } if (null !== ($v = $this->getFirstDose())) { - $a[self::FIELD_FIRST_DOSE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FIRST_DOSE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FIRST_DOSE_EXT] = $enc; + } + } else { + $a[self::FIELD_FIRST_DOSE] = $v; + } } if (null !== ($v = $this->getMaxDosePerDay())) { - $a[self::FIELD_MAX_DOSE_PER_DAY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MAX_DOSE_PER_DAY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MAX_DOSE_PER_DAY_EXT] = $enc; + } + } else { + $a[self::FIELD_MAX_DOSE_PER_DAY] = $v; + } } if (null !== ($v = $this->getMaxDosePerTreatmentPeriod())) { $a[self::FIELD_MAX_DOSE_PER_TREATMENT_PERIOD] = $v; } if (null !== ($v = $this->getMaxSingleDose())) { - $a[self::FIELD_MAX_SINGLE_DOSE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MAX_SINGLE_DOSE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MAX_SINGLE_DOSE_EXT] = $enc; + } + } else { + $a[self::FIELD_MAX_SINGLE_DOSE] = $v; + } } if (null !== ($v = $this->getMaxTreatmentPeriod())) { - $a[self::FIELD_MAX_TREATMENT_PERIOD] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MAX_TREATMENT_PERIOD] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MAX_TREATMENT_PERIOD_EXT] = $enc; + } + } else { + $a[self::FIELD_MAX_TREATMENT_PERIOD] = $v; + } } if ([] !== ($vs = $this->getTargetSpecies())) { $a[self::FIELD_TARGET_SPECIES] = $vs; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicinalProductPharmaceutical/FHIRMedicinalProductPharmaceuticalTargetSpecies.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicinalProductPharmaceutical/FHIRMedicinalProductPharmaceuticalTargetSpecies.php index 49346a1401..00d6cfcf7c 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicinalProductPharmaceutical/FHIRMedicinalProductPharmaceuticalTargetSpecies.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicinalProductPharmaceutical/FHIRMedicinalProductPharmaceuticalTargetSpecies.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -77,10 +77,6 @@ class FHIRMedicinalProductPharmaceuticalTargetSpecies extends FHIRBackboneElemen { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MEDICINAL_PRODUCT_PHARMACEUTICAL_DOT_TARGET_SPECIES; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CODE = 'code'; const FIELD_WITHDRAWAL_PERIOD = 'withdrawalPeriod'; const FIELD_WITHDRAWAL_PERIOD_EXT = '_withdrawalPeriod'; @@ -107,6 +103,9 @@ class FHIRMedicinalProductPharmaceuticalTargetSpecies extends FHIRBackboneElemen */ protected $withdrawalPeriod = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMedicinalProductPharmaceuticalTargetSpecies Constructor * @param null|array $data @@ -136,17 +135,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_WITHDRAWAL_PERIOD])) { foreach($data[self::FIELD_WITHDRAWAL_PERIOD] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRMedicinalProductPharmaceuticalWithdrawalPeriod) { $this->addWithdrawalPeriod($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addWithdrawalPeriod(new FHIRMedicinalProductPharmaceuticalWithdrawalPeriod([FHIRMedicinalProductPharmaceuticalWithdrawalPeriod::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addWithdrawalPeriod(new FHIRMedicinalProductPharmaceuticalWithdrawalPeriod([FHIRMedicinalProductPharmaceuticalWithdrawalPeriod::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addWithdrawalPeriod(new FHIRMedicinalProductPharmaceuticalWithdrawalPeriod(array_merge($v, $ext[$i]))); + } } else { $this->addWithdrawalPeriod(new FHIRMedicinalProductPharmaceuticalWithdrawalPeriod($v)); } } } elseif ($data[self::FIELD_WITHDRAWAL_PERIOD] instanceof FHIRMedicinalProductPharmaceuticalWithdrawalPeriod) { $this->addWithdrawalPeriod($data[self::FIELD_WITHDRAWAL_PERIOD]); - } elseif ($ext && is_scalar($data[self::FIELD_WITHDRAWAL_PERIOD])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_WITHDRAWAL_PERIOD])) { $this->addWithdrawalPeriod(new FHIRMedicinalProductPharmaceuticalWithdrawalPeriod([FHIRMedicinalProductPharmaceuticalWithdrawalPeriod::FIELD_VALUE => $data[self::FIELD_WITHDRAWAL_PERIOD]] + $ext)); } else { $this->addWithdrawalPeriod(new FHIRMedicinalProductPharmaceuticalWithdrawalPeriod($data[self::FIELD_WITHDRAWAL_PERIOD])); @@ -346,11 +352,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getWithdrawalPeriod())) { foreach($vs as $v) { if (null === $v) { @@ -359,6 +363,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_WITHDRAWAL_PERIOD, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } @@ -372,7 +377,23 @@ public function jsonSerialize() $a[self::FIELD_CODE] = $v; } if ([] !== ($vs = $this->getWithdrawalPeriod())) { - $a[self::FIELD_WITHDRAWAL_PERIOD] = $vs; + $a[self::FIELD_WITHDRAWAL_PERIOD] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_WITHDRAWAL_PERIOD][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_WITHDRAWAL_PERIOD_EXT][] = $enc; + } else { + $a[self::FIELD_WITHDRAWAL_PERIOD_EXT][] = null; + } + } else { + $a[self::FIELD_WITHDRAWAL_PERIOD][] = $v; + } + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicinalProductPharmaceutical/FHIRMedicinalProductPharmaceuticalWithdrawalPeriod.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicinalProductPharmaceutical/FHIRMedicinalProductPharmaceuticalWithdrawalPeriod.php index 1baf1d5d85..0a3ceb6371 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicinalProductPharmaceutical/FHIRMedicinalProductPharmaceuticalWithdrawalPeriod.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMedicinalProductPharmaceutical/FHIRMedicinalProductPharmaceuticalWithdrawalPeriod.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRMedicinalProductPharmaceuticalWithdrawalPeriod extends FHIRBackboneEle { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MEDICINAL_PRODUCT_PHARMACEUTICAL_DOT_WITHDRAWAL_PERIOD; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_SUPPORTING_INFORMATION = 'supportingInformation'; const FIELD_SUPPORTING_INFORMATION_EXT = '_supportingInformation'; const FIELD_TISSUE = 'tissue'; @@ -126,6 +122,9 @@ class FHIRMedicinalProductPharmaceuticalWithdrawalPeriod extends FHIRBackboneEle */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMedicinalProductPharmaceuticalWithdrawalPeriod Constructor * @param null|array $data @@ -152,8 +151,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SUPPORTING_INFORMATION] instanceof FHIRString) { $this->setSupportingInformation($data[self::FIELD_SUPPORTING_INFORMATION]); - } elseif ($ext && is_scalar($data[self::FIELD_SUPPORTING_INFORMATION])) { - $this->setSupportingInformation(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SUPPORTING_INFORMATION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SUPPORTING_INFORMATION])) { + $this->setSupportingInformation(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SUPPORTING_INFORMATION]] + $ext)); + } else if (is_array($data[self::FIELD_SUPPORTING_INFORMATION])) { + $this->setSupportingInformation(new FHIRString(array_merge($ext, $data[self::FIELD_SUPPORTING_INFORMATION]))); + } } else { $this->setSupportingInformation(new FHIRString($data[self::FIELD_SUPPORTING_INFORMATION])); } @@ -171,8 +174,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE] instanceof FHIRQuantity) { $this->setValue($data[self::FIELD_VALUE]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE])) { - $this->setValue(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_VALUE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE])) { + $this->setValue(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_VALUE]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE])) { + $this->setValue(new FHIRQuantity(array_merge($ext, $data[self::FIELD_VALUE]))); + } } else { $this->setValue(new FHIRQuantity($data[self::FIELD_VALUE])); } @@ -399,12 +406,11 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getSupportingInformation())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUPPORTING_INFORMATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getTissue())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TISSUE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValue())) { + $sxe->addAttribute(self::FIELD_VALUE, (string)$v); $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE, null, $v->_getFHIRXMLNamespace())); } return $sxe; @@ -417,14 +423,29 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getSupportingInformation())) { - $a[self::FIELD_SUPPORTING_INFORMATION] = $v->getValue(); - $a[self::FIELD_SUPPORTING_INFORMATION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SUPPORTING_INFORMATION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SUPPORTING_INFORMATION_EXT] = $enc; + } + } else { + $a[self::FIELD_SUPPORTING_INFORMATION] = $v; + } } if (null !== ($v = $this->getTissue())) { $a[self::FIELD_TISSUE] = $v; } if (null !== ($v = $this->getValue())) { - $a[self::FIELD_VALUE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMessageDefinition/FHIRMessageDefinitionAllowedResponse.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMessageDefinition/FHIRMessageDefinitionAllowedResponse.php index 2fd6f4a812..118470b766 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMessageDefinition/FHIRMessageDefinitionAllowedResponse.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMessageDefinition/FHIRMessageDefinitionAllowedResponse.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRMessageDefinitionAllowedResponse extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MESSAGE_DEFINITION_DOT_ALLOWED_RESPONSE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_MESSAGE = 'message'; const FIELD_MESSAGE_EXT = '_message'; const FIELD_SITUATION = 'situation'; @@ -118,6 +114,9 @@ class FHIRMessageDefinitionAllowedResponse extends FHIRBackboneElement */ protected $situation = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMessageDefinitionAllowedResponse Constructor * @param null|array $data @@ -140,8 +139,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MESSAGE] instanceof FHIRCanonical) { $this->setMessage($data[self::FIELD_MESSAGE]); - } elseif ($ext && is_scalar($data[self::FIELD_MESSAGE])) { - $this->setMessage(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $data[self::FIELD_MESSAGE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MESSAGE])) { + $this->setMessage(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $data[self::FIELD_MESSAGE]] + $ext)); + } else if (is_array($data[self::FIELD_MESSAGE])) { + $this->setMessage(new FHIRCanonical(array_merge($ext, $data[self::FIELD_MESSAGE]))); + } } else { $this->setMessage(new FHIRCanonical($data[self::FIELD_MESSAGE])); } @@ -152,8 +155,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SITUATION] instanceof FHIRMarkdown) { $this->setSituation($data[self::FIELD_SITUATION]); - } elseif ($ext && is_scalar($data[self::FIELD_SITUATION])) { - $this->setSituation(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_SITUATION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SITUATION])) { + $this->setSituation(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_SITUATION]] + $ext)); + } else if (is_array($data[self::FIELD_SITUATION])) { + $this->setSituation(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_SITUATION]))); + } } else { $this->setSituation(new FHIRMarkdown($data[self::FIELD_SITUATION])); } @@ -377,12 +384,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getMessage())) { - $a[self::FIELD_MESSAGE] = $v->getValue(); - $a[self::FIELD_MESSAGE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MESSAGE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MESSAGE_EXT] = $enc; + } + } else { + $a[self::FIELD_MESSAGE] = $v; + } } if (null !== ($v = $this->getSituation())) { - $a[self::FIELD_SITUATION] = $v->getValue(); - $a[self::FIELD_SITUATION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SITUATION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SITUATION_EXT] = $enc; + } + } else { + $a[self::FIELD_SITUATION] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMessageDefinition/FHIRMessageDefinitionFocus.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMessageDefinition/FHIRMessageDefinitionFocus.php index af88e0b1f8..f056b30711 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMessageDefinition/FHIRMessageDefinitionFocus.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMessageDefinition/FHIRMessageDefinitionFocus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -82,10 +82,6 @@ class FHIRMessageDefinitionFocus extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MESSAGE_DEFINITION_DOT_FOCUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CODE = 'code'; const FIELD_CODE_EXT = '_code'; const FIELD_MAX = 'max'; @@ -144,6 +140,9 @@ class FHIRMessageDefinitionFocus extends FHIRBackboneElement */ protected $profile = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMessageDefinitionFocus Constructor * @param null|array $data @@ -166,8 +165,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CODE] instanceof FHIRCode) { $this->setCode($data[self::FIELD_CODE]); - } elseif ($ext && is_scalar($data[self::FIELD_CODE])) { - $this->setCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_CODE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CODE])) { + $this->setCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_CODE]] + $ext)); + } else if (is_array($data[self::FIELD_CODE])) { + $this->setCode(new FHIRCode(array_merge($ext, $data[self::FIELD_CODE]))); + } } else { $this->setCode(new FHIRCode($data[self::FIELD_CODE])); } @@ -178,8 +181,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MAX] instanceof FHIRString) { $this->setMax($data[self::FIELD_MAX]); - } elseif ($ext && is_scalar($data[self::FIELD_MAX])) { - $this->setMax(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_MAX]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MAX])) { + $this->setMax(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_MAX]] + $ext)); + } else if (is_array($data[self::FIELD_MAX])) { + $this->setMax(new FHIRString(array_merge($ext, $data[self::FIELD_MAX]))); + } } else { $this->setMax(new FHIRString($data[self::FIELD_MAX])); } @@ -190,8 +197,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MIN] instanceof FHIRUnsignedInt) { $this->setMin($data[self::FIELD_MIN]); - } elseif ($ext && is_scalar($data[self::FIELD_MIN])) { - $this->setMin(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_MIN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MIN])) { + $this->setMin(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_MIN]] + $ext)); + } else if (is_array($data[self::FIELD_MIN])) { + $this->setMin(new FHIRUnsignedInt(array_merge($ext, $data[self::FIELD_MIN]))); + } } else { $this->setMin(new FHIRUnsignedInt($data[self::FIELD_MIN])); } @@ -202,8 +213,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PROFILE] instanceof FHIRCanonical) { $this->setProfile($data[self::FIELD_PROFILE]); - } elseif ($ext && is_scalar($data[self::FIELD_PROFILE])) { - $this->setProfile(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $data[self::FIELD_PROFILE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PROFILE])) { + $this->setProfile(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $data[self::FIELD_PROFILE]] + $ext)); + } else if (is_array($data[self::FIELD_PROFILE])) { + $this->setProfile(new FHIRCanonical(array_merge($ext, $data[self::FIELD_PROFILE]))); + } } else { $this->setProfile(new FHIRCanonical($data[self::FIELD_PROFILE])); } @@ -517,20 +532,48 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getCode())) { - $a[self::FIELD_CODE] = $v->getValue(); - $a[self::FIELD_CODE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CODE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CODE_EXT] = $enc; + } + } else { + $a[self::FIELD_CODE] = $v; + } } if (null !== ($v = $this->getMax())) { - $a[self::FIELD_MAX] = $v->getValue(); - $a[self::FIELD_MAX_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MAX] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MAX_EXT] = $enc; + } + } else { + $a[self::FIELD_MAX] = $v; + } } if (null !== ($v = $this->getMin())) { - $a[self::FIELD_MIN] = $v->getValue(); - $a[self::FIELD_MIN_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MIN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MIN_EXT] = $enc; + } + } else { + $a[self::FIELD_MIN] = $v; + } } if (null !== ($v = $this->getProfile())) { - $a[self::FIELD_PROFILE] = $v->getValue(); - $a[self::FIELD_PROFILE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PROFILE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PROFILE_EXT] = $enc; + } + } else { + $a[self::FIELD_PROFILE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMessageHeader/FHIRMessageHeaderDestination.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMessageHeader/FHIRMessageHeaderDestination.php index 6f70f9b3df..59c31ac730 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMessageHeader/FHIRMessageHeaderDestination.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMessageHeader/FHIRMessageHeaderDestination.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -82,10 +82,6 @@ class FHIRMessageHeaderDestination extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MESSAGE_HEADER_DOT_DESTINATION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ENDPOINT = 'endpoint'; const FIELD_ENDPOINT_EXT = '_endpoint'; const FIELD_NAME = 'name'; @@ -139,6 +135,9 @@ class FHIRMessageHeaderDestination extends FHIRBackboneElement */ protected $target = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMessageHeaderDestination Constructor * @param null|array $data @@ -161,8 +160,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ENDPOINT] instanceof FHIRUrl) { $this->setEndpoint($data[self::FIELD_ENDPOINT]); - } elseif ($ext && is_scalar($data[self::FIELD_ENDPOINT])) { - $this->setEndpoint(new FHIRUrl([FHIRUrl::FIELD_VALUE => $data[self::FIELD_ENDPOINT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ENDPOINT])) { + $this->setEndpoint(new FHIRUrl([FHIRUrl::FIELD_VALUE => $data[self::FIELD_ENDPOINT]] + $ext)); + } else if (is_array($data[self::FIELD_ENDPOINT])) { + $this->setEndpoint(new FHIRUrl(array_merge($ext, $data[self::FIELD_ENDPOINT]))); + } } else { $this->setEndpoint(new FHIRUrl($data[self::FIELD_ENDPOINT])); } @@ -173,8 +176,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -458,11 +465,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NAME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getReceiver())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RECEIVER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getTarget())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TARGET, null, $v->_getFHIRXMLNamespace())); } @@ -476,12 +481,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getEndpoint())) { - $a[self::FIELD_ENDPOINT] = $v->getValue(); - $a[self::FIELD_ENDPOINT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ENDPOINT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ENDPOINT_EXT] = $enc; + } + } else { + $a[self::FIELD_ENDPOINT] = $v; + } } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if (null !== ($v = $this->getReceiver())) { $a[self::FIELD_RECEIVER] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMessageHeader/FHIRMessageHeaderResponse.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMessageHeader/FHIRMessageHeaderResponse.php index 3fc7c5fdac..13dc64da75 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMessageHeader/FHIRMessageHeaderResponse.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMessageHeader/FHIRMessageHeaderResponse.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -82,10 +82,6 @@ class FHIRMessageHeaderResponse extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MESSAGE_HEADER_DOT_RESPONSE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CODE = 'code'; const FIELD_CODE_EXT = '_code'; const FIELD_DETAILS = 'details'; @@ -128,6 +124,9 @@ class FHIRMessageHeaderResponse extends FHIRBackboneElement */ protected $identifier = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMessageHeaderResponse Constructor * @param null|array $data @@ -150,8 +149,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CODE] instanceof FHIRResponseType) { $this->setCode($data[self::FIELD_CODE]); - } elseif ($ext && is_scalar($data[self::FIELD_CODE])) { - $this->setCode(new FHIRResponseType([FHIRResponseType::FIELD_VALUE => $data[self::FIELD_CODE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CODE])) { + $this->setCode(new FHIRResponseType([FHIRResponseType::FIELD_VALUE => $data[self::FIELD_CODE]] + $ext)); + } else if (is_array($data[self::FIELD_CODE])) { + $this->setCode(new FHIRResponseType(array_merge($ext, $data[self::FIELD_CODE]))); + } } else { $this->setCode(new FHIRResponseType($data[self::FIELD_CODE])); } @@ -169,8 +172,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IDENTIFIER] instanceof FHIRId) { $this->setIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { - $this->setIdentifier(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRId(array_merge($ext, $data[self::FIELD_IDENTIFIER]))); + } } else { $this->setIdentifier(new FHIRId($data[self::FIELD_IDENTIFIER])); } @@ -392,11 +399,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDetails())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DETAILS, null, $v->_getFHIRXMLNamespace())); } @@ -413,14 +418,29 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getCode())) { - $a[self::FIELD_CODE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CODE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CODE_EXT] = $enc; + } + } else { + $a[self::FIELD_CODE] = $v; + } } if (null !== ($v = $this->getDetails())) { $a[self::FIELD_DETAILS] = $v; } if (null !== ($v = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $v->getValue(); - $a[self::FIELD_IDENTIFIER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_IDENTIFIER] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMessageHeader/FHIRMessageHeaderSource.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMessageHeader/FHIRMessageHeaderSource.php index a379882110..f4dbf9b9bc 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMessageHeader/FHIRMessageHeaderSource.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMessageHeader/FHIRMessageHeaderSource.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -82,10 +82,6 @@ class FHIRMessageHeaderSource extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MESSAGE_HEADER_DOT_SOURCE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CONTACT = 'contact'; const FIELD_CONTACT_EXT = '_contact'; const FIELD_ENDPOINT = 'endpoint'; @@ -155,6 +151,9 @@ class FHIRMessageHeaderSource extends FHIRBackboneElement */ protected $version = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMessageHeaderSource Constructor * @param null|array $data @@ -177,8 +176,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CONTACT] instanceof FHIRContactPoint) { $this->setContact($data[self::FIELD_CONTACT]); - } elseif ($ext && is_scalar($data[self::FIELD_CONTACT])) { - $this->setContact(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $data[self::FIELD_CONTACT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CONTACT])) { + $this->setContact(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $data[self::FIELD_CONTACT]] + $ext)); + } else if (is_array($data[self::FIELD_CONTACT])) { + $this->setContact(new FHIRContactPoint(array_merge($ext, $data[self::FIELD_CONTACT]))); + } } else { $this->setContact(new FHIRContactPoint($data[self::FIELD_CONTACT])); } @@ -189,8 +192,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ENDPOINT] instanceof FHIRUrl) { $this->setEndpoint($data[self::FIELD_ENDPOINT]); - } elseif ($ext && is_scalar($data[self::FIELD_ENDPOINT])) { - $this->setEndpoint(new FHIRUrl([FHIRUrl::FIELD_VALUE => $data[self::FIELD_ENDPOINT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ENDPOINT])) { + $this->setEndpoint(new FHIRUrl([FHIRUrl::FIELD_VALUE => $data[self::FIELD_ENDPOINT]] + $ext)); + } else if (is_array($data[self::FIELD_ENDPOINT])) { + $this->setEndpoint(new FHIRUrl(array_merge($ext, $data[self::FIELD_ENDPOINT]))); + } } else { $this->setEndpoint(new FHIRUrl($data[self::FIELD_ENDPOINT])); } @@ -201,8 +208,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -213,8 +224,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SOFTWARE] instanceof FHIRString) { $this->setSoftware($data[self::FIELD_SOFTWARE]); - } elseif ($ext && is_scalar($data[self::FIELD_SOFTWARE])) { - $this->setSoftware(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SOFTWARE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SOFTWARE])) { + $this->setSoftware(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SOFTWARE]] + $ext)); + } else if (is_array($data[self::FIELD_SOFTWARE])) { + $this->setSoftware(new FHIRString(array_merge($ext, $data[self::FIELD_SOFTWARE]))); + } } else { $this->setSoftware(new FHIRString($data[self::FIELD_SOFTWARE])); } @@ -225,8 +240,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VERSION] instanceof FHIRString) { $this->setVersion($data[self::FIELD_VERSION]); - } elseif ($ext && is_scalar($data[self::FIELD_VERSION])) { - $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } else if (is_array($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString(array_merge($ext, $data[self::FIELD_VERSION]))); + } } else { $this->setVersion(new FHIRString($data[self::FIELD_VERSION])); } @@ -547,7 +566,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getContact())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CONTACT, null, $v->_getFHIRXMLNamespace())); } @@ -573,23 +591,59 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getContact())) { - $a[self::FIELD_CONTACT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CONTACT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CONTACT_EXT] = $enc; + } + } else { + $a[self::FIELD_CONTACT] = $v; + } } if (null !== ($v = $this->getEndpoint())) { - $a[self::FIELD_ENDPOINT] = $v->getValue(); - $a[self::FIELD_ENDPOINT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ENDPOINT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ENDPOINT_EXT] = $enc; + } + } else { + $a[self::FIELD_ENDPOINT] = $v; + } } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if (null !== ($v = $this->getSoftware())) { - $a[self::FIELD_SOFTWARE] = $v->getValue(); - $a[self::FIELD_SOFTWARE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SOFTWARE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SOFTWARE_EXT] = $enc; + } + } else { + $a[self::FIELD_SOFTWARE] = $v; + } } if (null !== ($v = $this->getVersion())) { - $a[self::FIELD_VERSION] = $v->getValue(); - $a[self::FIELD_VERSION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VERSION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VERSION_EXT] = $enc; + } + } else { + $a[self::FIELD_VERSION] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMolecularSequence/FHIRMolecularSequenceInner.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMolecularSequence/FHIRMolecularSequenceInner.php index c77e97979e..ca402696a4 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMolecularSequence/FHIRMolecularSequenceInner.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMolecularSequence/FHIRMolecularSequenceInner.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -77,10 +77,6 @@ class FHIRMolecularSequenceInner extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MOLECULAR_SEQUENCE_DOT_INNER; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_END = 'end'; const FIELD_END_EXT = '_end'; const FIELD_START = 'start'; @@ -111,6 +107,9 @@ class FHIRMolecularSequenceInner extends FHIRBackboneElement */ protected $start = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMolecularSequenceInner Constructor * @param null|array $data @@ -133,8 +132,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_END] instanceof FHIRInteger) { $this->setEnd($data[self::FIELD_END]); - } elseif ($ext && is_scalar($data[self::FIELD_END])) { - $this->setEnd(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_END]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_END])) { + $this->setEnd(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_END]] + $ext)); + } else if (is_array($data[self::FIELD_END])) { + $this->setEnd(new FHIRInteger(array_merge($ext, $data[self::FIELD_END]))); + } } else { $this->setEnd(new FHIRInteger($data[self::FIELD_END])); } @@ -145,8 +148,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_START] instanceof FHIRInteger) { $this->setStart($data[self::FIELD_START]); - } elseif ($ext && is_scalar($data[self::FIELD_START])) { - $this->setStart(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_START]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_START])) { + $this->setStart(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_START]] + $ext)); + } else if (is_array($data[self::FIELD_START])) { + $this->setStart(new FHIRInteger(array_merge($ext, $data[self::FIELD_START]))); + } } else { $this->setStart(new FHIRInteger($data[self::FIELD_START])); } @@ -362,12 +369,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getEnd())) { - $a[self::FIELD_END] = $v->getValue(); - $a[self::FIELD_END_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_END] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_END_EXT] = $enc; + } + } else { + $a[self::FIELD_END] = $v; + } } if (null !== ($v = $this->getStart())) { - $a[self::FIELD_START] = $v->getValue(); - $a[self::FIELD_START_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_START] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_START_EXT] = $enc; + } + } else { + $a[self::FIELD_START] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMolecularSequence/FHIRMolecularSequenceOuter.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMolecularSequence/FHIRMolecularSequenceOuter.php index 42a5be7416..f062a1015d 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMolecularSequence/FHIRMolecularSequenceOuter.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMolecularSequence/FHIRMolecularSequenceOuter.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -77,10 +77,6 @@ class FHIRMolecularSequenceOuter extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MOLECULAR_SEQUENCE_DOT_OUTER; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_END = 'end'; const FIELD_END_EXT = '_end'; const FIELD_START = 'start'; @@ -111,6 +107,9 @@ class FHIRMolecularSequenceOuter extends FHIRBackboneElement */ protected $start = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMolecularSequenceOuter Constructor * @param null|array $data @@ -133,8 +132,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_END] instanceof FHIRInteger) { $this->setEnd($data[self::FIELD_END]); - } elseif ($ext && is_scalar($data[self::FIELD_END])) { - $this->setEnd(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_END]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_END])) { + $this->setEnd(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_END]] + $ext)); + } else if (is_array($data[self::FIELD_END])) { + $this->setEnd(new FHIRInteger(array_merge($ext, $data[self::FIELD_END]))); + } } else { $this->setEnd(new FHIRInteger($data[self::FIELD_END])); } @@ -145,8 +148,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_START] instanceof FHIRInteger) { $this->setStart($data[self::FIELD_START]); - } elseif ($ext && is_scalar($data[self::FIELD_START])) { - $this->setStart(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_START]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_START])) { + $this->setStart(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_START]] + $ext)); + } else if (is_array($data[self::FIELD_START])) { + $this->setStart(new FHIRInteger(array_merge($ext, $data[self::FIELD_START]))); + } } else { $this->setStart(new FHIRInteger($data[self::FIELD_START])); } @@ -362,12 +369,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getEnd())) { - $a[self::FIELD_END] = $v->getValue(); - $a[self::FIELD_END_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_END] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_END_EXT] = $enc; + } + } else { + $a[self::FIELD_END] = $v; + } } if (null !== ($v = $this->getStart())) { - $a[self::FIELD_START] = $v->getValue(); - $a[self::FIELD_START_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_START] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_START_EXT] = $enc; + } + } else { + $a[self::FIELD_START] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMolecularSequence/FHIRMolecularSequenceQuality.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMolecularSequence/FHIRMolecularSequenceQuality.php index 1118c95a8b..73366ec063 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMolecularSequence/FHIRMolecularSequenceQuality.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMolecularSequence/FHIRMolecularSequenceQuality.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -81,10 +81,6 @@ class FHIRMolecularSequenceQuality extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MOLECULAR_SEQUENCE_DOT_QUALITY; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_END = 'end'; const FIELD_END_EXT = '_end'; const FIELD_F_SCORE = 'fScore'; @@ -306,6 +302,9 @@ class FHIRMolecularSequenceQuality extends FHIRBackboneElement */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMolecularSequenceQuality Constructor * @param null|array $data @@ -328,8 +327,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_END] instanceof FHIRInteger) { $this->setEnd($data[self::FIELD_END]); - } elseif ($ext && is_scalar($data[self::FIELD_END])) { - $this->setEnd(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_END]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_END])) { + $this->setEnd(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_END]] + $ext)); + } else if (is_array($data[self::FIELD_END])) { + $this->setEnd(new FHIRInteger(array_merge($ext, $data[self::FIELD_END]))); + } } else { $this->setEnd(new FHIRInteger($data[self::FIELD_END])); } @@ -340,8 +343,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_F_SCORE] instanceof FHIRDecimal) { $this->setFScore($data[self::FIELD_F_SCORE]); - } elseif ($ext && is_scalar($data[self::FIELD_F_SCORE])) { - $this->setFScore(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_F_SCORE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_F_SCORE])) { + $this->setFScore(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_F_SCORE]] + $ext)); + } else if (is_array($data[self::FIELD_F_SCORE])) { + $this->setFScore(new FHIRDecimal(array_merge($ext, $data[self::FIELD_F_SCORE]))); + } } else { $this->setFScore(new FHIRDecimal($data[self::FIELD_F_SCORE])); } @@ -352,8 +359,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_GT_FP] instanceof FHIRDecimal) { $this->setGtFP($data[self::FIELD_GT_FP]); - } elseif ($ext && is_scalar($data[self::FIELD_GT_FP])) { - $this->setGtFP(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_GT_FP]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_GT_FP])) { + $this->setGtFP(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_GT_FP]] + $ext)); + } else if (is_array($data[self::FIELD_GT_FP])) { + $this->setGtFP(new FHIRDecimal(array_merge($ext, $data[self::FIELD_GT_FP]))); + } } else { $this->setGtFP(new FHIRDecimal($data[self::FIELD_GT_FP])); } @@ -371,8 +382,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PRECISION] instanceof FHIRDecimal) { $this->setPrecision($data[self::FIELD_PRECISION]); - } elseif ($ext && is_scalar($data[self::FIELD_PRECISION])) { - $this->setPrecision(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_PRECISION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PRECISION])) { + $this->setPrecision(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_PRECISION]] + $ext)); + } else if (is_array($data[self::FIELD_PRECISION])) { + $this->setPrecision(new FHIRDecimal(array_merge($ext, $data[self::FIELD_PRECISION]))); + } } else { $this->setPrecision(new FHIRDecimal($data[self::FIELD_PRECISION])); } @@ -383,8 +398,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_QUERY_FP] instanceof FHIRDecimal) { $this->setQueryFP($data[self::FIELD_QUERY_FP]); - } elseif ($ext && is_scalar($data[self::FIELD_QUERY_FP])) { - $this->setQueryFP(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_QUERY_FP]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_QUERY_FP])) { + $this->setQueryFP(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_QUERY_FP]] + $ext)); + } else if (is_array($data[self::FIELD_QUERY_FP])) { + $this->setQueryFP(new FHIRDecimal(array_merge($ext, $data[self::FIELD_QUERY_FP]))); + } } else { $this->setQueryFP(new FHIRDecimal($data[self::FIELD_QUERY_FP])); } @@ -395,8 +414,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_QUERY_TP] instanceof FHIRDecimal) { $this->setQueryTP($data[self::FIELD_QUERY_TP]); - } elseif ($ext && is_scalar($data[self::FIELD_QUERY_TP])) { - $this->setQueryTP(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_QUERY_TP]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_QUERY_TP])) { + $this->setQueryTP(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_QUERY_TP]] + $ext)); + } else if (is_array($data[self::FIELD_QUERY_TP])) { + $this->setQueryTP(new FHIRDecimal(array_merge($ext, $data[self::FIELD_QUERY_TP]))); + } } else { $this->setQueryTP(new FHIRDecimal($data[self::FIELD_QUERY_TP])); } @@ -407,8 +430,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_RECALL] instanceof FHIRDecimal) { $this->setRecall($data[self::FIELD_RECALL]); - } elseif ($ext && is_scalar($data[self::FIELD_RECALL])) { - $this->setRecall(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_RECALL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_RECALL])) { + $this->setRecall(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_RECALL]] + $ext)); + } else if (is_array($data[self::FIELD_RECALL])) { + $this->setRecall(new FHIRDecimal(array_merge($ext, $data[self::FIELD_RECALL]))); + } } else { $this->setRecall(new FHIRDecimal($data[self::FIELD_RECALL])); } @@ -426,8 +453,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SCORE] instanceof FHIRQuantity) { $this->setScore($data[self::FIELD_SCORE]); - } elseif ($ext && is_scalar($data[self::FIELD_SCORE])) { - $this->setScore(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_SCORE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SCORE])) { + $this->setScore(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_SCORE]] + $ext)); + } else if (is_array($data[self::FIELD_SCORE])) { + $this->setScore(new FHIRQuantity(array_merge($ext, $data[self::FIELD_SCORE]))); + } } else { $this->setScore(new FHIRQuantity($data[self::FIELD_SCORE])); } @@ -445,8 +476,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_START] instanceof FHIRInteger) { $this->setStart($data[self::FIELD_START]); - } elseif ($ext && is_scalar($data[self::FIELD_START])) { - $this->setStart(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_START]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_START])) { + $this->setStart(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_START]] + $ext)); + } else if (is_array($data[self::FIELD_START])) { + $this->setStart(new FHIRInteger(array_merge($ext, $data[self::FIELD_START]))); + } } else { $this->setStart(new FHIRInteger($data[self::FIELD_START])); } @@ -457,8 +492,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TRUTH_FN] instanceof FHIRDecimal) { $this->setTruthFN($data[self::FIELD_TRUTH_FN]); - } elseif ($ext && is_scalar($data[self::FIELD_TRUTH_FN])) { - $this->setTruthFN(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_TRUTH_FN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TRUTH_FN])) { + $this->setTruthFN(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_TRUTH_FN]] + $ext)); + } else if (is_array($data[self::FIELD_TRUTH_FN])) { + $this->setTruthFN(new FHIRDecimal(array_merge($ext, $data[self::FIELD_TRUTH_FN]))); + } } else { $this->setTruthFN(new FHIRDecimal($data[self::FIELD_TRUTH_FN])); } @@ -469,8 +508,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TRUTH_TP] instanceof FHIRDecimal) { $this->setTruthTP($data[self::FIELD_TRUTH_TP]); - } elseif ($ext && is_scalar($data[self::FIELD_TRUTH_TP])) { - $this->setTruthTP(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_TRUTH_TP]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TRUTH_TP])) { + $this->setTruthTP(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_TRUTH_TP]] + $ext)); + } else if (is_array($data[self::FIELD_TRUTH_TP])) { + $this->setTruthTP(new FHIRDecimal(array_merge($ext, $data[self::FIELD_TRUTH_TP]))); + } } else { $this->setTruthTP(new FHIRDecimal($data[self::FIELD_TRUTH_TP])); } @@ -481,8 +524,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TYPE] instanceof FHIRQualityType) { $this->setType($data[self::FIELD_TYPE]); - } elseif ($ext && is_scalar($data[self::FIELD_TYPE])) { - $this->setType(new FHIRQualityType([FHIRQualityType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TYPE])) { + $this->setType(new FHIRQualityType([FHIRQualityType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } else if (is_array($data[self::FIELD_TYPE])) { + $this->setType(new FHIRQualityType(array_merge($ext, $data[self::FIELD_TYPE]))); + } } else { $this->setType(new FHIRQualityType($data[self::FIELD_TYPE])); } @@ -1258,7 +1305,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getGtFP())) { $v->xmlSerialize($sxe->addChild(self::FIELD_GT_FP, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getMethod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_METHOD, null, $v->_getFHIRXMLNamespace())); } @@ -1274,15 +1320,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getRecall())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RECALL, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRoc())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ROC, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getScore())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SCORE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStandardSequence())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STANDARD_SEQUENCE, null, $v->_getFHIRXMLNamespace())); } @@ -1295,7 +1338,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getTruthTP())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TRUTH_TP, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -1309,59 +1351,145 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getEnd())) { - $a[self::FIELD_END] = $v->getValue(); - $a[self::FIELD_END_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_END] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_END_EXT] = $enc; + } + } else { + $a[self::FIELD_END] = $v; + } } if (null !== ($v = $this->getFScore())) { - $a[self::FIELD_F_SCORE] = $v->getValue(); - $a[self::FIELD_F_SCORE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_F_SCORE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_F_SCORE_EXT] = $enc; + } + } else { + $a[self::FIELD_F_SCORE] = $v; + } } if (null !== ($v = $this->getGtFP())) { - $a[self::FIELD_GT_FP] = $v->getValue(); - $a[self::FIELD_GT_FP_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_GT_FP] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_GT_FP_EXT] = $enc; + } + } else { + $a[self::FIELD_GT_FP] = $v; + } } if (null !== ($v = $this->getMethod())) { $a[self::FIELD_METHOD] = $v; } if (null !== ($v = $this->getPrecision())) { - $a[self::FIELD_PRECISION] = $v->getValue(); - $a[self::FIELD_PRECISION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PRECISION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PRECISION_EXT] = $enc; + } + } else { + $a[self::FIELD_PRECISION] = $v; + } } if (null !== ($v = $this->getQueryFP())) { - $a[self::FIELD_QUERY_FP] = $v->getValue(); - $a[self::FIELD_QUERY_FP_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_QUERY_FP] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_QUERY_FP_EXT] = $enc; + } + } else { + $a[self::FIELD_QUERY_FP] = $v; + } } if (null !== ($v = $this->getQueryTP())) { - $a[self::FIELD_QUERY_TP] = $v->getValue(); - $a[self::FIELD_QUERY_TP_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_QUERY_TP] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_QUERY_TP_EXT] = $enc; + } + } else { + $a[self::FIELD_QUERY_TP] = $v; + } } if (null !== ($v = $this->getRecall())) { - $a[self::FIELD_RECALL] = $v->getValue(); - $a[self::FIELD_RECALL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_RECALL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_RECALL_EXT] = $enc; + } + } else { + $a[self::FIELD_RECALL] = $v; + } } if (null !== ($v = $this->getRoc())) { $a[self::FIELD_ROC] = $v; } if (null !== ($v = $this->getScore())) { - $a[self::FIELD_SCORE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SCORE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SCORE_EXT] = $enc; + } + } else { + $a[self::FIELD_SCORE] = $v; + } } if (null !== ($v = $this->getStandardSequence())) { $a[self::FIELD_STANDARD_SEQUENCE] = $v; } if (null !== ($v = $this->getStart())) { - $a[self::FIELD_START] = $v->getValue(); - $a[self::FIELD_START_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_START] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_START_EXT] = $enc; + } + } else { + $a[self::FIELD_START] = $v; + } } if (null !== ($v = $this->getTruthFN())) { - $a[self::FIELD_TRUTH_FN] = $v->getValue(); - $a[self::FIELD_TRUTH_FN_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TRUTH_FN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TRUTH_FN_EXT] = $enc; + } + } else { + $a[self::FIELD_TRUTH_FN] = $v; + } } if (null !== ($v = $this->getTruthTP())) { - $a[self::FIELD_TRUTH_TP] = $v->getValue(); - $a[self::FIELD_TRUTH_TP_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TRUTH_TP] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TRUTH_TP_EXT] = $enc; + } + } else { + $a[self::FIELD_TRUTH_TP] = $v; + } } if (null !== ($v = $this->getType())) { - $a[self::FIELD_TYPE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TYPE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TYPE_EXT] = $enc; + } + } else { + $a[self::FIELD_TYPE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMolecularSequence/FHIRMolecularSequenceReferenceSeq.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMolecularSequence/FHIRMolecularSequenceReferenceSeq.php index 7c7dbfb0fc..0a6899024d 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMolecularSequence/FHIRMolecularSequenceReferenceSeq.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMolecularSequence/FHIRMolecularSequenceReferenceSeq.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -82,10 +82,6 @@ class FHIRMolecularSequenceReferenceSeq extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MOLECULAR_SEQUENCE_DOT_REFERENCE_SEQ; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CHROMOSOME = 'chromosome'; const FIELD_GENOME_BUILD = 'genomeBuild'; const FIELD_GENOME_BUILD_EXT = '_genomeBuild'; @@ -217,6 +213,9 @@ class FHIRMolecularSequenceReferenceSeq extends FHIRBackboneElement */ protected $windowStart = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMolecularSequenceReferenceSeq Constructor * @param null|array $data @@ -246,8 +245,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_GENOME_BUILD] instanceof FHIRString) { $this->setGenomeBuild($data[self::FIELD_GENOME_BUILD]); - } elseif ($ext && is_scalar($data[self::FIELD_GENOME_BUILD])) { - $this->setGenomeBuild(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_GENOME_BUILD]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_GENOME_BUILD])) { + $this->setGenomeBuild(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_GENOME_BUILD]] + $ext)); + } else if (is_array($data[self::FIELD_GENOME_BUILD])) { + $this->setGenomeBuild(new FHIRString(array_merge($ext, $data[self::FIELD_GENOME_BUILD]))); + } } else { $this->setGenomeBuild(new FHIRString($data[self::FIELD_GENOME_BUILD])); } @@ -258,8 +261,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ORIENTATION] instanceof FHIROrientationType) { $this->setOrientation($data[self::FIELD_ORIENTATION]); - } elseif ($ext && is_scalar($data[self::FIELD_ORIENTATION])) { - $this->setOrientation(new FHIROrientationType([FHIROrientationType::FIELD_VALUE => $data[self::FIELD_ORIENTATION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ORIENTATION])) { + $this->setOrientation(new FHIROrientationType([FHIROrientationType::FIELD_VALUE => $data[self::FIELD_ORIENTATION]] + $ext)); + } else if (is_array($data[self::FIELD_ORIENTATION])) { + $this->setOrientation(new FHIROrientationType(array_merge($ext, $data[self::FIELD_ORIENTATION]))); + } } else { $this->setOrientation(new FHIROrientationType($data[self::FIELD_ORIENTATION])); } @@ -284,8 +291,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_REFERENCE_SEQ_STRING] instanceof FHIRString) { $this->setReferenceSeqString($data[self::FIELD_REFERENCE_SEQ_STRING]); - } elseif ($ext && is_scalar($data[self::FIELD_REFERENCE_SEQ_STRING])) { - $this->setReferenceSeqString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_REFERENCE_SEQ_STRING]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_REFERENCE_SEQ_STRING])) { + $this->setReferenceSeqString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_REFERENCE_SEQ_STRING]] + $ext)); + } else if (is_array($data[self::FIELD_REFERENCE_SEQ_STRING])) { + $this->setReferenceSeqString(new FHIRString(array_merge($ext, $data[self::FIELD_REFERENCE_SEQ_STRING]))); + } } else { $this->setReferenceSeqString(new FHIRString($data[self::FIELD_REFERENCE_SEQ_STRING])); } @@ -296,8 +307,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STRAND] instanceof FHIRStrandType) { $this->setStrand($data[self::FIELD_STRAND]); - } elseif ($ext && is_scalar($data[self::FIELD_STRAND])) { - $this->setStrand(new FHIRStrandType([FHIRStrandType::FIELD_VALUE => $data[self::FIELD_STRAND]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STRAND])) { + $this->setStrand(new FHIRStrandType([FHIRStrandType::FIELD_VALUE => $data[self::FIELD_STRAND]] + $ext)); + } else if (is_array($data[self::FIELD_STRAND])) { + $this->setStrand(new FHIRStrandType(array_merge($ext, $data[self::FIELD_STRAND]))); + } } else { $this->setStrand(new FHIRStrandType($data[self::FIELD_STRAND])); } @@ -308,8 +323,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_WINDOW_END] instanceof FHIRInteger) { $this->setWindowEnd($data[self::FIELD_WINDOW_END]); - } elseif ($ext && is_scalar($data[self::FIELD_WINDOW_END])) { - $this->setWindowEnd(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_WINDOW_END]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_WINDOW_END])) { + $this->setWindowEnd(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_WINDOW_END]] + $ext)); + } else if (is_array($data[self::FIELD_WINDOW_END])) { + $this->setWindowEnd(new FHIRInteger(array_merge($ext, $data[self::FIELD_WINDOW_END]))); + } } else { $this->setWindowEnd(new FHIRInteger($data[self::FIELD_WINDOW_END])); } @@ -320,8 +339,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_WINDOW_START] instanceof FHIRInteger) { $this->setWindowStart($data[self::FIELD_WINDOW_START]); - } elseif ($ext && is_scalar($data[self::FIELD_WINDOW_START])) { - $this->setWindowStart(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_WINDOW_START]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_WINDOW_START])) { + $this->setWindowStart(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_WINDOW_START]] + $ext)); + } else if (is_array($data[self::FIELD_WINDOW_START])) { + $this->setWindowStart(new FHIRInteger(array_merge($ext, $data[self::FIELD_WINDOW_START]))); + } } else { $this->setWindowStart(new FHIRInteger($data[self::FIELD_WINDOW_START])); } @@ -800,29 +823,24 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getChromosome())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CHROMOSOME, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getGenomeBuild())) { $v->xmlSerialize($sxe->addChild(self::FIELD_GENOME_BUILD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOrientation())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ORIENTATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getReferenceSeqId())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REFERENCE_SEQ_ID, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getReferenceSeqPointer())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REFERENCE_SEQ_POINTER, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getReferenceSeqString())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REFERENCE_SEQ_STRING, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStrand())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STRAND, null, $v->_getFHIRXMLNamespace())); } @@ -845,11 +863,26 @@ public function jsonSerialize() $a[self::FIELD_CHROMOSOME] = $v; } if (null !== ($v = $this->getGenomeBuild())) { - $a[self::FIELD_GENOME_BUILD] = $v->getValue(); - $a[self::FIELD_GENOME_BUILD_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_GENOME_BUILD] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_GENOME_BUILD_EXT] = $enc; + } + } else { + $a[self::FIELD_GENOME_BUILD] = $v; + } } if (null !== ($v = $this->getOrientation())) { - $a[self::FIELD_ORIENTATION] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ORIENTATION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ORIENTATION_EXT] = $enc; + } + } else { + $a[self::FIELD_ORIENTATION] = $v; + } } if (null !== ($v = $this->getReferenceSeqId())) { $a[self::FIELD_REFERENCE_SEQ_ID] = $v; @@ -858,19 +891,48 @@ public function jsonSerialize() $a[self::FIELD_REFERENCE_SEQ_POINTER] = $v; } if (null !== ($v = $this->getReferenceSeqString())) { - $a[self::FIELD_REFERENCE_SEQ_STRING] = $v->getValue(); - $a[self::FIELD_REFERENCE_SEQ_STRING_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_REFERENCE_SEQ_STRING] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_REFERENCE_SEQ_STRING_EXT] = $enc; + } + } else { + $a[self::FIELD_REFERENCE_SEQ_STRING] = $v; + } } if (null !== ($v = $this->getStrand())) { - $a[self::FIELD_STRAND] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STRAND] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STRAND_EXT] = $enc; + } + } else { + $a[self::FIELD_STRAND] = $v; + } } if (null !== ($v = $this->getWindowEnd())) { - $a[self::FIELD_WINDOW_END] = $v->getValue(); - $a[self::FIELD_WINDOW_END_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_WINDOW_END] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_WINDOW_END_EXT] = $enc; + } + } else { + $a[self::FIELD_WINDOW_END] = $v; + } } if (null !== ($v = $this->getWindowStart())) { - $a[self::FIELD_WINDOW_START] = $v->getValue(); - $a[self::FIELD_WINDOW_START_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_WINDOW_START] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_WINDOW_START_EXT] = $enc; + } + } else { + $a[self::FIELD_WINDOW_START] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMolecularSequence/FHIRMolecularSequenceRepository.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMolecularSequence/FHIRMolecularSequenceRepository.php index 937753bcc6..37626c1567 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMolecularSequence/FHIRMolecularSequenceRepository.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMolecularSequence/FHIRMolecularSequenceRepository.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRMolecularSequenceRepository extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MOLECULAR_SEQUENCE_DOT_REPOSITORY; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DATASET_ID = 'datasetId'; const FIELD_DATASET_ID_EXT = '_datasetId'; const FIELD_NAME = 'name'; @@ -166,6 +162,9 @@ class FHIRMolecularSequenceRepository extends FHIRBackboneElement */ protected $variantsetId = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMolecularSequenceRepository Constructor * @param null|array $data @@ -188,8 +187,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATASET_ID] instanceof FHIRString) { $this->setDatasetId($data[self::FIELD_DATASET_ID]); - } elseif ($ext && is_scalar($data[self::FIELD_DATASET_ID])) { - $this->setDatasetId(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DATASET_ID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATASET_ID])) { + $this->setDatasetId(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DATASET_ID]] + $ext)); + } else if (is_array($data[self::FIELD_DATASET_ID])) { + $this->setDatasetId(new FHIRString(array_merge($ext, $data[self::FIELD_DATASET_ID]))); + } } else { $this->setDatasetId(new FHIRString($data[self::FIELD_DATASET_ID])); } @@ -200,8 +203,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -212,8 +219,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_READSET_ID] instanceof FHIRString) { $this->setReadsetId($data[self::FIELD_READSET_ID]); - } elseif ($ext && is_scalar($data[self::FIELD_READSET_ID])) { - $this->setReadsetId(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_READSET_ID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_READSET_ID])) { + $this->setReadsetId(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_READSET_ID]] + $ext)); + } else if (is_array($data[self::FIELD_READSET_ID])) { + $this->setReadsetId(new FHIRString(array_merge($ext, $data[self::FIELD_READSET_ID]))); + } } else { $this->setReadsetId(new FHIRString($data[self::FIELD_READSET_ID])); } @@ -224,8 +235,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TYPE] instanceof FHIRRepositoryType) { $this->setType($data[self::FIELD_TYPE]); - } elseif ($ext && is_scalar($data[self::FIELD_TYPE])) { - $this->setType(new FHIRRepositoryType([FHIRRepositoryType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TYPE])) { + $this->setType(new FHIRRepositoryType([FHIRRepositoryType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } else if (is_array($data[self::FIELD_TYPE])) { + $this->setType(new FHIRRepositoryType(array_merge($ext, $data[self::FIELD_TYPE]))); + } } else { $this->setType(new FHIRRepositoryType($data[self::FIELD_TYPE])); } @@ -236,8 +251,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_URL] instanceof FHIRUri) { $this->setUrl($data[self::FIELD_URL]); - } elseif ($ext && is_scalar($data[self::FIELD_URL])) { - $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } else if (is_array($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri(array_merge($ext, $data[self::FIELD_URL]))); + } } else { $this->setUrl(new FHIRUri($data[self::FIELD_URL])); } @@ -248,8 +267,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VARIANTSET_ID] instanceof FHIRString) { $this->setVariantsetId($data[self::FIELD_VARIANTSET_ID]); - } elseif ($ext && is_scalar($data[self::FIELD_VARIANTSET_ID])) { - $this->setVariantsetId(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VARIANTSET_ID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VARIANTSET_ID])) { + $this->setVariantsetId(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VARIANTSET_ID]] + $ext)); + } else if (is_array($data[self::FIELD_VARIANTSET_ID])) { + $this->setVariantsetId(new FHIRString(array_merge($ext, $data[self::FIELD_VARIANTSET_ID]))); + } } else { $this->setVariantsetId(new FHIRString($data[self::FIELD_VARIANTSET_ID])); } @@ -625,7 +648,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getReadsetId())) { $v->xmlSerialize($sxe->addChild(self::FIELD_READSET_ID, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -645,27 +667,70 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getDatasetId())) { - $a[self::FIELD_DATASET_ID] = $v->getValue(); - $a[self::FIELD_DATASET_ID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATASET_ID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATASET_ID_EXT] = $enc; + } + } else { + $a[self::FIELD_DATASET_ID] = $v; + } } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if (null !== ($v = $this->getReadsetId())) { - $a[self::FIELD_READSET_ID] = $v->getValue(); - $a[self::FIELD_READSET_ID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_READSET_ID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_READSET_ID_EXT] = $enc; + } + } else { + $a[self::FIELD_READSET_ID] = $v; + } } if (null !== ($v = $this->getType())) { - $a[self::FIELD_TYPE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TYPE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TYPE_EXT] = $enc; + } + } else { + $a[self::FIELD_TYPE] = $v; + } } if (null !== ($v = $this->getUrl())) { - $a[self::FIELD_URL] = $v->getValue(); - $a[self::FIELD_URL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_URL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_URL_EXT] = $enc; + } + } else { + $a[self::FIELD_URL] = $v; + } } if (null !== ($v = $this->getVariantsetId())) { - $a[self::FIELD_VARIANTSET_ID] = $v->getValue(); - $a[self::FIELD_VARIANTSET_ID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VARIANTSET_ID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VARIANTSET_ID_EXT] = $enc; + } + } else { + $a[self::FIELD_VARIANTSET_ID] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMolecularSequence/FHIRMolecularSequenceRoc.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMolecularSequence/FHIRMolecularSequenceRoc.php index e37c840b38..91bfa85d31 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMolecularSequence/FHIRMolecularSequenceRoc.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMolecularSequence/FHIRMolecularSequenceRoc.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRMolecularSequenceRoc extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MOLECULAR_SEQUENCE_DOT_ROC; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_F_MEASURE = 'fMeasure'; const FIELD_F_MEASURE_EXT = '_fMeasure'; const FIELD_NUM_FN = 'numFN'; @@ -180,6 +176,9 @@ class FHIRMolecularSequenceRoc extends FHIRBackboneElement */ protected $sensitivity = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMolecularSequenceRoc Constructor * @param null|array $data @@ -202,17 +201,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_F_MEASURE])) { foreach($data[self::FIELD_F_MEASURE] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRDecimal) { $this->addFMeasure($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addFMeasure(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addFMeasure(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addFMeasure(new FHIRDecimal(array_merge($v, $ext[$i]))); + } } else { $this->addFMeasure(new FHIRDecimal($v)); } } } elseif ($data[self::FIELD_F_MEASURE] instanceof FHIRDecimal) { $this->addFMeasure($data[self::FIELD_F_MEASURE]); - } elseif ($ext && is_scalar($data[self::FIELD_F_MEASURE])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_F_MEASURE])) { $this->addFMeasure(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_F_MEASURE]] + $ext)); } else { $this->addFMeasure(new FHIRDecimal($data[self::FIELD_F_MEASURE])); @@ -224,17 +230,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_NUM_FN])) { foreach($data[self::FIELD_NUM_FN] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRInteger) { $this->addNumFN($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addNumFN(new FHIRInteger([FHIRInteger::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addNumFN(new FHIRInteger([FHIRInteger::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addNumFN(new FHIRInteger(array_merge($v, $ext[$i]))); + } } else { $this->addNumFN(new FHIRInteger($v)); } } } elseif ($data[self::FIELD_NUM_FN] instanceof FHIRInteger) { $this->addNumFN($data[self::FIELD_NUM_FN]); - } elseif ($ext && is_scalar($data[self::FIELD_NUM_FN])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_NUM_FN])) { $this->addNumFN(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_NUM_FN]] + $ext)); } else { $this->addNumFN(new FHIRInteger($data[self::FIELD_NUM_FN])); @@ -246,17 +259,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_NUM_FP])) { foreach($data[self::FIELD_NUM_FP] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRInteger) { $this->addNumFP($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addNumFP(new FHIRInteger([FHIRInteger::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addNumFP(new FHIRInteger([FHIRInteger::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addNumFP(new FHIRInteger(array_merge($v, $ext[$i]))); + } } else { $this->addNumFP(new FHIRInteger($v)); } } } elseif ($data[self::FIELD_NUM_FP] instanceof FHIRInteger) { $this->addNumFP($data[self::FIELD_NUM_FP]); - } elseif ($ext && is_scalar($data[self::FIELD_NUM_FP])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_NUM_FP])) { $this->addNumFP(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_NUM_FP]] + $ext)); } else { $this->addNumFP(new FHIRInteger($data[self::FIELD_NUM_FP])); @@ -268,17 +288,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_NUM_TP])) { foreach($data[self::FIELD_NUM_TP] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRInteger) { $this->addNumTP($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addNumTP(new FHIRInteger([FHIRInteger::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addNumTP(new FHIRInteger([FHIRInteger::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addNumTP(new FHIRInteger(array_merge($v, $ext[$i]))); + } } else { $this->addNumTP(new FHIRInteger($v)); } } } elseif ($data[self::FIELD_NUM_TP] instanceof FHIRInteger) { $this->addNumTP($data[self::FIELD_NUM_TP]); - } elseif ($ext && is_scalar($data[self::FIELD_NUM_TP])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_NUM_TP])) { $this->addNumTP(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_NUM_TP]] + $ext)); } else { $this->addNumTP(new FHIRInteger($data[self::FIELD_NUM_TP])); @@ -290,17 +317,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_PRECISION])) { foreach($data[self::FIELD_PRECISION] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRDecimal) { $this->addPrecision($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addPrecision(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addPrecision(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addPrecision(new FHIRDecimal(array_merge($v, $ext[$i]))); + } } else { $this->addPrecision(new FHIRDecimal($v)); } } } elseif ($data[self::FIELD_PRECISION] instanceof FHIRDecimal) { $this->addPrecision($data[self::FIELD_PRECISION]); - } elseif ($ext && is_scalar($data[self::FIELD_PRECISION])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_PRECISION])) { $this->addPrecision(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_PRECISION]] + $ext)); } else { $this->addPrecision(new FHIRDecimal($data[self::FIELD_PRECISION])); @@ -312,17 +346,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_SCORE])) { foreach($data[self::FIELD_SCORE] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRInteger) { $this->addScore($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addScore(new FHIRInteger([FHIRInteger::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addScore(new FHIRInteger([FHIRInteger::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addScore(new FHIRInteger(array_merge($v, $ext[$i]))); + } } else { $this->addScore(new FHIRInteger($v)); } } } elseif ($data[self::FIELD_SCORE] instanceof FHIRInteger) { $this->addScore($data[self::FIELD_SCORE]); - } elseif ($ext && is_scalar($data[self::FIELD_SCORE])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_SCORE])) { $this->addScore(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_SCORE]] + $ext)); } else { $this->addScore(new FHIRInteger($data[self::FIELD_SCORE])); @@ -334,17 +375,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_SENSITIVITY])) { foreach($data[self::FIELD_SENSITIVITY] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRDecimal) { $this->addSensitivity($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addSensitivity(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addSensitivity(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addSensitivity(new FHIRDecimal(array_merge($v, $ext[$i]))); + } } else { $this->addSensitivity(new FHIRDecimal($v)); } } } elseif ($data[self::FIELD_SENSITIVITY] instanceof FHIRDecimal) { $this->addSensitivity($data[self::FIELD_SENSITIVITY]); - } elseif ($ext && is_scalar($data[self::FIELD_SENSITIVITY])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_SENSITIVITY])) { $this->addSensitivity(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_SENSITIVITY]] + $ext)); } else { $this->addSensitivity(new FHIRDecimal($data[self::FIELD_SENSITIVITY])); @@ -981,6 +1029,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_F_MEASURE, null, $v->_getFHIRXMLNamespace())); } } + if ([] !== ($vs = $this->getNumFN())) { foreach($vs as $v) { if (null === $v) { @@ -989,6 +1038,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_NUM_FN, null, $v->_getFHIRXMLNamespace())); } } + if ([] !== ($vs = $this->getNumFP())) { foreach($vs as $v) { if (null === $v) { @@ -997,6 +1047,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_NUM_FP, null, $v->_getFHIRXMLNamespace())); } } + if ([] !== ($vs = $this->getNumTP())) { foreach($vs as $v) { if (null === $v) { @@ -1005,6 +1056,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_NUM_TP, null, $v->_getFHIRXMLNamespace())); } } + if ([] !== ($vs = $this->getPrecision())) { foreach($vs as $v) { if (null === $v) { @@ -1013,6 +1065,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_PRECISION, null, $v->_getFHIRXMLNamespace())); } } + if ([] !== ($vs = $this->getScore())) { foreach($vs as $v) { if (null === $v) { @@ -1021,6 +1074,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_SCORE, null, $v->_getFHIRXMLNamespace())); } } + if ([] !== ($vs = $this->getSensitivity())) { foreach($vs as $v) { if (null === $v) { @@ -1029,6 +1083,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_SENSITIVITY, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } @@ -1044,8 +1099,17 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_F_MEASURE][] = $v->getValue(); - $a[self::FIELD_F_MEASURE_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_F_MEASURE][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_F_MEASURE_EXT][] = $enc; + } else { + $a[self::FIELD_F_MEASURE_EXT][] = null; + } + } else { + $a[self::FIELD_F_MEASURE][] = $v; + } } } if ([] !== ($vs = $this->getNumFN())) { @@ -1054,8 +1118,17 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_NUM_FN][] = $v->getValue(); - $a[self::FIELD_NUM_FN_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NUM_FN][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NUM_FN_EXT][] = $enc; + } else { + $a[self::FIELD_NUM_FN_EXT][] = null; + } + } else { + $a[self::FIELD_NUM_FN][] = $v; + } } } if ([] !== ($vs = $this->getNumFP())) { @@ -1064,8 +1137,17 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_NUM_FP][] = $v->getValue(); - $a[self::FIELD_NUM_FP_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NUM_FP][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NUM_FP_EXT][] = $enc; + } else { + $a[self::FIELD_NUM_FP_EXT][] = null; + } + } else { + $a[self::FIELD_NUM_FP][] = $v; + } } } if ([] !== ($vs = $this->getNumTP())) { @@ -1074,8 +1156,17 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_NUM_TP][] = $v->getValue(); - $a[self::FIELD_NUM_TP_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NUM_TP][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NUM_TP_EXT][] = $enc; + } else { + $a[self::FIELD_NUM_TP_EXT][] = null; + } + } else { + $a[self::FIELD_NUM_TP][] = $v; + } } } if ([] !== ($vs = $this->getPrecision())) { @@ -1084,8 +1175,17 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_PRECISION][] = $v->getValue(); - $a[self::FIELD_PRECISION_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PRECISION][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PRECISION_EXT][] = $enc; + } else { + $a[self::FIELD_PRECISION_EXT][] = null; + } + } else { + $a[self::FIELD_PRECISION][] = $v; + } } } if ([] !== ($vs = $this->getScore())) { @@ -1094,8 +1194,17 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_SCORE][] = $v->getValue(); - $a[self::FIELD_SCORE_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SCORE][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SCORE_EXT][] = $enc; + } else { + $a[self::FIELD_SCORE_EXT][] = null; + } + } else { + $a[self::FIELD_SCORE][] = $v; + } } } if ([] !== ($vs = $this->getSensitivity())) { @@ -1104,8 +1213,17 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_SENSITIVITY][] = $v->getValue(); - $a[self::FIELD_SENSITIVITY_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SENSITIVITY][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SENSITIVITY_EXT][] = $enc; + } else { + $a[self::FIELD_SENSITIVITY_EXT][] = null; + } + } else { + $a[self::FIELD_SENSITIVITY][] = $v; + } } } return $a; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMolecularSequence/FHIRMolecularSequenceStructureVariant.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMolecularSequence/FHIRMolecularSequenceStructureVariant.php index 14f7b40943..3174ea91a4 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMolecularSequence/FHIRMolecularSequenceStructureVariant.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMolecularSequence/FHIRMolecularSequenceStructureVariant.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRMolecularSequenceStructureVariant extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MOLECULAR_SEQUENCE_DOT_STRUCTURE_VARIANT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_EXACT = 'exact'; const FIELD_EXACT_EXT = '_exact'; const FIELD_INNER = 'inner'; @@ -142,6 +138,9 @@ class FHIRMolecularSequenceStructureVariant extends FHIRBackboneElement */ protected $variantType = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMolecularSequenceStructureVariant Constructor * @param null|array $data @@ -164,8 +163,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EXACT] instanceof FHIRBoolean) { $this->setExact($data[self::FIELD_EXACT]); - } elseif ($ext && is_scalar($data[self::FIELD_EXACT])) { - $this->setExact(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_EXACT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EXACT])) { + $this->setExact(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_EXACT]] + $ext)); + } else if (is_array($data[self::FIELD_EXACT])) { + $this->setExact(new FHIRBoolean(array_merge($ext, $data[self::FIELD_EXACT]))); + } } else { $this->setExact(new FHIRBoolean($data[self::FIELD_EXACT])); } @@ -183,8 +186,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_LENGTH] instanceof FHIRInteger) { $this->setLength($data[self::FIELD_LENGTH]); - } elseif ($ext && is_scalar($data[self::FIELD_LENGTH])) { - $this->setLength(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_LENGTH]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_LENGTH])) { + $this->setLength(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_LENGTH]] + $ext)); + } else if (is_array($data[self::FIELD_LENGTH])) { + $this->setLength(new FHIRInteger(array_merge($ext, $data[self::FIELD_LENGTH]))); + } } else { $this->setLength(new FHIRInteger($data[self::FIELD_LENGTH])); } @@ -486,18 +493,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getExact())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EXACT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getInner())) { $v->xmlSerialize($sxe->addChild(self::FIELD_INNER, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getLength())) { $v->xmlSerialize($sxe->addChild(self::FIELD_LENGTH, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOuter())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OUTER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getVariantType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VARIANT_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -511,15 +515,29 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getExact())) { - $a[self::FIELD_EXACT] = $v->getValue(); - $a[self::FIELD_EXACT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EXACT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EXACT_EXT] = $enc; + } + } else { + $a[self::FIELD_EXACT] = $v; + } } if (null !== ($v = $this->getInner())) { $a[self::FIELD_INNER] = $v; } if (null !== ($v = $this->getLength())) { - $a[self::FIELD_LENGTH] = $v->getValue(); - $a[self::FIELD_LENGTH_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_LENGTH] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_LENGTH_EXT] = $enc; + } + } else { + $a[self::FIELD_LENGTH] = $v; + } } if (null !== ($v = $this->getOuter())) { $a[self::FIELD_OUTER] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMolecularSequence/FHIRMolecularSequenceVariant.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMolecularSequence/FHIRMolecularSequenceVariant.php index 5143b899b5..f9e94a3c7d 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMolecularSequence/FHIRMolecularSequenceVariant.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRMolecularSequence/FHIRMolecularSequenceVariant.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRMolecularSequenceVariant extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MOLECULAR_SEQUENCE_DOT_VARIANT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CIGAR = 'cigar'; const FIELD_CIGAR_EXT = '_cigar'; const FIELD_END = 'end'; @@ -177,6 +173,9 @@ class FHIRMolecularSequenceVariant extends FHIRBackboneElement */ protected $variantPointer = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMolecularSequenceVariant Constructor * @param null|array $data @@ -199,8 +198,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CIGAR] instanceof FHIRString) { $this->setCigar($data[self::FIELD_CIGAR]); - } elseif ($ext && is_scalar($data[self::FIELD_CIGAR])) { - $this->setCigar(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_CIGAR]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CIGAR])) { + $this->setCigar(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_CIGAR]] + $ext)); + } else if (is_array($data[self::FIELD_CIGAR])) { + $this->setCigar(new FHIRString(array_merge($ext, $data[self::FIELD_CIGAR]))); + } } else { $this->setCigar(new FHIRString($data[self::FIELD_CIGAR])); } @@ -211,8 +214,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_END] instanceof FHIRInteger) { $this->setEnd($data[self::FIELD_END]); - } elseif ($ext && is_scalar($data[self::FIELD_END])) { - $this->setEnd(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_END]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_END])) { + $this->setEnd(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_END]] + $ext)); + } else if (is_array($data[self::FIELD_END])) { + $this->setEnd(new FHIRInteger(array_merge($ext, $data[self::FIELD_END]))); + } } else { $this->setEnd(new FHIRInteger($data[self::FIELD_END])); } @@ -223,8 +230,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_OBSERVED_ALLELE] instanceof FHIRString) { $this->setObservedAllele($data[self::FIELD_OBSERVED_ALLELE]); - } elseif ($ext && is_scalar($data[self::FIELD_OBSERVED_ALLELE])) { - $this->setObservedAllele(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_OBSERVED_ALLELE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_OBSERVED_ALLELE])) { + $this->setObservedAllele(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_OBSERVED_ALLELE]] + $ext)); + } else if (is_array($data[self::FIELD_OBSERVED_ALLELE])) { + $this->setObservedAllele(new FHIRString(array_merge($ext, $data[self::FIELD_OBSERVED_ALLELE]))); + } } else { $this->setObservedAllele(new FHIRString($data[self::FIELD_OBSERVED_ALLELE])); } @@ -235,8 +246,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_REFERENCE_ALLELE] instanceof FHIRString) { $this->setReferenceAllele($data[self::FIELD_REFERENCE_ALLELE]); - } elseif ($ext && is_scalar($data[self::FIELD_REFERENCE_ALLELE])) { - $this->setReferenceAllele(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_REFERENCE_ALLELE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_REFERENCE_ALLELE])) { + $this->setReferenceAllele(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_REFERENCE_ALLELE]] + $ext)); + } else if (is_array($data[self::FIELD_REFERENCE_ALLELE])) { + $this->setReferenceAllele(new FHIRString(array_merge($ext, $data[self::FIELD_REFERENCE_ALLELE]))); + } } else { $this->setReferenceAllele(new FHIRString($data[self::FIELD_REFERENCE_ALLELE])); } @@ -247,8 +262,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_START] instanceof FHIRInteger) { $this->setStart($data[self::FIELD_START]); - } elseif ($ext && is_scalar($data[self::FIELD_START])) { - $this->setStart(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_START]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_START])) { + $this->setStart(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_START]] + $ext)); + } else if (is_array($data[self::FIELD_START])) { + $this->setStart(new FHIRInteger(array_merge($ext, $data[self::FIELD_START]))); + } } else { $this->setStart(new FHIRInteger($data[self::FIELD_START])); } @@ -661,7 +680,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getStart())) { $v->xmlSerialize($sxe->addChild(self::FIELD_START, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getVariantPointer())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VARIANT_POINTER, null, $v->_getFHIRXMLNamespace())); } @@ -675,24 +693,59 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getCigar())) { - $a[self::FIELD_CIGAR] = $v->getValue(); - $a[self::FIELD_CIGAR_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CIGAR] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CIGAR_EXT] = $enc; + } + } else { + $a[self::FIELD_CIGAR] = $v; + } } if (null !== ($v = $this->getEnd())) { - $a[self::FIELD_END] = $v->getValue(); - $a[self::FIELD_END_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_END] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_END_EXT] = $enc; + } + } else { + $a[self::FIELD_END] = $v; + } } if (null !== ($v = $this->getObservedAllele())) { - $a[self::FIELD_OBSERVED_ALLELE] = $v->getValue(); - $a[self::FIELD_OBSERVED_ALLELE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_OBSERVED_ALLELE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_OBSERVED_ALLELE_EXT] = $enc; + } + } else { + $a[self::FIELD_OBSERVED_ALLELE] = $v; + } } if (null !== ($v = $this->getReferenceAllele())) { - $a[self::FIELD_REFERENCE_ALLELE] = $v->getValue(); - $a[self::FIELD_REFERENCE_ALLELE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_REFERENCE_ALLELE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_REFERENCE_ALLELE_EXT] = $enc; + } + } else { + $a[self::FIELD_REFERENCE_ALLELE] = $v; + } } if (null !== ($v = $this->getStart())) { - $a[self::FIELD_START] = $v->getValue(); - $a[self::FIELD_START_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_START] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_START_EXT] = $enc; + } + } else { + $a[self::FIELD_START] = $v; + } } if (null !== ($v = $this->getVariantPointer())) { $a[self::FIELD_VARIANT_POINTER] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRNamingSystem/FHIRNamingSystemUniqueId.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRNamingSystem/FHIRNamingSystemUniqueId.php index 95a8d7e5a6..8a9d44aad5 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRNamingSystem/FHIRNamingSystemUniqueId.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRNamingSystem/FHIRNamingSystemUniqueId.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -82,10 +82,6 @@ class FHIRNamingSystemUniqueId extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_NAMING_SYSTEM_DOT_UNIQUE_ID; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_COMMENT = 'comment'; const FIELD_COMMENT_EXT = '_comment'; const FIELD_PERIOD = 'period'; @@ -152,6 +148,9 @@ class FHIRNamingSystemUniqueId extends FHIRBackboneElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRNamingSystemUniqueId Constructor * @param null|array $data @@ -178,8 +177,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_COMMENT] instanceof FHIRString) { $this->setComment($data[self::FIELD_COMMENT]); - } elseif ($ext && is_scalar($data[self::FIELD_COMMENT])) { - $this->setComment(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_COMMENT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_COMMENT])) { + $this->setComment(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_COMMENT]] + $ext)); + } else if (is_array($data[self::FIELD_COMMENT])) { + $this->setComment(new FHIRString(array_merge($ext, $data[self::FIELD_COMMENT]))); + } } else { $this->setComment(new FHIRString($data[self::FIELD_COMMENT])); } @@ -197,8 +200,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PREFERRED] instanceof FHIRBoolean) { $this->setPreferred($data[self::FIELD_PREFERRED]); - } elseif ($ext && is_scalar($data[self::FIELD_PREFERRED])) { - $this->setPreferred(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_PREFERRED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PREFERRED])) { + $this->setPreferred(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_PREFERRED]] + $ext)); + } else if (is_array($data[self::FIELD_PREFERRED])) { + $this->setPreferred(new FHIRBoolean(array_merge($ext, $data[self::FIELD_PREFERRED]))); + } } else { $this->setPreferred(new FHIRBoolean($data[self::FIELD_PREFERRED])); } @@ -209,8 +216,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TYPE] instanceof FHIRNamingSystemIdentifierType) { $this->setType($data[self::FIELD_TYPE]); - } elseif ($ext && is_scalar($data[self::FIELD_TYPE])) { - $this->setType(new FHIRNamingSystemIdentifierType([FHIRNamingSystemIdentifierType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TYPE])) { + $this->setType(new FHIRNamingSystemIdentifierType([FHIRNamingSystemIdentifierType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } else if (is_array($data[self::FIELD_TYPE])) { + $this->setType(new FHIRNamingSystemIdentifierType(array_merge($ext, $data[self::FIELD_TYPE]))); + } } else { $this->setType(new FHIRNamingSystemIdentifierType($data[self::FIELD_TYPE])); } @@ -221,8 +232,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE] instanceof FHIRString) { $this->setValue($data[self::FIELD_VALUE]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE])) { - $this->setValue(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VALUE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE])) { + $this->setValue(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VALUE]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE])) { + $this->setValue(new FHIRString(array_merge($ext, $data[self::FIELD_VALUE]))); + } } else { $this->setValue(new FHIRString($data[self::FIELD_VALUE])); } @@ -531,18 +546,17 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getComment())) { $v->xmlSerialize($sxe->addChild(self::FIELD_COMMENT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PERIOD, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getPreferred())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PREFERRED, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getValue())) { + $sxe->addAttribute(self::FIELD_VALUE, (string)$v); $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE, null, $v->_getFHIRXMLNamespace())); } return $sxe; @@ -555,22 +569,51 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getComment())) { - $a[self::FIELD_COMMENT] = $v->getValue(); - $a[self::FIELD_COMMENT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_COMMENT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_COMMENT_EXT] = $enc; + } + } else { + $a[self::FIELD_COMMENT] = $v; + } } if (null !== ($v = $this->getPeriod())) { $a[self::FIELD_PERIOD] = $v; } if (null !== ($v = $this->getPreferred())) { - $a[self::FIELD_PREFERRED] = $v->getValue(); - $a[self::FIELD_PREFERRED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PREFERRED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PREFERRED_EXT] = $enc; + } + } else { + $a[self::FIELD_PREFERRED] = $v; + } } if (null !== ($v = $this->getType())) { - $a[self::FIELD_TYPE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TYPE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TYPE_EXT] = $enc; + } + } else { + $a[self::FIELD_TYPE] = $v; + } } if (null !== ($v = $this->getValue())) { - $a[self::FIELD_VALUE] = $v->getValue(); - $a[self::FIELD_VALUE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRNutritionOrder/FHIRNutritionOrderAdministration.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRNutritionOrder/FHIRNutritionOrderAdministration.php index f7f9b545ad..6416da0383 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRNutritionOrder/FHIRNutritionOrderAdministration.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRNutritionOrder/FHIRNutritionOrderAdministration.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRNutritionOrderAdministration extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_NUTRITION_ORDER_DOT_ADMINISTRATION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_QUANTITY = 'quantity'; const FIELD_QUANTITY_EXT = '_quantity'; const FIELD_RATE_QUANTITY = 'rateQuantity'; @@ -148,6 +144,9 @@ class FHIRNutritionOrderAdministration extends FHIRBackboneElement */ protected $schedule = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRNutritionOrderAdministration Constructor * @param null|array $data @@ -170,8 +169,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_QUANTITY] instanceof FHIRQuantity) { $this->setQuantity($data[self::FIELD_QUANTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_QUANTITY])) { - $this->setQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_QUANTITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_QUANTITY])) { + $this->setQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_QUANTITY])) { + $this->setQuantity(new FHIRQuantity(array_merge($ext, $data[self::FIELD_QUANTITY]))); + } } else { $this->setQuantity(new FHIRQuantity($data[self::FIELD_QUANTITY])); } @@ -182,8 +185,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_RATE_QUANTITY] instanceof FHIRQuantity) { $this->setRateQuantity($data[self::FIELD_RATE_QUANTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_RATE_QUANTITY])) { - $this->setRateQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_RATE_QUANTITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_RATE_QUANTITY])) { + $this->setRateQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_RATE_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_RATE_QUANTITY])) { + $this->setRateQuantity(new FHIRQuantity(array_merge($ext, $data[self::FIELD_RATE_QUANTITY]))); + } } else { $this->setRateQuantity(new FHIRQuantity($data[self::FIELD_RATE_QUANTITY])); } @@ -461,19 +468,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_QUANTITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRateQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RATE_QUANTITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRateRatio())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RATE_RATIO, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSchedule())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SCHEDULE, null, $v->_getFHIRXMLNamespace())); } @@ -487,10 +490,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getQuantity())) { - $a[self::FIELD_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_QUANTITY] = $v; + } } if (null !== ($v = $this->getRateQuantity())) { - $a[self::FIELD_RATE_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_RATE_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_RATE_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_RATE_QUANTITY] = $v; + } } if (null !== ($v = $this->getRateRatio())) { $a[self::FIELD_RATE_RATIO] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRNutritionOrder/FHIRNutritionOrderEnteralFormula.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRNutritionOrder/FHIRNutritionOrderEnteralFormula.php index 799b0e170a..e43dd07328 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRNutritionOrder/FHIRNutritionOrderEnteralFormula.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRNutritionOrder/FHIRNutritionOrderEnteralFormula.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRNutritionOrderEnteralFormula extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_NUTRITION_ORDER_DOT_ENTERAL_FORMULA; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ADDITIVE_PRODUCT_NAME = 'additiveProductName'; const FIELD_ADDITIVE_PRODUCT_NAME_EXT = '_additiveProductName'; const FIELD_ADDITIVE_TYPE = 'additiveType'; @@ -218,6 +214,9 @@ class FHIRNutritionOrderEnteralFormula extends FHIRBackboneElement */ protected $routeofAdministration = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRNutritionOrderEnteralFormula Constructor * @param null|array $data @@ -240,8 +239,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ADDITIVE_PRODUCT_NAME] instanceof FHIRString) { $this->setAdditiveProductName($data[self::FIELD_ADDITIVE_PRODUCT_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_ADDITIVE_PRODUCT_NAME])) { - $this->setAdditiveProductName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_ADDITIVE_PRODUCT_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ADDITIVE_PRODUCT_NAME])) { + $this->setAdditiveProductName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_ADDITIVE_PRODUCT_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_ADDITIVE_PRODUCT_NAME])) { + $this->setAdditiveProductName(new FHIRString(array_merge($ext, $data[self::FIELD_ADDITIVE_PRODUCT_NAME]))); + } } else { $this->setAdditiveProductName(new FHIRString($data[self::FIELD_ADDITIVE_PRODUCT_NAME])); } @@ -256,6 +259,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ADMINISTRATION])) { if (is_array($data[self::FIELD_ADMINISTRATION])) { foreach($data[self::FIELD_ADMINISTRATION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRNutritionOrderAdministration) { $this->addAdministration($v); } else { @@ -274,8 +280,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ADMINISTRATION_INSTRUCTION] instanceof FHIRString) { $this->setAdministrationInstruction($data[self::FIELD_ADMINISTRATION_INSTRUCTION]); - } elseif ($ext && is_scalar($data[self::FIELD_ADMINISTRATION_INSTRUCTION])) { - $this->setAdministrationInstruction(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_ADMINISTRATION_INSTRUCTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ADMINISTRATION_INSTRUCTION])) { + $this->setAdministrationInstruction(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_ADMINISTRATION_INSTRUCTION]] + $ext)); + } else if (is_array($data[self::FIELD_ADMINISTRATION_INSTRUCTION])) { + $this->setAdministrationInstruction(new FHIRString(array_merge($ext, $data[self::FIELD_ADMINISTRATION_INSTRUCTION]))); + } } else { $this->setAdministrationInstruction(new FHIRString($data[self::FIELD_ADMINISTRATION_INSTRUCTION])); } @@ -286,8 +296,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_BASE_FORMULA_PRODUCT_NAME] instanceof FHIRString) { $this->setBaseFormulaProductName($data[self::FIELD_BASE_FORMULA_PRODUCT_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_BASE_FORMULA_PRODUCT_NAME])) { - $this->setBaseFormulaProductName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_BASE_FORMULA_PRODUCT_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_BASE_FORMULA_PRODUCT_NAME])) { + $this->setBaseFormulaProductName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_BASE_FORMULA_PRODUCT_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_BASE_FORMULA_PRODUCT_NAME])) { + $this->setBaseFormulaProductName(new FHIRString(array_merge($ext, $data[self::FIELD_BASE_FORMULA_PRODUCT_NAME]))); + } } else { $this->setBaseFormulaProductName(new FHIRString($data[self::FIELD_BASE_FORMULA_PRODUCT_NAME])); } @@ -305,8 +319,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CALORIC_DENSITY] instanceof FHIRQuantity) { $this->setCaloricDensity($data[self::FIELD_CALORIC_DENSITY]); - } elseif ($ext && is_scalar($data[self::FIELD_CALORIC_DENSITY])) { - $this->setCaloricDensity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_CALORIC_DENSITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CALORIC_DENSITY])) { + $this->setCaloricDensity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_CALORIC_DENSITY]] + $ext)); + } else if (is_array($data[self::FIELD_CALORIC_DENSITY])) { + $this->setCaloricDensity(new FHIRQuantity(array_merge($ext, $data[self::FIELD_CALORIC_DENSITY]))); + } } else { $this->setCaloricDensity(new FHIRQuantity($data[self::FIELD_CALORIC_DENSITY])); } @@ -317,8 +335,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MAX_VOLUME_TO_DELIVER] instanceof FHIRQuantity) { $this->setMaxVolumeToDeliver($data[self::FIELD_MAX_VOLUME_TO_DELIVER]); - } elseif ($ext && is_scalar($data[self::FIELD_MAX_VOLUME_TO_DELIVER])) { - $this->setMaxVolumeToDeliver(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_MAX_VOLUME_TO_DELIVER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MAX_VOLUME_TO_DELIVER])) { + $this->setMaxVolumeToDeliver(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_MAX_VOLUME_TO_DELIVER]] + $ext)); + } else if (is_array($data[self::FIELD_MAX_VOLUME_TO_DELIVER])) { + $this->setMaxVolumeToDeliver(new FHIRQuantity(array_merge($ext, $data[self::FIELD_MAX_VOLUME_TO_DELIVER]))); + } } else { $this->setMaxVolumeToDeliver(new FHIRQuantity($data[self::FIELD_MAX_VOLUME_TO_DELIVER])); } @@ -834,11 +856,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getAdditiveProductName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ADDITIVE_PRODUCT_NAME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getAdditiveType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ADDITIVE_TYPE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getAdministration())) { foreach($vs as $v) { if (null === $v) { @@ -847,25 +867,22 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_ADMINISTRATION, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getAdministrationInstruction())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ADMINISTRATION_INSTRUCTION, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getBaseFormulaProductName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_BASE_FORMULA_PRODUCT_NAME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getBaseFormulaType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_BASE_FORMULA_TYPE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getCaloricDensity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CALORIC_DENSITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getMaxVolumeToDeliver())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MAX_VOLUME_TO_DELIVER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRouteofAdministration())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ROUTEOF_ADMINISTRATION, null, $v->_getFHIRXMLNamespace())); } @@ -879,8 +896,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getAdditiveProductName())) { - $a[self::FIELD_ADDITIVE_PRODUCT_NAME] = $v->getValue(); - $a[self::FIELD_ADDITIVE_PRODUCT_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ADDITIVE_PRODUCT_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ADDITIVE_PRODUCT_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_ADDITIVE_PRODUCT_NAME] = $v; + } } if (null !== ($v = $this->getAdditiveType())) { $a[self::FIELD_ADDITIVE_TYPE] = $v; @@ -889,21 +913,51 @@ public function jsonSerialize() $a[self::FIELD_ADMINISTRATION] = $vs; } if (null !== ($v = $this->getAdministrationInstruction())) { - $a[self::FIELD_ADMINISTRATION_INSTRUCTION] = $v->getValue(); - $a[self::FIELD_ADMINISTRATION_INSTRUCTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ADMINISTRATION_INSTRUCTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ADMINISTRATION_INSTRUCTION_EXT] = $enc; + } + } else { + $a[self::FIELD_ADMINISTRATION_INSTRUCTION] = $v; + } } if (null !== ($v = $this->getBaseFormulaProductName())) { - $a[self::FIELD_BASE_FORMULA_PRODUCT_NAME] = $v->getValue(); - $a[self::FIELD_BASE_FORMULA_PRODUCT_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_BASE_FORMULA_PRODUCT_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_BASE_FORMULA_PRODUCT_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_BASE_FORMULA_PRODUCT_NAME] = $v; + } } if (null !== ($v = $this->getBaseFormulaType())) { $a[self::FIELD_BASE_FORMULA_TYPE] = $v; } if (null !== ($v = $this->getCaloricDensity())) { - $a[self::FIELD_CALORIC_DENSITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CALORIC_DENSITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CALORIC_DENSITY_EXT] = $enc; + } + } else { + $a[self::FIELD_CALORIC_DENSITY] = $v; + } } if (null !== ($v = $this->getMaxVolumeToDeliver())) { - $a[self::FIELD_MAX_VOLUME_TO_DELIVER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MAX_VOLUME_TO_DELIVER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MAX_VOLUME_TO_DELIVER_EXT] = $enc; + } + } else { + $a[self::FIELD_MAX_VOLUME_TO_DELIVER] = $v; + } } if (null !== ($v = $this->getRouteofAdministration())) { $a[self::FIELD_ROUTEOF_ADMINISTRATION] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRNutritionOrder/FHIRNutritionOrderNutrient.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRNutritionOrder/FHIRNutritionOrderNutrient.php index 7c0bc0e08f..82b8b1facb 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRNutritionOrder/FHIRNutritionOrderNutrient.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRNutritionOrder/FHIRNutritionOrderNutrient.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRNutritionOrderNutrient extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_NUTRITION_ORDER_DOT_NUTRIENT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_AMOUNT = 'amount'; const FIELD_AMOUNT_EXT = '_amount'; const FIELD_MODIFIER = 'modifier'; @@ -112,6 +108,9 @@ class FHIRNutritionOrderNutrient extends FHIRBackboneElement */ protected $modifier = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRNutritionOrderNutrient Constructor * @param null|array $data @@ -134,8 +133,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_AMOUNT] instanceof FHIRQuantity) { $this->setAmount($data[self::FIELD_AMOUNT]); - } elseif ($ext && is_scalar($data[self::FIELD_AMOUNT])) { - $this->setAmount(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_AMOUNT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_AMOUNT])) { + $this->setAmount(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_AMOUNT]] + $ext)); + } else if (is_array($data[self::FIELD_AMOUNT])) { + $this->setAmount(new FHIRQuantity(array_merge($ext, $data[self::FIELD_AMOUNT]))); + } } else { $this->setAmount(new FHIRQuantity($data[self::FIELD_AMOUNT])); } @@ -320,11 +323,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getAmount())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AMOUNT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getModifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MODIFIER, null, $v->_getFHIRXMLNamespace())); } @@ -338,7 +339,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getAmount())) { - $a[self::FIELD_AMOUNT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_AMOUNT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_AMOUNT_EXT] = $enc; + } + } else { + $a[self::FIELD_AMOUNT] = $v; + } } if (null !== ($v = $this->getModifier())) { $a[self::FIELD_MODIFIER] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRNutritionOrder/FHIRNutritionOrderOralDiet.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRNutritionOrder/FHIRNutritionOrderOralDiet.php index 84d6dcb230..18060bc3c8 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRNutritionOrder/FHIRNutritionOrderOralDiet.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRNutritionOrder/FHIRNutritionOrderOralDiet.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRNutritionOrderOralDiet extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_NUTRITION_ORDER_DOT_ORAL_DIET; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_FLUID_CONSISTENCY_TYPE = 'fluidConsistencyType'; const FIELD_INSTRUCTION = 'instruction'; const FIELD_INSTRUCTION_EXT = '_instruction'; @@ -168,6 +164,9 @@ class FHIRNutritionOrderOralDiet extends FHIRBackboneElement */ protected $type = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRNutritionOrderOralDiet Constructor * @param null|array $data @@ -187,6 +186,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_FLUID_CONSISTENCY_TYPE])) { if (is_array($data[self::FIELD_FLUID_CONSISTENCY_TYPE])) { foreach($data[self::FIELD_FLUID_CONSISTENCY_TYPE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addFluidConsistencyType($v); } else { @@ -205,8 +207,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_INSTRUCTION] instanceof FHIRString) { $this->setInstruction($data[self::FIELD_INSTRUCTION]); - } elseif ($ext && is_scalar($data[self::FIELD_INSTRUCTION])) { - $this->setInstruction(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_INSTRUCTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_INSTRUCTION])) { + $this->setInstruction(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_INSTRUCTION]] + $ext)); + } else if (is_array($data[self::FIELD_INSTRUCTION])) { + $this->setInstruction(new FHIRString(array_merge($ext, $data[self::FIELD_INSTRUCTION]))); + } } else { $this->setInstruction(new FHIRString($data[self::FIELD_INSTRUCTION])); } @@ -214,6 +220,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_NUTRIENT])) { if (is_array($data[self::FIELD_NUTRIENT])) { foreach($data[self::FIELD_NUTRIENT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRNutritionOrderNutrient) { $this->addNutrient($v); } else { @@ -229,6 +238,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SCHEDULE])) { if (is_array($data[self::FIELD_SCHEDULE])) { foreach($data[self::FIELD_SCHEDULE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRTiming) { $this->addSchedule($v); } else { @@ -244,6 +256,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_TEXTURE])) { if (is_array($data[self::FIELD_TEXTURE])) { foreach($data[self::FIELD_TEXTURE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRNutritionOrderTexture) { $this->addTexture($v); } else { @@ -259,6 +274,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_TYPE])) { if (is_array($data[self::FIELD_TYPE])) { foreach($data[self::FIELD_TYPE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addType($v); } else { @@ -751,7 +769,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getFluidConsistencyType())) { foreach($vs as $v) { if (null === $v) { @@ -760,10 +777,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_FLUID_CONSISTENCY_TYPE, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getInstruction())) { $v->xmlSerialize($sxe->addChild(self::FIELD_INSTRUCTION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getNutrient())) { foreach($vs as $v) { if (null === $v) { @@ -799,6 +816,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } @@ -812,8 +830,15 @@ public function jsonSerialize() $a[self::FIELD_FLUID_CONSISTENCY_TYPE] = $vs; } if (null !== ($v = $this->getInstruction())) { - $a[self::FIELD_INSTRUCTION] = $v->getValue(); - $a[self::FIELD_INSTRUCTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_INSTRUCTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_INSTRUCTION_EXT] = $enc; + } + } else { + $a[self::FIELD_INSTRUCTION] = $v; + } } if ([] !== ($vs = $this->getNutrient())) { $a[self::FIELD_NUTRIENT] = $vs; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRNutritionOrder/FHIRNutritionOrderSupplement.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRNutritionOrder/FHIRNutritionOrderSupplement.php index 51f5dbff4b..7dc6b35dc7 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRNutritionOrder/FHIRNutritionOrderSupplement.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRNutritionOrder/FHIRNutritionOrderSupplement.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -81,10 +81,6 @@ class FHIRNutritionOrderSupplement extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_NUTRITION_ORDER_DOT_SUPPLEMENT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_INSTRUCTION = 'instruction'; const FIELD_INSTRUCTION_EXT = '_instruction'; const FIELD_PRODUCT_NAME = 'productName'; @@ -161,6 +157,9 @@ class FHIRNutritionOrderSupplement extends FHIRBackboneElement */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRNutritionOrderSupplement Constructor * @param null|array $data @@ -183,8 +182,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_INSTRUCTION] instanceof FHIRString) { $this->setInstruction($data[self::FIELD_INSTRUCTION]); - } elseif ($ext && is_scalar($data[self::FIELD_INSTRUCTION])) { - $this->setInstruction(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_INSTRUCTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_INSTRUCTION])) { + $this->setInstruction(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_INSTRUCTION]] + $ext)); + } else if (is_array($data[self::FIELD_INSTRUCTION])) { + $this->setInstruction(new FHIRString(array_merge($ext, $data[self::FIELD_INSTRUCTION]))); + } } else { $this->setInstruction(new FHIRString($data[self::FIELD_INSTRUCTION])); } @@ -195,8 +198,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PRODUCT_NAME] instanceof FHIRString) { $this->setProductName($data[self::FIELD_PRODUCT_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_PRODUCT_NAME])) { - $this->setProductName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PRODUCT_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PRODUCT_NAME])) { + $this->setProductName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PRODUCT_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_PRODUCT_NAME])) { + $this->setProductName(new FHIRString(array_merge($ext, $data[self::FIELD_PRODUCT_NAME]))); + } } else { $this->setProductName(new FHIRString($data[self::FIELD_PRODUCT_NAME])); } @@ -207,8 +214,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_QUANTITY] instanceof FHIRQuantity) { $this->setQuantity($data[self::FIELD_QUANTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_QUANTITY])) { - $this->setQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_QUANTITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_QUANTITY])) { + $this->setQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_QUANTITY])) { + $this->setQuantity(new FHIRQuantity(array_merge($ext, $data[self::FIELD_QUANTITY]))); + } } else { $this->setQuantity(new FHIRQuantity($data[self::FIELD_QUANTITY])); } @@ -216,6 +227,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SCHEDULE])) { if (is_array($data[self::FIELD_SCHEDULE])) { foreach($data[self::FIELD_SCHEDULE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRTiming) { $this->addSchedule($v); } else { @@ -587,11 +601,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getProductName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PRODUCT_NAME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_QUANTITY, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getSchedule())) { foreach($vs as $v) { if (null === $v) { @@ -614,15 +626,37 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getInstruction())) { - $a[self::FIELD_INSTRUCTION] = $v->getValue(); - $a[self::FIELD_INSTRUCTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_INSTRUCTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_INSTRUCTION_EXT] = $enc; + } + } else { + $a[self::FIELD_INSTRUCTION] = $v; + } } if (null !== ($v = $this->getProductName())) { - $a[self::FIELD_PRODUCT_NAME] = $v->getValue(); - $a[self::FIELD_PRODUCT_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PRODUCT_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PRODUCT_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_PRODUCT_NAME] = $v; + } } if (null !== ($v = $this->getQuantity())) { - $a[self::FIELD_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_QUANTITY] = $v; + } } if ([] !== ($vs = $this->getSchedule())) { $a[self::FIELD_SCHEDULE] = $vs; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRNutritionOrder/FHIRNutritionOrderTexture.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRNutritionOrder/FHIRNutritionOrderTexture.php index 63f95cda89..693d21e212 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRNutritionOrder/FHIRNutritionOrderTexture.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRNutritionOrder/FHIRNutritionOrderTexture.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRNutritionOrderTexture extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_NUTRITION_ORDER_DOT_TEXTURE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_FOOD_TYPE = 'foodType'; const FIELD_MODIFIER = 'modifier'; @@ -111,6 +107,9 @@ class FHIRNutritionOrderTexture extends FHIRBackboneElement */ protected $modifier = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRNutritionOrderTexture Constructor * @param null|array $data @@ -316,11 +315,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getFoodType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FOOD_TYPE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getModifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MODIFIER, null, $v->_getFHIRXMLNamespace())); } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRObservation/FHIRObservationComponent.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRObservation/FHIRObservationComponent.php index 011e6572ed..056adeff5c 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRObservation/FHIRObservationComponent.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRObservation/FHIRObservationComponent.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -88,10 +88,6 @@ class FHIRObservationComponent extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_OBSERVATION_DOT_COMPONENT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CODE = 'code'; const FIELD_DATA_ABSENT_REASON = 'dataAbsentReason'; const FIELD_INTERPRETATION = 'interpretation'; @@ -301,6 +297,9 @@ class FHIRObservationComponent extends FHIRBackboneElement */ protected $valueTime = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRObservationComponent Constructor * @param null|array $data @@ -334,6 +333,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_INTERPRETATION])) { if (is_array($data[self::FIELD_INTERPRETATION])) { foreach($data[self::FIELD_INTERPRETATION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addInterpretation($v); } else { @@ -349,6 +351,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REFERENCE_RANGE])) { if (is_array($data[self::FIELD_REFERENCE_RANGE])) { foreach($data[self::FIELD_REFERENCE_RANGE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRObservationReferenceRange) { $this->addReferenceRange($v); } else { @@ -367,8 +372,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_BOOLEAN] instanceof FHIRBoolean) { $this->setValueBoolean($data[self::FIELD_VALUE_BOOLEAN]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_BOOLEAN])) { - $this->setValueBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_VALUE_BOOLEAN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_BOOLEAN])) { + $this->setValueBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_VALUE_BOOLEAN]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_BOOLEAN])) { + $this->setValueBoolean(new FHIRBoolean(array_merge($ext, $data[self::FIELD_VALUE_BOOLEAN]))); + } } else { $this->setValueBoolean(new FHIRBoolean($data[self::FIELD_VALUE_BOOLEAN])); } @@ -386,8 +395,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_DATE_TIME] instanceof FHIRDateTime) { $this->setValueDateTime($data[self::FIELD_VALUE_DATE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_DATE_TIME])) { - $this->setValueDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_VALUE_DATE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_DATE_TIME])) { + $this->setValueDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_VALUE_DATE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_DATE_TIME])) { + $this->setValueDateTime(new FHIRDateTime(array_merge($ext, $data[self::FIELD_VALUE_DATE_TIME]))); + } } else { $this->setValueDateTime(new FHIRDateTime($data[self::FIELD_VALUE_DATE_TIME])); } @@ -398,8 +411,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_INTEGER] instanceof FHIRInteger) { $this->setValueInteger($data[self::FIELD_VALUE_INTEGER]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_INTEGER])) { - $this->setValueInteger(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_VALUE_INTEGER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_INTEGER])) { + $this->setValueInteger(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_VALUE_INTEGER]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_INTEGER])) { + $this->setValueInteger(new FHIRInteger(array_merge($ext, $data[self::FIELD_VALUE_INTEGER]))); + } } else { $this->setValueInteger(new FHIRInteger($data[self::FIELD_VALUE_INTEGER])); } @@ -417,8 +434,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_QUANTITY] instanceof FHIRQuantity) { $this->setValueQuantity($data[self::FIELD_VALUE_QUANTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_QUANTITY])) { - $this->setValueQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_VALUE_QUANTITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_QUANTITY])) { + $this->setValueQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_VALUE_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_QUANTITY])) { + $this->setValueQuantity(new FHIRQuantity(array_merge($ext, $data[self::FIELD_VALUE_QUANTITY]))); + } } else { $this->setValueQuantity(new FHIRQuantity($data[self::FIELD_VALUE_QUANTITY])); } @@ -450,8 +471,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_STRING] instanceof FHIRString) { $this->setValueString($data[self::FIELD_VALUE_STRING]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_STRING])) { - $this->setValueString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VALUE_STRING]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_STRING])) { + $this->setValueString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VALUE_STRING]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_STRING])) { + $this->setValueString(new FHIRString(array_merge($ext, $data[self::FIELD_VALUE_STRING]))); + } } else { $this->setValueString(new FHIRString($data[self::FIELD_VALUE_STRING])); } @@ -462,8 +487,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_TIME] instanceof FHIRTime) { $this->setValueTime($data[self::FIELD_VALUE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_TIME])) { - $this->setValueTime(new FHIRTime([FHIRTime::FIELD_VALUE => $data[self::FIELD_VALUE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_TIME])) { + $this->setValueTime(new FHIRTime([FHIRTime::FIELD_VALUE => $data[self::FIELD_VALUE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_TIME])) { + $this->setValueTime(new FHIRTime(array_merge($ext, $data[self::FIELD_VALUE_TIME]))); + } } else { $this->setValueTime(new FHIRTime($data[self::FIELD_VALUE_TIME])); } @@ -1221,15 +1250,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDataAbsentReason())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DATA_ABSENT_REASON, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getInterpretation())) { foreach($vs as $v) { if (null === $v) { @@ -1247,10 +1273,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_REFERENCE_RANGE, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getValueBoolean())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_BOOLEAN, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } @@ -1260,23 +1286,18 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getValueInteger())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_INTEGER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValuePeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_QUANTITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueRange())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_RANGE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueRatio())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_RATIO, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueSampledData())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_SAMPLED_DATA, null, $v->_getFHIRXMLNamespace())); } @@ -1308,25 +1329,54 @@ public function jsonSerialize() $a[self::FIELD_REFERENCE_RANGE] = $vs; } if (null !== ($v = $this->getValueBoolean())) { - $a[self::FIELD_VALUE_BOOLEAN] = $v->getValue(); - $a[self::FIELD_VALUE_BOOLEAN_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_BOOLEAN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_BOOLEAN_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_BOOLEAN] = $v; + } } if (null !== ($v = $this->getValueCodeableConcept())) { $a[self::FIELD_VALUE_CODEABLE_CONCEPT] = $v; } if (null !== ($v = $this->getValueDateTime())) { - $a[self::FIELD_VALUE_DATE_TIME] = $v->getValue(); - $a[self::FIELD_VALUE_DATE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_DATE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_DATE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_DATE_TIME] = $v; + } } if (null !== ($v = $this->getValueInteger())) { - $a[self::FIELD_VALUE_INTEGER] = $v->getValue(); - $a[self::FIELD_VALUE_INTEGER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_INTEGER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_INTEGER_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_INTEGER] = $v; + } } if (null !== ($v = $this->getValuePeriod())) { $a[self::FIELD_VALUE_PERIOD] = $v; } if (null !== ($v = $this->getValueQuantity())) { - $a[self::FIELD_VALUE_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_QUANTITY] = $v; + } } if (null !== ($v = $this->getValueRange())) { $a[self::FIELD_VALUE_RANGE] = $v; @@ -1338,12 +1388,26 @@ public function jsonSerialize() $a[self::FIELD_VALUE_SAMPLED_DATA] = $v; } if (null !== ($v = $this->getValueString())) { - $a[self::FIELD_VALUE_STRING] = $v->getValue(); - $a[self::FIELD_VALUE_STRING_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_STRING] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_STRING_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_STRING] = $v; + } } if (null !== ($v = $this->getValueTime())) { - $a[self::FIELD_VALUE_TIME] = $v->getValue(); - $a[self::FIELD_VALUE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_TIME] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRObservation/FHIRObservationReferenceRange.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRObservation/FHIRObservationReferenceRange.php index 97880b6d67..6bd14c3007 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRObservation/FHIRObservationReferenceRange.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRObservation/FHIRObservationReferenceRange.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -81,10 +81,6 @@ class FHIRObservationReferenceRange extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_OBSERVATION_DOT_REFERENCE_RANGE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_AGE = 'age'; const FIELD_APPLIES_TO = 'appliesTo'; const FIELD_HIGH = 'high'; @@ -181,6 +177,9 @@ class FHIRObservationReferenceRange extends FHIRBackboneElement */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRObservationReferenceRange Constructor * @param null|array $data @@ -207,6 +206,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_APPLIES_TO])) { if (is_array($data[self::FIELD_APPLIES_TO])) { foreach($data[self::FIELD_APPLIES_TO] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addAppliesTo($v); } else { @@ -225,8 +227,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_HIGH] instanceof FHIRQuantity) { $this->setHigh($data[self::FIELD_HIGH]); - } elseif ($ext && is_scalar($data[self::FIELD_HIGH])) { - $this->setHigh(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_HIGH]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_HIGH])) { + $this->setHigh(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_HIGH]] + $ext)); + } else if (is_array($data[self::FIELD_HIGH])) { + $this->setHigh(new FHIRQuantity(array_merge($ext, $data[self::FIELD_HIGH]))); + } } else { $this->setHigh(new FHIRQuantity($data[self::FIELD_HIGH])); } @@ -237,8 +243,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_LOW] instanceof FHIRQuantity) { $this->setLow($data[self::FIELD_LOW]); - } elseif ($ext && is_scalar($data[self::FIELD_LOW])) { - $this->setLow(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_LOW]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_LOW])) { + $this->setLow(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_LOW]] + $ext)); + } else if (is_array($data[self::FIELD_LOW])) { + $this->setLow(new FHIRQuantity(array_merge($ext, $data[self::FIELD_LOW]))); + } } else { $this->setLow(new FHIRQuantity($data[self::FIELD_LOW])); } @@ -249,8 +259,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TEXT] instanceof FHIRString) { $this->setText($data[self::FIELD_TEXT]); - } elseif ($ext && is_scalar($data[self::FIELD_TEXT])) { - $this->setText(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TEXT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TEXT])) { + $this->setText(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TEXT]] + $ext)); + } else if (is_array($data[self::FIELD_TEXT])) { + $this->setText(new FHIRString(array_merge($ext, $data[self::FIELD_TEXT]))); + } } else { $this->setText(new FHIRString($data[self::FIELD_TEXT])); } @@ -645,11 +659,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getAge())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AGE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getAppliesTo())) { foreach($vs as $v) { if (null === $v) { @@ -662,14 +674,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getHigh())) { $v->xmlSerialize($sxe->addChild(self::FIELD_HIGH, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getLow())) { $v->xmlSerialize($sxe->addChild(self::FIELD_LOW, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getText())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TEXT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -689,14 +699,37 @@ public function jsonSerialize() $a[self::FIELD_APPLIES_TO] = $vs; } if (null !== ($v = $this->getHigh())) { - $a[self::FIELD_HIGH] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_HIGH] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_HIGH_EXT] = $enc; + } + } else { + $a[self::FIELD_HIGH] = $v; + } } if (null !== ($v = $this->getLow())) { - $a[self::FIELD_LOW] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_LOW] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_LOW_EXT] = $enc; + } + } else { + $a[self::FIELD_LOW] = $v; + } } if (null !== ($v = $this->getText())) { - $a[self::FIELD_TEXT] = $v->getValue(); - $a[self::FIELD_TEXT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TEXT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TEXT_EXT] = $enc; + } + } else { + $a[self::FIELD_TEXT] = $v; + } } if (null !== ($v = $this->getType())) { $a[self::FIELD_TYPE] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRObservationDefinition/FHIRObservationDefinitionQualifiedInterval.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRObservationDefinition/FHIRObservationDefinitionQualifiedInterval.php index 914f535bfa..336c255c76 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRObservationDefinition/FHIRObservationDefinitionQualifiedInterval.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRObservationDefinition/FHIRObservationDefinitionQualifiedInterval.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -82,10 +82,6 @@ class FHIRObservationDefinitionQualifiedInterval extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_OBSERVATION_DEFINITION_DOT_QUALIFIED_INTERVAL; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_AGE = 'age'; const FIELD_APPLIES_TO = 'appliesTo'; const FIELD_CATEGORY = 'category'; @@ -190,6 +186,9 @@ class FHIRObservationDefinitionQualifiedInterval extends FHIRBackboneElement */ protected $range = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRObservationDefinitionQualifiedInterval Constructor * @param null|array $data @@ -216,6 +215,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_APPLIES_TO])) { if (is_array($data[self::FIELD_APPLIES_TO])) { foreach($data[self::FIELD_APPLIES_TO] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addAppliesTo($v); } else { @@ -234,8 +236,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CATEGORY] instanceof FHIRObservationRangeCategory) { $this->setCategory($data[self::FIELD_CATEGORY]); - } elseif ($ext && is_scalar($data[self::FIELD_CATEGORY])) { - $this->setCategory(new FHIRObservationRangeCategory([FHIRObservationRangeCategory::FIELD_VALUE => $data[self::FIELD_CATEGORY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CATEGORY])) { + $this->setCategory(new FHIRObservationRangeCategory([FHIRObservationRangeCategory::FIELD_VALUE => $data[self::FIELD_CATEGORY]] + $ext)); + } else if (is_array($data[self::FIELD_CATEGORY])) { + $this->setCategory(new FHIRObservationRangeCategory(array_merge($ext, $data[self::FIELD_CATEGORY]))); + } } else { $this->setCategory(new FHIRObservationRangeCategory($data[self::FIELD_CATEGORY])); } @@ -246,8 +252,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CONDITION] instanceof FHIRString) { $this->setCondition($data[self::FIELD_CONDITION]); - } elseif ($ext && is_scalar($data[self::FIELD_CONDITION])) { - $this->setCondition(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_CONDITION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CONDITION])) { + $this->setCondition(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_CONDITION]] + $ext)); + } else if (is_array($data[self::FIELD_CONDITION])) { + $this->setCondition(new FHIRString(array_merge($ext, $data[self::FIELD_CONDITION]))); + } } else { $this->setCondition(new FHIRString($data[self::FIELD_CONDITION])); } @@ -265,8 +275,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_GENDER] instanceof FHIRAdministrativeGender) { $this->setGender($data[self::FIELD_GENDER]); - } elseif ($ext && is_scalar($data[self::FIELD_GENDER])) { - $this->setGender(new FHIRAdministrativeGender([FHIRAdministrativeGender::FIELD_VALUE => $data[self::FIELD_GENDER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_GENDER])) { + $this->setGender(new FHIRAdministrativeGender([FHIRAdministrativeGender::FIELD_VALUE => $data[self::FIELD_GENDER]] + $ext)); + } else if (is_array($data[self::FIELD_GENDER])) { + $this->setGender(new FHIRAdministrativeGender(array_merge($ext, $data[self::FIELD_GENDER]))); + } } else { $this->setGender(new FHIRAdministrativeGender($data[self::FIELD_GENDER])); } @@ -698,11 +712,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getAge())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AGE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getAppliesTo())) { foreach($vs as $v) { if (null === $v) { @@ -718,19 +730,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getCondition())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CONDITION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getContext())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CONTEXT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getGender())) { $v->xmlSerialize($sxe->addChild(self::FIELD_GENDER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getGestationalAge())) { $v->xmlSerialize($sxe->addChild(self::FIELD_GESTATIONAL_AGE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRange())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RANGE, null, $v->_getFHIRXMLNamespace())); } @@ -750,17 +758,40 @@ public function jsonSerialize() $a[self::FIELD_APPLIES_TO] = $vs; } if (null !== ($v = $this->getCategory())) { - $a[self::FIELD_CATEGORY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CATEGORY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CATEGORY_EXT] = $enc; + } + } else { + $a[self::FIELD_CATEGORY] = $v; + } } if (null !== ($v = $this->getCondition())) { - $a[self::FIELD_CONDITION] = $v->getValue(); - $a[self::FIELD_CONDITION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CONDITION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CONDITION_EXT] = $enc; + } + } else { + $a[self::FIELD_CONDITION] = $v; + } } if (null !== ($v = $this->getContext())) { $a[self::FIELD_CONTEXT] = $v; } if (null !== ($v = $this->getGender())) { - $a[self::FIELD_GENDER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_GENDER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_GENDER_EXT] = $enc; + } + } else { + $a[self::FIELD_GENDER] = $v; + } } if (null !== ($v = $this->getGestationalAge())) { $a[self::FIELD_GESTATIONAL_AGE] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRObservationDefinition/FHIRObservationDefinitionQuantitativeDetails.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRObservationDefinition/FHIRObservationDefinitionQuantitativeDetails.php index ee0b4a918c..1ce1ccb897 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRObservationDefinition/FHIRObservationDefinitionQuantitativeDetails.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRObservationDefinition/FHIRObservationDefinitionQuantitativeDetails.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRObservationDefinitionQuantitativeDetails extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_OBSERVATION_DEFINITION_DOT_QUANTITATIVE_DETAILS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CONVERSION_FACTOR = 'conversionFactor'; const FIELD_CONVERSION_FACTOR_EXT = '_conversionFactor'; const FIELD_CUSTOMARY_UNIT = 'customaryUnit'; @@ -142,6 +138,9 @@ class FHIRObservationDefinitionQuantitativeDetails extends FHIRBackboneElement */ protected $unit = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRObservationDefinitionQuantitativeDetails Constructor * @param null|array $data @@ -164,8 +163,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CONVERSION_FACTOR] instanceof FHIRDecimal) { $this->setConversionFactor($data[self::FIELD_CONVERSION_FACTOR]); - } elseif ($ext && is_scalar($data[self::FIELD_CONVERSION_FACTOR])) { - $this->setConversionFactor(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_CONVERSION_FACTOR]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CONVERSION_FACTOR])) { + $this->setConversionFactor(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_CONVERSION_FACTOR]] + $ext)); + } else if (is_array($data[self::FIELD_CONVERSION_FACTOR])) { + $this->setConversionFactor(new FHIRDecimal(array_merge($ext, $data[self::FIELD_CONVERSION_FACTOR]))); + } } else { $this->setConversionFactor(new FHIRDecimal($data[self::FIELD_CONVERSION_FACTOR])); } @@ -183,8 +186,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DECIMAL_PRECISION] instanceof FHIRInteger) { $this->setDecimalPrecision($data[self::FIELD_DECIMAL_PRECISION]); - } elseif ($ext && is_scalar($data[self::FIELD_DECIMAL_PRECISION])) { - $this->setDecimalPrecision(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_DECIMAL_PRECISION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DECIMAL_PRECISION])) { + $this->setDecimalPrecision(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_DECIMAL_PRECISION]] + $ext)); + } else if (is_array($data[self::FIELD_DECIMAL_PRECISION])) { + $this->setDecimalPrecision(new FHIRInteger(array_merge($ext, $data[self::FIELD_DECIMAL_PRECISION]))); + } } else { $this->setDecimalPrecision(new FHIRInteger($data[self::FIELD_DECIMAL_PRECISION])); } @@ -468,14 +475,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getConversionFactor())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CONVERSION_FACTOR, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getCustomaryUnit())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CUSTOMARY_UNIT, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getDecimalPrecision())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DECIMAL_PRECISION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getUnit())) { $v->xmlSerialize($sxe->addChild(self::FIELD_UNIT, null, $v->_getFHIRXMLNamespace())); } @@ -489,15 +494,29 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getConversionFactor())) { - $a[self::FIELD_CONVERSION_FACTOR] = $v->getValue(); - $a[self::FIELD_CONVERSION_FACTOR_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CONVERSION_FACTOR] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CONVERSION_FACTOR_EXT] = $enc; + } + } else { + $a[self::FIELD_CONVERSION_FACTOR] = $v; + } } if (null !== ($v = $this->getCustomaryUnit())) { $a[self::FIELD_CUSTOMARY_UNIT] = $v; } if (null !== ($v = $this->getDecimalPrecision())) { - $a[self::FIELD_DECIMAL_PRECISION] = $v->getValue(); - $a[self::FIELD_DECIMAL_PRECISION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DECIMAL_PRECISION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DECIMAL_PRECISION_EXT] = $enc; + } + } else { + $a[self::FIELD_DECIMAL_PRECISION] = $v; + } } if (null !== ($v = $this->getUnit())) { $a[self::FIELD_UNIT] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIROperationDefinition/FHIROperationDefinitionBinding.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIROperationDefinition/FHIROperationDefinitionBinding.php index 48fd90bc37..839cb075f8 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIROperationDefinition/FHIROperationDefinitionBinding.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIROperationDefinition/FHIROperationDefinitionBinding.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIROperationDefinitionBinding extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_OPERATION_DEFINITION_DOT_BINDING; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_STRENGTH = 'strength'; const FIELD_STRENGTH_EXT = '_strength'; const FIELD_VALUE_SET = 'valueSet'; @@ -113,6 +109,9 @@ class FHIROperationDefinitionBinding extends FHIRBackboneElement */ protected $valueSet = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIROperationDefinitionBinding Constructor * @param null|array $data @@ -135,8 +134,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STRENGTH] instanceof FHIRBindingStrength) { $this->setStrength($data[self::FIELD_STRENGTH]); - } elseif ($ext && is_scalar($data[self::FIELD_STRENGTH])) { - $this->setStrength(new FHIRBindingStrength([FHIRBindingStrength::FIELD_VALUE => $data[self::FIELD_STRENGTH]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STRENGTH])) { + $this->setStrength(new FHIRBindingStrength([FHIRBindingStrength::FIELD_VALUE => $data[self::FIELD_STRENGTH]] + $ext)); + } else if (is_array($data[self::FIELD_STRENGTH])) { + $this->setStrength(new FHIRBindingStrength(array_merge($ext, $data[self::FIELD_STRENGTH]))); + } } else { $this->setStrength(new FHIRBindingStrength($data[self::FIELD_STRENGTH])); } @@ -147,8 +150,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_SET] instanceof FHIRCanonical) { $this->setValueSet($data[self::FIELD_VALUE_SET]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_SET])) { - $this->setValueSet(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $data[self::FIELD_VALUE_SET]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_SET])) { + $this->setValueSet(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $data[self::FIELD_VALUE_SET]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_SET])) { + $this->setValueSet(new FHIRCanonical(array_merge($ext, $data[self::FIELD_VALUE_SET]))); + } } else { $this->setValueSet(new FHIRCanonical($data[self::FIELD_VALUE_SET])); } @@ -337,7 +344,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getStrength())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STRENGTH, null, $v->_getFHIRXMLNamespace())); } @@ -354,11 +360,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getStrength())) { - $a[self::FIELD_STRENGTH] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STRENGTH] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STRENGTH_EXT] = $enc; + } + } else { + $a[self::FIELD_STRENGTH] = $v; + } } if (null !== ($v = $this->getValueSet())) { - $a[self::FIELD_VALUE_SET] = $v->getValue(); - $a[self::FIELD_VALUE_SET_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_SET] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_SET_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_SET] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIROperationDefinition/FHIROperationDefinitionOverload.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIROperationDefinition/FHIROperationDefinitionOverload.php index 930194530c..4b839230fd 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIROperationDefinition/FHIROperationDefinitionOverload.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIROperationDefinition/FHIROperationDefinitionOverload.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIROperationDefinitionOverload extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_OPERATION_DEFINITION_DOT_OVERLOAD; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_COMMENT = 'comment'; const FIELD_COMMENT_EXT = '_comment'; const FIELD_PARAMETER_NAME = 'parameterName'; @@ -109,6 +105,9 @@ class FHIROperationDefinitionOverload extends FHIRBackboneElement */ protected $parameterName = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIROperationDefinitionOverload Constructor * @param null|array $data @@ -131,8 +130,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_COMMENT] instanceof FHIRString) { $this->setComment($data[self::FIELD_COMMENT]); - } elseif ($ext && is_scalar($data[self::FIELD_COMMENT])) { - $this->setComment(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_COMMENT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_COMMENT])) { + $this->setComment(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_COMMENT]] + $ext)); + } else if (is_array($data[self::FIELD_COMMENT])) { + $this->setComment(new FHIRString(array_merge($ext, $data[self::FIELD_COMMENT]))); + } } else { $this->setComment(new FHIRString($data[self::FIELD_COMMENT])); } @@ -143,17 +146,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_PARAMETER_NAME])) { foreach($data[self::FIELD_PARAMETER_NAME] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRString) { $this->addParameterName($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addParameterName(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addParameterName(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addParameterName(new FHIRString(array_merge($v, $ext[$i]))); + } } else { $this->addParameterName(new FHIRString($v)); } } } elseif ($data[self::FIELD_PARAMETER_NAME] instanceof FHIRString) { $this->addParameterName($data[self::FIELD_PARAMETER_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_PARAMETER_NAME])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_PARAMETER_NAME])) { $this->addParameterName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PARAMETER_NAME]] + $ext)); } else { $this->addParameterName(new FHIRString($data[self::FIELD_PARAMETER_NAME])); @@ -387,6 +397,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_PARAMETER_NAME, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } @@ -397,8 +408,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getComment())) { - $a[self::FIELD_COMMENT] = $v->getValue(); - $a[self::FIELD_COMMENT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_COMMENT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_COMMENT_EXT] = $enc; + } + } else { + $a[self::FIELD_COMMENT] = $v; + } } if ([] !== ($vs = $this->getParameterName())) { $a[self::FIELD_PARAMETER_NAME] = []; @@ -406,8 +424,17 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_PARAMETER_NAME][] = $v->getValue(); - $a[self::FIELD_PARAMETER_NAME_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PARAMETER_NAME][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PARAMETER_NAME_EXT][] = $enc; + } else { + $a[self::FIELD_PARAMETER_NAME_EXT][] = null; + } + } else { + $a[self::FIELD_PARAMETER_NAME][] = $v; + } } } return $a; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIROperationDefinition/FHIROperationDefinitionParameter.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIROperationDefinition/FHIROperationDefinitionParameter.php index 27ebc24ddb..732807e689 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIROperationDefinition/FHIROperationDefinitionParameter.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIROperationDefinition/FHIROperationDefinitionParameter.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -83,10 +83,6 @@ class FHIROperationDefinitionParameter extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_OPERATION_DEFINITION_DOT_PARAMETER; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_BINDING = 'binding'; const FIELD_DOCUMENTATION = 'documentation'; const FIELD_DOCUMENTATION_EXT = '_documentation'; @@ -236,6 +232,9 @@ class FHIROperationDefinitionParameter extends FHIRBackboneElement */ protected $use = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIROperationDefinitionParameter Constructor * @param null|array $data @@ -265,8 +264,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DOCUMENTATION] instanceof FHIRString) { $this->setDocumentation($data[self::FIELD_DOCUMENTATION]); - } elseif ($ext && is_scalar($data[self::FIELD_DOCUMENTATION])) { - $this->setDocumentation(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DOCUMENTATION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DOCUMENTATION])) { + $this->setDocumentation(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DOCUMENTATION]] + $ext)); + } else if (is_array($data[self::FIELD_DOCUMENTATION])) { + $this->setDocumentation(new FHIRString(array_merge($ext, $data[self::FIELD_DOCUMENTATION]))); + } } else { $this->setDocumentation(new FHIRString($data[self::FIELD_DOCUMENTATION])); } @@ -277,8 +280,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MAX] instanceof FHIRString) { $this->setMax($data[self::FIELD_MAX]); - } elseif ($ext && is_scalar($data[self::FIELD_MAX])) { - $this->setMax(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_MAX]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MAX])) { + $this->setMax(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_MAX]] + $ext)); + } else if (is_array($data[self::FIELD_MAX])) { + $this->setMax(new FHIRString(array_merge($ext, $data[self::FIELD_MAX]))); + } } else { $this->setMax(new FHIRString($data[self::FIELD_MAX])); } @@ -289,8 +296,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MIN] instanceof FHIRInteger) { $this->setMin($data[self::FIELD_MIN]); - } elseif ($ext && is_scalar($data[self::FIELD_MIN])) { - $this->setMin(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_MIN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MIN])) { + $this->setMin(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_MIN]] + $ext)); + } else if (is_array($data[self::FIELD_MIN])) { + $this->setMin(new FHIRInteger(array_merge($ext, $data[self::FIELD_MIN]))); + } } else { $this->setMin(new FHIRInteger($data[self::FIELD_MIN])); } @@ -301,8 +312,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRCode) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRCode(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRCode($data[self::FIELD_NAME])); } @@ -310,6 +325,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PART])) { if (is_array($data[self::FIELD_PART])) { foreach($data[self::FIELD_PART] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIROperationDefinitionParameter) { $this->addPart($v); } else { @@ -325,6 +343,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REFERENCED_FROM])) { if (is_array($data[self::FIELD_REFERENCED_FROM])) { foreach($data[self::FIELD_REFERENCED_FROM] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIROperationDefinitionReferencedFrom) { $this->addReferencedFrom($v); } else { @@ -343,8 +364,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SEARCH_TYPE] instanceof FHIRSearchParamType) { $this->setSearchType($data[self::FIELD_SEARCH_TYPE]); - } elseif ($ext && is_scalar($data[self::FIELD_SEARCH_TYPE])) { - $this->setSearchType(new FHIRSearchParamType([FHIRSearchParamType::FIELD_VALUE => $data[self::FIELD_SEARCH_TYPE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SEARCH_TYPE])) { + $this->setSearchType(new FHIRSearchParamType([FHIRSearchParamType::FIELD_VALUE => $data[self::FIELD_SEARCH_TYPE]] + $ext)); + } else if (is_array($data[self::FIELD_SEARCH_TYPE])) { + $this->setSearchType(new FHIRSearchParamType(array_merge($ext, $data[self::FIELD_SEARCH_TYPE]))); + } } else { $this->setSearchType(new FHIRSearchParamType($data[self::FIELD_SEARCH_TYPE])); } @@ -355,17 +380,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_TARGET_PROFILE])) { foreach($data[self::FIELD_TARGET_PROFILE] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCanonical) { $this->addTargetProfile($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addTargetProfile(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addTargetProfile(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addTargetProfile(new FHIRCanonical(array_merge($v, $ext[$i]))); + } } else { $this->addTargetProfile(new FHIRCanonical($v)); } } } elseif ($data[self::FIELD_TARGET_PROFILE] instanceof FHIRCanonical) { $this->addTargetProfile($data[self::FIELD_TARGET_PROFILE]); - } elseif ($ext && is_scalar($data[self::FIELD_TARGET_PROFILE])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_TARGET_PROFILE])) { $this->addTargetProfile(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $data[self::FIELD_TARGET_PROFILE]] + $ext)); } else { $this->addTargetProfile(new FHIRCanonical($data[self::FIELD_TARGET_PROFILE])); @@ -377,8 +409,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TYPE] instanceof FHIRCode) { $this->setType($data[self::FIELD_TYPE]); - } elseif ($ext && is_scalar($data[self::FIELD_TYPE])) { - $this->setType(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TYPE])) { + $this->setType(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } else if (is_array($data[self::FIELD_TYPE])) { + $this->setType(new FHIRCode(array_merge($ext, $data[self::FIELD_TYPE]))); + } } else { $this->setType(new FHIRCode($data[self::FIELD_TYPE])); } @@ -389,8 +425,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_USE] instanceof FHIROperationParameterUse) { $this->setUse($data[self::FIELD_USE]); - } elseif ($ext && is_scalar($data[self::FIELD_USE])) { - $this->setUse(new FHIROperationParameterUse([FHIROperationParameterUse::FIELD_VALUE => $data[self::FIELD_USE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_USE])) { + $this->setUse(new FHIROperationParameterUse([FHIROperationParameterUse::FIELD_VALUE => $data[self::FIELD_USE]] + $ext)); + } else if (is_array($data[self::FIELD_USE])) { + $this->setUse(new FHIROperationParameterUse(array_merge($ext, $data[self::FIELD_USE]))); + } } else { $this->setUse(new FHIROperationParameterUse($data[self::FIELD_USE])); } @@ -1032,7 +1072,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getBinding())) { $v->xmlSerialize($sxe->addChild(self::FIELD_BINDING, null, $v->_getFHIRXMLNamespace())); } @@ -1048,7 +1087,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NAME, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getPart())) { foreach($vs as $v) { if (null === $v) { @@ -1078,10 +1116,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_TARGET_PROFILE, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getUse())) { $v->xmlSerialize($sxe->addChild(self::FIELD_USE, null, $v->_getFHIRXMLNamespace())); } @@ -1098,20 +1136,48 @@ public function jsonSerialize() $a[self::FIELD_BINDING] = $v; } if (null !== ($v = $this->getDocumentation())) { - $a[self::FIELD_DOCUMENTATION] = $v->getValue(); - $a[self::FIELD_DOCUMENTATION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DOCUMENTATION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DOCUMENTATION_EXT] = $enc; + } + } else { + $a[self::FIELD_DOCUMENTATION] = $v; + } } if (null !== ($v = $this->getMax())) { - $a[self::FIELD_MAX] = $v->getValue(); - $a[self::FIELD_MAX_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MAX] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MAX_EXT] = $enc; + } + } else { + $a[self::FIELD_MAX] = $v; + } } if (null !== ($v = $this->getMin())) { - $a[self::FIELD_MIN] = $v->getValue(); - $a[self::FIELD_MIN_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MIN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MIN_EXT] = $enc; + } + } else { + $a[self::FIELD_MIN] = $v; + } } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if ([] !== ($vs = $this->getPart())) { $a[self::FIELD_PART] = $vs; @@ -1120,7 +1186,15 @@ public function jsonSerialize() $a[self::FIELD_REFERENCED_FROM] = $vs; } if (null !== ($v = $this->getSearchType())) { - $a[self::FIELD_SEARCH_TYPE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SEARCH_TYPE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SEARCH_TYPE_EXT] = $enc; + } + } else { + $a[self::FIELD_SEARCH_TYPE] = $v; + } } if ([] !== ($vs = $this->getTargetProfile())) { $a[self::FIELD_TARGET_PROFILE] = []; @@ -1128,16 +1202,40 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_TARGET_PROFILE][] = $v->getValue(); - $a[self::FIELD_TARGET_PROFILE_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TARGET_PROFILE][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TARGET_PROFILE_EXT][] = $enc; + } else { + $a[self::FIELD_TARGET_PROFILE_EXT][] = null; + } + } else { + $a[self::FIELD_TARGET_PROFILE][] = $v; + } } } if (null !== ($v = $this->getType())) { - $a[self::FIELD_TYPE] = $v->getValue(); - $a[self::FIELD_TYPE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TYPE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TYPE_EXT] = $enc; + } + } else { + $a[self::FIELD_TYPE] = $v; + } } if (null !== ($v = $this->getUse())) { - $a[self::FIELD_USE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_USE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_USE_EXT] = $enc; + } + } else { + $a[self::FIELD_USE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIROperationDefinition/FHIROperationDefinitionReferencedFrom.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIROperationDefinition/FHIROperationDefinitionReferencedFrom.php index 4c0106392d..5e9b882af3 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIROperationDefinition/FHIROperationDefinitionReferencedFrom.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIROperationDefinition/FHIROperationDefinitionReferencedFrom.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIROperationDefinitionReferencedFrom extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_OPERATION_DEFINITION_DOT_REFERENCED_FROM; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_SOURCE = 'source'; const FIELD_SOURCE_EXT = '_source'; const FIELD_SOURCE_ID = 'sourceId'; @@ -111,6 +107,9 @@ class FHIROperationDefinitionReferencedFrom extends FHIRBackboneElement */ protected $sourceId = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIROperationDefinitionReferencedFrom Constructor * @param null|array $data @@ -133,8 +132,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SOURCE] instanceof FHIRString) { $this->setSource($data[self::FIELD_SOURCE]); - } elseif ($ext && is_scalar($data[self::FIELD_SOURCE])) { - $this->setSource(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SOURCE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SOURCE])) { + $this->setSource(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SOURCE]] + $ext)); + } else if (is_array($data[self::FIELD_SOURCE])) { + $this->setSource(new FHIRString(array_merge($ext, $data[self::FIELD_SOURCE]))); + } } else { $this->setSource(new FHIRString($data[self::FIELD_SOURCE])); } @@ -145,8 +148,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SOURCE_ID] instanceof FHIRString) { $this->setSourceId($data[self::FIELD_SOURCE_ID]); - } elseif ($ext && is_scalar($data[self::FIELD_SOURCE_ID])) { - $this->setSourceId(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SOURCE_ID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SOURCE_ID])) { + $this->setSourceId(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SOURCE_ID]] + $ext)); + } else if (is_array($data[self::FIELD_SOURCE_ID])) { + $this->setSourceId(new FHIRString(array_merge($ext, $data[self::FIELD_SOURCE_ID]))); + } } else { $this->setSourceId(new FHIRString($data[self::FIELD_SOURCE_ID])); } @@ -360,12 +367,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getSource())) { - $a[self::FIELD_SOURCE] = $v->getValue(); - $a[self::FIELD_SOURCE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SOURCE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SOURCE_EXT] = $enc; + } + } else { + $a[self::FIELD_SOURCE] = $v; + } } if (null !== ($v = $this->getSourceId())) { - $a[self::FIELD_SOURCE_ID] = $v->getValue(); - $a[self::FIELD_SOURCE_ID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SOURCE_ID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SOURCE_ID_EXT] = $enc; + } + } else { + $a[self::FIELD_SOURCE_ID] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIROperationOutcome/FHIROperationOutcomeIssue.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIROperationOutcome/FHIROperationOutcomeIssue.php index 6b67fb379d..f0d25bf12f 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIROperationOutcome/FHIROperationOutcomeIssue.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIROperationOutcome/FHIROperationOutcomeIssue.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -81,10 +81,6 @@ class FHIROperationOutcomeIssue extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_OPERATION_OUTCOME_DOT_ISSUE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CODE = 'code'; const FIELD_CODE_EXT = '_code'; const FIELD_DETAILS = 'details'; @@ -172,6 +168,9 @@ class FHIROperationOutcomeIssue extends FHIRBackboneElement */ protected $severity = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIROperationOutcomeIssue Constructor * @param null|array $data @@ -194,8 +193,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CODE] instanceof FHIRIssueType) { $this->setCode($data[self::FIELD_CODE]); - } elseif ($ext && is_scalar($data[self::FIELD_CODE])) { - $this->setCode(new FHIRIssueType([FHIRIssueType::FIELD_VALUE => $data[self::FIELD_CODE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CODE])) { + $this->setCode(new FHIRIssueType([FHIRIssueType::FIELD_VALUE => $data[self::FIELD_CODE]] + $ext)); + } else if (is_array($data[self::FIELD_CODE])) { + $this->setCode(new FHIRIssueType(array_merge($ext, $data[self::FIELD_CODE]))); + } } else { $this->setCode(new FHIRIssueType($data[self::FIELD_CODE])); } @@ -213,8 +216,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DIAGNOSTICS] instanceof FHIRString) { $this->setDiagnostics($data[self::FIELD_DIAGNOSTICS]); - } elseif ($ext && is_scalar($data[self::FIELD_DIAGNOSTICS])) { - $this->setDiagnostics(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DIAGNOSTICS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DIAGNOSTICS])) { + $this->setDiagnostics(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DIAGNOSTICS]] + $ext)); + } else if (is_array($data[self::FIELD_DIAGNOSTICS])) { + $this->setDiagnostics(new FHIRString(array_merge($ext, $data[self::FIELD_DIAGNOSTICS]))); + } } else { $this->setDiagnostics(new FHIRString($data[self::FIELD_DIAGNOSTICS])); } @@ -225,17 +232,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_EXPRESSION])) { foreach($data[self::FIELD_EXPRESSION] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRString) { $this->addExpression($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addExpression(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addExpression(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addExpression(new FHIRString(array_merge($v, $ext[$i]))); + } } else { $this->addExpression(new FHIRString($v)); } } } elseif ($data[self::FIELD_EXPRESSION] instanceof FHIRString) { $this->addExpression($data[self::FIELD_EXPRESSION]); - } elseif ($ext && is_scalar($data[self::FIELD_EXPRESSION])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_EXPRESSION])) { $this->addExpression(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_EXPRESSION]] + $ext)); } else { $this->addExpression(new FHIRString($data[self::FIELD_EXPRESSION])); @@ -247,17 +261,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_LOCATION])) { foreach($data[self::FIELD_LOCATION] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRString) { $this->addLocation($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addLocation(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addLocation(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addLocation(new FHIRString(array_merge($v, $ext[$i]))); + } } else { $this->addLocation(new FHIRString($v)); } } } elseif ($data[self::FIELD_LOCATION] instanceof FHIRString) { $this->addLocation($data[self::FIELD_LOCATION]); - } elseif ($ext && is_scalar($data[self::FIELD_LOCATION])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_LOCATION])) { $this->addLocation(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_LOCATION]] + $ext)); } else { $this->addLocation(new FHIRString($data[self::FIELD_LOCATION])); @@ -269,8 +290,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SEVERITY] instanceof FHIRIssueSeverity) { $this->setSeverity($data[self::FIELD_SEVERITY]); - } elseif ($ext && is_scalar($data[self::FIELD_SEVERITY])) { - $this->setSeverity(new FHIRIssueSeverity([FHIRIssueSeverity::FIELD_VALUE => $data[self::FIELD_SEVERITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SEVERITY])) { + $this->setSeverity(new FHIRIssueSeverity([FHIRIssueSeverity::FIELD_VALUE => $data[self::FIELD_SEVERITY]] + $ext)); + } else if (is_array($data[self::FIELD_SEVERITY])) { + $this->setSeverity(new FHIRIssueSeverity(array_merge($ext, $data[self::FIELD_SEVERITY]))); + } } else { $this->setSeverity(new FHIRIssueSeverity($data[self::FIELD_SEVERITY])); } @@ -688,11 +713,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDetails())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DETAILS, null, $v->_getFHIRXMLNamespace())); } @@ -707,6 +730,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_EXPRESSION, null, $v->_getFHIRXMLNamespace())); } } + if ([] !== ($vs = $this->getLocation())) { foreach($vs as $v) { if (null === $v) { @@ -729,14 +753,29 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getCode())) { - $a[self::FIELD_CODE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CODE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CODE_EXT] = $enc; + } + } else { + $a[self::FIELD_CODE] = $v; + } } if (null !== ($v = $this->getDetails())) { $a[self::FIELD_DETAILS] = $v; } if (null !== ($v = $this->getDiagnostics())) { - $a[self::FIELD_DIAGNOSTICS] = $v->getValue(); - $a[self::FIELD_DIAGNOSTICS_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DIAGNOSTICS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DIAGNOSTICS_EXT] = $enc; + } + } else { + $a[self::FIELD_DIAGNOSTICS] = $v; + } } if ([] !== ($vs = $this->getExpression())) { $a[self::FIELD_EXPRESSION] = []; @@ -744,8 +783,17 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_EXPRESSION][] = $v->getValue(); - $a[self::FIELD_EXPRESSION_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EXPRESSION][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EXPRESSION_EXT][] = $enc; + } else { + $a[self::FIELD_EXPRESSION_EXT][] = null; + } + } else { + $a[self::FIELD_EXPRESSION][] = $v; + } } } if ([] !== ($vs = $this->getLocation())) { @@ -754,12 +802,29 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_LOCATION][] = $v->getValue(); - $a[self::FIELD_LOCATION_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_LOCATION][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_LOCATION_EXT][] = $enc; + } else { + $a[self::FIELD_LOCATION_EXT][] = null; + } + } else { + $a[self::FIELD_LOCATION][] = $v; + } } } if (null !== ($v = $this->getSeverity())) { - $a[self::FIELD_SEVERITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SEVERITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SEVERITY_EXT] = $enc; + } + } else { + $a[self::FIELD_SEVERITY] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIROrganization/FHIROrganizationContact.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIROrganization/FHIROrganizationContact.php index de41e53c70..cbe1a23dc6 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIROrganization/FHIROrganizationContact.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIROrganization/FHIROrganizationContact.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -83,10 +83,6 @@ class FHIROrganizationContact extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ORGANIZATION_DOT_CONTACT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ADDRESS = 'address'; const FIELD_NAME = 'name'; const FIELD_PURPOSE = 'purpose'; @@ -144,6 +140,9 @@ class FHIROrganizationContact extends FHIRBackboneElement */ protected $telecom = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIROrganizationContact Constructor * @param null|array $data @@ -187,17 +186,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_TELECOM])) { foreach($data[self::FIELD_TELECOM] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContactPoint) { $this->addTelecom($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addTelecom(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addTelecom(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addTelecom(new FHIRContactPoint(array_merge($v, $ext[$i]))); + } } else { $this->addTelecom(new FHIRContactPoint($v)); } } } elseif ($data[self::FIELD_TELECOM] instanceof FHIRContactPoint) { $this->addTelecom($data[self::FIELD_TELECOM]); - } elseif ($ext && is_scalar($data[self::FIELD_TELECOM])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_TELECOM])) { $this->addTelecom(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $data[self::FIELD_TELECOM]] + $ext)); } else { $this->addTelecom(new FHIRContactPoint($data[self::FIELD_TELECOM])); @@ -480,19 +486,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getAddress())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ADDRESS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NAME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPurpose())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PURPOSE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getTelecom())) { foreach($vs as $v) { if (null === $v) { @@ -501,6 +503,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_TELECOM, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } @@ -520,7 +523,23 @@ public function jsonSerialize() $a[self::FIELD_PURPOSE] = $v; } if ([] !== ($vs = $this->getTelecom())) { - $a[self::FIELD_TELECOM] = $vs; + $a[self::FIELD_TELECOM] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TELECOM][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TELECOM_EXT][] = $enc; + } else { + $a[self::FIELD_TELECOM_EXT][] = null; + } + } else { + $a[self::FIELD_TELECOM][] = $v; + } + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRParameters/FHIRParametersParameter.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRParameters/FHIRParametersParameter.php index f43dba3e60..88695c97b1 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRParameters/FHIRParametersParameter.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRParameters/FHIRParametersParameter.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -130,16 +130,13 @@ class FHIRParametersParameter extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_PARAMETERS_DOT_PARAMETER; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_NAME = 'name'; const FIELD_NAME_EXT = '_name'; const FIELD_PART = 'part'; const FIELD_RESOURCE = 'resource'; const FIELD_VALUE_ADDRESS = 'valueAddress'; const FIELD_VALUE_AGE = 'valueAge'; + const FIELD_VALUE_AGE_EXT = '_valueAge'; const FIELD_VALUE_ANNOTATION = 'valueAnnotation'; const FIELD_VALUE_ATTACHMENT = 'valueAttachment'; const FIELD_VALUE_BASE_64BINARY = 'valueBase64Binary'; @@ -157,6 +154,7 @@ class FHIRParametersParameter extends FHIRBackboneElement const FIELD_VALUE_CONTACT_POINT_EXT = '_valueContactPoint'; const FIELD_VALUE_CONTRIBUTOR = 'valueContributor'; const FIELD_VALUE_COUNT = 'valueCount'; + const FIELD_VALUE_COUNT_EXT = '_valueCount'; const FIELD_VALUE_DATA_REQUIREMENT = 'valueDataRequirement'; const FIELD_VALUE_DATE = 'valueDate'; const FIELD_VALUE_DATE_EXT = '_valueDate'; @@ -165,8 +163,10 @@ class FHIRParametersParameter extends FHIRBackboneElement const FIELD_VALUE_DECIMAL = 'valueDecimal'; const FIELD_VALUE_DECIMAL_EXT = '_valueDecimal'; const FIELD_VALUE_DISTANCE = 'valueDistance'; + const FIELD_VALUE_DISTANCE_EXT = '_valueDistance'; const FIELD_VALUE_DOSAGE = 'valueDosage'; const FIELD_VALUE_DURATION = 'valueDuration'; + const FIELD_VALUE_DURATION_EXT = '_valueDuration'; const FIELD_VALUE_EXPRESSION = 'valueExpression'; const FIELD_VALUE_HUMAN_NAME = 'valueHumanName'; const FIELD_VALUE_ID = 'valueId'; @@ -845,6 +845,9 @@ class FHIRParametersParameter extends FHIRBackboneElement */ protected $valueUuid = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRParametersParameter Constructor * @param null|array $data @@ -867,8 +870,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -876,6 +883,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PART])) { if (is_array($data[self::FIELD_PART])) { foreach($data[self::FIELD_PART] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRParametersParameter) { $this->addPart($v); } else { @@ -922,8 +932,17 @@ public function __construct($data = null) } } if (isset($data[self::FIELD_VALUE_AGE])) { + $ext = (isset($data[self::FIELD_VALUE_AGE_EXT]) && is_array($data[self::FIELD_VALUE_AGE_EXT])) + ? $data[self::FIELD_VALUE_AGE_EXT] + : null; if ($data[self::FIELD_VALUE_AGE] instanceof FHIRAge) { $this->setValueAge($data[self::FIELD_VALUE_AGE]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_AGE])) { + $this->setValueAge(new FHIRAge([FHIRAge::FIELD_VALUE => $data[self::FIELD_VALUE_AGE]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_AGE])) { + $this->setValueAge(new FHIRAge(array_merge($ext, $data[self::FIELD_VALUE_AGE]))); + } } else { $this->setValueAge(new FHIRAge($data[self::FIELD_VALUE_AGE])); } @@ -948,8 +967,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_BASE_64BINARY] instanceof FHIRBase64Binary) { $this->setValueBase64Binary($data[self::FIELD_VALUE_BASE_64BINARY]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_BASE_64BINARY])) { - $this->setValueBase64Binary(new FHIRBase64Binary([FHIRBase64Binary::FIELD_VALUE => $data[self::FIELD_VALUE_BASE_64BINARY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_BASE_64BINARY])) { + $this->setValueBase64Binary(new FHIRBase64Binary([FHIRBase64Binary::FIELD_VALUE => $data[self::FIELD_VALUE_BASE_64BINARY]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_BASE_64BINARY])) { + $this->setValueBase64Binary(new FHIRBase64Binary(array_merge($ext, $data[self::FIELD_VALUE_BASE_64BINARY]))); + } } else { $this->setValueBase64Binary(new FHIRBase64Binary($data[self::FIELD_VALUE_BASE_64BINARY])); } @@ -960,8 +983,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_BOOLEAN] instanceof FHIRBoolean) { $this->setValueBoolean($data[self::FIELD_VALUE_BOOLEAN]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_BOOLEAN])) { - $this->setValueBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_VALUE_BOOLEAN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_BOOLEAN])) { + $this->setValueBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_VALUE_BOOLEAN]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_BOOLEAN])) { + $this->setValueBoolean(new FHIRBoolean(array_merge($ext, $data[self::FIELD_VALUE_BOOLEAN]))); + } } else { $this->setValueBoolean(new FHIRBoolean($data[self::FIELD_VALUE_BOOLEAN])); } @@ -972,8 +999,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_CANONICAL] instanceof FHIRCanonical) { $this->setValueCanonical($data[self::FIELD_VALUE_CANONICAL]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_CANONICAL])) { - $this->setValueCanonical(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $data[self::FIELD_VALUE_CANONICAL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_CANONICAL])) { + $this->setValueCanonical(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $data[self::FIELD_VALUE_CANONICAL]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_CANONICAL])) { + $this->setValueCanonical(new FHIRCanonical(array_merge($ext, $data[self::FIELD_VALUE_CANONICAL]))); + } } else { $this->setValueCanonical(new FHIRCanonical($data[self::FIELD_VALUE_CANONICAL])); } @@ -984,8 +1015,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_CODE] instanceof FHIRCode) { $this->setValueCode($data[self::FIELD_VALUE_CODE]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_CODE])) { - $this->setValueCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_VALUE_CODE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_CODE])) { + $this->setValueCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_VALUE_CODE]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_CODE])) { + $this->setValueCode(new FHIRCode(array_merge($ext, $data[self::FIELD_VALUE_CODE]))); + } } else { $this->setValueCode(new FHIRCode($data[self::FIELD_VALUE_CODE])); } @@ -1017,8 +1052,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_CONTACT_POINT] instanceof FHIRContactPoint) { $this->setValueContactPoint($data[self::FIELD_VALUE_CONTACT_POINT]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_CONTACT_POINT])) { - $this->setValueContactPoint(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $data[self::FIELD_VALUE_CONTACT_POINT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_CONTACT_POINT])) { + $this->setValueContactPoint(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $data[self::FIELD_VALUE_CONTACT_POINT]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_CONTACT_POINT])) { + $this->setValueContactPoint(new FHIRContactPoint(array_merge($ext, $data[self::FIELD_VALUE_CONTACT_POINT]))); + } } else { $this->setValueContactPoint(new FHIRContactPoint($data[self::FIELD_VALUE_CONTACT_POINT])); } @@ -1031,8 +1070,17 @@ public function __construct($data = null) } } if (isset($data[self::FIELD_VALUE_COUNT])) { + $ext = (isset($data[self::FIELD_VALUE_COUNT_EXT]) && is_array($data[self::FIELD_VALUE_COUNT_EXT])) + ? $data[self::FIELD_VALUE_COUNT_EXT] + : null; if ($data[self::FIELD_VALUE_COUNT] instanceof FHIRCount) { $this->setValueCount($data[self::FIELD_VALUE_COUNT]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_COUNT])) { + $this->setValueCount(new FHIRCount([FHIRCount::FIELD_VALUE => $data[self::FIELD_VALUE_COUNT]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_COUNT])) { + $this->setValueCount(new FHIRCount(array_merge($ext, $data[self::FIELD_VALUE_COUNT]))); + } } else { $this->setValueCount(new FHIRCount($data[self::FIELD_VALUE_COUNT])); } @@ -1050,8 +1098,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_DATE] instanceof FHIRDate) { $this->setValueDate($data[self::FIELD_VALUE_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_DATE])) { - $this->setValueDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_VALUE_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_DATE])) { + $this->setValueDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_VALUE_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_DATE])) { + $this->setValueDate(new FHIRDate(array_merge($ext, $data[self::FIELD_VALUE_DATE]))); + } } else { $this->setValueDate(new FHIRDate($data[self::FIELD_VALUE_DATE])); } @@ -1062,8 +1114,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_DATE_TIME] instanceof FHIRDateTime) { $this->setValueDateTime($data[self::FIELD_VALUE_DATE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_DATE_TIME])) { - $this->setValueDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_VALUE_DATE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_DATE_TIME])) { + $this->setValueDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_VALUE_DATE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_DATE_TIME])) { + $this->setValueDateTime(new FHIRDateTime(array_merge($ext, $data[self::FIELD_VALUE_DATE_TIME]))); + } } else { $this->setValueDateTime(new FHIRDateTime($data[self::FIELD_VALUE_DATE_TIME])); } @@ -1074,15 +1130,28 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_DECIMAL] instanceof FHIRDecimal) { $this->setValueDecimal($data[self::FIELD_VALUE_DECIMAL]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_DECIMAL])) { - $this->setValueDecimal(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_VALUE_DECIMAL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_DECIMAL])) { + $this->setValueDecimal(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_VALUE_DECIMAL]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_DECIMAL])) { + $this->setValueDecimal(new FHIRDecimal(array_merge($ext, $data[self::FIELD_VALUE_DECIMAL]))); + } } else { $this->setValueDecimal(new FHIRDecimal($data[self::FIELD_VALUE_DECIMAL])); } } if (isset($data[self::FIELD_VALUE_DISTANCE])) { + $ext = (isset($data[self::FIELD_VALUE_DISTANCE_EXT]) && is_array($data[self::FIELD_VALUE_DISTANCE_EXT])) + ? $data[self::FIELD_VALUE_DISTANCE_EXT] + : null; if ($data[self::FIELD_VALUE_DISTANCE] instanceof FHIRDistance) { $this->setValueDistance($data[self::FIELD_VALUE_DISTANCE]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_DISTANCE])) { + $this->setValueDistance(new FHIRDistance([FHIRDistance::FIELD_VALUE => $data[self::FIELD_VALUE_DISTANCE]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_DISTANCE])) { + $this->setValueDistance(new FHIRDistance(array_merge($ext, $data[self::FIELD_VALUE_DISTANCE]))); + } } else { $this->setValueDistance(new FHIRDistance($data[self::FIELD_VALUE_DISTANCE])); } @@ -1095,8 +1164,17 @@ public function __construct($data = null) } } if (isset($data[self::FIELD_VALUE_DURATION])) { + $ext = (isset($data[self::FIELD_VALUE_DURATION_EXT]) && is_array($data[self::FIELD_VALUE_DURATION_EXT])) + ? $data[self::FIELD_VALUE_DURATION_EXT] + : null; if ($data[self::FIELD_VALUE_DURATION] instanceof FHIRDuration) { $this->setValueDuration($data[self::FIELD_VALUE_DURATION]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_DURATION])) { + $this->setValueDuration(new FHIRDuration([FHIRDuration::FIELD_VALUE => $data[self::FIELD_VALUE_DURATION]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_DURATION])) { + $this->setValueDuration(new FHIRDuration(array_merge($ext, $data[self::FIELD_VALUE_DURATION]))); + } } else { $this->setValueDuration(new FHIRDuration($data[self::FIELD_VALUE_DURATION])); } @@ -1121,8 +1199,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_ID] instanceof FHIRId) { $this->setValueId($data[self::FIELD_VALUE_ID]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_ID])) { - $this->setValueId(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_VALUE_ID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_ID])) { + $this->setValueId(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_VALUE_ID]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_ID])) { + $this->setValueId(new FHIRId(array_merge($ext, $data[self::FIELD_VALUE_ID]))); + } } else { $this->setValueId(new FHIRId($data[self::FIELD_VALUE_ID])); } @@ -1133,8 +1215,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_IDENTIFIER] instanceof FHIRIdentifier) { $this->setValueIdentifier($data[self::FIELD_VALUE_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_IDENTIFIER])) { - $this->setValueIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_VALUE_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_IDENTIFIER])) { + $this->setValueIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_VALUE_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_IDENTIFIER])) { + $this->setValueIdentifier(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_VALUE_IDENTIFIER]))); + } } else { $this->setValueIdentifier(new FHIRIdentifier($data[self::FIELD_VALUE_IDENTIFIER])); } @@ -1145,8 +1231,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_INSTANT] instanceof FHIRInstant) { $this->setValueInstant($data[self::FIELD_VALUE_INSTANT]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_INSTANT])) { - $this->setValueInstant(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_VALUE_INSTANT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_INSTANT])) { + $this->setValueInstant(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_VALUE_INSTANT]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_INSTANT])) { + $this->setValueInstant(new FHIRInstant(array_merge($ext, $data[self::FIELD_VALUE_INSTANT]))); + } } else { $this->setValueInstant(new FHIRInstant($data[self::FIELD_VALUE_INSTANT])); } @@ -1157,8 +1247,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_INTEGER] instanceof FHIRInteger) { $this->setValueInteger($data[self::FIELD_VALUE_INTEGER]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_INTEGER])) { - $this->setValueInteger(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_VALUE_INTEGER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_INTEGER])) { + $this->setValueInteger(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_VALUE_INTEGER]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_INTEGER])) { + $this->setValueInteger(new FHIRInteger(array_merge($ext, $data[self::FIELD_VALUE_INTEGER]))); + } } else { $this->setValueInteger(new FHIRInteger($data[self::FIELD_VALUE_INTEGER])); } @@ -1169,8 +1263,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_MARKDOWN] instanceof FHIRMarkdown) { $this->setValueMarkdown($data[self::FIELD_VALUE_MARKDOWN]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_MARKDOWN])) { - $this->setValueMarkdown(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_VALUE_MARKDOWN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_MARKDOWN])) { + $this->setValueMarkdown(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_VALUE_MARKDOWN]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_MARKDOWN])) { + $this->setValueMarkdown(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_VALUE_MARKDOWN]))); + } } else { $this->setValueMarkdown(new FHIRMarkdown($data[self::FIELD_VALUE_MARKDOWN])); } @@ -1188,8 +1286,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_MONEY] instanceof FHIRMoney) { $this->setValueMoney($data[self::FIELD_VALUE_MONEY]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_MONEY])) { - $this->setValueMoney(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_VALUE_MONEY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_MONEY])) { + $this->setValueMoney(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_VALUE_MONEY]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_MONEY])) { + $this->setValueMoney(new FHIRMoney(array_merge($ext, $data[self::FIELD_VALUE_MONEY]))); + } } else { $this->setValueMoney(new FHIRMoney($data[self::FIELD_VALUE_MONEY])); } @@ -1200,8 +1302,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_OID] instanceof FHIROid) { $this->setValueOid($data[self::FIELD_VALUE_OID]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_OID])) { - $this->setValueOid(new FHIROid([FHIROid::FIELD_VALUE => $data[self::FIELD_VALUE_OID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_OID])) { + $this->setValueOid(new FHIROid([FHIROid::FIELD_VALUE => $data[self::FIELD_VALUE_OID]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_OID])) { + $this->setValueOid(new FHIROid(array_merge($ext, $data[self::FIELD_VALUE_OID]))); + } } else { $this->setValueOid(new FHIROid($data[self::FIELD_VALUE_OID])); } @@ -1226,8 +1332,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_POSITIVE_INT] instanceof FHIRPositiveInt) { $this->setValuePositiveInt($data[self::FIELD_VALUE_POSITIVE_INT]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_POSITIVE_INT])) { - $this->setValuePositiveInt(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_VALUE_POSITIVE_INT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_POSITIVE_INT])) { + $this->setValuePositiveInt(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_VALUE_POSITIVE_INT]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_POSITIVE_INT])) { + $this->setValuePositiveInt(new FHIRPositiveInt(array_merge($ext, $data[self::FIELD_VALUE_POSITIVE_INT]))); + } } else { $this->setValuePositiveInt(new FHIRPositiveInt($data[self::FIELD_VALUE_POSITIVE_INT])); } @@ -1238,8 +1348,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_QUANTITY] instanceof FHIRQuantity) { $this->setValueQuantity($data[self::FIELD_VALUE_QUANTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_QUANTITY])) { - $this->setValueQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_VALUE_QUANTITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_QUANTITY])) { + $this->setValueQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_VALUE_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_QUANTITY])) { + $this->setValueQuantity(new FHIRQuantity(array_merge($ext, $data[self::FIELD_VALUE_QUANTITY]))); + } } else { $this->setValueQuantity(new FHIRQuantity($data[self::FIELD_VALUE_QUANTITY])); } @@ -1292,8 +1406,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_STRING] instanceof FHIRString) { $this->setValueString($data[self::FIELD_VALUE_STRING]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_STRING])) { - $this->setValueString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VALUE_STRING]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_STRING])) { + $this->setValueString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VALUE_STRING]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_STRING])) { + $this->setValueString(new FHIRString(array_merge($ext, $data[self::FIELD_VALUE_STRING]))); + } } else { $this->setValueString(new FHIRString($data[self::FIELD_VALUE_STRING])); } @@ -1304,8 +1422,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_TIME] instanceof FHIRTime) { $this->setValueTime($data[self::FIELD_VALUE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_TIME])) { - $this->setValueTime(new FHIRTime([FHIRTime::FIELD_VALUE => $data[self::FIELD_VALUE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_TIME])) { + $this->setValueTime(new FHIRTime([FHIRTime::FIELD_VALUE => $data[self::FIELD_VALUE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_TIME])) { + $this->setValueTime(new FHIRTime(array_merge($ext, $data[self::FIELD_VALUE_TIME]))); + } } else { $this->setValueTime(new FHIRTime($data[self::FIELD_VALUE_TIME])); } @@ -1330,8 +1452,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_UNSIGNED_INT] instanceof FHIRUnsignedInt) { $this->setValueUnsignedInt($data[self::FIELD_VALUE_UNSIGNED_INT]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_UNSIGNED_INT])) { - $this->setValueUnsignedInt(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_VALUE_UNSIGNED_INT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_UNSIGNED_INT])) { + $this->setValueUnsignedInt(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_VALUE_UNSIGNED_INT]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_UNSIGNED_INT])) { + $this->setValueUnsignedInt(new FHIRUnsignedInt(array_merge($ext, $data[self::FIELD_VALUE_UNSIGNED_INT]))); + } } else { $this->setValueUnsignedInt(new FHIRUnsignedInt($data[self::FIELD_VALUE_UNSIGNED_INT])); } @@ -1342,8 +1468,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_URI] instanceof FHIRUri) { $this->setValueUri($data[self::FIELD_VALUE_URI]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_URI])) { - $this->setValueUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_VALUE_URI]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_URI])) { + $this->setValueUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_VALUE_URI]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_URI])) { + $this->setValueUri(new FHIRUri(array_merge($ext, $data[self::FIELD_VALUE_URI]))); + } } else { $this->setValueUri(new FHIRUri($data[self::FIELD_VALUE_URI])); } @@ -1354,8 +1484,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_URL] instanceof FHIRUrl) { $this->setValueUrl($data[self::FIELD_VALUE_URL]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_URL])) { - $this->setValueUrl(new FHIRUrl([FHIRUrl::FIELD_VALUE => $data[self::FIELD_VALUE_URL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_URL])) { + $this->setValueUrl(new FHIRUrl([FHIRUrl::FIELD_VALUE => $data[self::FIELD_VALUE_URL]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_URL])) { + $this->setValueUrl(new FHIRUrl(array_merge($ext, $data[self::FIELD_VALUE_URL]))); + } } else { $this->setValueUrl(new FHIRUrl($data[self::FIELD_VALUE_URL])); } @@ -1373,8 +1507,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_UUID] instanceof FHIRUuid) { $this->setValueUuid($data[self::FIELD_VALUE_UUID]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_UUID])) { - $this->setValueUuid(new FHIRUuid([FHIRUuid::FIELD_VALUE => $data[self::FIELD_VALUE_UUID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_UUID])) { + $this->setValueUuid(new FHIRUuid([FHIRUuid::FIELD_VALUE => $data[self::FIELD_VALUE_UUID]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_UUID])) { + $this->setValueUuid(new FHIRUuid(array_merge($ext, $data[self::FIELD_VALUE_UUID]))); + } } else { $this->setValueUuid(new FHIRUuid($data[self::FIELD_VALUE_UUID])); } @@ -3585,7 +3723,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NAME, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getPart())) { foreach($vs as $v) { if (null === $v) { @@ -3599,19 +3736,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $tsxe = $sxe->addChild(self::FIELD_RESOURCE); $v->xmlSerialize($tsxe->addChild($v->_getFHIRTypeName(), null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueAddress())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_ADDRESS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueAge())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_AGE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueAnnotation())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_ANNOTATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueAttachment())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_ATTACHMENT, null, $v->_getFHIRXMLNamespace())); } @@ -3627,31 +3760,24 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getValueCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_CODE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueCoding())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_CODING, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueContactDetail())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_CONTACT_DETAIL, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueContactPoint())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_CONTACT_POINT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueContributor())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_CONTRIBUTOR, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueCount())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_COUNT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueDataRequirement())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_DATA_REQUIREMENT, null, $v->_getFHIRXMLNamespace())); } @@ -3664,30 +3790,24 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getValueDecimal())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_DECIMAL, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueDistance())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_DISTANCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueDosage())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_DOSAGE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueDuration())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_DURATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueExpression())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_EXPRESSION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueHumanName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_HUMAN_NAME, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getValueId())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_ID, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } @@ -3700,53 +3820,42 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getValueMarkdown())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_MARKDOWN, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueMeta())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_META, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueMoney())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_MONEY, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getValueOid())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_OID, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueParameterDefinition())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_PARAMETER_DEFINITION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValuePeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_PERIOD, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getValuePositiveInt())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_POSITIVE_INT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_QUANTITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueRange())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_RANGE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueRatio())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_RATIO, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_REFERENCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueRelatedArtifact())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_RELATED_ARTIFACT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueSampledData())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_SAMPLED_DATA, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueSignature())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_SIGNATURE, null, $v->_getFHIRXMLNamespace())); } @@ -3756,11 +3865,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getValueTime())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_TIME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueTiming())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_TIMING, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueTriggerDefinition())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_TRIGGER_DEFINITION, null, $v->_getFHIRXMLNamespace())); } @@ -3773,7 +3880,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getValueUrl())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_URL, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueUsageContext())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_USAGE_CONTEXT, null, $v->_getFHIRXMLNamespace())); } @@ -3790,8 +3896,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if ([] !== ($vs = $this->getPart())) { $a[self::FIELD_PART] = $vs; @@ -3803,7 +3916,15 @@ public function jsonSerialize() $a[self::FIELD_VALUE_ADDRESS] = $v; } if (null !== ($v = $this->getValueAge())) { - $a[self::FIELD_VALUE_AGE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_AGE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_AGE_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_AGE] = $v; + } } if (null !== ($v = $this->getValueAnnotation())) { $a[self::FIELD_VALUE_ANNOTATION] = $v; @@ -3812,20 +3933,48 @@ public function jsonSerialize() $a[self::FIELD_VALUE_ATTACHMENT] = $v; } if (null !== ($v = $this->getValueBase64Binary())) { - $a[self::FIELD_VALUE_BASE_64BINARY] = $v->getValue(); - $a[self::FIELD_VALUE_BASE_64BINARY_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_BASE_64BINARY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_BASE_64BINARY_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_BASE_64BINARY] = $v; + } } if (null !== ($v = $this->getValueBoolean())) { - $a[self::FIELD_VALUE_BOOLEAN] = $v->getValue(); - $a[self::FIELD_VALUE_BOOLEAN_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_BOOLEAN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_BOOLEAN_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_BOOLEAN] = $v; + } } if (null !== ($v = $this->getValueCanonical())) { - $a[self::FIELD_VALUE_CANONICAL] = $v->getValue(); - $a[self::FIELD_VALUE_CANONICAL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_CANONICAL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_CANONICAL_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_CANONICAL] = $v; + } } if (null !== ($v = $this->getValueCode())) { - $a[self::FIELD_VALUE_CODE] = $v->getValue(); - $a[self::FIELD_VALUE_CODE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_CODE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_CODE_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_CODE] = $v; + } } if (null !== ($v = $this->getValueCodeableConcept())) { $a[self::FIELD_VALUE_CODEABLE_CONCEPT] = $v; @@ -3837,37 +3986,90 @@ public function jsonSerialize() $a[self::FIELD_VALUE_CONTACT_DETAIL] = $v; } if (null !== ($v = $this->getValueContactPoint())) { - $a[self::FIELD_VALUE_CONTACT_POINT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_CONTACT_POINT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_CONTACT_POINT_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_CONTACT_POINT] = $v; + } } if (null !== ($v = $this->getValueContributor())) { $a[self::FIELD_VALUE_CONTRIBUTOR] = $v; } if (null !== ($v = $this->getValueCount())) { - $a[self::FIELD_VALUE_COUNT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_COUNT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_COUNT_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_COUNT] = $v; + } } if (null !== ($v = $this->getValueDataRequirement())) { $a[self::FIELD_VALUE_DATA_REQUIREMENT] = $v; } if (null !== ($v = $this->getValueDate())) { - $a[self::FIELD_VALUE_DATE] = $v->getValue(); - $a[self::FIELD_VALUE_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_DATE] = $v; + } } if (null !== ($v = $this->getValueDateTime())) { - $a[self::FIELD_VALUE_DATE_TIME] = $v->getValue(); - $a[self::FIELD_VALUE_DATE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_DATE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_DATE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_DATE_TIME] = $v; + } } if (null !== ($v = $this->getValueDecimal())) { - $a[self::FIELD_VALUE_DECIMAL] = $v->getValue(); - $a[self::FIELD_VALUE_DECIMAL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_DECIMAL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_DECIMAL_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_DECIMAL] = $v; + } } if (null !== ($v = $this->getValueDistance())) { - $a[self::FIELD_VALUE_DISTANCE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_DISTANCE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_DISTANCE_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_DISTANCE] = $v; + } } if (null !== ($v = $this->getValueDosage())) { $a[self::FIELD_VALUE_DOSAGE] = $v; } if (null !== ($v = $this->getValueDuration())) { - $a[self::FIELD_VALUE_DURATION] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_DURATION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_DURATION_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_DURATION] = $v; + } } if (null !== ($v = $this->getValueExpression())) { $a[self::FIELD_VALUE_EXPRESSION] = $v; @@ -3876,33 +4078,84 @@ public function jsonSerialize() $a[self::FIELD_VALUE_HUMAN_NAME] = $v; } if (null !== ($v = $this->getValueId())) { - $a[self::FIELD_VALUE_ID] = $v->getValue(); - $a[self::FIELD_VALUE_ID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_ID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_ID_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_ID] = $v; + } } if (null !== ($v = $this->getValueIdentifier())) { - $a[self::FIELD_VALUE_IDENTIFIER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_IDENTIFIER] = $v; + } } if (null !== ($v = $this->getValueInstant())) { - $a[self::FIELD_VALUE_INSTANT] = $v->getValue(); - $a[self::FIELD_VALUE_INSTANT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_INSTANT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_INSTANT_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_INSTANT] = $v; + } } if (null !== ($v = $this->getValueInteger())) { - $a[self::FIELD_VALUE_INTEGER] = $v->getValue(); - $a[self::FIELD_VALUE_INTEGER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_INTEGER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_INTEGER_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_INTEGER] = $v; + } } if (null !== ($v = $this->getValueMarkdown())) { - $a[self::FIELD_VALUE_MARKDOWN] = $v->getValue(); - $a[self::FIELD_VALUE_MARKDOWN_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_MARKDOWN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_MARKDOWN_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_MARKDOWN] = $v; + } } if (null !== ($v = $this->getValueMeta())) { $a[self::FIELD_VALUE_META] = $v; } if (null !== ($v = $this->getValueMoney())) { - $a[self::FIELD_VALUE_MONEY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_MONEY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_MONEY_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_MONEY] = $v; + } } if (null !== ($v = $this->getValueOid())) { - $a[self::FIELD_VALUE_OID] = $v->getValue(); - $a[self::FIELD_VALUE_OID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_OID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_OID_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_OID] = $v; + } } if (null !== ($v = $this->getValueParameterDefinition())) { $a[self::FIELD_VALUE_PARAMETER_DEFINITION] = $v; @@ -3911,11 +4164,26 @@ public function jsonSerialize() $a[self::FIELD_VALUE_PERIOD] = $v; } if (null !== ($v = $this->getValuePositiveInt())) { - $a[self::FIELD_VALUE_POSITIVE_INT] = $v->getValue(); - $a[self::FIELD_VALUE_POSITIVE_INT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_POSITIVE_INT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_POSITIVE_INT_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_POSITIVE_INT] = $v; + } } if (null !== ($v = $this->getValueQuantity())) { - $a[self::FIELD_VALUE_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_QUANTITY] = $v; + } } if (null !== ($v = $this->getValueRange())) { $a[self::FIELD_VALUE_RANGE] = $v; @@ -3936,12 +4204,26 @@ public function jsonSerialize() $a[self::FIELD_VALUE_SIGNATURE] = $v; } if (null !== ($v = $this->getValueString())) { - $a[self::FIELD_VALUE_STRING] = $v->getValue(); - $a[self::FIELD_VALUE_STRING_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_STRING] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_STRING_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_STRING] = $v; + } } if (null !== ($v = $this->getValueTime())) { - $a[self::FIELD_VALUE_TIME] = $v->getValue(); - $a[self::FIELD_VALUE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_TIME] = $v; + } } if (null !== ($v = $this->getValueTiming())) { $a[self::FIELD_VALUE_TIMING] = $v; @@ -3950,23 +4232,51 @@ public function jsonSerialize() $a[self::FIELD_VALUE_TRIGGER_DEFINITION] = $v; } if (null !== ($v = $this->getValueUnsignedInt())) { - $a[self::FIELD_VALUE_UNSIGNED_INT] = $v->getValue(); - $a[self::FIELD_VALUE_UNSIGNED_INT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_UNSIGNED_INT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_UNSIGNED_INT_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_UNSIGNED_INT] = $v; + } } if (null !== ($v = $this->getValueUri())) { - $a[self::FIELD_VALUE_URI] = $v->getValue(); - $a[self::FIELD_VALUE_URI_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_URI] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_URI_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_URI] = $v; + } } if (null !== ($v = $this->getValueUrl())) { - $a[self::FIELD_VALUE_URL] = $v->getValue(); - $a[self::FIELD_VALUE_URL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_URL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_URL_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_URL] = $v; + } } if (null !== ($v = $this->getValueUsageContext())) { $a[self::FIELD_VALUE_USAGE_CONTEXT] = $v; } if (null !== ($v = $this->getValueUuid())) { - $a[self::FIELD_VALUE_UUID] = $v->getValue(); - $a[self::FIELD_VALUE_UUID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_UUID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_UUID_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_UUID] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRPatient/FHIRPatientCommunication.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRPatient/FHIRPatientCommunication.php index 13e027e559..3c78c47106 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRPatient/FHIRPatientCommunication.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRPatient/FHIRPatientCommunication.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRPatientCommunication extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_PATIENT_DOT_COMMUNICATION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_LANGUAGE = 'language'; const FIELD_PREFERRED = 'preferred'; const FIELD_PREFERRED_EXT = '_preferred'; @@ -113,6 +109,9 @@ class FHIRPatientCommunication extends FHIRBackboneElement */ protected $preferred = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRPatientCommunication Constructor * @param null|array $data @@ -142,8 +141,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PREFERRED] instanceof FHIRBoolean) { $this->setPreferred($data[self::FIELD_PREFERRED]); - } elseif ($ext && is_scalar($data[self::FIELD_PREFERRED])) { - $this->setPreferred(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_PREFERRED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PREFERRED])) { + $this->setPreferred(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_PREFERRED]] + $ext)); + } else if (is_array($data[self::FIELD_PREFERRED])) { + $this->setPreferred(new FHIRBoolean(array_merge($ext, $data[self::FIELD_PREFERRED]))); + } } else { $this->setPreferred(new FHIRBoolean($data[self::FIELD_PREFERRED])); } @@ -334,7 +337,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getLanguage())) { $v->xmlSerialize($sxe->addChild(self::FIELD_LANGUAGE, null, $v->_getFHIRXMLNamespace())); } @@ -354,8 +356,15 @@ public function jsonSerialize() $a[self::FIELD_LANGUAGE] = $v; } if (null !== ($v = $this->getPreferred())) { - $a[self::FIELD_PREFERRED] = $v->getValue(); - $a[self::FIELD_PREFERRED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PREFERRED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PREFERRED_EXT] = $enc; + } + } else { + $a[self::FIELD_PREFERRED] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRPatient/FHIRPatientContact.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRPatient/FHIRPatientContact.php index e5ed1eb775..255f5424ab 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRPatient/FHIRPatientContact.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRPatient/FHIRPatientContact.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -84,10 +84,6 @@ class FHIRPatientContact extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_PATIENT_DOT_CONTACT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ADDRESS = 'address'; const FIELD_GENDER = 'gender'; const FIELD_GENDER_EXT = '_gender'; @@ -182,6 +178,9 @@ class FHIRPatientContact extends FHIRBackboneElement */ protected $telecom = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRPatientContact Constructor * @param null|array $data @@ -211,8 +210,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_GENDER] instanceof FHIRAdministrativeGender) { $this->setGender($data[self::FIELD_GENDER]); - } elseif ($ext && is_scalar($data[self::FIELD_GENDER])) { - $this->setGender(new FHIRAdministrativeGender([FHIRAdministrativeGender::FIELD_VALUE => $data[self::FIELD_GENDER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_GENDER])) { + $this->setGender(new FHIRAdministrativeGender([FHIRAdministrativeGender::FIELD_VALUE => $data[self::FIELD_GENDER]] + $ext)); + } else if (is_array($data[self::FIELD_GENDER])) { + $this->setGender(new FHIRAdministrativeGender(array_merge($ext, $data[self::FIELD_GENDER]))); + } } else { $this->setGender(new FHIRAdministrativeGender($data[self::FIELD_GENDER])); } @@ -241,6 +244,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_RELATIONSHIP])) { if (is_array($data[self::FIELD_RELATIONSHIP])) { foreach($data[self::FIELD_RELATIONSHIP] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addRelationship($v); } else { @@ -259,17 +265,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_TELECOM])) { foreach($data[self::FIELD_TELECOM] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContactPoint) { $this->addTelecom($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addTelecom(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addTelecom(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addTelecom(new FHIRContactPoint(array_merge($v, $ext[$i]))); + } } else { $this->addTelecom(new FHIRContactPoint($v)); } } } elseif ($data[self::FIELD_TELECOM] instanceof FHIRContactPoint) { $this->addTelecom($data[self::FIELD_TELECOM]); - } elseif ($ext && is_scalar($data[self::FIELD_TELECOM])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_TELECOM])) { $this->addTelecom(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $data[self::FIELD_TELECOM]] + $ext)); } else { $this->addTelecom(new FHIRContactPoint($data[self::FIELD_TELECOM])); @@ -679,27 +692,21 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getAddress())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ADDRESS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getGender())) { $v->xmlSerialize($sxe->addChild(self::FIELD_GENDER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NAME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOrganization())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ORGANIZATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getRelationship())) { foreach($vs as $v) { if (null === $v) { @@ -717,6 +724,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_TELECOM, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } @@ -730,7 +738,15 @@ public function jsonSerialize() $a[self::FIELD_ADDRESS] = $v; } if (null !== ($v = $this->getGender())) { - $a[self::FIELD_GENDER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_GENDER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_GENDER_EXT] = $enc; + } + } else { + $a[self::FIELD_GENDER] = $v; + } } if (null !== ($v = $this->getName())) { $a[self::FIELD_NAME] = $v; @@ -745,7 +761,23 @@ public function jsonSerialize() $a[self::FIELD_RELATIONSHIP] = $vs; } if ([] !== ($vs = $this->getTelecom())) { - $a[self::FIELD_TELECOM] = $vs; + $a[self::FIELD_TELECOM] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TELECOM][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TELECOM_EXT][] = $enc; + } else { + $a[self::FIELD_TELECOM_EXT][] = null; + } + } else { + $a[self::FIELD_TELECOM][] = $v; + } + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRPatient/FHIRPatientLink.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRPatient/FHIRPatientLink.php index cb218f0a32..e3f0884912 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRPatient/FHIRPatientLink.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRPatient/FHIRPatientLink.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRPatientLink extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_PATIENT_DOT_LINK; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_OTHER = 'other'; const FIELD_TYPE = 'type'; const FIELD_TYPE_EXT = '_type'; @@ -108,6 +104,9 @@ class FHIRPatientLink extends FHIRBackboneElement */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRPatientLink Constructor * @param null|array $data @@ -137,8 +136,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TYPE] instanceof FHIRLinkType) { $this->setType($data[self::FIELD_TYPE]); - } elseif ($ext && is_scalar($data[self::FIELD_TYPE])) { - $this->setType(new FHIRLinkType([FHIRLinkType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TYPE])) { + $this->setType(new FHIRLinkType([FHIRLinkType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } else if (is_array($data[self::FIELD_TYPE])) { + $this->setType(new FHIRLinkType(array_merge($ext, $data[self::FIELD_TYPE]))); + } } else { $this->setType(new FHIRLinkType($data[self::FIELD_TYPE])); } @@ -308,11 +311,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getOther())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OTHER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -329,7 +330,15 @@ public function jsonSerialize() $a[self::FIELD_OTHER] = $v; } if (null !== ($v = $this->getType())) { - $a[self::FIELD_TYPE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TYPE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TYPE_EXT] = $enc; + } + } else { + $a[self::FIELD_TYPE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRPaymentReconciliation/FHIRPaymentReconciliationDetail.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRPaymentReconciliation/FHIRPaymentReconciliationDetail.php index 78f288cf49..5003964ab2 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRPaymentReconciliation/FHIRPaymentReconciliationDetail.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRPaymentReconciliation/FHIRPaymentReconciliationDetail.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -82,10 +82,6 @@ class FHIRPaymentReconciliationDetail extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_PAYMENT_RECONCILIATION_DOT_DETAIL; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_AMOUNT = 'amount'; const FIELD_AMOUNT_EXT = '_amount'; const FIELD_DATE = 'date'; @@ -216,6 +212,9 @@ class FHIRPaymentReconciliationDetail extends FHIRBackboneElement */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRPaymentReconciliationDetail Constructor * @param null|array $data @@ -238,8 +237,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_AMOUNT] instanceof FHIRMoney) { $this->setAmount($data[self::FIELD_AMOUNT]); - } elseif ($ext && is_scalar($data[self::FIELD_AMOUNT])) { - $this->setAmount(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_AMOUNT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_AMOUNT])) { + $this->setAmount(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_AMOUNT]] + $ext)); + } else if (is_array($data[self::FIELD_AMOUNT])) { + $this->setAmount(new FHIRMoney(array_merge($ext, $data[self::FIELD_AMOUNT]))); + } } else { $this->setAmount(new FHIRMoney($data[self::FIELD_AMOUNT])); } @@ -250,8 +253,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATE] instanceof FHIRDate) { $this->setDate($data[self::FIELD_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_DATE])) { - $this->setDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDate(array_merge($ext, $data[self::FIELD_DATE]))); + } } else { $this->setDate(new FHIRDate($data[self::FIELD_DATE])); } @@ -262,8 +269,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->setIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { - $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_IDENTIFIER]))); + } } else { $this->setIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); } @@ -281,8 +292,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PREDECESSOR] instanceof FHIRIdentifier) { $this->setPredecessor($data[self::FIELD_PREDECESSOR]); - } elseif ($ext && is_scalar($data[self::FIELD_PREDECESSOR])) { - $this->setPredecessor(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_PREDECESSOR]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PREDECESSOR])) { + $this->setPredecessor(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_PREDECESSOR]] + $ext)); + } else if (is_array($data[self::FIELD_PREDECESSOR])) { + $this->setPredecessor(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_PREDECESSOR]))); + } } else { $this->setPredecessor(new FHIRIdentifier($data[self::FIELD_PREDECESSOR])); } @@ -774,42 +789,33 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getAmount())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AMOUNT, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DATE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPayee())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PAYEE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPredecessor())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PREDECESSOR, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRequest())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REQUEST, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getResponse())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RESPONSE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getResponsible())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RESPONSIBLE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSubmitter())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBMITTER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -823,20 +829,51 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getAmount())) { - $a[self::FIELD_AMOUNT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_AMOUNT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_AMOUNT_EXT] = $enc; + } + } else { + $a[self::FIELD_AMOUNT] = $v; + } } if (null !== ($v = $this->getDate())) { - $a[self::FIELD_DATE] = $v->getValue(); - $a[self::FIELD_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_DATE] = $v; + } } if (null !== ($v = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_IDENTIFIER] = $v; + } } if (null !== ($v = $this->getPayee())) { $a[self::FIELD_PAYEE] = $v; } if (null !== ($v = $this->getPredecessor())) { - $a[self::FIELD_PREDECESSOR] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PREDECESSOR] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PREDECESSOR_EXT] = $enc; + } + } else { + $a[self::FIELD_PREDECESSOR] = $v; + } } if (null !== ($v = $this->getRequest())) { $a[self::FIELD_REQUEST] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRPaymentReconciliation/FHIRPaymentReconciliationProcessNote.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRPaymentReconciliation/FHIRPaymentReconciliationProcessNote.php index 0043926c6f..87d301c370 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRPaymentReconciliation/FHIRPaymentReconciliationProcessNote.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRPaymentReconciliation/FHIRPaymentReconciliationProcessNote.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRPaymentReconciliationProcessNote extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_PAYMENT_RECONCILIATION_DOT_PROCESS_NOTE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_TEXT = 'text'; const FIELD_TEXT_EXT = '_text'; const FIELD_TYPE = 'type'; @@ -108,6 +104,9 @@ class FHIRPaymentReconciliationProcessNote extends FHIRBackboneElement */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRPaymentReconciliationProcessNote Constructor * @param null|array $data @@ -130,8 +129,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TEXT] instanceof FHIRString) { $this->setText($data[self::FIELD_TEXT]); - } elseif ($ext && is_scalar($data[self::FIELD_TEXT])) { - $this->setText(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TEXT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TEXT])) { + $this->setText(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TEXT]] + $ext)); + } else if (is_array($data[self::FIELD_TEXT])) { + $this->setText(new FHIRString(array_merge($ext, $data[self::FIELD_TEXT]))); + } } else { $this->setText(new FHIRString($data[self::FIELD_TEXT])); } @@ -142,8 +145,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TYPE] instanceof FHIRNoteType) { $this->setType($data[self::FIELD_TYPE]); - } elseif ($ext && is_scalar($data[self::FIELD_TYPE])) { - $this->setType(new FHIRNoteType([FHIRNoteType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TYPE])) { + $this->setType(new FHIRNoteType([FHIRNoteType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } else if (is_array($data[self::FIELD_TYPE])) { + $this->setType(new FHIRNoteType(array_merge($ext, $data[self::FIELD_TYPE]))); + } } else { $this->setType(new FHIRNoteType($data[self::FIELD_TYPE])); } @@ -325,7 +332,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getText())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TEXT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -339,11 +345,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getText())) { - $a[self::FIELD_TEXT] = $v->getValue(); - $a[self::FIELD_TEXT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TEXT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TEXT_EXT] = $enc; + } + } else { + $a[self::FIELD_TEXT] = $v; + } } if (null !== ($v = $this->getType())) { - $a[self::FIELD_TYPE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TYPE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TYPE_EXT] = $enc; + } + } else { + $a[self::FIELD_TYPE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRPerson/FHIRPersonLink.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRPerson/FHIRPersonLink.php index 8eb09cbfb5..7d6d191fce 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRPerson/FHIRPersonLink.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRPerson/FHIRPersonLink.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRPersonLink extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_PERSON_DOT_LINK; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ASSURANCE = 'assurance'; const FIELD_ASSURANCE_EXT = '_assurance'; const FIELD_TARGET = 'target'; @@ -109,6 +105,9 @@ class FHIRPersonLink extends FHIRBackboneElement */ protected $target = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRPersonLink Constructor * @param null|array $data @@ -131,8 +130,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ASSURANCE] instanceof FHIRIdentityAssuranceLevel) { $this->setAssurance($data[self::FIELD_ASSURANCE]); - } elseif ($ext && is_scalar($data[self::FIELD_ASSURANCE])) { - $this->setAssurance(new FHIRIdentityAssuranceLevel([FHIRIdentityAssuranceLevel::FIELD_VALUE => $data[self::FIELD_ASSURANCE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ASSURANCE])) { + $this->setAssurance(new FHIRIdentityAssuranceLevel([FHIRIdentityAssuranceLevel::FIELD_VALUE => $data[self::FIELD_ASSURANCE]] + $ext)); + } else if (is_array($data[self::FIELD_ASSURANCE])) { + $this->setAssurance(new FHIRIdentityAssuranceLevel(array_merge($ext, $data[self::FIELD_ASSURANCE]))); + } } else { $this->setAssurance(new FHIRIdentityAssuranceLevel($data[self::FIELD_ASSURANCE])); } @@ -311,11 +314,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getAssurance())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ASSURANCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getTarget())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TARGET, null, $v->_getFHIRXMLNamespace())); } @@ -329,7 +330,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getAssurance())) { - $a[self::FIELD_ASSURANCE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ASSURANCE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ASSURANCE_EXT] = $enc; + } + } else { + $a[self::FIELD_ASSURANCE] = $v; + } } if (null !== ($v = $this->getTarget())) { $a[self::FIELD_TARGET] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRPlanDefinition/FHIRPlanDefinitionAction.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRPlanDefinition/FHIRPlanDefinitionAction.php index 324bc2e640..751d4f7dca 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRPlanDefinition/FHIRPlanDefinitionAction.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRPlanDefinition/FHIRPlanDefinitionAction.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -100,10 +100,6 @@ class FHIRPlanDefinitionAction extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_PLAN_DEFINITION_DOT_ACTION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ACTION = 'action'; const FIELD_CARDINALITY_BEHAVIOR = 'cardinalityBehavior'; const FIELD_CARDINALITY_BEHAVIOR_EXT = '_cardinalityBehavior'; @@ -141,9 +137,11 @@ class FHIRPlanDefinitionAction extends FHIRBackboneElement const FIELD_TEXT_EQUIVALENT = 'textEquivalent'; const FIELD_TEXT_EQUIVALENT_EXT = '_textEquivalent'; const FIELD_TIMING_AGE = 'timingAge'; + const FIELD_TIMING_AGE_EXT = '_timingAge'; const FIELD_TIMING_DATE_TIME = 'timingDateTime'; const FIELD_TIMING_DATE_TIME_EXT = '_timingDateTime'; const FIELD_TIMING_DURATION = 'timingDuration'; + const FIELD_TIMING_DURATION_EXT = '_timingDuration'; const FIELD_TIMING_PERIOD = 'timingPeriod'; const FIELD_TIMING_RANGE = 'timingRange'; const FIELD_TIMING_TIMING = 'timingTiming'; @@ -578,6 +576,9 @@ class FHIRPlanDefinitionAction extends FHIRBackboneElement */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRPlanDefinitionAction Constructor * @param null|array $data @@ -597,6 +598,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ACTION])) { if (is_array($data[self::FIELD_ACTION])) { foreach($data[self::FIELD_ACTION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRPlanDefinitionAction) { $this->addAction($v); } else { @@ -615,8 +619,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CARDINALITY_BEHAVIOR] instanceof FHIRActionCardinalityBehavior) { $this->setCardinalityBehavior($data[self::FIELD_CARDINALITY_BEHAVIOR]); - } elseif ($ext && is_scalar($data[self::FIELD_CARDINALITY_BEHAVIOR])) { - $this->setCardinalityBehavior(new FHIRActionCardinalityBehavior([FHIRActionCardinalityBehavior::FIELD_VALUE => $data[self::FIELD_CARDINALITY_BEHAVIOR]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CARDINALITY_BEHAVIOR])) { + $this->setCardinalityBehavior(new FHIRActionCardinalityBehavior([FHIRActionCardinalityBehavior::FIELD_VALUE => $data[self::FIELD_CARDINALITY_BEHAVIOR]] + $ext)); + } else if (is_array($data[self::FIELD_CARDINALITY_BEHAVIOR])) { + $this->setCardinalityBehavior(new FHIRActionCardinalityBehavior(array_merge($ext, $data[self::FIELD_CARDINALITY_BEHAVIOR]))); + } } else { $this->setCardinalityBehavior(new FHIRActionCardinalityBehavior($data[self::FIELD_CARDINALITY_BEHAVIOR])); } @@ -624,6 +632,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CODE])) { if (is_array($data[self::FIELD_CODE])) { foreach($data[self::FIELD_CODE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addCode($v); } else { @@ -639,6 +650,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CONDITION])) { if (is_array($data[self::FIELD_CONDITION])) { foreach($data[self::FIELD_CONDITION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRPlanDefinitionCondition) { $this->addCondition($v); } else { @@ -657,8 +671,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DEFINITION_CANONICAL] instanceof FHIRCanonical) { $this->setDefinitionCanonical($data[self::FIELD_DEFINITION_CANONICAL]); - } elseif ($ext && is_scalar($data[self::FIELD_DEFINITION_CANONICAL])) { - $this->setDefinitionCanonical(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $data[self::FIELD_DEFINITION_CANONICAL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DEFINITION_CANONICAL])) { + $this->setDefinitionCanonical(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $data[self::FIELD_DEFINITION_CANONICAL]] + $ext)); + } else if (is_array($data[self::FIELD_DEFINITION_CANONICAL])) { + $this->setDefinitionCanonical(new FHIRCanonical(array_merge($ext, $data[self::FIELD_DEFINITION_CANONICAL]))); + } } else { $this->setDefinitionCanonical(new FHIRCanonical($data[self::FIELD_DEFINITION_CANONICAL])); } @@ -669,8 +687,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DEFINITION_URI] instanceof FHIRUri) { $this->setDefinitionUri($data[self::FIELD_DEFINITION_URI]); - } elseif ($ext && is_scalar($data[self::FIELD_DEFINITION_URI])) { - $this->setDefinitionUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_DEFINITION_URI]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DEFINITION_URI])) { + $this->setDefinitionUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_DEFINITION_URI]] + $ext)); + } else if (is_array($data[self::FIELD_DEFINITION_URI])) { + $this->setDefinitionUri(new FHIRUri(array_merge($ext, $data[self::FIELD_DEFINITION_URI]))); + } } else { $this->setDefinitionUri(new FHIRUri($data[self::FIELD_DEFINITION_URI])); } @@ -681,8 +703,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -690,6 +716,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_DOCUMENTATION])) { if (is_array($data[self::FIELD_DOCUMENTATION])) { foreach($data[self::FIELD_DOCUMENTATION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRRelatedArtifact) { $this->addDocumentation($v); } else { @@ -705,6 +734,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_DYNAMIC_VALUE])) { if (is_array($data[self::FIELD_DYNAMIC_VALUE])) { foreach($data[self::FIELD_DYNAMIC_VALUE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRPlanDefinitionDynamicValue) { $this->addDynamicValue($v); } else { @@ -723,17 +755,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_GOAL_ID])) { foreach($data[self::FIELD_GOAL_ID] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRId) { $this->addGoalId($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addGoalId(new FHIRId([FHIRId::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addGoalId(new FHIRId([FHIRId::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addGoalId(new FHIRId(array_merge($v, $ext[$i]))); + } } else { $this->addGoalId(new FHIRId($v)); } } } elseif ($data[self::FIELD_GOAL_ID] instanceof FHIRId) { $this->addGoalId($data[self::FIELD_GOAL_ID]); - } elseif ($ext && is_scalar($data[self::FIELD_GOAL_ID])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_GOAL_ID])) { $this->addGoalId(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_GOAL_ID]] + $ext)); } else { $this->addGoalId(new FHIRId($data[self::FIELD_GOAL_ID])); @@ -745,8 +784,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_GROUPING_BEHAVIOR] instanceof FHIRActionGroupingBehavior) { $this->setGroupingBehavior($data[self::FIELD_GROUPING_BEHAVIOR]); - } elseif ($ext && is_scalar($data[self::FIELD_GROUPING_BEHAVIOR])) { - $this->setGroupingBehavior(new FHIRActionGroupingBehavior([FHIRActionGroupingBehavior::FIELD_VALUE => $data[self::FIELD_GROUPING_BEHAVIOR]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_GROUPING_BEHAVIOR])) { + $this->setGroupingBehavior(new FHIRActionGroupingBehavior([FHIRActionGroupingBehavior::FIELD_VALUE => $data[self::FIELD_GROUPING_BEHAVIOR]] + $ext)); + } else if (is_array($data[self::FIELD_GROUPING_BEHAVIOR])) { + $this->setGroupingBehavior(new FHIRActionGroupingBehavior(array_merge($ext, $data[self::FIELD_GROUPING_BEHAVIOR]))); + } } else { $this->setGroupingBehavior(new FHIRActionGroupingBehavior($data[self::FIELD_GROUPING_BEHAVIOR])); } @@ -754,6 +797,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_INPUT])) { if (is_array($data[self::FIELD_INPUT])) { foreach($data[self::FIELD_INPUT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRDataRequirement) { $this->addInput($v); } else { @@ -769,6 +815,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_OUTPUT])) { if (is_array($data[self::FIELD_OUTPUT])) { foreach($data[self::FIELD_OUTPUT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRDataRequirement) { $this->addOutput($v); } else { @@ -784,6 +833,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PARTICIPANT])) { if (is_array($data[self::FIELD_PARTICIPANT])) { foreach($data[self::FIELD_PARTICIPANT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRPlanDefinitionParticipant) { $this->addParticipant($v); } else { @@ -802,8 +854,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PRECHECK_BEHAVIOR] instanceof FHIRActionPrecheckBehavior) { $this->setPrecheckBehavior($data[self::FIELD_PRECHECK_BEHAVIOR]); - } elseif ($ext && is_scalar($data[self::FIELD_PRECHECK_BEHAVIOR])) { - $this->setPrecheckBehavior(new FHIRActionPrecheckBehavior([FHIRActionPrecheckBehavior::FIELD_VALUE => $data[self::FIELD_PRECHECK_BEHAVIOR]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PRECHECK_BEHAVIOR])) { + $this->setPrecheckBehavior(new FHIRActionPrecheckBehavior([FHIRActionPrecheckBehavior::FIELD_VALUE => $data[self::FIELD_PRECHECK_BEHAVIOR]] + $ext)); + } else if (is_array($data[self::FIELD_PRECHECK_BEHAVIOR])) { + $this->setPrecheckBehavior(new FHIRActionPrecheckBehavior(array_merge($ext, $data[self::FIELD_PRECHECK_BEHAVIOR]))); + } } else { $this->setPrecheckBehavior(new FHIRActionPrecheckBehavior($data[self::FIELD_PRECHECK_BEHAVIOR])); } @@ -814,8 +870,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PREFIX] instanceof FHIRString) { $this->setPrefix($data[self::FIELD_PREFIX]); - } elseif ($ext && is_scalar($data[self::FIELD_PREFIX])) { - $this->setPrefix(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PREFIX]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PREFIX])) { + $this->setPrefix(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PREFIX]] + $ext)); + } else if (is_array($data[self::FIELD_PREFIX])) { + $this->setPrefix(new FHIRString(array_merge($ext, $data[self::FIELD_PREFIX]))); + } } else { $this->setPrefix(new FHIRString($data[self::FIELD_PREFIX])); } @@ -826,8 +886,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PRIORITY] instanceof FHIRRequestPriority) { $this->setPriority($data[self::FIELD_PRIORITY]); - } elseif ($ext && is_scalar($data[self::FIELD_PRIORITY])) { - $this->setPriority(new FHIRRequestPriority([FHIRRequestPriority::FIELD_VALUE => $data[self::FIELD_PRIORITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PRIORITY])) { + $this->setPriority(new FHIRRequestPriority([FHIRRequestPriority::FIELD_VALUE => $data[self::FIELD_PRIORITY]] + $ext)); + } else if (is_array($data[self::FIELD_PRIORITY])) { + $this->setPriority(new FHIRRequestPriority(array_merge($ext, $data[self::FIELD_PRIORITY]))); + } } else { $this->setPriority(new FHIRRequestPriority($data[self::FIELD_PRIORITY])); } @@ -835,6 +899,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REASON])) { if (is_array($data[self::FIELD_REASON])) { foreach($data[self::FIELD_REASON] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addReason($v); } else { @@ -850,6 +917,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_RELATED_ACTION])) { if (is_array($data[self::FIELD_RELATED_ACTION])) { foreach($data[self::FIELD_RELATED_ACTION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRPlanDefinitionRelatedAction) { $this->addRelatedAction($v); } else { @@ -868,8 +938,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_REQUIRED_BEHAVIOR] instanceof FHIRActionRequiredBehavior) { $this->setRequiredBehavior($data[self::FIELD_REQUIRED_BEHAVIOR]); - } elseif ($ext && is_scalar($data[self::FIELD_REQUIRED_BEHAVIOR])) { - $this->setRequiredBehavior(new FHIRActionRequiredBehavior([FHIRActionRequiredBehavior::FIELD_VALUE => $data[self::FIELD_REQUIRED_BEHAVIOR]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_REQUIRED_BEHAVIOR])) { + $this->setRequiredBehavior(new FHIRActionRequiredBehavior([FHIRActionRequiredBehavior::FIELD_VALUE => $data[self::FIELD_REQUIRED_BEHAVIOR]] + $ext)); + } else if (is_array($data[self::FIELD_REQUIRED_BEHAVIOR])) { + $this->setRequiredBehavior(new FHIRActionRequiredBehavior(array_merge($ext, $data[self::FIELD_REQUIRED_BEHAVIOR]))); + } } else { $this->setRequiredBehavior(new FHIRActionRequiredBehavior($data[self::FIELD_REQUIRED_BEHAVIOR])); } @@ -880,8 +954,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SELECTION_BEHAVIOR] instanceof FHIRActionSelectionBehavior) { $this->setSelectionBehavior($data[self::FIELD_SELECTION_BEHAVIOR]); - } elseif ($ext && is_scalar($data[self::FIELD_SELECTION_BEHAVIOR])) { - $this->setSelectionBehavior(new FHIRActionSelectionBehavior([FHIRActionSelectionBehavior::FIELD_VALUE => $data[self::FIELD_SELECTION_BEHAVIOR]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SELECTION_BEHAVIOR])) { + $this->setSelectionBehavior(new FHIRActionSelectionBehavior([FHIRActionSelectionBehavior::FIELD_VALUE => $data[self::FIELD_SELECTION_BEHAVIOR]] + $ext)); + } else if (is_array($data[self::FIELD_SELECTION_BEHAVIOR])) { + $this->setSelectionBehavior(new FHIRActionSelectionBehavior(array_merge($ext, $data[self::FIELD_SELECTION_BEHAVIOR]))); + } } else { $this->setSelectionBehavior(new FHIRActionSelectionBehavior($data[self::FIELD_SELECTION_BEHAVIOR])); } @@ -906,15 +984,28 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TEXT_EQUIVALENT] instanceof FHIRString) { $this->setTextEquivalent($data[self::FIELD_TEXT_EQUIVALENT]); - } elseif ($ext && is_scalar($data[self::FIELD_TEXT_EQUIVALENT])) { - $this->setTextEquivalent(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TEXT_EQUIVALENT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TEXT_EQUIVALENT])) { + $this->setTextEquivalent(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TEXT_EQUIVALENT]] + $ext)); + } else if (is_array($data[self::FIELD_TEXT_EQUIVALENT])) { + $this->setTextEquivalent(new FHIRString(array_merge($ext, $data[self::FIELD_TEXT_EQUIVALENT]))); + } } else { $this->setTextEquivalent(new FHIRString($data[self::FIELD_TEXT_EQUIVALENT])); } } if (isset($data[self::FIELD_TIMING_AGE])) { + $ext = (isset($data[self::FIELD_TIMING_AGE_EXT]) && is_array($data[self::FIELD_TIMING_AGE_EXT])) + ? $data[self::FIELD_TIMING_AGE_EXT] + : null; if ($data[self::FIELD_TIMING_AGE] instanceof FHIRAge) { $this->setTimingAge($data[self::FIELD_TIMING_AGE]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TIMING_AGE])) { + $this->setTimingAge(new FHIRAge([FHIRAge::FIELD_VALUE => $data[self::FIELD_TIMING_AGE]] + $ext)); + } else if (is_array($data[self::FIELD_TIMING_AGE])) { + $this->setTimingAge(new FHIRAge(array_merge($ext, $data[self::FIELD_TIMING_AGE]))); + } } else { $this->setTimingAge(new FHIRAge($data[self::FIELD_TIMING_AGE])); } @@ -925,15 +1016,28 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TIMING_DATE_TIME] instanceof FHIRDateTime) { $this->setTimingDateTime($data[self::FIELD_TIMING_DATE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_TIMING_DATE_TIME])) { - $this->setTimingDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_TIMING_DATE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TIMING_DATE_TIME])) { + $this->setTimingDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_TIMING_DATE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_TIMING_DATE_TIME])) { + $this->setTimingDateTime(new FHIRDateTime(array_merge($ext, $data[self::FIELD_TIMING_DATE_TIME]))); + } } else { $this->setTimingDateTime(new FHIRDateTime($data[self::FIELD_TIMING_DATE_TIME])); } } if (isset($data[self::FIELD_TIMING_DURATION])) { + $ext = (isset($data[self::FIELD_TIMING_DURATION_EXT]) && is_array($data[self::FIELD_TIMING_DURATION_EXT])) + ? $data[self::FIELD_TIMING_DURATION_EXT] + : null; if ($data[self::FIELD_TIMING_DURATION] instanceof FHIRDuration) { $this->setTimingDuration($data[self::FIELD_TIMING_DURATION]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TIMING_DURATION])) { + $this->setTimingDuration(new FHIRDuration([FHIRDuration::FIELD_VALUE => $data[self::FIELD_TIMING_DURATION]] + $ext)); + } else if (is_array($data[self::FIELD_TIMING_DURATION])) { + $this->setTimingDuration(new FHIRDuration(array_merge($ext, $data[self::FIELD_TIMING_DURATION]))); + } } else { $this->setTimingDuration(new FHIRDuration($data[self::FIELD_TIMING_DURATION])); } @@ -965,8 +1069,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TITLE] instanceof FHIRString) { $this->setTitle($data[self::FIELD_TITLE]); - } elseif ($ext && is_scalar($data[self::FIELD_TITLE])) { - $this->setTitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TITLE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TITLE])) { + $this->setTitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TITLE]] + $ext)); + } else if (is_array($data[self::FIELD_TITLE])) { + $this->setTitle(new FHIRString(array_merge($ext, $data[self::FIELD_TITLE]))); + } } else { $this->setTitle(new FHIRString($data[self::FIELD_TITLE])); } @@ -977,8 +1085,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TRANSFORM] instanceof FHIRCanonical) { $this->setTransform($data[self::FIELD_TRANSFORM]); - } elseif ($ext && is_scalar($data[self::FIELD_TRANSFORM])) { - $this->setTransform(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $data[self::FIELD_TRANSFORM]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TRANSFORM])) { + $this->setTransform(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $data[self::FIELD_TRANSFORM]] + $ext)); + } else if (is_array($data[self::FIELD_TRANSFORM])) { + $this->setTransform(new FHIRCanonical(array_merge($ext, $data[self::FIELD_TRANSFORM]))); + } } else { $this->setTransform(new FHIRCanonical($data[self::FIELD_TRANSFORM])); } @@ -986,6 +1098,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_TRIGGER])) { if (is_array($data[self::FIELD_TRIGGER])) { foreach($data[self::FIELD_TRIGGER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRTriggerDefinition) { $this->addTrigger($v); } else { @@ -2789,7 +2904,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getAction())) { foreach($vs as $v) { if (null === $v) { @@ -2802,7 +2916,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getCardinalityBehavior())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CARDINALITY_BEHAVIOR, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getCode())) { foreach($vs as $v) { if (null === $v) { @@ -2820,6 +2933,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_CONDITION, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getDefinitionCanonical())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFINITION_CANONICAL, null, $v->_getFHIRXMLNamespace())); } @@ -2829,7 +2943,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESCRIPTION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getDocumentation())) { foreach($vs as $v) { if (null === $v) { @@ -2847,6 +2960,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_DYNAMIC_VALUE, null, $v->_getFHIRXMLNamespace())); } } + if ([] !== ($vs = $this->getGoalId())) { foreach($vs as $v) { if (null === $v) { @@ -2859,7 +2973,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getGroupingBehavior())) { $v->xmlSerialize($sxe->addChild(self::FIELD_GROUPING_BEHAVIOR, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getInput())) { foreach($vs as $v) { if (null === $v) { @@ -2893,11 +3006,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getPrefix())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PREFIX, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPriority())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PRIORITY, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getReason())) { foreach($vs as $v) { if (null === $v) { @@ -2919,41 +3030,33 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getRequiredBehavior())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REQUIRED_BEHAVIOR, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSelectionBehavior())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SELECTION_BEHAVIOR, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSubjectCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBJECT_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSubjectReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBJECT_REFERENCE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getTextEquivalent())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TEXT_EQUIVALENT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getTimingAge())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TIMING_AGE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getTimingDateTime())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TIMING_DATE_TIME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getTimingDuration())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TIMING_DURATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getTimingPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TIMING_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getTimingRange())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TIMING_RANGE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getTimingTiming())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TIMING_TIMING, null, $v->_getFHIRXMLNamespace())); } @@ -2963,7 +3066,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getTransform())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TRANSFORM, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getTrigger())) { foreach($vs as $v) { if (null === $v) { @@ -2989,7 +3091,15 @@ public function jsonSerialize() $a[self::FIELD_ACTION] = $vs; } if (null !== ($v = $this->getCardinalityBehavior())) { - $a[self::FIELD_CARDINALITY_BEHAVIOR] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CARDINALITY_BEHAVIOR] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CARDINALITY_BEHAVIOR_EXT] = $enc; + } + } else { + $a[self::FIELD_CARDINALITY_BEHAVIOR] = $v; + } } if ([] !== ($vs = $this->getCode())) { $a[self::FIELD_CODE] = $vs; @@ -2998,16 +3108,37 @@ public function jsonSerialize() $a[self::FIELD_CONDITION] = $vs; } if (null !== ($v = $this->getDefinitionCanonical())) { - $a[self::FIELD_DEFINITION_CANONICAL] = $v->getValue(); - $a[self::FIELD_DEFINITION_CANONICAL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DEFINITION_CANONICAL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DEFINITION_CANONICAL_EXT] = $enc; + } + } else { + $a[self::FIELD_DEFINITION_CANONICAL] = $v; + } } if (null !== ($v = $this->getDefinitionUri())) { - $a[self::FIELD_DEFINITION_URI] = $v->getValue(); - $a[self::FIELD_DEFINITION_URI_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DEFINITION_URI] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DEFINITION_URI_EXT] = $enc; + } + } else { + $a[self::FIELD_DEFINITION_URI] = $v; + } } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if ([] !== ($vs = $this->getDocumentation())) { $a[self::FIELD_DOCUMENTATION] = $vs; @@ -3021,12 +3152,29 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_GOAL_ID][] = $v->getValue(); - $a[self::FIELD_GOAL_ID_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_GOAL_ID][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_GOAL_ID_EXT][] = $enc; + } else { + $a[self::FIELD_GOAL_ID_EXT][] = null; + } + } else { + $a[self::FIELD_GOAL_ID][] = $v; + } } } if (null !== ($v = $this->getGroupingBehavior())) { - $a[self::FIELD_GROUPING_BEHAVIOR] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_GROUPING_BEHAVIOR] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_GROUPING_BEHAVIOR_EXT] = $enc; + } + } else { + $a[self::FIELD_GROUPING_BEHAVIOR] = $v; + } } if ([] !== ($vs = $this->getInput())) { $a[self::FIELD_INPUT] = $vs; @@ -3038,14 +3186,37 @@ public function jsonSerialize() $a[self::FIELD_PARTICIPANT] = $vs; } if (null !== ($v = $this->getPrecheckBehavior())) { - $a[self::FIELD_PRECHECK_BEHAVIOR] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PRECHECK_BEHAVIOR] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PRECHECK_BEHAVIOR_EXT] = $enc; + } + } else { + $a[self::FIELD_PRECHECK_BEHAVIOR] = $v; + } } if (null !== ($v = $this->getPrefix())) { - $a[self::FIELD_PREFIX] = $v->getValue(); - $a[self::FIELD_PREFIX_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PREFIX] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PREFIX_EXT] = $enc; + } + } else { + $a[self::FIELD_PREFIX] = $v; + } } if (null !== ($v = $this->getPriority())) { - $a[self::FIELD_PRIORITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PRIORITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PRIORITY_EXT] = $enc; + } + } else { + $a[self::FIELD_PRIORITY] = $v; + } } if ([] !== ($vs = $this->getReason())) { $a[self::FIELD_REASON] = $vs; @@ -3054,10 +3225,26 @@ public function jsonSerialize() $a[self::FIELD_RELATED_ACTION] = $vs; } if (null !== ($v = $this->getRequiredBehavior())) { - $a[self::FIELD_REQUIRED_BEHAVIOR] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_REQUIRED_BEHAVIOR] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_REQUIRED_BEHAVIOR_EXT] = $enc; + } + } else { + $a[self::FIELD_REQUIRED_BEHAVIOR] = $v; + } } if (null !== ($v = $this->getSelectionBehavior())) { - $a[self::FIELD_SELECTION_BEHAVIOR] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SELECTION_BEHAVIOR] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SELECTION_BEHAVIOR_EXT] = $enc; + } + } else { + $a[self::FIELD_SELECTION_BEHAVIOR] = $v; + } } if (null !== ($v = $this->getSubjectCodeableConcept())) { $a[self::FIELD_SUBJECT_CODEABLE_CONCEPT] = $v; @@ -3066,18 +3253,48 @@ public function jsonSerialize() $a[self::FIELD_SUBJECT_REFERENCE] = $v; } if (null !== ($v = $this->getTextEquivalent())) { - $a[self::FIELD_TEXT_EQUIVALENT] = $v->getValue(); - $a[self::FIELD_TEXT_EQUIVALENT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TEXT_EQUIVALENT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TEXT_EQUIVALENT_EXT] = $enc; + } + } else { + $a[self::FIELD_TEXT_EQUIVALENT] = $v; + } } if (null !== ($v = $this->getTimingAge())) { - $a[self::FIELD_TIMING_AGE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TIMING_AGE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TIMING_AGE_EXT] = $enc; + } + } else { + $a[self::FIELD_TIMING_AGE] = $v; + } } if (null !== ($v = $this->getTimingDateTime())) { - $a[self::FIELD_TIMING_DATE_TIME] = $v->getValue(); - $a[self::FIELD_TIMING_DATE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TIMING_DATE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TIMING_DATE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_TIMING_DATE_TIME] = $v; + } } if (null !== ($v = $this->getTimingDuration())) { - $a[self::FIELD_TIMING_DURATION] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TIMING_DURATION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TIMING_DURATION_EXT] = $enc; + } + } else { + $a[self::FIELD_TIMING_DURATION] = $v; + } } if (null !== ($v = $this->getTimingPeriod())) { $a[self::FIELD_TIMING_PERIOD] = $v; @@ -3089,12 +3306,26 @@ public function jsonSerialize() $a[self::FIELD_TIMING_TIMING] = $v; } if (null !== ($v = $this->getTitle())) { - $a[self::FIELD_TITLE] = $v->getValue(); - $a[self::FIELD_TITLE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TITLE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TITLE_EXT] = $enc; + } + } else { + $a[self::FIELD_TITLE] = $v; + } } if (null !== ($v = $this->getTransform())) { - $a[self::FIELD_TRANSFORM] = $v->getValue(); - $a[self::FIELD_TRANSFORM_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TRANSFORM] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TRANSFORM_EXT] = $enc; + } + } else { + $a[self::FIELD_TRANSFORM] = $v; + } } if ([] !== ($vs = $this->getTrigger())) { $a[self::FIELD_TRIGGER] = $vs; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRPlanDefinition/FHIRPlanDefinitionCondition.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRPlanDefinition/FHIRPlanDefinitionCondition.php index 2e0330d7ad..2aef879108 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRPlanDefinition/FHIRPlanDefinitionCondition.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRPlanDefinition/FHIRPlanDefinitionCondition.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -81,10 +81,6 @@ class FHIRPlanDefinitionCondition extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_PLAN_DEFINITION_DOT_CONDITION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_EXPRESSION = 'expression'; const FIELD_KIND = 'kind'; const FIELD_KIND_EXT = '_kind'; @@ -113,6 +109,9 @@ class FHIRPlanDefinitionCondition extends FHIRBackboneElement */ protected $kind = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRPlanDefinitionCondition Constructor * @param null|array $data @@ -142,8 +141,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_KIND] instanceof FHIRActionConditionKind) { $this->setKind($data[self::FIELD_KIND]); - } elseif ($ext && is_scalar($data[self::FIELD_KIND])) { - $this->setKind(new FHIRActionConditionKind([FHIRActionConditionKind::FIELD_VALUE => $data[self::FIELD_KIND]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_KIND])) { + $this->setKind(new FHIRActionConditionKind([FHIRActionConditionKind::FIELD_VALUE => $data[self::FIELD_KIND]] + $ext)); + } else if (is_array($data[self::FIELD_KIND])) { + $this->setKind(new FHIRActionConditionKind(array_merge($ext, $data[self::FIELD_KIND]))); + } } else { $this->setKind(new FHIRActionConditionKind($data[self::FIELD_KIND])); } @@ -319,11 +322,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getExpression())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EXPRESSION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getKind())) { $v->xmlSerialize($sxe->addChild(self::FIELD_KIND, null, $v->_getFHIRXMLNamespace())); } @@ -340,7 +341,15 @@ public function jsonSerialize() $a[self::FIELD_EXPRESSION] = $v; } if (null !== ($v = $this->getKind())) { - $a[self::FIELD_KIND] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_KIND] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_KIND_EXT] = $enc; + } + } else { + $a[self::FIELD_KIND] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRPlanDefinition/FHIRPlanDefinitionDynamicValue.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRPlanDefinition/FHIRPlanDefinitionDynamicValue.php index 51dd5c118b..bd38f84f2f 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRPlanDefinition/FHIRPlanDefinitionDynamicValue.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRPlanDefinition/FHIRPlanDefinitionDynamicValue.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -81,10 +81,6 @@ class FHIRPlanDefinitionDynamicValue extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_PLAN_DEFINITION_DOT_DYNAMIC_VALUE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_EXPRESSION = 'expression'; const FIELD_PATH = 'path'; const FIELD_PATH_EXT = '_path'; @@ -120,6 +116,9 @@ class FHIRPlanDefinitionDynamicValue extends FHIRBackboneElement */ protected $path = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRPlanDefinitionDynamicValue Constructor * @param null|array $data @@ -149,8 +148,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PATH] instanceof FHIRString) { $this->setPath($data[self::FIELD_PATH]); - } elseif ($ext && is_scalar($data[self::FIELD_PATH])) { - $this->setPath(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PATH]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PATH])) { + $this->setPath(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PATH]] + $ext)); + } else if (is_array($data[self::FIELD_PATH])) { + $this->setPath(new FHIRString(array_merge($ext, $data[self::FIELD_PATH]))); + } } else { $this->setPath(new FHIRString($data[self::FIELD_PATH])); } @@ -351,7 +354,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getExpression())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EXPRESSION, null, $v->_getFHIRXMLNamespace())); } @@ -371,8 +373,15 @@ public function jsonSerialize() $a[self::FIELD_EXPRESSION] = $v; } if (null !== ($v = $this->getPath())) { - $a[self::FIELD_PATH] = $v->getValue(); - $a[self::FIELD_PATH_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PATH] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PATH_EXT] = $enc; + } + } else { + $a[self::FIELD_PATH] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRPlanDefinition/FHIRPlanDefinitionGoal.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRPlanDefinition/FHIRPlanDefinitionGoal.php index 293a5ef590..db34c12fee 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRPlanDefinition/FHIRPlanDefinitionGoal.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRPlanDefinition/FHIRPlanDefinitionGoal.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -81,10 +81,6 @@ class FHIRPlanDefinitionGoal extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_PLAN_DEFINITION_DOT_GOAL; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ADDRESSES = 'addresses'; const FIELD_CATEGORY = 'category'; const FIELD_DESCRIPTION = 'description'; @@ -183,6 +179,9 @@ class FHIRPlanDefinitionGoal extends FHIRBackboneElement */ protected $target = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRPlanDefinitionGoal Constructor * @param null|array $data @@ -202,6 +201,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ADDRESSES])) { if (is_array($data[self::FIELD_ADDRESSES])) { foreach($data[self::FIELD_ADDRESSES] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addAddresses($v); } else { @@ -231,6 +233,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_DOCUMENTATION])) { if (is_array($data[self::FIELD_DOCUMENTATION])) { foreach($data[self::FIELD_DOCUMENTATION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRRelatedArtifact) { $this->addDocumentation($v); } else { @@ -260,6 +265,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_TARGET])) { if (is_array($data[self::FIELD_TARGET])) { foreach($data[self::FIELD_TARGET] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRPlanDefinitionTarget) { $this->addTarget($v); } else { @@ -720,7 +728,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getAddresses())) { foreach($vs as $v) { if (null === $v) { @@ -733,11 +740,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getCategory())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CATEGORY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESCRIPTION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getDocumentation())) { foreach($vs as $v) { if (null === $v) { @@ -750,11 +755,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getPriority())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PRIORITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStart())) { $v->xmlSerialize($sxe->addChild(self::FIELD_START, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getTarget())) { foreach($vs as $v) { if (null === $v) { @@ -763,6 +766,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_TARGET, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRPlanDefinition/FHIRPlanDefinitionParticipant.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRPlanDefinition/FHIRPlanDefinitionParticipant.php index 0330a49519..34cadcfa2f 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRPlanDefinition/FHIRPlanDefinitionParticipant.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRPlanDefinition/FHIRPlanDefinitionParticipant.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -81,10 +81,6 @@ class FHIRPlanDefinitionParticipant extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_PLAN_DEFINITION_DOT_PARTICIPANT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ROLE = 'role'; const FIELD_TYPE = 'type'; const FIELD_TYPE_EXT = '_type'; @@ -111,6 +107,9 @@ class FHIRPlanDefinitionParticipant extends FHIRBackboneElement */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRPlanDefinitionParticipant Constructor * @param null|array $data @@ -140,8 +139,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TYPE] instanceof FHIRActionParticipantType) { $this->setType($data[self::FIELD_TYPE]); - } elseif ($ext && is_scalar($data[self::FIELD_TYPE])) { - $this->setType(new FHIRActionParticipantType([FHIRActionParticipantType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TYPE])) { + $this->setType(new FHIRActionParticipantType([FHIRActionParticipantType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } else if (is_array($data[self::FIELD_TYPE])) { + $this->setType(new FHIRActionParticipantType(array_merge($ext, $data[self::FIELD_TYPE]))); + } } else { $this->setType(new FHIRActionParticipantType($data[self::FIELD_TYPE])); } @@ -313,11 +316,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getRole())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ROLE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -334,7 +335,15 @@ public function jsonSerialize() $a[self::FIELD_ROLE] = $v; } if (null !== ($v = $this->getType())) { - $a[self::FIELD_TYPE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TYPE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TYPE_EXT] = $enc; + } + } else { + $a[self::FIELD_TYPE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRPlanDefinition/FHIRPlanDefinitionRelatedAction.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRPlanDefinition/FHIRPlanDefinitionRelatedAction.php index fe12eb7395..a53ec94da4 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRPlanDefinition/FHIRPlanDefinitionRelatedAction.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRPlanDefinition/FHIRPlanDefinitionRelatedAction.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -83,13 +83,10 @@ class FHIRPlanDefinitionRelatedAction extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_PLAN_DEFINITION_DOT_RELATED_ACTION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ACTION_ID = 'actionId'; const FIELD_ACTION_ID_EXT = '_actionId'; const FIELD_OFFSET_DURATION = 'offsetDuration'; + const FIELD_OFFSET_DURATION_EXT = '_offsetDuration'; const FIELD_OFFSET_RANGE = 'offsetRange'; const FIELD_RELATIONSHIP = 'relationship'; const FIELD_RELATIONSHIP_EXT = '_relationship'; @@ -142,6 +139,9 @@ class FHIRPlanDefinitionRelatedAction extends FHIRBackboneElement */ protected $relationship = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRPlanDefinitionRelatedAction Constructor * @param null|array $data @@ -164,15 +164,28 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ACTION_ID] instanceof FHIRId) { $this->setActionId($data[self::FIELD_ACTION_ID]); - } elseif ($ext && is_scalar($data[self::FIELD_ACTION_ID])) { - $this->setActionId(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_ACTION_ID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ACTION_ID])) { + $this->setActionId(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_ACTION_ID]] + $ext)); + } else if (is_array($data[self::FIELD_ACTION_ID])) { + $this->setActionId(new FHIRId(array_merge($ext, $data[self::FIELD_ACTION_ID]))); + } } else { $this->setActionId(new FHIRId($data[self::FIELD_ACTION_ID])); } } if (isset($data[self::FIELD_OFFSET_DURATION])) { + $ext = (isset($data[self::FIELD_OFFSET_DURATION_EXT]) && is_array($data[self::FIELD_OFFSET_DURATION_EXT])) + ? $data[self::FIELD_OFFSET_DURATION_EXT] + : null; if ($data[self::FIELD_OFFSET_DURATION] instanceof FHIRDuration) { $this->setOffsetDuration($data[self::FIELD_OFFSET_DURATION]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_OFFSET_DURATION])) { + $this->setOffsetDuration(new FHIRDuration([FHIRDuration::FIELD_VALUE => $data[self::FIELD_OFFSET_DURATION]] + $ext)); + } else if (is_array($data[self::FIELD_OFFSET_DURATION])) { + $this->setOffsetDuration(new FHIRDuration(array_merge($ext, $data[self::FIELD_OFFSET_DURATION]))); + } } else { $this->setOffsetDuration(new FHIRDuration($data[self::FIELD_OFFSET_DURATION])); } @@ -190,8 +203,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_RELATIONSHIP] instanceof FHIRActionRelationshipType) { $this->setRelationship($data[self::FIELD_RELATIONSHIP]); - } elseif ($ext && is_scalar($data[self::FIELD_RELATIONSHIP])) { - $this->setRelationship(new FHIRActionRelationshipType([FHIRActionRelationshipType::FIELD_VALUE => $data[self::FIELD_RELATIONSHIP]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_RELATIONSHIP])) { + $this->setRelationship(new FHIRActionRelationshipType([FHIRActionRelationshipType::FIELD_VALUE => $data[self::FIELD_RELATIONSHIP]] + $ext)); + } else if (is_array($data[self::FIELD_RELATIONSHIP])) { + $this->setRelationship(new FHIRActionRelationshipType(array_merge($ext, $data[self::FIELD_RELATIONSHIP]))); + } } else { $this->setRelationship(new FHIRActionRelationshipType($data[self::FIELD_RELATIONSHIP])); } @@ -451,15 +468,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getActionId())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ACTION_ID, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOffsetDuration())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OFFSET_DURATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOffsetRange())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OFFSET_RANGE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRelationship())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RELATIONSHIP, null, $v->_getFHIRXMLNamespace())); } @@ -473,17 +487,40 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getActionId())) { - $a[self::FIELD_ACTION_ID] = $v->getValue(); - $a[self::FIELD_ACTION_ID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ACTION_ID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ACTION_ID_EXT] = $enc; + } + } else { + $a[self::FIELD_ACTION_ID] = $v; + } } if (null !== ($v = $this->getOffsetDuration())) { - $a[self::FIELD_OFFSET_DURATION] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_OFFSET_DURATION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_OFFSET_DURATION_EXT] = $enc; + } + } else { + $a[self::FIELD_OFFSET_DURATION] = $v; + } } if (null !== ($v = $this->getOffsetRange())) { $a[self::FIELD_OFFSET_RANGE] = $v; } if (null !== ($v = $this->getRelationship())) { - $a[self::FIELD_RELATIONSHIP] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_RELATIONSHIP] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_RELATIONSHIP_EXT] = $enc; + } + } else { + $a[self::FIELD_RELATIONSHIP] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRPlanDefinition/FHIRPlanDefinitionTarget.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRPlanDefinition/FHIRPlanDefinitionTarget.php index 313752163d..775e6d8232 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRPlanDefinition/FHIRPlanDefinitionTarget.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRPlanDefinition/FHIRPlanDefinitionTarget.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -83,15 +83,12 @@ class FHIRPlanDefinitionTarget extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_PLAN_DEFINITION_DOT_TARGET; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DETAIL_CODEABLE_CONCEPT = 'detailCodeableConcept'; const FIELD_DETAIL_QUANTITY = 'detailQuantity'; const FIELD_DETAIL_QUANTITY_EXT = '_detailQuantity'; const FIELD_DETAIL_RANGE = 'detailRange'; const FIELD_DUE = 'due'; + const FIELD_DUE_EXT = '_due'; const FIELD_MEASURE = 'measure'; /** @@ -170,6 +167,9 @@ class FHIRPlanDefinitionTarget extends FHIRBackboneElement */ protected $measure = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRPlanDefinitionTarget Constructor * @param null|array $data @@ -199,8 +199,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DETAIL_QUANTITY] instanceof FHIRQuantity) { $this->setDetailQuantity($data[self::FIELD_DETAIL_QUANTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_DETAIL_QUANTITY])) { - $this->setDetailQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_DETAIL_QUANTITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DETAIL_QUANTITY])) { + $this->setDetailQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_DETAIL_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_DETAIL_QUANTITY])) { + $this->setDetailQuantity(new FHIRQuantity(array_merge($ext, $data[self::FIELD_DETAIL_QUANTITY]))); + } } else { $this->setDetailQuantity(new FHIRQuantity($data[self::FIELD_DETAIL_QUANTITY])); } @@ -213,8 +217,17 @@ public function __construct($data = null) } } if (isset($data[self::FIELD_DUE])) { + $ext = (isset($data[self::FIELD_DUE_EXT]) && is_array($data[self::FIELD_DUE_EXT])) + ? $data[self::FIELD_DUE_EXT] + : null; if ($data[self::FIELD_DUE] instanceof FHIRDuration) { $this->setDue($data[self::FIELD_DUE]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DUE])) { + $this->setDue(new FHIRDuration([FHIRDuration::FIELD_VALUE => $data[self::FIELD_DUE]] + $ext)); + } else if (is_array($data[self::FIELD_DUE])) { + $this->setDue(new FHIRDuration(array_merge($ext, $data[self::FIELD_DUE]))); + } } else { $this->setDue(new FHIRDuration($data[self::FIELD_DUE])); } @@ -534,23 +547,18 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getDetailCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DETAIL_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDetailQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DETAIL_QUANTITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDetailRange())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DETAIL_RANGE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDue())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DUE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getMeasure())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MEASURE, null, $v->_getFHIRXMLNamespace())); } @@ -567,13 +575,29 @@ public function jsonSerialize() $a[self::FIELD_DETAIL_CODEABLE_CONCEPT] = $v; } if (null !== ($v = $this->getDetailQuantity())) { - $a[self::FIELD_DETAIL_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DETAIL_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DETAIL_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_DETAIL_QUANTITY] = $v; + } } if (null !== ($v = $this->getDetailRange())) { $a[self::FIELD_DETAIL_RANGE] = $v; } if (null !== ($v = $this->getDue())) { - $a[self::FIELD_DUE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DUE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DUE_EXT] = $enc; + } + } else { + $a[self::FIELD_DUE] = $v; + } } if (null !== ($v = $this->getMeasure())) { $a[self::FIELD_MEASURE] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRPopulation.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRPopulation.php index e36306a33a..62dcc2bbf4 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRPopulation.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRPopulation.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRPopulation extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_POPULATION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_AGE_CODEABLE_CONCEPT = 'ageCodeableConcept'; const FIELD_AGE_RANGE = 'ageRange'; const FIELD_GENDER = 'gender'; @@ -150,6 +146,9 @@ class FHIRPopulation extends FHIRBackboneElement */ protected $race = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRPopulation Constructor * @param null|array $data @@ -477,23 +476,18 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getAgeCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AGE_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getAgeRange())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AGE_RANGE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getGender())) { $v->xmlSerialize($sxe->addChild(self::FIELD_GENDER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPhysiologicalCondition())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PHYSIOLOGICAL_CONDITION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRace())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RACE, null, $v->_getFHIRXMLNamespace())); } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRPractitioner/FHIRPractitionerQualification.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRPractitioner/FHIRPractitionerQualification.php index aa004f063b..889c2f2dae 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRPractitioner/FHIRPractitionerQualification.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRPractitioner/FHIRPractitionerQualification.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -81,10 +81,6 @@ class FHIRPractitionerQualification extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_PRACTITIONER_DOT_QUALIFICATION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CODE = 'code'; const FIELD_IDENTIFIER = 'identifier'; const FIELD_IDENTIFIER_EXT = '_identifier'; @@ -137,6 +133,9 @@ class FHIRPractitionerQualification extends FHIRBackboneElement */ protected $period = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRPractitionerQualification Constructor * @param null|array $data @@ -166,17 +165,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -462,11 +468,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -479,7 +483,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getIssuer())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ISSUER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PERIOD, null, $v->_getFHIRXMLNamespace())); } @@ -496,7 +499,23 @@ public function jsonSerialize() $a[self::FIELD_CODE] = $v; } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if (null !== ($v = $this->getIssuer())) { $a[self::FIELD_ISSUER] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRPractitionerRole/FHIRPractitionerRoleAvailableTime.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRPractitionerRole/FHIRPractitionerRoleAvailableTime.php index 56adefc04f..e2d28df126 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRPractitionerRole/FHIRPractitionerRoleAvailableTime.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRPractitionerRole/FHIRPractitionerRoleAvailableTime.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRPractitionerRoleAvailableTime extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_PRACTITIONER_ROLE_DOT_AVAILABLE_TIME; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ALL_DAY = 'allDay'; const FIELD_ALL_DAY_EXT = '_allDay'; const FIELD_AVAILABLE_END_TIME = 'availableEndTime'; @@ -135,6 +131,9 @@ class FHIRPractitionerRoleAvailableTime extends FHIRBackboneElement */ protected $daysOfWeek = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRPractitionerRoleAvailableTime Constructor * @param null|array $data @@ -157,8 +156,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ALL_DAY] instanceof FHIRBoolean) { $this->setAllDay($data[self::FIELD_ALL_DAY]); - } elseif ($ext && is_scalar($data[self::FIELD_ALL_DAY])) { - $this->setAllDay(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_ALL_DAY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ALL_DAY])) { + $this->setAllDay(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_ALL_DAY]] + $ext)); + } else if (is_array($data[self::FIELD_ALL_DAY])) { + $this->setAllDay(new FHIRBoolean(array_merge($ext, $data[self::FIELD_ALL_DAY]))); + } } else { $this->setAllDay(new FHIRBoolean($data[self::FIELD_ALL_DAY])); } @@ -169,8 +172,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_AVAILABLE_END_TIME] instanceof FHIRTime) { $this->setAvailableEndTime($data[self::FIELD_AVAILABLE_END_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_AVAILABLE_END_TIME])) { - $this->setAvailableEndTime(new FHIRTime([FHIRTime::FIELD_VALUE => $data[self::FIELD_AVAILABLE_END_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_AVAILABLE_END_TIME])) { + $this->setAvailableEndTime(new FHIRTime([FHIRTime::FIELD_VALUE => $data[self::FIELD_AVAILABLE_END_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_AVAILABLE_END_TIME])) { + $this->setAvailableEndTime(new FHIRTime(array_merge($ext, $data[self::FIELD_AVAILABLE_END_TIME]))); + } } else { $this->setAvailableEndTime(new FHIRTime($data[self::FIELD_AVAILABLE_END_TIME])); } @@ -181,8 +188,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_AVAILABLE_START_TIME] instanceof FHIRTime) { $this->setAvailableStartTime($data[self::FIELD_AVAILABLE_START_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_AVAILABLE_START_TIME])) { - $this->setAvailableStartTime(new FHIRTime([FHIRTime::FIELD_VALUE => $data[self::FIELD_AVAILABLE_START_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_AVAILABLE_START_TIME])) { + $this->setAvailableStartTime(new FHIRTime([FHIRTime::FIELD_VALUE => $data[self::FIELD_AVAILABLE_START_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_AVAILABLE_START_TIME])) { + $this->setAvailableStartTime(new FHIRTime(array_merge($ext, $data[self::FIELD_AVAILABLE_START_TIME]))); + } } else { $this->setAvailableStartTime(new FHIRTime($data[self::FIELD_AVAILABLE_START_TIME])); } @@ -193,17 +204,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_DAYS_OF_WEEK])) { foreach($data[self::FIELD_DAYS_OF_WEEK] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRDaysOfWeek) { $this->addDaysOfWeek($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addDaysOfWeek(new FHIRDaysOfWeek([FHIRDaysOfWeek::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addDaysOfWeek(new FHIRDaysOfWeek([FHIRDaysOfWeek::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addDaysOfWeek(new FHIRDaysOfWeek(array_merge($v, $ext[$i]))); + } } else { $this->addDaysOfWeek(new FHIRDaysOfWeek($v)); } } } elseif ($data[self::FIELD_DAYS_OF_WEEK] instanceof FHIRDaysOfWeek) { $this->addDaysOfWeek($data[self::FIELD_DAYS_OF_WEEK]); - } elseif ($ext && is_scalar($data[self::FIELD_DAYS_OF_WEEK])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_DAYS_OF_WEEK])) { $this->addDaysOfWeek(new FHIRDaysOfWeek([FHIRDaysOfWeek::FIELD_VALUE => $data[self::FIELD_DAYS_OF_WEEK]] + $ext)); } else { $this->addDaysOfWeek(new FHIRDaysOfWeek($data[self::FIELD_DAYS_OF_WEEK])); @@ -507,7 +525,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getAvailableStartTime())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AVAILABLE_START_TIME, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getDaysOfWeek())) { foreach($vs as $v) { if (null === $v) { @@ -516,6 +533,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_DAYS_OF_WEEK, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } @@ -526,19 +544,56 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getAllDay())) { - $a[self::FIELD_ALL_DAY] = $v->getValue(); - $a[self::FIELD_ALL_DAY_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ALL_DAY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ALL_DAY_EXT] = $enc; + } + } else { + $a[self::FIELD_ALL_DAY] = $v; + } } if (null !== ($v = $this->getAvailableEndTime())) { - $a[self::FIELD_AVAILABLE_END_TIME] = $v->getValue(); - $a[self::FIELD_AVAILABLE_END_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_AVAILABLE_END_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_AVAILABLE_END_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_AVAILABLE_END_TIME] = $v; + } } if (null !== ($v = $this->getAvailableStartTime())) { - $a[self::FIELD_AVAILABLE_START_TIME] = $v->getValue(); - $a[self::FIELD_AVAILABLE_START_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_AVAILABLE_START_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_AVAILABLE_START_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_AVAILABLE_START_TIME] = $v; + } } if ([] !== ($vs = $this->getDaysOfWeek())) { - $a[self::FIELD_DAYS_OF_WEEK] = $vs; + $a[self::FIELD_DAYS_OF_WEEK] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DAYS_OF_WEEK][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DAYS_OF_WEEK_EXT][] = $enc; + } else { + $a[self::FIELD_DAYS_OF_WEEK_EXT][] = null; + } + } else { + $a[self::FIELD_DAYS_OF_WEEK][] = $v; + } + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRPractitionerRole/FHIRPractitionerRoleNotAvailable.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRPractitionerRole/FHIRPractitionerRoleNotAvailable.php index 3df4fa29bc..51b10eb27d 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRPractitionerRole/FHIRPractitionerRoleNotAvailable.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRPractitionerRole/FHIRPractitionerRoleNotAvailable.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRPractitionerRoleNotAvailable extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_PRACTITIONER_ROLE_DOT_NOT_AVAILABLE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DESCRIPTION = 'description'; const FIELD_DESCRIPTION_EXT = '_description'; const FIELD_DURING = 'during'; @@ -110,6 +106,9 @@ class FHIRPractitionerRoleNotAvailable extends FHIRBackboneElement */ protected $during = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRPractitionerRoleNotAvailable Constructor * @param null|array $data @@ -132,8 +131,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -328,7 +331,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESCRIPTION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDuring())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DURING, null, $v->_getFHIRXMLNamespace())); } @@ -342,8 +344,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if (null !== ($v = $this->getDuring())) { $a[self::FIELD_DURING] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRProcedure/FHIRProcedureFocalDevice.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRProcedure/FHIRProcedureFocalDevice.php index 5d0b09240e..fc812800e9 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRProcedure/FHIRProcedureFocalDevice.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRProcedure/FHIRProcedureFocalDevice.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRProcedureFocalDevice extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_PROCEDURE_DOT_FOCAL_DEVICE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ACTION = 'action'; const FIELD_MANIPULATED = 'manipulated'; @@ -110,6 +106,9 @@ class FHIRProcedureFocalDevice extends FHIRBackboneElement */ protected $manipulated = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRProcedureFocalDevice Constructor * @param null|array $data @@ -309,11 +308,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getAction())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ACTION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getManipulated())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MANIPULATED, null, $v->_getFHIRXMLNamespace())); } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRProcedure/FHIRProcedurePerformer.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRProcedure/FHIRProcedurePerformer.php index cb7a8b36bc..975be01b4b 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRProcedure/FHIRProcedurePerformer.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRProcedure/FHIRProcedurePerformer.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRProcedurePerformer extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_PROCEDURE_DOT_PERFORMER; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ACTOR = 'actor'; const FIELD_FUNCTION = 'function'; const FIELD_ON_BEHALF_OF = 'onBehalfOf'; @@ -123,6 +119,9 @@ class FHIRProcedurePerformer extends FHIRBackboneElement */ protected $onBehalfOf = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRProcedurePerformer Constructor * @param null|array $data @@ -364,15 +363,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getActor())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ACTOR, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getFunction())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FUNCTION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOnBehalfOf())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ON_BEHALF_OF, null, $v->_getFHIRXMLNamespace())); } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRProdCharacteristic.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRProdCharacteristic.php index 595fc2468a..b5a443729e 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRProdCharacteristic.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRProdCharacteristic.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -83,10 +83,6 @@ class FHIRProdCharacteristic extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_PROD_CHARACTERISTIC; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_COLOR = 'color'; const FIELD_COLOR_EXT = '_color'; const FIELD_DEPTH = 'depth'; @@ -264,6 +260,9 @@ class FHIRProdCharacteristic extends FHIRBackboneElement */ protected $width = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRProdCharacteristic Constructor * @param null|array $data @@ -286,17 +285,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_COLOR])) { foreach($data[self::FIELD_COLOR] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRString) { $this->addColor($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addColor(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addColor(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addColor(new FHIRString(array_merge($v, $ext[$i]))); + } } else { $this->addColor(new FHIRString($v)); } } } elseif ($data[self::FIELD_COLOR] instanceof FHIRString) { $this->addColor($data[self::FIELD_COLOR]); - } elseif ($ext && is_scalar($data[self::FIELD_COLOR])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_COLOR])) { $this->addColor(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_COLOR]] + $ext)); } else { $this->addColor(new FHIRString($data[self::FIELD_COLOR])); @@ -308,8 +314,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DEPTH] instanceof FHIRQuantity) { $this->setDepth($data[self::FIELD_DEPTH]); - } elseif ($ext && is_scalar($data[self::FIELD_DEPTH])) { - $this->setDepth(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_DEPTH]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DEPTH])) { + $this->setDepth(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_DEPTH]] + $ext)); + } else if (is_array($data[self::FIELD_DEPTH])) { + $this->setDepth(new FHIRQuantity(array_merge($ext, $data[self::FIELD_DEPTH]))); + } } else { $this->setDepth(new FHIRQuantity($data[self::FIELD_DEPTH])); } @@ -320,8 +330,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EXTERNAL_DIAMETER] instanceof FHIRQuantity) { $this->setExternalDiameter($data[self::FIELD_EXTERNAL_DIAMETER]); - } elseif ($ext && is_scalar($data[self::FIELD_EXTERNAL_DIAMETER])) { - $this->setExternalDiameter(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_EXTERNAL_DIAMETER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EXTERNAL_DIAMETER])) { + $this->setExternalDiameter(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_EXTERNAL_DIAMETER]] + $ext)); + } else if (is_array($data[self::FIELD_EXTERNAL_DIAMETER])) { + $this->setExternalDiameter(new FHIRQuantity(array_merge($ext, $data[self::FIELD_EXTERNAL_DIAMETER]))); + } } else { $this->setExternalDiameter(new FHIRQuantity($data[self::FIELD_EXTERNAL_DIAMETER])); } @@ -332,8 +346,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_HEIGHT] instanceof FHIRQuantity) { $this->setHeight($data[self::FIELD_HEIGHT]); - } elseif ($ext && is_scalar($data[self::FIELD_HEIGHT])) { - $this->setHeight(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_HEIGHT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_HEIGHT])) { + $this->setHeight(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_HEIGHT]] + $ext)); + } else if (is_array($data[self::FIELD_HEIGHT])) { + $this->setHeight(new FHIRQuantity(array_merge($ext, $data[self::FIELD_HEIGHT]))); + } } else { $this->setHeight(new FHIRQuantity($data[self::FIELD_HEIGHT])); } @@ -341,6 +359,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_IMAGE])) { if (is_array($data[self::FIELD_IMAGE])) { foreach($data[self::FIELD_IMAGE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRAttachment) { $this->addImage($v); } else { @@ -359,17 +380,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IMPRINT])) { foreach($data[self::FIELD_IMPRINT] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRString) { $this->addImprint($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addImprint(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addImprint(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addImprint(new FHIRString(array_merge($v, $ext[$i]))); + } } else { $this->addImprint(new FHIRString($v)); } } } elseif ($data[self::FIELD_IMPRINT] instanceof FHIRString) { $this->addImprint($data[self::FIELD_IMPRINT]); - } elseif ($ext && is_scalar($data[self::FIELD_IMPRINT])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IMPRINT])) { $this->addImprint(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_IMPRINT]] + $ext)); } else { $this->addImprint(new FHIRString($data[self::FIELD_IMPRINT])); @@ -381,8 +409,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NOMINAL_VOLUME] instanceof FHIRQuantity) { $this->setNominalVolume($data[self::FIELD_NOMINAL_VOLUME]); - } elseif ($ext && is_scalar($data[self::FIELD_NOMINAL_VOLUME])) { - $this->setNominalVolume(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_NOMINAL_VOLUME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NOMINAL_VOLUME])) { + $this->setNominalVolume(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_NOMINAL_VOLUME]] + $ext)); + } else if (is_array($data[self::FIELD_NOMINAL_VOLUME])) { + $this->setNominalVolume(new FHIRQuantity(array_merge($ext, $data[self::FIELD_NOMINAL_VOLUME]))); + } } else { $this->setNominalVolume(new FHIRQuantity($data[self::FIELD_NOMINAL_VOLUME])); } @@ -400,8 +432,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SHAPE] instanceof FHIRString) { $this->setShape($data[self::FIELD_SHAPE]); - } elseif ($ext && is_scalar($data[self::FIELD_SHAPE])) { - $this->setShape(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SHAPE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SHAPE])) { + $this->setShape(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SHAPE]] + $ext)); + } else if (is_array($data[self::FIELD_SHAPE])) { + $this->setShape(new FHIRString(array_merge($ext, $data[self::FIELD_SHAPE]))); + } } else { $this->setShape(new FHIRString($data[self::FIELD_SHAPE])); } @@ -412,8 +448,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_WEIGHT] instanceof FHIRQuantity) { $this->setWeight($data[self::FIELD_WEIGHT]); - } elseif ($ext && is_scalar($data[self::FIELD_WEIGHT])) { - $this->setWeight(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_WEIGHT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_WEIGHT])) { + $this->setWeight(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_WEIGHT]] + $ext)); + } else if (is_array($data[self::FIELD_WEIGHT])) { + $this->setWeight(new FHIRQuantity(array_merge($ext, $data[self::FIELD_WEIGHT]))); + } } else { $this->setWeight(new FHIRQuantity($data[self::FIELD_WEIGHT])); } @@ -424,8 +464,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_WIDTH] instanceof FHIRQuantity) { $this->setWidth($data[self::FIELD_WIDTH]); - } elseif ($ext && is_scalar($data[self::FIELD_WIDTH])) { - $this->setWidth(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_WIDTH]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_WIDTH])) { + $this->setWidth(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_WIDTH]] + $ext)); + } else if (is_array($data[self::FIELD_WIDTH])) { + $this->setWidth(new FHIRQuantity(array_merge($ext, $data[self::FIELD_WIDTH]))); + } } else { $this->setWidth(new FHIRQuantity($data[self::FIELD_WIDTH])); } @@ -1095,15 +1139,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDepth())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEPTH, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getExternalDiameter())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EXTERNAL_DIAMETER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getHeight())) { $v->xmlSerialize($sxe->addChild(self::FIELD_HEIGHT, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getImage())) { foreach($vs as $v) { if (null === $v) { @@ -1112,6 +1153,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_IMAGE, null, $v->_getFHIRXMLNamespace())); } } + if ([] !== ($vs = $this->getImprint())) { foreach($vs as $v) { if (null === $v) { @@ -1124,18 +1166,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getNominalVolume())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NOMINAL_VOLUME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getScoring())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SCORING, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getShape())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SHAPE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getWeight())) { $v->xmlSerialize($sxe->addChild(self::FIELD_WEIGHT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getWidth())) { $v->xmlSerialize($sxe->addChild(self::FIELD_WIDTH, null, $v->_getFHIRXMLNamespace())); } @@ -1154,18 +1193,51 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_COLOR][] = $v->getValue(); - $a[self::FIELD_COLOR_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_COLOR][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_COLOR_EXT][] = $enc; + } else { + $a[self::FIELD_COLOR_EXT][] = null; + } + } else { + $a[self::FIELD_COLOR][] = $v; + } } } if (null !== ($v = $this->getDepth())) { - $a[self::FIELD_DEPTH] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DEPTH] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DEPTH_EXT] = $enc; + } + } else { + $a[self::FIELD_DEPTH] = $v; + } } if (null !== ($v = $this->getExternalDiameter())) { - $a[self::FIELD_EXTERNAL_DIAMETER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EXTERNAL_DIAMETER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EXTERNAL_DIAMETER_EXT] = $enc; + } + } else { + $a[self::FIELD_EXTERNAL_DIAMETER] = $v; + } } if (null !== ($v = $this->getHeight())) { - $a[self::FIELD_HEIGHT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_HEIGHT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_HEIGHT_EXT] = $enc; + } + } else { + $a[self::FIELD_HEIGHT] = $v; + } } if ([] !== ($vs = $this->getImage())) { $a[self::FIELD_IMAGE] = $vs; @@ -1176,25 +1248,65 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_IMPRINT][] = $v->getValue(); - $a[self::FIELD_IMPRINT_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IMPRINT][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IMPRINT_EXT][] = $enc; + } else { + $a[self::FIELD_IMPRINT_EXT][] = null; + } + } else { + $a[self::FIELD_IMPRINT][] = $v; + } } } if (null !== ($v = $this->getNominalVolume())) { - $a[self::FIELD_NOMINAL_VOLUME] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NOMINAL_VOLUME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NOMINAL_VOLUME_EXT] = $enc; + } + } else { + $a[self::FIELD_NOMINAL_VOLUME] = $v; + } } if (null !== ($v = $this->getScoring())) { $a[self::FIELD_SCORING] = $v; } if (null !== ($v = $this->getShape())) { - $a[self::FIELD_SHAPE] = $v->getValue(); - $a[self::FIELD_SHAPE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SHAPE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SHAPE_EXT] = $enc; + } + } else { + $a[self::FIELD_SHAPE] = $v; + } } if (null !== ($v = $this->getWeight())) { - $a[self::FIELD_WEIGHT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_WEIGHT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_WEIGHT_EXT] = $enc; + } + } else { + $a[self::FIELD_WEIGHT] = $v; + } } if (null !== ($v = $this->getWidth())) { - $a[self::FIELD_WIDTH] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_WIDTH] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_WIDTH_EXT] = $enc; + } + } else { + $a[self::FIELD_WIDTH] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRProductShelfLife.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRProductShelfLife.php index a59268eac1..11180d5b11 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRProductShelfLife.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRProductShelfLife.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -82,10 +82,6 @@ class FHIRProductShelfLife extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_PRODUCT_SHELF_LIFE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_IDENTIFIER = 'identifier'; const FIELD_IDENTIFIER_EXT = '_identifier'; const FIELD_PERIOD = 'period'; @@ -152,6 +148,9 @@ class FHIRProductShelfLife extends FHIRBackboneElement */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRProductShelfLife Constructor * @param null|array $data @@ -174,8 +173,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->setIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { - $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_IDENTIFIER]))); + } } else { $this->setIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); } @@ -186,8 +189,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PERIOD] instanceof FHIRQuantity) { $this->setPeriod($data[self::FIELD_PERIOD]); - } elseif ($ext && is_scalar($data[self::FIELD_PERIOD])) { - $this->setPeriod(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_PERIOD]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PERIOD])) { + $this->setPeriod(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_PERIOD]] + $ext)); + } else if (is_array($data[self::FIELD_PERIOD])) { + $this->setPeriod(new FHIRQuantity(array_merge($ext, $data[self::FIELD_PERIOD]))); + } } else { $this->setPeriod(new FHIRQuantity($data[self::FIELD_PERIOD])); } @@ -195,6 +202,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SPECIAL_PRECAUTIONS_FOR_STORAGE])) { if (is_array($data[self::FIELD_SPECIAL_PRECAUTIONS_FOR_STORAGE])) { foreach($data[self::FIELD_SPECIAL_PRECAUTIONS_FOR_STORAGE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addSpecialPrecautionsForStorage($v); } else { @@ -508,15 +518,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getSpecialPrecautionsForStorage())) { foreach($vs as $v) { if (null === $v) { @@ -539,10 +546,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_IDENTIFIER] = $v; + } } if (null !== ($v = $this->getPeriod())) { - $a[self::FIELD_PERIOD] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PERIOD] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PERIOD_EXT] = $enc; + } + } else { + $a[self::FIELD_PERIOD] = $v; + } } if ([] !== ($vs = $this->getSpecialPrecautionsForStorage())) { $a[self::FIELD_SPECIAL_PRECAUTIONS_FOR_STORAGE] = $vs; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRProvenance/FHIRProvenanceAgent.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRProvenance/FHIRProvenanceAgent.php index a5e0fb2c5d..4590bc315a 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRProvenance/FHIRProvenanceAgent.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRProvenance/FHIRProvenanceAgent.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -86,10 +86,6 @@ class FHIRProvenanceAgent extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_PROVENANCE_DOT_AGENT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ON_BEHALF_OF = 'onBehalfOf'; const FIELD_ROLE = 'role'; const FIELD_TYPE = 'type'; @@ -142,6 +138,9 @@ class FHIRProvenanceAgent extends FHIRBackboneElement */ protected $who = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRProvenanceAgent Constructor * @param null|array $data @@ -168,6 +167,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ROLE])) { if (is_array($data[self::FIELD_ROLE])) { foreach($data[self::FIELD_ROLE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addRole($v); } else { @@ -463,11 +465,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getOnBehalfOf())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ON_BEHALF_OF, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getRole())) { foreach($vs as $v) { if (null === $v) { @@ -480,7 +480,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getWho())) { $v->xmlSerialize($sxe->addChild(self::FIELD_WHO, null, $v->_getFHIRXMLNamespace())); } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRProvenance/FHIRProvenanceEntity.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRProvenance/FHIRProvenanceEntity.php index 9b6b870332..75f7f63f91 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRProvenance/FHIRProvenanceEntity.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRProvenance/FHIRProvenanceEntity.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -86,10 +86,6 @@ class FHIRProvenanceEntity extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_PROVENANCE_DOT_ENTITY; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_AGENT = 'agent'; const FIELD_ROLE = 'role'; const FIELD_ROLE_EXT = '_role'; @@ -137,6 +133,9 @@ class FHIRProvenanceEntity extends FHIRBackboneElement */ protected $what = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRProvenanceEntity Constructor * @param null|array $data @@ -156,6 +155,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_AGENT])) { if (is_array($data[self::FIELD_AGENT])) { foreach($data[self::FIELD_AGENT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRProvenanceAgent) { $this->addAgent($v); } else { @@ -174,8 +176,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ROLE] instanceof FHIRProvenanceEntityRole) { $this->setRole($data[self::FIELD_ROLE]); - } elseif ($ext && is_scalar($data[self::FIELD_ROLE])) { - $this->setRole(new FHIRProvenanceEntityRole([FHIRProvenanceEntityRole::FIELD_VALUE => $data[self::FIELD_ROLE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ROLE])) { + $this->setRole(new FHIRProvenanceEntityRole([FHIRProvenanceEntityRole::FIELD_VALUE => $data[self::FIELD_ROLE]] + $ext)); + } else if (is_array($data[self::FIELD_ROLE])) { + $this->setRole(new FHIRProvenanceEntityRole(array_merge($ext, $data[self::FIELD_ROLE]))); + } } else { $this->setRole(new FHIRProvenanceEntityRole($data[self::FIELD_ROLE])); } @@ -442,7 +448,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getAgent())) { foreach($vs as $v) { if (null === $v) { @@ -455,7 +460,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getRole())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ROLE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getWhat())) { $v->xmlSerialize($sxe->addChild(self::FIELD_WHAT, null, $v->_getFHIRXMLNamespace())); } @@ -472,7 +476,15 @@ public function jsonSerialize() $a[self::FIELD_AGENT] = $vs; } if (null !== ($v = $this->getRole())) { - $a[self::FIELD_ROLE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ROLE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ROLE_EXT] = $enc; + } + } else { + $a[self::FIELD_ROLE] = $v; + } } if (null !== ($v = $this->getWhat())) { $a[self::FIELD_WHAT] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRQuestionnaire/FHIRQuestionnaireAnswerOption.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRQuestionnaire/FHIRQuestionnaireAnswerOption.php index bb61d3dfd1..4eb703bff2 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRQuestionnaire/FHIRQuestionnaireAnswerOption.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRQuestionnaire/FHIRQuestionnaireAnswerOption.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -85,10 +85,6 @@ class FHIRQuestionnaireAnswerOption extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_QUESTIONNAIRE_DOT_ANSWER_OPTION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_INITIAL_SELECTED = 'initialSelected'; const FIELD_INITIAL_SELECTED_EXT = '_initialSelected'; const FIELD_VALUE_CODING = 'valueCoding'; @@ -185,6 +181,9 @@ class FHIRQuestionnaireAnswerOption extends FHIRBackboneElement */ protected $valueTime = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRQuestionnaireAnswerOption Constructor * @param null|array $data @@ -207,8 +206,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_INITIAL_SELECTED] instanceof FHIRBoolean) { $this->setInitialSelected($data[self::FIELD_INITIAL_SELECTED]); - } elseif ($ext && is_scalar($data[self::FIELD_INITIAL_SELECTED])) { - $this->setInitialSelected(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_INITIAL_SELECTED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_INITIAL_SELECTED])) { + $this->setInitialSelected(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_INITIAL_SELECTED]] + $ext)); + } else if (is_array($data[self::FIELD_INITIAL_SELECTED])) { + $this->setInitialSelected(new FHIRBoolean(array_merge($ext, $data[self::FIELD_INITIAL_SELECTED]))); + } } else { $this->setInitialSelected(new FHIRBoolean($data[self::FIELD_INITIAL_SELECTED])); } @@ -226,8 +229,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_DATE] instanceof FHIRDate) { $this->setValueDate($data[self::FIELD_VALUE_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_DATE])) { - $this->setValueDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_VALUE_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_DATE])) { + $this->setValueDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_VALUE_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_DATE])) { + $this->setValueDate(new FHIRDate(array_merge($ext, $data[self::FIELD_VALUE_DATE]))); + } } else { $this->setValueDate(new FHIRDate($data[self::FIELD_VALUE_DATE])); } @@ -238,8 +245,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_INTEGER] instanceof FHIRInteger) { $this->setValueInteger($data[self::FIELD_VALUE_INTEGER]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_INTEGER])) { - $this->setValueInteger(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_VALUE_INTEGER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_INTEGER])) { + $this->setValueInteger(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_VALUE_INTEGER]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_INTEGER])) { + $this->setValueInteger(new FHIRInteger(array_merge($ext, $data[self::FIELD_VALUE_INTEGER]))); + } } else { $this->setValueInteger(new FHIRInteger($data[self::FIELD_VALUE_INTEGER])); } @@ -257,8 +268,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_STRING] instanceof FHIRString) { $this->setValueString($data[self::FIELD_VALUE_STRING]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_STRING])) { - $this->setValueString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VALUE_STRING]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_STRING])) { + $this->setValueString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VALUE_STRING]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_STRING])) { + $this->setValueString(new FHIRString(array_merge($ext, $data[self::FIELD_VALUE_STRING]))); + } } else { $this->setValueString(new FHIRString($data[self::FIELD_VALUE_STRING])); } @@ -269,8 +284,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_TIME] instanceof FHIRTime) { $this->setValueTime($data[self::FIELD_VALUE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_TIME])) { - $this->setValueTime(new FHIRTime([FHIRTime::FIELD_VALUE => $data[self::FIELD_VALUE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_TIME])) { + $this->setValueTime(new FHIRTime([FHIRTime::FIELD_VALUE => $data[self::FIELD_VALUE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_TIME])) { + $this->setValueTime(new FHIRTime(array_merge($ext, $data[self::FIELD_VALUE_TIME]))); + } } else { $this->setValueTime(new FHIRTime($data[self::FIELD_VALUE_TIME])); } @@ -677,7 +696,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getInitialSelected())) { $v->xmlSerialize($sxe->addChild(self::FIELD_INITIAL_SELECTED, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueCoding())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_CODING, null, $v->_getFHIRXMLNamespace())); } @@ -687,7 +705,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getValueInteger())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_INTEGER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_REFERENCE, null, $v->_getFHIRXMLNamespace())); } @@ -707,30 +724,65 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getInitialSelected())) { - $a[self::FIELD_INITIAL_SELECTED] = $v->getValue(); - $a[self::FIELD_INITIAL_SELECTED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_INITIAL_SELECTED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_INITIAL_SELECTED_EXT] = $enc; + } + } else { + $a[self::FIELD_INITIAL_SELECTED] = $v; + } } if (null !== ($v = $this->getValueCoding())) { $a[self::FIELD_VALUE_CODING] = $v; } if (null !== ($v = $this->getValueDate())) { - $a[self::FIELD_VALUE_DATE] = $v->getValue(); - $a[self::FIELD_VALUE_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_DATE] = $v; + } } if (null !== ($v = $this->getValueInteger())) { - $a[self::FIELD_VALUE_INTEGER] = $v->getValue(); - $a[self::FIELD_VALUE_INTEGER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_INTEGER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_INTEGER_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_INTEGER] = $v; + } } if (null !== ($v = $this->getValueReference())) { $a[self::FIELD_VALUE_REFERENCE] = $v; } if (null !== ($v = $this->getValueString())) { - $a[self::FIELD_VALUE_STRING] = $v->getValue(); - $a[self::FIELD_VALUE_STRING_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_STRING] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_STRING_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_STRING] = $v; + } } if (null !== ($v = $this->getValueTime())) { - $a[self::FIELD_VALUE_TIME] = $v->getValue(); - $a[self::FIELD_VALUE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_TIME] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRQuestionnaire/FHIRQuestionnaireEnableWhen.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRQuestionnaire/FHIRQuestionnaireEnableWhen.php index fd1176848a..4dfe131330 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRQuestionnaire/FHIRQuestionnaireEnableWhen.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRQuestionnaire/FHIRQuestionnaireEnableWhen.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -89,10 +89,6 @@ class FHIRQuestionnaireEnableWhen extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_QUESTIONNAIRE_DOT_ENABLE_WHEN; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ANSWER_BOOLEAN = 'answerBoolean'; const FIELD_ANSWER_BOOLEAN_EXT = '_answerBoolean'; const FIELD_ANSWER_CODING = 'answerCoding'; @@ -263,6 +259,9 @@ class FHIRQuestionnaireEnableWhen extends FHIRBackboneElement */ protected $question = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRQuestionnaireEnableWhen Constructor * @param null|array $data @@ -285,8 +284,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ANSWER_BOOLEAN] instanceof FHIRBoolean) { $this->setAnswerBoolean($data[self::FIELD_ANSWER_BOOLEAN]); - } elseif ($ext && is_scalar($data[self::FIELD_ANSWER_BOOLEAN])) { - $this->setAnswerBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_ANSWER_BOOLEAN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ANSWER_BOOLEAN])) { + $this->setAnswerBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_ANSWER_BOOLEAN]] + $ext)); + } else if (is_array($data[self::FIELD_ANSWER_BOOLEAN])) { + $this->setAnswerBoolean(new FHIRBoolean(array_merge($ext, $data[self::FIELD_ANSWER_BOOLEAN]))); + } } else { $this->setAnswerBoolean(new FHIRBoolean($data[self::FIELD_ANSWER_BOOLEAN])); } @@ -304,8 +307,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ANSWER_DATE] instanceof FHIRDate) { $this->setAnswerDate($data[self::FIELD_ANSWER_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_ANSWER_DATE])) { - $this->setAnswerDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_ANSWER_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ANSWER_DATE])) { + $this->setAnswerDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_ANSWER_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_ANSWER_DATE])) { + $this->setAnswerDate(new FHIRDate(array_merge($ext, $data[self::FIELD_ANSWER_DATE]))); + } } else { $this->setAnswerDate(new FHIRDate($data[self::FIELD_ANSWER_DATE])); } @@ -316,8 +323,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ANSWER_DATE_TIME] instanceof FHIRDateTime) { $this->setAnswerDateTime($data[self::FIELD_ANSWER_DATE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_ANSWER_DATE_TIME])) { - $this->setAnswerDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_ANSWER_DATE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ANSWER_DATE_TIME])) { + $this->setAnswerDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_ANSWER_DATE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_ANSWER_DATE_TIME])) { + $this->setAnswerDateTime(new FHIRDateTime(array_merge($ext, $data[self::FIELD_ANSWER_DATE_TIME]))); + } } else { $this->setAnswerDateTime(new FHIRDateTime($data[self::FIELD_ANSWER_DATE_TIME])); } @@ -328,8 +339,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ANSWER_DECIMAL] instanceof FHIRDecimal) { $this->setAnswerDecimal($data[self::FIELD_ANSWER_DECIMAL]); - } elseif ($ext && is_scalar($data[self::FIELD_ANSWER_DECIMAL])) { - $this->setAnswerDecimal(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_ANSWER_DECIMAL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ANSWER_DECIMAL])) { + $this->setAnswerDecimal(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_ANSWER_DECIMAL]] + $ext)); + } else if (is_array($data[self::FIELD_ANSWER_DECIMAL])) { + $this->setAnswerDecimal(new FHIRDecimal(array_merge($ext, $data[self::FIELD_ANSWER_DECIMAL]))); + } } else { $this->setAnswerDecimal(new FHIRDecimal($data[self::FIELD_ANSWER_DECIMAL])); } @@ -340,8 +355,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ANSWER_INTEGER] instanceof FHIRInteger) { $this->setAnswerInteger($data[self::FIELD_ANSWER_INTEGER]); - } elseif ($ext && is_scalar($data[self::FIELD_ANSWER_INTEGER])) { - $this->setAnswerInteger(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_ANSWER_INTEGER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ANSWER_INTEGER])) { + $this->setAnswerInteger(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_ANSWER_INTEGER]] + $ext)); + } else if (is_array($data[self::FIELD_ANSWER_INTEGER])) { + $this->setAnswerInteger(new FHIRInteger(array_merge($ext, $data[self::FIELD_ANSWER_INTEGER]))); + } } else { $this->setAnswerInteger(new FHIRInteger($data[self::FIELD_ANSWER_INTEGER])); } @@ -352,8 +371,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ANSWER_QUANTITY] instanceof FHIRQuantity) { $this->setAnswerQuantity($data[self::FIELD_ANSWER_QUANTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_ANSWER_QUANTITY])) { - $this->setAnswerQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_ANSWER_QUANTITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ANSWER_QUANTITY])) { + $this->setAnswerQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_ANSWER_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_ANSWER_QUANTITY])) { + $this->setAnswerQuantity(new FHIRQuantity(array_merge($ext, $data[self::FIELD_ANSWER_QUANTITY]))); + } } else { $this->setAnswerQuantity(new FHIRQuantity($data[self::FIELD_ANSWER_QUANTITY])); } @@ -371,8 +394,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ANSWER_STRING] instanceof FHIRString) { $this->setAnswerString($data[self::FIELD_ANSWER_STRING]); - } elseif ($ext && is_scalar($data[self::FIELD_ANSWER_STRING])) { - $this->setAnswerString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_ANSWER_STRING]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ANSWER_STRING])) { + $this->setAnswerString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_ANSWER_STRING]] + $ext)); + } else if (is_array($data[self::FIELD_ANSWER_STRING])) { + $this->setAnswerString(new FHIRString(array_merge($ext, $data[self::FIELD_ANSWER_STRING]))); + } } else { $this->setAnswerString(new FHIRString($data[self::FIELD_ANSWER_STRING])); } @@ -383,8 +410,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ANSWER_TIME] instanceof FHIRTime) { $this->setAnswerTime($data[self::FIELD_ANSWER_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_ANSWER_TIME])) { - $this->setAnswerTime(new FHIRTime([FHIRTime::FIELD_VALUE => $data[self::FIELD_ANSWER_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ANSWER_TIME])) { + $this->setAnswerTime(new FHIRTime([FHIRTime::FIELD_VALUE => $data[self::FIELD_ANSWER_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_ANSWER_TIME])) { + $this->setAnswerTime(new FHIRTime(array_merge($ext, $data[self::FIELD_ANSWER_TIME]))); + } } else { $this->setAnswerTime(new FHIRTime($data[self::FIELD_ANSWER_TIME])); } @@ -395,8 +426,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_OPERATOR] instanceof FHIRQuestionnaireItemOperator) { $this->setOperator($data[self::FIELD_OPERATOR]); - } elseif ($ext && is_scalar($data[self::FIELD_OPERATOR])) { - $this->setOperator(new FHIRQuestionnaireItemOperator([FHIRQuestionnaireItemOperator::FIELD_VALUE => $data[self::FIELD_OPERATOR]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_OPERATOR])) { + $this->setOperator(new FHIRQuestionnaireItemOperator([FHIRQuestionnaireItemOperator::FIELD_VALUE => $data[self::FIELD_OPERATOR]] + $ext)); + } else if (is_array($data[self::FIELD_OPERATOR])) { + $this->setOperator(new FHIRQuestionnaireItemOperator(array_merge($ext, $data[self::FIELD_OPERATOR]))); + } } else { $this->setOperator(new FHIRQuestionnaireItemOperator($data[self::FIELD_OPERATOR])); } @@ -407,8 +442,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_QUESTION] instanceof FHIRString) { $this->setQuestion($data[self::FIELD_QUESTION]); - } elseif ($ext && is_scalar($data[self::FIELD_QUESTION])) { - $this->setQuestion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_QUESTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_QUESTION])) { + $this->setQuestion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_QUESTION]] + $ext)); + } else if (is_array($data[self::FIELD_QUESTION])) { + $this->setQuestion(new FHIRString(array_merge($ext, $data[self::FIELD_QUESTION]))); + } } else { $this->setQuestion(new FHIRString($data[self::FIELD_QUESTION])); } @@ -1031,7 +1070,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getAnswerBoolean())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ANSWER_BOOLEAN, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getAnswerCoding())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ANSWER_CODING, null, $v->_getFHIRXMLNamespace())); } @@ -1047,11 +1085,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getAnswerInteger())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ANSWER_INTEGER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getAnswerQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ANSWER_QUANTITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getAnswerReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ANSWER_REFERENCE, null, $v->_getFHIRXMLNamespace())); } @@ -1061,7 +1097,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getAnswerTime())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ANSWER_TIME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOperator())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OPERATOR, null, $v->_getFHIRXMLNamespace())); } @@ -1078,48 +1113,120 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getAnswerBoolean())) { - $a[self::FIELD_ANSWER_BOOLEAN] = $v->getValue(); - $a[self::FIELD_ANSWER_BOOLEAN_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ANSWER_BOOLEAN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ANSWER_BOOLEAN_EXT] = $enc; + } + } else { + $a[self::FIELD_ANSWER_BOOLEAN] = $v; + } } if (null !== ($v = $this->getAnswerCoding())) { $a[self::FIELD_ANSWER_CODING] = $v; } if (null !== ($v = $this->getAnswerDate())) { - $a[self::FIELD_ANSWER_DATE] = $v->getValue(); - $a[self::FIELD_ANSWER_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ANSWER_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ANSWER_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_ANSWER_DATE] = $v; + } } if (null !== ($v = $this->getAnswerDateTime())) { - $a[self::FIELD_ANSWER_DATE_TIME] = $v->getValue(); - $a[self::FIELD_ANSWER_DATE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ANSWER_DATE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ANSWER_DATE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_ANSWER_DATE_TIME] = $v; + } } if (null !== ($v = $this->getAnswerDecimal())) { - $a[self::FIELD_ANSWER_DECIMAL] = $v->getValue(); - $a[self::FIELD_ANSWER_DECIMAL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ANSWER_DECIMAL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ANSWER_DECIMAL_EXT] = $enc; + } + } else { + $a[self::FIELD_ANSWER_DECIMAL] = $v; + } } if (null !== ($v = $this->getAnswerInteger())) { - $a[self::FIELD_ANSWER_INTEGER] = $v->getValue(); - $a[self::FIELD_ANSWER_INTEGER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ANSWER_INTEGER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ANSWER_INTEGER_EXT] = $enc; + } + } else { + $a[self::FIELD_ANSWER_INTEGER] = $v; + } } if (null !== ($v = $this->getAnswerQuantity())) { - $a[self::FIELD_ANSWER_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ANSWER_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ANSWER_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_ANSWER_QUANTITY] = $v; + } } if (null !== ($v = $this->getAnswerReference())) { $a[self::FIELD_ANSWER_REFERENCE] = $v; } if (null !== ($v = $this->getAnswerString())) { - $a[self::FIELD_ANSWER_STRING] = $v->getValue(); - $a[self::FIELD_ANSWER_STRING_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ANSWER_STRING] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ANSWER_STRING_EXT] = $enc; + } + } else { + $a[self::FIELD_ANSWER_STRING] = $v; + } } if (null !== ($v = $this->getAnswerTime())) { - $a[self::FIELD_ANSWER_TIME] = $v->getValue(); - $a[self::FIELD_ANSWER_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ANSWER_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ANSWER_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_ANSWER_TIME] = $v; + } } if (null !== ($v = $this->getOperator())) { - $a[self::FIELD_OPERATOR] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_OPERATOR] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_OPERATOR_EXT] = $enc; + } + } else { + $a[self::FIELD_OPERATOR] = $v; + } } if (null !== ($v = $this->getQuestion())) { - $a[self::FIELD_QUESTION] = $v->getValue(); - $a[self::FIELD_QUESTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_QUESTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_QUESTION_EXT] = $enc; + } + } else { + $a[self::FIELD_QUESTION] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRQuestionnaire/FHIRQuestionnaireInitial.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRQuestionnaire/FHIRQuestionnaireInitial.php index efe16f11bc..d0e1ad2343 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRQuestionnaire/FHIRQuestionnaireInitial.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRQuestionnaire/FHIRQuestionnaireInitial.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -90,10 +90,6 @@ class FHIRQuestionnaireInitial extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_QUESTIONNAIRE_DOT_INITIAL; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE_ATTACHMENT = 'valueAttachment'; const FIELD_VALUE_BOOLEAN = 'valueBoolean'; const FIELD_VALUE_BOOLEAN_EXT = '_valueBoolean'; @@ -265,6 +261,9 @@ class FHIRQuestionnaireInitial extends FHIRBackboneElement */ protected $valueUri = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRQuestionnaireInitial Constructor * @param null|array $data @@ -294,8 +293,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_BOOLEAN] instanceof FHIRBoolean) { $this->setValueBoolean($data[self::FIELD_VALUE_BOOLEAN]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_BOOLEAN])) { - $this->setValueBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_VALUE_BOOLEAN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_BOOLEAN])) { + $this->setValueBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_VALUE_BOOLEAN]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_BOOLEAN])) { + $this->setValueBoolean(new FHIRBoolean(array_merge($ext, $data[self::FIELD_VALUE_BOOLEAN]))); + } } else { $this->setValueBoolean(new FHIRBoolean($data[self::FIELD_VALUE_BOOLEAN])); } @@ -313,8 +316,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_DATE] instanceof FHIRDate) { $this->setValueDate($data[self::FIELD_VALUE_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_DATE])) { - $this->setValueDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_VALUE_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_DATE])) { + $this->setValueDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_VALUE_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_DATE])) { + $this->setValueDate(new FHIRDate(array_merge($ext, $data[self::FIELD_VALUE_DATE]))); + } } else { $this->setValueDate(new FHIRDate($data[self::FIELD_VALUE_DATE])); } @@ -325,8 +332,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_DATE_TIME] instanceof FHIRDateTime) { $this->setValueDateTime($data[self::FIELD_VALUE_DATE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_DATE_TIME])) { - $this->setValueDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_VALUE_DATE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_DATE_TIME])) { + $this->setValueDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_VALUE_DATE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_DATE_TIME])) { + $this->setValueDateTime(new FHIRDateTime(array_merge($ext, $data[self::FIELD_VALUE_DATE_TIME]))); + } } else { $this->setValueDateTime(new FHIRDateTime($data[self::FIELD_VALUE_DATE_TIME])); } @@ -337,8 +348,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_DECIMAL] instanceof FHIRDecimal) { $this->setValueDecimal($data[self::FIELD_VALUE_DECIMAL]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_DECIMAL])) { - $this->setValueDecimal(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_VALUE_DECIMAL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_DECIMAL])) { + $this->setValueDecimal(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_VALUE_DECIMAL]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_DECIMAL])) { + $this->setValueDecimal(new FHIRDecimal(array_merge($ext, $data[self::FIELD_VALUE_DECIMAL]))); + } } else { $this->setValueDecimal(new FHIRDecimal($data[self::FIELD_VALUE_DECIMAL])); } @@ -349,8 +364,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_INTEGER] instanceof FHIRInteger) { $this->setValueInteger($data[self::FIELD_VALUE_INTEGER]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_INTEGER])) { - $this->setValueInteger(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_VALUE_INTEGER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_INTEGER])) { + $this->setValueInteger(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_VALUE_INTEGER]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_INTEGER])) { + $this->setValueInteger(new FHIRInteger(array_merge($ext, $data[self::FIELD_VALUE_INTEGER]))); + } } else { $this->setValueInteger(new FHIRInteger($data[self::FIELD_VALUE_INTEGER])); } @@ -361,8 +380,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_QUANTITY] instanceof FHIRQuantity) { $this->setValueQuantity($data[self::FIELD_VALUE_QUANTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_QUANTITY])) { - $this->setValueQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_VALUE_QUANTITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_QUANTITY])) { + $this->setValueQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_VALUE_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_QUANTITY])) { + $this->setValueQuantity(new FHIRQuantity(array_merge($ext, $data[self::FIELD_VALUE_QUANTITY]))); + } } else { $this->setValueQuantity(new FHIRQuantity($data[self::FIELD_VALUE_QUANTITY])); } @@ -380,8 +403,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_STRING] instanceof FHIRString) { $this->setValueString($data[self::FIELD_VALUE_STRING]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_STRING])) { - $this->setValueString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VALUE_STRING]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_STRING])) { + $this->setValueString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VALUE_STRING]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_STRING])) { + $this->setValueString(new FHIRString(array_merge($ext, $data[self::FIELD_VALUE_STRING]))); + } } else { $this->setValueString(new FHIRString($data[self::FIELD_VALUE_STRING])); } @@ -392,8 +419,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_TIME] instanceof FHIRTime) { $this->setValueTime($data[self::FIELD_VALUE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_TIME])) { - $this->setValueTime(new FHIRTime([FHIRTime::FIELD_VALUE => $data[self::FIELD_VALUE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_TIME])) { + $this->setValueTime(new FHIRTime([FHIRTime::FIELD_VALUE => $data[self::FIELD_VALUE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_TIME])) { + $this->setValueTime(new FHIRTime(array_merge($ext, $data[self::FIELD_VALUE_TIME]))); + } } else { $this->setValueTime(new FHIRTime($data[self::FIELD_VALUE_TIME])); } @@ -404,8 +435,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_URI] instanceof FHIRUri) { $this->setValueUri($data[self::FIELD_VALUE_URI]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_URI])) { - $this->setValueUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_VALUE_URI]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_URI])) { + $this->setValueUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_VALUE_URI]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_URI])) { + $this->setValueUri(new FHIRUri(array_merge($ext, $data[self::FIELD_VALUE_URI]))); + } } else { $this->setValueUri(new FHIRUri($data[self::FIELD_VALUE_URI])); } @@ -1029,14 +1064,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValueAttachment())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_ATTACHMENT, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getValueBoolean())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_BOOLEAN, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueCoding())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_CODING, null, $v->_getFHIRXMLNamespace())); } @@ -1052,11 +1085,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getValueInteger())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_INTEGER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_QUANTITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_REFERENCE, null, $v->_getFHIRXMLNamespace())); } @@ -1082,45 +1113,109 @@ public function jsonSerialize() $a[self::FIELD_VALUE_ATTACHMENT] = $v; } if (null !== ($v = $this->getValueBoolean())) { - $a[self::FIELD_VALUE_BOOLEAN] = $v->getValue(); - $a[self::FIELD_VALUE_BOOLEAN_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_BOOLEAN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_BOOLEAN_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_BOOLEAN] = $v; + } } if (null !== ($v = $this->getValueCoding())) { $a[self::FIELD_VALUE_CODING] = $v; } if (null !== ($v = $this->getValueDate())) { - $a[self::FIELD_VALUE_DATE] = $v->getValue(); - $a[self::FIELD_VALUE_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_DATE] = $v; + } } if (null !== ($v = $this->getValueDateTime())) { - $a[self::FIELD_VALUE_DATE_TIME] = $v->getValue(); - $a[self::FIELD_VALUE_DATE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_DATE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_DATE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_DATE_TIME] = $v; + } } if (null !== ($v = $this->getValueDecimal())) { - $a[self::FIELD_VALUE_DECIMAL] = $v->getValue(); - $a[self::FIELD_VALUE_DECIMAL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_DECIMAL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_DECIMAL_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_DECIMAL] = $v; + } } if (null !== ($v = $this->getValueInteger())) { - $a[self::FIELD_VALUE_INTEGER] = $v->getValue(); - $a[self::FIELD_VALUE_INTEGER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_INTEGER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_INTEGER_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_INTEGER] = $v; + } } if (null !== ($v = $this->getValueQuantity())) { - $a[self::FIELD_VALUE_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_QUANTITY] = $v; + } } if (null !== ($v = $this->getValueReference())) { $a[self::FIELD_VALUE_REFERENCE] = $v; } if (null !== ($v = $this->getValueString())) { - $a[self::FIELD_VALUE_STRING] = $v->getValue(); - $a[self::FIELD_VALUE_STRING_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_STRING] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_STRING_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_STRING] = $v; + } } if (null !== ($v = $this->getValueTime())) { - $a[self::FIELD_VALUE_TIME] = $v->getValue(); - $a[self::FIELD_VALUE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_TIME] = $v; + } } if (null !== ($v = $this->getValueUri())) { - $a[self::FIELD_VALUE_URI] = $v->getValue(); - $a[self::FIELD_VALUE_URI_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_URI] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_URI_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_URI] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRQuestionnaire/FHIRQuestionnaireItem.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRQuestionnaire/FHIRQuestionnaireItem.php index 163f4d8013..14115f376d 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRQuestionnaire/FHIRQuestionnaireItem.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRQuestionnaire/FHIRQuestionnaireItem.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -86,10 +86,6 @@ class FHIRQuestionnaireItem extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_QUESTIONNAIRE_DOT_ITEM; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ANSWER_OPTION = 'answerOption'; const FIELD_ANSWER_VALUE_SET = 'answerValueSet'; const FIELD_ANSWER_VALUE_SET_EXT = '_answerValueSet'; @@ -317,6 +313,9 @@ class FHIRQuestionnaireItem extends FHIRBackboneElement */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRQuestionnaireItem Constructor * @param null|array $data @@ -336,6 +335,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ANSWER_OPTION])) { if (is_array($data[self::FIELD_ANSWER_OPTION])) { foreach($data[self::FIELD_ANSWER_OPTION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRQuestionnaireAnswerOption) { $this->addAnswerOption($v); } else { @@ -354,8 +356,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ANSWER_VALUE_SET] instanceof FHIRCanonical) { $this->setAnswerValueSet($data[self::FIELD_ANSWER_VALUE_SET]); - } elseif ($ext && is_scalar($data[self::FIELD_ANSWER_VALUE_SET])) { - $this->setAnswerValueSet(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $data[self::FIELD_ANSWER_VALUE_SET]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ANSWER_VALUE_SET])) { + $this->setAnswerValueSet(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $data[self::FIELD_ANSWER_VALUE_SET]] + $ext)); + } else if (is_array($data[self::FIELD_ANSWER_VALUE_SET])) { + $this->setAnswerValueSet(new FHIRCanonical(array_merge($ext, $data[self::FIELD_ANSWER_VALUE_SET]))); + } } else { $this->setAnswerValueSet(new FHIRCanonical($data[self::FIELD_ANSWER_VALUE_SET])); } @@ -363,6 +369,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CODE])) { if (is_array($data[self::FIELD_CODE])) { foreach($data[self::FIELD_CODE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCoding) { $this->addCode($v); } else { @@ -381,8 +390,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DEFINITION] instanceof FHIRUri) { $this->setDefinition($data[self::FIELD_DEFINITION]); - } elseif ($ext && is_scalar($data[self::FIELD_DEFINITION])) { - $this->setDefinition(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_DEFINITION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DEFINITION])) { + $this->setDefinition(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_DEFINITION]] + $ext)); + } else if (is_array($data[self::FIELD_DEFINITION])) { + $this->setDefinition(new FHIRUri(array_merge($ext, $data[self::FIELD_DEFINITION]))); + } } else { $this->setDefinition(new FHIRUri($data[self::FIELD_DEFINITION])); } @@ -393,8 +406,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ENABLE_BEHAVIOR] instanceof FHIREnableWhenBehavior) { $this->setEnableBehavior($data[self::FIELD_ENABLE_BEHAVIOR]); - } elseif ($ext && is_scalar($data[self::FIELD_ENABLE_BEHAVIOR])) { - $this->setEnableBehavior(new FHIREnableWhenBehavior([FHIREnableWhenBehavior::FIELD_VALUE => $data[self::FIELD_ENABLE_BEHAVIOR]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ENABLE_BEHAVIOR])) { + $this->setEnableBehavior(new FHIREnableWhenBehavior([FHIREnableWhenBehavior::FIELD_VALUE => $data[self::FIELD_ENABLE_BEHAVIOR]] + $ext)); + } else if (is_array($data[self::FIELD_ENABLE_BEHAVIOR])) { + $this->setEnableBehavior(new FHIREnableWhenBehavior(array_merge($ext, $data[self::FIELD_ENABLE_BEHAVIOR]))); + } } else { $this->setEnableBehavior(new FHIREnableWhenBehavior($data[self::FIELD_ENABLE_BEHAVIOR])); } @@ -402,6 +419,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ENABLE_WHEN])) { if (is_array($data[self::FIELD_ENABLE_WHEN])) { foreach($data[self::FIELD_ENABLE_WHEN] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRQuestionnaireEnableWhen) { $this->addEnableWhen($v); } else { @@ -417,6 +437,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_INITIAL])) { if (is_array($data[self::FIELD_INITIAL])) { foreach($data[self::FIELD_INITIAL] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRQuestionnaireInitial) { $this->addInitial($v); } else { @@ -432,6 +455,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ITEM])) { if (is_array($data[self::FIELD_ITEM])) { foreach($data[self::FIELD_ITEM] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRQuestionnaireItem) { $this->addItem($v); } else { @@ -450,8 +476,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_LINK_ID] instanceof FHIRString) { $this->setLinkId($data[self::FIELD_LINK_ID]); - } elseif ($ext && is_scalar($data[self::FIELD_LINK_ID])) { - $this->setLinkId(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_LINK_ID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_LINK_ID])) { + $this->setLinkId(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_LINK_ID]] + $ext)); + } else if (is_array($data[self::FIELD_LINK_ID])) { + $this->setLinkId(new FHIRString(array_merge($ext, $data[self::FIELD_LINK_ID]))); + } } else { $this->setLinkId(new FHIRString($data[self::FIELD_LINK_ID])); } @@ -462,8 +492,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MAX_LENGTH] instanceof FHIRInteger) { $this->setMaxLength($data[self::FIELD_MAX_LENGTH]); - } elseif ($ext && is_scalar($data[self::FIELD_MAX_LENGTH])) { - $this->setMaxLength(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_MAX_LENGTH]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MAX_LENGTH])) { + $this->setMaxLength(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_MAX_LENGTH]] + $ext)); + } else if (is_array($data[self::FIELD_MAX_LENGTH])) { + $this->setMaxLength(new FHIRInteger(array_merge($ext, $data[self::FIELD_MAX_LENGTH]))); + } } else { $this->setMaxLength(new FHIRInteger($data[self::FIELD_MAX_LENGTH])); } @@ -474,8 +508,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PREFIX] instanceof FHIRString) { $this->setPrefix($data[self::FIELD_PREFIX]); - } elseif ($ext && is_scalar($data[self::FIELD_PREFIX])) { - $this->setPrefix(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PREFIX]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PREFIX])) { + $this->setPrefix(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PREFIX]] + $ext)); + } else if (is_array($data[self::FIELD_PREFIX])) { + $this->setPrefix(new FHIRString(array_merge($ext, $data[self::FIELD_PREFIX]))); + } } else { $this->setPrefix(new FHIRString($data[self::FIELD_PREFIX])); } @@ -486,8 +524,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_READ_ONLY] instanceof FHIRBoolean) { $this->setReadOnly($data[self::FIELD_READ_ONLY]); - } elseif ($ext && is_scalar($data[self::FIELD_READ_ONLY])) { - $this->setReadOnly(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_READ_ONLY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_READ_ONLY])) { + $this->setReadOnly(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_READ_ONLY]] + $ext)); + } else if (is_array($data[self::FIELD_READ_ONLY])) { + $this->setReadOnly(new FHIRBoolean(array_merge($ext, $data[self::FIELD_READ_ONLY]))); + } } else { $this->setReadOnly(new FHIRBoolean($data[self::FIELD_READ_ONLY])); } @@ -498,8 +540,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_REPEATS] instanceof FHIRBoolean) { $this->setRepeats($data[self::FIELD_REPEATS]); - } elseif ($ext && is_scalar($data[self::FIELD_REPEATS])) { - $this->setRepeats(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_REPEATS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_REPEATS])) { + $this->setRepeats(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_REPEATS]] + $ext)); + } else if (is_array($data[self::FIELD_REPEATS])) { + $this->setRepeats(new FHIRBoolean(array_merge($ext, $data[self::FIELD_REPEATS]))); + } } else { $this->setRepeats(new FHIRBoolean($data[self::FIELD_REPEATS])); } @@ -510,8 +556,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_REQUIRED] instanceof FHIRBoolean) { $this->setRequired($data[self::FIELD_REQUIRED]); - } elseif ($ext && is_scalar($data[self::FIELD_REQUIRED])) { - $this->setRequired(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_REQUIRED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_REQUIRED])) { + $this->setRequired(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_REQUIRED]] + $ext)); + } else if (is_array($data[self::FIELD_REQUIRED])) { + $this->setRequired(new FHIRBoolean(array_merge($ext, $data[self::FIELD_REQUIRED]))); + } } else { $this->setRequired(new FHIRBoolean($data[self::FIELD_REQUIRED])); } @@ -522,8 +572,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TEXT] instanceof FHIRString) { $this->setText($data[self::FIELD_TEXT]); - } elseif ($ext && is_scalar($data[self::FIELD_TEXT])) { - $this->setText(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TEXT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TEXT])) { + $this->setText(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TEXT]] + $ext)); + } else if (is_array($data[self::FIELD_TEXT])) { + $this->setText(new FHIRString(array_merge($ext, $data[self::FIELD_TEXT]))); + } } else { $this->setText(new FHIRString($data[self::FIELD_TEXT])); } @@ -534,8 +588,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TYPE] instanceof FHIRQuestionnaireItemType) { $this->setType($data[self::FIELD_TYPE]); - } elseif ($ext && is_scalar($data[self::FIELD_TYPE])) { - $this->setType(new FHIRQuestionnaireItemType([FHIRQuestionnaireItemType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TYPE])) { + $this->setType(new FHIRQuestionnaireItemType([FHIRQuestionnaireItemType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } else if (is_array($data[self::FIELD_TYPE])) { + $this->setType(new FHIRQuestionnaireItemType(array_merge($ext, $data[self::FIELD_TYPE]))); + } } else { $this->setType(new FHIRQuestionnaireItemType($data[self::FIELD_TYPE])); } @@ -1457,7 +1515,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getAnswerOption())) { foreach($vs as $v) { if (null === $v) { @@ -1466,10 +1523,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_ANSWER_OPTION, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getAnswerValueSet())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ANSWER_VALUE_SET, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getCode())) { foreach($vs as $v) { if (null === $v) { @@ -1478,14 +1535,13 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getDefinition())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFINITION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getEnableBehavior())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ENABLE_BEHAVIOR, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getEnableWhen())) { foreach($vs as $v) { if (null === $v) { @@ -1512,6 +1568,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_ITEM, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getLinkId())) { $v->xmlSerialize($sxe->addChild(self::FIELD_LINK_ID, null, $v->_getFHIRXMLNamespace())); } @@ -1533,7 +1590,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getText())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TEXT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -1550,18 +1606,40 @@ public function jsonSerialize() $a[self::FIELD_ANSWER_OPTION] = $vs; } if (null !== ($v = $this->getAnswerValueSet())) { - $a[self::FIELD_ANSWER_VALUE_SET] = $v->getValue(); - $a[self::FIELD_ANSWER_VALUE_SET_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ANSWER_VALUE_SET] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ANSWER_VALUE_SET_EXT] = $enc; + } + } else { + $a[self::FIELD_ANSWER_VALUE_SET] = $v; + } } if ([] !== ($vs = $this->getCode())) { $a[self::FIELD_CODE] = $vs; } if (null !== ($v = $this->getDefinition())) { - $a[self::FIELD_DEFINITION] = $v->getValue(); - $a[self::FIELD_DEFINITION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DEFINITION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DEFINITION_EXT] = $enc; + } + } else { + $a[self::FIELD_DEFINITION] = $v; + } } if (null !== ($v = $this->getEnableBehavior())) { - $a[self::FIELD_ENABLE_BEHAVIOR] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ENABLE_BEHAVIOR] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ENABLE_BEHAVIOR_EXT] = $enc; + } + } else { + $a[self::FIELD_ENABLE_BEHAVIOR] = $v; + } } if ([] !== ($vs = $this->getEnableWhen())) { $a[self::FIELD_ENABLE_WHEN] = $vs; @@ -1573,35 +1651,92 @@ public function jsonSerialize() $a[self::FIELD_ITEM] = $vs; } if (null !== ($v = $this->getLinkId())) { - $a[self::FIELD_LINK_ID] = $v->getValue(); - $a[self::FIELD_LINK_ID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_LINK_ID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_LINK_ID_EXT] = $enc; + } + } else { + $a[self::FIELD_LINK_ID] = $v; + } } if (null !== ($v = $this->getMaxLength())) { - $a[self::FIELD_MAX_LENGTH] = $v->getValue(); - $a[self::FIELD_MAX_LENGTH_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MAX_LENGTH] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MAX_LENGTH_EXT] = $enc; + } + } else { + $a[self::FIELD_MAX_LENGTH] = $v; + } } if (null !== ($v = $this->getPrefix())) { - $a[self::FIELD_PREFIX] = $v->getValue(); - $a[self::FIELD_PREFIX_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PREFIX] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PREFIX_EXT] = $enc; + } + } else { + $a[self::FIELD_PREFIX] = $v; + } } if (null !== ($v = $this->getReadOnly())) { - $a[self::FIELD_READ_ONLY] = $v->getValue(); - $a[self::FIELD_READ_ONLY_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_READ_ONLY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_READ_ONLY_EXT] = $enc; + } + } else { + $a[self::FIELD_READ_ONLY] = $v; + } } if (null !== ($v = $this->getRepeats())) { - $a[self::FIELD_REPEATS] = $v->getValue(); - $a[self::FIELD_REPEATS_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_REPEATS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_REPEATS_EXT] = $enc; + } + } else { + $a[self::FIELD_REPEATS] = $v; + } } if (null !== ($v = $this->getRequired())) { - $a[self::FIELD_REQUIRED] = $v->getValue(); - $a[self::FIELD_REQUIRED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_REQUIRED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_REQUIRED_EXT] = $enc; + } + } else { + $a[self::FIELD_REQUIRED] = $v; + } } if (null !== ($v = $this->getText())) { - $a[self::FIELD_TEXT] = $v->getValue(); - $a[self::FIELD_TEXT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TEXT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TEXT_EXT] = $enc; + } + } else { + $a[self::FIELD_TEXT] = $v; + } } if (null !== ($v = $this->getType())) { - $a[self::FIELD_TYPE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TYPE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TYPE_EXT] = $enc; + } + } else { + $a[self::FIELD_TYPE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRQuestionnaireResponse/FHIRQuestionnaireResponseAnswer.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRQuestionnaireResponse/FHIRQuestionnaireResponseAnswer.php index 89353e690f..a791520fa9 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRQuestionnaireResponse/FHIRQuestionnaireResponseAnswer.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRQuestionnaireResponse/FHIRQuestionnaireResponseAnswer.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -90,10 +90,6 @@ class FHIRQuestionnaireResponseAnswer extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_QUESTIONNAIRE_RESPONSE_DOT_ANSWER; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ITEM = 'item'; const FIELD_VALUE_ATTACHMENT = 'valueAttachment'; const FIELD_VALUE_BOOLEAN = 'valueBoolean'; @@ -277,6 +273,9 @@ class FHIRQuestionnaireResponseAnswer extends FHIRBackboneElement */ protected $valueUri = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRQuestionnaireResponseAnswer Constructor * @param null|array $data @@ -296,6 +295,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ITEM])) { if (is_array($data[self::FIELD_ITEM])) { foreach($data[self::FIELD_ITEM] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRQuestionnaireResponseItem) { $this->addItem($v); } else { @@ -321,8 +323,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_BOOLEAN] instanceof FHIRBoolean) { $this->setValueBoolean($data[self::FIELD_VALUE_BOOLEAN]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_BOOLEAN])) { - $this->setValueBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_VALUE_BOOLEAN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_BOOLEAN])) { + $this->setValueBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_VALUE_BOOLEAN]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_BOOLEAN])) { + $this->setValueBoolean(new FHIRBoolean(array_merge($ext, $data[self::FIELD_VALUE_BOOLEAN]))); + } } else { $this->setValueBoolean(new FHIRBoolean($data[self::FIELD_VALUE_BOOLEAN])); } @@ -340,8 +346,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_DATE] instanceof FHIRDate) { $this->setValueDate($data[self::FIELD_VALUE_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_DATE])) { - $this->setValueDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_VALUE_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_DATE])) { + $this->setValueDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_VALUE_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_DATE])) { + $this->setValueDate(new FHIRDate(array_merge($ext, $data[self::FIELD_VALUE_DATE]))); + } } else { $this->setValueDate(new FHIRDate($data[self::FIELD_VALUE_DATE])); } @@ -352,8 +362,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_DATE_TIME] instanceof FHIRDateTime) { $this->setValueDateTime($data[self::FIELD_VALUE_DATE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_DATE_TIME])) { - $this->setValueDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_VALUE_DATE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_DATE_TIME])) { + $this->setValueDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_VALUE_DATE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_DATE_TIME])) { + $this->setValueDateTime(new FHIRDateTime(array_merge($ext, $data[self::FIELD_VALUE_DATE_TIME]))); + } } else { $this->setValueDateTime(new FHIRDateTime($data[self::FIELD_VALUE_DATE_TIME])); } @@ -364,8 +378,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_DECIMAL] instanceof FHIRDecimal) { $this->setValueDecimal($data[self::FIELD_VALUE_DECIMAL]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_DECIMAL])) { - $this->setValueDecimal(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_VALUE_DECIMAL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_DECIMAL])) { + $this->setValueDecimal(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_VALUE_DECIMAL]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_DECIMAL])) { + $this->setValueDecimal(new FHIRDecimal(array_merge($ext, $data[self::FIELD_VALUE_DECIMAL]))); + } } else { $this->setValueDecimal(new FHIRDecimal($data[self::FIELD_VALUE_DECIMAL])); } @@ -376,8 +394,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_INTEGER] instanceof FHIRInteger) { $this->setValueInteger($data[self::FIELD_VALUE_INTEGER]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_INTEGER])) { - $this->setValueInteger(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_VALUE_INTEGER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_INTEGER])) { + $this->setValueInteger(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_VALUE_INTEGER]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_INTEGER])) { + $this->setValueInteger(new FHIRInteger(array_merge($ext, $data[self::FIELD_VALUE_INTEGER]))); + } } else { $this->setValueInteger(new FHIRInteger($data[self::FIELD_VALUE_INTEGER])); } @@ -388,8 +410,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_QUANTITY] instanceof FHIRQuantity) { $this->setValueQuantity($data[self::FIELD_VALUE_QUANTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_QUANTITY])) { - $this->setValueQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_VALUE_QUANTITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_QUANTITY])) { + $this->setValueQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_VALUE_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_QUANTITY])) { + $this->setValueQuantity(new FHIRQuantity(array_merge($ext, $data[self::FIELD_VALUE_QUANTITY]))); + } } else { $this->setValueQuantity(new FHIRQuantity($data[self::FIELD_VALUE_QUANTITY])); } @@ -407,8 +433,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_STRING] instanceof FHIRString) { $this->setValueString($data[self::FIELD_VALUE_STRING]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_STRING])) { - $this->setValueString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VALUE_STRING]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_STRING])) { + $this->setValueString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VALUE_STRING]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_STRING])) { + $this->setValueString(new FHIRString(array_merge($ext, $data[self::FIELD_VALUE_STRING]))); + } } else { $this->setValueString(new FHIRString($data[self::FIELD_VALUE_STRING])); } @@ -419,8 +449,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_TIME] instanceof FHIRTime) { $this->setValueTime($data[self::FIELD_VALUE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_TIME])) { - $this->setValueTime(new FHIRTime([FHIRTime::FIELD_VALUE => $data[self::FIELD_VALUE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_TIME])) { + $this->setValueTime(new FHIRTime([FHIRTime::FIELD_VALUE => $data[self::FIELD_VALUE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_TIME])) { + $this->setValueTime(new FHIRTime(array_merge($ext, $data[self::FIELD_VALUE_TIME]))); + } } else { $this->setValueTime(new FHIRTime($data[self::FIELD_VALUE_TIME])); } @@ -431,8 +465,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_URI] instanceof FHIRUri) { $this->setValueUri($data[self::FIELD_VALUE_URI]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_URI])) { - $this->setValueUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_VALUE_URI]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_URI])) { + $this->setValueUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_VALUE_URI]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_URI])) { + $this->setValueUri(new FHIRUri(array_merge($ext, $data[self::FIELD_VALUE_URI]))); + } } else { $this->setValueUri(new FHIRUri($data[self::FIELD_VALUE_URI])); } @@ -1117,7 +1155,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getItem())) { foreach($vs as $v) { if (null === $v) { @@ -1133,7 +1170,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getValueBoolean())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_BOOLEAN, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueCoding())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_CODING, null, $v->_getFHIRXMLNamespace())); } @@ -1149,11 +1185,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getValueInteger())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_INTEGER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_QUANTITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_REFERENCE, null, $v->_getFHIRXMLNamespace())); } @@ -1182,45 +1216,109 @@ public function jsonSerialize() $a[self::FIELD_VALUE_ATTACHMENT] = $v; } if (null !== ($v = $this->getValueBoolean())) { - $a[self::FIELD_VALUE_BOOLEAN] = $v->getValue(); - $a[self::FIELD_VALUE_BOOLEAN_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_BOOLEAN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_BOOLEAN_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_BOOLEAN] = $v; + } } if (null !== ($v = $this->getValueCoding())) { $a[self::FIELD_VALUE_CODING] = $v; } if (null !== ($v = $this->getValueDate())) { - $a[self::FIELD_VALUE_DATE] = $v->getValue(); - $a[self::FIELD_VALUE_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_DATE] = $v; + } } if (null !== ($v = $this->getValueDateTime())) { - $a[self::FIELD_VALUE_DATE_TIME] = $v->getValue(); - $a[self::FIELD_VALUE_DATE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_DATE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_DATE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_DATE_TIME] = $v; + } } if (null !== ($v = $this->getValueDecimal())) { - $a[self::FIELD_VALUE_DECIMAL] = $v->getValue(); - $a[self::FIELD_VALUE_DECIMAL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_DECIMAL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_DECIMAL_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_DECIMAL] = $v; + } } if (null !== ($v = $this->getValueInteger())) { - $a[self::FIELD_VALUE_INTEGER] = $v->getValue(); - $a[self::FIELD_VALUE_INTEGER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_INTEGER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_INTEGER_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_INTEGER] = $v; + } } if (null !== ($v = $this->getValueQuantity())) { - $a[self::FIELD_VALUE_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_QUANTITY] = $v; + } } if (null !== ($v = $this->getValueReference())) { $a[self::FIELD_VALUE_REFERENCE] = $v; } if (null !== ($v = $this->getValueString())) { - $a[self::FIELD_VALUE_STRING] = $v->getValue(); - $a[self::FIELD_VALUE_STRING_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_STRING] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_STRING_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_STRING] = $v; + } } if (null !== ($v = $this->getValueTime())) { - $a[self::FIELD_VALUE_TIME] = $v->getValue(); - $a[self::FIELD_VALUE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_TIME] = $v; + } } if (null !== ($v = $this->getValueUri())) { - $a[self::FIELD_VALUE_URI] = $v->getValue(); - $a[self::FIELD_VALUE_URI_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_URI] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_URI_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_URI] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRQuestionnaireResponse/FHIRQuestionnaireResponseItem.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRQuestionnaireResponse/FHIRQuestionnaireResponseItem.php index e0d0407dc7..95a3beaa6b 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRQuestionnaireResponse/FHIRQuestionnaireResponseItem.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRQuestionnaireResponse/FHIRQuestionnaireResponseItem.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRQuestionnaireResponseItem extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_QUESTIONNAIRE_RESPONSE_DOT_ITEM; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ANSWER = 'answer'; const FIELD_DEFINITION = 'definition'; const FIELD_DEFINITION_EXT = '_definition'; @@ -151,6 +147,9 @@ class FHIRQuestionnaireResponseItem extends FHIRBackboneElement */ protected $text = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRQuestionnaireResponseItem Constructor * @param null|array $data @@ -170,6 +169,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ANSWER])) { if (is_array($data[self::FIELD_ANSWER])) { foreach($data[self::FIELD_ANSWER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRQuestionnaireResponseAnswer) { $this->addAnswer($v); } else { @@ -188,8 +190,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DEFINITION] instanceof FHIRUri) { $this->setDefinition($data[self::FIELD_DEFINITION]); - } elseif ($ext && is_scalar($data[self::FIELD_DEFINITION])) { - $this->setDefinition(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_DEFINITION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DEFINITION])) { + $this->setDefinition(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_DEFINITION]] + $ext)); + } else if (is_array($data[self::FIELD_DEFINITION])) { + $this->setDefinition(new FHIRUri(array_merge($ext, $data[self::FIELD_DEFINITION]))); + } } else { $this->setDefinition(new FHIRUri($data[self::FIELD_DEFINITION])); } @@ -197,6 +203,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ITEM])) { if (is_array($data[self::FIELD_ITEM])) { foreach($data[self::FIELD_ITEM] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRQuestionnaireResponseItem) { $this->addItem($v); } else { @@ -215,8 +224,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_LINK_ID] instanceof FHIRString) { $this->setLinkId($data[self::FIELD_LINK_ID]); - } elseif ($ext && is_scalar($data[self::FIELD_LINK_ID])) { - $this->setLinkId(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_LINK_ID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_LINK_ID])) { + $this->setLinkId(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_LINK_ID]] + $ext)); + } else if (is_array($data[self::FIELD_LINK_ID])) { + $this->setLinkId(new FHIRString(array_merge($ext, $data[self::FIELD_LINK_ID]))); + } } else { $this->setLinkId(new FHIRString($data[self::FIELD_LINK_ID])); } @@ -227,8 +240,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TEXT] instanceof FHIRString) { $this->setText($data[self::FIELD_TEXT]); - } elseif ($ext && is_scalar($data[self::FIELD_TEXT])) { - $this->setText(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TEXT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TEXT])) { + $this->setText(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TEXT]] + $ext)); + } else if (is_array($data[self::FIELD_TEXT])) { + $this->setText(new FHIRString(array_merge($ext, $data[self::FIELD_TEXT]))); + } } else { $this->setText(new FHIRString($data[self::FIELD_TEXT])); } @@ -594,7 +611,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getAnswer())) { foreach($vs as $v) { if (null === $v) { @@ -603,10 +619,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_ANSWER, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getDefinition())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFINITION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getItem())) { foreach($vs as $v) { if (null === $v) { @@ -615,6 +631,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_ITEM, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getLinkId())) { $v->xmlSerialize($sxe->addChild(self::FIELD_LINK_ID, null, $v->_getFHIRXMLNamespace())); } @@ -634,19 +651,40 @@ public function jsonSerialize() $a[self::FIELD_ANSWER] = $vs; } if (null !== ($v = $this->getDefinition())) { - $a[self::FIELD_DEFINITION] = $v->getValue(); - $a[self::FIELD_DEFINITION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DEFINITION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DEFINITION_EXT] = $enc; + } + } else { + $a[self::FIELD_DEFINITION] = $v; + } } if ([] !== ($vs = $this->getItem())) { $a[self::FIELD_ITEM] = $vs; } if (null !== ($v = $this->getLinkId())) { - $a[self::FIELD_LINK_ID] = $v->getValue(); - $a[self::FIELD_LINK_ID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_LINK_ID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_LINK_ID_EXT] = $enc; + } + } else { + $a[self::FIELD_LINK_ID] = $v; + } } if (null !== ($v = $this->getText())) { - $a[self::FIELD_TEXT] = $v->getValue(); - $a[self::FIELD_TEXT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TEXT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TEXT_EXT] = $enc; + } + } else { + $a[self::FIELD_TEXT] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRRelatedPerson/FHIRRelatedPersonCommunication.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRRelatedPerson/FHIRRelatedPersonCommunication.php index 2c6b7fa473..7a7664503f 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRRelatedPerson/FHIRRelatedPersonCommunication.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRRelatedPerson/FHIRRelatedPersonCommunication.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRRelatedPersonCommunication extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_RELATED_PERSON_DOT_COMMUNICATION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_LANGUAGE = 'language'; const FIELD_PREFERRED = 'preferred'; const FIELD_PREFERRED_EXT = '_preferred'; @@ -114,6 +110,9 @@ class FHIRRelatedPersonCommunication extends FHIRBackboneElement */ protected $preferred = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRRelatedPersonCommunication Constructor * @param null|array $data @@ -143,8 +142,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PREFERRED] instanceof FHIRBoolean) { $this->setPreferred($data[self::FIELD_PREFERRED]); - } elseif ($ext && is_scalar($data[self::FIELD_PREFERRED])) { - $this->setPreferred(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_PREFERRED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PREFERRED])) { + $this->setPreferred(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_PREFERRED]] + $ext)); + } else if (is_array($data[self::FIELD_PREFERRED])) { + $this->setPreferred(new FHIRBoolean(array_merge($ext, $data[self::FIELD_PREFERRED]))); + } } else { $this->setPreferred(new FHIRBoolean($data[self::FIELD_PREFERRED])); } @@ -335,7 +338,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getLanguage())) { $v->xmlSerialize($sxe->addChild(self::FIELD_LANGUAGE, null, $v->_getFHIRXMLNamespace())); } @@ -355,8 +357,15 @@ public function jsonSerialize() $a[self::FIELD_LANGUAGE] = $v; } if (null !== ($v = $this->getPreferred())) { - $a[self::FIELD_PREFERRED] = $v->getValue(); - $a[self::FIELD_PREFERRED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PREFERRED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PREFERRED_EXT] = $enc; + } + } else { + $a[self::FIELD_PREFERRED] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRRequestGroup/FHIRRequestGroupAction.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRRequestGroup/FHIRRequestGroupAction.php index 9ca061f7ea..1ee5c46824 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRRequestGroup/FHIRRequestGroupAction.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRRequestGroup/FHIRRequestGroupAction.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -93,10 +93,6 @@ class FHIRRequestGroupAction extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_REQUEST_GROUP_DOT_ACTION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ACTION = 'action'; const FIELD_CARDINALITY_BEHAVIOR = 'cardinalityBehavior'; const FIELD_CARDINALITY_BEHAVIOR_EXT = '_cardinalityBehavior'; @@ -123,9 +119,11 @@ class FHIRRequestGroupAction extends FHIRBackboneElement const FIELD_TEXT_EQUIVALENT = 'textEquivalent'; const FIELD_TEXT_EQUIVALENT_EXT = '_textEquivalent'; const FIELD_TIMING_AGE = 'timingAge'; + const FIELD_TIMING_AGE_EXT = '_timingAge'; const FIELD_TIMING_DATE_TIME = 'timingDateTime'; const FIELD_TIMING_DATE_TIME_EXT = '_timingDateTime'; const FIELD_TIMING_DURATION = 'timingDuration'; + const FIELD_TIMING_DURATION_EXT = '_timingDuration'; const FIELD_TIMING_PERIOD = 'timingPeriod'; const FIELD_TIMING_RANGE = 'timingRange'; const FIELD_TIMING_TIMING = 'timingTiming'; @@ -414,6 +412,9 @@ class FHIRRequestGroupAction extends FHIRBackboneElement */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRRequestGroupAction Constructor * @param null|array $data @@ -433,6 +434,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ACTION])) { if (is_array($data[self::FIELD_ACTION])) { foreach($data[self::FIELD_ACTION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRRequestGroupAction) { $this->addAction($v); } else { @@ -451,8 +455,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CARDINALITY_BEHAVIOR] instanceof FHIRActionCardinalityBehavior) { $this->setCardinalityBehavior($data[self::FIELD_CARDINALITY_BEHAVIOR]); - } elseif ($ext && is_scalar($data[self::FIELD_CARDINALITY_BEHAVIOR])) { - $this->setCardinalityBehavior(new FHIRActionCardinalityBehavior([FHIRActionCardinalityBehavior::FIELD_VALUE => $data[self::FIELD_CARDINALITY_BEHAVIOR]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CARDINALITY_BEHAVIOR])) { + $this->setCardinalityBehavior(new FHIRActionCardinalityBehavior([FHIRActionCardinalityBehavior::FIELD_VALUE => $data[self::FIELD_CARDINALITY_BEHAVIOR]] + $ext)); + } else if (is_array($data[self::FIELD_CARDINALITY_BEHAVIOR])) { + $this->setCardinalityBehavior(new FHIRActionCardinalityBehavior(array_merge($ext, $data[self::FIELD_CARDINALITY_BEHAVIOR]))); + } } else { $this->setCardinalityBehavior(new FHIRActionCardinalityBehavior($data[self::FIELD_CARDINALITY_BEHAVIOR])); } @@ -460,6 +468,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CODE])) { if (is_array($data[self::FIELD_CODE])) { foreach($data[self::FIELD_CODE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addCode($v); } else { @@ -475,6 +486,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CONDITION])) { if (is_array($data[self::FIELD_CONDITION])) { foreach($data[self::FIELD_CONDITION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRRequestGroupCondition) { $this->addCondition($v); } else { @@ -493,8 +507,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -502,6 +520,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_DOCUMENTATION])) { if (is_array($data[self::FIELD_DOCUMENTATION])) { foreach($data[self::FIELD_DOCUMENTATION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRRelatedArtifact) { $this->addDocumentation($v); } else { @@ -520,8 +541,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_GROUPING_BEHAVIOR] instanceof FHIRActionGroupingBehavior) { $this->setGroupingBehavior($data[self::FIELD_GROUPING_BEHAVIOR]); - } elseif ($ext && is_scalar($data[self::FIELD_GROUPING_BEHAVIOR])) { - $this->setGroupingBehavior(new FHIRActionGroupingBehavior([FHIRActionGroupingBehavior::FIELD_VALUE => $data[self::FIELD_GROUPING_BEHAVIOR]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_GROUPING_BEHAVIOR])) { + $this->setGroupingBehavior(new FHIRActionGroupingBehavior([FHIRActionGroupingBehavior::FIELD_VALUE => $data[self::FIELD_GROUPING_BEHAVIOR]] + $ext)); + } else if (is_array($data[self::FIELD_GROUPING_BEHAVIOR])) { + $this->setGroupingBehavior(new FHIRActionGroupingBehavior(array_merge($ext, $data[self::FIELD_GROUPING_BEHAVIOR]))); + } } else { $this->setGroupingBehavior(new FHIRActionGroupingBehavior($data[self::FIELD_GROUPING_BEHAVIOR])); } @@ -529,6 +554,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PARTICIPANT])) { if (is_array($data[self::FIELD_PARTICIPANT])) { foreach($data[self::FIELD_PARTICIPANT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addParticipant($v); } else { @@ -547,8 +575,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PRECHECK_BEHAVIOR] instanceof FHIRActionPrecheckBehavior) { $this->setPrecheckBehavior($data[self::FIELD_PRECHECK_BEHAVIOR]); - } elseif ($ext && is_scalar($data[self::FIELD_PRECHECK_BEHAVIOR])) { - $this->setPrecheckBehavior(new FHIRActionPrecheckBehavior([FHIRActionPrecheckBehavior::FIELD_VALUE => $data[self::FIELD_PRECHECK_BEHAVIOR]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PRECHECK_BEHAVIOR])) { + $this->setPrecheckBehavior(new FHIRActionPrecheckBehavior([FHIRActionPrecheckBehavior::FIELD_VALUE => $data[self::FIELD_PRECHECK_BEHAVIOR]] + $ext)); + } else if (is_array($data[self::FIELD_PRECHECK_BEHAVIOR])) { + $this->setPrecheckBehavior(new FHIRActionPrecheckBehavior(array_merge($ext, $data[self::FIELD_PRECHECK_BEHAVIOR]))); + } } else { $this->setPrecheckBehavior(new FHIRActionPrecheckBehavior($data[self::FIELD_PRECHECK_BEHAVIOR])); } @@ -559,8 +591,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PREFIX] instanceof FHIRString) { $this->setPrefix($data[self::FIELD_PREFIX]); - } elseif ($ext && is_scalar($data[self::FIELD_PREFIX])) { - $this->setPrefix(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PREFIX]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PREFIX])) { + $this->setPrefix(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PREFIX]] + $ext)); + } else if (is_array($data[self::FIELD_PREFIX])) { + $this->setPrefix(new FHIRString(array_merge($ext, $data[self::FIELD_PREFIX]))); + } } else { $this->setPrefix(new FHIRString($data[self::FIELD_PREFIX])); } @@ -571,8 +607,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PRIORITY] instanceof FHIRRequestPriority) { $this->setPriority($data[self::FIELD_PRIORITY]); - } elseif ($ext && is_scalar($data[self::FIELD_PRIORITY])) { - $this->setPriority(new FHIRRequestPriority([FHIRRequestPriority::FIELD_VALUE => $data[self::FIELD_PRIORITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PRIORITY])) { + $this->setPriority(new FHIRRequestPriority([FHIRRequestPriority::FIELD_VALUE => $data[self::FIELD_PRIORITY]] + $ext)); + } else if (is_array($data[self::FIELD_PRIORITY])) { + $this->setPriority(new FHIRRequestPriority(array_merge($ext, $data[self::FIELD_PRIORITY]))); + } } else { $this->setPriority(new FHIRRequestPriority($data[self::FIELD_PRIORITY])); } @@ -580,6 +620,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_RELATED_ACTION])) { if (is_array($data[self::FIELD_RELATED_ACTION])) { foreach($data[self::FIELD_RELATED_ACTION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRRequestGroupRelatedAction) { $this->addRelatedAction($v); } else { @@ -598,8 +641,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_REQUIRED_BEHAVIOR] instanceof FHIRActionRequiredBehavior) { $this->setRequiredBehavior($data[self::FIELD_REQUIRED_BEHAVIOR]); - } elseif ($ext && is_scalar($data[self::FIELD_REQUIRED_BEHAVIOR])) { - $this->setRequiredBehavior(new FHIRActionRequiredBehavior([FHIRActionRequiredBehavior::FIELD_VALUE => $data[self::FIELD_REQUIRED_BEHAVIOR]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_REQUIRED_BEHAVIOR])) { + $this->setRequiredBehavior(new FHIRActionRequiredBehavior([FHIRActionRequiredBehavior::FIELD_VALUE => $data[self::FIELD_REQUIRED_BEHAVIOR]] + $ext)); + } else if (is_array($data[self::FIELD_REQUIRED_BEHAVIOR])) { + $this->setRequiredBehavior(new FHIRActionRequiredBehavior(array_merge($ext, $data[self::FIELD_REQUIRED_BEHAVIOR]))); + } } else { $this->setRequiredBehavior(new FHIRActionRequiredBehavior($data[self::FIELD_REQUIRED_BEHAVIOR])); } @@ -617,8 +664,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SELECTION_BEHAVIOR] instanceof FHIRActionSelectionBehavior) { $this->setSelectionBehavior($data[self::FIELD_SELECTION_BEHAVIOR]); - } elseif ($ext && is_scalar($data[self::FIELD_SELECTION_BEHAVIOR])) { - $this->setSelectionBehavior(new FHIRActionSelectionBehavior([FHIRActionSelectionBehavior::FIELD_VALUE => $data[self::FIELD_SELECTION_BEHAVIOR]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SELECTION_BEHAVIOR])) { + $this->setSelectionBehavior(new FHIRActionSelectionBehavior([FHIRActionSelectionBehavior::FIELD_VALUE => $data[self::FIELD_SELECTION_BEHAVIOR]] + $ext)); + } else if (is_array($data[self::FIELD_SELECTION_BEHAVIOR])) { + $this->setSelectionBehavior(new FHIRActionSelectionBehavior(array_merge($ext, $data[self::FIELD_SELECTION_BEHAVIOR]))); + } } else { $this->setSelectionBehavior(new FHIRActionSelectionBehavior($data[self::FIELD_SELECTION_BEHAVIOR])); } @@ -629,15 +680,28 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TEXT_EQUIVALENT] instanceof FHIRString) { $this->setTextEquivalent($data[self::FIELD_TEXT_EQUIVALENT]); - } elseif ($ext && is_scalar($data[self::FIELD_TEXT_EQUIVALENT])) { - $this->setTextEquivalent(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TEXT_EQUIVALENT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TEXT_EQUIVALENT])) { + $this->setTextEquivalent(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TEXT_EQUIVALENT]] + $ext)); + } else if (is_array($data[self::FIELD_TEXT_EQUIVALENT])) { + $this->setTextEquivalent(new FHIRString(array_merge($ext, $data[self::FIELD_TEXT_EQUIVALENT]))); + } } else { $this->setTextEquivalent(new FHIRString($data[self::FIELD_TEXT_EQUIVALENT])); } } if (isset($data[self::FIELD_TIMING_AGE])) { + $ext = (isset($data[self::FIELD_TIMING_AGE_EXT]) && is_array($data[self::FIELD_TIMING_AGE_EXT])) + ? $data[self::FIELD_TIMING_AGE_EXT] + : null; if ($data[self::FIELD_TIMING_AGE] instanceof FHIRAge) { $this->setTimingAge($data[self::FIELD_TIMING_AGE]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TIMING_AGE])) { + $this->setTimingAge(new FHIRAge([FHIRAge::FIELD_VALUE => $data[self::FIELD_TIMING_AGE]] + $ext)); + } else if (is_array($data[self::FIELD_TIMING_AGE])) { + $this->setTimingAge(new FHIRAge(array_merge($ext, $data[self::FIELD_TIMING_AGE]))); + } } else { $this->setTimingAge(new FHIRAge($data[self::FIELD_TIMING_AGE])); } @@ -648,15 +712,28 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TIMING_DATE_TIME] instanceof FHIRDateTime) { $this->setTimingDateTime($data[self::FIELD_TIMING_DATE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_TIMING_DATE_TIME])) { - $this->setTimingDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_TIMING_DATE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TIMING_DATE_TIME])) { + $this->setTimingDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_TIMING_DATE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_TIMING_DATE_TIME])) { + $this->setTimingDateTime(new FHIRDateTime(array_merge($ext, $data[self::FIELD_TIMING_DATE_TIME]))); + } } else { $this->setTimingDateTime(new FHIRDateTime($data[self::FIELD_TIMING_DATE_TIME])); } } if (isset($data[self::FIELD_TIMING_DURATION])) { + $ext = (isset($data[self::FIELD_TIMING_DURATION_EXT]) && is_array($data[self::FIELD_TIMING_DURATION_EXT])) + ? $data[self::FIELD_TIMING_DURATION_EXT] + : null; if ($data[self::FIELD_TIMING_DURATION] instanceof FHIRDuration) { $this->setTimingDuration($data[self::FIELD_TIMING_DURATION]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TIMING_DURATION])) { + $this->setTimingDuration(new FHIRDuration([FHIRDuration::FIELD_VALUE => $data[self::FIELD_TIMING_DURATION]] + $ext)); + } else if (is_array($data[self::FIELD_TIMING_DURATION])) { + $this->setTimingDuration(new FHIRDuration(array_merge($ext, $data[self::FIELD_TIMING_DURATION]))); + } } else { $this->setTimingDuration(new FHIRDuration($data[self::FIELD_TIMING_DURATION])); } @@ -688,8 +765,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TITLE] instanceof FHIRString) { $this->setTitle($data[self::FIELD_TITLE]); - } elseif ($ext && is_scalar($data[self::FIELD_TITLE])) { - $this->setTitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TITLE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TITLE])) { + $this->setTitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TITLE]] + $ext)); + } else if (is_array($data[self::FIELD_TITLE])) { + $this->setTitle(new FHIRString(array_merge($ext, $data[self::FIELD_TITLE]))); + } } else { $this->setTitle(new FHIRString($data[self::FIELD_TITLE])); } @@ -1855,7 +1936,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getAction())) { foreach($vs as $v) { if (null === $v) { @@ -1868,7 +1948,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getCardinalityBehavior())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CARDINALITY_BEHAVIOR, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getCode())) { foreach($vs as $v) { if (null === $v) { @@ -1886,10 +1965,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_CONDITION, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getDescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESCRIPTION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getDocumentation())) { foreach($vs as $v) { if (null === $v) { @@ -1902,7 +1981,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getGroupingBehavior())) { $v->xmlSerialize($sxe->addChild(self::FIELD_GROUPING_BEHAVIOR, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getParticipant())) { foreach($vs as $v) { if (null === $v) { @@ -1918,11 +1996,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getPrefix())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PREFIX, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPriority())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PRIORITY, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getRelatedAction())) { foreach($vs as $v) { if (null === $v) { @@ -1935,44 +2011,36 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getRequiredBehavior())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REQUIRED_BEHAVIOR, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getResource())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RESOURCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSelectionBehavior())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SELECTION_BEHAVIOR, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getTextEquivalent())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TEXT_EQUIVALENT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getTimingAge())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TIMING_AGE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getTimingDateTime())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TIMING_DATE_TIME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getTimingDuration())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TIMING_DURATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getTimingPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TIMING_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getTimingRange())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TIMING_RANGE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getTimingTiming())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TIMING_TIMING, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getTitle())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TITLE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -1989,7 +2057,15 @@ public function jsonSerialize() $a[self::FIELD_ACTION] = $vs; } if (null !== ($v = $this->getCardinalityBehavior())) { - $a[self::FIELD_CARDINALITY_BEHAVIOR] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CARDINALITY_BEHAVIOR] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CARDINALITY_BEHAVIOR_EXT] = $enc; + } + } else { + $a[self::FIELD_CARDINALITY_BEHAVIOR] = $v; + } } if ([] !== ($vs = $this->getCode())) { $a[self::FIELD_CODE] = $vs; @@ -1998,53 +2074,137 @@ public function jsonSerialize() $a[self::FIELD_CONDITION] = $vs; } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if ([] !== ($vs = $this->getDocumentation())) { $a[self::FIELD_DOCUMENTATION] = $vs; } if (null !== ($v = $this->getGroupingBehavior())) { - $a[self::FIELD_GROUPING_BEHAVIOR] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_GROUPING_BEHAVIOR] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_GROUPING_BEHAVIOR_EXT] = $enc; + } + } else { + $a[self::FIELD_GROUPING_BEHAVIOR] = $v; + } } if ([] !== ($vs = $this->getParticipant())) { $a[self::FIELD_PARTICIPANT] = $vs; } if (null !== ($v = $this->getPrecheckBehavior())) { - $a[self::FIELD_PRECHECK_BEHAVIOR] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PRECHECK_BEHAVIOR] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PRECHECK_BEHAVIOR_EXT] = $enc; + } + } else { + $a[self::FIELD_PRECHECK_BEHAVIOR] = $v; + } } if (null !== ($v = $this->getPrefix())) { - $a[self::FIELD_PREFIX] = $v->getValue(); - $a[self::FIELD_PREFIX_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PREFIX] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PREFIX_EXT] = $enc; + } + } else { + $a[self::FIELD_PREFIX] = $v; + } } if (null !== ($v = $this->getPriority())) { - $a[self::FIELD_PRIORITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PRIORITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PRIORITY_EXT] = $enc; + } + } else { + $a[self::FIELD_PRIORITY] = $v; + } } if ([] !== ($vs = $this->getRelatedAction())) { $a[self::FIELD_RELATED_ACTION] = $vs; } if (null !== ($v = $this->getRequiredBehavior())) { - $a[self::FIELD_REQUIRED_BEHAVIOR] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_REQUIRED_BEHAVIOR] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_REQUIRED_BEHAVIOR_EXT] = $enc; + } + } else { + $a[self::FIELD_REQUIRED_BEHAVIOR] = $v; + } } if (null !== ($v = $this->getResource())) { $a[self::FIELD_RESOURCE] = $v; } if (null !== ($v = $this->getSelectionBehavior())) { - $a[self::FIELD_SELECTION_BEHAVIOR] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SELECTION_BEHAVIOR] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SELECTION_BEHAVIOR_EXT] = $enc; + } + } else { + $a[self::FIELD_SELECTION_BEHAVIOR] = $v; + } } if (null !== ($v = $this->getTextEquivalent())) { - $a[self::FIELD_TEXT_EQUIVALENT] = $v->getValue(); - $a[self::FIELD_TEXT_EQUIVALENT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TEXT_EQUIVALENT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TEXT_EQUIVALENT_EXT] = $enc; + } + } else { + $a[self::FIELD_TEXT_EQUIVALENT] = $v; + } } if (null !== ($v = $this->getTimingAge())) { - $a[self::FIELD_TIMING_AGE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TIMING_AGE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TIMING_AGE_EXT] = $enc; + } + } else { + $a[self::FIELD_TIMING_AGE] = $v; + } } if (null !== ($v = $this->getTimingDateTime())) { - $a[self::FIELD_TIMING_DATE_TIME] = $v->getValue(); - $a[self::FIELD_TIMING_DATE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TIMING_DATE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TIMING_DATE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_TIMING_DATE_TIME] = $v; + } } if (null !== ($v = $this->getTimingDuration())) { - $a[self::FIELD_TIMING_DURATION] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TIMING_DURATION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TIMING_DURATION_EXT] = $enc; + } + } else { + $a[self::FIELD_TIMING_DURATION] = $v; + } } if (null !== ($v = $this->getTimingPeriod())) { $a[self::FIELD_TIMING_PERIOD] = $v; @@ -2056,8 +2216,15 @@ public function jsonSerialize() $a[self::FIELD_TIMING_TIMING] = $v; } if (null !== ($v = $this->getTitle())) { - $a[self::FIELD_TITLE] = $v->getValue(); - $a[self::FIELD_TITLE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TITLE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TITLE_EXT] = $enc; + } + } else { + $a[self::FIELD_TITLE] = $v; + } } if (null !== ($v = $this->getType())) { $a[self::FIELD_TYPE] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRRequestGroup/FHIRRequestGroupCondition.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRRequestGroup/FHIRRequestGroupCondition.php index 9fc2e3ab93..46bb21790b 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRRequestGroup/FHIRRequestGroupCondition.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRRequestGroup/FHIRRequestGroupCondition.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRRequestGroupCondition extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_REQUEST_GROUP_DOT_CONDITION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_EXPRESSION = 'expression'; const FIELD_KIND = 'kind'; const FIELD_KIND_EXT = '_kind'; @@ -111,6 +107,9 @@ class FHIRRequestGroupCondition extends FHIRBackboneElement */ protected $kind = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRRequestGroupCondition Constructor * @param null|array $data @@ -140,8 +139,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_KIND] instanceof FHIRActionConditionKind) { $this->setKind($data[self::FIELD_KIND]); - } elseif ($ext && is_scalar($data[self::FIELD_KIND])) { - $this->setKind(new FHIRActionConditionKind([FHIRActionConditionKind::FIELD_VALUE => $data[self::FIELD_KIND]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_KIND])) { + $this->setKind(new FHIRActionConditionKind([FHIRActionConditionKind::FIELD_VALUE => $data[self::FIELD_KIND]] + $ext)); + } else if (is_array($data[self::FIELD_KIND])) { + $this->setKind(new FHIRActionConditionKind(array_merge($ext, $data[self::FIELD_KIND]))); + } } else { $this->setKind(new FHIRActionConditionKind($data[self::FIELD_KIND])); } @@ -317,11 +320,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getExpression())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EXPRESSION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getKind())) { $v->xmlSerialize($sxe->addChild(self::FIELD_KIND, null, $v->_getFHIRXMLNamespace())); } @@ -338,7 +339,15 @@ public function jsonSerialize() $a[self::FIELD_EXPRESSION] = $v; } if (null !== ($v = $this->getKind())) { - $a[self::FIELD_KIND] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_KIND] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_KIND_EXT] = $enc; + } + } else { + $a[self::FIELD_KIND] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRRequestGroup/FHIRRequestGroupRelatedAction.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRRequestGroup/FHIRRequestGroupRelatedAction.php index bfa6ef88a4..2a627e91cb 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRRequestGroup/FHIRRequestGroupRelatedAction.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRRequestGroup/FHIRRequestGroupRelatedAction.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -81,13 +81,10 @@ class FHIRRequestGroupRelatedAction extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_REQUEST_GROUP_DOT_RELATED_ACTION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ACTION_ID = 'actionId'; const FIELD_ACTION_ID_EXT = '_actionId'; const FIELD_OFFSET_DURATION = 'offsetDuration'; + const FIELD_OFFSET_DURATION_EXT = '_offsetDuration'; const FIELD_OFFSET_RANGE = 'offsetRange'; const FIELD_RELATIONSHIP = 'relationship'; const FIELD_RELATIONSHIP_EXT = '_relationship'; @@ -140,6 +137,9 @@ class FHIRRequestGroupRelatedAction extends FHIRBackboneElement */ protected $relationship = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRRequestGroupRelatedAction Constructor * @param null|array $data @@ -162,15 +162,28 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ACTION_ID] instanceof FHIRId) { $this->setActionId($data[self::FIELD_ACTION_ID]); - } elseif ($ext && is_scalar($data[self::FIELD_ACTION_ID])) { - $this->setActionId(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_ACTION_ID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ACTION_ID])) { + $this->setActionId(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_ACTION_ID]] + $ext)); + } else if (is_array($data[self::FIELD_ACTION_ID])) { + $this->setActionId(new FHIRId(array_merge($ext, $data[self::FIELD_ACTION_ID]))); + } } else { $this->setActionId(new FHIRId($data[self::FIELD_ACTION_ID])); } } if (isset($data[self::FIELD_OFFSET_DURATION])) { + $ext = (isset($data[self::FIELD_OFFSET_DURATION_EXT]) && is_array($data[self::FIELD_OFFSET_DURATION_EXT])) + ? $data[self::FIELD_OFFSET_DURATION_EXT] + : null; if ($data[self::FIELD_OFFSET_DURATION] instanceof FHIRDuration) { $this->setOffsetDuration($data[self::FIELD_OFFSET_DURATION]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_OFFSET_DURATION])) { + $this->setOffsetDuration(new FHIRDuration([FHIRDuration::FIELD_VALUE => $data[self::FIELD_OFFSET_DURATION]] + $ext)); + } else if (is_array($data[self::FIELD_OFFSET_DURATION])) { + $this->setOffsetDuration(new FHIRDuration(array_merge($ext, $data[self::FIELD_OFFSET_DURATION]))); + } } else { $this->setOffsetDuration(new FHIRDuration($data[self::FIELD_OFFSET_DURATION])); } @@ -188,8 +201,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_RELATIONSHIP] instanceof FHIRActionRelationshipType) { $this->setRelationship($data[self::FIELD_RELATIONSHIP]); - } elseif ($ext && is_scalar($data[self::FIELD_RELATIONSHIP])) { - $this->setRelationship(new FHIRActionRelationshipType([FHIRActionRelationshipType::FIELD_VALUE => $data[self::FIELD_RELATIONSHIP]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_RELATIONSHIP])) { + $this->setRelationship(new FHIRActionRelationshipType([FHIRActionRelationshipType::FIELD_VALUE => $data[self::FIELD_RELATIONSHIP]] + $ext)); + } else if (is_array($data[self::FIELD_RELATIONSHIP])) { + $this->setRelationship(new FHIRActionRelationshipType(array_merge($ext, $data[self::FIELD_RELATIONSHIP]))); + } } else { $this->setRelationship(new FHIRActionRelationshipType($data[self::FIELD_RELATIONSHIP])); } @@ -449,15 +466,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getActionId())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ACTION_ID, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOffsetDuration())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OFFSET_DURATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOffsetRange())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OFFSET_RANGE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRelationship())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RELATIONSHIP, null, $v->_getFHIRXMLNamespace())); } @@ -471,17 +485,40 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getActionId())) { - $a[self::FIELD_ACTION_ID] = $v->getValue(); - $a[self::FIELD_ACTION_ID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ACTION_ID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ACTION_ID_EXT] = $enc; + } + } else { + $a[self::FIELD_ACTION_ID] = $v; + } } if (null !== ($v = $this->getOffsetDuration())) { - $a[self::FIELD_OFFSET_DURATION] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_OFFSET_DURATION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_OFFSET_DURATION_EXT] = $enc; + } + } else { + $a[self::FIELD_OFFSET_DURATION] = $v; + } } if (null !== ($v = $this->getOffsetRange())) { $a[self::FIELD_OFFSET_RANGE] = $v; } if (null !== ($v = $this->getRelationship())) { - $a[self::FIELD_RELATIONSHIP] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_RELATIONSHIP] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_RELATIONSHIP_EXT] = $enc; + } + } else { + $a[self::FIELD_RELATIONSHIP] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRResearchElementDefinition/FHIRResearchElementDefinitionCharacteristic.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRResearchElementDefinition/FHIRResearchElementDefinitionCharacteristic.php index ecfdb2d08f..08b6c6d0e5 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRResearchElementDefinition/FHIRResearchElementDefinitionCharacteristic.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRResearchElementDefinition/FHIRResearchElementDefinitionCharacteristic.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -89,10 +89,6 @@ class FHIRResearchElementDefinitionCharacteristic extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_RESEARCH_ELEMENT_DEFINITION_DOT_CHARACTERISTIC; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DEFINITION_CANONICAL = 'definitionCanonical'; const FIELD_DEFINITION_CANONICAL_EXT = '_definitionCanonical'; const FIELD_DEFINITION_CODEABLE_CONCEPT = 'definitionCodeableConcept'; @@ -105,20 +101,24 @@ class FHIRResearchElementDefinitionCharacteristic extends FHIRBackboneElement const FIELD_PARTICIPANT_EFFECTIVE_DESCRIPTION = 'participantEffectiveDescription'; const FIELD_PARTICIPANT_EFFECTIVE_DESCRIPTION_EXT = '_participantEffectiveDescription'; const FIELD_PARTICIPANT_EFFECTIVE_DURATION = 'participantEffectiveDuration'; + const FIELD_PARTICIPANT_EFFECTIVE_DURATION_EXT = '_participantEffectiveDuration'; const FIELD_PARTICIPANT_EFFECTIVE_GROUP_MEASURE = 'participantEffectiveGroupMeasure'; const FIELD_PARTICIPANT_EFFECTIVE_GROUP_MEASURE_EXT = '_participantEffectiveGroupMeasure'; const FIELD_PARTICIPANT_EFFECTIVE_PERIOD = 'participantEffectivePeriod'; const FIELD_PARTICIPANT_EFFECTIVE_TIME_FROM_START = 'participantEffectiveTimeFromStart'; + const FIELD_PARTICIPANT_EFFECTIVE_TIME_FROM_START_EXT = '_participantEffectiveTimeFromStart'; const FIELD_PARTICIPANT_EFFECTIVE_TIMING = 'participantEffectiveTiming'; const FIELD_STUDY_EFFECTIVE_DATE_TIME = 'studyEffectiveDateTime'; const FIELD_STUDY_EFFECTIVE_DATE_TIME_EXT = '_studyEffectiveDateTime'; const FIELD_STUDY_EFFECTIVE_DESCRIPTION = 'studyEffectiveDescription'; const FIELD_STUDY_EFFECTIVE_DESCRIPTION_EXT = '_studyEffectiveDescription'; const FIELD_STUDY_EFFECTIVE_DURATION = 'studyEffectiveDuration'; + const FIELD_STUDY_EFFECTIVE_DURATION_EXT = '_studyEffectiveDuration'; const FIELD_STUDY_EFFECTIVE_GROUP_MEASURE = 'studyEffectiveGroupMeasure'; const FIELD_STUDY_EFFECTIVE_GROUP_MEASURE_EXT = '_studyEffectiveGroupMeasure'; const FIELD_STUDY_EFFECTIVE_PERIOD = 'studyEffectivePeriod'; const FIELD_STUDY_EFFECTIVE_TIME_FROM_START = 'studyEffectiveTimeFromStart'; + const FIELD_STUDY_EFFECTIVE_TIME_FROM_START_EXT = '_studyEffectiveTimeFromStart'; const FIELD_STUDY_EFFECTIVE_TIMING = 'studyEffectiveTiming'; const FIELD_UNIT_OF_MEASURE = 'unitOfMeasure'; const FIELD_USAGE_CONTEXT = 'usageContext'; @@ -395,6 +395,9 @@ class FHIRResearchElementDefinitionCharacteristic extends FHIRBackboneElement */ protected $usageContext = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRResearchElementDefinitionCharacteristic Constructor * @param null|array $data @@ -417,8 +420,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DEFINITION_CANONICAL] instanceof FHIRCanonical) { $this->setDefinitionCanonical($data[self::FIELD_DEFINITION_CANONICAL]); - } elseif ($ext && is_scalar($data[self::FIELD_DEFINITION_CANONICAL])) { - $this->setDefinitionCanonical(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $data[self::FIELD_DEFINITION_CANONICAL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DEFINITION_CANONICAL])) { + $this->setDefinitionCanonical(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $data[self::FIELD_DEFINITION_CANONICAL]] + $ext)); + } else if (is_array($data[self::FIELD_DEFINITION_CANONICAL])) { + $this->setDefinitionCanonical(new FHIRCanonical(array_merge($ext, $data[self::FIELD_DEFINITION_CANONICAL]))); + } } else { $this->setDefinitionCanonical(new FHIRCanonical($data[self::FIELD_DEFINITION_CANONICAL])); } @@ -450,8 +457,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EXCLUDE] instanceof FHIRBoolean) { $this->setExclude($data[self::FIELD_EXCLUDE]); - } elseif ($ext && is_scalar($data[self::FIELD_EXCLUDE])) { - $this->setExclude(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_EXCLUDE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EXCLUDE])) { + $this->setExclude(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_EXCLUDE]] + $ext)); + } else if (is_array($data[self::FIELD_EXCLUDE])) { + $this->setExclude(new FHIRBoolean(array_merge($ext, $data[self::FIELD_EXCLUDE]))); + } } else { $this->setExclude(new FHIRBoolean($data[self::FIELD_EXCLUDE])); } @@ -462,8 +473,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PARTICIPANT_EFFECTIVE_DATE_TIME] instanceof FHIRDateTime) { $this->setParticipantEffectiveDateTime($data[self::FIELD_PARTICIPANT_EFFECTIVE_DATE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_PARTICIPANT_EFFECTIVE_DATE_TIME])) { - $this->setParticipantEffectiveDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_PARTICIPANT_EFFECTIVE_DATE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PARTICIPANT_EFFECTIVE_DATE_TIME])) { + $this->setParticipantEffectiveDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_PARTICIPANT_EFFECTIVE_DATE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_PARTICIPANT_EFFECTIVE_DATE_TIME])) { + $this->setParticipantEffectiveDateTime(new FHIRDateTime(array_merge($ext, $data[self::FIELD_PARTICIPANT_EFFECTIVE_DATE_TIME]))); + } } else { $this->setParticipantEffectiveDateTime(new FHIRDateTime($data[self::FIELD_PARTICIPANT_EFFECTIVE_DATE_TIME])); } @@ -474,15 +489,28 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PARTICIPANT_EFFECTIVE_DESCRIPTION] instanceof FHIRString) { $this->setParticipantEffectiveDescription($data[self::FIELD_PARTICIPANT_EFFECTIVE_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_PARTICIPANT_EFFECTIVE_DESCRIPTION])) { - $this->setParticipantEffectiveDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PARTICIPANT_EFFECTIVE_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PARTICIPANT_EFFECTIVE_DESCRIPTION])) { + $this->setParticipantEffectiveDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PARTICIPANT_EFFECTIVE_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_PARTICIPANT_EFFECTIVE_DESCRIPTION])) { + $this->setParticipantEffectiveDescription(new FHIRString(array_merge($ext, $data[self::FIELD_PARTICIPANT_EFFECTIVE_DESCRIPTION]))); + } } else { $this->setParticipantEffectiveDescription(new FHIRString($data[self::FIELD_PARTICIPANT_EFFECTIVE_DESCRIPTION])); } } if (isset($data[self::FIELD_PARTICIPANT_EFFECTIVE_DURATION])) { + $ext = (isset($data[self::FIELD_PARTICIPANT_EFFECTIVE_DURATION_EXT]) && is_array($data[self::FIELD_PARTICIPANT_EFFECTIVE_DURATION_EXT])) + ? $data[self::FIELD_PARTICIPANT_EFFECTIVE_DURATION_EXT] + : null; if ($data[self::FIELD_PARTICIPANT_EFFECTIVE_DURATION] instanceof FHIRDuration) { $this->setParticipantEffectiveDuration($data[self::FIELD_PARTICIPANT_EFFECTIVE_DURATION]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PARTICIPANT_EFFECTIVE_DURATION])) { + $this->setParticipantEffectiveDuration(new FHIRDuration([FHIRDuration::FIELD_VALUE => $data[self::FIELD_PARTICIPANT_EFFECTIVE_DURATION]] + $ext)); + } else if (is_array($data[self::FIELD_PARTICIPANT_EFFECTIVE_DURATION])) { + $this->setParticipantEffectiveDuration(new FHIRDuration(array_merge($ext, $data[self::FIELD_PARTICIPANT_EFFECTIVE_DURATION]))); + } } else { $this->setParticipantEffectiveDuration(new FHIRDuration($data[self::FIELD_PARTICIPANT_EFFECTIVE_DURATION])); } @@ -493,8 +521,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PARTICIPANT_EFFECTIVE_GROUP_MEASURE] instanceof FHIRGroupMeasure) { $this->setParticipantEffectiveGroupMeasure($data[self::FIELD_PARTICIPANT_EFFECTIVE_GROUP_MEASURE]); - } elseif ($ext && is_scalar($data[self::FIELD_PARTICIPANT_EFFECTIVE_GROUP_MEASURE])) { - $this->setParticipantEffectiveGroupMeasure(new FHIRGroupMeasure([FHIRGroupMeasure::FIELD_VALUE => $data[self::FIELD_PARTICIPANT_EFFECTIVE_GROUP_MEASURE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PARTICIPANT_EFFECTIVE_GROUP_MEASURE])) { + $this->setParticipantEffectiveGroupMeasure(new FHIRGroupMeasure([FHIRGroupMeasure::FIELD_VALUE => $data[self::FIELD_PARTICIPANT_EFFECTIVE_GROUP_MEASURE]] + $ext)); + } else if (is_array($data[self::FIELD_PARTICIPANT_EFFECTIVE_GROUP_MEASURE])) { + $this->setParticipantEffectiveGroupMeasure(new FHIRGroupMeasure(array_merge($ext, $data[self::FIELD_PARTICIPANT_EFFECTIVE_GROUP_MEASURE]))); + } } else { $this->setParticipantEffectiveGroupMeasure(new FHIRGroupMeasure($data[self::FIELD_PARTICIPANT_EFFECTIVE_GROUP_MEASURE])); } @@ -507,8 +539,17 @@ public function __construct($data = null) } } if (isset($data[self::FIELD_PARTICIPANT_EFFECTIVE_TIME_FROM_START])) { + $ext = (isset($data[self::FIELD_PARTICIPANT_EFFECTIVE_TIME_FROM_START_EXT]) && is_array($data[self::FIELD_PARTICIPANT_EFFECTIVE_TIME_FROM_START_EXT])) + ? $data[self::FIELD_PARTICIPANT_EFFECTIVE_TIME_FROM_START_EXT] + : null; if ($data[self::FIELD_PARTICIPANT_EFFECTIVE_TIME_FROM_START] instanceof FHIRDuration) { $this->setParticipantEffectiveTimeFromStart($data[self::FIELD_PARTICIPANT_EFFECTIVE_TIME_FROM_START]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PARTICIPANT_EFFECTIVE_TIME_FROM_START])) { + $this->setParticipantEffectiveTimeFromStart(new FHIRDuration([FHIRDuration::FIELD_VALUE => $data[self::FIELD_PARTICIPANT_EFFECTIVE_TIME_FROM_START]] + $ext)); + } else if (is_array($data[self::FIELD_PARTICIPANT_EFFECTIVE_TIME_FROM_START])) { + $this->setParticipantEffectiveTimeFromStart(new FHIRDuration(array_merge($ext, $data[self::FIELD_PARTICIPANT_EFFECTIVE_TIME_FROM_START]))); + } } else { $this->setParticipantEffectiveTimeFromStart(new FHIRDuration($data[self::FIELD_PARTICIPANT_EFFECTIVE_TIME_FROM_START])); } @@ -526,8 +567,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STUDY_EFFECTIVE_DATE_TIME] instanceof FHIRDateTime) { $this->setStudyEffectiveDateTime($data[self::FIELD_STUDY_EFFECTIVE_DATE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_STUDY_EFFECTIVE_DATE_TIME])) { - $this->setStudyEffectiveDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_STUDY_EFFECTIVE_DATE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STUDY_EFFECTIVE_DATE_TIME])) { + $this->setStudyEffectiveDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_STUDY_EFFECTIVE_DATE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_STUDY_EFFECTIVE_DATE_TIME])) { + $this->setStudyEffectiveDateTime(new FHIRDateTime(array_merge($ext, $data[self::FIELD_STUDY_EFFECTIVE_DATE_TIME]))); + } } else { $this->setStudyEffectiveDateTime(new FHIRDateTime($data[self::FIELD_STUDY_EFFECTIVE_DATE_TIME])); } @@ -538,15 +583,28 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STUDY_EFFECTIVE_DESCRIPTION] instanceof FHIRString) { $this->setStudyEffectiveDescription($data[self::FIELD_STUDY_EFFECTIVE_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_STUDY_EFFECTIVE_DESCRIPTION])) { - $this->setStudyEffectiveDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_STUDY_EFFECTIVE_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STUDY_EFFECTIVE_DESCRIPTION])) { + $this->setStudyEffectiveDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_STUDY_EFFECTIVE_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_STUDY_EFFECTIVE_DESCRIPTION])) { + $this->setStudyEffectiveDescription(new FHIRString(array_merge($ext, $data[self::FIELD_STUDY_EFFECTIVE_DESCRIPTION]))); + } } else { $this->setStudyEffectiveDescription(new FHIRString($data[self::FIELD_STUDY_EFFECTIVE_DESCRIPTION])); } } if (isset($data[self::FIELD_STUDY_EFFECTIVE_DURATION])) { + $ext = (isset($data[self::FIELD_STUDY_EFFECTIVE_DURATION_EXT]) && is_array($data[self::FIELD_STUDY_EFFECTIVE_DURATION_EXT])) + ? $data[self::FIELD_STUDY_EFFECTIVE_DURATION_EXT] + : null; if ($data[self::FIELD_STUDY_EFFECTIVE_DURATION] instanceof FHIRDuration) { $this->setStudyEffectiveDuration($data[self::FIELD_STUDY_EFFECTIVE_DURATION]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STUDY_EFFECTIVE_DURATION])) { + $this->setStudyEffectiveDuration(new FHIRDuration([FHIRDuration::FIELD_VALUE => $data[self::FIELD_STUDY_EFFECTIVE_DURATION]] + $ext)); + } else if (is_array($data[self::FIELD_STUDY_EFFECTIVE_DURATION])) { + $this->setStudyEffectiveDuration(new FHIRDuration(array_merge($ext, $data[self::FIELD_STUDY_EFFECTIVE_DURATION]))); + } } else { $this->setStudyEffectiveDuration(new FHIRDuration($data[self::FIELD_STUDY_EFFECTIVE_DURATION])); } @@ -557,8 +615,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STUDY_EFFECTIVE_GROUP_MEASURE] instanceof FHIRGroupMeasure) { $this->setStudyEffectiveGroupMeasure($data[self::FIELD_STUDY_EFFECTIVE_GROUP_MEASURE]); - } elseif ($ext && is_scalar($data[self::FIELD_STUDY_EFFECTIVE_GROUP_MEASURE])) { - $this->setStudyEffectiveGroupMeasure(new FHIRGroupMeasure([FHIRGroupMeasure::FIELD_VALUE => $data[self::FIELD_STUDY_EFFECTIVE_GROUP_MEASURE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STUDY_EFFECTIVE_GROUP_MEASURE])) { + $this->setStudyEffectiveGroupMeasure(new FHIRGroupMeasure([FHIRGroupMeasure::FIELD_VALUE => $data[self::FIELD_STUDY_EFFECTIVE_GROUP_MEASURE]] + $ext)); + } else if (is_array($data[self::FIELD_STUDY_EFFECTIVE_GROUP_MEASURE])) { + $this->setStudyEffectiveGroupMeasure(new FHIRGroupMeasure(array_merge($ext, $data[self::FIELD_STUDY_EFFECTIVE_GROUP_MEASURE]))); + } } else { $this->setStudyEffectiveGroupMeasure(new FHIRGroupMeasure($data[self::FIELD_STUDY_EFFECTIVE_GROUP_MEASURE])); } @@ -571,8 +633,17 @@ public function __construct($data = null) } } if (isset($data[self::FIELD_STUDY_EFFECTIVE_TIME_FROM_START])) { + $ext = (isset($data[self::FIELD_STUDY_EFFECTIVE_TIME_FROM_START_EXT]) && is_array($data[self::FIELD_STUDY_EFFECTIVE_TIME_FROM_START_EXT])) + ? $data[self::FIELD_STUDY_EFFECTIVE_TIME_FROM_START_EXT] + : null; if ($data[self::FIELD_STUDY_EFFECTIVE_TIME_FROM_START] instanceof FHIRDuration) { $this->setStudyEffectiveTimeFromStart($data[self::FIELD_STUDY_EFFECTIVE_TIME_FROM_START]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STUDY_EFFECTIVE_TIME_FROM_START])) { + $this->setStudyEffectiveTimeFromStart(new FHIRDuration([FHIRDuration::FIELD_VALUE => $data[self::FIELD_STUDY_EFFECTIVE_TIME_FROM_START]] + $ext)); + } else if (is_array($data[self::FIELD_STUDY_EFFECTIVE_TIME_FROM_START])) { + $this->setStudyEffectiveTimeFromStart(new FHIRDuration(array_merge($ext, $data[self::FIELD_STUDY_EFFECTIVE_TIME_FROM_START]))); + } } else { $this->setStudyEffectiveTimeFromStart(new FHIRDuration($data[self::FIELD_STUDY_EFFECTIVE_TIME_FROM_START])); } @@ -594,6 +665,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_USAGE_CONTEXT])) { if (is_array($data[self::FIELD_USAGE_CONTEXT])) { foreach($data[self::FIELD_USAGE_CONTEXT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRUsageContext) { $this->addUsageContext($v); } else { @@ -1583,15 +1657,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDefinitionCanonical())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFINITION_CANONICAL, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDefinitionCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFINITION_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDefinitionDataRequirement())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFINITION_DATA_REQUIREMENT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDefinitionExpression())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFINITION_EXPRESSION, null, $v->_getFHIRXMLNamespace())); } @@ -1604,23 +1675,18 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getParticipantEffectiveDescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PARTICIPANT_EFFECTIVE_DESCRIPTION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getParticipantEffectiveDuration())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PARTICIPANT_EFFECTIVE_DURATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getParticipantEffectiveGroupMeasure())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PARTICIPANT_EFFECTIVE_GROUP_MEASURE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getParticipantEffectivePeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PARTICIPANT_EFFECTIVE_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getParticipantEffectiveTimeFromStart())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PARTICIPANT_EFFECTIVE_TIME_FROM_START, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getParticipantEffectiveTiming())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PARTICIPANT_EFFECTIVE_TIMING, null, $v->_getFHIRXMLNamespace())); } @@ -1630,31 +1696,24 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getStudyEffectiveDescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STUDY_EFFECTIVE_DESCRIPTION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStudyEffectiveDuration())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STUDY_EFFECTIVE_DURATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStudyEffectiveGroupMeasure())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STUDY_EFFECTIVE_GROUP_MEASURE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStudyEffectivePeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STUDY_EFFECTIVE_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStudyEffectiveTimeFromStart())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STUDY_EFFECTIVE_TIME_FROM_START, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStudyEffectiveTiming())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STUDY_EFFECTIVE_TIMING, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getUnitOfMeasure())) { $v->xmlSerialize($sxe->addChild(self::FIELD_UNIT_OF_MEASURE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getUsageContext())) { foreach($vs as $v) { if (null === $v) { @@ -1663,6 +1722,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_USAGE_CONTEXT, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } @@ -1673,8 +1733,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getDefinitionCanonical())) { - $a[self::FIELD_DEFINITION_CANONICAL] = $v->getValue(); - $a[self::FIELD_DEFINITION_CANONICAL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DEFINITION_CANONICAL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DEFINITION_CANONICAL_EXT] = $enc; + } + } else { + $a[self::FIELD_DEFINITION_CANONICAL] = $v; + } } if (null !== ($v = $this->getDefinitionCodeableConcept())) { $a[self::FIELD_DEFINITION_CODEABLE_CONCEPT] = $v; @@ -1686,51 +1753,134 @@ public function jsonSerialize() $a[self::FIELD_DEFINITION_EXPRESSION] = $v; } if (null !== ($v = $this->getExclude())) { - $a[self::FIELD_EXCLUDE] = $v->getValue(); - $a[self::FIELD_EXCLUDE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EXCLUDE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EXCLUDE_EXT] = $enc; + } + } else { + $a[self::FIELD_EXCLUDE] = $v; + } } if (null !== ($v = $this->getParticipantEffectiveDateTime())) { - $a[self::FIELD_PARTICIPANT_EFFECTIVE_DATE_TIME] = $v->getValue(); - $a[self::FIELD_PARTICIPANT_EFFECTIVE_DATE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PARTICIPANT_EFFECTIVE_DATE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PARTICIPANT_EFFECTIVE_DATE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_PARTICIPANT_EFFECTIVE_DATE_TIME] = $v; + } } if (null !== ($v = $this->getParticipantEffectiveDescription())) { - $a[self::FIELD_PARTICIPANT_EFFECTIVE_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_PARTICIPANT_EFFECTIVE_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PARTICIPANT_EFFECTIVE_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PARTICIPANT_EFFECTIVE_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_PARTICIPANT_EFFECTIVE_DESCRIPTION] = $v; + } } if (null !== ($v = $this->getParticipantEffectiveDuration())) { - $a[self::FIELD_PARTICIPANT_EFFECTIVE_DURATION] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PARTICIPANT_EFFECTIVE_DURATION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PARTICIPANT_EFFECTIVE_DURATION_EXT] = $enc; + } + } else { + $a[self::FIELD_PARTICIPANT_EFFECTIVE_DURATION] = $v; + } } if (null !== ($v = $this->getParticipantEffectiveGroupMeasure())) { - $a[self::FIELD_PARTICIPANT_EFFECTIVE_GROUP_MEASURE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PARTICIPANT_EFFECTIVE_GROUP_MEASURE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PARTICIPANT_EFFECTIVE_GROUP_MEASURE_EXT] = $enc; + } + } else { + $a[self::FIELD_PARTICIPANT_EFFECTIVE_GROUP_MEASURE] = $v; + } } if (null !== ($v = $this->getParticipantEffectivePeriod())) { $a[self::FIELD_PARTICIPANT_EFFECTIVE_PERIOD] = $v; } if (null !== ($v = $this->getParticipantEffectiveTimeFromStart())) { - $a[self::FIELD_PARTICIPANT_EFFECTIVE_TIME_FROM_START] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PARTICIPANT_EFFECTIVE_TIME_FROM_START] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PARTICIPANT_EFFECTIVE_TIME_FROM_START_EXT] = $enc; + } + } else { + $a[self::FIELD_PARTICIPANT_EFFECTIVE_TIME_FROM_START] = $v; + } } if (null !== ($v = $this->getParticipantEffectiveTiming())) { $a[self::FIELD_PARTICIPANT_EFFECTIVE_TIMING] = $v; } if (null !== ($v = $this->getStudyEffectiveDateTime())) { - $a[self::FIELD_STUDY_EFFECTIVE_DATE_TIME] = $v->getValue(); - $a[self::FIELD_STUDY_EFFECTIVE_DATE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STUDY_EFFECTIVE_DATE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STUDY_EFFECTIVE_DATE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_STUDY_EFFECTIVE_DATE_TIME] = $v; + } } if (null !== ($v = $this->getStudyEffectiveDescription())) { - $a[self::FIELD_STUDY_EFFECTIVE_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_STUDY_EFFECTIVE_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STUDY_EFFECTIVE_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STUDY_EFFECTIVE_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_STUDY_EFFECTIVE_DESCRIPTION] = $v; + } } if (null !== ($v = $this->getStudyEffectiveDuration())) { - $a[self::FIELD_STUDY_EFFECTIVE_DURATION] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STUDY_EFFECTIVE_DURATION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STUDY_EFFECTIVE_DURATION_EXT] = $enc; + } + } else { + $a[self::FIELD_STUDY_EFFECTIVE_DURATION] = $v; + } } if (null !== ($v = $this->getStudyEffectiveGroupMeasure())) { - $a[self::FIELD_STUDY_EFFECTIVE_GROUP_MEASURE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STUDY_EFFECTIVE_GROUP_MEASURE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STUDY_EFFECTIVE_GROUP_MEASURE_EXT] = $enc; + } + } else { + $a[self::FIELD_STUDY_EFFECTIVE_GROUP_MEASURE] = $v; + } } if (null !== ($v = $this->getStudyEffectivePeriod())) { $a[self::FIELD_STUDY_EFFECTIVE_PERIOD] = $v; } if (null !== ($v = $this->getStudyEffectiveTimeFromStart())) { - $a[self::FIELD_STUDY_EFFECTIVE_TIME_FROM_START] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STUDY_EFFECTIVE_TIME_FROM_START] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STUDY_EFFECTIVE_TIME_FROM_START_EXT] = $enc; + } + } else { + $a[self::FIELD_STUDY_EFFECTIVE_TIME_FROM_START] = $v; + } } if (null !== ($v = $this->getStudyEffectiveTiming())) { $a[self::FIELD_STUDY_EFFECTIVE_TIMING] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRResearchStudy/FHIRResearchStudyArm.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRResearchStudy/FHIRResearchStudyArm.php index 31778cc4f5..2bf93bc089 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRResearchStudy/FHIRResearchStudyArm.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRResearchStudy/FHIRResearchStudyArm.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -83,10 +83,6 @@ class FHIRResearchStudyArm extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_RESEARCH_STUDY_DOT_ARM; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DESCRIPTION = 'description'; const FIELD_DESCRIPTION_EXT = '_description'; const FIELD_NAME = 'name'; @@ -129,6 +125,9 @@ class FHIRResearchStudyArm extends FHIRBackboneElement */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRResearchStudyArm Constructor * @param null|array $data @@ -151,8 +150,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -163,8 +166,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -410,7 +417,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NAME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -424,12 +430,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if (null !== ($v = $this->getType())) { $a[self::FIELD_TYPE] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRResearchStudy/FHIRResearchStudyObjective.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRResearchStudy/FHIRResearchStudyObjective.php index d312f9891c..c142b5ff5c 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRResearchStudy/FHIRResearchStudyObjective.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRResearchStudy/FHIRResearchStudyObjective.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -83,10 +83,6 @@ class FHIRResearchStudyObjective extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_RESEARCH_STUDY_DOT_OBJECTIVE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_NAME = 'name'; const FIELD_NAME_EXT = '_name'; const FIELD_TYPE = 'type'; @@ -114,6 +110,9 @@ class FHIRResearchStudyObjective extends FHIRBackboneElement */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRResearchStudyObjective Constructor * @param null|array $data @@ -136,8 +135,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -332,7 +335,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NAME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -346,8 +348,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if (null !== ($v = $this->getType())) { $a[self::FIELD_TYPE] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRRiskAssessment/FHIRRiskAssessmentPrediction.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRRiskAssessment/FHIRRiskAssessmentPrediction.php index 41fc84fa3b..3c8ff94535 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRRiskAssessment/FHIRRiskAssessmentPrediction.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRRiskAssessment/FHIRRiskAssessmentPrediction.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -82,10 +82,6 @@ class FHIRRiskAssessmentPrediction extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_RISK_ASSESSMENT_DOT_PREDICTION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_OUTCOME = 'outcome'; const FIELD_PROBABILITY_DECIMAL = 'probabilityDecimal'; const FIELD_PROBABILITY_DECIMAL_EXT = '_probabilityDecimal'; @@ -199,6 +195,9 @@ class FHIRRiskAssessmentPrediction extends FHIRBackboneElement */ protected $whenRange = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRRiskAssessmentPrediction Constructor * @param null|array $data @@ -228,8 +227,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PROBABILITY_DECIMAL] instanceof FHIRDecimal) { $this->setProbabilityDecimal($data[self::FIELD_PROBABILITY_DECIMAL]); - } elseif ($ext && is_scalar($data[self::FIELD_PROBABILITY_DECIMAL])) { - $this->setProbabilityDecimal(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_PROBABILITY_DECIMAL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PROBABILITY_DECIMAL])) { + $this->setProbabilityDecimal(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_PROBABILITY_DECIMAL]] + $ext)); + } else if (is_array($data[self::FIELD_PROBABILITY_DECIMAL])) { + $this->setProbabilityDecimal(new FHIRDecimal(array_merge($ext, $data[self::FIELD_PROBABILITY_DECIMAL]))); + } } else { $this->setProbabilityDecimal(new FHIRDecimal($data[self::FIELD_PROBABILITY_DECIMAL])); } @@ -254,8 +257,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_RATIONALE] instanceof FHIRString) { $this->setRationale($data[self::FIELD_RATIONALE]); - } elseif ($ext && is_scalar($data[self::FIELD_RATIONALE])) { - $this->setRationale(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_RATIONALE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_RATIONALE])) { + $this->setRationale(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_RATIONALE]] + $ext)); + } else if (is_array($data[self::FIELD_RATIONALE])) { + $this->setRationale(new FHIRString(array_merge($ext, $data[self::FIELD_RATIONALE]))); + } } else { $this->setRationale(new FHIRString($data[self::FIELD_RATIONALE])); } @@ -266,8 +273,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_RELATIVE_RISK] instanceof FHIRDecimal) { $this->setRelativeRisk($data[self::FIELD_RELATIVE_RISK]); - } elseif ($ext && is_scalar($data[self::FIELD_RELATIVE_RISK])) { - $this->setRelativeRisk(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_RELATIVE_RISK]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_RELATIVE_RISK])) { + $this->setRelativeRisk(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_RELATIVE_RISK]] + $ext)); + } else if (is_array($data[self::FIELD_RELATIVE_RISK])) { + $this->setRelativeRisk(new FHIRDecimal(array_merge($ext, $data[self::FIELD_RELATIVE_RISK]))); + } } else { $this->setRelativeRisk(new FHIRDecimal($data[self::FIELD_RELATIVE_RISK])); } @@ -710,18 +721,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getOutcome())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OUTCOME, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getProbabilityDecimal())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PROBABILITY_DECIMAL, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getProbabilityRange())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PROBABILITY_RANGE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getQualitativeRisk())) { $v->xmlSerialize($sxe->addChild(self::FIELD_QUALITATIVE_RISK, null, $v->_getFHIRXMLNamespace())); } @@ -731,11 +739,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getRelativeRisk())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RELATIVE_RISK, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getWhenPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_WHEN_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getWhenRange())) { $v->xmlSerialize($sxe->addChild(self::FIELD_WHEN_RANGE, null, $v->_getFHIRXMLNamespace())); } @@ -752,8 +758,15 @@ public function jsonSerialize() $a[self::FIELD_OUTCOME] = $v; } if (null !== ($v = $this->getProbabilityDecimal())) { - $a[self::FIELD_PROBABILITY_DECIMAL] = $v->getValue(); - $a[self::FIELD_PROBABILITY_DECIMAL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PROBABILITY_DECIMAL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PROBABILITY_DECIMAL_EXT] = $enc; + } + } else { + $a[self::FIELD_PROBABILITY_DECIMAL] = $v; + } } if (null !== ($v = $this->getProbabilityRange())) { $a[self::FIELD_PROBABILITY_RANGE] = $v; @@ -762,12 +775,26 @@ public function jsonSerialize() $a[self::FIELD_QUALITATIVE_RISK] = $v; } if (null !== ($v = $this->getRationale())) { - $a[self::FIELD_RATIONALE] = $v->getValue(); - $a[self::FIELD_RATIONALE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_RATIONALE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_RATIONALE_EXT] = $enc; + } + } else { + $a[self::FIELD_RATIONALE] = $v; + } } if (null !== ($v = $this->getRelativeRisk())) { - $a[self::FIELD_RELATIVE_RISK] = $v->getValue(); - $a[self::FIELD_RELATIVE_RISK_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_RELATIVE_RISK] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_RELATIVE_RISK_EXT] = $enc; + } + } else { + $a[self::FIELD_RELATIVE_RISK] = $v; + } } if (null !== ($v = $this->getWhenPeriod())) { $a[self::FIELD_WHEN_PERIOD] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRRiskEvidenceSynthesis/FHIRRiskEvidenceSynthesisCertainty.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRRiskEvidenceSynthesis/FHIRRiskEvidenceSynthesisCertainty.php index 841400508c..1383fb5daf 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRRiskEvidenceSynthesis/FHIRRiskEvidenceSynthesisCertainty.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRRiskEvidenceSynthesis/FHIRRiskEvidenceSynthesisCertainty.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRRiskEvidenceSynthesisCertainty extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_RISK_EVIDENCE_SYNTHESIS_DOT_CERTAINTY; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CERTAINTY_SUBCOMPONENT = 'certaintySubcomponent'; const FIELD_NOTE = 'note'; const FIELD_RATING = 'rating'; @@ -123,6 +119,9 @@ class FHIRRiskEvidenceSynthesisCertainty extends FHIRBackboneElement */ protected $rating = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRRiskEvidenceSynthesisCertainty Constructor * @param null|array $data @@ -142,6 +141,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CERTAINTY_SUBCOMPONENT])) { if (is_array($data[self::FIELD_CERTAINTY_SUBCOMPONENT])) { foreach($data[self::FIELD_CERTAINTY_SUBCOMPONENT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRRiskEvidenceSynthesisCertaintySubcomponent) { $this->addCertaintySubcomponent($v); } else { @@ -157,6 +159,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_NOTE])) { if (is_array($data[self::FIELD_NOTE])) { foreach($data[self::FIELD_NOTE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRAnnotation) { $this->addNote($v); } else { @@ -172,6 +177,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_RATING])) { if (is_array($data[self::FIELD_RATING])) { foreach($data[self::FIELD_RATING] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addRating($v); } else { @@ -474,7 +482,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getCertaintySubcomponent())) { foreach($vs as $v) { if (null === $v) { @@ -501,6 +508,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_RATING, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRRiskEvidenceSynthesis/FHIRRiskEvidenceSynthesisCertaintySubcomponent.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRRiskEvidenceSynthesis/FHIRRiskEvidenceSynthesisCertaintySubcomponent.php index 863ea77223..eb14177b8e 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRRiskEvidenceSynthesis/FHIRRiskEvidenceSynthesisCertaintySubcomponent.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRRiskEvidenceSynthesis/FHIRRiskEvidenceSynthesisCertaintySubcomponent.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRRiskEvidenceSynthesisCertaintySubcomponent extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_RISK_EVIDENCE_SYNTHESIS_DOT_CERTAINTY_SUBCOMPONENT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_NOTE = 'note'; const FIELD_RATING = 'rating'; const FIELD_TYPE = 'type'; @@ -124,6 +120,9 @@ class FHIRRiskEvidenceSynthesisCertaintySubcomponent extends FHIRBackboneElement */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRRiskEvidenceSynthesisCertaintySubcomponent Constructor * @param null|array $data @@ -143,6 +142,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_NOTE])) { if (is_array($data[self::FIELD_NOTE])) { foreach($data[self::FIELD_NOTE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRAnnotation) { $this->addNote($v); } else { @@ -158,6 +160,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_RATING])) { if (is_array($data[self::FIELD_RATING])) { foreach($data[self::FIELD_RATING] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addRating($v); } else { @@ -441,7 +446,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getNote())) { foreach($vs as $v) { if (null === $v) { diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRRiskEvidenceSynthesis/FHIRRiskEvidenceSynthesisPrecisionEstimate.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRRiskEvidenceSynthesis/FHIRRiskEvidenceSynthesisPrecisionEstimate.php index 877a1bb62d..5b2e78214c 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRRiskEvidenceSynthesis/FHIRRiskEvidenceSynthesisPrecisionEstimate.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRRiskEvidenceSynthesis/FHIRRiskEvidenceSynthesisPrecisionEstimate.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRRiskEvidenceSynthesisPrecisionEstimate extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_RISK_EVIDENCE_SYNTHESIS_DOT_PRECISION_ESTIMATE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_FROM = 'from'; const FIELD_FROM_EXT = '_from'; const FIELD_LEVEL = 'level'; @@ -140,6 +136,9 @@ class FHIRRiskEvidenceSynthesisPrecisionEstimate extends FHIRBackboneElement */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRRiskEvidenceSynthesisPrecisionEstimate Constructor * @param null|array $data @@ -162,8 +161,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_FROM] instanceof FHIRDecimal) { $this->setFrom($data[self::FIELD_FROM]); - } elseif ($ext && is_scalar($data[self::FIELD_FROM])) { - $this->setFrom(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_FROM]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_FROM])) { + $this->setFrom(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_FROM]] + $ext)); + } else if (is_array($data[self::FIELD_FROM])) { + $this->setFrom(new FHIRDecimal(array_merge($ext, $data[self::FIELD_FROM]))); + } } else { $this->setFrom(new FHIRDecimal($data[self::FIELD_FROM])); } @@ -174,8 +177,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_LEVEL] instanceof FHIRDecimal) { $this->setLevel($data[self::FIELD_LEVEL]); - } elseif ($ext && is_scalar($data[self::FIELD_LEVEL])) { - $this->setLevel(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_LEVEL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_LEVEL])) { + $this->setLevel(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_LEVEL]] + $ext)); + } else if (is_array($data[self::FIELD_LEVEL])) { + $this->setLevel(new FHIRDecimal(array_merge($ext, $data[self::FIELD_LEVEL]))); + } } else { $this->setLevel(new FHIRDecimal($data[self::FIELD_LEVEL])); } @@ -186,8 +193,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TO] instanceof FHIRDecimal) { $this->setTo($data[self::FIELD_TO]); - } elseif ($ext && is_scalar($data[self::FIELD_TO])) { - $this->setTo(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_TO]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TO])) { + $this->setTo(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_TO]] + $ext)); + } else if (is_array($data[self::FIELD_TO])) { + $this->setTo(new FHIRDecimal(array_merge($ext, $data[self::FIELD_TO]))); + } } else { $this->setTo(new FHIRDecimal($data[self::FIELD_TO])); } @@ -482,7 +493,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getTo())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TO, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -496,16 +506,37 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getFrom())) { - $a[self::FIELD_FROM] = $v->getValue(); - $a[self::FIELD_FROM_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FROM] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FROM_EXT] = $enc; + } + } else { + $a[self::FIELD_FROM] = $v; + } } if (null !== ($v = $this->getLevel())) { - $a[self::FIELD_LEVEL] = $v->getValue(); - $a[self::FIELD_LEVEL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_LEVEL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_LEVEL_EXT] = $enc; + } + } else { + $a[self::FIELD_LEVEL] = $v; + } } if (null !== ($v = $this->getTo())) { - $a[self::FIELD_TO] = $v->getValue(); - $a[self::FIELD_TO_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TO] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TO_EXT] = $enc; + } + } else { + $a[self::FIELD_TO] = $v; + } } if (null !== ($v = $this->getType())) { $a[self::FIELD_TYPE] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRRiskEvidenceSynthesis/FHIRRiskEvidenceSynthesisRiskEstimate.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRRiskEvidenceSynthesis/FHIRRiskEvidenceSynthesisRiskEstimate.php index 44d90b57a8..a567797069 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRRiskEvidenceSynthesis/FHIRRiskEvidenceSynthesisRiskEstimate.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRRiskEvidenceSynthesis/FHIRRiskEvidenceSynthesisRiskEstimate.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -82,10 +82,6 @@ class FHIRRiskEvidenceSynthesisRiskEstimate extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_RISK_EVIDENCE_SYNTHESIS_DOT_RISK_ESTIMATE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DENOMINATOR_COUNT = 'denominatorCount'; const FIELD_DENOMINATOR_COUNT_EXT = '_denominatorCount'; const FIELD_DESCRIPTION = 'description'; @@ -178,6 +174,9 @@ class FHIRRiskEvidenceSynthesisRiskEstimate extends FHIRBackboneElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRRiskEvidenceSynthesisRiskEstimate Constructor * @param null|array $data @@ -204,8 +203,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DENOMINATOR_COUNT] instanceof FHIRInteger) { $this->setDenominatorCount($data[self::FIELD_DENOMINATOR_COUNT]); - } elseif ($ext && is_scalar($data[self::FIELD_DENOMINATOR_COUNT])) { - $this->setDenominatorCount(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_DENOMINATOR_COUNT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DENOMINATOR_COUNT])) { + $this->setDenominatorCount(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_DENOMINATOR_COUNT]] + $ext)); + } else if (is_array($data[self::FIELD_DENOMINATOR_COUNT])) { + $this->setDenominatorCount(new FHIRInteger(array_merge($ext, $data[self::FIELD_DENOMINATOR_COUNT]))); + } } else { $this->setDenominatorCount(new FHIRInteger($data[self::FIELD_DENOMINATOR_COUNT])); } @@ -216,8 +219,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -228,8 +235,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NUMERATOR_COUNT] instanceof FHIRInteger) { $this->setNumeratorCount($data[self::FIELD_NUMERATOR_COUNT]); - } elseif ($ext && is_scalar($data[self::FIELD_NUMERATOR_COUNT])) { - $this->setNumeratorCount(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_NUMERATOR_COUNT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NUMERATOR_COUNT])) { + $this->setNumeratorCount(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_NUMERATOR_COUNT]] + $ext)); + } else if (is_array($data[self::FIELD_NUMERATOR_COUNT])) { + $this->setNumeratorCount(new FHIRInteger(array_merge($ext, $data[self::FIELD_NUMERATOR_COUNT]))); + } } else { $this->setNumeratorCount(new FHIRInteger($data[self::FIELD_NUMERATOR_COUNT])); } @@ -237,6 +248,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PRECISION_ESTIMATE])) { if (is_array($data[self::FIELD_PRECISION_ESTIMATE])) { foreach($data[self::FIELD_PRECISION_ESTIMATE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRRiskEvidenceSynthesisPrecisionEstimate) { $this->addPrecisionEstimate($v); } else { @@ -269,8 +283,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE] instanceof FHIRDecimal) { $this->setValue($data[self::FIELD_VALUE]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE])) { - $this->setValue(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_VALUE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE])) { + $this->setValue(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_VALUE]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE])) { + $this->setValue(new FHIRDecimal(array_merge($ext, $data[self::FIELD_VALUE]))); + } } else { $this->setValue(new FHIRDecimal($data[self::FIELD_VALUE])); } @@ -694,7 +712,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getNumeratorCount())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NUMERATOR_COUNT, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getPrecisionEstimate())) { foreach($vs as $v) { if (null === $v) { @@ -707,11 +724,11 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getUnitOfMeasure())) { $v->xmlSerialize($sxe->addChild(self::FIELD_UNIT_OF_MEASURE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getValue())) { + $sxe->addAttribute(self::FIELD_VALUE, (string)$v); $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE, null, $v->_getFHIRXMLNamespace())); } return $sxe; @@ -724,16 +741,37 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getDenominatorCount())) { - $a[self::FIELD_DENOMINATOR_COUNT] = $v->getValue(); - $a[self::FIELD_DENOMINATOR_COUNT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DENOMINATOR_COUNT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DENOMINATOR_COUNT_EXT] = $enc; + } + } else { + $a[self::FIELD_DENOMINATOR_COUNT] = $v; + } } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if (null !== ($v = $this->getNumeratorCount())) { - $a[self::FIELD_NUMERATOR_COUNT] = $v->getValue(); - $a[self::FIELD_NUMERATOR_COUNT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NUMERATOR_COUNT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NUMERATOR_COUNT_EXT] = $enc; + } + } else { + $a[self::FIELD_NUMERATOR_COUNT] = $v; + } } if ([] !== ($vs = $this->getPrecisionEstimate())) { $a[self::FIELD_PRECISION_ESTIMATE] = $vs; @@ -745,8 +783,15 @@ public function jsonSerialize() $a[self::FIELD_UNIT_OF_MEASURE] = $v; } if (null !== ($v = $this->getValue())) { - $a[self::FIELD_VALUE] = $v->getValue(); - $a[self::FIELD_VALUE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRRiskEvidenceSynthesis/FHIRRiskEvidenceSynthesisSampleSize.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRRiskEvidenceSynthesis/FHIRRiskEvidenceSynthesisSampleSize.php index 4b121b15b2..68affaccf2 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRRiskEvidenceSynthesis/FHIRRiskEvidenceSynthesisSampleSize.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRRiskEvidenceSynthesis/FHIRRiskEvidenceSynthesisSampleSize.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRRiskEvidenceSynthesisSampleSize extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_RISK_EVIDENCE_SYNTHESIS_DOT_SAMPLE_SIZE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DESCRIPTION = 'description'; const FIELD_DESCRIPTION_EXT = '_description'; const FIELD_NUMBER_OF_PARTICIPANTS = 'numberOfParticipants'; @@ -124,6 +120,9 @@ class FHIRRiskEvidenceSynthesisSampleSize extends FHIRBackboneElement */ protected $numberOfStudies = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRRiskEvidenceSynthesisSampleSize Constructor * @param null|array $data @@ -146,8 +145,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -158,8 +161,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NUMBER_OF_PARTICIPANTS] instanceof FHIRInteger) { $this->setNumberOfParticipants($data[self::FIELD_NUMBER_OF_PARTICIPANTS]); - } elseif ($ext && is_scalar($data[self::FIELD_NUMBER_OF_PARTICIPANTS])) { - $this->setNumberOfParticipants(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_NUMBER_OF_PARTICIPANTS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NUMBER_OF_PARTICIPANTS])) { + $this->setNumberOfParticipants(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_NUMBER_OF_PARTICIPANTS]] + $ext)); + } else if (is_array($data[self::FIELD_NUMBER_OF_PARTICIPANTS])) { + $this->setNumberOfParticipants(new FHIRInteger(array_merge($ext, $data[self::FIELD_NUMBER_OF_PARTICIPANTS]))); + } } else { $this->setNumberOfParticipants(new FHIRInteger($data[self::FIELD_NUMBER_OF_PARTICIPANTS])); } @@ -170,8 +177,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NUMBER_OF_STUDIES] instanceof FHIRInteger) { $this->setNumberOfStudies($data[self::FIELD_NUMBER_OF_STUDIES]); - } elseif ($ext && is_scalar($data[self::FIELD_NUMBER_OF_STUDIES])) { - $this->setNumberOfStudies(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_NUMBER_OF_STUDIES]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NUMBER_OF_STUDIES])) { + $this->setNumberOfStudies(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_NUMBER_OF_STUDIES]] + $ext)); + } else if (is_array($data[self::FIELD_NUMBER_OF_STUDIES])) { + $this->setNumberOfStudies(new FHIRInteger(array_merge($ext, $data[self::FIELD_NUMBER_OF_STUDIES]))); + } } else { $this->setNumberOfStudies(new FHIRInteger($data[self::FIELD_NUMBER_OF_STUDIES])); } @@ -428,16 +439,37 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if (null !== ($v = $this->getNumberOfParticipants())) { - $a[self::FIELD_NUMBER_OF_PARTICIPANTS] = $v->getValue(); - $a[self::FIELD_NUMBER_OF_PARTICIPANTS_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NUMBER_OF_PARTICIPANTS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NUMBER_OF_PARTICIPANTS_EXT] = $enc; + } + } else { + $a[self::FIELD_NUMBER_OF_PARTICIPANTS] = $v; + } } if (null !== ($v = $this->getNumberOfStudies())) { - $a[self::FIELD_NUMBER_OF_STUDIES] = $v->getValue(); - $a[self::FIELD_NUMBER_OF_STUDIES_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NUMBER_OF_STUDIES] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NUMBER_OF_STUDIES_EXT] = $enc; + } + } else { + $a[self::FIELD_NUMBER_OF_STUDIES] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSearchParameter/FHIRSearchParameterComponent.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSearchParameter/FHIRSearchParameterComponent.php index 3e74f705aa..b1aec39a50 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSearchParameter/FHIRSearchParameterComponent.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSearchParameter/FHIRSearchParameterComponent.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRSearchParameterComponent extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SEARCH_PARAMETER_DOT_COMPONENT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DEFINITION = 'definition'; const FIELD_DEFINITION_EXT = '_definition'; const FIELD_EXPRESSION = 'expression'; @@ -112,6 +108,9 @@ class FHIRSearchParameterComponent extends FHIRBackboneElement */ protected $expression = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSearchParameterComponent Constructor * @param null|array $data @@ -134,8 +133,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DEFINITION] instanceof FHIRCanonical) { $this->setDefinition($data[self::FIELD_DEFINITION]); - } elseif ($ext && is_scalar($data[self::FIELD_DEFINITION])) { - $this->setDefinition(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $data[self::FIELD_DEFINITION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DEFINITION])) { + $this->setDefinition(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $data[self::FIELD_DEFINITION]] + $ext)); + } else if (is_array($data[self::FIELD_DEFINITION])) { + $this->setDefinition(new FHIRCanonical(array_merge($ext, $data[self::FIELD_DEFINITION]))); + } } else { $this->setDefinition(new FHIRCanonical($data[self::FIELD_DEFINITION])); } @@ -146,8 +149,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EXPRESSION] instanceof FHIRString) { $this->setExpression($data[self::FIELD_EXPRESSION]); - } elseif ($ext && is_scalar($data[self::FIELD_EXPRESSION])) { - $this->setExpression(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_EXPRESSION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EXPRESSION])) { + $this->setExpression(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_EXPRESSION]] + $ext)); + } else if (is_array($data[self::FIELD_EXPRESSION])) { + $this->setExpression(new FHIRString(array_merge($ext, $data[self::FIELD_EXPRESSION]))); + } } else { $this->setExpression(new FHIRString($data[self::FIELD_EXPRESSION])); } @@ -361,12 +368,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getDefinition())) { - $a[self::FIELD_DEFINITION] = $v->getValue(); - $a[self::FIELD_DEFINITION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DEFINITION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DEFINITION_EXT] = $enc; + } + } else { + $a[self::FIELD_DEFINITION] = $v; + } } if (null !== ($v = $this->getExpression())) { - $a[self::FIELD_EXPRESSION] = $v->getValue(); - $a[self::FIELD_EXPRESSION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EXPRESSION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EXPRESSION_EXT] = $enc; + } + } else { + $a[self::FIELD_EXPRESSION] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSpecimen/FHIRSpecimenCollection.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSpecimen/FHIRSpecimenCollection.php index 3a6ca0b0de..e718a0103b 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSpecimen/FHIRSpecimenCollection.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSpecimen/FHIRSpecimenCollection.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -82,18 +82,16 @@ class FHIRSpecimenCollection extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SPECIMEN_DOT_COLLECTION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_BODY_SITE = 'bodySite'; const FIELD_COLLECTED_DATE_TIME = 'collectedDateTime'; const FIELD_COLLECTED_DATE_TIME_EXT = '_collectedDateTime'; const FIELD_COLLECTED_PERIOD = 'collectedPeriod'; const FIELD_COLLECTOR = 'collector'; const FIELD_DURATION = 'duration'; + const FIELD_DURATION_EXT = '_duration'; const FIELD_FASTING_STATUS_CODEABLE_CONCEPT = 'fastingStatusCodeableConcept'; const FIELD_FASTING_STATUS_DURATION = 'fastingStatusDuration'; + const FIELD_FASTING_STATUS_DURATION_EXT = '_fastingStatusDuration'; const FIELD_METHOD = 'method'; const FIELD_QUANTITY = 'quantity'; const FIELD_QUANTITY_EXT = '_quantity'; @@ -214,6 +212,9 @@ class FHIRSpecimenCollection extends FHIRBackboneElement */ protected $quantity = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSpecimenCollection Constructor * @param null|array $data @@ -243,8 +244,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_COLLECTED_DATE_TIME] instanceof FHIRDateTime) { $this->setCollectedDateTime($data[self::FIELD_COLLECTED_DATE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_COLLECTED_DATE_TIME])) { - $this->setCollectedDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_COLLECTED_DATE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_COLLECTED_DATE_TIME])) { + $this->setCollectedDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_COLLECTED_DATE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_COLLECTED_DATE_TIME])) { + $this->setCollectedDateTime(new FHIRDateTime(array_merge($ext, $data[self::FIELD_COLLECTED_DATE_TIME]))); + } } else { $this->setCollectedDateTime(new FHIRDateTime($data[self::FIELD_COLLECTED_DATE_TIME])); } @@ -264,8 +269,17 @@ public function __construct($data = null) } } if (isset($data[self::FIELD_DURATION])) { + $ext = (isset($data[self::FIELD_DURATION_EXT]) && is_array($data[self::FIELD_DURATION_EXT])) + ? $data[self::FIELD_DURATION_EXT] + : null; if ($data[self::FIELD_DURATION] instanceof FHIRDuration) { $this->setDuration($data[self::FIELD_DURATION]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DURATION])) { + $this->setDuration(new FHIRDuration([FHIRDuration::FIELD_VALUE => $data[self::FIELD_DURATION]] + $ext)); + } else if (is_array($data[self::FIELD_DURATION])) { + $this->setDuration(new FHIRDuration(array_merge($ext, $data[self::FIELD_DURATION]))); + } } else { $this->setDuration(new FHIRDuration($data[self::FIELD_DURATION])); } @@ -278,8 +292,17 @@ public function __construct($data = null) } } if (isset($data[self::FIELD_FASTING_STATUS_DURATION])) { + $ext = (isset($data[self::FIELD_FASTING_STATUS_DURATION_EXT]) && is_array($data[self::FIELD_FASTING_STATUS_DURATION_EXT])) + ? $data[self::FIELD_FASTING_STATUS_DURATION_EXT] + : null; if ($data[self::FIELD_FASTING_STATUS_DURATION] instanceof FHIRDuration) { $this->setFastingStatusDuration($data[self::FIELD_FASTING_STATUS_DURATION]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_FASTING_STATUS_DURATION])) { + $this->setFastingStatusDuration(new FHIRDuration([FHIRDuration::FIELD_VALUE => $data[self::FIELD_FASTING_STATUS_DURATION]] + $ext)); + } else if (is_array($data[self::FIELD_FASTING_STATUS_DURATION])) { + $this->setFastingStatusDuration(new FHIRDuration(array_merge($ext, $data[self::FIELD_FASTING_STATUS_DURATION]))); + } } else { $this->setFastingStatusDuration(new FHIRDuration($data[self::FIELD_FASTING_STATUS_DURATION])); } @@ -297,8 +320,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_QUANTITY] instanceof FHIRQuantity) { $this->setQuantity($data[self::FIELD_QUANTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_QUANTITY])) { - $this->setQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_QUANTITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_QUANTITY])) { + $this->setQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_QUANTITY])) { + $this->setQuantity(new FHIRQuantity(array_merge($ext, $data[self::FIELD_QUANTITY]))); + } } else { $this->setQuantity(new FHIRQuantity($data[self::FIELD_QUANTITY])); } @@ -746,38 +773,30 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getBodySite())) { $v->xmlSerialize($sxe->addChild(self::FIELD_BODY_SITE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getCollectedDateTime())) { $v->xmlSerialize($sxe->addChild(self::FIELD_COLLECTED_DATE_TIME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getCollectedPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_COLLECTED_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getCollector())) { $v->xmlSerialize($sxe->addChild(self::FIELD_COLLECTOR, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDuration())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DURATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getFastingStatusCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FASTING_STATUS_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getFastingStatusDuration())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FASTING_STATUS_DURATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getMethod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_METHOD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_QUANTITY, null, $v->_getFHIRXMLNamespace())); } @@ -794,8 +813,15 @@ public function jsonSerialize() $a[self::FIELD_BODY_SITE] = $v; } if (null !== ($v = $this->getCollectedDateTime())) { - $a[self::FIELD_COLLECTED_DATE_TIME] = $v->getValue(); - $a[self::FIELD_COLLECTED_DATE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_COLLECTED_DATE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_COLLECTED_DATE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_COLLECTED_DATE_TIME] = $v; + } } if (null !== ($v = $this->getCollectedPeriod())) { $a[self::FIELD_COLLECTED_PERIOD] = $v; @@ -804,19 +830,43 @@ public function jsonSerialize() $a[self::FIELD_COLLECTOR] = $v; } if (null !== ($v = $this->getDuration())) { - $a[self::FIELD_DURATION] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DURATION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DURATION_EXT] = $enc; + } + } else { + $a[self::FIELD_DURATION] = $v; + } } if (null !== ($v = $this->getFastingStatusCodeableConcept())) { $a[self::FIELD_FASTING_STATUS_CODEABLE_CONCEPT] = $v; } if (null !== ($v = $this->getFastingStatusDuration())) { - $a[self::FIELD_FASTING_STATUS_DURATION] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FASTING_STATUS_DURATION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FASTING_STATUS_DURATION_EXT] = $enc; + } + } else { + $a[self::FIELD_FASTING_STATUS_DURATION] = $v; + } } if (null !== ($v = $this->getMethod())) { $a[self::FIELD_METHOD] = $v; } if (null !== ($v = $this->getQuantity())) { - $a[self::FIELD_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_QUANTITY] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSpecimen/FHIRSpecimenContainer.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSpecimen/FHIRSpecimenContainer.php index a4c0bba029..85ea10b52f 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSpecimen/FHIRSpecimenContainer.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSpecimen/FHIRSpecimenContainer.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -81,10 +81,6 @@ class FHIRSpecimenContainer extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SPECIMEN_DOT_CONTAINER; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ADDITIVE_CODEABLE_CONCEPT = 'additiveCodeableConcept'; const FIELD_ADDITIVE_REFERENCE = 'additiveReference'; const FIELD_CAPACITY = 'capacity'; @@ -186,6 +182,9 @@ class FHIRSpecimenContainer extends FHIRBackboneElement */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSpecimenContainer Constructor * @param null|array $data @@ -222,8 +221,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CAPACITY] instanceof FHIRQuantity) { $this->setCapacity($data[self::FIELD_CAPACITY]); - } elseif ($ext && is_scalar($data[self::FIELD_CAPACITY])) { - $this->setCapacity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_CAPACITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CAPACITY])) { + $this->setCapacity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_CAPACITY]] + $ext)); + } else if (is_array($data[self::FIELD_CAPACITY])) { + $this->setCapacity(new FHIRQuantity(array_merge($ext, $data[self::FIELD_CAPACITY]))); + } } else { $this->setCapacity(new FHIRQuantity($data[self::FIELD_CAPACITY])); } @@ -234,8 +237,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -246,17 +253,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -268,8 +282,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SPECIMEN_QUANTITY] instanceof FHIRQuantity) { $this->setSpecimenQuantity($data[self::FIELD_SPECIMEN_QUANTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_SPECIMEN_QUANTITY])) { - $this->setSpecimenQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_SPECIMEN_QUANTITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SPECIMEN_QUANTITY])) { + $this->setSpecimenQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_SPECIMEN_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_SPECIMEN_QUANTITY])) { + $this->setSpecimenQuantity(new FHIRQuantity(array_merge($ext, $data[self::FIELD_SPECIMEN_QUANTITY]))); + } } else { $this->setSpecimenQuantity(new FHIRQuantity($data[self::FIELD_SPECIMEN_QUANTITY])); } @@ -679,22 +697,18 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getAdditiveCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ADDITIVE_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getAdditiveReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ADDITIVE_REFERENCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getCapacity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CAPACITY, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getDescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESCRIPTION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -707,7 +721,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getSpecimenQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SPECIMEN_QUANTITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -727,17 +740,56 @@ public function jsonSerialize() $a[self::FIELD_ADDITIVE_REFERENCE] = $v; } if (null !== ($v = $this->getCapacity())) { - $a[self::FIELD_CAPACITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CAPACITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CAPACITY_EXT] = $enc; + } + } else { + $a[self::FIELD_CAPACITY] = $v; + } } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if (null !== ($v = $this->getSpecimenQuantity())) { - $a[self::FIELD_SPECIMEN_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SPECIMEN_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SPECIMEN_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_SPECIMEN_QUANTITY] = $v; + } } if (null !== ($v = $this->getType())) { $a[self::FIELD_TYPE] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSpecimen/FHIRSpecimenProcessing.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSpecimen/FHIRSpecimenProcessing.php index 5f0d0a9a57..a035e72b5d 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSpecimen/FHIRSpecimenProcessing.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSpecimen/FHIRSpecimenProcessing.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -81,10 +81,6 @@ class FHIRSpecimenProcessing extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SPECIMEN_DOT_PROCESSING; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ADDITIVE = 'additive'; const FIELD_DESCRIPTION = 'description'; const FIELD_DESCRIPTION_EXT = '_description'; @@ -156,6 +152,9 @@ class FHIRSpecimenProcessing extends FHIRBackboneElement */ protected $timePeriod = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSpecimenProcessing Constructor * @param null|array $data @@ -175,6 +174,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ADDITIVE])) { if (is_array($data[self::FIELD_ADDITIVE])) { foreach($data[self::FIELD_ADDITIVE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addAdditive($v); } else { @@ -193,8 +195,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -212,8 +218,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TIME_DATE_TIME] instanceof FHIRDateTime) { $this->setTimeDateTime($data[self::FIELD_TIME_DATE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_TIME_DATE_TIME])) { - $this->setTimeDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_TIME_DATE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TIME_DATE_TIME])) { + $this->setTimeDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_TIME_DATE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_TIME_DATE_TIME])) { + $this->setTimeDateTime(new FHIRDateTime(array_merge($ext, $data[self::FIELD_TIME_DATE_TIME]))); + } } else { $this->setTimeDateTime(new FHIRDateTime($data[self::FIELD_TIME_DATE_TIME])); } @@ -557,7 +567,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getAdditive())) { foreach($vs as $v) { if (null === $v) { @@ -566,17 +575,16 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_ADDITIVE, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getDescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESCRIPTION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getProcedure())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PROCEDURE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getTimeDateTime())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TIME_DATE_TIME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getTimePeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TIME_PERIOD, null, $v->_getFHIRXMLNamespace())); } @@ -593,15 +601,29 @@ public function jsonSerialize() $a[self::FIELD_ADDITIVE] = $vs; } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if (null !== ($v = $this->getProcedure())) { $a[self::FIELD_PROCEDURE] = $v; } if (null !== ($v = $this->getTimeDateTime())) { - $a[self::FIELD_TIME_DATE_TIME] = $v->getValue(); - $a[self::FIELD_TIME_DATE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TIME_DATE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TIME_DATE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_TIME_DATE_TIME] = $v; + } } if (null !== ($v = $this->getTimePeriod())) { $a[self::FIELD_TIME_PERIOD] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSpecimenDefinition/FHIRSpecimenDefinitionAdditive.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSpecimenDefinition/FHIRSpecimenDefinitionAdditive.php index a8631db77e..274922e659 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSpecimenDefinition/FHIRSpecimenDefinitionAdditive.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSpecimenDefinition/FHIRSpecimenDefinitionAdditive.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRSpecimenDefinitionAdditive extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SPECIMEN_DEFINITION_DOT_ADDITIVE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ADDITIVE_CODEABLE_CONCEPT = 'additiveCodeableConcept'; const FIELD_ADDITIVE_REFERENCE = 'additiveReference'; @@ -112,6 +108,9 @@ class FHIRSpecimenDefinitionAdditive extends FHIRBackboneElement */ protected $additiveReference = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSpecimenDefinitionAdditive Constructor * @param null|array $data @@ -319,11 +318,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getAdditiveCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ADDITIVE_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getAdditiveReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ADDITIVE_REFERENCE, null, $v->_getFHIRXMLNamespace())); } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSpecimenDefinition/FHIRSpecimenDefinitionContainer.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSpecimenDefinition/FHIRSpecimenDefinitionContainer.php index 1d73051ed1..2cb7c079dd 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSpecimenDefinition/FHIRSpecimenDefinitionContainer.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSpecimenDefinition/FHIRSpecimenDefinitionContainer.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRSpecimenDefinitionContainer extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SPECIMEN_DEFINITION_DOT_CONTAINER; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ADDITIVE = 'additive'; const FIELD_CAP = 'cap'; const FIELD_CAPACITY = 'capacity'; @@ -206,6 +202,9 @@ class FHIRSpecimenDefinitionContainer extends FHIRBackboneElement */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSpecimenDefinitionContainer Constructor * @param null|array $data @@ -225,6 +224,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ADDITIVE])) { if (is_array($data[self::FIELD_ADDITIVE])) { foreach($data[self::FIELD_ADDITIVE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRSpecimenDefinitionAdditive) { $this->addAdditive($v); } else { @@ -250,8 +252,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CAPACITY] instanceof FHIRQuantity) { $this->setCapacity($data[self::FIELD_CAPACITY]); - } elseif ($ext && is_scalar($data[self::FIELD_CAPACITY])) { - $this->setCapacity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_CAPACITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CAPACITY])) { + $this->setCapacity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_CAPACITY]] + $ext)); + } else if (is_array($data[self::FIELD_CAPACITY])) { + $this->setCapacity(new FHIRQuantity(array_merge($ext, $data[self::FIELD_CAPACITY]))); + } } else { $this->setCapacity(new FHIRQuantity($data[self::FIELD_CAPACITY])); } @@ -262,8 +268,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -281,8 +291,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MINIMUM_VOLUME_QUANTITY] instanceof FHIRQuantity) { $this->setMinimumVolumeQuantity($data[self::FIELD_MINIMUM_VOLUME_QUANTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_MINIMUM_VOLUME_QUANTITY])) { - $this->setMinimumVolumeQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_MINIMUM_VOLUME_QUANTITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MINIMUM_VOLUME_QUANTITY])) { + $this->setMinimumVolumeQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_MINIMUM_VOLUME_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_MINIMUM_VOLUME_QUANTITY])) { + $this->setMinimumVolumeQuantity(new FHIRQuantity(array_merge($ext, $data[self::FIELD_MINIMUM_VOLUME_QUANTITY]))); + } } else { $this->setMinimumVolumeQuantity(new FHIRQuantity($data[self::FIELD_MINIMUM_VOLUME_QUANTITY])); } @@ -293,8 +307,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MINIMUM_VOLUME_STRING] instanceof FHIRString) { $this->setMinimumVolumeString($data[self::FIELD_MINIMUM_VOLUME_STRING]); - } elseif ($ext && is_scalar($data[self::FIELD_MINIMUM_VOLUME_STRING])) { - $this->setMinimumVolumeString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_MINIMUM_VOLUME_STRING]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MINIMUM_VOLUME_STRING])) { + $this->setMinimumVolumeString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_MINIMUM_VOLUME_STRING]] + $ext)); + } else if (is_array($data[self::FIELD_MINIMUM_VOLUME_STRING])) { + $this->setMinimumVolumeString(new FHIRString(array_merge($ext, $data[self::FIELD_MINIMUM_VOLUME_STRING]))); + } } else { $this->setMinimumVolumeString(new FHIRString($data[self::FIELD_MINIMUM_VOLUME_STRING])); } @@ -305,8 +323,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PREPARATION] instanceof FHIRString) { $this->setPreparation($data[self::FIELD_PREPARATION]); - } elseif ($ext && is_scalar($data[self::FIELD_PREPARATION])) { - $this->setPreparation(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PREPARATION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PREPARATION])) { + $this->setPreparation(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PREPARATION]] + $ext)); + } else if (is_array($data[self::FIELD_PREPARATION])) { + $this->setPreparation(new FHIRString(array_merge($ext, $data[self::FIELD_PREPARATION]))); + } } else { $this->setPreparation(new FHIRString($data[self::FIELD_PREPARATION])); } @@ -794,7 +816,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getAdditive())) { foreach($vs as $v) { if (null === $v) { @@ -807,18 +828,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getCap())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CAP, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getCapacity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CAPACITY, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getDescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESCRIPTION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getMaterial())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MATERIAL, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getMinimumVolumeQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MINIMUM_VOLUME_QUANTITY, null, $v->_getFHIRXMLNamespace())); } @@ -828,7 +846,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getPreparation())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PREPARATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -848,25 +865,62 @@ public function jsonSerialize() $a[self::FIELD_CAP] = $v; } if (null !== ($v = $this->getCapacity())) { - $a[self::FIELD_CAPACITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CAPACITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CAPACITY_EXT] = $enc; + } + } else { + $a[self::FIELD_CAPACITY] = $v; + } } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if (null !== ($v = $this->getMaterial())) { $a[self::FIELD_MATERIAL] = $v; } if (null !== ($v = $this->getMinimumVolumeQuantity())) { - $a[self::FIELD_MINIMUM_VOLUME_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MINIMUM_VOLUME_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MINIMUM_VOLUME_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_MINIMUM_VOLUME_QUANTITY] = $v; + } } if (null !== ($v = $this->getMinimumVolumeString())) { - $a[self::FIELD_MINIMUM_VOLUME_STRING] = $v->getValue(); - $a[self::FIELD_MINIMUM_VOLUME_STRING_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MINIMUM_VOLUME_STRING] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MINIMUM_VOLUME_STRING_EXT] = $enc; + } + } else { + $a[self::FIELD_MINIMUM_VOLUME_STRING] = $v; + } } if (null !== ($v = $this->getPreparation())) { - $a[self::FIELD_PREPARATION] = $v->getValue(); - $a[self::FIELD_PREPARATION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PREPARATION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PREPARATION_EXT] = $enc; + } + } else { + $a[self::FIELD_PREPARATION] = $v; + } } if (null !== ($v = $this->getType())) { $a[self::FIELD_TYPE] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSpecimenDefinition/FHIRSpecimenDefinitionHandling.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSpecimenDefinition/FHIRSpecimenDefinitionHandling.php index 3f68473605..8c3bc81a26 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSpecimenDefinition/FHIRSpecimenDefinitionHandling.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSpecimenDefinition/FHIRSpecimenDefinitionHandling.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -80,13 +80,10 @@ class FHIRSpecimenDefinitionHandling extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SPECIMEN_DEFINITION_DOT_HANDLING; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_INSTRUCTION = 'instruction'; const FIELD_INSTRUCTION_EXT = '_instruction'; const FIELD_MAX_DURATION = 'maxDuration'; + const FIELD_MAX_DURATION_EXT = '_maxDuration'; const FIELD_TEMPERATURE_QUALIFIER = 'temperatureQualifier'; const FIELD_TEMPERATURE_RANGE = 'temperatureRange'; @@ -138,6 +135,9 @@ class FHIRSpecimenDefinitionHandling extends FHIRBackboneElement */ protected $temperatureRange = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSpecimenDefinitionHandling Constructor * @param null|array $data @@ -160,15 +160,28 @@ public function __construct($data = null) : null; if ($data[self::FIELD_INSTRUCTION] instanceof FHIRString) { $this->setInstruction($data[self::FIELD_INSTRUCTION]); - } elseif ($ext && is_scalar($data[self::FIELD_INSTRUCTION])) { - $this->setInstruction(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_INSTRUCTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_INSTRUCTION])) { + $this->setInstruction(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_INSTRUCTION]] + $ext)); + } else if (is_array($data[self::FIELD_INSTRUCTION])) { + $this->setInstruction(new FHIRString(array_merge($ext, $data[self::FIELD_INSTRUCTION]))); + } } else { $this->setInstruction(new FHIRString($data[self::FIELD_INSTRUCTION])); } } if (isset($data[self::FIELD_MAX_DURATION])) { + $ext = (isset($data[self::FIELD_MAX_DURATION_EXT]) && is_array($data[self::FIELD_MAX_DURATION_EXT])) + ? $data[self::FIELD_MAX_DURATION_EXT] + : null; if ($data[self::FIELD_MAX_DURATION] instanceof FHIRDuration) { $this->setMaxDuration($data[self::FIELD_MAX_DURATION]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MAX_DURATION])) { + $this->setMaxDuration(new FHIRDuration([FHIRDuration::FIELD_VALUE => $data[self::FIELD_MAX_DURATION]] + $ext)); + } else if (is_array($data[self::FIELD_MAX_DURATION])) { + $this->setMaxDuration(new FHIRDuration(array_merge($ext, $data[self::FIELD_MAX_DURATION]))); + } } else { $this->setMaxDuration(new FHIRDuration($data[self::FIELD_MAX_DURATION])); } @@ -442,15 +455,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getInstruction())) { $v->xmlSerialize($sxe->addChild(self::FIELD_INSTRUCTION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getMaxDuration())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MAX_DURATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getTemperatureQualifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TEMPERATURE_QUALIFIER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getTemperatureRange())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TEMPERATURE_RANGE, null, $v->_getFHIRXMLNamespace())); } @@ -464,11 +474,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getInstruction())) { - $a[self::FIELD_INSTRUCTION] = $v->getValue(); - $a[self::FIELD_INSTRUCTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_INSTRUCTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_INSTRUCTION_EXT] = $enc; + } + } else { + $a[self::FIELD_INSTRUCTION] = $v; + } } if (null !== ($v = $this->getMaxDuration())) { - $a[self::FIELD_MAX_DURATION] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MAX_DURATION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MAX_DURATION_EXT] = $enc; + } + } else { + $a[self::FIELD_MAX_DURATION] = $v; + } } if (null !== ($v = $this->getTemperatureQualifier())) { $a[self::FIELD_TEMPERATURE_QUALIFIER] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSpecimenDefinition/FHIRSpecimenDefinitionTypeTested.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSpecimenDefinition/FHIRSpecimenDefinitionTypeTested.php index 5b30e6e84b..e55c305228 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSpecimenDefinition/FHIRSpecimenDefinitionTypeTested.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSpecimenDefinition/FHIRSpecimenDefinitionTypeTested.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -81,10 +81,6 @@ class FHIRSpecimenDefinitionTypeTested extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SPECIMEN_DEFINITION_DOT_TYPE_TESTED; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CONTAINER = 'container'; const FIELD_HANDLING = 'handling'; const FIELD_IS_DERIVED = 'isDerived'; @@ -95,6 +91,7 @@ class FHIRSpecimenDefinitionTypeTested extends FHIRBackboneElement const FIELD_REQUIREMENT = 'requirement'; const FIELD_REQUIREMENT_EXT = '_requirement'; const FIELD_RETENTION_TIME = 'retentionTime'; + const FIELD_RETENTION_TIME_EXT = '_retentionTime'; const FIELD_TYPE = 'type'; /** @@ -184,6 +181,9 @@ class FHIRSpecimenDefinitionTypeTested extends FHIRBackboneElement */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSpecimenDefinitionTypeTested Constructor * @param null|array $data @@ -210,6 +210,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_HANDLING])) { if (is_array($data[self::FIELD_HANDLING])) { foreach($data[self::FIELD_HANDLING] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRSpecimenDefinitionHandling) { $this->addHandling($v); } else { @@ -228,8 +231,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IS_DERIVED] instanceof FHIRBoolean) { $this->setIsDerived($data[self::FIELD_IS_DERIVED]); - } elseif ($ext && is_scalar($data[self::FIELD_IS_DERIVED])) { - $this->setIsDerived(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_IS_DERIVED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IS_DERIVED])) { + $this->setIsDerived(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_IS_DERIVED]] + $ext)); + } else if (is_array($data[self::FIELD_IS_DERIVED])) { + $this->setIsDerived(new FHIRBoolean(array_merge($ext, $data[self::FIELD_IS_DERIVED]))); + } } else { $this->setIsDerived(new FHIRBoolean($data[self::FIELD_IS_DERIVED])); } @@ -240,8 +247,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PREFERENCE] instanceof FHIRSpecimenContainedPreference) { $this->setPreference($data[self::FIELD_PREFERENCE]); - } elseif ($ext && is_scalar($data[self::FIELD_PREFERENCE])) { - $this->setPreference(new FHIRSpecimenContainedPreference([FHIRSpecimenContainedPreference::FIELD_VALUE => $data[self::FIELD_PREFERENCE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PREFERENCE])) { + $this->setPreference(new FHIRSpecimenContainedPreference([FHIRSpecimenContainedPreference::FIELD_VALUE => $data[self::FIELD_PREFERENCE]] + $ext)); + } else if (is_array($data[self::FIELD_PREFERENCE])) { + $this->setPreference(new FHIRSpecimenContainedPreference(array_merge($ext, $data[self::FIELD_PREFERENCE]))); + } } else { $this->setPreference(new FHIRSpecimenContainedPreference($data[self::FIELD_PREFERENCE])); } @@ -249,6 +260,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REJECTION_CRITERION])) { if (is_array($data[self::FIELD_REJECTION_CRITERION])) { foreach($data[self::FIELD_REJECTION_CRITERION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addRejectionCriterion($v); } else { @@ -267,15 +281,28 @@ public function __construct($data = null) : null; if ($data[self::FIELD_REQUIREMENT] instanceof FHIRString) { $this->setRequirement($data[self::FIELD_REQUIREMENT]); - } elseif ($ext && is_scalar($data[self::FIELD_REQUIREMENT])) { - $this->setRequirement(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_REQUIREMENT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_REQUIREMENT])) { + $this->setRequirement(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_REQUIREMENT]] + $ext)); + } else if (is_array($data[self::FIELD_REQUIREMENT])) { + $this->setRequirement(new FHIRString(array_merge($ext, $data[self::FIELD_REQUIREMENT]))); + } } else { $this->setRequirement(new FHIRString($data[self::FIELD_REQUIREMENT])); } } if (isset($data[self::FIELD_RETENTION_TIME])) { + $ext = (isset($data[self::FIELD_RETENTION_TIME_EXT]) && is_array($data[self::FIELD_RETENTION_TIME_EXT])) + ? $data[self::FIELD_RETENTION_TIME_EXT] + : null; if ($data[self::FIELD_RETENTION_TIME] instanceof FHIRDuration) { $this->setRetentionTime($data[self::FIELD_RETENTION_TIME]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_RETENTION_TIME])) { + $this->setRetentionTime(new FHIRDuration([FHIRDuration::FIELD_VALUE => $data[self::FIELD_RETENTION_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_RETENTION_TIME])) { + $this->setRetentionTime(new FHIRDuration(array_merge($ext, $data[self::FIELD_RETENTION_TIME]))); + } } else { $this->setRetentionTime(new FHIRDuration($data[self::FIELD_RETENTION_TIME])); } @@ -728,11 +755,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getContainer())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CONTAINER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getHandling())) { foreach($vs as $v) { if (null === $v) { @@ -741,14 +766,13 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_HANDLING, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getIsDerived())) { $v->xmlSerialize($sxe->addChild(self::FIELD_IS_DERIVED, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPreference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PREFERENCE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getRejectionCriterion())) { foreach($vs as $v) { if (null === $v) { @@ -757,14 +781,13 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_REJECTION_CRITERION, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getRequirement())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REQUIREMENT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRetentionTime())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RETENTION_TIME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -784,21 +807,51 @@ public function jsonSerialize() $a[self::FIELD_HANDLING] = $vs; } if (null !== ($v = $this->getIsDerived())) { - $a[self::FIELD_IS_DERIVED] = $v->getValue(); - $a[self::FIELD_IS_DERIVED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IS_DERIVED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IS_DERIVED_EXT] = $enc; + } + } else { + $a[self::FIELD_IS_DERIVED] = $v; + } } if (null !== ($v = $this->getPreference())) { - $a[self::FIELD_PREFERENCE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PREFERENCE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PREFERENCE_EXT] = $enc; + } + } else { + $a[self::FIELD_PREFERENCE] = $v; + } } if ([] !== ($vs = $this->getRejectionCriterion())) { $a[self::FIELD_REJECTION_CRITERION] = $vs; } if (null !== ($v = $this->getRequirement())) { - $a[self::FIELD_REQUIREMENT] = $v->getValue(); - $a[self::FIELD_REQUIREMENT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_REQUIREMENT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_REQUIREMENT_EXT] = $enc; + } + } else { + $a[self::FIELD_REQUIREMENT] = $v; + } } if (null !== ($v = $this->getRetentionTime())) { - $a[self::FIELD_RETENTION_TIME] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_RETENTION_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_RETENTION_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_RETENTION_TIME] = $v; + } } if (null !== ($v = $this->getType())) { $a[self::FIELD_TYPE] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRStructureDefinition/FHIRStructureDefinitionContext.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRStructureDefinition/FHIRStructureDefinitionContext.php index d2d5f31b77..866ae940bd 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRStructureDefinition/FHIRStructureDefinitionContext.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRStructureDefinition/FHIRStructureDefinitionContext.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRStructureDefinitionContext extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_STRUCTURE_DEFINITION_DOT_CONTEXT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_EXPRESSION = 'expression'; const FIELD_EXPRESSION_EXT = '_expression'; const FIELD_TYPE = 'type'; @@ -111,6 +107,9 @@ class FHIRStructureDefinitionContext extends FHIRBackboneElement */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRStructureDefinitionContext Constructor * @param null|array $data @@ -133,8 +132,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EXPRESSION] instanceof FHIRString) { $this->setExpression($data[self::FIELD_EXPRESSION]); - } elseif ($ext && is_scalar($data[self::FIELD_EXPRESSION])) { - $this->setExpression(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_EXPRESSION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EXPRESSION])) { + $this->setExpression(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_EXPRESSION]] + $ext)); + } else if (is_array($data[self::FIELD_EXPRESSION])) { + $this->setExpression(new FHIRString(array_merge($ext, $data[self::FIELD_EXPRESSION]))); + } } else { $this->setExpression(new FHIRString($data[self::FIELD_EXPRESSION])); } @@ -145,8 +148,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TYPE] instanceof FHIRExtensionContextType) { $this->setType($data[self::FIELD_TYPE]); - } elseif ($ext && is_scalar($data[self::FIELD_TYPE])) { - $this->setType(new FHIRExtensionContextType([FHIRExtensionContextType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TYPE])) { + $this->setType(new FHIRExtensionContextType([FHIRExtensionContextType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } else if (is_array($data[self::FIELD_TYPE])) { + $this->setType(new FHIRExtensionContextType(array_merge($ext, $data[self::FIELD_TYPE]))); + } } else { $this->setType(new FHIRExtensionContextType($data[self::FIELD_TYPE])); } @@ -332,7 +339,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getExpression())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EXPRESSION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -346,11 +352,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getExpression())) { - $a[self::FIELD_EXPRESSION] = $v->getValue(); - $a[self::FIELD_EXPRESSION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EXPRESSION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EXPRESSION_EXT] = $enc; + } + } else { + $a[self::FIELD_EXPRESSION] = $v; + } } if (null !== ($v = $this->getType())) { - $a[self::FIELD_TYPE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TYPE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TYPE_EXT] = $enc; + } + } else { + $a[self::FIELD_TYPE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRStructureDefinition/FHIRStructureDefinitionDifferential.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRStructureDefinition/FHIRStructureDefinitionDifferential.php index ecff2772fe..9397a851fd 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRStructureDefinition/FHIRStructureDefinitionDifferential.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRStructureDefinition/FHIRStructureDefinitionDifferential.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRStructureDefinitionDifferential extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_STRUCTURE_DEFINITION_DOT_DIFFERENTIAL; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ELEMENT = 'element'; /** @@ -96,6 +92,9 @@ class FHIRStructureDefinitionDifferential extends FHIRBackboneElement */ protected $element = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRStructureDefinitionDifferential Constructor * @param null|array $data @@ -115,6 +114,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ELEMENT])) { if (is_array($data[self::FIELD_ELEMENT])) { foreach($data[self::FIELD_ELEMENT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRElementDefinition) { $this->addElement($v); } else { @@ -289,7 +291,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getElement())) { foreach($vs as $v) { if (null === $v) { @@ -298,6 +299,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_ELEMENT, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRStructureDefinition/FHIRStructureDefinitionMapping.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRStructureDefinition/FHIRStructureDefinitionMapping.php index 28e1f82ee7..b1a179a00c 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRStructureDefinition/FHIRStructureDefinitionMapping.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRStructureDefinition/FHIRStructureDefinitionMapping.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -81,10 +81,6 @@ class FHIRStructureDefinitionMapping extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_STRUCTURE_DEFINITION_DOT_MAPPING; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_COMMENT = 'comment'; const FIELD_COMMENT_EXT = '_comment'; const FIELD_IDENTITY = 'identity'; @@ -144,6 +140,9 @@ class FHIRStructureDefinitionMapping extends FHIRBackboneElement */ protected $uri = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRStructureDefinitionMapping Constructor * @param null|array $data @@ -166,8 +165,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_COMMENT] instanceof FHIRString) { $this->setComment($data[self::FIELD_COMMENT]); - } elseif ($ext && is_scalar($data[self::FIELD_COMMENT])) { - $this->setComment(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_COMMENT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_COMMENT])) { + $this->setComment(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_COMMENT]] + $ext)); + } else if (is_array($data[self::FIELD_COMMENT])) { + $this->setComment(new FHIRString(array_merge($ext, $data[self::FIELD_COMMENT]))); + } } else { $this->setComment(new FHIRString($data[self::FIELD_COMMENT])); } @@ -178,8 +181,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IDENTITY] instanceof FHIRId) { $this->setIdentity($data[self::FIELD_IDENTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTITY])) { - $this->setIdentity(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_IDENTITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IDENTITY])) { + $this->setIdentity(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_IDENTITY]] + $ext)); + } else if (is_array($data[self::FIELD_IDENTITY])) { + $this->setIdentity(new FHIRId(array_merge($ext, $data[self::FIELD_IDENTITY]))); + } } else { $this->setIdentity(new FHIRId($data[self::FIELD_IDENTITY])); } @@ -190,8 +197,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -202,8 +213,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_URI] instanceof FHIRUri) { $this->setUri($data[self::FIELD_URI]); - } elseif ($ext && is_scalar($data[self::FIELD_URI])) { - $this->setUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URI]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_URI])) { + $this->setUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URI]] + $ext)); + } else if (is_array($data[self::FIELD_URI])) { + $this->setUri(new FHIRUri(array_merge($ext, $data[self::FIELD_URI]))); + } } else { $this->setUri(new FHIRUri($data[self::FIELD_URI])); } @@ -519,20 +534,48 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getComment())) { - $a[self::FIELD_COMMENT] = $v->getValue(); - $a[self::FIELD_COMMENT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_COMMENT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_COMMENT_EXT] = $enc; + } + } else { + $a[self::FIELD_COMMENT] = $v; + } } if (null !== ($v = $this->getIdentity())) { - $a[self::FIELD_IDENTITY] = $v->getValue(); - $a[self::FIELD_IDENTITY_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_IDENTITY] = $v; + } } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if (null !== ($v = $this->getUri())) { - $a[self::FIELD_URI] = $v->getValue(); - $a[self::FIELD_URI_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_URI] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_URI_EXT] = $enc; + } + } else { + $a[self::FIELD_URI] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRStructureDefinition/FHIRStructureDefinitionSnapshot.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRStructureDefinition/FHIRStructureDefinitionSnapshot.php index d296eaf760..0b28a64895 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRStructureDefinition/FHIRStructureDefinitionSnapshot.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRStructureDefinition/FHIRStructureDefinitionSnapshot.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRStructureDefinitionSnapshot extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_STRUCTURE_DEFINITION_DOT_SNAPSHOT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ELEMENT = 'element'; /** @@ -96,6 +92,9 @@ class FHIRStructureDefinitionSnapshot extends FHIRBackboneElement */ protected $element = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRStructureDefinitionSnapshot Constructor * @param null|array $data @@ -115,6 +114,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ELEMENT])) { if (is_array($data[self::FIELD_ELEMENT])) { foreach($data[self::FIELD_ELEMENT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRElementDefinition) { $this->addElement($v); } else { @@ -289,7 +291,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getElement())) { foreach($vs as $v) { if (null === $v) { @@ -298,6 +299,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_ELEMENT, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRStructureMap/FHIRStructureMapDependent.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRStructureMap/FHIRStructureMapDependent.php index 811b924bf3..d48337da6f 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRStructureMap/FHIRStructureMapDependent.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRStructureMap/FHIRStructureMapDependent.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRStructureMapDependent extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_STRUCTURE_MAP_DOT_DEPENDENT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_NAME = 'name'; const FIELD_NAME_EXT = '_name'; const FIELD_VARIABLE = 'variable'; @@ -112,6 +108,9 @@ class FHIRStructureMapDependent extends FHIRBackboneElement */ protected $variable = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRStructureMapDependent Constructor * @param null|array $data @@ -134,8 +133,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRId) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRId(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRId($data[self::FIELD_NAME])); } @@ -146,17 +149,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_VARIABLE])) { foreach($data[self::FIELD_VARIABLE] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRString) { $this->addVariable($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addVariable(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addVariable(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addVariable(new FHIRString(array_merge($v, $ext[$i]))); + } } else { $this->addVariable(new FHIRString($v)); } } } elseif ($data[self::FIELD_VARIABLE] instanceof FHIRString) { $this->addVariable($data[self::FIELD_VARIABLE]); - } elseif ($ext && is_scalar($data[self::FIELD_VARIABLE])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_VARIABLE])) { $this->addVariable(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VARIABLE]] + $ext)); } else { $this->addVariable(new FHIRString($data[self::FIELD_VARIABLE])); @@ -396,6 +406,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_VARIABLE, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } @@ -406,8 +417,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if ([] !== ($vs = $this->getVariable())) { $a[self::FIELD_VARIABLE] = []; @@ -415,8 +433,17 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_VARIABLE][] = $v->getValue(); - $a[self::FIELD_VARIABLE_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VARIABLE][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VARIABLE_EXT][] = $enc; + } else { + $a[self::FIELD_VARIABLE_EXT][] = null; + } + } else { + $a[self::FIELD_VARIABLE][] = $v; + } } } return $a; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRStructureMap/FHIRStructureMapGroup.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRStructureMap/FHIRStructureMapGroup.php index 169dfa7e65..0972438db9 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRStructureMap/FHIRStructureMapGroup.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRStructureMap/FHIRStructureMapGroup.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRStructureMapGroup extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_STRUCTURE_MAP_DOT_GROUP; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DOCUMENTATION = 'documentation'; const FIELD_DOCUMENTATION_EXT = '_documentation'; const FIELD_EXTENDS = 'extends'; @@ -165,6 +161,9 @@ class FHIRStructureMapGroup extends FHIRBackboneElement */ protected $typeMode = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRStructureMapGroup Constructor * @param null|array $data @@ -187,8 +186,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DOCUMENTATION] instanceof FHIRString) { $this->setDocumentation($data[self::FIELD_DOCUMENTATION]); - } elseif ($ext && is_scalar($data[self::FIELD_DOCUMENTATION])) { - $this->setDocumentation(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DOCUMENTATION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DOCUMENTATION])) { + $this->setDocumentation(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DOCUMENTATION]] + $ext)); + } else if (is_array($data[self::FIELD_DOCUMENTATION])) { + $this->setDocumentation(new FHIRString(array_merge($ext, $data[self::FIELD_DOCUMENTATION]))); + } } else { $this->setDocumentation(new FHIRString($data[self::FIELD_DOCUMENTATION])); } @@ -199,8 +202,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EXTENDS] instanceof FHIRId) { $this->setExtends($data[self::FIELD_EXTENDS]); - } elseif ($ext && is_scalar($data[self::FIELD_EXTENDS])) { - $this->setExtends(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_EXTENDS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EXTENDS])) { + $this->setExtends(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_EXTENDS]] + $ext)); + } else if (is_array($data[self::FIELD_EXTENDS])) { + $this->setExtends(new FHIRId(array_merge($ext, $data[self::FIELD_EXTENDS]))); + } } else { $this->setExtends(new FHIRId($data[self::FIELD_EXTENDS])); } @@ -208,6 +215,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_INPUT])) { if (is_array($data[self::FIELD_INPUT])) { foreach($data[self::FIELD_INPUT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRStructureMapInput) { $this->addInput($v); } else { @@ -226,8 +236,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRId) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRId(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRId($data[self::FIELD_NAME])); } @@ -235,6 +249,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_RULE])) { if (is_array($data[self::FIELD_RULE])) { foreach($data[self::FIELD_RULE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRStructureMapRule) { $this->addRule($v); } else { @@ -253,8 +270,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TYPE_MODE] instanceof FHIRStructureMapGroupTypeMode) { $this->setTypeMode($data[self::FIELD_TYPE_MODE]); - } elseif ($ext && is_scalar($data[self::FIELD_TYPE_MODE])) { - $this->setTypeMode(new FHIRStructureMapGroupTypeMode([FHIRStructureMapGroupTypeMode::FIELD_VALUE => $data[self::FIELD_TYPE_MODE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TYPE_MODE])) { + $this->setTypeMode(new FHIRStructureMapGroupTypeMode([FHIRStructureMapGroupTypeMode::FIELD_VALUE => $data[self::FIELD_TYPE_MODE]] + $ext)); + } else if (is_array($data[self::FIELD_TYPE_MODE])) { + $this->setTypeMode(new FHIRStructureMapGroupTypeMode(array_merge($ext, $data[self::FIELD_TYPE_MODE]))); + } } else { $this->setTypeMode(new FHIRStructureMapGroupTypeMode($data[self::FIELD_TYPE_MODE])); } @@ -660,7 +681,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getExtends())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EXTENDS, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getInput())) { foreach($vs as $v) { if (null === $v) { @@ -669,10 +689,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_INPUT, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NAME, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getRule())) { foreach($vs as $v) { if (null === $v) { @@ -695,25 +715,54 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getDocumentation())) { - $a[self::FIELD_DOCUMENTATION] = $v->getValue(); - $a[self::FIELD_DOCUMENTATION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DOCUMENTATION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DOCUMENTATION_EXT] = $enc; + } + } else { + $a[self::FIELD_DOCUMENTATION] = $v; + } } if (null !== ($v = $this->getExtends())) { - $a[self::FIELD_EXTENDS] = $v->getValue(); - $a[self::FIELD_EXTENDS_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EXTENDS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EXTENDS_EXT] = $enc; + } + } else { + $a[self::FIELD_EXTENDS] = $v; + } } if ([] !== ($vs = $this->getInput())) { $a[self::FIELD_INPUT] = $vs; } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if ([] !== ($vs = $this->getRule())) { $a[self::FIELD_RULE] = $vs; } if (null !== ($v = $this->getTypeMode())) { - $a[self::FIELD_TYPE_MODE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TYPE_MODE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TYPE_MODE_EXT] = $enc; + } + } else { + $a[self::FIELD_TYPE_MODE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRStructureMap/FHIRStructureMapInput.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRStructureMap/FHIRStructureMapInput.php index 17fc24109f..34cac600c8 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRStructureMap/FHIRStructureMapInput.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRStructureMap/FHIRStructureMapInput.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRStructureMapInput extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_STRUCTURE_MAP_DOT_INPUT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DOCUMENTATION = 'documentation'; const FIELD_DOCUMENTATION_EXT = '_documentation'; const FIELD_MODE = 'mode'; @@ -138,6 +134,9 @@ class FHIRStructureMapInput extends FHIRBackboneElement */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRStructureMapInput Constructor * @param null|array $data @@ -160,8 +159,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DOCUMENTATION] instanceof FHIRString) { $this->setDocumentation($data[self::FIELD_DOCUMENTATION]); - } elseif ($ext && is_scalar($data[self::FIELD_DOCUMENTATION])) { - $this->setDocumentation(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DOCUMENTATION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DOCUMENTATION])) { + $this->setDocumentation(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DOCUMENTATION]] + $ext)); + } else if (is_array($data[self::FIELD_DOCUMENTATION])) { + $this->setDocumentation(new FHIRString(array_merge($ext, $data[self::FIELD_DOCUMENTATION]))); + } } else { $this->setDocumentation(new FHIRString($data[self::FIELD_DOCUMENTATION])); } @@ -172,8 +175,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MODE] instanceof FHIRStructureMapInputMode) { $this->setMode($data[self::FIELD_MODE]); - } elseif ($ext && is_scalar($data[self::FIELD_MODE])) { - $this->setMode(new FHIRStructureMapInputMode([FHIRStructureMapInputMode::FIELD_VALUE => $data[self::FIELD_MODE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MODE])) { + $this->setMode(new FHIRStructureMapInputMode([FHIRStructureMapInputMode::FIELD_VALUE => $data[self::FIELD_MODE]] + $ext)); + } else if (is_array($data[self::FIELD_MODE])) { + $this->setMode(new FHIRStructureMapInputMode(array_merge($ext, $data[self::FIELD_MODE]))); + } } else { $this->setMode(new FHIRStructureMapInputMode($data[self::FIELD_MODE])); } @@ -184,8 +191,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRId) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRId(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRId($data[self::FIELD_NAME])); } @@ -196,8 +207,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TYPE] instanceof FHIRString) { $this->setType($data[self::FIELD_TYPE]); - } elseif ($ext && is_scalar($data[self::FIELD_TYPE])) { - $this->setType(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TYPE])) { + $this->setType(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } else if (is_array($data[self::FIELD_TYPE])) { + $this->setType(new FHIRString(array_merge($ext, $data[self::FIELD_TYPE]))); + } } else { $this->setType(new FHIRString($data[self::FIELD_TYPE])); } @@ -475,7 +490,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDocumentation())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DOCUMENTATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getMode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MODE, null, $v->_getFHIRXMLNamespace())); } @@ -495,19 +509,48 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getDocumentation())) { - $a[self::FIELD_DOCUMENTATION] = $v->getValue(); - $a[self::FIELD_DOCUMENTATION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DOCUMENTATION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DOCUMENTATION_EXT] = $enc; + } + } else { + $a[self::FIELD_DOCUMENTATION] = $v; + } } if (null !== ($v = $this->getMode())) { - $a[self::FIELD_MODE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MODE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MODE_EXT] = $enc; + } + } else { + $a[self::FIELD_MODE] = $v; + } } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if (null !== ($v = $this->getType())) { - $a[self::FIELD_TYPE] = $v->getValue(); - $a[self::FIELD_TYPE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TYPE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TYPE_EXT] = $enc; + } + } else { + $a[self::FIELD_TYPE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRStructureMap/FHIRStructureMapParameter.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRStructureMap/FHIRStructureMapParameter.php index 2b27f14843..f028c16c1a 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRStructureMap/FHIRStructureMapParameter.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRStructureMap/FHIRStructureMapParameter.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -81,10 +81,6 @@ class FHIRStructureMapParameter extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_STRUCTURE_MAP_DOT_PARAMETER; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE_BOOLEAN = 'valueBoolean'; const FIELD_VALUE_BOOLEAN_EXT = '_valueBoolean'; const FIELD_VALUE_DECIMAL = 'valueDecimal'; @@ -154,6 +150,9 @@ class FHIRStructureMapParameter extends FHIRBackboneElement */ protected $valueString = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRStructureMapParameter Constructor * @param null|array $data @@ -176,8 +175,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_BOOLEAN] instanceof FHIRBoolean) { $this->setValueBoolean($data[self::FIELD_VALUE_BOOLEAN]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_BOOLEAN])) { - $this->setValueBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_VALUE_BOOLEAN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_BOOLEAN])) { + $this->setValueBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_VALUE_BOOLEAN]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_BOOLEAN])) { + $this->setValueBoolean(new FHIRBoolean(array_merge($ext, $data[self::FIELD_VALUE_BOOLEAN]))); + } } else { $this->setValueBoolean(new FHIRBoolean($data[self::FIELD_VALUE_BOOLEAN])); } @@ -188,8 +191,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_DECIMAL] instanceof FHIRDecimal) { $this->setValueDecimal($data[self::FIELD_VALUE_DECIMAL]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_DECIMAL])) { - $this->setValueDecimal(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_VALUE_DECIMAL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_DECIMAL])) { + $this->setValueDecimal(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_VALUE_DECIMAL]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_DECIMAL])) { + $this->setValueDecimal(new FHIRDecimal(array_merge($ext, $data[self::FIELD_VALUE_DECIMAL]))); + } } else { $this->setValueDecimal(new FHIRDecimal($data[self::FIELD_VALUE_DECIMAL])); } @@ -200,8 +207,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_ID] instanceof FHIRId) { $this->setValueId($data[self::FIELD_VALUE_ID]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_ID])) { - $this->setValueId(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_VALUE_ID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_ID])) { + $this->setValueId(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_VALUE_ID]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_ID])) { + $this->setValueId(new FHIRId(array_merge($ext, $data[self::FIELD_VALUE_ID]))); + } } else { $this->setValueId(new FHIRId($data[self::FIELD_VALUE_ID])); } @@ -212,8 +223,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_INTEGER] instanceof FHIRInteger) { $this->setValueInteger($data[self::FIELD_VALUE_INTEGER]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_INTEGER])) { - $this->setValueInteger(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_VALUE_INTEGER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_INTEGER])) { + $this->setValueInteger(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_VALUE_INTEGER]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_INTEGER])) { + $this->setValueInteger(new FHIRInteger(array_merge($ext, $data[self::FIELD_VALUE_INTEGER]))); + } } else { $this->setValueInteger(new FHIRInteger($data[self::FIELD_VALUE_INTEGER])); } @@ -224,8 +239,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_STRING] instanceof FHIRString) { $this->setValueString($data[self::FIELD_VALUE_STRING]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_STRING])) { - $this->setValueString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VALUE_STRING]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_STRING])) { + $this->setValueString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VALUE_STRING]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_STRING])) { + $this->setValueString(new FHIRString(array_merge($ext, $data[self::FIELD_VALUE_STRING]))); + } } else { $this->setValueString(new FHIRString($data[self::FIELD_VALUE_STRING])); } @@ -582,24 +601,59 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getValueBoolean())) { - $a[self::FIELD_VALUE_BOOLEAN] = $v->getValue(); - $a[self::FIELD_VALUE_BOOLEAN_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_BOOLEAN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_BOOLEAN_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_BOOLEAN] = $v; + } } if (null !== ($v = $this->getValueDecimal())) { - $a[self::FIELD_VALUE_DECIMAL] = $v->getValue(); - $a[self::FIELD_VALUE_DECIMAL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_DECIMAL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_DECIMAL_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_DECIMAL] = $v; + } } if (null !== ($v = $this->getValueId())) { - $a[self::FIELD_VALUE_ID] = $v->getValue(); - $a[self::FIELD_VALUE_ID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_ID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_ID_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_ID] = $v; + } } if (null !== ($v = $this->getValueInteger())) { - $a[self::FIELD_VALUE_INTEGER] = $v->getValue(); - $a[self::FIELD_VALUE_INTEGER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_INTEGER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_INTEGER_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_INTEGER] = $v; + } } if (null !== ($v = $this->getValueString())) { - $a[self::FIELD_VALUE_STRING] = $v->getValue(); - $a[self::FIELD_VALUE_STRING_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_STRING] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_STRING_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_STRING] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRStructureMap/FHIRStructureMapRule.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRStructureMap/FHIRStructureMapRule.php index 2e464639f8..914d87e374 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRStructureMap/FHIRStructureMapRule.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRStructureMap/FHIRStructureMapRule.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRStructureMapRule extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_STRUCTURE_MAP_DOT_RULE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DEPENDENT = 'dependent'; const FIELD_DOCUMENTATION = 'documentation'; const FIELD_DOCUMENTATION_EXT = '_documentation'; @@ -152,6 +148,9 @@ class FHIRStructureMapRule extends FHIRBackboneElement */ protected $target = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRStructureMapRule Constructor * @param null|array $data @@ -171,6 +170,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_DEPENDENT])) { if (is_array($data[self::FIELD_DEPENDENT])) { foreach($data[self::FIELD_DEPENDENT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRStructureMapDependent) { $this->addDependent($v); } else { @@ -189,8 +191,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DOCUMENTATION] instanceof FHIRString) { $this->setDocumentation($data[self::FIELD_DOCUMENTATION]); - } elseif ($ext && is_scalar($data[self::FIELD_DOCUMENTATION])) { - $this->setDocumentation(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DOCUMENTATION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DOCUMENTATION])) { + $this->setDocumentation(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DOCUMENTATION]] + $ext)); + } else if (is_array($data[self::FIELD_DOCUMENTATION])) { + $this->setDocumentation(new FHIRString(array_merge($ext, $data[self::FIELD_DOCUMENTATION]))); + } } else { $this->setDocumentation(new FHIRString($data[self::FIELD_DOCUMENTATION])); } @@ -201,8 +207,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRId) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRId(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRId($data[self::FIELD_NAME])); } @@ -210,6 +220,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_RULE])) { if (is_array($data[self::FIELD_RULE])) { foreach($data[self::FIELD_RULE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRStructureMapRule) { $this->addRule($v); } else { @@ -225,6 +238,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SOURCE])) { if (is_array($data[self::FIELD_SOURCE])) { foreach($data[self::FIELD_SOURCE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRStructureMapSource) { $this->addSource($v); } else { @@ -240,6 +256,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_TARGET])) { if (is_array($data[self::FIELD_TARGET])) { foreach($data[self::FIELD_TARGET] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRStructureMapTarget) { $this->addTarget($v); } else { @@ -667,7 +686,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getDependent())) { foreach($vs as $v) { if (null === $v) { @@ -676,13 +694,13 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_DEPENDENT, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getDocumentation())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DOCUMENTATION, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NAME, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getRule())) { foreach($vs as $v) { if (null === $v) { @@ -709,6 +727,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_TARGET, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } @@ -722,12 +741,26 @@ public function jsonSerialize() $a[self::FIELD_DEPENDENT] = $vs; } if (null !== ($v = $this->getDocumentation())) { - $a[self::FIELD_DOCUMENTATION] = $v->getValue(); - $a[self::FIELD_DOCUMENTATION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DOCUMENTATION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DOCUMENTATION_EXT] = $enc; + } + } else { + $a[self::FIELD_DOCUMENTATION] = $v; + } } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if ([] !== ($vs = $this->getRule())) { $a[self::FIELD_RULE] = $vs; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRStructureMap/FHIRStructureMapSource.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRStructureMap/FHIRStructureMapSource.php index 37a2115f64..7d793f6575 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRStructureMap/FHIRStructureMapSource.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRStructureMap/FHIRStructureMapSource.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -127,10 +127,6 @@ class FHIRStructureMapSource extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_STRUCTURE_MAP_DOT_SOURCE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CHECK = 'check'; const FIELD_CHECK_EXT = '_check'; const FIELD_CONDITION = 'condition'; @@ -139,6 +135,7 @@ class FHIRStructureMapSource extends FHIRBackboneElement const FIELD_CONTEXT_EXT = '_context'; const FIELD_DEFAULT_VALUE_ADDRESS = 'defaultValueAddress'; const FIELD_DEFAULT_VALUE_AGE = 'defaultValueAge'; + const FIELD_DEFAULT_VALUE_AGE_EXT = '_defaultValueAge'; const FIELD_DEFAULT_VALUE_ANNOTATION = 'defaultValueAnnotation'; const FIELD_DEFAULT_VALUE_ATTACHMENT = 'defaultValueAttachment'; const FIELD_DEFAULT_VALUE_BASE_64BINARY = 'defaultValueBase64Binary'; @@ -156,6 +153,7 @@ class FHIRStructureMapSource extends FHIRBackboneElement const FIELD_DEFAULT_VALUE_CONTACT_POINT_EXT = '_defaultValueContactPoint'; const FIELD_DEFAULT_VALUE_CONTRIBUTOR = 'defaultValueContributor'; const FIELD_DEFAULT_VALUE_COUNT = 'defaultValueCount'; + const FIELD_DEFAULT_VALUE_COUNT_EXT = '_defaultValueCount'; const FIELD_DEFAULT_VALUE_DATA_REQUIREMENT = 'defaultValueDataRequirement'; const FIELD_DEFAULT_VALUE_DATE = 'defaultValueDate'; const FIELD_DEFAULT_VALUE_DATE_EXT = '_defaultValueDate'; @@ -164,8 +162,10 @@ class FHIRStructureMapSource extends FHIRBackboneElement const FIELD_DEFAULT_VALUE_DECIMAL = 'defaultValueDecimal'; const FIELD_DEFAULT_VALUE_DECIMAL_EXT = '_defaultValueDecimal'; const FIELD_DEFAULT_VALUE_DISTANCE = 'defaultValueDistance'; + const FIELD_DEFAULT_VALUE_DISTANCE_EXT = '_defaultValueDistance'; const FIELD_DEFAULT_VALUE_DOSAGE = 'defaultValueDosage'; const FIELD_DEFAULT_VALUE_DURATION = 'defaultValueDuration'; + const FIELD_DEFAULT_VALUE_DURATION_EXT = '_defaultValueDuration'; const FIELD_DEFAULT_VALUE_EXPRESSION = 'defaultValueExpression'; const FIELD_DEFAULT_VALUE_HUMAN_NAME = 'defaultValueHumanName'; const FIELD_DEFAULT_VALUE_ID = 'defaultValueId'; @@ -998,6 +998,9 @@ class FHIRStructureMapSource extends FHIRBackboneElement */ protected $variable = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRStructureMapSource Constructor * @param null|array $data @@ -1020,8 +1023,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CHECK] instanceof FHIRString) { $this->setCheck($data[self::FIELD_CHECK]); - } elseif ($ext && is_scalar($data[self::FIELD_CHECK])) { - $this->setCheck(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_CHECK]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CHECK])) { + $this->setCheck(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_CHECK]] + $ext)); + } else if (is_array($data[self::FIELD_CHECK])) { + $this->setCheck(new FHIRString(array_merge($ext, $data[self::FIELD_CHECK]))); + } } else { $this->setCheck(new FHIRString($data[self::FIELD_CHECK])); } @@ -1032,8 +1039,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CONDITION] instanceof FHIRString) { $this->setCondition($data[self::FIELD_CONDITION]); - } elseif ($ext && is_scalar($data[self::FIELD_CONDITION])) { - $this->setCondition(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_CONDITION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CONDITION])) { + $this->setCondition(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_CONDITION]] + $ext)); + } else if (is_array($data[self::FIELD_CONDITION])) { + $this->setCondition(new FHIRString(array_merge($ext, $data[self::FIELD_CONDITION]))); + } } else { $this->setCondition(new FHIRString($data[self::FIELD_CONDITION])); } @@ -1044,8 +1055,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CONTEXT] instanceof FHIRId) { $this->setContext($data[self::FIELD_CONTEXT]); - } elseif ($ext && is_scalar($data[self::FIELD_CONTEXT])) { - $this->setContext(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_CONTEXT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CONTEXT])) { + $this->setContext(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_CONTEXT]] + $ext)); + } else if (is_array($data[self::FIELD_CONTEXT])) { + $this->setContext(new FHIRId(array_merge($ext, $data[self::FIELD_CONTEXT]))); + } } else { $this->setContext(new FHIRId($data[self::FIELD_CONTEXT])); } @@ -1058,8 +1073,17 @@ public function __construct($data = null) } } if (isset($data[self::FIELD_DEFAULT_VALUE_AGE])) { + $ext = (isset($data[self::FIELD_DEFAULT_VALUE_AGE_EXT]) && is_array($data[self::FIELD_DEFAULT_VALUE_AGE_EXT])) + ? $data[self::FIELD_DEFAULT_VALUE_AGE_EXT] + : null; if ($data[self::FIELD_DEFAULT_VALUE_AGE] instanceof FHIRAge) { $this->setDefaultValueAge($data[self::FIELD_DEFAULT_VALUE_AGE]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DEFAULT_VALUE_AGE])) { + $this->setDefaultValueAge(new FHIRAge([FHIRAge::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_AGE]] + $ext)); + } else if (is_array($data[self::FIELD_DEFAULT_VALUE_AGE])) { + $this->setDefaultValueAge(new FHIRAge(array_merge($ext, $data[self::FIELD_DEFAULT_VALUE_AGE]))); + } } else { $this->setDefaultValueAge(new FHIRAge($data[self::FIELD_DEFAULT_VALUE_AGE])); } @@ -1084,8 +1108,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DEFAULT_VALUE_BASE_64BINARY] instanceof FHIRBase64Binary) { $this->setDefaultValueBase64Binary($data[self::FIELD_DEFAULT_VALUE_BASE_64BINARY]); - } elseif ($ext && is_scalar($data[self::FIELD_DEFAULT_VALUE_BASE_64BINARY])) { - $this->setDefaultValueBase64Binary(new FHIRBase64Binary([FHIRBase64Binary::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_BASE_64BINARY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DEFAULT_VALUE_BASE_64BINARY])) { + $this->setDefaultValueBase64Binary(new FHIRBase64Binary([FHIRBase64Binary::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_BASE_64BINARY]] + $ext)); + } else if (is_array($data[self::FIELD_DEFAULT_VALUE_BASE_64BINARY])) { + $this->setDefaultValueBase64Binary(new FHIRBase64Binary(array_merge($ext, $data[self::FIELD_DEFAULT_VALUE_BASE_64BINARY]))); + } } else { $this->setDefaultValueBase64Binary(new FHIRBase64Binary($data[self::FIELD_DEFAULT_VALUE_BASE_64BINARY])); } @@ -1096,8 +1124,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DEFAULT_VALUE_BOOLEAN] instanceof FHIRBoolean) { $this->setDefaultValueBoolean($data[self::FIELD_DEFAULT_VALUE_BOOLEAN]); - } elseif ($ext && is_scalar($data[self::FIELD_DEFAULT_VALUE_BOOLEAN])) { - $this->setDefaultValueBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_BOOLEAN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DEFAULT_VALUE_BOOLEAN])) { + $this->setDefaultValueBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_BOOLEAN]] + $ext)); + } else if (is_array($data[self::FIELD_DEFAULT_VALUE_BOOLEAN])) { + $this->setDefaultValueBoolean(new FHIRBoolean(array_merge($ext, $data[self::FIELD_DEFAULT_VALUE_BOOLEAN]))); + } } else { $this->setDefaultValueBoolean(new FHIRBoolean($data[self::FIELD_DEFAULT_VALUE_BOOLEAN])); } @@ -1108,8 +1140,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DEFAULT_VALUE_CANONICAL] instanceof FHIRCanonical) { $this->setDefaultValueCanonical($data[self::FIELD_DEFAULT_VALUE_CANONICAL]); - } elseif ($ext && is_scalar($data[self::FIELD_DEFAULT_VALUE_CANONICAL])) { - $this->setDefaultValueCanonical(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_CANONICAL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DEFAULT_VALUE_CANONICAL])) { + $this->setDefaultValueCanonical(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_CANONICAL]] + $ext)); + } else if (is_array($data[self::FIELD_DEFAULT_VALUE_CANONICAL])) { + $this->setDefaultValueCanonical(new FHIRCanonical(array_merge($ext, $data[self::FIELD_DEFAULT_VALUE_CANONICAL]))); + } } else { $this->setDefaultValueCanonical(new FHIRCanonical($data[self::FIELD_DEFAULT_VALUE_CANONICAL])); } @@ -1120,8 +1156,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DEFAULT_VALUE_CODE] instanceof FHIRCode) { $this->setDefaultValueCode($data[self::FIELD_DEFAULT_VALUE_CODE]); - } elseif ($ext && is_scalar($data[self::FIELD_DEFAULT_VALUE_CODE])) { - $this->setDefaultValueCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_CODE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DEFAULT_VALUE_CODE])) { + $this->setDefaultValueCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_CODE]] + $ext)); + } else if (is_array($data[self::FIELD_DEFAULT_VALUE_CODE])) { + $this->setDefaultValueCode(new FHIRCode(array_merge($ext, $data[self::FIELD_DEFAULT_VALUE_CODE]))); + } } else { $this->setDefaultValueCode(new FHIRCode($data[self::FIELD_DEFAULT_VALUE_CODE])); } @@ -1153,8 +1193,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DEFAULT_VALUE_CONTACT_POINT] instanceof FHIRContactPoint) { $this->setDefaultValueContactPoint($data[self::FIELD_DEFAULT_VALUE_CONTACT_POINT]); - } elseif ($ext && is_scalar($data[self::FIELD_DEFAULT_VALUE_CONTACT_POINT])) { - $this->setDefaultValueContactPoint(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_CONTACT_POINT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DEFAULT_VALUE_CONTACT_POINT])) { + $this->setDefaultValueContactPoint(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_CONTACT_POINT]] + $ext)); + } else if (is_array($data[self::FIELD_DEFAULT_VALUE_CONTACT_POINT])) { + $this->setDefaultValueContactPoint(new FHIRContactPoint(array_merge($ext, $data[self::FIELD_DEFAULT_VALUE_CONTACT_POINT]))); + } } else { $this->setDefaultValueContactPoint(new FHIRContactPoint($data[self::FIELD_DEFAULT_VALUE_CONTACT_POINT])); } @@ -1167,8 +1211,17 @@ public function __construct($data = null) } } if (isset($data[self::FIELD_DEFAULT_VALUE_COUNT])) { + $ext = (isset($data[self::FIELD_DEFAULT_VALUE_COUNT_EXT]) && is_array($data[self::FIELD_DEFAULT_VALUE_COUNT_EXT])) + ? $data[self::FIELD_DEFAULT_VALUE_COUNT_EXT] + : null; if ($data[self::FIELD_DEFAULT_VALUE_COUNT] instanceof FHIRCount) { $this->setDefaultValueCount($data[self::FIELD_DEFAULT_VALUE_COUNT]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DEFAULT_VALUE_COUNT])) { + $this->setDefaultValueCount(new FHIRCount([FHIRCount::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_COUNT]] + $ext)); + } else if (is_array($data[self::FIELD_DEFAULT_VALUE_COUNT])) { + $this->setDefaultValueCount(new FHIRCount(array_merge($ext, $data[self::FIELD_DEFAULT_VALUE_COUNT]))); + } } else { $this->setDefaultValueCount(new FHIRCount($data[self::FIELD_DEFAULT_VALUE_COUNT])); } @@ -1186,8 +1239,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DEFAULT_VALUE_DATE] instanceof FHIRDate) { $this->setDefaultValueDate($data[self::FIELD_DEFAULT_VALUE_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_DEFAULT_VALUE_DATE])) { - $this->setDefaultValueDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DEFAULT_VALUE_DATE])) { + $this->setDefaultValueDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_DEFAULT_VALUE_DATE])) { + $this->setDefaultValueDate(new FHIRDate(array_merge($ext, $data[self::FIELD_DEFAULT_VALUE_DATE]))); + } } else { $this->setDefaultValueDate(new FHIRDate($data[self::FIELD_DEFAULT_VALUE_DATE])); } @@ -1198,8 +1255,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DEFAULT_VALUE_DATE_TIME] instanceof FHIRDateTime) { $this->setDefaultValueDateTime($data[self::FIELD_DEFAULT_VALUE_DATE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_DEFAULT_VALUE_DATE_TIME])) { - $this->setDefaultValueDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_DATE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DEFAULT_VALUE_DATE_TIME])) { + $this->setDefaultValueDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_DATE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_DEFAULT_VALUE_DATE_TIME])) { + $this->setDefaultValueDateTime(new FHIRDateTime(array_merge($ext, $data[self::FIELD_DEFAULT_VALUE_DATE_TIME]))); + } } else { $this->setDefaultValueDateTime(new FHIRDateTime($data[self::FIELD_DEFAULT_VALUE_DATE_TIME])); } @@ -1210,15 +1271,28 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DEFAULT_VALUE_DECIMAL] instanceof FHIRDecimal) { $this->setDefaultValueDecimal($data[self::FIELD_DEFAULT_VALUE_DECIMAL]); - } elseif ($ext && is_scalar($data[self::FIELD_DEFAULT_VALUE_DECIMAL])) { - $this->setDefaultValueDecimal(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_DECIMAL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DEFAULT_VALUE_DECIMAL])) { + $this->setDefaultValueDecimal(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_DECIMAL]] + $ext)); + } else if (is_array($data[self::FIELD_DEFAULT_VALUE_DECIMAL])) { + $this->setDefaultValueDecimal(new FHIRDecimal(array_merge($ext, $data[self::FIELD_DEFAULT_VALUE_DECIMAL]))); + } } else { $this->setDefaultValueDecimal(new FHIRDecimal($data[self::FIELD_DEFAULT_VALUE_DECIMAL])); } } if (isset($data[self::FIELD_DEFAULT_VALUE_DISTANCE])) { + $ext = (isset($data[self::FIELD_DEFAULT_VALUE_DISTANCE_EXT]) && is_array($data[self::FIELD_DEFAULT_VALUE_DISTANCE_EXT])) + ? $data[self::FIELD_DEFAULT_VALUE_DISTANCE_EXT] + : null; if ($data[self::FIELD_DEFAULT_VALUE_DISTANCE] instanceof FHIRDistance) { $this->setDefaultValueDistance($data[self::FIELD_DEFAULT_VALUE_DISTANCE]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DEFAULT_VALUE_DISTANCE])) { + $this->setDefaultValueDistance(new FHIRDistance([FHIRDistance::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_DISTANCE]] + $ext)); + } else if (is_array($data[self::FIELD_DEFAULT_VALUE_DISTANCE])) { + $this->setDefaultValueDistance(new FHIRDistance(array_merge($ext, $data[self::FIELD_DEFAULT_VALUE_DISTANCE]))); + } } else { $this->setDefaultValueDistance(new FHIRDistance($data[self::FIELD_DEFAULT_VALUE_DISTANCE])); } @@ -1231,8 +1305,17 @@ public function __construct($data = null) } } if (isset($data[self::FIELD_DEFAULT_VALUE_DURATION])) { + $ext = (isset($data[self::FIELD_DEFAULT_VALUE_DURATION_EXT]) && is_array($data[self::FIELD_DEFAULT_VALUE_DURATION_EXT])) + ? $data[self::FIELD_DEFAULT_VALUE_DURATION_EXT] + : null; if ($data[self::FIELD_DEFAULT_VALUE_DURATION] instanceof FHIRDuration) { $this->setDefaultValueDuration($data[self::FIELD_DEFAULT_VALUE_DURATION]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DEFAULT_VALUE_DURATION])) { + $this->setDefaultValueDuration(new FHIRDuration([FHIRDuration::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_DURATION]] + $ext)); + } else if (is_array($data[self::FIELD_DEFAULT_VALUE_DURATION])) { + $this->setDefaultValueDuration(new FHIRDuration(array_merge($ext, $data[self::FIELD_DEFAULT_VALUE_DURATION]))); + } } else { $this->setDefaultValueDuration(new FHIRDuration($data[self::FIELD_DEFAULT_VALUE_DURATION])); } @@ -1257,8 +1340,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DEFAULT_VALUE_ID] instanceof FHIRId) { $this->setDefaultValueId($data[self::FIELD_DEFAULT_VALUE_ID]); - } elseif ($ext && is_scalar($data[self::FIELD_DEFAULT_VALUE_ID])) { - $this->setDefaultValueId(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_ID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DEFAULT_VALUE_ID])) { + $this->setDefaultValueId(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_ID]] + $ext)); + } else if (is_array($data[self::FIELD_DEFAULT_VALUE_ID])) { + $this->setDefaultValueId(new FHIRId(array_merge($ext, $data[self::FIELD_DEFAULT_VALUE_ID]))); + } } else { $this->setDefaultValueId(new FHIRId($data[self::FIELD_DEFAULT_VALUE_ID])); } @@ -1269,8 +1356,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DEFAULT_VALUE_IDENTIFIER] instanceof FHIRIdentifier) { $this->setDefaultValueIdentifier($data[self::FIELD_DEFAULT_VALUE_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_DEFAULT_VALUE_IDENTIFIER])) { - $this->setDefaultValueIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DEFAULT_VALUE_IDENTIFIER])) { + $this->setDefaultValueIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_DEFAULT_VALUE_IDENTIFIER])) { + $this->setDefaultValueIdentifier(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_DEFAULT_VALUE_IDENTIFIER]))); + } } else { $this->setDefaultValueIdentifier(new FHIRIdentifier($data[self::FIELD_DEFAULT_VALUE_IDENTIFIER])); } @@ -1281,8 +1372,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DEFAULT_VALUE_INSTANT] instanceof FHIRInstant) { $this->setDefaultValueInstant($data[self::FIELD_DEFAULT_VALUE_INSTANT]); - } elseif ($ext && is_scalar($data[self::FIELD_DEFAULT_VALUE_INSTANT])) { - $this->setDefaultValueInstant(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_INSTANT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DEFAULT_VALUE_INSTANT])) { + $this->setDefaultValueInstant(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_INSTANT]] + $ext)); + } else if (is_array($data[self::FIELD_DEFAULT_VALUE_INSTANT])) { + $this->setDefaultValueInstant(new FHIRInstant(array_merge($ext, $data[self::FIELD_DEFAULT_VALUE_INSTANT]))); + } } else { $this->setDefaultValueInstant(new FHIRInstant($data[self::FIELD_DEFAULT_VALUE_INSTANT])); } @@ -1293,8 +1388,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DEFAULT_VALUE_INTEGER] instanceof FHIRInteger) { $this->setDefaultValueInteger($data[self::FIELD_DEFAULT_VALUE_INTEGER]); - } elseif ($ext && is_scalar($data[self::FIELD_DEFAULT_VALUE_INTEGER])) { - $this->setDefaultValueInteger(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_INTEGER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DEFAULT_VALUE_INTEGER])) { + $this->setDefaultValueInteger(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_INTEGER]] + $ext)); + } else if (is_array($data[self::FIELD_DEFAULT_VALUE_INTEGER])) { + $this->setDefaultValueInteger(new FHIRInteger(array_merge($ext, $data[self::FIELD_DEFAULT_VALUE_INTEGER]))); + } } else { $this->setDefaultValueInteger(new FHIRInteger($data[self::FIELD_DEFAULT_VALUE_INTEGER])); } @@ -1305,8 +1404,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DEFAULT_VALUE_MARKDOWN] instanceof FHIRMarkdown) { $this->setDefaultValueMarkdown($data[self::FIELD_DEFAULT_VALUE_MARKDOWN]); - } elseif ($ext && is_scalar($data[self::FIELD_DEFAULT_VALUE_MARKDOWN])) { - $this->setDefaultValueMarkdown(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_MARKDOWN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DEFAULT_VALUE_MARKDOWN])) { + $this->setDefaultValueMarkdown(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_MARKDOWN]] + $ext)); + } else if (is_array($data[self::FIELD_DEFAULT_VALUE_MARKDOWN])) { + $this->setDefaultValueMarkdown(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_DEFAULT_VALUE_MARKDOWN]))); + } } else { $this->setDefaultValueMarkdown(new FHIRMarkdown($data[self::FIELD_DEFAULT_VALUE_MARKDOWN])); } @@ -1324,8 +1427,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DEFAULT_VALUE_MONEY] instanceof FHIRMoney) { $this->setDefaultValueMoney($data[self::FIELD_DEFAULT_VALUE_MONEY]); - } elseif ($ext && is_scalar($data[self::FIELD_DEFAULT_VALUE_MONEY])) { - $this->setDefaultValueMoney(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_MONEY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DEFAULT_VALUE_MONEY])) { + $this->setDefaultValueMoney(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_MONEY]] + $ext)); + } else if (is_array($data[self::FIELD_DEFAULT_VALUE_MONEY])) { + $this->setDefaultValueMoney(new FHIRMoney(array_merge($ext, $data[self::FIELD_DEFAULT_VALUE_MONEY]))); + } } else { $this->setDefaultValueMoney(new FHIRMoney($data[self::FIELD_DEFAULT_VALUE_MONEY])); } @@ -1336,8 +1443,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DEFAULT_VALUE_OID] instanceof FHIROid) { $this->setDefaultValueOid($data[self::FIELD_DEFAULT_VALUE_OID]); - } elseif ($ext && is_scalar($data[self::FIELD_DEFAULT_VALUE_OID])) { - $this->setDefaultValueOid(new FHIROid([FHIROid::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_OID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DEFAULT_VALUE_OID])) { + $this->setDefaultValueOid(new FHIROid([FHIROid::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_OID]] + $ext)); + } else if (is_array($data[self::FIELD_DEFAULT_VALUE_OID])) { + $this->setDefaultValueOid(new FHIROid(array_merge($ext, $data[self::FIELD_DEFAULT_VALUE_OID]))); + } } else { $this->setDefaultValueOid(new FHIROid($data[self::FIELD_DEFAULT_VALUE_OID])); } @@ -1362,8 +1473,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DEFAULT_VALUE_POSITIVE_INT] instanceof FHIRPositiveInt) { $this->setDefaultValuePositiveInt($data[self::FIELD_DEFAULT_VALUE_POSITIVE_INT]); - } elseif ($ext && is_scalar($data[self::FIELD_DEFAULT_VALUE_POSITIVE_INT])) { - $this->setDefaultValuePositiveInt(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_POSITIVE_INT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DEFAULT_VALUE_POSITIVE_INT])) { + $this->setDefaultValuePositiveInt(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_POSITIVE_INT]] + $ext)); + } else if (is_array($data[self::FIELD_DEFAULT_VALUE_POSITIVE_INT])) { + $this->setDefaultValuePositiveInt(new FHIRPositiveInt(array_merge($ext, $data[self::FIELD_DEFAULT_VALUE_POSITIVE_INT]))); + } } else { $this->setDefaultValuePositiveInt(new FHIRPositiveInt($data[self::FIELD_DEFAULT_VALUE_POSITIVE_INT])); } @@ -1374,8 +1489,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DEFAULT_VALUE_QUANTITY] instanceof FHIRQuantity) { $this->setDefaultValueQuantity($data[self::FIELD_DEFAULT_VALUE_QUANTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_DEFAULT_VALUE_QUANTITY])) { - $this->setDefaultValueQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_QUANTITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DEFAULT_VALUE_QUANTITY])) { + $this->setDefaultValueQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_DEFAULT_VALUE_QUANTITY])) { + $this->setDefaultValueQuantity(new FHIRQuantity(array_merge($ext, $data[self::FIELD_DEFAULT_VALUE_QUANTITY]))); + } } else { $this->setDefaultValueQuantity(new FHIRQuantity($data[self::FIELD_DEFAULT_VALUE_QUANTITY])); } @@ -1428,8 +1547,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DEFAULT_VALUE_STRING] instanceof FHIRString) { $this->setDefaultValueString($data[self::FIELD_DEFAULT_VALUE_STRING]); - } elseif ($ext && is_scalar($data[self::FIELD_DEFAULT_VALUE_STRING])) { - $this->setDefaultValueString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_STRING]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DEFAULT_VALUE_STRING])) { + $this->setDefaultValueString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_STRING]] + $ext)); + } else if (is_array($data[self::FIELD_DEFAULT_VALUE_STRING])) { + $this->setDefaultValueString(new FHIRString(array_merge($ext, $data[self::FIELD_DEFAULT_VALUE_STRING]))); + } } else { $this->setDefaultValueString(new FHIRString($data[self::FIELD_DEFAULT_VALUE_STRING])); } @@ -1440,8 +1563,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DEFAULT_VALUE_TIME] instanceof FHIRTime) { $this->setDefaultValueTime($data[self::FIELD_DEFAULT_VALUE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_DEFAULT_VALUE_TIME])) { - $this->setDefaultValueTime(new FHIRTime([FHIRTime::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DEFAULT_VALUE_TIME])) { + $this->setDefaultValueTime(new FHIRTime([FHIRTime::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_DEFAULT_VALUE_TIME])) { + $this->setDefaultValueTime(new FHIRTime(array_merge($ext, $data[self::FIELD_DEFAULT_VALUE_TIME]))); + } } else { $this->setDefaultValueTime(new FHIRTime($data[self::FIELD_DEFAULT_VALUE_TIME])); } @@ -1466,8 +1593,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DEFAULT_VALUE_UNSIGNED_INT] instanceof FHIRUnsignedInt) { $this->setDefaultValueUnsignedInt($data[self::FIELD_DEFAULT_VALUE_UNSIGNED_INT]); - } elseif ($ext && is_scalar($data[self::FIELD_DEFAULT_VALUE_UNSIGNED_INT])) { - $this->setDefaultValueUnsignedInt(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_UNSIGNED_INT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DEFAULT_VALUE_UNSIGNED_INT])) { + $this->setDefaultValueUnsignedInt(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_UNSIGNED_INT]] + $ext)); + } else if (is_array($data[self::FIELD_DEFAULT_VALUE_UNSIGNED_INT])) { + $this->setDefaultValueUnsignedInt(new FHIRUnsignedInt(array_merge($ext, $data[self::FIELD_DEFAULT_VALUE_UNSIGNED_INT]))); + } } else { $this->setDefaultValueUnsignedInt(new FHIRUnsignedInt($data[self::FIELD_DEFAULT_VALUE_UNSIGNED_INT])); } @@ -1478,8 +1609,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DEFAULT_VALUE_URI] instanceof FHIRUri) { $this->setDefaultValueUri($data[self::FIELD_DEFAULT_VALUE_URI]); - } elseif ($ext && is_scalar($data[self::FIELD_DEFAULT_VALUE_URI])) { - $this->setDefaultValueUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_URI]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DEFAULT_VALUE_URI])) { + $this->setDefaultValueUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_URI]] + $ext)); + } else if (is_array($data[self::FIELD_DEFAULT_VALUE_URI])) { + $this->setDefaultValueUri(new FHIRUri(array_merge($ext, $data[self::FIELD_DEFAULT_VALUE_URI]))); + } } else { $this->setDefaultValueUri(new FHIRUri($data[self::FIELD_DEFAULT_VALUE_URI])); } @@ -1490,8 +1625,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DEFAULT_VALUE_URL] instanceof FHIRUrl) { $this->setDefaultValueUrl($data[self::FIELD_DEFAULT_VALUE_URL]); - } elseif ($ext && is_scalar($data[self::FIELD_DEFAULT_VALUE_URL])) { - $this->setDefaultValueUrl(new FHIRUrl([FHIRUrl::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_URL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DEFAULT_VALUE_URL])) { + $this->setDefaultValueUrl(new FHIRUrl([FHIRUrl::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_URL]] + $ext)); + } else if (is_array($data[self::FIELD_DEFAULT_VALUE_URL])) { + $this->setDefaultValueUrl(new FHIRUrl(array_merge($ext, $data[self::FIELD_DEFAULT_VALUE_URL]))); + } } else { $this->setDefaultValueUrl(new FHIRUrl($data[self::FIELD_DEFAULT_VALUE_URL])); } @@ -1509,8 +1648,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DEFAULT_VALUE_UUID] instanceof FHIRUuid) { $this->setDefaultValueUuid($data[self::FIELD_DEFAULT_VALUE_UUID]); - } elseif ($ext && is_scalar($data[self::FIELD_DEFAULT_VALUE_UUID])) { - $this->setDefaultValueUuid(new FHIRUuid([FHIRUuid::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_UUID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DEFAULT_VALUE_UUID])) { + $this->setDefaultValueUuid(new FHIRUuid([FHIRUuid::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_UUID]] + $ext)); + } else if (is_array($data[self::FIELD_DEFAULT_VALUE_UUID])) { + $this->setDefaultValueUuid(new FHIRUuid(array_merge($ext, $data[self::FIELD_DEFAULT_VALUE_UUID]))); + } } else { $this->setDefaultValueUuid(new FHIRUuid($data[self::FIELD_DEFAULT_VALUE_UUID])); } @@ -1521,8 +1664,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ELEMENT] instanceof FHIRString) { $this->setElement($data[self::FIELD_ELEMENT]); - } elseif ($ext && is_scalar($data[self::FIELD_ELEMENT])) { - $this->setElement(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_ELEMENT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ELEMENT])) { + $this->setElement(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_ELEMENT]] + $ext)); + } else if (is_array($data[self::FIELD_ELEMENT])) { + $this->setElement(new FHIRString(array_merge($ext, $data[self::FIELD_ELEMENT]))); + } } else { $this->setElement(new FHIRString($data[self::FIELD_ELEMENT])); } @@ -1533,8 +1680,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_LIST_MODE] instanceof FHIRStructureMapSourceListMode) { $this->setListMode($data[self::FIELD_LIST_MODE]); - } elseif ($ext && is_scalar($data[self::FIELD_LIST_MODE])) { - $this->setListMode(new FHIRStructureMapSourceListMode([FHIRStructureMapSourceListMode::FIELD_VALUE => $data[self::FIELD_LIST_MODE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_LIST_MODE])) { + $this->setListMode(new FHIRStructureMapSourceListMode([FHIRStructureMapSourceListMode::FIELD_VALUE => $data[self::FIELD_LIST_MODE]] + $ext)); + } else if (is_array($data[self::FIELD_LIST_MODE])) { + $this->setListMode(new FHIRStructureMapSourceListMode(array_merge($ext, $data[self::FIELD_LIST_MODE]))); + } } else { $this->setListMode(new FHIRStructureMapSourceListMode($data[self::FIELD_LIST_MODE])); } @@ -1545,8 +1696,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_LOG_MESSAGE] instanceof FHIRString) { $this->setLogMessage($data[self::FIELD_LOG_MESSAGE]); - } elseif ($ext && is_scalar($data[self::FIELD_LOG_MESSAGE])) { - $this->setLogMessage(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_LOG_MESSAGE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_LOG_MESSAGE])) { + $this->setLogMessage(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_LOG_MESSAGE]] + $ext)); + } else if (is_array($data[self::FIELD_LOG_MESSAGE])) { + $this->setLogMessage(new FHIRString(array_merge($ext, $data[self::FIELD_LOG_MESSAGE]))); + } } else { $this->setLogMessage(new FHIRString($data[self::FIELD_LOG_MESSAGE])); } @@ -1557,8 +1712,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MAX] instanceof FHIRString) { $this->setMax($data[self::FIELD_MAX]); - } elseif ($ext && is_scalar($data[self::FIELD_MAX])) { - $this->setMax(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_MAX]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MAX])) { + $this->setMax(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_MAX]] + $ext)); + } else if (is_array($data[self::FIELD_MAX])) { + $this->setMax(new FHIRString(array_merge($ext, $data[self::FIELD_MAX]))); + } } else { $this->setMax(new FHIRString($data[self::FIELD_MAX])); } @@ -1569,8 +1728,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MIN] instanceof FHIRInteger) { $this->setMin($data[self::FIELD_MIN]); - } elseif ($ext && is_scalar($data[self::FIELD_MIN])) { - $this->setMin(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_MIN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MIN])) { + $this->setMin(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_MIN]] + $ext)); + } else if (is_array($data[self::FIELD_MIN])) { + $this->setMin(new FHIRInteger(array_merge($ext, $data[self::FIELD_MIN]))); + } } else { $this->setMin(new FHIRInteger($data[self::FIELD_MIN])); } @@ -1581,8 +1744,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TYPE] instanceof FHIRString) { $this->setType($data[self::FIELD_TYPE]); - } elseif ($ext && is_scalar($data[self::FIELD_TYPE])) { - $this->setType(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TYPE])) { + $this->setType(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } else if (is_array($data[self::FIELD_TYPE])) { + $this->setType(new FHIRString(array_merge($ext, $data[self::FIELD_TYPE]))); + } } else { $this->setType(new FHIRString($data[self::FIELD_TYPE])); } @@ -1593,8 +1760,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VARIABLE] instanceof FHIRId) { $this->setVariable($data[self::FIELD_VARIABLE]); - } elseif ($ext && is_scalar($data[self::FIELD_VARIABLE])) { - $this->setVariable(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_VARIABLE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VARIABLE])) { + $this->setVariable(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_VARIABLE]] + $ext)); + } else if (is_array($data[self::FIELD_VARIABLE])) { + $this->setVariable(new FHIRId(array_merge($ext, $data[self::FIELD_VARIABLE]))); + } } else { $this->setVariable(new FHIRId($data[self::FIELD_VARIABLE])); } @@ -4223,19 +4394,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getContext())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CONTEXT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDefaultValueAddress())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFAULT_VALUE_ADDRESS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDefaultValueAge())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFAULT_VALUE_AGE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDefaultValueAnnotation())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFAULT_VALUE_ANNOTATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDefaultValueAttachment())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFAULT_VALUE_ATTACHMENT, null, $v->_getFHIRXMLNamespace())); } @@ -4251,31 +4418,24 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDefaultValueCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFAULT_VALUE_CODE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDefaultValueCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFAULT_VALUE_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDefaultValueCoding())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFAULT_VALUE_CODING, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDefaultValueContactDetail())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFAULT_VALUE_CONTACT_DETAIL, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDefaultValueContactPoint())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFAULT_VALUE_CONTACT_POINT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDefaultValueContributor())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFAULT_VALUE_CONTRIBUTOR, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDefaultValueCount())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFAULT_VALUE_COUNT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDefaultValueDataRequirement())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFAULT_VALUE_DATA_REQUIREMENT, null, $v->_getFHIRXMLNamespace())); } @@ -4288,30 +4448,24 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDefaultValueDecimal())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFAULT_VALUE_DECIMAL, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDefaultValueDistance())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFAULT_VALUE_DISTANCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDefaultValueDosage())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFAULT_VALUE_DOSAGE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDefaultValueDuration())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFAULT_VALUE_DURATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDefaultValueExpression())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFAULT_VALUE_EXPRESSION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDefaultValueHumanName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFAULT_VALUE_HUMAN_NAME, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getDefaultValueId())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFAULT_VALUE_ID, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDefaultValueIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFAULT_VALUE_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } @@ -4324,53 +4478,42 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDefaultValueMarkdown())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFAULT_VALUE_MARKDOWN, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDefaultValueMeta())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFAULT_VALUE_META, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDefaultValueMoney())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFAULT_VALUE_MONEY, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getDefaultValueOid())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFAULT_VALUE_OID, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDefaultValueParameterDefinition())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFAULT_VALUE_PARAMETER_DEFINITION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDefaultValuePeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFAULT_VALUE_PERIOD, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getDefaultValuePositiveInt())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFAULT_VALUE_POSITIVE_INT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDefaultValueQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFAULT_VALUE_QUANTITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDefaultValueRange())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFAULT_VALUE_RANGE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDefaultValueRatio())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFAULT_VALUE_RATIO, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDefaultValueReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFAULT_VALUE_REFERENCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDefaultValueRelatedArtifact())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFAULT_VALUE_RELATED_ARTIFACT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDefaultValueSampledData())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFAULT_VALUE_SAMPLED_DATA, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDefaultValueSignature())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFAULT_VALUE_SIGNATURE, null, $v->_getFHIRXMLNamespace())); } @@ -4380,11 +4523,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDefaultValueTime())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFAULT_VALUE_TIME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDefaultValueTiming())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFAULT_VALUE_TIMING, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDefaultValueTriggerDefinition())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFAULT_VALUE_TRIGGER_DEFINITION, null, $v->_getFHIRXMLNamespace())); } @@ -4397,7 +4538,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDefaultValueUrl())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFAULT_VALUE_URL, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDefaultValueUsageContext())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFAULT_VALUE_USAGE_CONTEXT, null, $v->_getFHIRXMLNamespace())); } @@ -4407,7 +4547,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getElement())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ELEMENT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getListMode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_LIST_MODE, null, $v->_getFHIRXMLNamespace())); } @@ -4436,22 +4575,51 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getCheck())) { - $a[self::FIELD_CHECK] = $v->getValue(); - $a[self::FIELD_CHECK_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CHECK] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CHECK_EXT] = $enc; + } + } else { + $a[self::FIELD_CHECK] = $v; + } } if (null !== ($v = $this->getCondition())) { - $a[self::FIELD_CONDITION] = $v->getValue(); - $a[self::FIELD_CONDITION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CONDITION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CONDITION_EXT] = $enc; + } + } else { + $a[self::FIELD_CONDITION] = $v; + } } if (null !== ($v = $this->getContext())) { - $a[self::FIELD_CONTEXT] = $v->getValue(); - $a[self::FIELD_CONTEXT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CONTEXT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CONTEXT_EXT] = $enc; + } + } else { + $a[self::FIELD_CONTEXT] = $v; + } } if (null !== ($v = $this->getDefaultValueAddress())) { $a[self::FIELD_DEFAULT_VALUE_ADDRESS] = $v; } if (null !== ($v = $this->getDefaultValueAge())) { - $a[self::FIELD_DEFAULT_VALUE_AGE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DEFAULT_VALUE_AGE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DEFAULT_VALUE_AGE_EXT] = $enc; + } + } else { + $a[self::FIELD_DEFAULT_VALUE_AGE] = $v; + } } if (null !== ($v = $this->getDefaultValueAnnotation())) { $a[self::FIELD_DEFAULT_VALUE_ANNOTATION] = $v; @@ -4460,20 +4628,48 @@ public function jsonSerialize() $a[self::FIELD_DEFAULT_VALUE_ATTACHMENT] = $v; } if (null !== ($v = $this->getDefaultValueBase64Binary())) { - $a[self::FIELD_DEFAULT_VALUE_BASE_64BINARY] = $v->getValue(); - $a[self::FIELD_DEFAULT_VALUE_BASE_64BINARY_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DEFAULT_VALUE_BASE_64BINARY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DEFAULT_VALUE_BASE_64BINARY_EXT] = $enc; + } + } else { + $a[self::FIELD_DEFAULT_VALUE_BASE_64BINARY] = $v; + } } if (null !== ($v = $this->getDefaultValueBoolean())) { - $a[self::FIELD_DEFAULT_VALUE_BOOLEAN] = $v->getValue(); - $a[self::FIELD_DEFAULT_VALUE_BOOLEAN_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DEFAULT_VALUE_BOOLEAN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DEFAULT_VALUE_BOOLEAN_EXT] = $enc; + } + } else { + $a[self::FIELD_DEFAULT_VALUE_BOOLEAN] = $v; + } } if (null !== ($v = $this->getDefaultValueCanonical())) { - $a[self::FIELD_DEFAULT_VALUE_CANONICAL] = $v->getValue(); - $a[self::FIELD_DEFAULT_VALUE_CANONICAL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DEFAULT_VALUE_CANONICAL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DEFAULT_VALUE_CANONICAL_EXT] = $enc; + } + } else { + $a[self::FIELD_DEFAULT_VALUE_CANONICAL] = $v; + } } if (null !== ($v = $this->getDefaultValueCode())) { - $a[self::FIELD_DEFAULT_VALUE_CODE] = $v->getValue(); - $a[self::FIELD_DEFAULT_VALUE_CODE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DEFAULT_VALUE_CODE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DEFAULT_VALUE_CODE_EXT] = $enc; + } + } else { + $a[self::FIELD_DEFAULT_VALUE_CODE] = $v; + } } if (null !== ($v = $this->getDefaultValueCodeableConcept())) { $a[self::FIELD_DEFAULT_VALUE_CODEABLE_CONCEPT] = $v; @@ -4485,37 +4681,90 @@ public function jsonSerialize() $a[self::FIELD_DEFAULT_VALUE_CONTACT_DETAIL] = $v; } if (null !== ($v = $this->getDefaultValueContactPoint())) { - $a[self::FIELD_DEFAULT_VALUE_CONTACT_POINT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DEFAULT_VALUE_CONTACT_POINT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DEFAULT_VALUE_CONTACT_POINT_EXT] = $enc; + } + } else { + $a[self::FIELD_DEFAULT_VALUE_CONTACT_POINT] = $v; + } } if (null !== ($v = $this->getDefaultValueContributor())) { $a[self::FIELD_DEFAULT_VALUE_CONTRIBUTOR] = $v; } if (null !== ($v = $this->getDefaultValueCount())) { - $a[self::FIELD_DEFAULT_VALUE_COUNT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DEFAULT_VALUE_COUNT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DEFAULT_VALUE_COUNT_EXT] = $enc; + } + } else { + $a[self::FIELD_DEFAULT_VALUE_COUNT] = $v; + } } if (null !== ($v = $this->getDefaultValueDataRequirement())) { $a[self::FIELD_DEFAULT_VALUE_DATA_REQUIREMENT] = $v; } if (null !== ($v = $this->getDefaultValueDate())) { - $a[self::FIELD_DEFAULT_VALUE_DATE] = $v->getValue(); - $a[self::FIELD_DEFAULT_VALUE_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DEFAULT_VALUE_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DEFAULT_VALUE_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_DEFAULT_VALUE_DATE] = $v; + } } if (null !== ($v = $this->getDefaultValueDateTime())) { - $a[self::FIELD_DEFAULT_VALUE_DATE_TIME] = $v->getValue(); - $a[self::FIELD_DEFAULT_VALUE_DATE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DEFAULT_VALUE_DATE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DEFAULT_VALUE_DATE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_DEFAULT_VALUE_DATE_TIME] = $v; + } } if (null !== ($v = $this->getDefaultValueDecimal())) { - $a[self::FIELD_DEFAULT_VALUE_DECIMAL] = $v->getValue(); - $a[self::FIELD_DEFAULT_VALUE_DECIMAL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DEFAULT_VALUE_DECIMAL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DEFAULT_VALUE_DECIMAL_EXT] = $enc; + } + } else { + $a[self::FIELD_DEFAULT_VALUE_DECIMAL] = $v; + } } if (null !== ($v = $this->getDefaultValueDistance())) { - $a[self::FIELD_DEFAULT_VALUE_DISTANCE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DEFAULT_VALUE_DISTANCE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DEFAULT_VALUE_DISTANCE_EXT] = $enc; + } + } else { + $a[self::FIELD_DEFAULT_VALUE_DISTANCE] = $v; + } } if (null !== ($v = $this->getDefaultValueDosage())) { $a[self::FIELD_DEFAULT_VALUE_DOSAGE] = $v; } if (null !== ($v = $this->getDefaultValueDuration())) { - $a[self::FIELD_DEFAULT_VALUE_DURATION] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DEFAULT_VALUE_DURATION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DEFAULT_VALUE_DURATION_EXT] = $enc; + } + } else { + $a[self::FIELD_DEFAULT_VALUE_DURATION] = $v; + } } if (null !== ($v = $this->getDefaultValueExpression())) { $a[self::FIELD_DEFAULT_VALUE_EXPRESSION] = $v; @@ -4524,33 +4773,84 @@ public function jsonSerialize() $a[self::FIELD_DEFAULT_VALUE_HUMAN_NAME] = $v; } if (null !== ($v = $this->getDefaultValueId())) { - $a[self::FIELD_DEFAULT_VALUE_ID] = $v->getValue(); - $a[self::FIELD_DEFAULT_VALUE_ID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DEFAULT_VALUE_ID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DEFAULT_VALUE_ID_EXT] = $enc; + } + } else { + $a[self::FIELD_DEFAULT_VALUE_ID] = $v; + } } if (null !== ($v = $this->getDefaultValueIdentifier())) { - $a[self::FIELD_DEFAULT_VALUE_IDENTIFIER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DEFAULT_VALUE_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DEFAULT_VALUE_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_DEFAULT_VALUE_IDENTIFIER] = $v; + } } if (null !== ($v = $this->getDefaultValueInstant())) { - $a[self::FIELD_DEFAULT_VALUE_INSTANT] = $v->getValue(); - $a[self::FIELD_DEFAULT_VALUE_INSTANT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DEFAULT_VALUE_INSTANT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DEFAULT_VALUE_INSTANT_EXT] = $enc; + } + } else { + $a[self::FIELD_DEFAULT_VALUE_INSTANT] = $v; + } } if (null !== ($v = $this->getDefaultValueInteger())) { - $a[self::FIELD_DEFAULT_VALUE_INTEGER] = $v->getValue(); - $a[self::FIELD_DEFAULT_VALUE_INTEGER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DEFAULT_VALUE_INTEGER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DEFAULT_VALUE_INTEGER_EXT] = $enc; + } + } else { + $a[self::FIELD_DEFAULT_VALUE_INTEGER] = $v; + } } if (null !== ($v = $this->getDefaultValueMarkdown())) { - $a[self::FIELD_DEFAULT_VALUE_MARKDOWN] = $v->getValue(); - $a[self::FIELD_DEFAULT_VALUE_MARKDOWN_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DEFAULT_VALUE_MARKDOWN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DEFAULT_VALUE_MARKDOWN_EXT] = $enc; + } + } else { + $a[self::FIELD_DEFAULT_VALUE_MARKDOWN] = $v; + } } if (null !== ($v = $this->getDefaultValueMeta())) { $a[self::FIELD_DEFAULT_VALUE_META] = $v; } if (null !== ($v = $this->getDefaultValueMoney())) { - $a[self::FIELD_DEFAULT_VALUE_MONEY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DEFAULT_VALUE_MONEY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DEFAULT_VALUE_MONEY_EXT] = $enc; + } + } else { + $a[self::FIELD_DEFAULT_VALUE_MONEY] = $v; + } } if (null !== ($v = $this->getDefaultValueOid())) { - $a[self::FIELD_DEFAULT_VALUE_OID] = $v->getValue(); - $a[self::FIELD_DEFAULT_VALUE_OID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DEFAULT_VALUE_OID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DEFAULT_VALUE_OID_EXT] = $enc; + } + } else { + $a[self::FIELD_DEFAULT_VALUE_OID] = $v; + } } if (null !== ($v = $this->getDefaultValueParameterDefinition())) { $a[self::FIELD_DEFAULT_VALUE_PARAMETER_DEFINITION] = $v; @@ -4559,11 +4859,26 @@ public function jsonSerialize() $a[self::FIELD_DEFAULT_VALUE_PERIOD] = $v; } if (null !== ($v = $this->getDefaultValuePositiveInt())) { - $a[self::FIELD_DEFAULT_VALUE_POSITIVE_INT] = $v->getValue(); - $a[self::FIELD_DEFAULT_VALUE_POSITIVE_INT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DEFAULT_VALUE_POSITIVE_INT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DEFAULT_VALUE_POSITIVE_INT_EXT] = $enc; + } + } else { + $a[self::FIELD_DEFAULT_VALUE_POSITIVE_INT] = $v; + } } if (null !== ($v = $this->getDefaultValueQuantity())) { - $a[self::FIELD_DEFAULT_VALUE_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DEFAULT_VALUE_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DEFAULT_VALUE_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_DEFAULT_VALUE_QUANTITY] = $v; + } } if (null !== ($v = $this->getDefaultValueRange())) { $a[self::FIELD_DEFAULT_VALUE_RANGE] = $v; @@ -4584,12 +4899,26 @@ public function jsonSerialize() $a[self::FIELD_DEFAULT_VALUE_SIGNATURE] = $v; } if (null !== ($v = $this->getDefaultValueString())) { - $a[self::FIELD_DEFAULT_VALUE_STRING] = $v->getValue(); - $a[self::FIELD_DEFAULT_VALUE_STRING_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DEFAULT_VALUE_STRING] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DEFAULT_VALUE_STRING_EXT] = $enc; + } + } else { + $a[self::FIELD_DEFAULT_VALUE_STRING] = $v; + } } if (null !== ($v = $this->getDefaultValueTime())) { - $a[self::FIELD_DEFAULT_VALUE_TIME] = $v->getValue(); - $a[self::FIELD_DEFAULT_VALUE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DEFAULT_VALUE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DEFAULT_VALUE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_DEFAULT_VALUE_TIME] = $v; + } } if (null !== ($v = $this->getDefaultValueTiming())) { $a[self::FIELD_DEFAULT_VALUE_TIMING] = $v; @@ -4598,50 +4927,128 @@ public function jsonSerialize() $a[self::FIELD_DEFAULT_VALUE_TRIGGER_DEFINITION] = $v; } if (null !== ($v = $this->getDefaultValueUnsignedInt())) { - $a[self::FIELD_DEFAULT_VALUE_UNSIGNED_INT] = $v->getValue(); - $a[self::FIELD_DEFAULT_VALUE_UNSIGNED_INT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DEFAULT_VALUE_UNSIGNED_INT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DEFAULT_VALUE_UNSIGNED_INT_EXT] = $enc; + } + } else { + $a[self::FIELD_DEFAULT_VALUE_UNSIGNED_INT] = $v; + } } if (null !== ($v = $this->getDefaultValueUri())) { - $a[self::FIELD_DEFAULT_VALUE_URI] = $v->getValue(); - $a[self::FIELD_DEFAULT_VALUE_URI_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DEFAULT_VALUE_URI] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DEFAULT_VALUE_URI_EXT] = $enc; + } + } else { + $a[self::FIELD_DEFAULT_VALUE_URI] = $v; + } } if (null !== ($v = $this->getDefaultValueUrl())) { - $a[self::FIELD_DEFAULT_VALUE_URL] = $v->getValue(); - $a[self::FIELD_DEFAULT_VALUE_URL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DEFAULT_VALUE_URL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DEFAULT_VALUE_URL_EXT] = $enc; + } + } else { + $a[self::FIELD_DEFAULT_VALUE_URL] = $v; + } } if (null !== ($v = $this->getDefaultValueUsageContext())) { $a[self::FIELD_DEFAULT_VALUE_USAGE_CONTEXT] = $v; } if (null !== ($v = $this->getDefaultValueUuid())) { - $a[self::FIELD_DEFAULT_VALUE_UUID] = $v->getValue(); - $a[self::FIELD_DEFAULT_VALUE_UUID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DEFAULT_VALUE_UUID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DEFAULT_VALUE_UUID_EXT] = $enc; + } + } else { + $a[self::FIELD_DEFAULT_VALUE_UUID] = $v; + } } if (null !== ($v = $this->getElement())) { - $a[self::FIELD_ELEMENT] = $v->getValue(); - $a[self::FIELD_ELEMENT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ELEMENT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ELEMENT_EXT] = $enc; + } + } else { + $a[self::FIELD_ELEMENT] = $v; + } } if (null !== ($v = $this->getListMode())) { - $a[self::FIELD_LIST_MODE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_LIST_MODE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_LIST_MODE_EXT] = $enc; + } + } else { + $a[self::FIELD_LIST_MODE] = $v; + } } if (null !== ($v = $this->getLogMessage())) { - $a[self::FIELD_LOG_MESSAGE] = $v->getValue(); - $a[self::FIELD_LOG_MESSAGE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_LOG_MESSAGE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_LOG_MESSAGE_EXT] = $enc; + } + } else { + $a[self::FIELD_LOG_MESSAGE] = $v; + } } if (null !== ($v = $this->getMax())) { - $a[self::FIELD_MAX] = $v->getValue(); - $a[self::FIELD_MAX_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MAX] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MAX_EXT] = $enc; + } + } else { + $a[self::FIELD_MAX] = $v; + } } if (null !== ($v = $this->getMin())) { - $a[self::FIELD_MIN] = $v->getValue(); - $a[self::FIELD_MIN_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MIN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MIN_EXT] = $enc; + } + } else { + $a[self::FIELD_MIN] = $v; + } } if (null !== ($v = $this->getType())) { - $a[self::FIELD_TYPE] = $v->getValue(); - $a[self::FIELD_TYPE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TYPE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TYPE_EXT] = $enc; + } + } else { + $a[self::FIELD_TYPE] = $v; + } } if (null !== ($v = $this->getVariable())) { - $a[self::FIELD_VARIABLE] = $v->getValue(); - $a[self::FIELD_VARIABLE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VARIABLE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VARIABLE_EXT] = $enc; + } + } else { + $a[self::FIELD_VARIABLE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRStructureMap/FHIRStructureMapStructure.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRStructureMap/FHIRStructureMapStructure.php index a9e3c535d4..40c417f7d1 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRStructureMap/FHIRStructureMapStructure.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRStructureMap/FHIRStructureMapStructure.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRStructureMapStructure extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_STRUCTURE_MAP_DOT_STRUCTURE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ALIAS = 'alias'; const FIELD_ALIAS_EXT = '_alias'; const FIELD_DOCUMENTATION = 'documentation'; @@ -136,6 +132,9 @@ class FHIRStructureMapStructure extends FHIRBackboneElement */ protected $url = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRStructureMapStructure Constructor * @param null|array $data @@ -158,8 +157,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ALIAS] instanceof FHIRString) { $this->setAlias($data[self::FIELD_ALIAS]); - } elseif ($ext && is_scalar($data[self::FIELD_ALIAS])) { - $this->setAlias(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_ALIAS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ALIAS])) { + $this->setAlias(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_ALIAS]] + $ext)); + } else if (is_array($data[self::FIELD_ALIAS])) { + $this->setAlias(new FHIRString(array_merge($ext, $data[self::FIELD_ALIAS]))); + } } else { $this->setAlias(new FHIRString($data[self::FIELD_ALIAS])); } @@ -170,8 +173,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DOCUMENTATION] instanceof FHIRString) { $this->setDocumentation($data[self::FIELD_DOCUMENTATION]); - } elseif ($ext && is_scalar($data[self::FIELD_DOCUMENTATION])) { - $this->setDocumentation(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DOCUMENTATION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DOCUMENTATION])) { + $this->setDocumentation(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DOCUMENTATION]] + $ext)); + } else if (is_array($data[self::FIELD_DOCUMENTATION])) { + $this->setDocumentation(new FHIRString(array_merge($ext, $data[self::FIELD_DOCUMENTATION]))); + } } else { $this->setDocumentation(new FHIRString($data[self::FIELD_DOCUMENTATION])); } @@ -182,8 +189,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MODE] instanceof FHIRStructureMapModelMode) { $this->setMode($data[self::FIELD_MODE]); - } elseif ($ext && is_scalar($data[self::FIELD_MODE])) { - $this->setMode(new FHIRStructureMapModelMode([FHIRStructureMapModelMode::FIELD_VALUE => $data[self::FIELD_MODE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MODE])) { + $this->setMode(new FHIRStructureMapModelMode([FHIRStructureMapModelMode::FIELD_VALUE => $data[self::FIELD_MODE]] + $ext)); + } else if (is_array($data[self::FIELD_MODE])) { + $this->setMode(new FHIRStructureMapModelMode(array_merge($ext, $data[self::FIELD_MODE]))); + } } else { $this->setMode(new FHIRStructureMapModelMode($data[self::FIELD_MODE])); } @@ -194,8 +205,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_URL] instanceof FHIRCanonical) { $this->setUrl($data[self::FIELD_URL]); - } elseif ($ext && is_scalar($data[self::FIELD_URL])) { - $this->setUrl(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_URL])) { + $this->setUrl(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } else if (is_array($data[self::FIELD_URL])) { + $this->setUrl(new FHIRCanonical(array_merge($ext, $data[self::FIELD_URL]))); + } } else { $this->setUrl(new FHIRCanonical($data[self::FIELD_URL])); } @@ -472,7 +487,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDocumentation())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DOCUMENTATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getMode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MODE, null, $v->_getFHIRXMLNamespace())); } @@ -489,19 +503,48 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getAlias())) { - $a[self::FIELD_ALIAS] = $v->getValue(); - $a[self::FIELD_ALIAS_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ALIAS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ALIAS_EXT] = $enc; + } + } else { + $a[self::FIELD_ALIAS] = $v; + } } if (null !== ($v = $this->getDocumentation())) { - $a[self::FIELD_DOCUMENTATION] = $v->getValue(); - $a[self::FIELD_DOCUMENTATION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DOCUMENTATION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DOCUMENTATION_EXT] = $enc; + } + } else { + $a[self::FIELD_DOCUMENTATION] = $v; + } } if (null !== ($v = $this->getMode())) { - $a[self::FIELD_MODE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MODE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MODE_EXT] = $enc; + } + } else { + $a[self::FIELD_MODE] = $v; + } } if (null !== ($v = $this->getUrl())) { - $a[self::FIELD_URL] = $v->getValue(); - $a[self::FIELD_URL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_URL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_URL_EXT] = $enc; + } + } else { + $a[self::FIELD_URL] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRStructureMap/FHIRStructureMapTarget.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRStructureMap/FHIRStructureMapTarget.php index f9316ec831..2b7b37b5aa 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRStructureMap/FHIRStructureMapTarget.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRStructureMap/FHIRStructureMapTarget.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -81,10 +81,6 @@ class FHIRStructureMapTarget extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_STRUCTURE_MAP_DOT_TARGET; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CONTEXT = 'context'; const FIELD_CONTEXT_EXT = '_context'; const FIELD_CONTEXT_TYPE = 'contextType'; @@ -193,6 +189,9 @@ class FHIRStructureMapTarget extends FHIRBackboneElement */ protected $variable = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRStructureMapTarget Constructor * @param null|array $data @@ -215,8 +214,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CONTEXT] instanceof FHIRId) { $this->setContext($data[self::FIELD_CONTEXT]); - } elseif ($ext && is_scalar($data[self::FIELD_CONTEXT])) { - $this->setContext(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_CONTEXT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CONTEXT])) { + $this->setContext(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_CONTEXT]] + $ext)); + } else if (is_array($data[self::FIELD_CONTEXT])) { + $this->setContext(new FHIRId(array_merge($ext, $data[self::FIELD_CONTEXT]))); + } } else { $this->setContext(new FHIRId($data[self::FIELD_CONTEXT])); } @@ -227,8 +230,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CONTEXT_TYPE] instanceof FHIRStructureMapContextType) { $this->setContextType($data[self::FIELD_CONTEXT_TYPE]); - } elseif ($ext && is_scalar($data[self::FIELD_CONTEXT_TYPE])) { - $this->setContextType(new FHIRStructureMapContextType([FHIRStructureMapContextType::FIELD_VALUE => $data[self::FIELD_CONTEXT_TYPE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CONTEXT_TYPE])) { + $this->setContextType(new FHIRStructureMapContextType([FHIRStructureMapContextType::FIELD_VALUE => $data[self::FIELD_CONTEXT_TYPE]] + $ext)); + } else if (is_array($data[self::FIELD_CONTEXT_TYPE])) { + $this->setContextType(new FHIRStructureMapContextType(array_merge($ext, $data[self::FIELD_CONTEXT_TYPE]))); + } } else { $this->setContextType(new FHIRStructureMapContextType($data[self::FIELD_CONTEXT_TYPE])); } @@ -239,8 +246,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ELEMENT] instanceof FHIRString) { $this->setElement($data[self::FIELD_ELEMENT]); - } elseif ($ext && is_scalar($data[self::FIELD_ELEMENT])) { - $this->setElement(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_ELEMENT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ELEMENT])) { + $this->setElement(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_ELEMENT]] + $ext)); + } else if (is_array($data[self::FIELD_ELEMENT])) { + $this->setElement(new FHIRString(array_merge($ext, $data[self::FIELD_ELEMENT]))); + } } else { $this->setElement(new FHIRString($data[self::FIELD_ELEMENT])); } @@ -251,17 +262,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_LIST_MODE])) { foreach($data[self::FIELD_LIST_MODE] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRStructureMapTargetListMode) { $this->addListMode($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addListMode(new FHIRStructureMapTargetListMode([FHIRStructureMapTargetListMode::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addListMode(new FHIRStructureMapTargetListMode([FHIRStructureMapTargetListMode::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addListMode(new FHIRStructureMapTargetListMode(array_merge($v, $ext[$i]))); + } } else { $this->addListMode(new FHIRStructureMapTargetListMode($v)); } } } elseif ($data[self::FIELD_LIST_MODE] instanceof FHIRStructureMapTargetListMode) { $this->addListMode($data[self::FIELD_LIST_MODE]); - } elseif ($ext && is_scalar($data[self::FIELD_LIST_MODE])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_LIST_MODE])) { $this->addListMode(new FHIRStructureMapTargetListMode([FHIRStructureMapTargetListMode::FIELD_VALUE => $data[self::FIELD_LIST_MODE]] + $ext)); } else { $this->addListMode(new FHIRStructureMapTargetListMode($data[self::FIELD_LIST_MODE])); @@ -273,8 +291,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_LIST_RULE_ID] instanceof FHIRId) { $this->setListRuleId($data[self::FIELD_LIST_RULE_ID]); - } elseif ($ext && is_scalar($data[self::FIELD_LIST_RULE_ID])) { - $this->setListRuleId(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_LIST_RULE_ID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_LIST_RULE_ID])) { + $this->setListRuleId(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_LIST_RULE_ID]] + $ext)); + } else if (is_array($data[self::FIELD_LIST_RULE_ID])) { + $this->setListRuleId(new FHIRId(array_merge($ext, $data[self::FIELD_LIST_RULE_ID]))); + } } else { $this->setListRuleId(new FHIRId($data[self::FIELD_LIST_RULE_ID])); } @@ -282,6 +304,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PARAMETER])) { if (is_array($data[self::FIELD_PARAMETER])) { foreach($data[self::FIELD_PARAMETER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRStructureMapParameter) { $this->addParameter($v); } else { @@ -300,8 +325,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TRANSFORM] instanceof FHIRStructureMapTransform) { $this->setTransform($data[self::FIELD_TRANSFORM]); - } elseif ($ext && is_scalar($data[self::FIELD_TRANSFORM])) { - $this->setTransform(new FHIRStructureMapTransform([FHIRStructureMapTransform::FIELD_VALUE => $data[self::FIELD_TRANSFORM]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TRANSFORM])) { + $this->setTransform(new FHIRStructureMapTransform([FHIRStructureMapTransform::FIELD_VALUE => $data[self::FIELD_TRANSFORM]] + $ext)); + } else if (is_array($data[self::FIELD_TRANSFORM])) { + $this->setTransform(new FHIRStructureMapTransform(array_merge($ext, $data[self::FIELD_TRANSFORM]))); + } } else { $this->setTransform(new FHIRStructureMapTransform($data[self::FIELD_TRANSFORM])); } @@ -312,8 +341,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VARIABLE] instanceof FHIRId) { $this->setVariable($data[self::FIELD_VARIABLE]); - } elseif ($ext && is_scalar($data[self::FIELD_VARIABLE])) { - $this->setVariable(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_VARIABLE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VARIABLE])) { + $this->setVariable(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_VARIABLE]] + $ext)); + } else if (is_array($data[self::FIELD_VARIABLE])) { + $this->setVariable(new FHIRId(array_merge($ext, $data[self::FIELD_VARIABLE]))); + } } else { $this->setVariable(new FHIRId($data[self::FIELD_VARIABLE])); } @@ -791,14 +824,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getContext())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CONTEXT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getContextType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CONTEXT_TYPE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getElement())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ELEMENT, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getListMode())) { foreach($vs as $v) { if (null === $v) { @@ -807,10 +838,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_LIST_MODE, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getListRuleId())) { $v->xmlSerialize($sxe->addChild(self::FIELD_LIST_RULE_ID, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getParameter())) { foreach($vs as $v) { if (null === $v) { @@ -836,32 +867,92 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getContext())) { - $a[self::FIELD_CONTEXT] = $v->getValue(); - $a[self::FIELD_CONTEXT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CONTEXT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CONTEXT_EXT] = $enc; + } + } else { + $a[self::FIELD_CONTEXT] = $v; + } } if (null !== ($v = $this->getContextType())) { - $a[self::FIELD_CONTEXT_TYPE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CONTEXT_TYPE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CONTEXT_TYPE_EXT] = $enc; + } + } else { + $a[self::FIELD_CONTEXT_TYPE] = $v; + } } if (null !== ($v = $this->getElement())) { - $a[self::FIELD_ELEMENT] = $v->getValue(); - $a[self::FIELD_ELEMENT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ELEMENT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ELEMENT_EXT] = $enc; + } + } else { + $a[self::FIELD_ELEMENT] = $v; + } } if ([] !== ($vs = $this->getListMode())) { - $a[self::FIELD_LIST_MODE] = $vs; + $a[self::FIELD_LIST_MODE] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_LIST_MODE][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_LIST_MODE_EXT][] = $enc; + } else { + $a[self::FIELD_LIST_MODE_EXT][] = null; + } + } else { + $a[self::FIELD_LIST_MODE][] = $v; + } + } } if (null !== ($v = $this->getListRuleId())) { - $a[self::FIELD_LIST_RULE_ID] = $v->getValue(); - $a[self::FIELD_LIST_RULE_ID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_LIST_RULE_ID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_LIST_RULE_ID_EXT] = $enc; + } + } else { + $a[self::FIELD_LIST_RULE_ID] = $v; + } } if ([] !== ($vs = $this->getParameter())) { $a[self::FIELD_PARAMETER] = $vs; } if (null !== ($v = $this->getTransform())) { - $a[self::FIELD_TRANSFORM] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TRANSFORM] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TRANSFORM_EXT] = $enc; + } + } else { + $a[self::FIELD_TRANSFORM] = $v; + } } if (null !== ($v = $this->getVariable())) { - $a[self::FIELD_VARIABLE] = $v->getValue(); - $a[self::FIELD_VARIABLE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VARIABLE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VARIABLE_EXT] = $enc; + } + } else { + $a[self::FIELD_VARIABLE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSubscription/FHIRSubscriptionChannel.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSubscription/FHIRSubscriptionChannel.php index a3b7053816..14541dfd77 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSubscription/FHIRSubscriptionChannel.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSubscription/FHIRSubscriptionChannel.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -84,10 +84,6 @@ class FHIRSubscriptionChannel extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SUBSCRIPTION_DOT_CHANNEL; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ENDPOINT = 'endpoint'; const FIELD_ENDPOINT_EXT = '_endpoint'; const FIELD_HEADER = 'header'; @@ -144,6 +140,9 @@ class FHIRSubscriptionChannel extends FHIRBackboneElement */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSubscriptionChannel Constructor * @param null|array $data @@ -166,8 +165,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ENDPOINT] instanceof FHIRUrl) { $this->setEndpoint($data[self::FIELD_ENDPOINT]); - } elseif ($ext && is_scalar($data[self::FIELD_ENDPOINT])) { - $this->setEndpoint(new FHIRUrl([FHIRUrl::FIELD_VALUE => $data[self::FIELD_ENDPOINT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ENDPOINT])) { + $this->setEndpoint(new FHIRUrl([FHIRUrl::FIELD_VALUE => $data[self::FIELD_ENDPOINT]] + $ext)); + } else if (is_array($data[self::FIELD_ENDPOINT])) { + $this->setEndpoint(new FHIRUrl(array_merge($ext, $data[self::FIELD_ENDPOINT]))); + } } else { $this->setEndpoint(new FHIRUrl($data[self::FIELD_ENDPOINT])); } @@ -178,17 +181,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_HEADER])) { foreach($data[self::FIELD_HEADER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRString) { $this->addHeader($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addHeader(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addHeader(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addHeader(new FHIRString(array_merge($v, $ext[$i]))); + } } else { $this->addHeader(new FHIRString($v)); } } } elseif ($data[self::FIELD_HEADER] instanceof FHIRString) { $this->addHeader($data[self::FIELD_HEADER]); - } elseif ($ext && is_scalar($data[self::FIELD_HEADER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_HEADER])) { $this->addHeader(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_HEADER]] + $ext)); } else { $this->addHeader(new FHIRString($data[self::FIELD_HEADER])); @@ -200,8 +210,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PAYLOAD] instanceof FHIRCode) { $this->setPayload($data[self::FIELD_PAYLOAD]); - } elseif ($ext && is_scalar($data[self::FIELD_PAYLOAD])) { - $this->setPayload(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_PAYLOAD]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PAYLOAD])) { + $this->setPayload(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_PAYLOAD]] + $ext)); + } else if (is_array($data[self::FIELD_PAYLOAD])) { + $this->setPayload(new FHIRCode(array_merge($ext, $data[self::FIELD_PAYLOAD]))); + } } else { $this->setPayload(new FHIRCode($data[self::FIELD_PAYLOAD])); } @@ -212,8 +226,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TYPE] instanceof FHIRSubscriptionChannelType) { $this->setType($data[self::FIELD_TYPE]); - } elseif ($ext && is_scalar($data[self::FIELD_TYPE])) { - $this->setType(new FHIRSubscriptionChannelType([FHIRSubscriptionChannelType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TYPE])) { + $this->setType(new FHIRSubscriptionChannelType([FHIRSubscriptionChannelType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } else if (is_array($data[self::FIELD_TYPE])) { + $this->setType(new FHIRSubscriptionChannelType(array_merge($ext, $data[self::FIELD_TYPE]))); + } } else { $this->setType(new FHIRSubscriptionChannelType($data[self::FIELD_TYPE])); } @@ -529,10 +547,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_HEADER, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getPayload())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PAYLOAD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -546,8 +564,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getEndpoint())) { - $a[self::FIELD_ENDPOINT] = $v->getValue(); - $a[self::FIELD_ENDPOINT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ENDPOINT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ENDPOINT_EXT] = $enc; + } + } else { + $a[self::FIELD_ENDPOINT] = $v; + } } if ([] !== ($vs = $this->getHeader())) { $a[self::FIELD_HEADER] = []; @@ -555,16 +580,40 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_HEADER][] = $v->getValue(); - $a[self::FIELD_HEADER_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_HEADER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_HEADER_EXT][] = $enc; + } else { + $a[self::FIELD_HEADER_EXT][] = null; + } + } else { + $a[self::FIELD_HEADER][] = $v; + } } } if (null !== ($v = $this->getPayload())) { - $a[self::FIELD_PAYLOAD] = $v->getValue(); - $a[self::FIELD_PAYLOAD_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PAYLOAD] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PAYLOAD_EXT] = $enc; + } + } else { + $a[self::FIELD_PAYLOAD] = $v; + } } if (null !== ($v = $this->getType())) { - $a[self::FIELD_TYPE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TYPE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TYPE_EXT] = $enc; + } + } else { + $a[self::FIELD_TYPE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSubstance/FHIRSubstanceIngredient.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSubstance/FHIRSubstanceIngredient.php index 3e183f91f8..448e2d142c 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSubstance/FHIRSubstanceIngredient.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSubstance/FHIRSubstanceIngredient.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRSubstanceIngredient extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SUBSTANCE_DOT_INGREDIENT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_QUANTITY = 'quantity'; const FIELD_SUBSTANCE_CODEABLE_CONCEPT = 'substanceCodeableConcept'; const FIELD_SUBSTANCE_REFERENCE = 'substanceReference'; @@ -124,6 +120,9 @@ class FHIRSubstanceIngredient extends FHIRBackboneElement */ protected $substanceReference = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSubstanceIngredient Constructor * @param null|array $data @@ -369,15 +368,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_QUANTITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSubstanceCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBSTANCE_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSubstanceReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBSTANCE_REFERENCE, null, $v->_getFHIRXMLNamespace())); } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSubstance/FHIRSubstanceInstance.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSubstance/FHIRSubstanceInstance.php index 6ef29fae10..c41cdf01be 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSubstance/FHIRSubstanceInstance.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSubstance/FHIRSubstanceInstance.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRSubstanceInstance extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SUBSTANCE_DOT_INSTANCE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_EXPIRY = 'expiry'; const FIELD_EXPIRY_EXT = '_expiry'; const FIELD_IDENTIFIER = 'identifier'; @@ -131,6 +127,9 @@ class FHIRSubstanceInstance extends FHIRBackboneElement */ protected $quantity = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSubstanceInstance Constructor * @param null|array $data @@ -153,8 +152,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EXPIRY] instanceof FHIRDateTime) { $this->setExpiry($data[self::FIELD_EXPIRY]); - } elseif ($ext && is_scalar($data[self::FIELD_EXPIRY])) { - $this->setExpiry(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_EXPIRY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EXPIRY])) { + $this->setExpiry(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_EXPIRY]] + $ext)); + } else if (is_array($data[self::FIELD_EXPIRY])) { + $this->setExpiry(new FHIRDateTime(array_merge($ext, $data[self::FIELD_EXPIRY]))); + } } else { $this->setExpiry(new FHIRDateTime($data[self::FIELD_EXPIRY])); } @@ -165,8 +168,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->setIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { - $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_IDENTIFIER]))); + } } else { $this->setIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); } @@ -177,8 +184,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_QUANTITY] instanceof FHIRQuantity) { $this->setQuantity($data[self::FIELD_QUANTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_QUANTITY])) { - $this->setQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_QUANTITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_QUANTITY])) { + $this->setQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_QUANTITY])) { + $this->setQuantity(new FHIRQuantity(array_merge($ext, $data[self::FIELD_QUANTITY]))); + } } else { $this->setQuantity(new FHIRQuantity($data[self::FIELD_QUANTITY])); } @@ -413,11 +424,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getExpiry())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EXPIRY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_QUANTITY, null, $v->_getFHIRXMLNamespace())); } @@ -431,14 +440,37 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getExpiry())) { - $a[self::FIELD_EXPIRY] = $v->getValue(); - $a[self::FIELD_EXPIRY_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EXPIRY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EXPIRY_EXT] = $enc; + } + } else { + $a[self::FIELD_EXPIRY] = $v; + } } if (null !== ($v = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_IDENTIFIER] = $v; + } } if (null !== ($v = $this->getQuantity())) { - $a[self::FIELD_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_QUANTITY] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSubstanceAmount.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSubstanceAmount.php index 5254f6a98c..34ca385b6a 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSubstanceAmount.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSubstanceAmount.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -88,10 +88,6 @@ class FHIRSubstanceAmount extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SUBSTANCE_AMOUNT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_AMOUNT_QUANTITY = 'amountQuantity'; const FIELD_AMOUNT_QUANTITY_EXT = '_amountQuantity'; const FIELD_AMOUNT_RANGE = 'amountRange'; @@ -191,6 +187,9 @@ class FHIRSubstanceAmount extends FHIRBackboneElement */ protected $referenceRange = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSubstanceAmount Constructor * @param null|array $data @@ -213,8 +212,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_AMOUNT_QUANTITY] instanceof FHIRQuantity) { $this->setAmountQuantity($data[self::FIELD_AMOUNT_QUANTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_AMOUNT_QUANTITY])) { - $this->setAmountQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_AMOUNT_QUANTITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_AMOUNT_QUANTITY])) { + $this->setAmountQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_AMOUNT_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_AMOUNT_QUANTITY])) { + $this->setAmountQuantity(new FHIRQuantity(array_merge($ext, $data[self::FIELD_AMOUNT_QUANTITY]))); + } } else { $this->setAmountQuantity(new FHIRQuantity($data[self::FIELD_AMOUNT_QUANTITY])); } @@ -232,8 +235,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_AMOUNT_STRING] instanceof FHIRString) { $this->setAmountString($data[self::FIELD_AMOUNT_STRING]); - } elseif ($ext && is_scalar($data[self::FIELD_AMOUNT_STRING])) { - $this->setAmountString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_AMOUNT_STRING]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_AMOUNT_STRING])) { + $this->setAmountString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_AMOUNT_STRING]] + $ext)); + } else if (is_array($data[self::FIELD_AMOUNT_STRING])) { + $this->setAmountString(new FHIRString(array_merge($ext, $data[self::FIELD_AMOUNT_STRING]))); + } } else { $this->setAmountString(new FHIRString($data[self::FIELD_AMOUNT_STRING])); } @@ -244,8 +251,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_AMOUNT_TEXT] instanceof FHIRString) { $this->setAmountText($data[self::FIELD_AMOUNT_TEXT]); - } elseif ($ext && is_scalar($data[self::FIELD_AMOUNT_TEXT])) { - $this->setAmountText(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_AMOUNT_TEXT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_AMOUNT_TEXT])) { + $this->setAmountText(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_AMOUNT_TEXT]] + $ext)); + } else if (is_array($data[self::FIELD_AMOUNT_TEXT])) { + $this->setAmountText(new FHIRString(array_merge($ext, $data[self::FIELD_AMOUNT_TEXT]))); + } } else { $this->setAmountText(new FHIRString($data[self::FIELD_AMOUNT_TEXT])); } @@ -631,11 +642,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getAmountQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AMOUNT_QUANTITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getAmountRange())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AMOUNT_RANGE, null, $v->_getFHIRXMLNamespace())); } @@ -645,11 +654,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getAmountText())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AMOUNT_TEXT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getAmountType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AMOUNT_TYPE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getReferenceRange())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REFERENCE_RANGE, null, $v->_getFHIRXMLNamespace())); } @@ -663,18 +670,40 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getAmountQuantity())) { - $a[self::FIELD_AMOUNT_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_AMOUNT_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_AMOUNT_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_AMOUNT_QUANTITY] = $v; + } } if (null !== ($v = $this->getAmountRange())) { $a[self::FIELD_AMOUNT_RANGE] = $v; } if (null !== ($v = $this->getAmountString())) { - $a[self::FIELD_AMOUNT_STRING] = $v->getValue(); - $a[self::FIELD_AMOUNT_STRING_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_AMOUNT_STRING] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_AMOUNT_STRING_EXT] = $enc; + } + } else { + $a[self::FIELD_AMOUNT_STRING] = $v; + } } if (null !== ($v = $this->getAmountText())) { - $a[self::FIELD_AMOUNT_TEXT] = $v->getValue(); - $a[self::FIELD_AMOUNT_TEXT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_AMOUNT_TEXT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_AMOUNT_TEXT_EXT] = $enc; + } + } else { + $a[self::FIELD_AMOUNT_TEXT] = $v; + } } if (null !== ($v = $this->getAmountType())) { $a[self::FIELD_AMOUNT_TYPE] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSubstanceAmount/FHIRSubstanceAmountReferenceRange.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSubstanceAmount/FHIRSubstanceAmountReferenceRange.php index 0c23485c3f..7f7c98d7a4 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSubstanceAmount/FHIRSubstanceAmountReferenceRange.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSubstanceAmount/FHIRSubstanceAmountReferenceRange.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -84,10 +84,6 @@ class FHIRSubstanceAmountReferenceRange extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SUBSTANCE_AMOUNT_DOT_REFERENCE_RANGE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_HIGH_LIMIT = 'highLimit'; const FIELD_HIGH_LIMIT_EXT = '_highLimit'; const FIELD_LOW_LIMIT = 'lowLimit'; @@ -119,6 +115,9 @@ class FHIRSubstanceAmountReferenceRange extends FHIRBackboneElement */ protected $lowLimit = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSubstanceAmountReferenceRange Constructor * @param null|array $data @@ -141,8 +140,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_HIGH_LIMIT] instanceof FHIRQuantity) { $this->setHighLimit($data[self::FIELD_HIGH_LIMIT]); - } elseif ($ext && is_scalar($data[self::FIELD_HIGH_LIMIT])) { - $this->setHighLimit(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_HIGH_LIMIT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_HIGH_LIMIT])) { + $this->setHighLimit(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_HIGH_LIMIT]] + $ext)); + } else if (is_array($data[self::FIELD_HIGH_LIMIT])) { + $this->setHighLimit(new FHIRQuantity(array_merge($ext, $data[self::FIELD_HIGH_LIMIT]))); + } } else { $this->setHighLimit(new FHIRQuantity($data[self::FIELD_HIGH_LIMIT])); } @@ -153,8 +156,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_LOW_LIMIT] instanceof FHIRQuantity) { $this->setLowLimit($data[self::FIELD_LOW_LIMIT]); - } elseif ($ext && is_scalar($data[self::FIELD_LOW_LIMIT])) { - $this->setLowLimit(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_LOW_LIMIT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_LOW_LIMIT])) { + $this->setLowLimit(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_LOW_LIMIT]] + $ext)); + } else if (is_array($data[self::FIELD_LOW_LIMIT])) { + $this->setLowLimit(new FHIRQuantity(array_merge($ext, $data[self::FIELD_LOW_LIMIT]))); + } } else { $this->setLowLimit(new FHIRQuantity($data[self::FIELD_LOW_LIMIT])); } @@ -334,11 +341,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getHighLimit())) { $v->xmlSerialize($sxe->addChild(self::FIELD_HIGH_LIMIT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getLowLimit())) { $v->xmlSerialize($sxe->addChild(self::FIELD_LOW_LIMIT, null, $v->_getFHIRXMLNamespace())); } @@ -352,10 +357,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getHighLimit())) { - $a[self::FIELD_HIGH_LIMIT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_HIGH_LIMIT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_HIGH_LIMIT_EXT] = $enc; + } + } else { + $a[self::FIELD_HIGH_LIMIT] = $v; + } } if (null !== ($v = $this->getLowLimit())) { - $a[self::FIELD_LOW_LIMIT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_LOW_LIMIT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_LOW_LIMIT_EXT] = $enc; + } + } else { + $a[self::FIELD_LOW_LIMIT] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSubstanceNucleicAcid/FHIRSubstanceNucleicAcidLinkage.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSubstanceNucleicAcid/FHIRSubstanceNucleicAcidLinkage.php index 626c4df6e2..d458bf9971 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSubstanceNucleicAcid/FHIRSubstanceNucleicAcidLinkage.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSubstanceNucleicAcid/FHIRSubstanceNucleicAcidLinkage.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -81,10 +81,6 @@ class FHIRSubstanceNucleicAcidLinkage extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SUBSTANCE_NUCLEIC_ACID_DOT_LINKAGE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CONNECTIVITY = 'connectivity'; const FIELD_CONNECTIVITY_EXT = '_connectivity'; const FIELD_IDENTIFIER = 'identifier'; @@ -144,6 +140,9 @@ class FHIRSubstanceNucleicAcidLinkage extends FHIRBackboneElement */ protected $residueSite = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSubstanceNucleicAcidLinkage Constructor * @param null|array $data @@ -166,8 +165,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CONNECTIVITY] instanceof FHIRString) { $this->setConnectivity($data[self::FIELD_CONNECTIVITY]); - } elseif ($ext && is_scalar($data[self::FIELD_CONNECTIVITY])) { - $this->setConnectivity(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_CONNECTIVITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CONNECTIVITY])) { + $this->setConnectivity(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_CONNECTIVITY]] + $ext)); + } else if (is_array($data[self::FIELD_CONNECTIVITY])) { + $this->setConnectivity(new FHIRString(array_merge($ext, $data[self::FIELD_CONNECTIVITY]))); + } } else { $this->setConnectivity(new FHIRString($data[self::FIELD_CONNECTIVITY])); } @@ -178,8 +181,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->setIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { - $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_IDENTIFIER]))); + } } else { $this->setIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); } @@ -190,8 +197,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -202,8 +213,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_RESIDUE_SITE] instanceof FHIRString) { $this->setResidueSite($data[self::FIELD_RESIDUE_SITE]); - } elseif ($ext && is_scalar($data[self::FIELD_RESIDUE_SITE])) { - $this->setResidueSite(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_RESIDUE_SITE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_RESIDUE_SITE])) { + $this->setResidueSite(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_RESIDUE_SITE]] + $ext)); + } else if (is_array($data[self::FIELD_RESIDUE_SITE])) { + $this->setResidueSite(new FHIRString(array_merge($ext, $data[self::FIELD_RESIDUE_SITE]))); + } } else { $this->setResidueSite(new FHIRString($data[self::FIELD_RESIDUE_SITE])); } @@ -489,7 +504,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getConnectivity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CONNECTIVITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } @@ -509,19 +523,48 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getConnectivity())) { - $a[self::FIELD_CONNECTIVITY] = $v->getValue(); - $a[self::FIELD_CONNECTIVITY_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CONNECTIVITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CONNECTIVITY_EXT] = $enc; + } + } else { + $a[self::FIELD_CONNECTIVITY] = $v; + } } if (null !== ($v = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_IDENTIFIER] = $v; + } } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if (null !== ($v = $this->getResidueSite())) { - $a[self::FIELD_RESIDUE_SITE] = $v->getValue(); - $a[self::FIELD_RESIDUE_SITE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_RESIDUE_SITE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_RESIDUE_SITE_EXT] = $enc; + } + } else { + $a[self::FIELD_RESIDUE_SITE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSubstanceNucleicAcid/FHIRSubstanceNucleicAcidSubunit.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSubstanceNucleicAcid/FHIRSubstanceNucleicAcidSubunit.php index 42d38c3fa4..779176d5da 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSubstanceNucleicAcid/FHIRSubstanceNucleicAcidSubunit.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSubstanceNucleicAcid/FHIRSubstanceNucleicAcidSubunit.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -83,10 +83,6 @@ class FHIRSubstanceNucleicAcidSubunit extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SUBSTANCE_NUCLEIC_ACID_DOT_SUBUNIT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_FIVE_PRIME = 'fivePrime'; const FIELD_LENGTH = 'length'; const FIELD_LENGTH_EXT = '_length'; @@ -201,6 +197,9 @@ class FHIRSubstanceNucleicAcidSubunit extends FHIRBackboneElement */ protected $threePrime = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSubstanceNucleicAcidSubunit Constructor * @param null|array $data @@ -230,8 +229,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_LENGTH] instanceof FHIRInteger) { $this->setLength($data[self::FIELD_LENGTH]); - } elseif ($ext && is_scalar($data[self::FIELD_LENGTH])) { - $this->setLength(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_LENGTH]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_LENGTH])) { + $this->setLength(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_LENGTH]] + $ext)); + } else if (is_array($data[self::FIELD_LENGTH])) { + $this->setLength(new FHIRInteger(array_merge($ext, $data[self::FIELD_LENGTH]))); + } } else { $this->setLength(new FHIRInteger($data[self::FIELD_LENGTH])); } @@ -239,6 +242,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_LINKAGE])) { if (is_array($data[self::FIELD_LINKAGE])) { foreach($data[self::FIELD_LINKAGE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRSubstanceNucleicAcidLinkage) { $this->addLinkage($v); } else { @@ -257,8 +263,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SEQUENCE] instanceof FHIRString) { $this->setSequence($data[self::FIELD_SEQUENCE]); - } elseif ($ext && is_scalar($data[self::FIELD_SEQUENCE])) { - $this->setSequence(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SEQUENCE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SEQUENCE])) { + $this->setSequence(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SEQUENCE]] + $ext)); + } else if (is_array($data[self::FIELD_SEQUENCE])) { + $this->setSequence(new FHIRString(array_merge($ext, $data[self::FIELD_SEQUENCE]))); + } } else { $this->setSequence(new FHIRString($data[self::FIELD_SEQUENCE])); } @@ -276,8 +286,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SUBUNIT] instanceof FHIRInteger) { $this->setSubunit($data[self::FIELD_SUBUNIT]); - } elseif ($ext && is_scalar($data[self::FIELD_SUBUNIT])) { - $this->setSubunit(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_SUBUNIT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SUBUNIT])) { + $this->setSubunit(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_SUBUNIT]] + $ext)); + } else if (is_array($data[self::FIELD_SUBUNIT])) { + $this->setSubunit(new FHIRInteger(array_merge($ext, $data[self::FIELD_SUBUNIT]))); + } } else { $this->setSubunit(new FHIRInteger($data[self::FIELD_SUBUNIT])); } @@ -285,6 +299,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SUGAR])) { if (is_array($data[self::FIELD_SUGAR])) { foreach($data[self::FIELD_SUGAR] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRSubstanceNucleicAcidSugar) { $this->addSugar($v); } else { @@ -788,14 +805,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getFivePrime())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FIVE_PRIME, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getLength())) { $v->xmlSerialize($sxe->addChild(self::FIELD_LENGTH, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getLinkage())) { foreach($vs as $v) { if (null === $v) { @@ -804,17 +819,16 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_LINKAGE, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getSequence())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SEQUENCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSequenceAttachment())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SEQUENCE_ATTACHMENT, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getSubunit())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBUNIT, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getSugar())) { foreach($vs as $v) { if (null === $v) { @@ -840,22 +854,43 @@ public function jsonSerialize() $a[self::FIELD_FIVE_PRIME] = $v; } if (null !== ($v = $this->getLength())) { - $a[self::FIELD_LENGTH] = $v->getValue(); - $a[self::FIELD_LENGTH_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_LENGTH] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_LENGTH_EXT] = $enc; + } + } else { + $a[self::FIELD_LENGTH] = $v; + } } if ([] !== ($vs = $this->getLinkage())) { $a[self::FIELD_LINKAGE] = $vs; } if (null !== ($v = $this->getSequence())) { - $a[self::FIELD_SEQUENCE] = $v->getValue(); - $a[self::FIELD_SEQUENCE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SEQUENCE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SEQUENCE_EXT] = $enc; + } + } else { + $a[self::FIELD_SEQUENCE] = $v; + } } if (null !== ($v = $this->getSequenceAttachment())) { $a[self::FIELD_SEQUENCE_ATTACHMENT] = $v; } if (null !== ($v = $this->getSubunit())) { - $a[self::FIELD_SUBUNIT] = $v->getValue(); - $a[self::FIELD_SUBUNIT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SUBUNIT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SUBUNIT_EXT] = $enc; + } + } else { + $a[self::FIELD_SUBUNIT] = $v; + } } if ([] !== ($vs = $this->getSugar())) { $a[self::FIELD_SUGAR] = $vs; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSubstanceNucleicAcid/FHIRSubstanceNucleicAcidSugar.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSubstanceNucleicAcid/FHIRSubstanceNucleicAcidSugar.php index bfda8b9fa0..50cc048b10 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSubstanceNucleicAcid/FHIRSubstanceNucleicAcidSugar.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSubstanceNucleicAcid/FHIRSubstanceNucleicAcidSugar.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -81,10 +81,6 @@ class FHIRSubstanceNucleicAcidSugar extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SUBSTANCE_NUCLEIC_ACID_DOT_SUGAR; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_IDENTIFIER = 'identifier'; const FIELD_IDENTIFIER_EXT = '_identifier'; const FIELD_NAME = 'name'; @@ -129,6 +125,9 @@ class FHIRSubstanceNucleicAcidSugar extends FHIRBackboneElement */ protected $residueSite = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSubstanceNucleicAcidSugar Constructor * @param null|array $data @@ -151,8 +150,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->setIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { - $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_IDENTIFIER]))); + } } else { $this->setIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); } @@ -163,8 +166,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -175,8 +182,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_RESIDUE_SITE] instanceof FHIRString) { $this->setResidueSite($data[self::FIELD_RESIDUE_SITE]); - } elseif ($ext && is_scalar($data[self::FIELD_RESIDUE_SITE])) { - $this->setResidueSite(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_RESIDUE_SITE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_RESIDUE_SITE])) { + $this->setResidueSite(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_RESIDUE_SITE]] + $ext)); + } else if (is_array($data[self::FIELD_RESIDUE_SITE])) { + $this->setResidueSite(new FHIRString(array_merge($ext, $data[self::FIELD_RESIDUE_SITE]))); + } } else { $this->setResidueSite(new FHIRString($data[self::FIELD_RESIDUE_SITE])); } @@ -411,7 +422,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } @@ -431,15 +441,37 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_IDENTIFIER] = $v; + } } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if (null !== ($v = $this->getResidueSite())) { - $a[self::FIELD_RESIDUE_SITE] = $v->getValue(); - $a[self::FIELD_RESIDUE_SITE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_RESIDUE_SITE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_RESIDUE_SITE_EXT] = $enc; + } + } else { + $a[self::FIELD_RESIDUE_SITE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSubstancePolymer/FHIRSubstancePolymerDegreeOfPolymerisation.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSubstancePolymer/FHIRSubstancePolymerDegreeOfPolymerisation.php index 81a996b620..2dce499894 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSubstancePolymer/FHIRSubstancePolymerDegreeOfPolymerisation.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSubstancePolymer/FHIRSubstancePolymerDegreeOfPolymerisation.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRSubstancePolymerDegreeOfPolymerisation extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SUBSTANCE_POLYMER_DOT_DEGREE_OF_POLYMERISATION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_AMOUNT = 'amount'; const FIELD_DEGREE = 'degree'; @@ -113,6 +109,9 @@ class FHIRSubstancePolymerDegreeOfPolymerisation extends FHIRBackboneElement */ protected $degree = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSubstancePolymerDegreeOfPolymerisation Constructor * @param null|array $data @@ -322,11 +321,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getAmount())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AMOUNT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDegree())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEGREE, null, $v->_getFHIRXMLNamespace())); } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSubstancePolymer/FHIRSubstancePolymerMonomerSet.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSubstancePolymer/FHIRSubstancePolymerMonomerSet.php index 96f33616ff..61458ff0ff 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSubstancePolymer/FHIRSubstancePolymerMonomerSet.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSubstancePolymer/FHIRSubstancePolymerMonomerSet.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -77,10 +77,6 @@ class FHIRSubstancePolymerMonomerSet extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SUBSTANCE_POLYMER_DOT_MONOMER_SET; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_RATIO_TYPE = 'ratioType'; const FIELD_STARTING_MATERIAL = 'startingMaterial'; @@ -105,6 +101,9 @@ class FHIRSubstancePolymerMonomerSet extends FHIRBackboneElement */ protected $startingMaterial = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSubstancePolymerMonomerSet Constructor * @param null|array $data @@ -131,6 +130,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_STARTING_MATERIAL])) { if (is_array($data[self::FIELD_STARTING_MATERIAL])) { foreach($data[self::FIELD_STARTING_MATERIAL] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRSubstancePolymerStartingMaterial) { $this->addStartingMaterial($v); } else { @@ -334,11 +336,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getRatioType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RATIO_TYPE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getStartingMaterial())) { foreach($vs as $v) { if (null === $v) { @@ -347,6 +347,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_STARTING_MATERIAL, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSubstancePolymer/FHIRSubstancePolymerRepeat.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSubstancePolymer/FHIRSubstancePolymerRepeat.php index 55b9d8b522..2b4bc3b370 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSubstancePolymer/FHIRSubstancePolymerRepeat.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSubstancePolymer/FHIRSubstancePolymerRepeat.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRSubstancePolymerRepeat extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SUBSTANCE_POLYMER_DOT_REPEAT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_AVERAGE_MOLECULAR_FORMULA = 'averageMolecularFormula'; const FIELD_AVERAGE_MOLECULAR_FORMULA_EXT = '_averageMolecularFormula'; const FIELD_NUMBER_OF_UNITS = 'numberOfUnits'; @@ -133,6 +129,9 @@ class FHIRSubstancePolymerRepeat extends FHIRBackboneElement */ protected $repeatUnitAmountType = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSubstancePolymerRepeat Constructor * @param null|array $data @@ -155,8 +154,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_AVERAGE_MOLECULAR_FORMULA] instanceof FHIRString) { $this->setAverageMolecularFormula($data[self::FIELD_AVERAGE_MOLECULAR_FORMULA]); - } elseif ($ext && is_scalar($data[self::FIELD_AVERAGE_MOLECULAR_FORMULA])) { - $this->setAverageMolecularFormula(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_AVERAGE_MOLECULAR_FORMULA]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_AVERAGE_MOLECULAR_FORMULA])) { + $this->setAverageMolecularFormula(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_AVERAGE_MOLECULAR_FORMULA]] + $ext)); + } else if (is_array($data[self::FIELD_AVERAGE_MOLECULAR_FORMULA])) { + $this->setAverageMolecularFormula(new FHIRString(array_merge($ext, $data[self::FIELD_AVERAGE_MOLECULAR_FORMULA]))); + } } else { $this->setAverageMolecularFormula(new FHIRString($data[self::FIELD_AVERAGE_MOLECULAR_FORMULA])); } @@ -167,8 +170,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NUMBER_OF_UNITS] instanceof FHIRInteger) { $this->setNumberOfUnits($data[self::FIELD_NUMBER_OF_UNITS]); - } elseif ($ext && is_scalar($data[self::FIELD_NUMBER_OF_UNITS])) { - $this->setNumberOfUnits(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_NUMBER_OF_UNITS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NUMBER_OF_UNITS])) { + $this->setNumberOfUnits(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_NUMBER_OF_UNITS]] + $ext)); + } else if (is_array($data[self::FIELD_NUMBER_OF_UNITS])) { + $this->setNumberOfUnits(new FHIRInteger(array_merge($ext, $data[self::FIELD_NUMBER_OF_UNITS]))); + } } else { $this->setNumberOfUnits(new FHIRInteger($data[self::FIELD_NUMBER_OF_UNITS])); } @@ -176,6 +183,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REPEAT_UNIT])) { if (is_array($data[self::FIELD_REPEAT_UNIT])) { foreach($data[self::FIELD_REPEAT_UNIT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRSubstancePolymerRepeatUnit) { $this->addRepeatUnit($v); } else { @@ -480,7 +490,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getNumberOfUnits())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NUMBER_OF_UNITS, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getRepeatUnit())) { foreach($vs as $v) { if (null === $v) { @@ -503,12 +512,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getAverageMolecularFormula())) { - $a[self::FIELD_AVERAGE_MOLECULAR_FORMULA] = $v->getValue(); - $a[self::FIELD_AVERAGE_MOLECULAR_FORMULA_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_AVERAGE_MOLECULAR_FORMULA] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_AVERAGE_MOLECULAR_FORMULA_EXT] = $enc; + } + } else { + $a[self::FIELD_AVERAGE_MOLECULAR_FORMULA] = $v; + } } if (null !== ($v = $this->getNumberOfUnits())) { - $a[self::FIELD_NUMBER_OF_UNITS] = $v->getValue(); - $a[self::FIELD_NUMBER_OF_UNITS_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NUMBER_OF_UNITS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NUMBER_OF_UNITS_EXT] = $enc; + } + } else { + $a[self::FIELD_NUMBER_OF_UNITS] = $v; + } } if ([] !== ($vs = $this->getRepeatUnit())) { $a[self::FIELD_REPEAT_UNIT] = $vs; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSubstancePolymer/FHIRSubstancePolymerRepeatUnit.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSubstancePolymer/FHIRSubstancePolymerRepeatUnit.php index b8d08ee267..f32778f2eb 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSubstancePolymer/FHIRSubstancePolymerRepeatUnit.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSubstancePolymer/FHIRSubstancePolymerRepeatUnit.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRSubstancePolymerRepeatUnit extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SUBSTANCE_POLYMER_DOT_REPEAT_UNIT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_AMOUNT = 'amount'; const FIELD_DEGREE_OF_POLYMERISATION = 'degreeOfPolymerisation'; const FIELD_ORIENTATION_OF_POLYMERISATION = 'orientationOfPolymerisation'; @@ -147,6 +143,9 @@ class FHIRSubstancePolymerRepeatUnit extends FHIRBackboneElement */ protected $structuralRepresentation = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSubstancePolymerRepeatUnit Constructor * @param null|array $data @@ -173,6 +172,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_DEGREE_OF_POLYMERISATION])) { if (is_array($data[self::FIELD_DEGREE_OF_POLYMERISATION])) { foreach($data[self::FIELD_DEGREE_OF_POLYMERISATION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRSubstancePolymerDegreeOfPolymerisation) { $this->addDegreeOfPolymerisation($v); } else { @@ -198,8 +200,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_REPEAT_UNIT] instanceof FHIRString) { $this->setRepeatUnit($data[self::FIELD_REPEAT_UNIT]); - } elseif ($ext && is_scalar($data[self::FIELD_REPEAT_UNIT])) { - $this->setRepeatUnit(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_REPEAT_UNIT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_REPEAT_UNIT])) { + $this->setRepeatUnit(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_REPEAT_UNIT]] + $ext)); + } else if (is_array($data[self::FIELD_REPEAT_UNIT])) { + $this->setRepeatUnit(new FHIRString(array_merge($ext, $data[self::FIELD_REPEAT_UNIT]))); + } } else { $this->setRepeatUnit(new FHIRString($data[self::FIELD_REPEAT_UNIT])); } @@ -207,6 +213,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_STRUCTURAL_REPRESENTATION])) { if (is_array($data[self::FIELD_STRUCTURAL_REPRESENTATION])) { foreach($data[self::FIELD_STRUCTURAL_REPRESENTATION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRSubstancePolymerStructuralRepresentation) { $this->addStructuralRepresentation($v); } else { @@ -552,11 +561,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getAmount())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AMOUNT, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getDegreeOfPolymerisation())) { foreach($vs as $v) { if (null === $v) { @@ -572,7 +579,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getRepeatUnit())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REPEAT_UNIT, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getStructuralRepresentation())) { foreach($vs as $v) { if (null === $v) { @@ -581,6 +587,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_STRUCTURAL_REPRESENTATION, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } @@ -600,8 +607,15 @@ public function jsonSerialize() $a[self::FIELD_ORIENTATION_OF_POLYMERISATION] = $v; } if (null !== ($v = $this->getRepeatUnit())) { - $a[self::FIELD_REPEAT_UNIT] = $v->getValue(); - $a[self::FIELD_REPEAT_UNIT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_REPEAT_UNIT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_REPEAT_UNIT_EXT] = $enc; + } + } else { + $a[self::FIELD_REPEAT_UNIT] = $v; + } } if ([] !== ($vs = $this->getStructuralRepresentation())) { $a[self::FIELD_STRUCTURAL_REPRESENTATION] = $vs; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSubstancePolymer/FHIRSubstancePolymerStartingMaterial.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSubstancePolymer/FHIRSubstancePolymerStartingMaterial.php index fc0a9fb84f..6a43e8a6c5 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSubstancePolymer/FHIRSubstancePolymerStartingMaterial.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSubstancePolymer/FHIRSubstancePolymerStartingMaterial.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRSubstancePolymerStartingMaterial extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SUBSTANCE_POLYMER_DOT_STARTING_MATERIAL; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_AMOUNT = 'amount'; const FIELD_IS_DEFINING = 'isDefining'; const FIELD_IS_DEFINING_EXT = '_isDefining'; @@ -139,6 +135,9 @@ class FHIRSubstancePolymerStartingMaterial extends FHIRBackboneElement */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSubstancePolymerStartingMaterial Constructor * @param null|array $data @@ -168,8 +167,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IS_DEFINING] instanceof FHIRBoolean) { $this->setIsDefining($data[self::FIELD_IS_DEFINING]); - } elseif ($ext && is_scalar($data[self::FIELD_IS_DEFINING])) { - $this->setIsDefining(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_IS_DEFINING]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IS_DEFINING])) { + $this->setIsDefining(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_IS_DEFINING]] + $ext)); + } else if (is_array($data[self::FIELD_IS_DEFINING])) { + $this->setIsDefining(new FHIRBoolean(array_merge($ext, $data[self::FIELD_IS_DEFINING]))); + } } else { $this->setIsDefining(new FHIRBoolean($data[self::FIELD_IS_DEFINING])); } @@ -444,18 +447,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getAmount())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AMOUNT, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getIsDefining())) { $v->xmlSerialize($sxe->addChild(self::FIELD_IS_DEFINING, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getMaterial())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MATERIAL, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -472,8 +472,15 @@ public function jsonSerialize() $a[self::FIELD_AMOUNT] = $v; } if (null !== ($v = $this->getIsDefining())) { - $a[self::FIELD_IS_DEFINING] = $v->getValue(); - $a[self::FIELD_IS_DEFINING_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IS_DEFINING] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IS_DEFINING_EXT] = $enc; + } + } else { + $a[self::FIELD_IS_DEFINING] = $v; + } } if (null !== ($v = $this->getMaterial())) { $a[self::FIELD_MATERIAL] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSubstancePolymer/FHIRSubstancePolymerStructuralRepresentation.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSubstancePolymer/FHIRSubstancePolymerStructuralRepresentation.php index e39fb9ef6a..b3519a9dab 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSubstancePolymer/FHIRSubstancePolymerStructuralRepresentation.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSubstancePolymer/FHIRSubstancePolymerStructuralRepresentation.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRSubstancePolymerStructuralRepresentation extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SUBSTANCE_POLYMER_DOT_STRUCTURAL_REPRESENTATION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ATTACHMENT = 'attachment'; const FIELD_REPRESENTATION = 'representation'; const FIELD_REPRESENTATION_EXT = '_representation'; @@ -122,6 +118,9 @@ class FHIRSubstancePolymerStructuralRepresentation extends FHIRBackboneElement */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSubstancePolymerStructuralRepresentation Constructor * @param null|array $data @@ -151,8 +150,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_REPRESENTATION] instanceof FHIRString) { $this->setRepresentation($data[self::FIELD_REPRESENTATION]); - } elseif ($ext && is_scalar($data[self::FIELD_REPRESENTATION])) { - $this->setRepresentation(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_REPRESENTATION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_REPRESENTATION])) { + $this->setRepresentation(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_REPRESENTATION]] + $ext)); + } else if (is_array($data[self::FIELD_REPRESENTATION])) { + $this->setRepresentation(new FHIRString(array_merge($ext, $data[self::FIELD_REPRESENTATION]))); + } } else { $this->setRepresentation(new FHIRString($data[self::FIELD_REPRESENTATION])); } @@ -377,14 +380,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getAttachment())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ATTACHMENT, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getRepresentation())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REPRESENTATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -401,8 +402,15 @@ public function jsonSerialize() $a[self::FIELD_ATTACHMENT] = $v; } if (null !== ($v = $this->getRepresentation())) { - $a[self::FIELD_REPRESENTATION] = $v->getValue(); - $a[self::FIELD_REPRESENTATION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_REPRESENTATION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_REPRESENTATION_EXT] = $enc; + } + } else { + $a[self::FIELD_REPRESENTATION] = $v; + } } if (null !== ($v = $this->getType())) { $a[self::FIELD_TYPE] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSubstanceProtein/FHIRSubstanceProteinSubunit.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSubstanceProtein/FHIRSubstanceProteinSubunit.php index 89af194af9..a55a23e8a9 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSubstanceProtein/FHIRSubstanceProteinSubunit.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSubstanceProtein/FHIRSubstanceProteinSubunit.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -87,10 +87,6 @@ class FHIRSubstanceProteinSubunit extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SUBSTANCE_PROTEIN_DOT_SUBUNIT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_C_TERMINAL_MODIFICATION = 'cTerminalModification'; const FIELD_C_TERMINAL_MODIFICATION_EXT = '_cTerminalModification'; const FIELD_C_TERMINAL_MODIFICATION_ID = 'cTerminalModificationId'; @@ -215,6 +211,9 @@ class FHIRSubstanceProteinSubunit extends FHIRBackboneElement */ protected $subunit = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSubstanceProteinSubunit Constructor * @param null|array $data @@ -237,8 +236,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_C_TERMINAL_MODIFICATION] instanceof FHIRString) { $this->setCTerminalModification($data[self::FIELD_C_TERMINAL_MODIFICATION]); - } elseif ($ext && is_scalar($data[self::FIELD_C_TERMINAL_MODIFICATION])) { - $this->setCTerminalModification(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_C_TERMINAL_MODIFICATION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_C_TERMINAL_MODIFICATION])) { + $this->setCTerminalModification(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_C_TERMINAL_MODIFICATION]] + $ext)); + } else if (is_array($data[self::FIELD_C_TERMINAL_MODIFICATION])) { + $this->setCTerminalModification(new FHIRString(array_merge($ext, $data[self::FIELD_C_TERMINAL_MODIFICATION]))); + } } else { $this->setCTerminalModification(new FHIRString($data[self::FIELD_C_TERMINAL_MODIFICATION])); } @@ -249,8 +252,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_C_TERMINAL_MODIFICATION_ID] instanceof FHIRIdentifier) { $this->setCTerminalModificationId($data[self::FIELD_C_TERMINAL_MODIFICATION_ID]); - } elseif ($ext && is_scalar($data[self::FIELD_C_TERMINAL_MODIFICATION_ID])) { - $this->setCTerminalModificationId(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_C_TERMINAL_MODIFICATION_ID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_C_TERMINAL_MODIFICATION_ID])) { + $this->setCTerminalModificationId(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_C_TERMINAL_MODIFICATION_ID]] + $ext)); + } else if (is_array($data[self::FIELD_C_TERMINAL_MODIFICATION_ID])) { + $this->setCTerminalModificationId(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_C_TERMINAL_MODIFICATION_ID]))); + } } else { $this->setCTerminalModificationId(new FHIRIdentifier($data[self::FIELD_C_TERMINAL_MODIFICATION_ID])); } @@ -261,8 +268,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_LENGTH] instanceof FHIRInteger) { $this->setLength($data[self::FIELD_LENGTH]); - } elseif ($ext && is_scalar($data[self::FIELD_LENGTH])) { - $this->setLength(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_LENGTH]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_LENGTH])) { + $this->setLength(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_LENGTH]] + $ext)); + } else if (is_array($data[self::FIELD_LENGTH])) { + $this->setLength(new FHIRInteger(array_merge($ext, $data[self::FIELD_LENGTH]))); + } } else { $this->setLength(new FHIRInteger($data[self::FIELD_LENGTH])); } @@ -273,8 +284,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_N_TERMINAL_MODIFICATION] instanceof FHIRString) { $this->setNTerminalModification($data[self::FIELD_N_TERMINAL_MODIFICATION]); - } elseif ($ext && is_scalar($data[self::FIELD_N_TERMINAL_MODIFICATION])) { - $this->setNTerminalModification(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_N_TERMINAL_MODIFICATION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_N_TERMINAL_MODIFICATION])) { + $this->setNTerminalModification(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_N_TERMINAL_MODIFICATION]] + $ext)); + } else if (is_array($data[self::FIELD_N_TERMINAL_MODIFICATION])) { + $this->setNTerminalModification(new FHIRString(array_merge($ext, $data[self::FIELD_N_TERMINAL_MODIFICATION]))); + } } else { $this->setNTerminalModification(new FHIRString($data[self::FIELD_N_TERMINAL_MODIFICATION])); } @@ -285,8 +300,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_N_TERMINAL_MODIFICATION_ID] instanceof FHIRIdentifier) { $this->setNTerminalModificationId($data[self::FIELD_N_TERMINAL_MODIFICATION_ID]); - } elseif ($ext && is_scalar($data[self::FIELD_N_TERMINAL_MODIFICATION_ID])) { - $this->setNTerminalModificationId(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_N_TERMINAL_MODIFICATION_ID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_N_TERMINAL_MODIFICATION_ID])) { + $this->setNTerminalModificationId(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_N_TERMINAL_MODIFICATION_ID]] + $ext)); + } else if (is_array($data[self::FIELD_N_TERMINAL_MODIFICATION_ID])) { + $this->setNTerminalModificationId(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_N_TERMINAL_MODIFICATION_ID]))); + } } else { $this->setNTerminalModificationId(new FHIRIdentifier($data[self::FIELD_N_TERMINAL_MODIFICATION_ID])); } @@ -297,8 +316,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SEQUENCE] instanceof FHIRString) { $this->setSequence($data[self::FIELD_SEQUENCE]); - } elseif ($ext && is_scalar($data[self::FIELD_SEQUENCE])) { - $this->setSequence(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SEQUENCE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SEQUENCE])) { + $this->setSequence(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SEQUENCE]] + $ext)); + } else if (is_array($data[self::FIELD_SEQUENCE])) { + $this->setSequence(new FHIRString(array_merge($ext, $data[self::FIELD_SEQUENCE]))); + } } else { $this->setSequence(new FHIRString($data[self::FIELD_SEQUENCE])); } @@ -316,8 +339,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SUBUNIT] instanceof FHIRInteger) { $this->setSubunit($data[self::FIELD_SUBUNIT]); - } elseif ($ext && is_scalar($data[self::FIELD_SUBUNIT])) { - $this->setSubunit(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_SUBUNIT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SUBUNIT])) { + $this->setSubunit(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_SUBUNIT]] + $ext)); + } else if (is_array($data[self::FIELD_SUBUNIT])) { + $this->setSubunit(new FHIRInteger(array_merge($ext, $data[self::FIELD_SUBUNIT]))); + } } else { $this->setSubunit(new FHIRInteger($data[self::FIELD_SUBUNIT])); } @@ -785,7 +812,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getCTerminalModification())) { $v->xmlSerialize($sxe->addChild(self::FIELD_C_TERMINAL_MODIFICATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getCTerminalModificationId())) { $v->xmlSerialize($sxe->addChild(self::FIELD_C_TERMINAL_MODIFICATION_ID, null, $v->_getFHIRXMLNamespace())); } @@ -795,14 +821,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getNTerminalModification())) { $v->xmlSerialize($sxe->addChild(self::FIELD_N_TERMINAL_MODIFICATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getNTerminalModificationId())) { $v->xmlSerialize($sxe->addChild(self::FIELD_N_TERMINAL_MODIFICATION_ID, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getSequence())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SEQUENCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSequenceAttachment())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SEQUENCE_ATTACHMENT, null, $v->_getFHIRXMLNamespace())); } @@ -819,33 +843,84 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getCTerminalModification())) { - $a[self::FIELD_C_TERMINAL_MODIFICATION] = $v->getValue(); - $a[self::FIELD_C_TERMINAL_MODIFICATION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_C_TERMINAL_MODIFICATION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_C_TERMINAL_MODIFICATION_EXT] = $enc; + } + } else { + $a[self::FIELD_C_TERMINAL_MODIFICATION] = $v; + } } if (null !== ($v = $this->getCTerminalModificationId())) { - $a[self::FIELD_C_TERMINAL_MODIFICATION_ID] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_C_TERMINAL_MODIFICATION_ID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_C_TERMINAL_MODIFICATION_ID_EXT] = $enc; + } + } else { + $a[self::FIELD_C_TERMINAL_MODIFICATION_ID] = $v; + } } if (null !== ($v = $this->getLength())) { - $a[self::FIELD_LENGTH] = $v->getValue(); - $a[self::FIELD_LENGTH_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_LENGTH] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_LENGTH_EXT] = $enc; + } + } else { + $a[self::FIELD_LENGTH] = $v; + } } if (null !== ($v = $this->getNTerminalModification())) { - $a[self::FIELD_N_TERMINAL_MODIFICATION] = $v->getValue(); - $a[self::FIELD_N_TERMINAL_MODIFICATION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_N_TERMINAL_MODIFICATION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_N_TERMINAL_MODIFICATION_EXT] = $enc; + } + } else { + $a[self::FIELD_N_TERMINAL_MODIFICATION] = $v; + } } if (null !== ($v = $this->getNTerminalModificationId())) { - $a[self::FIELD_N_TERMINAL_MODIFICATION_ID] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_N_TERMINAL_MODIFICATION_ID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_N_TERMINAL_MODIFICATION_ID_EXT] = $enc; + } + } else { + $a[self::FIELD_N_TERMINAL_MODIFICATION_ID] = $v; + } } if (null !== ($v = $this->getSequence())) { - $a[self::FIELD_SEQUENCE] = $v->getValue(); - $a[self::FIELD_SEQUENCE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SEQUENCE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SEQUENCE_EXT] = $enc; + } + } else { + $a[self::FIELD_SEQUENCE] = $v; + } } if (null !== ($v = $this->getSequenceAttachment())) { $a[self::FIELD_SEQUENCE_ATTACHMENT] = $v; } if (null !== ($v = $this->getSubunit())) { - $a[self::FIELD_SUBUNIT] = $v->getValue(); - $a[self::FIELD_SUBUNIT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SUBUNIT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SUBUNIT_EXT] = $enc; + } + } else { + $a[self::FIELD_SUBUNIT] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSubstanceReferenceInformation/FHIRSubstanceReferenceInformationClassification.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSubstanceReferenceInformation/FHIRSubstanceReferenceInformationClassification.php index 6022ddb6f5..bd264762ce 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSubstanceReferenceInformation/FHIRSubstanceReferenceInformationClassification.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSubstanceReferenceInformation/FHIRSubstanceReferenceInformationClassification.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRSubstanceReferenceInformationClassification extends FHIRBackboneElemen { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SUBSTANCE_REFERENCE_INFORMATION_DOT_CLASSIFICATION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CLASSIFICATION = 'classification'; const FIELD_DOMAIN = 'domain'; const FIELD_SOURCE = 'source'; @@ -134,6 +130,9 @@ class FHIRSubstanceReferenceInformationClassification extends FHIRBackboneElemen */ protected $subtype = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSubstanceReferenceInformationClassification Constructor * @param null|array $data @@ -167,6 +166,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SOURCE])) { if (is_array($data[self::FIELD_SOURCE])) { foreach($data[self::FIELD_SOURCE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addSource($v); } else { @@ -182,6 +184,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SUBTYPE])) { if (is_array($data[self::FIELD_SUBTYPE])) { foreach($data[self::FIELD_SUBTYPE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addSubtype($v); } else { @@ -490,15 +495,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getClassification())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CLASSIFICATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDomain())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DOMAIN, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getSource())) { foreach($vs as $v) { if (null === $v) { @@ -516,6 +518,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_SUBTYPE, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSubstanceReferenceInformation/FHIRSubstanceReferenceInformationGene.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSubstanceReferenceInformation/FHIRSubstanceReferenceInformationGene.php index 70b1634230..f28a4e1bc0 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSubstanceReferenceInformation/FHIRSubstanceReferenceInformationGene.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSubstanceReferenceInformation/FHIRSubstanceReferenceInformationGene.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRSubstanceReferenceInformationGene extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SUBSTANCE_REFERENCE_INFORMATION_DOT_GENE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_GENE = 'gene'; const FIELD_GENE_SEQUENCE_ORIGIN = 'geneSequenceOrigin'; const FIELD_SOURCE = 'source'; @@ -121,6 +117,9 @@ class FHIRSubstanceReferenceInformationGene extends FHIRBackboneElement */ protected $source = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSubstanceReferenceInformationGene Constructor * @param null|array $data @@ -154,6 +153,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SOURCE])) { if (is_array($data[self::FIELD_SOURCE])) { foreach($data[self::FIELD_SOURCE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addSource($v); } else { @@ -398,15 +400,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getGene())) { $v->xmlSerialize($sxe->addChild(self::FIELD_GENE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getGeneSequenceOrigin())) { $v->xmlSerialize($sxe->addChild(self::FIELD_GENE_SEQUENCE_ORIGIN, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getSource())) { foreach($vs as $v) { if (null === $v) { @@ -415,6 +414,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_SOURCE, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSubstanceReferenceInformation/FHIRSubstanceReferenceInformationGeneElement.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSubstanceReferenceInformation/FHIRSubstanceReferenceInformationGeneElement.php index 7393190c37..e4ee8ed34a 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSubstanceReferenceInformation/FHIRSubstanceReferenceInformationGeneElement.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSubstanceReferenceInformation/FHIRSubstanceReferenceInformationGeneElement.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRSubstanceReferenceInformationGeneElement extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SUBSTANCE_REFERENCE_INFORMATION_DOT_GENE_ELEMENT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ELEMENT = 'element'; const FIELD_ELEMENT_EXT = '_element'; const FIELD_SOURCE = 'source'; @@ -123,6 +119,9 @@ class FHIRSubstanceReferenceInformationGeneElement extends FHIRBackboneElement */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSubstanceReferenceInformationGeneElement Constructor * @param null|array $data @@ -145,8 +144,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ELEMENT] instanceof FHIRIdentifier) { $this->setElement($data[self::FIELD_ELEMENT]); - } elseif ($ext && is_scalar($data[self::FIELD_ELEMENT])) { - $this->setElement(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_ELEMENT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ELEMENT])) { + $this->setElement(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_ELEMENT]] + $ext)); + } else if (is_array($data[self::FIELD_ELEMENT])) { + $this->setElement(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_ELEMENT]))); + } } else { $this->setElement(new FHIRIdentifier($data[self::FIELD_ELEMENT])); } @@ -154,6 +157,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SOURCE])) { if (is_array($data[self::FIELD_SOURCE])) { foreach($data[self::FIELD_SOURCE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addSource($v); } else { @@ -405,11 +411,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getElement())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ELEMENT, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getSource())) { foreach($vs as $v) { if (null === $v) { @@ -432,7 +436,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getElement())) { - $a[self::FIELD_ELEMENT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ELEMENT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ELEMENT_EXT] = $enc; + } + } else { + $a[self::FIELD_ELEMENT] = $v; + } } if ([] !== ($vs = $this->getSource())) { $a[self::FIELD_SOURCE] = $vs; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSubstanceReferenceInformation/FHIRSubstanceReferenceInformationTarget.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSubstanceReferenceInformation/FHIRSubstanceReferenceInformationTarget.php index ad5e0ca166..7a2e237cd6 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSubstanceReferenceInformation/FHIRSubstanceReferenceInformationTarget.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSubstanceReferenceInformation/FHIRSubstanceReferenceInformationTarget.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -82,10 +82,6 @@ class FHIRSubstanceReferenceInformationTarget extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SUBSTANCE_REFERENCE_INFORMATION_DOT_TARGET; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_AMOUNT_QUANTITY = 'amountQuantity'; const FIELD_AMOUNT_QUANTITY_EXT = '_amountQuantity'; const FIELD_AMOUNT_RANGE = 'amountRange'; @@ -218,6 +214,9 @@ class FHIRSubstanceReferenceInformationTarget extends FHIRBackboneElement */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSubstanceReferenceInformationTarget Constructor * @param null|array $data @@ -240,8 +239,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_AMOUNT_QUANTITY] instanceof FHIRQuantity) { $this->setAmountQuantity($data[self::FIELD_AMOUNT_QUANTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_AMOUNT_QUANTITY])) { - $this->setAmountQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_AMOUNT_QUANTITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_AMOUNT_QUANTITY])) { + $this->setAmountQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_AMOUNT_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_AMOUNT_QUANTITY])) { + $this->setAmountQuantity(new FHIRQuantity(array_merge($ext, $data[self::FIELD_AMOUNT_QUANTITY]))); + } } else { $this->setAmountQuantity(new FHIRQuantity($data[self::FIELD_AMOUNT_QUANTITY])); } @@ -259,8 +262,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_AMOUNT_STRING] instanceof FHIRString) { $this->setAmountString($data[self::FIELD_AMOUNT_STRING]); - } elseif ($ext && is_scalar($data[self::FIELD_AMOUNT_STRING])) { - $this->setAmountString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_AMOUNT_STRING]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_AMOUNT_STRING])) { + $this->setAmountString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_AMOUNT_STRING]] + $ext)); + } else if (is_array($data[self::FIELD_AMOUNT_STRING])) { + $this->setAmountString(new FHIRString(array_merge($ext, $data[self::FIELD_AMOUNT_STRING]))); + } } else { $this->setAmountString(new FHIRString($data[self::FIELD_AMOUNT_STRING])); } @@ -296,6 +303,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SOURCE])) { if (is_array($data[self::FIELD_SOURCE])) { foreach($data[self::FIELD_SOURCE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addSource($v); } else { @@ -314,8 +324,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TARGET] instanceof FHIRIdentifier) { $this->setTarget($data[self::FIELD_TARGET]); - } elseif ($ext && is_scalar($data[self::FIELD_TARGET])) { - $this->setTarget(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_TARGET]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TARGET])) { + $this->setTarget(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_TARGET]] + $ext)); + } else if (is_array($data[self::FIELD_TARGET])) { + $this->setTarget(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_TARGET]))); + } } else { $this->setTarget(new FHIRIdentifier($data[self::FIELD_TARGET])); } @@ -813,34 +827,27 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getAmountQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AMOUNT_QUANTITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getAmountRange())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AMOUNT_RANGE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getAmountString())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AMOUNT_STRING, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getAmountType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AMOUNT_TYPE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getInteraction())) { $v->xmlSerialize($sxe->addChild(self::FIELD_INTERACTION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOrganism())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ORGANISM, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOrganismType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ORGANISM_TYPE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getSource())) { foreach($vs as $v) { if (null === $v) { @@ -853,7 +860,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getTarget())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TARGET, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -867,14 +873,29 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getAmountQuantity())) { - $a[self::FIELD_AMOUNT_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_AMOUNT_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_AMOUNT_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_AMOUNT_QUANTITY] = $v; + } } if (null !== ($v = $this->getAmountRange())) { $a[self::FIELD_AMOUNT_RANGE] = $v; } if (null !== ($v = $this->getAmountString())) { - $a[self::FIELD_AMOUNT_STRING] = $v->getValue(); - $a[self::FIELD_AMOUNT_STRING_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_AMOUNT_STRING] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_AMOUNT_STRING_EXT] = $enc; + } + } else { + $a[self::FIELD_AMOUNT_STRING] = $v; + } } if (null !== ($v = $this->getAmountType())) { $a[self::FIELD_AMOUNT_TYPE] = $v; @@ -892,7 +913,15 @@ public function jsonSerialize() $a[self::FIELD_SOURCE] = $vs; } if (null !== ($v = $this->getTarget())) { - $a[self::FIELD_TARGET] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TARGET] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TARGET_EXT] = $enc; + } + } else { + $a[self::FIELD_TARGET] = $v; + } } if (null !== ($v = $this->getType())) { $a[self::FIELD_TYPE] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSubstanceSourceMaterial/FHIRSubstanceSourceMaterialAuthor.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSubstanceSourceMaterial/FHIRSubstanceSourceMaterialAuthor.php index 6c8fe76d43..16fa61a81c 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSubstanceSourceMaterial/FHIRSubstanceSourceMaterialAuthor.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSubstanceSourceMaterial/FHIRSubstanceSourceMaterialAuthor.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -90,10 +90,6 @@ class FHIRSubstanceSourceMaterialAuthor extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SUBSTANCE_SOURCE_MATERIAL_DOT_AUTHOR; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_AUTHOR_DESCRIPTION = 'authorDescription'; const FIELD_AUTHOR_DESCRIPTION_EXT = '_authorDescription'; const FIELD_AUTHOR_TYPE = 'authorType'; @@ -126,6 +122,9 @@ class FHIRSubstanceSourceMaterialAuthor extends FHIRBackboneElement */ protected $authorType = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSubstanceSourceMaterialAuthor Constructor * @param null|array $data @@ -148,8 +147,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_AUTHOR_DESCRIPTION] instanceof FHIRString) { $this->setAuthorDescription($data[self::FIELD_AUTHOR_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_AUTHOR_DESCRIPTION])) { - $this->setAuthorDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_AUTHOR_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_AUTHOR_DESCRIPTION])) { + $this->setAuthorDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_AUTHOR_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_AUTHOR_DESCRIPTION])) { + $this->setAuthorDescription(new FHIRString(array_merge($ext, $data[self::FIELD_AUTHOR_DESCRIPTION]))); + } } else { $this->setAuthorDescription(new FHIRString($data[self::FIELD_AUTHOR_DESCRIPTION])); } @@ -354,7 +357,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getAuthorDescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AUTHOR_DESCRIPTION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getAuthorType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AUTHOR_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -368,8 +370,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getAuthorDescription())) { - $a[self::FIELD_AUTHOR_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_AUTHOR_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_AUTHOR_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_AUTHOR_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_AUTHOR_DESCRIPTION] = $v; + } } if (null !== ($v = $this->getAuthorType())) { $a[self::FIELD_AUTHOR_TYPE] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSubstanceSourceMaterial/FHIRSubstanceSourceMaterialFractionDescription.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSubstanceSourceMaterial/FHIRSubstanceSourceMaterialFractionDescription.php index ba24411b5a..725819c240 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSubstanceSourceMaterial/FHIRSubstanceSourceMaterialFractionDescription.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSubstanceSourceMaterial/FHIRSubstanceSourceMaterialFractionDescription.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -90,10 +90,6 @@ class FHIRSubstanceSourceMaterialFractionDescription extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SUBSTANCE_SOURCE_MATERIAL_DOT_FRACTION_DESCRIPTION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_FRACTION = 'fraction'; const FIELD_FRACTION_EXT = '_fraction'; const FIELD_MATERIAL_TYPE = 'materialType'; @@ -124,6 +120,9 @@ class FHIRSubstanceSourceMaterialFractionDescription extends FHIRBackboneElement */ protected $materialType = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSubstanceSourceMaterialFractionDescription Constructor * @param null|array $data @@ -146,8 +145,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_FRACTION] instanceof FHIRString) { $this->setFraction($data[self::FIELD_FRACTION]); - } elseif ($ext && is_scalar($data[self::FIELD_FRACTION])) { - $this->setFraction(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_FRACTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_FRACTION])) { + $this->setFraction(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_FRACTION]] + $ext)); + } else if (is_array($data[self::FIELD_FRACTION])) { + $this->setFraction(new FHIRString(array_merge($ext, $data[self::FIELD_FRACTION]))); + } } else { $this->setFraction(new FHIRString($data[self::FIELD_FRACTION])); } @@ -348,7 +351,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getFraction())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FRACTION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getMaterialType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MATERIAL_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -362,8 +364,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getFraction())) { - $a[self::FIELD_FRACTION] = $v->getValue(); - $a[self::FIELD_FRACTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FRACTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FRACTION_EXT] = $enc; + } + } else { + $a[self::FIELD_FRACTION] = $v; + } } if (null !== ($v = $this->getMaterialType())) { $a[self::FIELD_MATERIAL_TYPE] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSubstanceSourceMaterial/FHIRSubstanceSourceMaterialHybrid.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSubstanceSourceMaterial/FHIRSubstanceSourceMaterialHybrid.php index 23a1e5d45f..a1120a6c23 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSubstanceSourceMaterial/FHIRSubstanceSourceMaterialHybrid.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSubstanceSourceMaterial/FHIRSubstanceSourceMaterialHybrid.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -90,10 +90,6 @@ class FHIRSubstanceSourceMaterialHybrid extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SUBSTANCE_SOURCE_MATERIAL_DOT_HYBRID; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_HYBRID_TYPE = 'hybridType'; const FIELD_MATERNAL_ORGANISM_ID = 'maternalOrganismId'; const FIELD_MATERNAL_ORGANISM_ID_EXT = '_maternalOrganismId'; @@ -167,6 +163,9 @@ class FHIRSubstanceSourceMaterialHybrid extends FHIRBackboneElement */ protected $paternalOrganismName = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSubstanceSourceMaterialHybrid Constructor * @param null|array $data @@ -196,8 +195,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MATERNAL_ORGANISM_ID] instanceof FHIRString) { $this->setMaternalOrganismId($data[self::FIELD_MATERNAL_ORGANISM_ID]); - } elseif ($ext && is_scalar($data[self::FIELD_MATERNAL_ORGANISM_ID])) { - $this->setMaternalOrganismId(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_MATERNAL_ORGANISM_ID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MATERNAL_ORGANISM_ID])) { + $this->setMaternalOrganismId(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_MATERNAL_ORGANISM_ID]] + $ext)); + } else if (is_array($data[self::FIELD_MATERNAL_ORGANISM_ID])) { + $this->setMaternalOrganismId(new FHIRString(array_merge($ext, $data[self::FIELD_MATERNAL_ORGANISM_ID]))); + } } else { $this->setMaternalOrganismId(new FHIRString($data[self::FIELD_MATERNAL_ORGANISM_ID])); } @@ -208,8 +211,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MATERNAL_ORGANISM_NAME] instanceof FHIRString) { $this->setMaternalOrganismName($data[self::FIELD_MATERNAL_ORGANISM_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_MATERNAL_ORGANISM_NAME])) { - $this->setMaternalOrganismName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_MATERNAL_ORGANISM_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MATERNAL_ORGANISM_NAME])) { + $this->setMaternalOrganismName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_MATERNAL_ORGANISM_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_MATERNAL_ORGANISM_NAME])) { + $this->setMaternalOrganismName(new FHIRString(array_merge($ext, $data[self::FIELD_MATERNAL_ORGANISM_NAME]))); + } } else { $this->setMaternalOrganismName(new FHIRString($data[self::FIELD_MATERNAL_ORGANISM_NAME])); } @@ -220,8 +227,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PATERNAL_ORGANISM_ID] instanceof FHIRString) { $this->setPaternalOrganismId($data[self::FIELD_PATERNAL_ORGANISM_ID]); - } elseif ($ext && is_scalar($data[self::FIELD_PATERNAL_ORGANISM_ID])) { - $this->setPaternalOrganismId(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PATERNAL_ORGANISM_ID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PATERNAL_ORGANISM_ID])) { + $this->setPaternalOrganismId(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PATERNAL_ORGANISM_ID]] + $ext)); + } else if (is_array($data[self::FIELD_PATERNAL_ORGANISM_ID])) { + $this->setPaternalOrganismId(new FHIRString(array_merge($ext, $data[self::FIELD_PATERNAL_ORGANISM_ID]))); + } } else { $this->setPaternalOrganismId(new FHIRString($data[self::FIELD_PATERNAL_ORGANISM_ID])); } @@ -232,8 +243,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PATERNAL_ORGANISM_NAME] instanceof FHIRString) { $this->setPaternalOrganismName($data[self::FIELD_PATERNAL_ORGANISM_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_PATERNAL_ORGANISM_NAME])) { - $this->setPaternalOrganismName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PATERNAL_ORGANISM_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PATERNAL_ORGANISM_NAME])) { + $this->setPaternalOrganismName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PATERNAL_ORGANISM_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_PATERNAL_ORGANISM_NAME])) { + $this->setPaternalOrganismName(new FHIRString(array_merge($ext, $data[self::FIELD_PATERNAL_ORGANISM_NAME]))); + } } else { $this->setPaternalOrganismName(new FHIRString($data[self::FIELD_PATERNAL_ORGANISM_NAME])); } @@ -564,7 +579,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getHybridType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_HYBRID_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -593,20 +607,48 @@ public function jsonSerialize() $a[self::FIELD_HYBRID_TYPE] = $v; } if (null !== ($v = $this->getMaternalOrganismId())) { - $a[self::FIELD_MATERNAL_ORGANISM_ID] = $v->getValue(); - $a[self::FIELD_MATERNAL_ORGANISM_ID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MATERNAL_ORGANISM_ID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MATERNAL_ORGANISM_ID_EXT] = $enc; + } + } else { + $a[self::FIELD_MATERNAL_ORGANISM_ID] = $v; + } } if (null !== ($v = $this->getMaternalOrganismName())) { - $a[self::FIELD_MATERNAL_ORGANISM_NAME] = $v->getValue(); - $a[self::FIELD_MATERNAL_ORGANISM_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MATERNAL_ORGANISM_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MATERNAL_ORGANISM_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_MATERNAL_ORGANISM_NAME] = $v; + } } if (null !== ($v = $this->getPaternalOrganismId())) { - $a[self::FIELD_PATERNAL_ORGANISM_ID] = $v->getValue(); - $a[self::FIELD_PATERNAL_ORGANISM_ID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PATERNAL_ORGANISM_ID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PATERNAL_ORGANISM_ID_EXT] = $enc; + } + } else { + $a[self::FIELD_PATERNAL_ORGANISM_ID] = $v; + } } if (null !== ($v = $this->getPaternalOrganismName())) { - $a[self::FIELD_PATERNAL_ORGANISM_NAME] = $v->getValue(); - $a[self::FIELD_PATERNAL_ORGANISM_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PATERNAL_ORGANISM_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PATERNAL_ORGANISM_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_PATERNAL_ORGANISM_NAME] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSubstanceSourceMaterial/FHIRSubstanceSourceMaterialOrganism.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSubstanceSourceMaterial/FHIRSubstanceSourceMaterialOrganism.php index c9512308b9..7e29e36e3c 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSubstanceSourceMaterial/FHIRSubstanceSourceMaterialOrganism.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSubstanceSourceMaterial/FHIRSubstanceSourceMaterialOrganism.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -90,10 +90,6 @@ class FHIRSubstanceSourceMaterialOrganism extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SUBSTANCE_SOURCE_MATERIAL_DOT_ORGANISM; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_AUTHOR = 'author'; const FIELD_FAMILY = 'family'; const FIELD_GENUS = 'genus'; @@ -232,6 +228,9 @@ class FHIRSubstanceSourceMaterialOrganism extends FHIRBackboneElement */ protected $species = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSubstanceSourceMaterialOrganism Constructor * @param null|array $data @@ -251,6 +250,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_AUTHOR])) { if (is_array($data[self::FIELD_AUTHOR])) { foreach($data[self::FIELD_AUTHOR] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRSubstanceSourceMaterialAuthor) { $this->addAuthor($v); } else { @@ -290,8 +292,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_INTRASPECIFIC_DESCRIPTION] instanceof FHIRString) { $this->setIntraspecificDescription($data[self::FIELD_INTRASPECIFIC_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_INTRASPECIFIC_DESCRIPTION])) { - $this->setIntraspecificDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_INTRASPECIFIC_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_INTRASPECIFIC_DESCRIPTION])) { + $this->setIntraspecificDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_INTRASPECIFIC_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_INTRASPECIFIC_DESCRIPTION])) { + $this->setIntraspecificDescription(new FHIRString(array_merge($ext, $data[self::FIELD_INTRASPECIFIC_DESCRIPTION]))); + } } else { $this->setIntraspecificDescription(new FHIRString($data[self::FIELD_INTRASPECIFIC_DESCRIPTION])); } @@ -811,7 +817,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getAuthor())) { foreach($vs as $v) { if (null === $v) { @@ -824,26 +829,21 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getFamily())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FAMILY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getGenus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_GENUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getHybrid())) { $v->xmlSerialize($sxe->addChild(self::FIELD_HYBRID, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getIntraspecificDescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_INTRASPECIFIC_DESCRIPTION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getIntraspecificType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_INTRASPECIFIC_TYPE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOrganismGeneral())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ORGANISM_GENERAL, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSpecies())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SPECIES, null, $v->_getFHIRXMLNamespace())); } @@ -869,8 +869,15 @@ public function jsonSerialize() $a[self::FIELD_HYBRID] = $v; } if (null !== ($v = $this->getIntraspecificDescription())) { - $a[self::FIELD_INTRASPECIFIC_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_INTRASPECIFIC_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_INTRASPECIFIC_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_INTRASPECIFIC_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_INTRASPECIFIC_DESCRIPTION] = $v; + } } if (null !== ($v = $this->getIntraspecificType())) { $a[self::FIELD_INTRASPECIFIC_TYPE] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSubstanceSourceMaterial/FHIRSubstanceSourceMaterialOrganismGeneral.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSubstanceSourceMaterial/FHIRSubstanceSourceMaterialOrganismGeneral.php index 8a6f6d1cbc..22d87069d1 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSubstanceSourceMaterial/FHIRSubstanceSourceMaterialOrganismGeneral.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSubstanceSourceMaterial/FHIRSubstanceSourceMaterialOrganismGeneral.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -89,10 +89,6 @@ class FHIRSubstanceSourceMaterialOrganismGeneral extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SUBSTANCE_SOURCE_MATERIAL_DOT_ORGANISM_GENERAL; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CLASS = 'class'; const FIELD_KINGDOM = 'kingdom'; const FIELD_ORDER = 'order'; @@ -146,6 +142,9 @@ class FHIRSubstanceSourceMaterialOrganismGeneral extends FHIRBackboneElement */ protected $phylum = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSubstanceSourceMaterialOrganismGeneral Constructor * @param null|array $data @@ -431,19 +430,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getClass())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CLASS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getKingdom())) { $v->xmlSerialize($sxe->addChild(self::FIELD_KINGDOM, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOrder())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ORDER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPhylum())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PHYLUM, null, $v->_getFHIRXMLNamespace())); } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSubstanceSourceMaterial/FHIRSubstanceSourceMaterialPartDescription.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSubstanceSourceMaterial/FHIRSubstanceSourceMaterialPartDescription.php index 087ccbffee..ef0276f900 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSubstanceSourceMaterial/FHIRSubstanceSourceMaterialPartDescription.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSubstanceSourceMaterial/FHIRSubstanceSourceMaterialPartDescription.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -89,10 +89,6 @@ class FHIRSubstanceSourceMaterialPartDescription extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SUBSTANCE_SOURCE_MATERIAL_DOT_PART_DESCRIPTION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_PART = 'part'; const FIELD_PART_LOCATION = 'partLocation'; @@ -121,6 +117,9 @@ class FHIRSubstanceSourceMaterialPartDescription extends FHIRBackboneElement */ protected $partLocation = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSubstanceSourceMaterialPartDescription Constructor * @param null|array $data @@ -324,11 +323,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getPart())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PART, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPartLocation())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PART_LOCATION, null, $v->_getFHIRXMLNamespace())); } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSubstanceSpecification/FHIRSubstanceSpecificationCode.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSubstanceSpecification/FHIRSubstanceSpecificationCode.php index 4182f6ccf4..844180ab67 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSubstanceSpecification/FHIRSubstanceSpecificationCode.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSubstanceSpecification/FHIRSubstanceSpecificationCode.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -81,10 +81,6 @@ class FHIRSubstanceSpecificationCode extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SUBSTANCE_SPECIFICATION_DOT_CODE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CODE = 'code'; const FIELD_COMMENT = 'comment'; const FIELD_COMMENT_EXT = '_comment'; @@ -154,6 +150,9 @@ class FHIRSubstanceSpecificationCode extends FHIRBackboneElement */ protected $statusDate = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSubstanceSpecificationCode Constructor * @param null|array $data @@ -183,8 +182,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_COMMENT] instanceof FHIRString) { $this->setComment($data[self::FIELD_COMMENT]); - } elseif ($ext && is_scalar($data[self::FIELD_COMMENT])) { - $this->setComment(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_COMMENT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_COMMENT])) { + $this->setComment(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_COMMENT]] + $ext)); + } else if (is_array($data[self::FIELD_COMMENT])) { + $this->setComment(new FHIRString(array_merge($ext, $data[self::FIELD_COMMENT]))); + } } else { $this->setComment(new FHIRString($data[self::FIELD_COMMENT])); } @@ -192,6 +195,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SOURCE])) { if (is_array($data[self::FIELD_SOURCE])) { foreach($data[self::FIELD_SOURCE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addSource($v); } else { @@ -217,8 +223,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS_DATE] instanceof FHIRDateTime) { $this->setStatusDate($data[self::FIELD_STATUS_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS_DATE])) { - $this->setStatusDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_STATUS_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS_DATE])) { + $this->setStatusDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_STATUS_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS_DATE])) { + $this->setStatusDate(new FHIRDateTime(array_merge($ext, $data[self::FIELD_STATUS_DATE]))); + } } else { $this->setStatusDate(new FHIRDateTime($data[self::FIELD_STATUS_DATE])); } @@ -551,14 +561,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getComment())) { $v->xmlSerialize($sxe->addChild(self::FIELD_COMMENT, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getSource())) { foreach($vs as $v) { if (null === $v) { @@ -587,8 +595,15 @@ public function jsonSerialize() $a[self::FIELD_CODE] = $v; } if (null !== ($v = $this->getComment())) { - $a[self::FIELD_COMMENT] = $v->getValue(); - $a[self::FIELD_COMMENT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_COMMENT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_COMMENT_EXT] = $enc; + } + } else { + $a[self::FIELD_COMMENT] = $v; + } } if ([] !== ($vs = $this->getSource())) { $a[self::FIELD_SOURCE] = $vs; @@ -597,8 +612,15 @@ public function jsonSerialize() $a[self::FIELD_STATUS] = $v; } if (null !== ($v = $this->getStatusDate())) { - $a[self::FIELD_STATUS_DATE] = $v->getValue(); - $a[self::FIELD_STATUS_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS_DATE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSubstanceSpecification/FHIRSubstanceSpecificationIsotope.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSubstanceSpecification/FHIRSubstanceSpecificationIsotope.php index 552c8ba613..d4b660562d 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSubstanceSpecification/FHIRSubstanceSpecificationIsotope.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSubstanceSpecification/FHIRSubstanceSpecificationIsotope.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRSubstanceSpecificationIsotope extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SUBSTANCE_SPECIFICATION_DOT_ISOTOPE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_HALF_LIFE = 'halfLife'; const FIELD_HALF_LIFE_EXT = '_halfLife'; const FIELD_IDENTIFIER = 'identifier'; @@ -151,6 +147,9 @@ class FHIRSubstanceSpecificationIsotope extends FHIRBackboneElement */ protected $substitution = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSubstanceSpecificationIsotope Constructor * @param null|array $data @@ -173,8 +172,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_HALF_LIFE] instanceof FHIRQuantity) { $this->setHalfLife($data[self::FIELD_HALF_LIFE]); - } elseif ($ext && is_scalar($data[self::FIELD_HALF_LIFE])) { - $this->setHalfLife(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_HALF_LIFE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_HALF_LIFE])) { + $this->setHalfLife(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_HALF_LIFE]] + $ext)); + } else if (is_array($data[self::FIELD_HALF_LIFE])) { + $this->setHalfLife(new FHIRQuantity(array_merge($ext, $data[self::FIELD_HALF_LIFE]))); + } } else { $this->setHalfLife(new FHIRQuantity($data[self::FIELD_HALF_LIFE])); } @@ -185,8 +188,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->setIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { - $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_IDENTIFIER]))); + } } else { $this->setIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); } @@ -486,23 +493,18 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getHalfLife())) { $v->xmlSerialize($sxe->addChild(self::FIELD_HALF_LIFE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getMolecularWeight())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MOLECULAR_WEIGHT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NAME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSubstitution())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBSTITUTION, null, $v->_getFHIRXMLNamespace())); } @@ -516,10 +518,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getHalfLife())) { - $a[self::FIELD_HALF_LIFE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_HALF_LIFE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_HALF_LIFE_EXT] = $enc; + } + } else { + $a[self::FIELD_HALF_LIFE] = $v; + } } if (null !== ($v = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_IDENTIFIER] = $v; + } } if (null !== ($v = $this->getMolecularWeight())) { $a[self::FIELD_MOLECULAR_WEIGHT] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSubstanceSpecification/FHIRSubstanceSpecificationMoiety.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSubstanceSpecification/FHIRSubstanceSpecificationMoiety.php index 80765da162..1e0191de52 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSubstanceSpecification/FHIRSubstanceSpecificationMoiety.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSubstanceSpecification/FHIRSubstanceSpecificationMoiety.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -81,10 +81,6 @@ class FHIRSubstanceSpecificationMoiety extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SUBSTANCE_SPECIFICATION_DOT_MOIETY; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_AMOUNT_QUANTITY = 'amountQuantity'; const FIELD_AMOUNT_QUANTITY_EXT = '_amountQuantity'; const FIELD_AMOUNT_STRING = 'amountString'; @@ -193,6 +189,9 @@ class FHIRSubstanceSpecificationMoiety extends FHIRBackboneElement */ protected $stereochemistry = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSubstanceSpecificationMoiety Constructor * @param null|array $data @@ -215,8 +214,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_AMOUNT_QUANTITY] instanceof FHIRQuantity) { $this->setAmountQuantity($data[self::FIELD_AMOUNT_QUANTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_AMOUNT_QUANTITY])) { - $this->setAmountQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_AMOUNT_QUANTITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_AMOUNT_QUANTITY])) { + $this->setAmountQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_AMOUNT_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_AMOUNT_QUANTITY])) { + $this->setAmountQuantity(new FHIRQuantity(array_merge($ext, $data[self::FIELD_AMOUNT_QUANTITY]))); + } } else { $this->setAmountQuantity(new FHIRQuantity($data[self::FIELD_AMOUNT_QUANTITY])); } @@ -227,8 +230,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_AMOUNT_STRING] instanceof FHIRString) { $this->setAmountString($data[self::FIELD_AMOUNT_STRING]); - } elseif ($ext && is_scalar($data[self::FIELD_AMOUNT_STRING])) { - $this->setAmountString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_AMOUNT_STRING]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_AMOUNT_STRING])) { + $this->setAmountString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_AMOUNT_STRING]] + $ext)); + } else if (is_array($data[self::FIELD_AMOUNT_STRING])) { + $this->setAmountString(new FHIRString(array_merge($ext, $data[self::FIELD_AMOUNT_STRING]))); + } } else { $this->setAmountString(new FHIRString($data[self::FIELD_AMOUNT_STRING])); } @@ -239,8 +246,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->setIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { - $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_IDENTIFIER]))); + } } else { $this->setIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); } @@ -251,8 +262,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MOLECULAR_FORMULA] instanceof FHIRString) { $this->setMolecularFormula($data[self::FIELD_MOLECULAR_FORMULA]); - } elseif ($ext && is_scalar($data[self::FIELD_MOLECULAR_FORMULA])) { - $this->setMolecularFormula(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_MOLECULAR_FORMULA]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MOLECULAR_FORMULA])) { + $this->setMolecularFormula(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_MOLECULAR_FORMULA]] + $ext)); + } else if (is_array($data[self::FIELD_MOLECULAR_FORMULA])) { + $this->setMolecularFormula(new FHIRString(array_merge($ext, $data[self::FIELD_MOLECULAR_FORMULA]))); + } } else { $this->setMolecularFormula(new FHIRString($data[self::FIELD_MOLECULAR_FORMULA])); } @@ -263,8 +278,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -700,14 +719,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getAmountQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AMOUNT_QUANTITY, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getAmountString())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AMOUNT_STRING, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } @@ -717,15 +734,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NAME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOpticalActivity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OPTICAL_ACTIVITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRole())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ROLE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStereochemistry())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STEREOCHEMISTRY, null, $v->_getFHIRXMLNamespace())); } @@ -739,22 +753,59 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getAmountQuantity())) { - $a[self::FIELD_AMOUNT_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_AMOUNT_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_AMOUNT_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_AMOUNT_QUANTITY] = $v; + } } if (null !== ($v = $this->getAmountString())) { - $a[self::FIELD_AMOUNT_STRING] = $v->getValue(); - $a[self::FIELD_AMOUNT_STRING_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_AMOUNT_STRING] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_AMOUNT_STRING_EXT] = $enc; + } + } else { + $a[self::FIELD_AMOUNT_STRING] = $v; + } } if (null !== ($v = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_IDENTIFIER] = $v; + } } if (null !== ($v = $this->getMolecularFormula())) { - $a[self::FIELD_MOLECULAR_FORMULA] = $v->getValue(); - $a[self::FIELD_MOLECULAR_FORMULA_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MOLECULAR_FORMULA] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MOLECULAR_FORMULA_EXT] = $enc; + } + } else { + $a[self::FIELD_MOLECULAR_FORMULA] = $v; + } } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if (null !== ($v = $this->getOpticalActivity())) { $a[self::FIELD_OPTICAL_ACTIVITY] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSubstanceSpecification/FHIRSubstanceSpecificationMolecularWeight.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSubstanceSpecification/FHIRSubstanceSpecificationMolecularWeight.php index cf5a99cddb..0115820310 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSubstanceSpecification/FHIRSubstanceSpecificationMolecularWeight.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSubstanceSpecification/FHIRSubstanceSpecificationMolecularWeight.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRSubstanceSpecificationMolecularWeight extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SUBSTANCE_SPECIFICATION_DOT_MOLECULAR_WEIGHT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_AMOUNT = 'amount'; const FIELD_AMOUNT_EXT = '_amount'; const FIELD_METHOD = 'method'; @@ -128,6 +124,9 @@ class FHIRSubstanceSpecificationMolecularWeight extends FHIRBackboneElement */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSubstanceSpecificationMolecularWeight Constructor * @param null|array $data @@ -150,8 +149,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_AMOUNT] instanceof FHIRQuantity) { $this->setAmount($data[self::FIELD_AMOUNT]); - } elseif ($ext && is_scalar($data[self::FIELD_AMOUNT])) { - $this->setAmount(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_AMOUNT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_AMOUNT])) { + $this->setAmount(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_AMOUNT]] + $ext)); + } else if (is_array($data[self::FIELD_AMOUNT])) { + $this->setAmount(new FHIRQuantity(array_merge($ext, $data[self::FIELD_AMOUNT]))); + } } else { $this->setAmount(new FHIRQuantity($data[self::FIELD_AMOUNT])); } @@ -384,15 +387,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getAmount())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AMOUNT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getMethod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_METHOD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -406,7 +406,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getAmount())) { - $a[self::FIELD_AMOUNT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_AMOUNT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_AMOUNT_EXT] = $enc; + } + } else { + $a[self::FIELD_AMOUNT] = $v; + } } if (null !== ($v = $this->getMethod())) { $a[self::FIELD_METHOD] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSubstanceSpecification/FHIRSubstanceSpecificationName.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSubstanceSpecification/FHIRSubstanceSpecificationName.php index c9ac51ed9f..335a7fa166 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSubstanceSpecification/FHIRSubstanceSpecificationName.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSubstanceSpecification/FHIRSubstanceSpecificationName.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -81,10 +81,6 @@ class FHIRSubstanceSpecificationName extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SUBSTANCE_SPECIFICATION_DOT_NAME; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DOMAIN = 'domain'; const FIELD_JURISDICTION = 'jurisdiction'; const FIELD_LANGUAGE = 'language'; @@ -222,6 +218,9 @@ class FHIRSubstanceSpecificationName extends FHIRBackboneElement */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSubstanceSpecificationName Constructor * @param null|array $data @@ -241,6 +240,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_DOMAIN])) { if (is_array($data[self::FIELD_DOMAIN])) { foreach($data[self::FIELD_DOMAIN] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addDomain($v); } else { @@ -256,6 +258,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_JURISDICTION])) { if (is_array($data[self::FIELD_JURISDICTION])) { foreach($data[self::FIELD_JURISDICTION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addJurisdiction($v); } else { @@ -271,6 +276,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_LANGUAGE])) { if (is_array($data[self::FIELD_LANGUAGE])) { foreach($data[self::FIELD_LANGUAGE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addLanguage($v); } else { @@ -289,8 +297,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -298,6 +310,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_OFFICIAL])) { if (is_array($data[self::FIELD_OFFICIAL])) { foreach($data[self::FIELD_OFFICIAL] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRSubstanceSpecificationOfficial) { $this->addOfficial($v); } else { @@ -316,8 +331,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PREFERRED] instanceof FHIRBoolean) { $this->setPreferred($data[self::FIELD_PREFERRED]); - } elseif ($ext && is_scalar($data[self::FIELD_PREFERRED])) { - $this->setPreferred(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_PREFERRED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PREFERRED])) { + $this->setPreferred(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_PREFERRED]] + $ext)); + } else if (is_array($data[self::FIELD_PREFERRED])) { + $this->setPreferred(new FHIRBoolean(array_merge($ext, $data[self::FIELD_PREFERRED]))); + } } else { $this->setPreferred(new FHIRBoolean($data[self::FIELD_PREFERRED])); } @@ -325,6 +344,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SOURCE])) { if (is_array($data[self::FIELD_SOURCE])) { foreach($data[self::FIELD_SOURCE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addSource($v); } else { @@ -347,6 +369,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SYNONYM])) { if (is_array($data[self::FIELD_SYNONYM])) { foreach($data[self::FIELD_SYNONYM] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRSubstanceSpecificationName) { $this->addSynonym($v); } else { @@ -362,6 +387,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_TRANSLATION])) { if (is_array($data[self::FIELD_TRANSLATION])) { foreach($data[self::FIELD_TRANSLATION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRSubstanceSpecificationName) { $this->addTranslation($v); } else { @@ -1068,7 +1096,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getDomain())) { foreach($vs as $v) { if (null === $v) { @@ -1095,10 +1122,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_LANGUAGE, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NAME, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getOfficial())) { foreach($vs as $v) { if (null === $v) { @@ -1107,10 +1134,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_OFFICIAL, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getPreferred())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PREFERRED, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getSource())) { foreach($vs as $v) { if (null === $v) { @@ -1123,7 +1150,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getSynonym())) { foreach($vs as $v) { if (null === $v) { @@ -1164,15 +1190,29 @@ public function jsonSerialize() $a[self::FIELD_LANGUAGE] = $vs; } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if ([] !== ($vs = $this->getOfficial())) { $a[self::FIELD_OFFICIAL] = $vs; } if (null !== ($v = $this->getPreferred())) { - $a[self::FIELD_PREFERRED] = $v->getValue(); - $a[self::FIELD_PREFERRED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PREFERRED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PREFERRED_EXT] = $enc; + } + } else { + $a[self::FIELD_PREFERRED] = $v; + } } if ([] !== ($vs = $this->getSource())) { $a[self::FIELD_SOURCE] = $vs; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSubstanceSpecification/FHIRSubstanceSpecificationOfficial.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSubstanceSpecification/FHIRSubstanceSpecificationOfficial.php index 7358538b34..0b778394e4 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSubstanceSpecification/FHIRSubstanceSpecificationOfficial.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSubstanceSpecification/FHIRSubstanceSpecificationOfficial.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRSubstanceSpecificationOfficial extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SUBSTANCE_SPECIFICATION_DOT_OFFICIAL; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_AUTHORITY = 'authority'; const FIELD_DATE = 'date'; const FIELD_DATE_EXT = '_date'; @@ -126,6 +122,9 @@ class FHIRSubstanceSpecificationOfficial extends FHIRBackboneElement */ protected $status = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSubstanceSpecificationOfficial Constructor * @param null|array $data @@ -155,8 +154,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATE] instanceof FHIRDateTime) { $this->setDate($data[self::FIELD_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_DATE])) { - $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime(array_merge($ext, $data[self::FIELD_DATE]))); + } } else { $this->setDate(new FHIRDateTime($data[self::FIELD_DATE])); } @@ -389,14 +392,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getAuthority())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AUTHORITY, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DATE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } @@ -413,8 +414,15 @@ public function jsonSerialize() $a[self::FIELD_AUTHORITY] = $v; } if (null !== ($v = $this->getDate())) { - $a[self::FIELD_DATE] = $v->getValue(); - $a[self::FIELD_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_DATE] = $v; + } } if (null !== ($v = $this->getStatus())) { $a[self::FIELD_STATUS] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSubstanceSpecification/FHIRSubstanceSpecificationProperty.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSubstanceSpecification/FHIRSubstanceSpecificationProperty.php index d96dd796e7..68c5b0da27 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSubstanceSpecification/FHIRSubstanceSpecificationProperty.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSubstanceSpecification/FHIRSubstanceSpecificationProperty.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -81,10 +81,6 @@ class FHIRSubstanceSpecificationProperty extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SUBSTANCE_SPECIFICATION_DOT_PROPERTY; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_AMOUNT_QUANTITY = 'amountQuantity'; const FIELD_AMOUNT_QUANTITY_EXT = '_amountQuantity'; const FIELD_AMOUNT_STRING = 'amountString'; @@ -181,6 +177,9 @@ class FHIRSubstanceSpecificationProperty extends FHIRBackboneElement */ protected $parameters = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSubstanceSpecificationProperty Constructor * @param null|array $data @@ -203,8 +202,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_AMOUNT_QUANTITY] instanceof FHIRQuantity) { $this->setAmountQuantity($data[self::FIELD_AMOUNT_QUANTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_AMOUNT_QUANTITY])) { - $this->setAmountQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_AMOUNT_QUANTITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_AMOUNT_QUANTITY])) { + $this->setAmountQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_AMOUNT_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_AMOUNT_QUANTITY])) { + $this->setAmountQuantity(new FHIRQuantity(array_merge($ext, $data[self::FIELD_AMOUNT_QUANTITY]))); + } } else { $this->setAmountQuantity(new FHIRQuantity($data[self::FIELD_AMOUNT_QUANTITY])); } @@ -215,8 +218,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_AMOUNT_STRING] instanceof FHIRString) { $this->setAmountString($data[self::FIELD_AMOUNT_STRING]); - } elseif ($ext && is_scalar($data[self::FIELD_AMOUNT_STRING])) { - $this->setAmountString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_AMOUNT_STRING]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_AMOUNT_STRING])) { + $this->setAmountString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_AMOUNT_STRING]] + $ext)); + } else if (is_array($data[self::FIELD_AMOUNT_STRING])) { + $this->setAmountString(new FHIRString(array_merge($ext, $data[self::FIELD_AMOUNT_STRING]))); + } } else { $this->setAmountString(new FHIRString($data[self::FIELD_AMOUNT_STRING])); } @@ -255,8 +262,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PARAMETERS] instanceof FHIRString) { $this->setParameters($data[self::FIELD_PARAMETERS]); - } elseif ($ext && is_scalar($data[self::FIELD_PARAMETERS])) { - $this->setParameters(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PARAMETERS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PARAMETERS])) { + $this->setParameters(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PARAMETERS]] + $ext)); + } else if (is_array($data[self::FIELD_PARAMETERS])) { + $this->setParameters(new FHIRString(array_merge($ext, $data[self::FIELD_PARAMETERS]))); + } } else { $this->setParameters(new FHIRString($data[self::FIELD_PARAMETERS])); } @@ -631,26 +642,21 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getAmountQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AMOUNT_QUANTITY, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getAmountString())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AMOUNT_STRING, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getCategory())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CATEGORY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDefiningSubstanceCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFINING_SUBSTANCE_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDefiningSubstanceReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFINING_SUBSTANCE_REFERENCE, null, $v->_getFHIRXMLNamespace())); } @@ -667,11 +673,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getAmountQuantity())) { - $a[self::FIELD_AMOUNT_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_AMOUNT_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_AMOUNT_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_AMOUNT_QUANTITY] = $v; + } } if (null !== ($v = $this->getAmountString())) { - $a[self::FIELD_AMOUNT_STRING] = $v->getValue(); - $a[self::FIELD_AMOUNT_STRING_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_AMOUNT_STRING] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_AMOUNT_STRING_EXT] = $enc; + } + } else { + $a[self::FIELD_AMOUNT_STRING] = $v; + } } if (null !== ($v = $this->getCategory())) { $a[self::FIELD_CATEGORY] = $v; @@ -686,8 +707,15 @@ public function jsonSerialize() $a[self::FIELD_DEFINING_SUBSTANCE_REFERENCE] = $v; } if (null !== ($v = $this->getParameters())) { - $a[self::FIELD_PARAMETERS] = $v->getValue(); - $a[self::FIELD_PARAMETERS_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PARAMETERS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PARAMETERS_EXT] = $enc; + } + } else { + $a[self::FIELD_PARAMETERS] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSubstanceSpecification/FHIRSubstanceSpecificationRelationship.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSubstanceSpecification/FHIRSubstanceSpecificationRelationship.php index 840a6c1e6b..32716385b1 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSubstanceSpecification/FHIRSubstanceSpecificationRelationship.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSubstanceSpecification/FHIRSubstanceSpecificationRelationship.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -84,10 +84,6 @@ class FHIRSubstanceSpecificationRelationship extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SUBSTANCE_SPECIFICATION_DOT_RELATIONSHIP; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_AMOUNT_QUANTITY = 'amountQuantity'; const FIELD_AMOUNT_QUANTITY_EXT = '_amountQuantity'; const FIELD_AMOUNT_RANGE = 'amountRange'; @@ -242,6 +238,9 @@ class FHIRSubstanceSpecificationRelationship extends FHIRBackboneElement */ protected $substanceReference = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSubstanceSpecificationRelationship Constructor * @param null|array $data @@ -264,8 +263,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_AMOUNT_QUANTITY] instanceof FHIRQuantity) { $this->setAmountQuantity($data[self::FIELD_AMOUNT_QUANTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_AMOUNT_QUANTITY])) { - $this->setAmountQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_AMOUNT_QUANTITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_AMOUNT_QUANTITY])) { + $this->setAmountQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_AMOUNT_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_AMOUNT_QUANTITY])) { + $this->setAmountQuantity(new FHIRQuantity(array_merge($ext, $data[self::FIELD_AMOUNT_QUANTITY]))); + } } else { $this->setAmountQuantity(new FHIRQuantity($data[self::FIELD_AMOUNT_QUANTITY])); } @@ -297,8 +300,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_AMOUNT_STRING] instanceof FHIRString) { $this->setAmountString($data[self::FIELD_AMOUNT_STRING]); - } elseif ($ext && is_scalar($data[self::FIELD_AMOUNT_STRING])) { - $this->setAmountString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_AMOUNT_STRING]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_AMOUNT_STRING])) { + $this->setAmountString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_AMOUNT_STRING]] + $ext)); + } else if (is_array($data[self::FIELD_AMOUNT_STRING])) { + $this->setAmountString(new FHIRString(array_merge($ext, $data[self::FIELD_AMOUNT_STRING]))); + } } else { $this->setAmountString(new FHIRString($data[self::FIELD_AMOUNT_STRING])); } @@ -316,8 +323,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IS_DEFINING] instanceof FHIRBoolean) { $this->setIsDefining($data[self::FIELD_IS_DEFINING]); - } elseif ($ext && is_scalar($data[self::FIELD_IS_DEFINING])) { - $this->setIsDefining(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_IS_DEFINING]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IS_DEFINING])) { + $this->setIsDefining(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_IS_DEFINING]] + $ext)); + } else if (is_array($data[self::FIELD_IS_DEFINING])) { + $this->setIsDefining(new FHIRBoolean(array_merge($ext, $data[self::FIELD_IS_DEFINING]))); + } } else { $this->setIsDefining(new FHIRBoolean($data[self::FIELD_IS_DEFINING])); } @@ -332,6 +343,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SOURCE])) { if (is_array($data[self::FIELD_SOURCE])) { foreach($data[self::FIELD_SOURCE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addSource($v); } else { @@ -908,37 +922,30 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getAmountQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AMOUNT_QUANTITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getAmountRange())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AMOUNT_RANGE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getAmountRatio())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AMOUNT_RATIO, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getAmountRatioLowLimit())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AMOUNT_RATIO_LOW_LIMIT, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getAmountString())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AMOUNT_STRING, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getAmountType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AMOUNT_TYPE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getIsDefining())) { $v->xmlSerialize($sxe->addChild(self::FIELD_IS_DEFINING, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRelationship())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RELATIONSHIP, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getSource())) { foreach($vs as $v) { if (null === $v) { @@ -951,7 +958,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getSubstanceCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBSTANCE_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSubstanceReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBSTANCE_REFERENCE, null, $v->_getFHIRXMLNamespace())); } @@ -965,7 +971,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getAmountQuantity())) { - $a[self::FIELD_AMOUNT_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_AMOUNT_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_AMOUNT_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_AMOUNT_QUANTITY] = $v; + } } if (null !== ($v = $this->getAmountRange())) { $a[self::FIELD_AMOUNT_RANGE] = $v; @@ -977,15 +991,29 @@ public function jsonSerialize() $a[self::FIELD_AMOUNT_RATIO_LOW_LIMIT] = $v; } if (null !== ($v = $this->getAmountString())) { - $a[self::FIELD_AMOUNT_STRING] = $v->getValue(); - $a[self::FIELD_AMOUNT_STRING_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_AMOUNT_STRING] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_AMOUNT_STRING_EXT] = $enc; + } + } else { + $a[self::FIELD_AMOUNT_STRING] = $v; + } } if (null !== ($v = $this->getAmountType())) { $a[self::FIELD_AMOUNT_TYPE] = $v; } if (null !== ($v = $this->getIsDefining())) { - $a[self::FIELD_IS_DEFINING] = $v->getValue(); - $a[self::FIELD_IS_DEFINING_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IS_DEFINING] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IS_DEFINING_EXT] = $enc; + } + } else { + $a[self::FIELD_IS_DEFINING] = $v; + } } if (null !== ($v = $this->getRelationship())) { $a[self::FIELD_RELATIONSHIP] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSubstanceSpecification/FHIRSubstanceSpecificationRepresentation.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSubstanceSpecification/FHIRSubstanceSpecificationRepresentation.php index 3da2c62fdf..fe86343634 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSubstanceSpecification/FHIRSubstanceSpecificationRepresentation.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSubstanceSpecification/FHIRSubstanceSpecificationRepresentation.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRSubstanceSpecificationRepresentation extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SUBSTANCE_SPECIFICATION_DOT_REPRESENTATION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ATTACHMENT = 'attachment'; const FIELD_REPRESENTATION = 'representation'; const FIELD_REPRESENTATION_EXT = '_representation'; @@ -124,6 +120,9 @@ class FHIRSubstanceSpecificationRepresentation extends FHIRBackboneElement */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSubstanceSpecificationRepresentation Constructor * @param null|array $data @@ -153,8 +152,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_REPRESENTATION] instanceof FHIRString) { $this->setRepresentation($data[self::FIELD_REPRESENTATION]); - } elseif ($ext && is_scalar($data[self::FIELD_REPRESENTATION])) { - $this->setRepresentation(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_REPRESENTATION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_REPRESENTATION])) { + $this->setRepresentation(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_REPRESENTATION]] + $ext)); + } else if (is_array($data[self::FIELD_REPRESENTATION])) { + $this->setRepresentation(new FHIRString(array_merge($ext, $data[self::FIELD_REPRESENTATION]))); + } } else { $this->setRepresentation(new FHIRString($data[self::FIELD_REPRESENTATION])); } @@ -381,14 +384,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getAttachment())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ATTACHMENT, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getRepresentation())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REPRESENTATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -405,8 +406,15 @@ public function jsonSerialize() $a[self::FIELD_ATTACHMENT] = $v; } if (null !== ($v = $this->getRepresentation())) { - $a[self::FIELD_REPRESENTATION] = $v->getValue(); - $a[self::FIELD_REPRESENTATION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_REPRESENTATION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_REPRESENTATION_EXT] = $enc; + } + } else { + $a[self::FIELD_REPRESENTATION] = $v; + } } if (null !== ($v = $this->getType())) { $a[self::FIELD_TYPE] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSubstanceSpecification/FHIRSubstanceSpecificationStructure.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSubstanceSpecification/FHIRSubstanceSpecificationStructure.php index 6d4f696f30..ea05a35308 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSubstanceSpecification/FHIRSubstanceSpecificationStructure.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSubstanceSpecification/FHIRSubstanceSpecificationStructure.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRSubstanceSpecificationStructure extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SUBSTANCE_SPECIFICATION_DOT_STRUCTURE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ISOTOPE = 'isotope'; const FIELD_MOLECULAR_FORMULA = 'molecularFormula'; const FIELD_MOLECULAR_FORMULA_EXT = '_molecularFormula'; @@ -184,6 +180,9 @@ class FHIRSubstanceSpecificationStructure extends FHIRBackboneElement */ protected $stereochemistry = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSubstanceSpecificationStructure Constructor * @param null|array $data @@ -203,6 +202,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ISOTOPE])) { if (is_array($data[self::FIELD_ISOTOPE])) { foreach($data[self::FIELD_ISOTOPE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRSubstanceSpecificationIsotope) { $this->addIsotope($v); } else { @@ -221,8 +223,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MOLECULAR_FORMULA] instanceof FHIRString) { $this->setMolecularFormula($data[self::FIELD_MOLECULAR_FORMULA]); - } elseif ($ext && is_scalar($data[self::FIELD_MOLECULAR_FORMULA])) { - $this->setMolecularFormula(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_MOLECULAR_FORMULA]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MOLECULAR_FORMULA])) { + $this->setMolecularFormula(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_MOLECULAR_FORMULA]] + $ext)); + } else if (is_array($data[self::FIELD_MOLECULAR_FORMULA])) { + $this->setMolecularFormula(new FHIRString(array_merge($ext, $data[self::FIELD_MOLECULAR_FORMULA]))); + } } else { $this->setMolecularFormula(new FHIRString($data[self::FIELD_MOLECULAR_FORMULA])); } @@ -233,8 +239,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MOLECULAR_FORMULA_BY_MOIETY] instanceof FHIRString) { $this->setMolecularFormulaByMoiety($data[self::FIELD_MOLECULAR_FORMULA_BY_MOIETY]); - } elseif ($ext && is_scalar($data[self::FIELD_MOLECULAR_FORMULA_BY_MOIETY])) { - $this->setMolecularFormulaByMoiety(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_MOLECULAR_FORMULA_BY_MOIETY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MOLECULAR_FORMULA_BY_MOIETY])) { + $this->setMolecularFormulaByMoiety(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_MOLECULAR_FORMULA_BY_MOIETY]] + $ext)); + } else if (is_array($data[self::FIELD_MOLECULAR_FORMULA_BY_MOIETY])) { + $this->setMolecularFormulaByMoiety(new FHIRString(array_merge($ext, $data[self::FIELD_MOLECULAR_FORMULA_BY_MOIETY]))); + } } else { $this->setMolecularFormulaByMoiety(new FHIRString($data[self::FIELD_MOLECULAR_FORMULA_BY_MOIETY])); } @@ -256,6 +266,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REPRESENTATION])) { if (is_array($data[self::FIELD_REPRESENTATION])) { foreach($data[self::FIELD_REPRESENTATION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRSubstanceSpecificationRepresentation) { $this->addRepresentation($v); } else { @@ -271,6 +284,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SOURCE])) { if (is_array($data[self::FIELD_SOURCE])) { foreach($data[self::FIELD_SOURCE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addSource($v); } else { @@ -762,7 +778,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getIsotope())) { foreach($vs as $v) { if (null === $v) { @@ -771,21 +786,19 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_ISOTOPE, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getMolecularFormula())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MOLECULAR_FORMULA, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getMolecularFormulaByMoiety())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MOLECULAR_FORMULA_BY_MOIETY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getMolecularWeight())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MOLECULAR_WEIGHT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOpticalActivity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OPTICAL_ACTIVITY, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getRepresentation())) { foreach($vs as $v) { if (null === $v) { @@ -820,12 +833,26 @@ public function jsonSerialize() $a[self::FIELD_ISOTOPE] = $vs; } if (null !== ($v = $this->getMolecularFormula())) { - $a[self::FIELD_MOLECULAR_FORMULA] = $v->getValue(); - $a[self::FIELD_MOLECULAR_FORMULA_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MOLECULAR_FORMULA] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MOLECULAR_FORMULA_EXT] = $enc; + } + } else { + $a[self::FIELD_MOLECULAR_FORMULA] = $v; + } } if (null !== ($v = $this->getMolecularFormulaByMoiety())) { - $a[self::FIELD_MOLECULAR_FORMULA_BY_MOIETY] = $v->getValue(); - $a[self::FIELD_MOLECULAR_FORMULA_BY_MOIETY_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MOLECULAR_FORMULA_BY_MOIETY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MOLECULAR_FORMULA_BY_MOIETY_EXT] = $enc; + } + } else { + $a[self::FIELD_MOLECULAR_FORMULA_BY_MOIETY] = $v; + } } if (null !== ($v = $this->getMolecularWeight())) { $a[self::FIELD_MOLECULAR_WEIGHT] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSupplyDelivery/FHIRSupplyDeliverySuppliedItem.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSupplyDelivery/FHIRSupplyDeliverySuppliedItem.php index 5d248dcd42..b71e00f420 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSupplyDelivery/FHIRSupplyDeliverySuppliedItem.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSupplyDelivery/FHIRSupplyDeliverySuppliedItem.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRSupplyDeliverySuppliedItem extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SUPPLY_DELIVERY_DOT_SUPPLIED_ITEM; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ITEM_CODEABLE_CONCEPT = 'itemCodeableConcept'; const FIELD_ITEM_REFERENCE = 'itemReference'; const FIELD_QUANTITY = 'quantity'; @@ -128,6 +124,9 @@ class FHIRSupplyDeliverySuppliedItem extends FHIRBackboneElement */ protected $quantity = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSupplyDeliverySuppliedItem Constructor * @param null|array $data @@ -164,8 +163,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_QUANTITY] instanceof FHIRQuantity) { $this->setQuantity($data[self::FIELD_QUANTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_QUANTITY])) { - $this->setQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_QUANTITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_QUANTITY])) { + $this->setQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_QUANTITY])) { + $this->setQuantity(new FHIRQuantity(array_merge($ext, $data[self::FIELD_QUANTITY]))); + } } else { $this->setQuantity(new FHIRQuantity($data[self::FIELD_QUANTITY])); } @@ -384,15 +387,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getItemCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ITEM_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getItemReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ITEM_REFERENCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_QUANTITY, null, $v->_getFHIRXMLNamespace())); } @@ -412,7 +412,15 @@ public function jsonSerialize() $a[self::FIELD_ITEM_REFERENCE] = $v; } if (null !== ($v = $this->getQuantity())) { - $a[self::FIELD_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_QUANTITY] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSupplyRequest/FHIRSupplyRequestParameter.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSupplyRequest/FHIRSupplyRequestParameter.php index 4f18052154..4ac0213d9e 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSupplyRequest/FHIRSupplyRequestParameter.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRSupplyRequest/FHIRSupplyRequestParameter.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -81,10 +81,6 @@ class FHIRSupplyRequestParameter extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SUPPLY_REQUEST_DOT_PARAMETER; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CODE = 'code'; const FIELD_VALUE_BOOLEAN = 'valueBoolean'; const FIELD_VALUE_BOOLEAN_EXT = '_valueBoolean'; @@ -151,6 +147,9 @@ class FHIRSupplyRequestParameter extends FHIRBackboneElement */ protected $valueRange = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSupplyRequestParameter Constructor * @param null|array $data @@ -180,8 +179,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_BOOLEAN] instanceof FHIRBoolean) { $this->setValueBoolean($data[self::FIELD_VALUE_BOOLEAN]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_BOOLEAN])) { - $this->setValueBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_VALUE_BOOLEAN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_BOOLEAN])) { + $this->setValueBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_VALUE_BOOLEAN]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_BOOLEAN])) { + $this->setValueBoolean(new FHIRBoolean(array_merge($ext, $data[self::FIELD_VALUE_BOOLEAN]))); + } } else { $this->setValueBoolean(new FHIRBoolean($data[self::FIELD_VALUE_BOOLEAN])); } @@ -199,8 +202,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_QUANTITY] instanceof FHIRQuantity) { $this->setValueQuantity($data[self::FIELD_VALUE_QUANTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_QUANTITY])) { - $this->setValueQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_VALUE_QUANTITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_QUANTITY])) { + $this->setValueQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_VALUE_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_QUANTITY])) { + $this->setValueQuantity(new FHIRQuantity(array_merge($ext, $data[self::FIELD_VALUE_QUANTITY]))); + } } else { $this->setValueQuantity(new FHIRQuantity($data[self::FIELD_VALUE_QUANTITY])); } @@ -495,22 +502,18 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getValueBoolean())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_BOOLEAN, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_QUANTITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueRange())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_RANGE, null, $v->_getFHIRXMLNamespace())); } @@ -527,14 +530,29 @@ public function jsonSerialize() $a[self::FIELD_CODE] = $v; } if (null !== ($v = $this->getValueBoolean())) { - $a[self::FIELD_VALUE_BOOLEAN] = $v->getValue(); - $a[self::FIELD_VALUE_BOOLEAN_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_BOOLEAN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_BOOLEAN_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_BOOLEAN] = $v; + } } if (null !== ($v = $this->getValueCodeableConcept())) { $a[self::FIELD_VALUE_CODEABLE_CONCEPT] = $v; } if (null !== ($v = $this->getValueQuantity())) { - $a[self::FIELD_VALUE_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_QUANTITY] = $v; + } } if (null !== ($v = $this->getValueRange())) { $a[self::FIELD_VALUE_RANGE] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRTask/FHIRTaskInput.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRTask/FHIRTaskInput.php index 0ffec9fc37..f53148a97a 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRTask/FHIRTaskInput.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRTask/FHIRTaskInput.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -126,13 +126,10 @@ class FHIRTaskInput extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_TASK_DOT_INPUT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_TYPE = 'type'; const FIELD_VALUE_ADDRESS = 'valueAddress'; const FIELD_VALUE_AGE = 'valueAge'; + const FIELD_VALUE_AGE_EXT = '_valueAge'; const FIELD_VALUE_ANNOTATION = 'valueAnnotation'; const FIELD_VALUE_ATTACHMENT = 'valueAttachment'; const FIELD_VALUE_BASE_64BINARY = 'valueBase64Binary'; @@ -150,6 +147,7 @@ class FHIRTaskInput extends FHIRBackboneElement const FIELD_VALUE_CONTACT_POINT_EXT = '_valueContactPoint'; const FIELD_VALUE_CONTRIBUTOR = 'valueContributor'; const FIELD_VALUE_COUNT = 'valueCount'; + const FIELD_VALUE_COUNT_EXT = '_valueCount'; const FIELD_VALUE_DATA_REQUIREMENT = 'valueDataRequirement'; const FIELD_VALUE_DATE = 'valueDate'; const FIELD_VALUE_DATE_EXT = '_valueDate'; @@ -158,8 +156,10 @@ class FHIRTaskInput extends FHIRBackboneElement const FIELD_VALUE_DECIMAL = 'valueDecimal'; const FIELD_VALUE_DECIMAL_EXT = '_valueDecimal'; const FIELD_VALUE_DISTANCE = 'valueDistance'; + const FIELD_VALUE_DISTANCE_EXT = '_valueDistance'; const FIELD_VALUE_DOSAGE = 'valueDosage'; const FIELD_VALUE_DURATION = 'valueDuration'; + const FIELD_VALUE_DURATION_EXT = '_valueDuration'; const FIELD_VALUE_EXPRESSION = 'valueExpression'; const FIELD_VALUE_HUMAN_NAME = 'valueHumanName'; const FIELD_VALUE_ID = 'valueId'; @@ -870,6 +870,9 @@ class FHIRTaskInput extends FHIRBackboneElement */ protected $valueUuid = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRTaskInput Constructor * @param null|array $data @@ -901,8 +904,17 @@ public function __construct($data = null) } } if (isset($data[self::FIELD_VALUE_AGE])) { + $ext = (isset($data[self::FIELD_VALUE_AGE_EXT]) && is_array($data[self::FIELD_VALUE_AGE_EXT])) + ? $data[self::FIELD_VALUE_AGE_EXT] + : null; if ($data[self::FIELD_VALUE_AGE] instanceof FHIRAge) { $this->setValueAge($data[self::FIELD_VALUE_AGE]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_AGE])) { + $this->setValueAge(new FHIRAge([FHIRAge::FIELD_VALUE => $data[self::FIELD_VALUE_AGE]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_AGE])) { + $this->setValueAge(new FHIRAge(array_merge($ext, $data[self::FIELD_VALUE_AGE]))); + } } else { $this->setValueAge(new FHIRAge($data[self::FIELD_VALUE_AGE])); } @@ -927,8 +939,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_BASE_64BINARY] instanceof FHIRBase64Binary) { $this->setValueBase64Binary($data[self::FIELD_VALUE_BASE_64BINARY]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_BASE_64BINARY])) { - $this->setValueBase64Binary(new FHIRBase64Binary([FHIRBase64Binary::FIELD_VALUE => $data[self::FIELD_VALUE_BASE_64BINARY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_BASE_64BINARY])) { + $this->setValueBase64Binary(new FHIRBase64Binary([FHIRBase64Binary::FIELD_VALUE => $data[self::FIELD_VALUE_BASE_64BINARY]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_BASE_64BINARY])) { + $this->setValueBase64Binary(new FHIRBase64Binary(array_merge($ext, $data[self::FIELD_VALUE_BASE_64BINARY]))); + } } else { $this->setValueBase64Binary(new FHIRBase64Binary($data[self::FIELD_VALUE_BASE_64BINARY])); } @@ -939,8 +955,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_BOOLEAN] instanceof FHIRBoolean) { $this->setValueBoolean($data[self::FIELD_VALUE_BOOLEAN]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_BOOLEAN])) { - $this->setValueBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_VALUE_BOOLEAN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_BOOLEAN])) { + $this->setValueBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_VALUE_BOOLEAN]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_BOOLEAN])) { + $this->setValueBoolean(new FHIRBoolean(array_merge($ext, $data[self::FIELD_VALUE_BOOLEAN]))); + } } else { $this->setValueBoolean(new FHIRBoolean($data[self::FIELD_VALUE_BOOLEAN])); } @@ -951,8 +971,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_CANONICAL] instanceof FHIRCanonical) { $this->setValueCanonical($data[self::FIELD_VALUE_CANONICAL]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_CANONICAL])) { - $this->setValueCanonical(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $data[self::FIELD_VALUE_CANONICAL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_CANONICAL])) { + $this->setValueCanonical(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $data[self::FIELD_VALUE_CANONICAL]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_CANONICAL])) { + $this->setValueCanonical(new FHIRCanonical(array_merge($ext, $data[self::FIELD_VALUE_CANONICAL]))); + } } else { $this->setValueCanonical(new FHIRCanonical($data[self::FIELD_VALUE_CANONICAL])); } @@ -963,8 +987,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_CODE] instanceof FHIRCode) { $this->setValueCode($data[self::FIELD_VALUE_CODE]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_CODE])) { - $this->setValueCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_VALUE_CODE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_CODE])) { + $this->setValueCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_VALUE_CODE]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_CODE])) { + $this->setValueCode(new FHIRCode(array_merge($ext, $data[self::FIELD_VALUE_CODE]))); + } } else { $this->setValueCode(new FHIRCode($data[self::FIELD_VALUE_CODE])); } @@ -996,8 +1024,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_CONTACT_POINT] instanceof FHIRContactPoint) { $this->setValueContactPoint($data[self::FIELD_VALUE_CONTACT_POINT]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_CONTACT_POINT])) { - $this->setValueContactPoint(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $data[self::FIELD_VALUE_CONTACT_POINT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_CONTACT_POINT])) { + $this->setValueContactPoint(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $data[self::FIELD_VALUE_CONTACT_POINT]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_CONTACT_POINT])) { + $this->setValueContactPoint(new FHIRContactPoint(array_merge($ext, $data[self::FIELD_VALUE_CONTACT_POINT]))); + } } else { $this->setValueContactPoint(new FHIRContactPoint($data[self::FIELD_VALUE_CONTACT_POINT])); } @@ -1010,8 +1042,17 @@ public function __construct($data = null) } } if (isset($data[self::FIELD_VALUE_COUNT])) { + $ext = (isset($data[self::FIELD_VALUE_COUNT_EXT]) && is_array($data[self::FIELD_VALUE_COUNT_EXT])) + ? $data[self::FIELD_VALUE_COUNT_EXT] + : null; if ($data[self::FIELD_VALUE_COUNT] instanceof FHIRCount) { $this->setValueCount($data[self::FIELD_VALUE_COUNT]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_COUNT])) { + $this->setValueCount(new FHIRCount([FHIRCount::FIELD_VALUE => $data[self::FIELD_VALUE_COUNT]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_COUNT])) { + $this->setValueCount(new FHIRCount(array_merge($ext, $data[self::FIELD_VALUE_COUNT]))); + } } else { $this->setValueCount(new FHIRCount($data[self::FIELD_VALUE_COUNT])); } @@ -1029,8 +1070,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_DATE] instanceof FHIRDate) { $this->setValueDate($data[self::FIELD_VALUE_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_DATE])) { - $this->setValueDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_VALUE_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_DATE])) { + $this->setValueDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_VALUE_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_DATE])) { + $this->setValueDate(new FHIRDate(array_merge($ext, $data[self::FIELD_VALUE_DATE]))); + } } else { $this->setValueDate(new FHIRDate($data[self::FIELD_VALUE_DATE])); } @@ -1041,8 +1086,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_DATE_TIME] instanceof FHIRDateTime) { $this->setValueDateTime($data[self::FIELD_VALUE_DATE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_DATE_TIME])) { - $this->setValueDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_VALUE_DATE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_DATE_TIME])) { + $this->setValueDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_VALUE_DATE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_DATE_TIME])) { + $this->setValueDateTime(new FHIRDateTime(array_merge($ext, $data[self::FIELD_VALUE_DATE_TIME]))); + } } else { $this->setValueDateTime(new FHIRDateTime($data[self::FIELD_VALUE_DATE_TIME])); } @@ -1053,15 +1102,28 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_DECIMAL] instanceof FHIRDecimal) { $this->setValueDecimal($data[self::FIELD_VALUE_DECIMAL]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_DECIMAL])) { - $this->setValueDecimal(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_VALUE_DECIMAL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_DECIMAL])) { + $this->setValueDecimal(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_VALUE_DECIMAL]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_DECIMAL])) { + $this->setValueDecimal(new FHIRDecimal(array_merge($ext, $data[self::FIELD_VALUE_DECIMAL]))); + } } else { $this->setValueDecimal(new FHIRDecimal($data[self::FIELD_VALUE_DECIMAL])); } } if (isset($data[self::FIELD_VALUE_DISTANCE])) { + $ext = (isset($data[self::FIELD_VALUE_DISTANCE_EXT]) && is_array($data[self::FIELD_VALUE_DISTANCE_EXT])) + ? $data[self::FIELD_VALUE_DISTANCE_EXT] + : null; if ($data[self::FIELD_VALUE_DISTANCE] instanceof FHIRDistance) { $this->setValueDistance($data[self::FIELD_VALUE_DISTANCE]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_DISTANCE])) { + $this->setValueDistance(new FHIRDistance([FHIRDistance::FIELD_VALUE => $data[self::FIELD_VALUE_DISTANCE]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_DISTANCE])) { + $this->setValueDistance(new FHIRDistance(array_merge($ext, $data[self::FIELD_VALUE_DISTANCE]))); + } } else { $this->setValueDistance(new FHIRDistance($data[self::FIELD_VALUE_DISTANCE])); } @@ -1074,8 +1136,17 @@ public function __construct($data = null) } } if (isset($data[self::FIELD_VALUE_DURATION])) { + $ext = (isset($data[self::FIELD_VALUE_DURATION_EXT]) && is_array($data[self::FIELD_VALUE_DURATION_EXT])) + ? $data[self::FIELD_VALUE_DURATION_EXT] + : null; if ($data[self::FIELD_VALUE_DURATION] instanceof FHIRDuration) { $this->setValueDuration($data[self::FIELD_VALUE_DURATION]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_DURATION])) { + $this->setValueDuration(new FHIRDuration([FHIRDuration::FIELD_VALUE => $data[self::FIELD_VALUE_DURATION]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_DURATION])) { + $this->setValueDuration(new FHIRDuration(array_merge($ext, $data[self::FIELD_VALUE_DURATION]))); + } } else { $this->setValueDuration(new FHIRDuration($data[self::FIELD_VALUE_DURATION])); } @@ -1100,8 +1171,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_ID] instanceof FHIRId) { $this->setValueId($data[self::FIELD_VALUE_ID]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_ID])) { - $this->setValueId(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_VALUE_ID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_ID])) { + $this->setValueId(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_VALUE_ID]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_ID])) { + $this->setValueId(new FHIRId(array_merge($ext, $data[self::FIELD_VALUE_ID]))); + } } else { $this->setValueId(new FHIRId($data[self::FIELD_VALUE_ID])); } @@ -1112,8 +1187,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_IDENTIFIER] instanceof FHIRIdentifier) { $this->setValueIdentifier($data[self::FIELD_VALUE_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_IDENTIFIER])) { - $this->setValueIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_VALUE_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_IDENTIFIER])) { + $this->setValueIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_VALUE_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_IDENTIFIER])) { + $this->setValueIdentifier(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_VALUE_IDENTIFIER]))); + } } else { $this->setValueIdentifier(new FHIRIdentifier($data[self::FIELD_VALUE_IDENTIFIER])); } @@ -1124,8 +1203,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_INSTANT] instanceof FHIRInstant) { $this->setValueInstant($data[self::FIELD_VALUE_INSTANT]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_INSTANT])) { - $this->setValueInstant(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_VALUE_INSTANT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_INSTANT])) { + $this->setValueInstant(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_VALUE_INSTANT]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_INSTANT])) { + $this->setValueInstant(new FHIRInstant(array_merge($ext, $data[self::FIELD_VALUE_INSTANT]))); + } } else { $this->setValueInstant(new FHIRInstant($data[self::FIELD_VALUE_INSTANT])); } @@ -1136,8 +1219,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_INTEGER] instanceof FHIRInteger) { $this->setValueInteger($data[self::FIELD_VALUE_INTEGER]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_INTEGER])) { - $this->setValueInteger(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_VALUE_INTEGER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_INTEGER])) { + $this->setValueInteger(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_VALUE_INTEGER]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_INTEGER])) { + $this->setValueInteger(new FHIRInteger(array_merge($ext, $data[self::FIELD_VALUE_INTEGER]))); + } } else { $this->setValueInteger(new FHIRInteger($data[self::FIELD_VALUE_INTEGER])); } @@ -1148,8 +1235,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_MARKDOWN] instanceof FHIRMarkdown) { $this->setValueMarkdown($data[self::FIELD_VALUE_MARKDOWN]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_MARKDOWN])) { - $this->setValueMarkdown(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_VALUE_MARKDOWN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_MARKDOWN])) { + $this->setValueMarkdown(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_VALUE_MARKDOWN]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_MARKDOWN])) { + $this->setValueMarkdown(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_VALUE_MARKDOWN]))); + } } else { $this->setValueMarkdown(new FHIRMarkdown($data[self::FIELD_VALUE_MARKDOWN])); } @@ -1167,8 +1258,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_MONEY] instanceof FHIRMoney) { $this->setValueMoney($data[self::FIELD_VALUE_MONEY]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_MONEY])) { - $this->setValueMoney(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_VALUE_MONEY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_MONEY])) { + $this->setValueMoney(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_VALUE_MONEY]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_MONEY])) { + $this->setValueMoney(new FHIRMoney(array_merge($ext, $data[self::FIELD_VALUE_MONEY]))); + } } else { $this->setValueMoney(new FHIRMoney($data[self::FIELD_VALUE_MONEY])); } @@ -1179,8 +1274,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_OID] instanceof FHIROid) { $this->setValueOid($data[self::FIELD_VALUE_OID]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_OID])) { - $this->setValueOid(new FHIROid([FHIROid::FIELD_VALUE => $data[self::FIELD_VALUE_OID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_OID])) { + $this->setValueOid(new FHIROid([FHIROid::FIELD_VALUE => $data[self::FIELD_VALUE_OID]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_OID])) { + $this->setValueOid(new FHIROid(array_merge($ext, $data[self::FIELD_VALUE_OID]))); + } } else { $this->setValueOid(new FHIROid($data[self::FIELD_VALUE_OID])); } @@ -1205,8 +1304,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_POSITIVE_INT] instanceof FHIRPositiveInt) { $this->setValuePositiveInt($data[self::FIELD_VALUE_POSITIVE_INT]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_POSITIVE_INT])) { - $this->setValuePositiveInt(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_VALUE_POSITIVE_INT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_POSITIVE_INT])) { + $this->setValuePositiveInt(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_VALUE_POSITIVE_INT]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_POSITIVE_INT])) { + $this->setValuePositiveInt(new FHIRPositiveInt(array_merge($ext, $data[self::FIELD_VALUE_POSITIVE_INT]))); + } } else { $this->setValuePositiveInt(new FHIRPositiveInt($data[self::FIELD_VALUE_POSITIVE_INT])); } @@ -1217,8 +1320,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_QUANTITY] instanceof FHIRQuantity) { $this->setValueQuantity($data[self::FIELD_VALUE_QUANTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_QUANTITY])) { - $this->setValueQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_VALUE_QUANTITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_QUANTITY])) { + $this->setValueQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_VALUE_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_QUANTITY])) { + $this->setValueQuantity(new FHIRQuantity(array_merge($ext, $data[self::FIELD_VALUE_QUANTITY]))); + } } else { $this->setValueQuantity(new FHIRQuantity($data[self::FIELD_VALUE_QUANTITY])); } @@ -1271,8 +1378,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_STRING] instanceof FHIRString) { $this->setValueString($data[self::FIELD_VALUE_STRING]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_STRING])) { - $this->setValueString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VALUE_STRING]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_STRING])) { + $this->setValueString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VALUE_STRING]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_STRING])) { + $this->setValueString(new FHIRString(array_merge($ext, $data[self::FIELD_VALUE_STRING]))); + } } else { $this->setValueString(new FHIRString($data[self::FIELD_VALUE_STRING])); } @@ -1283,8 +1394,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_TIME] instanceof FHIRTime) { $this->setValueTime($data[self::FIELD_VALUE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_TIME])) { - $this->setValueTime(new FHIRTime([FHIRTime::FIELD_VALUE => $data[self::FIELD_VALUE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_TIME])) { + $this->setValueTime(new FHIRTime([FHIRTime::FIELD_VALUE => $data[self::FIELD_VALUE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_TIME])) { + $this->setValueTime(new FHIRTime(array_merge($ext, $data[self::FIELD_VALUE_TIME]))); + } } else { $this->setValueTime(new FHIRTime($data[self::FIELD_VALUE_TIME])); } @@ -1309,8 +1424,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_UNSIGNED_INT] instanceof FHIRUnsignedInt) { $this->setValueUnsignedInt($data[self::FIELD_VALUE_UNSIGNED_INT]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_UNSIGNED_INT])) { - $this->setValueUnsignedInt(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_VALUE_UNSIGNED_INT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_UNSIGNED_INT])) { + $this->setValueUnsignedInt(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_VALUE_UNSIGNED_INT]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_UNSIGNED_INT])) { + $this->setValueUnsignedInt(new FHIRUnsignedInt(array_merge($ext, $data[self::FIELD_VALUE_UNSIGNED_INT]))); + } } else { $this->setValueUnsignedInt(new FHIRUnsignedInt($data[self::FIELD_VALUE_UNSIGNED_INT])); } @@ -1321,8 +1440,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_URI] instanceof FHIRUri) { $this->setValueUri($data[self::FIELD_VALUE_URI]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_URI])) { - $this->setValueUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_VALUE_URI]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_URI])) { + $this->setValueUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_VALUE_URI]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_URI])) { + $this->setValueUri(new FHIRUri(array_merge($ext, $data[self::FIELD_VALUE_URI]))); + } } else { $this->setValueUri(new FHIRUri($data[self::FIELD_VALUE_URI])); } @@ -1333,8 +1456,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_URL] instanceof FHIRUrl) { $this->setValueUrl($data[self::FIELD_VALUE_URL]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_URL])) { - $this->setValueUrl(new FHIRUrl([FHIRUrl::FIELD_VALUE => $data[self::FIELD_VALUE_URL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_URL])) { + $this->setValueUrl(new FHIRUrl([FHIRUrl::FIELD_VALUE => $data[self::FIELD_VALUE_URL]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_URL])) { + $this->setValueUrl(new FHIRUrl(array_merge($ext, $data[self::FIELD_VALUE_URL]))); + } } else { $this->setValueUrl(new FHIRUrl($data[self::FIELD_VALUE_URL])); } @@ -1352,8 +1479,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_UUID] instanceof FHIRUuid) { $this->setValueUuid($data[self::FIELD_VALUE_UUID]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_UUID])) { - $this->setValueUuid(new FHIRUuid([FHIRUuid::FIELD_VALUE => $data[self::FIELD_VALUE_UUID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_UUID])) { + $this->setValueUuid(new FHIRUuid([FHIRUuid::FIELD_VALUE => $data[self::FIELD_VALUE_UUID]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_UUID])) { + $this->setValueUuid(new FHIRUuid(array_merge($ext, $data[self::FIELD_VALUE_UUID]))); + } } else { $this->setValueUuid(new FHIRUuid($data[self::FIELD_VALUE_UUID])); } @@ -3559,23 +3690,18 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueAddress())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_ADDRESS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueAge())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_AGE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueAnnotation())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_ANNOTATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueAttachment())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_ATTACHMENT, null, $v->_getFHIRXMLNamespace())); } @@ -3591,31 +3717,24 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getValueCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_CODE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueCoding())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_CODING, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueContactDetail())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_CONTACT_DETAIL, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueContactPoint())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_CONTACT_POINT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueContributor())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_CONTRIBUTOR, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueCount())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_COUNT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueDataRequirement())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_DATA_REQUIREMENT, null, $v->_getFHIRXMLNamespace())); } @@ -3628,30 +3747,24 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getValueDecimal())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_DECIMAL, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueDistance())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_DISTANCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueDosage())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_DOSAGE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueDuration())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_DURATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueExpression())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_EXPRESSION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueHumanName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_HUMAN_NAME, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getValueId())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_ID, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } @@ -3664,53 +3777,42 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getValueMarkdown())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_MARKDOWN, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueMeta())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_META, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueMoney())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_MONEY, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getValueOid())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_OID, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueParameterDefinition())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_PARAMETER_DEFINITION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValuePeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_PERIOD, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getValuePositiveInt())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_POSITIVE_INT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_QUANTITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueRange())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_RANGE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueRatio())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_RATIO, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_REFERENCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueRelatedArtifact())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_RELATED_ARTIFACT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueSampledData())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_SAMPLED_DATA, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueSignature())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_SIGNATURE, null, $v->_getFHIRXMLNamespace())); } @@ -3720,11 +3822,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getValueTime())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_TIME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueTiming())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_TIMING, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueTriggerDefinition())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_TRIGGER_DEFINITION, null, $v->_getFHIRXMLNamespace())); } @@ -3737,7 +3837,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getValueUrl())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_URL, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueUsageContext())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_USAGE_CONTEXT, null, $v->_getFHIRXMLNamespace())); } @@ -3760,7 +3859,15 @@ public function jsonSerialize() $a[self::FIELD_VALUE_ADDRESS] = $v; } if (null !== ($v = $this->getValueAge())) { - $a[self::FIELD_VALUE_AGE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_AGE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_AGE_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_AGE] = $v; + } } if (null !== ($v = $this->getValueAnnotation())) { $a[self::FIELD_VALUE_ANNOTATION] = $v; @@ -3769,20 +3876,48 @@ public function jsonSerialize() $a[self::FIELD_VALUE_ATTACHMENT] = $v; } if (null !== ($v = $this->getValueBase64Binary())) { - $a[self::FIELD_VALUE_BASE_64BINARY] = $v->getValue(); - $a[self::FIELD_VALUE_BASE_64BINARY_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_BASE_64BINARY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_BASE_64BINARY_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_BASE_64BINARY] = $v; + } } if (null !== ($v = $this->getValueBoolean())) { - $a[self::FIELD_VALUE_BOOLEAN] = $v->getValue(); - $a[self::FIELD_VALUE_BOOLEAN_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_BOOLEAN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_BOOLEAN_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_BOOLEAN] = $v; + } } if (null !== ($v = $this->getValueCanonical())) { - $a[self::FIELD_VALUE_CANONICAL] = $v->getValue(); - $a[self::FIELD_VALUE_CANONICAL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_CANONICAL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_CANONICAL_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_CANONICAL] = $v; + } } if (null !== ($v = $this->getValueCode())) { - $a[self::FIELD_VALUE_CODE] = $v->getValue(); - $a[self::FIELD_VALUE_CODE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_CODE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_CODE_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_CODE] = $v; + } } if (null !== ($v = $this->getValueCodeableConcept())) { $a[self::FIELD_VALUE_CODEABLE_CONCEPT] = $v; @@ -3794,37 +3929,90 @@ public function jsonSerialize() $a[self::FIELD_VALUE_CONTACT_DETAIL] = $v; } if (null !== ($v = $this->getValueContactPoint())) { - $a[self::FIELD_VALUE_CONTACT_POINT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_CONTACT_POINT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_CONTACT_POINT_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_CONTACT_POINT] = $v; + } } if (null !== ($v = $this->getValueContributor())) { $a[self::FIELD_VALUE_CONTRIBUTOR] = $v; } if (null !== ($v = $this->getValueCount())) { - $a[self::FIELD_VALUE_COUNT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_COUNT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_COUNT_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_COUNT] = $v; + } } if (null !== ($v = $this->getValueDataRequirement())) { $a[self::FIELD_VALUE_DATA_REQUIREMENT] = $v; } if (null !== ($v = $this->getValueDate())) { - $a[self::FIELD_VALUE_DATE] = $v->getValue(); - $a[self::FIELD_VALUE_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_DATE] = $v; + } } if (null !== ($v = $this->getValueDateTime())) { - $a[self::FIELD_VALUE_DATE_TIME] = $v->getValue(); - $a[self::FIELD_VALUE_DATE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_DATE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_DATE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_DATE_TIME] = $v; + } } if (null !== ($v = $this->getValueDecimal())) { - $a[self::FIELD_VALUE_DECIMAL] = $v->getValue(); - $a[self::FIELD_VALUE_DECIMAL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_DECIMAL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_DECIMAL_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_DECIMAL] = $v; + } } if (null !== ($v = $this->getValueDistance())) { - $a[self::FIELD_VALUE_DISTANCE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_DISTANCE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_DISTANCE_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_DISTANCE] = $v; + } } if (null !== ($v = $this->getValueDosage())) { $a[self::FIELD_VALUE_DOSAGE] = $v; } if (null !== ($v = $this->getValueDuration())) { - $a[self::FIELD_VALUE_DURATION] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_DURATION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_DURATION_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_DURATION] = $v; + } } if (null !== ($v = $this->getValueExpression())) { $a[self::FIELD_VALUE_EXPRESSION] = $v; @@ -3833,33 +4021,84 @@ public function jsonSerialize() $a[self::FIELD_VALUE_HUMAN_NAME] = $v; } if (null !== ($v = $this->getValueId())) { - $a[self::FIELD_VALUE_ID] = $v->getValue(); - $a[self::FIELD_VALUE_ID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_ID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_ID_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_ID] = $v; + } } if (null !== ($v = $this->getValueIdentifier())) { - $a[self::FIELD_VALUE_IDENTIFIER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_IDENTIFIER] = $v; + } } if (null !== ($v = $this->getValueInstant())) { - $a[self::FIELD_VALUE_INSTANT] = $v->getValue(); - $a[self::FIELD_VALUE_INSTANT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_INSTANT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_INSTANT_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_INSTANT] = $v; + } } if (null !== ($v = $this->getValueInteger())) { - $a[self::FIELD_VALUE_INTEGER] = $v->getValue(); - $a[self::FIELD_VALUE_INTEGER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_INTEGER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_INTEGER_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_INTEGER] = $v; + } } if (null !== ($v = $this->getValueMarkdown())) { - $a[self::FIELD_VALUE_MARKDOWN] = $v->getValue(); - $a[self::FIELD_VALUE_MARKDOWN_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_MARKDOWN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_MARKDOWN_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_MARKDOWN] = $v; + } } if (null !== ($v = $this->getValueMeta())) { $a[self::FIELD_VALUE_META] = $v; } if (null !== ($v = $this->getValueMoney())) { - $a[self::FIELD_VALUE_MONEY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_MONEY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_MONEY_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_MONEY] = $v; + } } if (null !== ($v = $this->getValueOid())) { - $a[self::FIELD_VALUE_OID] = $v->getValue(); - $a[self::FIELD_VALUE_OID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_OID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_OID_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_OID] = $v; + } } if (null !== ($v = $this->getValueParameterDefinition())) { $a[self::FIELD_VALUE_PARAMETER_DEFINITION] = $v; @@ -3868,11 +4107,26 @@ public function jsonSerialize() $a[self::FIELD_VALUE_PERIOD] = $v; } if (null !== ($v = $this->getValuePositiveInt())) { - $a[self::FIELD_VALUE_POSITIVE_INT] = $v->getValue(); - $a[self::FIELD_VALUE_POSITIVE_INT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_POSITIVE_INT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_POSITIVE_INT_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_POSITIVE_INT] = $v; + } } if (null !== ($v = $this->getValueQuantity())) { - $a[self::FIELD_VALUE_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_QUANTITY] = $v; + } } if (null !== ($v = $this->getValueRange())) { $a[self::FIELD_VALUE_RANGE] = $v; @@ -3893,12 +4147,26 @@ public function jsonSerialize() $a[self::FIELD_VALUE_SIGNATURE] = $v; } if (null !== ($v = $this->getValueString())) { - $a[self::FIELD_VALUE_STRING] = $v->getValue(); - $a[self::FIELD_VALUE_STRING_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_STRING] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_STRING_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_STRING] = $v; + } } if (null !== ($v = $this->getValueTime())) { - $a[self::FIELD_VALUE_TIME] = $v->getValue(); - $a[self::FIELD_VALUE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_TIME] = $v; + } } if (null !== ($v = $this->getValueTiming())) { $a[self::FIELD_VALUE_TIMING] = $v; @@ -3907,23 +4175,51 @@ public function jsonSerialize() $a[self::FIELD_VALUE_TRIGGER_DEFINITION] = $v; } if (null !== ($v = $this->getValueUnsignedInt())) { - $a[self::FIELD_VALUE_UNSIGNED_INT] = $v->getValue(); - $a[self::FIELD_VALUE_UNSIGNED_INT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_UNSIGNED_INT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_UNSIGNED_INT_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_UNSIGNED_INT] = $v; + } } if (null !== ($v = $this->getValueUri())) { - $a[self::FIELD_VALUE_URI] = $v->getValue(); - $a[self::FIELD_VALUE_URI_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_URI] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_URI_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_URI] = $v; + } } if (null !== ($v = $this->getValueUrl())) { - $a[self::FIELD_VALUE_URL] = $v->getValue(); - $a[self::FIELD_VALUE_URL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_URL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_URL_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_URL] = $v; + } } if (null !== ($v = $this->getValueUsageContext())) { $a[self::FIELD_VALUE_USAGE_CONTEXT] = $v; } if (null !== ($v = $this->getValueUuid())) { - $a[self::FIELD_VALUE_UUID] = $v->getValue(); - $a[self::FIELD_VALUE_UUID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_UUID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_UUID_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_UUID] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRTask/FHIRTaskOutput.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRTask/FHIRTaskOutput.php index 694c20226b..ac80af1775 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRTask/FHIRTaskOutput.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRTask/FHIRTaskOutput.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -126,13 +126,10 @@ class FHIRTaskOutput extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_TASK_DOT_OUTPUT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_TYPE = 'type'; const FIELD_VALUE_ADDRESS = 'valueAddress'; const FIELD_VALUE_AGE = 'valueAge'; + const FIELD_VALUE_AGE_EXT = '_valueAge'; const FIELD_VALUE_ANNOTATION = 'valueAnnotation'; const FIELD_VALUE_ATTACHMENT = 'valueAttachment'; const FIELD_VALUE_BASE_64BINARY = 'valueBase64Binary'; @@ -150,6 +147,7 @@ class FHIRTaskOutput extends FHIRBackboneElement const FIELD_VALUE_CONTACT_POINT_EXT = '_valueContactPoint'; const FIELD_VALUE_CONTRIBUTOR = 'valueContributor'; const FIELD_VALUE_COUNT = 'valueCount'; + const FIELD_VALUE_COUNT_EXT = '_valueCount'; const FIELD_VALUE_DATA_REQUIREMENT = 'valueDataRequirement'; const FIELD_VALUE_DATE = 'valueDate'; const FIELD_VALUE_DATE_EXT = '_valueDate'; @@ -158,8 +156,10 @@ class FHIRTaskOutput extends FHIRBackboneElement const FIELD_VALUE_DECIMAL = 'valueDecimal'; const FIELD_VALUE_DECIMAL_EXT = '_valueDecimal'; const FIELD_VALUE_DISTANCE = 'valueDistance'; + const FIELD_VALUE_DISTANCE_EXT = '_valueDistance'; const FIELD_VALUE_DOSAGE = 'valueDosage'; const FIELD_VALUE_DURATION = 'valueDuration'; + const FIELD_VALUE_DURATION_EXT = '_valueDuration'; const FIELD_VALUE_EXPRESSION = 'valueExpression'; const FIELD_VALUE_HUMAN_NAME = 'valueHumanName'; const FIELD_VALUE_ID = 'valueId'; @@ -869,6 +869,9 @@ class FHIRTaskOutput extends FHIRBackboneElement */ protected $valueUuid = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRTaskOutput Constructor * @param null|array $data @@ -900,8 +903,17 @@ public function __construct($data = null) } } if (isset($data[self::FIELD_VALUE_AGE])) { + $ext = (isset($data[self::FIELD_VALUE_AGE_EXT]) && is_array($data[self::FIELD_VALUE_AGE_EXT])) + ? $data[self::FIELD_VALUE_AGE_EXT] + : null; if ($data[self::FIELD_VALUE_AGE] instanceof FHIRAge) { $this->setValueAge($data[self::FIELD_VALUE_AGE]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_AGE])) { + $this->setValueAge(new FHIRAge([FHIRAge::FIELD_VALUE => $data[self::FIELD_VALUE_AGE]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_AGE])) { + $this->setValueAge(new FHIRAge(array_merge($ext, $data[self::FIELD_VALUE_AGE]))); + } } else { $this->setValueAge(new FHIRAge($data[self::FIELD_VALUE_AGE])); } @@ -926,8 +938,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_BASE_64BINARY] instanceof FHIRBase64Binary) { $this->setValueBase64Binary($data[self::FIELD_VALUE_BASE_64BINARY]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_BASE_64BINARY])) { - $this->setValueBase64Binary(new FHIRBase64Binary([FHIRBase64Binary::FIELD_VALUE => $data[self::FIELD_VALUE_BASE_64BINARY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_BASE_64BINARY])) { + $this->setValueBase64Binary(new FHIRBase64Binary([FHIRBase64Binary::FIELD_VALUE => $data[self::FIELD_VALUE_BASE_64BINARY]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_BASE_64BINARY])) { + $this->setValueBase64Binary(new FHIRBase64Binary(array_merge($ext, $data[self::FIELD_VALUE_BASE_64BINARY]))); + } } else { $this->setValueBase64Binary(new FHIRBase64Binary($data[self::FIELD_VALUE_BASE_64BINARY])); } @@ -938,8 +954,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_BOOLEAN] instanceof FHIRBoolean) { $this->setValueBoolean($data[self::FIELD_VALUE_BOOLEAN]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_BOOLEAN])) { - $this->setValueBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_VALUE_BOOLEAN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_BOOLEAN])) { + $this->setValueBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_VALUE_BOOLEAN]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_BOOLEAN])) { + $this->setValueBoolean(new FHIRBoolean(array_merge($ext, $data[self::FIELD_VALUE_BOOLEAN]))); + } } else { $this->setValueBoolean(new FHIRBoolean($data[self::FIELD_VALUE_BOOLEAN])); } @@ -950,8 +970,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_CANONICAL] instanceof FHIRCanonical) { $this->setValueCanonical($data[self::FIELD_VALUE_CANONICAL]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_CANONICAL])) { - $this->setValueCanonical(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $data[self::FIELD_VALUE_CANONICAL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_CANONICAL])) { + $this->setValueCanonical(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $data[self::FIELD_VALUE_CANONICAL]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_CANONICAL])) { + $this->setValueCanonical(new FHIRCanonical(array_merge($ext, $data[self::FIELD_VALUE_CANONICAL]))); + } } else { $this->setValueCanonical(new FHIRCanonical($data[self::FIELD_VALUE_CANONICAL])); } @@ -962,8 +986,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_CODE] instanceof FHIRCode) { $this->setValueCode($data[self::FIELD_VALUE_CODE]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_CODE])) { - $this->setValueCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_VALUE_CODE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_CODE])) { + $this->setValueCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_VALUE_CODE]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_CODE])) { + $this->setValueCode(new FHIRCode(array_merge($ext, $data[self::FIELD_VALUE_CODE]))); + } } else { $this->setValueCode(new FHIRCode($data[self::FIELD_VALUE_CODE])); } @@ -995,8 +1023,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_CONTACT_POINT] instanceof FHIRContactPoint) { $this->setValueContactPoint($data[self::FIELD_VALUE_CONTACT_POINT]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_CONTACT_POINT])) { - $this->setValueContactPoint(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $data[self::FIELD_VALUE_CONTACT_POINT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_CONTACT_POINT])) { + $this->setValueContactPoint(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $data[self::FIELD_VALUE_CONTACT_POINT]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_CONTACT_POINT])) { + $this->setValueContactPoint(new FHIRContactPoint(array_merge($ext, $data[self::FIELD_VALUE_CONTACT_POINT]))); + } } else { $this->setValueContactPoint(new FHIRContactPoint($data[self::FIELD_VALUE_CONTACT_POINT])); } @@ -1009,8 +1041,17 @@ public function __construct($data = null) } } if (isset($data[self::FIELD_VALUE_COUNT])) { + $ext = (isset($data[self::FIELD_VALUE_COUNT_EXT]) && is_array($data[self::FIELD_VALUE_COUNT_EXT])) + ? $data[self::FIELD_VALUE_COUNT_EXT] + : null; if ($data[self::FIELD_VALUE_COUNT] instanceof FHIRCount) { $this->setValueCount($data[self::FIELD_VALUE_COUNT]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_COUNT])) { + $this->setValueCount(new FHIRCount([FHIRCount::FIELD_VALUE => $data[self::FIELD_VALUE_COUNT]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_COUNT])) { + $this->setValueCount(new FHIRCount(array_merge($ext, $data[self::FIELD_VALUE_COUNT]))); + } } else { $this->setValueCount(new FHIRCount($data[self::FIELD_VALUE_COUNT])); } @@ -1028,8 +1069,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_DATE] instanceof FHIRDate) { $this->setValueDate($data[self::FIELD_VALUE_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_DATE])) { - $this->setValueDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_VALUE_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_DATE])) { + $this->setValueDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_VALUE_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_DATE])) { + $this->setValueDate(new FHIRDate(array_merge($ext, $data[self::FIELD_VALUE_DATE]))); + } } else { $this->setValueDate(new FHIRDate($data[self::FIELD_VALUE_DATE])); } @@ -1040,8 +1085,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_DATE_TIME] instanceof FHIRDateTime) { $this->setValueDateTime($data[self::FIELD_VALUE_DATE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_DATE_TIME])) { - $this->setValueDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_VALUE_DATE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_DATE_TIME])) { + $this->setValueDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_VALUE_DATE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_DATE_TIME])) { + $this->setValueDateTime(new FHIRDateTime(array_merge($ext, $data[self::FIELD_VALUE_DATE_TIME]))); + } } else { $this->setValueDateTime(new FHIRDateTime($data[self::FIELD_VALUE_DATE_TIME])); } @@ -1052,15 +1101,28 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_DECIMAL] instanceof FHIRDecimal) { $this->setValueDecimal($data[self::FIELD_VALUE_DECIMAL]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_DECIMAL])) { - $this->setValueDecimal(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_VALUE_DECIMAL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_DECIMAL])) { + $this->setValueDecimal(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_VALUE_DECIMAL]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_DECIMAL])) { + $this->setValueDecimal(new FHIRDecimal(array_merge($ext, $data[self::FIELD_VALUE_DECIMAL]))); + } } else { $this->setValueDecimal(new FHIRDecimal($data[self::FIELD_VALUE_DECIMAL])); } } if (isset($data[self::FIELD_VALUE_DISTANCE])) { + $ext = (isset($data[self::FIELD_VALUE_DISTANCE_EXT]) && is_array($data[self::FIELD_VALUE_DISTANCE_EXT])) + ? $data[self::FIELD_VALUE_DISTANCE_EXT] + : null; if ($data[self::FIELD_VALUE_DISTANCE] instanceof FHIRDistance) { $this->setValueDistance($data[self::FIELD_VALUE_DISTANCE]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_DISTANCE])) { + $this->setValueDistance(new FHIRDistance([FHIRDistance::FIELD_VALUE => $data[self::FIELD_VALUE_DISTANCE]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_DISTANCE])) { + $this->setValueDistance(new FHIRDistance(array_merge($ext, $data[self::FIELD_VALUE_DISTANCE]))); + } } else { $this->setValueDistance(new FHIRDistance($data[self::FIELD_VALUE_DISTANCE])); } @@ -1073,8 +1135,17 @@ public function __construct($data = null) } } if (isset($data[self::FIELD_VALUE_DURATION])) { + $ext = (isset($data[self::FIELD_VALUE_DURATION_EXT]) && is_array($data[self::FIELD_VALUE_DURATION_EXT])) + ? $data[self::FIELD_VALUE_DURATION_EXT] + : null; if ($data[self::FIELD_VALUE_DURATION] instanceof FHIRDuration) { $this->setValueDuration($data[self::FIELD_VALUE_DURATION]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_DURATION])) { + $this->setValueDuration(new FHIRDuration([FHIRDuration::FIELD_VALUE => $data[self::FIELD_VALUE_DURATION]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_DURATION])) { + $this->setValueDuration(new FHIRDuration(array_merge($ext, $data[self::FIELD_VALUE_DURATION]))); + } } else { $this->setValueDuration(new FHIRDuration($data[self::FIELD_VALUE_DURATION])); } @@ -1099,8 +1170,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_ID] instanceof FHIRId) { $this->setValueId($data[self::FIELD_VALUE_ID]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_ID])) { - $this->setValueId(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_VALUE_ID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_ID])) { + $this->setValueId(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_VALUE_ID]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_ID])) { + $this->setValueId(new FHIRId(array_merge($ext, $data[self::FIELD_VALUE_ID]))); + } } else { $this->setValueId(new FHIRId($data[self::FIELD_VALUE_ID])); } @@ -1111,8 +1186,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_IDENTIFIER] instanceof FHIRIdentifier) { $this->setValueIdentifier($data[self::FIELD_VALUE_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_IDENTIFIER])) { - $this->setValueIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_VALUE_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_IDENTIFIER])) { + $this->setValueIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_VALUE_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_IDENTIFIER])) { + $this->setValueIdentifier(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_VALUE_IDENTIFIER]))); + } } else { $this->setValueIdentifier(new FHIRIdentifier($data[self::FIELD_VALUE_IDENTIFIER])); } @@ -1123,8 +1202,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_INSTANT] instanceof FHIRInstant) { $this->setValueInstant($data[self::FIELD_VALUE_INSTANT]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_INSTANT])) { - $this->setValueInstant(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_VALUE_INSTANT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_INSTANT])) { + $this->setValueInstant(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_VALUE_INSTANT]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_INSTANT])) { + $this->setValueInstant(new FHIRInstant(array_merge($ext, $data[self::FIELD_VALUE_INSTANT]))); + } } else { $this->setValueInstant(new FHIRInstant($data[self::FIELD_VALUE_INSTANT])); } @@ -1135,8 +1218,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_INTEGER] instanceof FHIRInteger) { $this->setValueInteger($data[self::FIELD_VALUE_INTEGER]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_INTEGER])) { - $this->setValueInteger(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_VALUE_INTEGER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_INTEGER])) { + $this->setValueInteger(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_VALUE_INTEGER]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_INTEGER])) { + $this->setValueInteger(new FHIRInteger(array_merge($ext, $data[self::FIELD_VALUE_INTEGER]))); + } } else { $this->setValueInteger(new FHIRInteger($data[self::FIELD_VALUE_INTEGER])); } @@ -1147,8 +1234,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_MARKDOWN] instanceof FHIRMarkdown) { $this->setValueMarkdown($data[self::FIELD_VALUE_MARKDOWN]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_MARKDOWN])) { - $this->setValueMarkdown(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_VALUE_MARKDOWN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_MARKDOWN])) { + $this->setValueMarkdown(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_VALUE_MARKDOWN]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_MARKDOWN])) { + $this->setValueMarkdown(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_VALUE_MARKDOWN]))); + } } else { $this->setValueMarkdown(new FHIRMarkdown($data[self::FIELD_VALUE_MARKDOWN])); } @@ -1166,8 +1257,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_MONEY] instanceof FHIRMoney) { $this->setValueMoney($data[self::FIELD_VALUE_MONEY]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_MONEY])) { - $this->setValueMoney(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_VALUE_MONEY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_MONEY])) { + $this->setValueMoney(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_VALUE_MONEY]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_MONEY])) { + $this->setValueMoney(new FHIRMoney(array_merge($ext, $data[self::FIELD_VALUE_MONEY]))); + } } else { $this->setValueMoney(new FHIRMoney($data[self::FIELD_VALUE_MONEY])); } @@ -1178,8 +1273,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_OID] instanceof FHIROid) { $this->setValueOid($data[self::FIELD_VALUE_OID]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_OID])) { - $this->setValueOid(new FHIROid([FHIROid::FIELD_VALUE => $data[self::FIELD_VALUE_OID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_OID])) { + $this->setValueOid(new FHIROid([FHIROid::FIELD_VALUE => $data[self::FIELD_VALUE_OID]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_OID])) { + $this->setValueOid(new FHIROid(array_merge($ext, $data[self::FIELD_VALUE_OID]))); + } } else { $this->setValueOid(new FHIROid($data[self::FIELD_VALUE_OID])); } @@ -1204,8 +1303,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_POSITIVE_INT] instanceof FHIRPositiveInt) { $this->setValuePositiveInt($data[self::FIELD_VALUE_POSITIVE_INT]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_POSITIVE_INT])) { - $this->setValuePositiveInt(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_VALUE_POSITIVE_INT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_POSITIVE_INT])) { + $this->setValuePositiveInt(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_VALUE_POSITIVE_INT]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_POSITIVE_INT])) { + $this->setValuePositiveInt(new FHIRPositiveInt(array_merge($ext, $data[self::FIELD_VALUE_POSITIVE_INT]))); + } } else { $this->setValuePositiveInt(new FHIRPositiveInt($data[self::FIELD_VALUE_POSITIVE_INT])); } @@ -1216,8 +1319,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_QUANTITY] instanceof FHIRQuantity) { $this->setValueQuantity($data[self::FIELD_VALUE_QUANTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_QUANTITY])) { - $this->setValueQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_VALUE_QUANTITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_QUANTITY])) { + $this->setValueQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_VALUE_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_QUANTITY])) { + $this->setValueQuantity(new FHIRQuantity(array_merge($ext, $data[self::FIELD_VALUE_QUANTITY]))); + } } else { $this->setValueQuantity(new FHIRQuantity($data[self::FIELD_VALUE_QUANTITY])); } @@ -1270,8 +1377,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_STRING] instanceof FHIRString) { $this->setValueString($data[self::FIELD_VALUE_STRING]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_STRING])) { - $this->setValueString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VALUE_STRING]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_STRING])) { + $this->setValueString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VALUE_STRING]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_STRING])) { + $this->setValueString(new FHIRString(array_merge($ext, $data[self::FIELD_VALUE_STRING]))); + } } else { $this->setValueString(new FHIRString($data[self::FIELD_VALUE_STRING])); } @@ -1282,8 +1393,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_TIME] instanceof FHIRTime) { $this->setValueTime($data[self::FIELD_VALUE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_TIME])) { - $this->setValueTime(new FHIRTime([FHIRTime::FIELD_VALUE => $data[self::FIELD_VALUE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_TIME])) { + $this->setValueTime(new FHIRTime([FHIRTime::FIELD_VALUE => $data[self::FIELD_VALUE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_TIME])) { + $this->setValueTime(new FHIRTime(array_merge($ext, $data[self::FIELD_VALUE_TIME]))); + } } else { $this->setValueTime(new FHIRTime($data[self::FIELD_VALUE_TIME])); } @@ -1308,8 +1423,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_UNSIGNED_INT] instanceof FHIRUnsignedInt) { $this->setValueUnsignedInt($data[self::FIELD_VALUE_UNSIGNED_INT]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_UNSIGNED_INT])) { - $this->setValueUnsignedInt(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_VALUE_UNSIGNED_INT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_UNSIGNED_INT])) { + $this->setValueUnsignedInt(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_VALUE_UNSIGNED_INT]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_UNSIGNED_INT])) { + $this->setValueUnsignedInt(new FHIRUnsignedInt(array_merge($ext, $data[self::FIELD_VALUE_UNSIGNED_INT]))); + } } else { $this->setValueUnsignedInt(new FHIRUnsignedInt($data[self::FIELD_VALUE_UNSIGNED_INT])); } @@ -1320,8 +1439,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_URI] instanceof FHIRUri) { $this->setValueUri($data[self::FIELD_VALUE_URI]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_URI])) { - $this->setValueUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_VALUE_URI]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_URI])) { + $this->setValueUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_VALUE_URI]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_URI])) { + $this->setValueUri(new FHIRUri(array_merge($ext, $data[self::FIELD_VALUE_URI]))); + } } else { $this->setValueUri(new FHIRUri($data[self::FIELD_VALUE_URI])); } @@ -1332,8 +1455,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_URL] instanceof FHIRUrl) { $this->setValueUrl($data[self::FIELD_VALUE_URL]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_URL])) { - $this->setValueUrl(new FHIRUrl([FHIRUrl::FIELD_VALUE => $data[self::FIELD_VALUE_URL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_URL])) { + $this->setValueUrl(new FHIRUrl([FHIRUrl::FIELD_VALUE => $data[self::FIELD_VALUE_URL]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_URL])) { + $this->setValueUrl(new FHIRUrl(array_merge($ext, $data[self::FIELD_VALUE_URL]))); + } } else { $this->setValueUrl(new FHIRUrl($data[self::FIELD_VALUE_URL])); } @@ -1351,8 +1478,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_UUID] instanceof FHIRUuid) { $this->setValueUuid($data[self::FIELD_VALUE_UUID]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_UUID])) { - $this->setValueUuid(new FHIRUuid([FHIRUuid::FIELD_VALUE => $data[self::FIELD_VALUE_UUID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_UUID])) { + $this->setValueUuid(new FHIRUuid([FHIRUuid::FIELD_VALUE => $data[self::FIELD_VALUE_UUID]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_UUID])) { + $this->setValueUuid(new FHIRUuid(array_merge($ext, $data[self::FIELD_VALUE_UUID]))); + } } else { $this->setValueUuid(new FHIRUuid($data[self::FIELD_VALUE_UUID])); } @@ -3556,23 +3687,18 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueAddress())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_ADDRESS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueAge())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_AGE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueAnnotation())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_ANNOTATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueAttachment())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_ATTACHMENT, null, $v->_getFHIRXMLNamespace())); } @@ -3588,31 +3714,24 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getValueCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_CODE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueCoding())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_CODING, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueContactDetail())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_CONTACT_DETAIL, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueContactPoint())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_CONTACT_POINT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueContributor())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_CONTRIBUTOR, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueCount())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_COUNT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueDataRequirement())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_DATA_REQUIREMENT, null, $v->_getFHIRXMLNamespace())); } @@ -3625,30 +3744,24 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getValueDecimal())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_DECIMAL, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueDistance())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_DISTANCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueDosage())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_DOSAGE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueDuration())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_DURATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueExpression())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_EXPRESSION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueHumanName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_HUMAN_NAME, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getValueId())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_ID, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } @@ -3661,53 +3774,42 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getValueMarkdown())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_MARKDOWN, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueMeta())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_META, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueMoney())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_MONEY, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getValueOid())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_OID, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueParameterDefinition())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_PARAMETER_DEFINITION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValuePeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_PERIOD, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getValuePositiveInt())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_POSITIVE_INT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_QUANTITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueRange())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_RANGE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueRatio())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_RATIO, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_REFERENCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueRelatedArtifact())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_RELATED_ARTIFACT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueSampledData())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_SAMPLED_DATA, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueSignature())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_SIGNATURE, null, $v->_getFHIRXMLNamespace())); } @@ -3717,11 +3819,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getValueTime())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_TIME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueTiming())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_TIMING, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueTriggerDefinition())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_TRIGGER_DEFINITION, null, $v->_getFHIRXMLNamespace())); } @@ -3734,7 +3834,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getValueUrl())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_URL, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueUsageContext())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_USAGE_CONTEXT, null, $v->_getFHIRXMLNamespace())); } @@ -3757,7 +3856,15 @@ public function jsonSerialize() $a[self::FIELD_VALUE_ADDRESS] = $v; } if (null !== ($v = $this->getValueAge())) { - $a[self::FIELD_VALUE_AGE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_AGE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_AGE_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_AGE] = $v; + } } if (null !== ($v = $this->getValueAnnotation())) { $a[self::FIELD_VALUE_ANNOTATION] = $v; @@ -3766,20 +3873,48 @@ public function jsonSerialize() $a[self::FIELD_VALUE_ATTACHMENT] = $v; } if (null !== ($v = $this->getValueBase64Binary())) { - $a[self::FIELD_VALUE_BASE_64BINARY] = $v->getValue(); - $a[self::FIELD_VALUE_BASE_64BINARY_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_BASE_64BINARY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_BASE_64BINARY_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_BASE_64BINARY] = $v; + } } if (null !== ($v = $this->getValueBoolean())) { - $a[self::FIELD_VALUE_BOOLEAN] = $v->getValue(); - $a[self::FIELD_VALUE_BOOLEAN_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_BOOLEAN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_BOOLEAN_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_BOOLEAN] = $v; + } } if (null !== ($v = $this->getValueCanonical())) { - $a[self::FIELD_VALUE_CANONICAL] = $v->getValue(); - $a[self::FIELD_VALUE_CANONICAL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_CANONICAL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_CANONICAL_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_CANONICAL] = $v; + } } if (null !== ($v = $this->getValueCode())) { - $a[self::FIELD_VALUE_CODE] = $v->getValue(); - $a[self::FIELD_VALUE_CODE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_CODE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_CODE_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_CODE] = $v; + } } if (null !== ($v = $this->getValueCodeableConcept())) { $a[self::FIELD_VALUE_CODEABLE_CONCEPT] = $v; @@ -3791,37 +3926,90 @@ public function jsonSerialize() $a[self::FIELD_VALUE_CONTACT_DETAIL] = $v; } if (null !== ($v = $this->getValueContactPoint())) { - $a[self::FIELD_VALUE_CONTACT_POINT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_CONTACT_POINT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_CONTACT_POINT_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_CONTACT_POINT] = $v; + } } if (null !== ($v = $this->getValueContributor())) { $a[self::FIELD_VALUE_CONTRIBUTOR] = $v; } if (null !== ($v = $this->getValueCount())) { - $a[self::FIELD_VALUE_COUNT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_COUNT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_COUNT_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_COUNT] = $v; + } } if (null !== ($v = $this->getValueDataRequirement())) { $a[self::FIELD_VALUE_DATA_REQUIREMENT] = $v; } if (null !== ($v = $this->getValueDate())) { - $a[self::FIELD_VALUE_DATE] = $v->getValue(); - $a[self::FIELD_VALUE_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_DATE] = $v; + } } if (null !== ($v = $this->getValueDateTime())) { - $a[self::FIELD_VALUE_DATE_TIME] = $v->getValue(); - $a[self::FIELD_VALUE_DATE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_DATE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_DATE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_DATE_TIME] = $v; + } } if (null !== ($v = $this->getValueDecimal())) { - $a[self::FIELD_VALUE_DECIMAL] = $v->getValue(); - $a[self::FIELD_VALUE_DECIMAL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_DECIMAL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_DECIMAL_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_DECIMAL] = $v; + } } if (null !== ($v = $this->getValueDistance())) { - $a[self::FIELD_VALUE_DISTANCE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_DISTANCE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_DISTANCE_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_DISTANCE] = $v; + } } if (null !== ($v = $this->getValueDosage())) { $a[self::FIELD_VALUE_DOSAGE] = $v; } if (null !== ($v = $this->getValueDuration())) { - $a[self::FIELD_VALUE_DURATION] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_DURATION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_DURATION_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_DURATION] = $v; + } } if (null !== ($v = $this->getValueExpression())) { $a[self::FIELD_VALUE_EXPRESSION] = $v; @@ -3830,33 +4018,84 @@ public function jsonSerialize() $a[self::FIELD_VALUE_HUMAN_NAME] = $v; } if (null !== ($v = $this->getValueId())) { - $a[self::FIELD_VALUE_ID] = $v->getValue(); - $a[self::FIELD_VALUE_ID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_ID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_ID_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_ID] = $v; + } } if (null !== ($v = $this->getValueIdentifier())) { - $a[self::FIELD_VALUE_IDENTIFIER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_IDENTIFIER] = $v; + } } if (null !== ($v = $this->getValueInstant())) { - $a[self::FIELD_VALUE_INSTANT] = $v->getValue(); - $a[self::FIELD_VALUE_INSTANT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_INSTANT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_INSTANT_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_INSTANT] = $v; + } } if (null !== ($v = $this->getValueInteger())) { - $a[self::FIELD_VALUE_INTEGER] = $v->getValue(); - $a[self::FIELD_VALUE_INTEGER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_INTEGER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_INTEGER_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_INTEGER] = $v; + } } if (null !== ($v = $this->getValueMarkdown())) { - $a[self::FIELD_VALUE_MARKDOWN] = $v->getValue(); - $a[self::FIELD_VALUE_MARKDOWN_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_MARKDOWN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_MARKDOWN_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_MARKDOWN] = $v; + } } if (null !== ($v = $this->getValueMeta())) { $a[self::FIELD_VALUE_META] = $v; } if (null !== ($v = $this->getValueMoney())) { - $a[self::FIELD_VALUE_MONEY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_MONEY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_MONEY_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_MONEY] = $v; + } } if (null !== ($v = $this->getValueOid())) { - $a[self::FIELD_VALUE_OID] = $v->getValue(); - $a[self::FIELD_VALUE_OID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_OID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_OID_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_OID] = $v; + } } if (null !== ($v = $this->getValueParameterDefinition())) { $a[self::FIELD_VALUE_PARAMETER_DEFINITION] = $v; @@ -3865,11 +4104,26 @@ public function jsonSerialize() $a[self::FIELD_VALUE_PERIOD] = $v; } if (null !== ($v = $this->getValuePositiveInt())) { - $a[self::FIELD_VALUE_POSITIVE_INT] = $v->getValue(); - $a[self::FIELD_VALUE_POSITIVE_INT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_POSITIVE_INT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_POSITIVE_INT_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_POSITIVE_INT] = $v; + } } if (null !== ($v = $this->getValueQuantity())) { - $a[self::FIELD_VALUE_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_QUANTITY] = $v; + } } if (null !== ($v = $this->getValueRange())) { $a[self::FIELD_VALUE_RANGE] = $v; @@ -3890,12 +4144,26 @@ public function jsonSerialize() $a[self::FIELD_VALUE_SIGNATURE] = $v; } if (null !== ($v = $this->getValueString())) { - $a[self::FIELD_VALUE_STRING] = $v->getValue(); - $a[self::FIELD_VALUE_STRING_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_STRING] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_STRING_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_STRING] = $v; + } } if (null !== ($v = $this->getValueTime())) { - $a[self::FIELD_VALUE_TIME] = $v->getValue(); - $a[self::FIELD_VALUE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_TIME] = $v; + } } if (null !== ($v = $this->getValueTiming())) { $a[self::FIELD_VALUE_TIMING] = $v; @@ -3904,23 +4172,51 @@ public function jsonSerialize() $a[self::FIELD_VALUE_TRIGGER_DEFINITION] = $v; } if (null !== ($v = $this->getValueUnsignedInt())) { - $a[self::FIELD_VALUE_UNSIGNED_INT] = $v->getValue(); - $a[self::FIELD_VALUE_UNSIGNED_INT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_UNSIGNED_INT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_UNSIGNED_INT_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_UNSIGNED_INT] = $v; + } } if (null !== ($v = $this->getValueUri())) { - $a[self::FIELD_VALUE_URI] = $v->getValue(); - $a[self::FIELD_VALUE_URI_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_URI] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_URI_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_URI] = $v; + } } if (null !== ($v = $this->getValueUrl())) { - $a[self::FIELD_VALUE_URL] = $v->getValue(); - $a[self::FIELD_VALUE_URL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_URL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_URL_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_URL] = $v; + } } if (null !== ($v = $this->getValueUsageContext())) { $a[self::FIELD_VALUE_USAGE_CONTEXT] = $v; } if (null !== ($v = $this->getValueUuid())) { - $a[self::FIELD_VALUE_UUID] = $v->getValue(); - $a[self::FIELD_VALUE_UUID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_UUID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_UUID_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_UUID] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRTask/FHIRTaskRestriction.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRTask/FHIRTaskRestriction.php index 3a0d36fe8a..e479b772e0 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRTask/FHIRTaskRestriction.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRTask/FHIRTaskRestriction.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRTaskRestriction extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_TASK_DOT_RESTRICTION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_PERIOD = 'period'; const FIELD_RECIPIENT = 'recipient'; const FIELD_REPETITIONS = 'repetitions'; @@ -122,6 +118,9 @@ class FHIRTaskRestriction extends FHIRBackboneElement */ protected $repetitions = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRTaskRestriction Constructor * @param null|array $data @@ -148,6 +147,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_RECIPIENT])) { if (is_array($data[self::FIELD_RECIPIENT])) { foreach($data[self::FIELD_RECIPIENT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addRecipient($v); } else { @@ -166,8 +168,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_REPETITIONS] instanceof FHIRPositiveInt) { $this->setRepetitions($data[self::FIELD_REPETITIONS]); - } elseif ($ext && is_scalar($data[self::FIELD_REPETITIONS])) { - $this->setRepetitions(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_REPETITIONS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_REPETITIONS])) { + $this->setRepetitions(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_REPETITIONS]] + $ext)); + } else if (is_array($data[self::FIELD_REPETITIONS])) { + $this->setRepetitions(new FHIRPositiveInt(array_merge($ext, $data[self::FIELD_REPETITIONS]))); + } } else { $this->setRepetitions(new FHIRPositiveInt($data[self::FIELD_REPETITIONS])); } @@ -414,11 +420,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getRecipient())) { foreach($vs as $v) { if (null === $v) { @@ -427,6 +431,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_RECIPIENT, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getRepetitions())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REPETITIONS, null, $v->_getFHIRXMLNamespace())); } @@ -446,8 +451,15 @@ public function jsonSerialize() $a[self::FIELD_RECIPIENT] = $vs; } if (null !== ($v = $this->getRepetitions())) { - $a[self::FIELD_REPETITIONS] = $v->getValue(); - $a[self::FIELD_REPETITIONS_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_REPETITIONS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_REPETITIONS_EXT] = $enc; + } + } else { + $a[self::FIELD_REPETITIONS] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRTerminologyCapabilities/FHIRTerminologyCapabilitiesClosure.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRTerminologyCapabilities/FHIRTerminologyCapabilitiesClosure.php index 89b74dfd6b..88bc0ea60d 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRTerminologyCapabilities/FHIRTerminologyCapabilitiesClosure.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRTerminologyCapabilities/FHIRTerminologyCapabilitiesClosure.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRTerminologyCapabilitiesClosure extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_TERMINOLOGY_CAPABILITIES_DOT_CLOSURE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_TRANSLATION = 'translation'; const FIELD_TRANSLATION_EXT = '_translation'; @@ -96,6 +92,9 @@ class FHIRTerminologyCapabilitiesClosure extends FHIRBackboneElement */ protected $translation = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRTerminologyCapabilitiesClosure Constructor * @param null|array $data @@ -118,8 +117,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TRANSLATION] instanceof FHIRBoolean) { $this->setTranslation($data[self::FIELD_TRANSLATION]); - } elseif ($ext && is_scalar($data[self::FIELD_TRANSLATION])) { - $this->setTranslation(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_TRANSLATION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TRANSLATION])) { + $this->setTranslation(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_TRANSLATION]] + $ext)); + } else if (is_array($data[self::FIELD_TRANSLATION])) { + $this->setTranslation(new FHIRBoolean(array_merge($ext, $data[self::FIELD_TRANSLATION]))); + } } else { $this->setTranslation(new FHIRBoolean($data[self::FIELD_TRANSLATION])); } @@ -280,8 +283,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getTranslation())) { - $a[self::FIELD_TRANSLATION] = $v->getValue(); - $a[self::FIELD_TRANSLATION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TRANSLATION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TRANSLATION_EXT] = $enc; + } + } else { + $a[self::FIELD_TRANSLATION] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRTerminologyCapabilities/FHIRTerminologyCapabilitiesCodeSystem.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRTerminologyCapabilities/FHIRTerminologyCapabilitiesCodeSystem.php index cdb3ea508f..3500e64e05 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRTerminologyCapabilities/FHIRTerminologyCapabilitiesCodeSystem.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRTerminologyCapabilities/FHIRTerminologyCapabilitiesCodeSystem.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRTerminologyCapabilitiesCodeSystem extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_TERMINOLOGY_CAPABILITIES_DOT_CODE_SYSTEM; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_SUBSUMPTION = 'subsumption'; const FIELD_SUBSUMPTION_EXT = '_subsumption'; const FIELD_URI = 'uri'; @@ -123,6 +119,9 @@ class FHIRTerminologyCapabilitiesCodeSystem extends FHIRBackboneElement */ protected $version = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRTerminologyCapabilitiesCodeSystem Constructor * @param null|array $data @@ -145,8 +144,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SUBSUMPTION] instanceof FHIRBoolean) { $this->setSubsumption($data[self::FIELD_SUBSUMPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_SUBSUMPTION])) { - $this->setSubsumption(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_SUBSUMPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SUBSUMPTION])) { + $this->setSubsumption(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_SUBSUMPTION]] + $ext)); + } else if (is_array($data[self::FIELD_SUBSUMPTION])) { + $this->setSubsumption(new FHIRBoolean(array_merge($ext, $data[self::FIELD_SUBSUMPTION]))); + } } else { $this->setSubsumption(new FHIRBoolean($data[self::FIELD_SUBSUMPTION])); } @@ -157,8 +160,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_URI] instanceof FHIRCanonical) { $this->setUri($data[self::FIELD_URI]); - } elseif ($ext && is_scalar($data[self::FIELD_URI])) { - $this->setUri(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $data[self::FIELD_URI]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_URI])) { + $this->setUri(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $data[self::FIELD_URI]] + $ext)); + } else if (is_array($data[self::FIELD_URI])) { + $this->setUri(new FHIRCanonical(array_merge($ext, $data[self::FIELD_URI]))); + } } else { $this->setUri(new FHIRCanonical($data[self::FIELD_URI])); } @@ -166,6 +173,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_VERSION])) { if (is_array($data[self::FIELD_VERSION])) { foreach($data[self::FIELD_VERSION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRTerminologyCapabilitiesVersion) { $this->addVersion($v); } else { @@ -434,7 +444,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getUri())) { $v->xmlSerialize($sxe->addChild(self::FIELD_URI, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getVersion())) { foreach($vs as $v) { if (null === $v) { @@ -443,6 +452,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_VERSION, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } @@ -453,12 +463,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getSubsumption())) { - $a[self::FIELD_SUBSUMPTION] = $v->getValue(); - $a[self::FIELD_SUBSUMPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SUBSUMPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SUBSUMPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_SUBSUMPTION] = $v; + } } if (null !== ($v = $this->getUri())) { - $a[self::FIELD_URI] = $v->getValue(); - $a[self::FIELD_URI_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_URI] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_URI_EXT] = $enc; + } + } else { + $a[self::FIELD_URI] = $v; + } } if ([] !== ($vs = $this->getVersion())) { $a[self::FIELD_VERSION] = $vs; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRTerminologyCapabilities/FHIRTerminologyCapabilitiesExpansion.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRTerminologyCapabilities/FHIRTerminologyCapabilitiesExpansion.php index 3bcccd2ce4..56e014fefc 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRTerminologyCapabilities/FHIRTerminologyCapabilitiesExpansion.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRTerminologyCapabilities/FHIRTerminologyCapabilitiesExpansion.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRTerminologyCapabilitiesExpansion extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_TERMINOLOGY_CAPABILITIES_DOT_EXPANSION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_HIERARCHICAL = 'hierarchical'; const FIELD_HIERARCHICAL_EXT = '_hierarchical'; const FIELD_INCOMPLETE = 'incomplete'; @@ -150,6 +146,9 @@ class FHIRTerminologyCapabilitiesExpansion extends FHIRBackboneElement */ protected $textFilter = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRTerminologyCapabilitiesExpansion Constructor * @param null|array $data @@ -172,8 +171,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_HIERARCHICAL] instanceof FHIRBoolean) { $this->setHierarchical($data[self::FIELD_HIERARCHICAL]); - } elseif ($ext && is_scalar($data[self::FIELD_HIERARCHICAL])) { - $this->setHierarchical(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_HIERARCHICAL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_HIERARCHICAL])) { + $this->setHierarchical(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_HIERARCHICAL]] + $ext)); + } else if (is_array($data[self::FIELD_HIERARCHICAL])) { + $this->setHierarchical(new FHIRBoolean(array_merge($ext, $data[self::FIELD_HIERARCHICAL]))); + } } else { $this->setHierarchical(new FHIRBoolean($data[self::FIELD_HIERARCHICAL])); } @@ -184,8 +187,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_INCOMPLETE] instanceof FHIRBoolean) { $this->setIncomplete($data[self::FIELD_INCOMPLETE]); - } elseif ($ext && is_scalar($data[self::FIELD_INCOMPLETE])) { - $this->setIncomplete(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_INCOMPLETE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_INCOMPLETE])) { + $this->setIncomplete(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_INCOMPLETE]] + $ext)); + } else if (is_array($data[self::FIELD_INCOMPLETE])) { + $this->setIncomplete(new FHIRBoolean(array_merge($ext, $data[self::FIELD_INCOMPLETE]))); + } } else { $this->setIncomplete(new FHIRBoolean($data[self::FIELD_INCOMPLETE])); } @@ -196,8 +203,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PAGING] instanceof FHIRBoolean) { $this->setPaging($data[self::FIELD_PAGING]); - } elseif ($ext && is_scalar($data[self::FIELD_PAGING])) { - $this->setPaging(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_PAGING]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PAGING])) { + $this->setPaging(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_PAGING]] + $ext)); + } else if (is_array($data[self::FIELD_PAGING])) { + $this->setPaging(new FHIRBoolean(array_merge($ext, $data[self::FIELD_PAGING]))); + } } else { $this->setPaging(new FHIRBoolean($data[self::FIELD_PAGING])); } @@ -205,6 +216,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PARAMETER])) { if (is_array($data[self::FIELD_PARAMETER])) { foreach($data[self::FIELD_PARAMETER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRTerminologyCapabilitiesParameter) { $this->addParameter($v); } else { @@ -223,8 +237,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TEXT_FILTER] instanceof FHIRMarkdown) { $this->setTextFilter($data[self::FIELD_TEXT_FILTER]); - } elseif ($ext && is_scalar($data[self::FIELD_TEXT_FILTER])) { - $this->setTextFilter(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_TEXT_FILTER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TEXT_FILTER])) { + $this->setTextFilter(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_TEXT_FILTER]] + $ext)); + } else if (is_array($data[self::FIELD_TEXT_FILTER])) { + $this->setTextFilter(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_TEXT_FILTER]))); + } } else { $this->setTextFilter(new FHIRMarkdown($data[self::FIELD_TEXT_FILTER])); } @@ -578,7 +596,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getPaging())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PAGING, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getParameter())) { foreach($vs as $v) { if (null === $v) { @@ -587,6 +604,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_PARAMETER, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getTextFilter())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TEXT_FILTER, null, $v->_getFHIRXMLNamespace())); } @@ -600,23 +618,51 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getHierarchical())) { - $a[self::FIELD_HIERARCHICAL] = $v->getValue(); - $a[self::FIELD_HIERARCHICAL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_HIERARCHICAL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_HIERARCHICAL_EXT] = $enc; + } + } else { + $a[self::FIELD_HIERARCHICAL] = $v; + } } if (null !== ($v = $this->getIncomplete())) { - $a[self::FIELD_INCOMPLETE] = $v->getValue(); - $a[self::FIELD_INCOMPLETE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_INCOMPLETE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_INCOMPLETE_EXT] = $enc; + } + } else { + $a[self::FIELD_INCOMPLETE] = $v; + } } if (null !== ($v = $this->getPaging())) { - $a[self::FIELD_PAGING] = $v->getValue(); - $a[self::FIELD_PAGING_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PAGING] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PAGING_EXT] = $enc; + } + } else { + $a[self::FIELD_PAGING] = $v; + } } if ([] !== ($vs = $this->getParameter())) { $a[self::FIELD_PARAMETER] = $vs; } if (null !== ($v = $this->getTextFilter())) { - $a[self::FIELD_TEXT_FILTER] = $v->getValue(); - $a[self::FIELD_TEXT_FILTER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TEXT_FILTER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TEXT_FILTER_EXT] = $enc; + } + } else { + $a[self::FIELD_TEXT_FILTER] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRTerminologyCapabilities/FHIRTerminologyCapabilitiesFilter.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRTerminologyCapabilities/FHIRTerminologyCapabilitiesFilter.php index 1459d48e7e..c493ef4ab6 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRTerminologyCapabilities/FHIRTerminologyCapabilitiesFilter.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRTerminologyCapabilities/FHIRTerminologyCapabilitiesFilter.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRTerminologyCapabilitiesFilter extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_TERMINOLOGY_CAPABILITIES_DOT_FILTER; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CODE = 'code'; const FIELD_CODE_EXT = '_code'; const FIELD_OP = 'op'; @@ -112,6 +108,9 @@ class FHIRTerminologyCapabilitiesFilter extends FHIRBackboneElement */ protected $op = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRTerminologyCapabilitiesFilter Constructor * @param null|array $data @@ -134,8 +133,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CODE] instanceof FHIRCode) { $this->setCode($data[self::FIELD_CODE]); - } elseif ($ext && is_scalar($data[self::FIELD_CODE])) { - $this->setCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_CODE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CODE])) { + $this->setCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_CODE]] + $ext)); + } else if (is_array($data[self::FIELD_CODE])) { + $this->setCode(new FHIRCode(array_merge($ext, $data[self::FIELD_CODE]))); + } } else { $this->setCode(new FHIRCode($data[self::FIELD_CODE])); } @@ -146,17 +149,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_OP])) { foreach($data[self::FIELD_OP] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCode) { $this->addOp($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addOp(new FHIRCode([FHIRCode::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addOp(new FHIRCode([FHIRCode::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addOp(new FHIRCode(array_merge($v, $ext[$i]))); + } } else { $this->addOp(new FHIRCode($v)); } } } elseif ($data[self::FIELD_OP] instanceof FHIRCode) { $this->addOp($data[self::FIELD_OP]); - } elseif ($ext && is_scalar($data[self::FIELD_OP])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_OP])) { $this->addOp(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_OP]] + $ext)); } else { $this->addOp(new FHIRCode($data[self::FIELD_OP])); @@ -395,6 +405,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_OP, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } @@ -405,8 +416,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getCode())) { - $a[self::FIELD_CODE] = $v->getValue(); - $a[self::FIELD_CODE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CODE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CODE_EXT] = $enc; + } + } else { + $a[self::FIELD_CODE] = $v; + } } if ([] !== ($vs = $this->getOp())) { $a[self::FIELD_OP] = []; @@ -414,8 +432,17 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_OP][] = $v->getValue(); - $a[self::FIELD_OP_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_OP][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_OP_EXT][] = $enc; + } else { + $a[self::FIELD_OP_EXT][] = null; + } + } else { + $a[self::FIELD_OP][] = $v; + } } } return $a; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRTerminologyCapabilities/FHIRTerminologyCapabilitiesImplementation.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRTerminologyCapabilities/FHIRTerminologyCapabilitiesImplementation.php index cce179293c..e81002538f 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRTerminologyCapabilities/FHIRTerminologyCapabilitiesImplementation.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRTerminologyCapabilities/FHIRTerminologyCapabilitiesImplementation.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRTerminologyCapabilitiesImplementation extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_TERMINOLOGY_CAPABILITIES_DOT_IMPLEMENTATION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DESCRIPTION = 'description'; const FIELD_DESCRIPTION_EXT = '_description'; const FIELD_URL = 'url'; @@ -112,6 +108,9 @@ class FHIRTerminologyCapabilitiesImplementation extends FHIRBackboneElement */ protected $url = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRTerminologyCapabilitiesImplementation Constructor * @param null|array $data @@ -134,8 +133,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -146,8 +149,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_URL] instanceof FHIRUrl) { $this->setUrl($data[self::FIELD_URL]); - } elseif ($ext && is_scalar($data[self::FIELD_URL])) { - $this->setUrl(new FHIRUrl([FHIRUrl::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUrl([FHIRUrl::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } else if (is_array($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUrl(array_merge($ext, $data[self::FIELD_URL]))); + } } else { $this->setUrl(new FHIRUrl($data[self::FIELD_URL])); } @@ -359,12 +366,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if (null !== ($v = $this->getUrl())) { - $a[self::FIELD_URL] = $v->getValue(); - $a[self::FIELD_URL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_URL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_URL_EXT] = $enc; + } + } else { + $a[self::FIELD_URL] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRTerminologyCapabilities/FHIRTerminologyCapabilitiesParameter.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRTerminologyCapabilities/FHIRTerminologyCapabilitiesParameter.php index 2644ebc278..837951e772 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRTerminologyCapabilities/FHIRTerminologyCapabilitiesParameter.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRTerminologyCapabilities/FHIRTerminologyCapabilitiesParameter.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRTerminologyCapabilitiesParameter extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_TERMINOLOGY_CAPABILITIES_DOT_PARAMETER; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DOCUMENTATION = 'documentation'; const FIELD_DOCUMENTATION_EXT = '_documentation'; const FIELD_NAME = 'name'; @@ -112,6 +108,9 @@ class FHIRTerminologyCapabilitiesParameter extends FHIRBackboneElement */ protected $name = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRTerminologyCapabilitiesParameter Constructor * @param null|array $data @@ -134,8 +133,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DOCUMENTATION] instanceof FHIRString) { $this->setDocumentation($data[self::FIELD_DOCUMENTATION]); - } elseif ($ext && is_scalar($data[self::FIELD_DOCUMENTATION])) { - $this->setDocumentation(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DOCUMENTATION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DOCUMENTATION])) { + $this->setDocumentation(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DOCUMENTATION]] + $ext)); + } else if (is_array($data[self::FIELD_DOCUMENTATION])) { + $this->setDocumentation(new FHIRString(array_merge($ext, $data[self::FIELD_DOCUMENTATION]))); + } } else { $this->setDocumentation(new FHIRString($data[self::FIELD_DOCUMENTATION])); } @@ -146,8 +149,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRCode) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRCode(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRCode($data[self::FIELD_NAME])); } @@ -359,12 +366,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getDocumentation())) { - $a[self::FIELD_DOCUMENTATION] = $v->getValue(); - $a[self::FIELD_DOCUMENTATION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DOCUMENTATION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DOCUMENTATION_EXT] = $enc; + } + } else { + $a[self::FIELD_DOCUMENTATION] = $v; + } } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRTerminologyCapabilities/FHIRTerminologyCapabilitiesSoftware.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRTerminologyCapabilities/FHIRTerminologyCapabilitiesSoftware.php index 40bc993b5b..ffac0cc8fc 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRTerminologyCapabilities/FHIRTerminologyCapabilitiesSoftware.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRTerminologyCapabilities/FHIRTerminologyCapabilitiesSoftware.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRTerminologyCapabilitiesSoftware extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_TERMINOLOGY_CAPABILITIES_DOT_SOFTWARE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_NAME = 'name'; const FIELD_NAME_EXT = '_name'; const FIELD_VERSION = 'version'; @@ -110,6 +106,9 @@ class FHIRTerminologyCapabilitiesSoftware extends FHIRBackboneElement */ protected $version = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRTerminologyCapabilitiesSoftware Constructor * @param null|array $data @@ -132,8 +131,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -144,8 +147,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VERSION] instanceof FHIRString) { $this->setVersion($data[self::FIELD_VERSION]); - } elseif ($ext && is_scalar($data[self::FIELD_VERSION])) { - $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } else if (is_array($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString(array_merge($ext, $data[self::FIELD_VERSION]))); + } } else { $this->setVersion(new FHIRString($data[self::FIELD_VERSION])); } @@ -355,12 +362,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if (null !== ($v = $this->getVersion())) { - $a[self::FIELD_VERSION] = $v->getValue(); - $a[self::FIELD_VERSION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VERSION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VERSION_EXT] = $enc; + } + } else { + $a[self::FIELD_VERSION] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRTerminologyCapabilities/FHIRTerminologyCapabilitiesTranslation.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRTerminologyCapabilities/FHIRTerminologyCapabilitiesTranslation.php index 5b93f57fa6..4360b85d11 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRTerminologyCapabilities/FHIRTerminologyCapabilitiesTranslation.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRTerminologyCapabilities/FHIRTerminologyCapabilitiesTranslation.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRTerminologyCapabilitiesTranslation extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_TERMINOLOGY_CAPABILITIES_DOT_TRANSLATION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_NEEDS_MAP = 'needsMap'; const FIELD_NEEDS_MAP_EXT = '_needsMap'; @@ -96,6 +92,9 @@ class FHIRTerminologyCapabilitiesTranslation extends FHIRBackboneElement */ protected $needsMap = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRTerminologyCapabilitiesTranslation Constructor * @param null|array $data @@ -118,8 +117,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NEEDS_MAP] instanceof FHIRBoolean) { $this->setNeedsMap($data[self::FIELD_NEEDS_MAP]); - } elseif ($ext && is_scalar($data[self::FIELD_NEEDS_MAP])) { - $this->setNeedsMap(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_NEEDS_MAP]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NEEDS_MAP])) { + $this->setNeedsMap(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_NEEDS_MAP]] + $ext)); + } else if (is_array($data[self::FIELD_NEEDS_MAP])) { + $this->setNeedsMap(new FHIRBoolean(array_merge($ext, $data[self::FIELD_NEEDS_MAP]))); + } } else { $this->setNeedsMap(new FHIRBoolean($data[self::FIELD_NEEDS_MAP])); } @@ -280,8 +283,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getNeedsMap())) { - $a[self::FIELD_NEEDS_MAP] = $v->getValue(); - $a[self::FIELD_NEEDS_MAP_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NEEDS_MAP] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NEEDS_MAP_EXT] = $enc; + } + } else { + $a[self::FIELD_NEEDS_MAP] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRTerminologyCapabilities/FHIRTerminologyCapabilitiesValidateCode.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRTerminologyCapabilities/FHIRTerminologyCapabilitiesValidateCode.php index 64343a92e2..beaa447e40 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRTerminologyCapabilities/FHIRTerminologyCapabilitiesValidateCode.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRTerminologyCapabilities/FHIRTerminologyCapabilitiesValidateCode.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRTerminologyCapabilitiesValidateCode extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_TERMINOLOGY_CAPABILITIES_DOT_VALIDATE_CODE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_TRANSLATIONS = 'translations'; const FIELD_TRANSLATIONS_EXT = '_translations'; @@ -96,6 +92,9 @@ class FHIRTerminologyCapabilitiesValidateCode extends FHIRBackboneElement */ protected $translations = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRTerminologyCapabilitiesValidateCode Constructor * @param null|array $data @@ -118,8 +117,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TRANSLATIONS] instanceof FHIRBoolean) { $this->setTranslations($data[self::FIELD_TRANSLATIONS]); - } elseif ($ext && is_scalar($data[self::FIELD_TRANSLATIONS])) { - $this->setTranslations(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_TRANSLATIONS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TRANSLATIONS])) { + $this->setTranslations(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_TRANSLATIONS]] + $ext)); + } else if (is_array($data[self::FIELD_TRANSLATIONS])) { + $this->setTranslations(new FHIRBoolean(array_merge($ext, $data[self::FIELD_TRANSLATIONS]))); + } } else { $this->setTranslations(new FHIRBoolean($data[self::FIELD_TRANSLATIONS])); } @@ -280,8 +283,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getTranslations())) { - $a[self::FIELD_TRANSLATIONS] = $v->getValue(); - $a[self::FIELD_TRANSLATIONS_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TRANSLATIONS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TRANSLATIONS_EXT] = $enc; + } + } else { + $a[self::FIELD_TRANSLATIONS] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRTerminologyCapabilities/FHIRTerminologyCapabilitiesVersion.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRTerminologyCapabilities/FHIRTerminologyCapabilitiesVersion.php index 53ea5c4bcf..65fddfd821 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRTerminologyCapabilities/FHIRTerminologyCapabilitiesVersion.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRTerminologyCapabilities/FHIRTerminologyCapabilitiesVersion.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -81,10 +81,6 @@ class FHIRTerminologyCapabilitiesVersion extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_TERMINOLOGY_CAPABILITIES_DOT_VERSION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CODE = 'code'; const FIELD_CODE_EXT = '_code'; const FIELD_COMPOSITIONAL = 'compositional'; @@ -164,6 +160,9 @@ class FHIRTerminologyCapabilitiesVersion extends FHIRBackboneElement */ protected $property = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRTerminologyCapabilitiesVersion Constructor * @param null|array $data @@ -186,8 +185,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CODE] instanceof FHIRString) { $this->setCode($data[self::FIELD_CODE]); - } elseif ($ext && is_scalar($data[self::FIELD_CODE])) { - $this->setCode(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_CODE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CODE])) { + $this->setCode(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_CODE]] + $ext)); + } else if (is_array($data[self::FIELD_CODE])) { + $this->setCode(new FHIRString(array_merge($ext, $data[self::FIELD_CODE]))); + } } else { $this->setCode(new FHIRString($data[self::FIELD_CODE])); } @@ -198,8 +201,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_COMPOSITIONAL] instanceof FHIRBoolean) { $this->setCompositional($data[self::FIELD_COMPOSITIONAL]); - } elseif ($ext && is_scalar($data[self::FIELD_COMPOSITIONAL])) { - $this->setCompositional(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_COMPOSITIONAL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_COMPOSITIONAL])) { + $this->setCompositional(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_COMPOSITIONAL]] + $ext)); + } else if (is_array($data[self::FIELD_COMPOSITIONAL])) { + $this->setCompositional(new FHIRBoolean(array_merge($ext, $data[self::FIELD_COMPOSITIONAL]))); + } } else { $this->setCompositional(new FHIRBoolean($data[self::FIELD_COMPOSITIONAL])); } @@ -207,6 +214,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_FILTER])) { if (is_array($data[self::FIELD_FILTER])) { foreach($data[self::FIELD_FILTER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRTerminologyCapabilitiesFilter) { $this->addFilter($v); } else { @@ -225,8 +235,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IS_DEFAULT] instanceof FHIRBoolean) { $this->setIsDefault($data[self::FIELD_IS_DEFAULT]); - } elseif ($ext && is_scalar($data[self::FIELD_IS_DEFAULT])) { - $this->setIsDefault(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_IS_DEFAULT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IS_DEFAULT])) { + $this->setIsDefault(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_IS_DEFAULT]] + $ext)); + } else if (is_array($data[self::FIELD_IS_DEFAULT])) { + $this->setIsDefault(new FHIRBoolean(array_merge($ext, $data[self::FIELD_IS_DEFAULT]))); + } } else { $this->setIsDefault(new FHIRBoolean($data[self::FIELD_IS_DEFAULT])); } @@ -237,17 +251,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_LANGUAGE])) { foreach($data[self::FIELD_LANGUAGE] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCode) { $this->addLanguage($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addLanguage(new FHIRCode([FHIRCode::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addLanguage(new FHIRCode([FHIRCode::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addLanguage(new FHIRCode(array_merge($v, $ext[$i]))); + } } else { $this->addLanguage(new FHIRCode($v)); } } } elseif ($data[self::FIELD_LANGUAGE] instanceof FHIRCode) { $this->addLanguage($data[self::FIELD_LANGUAGE]); - } elseif ($ext && is_scalar($data[self::FIELD_LANGUAGE])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_LANGUAGE])) { $this->addLanguage(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_LANGUAGE]] + $ext)); } else { $this->addLanguage(new FHIRCode($data[self::FIELD_LANGUAGE])); @@ -259,17 +280,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_PROPERTY])) { foreach($data[self::FIELD_PROPERTY] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCode) { $this->addProperty($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addProperty(new FHIRCode([FHIRCode::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addProperty(new FHIRCode([FHIRCode::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addProperty(new FHIRCode(array_merge($v, $ext[$i]))); + } } else { $this->addProperty(new FHIRCode($v)); } } } elseif ($data[self::FIELD_PROPERTY] instanceof FHIRCode) { $this->addProperty($data[self::FIELD_PROPERTY]); - } elseif ($ext && is_scalar($data[self::FIELD_PROPERTY])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_PROPERTY])) { $this->addProperty(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_PROPERTY]] + $ext)); } else { $this->addProperty(new FHIRCode($data[self::FIELD_PROPERTY])); @@ -723,7 +751,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getCompositional())) { $v->xmlSerialize($sxe->addChild(self::FIELD_COMPOSITIONAL, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getFilter())) { foreach($vs as $v) { if (null === $v) { @@ -732,6 +759,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_FILTER, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getIsDefault())) { $v->xmlSerialize($sxe->addChild(self::FIELD_IS_DEFAULT, null, $v->_getFHIRXMLNamespace())); } @@ -743,6 +771,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_LANGUAGE, null, $v->_getFHIRXMLNamespace())); } } + if ([] !== ($vs = $this->getProperty())) { foreach($vs as $v) { if (null === $v) { @@ -751,6 +780,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_PROPERTY, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } @@ -761,19 +791,40 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getCode())) { - $a[self::FIELD_CODE] = $v->getValue(); - $a[self::FIELD_CODE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CODE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CODE_EXT] = $enc; + } + } else { + $a[self::FIELD_CODE] = $v; + } } if (null !== ($v = $this->getCompositional())) { - $a[self::FIELD_COMPOSITIONAL] = $v->getValue(); - $a[self::FIELD_COMPOSITIONAL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_COMPOSITIONAL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_COMPOSITIONAL_EXT] = $enc; + } + } else { + $a[self::FIELD_COMPOSITIONAL] = $v; + } } if ([] !== ($vs = $this->getFilter())) { $a[self::FIELD_FILTER] = $vs; } if (null !== ($v = $this->getIsDefault())) { - $a[self::FIELD_IS_DEFAULT] = $v->getValue(); - $a[self::FIELD_IS_DEFAULT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IS_DEFAULT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IS_DEFAULT_EXT] = $enc; + } + } else { + $a[self::FIELD_IS_DEFAULT] = $v; + } } if ([] !== ($vs = $this->getLanguage())) { $a[self::FIELD_LANGUAGE] = []; @@ -781,8 +832,17 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_LANGUAGE][] = $v->getValue(); - $a[self::FIELD_LANGUAGE_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_LANGUAGE][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_LANGUAGE_EXT][] = $enc; + } else { + $a[self::FIELD_LANGUAGE_EXT][] = null; + } + } else { + $a[self::FIELD_LANGUAGE][] = $v; + } } } if ([] !== ($vs = $this->getProperty())) { @@ -791,8 +851,17 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_PROPERTY][] = $v->getValue(); - $a[self::FIELD_PROPERTY_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PROPERTY][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PROPERTY_EXT][] = $enc; + } else { + $a[self::FIELD_PROPERTY_EXT][] = null; + } + } else { + $a[self::FIELD_PROPERTY][] = $v; + } } } return $a; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRTestReport/FHIRTestReportAction.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRTestReport/FHIRTestReportAction.php index 296cab4739..399057ce7e 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRTestReport/FHIRTestReportAction.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRTestReport/FHIRTestReportAction.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -76,10 +76,6 @@ class FHIRTestReportAction extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_TEST_REPORT_DOT_ACTION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ASSERT = 'assert'; const FIELD_OPERATION = 'operation'; @@ -101,6 +97,9 @@ class FHIRTestReportAction extends FHIRBackboneElement */ protected $operation = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRTestReportAction Constructor * @param null|array $data @@ -290,11 +289,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getAssert())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ASSERT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOperation())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OPERATION, null, $v->_getFHIRXMLNamespace())); } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRTestReport/FHIRTestReportAction1.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRTestReport/FHIRTestReportAction1.php index bdf2251342..cf89efb887 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRTestReport/FHIRTestReportAction1.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRTestReport/FHIRTestReportAction1.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -76,10 +76,6 @@ class FHIRTestReportAction1 extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_TEST_REPORT_DOT_ACTION_1; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ASSERT = 'assert'; const FIELD_OPERATION = 'operation'; @@ -101,6 +97,9 @@ class FHIRTestReportAction1 extends FHIRBackboneElement */ protected $operation = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRTestReportAction1 Constructor * @param null|array $data @@ -290,11 +289,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getAssert())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ASSERT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOperation())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OPERATION, null, $v->_getFHIRXMLNamespace())); } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRTestReport/FHIRTestReportAction2.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRTestReport/FHIRTestReportAction2.php index 5e13c70fe3..ef8b339dc4 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRTestReport/FHIRTestReportAction2.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRTestReport/FHIRTestReportAction2.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -76,10 +76,6 @@ class FHIRTestReportAction2 extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_TEST_REPORT_DOT_ACTION_2; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_OPERATION = 'operation'; /** @@ -91,6 +87,9 @@ class FHIRTestReportAction2 extends FHIRBackboneElement */ protected $operation = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRTestReportAction2 Constructor * @param null|array $data @@ -244,7 +243,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getOperation())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OPERATION, null, $v->_getFHIRXMLNamespace())); } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRTestReport/FHIRTestReportAssert.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRTestReport/FHIRTestReportAssert.php index 1bb1307a05..334a1ebf6d 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRTestReport/FHIRTestReportAssert.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRTestReport/FHIRTestReportAssert.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRTestReportAssert extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_TEST_REPORT_DOT_ASSERT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DETAIL = 'detail'; const FIELD_DETAIL_EXT = '_detail'; const FIELD_MESSAGE = 'message'; @@ -126,6 +122,9 @@ class FHIRTestReportAssert extends FHIRBackboneElement */ protected $result = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRTestReportAssert Constructor * @param null|array $data @@ -148,8 +147,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DETAIL] instanceof FHIRString) { $this->setDetail($data[self::FIELD_DETAIL]); - } elseif ($ext && is_scalar($data[self::FIELD_DETAIL])) { - $this->setDetail(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DETAIL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DETAIL])) { + $this->setDetail(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DETAIL]] + $ext)); + } else if (is_array($data[self::FIELD_DETAIL])) { + $this->setDetail(new FHIRString(array_merge($ext, $data[self::FIELD_DETAIL]))); + } } else { $this->setDetail(new FHIRString($data[self::FIELD_DETAIL])); } @@ -160,8 +163,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MESSAGE] instanceof FHIRMarkdown) { $this->setMessage($data[self::FIELD_MESSAGE]); - } elseif ($ext && is_scalar($data[self::FIELD_MESSAGE])) { - $this->setMessage(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_MESSAGE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MESSAGE])) { + $this->setMessage(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_MESSAGE]] + $ext)); + } else if (is_array($data[self::FIELD_MESSAGE])) { + $this->setMessage(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_MESSAGE]))); + } } else { $this->setMessage(new FHIRMarkdown($data[self::FIELD_MESSAGE])); } @@ -172,8 +179,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_RESULT] instanceof FHIRTestReportActionResult) { $this->setResult($data[self::FIELD_RESULT]); - } elseif ($ext && is_scalar($data[self::FIELD_RESULT])) { - $this->setResult(new FHIRTestReportActionResult([FHIRTestReportActionResult::FIELD_VALUE => $data[self::FIELD_RESULT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_RESULT])) { + $this->setResult(new FHIRTestReportActionResult([FHIRTestReportActionResult::FIELD_VALUE => $data[self::FIELD_RESULT]] + $ext)); + } else if (is_array($data[self::FIELD_RESULT])) { + $this->setResult(new FHIRTestReportActionResult(array_merge($ext, $data[self::FIELD_RESULT]))); + } } else { $this->setResult(new FHIRTestReportActionResult($data[self::FIELD_RESULT])); } @@ -412,7 +423,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getMessage())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MESSAGE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getResult())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RESULT, null, $v->_getFHIRXMLNamespace())); } @@ -426,15 +436,37 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getDetail())) { - $a[self::FIELD_DETAIL] = $v->getValue(); - $a[self::FIELD_DETAIL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DETAIL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DETAIL_EXT] = $enc; + } + } else { + $a[self::FIELD_DETAIL] = $v; + } } if (null !== ($v = $this->getMessage())) { - $a[self::FIELD_MESSAGE] = $v->getValue(); - $a[self::FIELD_MESSAGE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MESSAGE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MESSAGE_EXT] = $enc; + } + } else { + $a[self::FIELD_MESSAGE] = $v; + } } if (null !== ($v = $this->getResult())) { - $a[self::FIELD_RESULT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_RESULT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_RESULT_EXT] = $enc; + } + } else { + $a[self::FIELD_RESULT] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRTestReport/FHIRTestReportOperation.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRTestReport/FHIRTestReportOperation.php index 08b23237e2..8349d69b31 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRTestReport/FHIRTestReportOperation.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRTestReport/FHIRTestReportOperation.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRTestReportOperation extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_TEST_REPORT_DOT_OPERATION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DETAIL = 'detail'; const FIELD_DETAIL_EXT = '_detail'; const FIELD_MESSAGE = 'message'; @@ -126,6 +122,9 @@ class FHIRTestReportOperation extends FHIRBackboneElement */ protected $result = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRTestReportOperation Constructor * @param null|array $data @@ -148,8 +147,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DETAIL] instanceof FHIRUri) { $this->setDetail($data[self::FIELD_DETAIL]); - } elseif ($ext && is_scalar($data[self::FIELD_DETAIL])) { - $this->setDetail(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_DETAIL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DETAIL])) { + $this->setDetail(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_DETAIL]] + $ext)); + } else if (is_array($data[self::FIELD_DETAIL])) { + $this->setDetail(new FHIRUri(array_merge($ext, $data[self::FIELD_DETAIL]))); + } } else { $this->setDetail(new FHIRUri($data[self::FIELD_DETAIL])); } @@ -160,8 +163,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MESSAGE] instanceof FHIRMarkdown) { $this->setMessage($data[self::FIELD_MESSAGE]); - } elseif ($ext && is_scalar($data[self::FIELD_MESSAGE])) { - $this->setMessage(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_MESSAGE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MESSAGE])) { + $this->setMessage(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_MESSAGE]] + $ext)); + } else if (is_array($data[self::FIELD_MESSAGE])) { + $this->setMessage(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_MESSAGE]))); + } } else { $this->setMessage(new FHIRMarkdown($data[self::FIELD_MESSAGE])); } @@ -172,8 +179,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_RESULT] instanceof FHIRTestReportActionResult) { $this->setResult($data[self::FIELD_RESULT]); - } elseif ($ext && is_scalar($data[self::FIELD_RESULT])) { - $this->setResult(new FHIRTestReportActionResult([FHIRTestReportActionResult::FIELD_VALUE => $data[self::FIELD_RESULT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_RESULT])) { + $this->setResult(new FHIRTestReportActionResult([FHIRTestReportActionResult::FIELD_VALUE => $data[self::FIELD_RESULT]] + $ext)); + } else if (is_array($data[self::FIELD_RESULT])) { + $this->setResult(new FHIRTestReportActionResult(array_merge($ext, $data[self::FIELD_RESULT]))); + } } else { $this->setResult(new FHIRTestReportActionResult($data[self::FIELD_RESULT])); } @@ -412,7 +423,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getMessage())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MESSAGE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getResult())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RESULT, null, $v->_getFHIRXMLNamespace())); } @@ -426,15 +436,37 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getDetail())) { - $a[self::FIELD_DETAIL] = $v->getValue(); - $a[self::FIELD_DETAIL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DETAIL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DETAIL_EXT] = $enc; + } + } else { + $a[self::FIELD_DETAIL] = $v; + } } if (null !== ($v = $this->getMessage())) { - $a[self::FIELD_MESSAGE] = $v->getValue(); - $a[self::FIELD_MESSAGE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MESSAGE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MESSAGE_EXT] = $enc; + } + } else { + $a[self::FIELD_MESSAGE] = $v; + } } if (null !== ($v = $this->getResult())) { - $a[self::FIELD_RESULT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_RESULT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_RESULT_EXT] = $enc; + } + } else { + $a[self::FIELD_RESULT] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRTestReport/FHIRTestReportParticipant.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRTestReport/FHIRTestReportParticipant.php index 30fcaa6f74..4ba31daed1 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRTestReport/FHIRTestReportParticipant.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRTestReport/FHIRTestReportParticipant.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRTestReportParticipant extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_TEST_REPORT_DOT_PARTICIPANT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DISPLAY = 'display'; const FIELD_DISPLAY_EXT = '_display'; const FIELD_TYPE = 'type'; @@ -122,6 +118,9 @@ class FHIRTestReportParticipant extends FHIRBackboneElement */ protected $uri = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRTestReportParticipant Constructor * @param null|array $data @@ -144,8 +143,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DISPLAY] instanceof FHIRString) { $this->setDisplay($data[self::FIELD_DISPLAY]); - } elseif ($ext && is_scalar($data[self::FIELD_DISPLAY])) { - $this->setDisplay(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DISPLAY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DISPLAY])) { + $this->setDisplay(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DISPLAY]] + $ext)); + } else if (is_array($data[self::FIELD_DISPLAY])) { + $this->setDisplay(new FHIRString(array_merge($ext, $data[self::FIELD_DISPLAY]))); + } } else { $this->setDisplay(new FHIRString($data[self::FIELD_DISPLAY])); } @@ -156,8 +159,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TYPE] instanceof FHIRTestReportParticipantType) { $this->setType($data[self::FIELD_TYPE]); - } elseif ($ext && is_scalar($data[self::FIELD_TYPE])) { - $this->setType(new FHIRTestReportParticipantType([FHIRTestReportParticipantType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TYPE])) { + $this->setType(new FHIRTestReportParticipantType([FHIRTestReportParticipantType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } else if (is_array($data[self::FIELD_TYPE])) { + $this->setType(new FHIRTestReportParticipantType(array_merge($ext, $data[self::FIELD_TYPE]))); + } } else { $this->setType(new FHIRTestReportParticipantType($data[self::FIELD_TYPE])); } @@ -168,8 +175,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_URI] instanceof FHIRUri) { $this->setUri($data[self::FIELD_URI]); - } elseif ($ext && is_scalar($data[self::FIELD_URI])) { - $this->setUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URI]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_URI])) { + $this->setUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URI]] + $ext)); + } else if (is_array($data[self::FIELD_URI])) { + $this->setUri(new FHIRUri(array_merge($ext, $data[self::FIELD_URI]))); + } } else { $this->setUri(new FHIRUri($data[self::FIELD_URI])); } @@ -397,7 +408,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDisplay())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DISPLAY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -414,15 +424,37 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getDisplay())) { - $a[self::FIELD_DISPLAY] = $v->getValue(); - $a[self::FIELD_DISPLAY_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DISPLAY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DISPLAY_EXT] = $enc; + } + } else { + $a[self::FIELD_DISPLAY] = $v; + } } if (null !== ($v = $this->getType())) { - $a[self::FIELD_TYPE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TYPE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TYPE_EXT] = $enc; + } + } else { + $a[self::FIELD_TYPE] = $v; + } } if (null !== ($v = $this->getUri())) { - $a[self::FIELD_URI] = $v->getValue(); - $a[self::FIELD_URI_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_URI] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_URI_EXT] = $enc; + } + } else { + $a[self::FIELD_URI] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRTestReport/FHIRTestReportSetup.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRTestReport/FHIRTestReportSetup.php index 305dd7bf66..fb0e3e91a4 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRTestReport/FHIRTestReportSetup.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRTestReport/FHIRTestReportSetup.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -76,10 +76,6 @@ class FHIRTestReportSetup extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_TEST_REPORT_DOT_SETUP; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ACTION = 'action'; /** @@ -91,6 +87,9 @@ class FHIRTestReportSetup extends FHIRBackboneElement */ protected $action = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRTestReportSetup Constructor * @param null|array $data @@ -110,6 +109,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ACTION])) { if (is_array($data[self::FIELD_ACTION])) { foreach($data[self::FIELD_ACTION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRTestReportAction) { $this->addAction($v); } else { @@ -278,7 +280,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getAction())) { foreach($vs as $v) { if (null === $v) { @@ -287,6 +288,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_ACTION, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRTestReport/FHIRTestReportTeardown.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRTestReport/FHIRTestReportTeardown.php index a4d3ad641f..9780ee7c3e 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRTestReport/FHIRTestReportTeardown.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRTestReport/FHIRTestReportTeardown.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -76,10 +76,6 @@ class FHIRTestReportTeardown extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_TEST_REPORT_DOT_TEARDOWN; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ACTION = 'action'; /** @@ -91,6 +87,9 @@ class FHIRTestReportTeardown extends FHIRBackboneElement */ protected $action = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRTestReportTeardown Constructor * @param null|array $data @@ -110,6 +109,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ACTION])) { if (is_array($data[self::FIELD_ACTION])) { foreach($data[self::FIELD_ACTION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRTestReportAction2) { $this->addAction($v); } else { @@ -278,7 +280,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getAction())) { foreach($vs as $v) { if (null === $v) { @@ -287,6 +288,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_ACTION, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRTestReport/FHIRTestReportTest.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRTestReport/FHIRTestReportTest.php index 776600522f..c5e868eccc 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRTestReport/FHIRTestReportTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRTestReport/FHIRTestReportTest.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -77,10 +77,6 @@ class FHIRTestReportTest extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_TEST_REPORT_DOT_TEST; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ACTION = 'action'; const FIELD_DESCRIPTION = 'description'; const FIELD_DESCRIPTION_EXT = '_description'; @@ -119,6 +115,9 @@ class FHIRTestReportTest extends FHIRBackboneElement */ protected $name = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRTestReportTest Constructor * @param null|array $data @@ -138,6 +137,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ACTION])) { if (is_array($data[self::FIELD_ACTION])) { foreach($data[self::FIELD_ACTION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRTestReportAction1) { $this->addAction($v); } else { @@ -156,8 +158,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -168,8 +174,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -420,7 +430,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getAction())) { foreach($vs as $v) { if (null === $v) { @@ -429,6 +438,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_ACTION, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getDescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESCRIPTION, null, $v->_getFHIRXMLNamespace())); } @@ -448,12 +458,26 @@ public function jsonSerialize() $a[self::FIELD_ACTION] = $vs; } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptAction.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptAction.php index 60e42e62ad..bc547950df 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptAction.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptAction.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -77,10 +77,6 @@ class FHIRTestScriptAction extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_TEST_SCRIPT_DOT_ACTION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ASSERT = 'assert'; const FIELD_ASSERT_EXT = '_assert'; const FIELD_OPERATION = 'operation'; @@ -106,6 +102,9 @@ class FHIRTestScriptAction extends FHIRBackboneElement */ protected $operation = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRTestScriptAction Constructor * @param null|array $data @@ -128,8 +127,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ASSERT] instanceof FHIRTestScriptAssert) { $this->setAssert($data[self::FIELD_ASSERT]); - } elseif ($ext && is_scalar($data[self::FIELD_ASSERT])) { - $this->setAssert(new FHIRTestScriptAssert([FHIRTestScriptAssert::FIELD_VALUE => $data[self::FIELD_ASSERT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ASSERT])) { + $this->setAssert(new FHIRTestScriptAssert([FHIRTestScriptAssert::FIELD_VALUE => $data[self::FIELD_ASSERT]] + $ext)); + } else if (is_array($data[self::FIELD_ASSERT])) { + $this->setAssert(new FHIRTestScriptAssert(array_merge($ext, $data[self::FIELD_ASSERT]))); + } } else { $this->setAssert(new FHIRTestScriptAssert($data[self::FIELD_ASSERT])); } @@ -306,11 +309,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getAssert())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ASSERT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOperation())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OPERATION, null, $v->_getFHIRXMLNamespace())); } @@ -324,7 +325,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getAssert())) { - $a[self::FIELD_ASSERT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ASSERT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ASSERT_EXT] = $enc; + } + } else { + $a[self::FIELD_ASSERT] = $v; + } } if (null !== ($v = $this->getOperation())) { $a[self::FIELD_OPERATION] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptAction1.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptAction1.php index 312315dcd3..8fa88556c5 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptAction1.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptAction1.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -77,10 +77,6 @@ class FHIRTestScriptAction1 extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_TEST_SCRIPT_DOT_ACTION_1; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ASSERT = 'assert'; const FIELD_ASSERT_EXT = '_assert'; const FIELD_OPERATION = 'operation'; @@ -106,6 +102,9 @@ class FHIRTestScriptAction1 extends FHIRBackboneElement */ protected $operation = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRTestScriptAction1 Constructor * @param null|array $data @@ -128,8 +127,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ASSERT] instanceof FHIRTestScriptAssert) { $this->setAssert($data[self::FIELD_ASSERT]); - } elseif ($ext && is_scalar($data[self::FIELD_ASSERT])) { - $this->setAssert(new FHIRTestScriptAssert([FHIRTestScriptAssert::FIELD_VALUE => $data[self::FIELD_ASSERT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ASSERT])) { + $this->setAssert(new FHIRTestScriptAssert([FHIRTestScriptAssert::FIELD_VALUE => $data[self::FIELD_ASSERT]] + $ext)); + } else if (is_array($data[self::FIELD_ASSERT])) { + $this->setAssert(new FHIRTestScriptAssert(array_merge($ext, $data[self::FIELD_ASSERT]))); + } } else { $this->setAssert(new FHIRTestScriptAssert($data[self::FIELD_ASSERT])); } @@ -306,11 +309,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getAssert())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ASSERT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOperation())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OPERATION, null, $v->_getFHIRXMLNamespace())); } @@ -324,7 +325,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getAssert())) { - $a[self::FIELD_ASSERT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ASSERT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ASSERT_EXT] = $enc; + } + } else { + $a[self::FIELD_ASSERT] = $v; + } } if (null !== ($v = $this->getOperation())) { $a[self::FIELD_OPERATION] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptAction2.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptAction2.php index d4c2191a64..81315c7fd8 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptAction2.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptAction2.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -77,10 +77,6 @@ class FHIRTestScriptAction2 extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_TEST_SCRIPT_DOT_ACTION_2; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_OPERATION = 'operation'; /** @@ -93,6 +89,9 @@ class FHIRTestScriptAction2 extends FHIRBackboneElement */ protected $operation = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRTestScriptAction2 Constructor * @param null|array $data @@ -248,7 +247,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getOperation())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OPERATION, null, $v->_getFHIRXMLNamespace())); } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptAssert.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptAssert.php index 1e8b20b53b..0d76ceb7a8 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptAssert.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptAssert.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -85,10 +85,6 @@ class FHIRTestScriptAssert extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_TEST_SCRIPT_DOT_ASSERT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_COMPARE_TO_SOURCE_EXPRESSION = 'compareToSourceExpression'; const FIELD_COMPARE_TO_SOURCE_EXPRESSION_EXT = '_compareToSourceExpression'; const FIELD_COMPARE_TO_SOURCE_ID = 'compareToSourceId'; @@ -393,6 +389,9 @@ class FHIRTestScriptAssert extends FHIRBackboneElement */ protected $warningOnly = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRTestScriptAssert Constructor * @param null|array $data @@ -419,8 +418,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_COMPARE_TO_SOURCE_EXPRESSION] instanceof FHIRString) { $this->setCompareToSourceExpression($data[self::FIELD_COMPARE_TO_SOURCE_EXPRESSION]); - } elseif ($ext && is_scalar($data[self::FIELD_COMPARE_TO_SOURCE_EXPRESSION])) { - $this->setCompareToSourceExpression(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_COMPARE_TO_SOURCE_EXPRESSION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_COMPARE_TO_SOURCE_EXPRESSION])) { + $this->setCompareToSourceExpression(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_COMPARE_TO_SOURCE_EXPRESSION]] + $ext)); + } else if (is_array($data[self::FIELD_COMPARE_TO_SOURCE_EXPRESSION])) { + $this->setCompareToSourceExpression(new FHIRString(array_merge($ext, $data[self::FIELD_COMPARE_TO_SOURCE_EXPRESSION]))); + } } else { $this->setCompareToSourceExpression(new FHIRString($data[self::FIELD_COMPARE_TO_SOURCE_EXPRESSION])); } @@ -431,8 +434,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_COMPARE_TO_SOURCE_ID] instanceof FHIRString) { $this->setCompareToSourceId($data[self::FIELD_COMPARE_TO_SOURCE_ID]); - } elseif ($ext && is_scalar($data[self::FIELD_COMPARE_TO_SOURCE_ID])) { - $this->setCompareToSourceId(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_COMPARE_TO_SOURCE_ID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_COMPARE_TO_SOURCE_ID])) { + $this->setCompareToSourceId(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_COMPARE_TO_SOURCE_ID]] + $ext)); + } else if (is_array($data[self::FIELD_COMPARE_TO_SOURCE_ID])) { + $this->setCompareToSourceId(new FHIRString(array_merge($ext, $data[self::FIELD_COMPARE_TO_SOURCE_ID]))); + } } else { $this->setCompareToSourceId(new FHIRString($data[self::FIELD_COMPARE_TO_SOURCE_ID])); } @@ -443,8 +450,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_COMPARE_TO_SOURCE_PATH] instanceof FHIRString) { $this->setCompareToSourcePath($data[self::FIELD_COMPARE_TO_SOURCE_PATH]); - } elseif ($ext && is_scalar($data[self::FIELD_COMPARE_TO_SOURCE_PATH])) { - $this->setCompareToSourcePath(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_COMPARE_TO_SOURCE_PATH]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_COMPARE_TO_SOURCE_PATH])) { + $this->setCompareToSourcePath(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_COMPARE_TO_SOURCE_PATH]] + $ext)); + } else if (is_array($data[self::FIELD_COMPARE_TO_SOURCE_PATH])) { + $this->setCompareToSourcePath(new FHIRString(array_merge($ext, $data[self::FIELD_COMPARE_TO_SOURCE_PATH]))); + } } else { $this->setCompareToSourcePath(new FHIRString($data[self::FIELD_COMPARE_TO_SOURCE_PATH])); } @@ -455,8 +466,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CONTENT_TYPE] instanceof FHIRCode) { $this->setContentType($data[self::FIELD_CONTENT_TYPE]); - } elseif ($ext && is_scalar($data[self::FIELD_CONTENT_TYPE])) { - $this->setContentType(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_CONTENT_TYPE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CONTENT_TYPE])) { + $this->setContentType(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_CONTENT_TYPE]] + $ext)); + } else if (is_array($data[self::FIELD_CONTENT_TYPE])) { + $this->setContentType(new FHIRCode(array_merge($ext, $data[self::FIELD_CONTENT_TYPE]))); + } } else { $this->setContentType(new FHIRCode($data[self::FIELD_CONTENT_TYPE])); } @@ -467,8 +482,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -479,8 +498,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DIRECTION] instanceof FHIRAssertionDirectionType) { $this->setDirection($data[self::FIELD_DIRECTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DIRECTION])) { - $this->setDirection(new FHIRAssertionDirectionType([FHIRAssertionDirectionType::FIELD_VALUE => $data[self::FIELD_DIRECTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DIRECTION])) { + $this->setDirection(new FHIRAssertionDirectionType([FHIRAssertionDirectionType::FIELD_VALUE => $data[self::FIELD_DIRECTION]] + $ext)); + } else if (is_array($data[self::FIELD_DIRECTION])) { + $this->setDirection(new FHIRAssertionDirectionType(array_merge($ext, $data[self::FIELD_DIRECTION]))); + } } else { $this->setDirection(new FHIRAssertionDirectionType($data[self::FIELD_DIRECTION])); } @@ -491,8 +514,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EXPRESSION] instanceof FHIRString) { $this->setExpression($data[self::FIELD_EXPRESSION]); - } elseif ($ext && is_scalar($data[self::FIELD_EXPRESSION])) { - $this->setExpression(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_EXPRESSION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EXPRESSION])) { + $this->setExpression(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_EXPRESSION]] + $ext)); + } else if (is_array($data[self::FIELD_EXPRESSION])) { + $this->setExpression(new FHIRString(array_merge($ext, $data[self::FIELD_EXPRESSION]))); + } } else { $this->setExpression(new FHIRString($data[self::FIELD_EXPRESSION])); } @@ -503,8 +530,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_HEADER_FIELD] instanceof FHIRString) { $this->setHeaderField($data[self::FIELD_HEADER_FIELD]); - } elseif ($ext && is_scalar($data[self::FIELD_HEADER_FIELD])) { - $this->setHeaderField(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_HEADER_FIELD]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_HEADER_FIELD])) { + $this->setHeaderField(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_HEADER_FIELD]] + $ext)); + } else if (is_array($data[self::FIELD_HEADER_FIELD])) { + $this->setHeaderField(new FHIRString(array_merge($ext, $data[self::FIELD_HEADER_FIELD]))); + } } else { $this->setHeaderField(new FHIRString($data[self::FIELD_HEADER_FIELD])); } @@ -515,8 +546,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_LABEL] instanceof FHIRString) { $this->setLabel($data[self::FIELD_LABEL]); - } elseif ($ext && is_scalar($data[self::FIELD_LABEL])) { - $this->setLabel(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_LABEL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_LABEL])) { + $this->setLabel(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_LABEL]] + $ext)); + } else if (is_array($data[self::FIELD_LABEL])) { + $this->setLabel(new FHIRString(array_merge($ext, $data[self::FIELD_LABEL]))); + } } else { $this->setLabel(new FHIRString($data[self::FIELD_LABEL])); } @@ -527,8 +562,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MINIMUM_ID] instanceof FHIRString) { $this->setMinimumId($data[self::FIELD_MINIMUM_ID]); - } elseif ($ext && is_scalar($data[self::FIELD_MINIMUM_ID])) { - $this->setMinimumId(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_MINIMUM_ID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MINIMUM_ID])) { + $this->setMinimumId(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_MINIMUM_ID]] + $ext)); + } else if (is_array($data[self::FIELD_MINIMUM_ID])) { + $this->setMinimumId(new FHIRString(array_merge($ext, $data[self::FIELD_MINIMUM_ID]))); + } } else { $this->setMinimumId(new FHIRString($data[self::FIELD_MINIMUM_ID])); } @@ -539,8 +578,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAVIGATION_LINKS] instanceof FHIRBoolean) { $this->setNavigationLinks($data[self::FIELD_NAVIGATION_LINKS]); - } elseif ($ext && is_scalar($data[self::FIELD_NAVIGATION_LINKS])) { - $this->setNavigationLinks(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_NAVIGATION_LINKS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAVIGATION_LINKS])) { + $this->setNavigationLinks(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_NAVIGATION_LINKS]] + $ext)); + } else if (is_array($data[self::FIELD_NAVIGATION_LINKS])) { + $this->setNavigationLinks(new FHIRBoolean(array_merge($ext, $data[self::FIELD_NAVIGATION_LINKS]))); + } } else { $this->setNavigationLinks(new FHIRBoolean($data[self::FIELD_NAVIGATION_LINKS])); } @@ -551,8 +594,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_OPERATOR] instanceof FHIRAssertionOperatorType) { $this->setOperator($data[self::FIELD_OPERATOR]); - } elseif ($ext && is_scalar($data[self::FIELD_OPERATOR])) { - $this->setOperator(new FHIRAssertionOperatorType([FHIRAssertionOperatorType::FIELD_VALUE => $data[self::FIELD_OPERATOR]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_OPERATOR])) { + $this->setOperator(new FHIRAssertionOperatorType([FHIRAssertionOperatorType::FIELD_VALUE => $data[self::FIELD_OPERATOR]] + $ext)); + } else if (is_array($data[self::FIELD_OPERATOR])) { + $this->setOperator(new FHIRAssertionOperatorType(array_merge($ext, $data[self::FIELD_OPERATOR]))); + } } else { $this->setOperator(new FHIRAssertionOperatorType($data[self::FIELD_OPERATOR])); } @@ -563,8 +610,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PATH] instanceof FHIRString) { $this->setPath($data[self::FIELD_PATH]); - } elseif ($ext && is_scalar($data[self::FIELD_PATH])) { - $this->setPath(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PATH]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PATH])) { + $this->setPath(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PATH]] + $ext)); + } else if (is_array($data[self::FIELD_PATH])) { + $this->setPath(new FHIRString(array_merge($ext, $data[self::FIELD_PATH]))); + } } else { $this->setPath(new FHIRString($data[self::FIELD_PATH])); } @@ -575,8 +626,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_REQUEST_METHOD] instanceof FHIRTestScriptRequestMethodCode) { $this->setRequestMethod($data[self::FIELD_REQUEST_METHOD]); - } elseif ($ext && is_scalar($data[self::FIELD_REQUEST_METHOD])) { - $this->setRequestMethod(new FHIRTestScriptRequestMethodCode([FHIRTestScriptRequestMethodCode::FIELD_VALUE => $data[self::FIELD_REQUEST_METHOD]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_REQUEST_METHOD])) { + $this->setRequestMethod(new FHIRTestScriptRequestMethodCode([FHIRTestScriptRequestMethodCode::FIELD_VALUE => $data[self::FIELD_REQUEST_METHOD]] + $ext)); + } else if (is_array($data[self::FIELD_REQUEST_METHOD])) { + $this->setRequestMethod(new FHIRTestScriptRequestMethodCode(array_merge($ext, $data[self::FIELD_REQUEST_METHOD]))); + } } else { $this->setRequestMethod(new FHIRTestScriptRequestMethodCode($data[self::FIELD_REQUEST_METHOD])); } @@ -587,8 +642,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_REQUEST_URL] instanceof FHIRString) { $this->setRequestURL($data[self::FIELD_REQUEST_URL]); - } elseif ($ext && is_scalar($data[self::FIELD_REQUEST_URL])) { - $this->setRequestURL(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_REQUEST_URL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_REQUEST_URL])) { + $this->setRequestURL(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_REQUEST_URL]] + $ext)); + } else if (is_array($data[self::FIELD_REQUEST_URL])) { + $this->setRequestURL(new FHIRString(array_merge($ext, $data[self::FIELD_REQUEST_URL]))); + } } else { $this->setRequestURL(new FHIRString($data[self::FIELD_REQUEST_URL])); } @@ -599,8 +658,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_RESOURCE] instanceof FHIRCode) { $this->setResource($data[self::FIELD_RESOURCE]); - } elseif ($ext && is_scalar($data[self::FIELD_RESOURCE])) { - $this->setResource(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_RESOURCE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_RESOURCE])) { + $this->setResource(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_RESOURCE]] + $ext)); + } else if (is_array($data[self::FIELD_RESOURCE])) { + $this->setResource(new FHIRCode(array_merge($ext, $data[self::FIELD_RESOURCE]))); + } } else { $this->setResource(new FHIRCode($data[self::FIELD_RESOURCE])); } @@ -611,8 +674,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_RESPONSE] instanceof FHIRAssertionResponseTypes) { $this->setResponse($data[self::FIELD_RESPONSE]); - } elseif ($ext && is_scalar($data[self::FIELD_RESPONSE])) { - $this->setResponse(new FHIRAssertionResponseTypes([FHIRAssertionResponseTypes::FIELD_VALUE => $data[self::FIELD_RESPONSE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_RESPONSE])) { + $this->setResponse(new FHIRAssertionResponseTypes([FHIRAssertionResponseTypes::FIELD_VALUE => $data[self::FIELD_RESPONSE]] + $ext)); + } else if (is_array($data[self::FIELD_RESPONSE])) { + $this->setResponse(new FHIRAssertionResponseTypes(array_merge($ext, $data[self::FIELD_RESPONSE]))); + } } else { $this->setResponse(new FHIRAssertionResponseTypes($data[self::FIELD_RESPONSE])); } @@ -623,8 +690,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_RESPONSE_CODE] instanceof FHIRString) { $this->setResponseCode($data[self::FIELD_RESPONSE_CODE]); - } elseif ($ext && is_scalar($data[self::FIELD_RESPONSE_CODE])) { - $this->setResponseCode(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_RESPONSE_CODE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_RESPONSE_CODE])) { + $this->setResponseCode(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_RESPONSE_CODE]] + $ext)); + } else if (is_array($data[self::FIELD_RESPONSE_CODE])) { + $this->setResponseCode(new FHIRString(array_merge($ext, $data[self::FIELD_RESPONSE_CODE]))); + } } else { $this->setResponseCode(new FHIRString($data[self::FIELD_RESPONSE_CODE])); } @@ -635,8 +706,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SOURCE_ID] instanceof FHIRId) { $this->setSourceId($data[self::FIELD_SOURCE_ID]); - } elseif ($ext && is_scalar($data[self::FIELD_SOURCE_ID])) { - $this->setSourceId(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_SOURCE_ID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SOURCE_ID])) { + $this->setSourceId(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_SOURCE_ID]] + $ext)); + } else if (is_array($data[self::FIELD_SOURCE_ID])) { + $this->setSourceId(new FHIRId(array_merge($ext, $data[self::FIELD_SOURCE_ID]))); + } } else { $this->setSourceId(new FHIRId($data[self::FIELD_SOURCE_ID])); } @@ -647,8 +722,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALIDATE_PROFILE_ID] instanceof FHIRId) { $this->setValidateProfileId($data[self::FIELD_VALIDATE_PROFILE_ID]); - } elseif ($ext && is_scalar($data[self::FIELD_VALIDATE_PROFILE_ID])) { - $this->setValidateProfileId(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_VALIDATE_PROFILE_ID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALIDATE_PROFILE_ID])) { + $this->setValidateProfileId(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_VALIDATE_PROFILE_ID]] + $ext)); + } else if (is_array($data[self::FIELD_VALIDATE_PROFILE_ID])) { + $this->setValidateProfileId(new FHIRId(array_merge($ext, $data[self::FIELD_VALIDATE_PROFILE_ID]))); + } } else { $this->setValidateProfileId(new FHIRId($data[self::FIELD_VALIDATE_PROFILE_ID])); } @@ -659,8 +738,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE] instanceof FHIRString) { $this->setValue($data[self::FIELD_VALUE]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE])) { - $this->setValue(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VALUE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE])) { + $this->setValue(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VALUE]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE])) { + $this->setValue(new FHIRString(array_merge($ext, $data[self::FIELD_VALUE]))); + } } else { $this->setValue(new FHIRString($data[self::FIELD_VALUE])); } @@ -671,8 +754,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_WARNING_ONLY] instanceof FHIRBoolean) { $this->setWarningOnly($data[self::FIELD_WARNING_ONLY]); - } elseif ($ext && is_scalar($data[self::FIELD_WARNING_ONLY])) { - $this->setWarningOnly(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_WARNING_ONLY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_WARNING_ONLY])) { + $this->setWarningOnly(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_WARNING_ONLY]] + $ext)); + } else if (is_array($data[self::FIELD_WARNING_ONLY])) { + $this->setWarningOnly(new FHIRBoolean(array_merge($ext, $data[self::FIELD_WARNING_ONLY]))); + } } else { $this->setWarningOnly(new FHIRBoolean($data[self::FIELD_WARNING_ONLY])); } @@ -1751,7 +1838,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESCRIPTION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDirection())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DIRECTION, null, $v->_getFHIRXMLNamespace())); } @@ -1770,14 +1856,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getNavigationLinks())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NAVIGATION_LINKS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOperator())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OPERATOR, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getPath())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATH, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRequestMethod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REQUEST_METHOD, null, $v->_getFHIRXMLNamespace())); } @@ -1787,7 +1871,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getResource())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RESOURCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getResponse())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RESPONSE, null, $v->_getFHIRXMLNamespace())); } @@ -1801,6 +1884,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_VALIDATE_PROFILE_ID, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getValue())) { + $sxe->addAttribute(self::FIELD_VALUE, (string)$v); $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getWarningOnly())) { @@ -1816,88 +1900,246 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getCompareToSourceExpression())) { - $a[self::FIELD_COMPARE_TO_SOURCE_EXPRESSION] = $v->getValue(); - $a[self::FIELD_COMPARE_TO_SOURCE_EXPRESSION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_COMPARE_TO_SOURCE_EXPRESSION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_COMPARE_TO_SOURCE_EXPRESSION_EXT] = $enc; + } + } else { + $a[self::FIELD_COMPARE_TO_SOURCE_EXPRESSION] = $v; + } } if (null !== ($v = $this->getCompareToSourceId())) { - $a[self::FIELD_COMPARE_TO_SOURCE_ID] = $v->getValue(); - $a[self::FIELD_COMPARE_TO_SOURCE_ID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_COMPARE_TO_SOURCE_ID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_COMPARE_TO_SOURCE_ID_EXT] = $enc; + } + } else { + $a[self::FIELD_COMPARE_TO_SOURCE_ID] = $v; + } } if (null !== ($v = $this->getCompareToSourcePath())) { - $a[self::FIELD_COMPARE_TO_SOURCE_PATH] = $v->getValue(); - $a[self::FIELD_COMPARE_TO_SOURCE_PATH_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_COMPARE_TO_SOURCE_PATH] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_COMPARE_TO_SOURCE_PATH_EXT] = $enc; + } + } else { + $a[self::FIELD_COMPARE_TO_SOURCE_PATH] = $v; + } } if (null !== ($v = $this->getContentType())) { - $a[self::FIELD_CONTENT_TYPE] = $v->getValue(); - $a[self::FIELD_CONTENT_TYPE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CONTENT_TYPE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CONTENT_TYPE_EXT] = $enc; + } + } else { + $a[self::FIELD_CONTENT_TYPE] = $v; + } } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if (null !== ($v = $this->getDirection())) { - $a[self::FIELD_DIRECTION] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DIRECTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DIRECTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DIRECTION] = $v; + } } if (null !== ($v = $this->getExpression())) { - $a[self::FIELD_EXPRESSION] = $v->getValue(); - $a[self::FIELD_EXPRESSION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EXPRESSION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EXPRESSION_EXT] = $enc; + } + } else { + $a[self::FIELD_EXPRESSION] = $v; + } } if (null !== ($v = $this->getHeaderField())) { - $a[self::FIELD_HEADER_FIELD] = $v->getValue(); - $a[self::FIELD_HEADER_FIELD_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_HEADER_FIELD] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_HEADER_FIELD_EXT] = $enc; + } + } else { + $a[self::FIELD_HEADER_FIELD] = $v; + } } if (null !== ($v = $this->getLabel())) { - $a[self::FIELD_LABEL] = $v->getValue(); - $a[self::FIELD_LABEL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_LABEL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_LABEL_EXT] = $enc; + } + } else { + $a[self::FIELD_LABEL] = $v; + } } if (null !== ($v = $this->getMinimumId())) { - $a[self::FIELD_MINIMUM_ID] = $v->getValue(); - $a[self::FIELD_MINIMUM_ID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MINIMUM_ID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MINIMUM_ID_EXT] = $enc; + } + } else { + $a[self::FIELD_MINIMUM_ID] = $v; + } } if (null !== ($v = $this->getNavigationLinks())) { - $a[self::FIELD_NAVIGATION_LINKS] = $v->getValue(); - $a[self::FIELD_NAVIGATION_LINKS_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAVIGATION_LINKS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAVIGATION_LINKS_EXT] = $enc; + } + } else { + $a[self::FIELD_NAVIGATION_LINKS] = $v; + } } if (null !== ($v = $this->getOperator())) { - $a[self::FIELD_OPERATOR] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_OPERATOR] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_OPERATOR_EXT] = $enc; + } + } else { + $a[self::FIELD_OPERATOR] = $v; + } } if (null !== ($v = $this->getPath())) { - $a[self::FIELD_PATH] = $v->getValue(); - $a[self::FIELD_PATH_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PATH] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PATH_EXT] = $enc; + } + } else { + $a[self::FIELD_PATH] = $v; + } } if (null !== ($v = $this->getRequestMethod())) { - $a[self::FIELD_REQUEST_METHOD] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_REQUEST_METHOD] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_REQUEST_METHOD_EXT] = $enc; + } + } else { + $a[self::FIELD_REQUEST_METHOD] = $v; + } } if (null !== ($v = $this->getRequestURL())) { - $a[self::FIELD_REQUEST_URL] = $v->getValue(); - $a[self::FIELD_REQUEST_URL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_REQUEST_URL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_REQUEST_URL_EXT] = $enc; + } + } else { + $a[self::FIELD_REQUEST_URL] = $v; + } } if (null !== ($v = $this->getResource())) { - $a[self::FIELD_RESOURCE] = $v->getValue(); - $a[self::FIELD_RESOURCE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_RESOURCE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_RESOURCE_EXT] = $enc; + } + } else { + $a[self::FIELD_RESOURCE] = $v; + } } if (null !== ($v = $this->getResponse())) { - $a[self::FIELD_RESPONSE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_RESPONSE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_RESPONSE_EXT] = $enc; + } + } else { + $a[self::FIELD_RESPONSE] = $v; + } } if (null !== ($v = $this->getResponseCode())) { - $a[self::FIELD_RESPONSE_CODE] = $v->getValue(); - $a[self::FIELD_RESPONSE_CODE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_RESPONSE_CODE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_RESPONSE_CODE_EXT] = $enc; + } + } else { + $a[self::FIELD_RESPONSE_CODE] = $v; + } } if (null !== ($v = $this->getSourceId())) { - $a[self::FIELD_SOURCE_ID] = $v->getValue(); - $a[self::FIELD_SOURCE_ID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SOURCE_ID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SOURCE_ID_EXT] = $enc; + } + } else { + $a[self::FIELD_SOURCE_ID] = $v; + } } if (null !== ($v = $this->getValidateProfileId())) { - $a[self::FIELD_VALIDATE_PROFILE_ID] = $v->getValue(); - $a[self::FIELD_VALIDATE_PROFILE_ID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALIDATE_PROFILE_ID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALIDATE_PROFILE_ID_EXT] = $enc; + } + } else { + $a[self::FIELD_VALIDATE_PROFILE_ID] = $v; + } } if (null !== ($v = $this->getValue())) { - $a[self::FIELD_VALUE] = $v->getValue(); - $a[self::FIELD_VALUE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE] = $v; + } } if (null !== ($v = $this->getWarningOnly())) { - $a[self::FIELD_WARNING_ONLY] = $v->getValue(); - $a[self::FIELD_WARNING_ONLY_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_WARNING_ONLY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_WARNING_ONLY_EXT] = $enc; + } + } else { + $a[self::FIELD_WARNING_ONLY] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptCapability.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptCapability.php index 7f64d34c78..08397bc69d 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptCapability.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptCapability.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -82,10 +82,6 @@ class FHIRTestScriptCapability extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_TEST_SCRIPT_DOT_CAPABILITY; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CAPABILITIES = 'capabilities'; const FIELD_CAPABILITIES_EXT = '_capabilities'; const FIELD_DESCRIPTION = 'description'; @@ -183,6 +179,9 @@ class FHIRTestScriptCapability extends FHIRBackboneElement */ protected $validated = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRTestScriptCapability Constructor * @param null|array $data @@ -205,8 +204,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CAPABILITIES] instanceof FHIRCanonical) { $this->setCapabilities($data[self::FIELD_CAPABILITIES]); - } elseif ($ext && is_scalar($data[self::FIELD_CAPABILITIES])) { - $this->setCapabilities(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $data[self::FIELD_CAPABILITIES]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CAPABILITIES])) { + $this->setCapabilities(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $data[self::FIELD_CAPABILITIES]] + $ext)); + } else if (is_array($data[self::FIELD_CAPABILITIES])) { + $this->setCapabilities(new FHIRCanonical(array_merge($ext, $data[self::FIELD_CAPABILITIES]))); + } } else { $this->setCapabilities(new FHIRCanonical($data[self::FIELD_CAPABILITIES])); } @@ -217,8 +220,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -229,8 +236,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESTINATION] instanceof FHIRInteger) { $this->setDestination($data[self::FIELD_DESTINATION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESTINATION])) { - $this->setDestination(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_DESTINATION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESTINATION])) { + $this->setDestination(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_DESTINATION]] + $ext)); + } else if (is_array($data[self::FIELD_DESTINATION])) { + $this->setDestination(new FHIRInteger(array_merge($ext, $data[self::FIELD_DESTINATION]))); + } } else { $this->setDestination(new FHIRInteger($data[self::FIELD_DESTINATION])); } @@ -241,17 +252,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_LINK])) { foreach($data[self::FIELD_LINK] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRUri) { $this->addLink($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addLink(new FHIRUri([FHIRUri::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addLink(new FHIRUri([FHIRUri::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addLink(new FHIRUri(array_merge($v, $ext[$i]))); + } } else { $this->addLink(new FHIRUri($v)); } } } elseif ($data[self::FIELD_LINK] instanceof FHIRUri) { $this->addLink($data[self::FIELD_LINK]); - } elseif ($ext && is_scalar($data[self::FIELD_LINK])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_LINK])) { $this->addLink(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_LINK]] + $ext)); } else { $this->addLink(new FHIRUri($data[self::FIELD_LINK])); @@ -263,17 +281,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_ORIGIN])) { foreach($data[self::FIELD_ORIGIN] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRInteger) { $this->addOrigin($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addOrigin(new FHIRInteger([FHIRInteger::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addOrigin(new FHIRInteger([FHIRInteger::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addOrigin(new FHIRInteger(array_merge($v, $ext[$i]))); + } } else { $this->addOrigin(new FHIRInteger($v)); } } } elseif ($data[self::FIELD_ORIGIN] instanceof FHIRInteger) { $this->addOrigin($data[self::FIELD_ORIGIN]); - } elseif ($ext && is_scalar($data[self::FIELD_ORIGIN])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_ORIGIN])) { $this->addOrigin(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_ORIGIN]] + $ext)); } else { $this->addOrigin(new FHIRInteger($data[self::FIELD_ORIGIN])); @@ -285,8 +310,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_REQUIRED] instanceof FHIRBoolean) { $this->setRequired($data[self::FIELD_REQUIRED]); - } elseif ($ext && is_scalar($data[self::FIELD_REQUIRED])) { - $this->setRequired(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_REQUIRED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_REQUIRED])) { + $this->setRequired(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_REQUIRED]] + $ext)); + } else if (is_array($data[self::FIELD_REQUIRED])) { + $this->setRequired(new FHIRBoolean(array_merge($ext, $data[self::FIELD_REQUIRED]))); + } } else { $this->setRequired(new FHIRBoolean($data[self::FIELD_REQUIRED])); } @@ -297,8 +326,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALIDATED] instanceof FHIRBoolean) { $this->setValidated($data[self::FIELD_VALIDATED]); - } elseif ($ext && is_scalar($data[self::FIELD_VALIDATED])) { - $this->setValidated(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_VALIDATED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALIDATED])) { + $this->setValidated(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_VALIDATED]] + $ext)); + } else if (is_array($data[self::FIELD_VALIDATED])) { + $this->setValidated(new FHIRBoolean(array_merge($ext, $data[self::FIELD_VALIDATED]))); + } } else { $this->setValidated(new FHIRBoolean($data[self::FIELD_VALIDATED])); } @@ -796,6 +829,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_LINK, null, $v->_getFHIRXMLNamespace())); } } + if ([] !== ($vs = $this->getOrigin())) { foreach($vs as $v) { if (null === $v) { @@ -804,6 +838,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_ORIGIN, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getRequired())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REQUIRED, null, $v->_getFHIRXMLNamespace())); } @@ -820,16 +855,37 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getCapabilities())) { - $a[self::FIELD_CAPABILITIES] = $v->getValue(); - $a[self::FIELD_CAPABILITIES_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CAPABILITIES] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CAPABILITIES_EXT] = $enc; + } + } else { + $a[self::FIELD_CAPABILITIES] = $v; + } } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if (null !== ($v = $this->getDestination())) { - $a[self::FIELD_DESTINATION] = $v->getValue(); - $a[self::FIELD_DESTINATION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESTINATION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESTINATION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESTINATION] = $v; + } } if ([] !== ($vs = $this->getLink())) { $a[self::FIELD_LINK] = []; @@ -837,8 +893,17 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_LINK][] = $v->getValue(); - $a[self::FIELD_LINK_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_LINK][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_LINK_EXT][] = $enc; + } else { + $a[self::FIELD_LINK_EXT][] = null; + } + } else { + $a[self::FIELD_LINK][] = $v; + } } } if ([] !== ($vs = $this->getOrigin())) { @@ -847,17 +912,40 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_ORIGIN][] = $v->getValue(); - $a[self::FIELD_ORIGIN_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ORIGIN][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ORIGIN_EXT][] = $enc; + } else { + $a[self::FIELD_ORIGIN_EXT][] = null; + } + } else { + $a[self::FIELD_ORIGIN][] = $v; + } } } if (null !== ($v = $this->getRequired())) { - $a[self::FIELD_REQUIRED] = $v->getValue(); - $a[self::FIELD_REQUIRED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_REQUIRED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_REQUIRED_EXT] = $enc; + } + } else { + $a[self::FIELD_REQUIRED] = $v; + } } if (null !== ($v = $this->getValidated())) { - $a[self::FIELD_VALIDATED] = $v->getValue(); - $a[self::FIELD_VALIDATED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALIDATED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALIDATED_EXT] = $enc; + } + } else { + $a[self::FIELD_VALIDATED] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptDestination.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptDestination.php index eb5611e41d..f5659b2249 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptDestination.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptDestination.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRTestScriptDestination extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_TEST_SCRIPT_DOT_DESTINATION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_INDEX = 'index'; const FIELD_INDEX_EXT = '_index'; const FIELD_PROFILE = 'profile'; @@ -110,6 +106,9 @@ class FHIRTestScriptDestination extends FHIRBackboneElement */ protected $profile = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRTestScriptDestination Constructor * @param null|array $data @@ -132,8 +131,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_INDEX] instanceof FHIRInteger) { $this->setIndex($data[self::FIELD_INDEX]); - } elseif ($ext && is_scalar($data[self::FIELD_INDEX])) { - $this->setIndex(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_INDEX]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_INDEX])) { + $this->setIndex(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_INDEX]] + $ext)); + } else if (is_array($data[self::FIELD_INDEX])) { + $this->setIndex(new FHIRInteger(array_merge($ext, $data[self::FIELD_INDEX]))); + } } else { $this->setIndex(new FHIRInteger($data[self::FIELD_INDEX])); } @@ -328,7 +331,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getIndex())) { $v->xmlSerialize($sxe->addChild(self::FIELD_INDEX, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getProfile())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PROFILE, null, $v->_getFHIRXMLNamespace())); } @@ -342,8 +344,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getIndex())) { - $a[self::FIELD_INDEX] = $v->getValue(); - $a[self::FIELD_INDEX_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_INDEX] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_INDEX_EXT] = $enc; + } + } else { + $a[self::FIELD_INDEX] = $v; + } } if (null !== ($v = $this->getProfile())) { $a[self::FIELD_PROFILE] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptFixture.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptFixture.php index 7e344fed4e..6b0ad9939e 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptFixture.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptFixture.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRTestScriptFixture extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_TEST_SCRIPT_DOT_FIXTURE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_AUTOCREATE = 'autocreate'; const FIELD_AUTOCREATE_EXT = '_autocreate'; const FIELD_AUTODELETE = 'autodelete'; @@ -127,6 +123,9 @@ class FHIRTestScriptFixture extends FHIRBackboneElement */ protected $resource = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRTestScriptFixture Constructor * @param null|array $data @@ -149,8 +148,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_AUTOCREATE] instanceof FHIRBoolean) { $this->setAutocreate($data[self::FIELD_AUTOCREATE]); - } elseif ($ext && is_scalar($data[self::FIELD_AUTOCREATE])) { - $this->setAutocreate(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_AUTOCREATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_AUTOCREATE])) { + $this->setAutocreate(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_AUTOCREATE]] + $ext)); + } else if (is_array($data[self::FIELD_AUTOCREATE])) { + $this->setAutocreate(new FHIRBoolean(array_merge($ext, $data[self::FIELD_AUTOCREATE]))); + } } else { $this->setAutocreate(new FHIRBoolean($data[self::FIELD_AUTOCREATE])); } @@ -161,8 +164,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_AUTODELETE] instanceof FHIRBoolean) { $this->setAutodelete($data[self::FIELD_AUTODELETE]); - } elseif ($ext && is_scalar($data[self::FIELD_AUTODELETE])) { - $this->setAutodelete(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_AUTODELETE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_AUTODELETE])) { + $this->setAutodelete(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_AUTODELETE]] + $ext)); + } else if (is_array($data[self::FIELD_AUTODELETE])) { + $this->setAutodelete(new FHIRBoolean(array_merge($ext, $data[self::FIELD_AUTODELETE]))); + } } else { $this->setAutodelete(new FHIRBoolean($data[self::FIELD_AUTODELETE])); } @@ -412,7 +419,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getAutodelete())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AUTODELETE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getResource())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RESOURCE, null, $v->_getFHIRXMLNamespace())); } @@ -426,12 +432,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getAutocreate())) { - $a[self::FIELD_AUTOCREATE] = $v->getValue(); - $a[self::FIELD_AUTOCREATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_AUTOCREATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_AUTOCREATE_EXT] = $enc; + } + } else { + $a[self::FIELD_AUTOCREATE] = $v; + } } if (null !== ($v = $this->getAutodelete())) { - $a[self::FIELD_AUTODELETE] = $v->getValue(); - $a[self::FIELD_AUTODELETE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_AUTODELETE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_AUTODELETE_EXT] = $enc; + } + } else { + $a[self::FIELD_AUTODELETE] = $v; + } } if (null !== ($v = $this->getResource())) { $a[self::FIELD_RESOURCE] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptLink.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptLink.php index 2952d119f1..b6619b0531 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptLink.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptLink.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRTestScriptLink extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_TEST_SCRIPT_DOT_LINK; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DESCRIPTION = 'description'; const FIELD_DESCRIPTION_EXT = '_description'; const FIELD_URL = 'url'; @@ -110,6 +106,9 @@ class FHIRTestScriptLink extends FHIRBackboneElement */ protected $url = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRTestScriptLink Constructor * @param null|array $data @@ -132,8 +131,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -144,8 +147,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_URL] instanceof FHIRUri) { $this->setUrl($data[self::FIELD_URL]); - } elseif ($ext && is_scalar($data[self::FIELD_URL])) { - $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } else if (is_array($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri(array_merge($ext, $data[self::FIELD_URL]))); + } } else { $this->setUrl(new FHIRUri($data[self::FIELD_URL])); } @@ -355,12 +362,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if (null !== ($v = $this->getUrl())) { - $a[self::FIELD_URL] = $v->getValue(); - $a[self::FIELD_URL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_URL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_URL_EXT] = $enc; + } + } else { + $a[self::FIELD_URL] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptMetadata.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptMetadata.php index 7259355127..6720cf7133 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptMetadata.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptMetadata.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -77,10 +77,6 @@ class FHIRTestScriptMetadata extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_TEST_SCRIPT_DOT_METADATA; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CAPABILITY = 'capability'; const FIELD_LINK = 'link'; @@ -105,6 +101,9 @@ class FHIRTestScriptMetadata extends FHIRBackboneElement */ protected $link = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRTestScriptMetadata Constructor * @param null|array $data @@ -124,6 +123,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CAPABILITY])) { if (is_array($data[self::FIELD_CAPABILITY])) { foreach($data[self::FIELD_CAPABILITY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRTestScriptCapability) { $this->addCapability($v); } else { @@ -139,6 +141,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_LINK])) { if (is_array($data[self::FIELD_LINK])) { foreach($data[self::FIELD_LINK] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRTestScriptLink) { $this->addLink($v); } else { @@ -371,7 +376,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getCapability())) { foreach($vs as $v) { if (null === $v) { @@ -389,6 +393,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_LINK, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptOperation.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptOperation.php index f3fe8a9e6b..8e6fa116f0 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptOperation.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptOperation.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -84,10 +84,6 @@ class FHIRTestScriptOperation extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_TEST_SCRIPT_DOT_OPERATION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ACCEPT = 'accept'; const FIELD_ACCEPT_EXT = '_accept'; const FIELD_CONTENT_TYPE = 'contentType'; @@ -328,6 +324,9 @@ class FHIRTestScriptOperation extends FHIRBackboneElement */ protected $url = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRTestScriptOperation Constructor * @param null|array $data @@ -350,8 +349,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ACCEPT] instanceof FHIRCode) { $this->setAccept($data[self::FIELD_ACCEPT]); - } elseif ($ext && is_scalar($data[self::FIELD_ACCEPT])) { - $this->setAccept(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_ACCEPT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ACCEPT])) { + $this->setAccept(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_ACCEPT]] + $ext)); + } else if (is_array($data[self::FIELD_ACCEPT])) { + $this->setAccept(new FHIRCode(array_merge($ext, $data[self::FIELD_ACCEPT]))); + } } else { $this->setAccept(new FHIRCode($data[self::FIELD_ACCEPT])); } @@ -362,8 +365,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CONTENT_TYPE] instanceof FHIRCode) { $this->setContentType($data[self::FIELD_CONTENT_TYPE]); - } elseif ($ext && is_scalar($data[self::FIELD_CONTENT_TYPE])) { - $this->setContentType(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_CONTENT_TYPE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CONTENT_TYPE])) { + $this->setContentType(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_CONTENT_TYPE]] + $ext)); + } else if (is_array($data[self::FIELD_CONTENT_TYPE])) { + $this->setContentType(new FHIRCode(array_merge($ext, $data[self::FIELD_CONTENT_TYPE]))); + } } else { $this->setContentType(new FHIRCode($data[self::FIELD_CONTENT_TYPE])); } @@ -374,8 +381,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -386,8 +397,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESTINATION] instanceof FHIRInteger) { $this->setDestination($data[self::FIELD_DESTINATION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESTINATION])) { - $this->setDestination(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_DESTINATION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESTINATION])) { + $this->setDestination(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_DESTINATION]] + $ext)); + } else if (is_array($data[self::FIELD_DESTINATION])) { + $this->setDestination(new FHIRInteger(array_merge($ext, $data[self::FIELD_DESTINATION]))); + } } else { $this->setDestination(new FHIRInteger($data[self::FIELD_DESTINATION])); } @@ -398,8 +413,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ENCODE_REQUEST_URL] instanceof FHIRBoolean) { $this->setEncodeRequestUrl($data[self::FIELD_ENCODE_REQUEST_URL]); - } elseif ($ext && is_scalar($data[self::FIELD_ENCODE_REQUEST_URL])) { - $this->setEncodeRequestUrl(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_ENCODE_REQUEST_URL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ENCODE_REQUEST_URL])) { + $this->setEncodeRequestUrl(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_ENCODE_REQUEST_URL]] + $ext)); + } else if (is_array($data[self::FIELD_ENCODE_REQUEST_URL])) { + $this->setEncodeRequestUrl(new FHIRBoolean(array_merge($ext, $data[self::FIELD_ENCODE_REQUEST_URL]))); + } } else { $this->setEncodeRequestUrl(new FHIRBoolean($data[self::FIELD_ENCODE_REQUEST_URL])); } @@ -410,8 +429,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_LABEL] instanceof FHIRString) { $this->setLabel($data[self::FIELD_LABEL]); - } elseif ($ext && is_scalar($data[self::FIELD_LABEL])) { - $this->setLabel(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_LABEL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_LABEL])) { + $this->setLabel(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_LABEL]] + $ext)); + } else if (is_array($data[self::FIELD_LABEL])) { + $this->setLabel(new FHIRString(array_merge($ext, $data[self::FIELD_LABEL]))); + } } else { $this->setLabel(new FHIRString($data[self::FIELD_LABEL])); } @@ -422,8 +445,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_METHOD] instanceof FHIRTestScriptRequestMethodCode) { $this->setMethod($data[self::FIELD_METHOD]); - } elseif ($ext && is_scalar($data[self::FIELD_METHOD])) { - $this->setMethod(new FHIRTestScriptRequestMethodCode([FHIRTestScriptRequestMethodCode::FIELD_VALUE => $data[self::FIELD_METHOD]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_METHOD])) { + $this->setMethod(new FHIRTestScriptRequestMethodCode([FHIRTestScriptRequestMethodCode::FIELD_VALUE => $data[self::FIELD_METHOD]] + $ext)); + } else if (is_array($data[self::FIELD_METHOD])) { + $this->setMethod(new FHIRTestScriptRequestMethodCode(array_merge($ext, $data[self::FIELD_METHOD]))); + } } else { $this->setMethod(new FHIRTestScriptRequestMethodCode($data[self::FIELD_METHOD])); } @@ -434,8 +461,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ORIGIN] instanceof FHIRInteger) { $this->setOrigin($data[self::FIELD_ORIGIN]); - } elseif ($ext && is_scalar($data[self::FIELD_ORIGIN])) { - $this->setOrigin(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_ORIGIN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ORIGIN])) { + $this->setOrigin(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_ORIGIN]] + $ext)); + } else if (is_array($data[self::FIELD_ORIGIN])) { + $this->setOrigin(new FHIRInteger(array_merge($ext, $data[self::FIELD_ORIGIN]))); + } } else { $this->setOrigin(new FHIRInteger($data[self::FIELD_ORIGIN])); } @@ -446,8 +477,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PARAMS] instanceof FHIRString) { $this->setParams($data[self::FIELD_PARAMS]); - } elseif ($ext && is_scalar($data[self::FIELD_PARAMS])) { - $this->setParams(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PARAMS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PARAMS])) { + $this->setParams(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PARAMS]] + $ext)); + } else if (is_array($data[self::FIELD_PARAMS])) { + $this->setParams(new FHIRString(array_merge($ext, $data[self::FIELD_PARAMS]))); + } } else { $this->setParams(new FHIRString($data[self::FIELD_PARAMS])); } @@ -458,17 +493,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_REQUEST_HEADER])) { foreach($data[self::FIELD_REQUEST_HEADER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRTestScriptRequestHeader) { $this->addRequestHeader($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addRequestHeader(new FHIRTestScriptRequestHeader([FHIRTestScriptRequestHeader::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addRequestHeader(new FHIRTestScriptRequestHeader([FHIRTestScriptRequestHeader::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addRequestHeader(new FHIRTestScriptRequestHeader(array_merge($v, $ext[$i]))); + } } else { $this->addRequestHeader(new FHIRTestScriptRequestHeader($v)); } } } elseif ($data[self::FIELD_REQUEST_HEADER] instanceof FHIRTestScriptRequestHeader) { $this->addRequestHeader($data[self::FIELD_REQUEST_HEADER]); - } elseif ($ext && is_scalar($data[self::FIELD_REQUEST_HEADER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_REQUEST_HEADER])) { $this->addRequestHeader(new FHIRTestScriptRequestHeader([FHIRTestScriptRequestHeader::FIELD_VALUE => $data[self::FIELD_REQUEST_HEADER]] + $ext)); } else { $this->addRequestHeader(new FHIRTestScriptRequestHeader($data[self::FIELD_REQUEST_HEADER])); @@ -480,8 +522,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_REQUEST_ID] instanceof FHIRId) { $this->setRequestId($data[self::FIELD_REQUEST_ID]); - } elseif ($ext && is_scalar($data[self::FIELD_REQUEST_ID])) { - $this->setRequestId(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_REQUEST_ID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_REQUEST_ID])) { + $this->setRequestId(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_REQUEST_ID]] + $ext)); + } else if (is_array($data[self::FIELD_REQUEST_ID])) { + $this->setRequestId(new FHIRId(array_merge($ext, $data[self::FIELD_REQUEST_ID]))); + } } else { $this->setRequestId(new FHIRId($data[self::FIELD_REQUEST_ID])); } @@ -492,8 +538,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_RESOURCE] instanceof FHIRCode) { $this->setResource($data[self::FIELD_RESOURCE]); - } elseif ($ext && is_scalar($data[self::FIELD_RESOURCE])) { - $this->setResource(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_RESOURCE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_RESOURCE])) { + $this->setResource(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_RESOURCE]] + $ext)); + } else if (is_array($data[self::FIELD_RESOURCE])) { + $this->setResource(new FHIRCode(array_merge($ext, $data[self::FIELD_RESOURCE]))); + } } else { $this->setResource(new FHIRCode($data[self::FIELD_RESOURCE])); } @@ -504,8 +554,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_RESPONSE_ID] instanceof FHIRId) { $this->setResponseId($data[self::FIELD_RESPONSE_ID]); - } elseif ($ext && is_scalar($data[self::FIELD_RESPONSE_ID])) { - $this->setResponseId(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_RESPONSE_ID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_RESPONSE_ID])) { + $this->setResponseId(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_RESPONSE_ID]] + $ext)); + } else if (is_array($data[self::FIELD_RESPONSE_ID])) { + $this->setResponseId(new FHIRId(array_merge($ext, $data[self::FIELD_RESPONSE_ID]))); + } } else { $this->setResponseId(new FHIRId($data[self::FIELD_RESPONSE_ID])); } @@ -516,8 +570,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SOURCE_ID] instanceof FHIRId) { $this->setSourceId($data[self::FIELD_SOURCE_ID]); - } elseif ($ext && is_scalar($data[self::FIELD_SOURCE_ID])) { - $this->setSourceId(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_SOURCE_ID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SOURCE_ID])) { + $this->setSourceId(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_SOURCE_ID]] + $ext)); + } else if (is_array($data[self::FIELD_SOURCE_ID])) { + $this->setSourceId(new FHIRId(array_merge($ext, $data[self::FIELD_SOURCE_ID]))); + } } else { $this->setSourceId(new FHIRId($data[self::FIELD_SOURCE_ID])); } @@ -528,8 +586,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TARGET_ID] instanceof FHIRId) { $this->setTargetId($data[self::FIELD_TARGET_ID]); - } elseif ($ext && is_scalar($data[self::FIELD_TARGET_ID])) { - $this->setTargetId(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_TARGET_ID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TARGET_ID])) { + $this->setTargetId(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_TARGET_ID]] + $ext)); + } else if (is_array($data[self::FIELD_TARGET_ID])) { + $this->setTargetId(new FHIRId(array_merge($ext, $data[self::FIELD_TARGET_ID]))); + } } else { $this->setTargetId(new FHIRId($data[self::FIELD_TARGET_ID])); } @@ -547,8 +609,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_URL] instanceof FHIRString) { $this->setUrl($data[self::FIELD_URL]); - } elseif ($ext && is_scalar($data[self::FIELD_URL])) { - $this->setUrl(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_URL])) { + $this->setUrl(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } else if (is_array($data[self::FIELD_URL])) { + $this->setUrl(new FHIRString(array_merge($ext, $data[self::FIELD_URL]))); + } } else { $this->setUrl(new FHIRString($data[self::FIELD_URL])); } @@ -1452,7 +1518,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getLabel())) { $v->xmlSerialize($sxe->addChild(self::FIELD_LABEL, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getMethod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_METHOD, null, $v->_getFHIRXMLNamespace())); } @@ -1462,7 +1527,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getParams())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PARAMS, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getRequestHeader())) { foreach($vs as $v) { if (null === $v) { @@ -1471,6 +1535,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_REQUEST_HEADER, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getRequestId())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REQUEST_ID, null, $v->_getFHIRXMLNamespace())); } @@ -1486,7 +1551,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getTargetId())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TARGET_ID, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -1503,69 +1567,191 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getAccept())) { - $a[self::FIELD_ACCEPT] = $v->getValue(); - $a[self::FIELD_ACCEPT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ACCEPT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ACCEPT_EXT] = $enc; + } + } else { + $a[self::FIELD_ACCEPT] = $v; + } } if (null !== ($v = $this->getContentType())) { - $a[self::FIELD_CONTENT_TYPE] = $v->getValue(); - $a[self::FIELD_CONTENT_TYPE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CONTENT_TYPE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CONTENT_TYPE_EXT] = $enc; + } + } else { + $a[self::FIELD_CONTENT_TYPE] = $v; + } } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if (null !== ($v = $this->getDestination())) { - $a[self::FIELD_DESTINATION] = $v->getValue(); - $a[self::FIELD_DESTINATION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESTINATION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESTINATION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESTINATION] = $v; + } } if (null !== ($v = $this->getEncodeRequestUrl())) { - $a[self::FIELD_ENCODE_REQUEST_URL] = $v->getValue(); - $a[self::FIELD_ENCODE_REQUEST_URL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ENCODE_REQUEST_URL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ENCODE_REQUEST_URL_EXT] = $enc; + } + } else { + $a[self::FIELD_ENCODE_REQUEST_URL] = $v; + } } if (null !== ($v = $this->getLabel())) { - $a[self::FIELD_LABEL] = $v->getValue(); - $a[self::FIELD_LABEL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_LABEL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_LABEL_EXT] = $enc; + } + } else { + $a[self::FIELD_LABEL] = $v; + } } if (null !== ($v = $this->getMethod())) { - $a[self::FIELD_METHOD] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_METHOD] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_METHOD_EXT] = $enc; + } + } else { + $a[self::FIELD_METHOD] = $v; + } } if (null !== ($v = $this->getOrigin())) { - $a[self::FIELD_ORIGIN] = $v->getValue(); - $a[self::FIELD_ORIGIN_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ORIGIN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ORIGIN_EXT] = $enc; + } + } else { + $a[self::FIELD_ORIGIN] = $v; + } } if (null !== ($v = $this->getParams())) { - $a[self::FIELD_PARAMS] = $v->getValue(); - $a[self::FIELD_PARAMS_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PARAMS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PARAMS_EXT] = $enc; + } + } else { + $a[self::FIELD_PARAMS] = $v; + } } if ([] !== ($vs = $this->getRequestHeader())) { - $a[self::FIELD_REQUEST_HEADER] = $vs; + $a[self::FIELD_REQUEST_HEADER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_REQUEST_HEADER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_REQUEST_HEADER_EXT][] = $enc; + } else { + $a[self::FIELD_REQUEST_HEADER_EXT][] = null; + } + } else { + $a[self::FIELD_REQUEST_HEADER][] = $v; + } + } } if (null !== ($v = $this->getRequestId())) { - $a[self::FIELD_REQUEST_ID] = $v->getValue(); - $a[self::FIELD_REQUEST_ID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_REQUEST_ID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_REQUEST_ID_EXT] = $enc; + } + } else { + $a[self::FIELD_REQUEST_ID] = $v; + } } if (null !== ($v = $this->getResource())) { - $a[self::FIELD_RESOURCE] = $v->getValue(); - $a[self::FIELD_RESOURCE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_RESOURCE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_RESOURCE_EXT] = $enc; + } + } else { + $a[self::FIELD_RESOURCE] = $v; + } } if (null !== ($v = $this->getResponseId())) { - $a[self::FIELD_RESPONSE_ID] = $v->getValue(); - $a[self::FIELD_RESPONSE_ID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_RESPONSE_ID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_RESPONSE_ID_EXT] = $enc; + } + } else { + $a[self::FIELD_RESPONSE_ID] = $v; + } } if (null !== ($v = $this->getSourceId())) { - $a[self::FIELD_SOURCE_ID] = $v->getValue(); - $a[self::FIELD_SOURCE_ID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SOURCE_ID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SOURCE_ID_EXT] = $enc; + } + } else { + $a[self::FIELD_SOURCE_ID] = $v; + } } if (null !== ($v = $this->getTargetId())) { - $a[self::FIELD_TARGET_ID] = $v->getValue(); - $a[self::FIELD_TARGET_ID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TARGET_ID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TARGET_ID_EXT] = $enc; + } + } else { + $a[self::FIELD_TARGET_ID] = $v; + } } if (null !== ($v = $this->getType())) { $a[self::FIELD_TYPE] = $v; } if (null !== ($v = $this->getUrl())) { - $a[self::FIELD_URL] = $v->getValue(); - $a[self::FIELD_URL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_URL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_URL_EXT] = $enc; + } + } else { + $a[self::FIELD_URL] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptOrigin.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptOrigin.php index 32934ecfc1..44ba8725a6 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptOrigin.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptOrigin.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRTestScriptOrigin extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_TEST_SCRIPT_DOT_ORIGIN; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_INDEX = 'index'; const FIELD_INDEX_EXT = '_index'; const FIELD_PROFILE = 'profile'; @@ -110,6 +106,9 @@ class FHIRTestScriptOrigin extends FHIRBackboneElement */ protected $profile = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRTestScriptOrigin Constructor * @param null|array $data @@ -132,8 +131,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_INDEX] instanceof FHIRInteger) { $this->setIndex($data[self::FIELD_INDEX]); - } elseif ($ext && is_scalar($data[self::FIELD_INDEX])) { - $this->setIndex(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_INDEX]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_INDEX])) { + $this->setIndex(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_INDEX]] + $ext)); + } else if (is_array($data[self::FIELD_INDEX])) { + $this->setIndex(new FHIRInteger(array_merge($ext, $data[self::FIELD_INDEX]))); + } } else { $this->setIndex(new FHIRInteger($data[self::FIELD_INDEX])); } @@ -328,7 +331,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getIndex())) { $v->xmlSerialize($sxe->addChild(self::FIELD_INDEX, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getProfile())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PROFILE, null, $v->_getFHIRXMLNamespace())); } @@ -342,8 +344,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getIndex())) { - $a[self::FIELD_INDEX] = $v->getValue(); - $a[self::FIELD_INDEX_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_INDEX] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_INDEX_EXT] = $enc; + } + } else { + $a[self::FIELD_INDEX] = $v; + } } if (null !== ($v = $this->getProfile())) { $a[self::FIELD_PROFILE] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptRequestHeader.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptRequestHeader.php index d5837417d7..85116fda9b 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptRequestHeader.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptRequestHeader.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRTestScriptRequestHeader extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_TEST_SCRIPT_DOT_REQUEST_HEADER; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_FIELD = 'field'; const FIELD_FIELD_EXT = '_field'; const FIELD_VALUE = 'value'; @@ -109,6 +105,9 @@ class FHIRTestScriptRequestHeader extends FHIRBackboneElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRTestScriptRequestHeader Constructor * @param null|array $data @@ -135,8 +134,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_FIELD] instanceof FHIRString) { $this->setField($data[self::FIELD_FIELD]); - } elseif ($ext && is_scalar($data[self::FIELD_FIELD])) { - $this->setField(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_FIELD]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_FIELD])) { + $this->setField(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_FIELD]] + $ext)); + } else if (is_array($data[self::FIELD_FIELD])) { + $this->setField(new FHIRString(array_merge($ext, $data[self::FIELD_FIELD]))); + } } else { $this->setField(new FHIRString($data[self::FIELD_FIELD])); } @@ -147,8 +150,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE] instanceof FHIRString) { $this->setValue($data[self::FIELD_VALUE]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE])) { - $this->setValue(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VALUE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE])) { + $this->setValue(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VALUE]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE])) { + $this->setValue(new FHIRString(array_merge($ext, $data[self::FIELD_VALUE]))); + } } else { $this->setValue(new FHIRString($data[self::FIELD_VALUE])); } @@ -346,6 +353,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_FIELD, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getValue())) { + $sxe->addAttribute(self::FIELD_VALUE, (string)$v); $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE, null, $v->_getFHIRXMLNamespace())); } return $sxe; @@ -358,12 +366,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getField())) { - $a[self::FIELD_FIELD] = $v->getValue(); - $a[self::FIELD_FIELD_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FIELD] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FIELD_EXT] = $enc; + } + } else { + $a[self::FIELD_FIELD] = $v; + } } if (null !== ($v = $this->getValue())) { - $a[self::FIELD_VALUE] = $v->getValue(); - $a[self::FIELD_VALUE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptSetup.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptSetup.php index 36955858b8..4e173d4478 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptSetup.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptSetup.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -77,10 +77,6 @@ class FHIRTestScriptSetup extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_TEST_SCRIPT_DOT_SETUP; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ACTION = 'action'; /** @@ -93,6 +89,9 @@ class FHIRTestScriptSetup extends FHIRBackboneElement */ protected $action = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRTestScriptSetup Constructor * @param null|array $data @@ -112,6 +111,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ACTION])) { if (is_array($data[self::FIELD_ACTION])) { foreach($data[self::FIELD_ACTION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRTestScriptAction) { $this->addAction($v); } else { @@ -283,7 +285,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getAction())) { foreach($vs as $v) { if (null === $v) { @@ -292,6 +293,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_ACTION, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptTeardown.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptTeardown.php index 96e403ee5e..9d8ee1e075 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptTeardown.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptTeardown.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -77,10 +77,6 @@ class FHIRTestScriptTeardown extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_TEST_SCRIPT_DOT_TEARDOWN; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ACTION = 'action'; /** @@ -93,6 +89,9 @@ class FHIRTestScriptTeardown extends FHIRBackboneElement */ protected $action = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRTestScriptTeardown Constructor * @param null|array $data @@ -112,6 +111,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ACTION])) { if (is_array($data[self::FIELD_ACTION])) { foreach($data[self::FIELD_ACTION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRTestScriptAction2) { $this->addAction($v); } else { @@ -283,7 +285,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getAction())) { foreach($vs as $v) { if (null === $v) { @@ -292,6 +293,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_ACTION, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptTest.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptTest.php index 4225044155..e2c3102499 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptTest.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRTestScriptTest extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_TEST_SCRIPT_DOT_TEST; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ACTION = 'action'; const FIELD_DESCRIPTION = 'description'; const FIELD_DESCRIPTION_EXT = '_description'; @@ -121,6 +117,9 @@ class FHIRTestScriptTest extends FHIRBackboneElement */ protected $name = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRTestScriptTest Constructor * @param null|array $data @@ -140,6 +139,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ACTION])) { if (is_array($data[self::FIELD_ACTION])) { foreach($data[self::FIELD_ACTION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRTestScriptAction1) { $this->addAction($v); } else { @@ -158,8 +160,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -170,8 +176,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -425,7 +435,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getAction())) { foreach($vs as $v) { if (null === $v) { @@ -434,6 +443,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_ACTION, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getDescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESCRIPTION, null, $v->_getFHIRXMLNamespace())); } @@ -453,12 +463,26 @@ public function jsonSerialize() $a[self::FIELD_ACTION] = $vs; } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptVariable.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptVariable.php index 5e515440ae..e60a050628 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptVariable.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptVariable.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRTestScriptVariable extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_TEST_SCRIPT_DOT_VARIABLE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DEFAULT_VALUE = 'defaultValue'; const FIELD_DEFAULT_VALUE_EXT = '_defaultValue'; const FIELD_DESCRIPTION = 'description'; @@ -196,6 +192,9 @@ class FHIRTestScriptVariable extends FHIRBackboneElement */ protected $sourceId = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRTestScriptVariable Constructor * @param null|array $data @@ -218,8 +217,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DEFAULT_VALUE] instanceof FHIRString) { $this->setDefaultValue($data[self::FIELD_DEFAULT_VALUE]); - } elseif ($ext && is_scalar($data[self::FIELD_DEFAULT_VALUE])) { - $this->setDefaultValue(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DEFAULT_VALUE])) { + $this->setDefaultValue(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE]] + $ext)); + } else if (is_array($data[self::FIELD_DEFAULT_VALUE])) { + $this->setDefaultValue(new FHIRString(array_merge($ext, $data[self::FIELD_DEFAULT_VALUE]))); + } } else { $this->setDefaultValue(new FHIRString($data[self::FIELD_DEFAULT_VALUE])); } @@ -230,8 +233,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -242,8 +249,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EXPRESSION] instanceof FHIRString) { $this->setExpression($data[self::FIELD_EXPRESSION]); - } elseif ($ext && is_scalar($data[self::FIELD_EXPRESSION])) { - $this->setExpression(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_EXPRESSION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EXPRESSION])) { + $this->setExpression(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_EXPRESSION]] + $ext)); + } else if (is_array($data[self::FIELD_EXPRESSION])) { + $this->setExpression(new FHIRString(array_merge($ext, $data[self::FIELD_EXPRESSION]))); + } } else { $this->setExpression(new FHIRString($data[self::FIELD_EXPRESSION])); } @@ -254,8 +265,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_HEADER_FIELD] instanceof FHIRString) { $this->setHeaderField($data[self::FIELD_HEADER_FIELD]); - } elseif ($ext && is_scalar($data[self::FIELD_HEADER_FIELD])) { - $this->setHeaderField(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_HEADER_FIELD]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_HEADER_FIELD])) { + $this->setHeaderField(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_HEADER_FIELD]] + $ext)); + } else if (is_array($data[self::FIELD_HEADER_FIELD])) { + $this->setHeaderField(new FHIRString(array_merge($ext, $data[self::FIELD_HEADER_FIELD]))); + } } else { $this->setHeaderField(new FHIRString($data[self::FIELD_HEADER_FIELD])); } @@ -266,8 +281,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_HINT] instanceof FHIRString) { $this->setHint($data[self::FIELD_HINT]); - } elseif ($ext && is_scalar($data[self::FIELD_HINT])) { - $this->setHint(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_HINT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_HINT])) { + $this->setHint(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_HINT]] + $ext)); + } else if (is_array($data[self::FIELD_HINT])) { + $this->setHint(new FHIRString(array_merge($ext, $data[self::FIELD_HINT]))); + } } else { $this->setHint(new FHIRString($data[self::FIELD_HINT])); } @@ -278,8 +297,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -290,8 +313,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PATH] instanceof FHIRString) { $this->setPath($data[self::FIELD_PATH]); - } elseif ($ext && is_scalar($data[self::FIELD_PATH])) { - $this->setPath(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PATH]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PATH])) { + $this->setPath(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PATH]] + $ext)); + } else if (is_array($data[self::FIELD_PATH])) { + $this->setPath(new FHIRString(array_merge($ext, $data[self::FIELD_PATH]))); + } } else { $this->setPath(new FHIRString($data[self::FIELD_PATH])); } @@ -302,8 +329,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SOURCE_ID] instanceof FHIRId) { $this->setSourceId($data[self::FIELD_SOURCE_ID]); - } elseif ($ext && is_scalar($data[self::FIELD_SOURCE_ID])) { - $this->setSourceId(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_SOURCE_ID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SOURCE_ID])) { + $this->setSourceId(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_SOURCE_ID]] + $ext)); + } else if (is_array($data[self::FIELD_SOURCE_ID])) { + $this->setSourceId(new FHIRId(array_merge($ext, $data[self::FIELD_SOURCE_ID]))); + } } else { $this->setSourceId(new FHIRId($data[self::FIELD_SOURCE_ID])); } @@ -811,36 +842,92 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getDefaultValue())) { - $a[self::FIELD_DEFAULT_VALUE] = $v->getValue(); - $a[self::FIELD_DEFAULT_VALUE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DEFAULT_VALUE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DEFAULT_VALUE_EXT] = $enc; + } + } else { + $a[self::FIELD_DEFAULT_VALUE] = $v; + } } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if (null !== ($v = $this->getExpression())) { - $a[self::FIELD_EXPRESSION] = $v->getValue(); - $a[self::FIELD_EXPRESSION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EXPRESSION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EXPRESSION_EXT] = $enc; + } + } else { + $a[self::FIELD_EXPRESSION] = $v; + } } if (null !== ($v = $this->getHeaderField())) { - $a[self::FIELD_HEADER_FIELD] = $v->getValue(); - $a[self::FIELD_HEADER_FIELD_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_HEADER_FIELD] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_HEADER_FIELD_EXT] = $enc; + } + } else { + $a[self::FIELD_HEADER_FIELD] = $v; + } } if (null !== ($v = $this->getHint())) { - $a[self::FIELD_HINT] = $v->getValue(); - $a[self::FIELD_HINT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_HINT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_HINT_EXT] = $enc; + } + } else { + $a[self::FIELD_HINT] = $v; + } } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if (null !== ($v = $this->getPath())) { - $a[self::FIELD_PATH] = $v->getValue(); - $a[self::FIELD_PATH_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PATH] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PATH_EXT] = $enc; + } + } else { + $a[self::FIELD_PATH] = $v; + } } if (null !== ($v = $this->getSourceId())) { - $a[self::FIELD_SOURCE_ID] = $v->getValue(); - $a[self::FIELD_SOURCE_ID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SOURCE_ID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SOURCE_ID_EXT] = $enc; + } + } else { + $a[self::FIELD_SOURCE_ID] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRTiming.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRTiming.php index 52a1507cc4..5853f4e490 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRTiming.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRTiming.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -85,10 +85,6 @@ class FHIRTiming extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_TIMING; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CODE = 'code'; const FIELD_EVENT = 'event'; const FIELD_EVENT_EXT = '_event'; @@ -140,6 +136,9 @@ class FHIRTiming extends FHIRBackboneElement */ protected $repeat = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRTiming Constructor * @param null|array $data @@ -169,17 +168,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_EVENT])) { foreach($data[self::FIELD_EVENT] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRDateTime) { $this->addEvent($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addEvent(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addEvent(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addEvent(new FHIRDateTime(array_merge($v, $ext[$i]))); + } } else { $this->addEvent(new FHIRDateTime($v)); } } } elseif ($data[self::FIELD_EVENT] instanceof FHIRDateTime) { $this->addEvent($data[self::FIELD_EVENT]); - } elseif ($ext && is_scalar($data[self::FIELD_EVENT])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_EVENT])) { $this->addEvent(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_EVENT]] + $ext)); } else { $this->addEvent(new FHIRDateTime($data[self::FIELD_EVENT])); @@ -460,7 +466,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } @@ -494,8 +499,17 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_EVENT][] = $v->getValue(); - $a[self::FIELD_EVENT_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EVENT][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EVENT_EXT][] = $enc; + } else { + $a[self::FIELD_EVENT_EXT][] = null; + } + } else { + $a[self::FIELD_EVENT][] = $v; + } } } if (null !== ($v = $this->getRepeat())) { diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRTiming/FHIRTimingRepeat.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRTiming/FHIRTimingRepeat.php index edfbe8de96..9bd1d963e5 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRTiming/FHIRTimingRepeat.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRTiming/FHIRTimingRepeat.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -92,11 +92,8 @@ class FHIRTimingRepeat extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_TIMING_DOT_REPEAT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_BOUNDS_DURATION = 'boundsDuration'; + const FIELD_BOUNDS_DURATION_EXT = '_boundsDuration'; const FIELD_BOUNDS_PERIOD = 'boundsPeriod'; const FIELD_BOUNDS_RANGE = 'boundsRange'; const FIELD_COUNT = 'count'; @@ -338,6 +335,9 @@ class FHIRTimingRepeat extends FHIRBackboneElement */ protected $when = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRTimingRepeat Constructor * @param null|array $data @@ -355,8 +355,17 @@ public function __construct($data = null) } parent::__construct($data); if (isset($data[self::FIELD_BOUNDS_DURATION])) { + $ext = (isset($data[self::FIELD_BOUNDS_DURATION_EXT]) && is_array($data[self::FIELD_BOUNDS_DURATION_EXT])) + ? $data[self::FIELD_BOUNDS_DURATION_EXT] + : null; if ($data[self::FIELD_BOUNDS_DURATION] instanceof FHIRDuration) { $this->setBoundsDuration($data[self::FIELD_BOUNDS_DURATION]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_BOUNDS_DURATION])) { + $this->setBoundsDuration(new FHIRDuration([FHIRDuration::FIELD_VALUE => $data[self::FIELD_BOUNDS_DURATION]] + $ext)); + } else if (is_array($data[self::FIELD_BOUNDS_DURATION])) { + $this->setBoundsDuration(new FHIRDuration(array_merge($ext, $data[self::FIELD_BOUNDS_DURATION]))); + } } else { $this->setBoundsDuration(new FHIRDuration($data[self::FIELD_BOUNDS_DURATION])); } @@ -381,8 +390,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_COUNT] instanceof FHIRPositiveInt) { $this->setCount($data[self::FIELD_COUNT]); - } elseif ($ext && is_scalar($data[self::FIELD_COUNT])) { - $this->setCount(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_COUNT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_COUNT])) { + $this->setCount(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_COUNT]] + $ext)); + } else if (is_array($data[self::FIELD_COUNT])) { + $this->setCount(new FHIRPositiveInt(array_merge($ext, $data[self::FIELD_COUNT]))); + } } else { $this->setCount(new FHIRPositiveInt($data[self::FIELD_COUNT])); } @@ -393,8 +406,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_COUNT_MAX] instanceof FHIRPositiveInt) { $this->setCountMax($data[self::FIELD_COUNT_MAX]); - } elseif ($ext && is_scalar($data[self::FIELD_COUNT_MAX])) { - $this->setCountMax(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_COUNT_MAX]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_COUNT_MAX])) { + $this->setCountMax(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_COUNT_MAX]] + $ext)); + } else if (is_array($data[self::FIELD_COUNT_MAX])) { + $this->setCountMax(new FHIRPositiveInt(array_merge($ext, $data[self::FIELD_COUNT_MAX]))); + } } else { $this->setCountMax(new FHIRPositiveInt($data[self::FIELD_COUNT_MAX])); } @@ -405,17 +422,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_DAY_OF_WEEK])) { foreach($data[self::FIELD_DAY_OF_WEEK] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCode) { $this->addDayOfWeek($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addDayOfWeek(new FHIRCode([FHIRCode::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addDayOfWeek(new FHIRCode([FHIRCode::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addDayOfWeek(new FHIRCode(array_merge($v, $ext[$i]))); + } } else { $this->addDayOfWeek(new FHIRCode($v)); } } } elseif ($data[self::FIELD_DAY_OF_WEEK] instanceof FHIRCode) { $this->addDayOfWeek($data[self::FIELD_DAY_OF_WEEK]); - } elseif ($ext && is_scalar($data[self::FIELD_DAY_OF_WEEK])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_DAY_OF_WEEK])) { $this->addDayOfWeek(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_DAY_OF_WEEK]] + $ext)); } else { $this->addDayOfWeek(new FHIRCode($data[self::FIELD_DAY_OF_WEEK])); @@ -427,8 +451,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DURATION] instanceof FHIRDecimal) { $this->setDuration($data[self::FIELD_DURATION]); - } elseif ($ext && is_scalar($data[self::FIELD_DURATION])) { - $this->setDuration(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_DURATION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DURATION])) { + $this->setDuration(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_DURATION]] + $ext)); + } else if (is_array($data[self::FIELD_DURATION])) { + $this->setDuration(new FHIRDecimal(array_merge($ext, $data[self::FIELD_DURATION]))); + } } else { $this->setDuration(new FHIRDecimal($data[self::FIELD_DURATION])); } @@ -439,8 +467,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DURATION_MAX] instanceof FHIRDecimal) { $this->setDurationMax($data[self::FIELD_DURATION_MAX]); - } elseif ($ext && is_scalar($data[self::FIELD_DURATION_MAX])) { - $this->setDurationMax(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_DURATION_MAX]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DURATION_MAX])) { + $this->setDurationMax(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_DURATION_MAX]] + $ext)); + } else if (is_array($data[self::FIELD_DURATION_MAX])) { + $this->setDurationMax(new FHIRDecimal(array_merge($ext, $data[self::FIELD_DURATION_MAX]))); + } } else { $this->setDurationMax(new FHIRDecimal($data[self::FIELD_DURATION_MAX])); } @@ -451,8 +483,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DURATION_UNIT] instanceof FHIRUnitsOfTime) { $this->setDurationUnit($data[self::FIELD_DURATION_UNIT]); - } elseif ($ext && is_scalar($data[self::FIELD_DURATION_UNIT])) { - $this->setDurationUnit(new FHIRUnitsOfTime([FHIRUnitsOfTime::FIELD_VALUE => $data[self::FIELD_DURATION_UNIT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DURATION_UNIT])) { + $this->setDurationUnit(new FHIRUnitsOfTime([FHIRUnitsOfTime::FIELD_VALUE => $data[self::FIELD_DURATION_UNIT]] + $ext)); + } else if (is_array($data[self::FIELD_DURATION_UNIT])) { + $this->setDurationUnit(new FHIRUnitsOfTime(array_merge($ext, $data[self::FIELD_DURATION_UNIT]))); + } } else { $this->setDurationUnit(new FHIRUnitsOfTime($data[self::FIELD_DURATION_UNIT])); } @@ -463,8 +499,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_FREQUENCY] instanceof FHIRPositiveInt) { $this->setFrequency($data[self::FIELD_FREQUENCY]); - } elseif ($ext && is_scalar($data[self::FIELD_FREQUENCY])) { - $this->setFrequency(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_FREQUENCY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_FREQUENCY])) { + $this->setFrequency(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_FREQUENCY]] + $ext)); + } else if (is_array($data[self::FIELD_FREQUENCY])) { + $this->setFrequency(new FHIRPositiveInt(array_merge($ext, $data[self::FIELD_FREQUENCY]))); + } } else { $this->setFrequency(new FHIRPositiveInt($data[self::FIELD_FREQUENCY])); } @@ -475,8 +515,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_FREQUENCY_MAX] instanceof FHIRPositiveInt) { $this->setFrequencyMax($data[self::FIELD_FREQUENCY_MAX]); - } elseif ($ext && is_scalar($data[self::FIELD_FREQUENCY_MAX])) { - $this->setFrequencyMax(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_FREQUENCY_MAX]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_FREQUENCY_MAX])) { + $this->setFrequencyMax(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_FREQUENCY_MAX]] + $ext)); + } else if (is_array($data[self::FIELD_FREQUENCY_MAX])) { + $this->setFrequencyMax(new FHIRPositiveInt(array_merge($ext, $data[self::FIELD_FREQUENCY_MAX]))); + } } else { $this->setFrequencyMax(new FHIRPositiveInt($data[self::FIELD_FREQUENCY_MAX])); } @@ -487,8 +531,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_OFFSET] instanceof FHIRUnsignedInt) { $this->setOffset($data[self::FIELD_OFFSET]); - } elseif ($ext && is_scalar($data[self::FIELD_OFFSET])) { - $this->setOffset(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_OFFSET]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_OFFSET])) { + $this->setOffset(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_OFFSET]] + $ext)); + } else if (is_array($data[self::FIELD_OFFSET])) { + $this->setOffset(new FHIRUnsignedInt(array_merge($ext, $data[self::FIELD_OFFSET]))); + } } else { $this->setOffset(new FHIRUnsignedInt($data[self::FIELD_OFFSET])); } @@ -499,8 +547,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PERIOD] instanceof FHIRDecimal) { $this->setPeriod($data[self::FIELD_PERIOD]); - } elseif ($ext && is_scalar($data[self::FIELD_PERIOD])) { - $this->setPeriod(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_PERIOD]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PERIOD])) { + $this->setPeriod(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_PERIOD]] + $ext)); + } else if (is_array($data[self::FIELD_PERIOD])) { + $this->setPeriod(new FHIRDecimal(array_merge($ext, $data[self::FIELD_PERIOD]))); + } } else { $this->setPeriod(new FHIRDecimal($data[self::FIELD_PERIOD])); } @@ -511,8 +563,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PERIOD_MAX] instanceof FHIRDecimal) { $this->setPeriodMax($data[self::FIELD_PERIOD_MAX]); - } elseif ($ext && is_scalar($data[self::FIELD_PERIOD_MAX])) { - $this->setPeriodMax(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_PERIOD_MAX]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PERIOD_MAX])) { + $this->setPeriodMax(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_PERIOD_MAX]] + $ext)); + } else if (is_array($data[self::FIELD_PERIOD_MAX])) { + $this->setPeriodMax(new FHIRDecimal(array_merge($ext, $data[self::FIELD_PERIOD_MAX]))); + } } else { $this->setPeriodMax(new FHIRDecimal($data[self::FIELD_PERIOD_MAX])); } @@ -523,8 +579,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PERIOD_UNIT] instanceof FHIRUnitsOfTime) { $this->setPeriodUnit($data[self::FIELD_PERIOD_UNIT]); - } elseif ($ext && is_scalar($data[self::FIELD_PERIOD_UNIT])) { - $this->setPeriodUnit(new FHIRUnitsOfTime([FHIRUnitsOfTime::FIELD_VALUE => $data[self::FIELD_PERIOD_UNIT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PERIOD_UNIT])) { + $this->setPeriodUnit(new FHIRUnitsOfTime([FHIRUnitsOfTime::FIELD_VALUE => $data[self::FIELD_PERIOD_UNIT]] + $ext)); + } else if (is_array($data[self::FIELD_PERIOD_UNIT])) { + $this->setPeriodUnit(new FHIRUnitsOfTime(array_merge($ext, $data[self::FIELD_PERIOD_UNIT]))); + } } else { $this->setPeriodUnit(new FHIRUnitsOfTime($data[self::FIELD_PERIOD_UNIT])); } @@ -535,17 +595,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_TIME_OF_DAY])) { foreach($data[self::FIELD_TIME_OF_DAY] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRTime) { $this->addTimeOfDay($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addTimeOfDay(new FHIRTime([FHIRTime::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addTimeOfDay(new FHIRTime([FHIRTime::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addTimeOfDay(new FHIRTime(array_merge($v, $ext[$i]))); + } } else { $this->addTimeOfDay(new FHIRTime($v)); } } } elseif ($data[self::FIELD_TIME_OF_DAY] instanceof FHIRTime) { $this->addTimeOfDay($data[self::FIELD_TIME_OF_DAY]); - } elseif ($ext && is_scalar($data[self::FIELD_TIME_OF_DAY])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_TIME_OF_DAY])) { $this->addTimeOfDay(new FHIRTime([FHIRTime::FIELD_VALUE => $data[self::FIELD_TIME_OF_DAY]] + $ext)); } else { $this->addTimeOfDay(new FHIRTime($data[self::FIELD_TIME_OF_DAY])); @@ -557,17 +624,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_WHEN])) { foreach($data[self::FIELD_WHEN] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIREventTiming) { $this->addWhen($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addWhen(new FHIREventTiming([FHIREventTiming::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addWhen(new FHIREventTiming([FHIREventTiming::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addWhen(new FHIREventTiming(array_merge($v, $ext[$i]))); + } } else { $this->addWhen(new FHIREventTiming($v)); } } } elseif ($data[self::FIELD_WHEN] instanceof FHIREventTiming) { $this->addWhen($data[self::FIELD_WHEN]); - } elseif ($ext && is_scalar($data[self::FIELD_WHEN])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_WHEN])) { $this->addWhen(new FHIREventTiming([FHIREventTiming::FIELD_VALUE => $data[self::FIELD_WHEN]] + $ext)); } else { $this->addWhen(new FHIREventTiming($data[self::FIELD_WHEN])); @@ -1487,15 +1561,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getBoundsDuration())) { $v->xmlSerialize($sxe->addChild(self::FIELD_BOUNDS_DURATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getBoundsPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_BOUNDS_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getBoundsRange())) { $v->xmlSerialize($sxe->addChild(self::FIELD_BOUNDS_RANGE, null, $v->_getFHIRXMLNamespace())); } @@ -1513,13 +1584,13 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_DAY_OF_WEEK, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getDuration())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DURATION, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getDurationMax())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DURATION_MAX, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDurationUnit())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DURATION_UNIT, null, $v->_getFHIRXMLNamespace())); } @@ -1538,7 +1609,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getPeriodMax())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PERIOD_MAX, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPeriodUnit())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PERIOD_UNIT, null, $v->_getFHIRXMLNamespace())); } @@ -1559,6 +1629,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_WHEN, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } @@ -1569,7 +1640,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getBoundsDuration())) { - $a[self::FIELD_BOUNDS_DURATION] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_BOUNDS_DURATION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_BOUNDS_DURATION_EXT] = $enc; + } + } else { + $a[self::FIELD_BOUNDS_DURATION] = $v; + } } if (null !== ($v = $this->getBoundsPeriod())) { $a[self::FIELD_BOUNDS_PERIOD] = $v; @@ -1578,12 +1657,26 @@ public function jsonSerialize() $a[self::FIELD_BOUNDS_RANGE] = $v; } if (null !== ($v = $this->getCount())) { - $a[self::FIELD_COUNT] = $v->getValue(); - $a[self::FIELD_COUNT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_COUNT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_COUNT_EXT] = $enc; + } + } else { + $a[self::FIELD_COUNT] = $v; + } } if (null !== ($v = $this->getCountMax())) { - $a[self::FIELD_COUNT_MAX] = $v->getValue(); - $a[self::FIELD_COUNT_MAX_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_COUNT_MAX] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_COUNT_MAX_EXT] = $enc; + } + } else { + $a[self::FIELD_COUNT_MAX] = $v; + } } if ([] !== ($vs = $this->getDayOfWeek())) { $a[self::FIELD_DAY_OF_WEEK] = []; @@ -1591,43 +1684,117 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_DAY_OF_WEEK][] = $v->getValue(); - $a[self::FIELD_DAY_OF_WEEK_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DAY_OF_WEEK][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DAY_OF_WEEK_EXT][] = $enc; + } else { + $a[self::FIELD_DAY_OF_WEEK_EXT][] = null; + } + } else { + $a[self::FIELD_DAY_OF_WEEK][] = $v; + } } } if (null !== ($v = $this->getDuration())) { - $a[self::FIELD_DURATION] = $v->getValue(); - $a[self::FIELD_DURATION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DURATION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DURATION_EXT] = $enc; + } + } else { + $a[self::FIELD_DURATION] = $v; + } } if (null !== ($v = $this->getDurationMax())) { - $a[self::FIELD_DURATION_MAX] = $v->getValue(); - $a[self::FIELD_DURATION_MAX_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DURATION_MAX] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DURATION_MAX_EXT] = $enc; + } + } else { + $a[self::FIELD_DURATION_MAX] = $v; + } } if (null !== ($v = $this->getDurationUnit())) { - $a[self::FIELD_DURATION_UNIT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DURATION_UNIT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DURATION_UNIT_EXT] = $enc; + } + } else { + $a[self::FIELD_DURATION_UNIT] = $v; + } } if (null !== ($v = $this->getFrequency())) { - $a[self::FIELD_FREQUENCY] = $v->getValue(); - $a[self::FIELD_FREQUENCY_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FREQUENCY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FREQUENCY_EXT] = $enc; + } + } else { + $a[self::FIELD_FREQUENCY] = $v; + } } if (null !== ($v = $this->getFrequencyMax())) { - $a[self::FIELD_FREQUENCY_MAX] = $v->getValue(); - $a[self::FIELD_FREQUENCY_MAX_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FREQUENCY_MAX] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FREQUENCY_MAX_EXT] = $enc; + } + } else { + $a[self::FIELD_FREQUENCY_MAX] = $v; + } } if (null !== ($v = $this->getOffset())) { - $a[self::FIELD_OFFSET] = $v->getValue(); - $a[self::FIELD_OFFSET_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_OFFSET] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_OFFSET_EXT] = $enc; + } + } else { + $a[self::FIELD_OFFSET] = $v; + } } if (null !== ($v = $this->getPeriod())) { - $a[self::FIELD_PERIOD] = $v->getValue(); - $a[self::FIELD_PERIOD_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PERIOD] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PERIOD_EXT] = $enc; + } + } else { + $a[self::FIELD_PERIOD] = $v; + } } if (null !== ($v = $this->getPeriodMax())) { - $a[self::FIELD_PERIOD_MAX] = $v->getValue(); - $a[self::FIELD_PERIOD_MAX_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PERIOD_MAX] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PERIOD_MAX_EXT] = $enc; + } + } else { + $a[self::FIELD_PERIOD_MAX] = $v; + } } if (null !== ($v = $this->getPeriodUnit())) { - $a[self::FIELD_PERIOD_UNIT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PERIOD_UNIT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PERIOD_UNIT_EXT] = $enc; + } + } else { + $a[self::FIELD_PERIOD_UNIT] = $v; + } } if ([] !== ($vs = $this->getTimeOfDay())) { $a[self::FIELD_TIME_OF_DAY] = []; @@ -1635,12 +1802,37 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_TIME_OF_DAY][] = $v->getValue(); - $a[self::FIELD_TIME_OF_DAY_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TIME_OF_DAY][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TIME_OF_DAY_EXT][] = $enc; + } else { + $a[self::FIELD_TIME_OF_DAY_EXT][] = null; + } + } else { + $a[self::FIELD_TIME_OF_DAY][] = $v; + } } } if ([] !== ($vs = $this->getWhen())) { - $a[self::FIELD_WHEN] = $vs; + $a[self::FIELD_WHEN] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_WHEN][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_WHEN_EXT][] = $enc; + } else { + $a[self::FIELD_WHEN_EXT][] = null; + } + } else { + $a[self::FIELD_WHEN][] = $v; + } + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetCompose.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetCompose.php index 34559e9dcf..d77fca9219 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetCompose.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetCompose.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -81,10 +81,6 @@ class FHIRValueSetCompose extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_VALUE_SET_DOT_COMPOSE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_EXCLUDE = 'exclude'; const FIELD_INACTIVE = 'inactive'; const FIELD_INACTIVE_EXT = '_inactive'; @@ -146,6 +142,9 @@ class FHIRValueSetCompose extends FHIRBackboneElement */ protected $lockedDate = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRValueSetCompose Constructor * @param null|array $data @@ -165,6 +164,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_EXCLUDE])) { if (is_array($data[self::FIELD_EXCLUDE])) { foreach($data[self::FIELD_EXCLUDE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRValueSetInclude) { $this->addExclude($v); } else { @@ -183,8 +185,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_INACTIVE] instanceof FHIRBoolean) { $this->setInactive($data[self::FIELD_INACTIVE]); - } elseif ($ext && is_scalar($data[self::FIELD_INACTIVE])) { - $this->setInactive(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_INACTIVE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_INACTIVE])) { + $this->setInactive(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_INACTIVE]] + $ext)); + } else if (is_array($data[self::FIELD_INACTIVE])) { + $this->setInactive(new FHIRBoolean(array_merge($ext, $data[self::FIELD_INACTIVE]))); + } } else { $this->setInactive(new FHIRBoolean($data[self::FIELD_INACTIVE])); } @@ -192,6 +198,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_INCLUDE])) { if (is_array($data[self::FIELD_INCLUDE])) { foreach($data[self::FIELD_INCLUDE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRValueSetInclude) { $this->addInclude($v); } else { @@ -210,8 +219,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_LOCKED_DATE] instanceof FHIRDate) { $this->setLockedDate($data[self::FIELD_LOCKED_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_LOCKED_DATE])) { - $this->setLockedDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_LOCKED_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_LOCKED_DATE])) { + $this->setLockedDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_LOCKED_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_LOCKED_DATE])) { + $this->setLockedDate(new FHIRDate(array_merge($ext, $data[self::FIELD_LOCKED_DATE]))); + } } else { $this->setLockedDate(new FHIRDate($data[self::FIELD_LOCKED_DATE])); } @@ -550,7 +563,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getExclude())) { foreach($vs as $v) { if (null === $v) { @@ -559,10 +571,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_EXCLUDE, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getInactive())) { $v->xmlSerialize($sxe->addChild(self::FIELD_INACTIVE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getInclude())) { foreach($vs as $v) { if (null === $v) { @@ -571,6 +583,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_INCLUDE, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getLockedDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_LOCKED_DATE, null, $v->_getFHIRXMLNamespace())); } @@ -587,15 +600,29 @@ public function jsonSerialize() $a[self::FIELD_EXCLUDE] = $vs; } if (null !== ($v = $this->getInactive())) { - $a[self::FIELD_INACTIVE] = $v->getValue(); - $a[self::FIELD_INACTIVE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_INACTIVE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_INACTIVE_EXT] = $enc; + } + } else { + $a[self::FIELD_INACTIVE] = $v; + } } if ([] !== ($vs = $this->getInclude())) { $a[self::FIELD_INCLUDE] = $vs; } if (null !== ($v = $this->getLockedDate())) { - $a[self::FIELD_LOCKED_DATE] = $v->getValue(); - $a[self::FIELD_LOCKED_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_LOCKED_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_LOCKED_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_LOCKED_DATE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetConcept.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetConcept.php index 813c0a987d..1047eeb39c 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetConcept.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetConcept.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -81,10 +81,6 @@ class FHIRValueSetConcept extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_VALUE_SET_DOT_CONCEPT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CODE = 'code'; const FIELD_CODE_EXT = '_code'; const FIELD_DESIGNATION = 'designation'; @@ -130,6 +126,9 @@ class FHIRValueSetConcept extends FHIRBackboneElement */ protected $display = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRValueSetConcept Constructor * @param null|array $data @@ -152,8 +151,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CODE] instanceof FHIRCode) { $this->setCode($data[self::FIELD_CODE]); - } elseif ($ext && is_scalar($data[self::FIELD_CODE])) { - $this->setCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_CODE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CODE])) { + $this->setCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_CODE]] + $ext)); + } else if (is_array($data[self::FIELD_CODE])) { + $this->setCode(new FHIRCode(array_merge($ext, $data[self::FIELD_CODE]))); + } } else { $this->setCode(new FHIRCode($data[self::FIELD_CODE])); } @@ -164,17 +167,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_DESIGNATION])) { foreach($data[self::FIELD_DESIGNATION] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRValueSetDesignation) { $this->addDesignation($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addDesignation(new FHIRValueSetDesignation([FHIRValueSetDesignation::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addDesignation(new FHIRValueSetDesignation([FHIRValueSetDesignation::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addDesignation(new FHIRValueSetDesignation(array_merge($v, $ext[$i]))); + } } else { $this->addDesignation(new FHIRValueSetDesignation($v)); } } } elseif ($data[self::FIELD_DESIGNATION] instanceof FHIRValueSetDesignation) { $this->addDesignation($data[self::FIELD_DESIGNATION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESIGNATION])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_DESIGNATION])) { $this->addDesignation(new FHIRValueSetDesignation([FHIRValueSetDesignation::FIELD_VALUE => $data[self::FIELD_DESIGNATION]] + $ext)); } else { $this->addDesignation(new FHIRValueSetDesignation($data[self::FIELD_DESIGNATION])); @@ -186,8 +196,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DISPLAY] instanceof FHIRString) { $this->setDisplay($data[self::FIELD_DISPLAY]); - } elseif ($ext && is_scalar($data[self::FIELD_DISPLAY])) { - $this->setDisplay(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DISPLAY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DISPLAY])) { + $this->setDisplay(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DISPLAY]] + $ext)); + } else if (is_array($data[self::FIELD_DISPLAY])) { + $this->setDisplay(new FHIRString(array_merge($ext, $data[self::FIELD_DISPLAY]))); + } } else { $this->setDisplay(new FHIRString($data[self::FIELD_DISPLAY])); } @@ -457,7 +471,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getDesignation())) { foreach($vs as $v) { if (null === $v) { @@ -466,6 +479,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_DESIGNATION, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getDisplay())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DISPLAY, null, $v->_getFHIRXMLNamespace())); } @@ -479,15 +493,45 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getCode())) { - $a[self::FIELD_CODE] = $v->getValue(); - $a[self::FIELD_CODE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CODE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CODE_EXT] = $enc; + } + } else { + $a[self::FIELD_CODE] = $v; + } } if ([] !== ($vs = $this->getDesignation())) { - $a[self::FIELD_DESIGNATION] = $vs; + $a[self::FIELD_DESIGNATION] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESIGNATION][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESIGNATION_EXT][] = $enc; + } else { + $a[self::FIELD_DESIGNATION_EXT][] = null; + } + } else { + $a[self::FIELD_DESIGNATION][] = $v; + } + } } if (null !== ($v = $this->getDisplay())) { - $a[self::FIELD_DISPLAY] = $v->getValue(); - $a[self::FIELD_DISPLAY_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DISPLAY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DISPLAY_EXT] = $enc; + } + } else { + $a[self::FIELD_DISPLAY] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetContains.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetContains.php index 5eb8d8ce1c..29753fe4b5 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetContains.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetContains.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -83,10 +83,6 @@ class FHIRValueSetContains extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_VALUE_SET_DOT_CONTAINS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ABSTRACT = 'abstract'; const FIELD_ABSTRACT_EXT = '_abstract'; const FIELD_CODE = 'code'; @@ -205,6 +201,9 @@ class FHIRValueSetContains extends FHIRBackboneElement */ protected $version = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRValueSetContains Constructor * @param null|array $data @@ -227,8 +226,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ABSTRACT] instanceof FHIRBoolean) { $this->setAbstract($data[self::FIELD_ABSTRACT]); - } elseif ($ext && is_scalar($data[self::FIELD_ABSTRACT])) { - $this->setAbstract(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_ABSTRACT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ABSTRACT])) { + $this->setAbstract(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_ABSTRACT]] + $ext)); + } else if (is_array($data[self::FIELD_ABSTRACT])) { + $this->setAbstract(new FHIRBoolean(array_merge($ext, $data[self::FIELD_ABSTRACT]))); + } } else { $this->setAbstract(new FHIRBoolean($data[self::FIELD_ABSTRACT])); } @@ -239,8 +242,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CODE] instanceof FHIRCode) { $this->setCode($data[self::FIELD_CODE]); - } elseif ($ext && is_scalar($data[self::FIELD_CODE])) { - $this->setCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_CODE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CODE])) { + $this->setCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_CODE]] + $ext)); + } else if (is_array($data[self::FIELD_CODE])) { + $this->setCode(new FHIRCode(array_merge($ext, $data[self::FIELD_CODE]))); + } } else { $this->setCode(new FHIRCode($data[self::FIELD_CODE])); } @@ -248,6 +255,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CONTAINS])) { if (is_array($data[self::FIELD_CONTAINS])) { foreach($data[self::FIELD_CONTAINS] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRValueSetContains) { $this->addContains($v); } else { @@ -266,17 +276,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_DESIGNATION])) { foreach($data[self::FIELD_DESIGNATION] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRValueSetDesignation) { $this->addDesignation($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addDesignation(new FHIRValueSetDesignation([FHIRValueSetDesignation::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addDesignation(new FHIRValueSetDesignation([FHIRValueSetDesignation::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addDesignation(new FHIRValueSetDesignation(array_merge($v, $ext[$i]))); + } } else { $this->addDesignation(new FHIRValueSetDesignation($v)); } } } elseif ($data[self::FIELD_DESIGNATION] instanceof FHIRValueSetDesignation) { $this->addDesignation($data[self::FIELD_DESIGNATION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESIGNATION])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_DESIGNATION])) { $this->addDesignation(new FHIRValueSetDesignation([FHIRValueSetDesignation::FIELD_VALUE => $data[self::FIELD_DESIGNATION]] + $ext)); } else { $this->addDesignation(new FHIRValueSetDesignation($data[self::FIELD_DESIGNATION])); @@ -288,8 +305,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DISPLAY] instanceof FHIRString) { $this->setDisplay($data[self::FIELD_DISPLAY]); - } elseif ($ext && is_scalar($data[self::FIELD_DISPLAY])) { - $this->setDisplay(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DISPLAY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DISPLAY])) { + $this->setDisplay(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DISPLAY]] + $ext)); + } else if (is_array($data[self::FIELD_DISPLAY])) { + $this->setDisplay(new FHIRString(array_merge($ext, $data[self::FIELD_DISPLAY]))); + } } else { $this->setDisplay(new FHIRString($data[self::FIELD_DISPLAY])); } @@ -300,8 +321,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_INACTIVE] instanceof FHIRBoolean) { $this->setInactive($data[self::FIELD_INACTIVE]); - } elseif ($ext && is_scalar($data[self::FIELD_INACTIVE])) { - $this->setInactive(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_INACTIVE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_INACTIVE])) { + $this->setInactive(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_INACTIVE]] + $ext)); + } else if (is_array($data[self::FIELD_INACTIVE])) { + $this->setInactive(new FHIRBoolean(array_merge($ext, $data[self::FIELD_INACTIVE]))); + } } else { $this->setInactive(new FHIRBoolean($data[self::FIELD_INACTIVE])); } @@ -312,8 +337,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SYSTEM] instanceof FHIRUri) { $this->setSystem($data[self::FIELD_SYSTEM]); - } elseif ($ext && is_scalar($data[self::FIELD_SYSTEM])) { - $this->setSystem(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_SYSTEM]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SYSTEM])) { + $this->setSystem(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_SYSTEM]] + $ext)); + } else if (is_array($data[self::FIELD_SYSTEM])) { + $this->setSystem(new FHIRUri(array_merge($ext, $data[self::FIELD_SYSTEM]))); + } } else { $this->setSystem(new FHIRUri($data[self::FIELD_SYSTEM])); } @@ -324,8 +353,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VERSION] instanceof FHIRString) { $this->setVersion($data[self::FIELD_VERSION]); - } elseif ($ext && is_scalar($data[self::FIELD_VERSION])) { - $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } else if (is_array($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString(array_merge($ext, $data[self::FIELD_VERSION]))); + } } else { $this->setVersion(new FHIRString($data[self::FIELD_VERSION])); } @@ -855,7 +888,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getContains())) { foreach($vs as $v) { if (null === $v) { @@ -873,6 +905,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_DESIGNATION, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getDisplay())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DISPLAY, null, $v->_getFHIRXMLNamespace())); } @@ -895,34 +928,92 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getAbstract())) { - $a[self::FIELD_ABSTRACT] = $v->getValue(); - $a[self::FIELD_ABSTRACT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ABSTRACT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ABSTRACT_EXT] = $enc; + } + } else { + $a[self::FIELD_ABSTRACT] = $v; + } } if (null !== ($v = $this->getCode())) { - $a[self::FIELD_CODE] = $v->getValue(); - $a[self::FIELD_CODE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CODE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CODE_EXT] = $enc; + } + } else { + $a[self::FIELD_CODE] = $v; + } } if ([] !== ($vs = $this->getContains())) { $a[self::FIELD_CONTAINS] = $vs; } if ([] !== ($vs = $this->getDesignation())) { - $a[self::FIELD_DESIGNATION] = $vs; + $a[self::FIELD_DESIGNATION] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESIGNATION][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESIGNATION_EXT][] = $enc; + } else { + $a[self::FIELD_DESIGNATION_EXT][] = null; + } + } else { + $a[self::FIELD_DESIGNATION][] = $v; + } + } } if (null !== ($v = $this->getDisplay())) { - $a[self::FIELD_DISPLAY] = $v->getValue(); - $a[self::FIELD_DISPLAY_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DISPLAY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DISPLAY_EXT] = $enc; + } + } else { + $a[self::FIELD_DISPLAY] = $v; + } } if (null !== ($v = $this->getInactive())) { - $a[self::FIELD_INACTIVE] = $v->getValue(); - $a[self::FIELD_INACTIVE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_INACTIVE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_INACTIVE_EXT] = $enc; + } + } else { + $a[self::FIELD_INACTIVE] = $v; + } } if (null !== ($v = $this->getSystem())) { - $a[self::FIELD_SYSTEM] = $v->getValue(); - $a[self::FIELD_SYSTEM_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SYSTEM] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SYSTEM_EXT] = $enc; + } + } else { + $a[self::FIELD_SYSTEM] = $v; + } } if (null !== ($v = $this->getVersion())) { - $a[self::FIELD_VERSION] = $v->getValue(); - $a[self::FIELD_VERSION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VERSION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VERSION_EXT] = $enc; + } + } else { + $a[self::FIELD_VERSION] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetDesignation.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetDesignation.php index f997312d07..fbf0b51dd8 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetDesignation.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetDesignation.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -82,10 +82,6 @@ class FHIRValueSetDesignation extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_VALUE_SET_DOT_DESIGNATION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_LANGUAGE = 'language'; const FIELD_LANGUAGE_EXT = '_language'; const FIELD_USE = 'use'; @@ -126,6 +122,9 @@ class FHIRValueSetDesignation extends FHIRBackboneElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRValueSetDesignation Constructor * @param null|array $data @@ -152,8 +151,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_LANGUAGE] instanceof FHIRCode) { $this->setLanguage($data[self::FIELD_LANGUAGE]); - } elseif ($ext && is_scalar($data[self::FIELD_LANGUAGE])) { - $this->setLanguage(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_LANGUAGE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_LANGUAGE])) { + $this->setLanguage(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_LANGUAGE]] + $ext)); + } else if (is_array($data[self::FIELD_LANGUAGE])) { + $this->setLanguage(new FHIRCode(array_merge($ext, $data[self::FIELD_LANGUAGE]))); + } } else { $this->setLanguage(new FHIRCode($data[self::FIELD_LANGUAGE])); } @@ -171,8 +174,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE] instanceof FHIRString) { $this->setValue($data[self::FIELD_VALUE]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE])) { - $this->setValue(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VALUE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE])) { + $this->setValue(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VALUE]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE])) { + $this->setValue(new FHIRString(array_merge($ext, $data[self::FIELD_VALUE]))); + } } else { $this->setValue(new FHIRString($data[self::FIELD_VALUE])); } @@ -404,11 +411,11 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getLanguage())) { $v->xmlSerialize($sxe->addChild(self::FIELD_LANGUAGE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getUse())) { $v->xmlSerialize($sxe->addChild(self::FIELD_USE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getValue())) { + $sxe->addAttribute(self::FIELD_VALUE, (string)$v); $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE, null, $v->_getFHIRXMLNamespace())); } return $sxe; @@ -421,15 +428,29 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getLanguage())) { - $a[self::FIELD_LANGUAGE] = $v->getValue(); - $a[self::FIELD_LANGUAGE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_LANGUAGE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_LANGUAGE_EXT] = $enc; + } + } else { + $a[self::FIELD_LANGUAGE] = $v; + } } if (null !== ($v = $this->getUse())) { $a[self::FIELD_USE] = $v; } if (null !== ($v = $this->getValue())) { - $a[self::FIELD_VALUE] = $v->getValue(); - $a[self::FIELD_VALUE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetExpansion.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetExpansion.php index 4f0a1410d9..4acbb77b8d 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetExpansion.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetExpansion.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -82,10 +82,6 @@ class FHIRValueSetExpansion extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_VALUE_SET_DOT_EXPANSION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CONTAINS = 'contains'; const FIELD_IDENTIFIER = 'identifier'; const FIELD_IDENTIFIER_EXT = '_identifier'; @@ -178,6 +174,9 @@ class FHIRValueSetExpansion extends FHIRBackboneElement */ protected $total = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRValueSetExpansion Constructor * @param null|array $data @@ -197,6 +196,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CONTAINS])) { if (is_array($data[self::FIELD_CONTAINS])) { foreach($data[self::FIELD_CONTAINS] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRValueSetContains) { $this->addContains($v); } else { @@ -215,8 +217,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IDENTIFIER] instanceof FHIRUri) { $this->setIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { - $this->setIdentifier(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRUri(array_merge($ext, $data[self::FIELD_IDENTIFIER]))); + } } else { $this->setIdentifier(new FHIRUri($data[self::FIELD_IDENTIFIER])); } @@ -227,8 +233,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_OFFSET] instanceof FHIRInteger) { $this->setOffset($data[self::FIELD_OFFSET]); - } elseif ($ext && is_scalar($data[self::FIELD_OFFSET])) { - $this->setOffset(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_OFFSET]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_OFFSET])) { + $this->setOffset(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_OFFSET]] + $ext)); + } else if (is_array($data[self::FIELD_OFFSET])) { + $this->setOffset(new FHIRInteger(array_merge($ext, $data[self::FIELD_OFFSET]))); + } } else { $this->setOffset(new FHIRInteger($data[self::FIELD_OFFSET])); } @@ -236,6 +246,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PARAMETER])) { if (is_array($data[self::FIELD_PARAMETER])) { foreach($data[self::FIELD_PARAMETER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRValueSetParameter) { $this->addParameter($v); } else { @@ -254,8 +267,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TIMESTAMP] instanceof FHIRDateTime) { $this->setTimestamp($data[self::FIELD_TIMESTAMP]); - } elseif ($ext && is_scalar($data[self::FIELD_TIMESTAMP])) { - $this->setTimestamp(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_TIMESTAMP]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TIMESTAMP])) { + $this->setTimestamp(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_TIMESTAMP]] + $ext)); + } else if (is_array($data[self::FIELD_TIMESTAMP])) { + $this->setTimestamp(new FHIRDateTime(array_merge($ext, $data[self::FIELD_TIMESTAMP]))); + } } else { $this->setTimestamp(new FHIRDateTime($data[self::FIELD_TIMESTAMP])); } @@ -266,8 +283,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TOTAL] instanceof FHIRInteger) { $this->setTotal($data[self::FIELD_TOTAL]); - } elseif ($ext && is_scalar($data[self::FIELD_TOTAL])) { - $this->setTotal(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_TOTAL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TOTAL])) { + $this->setTotal(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_TOTAL]] + $ext)); + } else if (is_array($data[self::FIELD_TOTAL])) { + $this->setTotal(new FHIRInteger(array_merge($ext, $data[self::FIELD_TOTAL]))); + } } else { $this->setTotal(new FHIRInteger($data[self::FIELD_TOTAL])); } @@ -705,7 +726,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getContains())) { foreach($vs as $v) { if (null === $v) { @@ -714,13 +734,13 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_CONTAINS, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getOffset())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OFFSET, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getParameter())) { foreach($vs as $v) { if (null === $v) { @@ -729,6 +749,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_PARAMETER, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getTimestamp())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TIMESTAMP, null, $v->_getFHIRXMLNamespace())); } @@ -748,23 +769,51 @@ public function jsonSerialize() $a[self::FIELD_CONTAINS] = $vs; } if (null !== ($v = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $v->getValue(); - $a[self::FIELD_IDENTIFIER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_IDENTIFIER] = $v; + } } if (null !== ($v = $this->getOffset())) { - $a[self::FIELD_OFFSET] = $v->getValue(); - $a[self::FIELD_OFFSET_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_OFFSET] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_OFFSET_EXT] = $enc; + } + } else { + $a[self::FIELD_OFFSET] = $v; + } } if ([] !== ($vs = $this->getParameter())) { $a[self::FIELD_PARAMETER] = $vs; } if (null !== ($v = $this->getTimestamp())) { - $a[self::FIELD_TIMESTAMP] = $v->getValue(); - $a[self::FIELD_TIMESTAMP_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TIMESTAMP] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TIMESTAMP_EXT] = $enc; + } + } else { + $a[self::FIELD_TIMESTAMP] = $v; + } } if (null !== ($v = $this->getTotal())) { - $a[self::FIELD_TOTAL] = $v->getValue(); - $a[self::FIELD_TOTAL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TOTAL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TOTAL_EXT] = $enc; + } + } else { + $a[self::FIELD_TOTAL] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetFilter.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetFilter.php index ef7aaf4d56..28bf5c30dc 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetFilter.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetFilter.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -82,10 +82,6 @@ class FHIRValueSetFilter extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_VALUE_SET_DOT_FILTER; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_OP = 'op'; const FIELD_OP_EXT = '_op'; const FIELD_PROPERTY = 'property'; @@ -131,6 +127,9 @@ class FHIRValueSetFilter extends FHIRBackboneElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRValueSetFilter Constructor * @param null|array $data @@ -157,8 +156,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_OP] instanceof FHIRFilterOperator) { $this->setOp($data[self::FIELD_OP]); - } elseif ($ext && is_scalar($data[self::FIELD_OP])) { - $this->setOp(new FHIRFilterOperator([FHIRFilterOperator::FIELD_VALUE => $data[self::FIELD_OP]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_OP])) { + $this->setOp(new FHIRFilterOperator([FHIRFilterOperator::FIELD_VALUE => $data[self::FIELD_OP]] + $ext)); + } else if (is_array($data[self::FIELD_OP])) { + $this->setOp(new FHIRFilterOperator(array_merge($ext, $data[self::FIELD_OP]))); + } } else { $this->setOp(new FHIRFilterOperator($data[self::FIELD_OP])); } @@ -169,8 +172,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PROPERTY] instanceof FHIRCode) { $this->setProperty($data[self::FIELD_PROPERTY]); - } elseif ($ext && is_scalar($data[self::FIELD_PROPERTY])) { - $this->setProperty(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_PROPERTY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PROPERTY])) { + $this->setProperty(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_PROPERTY]] + $ext)); + } else if (is_array($data[self::FIELD_PROPERTY])) { + $this->setProperty(new FHIRCode(array_merge($ext, $data[self::FIELD_PROPERTY]))); + } } else { $this->setProperty(new FHIRCode($data[self::FIELD_PROPERTY])); } @@ -181,8 +188,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE] instanceof FHIRString) { $this->setValue($data[self::FIELD_VALUE]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE])) { - $this->setValue(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VALUE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE])) { + $this->setValue(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VALUE]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE])) { + $this->setValue(new FHIRString(array_merge($ext, $data[self::FIELD_VALUE]))); + } } else { $this->setValue(new FHIRString($data[self::FIELD_VALUE])); } @@ -419,7 +430,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getOp())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OP, null, $v->_getFHIRXMLNamespace())); } @@ -427,6 +437,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_PROPERTY, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getValue())) { + $sxe->addAttribute(self::FIELD_VALUE, (string)$v); $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE, null, $v->_getFHIRXMLNamespace())); } return $sxe; @@ -439,15 +450,37 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getOp())) { - $a[self::FIELD_OP] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_OP] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_OP_EXT] = $enc; + } + } else { + $a[self::FIELD_OP] = $v; + } } if (null !== ($v = $this->getProperty())) { - $a[self::FIELD_PROPERTY] = $v->getValue(); - $a[self::FIELD_PROPERTY_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PROPERTY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PROPERTY_EXT] = $enc; + } + } else { + $a[self::FIELD_PROPERTY] = $v; + } } if (null !== ($v = $this->getValue())) { - $a[self::FIELD_VALUE] = $v->getValue(); - $a[self::FIELD_VALUE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetInclude.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetInclude.php index 4af4dbc34f..f9224640c4 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetInclude.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetInclude.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -82,10 +82,6 @@ class FHIRValueSetInclude extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_VALUE_SET_DOT_INCLUDE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CONCEPT = 'concept'; const FIELD_FILTER = 'filter'; const FIELD_FILTER_EXT = '_filter'; @@ -161,6 +157,9 @@ class FHIRValueSetInclude extends FHIRBackboneElement */ protected $version = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRValueSetInclude Constructor * @param null|array $data @@ -180,6 +179,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CONCEPT])) { if (is_array($data[self::FIELD_CONCEPT])) { foreach($data[self::FIELD_CONCEPT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRValueSetConcept) { $this->addConcept($v); } else { @@ -198,17 +200,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_FILTER])) { foreach($data[self::FIELD_FILTER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRValueSetFilter) { $this->addFilter($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addFilter(new FHIRValueSetFilter([FHIRValueSetFilter::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addFilter(new FHIRValueSetFilter([FHIRValueSetFilter::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addFilter(new FHIRValueSetFilter(array_merge($v, $ext[$i]))); + } } else { $this->addFilter(new FHIRValueSetFilter($v)); } } } elseif ($data[self::FIELD_FILTER] instanceof FHIRValueSetFilter) { $this->addFilter($data[self::FIELD_FILTER]); - } elseif ($ext && is_scalar($data[self::FIELD_FILTER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_FILTER])) { $this->addFilter(new FHIRValueSetFilter([FHIRValueSetFilter::FIELD_VALUE => $data[self::FIELD_FILTER]] + $ext)); } else { $this->addFilter(new FHIRValueSetFilter($data[self::FIELD_FILTER])); @@ -220,8 +229,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SYSTEM] instanceof FHIRUri) { $this->setSystem($data[self::FIELD_SYSTEM]); - } elseif ($ext && is_scalar($data[self::FIELD_SYSTEM])) { - $this->setSystem(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_SYSTEM]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SYSTEM])) { + $this->setSystem(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_SYSTEM]] + $ext)); + } else if (is_array($data[self::FIELD_SYSTEM])) { + $this->setSystem(new FHIRUri(array_merge($ext, $data[self::FIELD_SYSTEM]))); + } } else { $this->setSystem(new FHIRUri($data[self::FIELD_SYSTEM])); } @@ -232,17 +245,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_VALUE_SET])) { foreach($data[self::FIELD_VALUE_SET] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCanonical) { $this->addValueSet($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addValueSet(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addValueSet(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addValueSet(new FHIRCanonical(array_merge($v, $ext[$i]))); + } } else { $this->addValueSet(new FHIRCanonical($v)); } } } elseif ($data[self::FIELD_VALUE_SET] instanceof FHIRCanonical) { $this->addValueSet($data[self::FIELD_VALUE_SET]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_SET])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_VALUE_SET])) { $this->addValueSet(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $data[self::FIELD_VALUE_SET]] + $ext)); } else { $this->addValueSet(new FHIRCanonical($data[self::FIELD_VALUE_SET])); @@ -254,8 +274,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VERSION] instanceof FHIRString) { $this->setVersion($data[self::FIELD_VERSION]); - } elseif ($ext && is_scalar($data[self::FIELD_VERSION])) { - $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } else if (is_array($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString(array_merge($ext, $data[self::FIELD_VERSION]))); + } } else { $this->setVersion(new FHIRString($data[self::FIELD_VERSION])); } @@ -671,7 +695,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getConcept())) { foreach($vs as $v) { if (null === $v) { @@ -689,6 +712,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_FILTER, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getSystem())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SYSTEM, null, $v->_getFHIRXMLNamespace())); } @@ -700,6 +724,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_SET, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getVersion())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VERSION, null, $v->_getFHIRXMLNamespace())); } @@ -716,11 +741,34 @@ public function jsonSerialize() $a[self::FIELD_CONCEPT] = $vs; } if ([] !== ($vs = $this->getFilter())) { - $a[self::FIELD_FILTER] = $vs; + $a[self::FIELD_FILTER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FILTER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FILTER_EXT][] = $enc; + } else { + $a[self::FIELD_FILTER_EXT][] = null; + } + } else { + $a[self::FIELD_FILTER][] = $v; + } + } } if (null !== ($v = $this->getSystem())) { - $a[self::FIELD_SYSTEM] = $v->getValue(); - $a[self::FIELD_SYSTEM_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SYSTEM] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SYSTEM_EXT] = $enc; + } + } else { + $a[self::FIELD_SYSTEM] = $v; + } } if ([] !== ($vs = $this->getValueSet())) { $a[self::FIELD_VALUE_SET] = []; @@ -728,13 +776,29 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_VALUE_SET][] = $v->getValue(); - $a[self::FIELD_VALUE_SET_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_SET][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_SET_EXT][] = $enc; + } else { + $a[self::FIELD_VALUE_SET_EXT][] = null; + } + } else { + $a[self::FIELD_VALUE_SET][] = $v; + } } } if (null !== ($v = $this->getVersion())) { - $a[self::FIELD_VERSION] = $v->getValue(); - $a[self::FIELD_VERSION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VERSION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VERSION_EXT] = $enc; + } + } else { + $a[self::FIELD_VERSION] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetParameter.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetParameter.php index 3feb92357e..0073ec0229 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetParameter.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetParameter.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -86,10 +86,6 @@ class FHIRValueSetParameter extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_VALUE_SET_DOT_PARAMETER; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_NAME = 'name'; const FIELD_NAME_EXT = '_name'; const FIELD_VALUE_BOOLEAN = 'valueBoolean'; @@ -201,6 +197,9 @@ class FHIRValueSetParameter extends FHIRBackboneElement */ protected $valueUri = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRValueSetParameter Constructor * @param null|array $data @@ -223,8 +222,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -235,8 +238,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_BOOLEAN] instanceof FHIRBoolean) { $this->setValueBoolean($data[self::FIELD_VALUE_BOOLEAN]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_BOOLEAN])) { - $this->setValueBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_VALUE_BOOLEAN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_BOOLEAN])) { + $this->setValueBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_VALUE_BOOLEAN]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_BOOLEAN])) { + $this->setValueBoolean(new FHIRBoolean(array_merge($ext, $data[self::FIELD_VALUE_BOOLEAN]))); + } } else { $this->setValueBoolean(new FHIRBoolean($data[self::FIELD_VALUE_BOOLEAN])); } @@ -247,8 +254,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_CODE] instanceof FHIRCode) { $this->setValueCode($data[self::FIELD_VALUE_CODE]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_CODE])) { - $this->setValueCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_VALUE_CODE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_CODE])) { + $this->setValueCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_VALUE_CODE]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_CODE])) { + $this->setValueCode(new FHIRCode(array_merge($ext, $data[self::FIELD_VALUE_CODE]))); + } } else { $this->setValueCode(new FHIRCode($data[self::FIELD_VALUE_CODE])); } @@ -259,8 +270,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_DATE_TIME] instanceof FHIRDateTime) { $this->setValueDateTime($data[self::FIELD_VALUE_DATE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_DATE_TIME])) { - $this->setValueDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_VALUE_DATE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_DATE_TIME])) { + $this->setValueDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_VALUE_DATE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_DATE_TIME])) { + $this->setValueDateTime(new FHIRDateTime(array_merge($ext, $data[self::FIELD_VALUE_DATE_TIME]))); + } } else { $this->setValueDateTime(new FHIRDateTime($data[self::FIELD_VALUE_DATE_TIME])); } @@ -271,8 +286,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_DECIMAL] instanceof FHIRDecimal) { $this->setValueDecimal($data[self::FIELD_VALUE_DECIMAL]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_DECIMAL])) { - $this->setValueDecimal(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_VALUE_DECIMAL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_DECIMAL])) { + $this->setValueDecimal(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_VALUE_DECIMAL]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_DECIMAL])) { + $this->setValueDecimal(new FHIRDecimal(array_merge($ext, $data[self::FIELD_VALUE_DECIMAL]))); + } } else { $this->setValueDecimal(new FHIRDecimal($data[self::FIELD_VALUE_DECIMAL])); } @@ -283,8 +302,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_INTEGER] instanceof FHIRInteger) { $this->setValueInteger($data[self::FIELD_VALUE_INTEGER]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_INTEGER])) { - $this->setValueInteger(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_VALUE_INTEGER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_INTEGER])) { + $this->setValueInteger(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_VALUE_INTEGER]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_INTEGER])) { + $this->setValueInteger(new FHIRInteger(array_merge($ext, $data[self::FIELD_VALUE_INTEGER]))); + } } else { $this->setValueInteger(new FHIRInteger($data[self::FIELD_VALUE_INTEGER])); } @@ -295,8 +318,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_STRING] instanceof FHIRString) { $this->setValueString($data[self::FIELD_VALUE_STRING]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_STRING])) { - $this->setValueString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VALUE_STRING]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_STRING])) { + $this->setValueString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VALUE_STRING]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_STRING])) { + $this->setValueString(new FHIRString(array_merge($ext, $data[self::FIELD_VALUE_STRING]))); + } } else { $this->setValueString(new FHIRString($data[self::FIELD_VALUE_STRING])); } @@ -307,8 +334,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_URI] instanceof FHIRUri) { $this->setValueUri($data[self::FIELD_VALUE_URI]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_URI])) { - $this->setValueUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_VALUE_URI]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_URI])) { + $this->setValueUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_VALUE_URI]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_URI])) { + $this->setValueUri(new FHIRUri(array_merge($ext, $data[self::FIELD_VALUE_URI]))); + } } else { $this->setValueUri(new FHIRUri($data[self::FIELD_VALUE_URI])); } @@ -812,36 +843,92 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if (null !== ($v = $this->getValueBoolean())) { - $a[self::FIELD_VALUE_BOOLEAN] = $v->getValue(); - $a[self::FIELD_VALUE_BOOLEAN_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_BOOLEAN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_BOOLEAN_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_BOOLEAN] = $v; + } } if (null !== ($v = $this->getValueCode())) { - $a[self::FIELD_VALUE_CODE] = $v->getValue(); - $a[self::FIELD_VALUE_CODE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_CODE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_CODE_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_CODE] = $v; + } } if (null !== ($v = $this->getValueDateTime())) { - $a[self::FIELD_VALUE_DATE_TIME] = $v->getValue(); - $a[self::FIELD_VALUE_DATE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_DATE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_DATE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_DATE_TIME] = $v; + } } if (null !== ($v = $this->getValueDecimal())) { - $a[self::FIELD_VALUE_DECIMAL] = $v->getValue(); - $a[self::FIELD_VALUE_DECIMAL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_DECIMAL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_DECIMAL_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_DECIMAL] = $v; + } } if (null !== ($v = $this->getValueInteger())) { - $a[self::FIELD_VALUE_INTEGER] = $v->getValue(); - $a[self::FIELD_VALUE_INTEGER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_INTEGER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_INTEGER_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_INTEGER] = $v; + } } if (null !== ($v = $this->getValueString())) { - $a[self::FIELD_VALUE_STRING] = $v->getValue(); - $a[self::FIELD_VALUE_STRING_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_STRING] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_STRING_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_STRING] = $v; + } } if (null !== ($v = $this->getValueUri())) { - $a[self::FIELD_VALUE_URI] = $v->getValue(); - $a[self::FIELD_VALUE_URI_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_URI] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_URI_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_URI] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRVerificationResult/FHIRVerificationResultAttestation.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRVerificationResult/FHIRVerificationResultAttestation.php index 3d35f93124..cb4625156c 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRVerificationResult/FHIRVerificationResultAttestation.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRVerificationResult/FHIRVerificationResultAttestation.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -82,10 +82,6 @@ class FHIRVerificationResultAttestation extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_VERIFICATION_RESULT_DOT_ATTESTATION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_COMMUNICATION_METHOD = 'communicationMethod'; const FIELD_DATE = 'date'; const FIELD_DATE_EXT = '_date'; @@ -200,6 +196,9 @@ class FHIRVerificationResultAttestation extends FHIRBackboneElement */ protected $who = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRVerificationResultAttestation Constructor * @param null|array $data @@ -229,8 +228,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATE] instanceof FHIRDate) { $this->setDate($data[self::FIELD_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_DATE])) { - $this->setDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDate(array_merge($ext, $data[self::FIELD_DATE]))); + } } else { $this->setDate(new FHIRDate($data[self::FIELD_DATE])); } @@ -248,8 +251,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PROXY_IDENTITY_CERTIFICATE] instanceof FHIRString) { $this->setProxyIdentityCertificate($data[self::FIELD_PROXY_IDENTITY_CERTIFICATE]); - } elseif ($ext && is_scalar($data[self::FIELD_PROXY_IDENTITY_CERTIFICATE])) { - $this->setProxyIdentityCertificate(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PROXY_IDENTITY_CERTIFICATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PROXY_IDENTITY_CERTIFICATE])) { + $this->setProxyIdentityCertificate(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PROXY_IDENTITY_CERTIFICATE]] + $ext)); + } else if (is_array($data[self::FIELD_PROXY_IDENTITY_CERTIFICATE])) { + $this->setProxyIdentityCertificate(new FHIRString(array_merge($ext, $data[self::FIELD_PROXY_IDENTITY_CERTIFICATE]))); + } } else { $this->setProxyIdentityCertificate(new FHIRString($data[self::FIELD_PROXY_IDENTITY_CERTIFICATE])); } @@ -267,8 +274,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SOURCE_IDENTITY_CERTIFICATE] instanceof FHIRString) { $this->setSourceIdentityCertificate($data[self::FIELD_SOURCE_IDENTITY_CERTIFICATE]); - } elseif ($ext && is_scalar($data[self::FIELD_SOURCE_IDENTITY_CERTIFICATE])) { - $this->setSourceIdentityCertificate(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SOURCE_IDENTITY_CERTIFICATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SOURCE_IDENTITY_CERTIFICATE])) { + $this->setSourceIdentityCertificate(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SOURCE_IDENTITY_CERTIFICATE]] + $ext)); + } else if (is_array($data[self::FIELD_SOURCE_IDENTITY_CERTIFICATE])) { + $this->setSourceIdentityCertificate(new FHIRString(array_merge($ext, $data[self::FIELD_SOURCE_IDENTITY_CERTIFICATE]))); + } } else { $this->setSourceIdentityCertificate(new FHIRString($data[self::FIELD_SOURCE_IDENTITY_CERTIFICATE])); } @@ -713,32 +724,27 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getCommunicationMethod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_COMMUNICATION_METHOD, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DATE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOnBehalfOf())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ON_BEHALF_OF, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getProxyIdentityCertificate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PROXY_IDENTITY_CERTIFICATE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getProxySignature())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PROXY_SIGNATURE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getSourceIdentityCertificate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SOURCE_IDENTITY_CERTIFICATE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSourceSignature())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SOURCE_SIGNATURE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getWho())) { $v->xmlSerialize($sxe->addChild(self::FIELD_WHO, null, $v->_getFHIRXMLNamespace())); } @@ -755,22 +761,43 @@ public function jsonSerialize() $a[self::FIELD_COMMUNICATION_METHOD] = $v; } if (null !== ($v = $this->getDate())) { - $a[self::FIELD_DATE] = $v->getValue(); - $a[self::FIELD_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_DATE] = $v; + } } if (null !== ($v = $this->getOnBehalfOf())) { $a[self::FIELD_ON_BEHALF_OF] = $v; } if (null !== ($v = $this->getProxyIdentityCertificate())) { - $a[self::FIELD_PROXY_IDENTITY_CERTIFICATE] = $v->getValue(); - $a[self::FIELD_PROXY_IDENTITY_CERTIFICATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PROXY_IDENTITY_CERTIFICATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PROXY_IDENTITY_CERTIFICATE_EXT] = $enc; + } + } else { + $a[self::FIELD_PROXY_IDENTITY_CERTIFICATE] = $v; + } } if (null !== ($v = $this->getProxySignature())) { $a[self::FIELD_PROXY_SIGNATURE] = $v; } if (null !== ($v = $this->getSourceIdentityCertificate())) { - $a[self::FIELD_SOURCE_IDENTITY_CERTIFICATE] = $v->getValue(); - $a[self::FIELD_SOURCE_IDENTITY_CERTIFICATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SOURCE_IDENTITY_CERTIFICATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SOURCE_IDENTITY_CERTIFICATE_EXT] = $enc; + } + } else { + $a[self::FIELD_SOURCE_IDENTITY_CERTIFICATE] = $v; + } } if (null !== ($v = $this->getSourceSignature())) { $a[self::FIELD_SOURCE_SIGNATURE] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRVerificationResult/FHIRVerificationResultPrimarySource.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRVerificationResult/FHIRVerificationResultPrimarySource.php index 8e62fe6c35..54fd2c4f2b 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRVerificationResult/FHIRVerificationResultPrimarySource.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRVerificationResult/FHIRVerificationResultPrimarySource.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRVerificationResultPrimarySource extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_VERIFICATION_RESULT_DOT_PRIMARY_SOURCE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CAN_PUSH_UPDATES = 'canPushUpdates'; const FIELD_COMMUNICATION_METHOD = 'communicationMethod'; const FIELD_PUSH_TYPE_AVAILABLE = 'pushTypeAvailable'; @@ -182,6 +178,9 @@ class FHIRVerificationResultPrimarySource extends FHIRBackboneElement */ protected $who = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRVerificationResultPrimarySource Constructor * @param null|array $data @@ -208,6 +207,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_COMMUNICATION_METHOD])) { if (is_array($data[self::FIELD_COMMUNICATION_METHOD])) { foreach($data[self::FIELD_COMMUNICATION_METHOD] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addCommunicationMethod($v); } else { @@ -223,6 +225,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PUSH_TYPE_AVAILABLE])) { if (is_array($data[self::FIELD_PUSH_TYPE_AVAILABLE])) { foreach($data[self::FIELD_PUSH_TYPE_AVAILABLE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addPushTypeAvailable($v); } else { @@ -238,6 +243,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_TYPE])) { if (is_array($data[self::FIELD_TYPE])) { foreach($data[self::FIELD_TYPE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addType($v); } else { @@ -256,8 +264,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALIDATION_DATE] instanceof FHIRDateTime) { $this->setValidationDate($data[self::FIELD_VALIDATION_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_VALIDATION_DATE])) { - $this->setValidationDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_VALIDATION_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALIDATION_DATE])) { + $this->setValidationDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_VALIDATION_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_VALIDATION_DATE])) { + $this->setValidationDate(new FHIRDateTime(array_merge($ext, $data[self::FIELD_VALIDATION_DATE]))); + } } else { $this->setValidationDate(new FHIRDateTime($data[self::FIELD_VALIDATION_DATE])); } @@ -733,11 +745,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getCanPushUpdates())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CAN_PUSH_UPDATES, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getCommunicationMethod())) { foreach($vs as $v) { if (null === $v) { @@ -764,14 +774,13 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getValidationDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALIDATION_DATE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValidationStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALIDATION_STATUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getWho())) { $v->xmlSerialize($sxe->addChild(self::FIELD_WHO, null, $v->_getFHIRXMLNamespace())); } @@ -797,8 +806,15 @@ public function jsonSerialize() $a[self::FIELD_TYPE] = $vs; } if (null !== ($v = $this->getValidationDate())) { - $a[self::FIELD_VALIDATION_DATE] = $v->getValue(); - $a[self::FIELD_VALIDATION_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALIDATION_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALIDATION_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_VALIDATION_DATE] = $v; + } } if (null !== ($v = $this->getValidationStatus())) { $a[self::FIELD_VALIDATION_STATUS] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRVerificationResult/FHIRVerificationResultValidator.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRVerificationResult/FHIRVerificationResultValidator.php index f177503049..5a3d9e8574 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRVerificationResult/FHIRVerificationResultValidator.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRVerificationResult/FHIRVerificationResultValidator.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRVerificationResultValidator extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_VERIFICATION_RESULT_DOT_VALIDATOR; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ATTESTATION_SIGNATURE = 'attestationSignature'; const FIELD_IDENTITY_CERTIFICATE = 'identityCertificate'; const FIELD_IDENTITY_CERTIFICATE_EXT = '_identityCertificate'; @@ -126,6 +122,9 @@ class FHIRVerificationResultValidator extends FHIRBackboneElement */ protected $organization = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRVerificationResultValidator Constructor * @param null|array $data @@ -155,8 +154,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IDENTITY_CERTIFICATE] instanceof FHIRString) { $this->setIdentityCertificate($data[self::FIELD_IDENTITY_CERTIFICATE]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTITY_CERTIFICATE])) { - $this->setIdentityCertificate(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_IDENTITY_CERTIFICATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IDENTITY_CERTIFICATE])) { + $this->setIdentityCertificate(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_IDENTITY_CERTIFICATE]] + $ext)); + } else if (is_array($data[self::FIELD_IDENTITY_CERTIFICATE])) { + $this->setIdentityCertificate(new FHIRString(array_merge($ext, $data[self::FIELD_IDENTITY_CERTIFICATE]))); + } } else { $this->setIdentityCertificate(new FHIRString($data[self::FIELD_IDENTITY_CERTIFICATE])); } @@ -387,14 +390,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getAttestationSignature())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ATTESTATION_SIGNATURE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getIdentityCertificate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTITY_CERTIFICATE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOrganization())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ORGANIZATION, null, $v->_getFHIRXMLNamespace())); } @@ -411,8 +412,15 @@ public function jsonSerialize() $a[self::FIELD_ATTESTATION_SIGNATURE] = $v; } if (null !== ($v = $this->getIdentityCertificate())) { - $a[self::FIELD_IDENTITY_CERTIFICATE] = $v->getValue(); - $a[self::FIELD_IDENTITY_CERTIFICATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTITY_CERTIFICATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTITY_CERTIFICATE_EXT] = $enc; + } + } else { + $a[self::FIELD_IDENTITY_CERTIFICATE] = $v; + } } if (null !== ($v = $this->getOrganization())) { $a[self::FIELD_ORGANIZATION] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRVisionPrescription/FHIRVisionPrescriptionLensSpecification.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRVisionPrescription/FHIRVisionPrescriptionLensSpecification.php index d0f0a890f0..1203baf70b 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRVisionPrescription/FHIRVisionPrescriptionLensSpecification.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRVisionPrescription/FHIRVisionPrescriptionLensSpecification.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -84,10 +84,6 @@ class FHIRVisionPrescriptionLensSpecification extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_VISION_PRESCRIPTION_DOT_LENS_SPECIFICATION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ADD = 'add'; const FIELD_ADD_EXT = '_add'; const FIELD_AXIS = 'axis'; @@ -277,6 +273,9 @@ class FHIRVisionPrescriptionLensSpecification extends FHIRBackboneElement */ protected $sphere = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRVisionPrescriptionLensSpecification Constructor * @param null|array $data @@ -299,8 +298,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ADD] instanceof FHIRDecimal) { $this->setAdd($data[self::FIELD_ADD]); - } elseif ($ext && is_scalar($data[self::FIELD_ADD])) { - $this->setAdd(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_ADD]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ADD])) { + $this->setAdd(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_ADD]] + $ext)); + } else if (is_array($data[self::FIELD_ADD])) { + $this->setAdd(new FHIRDecimal(array_merge($ext, $data[self::FIELD_ADD]))); + } } else { $this->setAdd(new FHIRDecimal($data[self::FIELD_ADD])); } @@ -311,8 +314,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_AXIS] instanceof FHIRInteger) { $this->setAxis($data[self::FIELD_AXIS]); - } elseif ($ext && is_scalar($data[self::FIELD_AXIS])) { - $this->setAxis(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_AXIS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_AXIS])) { + $this->setAxis(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_AXIS]] + $ext)); + } else if (is_array($data[self::FIELD_AXIS])) { + $this->setAxis(new FHIRInteger(array_merge($ext, $data[self::FIELD_AXIS]))); + } } else { $this->setAxis(new FHIRInteger($data[self::FIELD_AXIS])); } @@ -323,8 +330,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_BACK_CURVE] instanceof FHIRDecimal) { $this->setBackCurve($data[self::FIELD_BACK_CURVE]); - } elseif ($ext && is_scalar($data[self::FIELD_BACK_CURVE])) { - $this->setBackCurve(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_BACK_CURVE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_BACK_CURVE])) { + $this->setBackCurve(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_BACK_CURVE]] + $ext)); + } else if (is_array($data[self::FIELD_BACK_CURVE])) { + $this->setBackCurve(new FHIRDecimal(array_merge($ext, $data[self::FIELD_BACK_CURVE]))); + } } else { $this->setBackCurve(new FHIRDecimal($data[self::FIELD_BACK_CURVE])); } @@ -335,8 +346,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_BRAND] instanceof FHIRString) { $this->setBrand($data[self::FIELD_BRAND]); - } elseif ($ext && is_scalar($data[self::FIELD_BRAND])) { - $this->setBrand(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_BRAND]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_BRAND])) { + $this->setBrand(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_BRAND]] + $ext)); + } else if (is_array($data[self::FIELD_BRAND])) { + $this->setBrand(new FHIRString(array_merge($ext, $data[self::FIELD_BRAND]))); + } } else { $this->setBrand(new FHIRString($data[self::FIELD_BRAND])); } @@ -347,8 +362,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_COLOR] instanceof FHIRString) { $this->setColor($data[self::FIELD_COLOR]); - } elseif ($ext && is_scalar($data[self::FIELD_COLOR])) { - $this->setColor(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_COLOR]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_COLOR])) { + $this->setColor(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_COLOR]] + $ext)); + } else if (is_array($data[self::FIELD_COLOR])) { + $this->setColor(new FHIRString(array_merge($ext, $data[self::FIELD_COLOR]))); + } } else { $this->setColor(new FHIRString($data[self::FIELD_COLOR])); } @@ -359,8 +378,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CYLINDER] instanceof FHIRDecimal) { $this->setCylinder($data[self::FIELD_CYLINDER]); - } elseif ($ext && is_scalar($data[self::FIELD_CYLINDER])) { - $this->setCylinder(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_CYLINDER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CYLINDER])) { + $this->setCylinder(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_CYLINDER]] + $ext)); + } else if (is_array($data[self::FIELD_CYLINDER])) { + $this->setCylinder(new FHIRDecimal(array_merge($ext, $data[self::FIELD_CYLINDER]))); + } } else { $this->setCylinder(new FHIRDecimal($data[self::FIELD_CYLINDER])); } @@ -371,8 +394,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DIAMETER] instanceof FHIRDecimal) { $this->setDiameter($data[self::FIELD_DIAMETER]); - } elseif ($ext && is_scalar($data[self::FIELD_DIAMETER])) { - $this->setDiameter(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_DIAMETER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DIAMETER])) { + $this->setDiameter(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_DIAMETER]] + $ext)); + } else if (is_array($data[self::FIELD_DIAMETER])) { + $this->setDiameter(new FHIRDecimal(array_merge($ext, $data[self::FIELD_DIAMETER]))); + } } else { $this->setDiameter(new FHIRDecimal($data[self::FIELD_DIAMETER])); } @@ -383,8 +410,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DURATION] instanceof FHIRQuantity) { $this->setDuration($data[self::FIELD_DURATION]); - } elseif ($ext && is_scalar($data[self::FIELD_DURATION])) { - $this->setDuration(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_DURATION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DURATION])) { + $this->setDuration(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_DURATION]] + $ext)); + } else if (is_array($data[self::FIELD_DURATION])) { + $this->setDuration(new FHIRQuantity(array_merge($ext, $data[self::FIELD_DURATION]))); + } } else { $this->setDuration(new FHIRQuantity($data[self::FIELD_DURATION])); } @@ -395,8 +426,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EYE] instanceof FHIRVisionEyes) { $this->setEye($data[self::FIELD_EYE]); - } elseif ($ext && is_scalar($data[self::FIELD_EYE])) { - $this->setEye(new FHIRVisionEyes([FHIRVisionEyes::FIELD_VALUE => $data[self::FIELD_EYE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EYE])) { + $this->setEye(new FHIRVisionEyes([FHIRVisionEyes::FIELD_VALUE => $data[self::FIELD_EYE]] + $ext)); + } else if (is_array($data[self::FIELD_EYE])) { + $this->setEye(new FHIRVisionEyes(array_merge($ext, $data[self::FIELD_EYE]))); + } } else { $this->setEye(new FHIRVisionEyes($data[self::FIELD_EYE])); } @@ -404,6 +439,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_NOTE])) { if (is_array($data[self::FIELD_NOTE])) { foreach($data[self::FIELD_NOTE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRAnnotation) { $this->addNote($v); } else { @@ -422,8 +460,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_POWER] instanceof FHIRDecimal) { $this->setPower($data[self::FIELD_POWER]); - } elseif ($ext && is_scalar($data[self::FIELD_POWER])) { - $this->setPower(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_POWER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_POWER])) { + $this->setPower(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_POWER]] + $ext)); + } else if (is_array($data[self::FIELD_POWER])) { + $this->setPower(new FHIRDecimal(array_merge($ext, $data[self::FIELD_POWER]))); + } } else { $this->setPower(new FHIRDecimal($data[self::FIELD_POWER])); } @@ -431,6 +473,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PRISM])) { if (is_array($data[self::FIELD_PRISM])) { foreach($data[self::FIELD_PRISM] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRVisionPrescriptionPrism) { $this->addPrism($v); } else { @@ -456,8 +501,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SPHERE] instanceof FHIRDecimal) { $this->setSphere($data[self::FIELD_SPHERE]); - } elseif ($ext && is_scalar($data[self::FIELD_SPHERE])) { - $this->setSphere(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_SPHERE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SPHERE])) { + $this->setSphere(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_SPHERE]] + $ext)); + } else if (is_array($data[self::FIELD_SPHERE])) { + $this->setSphere(new FHIRDecimal(array_merge($ext, $data[self::FIELD_SPHERE]))); + } } else { $this->setSphere(new FHIRDecimal($data[self::FIELD_SPHERE])); } @@ -1219,15 +1268,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDiameter())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DIAMETER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDuration())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DURATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getEye())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EYE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getNote())) { foreach($vs as $v) { if (null === $v) { @@ -1236,10 +1282,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_NOTE, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getPower())) { $v->xmlSerialize($sxe->addChild(self::FIELD_POWER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getPrism())) { foreach($vs as $v) { if (null === $v) { @@ -1265,45 +1311,117 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getAdd())) { - $a[self::FIELD_ADD] = $v->getValue(); - $a[self::FIELD_ADD_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ADD] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ADD_EXT] = $enc; + } + } else { + $a[self::FIELD_ADD] = $v; + } } if (null !== ($v = $this->getAxis())) { - $a[self::FIELD_AXIS] = $v->getValue(); - $a[self::FIELD_AXIS_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_AXIS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_AXIS_EXT] = $enc; + } + } else { + $a[self::FIELD_AXIS] = $v; + } } if (null !== ($v = $this->getBackCurve())) { - $a[self::FIELD_BACK_CURVE] = $v->getValue(); - $a[self::FIELD_BACK_CURVE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_BACK_CURVE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_BACK_CURVE_EXT] = $enc; + } + } else { + $a[self::FIELD_BACK_CURVE] = $v; + } } if (null !== ($v = $this->getBrand())) { - $a[self::FIELD_BRAND] = $v->getValue(); - $a[self::FIELD_BRAND_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_BRAND] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_BRAND_EXT] = $enc; + } + } else { + $a[self::FIELD_BRAND] = $v; + } } if (null !== ($v = $this->getColor())) { - $a[self::FIELD_COLOR] = $v->getValue(); - $a[self::FIELD_COLOR_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_COLOR] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_COLOR_EXT] = $enc; + } + } else { + $a[self::FIELD_COLOR] = $v; + } } if (null !== ($v = $this->getCylinder())) { - $a[self::FIELD_CYLINDER] = $v->getValue(); - $a[self::FIELD_CYLINDER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CYLINDER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CYLINDER_EXT] = $enc; + } + } else { + $a[self::FIELD_CYLINDER] = $v; + } } if (null !== ($v = $this->getDiameter())) { - $a[self::FIELD_DIAMETER] = $v->getValue(); - $a[self::FIELD_DIAMETER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DIAMETER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DIAMETER_EXT] = $enc; + } + } else { + $a[self::FIELD_DIAMETER] = $v; + } } if (null !== ($v = $this->getDuration())) { - $a[self::FIELD_DURATION] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DURATION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DURATION_EXT] = $enc; + } + } else { + $a[self::FIELD_DURATION] = $v; + } } if (null !== ($v = $this->getEye())) { - $a[self::FIELD_EYE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EYE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EYE_EXT] = $enc; + } + } else { + $a[self::FIELD_EYE] = $v; + } } if ([] !== ($vs = $this->getNote())) { $a[self::FIELD_NOTE] = $vs; } if (null !== ($v = $this->getPower())) { - $a[self::FIELD_POWER] = $v->getValue(); - $a[self::FIELD_POWER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_POWER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_POWER_EXT] = $enc; + } + } else { + $a[self::FIELD_POWER] = $v; + } } if ([] !== ($vs = $this->getPrism())) { $a[self::FIELD_PRISM] = $vs; @@ -1312,8 +1430,15 @@ public function jsonSerialize() $a[self::FIELD_PRODUCT] = $v; } if (null !== ($v = $this->getSphere())) { - $a[self::FIELD_SPHERE] = $v->getValue(); - $a[self::FIELD_SPHERE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SPHERE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SPHERE_EXT] = $enc; + } + } else { + $a[self::FIELD_SPHERE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRVisionPrescription/FHIRVisionPrescriptionPrism.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRVisionPrescription/FHIRVisionPrescriptionPrism.php index 1a6988ee7d..1b6b3cdccb 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRVisionPrescription/FHIRVisionPrescriptionPrism.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBackboneElement/FHIRVisionPrescription/FHIRVisionPrescriptionPrism.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRVisionPrescriptionPrism extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_VISION_PRESCRIPTION_DOT_PRISM; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_AMOUNT = 'amount'; const FIELD_AMOUNT_EXT = '_amount'; const FIELD_BASE = 'base'; @@ -110,6 +106,9 @@ class FHIRVisionPrescriptionPrism extends FHIRBackboneElement */ protected $base = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRVisionPrescriptionPrism Constructor * @param null|array $data @@ -132,8 +131,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_AMOUNT] instanceof FHIRDecimal) { $this->setAmount($data[self::FIELD_AMOUNT]); - } elseif ($ext && is_scalar($data[self::FIELD_AMOUNT])) { - $this->setAmount(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_AMOUNT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_AMOUNT])) { + $this->setAmount(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_AMOUNT]] + $ext)); + } else if (is_array($data[self::FIELD_AMOUNT])) { + $this->setAmount(new FHIRDecimal(array_merge($ext, $data[self::FIELD_AMOUNT]))); + } } else { $this->setAmount(new FHIRDecimal($data[self::FIELD_AMOUNT])); } @@ -144,8 +147,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_BASE] instanceof FHIRVisionBase) { $this->setBase($data[self::FIELD_BASE]); - } elseif ($ext && is_scalar($data[self::FIELD_BASE])) { - $this->setBase(new FHIRVisionBase([FHIRVisionBase::FIELD_VALUE => $data[self::FIELD_BASE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_BASE])) { + $this->setBase(new FHIRVisionBase([FHIRVisionBase::FIELD_VALUE => $data[self::FIELD_BASE]] + $ext)); + } else if (is_array($data[self::FIELD_BASE])) { + $this->setBase(new FHIRVisionBase(array_merge($ext, $data[self::FIELD_BASE]))); + } } else { $this->setBase(new FHIRVisionBase($data[self::FIELD_BASE])); } @@ -331,7 +338,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getAmount())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AMOUNT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getBase())) { $v->xmlSerialize($sxe->addChild(self::FIELD_BASE, null, $v->_getFHIRXMLNamespace())); } @@ -345,11 +351,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getAmount())) { - $a[self::FIELD_AMOUNT] = $v->getValue(); - $a[self::FIELD_AMOUNT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_AMOUNT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_AMOUNT_EXT] = $enc; + } + } else { + $a[self::FIELD_AMOUNT] = $v; + } } if (null !== ($v = $this->getBase())) { - $a[self::FIELD_BASE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_BASE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_BASE_EXT] = $enc; + } + } else { + $a[self::FIELD_BASE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBase64Binary.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBase64Binary.php index fd3fcadc9b..8a079a0f72 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBase64Binary.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBase64Binary.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRBase64Binary extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_BASE_64BINARY; - - /** @var string */ - protected $_xmlns = ''; - const FIELD_VALUE = 'value'; /** @@ -90,6 +86,8 @@ class FHIRBase64Binary extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; /** * FHIRBase64Binary Constructor @@ -247,8 +245,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBindingStrength.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBindingStrength.php index a96650d8b9..c756ab1b41 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBindingStrength.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBindingStrength.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRBindingStrength extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_BINDING_STRENGTH; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRBindingStrength extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRBindingStrength Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBiologicallyDerivedProductCategory.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBiologicallyDerivedProductCategory.php index 2b601b52ce..ae52dfe93a 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBiologicallyDerivedProductCategory.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBiologicallyDerivedProductCategory.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRBiologicallyDerivedProductCategory extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_BIOLOGICALLY_DERIVED_PRODUCT_CATEGORY; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRBiologicallyDerivedProductCategory extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRBiologicallyDerivedProductCategory Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBiologicallyDerivedProductStatus.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBiologicallyDerivedProductStatus.php index 637c74796f..3c44226a80 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBiologicallyDerivedProductStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBiologicallyDerivedProductStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRBiologicallyDerivedProductStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_BIOLOGICALLY_DERIVED_PRODUCT_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRBiologicallyDerivedProductStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRBiologicallyDerivedProductStatus Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBiologicallyDerivedProductStorageScale.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBiologicallyDerivedProductStorageScale.php index 4157e46471..24c8ee30f3 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBiologicallyDerivedProductStorageScale.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBiologicallyDerivedProductStorageScale.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRBiologicallyDerivedProductStorageScale extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_BIOLOGICALLY_DERIVED_PRODUCT_STORAGE_SCALE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRBiologicallyDerivedProductStorageScale extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRBiologicallyDerivedProductStorageScale Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBoolean.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBoolean.php index 54ed6c7007..98186fe0d7 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBoolean.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBoolean.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRBoolean extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_BOOLEAN; - - /** @var string */ - protected $_xmlns = ''; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,8 @@ class FHIRBoolean extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; /** * FHIRBoolean Constructor @@ -246,8 +244,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBundleType.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBundleType.php index 025c67556d..91d2e6a5dc 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBundleType.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRBundleType.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRBundleType extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_BUNDLE_TYPE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRBundleType extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRBundleType Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRCanonical.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRCanonical.php index 12bbdb7d95..bedbb6504b 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRCanonical.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRCanonical.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRCanonical extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CANONICAL; - - /** @var string */ - protected $_xmlns = ''; - const FIELD_VALUE = 'value'; /** @@ -91,6 +87,8 @@ class FHIRCanonical extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; /** * FHIRCanonical Constructor @@ -248,8 +246,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRCapabilityStatementKind.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRCapabilityStatementKind.php index 1b4a95d41d..ccf4208a86 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRCapabilityStatementKind.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRCapabilityStatementKind.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRCapabilityStatementKind extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CAPABILITY_STATEMENT_KIND; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRCapabilityStatementKind extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRCapabilityStatementKind Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRCarePlanActivityKind.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRCarePlanActivityKind.php index 4f2eead6a3..787a6f9216 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRCarePlanActivityKind.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRCarePlanActivityKind.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRCarePlanActivityKind extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CARE_PLAN_ACTIVITY_KIND; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -90,6 +86,9 @@ class FHIRCarePlanActivityKind extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRCarePlanActivityKind Constructor * @param null|array $data @@ -245,8 +244,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRCarePlanActivityStatus.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRCarePlanActivityStatus.php index c4e664dfc3..8e101136fd 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRCarePlanActivityStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRCarePlanActivityStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRCarePlanActivityStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CARE_PLAN_ACTIVITY_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -90,6 +86,9 @@ class FHIRCarePlanActivityStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRCarePlanActivityStatus Constructor * @param null|array $data @@ -245,8 +244,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRCarePlanIntent.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRCarePlanIntent.php index 41c5a13e30..cbba028693 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRCarePlanIntent.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRCarePlanIntent.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRCarePlanIntent extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CARE_PLAN_INTENT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -90,6 +86,9 @@ class FHIRCarePlanIntent extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRCarePlanIntent Constructor * @param null|array $data @@ -245,8 +244,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRCareTeamStatus.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRCareTeamStatus.php index 13ddd6a598..6424043431 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRCareTeamStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRCareTeamStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRCareTeamStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CARE_TEAM_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRCareTeamStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRCareTeamStatus Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRCatalogEntryRelationType.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRCatalogEntryRelationType.php index 40e1eea7ab..8a265c7192 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRCatalogEntryRelationType.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRCatalogEntryRelationType.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRCatalogEntryRelationType extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CATALOG_ENTRY_RELATION_TYPE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRCatalogEntryRelationType extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRCatalogEntryRelationType Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRChargeItemStatus.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRChargeItemStatus.php index 6cf9cfbe6d..e3262bd505 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRChargeItemStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRChargeItemStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRChargeItemStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CHARGE_ITEM_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRChargeItemStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRChargeItemStatus Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRClaimProcessingCodes.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRClaimProcessingCodes.php index a5895e0fc4..1567666415 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRClaimProcessingCodes.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRClaimProcessingCodes.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRClaimProcessingCodes extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CLAIM_PROCESSING_CODES; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRClaimProcessingCodes extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRClaimProcessingCodes Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRClinicalImpressionStatus.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRClinicalImpressionStatus.php index 883ec23d38..bbda94754e 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRClinicalImpressionStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRClinicalImpressionStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRClinicalImpressionStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CLINICAL_IMPRESSION_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRClinicalImpressionStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRClinicalImpressionStatus Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRCode.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRCode.php index 1774d41135..0d70f67ec0 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRCode.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRCode.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRCode extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CODE; - - /** @var string */ - protected $_xmlns = ''; - const FIELD_VALUE = 'value'; /** @@ -91,6 +87,8 @@ class FHIRCode extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; /** * FHIRCode Constructor @@ -248,8 +246,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRCodeSearchSupport.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRCodeSearchSupport.php index 6343d591c9..ea80450e17 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRCodeSearchSupport.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRCodeSearchSupport.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRCodeSearchSupport extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CODE_SEARCH_SUPPORT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -90,6 +86,9 @@ class FHIRCodeSearchSupport extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRCodeSearchSupport Constructor * @param null|array $data @@ -245,8 +244,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRCodeSystemContentMode.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRCodeSystemContentMode.php index 9d60af4289..15c9616866 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRCodeSystemContentMode.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRCodeSystemContentMode.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRCodeSystemContentMode extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CODE_SYSTEM_CONTENT_MODE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -90,6 +86,9 @@ class FHIRCodeSystemContentMode extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRCodeSystemContentMode Constructor * @param null|array $data @@ -245,8 +244,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRCodeSystemHierarchyMeaning.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRCodeSystemHierarchyMeaning.php index e840102c34..0ade26ded0 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRCodeSystemHierarchyMeaning.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRCodeSystemHierarchyMeaning.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRCodeSystemHierarchyMeaning extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CODE_SYSTEM_HIERARCHY_MEANING; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRCodeSystemHierarchyMeaning extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRCodeSystemHierarchyMeaning Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRCodeableConcept.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRCodeableConcept.php index d26e274a5f..d97527ae1c 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRCodeableConcept.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRCodeableConcept.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRCodeableConcept extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CODEABLE_CONCEPT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CODING = 'coding'; const FIELD_TEXT = 'text'; const FIELD_TEXT_EXT = '_text'; @@ -111,6 +107,9 @@ class FHIRCodeableConcept extends FHIRElement */ protected $text = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRCodeableConcept Constructor * @param null|array $data @@ -130,6 +129,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CODING])) { if (is_array($data[self::FIELD_CODING])) { foreach($data[self::FIELD_CODING] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCoding) { $this->addCoding($v); } else { @@ -148,8 +150,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TEXT] instanceof FHIRString) { $this->setText($data[self::FIELD_TEXT]); - } elseif ($ext && is_scalar($data[self::FIELD_TEXT])) { - $this->setText(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TEXT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TEXT])) { + $this->setText(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TEXT]] + $ext)); + } else if (is_array($data[self::FIELD_TEXT])) { + $this->setText(new FHIRString(array_merge($ext, $data[self::FIELD_TEXT]))); + } } else { $this->setText(new FHIRString($data[self::FIELD_TEXT])); } @@ -364,7 +370,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getCoding())) { foreach($vs as $v) { if (null === $v) { @@ -373,6 +378,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_CODING, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getText())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TEXT, null, $v->_getFHIRXMLNamespace())); } @@ -389,8 +395,15 @@ public function jsonSerialize() $a[self::FIELD_CODING] = $vs; } if (null !== ($v = $this->getText())) { - $a[self::FIELD_TEXT] = $v->getValue(); - $a[self::FIELD_TEXT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TEXT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TEXT_EXT] = $enc; + } + } else { + $a[self::FIELD_TEXT] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRCoding.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRCoding.php index ddb964cc5d..ebae888571 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRCoding.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRCoding.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRCoding extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CODING; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CODE = 'code'; const FIELD_CODE_EXT = '_code'; const FIELD_DISPLAY = 'display'; @@ -156,6 +152,9 @@ class FHIRCoding extends FHIRElement */ protected $version = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRCoding Constructor * @param null|array $data @@ -178,8 +177,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CODE] instanceof FHIRCode) { $this->setCode($data[self::FIELD_CODE]); - } elseif ($ext && is_scalar($data[self::FIELD_CODE])) { - $this->setCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_CODE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CODE])) { + $this->setCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_CODE]] + $ext)); + } else if (is_array($data[self::FIELD_CODE])) { + $this->setCode(new FHIRCode(array_merge($ext, $data[self::FIELD_CODE]))); + } } else { $this->setCode(new FHIRCode($data[self::FIELD_CODE])); } @@ -190,8 +193,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DISPLAY] instanceof FHIRString) { $this->setDisplay($data[self::FIELD_DISPLAY]); - } elseif ($ext && is_scalar($data[self::FIELD_DISPLAY])) { - $this->setDisplay(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DISPLAY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DISPLAY])) { + $this->setDisplay(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DISPLAY]] + $ext)); + } else if (is_array($data[self::FIELD_DISPLAY])) { + $this->setDisplay(new FHIRString(array_merge($ext, $data[self::FIELD_DISPLAY]))); + } } else { $this->setDisplay(new FHIRString($data[self::FIELD_DISPLAY])); } @@ -202,8 +209,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SYSTEM] instanceof FHIRUri) { $this->setSystem($data[self::FIELD_SYSTEM]); - } elseif ($ext && is_scalar($data[self::FIELD_SYSTEM])) { - $this->setSystem(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_SYSTEM]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SYSTEM])) { + $this->setSystem(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_SYSTEM]] + $ext)); + } else if (is_array($data[self::FIELD_SYSTEM])) { + $this->setSystem(new FHIRUri(array_merge($ext, $data[self::FIELD_SYSTEM]))); + } } else { $this->setSystem(new FHIRUri($data[self::FIELD_SYSTEM])); } @@ -214,8 +225,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_USER_SELECTED] instanceof FHIRBoolean) { $this->setUserSelected($data[self::FIELD_USER_SELECTED]); - } elseif ($ext && is_scalar($data[self::FIELD_USER_SELECTED])) { - $this->setUserSelected(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_USER_SELECTED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_USER_SELECTED])) { + $this->setUserSelected(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_USER_SELECTED]] + $ext)); + } else if (is_array($data[self::FIELD_USER_SELECTED])) { + $this->setUserSelected(new FHIRBoolean(array_merge($ext, $data[self::FIELD_USER_SELECTED]))); + } } else { $this->setUserSelected(new FHIRBoolean($data[self::FIELD_USER_SELECTED])); } @@ -226,8 +241,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VERSION] instanceof FHIRString) { $this->setVersion($data[self::FIELD_VERSION]); - } elseif ($ext && is_scalar($data[self::FIELD_VERSION])) { - $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } else if (is_array($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString(array_merge($ext, $data[self::FIELD_VERSION]))); + } } else { $this->setVersion(new FHIRString($data[self::FIELD_VERSION])); } @@ -594,24 +613,59 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getCode())) { - $a[self::FIELD_CODE] = $v->getValue(); - $a[self::FIELD_CODE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CODE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CODE_EXT] = $enc; + } + } else { + $a[self::FIELD_CODE] = $v; + } } if (null !== ($v = $this->getDisplay())) { - $a[self::FIELD_DISPLAY] = $v->getValue(); - $a[self::FIELD_DISPLAY_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DISPLAY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DISPLAY_EXT] = $enc; + } + } else { + $a[self::FIELD_DISPLAY] = $v; + } } if (null !== ($v = $this->getSystem())) { - $a[self::FIELD_SYSTEM] = $v->getValue(); - $a[self::FIELD_SYSTEM_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SYSTEM] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SYSTEM_EXT] = $enc; + } + } else { + $a[self::FIELD_SYSTEM] = $v; + } } if (null !== ($v = $this->getUserSelected())) { - $a[self::FIELD_USER_SELECTED] = $v->getValue(); - $a[self::FIELD_USER_SELECTED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_USER_SELECTED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_USER_SELECTED_EXT] = $enc; + } + } else { + $a[self::FIELD_USER_SELECTED] = $v; + } } if (null !== ($v = $this->getVersion())) { - $a[self::FIELD_VERSION] = $v->getValue(); - $a[self::FIELD_VERSION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VERSION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VERSION_EXT] = $enc; + } + } else { + $a[self::FIELD_VERSION] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRCompartmentType.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRCompartmentType.php index 231b11422a..bd27c4a4a1 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRCompartmentType.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRCompartmentType.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRCompartmentType extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_COMPARTMENT_TYPE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRCompartmentType extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRCompartmentType Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRCompositionAttestationMode.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRCompositionAttestationMode.php index 07b5d11173..7244801bfe 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRCompositionAttestationMode.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRCompositionAttestationMode.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRCompositionAttestationMode extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_COMPOSITION_ATTESTATION_MODE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRCompositionAttestationMode extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRCompositionAttestationMode Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRCompositionStatus.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRCompositionStatus.php index 34f732a771..8b5e3b7824 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRCompositionStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRCompositionStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRCompositionStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_COMPOSITION_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRCompositionStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRCompositionStatus Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRConceptMapEquivalence.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRConceptMapEquivalence.php index 9fc5162b2c..06b139620d 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRConceptMapEquivalence.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRConceptMapEquivalence.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -77,10 +77,6 @@ class FHIRConceptMapEquivalence extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONCEPT_MAP_EQUIVALENCE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -88,6 +84,9 @@ class FHIRConceptMapEquivalence extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRConceptMapEquivalence Constructor * @param null|array $data @@ -243,8 +242,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRConceptMapGroupUnmappedMode.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRConceptMapGroupUnmappedMode.php index 55f857b6c4..d3aaa4a1a9 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRConceptMapGroupUnmappedMode.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRConceptMapGroupUnmappedMode.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRConceptMapGroupUnmappedMode extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONCEPT_MAP_GROUP_UNMAPPED_MODE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRConceptMapGroupUnmappedMode extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRConceptMapGroupUnmappedMode Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRConditionalDeleteStatus.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRConditionalDeleteStatus.php index 4cad969893..fefc6aea92 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRConditionalDeleteStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRConditionalDeleteStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRConditionalDeleteStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONDITIONAL_DELETE_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRConditionalDeleteStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRConditionalDeleteStatus Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRConditionalReadStatus.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRConditionalReadStatus.php index e7c57d147e..91397f398a 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRConditionalReadStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRConditionalReadStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRConditionalReadStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONDITIONAL_READ_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRConditionalReadStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRConditionalReadStatus Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRConsentDataMeaning.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRConsentDataMeaning.php index 2303de5681..6c6a7128e4 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRConsentDataMeaning.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRConsentDataMeaning.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRConsentDataMeaning extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONSENT_DATA_MEANING; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRConsentDataMeaning extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRConsentDataMeaning Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRConsentProvisionType.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRConsentProvisionType.php index cb108688e7..4f1459eab6 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRConsentProvisionType.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRConsentProvisionType.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRConsentProvisionType extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONSENT_PROVISION_TYPE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -90,6 +86,9 @@ class FHIRConsentProvisionType extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRConsentProvisionType Constructor * @param null|array $data @@ -245,8 +244,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRConsentState.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRConsentState.php index feccd128f5..789262f0b9 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRConsentState.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRConsentState.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRConsentState extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONSENT_STATE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRConsentState extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRConsentState Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRConstraintSeverity.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRConstraintSeverity.php index c07e4f23de..3eebba557f 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRConstraintSeverity.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRConstraintSeverity.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRConstraintSeverity extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONSTRAINT_SEVERITY; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRConstraintSeverity extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRConstraintSeverity Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRContactDetail.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRContactDetail.php index 5e0a5a03ef..11a2aba7e1 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRContactDetail.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRContactDetail.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRContactDetail extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONTACT_DETAIL; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_NAME = 'name'; const FIELD_NAME_EXT = '_name'; const FIELD_TELECOM = 'telecom'; @@ -111,6 +107,9 @@ class FHIRContactDetail extends FHIRElement */ protected $telecom = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRContactDetail Constructor * @param null|array $data @@ -133,8 +132,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -145,17 +148,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_TELECOM])) { foreach($data[self::FIELD_TELECOM] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContactPoint) { $this->addTelecom($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addTelecom(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addTelecom(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addTelecom(new FHIRContactPoint(array_merge($v, $ext[$i]))); + } } else { $this->addTelecom(new FHIRContactPoint($v)); } } } elseif ($data[self::FIELD_TELECOM] instanceof FHIRContactPoint) { $this->addTelecom($data[self::FIELD_TELECOM]); - } elseif ($ext && is_scalar($data[self::FIELD_TELECOM])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_TELECOM])) { $this->addTelecom(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $data[self::FIELD_TELECOM]] + $ext)); } else { $this->addTelecom(new FHIRContactPoint($data[self::FIELD_TELECOM])); @@ -376,7 +386,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NAME, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getTelecom())) { foreach($vs as $v) { if (null === $v) { @@ -385,6 +394,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_TELECOM, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } @@ -395,11 +405,34 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if ([] !== ($vs = $this->getTelecom())) { - $a[self::FIELD_TELECOM] = $vs; + $a[self::FIELD_TELECOM] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TELECOM][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TELECOM_EXT][] = $enc; + } else { + $a[self::FIELD_TELECOM_EXT][] = null; + } + } else { + $a[self::FIELD_TELECOM][] = $v; + } + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRContactPoint.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRContactPoint.php index 6033ab2073..612af42ae3 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRContactPoint.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRContactPoint.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRContactPoint extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONTACT_POINT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_PERIOD = 'period'; const FIELD_RANK = 'rank'; const FIELD_RANK_EXT = '_rank'; @@ -149,6 +145,9 @@ class FHIRContactPoint extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRContactPoint Constructor * @param null|array $data @@ -182,8 +181,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_RANK] instanceof FHIRPositiveInt) { $this->setRank($data[self::FIELD_RANK]); - } elseif ($ext && is_scalar($data[self::FIELD_RANK])) { - $this->setRank(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_RANK]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_RANK])) { + $this->setRank(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_RANK]] + $ext)); + } else if (is_array($data[self::FIELD_RANK])) { + $this->setRank(new FHIRPositiveInt(array_merge($ext, $data[self::FIELD_RANK]))); + } } else { $this->setRank(new FHIRPositiveInt($data[self::FIELD_RANK])); } @@ -194,8 +197,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SYSTEM] instanceof FHIRContactPointSystem) { $this->setSystem($data[self::FIELD_SYSTEM]); - } elseif ($ext && is_scalar($data[self::FIELD_SYSTEM])) { - $this->setSystem(new FHIRContactPointSystem([FHIRContactPointSystem::FIELD_VALUE => $data[self::FIELD_SYSTEM]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SYSTEM])) { + $this->setSystem(new FHIRContactPointSystem([FHIRContactPointSystem::FIELD_VALUE => $data[self::FIELD_SYSTEM]] + $ext)); + } else if (is_array($data[self::FIELD_SYSTEM])) { + $this->setSystem(new FHIRContactPointSystem(array_merge($ext, $data[self::FIELD_SYSTEM]))); + } } else { $this->setSystem(new FHIRContactPointSystem($data[self::FIELD_SYSTEM])); } @@ -206,8 +213,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_USE] instanceof FHIRContactPointUse) { $this->setUse($data[self::FIELD_USE]); - } elseif ($ext && is_scalar($data[self::FIELD_USE])) { - $this->setUse(new FHIRContactPointUse([FHIRContactPointUse::FIELD_VALUE => $data[self::FIELD_USE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_USE])) { + $this->setUse(new FHIRContactPointUse([FHIRContactPointUse::FIELD_VALUE => $data[self::FIELD_USE]] + $ext)); + } else if (is_array($data[self::FIELD_USE])) { + $this->setUse(new FHIRContactPointUse(array_merge($ext, $data[self::FIELD_USE]))); + } } else { $this->setUse(new FHIRContactPointUse($data[self::FIELD_USE])); } @@ -218,8 +229,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE] instanceof FHIRString) { $this->setValue($data[self::FIELD_VALUE]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE])) { - $this->setValue(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VALUE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE])) { + $this->setValue(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VALUE]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE])) { + $this->setValue(new FHIRString(array_merge($ext, $data[self::FIELD_VALUE]))); + } } else { $this->setValue(new FHIRString($data[self::FIELD_VALUE])); } @@ -514,22 +529,20 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PERIOD, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getRank())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RANK, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSystem())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SYSTEM, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getUse())) { $v->xmlSerialize($sxe->addChild(self::FIELD_USE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getValue())) { + $sxe->addAttribute(self::FIELD_VALUE, (string)$v); $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE, null, $v->_getFHIRXMLNamespace())); } return $sxe; @@ -545,18 +558,48 @@ public function jsonSerialize() $a[self::FIELD_PERIOD] = $v; } if (null !== ($v = $this->getRank())) { - $a[self::FIELD_RANK] = $v->getValue(); - $a[self::FIELD_RANK_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_RANK] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_RANK_EXT] = $enc; + } + } else { + $a[self::FIELD_RANK] = $v; + } } if (null !== ($v = $this->getSystem())) { - $a[self::FIELD_SYSTEM] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SYSTEM] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SYSTEM_EXT] = $enc; + } + } else { + $a[self::FIELD_SYSTEM] = $v; + } } if (null !== ($v = $this->getUse())) { - $a[self::FIELD_USE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_USE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_USE_EXT] = $enc; + } + } else { + $a[self::FIELD_USE] = $v; + } } if (null !== ($v = $this->getValue())) { - $a[self::FIELD_VALUE] = $v->getValue(); - $a[self::FIELD_VALUE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRContactPointSystem.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRContactPointSystem.php index 34b2204056..fd4634cf47 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRContactPointSystem.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRContactPointSystem.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRContactPointSystem extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONTACT_POINT_SYSTEM; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRContactPointSystem extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRContactPointSystem Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRContactPointUse.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRContactPointUse.php index 841aedbd09..9167c24939 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRContactPointUse.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRContactPointUse.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRContactPointUse extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONTACT_POINT_USE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRContactPointUse extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRContactPointUse Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRContractResourcePublicationStatusCodes.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRContractResourcePublicationStatusCodes.php index 34580c511e..b9a6c6b104 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRContractResourcePublicationStatusCodes.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRContractResourcePublicationStatusCodes.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRContractResourcePublicationStatusCodes extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONTRACT_RESOURCE_PUBLICATION_STATUS_CODES; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRContractResourcePublicationStatusCodes extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRContractResourcePublicationStatusCodes Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRContractResourceStatusCodes.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRContractResourceStatusCodes.php index 09952f08a2..7fcf468239 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRContractResourceStatusCodes.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRContractResourceStatusCodes.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRContractResourceStatusCodes extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONTRACT_RESOURCE_STATUS_CODES; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRContractResourceStatusCodes extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRContractResourceStatusCodes Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRContributor.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRContributor.php index 04885b33ac..b0c5af04ff 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRContributor.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRContributor.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRContributor extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONTRIBUTOR; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CONTACT = 'contact'; const FIELD_NAME = 'name'; const FIELD_NAME_EXT = '_name'; @@ -122,6 +118,9 @@ class FHIRContributor extends FHIRElement */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRContributor Constructor * @param null|array $data @@ -141,6 +140,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CONTACT])) { if (is_array($data[self::FIELD_CONTACT])) { foreach($data[self::FIELD_CONTACT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContactDetail) { $this->addContact($v); } else { @@ -159,8 +161,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -171,8 +177,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TYPE] instanceof FHIRContributorType) { $this->setType($data[self::FIELD_TYPE]); - } elseif ($ext && is_scalar($data[self::FIELD_TYPE])) { - $this->setType(new FHIRContributorType([FHIRContributorType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TYPE])) { + $this->setType(new FHIRContributorType([FHIRContributorType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } else if (is_array($data[self::FIELD_TYPE])) { + $this->setType(new FHIRContributorType(array_merge($ext, $data[self::FIELD_TYPE]))); + } } else { $this->setType(new FHIRContributorType($data[self::FIELD_TYPE])); } @@ -417,7 +427,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getContact())) { foreach($vs as $v) { if (null === $v) { @@ -426,10 +435,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_CONTACT, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NAME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -446,11 +455,26 @@ public function jsonSerialize() $a[self::FIELD_CONTACT] = $vs; } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if (null !== ($v = $this->getType())) { - $a[self::FIELD_TYPE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TYPE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TYPE_EXT] = $enc; + } + } else { + $a[self::FIELD_TYPE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRContributorType.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRContributorType.php index 7c7901e3bf..0abc7480ea 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRContributorType.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRContributorType.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRContributorType extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONTRIBUTOR_TYPE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRContributorType extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRContributorType Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRDataRequirement.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRDataRequirement.php index f0fb358812..e1640f608c 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRDataRequirement.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRDataRequirement.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -82,10 +82,6 @@ class FHIRDataRequirement extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DATA_REQUIREMENT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CODE_FILTER = 'codeFilter'; const FIELD_DATE_FILTER = 'dateFilter'; const FIELD_LIMIT = 'limit'; @@ -221,6 +217,9 @@ class FHIRDataRequirement extends FHIRElement */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRDataRequirement Constructor * @param null|array $data @@ -240,6 +239,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CODE_FILTER])) { if (is_array($data[self::FIELD_CODE_FILTER])) { foreach($data[self::FIELD_CODE_FILTER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRDataRequirementCodeFilter) { $this->addCodeFilter($v); } else { @@ -255,6 +257,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_DATE_FILTER])) { if (is_array($data[self::FIELD_DATE_FILTER])) { foreach($data[self::FIELD_DATE_FILTER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRDataRequirementDateFilter) { $this->addDateFilter($v); } else { @@ -273,8 +278,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_LIMIT] instanceof FHIRPositiveInt) { $this->setLimit($data[self::FIELD_LIMIT]); - } elseif ($ext && is_scalar($data[self::FIELD_LIMIT])) { - $this->setLimit(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_LIMIT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_LIMIT])) { + $this->setLimit(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_LIMIT]] + $ext)); + } else if (is_array($data[self::FIELD_LIMIT])) { + $this->setLimit(new FHIRPositiveInt(array_merge($ext, $data[self::FIELD_LIMIT]))); + } } else { $this->setLimit(new FHIRPositiveInt($data[self::FIELD_LIMIT])); } @@ -285,17 +294,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_MUST_SUPPORT])) { foreach($data[self::FIELD_MUST_SUPPORT] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRString) { $this->addMustSupport($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addMustSupport(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addMustSupport(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addMustSupport(new FHIRString(array_merge($v, $ext[$i]))); + } } else { $this->addMustSupport(new FHIRString($v)); } } } elseif ($data[self::FIELD_MUST_SUPPORT] instanceof FHIRString) { $this->addMustSupport($data[self::FIELD_MUST_SUPPORT]); - } elseif ($ext && is_scalar($data[self::FIELD_MUST_SUPPORT])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_MUST_SUPPORT])) { $this->addMustSupport(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_MUST_SUPPORT]] + $ext)); } else { $this->addMustSupport(new FHIRString($data[self::FIELD_MUST_SUPPORT])); @@ -307,17 +323,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_PROFILE])) { foreach($data[self::FIELD_PROFILE] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCanonical) { $this->addProfile($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addProfile(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addProfile(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addProfile(new FHIRCanonical(array_merge($v, $ext[$i]))); + } } else { $this->addProfile(new FHIRCanonical($v)); } } } elseif ($data[self::FIELD_PROFILE] instanceof FHIRCanonical) { $this->addProfile($data[self::FIELD_PROFILE]); - } elseif ($ext && is_scalar($data[self::FIELD_PROFILE])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_PROFILE])) { $this->addProfile(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $data[self::FIELD_PROFILE]] + $ext)); } else { $this->addProfile(new FHIRCanonical($data[self::FIELD_PROFILE])); @@ -326,6 +349,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SORT])) { if (is_array($data[self::FIELD_SORT])) { foreach($data[self::FIELD_SORT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRDataRequirementSort) { $this->addSort($v); } else { @@ -358,8 +384,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TYPE] instanceof FHIRCode) { $this->setType($data[self::FIELD_TYPE]); - } elseif ($ext && is_scalar($data[self::FIELD_TYPE])) { - $this->setType(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TYPE])) { + $this->setType(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } else if (is_array($data[self::FIELD_TYPE])) { + $this->setType(new FHIRCode(array_merge($ext, $data[self::FIELD_TYPE]))); + } } else { $this->setType(new FHIRCode($data[self::FIELD_TYPE])); } @@ -1006,7 +1036,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getCodeFilter())) { foreach($vs as $v) { if (null === $v) { @@ -1024,6 +1053,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_DATE_FILTER, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getLimit())) { $v->xmlSerialize($sxe->addChild(self::FIELD_LIMIT, null, $v->_getFHIRXMLNamespace())); } @@ -1035,6 +1065,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_MUST_SUPPORT, null, $v->_getFHIRXMLNamespace())); } } + if ([] !== ($vs = $this->getProfile())) { foreach($vs as $v) { if (null === $v) { @@ -1056,7 +1087,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getSubjectCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBJECT_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSubjectReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBJECT_REFERENCE, null, $v->_getFHIRXMLNamespace())); } @@ -1079,8 +1109,15 @@ public function jsonSerialize() $a[self::FIELD_DATE_FILTER] = $vs; } if (null !== ($v = $this->getLimit())) { - $a[self::FIELD_LIMIT] = $v->getValue(); - $a[self::FIELD_LIMIT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_LIMIT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_LIMIT_EXT] = $enc; + } + } else { + $a[self::FIELD_LIMIT] = $v; + } } if ([] !== ($vs = $this->getMustSupport())) { $a[self::FIELD_MUST_SUPPORT] = []; @@ -1088,8 +1125,17 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_MUST_SUPPORT][] = $v->getValue(); - $a[self::FIELD_MUST_SUPPORT_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MUST_SUPPORT][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MUST_SUPPORT_EXT][] = $enc; + } else { + $a[self::FIELD_MUST_SUPPORT_EXT][] = null; + } + } else { + $a[self::FIELD_MUST_SUPPORT][] = $v; + } } } if ([] !== ($vs = $this->getProfile())) { @@ -1098,8 +1144,17 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_PROFILE][] = $v->getValue(); - $a[self::FIELD_PROFILE_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PROFILE][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PROFILE_EXT][] = $enc; + } else { + $a[self::FIELD_PROFILE_EXT][] = null; + } + } else { + $a[self::FIELD_PROFILE][] = $v; + } } } if ([] !== ($vs = $this->getSort())) { @@ -1112,8 +1167,15 @@ public function jsonSerialize() $a[self::FIELD_SUBJECT_REFERENCE] = $v; } if (null !== ($v = $this->getType())) { - $a[self::FIELD_TYPE] = $v->getValue(); - $a[self::FIELD_TYPE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TYPE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TYPE_EXT] = $enc; + } + } else { + $a[self::FIELD_TYPE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRDataRequirement/FHIRDataRequirementCodeFilter.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRDataRequirement/FHIRDataRequirementCodeFilter.php index 64d4f7969b..1a04273a0d 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRDataRequirement/FHIRDataRequirementCodeFilter.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRDataRequirement/FHIRDataRequirementCodeFilter.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -82,10 +82,6 @@ class FHIRDataRequirementCodeFilter extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DATA_REQUIREMENT_DOT_CODE_FILTER; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CODE = 'code'; const FIELD_PATH = 'path'; const FIELD_PATH_EXT = '_path'; @@ -155,6 +151,9 @@ class FHIRDataRequirementCodeFilter extends FHIRElement */ protected $valueSet = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRDataRequirementCodeFilter Constructor * @param null|array $data @@ -174,6 +173,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CODE])) { if (is_array($data[self::FIELD_CODE])) { foreach($data[self::FIELD_CODE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCoding) { $this->addCode($v); } else { @@ -192,8 +194,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PATH] instanceof FHIRString) { $this->setPath($data[self::FIELD_PATH]); - } elseif ($ext && is_scalar($data[self::FIELD_PATH])) { - $this->setPath(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PATH]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PATH])) { + $this->setPath(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PATH]] + $ext)); + } else if (is_array($data[self::FIELD_PATH])) { + $this->setPath(new FHIRString(array_merge($ext, $data[self::FIELD_PATH]))); + } } else { $this->setPath(new FHIRString($data[self::FIELD_PATH])); } @@ -204,8 +210,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SEARCH_PARAM] instanceof FHIRString) { $this->setSearchParam($data[self::FIELD_SEARCH_PARAM]); - } elseif ($ext && is_scalar($data[self::FIELD_SEARCH_PARAM])) { - $this->setSearchParam(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SEARCH_PARAM]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SEARCH_PARAM])) { + $this->setSearchParam(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SEARCH_PARAM]] + $ext)); + } else if (is_array($data[self::FIELD_SEARCH_PARAM])) { + $this->setSearchParam(new FHIRString(array_merge($ext, $data[self::FIELD_SEARCH_PARAM]))); + } } else { $this->setSearchParam(new FHIRString($data[self::FIELD_SEARCH_PARAM])); } @@ -216,8 +226,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_SET] instanceof FHIRCanonical) { $this->setValueSet($data[self::FIELD_VALUE_SET]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_SET])) { - $this->setValueSet(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $data[self::FIELD_VALUE_SET]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_SET])) { + $this->setValueSet(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $data[self::FIELD_VALUE_SET]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_SET])) { + $this->setValueSet(new FHIRCanonical(array_merge($ext, $data[self::FIELD_VALUE_SET]))); + } } else { $this->setValueSet(new FHIRCanonical($data[self::FIELD_VALUE_SET])); } @@ -554,7 +568,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getCode())) { foreach($vs as $v) { if (null === $v) { @@ -563,6 +576,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getPath())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATH, null, $v->_getFHIRXMLNamespace())); } @@ -585,16 +599,37 @@ public function jsonSerialize() $a[self::FIELD_CODE] = $vs; } if (null !== ($v = $this->getPath())) { - $a[self::FIELD_PATH] = $v->getValue(); - $a[self::FIELD_PATH_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PATH] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PATH_EXT] = $enc; + } + } else { + $a[self::FIELD_PATH] = $v; + } } if (null !== ($v = $this->getSearchParam())) { - $a[self::FIELD_SEARCH_PARAM] = $v->getValue(); - $a[self::FIELD_SEARCH_PARAM_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SEARCH_PARAM] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SEARCH_PARAM_EXT] = $enc; + } + } else { + $a[self::FIELD_SEARCH_PARAM] = $v; + } } if (null !== ($v = $this->getValueSet())) { - $a[self::FIELD_VALUE_SET] = $v->getValue(); - $a[self::FIELD_VALUE_SET_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_SET] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_SET_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_SET] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRDataRequirement/FHIRDataRequirementDateFilter.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRDataRequirement/FHIRDataRequirementDateFilter.php index 33f16058d0..5186de2941 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRDataRequirement/FHIRDataRequirementDateFilter.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRDataRequirement/FHIRDataRequirementDateFilter.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -83,10 +83,6 @@ class FHIRDataRequirementDateFilter extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DATA_REQUIREMENT_DOT_DATE_FILTER; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_PATH = 'path'; const FIELD_PATH_EXT = '_path'; const FIELD_SEARCH_PARAM = 'searchParam'; @@ -94,6 +90,7 @@ class FHIRDataRequirementDateFilter extends FHIRElement const FIELD_VALUE_DATE_TIME = 'valueDateTime'; const FIELD_VALUE_DATE_TIME_EXT = '_valueDateTime'; const FIELD_VALUE_DURATION = 'valueDuration'; + const FIELD_VALUE_DURATION_EXT = '_valueDuration'; const FIELD_VALUE_PERIOD = 'valuePeriod'; /** @@ -178,6 +175,9 @@ class FHIRDataRequirementDateFilter extends FHIRElement */ protected $valuePeriod = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRDataRequirementDateFilter Constructor * @param null|array $data @@ -200,8 +200,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PATH] instanceof FHIRString) { $this->setPath($data[self::FIELD_PATH]); - } elseif ($ext && is_scalar($data[self::FIELD_PATH])) { - $this->setPath(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PATH]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PATH])) { + $this->setPath(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PATH]] + $ext)); + } else if (is_array($data[self::FIELD_PATH])) { + $this->setPath(new FHIRString(array_merge($ext, $data[self::FIELD_PATH]))); + } } else { $this->setPath(new FHIRString($data[self::FIELD_PATH])); } @@ -212,8 +216,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SEARCH_PARAM] instanceof FHIRString) { $this->setSearchParam($data[self::FIELD_SEARCH_PARAM]); - } elseif ($ext && is_scalar($data[self::FIELD_SEARCH_PARAM])) { - $this->setSearchParam(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SEARCH_PARAM]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SEARCH_PARAM])) { + $this->setSearchParam(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SEARCH_PARAM]] + $ext)); + } else if (is_array($data[self::FIELD_SEARCH_PARAM])) { + $this->setSearchParam(new FHIRString(array_merge($ext, $data[self::FIELD_SEARCH_PARAM]))); + } } else { $this->setSearchParam(new FHIRString($data[self::FIELD_SEARCH_PARAM])); } @@ -224,15 +232,28 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_DATE_TIME] instanceof FHIRDateTime) { $this->setValueDateTime($data[self::FIELD_VALUE_DATE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_DATE_TIME])) { - $this->setValueDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_VALUE_DATE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_DATE_TIME])) { + $this->setValueDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_VALUE_DATE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_DATE_TIME])) { + $this->setValueDateTime(new FHIRDateTime(array_merge($ext, $data[self::FIELD_VALUE_DATE_TIME]))); + } } else { $this->setValueDateTime(new FHIRDateTime($data[self::FIELD_VALUE_DATE_TIME])); } } if (isset($data[self::FIELD_VALUE_DURATION])) { + $ext = (isset($data[self::FIELD_VALUE_DURATION_EXT]) && is_array($data[self::FIELD_VALUE_DURATION_EXT])) + ? $data[self::FIELD_VALUE_DURATION_EXT] + : null; if ($data[self::FIELD_VALUE_DURATION] instanceof FHIRDuration) { $this->setValueDuration($data[self::FIELD_VALUE_DURATION]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_DURATION])) { + $this->setValueDuration(new FHIRDuration([FHIRDuration::FIELD_VALUE => $data[self::FIELD_VALUE_DURATION]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_DURATION])) { + $this->setValueDuration(new FHIRDuration(array_merge($ext, $data[self::FIELD_VALUE_DURATION]))); + } } else { $this->setValueDuration(new FHIRDuration($data[self::FIELD_VALUE_DURATION])); } @@ -606,11 +627,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getValueDateTime())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_DATE_TIME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueDuration())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_DURATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValuePeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_PERIOD, null, $v->_getFHIRXMLNamespace())); } @@ -624,19 +643,48 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getPath())) { - $a[self::FIELD_PATH] = $v->getValue(); - $a[self::FIELD_PATH_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PATH] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PATH_EXT] = $enc; + } + } else { + $a[self::FIELD_PATH] = $v; + } } if (null !== ($v = $this->getSearchParam())) { - $a[self::FIELD_SEARCH_PARAM] = $v->getValue(); - $a[self::FIELD_SEARCH_PARAM_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SEARCH_PARAM] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SEARCH_PARAM_EXT] = $enc; + } + } else { + $a[self::FIELD_SEARCH_PARAM] = $v; + } } if (null !== ($v = $this->getValueDateTime())) { - $a[self::FIELD_VALUE_DATE_TIME] = $v->getValue(); - $a[self::FIELD_VALUE_DATE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_DATE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_DATE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_DATE_TIME] = $v; + } } if (null !== ($v = $this->getValueDuration())) { - $a[self::FIELD_VALUE_DURATION] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_DURATION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_DURATION_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_DURATION] = $v; + } } if (null !== ($v = $this->getValuePeriod())) { $a[self::FIELD_VALUE_PERIOD] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRDataRequirement/FHIRDataRequirementSort.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRDataRequirement/FHIRDataRequirementSort.php index 784f225a0e..e2e043c512 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRDataRequirement/FHIRDataRequirementSort.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRDataRequirement/FHIRDataRequirementSort.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -81,10 +81,6 @@ class FHIRDataRequirementSort extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DATA_REQUIREMENT_DOT_SORT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DIRECTION = 'direction'; const FIELD_DIRECTION_EXT = '_direction'; const FIELD_PATH = 'path'; @@ -114,6 +110,9 @@ class FHIRDataRequirementSort extends FHIRElement */ protected $path = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRDataRequirementSort Constructor * @param null|array $data @@ -136,8 +135,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DIRECTION] instanceof FHIRSortDirection) { $this->setDirection($data[self::FIELD_DIRECTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DIRECTION])) { - $this->setDirection(new FHIRSortDirection([FHIRSortDirection::FIELD_VALUE => $data[self::FIELD_DIRECTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DIRECTION])) { + $this->setDirection(new FHIRSortDirection([FHIRSortDirection::FIELD_VALUE => $data[self::FIELD_DIRECTION]] + $ext)); + } else if (is_array($data[self::FIELD_DIRECTION])) { + $this->setDirection(new FHIRSortDirection(array_merge($ext, $data[self::FIELD_DIRECTION]))); + } } else { $this->setDirection(new FHIRSortDirection($data[self::FIELD_DIRECTION])); } @@ -148,8 +151,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PATH] instanceof FHIRString) { $this->setPath($data[self::FIELD_PATH]); - } elseif ($ext && is_scalar($data[self::FIELD_PATH])) { - $this->setPath(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PATH]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PATH])) { + $this->setPath(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PATH]] + $ext)); + } else if (is_array($data[self::FIELD_PATH])) { + $this->setPath(new FHIRString(array_merge($ext, $data[self::FIELD_PATH]))); + } } else { $this->setPath(new FHIRString($data[self::FIELD_PATH])); } @@ -336,7 +343,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getDirection())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DIRECTION, null, $v->_getFHIRXMLNamespace())); } @@ -353,11 +359,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getDirection())) { - $a[self::FIELD_DIRECTION] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DIRECTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DIRECTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DIRECTION] = $v; + } } if (null !== ($v = $this->getPath())) { - $a[self::FIELD_PATH] = $v->getValue(); - $a[self::FIELD_PATH_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PATH] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PATH_EXT] = $enc; + } + } else { + $a[self::FIELD_PATH] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRDate.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRDate.php index 4a8e874ce3..5a9595c1bc 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRDate.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRDate.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRDate extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DATE; - - /** @var string */ - protected $_xmlns = ''; - const FIELD_VALUE = 'value'; /** @@ -91,6 +87,8 @@ class FHIRDate extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; /** * FHIRDate Constructor @@ -248,8 +246,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRDateTime.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRDateTime.php index 148379c599..e8b8647614 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRDateTime.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRDateTime.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -82,10 +82,6 @@ class FHIRDateTime extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DATE_TIME; - - /** @var string */ - protected $_xmlns = ''; - const FIELD_VALUE = 'value'; /** @@ -93,6 +89,8 @@ class FHIRDateTime extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; /** * FHIRDateTime Constructor @@ -250,8 +248,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRDaysOfWeek.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRDaysOfWeek.php index 6f71eb5672..20d297a952 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRDaysOfWeek.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRDaysOfWeek.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRDaysOfWeek extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DAYS_OF_WEEK; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRDaysOfWeek extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRDaysOfWeek Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRDecimal.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRDecimal.php index ab4b93cc23..457946eefe 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRDecimal.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRDecimal.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRDecimal extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DECIMAL; - - /** @var string */ - protected $_xmlns = ''; - const FIELD_VALUE = 'value'; /** @@ -91,6 +87,8 @@ class FHIRDecimal extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; /** * FHIRDecimal Constructor @@ -248,8 +246,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRDetectedIssueSeverity.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRDetectedIssueSeverity.php index fcab78faef..8d5b14e271 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRDetectedIssueSeverity.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRDetectedIssueSeverity.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRDetectedIssueSeverity extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DETECTED_ISSUE_SEVERITY; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRDetectedIssueSeverity extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRDetectedIssueSeverity Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRDeviceMetricCalibrationState.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRDeviceMetricCalibrationState.php index 065a9a3115..7b7c0f2b49 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRDeviceMetricCalibrationState.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRDeviceMetricCalibrationState.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRDeviceMetricCalibrationState extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DEVICE_METRIC_CALIBRATION_STATE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRDeviceMetricCalibrationState extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRDeviceMetricCalibrationState Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRDeviceMetricCalibrationType.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRDeviceMetricCalibrationType.php index 3f3cc73ae3..6f4fc408c9 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRDeviceMetricCalibrationType.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRDeviceMetricCalibrationType.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRDeviceMetricCalibrationType extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DEVICE_METRIC_CALIBRATION_TYPE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRDeviceMetricCalibrationType extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRDeviceMetricCalibrationType Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRDeviceMetricCategory.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRDeviceMetricCategory.php index e02dc5dab5..2ce12e6c7d 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRDeviceMetricCategory.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRDeviceMetricCategory.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRDeviceMetricCategory extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DEVICE_METRIC_CATEGORY; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRDeviceMetricCategory extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRDeviceMetricCategory Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRDeviceMetricColor.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRDeviceMetricColor.php index 3d83ef8f04..643d1ec38f 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRDeviceMetricColor.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRDeviceMetricColor.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRDeviceMetricColor extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DEVICE_METRIC_COLOR; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRDeviceMetricColor extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRDeviceMetricColor Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRDeviceMetricOperationalStatus.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRDeviceMetricOperationalStatus.php index 4513d11679..bdaa598936 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRDeviceMetricOperationalStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRDeviceMetricOperationalStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRDeviceMetricOperationalStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DEVICE_METRIC_OPERATIONAL_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRDeviceMetricOperationalStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRDeviceMetricOperationalStatus Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRDeviceNameType.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRDeviceNameType.php index eb3f39570d..a608e6e655 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRDeviceNameType.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRDeviceNameType.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRDeviceNameType extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DEVICE_NAME_TYPE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRDeviceNameType extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRDeviceNameType Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRDeviceUseStatementStatus.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRDeviceUseStatementStatus.php index ed82aa9e7c..632708d93e 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRDeviceUseStatementStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRDeviceUseStatementStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRDeviceUseStatementStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DEVICE_USE_STATEMENT_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRDeviceUseStatementStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRDeviceUseStatementStatus Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRDiagnosticReportStatus.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRDiagnosticReportStatus.php index 669f94091d..c6b05b8b1e 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRDiagnosticReportStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRDiagnosticReportStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRDiagnosticReportStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DIAGNOSTIC_REPORT_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRDiagnosticReportStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRDiagnosticReportStatus Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRDiscriminatorType.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRDiscriminatorType.php index d5b1d0d434..15977be967 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRDiscriminatorType.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRDiscriminatorType.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRDiscriminatorType extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DISCRIMINATOR_TYPE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRDiscriminatorType extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRDiscriminatorType Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRDocumentMode.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRDocumentMode.php index cab9cd1405..54022501b0 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRDocumentMode.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRDocumentMode.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRDocumentMode extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DOCUMENT_MODE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRDocumentMode extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRDocumentMode Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRDocumentReferenceStatus.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRDocumentReferenceStatus.php index ca832837c1..3245af6bc8 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRDocumentReferenceStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRDocumentReferenceStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -77,10 +77,6 @@ class FHIRDocumentReferenceStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DOCUMENT_REFERENCE_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -88,6 +84,9 @@ class FHIRDocumentReferenceStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRDocumentReferenceStatus Constructor * @param null|array $data @@ -243,8 +242,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRDocumentRelationshipType.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRDocumentRelationshipType.php index ffe3042741..781e54b49a 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRDocumentRelationshipType.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRDocumentRelationshipType.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRDocumentRelationshipType extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DOCUMENT_RELATIONSHIP_TYPE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRDocumentRelationshipType extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRDocumentRelationshipType Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIREligibilityRequestPurpose.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIREligibilityRequestPurpose.php index 63e0a113a8..d8898d54ef 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIREligibilityRequestPurpose.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIREligibilityRequestPurpose.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIREligibilityRequestPurpose extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ELIGIBILITY_REQUEST_PURPOSE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIREligibilityRequestPurpose extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIREligibilityRequestPurpose Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIREligibilityResponsePurpose.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIREligibilityResponsePurpose.php index 5329b4752b..cb62347f64 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIREligibilityResponsePurpose.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIREligibilityResponsePurpose.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIREligibilityResponsePurpose extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ELIGIBILITY_RESPONSE_PURPOSE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIREligibilityResponsePurpose extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIREligibilityResponsePurpose Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIREnableWhenBehavior.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIREnableWhenBehavior.php index c72fa6c2da..2068d82e7e 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIREnableWhenBehavior.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIREnableWhenBehavior.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIREnableWhenBehavior extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ENABLE_WHEN_BEHAVIOR; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -90,6 +86,9 @@ class FHIREnableWhenBehavior extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIREnableWhenBehavior Constructor * @param null|array $data @@ -245,8 +244,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIREncounterLocationStatus.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIREncounterLocationStatus.php index 7276f36a64..b1b37455bc 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIREncounterLocationStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIREncounterLocationStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIREncounterLocationStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ENCOUNTER_LOCATION_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIREncounterLocationStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIREncounterLocationStatus Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIREncounterStatus.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIREncounterStatus.php index aaa3629253..56d868f517 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIREncounterStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIREncounterStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIREncounterStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ENCOUNTER_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIREncounterStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIREncounterStatus Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIREndpointStatus.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIREndpointStatus.php index d2d0783e0e..3a020961ef 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIREndpointStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIREndpointStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIREndpointStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ENDPOINT_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIREndpointStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIREndpointStatus Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIREpisodeOfCareStatus.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIREpisodeOfCareStatus.php index bd9838c6f9..0ac9b92a49 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIREpisodeOfCareStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIREpisodeOfCareStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIREpisodeOfCareStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_EPISODE_OF_CARE_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIREpisodeOfCareStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIREpisodeOfCareStatus Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIREventCapabilityMode.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIREventCapabilityMode.php index 1b7484f9fe..e5dd4e203e 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIREventCapabilityMode.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIREventCapabilityMode.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIREventCapabilityMode extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_EVENT_CAPABILITY_MODE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIREventCapabilityMode extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIREventCapabilityMode Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIREventStatus.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIREventStatus.php index 2bd5b72fc6..db96125aae 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIREventStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIREventStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIREventStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_EVENT_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIREventStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIREventStatus Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIREventTiming.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIREventTiming.php index e2551a6578..1618c51bfa 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIREventTiming.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIREventTiming.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIREventTiming extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_EVENT_TIMING; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIREventTiming extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIREventTiming Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIREvidenceVariableType.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIREvidenceVariableType.php index 6d8336c9d6..d058df09b5 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIREvidenceVariableType.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIREvidenceVariableType.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIREvidenceVariableType extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_EVIDENCE_VARIABLE_TYPE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -90,6 +86,9 @@ class FHIREvidenceVariableType extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIREvidenceVariableType Constructor * @param null|array $data @@ -245,8 +244,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRExampleScenarioActorType.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRExampleScenarioActorType.php index b954a3bbda..485bf380d2 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRExampleScenarioActorType.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRExampleScenarioActorType.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRExampleScenarioActorType extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_EXAMPLE_SCENARIO_ACTOR_TYPE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRExampleScenarioActorType extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRExampleScenarioActorType Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRExplanationOfBenefitStatus.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRExplanationOfBenefitStatus.php index f994ec8800..fcc954dda8 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRExplanationOfBenefitStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRExplanationOfBenefitStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRExplanationOfBenefitStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_EXPLANATION_OF_BENEFIT_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRExplanationOfBenefitStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRExplanationOfBenefitStatus Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRExposureState.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRExposureState.php index 12573d8aa0..57bd6f6864 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRExposureState.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRExposureState.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRExposureState extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_EXPOSURE_STATE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -90,6 +86,9 @@ class FHIRExposureState extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRExposureState Constructor * @param null|array $data @@ -245,8 +244,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRExpression.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRExpression.php index 5369655dd6..eceee5c12a 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRExpression.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRExpression.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRExpression extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_EXPRESSION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DESCRIPTION = 'description'; const FIELD_DESCRIPTION_EXT = '_description'; const FIELD_EXPRESSION = 'expression'; @@ -154,6 +150,9 @@ class FHIRExpression extends FHIRElement */ protected $reference = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRExpression Constructor * @param null|array $data @@ -176,8 +175,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -188,8 +191,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EXPRESSION] instanceof FHIRString) { $this->setExpression($data[self::FIELD_EXPRESSION]); - } elseif ($ext && is_scalar($data[self::FIELD_EXPRESSION])) { - $this->setExpression(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_EXPRESSION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EXPRESSION])) { + $this->setExpression(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_EXPRESSION]] + $ext)); + } else if (is_array($data[self::FIELD_EXPRESSION])) { + $this->setExpression(new FHIRString(array_merge($ext, $data[self::FIELD_EXPRESSION]))); + } } else { $this->setExpression(new FHIRString($data[self::FIELD_EXPRESSION])); } @@ -200,8 +207,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_LANGUAGE] instanceof FHIRExpressionLanguage) { $this->setLanguage($data[self::FIELD_LANGUAGE]); - } elseif ($ext && is_scalar($data[self::FIELD_LANGUAGE])) { - $this->setLanguage(new FHIRExpressionLanguage([FHIRExpressionLanguage::FIELD_VALUE => $data[self::FIELD_LANGUAGE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_LANGUAGE])) { + $this->setLanguage(new FHIRExpressionLanguage([FHIRExpressionLanguage::FIELD_VALUE => $data[self::FIELD_LANGUAGE]] + $ext)); + } else if (is_array($data[self::FIELD_LANGUAGE])) { + $this->setLanguage(new FHIRExpressionLanguage(array_merge($ext, $data[self::FIELD_LANGUAGE]))); + } } else { $this->setLanguage(new FHIRExpressionLanguage($data[self::FIELD_LANGUAGE])); } @@ -212,8 +223,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRId) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRId(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRId($data[self::FIELD_NAME])); } @@ -224,8 +239,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_REFERENCE] instanceof FHIRUri) { $this->setReference($data[self::FIELD_REFERENCE]); - } elseif ($ext && is_scalar($data[self::FIELD_REFERENCE])) { - $this->setReference(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_REFERENCE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_REFERENCE])) { + $this->setReference(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_REFERENCE]] + $ext)); + } else if (is_array($data[self::FIELD_REFERENCE])) { + $this->setReference(new FHIRUri(array_merge($ext, $data[self::FIELD_REFERENCE]))); + } } else { $this->setReference(new FHIRUri($data[self::FIELD_REFERENCE])); } @@ -554,7 +573,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getExpression())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EXPRESSION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getLanguage())) { $v->xmlSerialize($sxe->addChild(self::FIELD_LANGUAGE, null, $v->_getFHIRXMLNamespace())); } @@ -574,23 +592,59 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if (null !== ($v = $this->getExpression())) { - $a[self::FIELD_EXPRESSION] = $v->getValue(); - $a[self::FIELD_EXPRESSION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EXPRESSION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EXPRESSION_EXT] = $enc; + } + } else { + $a[self::FIELD_EXPRESSION] = $v; + } } if (null !== ($v = $this->getLanguage())) { - $a[self::FIELD_LANGUAGE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_LANGUAGE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_LANGUAGE_EXT] = $enc; + } + } else { + $a[self::FIELD_LANGUAGE] = $v; + } } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if (null !== ($v = $this->getReference())) { - $a[self::FIELD_REFERENCE] = $v->getValue(); - $a[self::FIELD_REFERENCE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_REFERENCE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_REFERENCE_EXT] = $enc; + } + } else { + $a[self::FIELD_REFERENCE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRExpressionLanguage.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRExpressionLanguage.php index 1c72874149..8efbd703da 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRExpressionLanguage.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRExpressionLanguage.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRExpressionLanguage extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_EXPRESSION_LANGUAGE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRExpressionLanguage extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRExpressionLanguage Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRExtension.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRExtension.php index fc7851cb21..662a6dc4ad 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRExtension.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRExtension.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -85,13 +85,10 @@ class FHIRExtension extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_EXTENSION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_URL = 'url'; const FIELD_VALUE_ADDRESS = 'valueAddress'; const FIELD_VALUE_AGE = 'valueAge'; + const FIELD_VALUE_AGE_EXT = '_valueAge'; const FIELD_VALUE_ANNOTATION = 'valueAnnotation'; const FIELD_VALUE_ATTACHMENT = 'valueAttachment'; const FIELD_VALUE_BASE_64BINARY = 'valueBase64Binary'; @@ -109,6 +106,7 @@ class FHIRExtension extends FHIRElement const FIELD_VALUE_CONTACT_POINT_EXT = '_valueContactPoint'; const FIELD_VALUE_CONTRIBUTOR = 'valueContributor'; const FIELD_VALUE_COUNT = 'valueCount'; + const FIELD_VALUE_COUNT_EXT = '_valueCount'; const FIELD_VALUE_DATA_REQUIREMENT = 'valueDataRequirement'; const FIELD_VALUE_DATE = 'valueDate'; const FIELD_VALUE_DATE_EXT = '_valueDate'; @@ -117,8 +115,10 @@ class FHIRExtension extends FHIRElement const FIELD_VALUE_DECIMAL = 'valueDecimal'; const FIELD_VALUE_DECIMAL_EXT = '_valueDecimal'; const FIELD_VALUE_DISTANCE = 'valueDistance'; + const FIELD_VALUE_DISTANCE_EXT = '_valueDistance'; const FIELD_VALUE_DOSAGE = 'valueDosage'; const FIELD_VALUE_DURATION = 'valueDuration'; + const FIELD_VALUE_DURATION_EXT = '_valueDuration'; const FIELD_VALUE_EXPRESSION = 'valueExpression'; const FIELD_VALUE_HUMAN_NAME = 'valueHumanName'; const FIELD_VALUE_ID = 'valueId'; @@ -871,6 +871,9 @@ class FHIRExtension extends FHIRElement */ protected $valueUuid = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRExtension Constructor * @param null|array $data @@ -898,8 +901,17 @@ public function __construct($data = null) } } if (isset($data[self::FIELD_VALUE_AGE])) { + $ext = (isset($data[self::FIELD_VALUE_AGE_EXT]) && is_array($data[self::FIELD_VALUE_AGE_EXT])) + ? $data[self::FIELD_VALUE_AGE_EXT] + : null; if ($data[self::FIELD_VALUE_AGE] instanceof FHIRAge) { $this->setValueAge($data[self::FIELD_VALUE_AGE]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_AGE])) { + $this->setValueAge(new FHIRAge([FHIRAge::FIELD_VALUE => $data[self::FIELD_VALUE_AGE]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_AGE])) { + $this->setValueAge(new FHIRAge(array_merge($ext, $data[self::FIELD_VALUE_AGE]))); + } } else { $this->setValueAge(new FHIRAge($data[self::FIELD_VALUE_AGE])); } @@ -924,8 +936,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_BASE_64BINARY] instanceof FHIRBase64Binary) { $this->setValueBase64Binary($data[self::FIELD_VALUE_BASE_64BINARY]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_BASE_64BINARY])) { - $this->setValueBase64Binary(new FHIRBase64Binary([FHIRBase64Binary::FIELD_VALUE => $data[self::FIELD_VALUE_BASE_64BINARY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_BASE_64BINARY])) { + $this->setValueBase64Binary(new FHIRBase64Binary([FHIRBase64Binary::FIELD_VALUE => $data[self::FIELD_VALUE_BASE_64BINARY]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_BASE_64BINARY])) { + $this->setValueBase64Binary(new FHIRBase64Binary(array_merge($ext, $data[self::FIELD_VALUE_BASE_64BINARY]))); + } } else { $this->setValueBase64Binary(new FHIRBase64Binary($data[self::FIELD_VALUE_BASE_64BINARY])); } @@ -936,8 +952,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_BOOLEAN] instanceof FHIRBoolean) { $this->setValueBoolean($data[self::FIELD_VALUE_BOOLEAN]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_BOOLEAN])) { - $this->setValueBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_VALUE_BOOLEAN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_BOOLEAN])) { + $this->setValueBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_VALUE_BOOLEAN]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_BOOLEAN])) { + $this->setValueBoolean(new FHIRBoolean(array_merge($ext, $data[self::FIELD_VALUE_BOOLEAN]))); + } } else { $this->setValueBoolean(new FHIRBoolean($data[self::FIELD_VALUE_BOOLEAN])); } @@ -948,8 +968,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_CANONICAL] instanceof FHIRCanonical) { $this->setValueCanonical($data[self::FIELD_VALUE_CANONICAL]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_CANONICAL])) { - $this->setValueCanonical(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $data[self::FIELD_VALUE_CANONICAL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_CANONICAL])) { + $this->setValueCanonical(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $data[self::FIELD_VALUE_CANONICAL]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_CANONICAL])) { + $this->setValueCanonical(new FHIRCanonical(array_merge($ext, $data[self::FIELD_VALUE_CANONICAL]))); + } } else { $this->setValueCanonical(new FHIRCanonical($data[self::FIELD_VALUE_CANONICAL])); } @@ -960,8 +984,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_CODE] instanceof FHIRCode) { $this->setValueCode($data[self::FIELD_VALUE_CODE]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_CODE])) { - $this->setValueCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_VALUE_CODE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_CODE])) { + $this->setValueCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_VALUE_CODE]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_CODE])) { + $this->setValueCode(new FHIRCode(array_merge($ext, $data[self::FIELD_VALUE_CODE]))); + } } else { $this->setValueCode(new FHIRCode($data[self::FIELD_VALUE_CODE])); } @@ -993,8 +1021,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_CONTACT_POINT] instanceof FHIRContactPoint) { $this->setValueContactPoint($data[self::FIELD_VALUE_CONTACT_POINT]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_CONTACT_POINT])) { - $this->setValueContactPoint(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $data[self::FIELD_VALUE_CONTACT_POINT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_CONTACT_POINT])) { + $this->setValueContactPoint(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $data[self::FIELD_VALUE_CONTACT_POINT]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_CONTACT_POINT])) { + $this->setValueContactPoint(new FHIRContactPoint(array_merge($ext, $data[self::FIELD_VALUE_CONTACT_POINT]))); + } } else { $this->setValueContactPoint(new FHIRContactPoint($data[self::FIELD_VALUE_CONTACT_POINT])); } @@ -1007,8 +1039,17 @@ public function __construct($data = null) } } if (isset($data[self::FIELD_VALUE_COUNT])) { + $ext = (isset($data[self::FIELD_VALUE_COUNT_EXT]) && is_array($data[self::FIELD_VALUE_COUNT_EXT])) + ? $data[self::FIELD_VALUE_COUNT_EXT] + : null; if ($data[self::FIELD_VALUE_COUNT] instanceof FHIRCount) { $this->setValueCount($data[self::FIELD_VALUE_COUNT]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_COUNT])) { + $this->setValueCount(new FHIRCount([FHIRCount::FIELD_VALUE => $data[self::FIELD_VALUE_COUNT]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_COUNT])) { + $this->setValueCount(new FHIRCount(array_merge($ext, $data[self::FIELD_VALUE_COUNT]))); + } } else { $this->setValueCount(new FHIRCount($data[self::FIELD_VALUE_COUNT])); } @@ -1026,8 +1067,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_DATE] instanceof FHIRDate) { $this->setValueDate($data[self::FIELD_VALUE_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_DATE])) { - $this->setValueDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_VALUE_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_DATE])) { + $this->setValueDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_VALUE_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_DATE])) { + $this->setValueDate(new FHIRDate(array_merge($ext, $data[self::FIELD_VALUE_DATE]))); + } } else { $this->setValueDate(new FHIRDate($data[self::FIELD_VALUE_DATE])); } @@ -1038,8 +1083,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_DATE_TIME] instanceof FHIRDateTime) { $this->setValueDateTime($data[self::FIELD_VALUE_DATE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_DATE_TIME])) { - $this->setValueDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_VALUE_DATE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_DATE_TIME])) { + $this->setValueDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_VALUE_DATE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_DATE_TIME])) { + $this->setValueDateTime(new FHIRDateTime(array_merge($ext, $data[self::FIELD_VALUE_DATE_TIME]))); + } } else { $this->setValueDateTime(new FHIRDateTime($data[self::FIELD_VALUE_DATE_TIME])); } @@ -1050,15 +1099,28 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_DECIMAL] instanceof FHIRDecimal) { $this->setValueDecimal($data[self::FIELD_VALUE_DECIMAL]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_DECIMAL])) { - $this->setValueDecimal(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_VALUE_DECIMAL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_DECIMAL])) { + $this->setValueDecimal(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_VALUE_DECIMAL]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_DECIMAL])) { + $this->setValueDecimal(new FHIRDecimal(array_merge($ext, $data[self::FIELD_VALUE_DECIMAL]))); + } } else { $this->setValueDecimal(new FHIRDecimal($data[self::FIELD_VALUE_DECIMAL])); } } if (isset($data[self::FIELD_VALUE_DISTANCE])) { + $ext = (isset($data[self::FIELD_VALUE_DISTANCE_EXT]) && is_array($data[self::FIELD_VALUE_DISTANCE_EXT])) + ? $data[self::FIELD_VALUE_DISTANCE_EXT] + : null; if ($data[self::FIELD_VALUE_DISTANCE] instanceof FHIRDistance) { $this->setValueDistance($data[self::FIELD_VALUE_DISTANCE]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_DISTANCE])) { + $this->setValueDistance(new FHIRDistance([FHIRDistance::FIELD_VALUE => $data[self::FIELD_VALUE_DISTANCE]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_DISTANCE])) { + $this->setValueDistance(new FHIRDistance(array_merge($ext, $data[self::FIELD_VALUE_DISTANCE]))); + } } else { $this->setValueDistance(new FHIRDistance($data[self::FIELD_VALUE_DISTANCE])); } @@ -1071,8 +1133,17 @@ public function __construct($data = null) } } if (isset($data[self::FIELD_VALUE_DURATION])) { + $ext = (isset($data[self::FIELD_VALUE_DURATION_EXT]) && is_array($data[self::FIELD_VALUE_DURATION_EXT])) + ? $data[self::FIELD_VALUE_DURATION_EXT] + : null; if ($data[self::FIELD_VALUE_DURATION] instanceof FHIRDuration) { $this->setValueDuration($data[self::FIELD_VALUE_DURATION]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_DURATION])) { + $this->setValueDuration(new FHIRDuration([FHIRDuration::FIELD_VALUE => $data[self::FIELD_VALUE_DURATION]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_DURATION])) { + $this->setValueDuration(new FHIRDuration(array_merge($ext, $data[self::FIELD_VALUE_DURATION]))); + } } else { $this->setValueDuration(new FHIRDuration($data[self::FIELD_VALUE_DURATION])); } @@ -1097,8 +1168,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_ID] instanceof FHIRId) { $this->setValueId($data[self::FIELD_VALUE_ID]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_ID])) { - $this->setValueId(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_VALUE_ID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_ID])) { + $this->setValueId(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_VALUE_ID]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_ID])) { + $this->setValueId(new FHIRId(array_merge($ext, $data[self::FIELD_VALUE_ID]))); + } } else { $this->setValueId(new FHIRId($data[self::FIELD_VALUE_ID])); } @@ -1109,8 +1184,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_IDENTIFIER] instanceof FHIRIdentifier) { $this->setValueIdentifier($data[self::FIELD_VALUE_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_IDENTIFIER])) { - $this->setValueIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_VALUE_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_IDENTIFIER])) { + $this->setValueIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_VALUE_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_IDENTIFIER])) { + $this->setValueIdentifier(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_VALUE_IDENTIFIER]))); + } } else { $this->setValueIdentifier(new FHIRIdentifier($data[self::FIELD_VALUE_IDENTIFIER])); } @@ -1121,8 +1200,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_INSTANT] instanceof FHIRInstant) { $this->setValueInstant($data[self::FIELD_VALUE_INSTANT]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_INSTANT])) { - $this->setValueInstant(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_VALUE_INSTANT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_INSTANT])) { + $this->setValueInstant(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_VALUE_INSTANT]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_INSTANT])) { + $this->setValueInstant(new FHIRInstant(array_merge($ext, $data[self::FIELD_VALUE_INSTANT]))); + } } else { $this->setValueInstant(new FHIRInstant($data[self::FIELD_VALUE_INSTANT])); } @@ -1133,8 +1216,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_INTEGER] instanceof FHIRInteger) { $this->setValueInteger($data[self::FIELD_VALUE_INTEGER]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_INTEGER])) { - $this->setValueInteger(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_VALUE_INTEGER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_INTEGER])) { + $this->setValueInteger(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_VALUE_INTEGER]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_INTEGER])) { + $this->setValueInteger(new FHIRInteger(array_merge($ext, $data[self::FIELD_VALUE_INTEGER]))); + } } else { $this->setValueInteger(new FHIRInteger($data[self::FIELD_VALUE_INTEGER])); } @@ -1145,8 +1232,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_MARKDOWN] instanceof FHIRMarkdown) { $this->setValueMarkdown($data[self::FIELD_VALUE_MARKDOWN]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_MARKDOWN])) { - $this->setValueMarkdown(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_VALUE_MARKDOWN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_MARKDOWN])) { + $this->setValueMarkdown(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_VALUE_MARKDOWN]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_MARKDOWN])) { + $this->setValueMarkdown(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_VALUE_MARKDOWN]))); + } } else { $this->setValueMarkdown(new FHIRMarkdown($data[self::FIELD_VALUE_MARKDOWN])); } @@ -1164,8 +1255,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_MONEY] instanceof FHIRMoney) { $this->setValueMoney($data[self::FIELD_VALUE_MONEY]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_MONEY])) { - $this->setValueMoney(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_VALUE_MONEY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_MONEY])) { + $this->setValueMoney(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_VALUE_MONEY]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_MONEY])) { + $this->setValueMoney(new FHIRMoney(array_merge($ext, $data[self::FIELD_VALUE_MONEY]))); + } } else { $this->setValueMoney(new FHIRMoney($data[self::FIELD_VALUE_MONEY])); } @@ -1176,8 +1271,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_OID] instanceof FHIROid) { $this->setValueOid($data[self::FIELD_VALUE_OID]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_OID])) { - $this->setValueOid(new FHIROid([FHIROid::FIELD_VALUE => $data[self::FIELD_VALUE_OID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_OID])) { + $this->setValueOid(new FHIROid([FHIROid::FIELD_VALUE => $data[self::FIELD_VALUE_OID]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_OID])) { + $this->setValueOid(new FHIROid(array_merge($ext, $data[self::FIELD_VALUE_OID]))); + } } else { $this->setValueOid(new FHIROid($data[self::FIELD_VALUE_OID])); } @@ -1202,8 +1301,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_POSITIVE_INT] instanceof FHIRPositiveInt) { $this->setValuePositiveInt($data[self::FIELD_VALUE_POSITIVE_INT]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_POSITIVE_INT])) { - $this->setValuePositiveInt(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_VALUE_POSITIVE_INT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_POSITIVE_INT])) { + $this->setValuePositiveInt(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_VALUE_POSITIVE_INT]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_POSITIVE_INT])) { + $this->setValuePositiveInt(new FHIRPositiveInt(array_merge($ext, $data[self::FIELD_VALUE_POSITIVE_INT]))); + } } else { $this->setValuePositiveInt(new FHIRPositiveInt($data[self::FIELD_VALUE_POSITIVE_INT])); } @@ -1214,8 +1317,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_QUANTITY] instanceof FHIRQuantity) { $this->setValueQuantity($data[self::FIELD_VALUE_QUANTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_QUANTITY])) { - $this->setValueQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_VALUE_QUANTITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_QUANTITY])) { + $this->setValueQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_VALUE_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_QUANTITY])) { + $this->setValueQuantity(new FHIRQuantity(array_merge($ext, $data[self::FIELD_VALUE_QUANTITY]))); + } } else { $this->setValueQuantity(new FHIRQuantity($data[self::FIELD_VALUE_QUANTITY])); } @@ -1268,8 +1375,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_STRING] instanceof FHIRString) { $this->setValueString($data[self::FIELD_VALUE_STRING]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_STRING])) { - $this->setValueString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VALUE_STRING]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_STRING])) { + $this->setValueString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VALUE_STRING]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_STRING])) { + $this->setValueString(new FHIRString(array_merge($ext, $data[self::FIELD_VALUE_STRING]))); + } } else { $this->setValueString(new FHIRString($data[self::FIELD_VALUE_STRING])); } @@ -1280,8 +1391,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_TIME] instanceof FHIRTime) { $this->setValueTime($data[self::FIELD_VALUE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_TIME])) { - $this->setValueTime(new FHIRTime([FHIRTime::FIELD_VALUE => $data[self::FIELD_VALUE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_TIME])) { + $this->setValueTime(new FHIRTime([FHIRTime::FIELD_VALUE => $data[self::FIELD_VALUE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_TIME])) { + $this->setValueTime(new FHIRTime(array_merge($ext, $data[self::FIELD_VALUE_TIME]))); + } } else { $this->setValueTime(new FHIRTime($data[self::FIELD_VALUE_TIME])); } @@ -1306,8 +1421,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_UNSIGNED_INT] instanceof FHIRUnsignedInt) { $this->setValueUnsignedInt($data[self::FIELD_VALUE_UNSIGNED_INT]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_UNSIGNED_INT])) { - $this->setValueUnsignedInt(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_VALUE_UNSIGNED_INT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_UNSIGNED_INT])) { + $this->setValueUnsignedInt(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_VALUE_UNSIGNED_INT]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_UNSIGNED_INT])) { + $this->setValueUnsignedInt(new FHIRUnsignedInt(array_merge($ext, $data[self::FIELD_VALUE_UNSIGNED_INT]))); + } } else { $this->setValueUnsignedInt(new FHIRUnsignedInt($data[self::FIELD_VALUE_UNSIGNED_INT])); } @@ -1318,8 +1437,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_URI] instanceof FHIRUri) { $this->setValueUri($data[self::FIELD_VALUE_URI]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_URI])) { - $this->setValueUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_VALUE_URI]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_URI])) { + $this->setValueUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_VALUE_URI]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_URI])) { + $this->setValueUri(new FHIRUri(array_merge($ext, $data[self::FIELD_VALUE_URI]))); + } } else { $this->setValueUri(new FHIRUri($data[self::FIELD_VALUE_URI])); } @@ -1330,8 +1453,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_URL] instanceof FHIRUrl) { $this->setValueUrl($data[self::FIELD_VALUE_URL]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_URL])) { - $this->setValueUrl(new FHIRUrl([FHIRUrl::FIELD_VALUE => $data[self::FIELD_VALUE_URL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_URL])) { + $this->setValueUrl(new FHIRUrl([FHIRUrl::FIELD_VALUE => $data[self::FIELD_VALUE_URL]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_URL])) { + $this->setValueUrl(new FHIRUrl(array_merge($ext, $data[self::FIELD_VALUE_URL]))); + } } else { $this->setValueUrl(new FHIRUrl($data[self::FIELD_VALUE_URL])); } @@ -1349,8 +1476,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_UUID] instanceof FHIRUuid) { $this->setValueUuid($data[self::FIELD_VALUE_UUID]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_UUID])) { - $this->setValueUuid(new FHIRUuid([FHIRUuid::FIELD_VALUE => $data[self::FIELD_VALUE_UUID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_UUID])) { + $this->setValueUuid(new FHIRUuid([FHIRUuid::FIELD_VALUE => $data[self::FIELD_VALUE_UUID]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_UUID])) { + $this->setValueUuid(new FHIRUuid(array_merge($ext, $data[self::FIELD_VALUE_UUID]))); + } } else { $this->setValueUuid(new FHIRUuid($data[self::FIELD_VALUE_UUID])); } @@ -3650,23 +3781,18 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getUrl())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getUrl())) { $sxe->addAttribute(self::FIELD_URL, (string)$v); } - if (null !== ($v = $this->getValueAddress())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_ADDRESS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueAge())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_AGE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueAnnotation())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_ANNOTATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueAttachment())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_ATTACHMENT, null, $v->_getFHIRXMLNamespace())); } @@ -3682,31 +3808,24 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getValueCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_CODE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueCoding())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_CODING, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueContactDetail())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_CONTACT_DETAIL, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueContactPoint())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_CONTACT_POINT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueContributor())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_CONTRIBUTOR, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueCount())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_COUNT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueDataRequirement())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_DATA_REQUIREMENT, null, $v->_getFHIRXMLNamespace())); } @@ -3719,30 +3838,24 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getValueDecimal())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_DECIMAL, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueDistance())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_DISTANCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueDosage())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_DOSAGE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueDuration())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_DURATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueExpression())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_EXPRESSION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueHumanName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_HUMAN_NAME, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getValueId())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_ID, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } @@ -3755,53 +3868,42 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getValueMarkdown())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_MARKDOWN, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueMeta())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_META, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueMoney())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_MONEY, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getValueOid())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_OID, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueParameterDefinition())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_PARAMETER_DEFINITION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValuePeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_PERIOD, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getValuePositiveInt())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_POSITIVE_INT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_QUANTITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueRange())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_RANGE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueRatio())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_RATIO, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_REFERENCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueRelatedArtifact())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_RELATED_ARTIFACT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueSampledData())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_SAMPLED_DATA, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueSignature())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_SIGNATURE, null, $v->_getFHIRXMLNamespace())); } @@ -3811,11 +3913,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getValueTime())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_TIME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueTiming())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_TIMING, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueTriggerDefinition())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_TRIGGER_DEFINITION, null, $v->_getFHIRXMLNamespace())); } @@ -3828,7 +3928,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getValueUrl())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_URL, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueUsageContext())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_USAGE_CONTEXT, null, $v->_getFHIRXMLNamespace())); } @@ -3851,7 +3950,15 @@ public function jsonSerialize() $a[self::FIELD_VALUE_ADDRESS] = $v; } if (null !== ($v = $this->getValueAge())) { - $a[self::FIELD_VALUE_AGE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_AGE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_AGE_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_AGE] = $v; + } } if (null !== ($v = $this->getValueAnnotation())) { $a[self::FIELD_VALUE_ANNOTATION] = $v; @@ -3860,20 +3967,48 @@ public function jsonSerialize() $a[self::FIELD_VALUE_ATTACHMENT] = $v; } if (null !== ($v = $this->getValueBase64Binary())) { - $a[self::FIELD_VALUE_BASE_64BINARY] = $v->getValue(); - $a[self::FIELD_VALUE_BASE_64BINARY_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_BASE_64BINARY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_BASE_64BINARY_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_BASE_64BINARY] = $v; + } } if (null !== ($v = $this->getValueBoolean())) { - $a[self::FIELD_VALUE_BOOLEAN] = $v->getValue(); - $a[self::FIELD_VALUE_BOOLEAN_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_BOOLEAN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_BOOLEAN_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_BOOLEAN] = $v; + } } if (null !== ($v = $this->getValueCanonical())) { - $a[self::FIELD_VALUE_CANONICAL] = $v->getValue(); - $a[self::FIELD_VALUE_CANONICAL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_CANONICAL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_CANONICAL_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_CANONICAL] = $v; + } } if (null !== ($v = $this->getValueCode())) { - $a[self::FIELD_VALUE_CODE] = $v->getValue(); - $a[self::FIELD_VALUE_CODE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_CODE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_CODE_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_CODE] = $v; + } } if (null !== ($v = $this->getValueCodeableConcept())) { $a[self::FIELD_VALUE_CODEABLE_CONCEPT] = $v; @@ -3885,37 +4020,90 @@ public function jsonSerialize() $a[self::FIELD_VALUE_CONTACT_DETAIL] = $v; } if (null !== ($v = $this->getValueContactPoint())) { - $a[self::FIELD_VALUE_CONTACT_POINT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_CONTACT_POINT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_CONTACT_POINT_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_CONTACT_POINT] = $v; + } } if (null !== ($v = $this->getValueContributor())) { $a[self::FIELD_VALUE_CONTRIBUTOR] = $v; } if (null !== ($v = $this->getValueCount())) { - $a[self::FIELD_VALUE_COUNT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_COUNT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_COUNT_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_COUNT] = $v; + } } if (null !== ($v = $this->getValueDataRequirement())) { $a[self::FIELD_VALUE_DATA_REQUIREMENT] = $v; } if (null !== ($v = $this->getValueDate())) { - $a[self::FIELD_VALUE_DATE] = $v->getValue(); - $a[self::FIELD_VALUE_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_DATE] = $v; + } } if (null !== ($v = $this->getValueDateTime())) { - $a[self::FIELD_VALUE_DATE_TIME] = $v->getValue(); - $a[self::FIELD_VALUE_DATE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_DATE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_DATE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_DATE_TIME] = $v; + } } if (null !== ($v = $this->getValueDecimal())) { - $a[self::FIELD_VALUE_DECIMAL] = $v->getValue(); - $a[self::FIELD_VALUE_DECIMAL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_DECIMAL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_DECIMAL_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_DECIMAL] = $v; + } } if (null !== ($v = $this->getValueDistance())) { - $a[self::FIELD_VALUE_DISTANCE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_DISTANCE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_DISTANCE_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_DISTANCE] = $v; + } } if (null !== ($v = $this->getValueDosage())) { $a[self::FIELD_VALUE_DOSAGE] = $v; } if (null !== ($v = $this->getValueDuration())) { - $a[self::FIELD_VALUE_DURATION] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_DURATION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_DURATION_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_DURATION] = $v; + } } if (null !== ($v = $this->getValueExpression())) { $a[self::FIELD_VALUE_EXPRESSION] = $v; @@ -3924,33 +4112,84 @@ public function jsonSerialize() $a[self::FIELD_VALUE_HUMAN_NAME] = $v; } if (null !== ($v = $this->getValueId())) { - $a[self::FIELD_VALUE_ID] = $v->getValue(); - $a[self::FIELD_VALUE_ID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_ID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_ID_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_ID] = $v; + } } if (null !== ($v = $this->getValueIdentifier())) { - $a[self::FIELD_VALUE_IDENTIFIER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_IDENTIFIER] = $v; + } } if (null !== ($v = $this->getValueInstant())) { - $a[self::FIELD_VALUE_INSTANT] = $v->getValue(); - $a[self::FIELD_VALUE_INSTANT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_INSTANT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_INSTANT_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_INSTANT] = $v; + } } if (null !== ($v = $this->getValueInteger())) { - $a[self::FIELD_VALUE_INTEGER] = $v->getValue(); - $a[self::FIELD_VALUE_INTEGER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_INTEGER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_INTEGER_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_INTEGER] = $v; + } } if (null !== ($v = $this->getValueMarkdown())) { - $a[self::FIELD_VALUE_MARKDOWN] = $v->getValue(); - $a[self::FIELD_VALUE_MARKDOWN_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_MARKDOWN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_MARKDOWN_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_MARKDOWN] = $v; + } } if (null !== ($v = $this->getValueMeta())) { $a[self::FIELD_VALUE_META] = $v; } if (null !== ($v = $this->getValueMoney())) { - $a[self::FIELD_VALUE_MONEY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_MONEY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_MONEY_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_MONEY] = $v; + } } if (null !== ($v = $this->getValueOid())) { - $a[self::FIELD_VALUE_OID] = $v->getValue(); - $a[self::FIELD_VALUE_OID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_OID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_OID_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_OID] = $v; + } } if (null !== ($v = $this->getValueParameterDefinition())) { $a[self::FIELD_VALUE_PARAMETER_DEFINITION] = $v; @@ -3959,11 +4198,26 @@ public function jsonSerialize() $a[self::FIELD_VALUE_PERIOD] = $v; } if (null !== ($v = $this->getValuePositiveInt())) { - $a[self::FIELD_VALUE_POSITIVE_INT] = $v->getValue(); - $a[self::FIELD_VALUE_POSITIVE_INT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_POSITIVE_INT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_POSITIVE_INT_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_POSITIVE_INT] = $v; + } } if (null !== ($v = $this->getValueQuantity())) { - $a[self::FIELD_VALUE_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_QUANTITY] = $v; + } } if (null !== ($v = $this->getValueRange())) { $a[self::FIELD_VALUE_RANGE] = $v; @@ -3984,12 +4238,26 @@ public function jsonSerialize() $a[self::FIELD_VALUE_SIGNATURE] = $v; } if (null !== ($v = $this->getValueString())) { - $a[self::FIELD_VALUE_STRING] = $v->getValue(); - $a[self::FIELD_VALUE_STRING_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_STRING] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_STRING_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_STRING] = $v; + } } if (null !== ($v = $this->getValueTime())) { - $a[self::FIELD_VALUE_TIME] = $v->getValue(); - $a[self::FIELD_VALUE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_TIME] = $v; + } } if (null !== ($v = $this->getValueTiming())) { $a[self::FIELD_VALUE_TIMING] = $v; @@ -3998,23 +4266,51 @@ public function jsonSerialize() $a[self::FIELD_VALUE_TRIGGER_DEFINITION] = $v; } if (null !== ($v = $this->getValueUnsignedInt())) { - $a[self::FIELD_VALUE_UNSIGNED_INT] = $v->getValue(); - $a[self::FIELD_VALUE_UNSIGNED_INT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_UNSIGNED_INT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_UNSIGNED_INT_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_UNSIGNED_INT] = $v; + } } if (null !== ($v = $this->getValueUri())) { - $a[self::FIELD_VALUE_URI] = $v->getValue(); - $a[self::FIELD_VALUE_URI_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_URI] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_URI_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_URI] = $v; + } } if (null !== ($v = $this->getValueUrl())) { - $a[self::FIELD_VALUE_URL] = $v->getValue(); - $a[self::FIELD_VALUE_URL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_URL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_URL_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_URL] = $v; + } } if (null !== ($v = $this->getValueUsageContext())) { $a[self::FIELD_VALUE_USAGE_CONTEXT] = $v; } if (null !== ($v = $this->getValueUuid())) { - $a[self::FIELD_VALUE_UUID] = $v->getValue(); - $a[self::FIELD_VALUE_UUID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_UUID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_UUID_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_UUID] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRExtensionContextType.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRExtensionContextType.php index 29d3b8e913..88f74cc8fd 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRExtensionContextType.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRExtensionContextType.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRExtensionContextType extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_EXTENSION_CONTEXT_TYPE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRExtensionContextType extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRExtensionContextType Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRFHIRDeviceStatus.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRFHIRDeviceStatus.php index 70e0ead48b..a3885c5152 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRFHIRDeviceStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRFHIRDeviceStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRFHIRDeviceStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_FHIRDEVICE_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRFHIRDeviceStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRFHIRDeviceStatus Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRFHIRSubstanceStatus.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRFHIRSubstanceStatus.php index ca0fe992e1..818084122b 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRFHIRSubstanceStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRFHIRSubstanceStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRFHIRSubstanceStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_FHIRSUBSTANCE_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRFHIRSubstanceStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRFHIRSubstanceStatus Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRFHIRVersion.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRFHIRVersion.php index 5629db1810..14a3637a2b 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRFHIRVersion.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRFHIRVersion.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -77,10 +77,6 @@ class FHIRFHIRVersion extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_FHIRVERSION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -88,6 +84,9 @@ class FHIRFHIRVersion extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRFHIRVersion Constructor * @param null|array $data @@ -243,8 +242,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRFamilyHistoryStatus.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRFamilyHistoryStatus.php index aee564e969..963dfaab0c 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRFamilyHistoryStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRFamilyHistoryStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRFamilyHistoryStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_FAMILY_HISTORY_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRFamilyHistoryStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRFamilyHistoryStatus Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRFilterOperator.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRFilterOperator.php index e1e0b4d729..0cba1e02ad 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRFilterOperator.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRFilterOperator.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRFilterOperator extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_FILTER_OPERATOR; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRFilterOperator extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRFilterOperator Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRFinancialResourceStatusCodes.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRFinancialResourceStatusCodes.php index 78231320bb..c4d997a5c2 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRFinancialResourceStatusCodes.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRFinancialResourceStatusCodes.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRFinancialResourceStatusCodes extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_FINANCIAL_RESOURCE_STATUS_CODES; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRFinancialResourceStatusCodes extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRFinancialResourceStatusCodes Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRFlagStatus.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRFlagStatus.php index 029a884a34..cdf955e0be 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRFlagStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRFlagStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRFlagStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_FLAG_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -90,6 +86,9 @@ class FHIRFlagStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRFlagStatus Constructor * @param null|array $data @@ -245,8 +244,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRGoalLifecycleStatus.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRGoalLifecycleStatus.php index d1548deb69..7dba7eaf17 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRGoalLifecycleStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRGoalLifecycleStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRGoalLifecycleStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_GOAL_LIFECYCLE_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -90,6 +86,9 @@ class FHIRGoalLifecycleStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRGoalLifecycleStatus Constructor * @param null|array $data @@ -245,8 +244,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRGraphCompartmentRule.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRGraphCompartmentRule.php index 16705f03dd..f25fb98c50 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRGraphCompartmentRule.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRGraphCompartmentRule.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRGraphCompartmentRule extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_GRAPH_COMPARTMENT_RULE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRGraphCompartmentRule extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRGraphCompartmentRule Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRGraphCompartmentUse.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRGraphCompartmentUse.php index 7449035b03..817469b56f 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRGraphCompartmentUse.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRGraphCompartmentUse.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRGraphCompartmentUse extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_GRAPH_COMPARTMENT_USE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRGraphCompartmentUse extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRGraphCompartmentUse Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRGroupMeasure.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRGroupMeasure.php index e059ac40f2..0280dd6dca 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRGroupMeasure.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRGroupMeasure.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRGroupMeasure extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_GROUP_MEASURE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRGroupMeasure extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRGroupMeasure Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRGroupType.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRGroupType.php index e1f64f326f..5054e72de2 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRGroupType.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRGroupType.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRGroupType extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_GROUP_TYPE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRGroupType extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRGroupType Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRGuidanceResponseStatus.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRGuidanceResponseStatus.php index 20201b7c2c..cfbcfcf493 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRGuidanceResponseStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRGuidanceResponseStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRGuidanceResponseStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_GUIDANCE_RESPONSE_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRGuidanceResponseStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRGuidanceResponseStatus Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRGuidePageGeneration.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRGuidePageGeneration.php index 33c769a2f9..65ea36ed41 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRGuidePageGeneration.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRGuidePageGeneration.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRGuidePageGeneration extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_GUIDE_PAGE_GENERATION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRGuidePageGeneration extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRGuidePageGeneration Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRGuideParameterCode.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRGuideParameterCode.php index 867b842d90..f40196be4f 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRGuideParameterCode.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRGuideParameterCode.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRGuideParameterCode extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_GUIDE_PARAMETER_CODE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRGuideParameterCode extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRGuideParameterCode Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRHTTPVerb.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRHTTPVerb.php index ae0520b051..5d1bbcabd1 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRHTTPVerb.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRHTTPVerb.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRHTTPVerb extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_HTTPVERB; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -90,6 +86,9 @@ class FHIRHTTPVerb extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRHTTPVerb Constructor * @param null|array $data @@ -245,8 +244,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRHumanName.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRHumanName.php index c3d5100664..a6fb60d853 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRHumanName.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRHumanName.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRHumanName extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_HUMAN_NAME; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_FAMILY = 'family'; const FIELD_FAMILY_EXT = '_family'; const FIELD_GIVEN = 'given'; @@ -176,6 +172,9 @@ class FHIRHumanName extends FHIRElement */ protected $use = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRHumanName Constructor * @param null|array $data @@ -198,8 +197,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_FAMILY] instanceof FHIRString) { $this->setFamily($data[self::FIELD_FAMILY]); - } elseif ($ext && is_scalar($data[self::FIELD_FAMILY])) { - $this->setFamily(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_FAMILY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_FAMILY])) { + $this->setFamily(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_FAMILY]] + $ext)); + } else if (is_array($data[self::FIELD_FAMILY])) { + $this->setFamily(new FHIRString(array_merge($ext, $data[self::FIELD_FAMILY]))); + } } else { $this->setFamily(new FHIRString($data[self::FIELD_FAMILY])); } @@ -210,17 +213,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_GIVEN])) { foreach($data[self::FIELD_GIVEN] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRString) { $this->addGiven($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addGiven(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addGiven(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addGiven(new FHIRString(array_merge($v, $ext[$i]))); + } } else { $this->addGiven(new FHIRString($v)); } } } elseif ($data[self::FIELD_GIVEN] instanceof FHIRString) { $this->addGiven($data[self::FIELD_GIVEN]); - } elseif ($ext && is_scalar($data[self::FIELD_GIVEN])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_GIVEN])) { $this->addGiven(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_GIVEN]] + $ext)); } else { $this->addGiven(new FHIRString($data[self::FIELD_GIVEN])); @@ -239,17 +249,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_PREFIX])) { foreach($data[self::FIELD_PREFIX] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRString) { $this->addPrefix($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addPrefix(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addPrefix(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addPrefix(new FHIRString(array_merge($v, $ext[$i]))); + } } else { $this->addPrefix(new FHIRString($v)); } } } elseif ($data[self::FIELD_PREFIX] instanceof FHIRString) { $this->addPrefix($data[self::FIELD_PREFIX]); - } elseif ($ext && is_scalar($data[self::FIELD_PREFIX])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_PREFIX])) { $this->addPrefix(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PREFIX]] + $ext)); } else { $this->addPrefix(new FHIRString($data[self::FIELD_PREFIX])); @@ -261,17 +278,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_SUFFIX])) { foreach($data[self::FIELD_SUFFIX] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRString) { $this->addSuffix($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addSuffix(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addSuffix(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addSuffix(new FHIRString(array_merge($v, $ext[$i]))); + } } else { $this->addSuffix(new FHIRString($v)); } } } elseif ($data[self::FIELD_SUFFIX] instanceof FHIRString) { $this->addSuffix($data[self::FIELD_SUFFIX]); - } elseif ($ext && is_scalar($data[self::FIELD_SUFFIX])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_SUFFIX])) { $this->addSuffix(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SUFFIX]] + $ext)); } else { $this->addSuffix(new FHIRString($data[self::FIELD_SUFFIX])); @@ -283,8 +307,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TEXT] instanceof FHIRString) { $this->setText($data[self::FIELD_TEXT]); - } elseif ($ext && is_scalar($data[self::FIELD_TEXT])) { - $this->setText(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TEXT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TEXT])) { + $this->setText(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TEXT]] + $ext)); + } else if (is_array($data[self::FIELD_TEXT])) { + $this->setText(new FHIRString(array_merge($ext, $data[self::FIELD_TEXT]))); + } } else { $this->setText(new FHIRString($data[self::FIELD_TEXT])); } @@ -295,8 +323,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_USE] instanceof FHIRNameUse) { $this->setUse($data[self::FIELD_USE]); - } elseif ($ext && is_scalar($data[self::FIELD_USE])) { - $this->setUse(new FHIRNameUse([FHIRNameUse::FIELD_VALUE => $data[self::FIELD_USE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_USE])) { + $this->setUse(new FHIRNameUse([FHIRNameUse::FIELD_VALUE => $data[self::FIELD_USE]] + $ext)); + } else if (is_array($data[self::FIELD_USE])) { + $this->setUse(new FHIRNameUse(array_merge($ext, $data[self::FIELD_USE]))); + } } else { $this->setUse(new FHIRNameUse($data[self::FIELD_USE])); } @@ -803,6 +835,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_PREFIX, null, $v->_getFHIRXMLNamespace())); } } + if ([] !== ($vs = $this->getSuffix())) { foreach($vs as $v) { if (null === $v) { @@ -811,10 +844,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_SUFFIX, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getText())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TEXT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getUse())) { $v->xmlSerialize($sxe->addChild(self::FIELD_USE, null, $v->_getFHIRXMLNamespace())); } @@ -828,8 +861,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getFamily())) { - $a[self::FIELD_FAMILY] = $v->getValue(); - $a[self::FIELD_FAMILY_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FAMILY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FAMILY_EXT] = $enc; + } + } else { + $a[self::FIELD_FAMILY] = $v; + } } if ([] !== ($vs = $this->getGiven())) { $a[self::FIELD_GIVEN] = []; @@ -837,8 +877,17 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_GIVEN][] = $v->getValue(); - $a[self::FIELD_GIVEN_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_GIVEN][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_GIVEN_EXT][] = $enc; + } else { + $a[self::FIELD_GIVEN_EXT][] = null; + } + } else { + $a[self::FIELD_GIVEN][] = $v; + } } } if (null !== ($v = $this->getPeriod())) { @@ -850,8 +899,17 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_PREFIX][] = $v->getValue(); - $a[self::FIELD_PREFIX_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PREFIX][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PREFIX_EXT][] = $enc; + } else { + $a[self::FIELD_PREFIX_EXT][] = null; + } + } else { + $a[self::FIELD_PREFIX][] = $v; + } } } if ([] !== ($vs = $this->getSuffix())) { @@ -860,16 +918,40 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_SUFFIX][] = $v->getValue(); - $a[self::FIELD_SUFFIX_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SUFFIX][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SUFFIX_EXT][] = $enc; + } else { + $a[self::FIELD_SUFFIX_EXT][] = null; + } + } else { + $a[self::FIELD_SUFFIX][] = $v; + } } } if (null !== ($v = $this->getText())) { - $a[self::FIELD_TEXT] = $v->getValue(); - $a[self::FIELD_TEXT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TEXT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TEXT_EXT] = $enc; + } + } else { + $a[self::FIELD_TEXT] = $v; + } } if (null !== ($v = $this->getUse())) { - $a[self::FIELD_USE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_USE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_USE_EXT] = $enc; + } + } else { + $a[self::FIELD_USE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRId.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRId.php index 01e748c768..382c58b21f 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRId.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRId.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -82,10 +82,6 @@ class FHIRId extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ID; - - /** @var string */ - protected $_xmlns = ''; - const FIELD_VALUE = 'value'; /** @@ -93,6 +89,8 @@ class FHIRId extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; /** * FHIRId Constructor @@ -250,8 +248,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRIdentifier.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRIdentifier.php index 9ce20579de..92310b3460 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRIdentifier.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRIdentifier.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRIdentifier extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_IDENTIFIER; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ASSIGNER = 'assigner'; const FIELD_PERIOD = 'period'; const FIELD_SYSTEM = 'system'; @@ -162,6 +158,9 @@ class FHIRIdentifier extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRIdentifier Constructor * @param null|array $data @@ -202,8 +201,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SYSTEM] instanceof FHIRUri) { $this->setSystem($data[self::FIELD_SYSTEM]); - } elseif ($ext && is_scalar($data[self::FIELD_SYSTEM])) { - $this->setSystem(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_SYSTEM]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SYSTEM])) { + $this->setSystem(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_SYSTEM]] + $ext)); + } else if (is_array($data[self::FIELD_SYSTEM])) { + $this->setSystem(new FHIRUri(array_merge($ext, $data[self::FIELD_SYSTEM]))); + } } else { $this->setSystem(new FHIRUri($data[self::FIELD_SYSTEM])); } @@ -221,8 +224,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_USE] instanceof FHIRIdentifierUse) { $this->setUse($data[self::FIELD_USE]); - } elseif ($ext && is_scalar($data[self::FIELD_USE])) { - $this->setUse(new FHIRIdentifierUse([FHIRIdentifierUse::FIELD_VALUE => $data[self::FIELD_USE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_USE])) { + $this->setUse(new FHIRIdentifierUse([FHIRIdentifierUse::FIELD_VALUE => $data[self::FIELD_USE]] + $ext)); + } else if (is_array($data[self::FIELD_USE])) { + $this->setUse(new FHIRIdentifierUse(array_merge($ext, $data[self::FIELD_USE]))); + } } else { $this->setUse(new FHIRIdentifierUse($data[self::FIELD_USE])); } @@ -233,8 +240,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE] instanceof FHIRString) { $this->setValue($data[self::FIELD_VALUE]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE])) { - $this->setValue(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VALUE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE])) { + $this->setValue(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VALUE]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE])) { + $this->setValue(new FHIRString(array_merge($ext, $data[self::FIELD_VALUE]))); + } } else { $this->setValue(new FHIRString($data[self::FIELD_VALUE])); } @@ -566,26 +577,23 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getAssigner())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ASSIGNER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PERIOD, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getSystem())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SYSTEM, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getUse())) { $v->xmlSerialize($sxe->addChild(self::FIELD_USE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getValue())) { + $sxe->addAttribute(self::FIELD_VALUE, (string)$v); $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE, null, $v->_getFHIRXMLNamespace())); } return $sxe; @@ -604,18 +612,40 @@ public function jsonSerialize() $a[self::FIELD_PERIOD] = $v; } if (null !== ($v = $this->getSystem())) { - $a[self::FIELD_SYSTEM] = $v->getValue(); - $a[self::FIELD_SYSTEM_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SYSTEM] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SYSTEM_EXT] = $enc; + } + } else { + $a[self::FIELD_SYSTEM] = $v; + } } if (null !== ($v = $this->getType())) { $a[self::FIELD_TYPE] = $v; } if (null !== ($v = $this->getUse())) { - $a[self::FIELD_USE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_USE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_USE_EXT] = $enc; + } + } else { + $a[self::FIELD_USE] = $v; + } } if (null !== ($v = $this->getValue())) { - $a[self::FIELD_VALUE] = $v->getValue(); - $a[self::FIELD_VALUE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRIdentifierUse.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRIdentifierUse.php index 733a1bb5f5..d564bd8d23 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRIdentifierUse.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRIdentifierUse.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRIdentifierUse extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_IDENTIFIER_USE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRIdentifierUse extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRIdentifierUse Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRIdentityAssuranceLevel.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRIdentityAssuranceLevel.php index be21ffc67f..ae6136299b 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRIdentityAssuranceLevel.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRIdentityAssuranceLevel.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRIdentityAssuranceLevel extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_IDENTITY_ASSURANCE_LEVEL; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -90,6 +86,9 @@ class FHIRIdentityAssuranceLevel extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRIdentityAssuranceLevel Constructor * @param null|array $data @@ -245,8 +244,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRImagingStudyStatus.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRImagingStudyStatus.php index 2dc54e9631..5eb37cd2ed 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRImagingStudyStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRImagingStudyStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRImagingStudyStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_IMAGING_STUDY_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRImagingStudyStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRImagingStudyStatus Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRImmunizationEvaluationStatusCodes.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRImmunizationEvaluationStatusCodes.php index 40c9dc8f18..18b70ee270 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRImmunizationEvaluationStatusCodes.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRImmunizationEvaluationStatusCodes.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRImmunizationEvaluationStatusCodes extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_IMMUNIZATION_EVALUATION_STATUS_CODES; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRImmunizationEvaluationStatusCodes extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRImmunizationEvaluationStatusCodes Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRImmunizationStatusCodes.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRImmunizationStatusCodes.php index b3d3f8b7cd..3d6e0c9308 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRImmunizationStatusCodes.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRImmunizationStatusCodes.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRImmunizationStatusCodes extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_IMMUNIZATION_STATUS_CODES; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRImmunizationStatusCodes extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRImmunizationStatusCodes Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRInstant.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRInstant.php index acb44479c7..0a5bb43558 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRInstant.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRInstant.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -82,10 +82,6 @@ class FHIRInstant extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_INSTANT; - - /** @var string */ - protected $_xmlns = ''; - const FIELD_VALUE = 'value'; /** @@ -93,6 +89,8 @@ class FHIRInstant extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; /** * FHIRInstant Constructor @@ -250,8 +248,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRInteger.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRInteger.php index 78178a9ac9..7136098cd5 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRInteger.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRInteger.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRInteger extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_INTEGER; - - /** @var string */ - protected $_xmlns = ''; - const FIELD_VALUE = 'value'; /** @@ -90,6 +86,8 @@ class FHIRInteger extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; /** * FHIRInteger Constructor @@ -247,8 +245,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRInvoicePriceComponentType.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRInvoicePriceComponentType.php index 376009b9a4..18190604e2 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRInvoicePriceComponentType.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRInvoicePriceComponentType.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRInvoicePriceComponentType extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_INVOICE_PRICE_COMPONENT_TYPE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRInvoicePriceComponentType extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRInvoicePriceComponentType Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRInvoiceStatus.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRInvoiceStatus.php index 6a3d8f7d44..a3ca6a8bf8 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRInvoiceStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRInvoiceStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRInvoiceStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_INVOICE_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRInvoiceStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRInvoiceStatus Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRIssueSeverity.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRIssueSeverity.php index 788825c8a4..1d0970bcd5 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRIssueSeverity.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRIssueSeverity.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRIssueSeverity extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ISSUE_SEVERITY; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRIssueSeverity extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRIssueSeverity Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRIssueType.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRIssueType.php index 34a4bb6eb8..52b652481b 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRIssueType.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRIssueType.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRIssueType extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ISSUE_TYPE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRIssueType extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRIssueType Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRLinkType.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRLinkType.php index dbaa9c2fab..e43128d1f9 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRLinkType.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRLinkType.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRLinkType extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_LINK_TYPE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRLinkType extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRLinkType Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRLinkageType.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRLinkageType.php index beb9a7a94f..25555a361e 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRLinkageType.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRLinkageType.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRLinkageType extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_LINKAGE_TYPE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -90,6 +86,9 @@ class FHIRLinkageType extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRLinkageType Constructor * @param null|array $data @@ -245,8 +244,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRListMode.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRListMode.php index 8dceff8964..fb702f2dda 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRListMode.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRListMode.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRListMode extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_LIST_MODE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRListMode extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRListMode Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRListStatus.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRListStatus.php index b84f6d8438..a719f8184e 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRListStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRListStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRListStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_LIST_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRListStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRListStatus Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRLocationMode.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRLocationMode.php index beb0f79733..2205aa86cb 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRLocationMode.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRLocationMode.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRLocationMode extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_LOCATION_MODE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -90,6 +86,9 @@ class FHIRLocationMode extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRLocationMode Constructor * @param null|array $data @@ -245,8 +244,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRLocationStatus.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRLocationStatus.php index 64fb1174f0..37df7132d6 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRLocationStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRLocationStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRLocationStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_LOCATION_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRLocationStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRLocationStatus Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRMarkdown.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRMarkdown.php index 75fab01c79..21ad449ae9 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRMarkdown.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRMarkdown.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -83,10 +83,6 @@ class FHIRMarkdown extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MARKDOWN; - - /** @var string */ - protected $_xmlns = ''; - const FIELD_VALUE = 'value'; /** @@ -94,6 +90,8 @@ class FHIRMarkdown extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; /** * FHIRMarkdown Constructor @@ -251,8 +249,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRMeasureReportStatus.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRMeasureReportStatus.php index efa06dc1f9..9c1af1ff32 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRMeasureReportStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRMeasureReportStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRMeasureReportStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MEASURE_REPORT_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRMeasureReportStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMeasureReportStatus Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRMeasureReportType.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRMeasureReportType.php index 16fcb3429f..3da505868a 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRMeasureReportType.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRMeasureReportType.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRMeasureReportType extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MEASURE_REPORT_TYPE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRMeasureReportType extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMeasureReportType Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRMedicationRequestIntent.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRMedicationRequestIntent.php index 2692f75313..4d66a3c221 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRMedicationRequestIntent.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRMedicationRequestIntent.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRMedicationRequestIntent extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MEDICATION_REQUEST_INTENT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRMedicationRequestIntent extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMedicationRequestIntent Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRMedicationStatusCodes.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRMedicationStatusCodes.php index e4ebbf604e..0f27f0398f 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRMedicationStatusCodes.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRMedicationStatusCodes.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRMedicationStatusCodes extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MEDICATION_STATUS_CODES; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRMedicationStatusCodes extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMedicationStatusCodes Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRMedicationrequestStatus.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRMedicationrequestStatus.php index 058b73ba35..6057282632 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRMedicationrequestStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRMedicationrequestStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRMedicationrequestStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MEDICATIONREQUEST_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -90,6 +86,9 @@ class FHIRMedicationrequestStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMedicationrequestStatus Constructor * @param null|array $data @@ -245,8 +244,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRMessageSignificanceCategory.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRMessageSignificanceCategory.php index d7e7fa6fbe..4f8a4daa85 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRMessageSignificanceCategory.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRMessageSignificanceCategory.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRMessageSignificanceCategory extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MESSAGE_SIGNIFICANCE_CATEGORY; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRMessageSignificanceCategory extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMessageSignificanceCategory Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRMessageheaderResponseRequest.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRMessageheaderResponseRequest.php index c2caf3b2a9..a868d5860d 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRMessageheaderResponseRequest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRMessageheaderResponseRequest.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRMessageheaderResponseRequest extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MESSAGEHEADER_RESPONSE_REQUEST; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -90,6 +86,9 @@ class FHIRMessageheaderResponseRequest extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMessageheaderResponseRequest Constructor * @param null|array $data @@ -245,8 +244,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRMeta.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRMeta.php index a265c929a7..7028810d8b 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRMeta.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRMeta.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRMeta extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_META; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_LAST_UPDATED = 'lastUpdated'; const FIELD_LAST_UPDATED_EXT = '_lastUpdated'; const FIELD_PROFILE = 'profile'; @@ -177,6 +173,9 @@ class FHIRMeta extends FHIRElement */ protected $versionId = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMeta Constructor * @param null|array $data @@ -199,8 +198,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_LAST_UPDATED] instanceof FHIRInstant) { $this->setLastUpdated($data[self::FIELD_LAST_UPDATED]); - } elseif ($ext && is_scalar($data[self::FIELD_LAST_UPDATED])) { - $this->setLastUpdated(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_LAST_UPDATED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_LAST_UPDATED])) { + $this->setLastUpdated(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_LAST_UPDATED]] + $ext)); + } else if (is_array($data[self::FIELD_LAST_UPDATED])) { + $this->setLastUpdated(new FHIRInstant(array_merge($ext, $data[self::FIELD_LAST_UPDATED]))); + } } else { $this->setLastUpdated(new FHIRInstant($data[self::FIELD_LAST_UPDATED])); } @@ -211,17 +214,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_PROFILE])) { foreach($data[self::FIELD_PROFILE] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCanonical) { $this->addProfile($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addProfile(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addProfile(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addProfile(new FHIRCanonical(array_merge($v, $ext[$i]))); + } } else { $this->addProfile(new FHIRCanonical($v)); } } } elseif ($data[self::FIELD_PROFILE] instanceof FHIRCanonical) { $this->addProfile($data[self::FIELD_PROFILE]); - } elseif ($ext && is_scalar($data[self::FIELD_PROFILE])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_PROFILE])) { $this->addProfile(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $data[self::FIELD_PROFILE]] + $ext)); } else { $this->addProfile(new FHIRCanonical($data[self::FIELD_PROFILE])); @@ -230,6 +240,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SECURITY])) { if (is_array($data[self::FIELD_SECURITY])) { foreach($data[self::FIELD_SECURITY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCoding) { $this->addSecurity($v); } else { @@ -248,8 +261,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SOURCE] instanceof FHIRUri) { $this->setSource($data[self::FIELD_SOURCE]); - } elseif ($ext && is_scalar($data[self::FIELD_SOURCE])) { - $this->setSource(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_SOURCE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SOURCE])) { + $this->setSource(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_SOURCE]] + $ext)); + } else if (is_array($data[self::FIELD_SOURCE])) { + $this->setSource(new FHIRUri(array_merge($ext, $data[self::FIELD_SOURCE]))); + } } else { $this->setSource(new FHIRUri($data[self::FIELD_SOURCE])); } @@ -257,6 +274,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_TAG])) { if (is_array($data[self::FIELD_TAG])) { foreach($data[self::FIELD_TAG] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCoding) { $this->addTag($v); } else { @@ -275,8 +295,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VERSION_ID] instanceof FHIRId) { $this->setVersionId($data[self::FIELD_VERSION_ID]); - } elseif ($ext && is_scalar($data[self::FIELD_VERSION_ID])) { - $this->setVersionId(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_VERSION_ID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VERSION_ID])) { + $this->setVersionId(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_VERSION_ID]] + $ext)); + } else if (is_array($data[self::FIELD_VERSION_ID])) { + $this->setVersionId(new FHIRId(array_merge($ext, $data[self::FIELD_VERSION_ID]))); + } } else { $this->setVersionId(new FHIRId($data[self::FIELD_VERSION_ID])); } @@ -766,10 +790,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_SECURITY, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getSource())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SOURCE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getTag())) { foreach($vs as $v) { if (null === $v) { @@ -778,6 +802,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_TAG, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getVersionId())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VERSION_ID, null, $v->_getFHIRXMLNamespace())); } @@ -791,8 +816,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getLastUpdated())) { - $a[self::FIELD_LAST_UPDATED] = $v->getValue(); - $a[self::FIELD_LAST_UPDATED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_LAST_UPDATED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_LAST_UPDATED_EXT] = $enc; + } + } else { + $a[self::FIELD_LAST_UPDATED] = $v; + } } if ([] !== ($vs = $this->getProfile())) { $a[self::FIELD_PROFILE] = []; @@ -800,23 +832,46 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_PROFILE][] = $v->getValue(); - $a[self::FIELD_PROFILE_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PROFILE][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PROFILE_EXT][] = $enc; + } else { + $a[self::FIELD_PROFILE_EXT][] = null; + } + } else { + $a[self::FIELD_PROFILE][] = $v; + } } } if ([] !== ($vs = $this->getSecurity())) { $a[self::FIELD_SECURITY] = $vs; } if (null !== ($v = $this->getSource())) { - $a[self::FIELD_SOURCE] = $v->getValue(); - $a[self::FIELD_SOURCE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SOURCE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SOURCE_EXT] = $enc; + } + } else { + $a[self::FIELD_SOURCE] = $v; + } } if ([] !== ($vs = $this->getTag())) { $a[self::FIELD_TAG] = $vs; } if (null !== ($v = $this->getVersionId())) { - $a[self::FIELD_VERSION_ID] = $v->getValue(); - $a[self::FIELD_VERSION_ID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VERSION_ID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VERSION_ID_EXT] = $enc; + } + } else { + $a[self::FIELD_VERSION_ID] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRMoney.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRMoney.php index cda26d58d7..b2f3f7629e 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRMoney.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRMoney.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRMoney extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MONEY; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CURRENCY = 'currency'; const FIELD_CURRENCY_EXT = '_currency'; const FIELD_VALUE = 'value'; @@ -111,6 +107,9 @@ class FHIRMoney extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMoney Constructor * @param null|array $data @@ -137,8 +136,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CURRENCY] instanceof FHIRCode) { $this->setCurrency($data[self::FIELD_CURRENCY]); - } elseif ($ext && is_scalar($data[self::FIELD_CURRENCY])) { - $this->setCurrency(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_CURRENCY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CURRENCY])) { + $this->setCurrency(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_CURRENCY]] + $ext)); + } else if (is_array($data[self::FIELD_CURRENCY])) { + $this->setCurrency(new FHIRCode(array_merge($ext, $data[self::FIELD_CURRENCY]))); + } } else { $this->setCurrency(new FHIRCode($data[self::FIELD_CURRENCY])); } @@ -149,8 +152,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE] instanceof FHIRDecimal) { $this->setValue($data[self::FIELD_VALUE]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE])) { - $this->setValue(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_VALUE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE])) { + $this->setValue(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_VALUE]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE])) { + $this->setValue(new FHIRDecimal(array_merge($ext, $data[self::FIELD_VALUE]))); + } } else { $this->setValue(new FHIRDecimal($data[self::FIELD_VALUE])); } @@ -352,6 +359,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_CURRENCY, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getValue())) { + $sxe->addAttribute(self::FIELD_VALUE, (string)$v); $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE, null, $v->_getFHIRXMLNamespace())); } return $sxe; @@ -364,12 +372,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getCurrency())) { - $a[self::FIELD_CURRENCY] = $v->getValue(); - $a[self::FIELD_CURRENCY_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CURRENCY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CURRENCY_EXT] = $enc; + } + } else { + $a[self::FIELD_CURRENCY] = $v; + } } if (null !== ($v = $this->getValue())) { - $a[self::FIELD_VALUE] = $v->getValue(); - $a[self::FIELD_VALUE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRNameUse.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRNameUse.php index 4afcbda9f5..77a5f7d7ce 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRNameUse.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRNameUse.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRNameUse extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_NAME_USE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRNameUse extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRNameUse Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRNamingSystemIdentifierType.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRNamingSystemIdentifierType.php index e7606a9601..38b2c1182e 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRNamingSystemIdentifierType.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRNamingSystemIdentifierType.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRNamingSystemIdentifierType extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_NAMING_SYSTEM_IDENTIFIER_TYPE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRNamingSystemIdentifierType extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRNamingSystemIdentifierType Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRNamingSystemType.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRNamingSystemType.php index 3ce9a584c5..9afb8fdc61 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRNamingSystemType.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRNamingSystemType.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRNamingSystemType extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_NAMING_SYSTEM_TYPE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRNamingSystemType extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRNamingSystemType Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRNarrative.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRNarrative.php index 5e3dc46fd2..b6e307fd4c 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRNarrative.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRNarrative.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRNarrative extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_NARRATIVE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DIV = 'div'; const FIELD_STATUS = 'status'; const FIELD_STATUS_EXT = '_status'; @@ -107,6 +103,9 @@ class FHIRNarrative extends FHIRElement */ protected $status = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRNarrative Constructor * @param null|array $data @@ -132,8 +131,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRNarrativeStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRNarrativeStatus([FHIRNarrativeStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRNarrativeStatus([FHIRNarrativeStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRNarrativeStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRNarrativeStatus($data[self::FIELD_STATUS])); } @@ -309,11 +312,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getDiv())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getDiv())) { $sxe->addAttribute(self::FIELD_DIV, (string)$v); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } @@ -330,7 +331,15 @@ public function jsonSerialize() $a[self::FIELD_DIV] = $v; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRNarrativeStatus.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRNarrativeStatus.php index 0d523280f2..5cdb79b4dd 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRNarrativeStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRNarrativeStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRNarrativeStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_NARRATIVE_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRNarrativeStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRNarrativeStatus Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRNoteType.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRNoteType.php index 33c5584851..78ff94c864 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRNoteType.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRNoteType.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -77,10 +77,6 @@ class FHIRNoteType extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_NOTE_TYPE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -88,6 +84,9 @@ class FHIRNoteType extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRNoteType Constructor * @param null|array $data @@ -243,8 +242,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRObservationDataType.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRObservationDataType.php index aa8ee182ff..26fd205604 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRObservationDataType.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRObservationDataType.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRObservationDataType extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_OBSERVATION_DATA_TYPE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRObservationDataType extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRObservationDataType Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRObservationRangeCategory.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRObservationRangeCategory.php index 495396b2c4..b6db9f68a9 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRObservationRangeCategory.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRObservationRangeCategory.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRObservationRangeCategory extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_OBSERVATION_RANGE_CATEGORY; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRObservationRangeCategory extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRObservationRangeCategory Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRObservationStatus.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRObservationStatus.php index 86927fd99c..241dfff0af 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRObservationStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRObservationStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRObservationStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_OBSERVATION_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRObservationStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRObservationStatus Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIROid.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIROid.php index acd1ac1290..695fd6ab61 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIROid.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIROid.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIROid extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_OID; - - /** @var string */ - protected $_xmlns = ''; - const FIELD_VALUE = 'value'; /** @@ -91,6 +87,8 @@ class FHIROid extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; /** * FHIROid Constructor @@ -248,8 +246,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIROperationKind.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIROperationKind.php index 945f732c4a..a999f7b0b8 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIROperationKind.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIROperationKind.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIROperationKind extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_OPERATION_KIND; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIROperationKind extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIROperationKind Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIROperationParameterUse.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIROperationParameterUse.php index 22612349f7..40af7e73ac 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIROperationParameterUse.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIROperationParameterUse.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIROperationParameterUse extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_OPERATION_PARAMETER_USE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIROperationParameterUse extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIROperationParameterUse Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIROrientationType.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIROrientationType.php index 71d29168bb..f5d2b7c35b 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIROrientationType.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIROrientationType.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIROrientationType extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ORIENTATION_TYPE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIROrientationType extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIROrientationType Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRParameterDefinition.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRParameterDefinition.php index 302bb1fac5..bc4d79c9da 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRParameterDefinition.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRParameterDefinition.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRParameterDefinition extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_PARAMETER_DEFINITION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DOCUMENTATION = 'documentation'; const FIELD_DOCUMENTATION_EXT = '_documentation'; const FIELD_MAX = 'max'; @@ -185,6 +181,9 @@ class FHIRParameterDefinition extends FHIRElement */ protected $use = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRParameterDefinition Constructor * @param null|array $data @@ -207,8 +206,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DOCUMENTATION] instanceof FHIRString) { $this->setDocumentation($data[self::FIELD_DOCUMENTATION]); - } elseif ($ext && is_scalar($data[self::FIELD_DOCUMENTATION])) { - $this->setDocumentation(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DOCUMENTATION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DOCUMENTATION])) { + $this->setDocumentation(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DOCUMENTATION]] + $ext)); + } else if (is_array($data[self::FIELD_DOCUMENTATION])) { + $this->setDocumentation(new FHIRString(array_merge($ext, $data[self::FIELD_DOCUMENTATION]))); + } } else { $this->setDocumentation(new FHIRString($data[self::FIELD_DOCUMENTATION])); } @@ -219,8 +222,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MAX] instanceof FHIRString) { $this->setMax($data[self::FIELD_MAX]); - } elseif ($ext && is_scalar($data[self::FIELD_MAX])) { - $this->setMax(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_MAX]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MAX])) { + $this->setMax(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_MAX]] + $ext)); + } else if (is_array($data[self::FIELD_MAX])) { + $this->setMax(new FHIRString(array_merge($ext, $data[self::FIELD_MAX]))); + } } else { $this->setMax(new FHIRString($data[self::FIELD_MAX])); } @@ -231,8 +238,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MIN] instanceof FHIRInteger) { $this->setMin($data[self::FIELD_MIN]); - } elseif ($ext && is_scalar($data[self::FIELD_MIN])) { - $this->setMin(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_MIN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MIN])) { + $this->setMin(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_MIN]] + $ext)); + } else if (is_array($data[self::FIELD_MIN])) { + $this->setMin(new FHIRInteger(array_merge($ext, $data[self::FIELD_MIN]))); + } } else { $this->setMin(new FHIRInteger($data[self::FIELD_MIN])); } @@ -243,8 +254,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRCode) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRCode(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRCode($data[self::FIELD_NAME])); } @@ -255,8 +270,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PROFILE] instanceof FHIRCanonical) { $this->setProfile($data[self::FIELD_PROFILE]); - } elseif ($ext && is_scalar($data[self::FIELD_PROFILE])) { - $this->setProfile(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $data[self::FIELD_PROFILE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PROFILE])) { + $this->setProfile(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $data[self::FIELD_PROFILE]] + $ext)); + } else if (is_array($data[self::FIELD_PROFILE])) { + $this->setProfile(new FHIRCanonical(array_merge($ext, $data[self::FIELD_PROFILE]))); + } } else { $this->setProfile(new FHIRCanonical($data[self::FIELD_PROFILE])); } @@ -267,8 +286,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TYPE] instanceof FHIRCode) { $this->setType($data[self::FIELD_TYPE]); - } elseif ($ext && is_scalar($data[self::FIELD_TYPE])) { - $this->setType(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TYPE])) { + $this->setType(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } else if (is_array($data[self::FIELD_TYPE])) { + $this->setType(new FHIRCode(array_merge($ext, $data[self::FIELD_TYPE]))); + } } else { $this->setType(new FHIRCode($data[self::FIELD_TYPE])); } @@ -279,8 +302,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_USE] instanceof FHIRCode) { $this->setUse($data[self::FIELD_USE]); - } elseif ($ext && is_scalar($data[self::FIELD_USE])) { - $this->setUse(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_USE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_USE])) { + $this->setUse(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_USE]] + $ext)); + } else if (is_array($data[self::FIELD_USE])) { + $this->setUse(new FHIRCode(array_merge($ext, $data[self::FIELD_USE]))); + } } else { $this->setUse(new FHIRCode($data[self::FIELD_USE])); } @@ -743,32 +770,81 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getDocumentation())) { - $a[self::FIELD_DOCUMENTATION] = $v->getValue(); - $a[self::FIELD_DOCUMENTATION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DOCUMENTATION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DOCUMENTATION_EXT] = $enc; + } + } else { + $a[self::FIELD_DOCUMENTATION] = $v; + } } if (null !== ($v = $this->getMax())) { - $a[self::FIELD_MAX] = $v->getValue(); - $a[self::FIELD_MAX_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MAX] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MAX_EXT] = $enc; + } + } else { + $a[self::FIELD_MAX] = $v; + } } if (null !== ($v = $this->getMin())) { - $a[self::FIELD_MIN] = $v->getValue(); - $a[self::FIELD_MIN_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MIN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MIN_EXT] = $enc; + } + } else { + $a[self::FIELD_MIN] = $v; + } } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if (null !== ($v = $this->getProfile())) { - $a[self::FIELD_PROFILE] = $v->getValue(); - $a[self::FIELD_PROFILE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PROFILE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PROFILE_EXT] = $enc; + } + } else { + $a[self::FIELD_PROFILE] = $v; + } } if (null !== ($v = $this->getType())) { - $a[self::FIELD_TYPE] = $v->getValue(); - $a[self::FIELD_TYPE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TYPE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TYPE_EXT] = $enc; + } + } else { + $a[self::FIELD_TYPE] = $v; + } } if (null !== ($v = $this->getUse())) { - $a[self::FIELD_USE] = $v->getValue(); - $a[self::FIELD_USE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_USE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_USE_EXT] = $enc; + } + } else { + $a[self::FIELD_USE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRParticipantRequired.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRParticipantRequired.php index 7a881eb698..f1b720760b 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRParticipantRequired.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRParticipantRequired.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRParticipantRequired extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_PARTICIPANT_REQUIRED; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRParticipantRequired extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRParticipantRequired Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRParticipationStatus.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRParticipationStatus.php index 6c9f48fb26..ca5fb6848b 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRParticipationStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRParticipationStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRParticipationStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_PARTICIPATION_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRParticipationStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRParticipationStatus Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRPeriod.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRPeriod.php index b35edd3dc3..da2cf4e364 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRPeriod.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRPeriod.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRPeriod extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_PERIOD; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_END = 'end'; const FIELD_END_EXT = '_end'; const FIELD_START = 'start'; @@ -118,6 +114,9 @@ class FHIRPeriod extends FHIRElement */ protected $start = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRPeriod Constructor * @param null|array $data @@ -140,8 +139,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_END] instanceof FHIRDateTime) { $this->setEnd($data[self::FIELD_END]); - } elseif ($ext && is_scalar($data[self::FIELD_END])) { - $this->setEnd(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_END]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_END])) { + $this->setEnd(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_END]] + $ext)); + } else if (is_array($data[self::FIELD_END])) { + $this->setEnd(new FHIRDateTime(array_merge($ext, $data[self::FIELD_END]))); + } } else { $this->setEnd(new FHIRDateTime($data[self::FIELD_END])); } @@ -152,8 +155,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_START] instanceof FHIRDateTime) { $this->setStart($data[self::FIELD_START]); - } elseif ($ext && is_scalar($data[self::FIELD_START])) { - $this->setStart(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_START]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_START])) { + $this->setStart(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_START]] + $ext)); + } else if (is_array($data[self::FIELD_START])) { + $this->setStart(new FHIRDateTime(array_merge($ext, $data[self::FIELD_START]))); + } } else { $this->setStart(new FHIRDateTime($data[self::FIELD_START])); } @@ -381,12 +388,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getEnd())) { - $a[self::FIELD_END] = $v->getValue(); - $a[self::FIELD_END_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_END] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_END_EXT] = $enc; + } + } else { + $a[self::FIELD_END] = $v; + } } if (null !== ($v = $this->getStart())) { - $a[self::FIELD_START] = $v->getValue(); - $a[self::FIELD_START_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_START] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_START_EXT] = $enc; + } + } else { + $a[self::FIELD_START] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRPositiveInt.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRPositiveInt.php index 8b1dc91752..73c2b29440 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRPositiveInt.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRPositiveInt.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRPositiveInt extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_POSITIVE_INT; - - /** @var string */ - protected $_xmlns = ''; - const FIELD_VALUE = 'value'; /** @@ -90,6 +86,8 @@ class FHIRPositiveInt extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; /** * FHIRPositiveInt Constructor @@ -247,8 +245,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRPropertyRepresentation.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRPropertyRepresentation.php index d182682ecb..ddc98a0774 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRPropertyRepresentation.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRPropertyRepresentation.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRPropertyRepresentation extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_PROPERTY_REPRESENTATION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRPropertyRepresentation extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRPropertyRepresentation Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRPropertyType.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRPropertyType.php index 7c0d67f728..bafb2d2792 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRPropertyType.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRPropertyType.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRPropertyType extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_PROPERTY_TYPE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRPropertyType extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRPropertyType Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRProvenanceEntityRole.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRProvenanceEntityRole.php index 380ef25a5e..2115c3eb46 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRProvenanceEntityRole.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRProvenanceEntityRole.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRProvenanceEntityRole extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_PROVENANCE_ENTITY_ROLE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRProvenanceEntityRole extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRProvenanceEntityRole Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRPublicationStatus.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRPublicationStatus.php index 647d813484..6a9e2b00fc 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRPublicationStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRPublicationStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -77,10 +77,6 @@ class FHIRPublicationStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_PUBLICATION_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -88,6 +84,9 @@ class FHIRPublicationStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRPublicationStatus Constructor * @param null|array $data @@ -243,8 +242,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRQualityType.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRQualityType.php index f0c934bd53..a2d5a0919b 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRQualityType.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRQualityType.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRQualityType extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_QUALITY_TYPE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRQualityType extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRQualityType Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRQuantity.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRQuantity.php index da5771a800..c083feec5f 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRQuantity.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRQuantity.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRQuantity extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_QUANTITY; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CODE = 'code'; const FIELD_CODE_EXT = '_code'; const FIELD_COMPARATOR = 'comparator'; @@ -154,6 +150,9 @@ class FHIRQuantity extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRQuantity Constructor * @param null|array $data @@ -180,8 +179,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CODE] instanceof FHIRCode) { $this->setCode($data[self::FIELD_CODE]); - } elseif ($ext && is_scalar($data[self::FIELD_CODE])) { - $this->setCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_CODE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CODE])) { + $this->setCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_CODE]] + $ext)); + } else if (is_array($data[self::FIELD_CODE])) { + $this->setCode(new FHIRCode(array_merge($ext, $data[self::FIELD_CODE]))); + } } else { $this->setCode(new FHIRCode($data[self::FIELD_CODE])); } @@ -192,8 +195,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_COMPARATOR] instanceof FHIRQuantityComparator) { $this->setComparator($data[self::FIELD_COMPARATOR]); - } elseif ($ext && is_scalar($data[self::FIELD_COMPARATOR])) { - $this->setComparator(new FHIRQuantityComparator([FHIRQuantityComparator::FIELD_VALUE => $data[self::FIELD_COMPARATOR]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_COMPARATOR])) { + $this->setComparator(new FHIRQuantityComparator([FHIRQuantityComparator::FIELD_VALUE => $data[self::FIELD_COMPARATOR]] + $ext)); + } else if (is_array($data[self::FIELD_COMPARATOR])) { + $this->setComparator(new FHIRQuantityComparator(array_merge($ext, $data[self::FIELD_COMPARATOR]))); + } } else { $this->setComparator(new FHIRQuantityComparator($data[self::FIELD_COMPARATOR])); } @@ -204,8 +211,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SYSTEM] instanceof FHIRUri) { $this->setSystem($data[self::FIELD_SYSTEM]); - } elseif ($ext && is_scalar($data[self::FIELD_SYSTEM])) { - $this->setSystem(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_SYSTEM]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SYSTEM])) { + $this->setSystem(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_SYSTEM]] + $ext)); + } else if (is_array($data[self::FIELD_SYSTEM])) { + $this->setSystem(new FHIRUri(array_merge($ext, $data[self::FIELD_SYSTEM]))); + } } else { $this->setSystem(new FHIRUri($data[self::FIELD_SYSTEM])); } @@ -216,8 +227,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_UNIT] instanceof FHIRString) { $this->setUnit($data[self::FIELD_UNIT]); - } elseif ($ext && is_scalar($data[self::FIELD_UNIT])) { - $this->setUnit(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_UNIT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_UNIT])) { + $this->setUnit(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_UNIT]] + $ext)); + } else if (is_array($data[self::FIELD_UNIT])) { + $this->setUnit(new FHIRString(array_merge($ext, $data[self::FIELD_UNIT]))); + } } else { $this->setUnit(new FHIRString($data[self::FIELD_UNIT])); } @@ -228,8 +243,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE] instanceof FHIRDecimal) { $this->setValue($data[self::FIELD_VALUE]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE])) { - $this->setValue(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_VALUE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE])) { + $this->setValue(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_VALUE]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE])) { + $this->setValue(new FHIRDecimal(array_merge($ext, $data[self::FIELD_VALUE]))); + } } else { $this->setValue(new FHIRDecimal($data[self::FIELD_VALUE])); } @@ -555,7 +574,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getComparator())) { $v->xmlSerialize($sxe->addChild(self::FIELD_COMPARATOR, null, $v->_getFHIRXMLNamespace())); } @@ -566,6 +584,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_UNIT, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getValue())) { + $sxe->addAttribute(self::FIELD_VALUE, (string)$v); $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE, null, $v->_getFHIRXMLNamespace())); } return $sxe; @@ -578,23 +597,59 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getCode())) { - $a[self::FIELD_CODE] = $v->getValue(); - $a[self::FIELD_CODE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CODE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CODE_EXT] = $enc; + } + } else { + $a[self::FIELD_CODE] = $v; + } } if (null !== ($v = $this->getComparator())) { - $a[self::FIELD_COMPARATOR] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_COMPARATOR] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_COMPARATOR_EXT] = $enc; + } + } else { + $a[self::FIELD_COMPARATOR] = $v; + } } if (null !== ($v = $this->getSystem())) { - $a[self::FIELD_SYSTEM] = $v->getValue(); - $a[self::FIELD_SYSTEM_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SYSTEM] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SYSTEM_EXT] = $enc; + } + } else { + $a[self::FIELD_SYSTEM] = $v; + } } if (null !== ($v = $this->getUnit())) { - $a[self::FIELD_UNIT] = $v->getValue(); - $a[self::FIELD_UNIT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_UNIT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_UNIT_EXT] = $enc; + } + } else { + $a[self::FIELD_UNIT] = $v; + } } if (null !== ($v = $this->getValue())) { - $a[self::FIELD_VALUE] = $v->getValue(); - $a[self::FIELD_VALUE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRQuantity/FHIRAge.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRQuantity/FHIRAge.php index d53757e0e1..9d07d07d95 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRQuantity/FHIRAge.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRQuantity/FHIRAge.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,7 +78,6 @@ class FHIRAge extends FHIRQuantity { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_AGE; - /** @var string */ protected $_xmlns = 'http://hl7.org/fhir'; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRQuantity/FHIRCount.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRQuantity/FHIRCount.php index 9ad8737a3b..233f4425c0 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRQuantity/FHIRCount.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRQuantity/FHIRCount.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -80,7 +80,6 @@ class FHIRCount extends FHIRQuantity { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_COUNT; - /** @var string */ protected $_xmlns = 'http://hl7.org/fhir'; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRQuantity/FHIRDistance.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRQuantity/FHIRDistance.php index 0ea35049e9..ab968c3d00 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRQuantity/FHIRDistance.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRQuantity/FHIRDistance.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,7 +78,6 @@ class FHIRDistance extends FHIRQuantity { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DISTANCE; - /** @var string */ protected $_xmlns = 'http://hl7.org/fhir'; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRQuantity/FHIRDuration.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRQuantity/FHIRDuration.php index b284f72490..d50ec572bd 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRQuantity/FHIRDuration.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRQuantity/FHIRDuration.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,7 +78,6 @@ class FHIRDuration extends FHIRQuantity { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DURATION; - /** @var string */ protected $_xmlns = 'http://hl7.org/fhir'; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRQuantityComparator.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRQuantityComparator.php index f9f8a601b8..5468fddf6f 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRQuantityComparator.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRQuantityComparator.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRQuantityComparator extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_QUANTITY_COMPARATOR; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRQuantityComparator extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRQuantityComparator Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRQuestionnaireItemOperator.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRQuestionnaireItemOperator.php index 1ae319d100..892f553396 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRQuestionnaireItemOperator.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRQuestionnaireItemOperator.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRQuestionnaireItemOperator extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_QUESTIONNAIRE_ITEM_OPERATOR; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRQuestionnaireItemOperator extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRQuestionnaireItemOperator Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRQuestionnaireItemType.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRQuestionnaireItemType.php index 7b89de2887..0e72a66408 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRQuestionnaireItemType.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRQuestionnaireItemType.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRQuestionnaireItemType extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_QUESTIONNAIRE_ITEM_TYPE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -90,6 +86,9 @@ class FHIRQuestionnaireItemType extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRQuestionnaireItemType Constructor * @param null|array $data @@ -245,8 +244,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRQuestionnaireResponseStatus.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRQuestionnaireResponseStatus.php index 578a08149d..c6c320a8d3 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRQuestionnaireResponseStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRQuestionnaireResponseStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRQuestionnaireResponseStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_QUESTIONNAIRE_RESPONSE_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRQuestionnaireResponseStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRQuestionnaireResponseStatus Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRRange.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRRange.php index 9d13aae66e..2d2d0b1c21 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRRange.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRRange.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRRange extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_RANGE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_HIGH = 'high'; const FIELD_HIGH_EXT = '_high'; const FIELD_LOW = 'low'; @@ -113,6 +109,9 @@ class FHIRRange extends FHIRElement */ protected $low = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRRange Constructor * @param null|array $data @@ -135,8 +134,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_HIGH] instanceof FHIRQuantity) { $this->setHigh($data[self::FIELD_HIGH]); - } elseif ($ext && is_scalar($data[self::FIELD_HIGH])) { - $this->setHigh(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_HIGH]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_HIGH])) { + $this->setHigh(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_HIGH]] + $ext)); + } else if (is_array($data[self::FIELD_HIGH])) { + $this->setHigh(new FHIRQuantity(array_merge($ext, $data[self::FIELD_HIGH]))); + } } else { $this->setHigh(new FHIRQuantity($data[self::FIELD_HIGH])); } @@ -147,8 +150,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_LOW] instanceof FHIRQuantity) { $this->setLow($data[self::FIELD_LOW]); - } elseif ($ext && is_scalar($data[self::FIELD_LOW])) { - $this->setLow(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_LOW]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_LOW])) { + $this->setLow(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_LOW]] + $ext)); + } else if (is_array($data[self::FIELD_LOW])) { + $this->setLow(new FHIRQuantity(array_merge($ext, $data[self::FIELD_LOW]))); + } } else { $this->setLow(new FHIRQuantity($data[self::FIELD_LOW])); } @@ -328,11 +335,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getHigh())) { $v->xmlSerialize($sxe->addChild(self::FIELD_HIGH, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getLow())) { $v->xmlSerialize($sxe->addChild(self::FIELD_LOW, null, $v->_getFHIRXMLNamespace())); } @@ -346,10 +351,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getHigh())) { - $a[self::FIELD_HIGH] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_HIGH] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_HIGH_EXT] = $enc; + } + } else { + $a[self::FIELD_HIGH] = $v; + } } if (null !== ($v = $this->getLow())) { - $a[self::FIELD_LOW] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_LOW] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_LOW_EXT] = $enc; + } + } else { + $a[self::FIELD_LOW] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRRatio.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRRatio.php index aa72d43105..add056c918 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRRatio.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRRatio.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRRatio extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_RATIO; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DENOMINATOR = 'denominator'; const FIELD_DENOMINATOR_EXT = '_denominator'; const FIELD_NUMERATOR = 'numerator'; @@ -114,6 +110,9 @@ class FHIRRatio extends FHIRElement */ protected $numerator = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRRatio Constructor * @param null|array $data @@ -136,8 +135,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DENOMINATOR] instanceof FHIRQuantity) { $this->setDenominator($data[self::FIELD_DENOMINATOR]); - } elseif ($ext && is_scalar($data[self::FIELD_DENOMINATOR])) { - $this->setDenominator(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_DENOMINATOR]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DENOMINATOR])) { + $this->setDenominator(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_DENOMINATOR]] + $ext)); + } else if (is_array($data[self::FIELD_DENOMINATOR])) { + $this->setDenominator(new FHIRQuantity(array_merge($ext, $data[self::FIELD_DENOMINATOR]))); + } } else { $this->setDenominator(new FHIRQuantity($data[self::FIELD_DENOMINATOR])); } @@ -148,8 +151,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NUMERATOR] instanceof FHIRQuantity) { $this->setNumerator($data[self::FIELD_NUMERATOR]); - } elseif ($ext && is_scalar($data[self::FIELD_NUMERATOR])) { - $this->setNumerator(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_NUMERATOR]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NUMERATOR])) { + $this->setNumerator(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_NUMERATOR]] + $ext)); + } else if (is_array($data[self::FIELD_NUMERATOR])) { + $this->setNumerator(new FHIRQuantity(array_merge($ext, $data[self::FIELD_NUMERATOR]))); + } } else { $this->setNumerator(new FHIRQuantity($data[self::FIELD_NUMERATOR])); } @@ -329,11 +336,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getDenominator())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DENOMINATOR, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getNumerator())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NUMERATOR, null, $v->_getFHIRXMLNamespace())); } @@ -347,10 +352,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getDenominator())) { - $a[self::FIELD_DENOMINATOR] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DENOMINATOR] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DENOMINATOR_EXT] = $enc; + } + } else { + $a[self::FIELD_DENOMINATOR] = $v; + } } if (null !== ($v = $this->getNumerator())) { - $a[self::FIELD_NUMERATOR] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NUMERATOR] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NUMERATOR_EXT] = $enc; + } + } else { + $a[self::FIELD_NUMERATOR] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRReference.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRReference.php index c985e78b9f..2598f94822 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRReference.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRReference.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRReference extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_REFERENCE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DISPLAY = 'display'; const FIELD_DISPLAY_EXT = '_display'; const FIELD_IDENTIFIER = 'identifier'; @@ -156,6 +152,9 @@ class FHIRReference extends FHIRElement */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRReference Constructor * @param null|array $data @@ -178,8 +177,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DISPLAY] instanceof FHIRString) { $this->setDisplay($data[self::FIELD_DISPLAY]); - } elseif ($ext && is_scalar($data[self::FIELD_DISPLAY])) { - $this->setDisplay(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DISPLAY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DISPLAY])) { + $this->setDisplay(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DISPLAY]] + $ext)); + } else if (is_array($data[self::FIELD_DISPLAY])) { + $this->setDisplay(new FHIRString(array_merge($ext, $data[self::FIELD_DISPLAY]))); + } } else { $this->setDisplay(new FHIRString($data[self::FIELD_DISPLAY])); } @@ -190,8 +193,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->setIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { - $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_IDENTIFIER]))); + } } else { $this->setIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); } @@ -202,8 +209,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_REFERENCE] instanceof FHIRString) { $this->setReference($data[self::FIELD_REFERENCE]); - } elseif ($ext && is_scalar($data[self::FIELD_REFERENCE])) { - $this->setReference(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_REFERENCE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_REFERENCE])) { + $this->setReference(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_REFERENCE]] + $ext)); + } else if (is_array($data[self::FIELD_REFERENCE])) { + $this->setReference(new FHIRString(array_merge($ext, $data[self::FIELD_REFERENCE]))); + } } else { $this->setReference(new FHIRString($data[self::FIELD_REFERENCE])); } @@ -214,8 +225,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TYPE] instanceof FHIRUri) { $this->setType($data[self::FIELD_TYPE]); - } elseif ($ext && is_scalar($data[self::FIELD_TYPE])) { - $this->setType(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TYPE])) { + $this->setType(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } else if (is_array($data[self::FIELD_TYPE])) { + $this->setType(new FHIRUri(array_merge($ext, $data[self::FIELD_TYPE]))); + } } else { $this->setType(new FHIRUri($data[self::FIELD_TYPE])); } @@ -531,7 +546,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDisplay())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DISPLAY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } @@ -551,19 +565,48 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getDisplay())) { - $a[self::FIELD_DISPLAY] = $v->getValue(); - $a[self::FIELD_DISPLAY_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DISPLAY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DISPLAY_EXT] = $enc; + } + } else { + $a[self::FIELD_DISPLAY] = $v; + } } if (null !== ($v = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_IDENTIFIER] = $v; + } } if (null !== ($v = $this->getReference())) { - $a[self::FIELD_REFERENCE] = $v->getValue(); - $a[self::FIELD_REFERENCE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_REFERENCE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_REFERENCE_EXT] = $enc; + } + } else { + $a[self::FIELD_REFERENCE] = $v; + } } if (null !== ($v = $this->getType())) { - $a[self::FIELD_TYPE] = $v->getValue(); - $a[self::FIELD_TYPE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TYPE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TYPE_EXT] = $enc; + } + } else { + $a[self::FIELD_TYPE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRReferenceHandlingPolicy.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRReferenceHandlingPolicy.php index 698540907c..1415601d1f 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRReferenceHandlingPolicy.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRReferenceHandlingPolicy.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRReferenceHandlingPolicy extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_REFERENCE_HANDLING_POLICY; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRReferenceHandlingPolicy extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRReferenceHandlingPolicy Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRReferenceVersionRules.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRReferenceVersionRules.php index d3136d289d..d082a7f9db 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRReferenceVersionRules.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRReferenceVersionRules.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRReferenceVersionRules extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_REFERENCE_VERSION_RULES; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -90,6 +86,9 @@ class FHIRReferenceVersionRules extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRReferenceVersionRules Constructor * @param null|array $data @@ -245,8 +244,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRRelatedArtifact.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRRelatedArtifact.php index 135b90c642..7135bbd4b6 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRRelatedArtifact.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRRelatedArtifact.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRRelatedArtifact extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_RELATED_ARTIFACT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CITATION = 'citation'; const FIELD_CITATION_EXT = '_citation'; const FIELD_DISPLAY = 'display'; @@ -183,6 +179,9 @@ class FHIRRelatedArtifact extends FHIRElement */ protected $url = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRRelatedArtifact Constructor * @param null|array $data @@ -205,8 +204,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CITATION] instanceof FHIRMarkdown) { $this->setCitation($data[self::FIELD_CITATION]); - } elseif ($ext && is_scalar($data[self::FIELD_CITATION])) { - $this->setCitation(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_CITATION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CITATION])) { + $this->setCitation(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_CITATION]] + $ext)); + } else if (is_array($data[self::FIELD_CITATION])) { + $this->setCitation(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_CITATION]))); + } } else { $this->setCitation(new FHIRMarkdown($data[self::FIELD_CITATION])); } @@ -217,8 +220,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DISPLAY] instanceof FHIRString) { $this->setDisplay($data[self::FIELD_DISPLAY]); - } elseif ($ext && is_scalar($data[self::FIELD_DISPLAY])) { - $this->setDisplay(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DISPLAY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DISPLAY])) { + $this->setDisplay(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DISPLAY]] + $ext)); + } else if (is_array($data[self::FIELD_DISPLAY])) { + $this->setDisplay(new FHIRString(array_merge($ext, $data[self::FIELD_DISPLAY]))); + } } else { $this->setDisplay(new FHIRString($data[self::FIELD_DISPLAY])); } @@ -236,8 +243,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_LABEL] instanceof FHIRString) { $this->setLabel($data[self::FIELD_LABEL]); - } elseif ($ext && is_scalar($data[self::FIELD_LABEL])) { - $this->setLabel(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_LABEL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_LABEL])) { + $this->setLabel(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_LABEL]] + $ext)); + } else if (is_array($data[self::FIELD_LABEL])) { + $this->setLabel(new FHIRString(array_merge($ext, $data[self::FIELD_LABEL]))); + } } else { $this->setLabel(new FHIRString($data[self::FIELD_LABEL])); } @@ -248,8 +259,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_RESOURCE] instanceof FHIRCanonical) { $this->setResource($data[self::FIELD_RESOURCE]); - } elseif ($ext && is_scalar($data[self::FIELD_RESOURCE])) { - $this->setResource(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $data[self::FIELD_RESOURCE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_RESOURCE])) { + $this->setResource(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $data[self::FIELD_RESOURCE]] + $ext)); + } else if (is_array($data[self::FIELD_RESOURCE])) { + $this->setResource(new FHIRCanonical(array_merge($ext, $data[self::FIELD_RESOURCE]))); + } } else { $this->setResource(new FHIRCanonical($data[self::FIELD_RESOURCE])); } @@ -260,8 +275,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TYPE] instanceof FHIRRelatedArtifactType) { $this->setType($data[self::FIELD_TYPE]); - } elseif ($ext && is_scalar($data[self::FIELD_TYPE])) { - $this->setType(new FHIRRelatedArtifactType([FHIRRelatedArtifactType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TYPE])) { + $this->setType(new FHIRRelatedArtifactType([FHIRRelatedArtifactType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } else if (is_array($data[self::FIELD_TYPE])) { + $this->setType(new FHIRRelatedArtifactType(array_merge($ext, $data[self::FIELD_TYPE]))); + } } else { $this->setType(new FHIRRelatedArtifactType($data[self::FIELD_TYPE])); } @@ -272,8 +291,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_URL] instanceof FHIRUrl) { $this->setUrl($data[self::FIELD_URL]); - } elseif ($ext && is_scalar($data[self::FIELD_URL])) { - $this->setUrl(new FHIRUrl([FHIRUrl::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUrl([FHIRUrl::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } else if (is_array($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUrl(array_merge($ext, $data[self::FIELD_URL]))); + } } else { $this->setUrl(new FHIRUrl($data[self::FIELD_URL])); } @@ -689,7 +712,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDisplay())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DISPLAY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDocument())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DOCUMENT, null, $v->_getFHIRXMLNamespace())); } @@ -699,7 +721,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getResource())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RESOURCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -716,30 +737,73 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getCitation())) { - $a[self::FIELD_CITATION] = $v->getValue(); - $a[self::FIELD_CITATION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CITATION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CITATION_EXT] = $enc; + } + } else { + $a[self::FIELD_CITATION] = $v; + } } if (null !== ($v = $this->getDisplay())) { - $a[self::FIELD_DISPLAY] = $v->getValue(); - $a[self::FIELD_DISPLAY_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DISPLAY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DISPLAY_EXT] = $enc; + } + } else { + $a[self::FIELD_DISPLAY] = $v; + } } if (null !== ($v = $this->getDocument())) { $a[self::FIELD_DOCUMENT] = $v; } if (null !== ($v = $this->getLabel())) { - $a[self::FIELD_LABEL] = $v->getValue(); - $a[self::FIELD_LABEL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_LABEL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_LABEL_EXT] = $enc; + } + } else { + $a[self::FIELD_LABEL] = $v; + } } if (null !== ($v = $this->getResource())) { - $a[self::FIELD_RESOURCE] = $v->getValue(); - $a[self::FIELD_RESOURCE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_RESOURCE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_RESOURCE_EXT] = $enc; + } + } else { + $a[self::FIELD_RESOURCE] = $v; + } } if (null !== ($v = $this->getType())) { - $a[self::FIELD_TYPE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TYPE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TYPE_EXT] = $enc; + } + } else { + $a[self::FIELD_TYPE] = $v; + } } if (null !== ($v = $this->getUrl())) { - $a[self::FIELD_URL] = $v->getValue(); - $a[self::FIELD_URL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_URL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_URL_EXT] = $enc; + } + } else { + $a[self::FIELD_URL] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRRelatedArtifactType.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRRelatedArtifactType.php index 17b31501f4..ac03f09c1b 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRRelatedArtifactType.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRRelatedArtifactType.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRRelatedArtifactType extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_RELATED_ARTIFACT_TYPE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRRelatedArtifactType extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRRelatedArtifactType Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRRemittanceOutcome.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRRemittanceOutcome.php index 037e0fce68..e0005d7ca1 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRRemittanceOutcome.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRRemittanceOutcome.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -77,10 +77,6 @@ class FHIRRemittanceOutcome extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_REMITTANCE_OUTCOME; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -88,6 +84,9 @@ class FHIRRemittanceOutcome extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRRemittanceOutcome Constructor * @param null|array $data @@ -243,8 +242,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRRepositoryType.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRRepositoryType.php index e0a1227e11..869aa14477 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRRepositoryType.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRRepositoryType.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRRepositoryType extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_REPOSITORY_TYPE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRRepositoryType extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRRepositoryType Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRRequestIntent.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRRequestIntent.php index 9a445bef11..0b92afd8a5 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRRequestIntent.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRRequestIntent.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRRequestIntent extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_REQUEST_INTENT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -90,6 +86,9 @@ class FHIRRequestIntent extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRRequestIntent Constructor * @param null|array $data @@ -245,8 +244,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRRequestPriority.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRRequestPriority.php index 375a8f0cef..999e3bd1e9 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRRequestPriority.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRRequestPriority.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRRequestPriority extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_REQUEST_PRIORITY; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRRequestPriority extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRRequestPriority Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRRequestResourceType.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRRequestResourceType.php index 431de0fe84..3154c33c21 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRRequestResourceType.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRRequestResourceType.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRRequestResourceType extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_REQUEST_RESOURCE_TYPE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRRequestResourceType extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRRequestResourceType Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRRequestStatus.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRRequestStatus.php index a2ca30b5ab..45162d81e3 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRRequestStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRRequestStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRRequestStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_REQUEST_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -90,6 +86,9 @@ class FHIRRequestStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRRequestStatus Constructor * @param null|array $data @@ -245,8 +244,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRResearchElementType.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRResearchElementType.php index 34bdfebc37..3a18c6e80c 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRResearchElementType.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRResearchElementType.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRResearchElementType extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_RESEARCH_ELEMENT_TYPE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRResearchElementType extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRResearchElementType Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRResearchStudyStatus.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRResearchStudyStatus.php index df6229de10..7a62097f7f 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRResearchStudyStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRResearchStudyStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRResearchStudyStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_RESEARCH_STUDY_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRResearchStudyStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRResearchStudyStatus Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRResearchSubjectStatus.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRResearchSubjectStatus.php index fab51e21c0..97b93612af 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRResearchSubjectStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRResearchSubjectStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRResearchSubjectStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_RESEARCH_SUBJECT_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRResearchSubjectStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRResearchSubjectStatus Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRResourceVersionPolicy.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRResourceVersionPolicy.php index 29820c2583..0fe50fdd47 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRResourceVersionPolicy.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRResourceVersionPolicy.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRResourceVersionPolicy extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_RESOURCE_VERSION_POLICY; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRResourceVersionPolicy extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRResourceVersionPolicy Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRResponseType.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRResponseType.php index a614d3028c..11f27ed83b 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRResponseType.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRResponseType.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRResponseType extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_RESPONSE_TYPE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRResponseType extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRResponseType Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRRestfulCapabilityMode.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRRestfulCapabilityMode.php index a2934895ff..2b0b6692c9 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRRestfulCapabilityMode.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRRestfulCapabilityMode.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRRestfulCapabilityMode extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_RESTFUL_CAPABILITY_MODE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRRestfulCapabilityMode extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRRestfulCapabilityMode Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRSPDXLicense.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRSPDXLicense.php index a7fb0f9623..2e665b1354 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRSPDXLicense.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRSPDXLicense.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRSPDXLicense extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SPDXLICENSE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -91,6 +87,9 @@ class FHIRSPDXLicense extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSPDXLicense Constructor * @param null|array $data @@ -246,8 +245,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRSampledData.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRSampledData.php index 4a0e32e5a5..155cb8f8db 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRSampledData.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRSampledData.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRSampledData extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SAMPLED_DATA; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DATA = 'data'; const FIELD_DATA_EXT = '_data'; const FIELD_DIMENSIONS = 'dimensions'; @@ -185,6 +181,9 @@ class FHIRSampledData extends FHIRElement */ protected $upperLimit = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSampledData Constructor * @param null|array $data @@ -207,8 +206,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATA] instanceof FHIRSampledDataDataType) { $this->setData($data[self::FIELD_DATA]); - } elseif ($ext && is_scalar($data[self::FIELD_DATA])) { - $this->setData(new FHIRSampledDataDataType([FHIRSampledDataDataType::FIELD_VALUE => $data[self::FIELD_DATA]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATA])) { + $this->setData(new FHIRSampledDataDataType([FHIRSampledDataDataType::FIELD_VALUE => $data[self::FIELD_DATA]] + $ext)); + } else if (is_array($data[self::FIELD_DATA])) { + $this->setData(new FHIRSampledDataDataType(array_merge($ext, $data[self::FIELD_DATA]))); + } } else { $this->setData(new FHIRSampledDataDataType($data[self::FIELD_DATA])); } @@ -219,8 +222,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DIMENSIONS] instanceof FHIRPositiveInt) { $this->setDimensions($data[self::FIELD_DIMENSIONS]); - } elseif ($ext && is_scalar($data[self::FIELD_DIMENSIONS])) { - $this->setDimensions(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_DIMENSIONS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DIMENSIONS])) { + $this->setDimensions(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_DIMENSIONS]] + $ext)); + } else if (is_array($data[self::FIELD_DIMENSIONS])) { + $this->setDimensions(new FHIRPositiveInt(array_merge($ext, $data[self::FIELD_DIMENSIONS]))); + } } else { $this->setDimensions(new FHIRPositiveInt($data[self::FIELD_DIMENSIONS])); } @@ -231,8 +238,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_FACTOR] instanceof FHIRDecimal) { $this->setFactor($data[self::FIELD_FACTOR]); - } elseif ($ext && is_scalar($data[self::FIELD_FACTOR])) { - $this->setFactor(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_FACTOR]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_FACTOR])) { + $this->setFactor(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_FACTOR]] + $ext)); + } else if (is_array($data[self::FIELD_FACTOR])) { + $this->setFactor(new FHIRDecimal(array_merge($ext, $data[self::FIELD_FACTOR]))); + } } else { $this->setFactor(new FHIRDecimal($data[self::FIELD_FACTOR])); } @@ -243,8 +254,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_LOWER_LIMIT] instanceof FHIRDecimal) { $this->setLowerLimit($data[self::FIELD_LOWER_LIMIT]); - } elseif ($ext && is_scalar($data[self::FIELD_LOWER_LIMIT])) { - $this->setLowerLimit(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_LOWER_LIMIT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_LOWER_LIMIT])) { + $this->setLowerLimit(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_LOWER_LIMIT]] + $ext)); + } else if (is_array($data[self::FIELD_LOWER_LIMIT])) { + $this->setLowerLimit(new FHIRDecimal(array_merge($ext, $data[self::FIELD_LOWER_LIMIT]))); + } } else { $this->setLowerLimit(new FHIRDecimal($data[self::FIELD_LOWER_LIMIT])); } @@ -255,8 +270,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ORIGIN] instanceof FHIRQuantity) { $this->setOrigin($data[self::FIELD_ORIGIN]); - } elseif ($ext && is_scalar($data[self::FIELD_ORIGIN])) { - $this->setOrigin(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_ORIGIN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ORIGIN])) { + $this->setOrigin(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_ORIGIN]] + $ext)); + } else if (is_array($data[self::FIELD_ORIGIN])) { + $this->setOrigin(new FHIRQuantity(array_merge($ext, $data[self::FIELD_ORIGIN]))); + } } else { $this->setOrigin(new FHIRQuantity($data[self::FIELD_ORIGIN])); } @@ -267,8 +286,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PERIOD] instanceof FHIRDecimal) { $this->setPeriod($data[self::FIELD_PERIOD]); - } elseif ($ext && is_scalar($data[self::FIELD_PERIOD])) { - $this->setPeriod(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_PERIOD]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PERIOD])) { + $this->setPeriod(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_PERIOD]] + $ext)); + } else if (is_array($data[self::FIELD_PERIOD])) { + $this->setPeriod(new FHIRDecimal(array_merge($ext, $data[self::FIELD_PERIOD]))); + } } else { $this->setPeriod(new FHIRDecimal($data[self::FIELD_PERIOD])); } @@ -279,8 +302,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_UPPER_LIMIT] instanceof FHIRDecimal) { $this->setUpperLimit($data[self::FIELD_UPPER_LIMIT]); - } elseif ($ext && is_scalar($data[self::FIELD_UPPER_LIMIT])) { - $this->setUpperLimit(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_UPPER_LIMIT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_UPPER_LIMIT])) { + $this->setUpperLimit(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_UPPER_LIMIT]] + $ext)); + } else if (is_array($data[self::FIELD_UPPER_LIMIT])) { + $this->setUpperLimit(new FHIRDecimal(array_merge($ext, $data[self::FIELD_UPPER_LIMIT]))); + } } else { $this->setUpperLimit(new FHIRDecimal($data[self::FIELD_UPPER_LIMIT])); } @@ -715,7 +742,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getLowerLimit())) { $v->xmlSerialize($sxe->addChild(self::FIELD_LOWER_LIMIT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOrigin())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ORIGIN, null, $v->_getFHIRXMLNamespace())); } @@ -735,31 +761,81 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getData())) { - $a[self::FIELD_DATA] = $v->getValue(); - $a[self::FIELD_DATA_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATA] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATA_EXT] = $enc; + } + } else { + $a[self::FIELD_DATA] = $v; + } } if (null !== ($v = $this->getDimensions())) { - $a[self::FIELD_DIMENSIONS] = $v->getValue(); - $a[self::FIELD_DIMENSIONS_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DIMENSIONS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DIMENSIONS_EXT] = $enc; + } + } else { + $a[self::FIELD_DIMENSIONS] = $v; + } } if (null !== ($v = $this->getFactor())) { - $a[self::FIELD_FACTOR] = $v->getValue(); - $a[self::FIELD_FACTOR_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FACTOR] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FACTOR_EXT] = $enc; + } + } else { + $a[self::FIELD_FACTOR] = $v; + } } if (null !== ($v = $this->getLowerLimit())) { - $a[self::FIELD_LOWER_LIMIT] = $v->getValue(); - $a[self::FIELD_LOWER_LIMIT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_LOWER_LIMIT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_LOWER_LIMIT_EXT] = $enc; + } + } else { + $a[self::FIELD_LOWER_LIMIT] = $v; + } } if (null !== ($v = $this->getOrigin())) { - $a[self::FIELD_ORIGIN] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ORIGIN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ORIGIN_EXT] = $enc; + } + } else { + $a[self::FIELD_ORIGIN] = $v; + } } if (null !== ($v = $this->getPeriod())) { - $a[self::FIELD_PERIOD] = $v->getValue(); - $a[self::FIELD_PERIOD_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PERIOD] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PERIOD_EXT] = $enc; + } + } else { + $a[self::FIELD_PERIOD] = $v; + } } if (null !== ($v = $this->getUpperLimit())) { - $a[self::FIELD_UPPER_LIMIT] = $v->getValue(); - $a[self::FIELD_UPPER_LIMIT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_UPPER_LIMIT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_UPPER_LIMIT_EXT] = $enc; + } + } else { + $a[self::FIELD_UPPER_LIMIT] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRSampledDataDataType.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRSampledDataDataType.php index 27fe1f783a..0ae32c678b 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRSampledDataDataType.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRSampledDataDataType.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -75,10 +75,6 @@ class FHIRSampledDataDataType extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SAMPLED_DATA_DATA_TYPE; - - /** @var string */ - protected $_xmlns = ''; - const FIELD_VALUE = 'value'; /** @@ -86,6 +82,8 @@ class FHIRSampledDataDataType extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; /** * FHIRSampledDataDataType Constructor @@ -243,8 +241,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRSearchComparator.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRSearchComparator.php index c23fc86911..da254fd9dd 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRSearchComparator.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRSearchComparator.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRSearchComparator extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SEARCH_COMPARATOR; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRSearchComparator extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSearchComparator Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRSearchEntryMode.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRSearchEntryMode.php index 8efdd51840..6d332a88b5 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRSearchEntryMode.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRSearchEntryMode.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRSearchEntryMode extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SEARCH_ENTRY_MODE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -91,6 +87,9 @@ class FHIRSearchEntryMode extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSearchEntryMode Constructor * @param null|array $data @@ -246,8 +245,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRSearchModifierCode.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRSearchModifierCode.php index f01e3b8df8..7591be3364 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRSearchModifierCode.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRSearchModifierCode.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRSearchModifierCode extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SEARCH_MODIFIER_CODE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRSearchModifierCode extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSearchModifierCode Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRSearchParamType.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRSearchParamType.php index 53729e6f0a..94153dd4c5 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRSearchParamType.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRSearchParamType.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -77,10 +77,6 @@ class FHIRSearchParamType extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SEARCH_PARAM_TYPE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -88,6 +84,9 @@ class FHIRSearchParamType extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSearchParamType Constructor * @param null|array $data @@ -243,8 +242,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRSequenceType.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRSequenceType.php index b16ba8f100..6267582080 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRSequenceType.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRSequenceType.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRSequenceType extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SEQUENCE_TYPE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRSequenceType extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSequenceType Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRSignature.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRSignature.php index 5c00f02901..3ef5ad2310 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRSignature.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRSignature.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -82,10 +82,6 @@ class FHIRSignature extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SIGNATURE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DATA = 'data'; const FIELD_DATA_EXT = '_data'; const FIELD_ON_BEHALF_OF = 'onBehalfOf'; @@ -188,6 +184,9 @@ class FHIRSignature extends FHIRElement */ protected $who = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSignature Constructor * @param null|array $data @@ -210,8 +209,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATA] instanceof FHIRBase64Binary) { $this->setData($data[self::FIELD_DATA]); - } elseif ($ext && is_scalar($data[self::FIELD_DATA])) { - $this->setData(new FHIRBase64Binary([FHIRBase64Binary::FIELD_VALUE => $data[self::FIELD_DATA]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATA])) { + $this->setData(new FHIRBase64Binary([FHIRBase64Binary::FIELD_VALUE => $data[self::FIELD_DATA]] + $ext)); + } else if (is_array($data[self::FIELD_DATA])) { + $this->setData(new FHIRBase64Binary(array_merge($ext, $data[self::FIELD_DATA]))); + } } else { $this->setData(new FHIRBase64Binary($data[self::FIELD_DATA])); } @@ -229,8 +232,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SIG_FORMAT] instanceof FHIRCode) { $this->setSigFormat($data[self::FIELD_SIG_FORMAT]); - } elseif ($ext && is_scalar($data[self::FIELD_SIG_FORMAT])) { - $this->setSigFormat(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_SIG_FORMAT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SIG_FORMAT])) { + $this->setSigFormat(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_SIG_FORMAT]] + $ext)); + } else if (is_array($data[self::FIELD_SIG_FORMAT])) { + $this->setSigFormat(new FHIRCode(array_merge($ext, $data[self::FIELD_SIG_FORMAT]))); + } } else { $this->setSigFormat(new FHIRCode($data[self::FIELD_SIG_FORMAT])); } @@ -241,8 +248,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TARGET_FORMAT] instanceof FHIRCode) { $this->setTargetFormat($data[self::FIELD_TARGET_FORMAT]); - } elseif ($ext && is_scalar($data[self::FIELD_TARGET_FORMAT])) { - $this->setTargetFormat(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_TARGET_FORMAT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TARGET_FORMAT])) { + $this->setTargetFormat(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_TARGET_FORMAT]] + $ext)); + } else if (is_array($data[self::FIELD_TARGET_FORMAT])) { + $this->setTargetFormat(new FHIRCode(array_merge($ext, $data[self::FIELD_TARGET_FORMAT]))); + } } else { $this->setTargetFormat(new FHIRCode($data[self::FIELD_TARGET_FORMAT])); } @@ -250,6 +261,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_TYPE])) { if (is_array($data[self::FIELD_TYPE])) { foreach($data[self::FIELD_TYPE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCoding) { $this->addType($v); } else { @@ -268,8 +282,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_WHEN] instanceof FHIRInstant) { $this->setWhen($data[self::FIELD_WHEN]); - } elseif ($ext && is_scalar($data[self::FIELD_WHEN])) { - $this->setWhen(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_WHEN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_WHEN])) { + $this->setWhen(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_WHEN]] + $ext)); + } else if (is_array($data[self::FIELD_WHEN])) { + $this->setWhen(new FHIRInstant(array_merge($ext, $data[self::FIELD_WHEN]))); + } } else { $this->setWhen(new FHIRInstant($data[self::FIELD_WHEN])); } @@ -716,7 +734,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getData())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DATA, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOnBehalfOf())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ON_BEHALF_OF, null, $v->_getFHIRXMLNamespace())); } @@ -726,7 +743,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getTargetFormat())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TARGET_FORMAT, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getType())) { foreach($vs as $v) { if (null === $v) { @@ -735,10 +751,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getWhen())) { $v->xmlSerialize($sxe->addChild(self::FIELD_WHEN, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getWho())) { $v->xmlSerialize($sxe->addChild(self::FIELD_WHO, null, $v->_getFHIRXMLNamespace())); } @@ -752,26 +768,54 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getData())) { - $a[self::FIELD_DATA] = $v->getValue(); - $a[self::FIELD_DATA_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATA] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATA_EXT] = $enc; + } + } else { + $a[self::FIELD_DATA] = $v; + } } if (null !== ($v = $this->getOnBehalfOf())) { $a[self::FIELD_ON_BEHALF_OF] = $v; } if (null !== ($v = $this->getSigFormat())) { - $a[self::FIELD_SIG_FORMAT] = $v->getValue(); - $a[self::FIELD_SIG_FORMAT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SIG_FORMAT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SIG_FORMAT_EXT] = $enc; + } + } else { + $a[self::FIELD_SIG_FORMAT] = $v; + } } if (null !== ($v = $this->getTargetFormat())) { - $a[self::FIELD_TARGET_FORMAT] = $v->getValue(); - $a[self::FIELD_TARGET_FORMAT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TARGET_FORMAT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TARGET_FORMAT_EXT] = $enc; + } + } else { + $a[self::FIELD_TARGET_FORMAT] = $v; + } } if ([] !== ($vs = $this->getType())) { $a[self::FIELD_TYPE] = $vs; } if (null !== ($v = $this->getWhen())) { - $a[self::FIELD_WHEN] = $v->getValue(); - $a[self::FIELD_WHEN_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_WHEN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_WHEN_EXT] = $enc; + } + } else { + $a[self::FIELD_WHEN] = $v; + } } if (null !== ($v = $this->getWho())) { $a[self::FIELD_WHO] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRSlicingRules.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRSlicingRules.php index 785d57b1f0..a8d6c9f5a0 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRSlicingRules.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRSlicingRules.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRSlicingRules extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SLICING_RULES; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRSlicingRules extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSlicingRules Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRSlotStatus.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRSlotStatus.php index b4b74344e6..0b67d09d02 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRSlotStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRSlotStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRSlotStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SLOT_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRSlotStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSlotStatus Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRSortDirection.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRSortDirection.php index 30a0906c20..5ccf3980ac 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRSortDirection.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRSortDirection.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRSortDirection extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SORT_DIRECTION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRSortDirection extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSortDirection Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRSpecimenContainedPreference.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRSpecimenContainedPreference.php index 1057b997c9..65e7741972 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRSpecimenContainedPreference.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRSpecimenContainedPreference.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRSpecimenContainedPreference extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SPECIMEN_CONTAINED_PREFERENCE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRSpecimenContainedPreference extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSpecimenContainedPreference Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRSpecimenStatus.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRSpecimenStatus.php index 1c2b3e0495..1cdef13219 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRSpecimenStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRSpecimenStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRSpecimenStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SPECIMEN_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRSpecimenStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSpecimenStatus Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRStatus.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRStatus.php index 740fdf1890..bcbf3d15a4 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRStatus Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRStrandType.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRStrandType.php index 47e3af710d..8462685d5b 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRStrandType.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRStrandType.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRStrandType extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_STRAND_TYPE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRStrandType extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRStrandType Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRString.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRString.php index 66df10179c..ffa055825d 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRString.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRString.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRString extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_STRING; - - /** @var string */ - protected $_xmlns = ''; - const FIELD_VALUE = 'value'; /** @@ -90,6 +86,8 @@ class FHIRString extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; /** * FHIRString Constructor @@ -247,8 +245,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRStructureDefinitionKind.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRStructureDefinitionKind.php index cd71869fc6..cd5660382f 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRStructureDefinitionKind.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRStructureDefinitionKind.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRStructureDefinitionKind extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_STRUCTURE_DEFINITION_KIND; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRStructureDefinitionKind extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRStructureDefinitionKind Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRStructureMapContextType.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRStructureMapContextType.php index c7dd968524..83e6db3e89 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRStructureMapContextType.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRStructureMapContextType.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRStructureMapContextType extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_STRUCTURE_MAP_CONTEXT_TYPE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRStructureMapContextType extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRStructureMapContextType Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRStructureMapGroupTypeMode.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRStructureMapGroupTypeMode.php index b107cd4b59..43d4213787 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRStructureMapGroupTypeMode.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRStructureMapGroupTypeMode.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRStructureMapGroupTypeMode extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_STRUCTURE_MAP_GROUP_TYPE_MODE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -90,6 +86,9 @@ class FHIRStructureMapGroupTypeMode extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRStructureMapGroupTypeMode Constructor * @param null|array $data @@ -245,8 +244,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRStructureMapInputMode.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRStructureMapInputMode.php index 06f4501476..f5fe7051c7 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRStructureMapInputMode.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRStructureMapInputMode.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRStructureMapInputMode extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_STRUCTURE_MAP_INPUT_MODE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRStructureMapInputMode extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRStructureMapInputMode Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRStructureMapModelMode.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRStructureMapModelMode.php index 2b80af6283..5edf390e60 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRStructureMapModelMode.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRStructureMapModelMode.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRStructureMapModelMode extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_STRUCTURE_MAP_MODEL_MODE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRStructureMapModelMode extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRStructureMapModelMode Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRStructureMapSourceListMode.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRStructureMapSourceListMode.php index ace2b0344e..ff1b6dfa1e 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRStructureMapSourceListMode.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRStructureMapSourceListMode.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRStructureMapSourceListMode extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_STRUCTURE_MAP_SOURCE_LIST_MODE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRStructureMapSourceListMode extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRStructureMapSourceListMode Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRStructureMapTargetListMode.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRStructureMapTargetListMode.php index 9c09588d61..71e7c5aa18 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRStructureMapTargetListMode.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRStructureMapTargetListMode.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRStructureMapTargetListMode extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_STRUCTURE_MAP_TARGET_LIST_MODE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRStructureMapTargetListMode extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRStructureMapTargetListMode Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRStructureMapTransform.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRStructureMapTransform.php index bf7e19101d..2474325423 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRStructureMapTransform.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRStructureMapTransform.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRStructureMapTransform extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_STRUCTURE_MAP_TRANSFORM; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRStructureMapTransform extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRStructureMapTransform Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRSubscriptionChannelType.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRSubscriptionChannelType.php index ed2a7166ed..fc076741ee 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRSubscriptionChannelType.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRSubscriptionChannelType.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRSubscriptionChannelType extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SUBSCRIPTION_CHANNEL_TYPE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRSubscriptionChannelType extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSubscriptionChannelType Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRSubscriptionStatus.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRSubscriptionStatus.php index 4824c95040..63df3460f2 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRSubscriptionStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRSubscriptionStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRSubscriptionStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SUBSCRIPTION_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRSubscriptionStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSubscriptionStatus Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRSupplyDeliveryStatus.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRSupplyDeliveryStatus.php index 1d125bca63..0c292434de 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRSupplyDeliveryStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRSupplyDeliveryStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRSupplyDeliveryStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SUPPLY_DELIVERY_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRSupplyDeliveryStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSupplyDeliveryStatus Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRSupplyRequestStatus.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRSupplyRequestStatus.php index b10d266a29..d6b9f94931 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRSupplyRequestStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRSupplyRequestStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRSupplyRequestStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SUPPLY_REQUEST_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRSupplyRequestStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSupplyRequestStatus Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRSystemRestfulInteraction.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRSystemRestfulInteraction.php index 30b79f7855..a379071666 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRSystemRestfulInteraction.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRSystemRestfulInteraction.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRSystemRestfulInteraction extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SYSTEM_RESTFUL_INTERACTION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRSystemRestfulInteraction extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSystemRestfulInteraction Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRTaskIntent.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRTaskIntent.php index a664e76cf5..15e0a56325 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRTaskIntent.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRTaskIntent.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRTaskIntent extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_TASK_INTENT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRTaskIntent extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRTaskIntent Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRTaskStatus.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRTaskStatus.php index 1c5aa151ae..d202aea69b 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRTaskStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRTaskStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRTaskStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_TASK_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRTaskStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRTaskStatus Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRTestReportActionResult.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRTestReportActionResult.php index d6381d3627..7127a45947 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRTestReportActionResult.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRTestReportActionResult.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRTestReportActionResult extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_TEST_REPORT_ACTION_RESULT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRTestReportActionResult extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRTestReportActionResult Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRTestReportParticipantType.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRTestReportParticipantType.php index 0e9982ac69..ba168d532e 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRTestReportParticipantType.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRTestReportParticipantType.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRTestReportParticipantType extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_TEST_REPORT_PARTICIPANT_TYPE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRTestReportParticipantType extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRTestReportParticipantType Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRTestReportResult.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRTestReportResult.php index 1699738ed0..0e950a62e7 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRTestReportResult.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRTestReportResult.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRTestReportResult extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_TEST_REPORT_RESULT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRTestReportResult extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRTestReportResult Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRTestReportStatus.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRTestReportStatus.php index ca1529d8c3..8e163d0f64 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRTestReportStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRTestReportStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRTestReportStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_TEST_REPORT_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRTestReportStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRTestReportStatus Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRTestScriptRequestMethodCode.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRTestScriptRequestMethodCode.php index c8a39c6b70..2f130d83fb 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRTestScriptRequestMethodCode.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRTestScriptRequestMethodCode.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRTestScriptRequestMethodCode extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_TEST_SCRIPT_REQUEST_METHOD_CODE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRTestScriptRequestMethodCode extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRTestScriptRequestMethodCode Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRTime.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRTime.php index 5407a1d531..d0f47c020e 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRTime.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRTime.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRTime extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_TIME; - - /** @var string */ - protected $_xmlns = ''; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,8 @@ class FHIRTime extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; /** * FHIRTime Constructor @@ -246,8 +244,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRTriggerDefinition.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRTriggerDefinition.php index 225707ddb2..bee586c3d9 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRTriggerDefinition.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRTriggerDefinition.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRTriggerDefinition extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_TRIGGER_DEFINITION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CONDITION = 'condition'; const FIELD_DATA = 'data'; const FIELD_NAME = 'name'; @@ -203,6 +199,9 @@ class FHIRTriggerDefinition extends FHIRElement */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRTriggerDefinition Constructor * @param null|array $data @@ -229,6 +228,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_DATA])) { if (is_array($data[self::FIELD_DATA])) { foreach($data[self::FIELD_DATA] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRDataRequirement) { $this->addData($v); } else { @@ -247,8 +249,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -259,8 +265,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TIMING_DATE] instanceof FHIRDate) { $this->setTimingDate($data[self::FIELD_TIMING_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_TIMING_DATE])) { - $this->setTimingDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_TIMING_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TIMING_DATE])) { + $this->setTimingDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_TIMING_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_TIMING_DATE])) { + $this->setTimingDate(new FHIRDate(array_merge($ext, $data[self::FIELD_TIMING_DATE]))); + } } else { $this->setTimingDate(new FHIRDate($data[self::FIELD_TIMING_DATE])); } @@ -271,8 +281,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TIMING_DATE_TIME] instanceof FHIRDateTime) { $this->setTimingDateTime($data[self::FIELD_TIMING_DATE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_TIMING_DATE_TIME])) { - $this->setTimingDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_TIMING_DATE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TIMING_DATE_TIME])) { + $this->setTimingDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_TIMING_DATE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_TIMING_DATE_TIME])) { + $this->setTimingDateTime(new FHIRDateTime(array_merge($ext, $data[self::FIELD_TIMING_DATE_TIME]))); + } } else { $this->setTimingDateTime(new FHIRDateTime($data[self::FIELD_TIMING_DATE_TIME])); } @@ -297,8 +311,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TYPE] instanceof FHIRTriggerType) { $this->setType($data[self::FIELD_TYPE]); - } elseif ($ext && is_scalar($data[self::FIELD_TYPE])) { - $this->setType(new FHIRTriggerType([FHIRTriggerType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TYPE])) { + $this->setType(new FHIRTriggerType([FHIRTriggerType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } else if (is_array($data[self::FIELD_TYPE])) { + $this->setType(new FHIRTriggerType(array_merge($ext, $data[self::FIELD_TYPE]))); + } } else { $this->setType(new FHIRTriggerType($data[self::FIELD_TYPE])); } @@ -767,11 +785,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getCondition())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CONDITION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getData())) { foreach($vs as $v) { if (null === $v) { @@ -780,6 +796,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_DATA, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NAME, null, $v->_getFHIRXMLNamespace())); } @@ -789,15 +806,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getTimingDateTime())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TIMING_DATE_TIME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getTimingReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TIMING_REFERENCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getTimingTiming())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TIMING_TIMING, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -817,16 +831,37 @@ public function jsonSerialize() $a[self::FIELD_DATA] = $vs; } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if (null !== ($v = $this->getTimingDate())) { - $a[self::FIELD_TIMING_DATE] = $v->getValue(); - $a[self::FIELD_TIMING_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TIMING_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TIMING_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_TIMING_DATE] = $v; + } } if (null !== ($v = $this->getTimingDateTime())) { - $a[self::FIELD_TIMING_DATE_TIME] = $v->getValue(); - $a[self::FIELD_TIMING_DATE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TIMING_DATE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TIMING_DATE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_TIMING_DATE_TIME] = $v; + } } if (null !== ($v = $this->getTimingReference())) { $a[self::FIELD_TIMING_REFERENCE] = $v; @@ -835,7 +870,15 @@ public function jsonSerialize() $a[self::FIELD_TIMING_TIMING] = $v; } if (null !== ($v = $this->getType())) { - $a[self::FIELD_TYPE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TYPE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TYPE_EXT] = $enc; + } + } else { + $a[self::FIELD_TYPE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRTriggerType.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRTriggerType.php index dd66b21d8f..7c9142c491 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRTriggerType.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRTriggerType.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRTriggerType extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_TRIGGER_TYPE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRTriggerType extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRTriggerType Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRTypeDerivationRule.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRTypeDerivationRule.php index 4a7f2c2a34..785cc2a9e0 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRTypeDerivationRule.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRTypeDerivationRule.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRTypeDerivationRule extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_TYPE_DERIVATION_RULE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRTypeDerivationRule extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRTypeDerivationRule Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRTypeRestfulInteraction.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRTypeRestfulInteraction.php index 37089400cb..46c76049b0 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRTypeRestfulInteraction.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRTypeRestfulInteraction.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRTypeRestfulInteraction extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_TYPE_RESTFUL_INTERACTION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRTypeRestfulInteraction extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRTypeRestfulInteraction Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRUDIEntryType.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRUDIEntryType.php index bc0a6d5159..f0af38566e 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRUDIEntryType.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRUDIEntryType.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRUDIEntryType extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_UDIENTRY_TYPE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRUDIEntryType extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRUDIEntryType Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRUnitsOfTime.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRUnitsOfTime.php index 2653497ccd..3f09c91707 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRUnitsOfTime.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRUnitsOfTime.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRUnitsOfTime extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_UNITS_OF_TIME; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRUnitsOfTime extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRUnitsOfTime Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRUnsignedInt.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRUnsignedInt.php index 6ee1e35c67..6879b364df 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRUnsignedInt.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRUnsignedInt.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRUnsignedInt extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_UNSIGNED_INT; - - /** @var string */ - protected $_xmlns = ''; - const FIELD_VALUE = 'value'; /** @@ -90,6 +86,8 @@ class FHIRUnsignedInt extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; /** * FHIRUnsignedInt Constructor @@ -247,8 +245,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRUri.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRUri.php index d0cc99eace..b0e8443f1c 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRUri.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRUri.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRUri extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_URI; - - /** @var string */ - protected $_xmlns = ''; - const FIELD_VALUE = 'value'; /** @@ -90,6 +86,8 @@ class FHIRUri extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; /** * FHIRUri Constructor @@ -247,8 +245,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRUrl.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRUrl.php index 9c81e8b08b..5c964cf80e 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRUrl.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRUrl.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRUrl extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_URL; - - /** @var string */ - protected $_xmlns = ''; - const FIELD_VALUE = 'value'; /** @@ -90,6 +86,8 @@ class FHIRUrl extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; /** * FHIRUrl Constructor @@ -247,8 +245,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRUsageContext.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRUsageContext.php index 395779449e..1c21bfad04 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRUsageContext.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRUsageContext.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -81,10 +81,6 @@ class FHIRUsageContext extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_USAGE_CONTEXT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CODE = 'code'; const FIELD_VALUE_CODEABLE_CONCEPT = 'valueCodeableConcept'; const FIELD_VALUE_QUANTITY = 'valueQuantity'; @@ -159,6 +155,9 @@ class FHIRUsageContext extends FHIRElement */ protected $valueReference = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRUsageContext Constructor * @param null|array $data @@ -195,8 +194,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_QUANTITY] instanceof FHIRQuantity) { $this->setValueQuantity($data[self::FIELD_VALUE_QUANTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_QUANTITY])) { - $this->setValueQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_VALUE_QUANTITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_QUANTITY])) { + $this->setValueQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_VALUE_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_QUANTITY])) { + $this->setValueQuantity(new FHIRQuantity(array_merge($ext, $data[self::FIELD_VALUE_QUANTITY]))); + } } else { $this->setValueQuantity(new FHIRQuantity($data[self::FIELD_VALUE_QUANTITY])); } @@ -505,23 +508,18 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_QUANTITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueRange())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_RANGE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_REFERENCE, null, $v->_getFHIRXMLNamespace())); } @@ -541,7 +539,15 @@ public function jsonSerialize() $a[self::FIELD_VALUE_CODEABLE_CONCEPT] = $v; } if (null !== ($v = $this->getValueQuantity())) { - $a[self::FIELD_VALUE_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_QUANTITY] = $v; + } } if (null !== ($v = $this->getValueRange())) { $a[self::FIELD_VALUE_RANGE] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRUse.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRUse.php index b510c53b38..3abb1d8618 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRUse.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRUse.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRUse extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_USE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRUse extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRUse Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRUuid.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRUuid.php index 5b27f4c262..3257f243e4 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRUuid.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRUuid.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRUuid extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_UUID; - - /** @var string */ - protected $_xmlns = ''; - const FIELD_VALUE = 'value'; /** @@ -91,6 +87,8 @@ class FHIRUuid extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; /** * FHIRUuid Constructor @@ -248,8 +246,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRVConfidentialityClassification.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRVConfidentialityClassification.php index 4359f33089..80a22595d0 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRVConfidentialityClassification.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRVConfidentialityClassification.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRVConfidentialityClassification extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_V_CONFIDENTIALITY_CLASSIFICATION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRVConfidentialityClassification extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRVConfidentialityClassification Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRVariableType.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRVariableType.php index 4718b88ebb..4ae4428cdb 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRVariableType.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRVariableType.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRVariableType extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_VARIABLE_TYPE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -90,6 +86,9 @@ class FHIRVariableType extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRVariableType Constructor * @param null|array $data @@ -245,8 +244,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRVisionBase.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRVisionBase.php index d9dde8f288..d1a1565094 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRVisionBase.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRVisionBase.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRVisionBase extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_VISION_BASE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRVisionBase extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRVisionBase Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRVisionEyes.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRVisionEyes.php index 8d4772df5e..c18195f00f 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRVisionEyes.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRVisionEyes.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRVisionEyes extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_VISION_EYES; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRVisionEyes extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRVisionEyes Constructor * @param null|array $data @@ -244,8 +243,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRXPathUsageType.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRXPathUsageType.php index cb07ee40a2..0f2b1e5a62 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRXPathUsageType.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRElement/FHIRXPathUsageType.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRXPathUsageType extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_XPATH_USAGE_TYPE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -90,6 +86,9 @@ class FHIRXPathUsageType extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRXPathUsageType Constructor * @param null|array $data @@ -245,8 +244,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } - parent::xmlSerialize($sxe); - if (null !== ($v = $this->getValue())) { + parent::xmlSerialize($sxe); if (null !== ($v = $this->getValue())) { $sxe->addAttribute(self::FIELD_VALUE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIREligibilityRequestPurposeList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIREligibilityRequestPurposeList.php index a00d393c58..603c98613d 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIREligibilityRequestPurposeList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIREligibilityRequestPurposeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -247,6 +247,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIREligibilityResponsePurposeList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIREligibilityResponsePurposeList.php index a26a2b7e34..8afc5c29a3 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIREligibilityResponsePurposeList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIREligibilityResponsePurposeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -247,6 +247,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIREnableWhenBehaviorList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIREnableWhenBehaviorList.php index 6d87fd4ffb..b9cf225631 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIREnableWhenBehaviorList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIREnableWhenBehaviorList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -245,6 +245,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIREncounterLocationStatusList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIREncounterLocationStatusList.php index ba74deabd8..79ba23f96b 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIREncounterLocationStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIREncounterLocationStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -247,6 +247,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIREncounterStatusList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIREncounterStatusList.php index c30d7a31dc..051bb1f005 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIREncounterStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIREncounterStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -252,6 +252,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIREndpointStatusList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIREndpointStatusList.php index c3d7290425..93581d886e 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIREndpointStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIREndpointStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -249,6 +249,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIREpisodeOfCareStatusList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIREpisodeOfCareStatusList.php index 25862eeb6f..9a5c7d0c33 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIREpisodeOfCareStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIREpisodeOfCareStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -250,6 +250,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIREventCapabilityModeList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIREventCapabilityModeList.php index 88c46f750c..24d9e23d14 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIREventCapabilityModeList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIREventCapabilityModeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -245,6 +245,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIREventStatusList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIREventStatusList.php index 347c49eab9..fead65e3b7 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIREventStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIREventStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -251,6 +251,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIREventTimingList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIREventTimingList.php index b75c223732..3472b04a5d 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIREventTimingList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIREventTimingList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -269,6 +269,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIREvidenceVariableTypeList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIREvidenceVariableTypeList.php index 0fa7605217..3ff72028b9 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIREvidenceVariableTypeList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIREvidenceVariableTypeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -246,6 +246,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRExampleScenarioActorTypeList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRExampleScenarioActorTypeList.php index f8dc269ddb..b6c4602a1b 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRExampleScenarioActorTypeList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRExampleScenarioActorTypeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -245,6 +245,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRExplanationOfBenefitStatusList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRExplanationOfBenefitStatusList.php index ba3d603ba8..4adb828e31 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRExplanationOfBenefitStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRExplanationOfBenefitStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -247,6 +247,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRExposureStateList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRExposureStateList.php index 470e7826d4..cd05b98d37 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRExposureStateList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRExposureStateList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -245,6 +245,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRExpressionLanguageList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRExpressionLanguageList.php index 84f6be5229..6e94209a37 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRExpressionLanguageList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRExpressionLanguageList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -246,6 +246,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRExtensionContextTypeList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRExtensionContextTypeList.php index 8a2e89126c..b8ea9b4637 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRExtensionContextTypeList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRExtensionContextTypeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -246,6 +246,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRFHIRDeviceStatusList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRFHIRDeviceStatusList.php index 11cc22c36a..b3651982e3 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRFHIRDeviceStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRFHIRDeviceStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -247,6 +247,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRFHIRSubstanceStatusList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRFHIRSubstanceStatusList.php index 54340cdd89..0a652c480a 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRFHIRSubstanceStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRFHIRSubstanceStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -246,6 +246,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRFHIRVersionList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRFHIRVersionList.php index 2d7bfabcf2..5a3e537f95 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRFHIRVersionList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRFHIRVersionList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -265,6 +265,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRFamilyHistoryStatusList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRFamilyHistoryStatusList.php index 1dedc11f1c..cc769c147d 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRFamilyHistoryStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRFamilyHistoryStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -247,6 +247,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRFilterOperatorList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRFilterOperatorList.php index 0c9015c2fe..f035734f1d 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRFilterOperatorList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRFilterOperatorList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -252,6 +252,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRFinancialResourceStatusCodesList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRFinancialResourceStatusCodesList.php index 94e4906f69..6832897dab 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRFinancialResourceStatusCodesList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRFinancialResourceStatusCodesList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -247,6 +247,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRFlagStatusList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRFlagStatusList.php index 0d1b0c039b..f362b71362 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRFlagStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRFlagStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -246,6 +246,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRGoalLifecycleStatusList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRGoalLifecycleStatusList.php index e6c76ef184..0abbe66f9c 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRGoalLifecycleStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRGoalLifecycleStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -252,6 +252,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRGraphCompartmentRuleList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRGraphCompartmentRuleList.php index f2881a2729..8f37b17068 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRGraphCompartmentRuleList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRGraphCompartmentRuleList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -247,6 +247,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRGraphCompartmentUseList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRGraphCompartmentUseList.php index 67e2c171f3..9d818ebe3e 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRGraphCompartmentUseList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRGraphCompartmentUseList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -245,6 +245,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRGroupMeasureList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRGroupMeasureList.php index 99fe2a5165..e6c41842ef 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRGroupMeasureList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRGroupMeasureList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -249,6 +249,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRGroupTypeList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRGroupTypeList.php index efe8f61476..7bc4150dd4 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRGroupTypeList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRGroupTypeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -249,6 +249,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRGuidanceResponseStatusList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRGuidanceResponseStatusList.php index 62e534e22f..2259216698 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRGuidanceResponseStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRGuidanceResponseStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -249,6 +249,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRGuidePageGenerationList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRGuidePageGenerationList.php index eaeb6bf994..d3743d785b 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRGuidePageGenerationList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRGuidePageGenerationList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -247,6 +247,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRGuideParameterCodeList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRGuideParameterCodeList.php index 88e7e883fd..2049273a89 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRGuideParameterCodeList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRGuideParameterCodeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -253,6 +253,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRHTTPVerbList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRHTTPVerbList.php index e54e9e9756..77f8008432 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRHTTPVerbList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRHTTPVerbList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -249,6 +249,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRIdPrimitive.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRIdPrimitive.php index 8839dd879f..b11d2e22b2 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRIdPrimitive.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRIdPrimitive.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -229,6 +229,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRIdentifierUseList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRIdentifierUseList.php index d42dc49adf..bb49bf13a8 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRIdentifierUseList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRIdentifierUseList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -248,6 +248,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRIdentityAssuranceLevelList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRIdentityAssuranceLevelList.php index 6e9f504ca5..14aaa22856 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRIdentityAssuranceLevelList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRIdentityAssuranceLevelList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -247,6 +247,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRImagingStudyStatusList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRImagingStudyStatusList.php index a55e224ead..ecbfd4c997 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRImagingStudyStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRImagingStudyStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -248,6 +248,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRImmunizationEvaluationStatusCodesList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRImmunizationEvaluationStatusCodesList.php index 56cb315b98..42a6d2a044 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRImmunizationEvaluationStatusCodesList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRImmunizationEvaluationStatusCodesList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -245,6 +245,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRImmunizationStatusCodesList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRImmunizationStatusCodesList.php index 951343ad9c..5e2953bd4d 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRImmunizationStatusCodesList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRImmunizationStatusCodesList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -246,6 +246,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRInstantPrimitive.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRInstantPrimitive.php index 16b5006a8a..7745c4c020 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRInstantPrimitive.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRInstantPrimitive.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -256,6 +256,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRIntegerPrimitive.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRIntegerPrimitive.php index 4c693bb749..ef5812930a 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRIntegerPrimitive.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRIntegerPrimitive.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -244,6 +244,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRInvoicePriceComponentTypeList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRInvoicePriceComponentTypeList.php index 1ae0ab1d67..b5515e2ad3 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRInvoicePriceComponentTypeList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRInvoicePriceComponentTypeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -249,6 +249,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRInvoiceStatusList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRInvoiceStatusList.php index 112ae87774..3ab7cc3f66 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRInvoiceStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRInvoiceStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -248,6 +248,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRIssueSeverityList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRIssueSeverityList.php index 55735e570b..1b34e66758 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRIssueSeverityList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRIssueSeverityList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -247,6 +247,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRIssueTypeList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRIssueTypeList.php index f92d924098..6892dc4267 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRIssueTypeList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRIssueTypeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -274,6 +274,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRLinkTypeList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRLinkTypeList.php index cc4db2fd06..609fe0351e 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRLinkTypeList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRLinkTypeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -247,6 +247,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRLinkageTypeList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRLinkageTypeList.php index 920b0a59bb..92006d1ee3 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRLinkageTypeList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRLinkageTypeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -246,6 +246,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRListModeList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRListModeList.php index 82bab42fe4..eb0287fada 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRListModeList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRListModeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -246,6 +246,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRListStatusList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRListStatusList.php index 6dca9a4f7d..f12ed0a20e 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRListStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRListStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -246,6 +246,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRLocationModeList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRLocationModeList.php index cbb75b108a..e70c2119a8 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRLocationModeList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRLocationModeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -245,6 +245,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRLocationStatusList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRLocationStatusList.php index 617c2b4455..f5f52324b1 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRLocationStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRLocationStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -246,6 +246,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRMarkdownPrimitive.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRMarkdownPrimitive.php index 71a509b39a..e602479b9f 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRMarkdownPrimitive.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRMarkdownPrimitive.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -228,6 +228,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRMeasureReportStatusList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRMeasureReportStatusList.php index 84e24f2614..319ccdbec0 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRMeasureReportStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRMeasureReportStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -246,6 +246,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRMeasureReportTypeList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRMeasureReportTypeList.php index 859923e07f..e095fc5ff9 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRMeasureReportTypeList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRMeasureReportTypeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -247,6 +247,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRMedicationRequestIntentList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRMedicationRequestIntentList.php index 0a13ccad34..3182e52f72 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRMedicationRequestIntentList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRMedicationRequestIntentList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -251,6 +251,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRMedicationStatusCodesList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRMedicationStatusCodesList.php index 93a542c772..0881b38775 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRMedicationStatusCodesList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRMedicationStatusCodesList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -246,6 +246,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRMedicationrequestStatusList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRMedicationrequestStatusList.php index 95fdaa321d..6adf0fc9d4 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRMedicationrequestStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRMedicationrequestStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -251,6 +251,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRMessageSignificanceCategoryList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRMessageSignificanceCategoryList.php index c7564001f4..f2263c9189 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRMessageSignificanceCategoryList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRMessageSignificanceCategoryList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -246,6 +246,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRMessageheaderResponseRequestList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRMessageheaderResponseRequestList.php index 8ff13cedb3..09bea68c68 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRMessageheaderResponseRequestList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRMessageheaderResponseRequestList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -247,6 +247,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRNameUseList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRNameUseList.php index 4deb2f4424..7be2536d8c 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRNameUseList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRNameUseList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -250,6 +250,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRNamingSystemIdentifierTypeList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRNamingSystemIdentifierTypeList.php index db82678625..ff4d44c9eb 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRNamingSystemIdentifierTypeList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRNamingSystemIdentifierTypeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -247,6 +247,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRNamingSystemTypeList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRNamingSystemTypeList.php index b9f82f94a3..58c94c957c 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRNamingSystemTypeList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRNamingSystemTypeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -246,6 +246,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRNarrativeStatusList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRNarrativeStatusList.php index 7b6f02dd3b..c1687d7377 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRNarrativeStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRNarrativeStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -247,6 +247,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRNoteTypeList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRNoteTypeList.php index 403748ae5b..cc8b36956c 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRNoteTypeList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRNoteTypeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -246,6 +246,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRObservationDataTypeList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRObservationDataTypeList.php index 8a71af2951..aac6c6a7b0 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRObservationDataTypeList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRObservationDataTypeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -254,6 +254,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRObservationRangeCategoryList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRObservationRangeCategoryList.php index 152a458769..a78a10d7c1 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRObservationRangeCategoryList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRObservationRangeCategoryList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -246,6 +246,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRObservationStatusList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRObservationStatusList.php index 66145690f4..65a424aa71 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRObservationStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRObservationStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -251,6 +251,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIROidPrimitive.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIROidPrimitive.php index 133fd3e5d6..33589d9f7d 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIROidPrimitive.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIROidPrimitive.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -229,6 +229,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIROperationKindList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIROperationKindList.php index 6914cb911a..b76937940e 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIROperationKindList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIROperationKindList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -245,6 +245,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIROperationParameterUseList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIROperationParameterUseList.php index bfc3523b4c..75b764f2b0 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIROperationParameterUseList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIROperationParameterUseList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -245,6 +245,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIROrientationTypeList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIROrientationTypeList.php index 284c82f97c..8330486a04 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIROrientationTypeList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIROrientationTypeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -245,6 +245,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRParticipantRequiredList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRParticipantRequiredList.php index 8171887166..a134edf5ce 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRParticipantRequiredList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRParticipantRequiredList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -246,6 +246,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRParticipationStatusList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRParticipationStatusList.php index 83bf288de6..87c8e034ef 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRParticipationStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRParticipationStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -247,6 +247,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRPositiveIntPrimitive.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRPositiveIntPrimitive.php index 9d0237ac8c..62a8fe5bbc 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRPositiveIntPrimitive.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRPositiveIntPrimitive.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -244,6 +244,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRPropertyRepresentationList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRPropertyRepresentationList.php index ab0787e816..01176fcdab 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRPropertyRepresentationList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRPropertyRepresentationList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -248,6 +248,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRPropertyTypeList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRPropertyTypeList.php index aea33ac1fc..359a0f5d3d 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRPropertyTypeList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRPropertyTypeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -250,6 +250,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRProvenanceEntityRoleList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRProvenanceEntityRoleList.php index 1619f217f1..9b23bd65fa 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRProvenanceEntityRoleList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRProvenanceEntityRoleList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -248,6 +248,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRPublicationStatusList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRPublicationStatusList.php index 10ef9c3ea3..263e765b7b 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRPublicationStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRPublicationStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -247,6 +247,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRQualityTypeList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRQualityTypeList.php index 7e9fd17b20..77981ef2e0 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRQualityTypeList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRQualityTypeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -246,6 +246,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRQuantityComparatorList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRQuantityComparatorList.php index 9a6e049801..8967a863bf 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRQuantityComparatorList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRQuantityComparatorList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -247,6 +247,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRQuestionnaireItemOperatorList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRQuestionnaireItemOperatorList.php index 59669fdce7..25b9c8d820 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRQuestionnaireItemOperatorList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRQuestionnaireItemOperatorList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -250,6 +250,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRQuestionnaireItemTypeList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRQuestionnaireItemTypeList.php index 248c05771b..0dc515d87d 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRQuestionnaireItemTypeList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRQuestionnaireItemTypeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -259,6 +259,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRQuestionnaireResponseStatusList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRQuestionnaireResponseStatusList.php index b9d18019e9..fb09c7470b 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRQuestionnaireResponseStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRQuestionnaireResponseStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -248,6 +248,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRReferenceHandlingPolicyList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRReferenceHandlingPolicyList.php index 8afc4900ab..ae47d982e8 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRReferenceHandlingPolicyList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRReferenceHandlingPolicyList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -248,6 +248,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRReferenceVersionRulesList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRReferenceVersionRulesList.php index 1789ec223e..387df7cc57 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRReferenceVersionRulesList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRReferenceVersionRulesList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -246,6 +246,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRRelatedArtifactTypeList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRRelatedArtifactTypeList.php index fdfc9fe43f..134e507e38 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRRelatedArtifactTypeList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRRelatedArtifactTypeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -251,6 +251,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRRemittanceOutcomeList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRRemittanceOutcomeList.php index f49de21dcc..f4fa044af0 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRRemittanceOutcomeList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRRemittanceOutcomeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -247,6 +247,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRRepositoryTypeList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRRepositoryTypeList.php index 5858433f92..2a7a826dd8 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRRepositoryTypeList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRRepositoryTypeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -248,6 +248,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRRequestIntentList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRRequestIntentList.php index d1b8569861..d05fc18d9c 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRRequestIntentList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRRequestIntentList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -252,6 +252,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRRequestPriorityList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRRequestPriorityList.php index 113e6dc516..bfa5211e05 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRRequestPriorityList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRRequestPriorityList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -247,6 +247,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRRequestResourceTypeList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRRequestResourceTypeList.php index 79fbc9c6d1..c2b86e2143 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRRequestResourceTypeList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRRequestResourceTypeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -258,6 +258,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRRequestStatusList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRRequestStatusList.php index 8d0ca3089c..bfb3e651ff 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRRequestStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRRequestStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -250,6 +250,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResearchElementTypeList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResearchElementTypeList.php index 46a6f91e62..5d80361c53 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResearchElementTypeList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResearchElementTypeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -246,6 +246,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResearchStudyStatusList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResearchStudyStatusList.php index aced26d5a7..0f58dc3df4 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResearchStudyStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResearchStudyStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -254,6 +254,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResearchSubjectStatusList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResearchSubjectStatusList.php index 5fea6cf552..e02dcf458b 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResearchSubjectStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResearchSubjectStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -256,6 +256,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource.php index 4b1039a6d4..a50df0c257 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -79,9 +79,7 @@ class FHIRResource implements PHPFHIRCommentContainerInterface, PHPFHIRTypeInter // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_RESOURCE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; + const FIELD_FHIR_COMMENTS = 'fhir_comments'; const FIELD_ID = 'id'; const FIELD_ID_EXT = '_id'; @@ -147,6 +145,9 @@ class FHIRResource implements PHPFHIRCommentContainerInterface, PHPFHIRTypeInter */ protected $meta = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRResource Constructor * @param null|array $data @@ -162,14 +163,25 @@ public function __construct($data = null) gettype($data) )); } + if (isset($data[self::FIELD_FHIR_COMMENTS])) { + if (is_array($data[self::FIELD_FHIR_COMMENTS])) { + $this->_setFHIRComments($data[self::FIELD_FHIR_COMMENTS]); + } else if (is_string($data[self::FIELD_FHIR_COMMENTS])) { + $this->_addFHIRComment($data[self::FIELD_FHIR_COMMENTS]); + } + } if (isset($data[self::FIELD_ID])) { $ext = (isset($data[self::FIELD_ID_EXT]) && is_array($data[self::FIELD_ID_EXT])) ? $data[self::FIELD_ID_EXT] : null; if ($data[self::FIELD_ID] instanceof FHIRId) { $this->setId($data[self::FIELD_ID]); - } elseif ($ext && is_scalar($data[self::FIELD_ID])) { - $this->setId(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_ID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ID])) { + $this->setId(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_ID]] + $ext)); + } else if (is_array($data[self::FIELD_ID])) { + $this->setId(new FHIRId(array_merge($ext, $data[self::FIELD_ID]))); + } } else { $this->setId(new FHIRId($data[self::FIELD_ID])); } @@ -180,8 +192,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IMPLICIT_RULES] instanceof FHIRUri) { $this->setImplicitRules($data[self::FIELD_IMPLICIT_RULES]); - } elseif ($ext && is_scalar($data[self::FIELD_IMPLICIT_RULES])) { - $this->setImplicitRules(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_IMPLICIT_RULES]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IMPLICIT_RULES])) { + $this->setImplicitRules(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_IMPLICIT_RULES]] + $ext)); + } else if (is_array($data[self::FIELD_IMPLICIT_RULES])) { + $this->setImplicitRules(new FHIRUri(array_merge($ext, $data[self::FIELD_IMPLICIT_RULES]))); + } } else { $this->setImplicitRules(new FHIRUri($data[self::FIELD_IMPLICIT_RULES])); } @@ -192,8 +208,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_LANGUAGE] instanceof FHIRCode) { $this->setLanguage($data[self::FIELD_LANGUAGE]); - } elseif ($ext && is_scalar($data[self::FIELD_LANGUAGE])) { - $this->setLanguage(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_LANGUAGE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_LANGUAGE])) { + $this->setLanguage(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_LANGUAGE]] + $ext)); + } else if (is_array($data[self::FIELD_LANGUAGE])) { + $this->setLanguage(new FHIRCode(array_merge($ext, $data[self::FIELD_LANGUAGE]))); + } } else { $this->setLanguage(new FHIRCode($data[self::FIELD_LANGUAGE])); } @@ -493,6 +513,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } + if (null !== ($v = $this->getId())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ID, null, $v->_getFHIRXMLNamespace())); } @@ -502,7 +523,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getLanguage())) { $v->xmlSerialize($sxe->addChild(self::FIELD_LANGUAGE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getMeta())) { $v->xmlSerialize($sxe->addChild(self::FIELD_META, null, $v->_getFHIRXMLNamespace())); } @@ -515,17 +535,41 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 public function jsonSerialize() { $a = []; + if ([] !== ($vs = $this->_getFHIRComments())) { + $a[self::FIELD_FHIR_COMMENTS] = $vs; + } if (null !== ($v = $this->getId())) { - $a[self::FIELD_ID] = $v->getValue(); - $a[self::FIELD_ID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ID_EXT] = $enc; + } + } else { + $a[self::FIELD_ID] = $v; + } } if (null !== ($v = $this->getImplicitRules())) { - $a[self::FIELD_IMPLICIT_RULES] = $v->getValue(); - $a[self::FIELD_IMPLICIT_RULES_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IMPLICIT_RULES] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IMPLICIT_RULES_EXT] = $enc; + } + } else { + $a[self::FIELD_IMPLICIT_RULES] = $v; + } } if (null !== ($v = $this->getLanguage())) { - $a[self::FIELD_LANGUAGE] = $v->getValue(); - $a[self::FIELD_LANGUAGE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_LANGUAGE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_LANGUAGE_EXT] = $enc; + } + } else { + $a[self::FIELD_LANGUAGE] = $v; + } } if (null !== ($v = $this->getMeta())) { $a[self::FIELD_META] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRBinary.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRBinary.php index 70fc8ada9b..de7c1b9604 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRBinary.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRBinary.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -83,10 +83,6 @@ class FHIRBinary extends FHIRResource implements PHPFHIRContainedTypeInterface { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_BINARY; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CONTENT_TYPE = 'contentType'; const FIELD_CONTENT_TYPE_EXT = '_contentType'; const FIELD_DATA = 'data'; @@ -135,6 +131,9 @@ class FHIRBinary extends FHIRResource implements PHPFHIRContainedTypeInterface */ protected $securityContext = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRBinary Constructor * @param null|array $data @@ -157,8 +156,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CONTENT_TYPE] instanceof FHIRCode) { $this->setContentType($data[self::FIELD_CONTENT_TYPE]); - } elseif ($ext && is_scalar($data[self::FIELD_CONTENT_TYPE])) { - $this->setContentType(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_CONTENT_TYPE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CONTENT_TYPE])) { + $this->setContentType(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_CONTENT_TYPE]] + $ext)); + } else if (is_array($data[self::FIELD_CONTENT_TYPE])) { + $this->setContentType(new FHIRCode(array_merge($ext, $data[self::FIELD_CONTENT_TYPE]))); + } } else { $this->setContentType(new FHIRCode($data[self::FIELD_CONTENT_TYPE])); } @@ -169,8 +172,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATA] instanceof FHIRBase64Binary) { $this->setData($data[self::FIELD_DATA]); - } elseif ($ext && is_scalar($data[self::FIELD_DATA])) { - $this->setData(new FHIRBase64Binary([FHIRBase64Binary::FIELD_VALUE => $data[self::FIELD_DATA]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATA])) { + $this->setData(new FHIRBase64Binary([FHIRBase64Binary::FIELD_VALUE => $data[self::FIELD_DATA]] + $ext)); + } else if (is_array($data[self::FIELD_DATA])) { + $this->setData(new FHIRBase64Binary(array_merge($ext, $data[self::FIELD_DATA]))); + } } else { $this->setData(new FHIRBase64Binary($data[self::FIELD_DATA])); } @@ -436,7 +443,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getData())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DATA, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSecurityContext())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SECURITY_CONTEXT, null, $v->_getFHIRXMLNamespace())); } @@ -450,12 +456,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getContentType())) { - $a[self::FIELD_CONTENT_TYPE] = $v->getValue(); - $a[self::FIELD_CONTENT_TYPE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CONTENT_TYPE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CONTENT_TYPE_EXT] = $enc; + } + } else { + $a[self::FIELD_CONTENT_TYPE] = $v; + } } if (null !== ($v = $this->getData())) { - $a[self::FIELD_DATA] = $v->getValue(); - $a[self::FIELD_DATA_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATA] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATA_EXT] = $enc; + } + } else { + $a[self::FIELD_DATA] = $v; + } } if (null !== ($v = $this->getSecurityContext())) { $a[self::FIELD_SECURITY_CONTEXT] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRBundle.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRBundle.php index 90d34d2efe..a3fbad7777 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRBundle.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRBundle.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -85,10 +85,6 @@ class FHIRBundle extends FHIRResource implements PHPFHIRContainedTypeInterface { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_BUNDLE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ENTRY = 'entry'; const FIELD_IDENTIFIER = 'identifier'; const FIELD_IDENTIFIER_EXT = '_identifier'; @@ -187,6 +183,9 @@ class FHIRBundle extends FHIRResource implements PHPFHIRContainedTypeInterface */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRBundle Constructor * @param null|array $data @@ -206,6 +205,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ENTRY])) { if (is_array($data[self::FIELD_ENTRY])) { foreach($data[self::FIELD_ENTRY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRBundleEntry) { $this->addEntry($v); } else { @@ -224,8 +226,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->setIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { - $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_IDENTIFIER]))); + } } else { $this->setIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); } @@ -233,6 +239,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_LINK])) { if (is_array($data[self::FIELD_LINK])) { foreach($data[self::FIELD_LINK] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRBundleLink) { $this->addLink($v); } else { @@ -258,8 +267,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TIMESTAMP] instanceof FHIRInstant) { $this->setTimestamp($data[self::FIELD_TIMESTAMP]); - } elseif ($ext && is_scalar($data[self::FIELD_TIMESTAMP])) { - $this->setTimestamp(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_TIMESTAMP]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TIMESTAMP])) { + $this->setTimestamp(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_TIMESTAMP]] + $ext)); + } else if (is_array($data[self::FIELD_TIMESTAMP])) { + $this->setTimestamp(new FHIRInstant(array_merge($ext, $data[self::FIELD_TIMESTAMP]))); + } } else { $this->setTimestamp(new FHIRInstant($data[self::FIELD_TIMESTAMP])); } @@ -270,8 +283,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TOTAL] instanceof FHIRUnsignedInt) { $this->setTotal($data[self::FIELD_TOTAL]); - } elseif ($ext && is_scalar($data[self::FIELD_TOTAL])) { - $this->setTotal(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_TOTAL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TOTAL])) { + $this->setTotal(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_TOTAL]] + $ext)); + } else if (is_array($data[self::FIELD_TOTAL])) { + $this->setTotal(new FHIRUnsignedInt(array_merge($ext, $data[self::FIELD_TOTAL]))); + } } else { $this->setTotal(new FHIRUnsignedInt($data[self::FIELD_TOTAL])); } @@ -282,8 +299,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TYPE] instanceof FHIRBundleType) { $this->setType($data[self::FIELD_TYPE]); - } elseif ($ext && is_scalar($data[self::FIELD_TYPE])) { - $this->setType(new FHIRBundleType([FHIRBundleType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TYPE])) { + $this->setType(new FHIRBundleType([FHIRBundleType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } else if (is_array($data[self::FIELD_TYPE])) { + $this->setType(new FHIRBundleType(array_merge($ext, $data[self::FIELD_TYPE]))); + } } else { $this->setType(new FHIRBundleType($data[self::FIELD_TYPE])); } @@ -721,7 +742,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getEntry())) { foreach($vs as $v) { if (null === $v) { @@ -734,7 +754,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getLink())) { foreach($vs as $v) { if (null === $v) { @@ -753,7 +772,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getTotal())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TOTAL, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -770,7 +788,15 @@ public function jsonSerialize() $a[self::FIELD_ENTRY] = $vs; } if (null !== ($v = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_IDENTIFIER] = $v; + } } if ([] !== ($vs = $this->getLink())) { $a[self::FIELD_LINK] = $vs; @@ -779,15 +805,37 @@ public function jsonSerialize() $a[self::FIELD_SIGNATURE] = $v; } if (null !== ($v = $this->getTimestamp())) { - $a[self::FIELD_TIMESTAMP] = $v->getValue(); - $a[self::FIELD_TIMESTAMP_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TIMESTAMP] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TIMESTAMP_EXT] = $enc; + } + } else { + $a[self::FIELD_TIMESTAMP] = $v; + } } if (null !== ($v = $this->getTotal())) { - $a[self::FIELD_TOTAL] = $v->getValue(); - $a[self::FIELD_TOTAL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TOTAL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TOTAL_EXT] = $enc; + } + } else { + $a[self::FIELD_TOTAL] = $v; + } } if (null !== ($v = $this->getType())) { - $a[self::FIELD_TYPE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TYPE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TYPE_EXT] = $enc; + } + } else { + $a[self::FIELD_TYPE] = $v; + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource.php index c34bedb42a..63642c679d 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRDomainResource extends FHIRResource { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DOMAIN_RESOURCE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CONTAINED = 'contained'; const FIELD_EXTENSION = 'extension'; const FIELD_MODIFIER_EXTENSION = 'modifierExtension'; @@ -154,6 +150,9 @@ class FHIRDomainResource extends FHIRResource */ protected $text = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRDomainResource Constructor * @param null|array $data @@ -191,6 +190,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_EXTENSION])) { if (is_array($data[self::FIELD_EXTENSION])) { foreach($data[self::FIELD_EXTENSION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRExtension) { $this->addExtension($v); } else { @@ -206,6 +208,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_MODIFIER_EXTENSION])) { if (is_array($data[self::FIELD_MODIFIER_EXTENSION])) { foreach($data[self::FIELD_MODIFIER_EXTENSION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRExtension) { $this->addModifierExtension($v); } else { @@ -624,7 +629,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getContained())) { foreach($vs as $v) { if (null === $v) { diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRAccount.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRAccount.php index 8cb14b4589..58c1c5d8bf 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRAccount.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRAccount.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -87,10 +87,6 @@ class FHIRAccount extends FHIRDomainResource implements PHPFHIRContainedTypeInte { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ACCOUNT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_COVERAGE = 'coverage'; const FIELD_DESCRIPTION = 'description'; const FIELD_DESCRIPTION_EXT = '_description'; @@ -234,6 +230,9 @@ class FHIRAccount extends FHIRDomainResource implements PHPFHIRContainedTypeInte */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRAccount Constructor * @param null|array $data @@ -253,6 +252,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_COVERAGE])) { if (is_array($data[self::FIELD_COVERAGE])) { foreach($data[self::FIELD_COVERAGE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRAccountCoverage) { $this->addCoverage($v); } else { @@ -271,8 +273,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -280,6 +286,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_GUARANTOR])) { if (is_array($data[self::FIELD_GUARANTOR])) { foreach($data[self::FIELD_GUARANTOR] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRAccountGuarantor) { $this->addGuarantor($v); } else { @@ -298,17 +307,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -320,8 +336,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -353,8 +373,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRAccountStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRAccountStatus([FHIRAccountStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRAccountStatus([FHIRAccountStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRAccountStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRAccountStatus($data[self::FIELD_STATUS])); } @@ -362,6 +386,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SUBJECT])) { if (is_array($data[self::FIELD_SUBJECT])) { foreach($data[self::FIELD_SUBJECT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addSubject($v); } else { @@ -1003,7 +1030,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getCoverage())) { foreach($vs as $v) { if (null === $v) { @@ -1012,10 +1038,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_COVERAGE, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getDescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESCRIPTION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getGuarantor())) { foreach($vs as $v) { if (null === $v) { @@ -1033,26 +1059,22 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NAME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOwner())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OWNER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPartOf())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PART_OF, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getServicePeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SERVICE_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getSubject())) { foreach($vs as $v) { if (null === $v) { @@ -1078,18 +1100,48 @@ public function jsonSerialize() $a[self::FIELD_COVERAGE] = $vs; } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if ([] !== ($vs = $this->getGuarantor())) { $a[self::FIELD_GUARANTOR] = $vs; } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if (null !== ($v = $this->getOwner())) { $a[self::FIELD_OWNER] = $v; @@ -1101,7 +1153,15 @@ public function jsonSerialize() $a[self::FIELD_SERVICE_PERIOD] = $v; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if ([] !== ($vs = $this->getSubject())) { $a[self::FIELD_SUBJECT] = $vs; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRActivityDefinition.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRActivityDefinition.php index 094a1b6fcc..42daa2f08e 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRActivityDefinition.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRActivityDefinition.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -105,10 +105,6 @@ class FHIRActivityDefinition extends FHIRDomainResource implements PHPFHIRContai { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ACTIVITY_DEFINITION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_APPROVAL_DATE = 'approvalDate'; const FIELD_APPROVAL_DATE_EXT = '_approvalDate'; const FIELD_AUTHOR = 'author'; @@ -169,9 +165,11 @@ class FHIRActivityDefinition extends FHIRDomainResource implements PHPFHIRContai const FIELD_SUBTITLE = 'subtitle'; const FIELD_SUBTITLE_EXT = '_subtitle'; const FIELD_TIMING_AGE = 'timingAge'; + const FIELD_TIMING_AGE_EXT = '_timingAge'; const FIELD_TIMING_DATE_TIME = 'timingDateTime'; const FIELD_TIMING_DATE_TIME_EXT = '_timingDateTime'; const FIELD_TIMING_DURATION = 'timingDuration'; + const FIELD_TIMING_DURATION_EXT = '_timingDuration'; const FIELD_TIMING_PERIOD = 'timingPeriod'; const FIELD_TIMING_RANGE = 'timingRange'; const FIELD_TIMING_TIMING = 'timingTiming'; @@ -882,6 +880,9 @@ class FHIRActivityDefinition extends FHIRDomainResource implements PHPFHIRContai */ protected $version = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRActivityDefinition Constructor * @param null|array $data @@ -904,8 +905,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_APPROVAL_DATE] instanceof FHIRDate) { $this->setApprovalDate($data[self::FIELD_APPROVAL_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_APPROVAL_DATE])) { - $this->setApprovalDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_APPROVAL_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_APPROVAL_DATE])) { + $this->setApprovalDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_APPROVAL_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_APPROVAL_DATE])) { + $this->setApprovalDate(new FHIRDate(array_merge($ext, $data[self::FIELD_APPROVAL_DATE]))); + } } else { $this->setApprovalDate(new FHIRDate($data[self::FIELD_APPROVAL_DATE])); } @@ -913,6 +918,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_AUTHOR])) { if (is_array($data[self::FIELD_AUTHOR])) { foreach($data[self::FIELD_AUTHOR] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContactDetail) { $this->addAuthor($v); } else { @@ -928,6 +936,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_BODY_SITE])) { if (is_array($data[self::FIELD_BODY_SITE])) { foreach($data[self::FIELD_BODY_SITE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addBodySite($v); } else { @@ -950,6 +961,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CONTACT])) { if (is_array($data[self::FIELD_CONTACT])) { foreach($data[self::FIELD_CONTACT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContactDetail) { $this->addContact($v); } else { @@ -968,8 +982,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_COPYRIGHT] instanceof FHIRMarkdown) { $this->setCopyright($data[self::FIELD_COPYRIGHT]); - } elseif ($ext && is_scalar($data[self::FIELD_COPYRIGHT])) { - $this->setCopyright(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_COPYRIGHT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_COPYRIGHT])) { + $this->setCopyright(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_COPYRIGHT]] + $ext)); + } else if (is_array($data[self::FIELD_COPYRIGHT])) { + $this->setCopyright(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_COPYRIGHT]))); + } } else { $this->setCopyright(new FHIRMarkdown($data[self::FIELD_COPYRIGHT])); } @@ -980,8 +998,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATE] instanceof FHIRDateTime) { $this->setDate($data[self::FIELD_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_DATE])) { - $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime(array_merge($ext, $data[self::FIELD_DATE]))); + } } else { $this->setDate(new FHIRDateTime($data[self::FIELD_DATE])); } @@ -992,8 +1014,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRMarkdown) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRMarkdown($data[self::FIELD_DESCRIPTION])); } @@ -1004,8 +1030,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DO_NOT_PERFORM] instanceof FHIRBoolean) { $this->setDoNotPerform($data[self::FIELD_DO_NOT_PERFORM]); - } elseif ($ext && is_scalar($data[self::FIELD_DO_NOT_PERFORM])) { - $this->setDoNotPerform(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_DO_NOT_PERFORM]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DO_NOT_PERFORM])) { + $this->setDoNotPerform(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_DO_NOT_PERFORM]] + $ext)); + } else if (is_array($data[self::FIELD_DO_NOT_PERFORM])) { + $this->setDoNotPerform(new FHIRBoolean(array_merge($ext, $data[self::FIELD_DO_NOT_PERFORM]))); + } } else { $this->setDoNotPerform(new FHIRBoolean($data[self::FIELD_DO_NOT_PERFORM])); } @@ -1013,6 +1043,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_DOSAGE])) { if (is_array($data[self::FIELD_DOSAGE])) { foreach($data[self::FIELD_DOSAGE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRDosage) { $this->addDosage($v); } else { @@ -1028,6 +1061,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_DYNAMIC_VALUE])) { if (is_array($data[self::FIELD_DYNAMIC_VALUE])) { foreach($data[self::FIELD_DYNAMIC_VALUE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRActivityDefinitionDynamicValue) { $this->addDynamicValue($v); } else { @@ -1043,6 +1079,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_EDITOR])) { if (is_array($data[self::FIELD_EDITOR])) { foreach($data[self::FIELD_EDITOR] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContactDetail) { $this->addEditor($v); } else { @@ -1065,6 +1104,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ENDORSER])) { if (is_array($data[self::FIELD_ENDORSER])) { foreach($data[self::FIELD_ENDORSER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContactDetail) { $this->addEndorser($v); } else { @@ -1083,8 +1125,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EXPERIMENTAL] instanceof FHIRBoolean) { $this->setExperimental($data[self::FIELD_EXPERIMENTAL]); - } elseif ($ext && is_scalar($data[self::FIELD_EXPERIMENTAL])) { - $this->setExperimental(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_EXPERIMENTAL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EXPERIMENTAL])) { + $this->setExperimental(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_EXPERIMENTAL]] + $ext)); + } else if (is_array($data[self::FIELD_EXPERIMENTAL])) { + $this->setExperimental(new FHIRBoolean(array_merge($ext, $data[self::FIELD_EXPERIMENTAL]))); + } } else { $this->setExperimental(new FHIRBoolean($data[self::FIELD_EXPERIMENTAL])); } @@ -1095,17 +1141,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -1117,8 +1170,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_INTENT] instanceof FHIRRequestIntent) { $this->setIntent($data[self::FIELD_INTENT]); - } elseif ($ext && is_scalar($data[self::FIELD_INTENT])) { - $this->setIntent(new FHIRRequestIntent([FHIRRequestIntent::FIELD_VALUE => $data[self::FIELD_INTENT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_INTENT])) { + $this->setIntent(new FHIRRequestIntent([FHIRRequestIntent::FIELD_VALUE => $data[self::FIELD_INTENT]] + $ext)); + } else if (is_array($data[self::FIELD_INTENT])) { + $this->setIntent(new FHIRRequestIntent(array_merge($ext, $data[self::FIELD_INTENT]))); + } } else { $this->setIntent(new FHIRRequestIntent($data[self::FIELD_INTENT])); } @@ -1126,6 +1183,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_JURISDICTION])) { if (is_array($data[self::FIELD_JURISDICTION])) { foreach($data[self::FIELD_JURISDICTION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addJurisdiction($v); } else { @@ -1144,8 +1204,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_KIND] instanceof FHIRRequestResourceType) { $this->setKind($data[self::FIELD_KIND]); - } elseif ($ext && is_scalar($data[self::FIELD_KIND])) { - $this->setKind(new FHIRRequestResourceType([FHIRRequestResourceType::FIELD_VALUE => $data[self::FIELD_KIND]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_KIND])) { + $this->setKind(new FHIRRequestResourceType([FHIRRequestResourceType::FIELD_VALUE => $data[self::FIELD_KIND]] + $ext)); + } else if (is_array($data[self::FIELD_KIND])) { + $this->setKind(new FHIRRequestResourceType(array_merge($ext, $data[self::FIELD_KIND]))); + } } else { $this->setKind(new FHIRRequestResourceType($data[self::FIELD_KIND])); } @@ -1156,8 +1220,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_LAST_REVIEW_DATE] instanceof FHIRDate) { $this->setLastReviewDate($data[self::FIELD_LAST_REVIEW_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_LAST_REVIEW_DATE])) { - $this->setLastReviewDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_LAST_REVIEW_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_LAST_REVIEW_DATE])) { + $this->setLastReviewDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_LAST_REVIEW_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_LAST_REVIEW_DATE])) { + $this->setLastReviewDate(new FHIRDate(array_merge($ext, $data[self::FIELD_LAST_REVIEW_DATE]))); + } } else { $this->setLastReviewDate(new FHIRDate($data[self::FIELD_LAST_REVIEW_DATE])); } @@ -1168,17 +1236,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_LIBRARY])) { foreach($data[self::FIELD_LIBRARY] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCanonical) { $this->addLibrary($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addLibrary(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addLibrary(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addLibrary(new FHIRCanonical(array_merge($v, $ext[$i]))); + } } else { $this->addLibrary(new FHIRCanonical($v)); } } } elseif ($data[self::FIELD_LIBRARY] instanceof FHIRCanonical) { $this->addLibrary($data[self::FIELD_LIBRARY]); - } elseif ($ext && is_scalar($data[self::FIELD_LIBRARY])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_LIBRARY])) { $this->addLibrary(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $data[self::FIELD_LIBRARY]] + $ext)); } else { $this->addLibrary(new FHIRCanonical($data[self::FIELD_LIBRARY])); @@ -1197,8 +1272,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -1206,6 +1285,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_OBSERVATION_REQUIREMENT])) { if (is_array($data[self::FIELD_OBSERVATION_REQUIREMENT])) { foreach($data[self::FIELD_OBSERVATION_REQUIREMENT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addObservationRequirement($v); } else { @@ -1221,6 +1303,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_OBSERVATION_RESULT_REQUIREMENT])) { if (is_array($data[self::FIELD_OBSERVATION_RESULT_REQUIREMENT])) { foreach($data[self::FIELD_OBSERVATION_RESULT_REQUIREMENT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addObservationResultRequirement($v); } else { @@ -1236,6 +1321,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PARTICIPANT])) { if (is_array($data[self::FIELD_PARTICIPANT])) { foreach($data[self::FIELD_PARTICIPANT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRActivityDefinitionParticipant) { $this->addParticipant($v); } else { @@ -1254,8 +1342,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PRIORITY] instanceof FHIRRequestPriority) { $this->setPriority($data[self::FIELD_PRIORITY]); - } elseif ($ext && is_scalar($data[self::FIELD_PRIORITY])) { - $this->setPriority(new FHIRRequestPriority([FHIRRequestPriority::FIELD_VALUE => $data[self::FIELD_PRIORITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PRIORITY])) { + $this->setPriority(new FHIRRequestPriority([FHIRRequestPriority::FIELD_VALUE => $data[self::FIELD_PRIORITY]] + $ext)); + } else if (is_array($data[self::FIELD_PRIORITY])) { + $this->setPriority(new FHIRRequestPriority(array_merge($ext, $data[self::FIELD_PRIORITY]))); + } } else { $this->setPriority(new FHIRRequestPriority($data[self::FIELD_PRIORITY])); } @@ -1280,8 +1372,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PROFILE] instanceof FHIRCanonical) { $this->setProfile($data[self::FIELD_PROFILE]); - } elseif ($ext && is_scalar($data[self::FIELD_PROFILE])) { - $this->setProfile(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $data[self::FIELD_PROFILE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PROFILE])) { + $this->setProfile(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $data[self::FIELD_PROFILE]] + $ext)); + } else if (is_array($data[self::FIELD_PROFILE])) { + $this->setProfile(new FHIRCanonical(array_merge($ext, $data[self::FIELD_PROFILE]))); + } } else { $this->setProfile(new FHIRCanonical($data[self::FIELD_PROFILE])); } @@ -1292,8 +1388,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PUBLISHER] instanceof FHIRString) { $this->setPublisher($data[self::FIELD_PUBLISHER]); - } elseif ($ext && is_scalar($data[self::FIELD_PUBLISHER])) { - $this->setPublisher(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PUBLISHER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PUBLISHER])) { + $this->setPublisher(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PUBLISHER]] + $ext)); + } else if (is_array($data[self::FIELD_PUBLISHER])) { + $this->setPublisher(new FHIRString(array_merge($ext, $data[self::FIELD_PUBLISHER]))); + } } else { $this->setPublisher(new FHIRString($data[self::FIELD_PUBLISHER])); } @@ -1304,8 +1404,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PURPOSE] instanceof FHIRMarkdown) { $this->setPurpose($data[self::FIELD_PURPOSE]); - } elseif ($ext && is_scalar($data[self::FIELD_PURPOSE])) { - $this->setPurpose(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_PURPOSE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PURPOSE])) { + $this->setPurpose(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_PURPOSE]] + $ext)); + } else if (is_array($data[self::FIELD_PURPOSE])) { + $this->setPurpose(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_PURPOSE]))); + } } else { $this->setPurpose(new FHIRMarkdown($data[self::FIELD_PURPOSE])); } @@ -1316,8 +1420,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_QUANTITY] instanceof FHIRQuantity) { $this->setQuantity($data[self::FIELD_QUANTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_QUANTITY])) { - $this->setQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_QUANTITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_QUANTITY])) { + $this->setQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_QUANTITY])) { + $this->setQuantity(new FHIRQuantity(array_merge($ext, $data[self::FIELD_QUANTITY]))); + } } else { $this->setQuantity(new FHIRQuantity($data[self::FIELD_QUANTITY])); } @@ -1325,6 +1433,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_RELATED_ARTIFACT])) { if (is_array($data[self::FIELD_RELATED_ARTIFACT])) { foreach($data[self::FIELD_RELATED_ARTIFACT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRRelatedArtifact) { $this->addRelatedArtifact($v); } else { @@ -1340,6 +1451,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REVIEWER])) { if (is_array($data[self::FIELD_REVIEWER])) { foreach($data[self::FIELD_REVIEWER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContactDetail) { $this->addReviewer($v); } else { @@ -1355,6 +1469,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SPECIMEN_REQUIREMENT])) { if (is_array($data[self::FIELD_SPECIMEN_REQUIREMENT])) { foreach($data[self::FIELD_SPECIMEN_REQUIREMENT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addSpecimenRequirement($v); } else { @@ -1373,8 +1490,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRPublicationStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRPublicationStatus([FHIRPublicationStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRPublicationStatus([FHIRPublicationStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRPublicationStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRPublicationStatus($data[self::FIELD_STATUS])); } @@ -1399,15 +1520,28 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SUBTITLE] instanceof FHIRString) { $this->setSubtitle($data[self::FIELD_SUBTITLE]); - } elseif ($ext && is_scalar($data[self::FIELD_SUBTITLE])) { - $this->setSubtitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SUBTITLE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SUBTITLE])) { + $this->setSubtitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SUBTITLE]] + $ext)); + } else if (is_array($data[self::FIELD_SUBTITLE])) { + $this->setSubtitle(new FHIRString(array_merge($ext, $data[self::FIELD_SUBTITLE]))); + } } else { $this->setSubtitle(new FHIRString($data[self::FIELD_SUBTITLE])); } } if (isset($data[self::FIELD_TIMING_AGE])) { + $ext = (isset($data[self::FIELD_TIMING_AGE_EXT]) && is_array($data[self::FIELD_TIMING_AGE_EXT])) + ? $data[self::FIELD_TIMING_AGE_EXT] + : null; if ($data[self::FIELD_TIMING_AGE] instanceof FHIRAge) { $this->setTimingAge($data[self::FIELD_TIMING_AGE]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TIMING_AGE])) { + $this->setTimingAge(new FHIRAge([FHIRAge::FIELD_VALUE => $data[self::FIELD_TIMING_AGE]] + $ext)); + } else if (is_array($data[self::FIELD_TIMING_AGE])) { + $this->setTimingAge(new FHIRAge(array_merge($ext, $data[self::FIELD_TIMING_AGE]))); + } } else { $this->setTimingAge(new FHIRAge($data[self::FIELD_TIMING_AGE])); } @@ -1418,15 +1552,28 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TIMING_DATE_TIME] instanceof FHIRDateTime) { $this->setTimingDateTime($data[self::FIELD_TIMING_DATE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_TIMING_DATE_TIME])) { - $this->setTimingDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_TIMING_DATE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TIMING_DATE_TIME])) { + $this->setTimingDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_TIMING_DATE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_TIMING_DATE_TIME])) { + $this->setTimingDateTime(new FHIRDateTime(array_merge($ext, $data[self::FIELD_TIMING_DATE_TIME]))); + } } else { $this->setTimingDateTime(new FHIRDateTime($data[self::FIELD_TIMING_DATE_TIME])); } } if (isset($data[self::FIELD_TIMING_DURATION])) { + $ext = (isset($data[self::FIELD_TIMING_DURATION_EXT]) && is_array($data[self::FIELD_TIMING_DURATION_EXT])) + ? $data[self::FIELD_TIMING_DURATION_EXT] + : null; if ($data[self::FIELD_TIMING_DURATION] instanceof FHIRDuration) { $this->setTimingDuration($data[self::FIELD_TIMING_DURATION]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TIMING_DURATION])) { + $this->setTimingDuration(new FHIRDuration([FHIRDuration::FIELD_VALUE => $data[self::FIELD_TIMING_DURATION]] + $ext)); + } else if (is_array($data[self::FIELD_TIMING_DURATION])) { + $this->setTimingDuration(new FHIRDuration(array_merge($ext, $data[self::FIELD_TIMING_DURATION]))); + } } else { $this->setTimingDuration(new FHIRDuration($data[self::FIELD_TIMING_DURATION])); } @@ -1458,8 +1605,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TITLE] instanceof FHIRString) { $this->setTitle($data[self::FIELD_TITLE]); - } elseif ($ext && is_scalar($data[self::FIELD_TITLE])) { - $this->setTitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TITLE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TITLE])) { + $this->setTitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TITLE]] + $ext)); + } else if (is_array($data[self::FIELD_TITLE])) { + $this->setTitle(new FHIRString(array_merge($ext, $data[self::FIELD_TITLE]))); + } } else { $this->setTitle(new FHIRString($data[self::FIELD_TITLE])); } @@ -1467,6 +1618,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_TOPIC])) { if (is_array($data[self::FIELD_TOPIC])) { foreach($data[self::FIELD_TOPIC] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addTopic($v); } else { @@ -1485,8 +1639,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TRANSFORM] instanceof FHIRCanonical) { $this->setTransform($data[self::FIELD_TRANSFORM]); - } elseif ($ext && is_scalar($data[self::FIELD_TRANSFORM])) { - $this->setTransform(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $data[self::FIELD_TRANSFORM]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TRANSFORM])) { + $this->setTransform(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $data[self::FIELD_TRANSFORM]] + $ext)); + } else if (is_array($data[self::FIELD_TRANSFORM])) { + $this->setTransform(new FHIRCanonical(array_merge($ext, $data[self::FIELD_TRANSFORM]))); + } } else { $this->setTransform(new FHIRCanonical($data[self::FIELD_TRANSFORM])); } @@ -1497,8 +1655,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_URL] instanceof FHIRUri) { $this->setUrl($data[self::FIELD_URL]); - } elseif ($ext && is_scalar($data[self::FIELD_URL])) { - $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } else if (is_array($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri(array_merge($ext, $data[self::FIELD_URL]))); + } } else { $this->setUrl(new FHIRUri($data[self::FIELD_URL])); } @@ -1509,8 +1671,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_USAGE] instanceof FHIRString) { $this->setUsage($data[self::FIELD_USAGE]); - } elseif ($ext && is_scalar($data[self::FIELD_USAGE])) { - $this->setUsage(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_USAGE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_USAGE])) { + $this->setUsage(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_USAGE]] + $ext)); + } else if (is_array($data[self::FIELD_USAGE])) { + $this->setUsage(new FHIRString(array_merge($ext, $data[self::FIELD_USAGE]))); + } } else { $this->setUsage(new FHIRString($data[self::FIELD_USAGE])); } @@ -1518,6 +1684,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_USE_CONTEXT])) { if (is_array($data[self::FIELD_USE_CONTEXT])) { foreach($data[self::FIELD_USE_CONTEXT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRUsageContext) { $this->addUseContext($v); } else { @@ -1536,8 +1705,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VERSION] instanceof FHIRString) { $this->setVersion($data[self::FIELD_VERSION]); - } elseif ($ext && is_scalar($data[self::FIELD_VERSION])) { - $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } else if (is_array($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString(array_merge($ext, $data[self::FIELD_VERSION]))); + } } else { $this->setVersion(new FHIRString($data[self::FIELD_VERSION])); } @@ -4369,7 +4542,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getApprovalDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_APPROVAL_DATE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getAuthor())) { foreach($vs as $v) { if (null === $v) { @@ -4391,7 +4563,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getContact())) { foreach($vs as $v) { if (null === $v) { @@ -4400,6 +4571,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_CONTACT, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getCopyright())) { $v->xmlSerialize($sxe->addChild(self::FIELD_COPYRIGHT, null, $v->_getFHIRXMLNamespace())); } @@ -4412,7 +4584,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDoNotPerform())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DO_NOT_PERFORM, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getDosage())) { foreach($vs as $v) { if (null === $v) { @@ -4443,7 +4614,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getEffectivePeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EFFECTIVE_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getEndorser())) { foreach($vs as $v) { if (null === $v) { @@ -4452,10 +4622,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_ENDORSER, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getExperimental())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EXPERIMENTAL, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -4468,7 +4638,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getIntent())) { $v->xmlSerialize($sxe->addChild(self::FIELD_INTENT, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getJurisdiction())) { foreach($vs as $v) { if (null === $v) { @@ -4499,7 +4668,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NAME, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getObservationRequirement())) { foreach($vs as $v) { if (null === $v) { @@ -4530,11 +4698,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getPriority())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PRIORITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getProductCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PRODUCT_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getProductReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PRODUCT_REFERENCE, null, $v->_getFHIRXMLNamespace())); } @@ -4547,11 +4713,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getPurpose())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PURPOSE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_QUANTITY, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getRelatedArtifact())) { foreach($vs as $v) { if (null === $v) { @@ -4582,44 +4746,36 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSubjectCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBJECT_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSubjectReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBJECT_REFERENCE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getSubtitle())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBTITLE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getTimingAge())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TIMING_AGE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getTimingDateTime())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TIMING_DATE_TIME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getTimingDuration())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TIMING_DURATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getTimingPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TIMING_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getTimingRange())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TIMING_RANGE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getTimingTiming())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TIMING_TIMING, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getTitle())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TITLE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getTopic())) { foreach($vs as $v) { if (null === $v) { @@ -4628,6 +4784,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_TOPIC, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getTransform())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TRANSFORM, null, $v->_getFHIRXMLNamespace())); } @@ -4637,7 +4794,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getUsage())) { $v->xmlSerialize($sxe->addChild(self::FIELD_USAGE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getUseContext())) { foreach($vs as $v) { if (null === $v) { @@ -4646,6 +4802,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_USE_CONTEXT, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getVersion())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VERSION, null, $v->_getFHIRXMLNamespace())); } @@ -4659,8 +4816,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getApprovalDate())) { - $a[self::FIELD_APPROVAL_DATE] = $v->getValue(); - $a[self::FIELD_APPROVAL_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_APPROVAL_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_APPROVAL_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_APPROVAL_DATE] = $v; + } } if ([] !== ($vs = $this->getAuthor())) { $a[self::FIELD_AUTHOR] = $vs; @@ -4675,20 +4839,48 @@ public function jsonSerialize() $a[self::FIELD_CONTACT] = $vs; } if (null !== ($v = $this->getCopyright())) { - $a[self::FIELD_COPYRIGHT] = $v->getValue(); - $a[self::FIELD_COPYRIGHT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_COPYRIGHT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_COPYRIGHT_EXT] = $enc; + } + } else { + $a[self::FIELD_COPYRIGHT] = $v; + } } if (null !== ($v = $this->getDate())) { - $a[self::FIELD_DATE] = $v->getValue(); - $a[self::FIELD_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_DATE] = $v; + } } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if (null !== ($v = $this->getDoNotPerform())) { - $a[self::FIELD_DO_NOT_PERFORM] = $v->getValue(); - $a[self::FIELD_DO_NOT_PERFORM_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DO_NOT_PERFORM] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DO_NOT_PERFORM_EXT] = $enc; + } + } else { + $a[self::FIELD_DO_NOT_PERFORM] = $v; + } } if ([] !== ($vs = $this->getDosage())) { $a[self::FIELD_DOSAGE] = $vs; @@ -4706,24 +4898,70 @@ public function jsonSerialize() $a[self::FIELD_ENDORSER] = $vs; } if (null !== ($v = $this->getExperimental())) { - $a[self::FIELD_EXPERIMENTAL] = $v->getValue(); - $a[self::FIELD_EXPERIMENTAL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EXPERIMENTAL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EXPERIMENTAL_EXT] = $enc; + } + } else { + $a[self::FIELD_EXPERIMENTAL] = $v; + } } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if (null !== ($v = $this->getIntent())) { - $a[self::FIELD_INTENT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_INTENT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_INTENT_EXT] = $enc; + } + } else { + $a[self::FIELD_INTENT] = $v; + } } if ([] !== ($vs = $this->getJurisdiction())) { $a[self::FIELD_JURISDICTION] = $vs; } if (null !== ($v = $this->getKind())) { - $a[self::FIELD_KIND] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_KIND] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_KIND_EXT] = $enc; + } + } else { + $a[self::FIELD_KIND] = $v; + } } if (null !== ($v = $this->getLastReviewDate())) { - $a[self::FIELD_LAST_REVIEW_DATE] = $v->getValue(); - $a[self::FIELD_LAST_REVIEW_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_LAST_REVIEW_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_LAST_REVIEW_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_LAST_REVIEW_DATE] = $v; + } } if ([] !== ($vs = $this->getLibrary())) { $a[self::FIELD_LIBRARY] = []; @@ -4731,16 +4969,32 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_LIBRARY][] = $v->getValue(); - $a[self::FIELD_LIBRARY_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_LIBRARY][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_LIBRARY_EXT][] = $enc; + } else { + $a[self::FIELD_LIBRARY_EXT][] = null; + } + } else { + $a[self::FIELD_LIBRARY][] = $v; + } } } if (null !== ($v = $this->getLocation())) { $a[self::FIELD_LOCATION] = $v; } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if ([] !== ($vs = $this->getObservationRequirement())) { $a[self::FIELD_OBSERVATION_REQUIREMENT] = $vs; @@ -4752,7 +5006,15 @@ public function jsonSerialize() $a[self::FIELD_PARTICIPANT] = $vs; } if (null !== ($v = $this->getPriority())) { - $a[self::FIELD_PRIORITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PRIORITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PRIORITY_EXT] = $enc; + } + } else { + $a[self::FIELD_PRIORITY] = $v; + } } if (null !== ($v = $this->getProductCodeableConcept())) { $a[self::FIELD_PRODUCT_CODEABLE_CONCEPT] = $v; @@ -4761,19 +5023,48 @@ public function jsonSerialize() $a[self::FIELD_PRODUCT_REFERENCE] = $v; } if (null !== ($v = $this->getProfile())) { - $a[self::FIELD_PROFILE] = $v->getValue(); - $a[self::FIELD_PROFILE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PROFILE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PROFILE_EXT] = $enc; + } + } else { + $a[self::FIELD_PROFILE] = $v; + } } if (null !== ($v = $this->getPublisher())) { - $a[self::FIELD_PUBLISHER] = $v->getValue(); - $a[self::FIELD_PUBLISHER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PUBLISHER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PUBLISHER_EXT] = $enc; + } + } else { + $a[self::FIELD_PUBLISHER] = $v; + } } if (null !== ($v = $this->getPurpose())) { - $a[self::FIELD_PURPOSE] = $v->getValue(); - $a[self::FIELD_PURPOSE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PURPOSE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PURPOSE_EXT] = $enc; + } + } else { + $a[self::FIELD_PURPOSE] = $v; + } } if (null !== ($v = $this->getQuantity())) { - $a[self::FIELD_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_QUANTITY] = $v; + } } if ([] !== ($vs = $this->getRelatedArtifact())) { $a[self::FIELD_RELATED_ARTIFACT] = $vs; @@ -4785,7 +5076,15 @@ public function jsonSerialize() $a[self::FIELD_SPECIMEN_REQUIREMENT] = $vs; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getSubjectCodeableConcept())) { $a[self::FIELD_SUBJECT_CODEABLE_CONCEPT] = $v; @@ -4794,18 +5093,48 @@ public function jsonSerialize() $a[self::FIELD_SUBJECT_REFERENCE] = $v; } if (null !== ($v = $this->getSubtitle())) { - $a[self::FIELD_SUBTITLE] = $v->getValue(); - $a[self::FIELD_SUBTITLE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SUBTITLE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SUBTITLE_EXT] = $enc; + } + } else { + $a[self::FIELD_SUBTITLE] = $v; + } } if (null !== ($v = $this->getTimingAge())) { - $a[self::FIELD_TIMING_AGE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TIMING_AGE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TIMING_AGE_EXT] = $enc; + } + } else { + $a[self::FIELD_TIMING_AGE] = $v; + } } if (null !== ($v = $this->getTimingDateTime())) { - $a[self::FIELD_TIMING_DATE_TIME] = $v->getValue(); - $a[self::FIELD_TIMING_DATE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TIMING_DATE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TIMING_DATE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_TIMING_DATE_TIME] = $v; + } } if (null !== ($v = $this->getTimingDuration())) { - $a[self::FIELD_TIMING_DURATION] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TIMING_DURATION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TIMING_DURATION_EXT] = $enc; + } + } else { + $a[self::FIELD_TIMING_DURATION] = $v; + } } if (null !== ($v = $this->getTimingPeriod())) { $a[self::FIELD_TIMING_PERIOD] = $v; @@ -4817,30 +5146,65 @@ public function jsonSerialize() $a[self::FIELD_TIMING_TIMING] = $v; } if (null !== ($v = $this->getTitle())) { - $a[self::FIELD_TITLE] = $v->getValue(); - $a[self::FIELD_TITLE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TITLE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TITLE_EXT] = $enc; + } + } else { + $a[self::FIELD_TITLE] = $v; + } } if ([] !== ($vs = $this->getTopic())) { $a[self::FIELD_TOPIC] = $vs; } if (null !== ($v = $this->getTransform())) { - $a[self::FIELD_TRANSFORM] = $v->getValue(); - $a[self::FIELD_TRANSFORM_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TRANSFORM] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TRANSFORM_EXT] = $enc; + } + } else { + $a[self::FIELD_TRANSFORM] = $v; + } } if (null !== ($v = $this->getUrl())) { - $a[self::FIELD_URL] = $v->getValue(); - $a[self::FIELD_URL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_URL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_URL_EXT] = $enc; + } + } else { + $a[self::FIELD_URL] = $v; + } } if (null !== ($v = $this->getUsage())) { - $a[self::FIELD_USAGE] = $v->getValue(); - $a[self::FIELD_USAGE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_USAGE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_USAGE_EXT] = $enc; + } + } else { + $a[self::FIELD_USAGE] = $v; + } } if ([] !== ($vs = $this->getUseContext())) { $a[self::FIELD_USE_CONTEXT] = $vs; } if (null !== ($v = $this->getVersion())) { - $a[self::FIELD_VERSION] = $v->getValue(); - $a[self::FIELD_VERSION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VERSION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VERSION_EXT] = $enc; + } + } else { + $a[self::FIELD_VERSION] = $v; + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRAdverseEvent.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRAdverseEvent.php index 8f5c7c95f6..9d7a678677 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRAdverseEvent.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRAdverseEvent.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -87,10 +87,6 @@ class FHIRAdverseEvent extends FHIRDomainResource implements PHPFHIRContainedTyp { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ADVERSE_EVENT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ACTUALITY = 'actuality'; const FIELD_ACTUALITY_EXT = '_actuality'; const FIELD_CATEGORY = 'category'; @@ -366,6 +362,9 @@ class FHIRAdverseEvent extends FHIRDomainResource implements PHPFHIRContainedTyp */ protected $suspectEntity = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRAdverseEvent Constructor * @param null|array $data @@ -388,8 +387,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ACTUALITY] instanceof FHIRAdverseEventActuality) { $this->setActuality($data[self::FIELD_ACTUALITY]); - } elseif ($ext && is_scalar($data[self::FIELD_ACTUALITY])) { - $this->setActuality(new FHIRAdverseEventActuality([FHIRAdverseEventActuality::FIELD_VALUE => $data[self::FIELD_ACTUALITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ACTUALITY])) { + $this->setActuality(new FHIRAdverseEventActuality([FHIRAdverseEventActuality::FIELD_VALUE => $data[self::FIELD_ACTUALITY]] + $ext)); + } else if (is_array($data[self::FIELD_ACTUALITY])) { + $this->setActuality(new FHIRAdverseEventActuality(array_merge($ext, $data[self::FIELD_ACTUALITY]))); + } } else { $this->setActuality(new FHIRAdverseEventActuality($data[self::FIELD_ACTUALITY])); } @@ -397,6 +400,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CATEGORY])) { if (is_array($data[self::FIELD_CATEGORY])) { foreach($data[self::FIELD_CATEGORY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addCategory($v); } else { @@ -412,6 +418,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CONTRIBUTOR])) { if (is_array($data[self::FIELD_CONTRIBUTOR])) { foreach($data[self::FIELD_CONTRIBUTOR] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addContributor($v); } else { @@ -430,8 +439,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATE] instanceof FHIRDateTime) { $this->setDate($data[self::FIELD_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_DATE])) { - $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime(array_merge($ext, $data[self::FIELD_DATE]))); + } } else { $this->setDate(new FHIRDateTime($data[self::FIELD_DATE])); } @@ -442,8 +455,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DETECTED] instanceof FHIRDateTime) { $this->setDetected($data[self::FIELD_DETECTED]); - } elseif ($ext && is_scalar($data[self::FIELD_DETECTED])) { - $this->setDetected(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DETECTED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DETECTED])) { + $this->setDetected(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DETECTED]] + $ext)); + } else if (is_array($data[self::FIELD_DETECTED])) { + $this->setDetected(new FHIRDateTime(array_merge($ext, $data[self::FIELD_DETECTED]))); + } } else { $this->setDetected(new FHIRDateTime($data[self::FIELD_DETECTED])); } @@ -468,8 +485,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->setIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { - $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_IDENTIFIER]))); + } } else { $this->setIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); } @@ -494,8 +515,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_RECORDED_DATE] instanceof FHIRDateTime) { $this->setRecordedDate($data[self::FIELD_RECORDED_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_RECORDED_DATE])) { - $this->setRecordedDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_RECORDED_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_RECORDED_DATE])) { + $this->setRecordedDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_RECORDED_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_RECORDED_DATE])) { + $this->setRecordedDate(new FHIRDateTime(array_merge($ext, $data[self::FIELD_RECORDED_DATE]))); + } } else { $this->setRecordedDate(new FHIRDateTime($data[self::FIELD_RECORDED_DATE])); } @@ -510,6 +535,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REFERENCE_DOCUMENT])) { if (is_array($data[self::FIELD_REFERENCE_DOCUMENT])) { foreach($data[self::FIELD_REFERENCE_DOCUMENT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addReferenceDocument($v); } else { @@ -525,6 +553,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_RESULTING_CONDITION])) { if (is_array($data[self::FIELD_RESULTING_CONDITION])) { foreach($data[self::FIELD_RESULTING_CONDITION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addResultingCondition($v); } else { @@ -554,6 +585,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_STUDY])) { if (is_array($data[self::FIELD_STUDY])) { foreach($data[self::FIELD_STUDY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addStudy($v); } else { @@ -576,6 +610,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SUBJECT_MEDICAL_HISTORY])) { if (is_array($data[self::FIELD_SUBJECT_MEDICAL_HISTORY])) { foreach($data[self::FIELD_SUBJECT_MEDICAL_HISTORY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addSubjectMedicalHistory($v); } else { @@ -591,6 +628,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SUSPECT_ENTITY])) { if (is_array($data[self::FIELD_SUSPECT_ENTITY])) { foreach($data[self::FIELD_SUSPECT_ENTITY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRAdverseEventSuspectEntity) { $this->addSuspectEntity($v); } else { @@ -1667,11 +1707,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getActuality())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ACTUALITY, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getCategory())) { foreach($vs as $v) { if (null === $v) { @@ -1689,40 +1727,34 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_CONTRIBUTOR, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DATE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getDetected())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DETECTED, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getEncounter())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ENCOUNTER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getEvent())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EVENT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getLocation())) { $v->xmlSerialize($sxe->addChild(self::FIELD_LOCATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOutcome())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OUTCOME, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getRecordedDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RECORDED_DATE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRecorder())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RECORDER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getReferenceDocument())) { foreach($vs as $v) { if (null === $v) { @@ -1744,11 +1776,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getSeriousness())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SERIOUSNESS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSeverity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SEVERITY, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getStudy())) { foreach($vs as $v) { if (null === $v) { @@ -1761,7 +1791,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getSubject())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBJECT, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getSubjectMedicalHistory())) { foreach($vs as $v) { if (null === $v) { @@ -1779,6 +1808,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_SUSPECT_ENTITY, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } @@ -1789,7 +1819,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getActuality())) { - $a[self::FIELD_ACTUALITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ACTUALITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ACTUALITY_EXT] = $enc; + } + } else { + $a[self::FIELD_ACTUALITY] = $v; + } } if ([] !== ($vs = $this->getCategory())) { $a[self::FIELD_CATEGORY] = $vs; @@ -1798,12 +1836,26 @@ public function jsonSerialize() $a[self::FIELD_CONTRIBUTOR] = $vs; } if (null !== ($v = $this->getDate())) { - $a[self::FIELD_DATE] = $v->getValue(); - $a[self::FIELD_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_DATE] = $v; + } } if (null !== ($v = $this->getDetected())) { - $a[self::FIELD_DETECTED] = $v->getValue(); - $a[self::FIELD_DETECTED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DETECTED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DETECTED_EXT] = $enc; + } + } else { + $a[self::FIELD_DETECTED] = $v; + } } if (null !== ($v = $this->getEncounter())) { $a[self::FIELD_ENCOUNTER] = $v; @@ -1812,7 +1864,15 @@ public function jsonSerialize() $a[self::FIELD_EVENT] = $v; } if (null !== ($v = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_IDENTIFIER] = $v; + } } if (null !== ($v = $this->getLocation())) { $a[self::FIELD_LOCATION] = $v; @@ -1821,8 +1881,15 @@ public function jsonSerialize() $a[self::FIELD_OUTCOME] = $v; } if (null !== ($v = $this->getRecordedDate())) { - $a[self::FIELD_RECORDED_DATE] = $v->getValue(); - $a[self::FIELD_RECORDED_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_RECORDED_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_RECORDED_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_RECORDED_DATE] = $v; + } } if (null !== ($v = $this->getRecorder())) { $a[self::FIELD_RECORDER] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRAllergyIntolerance.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRAllergyIntolerance.php index b9b57ce459..254d633b2b 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRAllergyIntolerance.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRAllergyIntolerance.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -92,10 +92,6 @@ class FHIRAllergyIntolerance extends FHIRDomainResource implements PHPFHIRContai { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ALLERGY_INTOLERANCE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ASSERTER = 'asserter'; const FIELD_CATEGORY = 'category'; const FIELD_CATEGORY_EXT = '_category'; @@ -110,6 +106,7 @@ class FHIRAllergyIntolerance extends FHIRDomainResource implements PHPFHIRContai const FIELD_LAST_OCCURRENCE_EXT = '_lastOccurrence'; const FIELD_NOTE = 'note'; const FIELD_ONSET_AGE = 'onsetAge'; + const FIELD_ONSET_AGE_EXT = '_onsetAge'; const FIELD_ONSET_DATE_TIME = 'onsetDateTime'; const FIELD_ONSET_DATE_TIME_EXT = '_onsetDateTime'; const FIELD_ONSET_PERIOD = 'onsetPeriod'; @@ -383,6 +380,9 @@ class FHIRAllergyIntolerance extends FHIRDomainResource implements PHPFHIRContai */ protected $verificationStatus = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRAllergyIntolerance Constructor * @param null|array $data @@ -412,17 +412,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_CATEGORY])) { foreach($data[self::FIELD_CATEGORY] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRAllergyIntoleranceCategory) { $this->addCategory($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addCategory(new FHIRAllergyIntoleranceCategory([FHIRAllergyIntoleranceCategory::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addCategory(new FHIRAllergyIntoleranceCategory([FHIRAllergyIntoleranceCategory::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addCategory(new FHIRAllergyIntoleranceCategory(array_merge($v, $ext[$i]))); + } } else { $this->addCategory(new FHIRAllergyIntoleranceCategory($v)); } } } elseif ($data[self::FIELD_CATEGORY] instanceof FHIRAllergyIntoleranceCategory) { $this->addCategory($data[self::FIELD_CATEGORY]); - } elseif ($ext && is_scalar($data[self::FIELD_CATEGORY])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_CATEGORY])) { $this->addCategory(new FHIRAllergyIntoleranceCategory([FHIRAllergyIntoleranceCategory::FIELD_VALUE => $data[self::FIELD_CATEGORY]] + $ext)); } else { $this->addCategory(new FHIRAllergyIntoleranceCategory($data[self::FIELD_CATEGORY])); @@ -448,8 +455,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CRITICALITY] instanceof FHIRAllergyIntoleranceCriticality) { $this->setCriticality($data[self::FIELD_CRITICALITY]); - } elseif ($ext && is_scalar($data[self::FIELD_CRITICALITY])) { - $this->setCriticality(new FHIRAllergyIntoleranceCriticality([FHIRAllergyIntoleranceCriticality::FIELD_VALUE => $data[self::FIELD_CRITICALITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CRITICALITY])) { + $this->setCriticality(new FHIRAllergyIntoleranceCriticality([FHIRAllergyIntoleranceCriticality::FIELD_VALUE => $data[self::FIELD_CRITICALITY]] + $ext)); + } else if (is_array($data[self::FIELD_CRITICALITY])) { + $this->setCriticality(new FHIRAllergyIntoleranceCriticality(array_merge($ext, $data[self::FIELD_CRITICALITY]))); + } } else { $this->setCriticality(new FHIRAllergyIntoleranceCriticality($data[self::FIELD_CRITICALITY])); } @@ -467,17 +478,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -489,8 +507,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_LAST_OCCURRENCE] instanceof FHIRDateTime) { $this->setLastOccurrence($data[self::FIELD_LAST_OCCURRENCE]); - } elseif ($ext && is_scalar($data[self::FIELD_LAST_OCCURRENCE])) { - $this->setLastOccurrence(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_LAST_OCCURRENCE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_LAST_OCCURRENCE])) { + $this->setLastOccurrence(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_LAST_OCCURRENCE]] + $ext)); + } else if (is_array($data[self::FIELD_LAST_OCCURRENCE])) { + $this->setLastOccurrence(new FHIRDateTime(array_merge($ext, $data[self::FIELD_LAST_OCCURRENCE]))); + } } else { $this->setLastOccurrence(new FHIRDateTime($data[self::FIELD_LAST_OCCURRENCE])); } @@ -498,6 +520,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_NOTE])) { if (is_array($data[self::FIELD_NOTE])) { foreach($data[self::FIELD_NOTE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRAnnotation) { $this->addNote($v); } else { @@ -511,8 +536,17 @@ public function __construct($data = null) } } if (isset($data[self::FIELD_ONSET_AGE])) { + $ext = (isset($data[self::FIELD_ONSET_AGE_EXT]) && is_array($data[self::FIELD_ONSET_AGE_EXT])) + ? $data[self::FIELD_ONSET_AGE_EXT] + : null; if ($data[self::FIELD_ONSET_AGE] instanceof FHIRAge) { $this->setOnsetAge($data[self::FIELD_ONSET_AGE]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ONSET_AGE])) { + $this->setOnsetAge(new FHIRAge([FHIRAge::FIELD_VALUE => $data[self::FIELD_ONSET_AGE]] + $ext)); + } else if (is_array($data[self::FIELD_ONSET_AGE])) { + $this->setOnsetAge(new FHIRAge(array_merge($ext, $data[self::FIELD_ONSET_AGE]))); + } } else { $this->setOnsetAge(new FHIRAge($data[self::FIELD_ONSET_AGE])); } @@ -523,8 +557,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ONSET_DATE_TIME] instanceof FHIRDateTime) { $this->setOnsetDateTime($data[self::FIELD_ONSET_DATE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_ONSET_DATE_TIME])) { - $this->setOnsetDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_ONSET_DATE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ONSET_DATE_TIME])) { + $this->setOnsetDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_ONSET_DATE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_ONSET_DATE_TIME])) { + $this->setOnsetDateTime(new FHIRDateTime(array_merge($ext, $data[self::FIELD_ONSET_DATE_TIME]))); + } } else { $this->setOnsetDateTime(new FHIRDateTime($data[self::FIELD_ONSET_DATE_TIME])); } @@ -549,8 +587,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ONSET_STRING] instanceof FHIRString) { $this->setOnsetString($data[self::FIELD_ONSET_STRING]); - } elseif ($ext && is_scalar($data[self::FIELD_ONSET_STRING])) { - $this->setOnsetString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_ONSET_STRING]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ONSET_STRING])) { + $this->setOnsetString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_ONSET_STRING]] + $ext)); + } else if (is_array($data[self::FIELD_ONSET_STRING])) { + $this->setOnsetString(new FHIRString(array_merge($ext, $data[self::FIELD_ONSET_STRING]))); + } } else { $this->setOnsetString(new FHIRString($data[self::FIELD_ONSET_STRING])); } @@ -565,6 +607,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REACTION])) { if (is_array($data[self::FIELD_REACTION])) { foreach($data[self::FIELD_REACTION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRAllergyIntoleranceReaction) { $this->addReaction($v); } else { @@ -583,8 +628,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_RECORDED_DATE] instanceof FHIRDateTime) { $this->setRecordedDate($data[self::FIELD_RECORDED_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_RECORDED_DATE])) { - $this->setRecordedDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_RECORDED_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_RECORDED_DATE])) { + $this->setRecordedDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_RECORDED_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_RECORDED_DATE])) { + $this->setRecordedDate(new FHIRDateTime(array_merge($ext, $data[self::FIELD_RECORDED_DATE]))); + } } else { $this->setRecordedDate(new FHIRDateTime($data[self::FIELD_RECORDED_DATE])); } @@ -602,8 +651,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TYPE] instanceof FHIRAllergyIntoleranceType) { $this->setType($data[self::FIELD_TYPE]); - } elseif ($ext && is_scalar($data[self::FIELD_TYPE])) { - $this->setType(new FHIRAllergyIntoleranceType([FHIRAllergyIntoleranceType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TYPE])) { + $this->setType(new FHIRAllergyIntoleranceType([FHIRAllergyIntoleranceType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } else if (is_array($data[self::FIELD_TYPE])) { + $this->setType(new FHIRAllergyIntoleranceType(array_merge($ext, $data[self::FIELD_TYPE]))); + } } else { $this->setType(new FHIRAllergyIntoleranceType($data[self::FIELD_TYPE])); } @@ -1620,11 +1673,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getAsserter())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ASSERTER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getCategory())) { foreach($vs as $v) { if (null === $v) { @@ -1637,19 +1688,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getClinicalStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CLINICAL_STATUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getCriticality())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CRITICALITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getEncounter())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ENCOUNTER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -1658,10 +1705,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getLastOccurrence())) { $v->xmlSerialize($sxe->addChild(self::FIELD_LAST_OCCURRENCE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getNote())) { foreach($vs as $v) { if (null === $v) { @@ -1677,22 +1724,18 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getOnsetDateTime())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ONSET_DATE_TIME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOnsetPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ONSET_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOnsetRange())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ONSET_RANGE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getOnsetString())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ONSET_STRING, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPatient())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATIENT, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getReaction())) { foreach($vs as $v) { if (null === $v) { @@ -1701,18 +1744,16 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_REACTION, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getRecordedDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RECORDED_DATE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRecorder())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RECORDER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getVerificationStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VERIFICATION_STATUS, null, $v->_getFHIRXMLNamespace())); } @@ -1729,7 +1770,23 @@ public function jsonSerialize() $a[self::FIELD_ASSERTER] = $v; } if ([] !== ($vs = $this->getCategory())) { - $a[self::FIELD_CATEGORY] = $vs; + $a[self::FIELD_CATEGORY] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CATEGORY][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CATEGORY_EXT][] = $enc; + } else { + $a[self::FIELD_CATEGORY_EXT][] = null; + } + } else { + $a[self::FIELD_CATEGORY][] = $v; + } + } } if (null !== ($v = $this->getClinicalStatus())) { $a[self::FIELD_CLINICAL_STATUS] = $v; @@ -1738,27 +1795,73 @@ public function jsonSerialize() $a[self::FIELD_CODE] = $v; } if (null !== ($v = $this->getCriticality())) { - $a[self::FIELD_CRITICALITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CRITICALITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CRITICALITY_EXT] = $enc; + } + } else { + $a[self::FIELD_CRITICALITY] = $v; + } } if (null !== ($v = $this->getEncounter())) { $a[self::FIELD_ENCOUNTER] = $v; } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if (null !== ($v = $this->getLastOccurrence())) { - $a[self::FIELD_LAST_OCCURRENCE] = $v->getValue(); - $a[self::FIELD_LAST_OCCURRENCE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_LAST_OCCURRENCE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_LAST_OCCURRENCE_EXT] = $enc; + } + } else { + $a[self::FIELD_LAST_OCCURRENCE] = $v; + } } if ([] !== ($vs = $this->getNote())) { $a[self::FIELD_NOTE] = $vs; } if (null !== ($v = $this->getOnsetAge())) { - $a[self::FIELD_ONSET_AGE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ONSET_AGE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ONSET_AGE_EXT] = $enc; + } + } else { + $a[self::FIELD_ONSET_AGE] = $v; + } } if (null !== ($v = $this->getOnsetDateTime())) { - $a[self::FIELD_ONSET_DATE_TIME] = $v->getValue(); - $a[self::FIELD_ONSET_DATE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ONSET_DATE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ONSET_DATE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_ONSET_DATE_TIME] = $v; + } } if (null !== ($v = $this->getOnsetPeriod())) { $a[self::FIELD_ONSET_PERIOD] = $v; @@ -1767,8 +1870,15 @@ public function jsonSerialize() $a[self::FIELD_ONSET_RANGE] = $v; } if (null !== ($v = $this->getOnsetString())) { - $a[self::FIELD_ONSET_STRING] = $v->getValue(); - $a[self::FIELD_ONSET_STRING_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ONSET_STRING] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ONSET_STRING_EXT] = $enc; + } + } else { + $a[self::FIELD_ONSET_STRING] = $v; + } } if (null !== ($v = $this->getPatient())) { $a[self::FIELD_PATIENT] = $v; @@ -1777,14 +1887,29 @@ public function jsonSerialize() $a[self::FIELD_REACTION] = $vs; } if (null !== ($v = $this->getRecordedDate())) { - $a[self::FIELD_RECORDED_DATE] = $v->getValue(); - $a[self::FIELD_RECORDED_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_RECORDED_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_RECORDED_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_RECORDED_DATE] = $v; + } } if (null !== ($v = $this->getRecorder())) { $a[self::FIELD_RECORDER] = $v; } if (null !== ($v = $this->getType())) { - $a[self::FIELD_TYPE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TYPE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TYPE_EXT] = $enc; + } + } else { + $a[self::FIELD_TYPE] = $v; + } } if (null !== ($v = $this->getVerificationStatus())) { $a[self::FIELD_VERIFICATION_STATUS] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRAppointment.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRAppointment.php index 530b054474..28b62b5416 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRAppointment.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRAppointment.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -91,10 +91,6 @@ class FHIRAppointment extends FHIRDomainResource implements PHPFHIRContainedType { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_APPOINTMENT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_APPOINTMENT_TYPE = 'appointmentType'; const FIELD_BASED_ON = 'basedOn'; const FIELD_CANCELATION_REASON = 'cancelationReason'; @@ -422,6 +418,9 @@ class FHIRAppointment extends FHIRDomainResource implements PHPFHIRContainedType */ protected $supportingInformation = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRAppointment Constructor * @param null|array $data @@ -448,6 +447,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_BASED_ON])) { if (is_array($data[self::FIELD_BASED_ON])) { foreach($data[self::FIELD_BASED_ON] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addBasedOn($v); } else { @@ -473,8 +475,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_COMMENT] instanceof FHIRString) { $this->setComment($data[self::FIELD_COMMENT]); - } elseif ($ext && is_scalar($data[self::FIELD_COMMENT])) { - $this->setComment(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_COMMENT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_COMMENT])) { + $this->setComment(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_COMMENT]] + $ext)); + } else if (is_array($data[self::FIELD_COMMENT])) { + $this->setComment(new FHIRString(array_merge($ext, $data[self::FIELD_COMMENT]))); + } } else { $this->setComment(new FHIRString($data[self::FIELD_COMMENT])); } @@ -485,8 +491,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CREATED] instanceof FHIRDateTime) { $this->setCreated($data[self::FIELD_CREATED]); - } elseif ($ext && is_scalar($data[self::FIELD_CREATED])) { - $this->setCreated(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_CREATED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CREATED])) { + $this->setCreated(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_CREATED]] + $ext)); + } else if (is_array($data[self::FIELD_CREATED])) { + $this->setCreated(new FHIRDateTime(array_merge($ext, $data[self::FIELD_CREATED]))); + } } else { $this->setCreated(new FHIRDateTime($data[self::FIELD_CREATED])); } @@ -497,8 +507,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -509,8 +523,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_END] instanceof FHIRInstant) { $this->setEnd($data[self::FIELD_END]); - } elseif ($ext && is_scalar($data[self::FIELD_END])) { - $this->setEnd(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_END]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_END])) { + $this->setEnd(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_END]] + $ext)); + } else if (is_array($data[self::FIELD_END])) { + $this->setEnd(new FHIRInstant(array_merge($ext, $data[self::FIELD_END]))); + } } else { $this->setEnd(new FHIRInstant($data[self::FIELD_END])); } @@ -521,17 +539,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -543,8 +568,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MINUTES_DURATION] instanceof FHIRPositiveInt) { $this->setMinutesDuration($data[self::FIELD_MINUTES_DURATION]); - } elseif ($ext && is_scalar($data[self::FIELD_MINUTES_DURATION])) { - $this->setMinutesDuration(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_MINUTES_DURATION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MINUTES_DURATION])) { + $this->setMinutesDuration(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_MINUTES_DURATION]] + $ext)); + } else if (is_array($data[self::FIELD_MINUTES_DURATION])) { + $this->setMinutesDuration(new FHIRPositiveInt(array_merge($ext, $data[self::FIELD_MINUTES_DURATION]))); + } } else { $this->setMinutesDuration(new FHIRPositiveInt($data[self::FIELD_MINUTES_DURATION])); } @@ -552,6 +581,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PARTICIPANT])) { if (is_array($data[self::FIELD_PARTICIPANT])) { foreach($data[self::FIELD_PARTICIPANT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRAppointmentParticipant) { $this->addParticipant($v); } else { @@ -570,8 +602,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PATIENT_INSTRUCTION] instanceof FHIRString) { $this->setPatientInstruction($data[self::FIELD_PATIENT_INSTRUCTION]); - } elseif ($ext && is_scalar($data[self::FIELD_PATIENT_INSTRUCTION])) { - $this->setPatientInstruction(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PATIENT_INSTRUCTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PATIENT_INSTRUCTION])) { + $this->setPatientInstruction(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PATIENT_INSTRUCTION]] + $ext)); + } else if (is_array($data[self::FIELD_PATIENT_INSTRUCTION])) { + $this->setPatientInstruction(new FHIRString(array_merge($ext, $data[self::FIELD_PATIENT_INSTRUCTION]))); + } } else { $this->setPatientInstruction(new FHIRString($data[self::FIELD_PATIENT_INSTRUCTION])); } @@ -582,8 +618,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PRIORITY] instanceof FHIRUnsignedInt) { $this->setPriority($data[self::FIELD_PRIORITY]); - } elseif ($ext && is_scalar($data[self::FIELD_PRIORITY])) { - $this->setPriority(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_PRIORITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PRIORITY])) { + $this->setPriority(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_PRIORITY]] + $ext)); + } else if (is_array($data[self::FIELD_PRIORITY])) { + $this->setPriority(new FHIRUnsignedInt(array_merge($ext, $data[self::FIELD_PRIORITY]))); + } } else { $this->setPriority(new FHIRUnsignedInt($data[self::FIELD_PRIORITY])); } @@ -591,6 +631,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REASON_CODE])) { if (is_array($data[self::FIELD_REASON_CODE])) { foreach($data[self::FIELD_REASON_CODE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addReasonCode($v); } else { @@ -606,6 +649,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REASON_REFERENCE])) { if (is_array($data[self::FIELD_REASON_REFERENCE])) { foreach($data[self::FIELD_REASON_REFERENCE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addReasonReference($v); } else { @@ -621,6 +667,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REQUESTED_PERIOD])) { if (is_array($data[self::FIELD_REQUESTED_PERIOD])) { foreach($data[self::FIELD_REQUESTED_PERIOD] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRPeriod) { $this->addRequestedPeriod($v); } else { @@ -636,6 +685,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SERVICE_CATEGORY])) { if (is_array($data[self::FIELD_SERVICE_CATEGORY])) { foreach($data[self::FIELD_SERVICE_CATEGORY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addServiceCategory($v); } else { @@ -651,6 +703,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SERVICE_TYPE])) { if (is_array($data[self::FIELD_SERVICE_TYPE])) { foreach($data[self::FIELD_SERVICE_TYPE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addServiceType($v); } else { @@ -666,6 +721,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SLOT])) { if (is_array($data[self::FIELD_SLOT])) { foreach($data[self::FIELD_SLOT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addSlot($v); } else { @@ -681,6 +739,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SPECIALTY])) { if (is_array($data[self::FIELD_SPECIALTY])) { foreach($data[self::FIELD_SPECIALTY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addSpecialty($v); } else { @@ -699,8 +760,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_START] instanceof FHIRInstant) { $this->setStart($data[self::FIELD_START]); - } elseif ($ext && is_scalar($data[self::FIELD_START])) { - $this->setStart(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_START]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_START])) { + $this->setStart(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_START]] + $ext)); + } else if (is_array($data[self::FIELD_START])) { + $this->setStart(new FHIRInstant(array_merge($ext, $data[self::FIELD_START]))); + } } else { $this->setStart(new FHIRInstant($data[self::FIELD_START])); } @@ -711,8 +776,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRAppointmentStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRAppointmentStatus([FHIRAppointmentStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRAppointmentStatus([FHIRAppointmentStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRAppointmentStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRAppointmentStatus($data[self::FIELD_STATUS])); } @@ -720,6 +789,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SUPPORTING_INFORMATION])) { if (is_array($data[self::FIELD_SUPPORTING_INFORMATION])) { foreach($data[self::FIELD_SUPPORTING_INFORMATION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addSupportingInformation($v); } else { @@ -2089,11 +2161,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getAppointmentType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_APPOINTMENT_TYPE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getBasedOn())) { foreach($vs as $v) { if (null === $v) { @@ -2118,7 +2188,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getEnd())) { $v->xmlSerialize($sxe->addChild(self::FIELD_END, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -2127,10 +2196,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getMinutesDuration())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MINUTES_DURATION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getParticipant())) { foreach($vs as $v) { if (null === $v) { @@ -2139,13 +2208,13 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_PARTICIPANT, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getPatientInstruction())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATIENT_INSTRUCTION, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getPriority())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PRIORITY, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getReasonCode())) { foreach($vs as $v) { if (null === $v) { @@ -2208,14 +2277,13 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_SPECIALTY, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getStart())) { $v->xmlSerialize($sxe->addChild(self::FIELD_START, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getSupportingInformation())) { foreach($vs as $v) { if (null === $v) { @@ -2224,6 +2292,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_SUPPORTING_INFORMATION, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } @@ -2243,38 +2312,103 @@ public function jsonSerialize() $a[self::FIELD_CANCELATION_REASON] = $v; } if (null !== ($v = $this->getComment())) { - $a[self::FIELD_COMMENT] = $v->getValue(); - $a[self::FIELD_COMMENT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_COMMENT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_COMMENT_EXT] = $enc; + } + } else { + $a[self::FIELD_COMMENT] = $v; + } } if (null !== ($v = $this->getCreated())) { - $a[self::FIELD_CREATED] = $v->getValue(); - $a[self::FIELD_CREATED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CREATED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CREATED_EXT] = $enc; + } + } else { + $a[self::FIELD_CREATED] = $v; + } } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if (null !== ($v = $this->getEnd())) { - $a[self::FIELD_END] = $v->getValue(); - $a[self::FIELD_END_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_END] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_END_EXT] = $enc; + } + } else { + $a[self::FIELD_END] = $v; + } } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if (null !== ($v = $this->getMinutesDuration())) { - $a[self::FIELD_MINUTES_DURATION] = $v->getValue(); - $a[self::FIELD_MINUTES_DURATION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MINUTES_DURATION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MINUTES_DURATION_EXT] = $enc; + } + } else { + $a[self::FIELD_MINUTES_DURATION] = $v; + } } if ([] !== ($vs = $this->getParticipant())) { $a[self::FIELD_PARTICIPANT] = $vs; } if (null !== ($v = $this->getPatientInstruction())) { - $a[self::FIELD_PATIENT_INSTRUCTION] = $v->getValue(); - $a[self::FIELD_PATIENT_INSTRUCTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PATIENT_INSTRUCTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PATIENT_INSTRUCTION_EXT] = $enc; + } + } else { + $a[self::FIELD_PATIENT_INSTRUCTION] = $v; + } } if (null !== ($v = $this->getPriority())) { - $a[self::FIELD_PRIORITY] = $v->getValue(); - $a[self::FIELD_PRIORITY_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PRIORITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PRIORITY_EXT] = $enc; + } + } else { + $a[self::FIELD_PRIORITY] = $v; + } } if ([] !== ($vs = $this->getReasonCode())) { $a[self::FIELD_REASON_CODE] = $vs; @@ -2298,11 +2432,26 @@ public function jsonSerialize() $a[self::FIELD_SPECIALTY] = $vs; } if (null !== ($v = $this->getStart())) { - $a[self::FIELD_START] = $v->getValue(); - $a[self::FIELD_START_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_START] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_START_EXT] = $enc; + } + } else { + $a[self::FIELD_START] = $v; + } } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if ([] !== ($vs = $this->getSupportingInformation())) { $a[self::FIELD_SUPPORTING_INFORMATION] = $vs; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRAppointmentResponse.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRAppointmentResponse.php index 6c93ece522..b1e276e8ff 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRAppointmentResponse.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRAppointmentResponse.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -85,10 +85,6 @@ class FHIRAppointmentResponse extends FHIRDomainResource implements PHPFHIRConta { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_APPOINTMENT_RESPONSE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ACTOR = 'actor'; const FIELD_APPOINTMENT = 'appointment'; const FIELD_COMMENT = 'comment'; @@ -207,6 +203,9 @@ class FHIRAppointmentResponse extends FHIRDomainResource implements PHPFHIRConta */ protected $start = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRAppointmentResponse Constructor * @param null|array $data @@ -243,8 +242,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_COMMENT] instanceof FHIRString) { $this->setComment($data[self::FIELD_COMMENT]); - } elseif ($ext && is_scalar($data[self::FIELD_COMMENT])) { - $this->setComment(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_COMMENT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_COMMENT])) { + $this->setComment(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_COMMENT]] + $ext)); + } else if (is_array($data[self::FIELD_COMMENT])) { + $this->setComment(new FHIRString(array_merge($ext, $data[self::FIELD_COMMENT]))); + } } else { $this->setComment(new FHIRString($data[self::FIELD_COMMENT])); } @@ -255,8 +258,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_END] instanceof FHIRInstant) { $this->setEnd($data[self::FIELD_END]); - } elseif ($ext && is_scalar($data[self::FIELD_END])) { - $this->setEnd(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_END]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_END])) { + $this->setEnd(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_END]] + $ext)); + } else if (is_array($data[self::FIELD_END])) { + $this->setEnd(new FHIRInstant(array_merge($ext, $data[self::FIELD_END]))); + } } else { $this->setEnd(new FHIRInstant($data[self::FIELD_END])); } @@ -267,17 +274,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -289,8 +303,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PARTICIPANT_STATUS] instanceof FHIRParticipationStatus) { $this->setParticipantStatus($data[self::FIELD_PARTICIPANT_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_PARTICIPANT_STATUS])) { - $this->setParticipantStatus(new FHIRParticipationStatus([FHIRParticipationStatus::FIELD_VALUE => $data[self::FIELD_PARTICIPANT_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PARTICIPANT_STATUS])) { + $this->setParticipantStatus(new FHIRParticipationStatus([FHIRParticipationStatus::FIELD_VALUE => $data[self::FIELD_PARTICIPANT_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_PARTICIPANT_STATUS])) { + $this->setParticipantStatus(new FHIRParticipationStatus(array_merge($ext, $data[self::FIELD_PARTICIPANT_STATUS]))); + } } else { $this->setParticipantStatus(new FHIRParticipationStatus($data[self::FIELD_PARTICIPANT_STATUS])); } @@ -298,6 +316,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PARTICIPANT_TYPE])) { if (is_array($data[self::FIELD_PARTICIPANT_TYPE])) { foreach($data[self::FIELD_PARTICIPANT_TYPE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addParticipantType($v); } else { @@ -316,8 +337,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_START] instanceof FHIRInstant) { $this->setStart($data[self::FIELD_START]); - } elseif ($ext && is_scalar($data[self::FIELD_START])) { - $this->setStart(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_START]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_START])) { + $this->setStart(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_START]] + $ext)); + } else if (is_array($data[self::FIELD_START])) { + $this->setStart(new FHIRInstant(array_merge($ext, $data[self::FIELD_START]))); + } } else { $this->setStart(new FHIRInstant($data[self::FIELD_START])); } @@ -820,11 +845,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getActor())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ACTOR, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getAppointment())) { $v->xmlSerialize($sxe->addChild(self::FIELD_APPOINTMENT, null, $v->_getFHIRXMLNamespace())); } @@ -834,7 +857,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getEnd())) { $v->xmlSerialize($sxe->addChild(self::FIELD_END, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -847,7 +869,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getParticipantStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PARTICIPANT_STATUS, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getParticipantType())) { foreach($vs as $v) { if (null === $v) { @@ -856,6 +877,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_PARTICIPANT_TYPE, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getStart())) { $v->xmlSerialize($sxe->addChild(self::FIELD_START, null, $v->_getFHIRXMLNamespace())); } @@ -875,25 +897,70 @@ public function jsonSerialize() $a[self::FIELD_APPOINTMENT] = $v; } if (null !== ($v = $this->getComment())) { - $a[self::FIELD_COMMENT] = $v->getValue(); - $a[self::FIELD_COMMENT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_COMMENT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_COMMENT_EXT] = $enc; + } + } else { + $a[self::FIELD_COMMENT] = $v; + } } if (null !== ($v = $this->getEnd())) { - $a[self::FIELD_END] = $v->getValue(); - $a[self::FIELD_END_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_END] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_END_EXT] = $enc; + } + } else { + $a[self::FIELD_END] = $v; + } } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if (null !== ($v = $this->getParticipantStatus())) { - $a[self::FIELD_PARTICIPANT_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PARTICIPANT_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PARTICIPANT_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_PARTICIPANT_STATUS] = $v; + } } if ([] !== ($vs = $this->getParticipantType())) { $a[self::FIELD_PARTICIPANT_TYPE] = $vs; } if (null !== ($v = $this->getStart())) { - $a[self::FIELD_START] = $v->getValue(); - $a[self::FIELD_START_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_START] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_START_EXT] = $enc; + } + } else { + $a[self::FIELD_START] = $v; + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRAuditEvent.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRAuditEvent.php index 453106d24e..b913970a39 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRAuditEvent.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRAuditEvent.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -90,10 +90,6 @@ class FHIRAuditEvent extends FHIRDomainResource implements PHPFHIRContainedTypeI { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_AUDIT_EVENT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ACTION = 'action'; const FIELD_ACTION_EXT = '_action'; const FIELD_AGENT = 'agent'; @@ -237,6 +233,9 @@ class FHIRAuditEvent extends FHIRDomainResource implements PHPFHIRContainedTypeI */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRAuditEvent Constructor * @param null|array $data @@ -259,8 +258,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ACTION] instanceof FHIRAuditEventAction) { $this->setAction($data[self::FIELD_ACTION]); - } elseif ($ext && is_scalar($data[self::FIELD_ACTION])) { - $this->setAction(new FHIRAuditEventAction([FHIRAuditEventAction::FIELD_VALUE => $data[self::FIELD_ACTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ACTION])) { + $this->setAction(new FHIRAuditEventAction([FHIRAuditEventAction::FIELD_VALUE => $data[self::FIELD_ACTION]] + $ext)); + } else if (is_array($data[self::FIELD_ACTION])) { + $this->setAction(new FHIRAuditEventAction(array_merge($ext, $data[self::FIELD_ACTION]))); + } } else { $this->setAction(new FHIRAuditEventAction($data[self::FIELD_ACTION])); } @@ -268,6 +271,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_AGENT])) { if (is_array($data[self::FIELD_AGENT])) { foreach($data[self::FIELD_AGENT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRAuditEventAgent) { $this->addAgent($v); } else { @@ -283,6 +289,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ENTITY])) { if (is_array($data[self::FIELD_ENTITY])) { foreach($data[self::FIELD_ENTITY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRAuditEventEntity) { $this->addEntity($v); } else { @@ -301,8 +310,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_OUTCOME] instanceof FHIRAuditEventOutcome) { $this->setOutcome($data[self::FIELD_OUTCOME]); - } elseif ($ext && is_scalar($data[self::FIELD_OUTCOME])) { - $this->setOutcome(new FHIRAuditEventOutcome([FHIRAuditEventOutcome::FIELD_VALUE => $data[self::FIELD_OUTCOME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_OUTCOME])) { + $this->setOutcome(new FHIRAuditEventOutcome([FHIRAuditEventOutcome::FIELD_VALUE => $data[self::FIELD_OUTCOME]] + $ext)); + } else if (is_array($data[self::FIELD_OUTCOME])) { + $this->setOutcome(new FHIRAuditEventOutcome(array_merge($ext, $data[self::FIELD_OUTCOME]))); + } } else { $this->setOutcome(new FHIRAuditEventOutcome($data[self::FIELD_OUTCOME])); } @@ -313,8 +326,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_OUTCOME_DESC] instanceof FHIRString) { $this->setOutcomeDesc($data[self::FIELD_OUTCOME_DESC]); - } elseif ($ext && is_scalar($data[self::FIELD_OUTCOME_DESC])) { - $this->setOutcomeDesc(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_OUTCOME_DESC]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_OUTCOME_DESC])) { + $this->setOutcomeDesc(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_OUTCOME_DESC]] + $ext)); + } else if (is_array($data[self::FIELD_OUTCOME_DESC])) { + $this->setOutcomeDesc(new FHIRString(array_merge($ext, $data[self::FIELD_OUTCOME_DESC]))); + } } else { $this->setOutcomeDesc(new FHIRString($data[self::FIELD_OUTCOME_DESC])); } @@ -329,6 +346,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PURPOSE_OF_EVENT])) { if (is_array($data[self::FIELD_PURPOSE_OF_EVENT])) { foreach($data[self::FIELD_PURPOSE_OF_EVENT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addPurposeOfEvent($v); } else { @@ -347,8 +367,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_RECORDED] instanceof FHIRInstant) { $this->setRecorded($data[self::FIELD_RECORDED]); - } elseif ($ext && is_scalar($data[self::FIELD_RECORDED])) { - $this->setRecorded(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_RECORDED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_RECORDED])) { + $this->setRecorded(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_RECORDED]] + $ext)); + } else if (is_array($data[self::FIELD_RECORDED])) { + $this->setRecorded(new FHIRInstant(array_merge($ext, $data[self::FIELD_RECORDED]))); + } } else { $this->setRecorded(new FHIRInstant($data[self::FIELD_RECORDED])); } @@ -363,6 +387,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SUBTYPE])) { if (is_array($data[self::FIELD_SUBTYPE])) { foreach($data[self::FIELD_SUBTYPE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCoding) { $this->addSubtype($v); } else { @@ -1001,11 +1028,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getAction())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ACTION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getAgent())) { foreach($vs as $v) { if (null === $v) { @@ -1030,11 +1055,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getOutcomeDesc())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OUTCOME_DESC, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getPurposeOfEvent())) { foreach($vs as $v) { if (null === $v) { @@ -1043,14 +1066,13 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_PURPOSE_OF_EVENT, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getRecorded())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RECORDED, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSource())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SOURCE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getSubtype())) { foreach($vs as $v) { if (null === $v) { @@ -1073,7 +1095,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getAction())) { - $a[self::FIELD_ACTION] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ACTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ACTION_EXT] = $enc; + } + } else { + $a[self::FIELD_ACTION] = $v; + } } if ([] !== ($vs = $this->getAgent())) { $a[self::FIELD_AGENT] = $vs; @@ -1082,11 +1112,26 @@ public function jsonSerialize() $a[self::FIELD_ENTITY] = $vs; } if (null !== ($v = $this->getOutcome())) { - $a[self::FIELD_OUTCOME] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_OUTCOME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_OUTCOME_EXT] = $enc; + } + } else { + $a[self::FIELD_OUTCOME] = $v; + } } if (null !== ($v = $this->getOutcomeDesc())) { - $a[self::FIELD_OUTCOME_DESC] = $v->getValue(); - $a[self::FIELD_OUTCOME_DESC_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_OUTCOME_DESC] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_OUTCOME_DESC_EXT] = $enc; + } + } else { + $a[self::FIELD_OUTCOME_DESC] = $v; + } } if (null !== ($v = $this->getPeriod())) { $a[self::FIELD_PERIOD] = $v; @@ -1095,8 +1140,15 @@ public function jsonSerialize() $a[self::FIELD_PURPOSE_OF_EVENT] = $vs; } if (null !== ($v = $this->getRecorded())) { - $a[self::FIELD_RECORDED] = $v->getValue(); - $a[self::FIELD_RECORDED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_RECORDED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_RECORDED_EXT] = $enc; + } + } else { + $a[self::FIELD_RECORDED] = $v; + } } if (null !== ($v = $this->getSource())) { $a[self::FIELD_SOURCE] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRBasic.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRBasic.php index 3b281ce302..595fe758b2 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRBasic.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRBasic.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -84,10 +84,6 @@ class FHIRBasic extends FHIRDomainResource implements PHPFHIRContainedTypeInterf { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_BASIC; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_AUTHOR = 'author'; const FIELD_CODE = 'code'; const FIELD_CREATED = 'created'; @@ -157,6 +153,9 @@ class FHIRBasic extends FHIRDomainResource implements PHPFHIRContainedTypeInterf */ protected $subject = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRBasic Constructor * @param null|array $data @@ -193,8 +192,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CREATED] instanceof FHIRDate) { $this->setCreated($data[self::FIELD_CREATED]); - } elseif ($ext && is_scalar($data[self::FIELD_CREATED])) { - $this->setCreated(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_CREATED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CREATED])) { + $this->setCreated(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_CREATED]] + $ext)); + } else if (is_array($data[self::FIELD_CREATED])) { + $this->setCreated(new FHIRDate(array_merge($ext, $data[self::FIELD_CREATED]))); + } } else { $this->setCreated(new FHIRDate($data[self::FIELD_CREATED])); } @@ -205,17 +208,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -555,18 +565,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getAuthor())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AUTHOR, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getCreated())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CREATED, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -595,11 +602,34 @@ public function jsonSerialize() $a[self::FIELD_CODE] = $v; } if (null !== ($v = $this->getCreated())) { - $a[self::FIELD_CREATED] = $v->getValue(); - $a[self::FIELD_CREATED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CREATED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CREATED_EXT] = $enc; + } + } else { + $a[self::FIELD_CREATED] = $v; + } } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if (null !== ($v = $this->getSubject())) { $a[self::FIELD_SUBJECT] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRBiologicallyDerivedProduct.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRBiologicallyDerivedProduct.php index 5270181dbb..99135610fc 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRBiologicallyDerivedProduct.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRBiologicallyDerivedProduct.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -89,10 +89,6 @@ class FHIRBiologicallyDerivedProduct extends FHIRDomainResource implements PHPFH { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_BIOLOGICALLY_DERIVED_PRODUCT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_COLLECTION = 'collection'; const FIELD_IDENTIFIER = 'identifier'; const FIELD_IDENTIFIER_EXT = '_identifier'; @@ -234,6 +230,9 @@ class FHIRBiologicallyDerivedProduct extends FHIRDomainResource implements PHPFH */ protected $storage = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRBiologicallyDerivedProduct Constructor * @param null|array $data @@ -263,17 +262,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -289,6 +295,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PARENT])) { if (is_array($data[self::FIELD_PARENT])) { foreach($data[self::FIELD_PARENT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addParent($v); } else { @@ -304,6 +313,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PROCESSING])) { if (is_array($data[self::FIELD_PROCESSING])) { foreach($data[self::FIELD_PROCESSING] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRBiologicallyDerivedProductProcessing) { $this->addProcessing($v); } else { @@ -322,8 +334,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PRODUCT_CATEGORY] instanceof FHIRBiologicallyDerivedProductCategory) { $this->setProductCategory($data[self::FIELD_PRODUCT_CATEGORY]); - } elseif ($ext && is_scalar($data[self::FIELD_PRODUCT_CATEGORY])) { - $this->setProductCategory(new FHIRBiologicallyDerivedProductCategory([FHIRBiologicallyDerivedProductCategory::FIELD_VALUE => $data[self::FIELD_PRODUCT_CATEGORY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PRODUCT_CATEGORY])) { + $this->setProductCategory(new FHIRBiologicallyDerivedProductCategory([FHIRBiologicallyDerivedProductCategory::FIELD_VALUE => $data[self::FIELD_PRODUCT_CATEGORY]] + $ext)); + } else if (is_array($data[self::FIELD_PRODUCT_CATEGORY])) { + $this->setProductCategory(new FHIRBiologicallyDerivedProductCategory(array_merge($ext, $data[self::FIELD_PRODUCT_CATEGORY]))); + } } else { $this->setProductCategory(new FHIRBiologicallyDerivedProductCategory($data[self::FIELD_PRODUCT_CATEGORY])); } @@ -341,8 +357,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_QUANTITY] instanceof FHIRInteger) { $this->setQuantity($data[self::FIELD_QUANTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_QUANTITY])) { - $this->setQuantity(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_QUANTITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_QUANTITY])) { + $this->setQuantity(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_QUANTITY])) { + $this->setQuantity(new FHIRInteger(array_merge($ext, $data[self::FIELD_QUANTITY]))); + } } else { $this->setQuantity(new FHIRInteger($data[self::FIELD_QUANTITY])); } @@ -350,6 +370,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REQUEST])) { if (is_array($data[self::FIELD_REQUEST])) { foreach($data[self::FIELD_REQUEST] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addRequest($v); } else { @@ -368,8 +391,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRBiologicallyDerivedProductStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRBiologicallyDerivedProductStatus([FHIRBiologicallyDerivedProductStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRBiologicallyDerivedProductStatus([FHIRBiologicallyDerivedProductStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRBiologicallyDerivedProductStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRBiologicallyDerivedProductStatus($data[self::FIELD_STATUS])); } @@ -377,6 +404,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_STORAGE])) { if (is_array($data[self::FIELD_STORAGE])) { foreach($data[self::FIELD_STORAGE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRBiologicallyDerivedProductStorage) { $this->addStorage($v); } else { @@ -1024,11 +1054,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getCollection())) { $v->xmlSerialize($sxe->addChild(self::FIELD_COLLECTION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -1041,7 +1069,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getManipulation())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MANIPULATION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getParent())) { foreach($vs as $v) { if (null === $v) { @@ -1063,14 +1090,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getProductCategory())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PRODUCT_CATEGORY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getProductCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PRODUCT_CODE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_QUANTITY, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getRequest())) { foreach($vs as $v) { if (null === $v) { @@ -1083,7 +1108,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getStorage())) { foreach($vs as $v) { if (null === $v) { @@ -1092,6 +1116,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_STORAGE, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } @@ -1105,7 +1130,23 @@ public function jsonSerialize() $a[self::FIELD_COLLECTION] = $v; } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if (null !== ($v = $this->getManipulation())) { $a[self::FIELD_MANIPULATION] = $v; @@ -1117,20 +1158,43 @@ public function jsonSerialize() $a[self::FIELD_PROCESSING] = $vs; } if (null !== ($v = $this->getProductCategory())) { - $a[self::FIELD_PRODUCT_CATEGORY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PRODUCT_CATEGORY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PRODUCT_CATEGORY_EXT] = $enc; + } + } else { + $a[self::FIELD_PRODUCT_CATEGORY] = $v; + } } if (null !== ($v = $this->getProductCode())) { $a[self::FIELD_PRODUCT_CODE] = $v; } if (null !== ($v = $this->getQuantity())) { - $a[self::FIELD_QUANTITY] = $v->getValue(); - $a[self::FIELD_QUANTITY_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_QUANTITY] = $v; + } } if ([] !== ($vs = $this->getRequest())) { $a[self::FIELD_REQUEST] = $vs; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if ([] !== ($vs = $this->getStorage())) { $a[self::FIELD_STORAGE] = $vs; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRBodyStructure.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRBodyStructure.php index 1b09368cfb..3b14b7a44a 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRBodyStructure.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRBodyStructure.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -85,10 +85,6 @@ class FHIRBodyStructure extends FHIRDomainResource implements PHPFHIRContainedTy { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_BODY_STRUCTURE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ACTIVE = 'active'; const FIELD_ACTIVE_EXT = '_active'; const FIELD_DESCRIPTION = 'description'; @@ -194,6 +190,9 @@ class FHIRBodyStructure extends FHIRDomainResource implements PHPFHIRContainedTy */ protected $patient = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRBodyStructure Constructor * @param null|array $data @@ -216,8 +215,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ACTIVE] instanceof FHIRBoolean) { $this->setActive($data[self::FIELD_ACTIVE]); - } elseif ($ext && is_scalar($data[self::FIELD_ACTIVE])) { - $this->setActive(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_ACTIVE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ACTIVE])) { + $this->setActive(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_ACTIVE]] + $ext)); + } else if (is_array($data[self::FIELD_ACTIVE])) { + $this->setActive(new FHIRBoolean(array_merge($ext, $data[self::FIELD_ACTIVE]))); + } } else { $this->setActive(new FHIRBoolean($data[self::FIELD_ACTIVE])); } @@ -228,8 +231,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -240,17 +247,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -259,6 +273,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_IMAGE])) { if (is_array($data[self::FIELD_IMAGE])) { foreach($data[self::FIELD_IMAGE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRAttachment) { $this->addImage($v); } else { @@ -281,6 +298,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_LOCATION_QUALIFIER])) { if (is_array($data[self::FIELD_LOCATION_QUALIFIER])) { foreach($data[self::FIELD_LOCATION_QUALIFIER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addLocationQualifier($v); } else { @@ -805,7 +825,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESCRIPTION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -827,7 +846,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getLocation())) { $v->xmlSerialize($sxe->addChild(self::FIELD_LOCATION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getLocationQualifier())) { foreach($vs as $v) { if (null === $v) { @@ -840,7 +858,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getMorphology())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MORPHOLOGY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPatient())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATIENT, null, $v->_getFHIRXMLNamespace())); } @@ -854,15 +871,45 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getActive())) { - $a[self::FIELD_ACTIVE] = $v->getValue(); - $a[self::FIELD_ACTIVE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ACTIVE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ACTIVE_EXT] = $enc; + } + } else { + $a[self::FIELD_ACTIVE] = $v; + } } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if ([] !== ($vs = $this->getImage())) { $a[self::FIELD_IMAGE] = $vs; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRCapabilityStatement.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRCapabilityStatement.php index 42c88c9d0c..3e8c88b7ac 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRCapabilityStatement.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRCapabilityStatement.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -99,10 +99,6 @@ class FHIRCapabilityStatement extends FHIRDomainResource implements PHPFHIRConta { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CAPABILITY_STATEMENT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CONTACT = 'contact'; const FIELD_COPYRIGHT = 'copyright'; const FIELD_COPYRIGHT_EXT = '_copyright'; @@ -507,6 +503,9 @@ class FHIRCapabilityStatement extends FHIRDomainResource implements PHPFHIRConta */ protected $version = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRCapabilityStatement Constructor * @param null|array $data @@ -526,6 +525,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CONTACT])) { if (is_array($data[self::FIELD_CONTACT])) { foreach($data[self::FIELD_CONTACT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContactDetail) { $this->addContact($v); } else { @@ -544,8 +546,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_COPYRIGHT] instanceof FHIRMarkdown) { $this->setCopyright($data[self::FIELD_COPYRIGHT]); - } elseif ($ext && is_scalar($data[self::FIELD_COPYRIGHT])) { - $this->setCopyright(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_COPYRIGHT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_COPYRIGHT])) { + $this->setCopyright(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_COPYRIGHT]] + $ext)); + } else if (is_array($data[self::FIELD_COPYRIGHT])) { + $this->setCopyright(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_COPYRIGHT]))); + } } else { $this->setCopyright(new FHIRMarkdown($data[self::FIELD_COPYRIGHT])); } @@ -556,8 +562,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATE] instanceof FHIRDateTime) { $this->setDate($data[self::FIELD_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_DATE])) { - $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime(array_merge($ext, $data[self::FIELD_DATE]))); + } } else { $this->setDate(new FHIRDateTime($data[self::FIELD_DATE])); } @@ -568,8 +578,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRMarkdown) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRMarkdown($data[self::FIELD_DESCRIPTION])); } @@ -577,6 +591,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_DOCUMENT])) { if (is_array($data[self::FIELD_DOCUMENT])) { foreach($data[self::FIELD_DOCUMENT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCapabilityStatementDocument) { $this->addDocument($v); } else { @@ -595,8 +612,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EXPERIMENTAL] instanceof FHIRBoolean) { $this->setExperimental($data[self::FIELD_EXPERIMENTAL]); - } elseif ($ext && is_scalar($data[self::FIELD_EXPERIMENTAL])) { - $this->setExperimental(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_EXPERIMENTAL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EXPERIMENTAL])) { + $this->setExperimental(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_EXPERIMENTAL]] + $ext)); + } else if (is_array($data[self::FIELD_EXPERIMENTAL])) { + $this->setExperimental(new FHIRBoolean(array_merge($ext, $data[self::FIELD_EXPERIMENTAL]))); + } } else { $this->setExperimental(new FHIRBoolean($data[self::FIELD_EXPERIMENTAL])); } @@ -607,8 +628,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_FHIR_VERSION] instanceof FHIRFHIRVersion) { $this->setFhirVersion($data[self::FIELD_FHIR_VERSION]); - } elseif ($ext && is_scalar($data[self::FIELD_FHIR_VERSION])) { - $this->setFhirVersion(new FHIRFHIRVersion([FHIRFHIRVersion::FIELD_VALUE => $data[self::FIELD_FHIR_VERSION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_FHIR_VERSION])) { + $this->setFhirVersion(new FHIRFHIRVersion([FHIRFHIRVersion::FIELD_VALUE => $data[self::FIELD_FHIR_VERSION]] + $ext)); + } else if (is_array($data[self::FIELD_FHIR_VERSION])) { + $this->setFhirVersion(new FHIRFHIRVersion(array_merge($ext, $data[self::FIELD_FHIR_VERSION]))); + } } else { $this->setFhirVersion(new FHIRFHIRVersion($data[self::FIELD_FHIR_VERSION])); } @@ -619,17 +644,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_FORMAT])) { foreach($data[self::FIELD_FORMAT] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCode) { $this->addFormat($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addFormat(new FHIRCode([FHIRCode::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addFormat(new FHIRCode([FHIRCode::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addFormat(new FHIRCode(array_merge($v, $ext[$i]))); + } } else { $this->addFormat(new FHIRCode($v)); } } } elseif ($data[self::FIELD_FORMAT] instanceof FHIRCode) { $this->addFormat($data[self::FIELD_FORMAT]); - } elseif ($ext && is_scalar($data[self::FIELD_FORMAT])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_FORMAT])) { $this->addFormat(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_FORMAT]] + $ext)); } else { $this->addFormat(new FHIRCode($data[self::FIELD_FORMAT])); @@ -648,17 +680,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IMPLEMENTATION_GUIDE])) { foreach($data[self::FIELD_IMPLEMENTATION_GUIDE] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCanonical) { $this->addImplementationGuide($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addImplementationGuide(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addImplementationGuide(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addImplementationGuide(new FHIRCanonical(array_merge($v, $ext[$i]))); + } } else { $this->addImplementationGuide(new FHIRCanonical($v)); } } } elseif ($data[self::FIELD_IMPLEMENTATION_GUIDE] instanceof FHIRCanonical) { $this->addImplementationGuide($data[self::FIELD_IMPLEMENTATION_GUIDE]); - } elseif ($ext && is_scalar($data[self::FIELD_IMPLEMENTATION_GUIDE])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IMPLEMENTATION_GUIDE])) { $this->addImplementationGuide(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $data[self::FIELD_IMPLEMENTATION_GUIDE]] + $ext)); } else { $this->addImplementationGuide(new FHIRCanonical($data[self::FIELD_IMPLEMENTATION_GUIDE])); @@ -670,17 +709,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IMPORTS])) { foreach($data[self::FIELD_IMPORTS] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCanonical) { $this->addImports($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addImports(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addImports(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addImports(new FHIRCanonical(array_merge($v, $ext[$i]))); + } } else { $this->addImports(new FHIRCanonical($v)); } } } elseif ($data[self::FIELD_IMPORTS] instanceof FHIRCanonical) { $this->addImports($data[self::FIELD_IMPORTS]); - } elseif ($ext && is_scalar($data[self::FIELD_IMPORTS])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IMPORTS])) { $this->addImports(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $data[self::FIELD_IMPORTS]] + $ext)); } else { $this->addImports(new FHIRCanonical($data[self::FIELD_IMPORTS])); @@ -692,17 +738,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_INSTANTIATES])) { foreach($data[self::FIELD_INSTANTIATES] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCanonical) { $this->addInstantiates($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addInstantiates(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addInstantiates(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addInstantiates(new FHIRCanonical(array_merge($v, $ext[$i]))); + } } else { $this->addInstantiates(new FHIRCanonical($v)); } } } elseif ($data[self::FIELD_INSTANTIATES] instanceof FHIRCanonical) { $this->addInstantiates($data[self::FIELD_INSTANTIATES]); - } elseif ($ext && is_scalar($data[self::FIELD_INSTANTIATES])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_INSTANTIATES])) { $this->addInstantiates(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $data[self::FIELD_INSTANTIATES]] + $ext)); } else { $this->addInstantiates(new FHIRCanonical($data[self::FIELD_INSTANTIATES])); @@ -711,6 +764,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_JURISDICTION])) { if (is_array($data[self::FIELD_JURISDICTION])) { foreach($data[self::FIELD_JURISDICTION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addJurisdiction($v); } else { @@ -729,8 +785,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_KIND] instanceof FHIRCapabilityStatementKind) { $this->setKind($data[self::FIELD_KIND]); - } elseif ($ext && is_scalar($data[self::FIELD_KIND])) { - $this->setKind(new FHIRCapabilityStatementKind([FHIRCapabilityStatementKind::FIELD_VALUE => $data[self::FIELD_KIND]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_KIND])) { + $this->setKind(new FHIRCapabilityStatementKind([FHIRCapabilityStatementKind::FIELD_VALUE => $data[self::FIELD_KIND]] + $ext)); + } else if (is_array($data[self::FIELD_KIND])) { + $this->setKind(new FHIRCapabilityStatementKind(array_merge($ext, $data[self::FIELD_KIND]))); + } } else { $this->setKind(new FHIRCapabilityStatementKind($data[self::FIELD_KIND])); } @@ -738,6 +798,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_MESSAGING])) { if (is_array($data[self::FIELD_MESSAGING])) { foreach($data[self::FIELD_MESSAGING] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCapabilityStatementMessaging) { $this->addMessaging($v); } else { @@ -756,8 +819,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -768,17 +835,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_PATCH_FORMAT])) { foreach($data[self::FIELD_PATCH_FORMAT] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCode) { $this->addPatchFormat($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addPatchFormat(new FHIRCode([FHIRCode::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addPatchFormat(new FHIRCode([FHIRCode::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addPatchFormat(new FHIRCode(array_merge($v, $ext[$i]))); + } } else { $this->addPatchFormat(new FHIRCode($v)); } } } elseif ($data[self::FIELD_PATCH_FORMAT] instanceof FHIRCode) { $this->addPatchFormat($data[self::FIELD_PATCH_FORMAT]); - } elseif ($ext && is_scalar($data[self::FIELD_PATCH_FORMAT])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_PATCH_FORMAT])) { $this->addPatchFormat(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_PATCH_FORMAT]] + $ext)); } else { $this->addPatchFormat(new FHIRCode($data[self::FIELD_PATCH_FORMAT])); @@ -790,8 +864,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PUBLISHER] instanceof FHIRString) { $this->setPublisher($data[self::FIELD_PUBLISHER]); - } elseif ($ext && is_scalar($data[self::FIELD_PUBLISHER])) { - $this->setPublisher(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PUBLISHER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PUBLISHER])) { + $this->setPublisher(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PUBLISHER]] + $ext)); + } else if (is_array($data[self::FIELD_PUBLISHER])) { + $this->setPublisher(new FHIRString(array_merge($ext, $data[self::FIELD_PUBLISHER]))); + } } else { $this->setPublisher(new FHIRString($data[self::FIELD_PUBLISHER])); } @@ -802,8 +880,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PURPOSE] instanceof FHIRMarkdown) { $this->setPurpose($data[self::FIELD_PURPOSE]); - } elseif ($ext && is_scalar($data[self::FIELD_PURPOSE])) { - $this->setPurpose(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_PURPOSE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PURPOSE])) { + $this->setPurpose(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_PURPOSE]] + $ext)); + } else if (is_array($data[self::FIELD_PURPOSE])) { + $this->setPurpose(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_PURPOSE]))); + } } else { $this->setPurpose(new FHIRMarkdown($data[self::FIELD_PURPOSE])); } @@ -811,6 +893,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REST])) { if (is_array($data[self::FIELD_REST])) { foreach($data[self::FIELD_REST] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCapabilityStatementRest) { $this->addRest($v); } else { @@ -836,8 +921,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRPublicationStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRPublicationStatus([FHIRPublicationStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRPublicationStatus([FHIRPublicationStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRPublicationStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRPublicationStatus($data[self::FIELD_STATUS])); } @@ -848,8 +937,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TITLE] instanceof FHIRString) { $this->setTitle($data[self::FIELD_TITLE]); - } elseif ($ext && is_scalar($data[self::FIELD_TITLE])) { - $this->setTitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TITLE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TITLE])) { + $this->setTitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TITLE]] + $ext)); + } else if (is_array($data[self::FIELD_TITLE])) { + $this->setTitle(new FHIRString(array_merge($ext, $data[self::FIELD_TITLE]))); + } } else { $this->setTitle(new FHIRString($data[self::FIELD_TITLE])); } @@ -860,8 +953,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_URL] instanceof FHIRUri) { $this->setUrl($data[self::FIELD_URL]); - } elseif ($ext && is_scalar($data[self::FIELD_URL])) { - $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } else if (is_array($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri(array_merge($ext, $data[self::FIELD_URL]))); + } } else { $this->setUrl(new FHIRUri($data[self::FIELD_URL])); } @@ -869,6 +966,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_USE_CONTEXT])) { if (is_array($data[self::FIELD_USE_CONTEXT])) { foreach($data[self::FIELD_USE_CONTEXT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRUsageContext) { $this->addUseContext($v); } else { @@ -887,8 +987,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VERSION] instanceof FHIRString) { $this->setVersion($data[self::FIELD_VERSION]); - } elseif ($ext && is_scalar($data[self::FIELD_VERSION])) { - $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } else if (is_array($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString(array_merge($ext, $data[self::FIELD_VERSION]))); + } } else { $this->setVersion(new FHIRString($data[self::FIELD_VERSION])); } @@ -2507,7 +2611,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getContact())) { foreach($vs as $v) { if (null === $v) { @@ -2516,6 +2619,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_CONTACT, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getCopyright())) { $v->xmlSerialize($sxe->addChild(self::FIELD_COPYRIGHT, null, $v->_getFHIRXMLNamespace())); } @@ -2525,7 +2629,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESCRIPTION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getDocument())) { foreach($vs as $v) { if (null === $v) { @@ -2534,10 +2637,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_DOCUMENT, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getExperimental())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EXPERIMENTAL, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getFhirVersion())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FHIR_VERSION, null, $v->_getFHIRXMLNamespace())); } @@ -2561,6 +2664,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_IMPLEMENTATION_GUIDE, null, $v->_getFHIRXMLNamespace())); } } + if ([] !== ($vs = $this->getImports())) { foreach($vs as $v) { if (null === $v) { @@ -2569,6 +2673,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_IMPORTS, null, $v->_getFHIRXMLNamespace())); } } + if ([] !== ($vs = $this->getInstantiates())) { foreach($vs as $v) { if (null === $v) { @@ -2590,7 +2695,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getKind())) { $v->xmlSerialize($sxe->addChild(self::FIELD_KIND, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getMessaging())) { foreach($vs as $v) { if (null === $v) { @@ -2599,6 +2703,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_MESSAGING, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NAME, null, $v->_getFHIRXMLNamespace())); } @@ -2610,13 +2715,13 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_PATCH_FORMAT, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getPublisher())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PUBLISHER, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getPurpose())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PURPOSE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getRest())) { foreach($vs as $v) { if (null === $v) { @@ -2629,7 +2734,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getSoftware())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SOFTWARE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } @@ -2639,7 +2743,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getUrl())) { $v->xmlSerialize($sxe->addChild(self::FIELD_URL, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getUseContext())) { foreach($vs as $v) { if (null === $v) { @@ -2648,6 +2751,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_USE_CONTEXT, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getVersion())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VERSION, null, $v->_getFHIRXMLNamespace())); } @@ -2664,26 +2768,62 @@ public function jsonSerialize() $a[self::FIELD_CONTACT] = $vs; } if (null !== ($v = $this->getCopyright())) { - $a[self::FIELD_COPYRIGHT] = $v->getValue(); - $a[self::FIELD_COPYRIGHT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_COPYRIGHT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_COPYRIGHT_EXT] = $enc; + } + } else { + $a[self::FIELD_COPYRIGHT] = $v; + } } if (null !== ($v = $this->getDate())) { - $a[self::FIELD_DATE] = $v->getValue(); - $a[self::FIELD_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_DATE] = $v; + } } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if ([] !== ($vs = $this->getDocument())) { $a[self::FIELD_DOCUMENT] = $vs; } if (null !== ($v = $this->getExperimental())) { - $a[self::FIELD_EXPERIMENTAL] = $v->getValue(); - $a[self::FIELD_EXPERIMENTAL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EXPERIMENTAL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EXPERIMENTAL_EXT] = $enc; + } + } else { + $a[self::FIELD_EXPERIMENTAL] = $v; + } } if (null !== ($v = $this->getFhirVersion())) { - $a[self::FIELD_FHIR_VERSION] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FHIR_VERSION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FHIR_VERSION_EXT] = $enc; + } + } else { + $a[self::FIELD_FHIR_VERSION] = $v; + } } if ([] !== ($vs = $this->getFormat())) { $a[self::FIELD_FORMAT] = []; @@ -2691,8 +2831,17 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_FORMAT][] = $v->getValue(); - $a[self::FIELD_FORMAT_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FORMAT][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FORMAT_EXT][] = $enc; + } else { + $a[self::FIELD_FORMAT_EXT][] = null; + } + } else { + $a[self::FIELD_FORMAT][] = $v; + } } } if (null !== ($v = $this->getImplementation())) { @@ -2704,8 +2853,17 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_IMPLEMENTATION_GUIDE][] = $v->getValue(); - $a[self::FIELD_IMPLEMENTATION_GUIDE_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IMPLEMENTATION_GUIDE][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IMPLEMENTATION_GUIDE_EXT][] = $enc; + } else { + $a[self::FIELD_IMPLEMENTATION_GUIDE_EXT][] = null; + } + } else { + $a[self::FIELD_IMPLEMENTATION_GUIDE][] = $v; + } } } if ([] !== ($vs = $this->getImports())) { @@ -2714,8 +2872,17 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_IMPORTS][] = $v->getValue(); - $a[self::FIELD_IMPORTS_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IMPORTS][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IMPORTS_EXT][] = $enc; + } else { + $a[self::FIELD_IMPORTS_EXT][] = null; + } + } else { + $a[self::FIELD_IMPORTS][] = $v; + } } } if ([] !== ($vs = $this->getInstantiates())) { @@ -2724,22 +2891,46 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_INSTANTIATES][] = $v->getValue(); - $a[self::FIELD_INSTANTIATES_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_INSTANTIATES][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_INSTANTIATES_EXT][] = $enc; + } else { + $a[self::FIELD_INSTANTIATES_EXT][] = null; + } + } else { + $a[self::FIELD_INSTANTIATES][] = $v; + } } } if ([] !== ($vs = $this->getJurisdiction())) { $a[self::FIELD_JURISDICTION] = $vs; } if (null !== ($v = $this->getKind())) { - $a[self::FIELD_KIND] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_KIND] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_KIND_EXT] = $enc; + } + } else { + $a[self::FIELD_KIND] = $v; + } } if ([] !== ($vs = $this->getMessaging())) { $a[self::FIELD_MESSAGING] = $vs; } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if ([] !== ($vs = $this->getPatchFormat())) { $a[self::FIELD_PATCH_FORMAT] = []; @@ -2747,17 +2938,40 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_PATCH_FORMAT][] = $v->getValue(); - $a[self::FIELD_PATCH_FORMAT_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PATCH_FORMAT][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PATCH_FORMAT_EXT][] = $enc; + } else { + $a[self::FIELD_PATCH_FORMAT_EXT][] = null; + } + } else { + $a[self::FIELD_PATCH_FORMAT][] = $v; + } } } if (null !== ($v = $this->getPublisher())) { - $a[self::FIELD_PUBLISHER] = $v->getValue(); - $a[self::FIELD_PUBLISHER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PUBLISHER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PUBLISHER_EXT] = $enc; + } + } else { + $a[self::FIELD_PUBLISHER] = $v; + } } if (null !== ($v = $this->getPurpose())) { - $a[self::FIELD_PURPOSE] = $v->getValue(); - $a[self::FIELD_PURPOSE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PURPOSE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PURPOSE_EXT] = $enc; + } + } else { + $a[self::FIELD_PURPOSE] = $v; + } } if ([] !== ($vs = $this->getRest())) { $a[self::FIELD_REST] = $vs; @@ -2766,22 +2980,51 @@ public function jsonSerialize() $a[self::FIELD_SOFTWARE] = $v; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getTitle())) { - $a[self::FIELD_TITLE] = $v->getValue(); - $a[self::FIELD_TITLE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TITLE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TITLE_EXT] = $enc; + } + } else { + $a[self::FIELD_TITLE] = $v; + } } if (null !== ($v = $this->getUrl())) { - $a[self::FIELD_URL] = $v->getValue(); - $a[self::FIELD_URL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_URL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_URL_EXT] = $enc; + } + } else { + $a[self::FIELD_URL] = $v; + } } if ([] !== ($vs = $this->getUseContext())) { $a[self::FIELD_USE_CONTEXT] = $vs; } if (null !== ($v = $this->getVersion())) { - $a[self::FIELD_VERSION] = $v->getValue(); - $a[self::FIELD_VERSION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VERSION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VERSION_EXT] = $enc; + } + } else { + $a[self::FIELD_VERSION] = $v; + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRCarePlan.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRCarePlan.php index ba19da5e2b..605b8a9f01 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRCarePlan.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRCarePlan.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -92,10 +92,6 @@ class FHIRCarePlan extends FHIRDomainResource implements PHPFHIRContainedTypeInt { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CARE_PLAN; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ACTIVITY = 'activity'; const FIELD_ADDRESSES = 'addresses'; const FIELD_AUTHOR = 'author'; @@ -405,6 +401,9 @@ class FHIRCarePlan extends FHIRDomainResource implements PHPFHIRContainedTypeInt */ protected $title = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRCarePlan Constructor * @param null|array $data @@ -424,6 +423,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ACTIVITY])) { if (is_array($data[self::FIELD_ACTIVITY])) { foreach($data[self::FIELD_ACTIVITY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCarePlanActivity) { $this->addActivity($v); } else { @@ -439,6 +441,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ADDRESSES])) { if (is_array($data[self::FIELD_ADDRESSES])) { foreach($data[self::FIELD_ADDRESSES] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addAddresses($v); } else { @@ -461,6 +466,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_BASED_ON])) { if (is_array($data[self::FIELD_BASED_ON])) { foreach($data[self::FIELD_BASED_ON] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addBasedOn($v); } else { @@ -476,6 +484,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CARE_TEAM])) { if (is_array($data[self::FIELD_CARE_TEAM])) { foreach($data[self::FIELD_CARE_TEAM] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addCareTeam($v); } else { @@ -491,6 +502,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CATEGORY])) { if (is_array($data[self::FIELD_CATEGORY])) { foreach($data[self::FIELD_CATEGORY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addCategory($v); } else { @@ -506,6 +520,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CONTRIBUTOR])) { if (is_array($data[self::FIELD_CONTRIBUTOR])) { foreach($data[self::FIELD_CONTRIBUTOR] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addContributor($v); } else { @@ -524,8 +541,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CREATED] instanceof FHIRDateTime) { $this->setCreated($data[self::FIELD_CREATED]); - } elseif ($ext && is_scalar($data[self::FIELD_CREATED])) { - $this->setCreated(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_CREATED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CREATED])) { + $this->setCreated(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_CREATED]] + $ext)); + } else if (is_array($data[self::FIELD_CREATED])) { + $this->setCreated(new FHIRDateTime(array_merge($ext, $data[self::FIELD_CREATED]))); + } } else { $this->setCreated(new FHIRDateTime($data[self::FIELD_CREATED])); } @@ -536,8 +557,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -552,6 +577,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_GOAL])) { if (is_array($data[self::FIELD_GOAL])) { foreach($data[self::FIELD_GOAL] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addGoal($v); } else { @@ -570,17 +598,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -592,17 +627,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_INSTANTIATES_CANONICAL])) { foreach($data[self::FIELD_INSTANTIATES_CANONICAL] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCanonical) { $this->addInstantiatesCanonical($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addInstantiatesCanonical(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addInstantiatesCanonical(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addInstantiatesCanonical(new FHIRCanonical(array_merge($v, $ext[$i]))); + } } else { $this->addInstantiatesCanonical(new FHIRCanonical($v)); } } } elseif ($data[self::FIELD_INSTANTIATES_CANONICAL] instanceof FHIRCanonical) { $this->addInstantiatesCanonical($data[self::FIELD_INSTANTIATES_CANONICAL]); - } elseif ($ext && is_scalar($data[self::FIELD_INSTANTIATES_CANONICAL])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_INSTANTIATES_CANONICAL])) { $this->addInstantiatesCanonical(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $data[self::FIELD_INSTANTIATES_CANONICAL]] + $ext)); } else { $this->addInstantiatesCanonical(new FHIRCanonical($data[self::FIELD_INSTANTIATES_CANONICAL])); @@ -614,17 +656,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_INSTANTIATES_URI])) { foreach($data[self::FIELD_INSTANTIATES_URI] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRUri) { $this->addInstantiatesUri($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addInstantiatesUri(new FHIRUri([FHIRUri::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addInstantiatesUri(new FHIRUri([FHIRUri::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addInstantiatesUri(new FHIRUri(array_merge($v, $ext[$i]))); + } } else { $this->addInstantiatesUri(new FHIRUri($v)); } } } elseif ($data[self::FIELD_INSTANTIATES_URI] instanceof FHIRUri) { $this->addInstantiatesUri($data[self::FIELD_INSTANTIATES_URI]); - } elseif ($ext && is_scalar($data[self::FIELD_INSTANTIATES_URI])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_INSTANTIATES_URI])) { $this->addInstantiatesUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_INSTANTIATES_URI]] + $ext)); } else { $this->addInstantiatesUri(new FHIRUri($data[self::FIELD_INSTANTIATES_URI])); @@ -636,8 +685,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_INTENT] instanceof FHIRCarePlanIntent) { $this->setIntent($data[self::FIELD_INTENT]); - } elseif ($ext && is_scalar($data[self::FIELD_INTENT])) { - $this->setIntent(new FHIRCarePlanIntent([FHIRCarePlanIntent::FIELD_VALUE => $data[self::FIELD_INTENT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_INTENT])) { + $this->setIntent(new FHIRCarePlanIntent([FHIRCarePlanIntent::FIELD_VALUE => $data[self::FIELD_INTENT]] + $ext)); + } else if (is_array($data[self::FIELD_INTENT])) { + $this->setIntent(new FHIRCarePlanIntent(array_merge($ext, $data[self::FIELD_INTENT]))); + } } else { $this->setIntent(new FHIRCarePlanIntent($data[self::FIELD_INTENT])); } @@ -645,6 +698,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_NOTE])) { if (is_array($data[self::FIELD_NOTE])) { foreach($data[self::FIELD_NOTE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRAnnotation) { $this->addNote($v); } else { @@ -660,6 +716,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PART_OF])) { if (is_array($data[self::FIELD_PART_OF])) { foreach($data[self::FIELD_PART_OF] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addPartOf($v); } else { @@ -682,6 +741,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REPLACES])) { if (is_array($data[self::FIELD_REPLACES])) { foreach($data[self::FIELD_REPLACES] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addReplaces($v); } else { @@ -700,8 +762,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRRequestStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRRequestStatus([FHIRRequestStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRRequestStatus([FHIRRequestStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRRequestStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRRequestStatus($data[self::FIELD_STATUS])); } @@ -716,6 +782,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SUPPORTING_INFO])) { if (is_array($data[self::FIELD_SUPPORTING_INFO])) { foreach($data[self::FIELD_SUPPORTING_INFO] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addSupportingInfo($v); } else { @@ -734,8 +803,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TITLE] instanceof FHIRString) { $this->setTitle($data[self::FIELD_TITLE]); - } elseif ($ext && is_scalar($data[self::FIELD_TITLE])) { - $this->setTitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TITLE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TITLE])) { + $this->setTitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TITLE]] + $ext)); + } else if (is_array($data[self::FIELD_TITLE])) { + $this->setTitle(new FHIRString(array_merge($ext, $data[self::FIELD_TITLE]))); + } } else { $this->setTitle(new FHIRString($data[self::FIELD_TITLE])); } @@ -2119,7 +2192,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getActivity())) { foreach($vs as $v) { if (null === $v) { @@ -2141,7 +2213,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getAuthor())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AUTHOR, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getBasedOn())) { foreach($vs as $v) { if (null === $v) { @@ -2177,17 +2248,16 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_CONTRIBUTOR, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getCreated())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CREATED, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getDescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESCRIPTION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getEncounter())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ENCOUNTER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getGoal())) { foreach($vs as $v) { if (null === $v) { @@ -2205,6 +2275,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } } + if ([] !== ($vs = $this->getInstantiatesCanonical())) { foreach($vs as $v) { if (null === $v) { @@ -2213,6 +2284,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_INSTANTIATES_CANONICAL, null, $v->_getFHIRXMLNamespace())); } } + if ([] !== ($vs = $this->getInstantiatesUri())) { foreach($vs as $v) { if (null === $v) { @@ -2225,7 +2297,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getIntent())) { $v->xmlSerialize($sxe->addChild(self::FIELD_INTENT, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getNote())) { foreach($vs as $v) { if (null === $v) { @@ -2247,7 +2318,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getReplaces())) { foreach($vs as $v) { if (null === $v) { @@ -2260,11 +2330,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSubject())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBJECT, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getSupportingInfo())) { foreach($vs as $v) { if (null === $v) { @@ -2273,6 +2341,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_SUPPORTING_INFO, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getTitle())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TITLE, null, $v->_getFHIRXMLNamespace())); } @@ -2307,12 +2376,26 @@ public function jsonSerialize() $a[self::FIELD_CONTRIBUTOR] = $vs; } if (null !== ($v = $this->getCreated())) { - $a[self::FIELD_CREATED] = $v->getValue(); - $a[self::FIELD_CREATED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CREATED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CREATED_EXT] = $enc; + } + } else { + $a[self::FIELD_CREATED] = $v; + } } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if (null !== ($v = $this->getEncounter())) { $a[self::FIELD_ENCOUNTER] = $v; @@ -2321,7 +2404,23 @@ public function jsonSerialize() $a[self::FIELD_GOAL] = $vs; } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if ([] !== ($vs = $this->getInstantiatesCanonical())) { $a[self::FIELD_INSTANTIATES_CANONICAL] = []; @@ -2329,8 +2428,17 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_INSTANTIATES_CANONICAL][] = $v->getValue(); - $a[self::FIELD_INSTANTIATES_CANONICAL_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_INSTANTIATES_CANONICAL][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_INSTANTIATES_CANONICAL_EXT][] = $enc; + } else { + $a[self::FIELD_INSTANTIATES_CANONICAL_EXT][] = null; + } + } else { + $a[self::FIELD_INSTANTIATES_CANONICAL][] = $v; + } } } if ([] !== ($vs = $this->getInstantiatesUri())) { @@ -2339,12 +2447,29 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_INSTANTIATES_URI][] = $v->getValue(); - $a[self::FIELD_INSTANTIATES_URI_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_INSTANTIATES_URI][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_INSTANTIATES_URI_EXT][] = $enc; + } else { + $a[self::FIELD_INSTANTIATES_URI_EXT][] = null; + } + } else { + $a[self::FIELD_INSTANTIATES_URI][] = $v; + } } } if (null !== ($v = $this->getIntent())) { - $a[self::FIELD_INTENT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_INTENT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_INTENT_EXT] = $enc; + } + } else { + $a[self::FIELD_INTENT] = $v; + } } if ([] !== ($vs = $this->getNote())) { $a[self::FIELD_NOTE] = $vs; @@ -2359,7 +2484,15 @@ public function jsonSerialize() $a[self::FIELD_REPLACES] = $vs; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getSubject())) { $a[self::FIELD_SUBJECT] = $v; @@ -2368,8 +2501,15 @@ public function jsonSerialize() $a[self::FIELD_SUPPORTING_INFO] = $vs; } if (null !== ($v = $this->getTitle())) { - $a[self::FIELD_TITLE] = $v->getValue(); - $a[self::FIELD_TITLE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TITLE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TITLE_EXT] = $enc; + } + } else { + $a[self::FIELD_TITLE] = $v; + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRCareTeam.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRCareTeam.php index 6888b36038..71395136b0 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRCareTeam.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRCareTeam.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -88,10 +88,6 @@ class FHIRCareTeam extends FHIRDomainResource implements PHPFHIRContainedTypeInt { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CARE_TEAM; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CATEGORY = 'category'; const FIELD_ENCOUNTER = 'encounter'; const FIELD_IDENTIFIER = 'identifier'; @@ -263,6 +259,9 @@ class FHIRCareTeam extends FHIRDomainResource implements PHPFHIRContainedTypeInt */ protected $telecom = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRCareTeam Constructor * @param null|array $data @@ -282,6 +281,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CATEGORY])) { if (is_array($data[self::FIELD_CATEGORY])) { foreach($data[self::FIELD_CATEGORY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addCategory($v); } else { @@ -307,17 +309,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -326,6 +335,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_MANAGING_ORGANIZATION])) { if (is_array($data[self::FIELD_MANAGING_ORGANIZATION])) { foreach($data[self::FIELD_MANAGING_ORGANIZATION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addManagingOrganization($v); } else { @@ -344,8 +356,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -353,6 +369,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_NOTE])) { if (is_array($data[self::FIELD_NOTE])) { foreach($data[self::FIELD_NOTE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRAnnotation) { $this->addNote($v); } else { @@ -368,6 +387,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PARTICIPANT])) { if (is_array($data[self::FIELD_PARTICIPANT])) { foreach($data[self::FIELD_PARTICIPANT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCareTeamParticipant) { $this->addParticipant($v); } else { @@ -390,6 +412,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REASON_CODE])) { if (is_array($data[self::FIELD_REASON_CODE])) { foreach($data[self::FIELD_REASON_CODE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addReasonCode($v); } else { @@ -405,6 +430,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REASON_REFERENCE])) { if (is_array($data[self::FIELD_REASON_REFERENCE])) { foreach($data[self::FIELD_REASON_REFERENCE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addReasonReference($v); } else { @@ -423,8 +451,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRCareTeamStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRCareTeamStatus([FHIRCareTeamStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRCareTeamStatus([FHIRCareTeamStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRCareTeamStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRCareTeamStatus($data[self::FIELD_STATUS])); } @@ -442,17 +474,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_TELECOM])) { foreach($data[self::FIELD_TELECOM] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContactPoint) { $this->addTelecom($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addTelecom(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addTelecom(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addTelecom(new FHIRContactPoint(array_merge($v, $ext[$i]))); + } } else { $this->addTelecom(new FHIRContactPoint($v)); } } } elseif ($data[self::FIELD_TELECOM] instanceof FHIRContactPoint) { $this->addTelecom($data[self::FIELD_TELECOM]); - } elseif ($ext && is_scalar($data[self::FIELD_TELECOM])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_TELECOM])) { $this->addTelecom(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $data[self::FIELD_TELECOM]] + $ext)); } else { $this->addTelecom(new FHIRContactPoint($data[self::FIELD_TELECOM])); @@ -1260,7 +1299,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getCategory())) { foreach($vs as $v) { if (null === $v) { @@ -1273,7 +1311,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getEncounter())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ENCOUNTER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -1291,10 +1328,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_MANAGING_ORGANIZATION, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NAME, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getNote())) { foreach($vs as $v) { if (null === $v) { @@ -1316,7 +1353,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getReasonCode())) { foreach($vs as $v) { if (null === $v) { @@ -1338,11 +1374,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSubject())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBJECT, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getTelecom())) { foreach($vs as $v) { if (null === $v) { @@ -1351,6 +1385,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_TELECOM, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } @@ -1367,14 +1402,37 @@ public function jsonSerialize() $a[self::FIELD_ENCOUNTER] = $v; } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if ([] !== ($vs = $this->getManagingOrganization())) { $a[self::FIELD_MANAGING_ORGANIZATION] = $vs; } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if ([] !== ($vs = $this->getNote())) { $a[self::FIELD_NOTE] = $vs; @@ -1392,13 +1450,37 @@ public function jsonSerialize() $a[self::FIELD_REASON_REFERENCE] = $vs; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getSubject())) { $a[self::FIELD_SUBJECT] = $v; } if ([] !== ($vs = $this->getTelecom())) { - $a[self::FIELD_TELECOM] = $vs; + $a[self::FIELD_TELECOM] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TELECOM][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TELECOM_EXT][] = $enc; + } else { + $a[self::FIELD_TELECOM_EXT][] = null; + } + } else { + $a[self::FIELD_TELECOM][] = $v; + } + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRCatalogEntry.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRCatalogEntry.php index ec1a83abee..ff01522f06 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRCatalogEntry.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRCatalogEntry.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -86,10 +86,6 @@ class FHIRCatalogEntry extends FHIRDomainResource implements PHPFHIRContainedTyp { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CATALOG_ENTRY; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ADDITIONAL_CHARACTERISTIC = 'additionalCharacteristic'; const FIELD_ADDITIONAL_CLASSIFICATION = 'additionalClassification'; const FIELD_ADDITIONAL_IDENTIFIER = 'additionalIdentifier'; @@ -264,6 +260,9 @@ class FHIRCatalogEntry extends FHIRDomainResource implements PHPFHIRContainedTyp */ protected $validityPeriod = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRCatalogEntry Constructor * @param null|array $data @@ -283,6 +282,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ADDITIONAL_CHARACTERISTIC])) { if (is_array($data[self::FIELD_ADDITIONAL_CHARACTERISTIC])) { foreach($data[self::FIELD_ADDITIONAL_CHARACTERISTIC] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addAdditionalCharacteristic($v); } else { @@ -298,6 +300,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ADDITIONAL_CLASSIFICATION])) { if (is_array($data[self::FIELD_ADDITIONAL_CLASSIFICATION])) { foreach($data[self::FIELD_ADDITIONAL_CLASSIFICATION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addAdditionalClassification($v); } else { @@ -316,17 +321,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_ADDITIONAL_IDENTIFIER])) { foreach($data[self::FIELD_ADDITIONAL_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addAdditionalIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addAdditionalIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addAdditionalIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addAdditionalIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addAdditionalIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_ADDITIONAL_IDENTIFIER] instanceof FHIRIdentifier) { $this->addAdditionalIdentifier($data[self::FIELD_ADDITIONAL_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_ADDITIONAL_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_ADDITIONAL_IDENTIFIER])) { $this->addAdditionalIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_ADDITIONAL_IDENTIFIER]] + $ext)); } else { $this->addAdditionalIdentifier(new FHIRIdentifier($data[self::FIELD_ADDITIONAL_IDENTIFIER])); @@ -335,6 +347,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CLASSIFICATION])) { if (is_array($data[self::FIELD_CLASSIFICATION])) { foreach($data[self::FIELD_CLASSIFICATION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addClassification($v); } else { @@ -353,17 +368,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -375,8 +397,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_LAST_UPDATED] instanceof FHIRDateTime) { $this->setLastUpdated($data[self::FIELD_LAST_UPDATED]); - } elseif ($ext && is_scalar($data[self::FIELD_LAST_UPDATED])) { - $this->setLastUpdated(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_LAST_UPDATED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_LAST_UPDATED])) { + $this->setLastUpdated(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_LAST_UPDATED]] + $ext)); + } else if (is_array($data[self::FIELD_LAST_UPDATED])) { + $this->setLastUpdated(new FHIRDateTime(array_merge($ext, $data[self::FIELD_LAST_UPDATED]))); + } } else { $this->setLastUpdated(new FHIRDateTime($data[self::FIELD_LAST_UPDATED])); } @@ -387,8 +413,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ORDERABLE] instanceof FHIRBoolean) { $this->setOrderable($data[self::FIELD_ORDERABLE]); - } elseif ($ext && is_scalar($data[self::FIELD_ORDERABLE])) { - $this->setOrderable(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_ORDERABLE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ORDERABLE])) { + $this->setOrderable(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_ORDERABLE]] + $ext)); + } else if (is_array($data[self::FIELD_ORDERABLE])) { + $this->setOrderable(new FHIRBoolean(array_merge($ext, $data[self::FIELD_ORDERABLE]))); + } } else { $this->setOrderable(new FHIRBoolean($data[self::FIELD_ORDERABLE])); } @@ -403,6 +433,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_RELATED_ENTRY])) { if (is_array($data[self::FIELD_RELATED_ENTRY])) { foreach($data[self::FIELD_RELATED_ENTRY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCatalogEntryRelatedEntry) { $this->addRelatedEntry($v); } else { @@ -421,8 +454,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRPublicationStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRPublicationStatus([FHIRPublicationStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRPublicationStatus([FHIRPublicationStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRPublicationStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRPublicationStatus($data[self::FIELD_STATUS])); } @@ -440,8 +477,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALID_TO] instanceof FHIRDateTime) { $this->setValidTo($data[self::FIELD_VALID_TO]); - } elseif ($ext && is_scalar($data[self::FIELD_VALID_TO])) { - $this->setValidTo(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_VALID_TO]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALID_TO])) { + $this->setValidTo(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_VALID_TO]] + $ext)); + } else if (is_array($data[self::FIELD_VALID_TO])) { + $this->setValidTo(new FHIRDateTime(array_merge($ext, $data[self::FIELD_VALID_TO]))); + } } else { $this->setValidTo(new FHIRDateTime($data[self::FIELD_VALID_TO])); } @@ -1219,7 +1260,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getAdditionalCharacteristic())) { foreach($vs as $v) { if (null === $v) { @@ -1264,17 +1304,16 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getLastUpdated())) { $v->xmlSerialize($sxe->addChild(self::FIELD_LAST_UPDATED, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getOrderable())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ORDERABLE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getReferencedItem())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REFERENCED_ITEM, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getRelatedEntry())) { foreach($vs as $v) { if (null === $v) { @@ -1287,14 +1326,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getValidTo())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALID_TO, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValidityPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALIDITY_PERIOD, null, $v->_getFHIRXMLNamespace())); } @@ -1314,21 +1351,67 @@ public function jsonSerialize() $a[self::FIELD_ADDITIONAL_CLASSIFICATION] = $vs; } if ([] !== ($vs = $this->getAdditionalIdentifier())) { - $a[self::FIELD_ADDITIONAL_IDENTIFIER] = $vs; + $a[self::FIELD_ADDITIONAL_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ADDITIONAL_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ADDITIONAL_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_ADDITIONAL_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_ADDITIONAL_IDENTIFIER][] = $v; + } + } } if ([] !== ($vs = $this->getClassification())) { $a[self::FIELD_CLASSIFICATION] = $vs; } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if (null !== ($v = $this->getLastUpdated())) { - $a[self::FIELD_LAST_UPDATED] = $v->getValue(); - $a[self::FIELD_LAST_UPDATED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_LAST_UPDATED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_LAST_UPDATED_EXT] = $enc; + } + } else { + $a[self::FIELD_LAST_UPDATED] = $v; + } } if (null !== ($v = $this->getOrderable())) { - $a[self::FIELD_ORDERABLE] = $v->getValue(); - $a[self::FIELD_ORDERABLE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ORDERABLE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ORDERABLE_EXT] = $enc; + } + } else { + $a[self::FIELD_ORDERABLE] = $v; + } } if (null !== ($v = $this->getReferencedItem())) { $a[self::FIELD_REFERENCED_ITEM] = $v; @@ -1337,14 +1420,29 @@ public function jsonSerialize() $a[self::FIELD_RELATED_ENTRY] = $vs; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getType())) { $a[self::FIELD_TYPE] = $v; } if (null !== ($v = $this->getValidTo())) { - $a[self::FIELD_VALID_TO] = $v->getValue(); - $a[self::FIELD_VALID_TO_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALID_TO] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALID_TO_EXT] = $enc; + } + } else { + $a[self::FIELD_VALID_TO] = $v; + } } if (null !== ($v = $this->getValidityPeriod())) { $a[self::FIELD_VALIDITY_PERIOD] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRChargeItem.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRChargeItem.php index f0c1a4650a..e55e096d21 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRChargeItem.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRChargeItem.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -97,10 +97,6 @@ class FHIRChargeItem extends FHIRDomainResource implements PHPFHIRContainedTypeI { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CHARGE_ITEM; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ACCOUNT = 'account'; const FIELD_BODYSITE = 'bodysite'; const FIELD_CODE = 'code'; @@ -490,6 +486,9 @@ class FHIRChargeItem extends FHIRDomainResource implements PHPFHIRContainedTypeI */ protected $supportingInformation = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRChargeItem Constructor * @param null|array $data @@ -509,6 +508,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ACCOUNT])) { if (is_array($data[self::FIELD_ACCOUNT])) { foreach($data[self::FIELD_ACCOUNT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addAccount($v); } else { @@ -524,6 +526,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_BODYSITE])) { if (is_array($data[self::FIELD_BODYSITE])) { foreach($data[self::FIELD_BODYSITE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addBodysite($v); } else { @@ -563,17 +568,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_DEFINITION_CANONICAL])) { foreach($data[self::FIELD_DEFINITION_CANONICAL] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCanonical) { $this->addDefinitionCanonical($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addDefinitionCanonical(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addDefinitionCanonical(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addDefinitionCanonical(new FHIRCanonical(array_merge($v, $ext[$i]))); + } } else { $this->addDefinitionCanonical(new FHIRCanonical($v)); } } } elseif ($data[self::FIELD_DEFINITION_CANONICAL] instanceof FHIRCanonical) { $this->addDefinitionCanonical($data[self::FIELD_DEFINITION_CANONICAL]); - } elseif ($ext && is_scalar($data[self::FIELD_DEFINITION_CANONICAL])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_DEFINITION_CANONICAL])) { $this->addDefinitionCanonical(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $data[self::FIELD_DEFINITION_CANONICAL]] + $ext)); } else { $this->addDefinitionCanonical(new FHIRCanonical($data[self::FIELD_DEFINITION_CANONICAL])); @@ -585,17 +597,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_DEFINITION_URI])) { foreach($data[self::FIELD_DEFINITION_URI] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRUri) { $this->addDefinitionUri($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addDefinitionUri(new FHIRUri([FHIRUri::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addDefinitionUri(new FHIRUri([FHIRUri::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addDefinitionUri(new FHIRUri(array_merge($v, $ext[$i]))); + } } else { $this->addDefinitionUri(new FHIRUri($v)); } } } elseif ($data[self::FIELD_DEFINITION_URI] instanceof FHIRUri) { $this->addDefinitionUri($data[self::FIELD_DEFINITION_URI]); - } elseif ($ext && is_scalar($data[self::FIELD_DEFINITION_URI])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_DEFINITION_URI])) { $this->addDefinitionUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_DEFINITION_URI]] + $ext)); } else { $this->addDefinitionUri(new FHIRUri($data[self::FIELD_DEFINITION_URI])); @@ -607,8 +626,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ENTERED_DATE] instanceof FHIRDateTime) { $this->setEnteredDate($data[self::FIELD_ENTERED_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_ENTERED_DATE])) { - $this->setEnteredDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_ENTERED_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ENTERED_DATE])) { + $this->setEnteredDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_ENTERED_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_ENTERED_DATE])) { + $this->setEnteredDate(new FHIRDateTime(array_merge($ext, $data[self::FIELD_ENTERED_DATE]))); + } } else { $this->setEnteredDate(new FHIRDateTime($data[self::FIELD_ENTERED_DATE])); } @@ -626,8 +649,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_FACTOR_OVERRIDE] instanceof FHIRDecimal) { $this->setFactorOverride($data[self::FIELD_FACTOR_OVERRIDE]); - } elseif ($ext && is_scalar($data[self::FIELD_FACTOR_OVERRIDE])) { - $this->setFactorOverride(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_FACTOR_OVERRIDE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_FACTOR_OVERRIDE])) { + $this->setFactorOverride(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_FACTOR_OVERRIDE]] + $ext)); + } else if (is_array($data[self::FIELD_FACTOR_OVERRIDE])) { + $this->setFactorOverride(new FHIRDecimal(array_merge($ext, $data[self::FIELD_FACTOR_OVERRIDE]))); + } } else { $this->setFactorOverride(new FHIRDecimal($data[self::FIELD_FACTOR_OVERRIDE])); } @@ -638,17 +665,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -657,6 +691,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_NOTE])) { if (is_array($data[self::FIELD_NOTE])) { foreach($data[self::FIELD_NOTE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRAnnotation) { $this->addNote($v); } else { @@ -675,8 +712,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_OCCURRENCE_DATE_TIME] instanceof FHIRDateTime) { $this->setOccurrenceDateTime($data[self::FIELD_OCCURRENCE_DATE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_OCCURRENCE_DATE_TIME])) { - $this->setOccurrenceDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_OCCURRENCE_DATE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_OCCURRENCE_DATE_TIME])) { + $this->setOccurrenceDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_OCCURRENCE_DATE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_OCCURRENCE_DATE_TIME])) { + $this->setOccurrenceDateTime(new FHIRDateTime(array_merge($ext, $data[self::FIELD_OCCURRENCE_DATE_TIME]))); + } } else { $this->setOccurrenceDateTime(new FHIRDateTime($data[self::FIELD_OCCURRENCE_DATE_TIME])); } @@ -701,8 +742,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_OVERRIDE_REASON] instanceof FHIRString) { $this->setOverrideReason($data[self::FIELD_OVERRIDE_REASON]); - } elseif ($ext && is_scalar($data[self::FIELD_OVERRIDE_REASON])) { - $this->setOverrideReason(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_OVERRIDE_REASON]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_OVERRIDE_REASON])) { + $this->setOverrideReason(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_OVERRIDE_REASON]] + $ext)); + } else if (is_array($data[self::FIELD_OVERRIDE_REASON])) { + $this->setOverrideReason(new FHIRString(array_merge($ext, $data[self::FIELD_OVERRIDE_REASON]))); + } } else { $this->setOverrideReason(new FHIRString($data[self::FIELD_OVERRIDE_REASON])); } @@ -710,6 +755,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PART_OF])) { if (is_array($data[self::FIELD_PART_OF])) { foreach($data[self::FIELD_PART_OF] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addPartOf($v); } else { @@ -725,6 +773,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PERFORMER])) { if (is_array($data[self::FIELD_PERFORMER])) { foreach($data[self::FIELD_PERFORMER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRChargeItemPerformer) { $this->addPerformer($v); } else { @@ -750,8 +801,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PRICE_OVERRIDE] instanceof FHIRMoney) { $this->setPriceOverride($data[self::FIELD_PRICE_OVERRIDE]); - } elseif ($ext && is_scalar($data[self::FIELD_PRICE_OVERRIDE])) { - $this->setPriceOverride(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_PRICE_OVERRIDE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PRICE_OVERRIDE])) { + $this->setPriceOverride(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_PRICE_OVERRIDE]] + $ext)); + } else if (is_array($data[self::FIELD_PRICE_OVERRIDE])) { + $this->setPriceOverride(new FHIRMoney(array_merge($ext, $data[self::FIELD_PRICE_OVERRIDE]))); + } } else { $this->setPriceOverride(new FHIRMoney($data[self::FIELD_PRICE_OVERRIDE])); } @@ -776,8 +831,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_QUANTITY] instanceof FHIRQuantity) { $this->setQuantity($data[self::FIELD_QUANTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_QUANTITY])) { - $this->setQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_QUANTITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_QUANTITY])) { + $this->setQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_QUANTITY])) { + $this->setQuantity(new FHIRQuantity(array_merge($ext, $data[self::FIELD_QUANTITY]))); + } } else { $this->setQuantity(new FHIRQuantity($data[self::FIELD_QUANTITY])); } @@ -785,6 +844,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REASON])) { if (is_array($data[self::FIELD_REASON])) { foreach($data[self::FIELD_REASON] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addReason($v); } else { @@ -807,6 +869,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SERVICE])) { if (is_array($data[self::FIELD_SERVICE])) { foreach($data[self::FIELD_SERVICE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addService($v); } else { @@ -825,8 +890,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRChargeItemStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRChargeItemStatus([FHIRChargeItemStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRChargeItemStatus([FHIRChargeItemStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRChargeItemStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRChargeItemStatus($data[self::FIELD_STATUS])); } @@ -841,6 +910,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SUPPORTING_INFORMATION])) { if (is_array($data[self::FIELD_SUPPORTING_INFORMATION])) { foreach($data[self::FIELD_SUPPORTING_INFORMATION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addSupportingInformation($v); } else { @@ -2362,7 +2434,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getAccount())) { foreach($vs as $v) { if (null === $v) { @@ -2384,11 +2455,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getContext())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CONTEXT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getCostCenter())) { $v->xmlSerialize($sxe->addChild(self::FIELD_COST_CENTER, null, $v->_getFHIRXMLNamespace())); } @@ -2400,6 +2469,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_DEFINITION_CANONICAL, null, $v->_getFHIRXMLNamespace())); } } + if ([] !== ($vs = $this->getDefinitionUri())) { foreach($vs as $v) { if (null === $v) { @@ -2408,17 +2478,16 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_DEFINITION_URI, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getEnteredDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ENTERED_DATE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getEnterer())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ENTERER, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getFactorOverride())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FACTOR_OVERRIDE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -2436,21 +2505,19 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_NOTE, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getOccurrenceDateTime())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OCCURRENCE_DATE_TIME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOccurrencePeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OCCURRENCE_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOccurrenceTiming())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OCCURRENCE_TIMING, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getOverrideReason())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OVERRIDE_REASON, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getPartOf())) { foreach($vs as $v) { if (null === $v) { @@ -2472,23 +2539,18 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getPerformingOrganization())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PERFORMING_ORGANIZATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPriceOverride())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PRICE_OVERRIDE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getProductCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PRODUCT_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getProductReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PRODUCT_REFERENCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_QUANTITY, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getReason())) { foreach($vs as $v) { if (null === $v) { @@ -2501,7 +2563,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getRequestingOrganization())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REQUESTING_ORGANIZATION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getService())) { foreach($vs as $v) { if (null === $v) { @@ -2514,11 +2575,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSubject())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBJECT, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getSupportingInformation())) { foreach($vs as $v) { if (null === $v) { @@ -2527,6 +2586,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_SUPPORTING_INFORMATION, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } @@ -2557,8 +2617,17 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_DEFINITION_CANONICAL][] = $v->getValue(); - $a[self::FIELD_DEFINITION_CANONICAL_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DEFINITION_CANONICAL][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DEFINITION_CANONICAL_EXT][] = $enc; + } else { + $a[self::FIELD_DEFINITION_CANONICAL_EXT][] = null; + } + } else { + $a[self::FIELD_DEFINITION_CANONICAL][] = $v; + } } } if ([] !== ($vs = $this->getDefinitionUri())) { @@ -2567,30 +2636,76 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_DEFINITION_URI][] = $v->getValue(); - $a[self::FIELD_DEFINITION_URI_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DEFINITION_URI][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DEFINITION_URI_EXT][] = $enc; + } else { + $a[self::FIELD_DEFINITION_URI_EXT][] = null; + } + } else { + $a[self::FIELD_DEFINITION_URI][] = $v; + } } } if (null !== ($v = $this->getEnteredDate())) { - $a[self::FIELD_ENTERED_DATE] = $v->getValue(); - $a[self::FIELD_ENTERED_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ENTERED_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ENTERED_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_ENTERED_DATE] = $v; + } } if (null !== ($v = $this->getEnterer())) { $a[self::FIELD_ENTERER] = $v; } if (null !== ($v = $this->getFactorOverride())) { - $a[self::FIELD_FACTOR_OVERRIDE] = $v->getValue(); - $a[self::FIELD_FACTOR_OVERRIDE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FACTOR_OVERRIDE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FACTOR_OVERRIDE_EXT] = $enc; + } + } else { + $a[self::FIELD_FACTOR_OVERRIDE] = $v; + } } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if ([] !== ($vs = $this->getNote())) { $a[self::FIELD_NOTE] = $vs; } if (null !== ($v = $this->getOccurrenceDateTime())) { - $a[self::FIELD_OCCURRENCE_DATE_TIME] = $v->getValue(); - $a[self::FIELD_OCCURRENCE_DATE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_OCCURRENCE_DATE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_OCCURRENCE_DATE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_OCCURRENCE_DATE_TIME] = $v; + } } if (null !== ($v = $this->getOccurrencePeriod())) { $a[self::FIELD_OCCURRENCE_PERIOD] = $v; @@ -2599,8 +2714,15 @@ public function jsonSerialize() $a[self::FIELD_OCCURRENCE_TIMING] = $v; } if (null !== ($v = $this->getOverrideReason())) { - $a[self::FIELD_OVERRIDE_REASON] = $v->getValue(); - $a[self::FIELD_OVERRIDE_REASON_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_OVERRIDE_REASON] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_OVERRIDE_REASON_EXT] = $enc; + } + } else { + $a[self::FIELD_OVERRIDE_REASON] = $v; + } } if ([] !== ($vs = $this->getPartOf())) { $a[self::FIELD_PART_OF] = $vs; @@ -2612,7 +2734,15 @@ public function jsonSerialize() $a[self::FIELD_PERFORMING_ORGANIZATION] = $v; } if (null !== ($v = $this->getPriceOverride())) { - $a[self::FIELD_PRICE_OVERRIDE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PRICE_OVERRIDE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PRICE_OVERRIDE_EXT] = $enc; + } + } else { + $a[self::FIELD_PRICE_OVERRIDE] = $v; + } } if (null !== ($v = $this->getProductCodeableConcept())) { $a[self::FIELD_PRODUCT_CODEABLE_CONCEPT] = $v; @@ -2621,7 +2751,15 @@ public function jsonSerialize() $a[self::FIELD_PRODUCT_REFERENCE] = $v; } if (null !== ($v = $this->getQuantity())) { - $a[self::FIELD_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_QUANTITY] = $v; + } } if ([] !== ($vs = $this->getReason())) { $a[self::FIELD_REASON] = $vs; @@ -2633,7 +2771,15 @@ public function jsonSerialize() $a[self::FIELD_SERVICE] = $vs; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getSubject())) { $a[self::FIELD_SUBJECT] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRChargeItemDefinition.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRChargeItemDefinition.php index 0b50602223..191a731783 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRChargeItemDefinition.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRChargeItemDefinition.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -97,10 +97,6 @@ class FHIRChargeItemDefinition extends FHIRDomainResource implements PHPFHIRCont { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CHARGE_ITEM_DEFINITION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_APPLICABILITY = 'applicability'; const FIELD_APPROVAL_DATE = 'approvalDate'; const FIELD_APPROVAL_DATE_EXT = '_approvalDate'; @@ -453,6 +449,9 @@ class FHIRChargeItemDefinition extends FHIRDomainResource implements PHPFHIRCont */ protected $version = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRChargeItemDefinition Constructor * @param null|array $data @@ -472,6 +471,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_APPLICABILITY])) { if (is_array($data[self::FIELD_APPLICABILITY])) { foreach($data[self::FIELD_APPLICABILITY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRChargeItemDefinitionApplicability) { $this->addApplicability($v); } else { @@ -490,8 +492,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_APPROVAL_DATE] instanceof FHIRDate) { $this->setApprovalDate($data[self::FIELD_APPROVAL_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_APPROVAL_DATE])) { - $this->setApprovalDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_APPROVAL_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_APPROVAL_DATE])) { + $this->setApprovalDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_APPROVAL_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_APPROVAL_DATE])) { + $this->setApprovalDate(new FHIRDate(array_merge($ext, $data[self::FIELD_APPROVAL_DATE]))); + } } else { $this->setApprovalDate(new FHIRDate($data[self::FIELD_APPROVAL_DATE])); } @@ -506,6 +512,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CONTACT])) { if (is_array($data[self::FIELD_CONTACT])) { foreach($data[self::FIELD_CONTACT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContactDetail) { $this->addContact($v); } else { @@ -524,8 +533,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_COPYRIGHT] instanceof FHIRMarkdown) { $this->setCopyright($data[self::FIELD_COPYRIGHT]); - } elseif ($ext && is_scalar($data[self::FIELD_COPYRIGHT])) { - $this->setCopyright(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_COPYRIGHT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_COPYRIGHT])) { + $this->setCopyright(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_COPYRIGHT]] + $ext)); + } else if (is_array($data[self::FIELD_COPYRIGHT])) { + $this->setCopyright(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_COPYRIGHT]))); + } } else { $this->setCopyright(new FHIRMarkdown($data[self::FIELD_COPYRIGHT])); } @@ -536,8 +549,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATE] instanceof FHIRDateTime) { $this->setDate($data[self::FIELD_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_DATE])) { - $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime(array_merge($ext, $data[self::FIELD_DATE]))); + } } else { $this->setDate(new FHIRDateTime($data[self::FIELD_DATE])); } @@ -548,17 +565,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_DERIVED_FROM_URI])) { foreach($data[self::FIELD_DERIVED_FROM_URI] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRUri) { $this->addDerivedFromUri($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addDerivedFromUri(new FHIRUri([FHIRUri::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addDerivedFromUri(new FHIRUri([FHIRUri::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addDerivedFromUri(new FHIRUri(array_merge($v, $ext[$i]))); + } } else { $this->addDerivedFromUri(new FHIRUri($v)); } } } elseif ($data[self::FIELD_DERIVED_FROM_URI] instanceof FHIRUri) { $this->addDerivedFromUri($data[self::FIELD_DERIVED_FROM_URI]); - } elseif ($ext && is_scalar($data[self::FIELD_DERIVED_FROM_URI])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_DERIVED_FROM_URI])) { $this->addDerivedFromUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_DERIVED_FROM_URI]] + $ext)); } else { $this->addDerivedFromUri(new FHIRUri($data[self::FIELD_DERIVED_FROM_URI])); @@ -570,8 +594,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRMarkdown) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRMarkdown($data[self::FIELD_DESCRIPTION])); } @@ -589,8 +617,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EXPERIMENTAL] instanceof FHIRBoolean) { $this->setExperimental($data[self::FIELD_EXPERIMENTAL]); - } elseif ($ext && is_scalar($data[self::FIELD_EXPERIMENTAL])) { - $this->setExperimental(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_EXPERIMENTAL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EXPERIMENTAL])) { + $this->setExperimental(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_EXPERIMENTAL]] + $ext)); + } else if (is_array($data[self::FIELD_EXPERIMENTAL])) { + $this->setExperimental(new FHIRBoolean(array_merge($ext, $data[self::FIELD_EXPERIMENTAL]))); + } } else { $this->setExperimental(new FHIRBoolean($data[self::FIELD_EXPERIMENTAL])); } @@ -601,17 +633,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -620,6 +659,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_INSTANCE])) { if (is_array($data[self::FIELD_INSTANCE])) { foreach($data[self::FIELD_INSTANCE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addInstance($v); } else { @@ -635,6 +677,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_JURISDICTION])) { if (is_array($data[self::FIELD_JURISDICTION])) { foreach($data[self::FIELD_JURISDICTION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addJurisdiction($v); } else { @@ -653,8 +698,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_LAST_REVIEW_DATE] instanceof FHIRDate) { $this->setLastReviewDate($data[self::FIELD_LAST_REVIEW_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_LAST_REVIEW_DATE])) { - $this->setLastReviewDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_LAST_REVIEW_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_LAST_REVIEW_DATE])) { + $this->setLastReviewDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_LAST_REVIEW_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_LAST_REVIEW_DATE])) { + $this->setLastReviewDate(new FHIRDate(array_merge($ext, $data[self::FIELD_LAST_REVIEW_DATE]))); + } } else { $this->setLastReviewDate(new FHIRDate($data[self::FIELD_LAST_REVIEW_DATE])); } @@ -665,17 +714,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_PART_OF])) { foreach($data[self::FIELD_PART_OF] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCanonical) { $this->addPartOf($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addPartOf(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addPartOf(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addPartOf(new FHIRCanonical(array_merge($v, $ext[$i]))); + } } else { $this->addPartOf(new FHIRCanonical($v)); } } } elseif ($data[self::FIELD_PART_OF] instanceof FHIRCanonical) { $this->addPartOf($data[self::FIELD_PART_OF]); - } elseif ($ext && is_scalar($data[self::FIELD_PART_OF])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_PART_OF])) { $this->addPartOf(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $data[self::FIELD_PART_OF]] + $ext)); } else { $this->addPartOf(new FHIRCanonical($data[self::FIELD_PART_OF])); @@ -684,6 +740,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PROPERTY_GROUP])) { if (is_array($data[self::FIELD_PROPERTY_GROUP])) { foreach($data[self::FIELD_PROPERTY_GROUP] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRChargeItemDefinitionPropertyGroup) { $this->addPropertyGroup($v); } else { @@ -702,8 +761,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PUBLISHER] instanceof FHIRString) { $this->setPublisher($data[self::FIELD_PUBLISHER]); - } elseif ($ext && is_scalar($data[self::FIELD_PUBLISHER])) { - $this->setPublisher(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PUBLISHER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PUBLISHER])) { + $this->setPublisher(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PUBLISHER]] + $ext)); + } else if (is_array($data[self::FIELD_PUBLISHER])) { + $this->setPublisher(new FHIRString(array_merge($ext, $data[self::FIELD_PUBLISHER]))); + } } else { $this->setPublisher(new FHIRString($data[self::FIELD_PUBLISHER])); } @@ -714,17 +777,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_REPLACES])) { foreach($data[self::FIELD_REPLACES] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCanonical) { $this->addReplaces($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addReplaces(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addReplaces(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addReplaces(new FHIRCanonical(array_merge($v, $ext[$i]))); + } } else { $this->addReplaces(new FHIRCanonical($v)); } } } elseif ($data[self::FIELD_REPLACES] instanceof FHIRCanonical) { $this->addReplaces($data[self::FIELD_REPLACES]); - } elseif ($ext && is_scalar($data[self::FIELD_REPLACES])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_REPLACES])) { $this->addReplaces(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $data[self::FIELD_REPLACES]] + $ext)); } else { $this->addReplaces(new FHIRCanonical($data[self::FIELD_REPLACES])); @@ -736,8 +806,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRPublicationStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRPublicationStatus([FHIRPublicationStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRPublicationStatus([FHIRPublicationStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRPublicationStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRPublicationStatus($data[self::FIELD_STATUS])); } @@ -748,8 +822,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TITLE] instanceof FHIRString) { $this->setTitle($data[self::FIELD_TITLE]); - } elseif ($ext && is_scalar($data[self::FIELD_TITLE])) { - $this->setTitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TITLE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TITLE])) { + $this->setTitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TITLE]] + $ext)); + } else if (is_array($data[self::FIELD_TITLE])) { + $this->setTitle(new FHIRString(array_merge($ext, $data[self::FIELD_TITLE]))); + } } else { $this->setTitle(new FHIRString($data[self::FIELD_TITLE])); } @@ -760,8 +838,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_URL] instanceof FHIRUri) { $this->setUrl($data[self::FIELD_URL]); - } elseif ($ext && is_scalar($data[self::FIELD_URL])) { - $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } else if (is_array($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri(array_merge($ext, $data[self::FIELD_URL]))); + } } else { $this->setUrl(new FHIRUri($data[self::FIELD_URL])); } @@ -769,6 +851,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_USE_CONTEXT])) { if (is_array($data[self::FIELD_USE_CONTEXT])) { foreach($data[self::FIELD_USE_CONTEXT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRUsageContext) { $this->addUseContext($v); } else { @@ -787,8 +872,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VERSION] instanceof FHIRString) { $this->setVersion($data[self::FIELD_VERSION]); - } elseif ($ext && is_scalar($data[self::FIELD_VERSION])) { - $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } else if (is_array($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString(array_merge($ext, $data[self::FIELD_VERSION]))); + } } else { $this->setVersion(new FHIRString($data[self::FIELD_VERSION])); } @@ -2226,7 +2315,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getApplicability())) { foreach($vs as $v) { if (null === $v) { @@ -2235,14 +2323,13 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_APPLICABILITY, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getApprovalDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_APPROVAL_DATE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getContact())) { foreach($vs as $v) { if (null === $v) { @@ -2251,6 +2338,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_CONTACT, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getCopyright())) { $v->xmlSerialize($sxe->addChild(self::FIELD_COPYRIGHT, null, $v->_getFHIRXMLNamespace())); } @@ -2265,17 +2353,16 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_DERIVED_FROM_URI, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getDescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESCRIPTION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getEffectivePeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EFFECTIVE_PERIOD, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getExperimental())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EXPERIMENTAL, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -2302,6 +2389,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_JURISDICTION, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getLastReviewDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_LAST_REVIEW_DATE, null, $v->_getFHIRXMLNamespace())); } @@ -2322,6 +2410,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_PROPERTY_GROUP, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getPublisher())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PUBLISHER, null, $v->_getFHIRXMLNamespace())); } @@ -2343,7 +2432,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getUrl())) { $v->xmlSerialize($sxe->addChild(self::FIELD_URL, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getUseContext())) { foreach($vs as $v) { if (null === $v) { @@ -2352,6 +2440,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_USE_CONTEXT, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getVersion())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VERSION, null, $v->_getFHIRXMLNamespace())); } @@ -2368,8 +2457,15 @@ public function jsonSerialize() $a[self::FIELD_APPLICABILITY] = $vs; } if (null !== ($v = $this->getApprovalDate())) { - $a[self::FIELD_APPROVAL_DATE] = $v->getValue(); - $a[self::FIELD_APPROVAL_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_APPROVAL_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_APPROVAL_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_APPROVAL_DATE] = $v; + } } if (null !== ($v = $this->getCode())) { $a[self::FIELD_CODE] = $v; @@ -2378,12 +2474,26 @@ public function jsonSerialize() $a[self::FIELD_CONTACT] = $vs; } if (null !== ($v = $this->getCopyright())) { - $a[self::FIELD_COPYRIGHT] = $v->getValue(); - $a[self::FIELD_COPYRIGHT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_COPYRIGHT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_COPYRIGHT_EXT] = $enc; + } + } else { + $a[self::FIELD_COPYRIGHT] = $v; + } } if (null !== ($v = $this->getDate())) { - $a[self::FIELD_DATE] = $v->getValue(); - $a[self::FIELD_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_DATE] = $v; + } } if ([] !== ($vs = $this->getDerivedFromUri())) { $a[self::FIELD_DERIVED_FROM_URI] = []; @@ -2391,23 +2501,62 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_DERIVED_FROM_URI][] = $v->getValue(); - $a[self::FIELD_DERIVED_FROM_URI_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DERIVED_FROM_URI][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DERIVED_FROM_URI_EXT][] = $enc; + } else { + $a[self::FIELD_DERIVED_FROM_URI_EXT][] = null; + } + } else { + $a[self::FIELD_DERIVED_FROM_URI][] = $v; + } } } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if (null !== ($v = $this->getEffectivePeriod())) { $a[self::FIELD_EFFECTIVE_PERIOD] = $v; } if (null !== ($v = $this->getExperimental())) { - $a[self::FIELD_EXPERIMENTAL] = $v->getValue(); - $a[self::FIELD_EXPERIMENTAL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EXPERIMENTAL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EXPERIMENTAL_EXT] = $enc; + } + } else { + $a[self::FIELD_EXPERIMENTAL] = $v; + } } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if ([] !== ($vs = $this->getInstance())) { $a[self::FIELD_INSTANCE] = $vs; @@ -2416,8 +2565,15 @@ public function jsonSerialize() $a[self::FIELD_JURISDICTION] = $vs; } if (null !== ($v = $this->getLastReviewDate())) { - $a[self::FIELD_LAST_REVIEW_DATE] = $v->getValue(); - $a[self::FIELD_LAST_REVIEW_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_LAST_REVIEW_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_LAST_REVIEW_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_LAST_REVIEW_DATE] = $v; + } } if ([] !== ($vs = $this->getPartOf())) { $a[self::FIELD_PART_OF] = []; @@ -2425,16 +2581,32 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_PART_OF][] = $v->getValue(); - $a[self::FIELD_PART_OF_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PART_OF][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PART_OF_EXT][] = $enc; + } else { + $a[self::FIELD_PART_OF_EXT][] = null; + } + } else { + $a[self::FIELD_PART_OF][] = $v; + } } } if ([] !== ($vs = $this->getPropertyGroup())) { $a[self::FIELD_PROPERTY_GROUP] = $vs; } if (null !== ($v = $this->getPublisher())) { - $a[self::FIELD_PUBLISHER] = $v->getValue(); - $a[self::FIELD_PUBLISHER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PUBLISHER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PUBLISHER_EXT] = $enc; + } + } else { + $a[self::FIELD_PUBLISHER] = $v; + } } if ([] !== ($vs = $this->getReplaces())) { $a[self::FIELD_REPLACES] = []; @@ -2442,27 +2614,65 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_REPLACES][] = $v->getValue(); - $a[self::FIELD_REPLACES_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_REPLACES][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_REPLACES_EXT][] = $enc; + } else { + $a[self::FIELD_REPLACES_EXT][] = null; + } + } else { + $a[self::FIELD_REPLACES][] = $v; + } } } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getTitle())) { - $a[self::FIELD_TITLE] = $v->getValue(); - $a[self::FIELD_TITLE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TITLE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TITLE_EXT] = $enc; + } + } else { + $a[self::FIELD_TITLE] = $v; + } } if (null !== ($v = $this->getUrl())) { - $a[self::FIELD_URL] = $v->getValue(); - $a[self::FIELD_URL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_URL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_URL_EXT] = $enc; + } + } else { + $a[self::FIELD_URL] = $v; + } } if ([] !== ($vs = $this->getUseContext())) { $a[self::FIELD_USE_CONTEXT] = $vs; } if (null !== ($v = $this->getVersion())) { - $a[self::FIELD_VERSION] = $v->getValue(); - $a[self::FIELD_VERSION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VERSION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VERSION_EXT] = $enc; + } + } else { + $a[self::FIELD_VERSION] = $v; + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRClaim.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRClaim.php index 805b4b41e3..906c913890 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRClaim.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRClaim.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -97,10 +97,6 @@ class FHIRClaim extends FHIRDomainResource implements PHPFHIRContainedTypeInterf { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CLAIM; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ACCIDENT = 'accident'; const FIELD_BILLABLE_PERIOD = 'billablePeriod'; const FIELD_CARE_TEAM = 'careTeam'; @@ -454,6 +450,9 @@ class FHIRClaim extends FHIRDomainResource implements PHPFHIRContainedTypeInterf */ protected $use = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRClaim Constructor * @param null|array $data @@ -487,6 +486,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CARE_TEAM])) { if (is_array($data[self::FIELD_CARE_TEAM])) { foreach($data[self::FIELD_CARE_TEAM] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRClaimCareTeam) { $this->addCareTeam($v); } else { @@ -505,8 +507,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CREATED] instanceof FHIRDateTime) { $this->setCreated($data[self::FIELD_CREATED]); - } elseif ($ext && is_scalar($data[self::FIELD_CREATED])) { - $this->setCreated(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_CREATED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CREATED])) { + $this->setCreated(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_CREATED]] + $ext)); + } else if (is_array($data[self::FIELD_CREATED])) { + $this->setCreated(new FHIRDateTime(array_merge($ext, $data[self::FIELD_CREATED]))); + } } else { $this->setCreated(new FHIRDateTime($data[self::FIELD_CREATED])); } @@ -514,6 +520,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_DIAGNOSIS])) { if (is_array($data[self::FIELD_DIAGNOSIS])) { foreach($data[self::FIELD_DIAGNOSIS] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRClaimDiagnosis) { $this->addDiagnosis($v); } else { @@ -553,17 +562,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -572,6 +588,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_INSURANCE])) { if (is_array($data[self::FIELD_INSURANCE])) { foreach($data[self::FIELD_INSURANCE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRClaimInsurance) { $this->addInsurance($v); } else { @@ -594,6 +613,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ITEM])) { if (is_array($data[self::FIELD_ITEM])) { foreach($data[self::FIELD_ITEM] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRClaimItem) { $this->addItem($v); } else { @@ -644,6 +666,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PROCEDURE])) { if (is_array($data[self::FIELD_PROCEDURE])) { foreach($data[self::FIELD_PROCEDURE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRClaimProcedure) { $this->addProcedure($v); } else { @@ -673,6 +698,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_RELATED])) { if (is_array($data[self::FIELD_RELATED])) { foreach($data[self::FIELD_RELATED] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRClaimRelated) { $this->addRelated($v); } else { @@ -691,8 +719,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRFinancialResourceStatusCodes) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRFinancialResourceStatusCodes([FHIRFinancialResourceStatusCodes::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRFinancialResourceStatusCodes([FHIRFinancialResourceStatusCodes::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRFinancialResourceStatusCodes(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRFinancialResourceStatusCodes($data[self::FIELD_STATUS])); } @@ -707,6 +739,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SUPPORTING_INFO])) { if (is_array($data[self::FIELD_SUPPORTING_INFO])) { foreach($data[self::FIELD_SUPPORTING_INFO] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRClaimSupportingInfo) { $this->addSupportingInfo($v); } else { @@ -725,8 +760,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TOTAL] instanceof FHIRMoney) { $this->setTotal($data[self::FIELD_TOTAL]); - } elseif ($ext && is_scalar($data[self::FIELD_TOTAL])) { - $this->setTotal(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_TOTAL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TOTAL])) { + $this->setTotal(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_TOTAL]] + $ext)); + } else if (is_array($data[self::FIELD_TOTAL])) { + $this->setTotal(new FHIRMoney(array_merge($ext, $data[self::FIELD_TOTAL]))); + } } else { $this->setTotal(new FHIRMoney($data[self::FIELD_TOTAL])); } @@ -744,8 +783,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_USE] instanceof FHIRUse) { $this->setUse($data[self::FIELD_USE]); - } elseif ($ext && is_scalar($data[self::FIELD_USE])) { - $this->setUse(new FHIRUse([FHIRUse::FIELD_VALUE => $data[self::FIELD_USE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_USE])) { + $this->setUse(new FHIRUse([FHIRUse::FIELD_VALUE => $data[self::FIELD_USE]] + $ext)); + } else if (is_array($data[self::FIELD_USE])) { + $this->setUse(new FHIRUse(array_merge($ext, $data[self::FIELD_USE]))); + } } else { $this->setUse(new FHIRUse($data[self::FIELD_USE])); } @@ -2037,15 +2080,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getAccident())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ACCIDENT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getBillablePeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_BILLABLE_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getCareTeam())) { foreach($vs as $v) { if (null === $v) { @@ -2054,10 +2094,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_CARE_TEAM, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getCreated())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CREATED, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getDiagnosis())) { foreach($vs as $v) { if (null === $v) { @@ -2070,15 +2110,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getEnterer())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ENTERER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getFacility())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FACILITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getFundsReserve())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FUNDS_RESERVE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -2100,7 +2137,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getInsurer())) { $v->xmlSerialize($sxe->addChild(self::FIELD_INSURER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getItem())) { foreach($vs as $v) { if (null === $v) { @@ -2113,23 +2149,18 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getOriginalPrescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ORIGINAL_PRESCRIPTION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPatient())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATIENT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPayee())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PAYEE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPrescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PRESCRIPTION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPriority())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PRIORITY, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getProcedure())) { foreach($vs as $v) { if (null === $v) { @@ -2142,11 +2173,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getProvider())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PROVIDER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getReferral())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REFERRAL, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getRelated())) { foreach($vs as $v) { if (null === $v) { @@ -2159,11 +2188,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSubType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUB_TYPE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getSupportingInfo())) { foreach($vs as $v) { if (null === $v) { @@ -2176,11 +2203,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getTotal())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TOTAL, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getUse())) { $v->xmlSerialize($sxe->addChild(self::FIELD_USE, null, $v->_getFHIRXMLNamespace())); } @@ -2203,8 +2228,15 @@ public function jsonSerialize() $a[self::FIELD_CARE_TEAM] = $vs; } if (null !== ($v = $this->getCreated())) { - $a[self::FIELD_CREATED] = $v->getValue(); - $a[self::FIELD_CREATED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CREATED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CREATED_EXT] = $enc; + } + } else { + $a[self::FIELD_CREATED] = $v; + } } if ([] !== ($vs = $this->getDiagnosis())) { $a[self::FIELD_DIAGNOSIS] = $vs; @@ -2219,7 +2251,23 @@ public function jsonSerialize() $a[self::FIELD_FUNDS_RESERVE] = $v; } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if ([] !== ($vs = $this->getInsurance())) { $a[self::FIELD_INSURANCE] = $vs; @@ -2258,7 +2306,15 @@ public function jsonSerialize() $a[self::FIELD_RELATED] = $vs; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getSubType())) { $a[self::FIELD_SUB_TYPE] = $v; @@ -2267,13 +2323,29 @@ public function jsonSerialize() $a[self::FIELD_SUPPORTING_INFO] = $vs; } if (null !== ($v = $this->getTotal())) { - $a[self::FIELD_TOTAL] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TOTAL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TOTAL_EXT] = $enc; + } + } else { + $a[self::FIELD_TOTAL] = $v; + } } if (null !== ($v = $this->getType())) { $a[self::FIELD_TYPE] = $v; } if (null !== ($v = $this->getUse())) { - $a[self::FIELD_USE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_USE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_USE_EXT] = $enc; + } + } else { + $a[self::FIELD_USE] = $v; + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRClaimResponse.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRClaimResponse.php index 66cb6b0d1e..2d34dd270f 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRClaimResponse.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRClaimResponse.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -97,10 +97,6 @@ class FHIRClaimResponse extends FHIRDomainResource implements PHPFHIRContainedTy { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CLAIM_RESPONSE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ADD_ITEM = 'addItem'; const FIELD_ADJUDICATION = 'adjudication'; const FIELD_ADJUDICATION_EXT = '_adjudication'; @@ -445,6 +441,9 @@ class FHIRClaimResponse extends FHIRDomainResource implements PHPFHIRContainedTy */ protected $use = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRClaimResponse Constructor * @param null|array $data @@ -464,6 +463,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ADD_ITEM])) { if (is_array($data[self::FIELD_ADD_ITEM])) { foreach($data[self::FIELD_ADD_ITEM] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRClaimResponseAddItem) { $this->addAddItem($v); } else { @@ -482,17 +484,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_ADJUDICATION])) { foreach($data[self::FIELD_ADJUDICATION] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRClaimResponseAdjudication) { $this->addAdjudication($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addAdjudication(new FHIRClaimResponseAdjudication([FHIRClaimResponseAdjudication::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addAdjudication(new FHIRClaimResponseAdjudication([FHIRClaimResponseAdjudication::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addAdjudication(new FHIRClaimResponseAdjudication(array_merge($v, $ext[$i]))); + } } else { $this->addAdjudication(new FHIRClaimResponseAdjudication($v)); } } } elseif ($data[self::FIELD_ADJUDICATION] instanceof FHIRClaimResponseAdjudication) { $this->addAdjudication($data[self::FIELD_ADJUDICATION]); - } elseif ($ext && is_scalar($data[self::FIELD_ADJUDICATION])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_ADJUDICATION])) { $this->addAdjudication(new FHIRClaimResponseAdjudication([FHIRClaimResponseAdjudication::FIELD_VALUE => $data[self::FIELD_ADJUDICATION]] + $ext)); } else { $this->addAdjudication(new FHIRClaimResponseAdjudication($data[self::FIELD_ADJUDICATION])); @@ -501,6 +510,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_COMMUNICATION_REQUEST])) { if (is_array($data[self::FIELD_COMMUNICATION_REQUEST])) { foreach($data[self::FIELD_COMMUNICATION_REQUEST] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addCommunicationRequest($v); } else { @@ -519,8 +531,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CREATED] instanceof FHIRDateTime) { $this->setCreated($data[self::FIELD_CREATED]); - } elseif ($ext && is_scalar($data[self::FIELD_CREATED])) { - $this->setCreated(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_CREATED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CREATED])) { + $this->setCreated(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_CREATED]] + $ext)); + } else if (is_array($data[self::FIELD_CREATED])) { + $this->setCreated(new FHIRDateTime(array_merge($ext, $data[self::FIELD_CREATED]))); + } } else { $this->setCreated(new FHIRDateTime($data[self::FIELD_CREATED])); } @@ -531,8 +547,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DISPOSITION] instanceof FHIRString) { $this->setDisposition($data[self::FIELD_DISPOSITION]); - } elseif ($ext && is_scalar($data[self::FIELD_DISPOSITION])) { - $this->setDisposition(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DISPOSITION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DISPOSITION])) { + $this->setDisposition(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DISPOSITION]] + $ext)); + } else if (is_array($data[self::FIELD_DISPOSITION])) { + $this->setDisposition(new FHIRString(array_merge($ext, $data[self::FIELD_DISPOSITION]))); + } } else { $this->setDisposition(new FHIRString($data[self::FIELD_DISPOSITION])); } @@ -540,6 +560,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ERROR])) { if (is_array($data[self::FIELD_ERROR])) { foreach($data[self::FIELD_ERROR] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRClaimResponseError) { $this->addError($v); } else { @@ -579,17 +602,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -598,6 +628,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_INSURANCE])) { if (is_array($data[self::FIELD_INSURANCE])) { foreach($data[self::FIELD_INSURANCE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRClaimResponseInsurance) { $this->addInsurance($v); } else { @@ -620,6 +653,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ITEM])) { if (is_array($data[self::FIELD_ITEM])) { foreach($data[self::FIELD_ITEM] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRClaimResponseItem) { $this->addItem($v); } else { @@ -638,8 +674,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_OUTCOME] instanceof FHIRClaimProcessingCodes) { $this->setOutcome($data[self::FIELD_OUTCOME]); - } elseif ($ext && is_scalar($data[self::FIELD_OUTCOME])) { - $this->setOutcome(new FHIRClaimProcessingCodes([FHIRClaimProcessingCodes::FIELD_VALUE => $data[self::FIELD_OUTCOME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_OUTCOME])) { + $this->setOutcome(new FHIRClaimProcessingCodes([FHIRClaimProcessingCodes::FIELD_VALUE => $data[self::FIELD_OUTCOME]] + $ext)); + } else if (is_array($data[self::FIELD_OUTCOME])) { + $this->setOutcome(new FHIRClaimProcessingCodes(array_merge($ext, $data[self::FIELD_OUTCOME]))); + } } else { $this->setOutcome(new FHIRClaimProcessingCodes($data[self::FIELD_OUTCOME])); } @@ -678,8 +718,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PRE_AUTH_REF] instanceof FHIRString) { $this->setPreAuthRef($data[self::FIELD_PRE_AUTH_REF]); - } elseif ($ext && is_scalar($data[self::FIELD_PRE_AUTH_REF])) { - $this->setPreAuthRef(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PRE_AUTH_REF]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PRE_AUTH_REF])) { + $this->setPreAuthRef(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PRE_AUTH_REF]] + $ext)); + } else if (is_array($data[self::FIELD_PRE_AUTH_REF])) { + $this->setPreAuthRef(new FHIRString(array_merge($ext, $data[self::FIELD_PRE_AUTH_REF]))); + } } else { $this->setPreAuthRef(new FHIRString($data[self::FIELD_PRE_AUTH_REF])); } @@ -687,6 +731,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PROCESS_NOTE])) { if (is_array($data[self::FIELD_PROCESS_NOTE])) { foreach($data[self::FIELD_PROCESS_NOTE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRClaimResponseProcessNote) { $this->addProcessNote($v); } else { @@ -719,8 +766,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRFinancialResourceStatusCodes) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRFinancialResourceStatusCodes([FHIRFinancialResourceStatusCodes::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRFinancialResourceStatusCodes([FHIRFinancialResourceStatusCodes::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRFinancialResourceStatusCodes(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRFinancialResourceStatusCodes($data[self::FIELD_STATUS])); } @@ -735,6 +786,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_TOTAL])) { if (is_array($data[self::FIELD_TOTAL])) { foreach($data[self::FIELD_TOTAL] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRClaimResponseTotal) { $this->addTotal($v); } else { @@ -760,8 +814,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_USE] instanceof FHIRUse) { $this->setUse($data[self::FIELD_USE]); - } elseif ($ext && is_scalar($data[self::FIELD_USE])) { - $this->setUse(new FHIRUse([FHIRUse::FIELD_VALUE => $data[self::FIELD_USE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_USE])) { + $this->setUse(new FHIRUse([FHIRUse::FIELD_VALUE => $data[self::FIELD_USE]] + $ext)); + } else if (is_array($data[self::FIELD_USE])) { + $this->setUse(new FHIRUse(array_merge($ext, $data[self::FIELD_USE]))); + } } else { $this->setUse(new FHIRUse($data[self::FIELD_USE])); } @@ -2070,7 +2128,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getAddItem())) { foreach($vs as $v) { if (null === $v) { @@ -2097,13 +2154,13 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_COMMUNICATION_REQUEST, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getCreated())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CREATED, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getDisposition())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DISPOSITION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getError())) { foreach($vs as $v) { if (null === $v) { @@ -2116,15 +2173,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getForm())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FORM, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getFormCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FORM_CODE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getFundsReserve())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FUNDS_RESERVE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -2146,7 +2200,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getInsurer())) { $v->xmlSerialize($sxe->addChild(self::FIELD_INSURER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getItem())) { foreach($vs as $v) { if (null === $v) { @@ -2159,26 +2212,21 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getOutcome())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OUTCOME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPatient())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATIENT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPayeeType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PAYEE_TYPE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPayment())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PAYMENT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPreAuthPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PRE_AUTH_PERIOD, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getPreAuthRef())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PRE_AUTH_REF, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getProcessNote())) { foreach($vs as $v) { if (null === $v) { @@ -2191,19 +2239,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getRequest())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REQUEST, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRequestor())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REQUESTOR, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSubType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUB_TYPE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getTotal())) { foreach($vs as $v) { if (null === $v) { @@ -2216,7 +2260,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getUse())) { $v->xmlSerialize($sxe->addChild(self::FIELD_USE, null, $v->_getFHIRXMLNamespace())); } @@ -2233,18 +2276,48 @@ public function jsonSerialize() $a[self::FIELD_ADD_ITEM] = $vs; } if ([] !== ($vs = $this->getAdjudication())) { - $a[self::FIELD_ADJUDICATION] = $vs; + $a[self::FIELD_ADJUDICATION] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ADJUDICATION][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ADJUDICATION_EXT][] = $enc; + } else { + $a[self::FIELD_ADJUDICATION_EXT][] = null; + } + } else { + $a[self::FIELD_ADJUDICATION][] = $v; + } + } } if ([] !== ($vs = $this->getCommunicationRequest())) { $a[self::FIELD_COMMUNICATION_REQUEST] = $vs; } if (null !== ($v = $this->getCreated())) { - $a[self::FIELD_CREATED] = $v->getValue(); - $a[self::FIELD_CREATED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CREATED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CREATED_EXT] = $enc; + } + } else { + $a[self::FIELD_CREATED] = $v; + } } if (null !== ($v = $this->getDisposition())) { - $a[self::FIELD_DISPOSITION] = $v->getValue(); - $a[self::FIELD_DISPOSITION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DISPOSITION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DISPOSITION_EXT] = $enc; + } + } else { + $a[self::FIELD_DISPOSITION] = $v; + } } if ([] !== ($vs = $this->getError())) { $a[self::FIELD_ERROR] = $vs; @@ -2259,7 +2332,23 @@ public function jsonSerialize() $a[self::FIELD_FUNDS_RESERVE] = $v; } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if ([] !== ($vs = $this->getInsurance())) { $a[self::FIELD_INSURANCE] = $vs; @@ -2271,7 +2360,15 @@ public function jsonSerialize() $a[self::FIELD_ITEM] = $vs; } if (null !== ($v = $this->getOutcome())) { - $a[self::FIELD_OUTCOME] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_OUTCOME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_OUTCOME_EXT] = $enc; + } + } else { + $a[self::FIELD_OUTCOME] = $v; + } } if (null !== ($v = $this->getPatient())) { $a[self::FIELD_PATIENT] = $v; @@ -2286,8 +2383,15 @@ public function jsonSerialize() $a[self::FIELD_PRE_AUTH_PERIOD] = $v; } if (null !== ($v = $this->getPreAuthRef())) { - $a[self::FIELD_PRE_AUTH_REF] = $v->getValue(); - $a[self::FIELD_PRE_AUTH_REF_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PRE_AUTH_REF] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PRE_AUTH_REF_EXT] = $enc; + } + } else { + $a[self::FIELD_PRE_AUTH_REF] = $v; + } } if ([] !== ($vs = $this->getProcessNote())) { $a[self::FIELD_PROCESS_NOTE] = $vs; @@ -2299,7 +2403,15 @@ public function jsonSerialize() $a[self::FIELD_REQUESTOR] = $v; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getSubType())) { $a[self::FIELD_SUB_TYPE] = $v; @@ -2311,7 +2423,15 @@ public function jsonSerialize() $a[self::FIELD_TYPE] = $v; } if (null !== ($v = $this->getUse())) { - $a[self::FIELD_USE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_USE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_USE_EXT] = $enc; + } + } else { + $a[self::FIELD_USE] = $v; + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRClinicalImpression.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRClinicalImpression.php index fb9f15b8a1..669114d10e 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRClinicalImpression.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRClinicalImpression.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -95,10 +95,6 @@ class FHIRClinicalImpression extends FHIRDomainResource implements PHPFHIRContai { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CLINICAL_IMPRESSION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ASSESSOR = 'assessor'; const FIELD_CODE = 'code'; const FIELD_DATE = 'date'; @@ -393,6 +389,9 @@ class FHIRClinicalImpression extends FHIRDomainResource implements PHPFHIRContai */ protected $supportingInfo = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRClinicalImpression Constructor * @param null|array $data @@ -429,8 +428,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATE] instanceof FHIRDateTime) { $this->setDate($data[self::FIELD_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_DATE])) { - $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime(array_merge($ext, $data[self::FIELD_DATE]))); + } } else { $this->setDate(new FHIRDateTime($data[self::FIELD_DATE])); } @@ -441,8 +444,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -453,8 +460,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EFFECTIVE_DATE_TIME] instanceof FHIRDateTime) { $this->setEffectiveDateTime($data[self::FIELD_EFFECTIVE_DATE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_EFFECTIVE_DATE_TIME])) { - $this->setEffectiveDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_EFFECTIVE_DATE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EFFECTIVE_DATE_TIME])) { + $this->setEffectiveDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_EFFECTIVE_DATE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_EFFECTIVE_DATE_TIME])) { + $this->setEffectiveDateTime(new FHIRDateTime(array_merge($ext, $data[self::FIELD_EFFECTIVE_DATE_TIME]))); + } } else { $this->setEffectiveDateTime(new FHIRDateTime($data[self::FIELD_EFFECTIVE_DATE_TIME])); } @@ -476,6 +487,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_FINDING])) { if (is_array($data[self::FIELD_FINDING])) { foreach($data[self::FIELD_FINDING] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRClinicalImpressionFinding) { $this->addFinding($v); } else { @@ -494,17 +508,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -513,6 +534,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_INVESTIGATION])) { if (is_array($data[self::FIELD_INVESTIGATION])) { foreach($data[self::FIELD_INVESTIGATION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRClinicalImpressionInvestigation) { $this->addInvestigation($v); } else { @@ -528,6 +552,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_NOTE])) { if (is_array($data[self::FIELD_NOTE])) { foreach($data[self::FIELD_NOTE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRAnnotation) { $this->addNote($v); } else { @@ -550,6 +577,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PROBLEM])) { if (is_array($data[self::FIELD_PROBLEM])) { foreach($data[self::FIELD_PROBLEM] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addProblem($v); } else { @@ -565,6 +595,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PROGNOSIS_CODEABLE_CONCEPT])) { if (is_array($data[self::FIELD_PROGNOSIS_CODEABLE_CONCEPT])) { foreach($data[self::FIELD_PROGNOSIS_CODEABLE_CONCEPT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addPrognosisCodeableConcept($v); } else { @@ -580,6 +613,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PROGNOSIS_REFERENCE])) { if (is_array($data[self::FIELD_PROGNOSIS_REFERENCE])) { foreach($data[self::FIELD_PROGNOSIS_REFERENCE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addPrognosisReference($v); } else { @@ -598,17 +634,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_PROTOCOL])) { foreach($data[self::FIELD_PROTOCOL] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRUri) { $this->addProtocol($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addProtocol(new FHIRUri([FHIRUri::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addProtocol(new FHIRUri([FHIRUri::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addProtocol(new FHIRUri(array_merge($v, $ext[$i]))); + } } else { $this->addProtocol(new FHIRUri($v)); } } } elseif ($data[self::FIELD_PROTOCOL] instanceof FHIRUri) { $this->addProtocol($data[self::FIELD_PROTOCOL]); - } elseif ($ext && is_scalar($data[self::FIELD_PROTOCOL])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_PROTOCOL])) { $this->addProtocol(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_PROTOCOL]] + $ext)); } else { $this->addProtocol(new FHIRUri($data[self::FIELD_PROTOCOL])); @@ -620,8 +663,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRClinicalImpressionStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRClinicalImpressionStatus([FHIRClinicalImpressionStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRClinicalImpressionStatus([FHIRClinicalImpressionStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRClinicalImpressionStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRClinicalImpressionStatus($data[self::FIELD_STATUS])); } @@ -646,8 +693,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SUMMARY] instanceof FHIRString) { $this->setSummary($data[self::FIELD_SUMMARY]); - } elseif ($ext && is_scalar($data[self::FIELD_SUMMARY])) { - $this->setSummary(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SUMMARY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SUMMARY])) { + $this->setSummary(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SUMMARY]] + $ext)); + } else if (is_array($data[self::FIELD_SUMMARY])) { + $this->setSummary(new FHIRString(array_merge($ext, $data[self::FIELD_SUMMARY]))); + } } else { $this->setSummary(new FHIRString($data[self::FIELD_SUMMARY])); } @@ -655,6 +706,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SUPPORTING_INFO])) { if (is_array($data[self::FIELD_SUPPORTING_INFO])) { foreach($data[self::FIELD_SUPPORTING_INFO] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addSupportingInfo($v); } else { @@ -1864,11 +1918,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getAssessor())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ASSESSOR, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } @@ -1881,15 +1933,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getEffectiveDateTime())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EFFECTIVE_DATE_TIME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getEffectivePeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EFFECTIVE_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getEncounter())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ENCOUNTER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getFinding())) { foreach($vs as $v) { if (null === $v) { @@ -1929,7 +1978,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getPrevious())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PREVIOUS, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getProblem())) { foreach($vs as $v) { if (null === $v) { @@ -1956,6 +2004,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_PROGNOSIS_REFERENCE, null, $v->_getFHIRXMLNamespace())); } } + if ([] !== ($vs = $this->getProtocol())) { foreach($vs as $v) { if (null === $v) { @@ -1968,18 +2017,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatusReason())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS_REASON, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSubject())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBJECT, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getSummary())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUMMARY, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getSupportingInfo())) { foreach($vs as $v) { if (null === $v) { @@ -1988,6 +2034,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_SUPPORTING_INFO, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } @@ -2004,16 +2051,37 @@ public function jsonSerialize() $a[self::FIELD_CODE] = $v; } if (null !== ($v = $this->getDate())) { - $a[self::FIELD_DATE] = $v->getValue(); - $a[self::FIELD_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_DATE] = $v; + } } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if (null !== ($v = $this->getEffectiveDateTime())) { - $a[self::FIELD_EFFECTIVE_DATE_TIME] = $v->getValue(); - $a[self::FIELD_EFFECTIVE_DATE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EFFECTIVE_DATE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EFFECTIVE_DATE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_EFFECTIVE_DATE_TIME] = $v; + } } if (null !== ($v = $this->getEffectivePeriod())) { $a[self::FIELD_EFFECTIVE_PERIOD] = $v; @@ -2025,7 +2093,23 @@ public function jsonSerialize() $a[self::FIELD_FINDING] = $vs; } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if ([] !== ($vs = $this->getInvestigation())) { $a[self::FIELD_INVESTIGATION] = $vs; @@ -2051,12 +2135,29 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_PROTOCOL][] = $v->getValue(); - $a[self::FIELD_PROTOCOL_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PROTOCOL][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PROTOCOL_EXT][] = $enc; + } else { + $a[self::FIELD_PROTOCOL_EXT][] = null; + } + } else { + $a[self::FIELD_PROTOCOL][] = $v; + } } } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getStatusReason())) { $a[self::FIELD_STATUS_REASON] = $v; @@ -2065,8 +2166,15 @@ public function jsonSerialize() $a[self::FIELD_SUBJECT] = $v; } if (null !== ($v = $this->getSummary())) { - $a[self::FIELD_SUMMARY] = $v->getValue(); - $a[self::FIELD_SUMMARY_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SUMMARY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SUMMARY_EXT] = $enc; + } + } else { + $a[self::FIELD_SUMMARY] = $v; + } } if ([] !== ($vs = $this->getSupportingInfo())) { $a[self::FIELD_SUPPORTING_INFO] = $vs; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRCodeSystem.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRCodeSystem.php index b279503ca6..bb56beb5a9 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRCodeSystem.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRCodeSystem.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -97,10 +97,6 @@ class FHIRCodeSystem extends FHIRDomainResource implements PHPFHIRContainedTypeI { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CODE_SYSTEM; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CASE_SENSITIVE = 'caseSensitive'; const FIELD_CASE_SENSITIVE_EXT = '_caseSensitive'; const FIELD_COMPOSITIONAL = 'compositional'; @@ -492,6 +488,9 @@ class FHIRCodeSystem extends FHIRDomainResource implements PHPFHIRContainedTypeI */ protected $versionNeeded = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRCodeSystem Constructor * @param null|array $data @@ -514,8 +513,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CASE_SENSITIVE] instanceof FHIRBoolean) { $this->setCaseSensitive($data[self::FIELD_CASE_SENSITIVE]); - } elseif ($ext && is_scalar($data[self::FIELD_CASE_SENSITIVE])) { - $this->setCaseSensitive(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_CASE_SENSITIVE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CASE_SENSITIVE])) { + $this->setCaseSensitive(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_CASE_SENSITIVE]] + $ext)); + } else if (is_array($data[self::FIELD_CASE_SENSITIVE])) { + $this->setCaseSensitive(new FHIRBoolean(array_merge($ext, $data[self::FIELD_CASE_SENSITIVE]))); + } } else { $this->setCaseSensitive(new FHIRBoolean($data[self::FIELD_CASE_SENSITIVE])); } @@ -526,8 +529,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_COMPOSITIONAL] instanceof FHIRBoolean) { $this->setCompositional($data[self::FIELD_COMPOSITIONAL]); - } elseif ($ext && is_scalar($data[self::FIELD_COMPOSITIONAL])) { - $this->setCompositional(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_COMPOSITIONAL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_COMPOSITIONAL])) { + $this->setCompositional(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_COMPOSITIONAL]] + $ext)); + } else if (is_array($data[self::FIELD_COMPOSITIONAL])) { + $this->setCompositional(new FHIRBoolean(array_merge($ext, $data[self::FIELD_COMPOSITIONAL]))); + } } else { $this->setCompositional(new FHIRBoolean($data[self::FIELD_COMPOSITIONAL])); } @@ -535,6 +542,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CONCEPT])) { if (is_array($data[self::FIELD_CONCEPT])) { foreach($data[self::FIELD_CONCEPT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeSystemConcept) { $this->addConcept($v); } else { @@ -550,6 +560,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CONTACT])) { if (is_array($data[self::FIELD_CONTACT])) { foreach($data[self::FIELD_CONTACT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContactDetail) { $this->addContact($v); } else { @@ -568,8 +581,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CONTENT] instanceof FHIRCodeSystemContentMode) { $this->setContent($data[self::FIELD_CONTENT]); - } elseif ($ext && is_scalar($data[self::FIELD_CONTENT])) { - $this->setContent(new FHIRCodeSystemContentMode([FHIRCodeSystemContentMode::FIELD_VALUE => $data[self::FIELD_CONTENT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CONTENT])) { + $this->setContent(new FHIRCodeSystemContentMode([FHIRCodeSystemContentMode::FIELD_VALUE => $data[self::FIELD_CONTENT]] + $ext)); + } else if (is_array($data[self::FIELD_CONTENT])) { + $this->setContent(new FHIRCodeSystemContentMode(array_merge($ext, $data[self::FIELD_CONTENT]))); + } } else { $this->setContent(new FHIRCodeSystemContentMode($data[self::FIELD_CONTENT])); } @@ -580,8 +597,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_COPYRIGHT] instanceof FHIRMarkdown) { $this->setCopyright($data[self::FIELD_COPYRIGHT]); - } elseif ($ext && is_scalar($data[self::FIELD_COPYRIGHT])) { - $this->setCopyright(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_COPYRIGHT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_COPYRIGHT])) { + $this->setCopyright(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_COPYRIGHT]] + $ext)); + } else if (is_array($data[self::FIELD_COPYRIGHT])) { + $this->setCopyright(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_COPYRIGHT]))); + } } else { $this->setCopyright(new FHIRMarkdown($data[self::FIELD_COPYRIGHT])); } @@ -592,8 +613,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_COUNT] instanceof FHIRUnsignedInt) { $this->setCount($data[self::FIELD_COUNT]); - } elseif ($ext && is_scalar($data[self::FIELD_COUNT])) { - $this->setCount(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_COUNT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_COUNT])) { + $this->setCount(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_COUNT]] + $ext)); + } else if (is_array($data[self::FIELD_COUNT])) { + $this->setCount(new FHIRUnsignedInt(array_merge($ext, $data[self::FIELD_COUNT]))); + } } else { $this->setCount(new FHIRUnsignedInt($data[self::FIELD_COUNT])); } @@ -604,8 +629,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATE] instanceof FHIRDateTime) { $this->setDate($data[self::FIELD_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_DATE])) { - $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime(array_merge($ext, $data[self::FIELD_DATE]))); + } } else { $this->setDate(new FHIRDateTime($data[self::FIELD_DATE])); } @@ -616,8 +645,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRMarkdown) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRMarkdown($data[self::FIELD_DESCRIPTION])); } @@ -628,8 +661,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EXPERIMENTAL] instanceof FHIRBoolean) { $this->setExperimental($data[self::FIELD_EXPERIMENTAL]); - } elseif ($ext && is_scalar($data[self::FIELD_EXPERIMENTAL])) { - $this->setExperimental(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_EXPERIMENTAL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EXPERIMENTAL])) { + $this->setExperimental(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_EXPERIMENTAL]] + $ext)); + } else if (is_array($data[self::FIELD_EXPERIMENTAL])) { + $this->setExperimental(new FHIRBoolean(array_merge($ext, $data[self::FIELD_EXPERIMENTAL]))); + } } else { $this->setExperimental(new FHIRBoolean($data[self::FIELD_EXPERIMENTAL])); } @@ -640,17 +677,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_FILTER])) { foreach($data[self::FIELD_FILTER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeSystemFilter) { $this->addFilter($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addFilter(new FHIRCodeSystemFilter([FHIRCodeSystemFilter::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addFilter(new FHIRCodeSystemFilter([FHIRCodeSystemFilter::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addFilter(new FHIRCodeSystemFilter(array_merge($v, $ext[$i]))); + } } else { $this->addFilter(new FHIRCodeSystemFilter($v)); } } } elseif ($data[self::FIELD_FILTER] instanceof FHIRCodeSystemFilter) { $this->addFilter($data[self::FIELD_FILTER]); - } elseif ($ext && is_scalar($data[self::FIELD_FILTER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_FILTER])) { $this->addFilter(new FHIRCodeSystemFilter([FHIRCodeSystemFilter::FIELD_VALUE => $data[self::FIELD_FILTER]] + $ext)); } else { $this->addFilter(new FHIRCodeSystemFilter($data[self::FIELD_FILTER])); @@ -662,8 +706,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_HIERARCHY_MEANING] instanceof FHIRCodeSystemHierarchyMeaning) { $this->setHierarchyMeaning($data[self::FIELD_HIERARCHY_MEANING]); - } elseif ($ext && is_scalar($data[self::FIELD_HIERARCHY_MEANING])) { - $this->setHierarchyMeaning(new FHIRCodeSystemHierarchyMeaning([FHIRCodeSystemHierarchyMeaning::FIELD_VALUE => $data[self::FIELD_HIERARCHY_MEANING]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_HIERARCHY_MEANING])) { + $this->setHierarchyMeaning(new FHIRCodeSystemHierarchyMeaning([FHIRCodeSystemHierarchyMeaning::FIELD_VALUE => $data[self::FIELD_HIERARCHY_MEANING]] + $ext)); + } else if (is_array($data[self::FIELD_HIERARCHY_MEANING])) { + $this->setHierarchyMeaning(new FHIRCodeSystemHierarchyMeaning(array_merge($ext, $data[self::FIELD_HIERARCHY_MEANING]))); + } } else { $this->setHierarchyMeaning(new FHIRCodeSystemHierarchyMeaning($data[self::FIELD_HIERARCHY_MEANING])); } @@ -674,17 +722,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -693,6 +748,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_JURISDICTION])) { if (is_array($data[self::FIELD_JURISDICTION])) { foreach($data[self::FIELD_JURISDICTION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addJurisdiction($v); } else { @@ -711,8 +769,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -720,6 +782,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PROPERTY])) { if (is_array($data[self::FIELD_PROPERTY])) { foreach($data[self::FIELD_PROPERTY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeSystemProperty) { $this->addProperty($v); } else { @@ -738,8 +803,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PUBLISHER] instanceof FHIRString) { $this->setPublisher($data[self::FIELD_PUBLISHER]); - } elseif ($ext && is_scalar($data[self::FIELD_PUBLISHER])) { - $this->setPublisher(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PUBLISHER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PUBLISHER])) { + $this->setPublisher(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PUBLISHER]] + $ext)); + } else if (is_array($data[self::FIELD_PUBLISHER])) { + $this->setPublisher(new FHIRString(array_merge($ext, $data[self::FIELD_PUBLISHER]))); + } } else { $this->setPublisher(new FHIRString($data[self::FIELD_PUBLISHER])); } @@ -750,8 +819,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PURPOSE] instanceof FHIRMarkdown) { $this->setPurpose($data[self::FIELD_PURPOSE]); - } elseif ($ext && is_scalar($data[self::FIELD_PURPOSE])) { - $this->setPurpose(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_PURPOSE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PURPOSE])) { + $this->setPurpose(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_PURPOSE]] + $ext)); + } else if (is_array($data[self::FIELD_PURPOSE])) { + $this->setPurpose(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_PURPOSE]))); + } } else { $this->setPurpose(new FHIRMarkdown($data[self::FIELD_PURPOSE])); } @@ -762,8 +835,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRPublicationStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRPublicationStatus([FHIRPublicationStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRPublicationStatus([FHIRPublicationStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRPublicationStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRPublicationStatus($data[self::FIELD_STATUS])); } @@ -774,8 +851,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SUPPLEMENTS] instanceof FHIRCanonical) { $this->setSupplements($data[self::FIELD_SUPPLEMENTS]); - } elseif ($ext && is_scalar($data[self::FIELD_SUPPLEMENTS])) { - $this->setSupplements(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $data[self::FIELD_SUPPLEMENTS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SUPPLEMENTS])) { + $this->setSupplements(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $data[self::FIELD_SUPPLEMENTS]] + $ext)); + } else if (is_array($data[self::FIELD_SUPPLEMENTS])) { + $this->setSupplements(new FHIRCanonical(array_merge($ext, $data[self::FIELD_SUPPLEMENTS]))); + } } else { $this->setSupplements(new FHIRCanonical($data[self::FIELD_SUPPLEMENTS])); } @@ -786,8 +867,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TITLE] instanceof FHIRString) { $this->setTitle($data[self::FIELD_TITLE]); - } elseif ($ext && is_scalar($data[self::FIELD_TITLE])) { - $this->setTitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TITLE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TITLE])) { + $this->setTitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TITLE]] + $ext)); + } else if (is_array($data[self::FIELD_TITLE])) { + $this->setTitle(new FHIRString(array_merge($ext, $data[self::FIELD_TITLE]))); + } } else { $this->setTitle(new FHIRString($data[self::FIELD_TITLE])); } @@ -798,8 +883,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_URL] instanceof FHIRUri) { $this->setUrl($data[self::FIELD_URL]); - } elseif ($ext && is_scalar($data[self::FIELD_URL])) { - $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } else if (is_array($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri(array_merge($ext, $data[self::FIELD_URL]))); + } } else { $this->setUrl(new FHIRUri($data[self::FIELD_URL])); } @@ -807,6 +896,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_USE_CONTEXT])) { if (is_array($data[self::FIELD_USE_CONTEXT])) { foreach($data[self::FIELD_USE_CONTEXT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRUsageContext) { $this->addUseContext($v); } else { @@ -825,8 +917,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_SET] instanceof FHIRCanonical) { $this->setValueSet($data[self::FIELD_VALUE_SET]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_SET])) { - $this->setValueSet(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $data[self::FIELD_VALUE_SET]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_SET])) { + $this->setValueSet(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $data[self::FIELD_VALUE_SET]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_SET])) { + $this->setValueSet(new FHIRCanonical(array_merge($ext, $data[self::FIELD_VALUE_SET]))); + } } else { $this->setValueSet(new FHIRCanonical($data[self::FIELD_VALUE_SET])); } @@ -837,8 +933,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VERSION] instanceof FHIRString) { $this->setVersion($data[self::FIELD_VERSION]); - } elseif ($ext && is_scalar($data[self::FIELD_VERSION])) { - $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } else if (is_array($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString(array_merge($ext, $data[self::FIELD_VERSION]))); + } } else { $this->setVersion(new FHIRString($data[self::FIELD_VERSION])); } @@ -849,8 +949,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VERSION_NEEDED] instanceof FHIRBoolean) { $this->setVersionNeeded($data[self::FIELD_VERSION_NEEDED]); - } elseif ($ext && is_scalar($data[self::FIELD_VERSION_NEEDED])) { - $this->setVersionNeeded(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_VERSION_NEEDED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VERSION_NEEDED])) { + $this->setVersionNeeded(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_VERSION_NEEDED]] + $ext)); + } else if (is_array($data[self::FIELD_VERSION_NEEDED])) { + $this->setVersionNeeded(new FHIRBoolean(array_merge($ext, $data[self::FIELD_VERSION_NEEDED]))); + } } else { $this->setVersionNeeded(new FHIRBoolean($data[self::FIELD_VERSION_NEEDED])); } @@ -2330,7 +2434,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getCompositional())) { $v->xmlSerialize($sxe->addChild(self::FIELD_COMPOSITIONAL, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getConcept())) { foreach($vs as $v) { if (null === $v) { @@ -2367,7 +2470,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getExperimental())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EXPERIMENTAL, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getFilter())) { foreach($vs as $v) { if (null === $v) { @@ -2380,7 +2482,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getHierarchyMeaning())) { $v->xmlSerialize($sxe->addChild(self::FIELD_HIERARCHY_MEANING, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -2398,10 +2499,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_JURISDICTION, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NAME, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getProperty())) { foreach($vs as $v) { if (null === $v) { @@ -2410,13 +2511,13 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_PROPERTY, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getPublisher())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PUBLISHER, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getPurpose())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PURPOSE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } @@ -2429,7 +2530,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getUrl())) { $v->xmlSerialize($sxe->addChild(self::FIELD_URL, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getUseContext())) { foreach($vs as $v) { if (null === $v) { @@ -2438,6 +2538,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_USE_CONTEXT, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getValueSet())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_SET, null, $v->_getFHIRXMLNamespace())); } @@ -2457,12 +2558,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getCaseSensitive())) { - $a[self::FIELD_CASE_SENSITIVE] = $v->getValue(); - $a[self::FIELD_CASE_SENSITIVE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CASE_SENSITIVE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CASE_SENSITIVE_EXT] = $enc; + } + } else { + $a[self::FIELD_CASE_SENSITIVE] = $v; + } } if (null !== ($v = $this->getCompositional())) { - $a[self::FIELD_COMPOSITIONAL] = $v->getValue(); - $a[self::FIELD_COMPOSITIONAL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_COMPOSITIONAL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_COMPOSITIONAL_EXT] = $enc; + } + } else { + $a[self::FIELD_COMPOSITIONAL] = $v; + } } if ([] !== ($vs = $this->getConcept())) { $a[self::FIELD_CONCEPT] = $vs; @@ -2471,84 +2586,238 @@ public function jsonSerialize() $a[self::FIELD_CONTACT] = $vs; } if (null !== ($v = $this->getContent())) { - $a[self::FIELD_CONTENT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CONTENT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CONTENT_EXT] = $enc; + } + } else { + $a[self::FIELD_CONTENT] = $v; + } } if (null !== ($v = $this->getCopyright())) { - $a[self::FIELD_COPYRIGHT] = $v->getValue(); - $a[self::FIELD_COPYRIGHT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_COPYRIGHT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_COPYRIGHT_EXT] = $enc; + } + } else { + $a[self::FIELD_COPYRIGHT] = $v; + } } if (null !== ($v = $this->getCount())) { - $a[self::FIELD_COUNT] = $v->getValue(); - $a[self::FIELD_COUNT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_COUNT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_COUNT_EXT] = $enc; + } + } else { + $a[self::FIELD_COUNT] = $v; + } } if (null !== ($v = $this->getDate())) { - $a[self::FIELD_DATE] = $v->getValue(); - $a[self::FIELD_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_DATE] = $v; + } } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if (null !== ($v = $this->getExperimental())) { - $a[self::FIELD_EXPERIMENTAL] = $v->getValue(); - $a[self::FIELD_EXPERIMENTAL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EXPERIMENTAL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EXPERIMENTAL_EXT] = $enc; + } + } else { + $a[self::FIELD_EXPERIMENTAL] = $v; + } } if ([] !== ($vs = $this->getFilter())) { - $a[self::FIELD_FILTER] = $vs; + $a[self::FIELD_FILTER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FILTER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FILTER_EXT][] = $enc; + } else { + $a[self::FIELD_FILTER_EXT][] = null; + } + } else { + $a[self::FIELD_FILTER][] = $v; + } + } } if (null !== ($v = $this->getHierarchyMeaning())) { - $a[self::FIELD_HIERARCHY_MEANING] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_HIERARCHY_MEANING] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_HIERARCHY_MEANING_EXT] = $enc; + } + } else { + $a[self::FIELD_HIERARCHY_MEANING] = $v; + } } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if ([] !== ($vs = $this->getJurisdiction())) { $a[self::FIELD_JURISDICTION] = $vs; } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if ([] !== ($vs = $this->getProperty())) { $a[self::FIELD_PROPERTY] = $vs; } if (null !== ($v = $this->getPublisher())) { - $a[self::FIELD_PUBLISHER] = $v->getValue(); - $a[self::FIELD_PUBLISHER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PUBLISHER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PUBLISHER_EXT] = $enc; + } + } else { + $a[self::FIELD_PUBLISHER] = $v; + } } if (null !== ($v = $this->getPurpose())) { - $a[self::FIELD_PURPOSE] = $v->getValue(); - $a[self::FIELD_PURPOSE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PURPOSE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PURPOSE_EXT] = $enc; + } + } else { + $a[self::FIELD_PURPOSE] = $v; + } } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getSupplements())) { - $a[self::FIELD_SUPPLEMENTS] = $v->getValue(); - $a[self::FIELD_SUPPLEMENTS_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SUPPLEMENTS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SUPPLEMENTS_EXT] = $enc; + } + } else { + $a[self::FIELD_SUPPLEMENTS] = $v; + } } if (null !== ($v = $this->getTitle())) { - $a[self::FIELD_TITLE] = $v->getValue(); - $a[self::FIELD_TITLE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TITLE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TITLE_EXT] = $enc; + } + } else { + $a[self::FIELD_TITLE] = $v; + } } if (null !== ($v = $this->getUrl())) { - $a[self::FIELD_URL] = $v->getValue(); - $a[self::FIELD_URL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_URL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_URL_EXT] = $enc; + } + } else { + $a[self::FIELD_URL] = $v; + } } if ([] !== ($vs = $this->getUseContext())) { $a[self::FIELD_USE_CONTEXT] = $vs; } if (null !== ($v = $this->getValueSet())) { - $a[self::FIELD_VALUE_SET] = $v->getValue(); - $a[self::FIELD_VALUE_SET_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_SET] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_SET_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_SET] = $v; + } } if (null !== ($v = $this->getVersion())) { - $a[self::FIELD_VERSION] = $v->getValue(); - $a[self::FIELD_VERSION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VERSION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VERSION_EXT] = $enc; + } + } else { + $a[self::FIELD_VERSION] = $v; + } } if (null !== ($v = $this->getVersionNeeded())) { - $a[self::FIELD_VERSION_NEEDED] = $v->getValue(); - $a[self::FIELD_VERSION_NEEDED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VERSION_NEEDED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VERSION_NEEDED_EXT] = $enc; + } + } else { + $a[self::FIELD_VERSION_NEEDED] = $v; + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRCommunication.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRCommunication.php index 30fbd2d1a0..93d9c60b8c 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRCommunication.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRCommunication.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -90,10 +90,6 @@ class FHIRCommunication extends FHIRDomainResource implements PHPFHIRContainedTy { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_COMMUNICATION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ABOUT = 'about'; const FIELD_BASED_ON = 'basedOn'; const FIELD_CATEGORY = 'category'; @@ -405,6 +401,9 @@ class FHIRCommunication extends FHIRDomainResource implements PHPFHIRContainedTy */ protected $topic = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRCommunication Constructor * @param null|array $data @@ -424,6 +423,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ABOUT])) { if (is_array($data[self::FIELD_ABOUT])) { foreach($data[self::FIELD_ABOUT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addAbout($v); } else { @@ -439,6 +441,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_BASED_ON])) { if (is_array($data[self::FIELD_BASED_ON])) { foreach($data[self::FIELD_BASED_ON] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addBasedOn($v); } else { @@ -454,6 +459,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CATEGORY])) { if (is_array($data[self::FIELD_CATEGORY])) { foreach($data[self::FIELD_CATEGORY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addCategory($v); } else { @@ -479,17 +487,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -498,6 +513,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_IN_RESPONSE_TO])) { if (is_array($data[self::FIELD_IN_RESPONSE_TO])) { foreach($data[self::FIELD_IN_RESPONSE_TO] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addInResponseTo($v); } else { @@ -516,17 +534,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_INSTANTIATES_CANONICAL])) { foreach($data[self::FIELD_INSTANTIATES_CANONICAL] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCanonical) { $this->addInstantiatesCanonical($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addInstantiatesCanonical(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addInstantiatesCanonical(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addInstantiatesCanonical(new FHIRCanonical(array_merge($v, $ext[$i]))); + } } else { $this->addInstantiatesCanonical(new FHIRCanonical($v)); } } } elseif ($data[self::FIELD_INSTANTIATES_CANONICAL] instanceof FHIRCanonical) { $this->addInstantiatesCanonical($data[self::FIELD_INSTANTIATES_CANONICAL]); - } elseif ($ext && is_scalar($data[self::FIELD_INSTANTIATES_CANONICAL])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_INSTANTIATES_CANONICAL])) { $this->addInstantiatesCanonical(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $data[self::FIELD_INSTANTIATES_CANONICAL]] + $ext)); } else { $this->addInstantiatesCanonical(new FHIRCanonical($data[self::FIELD_INSTANTIATES_CANONICAL])); @@ -538,17 +563,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_INSTANTIATES_URI])) { foreach($data[self::FIELD_INSTANTIATES_URI] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRUri) { $this->addInstantiatesUri($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addInstantiatesUri(new FHIRUri([FHIRUri::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addInstantiatesUri(new FHIRUri([FHIRUri::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addInstantiatesUri(new FHIRUri(array_merge($v, $ext[$i]))); + } } else { $this->addInstantiatesUri(new FHIRUri($v)); } } } elseif ($data[self::FIELD_INSTANTIATES_URI] instanceof FHIRUri) { $this->addInstantiatesUri($data[self::FIELD_INSTANTIATES_URI]); - } elseif ($ext && is_scalar($data[self::FIELD_INSTANTIATES_URI])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_INSTANTIATES_URI])) { $this->addInstantiatesUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_INSTANTIATES_URI]] + $ext)); } else { $this->addInstantiatesUri(new FHIRUri($data[self::FIELD_INSTANTIATES_URI])); @@ -557,6 +589,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_MEDIUM])) { if (is_array($data[self::FIELD_MEDIUM])) { foreach($data[self::FIELD_MEDIUM] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addMedium($v); } else { @@ -572,6 +607,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_NOTE])) { if (is_array($data[self::FIELD_NOTE])) { foreach($data[self::FIELD_NOTE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRAnnotation) { $this->addNote($v); } else { @@ -587,6 +625,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PART_OF])) { if (is_array($data[self::FIELD_PART_OF])) { foreach($data[self::FIELD_PART_OF] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addPartOf($v); } else { @@ -602,6 +643,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PAYLOAD])) { if (is_array($data[self::FIELD_PAYLOAD])) { foreach($data[self::FIELD_PAYLOAD] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCommunicationPayload) { $this->addPayload($v); } else { @@ -620,8 +664,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PRIORITY] instanceof FHIRRequestPriority) { $this->setPriority($data[self::FIELD_PRIORITY]); - } elseif ($ext && is_scalar($data[self::FIELD_PRIORITY])) { - $this->setPriority(new FHIRRequestPriority([FHIRRequestPriority::FIELD_VALUE => $data[self::FIELD_PRIORITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PRIORITY])) { + $this->setPriority(new FHIRRequestPriority([FHIRRequestPriority::FIELD_VALUE => $data[self::FIELD_PRIORITY]] + $ext)); + } else if (is_array($data[self::FIELD_PRIORITY])) { + $this->setPriority(new FHIRRequestPriority(array_merge($ext, $data[self::FIELD_PRIORITY]))); + } } else { $this->setPriority(new FHIRRequestPriority($data[self::FIELD_PRIORITY])); } @@ -629,6 +677,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REASON_CODE])) { if (is_array($data[self::FIELD_REASON_CODE])) { foreach($data[self::FIELD_REASON_CODE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addReasonCode($v); } else { @@ -644,6 +695,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REASON_REFERENCE])) { if (is_array($data[self::FIELD_REASON_REFERENCE])) { foreach($data[self::FIELD_REASON_REFERENCE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addReasonReference($v); } else { @@ -662,8 +716,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_RECEIVED] instanceof FHIRDateTime) { $this->setReceived($data[self::FIELD_RECEIVED]); - } elseif ($ext && is_scalar($data[self::FIELD_RECEIVED])) { - $this->setReceived(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_RECEIVED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_RECEIVED])) { + $this->setReceived(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_RECEIVED]] + $ext)); + } else if (is_array($data[self::FIELD_RECEIVED])) { + $this->setReceived(new FHIRDateTime(array_merge($ext, $data[self::FIELD_RECEIVED]))); + } } else { $this->setReceived(new FHIRDateTime($data[self::FIELD_RECEIVED])); } @@ -671,6 +729,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_RECIPIENT])) { if (is_array($data[self::FIELD_RECIPIENT])) { foreach($data[self::FIELD_RECIPIENT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addRecipient($v); } else { @@ -696,8 +757,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SENT] instanceof FHIRDateTime) { $this->setSent($data[self::FIELD_SENT]); - } elseif ($ext && is_scalar($data[self::FIELD_SENT])) { - $this->setSent(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_SENT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SENT])) { + $this->setSent(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_SENT]] + $ext)); + } else if (is_array($data[self::FIELD_SENT])) { + $this->setSent(new FHIRDateTime(array_merge($ext, $data[self::FIELD_SENT]))); + } } else { $this->setSent(new FHIRDateTime($data[self::FIELD_SENT])); } @@ -708,8 +773,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIREventStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIREventStatus([FHIREventStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIREventStatus([FHIREventStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIREventStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIREventStatus($data[self::FIELD_STATUS])); } @@ -2111,7 +2180,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getAbout())) { foreach($vs as $v) { if (null === $v) { @@ -2142,7 +2210,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getEncounter())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ENCOUNTER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -2160,6 +2227,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_IN_RESPONSE_TO, null, $v->_getFHIRXMLNamespace())); } } + if ([] !== ($vs = $this->getInstantiatesCanonical())) { foreach($vs as $v) { if (null === $v) { @@ -2168,6 +2236,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_INSTANTIATES_CANONICAL, null, $v->_getFHIRXMLNamespace())); } } + if ([] !== ($vs = $this->getInstantiatesUri())) { foreach($vs as $v) { if (null === $v) { @@ -2216,7 +2285,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getPriority())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PRIORITY, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getReasonCode())) { foreach($vs as $v) { if (null === $v) { @@ -2234,10 +2302,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_REASON_REFERENCE, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getReceived())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RECEIVED, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getRecipient())) { foreach($vs as $v) { if (null === $v) { @@ -2253,19 +2321,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getSent())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SENT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatusReason())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS_REASON, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSubject())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBJECT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getTopic())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TOPIC, null, $v->_getFHIRXMLNamespace())); } @@ -2291,7 +2355,23 @@ public function jsonSerialize() $a[self::FIELD_ENCOUNTER] = $v; } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if ([] !== ($vs = $this->getInResponseTo())) { $a[self::FIELD_IN_RESPONSE_TO] = $vs; @@ -2302,8 +2382,17 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_INSTANTIATES_CANONICAL][] = $v->getValue(); - $a[self::FIELD_INSTANTIATES_CANONICAL_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_INSTANTIATES_CANONICAL][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_INSTANTIATES_CANONICAL_EXT][] = $enc; + } else { + $a[self::FIELD_INSTANTIATES_CANONICAL_EXT][] = null; + } + } else { + $a[self::FIELD_INSTANTIATES_CANONICAL][] = $v; + } } } if ([] !== ($vs = $this->getInstantiatesUri())) { @@ -2312,8 +2401,17 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_INSTANTIATES_URI][] = $v->getValue(); - $a[self::FIELD_INSTANTIATES_URI_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_INSTANTIATES_URI][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_INSTANTIATES_URI_EXT][] = $enc; + } else { + $a[self::FIELD_INSTANTIATES_URI_EXT][] = null; + } + } else { + $a[self::FIELD_INSTANTIATES_URI][] = $v; + } } } if ([] !== ($vs = $this->getMedium())) { @@ -2329,7 +2427,15 @@ public function jsonSerialize() $a[self::FIELD_PAYLOAD] = $vs; } if (null !== ($v = $this->getPriority())) { - $a[self::FIELD_PRIORITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PRIORITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PRIORITY_EXT] = $enc; + } + } else { + $a[self::FIELD_PRIORITY] = $v; + } } if ([] !== ($vs = $this->getReasonCode())) { $a[self::FIELD_REASON_CODE] = $vs; @@ -2338,8 +2444,15 @@ public function jsonSerialize() $a[self::FIELD_REASON_REFERENCE] = $vs; } if (null !== ($v = $this->getReceived())) { - $a[self::FIELD_RECEIVED] = $v->getValue(); - $a[self::FIELD_RECEIVED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_RECEIVED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_RECEIVED_EXT] = $enc; + } + } else { + $a[self::FIELD_RECEIVED] = $v; + } } if ([] !== ($vs = $this->getRecipient())) { $a[self::FIELD_RECIPIENT] = $vs; @@ -2348,11 +2461,26 @@ public function jsonSerialize() $a[self::FIELD_SENDER] = $v; } if (null !== ($v = $this->getSent())) { - $a[self::FIELD_SENT] = $v->getValue(); - $a[self::FIELD_SENT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SENT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SENT_EXT] = $enc; + } + } else { + $a[self::FIELD_SENT] = $v; + } } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getStatusReason())) { $a[self::FIELD_STATUS_REASON] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRCommunicationRequest.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRCommunicationRequest.php index 1851136483..bead8bf35a 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRCommunicationRequest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRCommunicationRequest.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -90,10 +90,6 @@ class FHIRCommunicationRequest extends FHIRDomainResource implements PHPFHIRCont { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_COMMUNICATION_REQUEST; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ABOUT = 'about'; const FIELD_AUTHORED_ON = 'authoredOn'; const FIELD_AUTHORED_ON_EXT = '_authoredOn'; @@ -405,6 +401,9 @@ class FHIRCommunicationRequest extends FHIRDomainResource implements PHPFHIRCont */ protected $subject = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRCommunicationRequest Constructor * @param null|array $data @@ -424,6 +423,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ABOUT])) { if (is_array($data[self::FIELD_ABOUT])) { foreach($data[self::FIELD_ABOUT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addAbout($v); } else { @@ -442,8 +444,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_AUTHORED_ON] instanceof FHIRDateTime) { $this->setAuthoredOn($data[self::FIELD_AUTHORED_ON]); - } elseif ($ext && is_scalar($data[self::FIELD_AUTHORED_ON])) { - $this->setAuthoredOn(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_AUTHORED_ON]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_AUTHORED_ON])) { + $this->setAuthoredOn(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_AUTHORED_ON]] + $ext)); + } else if (is_array($data[self::FIELD_AUTHORED_ON])) { + $this->setAuthoredOn(new FHIRDateTime(array_merge($ext, $data[self::FIELD_AUTHORED_ON]))); + } } else { $this->setAuthoredOn(new FHIRDateTime($data[self::FIELD_AUTHORED_ON])); } @@ -451,6 +457,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_BASED_ON])) { if (is_array($data[self::FIELD_BASED_ON])) { foreach($data[self::FIELD_BASED_ON] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addBasedOn($v); } else { @@ -466,6 +475,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CATEGORY])) { if (is_array($data[self::FIELD_CATEGORY])) { foreach($data[self::FIELD_CATEGORY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addCategory($v); } else { @@ -484,8 +496,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DO_NOT_PERFORM] instanceof FHIRBoolean) { $this->setDoNotPerform($data[self::FIELD_DO_NOT_PERFORM]); - } elseif ($ext && is_scalar($data[self::FIELD_DO_NOT_PERFORM])) { - $this->setDoNotPerform(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_DO_NOT_PERFORM]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DO_NOT_PERFORM])) { + $this->setDoNotPerform(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_DO_NOT_PERFORM]] + $ext)); + } else if (is_array($data[self::FIELD_DO_NOT_PERFORM])) { + $this->setDoNotPerform(new FHIRBoolean(array_merge($ext, $data[self::FIELD_DO_NOT_PERFORM]))); + } } else { $this->setDoNotPerform(new FHIRBoolean($data[self::FIELD_DO_NOT_PERFORM])); } @@ -503,8 +519,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_GROUP_IDENTIFIER] instanceof FHIRIdentifier) { $this->setGroupIdentifier($data[self::FIELD_GROUP_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_GROUP_IDENTIFIER])) { - $this->setGroupIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_GROUP_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_GROUP_IDENTIFIER])) { + $this->setGroupIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_GROUP_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_GROUP_IDENTIFIER])) { + $this->setGroupIdentifier(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_GROUP_IDENTIFIER]))); + } } else { $this->setGroupIdentifier(new FHIRIdentifier($data[self::FIELD_GROUP_IDENTIFIER])); } @@ -515,17 +535,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -534,6 +561,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_MEDIUM])) { if (is_array($data[self::FIELD_MEDIUM])) { foreach($data[self::FIELD_MEDIUM] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addMedium($v); } else { @@ -549,6 +579,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_NOTE])) { if (is_array($data[self::FIELD_NOTE])) { foreach($data[self::FIELD_NOTE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRAnnotation) { $this->addNote($v); } else { @@ -567,8 +600,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_OCCURRENCE_DATE_TIME] instanceof FHIRDateTime) { $this->setOccurrenceDateTime($data[self::FIELD_OCCURRENCE_DATE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_OCCURRENCE_DATE_TIME])) { - $this->setOccurrenceDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_OCCURRENCE_DATE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_OCCURRENCE_DATE_TIME])) { + $this->setOccurrenceDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_OCCURRENCE_DATE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_OCCURRENCE_DATE_TIME])) { + $this->setOccurrenceDateTime(new FHIRDateTime(array_merge($ext, $data[self::FIELD_OCCURRENCE_DATE_TIME]))); + } } else { $this->setOccurrenceDateTime(new FHIRDateTime($data[self::FIELD_OCCURRENCE_DATE_TIME])); } @@ -583,6 +620,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PAYLOAD])) { if (is_array($data[self::FIELD_PAYLOAD])) { foreach($data[self::FIELD_PAYLOAD] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCommunicationRequestPayload) { $this->addPayload($v); } else { @@ -601,8 +641,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PRIORITY] instanceof FHIRRequestPriority) { $this->setPriority($data[self::FIELD_PRIORITY]); - } elseif ($ext && is_scalar($data[self::FIELD_PRIORITY])) { - $this->setPriority(new FHIRRequestPriority([FHIRRequestPriority::FIELD_VALUE => $data[self::FIELD_PRIORITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PRIORITY])) { + $this->setPriority(new FHIRRequestPriority([FHIRRequestPriority::FIELD_VALUE => $data[self::FIELD_PRIORITY]] + $ext)); + } else if (is_array($data[self::FIELD_PRIORITY])) { + $this->setPriority(new FHIRRequestPriority(array_merge($ext, $data[self::FIELD_PRIORITY]))); + } } else { $this->setPriority(new FHIRRequestPriority($data[self::FIELD_PRIORITY])); } @@ -610,6 +654,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REASON_CODE])) { if (is_array($data[self::FIELD_REASON_CODE])) { foreach($data[self::FIELD_REASON_CODE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addReasonCode($v); } else { @@ -625,6 +672,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REASON_REFERENCE])) { if (is_array($data[self::FIELD_REASON_REFERENCE])) { foreach($data[self::FIELD_REASON_REFERENCE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addReasonReference($v); } else { @@ -640,6 +690,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_RECIPIENT])) { if (is_array($data[self::FIELD_RECIPIENT])) { foreach($data[self::FIELD_RECIPIENT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addRecipient($v); } else { @@ -655,6 +708,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REPLACES])) { if (is_array($data[self::FIELD_REPLACES])) { foreach($data[self::FIELD_REPLACES] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addReplaces($v); } else { @@ -687,8 +743,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRRequestStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRRequestStatus([FHIRRequestStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRRequestStatus([FHIRRequestStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRRequestStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRRequestStatus($data[self::FIELD_STATUS])); } @@ -1981,7 +2041,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getAbout())) { foreach($vs as $v) { if (null === $v) { @@ -1990,10 +2049,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_ABOUT, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getAuthoredOn())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AUTHORED_ON, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getBasedOn())) { foreach($vs as $v) { if (null === $v) { @@ -2011,18 +2070,16 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_CATEGORY, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getDoNotPerform())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DO_NOT_PERFORM, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getEncounter())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ENCOUNTER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getGroupIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_GROUP_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -2049,14 +2106,13 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_NOTE, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getOccurrenceDateTime())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OCCURRENCE_DATE_TIME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOccurrencePeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OCCURRENCE_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getPayload())) { foreach($vs as $v) { if (null === $v) { @@ -2069,7 +2125,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getPriority())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PRIORITY, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getReasonCode())) { foreach($vs as $v) { if (null === $v) { @@ -2109,19 +2164,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getRequester())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REQUESTER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSender())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SENDER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatusReason())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS_REASON, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSubject())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBJECT, null, $v->_getFHIRXMLNamespace())); } @@ -2138,8 +2189,15 @@ public function jsonSerialize() $a[self::FIELD_ABOUT] = $vs; } if (null !== ($v = $this->getAuthoredOn())) { - $a[self::FIELD_AUTHORED_ON] = $v->getValue(); - $a[self::FIELD_AUTHORED_ON_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_AUTHORED_ON] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_AUTHORED_ON_EXT] = $enc; + } + } else { + $a[self::FIELD_AUTHORED_ON] = $v; + } } if ([] !== ($vs = $this->getBasedOn())) { $a[self::FIELD_BASED_ON] = $vs; @@ -2148,17 +2206,48 @@ public function jsonSerialize() $a[self::FIELD_CATEGORY] = $vs; } if (null !== ($v = $this->getDoNotPerform())) { - $a[self::FIELD_DO_NOT_PERFORM] = $v->getValue(); - $a[self::FIELD_DO_NOT_PERFORM_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DO_NOT_PERFORM] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DO_NOT_PERFORM_EXT] = $enc; + } + } else { + $a[self::FIELD_DO_NOT_PERFORM] = $v; + } } if (null !== ($v = $this->getEncounter())) { $a[self::FIELD_ENCOUNTER] = $v; } if (null !== ($v = $this->getGroupIdentifier())) { - $a[self::FIELD_GROUP_IDENTIFIER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_GROUP_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_GROUP_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_GROUP_IDENTIFIER] = $v; + } } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if ([] !== ($vs = $this->getMedium())) { $a[self::FIELD_MEDIUM] = $vs; @@ -2167,8 +2256,15 @@ public function jsonSerialize() $a[self::FIELD_NOTE] = $vs; } if (null !== ($v = $this->getOccurrenceDateTime())) { - $a[self::FIELD_OCCURRENCE_DATE_TIME] = $v->getValue(); - $a[self::FIELD_OCCURRENCE_DATE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_OCCURRENCE_DATE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_OCCURRENCE_DATE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_OCCURRENCE_DATE_TIME] = $v; + } } if (null !== ($v = $this->getOccurrencePeriod())) { $a[self::FIELD_OCCURRENCE_PERIOD] = $v; @@ -2177,7 +2273,15 @@ public function jsonSerialize() $a[self::FIELD_PAYLOAD] = $vs; } if (null !== ($v = $this->getPriority())) { - $a[self::FIELD_PRIORITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PRIORITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PRIORITY_EXT] = $enc; + } + } else { + $a[self::FIELD_PRIORITY] = $v; + } } if ([] !== ($vs = $this->getReasonCode())) { $a[self::FIELD_REASON_CODE] = $vs; @@ -2198,7 +2302,15 @@ public function jsonSerialize() $a[self::FIELD_SENDER] = $v; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getStatusReason())) { $a[self::FIELD_STATUS_REASON] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRCompartmentDefinition.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRCompartmentDefinition.php index e39bc13e9a..aae0d1cbef 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRCompartmentDefinition.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRCompartmentDefinition.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -88,10 +88,6 @@ class FHIRCompartmentDefinition extends FHIRDomainResource implements PHPFHIRCon { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_COMPARTMENT_DEFINITION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CODE = 'code'; const FIELD_CODE_EXT = '_code'; const FIELD_CONTACT = 'contact'; @@ -306,6 +302,9 @@ class FHIRCompartmentDefinition extends FHIRDomainResource implements PHPFHIRCon */ protected $version = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRCompartmentDefinition Constructor * @param null|array $data @@ -328,8 +327,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CODE] instanceof FHIRCompartmentType) { $this->setCode($data[self::FIELD_CODE]); - } elseif ($ext && is_scalar($data[self::FIELD_CODE])) { - $this->setCode(new FHIRCompartmentType([FHIRCompartmentType::FIELD_VALUE => $data[self::FIELD_CODE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CODE])) { + $this->setCode(new FHIRCompartmentType([FHIRCompartmentType::FIELD_VALUE => $data[self::FIELD_CODE]] + $ext)); + } else if (is_array($data[self::FIELD_CODE])) { + $this->setCode(new FHIRCompartmentType(array_merge($ext, $data[self::FIELD_CODE]))); + } } else { $this->setCode(new FHIRCompartmentType($data[self::FIELD_CODE])); } @@ -337,6 +340,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CONTACT])) { if (is_array($data[self::FIELD_CONTACT])) { foreach($data[self::FIELD_CONTACT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContactDetail) { $this->addContact($v); } else { @@ -355,8 +361,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATE] instanceof FHIRDateTime) { $this->setDate($data[self::FIELD_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_DATE])) { - $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime(array_merge($ext, $data[self::FIELD_DATE]))); + } } else { $this->setDate(new FHIRDateTime($data[self::FIELD_DATE])); } @@ -367,8 +377,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRMarkdown) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRMarkdown($data[self::FIELD_DESCRIPTION])); } @@ -379,8 +393,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EXPERIMENTAL] instanceof FHIRBoolean) { $this->setExperimental($data[self::FIELD_EXPERIMENTAL]); - } elseif ($ext && is_scalar($data[self::FIELD_EXPERIMENTAL])) { - $this->setExperimental(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_EXPERIMENTAL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EXPERIMENTAL])) { + $this->setExperimental(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_EXPERIMENTAL]] + $ext)); + } else if (is_array($data[self::FIELD_EXPERIMENTAL])) { + $this->setExperimental(new FHIRBoolean(array_merge($ext, $data[self::FIELD_EXPERIMENTAL]))); + } } else { $this->setExperimental(new FHIRBoolean($data[self::FIELD_EXPERIMENTAL])); } @@ -391,8 +409,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -403,8 +425,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PUBLISHER] instanceof FHIRString) { $this->setPublisher($data[self::FIELD_PUBLISHER]); - } elseif ($ext && is_scalar($data[self::FIELD_PUBLISHER])) { - $this->setPublisher(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PUBLISHER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PUBLISHER])) { + $this->setPublisher(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PUBLISHER]] + $ext)); + } else if (is_array($data[self::FIELD_PUBLISHER])) { + $this->setPublisher(new FHIRString(array_merge($ext, $data[self::FIELD_PUBLISHER]))); + } } else { $this->setPublisher(new FHIRString($data[self::FIELD_PUBLISHER])); } @@ -415,8 +441,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PURPOSE] instanceof FHIRMarkdown) { $this->setPurpose($data[self::FIELD_PURPOSE]); - } elseif ($ext && is_scalar($data[self::FIELD_PURPOSE])) { - $this->setPurpose(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_PURPOSE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PURPOSE])) { + $this->setPurpose(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_PURPOSE]] + $ext)); + } else if (is_array($data[self::FIELD_PURPOSE])) { + $this->setPurpose(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_PURPOSE]))); + } } else { $this->setPurpose(new FHIRMarkdown($data[self::FIELD_PURPOSE])); } @@ -424,6 +454,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_RESOURCE])) { if (is_array($data[self::FIELD_RESOURCE])) { foreach($data[self::FIELD_RESOURCE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCompartmentDefinitionResource) { $this->addResource($v); } else { @@ -442,8 +475,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SEARCH] instanceof FHIRBoolean) { $this->setSearch($data[self::FIELD_SEARCH]); - } elseif ($ext && is_scalar($data[self::FIELD_SEARCH])) { - $this->setSearch(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_SEARCH]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SEARCH])) { + $this->setSearch(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_SEARCH]] + $ext)); + } else if (is_array($data[self::FIELD_SEARCH])) { + $this->setSearch(new FHIRBoolean(array_merge($ext, $data[self::FIELD_SEARCH]))); + } } else { $this->setSearch(new FHIRBoolean($data[self::FIELD_SEARCH])); } @@ -454,8 +491,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRPublicationStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRPublicationStatus([FHIRPublicationStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRPublicationStatus([FHIRPublicationStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRPublicationStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRPublicationStatus($data[self::FIELD_STATUS])); } @@ -466,8 +507,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_URL] instanceof FHIRUri) { $this->setUrl($data[self::FIELD_URL]); - } elseif ($ext && is_scalar($data[self::FIELD_URL])) { - $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } else if (is_array($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri(array_merge($ext, $data[self::FIELD_URL]))); + } } else { $this->setUrl(new FHIRUri($data[self::FIELD_URL])); } @@ -475,6 +520,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_USE_CONTEXT])) { if (is_array($data[self::FIELD_USE_CONTEXT])) { foreach($data[self::FIELD_USE_CONTEXT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRUsageContext) { $this->addUseContext($v); } else { @@ -493,8 +541,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VERSION] instanceof FHIRString) { $this->setVersion($data[self::FIELD_VERSION]); - } elseif ($ext && is_scalar($data[self::FIELD_VERSION])) { - $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } else if (is_array($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString(array_merge($ext, $data[self::FIELD_VERSION]))); + } } else { $this->setVersion(new FHIRString($data[self::FIELD_VERSION])); } @@ -1327,11 +1379,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getContact())) { foreach($vs as $v) { if (null === $v) { @@ -1340,6 +1390,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_CONTACT, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DATE, null, $v->_getFHIRXMLNamespace())); } @@ -1358,7 +1409,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getPurpose())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PURPOSE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getResource())) { foreach($vs as $v) { if (null === $v) { @@ -1367,17 +1417,16 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_RESOURCE, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getSearch())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SEARCH, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getUrl())) { $v->xmlSerialize($sxe->addChild(self::FIELD_URL, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getUseContext())) { foreach($vs as $v) { if (null === $v) { @@ -1386,6 +1435,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_USE_CONTEXT, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getVersion())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VERSION, null, $v->_getFHIRXMLNamespace())); } @@ -1399,55 +1449,134 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getCode())) { - $a[self::FIELD_CODE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CODE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CODE_EXT] = $enc; + } + } else { + $a[self::FIELD_CODE] = $v; + } } if ([] !== ($vs = $this->getContact())) { $a[self::FIELD_CONTACT] = $vs; } if (null !== ($v = $this->getDate())) { - $a[self::FIELD_DATE] = $v->getValue(); - $a[self::FIELD_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_DATE] = $v; + } } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if (null !== ($v = $this->getExperimental())) { - $a[self::FIELD_EXPERIMENTAL] = $v->getValue(); - $a[self::FIELD_EXPERIMENTAL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EXPERIMENTAL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EXPERIMENTAL_EXT] = $enc; + } + } else { + $a[self::FIELD_EXPERIMENTAL] = $v; + } } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if (null !== ($v = $this->getPublisher())) { - $a[self::FIELD_PUBLISHER] = $v->getValue(); - $a[self::FIELD_PUBLISHER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PUBLISHER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PUBLISHER_EXT] = $enc; + } + } else { + $a[self::FIELD_PUBLISHER] = $v; + } } if (null !== ($v = $this->getPurpose())) { - $a[self::FIELD_PURPOSE] = $v->getValue(); - $a[self::FIELD_PURPOSE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PURPOSE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PURPOSE_EXT] = $enc; + } + } else { + $a[self::FIELD_PURPOSE] = $v; + } } if ([] !== ($vs = $this->getResource())) { $a[self::FIELD_RESOURCE] = $vs; } if (null !== ($v = $this->getSearch())) { - $a[self::FIELD_SEARCH] = $v->getValue(); - $a[self::FIELD_SEARCH_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SEARCH] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SEARCH_EXT] = $enc; + } + } else { + $a[self::FIELD_SEARCH] = $v; + } } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getUrl())) { - $a[self::FIELD_URL] = $v->getValue(); - $a[self::FIELD_URL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_URL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_URL_EXT] = $enc; + } + } else { + $a[self::FIELD_URL] = $v; + } } if ([] !== ($vs = $this->getUseContext())) { $a[self::FIELD_USE_CONTEXT] = $vs; } if (null !== ($v = $this->getVersion())) { - $a[self::FIELD_VERSION] = $v->getValue(); - $a[self::FIELD_VERSION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VERSION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VERSION_EXT] = $enc; + } + } else { + $a[self::FIELD_VERSION] = $v; + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRComposition.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRComposition.php index 540456fd98..e1a9ab52c7 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRComposition.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRComposition.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -97,10 +97,6 @@ class FHIRComposition extends FHIRDomainResource implements PHPFHIRContainedType { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_COMPOSITION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ATTESTER = 'attester'; const FIELD_AUTHOR = 'author'; const FIELD_CATEGORY = 'category'; @@ -330,6 +326,9 @@ class FHIRComposition extends FHIRDomainResource implements PHPFHIRContainedType */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRComposition Constructor * @param null|array $data @@ -349,6 +348,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ATTESTER])) { if (is_array($data[self::FIELD_ATTESTER])) { foreach($data[self::FIELD_ATTESTER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCompositionAttester) { $this->addAttester($v); } else { @@ -364,6 +366,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_AUTHOR])) { if (is_array($data[self::FIELD_AUTHOR])) { foreach($data[self::FIELD_AUTHOR] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addAuthor($v); } else { @@ -379,6 +384,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CATEGORY])) { if (is_array($data[self::FIELD_CATEGORY])) { foreach($data[self::FIELD_CATEGORY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addCategory($v); } else { @@ -397,8 +405,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CONFIDENTIALITY] instanceof FHIRVConfidentialityClassification) { $this->setConfidentiality($data[self::FIELD_CONFIDENTIALITY]); - } elseif ($ext && is_scalar($data[self::FIELD_CONFIDENTIALITY])) { - $this->setConfidentiality(new FHIRVConfidentialityClassification([FHIRVConfidentialityClassification::FIELD_VALUE => $data[self::FIELD_CONFIDENTIALITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CONFIDENTIALITY])) { + $this->setConfidentiality(new FHIRVConfidentialityClassification([FHIRVConfidentialityClassification::FIELD_VALUE => $data[self::FIELD_CONFIDENTIALITY]] + $ext)); + } else if (is_array($data[self::FIELD_CONFIDENTIALITY])) { + $this->setConfidentiality(new FHIRVConfidentialityClassification(array_merge($ext, $data[self::FIELD_CONFIDENTIALITY]))); + } } else { $this->setConfidentiality(new FHIRVConfidentialityClassification($data[self::FIELD_CONFIDENTIALITY])); } @@ -416,8 +428,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATE] instanceof FHIRDateTime) { $this->setDate($data[self::FIELD_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_DATE])) { - $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime(array_merge($ext, $data[self::FIELD_DATE]))); + } } else { $this->setDate(new FHIRDateTime($data[self::FIELD_DATE])); } @@ -432,6 +448,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_EVENT])) { if (is_array($data[self::FIELD_EVENT])) { foreach($data[self::FIELD_EVENT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCompositionEvent) { $this->addEvent($v); } else { @@ -450,8 +469,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->setIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { - $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_IDENTIFIER]))); + } } else { $this->setIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); } @@ -459,6 +482,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_RELATES_TO])) { if (is_array($data[self::FIELD_RELATES_TO])) { foreach($data[self::FIELD_RELATES_TO] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCompositionRelatesTo) { $this->addRelatesTo($v); } else { @@ -474,6 +500,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SECTION])) { if (is_array($data[self::FIELD_SECTION])) { foreach($data[self::FIELD_SECTION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCompositionSection) { $this->addSection($v); } else { @@ -492,8 +521,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRCompositionStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRCompositionStatus([FHIRCompositionStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRCompositionStatus([FHIRCompositionStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRCompositionStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRCompositionStatus($data[self::FIELD_STATUS])); } @@ -511,8 +544,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TITLE] instanceof FHIRString) { $this->setTitle($data[self::FIELD_TITLE]); - } elseif ($ext && is_scalar($data[self::FIELD_TITLE])) { - $this->setTitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TITLE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TITLE])) { + $this->setTitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TITLE]] + $ext)); + } else if (is_array($data[self::FIELD_TITLE])) { + $this->setTitle(new FHIRString(array_merge($ext, $data[self::FIELD_TITLE]))); + } } else { $this->setTitle(new FHIRString($data[self::FIELD_TITLE])); } @@ -1434,7 +1471,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getAttester())) { foreach($vs as $v) { if (null === $v) { @@ -1465,18 +1501,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getConfidentiality())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CONFIDENTIALITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getCustodian())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CUSTODIAN, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DATE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getEncounter())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ENCOUNTER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getEvent())) { foreach($vs as $v) { if (null === $v) { @@ -1489,7 +1522,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getRelatesTo())) { foreach($vs as $v) { if (null === $v) { @@ -1511,14 +1543,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSubject())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBJECT, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getTitle())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TITLE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -1541,14 +1571,29 @@ public function jsonSerialize() $a[self::FIELD_CATEGORY] = $vs; } if (null !== ($v = $this->getConfidentiality())) { - $a[self::FIELD_CONFIDENTIALITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CONFIDENTIALITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CONFIDENTIALITY_EXT] = $enc; + } + } else { + $a[self::FIELD_CONFIDENTIALITY] = $v; + } } if (null !== ($v = $this->getCustodian())) { $a[self::FIELD_CUSTODIAN] = $v; } if (null !== ($v = $this->getDate())) { - $a[self::FIELD_DATE] = $v->getValue(); - $a[self::FIELD_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_DATE] = $v; + } } if (null !== ($v = $this->getEncounter())) { $a[self::FIELD_ENCOUNTER] = $v; @@ -1557,7 +1602,15 @@ public function jsonSerialize() $a[self::FIELD_EVENT] = $vs; } if (null !== ($v = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_IDENTIFIER] = $v; + } } if ([] !== ($vs = $this->getRelatesTo())) { $a[self::FIELD_RELATES_TO] = $vs; @@ -1566,14 +1619,29 @@ public function jsonSerialize() $a[self::FIELD_SECTION] = $vs; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getSubject())) { $a[self::FIELD_SUBJECT] = $v; } if (null !== ($v = $this->getTitle())) { - $a[self::FIELD_TITLE] = $v->getValue(); - $a[self::FIELD_TITLE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TITLE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TITLE_EXT] = $enc; + } + } else { + $a[self::FIELD_TITLE] = $v; + } } if (null !== ($v = $this->getType())) { $a[self::FIELD_TYPE] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRConceptMap.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRConceptMap.php index b49f60ccd4..77d34e7350 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRConceptMap.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRConceptMap.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -92,10 +92,6 @@ class FHIRConceptMap extends FHIRDomainResource implements PHPFHIRContainedTypeI { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONCEPT_MAP; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CONTACT = 'contact'; const FIELD_COPYRIGHT = 'copyright'; const FIELD_COPYRIGHT_EXT = '_copyright'; @@ -410,6 +406,9 @@ class FHIRConceptMap extends FHIRDomainResource implements PHPFHIRContainedTypeI */ protected $version = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRConceptMap Constructor * @param null|array $data @@ -429,6 +428,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CONTACT])) { if (is_array($data[self::FIELD_CONTACT])) { foreach($data[self::FIELD_CONTACT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContactDetail) { $this->addContact($v); } else { @@ -447,8 +449,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_COPYRIGHT] instanceof FHIRMarkdown) { $this->setCopyright($data[self::FIELD_COPYRIGHT]); - } elseif ($ext && is_scalar($data[self::FIELD_COPYRIGHT])) { - $this->setCopyright(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_COPYRIGHT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_COPYRIGHT])) { + $this->setCopyright(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_COPYRIGHT]] + $ext)); + } else if (is_array($data[self::FIELD_COPYRIGHT])) { + $this->setCopyright(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_COPYRIGHT]))); + } } else { $this->setCopyright(new FHIRMarkdown($data[self::FIELD_COPYRIGHT])); } @@ -459,8 +465,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATE] instanceof FHIRDateTime) { $this->setDate($data[self::FIELD_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_DATE])) { - $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime(array_merge($ext, $data[self::FIELD_DATE]))); + } } else { $this->setDate(new FHIRDateTime($data[self::FIELD_DATE])); } @@ -471,8 +481,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRMarkdown) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRMarkdown($data[self::FIELD_DESCRIPTION])); } @@ -483,8 +497,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EXPERIMENTAL] instanceof FHIRBoolean) { $this->setExperimental($data[self::FIELD_EXPERIMENTAL]); - } elseif ($ext && is_scalar($data[self::FIELD_EXPERIMENTAL])) { - $this->setExperimental(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_EXPERIMENTAL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EXPERIMENTAL])) { + $this->setExperimental(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_EXPERIMENTAL]] + $ext)); + } else if (is_array($data[self::FIELD_EXPERIMENTAL])) { + $this->setExperimental(new FHIRBoolean(array_merge($ext, $data[self::FIELD_EXPERIMENTAL]))); + } } else { $this->setExperimental(new FHIRBoolean($data[self::FIELD_EXPERIMENTAL])); } @@ -492,6 +510,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_GROUP])) { if (is_array($data[self::FIELD_GROUP])) { foreach($data[self::FIELD_GROUP] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRConceptMapGroup) { $this->addGroup($v); } else { @@ -510,8 +531,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->setIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { - $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_IDENTIFIER]))); + } } else { $this->setIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); } @@ -519,6 +544,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_JURISDICTION])) { if (is_array($data[self::FIELD_JURISDICTION])) { foreach($data[self::FIELD_JURISDICTION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addJurisdiction($v); } else { @@ -537,8 +565,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -549,8 +581,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PUBLISHER] instanceof FHIRString) { $this->setPublisher($data[self::FIELD_PUBLISHER]); - } elseif ($ext && is_scalar($data[self::FIELD_PUBLISHER])) { - $this->setPublisher(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PUBLISHER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PUBLISHER])) { + $this->setPublisher(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PUBLISHER]] + $ext)); + } else if (is_array($data[self::FIELD_PUBLISHER])) { + $this->setPublisher(new FHIRString(array_merge($ext, $data[self::FIELD_PUBLISHER]))); + } } else { $this->setPublisher(new FHIRString($data[self::FIELD_PUBLISHER])); } @@ -561,8 +597,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PURPOSE] instanceof FHIRMarkdown) { $this->setPurpose($data[self::FIELD_PURPOSE]); - } elseif ($ext && is_scalar($data[self::FIELD_PURPOSE])) { - $this->setPurpose(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_PURPOSE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PURPOSE])) { + $this->setPurpose(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_PURPOSE]] + $ext)); + } else if (is_array($data[self::FIELD_PURPOSE])) { + $this->setPurpose(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_PURPOSE]))); + } } else { $this->setPurpose(new FHIRMarkdown($data[self::FIELD_PURPOSE])); } @@ -573,8 +613,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SOURCE_CANONICAL] instanceof FHIRCanonical) { $this->setSourceCanonical($data[self::FIELD_SOURCE_CANONICAL]); - } elseif ($ext && is_scalar($data[self::FIELD_SOURCE_CANONICAL])) { - $this->setSourceCanonical(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $data[self::FIELD_SOURCE_CANONICAL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SOURCE_CANONICAL])) { + $this->setSourceCanonical(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $data[self::FIELD_SOURCE_CANONICAL]] + $ext)); + } else if (is_array($data[self::FIELD_SOURCE_CANONICAL])) { + $this->setSourceCanonical(new FHIRCanonical(array_merge($ext, $data[self::FIELD_SOURCE_CANONICAL]))); + } } else { $this->setSourceCanonical(new FHIRCanonical($data[self::FIELD_SOURCE_CANONICAL])); } @@ -585,8 +629,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SOURCE_URI] instanceof FHIRUri) { $this->setSourceUri($data[self::FIELD_SOURCE_URI]); - } elseif ($ext && is_scalar($data[self::FIELD_SOURCE_URI])) { - $this->setSourceUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_SOURCE_URI]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SOURCE_URI])) { + $this->setSourceUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_SOURCE_URI]] + $ext)); + } else if (is_array($data[self::FIELD_SOURCE_URI])) { + $this->setSourceUri(new FHIRUri(array_merge($ext, $data[self::FIELD_SOURCE_URI]))); + } } else { $this->setSourceUri(new FHIRUri($data[self::FIELD_SOURCE_URI])); } @@ -597,8 +645,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRPublicationStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRPublicationStatus([FHIRPublicationStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRPublicationStatus([FHIRPublicationStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRPublicationStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRPublicationStatus($data[self::FIELD_STATUS])); } @@ -609,8 +661,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TARGET_CANONICAL] instanceof FHIRCanonical) { $this->setTargetCanonical($data[self::FIELD_TARGET_CANONICAL]); - } elseif ($ext && is_scalar($data[self::FIELD_TARGET_CANONICAL])) { - $this->setTargetCanonical(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $data[self::FIELD_TARGET_CANONICAL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TARGET_CANONICAL])) { + $this->setTargetCanonical(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $data[self::FIELD_TARGET_CANONICAL]] + $ext)); + } else if (is_array($data[self::FIELD_TARGET_CANONICAL])) { + $this->setTargetCanonical(new FHIRCanonical(array_merge($ext, $data[self::FIELD_TARGET_CANONICAL]))); + } } else { $this->setTargetCanonical(new FHIRCanonical($data[self::FIELD_TARGET_CANONICAL])); } @@ -621,8 +677,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TARGET_URI] instanceof FHIRUri) { $this->setTargetUri($data[self::FIELD_TARGET_URI]); - } elseif ($ext && is_scalar($data[self::FIELD_TARGET_URI])) { - $this->setTargetUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_TARGET_URI]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TARGET_URI])) { + $this->setTargetUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_TARGET_URI]] + $ext)); + } else if (is_array($data[self::FIELD_TARGET_URI])) { + $this->setTargetUri(new FHIRUri(array_merge($ext, $data[self::FIELD_TARGET_URI]))); + } } else { $this->setTargetUri(new FHIRUri($data[self::FIELD_TARGET_URI])); } @@ -633,8 +693,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TITLE] instanceof FHIRString) { $this->setTitle($data[self::FIELD_TITLE]); - } elseif ($ext && is_scalar($data[self::FIELD_TITLE])) { - $this->setTitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TITLE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TITLE])) { + $this->setTitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TITLE]] + $ext)); + } else if (is_array($data[self::FIELD_TITLE])) { + $this->setTitle(new FHIRString(array_merge($ext, $data[self::FIELD_TITLE]))); + } } else { $this->setTitle(new FHIRString($data[self::FIELD_TITLE])); } @@ -645,8 +709,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_URL] instanceof FHIRUri) { $this->setUrl($data[self::FIELD_URL]); - } elseif ($ext && is_scalar($data[self::FIELD_URL])) { - $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } else if (is_array($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri(array_merge($ext, $data[self::FIELD_URL]))); + } } else { $this->setUrl(new FHIRUri($data[self::FIELD_URL])); } @@ -654,6 +722,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_USE_CONTEXT])) { if (is_array($data[self::FIELD_USE_CONTEXT])) { foreach($data[self::FIELD_USE_CONTEXT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRUsageContext) { $this->addUseContext($v); } else { @@ -672,8 +743,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VERSION] instanceof FHIRString) { $this->setVersion($data[self::FIELD_VERSION]); - } elseif ($ext && is_scalar($data[self::FIELD_VERSION])) { - $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } else if (is_array($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString(array_merge($ext, $data[self::FIELD_VERSION]))); + } } else { $this->setVersion(new FHIRString($data[self::FIELD_VERSION])); } @@ -1836,7 +1911,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getContact())) { foreach($vs as $v) { if (null === $v) { @@ -1845,6 +1919,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_CONTACT, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getCopyright())) { $v->xmlSerialize($sxe->addChild(self::FIELD_COPYRIGHT, null, $v->_getFHIRXMLNamespace())); } @@ -1857,7 +1932,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getExperimental())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EXPERIMENTAL, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getGroup())) { foreach($vs as $v) { if (null === $v) { @@ -1870,7 +1944,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getJurisdiction())) { foreach($vs as $v) { if (null === $v) { @@ -1879,6 +1952,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_JURISDICTION, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NAME, null, $v->_getFHIRXMLNamespace())); } @@ -1894,7 +1968,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getSourceUri())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SOURCE_URI, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } @@ -1910,7 +1983,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getUrl())) { $v->xmlSerialize($sxe->addChild(self::FIELD_URL, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getUseContext())) { foreach($vs as $v) { if (null === $v) { @@ -1919,6 +1991,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_USE_CONTEXT, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getVersion())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VERSION, null, $v->_getFHIRXMLNamespace())); } @@ -1935,75 +2008,189 @@ public function jsonSerialize() $a[self::FIELD_CONTACT] = $vs; } if (null !== ($v = $this->getCopyright())) { - $a[self::FIELD_COPYRIGHT] = $v->getValue(); - $a[self::FIELD_COPYRIGHT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_COPYRIGHT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_COPYRIGHT_EXT] = $enc; + } + } else { + $a[self::FIELD_COPYRIGHT] = $v; + } } if (null !== ($v = $this->getDate())) { - $a[self::FIELD_DATE] = $v->getValue(); - $a[self::FIELD_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_DATE] = $v; + } } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if (null !== ($v = $this->getExperimental())) { - $a[self::FIELD_EXPERIMENTAL] = $v->getValue(); - $a[self::FIELD_EXPERIMENTAL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EXPERIMENTAL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EXPERIMENTAL_EXT] = $enc; + } + } else { + $a[self::FIELD_EXPERIMENTAL] = $v; + } } if ([] !== ($vs = $this->getGroup())) { $a[self::FIELD_GROUP] = $vs; } if (null !== ($v = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_IDENTIFIER] = $v; + } } if ([] !== ($vs = $this->getJurisdiction())) { $a[self::FIELD_JURISDICTION] = $vs; } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if (null !== ($v = $this->getPublisher())) { - $a[self::FIELD_PUBLISHER] = $v->getValue(); - $a[self::FIELD_PUBLISHER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PUBLISHER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PUBLISHER_EXT] = $enc; + } + } else { + $a[self::FIELD_PUBLISHER] = $v; + } } if (null !== ($v = $this->getPurpose())) { - $a[self::FIELD_PURPOSE] = $v->getValue(); - $a[self::FIELD_PURPOSE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PURPOSE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PURPOSE_EXT] = $enc; + } + } else { + $a[self::FIELD_PURPOSE] = $v; + } } if (null !== ($v = $this->getSourceCanonical())) { - $a[self::FIELD_SOURCE_CANONICAL] = $v->getValue(); - $a[self::FIELD_SOURCE_CANONICAL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SOURCE_CANONICAL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SOURCE_CANONICAL_EXT] = $enc; + } + } else { + $a[self::FIELD_SOURCE_CANONICAL] = $v; + } } if (null !== ($v = $this->getSourceUri())) { - $a[self::FIELD_SOURCE_URI] = $v->getValue(); - $a[self::FIELD_SOURCE_URI_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SOURCE_URI] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SOURCE_URI_EXT] = $enc; + } + } else { + $a[self::FIELD_SOURCE_URI] = $v; + } } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getTargetCanonical())) { - $a[self::FIELD_TARGET_CANONICAL] = $v->getValue(); - $a[self::FIELD_TARGET_CANONICAL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TARGET_CANONICAL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TARGET_CANONICAL_EXT] = $enc; + } + } else { + $a[self::FIELD_TARGET_CANONICAL] = $v; + } } if (null !== ($v = $this->getTargetUri())) { - $a[self::FIELD_TARGET_URI] = $v->getValue(); - $a[self::FIELD_TARGET_URI_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TARGET_URI] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TARGET_URI_EXT] = $enc; + } + } else { + $a[self::FIELD_TARGET_URI] = $v; + } } if (null !== ($v = $this->getTitle())) { - $a[self::FIELD_TITLE] = $v->getValue(); - $a[self::FIELD_TITLE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TITLE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TITLE_EXT] = $enc; + } + } else { + $a[self::FIELD_TITLE] = $v; + } } if (null !== ($v = $this->getUrl())) { - $a[self::FIELD_URL] = $v->getValue(); - $a[self::FIELD_URL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_URL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_URL_EXT] = $enc; + } + } else { + $a[self::FIELD_URL] = $v; + } } if ([] !== ($vs = $this->getUseContext())) { $a[self::FIELD_USE_CONTEXT] = $vs; } if (null !== ($v = $this->getVersion())) { - $a[self::FIELD_VERSION] = $v->getValue(); - $a[self::FIELD_VERSION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VERSION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VERSION_EXT] = $enc; + } + } else { + $a[self::FIELD_VERSION] = $v; + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRCondition.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRCondition.php index 88b907ab99..6333833f05 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRCondition.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRCondition.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -90,11 +90,8 @@ class FHIRCondition extends FHIRDomainResource implements PHPFHIRContainedTypeIn { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONDITION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ABATEMENT_AGE = 'abatementAge'; + const FIELD_ABATEMENT_AGE_EXT = '_abatementAge'; const FIELD_ABATEMENT_DATE_TIME = 'abatementDateTime'; const FIELD_ABATEMENT_DATE_TIME_EXT = '_abatementDateTime'; const FIELD_ABATEMENT_PERIOD = 'abatementPeriod'; @@ -112,6 +109,7 @@ class FHIRCondition extends FHIRDomainResource implements PHPFHIRContainedTypeIn const FIELD_IDENTIFIER_EXT = '_identifier'; const FIELD_NOTE = 'note'; const FIELD_ONSET_AGE = 'onsetAge'; + const FIELD_ONSET_AGE_EXT = '_onsetAge'; const FIELD_ONSET_DATE_TIME = 'onsetDateTime'; const FIELD_ONSET_DATE_TIME_EXT = '_onsetDateTime'; const FIELD_ONSET_PERIOD = 'onsetPeriod'; @@ -443,6 +441,9 @@ class FHIRCondition extends FHIRDomainResource implements PHPFHIRContainedTypeIn */ protected $verificationStatus = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRCondition Constructor * @param null|array $data @@ -460,8 +461,17 @@ public function __construct($data = null) } parent::__construct($data); if (isset($data[self::FIELD_ABATEMENT_AGE])) { + $ext = (isset($data[self::FIELD_ABATEMENT_AGE_EXT]) && is_array($data[self::FIELD_ABATEMENT_AGE_EXT])) + ? $data[self::FIELD_ABATEMENT_AGE_EXT] + : null; if ($data[self::FIELD_ABATEMENT_AGE] instanceof FHIRAge) { $this->setAbatementAge($data[self::FIELD_ABATEMENT_AGE]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ABATEMENT_AGE])) { + $this->setAbatementAge(new FHIRAge([FHIRAge::FIELD_VALUE => $data[self::FIELD_ABATEMENT_AGE]] + $ext)); + } else if (is_array($data[self::FIELD_ABATEMENT_AGE])) { + $this->setAbatementAge(new FHIRAge(array_merge($ext, $data[self::FIELD_ABATEMENT_AGE]))); + } } else { $this->setAbatementAge(new FHIRAge($data[self::FIELD_ABATEMENT_AGE])); } @@ -472,8 +482,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ABATEMENT_DATE_TIME] instanceof FHIRDateTime) { $this->setAbatementDateTime($data[self::FIELD_ABATEMENT_DATE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_ABATEMENT_DATE_TIME])) { - $this->setAbatementDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_ABATEMENT_DATE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ABATEMENT_DATE_TIME])) { + $this->setAbatementDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_ABATEMENT_DATE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_ABATEMENT_DATE_TIME])) { + $this->setAbatementDateTime(new FHIRDateTime(array_merge($ext, $data[self::FIELD_ABATEMENT_DATE_TIME]))); + } } else { $this->setAbatementDateTime(new FHIRDateTime($data[self::FIELD_ABATEMENT_DATE_TIME])); } @@ -498,8 +512,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ABATEMENT_STRING] instanceof FHIRString) { $this->setAbatementString($data[self::FIELD_ABATEMENT_STRING]); - } elseif ($ext && is_scalar($data[self::FIELD_ABATEMENT_STRING])) { - $this->setAbatementString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_ABATEMENT_STRING]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ABATEMENT_STRING])) { + $this->setAbatementString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_ABATEMENT_STRING]] + $ext)); + } else if (is_array($data[self::FIELD_ABATEMENT_STRING])) { + $this->setAbatementString(new FHIRString(array_merge($ext, $data[self::FIELD_ABATEMENT_STRING]))); + } } else { $this->setAbatementString(new FHIRString($data[self::FIELD_ABATEMENT_STRING])); } @@ -514,6 +532,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_BODY_SITE])) { if (is_array($data[self::FIELD_BODY_SITE])) { foreach($data[self::FIELD_BODY_SITE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addBodySite($v); } else { @@ -529,6 +550,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CATEGORY])) { if (is_array($data[self::FIELD_CATEGORY])) { foreach($data[self::FIELD_CATEGORY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addCategory($v); } else { @@ -565,6 +589,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_EVIDENCE])) { if (is_array($data[self::FIELD_EVIDENCE])) { foreach($data[self::FIELD_EVIDENCE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRConditionEvidence) { $this->addEvidence($v); } else { @@ -583,17 +610,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -602,6 +636,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_NOTE])) { if (is_array($data[self::FIELD_NOTE])) { foreach($data[self::FIELD_NOTE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRAnnotation) { $this->addNote($v); } else { @@ -615,8 +652,17 @@ public function __construct($data = null) } } if (isset($data[self::FIELD_ONSET_AGE])) { + $ext = (isset($data[self::FIELD_ONSET_AGE_EXT]) && is_array($data[self::FIELD_ONSET_AGE_EXT])) + ? $data[self::FIELD_ONSET_AGE_EXT] + : null; if ($data[self::FIELD_ONSET_AGE] instanceof FHIRAge) { $this->setOnsetAge($data[self::FIELD_ONSET_AGE]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ONSET_AGE])) { + $this->setOnsetAge(new FHIRAge([FHIRAge::FIELD_VALUE => $data[self::FIELD_ONSET_AGE]] + $ext)); + } else if (is_array($data[self::FIELD_ONSET_AGE])) { + $this->setOnsetAge(new FHIRAge(array_merge($ext, $data[self::FIELD_ONSET_AGE]))); + } } else { $this->setOnsetAge(new FHIRAge($data[self::FIELD_ONSET_AGE])); } @@ -627,8 +673,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ONSET_DATE_TIME] instanceof FHIRDateTime) { $this->setOnsetDateTime($data[self::FIELD_ONSET_DATE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_ONSET_DATE_TIME])) { - $this->setOnsetDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_ONSET_DATE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ONSET_DATE_TIME])) { + $this->setOnsetDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_ONSET_DATE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_ONSET_DATE_TIME])) { + $this->setOnsetDateTime(new FHIRDateTime(array_merge($ext, $data[self::FIELD_ONSET_DATE_TIME]))); + } } else { $this->setOnsetDateTime(new FHIRDateTime($data[self::FIELD_ONSET_DATE_TIME])); } @@ -653,8 +703,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ONSET_STRING] instanceof FHIRString) { $this->setOnsetString($data[self::FIELD_ONSET_STRING]); - } elseif ($ext && is_scalar($data[self::FIELD_ONSET_STRING])) { - $this->setOnsetString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_ONSET_STRING]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ONSET_STRING])) { + $this->setOnsetString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_ONSET_STRING]] + $ext)); + } else if (is_array($data[self::FIELD_ONSET_STRING])) { + $this->setOnsetString(new FHIRString(array_merge($ext, $data[self::FIELD_ONSET_STRING]))); + } } else { $this->setOnsetString(new FHIRString($data[self::FIELD_ONSET_STRING])); } @@ -665,8 +719,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_RECORDED_DATE] instanceof FHIRDateTime) { $this->setRecordedDate($data[self::FIELD_RECORDED_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_RECORDED_DATE])) { - $this->setRecordedDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_RECORDED_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_RECORDED_DATE])) { + $this->setRecordedDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_RECORDED_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_RECORDED_DATE])) { + $this->setRecordedDate(new FHIRDateTime(array_merge($ext, $data[self::FIELD_RECORDED_DATE]))); + } } else { $this->setRecordedDate(new FHIRDateTime($data[self::FIELD_RECORDED_DATE])); } @@ -688,6 +746,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_STAGE])) { if (is_array($data[self::FIELD_STAGE])) { foreach($data[self::FIELD_STAGE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRConditionStage) { $this->addStage($v); } else { @@ -1961,29 +2022,24 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getAbatementAge())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ABATEMENT_AGE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getAbatementDateTime())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ABATEMENT_DATE_TIME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getAbatementPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ABATEMENT_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getAbatementRange())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ABATEMENT_RANGE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getAbatementString())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ABATEMENT_STRING, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getAsserter())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ASSERTER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getBodySite())) { foreach($vs as $v) { if (null === $v) { @@ -2005,15 +2061,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getClinicalStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CLINICAL_STATUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getEncounter())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ENCOUNTER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getEvidence())) { foreach($vs as $v) { if (null === $v) { @@ -2047,11 +2100,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getOnsetDateTime())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ONSET_DATE_TIME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOnsetPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ONSET_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOnsetRange())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ONSET_RANGE, null, $v->_getFHIRXMLNamespace())); } @@ -2061,15 +2112,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getRecordedDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RECORDED_DATE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRecorder())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RECORDER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSeverity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SEVERITY, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getStage())) { foreach($vs as $v) { if (null === $v) { @@ -2082,7 +2130,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getSubject())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBJECT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getVerificationStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VERIFICATION_STATUS, null, $v->_getFHIRXMLNamespace())); } @@ -2096,11 +2143,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getAbatementAge())) { - $a[self::FIELD_ABATEMENT_AGE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ABATEMENT_AGE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ABATEMENT_AGE_EXT] = $enc; + } + } else { + $a[self::FIELD_ABATEMENT_AGE] = $v; + } } if (null !== ($v = $this->getAbatementDateTime())) { - $a[self::FIELD_ABATEMENT_DATE_TIME] = $v->getValue(); - $a[self::FIELD_ABATEMENT_DATE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ABATEMENT_DATE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ABATEMENT_DATE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_ABATEMENT_DATE_TIME] = $v; + } } if (null !== ($v = $this->getAbatementPeriod())) { $a[self::FIELD_ABATEMENT_PERIOD] = $v; @@ -2109,8 +2171,15 @@ public function jsonSerialize() $a[self::FIELD_ABATEMENT_RANGE] = $v; } if (null !== ($v = $this->getAbatementString())) { - $a[self::FIELD_ABATEMENT_STRING] = $v->getValue(); - $a[self::FIELD_ABATEMENT_STRING_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ABATEMENT_STRING] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ABATEMENT_STRING_EXT] = $enc; + } + } else { + $a[self::FIELD_ABATEMENT_STRING] = $v; + } } if (null !== ($v = $this->getAsserter())) { $a[self::FIELD_ASSERTER] = $v; @@ -2134,17 +2203,48 @@ public function jsonSerialize() $a[self::FIELD_EVIDENCE] = $vs; } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if ([] !== ($vs = $this->getNote())) { $a[self::FIELD_NOTE] = $vs; } if (null !== ($v = $this->getOnsetAge())) { - $a[self::FIELD_ONSET_AGE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ONSET_AGE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ONSET_AGE_EXT] = $enc; + } + } else { + $a[self::FIELD_ONSET_AGE] = $v; + } } if (null !== ($v = $this->getOnsetDateTime())) { - $a[self::FIELD_ONSET_DATE_TIME] = $v->getValue(); - $a[self::FIELD_ONSET_DATE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ONSET_DATE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ONSET_DATE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_ONSET_DATE_TIME] = $v; + } } if (null !== ($v = $this->getOnsetPeriod())) { $a[self::FIELD_ONSET_PERIOD] = $v; @@ -2153,12 +2253,26 @@ public function jsonSerialize() $a[self::FIELD_ONSET_RANGE] = $v; } if (null !== ($v = $this->getOnsetString())) { - $a[self::FIELD_ONSET_STRING] = $v->getValue(); - $a[self::FIELD_ONSET_STRING_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ONSET_STRING] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ONSET_STRING_EXT] = $enc; + } + } else { + $a[self::FIELD_ONSET_STRING] = $v; + } } if (null !== ($v = $this->getRecordedDate())) { - $a[self::FIELD_RECORDED_DATE] = $v->getValue(); - $a[self::FIELD_RECORDED_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_RECORDED_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_RECORDED_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_RECORDED_DATE] = $v; + } } if (null !== ($v = $this->getRecorder())) { $a[self::FIELD_RECORDER] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRConsent.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRConsent.php index c3e8041df9..44bac335d1 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRConsent.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRConsent.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -89,10 +89,6 @@ class FHIRConsent extends FHIRDomainResource implements PHPFHIRContainedTypeInte { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONSENT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CATEGORY = 'category'; const FIELD_DATE_TIME = 'dateTime'; const FIELD_DATE_TIME_EXT = '_dateTime'; @@ -286,6 +282,9 @@ class FHIRConsent extends FHIRDomainResource implements PHPFHIRContainedTypeInte */ protected $verification = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRConsent Constructor * @param null|array $data @@ -305,6 +304,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CATEGORY])) { if (is_array($data[self::FIELD_CATEGORY])) { foreach($data[self::FIELD_CATEGORY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addCategory($v); } else { @@ -323,8 +325,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATE_TIME] instanceof FHIRDateTime) { $this->setDateTime($data[self::FIELD_DATE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_DATE_TIME])) { - $this->setDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATE_TIME])) { + $this->setDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_DATE_TIME])) { + $this->setDateTime(new FHIRDateTime(array_merge($ext, $data[self::FIELD_DATE_TIME]))); + } } else { $this->setDateTime(new FHIRDateTime($data[self::FIELD_DATE_TIME])); } @@ -335,17 +341,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -354,6 +367,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ORGANIZATION])) { if (is_array($data[self::FIELD_ORGANIZATION])) { foreach($data[self::FIELD_ORGANIZATION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addOrganization($v); } else { @@ -376,6 +392,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PERFORMER])) { if (is_array($data[self::FIELD_PERFORMER])) { foreach($data[self::FIELD_PERFORMER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addPerformer($v); } else { @@ -391,6 +410,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_POLICY])) { if (is_array($data[self::FIELD_POLICY])) { foreach($data[self::FIELD_POLICY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRConsentPolicy) { $this->addPolicy($v); } else { @@ -444,8 +466,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRConsentState) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRConsentState([FHIRConsentState::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRConsentState([FHIRConsentState::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRConsentState(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRConsentState($data[self::FIELD_STATUS])); } @@ -453,6 +479,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_VERIFICATION])) { if (is_array($data[self::FIELD_VERIFICATION])) { foreach($data[self::FIELD_VERIFICATION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRConsentVerification) { $this->addVerification($v); } else { @@ -1266,7 +1295,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getCategory())) { foreach($vs as $v) { if (null === $v) { @@ -1275,10 +1303,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_CATEGORY, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getDateTime())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DATE_TIME, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -1300,7 +1328,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getPatient())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATIENT, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getPerformer())) { foreach($vs as $v) { if (null === $v) { @@ -1322,27 +1349,21 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getPolicyRule())) { $v->xmlSerialize($sxe->addChild(self::FIELD_POLICY_RULE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getProvision())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PROVISION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getScope())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SCOPE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSourceAttachment())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SOURCE_ATTACHMENT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSourceReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SOURCE_REFERENCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getVerification())) { foreach($vs as $v) { if (null === $v) { @@ -1351,6 +1372,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_VERIFICATION, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } @@ -1364,11 +1386,34 @@ public function jsonSerialize() $a[self::FIELD_CATEGORY] = $vs; } if (null !== ($v = $this->getDateTime())) { - $a[self::FIELD_DATE_TIME] = $v->getValue(); - $a[self::FIELD_DATE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_DATE_TIME] = $v; + } } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if ([] !== ($vs = $this->getOrganization())) { $a[self::FIELD_ORGANIZATION] = $vs; @@ -1398,7 +1443,15 @@ public function jsonSerialize() $a[self::FIELD_SOURCE_REFERENCE] = $v; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if ([] !== ($vs = $this->getVerification())) { $a[self::FIELD_VERIFICATION] = $vs; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRContract.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRContract.php index 92d01bbeeb..0dc22f1547 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRContract.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRContract.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -94,10 +94,6 @@ class FHIRContract extends FHIRDomainResource implements PHPFHIRContainedTypeInt { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONTRACT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ALIAS = 'alias'; const FIELD_ALIAS_EXT = '_alias'; const FIELD_APPLIES = 'applies'; @@ -588,6 +584,9 @@ class FHIRContract extends FHIRDomainResource implements PHPFHIRContainedTypeInt */ protected $version = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRContract Constructor * @param null|array $data @@ -610,17 +609,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_ALIAS])) { foreach($data[self::FIELD_ALIAS] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRString) { $this->addAlias($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addAlias(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addAlias(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addAlias(new FHIRString(array_merge($v, $ext[$i]))); + } } else { $this->addAlias(new FHIRString($v)); } } } elseif ($data[self::FIELD_ALIAS] instanceof FHIRString) { $this->addAlias($data[self::FIELD_ALIAS]); - } elseif ($ext && is_scalar($data[self::FIELD_ALIAS])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_ALIAS])) { $this->addAlias(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_ALIAS]] + $ext)); } else { $this->addAlias(new FHIRString($data[self::FIELD_ALIAS])); @@ -643,6 +649,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_AUTHORITY])) { if (is_array($data[self::FIELD_AUTHORITY])) { foreach($data[self::FIELD_AUTHORITY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addAuthority($v); } else { @@ -672,6 +681,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_DOMAIN])) { if (is_array($data[self::FIELD_DOMAIN])) { foreach($data[self::FIELD_DOMAIN] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addDomain($v); } else { @@ -694,6 +706,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_FRIENDLY])) { if (is_array($data[self::FIELD_FRIENDLY])) { foreach($data[self::FIELD_FRIENDLY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContractFriendly) { $this->addFriendly($v); } else { @@ -712,17 +727,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -741,8 +763,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_INSTANTIATES_URI] instanceof FHIRUri) { $this->setInstantiatesUri($data[self::FIELD_INSTANTIATES_URI]); - } elseif ($ext && is_scalar($data[self::FIELD_INSTANTIATES_URI])) { - $this->setInstantiatesUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_INSTANTIATES_URI]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_INSTANTIATES_URI])) { + $this->setInstantiatesUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_INSTANTIATES_URI]] + $ext)); + } else if (is_array($data[self::FIELD_INSTANTIATES_URI])) { + $this->setInstantiatesUri(new FHIRUri(array_merge($ext, $data[self::FIELD_INSTANTIATES_URI]))); + } } else { $this->setInstantiatesUri(new FHIRUri($data[self::FIELD_INSTANTIATES_URI])); } @@ -753,8 +779,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ISSUED] instanceof FHIRDateTime) { $this->setIssued($data[self::FIELD_ISSUED]); - } elseif ($ext && is_scalar($data[self::FIELD_ISSUED])) { - $this->setIssued(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_ISSUED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ISSUED])) { + $this->setIssued(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_ISSUED]] + $ext)); + } else if (is_array($data[self::FIELD_ISSUED])) { + $this->setIssued(new FHIRDateTime(array_merge($ext, $data[self::FIELD_ISSUED]))); + } } else { $this->setIssued(new FHIRDateTime($data[self::FIELD_ISSUED])); } @@ -762,6 +792,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_LEGAL])) { if (is_array($data[self::FIELD_LEGAL])) { foreach($data[self::FIELD_LEGAL] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContractLegal) { $this->addLegal($v); } else { @@ -801,8 +834,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -810,6 +847,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_RELEVANT_HISTORY])) { if (is_array($data[self::FIELD_RELEVANT_HISTORY])) { foreach($data[self::FIELD_RELEVANT_HISTORY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addRelevantHistory($v); } else { @@ -825,6 +865,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_RULE])) { if (is_array($data[self::FIELD_RULE])) { foreach($data[self::FIELD_RULE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContractRule) { $this->addRule($v); } else { @@ -847,6 +890,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SIGNER])) { if (is_array($data[self::FIELD_SIGNER])) { foreach($data[self::FIELD_SIGNER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContractSigner) { $this->addSigner($v); } else { @@ -862,6 +908,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SITE])) { if (is_array($data[self::FIELD_SITE])) { foreach($data[self::FIELD_SITE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addSite($v); } else { @@ -880,8 +929,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRContractResourceStatusCodes) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRContractResourceStatusCodes([FHIRContractResourceStatusCodes::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRContractResourceStatusCodes([FHIRContractResourceStatusCodes::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRContractResourceStatusCodes(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRContractResourceStatusCodes($data[self::FIELD_STATUS])); } @@ -889,6 +942,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SUB_TYPE])) { if (is_array($data[self::FIELD_SUB_TYPE])) { foreach($data[self::FIELD_SUB_TYPE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addSubType($v); } else { @@ -904,6 +960,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SUBJECT])) { if (is_array($data[self::FIELD_SUBJECT])) { foreach($data[self::FIELD_SUBJECT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addSubject($v); } else { @@ -922,8 +981,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SUBTITLE] instanceof FHIRString) { $this->setSubtitle($data[self::FIELD_SUBTITLE]); - } elseif ($ext && is_scalar($data[self::FIELD_SUBTITLE])) { - $this->setSubtitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SUBTITLE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SUBTITLE])) { + $this->setSubtitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SUBTITLE]] + $ext)); + } else if (is_array($data[self::FIELD_SUBTITLE])) { + $this->setSubtitle(new FHIRString(array_merge($ext, $data[self::FIELD_SUBTITLE]))); + } } else { $this->setSubtitle(new FHIRString($data[self::FIELD_SUBTITLE])); } @@ -931,6 +994,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SUPPORTING_INFO])) { if (is_array($data[self::FIELD_SUPPORTING_INFO])) { foreach($data[self::FIELD_SUPPORTING_INFO] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addSupportingInfo($v); } else { @@ -946,6 +1012,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_TERM])) { if (is_array($data[self::FIELD_TERM])) { foreach($data[self::FIELD_TERM] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContractTerm) { $this->addTerm($v); } else { @@ -964,8 +1033,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TITLE] instanceof FHIRString) { $this->setTitle($data[self::FIELD_TITLE]); - } elseif ($ext && is_scalar($data[self::FIELD_TITLE])) { - $this->setTitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TITLE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TITLE])) { + $this->setTitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TITLE]] + $ext)); + } else if (is_array($data[self::FIELD_TITLE])) { + $this->setTitle(new FHIRString(array_merge($ext, $data[self::FIELD_TITLE]))); + } } else { $this->setTitle(new FHIRString($data[self::FIELD_TITLE])); } @@ -997,8 +1070,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_URL] instanceof FHIRUri) { $this->setUrl($data[self::FIELD_URL]); - } elseif ($ext && is_scalar($data[self::FIELD_URL])) { - $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } else if (is_array($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri(array_merge($ext, $data[self::FIELD_URL]))); + } } else { $this->setUrl(new FHIRUri($data[self::FIELD_URL])); } @@ -1009,8 +1086,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VERSION] instanceof FHIRString) { $this->setVersion($data[self::FIELD_VERSION]); - } elseif ($ext && is_scalar($data[self::FIELD_VERSION])) { - $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } else if (is_array($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString(array_merge($ext, $data[self::FIELD_VERSION]))); + } } else { $this->setVersion(new FHIRString($data[self::FIELD_VERSION])); } @@ -2910,11 +2991,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getApplies())) { $v->xmlSerialize($sxe->addChild(self::FIELD_APPLIES, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getAuthor())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AUTHOR, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getAuthority())) { foreach($vs as $v) { if (null === $v) { @@ -2927,11 +3006,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getContentDefinition())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CONTENT_DEFINITION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getContentDerivative())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CONTENT_DERIVATIVE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getDomain())) { foreach($vs as $v) { if (null === $v) { @@ -2944,7 +3021,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getExpirationType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EXPIRATION_TYPE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getFriendly())) { foreach($vs as $v) { if (null === $v) { @@ -2972,7 +3048,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getIssued())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ISSUED, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getLegal())) { foreach($vs as $v) { if (null === $v) { @@ -2985,18 +3060,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getLegalState())) { $v->xmlSerialize($sxe->addChild(self::FIELD_LEGAL_STATE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getLegallyBindingAttachment())) { $v->xmlSerialize($sxe->addChild(self::FIELD_LEGALLY_BINDING_ATTACHMENT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getLegallyBindingReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_LEGALLY_BINDING_REFERENCE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NAME, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getRelevantHistory())) { foreach($vs as $v) { if (null === $v) { @@ -3018,7 +3090,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getScope())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SCOPE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getSigner())) { foreach($vs as $v) { if (null === $v) { @@ -3040,7 +3111,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getSubType())) { foreach($vs as $v) { if (null === $v) { @@ -3058,10 +3128,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_SUBJECT, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getSubtitle())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBTITLE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getSupportingInfo())) { foreach($vs as $v) { if (null === $v) { @@ -3079,18 +3149,16 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_TERM, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getTitle())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TITLE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getTopicCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TOPIC_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getTopicReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TOPIC_REFERENCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -3115,8 +3183,17 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_ALIAS][] = $v->getValue(); - $a[self::FIELD_ALIAS_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ALIAS][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ALIAS_EXT][] = $enc; + } else { + $a[self::FIELD_ALIAS_EXT][] = null; + } + } else { + $a[self::FIELD_ALIAS][] = $v; + } } } if (null !== ($v = $this->getApplies())) { @@ -3144,18 +3221,48 @@ public function jsonSerialize() $a[self::FIELD_FRIENDLY] = $vs; } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if (null !== ($v = $this->getInstantiatesCanonical())) { $a[self::FIELD_INSTANTIATES_CANONICAL] = $v; } if (null !== ($v = $this->getInstantiatesUri())) { - $a[self::FIELD_INSTANTIATES_URI] = $v->getValue(); - $a[self::FIELD_INSTANTIATES_URI_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_INSTANTIATES_URI] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_INSTANTIATES_URI_EXT] = $enc; + } + } else { + $a[self::FIELD_INSTANTIATES_URI] = $v; + } } if (null !== ($v = $this->getIssued())) { - $a[self::FIELD_ISSUED] = $v->getValue(); - $a[self::FIELD_ISSUED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ISSUED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ISSUED_EXT] = $enc; + } + } else { + $a[self::FIELD_ISSUED] = $v; + } } if ([] !== ($vs = $this->getLegal())) { $a[self::FIELD_LEGAL] = $vs; @@ -3170,8 +3277,15 @@ public function jsonSerialize() $a[self::FIELD_LEGALLY_BINDING_REFERENCE] = $v; } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if ([] !== ($vs = $this->getRelevantHistory())) { $a[self::FIELD_RELEVANT_HISTORY] = $vs; @@ -3189,7 +3303,15 @@ public function jsonSerialize() $a[self::FIELD_SITE] = $vs; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if ([] !== ($vs = $this->getSubType())) { $a[self::FIELD_SUB_TYPE] = $vs; @@ -3198,8 +3320,15 @@ public function jsonSerialize() $a[self::FIELD_SUBJECT] = $vs; } if (null !== ($v = $this->getSubtitle())) { - $a[self::FIELD_SUBTITLE] = $v->getValue(); - $a[self::FIELD_SUBTITLE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SUBTITLE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SUBTITLE_EXT] = $enc; + } + } else { + $a[self::FIELD_SUBTITLE] = $v; + } } if ([] !== ($vs = $this->getSupportingInfo())) { $a[self::FIELD_SUPPORTING_INFO] = $vs; @@ -3208,8 +3337,15 @@ public function jsonSerialize() $a[self::FIELD_TERM] = $vs; } if (null !== ($v = $this->getTitle())) { - $a[self::FIELD_TITLE] = $v->getValue(); - $a[self::FIELD_TITLE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TITLE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TITLE_EXT] = $enc; + } + } else { + $a[self::FIELD_TITLE] = $v; + } } if (null !== ($v = $this->getTopicCodeableConcept())) { $a[self::FIELD_TOPIC_CODEABLE_CONCEPT] = $v; @@ -3221,12 +3357,26 @@ public function jsonSerialize() $a[self::FIELD_TYPE] = $v; } if (null !== ($v = $this->getUrl())) { - $a[self::FIELD_URL] = $v->getValue(); - $a[self::FIELD_URL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_URL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_URL_EXT] = $enc; + } + } else { + $a[self::FIELD_URL] = $v; + } } if (null !== ($v = $this->getVersion())) { - $a[self::FIELD_VERSION] = $v->getValue(); - $a[self::FIELD_VERSION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VERSION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VERSION_EXT] = $enc; + } + } else { + $a[self::FIELD_VERSION] = $v; + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRCoverage.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRCoverage.php index 960691ca19..afb8178551 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRCoverage.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRCoverage.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -89,10 +89,6 @@ class FHIRCoverage extends FHIRDomainResource implements PHPFHIRContainedTypeInt { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_COVERAGE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_BENEFICIARY = 'beneficiary'; const FIELD_CLASS = 'class'; const FIELD_CLASS_EXT = '_class'; @@ -319,6 +315,9 @@ class FHIRCoverage extends FHIRDomainResource implements PHPFHIRContainedTypeInt */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRCoverage Constructor * @param null|array $data @@ -348,17 +347,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_CLASS])) { foreach($data[self::FIELD_CLASS] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCoverageClass) { $this->addClass($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addClass(new FHIRCoverageClass([FHIRCoverageClass::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addClass(new FHIRCoverageClass([FHIRCoverageClass::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addClass(new FHIRCoverageClass(array_merge($v, $ext[$i]))); + } } else { $this->addClass(new FHIRCoverageClass($v)); } } } elseif ($data[self::FIELD_CLASS] instanceof FHIRCoverageClass) { $this->addClass($data[self::FIELD_CLASS]); - } elseif ($ext && is_scalar($data[self::FIELD_CLASS])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_CLASS])) { $this->addClass(new FHIRCoverageClass([FHIRCoverageClass::FIELD_VALUE => $data[self::FIELD_CLASS]] + $ext)); } else { $this->addClass(new FHIRCoverageClass($data[self::FIELD_CLASS])); @@ -367,6 +373,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CONTRACT])) { if (is_array($data[self::FIELD_CONTRACT])) { foreach($data[self::FIELD_CONTRACT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addContract($v); } else { @@ -382,6 +391,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_COST_TO_BENEFICIARY])) { if (is_array($data[self::FIELD_COST_TO_BENEFICIARY])) { foreach($data[self::FIELD_COST_TO_BENEFICIARY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCoverageCostToBeneficiary) { $this->addCostToBeneficiary($v); } else { @@ -400,8 +412,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DEPENDENT] instanceof FHIRString) { $this->setDependent($data[self::FIELD_DEPENDENT]); - } elseif ($ext && is_scalar($data[self::FIELD_DEPENDENT])) { - $this->setDependent(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DEPENDENT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DEPENDENT])) { + $this->setDependent(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DEPENDENT]] + $ext)); + } else if (is_array($data[self::FIELD_DEPENDENT])) { + $this->setDependent(new FHIRString(array_merge($ext, $data[self::FIELD_DEPENDENT]))); + } } else { $this->setDependent(new FHIRString($data[self::FIELD_DEPENDENT])); } @@ -412,17 +428,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -434,8 +457,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NETWORK] instanceof FHIRString) { $this->setNetwork($data[self::FIELD_NETWORK]); - } elseif ($ext && is_scalar($data[self::FIELD_NETWORK])) { - $this->setNetwork(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NETWORK]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NETWORK])) { + $this->setNetwork(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NETWORK]] + $ext)); + } else if (is_array($data[self::FIELD_NETWORK])) { + $this->setNetwork(new FHIRString(array_merge($ext, $data[self::FIELD_NETWORK]))); + } } else { $this->setNetwork(new FHIRString($data[self::FIELD_NETWORK])); } @@ -446,8 +473,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ORDER] instanceof FHIRPositiveInt) { $this->setOrder($data[self::FIELD_ORDER]); - } elseif ($ext && is_scalar($data[self::FIELD_ORDER])) { - $this->setOrder(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_ORDER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ORDER])) { + $this->setOrder(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_ORDER]] + $ext)); + } else if (is_array($data[self::FIELD_ORDER])) { + $this->setOrder(new FHIRPositiveInt(array_merge($ext, $data[self::FIELD_ORDER]))); + } } else { $this->setOrder(new FHIRPositiveInt($data[self::FIELD_ORDER])); } @@ -455,6 +486,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PAYOR])) { if (is_array($data[self::FIELD_PAYOR])) { foreach($data[self::FIELD_PAYOR] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addPayor($v); } else { @@ -494,8 +528,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRFinancialResourceStatusCodes) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRFinancialResourceStatusCodes([FHIRFinancialResourceStatusCodes::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRFinancialResourceStatusCodes([FHIRFinancialResourceStatusCodes::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRFinancialResourceStatusCodes(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRFinancialResourceStatusCodes($data[self::FIELD_STATUS])); } @@ -506,8 +544,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SUBROGATION] instanceof FHIRBoolean) { $this->setSubrogation($data[self::FIELD_SUBROGATION]); - } elseif ($ext && is_scalar($data[self::FIELD_SUBROGATION])) { - $this->setSubrogation(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_SUBROGATION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SUBROGATION])) { + $this->setSubrogation(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_SUBROGATION]] + $ext)); + } else if (is_array($data[self::FIELD_SUBROGATION])) { + $this->setSubrogation(new FHIRBoolean(array_merge($ext, $data[self::FIELD_SUBROGATION]))); + } } else { $this->setSubrogation(new FHIRBoolean($data[self::FIELD_SUBROGATION])); } @@ -525,8 +567,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SUBSCRIBER_ID] instanceof FHIRString) { $this->setSubscriberId($data[self::FIELD_SUBSCRIBER_ID]); - } elseif ($ext && is_scalar($data[self::FIELD_SUBSCRIBER_ID])) { - $this->setSubscriberId(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SUBSCRIBER_ID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SUBSCRIBER_ID])) { + $this->setSubscriberId(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SUBSCRIBER_ID]] + $ext)); + } else if (is_array($data[self::FIELD_SUBSCRIBER_ID])) { + $this->setSubscriberId(new FHIRString(array_merge($ext, $data[self::FIELD_SUBSCRIBER_ID]))); + } } else { $this->setSubscriberId(new FHIRString($data[self::FIELD_SUBSCRIBER_ID])); } @@ -1430,11 +1476,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getBeneficiary())) { $v->xmlSerialize($sxe->addChild(self::FIELD_BENEFICIARY, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getClass())) { foreach($vs as $v) { if (null === $v) { @@ -1461,10 +1505,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_COST_TO_BENEFICIARY, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getDependent())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEPENDENT, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -1473,13 +1517,13 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getNetwork())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NETWORK, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getOrder())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ORDER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getPayor())) { foreach($vs as $v) { if (null === $v) { @@ -1492,29 +1536,24 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPolicyHolder())) { $v->xmlSerialize($sxe->addChild(self::FIELD_POLICY_HOLDER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRelationship())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RELATIONSHIP, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getSubrogation())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBROGATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSubscriber())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBSCRIBER, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getSubscriberId())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBSCRIBER_ID, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -1531,7 +1570,23 @@ public function jsonSerialize() $a[self::FIELD_BENEFICIARY] = $v; } if ([] !== ($vs = $this->getClass())) { - $a[self::FIELD_CLASS] = $vs; + $a[self::FIELD_CLASS] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CLASS][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CLASS_EXT][] = $enc; + } else { + $a[self::FIELD_CLASS_EXT][] = null; + } + } else { + $a[self::FIELD_CLASS][] = $v; + } + } } if ([] !== ($vs = $this->getContract())) { $a[self::FIELD_CONTRACT] = $vs; @@ -1540,19 +1595,56 @@ public function jsonSerialize() $a[self::FIELD_COST_TO_BENEFICIARY] = $vs; } if (null !== ($v = $this->getDependent())) { - $a[self::FIELD_DEPENDENT] = $v->getValue(); - $a[self::FIELD_DEPENDENT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DEPENDENT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DEPENDENT_EXT] = $enc; + } + } else { + $a[self::FIELD_DEPENDENT] = $v; + } } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if (null !== ($v = $this->getNetwork())) { - $a[self::FIELD_NETWORK] = $v->getValue(); - $a[self::FIELD_NETWORK_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NETWORK] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NETWORK_EXT] = $enc; + } + } else { + $a[self::FIELD_NETWORK] = $v; + } } if (null !== ($v = $this->getOrder())) { - $a[self::FIELD_ORDER] = $v->getValue(); - $a[self::FIELD_ORDER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ORDER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ORDER_EXT] = $enc; + } + } else { + $a[self::FIELD_ORDER] = $v; + } } if ([] !== ($vs = $this->getPayor())) { $a[self::FIELD_PAYOR] = $vs; @@ -1567,18 +1659,40 @@ public function jsonSerialize() $a[self::FIELD_RELATIONSHIP] = $v; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getSubrogation())) { - $a[self::FIELD_SUBROGATION] = $v->getValue(); - $a[self::FIELD_SUBROGATION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SUBROGATION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SUBROGATION_EXT] = $enc; + } + } else { + $a[self::FIELD_SUBROGATION] = $v; + } } if (null !== ($v = $this->getSubscriber())) { $a[self::FIELD_SUBSCRIBER] = $v; } if (null !== ($v = $this->getSubscriberId())) { - $a[self::FIELD_SUBSCRIBER_ID] = $v->getValue(); - $a[self::FIELD_SUBSCRIBER_ID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SUBSCRIBER_ID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SUBSCRIBER_ID_EXT] = $enc; + } + } else { + $a[self::FIELD_SUBSCRIBER_ID] = $v; + } } if (null !== ($v = $this->getType())) { $a[self::FIELD_TYPE] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRCoverageEligibilityRequest.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRCoverageEligibilityRequest.php index 6bf3048da4..b25a875c0e 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRCoverageEligibilityRequest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRCoverageEligibilityRequest.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -93,10 +93,6 @@ class FHIRCoverageEligibilityRequest extends FHIRDomainResource implements PHPFH { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_COVERAGE_ELIGIBILITY_REQUEST; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CREATED = 'created'; const FIELD_CREATED_EXT = '_created'; const FIELD_ENTERER = 'enterer'; @@ -304,6 +300,9 @@ class FHIRCoverageEligibilityRequest extends FHIRDomainResource implements PHPFH */ protected $supportingInfo = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRCoverageEligibilityRequest Constructor * @param null|array $data @@ -326,8 +325,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CREATED] instanceof FHIRDateTime) { $this->setCreated($data[self::FIELD_CREATED]); - } elseif ($ext && is_scalar($data[self::FIELD_CREATED])) { - $this->setCreated(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_CREATED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CREATED])) { + $this->setCreated(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_CREATED]] + $ext)); + } else if (is_array($data[self::FIELD_CREATED])) { + $this->setCreated(new FHIRDateTime(array_merge($ext, $data[self::FIELD_CREATED]))); + } } else { $this->setCreated(new FHIRDateTime($data[self::FIELD_CREATED])); } @@ -352,17 +355,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -371,6 +381,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_INSURANCE])) { if (is_array($data[self::FIELD_INSURANCE])) { foreach($data[self::FIELD_INSURANCE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCoverageEligibilityRequestInsurance) { $this->addInsurance($v); } else { @@ -393,6 +406,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ITEM])) { if (is_array($data[self::FIELD_ITEM])) { foreach($data[self::FIELD_ITEM] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCoverageEligibilityRequestItem) { $this->addItem($v); } else { @@ -432,17 +448,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_PURPOSE])) { foreach($data[self::FIELD_PURPOSE] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIREligibilityRequestPurpose) { $this->addPurpose($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addPurpose(new FHIREligibilityRequestPurpose([FHIREligibilityRequestPurpose::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addPurpose(new FHIREligibilityRequestPurpose([FHIREligibilityRequestPurpose::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addPurpose(new FHIREligibilityRequestPurpose(array_merge($v, $ext[$i]))); + } } else { $this->addPurpose(new FHIREligibilityRequestPurpose($v)); } } } elseif ($data[self::FIELD_PURPOSE] instanceof FHIREligibilityRequestPurpose) { $this->addPurpose($data[self::FIELD_PURPOSE]); - } elseif ($ext && is_scalar($data[self::FIELD_PURPOSE])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_PURPOSE])) { $this->addPurpose(new FHIREligibilityRequestPurpose([FHIREligibilityRequestPurpose::FIELD_VALUE => $data[self::FIELD_PURPOSE]] + $ext)); } else { $this->addPurpose(new FHIREligibilityRequestPurpose($data[self::FIELD_PURPOSE])); @@ -454,8 +477,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SERVICED_DATE] instanceof FHIRDate) { $this->setServicedDate($data[self::FIELD_SERVICED_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_SERVICED_DATE])) { - $this->setServicedDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_SERVICED_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SERVICED_DATE])) { + $this->setServicedDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_SERVICED_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_SERVICED_DATE])) { + $this->setServicedDate(new FHIRDate(array_merge($ext, $data[self::FIELD_SERVICED_DATE]))); + } } else { $this->setServicedDate(new FHIRDate($data[self::FIELD_SERVICED_DATE])); } @@ -473,8 +500,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRFinancialResourceStatusCodes) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRFinancialResourceStatusCodes([FHIRFinancialResourceStatusCodes::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRFinancialResourceStatusCodes([FHIRFinancialResourceStatusCodes::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRFinancialResourceStatusCodes(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRFinancialResourceStatusCodes($data[self::FIELD_STATUS])); } @@ -482,6 +513,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SUPPORTING_INFO])) { if (is_array($data[self::FIELD_SUPPORTING_INFO])) { foreach($data[self::FIELD_SUPPORTING_INFO] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCoverageEligibilityRequestSupportingInfo) { $this->addSupportingInfo($v); } else { @@ -1318,15 +1352,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getCreated())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CREATED, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getEnterer())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ENTERER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getFacility())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FACILITY, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -1348,7 +1379,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getInsurer())) { $v->xmlSerialize($sxe->addChild(self::FIELD_INSURER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getItem())) { foreach($vs as $v) { if (null === $v) { @@ -1361,15 +1391,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getPatient())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATIENT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPriority())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PRIORITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getProvider())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PROVIDER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getPurpose())) { foreach($vs as $v) { if (null === $v) { @@ -1378,18 +1405,16 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_PURPOSE, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getServicedDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SERVICED_DATE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getServicedPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SERVICED_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getSupportingInfo())) { foreach($vs as $v) { if (null === $v) { @@ -1398,6 +1423,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_SUPPORTING_INFO, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } @@ -1408,8 +1434,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getCreated())) { - $a[self::FIELD_CREATED] = $v->getValue(); - $a[self::FIELD_CREATED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CREATED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CREATED_EXT] = $enc; + } + } else { + $a[self::FIELD_CREATED] = $v; + } } if (null !== ($v = $this->getEnterer())) { $a[self::FIELD_ENTERER] = $v; @@ -1418,7 +1451,23 @@ public function jsonSerialize() $a[self::FIELD_FACILITY] = $v; } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if ([] !== ($vs = $this->getInsurance())) { $a[self::FIELD_INSURANCE] = $vs; @@ -1439,17 +1488,48 @@ public function jsonSerialize() $a[self::FIELD_PROVIDER] = $v; } if ([] !== ($vs = $this->getPurpose())) { - $a[self::FIELD_PURPOSE] = $vs; + $a[self::FIELD_PURPOSE] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PURPOSE][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PURPOSE_EXT][] = $enc; + } else { + $a[self::FIELD_PURPOSE_EXT][] = null; + } + } else { + $a[self::FIELD_PURPOSE][] = $v; + } + } } if (null !== ($v = $this->getServicedDate())) { - $a[self::FIELD_SERVICED_DATE] = $v->getValue(); - $a[self::FIELD_SERVICED_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SERVICED_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SERVICED_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_SERVICED_DATE] = $v; + } } if (null !== ($v = $this->getServicedPeriod())) { $a[self::FIELD_SERVICED_PERIOD] = $v; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if ([] !== ($vs = $this->getSupportingInfo())) { $a[self::FIELD_SUPPORTING_INFO] = $vs; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRCoverageEligibilityResponse.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRCoverageEligibilityResponse.php index 3d0069d6d9..752e774a86 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRCoverageEligibilityResponse.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRCoverageEligibilityResponse.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -91,10 +91,6 @@ class FHIRCoverageEligibilityResponse extends FHIRDomainResource implements PHPF { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_COVERAGE_ELIGIBILITY_RESPONSE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CREATED = 'created'; const FIELD_CREATED_EXT = '_created'; const FIELD_DISPOSITION = 'disposition'; @@ -306,6 +302,9 @@ class FHIRCoverageEligibilityResponse extends FHIRDomainResource implements PHPF */ protected $status = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRCoverageEligibilityResponse Constructor * @param null|array $data @@ -328,8 +327,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CREATED] instanceof FHIRDateTime) { $this->setCreated($data[self::FIELD_CREATED]); - } elseif ($ext && is_scalar($data[self::FIELD_CREATED])) { - $this->setCreated(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_CREATED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CREATED])) { + $this->setCreated(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_CREATED]] + $ext)); + } else if (is_array($data[self::FIELD_CREATED])) { + $this->setCreated(new FHIRDateTime(array_merge($ext, $data[self::FIELD_CREATED]))); + } } else { $this->setCreated(new FHIRDateTime($data[self::FIELD_CREATED])); } @@ -340,8 +343,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DISPOSITION] instanceof FHIRString) { $this->setDisposition($data[self::FIELD_DISPOSITION]); - } elseif ($ext && is_scalar($data[self::FIELD_DISPOSITION])) { - $this->setDisposition(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DISPOSITION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DISPOSITION])) { + $this->setDisposition(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DISPOSITION]] + $ext)); + } else if (is_array($data[self::FIELD_DISPOSITION])) { + $this->setDisposition(new FHIRString(array_merge($ext, $data[self::FIELD_DISPOSITION]))); + } } else { $this->setDisposition(new FHIRString($data[self::FIELD_DISPOSITION])); } @@ -349,6 +356,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ERROR])) { if (is_array($data[self::FIELD_ERROR])) { foreach($data[self::FIELD_ERROR] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCoverageEligibilityResponseError) { $this->addError($v); } else { @@ -374,17 +384,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -393,6 +410,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_INSURANCE])) { if (is_array($data[self::FIELD_INSURANCE])) { foreach($data[self::FIELD_INSURANCE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCoverageEligibilityResponseInsurance) { $this->addInsurance($v); } else { @@ -418,8 +438,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_OUTCOME] instanceof FHIRRemittanceOutcome) { $this->setOutcome($data[self::FIELD_OUTCOME]); - } elseif ($ext && is_scalar($data[self::FIELD_OUTCOME])) { - $this->setOutcome(new FHIRRemittanceOutcome([FHIRRemittanceOutcome::FIELD_VALUE => $data[self::FIELD_OUTCOME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_OUTCOME])) { + $this->setOutcome(new FHIRRemittanceOutcome([FHIRRemittanceOutcome::FIELD_VALUE => $data[self::FIELD_OUTCOME]] + $ext)); + } else if (is_array($data[self::FIELD_OUTCOME])) { + $this->setOutcome(new FHIRRemittanceOutcome(array_merge($ext, $data[self::FIELD_OUTCOME]))); + } } else { $this->setOutcome(new FHIRRemittanceOutcome($data[self::FIELD_OUTCOME])); } @@ -437,8 +461,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PRE_AUTH_REF] instanceof FHIRString) { $this->setPreAuthRef($data[self::FIELD_PRE_AUTH_REF]); - } elseif ($ext && is_scalar($data[self::FIELD_PRE_AUTH_REF])) { - $this->setPreAuthRef(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PRE_AUTH_REF]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PRE_AUTH_REF])) { + $this->setPreAuthRef(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PRE_AUTH_REF]] + $ext)); + } else if (is_array($data[self::FIELD_PRE_AUTH_REF])) { + $this->setPreAuthRef(new FHIRString(array_merge($ext, $data[self::FIELD_PRE_AUTH_REF]))); + } } else { $this->setPreAuthRef(new FHIRString($data[self::FIELD_PRE_AUTH_REF])); } @@ -449,17 +477,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_PURPOSE])) { foreach($data[self::FIELD_PURPOSE] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIREligibilityResponsePurpose) { $this->addPurpose($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addPurpose(new FHIREligibilityResponsePurpose([FHIREligibilityResponsePurpose::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addPurpose(new FHIREligibilityResponsePurpose([FHIREligibilityResponsePurpose::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addPurpose(new FHIREligibilityResponsePurpose(array_merge($v, $ext[$i]))); + } } else { $this->addPurpose(new FHIREligibilityResponsePurpose($v)); } } } elseif ($data[self::FIELD_PURPOSE] instanceof FHIREligibilityResponsePurpose) { $this->addPurpose($data[self::FIELD_PURPOSE]); - } elseif ($ext && is_scalar($data[self::FIELD_PURPOSE])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_PURPOSE])) { $this->addPurpose(new FHIREligibilityResponsePurpose([FHIREligibilityResponsePurpose::FIELD_VALUE => $data[self::FIELD_PURPOSE]] + $ext)); } else { $this->addPurpose(new FHIREligibilityResponsePurpose($data[self::FIELD_PURPOSE])); @@ -485,8 +520,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SERVICED_DATE] instanceof FHIRDate) { $this->setServicedDate($data[self::FIELD_SERVICED_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_SERVICED_DATE])) { - $this->setServicedDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_SERVICED_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SERVICED_DATE])) { + $this->setServicedDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_SERVICED_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_SERVICED_DATE])) { + $this->setServicedDate(new FHIRDate(array_merge($ext, $data[self::FIELD_SERVICED_DATE]))); + } } else { $this->setServicedDate(new FHIRDate($data[self::FIELD_SERVICED_DATE])); } @@ -504,8 +543,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRFinancialResourceStatusCodes) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRFinancialResourceStatusCodes([FHIRFinancialResourceStatusCodes::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRFinancialResourceStatusCodes([FHIRFinancialResourceStatusCodes::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRFinancialResourceStatusCodes(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRFinancialResourceStatusCodes($data[self::FIELD_STATUS])); } @@ -1332,7 +1375,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDisposition())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DISPOSITION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getError())) { foreach($vs as $v) { if (null === $v) { @@ -1345,7 +1387,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getForm())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FORM, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -1367,18 +1408,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getInsurer())) { $v->xmlSerialize($sxe->addChild(self::FIELD_INSURER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOutcome())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OUTCOME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPatient())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATIENT, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getPreAuthRef())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PRE_AUTH_REF, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getPurpose())) { foreach($vs as $v) { if (null === $v) { @@ -1391,18 +1429,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getRequest())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REQUEST, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRequestor())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REQUESTOR, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getServicedDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SERVICED_DATE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getServicedPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SERVICED_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } @@ -1416,12 +1451,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getCreated())) { - $a[self::FIELD_CREATED] = $v->getValue(); - $a[self::FIELD_CREATED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CREATED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CREATED_EXT] = $enc; + } + } else { + $a[self::FIELD_CREATED] = $v; + } } if (null !== ($v = $this->getDisposition())) { - $a[self::FIELD_DISPOSITION] = $v->getValue(); - $a[self::FIELD_DISPOSITION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DISPOSITION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DISPOSITION_EXT] = $enc; + } + } else { + $a[self::FIELD_DISPOSITION] = $v; + } } if ([] !== ($vs = $this->getError())) { $a[self::FIELD_ERROR] = $vs; @@ -1430,7 +1479,23 @@ public function jsonSerialize() $a[self::FIELD_FORM] = $v; } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if ([] !== ($vs = $this->getInsurance())) { $a[self::FIELD_INSURANCE] = $vs; @@ -1439,17 +1504,48 @@ public function jsonSerialize() $a[self::FIELD_INSURER] = $v; } if (null !== ($v = $this->getOutcome())) { - $a[self::FIELD_OUTCOME] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_OUTCOME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_OUTCOME_EXT] = $enc; + } + } else { + $a[self::FIELD_OUTCOME] = $v; + } } if (null !== ($v = $this->getPatient())) { $a[self::FIELD_PATIENT] = $v; } if (null !== ($v = $this->getPreAuthRef())) { - $a[self::FIELD_PRE_AUTH_REF] = $v->getValue(); - $a[self::FIELD_PRE_AUTH_REF_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PRE_AUTH_REF] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PRE_AUTH_REF_EXT] = $enc; + } + } else { + $a[self::FIELD_PRE_AUTH_REF] = $v; + } } if ([] !== ($vs = $this->getPurpose())) { - $a[self::FIELD_PURPOSE] = $vs; + $a[self::FIELD_PURPOSE] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PURPOSE][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PURPOSE_EXT][] = $enc; + } else { + $a[self::FIELD_PURPOSE_EXT][] = null; + } + } else { + $a[self::FIELD_PURPOSE][] = $v; + } + } } if (null !== ($v = $this->getRequest())) { $a[self::FIELD_REQUEST] = $v; @@ -1458,14 +1554,29 @@ public function jsonSerialize() $a[self::FIELD_REQUESTOR] = $v; } if (null !== ($v = $this->getServicedDate())) { - $a[self::FIELD_SERVICED_DATE] = $v->getValue(); - $a[self::FIELD_SERVICED_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SERVICED_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SERVICED_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_SERVICED_DATE] = $v; + } } if (null !== ($v = $this->getServicedPeriod())) { $a[self::FIELD_SERVICED_PERIOD] = $v; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRDetectedIssue.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRDetectedIssue.php index e598537826..b3068c2835 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRDetectedIssue.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRDetectedIssue.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -91,10 +91,6 @@ class FHIRDetectedIssue extends FHIRDomainResource implements PHPFHIRContainedTy { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DETECTED_ISSUE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_AUTHOR = 'author'; const FIELD_CODE = 'code'; const FIELD_DETAIL = 'detail'; @@ -271,6 +267,9 @@ class FHIRDetectedIssue extends FHIRDomainResource implements PHPFHIRContainedTy */ protected $status = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRDetectedIssue Constructor * @param null|array $data @@ -307,8 +306,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DETAIL] instanceof FHIRString) { $this->setDetail($data[self::FIELD_DETAIL]); - } elseif ($ext && is_scalar($data[self::FIELD_DETAIL])) { - $this->setDetail(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DETAIL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DETAIL])) { + $this->setDetail(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DETAIL]] + $ext)); + } else if (is_array($data[self::FIELD_DETAIL])) { + $this->setDetail(new FHIRString(array_merge($ext, $data[self::FIELD_DETAIL]))); + } } else { $this->setDetail(new FHIRString($data[self::FIELD_DETAIL])); } @@ -316,6 +319,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_EVIDENCE])) { if (is_array($data[self::FIELD_EVIDENCE])) { foreach($data[self::FIELD_EVIDENCE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRDetectedIssueEvidence) { $this->addEvidence($v); } else { @@ -334,8 +340,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IDENTIFIED_DATE_TIME] instanceof FHIRDateTime) { $this->setIdentifiedDateTime($data[self::FIELD_IDENTIFIED_DATE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIED_DATE_TIME])) { - $this->setIdentifiedDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_IDENTIFIED_DATE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IDENTIFIED_DATE_TIME])) { + $this->setIdentifiedDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_IDENTIFIED_DATE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_IDENTIFIED_DATE_TIME])) { + $this->setIdentifiedDateTime(new FHIRDateTime(array_merge($ext, $data[self::FIELD_IDENTIFIED_DATE_TIME]))); + } } else { $this->setIdentifiedDateTime(new FHIRDateTime($data[self::FIELD_IDENTIFIED_DATE_TIME])); } @@ -353,17 +363,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -372,6 +389,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_IMPLICATED])) { if (is_array($data[self::FIELD_IMPLICATED])) { foreach($data[self::FIELD_IMPLICATED] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addImplicated($v); } else { @@ -387,6 +407,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_MITIGATION])) { if (is_array($data[self::FIELD_MITIGATION])) { foreach($data[self::FIELD_MITIGATION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRDetectedIssueMitigation) { $this->addMitigation($v); } else { @@ -412,8 +435,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_REFERENCE] instanceof FHIRUri) { $this->setReference($data[self::FIELD_REFERENCE]); - } elseif ($ext && is_scalar($data[self::FIELD_REFERENCE])) { - $this->setReference(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_REFERENCE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_REFERENCE])) { + $this->setReference(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_REFERENCE]] + $ext)); + } else if (is_array($data[self::FIELD_REFERENCE])) { + $this->setReference(new FHIRUri(array_merge($ext, $data[self::FIELD_REFERENCE]))); + } } else { $this->setReference(new FHIRUri($data[self::FIELD_REFERENCE])); } @@ -424,8 +451,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SEVERITY] instanceof FHIRDetectedIssueSeverity) { $this->setSeverity($data[self::FIELD_SEVERITY]); - } elseif ($ext && is_scalar($data[self::FIELD_SEVERITY])) { - $this->setSeverity(new FHIRDetectedIssueSeverity([FHIRDetectedIssueSeverity::FIELD_VALUE => $data[self::FIELD_SEVERITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SEVERITY])) { + $this->setSeverity(new FHIRDetectedIssueSeverity([FHIRDetectedIssueSeverity::FIELD_VALUE => $data[self::FIELD_SEVERITY]] + $ext)); + } else if (is_array($data[self::FIELD_SEVERITY])) { + $this->setSeverity(new FHIRDetectedIssueSeverity(array_merge($ext, $data[self::FIELD_SEVERITY]))); + } } else { $this->setSeverity(new FHIRDetectedIssueSeverity($data[self::FIELD_SEVERITY])); } @@ -436,8 +467,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRObservationStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRObservationStatus([FHIRObservationStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRObservationStatus([FHIRObservationStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRObservationStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRObservationStatus($data[self::FIELD_STATUS])); } @@ -1157,18 +1192,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getAuthor())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AUTHOR, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getDetail())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DETAIL, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getEvidence())) { foreach($vs as $v) { if (null === $v) { @@ -1177,14 +1209,13 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_EVIDENCE, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getIdentifiedDateTime())) { $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIED_DATE_TIME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getIdentifiedPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIED_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -1218,11 +1249,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REFERENCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSeverity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SEVERITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } @@ -1242,21 +1271,51 @@ public function jsonSerialize() $a[self::FIELD_CODE] = $v; } if (null !== ($v = $this->getDetail())) { - $a[self::FIELD_DETAIL] = $v->getValue(); - $a[self::FIELD_DETAIL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DETAIL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DETAIL_EXT] = $enc; + } + } else { + $a[self::FIELD_DETAIL] = $v; + } } if ([] !== ($vs = $this->getEvidence())) { $a[self::FIELD_EVIDENCE] = $vs; } if (null !== ($v = $this->getIdentifiedDateTime())) { - $a[self::FIELD_IDENTIFIED_DATE_TIME] = $v->getValue(); - $a[self::FIELD_IDENTIFIED_DATE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIED_DATE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIED_DATE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_IDENTIFIED_DATE_TIME] = $v; + } } if (null !== ($v = $this->getIdentifiedPeriod())) { $a[self::FIELD_IDENTIFIED_PERIOD] = $v; } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if ([] !== ($vs = $this->getImplicated())) { $a[self::FIELD_IMPLICATED] = $vs; @@ -1268,14 +1327,37 @@ public function jsonSerialize() $a[self::FIELD_PATIENT] = $v; } if (null !== ($v = $this->getReference())) { - $a[self::FIELD_REFERENCE] = $v->getValue(); - $a[self::FIELD_REFERENCE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_REFERENCE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_REFERENCE_EXT] = $enc; + } + } else { + $a[self::FIELD_REFERENCE] = $v; + } } if (null !== ($v = $this->getSeverity())) { - $a[self::FIELD_SEVERITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SEVERITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SEVERITY_EXT] = $enc; + } + } else { + $a[self::FIELD_SEVERITY] = $v; + } } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRDevice.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRDevice.php index a07cfe45d4..141c6857f5 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRDevice.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRDevice.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -94,10 +94,6 @@ class FHIRDevice extends FHIRDomainResource implements PHPFHIRContainedTypeInter { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DEVICE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CONTACT = 'contact'; const FIELD_CONTACT_EXT = '_contact'; const FIELD_DEFINITION = 'definition'; @@ -450,6 +446,9 @@ class FHIRDevice extends FHIRDomainResource implements PHPFHIRContainedTypeInter */ protected $version = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRDevice Constructor * @param null|array $data @@ -472,17 +471,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_CONTACT])) { foreach($data[self::FIELD_CONTACT] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContactPoint) { $this->addContact($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addContact(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addContact(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addContact(new FHIRContactPoint(array_merge($v, $ext[$i]))); + } } else { $this->addContact(new FHIRContactPoint($v)); } } } elseif ($data[self::FIELD_CONTACT] instanceof FHIRContactPoint) { $this->addContact($data[self::FIELD_CONTACT]); - } elseif ($ext && is_scalar($data[self::FIELD_CONTACT])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_CONTACT])) { $this->addContact(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $data[self::FIELD_CONTACT]] + $ext)); } else { $this->addContact(new FHIRContactPoint($data[self::FIELD_CONTACT])); @@ -498,6 +504,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_DEVICE_NAME])) { if (is_array($data[self::FIELD_DEVICE_NAME])) { foreach($data[self::FIELD_DEVICE_NAME] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRDeviceDeviceName) { $this->addDeviceName($v); } else { @@ -516,8 +525,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DISTINCT_IDENTIFIER] instanceof FHIRString) { $this->setDistinctIdentifier($data[self::FIELD_DISTINCT_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_DISTINCT_IDENTIFIER])) { - $this->setDistinctIdentifier(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DISTINCT_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DISTINCT_IDENTIFIER])) { + $this->setDistinctIdentifier(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DISTINCT_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_DISTINCT_IDENTIFIER])) { + $this->setDistinctIdentifier(new FHIRString(array_merge($ext, $data[self::FIELD_DISTINCT_IDENTIFIER]))); + } } else { $this->setDistinctIdentifier(new FHIRString($data[self::FIELD_DISTINCT_IDENTIFIER])); } @@ -528,8 +541,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EXPIRATION_DATE] instanceof FHIRDateTime) { $this->setExpirationDate($data[self::FIELD_EXPIRATION_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_EXPIRATION_DATE])) { - $this->setExpirationDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_EXPIRATION_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EXPIRATION_DATE])) { + $this->setExpirationDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_EXPIRATION_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_EXPIRATION_DATE])) { + $this->setExpirationDate(new FHIRDateTime(array_merge($ext, $data[self::FIELD_EXPIRATION_DATE]))); + } } else { $this->setExpirationDate(new FHIRDateTime($data[self::FIELD_EXPIRATION_DATE])); } @@ -540,17 +557,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -569,8 +593,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_LOT_NUMBER] instanceof FHIRString) { $this->setLotNumber($data[self::FIELD_LOT_NUMBER]); - } elseif ($ext && is_scalar($data[self::FIELD_LOT_NUMBER])) { - $this->setLotNumber(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_LOT_NUMBER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_LOT_NUMBER])) { + $this->setLotNumber(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_LOT_NUMBER]] + $ext)); + } else if (is_array($data[self::FIELD_LOT_NUMBER])) { + $this->setLotNumber(new FHIRString(array_merge($ext, $data[self::FIELD_LOT_NUMBER]))); + } } else { $this->setLotNumber(new FHIRString($data[self::FIELD_LOT_NUMBER])); } @@ -581,8 +609,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MANUFACTURE_DATE] instanceof FHIRDateTime) { $this->setManufactureDate($data[self::FIELD_MANUFACTURE_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_MANUFACTURE_DATE])) { - $this->setManufactureDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_MANUFACTURE_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MANUFACTURE_DATE])) { + $this->setManufactureDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_MANUFACTURE_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_MANUFACTURE_DATE])) { + $this->setManufactureDate(new FHIRDateTime(array_merge($ext, $data[self::FIELD_MANUFACTURE_DATE]))); + } } else { $this->setManufactureDate(new FHIRDateTime($data[self::FIELD_MANUFACTURE_DATE])); } @@ -593,8 +625,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MANUFACTURER] instanceof FHIRString) { $this->setManufacturer($data[self::FIELD_MANUFACTURER]); - } elseif ($ext && is_scalar($data[self::FIELD_MANUFACTURER])) { - $this->setManufacturer(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_MANUFACTURER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MANUFACTURER])) { + $this->setManufacturer(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_MANUFACTURER]] + $ext)); + } else if (is_array($data[self::FIELD_MANUFACTURER])) { + $this->setManufacturer(new FHIRString(array_merge($ext, $data[self::FIELD_MANUFACTURER]))); + } } else { $this->setManufacturer(new FHIRString($data[self::FIELD_MANUFACTURER])); } @@ -605,8 +641,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MODEL_NUMBER] instanceof FHIRString) { $this->setModelNumber($data[self::FIELD_MODEL_NUMBER]); - } elseif ($ext && is_scalar($data[self::FIELD_MODEL_NUMBER])) { - $this->setModelNumber(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_MODEL_NUMBER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MODEL_NUMBER])) { + $this->setModelNumber(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_MODEL_NUMBER]] + $ext)); + } else if (is_array($data[self::FIELD_MODEL_NUMBER])) { + $this->setModelNumber(new FHIRString(array_merge($ext, $data[self::FIELD_MODEL_NUMBER]))); + } } else { $this->setModelNumber(new FHIRString($data[self::FIELD_MODEL_NUMBER])); } @@ -614,6 +654,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_NOTE])) { if (is_array($data[self::FIELD_NOTE])) { foreach($data[self::FIELD_NOTE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRAnnotation) { $this->addNote($v); } else { @@ -646,8 +689,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PART_NUMBER] instanceof FHIRString) { $this->setPartNumber($data[self::FIELD_PART_NUMBER]); - } elseif ($ext && is_scalar($data[self::FIELD_PART_NUMBER])) { - $this->setPartNumber(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PART_NUMBER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PART_NUMBER])) { + $this->setPartNumber(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PART_NUMBER]] + $ext)); + } else if (is_array($data[self::FIELD_PART_NUMBER])) { + $this->setPartNumber(new FHIRString(array_merge($ext, $data[self::FIELD_PART_NUMBER]))); + } } else { $this->setPartNumber(new FHIRString($data[self::FIELD_PART_NUMBER])); } @@ -662,6 +709,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PROPERTY])) { if (is_array($data[self::FIELD_PROPERTY])) { foreach($data[self::FIELD_PROPERTY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRDeviceProperty) { $this->addProperty($v); } else { @@ -677,6 +727,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SAFETY])) { if (is_array($data[self::FIELD_SAFETY])) { foreach($data[self::FIELD_SAFETY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addSafety($v); } else { @@ -695,8 +748,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SERIAL_NUMBER] instanceof FHIRString) { $this->setSerialNumber($data[self::FIELD_SERIAL_NUMBER]); - } elseif ($ext && is_scalar($data[self::FIELD_SERIAL_NUMBER])) { - $this->setSerialNumber(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SERIAL_NUMBER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SERIAL_NUMBER])) { + $this->setSerialNumber(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SERIAL_NUMBER]] + $ext)); + } else if (is_array($data[self::FIELD_SERIAL_NUMBER])) { + $this->setSerialNumber(new FHIRString(array_merge($ext, $data[self::FIELD_SERIAL_NUMBER]))); + } } else { $this->setSerialNumber(new FHIRString($data[self::FIELD_SERIAL_NUMBER])); } @@ -704,6 +761,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SPECIALIZATION])) { if (is_array($data[self::FIELD_SPECIALIZATION])) { foreach($data[self::FIELD_SPECIALIZATION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRDeviceSpecialization) { $this->addSpecialization($v); } else { @@ -722,8 +782,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRFHIRDeviceStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRFHIRDeviceStatus([FHIRFHIRDeviceStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRFHIRDeviceStatus([FHIRFHIRDeviceStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRFHIRDeviceStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRFHIRDeviceStatus($data[self::FIELD_STATUS])); } @@ -731,6 +795,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_STATUS_REASON])) { if (is_array($data[self::FIELD_STATUS_REASON])) { foreach($data[self::FIELD_STATUS_REASON] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addStatusReason($v); } else { @@ -753,6 +820,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_UDI_CARRIER])) { if (is_array($data[self::FIELD_UDI_CARRIER])) { foreach($data[self::FIELD_UDI_CARRIER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRDeviceUdiCarrier) { $this->addUdiCarrier($v); } else { @@ -771,8 +841,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_URL] instanceof FHIRUri) { $this->setUrl($data[self::FIELD_URL]); - } elseif ($ext && is_scalar($data[self::FIELD_URL])) { - $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } else if (is_array($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri(array_merge($ext, $data[self::FIELD_URL]))); + } } else { $this->setUrl(new FHIRUri($data[self::FIELD_URL])); } @@ -783,17 +857,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_VERSION])) { foreach($data[self::FIELD_VERSION] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRDeviceVersion) { $this->addVersion($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addVersion(new FHIRDeviceVersion([FHIRDeviceVersion::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addVersion(new FHIRDeviceVersion([FHIRDeviceVersion::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addVersion(new FHIRDeviceVersion(array_merge($v, $ext[$i]))); + } } else { $this->addVersion(new FHIRDeviceVersion($v)); } } } elseif ($data[self::FIELD_VERSION] instanceof FHIRDeviceVersion) { $this->addVersion($data[self::FIELD_VERSION]); - } elseif ($ext && is_scalar($data[self::FIELD_VERSION])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_VERSION])) { $this->addVersion(new FHIRDeviceVersion([FHIRDeviceVersion::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); } else { $this->addVersion(new FHIRDeviceVersion($data[self::FIELD_VERSION])); @@ -2214,7 +2295,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getContact())) { foreach($vs as $v) { if (null === $v) { @@ -2227,7 +2307,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDefinition())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFINITION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getDeviceName())) { foreach($vs as $v) { if (null === $v) { @@ -2236,13 +2315,13 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_DEVICE_NAME, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getDistinctIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DISTINCT_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getExpirationDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EXPIRATION_DATE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -2267,7 +2346,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getModelNumber())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MODEL_NUMBER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getNote())) { foreach($vs as $v) { if (null === $v) { @@ -2280,18 +2358,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getOwner())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OWNER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getParent())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PARENT, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getPartNumber())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PART_NUMBER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPatient())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATIENT, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getProperty())) { foreach($vs as $v) { if (null === $v) { @@ -2309,10 +2384,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_SAFETY, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getSerialNumber())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SERIAL_NUMBER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getSpecialization())) { foreach($vs as $v) { if (null === $v) { @@ -2325,7 +2400,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getStatusReason())) { foreach($vs as $v) { if (null === $v) { @@ -2338,7 +2412,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getUdiCarrier())) { foreach($vs as $v) { if (null === $v) { @@ -2347,10 +2420,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_UDI_CARRIER, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getUrl())) { $v->xmlSerialize($sxe->addChild(self::FIELD_URL, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getVersion())) { foreach($vs as $v) { if (null === $v) { @@ -2359,6 +2432,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_VERSION, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } @@ -2369,7 +2443,23 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if ([] !== ($vs = $this->getContact())) { - $a[self::FIELD_CONTACT] = $vs; + $a[self::FIELD_CONTACT] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CONTACT][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CONTACT_EXT][] = $enc; + } else { + $a[self::FIELD_CONTACT_EXT][] = null; + } + } else { + $a[self::FIELD_CONTACT][] = $v; + } + } } if (null !== ($v = $this->getDefinition())) { $a[self::FIELD_DEFINITION] = $v; @@ -2378,34 +2468,92 @@ public function jsonSerialize() $a[self::FIELD_DEVICE_NAME] = $vs; } if (null !== ($v = $this->getDistinctIdentifier())) { - $a[self::FIELD_DISTINCT_IDENTIFIER] = $v->getValue(); - $a[self::FIELD_DISTINCT_IDENTIFIER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DISTINCT_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DISTINCT_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_DISTINCT_IDENTIFIER] = $v; + } } if (null !== ($v = $this->getExpirationDate())) { - $a[self::FIELD_EXPIRATION_DATE] = $v->getValue(); - $a[self::FIELD_EXPIRATION_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EXPIRATION_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EXPIRATION_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_EXPIRATION_DATE] = $v; + } } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if (null !== ($v = $this->getLocation())) { $a[self::FIELD_LOCATION] = $v; } if (null !== ($v = $this->getLotNumber())) { - $a[self::FIELD_LOT_NUMBER] = $v->getValue(); - $a[self::FIELD_LOT_NUMBER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_LOT_NUMBER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_LOT_NUMBER_EXT] = $enc; + } + } else { + $a[self::FIELD_LOT_NUMBER] = $v; + } } if (null !== ($v = $this->getManufactureDate())) { - $a[self::FIELD_MANUFACTURE_DATE] = $v->getValue(); - $a[self::FIELD_MANUFACTURE_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MANUFACTURE_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MANUFACTURE_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_MANUFACTURE_DATE] = $v; + } } if (null !== ($v = $this->getManufacturer())) { - $a[self::FIELD_MANUFACTURER] = $v->getValue(); - $a[self::FIELD_MANUFACTURER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MANUFACTURER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MANUFACTURER_EXT] = $enc; + } + } else { + $a[self::FIELD_MANUFACTURER] = $v; + } } if (null !== ($v = $this->getModelNumber())) { - $a[self::FIELD_MODEL_NUMBER] = $v->getValue(); - $a[self::FIELD_MODEL_NUMBER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MODEL_NUMBER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MODEL_NUMBER_EXT] = $enc; + } + } else { + $a[self::FIELD_MODEL_NUMBER] = $v; + } } if ([] !== ($vs = $this->getNote())) { $a[self::FIELD_NOTE] = $vs; @@ -2417,8 +2565,15 @@ public function jsonSerialize() $a[self::FIELD_PARENT] = $v; } if (null !== ($v = $this->getPartNumber())) { - $a[self::FIELD_PART_NUMBER] = $v->getValue(); - $a[self::FIELD_PART_NUMBER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PART_NUMBER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PART_NUMBER_EXT] = $enc; + } + } else { + $a[self::FIELD_PART_NUMBER] = $v; + } } if (null !== ($v = $this->getPatient())) { $a[self::FIELD_PATIENT] = $v; @@ -2430,14 +2585,29 @@ public function jsonSerialize() $a[self::FIELD_SAFETY] = $vs; } if (null !== ($v = $this->getSerialNumber())) { - $a[self::FIELD_SERIAL_NUMBER] = $v->getValue(); - $a[self::FIELD_SERIAL_NUMBER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SERIAL_NUMBER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SERIAL_NUMBER_EXT] = $enc; + } + } else { + $a[self::FIELD_SERIAL_NUMBER] = $v; + } } if ([] !== ($vs = $this->getSpecialization())) { $a[self::FIELD_SPECIALIZATION] = $vs; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if ([] !== ($vs = $this->getStatusReason())) { $a[self::FIELD_STATUS_REASON] = $vs; @@ -2449,11 +2619,34 @@ public function jsonSerialize() $a[self::FIELD_UDI_CARRIER] = $vs; } if (null !== ($v = $this->getUrl())) { - $a[self::FIELD_URL] = $v->getValue(); - $a[self::FIELD_URL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_URL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_URL_EXT] = $enc; + } + } else { + $a[self::FIELD_URL] = $v; + } } if ([] !== ($vs = $this->getVersion())) { - $a[self::FIELD_VERSION] = $vs; + $a[self::FIELD_VERSION] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VERSION][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VERSION_EXT][] = $enc; + } else { + $a[self::FIELD_VERSION_EXT][] = null; + } + } else { + $a[self::FIELD_VERSION][] = $v; + } + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRDeviceDefinition.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRDeviceDefinition.php index 4949ef107e..978e6f3fcf 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRDeviceDefinition.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRDeviceDefinition.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -95,10 +95,6 @@ class FHIRDeviceDefinition extends FHIRDomainResource implements PHPFHIRContaine { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DEVICE_DEFINITION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CAPABILITY = 'capability'; const FIELD_CONTACT = 'contact'; const FIELD_CONTACT_EXT = '_contact'; @@ -400,6 +396,9 @@ class FHIRDeviceDefinition extends FHIRDomainResource implements PHPFHIRContaine */ protected $version = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRDeviceDefinition Constructor * @param null|array $data @@ -419,6 +418,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CAPABILITY])) { if (is_array($data[self::FIELD_CAPABILITY])) { foreach($data[self::FIELD_CAPABILITY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRDeviceDefinitionCapability) { $this->addCapability($v); } else { @@ -437,17 +439,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_CONTACT])) { foreach($data[self::FIELD_CONTACT] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContactPoint) { $this->addContact($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addContact(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addContact(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addContact(new FHIRContactPoint(array_merge($v, $ext[$i]))); + } } else { $this->addContact(new FHIRContactPoint($v)); } } } elseif ($data[self::FIELD_CONTACT] instanceof FHIRContactPoint) { $this->addContact($data[self::FIELD_CONTACT]); - } elseif ($ext && is_scalar($data[self::FIELD_CONTACT])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_CONTACT])) { $this->addContact(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $data[self::FIELD_CONTACT]] + $ext)); } else { $this->addContact(new FHIRContactPoint($data[self::FIELD_CONTACT])); @@ -456,6 +465,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_DEVICE_NAME])) { if (is_array($data[self::FIELD_DEVICE_NAME])) { foreach($data[self::FIELD_DEVICE_NAME] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRDeviceDefinitionDeviceName) { $this->addDeviceName($v); } else { @@ -474,17 +486,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -493,6 +512,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_LANGUAGE_CODE])) { if (is_array($data[self::FIELD_LANGUAGE_CODE])) { foreach($data[self::FIELD_LANGUAGE_CODE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addLanguageCode($v); } else { @@ -518,8 +540,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MANUFACTURER_STRING] instanceof FHIRString) { $this->setManufacturerString($data[self::FIELD_MANUFACTURER_STRING]); - } elseif ($ext && is_scalar($data[self::FIELD_MANUFACTURER_STRING])) { - $this->setManufacturerString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_MANUFACTURER_STRING]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MANUFACTURER_STRING])) { + $this->setManufacturerString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_MANUFACTURER_STRING]] + $ext)); + } else if (is_array($data[self::FIELD_MANUFACTURER_STRING])) { + $this->setManufacturerString(new FHIRString(array_merge($ext, $data[self::FIELD_MANUFACTURER_STRING]))); + } } else { $this->setManufacturerString(new FHIRString($data[self::FIELD_MANUFACTURER_STRING])); } @@ -527,6 +553,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_MATERIAL])) { if (is_array($data[self::FIELD_MATERIAL])) { foreach($data[self::FIELD_MATERIAL] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRDeviceDefinitionMaterial) { $this->addMaterial($v); } else { @@ -545,8 +574,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MODEL_NUMBER] instanceof FHIRString) { $this->setModelNumber($data[self::FIELD_MODEL_NUMBER]); - } elseif ($ext && is_scalar($data[self::FIELD_MODEL_NUMBER])) { - $this->setModelNumber(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_MODEL_NUMBER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MODEL_NUMBER])) { + $this->setModelNumber(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_MODEL_NUMBER]] + $ext)); + } else if (is_array($data[self::FIELD_MODEL_NUMBER])) { + $this->setModelNumber(new FHIRString(array_merge($ext, $data[self::FIELD_MODEL_NUMBER]))); + } } else { $this->setModelNumber(new FHIRString($data[self::FIELD_MODEL_NUMBER])); } @@ -554,6 +587,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_NOTE])) { if (is_array($data[self::FIELD_NOTE])) { foreach($data[self::FIELD_NOTE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRAnnotation) { $this->addNote($v); } else { @@ -572,8 +608,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ONLINE_INFORMATION] instanceof FHIRUri) { $this->setOnlineInformation($data[self::FIELD_ONLINE_INFORMATION]); - } elseif ($ext && is_scalar($data[self::FIELD_ONLINE_INFORMATION])) { - $this->setOnlineInformation(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_ONLINE_INFORMATION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ONLINE_INFORMATION])) { + $this->setOnlineInformation(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_ONLINE_INFORMATION]] + $ext)); + } else if (is_array($data[self::FIELD_ONLINE_INFORMATION])) { + $this->setOnlineInformation(new FHIRUri(array_merge($ext, $data[self::FIELD_ONLINE_INFORMATION]))); + } } else { $this->setOnlineInformation(new FHIRUri($data[self::FIELD_ONLINE_INFORMATION])); } @@ -602,6 +642,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PROPERTY])) { if (is_array($data[self::FIELD_PROPERTY])) { foreach($data[self::FIELD_PROPERTY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRDeviceDefinitionProperty) { $this->addProperty($v); } else { @@ -620,8 +663,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_QUANTITY] instanceof FHIRQuantity) { $this->setQuantity($data[self::FIELD_QUANTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_QUANTITY])) { - $this->setQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_QUANTITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_QUANTITY])) { + $this->setQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_QUANTITY])) { + $this->setQuantity(new FHIRQuantity(array_merge($ext, $data[self::FIELD_QUANTITY]))); + } } else { $this->setQuantity(new FHIRQuantity($data[self::FIELD_QUANTITY])); } @@ -629,6 +676,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SAFETY])) { if (is_array($data[self::FIELD_SAFETY])) { foreach($data[self::FIELD_SAFETY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addSafety($v); } else { @@ -644,6 +694,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SHELF_LIFE_STORAGE])) { if (is_array($data[self::FIELD_SHELF_LIFE_STORAGE])) { foreach($data[self::FIELD_SHELF_LIFE_STORAGE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRProductShelfLife) { $this->addShelfLifeStorage($v); } else { @@ -659,6 +712,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SPECIALIZATION])) { if (is_array($data[self::FIELD_SPECIALIZATION])) { foreach($data[self::FIELD_SPECIALIZATION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRDeviceDefinitionSpecialization) { $this->addSpecialization($v); } else { @@ -681,6 +737,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_UDI_DEVICE_IDENTIFIER])) { if (is_array($data[self::FIELD_UDI_DEVICE_IDENTIFIER])) { foreach($data[self::FIELD_UDI_DEVICE_IDENTIFIER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRDeviceDefinitionUdiDeviceIdentifier) { $this->addUdiDeviceIdentifier($v); } else { @@ -699,8 +758,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_URL] instanceof FHIRUri) { $this->setUrl($data[self::FIELD_URL]); - } elseif ($ext && is_scalar($data[self::FIELD_URL])) { - $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } else if (is_array($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri(array_merge($ext, $data[self::FIELD_URL]))); + } } else { $this->setUrl(new FHIRUri($data[self::FIELD_URL])); } @@ -711,17 +774,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_VERSION])) { foreach($data[self::FIELD_VERSION] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRString) { $this->addVersion($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addVersion(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addVersion(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addVersion(new FHIRString(array_merge($v, $ext[$i]))); + } } else { $this->addVersion(new FHIRString($v)); } } } elseif ($data[self::FIELD_VERSION] instanceof FHIRString) { $this->addVersion($data[self::FIELD_VERSION]); - } elseif ($ext && is_scalar($data[self::FIELD_VERSION])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_VERSION])) { $this->addVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); } else { $this->addVersion(new FHIRString($data[self::FIELD_VERSION])); @@ -2055,7 +2125,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getCapability())) { foreach($vs as $v) { if (null === $v) { @@ -2107,7 +2176,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getManufacturerString())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MANUFACTURER_STRING, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getMaterial())) { foreach($vs as $v) { if (null === $v) { @@ -2116,10 +2184,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_MATERIAL, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getModelNumber())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MODEL_NUMBER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getNote())) { foreach($vs as $v) { if (null === $v) { @@ -2128,22 +2196,19 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_NOTE, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getOnlineInformation())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ONLINE_INFORMATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOwner())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OWNER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getParentDevice())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PARENT_DEVICE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPhysicalCharacteristics())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PHYSICAL_CHARACTERISTICS, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getProperty())) { foreach($vs as $v) { if (null === $v) { @@ -2156,7 +2221,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_QUANTITY, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getSafety())) { foreach($vs as $v) { if (null === $v) { @@ -2187,7 +2251,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getUdiDeviceIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -2196,6 +2259,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_UDI_DEVICE_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getUrl())) { $v->xmlSerialize($sxe->addChild(self::FIELD_URL, null, $v->_getFHIRXMLNamespace())); } @@ -2207,6 +2271,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_VERSION, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } @@ -2220,13 +2285,45 @@ public function jsonSerialize() $a[self::FIELD_CAPABILITY] = $vs; } if ([] !== ($vs = $this->getContact())) { - $a[self::FIELD_CONTACT] = $vs; + $a[self::FIELD_CONTACT] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CONTACT][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CONTACT_EXT][] = $enc; + } else { + $a[self::FIELD_CONTACT_EXT][] = null; + } + } else { + $a[self::FIELD_CONTACT][] = $v; + } + } } if ([] !== ($vs = $this->getDeviceName())) { $a[self::FIELD_DEVICE_NAME] = $vs; } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if ([] !== ($vs = $this->getLanguageCode())) { $a[self::FIELD_LANGUAGE_CODE] = $vs; @@ -2235,22 +2332,43 @@ public function jsonSerialize() $a[self::FIELD_MANUFACTURER_REFERENCE] = $v; } if (null !== ($v = $this->getManufacturerString())) { - $a[self::FIELD_MANUFACTURER_STRING] = $v->getValue(); - $a[self::FIELD_MANUFACTURER_STRING_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MANUFACTURER_STRING] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MANUFACTURER_STRING_EXT] = $enc; + } + } else { + $a[self::FIELD_MANUFACTURER_STRING] = $v; + } } if ([] !== ($vs = $this->getMaterial())) { $a[self::FIELD_MATERIAL] = $vs; } if (null !== ($v = $this->getModelNumber())) { - $a[self::FIELD_MODEL_NUMBER] = $v->getValue(); - $a[self::FIELD_MODEL_NUMBER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MODEL_NUMBER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MODEL_NUMBER_EXT] = $enc; + } + } else { + $a[self::FIELD_MODEL_NUMBER] = $v; + } } if ([] !== ($vs = $this->getNote())) { $a[self::FIELD_NOTE] = $vs; } if (null !== ($v = $this->getOnlineInformation())) { - $a[self::FIELD_ONLINE_INFORMATION] = $v->getValue(); - $a[self::FIELD_ONLINE_INFORMATION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ONLINE_INFORMATION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ONLINE_INFORMATION_EXT] = $enc; + } + } else { + $a[self::FIELD_ONLINE_INFORMATION] = $v; + } } if (null !== ($v = $this->getOwner())) { $a[self::FIELD_OWNER] = $v; @@ -2265,7 +2383,15 @@ public function jsonSerialize() $a[self::FIELD_PROPERTY] = $vs; } if (null !== ($v = $this->getQuantity())) { - $a[self::FIELD_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_QUANTITY] = $v; + } } if ([] !== ($vs = $this->getSafety())) { $a[self::FIELD_SAFETY] = $vs; @@ -2283,8 +2409,15 @@ public function jsonSerialize() $a[self::FIELD_UDI_DEVICE_IDENTIFIER] = $vs; } if (null !== ($v = $this->getUrl())) { - $a[self::FIELD_URL] = $v->getValue(); - $a[self::FIELD_URL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_URL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_URL_EXT] = $enc; + } + } else { + $a[self::FIELD_URL] = $v; + } } if ([] !== ($vs = $this->getVersion())) { $a[self::FIELD_VERSION] = []; @@ -2292,8 +2425,17 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_VERSION][] = $v->getValue(); - $a[self::FIELD_VERSION_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VERSION][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VERSION_EXT][] = $enc; + } else { + $a[self::FIELD_VERSION_EXT][] = null; + } + } else { + $a[self::FIELD_VERSION][] = $v; + } } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRDeviceMetric.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRDeviceMetric.php index 39e4a8c729..d702e8341c 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRDeviceMetric.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRDeviceMetric.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -86,10 +86,6 @@ class FHIRDeviceMetric extends FHIRDomainResource implements PHPFHIRContainedTyp { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DEVICE_METRIC; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CALIBRATION = 'calibration'; const FIELD_CATEGORY = 'category'; const FIELD_CATEGORY_EXT = '_category'; @@ -240,6 +236,9 @@ class FHIRDeviceMetric extends FHIRDomainResource implements PHPFHIRContainedTyp */ protected $unit = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRDeviceMetric Constructor * @param null|array $data @@ -259,6 +258,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CALIBRATION])) { if (is_array($data[self::FIELD_CALIBRATION])) { foreach($data[self::FIELD_CALIBRATION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRDeviceMetricCalibration) { $this->addCalibration($v); } else { @@ -277,8 +279,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CATEGORY] instanceof FHIRDeviceMetricCategory) { $this->setCategory($data[self::FIELD_CATEGORY]); - } elseif ($ext && is_scalar($data[self::FIELD_CATEGORY])) { - $this->setCategory(new FHIRDeviceMetricCategory([FHIRDeviceMetricCategory::FIELD_VALUE => $data[self::FIELD_CATEGORY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CATEGORY])) { + $this->setCategory(new FHIRDeviceMetricCategory([FHIRDeviceMetricCategory::FIELD_VALUE => $data[self::FIELD_CATEGORY]] + $ext)); + } else if (is_array($data[self::FIELD_CATEGORY])) { + $this->setCategory(new FHIRDeviceMetricCategory(array_merge($ext, $data[self::FIELD_CATEGORY]))); + } } else { $this->setCategory(new FHIRDeviceMetricCategory($data[self::FIELD_CATEGORY])); } @@ -289,8 +295,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_COLOR] instanceof FHIRDeviceMetricColor) { $this->setColor($data[self::FIELD_COLOR]); - } elseif ($ext && is_scalar($data[self::FIELD_COLOR])) { - $this->setColor(new FHIRDeviceMetricColor([FHIRDeviceMetricColor::FIELD_VALUE => $data[self::FIELD_COLOR]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_COLOR])) { + $this->setColor(new FHIRDeviceMetricColor([FHIRDeviceMetricColor::FIELD_VALUE => $data[self::FIELD_COLOR]] + $ext)); + } else if (is_array($data[self::FIELD_COLOR])) { + $this->setColor(new FHIRDeviceMetricColor(array_merge($ext, $data[self::FIELD_COLOR]))); + } } else { $this->setColor(new FHIRDeviceMetricColor($data[self::FIELD_COLOR])); } @@ -301,17 +311,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -330,8 +347,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_OPERATIONAL_STATUS] instanceof FHIRDeviceMetricOperationalStatus) { $this->setOperationalStatus($data[self::FIELD_OPERATIONAL_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_OPERATIONAL_STATUS])) { - $this->setOperationalStatus(new FHIRDeviceMetricOperationalStatus([FHIRDeviceMetricOperationalStatus::FIELD_VALUE => $data[self::FIELD_OPERATIONAL_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_OPERATIONAL_STATUS])) { + $this->setOperationalStatus(new FHIRDeviceMetricOperationalStatus([FHIRDeviceMetricOperationalStatus::FIELD_VALUE => $data[self::FIELD_OPERATIONAL_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_OPERATIONAL_STATUS])) { + $this->setOperationalStatus(new FHIRDeviceMetricOperationalStatus(array_merge($ext, $data[self::FIELD_OPERATIONAL_STATUS]))); + } } else { $this->setOperationalStatus(new FHIRDeviceMetricOperationalStatus($data[self::FIELD_OPERATIONAL_STATUS])); } @@ -910,7 +931,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getCalibration())) { foreach($vs as $v) { if (null === $v) { @@ -923,11 +943,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getCategory())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CATEGORY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getColor())) { $v->xmlSerialize($sxe->addChild(self::FIELD_COLOR, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -940,23 +958,18 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getMeasurementPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MEASUREMENT_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOperationalStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OPERATIONAL_STATUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getParent())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PARENT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSource())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SOURCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getUnit())) { $v->xmlSerialize($sxe->addChild(self::FIELD_UNIT, null, $v->_getFHIRXMLNamespace())); } @@ -973,19 +986,59 @@ public function jsonSerialize() $a[self::FIELD_CALIBRATION] = $vs; } if (null !== ($v = $this->getCategory())) { - $a[self::FIELD_CATEGORY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CATEGORY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CATEGORY_EXT] = $enc; + } + } else { + $a[self::FIELD_CATEGORY] = $v; + } } if (null !== ($v = $this->getColor())) { - $a[self::FIELD_COLOR] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_COLOR] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_COLOR_EXT] = $enc; + } + } else { + $a[self::FIELD_COLOR] = $v; + } } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if (null !== ($v = $this->getMeasurementPeriod())) { $a[self::FIELD_MEASUREMENT_PERIOD] = $v; } if (null !== ($v = $this->getOperationalStatus())) { - $a[self::FIELD_OPERATIONAL_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_OPERATIONAL_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_OPERATIONAL_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_OPERATIONAL_STATUS] = $v; + } } if (null !== ($v = $this->getParent())) { $a[self::FIELD_PARENT] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRDeviceRequest.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRDeviceRequest.php index 5233cb8dc4..8b47a8ac9c 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRDeviceRequest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRDeviceRequest.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -92,10 +92,6 @@ class FHIRDeviceRequest extends FHIRDomainResource implements PHPFHIRContainedTy { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DEVICE_REQUEST; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_AUTHORED_ON = 'authoredOn'; const FIELD_AUTHORED_ON_EXT = '_authoredOn'; const FIELD_BASED_ON = 'basedOn'; @@ -465,6 +461,9 @@ class FHIRDeviceRequest extends FHIRDomainResource implements PHPFHIRContainedTy */ protected $supportingInfo = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRDeviceRequest Constructor * @param null|array $data @@ -487,8 +486,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_AUTHORED_ON] instanceof FHIRDateTime) { $this->setAuthoredOn($data[self::FIELD_AUTHORED_ON]); - } elseif ($ext && is_scalar($data[self::FIELD_AUTHORED_ON])) { - $this->setAuthoredOn(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_AUTHORED_ON]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_AUTHORED_ON])) { + $this->setAuthoredOn(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_AUTHORED_ON]] + $ext)); + } else if (is_array($data[self::FIELD_AUTHORED_ON])) { + $this->setAuthoredOn(new FHIRDateTime(array_merge($ext, $data[self::FIELD_AUTHORED_ON]))); + } } else { $this->setAuthoredOn(new FHIRDateTime($data[self::FIELD_AUTHORED_ON])); } @@ -496,6 +499,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_BASED_ON])) { if (is_array($data[self::FIELD_BASED_ON])) { foreach($data[self::FIELD_BASED_ON] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addBasedOn($v); } else { @@ -535,8 +541,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_GROUP_IDENTIFIER] instanceof FHIRIdentifier) { $this->setGroupIdentifier($data[self::FIELD_GROUP_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_GROUP_IDENTIFIER])) { - $this->setGroupIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_GROUP_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_GROUP_IDENTIFIER])) { + $this->setGroupIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_GROUP_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_GROUP_IDENTIFIER])) { + $this->setGroupIdentifier(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_GROUP_IDENTIFIER]))); + } } else { $this->setGroupIdentifier(new FHIRIdentifier($data[self::FIELD_GROUP_IDENTIFIER])); } @@ -547,17 +557,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -569,17 +586,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_INSTANTIATES_CANONICAL])) { foreach($data[self::FIELD_INSTANTIATES_CANONICAL] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCanonical) { $this->addInstantiatesCanonical($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addInstantiatesCanonical(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addInstantiatesCanonical(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addInstantiatesCanonical(new FHIRCanonical(array_merge($v, $ext[$i]))); + } } else { $this->addInstantiatesCanonical(new FHIRCanonical($v)); } } } elseif ($data[self::FIELD_INSTANTIATES_CANONICAL] instanceof FHIRCanonical) { $this->addInstantiatesCanonical($data[self::FIELD_INSTANTIATES_CANONICAL]); - } elseif ($ext && is_scalar($data[self::FIELD_INSTANTIATES_CANONICAL])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_INSTANTIATES_CANONICAL])) { $this->addInstantiatesCanonical(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $data[self::FIELD_INSTANTIATES_CANONICAL]] + $ext)); } else { $this->addInstantiatesCanonical(new FHIRCanonical($data[self::FIELD_INSTANTIATES_CANONICAL])); @@ -591,17 +615,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_INSTANTIATES_URI])) { foreach($data[self::FIELD_INSTANTIATES_URI] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRUri) { $this->addInstantiatesUri($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addInstantiatesUri(new FHIRUri([FHIRUri::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addInstantiatesUri(new FHIRUri([FHIRUri::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addInstantiatesUri(new FHIRUri(array_merge($v, $ext[$i]))); + } } else { $this->addInstantiatesUri(new FHIRUri($v)); } } } elseif ($data[self::FIELD_INSTANTIATES_URI] instanceof FHIRUri) { $this->addInstantiatesUri($data[self::FIELD_INSTANTIATES_URI]); - } elseif ($ext && is_scalar($data[self::FIELD_INSTANTIATES_URI])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_INSTANTIATES_URI])) { $this->addInstantiatesUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_INSTANTIATES_URI]] + $ext)); } else { $this->addInstantiatesUri(new FHIRUri($data[self::FIELD_INSTANTIATES_URI])); @@ -610,6 +641,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_INSURANCE])) { if (is_array($data[self::FIELD_INSURANCE])) { foreach($data[self::FIELD_INSURANCE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addInsurance($v); } else { @@ -628,8 +662,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_INTENT] instanceof FHIRRequestIntent) { $this->setIntent($data[self::FIELD_INTENT]); - } elseif ($ext && is_scalar($data[self::FIELD_INTENT])) { - $this->setIntent(new FHIRRequestIntent([FHIRRequestIntent::FIELD_VALUE => $data[self::FIELD_INTENT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_INTENT])) { + $this->setIntent(new FHIRRequestIntent([FHIRRequestIntent::FIELD_VALUE => $data[self::FIELD_INTENT]] + $ext)); + } else if (is_array($data[self::FIELD_INTENT])) { + $this->setIntent(new FHIRRequestIntent(array_merge($ext, $data[self::FIELD_INTENT]))); + } } else { $this->setIntent(new FHIRRequestIntent($data[self::FIELD_INTENT])); } @@ -637,6 +675,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_NOTE])) { if (is_array($data[self::FIELD_NOTE])) { foreach($data[self::FIELD_NOTE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRAnnotation) { $this->addNote($v); } else { @@ -655,8 +696,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_OCCURRENCE_DATE_TIME] instanceof FHIRDateTime) { $this->setOccurrenceDateTime($data[self::FIELD_OCCURRENCE_DATE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_OCCURRENCE_DATE_TIME])) { - $this->setOccurrenceDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_OCCURRENCE_DATE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_OCCURRENCE_DATE_TIME])) { + $this->setOccurrenceDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_OCCURRENCE_DATE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_OCCURRENCE_DATE_TIME])) { + $this->setOccurrenceDateTime(new FHIRDateTime(array_merge($ext, $data[self::FIELD_OCCURRENCE_DATE_TIME]))); + } } else { $this->setOccurrenceDateTime(new FHIRDateTime($data[self::FIELD_OCCURRENCE_DATE_TIME])); } @@ -678,6 +723,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PARAMETER])) { if (is_array($data[self::FIELD_PARAMETER])) { foreach($data[self::FIELD_PARAMETER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRDeviceRequestParameter) { $this->addParameter($v); } else { @@ -707,6 +755,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PRIOR_REQUEST])) { if (is_array($data[self::FIELD_PRIOR_REQUEST])) { foreach($data[self::FIELD_PRIOR_REQUEST] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addPriorRequest($v); } else { @@ -725,8 +776,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PRIORITY] instanceof FHIRRequestPriority) { $this->setPriority($data[self::FIELD_PRIORITY]); - } elseif ($ext && is_scalar($data[self::FIELD_PRIORITY])) { - $this->setPriority(new FHIRRequestPriority([FHIRRequestPriority::FIELD_VALUE => $data[self::FIELD_PRIORITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PRIORITY])) { + $this->setPriority(new FHIRRequestPriority([FHIRRequestPriority::FIELD_VALUE => $data[self::FIELD_PRIORITY]] + $ext)); + } else if (is_array($data[self::FIELD_PRIORITY])) { + $this->setPriority(new FHIRRequestPriority(array_merge($ext, $data[self::FIELD_PRIORITY]))); + } } else { $this->setPriority(new FHIRRequestPriority($data[self::FIELD_PRIORITY])); } @@ -734,6 +789,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REASON_CODE])) { if (is_array($data[self::FIELD_REASON_CODE])) { foreach($data[self::FIELD_REASON_CODE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addReasonCode($v); } else { @@ -749,6 +807,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REASON_REFERENCE])) { if (is_array($data[self::FIELD_REASON_REFERENCE])) { foreach($data[self::FIELD_REASON_REFERENCE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addReasonReference($v); } else { @@ -764,6 +825,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_RELEVANT_HISTORY])) { if (is_array($data[self::FIELD_RELEVANT_HISTORY])) { foreach($data[self::FIELD_RELEVANT_HISTORY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addRelevantHistory($v); } else { @@ -789,8 +853,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRRequestStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRRequestStatus([FHIRRequestStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRRequestStatus([FHIRRequestStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRRequestStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRRequestStatus($data[self::FIELD_STATUS])); } @@ -805,6 +873,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SUPPORTING_INFO])) { if (is_array($data[self::FIELD_SUPPORTING_INFO])) { foreach($data[self::FIELD_SUPPORTING_INFO] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addSupportingInfo($v); } else { @@ -2282,7 +2353,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getAuthoredOn())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AUTHORED_ON, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getBasedOn())) { foreach($vs as $v) { if (null === $v) { @@ -2295,19 +2365,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getCodeCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getCodeReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE_REFERENCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getEncounter())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ENCOUNTER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getGroupIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_GROUP_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -2316,6 +2382,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } } + if ([] !== ($vs = $this->getInstantiatesCanonical())) { foreach($vs as $v) { if (null === $v) { @@ -2324,6 +2391,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_INSTANTIATES_CANONICAL, null, $v->_getFHIRXMLNamespace())); } } + if ([] !== ($vs = $this->getInstantiatesUri())) { foreach($vs as $v) { if (null === $v) { @@ -2345,7 +2413,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getIntent())) { $v->xmlSerialize($sxe->addChild(self::FIELD_INTENT, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getNote())) { foreach($vs as $v) { if (null === $v) { @@ -2354,18 +2421,16 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_NOTE, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getOccurrenceDateTime())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OCCURRENCE_DATE_TIME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOccurrencePeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OCCURRENCE_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOccurrenceTiming())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OCCURRENCE_TIMING, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getParameter())) { foreach($vs as $v) { if (null === $v) { @@ -2378,11 +2443,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getPerformer())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PERFORMER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPerformerType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PERFORMER_TYPE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getPriorRequest())) { foreach($vs as $v) { if (null === $v) { @@ -2395,7 +2458,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getPriority())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PRIORITY, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getReasonCode())) { foreach($vs as $v) { if (null === $v) { @@ -2426,15 +2488,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getRequester())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REQUESTER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSubject())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBJECT, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getSupportingInfo())) { foreach($vs as $v) { if (null === $v) { @@ -2443,6 +2502,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_SUPPORTING_INFO, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } @@ -2453,8 +2513,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getAuthoredOn())) { - $a[self::FIELD_AUTHORED_ON] = $v->getValue(); - $a[self::FIELD_AUTHORED_ON_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_AUTHORED_ON] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_AUTHORED_ON_EXT] = $enc; + } + } else { + $a[self::FIELD_AUTHORED_ON] = $v; + } } if ([] !== ($vs = $this->getBasedOn())) { $a[self::FIELD_BASED_ON] = $vs; @@ -2469,10 +2536,34 @@ public function jsonSerialize() $a[self::FIELD_ENCOUNTER] = $v; } if (null !== ($v = $this->getGroupIdentifier())) { - $a[self::FIELD_GROUP_IDENTIFIER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_GROUP_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_GROUP_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_GROUP_IDENTIFIER] = $v; + } } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if ([] !== ($vs = $this->getInstantiatesCanonical())) { $a[self::FIELD_INSTANTIATES_CANONICAL] = []; @@ -2480,8 +2571,17 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_INSTANTIATES_CANONICAL][] = $v->getValue(); - $a[self::FIELD_INSTANTIATES_CANONICAL_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_INSTANTIATES_CANONICAL][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_INSTANTIATES_CANONICAL_EXT][] = $enc; + } else { + $a[self::FIELD_INSTANTIATES_CANONICAL_EXT][] = null; + } + } else { + $a[self::FIELD_INSTANTIATES_CANONICAL][] = $v; + } } } if ([] !== ($vs = $this->getInstantiatesUri())) { @@ -2490,22 +2590,46 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_INSTANTIATES_URI][] = $v->getValue(); - $a[self::FIELD_INSTANTIATES_URI_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_INSTANTIATES_URI][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_INSTANTIATES_URI_EXT][] = $enc; + } else { + $a[self::FIELD_INSTANTIATES_URI_EXT][] = null; + } + } else { + $a[self::FIELD_INSTANTIATES_URI][] = $v; + } } } if ([] !== ($vs = $this->getInsurance())) { $a[self::FIELD_INSURANCE] = $vs; } if (null !== ($v = $this->getIntent())) { - $a[self::FIELD_INTENT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_INTENT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_INTENT_EXT] = $enc; + } + } else { + $a[self::FIELD_INTENT] = $v; + } } if ([] !== ($vs = $this->getNote())) { $a[self::FIELD_NOTE] = $vs; } if (null !== ($v = $this->getOccurrenceDateTime())) { - $a[self::FIELD_OCCURRENCE_DATE_TIME] = $v->getValue(); - $a[self::FIELD_OCCURRENCE_DATE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_OCCURRENCE_DATE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_OCCURRENCE_DATE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_OCCURRENCE_DATE_TIME] = $v; + } } if (null !== ($v = $this->getOccurrencePeriod())) { $a[self::FIELD_OCCURRENCE_PERIOD] = $v; @@ -2526,7 +2650,15 @@ public function jsonSerialize() $a[self::FIELD_PRIOR_REQUEST] = $vs; } if (null !== ($v = $this->getPriority())) { - $a[self::FIELD_PRIORITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PRIORITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PRIORITY_EXT] = $enc; + } + } else { + $a[self::FIELD_PRIORITY] = $v; + } } if ([] !== ($vs = $this->getReasonCode())) { $a[self::FIELD_REASON_CODE] = $vs; @@ -2541,7 +2673,15 @@ public function jsonSerialize() $a[self::FIELD_REQUESTER] = $v; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getSubject())) { $a[self::FIELD_SUBJECT] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRDeviceUseStatement.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRDeviceUseStatement.php index a7a3cab57e..4de4fa4238 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRDeviceUseStatement.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRDeviceUseStatement.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -87,10 +87,6 @@ class FHIRDeviceUseStatement extends FHIRDomainResource implements PHPFHIRContai { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DEVICE_USE_STATEMENT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_BASED_ON = 'basedOn'; const FIELD_BODY_SITE = 'bodySite'; const FIELD_DERIVED_FROM = 'derivedFrom'; @@ -296,6 +292,9 @@ class FHIRDeviceUseStatement extends FHIRDomainResource implements PHPFHIRContai */ protected $timingTiming = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRDeviceUseStatement Constructor * @param null|array $data @@ -315,6 +314,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_BASED_ON])) { if (is_array($data[self::FIELD_BASED_ON])) { foreach($data[self::FIELD_BASED_ON] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addBasedOn($v); } else { @@ -337,6 +339,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_DERIVED_FROM])) { if (is_array($data[self::FIELD_DERIVED_FROM])) { foreach($data[self::FIELD_DERIVED_FROM] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addDerivedFrom($v); } else { @@ -362,17 +367,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -381,6 +393,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_NOTE])) { if (is_array($data[self::FIELD_NOTE])) { foreach($data[self::FIELD_NOTE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRAnnotation) { $this->addNote($v); } else { @@ -396,6 +411,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REASON_CODE])) { if (is_array($data[self::FIELD_REASON_CODE])) { foreach($data[self::FIELD_REASON_CODE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addReasonCode($v); } else { @@ -411,6 +429,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REASON_REFERENCE])) { if (is_array($data[self::FIELD_REASON_REFERENCE])) { foreach($data[self::FIELD_REASON_REFERENCE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addReasonReference($v); } else { @@ -429,8 +450,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_RECORDED_ON] instanceof FHIRDateTime) { $this->setRecordedOn($data[self::FIELD_RECORDED_ON]); - } elseif ($ext && is_scalar($data[self::FIELD_RECORDED_ON])) { - $this->setRecordedOn(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_RECORDED_ON]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_RECORDED_ON])) { + $this->setRecordedOn(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_RECORDED_ON]] + $ext)); + } else if (is_array($data[self::FIELD_RECORDED_ON])) { + $this->setRecordedOn(new FHIRDateTime(array_merge($ext, $data[self::FIELD_RECORDED_ON]))); + } } else { $this->setRecordedOn(new FHIRDateTime($data[self::FIELD_RECORDED_ON])); } @@ -448,8 +473,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRDeviceUseStatementStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRDeviceUseStatementStatus([FHIRDeviceUseStatementStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRDeviceUseStatementStatus([FHIRDeviceUseStatementStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRDeviceUseStatementStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRDeviceUseStatementStatus($data[self::FIELD_STATUS])); } @@ -467,8 +496,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TIMING_DATE_TIME] instanceof FHIRDateTime) { $this->setTimingDateTime($data[self::FIELD_TIMING_DATE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_TIMING_DATE_TIME])) { - $this->setTimingDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_TIMING_DATE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TIMING_DATE_TIME])) { + $this->setTimingDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_TIMING_DATE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_TIMING_DATE_TIME])) { + $this->setTimingDateTime(new FHIRDateTime(array_merge($ext, $data[self::FIELD_TIMING_DATE_TIME]))); + } } else { $this->setTimingDateTime(new FHIRDateTime($data[self::FIELD_TIMING_DATE_TIME])); } @@ -1328,7 +1361,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getBasedOn())) { foreach($vs as $v) { if (null === $v) { @@ -1341,7 +1373,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getBodySite())) { $v->xmlSerialize($sxe->addChild(self::FIELD_BODY_SITE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getDerivedFrom())) { foreach($vs as $v) { if (null === $v) { @@ -1354,7 +1385,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDevice())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEVICE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -1390,29 +1420,25 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_REASON_REFERENCE, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getRecordedOn())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RECORDED_ON, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSource())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SOURCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSubject())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBJECT, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getTimingDateTime())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TIMING_DATE_TIME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getTimingPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TIMING_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getTimingTiming())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TIMING_TIMING, null, $v->_getFHIRXMLNamespace())); } @@ -1438,7 +1464,23 @@ public function jsonSerialize() $a[self::FIELD_DEVICE] = $v; } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if ([] !== ($vs = $this->getNote())) { $a[self::FIELD_NOTE] = $vs; @@ -1450,21 +1492,43 @@ public function jsonSerialize() $a[self::FIELD_REASON_REFERENCE] = $vs; } if (null !== ($v = $this->getRecordedOn())) { - $a[self::FIELD_RECORDED_ON] = $v->getValue(); - $a[self::FIELD_RECORDED_ON_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_RECORDED_ON] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_RECORDED_ON_EXT] = $enc; + } + } else { + $a[self::FIELD_RECORDED_ON] = $v; + } } if (null !== ($v = $this->getSource())) { $a[self::FIELD_SOURCE] = $v; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getSubject())) { $a[self::FIELD_SUBJECT] = $v; } if (null !== ($v = $this->getTimingDateTime())) { - $a[self::FIELD_TIMING_DATE_TIME] = $v->getValue(); - $a[self::FIELD_TIMING_DATE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TIMING_DATE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TIMING_DATE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_TIMING_DATE_TIME] = $v; + } } if (null !== ($v = $this->getTimingPeriod())) { $a[self::FIELD_TIMING_PERIOD] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRDiagnosticReport.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRDiagnosticReport.php index 70cb9568e7..9854b421a6 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRDiagnosticReport.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRDiagnosticReport.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -92,10 +92,6 @@ class FHIRDiagnosticReport extends FHIRDomainResource implements PHPFHIRContaine { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DIAGNOSTIC_REPORT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_BASED_ON = 'basedOn'; const FIELD_CATEGORY = 'category'; const FIELD_CODE = 'code'; @@ -362,6 +358,9 @@ class FHIRDiagnosticReport extends FHIRDomainResource implements PHPFHIRContaine */ protected $subject = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRDiagnosticReport Constructor * @param null|array $data @@ -381,6 +380,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_BASED_ON])) { if (is_array($data[self::FIELD_BASED_ON])) { foreach($data[self::FIELD_BASED_ON] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addBasedOn($v); } else { @@ -396,6 +398,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CATEGORY])) { if (is_array($data[self::FIELD_CATEGORY])) { foreach($data[self::FIELD_CATEGORY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addCategory($v); } else { @@ -421,8 +426,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CONCLUSION] instanceof FHIRString) { $this->setConclusion($data[self::FIELD_CONCLUSION]); - } elseif ($ext && is_scalar($data[self::FIELD_CONCLUSION])) { - $this->setConclusion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_CONCLUSION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CONCLUSION])) { + $this->setConclusion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_CONCLUSION]] + $ext)); + } else if (is_array($data[self::FIELD_CONCLUSION])) { + $this->setConclusion(new FHIRString(array_merge($ext, $data[self::FIELD_CONCLUSION]))); + } } else { $this->setConclusion(new FHIRString($data[self::FIELD_CONCLUSION])); } @@ -430,6 +439,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CONCLUSION_CODE])) { if (is_array($data[self::FIELD_CONCLUSION_CODE])) { foreach($data[self::FIELD_CONCLUSION_CODE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addConclusionCode($v); } else { @@ -448,8 +460,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EFFECTIVE_DATE_TIME] instanceof FHIRDateTime) { $this->setEffectiveDateTime($data[self::FIELD_EFFECTIVE_DATE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_EFFECTIVE_DATE_TIME])) { - $this->setEffectiveDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_EFFECTIVE_DATE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EFFECTIVE_DATE_TIME])) { + $this->setEffectiveDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_EFFECTIVE_DATE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_EFFECTIVE_DATE_TIME])) { + $this->setEffectiveDateTime(new FHIRDateTime(array_merge($ext, $data[self::FIELD_EFFECTIVE_DATE_TIME]))); + } } else { $this->setEffectiveDateTime(new FHIRDateTime($data[self::FIELD_EFFECTIVE_DATE_TIME])); } @@ -474,17 +490,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -493,6 +516,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_IMAGING_STUDY])) { if (is_array($data[self::FIELD_IMAGING_STUDY])) { foreach($data[self::FIELD_IMAGING_STUDY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addImagingStudy($v); } else { @@ -511,8 +537,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ISSUED] instanceof FHIRInstant) { $this->setIssued($data[self::FIELD_ISSUED]); - } elseif ($ext && is_scalar($data[self::FIELD_ISSUED])) { - $this->setIssued(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_ISSUED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ISSUED])) { + $this->setIssued(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_ISSUED]] + $ext)); + } else if (is_array($data[self::FIELD_ISSUED])) { + $this->setIssued(new FHIRInstant(array_merge($ext, $data[self::FIELD_ISSUED]))); + } } else { $this->setIssued(new FHIRInstant($data[self::FIELD_ISSUED])); } @@ -520,6 +550,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_MEDIA])) { if (is_array($data[self::FIELD_MEDIA])) { foreach($data[self::FIELD_MEDIA] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRDiagnosticReportMedia) { $this->addMedia($v); } else { @@ -535,6 +568,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PERFORMER])) { if (is_array($data[self::FIELD_PERFORMER])) { foreach($data[self::FIELD_PERFORMER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addPerformer($v); } else { @@ -550,6 +586,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PRESENTED_FORM])) { if (is_array($data[self::FIELD_PRESENTED_FORM])) { foreach($data[self::FIELD_PRESENTED_FORM] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRAttachment) { $this->addPresentedForm($v); } else { @@ -565,6 +604,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_RESULT])) { if (is_array($data[self::FIELD_RESULT])) { foreach($data[self::FIELD_RESULT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addResult($v); } else { @@ -580,6 +622,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_RESULTS_INTERPRETER])) { if (is_array($data[self::FIELD_RESULTS_INTERPRETER])) { foreach($data[self::FIELD_RESULTS_INTERPRETER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addResultsInterpreter($v); } else { @@ -595,6 +640,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SPECIMEN])) { if (is_array($data[self::FIELD_SPECIMEN])) { foreach($data[self::FIELD_SPECIMEN] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addSpecimen($v); } else { @@ -613,8 +661,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRDiagnosticReportStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRDiagnosticReportStatus([FHIRDiagnosticReportStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRDiagnosticReportStatus([FHIRDiagnosticReportStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRDiagnosticReportStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRDiagnosticReportStatus($data[self::FIELD_STATUS])); } @@ -1782,7 +1834,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getBasedOn())) { foreach($vs as $v) { if (null === $v) { @@ -1807,7 +1858,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getConclusion())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CONCLUSION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getConclusionCode())) { foreach($vs as $v) { if (null === $v) { @@ -1816,18 +1866,16 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_CONCLUSION_CODE, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getEffectiveDateTime())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EFFECTIVE_DATE_TIME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getEffectivePeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EFFECTIVE_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getEncounter())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ENCOUNTER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -1845,10 +1893,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_IMAGING_STUDY, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getIssued())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ISSUED, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getMedia())) { foreach($vs as $v) { if (null === $v) { @@ -1906,7 +1954,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSubject())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBJECT, null, $v->_getFHIRXMLNamespace())); } @@ -1929,15 +1976,29 @@ public function jsonSerialize() $a[self::FIELD_CODE] = $v; } if (null !== ($v = $this->getConclusion())) { - $a[self::FIELD_CONCLUSION] = $v->getValue(); - $a[self::FIELD_CONCLUSION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CONCLUSION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CONCLUSION_EXT] = $enc; + } + } else { + $a[self::FIELD_CONCLUSION] = $v; + } } if ([] !== ($vs = $this->getConclusionCode())) { $a[self::FIELD_CONCLUSION_CODE] = $vs; } if (null !== ($v = $this->getEffectiveDateTime())) { - $a[self::FIELD_EFFECTIVE_DATE_TIME] = $v->getValue(); - $a[self::FIELD_EFFECTIVE_DATE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EFFECTIVE_DATE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EFFECTIVE_DATE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_EFFECTIVE_DATE_TIME] = $v; + } } if (null !== ($v = $this->getEffectivePeriod())) { $a[self::FIELD_EFFECTIVE_PERIOD] = $v; @@ -1946,14 +2007,37 @@ public function jsonSerialize() $a[self::FIELD_ENCOUNTER] = $v; } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if ([] !== ($vs = $this->getImagingStudy())) { $a[self::FIELD_IMAGING_STUDY] = $vs; } if (null !== ($v = $this->getIssued())) { - $a[self::FIELD_ISSUED] = $v->getValue(); - $a[self::FIELD_ISSUED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ISSUED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ISSUED_EXT] = $enc; + } + } else { + $a[self::FIELD_ISSUED] = $v; + } } if ([] !== ($vs = $this->getMedia())) { $a[self::FIELD_MEDIA] = $vs; @@ -1974,7 +2058,15 @@ public function jsonSerialize() $a[self::FIELD_SPECIMEN] = $vs; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getSubject())) { $a[self::FIELD_SUBJECT] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRDocumentManifest.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRDocumentManifest.php index 2a154eaeaf..27b9536228 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRDocumentManifest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRDocumentManifest.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -87,10 +87,6 @@ class FHIRDocumentManifest extends FHIRDomainResource implements PHPFHIRContaine { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DOCUMENT_MANIFEST; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_AUTHOR = 'author'; const FIELD_CONTENT = 'content'; const FIELD_CREATED = 'created'; @@ -258,6 +254,9 @@ class FHIRDocumentManifest extends FHIRDomainResource implements PHPFHIRContaine */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRDocumentManifest Constructor * @param null|array $data @@ -277,6 +276,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_AUTHOR])) { if (is_array($data[self::FIELD_AUTHOR])) { foreach($data[self::FIELD_AUTHOR] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addAuthor($v); } else { @@ -292,6 +294,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CONTENT])) { if (is_array($data[self::FIELD_CONTENT])) { foreach($data[self::FIELD_CONTENT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addContent($v); } else { @@ -310,8 +315,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CREATED] instanceof FHIRDateTime) { $this->setCreated($data[self::FIELD_CREATED]); - } elseif ($ext && is_scalar($data[self::FIELD_CREATED])) { - $this->setCreated(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_CREATED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CREATED])) { + $this->setCreated(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_CREATED]] + $ext)); + } else if (is_array($data[self::FIELD_CREATED])) { + $this->setCreated(new FHIRDateTime(array_merge($ext, $data[self::FIELD_CREATED]))); + } } else { $this->setCreated(new FHIRDateTime($data[self::FIELD_CREATED])); } @@ -322,8 +331,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -334,17 +347,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -356,8 +376,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MASTER_IDENTIFIER] instanceof FHIRIdentifier) { $this->setMasterIdentifier($data[self::FIELD_MASTER_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_MASTER_IDENTIFIER])) { - $this->setMasterIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_MASTER_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MASTER_IDENTIFIER])) { + $this->setMasterIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_MASTER_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_MASTER_IDENTIFIER])) { + $this->setMasterIdentifier(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_MASTER_IDENTIFIER]))); + } } else { $this->setMasterIdentifier(new FHIRIdentifier($data[self::FIELD_MASTER_IDENTIFIER])); } @@ -365,6 +389,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_RECIPIENT])) { if (is_array($data[self::FIELD_RECIPIENT])) { foreach($data[self::FIELD_RECIPIENT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addRecipient($v); } else { @@ -380,6 +407,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_RELATED])) { if (is_array($data[self::FIELD_RELATED])) { foreach($data[self::FIELD_RELATED] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRDocumentManifestRelated) { $this->addRelated($v); } else { @@ -398,8 +428,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SOURCE] instanceof FHIRUri) { $this->setSource($data[self::FIELD_SOURCE]); - } elseif ($ext && is_scalar($data[self::FIELD_SOURCE])) { - $this->setSource(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_SOURCE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SOURCE])) { + $this->setSource(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_SOURCE]] + $ext)); + } else if (is_array($data[self::FIELD_SOURCE])) { + $this->setSource(new FHIRUri(array_merge($ext, $data[self::FIELD_SOURCE]))); + } } else { $this->setSource(new FHIRUri($data[self::FIELD_SOURCE])); } @@ -410,8 +444,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRDocumentReferenceStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRDocumentReferenceStatus([FHIRDocumentReferenceStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRDocumentReferenceStatus([FHIRDocumentReferenceStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRDocumentReferenceStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRDocumentReferenceStatus($data[self::FIELD_STATUS])); } @@ -1143,7 +1181,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getAuthor())) { foreach($vs as $v) { if (null === $v) { @@ -1161,13 +1198,13 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_CONTENT, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getCreated())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CREATED, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getDescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESCRIPTION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -1180,7 +1217,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getMasterIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MASTER_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getRecipient())) { foreach($vs as $v) { if (null === $v) { @@ -1198,18 +1234,16 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_RELATED, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getSource())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SOURCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSubject())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBJECT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -1229,18 +1263,56 @@ public function jsonSerialize() $a[self::FIELD_CONTENT] = $vs; } if (null !== ($v = $this->getCreated())) { - $a[self::FIELD_CREATED] = $v->getValue(); - $a[self::FIELD_CREATED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CREATED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CREATED_EXT] = $enc; + } + } else { + $a[self::FIELD_CREATED] = $v; + } } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if (null !== ($v = $this->getMasterIdentifier())) { - $a[self::FIELD_MASTER_IDENTIFIER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MASTER_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MASTER_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_MASTER_IDENTIFIER] = $v; + } } if ([] !== ($vs = $this->getRecipient())) { $a[self::FIELD_RECIPIENT] = $vs; @@ -1249,11 +1321,26 @@ public function jsonSerialize() $a[self::FIELD_RELATED] = $vs; } if (null !== ($v = $this->getSource())) { - $a[self::FIELD_SOURCE] = $v->getValue(); - $a[self::FIELD_SOURCE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SOURCE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SOURCE_EXT] = $enc; + } + } else { + $a[self::FIELD_SOURCE] = $v; + } } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getSubject())) { $a[self::FIELD_SUBJECT] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRDocumentReference.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRDocumentReference.php index 8bb27cd1d2..a026c3766c 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRDocumentReference.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRDocumentReference.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -92,10 +92,6 @@ class FHIRDocumentReference extends FHIRDomainResource implements PHPFHIRContain { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DOCUMENT_REFERENCE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_AUTHENTICATOR = 'authenticator'; const FIELD_AUTHOR = 'author'; const FIELD_CATEGORY = 'category'; @@ -323,6 +319,9 @@ class FHIRDocumentReference extends FHIRDomainResource implements PHPFHIRContain */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRDocumentReference Constructor * @param null|array $data @@ -349,6 +348,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_AUTHOR])) { if (is_array($data[self::FIELD_AUTHOR])) { foreach($data[self::FIELD_AUTHOR] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addAuthor($v); } else { @@ -364,6 +366,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CATEGORY])) { if (is_array($data[self::FIELD_CATEGORY])) { foreach($data[self::FIELD_CATEGORY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addCategory($v); } else { @@ -379,6 +384,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CONTENT])) { if (is_array($data[self::FIELD_CONTENT])) { foreach($data[self::FIELD_CONTENT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRDocumentReferenceContent) { $this->addContent($v); } else { @@ -411,8 +419,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATE] instanceof FHIRInstant) { $this->setDate($data[self::FIELD_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_DATE])) { - $this->setDate(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATE])) { + $this->setDate(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_DATE])) { + $this->setDate(new FHIRInstant(array_merge($ext, $data[self::FIELD_DATE]))); + } } else { $this->setDate(new FHIRInstant($data[self::FIELD_DATE])); } @@ -423,8 +435,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -435,8 +451,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DOC_STATUS] instanceof FHIRCompositionStatus) { $this->setDocStatus($data[self::FIELD_DOC_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_DOC_STATUS])) { - $this->setDocStatus(new FHIRCompositionStatus([FHIRCompositionStatus::FIELD_VALUE => $data[self::FIELD_DOC_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DOC_STATUS])) { + $this->setDocStatus(new FHIRCompositionStatus([FHIRCompositionStatus::FIELD_VALUE => $data[self::FIELD_DOC_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_DOC_STATUS])) { + $this->setDocStatus(new FHIRCompositionStatus(array_merge($ext, $data[self::FIELD_DOC_STATUS]))); + } } else { $this->setDocStatus(new FHIRCompositionStatus($data[self::FIELD_DOC_STATUS])); } @@ -447,17 +467,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -469,8 +496,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MASTER_IDENTIFIER] instanceof FHIRIdentifier) { $this->setMasterIdentifier($data[self::FIELD_MASTER_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_MASTER_IDENTIFIER])) { - $this->setMasterIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_MASTER_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MASTER_IDENTIFIER])) { + $this->setMasterIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_MASTER_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_MASTER_IDENTIFIER])) { + $this->setMasterIdentifier(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_MASTER_IDENTIFIER]))); + } } else { $this->setMasterIdentifier(new FHIRIdentifier($data[self::FIELD_MASTER_IDENTIFIER])); } @@ -478,6 +509,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_RELATES_TO])) { if (is_array($data[self::FIELD_RELATES_TO])) { foreach($data[self::FIELD_RELATES_TO] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRDocumentReferenceRelatesTo) { $this->addRelatesTo($v); } else { @@ -493,6 +527,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SECURITY_LABEL])) { if (is_array($data[self::FIELD_SECURITY_LABEL])) { foreach($data[self::FIELD_SECURITY_LABEL] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addSecurityLabel($v); } else { @@ -511,8 +548,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRDocumentReferenceStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRDocumentReferenceStatus([FHIRDocumentReferenceStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRDocumentReferenceStatus([FHIRDocumentReferenceStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRDocumentReferenceStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRDocumentReferenceStatus($data[self::FIELD_STATUS])); } @@ -1430,11 +1471,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getAuthenticator())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AUTHENTICATOR, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getAuthor())) { foreach($vs as $v) { if (null === $v) { @@ -1465,7 +1504,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getContext())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CONTEXT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getCustodian())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CUSTODIAN, null, $v->_getFHIRXMLNamespace())); } @@ -1475,11 +1513,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESCRIPTION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDocStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DOC_STATUS, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -1492,7 +1528,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getMasterIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MASTER_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getRelatesTo())) { foreach($vs as $v) { if (null === $v) { @@ -1514,11 +1549,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSubject())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBJECT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -1550,21 +1583,67 @@ public function jsonSerialize() $a[self::FIELD_CUSTODIAN] = $v; } if (null !== ($v = $this->getDate())) { - $a[self::FIELD_DATE] = $v->getValue(); - $a[self::FIELD_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_DATE] = $v; + } } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if (null !== ($v = $this->getDocStatus())) { - $a[self::FIELD_DOC_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DOC_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DOC_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_DOC_STATUS] = $v; + } } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if (null !== ($v = $this->getMasterIdentifier())) { - $a[self::FIELD_MASTER_IDENTIFIER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MASTER_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MASTER_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_MASTER_IDENTIFIER] = $v; + } } if ([] !== ($vs = $this->getRelatesTo())) { $a[self::FIELD_RELATES_TO] = $vs; @@ -1573,7 +1652,15 @@ public function jsonSerialize() $a[self::FIELD_SECURITY_LABEL] = $vs; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getSubject())) { $a[self::FIELD_SUBJECT] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIREffectEvidenceSynthesis.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIREffectEvidenceSynthesis.php index e789e3b312..dd4487b51e 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIREffectEvidenceSynthesis.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIREffectEvidenceSynthesis.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -98,10 +98,6 @@ class FHIREffectEvidenceSynthesis extends FHIRDomainResource implements PHPFHIRC { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_EFFECT_EVIDENCE_SYNTHESIS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_APPROVAL_DATE = 'approvalDate'; const FIELD_APPROVAL_DATE_EXT = '_approvalDate'; const FIELD_AUTHOR = 'author'; @@ -577,6 +573,9 @@ class FHIREffectEvidenceSynthesis extends FHIRDomainResource implements PHPFHIRC */ protected $version = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIREffectEvidenceSynthesis Constructor * @param null|array $data @@ -599,8 +598,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_APPROVAL_DATE] instanceof FHIRDate) { $this->setApprovalDate($data[self::FIELD_APPROVAL_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_APPROVAL_DATE])) { - $this->setApprovalDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_APPROVAL_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_APPROVAL_DATE])) { + $this->setApprovalDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_APPROVAL_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_APPROVAL_DATE])) { + $this->setApprovalDate(new FHIRDate(array_merge($ext, $data[self::FIELD_APPROVAL_DATE]))); + } } else { $this->setApprovalDate(new FHIRDate($data[self::FIELD_APPROVAL_DATE])); } @@ -608,6 +611,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_AUTHOR])) { if (is_array($data[self::FIELD_AUTHOR])) { foreach($data[self::FIELD_AUTHOR] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContactDetail) { $this->addAuthor($v); } else { @@ -623,6 +629,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CERTAINTY])) { if (is_array($data[self::FIELD_CERTAINTY])) { foreach($data[self::FIELD_CERTAINTY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIREffectEvidenceSynthesisCertainty) { $this->addCertainty($v); } else { @@ -638,6 +647,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CONTACT])) { if (is_array($data[self::FIELD_CONTACT])) { foreach($data[self::FIELD_CONTACT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContactDetail) { $this->addContact($v); } else { @@ -656,8 +668,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_COPYRIGHT] instanceof FHIRMarkdown) { $this->setCopyright($data[self::FIELD_COPYRIGHT]); - } elseif ($ext && is_scalar($data[self::FIELD_COPYRIGHT])) { - $this->setCopyright(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_COPYRIGHT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_COPYRIGHT])) { + $this->setCopyright(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_COPYRIGHT]] + $ext)); + } else if (is_array($data[self::FIELD_COPYRIGHT])) { + $this->setCopyright(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_COPYRIGHT]))); + } } else { $this->setCopyright(new FHIRMarkdown($data[self::FIELD_COPYRIGHT])); } @@ -668,8 +684,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATE] instanceof FHIRDateTime) { $this->setDate($data[self::FIELD_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_DATE])) { - $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime(array_merge($ext, $data[self::FIELD_DATE]))); + } } else { $this->setDate(new FHIRDateTime($data[self::FIELD_DATE])); } @@ -680,8 +700,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRMarkdown) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRMarkdown($data[self::FIELD_DESCRIPTION])); } @@ -689,6 +713,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_EDITOR])) { if (is_array($data[self::FIELD_EDITOR])) { foreach($data[self::FIELD_EDITOR] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContactDetail) { $this->addEditor($v); } else { @@ -707,17 +734,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_EFFECT_ESTIMATE])) { foreach($data[self::FIELD_EFFECT_ESTIMATE] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIREffectEvidenceSynthesisEffectEstimate) { $this->addEffectEstimate($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addEffectEstimate(new FHIREffectEvidenceSynthesisEffectEstimate([FHIREffectEvidenceSynthesisEffectEstimate::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addEffectEstimate(new FHIREffectEvidenceSynthesisEffectEstimate([FHIREffectEvidenceSynthesisEffectEstimate::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addEffectEstimate(new FHIREffectEvidenceSynthesisEffectEstimate(array_merge($v, $ext[$i]))); + } } else { $this->addEffectEstimate(new FHIREffectEvidenceSynthesisEffectEstimate($v)); } } } elseif ($data[self::FIELD_EFFECT_ESTIMATE] instanceof FHIREffectEvidenceSynthesisEffectEstimate) { $this->addEffectEstimate($data[self::FIELD_EFFECT_ESTIMATE]); - } elseif ($ext && is_scalar($data[self::FIELD_EFFECT_ESTIMATE])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_EFFECT_ESTIMATE])) { $this->addEffectEstimate(new FHIREffectEvidenceSynthesisEffectEstimate([FHIREffectEvidenceSynthesisEffectEstimate::FIELD_VALUE => $data[self::FIELD_EFFECT_ESTIMATE]] + $ext)); } else { $this->addEffectEstimate(new FHIREffectEvidenceSynthesisEffectEstimate($data[self::FIELD_EFFECT_ESTIMATE])); @@ -733,6 +767,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ENDORSER])) { if (is_array($data[self::FIELD_ENDORSER])) { foreach($data[self::FIELD_ENDORSER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContactDetail) { $this->addEndorser($v); } else { @@ -765,17 +802,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -784,6 +828,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_JURISDICTION])) { if (is_array($data[self::FIELD_JURISDICTION])) { foreach($data[self::FIELD_JURISDICTION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addJurisdiction($v); } else { @@ -802,8 +849,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_LAST_REVIEW_DATE] instanceof FHIRDate) { $this->setLastReviewDate($data[self::FIELD_LAST_REVIEW_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_LAST_REVIEW_DATE])) { - $this->setLastReviewDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_LAST_REVIEW_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_LAST_REVIEW_DATE])) { + $this->setLastReviewDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_LAST_REVIEW_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_LAST_REVIEW_DATE])) { + $this->setLastReviewDate(new FHIRDate(array_merge($ext, $data[self::FIELD_LAST_REVIEW_DATE]))); + } } else { $this->setLastReviewDate(new FHIRDate($data[self::FIELD_LAST_REVIEW_DATE])); } @@ -814,8 +865,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -823,6 +878,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_NOTE])) { if (is_array($data[self::FIELD_NOTE])) { foreach($data[self::FIELD_NOTE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRAnnotation) { $this->addNote($v); } else { @@ -855,8 +913,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PUBLISHER] instanceof FHIRString) { $this->setPublisher($data[self::FIELD_PUBLISHER]); - } elseif ($ext && is_scalar($data[self::FIELD_PUBLISHER])) { - $this->setPublisher(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PUBLISHER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PUBLISHER])) { + $this->setPublisher(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PUBLISHER]] + $ext)); + } else if (is_array($data[self::FIELD_PUBLISHER])) { + $this->setPublisher(new FHIRString(array_merge($ext, $data[self::FIELD_PUBLISHER]))); + } } else { $this->setPublisher(new FHIRString($data[self::FIELD_PUBLISHER])); } @@ -864,6 +926,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_RELATED_ARTIFACT])) { if (is_array($data[self::FIELD_RELATED_ARTIFACT])) { foreach($data[self::FIELD_RELATED_ARTIFACT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRRelatedArtifact) { $this->addRelatedArtifact($v); } else { @@ -879,6 +944,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_RESULTS_BY_EXPOSURE])) { if (is_array($data[self::FIELD_RESULTS_BY_EXPOSURE])) { foreach($data[self::FIELD_RESULTS_BY_EXPOSURE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIREffectEvidenceSynthesisResultsByExposure) { $this->addResultsByExposure($v); } else { @@ -894,6 +962,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REVIEWER])) { if (is_array($data[self::FIELD_REVIEWER])) { foreach($data[self::FIELD_REVIEWER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContactDetail) { $this->addReviewer($v); } else { @@ -919,8 +990,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRPublicationStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRPublicationStatus([FHIRPublicationStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRPublicationStatus([FHIRPublicationStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRPublicationStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRPublicationStatus($data[self::FIELD_STATUS])); } @@ -945,8 +1020,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TITLE] instanceof FHIRString) { $this->setTitle($data[self::FIELD_TITLE]); - } elseif ($ext && is_scalar($data[self::FIELD_TITLE])) { - $this->setTitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TITLE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TITLE])) { + $this->setTitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TITLE]] + $ext)); + } else if (is_array($data[self::FIELD_TITLE])) { + $this->setTitle(new FHIRString(array_merge($ext, $data[self::FIELD_TITLE]))); + } } else { $this->setTitle(new FHIRString($data[self::FIELD_TITLE])); } @@ -954,6 +1033,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_TOPIC])) { if (is_array($data[self::FIELD_TOPIC])) { foreach($data[self::FIELD_TOPIC] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addTopic($v); } else { @@ -972,8 +1054,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_URL] instanceof FHIRUri) { $this->setUrl($data[self::FIELD_URL]); - } elseif ($ext && is_scalar($data[self::FIELD_URL])) { - $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } else if (is_array($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri(array_merge($ext, $data[self::FIELD_URL]))); + } } else { $this->setUrl(new FHIRUri($data[self::FIELD_URL])); } @@ -981,6 +1067,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_USE_CONTEXT])) { if (is_array($data[self::FIELD_USE_CONTEXT])) { foreach($data[self::FIELD_USE_CONTEXT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRUsageContext) { $this->addUseContext($v); } else { @@ -999,8 +1088,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VERSION] instanceof FHIRString) { $this->setVersion($data[self::FIELD_VERSION]); - } elseif ($ext && is_scalar($data[self::FIELD_VERSION])) { - $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } else if (is_array($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString(array_merge($ext, $data[self::FIELD_VERSION]))); + } } else { $this->setVersion(new FHIRString($data[self::FIELD_VERSION])); } @@ -2862,7 +2955,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getApprovalDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_APPROVAL_DATE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getAuthor())) { foreach($vs as $v) { if (null === $v) { @@ -2889,6 +2981,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_CONTACT, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getCopyright())) { $v->xmlSerialize($sxe->addChild(self::FIELD_COPYRIGHT, null, $v->_getFHIRXMLNamespace())); } @@ -2898,7 +2991,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESCRIPTION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getEditor())) { foreach($vs as $v) { if (null === $v) { @@ -2920,7 +3012,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getEffectivePeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EFFECTIVE_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getEndorser())) { foreach($vs as $v) { if (null === $v) { @@ -2933,11 +3024,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getExposure())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EXPOSURE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getExposureAlternative())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EXPOSURE_ALTERNATIVE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -2955,13 +3044,13 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_JURISDICTION, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getLastReviewDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_LAST_REVIEW_DATE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NAME, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getNote())) { foreach($vs as $v) { if (null === $v) { @@ -2974,14 +3063,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getOutcome())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OUTCOME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPopulation())) { $v->xmlSerialize($sxe->addChild(self::FIELD_POPULATION, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getPublisher())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PUBLISHER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getRelatedArtifact())) { foreach($vs as $v) { if (null === $v) { @@ -3012,22 +3099,18 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getSampleSize())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SAMPLE_SIZE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStudyType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STUDY_TYPE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSynthesisType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SYNTHESIS_TYPE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getTitle())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TITLE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getTopic())) { foreach($vs as $v) { if (null === $v) { @@ -3036,10 +3119,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_TOPIC, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getUrl())) { $v->xmlSerialize($sxe->addChild(self::FIELD_URL, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getUseContext())) { foreach($vs as $v) { if (null === $v) { @@ -3048,6 +3131,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_USE_CONTEXT, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getVersion())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VERSION, null, $v->_getFHIRXMLNamespace())); } @@ -3061,8 +3145,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getApprovalDate())) { - $a[self::FIELD_APPROVAL_DATE] = $v->getValue(); - $a[self::FIELD_APPROVAL_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_APPROVAL_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_APPROVAL_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_APPROVAL_DATE] = $v; + } } if ([] !== ($vs = $this->getAuthor())) { $a[self::FIELD_AUTHOR] = $vs; @@ -3074,22 +3165,59 @@ public function jsonSerialize() $a[self::FIELD_CONTACT] = $vs; } if (null !== ($v = $this->getCopyright())) { - $a[self::FIELD_COPYRIGHT] = $v->getValue(); - $a[self::FIELD_COPYRIGHT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_COPYRIGHT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_COPYRIGHT_EXT] = $enc; + } + } else { + $a[self::FIELD_COPYRIGHT] = $v; + } } if (null !== ($v = $this->getDate())) { - $a[self::FIELD_DATE] = $v->getValue(); - $a[self::FIELD_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_DATE] = $v; + } } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if ([] !== ($vs = $this->getEditor())) { $a[self::FIELD_EDITOR] = $vs; } if ([] !== ($vs = $this->getEffectEstimate())) { - $a[self::FIELD_EFFECT_ESTIMATE] = $vs; + $a[self::FIELD_EFFECT_ESTIMATE] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EFFECT_ESTIMATE][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EFFECT_ESTIMATE_EXT][] = $enc; + } else { + $a[self::FIELD_EFFECT_ESTIMATE_EXT][] = null; + } + } else { + $a[self::FIELD_EFFECT_ESTIMATE][] = $v; + } + } } if (null !== ($v = $this->getEffectivePeriod())) { $a[self::FIELD_EFFECTIVE_PERIOD] = $v; @@ -3104,18 +3232,48 @@ public function jsonSerialize() $a[self::FIELD_EXPOSURE_ALTERNATIVE] = $v; } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if ([] !== ($vs = $this->getJurisdiction())) { $a[self::FIELD_JURISDICTION] = $vs; } if (null !== ($v = $this->getLastReviewDate())) { - $a[self::FIELD_LAST_REVIEW_DATE] = $v->getValue(); - $a[self::FIELD_LAST_REVIEW_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_LAST_REVIEW_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_LAST_REVIEW_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_LAST_REVIEW_DATE] = $v; + } } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if ([] !== ($vs = $this->getNote())) { $a[self::FIELD_NOTE] = $vs; @@ -3127,8 +3285,15 @@ public function jsonSerialize() $a[self::FIELD_POPULATION] = $v; } if (null !== ($v = $this->getPublisher())) { - $a[self::FIELD_PUBLISHER] = $v->getValue(); - $a[self::FIELD_PUBLISHER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PUBLISHER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PUBLISHER_EXT] = $enc; + } + } else { + $a[self::FIELD_PUBLISHER] = $v; + } } if ([] !== ($vs = $this->getRelatedArtifact())) { $a[self::FIELD_RELATED_ARTIFACT] = $vs; @@ -3143,7 +3308,15 @@ public function jsonSerialize() $a[self::FIELD_SAMPLE_SIZE] = $v; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getStudyType())) { $a[self::FIELD_STUDY_TYPE] = $v; @@ -3152,22 +3325,43 @@ public function jsonSerialize() $a[self::FIELD_SYNTHESIS_TYPE] = $v; } if (null !== ($v = $this->getTitle())) { - $a[self::FIELD_TITLE] = $v->getValue(); - $a[self::FIELD_TITLE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TITLE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TITLE_EXT] = $enc; + } + } else { + $a[self::FIELD_TITLE] = $v; + } } if ([] !== ($vs = $this->getTopic())) { $a[self::FIELD_TOPIC] = $vs; } if (null !== ($v = $this->getUrl())) { - $a[self::FIELD_URL] = $v->getValue(); - $a[self::FIELD_URL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_URL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_URL_EXT] = $enc; + } + } else { + $a[self::FIELD_URL] = $v; + } } if ([] !== ($vs = $this->getUseContext())) { $a[self::FIELD_USE_CONTEXT] = $vs; } if (null !== ($v = $this->getVersion())) { - $a[self::FIELD_VERSION] = $v->getValue(); - $a[self::FIELD_VERSION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VERSION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VERSION_EXT] = $enc; + } + } else { + $a[self::FIELD_VERSION] = $v; + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIREncounter.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIREncounter.php index fce564d7b5..a95b82c689 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIREncounter.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIREncounter.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -92,10 +92,6 @@ class FHIREncounter extends FHIRDomainResource implements PHPFHIRContainedTypeIn { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ENCOUNTER; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ACCOUNT = 'account'; const FIELD_APPOINTMENT = 'appointment'; const FIELD_BASED_ON = 'basedOn'; @@ -107,6 +103,7 @@ class FHIREncounter extends FHIRDomainResource implements PHPFHIRContainedTypeIn const FIELD_IDENTIFIER = 'identifier'; const FIELD_IDENTIFIER_EXT = '_identifier'; const FIELD_LENGTH = 'length'; + const FIELD_LENGTH_EXT = '_length'; const FIELD_LOCATION = 'location'; const FIELD_PART_OF = 'partOf'; const FIELD_PARTICIPANT = 'participant'; @@ -400,6 +397,9 @@ class FHIREncounter extends FHIRDomainResource implements PHPFHIRContainedTypeIn */ protected $type = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIREncounter Constructor * @param null|array $data @@ -419,6 +419,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ACCOUNT])) { if (is_array($data[self::FIELD_ACCOUNT])) { foreach($data[self::FIELD_ACCOUNT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addAccount($v); } else { @@ -434,6 +437,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_APPOINTMENT])) { if (is_array($data[self::FIELD_APPOINTMENT])) { foreach($data[self::FIELD_APPOINTMENT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addAppointment($v); } else { @@ -449,6 +455,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_BASED_ON])) { if (is_array($data[self::FIELD_BASED_ON])) { foreach($data[self::FIELD_BASED_ON] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addBasedOn($v); } else { @@ -471,6 +480,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CLASS_HISTORY])) { if (is_array($data[self::FIELD_CLASS_HISTORY])) { foreach($data[self::FIELD_CLASS_HISTORY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIREncounterClassHistory) { $this->addClassHistory($v); } else { @@ -486,6 +498,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_DIAGNOSIS])) { if (is_array($data[self::FIELD_DIAGNOSIS])) { foreach($data[self::FIELD_DIAGNOSIS] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIREncounterDiagnosis) { $this->addDiagnosis($v); } else { @@ -501,6 +516,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_EPISODE_OF_CARE])) { if (is_array($data[self::FIELD_EPISODE_OF_CARE])) { foreach($data[self::FIELD_EPISODE_OF_CARE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addEpisodeOfCare($v); } else { @@ -526,25 +544,41 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); } } if (isset($data[self::FIELD_LENGTH])) { + $ext = (isset($data[self::FIELD_LENGTH_EXT]) && is_array($data[self::FIELD_LENGTH_EXT])) + ? $data[self::FIELD_LENGTH_EXT] + : null; if ($data[self::FIELD_LENGTH] instanceof FHIRDuration) { $this->setLength($data[self::FIELD_LENGTH]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_LENGTH])) { + $this->setLength(new FHIRDuration([FHIRDuration::FIELD_VALUE => $data[self::FIELD_LENGTH]] + $ext)); + } else if (is_array($data[self::FIELD_LENGTH])) { + $this->setLength(new FHIRDuration(array_merge($ext, $data[self::FIELD_LENGTH]))); + } } else { $this->setLength(new FHIRDuration($data[self::FIELD_LENGTH])); } @@ -552,6 +586,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_LOCATION])) { if (is_array($data[self::FIELD_LOCATION])) { foreach($data[self::FIELD_LOCATION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIREncounterLocation) { $this->addLocation($v); } else { @@ -574,6 +611,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PARTICIPANT])) { if (is_array($data[self::FIELD_PARTICIPANT])) { foreach($data[self::FIELD_PARTICIPANT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIREncounterParticipant) { $this->addParticipant($v); } else { @@ -603,6 +643,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REASON_CODE])) { if (is_array($data[self::FIELD_REASON_CODE])) { foreach($data[self::FIELD_REASON_CODE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addReasonCode($v); } else { @@ -618,6 +661,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REASON_REFERENCE])) { if (is_array($data[self::FIELD_REASON_REFERENCE])) { foreach($data[self::FIELD_REASON_REFERENCE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addReasonReference($v); } else { @@ -650,8 +696,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIREncounterStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIREncounterStatus([FHIREncounterStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIREncounterStatus([FHIREncounterStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIREncounterStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIREncounterStatus($data[self::FIELD_STATUS])); } @@ -659,6 +709,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_STATUS_HISTORY])) { if (is_array($data[self::FIELD_STATUS_HISTORY])) { foreach($data[self::FIELD_STATUS_HISTORY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIREncounterStatusHistory) { $this->addStatusHistory($v); } else { @@ -681,6 +734,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_TYPE])) { if (is_array($data[self::FIELD_TYPE])) { foreach($data[self::FIELD_TYPE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addType($v); } else { @@ -1991,7 +2047,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getAccount())) { foreach($vs as $v) { if (null === $v) { @@ -2022,7 +2077,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getClass())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CLASS, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getClassHistory())) { foreach($vs as $v) { if (null === $v) { @@ -2053,7 +2107,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getHospitalization())) { $v->xmlSerialize($sxe->addChild(self::FIELD_HOSPITALIZATION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -2066,7 +2119,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getLength())) { $v->xmlSerialize($sxe->addChild(self::FIELD_LENGTH, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getLocation())) { foreach($vs as $v) { if (null === $v) { @@ -2079,7 +2131,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getPartOf())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PART_OF, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getParticipant())) { foreach($vs as $v) { if (null === $v) { @@ -2092,11 +2143,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPriority())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PRIORITY, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getReasonCode())) { foreach($vs as $v) { if (null === $v) { @@ -2118,15 +2167,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getServiceProvider())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SERVICE_PROVIDER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getServiceType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SERVICE_TYPE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getStatusHistory())) { foreach($vs as $v) { if (null === $v) { @@ -2139,7 +2185,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getSubject())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBJECT, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getType())) { foreach($vs as $v) { if (null === $v) { @@ -2148,6 +2193,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } @@ -2182,10 +2228,34 @@ public function jsonSerialize() $a[self::FIELD_HOSPITALIZATION] = $v; } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if (null !== ($v = $this->getLength())) { - $a[self::FIELD_LENGTH] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_LENGTH] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_LENGTH_EXT] = $enc; + } + } else { + $a[self::FIELD_LENGTH] = $v; + } } if ([] !== ($vs = $this->getLocation())) { $a[self::FIELD_LOCATION] = $vs; @@ -2215,7 +2285,15 @@ public function jsonSerialize() $a[self::FIELD_SERVICE_TYPE] = $v; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if ([] !== ($vs = $this->getStatusHistory())) { $a[self::FIELD_STATUS_HISTORY] = $vs; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIREndpoint.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIREndpoint.php index a6a52e1ebe..3a5b35822a 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIREndpoint.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIREndpoint.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -90,10 +90,6 @@ class FHIREndpoint extends FHIRDomainResource implements PHPFHIRContainedTypeInt { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ENDPOINT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ADDRESS = 'address'; const FIELD_ADDRESS_EXT = '_address'; const FIELD_CONNECTION_TYPE = 'connectionType'; @@ -246,6 +242,9 @@ class FHIREndpoint extends FHIRDomainResource implements PHPFHIRContainedTypeInt */ protected $status = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIREndpoint Constructor * @param null|array $data @@ -268,8 +267,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ADDRESS] instanceof FHIRUrl) { $this->setAddress($data[self::FIELD_ADDRESS]); - } elseif ($ext && is_scalar($data[self::FIELD_ADDRESS])) { - $this->setAddress(new FHIRUrl([FHIRUrl::FIELD_VALUE => $data[self::FIELD_ADDRESS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ADDRESS])) { + $this->setAddress(new FHIRUrl([FHIRUrl::FIELD_VALUE => $data[self::FIELD_ADDRESS]] + $ext)); + } else if (is_array($data[self::FIELD_ADDRESS])) { + $this->setAddress(new FHIRUrl(array_merge($ext, $data[self::FIELD_ADDRESS]))); + } } else { $this->setAddress(new FHIRUrl($data[self::FIELD_ADDRESS])); } @@ -287,17 +290,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_CONTACT])) { foreach($data[self::FIELD_CONTACT] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContactPoint) { $this->addContact($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addContact(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addContact(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addContact(new FHIRContactPoint(array_merge($v, $ext[$i]))); + } } else { $this->addContact(new FHIRContactPoint($v)); } } } elseif ($data[self::FIELD_CONTACT] instanceof FHIRContactPoint) { $this->addContact($data[self::FIELD_CONTACT]); - } elseif ($ext && is_scalar($data[self::FIELD_CONTACT])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_CONTACT])) { $this->addContact(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $data[self::FIELD_CONTACT]] + $ext)); } else { $this->addContact(new FHIRContactPoint($data[self::FIELD_CONTACT])); @@ -309,17 +319,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_HEADER])) { foreach($data[self::FIELD_HEADER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRString) { $this->addHeader($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addHeader(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addHeader(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addHeader(new FHIRString(array_merge($v, $ext[$i]))); + } } else { $this->addHeader(new FHIRString($v)); } } } elseif ($data[self::FIELD_HEADER] instanceof FHIRString) { $this->addHeader($data[self::FIELD_HEADER]); - } elseif ($ext && is_scalar($data[self::FIELD_HEADER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_HEADER])) { $this->addHeader(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_HEADER]] + $ext)); } else { $this->addHeader(new FHIRString($data[self::FIELD_HEADER])); @@ -331,17 +348,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -360,8 +384,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -372,17 +400,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_PAYLOAD_MIME_TYPE])) { foreach($data[self::FIELD_PAYLOAD_MIME_TYPE] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCode) { $this->addPayloadMimeType($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addPayloadMimeType(new FHIRCode([FHIRCode::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addPayloadMimeType(new FHIRCode([FHIRCode::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addPayloadMimeType(new FHIRCode(array_merge($v, $ext[$i]))); + } } else { $this->addPayloadMimeType(new FHIRCode($v)); } } } elseif ($data[self::FIELD_PAYLOAD_MIME_TYPE] instanceof FHIRCode) { $this->addPayloadMimeType($data[self::FIELD_PAYLOAD_MIME_TYPE]); - } elseif ($ext && is_scalar($data[self::FIELD_PAYLOAD_MIME_TYPE])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_PAYLOAD_MIME_TYPE])) { $this->addPayloadMimeType(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_PAYLOAD_MIME_TYPE]] + $ext)); } else { $this->addPayloadMimeType(new FHIRCode($data[self::FIELD_PAYLOAD_MIME_TYPE])); @@ -391,6 +426,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PAYLOAD_TYPE])) { if (is_array($data[self::FIELD_PAYLOAD_TYPE])) { foreach($data[self::FIELD_PAYLOAD_TYPE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addPayloadType($v); } else { @@ -416,8 +454,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIREndpointStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIREndpointStatus([FHIREndpointStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIREndpointStatus([FHIREndpointStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIREndpointStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIREndpointStatus($data[self::FIELD_STATUS])); } @@ -1114,11 +1156,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getAddress())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ADDRESS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getConnectionType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CONNECTION_TYPE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getContact())) { foreach($vs as $v) { if (null === $v) { @@ -1127,6 +1167,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_CONTACT, null, $v->_getFHIRXMLNamespace())); } } + if ([] !== ($vs = $this->getHeader())) { foreach($vs as $v) { if (null === $v) { @@ -1172,7 +1213,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } @@ -1186,14 +1226,37 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getAddress())) { - $a[self::FIELD_ADDRESS] = $v->getValue(); - $a[self::FIELD_ADDRESS_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ADDRESS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ADDRESS_EXT] = $enc; + } + } else { + $a[self::FIELD_ADDRESS] = $v; + } } if (null !== ($v = $this->getConnectionType())) { $a[self::FIELD_CONNECTION_TYPE] = $v; } if ([] !== ($vs = $this->getContact())) { - $a[self::FIELD_CONTACT] = $vs; + $a[self::FIELD_CONTACT] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CONTACT][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CONTACT_EXT][] = $enc; + } else { + $a[self::FIELD_CONTACT_EXT][] = null; + } + } else { + $a[self::FIELD_CONTACT][] = $v; + } + } } if ([] !== ($vs = $this->getHeader())) { $a[self::FIELD_HEADER] = []; @@ -1201,19 +1264,51 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_HEADER][] = $v->getValue(); - $a[self::FIELD_HEADER_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_HEADER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_HEADER_EXT][] = $enc; + } else { + $a[self::FIELD_HEADER_EXT][] = null; + } + } else { + $a[self::FIELD_HEADER][] = $v; + } } } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if (null !== ($v = $this->getManagingOrganization())) { $a[self::FIELD_MANAGING_ORGANIZATION] = $v; } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if ([] !== ($vs = $this->getPayloadMimeType())) { $a[self::FIELD_PAYLOAD_MIME_TYPE] = []; @@ -1221,8 +1316,17 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_PAYLOAD_MIME_TYPE][] = $v->getValue(); - $a[self::FIELD_PAYLOAD_MIME_TYPE_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PAYLOAD_MIME_TYPE][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PAYLOAD_MIME_TYPE_EXT][] = $enc; + } else { + $a[self::FIELD_PAYLOAD_MIME_TYPE_EXT][] = null; + } + } else { + $a[self::FIELD_PAYLOAD_MIME_TYPE][] = $v; + } } } if ([] !== ($vs = $this->getPayloadType())) { @@ -1232,7 +1336,15 @@ public function jsonSerialize() $a[self::FIELD_PERIOD] = $v; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIREnrollmentRequest.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIREnrollmentRequest.php index 09f6c099a1..bef545782f 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIREnrollmentRequest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIREnrollmentRequest.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -83,10 +83,6 @@ class FHIREnrollmentRequest extends FHIRDomainResource implements PHPFHIRContain { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ENROLLMENT_REQUEST; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CANDIDATE = 'candidate'; const FIELD_COVERAGE = 'coverage'; const FIELD_CREATED = 'created'; @@ -178,6 +174,9 @@ class FHIREnrollmentRequest extends FHIRDomainResource implements PHPFHIRContain */ protected $status = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIREnrollmentRequest Constructor * @param null|array $data @@ -214,8 +213,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CREATED] instanceof FHIRDateTime) { $this->setCreated($data[self::FIELD_CREATED]); - } elseif ($ext && is_scalar($data[self::FIELD_CREATED])) { - $this->setCreated(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_CREATED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CREATED])) { + $this->setCreated(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_CREATED]] + $ext)); + } else if (is_array($data[self::FIELD_CREATED])) { + $this->setCreated(new FHIRDateTime(array_merge($ext, $data[self::FIELD_CREATED]))); + } } else { $this->setCreated(new FHIRDateTime($data[self::FIELD_CREATED])); } @@ -226,17 +229,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -262,8 +272,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRFinancialResourceStatusCodes) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRFinancialResourceStatusCodes([FHIRFinancialResourceStatusCodes::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRFinancialResourceStatusCodes([FHIRFinancialResourceStatusCodes::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRFinancialResourceStatusCodes(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRFinancialResourceStatusCodes($data[self::FIELD_STATUS])); } @@ -654,18 +668,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getCandidate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CANDIDATE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getCoverage())) { $v->xmlSerialize($sxe->addChild(self::FIELD_COVERAGE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getCreated())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CREATED, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -678,11 +689,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getInsurer())) { $v->xmlSerialize($sxe->addChild(self::FIELD_INSURER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getProvider())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PROVIDER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } @@ -702,11 +711,34 @@ public function jsonSerialize() $a[self::FIELD_COVERAGE] = $v; } if (null !== ($v = $this->getCreated())) { - $a[self::FIELD_CREATED] = $v->getValue(); - $a[self::FIELD_CREATED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CREATED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CREATED_EXT] = $enc; + } + } else { + $a[self::FIELD_CREATED] = $v; + } } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if (null !== ($v = $this->getInsurer())) { $a[self::FIELD_INSURER] = $v; @@ -715,7 +747,15 @@ public function jsonSerialize() $a[self::FIELD_PROVIDER] = $v; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIREnrollmentResponse.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIREnrollmentResponse.php index fa925444ef..a887cf8c50 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIREnrollmentResponse.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIREnrollmentResponse.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -85,10 +85,6 @@ class FHIREnrollmentResponse extends FHIRDomainResource implements PHPFHIRContai { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ENROLLMENT_RESPONSE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CREATED = 'created'; const FIELD_CREATED_EXT = '_created'; const FIELD_DISPOSITION = 'disposition'; @@ -192,6 +188,9 @@ class FHIREnrollmentResponse extends FHIRDomainResource implements PHPFHIRContai */ protected $status = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIREnrollmentResponse Constructor * @param null|array $data @@ -214,8 +213,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CREATED] instanceof FHIRDateTime) { $this->setCreated($data[self::FIELD_CREATED]); - } elseif ($ext && is_scalar($data[self::FIELD_CREATED])) { - $this->setCreated(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_CREATED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CREATED])) { + $this->setCreated(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_CREATED]] + $ext)); + } else if (is_array($data[self::FIELD_CREATED])) { + $this->setCreated(new FHIRDateTime(array_merge($ext, $data[self::FIELD_CREATED]))); + } } else { $this->setCreated(new FHIRDateTime($data[self::FIELD_CREATED])); } @@ -226,8 +229,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DISPOSITION] instanceof FHIRString) { $this->setDisposition($data[self::FIELD_DISPOSITION]); - } elseif ($ext && is_scalar($data[self::FIELD_DISPOSITION])) { - $this->setDisposition(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DISPOSITION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DISPOSITION])) { + $this->setDisposition(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DISPOSITION]] + $ext)); + } else if (is_array($data[self::FIELD_DISPOSITION])) { + $this->setDisposition(new FHIRString(array_merge($ext, $data[self::FIELD_DISPOSITION]))); + } } else { $this->setDisposition(new FHIRString($data[self::FIELD_DISPOSITION])); } @@ -238,17 +245,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -267,8 +281,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_OUTCOME] instanceof FHIRRemittanceOutcome) { $this->setOutcome($data[self::FIELD_OUTCOME]); - } elseif ($ext && is_scalar($data[self::FIELD_OUTCOME])) { - $this->setOutcome(new FHIRRemittanceOutcome([FHIRRemittanceOutcome::FIELD_VALUE => $data[self::FIELD_OUTCOME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_OUTCOME])) { + $this->setOutcome(new FHIRRemittanceOutcome([FHIRRemittanceOutcome::FIELD_VALUE => $data[self::FIELD_OUTCOME]] + $ext)); + } else if (is_array($data[self::FIELD_OUTCOME])) { + $this->setOutcome(new FHIRRemittanceOutcome(array_merge($ext, $data[self::FIELD_OUTCOME]))); + } } else { $this->setOutcome(new FHIRRemittanceOutcome($data[self::FIELD_OUTCOME])); } @@ -293,8 +311,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRFinancialResourceStatusCodes) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRFinancialResourceStatusCodes([FHIRFinancialResourceStatusCodes::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRFinancialResourceStatusCodes([FHIRFinancialResourceStatusCodes::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRFinancialResourceStatusCodes(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRFinancialResourceStatusCodes($data[self::FIELD_STATUS])); } @@ -731,7 +753,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDisposition())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DISPOSITION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -744,19 +765,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getOrganization())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ORGANIZATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOutcome())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OUTCOME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRequest())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REQUEST, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRequestProvider())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REQUEST_PROVIDER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } @@ -770,21 +787,59 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getCreated())) { - $a[self::FIELD_CREATED] = $v->getValue(); - $a[self::FIELD_CREATED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CREATED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CREATED_EXT] = $enc; + } + } else { + $a[self::FIELD_CREATED] = $v; + } } if (null !== ($v = $this->getDisposition())) { - $a[self::FIELD_DISPOSITION] = $v->getValue(); - $a[self::FIELD_DISPOSITION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DISPOSITION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DISPOSITION_EXT] = $enc; + } + } else { + $a[self::FIELD_DISPOSITION] = $v; + } } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if (null !== ($v = $this->getOrganization())) { $a[self::FIELD_ORGANIZATION] = $v; } if (null !== ($v = $this->getOutcome())) { - $a[self::FIELD_OUTCOME] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_OUTCOME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_OUTCOME_EXT] = $enc; + } + } else { + $a[self::FIELD_OUTCOME] = $v; + } } if (null !== ($v = $this->getRequest())) { $a[self::FIELD_REQUEST] = $v; @@ -793,7 +848,15 @@ public function jsonSerialize() $a[self::FIELD_REQUEST_PROVIDER] = $v; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIREpisodeOfCare.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIREpisodeOfCare.php index 52c5fd9b68..8ead9aa756 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIREpisodeOfCare.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIREpisodeOfCare.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -87,10 +87,6 @@ class FHIREpisodeOfCare extends FHIRDomainResource implements PHPFHIRContainedTy { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_EPISODE_OF_CARE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ACCOUNT = 'account'; const FIELD_CARE_MANAGER = 'careManager'; const FIELD_DIAGNOSIS = 'diagnosis'; @@ -247,6 +243,9 @@ class FHIREpisodeOfCare extends FHIRDomainResource implements PHPFHIRContainedTy */ protected $type = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIREpisodeOfCare Constructor * @param null|array $data @@ -266,6 +265,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ACCOUNT])) { if (is_array($data[self::FIELD_ACCOUNT])) { foreach($data[self::FIELD_ACCOUNT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addAccount($v); } else { @@ -288,6 +290,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_DIAGNOSIS])) { if (is_array($data[self::FIELD_DIAGNOSIS])) { foreach($data[self::FIELD_DIAGNOSIS] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIREpisodeOfCareDiagnosis) { $this->addDiagnosis($v); } else { @@ -306,17 +311,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -346,6 +358,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REFERRAL_REQUEST])) { if (is_array($data[self::FIELD_REFERRAL_REQUEST])) { foreach($data[self::FIELD_REFERRAL_REQUEST] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addReferralRequest($v); } else { @@ -364,8 +379,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIREpisodeOfCareStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIREpisodeOfCareStatus([FHIREpisodeOfCareStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIREpisodeOfCareStatus([FHIREpisodeOfCareStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIREpisodeOfCareStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIREpisodeOfCareStatus($data[self::FIELD_STATUS])); } @@ -373,6 +392,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_STATUS_HISTORY])) { if (is_array($data[self::FIELD_STATUS_HISTORY])) { foreach($data[self::FIELD_STATUS_HISTORY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIREpisodeOfCareStatusHistory) { $this->addStatusHistory($v); } else { @@ -388,6 +410,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_TEAM])) { if (is_array($data[self::FIELD_TEAM])) { foreach($data[self::FIELD_TEAM] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addTeam($v); } else { @@ -403,6 +428,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_TYPE])) { if (is_array($data[self::FIELD_TYPE])) { foreach($data[self::FIELD_TYPE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addType($v); } else { @@ -1142,7 +1170,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getAccount())) { foreach($vs as $v) { if (null === $v) { @@ -1155,7 +1182,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getCareManager())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CARE_MANAGER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getDiagnosis())) { foreach($vs as $v) { if (null === $v) { @@ -1177,15 +1203,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getManagingOrganization())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MANAGING_ORGANIZATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPatient())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATIENT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getReferralRequest())) { foreach($vs as $v) { if (null === $v) { @@ -1198,7 +1221,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getStatusHistory())) { foreach($vs as $v) { if (null === $v) { @@ -1225,6 +1247,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } @@ -1244,7 +1267,23 @@ public function jsonSerialize() $a[self::FIELD_DIAGNOSIS] = $vs; } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if (null !== ($v = $this->getManagingOrganization())) { $a[self::FIELD_MANAGING_ORGANIZATION] = $v; @@ -1259,7 +1298,15 @@ public function jsonSerialize() $a[self::FIELD_REFERRAL_REQUEST] = $vs; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if ([] !== ($vs = $this->getStatusHistory())) { $a[self::FIELD_STATUS_HISTORY] = $vs; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIREventDefinition.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIREventDefinition.php index 02d8298836..4454b46a22 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIREventDefinition.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIREventDefinition.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -94,10 +94,6 @@ class FHIREventDefinition extends FHIRDomainResource implements PHPFHIRContained { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_EVENT_DEFINITION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_APPROVAL_DATE = 'approvalDate'; const FIELD_APPROVAL_DATE_EXT = '_approvalDate'; const FIELD_AUTHOR = 'author'; @@ -531,6 +527,9 @@ class FHIREventDefinition extends FHIRDomainResource implements PHPFHIRContained */ protected $version = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIREventDefinition Constructor * @param null|array $data @@ -553,8 +552,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_APPROVAL_DATE] instanceof FHIRDate) { $this->setApprovalDate($data[self::FIELD_APPROVAL_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_APPROVAL_DATE])) { - $this->setApprovalDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_APPROVAL_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_APPROVAL_DATE])) { + $this->setApprovalDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_APPROVAL_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_APPROVAL_DATE])) { + $this->setApprovalDate(new FHIRDate(array_merge($ext, $data[self::FIELD_APPROVAL_DATE]))); + } } else { $this->setApprovalDate(new FHIRDate($data[self::FIELD_APPROVAL_DATE])); } @@ -562,6 +565,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_AUTHOR])) { if (is_array($data[self::FIELD_AUTHOR])) { foreach($data[self::FIELD_AUTHOR] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContactDetail) { $this->addAuthor($v); } else { @@ -577,6 +583,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CONTACT])) { if (is_array($data[self::FIELD_CONTACT])) { foreach($data[self::FIELD_CONTACT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContactDetail) { $this->addContact($v); } else { @@ -595,8 +604,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_COPYRIGHT] instanceof FHIRMarkdown) { $this->setCopyright($data[self::FIELD_COPYRIGHT]); - } elseif ($ext && is_scalar($data[self::FIELD_COPYRIGHT])) { - $this->setCopyright(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_COPYRIGHT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_COPYRIGHT])) { + $this->setCopyright(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_COPYRIGHT]] + $ext)); + } else if (is_array($data[self::FIELD_COPYRIGHT])) { + $this->setCopyright(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_COPYRIGHT]))); + } } else { $this->setCopyright(new FHIRMarkdown($data[self::FIELD_COPYRIGHT])); } @@ -607,8 +620,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATE] instanceof FHIRDateTime) { $this->setDate($data[self::FIELD_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_DATE])) { - $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime(array_merge($ext, $data[self::FIELD_DATE]))); + } } else { $this->setDate(new FHIRDateTime($data[self::FIELD_DATE])); } @@ -619,8 +636,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRMarkdown) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRMarkdown($data[self::FIELD_DESCRIPTION])); } @@ -628,6 +649,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_EDITOR])) { if (is_array($data[self::FIELD_EDITOR])) { foreach($data[self::FIELD_EDITOR] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContactDetail) { $this->addEditor($v); } else { @@ -650,6 +674,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ENDORSER])) { if (is_array($data[self::FIELD_ENDORSER])) { foreach($data[self::FIELD_ENDORSER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContactDetail) { $this->addEndorser($v); } else { @@ -668,8 +695,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EXPERIMENTAL] instanceof FHIRBoolean) { $this->setExperimental($data[self::FIELD_EXPERIMENTAL]); - } elseif ($ext && is_scalar($data[self::FIELD_EXPERIMENTAL])) { - $this->setExperimental(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_EXPERIMENTAL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EXPERIMENTAL])) { + $this->setExperimental(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_EXPERIMENTAL]] + $ext)); + } else if (is_array($data[self::FIELD_EXPERIMENTAL])) { + $this->setExperimental(new FHIRBoolean(array_merge($ext, $data[self::FIELD_EXPERIMENTAL]))); + } } else { $this->setExperimental(new FHIRBoolean($data[self::FIELD_EXPERIMENTAL])); } @@ -680,17 +711,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -699,6 +737,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_JURISDICTION])) { if (is_array($data[self::FIELD_JURISDICTION])) { foreach($data[self::FIELD_JURISDICTION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addJurisdiction($v); } else { @@ -717,8 +758,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_LAST_REVIEW_DATE] instanceof FHIRDate) { $this->setLastReviewDate($data[self::FIELD_LAST_REVIEW_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_LAST_REVIEW_DATE])) { - $this->setLastReviewDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_LAST_REVIEW_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_LAST_REVIEW_DATE])) { + $this->setLastReviewDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_LAST_REVIEW_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_LAST_REVIEW_DATE])) { + $this->setLastReviewDate(new FHIRDate(array_merge($ext, $data[self::FIELD_LAST_REVIEW_DATE]))); + } } else { $this->setLastReviewDate(new FHIRDate($data[self::FIELD_LAST_REVIEW_DATE])); } @@ -729,8 +774,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -741,8 +790,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PUBLISHER] instanceof FHIRString) { $this->setPublisher($data[self::FIELD_PUBLISHER]); - } elseif ($ext && is_scalar($data[self::FIELD_PUBLISHER])) { - $this->setPublisher(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PUBLISHER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PUBLISHER])) { + $this->setPublisher(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PUBLISHER]] + $ext)); + } else if (is_array($data[self::FIELD_PUBLISHER])) { + $this->setPublisher(new FHIRString(array_merge($ext, $data[self::FIELD_PUBLISHER]))); + } } else { $this->setPublisher(new FHIRString($data[self::FIELD_PUBLISHER])); } @@ -753,8 +806,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PURPOSE] instanceof FHIRMarkdown) { $this->setPurpose($data[self::FIELD_PURPOSE]); - } elseif ($ext && is_scalar($data[self::FIELD_PURPOSE])) { - $this->setPurpose(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_PURPOSE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PURPOSE])) { + $this->setPurpose(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_PURPOSE]] + $ext)); + } else if (is_array($data[self::FIELD_PURPOSE])) { + $this->setPurpose(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_PURPOSE]))); + } } else { $this->setPurpose(new FHIRMarkdown($data[self::FIELD_PURPOSE])); } @@ -762,6 +819,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_RELATED_ARTIFACT])) { if (is_array($data[self::FIELD_RELATED_ARTIFACT])) { foreach($data[self::FIELD_RELATED_ARTIFACT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRRelatedArtifact) { $this->addRelatedArtifact($v); } else { @@ -777,6 +837,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REVIEWER])) { if (is_array($data[self::FIELD_REVIEWER])) { foreach($data[self::FIELD_REVIEWER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContactDetail) { $this->addReviewer($v); } else { @@ -795,8 +858,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRPublicationStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRPublicationStatus([FHIRPublicationStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRPublicationStatus([FHIRPublicationStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRPublicationStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRPublicationStatus($data[self::FIELD_STATUS])); } @@ -821,8 +888,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SUBTITLE] instanceof FHIRString) { $this->setSubtitle($data[self::FIELD_SUBTITLE]); - } elseif ($ext && is_scalar($data[self::FIELD_SUBTITLE])) { - $this->setSubtitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SUBTITLE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SUBTITLE])) { + $this->setSubtitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SUBTITLE]] + $ext)); + } else if (is_array($data[self::FIELD_SUBTITLE])) { + $this->setSubtitle(new FHIRString(array_merge($ext, $data[self::FIELD_SUBTITLE]))); + } } else { $this->setSubtitle(new FHIRString($data[self::FIELD_SUBTITLE])); } @@ -833,8 +904,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TITLE] instanceof FHIRString) { $this->setTitle($data[self::FIELD_TITLE]); - } elseif ($ext && is_scalar($data[self::FIELD_TITLE])) { - $this->setTitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TITLE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TITLE])) { + $this->setTitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TITLE]] + $ext)); + } else if (is_array($data[self::FIELD_TITLE])) { + $this->setTitle(new FHIRString(array_merge($ext, $data[self::FIELD_TITLE]))); + } } else { $this->setTitle(new FHIRString($data[self::FIELD_TITLE])); } @@ -842,6 +917,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_TOPIC])) { if (is_array($data[self::FIELD_TOPIC])) { foreach($data[self::FIELD_TOPIC] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addTopic($v); } else { @@ -857,6 +935,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_TRIGGER])) { if (is_array($data[self::FIELD_TRIGGER])) { foreach($data[self::FIELD_TRIGGER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRTriggerDefinition) { $this->addTrigger($v); } else { @@ -875,8 +956,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_URL] instanceof FHIRUri) { $this->setUrl($data[self::FIELD_URL]); - } elseif ($ext && is_scalar($data[self::FIELD_URL])) { - $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } else if (is_array($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri(array_merge($ext, $data[self::FIELD_URL]))); + } } else { $this->setUrl(new FHIRUri($data[self::FIELD_URL])); } @@ -887,8 +972,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_USAGE] instanceof FHIRString) { $this->setUsage($data[self::FIELD_USAGE]); - } elseif ($ext && is_scalar($data[self::FIELD_USAGE])) { - $this->setUsage(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_USAGE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_USAGE])) { + $this->setUsage(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_USAGE]] + $ext)); + } else if (is_array($data[self::FIELD_USAGE])) { + $this->setUsage(new FHIRString(array_merge($ext, $data[self::FIELD_USAGE]))); + } } else { $this->setUsage(new FHIRString($data[self::FIELD_USAGE])); } @@ -896,6 +985,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_USE_CONTEXT])) { if (is_array($data[self::FIELD_USE_CONTEXT])) { foreach($data[self::FIELD_USE_CONTEXT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRUsageContext) { $this->addUseContext($v); } else { @@ -914,8 +1006,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VERSION] instanceof FHIRString) { $this->setVersion($data[self::FIELD_VERSION]); - } elseif ($ext && is_scalar($data[self::FIELD_VERSION])) { - $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } else if (is_array($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString(array_merge($ext, $data[self::FIELD_VERSION]))); + } } else { $this->setVersion(new FHIRString($data[self::FIELD_VERSION])); } @@ -2611,7 +2707,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getApprovalDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_APPROVAL_DATE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getAuthor())) { foreach($vs as $v) { if (null === $v) { @@ -2629,6 +2724,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_CONTACT, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getCopyright())) { $v->xmlSerialize($sxe->addChild(self::FIELD_COPYRIGHT, null, $v->_getFHIRXMLNamespace())); } @@ -2638,7 +2734,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESCRIPTION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getEditor())) { foreach($vs as $v) { if (null === $v) { @@ -2651,7 +2746,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getEffectivePeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EFFECTIVE_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getEndorser())) { foreach($vs as $v) { if (null === $v) { @@ -2660,10 +2754,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_ENDORSER, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getExperimental())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EXPERIMENTAL, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -2681,6 +2775,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_JURISDICTION, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getLastReviewDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_LAST_REVIEW_DATE, null, $v->_getFHIRXMLNamespace())); } @@ -2693,7 +2788,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getPurpose())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PURPOSE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getRelatedArtifact())) { foreach($vs as $v) { if (null === $v) { @@ -2715,11 +2809,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSubjectCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBJECT_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSubjectReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBJECT_REFERENCE, null, $v->_getFHIRXMLNamespace())); } @@ -2729,7 +2821,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getTitle())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TITLE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getTopic())) { foreach($vs as $v) { if (null === $v) { @@ -2747,13 +2838,13 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_TRIGGER, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getUrl())) { $v->xmlSerialize($sxe->addChild(self::FIELD_URL, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getUsage())) { $v->xmlSerialize($sxe->addChild(self::FIELD_USAGE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getUseContext())) { foreach($vs as $v) { if (null === $v) { @@ -2762,6 +2853,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_USE_CONTEXT, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getVersion())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VERSION, null, $v->_getFHIRXMLNamespace())); } @@ -2775,8 +2867,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getApprovalDate())) { - $a[self::FIELD_APPROVAL_DATE] = $v->getValue(); - $a[self::FIELD_APPROVAL_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_APPROVAL_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_APPROVAL_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_APPROVAL_DATE] = $v; + } } if ([] !== ($vs = $this->getAuthor())) { $a[self::FIELD_AUTHOR] = $vs; @@ -2785,16 +2884,37 @@ public function jsonSerialize() $a[self::FIELD_CONTACT] = $vs; } if (null !== ($v = $this->getCopyright())) { - $a[self::FIELD_COPYRIGHT] = $v->getValue(); - $a[self::FIELD_COPYRIGHT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_COPYRIGHT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_COPYRIGHT_EXT] = $enc; + } + } else { + $a[self::FIELD_COPYRIGHT] = $v; + } } if (null !== ($v = $this->getDate())) { - $a[self::FIELD_DATE] = $v->getValue(); - $a[self::FIELD_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_DATE] = $v; + } } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if ([] !== ($vs = $this->getEditor())) { $a[self::FIELD_EDITOR] = $vs; @@ -2806,30 +2926,81 @@ public function jsonSerialize() $a[self::FIELD_ENDORSER] = $vs; } if (null !== ($v = $this->getExperimental())) { - $a[self::FIELD_EXPERIMENTAL] = $v->getValue(); - $a[self::FIELD_EXPERIMENTAL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EXPERIMENTAL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EXPERIMENTAL_EXT] = $enc; + } + } else { + $a[self::FIELD_EXPERIMENTAL] = $v; + } } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if ([] !== ($vs = $this->getJurisdiction())) { $a[self::FIELD_JURISDICTION] = $vs; } if (null !== ($v = $this->getLastReviewDate())) { - $a[self::FIELD_LAST_REVIEW_DATE] = $v->getValue(); - $a[self::FIELD_LAST_REVIEW_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_LAST_REVIEW_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_LAST_REVIEW_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_LAST_REVIEW_DATE] = $v; + } } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if (null !== ($v = $this->getPublisher())) { - $a[self::FIELD_PUBLISHER] = $v->getValue(); - $a[self::FIELD_PUBLISHER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PUBLISHER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PUBLISHER_EXT] = $enc; + } + } else { + $a[self::FIELD_PUBLISHER] = $v; + } } if (null !== ($v = $this->getPurpose())) { - $a[self::FIELD_PURPOSE] = $v->getValue(); - $a[self::FIELD_PURPOSE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PURPOSE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PURPOSE_EXT] = $enc; + } + } else { + $a[self::FIELD_PURPOSE] = $v; + } } if ([] !== ($vs = $this->getRelatedArtifact())) { $a[self::FIELD_RELATED_ARTIFACT] = $vs; @@ -2838,7 +3009,15 @@ public function jsonSerialize() $a[self::FIELD_REVIEWER] = $vs; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getSubjectCodeableConcept())) { $a[self::FIELD_SUBJECT_CODEABLE_CONCEPT] = $v; @@ -2847,12 +3026,26 @@ public function jsonSerialize() $a[self::FIELD_SUBJECT_REFERENCE] = $v; } if (null !== ($v = $this->getSubtitle())) { - $a[self::FIELD_SUBTITLE] = $v->getValue(); - $a[self::FIELD_SUBTITLE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SUBTITLE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SUBTITLE_EXT] = $enc; + } + } else { + $a[self::FIELD_SUBTITLE] = $v; + } } if (null !== ($v = $this->getTitle())) { - $a[self::FIELD_TITLE] = $v->getValue(); - $a[self::FIELD_TITLE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TITLE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TITLE_EXT] = $enc; + } + } else { + $a[self::FIELD_TITLE] = $v; + } } if ([] !== ($vs = $this->getTopic())) { $a[self::FIELD_TOPIC] = $vs; @@ -2861,19 +3054,40 @@ public function jsonSerialize() $a[self::FIELD_TRIGGER] = $vs; } if (null !== ($v = $this->getUrl())) { - $a[self::FIELD_URL] = $v->getValue(); - $a[self::FIELD_URL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_URL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_URL_EXT] = $enc; + } + } else { + $a[self::FIELD_URL] = $v; + } } if (null !== ($v = $this->getUsage())) { - $a[self::FIELD_USAGE] = $v->getValue(); - $a[self::FIELD_USAGE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_USAGE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_USAGE_EXT] = $enc; + } + } else { + $a[self::FIELD_USAGE] = $v; + } } if ([] !== ($vs = $this->getUseContext())) { $a[self::FIELD_USE_CONTEXT] = $vs; } if (null !== ($v = $this->getVersion())) { - $a[self::FIELD_VERSION] = $v->getValue(); - $a[self::FIELD_VERSION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VERSION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VERSION_EXT] = $enc; + } + } else { + $a[self::FIELD_VERSION] = $v; + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIREvidence.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIREvidence.php index 1a8b435884..606e68ed09 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIREvidence.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIREvidence.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -94,10 +94,6 @@ class FHIREvidence extends FHIRDomainResource implements PHPFHIRContainedTypeInt { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_EVIDENCE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_APPROVAL_DATE = 'approvalDate'; const FIELD_APPROVAL_DATE_EXT = '_approvalDate'; const FIELD_AUTHOR = 'author'; @@ -512,6 +508,9 @@ class FHIREvidence extends FHIRDomainResource implements PHPFHIRContainedTypeInt */ protected $version = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIREvidence Constructor * @param null|array $data @@ -534,8 +533,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_APPROVAL_DATE] instanceof FHIRDate) { $this->setApprovalDate($data[self::FIELD_APPROVAL_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_APPROVAL_DATE])) { - $this->setApprovalDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_APPROVAL_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_APPROVAL_DATE])) { + $this->setApprovalDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_APPROVAL_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_APPROVAL_DATE])) { + $this->setApprovalDate(new FHIRDate(array_merge($ext, $data[self::FIELD_APPROVAL_DATE]))); + } } else { $this->setApprovalDate(new FHIRDate($data[self::FIELD_APPROVAL_DATE])); } @@ -543,6 +546,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_AUTHOR])) { if (is_array($data[self::FIELD_AUTHOR])) { foreach($data[self::FIELD_AUTHOR] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContactDetail) { $this->addAuthor($v); } else { @@ -558,6 +564,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CONTACT])) { if (is_array($data[self::FIELD_CONTACT])) { foreach($data[self::FIELD_CONTACT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContactDetail) { $this->addContact($v); } else { @@ -576,8 +585,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_COPYRIGHT] instanceof FHIRMarkdown) { $this->setCopyright($data[self::FIELD_COPYRIGHT]); - } elseif ($ext && is_scalar($data[self::FIELD_COPYRIGHT])) { - $this->setCopyright(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_COPYRIGHT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_COPYRIGHT])) { + $this->setCopyright(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_COPYRIGHT]] + $ext)); + } else if (is_array($data[self::FIELD_COPYRIGHT])) { + $this->setCopyright(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_COPYRIGHT]))); + } } else { $this->setCopyright(new FHIRMarkdown($data[self::FIELD_COPYRIGHT])); } @@ -588,8 +601,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATE] instanceof FHIRDateTime) { $this->setDate($data[self::FIELD_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_DATE])) { - $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime(array_merge($ext, $data[self::FIELD_DATE]))); + } } else { $this->setDate(new FHIRDateTime($data[self::FIELD_DATE])); } @@ -600,8 +617,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRMarkdown) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRMarkdown($data[self::FIELD_DESCRIPTION])); } @@ -609,6 +630,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_EDITOR])) { if (is_array($data[self::FIELD_EDITOR])) { foreach($data[self::FIELD_EDITOR] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContactDetail) { $this->addEditor($v); } else { @@ -631,6 +655,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ENDORSER])) { if (is_array($data[self::FIELD_ENDORSER])) { foreach($data[self::FIELD_ENDORSER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContactDetail) { $this->addEndorser($v); } else { @@ -653,6 +680,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_EXPOSURE_VARIANT])) { if (is_array($data[self::FIELD_EXPOSURE_VARIANT])) { foreach($data[self::FIELD_EXPOSURE_VARIANT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addExposureVariant($v); } else { @@ -671,17 +701,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -690,6 +727,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_JURISDICTION])) { if (is_array($data[self::FIELD_JURISDICTION])) { foreach($data[self::FIELD_JURISDICTION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addJurisdiction($v); } else { @@ -708,8 +748,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_LAST_REVIEW_DATE] instanceof FHIRDate) { $this->setLastReviewDate($data[self::FIELD_LAST_REVIEW_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_LAST_REVIEW_DATE])) { - $this->setLastReviewDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_LAST_REVIEW_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_LAST_REVIEW_DATE])) { + $this->setLastReviewDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_LAST_REVIEW_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_LAST_REVIEW_DATE])) { + $this->setLastReviewDate(new FHIRDate(array_merge($ext, $data[self::FIELD_LAST_REVIEW_DATE]))); + } } else { $this->setLastReviewDate(new FHIRDate($data[self::FIELD_LAST_REVIEW_DATE])); } @@ -720,8 +764,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -729,6 +777,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_NOTE])) { if (is_array($data[self::FIELD_NOTE])) { foreach($data[self::FIELD_NOTE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRAnnotation) { $this->addNote($v); } else { @@ -744,6 +795,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_OUTCOME])) { if (is_array($data[self::FIELD_OUTCOME])) { foreach($data[self::FIELD_OUTCOME] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addOutcome($v); } else { @@ -762,8 +816,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PUBLISHER] instanceof FHIRString) { $this->setPublisher($data[self::FIELD_PUBLISHER]); - } elseif ($ext && is_scalar($data[self::FIELD_PUBLISHER])) { - $this->setPublisher(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PUBLISHER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PUBLISHER])) { + $this->setPublisher(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PUBLISHER]] + $ext)); + } else if (is_array($data[self::FIELD_PUBLISHER])) { + $this->setPublisher(new FHIRString(array_merge($ext, $data[self::FIELD_PUBLISHER]))); + } } else { $this->setPublisher(new FHIRString($data[self::FIELD_PUBLISHER])); } @@ -771,6 +829,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_RELATED_ARTIFACT])) { if (is_array($data[self::FIELD_RELATED_ARTIFACT])) { foreach($data[self::FIELD_RELATED_ARTIFACT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRRelatedArtifact) { $this->addRelatedArtifact($v); } else { @@ -786,6 +847,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REVIEWER])) { if (is_array($data[self::FIELD_REVIEWER])) { foreach($data[self::FIELD_REVIEWER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContactDetail) { $this->addReviewer($v); } else { @@ -804,8 +868,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SHORT_TITLE] instanceof FHIRString) { $this->setShortTitle($data[self::FIELD_SHORT_TITLE]); - } elseif ($ext && is_scalar($data[self::FIELD_SHORT_TITLE])) { - $this->setShortTitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SHORT_TITLE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SHORT_TITLE])) { + $this->setShortTitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SHORT_TITLE]] + $ext)); + } else if (is_array($data[self::FIELD_SHORT_TITLE])) { + $this->setShortTitle(new FHIRString(array_merge($ext, $data[self::FIELD_SHORT_TITLE]))); + } } else { $this->setShortTitle(new FHIRString($data[self::FIELD_SHORT_TITLE])); } @@ -816,8 +884,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRPublicationStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRPublicationStatus([FHIRPublicationStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRPublicationStatus([FHIRPublicationStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRPublicationStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRPublicationStatus($data[self::FIELD_STATUS])); } @@ -828,8 +900,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SUBTITLE] instanceof FHIRString) { $this->setSubtitle($data[self::FIELD_SUBTITLE]); - } elseif ($ext && is_scalar($data[self::FIELD_SUBTITLE])) { - $this->setSubtitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SUBTITLE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SUBTITLE])) { + $this->setSubtitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SUBTITLE]] + $ext)); + } else if (is_array($data[self::FIELD_SUBTITLE])) { + $this->setSubtitle(new FHIRString(array_merge($ext, $data[self::FIELD_SUBTITLE]))); + } } else { $this->setSubtitle(new FHIRString($data[self::FIELD_SUBTITLE])); } @@ -840,8 +916,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TITLE] instanceof FHIRString) { $this->setTitle($data[self::FIELD_TITLE]); - } elseif ($ext && is_scalar($data[self::FIELD_TITLE])) { - $this->setTitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TITLE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TITLE])) { + $this->setTitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TITLE]] + $ext)); + } else if (is_array($data[self::FIELD_TITLE])) { + $this->setTitle(new FHIRString(array_merge($ext, $data[self::FIELD_TITLE]))); + } } else { $this->setTitle(new FHIRString($data[self::FIELD_TITLE])); } @@ -849,6 +929,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_TOPIC])) { if (is_array($data[self::FIELD_TOPIC])) { foreach($data[self::FIELD_TOPIC] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addTopic($v); } else { @@ -867,8 +950,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_URL] instanceof FHIRUri) { $this->setUrl($data[self::FIELD_URL]); - } elseif ($ext && is_scalar($data[self::FIELD_URL])) { - $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } else if (is_array($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri(array_merge($ext, $data[self::FIELD_URL]))); + } } else { $this->setUrl(new FHIRUri($data[self::FIELD_URL])); } @@ -876,6 +963,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_USE_CONTEXT])) { if (is_array($data[self::FIELD_USE_CONTEXT])) { foreach($data[self::FIELD_USE_CONTEXT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRUsageContext) { $this->addUseContext($v); } else { @@ -894,8 +984,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VERSION] instanceof FHIRString) { $this->setVersion($data[self::FIELD_VERSION]); - } elseif ($ext && is_scalar($data[self::FIELD_VERSION])) { - $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } else if (is_array($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString(array_merge($ext, $data[self::FIELD_VERSION]))); + } } else { $this->setVersion(new FHIRString($data[self::FIELD_VERSION])); } @@ -2582,7 +2676,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getApprovalDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_APPROVAL_DATE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getAuthor())) { foreach($vs as $v) { if (null === $v) { @@ -2600,6 +2693,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_CONTACT, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getCopyright())) { $v->xmlSerialize($sxe->addChild(self::FIELD_COPYRIGHT, null, $v->_getFHIRXMLNamespace())); } @@ -2609,7 +2703,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESCRIPTION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getEditor())) { foreach($vs as $v) { if (null === $v) { @@ -2622,7 +2715,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getEffectivePeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EFFECTIVE_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getEndorser())) { foreach($vs as $v) { if (null === $v) { @@ -2635,7 +2727,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getExposureBackground())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EXPOSURE_BACKGROUND, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getExposureVariant())) { foreach($vs as $v) { if (null === $v) { @@ -2662,13 +2753,13 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_JURISDICTION, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getLastReviewDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_LAST_REVIEW_DATE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NAME, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getNote())) { foreach($vs as $v) { if (null === $v) { @@ -2686,10 +2777,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_OUTCOME, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getPublisher())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PUBLISHER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getRelatedArtifact())) { foreach($vs as $v) { if (null === $v) { @@ -2707,10 +2798,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_REVIEWER, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getShortTitle())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SHORT_TITLE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } @@ -2720,7 +2811,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getTitle())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TITLE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getTopic())) { foreach($vs as $v) { if (null === $v) { @@ -2729,10 +2819,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_TOPIC, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getUrl())) { $v->xmlSerialize($sxe->addChild(self::FIELD_URL, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getUseContext())) { foreach($vs as $v) { if (null === $v) { @@ -2741,6 +2831,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_USE_CONTEXT, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getVersion())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VERSION, null, $v->_getFHIRXMLNamespace())); } @@ -2754,8 +2845,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getApprovalDate())) { - $a[self::FIELD_APPROVAL_DATE] = $v->getValue(); - $a[self::FIELD_APPROVAL_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_APPROVAL_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_APPROVAL_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_APPROVAL_DATE] = $v; + } } if ([] !== ($vs = $this->getAuthor())) { $a[self::FIELD_AUTHOR] = $vs; @@ -2764,16 +2862,37 @@ public function jsonSerialize() $a[self::FIELD_CONTACT] = $vs; } if (null !== ($v = $this->getCopyright())) { - $a[self::FIELD_COPYRIGHT] = $v->getValue(); - $a[self::FIELD_COPYRIGHT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_COPYRIGHT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_COPYRIGHT_EXT] = $enc; + } + } else { + $a[self::FIELD_COPYRIGHT] = $v; + } } if (null !== ($v = $this->getDate())) { - $a[self::FIELD_DATE] = $v->getValue(); - $a[self::FIELD_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_DATE] = $v; + } } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if ([] !== ($vs = $this->getEditor())) { $a[self::FIELD_EDITOR] = $vs; @@ -2791,18 +2910,48 @@ public function jsonSerialize() $a[self::FIELD_EXPOSURE_VARIANT] = $vs; } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if ([] !== ($vs = $this->getJurisdiction())) { $a[self::FIELD_JURISDICTION] = $vs; } if (null !== ($v = $this->getLastReviewDate())) { - $a[self::FIELD_LAST_REVIEW_DATE] = $v->getValue(); - $a[self::FIELD_LAST_REVIEW_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_LAST_REVIEW_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_LAST_REVIEW_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_LAST_REVIEW_DATE] = $v; + } } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if ([] !== ($vs = $this->getNote())) { $a[self::FIELD_NOTE] = $vs; @@ -2811,8 +2960,15 @@ public function jsonSerialize() $a[self::FIELD_OUTCOME] = $vs; } if (null !== ($v = $this->getPublisher())) { - $a[self::FIELD_PUBLISHER] = $v->getValue(); - $a[self::FIELD_PUBLISHER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PUBLISHER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PUBLISHER_EXT] = $enc; + } + } else { + $a[self::FIELD_PUBLISHER] = $v; + } } if ([] !== ($vs = $this->getRelatedArtifact())) { $a[self::FIELD_RELATED_ARTIFACT] = $vs; @@ -2821,33 +2977,76 @@ public function jsonSerialize() $a[self::FIELD_REVIEWER] = $vs; } if (null !== ($v = $this->getShortTitle())) { - $a[self::FIELD_SHORT_TITLE] = $v->getValue(); - $a[self::FIELD_SHORT_TITLE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SHORT_TITLE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SHORT_TITLE_EXT] = $enc; + } + } else { + $a[self::FIELD_SHORT_TITLE] = $v; + } } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getSubtitle())) { - $a[self::FIELD_SUBTITLE] = $v->getValue(); - $a[self::FIELD_SUBTITLE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SUBTITLE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SUBTITLE_EXT] = $enc; + } + } else { + $a[self::FIELD_SUBTITLE] = $v; + } } if (null !== ($v = $this->getTitle())) { - $a[self::FIELD_TITLE] = $v->getValue(); - $a[self::FIELD_TITLE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TITLE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TITLE_EXT] = $enc; + } + } else { + $a[self::FIELD_TITLE] = $v; + } } if ([] !== ($vs = $this->getTopic())) { $a[self::FIELD_TOPIC] = $vs; } if (null !== ($v = $this->getUrl())) { - $a[self::FIELD_URL] = $v->getValue(); - $a[self::FIELD_URL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_URL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_URL_EXT] = $enc; + } + } else { + $a[self::FIELD_URL] = $v; + } } if ([] !== ($vs = $this->getUseContext())) { $a[self::FIELD_USE_CONTEXT] = $vs; } if (null !== ($v = $this->getVersion())) { - $a[self::FIELD_VERSION] = $v->getValue(); - $a[self::FIELD_VERSION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VERSION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VERSION_EXT] = $enc; + } + } else { + $a[self::FIELD_VERSION] = $v; + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIREvidenceVariable.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIREvidenceVariable.php index 9bbfa9389a..02e2853c7f 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIREvidenceVariable.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIREvidenceVariable.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -94,10 +94,6 @@ class FHIREvidenceVariable extends FHIRDomainResource implements PHPFHIRContaine { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_EVIDENCE_VARIABLE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_APPROVAL_DATE = 'approvalDate'; const FIELD_APPROVAL_DATE_EXT = '_approvalDate'; const FIELD_AUTHOR = 'author'; @@ -500,6 +496,9 @@ class FHIREvidenceVariable extends FHIRDomainResource implements PHPFHIRContaine */ protected $version = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIREvidenceVariable Constructor * @param null|array $data @@ -522,8 +521,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_APPROVAL_DATE] instanceof FHIRDate) { $this->setApprovalDate($data[self::FIELD_APPROVAL_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_APPROVAL_DATE])) { - $this->setApprovalDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_APPROVAL_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_APPROVAL_DATE])) { + $this->setApprovalDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_APPROVAL_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_APPROVAL_DATE])) { + $this->setApprovalDate(new FHIRDate(array_merge($ext, $data[self::FIELD_APPROVAL_DATE]))); + } } else { $this->setApprovalDate(new FHIRDate($data[self::FIELD_APPROVAL_DATE])); } @@ -531,6 +534,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_AUTHOR])) { if (is_array($data[self::FIELD_AUTHOR])) { foreach($data[self::FIELD_AUTHOR] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContactDetail) { $this->addAuthor($v); } else { @@ -546,6 +552,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CHARACTERISTIC])) { if (is_array($data[self::FIELD_CHARACTERISTIC])) { foreach($data[self::FIELD_CHARACTERISTIC] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIREvidenceVariableCharacteristic) { $this->addCharacteristic($v); } else { @@ -561,6 +570,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CONTACT])) { if (is_array($data[self::FIELD_CONTACT])) { foreach($data[self::FIELD_CONTACT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContactDetail) { $this->addContact($v); } else { @@ -579,8 +591,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_COPYRIGHT] instanceof FHIRMarkdown) { $this->setCopyright($data[self::FIELD_COPYRIGHT]); - } elseif ($ext && is_scalar($data[self::FIELD_COPYRIGHT])) { - $this->setCopyright(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_COPYRIGHT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_COPYRIGHT])) { + $this->setCopyright(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_COPYRIGHT]] + $ext)); + } else if (is_array($data[self::FIELD_COPYRIGHT])) { + $this->setCopyright(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_COPYRIGHT]))); + } } else { $this->setCopyright(new FHIRMarkdown($data[self::FIELD_COPYRIGHT])); } @@ -591,8 +607,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATE] instanceof FHIRDateTime) { $this->setDate($data[self::FIELD_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_DATE])) { - $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime(array_merge($ext, $data[self::FIELD_DATE]))); + } } else { $this->setDate(new FHIRDateTime($data[self::FIELD_DATE])); } @@ -603,8 +623,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRMarkdown) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRMarkdown($data[self::FIELD_DESCRIPTION])); } @@ -612,6 +636,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_EDITOR])) { if (is_array($data[self::FIELD_EDITOR])) { foreach($data[self::FIELD_EDITOR] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContactDetail) { $this->addEditor($v); } else { @@ -634,6 +661,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ENDORSER])) { if (is_array($data[self::FIELD_ENDORSER])) { foreach($data[self::FIELD_ENDORSER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContactDetail) { $this->addEndorser($v); } else { @@ -652,17 +682,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -671,6 +708,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_JURISDICTION])) { if (is_array($data[self::FIELD_JURISDICTION])) { foreach($data[self::FIELD_JURISDICTION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addJurisdiction($v); } else { @@ -689,8 +729,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_LAST_REVIEW_DATE] instanceof FHIRDate) { $this->setLastReviewDate($data[self::FIELD_LAST_REVIEW_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_LAST_REVIEW_DATE])) { - $this->setLastReviewDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_LAST_REVIEW_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_LAST_REVIEW_DATE])) { + $this->setLastReviewDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_LAST_REVIEW_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_LAST_REVIEW_DATE])) { + $this->setLastReviewDate(new FHIRDate(array_merge($ext, $data[self::FIELD_LAST_REVIEW_DATE]))); + } } else { $this->setLastReviewDate(new FHIRDate($data[self::FIELD_LAST_REVIEW_DATE])); } @@ -701,8 +745,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -710,6 +758,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_NOTE])) { if (is_array($data[self::FIELD_NOTE])) { foreach($data[self::FIELD_NOTE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRAnnotation) { $this->addNote($v); } else { @@ -728,8 +779,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PUBLISHER] instanceof FHIRString) { $this->setPublisher($data[self::FIELD_PUBLISHER]); - } elseif ($ext && is_scalar($data[self::FIELD_PUBLISHER])) { - $this->setPublisher(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PUBLISHER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PUBLISHER])) { + $this->setPublisher(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PUBLISHER]] + $ext)); + } else if (is_array($data[self::FIELD_PUBLISHER])) { + $this->setPublisher(new FHIRString(array_merge($ext, $data[self::FIELD_PUBLISHER]))); + } } else { $this->setPublisher(new FHIRString($data[self::FIELD_PUBLISHER])); } @@ -737,6 +792,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_RELATED_ARTIFACT])) { if (is_array($data[self::FIELD_RELATED_ARTIFACT])) { foreach($data[self::FIELD_RELATED_ARTIFACT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRRelatedArtifact) { $this->addRelatedArtifact($v); } else { @@ -752,6 +810,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REVIEWER])) { if (is_array($data[self::FIELD_REVIEWER])) { foreach($data[self::FIELD_REVIEWER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContactDetail) { $this->addReviewer($v); } else { @@ -770,8 +831,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SHORT_TITLE] instanceof FHIRString) { $this->setShortTitle($data[self::FIELD_SHORT_TITLE]); - } elseif ($ext && is_scalar($data[self::FIELD_SHORT_TITLE])) { - $this->setShortTitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SHORT_TITLE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SHORT_TITLE])) { + $this->setShortTitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SHORT_TITLE]] + $ext)); + } else if (is_array($data[self::FIELD_SHORT_TITLE])) { + $this->setShortTitle(new FHIRString(array_merge($ext, $data[self::FIELD_SHORT_TITLE]))); + } } else { $this->setShortTitle(new FHIRString($data[self::FIELD_SHORT_TITLE])); } @@ -782,8 +847,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRPublicationStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRPublicationStatus([FHIRPublicationStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRPublicationStatus([FHIRPublicationStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRPublicationStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRPublicationStatus($data[self::FIELD_STATUS])); } @@ -794,8 +863,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SUBTITLE] instanceof FHIRString) { $this->setSubtitle($data[self::FIELD_SUBTITLE]); - } elseif ($ext && is_scalar($data[self::FIELD_SUBTITLE])) { - $this->setSubtitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SUBTITLE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SUBTITLE])) { + $this->setSubtitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SUBTITLE]] + $ext)); + } else if (is_array($data[self::FIELD_SUBTITLE])) { + $this->setSubtitle(new FHIRString(array_merge($ext, $data[self::FIELD_SUBTITLE]))); + } } else { $this->setSubtitle(new FHIRString($data[self::FIELD_SUBTITLE])); } @@ -806,8 +879,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TITLE] instanceof FHIRString) { $this->setTitle($data[self::FIELD_TITLE]); - } elseif ($ext && is_scalar($data[self::FIELD_TITLE])) { - $this->setTitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TITLE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TITLE])) { + $this->setTitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TITLE]] + $ext)); + } else if (is_array($data[self::FIELD_TITLE])) { + $this->setTitle(new FHIRString(array_merge($ext, $data[self::FIELD_TITLE]))); + } } else { $this->setTitle(new FHIRString($data[self::FIELD_TITLE])); } @@ -815,6 +892,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_TOPIC])) { if (is_array($data[self::FIELD_TOPIC])) { foreach($data[self::FIELD_TOPIC] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addTopic($v); } else { @@ -833,8 +913,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TYPE] instanceof FHIREvidenceVariableType) { $this->setType($data[self::FIELD_TYPE]); - } elseif ($ext && is_scalar($data[self::FIELD_TYPE])) { - $this->setType(new FHIREvidenceVariableType([FHIREvidenceVariableType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TYPE])) { + $this->setType(new FHIREvidenceVariableType([FHIREvidenceVariableType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } else if (is_array($data[self::FIELD_TYPE])) { + $this->setType(new FHIREvidenceVariableType(array_merge($ext, $data[self::FIELD_TYPE]))); + } } else { $this->setType(new FHIREvidenceVariableType($data[self::FIELD_TYPE])); } @@ -845,8 +929,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_URL] instanceof FHIRUri) { $this->setUrl($data[self::FIELD_URL]); - } elseif ($ext && is_scalar($data[self::FIELD_URL])) { - $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } else if (is_array($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri(array_merge($ext, $data[self::FIELD_URL]))); + } } else { $this->setUrl(new FHIRUri($data[self::FIELD_URL])); } @@ -854,6 +942,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_USE_CONTEXT])) { if (is_array($data[self::FIELD_USE_CONTEXT])) { foreach($data[self::FIELD_USE_CONTEXT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRUsageContext) { $this->addUseContext($v); } else { @@ -872,8 +963,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VERSION] instanceof FHIRString) { $this->setVersion($data[self::FIELD_VERSION]); - } elseif ($ext && is_scalar($data[self::FIELD_VERSION])) { - $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } else if (is_array($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString(array_merge($ext, $data[self::FIELD_VERSION]))); + } } else { $this->setVersion(new FHIRString($data[self::FIELD_VERSION])); } @@ -2496,7 +2591,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getApprovalDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_APPROVAL_DATE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getAuthor())) { foreach($vs as $v) { if (null === $v) { @@ -2523,6 +2617,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_CONTACT, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getCopyright())) { $v->xmlSerialize($sxe->addChild(self::FIELD_COPYRIGHT, null, $v->_getFHIRXMLNamespace())); } @@ -2532,7 +2627,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESCRIPTION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getEditor())) { foreach($vs as $v) { if (null === $v) { @@ -2545,7 +2639,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getEffectivePeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EFFECTIVE_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getEndorser())) { foreach($vs as $v) { if (null === $v) { @@ -2572,13 +2665,13 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_JURISDICTION, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getLastReviewDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_LAST_REVIEW_DATE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NAME, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getNote())) { foreach($vs as $v) { if (null === $v) { @@ -2587,10 +2680,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_NOTE, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getPublisher())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PUBLISHER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getRelatedArtifact())) { foreach($vs as $v) { if (null === $v) { @@ -2608,10 +2701,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_REVIEWER, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getShortTitle())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SHORT_TITLE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } @@ -2621,7 +2714,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getTitle())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TITLE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getTopic())) { foreach($vs as $v) { if (null === $v) { @@ -2637,7 +2729,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getUrl())) { $v->xmlSerialize($sxe->addChild(self::FIELD_URL, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getUseContext())) { foreach($vs as $v) { if (null === $v) { @@ -2646,6 +2737,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_USE_CONTEXT, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getVersion())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VERSION, null, $v->_getFHIRXMLNamespace())); } @@ -2659,8 +2751,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getApprovalDate())) { - $a[self::FIELD_APPROVAL_DATE] = $v->getValue(); - $a[self::FIELD_APPROVAL_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_APPROVAL_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_APPROVAL_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_APPROVAL_DATE] = $v; + } } if ([] !== ($vs = $this->getAuthor())) { $a[self::FIELD_AUTHOR] = $vs; @@ -2672,16 +2771,37 @@ public function jsonSerialize() $a[self::FIELD_CONTACT] = $vs; } if (null !== ($v = $this->getCopyright())) { - $a[self::FIELD_COPYRIGHT] = $v->getValue(); - $a[self::FIELD_COPYRIGHT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_COPYRIGHT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_COPYRIGHT_EXT] = $enc; + } + } else { + $a[self::FIELD_COPYRIGHT] = $v; + } } if (null !== ($v = $this->getDate())) { - $a[self::FIELD_DATE] = $v->getValue(); - $a[self::FIELD_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_DATE] = $v; + } } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if ([] !== ($vs = $this->getEditor())) { $a[self::FIELD_EDITOR] = $vs; @@ -2693,25 +2813,62 @@ public function jsonSerialize() $a[self::FIELD_ENDORSER] = $vs; } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if ([] !== ($vs = $this->getJurisdiction())) { $a[self::FIELD_JURISDICTION] = $vs; } if (null !== ($v = $this->getLastReviewDate())) { - $a[self::FIELD_LAST_REVIEW_DATE] = $v->getValue(); - $a[self::FIELD_LAST_REVIEW_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_LAST_REVIEW_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_LAST_REVIEW_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_LAST_REVIEW_DATE] = $v; + } } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if ([] !== ($vs = $this->getNote())) { $a[self::FIELD_NOTE] = $vs; } if (null !== ($v = $this->getPublisher())) { - $a[self::FIELD_PUBLISHER] = $v->getValue(); - $a[self::FIELD_PUBLISHER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PUBLISHER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PUBLISHER_EXT] = $enc; + } + } else { + $a[self::FIELD_PUBLISHER] = $v; + } } if ([] !== ($vs = $this->getRelatedArtifact())) { $a[self::FIELD_RELATED_ARTIFACT] = $vs; @@ -2720,36 +2877,87 @@ public function jsonSerialize() $a[self::FIELD_REVIEWER] = $vs; } if (null !== ($v = $this->getShortTitle())) { - $a[self::FIELD_SHORT_TITLE] = $v->getValue(); - $a[self::FIELD_SHORT_TITLE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SHORT_TITLE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SHORT_TITLE_EXT] = $enc; + } + } else { + $a[self::FIELD_SHORT_TITLE] = $v; + } } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getSubtitle())) { - $a[self::FIELD_SUBTITLE] = $v->getValue(); - $a[self::FIELD_SUBTITLE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SUBTITLE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SUBTITLE_EXT] = $enc; + } + } else { + $a[self::FIELD_SUBTITLE] = $v; + } } if (null !== ($v = $this->getTitle())) { - $a[self::FIELD_TITLE] = $v->getValue(); - $a[self::FIELD_TITLE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TITLE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TITLE_EXT] = $enc; + } + } else { + $a[self::FIELD_TITLE] = $v; + } } if ([] !== ($vs = $this->getTopic())) { $a[self::FIELD_TOPIC] = $vs; } if (null !== ($v = $this->getType())) { - $a[self::FIELD_TYPE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TYPE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TYPE_EXT] = $enc; + } + } else { + $a[self::FIELD_TYPE] = $v; + } } if (null !== ($v = $this->getUrl())) { - $a[self::FIELD_URL] = $v->getValue(); - $a[self::FIELD_URL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_URL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_URL_EXT] = $enc; + } + } else { + $a[self::FIELD_URL] = $v; + } } if ([] !== ($vs = $this->getUseContext())) { $a[self::FIELD_USE_CONTEXT] = $vs; } if (null !== ($v = $this->getVersion())) { - $a[self::FIELD_VERSION] = $v->getValue(); - $a[self::FIELD_VERSION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VERSION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VERSION_EXT] = $enc; + } + } else { + $a[self::FIELD_VERSION] = $v; + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRExampleScenario.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRExampleScenario.php index 0f006ae53a..7292388827 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRExampleScenario.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRExampleScenario.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -92,10 +92,6 @@ class FHIRExampleScenario extends FHIRDomainResource implements PHPFHIRContained { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_EXAMPLE_SCENARIO; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ACTOR = 'actor'; const FIELD_CONTACT = 'contact'; const FIELD_COPYRIGHT = 'copyright'; @@ -350,6 +346,9 @@ class FHIRExampleScenario extends FHIRDomainResource implements PHPFHIRContained */ protected $workflow = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRExampleScenario Constructor * @param null|array $data @@ -369,6 +368,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ACTOR])) { if (is_array($data[self::FIELD_ACTOR])) { foreach($data[self::FIELD_ACTOR] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRExampleScenarioActor) { $this->addActor($v); } else { @@ -384,6 +386,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CONTACT])) { if (is_array($data[self::FIELD_CONTACT])) { foreach($data[self::FIELD_CONTACT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContactDetail) { $this->addContact($v); } else { @@ -402,8 +407,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_COPYRIGHT] instanceof FHIRMarkdown) { $this->setCopyright($data[self::FIELD_COPYRIGHT]); - } elseif ($ext && is_scalar($data[self::FIELD_COPYRIGHT])) { - $this->setCopyright(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_COPYRIGHT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_COPYRIGHT])) { + $this->setCopyright(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_COPYRIGHT]] + $ext)); + } else if (is_array($data[self::FIELD_COPYRIGHT])) { + $this->setCopyright(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_COPYRIGHT]))); + } } else { $this->setCopyright(new FHIRMarkdown($data[self::FIELD_COPYRIGHT])); } @@ -414,8 +423,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATE] instanceof FHIRDateTime) { $this->setDate($data[self::FIELD_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_DATE])) { - $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime(array_merge($ext, $data[self::FIELD_DATE]))); + } } else { $this->setDate(new FHIRDateTime($data[self::FIELD_DATE])); } @@ -426,8 +439,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EXPERIMENTAL] instanceof FHIRBoolean) { $this->setExperimental($data[self::FIELD_EXPERIMENTAL]); - } elseif ($ext && is_scalar($data[self::FIELD_EXPERIMENTAL])) { - $this->setExperimental(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_EXPERIMENTAL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EXPERIMENTAL])) { + $this->setExperimental(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_EXPERIMENTAL]] + $ext)); + } else if (is_array($data[self::FIELD_EXPERIMENTAL])) { + $this->setExperimental(new FHIRBoolean(array_merge($ext, $data[self::FIELD_EXPERIMENTAL]))); + } } else { $this->setExperimental(new FHIRBoolean($data[self::FIELD_EXPERIMENTAL])); } @@ -438,17 +455,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -457,6 +481,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_INSTANCE])) { if (is_array($data[self::FIELD_INSTANCE])) { foreach($data[self::FIELD_INSTANCE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRExampleScenarioInstance) { $this->addInstance($v); } else { @@ -472,6 +499,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_JURISDICTION])) { if (is_array($data[self::FIELD_JURISDICTION])) { foreach($data[self::FIELD_JURISDICTION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addJurisdiction($v); } else { @@ -490,8 +520,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -499,6 +533,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PROCESS])) { if (is_array($data[self::FIELD_PROCESS])) { foreach($data[self::FIELD_PROCESS] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRExampleScenarioProcess) { $this->addProcess($v); } else { @@ -517,8 +554,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PUBLISHER] instanceof FHIRString) { $this->setPublisher($data[self::FIELD_PUBLISHER]); - } elseif ($ext && is_scalar($data[self::FIELD_PUBLISHER])) { - $this->setPublisher(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PUBLISHER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PUBLISHER])) { + $this->setPublisher(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PUBLISHER]] + $ext)); + } else if (is_array($data[self::FIELD_PUBLISHER])) { + $this->setPublisher(new FHIRString(array_merge($ext, $data[self::FIELD_PUBLISHER]))); + } } else { $this->setPublisher(new FHIRString($data[self::FIELD_PUBLISHER])); } @@ -529,8 +570,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PURPOSE] instanceof FHIRMarkdown) { $this->setPurpose($data[self::FIELD_PURPOSE]); - } elseif ($ext && is_scalar($data[self::FIELD_PURPOSE])) { - $this->setPurpose(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_PURPOSE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PURPOSE])) { + $this->setPurpose(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_PURPOSE]] + $ext)); + } else if (is_array($data[self::FIELD_PURPOSE])) { + $this->setPurpose(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_PURPOSE]))); + } } else { $this->setPurpose(new FHIRMarkdown($data[self::FIELD_PURPOSE])); } @@ -541,8 +586,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRPublicationStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRPublicationStatus([FHIRPublicationStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRPublicationStatus([FHIRPublicationStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRPublicationStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRPublicationStatus($data[self::FIELD_STATUS])); } @@ -553,8 +602,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_URL] instanceof FHIRUri) { $this->setUrl($data[self::FIELD_URL]); - } elseif ($ext && is_scalar($data[self::FIELD_URL])) { - $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } else if (is_array($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri(array_merge($ext, $data[self::FIELD_URL]))); + } } else { $this->setUrl(new FHIRUri($data[self::FIELD_URL])); } @@ -562,6 +615,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_USE_CONTEXT])) { if (is_array($data[self::FIELD_USE_CONTEXT])) { foreach($data[self::FIELD_USE_CONTEXT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRUsageContext) { $this->addUseContext($v); } else { @@ -580,8 +636,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VERSION] instanceof FHIRString) { $this->setVersion($data[self::FIELD_VERSION]); - } elseif ($ext && is_scalar($data[self::FIELD_VERSION])) { - $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } else if (is_array($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString(array_merge($ext, $data[self::FIELD_VERSION]))); + } } else { $this->setVersion(new FHIRString($data[self::FIELD_VERSION])); } @@ -592,17 +652,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_WORKFLOW])) { foreach($data[self::FIELD_WORKFLOW] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCanonical) { $this->addWorkflow($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addWorkflow(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addWorkflow(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addWorkflow(new FHIRCanonical(array_merge($v, $ext[$i]))); + } } else { $this->addWorkflow(new FHIRCanonical($v)); } } } elseif ($data[self::FIELD_WORKFLOW] instanceof FHIRCanonical) { $this->addWorkflow($data[self::FIELD_WORKFLOW]); - } elseif ($ext && is_scalar($data[self::FIELD_WORKFLOW])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_WORKFLOW])) { $this->addWorkflow(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $data[self::FIELD_WORKFLOW]] + $ext)); } else { $this->addWorkflow(new FHIRCanonical($data[self::FIELD_WORKFLOW])); @@ -1685,7 +1752,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getActor())) { foreach($vs as $v) { if (null === $v) { @@ -1703,6 +1769,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_CONTACT, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getCopyright())) { $v->xmlSerialize($sxe->addChild(self::FIELD_COPYRIGHT, null, $v->_getFHIRXMLNamespace())); } @@ -1712,7 +1779,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getExperimental())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EXPERIMENTAL, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -1739,10 +1805,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_JURISDICTION, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NAME, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getProcess())) { foreach($vs as $v) { if (null === $v) { @@ -1751,20 +1817,19 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_PROCESS, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getPublisher())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PUBLISHER, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getPurpose())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PURPOSE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getUrl())) { $v->xmlSerialize($sxe->addChild(self::FIELD_URL, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getUseContext())) { foreach($vs as $v) { if (null === $v) { @@ -1773,6 +1838,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_USE_CONTEXT, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getVersion())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VERSION, null, $v->_getFHIRXMLNamespace())); } @@ -1784,6 +1850,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_WORKFLOW, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } @@ -1800,19 +1867,56 @@ public function jsonSerialize() $a[self::FIELD_CONTACT] = $vs; } if (null !== ($v = $this->getCopyright())) { - $a[self::FIELD_COPYRIGHT] = $v->getValue(); - $a[self::FIELD_COPYRIGHT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_COPYRIGHT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_COPYRIGHT_EXT] = $enc; + } + } else { + $a[self::FIELD_COPYRIGHT] = $v; + } } if (null !== ($v = $this->getDate())) { - $a[self::FIELD_DATE] = $v->getValue(); - $a[self::FIELD_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_DATE] = $v; + } } if (null !== ($v = $this->getExperimental())) { - $a[self::FIELD_EXPERIMENTAL] = $v->getValue(); - $a[self::FIELD_EXPERIMENTAL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EXPERIMENTAL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EXPERIMENTAL_EXT] = $enc; + } + } else { + $a[self::FIELD_EXPERIMENTAL] = $v; + } } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if ([] !== ($vs = $this->getInstance())) { $a[self::FIELD_INSTANCE] = $vs; @@ -1821,33 +1925,76 @@ public function jsonSerialize() $a[self::FIELD_JURISDICTION] = $vs; } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if ([] !== ($vs = $this->getProcess())) { $a[self::FIELD_PROCESS] = $vs; } if (null !== ($v = $this->getPublisher())) { - $a[self::FIELD_PUBLISHER] = $v->getValue(); - $a[self::FIELD_PUBLISHER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PUBLISHER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PUBLISHER_EXT] = $enc; + } + } else { + $a[self::FIELD_PUBLISHER] = $v; + } } if (null !== ($v = $this->getPurpose())) { - $a[self::FIELD_PURPOSE] = $v->getValue(); - $a[self::FIELD_PURPOSE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PURPOSE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PURPOSE_EXT] = $enc; + } + } else { + $a[self::FIELD_PURPOSE] = $v; + } } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getUrl())) { - $a[self::FIELD_URL] = $v->getValue(); - $a[self::FIELD_URL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_URL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_URL_EXT] = $enc; + } + } else { + $a[self::FIELD_URL] = $v; + } } if ([] !== ($vs = $this->getUseContext())) { $a[self::FIELD_USE_CONTEXT] = $vs; } if (null !== ($v = $this->getVersion())) { - $a[self::FIELD_VERSION] = $v->getValue(); - $a[self::FIELD_VERSION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VERSION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VERSION_EXT] = $enc; + } + } else { + $a[self::FIELD_VERSION] = $v; + } } if ([] !== ($vs = $this->getWorkflow())) { $a[self::FIELD_WORKFLOW] = []; @@ -1855,8 +2002,17 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_WORKFLOW][] = $v->getValue(); - $a[self::FIELD_WORKFLOW_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_WORKFLOW][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_WORKFLOW_EXT][] = $enc; + } else { + $a[self::FIELD_WORKFLOW_EXT][] = null; + } + } else { + $a[self::FIELD_WORKFLOW][] = $v; + } } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRExplanationOfBenefit.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRExplanationOfBenefit.php index b73a231d72..103afb5224 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRExplanationOfBenefit.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRExplanationOfBenefit.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -106,10 +106,6 @@ class FHIRExplanationOfBenefit extends FHIRDomainResource implements PHPFHIRCont { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_EXPLANATION_OF_BENEFIT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ACCIDENT = 'accident'; const FIELD_ADD_ITEM = 'addItem'; const FIELD_ADJUDICATION = 'adjudication'; @@ -668,6 +664,9 @@ class FHIRExplanationOfBenefit extends FHIRDomainResource implements PHPFHIRCont */ protected $use = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRExplanationOfBenefit Constructor * @param null|array $data @@ -694,6 +693,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ADD_ITEM])) { if (is_array($data[self::FIELD_ADD_ITEM])) { foreach($data[self::FIELD_ADD_ITEM] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRExplanationOfBenefitAddItem) { $this->addAddItem($v); } else { @@ -712,17 +714,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_ADJUDICATION])) { foreach($data[self::FIELD_ADJUDICATION] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRExplanationOfBenefitAdjudication) { $this->addAdjudication($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addAdjudication(new FHIRExplanationOfBenefitAdjudication([FHIRExplanationOfBenefitAdjudication::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addAdjudication(new FHIRExplanationOfBenefitAdjudication([FHIRExplanationOfBenefitAdjudication::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addAdjudication(new FHIRExplanationOfBenefitAdjudication(array_merge($v, $ext[$i]))); + } } else { $this->addAdjudication(new FHIRExplanationOfBenefitAdjudication($v)); } } } elseif ($data[self::FIELD_ADJUDICATION] instanceof FHIRExplanationOfBenefitAdjudication) { $this->addAdjudication($data[self::FIELD_ADJUDICATION]); - } elseif ($ext && is_scalar($data[self::FIELD_ADJUDICATION])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_ADJUDICATION])) { $this->addAdjudication(new FHIRExplanationOfBenefitAdjudication([FHIRExplanationOfBenefitAdjudication::FIELD_VALUE => $data[self::FIELD_ADJUDICATION]] + $ext)); } else { $this->addAdjudication(new FHIRExplanationOfBenefitAdjudication($data[self::FIELD_ADJUDICATION])); @@ -731,6 +740,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_BENEFIT_BALANCE])) { if (is_array($data[self::FIELD_BENEFIT_BALANCE])) { foreach($data[self::FIELD_BENEFIT_BALANCE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRExplanationOfBenefitBenefitBalance) { $this->addBenefitBalance($v); } else { @@ -760,6 +772,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CARE_TEAM])) { if (is_array($data[self::FIELD_CARE_TEAM])) { foreach($data[self::FIELD_CARE_TEAM] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRExplanationOfBenefitCareTeam) { $this->addCareTeam($v); } else { @@ -792,8 +807,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CREATED] instanceof FHIRDateTime) { $this->setCreated($data[self::FIELD_CREATED]); - } elseif ($ext && is_scalar($data[self::FIELD_CREATED])) { - $this->setCreated(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_CREATED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CREATED])) { + $this->setCreated(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_CREATED]] + $ext)); + } else if (is_array($data[self::FIELD_CREATED])) { + $this->setCreated(new FHIRDateTime(array_merge($ext, $data[self::FIELD_CREATED]))); + } } else { $this->setCreated(new FHIRDateTime($data[self::FIELD_CREATED])); } @@ -801,6 +820,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_DIAGNOSIS])) { if (is_array($data[self::FIELD_DIAGNOSIS])) { foreach($data[self::FIELD_DIAGNOSIS] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRExplanationOfBenefitDiagnosis) { $this->addDiagnosis($v); } else { @@ -819,8 +841,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DISPOSITION] instanceof FHIRString) { $this->setDisposition($data[self::FIELD_DISPOSITION]); - } elseif ($ext && is_scalar($data[self::FIELD_DISPOSITION])) { - $this->setDisposition(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DISPOSITION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DISPOSITION])) { + $this->setDisposition(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DISPOSITION]] + $ext)); + } else if (is_array($data[self::FIELD_DISPOSITION])) { + $this->setDisposition(new FHIRString(array_merge($ext, $data[self::FIELD_DISPOSITION]))); + } } else { $this->setDisposition(new FHIRString($data[self::FIELD_DISPOSITION])); } @@ -873,17 +899,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -892,6 +925,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_INSURANCE])) { if (is_array($data[self::FIELD_INSURANCE])) { foreach($data[self::FIELD_INSURANCE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRExplanationOfBenefitInsurance) { $this->addInsurance($v); } else { @@ -914,6 +950,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ITEM])) { if (is_array($data[self::FIELD_ITEM])) { foreach($data[self::FIELD_ITEM] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRExplanationOfBenefitItem) { $this->addItem($v); } else { @@ -939,8 +978,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_OUTCOME] instanceof FHIRClaimProcessingCodes) { $this->setOutcome($data[self::FIELD_OUTCOME]); - } elseif ($ext && is_scalar($data[self::FIELD_OUTCOME])) { - $this->setOutcome(new FHIRClaimProcessingCodes([FHIRClaimProcessingCodes::FIELD_VALUE => $data[self::FIELD_OUTCOME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_OUTCOME])) { + $this->setOutcome(new FHIRClaimProcessingCodes([FHIRClaimProcessingCodes::FIELD_VALUE => $data[self::FIELD_OUTCOME]] + $ext)); + } else if (is_array($data[self::FIELD_OUTCOME])) { + $this->setOutcome(new FHIRClaimProcessingCodes(array_merge($ext, $data[self::FIELD_OUTCOME]))); + } } else { $this->setOutcome(new FHIRClaimProcessingCodes($data[self::FIELD_OUTCOME])); } @@ -972,17 +1015,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_PRE_AUTH_REF])) { foreach($data[self::FIELD_PRE_AUTH_REF] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRString) { $this->addPreAuthRef($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addPreAuthRef(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addPreAuthRef(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addPreAuthRef(new FHIRString(array_merge($v, $ext[$i]))); + } } else { $this->addPreAuthRef(new FHIRString($v)); } } } elseif ($data[self::FIELD_PRE_AUTH_REF] instanceof FHIRString) { $this->addPreAuthRef($data[self::FIELD_PRE_AUTH_REF]); - } elseif ($ext && is_scalar($data[self::FIELD_PRE_AUTH_REF])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_PRE_AUTH_REF])) { $this->addPreAuthRef(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PRE_AUTH_REF]] + $ext)); } else { $this->addPreAuthRef(new FHIRString($data[self::FIELD_PRE_AUTH_REF])); @@ -991,6 +1041,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PRE_AUTH_REF_PERIOD])) { if (is_array($data[self::FIELD_PRE_AUTH_REF_PERIOD])) { foreach($data[self::FIELD_PRE_AUTH_REF_PERIOD] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRPeriod) { $this->addPreAuthRefPeriod($v); } else { @@ -1009,8 +1062,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PRECEDENCE] instanceof FHIRPositiveInt) { $this->setPrecedence($data[self::FIELD_PRECEDENCE]); - } elseif ($ext && is_scalar($data[self::FIELD_PRECEDENCE])) { - $this->setPrecedence(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_PRECEDENCE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PRECEDENCE])) { + $this->setPrecedence(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_PRECEDENCE]] + $ext)); + } else if (is_array($data[self::FIELD_PRECEDENCE])) { + $this->setPrecedence(new FHIRPositiveInt(array_merge($ext, $data[self::FIELD_PRECEDENCE]))); + } } else { $this->setPrecedence(new FHIRPositiveInt($data[self::FIELD_PRECEDENCE])); } @@ -1032,6 +1089,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PROCEDURE])) { if (is_array($data[self::FIELD_PROCEDURE])) { foreach($data[self::FIELD_PROCEDURE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRExplanationOfBenefitProcedure) { $this->addProcedure($v); } else { @@ -1047,6 +1107,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PROCESS_NOTE])) { if (is_array($data[self::FIELD_PROCESS_NOTE])) { foreach($data[self::FIELD_PROCESS_NOTE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRExplanationOfBenefitProcessNote) { $this->addProcessNote($v); } else { @@ -1076,6 +1139,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_RELATED])) { if (is_array($data[self::FIELD_RELATED])) { foreach($data[self::FIELD_RELATED] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRExplanationOfBenefitRelated) { $this->addRelated($v); } else { @@ -1094,8 +1160,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRExplanationOfBenefitStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRExplanationOfBenefitStatus([FHIRExplanationOfBenefitStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRExplanationOfBenefitStatus([FHIRExplanationOfBenefitStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRExplanationOfBenefitStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRExplanationOfBenefitStatus($data[self::FIELD_STATUS])); } @@ -1110,6 +1180,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SUPPORTING_INFO])) { if (is_array($data[self::FIELD_SUPPORTING_INFO])) { foreach($data[self::FIELD_SUPPORTING_INFO] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRExplanationOfBenefitSupportingInfo) { $this->addSupportingInfo($v); } else { @@ -1125,6 +1198,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_TOTAL])) { if (is_array($data[self::FIELD_TOTAL])) { foreach($data[self::FIELD_TOTAL] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRExplanationOfBenefitTotal) { $this->addTotal($v); } else { @@ -1150,8 +1226,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_USE] instanceof FHIRUse) { $this->setUse($data[self::FIELD_USE]); - } elseif ($ext && is_scalar($data[self::FIELD_USE])) { - $this->setUse(new FHIRUse([FHIRUse::FIELD_VALUE => $data[self::FIELD_USE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_USE])) { + $this->setUse(new FHIRUse([FHIRUse::FIELD_VALUE => $data[self::FIELD_USE]] + $ext)); + } else if (is_array($data[self::FIELD_USE])) { + $this->setUse(new FHIRUse(array_merge($ext, $data[self::FIELD_USE]))); + } } else { $this->setUse(new FHIRUse($data[self::FIELD_USE])); } @@ -3221,11 +3301,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getAccident())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ACCIDENT, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getAddItem())) { foreach($vs as $v) { if (null === $v) { @@ -3256,11 +3334,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getBenefitPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_BENEFIT_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getBillablePeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_BILLABLE_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getCareTeam())) { foreach($vs as $v) { if (null === $v) { @@ -3273,14 +3349,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getClaim())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CLAIM, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getClaimResponse())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CLAIM_RESPONSE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getCreated())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CREATED, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getDiagnosis())) { foreach($vs as $v) { if (null === $v) { @@ -3289,34 +3363,28 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_DIAGNOSIS, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getDisposition())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DISPOSITION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getEnterer())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ENTERER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getFacility())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FACILITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getForm())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FORM, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getFormCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FORM_CODE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getFundsReserve())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FUNDS_RESERVE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getFundsReserveRequested())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FUNDS_RESERVE_REQUESTED, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -3338,7 +3406,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getInsurer())) { $v->xmlSerialize($sxe->addChild(self::FIELD_INSURER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getItem())) { foreach($vs as $v) { if (null === $v) { @@ -3351,19 +3418,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getOriginalPrescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ORIGINAL_PRESCRIPTION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOutcome())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OUTCOME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPatient())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATIENT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPayee())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PAYEE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPayment())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PAYMENT, null, $v->_getFHIRXMLNamespace())); } @@ -3384,18 +3447,16 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_PRE_AUTH_REF_PERIOD, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getPrecedence())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PRECEDENCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPrescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PRESCRIPTION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPriority())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PRIORITY, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getProcedure())) { foreach($vs as $v) { if (null === $v) { @@ -3417,11 +3478,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getProvider())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PROVIDER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getReferral())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REFERRAL, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getRelated())) { foreach($vs as $v) { if (null === $v) { @@ -3434,11 +3493,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSubType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUB_TYPE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getSupportingInfo())) { foreach($vs as $v) { if (null === $v) { @@ -3460,7 +3517,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getUse())) { $v->xmlSerialize($sxe->addChild(self::FIELD_USE, null, $v->_getFHIRXMLNamespace())); } @@ -3480,7 +3536,23 @@ public function jsonSerialize() $a[self::FIELD_ADD_ITEM] = $vs; } if ([] !== ($vs = $this->getAdjudication())) { - $a[self::FIELD_ADJUDICATION] = $vs; + $a[self::FIELD_ADJUDICATION] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ADJUDICATION][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ADJUDICATION_EXT][] = $enc; + } else { + $a[self::FIELD_ADJUDICATION_EXT][] = null; + } + } else { + $a[self::FIELD_ADJUDICATION][] = $v; + } + } } if ([] !== ($vs = $this->getBenefitBalance())) { $a[self::FIELD_BENEFIT_BALANCE] = $vs; @@ -3501,15 +3573,29 @@ public function jsonSerialize() $a[self::FIELD_CLAIM_RESPONSE] = $v; } if (null !== ($v = $this->getCreated())) { - $a[self::FIELD_CREATED] = $v->getValue(); - $a[self::FIELD_CREATED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CREATED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CREATED_EXT] = $enc; + } + } else { + $a[self::FIELD_CREATED] = $v; + } } if ([] !== ($vs = $this->getDiagnosis())) { $a[self::FIELD_DIAGNOSIS] = $vs; } if (null !== ($v = $this->getDisposition())) { - $a[self::FIELD_DISPOSITION] = $v->getValue(); - $a[self::FIELD_DISPOSITION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DISPOSITION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DISPOSITION_EXT] = $enc; + } + } else { + $a[self::FIELD_DISPOSITION] = $v; + } } if (null !== ($v = $this->getEnterer())) { $a[self::FIELD_ENTERER] = $v; @@ -3530,7 +3616,23 @@ public function jsonSerialize() $a[self::FIELD_FUNDS_RESERVE_REQUESTED] = $v; } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if ([] !== ($vs = $this->getInsurance())) { $a[self::FIELD_INSURANCE] = $vs; @@ -3545,7 +3647,15 @@ public function jsonSerialize() $a[self::FIELD_ORIGINAL_PRESCRIPTION] = $v; } if (null !== ($v = $this->getOutcome())) { - $a[self::FIELD_OUTCOME] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_OUTCOME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_OUTCOME_EXT] = $enc; + } + } else { + $a[self::FIELD_OUTCOME] = $v; + } } if (null !== ($v = $this->getPatient())) { $a[self::FIELD_PATIENT] = $v; @@ -3562,16 +3672,32 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_PRE_AUTH_REF][] = $v->getValue(); - $a[self::FIELD_PRE_AUTH_REF_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PRE_AUTH_REF][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PRE_AUTH_REF_EXT][] = $enc; + } else { + $a[self::FIELD_PRE_AUTH_REF_EXT][] = null; + } + } else { + $a[self::FIELD_PRE_AUTH_REF][] = $v; + } } } if ([] !== ($vs = $this->getPreAuthRefPeriod())) { $a[self::FIELD_PRE_AUTH_REF_PERIOD] = $vs; } if (null !== ($v = $this->getPrecedence())) { - $a[self::FIELD_PRECEDENCE] = $v->getValue(); - $a[self::FIELD_PRECEDENCE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PRECEDENCE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PRECEDENCE_EXT] = $enc; + } + } else { + $a[self::FIELD_PRECEDENCE] = $v; + } } if (null !== ($v = $this->getPrescription())) { $a[self::FIELD_PRESCRIPTION] = $v; @@ -3595,7 +3721,15 @@ public function jsonSerialize() $a[self::FIELD_RELATED] = $vs; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getSubType())) { $a[self::FIELD_SUB_TYPE] = $v; @@ -3610,7 +3744,15 @@ public function jsonSerialize() $a[self::FIELD_TYPE] = $v; } if (null !== ($v = $this->getUse())) { - $a[self::FIELD_USE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_USE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_USE_EXT] = $enc; + } + } else { + $a[self::FIELD_USE] = $v; + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRFamilyMemberHistory.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRFamilyMemberHistory.php index 49c40bee07..0284466658 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRFamilyMemberHistory.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRFamilyMemberHistory.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -94,11 +94,8 @@ class FHIRFamilyMemberHistory extends FHIRDomainResource implements PHPFHIRConta { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_FAMILY_MEMBER_HISTORY; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_AGE_AGE = 'ageAge'; + const FIELD_AGE_AGE_EXT = '_ageAge'; const FIELD_AGE_RANGE = 'ageRange'; const FIELD_AGE_STRING = 'ageString'; const FIELD_AGE_STRING_EXT = '_ageString'; @@ -112,6 +109,7 @@ class FHIRFamilyMemberHistory extends FHIRDomainResource implements PHPFHIRConta const FIELD_DATE = 'date'; const FIELD_DATE_EXT = '_date'; const FIELD_DECEASED_AGE = 'deceasedAge'; + const FIELD_DECEASED_AGE_EXT = '_deceasedAge'; const FIELD_DECEASED_BOOLEAN = 'deceasedBoolean'; const FIELD_DECEASED_BOOLEAN_EXT = '_deceasedBoolean'; const FIELD_DECEASED_DATE = 'deceasedDate'; @@ -463,6 +461,9 @@ class FHIRFamilyMemberHistory extends FHIRDomainResource implements PHPFHIRConta */ protected $status = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRFamilyMemberHistory Constructor * @param null|array $data @@ -480,8 +481,17 @@ public function __construct($data = null) } parent::__construct($data); if (isset($data[self::FIELD_AGE_AGE])) { + $ext = (isset($data[self::FIELD_AGE_AGE_EXT]) && is_array($data[self::FIELD_AGE_AGE_EXT])) + ? $data[self::FIELD_AGE_AGE_EXT] + : null; if ($data[self::FIELD_AGE_AGE] instanceof FHIRAge) { $this->setAgeAge($data[self::FIELD_AGE_AGE]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_AGE_AGE])) { + $this->setAgeAge(new FHIRAge([FHIRAge::FIELD_VALUE => $data[self::FIELD_AGE_AGE]] + $ext)); + } else if (is_array($data[self::FIELD_AGE_AGE])) { + $this->setAgeAge(new FHIRAge(array_merge($ext, $data[self::FIELD_AGE_AGE]))); + } } else { $this->setAgeAge(new FHIRAge($data[self::FIELD_AGE_AGE])); } @@ -499,8 +509,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_AGE_STRING] instanceof FHIRString) { $this->setAgeString($data[self::FIELD_AGE_STRING]); - } elseif ($ext && is_scalar($data[self::FIELD_AGE_STRING])) { - $this->setAgeString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_AGE_STRING]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_AGE_STRING])) { + $this->setAgeString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_AGE_STRING]] + $ext)); + } else if (is_array($data[self::FIELD_AGE_STRING])) { + $this->setAgeString(new FHIRString(array_merge($ext, $data[self::FIELD_AGE_STRING]))); + } } else { $this->setAgeString(new FHIRString($data[self::FIELD_AGE_STRING])); } @@ -511,8 +525,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_BORN_DATE] instanceof FHIRDate) { $this->setBornDate($data[self::FIELD_BORN_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_BORN_DATE])) { - $this->setBornDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_BORN_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_BORN_DATE])) { + $this->setBornDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_BORN_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_BORN_DATE])) { + $this->setBornDate(new FHIRDate(array_merge($ext, $data[self::FIELD_BORN_DATE]))); + } } else { $this->setBornDate(new FHIRDate($data[self::FIELD_BORN_DATE])); } @@ -530,8 +548,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_BORN_STRING] instanceof FHIRString) { $this->setBornString($data[self::FIELD_BORN_STRING]); - } elseif ($ext && is_scalar($data[self::FIELD_BORN_STRING])) { - $this->setBornString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_BORN_STRING]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_BORN_STRING])) { + $this->setBornString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_BORN_STRING]] + $ext)); + } else if (is_array($data[self::FIELD_BORN_STRING])) { + $this->setBornString(new FHIRString(array_merge($ext, $data[self::FIELD_BORN_STRING]))); + } } else { $this->setBornString(new FHIRString($data[self::FIELD_BORN_STRING])); } @@ -539,6 +561,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CONDITION])) { if (is_array($data[self::FIELD_CONDITION])) { foreach($data[self::FIELD_CONDITION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRFamilyMemberHistoryCondition) { $this->addCondition($v); } else { @@ -564,15 +589,28 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATE] instanceof FHIRDateTime) { $this->setDate($data[self::FIELD_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_DATE])) { - $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime(array_merge($ext, $data[self::FIELD_DATE]))); + } } else { $this->setDate(new FHIRDateTime($data[self::FIELD_DATE])); } } if (isset($data[self::FIELD_DECEASED_AGE])) { + $ext = (isset($data[self::FIELD_DECEASED_AGE_EXT]) && is_array($data[self::FIELD_DECEASED_AGE_EXT])) + ? $data[self::FIELD_DECEASED_AGE_EXT] + : null; if ($data[self::FIELD_DECEASED_AGE] instanceof FHIRAge) { $this->setDeceasedAge($data[self::FIELD_DECEASED_AGE]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DECEASED_AGE])) { + $this->setDeceasedAge(new FHIRAge([FHIRAge::FIELD_VALUE => $data[self::FIELD_DECEASED_AGE]] + $ext)); + } else if (is_array($data[self::FIELD_DECEASED_AGE])) { + $this->setDeceasedAge(new FHIRAge(array_merge($ext, $data[self::FIELD_DECEASED_AGE]))); + } } else { $this->setDeceasedAge(new FHIRAge($data[self::FIELD_DECEASED_AGE])); } @@ -583,8 +621,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DECEASED_BOOLEAN] instanceof FHIRBoolean) { $this->setDeceasedBoolean($data[self::FIELD_DECEASED_BOOLEAN]); - } elseif ($ext && is_scalar($data[self::FIELD_DECEASED_BOOLEAN])) { - $this->setDeceasedBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_DECEASED_BOOLEAN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DECEASED_BOOLEAN])) { + $this->setDeceasedBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_DECEASED_BOOLEAN]] + $ext)); + } else if (is_array($data[self::FIELD_DECEASED_BOOLEAN])) { + $this->setDeceasedBoolean(new FHIRBoolean(array_merge($ext, $data[self::FIELD_DECEASED_BOOLEAN]))); + } } else { $this->setDeceasedBoolean(new FHIRBoolean($data[self::FIELD_DECEASED_BOOLEAN])); } @@ -595,8 +637,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DECEASED_DATE] instanceof FHIRDate) { $this->setDeceasedDate($data[self::FIELD_DECEASED_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_DECEASED_DATE])) { - $this->setDeceasedDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_DECEASED_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DECEASED_DATE])) { + $this->setDeceasedDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_DECEASED_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_DECEASED_DATE])) { + $this->setDeceasedDate(new FHIRDate(array_merge($ext, $data[self::FIELD_DECEASED_DATE]))); + } } else { $this->setDeceasedDate(new FHIRDate($data[self::FIELD_DECEASED_DATE])); } @@ -614,8 +660,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DECEASED_STRING] instanceof FHIRString) { $this->setDeceasedString($data[self::FIELD_DECEASED_STRING]); - } elseif ($ext && is_scalar($data[self::FIELD_DECEASED_STRING])) { - $this->setDeceasedString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DECEASED_STRING]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DECEASED_STRING])) { + $this->setDeceasedString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DECEASED_STRING]] + $ext)); + } else if (is_array($data[self::FIELD_DECEASED_STRING])) { + $this->setDeceasedString(new FHIRString(array_merge($ext, $data[self::FIELD_DECEASED_STRING]))); + } } else { $this->setDeceasedString(new FHIRString($data[self::FIELD_DECEASED_STRING])); } @@ -626,8 +676,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ESTIMATED_AGE] instanceof FHIRBoolean) { $this->setEstimatedAge($data[self::FIELD_ESTIMATED_AGE]); - } elseif ($ext && is_scalar($data[self::FIELD_ESTIMATED_AGE])) { - $this->setEstimatedAge(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_ESTIMATED_AGE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ESTIMATED_AGE])) { + $this->setEstimatedAge(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_ESTIMATED_AGE]] + $ext)); + } else if (is_array($data[self::FIELD_ESTIMATED_AGE])) { + $this->setEstimatedAge(new FHIRBoolean(array_merge($ext, $data[self::FIELD_ESTIMATED_AGE]))); + } } else { $this->setEstimatedAge(new FHIRBoolean($data[self::FIELD_ESTIMATED_AGE])); } @@ -638,17 +692,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -660,17 +721,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_INSTANTIATES_CANONICAL])) { foreach($data[self::FIELD_INSTANTIATES_CANONICAL] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCanonical) { $this->addInstantiatesCanonical($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addInstantiatesCanonical(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addInstantiatesCanonical(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addInstantiatesCanonical(new FHIRCanonical(array_merge($v, $ext[$i]))); + } } else { $this->addInstantiatesCanonical(new FHIRCanonical($v)); } } } elseif ($data[self::FIELD_INSTANTIATES_CANONICAL] instanceof FHIRCanonical) { $this->addInstantiatesCanonical($data[self::FIELD_INSTANTIATES_CANONICAL]); - } elseif ($ext && is_scalar($data[self::FIELD_INSTANTIATES_CANONICAL])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_INSTANTIATES_CANONICAL])) { $this->addInstantiatesCanonical(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $data[self::FIELD_INSTANTIATES_CANONICAL]] + $ext)); } else { $this->addInstantiatesCanonical(new FHIRCanonical($data[self::FIELD_INSTANTIATES_CANONICAL])); @@ -682,17 +750,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_INSTANTIATES_URI])) { foreach($data[self::FIELD_INSTANTIATES_URI] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRUri) { $this->addInstantiatesUri($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addInstantiatesUri(new FHIRUri([FHIRUri::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addInstantiatesUri(new FHIRUri([FHIRUri::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addInstantiatesUri(new FHIRUri(array_merge($v, $ext[$i]))); + } } else { $this->addInstantiatesUri(new FHIRUri($v)); } } } elseif ($data[self::FIELD_INSTANTIATES_URI] instanceof FHIRUri) { $this->addInstantiatesUri($data[self::FIELD_INSTANTIATES_URI]); - } elseif ($ext && is_scalar($data[self::FIELD_INSTANTIATES_URI])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_INSTANTIATES_URI])) { $this->addInstantiatesUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_INSTANTIATES_URI]] + $ext)); } else { $this->addInstantiatesUri(new FHIRUri($data[self::FIELD_INSTANTIATES_URI])); @@ -704,8 +779,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -713,6 +792,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_NOTE])) { if (is_array($data[self::FIELD_NOTE])) { foreach($data[self::FIELD_NOTE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRAnnotation) { $this->addNote($v); } else { @@ -735,6 +817,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REASON_CODE])) { if (is_array($data[self::FIELD_REASON_CODE])) { foreach($data[self::FIELD_REASON_CODE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addReasonCode($v); } else { @@ -750,6 +835,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REASON_REFERENCE])) { if (is_array($data[self::FIELD_REASON_REFERENCE])) { foreach($data[self::FIELD_REASON_REFERENCE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addReasonReference($v); } else { @@ -782,8 +870,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRFamilyHistoryStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRFamilyHistoryStatus([FHIRFamilyHistoryStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRFamilyHistoryStatus([FHIRFamilyHistoryStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRFamilyHistoryStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRFamilyHistoryStatus($data[self::FIELD_STATUS])); } @@ -2164,11 +2256,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getAgeAge())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AGE_AGE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getAgeRange())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AGE_RANGE, null, $v->_getFHIRXMLNamespace())); } @@ -2178,14 +2268,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getBornDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_BORN_DATE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getBornPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_BORN_PERIOD, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getBornString())) { $v->xmlSerialize($sxe->addChild(self::FIELD_BORN_STRING, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getCondition())) { foreach($vs as $v) { if (null === $v) { @@ -2201,7 +2289,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DATE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDeceasedAge())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DECEASED_AGE, null, $v->_getFHIRXMLNamespace())); } @@ -2211,7 +2298,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDeceasedDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DECEASED_DATE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDeceasedRange())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DECEASED_RANGE, null, $v->_getFHIRXMLNamespace())); } @@ -2221,7 +2307,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getEstimatedAge())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ESTIMATED_AGE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -2230,6 +2315,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } } + if ([] !== ($vs = $this->getInstantiatesCanonical())) { foreach($vs as $v) { if (null === $v) { @@ -2238,6 +2324,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_INSTANTIATES_CANONICAL, null, $v->_getFHIRXMLNamespace())); } } + if ([] !== ($vs = $this->getInstantiatesUri())) { foreach($vs as $v) { if (null === $v) { @@ -2246,10 +2333,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_INSTANTIATES_URI, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NAME, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getNote())) { foreach($vs as $v) { if (null === $v) { @@ -2262,7 +2349,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getPatient())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATIENT, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getReasonCode())) { foreach($vs as $v) { if (null === $v) { @@ -2284,11 +2370,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getRelationship())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RELATIONSHIP, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSex())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SEX, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } @@ -2302,25 +2386,54 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getAgeAge())) { - $a[self::FIELD_AGE_AGE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_AGE_AGE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_AGE_AGE_EXT] = $enc; + } + } else { + $a[self::FIELD_AGE_AGE] = $v; + } } if (null !== ($v = $this->getAgeRange())) { $a[self::FIELD_AGE_RANGE] = $v; } if (null !== ($v = $this->getAgeString())) { - $a[self::FIELD_AGE_STRING] = $v->getValue(); - $a[self::FIELD_AGE_STRING_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_AGE_STRING] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_AGE_STRING_EXT] = $enc; + } + } else { + $a[self::FIELD_AGE_STRING] = $v; + } } if (null !== ($v = $this->getBornDate())) { - $a[self::FIELD_BORN_DATE] = $v->getValue(); - $a[self::FIELD_BORN_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_BORN_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_BORN_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_BORN_DATE] = $v; + } } if (null !== ($v = $this->getBornPeriod())) { $a[self::FIELD_BORN_PERIOD] = $v; } if (null !== ($v = $this->getBornString())) { - $a[self::FIELD_BORN_STRING] = $v->getValue(); - $a[self::FIELD_BORN_STRING_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_BORN_STRING] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_BORN_STRING_EXT] = $enc; + } + } else { + $a[self::FIELD_BORN_STRING] = $v; + } } if ([] !== ($vs = $this->getCondition())) { $a[self::FIELD_CONDITION] = $vs; @@ -2329,33 +2442,92 @@ public function jsonSerialize() $a[self::FIELD_DATA_ABSENT_REASON] = $v; } if (null !== ($v = $this->getDate())) { - $a[self::FIELD_DATE] = $v->getValue(); - $a[self::FIELD_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_DATE] = $v; + } } if (null !== ($v = $this->getDeceasedAge())) { - $a[self::FIELD_DECEASED_AGE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DECEASED_AGE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DECEASED_AGE_EXT] = $enc; + } + } else { + $a[self::FIELD_DECEASED_AGE] = $v; + } } if (null !== ($v = $this->getDeceasedBoolean())) { - $a[self::FIELD_DECEASED_BOOLEAN] = $v->getValue(); - $a[self::FIELD_DECEASED_BOOLEAN_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DECEASED_BOOLEAN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DECEASED_BOOLEAN_EXT] = $enc; + } + } else { + $a[self::FIELD_DECEASED_BOOLEAN] = $v; + } } if (null !== ($v = $this->getDeceasedDate())) { - $a[self::FIELD_DECEASED_DATE] = $v->getValue(); - $a[self::FIELD_DECEASED_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DECEASED_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DECEASED_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_DECEASED_DATE] = $v; + } } if (null !== ($v = $this->getDeceasedRange())) { $a[self::FIELD_DECEASED_RANGE] = $v; } if (null !== ($v = $this->getDeceasedString())) { - $a[self::FIELD_DECEASED_STRING] = $v->getValue(); - $a[self::FIELD_DECEASED_STRING_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DECEASED_STRING] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DECEASED_STRING_EXT] = $enc; + } + } else { + $a[self::FIELD_DECEASED_STRING] = $v; + } } if (null !== ($v = $this->getEstimatedAge())) { - $a[self::FIELD_ESTIMATED_AGE] = $v->getValue(); - $a[self::FIELD_ESTIMATED_AGE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ESTIMATED_AGE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ESTIMATED_AGE_EXT] = $enc; + } + } else { + $a[self::FIELD_ESTIMATED_AGE] = $v; + } } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if ([] !== ($vs = $this->getInstantiatesCanonical())) { $a[self::FIELD_INSTANTIATES_CANONICAL] = []; @@ -2363,8 +2535,17 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_INSTANTIATES_CANONICAL][] = $v->getValue(); - $a[self::FIELD_INSTANTIATES_CANONICAL_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_INSTANTIATES_CANONICAL][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_INSTANTIATES_CANONICAL_EXT][] = $enc; + } else { + $a[self::FIELD_INSTANTIATES_CANONICAL_EXT][] = null; + } + } else { + $a[self::FIELD_INSTANTIATES_CANONICAL][] = $v; + } } } if ([] !== ($vs = $this->getInstantiatesUri())) { @@ -2373,13 +2554,29 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_INSTANTIATES_URI][] = $v->getValue(); - $a[self::FIELD_INSTANTIATES_URI_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_INSTANTIATES_URI][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_INSTANTIATES_URI_EXT][] = $enc; + } else { + $a[self::FIELD_INSTANTIATES_URI_EXT][] = null; + } + } else { + $a[self::FIELD_INSTANTIATES_URI][] = $v; + } } } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if ([] !== ($vs = $this->getNote())) { $a[self::FIELD_NOTE] = $vs; @@ -2400,7 +2597,15 @@ public function jsonSerialize() $a[self::FIELD_SEX] = $v; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRFlag.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRFlag.php index 1f2bc5f4e9..abe37dea8c 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRFlag.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRFlag.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -83,10 +83,6 @@ class FHIRFlag extends FHIRDomainResource implements PHPFHIRContainedTypeInterfa { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_FLAG; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_AUTHOR = 'author'; const FIELD_CATEGORY = 'category'; const FIELD_CODE = 'code'; @@ -195,6 +191,9 @@ class FHIRFlag extends FHIRDomainResource implements PHPFHIRContainedTypeInterfa */ protected $subject = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRFlag Constructor * @param null|array $data @@ -221,6 +220,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CATEGORY])) { if (is_array($data[self::FIELD_CATEGORY])) { foreach($data[self::FIELD_CATEGORY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addCategory($v); } else { @@ -253,17 +255,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -282,8 +291,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRFlagStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRFlagStatus([FHIRFlagStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRFlagStatus([FHIRFlagStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRFlagStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRFlagStatus($data[self::FIELD_STATUS])); } @@ -748,11 +761,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getAuthor())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AUTHOR, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getCategory())) { foreach($vs as $v) { if (null === $v) { @@ -765,11 +776,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getEncounter())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ENCOUNTER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -782,11 +791,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSubject())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBJECT, null, $v->_getFHIRXMLNamespace())); } @@ -812,13 +819,37 @@ public function jsonSerialize() $a[self::FIELD_ENCOUNTER] = $v; } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if (null !== ($v = $this->getPeriod())) { $a[self::FIELD_PERIOD] = $v; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getSubject())) { $a[self::FIELD_SUBJECT] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRGoal.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRGoal.php index 9cf9520caf..3eb6f61ff8 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRGoal.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRGoal.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -88,10 +88,6 @@ class FHIRGoal extends FHIRDomainResource implements PHPFHIRContainedTypeInterfa { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_GOAL; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ACHIEVEMENT_STATUS = 'achievementStatus'; const FIELD_ADDRESSES = 'addresses'; const FIELD_CATEGORY = 'category'; @@ -323,6 +319,9 @@ class FHIRGoal extends FHIRDomainResource implements PHPFHIRContainedTypeInterfa */ protected $target = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRGoal Constructor * @param null|array $data @@ -349,6 +348,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ADDRESSES])) { if (is_array($data[self::FIELD_ADDRESSES])) { foreach($data[self::FIELD_ADDRESSES] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addAddresses($v); } else { @@ -364,6 +366,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CATEGORY])) { if (is_array($data[self::FIELD_CATEGORY])) { foreach($data[self::FIELD_CATEGORY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addCategory($v); } else { @@ -396,17 +401,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -418,8 +430,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_LIFECYCLE_STATUS] instanceof FHIRGoalLifecycleStatus) { $this->setLifecycleStatus($data[self::FIELD_LIFECYCLE_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_LIFECYCLE_STATUS])) { - $this->setLifecycleStatus(new FHIRGoalLifecycleStatus([FHIRGoalLifecycleStatus::FIELD_VALUE => $data[self::FIELD_LIFECYCLE_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_LIFECYCLE_STATUS])) { + $this->setLifecycleStatus(new FHIRGoalLifecycleStatus([FHIRGoalLifecycleStatus::FIELD_VALUE => $data[self::FIELD_LIFECYCLE_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_LIFECYCLE_STATUS])) { + $this->setLifecycleStatus(new FHIRGoalLifecycleStatus(array_merge($ext, $data[self::FIELD_LIFECYCLE_STATUS]))); + } } else { $this->setLifecycleStatus(new FHIRGoalLifecycleStatus($data[self::FIELD_LIFECYCLE_STATUS])); } @@ -427,6 +443,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_NOTE])) { if (is_array($data[self::FIELD_NOTE])) { foreach($data[self::FIELD_NOTE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRAnnotation) { $this->addNote($v); } else { @@ -442,6 +461,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_OUTCOME_CODE])) { if (is_array($data[self::FIELD_OUTCOME_CODE])) { foreach($data[self::FIELD_OUTCOME_CODE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addOutcomeCode($v); } else { @@ -457,6 +479,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_OUTCOME_REFERENCE])) { if (is_array($data[self::FIELD_OUTCOME_REFERENCE])) { foreach($data[self::FIELD_OUTCOME_REFERENCE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addOutcomeReference($v); } else { @@ -489,8 +514,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_START_DATE] instanceof FHIRDate) { $this->setStartDate($data[self::FIELD_START_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_START_DATE])) { - $this->setStartDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_START_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_START_DATE])) { + $this->setStartDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_START_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_START_DATE])) { + $this->setStartDate(new FHIRDate(array_merge($ext, $data[self::FIELD_START_DATE]))); + } } else { $this->setStartDate(new FHIRDate($data[self::FIELD_START_DATE])); } @@ -501,8 +530,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS_DATE] instanceof FHIRDate) { $this->setStatusDate($data[self::FIELD_STATUS_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS_DATE])) { - $this->setStatusDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_STATUS_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS_DATE])) { + $this->setStatusDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_STATUS_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS_DATE])) { + $this->setStatusDate(new FHIRDate(array_merge($ext, $data[self::FIELD_STATUS_DATE]))); + } } else { $this->setStatusDate(new FHIRDate($data[self::FIELD_STATUS_DATE])); } @@ -513,8 +546,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS_REASON] instanceof FHIRString) { $this->setStatusReason($data[self::FIELD_STATUS_REASON]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS_REASON])) { - $this->setStatusReason(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_STATUS_REASON]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS_REASON])) { + $this->setStatusReason(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_STATUS_REASON]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS_REASON])) { + $this->setStatusReason(new FHIRString(array_merge($ext, $data[self::FIELD_STATUS_REASON]))); + } } else { $this->setStatusReason(new FHIRString($data[self::FIELD_STATUS_REASON])); } @@ -529,6 +566,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_TARGET])) { if (is_array($data[self::FIELD_TARGET])) { foreach($data[self::FIELD_TARGET] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRGoalTarget) { $this->addTarget($v); } else { @@ -1490,11 +1530,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getAchievementStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ACHIEVEMENT_STATUS, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getAddresses())) { foreach($vs as $v) { if (null === $v) { @@ -1516,11 +1554,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESCRIPTION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getExpressedBy())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EXPRESSED_BY, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -1533,7 +1569,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getLifecycleStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_LIFECYCLE_STATUS, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getNote())) { foreach($vs as $v) { if (null === $v) { @@ -1564,7 +1599,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getPriority())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PRIORITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStartCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_START_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } @@ -1577,11 +1611,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getStatusReason())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS_REASON, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSubject())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBJECT, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getTarget())) { foreach($vs as $v) { if (null === $v) { @@ -1590,6 +1622,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_TARGET, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } @@ -1615,10 +1648,34 @@ public function jsonSerialize() $a[self::FIELD_EXPRESSED_BY] = $v; } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if (null !== ($v = $this->getLifecycleStatus())) { - $a[self::FIELD_LIFECYCLE_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_LIFECYCLE_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_LIFECYCLE_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_LIFECYCLE_STATUS] = $v; + } } if ([] !== ($vs = $this->getNote())) { $a[self::FIELD_NOTE] = $vs; @@ -1636,16 +1693,37 @@ public function jsonSerialize() $a[self::FIELD_START_CODEABLE_CONCEPT] = $v; } if (null !== ($v = $this->getStartDate())) { - $a[self::FIELD_START_DATE] = $v->getValue(); - $a[self::FIELD_START_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_START_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_START_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_START_DATE] = $v; + } } if (null !== ($v = $this->getStatusDate())) { - $a[self::FIELD_STATUS_DATE] = $v->getValue(); - $a[self::FIELD_STATUS_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS_DATE] = $v; + } } if (null !== ($v = $this->getStatusReason())) { - $a[self::FIELD_STATUS_REASON] = $v->getValue(); - $a[self::FIELD_STATUS_REASON_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS_REASON] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_REASON_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS_REASON] = $v; + } } if (null !== ($v = $this->getSubject())) { $a[self::FIELD_SUBJECT] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRGraphDefinition.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRGraphDefinition.php index 57d1fa9bbc..ae5bd1d79a 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRGraphDefinition.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRGraphDefinition.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -92,10 +92,6 @@ class FHIRGraphDefinition extends FHIRDomainResource implements PHPFHIRContained { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_GRAPH_DEFINITION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CONTACT = 'contact'; const FIELD_DATE = 'date'; const FIELD_DATE_EXT = '_date'; @@ -328,6 +324,9 @@ class FHIRGraphDefinition extends FHIRDomainResource implements PHPFHIRContained */ protected $version = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRGraphDefinition Constructor * @param null|array $data @@ -347,6 +346,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CONTACT])) { if (is_array($data[self::FIELD_CONTACT])) { foreach($data[self::FIELD_CONTACT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContactDetail) { $this->addContact($v); } else { @@ -365,8 +367,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATE] instanceof FHIRDateTime) { $this->setDate($data[self::FIELD_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_DATE])) { - $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime(array_merge($ext, $data[self::FIELD_DATE]))); + } } else { $this->setDate(new FHIRDateTime($data[self::FIELD_DATE])); } @@ -377,8 +383,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRMarkdown) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRMarkdown($data[self::FIELD_DESCRIPTION])); } @@ -389,8 +399,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EXPERIMENTAL] instanceof FHIRBoolean) { $this->setExperimental($data[self::FIELD_EXPERIMENTAL]); - } elseif ($ext && is_scalar($data[self::FIELD_EXPERIMENTAL])) { - $this->setExperimental(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_EXPERIMENTAL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EXPERIMENTAL])) { + $this->setExperimental(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_EXPERIMENTAL]] + $ext)); + } else if (is_array($data[self::FIELD_EXPERIMENTAL])) { + $this->setExperimental(new FHIRBoolean(array_merge($ext, $data[self::FIELD_EXPERIMENTAL]))); + } } else { $this->setExperimental(new FHIRBoolean($data[self::FIELD_EXPERIMENTAL])); } @@ -398,6 +412,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_JURISDICTION])) { if (is_array($data[self::FIELD_JURISDICTION])) { foreach($data[self::FIELD_JURISDICTION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addJurisdiction($v); } else { @@ -413,6 +430,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_LINK])) { if (is_array($data[self::FIELD_LINK])) { foreach($data[self::FIELD_LINK] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRGraphDefinitionLink) { $this->addLink($v); } else { @@ -431,8 +451,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -443,8 +467,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PROFILE] instanceof FHIRCanonical) { $this->setProfile($data[self::FIELD_PROFILE]); - } elseif ($ext && is_scalar($data[self::FIELD_PROFILE])) { - $this->setProfile(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $data[self::FIELD_PROFILE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PROFILE])) { + $this->setProfile(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $data[self::FIELD_PROFILE]] + $ext)); + } else if (is_array($data[self::FIELD_PROFILE])) { + $this->setProfile(new FHIRCanonical(array_merge($ext, $data[self::FIELD_PROFILE]))); + } } else { $this->setProfile(new FHIRCanonical($data[self::FIELD_PROFILE])); } @@ -455,8 +483,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PUBLISHER] instanceof FHIRString) { $this->setPublisher($data[self::FIELD_PUBLISHER]); - } elseif ($ext && is_scalar($data[self::FIELD_PUBLISHER])) { - $this->setPublisher(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PUBLISHER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PUBLISHER])) { + $this->setPublisher(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PUBLISHER]] + $ext)); + } else if (is_array($data[self::FIELD_PUBLISHER])) { + $this->setPublisher(new FHIRString(array_merge($ext, $data[self::FIELD_PUBLISHER]))); + } } else { $this->setPublisher(new FHIRString($data[self::FIELD_PUBLISHER])); } @@ -467,8 +499,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PURPOSE] instanceof FHIRMarkdown) { $this->setPurpose($data[self::FIELD_PURPOSE]); - } elseif ($ext && is_scalar($data[self::FIELD_PURPOSE])) { - $this->setPurpose(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_PURPOSE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PURPOSE])) { + $this->setPurpose(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_PURPOSE]] + $ext)); + } else if (is_array($data[self::FIELD_PURPOSE])) { + $this->setPurpose(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_PURPOSE]))); + } } else { $this->setPurpose(new FHIRMarkdown($data[self::FIELD_PURPOSE])); } @@ -479,8 +515,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_START] instanceof FHIRCode) { $this->setStart($data[self::FIELD_START]); - } elseif ($ext && is_scalar($data[self::FIELD_START])) { - $this->setStart(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_START]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_START])) { + $this->setStart(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_START]] + $ext)); + } else if (is_array($data[self::FIELD_START])) { + $this->setStart(new FHIRCode(array_merge($ext, $data[self::FIELD_START]))); + } } else { $this->setStart(new FHIRCode($data[self::FIELD_START])); } @@ -491,8 +531,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRPublicationStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRPublicationStatus([FHIRPublicationStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRPublicationStatus([FHIRPublicationStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRPublicationStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRPublicationStatus($data[self::FIELD_STATUS])); } @@ -503,8 +547,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_URL] instanceof FHIRUri) { $this->setUrl($data[self::FIELD_URL]); - } elseif ($ext && is_scalar($data[self::FIELD_URL])) { - $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } else if (is_array($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri(array_merge($ext, $data[self::FIELD_URL]))); + } } else { $this->setUrl(new FHIRUri($data[self::FIELD_URL])); } @@ -512,6 +560,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_USE_CONTEXT])) { if (is_array($data[self::FIELD_USE_CONTEXT])) { foreach($data[self::FIELD_USE_CONTEXT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRUsageContext) { $this->addUseContext($v); } else { @@ -530,8 +581,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VERSION] instanceof FHIRString) { $this->setVersion($data[self::FIELD_VERSION]); - } elseif ($ext && is_scalar($data[self::FIELD_VERSION])) { - $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } else if (is_array($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString(array_merge($ext, $data[self::FIELD_VERSION]))); + } } else { $this->setVersion(new FHIRString($data[self::FIELD_VERSION])); } @@ -1452,7 +1507,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getContact())) { foreach($vs as $v) { if (null === $v) { @@ -1461,6 +1515,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_CONTACT, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DATE, null, $v->_getFHIRXMLNamespace())); } @@ -1470,7 +1525,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getExperimental())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EXPERIMENTAL, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getJurisdiction())) { foreach($vs as $v) { if (null === $v) { @@ -1488,6 +1542,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_LINK, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NAME, null, $v->_getFHIRXMLNamespace())); } @@ -1503,14 +1558,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getStart())) { $v->xmlSerialize($sxe->addChild(self::FIELD_START, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getUrl())) { $v->xmlSerialize($sxe->addChild(self::FIELD_URL, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getUseContext())) { foreach($vs as $v) { if (null === $v) { @@ -1519,6 +1572,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_USE_CONTEXT, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getVersion())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VERSION, null, $v->_getFHIRXMLNamespace())); } @@ -1535,16 +1589,37 @@ public function jsonSerialize() $a[self::FIELD_CONTACT] = $vs; } if (null !== ($v = $this->getDate())) { - $a[self::FIELD_DATE] = $v->getValue(); - $a[self::FIELD_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_DATE] = $v; + } } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if (null !== ($v = $this->getExperimental())) { - $a[self::FIELD_EXPERIMENTAL] = $v->getValue(); - $a[self::FIELD_EXPERIMENTAL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EXPERIMENTAL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EXPERIMENTAL_EXT] = $enc; + } + } else { + $a[self::FIELD_EXPERIMENTAL] = $v; + } } if ([] !== ($vs = $this->getJurisdiction())) { $a[self::FIELD_JURISDICTION] = $vs; @@ -1553,38 +1628,95 @@ public function jsonSerialize() $a[self::FIELD_LINK] = $vs; } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if (null !== ($v = $this->getProfile())) { - $a[self::FIELD_PROFILE] = $v->getValue(); - $a[self::FIELD_PROFILE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PROFILE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PROFILE_EXT] = $enc; + } + } else { + $a[self::FIELD_PROFILE] = $v; + } } if (null !== ($v = $this->getPublisher())) { - $a[self::FIELD_PUBLISHER] = $v->getValue(); - $a[self::FIELD_PUBLISHER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PUBLISHER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PUBLISHER_EXT] = $enc; + } + } else { + $a[self::FIELD_PUBLISHER] = $v; + } } if (null !== ($v = $this->getPurpose())) { - $a[self::FIELD_PURPOSE] = $v->getValue(); - $a[self::FIELD_PURPOSE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PURPOSE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PURPOSE_EXT] = $enc; + } + } else { + $a[self::FIELD_PURPOSE] = $v; + } } if (null !== ($v = $this->getStart())) { - $a[self::FIELD_START] = $v->getValue(); - $a[self::FIELD_START_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_START] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_START_EXT] = $enc; + } + } else { + $a[self::FIELD_START] = $v; + } } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getUrl())) { - $a[self::FIELD_URL] = $v->getValue(); - $a[self::FIELD_URL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_URL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_URL_EXT] = $enc; + } + } else { + $a[self::FIELD_URL] = $v; + } } if ([] !== ($vs = $this->getUseContext())) { $a[self::FIELD_USE_CONTEXT] = $vs; } if (null !== ($v = $this->getVersion())) { - $a[self::FIELD_VERSION] = $v->getValue(); - $a[self::FIELD_VERSION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VERSION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VERSION_EXT] = $enc; + } + } else { + $a[self::FIELD_VERSION] = $v; + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRGroup.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRGroup.php index 970130b940..09ac9a267b 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRGroup.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRGroup.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -90,10 +90,6 @@ class FHIRGroup extends FHIRDomainResource implements PHPFHIRContainedTypeInterf { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_GROUP; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ACTIVE = 'active'; const FIELD_ACTIVE_EXT = '_active'; const FIELD_ACTUAL = 'actual'; @@ -226,6 +222,9 @@ class FHIRGroup extends FHIRDomainResource implements PHPFHIRContainedTypeInterf */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRGroup Constructor * @param null|array $data @@ -248,8 +247,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ACTIVE] instanceof FHIRBoolean) { $this->setActive($data[self::FIELD_ACTIVE]); - } elseif ($ext && is_scalar($data[self::FIELD_ACTIVE])) { - $this->setActive(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_ACTIVE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ACTIVE])) { + $this->setActive(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_ACTIVE]] + $ext)); + } else if (is_array($data[self::FIELD_ACTIVE])) { + $this->setActive(new FHIRBoolean(array_merge($ext, $data[self::FIELD_ACTIVE]))); + } } else { $this->setActive(new FHIRBoolean($data[self::FIELD_ACTIVE])); } @@ -260,8 +263,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ACTUAL] instanceof FHIRBoolean) { $this->setActual($data[self::FIELD_ACTUAL]); - } elseif ($ext && is_scalar($data[self::FIELD_ACTUAL])) { - $this->setActual(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_ACTUAL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ACTUAL])) { + $this->setActual(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_ACTUAL]] + $ext)); + } else if (is_array($data[self::FIELD_ACTUAL])) { + $this->setActual(new FHIRBoolean(array_merge($ext, $data[self::FIELD_ACTUAL]))); + } } else { $this->setActual(new FHIRBoolean($data[self::FIELD_ACTUAL])); } @@ -269,6 +276,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CHARACTERISTIC])) { if (is_array($data[self::FIELD_CHARACTERISTIC])) { foreach($data[self::FIELD_CHARACTERISTIC] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRGroupCharacteristic) { $this->addCharacteristic($v); } else { @@ -294,17 +304,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -320,6 +337,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_MEMBER])) { if (is_array($data[self::FIELD_MEMBER])) { foreach($data[self::FIELD_MEMBER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRGroupMember) { $this->addMember($v); } else { @@ -338,8 +358,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -350,8 +374,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_QUANTITY] instanceof FHIRUnsignedInt) { $this->setQuantity($data[self::FIELD_QUANTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_QUANTITY])) { - $this->setQuantity(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_QUANTITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_QUANTITY])) { + $this->setQuantity(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_QUANTITY])) { + $this->setQuantity(new FHIRUnsignedInt(array_merge($ext, $data[self::FIELD_QUANTITY]))); + } } else { $this->setQuantity(new FHIRUnsignedInt($data[self::FIELD_QUANTITY])); } @@ -362,8 +390,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TYPE] instanceof FHIRGroupType) { $this->setType($data[self::FIELD_TYPE]); - } elseif ($ext && is_scalar($data[self::FIELD_TYPE])) { - $this->setType(new FHIRGroupType([FHIRGroupType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TYPE])) { + $this->setType(new FHIRGroupType([FHIRGroupType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } else if (is_array($data[self::FIELD_TYPE])) { + $this->setType(new FHIRGroupType(array_merge($ext, $data[self::FIELD_TYPE]))); + } } else { $this->setType(new FHIRGroupType($data[self::FIELD_TYPE])); } @@ -954,7 +986,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getActual())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ACTUAL, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getCharacteristic())) { foreach($vs as $v) { if (null === $v) { @@ -967,7 +998,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -980,7 +1010,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getManagingEntity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MANAGING_ENTITY, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getMember())) { foreach($vs as $v) { if (null === $v) { @@ -989,13 +1018,13 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_MEMBER, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NAME, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_QUANTITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -1009,12 +1038,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getActive())) { - $a[self::FIELD_ACTIVE] = $v->getValue(); - $a[self::FIELD_ACTIVE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ACTIVE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ACTIVE_EXT] = $enc; + } + } else { + $a[self::FIELD_ACTIVE] = $v; + } } if (null !== ($v = $this->getActual())) { - $a[self::FIELD_ACTUAL] = $v->getValue(); - $a[self::FIELD_ACTUAL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ACTUAL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ACTUAL_EXT] = $enc; + } + } else { + $a[self::FIELD_ACTUAL] = $v; + } } if ([] !== ($vs = $this->getCharacteristic())) { $a[self::FIELD_CHARACTERISTIC] = $vs; @@ -1023,7 +1066,23 @@ public function jsonSerialize() $a[self::FIELD_CODE] = $v; } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if (null !== ($v = $this->getManagingEntity())) { $a[self::FIELD_MANAGING_ENTITY] = $v; @@ -1032,15 +1091,37 @@ public function jsonSerialize() $a[self::FIELD_MEMBER] = $vs; } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if (null !== ($v = $this->getQuantity())) { - $a[self::FIELD_QUANTITY] = $v->getValue(); - $a[self::FIELD_QUANTITY_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_QUANTITY] = $v; + } } if (null !== ($v = $this->getType())) { - $a[self::FIELD_TYPE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TYPE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TYPE_EXT] = $enc; + } + } else { + $a[self::FIELD_TYPE] = $v; + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRGuidanceResponse.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRGuidanceResponse.php index 4e2ef3c013..5406c54ed2 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRGuidanceResponse.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRGuidanceResponse.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -89,10 +89,6 @@ class FHIRGuidanceResponse extends FHIRDomainResource implements PHPFHIRContaine { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_GUIDANCE_RESPONSE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DATA_REQUIREMENT = 'dataRequirement'; const FIELD_ENCOUNTER = 'encounter'; const FIELD_EVALUATION_MESSAGE = 'evaluationMessage'; @@ -338,6 +334,9 @@ class FHIRGuidanceResponse extends FHIRDomainResource implements PHPFHIRContaine */ protected $subject = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRGuidanceResponse Constructor * @param null|array $data @@ -357,6 +356,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_DATA_REQUIREMENT])) { if (is_array($data[self::FIELD_DATA_REQUIREMENT])) { foreach($data[self::FIELD_DATA_REQUIREMENT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRDataRequirement) { $this->addDataRequirement($v); } else { @@ -379,6 +381,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_EVALUATION_MESSAGE])) { if (is_array($data[self::FIELD_EVALUATION_MESSAGE])) { foreach($data[self::FIELD_EVALUATION_MESSAGE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addEvaluationMessage($v); } else { @@ -397,17 +402,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -419,8 +431,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MODULE_CANONICAL] instanceof FHIRCanonical) { $this->setModuleCanonical($data[self::FIELD_MODULE_CANONICAL]); - } elseif ($ext && is_scalar($data[self::FIELD_MODULE_CANONICAL])) { - $this->setModuleCanonical(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $data[self::FIELD_MODULE_CANONICAL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MODULE_CANONICAL])) { + $this->setModuleCanonical(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $data[self::FIELD_MODULE_CANONICAL]] + $ext)); + } else if (is_array($data[self::FIELD_MODULE_CANONICAL])) { + $this->setModuleCanonical(new FHIRCanonical(array_merge($ext, $data[self::FIELD_MODULE_CANONICAL]))); + } } else { $this->setModuleCanonical(new FHIRCanonical($data[self::FIELD_MODULE_CANONICAL])); } @@ -438,8 +454,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MODULE_URI] instanceof FHIRUri) { $this->setModuleUri($data[self::FIELD_MODULE_URI]); - } elseif ($ext && is_scalar($data[self::FIELD_MODULE_URI])) { - $this->setModuleUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_MODULE_URI]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MODULE_URI])) { + $this->setModuleUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_MODULE_URI]] + $ext)); + } else if (is_array($data[self::FIELD_MODULE_URI])) { + $this->setModuleUri(new FHIRUri(array_merge($ext, $data[self::FIELD_MODULE_URI]))); + } } else { $this->setModuleUri(new FHIRUri($data[self::FIELD_MODULE_URI])); } @@ -447,6 +467,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_NOTE])) { if (is_array($data[self::FIELD_NOTE])) { foreach($data[self::FIELD_NOTE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRAnnotation) { $this->addNote($v); } else { @@ -465,8 +488,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_OCCURRENCE_DATE_TIME] instanceof FHIRDateTime) { $this->setOccurrenceDateTime($data[self::FIELD_OCCURRENCE_DATE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_OCCURRENCE_DATE_TIME])) { - $this->setOccurrenceDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_OCCURRENCE_DATE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_OCCURRENCE_DATE_TIME])) { + $this->setOccurrenceDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_OCCURRENCE_DATE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_OCCURRENCE_DATE_TIME])) { + $this->setOccurrenceDateTime(new FHIRDateTime(array_merge($ext, $data[self::FIELD_OCCURRENCE_DATE_TIME]))); + } } else { $this->setOccurrenceDateTime(new FHIRDateTime($data[self::FIELD_OCCURRENCE_DATE_TIME])); } @@ -488,6 +515,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REASON_CODE])) { if (is_array($data[self::FIELD_REASON_CODE])) { foreach($data[self::FIELD_REASON_CODE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addReasonCode($v); } else { @@ -503,6 +533,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REASON_REFERENCE])) { if (is_array($data[self::FIELD_REASON_REFERENCE])) { foreach($data[self::FIELD_REASON_REFERENCE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addReasonReference($v); } else { @@ -521,8 +554,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_REQUEST_IDENTIFIER] instanceof FHIRIdentifier) { $this->setRequestIdentifier($data[self::FIELD_REQUEST_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_REQUEST_IDENTIFIER])) { - $this->setRequestIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_REQUEST_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_REQUEST_IDENTIFIER])) { + $this->setRequestIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_REQUEST_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_REQUEST_IDENTIFIER])) { + $this->setRequestIdentifier(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_REQUEST_IDENTIFIER]))); + } } else { $this->setRequestIdentifier(new FHIRIdentifier($data[self::FIELD_REQUEST_IDENTIFIER])); } @@ -540,8 +577,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRGuidanceResponseStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRGuidanceResponseStatus([FHIRGuidanceResponseStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRGuidanceResponseStatus([FHIRGuidanceResponseStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRGuidanceResponseStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRGuidanceResponseStatus($data[self::FIELD_STATUS])); } @@ -1504,7 +1545,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getDataRequirement())) { foreach($vs as $v) { if (null === $v) { @@ -1517,7 +1557,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getEncounter())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ENCOUNTER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getEvaluationMessage())) { foreach($vs as $v) { if (null === $v) { @@ -1535,17 +1574,16 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getModuleCanonical())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MODULE_CANONICAL, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getModuleCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MODULE_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getModuleUri())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MODULE_URI, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getNote())) { foreach($vs as $v) { if (null === $v) { @@ -1554,18 +1592,16 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_NOTE, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getOccurrenceDateTime())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OCCURRENCE_DATE_TIME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOutputParameters())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OUTPUT_PARAMETERS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPerformer())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PERFORMER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getReasonCode())) { foreach($vs as $v) { if (null === $v) { @@ -1587,15 +1623,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getRequestIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REQUEST_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getResult())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RESULT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSubject())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBJECT, null, $v->_getFHIRXMLNamespace())); } @@ -1618,25 +1651,62 @@ public function jsonSerialize() $a[self::FIELD_EVALUATION_MESSAGE] = $vs; } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if (null !== ($v = $this->getModuleCanonical())) { - $a[self::FIELD_MODULE_CANONICAL] = $v->getValue(); - $a[self::FIELD_MODULE_CANONICAL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MODULE_CANONICAL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MODULE_CANONICAL_EXT] = $enc; + } + } else { + $a[self::FIELD_MODULE_CANONICAL] = $v; + } } if (null !== ($v = $this->getModuleCodeableConcept())) { $a[self::FIELD_MODULE_CODEABLE_CONCEPT] = $v; } if (null !== ($v = $this->getModuleUri())) { - $a[self::FIELD_MODULE_URI] = $v->getValue(); - $a[self::FIELD_MODULE_URI_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MODULE_URI] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MODULE_URI_EXT] = $enc; + } + } else { + $a[self::FIELD_MODULE_URI] = $v; + } } if ([] !== ($vs = $this->getNote())) { $a[self::FIELD_NOTE] = $vs; } if (null !== ($v = $this->getOccurrenceDateTime())) { - $a[self::FIELD_OCCURRENCE_DATE_TIME] = $v->getValue(); - $a[self::FIELD_OCCURRENCE_DATE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_OCCURRENCE_DATE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_OCCURRENCE_DATE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_OCCURRENCE_DATE_TIME] = $v; + } } if (null !== ($v = $this->getOutputParameters())) { $a[self::FIELD_OUTPUT_PARAMETERS] = $v; @@ -1651,13 +1721,29 @@ public function jsonSerialize() $a[self::FIELD_REASON_REFERENCE] = $vs; } if (null !== ($v = $this->getRequestIdentifier())) { - $a[self::FIELD_REQUEST_IDENTIFIER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_REQUEST_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_REQUEST_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_REQUEST_IDENTIFIER] = $v; + } } if (null !== ($v = $this->getResult())) { $a[self::FIELD_RESULT] = $v; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getSubject())) { $a[self::FIELD_SUBJECT] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRHealthcareService.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRHealthcareService.php index cc72a3e99d..3e3bb61d5c 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRHealthcareService.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRHealthcareService.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -89,10 +89,6 @@ class FHIRHealthcareService extends FHIRDomainResource implements PHPFHIRContain { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_HEALTHCARE_SERVICE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ACTIVE = 'active'; const FIELD_ACTIVE_EXT = '_active'; const FIELD_APPOINTMENT_REQUIRED = 'appointmentRequired'; @@ -416,6 +412,9 @@ class FHIRHealthcareService extends FHIRDomainResource implements PHPFHIRContain */ protected $type = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRHealthcareService Constructor * @param null|array $data @@ -438,8 +437,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ACTIVE] instanceof FHIRBoolean) { $this->setActive($data[self::FIELD_ACTIVE]); - } elseif ($ext && is_scalar($data[self::FIELD_ACTIVE])) { - $this->setActive(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_ACTIVE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ACTIVE])) { + $this->setActive(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_ACTIVE]] + $ext)); + } else if (is_array($data[self::FIELD_ACTIVE])) { + $this->setActive(new FHIRBoolean(array_merge($ext, $data[self::FIELD_ACTIVE]))); + } } else { $this->setActive(new FHIRBoolean($data[self::FIELD_ACTIVE])); } @@ -450,8 +453,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_APPOINTMENT_REQUIRED] instanceof FHIRBoolean) { $this->setAppointmentRequired($data[self::FIELD_APPOINTMENT_REQUIRED]); - } elseif ($ext && is_scalar($data[self::FIELD_APPOINTMENT_REQUIRED])) { - $this->setAppointmentRequired(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_APPOINTMENT_REQUIRED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_APPOINTMENT_REQUIRED])) { + $this->setAppointmentRequired(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_APPOINTMENT_REQUIRED]] + $ext)); + } else if (is_array($data[self::FIELD_APPOINTMENT_REQUIRED])) { + $this->setAppointmentRequired(new FHIRBoolean(array_merge($ext, $data[self::FIELD_APPOINTMENT_REQUIRED]))); + } } else { $this->setAppointmentRequired(new FHIRBoolean($data[self::FIELD_APPOINTMENT_REQUIRED])); } @@ -462,8 +469,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_AVAILABILITY_EXCEPTIONS] instanceof FHIRString) { $this->setAvailabilityExceptions($data[self::FIELD_AVAILABILITY_EXCEPTIONS]); - } elseif ($ext && is_scalar($data[self::FIELD_AVAILABILITY_EXCEPTIONS])) { - $this->setAvailabilityExceptions(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_AVAILABILITY_EXCEPTIONS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_AVAILABILITY_EXCEPTIONS])) { + $this->setAvailabilityExceptions(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_AVAILABILITY_EXCEPTIONS]] + $ext)); + } else if (is_array($data[self::FIELD_AVAILABILITY_EXCEPTIONS])) { + $this->setAvailabilityExceptions(new FHIRString(array_merge($ext, $data[self::FIELD_AVAILABILITY_EXCEPTIONS]))); + } } else { $this->setAvailabilityExceptions(new FHIRString($data[self::FIELD_AVAILABILITY_EXCEPTIONS])); } @@ -471,6 +482,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_AVAILABLE_TIME])) { if (is_array($data[self::FIELD_AVAILABLE_TIME])) { foreach($data[self::FIELD_AVAILABLE_TIME] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRHealthcareServiceAvailableTime) { $this->addAvailableTime($v); } else { @@ -486,6 +500,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CATEGORY])) { if (is_array($data[self::FIELD_CATEGORY])) { foreach($data[self::FIELD_CATEGORY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addCategory($v); } else { @@ -501,6 +518,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CHARACTERISTIC])) { if (is_array($data[self::FIELD_CHARACTERISTIC])) { foreach($data[self::FIELD_CHARACTERISTIC] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addCharacteristic($v); } else { @@ -519,8 +539,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_COMMENT] instanceof FHIRString) { $this->setComment($data[self::FIELD_COMMENT]); - } elseif ($ext && is_scalar($data[self::FIELD_COMMENT])) { - $this->setComment(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_COMMENT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_COMMENT])) { + $this->setComment(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_COMMENT]] + $ext)); + } else if (is_array($data[self::FIELD_COMMENT])) { + $this->setComment(new FHIRString(array_merge($ext, $data[self::FIELD_COMMENT]))); + } } else { $this->setComment(new FHIRString($data[self::FIELD_COMMENT])); } @@ -528,6 +552,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_COMMUNICATION])) { if (is_array($data[self::FIELD_COMMUNICATION])) { foreach($data[self::FIELD_COMMUNICATION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addCommunication($v); } else { @@ -543,6 +570,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_COVERAGE_AREA])) { if (is_array($data[self::FIELD_COVERAGE_AREA])) { foreach($data[self::FIELD_COVERAGE_AREA] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addCoverageArea($v); } else { @@ -558,6 +588,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ELIGIBILITY])) { if (is_array($data[self::FIELD_ELIGIBILITY])) { foreach($data[self::FIELD_ELIGIBILITY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRHealthcareServiceEligibility) { $this->addEligibility($v); } else { @@ -573,6 +606,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ENDPOINT])) { if (is_array($data[self::FIELD_ENDPOINT])) { foreach($data[self::FIELD_ENDPOINT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addEndpoint($v); } else { @@ -591,8 +627,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EXTRA_DETAILS] instanceof FHIRMarkdown) { $this->setExtraDetails($data[self::FIELD_EXTRA_DETAILS]); - } elseif ($ext && is_scalar($data[self::FIELD_EXTRA_DETAILS])) { - $this->setExtraDetails(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_EXTRA_DETAILS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EXTRA_DETAILS])) { + $this->setExtraDetails(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_EXTRA_DETAILS]] + $ext)); + } else if (is_array($data[self::FIELD_EXTRA_DETAILS])) { + $this->setExtraDetails(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_EXTRA_DETAILS]))); + } } else { $this->setExtraDetails(new FHIRMarkdown($data[self::FIELD_EXTRA_DETAILS])); } @@ -603,17 +643,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -622,6 +669,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_LOCATION])) { if (is_array($data[self::FIELD_LOCATION])) { foreach($data[self::FIELD_LOCATION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addLocation($v); } else { @@ -640,8 +690,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -649,6 +703,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_NOT_AVAILABLE])) { if (is_array($data[self::FIELD_NOT_AVAILABLE])) { foreach($data[self::FIELD_NOT_AVAILABLE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRHealthcareServiceNotAvailable) { $this->addNotAvailable($v); } else { @@ -671,6 +728,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PROGRAM])) { if (is_array($data[self::FIELD_PROGRAM])) { foreach($data[self::FIELD_PROGRAM] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addProgram($v); } else { @@ -693,6 +753,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REFERRAL_METHOD])) { if (is_array($data[self::FIELD_REFERRAL_METHOD])) { foreach($data[self::FIELD_REFERRAL_METHOD] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addReferralMethod($v); } else { @@ -708,6 +771,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SERVICE_PROVISION_CODE])) { if (is_array($data[self::FIELD_SERVICE_PROVISION_CODE])) { foreach($data[self::FIELD_SERVICE_PROVISION_CODE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addServiceProvisionCode($v); } else { @@ -723,6 +789,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SPECIALTY])) { if (is_array($data[self::FIELD_SPECIALTY])) { foreach($data[self::FIELD_SPECIALTY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addSpecialty($v); } else { @@ -741,17 +810,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_TELECOM])) { foreach($data[self::FIELD_TELECOM] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContactPoint) { $this->addTelecom($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addTelecom(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addTelecom(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addTelecom(new FHIRContactPoint(array_merge($v, $ext[$i]))); + } } else { $this->addTelecom(new FHIRContactPoint($v)); } } } elseif ($data[self::FIELD_TELECOM] instanceof FHIRContactPoint) { $this->addTelecom($data[self::FIELD_TELECOM]); - } elseif ($ext && is_scalar($data[self::FIELD_TELECOM])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_TELECOM])) { $this->addTelecom(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $data[self::FIELD_TELECOM]] + $ext)); } else { $this->addTelecom(new FHIRContactPoint($data[self::FIELD_TELECOM])); @@ -760,6 +836,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_TYPE])) { if (is_array($data[self::FIELD_TYPE])) { foreach($data[self::FIELD_TYPE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addType($v); } else { @@ -2262,7 +2341,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getAvailabilityExceptions())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AVAILABILITY_EXCEPTIONS, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getAvailableTime())) { foreach($vs as $v) { if (null === $v) { @@ -2289,10 +2367,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_CHARACTERISTIC, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getComment())) { $v->xmlSerialize($sxe->addChild(self::FIELD_COMMENT, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getCommunication())) { foreach($vs as $v) { if (null === $v) { @@ -2328,10 +2406,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_ENDPOINT, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getExtraDetails())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EXTRA_DETAILS, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -2349,10 +2427,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_LOCATION, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NAME, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getNotAvailable())) { foreach($vs as $v) { if (null === $v) { @@ -2365,7 +2443,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getPhoto())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PHOTO, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getProgram())) { foreach($vs as $v) { if (null === $v) { @@ -2378,7 +2455,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getProvidedBy())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PROVIDED_BY, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getReferralMethod())) { foreach($vs as $v) { if (null === $v) { @@ -2423,6 +2499,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } @@ -2433,16 +2510,37 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getActive())) { - $a[self::FIELD_ACTIVE] = $v->getValue(); - $a[self::FIELD_ACTIVE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ACTIVE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ACTIVE_EXT] = $enc; + } + } else { + $a[self::FIELD_ACTIVE] = $v; + } } if (null !== ($v = $this->getAppointmentRequired())) { - $a[self::FIELD_APPOINTMENT_REQUIRED] = $v->getValue(); - $a[self::FIELD_APPOINTMENT_REQUIRED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_APPOINTMENT_REQUIRED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_APPOINTMENT_REQUIRED_EXT] = $enc; + } + } else { + $a[self::FIELD_APPOINTMENT_REQUIRED] = $v; + } } if (null !== ($v = $this->getAvailabilityExceptions())) { - $a[self::FIELD_AVAILABILITY_EXCEPTIONS] = $v->getValue(); - $a[self::FIELD_AVAILABILITY_EXCEPTIONS_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_AVAILABILITY_EXCEPTIONS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_AVAILABILITY_EXCEPTIONS_EXT] = $enc; + } + } else { + $a[self::FIELD_AVAILABILITY_EXCEPTIONS] = $v; + } } if ([] !== ($vs = $this->getAvailableTime())) { $a[self::FIELD_AVAILABLE_TIME] = $vs; @@ -2454,8 +2552,15 @@ public function jsonSerialize() $a[self::FIELD_CHARACTERISTIC] = $vs; } if (null !== ($v = $this->getComment())) { - $a[self::FIELD_COMMENT] = $v->getValue(); - $a[self::FIELD_COMMENT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_COMMENT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_COMMENT_EXT] = $enc; + } + } else { + $a[self::FIELD_COMMENT] = $v; + } } if ([] !== ($vs = $this->getCommunication())) { $a[self::FIELD_COMMUNICATION] = $vs; @@ -2470,18 +2575,48 @@ public function jsonSerialize() $a[self::FIELD_ENDPOINT] = $vs; } if (null !== ($v = $this->getExtraDetails())) { - $a[self::FIELD_EXTRA_DETAILS] = $v->getValue(); - $a[self::FIELD_EXTRA_DETAILS_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EXTRA_DETAILS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EXTRA_DETAILS_EXT] = $enc; + } + } else { + $a[self::FIELD_EXTRA_DETAILS] = $v; + } } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if ([] !== ($vs = $this->getLocation())) { $a[self::FIELD_LOCATION] = $vs; } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if ([] !== ($vs = $this->getNotAvailable())) { $a[self::FIELD_NOT_AVAILABLE] = $vs; @@ -2505,7 +2640,23 @@ public function jsonSerialize() $a[self::FIELD_SPECIALTY] = $vs; } if ([] !== ($vs = $this->getTelecom())) { - $a[self::FIELD_TELECOM] = $vs; + $a[self::FIELD_TELECOM] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TELECOM][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TELECOM_EXT][] = $enc; + } else { + $a[self::FIELD_TELECOM_EXT][] = null; + } + } else { + $a[self::FIELD_TELECOM][] = $v; + } + } } if ([] !== ($vs = $this->getType())) { $a[self::FIELD_TYPE] = $vs; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRImagingStudy.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRImagingStudy.php index b5c1f30c3c..8ad67a3138 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRImagingStudy.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRImagingStudy.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -92,10 +92,6 @@ class FHIRImagingStudy extends FHIRDomainResource implements PHPFHIRContainedTyp { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_IMAGING_STUDY; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_BASED_ON = 'basedOn'; const FIELD_DESCRIPTION = 'description'; const FIELD_DESCRIPTION_EXT = '_description'; @@ -368,6 +364,9 @@ class FHIRImagingStudy extends FHIRDomainResource implements PHPFHIRContainedTyp */ protected $subject = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRImagingStudy Constructor * @param null|array $data @@ -387,6 +386,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_BASED_ON])) { if (is_array($data[self::FIELD_BASED_ON])) { foreach($data[self::FIELD_BASED_ON] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addBasedOn($v); } else { @@ -405,8 +407,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -421,6 +427,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ENDPOINT])) { if (is_array($data[self::FIELD_ENDPOINT])) { foreach($data[self::FIELD_ENDPOINT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addEndpoint($v); } else { @@ -439,17 +448,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -458,6 +474,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_INTERPRETER])) { if (is_array($data[self::FIELD_INTERPRETER])) { foreach($data[self::FIELD_INTERPRETER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addInterpreter($v); } else { @@ -480,6 +499,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_MODALITY])) { if (is_array($data[self::FIELD_MODALITY])) { foreach($data[self::FIELD_MODALITY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCoding) { $this->addModality($v); } else { @@ -495,6 +517,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_NOTE])) { if (is_array($data[self::FIELD_NOTE])) { foreach($data[self::FIELD_NOTE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRAnnotation) { $this->addNote($v); } else { @@ -513,8 +538,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NUMBER_OF_INSTANCES] instanceof FHIRUnsignedInt) { $this->setNumberOfInstances($data[self::FIELD_NUMBER_OF_INSTANCES]); - } elseif ($ext && is_scalar($data[self::FIELD_NUMBER_OF_INSTANCES])) { - $this->setNumberOfInstances(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_NUMBER_OF_INSTANCES]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NUMBER_OF_INSTANCES])) { + $this->setNumberOfInstances(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_NUMBER_OF_INSTANCES]] + $ext)); + } else if (is_array($data[self::FIELD_NUMBER_OF_INSTANCES])) { + $this->setNumberOfInstances(new FHIRUnsignedInt(array_merge($ext, $data[self::FIELD_NUMBER_OF_INSTANCES]))); + } } else { $this->setNumberOfInstances(new FHIRUnsignedInt($data[self::FIELD_NUMBER_OF_INSTANCES])); } @@ -525,8 +554,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NUMBER_OF_SERIES] instanceof FHIRUnsignedInt) { $this->setNumberOfSeries($data[self::FIELD_NUMBER_OF_SERIES]); - } elseif ($ext && is_scalar($data[self::FIELD_NUMBER_OF_SERIES])) { - $this->setNumberOfSeries(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_NUMBER_OF_SERIES]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NUMBER_OF_SERIES])) { + $this->setNumberOfSeries(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_NUMBER_OF_SERIES]] + $ext)); + } else if (is_array($data[self::FIELD_NUMBER_OF_SERIES])) { + $this->setNumberOfSeries(new FHIRUnsignedInt(array_merge($ext, $data[self::FIELD_NUMBER_OF_SERIES]))); + } } else { $this->setNumberOfSeries(new FHIRUnsignedInt($data[self::FIELD_NUMBER_OF_SERIES])); } @@ -534,6 +567,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PROCEDURE_CODE])) { if (is_array($data[self::FIELD_PROCEDURE_CODE])) { foreach($data[self::FIELD_PROCEDURE_CODE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addProcedureCode($v); } else { @@ -556,6 +592,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REASON_CODE])) { if (is_array($data[self::FIELD_REASON_CODE])) { foreach($data[self::FIELD_REASON_CODE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addReasonCode($v); } else { @@ -571,6 +610,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REASON_REFERENCE])) { if (is_array($data[self::FIELD_REASON_REFERENCE])) { foreach($data[self::FIELD_REASON_REFERENCE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addReasonReference($v); } else { @@ -593,6 +635,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SERIES])) { if (is_array($data[self::FIELD_SERIES])) { foreach($data[self::FIELD_SERIES] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRImagingStudySeries) { $this->addSeries($v); } else { @@ -611,8 +656,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STARTED] instanceof FHIRDateTime) { $this->setStarted($data[self::FIELD_STARTED]); - } elseif ($ext && is_scalar($data[self::FIELD_STARTED])) { - $this->setStarted(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_STARTED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STARTED])) { + $this->setStarted(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_STARTED]] + $ext)); + } else if (is_array($data[self::FIELD_STARTED])) { + $this->setStarted(new FHIRDateTime(array_merge($ext, $data[self::FIELD_STARTED]))); + } } else { $this->setStarted(new FHIRDateTime($data[self::FIELD_STARTED])); } @@ -623,8 +672,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRImagingStudyStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRImagingStudyStatus([FHIRImagingStudyStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRImagingStudyStatus([FHIRImagingStudyStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRImagingStudyStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRImagingStudyStatus($data[self::FIELD_STATUS])); } @@ -1794,7 +1847,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getBasedOn())) { foreach($vs as $v) { if (null === $v) { @@ -1803,14 +1855,13 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_BASED_ON, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getDescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESCRIPTION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getEncounter())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ENCOUNTER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getEndpoint())) { foreach($vs as $v) { if (null === $v) { @@ -1841,7 +1892,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getLocation())) { $v->xmlSerialize($sxe->addChild(self::FIELD_LOCATION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getModality())) { foreach($vs as $v) { if (null === $v) { @@ -1859,13 +1909,13 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_NOTE, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getNumberOfInstances())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NUMBER_OF_INSTANCES, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getNumberOfSeries())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NUMBER_OF_SERIES, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getProcedureCode())) { foreach($vs as $v) { if (null === $v) { @@ -1878,7 +1928,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getProcedureReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PROCEDURE_REFERENCE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getReasonCode())) { foreach($vs as $v) { if (null === $v) { @@ -1900,7 +1949,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getReferrer())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REFERRER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getSeries())) { foreach($vs as $v) { if (null === $v) { @@ -1909,14 +1957,13 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_SERIES, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getStarted())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STARTED, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSubject())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBJECT, null, $v->_getFHIRXMLNamespace())); } @@ -1933,8 +1980,15 @@ public function jsonSerialize() $a[self::FIELD_BASED_ON] = $vs; } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if (null !== ($v = $this->getEncounter())) { $a[self::FIELD_ENCOUNTER] = $v; @@ -1943,7 +1997,23 @@ public function jsonSerialize() $a[self::FIELD_ENDPOINT] = $vs; } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if ([] !== ($vs = $this->getInterpreter())) { $a[self::FIELD_INTERPRETER] = $vs; @@ -1958,12 +2028,26 @@ public function jsonSerialize() $a[self::FIELD_NOTE] = $vs; } if (null !== ($v = $this->getNumberOfInstances())) { - $a[self::FIELD_NUMBER_OF_INSTANCES] = $v->getValue(); - $a[self::FIELD_NUMBER_OF_INSTANCES_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NUMBER_OF_INSTANCES] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NUMBER_OF_INSTANCES_EXT] = $enc; + } + } else { + $a[self::FIELD_NUMBER_OF_INSTANCES] = $v; + } } if (null !== ($v = $this->getNumberOfSeries())) { - $a[self::FIELD_NUMBER_OF_SERIES] = $v->getValue(); - $a[self::FIELD_NUMBER_OF_SERIES_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NUMBER_OF_SERIES] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NUMBER_OF_SERIES_EXT] = $enc; + } + } else { + $a[self::FIELD_NUMBER_OF_SERIES] = $v; + } } if ([] !== ($vs = $this->getProcedureCode())) { $a[self::FIELD_PROCEDURE_CODE] = $vs; @@ -1984,11 +2068,26 @@ public function jsonSerialize() $a[self::FIELD_SERIES] = $vs; } if (null !== ($v = $this->getStarted())) { - $a[self::FIELD_STARTED] = $v->getValue(); - $a[self::FIELD_STARTED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STARTED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STARTED_EXT] = $enc; + } + } else { + $a[self::FIELD_STARTED] = $v; + } } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getSubject())) { $a[self::FIELD_SUBJECT] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRImmunization.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRImmunization.php index df24eebf57..4b438f9701 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRImmunization.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRImmunization.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -93,10 +93,6 @@ class FHIRImmunization extends FHIRDomainResource implements PHPFHIRContainedTyp { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_IMMUNIZATION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DOSE_QUANTITY = 'doseQuantity'; const FIELD_DOSE_QUANTITY_EXT = '_doseQuantity'; const FIELD_EDUCATION = 'education'; @@ -485,6 +481,9 @@ class FHIRImmunization extends FHIRDomainResource implements PHPFHIRContainedTyp */ protected $vaccineCode = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRImmunization Constructor * @param null|array $data @@ -507,8 +506,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DOSE_QUANTITY] instanceof FHIRQuantity) { $this->setDoseQuantity($data[self::FIELD_DOSE_QUANTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_DOSE_QUANTITY])) { - $this->setDoseQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_DOSE_QUANTITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DOSE_QUANTITY])) { + $this->setDoseQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_DOSE_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_DOSE_QUANTITY])) { + $this->setDoseQuantity(new FHIRQuantity(array_merge($ext, $data[self::FIELD_DOSE_QUANTITY]))); + } } else { $this->setDoseQuantity(new FHIRQuantity($data[self::FIELD_DOSE_QUANTITY])); } @@ -516,6 +519,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_EDUCATION])) { if (is_array($data[self::FIELD_EDUCATION])) { foreach($data[self::FIELD_EDUCATION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRImmunizationEducation) { $this->addEducation($v); } else { @@ -541,8 +547,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EXPIRATION_DATE] instanceof FHIRDate) { $this->setExpirationDate($data[self::FIELD_EXPIRATION_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_EXPIRATION_DATE])) { - $this->setExpirationDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_EXPIRATION_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EXPIRATION_DATE])) { + $this->setExpirationDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_EXPIRATION_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_EXPIRATION_DATE])) { + $this->setExpirationDate(new FHIRDate(array_merge($ext, $data[self::FIELD_EXPIRATION_DATE]))); + } } else { $this->setExpirationDate(new FHIRDate($data[self::FIELD_EXPIRATION_DATE])); } @@ -560,17 +570,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -582,8 +599,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IS_SUBPOTENT] instanceof FHIRBoolean) { $this->setIsSubpotent($data[self::FIELD_IS_SUBPOTENT]); - } elseif ($ext && is_scalar($data[self::FIELD_IS_SUBPOTENT])) { - $this->setIsSubpotent(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_IS_SUBPOTENT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IS_SUBPOTENT])) { + $this->setIsSubpotent(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_IS_SUBPOTENT]] + $ext)); + } else if (is_array($data[self::FIELD_IS_SUBPOTENT])) { + $this->setIsSubpotent(new FHIRBoolean(array_merge($ext, $data[self::FIELD_IS_SUBPOTENT]))); + } } else { $this->setIsSubpotent(new FHIRBoolean($data[self::FIELD_IS_SUBPOTENT])); } @@ -601,8 +622,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_LOT_NUMBER] instanceof FHIRString) { $this->setLotNumber($data[self::FIELD_LOT_NUMBER]); - } elseif ($ext && is_scalar($data[self::FIELD_LOT_NUMBER])) { - $this->setLotNumber(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_LOT_NUMBER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_LOT_NUMBER])) { + $this->setLotNumber(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_LOT_NUMBER]] + $ext)); + } else if (is_array($data[self::FIELD_LOT_NUMBER])) { + $this->setLotNumber(new FHIRString(array_merge($ext, $data[self::FIELD_LOT_NUMBER]))); + } } else { $this->setLotNumber(new FHIRString($data[self::FIELD_LOT_NUMBER])); } @@ -617,6 +642,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_NOTE])) { if (is_array($data[self::FIELD_NOTE])) { foreach($data[self::FIELD_NOTE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRAnnotation) { $this->addNote($v); } else { @@ -635,8 +663,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_OCCURRENCE_DATE_TIME] instanceof FHIRDateTime) { $this->setOccurrenceDateTime($data[self::FIELD_OCCURRENCE_DATE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_OCCURRENCE_DATE_TIME])) { - $this->setOccurrenceDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_OCCURRENCE_DATE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_OCCURRENCE_DATE_TIME])) { + $this->setOccurrenceDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_OCCURRENCE_DATE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_OCCURRENCE_DATE_TIME])) { + $this->setOccurrenceDateTime(new FHIRDateTime(array_merge($ext, $data[self::FIELD_OCCURRENCE_DATE_TIME]))); + } } else { $this->setOccurrenceDateTime(new FHIRDateTime($data[self::FIELD_OCCURRENCE_DATE_TIME])); } @@ -647,8 +679,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_OCCURRENCE_STRING] instanceof FHIRString) { $this->setOccurrenceString($data[self::FIELD_OCCURRENCE_STRING]); - } elseif ($ext && is_scalar($data[self::FIELD_OCCURRENCE_STRING])) { - $this->setOccurrenceString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_OCCURRENCE_STRING]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_OCCURRENCE_STRING])) { + $this->setOccurrenceString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_OCCURRENCE_STRING]] + $ext)); + } else if (is_array($data[self::FIELD_OCCURRENCE_STRING])) { + $this->setOccurrenceString(new FHIRString(array_merge($ext, $data[self::FIELD_OCCURRENCE_STRING]))); + } } else { $this->setOccurrenceString(new FHIRString($data[self::FIELD_OCCURRENCE_STRING])); } @@ -663,6 +699,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PERFORMER])) { if (is_array($data[self::FIELD_PERFORMER])) { foreach($data[self::FIELD_PERFORMER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRImmunizationPerformer) { $this->addPerformer($v); } else { @@ -681,8 +720,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PRIMARY_SOURCE] instanceof FHIRBoolean) { $this->setPrimarySource($data[self::FIELD_PRIMARY_SOURCE]); - } elseif ($ext && is_scalar($data[self::FIELD_PRIMARY_SOURCE])) { - $this->setPrimarySource(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_PRIMARY_SOURCE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PRIMARY_SOURCE])) { + $this->setPrimarySource(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_PRIMARY_SOURCE]] + $ext)); + } else if (is_array($data[self::FIELD_PRIMARY_SOURCE])) { + $this->setPrimarySource(new FHIRBoolean(array_merge($ext, $data[self::FIELD_PRIMARY_SOURCE]))); + } } else { $this->setPrimarySource(new FHIRBoolean($data[self::FIELD_PRIMARY_SOURCE])); } @@ -690,6 +733,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PROGRAM_ELIGIBILITY])) { if (is_array($data[self::FIELD_PROGRAM_ELIGIBILITY])) { foreach($data[self::FIELD_PROGRAM_ELIGIBILITY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addProgramEligibility($v); } else { @@ -705,6 +751,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PROTOCOL_APPLIED])) { if (is_array($data[self::FIELD_PROTOCOL_APPLIED])) { foreach($data[self::FIELD_PROTOCOL_APPLIED] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRImmunizationProtocolApplied) { $this->addProtocolApplied($v); } else { @@ -720,6 +769,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REACTION])) { if (is_array($data[self::FIELD_REACTION])) { foreach($data[self::FIELD_REACTION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRImmunizationReaction) { $this->addReaction($v); } else { @@ -735,6 +787,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REASON_CODE])) { if (is_array($data[self::FIELD_REASON_CODE])) { foreach($data[self::FIELD_REASON_CODE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addReasonCode($v); } else { @@ -750,6 +805,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REASON_REFERENCE])) { if (is_array($data[self::FIELD_REASON_REFERENCE])) { foreach($data[self::FIELD_REASON_REFERENCE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addReasonReference($v); } else { @@ -768,8 +826,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_RECORDED] instanceof FHIRDateTime) { $this->setRecorded($data[self::FIELD_RECORDED]); - } elseif ($ext && is_scalar($data[self::FIELD_RECORDED])) { - $this->setRecorded(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_RECORDED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_RECORDED])) { + $this->setRecorded(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_RECORDED]] + $ext)); + } else if (is_array($data[self::FIELD_RECORDED])) { + $this->setRecorded(new FHIRDateTime(array_merge($ext, $data[self::FIELD_RECORDED]))); + } } else { $this->setRecorded(new FHIRDateTime($data[self::FIELD_RECORDED])); } @@ -801,8 +863,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRImmunizationStatusCodes) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRImmunizationStatusCodes([FHIRImmunizationStatusCodes::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRImmunizationStatusCodes([FHIRImmunizationStatusCodes::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRImmunizationStatusCodes(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRImmunizationStatusCodes($data[self::FIELD_STATUS])); } @@ -817,6 +883,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SUBPOTENT_REASON])) { if (is_array($data[self::FIELD_SUBPOTENT_REASON])) { foreach($data[self::FIELD_SUBPOTENT_REASON] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addSubpotentReason($v); } else { @@ -2323,11 +2392,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getDoseQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DOSE_QUANTITY, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getEducation())) { foreach($vs as $v) { if (null === $v) { @@ -2343,11 +2410,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getExpirationDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EXPIRATION_DATE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getFundingSource())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FUNDING_SOURCE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -2356,21 +2421,19 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getIsSubpotent())) { $v->xmlSerialize($sxe->addChild(self::FIELD_IS_SUBPOTENT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getLocation())) { $v->xmlSerialize($sxe->addChild(self::FIELD_LOCATION, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getLotNumber())) { $v->xmlSerialize($sxe->addChild(self::FIELD_LOT_NUMBER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getManufacturer())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MANUFACTURER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getNote())) { foreach($vs as $v) { if (null === $v) { @@ -2379,17 +2442,16 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_NOTE, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getOccurrenceDateTime())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OCCURRENCE_DATE_TIME, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getOccurrenceString())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OCCURRENCE_STRING, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPatient())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATIENT, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getPerformer())) { foreach($vs as $v) { if (null === $v) { @@ -2398,10 +2460,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_PERFORMER, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getPrimarySource())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PRIMARY_SOURCE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getProgramEligibility())) { foreach($vs as $v) { if (null === $v) { @@ -2446,30 +2508,25 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_REASON_REFERENCE, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getRecorded())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RECORDED, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getReportOrigin())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REPORT_ORIGIN, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRoute())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ROUTE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSite())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SITE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatusReason())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS_REASON, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getSubpotentReason())) { foreach($vs as $v) { if (null === $v) { @@ -2492,7 +2549,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getDoseQuantity())) { - $a[self::FIELD_DOSE_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DOSE_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DOSE_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_DOSE_QUANTITY] = $v; + } } if ([] !== ($vs = $this->getEducation())) { $a[self::FIELD_EDUCATION] = $vs; @@ -2501,25 +2566,62 @@ public function jsonSerialize() $a[self::FIELD_ENCOUNTER] = $v; } if (null !== ($v = $this->getExpirationDate())) { - $a[self::FIELD_EXPIRATION_DATE] = $v->getValue(); - $a[self::FIELD_EXPIRATION_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EXPIRATION_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EXPIRATION_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_EXPIRATION_DATE] = $v; + } } if (null !== ($v = $this->getFundingSource())) { $a[self::FIELD_FUNDING_SOURCE] = $v; } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if (null !== ($v = $this->getIsSubpotent())) { - $a[self::FIELD_IS_SUBPOTENT] = $v->getValue(); - $a[self::FIELD_IS_SUBPOTENT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IS_SUBPOTENT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IS_SUBPOTENT_EXT] = $enc; + } + } else { + $a[self::FIELD_IS_SUBPOTENT] = $v; + } } if (null !== ($v = $this->getLocation())) { $a[self::FIELD_LOCATION] = $v; } if (null !== ($v = $this->getLotNumber())) { - $a[self::FIELD_LOT_NUMBER] = $v->getValue(); - $a[self::FIELD_LOT_NUMBER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_LOT_NUMBER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_LOT_NUMBER_EXT] = $enc; + } + } else { + $a[self::FIELD_LOT_NUMBER] = $v; + } } if (null !== ($v = $this->getManufacturer())) { $a[self::FIELD_MANUFACTURER] = $v; @@ -2528,12 +2630,26 @@ public function jsonSerialize() $a[self::FIELD_NOTE] = $vs; } if (null !== ($v = $this->getOccurrenceDateTime())) { - $a[self::FIELD_OCCURRENCE_DATE_TIME] = $v->getValue(); - $a[self::FIELD_OCCURRENCE_DATE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_OCCURRENCE_DATE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_OCCURRENCE_DATE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_OCCURRENCE_DATE_TIME] = $v; + } } if (null !== ($v = $this->getOccurrenceString())) { - $a[self::FIELD_OCCURRENCE_STRING] = $v->getValue(); - $a[self::FIELD_OCCURRENCE_STRING_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_OCCURRENCE_STRING] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_OCCURRENCE_STRING_EXT] = $enc; + } + } else { + $a[self::FIELD_OCCURRENCE_STRING] = $v; + } } if (null !== ($v = $this->getPatient())) { $a[self::FIELD_PATIENT] = $v; @@ -2542,8 +2658,15 @@ public function jsonSerialize() $a[self::FIELD_PERFORMER] = $vs; } if (null !== ($v = $this->getPrimarySource())) { - $a[self::FIELD_PRIMARY_SOURCE] = $v->getValue(); - $a[self::FIELD_PRIMARY_SOURCE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PRIMARY_SOURCE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PRIMARY_SOURCE_EXT] = $enc; + } + } else { + $a[self::FIELD_PRIMARY_SOURCE] = $v; + } } if ([] !== ($vs = $this->getProgramEligibility())) { $a[self::FIELD_PROGRAM_ELIGIBILITY] = $vs; @@ -2561,8 +2684,15 @@ public function jsonSerialize() $a[self::FIELD_REASON_REFERENCE] = $vs; } if (null !== ($v = $this->getRecorded())) { - $a[self::FIELD_RECORDED] = $v->getValue(); - $a[self::FIELD_RECORDED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_RECORDED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_RECORDED_EXT] = $enc; + } + } else { + $a[self::FIELD_RECORDED] = $v; + } } if (null !== ($v = $this->getReportOrigin())) { $a[self::FIELD_REPORT_ORIGIN] = $v; @@ -2574,7 +2704,15 @@ public function jsonSerialize() $a[self::FIELD_SITE] = $v; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getStatusReason())) { $a[self::FIELD_STATUS_REASON] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRImmunizationEvaluation.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRImmunizationEvaluation.php index 7aa4e78b86..688b4cd79f 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRImmunizationEvaluation.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRImmunizationEvaluation.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -87,10 +87,6 @@ class FHIRImmunizationEvaluation extends FHIRDomainResource implements PHPFHIRCo { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_IMMUNIZATION_EVALUATION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_AUTHORITY = 'authority'; const FIELD_DATE = 'date'; const FIELD_DATE_EXT = '_date'; @@ -293,6 +289,9 @@ class FHIRImmunizationEvaluation extends FHIRDomainResource implements PHPFHIRCo */ protected $targetDisease = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRImmunizationEvaluation Constructor * @param null|array $data @@ -322,8 +321,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATE] instanceof FHIRDateTime) { $this->setDate($data[self::FIELD_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_DATE])) { - $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime(array_merge($ext, $data[self::FIELD_DATE]))); + } } else { $this->setDate(new FHIRDateTime($data[self::FIELD_DATE])); } @@ -334,8 +337,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -346,8 +353,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DOSE_NUMBER_POSITIVE_INT] instanceof FHIRPositiveInt) { $this->setDoseNumberPositiveInt($data[self::FIELD_DOSE_NUMBER_POSITIVE_INT]); - } elseif ($ext && is_scalar($data[self::FIELD_DOSE_NUMBER_POSITIVE_INT])) { - $this->setDoseNumberPositiveInt(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_DOSE_NUMBER_POSITIVE_INT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DOSE_NUMBER_POSITIVE_INT])) { + $this->setDoseNumberPositiveInt(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_DOSE_NUMBER_POSITIVE_INT]] + $ext)); + } else if (is_array($data[self::FIELD_DOSE_NUMBER_POSITIVE_INT])) { + $this->setDoseNumberPositiveInt(new FHIRPositiveInt(array_merge($ext, $data[self::FIELD_DOSE_NUMBER_POSITIVE_INT]))); + } } else { $this->setDoseNumberPositiveInt(new FHIRPositiveInt($data[self::FIELD_DOSE_NUMBER_POSITIVE_INT])); } @@ -358,8 +369,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DOSE_NUMBER_STRING] instanceof FHIRString) { $this->setDoseNumberString($data[self::FIELD_DOSE_NUMBER_STRING]); - } elseif ($ext && is_scalar($data[self::FIELD_DOSE_NUMBER_STRING])) { - $this->setDoseNumberString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DOSE_NUMBER_STRING]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DOSE_NUMBER_STRING])) { + $this->setDoseNumberString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DOSE_NUMBER_STRING]] + $ext)); + } else if (is_array($data[self::FIELD_DOSE_NUMBER_STRING])) { + $this->setDoseNumberString(new FHIRString(array_merge($ext, $data[self::FIELD_DOSE_NUMBER_STRING]))); + } } else { $this->setDoseNumberString(new FHIRString($data[self::FIELD_DOSE_NUMBER_STRING])); } @@ -374,6 +389,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_DOSE_STATUS_REASON])) { if (is_array($data[self::FIELD_DOSE_STATUS_REASON])) { foreach($data[self::FIELD_DOSE_STATUS_REASON] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addDoseStatusReason($v); } else { @@ -392,17 +410,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -428,8 +453,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SERIES] instanceof FHIRString) { $this->setSeries($data[self::FIELD_SERIES]); - } elseif ($ext && is_scalar($data[self::FIELD_SERIES])) { - $this->setSeries(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SERIES]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SERIES])) { + $this->setSeries(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SERIES]] + $ext)); + } else if (is_array($data[self::FIELD_SERIES])) { + $this->setSeries(new FHIRString(array_merge($ext, $data[self::FIELD_SERIES]))); + } } else { $this->setSeries(new FHIRString($data[self::FIELD_SERIES])); } @@ -440,8 +469,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SERIES_DOSES_POSITIVE_INT] instanceof FHIRPositiveInt) { $this->setSeriesDosesPositiveInt($data[self::FIELD_SERIES_DOSES_POSITIVE_INT]); - } elseif ($ext && is_scalar($data[self::FIELD_SERIES_DOSES_POSITIVE_INT])) { - $this->setSeriesDosesPositiveInt(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_SERIES_DOSES_POSITIVE_INT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SERIES_DOSES_POSITIVE_INT])) { + $this->setSeriesDosesPositiveInt(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_SERIES_DOSES_POSITIVE_INT]] + $ext)); + } else if (is_array($data[self::FIELD_SERIES_DOSES_POSITIVE_INT])) { + $this->setSeriesDosesPositiveInt(new FHIRPositiveInt(array_merge($ext, $data[self::FIELD_SERIES_DOSES_POSITIVE_INT]))); + } } else { $this->setSeriesDosesPositiveInt(new FHIRPositiveInt($data[self::FIELD_SERIES_DOSES_POSITIVE_INT])); } @@ -452,8 +485,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SERIES_DOSES_STRING] instanceof FHIRString) { $this->setSeriesDosesString($data[self::FIELD_SERIES_DOSES_STRING]); - } elseif ($ext && is_scalar($data[self::FIELD_SERIES_DOSES_STRING])) { - $this->setSeriesDosesString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SERIES_DOSES_STRING]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SERIES_DOSES_STRING])) { + $this->setSeriesDosesString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SERIES_DOSES_STRING]] + $ext)); + } else if (is_array($data[self::FIELD_SERIES_DOSES_STRING])) { + $this->setSeriesDosesString(new FHIRString(array_merge($ext, $data[self::FIELD_SERIES_DOSES_STRING]))); + } } else { $this->setSeriesDosesString(new FHIRString($data[self::FIELD_SERIES_DOSES_STRING])); } @@ -464,8 +501,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRImmunizationEvaluationStatusCodes) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRImmunizationEvaluationStatusCodes([FHIRImmunizationEvaluationStatusCodes::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRImmunizationEvaluationStatusCodes([FHIRImmunizationEvaluationStatusCodes::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRImmunizationEvaluationStatusCodes(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRImmunizationEvaluationStatusCodes($data[self::FIELD_STATUS])); } @@ -1241,7 +1282,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getAuthority())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AUTHORITY, null, $v->_getFHIRXMLNamespace())); } @@ -1257,11 +1297,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDoseNumberString())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DOSE_NUMBER_STRING, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDoseStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DOSE_STATUS, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getDoseStatusReason())) { foreach($vs as $v) { if (null === $v) { @@ -1283,7 +1321,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getImmunizationEvent())) { $v->xmlSerialize($sxe->addChild(self::FIELD_IMMUNIZATION_EVENT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPatient())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATIENT, null, $v->_getFHIRXMLNamespace())); } @@ -1296,11 +1333,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getSeriesDosesString())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SERIES_DOSES_STRING, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getTargetDisease())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TARGET_DISEASE, null, $v->_getFHIRXMLNamespace())); } @@ -1317,20 +1352,48 @@ public function jsonSerialize() $a[self::FIELD_AUTHORITY] = $v; } if (null !== ($v = $this->getDate())) { - $a[self::FIELD_DATE] = $v->getValue(); - $a[self::FIELD_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_DATE] = $v; + } } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if (null !== ($v = $this->getDoseNumberPositiveInt())) { - $a[self::FIELD_DOSE_NUMBER_POSITIVE_INT] = $v->getValue(); - $a[self::FIELD_DOSE_NUMBER_POSITIVE_INT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DOSE_NUMBER_POSITIVE_INT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DOSE_NUMBER_POSITIVE_INT_EXT] = $enc; + } + } else { + $a[self::FIELD_DOSE_NUMBER_POSITIVE_INT] = $v; + } } if (null !== ($v = $this->getDoseNumberString())) { - $a[self::FIELD_DOSE_NUMBER_STRING] = $v->getValue(); - $a[self::FIELD_DOSE_NUMBER_STRING_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DOSE_NUMBER_STRING] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DOSE_NUMBER_STRING_EXT] = $enc; + } + } else { + $a[self::FIELD_DOSE_NUMBER_STRING] = $v; + } } if (null !== ($v = $this->getDoseStatus())) { $a[self::FIELD_DOSE_STATUS] = $v; @@ -1339,7 +1402,23 @@ public function jsonSerialize() $a[self::FIELD_DOSE_STATUS_REASON] = $vs; } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if (null !== ($v = $this->getImmunizationEvent())) { $a[self::FIELD_IMMUNIZATION_EVENT] = $v; @@ -1348,19 +1427,48 @@ public function jsonSerialize() $a[self::FIELD_PATIENT] = $v; } if (null !== ($v = $this->getSeries())) { - $a[self::FIELD_SERIES] = $v->getValue(); - $a[self::FIELD_SERIES_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SERIES] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SERIES_EXT] = $enc; + } + } else { + $a[self::FIELD_SERIES] = $v; + } } if (null !== ($v = $this->getSeriesDosesPositiveInt())) { - $a[self::FIELD_SERIES_DOSES_POSITIVE_INT] = $v->getValue(); - $a[self::FIELD_SERIES_DOSES_POSITIVE_INT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SERIES_DOSES_POSITIVE_INT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SERIES_DOSES_POSITIVE_INT_EXT] = $enc; + } + } else { + $a[self::FIELD_SERIES_DOSES_POSITIVE_INT] = $v; + } } if (null !== ($v = $this->getSeriesDosesString())) { - $a[self::FIELD_SERIES_DOSES_STRING] = $v->getValue(); - $a[self::FIELD_SERIES_DOSES_STRING_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SERIES_DOSES_STRING] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SERIES_DOSES_STRING_EXT] = $enc; + } + } else { + $a[self::FIELD_SERIES_DOSES_STRING] = $v; + } } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getTargetDisease())) { $a[self::FIELD_TARGET_DISEASE] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRImmunizationRecommendation.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRImmunizationRecommendation.php index cc9ed4bddb..9f73d02875 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRImmunizationRecommendation.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRImmunizationRecommendation.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -83,10 +83,6 @@ class FHIRImmunizationRecommendation extends FHIRDomainResource implements PHPFH { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_IMMUNIZATION_RECOMMENDATION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_AUTHORITY = 'authority'; const FIELD_DATE = 'date'; const FIELD_DATE_EXT = '_date'; @@ -153,6 +149,9 @@ class FHIRImmunizationRecommendation extends FHIRDomainResource implements PHPFH */ protected $recommendation = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRImmunizationRecommendation Constructor * @param null|array $data @@ -182,8 +181,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATE] instanceof FHIRDateTime) { $this->setDate($data[self::FIELD_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_DATE])) { - $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime(array_merge($ext, $data[self::FIELD_DATE]))); + } } else { $this->setDate(new FHIRDateTime($data[self::FIELD_DATE])); } @@ -194,17 +197,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -220,6 +230,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_RECOMMENDATION])) { if (is_array($data[self::FIELD_RECOMMENDATION])) { foreach($data[self::FIELD_RECOMMENDATION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRImmunizationRecommendationRecommendation) { $this->addRecommendation($v); } else { @@ -579,14 +592,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getAuthority())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AUTHORITY, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DATE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -599,7 +610,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getPatient())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATIENT, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getRecommendation())) { foreach($vs as $v) { if (null === $v) { @@ -608,6 +618,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_RECOMMENDATION, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } @@ -621,11 +632,34 @@ public function jsonSerialize() $a[self::FIELD_AUTHORITY] = $v; } if (null !== ($v = $this->getDate())) { - $a[self::FIELD_DATE] = $v->getValue(); - $a[self::FIELD_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_DATE] = $v; + } } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if (null !== ($v = $this->getPatient())) { $a[self::FIELD_PATIENT] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRImplementationGuide.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRImplementationGuide.php index 4bb99e173a..927907854b 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRImplementationGuide.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRImplementationGuide.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -97,10 +97,6 @@ class FHIRImplementationGuide extends FHIRDomainResource implements PHPFHIRConta { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_IMPLEMENTATION_GUIDE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CONTACT = 'contact'; const FIELD_COPYRIGHT = 'copyright'; const FIELD_COPYRIGHT_EXT = '_copyright'; @@ -414,6 +410,9 @@ class FHIRImplementationGuide extends FHIRDomainResource implements PHPFHIRConta */ protected $version = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRImplementationGuide Constructor * @param null|array $data @@ -433,6 +432,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CONTACT])) { if (is_array($data[self::FIELD_CONTACT])) { foreach($data[self::FIELD_CONTACT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContactDetail) { $this->addContact($v); } else { @@ -451,8 +453,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_COPYRIGHT] instanceof FHIRMarkdown) { $this->setCopyright($data[self::FIELD_COPYRIGHT]); - } elseif ($ext && is_scalar($data[self::FIELD_COPYRIGHT])) { - $this->setCopyright(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_COPYRIGHT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_COPYRIGHT])) { + $this->setCopyright(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_COPYRIGHT]] + $ext)); + } else if (is_array($data[self::FIELD_COPYRIGHT])) { + $this->setCopyright(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_COPYRIGHT]))); + } } else { $this->setCopyright(new FHIRMarkdown($data[self::FIELD_COPYRIGHT])); } @@ -463,8 +469,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATE] instanceof FHIRDateTime) { $this->setDate($data[self::FIELD_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_DATE])) { - $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime(array_merge($ext, $data[self::FIELD_DATE]))); + } } else { $this->setDate(new FHIRDateTime($data[self::FIELD_DATE])); } @@ -479,6 +489,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_DEPENDS_ON])) { if (is_array($data[self::FIELD_DEPENDS_ON])) { foreach($data[self::FIELD_DEPENDS_ON] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRImplementationGuideDependsOn) { $this->addDependsOn($v); } else { @@ -497,8 +510,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRMarkdown) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRMarkdown($data[self::FIELD_DESCRIPTION])); } @@ -509,8 +526,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EXPERIMENTAL] instanceof FHIRBoolean) { $this->setExperimental($data[self::FIELD_EXPERIMENTAL]); - } elseif ($ext && is_scalar($data[self::FIELD_EXPERIMENTAL])) { - $this->setExperimental(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_EXPERIMENTAL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EXPERIMENTAL])) { + $this->setExperimental(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_EXPERIMENTAL]] + $ext)); + } else if (is_array($data[self::FIELD_EXPERIMENTAL])) { + $this->setExperimental(new FHIRBoolean(array_merge($ext, $data[self::FIELD_EXPERIMENTAL]))); + } } else { $this->setExperimental(new FHIRBoolean($data[self::FIELD_EXPERIMENTAL])); } @@ -521,17 +542,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_FHIR_VERSION])) { foreach($data[self::FIELD_FHIR_VERSION] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRFHIRVersion) { $this->addFhirVersion($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addFhirVersion(new FHIRFHIRVersion([FHIRFHIRVersion::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addFhirVersion(new FHIRFHIRVersion([FHIRFHIRVersion::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addFhirVersion(new FHIRFHIRVersion(array_merge($v, $ext[$i]))); + } } else { $this->addFhirVersion(new FHIRFHIRVersion($v)); } } } elseif ($data[self::FIELD_FHIR_VERSION] instanceof FHIRFHIRVersion) { $this->addFhirVersion($data[self::FIELD_FHIR_VERSION]); - } elseif ($ext && is_scalar($data[self::FIELD_FHIR_VERSION])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_FHIR_VERSION])) { $this->addFhirVersion(new FHIRFHIRVersion([FHIRFHIRVersion::FIELD_VALUE => $data[self::FIELD_FHIR_VERSION]] + $ext)); } else { $this->addFhirVersion(new FHIRFHIRVersion($data[self::FIELD_FHIR_VERSION])); @@ -540,6 +568,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_GLOBAL])) { if (is_array($data[self::FIELD_GLOBAL])) { foreach($data[self::FIELD_GLOBAL] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRImplementationGuideGlobal) { $this->addGlobal($v); } else { @@ -555,6 +586,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_JURISDICTION])) { if (is_array($data[self::FIELD_JURISDICTION])) { foreach($data[self::FIELD_JURISDICTION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addJurisdiction($v); } else { @@ -573,8 +607,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_LICENSE] instanceof FHIRSPDXLicense) { $this->setLicense($data[self::FIELD_LICENSE]); - } elseif ($ext && is_scalar($data[self::FIELD_LICENSE])) { - $this->setLicense(new FHIRSPDXLicense([FHIRSPDXLicense::FIELD_VALUE => $data[self::FIELD_LICENSE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_LICENSE])) { + $this->setLicense(new FHIRSPDXLicense([FHIRSPDXLicense::FIELD_VALUE => $data[self::FIELD_LICENSE]] + $ext)); + } else if (is_array($data[self::FIELD_LICENSE])) { + $this->setLicense(new FHIRSPDXLicense(array_merge($ext, $data[self::FIELD_LICENSE]))); + } } else { $this->setLicense(new FHIRSPDXLicense($data[self::FIELD_LICENSE])); } @@ -592,8 +630,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -604,8 +646,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PACKAGE_ID] instanceof FHIRId) { $this->setPackageId($data[self::FIELD_PACKAGE_ID]); - } elseif ($ext && is_scalar($data[self::FIELD_PACKAGE_ID])) { - $this->setPackageId(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_PACKAGE_ID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PACKAGE_ID])) { + $this->setPackageId(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_PACKAGE_ID]] + $ext)); + } else if (is_array($data[self::FIELD_PACKAGE_ID])) { + $this->setPackageId(new FHIRId(array_merge($ext, $data[self::FIELD_PACKAGE_ID]))); + } } else { $this->setPackageId(new FHIRId($data[self::FIELD_PACKAGE_ID])); } @@ -616,8 +662,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PUBLISHER] instanceof FHIRString) { $this->setPublisher($data[self::FIELD_PUBLISHER]); - } elseif ($ext && is_scalar($data[self::FIELD_PUBLISHER])) { - $this->setPublisher(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PUBLISHER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PUBLISHER])) { + $this->setPublisher(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PUBLISHER]] + $ext)); + } else if (is_array($data[self::FIELD_PUBLISHER])) { + $this->setPublisher(new FHIRString(array_merge($ext, $data[self::FIELD_PUBLISHER]))); + } } else { $this->setPublisher(new FHIRString($data[self::FIELD_PUBLISHER])); } @@ -628,8 +678,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRPublicationStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRPublicationStatus([FHIRPublicationStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRPublicationStatus([FHIRPublicationStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRPublicationStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRPublicationStatus($data[self::FIELD_STATUS])); } @@ -640,8 +694,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TITLE] instanceof FHIRString) { $this->setTitle($data[self::FIELD_TITLE]); - } elseif ($ext && is_scalar($data[self::FIELD_TITLE])) { - $this->setTitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TITLE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TITLE])) { + $this->setTitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TITLE]] + $ext)); + } else if (is_array($data[self::FIELD_TITLE])) { + $this->setTitle(new FHIRString(array_merge($ext, $data[self::FIELD_TITLE]))); + } } else { $this->setTitle(new FHIRString($data[self::FIELD_TITLE])); } @@ -652,8 +710,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_URL] instanceof FHIRUri) { $this->setUrl($data[self::FIELD_URL]); - } elseif ($ext && is_scalar($data[self::FIELD_URL])) { - $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } else if (is_array($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri(array_merge($ext, $data[self::FIELD_URL]))); + } } else { $this->setUrl(new FHIRUri($data[self::FIELD_URL])); } @@ -661,6 +723,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_USE_CONTEXT])) { if (is_array($data[self::FIELD_USE_CONTEXT])) { foreach($data[self::FIELD_USE_CONTEXT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRUsageContext) { $this->addUseContext($v); } else { @@ -679,8 +744,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VERSION] instanceof FHIRString) { $this->setVersion($data[self::FIELD_VERSION]); - } elseif ($ext && is_scalar($data[self::FIELD_VERSION])) { - $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } else if (is_array($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString(array_merge($ext, $data[self::FIELD_VERSION]))); + } } else { $this->setVersion(new FHIRString($data[self::FIELD_VERSION])); } @@ -1866,7 +1935,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getContact())) { foreach($vs as $v) { if (null === $v) { @@ -1875,17 +1943,16 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_CONTACT, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getCopyright())) { $v->xmlSerialize($sxe->addChild(self::FIELD_COPYRIGHT, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DATE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDefinition())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFINITION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getDependsOn())) { foreach($vs as $v) { if (null === $v) { @@ -1894,13 +1961,13 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_DEPENDS_ON, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getDescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESCRIPTION, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getExperimental())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EXPERIMENTAL, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getFhirVersion())) { foreach($vs as $v) { if (null === $v) { @@ -1931,7 +1998,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getLicense())) { $v->xmlSerialize($sxe->addChild(self::FIELD_LICENSE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getManifest())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MANIFEST, null, $v->_getFHIRXMLNamespace())); } @@ -1944,7 +2010,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getPublisher())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PUBLISHER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } @@ -1954,7 +2019,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getUrl())) { $v->xmlSerialize($sxe->addChild(self::FIELD_URL, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getUseContext())) { foreach($vs as $v) { if (null === $v) { @@ -1963,6 +2027,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_USE_CONTEXT, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getVersion())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VERSION, null, $v->_getFHIRXMLNamespace())); } @@ -1979,12 +2044,26 @@ public function jsonSerialize() $a[self::FIELD_CONTACT] = $vs; } if (null !== ($v = $this->getCopyright())) { - $a[self::FIELD_COPYRIGHT] = $v->getValue(); - $a[self::FIELD_COPYRIGHT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_COPYRIGHT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_COPYRIGHT_EXT] = $enc; + } + } else { + $a[self::FIELD_COPYRIGHT] = $v; + } } if (null !== ($v = $this->getDate())) { - $a[self::FIELD_DATE] = $v->getValue(); - $a[self::FIELD_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_DATE] = $v; + } } if (null !== ($v = $this->getDefinition())) { $a[self::FIELD_DEFINITION] = $v; @@ -1993,15 +2072,45 @@ public function jsonSerialize() $a[self::FIELD_DEPENDS_ON] = $vs; } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if (null !== ($v = $this->getExperimental())) { - $a[self::FIELD_EXPERIMENTAL] = $v->getValue(); - $a[self::FIELD_EXPERIMENTAL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EXPERIMENTAL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EXPERIMENTAL_EXT] = $enc; + } + } else { + $a[self::FIELD_EXPERIMENTAL] = $v; + } } if ([] !== ($vs = $this->getFhirVersion())) { - $a[self::FIELD_FHIR_VERSION] = $vs; + $a[self::FIELD_FHIR_VERSION] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FHIR_VERSION][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FHIR_VERSION_EXT][] = $enc; + } else { + $a[self::FIELD_FHIR_VERSION_EXT][] = null; + } + } else { + $a[self::FIELD_FHIR_VERSION][] = $v; + } + } } if ([] !== ($vs = $this->getGlobal())) { $a[self::FIELD_GLOBAL] = $vs; @@ -2010,40 +2119,98 @@ public function jsonSerialize() $a[self::FIELD_JURISDICTION] = $vs; } if (null !== ($v = $this->getLicense())) { - $a[self::FIELD_LICENSE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_LICENSE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_LICENSE_EXT] = $enc; + } + } else { + $a[self::FIELD_LICENSE] = $v; + } } if (null !== ($v = $this->getManifest())) { $a[self::FIELD_MANIFEST] = $v; } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if (null !== ($v = $this->getPackageId())) { - $a[self::FIELD_PACKAGE_ID] = $v->getValue(); - $a[self::FIELD_PACKAGE_ID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PACKAGE_ID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PACKAGE_ID_EXT] = $enc; + } + } else { + $a[self::FIELD_PACKAGE_ID] = $v; + } } if (null !== ($v = $this->getPublisher())) { - $a[self::FIELD_PUBLISHER] = $v->getValue(); - $a[self::FIELD_PUBLISHER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PUBLISHER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PUBLISHER_EXT] = $enc; + } + } else { + $a[self::FIELD_PUBLISHER] = $v; + } } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getTitle())) { - $a[self::FIELD_TITLE] = $v->getValue(); - $a[self::FIELD_TITLE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TITLE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TITLE_EXT] = $enc; + } + } else { + $a[self::FIELD_TITLE] = $v; + } } if (null !== ($v = $this->getUrl())) { - $a[self::FIELD_URL] = $v->getValue(); - $a[self::FIELD_URL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_URL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_URL_EXT] = $enc; + } + } else { + $a[self::FIELD_URL] = $v; + } } if ([] !== ($vs = $this->getUseContext())) { $a[self::FIELD_USE_CONTEXT] = $vs; } if (null !== ($v = $this->getVersion())) { - $a[self::FIELD_VERSION] = $v->getValue(); - $a[self::FIELD_VERSION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VERSION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VERSION_EXT] = $enc; + } + } else { + $a[self::FIELD_VERSION] = $v; + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRInsurancePlan.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRInsurancePlan.php index c13027ef12..e57590d566 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRInsurancePlan.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRInsurancePlan.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -87,10 +87,6 @@ class FHIRInsurancePlan extends FHIRDomainResource implements PHPFHIRContainedTy { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_INSURANCE_PLAN; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ADMINISTERED_BY = 'administeredBy'; const FIELD_ALIAS = 'alias'; const FIELD_ALIAS_EXT = '_alias'; @@ -265,6 +261,9 @@ class FHIRInsurancePlan extends FHIRDomainResource implements PHPFHIRContainedTy */ protected $type = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRInsurancePlan Constructor * @param null|array $data @@ -294,17 +293,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_ALIAS])) { foreach($data[self::FIELD_ALIAS] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRString) { $this->addAlias($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addAlias(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addAlias(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addAlias(new FHIRString(array_merge($v, $ext[$i]))); + } } else { $this->addAlias(new FHIRString($v)); } } } elseif ($data[self::FIELD_ALIAS] instanceof FHIRString) { $this->addAlias($data[self::FIELD_ALIAS]); - } elseif ($ext && is_scalar($data[self::FIELD_ALIAS])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_ALIAS])) { $this->addAlias(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_ALIAS]] + $ext)); } else { $this->addAlias(new FHIRString($data[self::FIELD_ALIAS])); @@ -313,6 +319,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CONTACT])) { if (is_array($data[self::FIELD_CONTACT])) { foreach($data[self::FIELD_CONTACT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRInsurancePlanContact) { $this->addContact($v); } else { @@ -328,6 +337,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_COVERAGE])) { if (is_array($data[self::FIELD_COVERAGE])) { foreach($data[self::FIELD_COVERAGE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRInsurancePlanCoverage) { $this->addCoverage($v); } else { @@ -343,6 +355,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_COVERAGE_AREA])) { if (is_array($data[self::FIELD_COVERAGE_AREA])) { foreach($data[self::FIELD_COVERAGE_AREA] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addCoverageArea($v); } else { @@ -358,6 +373,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ENDPOINT])) { if (is_array($data[self::FIELD_ENDPOINT])) { foreach($data[self::FIELD_ENDPOINT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addEndpoint($v); } else { @@ -376,17 +394,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -398,8 +423,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -407,6 +436,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_NETWORK])) { if (is_array($data[self::FIELD_NETWORK])) { foreach($data[self::FIELD_NETWORK] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addNetwork($v); } else { @@ -436,6 +468,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PLAN])) { if (is_array($data[self::FIELD_PLAN])) { foreach($data[self::FIELD_PLAN] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRInsurancePlanPlan) { $this->addPlan($v); } else { @@ -454,8 +489,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRPublicationStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRPublicationStatus([FHIRPublicationStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRPublicationStatus([FHIRPublicationStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRPublicationStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRPublicationStatus($data[self::FIELD_STATUS])); } @@ -463,6 +502,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_TYPE])) { if (is_array($data[self::FIELD_TYPE])) { foreach($data[self::FIELD_TYPE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addType($v); } else { @@ -1321,7 +1363,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getAdministeredBy())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ADMINISTERED_BY, null, $v->_getFHIRXMLNamespace())); } @@ -1378,10 +1419,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NAME, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getNetwork())) { foreach($vs as $v) { if (null === $v) { @@ -1394,11 +1435,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getOwnedBy())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OWNED_BY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getPlan())) { foreach($vs as $v) { if (null === $v) { @@ -1411,7 +1450,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getType())) { foreach($vs as $v) { if (null === $v) { @@ -1420,6 +1458,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } @@ -1438,8 +1477,17 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_ALIAS][] = $v->getValue(); - $a[self::FIELD_ALIAS_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ALIAS][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ALIAS_EXT][] = $enc; + } else { + $a[self::FIELD_ALIAS_EXT][] = null; + } + } else { + $a[self::FIELD_ALIAS][] = $v; + } } } if ([] !== ($vs = $this->getContact())) { @@ -1455,11 +1503,34 @@ public function jsonSerialize() $a[self::FIELD_ENDPOINT] = $vs; } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if ([] !== ($vs = $this->getNetwork())) { $a[self::FIELD_NETWORK] = $vs; @@ -1474,7 +1545,15 @@ public function jsonSerialize() $a[self::FIELD_PLAN] = $vs; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if ([] !== ($vs = $this->getType())) { $a[self::FIELD_TYPE] = $vs; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRInvoice.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRInvoice.php index d65c4e9cae..b960d74f13 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRInvoice.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRInvoice.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -91,10 +91,6 @@ class FHIRInvoice extends FHIRDomainResource implements PHPFHIRContainedTypeInte { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_INVOICE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ACCOUNT = 'account'; const FIELD_CANCELLED_REASON = 'cancelledReason'; const FIELD_CANCELLED_REASON_EXT = '_cancelledReason'; @@ -310,6 +306,9 @@ class FHIRInvoice extends FHIRDomainResource implements PHPFHIRContainedTypeInte */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRInvoice Constructor * @param null|array $data @@ -339,8 +338,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CANCELLED_REASON] instanceof FHIRString) { $this->setCancelledReason($data[self::FIELD_CANCELLED_REASON]); - } elseif ($ext && is_scalar($data[self::FIELD_CANCELLED_REASON])) { - $this->setCancelledReason(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_CANCELLED_REASON]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CANCELLED_REASON])) { + $this->setCancelledReason(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_CANCELLED_REASON]] + $ext)); + } else if (is_array($data[self::FIELD_CANCELLED_REASON])) { + $this->setCancelledReason(new FHIRString(array_merge($ext, $data[self::FIELD_CANCELLED_REASON]))); + } } else { $this->setCancelledReason(new FHIRString($data[self::FIELD_CANCELLED_REASON])); } @@ -351,8 +354,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATE] instanceof FHIRDateTime) { $this->setDate($data[self::FIELD_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_DATE])) { - $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime(array_merge($ext, $data[self::FIELD_DATE]))); + } } else { $this->setDate(new FHIRDateTime($data[self::FIELD_DATE])); } @@ -363,17 +370,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -389,6 +403,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_LINE_ITEM])) { if (is_array($data[self::FIELD_LINE_ITEM])) { foreach($data[self::FIELD_LINE_ITEM] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRInvoiceLineItem) { $this->addLineItem($v); } else { @@ -404,6 +421,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_NOTE])) { if (is_array($data[self::FIELD_NOTE])) { foreach($data[self::FIELD_NOTE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRAnnotation) { $this->addNote($v); } else { @@ -419,6 +439,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PARTICIPANT])) { if (is_array($data[self::FIELD_PARTICIPANT])) { foreach($data[self::FIELD_PARTICIPANT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRInvoiceParticipant) { $this->addParticipant($v); } else { @@ -437,8 +460,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PAYMENT_TERMS] instanceof FHIRMarkdown) { $this->setPaymentTerms($data[self::FIELD_PAYMENT_TERMS]); - } elseif ($ext && is_scalar($data[self::FIELD_PAYMENT_TERMS])) { - $this->setPaymentTerms(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_PAYMENT_TERMS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PAYMENT_TERMS])) { + $this->setPaymentTerms(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_PAYMENT_TERMS]] + $ext)); + } else if (is_array($data[self::FIELD_PAYMENT_TERMS])) { + $this->setPaymentTerms(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_PAYMENT_TERMS]))); + } } else { $this->setPaymentTerms(new FHIRMarkdown($data[self::FIELD_PAYMENT_TERMS])); } @@ -456,8 +483,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRInvoiceStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRInvoiceStatus([FHIRInvoiceStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRInvoiceStatus([FHIRInvoiceStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRInvoiceStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRInvoiceStatus($data[self::FIELD_STATUS])); } @@ -475,8 +506,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TOTAL_GROSS] instanceof FHIRMoney) { $this->setTotalGross($data[self::FIELD_TOTAL_GROSS]); - } elseif ($ext && is_scalar($data[self::FIELD_TOTAL_GROSS])) { - $this->setTotalGross(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_TOTAL_GROSS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TOTAL_GROSS])) { + $this->setTotalGross(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_TOTAL_GROSS]] + $ext)); + } else if (is_array($data[self::FIELD_TOTAL_GROSS])) { + $this->setTotalGross(new FHIRMoney(array_merge($ext, $data[self::FIELD_TOTAL_GROSS]))); + } } else { $this->setTotalGross(new FHIRMoney($data[self::FIELD_TOTAL_GROSS])); } @@ -487,8 +522,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TOTAL_NET] instanceof FHIRMoney) { $this->setTotalNet($data[self::FIELD_TOTAL_NET]); - } elseif ($ext && is_scalar($data[self::FIELD_TOTAL_NET])) { - $this->setTotalNet(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_TOTAL_NET]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TOTAL_NET])) { + $this->setTotalNet(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_TOTAL_NET]] + $ext)); + } else if (is_array($data[self::FIELD_TOTAL_NET])) { + $this->setTotalNet(new FHIRMoney(array_merge($ext, $data[self::FIELD_TOTAL_NET]))); + } } else { $this->setTotalNet(new FHIRMoney($data[self::FIELD_TOTAL_NET])); } @@ -496,6 +535,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_TOTAL_PRICE_COMPONENT])) { if (is_array($data[self::FIELD_TOTAL_PRICE_COMPONENT])) { foreach($data[self::FIELD_TOTAL_PRICE_COMPONENT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRInvoicePriceComponent) { $this->addTotalPriceComponent($v); } else { @@ -1359,7 +1401,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getAccount())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ACCOUNT, null, $v->_getFHIRXMLNamespace())); } @@ -1369,7 +1410,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DATE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -1382,7 +1422,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getIssuer())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ISSUER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getLineItem())) { foreach($vs as $v) { if (null === $v) { @@ -1409,30 +1448,25 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_PARTICIPANT, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getPaymentTerms())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PAYMENT_TERMS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRecipient())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RECIPIENT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSubject())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBJECT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getTotalGross())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TOTAL_GROSS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getTotalNet())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TOTAL_NET, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getTotalPriceComponent())) { foreach($vs as $v) { if (null === $v) { @@ -1458,15 +1492,45 @@ public function jsonSerialize() $a[self::FIELD_ACCOUNT] = $v; } if (null !== ($v = $this->getCancelledReason())) { - $a[self::FIELD_CANCELLED_REASON] = $v->getValue(); - $a[self::FIELD_CANCELLED_REASON_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CANCELLED_REASON] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CANCELLED_REASON_EXT] = $enc; + } + } else { + $a[self::FIELD_CANCELLED_REASON] = $v; + } } if (null !== ($v = $this->getDate())) { - $a[self::FIELD_DATE] = $v->getValue(); - $a[self::FIELD_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_DATE] = $v; + } } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if (null !== ($v = $this->getIssuer())) { $a[self::FIELD_ISSUER] = $v; @@ -1481,23 +1545,54 @@ public function jsonSerialize() $a[self::FIELD_PARTICIPANT] = $vs; } if (null !== ($v = $this->getPaymentTerms())) { - $a[self::FIELD_PAYMENT_TERMS] = $v->getValue(); - $a[self::FIELD_PAYMENT_TERMS_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PAYMENT_TERMS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PAYMENT_TERMS_EXT] = $enc; + } + } else { + $a[self::FIELD_PAYMENT_TERMS] = $v; + } } if (null !== ($v = $this->getRecipient())) { $a[self::FIELD_RECIPIENT] = $v; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getSubject())) { $a[self::FIELD_SUBJECT] = $v; } if (null !== ($v = $this->getTotalGross())) { - $a[self::FIELD_TOTAL_GROSS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TOTAL_GROSS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TOTAL_GROSS_EXT] = $enc; + } + } else { + $a[self::FIELD_TOTAL_GROSS] = $v; + } } if (null !== ($v = $this->getTotalNet())) { - $a[self::FIELD_TOTAL_NET] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TOTAL_NET] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TOTAL_NET_EXT] = $enc; + } + } else { + $a[self::FIELD_TOTAL_NET] = $v; + } } if ([] !== ($vs = $this->getTotalPriceComponent())) { $a[self::FIELD_TOTAL_PRICE_COMPONENT] = $vs; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRLibrary.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRLibrary.php index a606bda002..1fa8f77627 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRLibrary.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRLibrary.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -98,10 +98,6 @@ class FHIRLibrary extends FHIRDomainResource implements PHPFHIRContainedTypeInte { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_LIBRARY; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_APPROVAL_DATE = 'approvalDate'; const FIELD_APPROVAL_DATE_EXT = '_approvalDate'; const FIELD_AUTHOR = 'author'; @@ -578,6 +574,9 @@ class FHIRLibrary extends FHIRDomainResource implements PHPFHIRContainedTypeInte */ protected $version = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRLibrary Constructor * @param null|array $data @@ -600,8 +599,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_APPROVAL_DATE] instanceof FHIRDate) { $this->setApprovalDate($data[self::FIELD_APPROVAL_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_APPROVAL_DATE])) { - $this->setApprovalDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_APPROVAL_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_APPROVAL_DATE])) { + $this->setApprovalDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_APPROVAL_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_APPROVAL_DATE])) { + $this->setApprovalDate(new FHIRDate(array_merge($ext, $data[self::FIELD_APPROVAL_DATE]))); + } } else { $this->setApprovalDate(new FHIRDate($data[self::FIELD_APPROVAL_DATE])); } @@ -609,6 +612,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_AUTHOR])) { if (is_array($data[self::FIELD_AUTHOR])) { foreach($data[self::FIELD_AUTHOR] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContactDetail) { $this->addAuthor($v); } else { @@ -624,6 +630,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CONTACT])) { if (is_array($data[self::FIELD_CONTACT])) { foreach($data[self::FIELD_CONTACT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContactDetail) { $this->addContact($v); } else { @@ -639,6 +648,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CONTENT])) { if (is_array($data[self::FIELD_CONTENT])) { foreach($data[self::FIELD_CONTENT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRAttachment) { $this->addContent($v); } else { @@ -657,8 +669,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_COPYRIGHT] instanceof FHIRMarkdown) { $this->setCopyright($data[self::FIELD_COPYRIGHT]); - } elseif ($ext && is_scalar($data[self::FIELD_COPYRIGHT])) { - $this->setCopyright(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_COPYRIGHT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_COPYRIGHT])) { + $this->setCopyright(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_COPYRIGHT]] + $ext)); + } else if (is_array($data[self::FIELD_COPYRIGHT])) { + $this->setCopyright(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_COPYRIGHT]))); + } } else { $this->setCopyright(new FHIRMarkdown($data[self::FIELD_COPYRIGHT])); } @@ -666,6 +682,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_DATA_REQUIREMENT])) { if (is_array($data[self::FIELD_DATA_REQUIREMENT])) { foreach($data[self::FIELD_DATA_REQUIREMENT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRDataRequirement) { $this->addDataRequirement($v); } else { @@ -684,8 +703,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATE] instanceof FHIRDateTime) { $this->setDate($data[self::FIELD_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_DATE])) { - $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime(array_merge($ext, $data[self::FIELD_DATE]))); + } } else { $this->setDate(new FHIRDateTime($data[self::FIELD_DATE])); } @@ -696,8 +719,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRMarkdown) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRMarkdown($data[self::FIELD_DESCRIPTION])); } @@ -705,6 +732,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_EDITOR])) { if (is_array($data[self::FIELD_EDITOR])) { foreach($data[self::FIELD_EDITOR] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContactDetail) { $this->addEditor($v); } else { @@ -727,6 +757,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ENDORSER])) { if (is_array($data[self::FIELD_ENDORSER])) { foreach($data[self::FIELD_ENDORSER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContactDetail) { $this->addEndorser($v); } else { @@ -745,8 +778,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EXPERIMENTAL] instanceof FHIRBoolean) { $this->setExperimental($data[self::FIELD_EXPERIMENTAL]); - } elseif ($ext && is_scalar($data[self::FIELD_EXPERIMENTAL])) { - $this->setExperimental(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_EXPERIMENTAL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EXPERIMENTAL])) { + $this->setExperimental(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_EXPERIMENTAL]] + $ext)); + } else if (is_array($data[self::FIELD_EXPERIMENTAL])) { + $this->setExperimental(new FHIRBoolean(array_merge($ext, $data[self::FIELD_EXPERIMENTAL]))); + } } else { $this->setExperimental(new FHIRBoolean($data[self::FIELD_EXPERIMENTAL])); } @@ -757,17 +794,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -776,6 +820,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_JURISDICTION])) { if (is_array($data[self::FIELD_JURISDICTION])) { foreach($data[self::FIELD_JURISDICTION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addJurisdiction($v); } else { @@ -794,8 +841,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_LAST_REVIEW_DATE] instanceof FHIRDate) { $this->setLastReviewDate($data[self::FIELD_LAST_REVIEW_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_LAST_REVIEW_DATE])) { - $this->setLastReviewDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_LAST_REVIEW_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_LAST_REVIEW_DATE])) { + $this->setLastReviewDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_LAST_REVIEW_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_LAST_REVIEW_DATE])) { + $this->setLastReviewDate(new FHIRDate(array_merge($ext, $data[self::FIELD_LAST_REVIEW_DATE]))); + } } else { $this->setLastReviewDate(new FHIRDate($data[self::FIELD_LAST_REVIEW_DATE])); } @@ -806,8 +857,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -815,6 +870,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PARAMETER])) { if (is_array($data[self::FIELD_PARAMETER])) { foreach($data[self::FIELD_PARAMETER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRParameterDefinition) { $this->addParameter($v); } else { @@ -833,8 +891,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PUBLISHER] instanceof FHIRString) { $this->setPublisher($data[self::FIELD_PUBLISHER]); - } elseif ($ext && is_scalar($data[self::FIELD_PUBLISHER])) { - $this->setPublisher(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PUBLISHER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PUBLISHER])) { + $this->setPublisher(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PUBLISHER]] + $ext)); + } else if (is_array($data[self::FIELD_PUBLISHER])) { + $this->setPublisher(new FHIRString(array_merge($ext, $data[self::FIELD_PUBLISHER]))); + } } else { $this->setPublisher(new FHIRString($data[self::FIELD_PUBLISHER])); } @@ -845,8 +907,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PURPOSE] instanceof FHIRMarkdown) { $this->setPurpose($data[self::FIELD_PURPOSE]); - } elseif ($ext && is_scalar($data[self::FIELD_PURPOSE])) { - $this->setPurpose(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_PURPOSE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PURPOSE])) { + $this->setPurpose(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_PURPOSE]] + $ext)); + } else if (is_array($data[self::FIELD_PURPOSE])) { + $this->setPurpose(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_PURPOSE]))); + } } else { $this->setPurpose(new FHIRMarkdown($data[self::FIELD_PURPOSE])); } @@ -854,6 +920,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_RELATED_ARTIFACT])) { if (is_array($data[self::FIELD_RELATED_ARTIFACT])) { foreach($data[self::FIELD_RELATED_ARTIFACT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRRelatedArtifact) { $this->addRelatedArtifact($v); } else { @@ -869,6 +938,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REVIEWER])) { if (is_array($data[self::FIELD_REVIEWER])) { foreach($data[self::FIELD_REVIEWER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContactDetail) { $this->addReviewer($v); } else { @@ -887,8 +959,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRPublicationStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRPublicationStatus([FHIRPublicationStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRPublicationStatus([FHIRPublicationStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRPublicationStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRPublicationStatus($data[self::FIELD_STATUS])); } @@ -913,8 +989,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SUBTITLE] instanceof FHIRString) { $this->setSubtitle($data[self::FIELD_SUBTITLE]); - } elseif ($ext && is_scalar($data[self::FIELD_SUBTITLE])) { - $this->setSubtitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SUBTITLE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SUBTITLE])) { + $this->setSubtitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SUBTITLE]] + $ext)); + } else if (is_array($data[self::FIELD_SUBTITLE])) { + $this->setSubtitle(new FHIRString(array_merge($ext, $data[self::FIELD_SUBTITLE]))); + } } else { $this->setSubtitle(new FHIRString($data[self::FIELD_SUBTITLE])); } @@ -925,8 +1005,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TITLE] instanceof FHIRString) { $this->setTitle($data[self::FIELD_TITLE]); - } elseif ($ext && is_scalar($data[self::FIELD_TITLE])) { - $this->setTitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TITLE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TITLE])) { + $this->setTitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TITLE]] + $ext)); + } else if (is_array($data[self::FIELD_TITLE])) { + $this->setTitle(new FHIRString(array_merge($ext, $data[self::FIELD_TITLE]))); + } } else { $this->setTitle(new FHIRString($data[self::FIELD_TITLE])); } @@ -934,6 +1018,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_TOPIC])) { if (is_array($data[self::FIELD_TOPIC])) { foreach($data[self::FIELD_TOPIC] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addTopic($v); } else { @@ -959,8 +1046,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_URL] instanceof FHIRUri) { $this->setUrl($data[self::FIELD_URL]); - } elseif ($ext && is_scalar($data[self::FIELD_URL])) { - $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } else if (is_array($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri(array_merge($ext, $data[self::FIELD_URL]))); + } } else { $this->setUrl(new FHIRUri($data[self::FIELD_URL])); } @@ -971,8 +1062,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_USAGE] instanceof FHIRString) { $this->setUsage($data[self::FIELD_USAGE]); - } elseif ($ext && is_scalar($data[self::FIELD_USAGE])) { - $this->setUsage(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_USAGE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_USAGE])) { + $this->setUsage(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_USAGE]] + $ext)); + } else if (is_array($data[self::FIELD_USAGE])) { + $this->setUsage(new FHIRString(array_merge($ext, $data[self::FIELD_USAGE]))); + } } else { $this->setUsage(new FHIRString($data[self::FIELD_USAGE])); } @@ -980,6 +1075,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_USE_CONTEXT])) { if (is_array($data[self::FIELD_USE_CONTEXT])) { foreach($data[self::FIELD_USE_CONTEXT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRUsageContext) { $this->addUseContext($v); } else { @@ -998,8 +1096,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VERSION] instanceof FHIRString) { $this->setVersion($data[self::FIELD_VERSION]); - } elseif ($ext && is_scalar($data[self::FIELD_VERSION])) { - $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } else if (is_array($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString(array_merge($ext, $data[self::FIELD_VERSION]))); + } } else { $this->setVersion(new FHIRString($data[self::FIELD_VERSION])); } @@ -2867,7 +2969,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getApprovalDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_APPROVAL_DATE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getAuthor())) { foreach($vs as $v) { if (null === $v) { @@ -2894,10 +2995,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_CONTENT, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getCopyright())) { $v->xmlSerialize($sxe->addChild(self::FIELD_COPYRIGHT, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getDataRequirement())) { foreach($vs as $v) { if (null === $v) { @@ -2906,13 +3007,13 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_DATA_REQUIREMENT, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DATE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getDescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESCRIPTION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getEditor())) { foreach($vs as $v) { if (null === $v) { @@ -2925,7 +3026,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getEffectivePeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EFFECTIVE_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getEndorser())) { foreach($vs as $v) { if (null === $v) { @@ -2934,10 +3034,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_ENDORSER, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getExperimental())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EXPERIMENTAL, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -2955,13 +3055,13 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_JURISDICTION, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getLastReviewDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_LAST_REVIEW_DATE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NAME, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getParameter())) { foreach($vs as $v) { if (null === $v) { @@ -2970,13 +3070,13 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_PARAMETER, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getPublisher())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PUBLISHER, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getPurpose())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PURPOSE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getRelatedArtifact())) { foreach($vs as $v) { if (null === $v) { @@ -2998,11 +3098,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSubjectCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBJECT_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSubjectReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBJECT_REFERENCE, null, $v->_getFHIRXMLNamespace())); } @@ -3012,7 +3110,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getTitle())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TITLE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getTopic())) { foreach($vs as $v) { if (null === $v) { @@ -3031,7 +3128,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getUsage())) { $v->xmlSerialize($sxe->addChild(self::FIELD_USAGE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getUseContext())) { foreach($vs as $v) { if (null === $v) { @@ -3040,6 +3136,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_USE_CONTEXT, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getVersion())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VERSION, null, $v->_getFHIRXMLNamespace())); } @@ -3053,8 +3150,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getApprovalDate())) { - $a[self::FIELD_APPROVAL_DATE] = $v->getValue(); - $a[self::FIELD_APPROVAL_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_APPROVAL_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_APPROVAL_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_APPROVAL_DATE] = $v; + } } if ([] !== ($vs = $this->getAuthor())) { $a[self::FIELD_AUTHOR] = $vs; @@ -3066,19 +3170,40 @@ public function jsonSerialize() $a[self::FIELD_CONTENT] = $vs; } if (null !== ($v = $this->getCopyright())) { - $a[self::FIELD_COPYRIGHT] = $v->getValue(); - $a[self::FIELD_COPYRIGHT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_COPYRIGHT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_COPYRIGHT_EXT] = $enc; + } + } else { + $a[self::FIELD_COPYRIGHT] = $v; + } } if ([] !== ($vs = $this->getDataRequirement())) { $a[self::FIELD_DATA_REQUIREMENT] = $vs; } if (null !== ($v = $this->getDate())) { - $a[self::FIELD_DATE] = $v->getValue(); - $a[self::FIELD_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_DATE] = $v; + } } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if ([] !== ($vs = $this->getEditor())) { $a[self::FIELD_EDITOR] = $vs; @@ -3090,33 +3215,84 @@ public function jsonSerialize() $a[self::FIELD_ENDORSER] = $vs; } if (null !== ($v = $this->getExperimental())) { - $a[self::FIELD_EXPERIMENTAL] = $v->getValue(); - $a[self::FIELD_EXPERIMENTAL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EXPERIMENTAL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EXPERIMENTAL_EXT] = $enc; + } + } else { + $a[self::FIELD_EXPERIMENTAL] = $v; + } } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if ([] !== ($vs = $this->getJurisdiction())) { $a[self::FIELD_JURISDICTION] = $vs; } if (null !== ($v = $this->getLastReviewDate())) { - $a[self::FIELD_LAST_REVIEW_DATE] = $v->getValue(); - $a[self::FIELD_LAST_REVIEW_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_LAST_REVIEW_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_LAST_REVIEW_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_LAST_REVIEW_DATE] = $v; + } } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if ([] !== ($vs = $this->getParameter())) { $a[self::FIELD_PARAMETER] = $vs; } if (null !== ($v = $this->getPublisher())) { - $a[self::FIELD_PUBLISHER] = $v->getValue(); - $a[self::FIELD_PUBLISHER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PUBLISHER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PUBLISHER_EXT] = $enc; + } + } else { + $a[self::FIELD_PUBLISHER] = $v; + } } if (null !== ($v = $this->getPurpose())) { - $a[self::FIELD_PURPOSE] = $v->getValue(); - $a[self::FIELD_PURPOSE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PURPOSE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PURPOSE_EXT] = $enc; + } + } else { + $a[self::FIELD_PURPOSE] = $v; + } } if ([] !== ($vs = $this->getRelatedArtifact())) { $a[self::FIELD_RELATED_ARTIFACT] = $vs; @@ -3125,7 +3301,15 @@ public function jsonSerialize() $a[self::FIELD_REVIEWER] = $vs; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getSubjectCodeableConcept())) { $a[self::FIELD_SUBJECT_CODEABLE_CONCEPT] = $v; @@ -3134,12 +3318,26 @@ public function jsonSerialize() $a[self::FIELD_SUBJECT_REFERENCE] = $v; } if (null !== ($v = $this->getSubtitle())) { - $a[self::FIELD_SUBTITLE] = $v->getValue(); - $a[self::FIELD_SUBTITLE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SUBTITLE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SUBTITLE_EXT] = $enc; + } + } else { + $a[self::FIELD_SUBTITLE] = $v; + } } if (null !== ($v = $this->getTitle())) { - $a[self::FIELD_TITLE] = $v->getValue(); - $a[self::FIELD_TITLE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TITLE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TITLE_EXT] = $enc; + } + } else { + $a[self::FIELD_TITLE] = $v; + } } if ([] !== ($vs = $this->getTopic())) { $a[self::FIELD_TOPIC] = $vs; @@ -3148,19 +3346,40 @@ public function jsonSerialize() $a[self::FIELD_TYPE] = $v; } if (null !== ($v = $this->getUrl())) { - $a[self::FIELD_URL] = $v->getValue(); - $a[self::FIELD_URL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_URL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_URL_EXT] = $enc; + } + } else { + $a[self::FIELD_URL] = $v; + } } if (null !== ($v = $this->getUsage())) { - $a[self::FIELD_USAGE] = $v->getValue(); - $a[self::FIELD_USAGE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_USAGE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_USAGE_EXT] = $enc; + } + } else { + $a[self::FIELD_USAGE] = $v; + } } if ([] !== ($vs = $this->getUseContext())) { $a[self::FIELD_USE_CONTEXT] = $vs; } if (null !== ($v = $this->getVersion())) { - $a[self::FIELD_VERSION] = $v->getValue(); - $a[self::FIELD_VERSION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VERSION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VERSION_EXT] = $enc; + } + } else { + $a[self::FIELD_VERSION] = $v; + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRLinkage.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRLinkage.php index 9d95113e04..a9695058a2 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRLinkage.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRLinkage.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -82,10 +82,6 @@ class FHIRLinkage extends FHIRDomainResource implements PHPFHIRContainedTypeInte { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_LINKAGE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ACTIVE = 'active'; const FIELD_ACTIVE_EXT = '_active'; const FIELD_AUTHOR = 'author'; @@ -126,6 +122,9 @@ class FHIRLinkage extends FHIRDomainResource implements PHPFHIRContainedTypeInte */ protected $item = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRLinkage Constructor * @param null|array $data @@ -148,8 +147,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ACTIVE] instanceof FHIRBoolean) { $this->setActive($data[self::FIELD_ACTIVE]); - } elseif ($ext && is_scalar($data[self::FIELD_ACTIVE])) { - $this->setActive(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_ACTIVE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ACTIVE])) { + $this->setActive(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_ACTIVE]] + $ext)); + } else if (is_array($data[self::FIELD_ACTIVE])) { + $this->setActive(new FHIRBoolean(array_merge($ext, $data[self::FIELD_ACTIVE]))); + } } else { $this->setActive(new FHIRBoolean($data[self::FIELD_ACTIVE])); } @@ -164,6 +167,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ITEM])) { if (is_array($data[self::FIELD_ITEM])) { foreach($data[self::FIELD_ITEM] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRLinkageItem) { $this->addItem($v); } else { @@ -431,11 +437,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getActive())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ACTIVE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getAuthor())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AUTHOR, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getItem())) { foreach($vs as $v) { if (null === $v) { @@ -444,6 +448,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_ITEM, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } @@ -454,8 +459,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getActive())) { - $a[self::FIELD_ACTIVE] = $v->getValue(); - $a[self::FIELD_ACTIVE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ACTIVE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ACTIVE_EXT] = $enc; + } + } else { + $a[self::FIELD_ACTIVE] = $v; + } } if (null !== ($v = $this->getAuthor())) { $a[self::FIELD_AUTHOR] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRList.php index a6e1fdaf77..d8a8149aec 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -87,10 +87,6 @@ class FHIRList extends FHIRDomainResource implements PHPFHIRContainedTypeInterfa { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_LIST; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CODE = 'code'; const FIELD_DATE = 'date'; const FIELD_DATE_EXT = '_date'; @@ -263,6 +259,9 @@ class FHIRList extends FHIRDomainResource implements PHPFHIRContainedTypeInterfa */ protected $title = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRList Constructor * @param null|array $data @@ -292,8 +291,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATE] instanceof FHIRDateTime) { $this->setDate($data[self::FIELD_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_DATE])) { - $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime(array_merge($ext, $data[self::FIELD_DATE]))); + } } else { $this->setDate(new FHIRDateTime($data[self::FIELD_DATE])); } @@ -315,6 +318,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ENTRY])) { if (is_array($data[self::FIELD_ENTRY])) { foreach($data[self::FIELD_ENTRY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRListEntry) { $this->addEntry($v); } else { @@ -333,17 +339,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -355,8 +368,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MODE] instanceof FHIRListMode) { $this->setMode($data[self::FIELD_MODE]); - } elseif ($ext && is_scalar($data[self::FIELD_MODE])) { - $this->setMode(new FHIRListMode([FHIRListMode::FIELD_VALUE => $data[self::FIELD_MODE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MODE])) { + $this->setMode(new FHIRListMode([FHIRListMode::FIELD_VALUE => $data[self::FIELD_MODE]] + $ext)); + } else if (is_array($data[self::FIELD_MODE])) { + $this->setMode(new FHIRListMode(array_merge($ext, $data[self::FIELD_MODE]))); + } } else { $this->setMode(new FHIRListMode($data[self::FIELD_MODE])); } @@ -364,6 +381,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_NOTE])) { if (is_array($data[self::FIELD_NOTE])) { foreach($data[self::FIELD_NOTE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRAnnotation) { $this->addNote($v); } else { @@ -396,8 +416,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRListStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRListStatus([FHIRListStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRListStatus([FHIRListStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRListStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRListStatus($data[self::FIELD_STATUS])); } @@ -415,8 +439,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TITLE] instanceof FHIRString) { $this->setTitle($data[self::FIELD_TITLE]); - } elseif ($ext && is_scalar($data[self::FIELD_TITLE])) { - $this->setTitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TITLE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TITLE])) { + $this->setTitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TITLE]] + $ext)); + } else if (is_array($data[self::FIELD_TITLE])) { + $this->setTitle(new FHIRString(array_merge($ext, $data[self::FIELD_TITLE]))); + } } else { $this->setTitle(new FHIRString($data[self::FIELD_TITLE])); } @@ -1086,22 +1114,18 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DATE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getEmptyReason())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EMPTY_REASON, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getEncounter())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ENCOUNTER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getEntry())) { foreach($vs as $v) { if (null === $v) { @@ -1123,7 +1147,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getMode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MODE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getNote())) { foreach($vs as $v) { if (null === $v) { @@ -1136,15 +1159,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getOrderedBy())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ORDERED_BY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSource())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SOURCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSubject())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBJECT, null, $v->_getFHIRXMLNamespace())); } @@ -1164,8 +1184,15 @@ public function jsonSerialize() $a[self::FIELD_CODE] = $v; } if (null !== ($v = $this->getDate())) { - $a[self::FIELD_DATE] = $v->getValue(); - $a[self::FIELD_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_DATE] = $v; + } } if (null !== ($v = $this->getEmptyReason())) { $a[self::FIELD_EMPTY_REASON] = $v; @@ -1177,10 +1204,34 @@ public function jsonSerialize() $a[self::FIELD_ENTRY] = $vs; } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if (null !== ($v = $this->getMode())) { - $a[self::FIELD_MODE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MODE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MODE_EXT] = $enc; + } + } else { + $a[self::FIELD_MODE] = $v; + } } if ([] !== ($vs = $this->getNote())) { $a[self::FIELD_NOTE] = $vs; @@ -1192,14 +1243,29 @@ public function jsonSerialize() $a[self::FIELD_SOURCE] = $v; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getSubject())) { $a[self::FIELD_SUBJECT] = $v; } if (null !== ($v = $this->getTitle())) { - $a[self::FIELD_TITLE] = $v->getValue(); - $a[self::FIELD_TITLE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TITLE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TITLE_EXT] = $enc; + } + } else { + $a[self::FIELD_TITLE] = $v; + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRLocation.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRLocation.php index 6bad3ba838..0eeefc0a33 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRLocation.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRLocation.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -91,10 +91,6 @@ class FHIRLocation extends FHIRDomainResource implements PHPFHIRContainedTypeInt { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_LOCATION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ADDRESS = 'address'; const FIELD_ALIAS = 'alias'; const FIELD_ALIAS_EXT = '_alias'; @@ -327,6 +323,9 @@ class FHIRLocation extends FHIRDomainResource implements PHPFHIRContainedTypeInt */ protected $type = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRLocation Constructor * @param null|array $data @@ -356,17 +355,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_ALIAS])) { foreach($data[self::FIELD_ALIAS] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRString) { $this->addAlias($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addAlias(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addAlias(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addAlias(new FHIRString(array_merge($v, $ext[$i]))); + } } else { $this->addAlias(new FHIRString($v)); } } } elseif ($data[self::FIELD_ALIAS] instanceof FHIRString) { $this->addAlias($data[self::FIELD_ALIAS]); - } elseif ($ext && is_scalar($data[self::FIELD_ALIAS])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_ALIAS])) { $this->addAlias(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_ALIAS]] + $ext)); } else { $this->addAlias(new FHIRString($data[self::FIELD_ALIAS])); @@ -378,8 +384,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_AVAILABILITY_EXCEPTIONS] instanceof FHIRString) { $this->setAvailabilityExceptions($data[self::FIELD_AVAILABILITY_EXCEPTIONS]); - } elseif ($ext && is_scalar($data[self::FIELD_AVAILABILITY_EXCEPTIONS])) { - $this->setAvailabilityExceptions(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_AVAILABILITY_EXCEPTIONS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_AVAILABILITY_EXCEPTIONS])) { + $this->setAvailabilityExceptions(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_AVAILABILITY_EXCEPTIONS]] + $ext)); + } else if (is_array($data[self::FIELD_AVAILABILITY_EXCEPTIONS])) { + $this->setAvailabilityExceptions(new FHIRString(array_merge($ext, $data[self::FIELD_AVAILABILITY_EXCEPTIONS]))); + } } else { $this->setAvailabilityExceptions(new FHIRString($data[self::FIELD_AVAILABILITY_EXCEPTIONS])); } @@ -390,8 +400,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -399,6 +413,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ENDPOINT])) { if (is_array($data[self::FIELD_ENDPOINT])) { foreach($data[self::FIELD_ENDPOINT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addEndpoint($v); } else { @@ -414,6 +431,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_HOURS_OF_OPERATION])) { if (is_array($data[self::FIELD_HOURS_OF_OPERATION])) { foreach($data[self::FIELD_HOURS_OF_OPERATION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRLocationHoursOfOperation) { $this->addHoursOfOperation($v); } else { @@ -432,17 +452,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -461,8 +488,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MODE] instanceof FHIRLocationMode) { $this->setMode($data[self::FIELD_MODE]); - } elseif ($ext && is_scalar($data[self::FIELD_MODE])) { - $this->setMode(new FHIRLocationMode([FHIRLocationMode::FIELD_VALUE => $data[self::FIELD_MODE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MODE])) { + $this->setMode(new FHIRLocationMode([FHIRLocationMode::FIELD_VALUE => $data[self::FIELD_MODE]] + $ext)); + } else if (is_array($data[self::FIELD_MODE])) { + $this->setMode(new FHIRLocationMode(array_merge($ext, $data[self::FIELD_MODE]))); + } } else { $this->setMode(new FHIRLocationMode($data[self::FIELD_MODE])); } @@ -473,8 +504,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -513,8 +548,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRLocationStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRLocationStatus([FHIRLocationStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRLocationStatus([FHIRLocationStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRLocationStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRLocationStatus($data[self::FIELD_STATUS])); } @@ -525,17 +564,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_TELECOM])) { foreach($data[self::FIELD_TELECOM] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContactPoint) { $this->addTelecom($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addTelecom(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addTelecom(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addTelecom(new FHIRContactPoint(array_merge($v, $ext[$i]))); + } } else { $this->addTelecom(new FHIRContactPoint($v)); } } } elseif ($data[self::FIELD_TELECOM] instanceof FHIRContactPoint) { $this->addTelecom($data[self::FIELD_TELECOM]); - } elseif ($ext && is_scalar($data[self::FIELD_TELECOM])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_TELECOM])) { $this->addTelecom(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $data[self::FIELD_TELECOM]] + $ext)); } else { $this->addTelecom(new FHIRContactPoint($data[self::FIELD_TELECOM])); @@ -544,6 +590,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_TYPE])) { if (is_array($data[self::FIELD_TYPE])) { foreach($data[self::FIELD_TYPE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addType($v); } else { @@ -1482,7 +1531,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getAddress())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ADDRESS, null, $v->_getFHIRXMLNamespace())); } @@ -1494,13 +1542,13 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_ALIAS, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getAvailabilityExceptions())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AVAILABILITY_EXCEPTIONS, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getDescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESCRIPTION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getEndpoint())) { foreach($vs as $v) { if (null === $v) { @@ -1531,34 +1579,27 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getManagingOrganization())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MANAGING_ORGANIZATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getMode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MODE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NAME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOperationalStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OPERATIONAL_STATUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPartOf())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PART_OF, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPhysicalType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PHYSICAL_TYPE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPosition())) { $v->xmlSerialize($sxe->addChild(self::FIELD_POSITION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getTelecom())) { foreach($vs as $v) { if (null === $v) { @@ -1576,6 +1617,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } @@ -1594,17 +1636,40 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_ALIAS][] = $v->getValue(); - $a[self::FIELD_ALIAS_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ALIAS][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ALIAS_EXT][] = $enc; + } else { + $a[self::FIELD_ALIAS_EXT][] = null; + } + } else { + $a[self::FIELD_ALIAS][] = $v; + } } } if (null !== ($v = $this->getAvailabilityExceptions())) { - $a[self::FIELD_AVAILABILITY_EXCEPTIONS] = $v->getValue(); - $a[self::FIELD_AVAILABILITY_EXCEPTIONS_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_AVAILABILITY_EXCEPTIONS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_AVAILABILITY_EXCEPTIONS_EXT] = $enc; + } + } else { + $a[self::FIELD_AVAILABILITY_EXCEPTIONS] = $v; + } } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if ([] !== ($vs = $this->getEndpoint())) { $a[self::FIELD_ENDPOINT] = $vs; @@ -1613,17 +1678,48 @@ public function jsonSerialize() $a[self::FIELD_HOURS_OF_OPERATION] = $vs; } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if (null !== ($v = $this->getManagingOrganization())) { $a[self::FIELD_MANAGING_ORGANIZATION] = $v; } if (null !== ($v = $this->getMode())) { - $a[self::FIELD_MODE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MODE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MODE_EXT] = $enc; + } + } else { + $a[self::FIELD_MODE] = $v; + } } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if (null !== ($v = $this->getOperationalStatus())) { $a[self::FIELD_OPERATIONAL_STATUS] = $v; @@ -1638,10 +1734,34 @@ public function jsonSerialize() $a[self::FIELD_POSITION] = $v; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if ([] !== ($vs = $this->getTelecom())) { - $a[self::FIELD_TELECOM] = $vs; + $a[self::FIELD_TELECOM] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TELECOM][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TELECOM_EXT][] = $enc; + } else { + $a[self::FIELD_TELECOM_EXT][] = null; + } + } else { + $a[self::FIELD_TELECOM][] = $v; + } + } } if ([] !== ($vs = $this->getType())) { $a[self::FIELD_TYPE] = $vs; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRMeasure.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRMeasure.php index 50f457a0b7..8824a2bf64 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRMeasure.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRMeasure.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -95,10 +95,6 @@ class FHIRMeasure extends FHIRDomainResource implements PHPFHIRContainedTypeInte { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MEASURE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_APPROVAL_DATE = 'approvalDate'; const FIELD_APPROVAL_DATE_EXT = '_approvalDate'; const FIELD_AUTHOR = 'author'; @@ -734,6 +730,9 @@ class FHIRMeasure extends FHIRDomainResource implements PHPFHIRContainedTypeInte */ protected $version = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMeasure Constructor * @param null|array $data @@ -756,8 +755,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_APPROVAL_DATE] instanceof FHIRDate) { $this->setApprovalDate($data[self::FIELD_APPROVAL_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_APPROVAL_DATE])) { - $this->setApprovalDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_APPROVAL_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_APPROVAL_DATE])) { + $this->setApprovalDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_APPROVAL_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_APPROVAL_DATE])) { + $this->setApprovalDate(new FHIRDate(array_merge($ext, $data[self::FIELD_APPROVAL_DATE]))); + } } else { $this->setApprovalDate(new FHIRDate($data[self::FIELD_APPROVAL_DATE])); } @@ -765,6 +768,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_AUTHOR])) { if (is_array($data[self::FIELD_AUTHOR])) { foreach($data[self::FIELD_AUTHOR] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContactDetail) { $this->addAuthor($v); } else { @@ -783,8 +789,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CLINICAL_RECOMMENDATION_STATEMENT] instanceof FHIRMarkdown) { $this->setClinicalRecommendationStatement($data[self::FIELD_CLINICAL_RECOMMENDATION_STATEMENT]); - } elseif ($ext && is_scalar($data[self::FIELD_CLINICAL_RECOMMENDATION_STATEMENT])) { - $this->setClinicalRecommendationStatement(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_CLINICAL_RECOMMENDATION_STATEMENT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CLINICAL_RECOMMENDATION_STATEMENT])) { + $this->setClinicalRecommendationStatement(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_CLINICAL_RECOMMENDATION_STATEMENT]] + $ext)); + } else if (is_array($data[self::FIELD_CLINICAL_RECOMMENDATION_STATEMENT])) { + $this->setClinicalRecommendationStatement(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_CLINICAL_RECOMMENDATION_STATEMENT]))); + } } else { $this->setClinicalRecommendationStatement(new FHIRMarkdown($data[self::FIELD_CLINICAL_RECOMMENDATION_STATEMENT])); } @@ -799,6 +809,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CONTACT])) { if (is_array($data[self::FIELD_CONTACT])) { foreach($data[self::FIELD_CONTACT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContactDetail) { $this->addContact($v); } else { @@ -817,8 +830,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_COPYRIGHT] instanceof FHIRMarkdown) { $this->setCopyright($data[self::FIELD_COPYRIGHT]); - } elseif ($ext && is_scalar($data[self::FIELD_COPYRIGHT])) { - $this->setCopyright(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_COPYRIGHT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_COPYRIGHT])) { + $this->setCopyright(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_COPYRIGHT]] + $ext)); + } else if (is_array($data[self::FIELD_COPYRIGHT])) { + $this->setCopyright(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_COPYRIGHT]))); + } } else { $this->setCopyright(new FHIRMarkdown($data[self::FIELD_COPYRIGHT])); } @@ -829,8 +846,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATE] instanceof FHIRDateTime) { $this->setDate($data[self::FIELD_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_DATE])) { - $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime(array_merge($ext, $data[self::FIELD_DATE]))); + } } else { $this->setDate(new FHIRDateTime($data[self::FIELD_DATE])); } @@ -841,17 +862,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_DEFINITION])) { foreach($data[self::FIELD_DEFINITION] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRMarkdown) { $this->addDefinition($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addDefinition(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addDefinition(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addDefinition(new FHIRMarkdown(array_merge($v, $ext[$i]))); + } } else { $this->addDefinition(new FHIRMarkdown($v)); } } } elseif ($data[self::FIELD_DEFINITION] instanceof FHIRMarkdown) { $this->addDefinition($data[self::FIELD_DEFINITION]); - } elseif ($ext && is_scalar($data[self::FIELD_DEFINITION])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_DEFINITION])) { $this->addDefinition(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_DEFINITION]] + $ext)); } else { $this->addDefinition(new FHIRMarkdown($data[self::FIELD_DEFINITION])); @@ -863,8 +891,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRMarkdown) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRMarkdown($data[self::FIELD_DESCRIPTION])); } @@ -875,8 +907,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DISCLAIMER] instanceof FHIRMarkdown) { $this->setDisclaimer($data[self::FIELD_DISCLAIMER]); - } elseif ($ext && is_scalar($data[self::FIELD_DISCLAIMER])) { - $this->setDisclaimer(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_DISCLAIMER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DISCLAIMER])) { + $this->setDisclaimer(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_DISCLAIMER]] + $ext)); + } else if (is_array($data[self::FIELD_DISCLAIMER])) { + $this->setDisclaimer(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_DISCLAIMER]))); + } } else { $this->setDisclaimer(new FHIRMarkdown($data[self::FIELD_DISCLAIMER])); } @@ -884,6 +920,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_EDITOR])) { if (is_array($data[self::FIELD_EDITOR])) { foreach($data[self::FIELD_EDITOR] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContactDetail) { $this->addEditor($v); } else { @@ -906,6 +945,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ENDORSER])) { if (is_array($data[self::FIELD_ENDORSER])) { foreach($data[self::FIELD_ENDORSER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContactDetail) { $this->addEndorser($v); } else { @@ -924,8 +966,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EXPERIMENTAL] instanceof FHIRBoolean) { $this->setExperimental($data[self::FIELD_EXPERIMENTAL]); - } elseif ($ext && is_scalar($data[self::FIELD_EXPERIMENTAL])) { - $this->setExperimental(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_EXPERIMENTAL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EXPERIMENTAL])) { + $this->setExperimental(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_EXPERIMENTAL]] + $ext)); + } else if (is_array($data[self::FIELD_EXPERIMENTAL])) { + $this->setExperimental(new FHIRBoolean(array_merge($ext, $data[self::FIELD_EXPERIMENTAL]))); + } } else { $this->setExperimental(new FHIRBoolean($data[self::FIELD_EXPERIMENTAL])); } @@ -933,6 +979,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_GROUP])) { if (is_array($data[self::FIELD_GROUP])) { foreach($data[self::FIELD_GROUP] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRMeasureGroup) { $this->addGroup($v); } else { @@ -951,8 +1000,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_GUIDANCE] instanceof FHIRMarkdown) { $this->setGuidance($data[self::FIELD_GUIDANCE]); - } elseif ($ext && is_scalar($data[self::FIELD_GUIDANCE])) { - $this->setGuidance(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_GUIDANCE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_GUIDANCE])) { + $this->setGuidance(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_GUIDANCE]] + $ext)); + } else if (is_array($data[self::FIELD_GUIDANCE])) { + $this->setGuidance(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_GUIDANCE]))); + } } else { $this->setGuidance(new FHIRMarkdown($data[self::FIELD_GUIDANCE])); } @@ -963,17 +1016,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -989,6 +1049,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_JURISDICTION])) { if (is_array($data[self::FIELD_JURISDICTION])) { foreach($data[self::FIELD_JURISDICTION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addJurisdiction($v); } else { @@ -1007,8 +1070,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_LAST_REVIEW_DATE] instanceof FHIRDate) { $this->setLastReviewDate($data[self::FIELD_LAST_REVIEW_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_LAST_REVIEW_DATE])) { - $this->setLastReviewDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_LAST_REVIEW_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_LAST_REVIEW_DATE])) { + $this->setLastReviewDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_LAST_REVIEW_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_LAST_REVIEW_DATE])) { + $this->setLastReviewDate(new FHIRDate(array_merge($ext, $data[self::FIELD_LAST_REVIEW_DATE]))); + } } else { $this->setLastReviewDate(new FHIRDate($data[self::FIELD_LAST_REVIEW_DATE])); } @@ -1019,17 +1086,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_LIBRARY])) { foreach($data[self::FIELD_LIBRARY] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCanonical) { $this->addLibrary($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addLibrary(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addLibrary(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addLibrary(new FHIRCanonical(array_merge($v, $ext[$i]))); + } } else { $this->addLibrary(new FHIRCanonical($v)); } } } elseif ($data[self::FIELD_LIBRARY] instanceof FHIRCanonical) { $this->addLibrary($data[self::FIELD_LIBRARY]); - } elseif ($ext && is_scalar($data[self::FIELD_LIBRARY])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_LIBRARY])) { $this->addLibrary(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $data[self::FIELD_LIBRARY]] + $ext)); } else { $this->addLibrary(new FHIRCanonical($data[self::FIELD_LIBRARY])); @@ -1041,8 +1115,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -1053,8 +1131,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PUBLISHER] instanceof FHIRString) { $this->setPublisher($data[self::FIELD_PUBLISHER]); - } elseif ($ext && is_scalar($data[self::FIELD_PUBLISHER])) { - $this->setPublisher(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PUBLISHER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PUBLISHER])) { + $this->setPublisher(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PUBLISHER]] + $ext)); + } else if (is_array($data[self::FIELD_PUBLISHER])) { + $this->setPublisher(new FHIRString(array_merge($ext, $data[self::FIELD_PUBLISHER]))); + } } else { $this->setPublisher(new FHIRString($data[self::FIELD_PUBLISHER])); } @@ -1065,8 +1147,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PURPOSE] instanceof FHIRMarkdown) { $this->setPurpose($data[self::FIELD_PURPOSE]); - } elseif ($ext && is_scalar($data[self::FIELD_PURPOSE])) { - $this->setPurpose(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_PURPOSE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PURPOSE])) { + $this->setPurpose(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_PURPOSE]] + $ext)); + } else if (is_array($data[self::FIELD_PURPOSE])) { + $this->setPurpose(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_PURPOSE]))); + } } else { $this->setPurpose(new FHIRMarkdown($data[self::FIELD_PURPOSE])); } @@ -1077,8 +1163,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_RATE_AGGREGATION] instanceof FHIRString) { $this->setRateAggregation($data[self::FIELD_RATE_AGGREGATION]); - } elseif ($ext && is_scalar($data[self::FIELD_RATE_AGGREGATION])) { - $this->setRateAggregation(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_RATE_AGGREGATION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_RATE_AGGREGATION])) { + $this->setRateAggregation(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_RATE_AGGREGATION]] + $ext)); + } else if (is_array($data[self::FIELD_RATE_AGGREGATION])) { + $this->setRateAggregation(new FHIRString(array_merge($ext, $data[self::FIELD_RATE_AGGREGATION]))); + } } else { $this->setRateAggregation(new FHIRString($data[self::FIELD_RATE_AGGREGATION])); } @@ -1089,8 +1179,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_RATIONALE] instanceof FHIRMarkdown) { $this->setRationale($data[self::FIELD_RATIONALE]); - } elseif ($ext && is_scalar($data[self::FIELD_RATIONALE])) { - $this->setRationale(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_RATIONALE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_RATIONALE])) { + $this->setRationale(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_RATIONALE]] + $ext)); + } else if (is_array($data[self::FIELD_RATIONALE])) { + $this->setRationale(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_RATIONALE]))); + } } else { $this->setRationale(new FHIRMarkdown($data[self::FIELD_RATIONALE])); } @@ -1098,6 +1192,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_RELATED_ARTIFACT])) { if (is_array($data[self::FIELD_RELATED_ARTIFACT])) { foreach($data[self::FIELD_RELATED_ARTIFACT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRRelatedArtifact) { $this->addRelatedArtifact($v); } else { @@ -1113,6 +1210,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REVIEWER])) { if (is_array($data[self::FIELD_REVIEWER])) { foreach($data[self::FIELD_REVIEWER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContactDetail) { $this->addReviewer($v); } else { @@ -1131,8 +1231,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_RISK_ADJUSTMENT] instanceof FHIRString) { $this->setRiskAdjustment($data[self::FIELD_RISK_ADJUSTMENT]); - } elseif ($ext && is_scalar($data[self::FIELD_RISK_ADJUSTMENT])) { - $this->setRiskAdjustment(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_RISK_ADJUSTMENT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_RISK_ADJUSTMENT])) { + $this->setRiskAdjustment(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_RISK_ADJUSTMENT]] + $ext)); + } else if (is_array($data[self::FIELD_RISK_ADJUSTMENT])) { + $this->setRiskAdjustment(new FHIRString(array_merge($ext, $data[self::FIELD_RISK_ADJUSTMENT]))); + } } else { $this->setRiskAdjustment(new FHIRString($data[self::FIELD_RISK_ADJUSTMENT])); } @@ -1150,8 +1254,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRPublicationStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRPublicationStatus([FHIRPublicationStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRPublicationStatus([FHIRPublicationStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRPublicationStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRPublicationStatus($data[self::FIELD_STATUS])); } @@ -1176,8 +1284,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SUBTITLE] instanceof FHIRString) { $this->setSubtitle($data[self::FIELD_SUBTITLE]); - } elseif ($ext && is_scalar($data[self::FIELD_SUBTITLE])) { - $this->setSubtitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SUBTITLE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SUBTITLE])) { + $this->setSubtitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SUBTITLE]] + $ext)); + } else if (is_array($data[self::FIELD_SUBTITLE])) { + $this->setSubtitle(new FHIRString(array_merge($ext, $data[self::FIELD_SUBTITLE]))); + } } else { $this->setSubtitle(new FHIRString($data[self::FIELD_SUBTITLE])); } @@ -1185,6 +1297,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SUPPLEMENTAL_DATA])) { if (is_array($data[self::FIELD_SUPPLEMENTAL_DATA])) { foreach($data[self::FIELD_SUPPLEMENTAL_DATA] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRMeasureSupplementalData) { $this->addSupplementalData($v); } else { @@ -1203,8 +1318,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TITLE] instanceof FHIRString) { $this->setTitle($data[self::FIELD_TITLE]); - } elseif ($ext && is_scalar($data[self::FIELD_TITLE])) { - $this->setTitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TITLE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TITLE])) { + $this->setTitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TITLE]] + $ext)); + } else if (is_array($data[self::FIELD_TITLE])) { + $this->setTitle(new FHIRString(array_merge($ext, $data[self::FIELD_TITLE]))); + } } else { $this->setTitle(new FHIRString($data[self::FIELD_TITLE])); } @@ -1212,6 +1331,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_TOPIC])) { if (is_array($data[self::FIELD_TOPIC])) { foreach($data[self::FIELD_TOPIC] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addTopic($v); } else { @@ -1227,6 +1349,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_TYPE])) { if (is_array($data[self::FIELD_TYPE])) { foreach($data[self::FIELD_TYPE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addType($v); } else { @@ -1245,8 +1370,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_URL] instanceof FHIRUri) { $this->setUrl($data[self::FIELD_URL]); - } elseif ($ext && is_scalar($data[self::FIELD_URL])) { - $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } else if (is_array($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri(array_merge($ext, $data[self::FIELD_URL]))); + } } else { $this->setUrl(new FHIRUri($data[self::FIELD_URL])); } @@ -1257,8 +1386,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_USAGE] instanceof FHIRString) { $this->setUsage($data[self::FIELD_USAGE]); - } elseif ($ext && is_scalar($data[self::FIELD_USAGE])) { - $this->setUsage(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_USAGE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_USAGE])) { + $this->setUsage(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_USAGE]] + $ext)); + } else if (is_array($data[self::FIELD_USAGE])) { + $this->setUsage(new FHIRString(array_merge($ext, $data[self::FIELD_USAGE]))); + } } else { $this->setUsage(new FHIRString($data[self::FIELD_USAGE])); } @@ -1266,6 +1399,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_USE_CONTEXT])) { if (is_array($data[self::FIELD_USE_CONTEXT])) { foreach($data[self::FIELD_USE_CONTEXT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRUsageContext) { $this->addUseContext($v); } else { @@ -1284,8 +1420,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VERSION] instanceof FHIRString) { $this->setVersion($data[self::FIELD_VERSION]); - } elseif ($ext && is_scalar($data[self::FIELD_VERSION])) { - $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } else if (is_array($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString(array_merge($ext, $data[self::FIELD_VERSION]))); + } } else { $this->setVersion(new FHIRString($data[self::FIELD_VERSION])); } @@ -3688,7 +3828,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getApprovalDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_APPROVAL_DATE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getAuthor())) { foreach($vs as $v) { if (null === $v) { @@ -3697,14 +3836,13 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_AUTHOR, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getClinicalRecommendationStatement())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CLINICAL_RECOMMENDATION_STATEMENT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getCompositeScoring())) { $v->xmlSerialize($sxe->addChild(self::FIELD_COMPOSITE_SCORING, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getContact())) { foreach($vs as $v) { if (null === $v) { @@ -3713,6 +3851,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_CONTACT, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getCopyright())) { $v->xmlSerialize($sxe->addChild(self::FIELD_COPYRIGHT, null, $v->_getFHIRXMLNamespace())); } @@ -3727,13 +3866,13 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_DEFINITION, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getDescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESCRIPTION, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getDisclaimer())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DISCLAIMER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getEditor())) { foreach($vs as $v) { if (null === $v) { @@ -3746,7 +3885,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getEffectivePeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EFFECTIVE_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getEndorser())) { foreach($vs as $v) { if (null === $v) { @@ -3755,10 +3893,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_ENDORSER, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getExperimental())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EXPERIMENTAL, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getGroup())) { foreach($vs as $v) { if (null === $v) { @@ -3767,10 +3905,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_GROUP, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getGuidance())) { $v->xmlSerialize($sxe->addChild(self::FIELD_GUIDANCE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -3783,7 +3921,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getImprovementNotation())) { $v->xmlSerialize($sxe->addChild(self::FIELD_IMPROVEMENT_NOTATION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getJurisdiction())) { foreach($vs as $v) { if (null === $v) { @@ -3792,6 +3929,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_JURISDICTION, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getLastReviewDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_LAST_REVIEW_DATE, null, $v->_getFHIRXMLNamespace())); } @@ -3803,6 +3941,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_LIBRARY, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NAME, null, $v->_getFHIRXMLNamespace())); } @@ -3818,7 +3957,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getRationale())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RATIONALE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getRelatedArtifact())) { foreach($vs as $v) { if (null === $v) { @@ -3836,29 +3974,25 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_REVIEWER, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getRiskAdjustment())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RISK_ADJUSTMENT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getScoring())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SCORING, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSubjectCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBJECT_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSubjectReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBJECT_REFERENCE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getSubtitle())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBTITLE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getSupplementalData())) { foreach($vs as $v) { if (null === $v) { @@ -3867,10 +4001,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_SUPPLEMENTAL_DATA, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getTitle())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TITLE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getTopic())) { foreach($vs as $v) { if (null === $v) { @@ -3888,13 +4022,13 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getUrl())) { $v->xmlSerialize($sxe->addChild(self::FIELD_URL, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getUsage())) { $v->xmlSerialize($sxe->addChild(self::FIELD_USAGE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getUseContext())) { foreach($vs as $v) { if (null === $v) { @@ -3903,6 +4037,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_USE_CONTEXT, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getVersion())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VERSION, null, $v->_getFHIRXMLNamespace())); } @@ -3916,15 +4051,29 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getApprovalDate())) { - $a[self::FIELD_APPROVAL_DATE] = $v->getValue(); - $a[self::FIELD_APPROVAL_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_APPROVAL_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_APPROVAL_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_APPROVAL_DATE] = $v; + } } if ([] !== ($vs = $this->getAuthor())) { $a[self::FIELD_AUTHOR] = $vs; } if (null !== ($v = $this->getClinicalRecommendationStatement())) { - $a[self::FIELD_CLINICAL_RECOMMENDATION_STATEMENT] = $v->getValue(); - $a[self::FIELD_CLINICAL_RECOMMENDATION_STATEMENT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CLINICAL_RECOMMENDATION_STATEMENT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CLINICAL_RECOMMENDATION_STATEMENT_EXT] = $enc; + } + } else { + $a[self::FIELD_CLINICAL_RECOMMENDATION_STATEMENT] = $v; + } } if (null !== ($v = $this->getCompositeScoring())) { $a[self::FIELD_COMPOSITE_SCORING] = $v; @@ -3933,12 +4082,26 @@ public function jsonSerialize() $a[self::FIELD_CONTACT] = $vs; } if (null !== ($v = $this->getCopyright())) { - $a[self::FIELD_COPYRIGHT] = $v->getValue(); - $a[self::FIELD_COPYRIGHT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_COPYRIGHT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_COPYRIGHT_EXT] = $enc; + } + } else { + $a[self::FIELD_COPYRIGHT] = $v; + } } if (null !== ($v = $this->getDate())) { - $a[self::FIELD_DATE] = $v->getValue(); - $a[self::FIELD_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_DATE] = $v; + } } if ([] !== ($vs = $this->getDefinition())) { $a[self::FIELD_DEFINITION] = []; @@ -3946,17 +4109,40 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_DEFINITION][] = $v->getValue(); - $a[self::FIELD_DEFINITION_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DEFINITION][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DEFINITION_EXT][] = $enc; + } else { + $a[self::FIELD_DEFINITION_EXT][] = null; + } + } else { + $a[self::FIELD_DEFINITION][] = $v; + } } } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if (null !== ($v = $this->getDisclaimer())) { - $a[self::FIELD_DISCLAIMER] = $v->getValue(); - $a[self::FIELD_DISCLAIMER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DISCLAIMER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DISCLAIMER_EXT] = $enc; + } + } else { + $a[self::FIELD_DISCLAIMER] = $v; + } } if ([] !== ($vs = $this->getEditor())) { $a[self::FIELD_EDITOR] = $vs; @@ -3968,18 +4154,48 @@ public function jsonSerialize() $a[self::FIELD_ENDORSER] = $vs; } if (null !== ($v = $this->getExperimental())) { - $a[self::FIELD_EXPERIMENTAL] = $v->getValue(); - $a[self::FIELD_EXPERIMENTAL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EXPERIMENTAL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EXPERIMENTAL_EXT] = $enc; + } + } else { + $a[self::FIELD_EXPERIMENTAL] = $v; + } } if ([] !== ($vs = $this->getGroup())) { $a[self::FIELD_GROUP] = $vs; } if (null !== ($v = $this->getGuidance())) { - $a[self::FIELD_GUIDANCE] = $v->getValue(); - $a[self::FIELD_GUIDANCE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_GUIDANCE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_GUIDANCE_EXT] = $enc; + } + } else { + $a[self::FIELD_GUIDANCE] = $v; + } } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if (null !== ($v = $this->getImprovementNotation())) { $a[self::FIELD_IMPROVEMENT_NOTATION] = $v; @@ -3988,8 +4204,15 @@ public function jsonSerialize() $a[self::FIELD_JURISDICTION] = $vs; } if (null !== ($v = $this->getLastReviewDate())) { - $a[self::FIELD_LAST_REVIEW_DATE] = $v->getValue(); - $a[self::FIELD_LAST_REVIEW_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_LAST_REVIEW_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_LAST_REVIEW_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_LAST_REVIEW_DATE] = $v; + } } if ([] !== ($vs = $this->getLibrary())) { $a[self::FIELD_LIBRARY] = []; @@ -3997,29 +4220,73 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_LIBRARY][] = $v->getValue(); - $a[self::FIELD_LIBRARY_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_LIBRARY][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_LIBRARY_EXT][] = $enc; + } else { + $a[self::FIELD_LIBRARY_EXT][] = null; + } + } else { + $a[self::FIELD_LIBRARY][] = $v; + } } } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if (null !== ($v = $this->getPublisher())) { - $a[self::FIELD_PUBLISHER] = $v->getValue(); - $a[self::FIELD_PUBLISHER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PUBLISHER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PUBLISHER_EXT] = $enc; + } + } else { + $a[self::FIELD_PUBLISHER] = $v; + } } if (null !== ($v = $this->getPurpose())) { - $a[self::FIELD_PURPOSE] = $v->getValue(); - $a[self::FIELD_PURPOSE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PURPOSE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PURPOSE_EXT] = $enc; + } + } else { + $a[self::FIELD_PURPOSE] = $v; + } } if (null !== ($v = $this->getRateAggregation())) { - $a[self::FIELD_RATE_AGGREGATION] = $v->getValue(); - $a[self::FIELD_RATE_AGGREGATION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_RATE_AGGREGATION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_RATE_AGGREGATION_EXT] = $enc; + } + } else { + $a[self::FIELD_RATE_AGGREGATION] = $v; + } } if (null !== ($v = $this->getRationale())) { - $a[self::FIELD_RATIONALE] = $v->getValue(); - $a[self::FIELD_RATIONALE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_RATIONALE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_RATIONALE_EXT] = $enc; + } + } else { + $a[self::FIELD_RATIONALE] = $v; + } } if ([] !== ($vs = $this->getRelatedArtifact())) { $a[self::FIELD_RELATED_ARTIFACT] = $vs; @@ -4028,14 +4295,29 @@ public function jsonSerialize() $a[self::FIELD_REVIEWER] = $vs; } if (null !== ($v = $this->getRiskAdjustment())) { - $a[self::FIELD_RISK_ADJUSTMENT] = $v->getValue(); - $a[self::FIELD_RISK_ADJUSTMENT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_RISK_ADJUSTMENT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_RISK_ADJUSTMENT_EXT] = $enc; + } + } else { + $a[self::FIELD_RISK_ADJUSTMENT] = $v; + } } if (null !== ($v = $this->getScoring())) { $a[self::FIELD_SCORING] = $v; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getSubjectCodeableConcept())) { $a[self::FIELD_SUBJECT_CODEABLE_CONCEPT] = $v; @@ -4044,15 +4326,29 @@ public function jsonSerialize() $a[self::FIELD_SUBJECT_REFERENCE] = $v; } if (null !== ($v = $this->getSubtitle())) { - $a[self::FIELD_SUBTITLE] = $v->getValue(); - $a[self::FIELD_SUBTITLE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SUBTITLE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SUBTITLE_EXT] = $enc; + } + } else { + $a[self::FIELD_SUBTITLE] = $v; + } } if ([] !== ($vs = $this->getSupplementalData())) { $a[self::FIELD_SUPPLEMENTAL_DATA] = $vs; } if (null !== ($v = $this->getTitle())) { - $a[self::FIELD_TITLE] = $v->getValue(); - $a[self::FIELD_TITLE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TITLE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TITLE_EXT] = $enc; + } + } else { + $a[self::FIELD_TITLE] = $v; + } } if ([] !== ($vs = $this->getTopic())) { $a[self::FIELD_TOPIC] = $vs; @@ -4061,19 +4357,40 @@ public function jsonSerialize() $a[self::FIELD_TYPE] = $vs; } if (null !== ($v = $this->getUrl())) { - $a[self::FIELD_URL] = $v->getValue(); - $a[self::FIELD_URL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_URL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_URL_EXT] = $enc; + } + } else { + $a[self::FIELD_URL] = $v; + } } if (null !== ($v = $this->getUsage())) { - $a[self::FIELD_USAGE] = $v->getValue(); - $a[self::FIELD_USAGE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_USAGE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_USAGE_EXT] = $enc; + } + } else { + $a[self::FIELD_USAGE] = $v; + } } if ([] !== ($vs = $this->getUseContext())) { $a[self::FIELD_USE_CONTEXT] = $vs; } if (null !== ($v = $this->getVersion())) { - $a[self::FIELD_VERSION] = $v->getValue(); - $a[self::FIELD_VERSION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VERSION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VERSION_EXT] = $enc; + } + } else { + $a[self::FIELD_VERSION] = $v; + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRMeasureReport.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRMeasureReport.php index bc0c83f827..19b3ba8ca8 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRMeasureReport.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRMeasureReport.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -88,10 +88,6 @@ class FHIRMeasureReport extends FHIRDomainResource implements PHPFHIRContainedTy { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MEASURE_REPORT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DATE = 'date'; const FIELD_DATE_EXT = '_date'; const FIELD_EVALUATED_RESOURCE = 'evaluatedResource'; @@ -243,6 +239,9 @@ class FHIRMeasureReport extends FHIRDomainResource implements PHPFHIRContainedTy */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMeasureReport Constructor * @param null|array $data @@ -265,8 +264,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATE] instanceof FHIRDateTime) { $this->setDate($data[self::FIELD_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_DATE])) { - $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime(array_merge($ext, $data[self::FIELD_DATE]))); + } } else { $this->setDate(new FHIRDateTime($data[self::FIELD_DATE])); } @@ -274,6 +277,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_EVALUATED_RESOURCE])) { if (is_array($data[self::FIELD_EVALUATED_RESOURCE])) { foreach($data[self::FIELD_EVALUATED_RESOURCE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addEvaluatedResource($v); } else { @@ -289,6 +295,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_GROUP])) { if (is_array($data[self::FIELD_GROUP])) { foreach($data[self::FIELD_GROUP] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRMeasureReportGroup) { $this->addGroup($v); } else { @@ -307,17 +316,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -336,8 +352,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MEASURE] instanceof FHIRCanonical) { $this->setMeasure($data[self::FIELD_MEASURE]); - } elseif ($ext && is_scalar($data[self::FIELD_MEASURE])) { - $this->setMeasure(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $data[self::FIELD_MEASURE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MEASURE])) { + $this->setMeasure(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $data[self::FIELD_MEASURE]] + $ext)); + } else if (is_array($data[self::FIELD_MEASURE])) { + $this->setMeasure(new FHIRCanonical(array_merge($ext, $data[self::FIELD_MEASURE]))); + } } else { $this->setMeasure(new FHIRCanonical($data[self::FIELD_MEASURE])); } @@ -362,8 +382,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRMeasureReportStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRMeasureReportStatus([FHIRMeasureReportStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRMeasureReportStatus([FHIRMeasureReportStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRMeasureReportStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRMeasureReportStatus($data[self::FIELD_STATUS])); } @@ -381,8 +405,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TYPE] instanceof FHIRMeasureReportType) { $this->setType($data[self::FIELD_TYPE]); - } elseif ($ext && is_scalar($data[self::FIELD_TYPE])) { - $this->setType(new FHIRMeasureReportType([FHIRMeasureReportType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TYPE])) { + $this->setType(new FHIRMeasureReportType([FHIRMeasureReportType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } else if (is_array($data[self::FIELD_TYPE])) { + $this->setType(new FHIRMeasureReportType(array_merge($ext, $data[self::FIELD_TYPE]))); + } } else { $this->setType(new FHIRMeasureReportType($data[self::FIELD_TYPE])); } @@ -997,7 +1025,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DATE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getEvaluatedResource())) { foreach($vs as $v) { if (null === $v) { @@ -1031,23 +1058,18 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getMeasure())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MEASURE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getReporter())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REPORTER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSubject())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBJECT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -1061,8 +1083,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getDate())) { - $a[self::FIELD_DATE] = $v->getValue(); - $a[self::FIELD_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_DATE] = $v; + } } if ([] !== ($vs = $this->getEvaluatedResource())) { $a[self::FIELD_EVALUATED_RESOURCE] = $vs; @@ -1071,14 +1100,37 @@ public function jsonSerialize() $a[self::FIELD_GROUP] = $vs; } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if (null !== ($v = $this->getImprovementNotation())) { $a[self::FIELD_IMPROVEMENT_NOTATION] = $v; } if (null !== ($v = $this->getMeasure())) { - $a[self::FIELD_MEASURE] = $v->getValue(); - $a[self::FIELD_MEASURE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MEASURE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MEASURE_EXT] = $enc; + } + } else { + $a[self::FIELD_MEASURE] = $v; + } } if (null !== ($v = $this->getPeriod())) { $a[self::FIELD_PERIOD] = $v; @@ -1087,13 +1139,29 @@ public function jsonSerialize() $a[self::FIELD_REPORTER] = $v; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getSubject())) { $a[self::FIELD_SUBJECT] = $v; } if (null !== ($v = $this->getType())) { - $a[self::FIELD_TYPE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TYPE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TYPE_EXT] = $enc; + } + } else { + $a[self::FIELD_TYPE] = $v; + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRMedia.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRMedia.php index c5cf6b404b..6d0e242751 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRMedia.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRMedia.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -91,10 +91,6 @@ class FHIRMedia extends FHIRDomainResource implements PHPFHIRContainedTypeInterf { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MEDIA; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_BASED_ON = 'basedOn'; const FIELD_BODY_SITE = 'bodySite'; const FIELD_CONTENT = 'content'; @@ -409,6 +405,9 @@ class FHIRMedia extends FHIRDomainResource implements PHPFHIRContainedTypeInterf */ protected $width = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMedia Constructor * @param null|array $data @@ -428,6 +427,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_BASED_ON])) { if (is_array($data[self::FIELD_BASED_ON])) { foreach($data[self::FIELD_BASED_ON] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addBasedOn($v); } else { @@ -460,8 +462,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CREATED_DATE_TIME] instanceof FHIRDateTime) { $this->setCreatedDateTime($data[self::FIELD_CREATED_DATE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_CREATED_DATE_TIME])) { - $this->setCreatedDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_CREATED_DATE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CREATED_DATE_TIME])) { + $this->setCreatedDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_CREATED_DATE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_CREATED_DATE_TIME])) { + $this->setCreatedDateTime(new FHIRDateTime(array_merge($ext, $data[self::FIELD_CREATED_DATE_TIME]))); + } } else { $this->setCreatedDateTime(new FHIRDateTime($data[self::FIELD_CREATED_DATE_TIME])); } @@ -486,8 +492,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DEVICE_NAME] instanceof FHIRString) { $this->setDeviceName($data[self::FIELD_DEVICE_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_DEVICE_NAME])) { - $this->setDeviceName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DEVICE_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DEVICE_NAME])) { + $this->setDeviceName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DEVICE_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_DEVICE_NAME])) { + $this->setDeviceName(new FHIRString(array_merge($ext, $data[self::FIELD_DEVICE_NAME]))); + } } else { $this->setDeviceName(new FHIRString($data[self::FIELD_DEVICE_NAME])); } @@ -498,8 +508,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DURATION] instanceof FHIRDecimal) { $this->setDuration($data[self::FIELD_DURATION]); - } elseif ($ext && is_scalar($data[self::FIELD_DURATION])) { - $this->setDuration(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_DURATION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DURATION])) { + $this->setDuration(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_DURATION]] + $ext)); + } else if (is_array($data[self::FIELD_DURATION])) { + $this->setDuration(new FHIRDecimal(array_merge($ext, $data[self::FIELD_DURATION]))); + } } else { $this->setDuration(new FHIRDecimal($data[self::FIELD_DURATION])); } @@ -517,8 +531,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_FRAMES] instanceof FHIRPositiveInt) { $this->setFrames($data[self::FIELD_FRAMES]); - } elseif ($ext && is_scalar($data[self::FIELD_FRAMES])) { - $this->setFrames(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_FRAMES]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_FRAMES])) { + $this->setFrames(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_FRAMES]] + $ext)); + } else if (is_array($data[self::FIELD_FRAMES])) { + $this->setFrames(new FHIRPositiveInt(array_merge($ext, $data[self::FIELD_FRAMES]))); + } } else { $this->setFrames(new FHIRPositiveInt($data[self::FIELD_FRAMES])); } @@ -529,8 +547,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_HEIGHT] instanceof FHIRPositiveInt) { $this->setHeight($data[self::FIELD_HEIGHT]); - } elseif ($ext && is_scalar($data[self::FIELD_HEIGHT])) { - $this->setHeight(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_HEIGHT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_HEIGHT])) { + $this->setHeight(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_HEIGHT]] + $ext)); + } else if (is_array($data[self::FIELD_HEIGHT])) { + $this->setHeight(new FHIRPositiveInt(array_merge($ext, $data[self::FIELD_HEIGHT]))); + } } else { $this->setHeight(new FHIRPositiveInt($data[self::FIELD_HEIGHT])); } @@ -541,17 +563,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -563,8 +592,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ISSUED] instanceof FHIRInstant) { $this->setIssued($data[self::FIELD_ISSUED]); - } elseif ($ext && is_scalar($data[self::FIELD_ISSUED])) { - $this->setIssued(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_ISSUED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ISSUED])) { + $this->setIssued(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_ISSUED]] + $ext)); + } else if (is_array($data[self::FIELD_ISSUED])) { + $this->setIssued(new FHIRInstant(array_merge($ext, $data[self::FIELD_ISSUED]))); + } } else { $this->setIssued(new FHIRInstant($data[self::FIELD_ISSUED])); } @@ -579,6 +612,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_NOTE])) { if (is_array($data[self::FIELD_NOTE])) { foreach($data[self::FIELD_NOTE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRAnnotation) { $this->addNote($v); } else { @@ -601,6 +637,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PART_OF])) { if (is_array($data[self::FIELD_PART_OF])) { foreach($data[self::FIELD_PART_OF] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addPartOf($v); } else { @@ -616,6 +655,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REASON_CODE])) { if (is_array($data[self::FIELD_REASON_CODE])) { foreach($data[self::FIELD_REASON_CODE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addReasonCode($v); } else { @@ -634,8 +676,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIREventStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIREventStatus([FHIREventStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIREventStatus([FHIREventStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIREventStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIREventStatus($data[self::FIELD_STATUS])); } @@ -667,8 +713,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_WIDTH] instanceof FHIRPositiveInt) { $this->setWidth($data[self::FIELD_WIDTH]); - } elseif ($ext && is_scalar($data[self::FIELD_WIDTH])) { - $this->setWidth(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_WIDTH]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_WIDTH])) { + $this->setWidth(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_WIDTH]] + $ext)); + } else if (is_array($data[self::FIELD_WIDTH])) { + $this->setWidth(new FHIRPositiveInt(array_merge($ext, $data[self::FIELD_WIDTH]))); + } } else { $this->setWidth(new FHIRPositiveInt($data[self::FIELD_WIDTH])); } @@ -1819,7 +1869,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getBasedOn())) { foreach($vs as $v) { if (null === $v) { @@ -1832,18 +1881,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getBodySite())) { $v->xmlSerialize($sxe->addChild(self::FIELD_BODY_SITE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getContent())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CONTENT, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getCreatedDateTime())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CREATED_DATE_TIME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getCreatedPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CREATED_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDevice())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEVICE, null, $v->_getFHIRXMLNamespace())); } @@ -1853,7 +1899,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDuration())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DURATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getEncounter())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ENCOUNTER, null, $v->_getFHIRXMLNamespace())); } @@ -1863,7 +1908,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getHeight())) { $v->xmlSerialize($sxe->addChild(self::FIELD_HEIGHT, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -1872,14 +1916,13 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getIssued())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ISSUED, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getModality())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MODALITY, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getNote())) { foreach($vs as $v) { if (null === $v) { @@ -1892,7 +1935,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getOperator())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OPERATOR, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getPartOf())) { foreach($vs as $v) { if (null === $v) { @@ -1914,15 +1956,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSubject())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBJECT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getView())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VIEW, null, $v->_getFHIRXMLNamespace())); } @@ -1948,8 +1987,15 @@ public function jsonSerialize() $a[self::FIELD_CONTENT] = $v; } if (null !== ($v = $this->getCreatedDateTime())) { - $a[self::FIELD_CREATED_DATE_TIME] = $v->getValue(); - $a[self::FIELD_CREATED_DATE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CREATED_DATE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CREATED_DATE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_CREATED_DATE_TIME] = $v; + } } if (null !== ($v = $this->getCreatedPeriod())) { $a[self::FIELD_CREATED_PERIOD] = $v; @@ -1958,30 +2004,81 @@ public function jsonSerialize() $a[self::FIELD_DEVICE] = $v; } if (null !== ($v = $this->getDeviceName())) { - $a[self::FIELD_DEVICE_NAME] = $v->getValue(); - $a[self::FIELD_DEVICE_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DEVICE_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DEVICE_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_DEVICE_NAME] = $v; + } } if (null !== ($v = $this->getDuration())) { - $a[self::FIELD_DURATION] = $v->getValue(); - $a[self::FIELD_DURATION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DURATION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DURATION_EXT] = $enc; + } + } else { + $a[self::FIELD_DURATION] = $v; + } } if (null !== ($v = $this->getEncounter())) { $a[self::FIELD_ENCOUNTER] = $v; } if (null !== ($v = $this->getFrames())) { - $a[self::FIELD_FRAMES] = $v->getValue(); - $a[self::FIELD_FRAMES_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FRAMES] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FRAMES_EXT] = $enc; + } + } else { + $a[self::FIELD_FRAMES] = $v; + } } if (null !== ($v = $this->getHeight())) { - $a[self::FIELD_HEIGHT] = $v->getValue(); - $a[self::FIELD_HEIGHT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_HEIGHT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_HEIGHT_EXT] = $enc; + } + } else { + $a[self::FIELD_HEIGHT] = $v; + } } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if (null !== ($v = $this->getIssued())) { - $a[self::FIELD_ISSUED] = $v->getValue(); - $a[self::FIELD_ISSUED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ISSUED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ISSUED_EXT] = $enc; + } + } else { + $a[self::FIELD_ISSUED] = $v; + } } if (null !== ($v = $this->getModality())) { $a[self::FIELD_MODALITY] = $v; @@ -1999,7 +2096,15 @@ public function jsonSerialize() $a[self::FIELD_REASON_CODE] = $vs; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getSubject())) { $a[self::FIELD_SUBJECT] = $v; @@ -2011,8 +2116,15 @@ public function jsonSerialize() $a[self::FIELD_VIEW] = $v; } if (null !== ($v = $this->getWidth())) { - $a[self::FIELD_WIDTH] = $v->getValue(); - $a[self::FIELD_WIDTH_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_WIDTH] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_WIDTH_EXT] = $enc; + } + } else { + $a[self::FIELD_WIDTH] = $v; + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRMedication.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRMedication.php index a81dbd548d..f8812b2228 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRMedication.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRMedication.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -87,10 +87,6 @@ class FHIRMedication extends FHIRDomainResource implements PHPFHIRContainedTypeI { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MEDICATION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_AMOUNT = 'amount'; const FIELD_BATCH = 'batch'; const FIELD_CODE = 'code'; @@ -200,6 +196,9 @@ class FHIRMedication extends FHIRDomainResource implements PHPFHIRContainedTypeI */ protected $status = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMedication Constructor * @param null|array $data @@ -250,17 +249,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -269,6 +275,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_INGREDIENT])) { if (is_array($data[self::FIELD_INGREDIENT])) { foreach($data[self::FIELD_INGREDIENT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRMedicationIngredient) { $this->addIngredient($v); } else { @@ -294,8 +303,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRMedicationStatusCodes) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRMedicationStatusCodes([FHIRMedicationStatusCodes::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRMedicationStatusCodes([FHIRMedicationStatusCodes::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRMedicationStatusCodes(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRMedicationStatusCodes($data[self::FIELD_STATUS])); } @@ -750,23 +763,18 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getAmount())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AMOUNT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getBatch())) { $v->xmlSerialize($sxe->addChild(self::FIELD_BATCH, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getForm())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FORM, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -788,7 +796,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getManufacturer())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MANUFACTURER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } @@ -814,7 +821,23 @@ public function jsonSerialize() $a[self::FIELD_FORM] = $v; } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if ([] !== ($vs = $this->getIngredient())) { $a[self::FIELD_INGREDIENT] = $vs; @@ -823,7 +846,15 @@ public function jsonSerialize() $a[self::FIELD_MANUFACTURER] = $v; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRMedicationAdministration.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRMedicationAdministration.php index 0e01557faf..3cfeface4f 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRMedicationAdministration.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRMedicationAdministration.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -92,10 +92,6 @@ class FHIRMedicationAdministration extends FHIRDomainResource implements PHPFHIR { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MEDICATION_ADMINISTRATION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CATEGORY = 'category'; const FIELD_CONTEXT = 'context'; const FIELD_DEVICE = 'device'; @@ -394,6 +390,9 @@ class FHIRMedicationAdministration extends FHIRDomainResource implements PHPFHIR */ protected $supportingInformation = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMedicationAdministration Constructor * @param null|array $data @@ -427,6 +426,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_DEVICE])) { if (is_array($data[self::FIELD_DEVICE])) { foreach($data[self::FIELD_DEVICE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addDevice($v); } else { @@ -452,8 +454,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EFFECTIVE_DATE_TIME] instanceof FHIRDateTime) { $this->setEffectiveDateTime($data[self::FIELD_EFFECTIVE_DATE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_EFFECTIVE_DATE_TIME])) { - $this->setEffectiveDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_EFFECTIVE_DATE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EFFECTIVE_DATE_TIME])) { + $this->setEffectiveDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_EFFECTIVE_DATE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_EFFECTIVE_DATE_TIME])) { + $this->setEffectiveDateTime(new FHIRDateTime(array_merge($ext, $data[self::FIELD_EFFECTIVE_DATE_TIME]))); + } } else { $this->setEffectiveDateTime(new FHIRDateTime($data[self::FIELD_EFFECTIVE_DATE_TIME])); } @@ -468,6 +474,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_EVENT_HISTORY])) { if (is_array($data[self::FIELD_EVENT_HISTORY])) { foreach($data[self::FIELD_EVENT_HISTORY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addEventHistory($v); } else { @@ -486,17 +495,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -508,17 +524,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_INSTANTIATES])) { foreach($data[self::FIELD_INSTANTIATES] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRUri) { $this->addInstantiates($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addInstantiates(new FHIRUri([FHIRUri::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addInstantiates(new FHIRUri([FHIRUri::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addInstantiates(new FHIRUri(array_merge($v, $ext[$i]))); + } } else { $this->addInstantiates(new FHIRUri($v)); } } } elseif ($data[self::FIELD_INSTANTIATES] instanceof FHIRUri) { $this->addInstantiates($data[self::FIELD_INSTANTIATES]); - } elseif ($ext && is_scalar($data[self::FIELD_INSTANTIATES])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_INSTANTIATES])) { $this->addInstantiates(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_INSTANTIATES]] + $ext)); } else { $this->addInstantiates(new FHIRUri($data[self::FIELD_INSTANTIATES])); @@ -541,6 +564,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_NOTE])) { if (is_array($data[self::FIELD_NOTE])) { foreach($data[self::FIELD_NOTE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRAnnotation) { $this->addNote($v); } else { @@ -556,6 +582,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PART_OF])) { if (is_array($data[self::FIELD_PART_OF])) { foreach($data[self::FIELD_PART_OF] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addPartOf($v); } else { @@ -571,6 +600,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PERFORMER])) { if (is_array($data[self::FIELD_PERFORMER])) { foreach($data[self::FIELD_PERFORMER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRMedicationAdministrationPerformer) { $this->addPerformer($v); } else { @@ -586,6 +618,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REASON_CODE])) { if (is_array($data[self::FIELD_REASON_CODE])) { foreach($data[self::FIELD_REASON_CODE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addReasonCode($v); } else { @@ -601,6 +636,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REASON_REFERENCE])) { if (is_array($data[self::FIELD_REASON_REFERENCE])) { foreach($data[self::FIELD_REASON_REFERENCE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addReasonReference($v); } else { @@ -626,8 +664,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRCode) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRCode(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRCode($data[self::FIELD_STATUS])); } @@ -635,6 +677,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_STATUS_REASON])) { if (is_array($data[self::FIELD_STATUS_REASON])) { foreach($data[self::FIELD_STATUS_REASON] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addStatusReason($v); } else { @@ -657,6 +702,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SUPPORTING_INFORMATION])) { if (is_array($data[self::FIELD_SUPPORTING_INFORMATION])) { foreach($data[self::FIELD_SUPPORTING_INFORMATION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addSupportingInformation($v); } else { @@ -1910,15 +1958,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getCategory())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CATEGORY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getContext())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CONTEXT, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getDevice())) { foreach($vs as $v) { if (null === $v) { @@ -1934,11 +1979,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getEffectiveDateTime())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EFFECTIVE_DATE_TIME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getEffectivePeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EFFECTIVE_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getEventHistory())) { foreach($vs as $v) { if (null === $v) { @@ -1956,6 +1999,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } } + if ([] !== ($vs = $this->getInstantiates())) { foreach($vs as $v) { if (null === $v) { @@ -1968,11 +2012,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getMedicationCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MEDICATION_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getMedicationReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MEDICATION_REFERENCE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getNote())) { foreach($vs as $v) { if (null === $v) { @@ -2024,7 +2066,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getStatusReason())) { foreach($vs as $v) { if (null === $v) { @@ -2037,7 +2078,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getSubject())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBJECT, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getSupportingInformation())) { foreach($vs as $v) { if (null === $v) { @@ -2046,6 +2086,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_SUPPORTING_INFORMATION, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } @@ -2068,8 +2109,15 @@ public function jsonSerialize() $a[self::FIELD_DOSAGE] = $v; } if (null !== ($v = $this->getEffectiveDateTime())) { - $a[self::FIELD_EFFECTIVE_DATE_TIME] = $v->getValue(); - $a[self::FIELD_EFFECTIVE_DATE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EFFECTIVE_DATE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EFFECTIVE_DATE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_EFFECTIVE_DATE_TIME] = $v; + } } if (null !== ($v = $this->getEffectivePeriod())) { $a[self::FIELD_EFFECTIVE_PERIOD] = $v; @@ -2078,7 +2126,23 @@ public function jsonSerialize() $a[self::FIELD_EVENT_HISTORY] = $vs; } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if ([] !== ($vs = $this->getInstantiates())) { $a[self::FIELD_INSTANTIATES] = []; @@ -2086,8 +2150,17 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_INSTANTIATES][] = $v->getValue(); - $a[self::FIELD_INSTANTIATES_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_INSTANTIATES][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_INSTANTIATES_EXT][] = $enc; + } else { + $a[self::FIELD_INSTANTIATES_EXT][] = null; + } + } else { + $a[self::FIELD_INSTANTIATES][] = $v; + } } } if (null !== ($v = $this->getMedicationCodeableConcept())) { @@ -2115,8 +2188,15 @@ public function jsonSerialize() $a[self::FIELD_REQUEST] = $v; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v->getValue(); - $a[self::FIELD_STATUS_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if ([] !== ($vs = $this->getStatusReason())) { $a[self::FIELD_STATUS_REASON] = $vs; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRMedicationDispense.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRMedicationDispense.php index c6795cc618..a90b4665cf 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRMedicationDispense.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRMedicationDispense.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -91,10 +91,6 @@ class FHIRMedicationDispense extends FHIRDomainResource implements PHPFHIRContai { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MEDICATION_DISPENSE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_AUTHORIZING_PRESCRIPTION = 'authorizingPrescription'; const FIELD_CATEGORY = 'category'; const FIELD_CONTEXT = 'context'; @@ -460,6 +456,9 @@ class FHIRMedicationDispense extends FHIRDomainResource implements PHPFHIRContai */ protected $whenPrepared = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMedicationDispense Constructor * @param null|array $data @@ -479,6 +478,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_AUTHORIZING_PRESCRIPTION])) { if (is_array($data[self::FIELD_AUTHORIZING_PRESCRIPTION])) { foreach($data[self::FIELD_AUTHORIZING_PRESCRIPTION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addAuthorizingPrescription($v); } else { @@ -511,8 +513,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DAYS_SUPPLY] instanceof FHIRQuantity) { $this->setDaysSupply($data[self::FIELD_DAYS_SUPPLY]); - } elseif ($ext && is_scalar($data[self::FIELD_DAYS_SUPPLY])) { - $this->setDaysSupply(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_DAYS_SUPPLY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DAYS_SUPPLY])) { + $this->setDaysSupply(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_DAYS_SUPPLY]] + $ext)); + } else if (is_array($data[self::FIELD_DAYS_SUPPLY])) { + $this->setDaysSupply(new FHIRQuantity(array_merge($ext, $data[self::FIELD_DAYS_SUPPLY]))); + } } else { $this->setDaysSupply(new FHIRQuantity($data[self::FIELD_DAYS_SUPPLY])); } @@ -527,6 +533,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_DETECTED_ISSUE])) { if (is_array($data[self::FIELD_DETECTED_ISSUE])) { foreach($data[self::FIELD_DETECTED_ISSUE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addDetectedIssue($v); } else { @@ -542,6 +551,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_DOSAGE_INSTRUCTION])) { if (is_array($data[self::FIELD_DOSAGE_INSTRUCTION])) { foreach($data[self::FIELD_DOSAGE_INSTRUCTION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRDosage) { $this->addDosageInstruction($v); } else { @@ -557,6 +569,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_EVENT_HISTORY])) { if (is_array($data[self::FIELD_EVENT_HISTORY])) { foreach($data[self::FIELD_EVENT_HISTORY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addEventHistory($v); } else { @@ -575,17 +590,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -615,6 +637,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_NOTE])) { if (is_array($data[self::FIELD_NOTE])) { foreach($data[self::FIELD_NOTE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRAnnotation) { $this->addNote($v); } else { @@ -630,6 +655,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PART_OF])) { if (is_array($data[self::FIELD_PART_OF])) { foreach($data[self::FIELD_PART_OF] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addPartOf($v); } else { @@ -645,6 +673,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PERFORMER])) { if (is_array($data[self::FIELD_PERFORMER])) { foreach($data[self::FIELD_PERFORMER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRMedicationDispensePerformer) { $this->addPerformer($v); } else { @@ -663,8 +694,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_QUANTITY] instanceof FHIRQuantity) { $this->setQuantity($data[self::FIELD_QUANTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_QUANTITY])) { - $this->setQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_QUANTITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_QUANTITY])) { + $this->setQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_QUANTITY])) { + $this->setQuantity(new FHIRQuantity(array_merge($ext, $data[self::FIELD_QUANTITY]))); + } } else { $this->setQuantity(new FHIRQuantity($data[self::FIELD_QUANTITY])); } @@ -672,6 +707,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_RECEIVER])) { if (is_array($data[self::FIELD_RECEIVER])) { foreach($data[self::FIELD_RECEIVER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addReceiver($v); } else { @@ -690,8 +728,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRCode) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRCode(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRCode($data[self::FIELD_STATUS])); } @@ -727,6 +769,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SUPPORTING_INFORMATION])) { if (is_array($data[self::FIELD_SUPPORTING_INFORMATION])) { foreach($data[self::FIELD_SUPPORTING_INFORMATION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addSupportingInformation($v); } else { @@ -752,8 +797,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_WHEN_HANDED_OVER] instanceof FHIRDateTime) { $this->setWhenHandedOver($data[self::FIELD_WHEN_HANDED_OVER]); - } elseif ($ext && is_scalar($data[self::FIELD_WHEN_HANDED_OVER])) { - $this->setWhenHandedOver(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_WHEN_HANDED_OVER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_WHEN_HANDED_OVER])) { + $this->setWhenHandedOver(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_WHEN_HANDED_OVER]] + $ext)); + } else if (is_array($data[self::FIELD_WHEN_HANDED_OVER])) { + $this->setWhenHandedOver(new FHIRDateTime(array_merge($ext, $data[self::FIELD_WHEN_HANDED_OVER]))); + } } else { $this->setWhenHandedOver(new FHIRDateTime($data[self::FIELD_WHEN_HANDED_OVER])); } @@ -764,8 +813,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_WHEN_PREPARED] instanceof FHIRDateTime) { $this->setWhenPrepared($data[self::FIELD_WHEN_PREPARED]); - } elseif ($ext && is_scalar($data[self::FIELD_WHEN_PREPARED])) { - $this->setWhenPrepared(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_WHEN_PREPARED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_WHEN_PREPARED])) { + $this->setWhenPrepared(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_WHEN_PREPARED]] + $ext)); + } else if (is_array($data[self::FIELD_WHEN_PREPARED])) { + $this->setWhenPrepared(new FHIRDateTime(array_merge($ext, $data[self::FIELD_WHEN_PREPARED]))); + } } else { $this->setWhenPrepared(new FHIRDateTime($data[self::FIELD_WHEN_PREPARED])); } @@ -2155,7 +2208,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getAuthorizingPrescription())) { foreach($vs as $v) { if (null === $v) { @@ -2168,19 +2220,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getCategory())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CATEGORY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getContext())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CONTEXT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDaysSupply())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DAYS_SUPPLY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDestination())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESTINATION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getDetectedIssue())) { foreach($vs as $v) { if (null === $v) { @@ -2220,15 +2268,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getLocation())) { $v->xmlSerialize($sxe->addChild(self::FIELD_LOCATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getMedicationCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MEDICATION_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getMedicationReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MEDICATION_REFERENCE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getNote())) { foreach($vs as $v) { if (null === $v) { @@ -2259,7 +2304,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_QUANTITY, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getReceiver())) { foreach($vs as $v) { if (null === $v) { @@ -2268,26 +2312,22 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_RECEIVER, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatusReasonCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS_REASON_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatusReasonReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS_REASON_REFERENCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSubject())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBJECT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSubstitution())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBSTITUTION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getSupportingInformation())) { foreach($vs as $v) { if (null === $v) { @@ -2325,7 +2365,15 @@ public function jsonSerialize() $a[self::FIELD_CONTEXT] = $v; } if (null !== ($v = $this->getDaysSupply())) { - $a[self::FIELD_DAYS_SUPPLY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DAYS_SUPPLY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DAYS_SUPPLY_EXT] = $enc; + } + } else { + $a[self::FIELD_DAYS_SUPPLY] = $v; + } } if (null !== ($v = $this->getDestination())) { $a[self::FIELD_DESTINATION] = $v; @@ -2340,7 +2388,23 @@ public function jsonSerialize() $a[self::FIELD_EVENT_HISTORY] = $vs; } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if (null !== ($v = $this->getLocation())) { $a[self::FIELD_LOCATION] = $v; @@ -2361,14 +2425,29 @@ public function jsonSerialize() $a[self::FIELD_PERFORMER] = $vs; } if (null !== ($v = $this->getQuantity())) { - $a[self::FIELD_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_QUANTITY] = $v; + } } if ([] !== ($vs = $this->getReceiver())) { $a[self::FIELD_RECEIVER] = $vs; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v->getValue(); - $a[self::FIELD_STATUS_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getStatusReasonCodeableConcept())) { $a[self::FIELD_STATUS_REASON_CODEABLE_CONCEPT] = $v; @@ -2389,12 +2468,26 @@ public function jsonSerialize() $a[self::FIELD_TYPE] = $v; } if (null !== ($v = $this->getWhenHandedOver())) { - $a[self::FIELD_WHEN_HANDED_OVER] = $v->getValue(); - $a[self::FIELD_WHEN_HANDED_OVER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_WHEN_HANDED_OVER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_WHEN_HANDED_OVER_EXT] = $enc; + } + } else { + $a[self::FIELD_WHEN_HANDED_OVER] = $v; + } } if (null !== ($v = $this->getWhenPrepared())) { - $a[self::FIELD_WHEN_PREPARED] = $v->getValue(); - $a[self::FIELD_WHEN_PREPARED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_WHEN_PREPARED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_WHEN_PREPARED_EXT] = $enc; + } + } else { + $a[self::FIELD_WHEN_PREPARED] = $v; + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRMedicationKnowledge.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRMedicationKnowledge.php index 9aa537e9d2..ec4bff2785 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRMedicationKnowledge.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRMedicationKnowledge.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -95,10 +95,6 @@ class FHIRMedicationKnowledge extends FHIRDomainResource implements PHPFHIRConta { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MEDICATION_KNOWLEDGE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ADMINISTRATION_GUIDELINES = 'administrationGuidelines'; const FIELD_AMOUNT = 'amount'; const FIELD_AMOUNT_EXT = '_amount'; @@ -375,6 +371,9 @@ class FHIRMedicationKnowledge extends FHIRDomainResource implements PHPFHIRConta */ protected $synonym = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMedicationKnowledge Constructor * @param null|array $data @@ -394,6 +393,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ADMINISTRATION_GUIDELINES])) { if (is_array($data[self::FIELD_ADMINISTRATION_GUIDELINES])) { foreach($data[self::FIELD_ADMINISTRATION_GUIDELINES] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRMedicationKnowledgeAdministrationGuidelines) { $this->addAdministrationGuidelines($v); } else { @@ -412,8 +414,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_AMOUNT] instanceof FHIRQuantity) { $this->setAmount($data[self::FIELD_AMOUNT]); - } elseif ($ext && is_scalar($data[self::FIELD_AMOUNT])) { - $this->setAmount(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_AMOUNT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_AMOUNT])) { + $this->setAmount(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_AMOUNT]] + $ext)); + } else if (is_array($data[self::FIELD_AMOUNT])) { + $this->setAmount(new FHIRQuantity(array_merge($ext, $data[self::FIELD_AMOUNT]))); + } } else { $this->setAmount(new FHIRQuantity($data[self::FIELD_AMOUNT])); } @@ -421,6 +427,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ASSOCIATED_MEDICATION])) { if (is_array($data[self::FIELD_ASSOCIATED_MEDICATION])) { foreach($data[self::FIELD_ASSOCIATED_MEDICATION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addAssociatedMedication($v); } else { @@ -443,6 +452,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CONTRAINDICATION])) { if (is_array($data[self::FIELD_CONTRAINDICATION])) { foreach($data[self::FIELD_CONTRAINDICATION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addContraindication($v); } else { @@ -458,6 +470,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_COST])) { if (is_array($data[self::FIELD_COST])) { foreach($data[self::FIELD_COST] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRMedicationKnowledgeCost) { $this->addCost($v); } else { @@ -480,6 +495,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_DRUG_CHARACTERISTIC])) { if (is_array($data[self::FIELD_DRUG_CHARACTERISTIC])) { foreach($data[self::FIELD_DRUG_CHARACTERISTIC] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRMedicationKnowledgeDrugCharacteristic) { $this->addDrugCharacteristic($v); } else { @@ -495,6 +513,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_INGREDIENT])) { if (is_array($data[self::FIELD_INGREDIENT])) { foreach($data[self::FIELD_INGREDIENT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRMedicationKnowledgeIngredient) { $this->addIngredient($v); } else { @@ -510,6 +531,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_INTENDED_ROUTE])) { if (is_array($data[self::FIELD_INTENDED_ROUTE])) { foreach($data[self::FIELD_INTENDED_ROUTE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addIntendedRoute($v); } else { @@ -525,6 +549,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_KINETICS])) { if (is_array($data[self::FIELD_KINETICS])) { foreach($data[self::FIELD_KINETICS] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRMedicationKnowledgeKinetics) { $this->addKinetics($v); } else { @@ -547,6 +574,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_MEDICINE_CLASSIFICATION])) { if (is_array($data[self::FIELD_MEDICINE_CLASSIFICATION])) { foreach($data[self::FIELD_MEDICINE_CLASSIFICATION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRMedicationKnowledgeMedicineClassification) { $this->addMedicineClassification($v); } else { @@ -562,6 +592,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_MONITORING_PROGRAM])) { if (is_array($data[self::FIELD_MONITORING_PROGRAM])) { foreach($data[self::FIELD_MONITORING_PROGRAM] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRMedicationKnowledgeMonitoringProgram) { $this->addMonitoringProgram($v); } else { @@ -577,6 +610,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_MONOGRAPH])) { if (is_array($data[self::FIELD_MONOGRAPH])) { foreach($data[self::FIELD_MONOGRAPH] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRMedicationKnowledgeMonograph) { $this->addMonograph($v); } else { @@ -602,8 +638,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PREPARATION_INSTRUCTION] instanceof FHIRMarkdown) { $this->setPreparationInstruction($data[self::FIELD_PREPARATION_INSTRUCTION]); - } elseif ($ext && is_scalar($data[self::FIELD_PREPARATION_INSTRUCTION])) { - $this->setPreparationInstruction(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_PREPARATION_INSTRUCTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PREPARATION_INSTRUCTION])) { + $this->setPreparationInstruction(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_PREPARATION_INSTRUCTION]] + $ext)); + } else if (is_array($data[self::FIELD_PREPARATION_INSTRUCTION])) { + $this->setPreparationInstruction(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_PREPARATION_INSTRUCTION]))); + } } else { $this->setPreparationInstruction(new FHIRMarkdown($data[self::FIELD_PREPARATION_INSTRUCTION])); } @@ -611,6 +651,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PRODUCT_TYPE])) { if (is_array($data[self::FIELD_PRODUCT_TYPE])) { foreach($data[self::FIELD_PRODUCT_TYPE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addProductType($v); } else { @@ -626,6 +669,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REGULATORY])) { if (is_array($data[self::FIELD_REGULATORY])) { foreach($data[self::FIELD_REGULATORY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRMedicationKnowledgeRegulatory) { $this->addRegulatory($v); } else { @@ -641,6 +687,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_RELATED_MEDICATION_KNOWLEDGE])) { if (is_array($data[self::FIELD_RELATED_MEDICATION_KNOWLEDGE])) { foreach($data[self::FIELD_RELATED_MEDICATION_KNOWLEDGE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRMedicationKnowledgeRelatedMedicationKnowledge) { $this->addRelatedMedicationKnowledge($v); } else { @@ -659,8 +708,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRCode) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRCode(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRCode($data[self::FIELD_STATUS])); } @@ -671,17 +724,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_SYNONYM])) { foreach($data[self::FIELD_SYNONYM] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRString) { $this->addSynonym($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addSynonym(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addSynonym(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addSynonym(new FHIRString(array_merge($v, $ext[$i]))); + } } else { $this->addSynonym(new FHIRString($v)); } } } elseif ($data[self::FIELD_SYNONYM] instanceof FHIRString) { $this->addSynonym($data[self::FIELD_SYNONYM]); - } elseif ($ext && is_scalar($data[self::FIELD_SYNONYM])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_SYNONYM])) { $this->addSynonym(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SYNONYM]] + $ext)); } else { $this->addSynonym(new FHIRString($data[self::FIELD_SYNONYM])); @@ -1980,7 +2040,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getAdministrationGuidelines())) { foreach($vs as $v) { if (null === $v) { @@ -1993,7 +2052,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getAmount())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AMOUNT, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getAssociatedMedication())) { foreach($vs as $v) { if (null === $v) { @@ -2006,7 +2064,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getContraindication())) { foreach($vs as $v) { if (null === $v) { @@ -2028,7 +2085,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDoseForm())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DOSE_FORM, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getDrugCharacteristic())) { foreach($vs as $v) { if (null === $v) { @@ -2068,7 +2124,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getManufacturer())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MANUFACTURER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getMedicineClassification())) { foreach($vs as $v) { if (null === $v) { @@ -2102,7 +2157,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getPreparationInstruction())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PREPARATION_INSTRUCTION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getProductType())) { foreach($vs as $v) { if (null === $v) { @@ -2129,6 +2183,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_RELATED_MEDICATION_KNOWLEDGE, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } @@ -2140,6 +2195,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_SYNONYM, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } @@ -2153,7 +2209,15 @@ public function jsonSerialize() $a[self::FIELD_ADMINISTRATION_GUIDELINES] = $vs; } if (null !== ($v = $this->getAmount())) { - $a[self::FIELD_AMOUNT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_AMOUNT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_AMOUNT_EXT] = $enc; + } + } else { + $a[self::FIELD_AMOUNT] = $v; + } } if ([] !== ($vs = $this->getAssociatedMedication())) { $a[self::FIELD_ASSOCIATED_MEDICATION] = $vs; @@ -2198,8 +2262,15 @@ public function jsonSerialize() $a[self::FIELD_PACKAGING] = $v; } if (null !== ($v = $this->getPreparationInstruction())) { - $a[self::FIELD_PREPARATION_INSTRUCTION] = $v->getValue(); - $a[self::FIELD_PREPARATION_INSTRUCTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PREPARATION_INSTRUCTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PREPARATION_INSTRUCTION_EXT] = $enc; + } + } else { + $a[self::FIELD_PREPARATION_INSTRUCTION] = $v; + } } if ([] !== ($vs = $this->getProductType())) { $a[self::FIELD_PRODUCT_TYPE] = $vs; @@ -2211,8 +2282,15 @@ public function jsonSerialize() $a[self::FIELD_RELATED_MEDICATION_KNOWLEDGE] = $vs; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v->getValue(); - $a[self::FIELD_STATUS_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if ([] !== ($vs = $this->getSynonym())) { $a[self::FIELD_SYNONYM] = []; @@ -2220,8 +2298,17 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_SYNONYM][] = $v->getValue(); - $a[self::FIELD_SYNONYM_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SYNONYM][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SYNONYM_EXT][] = $enc; + } else { + $a[self::FIELD_SYNONYM_EXT][] = null; + } + } else { + $a[self::FIELD_SYNONYM][] = $v; + } } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRMedicationRequest.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRMedicationRequest.php index a9f1e791de..49f2f2ec22 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRMedicationRequest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRMedicationRequest.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -96,10 +96,6 @@ class FHIRMedicationRequest extends FHIRDomainResource implements PHPFHIRContain { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MEDICATION_REQUEST; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_AUTHORED_ON = 'authoredOn'; const FIELD_AUTHORED_ON_EXT = '_authoredOn'; const FIELD_BASED_ON = 'basedOn'; @@ -579,6 +575,9 @@ class FHIRMedicationRequest extends FHIRDomainResource implements PHPFHIRContain */ protected $supportingInformation = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMedicationRequest Constructor * @param null|array $data @@ -601,8 +600,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_AUTHORED_ON] instanceof FHIRDateTime) { $this->setAuthoredOn($data[self::FIELD_AUTHORED_ON]); - } elseif ($ext && is_scalar($data[self::FIELD_AUTHORED_ON])) { - $this->setAuthoredOn(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_AUTHORED_ON]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_AUTHORED_ON])) { + $this->setAuthoredOn(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_AUTHORED_ON]] + $ext)); + } else if (is_array($data[self::FIELD_AUTHORED_ON])) { + $this->setAuthoredOn(new FHIRDateTime(array_merge($ext, $data[self::FIELD_AUTHORED_ON]))); + } } else { $this->setAuthoredOn(new FHIRDateTime($data[self::FIELD_AUTHORED_ON])); } @@ -610,6 +613,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_BASED_ON])) { if (is_array($data[self::FIELD_BASED_ON])) { foreach($data[self::FIELD_BASED_ON] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addBasedOn($v); } else { @@ -625,6 +631,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CATEGORY])) { if (is_array($data[self::FIELD_CATEGORY])) { foreach($data[self::FIELD_CATEGORY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addCategory($v); } else { @@ -647,6 +656,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_DETECTED_ISSUE])) { if (is_array($data[self::FIELD_DETECTED_ISSUE])) { foreach($data[self::FIELD_DETECTED_ISSUE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addDetectedIssue($v); } else { @@ -672,8 +684,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DO_NOT_PERFORM] instanceof FHIRBoolean) { $this->setDoNotPerform($data[self::FIELD_DO_NOT_PERFORM]); - } elseif ($ext && is_scalar($data[self::FIELD_DO_NOT_PERFORM])) { - $this->setDoNotPerform(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_DO_NOT_PERFORM]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DO_NOT_PERFORM])) { + $this->setDoNotPerform(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_DO_NOT_PERFORM]] + $ext)); + } else if (is_array($data[self::FIELD_DO_NOT_PERFORM])) { + $this->setDoNotPerform(new FHIRBoolean(array_merge($ext, $data[self::FIELD_DO_NOT_PERFORM]))); + } } else { $this->setDoNotPerform(new FHIRBoolean($data[self::FIELD_DO_NOT_PERFORM])); } @@ -681,6 +697,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_DOSAGE_INSTRUCTION])) { if (is_array($data[self::FIELD_DOSAGE_INSTRUCTION])) { foreach($data[self::FIELD_DOSAGE_INSTRUCTION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRDosage) { $this->addDosageInstruction($v); } else { @@ -703,6 +722,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_EVENT_HISTORY])) { if (is_array($data[self::FIELD_EVENT_HISTORY])) { foreach($data[self::FIELD_EVENT_HISTORY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addEventHistory($v); } else { @@ -721,8 +743,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_GROUP_IDENTIFIER] instanceof FHIRIdentifier) { $this->setGroupIdentifier($data[self::FIELD_GROUP_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_GROUP_IDENTIFIER])) { - $this->setGroupIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_GROUP_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_GROUP_IDENTIFIER])) { + $this->setGroupIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_GROUP_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_GROUP_IDENTIFIER])) { + $this->setGroupIdentifier(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_GROUP_IDENTIFIER]))); + } } else { $this->setGroupIdentifier(new FHIRIdentifier($data[self::FIELD_GROUP_IDENTIFIER])); } @@ -733,17 +759,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -755,17 +788,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_INSTANTIATES_CANONICAL])) { foreach($data[self::FIELD_INSTANTIATES_CANONICAL] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCanonical) { $this->addInstantiatesCanonical($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addInstantiatesCanonical(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addInstantiatesCanonical(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addInstantiatesCanonical(new FHIRCanonical(array_merge($v, $ext[$i]))); + } } else { $this->addInstantiatesCanonical(new FHIRCanonical($v)); } } } elseif ($data[self::FIELD_INSTANTIATES_CANONICAL] instanceof FHIRCanonical) { $this->addInstantiatesCanonical($data[self::FIELD_INSTANTIATES_CANONICAL]); - } elseif ($ext && is_scalar($data[self::FIELD_INSTANTIATES_CANONICAL])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_INSTANTIATES_CANONICAL])) { $this->addInstantiatesCanonical(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $data[self::FIELD_INSTANTIATES_CANONICAL]] + $ext)); } else { $this->addInstantiatesCanonical(new FHIRCanonical($data[self::FIELD_INSTANTIATES_CANONICAL])); @@ -777,17 +817,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_INSTANTIATES_URI])) { foreach($data[self::FIELD_INSTANTIATES_URI] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRUri) { $this->addInstantiatesUri($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addInstantiatesUri(new FHIRUri([FHIRUri::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addInstantiatesUri(new FHIRUri([FHIRUri::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addInstantiatesUri(new FHIRUri(array_merge($v, $ext[$i]))); + } } else { $this->addInstantiatesUri(new FHIRUri($v)); } } } elseif ($data[self::FIELD_INSTANTIATES_URI] instanceof FHIRUri) { $this->addInstantiatesUri($data[self::FIELD_INSTANTIATES_URI]); - } elseif ($ext && is_scalar($data[self::FIELD_INSTANTIATES_URI])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_INSTANTIATES_URI])) { $this->addInstantiatesUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_INSTANTIATES_URI]] + $ext)); } else { $this->addInstantiatesUri(new FHIRUri($data[self::FIELD_INSTANTIATES_URI])); @@ -796,6 +843,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_INSURANCE])) { if (is_array($data[self::FIELD_INSURANCE])) { foreach($data[self::FIELD_INSURANCE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addInsurance($v); } else { @@ -814,8 +864,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_INTENT] instanceof FHIRMedicationRequestIntent) { $this->setIntent($data[self::FIELD_INTENT]); - } elseif ($ext && is_scalar($data[self::FIELD_INTENT])) { - $this->setIntent(new FHIRMedicationRequestIntent([FHIRMedicationRequestIntent::FIELD_VALUE => $data[self::FIELD_INTENT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_INTENT])) { + $this->setIntent(new FHIRMedicationRequestIntent([FHIRMedicationRequestIntent::FIELD_VALUE => $data[self::FIELD_INTENT]] + $ext)); + } else if (is_array($data[self::FIELD_INTENT])) { + $this->setIntent(new FHIRMedicationRequestIntent(array_merge($ext, $data[self::FIELD_INTENT]))); + } } else { $this->setIntent(new FHIRMedicationRequestIntent($data[self::FIELD_INTENT])); } @@ -837,6 +891,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_NOTE])) { if (is_array($data[self::FIELD_NOTE])) { foreach($data[self::FIELD_NOTE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRAnnotation) { $this->addNote($v); } else { @@ -876,8 +933,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PRIORITY] instanceof FHIRRequestPriority) { $this->setPriority($data[self::FIELD_PRIORITY]); - } elseif ($ext && is_scalar($data[self::FIELD_PRIORITY])) { - $this->setPriority(new FHIRRequestPriority([FHIRRequestPriority::FIELD_VALUE => $data[self::FIELD_PRIORITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PRIORITY])) { + $this->setPriority(new FHIRRequestPriority([FHIRRequestPriority::FIELD_VALUE => $data[self::FIELD_PRIORITY]] + $ext)); + } else if (is_array($data[self::FIELD_PRIORITY])) { + $this->setPriority(new FHIRRequestPriority(array_merge($ext, $data[self::FIELD_PRIORITY]))); + } } else { $this->setPriority(new FHIRRequestPriority($data[self::FIELD_PRIORITY])); } @@ -885,6 +946,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REASON_CODE])) { if (is_array($data[self::FIELD_REASON_CODE])) { foreach($data[self::FIELD_REASON_CODE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addReasonCode($v); } else { @@ -900,6 +964,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REASON_REFERENCE])) { if (is_array($data[self::FIELD_REASON_REFERENCE])) { foreach($data[self::FIELD_REASON_REFERENCE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addReasonReference($v); } else { @@ -925,8 +992,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_REPORTED_BOOLEAN] instanceof FHIRBoolean) { $this->setReportedBoolean($data[self::FIELD_REPORTED_BOOLEAN]); - } elseif ($ext && is_scalar($data[self::FIELD_REPORTED_BOOLEAN])) { - $this->setReportedBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_REPORTED_BOOLEAN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_REPORTED_BOOLEAN])) { + $this->setReportedBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_REPORTED_BOOLEAN]] + $ext)); + } else if (is_array($data[self::FIELD_REPORTED_BOOLEAN])) { + $this->setReportedBoolean(new FHIRBoolean(array_merge($ext, $data[self::FIELD_REPORTED_BOOLEAN]))); + } } else { $this->setReportedBoolean(new FHIRBoolean($data[self::FIELD_REPORTED_BOOLEAN])); } @@ -951,8 +1022,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRMedicationrequestStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRMedicationrequestStatus([FHIRMedicationrequestStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRMedicationrequestStatus([FHIRMedicationrequestStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRMedicationrequestStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRMedicationrequestStatus($data[self::FIELD_STATUS])); } @@ -981,6 +1056,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SUPPORTING_INFORMATION])) { if (is_array($data[self::FIELD_SUPPORTING_INFORMATION])) { foreach($data[self::FIELD_SUPPORTING_INFORMATION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addSupportingInformation($v); } else { @@ -2788,7 +2866,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getAuthoredOn())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AUTHORED_ON, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getBasedOn())) { foreach($vs as $v) { if (null === $v) { @@ -2810,7 +2887,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getCourseOfTherapyType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_COURSE_OF_THERAPY_TYPE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getDetectedIssue())) { foreach($vs as $v) { if (null === $v) { @@ -2826,7 +2902,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDoNotPerform())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DO_NOT_PERFORM, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getDosageInstruction())) { foreach($vs as $v) { if (null === $v) { @@ -2839,7 +2914,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getEncounter())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ENCOUNTER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getEventHistory())) { foreach($vs as $v) { if (null === $v) { @@ -2852,7 +2926,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getGroupIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_GROUP_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -2861,6 +2934,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } } + if ([] !== ($vs = $this->getInstantiatesCanonical())) { foreach($vs as $v) { if (null === $v) { @@ -2869,6 +2943,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_INSTANTIATES_CANONICAL, null, $v->_getFHIRXMLNamespace())); } } + if ([] !== ($vs = $this->getInstantiatesUri())) { foreach($vs as $v) { if (null === $v) { @@ -2890,15 +2965,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getIntent())) { $v->xmlSerialize($sxe->addChild(self::FIELD_INTENT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getMedicationCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MEDICATION_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getMedicationReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MEDICATION_REFERENCE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getNote())) { foreach($vs as $v) { if (null === $v) { @@ -2911,19 +2983,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getPerformer())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PERFORMER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPerformerType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PERFORMER_TYPE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPriorPrescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PRIOR_PRESCRIPTION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPriority())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PRIORITY, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getReasonCode())) { foreach($vs as $v) { if (null === $v) { @@ -2948,31 +3016,24 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getReportedBoolean())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REPORTED_BOOLEAN, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getReportedReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REPORTED_REFERENCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRequester())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REQUESTER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatusReason())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS_REASON, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSubject())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBJECT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSubstitution())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBSTITUTION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getSupportingInformation())) { foreach($vs as $v) { if (null === $v) { @@ -2981,6 +3042,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_SUPPORTING_INFORMATION, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } @@ -2991,8 +3053,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getAuthoredOn())) { - $a[self::FIELD_AUTHORED_ON] = $v->getValue(); - $a[self::FIELD_AUTHORED_ON_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_AUTHORED_ON] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_AUTHORED_ON_EXT] = $enc; + } + } else { + $a[self::FIELD_AUTHORED_ON] = $v; + } } if ([] !== ($vs = $this->getBasedOn())) { $a[self::FIELD_BASED_ON] = $vs; @@ -3010,8 +3079,15 @@ public function jsonSerialize() $a[self::FIELD_DISPENSE_REQUEST] = $v; } if (null !== ($v = $this->getDoNotPerform())) { - $a[self::FIELD_DO_NOT_PERFORM] = $v->getValue(); - $a[self::FIELD_DO_NOT_PERFORM_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DO_NOT_PERFORM] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DO_NOT_PERFORM_EXT] = $enc; + } + } else { + $a[self::FIELD_DO_NOT_PERFORM] = $v; + } } if ([] !== ($vs = $this->getDosageInstruction())) { $a[self::FIELD_DOSAGE_INSTRUCTION] = $vs; @@ -3023,10 +3099,34 @@ public function jsonSerialize() $a[self::FIELD_EVENT_HISTORY] = $vs; } if (null !== ($v = $this->getGroupIdentifier())) { - $a[self::FIELD_GROUP_IDENTIFIER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_GROUP_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_GROUP_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_GROUP_IDENTIFIER] = $v; + } } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if ([] !== ($vs = $this->getInstantiatesCanonical())) { $a[self::FIELD_INSTANTIATES_CANONICAL] = []; @@ -3034,8 +3134,17 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_INSTANTIATES_CANONICAL][] = $v->getValue(); - $a[self::FIELD_INSTANTIATES_CANONICAL_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_INSTANTIATES_CANONICAL][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_INSTANTIATES_CANONICAL_EXT][] = $enc; + } else { + $a[self::FIELD_INSTANTIATES_CANONICAL_EXT][] = null; + } + } else { + $a[self::FIELD_INSTANTIATES_CANONICAL][] = $v; + } } } if ([] !== ($vs = $this->getInstantiatesUri())) { @@ -3044,15 +3153,32 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_INSTANTIATES_URI][] = $v->getValue(); - $a[self::FIELD_INSTANTIATES_URI_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_INSTANTIATES_URI][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_INSTANTIATES_URI_EXT][] = $enc; + } else { + $a[self::FIELD_INSTANTIATES_URI_EXT][] = null; + } + } else { + $a[self::FIELD_INSTANTIATES_URI][] = $v; + } } } if ([] !== ($vs = $this->getInsurance())) { $a[self::FIELD_INSURANCE] = $vs; } if (null !== ($v = $this->getIntent())) { - $a[self::FIELD_INTENT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_INTENT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_INTENT_EXT] = $enc; + } + } else { + $a[self::FIELD_INTENT] = $v; + } } if (null !== ($v = $this->getMedicationCodeableConcept())) { $a[self::FIELD_MEDICATION_CODEABLE_CONCEPT] = $v; @@ -3073,7 +3199,15 @@ public function jsonSerialize() $a[self::FIELD_PRIOR_PRESCRIPTION] = $v; } if (null !== ($v = $this->getPriority())) { - $a[self::FIELD_PRIORITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PRIORITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PRIORITY_EXT] = $enc; + } + } else { + $a[self::FIELD_PRIORITY] = $v; + } } if ([] !== ($vs = $this->getReasonCode())) { $a[self::FIELD_REASON_CODE] = $vs; @@ -3085,8 +3219,15 @@ public function jsonSerialize() $a[self::FIELD_RECORDER] = $v; } if (null !== ($v = $this->getReportedBoolean())) { - $a[self::FIELD_REPORTED_BOOLEAN] = $v->getValue(); - $a[self::FIELD_REPORTED_BOOLEAN_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_REPORTED_BOOLEAN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_REPORTED_BOOLEAN_EXT] = $enc; + } + } else { + $a[self::FIELD_REPORTED_BOOLEAN] = $v; + } } if (null !== ($v = $this->getReportedReference())) { $a[self::FIELD_REPORTED_REFERENCE] = $v; @@ -3095,7 +3236,15 @@ public function jsonSerialize() $a[self::FIELD_REQUESTER] = $v; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getStatusReason())) { $a[self::FIELD_STATUS_REASON] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRMedicationStatement.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRMedicationStatement.php index 4d565eec03..2cef93484a 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRMedicationStatement.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRMedicationStatement.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -105,10 +105,6 @@ class FHIRMedicationStatement extends FHIRDomainResource implements PHPFHIRConta { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MEDICATION_STATEMENT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_BASED_ON = 'basedOn'; const FIELD_CATEGORY = 'category'; const FIELD_CONTEXT = 'context'; @@ -376,6 +372,9 @@ class FHIRMedicationStatement extends FHIRDomainResource implements PHPFHIRConta */ protected $subject = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMedicationStatement Constructor * @param null|array $data @@ -395,6 +394,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_BASED_ON])) { if (is_array($data[self::FIELD_BASED_ON])) { foreach($data[self::FIELD_BASED_ON] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addBasedOn($v); } else { @@ -427,8 +429,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATE_ASSERTED] instanceof FHIRDateTime) { $this->setDateAsserted($data[self::FIELD_DATE_ASSERTED]); - } elseif ($ext && is_scalar($data[self::FIELD_DATE_ASSERTED])) { - $this->setDateAsserted(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE_ASSERTED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATE_ASSERTED])) { + $this->setDateAsserted(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE_ASSERTED]] + $ext)); + } else if (is_array($data[self::FIELD_DATE_ASSERTED])) { + $this->setDateAsserted(new FHIRDateTime(array_merge($ext, $data[self::FIELD_DATE_ASSERTED]))); + } } else { $this->setDateAsserted(new FHIRDateTime($data[self::FIELD_DATE_ASSERTED])); } @@ -436,6 +442,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_DERIVED_FROM])) { if (is_array($data[self::FIELD_DERIVED_FROM])) { foreach($data[self::FIELD_DERIVED_FROM] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addDerivedFrom($v); } else { @@ -451,6 +460,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_DOSAGE])) { if (is_array($data[self::FIELD_DOSAGE])) { foreach($data[self::FIELD_DOSAGE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRDosage) { $this->addDosage($v); } else { @@ -469,8 +481,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EFFECTIVE_DATE_TIME] instanceof FHIRDateTime) { $this->setEffectiveDateTime($data[self::FIELD_EFFECTIVE_DATE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_EFFECTIVE_DATE_TIME])) { - $this->setEffectiveDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_EFFECTIVE_DATE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EFFECTIVE_DATE_TIME])) { + $this->setEffectiveDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_EFFECTIVE_DATE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_EFFECTIVE_DATE_TIME])) { + $this->setEffectiveDateTime(new FHIRDateTime(array_merge($ext, $data[self::FIELD_EFFECTIVE_DATE_TIME]))); + } } else { $this->setEffectiveDateTime(new FHIRDateTime($data[self::FIELD_EFFECTIVE_DATE_TIME])); } @@ -488,17 +504,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -528,6 +551,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_NOTE])) { if (is_array($data[self::FIELD_NOTE])) { foreach($data[self::FIELD_NOTE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRAnnotation) { $this->addNote($v); } else { @@ -543,6 +569,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PART_OF])) { if (is_array($data[self::FIELD_PART_OF])) { foreach($data[self::FIELD_PART_OF] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addPartOf($v); } else { @@ -558,6 +587,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REASON_CODE])) { if (is_array($data[self::FIELD_REASON_CODE])) { foreach($data[self::FIELD_REASON_CODE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addReasonCode($v); } else { @@ -573,6 +605,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REASON_REFERENCE])) { if (is_array($data[self::FIELD_REASON_REFERENCE])) { foreach($data[self::FIELD_REASON_REFERENCE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addReasonReference($v); } else { @@ -591,8 +626,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRMedicationStatusCodes) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRMedicationStatusCodes([FHIRMedicationStatusCodes::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRMedicationStatusCodes([FHIRMedicationStatusCodes::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRMedicationStatusCodes(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRMedicationStatusCodes($data[self::FIELD_STATUS])); } @@ -600,6 +639,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_STATUS_REASON])) { if (is_array($data[self::FIELD_STATUS_REASON])) { foreach($data[self::FIELD_STATUS_REASON] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addStatusReason($v); } else { @@ -1707,7 +1749,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getBasedOn())) { foreach($vs as $v) { if (null === $v) { @@ -1720,14 +1761,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getCategory())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CATEGORY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getContext())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CONTEXT, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getDateAsserted())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DATE_ASSERTED, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getDerivedFrom())) { foreach($vs as $v) { if (null === $v) { @@ -1745,14 +1784,13 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_DOSAGE, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getEffectiveDateTime())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EFFECTIVE_DATE_TIME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getEffectivePeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EFFECTIVE_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -1765,15 +1803,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getInformationSource())) { $v->xmlSerialize($sxe->addChild(self::FIELD_INFORMATION_SOURCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getMedicationCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MEDICATION_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getMedicationReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MEDICATION_REFERENCE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getNote())) { foreach($vs as $v) { if (null === $v) { @@ -1813,7 +1848,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getStatusReason())) { foreach($vs as $v) { if (null === $v) { @@ -1845,8 +1879,15 @@ public function jsonSerialize() $a[self::FIELD_CONTEXT] = $v; } if (null !== ($v = $this->getDateAsserted())) { - $a[self::FIELD_DATE_ASSERTED] = $v->getValue(); - $a[self::FIELD_DATE_ASSERTED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATE_ASSERTED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATE_ASSERTED_EXT] = $enc; + } + } else { + $a[self::FIELD_DATE_ASSERTED] = $v; + } } if ([] !== ($vs = $this->getDerivedFrom())) { $a[self::FIELD_DERIVED_FROM] = $vs; @@ -1855,14 +1896,37 @@ public function jsonSerialize() $a[self::FIELD_DOSAGE] = $vs; } if (null !== ($v = $this->getEffectiveDateTime())) { - $a[self::FIELD_EFFECTIVE_DATE_TIME] = $v->getValue(); - $a[self::FIELD_EFFECTIVE_DATE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EFFECTIVE_DATE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EFFECTIVE_DATE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_EFFECTIVE_DATE_TIME] = $v; + } } if (null !== ($v = $this->getEffectivePeriod())) { $a[self::FIELD_EFFECTIVE_PERIOD] = $v; } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if (null !== ($v = $this->getInformationSource())) { $a[self::FIELD_INFORMATION_SOURCE] = $v; @@ -1886,7 +1950,15 @@ public function jsonSerialize() $a[self::FIELD_REASON_REFERENCE] = $vs; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if ([] !== ($vs = $this->getStatusReason())) { $a[self::FIELD_STATUS_REASON] = $vs; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRMedicinalProduct.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRMedicinalProduct.php index cad9e5b0c2..d18a6756f7 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRMedicinalProduct.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRMedicinalProduct.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -88,10 +88,6 @@ class FHIRMedicinalProduct extends FHIRDomainResource implements PHPFHIRContaine { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MEDICINAL_PRODUCT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ADDITIONAL_MONITORING_INDICATOR = 'additionalMonitoringIndicator'; const FIELD_ATTACHED_DOCUMENT = 'attachedDocument'; const FIELD_CLINICAL_TRIAL = 'clinicalTrial'; @@ -351,6 +347,9 @@ class FHIRMedicinalProduct extends FHIRDomainResource implements PHPFHIRContaine */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMedicinalProduct Constructor * @param null|array $data @@ -377,6 +376,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ATTACHED_DOCUMENT])) { if (is_array($data[self::FIELD_ATTACHED_DOCUMENT])) { foreach($data[self::FIELD_ATTACHED_DOCUMENT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addAttachedDocument($v); } else { @@ -392,6 +394,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CLINICAL_TRIAL])) { if (is_array($data[self::FIELD_CLINICAL_TRIAL])) { foreach($data[self::FIELD_CLINICAL_TRIAL] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addClinicalTrial($v); } else { @@ -414,6 +419,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CONTACT])) { if (is_array($data[self::FIELD_CONTACT])) { foreach($data[self::FIELD_CONTACT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addContact($v); } else { @@ -432,17 +440,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_CROSS_REFERENCE])) { foreach($data[self::FIELD_CROSS_REFERENCE] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addCrossReference($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addCrossReference(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addCrossReference(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addCrossReference(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addCrossReference(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_CROSS_REFERENCE] instanceof FHIRIdentifier) { $this->addCrossReference($data[self::FIELD_CROSS_REFERENCE]); - } elseif ($ext && is_scalar($data[self::FIELD_CROSS_REFERENCE])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_CROSS_REFERENCE])) { $this->addCrossReference(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_CROSS_REFERENCE]] + $ext)); } else { $this->addCrossReference(new FHIRIdentifier($data[self::FIELD_CROSS_REFERENCE])); @@ -461,17 +476,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -487,6 +509,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_MANUFACTURING_BUSINESS_OPERATION])) { if (is_array($data[self::FIELD_MANUFACTURING_BUSINESS_OPERATION])) { foreach($data[self::FIELD_MANUFACTURING_BUSINESS_OPERATION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRMedicinalProductManufacturingBusinessOperation) { $this->addManufacturingBusinessOperation($v); } else { @@ -502,6 +527,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_MARKETING_STATUS])) { if (is_array($data[self::FIELD_MARKETING_STATUS])) { foreach($data[self::FIELD_MARKETING_STATUS] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRMarketingStatus) { $this->addMarketingStatus($v); } else { @@ -517,6 +545,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_MASTER_FILE])) { if (is_array($data[self::FIELD_MASTER_FILE])) { foreach($data[self::FIELD_MASTER_FILE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addMasterFile($v); } else { @@ -532,6 +563,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_NAME])) { if (is_array($data[self::FIELD_NAME])) { foreach($data[self::FIELD_NAME] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRMedicinalProductName) { $this->addName($v); } else { @@ -547,6 +581,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PACKAGED_MEDICINAL_PRODUCT])) { if (is_array($data[self::FIELD_PACKAGED_MEDICINAL_PRODUCT])) { foreach($data[self::FIELD_PACKAGED_MEDICINAL_PRODUCT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addPackagedMedicinalProduct($v); } else { @@ -569,6 +606,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PHARMACEUTICAL_PRODUCT])) { if (is_array($data[self::FIELD_PHARMACEUTICAL_PRODUCT])) { foreach($data[self::FIELD_PHARMACEUTICAL_PRODUCT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addPharmaceuticalProduct($v); } else { @@ -584,6 +624,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PRODUCT_CLASSIFICATION])) { if (is_array($data[self::FIELD_PRODUCT_CLASSIFICATION])) { foreach($data[self::FIELD_PRODUCT_CLASSIFICATION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addProductClassification($v); } else { @@ -599,6 +642,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SPECIAL_DESIGNATION])) { if (is_array($data[self::FIELD_SPECIAL_DESIGNATION])) { foreach($data[self::FIELD_SPECIAL_DESIGNATION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRMedicinalProductSpecialDesignation) { $this->addSpecialDesignation($v); } else { @@ -617,17 +663,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_SPECIAL_MEASURES])) { foreach($data[self::FIELD_SPECIAL_MEASURES] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRString) { $this->addSpecialMeasures($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addSpecialMeasures(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addSpecialMeasures(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addSpecialMeasures(new FHIRString(array_merge($v, $ext[$i]))); + } } else { $this->addSpecialMeasures(new FHIRString($v)); } } } elseif ($data[self::FIELD_SPECIAL_MEASURES] instanceof FHIRString) { $this->addSpecialMeasures($data[self::FIELD_SPECIAL_MEASURES]); - } elseif ($ext && is_scalar($data[self::FIELD_SPECIAL_MEASURES])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_SPECIAL_MEASURES])) { $this->addSpecialMeasures(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SPECIAL_MEASURES]] + $ext)); } else { $this->addSpecialMeasures(new FHIRString($data[self::FIELD_SPECIAL_MEASURES])); @@ -1849,11 +1902,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getAdditionalMonitoringIndicator())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ADDITIONAL_MONITORING_INDICATOR, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getAttachedDocument())) { foreach($vs as $v) { if (null === $v) { @@ -1875,7 +1926,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getCombinedPharmaceuticalDoseForm())) { $v->xmlSerialize($sxe->addChild(self::FIELD_COMBINED_PHARMACEUTICAL_DOSE_FORM, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getContact())) { foreach($vs as $v) { if (null === $v) { @@ -1897,7 +1947,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDomain())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DOMAIN, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -1910,7 +1959,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getLegalStatusOfSupply())) { $v->xmlSerialize($sxe->addChild(self::FIELD_LEGAL_STATUS_OF_SUPPLY, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getManufacturingBusinessOperation())) { foreach($vs as $v) { if (null === $v) { @@ -1959,7 +2007,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getPaediatricUseIndicator())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PAEDIATRIC_USE_INDICATOR, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getPharmaceuticalProduct())) { foreach($vs as $v) { if (null === $v) { @@ -1986,6 +2033,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_SPECIAL_DESIGNATION, null, $v->_getFHIRXMLNamespace())); } } + if ([] !== ($vs = $this->getSpecialMeasures())) { foreach($vs as $v) { if (null === $v) { @@ -2023,13 +2071,45 @@ public function jsonSerialize() $a[self::FIELD_CONTACT] = $vs; } if ([] !== ($vs = $this->getCrossReference())) { - $a[self::FIELD_CROSS_REFERENCE] = $vs; + $a[self::FIELD_CROSS_REFERENCE] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CROSS_REFERENCE][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CROSS_REFERENCE_EXT][] = $enc; + } else { + $a[self::FIELD_CROSS_REFERENCE_EXT][] = null; + } + } else { + $a[self::FIELD_CROSS_REFERENCE][] = $v; + } + } } if (null !== ($v = $this->getDomain())) { $a[self::FIELD_DOMAIN] = $v; } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if (null !== ($v = $this->getLegalStatusOfSupply())) { $a[self::FIELD_LEGAL_STATUS_OF_SUPPLY] = $v; @@ -2067,8 +2147,17 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_SPECIAL_MEASURES][] = $v->getValue(); - $a[self::FIELD_SPECIAL_MEASURES_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SPECIAL_MEASURES][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SPECIAL_MEASURES_EXT][] = $enc; + } else { + $a[self::FIELD_SPECIAL_MEASURES_EXT][] = null; + } + } else { + $a[self::FIELD_SPECIAL_MEASURES][] = $v; + } } } if (null !== ($v = $this->getType())) { diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRMedicinalProductAuthorization.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRMedicinalProductAuthorization.php index 6840e6c97f..a3ade2d8a7 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRMedicinalProductAuthorization.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRMedicinalProductAuthorization.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -85,10 +85,6 @@ class FHIRMedicinalProductAuthorization extends FHIRDomainResource implements PH { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MEDICINAL_PRODUCT_AUTHORIZATION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_COUNTRY = 'country'; const FIELD_DATA_EXCLUSIVITY_PERIOD = 'dataExclusivityPeriod'; const FIELD_DATE_OF_FIRST_AUTHORIZATION = 'dateOfFirstAuthorization'; @@ -306,6 +302,9 @@ class FHIRMedicinalProductAuthorization extends FHIRDomainResource implements PH */ protected $validityPeriod = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMedicinalProductAuthorization Constructor * @param null|array $data @@ -325,6 +324,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_COUNTRY])) { if (is_array($data[self::FIELD_COUNTRY])) { foreach($data[self::FIELD_COUNTRY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addCountry($v); } else { @@ -350,8 +352,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATE_OF_FIRST_AUTHORIZATION] instanceof FHIRDateTime) { $this->setDateOfFirstAuthorization($data[self::FIELD_DATE_OF_FIRST_AUTHORIZATION]); - } elseif ($ext && is_scalar($data[self::FIELD_DATE_OF_FIRST_AUTHORIZATION])) { - $this->setDateOfFirstAuthorization(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE_OF_FIRST_AUTHORIZATION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATE_OF_FIRST_AUTHORIZATION])) { + $this->setDateOfFirstAuthorization(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE_OF_FIRST_AUTHORIZATION]] + $ext)); + } else if (is_array($data[self::FIELD_DATE_OF_FIRST_AUTHORIZATION])) { + $this->setDateOfFirstAuthorization(new FHIRDateTime(array_merge($ext, $data[self::FIELD_DATE_OF_FIRST_AUTHORIZATION]))); + } } else { $this->setDateOfFirstAuthorization(new FHIRDateTime($data[self::FIELD_DATE_OF_FIRST_AUTHORIZATION])); } @@ -369,17 +375,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -391,8 +404,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_INTERNATIONAL_BIRTH_DATE] instanceof FHIRDateTime) { $this->setInternationalBirthDate($data[self::FIELD_INTERNATIONAL_BIRTH_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_INTERNATIONAL_BIRTH_DATE])) { - $this->setInternationalBirthDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_INTERNATIONAL_BIRTH_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_INTERNATIONAL_BIRTH_DATE])) { + $this->setInternationalBirthDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_INTERNATIONAL_BIRTH_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_INTERNATIONAL_BIRTH_DATE])) { + $this->setInternationalBirthDate(new FHIRDateTime(array_merge($ext, $data[self::FIELD_INTERNATIONAL_BIRTH_DATE]))); + } } else { $this->setInternationalBirthDate(new FHIRDateTime($data[self::FIELD_INTERNATIONAL_BIRTH_DATE])); } @@ -400,6 +417,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_JURISDICTION])) { if (is_array($data[self::FIELD_JURISDICTION])) { foreach($data[self::FIELD_JURISDICTION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addJurisdiction($v); } else { @@ -415,6 +435,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_JURISDICTIONAL_AUTHORIZATION])) { if (is_array($data[self::FIELD_JURISDICTIONAL_AUTHORIZATION])) { foreach($data[self::FIELD_JURISDICTIONAL_AUTHORIZATION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRMedicinalProductAuthorizationJurisdictionalAuthorization) { $this->addJurisdictionalAuthorization($v); } else { @@ -454,8 +477,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_RESTORE_DATE] instanceof FHIRDateTime) { $this->setRestoreDate($data[self::FIELD_RESTORE_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_RESTORE_DATE])) { - $this->setRestoreDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_RESTORE_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_RESTORE_DATE])) { + $this->setRestoreDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_RESTORE_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_RESTORE_DATE])) { + $this->setRestoreDate(new FHIRDateTime(array_merge($ext, $data[self::FIELD_RESTORE_DATE]))); + } } else { $this->setRestoreDate(new FHIRDateTime($data[self::FIELD_RESTORE_DATE])); } @@ -473,8 +500,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS_DATE] instanceof FHIRDateTime) { $this->setStatusDate($data[self::FIELD_STATUS_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS_DATE])) { - $this->setStatusDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_STATUS_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS_DATE])) { + $this->setStatusDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_STATUS_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS_DATE])) { + $this->setStatusDate(new FHIRDateTime(array_merge($ext, $data[self::FIELD_STATUS_DATE]))); + } } else { $this->setStatusDate(new FHIRDateTime($data[self::FIELD_STATUS_DATE])); } @@ -1325,7 +1356,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getCountry())) { foreach($vs as $v) { if (null === $v) { @@ -1341,11 +1371,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDateOfFirstAuthorization())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DATE_OF_FIRST_AUTHORIZATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getHolder())) { $v->xmlSerialize($sxe->addChild(self::FIELD_HOLDER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -1354,10 +1382,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getInternationalBirthDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_INTERNATIONAL_BIRTH_DATE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getJurisdiction())) { foreach($vs as $v) { if (null === $v) { @@ -1379,29 +1407,24 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getLegalBasis())) { $v->xmlSerialize($sxe->addChild(self::FIELD_LEGAL_BASIS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getProcedure())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PROCEDURE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRegulator())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REGULATOR, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getRestoreDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RESTORE_DATE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getStatusDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS_DATE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSubject())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBJECT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValidityPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALIDITY_PERIOD, null, $v->_getFHIRXMLNamespace())); } @@ -1421,18 +1444,48 @@ public function jsonSerialize() $a[self::FIELD_DATA_EXCLUSIVITY_PERIOD] = $v; } if (null !== ($v = $this->getDateOfFirstAuthorization())) { - $a[self::FIELD_DATE_OF_FIRST_AUTHORIZATION] = $v->getValue(); - $a[self::FIELD_DATE_OF_FIRST_AUTHORIZATION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATE_OF_FIRST_AUTHORIZATION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATE_OF_FIRST_AUTHORIZATION_EXT] = $enc; + } + } else { + $a[self::FIELD_DATE_OF_FIRST_AUTHORIZATION] = $v; + } } if (null !== ($v = $this->getHolder())) { $a[self::FIELD_HOLDER] = $v; } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if (null !== ($v = $this->getInternationalBirthDate())) { - $a[self::FIELD_INTERNATIONAL_BIRTH_DATE] = $v->getValue(); - $a[self::FIELD_INTERNATIONAL_BIRTH_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_INTERNATIONAL_BIRTH_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_INTERNATIONAL_BIRTH_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_INTERNATIONAL_BIRTH_DATE] = $v; + } } if ([] !== ($vs = $this->getJurisdiction())) { $a[self::FIELD_JURISDICTION] = $vs; @@ -1450,15 +1503,29 @@ public function jsonSerialize() $a[self::FIELD_REGULATOR] = $v; } if (null !== ($v = $this->getRestoreDate())) { - $a[self::FIELD_RESTORE_DATE] = $v->getValue(); - $a[self::FIELD_RESTORE_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_RESTORE_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_RESTORE_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_RESTORE_DATE] = $v; + } } if (null !== ($v = $this->getStatus())) { $a[self::FIELD_STATUS] = $v; } if (null !== ($v = $this->getStatusDate())) { - $a[self::FIELD_STATUS_DATE] = $v->getValue(); - $a[self::FIELD_STATUS_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS_DATE] = $v; + } } if (null !== ($v = $this->getSubject())) { $a[self::FIELD_SUBJECT] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRMedicinalProductContraindication.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRMedicinalProductContraindication.php index b0882adef0..3fb0aafc46 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRMedicinalProductContraindication.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRMedicinalProductContraindication.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -83,10 +83,6 @@ class FHIRMedicinalProductContraindication extends FHIRDomainResource implements { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MEDICINAL_PRODUCT_CONTRAINDICATION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_COMORBIDITY = 'comorbidity'; const FIELD_DISEASE = 'disease'; const FIELD_DISEASE_STATUS = 'diseaseStatus'; @@ -176,6 +172,9 @@ class FHIRMedicinalProductContraindication extends FHIRDomainResource implements */ protected $therapeuticIndication = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMedicinalProductContraindication Constructor * @param null|array $data @@ -195,6 +194,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_COMORBIDITY])) { if (is_array($data[self::FIELD_COMORBIDITY])) { foreach($data[self::FIELD_COMORBIDITY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addComorbidity($v); } else { @@ -224,6 +226,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_OTHER_THERAPY])) { if (is_array($data[self::FIELD_OTHER_THERAPY])) { foreach($data[self::FIELD_OTHER_THERAPY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRMedicinalProductContraindicationOtherTherapy) { $this->addOtherTherapy($v); } else { @@ -239,6 +244,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_POPULATION])) { if (is_array($data[self::FIELD_POPULATION])) { foreach($data[self::FIELD_POPULATION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRPopulation) { $this->addPopulation($v); } else { @@ -254,6 +262,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SUBJECT])) { if (is_array($data[self::FIELD_SUBJECT])) { foreach($data[self::FIELD_SUBJECT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addSubject($v); } else { @@ -269,6 +280,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_THERAPEUTIC_INDICATION])) { if (is_array($data[self::FIELD_THERAPEUTIC_INDICATION])) { foreach($data[self::FIELD_THERAPEUTIC_INDICATION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addTherapeuticIndication($v); } else { @@ -771,7 +785,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getComorbidity())) { foreach($vs as $v) { if (null === $v) { @@ -784,11 +797,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDisease())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DISEASE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDiseaseStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DISEASE_STATUS, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getOtherTherapy())) { foreach($vs as $v) { if (null === $v) { @@ -824,6 +835,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_THERAPEUTIC_INDICATION, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRMedicinalProductIndication.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRMedicinalProductIndication.php index 311727db2b..eb2c1df8b8 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRMedicinalProductIndication.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRMedicinalProductIndication.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -83,10 +83,6 @@ class FHIRMedicinalProductIndication extends FHIRDomainResource implements PHPFH { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MEDICINAL_PRODUCT_INDICATION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_COMORBIDITY = 'comorbidity'; const FIELD_DISEASE_STATUS = 'diseaseStatus'; const FIELD_DISEASE_SYMPTOM_PROCEDURE = 'diseaseSymptomProcedure'; @@ -202,6 +198,9 @@ class FHIRMedicinalProductIndication extends FHIRDomainResource implements PHPFH */ protected $undesirableEffect = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMedicinalProductIndication Constructor * @param null|array $data @@ -221,6 +220,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_COMORBIDITY])) { if (is_array($data[self::FIELD_COMORBIDITY])) { foreach($data[self::FIELD_COMORBIDITY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addComorbidity($v); } else { @@ -253,8 +255,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DURATION] instanceof FHIRQuantity) { $this->setDuration($data[self::FIELD_DURATION]); - } elseif ($ext && is_scalar($data[self::FIELD_DURATION])) { - $this->setDuration(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_DURATION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DURATION])) { + $this->setDuration(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_DURATION]] + $ext)); + } else if (is_array($data[self::FIELD_DURATION])) { + $this->setDuration(new FHIRQuantity(array_merge($ext, $data[self::FIELD_DURATION]))); + } } else { $this->setDuration(new FHIRQuantity($data[self::FIELD_DURATION])); } @@ -269,6 +275,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_OTHER_THERAPY])) { if (is_array($data[self::FIELD_OTHER_THERAPY])) { foreach($data[self::FIELD_OTHER_THERAPY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRMedicinalProductIndicationOtherTherapy) { $this->addOtherTherapy($v); } else { @@ -284,6 +293,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_POPULATION])) { if (is_array($data[self::FIELD_POPULATION])) { foreach($data[self::FIELD_POPULATION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRPopulation) { $this->addPopulation($v); } else { @@ -299,6 +311,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SUBJECT])) { if (is_array($data[self::FIELD_SUBJECT])) { foreach($data[self::FIELD_SUBJECT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addSubject($v); } else { @@ -314,6 +329,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_UNDESIRABLE_EFFECT])) { if (is_array($data[self::FIELD_UNDESIRABLE_EFFECT])) { foreach($data[self::FIELD_UNDESIRABLE_EFFECT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addUndesirableEffect($v); } else { @@ -882,7 +900,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getComorbidity())) { foreach($vs as $v) { if (null === $v) { @@ -895,19 +912,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDiseaseStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DISEASE_STATUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDiseaseSymptomProcedure())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DISEASE_SYMPTOM_PROCEDURE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDuration())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DURATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getIntendedEffect())) { $v->xmlSerialize($sxe->addChild(self::FIELD_INTENDED_EFFECT, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getOtherTherapy())) { foreach($vs as $v) { if (null === $v) { @@ -943,6 +956,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_UNDESIRABLE_EFFECT, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } @@ -962,7 +976,15 @@ public function jsonSerialize() $a[self::FIELD_DISEASE_SYMPTOM_PROCEDURE] = $v; } if (null !== ($v = $this->getDuration())) { - $a[self::FIELD_DURATION] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DURATION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DURATION_EXT] = $enc; + } + } else { + $a[self::FIELD_DURATION] = $v; + } } if (null !== ($v = $this->getIntendedEffect())) { $a[self::FIELD_INTENDED_EFFECT] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRMedicinalProductIngredient.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRMedicinalProductIngredient.php index 8efd7f8b58..7c60a216fd 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRMedicinalProductIngredient.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRMedicinalProductIngredient.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -84,10 +84,6 @@ class FHIRMedicinalProductIngredient extends FHIRDomainResource implements PHPFH { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MEDICINAL_PRODUCT_INGREDIENT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ALLERGENIC_INDICATOR = 'allergenicIndicator'; const FIELD_ALLERGENIC_INDICATOR_EXT = '_allergenicIndicator'; const FIELD_IDENTIFIER = 'identifier'; @@ -162,6 +158,9 @@ class FHIRMedicinalProductIngredient extends FHIRDomainResource implements PHPFH */ protected $substance = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMedicinalProductIngredient Constructor * @param null|array $data @@ -184,8 +183,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ALLERGENIC_INDICATOR] instanceof FHIRBoolean) { $this->setAllergenicIndicator($data[self::FIELD_ALLERGENIC_INDICATOR]); - } elseif ($ext && is_scalar($data[self::FIELD_ALLERGENIC_INDICATOR])) { - $this->setAllergenicIndicator(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_ALLERGENIC_INDICATOR]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ALLERGENIC_INDICATOR])) { + $this->setAllergenicIndicator(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_ALLERGENIC_INDICATOR]] + $ext)); + } else if (is_array($data[self::FIELD_ALLERGENIC_INDICATOR])) { + $this->setAllergenicIndicator(new FHIRBoolean(array_merge($ext, $data[self::FIELD_ALLERGENIC_INDICATOR]))); + } } else { $this->setAllergenicIndicator(new FHIRBoolean($data[self::FIELD_ALLERGENIC_INDICATOR])); } @@ -196,8 +199,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->setIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { - $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_IDENTIFIER]))); + } } else { $this->setIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); } @@ -205,6 +212,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_MANUFACTURER])) { if (is_array($data[self::FIELD_MANUFACTURER])) { foreach($data[self::FIELD_MANUFACTURER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addManufacturer($v); } else { @@ -227,6 +237,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SPECIFIED_SUBSTANCE])) { if (is_array($data[self::FIELD_SPECIFIED_SUBSTANCE])) { foreach($data[self::FIELD_SPECIFIED_SUBSTANCE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRMedicinalProductIngredientSpecifiedSubstance) { $this->addSpecifiedSubstance($v); } else { @@ -619,11 +632,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getAllergenicIndicator())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ALLERGENIC_INDICATOR, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getManufacturer())) { foreach($vs as $v) { if (null === $v) { @@ -636,7 +647,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getRole())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ROLE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getSpecifiedSubstance())) { foreach($vs as $v) { if (null === $v) { @@ -659,11 +669,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getAllergenicIndicator())) { - $a[self::FIELD_ALLERGENIC_INDICATOR] = $v->getValue(); - $a[self::FIELD_ALLERGENIC_INDICATOR_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ALLERGENIC_INDICATOR] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ALLERGENIC_INDICATOR_EXT] = $enc; + } + } else { + $a[self::FIELD_ALLERGENIC_INDICATOR] = $v; + } } if (null !== ($v = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_IDENTIFIER] = $v; + } } if ([] !== ($vs = $this->getManufacturer())) { $a[self::FIELD_MANUFACTURER] = $vs; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRMedicinalProductInteraction.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRMedicinalProductInteraction.php index 9060472ecb..d9397f26e3 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRMedicinalProductInteraction.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRMedicinalProductInteraction.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -83,10 +83,6 @@ class FHIRMedicinalProductInteraction extends FHIRDomainResource implements PHPF { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MEDICINAL_PRODUCT_INTERACTION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DESCRIPTION = 'description'; const FIELD_DESCRIPTION_EXT = '_description'; const FIELD_EFFECT = 'effect'; @@ -178,6 +174,9 @@ class FHIRMedicinalProductInteraction extends FHIRDomainResource implements PHPF */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMedicinalProductInteraction Constructor * @param null|array $data @@ -200,8 +199,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -223,6 +226,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_INTERACTANT])) { if (is_array($data[self::FIELD_INTERACTANT])) { foreach($data[self::FIELD_INTERACTANT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRMedicinalProductInteractionInteractant) { $this->addInteractant($v); } else { @@ -245,6 +251,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SUBJECT])) { if (is_array($data[self::FIELD_SUBJECT])) { foreach($data[self::FIELD_SUBJECT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addSubject($v); } else { @@ -683,15 +692,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESCRIPTION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getEffect())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EFFECT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getIncidence())) { $v->xmlSerialize($sxe->addChild(self::FIELD_INCIDENCE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getInteractant())) { foreach($vs as $v) { if (null === $v) { @@ -704,7 +710,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getManagement())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MANAGEMENT, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getSubject())) { foreach($vs as $v) { if (null === $v) { @@ -727,8 +732,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if (null !== ($v = $this->getEffect())) { $a[self::FIELD_EFFECT] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRMedicinalProductManufactured.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRMedicinalProductManufactured.php index 4c8bc0f5d5..2fa70b31d4 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRMedicinalProductManufactured.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRMedicinalProductManufactured.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -82,10 +82,6 @@ class FHIRMedicinalProductManufactured extends FHIRDomainResource implements PHP { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MEDICINAL_PRODUCT_MANUFACTURED; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_INGREDIENT = 'ingredient'; const FIELD_MANUFACTURED_DOSE_FORM = 'manufacturedDoseForm'; const FIELD_MANUFACTURER = 'manufacturer'; @@ -181,6 +177,9 @@ class FHIRMedicinalProductManufactured extends FHIRDomainResource implements PHP */ protected $unitOfPresentation = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMedicinalProductManufactured Constructor * @param null|array $data @@ -200,6 +199,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_INGREDIENT])) { if (is_array($data[self::FIELD_INGREDIENT])) { foreach($data[self::FIELD_INGREDIENT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addIngredient($v); } else { @@ -222,6 +224,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_MANUFACTURER])) { if (is_array($data[self::FIELD_MANUFACTURER])) { foreach($data[self::FIELD_MANUFACTURER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addManufacturer($v); } else { @@ -237,6 +242,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_OTHER_CHARACTERISTICS])) { if (is_array($data[self::FIELD_OTHER_CHARACTERISTICS])) { foreach($data[self::FIELD_OTHER_CHARACTERISTICS] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addOtherCharacteristics($v); } else { @@ -262,8 +270,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_QUANTITY] instanceof FHIRQuantity) { $this->setQuantity($data[self::FIELD_QUANTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_QUANTITY])) { - $this->setQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_QUANTITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_QUANTITY])) { + $this->setQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_QUANTITY])) { + $this->setQuantity(new FHIRQuantity(array_merge($ext, $data[self::FIELD_QUANTITY]))); + } } else { $this->setQuantity(new FHIRQuantity($data[self::FIELD_QUANTITY])); } @@ -719,7 +731,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getIngredient())) { foreach($vs as $v) { if (null === $v) { @@ -732,7 +743,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getManufacturedDoseForm())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MANUFACTURED_DOSE_FORM, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getManufacturer())) { foreach($vs as $v) { if (null === $v) { @@ -754,11 +764,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getPhysicalCharacteristics())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PHYSICAL_CHARACTERISTICS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_QUANTITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getUnitOfPresentation())) { $v->xmlSerialize($sxe->addChild(self::FIELD_UNIT_OF_PRESENTATION, null, $v->_getFHIRXMLNamespace())); } @@ -787,7 +795,15 @@ public function jsonSerialize() $a[self::FIELD_PHYSICAL_CHARACTERISTICS] = $v; } if (null !== ($v = $this->getQuantity())) { - $a[self::FIELD_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_QUANTITY] = $v; + } } if (null !== ($v = $this->getUnitOfPresentation())) { $a[self::FIELD_UNIT_OF_PRESENTATION] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRMedicinalProductPackaged.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRMedicinalProductPackaged.php index 4d6e3701b0..e467a6a6c8 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRMedicinalProductPackaged.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRMedicinalProductPackaged.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -85,10 +85,6 @@ class FHIRMedicinalProductPackaged extends FHIRDomainResource implements PHPFHIR { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MEDICINAL_PRODUCT_PACKAGED; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_BATCH_IDENTIFIER = 'batchIdentifier'; const FIELD_DESCRIPTION = 'description'; const FIELD_DESCRIPTION_EXT = '_description'; @@ -201,6 +197,9 @@ class FHIRMedicinalProductPackaged extends FHIRDomainResource implements PHPFHIR */ protected $subject = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMedicinalProductPackaged Constructor * @param null|array $data @@ -220,6 +219,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_BATCH_IDENTIFIER])) { if (is_array($data[self::FIELD_BATCH_IDENTIFIER])) { foreach($data[self::FIELD_BATCH_IDENTIFIER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRMedicinalProductPackagedBatchIdentifier) { $this->addBatchIdentifier($v); } else { @@ -238,8 +240,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -250,17 +256,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -276,6 +289,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_MANUFACTURER])) { if (is_array($data[self::FIELD_MANUFACTURER])) { foreach($data[self::FIELD_MANUFACTURER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addManufacturer($v); } else { @@ -298,6 +314,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_MARKETING_STATUS])) { if (is_array($data[self::FIELD_MARKETING_STATUS])) { foreach($data[self::FIELD_MARKETING_STATUS] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRMarketingStatus) { $this->addMarketingStatus($v); } else { @@ -313,6 +332,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PACKAGE_ITEM])) { if (is_array($data[self::FIELD_PACKAGE_ITEM])) { foreach($data[self::FIELD_PACKAGE_ITEM] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRMedicinalProductPackagedPackageItem) { $this->addPackageItem($v); } else { @@ -328,6 +350,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SUBJECT])) { if (is_array($data[self::FIELD_SUBJECT])) { foreach($data[self::FIELD_SUBJECT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addSubject($v); } else { @@ -926,7 +951,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getBatchIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -935,10 +959,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_BATCH_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getDescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESCRIPTION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -951,7 +975,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getLegalStatusOfSupply())) { $v->xmlSerialize($sxe->addChild(self::FIELD_LEGAL_STATUS_OF_SUPPLY, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getManufacturer())) { foreach($vs as $v) { if (null === $v) { @@ -964,7 +987,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getMarketingAuthorization())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MARKETING_AUTHORIZATION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getMarketingStatus())) { foreach($vs as $v) { if (null === $v) { @@ -991,6 +1013,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_SUBJECT, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } @@ -1004,11 +1027,34 @@ public function jsonSerialize() $a[self::FIELD_BATCH_IDENTIFIER] = $vs; } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if (null !== ($v = $this->getLegalStatusOfSupply())) { $a[self::FIELD_LEGAL_STATUS_OF_SUPPLY] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRMedicinalProductPharmaceutical.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRMedicinalProductPharmaceutical.php index 327d026ce7..b50da33d57 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRMedicinalProductPharmaceutical.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRMedicinalProductPharmaceutical.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -83,10 +83,6 @@ class FHIRMedicinalProductPharmaceutical extends FHIRDomainResource implements P { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MEDICINAL_PRODUCT_PHARMACEUTICAL; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ADMINISTRABLE_DOSE_FORM = 'administrableDoseForm'; const FIELD_CHARACTERISTICS = 'characteristics'; const FIELD_DEVICE = 'device'; @@ -173,6 +169,9 @@ class FHIRMedicinalProductPharmaceutical extends FHIRDomainResource implements P */ protected $unitOfPresentation = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMedicinalProductPharmaceutical Constructor * @param null|array $data @@ -199,6 +198,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CHARACTERISTICS])) { if (is_array($data[self::FIELD_CHARACTERISTICS])) { foreach($data[self::FIELD_CHARACTERISTICS] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRMedicinalProductPharmaceuticalCharacteristics) { $this->addCharacteristics($v); } else { @@ -214,6 +216,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_DEVICE])) { if (is_array($data[self::FIELD_DEVICE])) { foreach($data[self::FIELD_DEVICE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addDevice($v); } else { @@ -232,17 +237,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -251,6 +263,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_INGREDIENT])) { if (is_array($data[self::FIELD_INGREDIENT])) { foreach($data[self::FIELD_INGREDIENT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addIngredient($v); } else { @@ -266,6 +281,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ROUTE_OF_ADMINISTRATION])) { if (is_array($data[self::FIELD_ROUTE_OF_ADMINISTRATION])) { foreach($data[self::FIELD_ROUTE_OF_ADMINISTRATION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRMedicinalProductPharmaceuticalRouteOfAdministration) { $this->addRouteOfAdministration($v); } else { @@ -763,11 +781,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getAdministrableDoseForm())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ADMINISTRABLE_DOSE_FORM, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getCharacteristics())) { foreach($vs as $v) { if (null === $v) { @@ -835,7 +851,23 @@ public function jsonSerialize() $a[self::FIELD_DEVICE] = $vs; } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if ([] !== ($vs = $this->getIngredient())) { $a[self::FIELD_INGREDIENT] = $vs; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRMedicinalProductUndesirableEffect.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRMedicinalProductUndesirableEffect.php index ead8d4285d..7eb756686c 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRMedicinalProductUndesirableEffect.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRMedicinalProductUndesirableEffect.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -81,10 +81,6 @@ class FHIRMedicinalProductUndesirableEffect extends FHIRDomainResource implement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MEDICINAL_PRODUCT_UNDESIRABLE_EFFECT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CLASSIFICATION = 'classification'; const FIELD_FREQUENCY_OF_OCCURRENCE = 'frequencyOfOccurrence'; const FIELD_POPULATION = 'population'; @@ -149,6 +145,9 @@ class FHIRMedicinalProductUndesirableEffect extends FHIRDomainResource implement */ protected $symptomConditionEffect = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMedicinalProductUndesirableEffect Constructor * @param null|array $data @@ -182,6 +181,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_POPULATION])) { if (is_array($data[self::FIELD_POPULATION])) { foreach($data[self::FIELD_POPULATION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRPopulation) { $this->addPopulation($v); } else { @@ -197,6 +199,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SUBJECT])) { if (is_array($data[self::FIELD_SUBJECT])) { foreach($data[self::FIELD_SUBJECT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addSubject($v); } else { @@ -552,15 +557,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getClassification())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CLASSIFICATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getFrequencyOfOccurrence())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FREQUENCY_OF_OCCURRENCE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getPopulation())) { foreach($vs as $v) { if (null === $v) { diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRMessageDefinition.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRMessageDefinition.php index 53547659a0..08d13f26d1 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRMessageDefinition.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRMessageDefinition.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -96,10 +96,6 @@ class FHIRMessageDefinition extends FHIRDomainResource implements PHPFHIRContain { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MESSAGE_DEFINITION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ALLOWED_RESPONSE = 'allowedResponse'; const FIELD_BASE = 'base'; const FIELD_BASE_EXT = '_base'; @@ -477,6 +473,9 @@ class FHIRMessageDefinition extends FHIRDomainResource implements PHPFHIRContain */ protected $version = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMessageDefinition Constructor * @param null|array $data @@ -496,6 +495,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ALLOWED_RESPONSE])) { if (is_array($data[self::FIELD_ALLOWED_RESPONSE])) { foreach($data[self::FIELD_ALLOWED_RESPONSE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRMessageDefinitionAllowedResponse) { $this->addAllowedResponse($v); } else { @@ -514,8 +516,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_BASE] instanceof FHIRCanonical) { $this->setBase($data[self::FIELD_BASE]); - } elseif ($ext && is_scalar($data[self::FIELD_BASE])) { - $this->setBase(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $data[self::FIELD_BASE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_BASE])) { + $this->setBase(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $data[self::FIELD_BASE]] + $ext)); + } else if (is_array($data[self::FIELD_BASE])) { + $this->setBase(new FHIRCanonical(array_merge($ext, $data[self::FIELD_BASE]))); + } } else { $this->setBase(new FHIRCanonical($data[self::FIELD_BASE])); } @@ -526,8 +532,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CATEGORY] instanceof FHIRMessageSignificanceCategory) { $this->setCategory($data[self::FIELD_CATEGORY]); - } elseif ($ext && is_scalar($data[self::FIELD_CATEGORY])) { - $this->setCategory(new FHIRMessageSignificanceCategory([FHIRMessageSignificanceCategory::FIELD_VALUE => $data[self::FIELD_CATEGORY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CATEGORY])) { + $this->setCategory(new FHIRMessageSignificanceCategory([FHIRMessageSignificanceCategory::FIELD_VALUE => $data[self::FIELD_CATEGORY]] + $ext)); + } else if (is_array($data[self::FIELD_CATEGORY])) { + $this->setCategory(new FHIRMessageSignificanceCategory(array_merge($ext, $data[self::FIELD_CATEGORY]))); + } } else { $this->setCategory(new FHIRMessageSignificanceCategory($data[self::FIELD_CATEGORY])); } @@ -535,6 +545,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CONTACT])) { if (is_array($data[self::FIELD_CONTACT])) { foreach($data[self::FIELD_CONTACT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContactDetail) { $this->addContact($v); } else { @@ -553,8 +566,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_COPYRIGHT] instanceof FHIRMarkdown) { $this->setCopyright($data[self::FIELD_COPYRIGHT]); - } elseif ($ext && is_scalar($data[self::FIELD_COPYRIGHT])) { - $this->setCopyright(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_COPYRIGHT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_COPYRIGHT])) { + $this->setCopyright(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_COPYRIGHT]] + $ext)); + } else if (is_array($data[self::FIELD_COPYRIGHT])) { + $this->setCopyright(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_COPYRIGHT]))); + } } else { $this->setCopyright(new FHIRMarkdown($data[self::FIELD_COPYRIGHT])); } @@ -565,8 +582,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATE] instanceof FHIRDateTime) { $this->setDate($data[self::FIELD_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_DATE])) { - $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime(array_merge($ext, $data[self::FIELD_DATE]))); + } } else { $this->setDate(new FHIRDateTime($data[self::FIELD_DATE])); } @@ -577,8 +598,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRMarkdown) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRMarkdown($data[self::FIELD_DESCRIPTION])); } @@ -596,8 +621,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EVENT_URI] instanceof FHIRUri) { $this->setEventUri($data[self::FIELD_EVENT_URI]); - } elseif ($ext && is_scalar($data[self::FIELD_EVENT_URI])) { - $this->setEventUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_EVENT_URI]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EVENT_URI])) { + $this->setEventUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_EVENT_URI]] + $ext)); + } else if (is_array($data[self::FIELD_EVENT_URI])) { + $this->setEventUri(new FHIRUri(array_merge($ext, $data[self::FIELD_EVENT_URI]))); + } } else { $this->setEventUri(new FHIRUri($data[self::FIELD_EVENT_URI])); } @@ -608,8 +637,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EXPERIMENTAL] instanceof FHIRBoolean) { $this->setExperimental($data[self::FIELD_EXPERIMENTAL]); - } elseif ($ext && is_scalar($data[self::FIELD_EXPERIMENTAL])) { - $this->setExperimental(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_EXPERIMENTAL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EXPERIMENTAL])) { + $this->setExperimental(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_EXPERIMENTAL]] + $ext)); + } else if (is_array($data[self::FIELD_EXPERIMENTAL])) { + $this->setExperimental(new FHIRBoolean(array_merge($ext, $data[self::FIELD_EXPERIMENTAL]))); + } } else { $this->setExperimental(new FHIRBoolean($data[self::FIELD_EXPERIMENTAL])); } @@ -617,6 +650,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_FOCUS])) { if (is_array($data[self::FIELD_FOCUS])) { foreach($data[self::FIELD_FOCUS] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRMessageDefinitionFocus) { $this->addFocus($v); } else { @@ -635,17 +671,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_GRAPH])) { foreach($data[self::FIELD_GRAPH] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCanonical) { $this->addGraph($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addGraph(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addGraph(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addGraph(new FHIRCanonical(array_merge($v, $ext[$i]))); + } } else { $this->addGraph(new FHIRCanonical($v)); } } } elseif ($data[self::FIELD_GRAPH] instanceof FHIRCanonical) { $this->addGraph($data[self::FIELD_GRAPH]); - } elseif ($ext && is_scalar($data[self::FIELD_GRAPH])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_GRAPH])) { $this->addGraph(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $data[self::FIELD_GRAPH]] + $ext)); } else { $this->addGraph(new FHIRCanonical($data[self::FIELD_GRAPH])); @@ -657,17 +700,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -676,6 +726,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_JURISDICTION])) { if (is_array($data[self::FIELD_JURISDICTION])) { foreach($data[self::FIELD_JURISDICTION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addJurisdiction($v); } else { @@ -694,8 +747,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -706,17 +763,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_PARENT])) { foreach($data[self::FIELD_PARENT] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCanonical) { $this->addParent($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addParent(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addParent(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addParent(new FHIRCanonical(array_merge($v, $ext[$i]))); + } } else { $this->addParent(new FHIRCanonical($v)); } } } elseif ($data[self::FIELD_PARENT] instanceof FHIRCanonical) { $this->addParent($data[self::FIELD_PARENT]); - } elseif ($ext && is_scalar($data[self::FIELD_PARENT])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_PARENT])) { $this->addParent(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $data[self::FIELD_PARENT]] + $ext)); } else { $this->addParent(new FHIRCanonical($data[self::FIELD_PARENT])); @@ -728,8 +792,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PUBLISHER] instanceof FHIRString) { $this->setPublisher($data[self::FIELD_PUBLISHER]); - } elseif ($ext && is_scalar($data[self::FIELD_PUBLISHER])) { - $this->setPublisher(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PUBLISHER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PUBLISHER])) { + $this->setPublisher(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PUBLISHER]] + $ext)); + } else if (is_array($data[self::FIELD_PUBLISHER])) { + $this->setPublisher(new FHIRString(array_merge($ext, $data[self::FIELD_PUBLISHER]))); + } } else { $this->setPublisher(new FHIRString($data[self::FIELD_PUBLISHER])); } @@ -740,8 +808,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PURPOSE] instanceof FHIRMarkdown) { $this->setPurpose($data[self::FIELD_PURPOSE]); - } elseif ($ext && is_scalar($data[self::FIELD_PURPOSE])) { - $this->setPurpose(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_PURPOSE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PURPOSE])) { + $this->setPurpose(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_PURPOSE]] + $ext)); + } else if (is_array($data[self::FIELD_PURPOSE])) { + $this->setPurpose(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_PURPOSE]))); + } } else { $this->setPurpose(new FHIRMarkdown($data[self::FIELD_PURPOSE])); } @@ -752,17 +824,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_REPLACES])) { foreach($data[self::FIELD_REPLACES] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCanonical) { $this->addReplaces($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addReplaces(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addReplaces(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addReplaces(new FHIRCanonical(array_merge($v, $ext[$i]))); + } } else { $this->addReplaces(new FHIRCanonical($v)); } } } elseif ($data[self::FIELD_REPLACES] instanceof FHIRCanonical) { $this->addReplaces($data[self::FIELD_REPLACES]); - } elseif ($ext && is_scalar($data[self::FIELD_REPLACES])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_REPLACES])) { $this->addReplaces(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $data[self::FIELD_REPLACES]] + $ext)); } else { $this->addReplaces(new FHIRCanonical($data[self::FIELD_REPLACES])); @@ -774,8 +853,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_RESPONSE_REQUIRED] instanceof FHIRMessageheaderResponseRequest) { $this->setResponseRequired($data[self::FIELD_RESPONSE_REQUIRED]); - } elseif ($ext && is_scalar($data[self::FIELD_RESPONSE_REQUIRED])) { - $this->setResponseRequired(new FHIRMessageheaderResponseRequest([FHIRMessageheaderResponseRequest::FIELD_VALUE => $data[self::FIELD_RESPONSE_REQUIRED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_RESPONSE_REQUIRED])) { + $this->setResponseRequired(new FHIRMessageheaderResponseRequest([FHIRMessageheaderResponseRequest::FIELD_VALUE => $data[self::FIELD_RESPONSE_REQUIRED]] + $ext)); + } else if (is_array($data[self::FIELD_RESPONSE_REQUIRED])) { + $this->setResponseRequired(new FHIRMessageheaderResponseRequest(array_merge($ext, $data[self::FIELD_RESPONSE_REQUIRED]))); + } } else { $this->setResponseRequired(new FHIRMessageheaderResponseRequest($data[self::FIELD_RESPONSE_REQUIRED])); } @@ -786,8 +869,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRPublicationStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRPublicationStatus([FHIRPublicationStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRPublicationStatus([FHIRPublicationStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRPublicationStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRPublicationStatus($data[self::FIELD_STATUS])); } @@ -798,8 +885,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TITLE] instanceof FHIRString) { $this->setTitle($data[self::FIELD_TITLE]); - } elseif ($ext && is_scalar($data[self::FIELD_TITLE])) { - $this->setTitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TITLE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TITLE])) { + $this->setTitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TITLE]] + $ext)); + } else if (is_array($data[self::FIELD_TITLE])) { + $this->setTitle(new FHIRString(array_merge($ext, $data[self::FIELD_TITLE]))); + } } else { $this->setTitle(new FHIRString($data[self::FIELD_TITLE])); } @@ -810,8 +901,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_URL] instanceof FHIRUri) { $this->setUrl($data[self::FIELD_URL]); - } elseif ($ext && is_scalar($data[self::FIELD_URL])) { - $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } else if (is_array($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri(array_merge($ext, $data[self::FIELD_URL]))); + } } else { $this->setUrl(new FHIRUri($data[self::FIELD_URL])); } @@ -819,6 +914,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_USE_CONTEXT])) { if (is_array($data[self::FIELD_USE_CONTEXT])) { foreach($data[self::FIELD_USE_CONTEXT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRUsageContext) { $this->addUseContext($v); } else { @@ -837,8 +935,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VERSION] instanceof FHIRString) { $this->setVersion($data[self::FIELD_VERSION]); - } elseif ($ext && is_scalar($data[self::FIELD_VERSION])) { - $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } else if (is_array($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString(array_merge($ext, $data[self::FIELD_VERSION]))); + } } else { $this->setVersion(new FHIRString($data[self::FIELD_VERSION])); } @@ -2331,7 +2433,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getAllowedResponse())) { foreach($vs as $v) { if (null === $v) { @@ -2340,14 +2441,13 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_ALLOWED_RESPONSE, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getBase())) { $v->xmlSerialize($sxe->addChild(self::FIELD_BASE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getCategory())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CATEGORY, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getContact())) { foreach($vs as $v) { if (null === $v) { @@ -2356,6 +2456,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_CONTACT, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getCopyright())) { $v->xmlSerialize($sxe->addChild(self::FIELD_COPYRIGHT, null, $v->_getFHIRXMLNamespace())); } @@ -2365,7 +2466,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESCRIPTION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getEventCoding())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EVENT_CODING, null, $v->_getFHIRXMLNamespace())); } @@ -2375,7 +2475,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getExperimental())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EXPERIMENTAL, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getFocus())) { foreach($vs as $v) { if (null === $v) { @@ -2384,6 +2483,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_FOCUS, null, $v->_getFHIRXMLNamespace())); } } + if ([] !== ($vs = $this->getGraph())) { foreach($vs as $v) { if (null === $v) { @@ -2410,6 +2510,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_JURISDICTION, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NAME, null, $v->_getFHIRXMLNamespace())); } @@ -2421,6 +2522,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_PARENT, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getPublisher())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PUBLISHER, null, $v->_getFHIRXMLNamespace())); } @@ -2439,7 +2541,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getResponseRequired())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RESPONSE_REQUIRED, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } @@ -2449,7 +2550,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getUrl())) { $v->xmlSerialize($sxe->addChild(self::FIELD_URL, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getUseContext())) { foreach($vs as $v) { if (null === $v) { @@ -2458,6 +2558,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_USE_CONTEXT, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getVersion())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VERSION, null, $v->_getFHIRXMLNamespace())); } @@ -2474,37 +2575,87 @@ public function jsonSerialize() $a[self::FIELD_ALLOWED_RESPONSE] = $vs; } if (null !== ($v = $this->getBase())) { - $a[self::FIELD_BASE] = $v->getValue(); - $a[self::FIELD_BASE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_BASE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_BASE_EXT] = $enc; + } + } else { + $a[self::FIELD_BASE] = $v; + } } if (null !== ($v = $this->getCategory())) { - $a[self::FIELD_CATEGORY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CATEGORY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CATEGORY_EXT] = $enc; + } + } else { + $a[self::FIELD_CATEGORY] = $v; + } } if ([] !== ($vs = $this->getContact())) { $a[self::FIELD_CONTACT] = $vs; } if (null !== ($v = $this->getCopyright())) { - $a[self::FIELD_COPYRIGHT] = $v->getValue(); - $a[self::FIELD_COPYRIGHT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_COPYRIGHT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_COPYRIGHT_EXT] = $enc; + } + } else { + $a[self::FIELD_COPYRIGHT] = $v; + } } if (null !== ($v = $this->getDate())) { - $a[self::FIELD_DATE] = $v->getValue(); - $a[self::FIELD_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_DATE] = $v; + } } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if (null !== ($v = $this->getEventCoding())) { $a[self::FIELD_EVENT_CODING] = $v; } if (null !== ($v = $this->getEventUri())) { - $a[self::FIELD_EVENT_URI] = $v->getValue(); - $a[self::FIELD_EVENT_URI_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EVENT_URI] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EVENT_URI_EXT] = $enc; + } + } else { + $a[self::FIELD_EVENT_URI] = $v; + } } if (null !== ($v = $this->getExperimental())) { - $a[self::FIELD_EXPERIMENTAL] = $v->getValue(); - $a[self::FIELD_EXPERIMENTAL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EXPERIMENTAL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EXPERIMENTAL_EXT] = $enc; + } + } else { + $a[self::FIELD_EXPERIMENTAL] = $v; + } } if ([] !== ($vs = $this->getFocus())) { $a[self::FIELD_FOCUS] = $vs; @@ -2515,19 +2666,51 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_GRAPH][] = $v->getValue(); - $a[self::FIELD_GRAPH_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_GRAPH][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_GRAPH_EXT][] = $enc; + } else { + $a[self::FIELD_GRAPH_EXT][] = null; + } + } else { + $a[self::FIELD_GRAPH][] = $v; + } } } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if ([] !== ($vs = $this->getJurisdiction())) { $a[self::FIELD_JURISDICTION] = $vs; } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if ([] !== ($vs = $this->getParent())) { $a[self::FIELD_PARENT] = []; @@ -2535,17 +2718,40 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_PARENT][] = $v->getValue(); - $a[self::FIELD_PARENT_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PARENT][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PARENT_EXT][] = $enc; + } else { + $a[self::FIELD_PARENT_EXT][] = null; + } + } else { + $a[self::FIELD_PARENT][] = $v; + } } } if (null !== ($v = $this->getPublisher())) { - $a[self::FIELD_PUBLISHER] = $v->getValue(); - $a[self::FIELD_PUBLISHER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PUBLISHER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PUBLISHER_EXT] = $enc; + } + } else { + $a[self::FIELD_PUBLISHER] = $v; + } } if (null !== ($v = $this->getPurpose())) { - $a[self::FIELD_PURPOSE] = $v->getValue(); - $a[self::FIELD_PURPOSE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PURPOSE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PURPOSE_EXT] = $enc; + } + } else { + $a[self::FIELD_PURPOSE] = $v; + } } if ([] !== ($vs = $this->getReplaces())) { $a[self::FIELD_REPLACES] = []; @@ -2553,30 +2759,76 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_REPLACES][] = $v->getValue(); - $a[self::FIELD_REPLACES_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_REPLACES][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_REPLACES_EXT][] = $enc; + } else { + $a[self::FIELD_REPLACES_EXT][] = null; + } + } else { + $a[self::FIELD_REPLACES][] = $v; + } } } if (null !== ($v = $this->getResponseRequired())) { - $a[self::FIELD_RESPONSE_REQUIRED] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_RESPONSE_REQUIRED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_RESPONSE_REQUIRED_EXT] = $enc; + } + } else { + $a[self::FIELD_RESPONSE_REQUIRED] = $v; + } } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getTitle())) { - $a[self::FIELD_TITLE] = $v->getValue(); - $a[self::FIELD_TITLE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TITLE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TITLE_EXT] = $enc; + } + } else { + $a[self::FIELD_TITLE] = $v; + } } if (null !== ($v = $this->getUrl())) { - $a[self::FIELD_URL] = $v->getValue(); - $a[self::FIELD_URL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_URL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_URL_EXT] = $enc; + } + } else { + $a[self::FIELD_URL] = $v; + } } if ([] !== ($vs = $this->getUseContext())) { $a[self::FIELD_USE_CONTEXT] = $vs; } if (null !== ($v = $this->getVersion())) { - $a[self::FIELD_VERSION] = $v->getValue(); - $a[self::FIELD_VERSION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VERSION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VERSION_EXT] = $enc; + } + } else { + $a[self::FIELD_VERSION] = $v; + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRMessageHeader.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRMessageHeader.php index e7066f7594..8b5b48bdf2 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRMessageHeader.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRMessageHeader.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -89,10 +89,6 @@ class FHIRMessageHeader extends FHIRDomainResource implements PHPFHIRContainedTy { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MESSAGE_HEADER; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_AUTHOR = 'author'; const FIELD_DEFINITION = 'definition'; const FIELD_DEFINITION_EXT = '_definition'; @@ -260,6 +256,9 @@ class FHIRMessageHeader extends FHIRDomainResource implements PHPFHIRContainedTy */ protected $source = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMessageHeader Constructor * @param null|array $data @@ -289,8 +288,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DEFINITION] instanceof FHIRCanonical) { $this->setDefinition($data[self::FIELD_DEFINITION]); - } elseif ($ext && is_scalar($data[self::FIELD_DEFINITION])) { - $this->setDefinition(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $data[self::FIELD_DEFINITION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DEFINITION])) { + $this->setDefinition(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $data[self::FIELD_DEFINITION]] + $ext)); + } else if (is_array($data[self::FIELD_DEFINITION])) { + $this->setDefinition(new FHIRCanonical(array_merge($ext, $data[self::FIELD_DEFINITION]))); + } } else { $this->setDefinition(new FHIRCanonical($data[self::FIELD_DEFINITION])); } @@ -298,6 +301,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_DESTINATION])) { if (is_array($data[self::FIELD_DESTINATION])) { foreach($data[self::FIELD_DESTINATION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRMessageHeaderDestination) { $this->addDestination($v); } else { @@ -330,8 +336,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EVENT_URI] instanceof FHIRUri) { $this->setEventUri($data[self::FIELD_EVENT_URI]); - } elseif ($ext && is_scalar($data[self::FIELD_EVENT_URI])) { - $this->setEventUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_EVENT_URI]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EVENT_URI])) { + $this->setEventUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_EVENT_URI]] + $ext)); + } else if (is_array($data[self::FIELD_EVENT_URI])) { + $this->setEventUri(new FHIRUri(array_merge($ext, $data[self::FIELD_EVENT_URI]))); + } } else { $this->setEventUri(new FHIRUri($data[self::FIELD_EVENT_URI])); } @@ -339,6 +349,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_FOCUS])) { if (is_array($data[self::FIELD_FOCUS])) { foreach($data[self::FIELD_FOCUS] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addFocus($v); } else { @@ -1011,14 +1024,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getAuthor())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AUTHOR, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getDefinition())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFINITION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getDestination())) { foreach($vs as $v) { if (null === $v) { @@ -1031,14 +1042,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getEnterer())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ENTERER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getEventCoding())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EVENT_CODING, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getEventUri())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EVENT_URI, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getFocus())) { foreach($vs as $v) { if (null === $v) { @@ -1051,19 +1060,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getReason())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REASON, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getResponse())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RESPONSE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getResponsible())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RESPONSIBLE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSender())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SENDER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSource())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SOURCE, null, $v->_getFHIRXMLNamespace())); } @@ -1080,8 +1085,15 @@ public function jsonSerialize() $a[self::FIELD_AUTHOR] = $v; } if (null !== ($v = $this->getDefinition())) { - $a[self::FIELD_DEFINITION] = $v->getValue(); - $a[self::FIELD_DEFINITION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DEFINITION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DEFINITION_EXT] = $enc; + } + } else { + $a[self::FIELD_DEFINITION] = $v; + } } if ([] !== ($vs = $this->getDestination())) { $a[self::FIELD_DESTINATION] = $vs; @@ -1093,8 +1105,15 @@ public function jsonSerialize() $a[self::FIELD_EVENT_CODING] = $v; } if (null !== ($v = $this->getEventUri())) { - $a[self::FIELD_EVENT_URI] = $v->getValue(); - $a[self::FIELD_EVENT_URI_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EVENT_URI] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EVENT_URI_EXT] = $enc; + } + } else { + $a[self::FIELD_EVENT_URI] = $v; + } } if ([] !== ($vs = $this->getFocus())) { $a[self::FIELD_FOCUS] = $vs; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRMolecularSequence.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRMolecularSequence.php index 2937719fde..0896c9a3e4 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRMolecularSequence.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRMolecularSequence.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -89,10 +89,6 @@ class FHIRMolecularSequence extends FHIRDomainResource implements PHPFHIRContain { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MOLECULAR_SEQUENCE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_COORDINATE_SYSTEM = 'coordinateSystem'; const FIELD_COORDINATE_SYSTEM_EXT = '_coordinateSystem'; const FIELD_DEVICE = 'device'; @@ -298,6 +294,9 @@ class FHIRMolecularSequence extends FHIRDomainResource implements PHPFHIRContain */ protected $variant = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMolecularSequence Constructor * @param null|array $data @@ -320,8 +319,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_COORDINATE_SYSTEM] instanceof FHIRInteger) { $this->setCoordinateSystem($data[self::FIELD_COORDINATE_SYSTEM]); - } elseif ($ext && is_scalar($data[self::FIELD_COORDINATE_SYSTEM])) { - $this->setCoordinateSystem(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_COORDINATE_SYSTEM]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_COORDINATE_SYSTEM])) { + $this->setCoordinateSystem(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_COORDINATE_SYSTEM]] + $ext)); + } else if (is_array($data[self::FIELD_COORDINATE_SYSTEM])) { + $this->setCoordinateSystem(new FHIRInteger(array_merge($ext, $data[self::FIELD_COORDINATE_SYSTEM]))); + } } else { $this->setCoordinateSystem(new FHIRInteger($data[self::FIELD_COORDINATE_SYSTEM])); } @@ -339,17 +342,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -361,8 +371,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_OBSERVED_SEQ] instanceof FHIRString) { $this->setObservedSeq($data[self::FIELD_OBSERVED_SEQ]); - } elseif ($ext && is_scalar($data[self::FIELD_OBSERVED_SEQ])) { - $this->setObservedSeq(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_OBSERVED_SEQ]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_OBSERVED_SEQ])) { + $this->setObservedSeq(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_OBSERVED_SEQ]] + $ext)); + } else if (is_array($data[self::FIELD_OBSERVED_SEQ])) { + $this->setObservedSeq(new FHIRString(array_merge($ext, $data[self::FIELD_OBSERVED_SEQ]))); + } } else { $this->setObservedSeq(new FHIRString($data[self::FIELD_OBSERVED_SEQ])); } @@ -384,6 +398,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_POINTER])) { if (is_array($data[self::FIELD_POINTER])) { foreach($data[self::FIELD_POINTER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addPointer($v); } else { @@ -399,6 +416,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_QUALITY])) { if (is_array($data[self::FIELD_QUALITY])) { foreach($data[self::FIELD_QUALITY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRMolecularSequenceQuality) { $this->addQuality($v); } else { @@ -417,8 +437,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_QUANTITY] instanceof FHIRQuantity) { $this->setQuantity($data[self::FIELD_QUANTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_QUANTITY])) { - $this->setQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_QUANTITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_QUANTITY])) { + $this->setQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_QUANTITY])) { + $this->setQuantity(new FHIRQuantity(array_merge($ext, $data[self::FIELD_QUANTITY]))); + } } else { $this->setQuantity(new FHIRQuantity($data[self::FIELD_QUANTITY])); } @@ -429,8 +453,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_READ_COVERAGE] instanceof FHIRInteger) { $this->setReadCoverage($data[self::FIELD_READ_COVERAGE]); - } elseif ($ext && is_scalar($data[self::FIELD_READ_COVERAGE])) { - $this->setReadCoverage(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_READ_COVERAGE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_READ_COVERAGE])) { + $this->setReadCoverage(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_READ_COVERAGE]] + $ext)); + } else if (is_array($data[self::FIELD_READ_COVERAGE])) { + $this->setReadCoverage(new FHIRInteger(array_merge($ext, $data[self::FIELD_READ_COVERAGE]))); + } } else { $this->setReadCoverage(new FHIRInteger($data[self::FIELD_READ_COVERAGE])); } @@ -445,6 +473,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REPOSITORY])) { if (is_array($data[self::FIELD_REPOSITORY])) { foreach($data[self::FIELD_REPOSITORY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRMolecularSequenceRepository) { $this->addRepository($v); } else { @@ -467,6 +498,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_STRUCTURE_VARIANT])) { if (is_array($data[self::FIELD_STRUCTURE_VARIANT])) { foreach($data[self::FIELD_STRUCTURE_VARIANT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRMolecularSequenceStructureVariant) { $this->addStructureVariant($v); } else { @@ -485,8 +519,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TYPE] instanceof FHIRSequenceType) { $this->setType($data[self::FIELD_TYPE]); - } elseif ($ext && is_scalar($data[self::FIELD_TYPE])) { - $this->setType(new FHIRSequenceType([FHIRSequenceType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TYPE])) { + $this->setType(new FHIRSequenceType([FHIRSequenceType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } else if (is_array($data[self::FIELD_TYPE])) { + $this->setType(new FHIRSequenceType(array_merge($ext, $data[self::FIELD_TYPE]))); + } } else { $this->setType(new FHIRSequenceType($data[self::FIELD_TYPE])); } @@ -494,6 +532,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_VARIANT])) { if (is_array($data[self::FIELD_VARIANT])) { foreach($data[self::FIELD_VARIANT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRMolecularSequenceVariant) { $this->addVariant($v); } else { @@ -1360,11 +1401,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getCoordinateSystem())) { $v->xmlSerialize($sxe->addChild(self::FIELD_COORDINATE_SYSTEM, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDevice())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEVICE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -1373,18 +1412,16 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getObservedSeq())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OBSERVED_SEQ, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPatient())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATIENT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPerformer())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PERFORMER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getPointer())) { foreach($vs as $v) { if (null === $v) { @@ -1409,11 +1446,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getReadCoverage())) { $v->xmlSerialize($sxe->addChild(self::FIELD_READ_COVERAGE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getReferenceSeq())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REFERENCE_SEQ, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getRepository())) { foreach($vs as $v) { if (null === $v) { @@ -1426,7 +1461,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getSpecimen())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SPECIMEN, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getStructureVariant())) { foreach($vs as $v) { if (null === $v) { @@ -1439,7 +1473,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getVariant())) { foreach($vs as $v) { if (null === $v) { @@ -1448,6 +1481,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_VARIANT, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } @@ -1458,18 +1492,48 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getCoordinateSystem())) { - $a[self::FIELD_COORDINATE_SYSTEM] = $v->getValue(); - $a[self::FIELD_COORDINATE_SYSTEM_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_COORDINATE_SYSTEM] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_COORDINATE_SYSTEM_EXT] = $enc; + } + } else { + $a[self::FIELD_COORDINATE_SYSTEM] = $v; + } } if (null !== ($v = $this->getDevice())) { $a[self::FIELD_DEVICE] = $v; } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if (null !== ($v = $this->getObservedSeq())) { - $a[self::FIELD_OBSERVED_SEQ] = $v->getValue(); - $a[self::FIELD_OBSERVED_SEQ_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_OBSERVED_SEQ] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_OBSERVED_SEQ_EXT] = $enc; + } + } else { + $a[self::FIELD_OBSERVED_SEQ] = $v; + } } if (null !== ($v = $this->getPatient())) { $a[self::FIELD_PATIENT] = $v; @@ -1484,11 +1548,26 @@ public function jsonSerialize() $a[self::FIELD_QUALITY] = $vs; } if (null !== ($v = $this->getQuantity())) { - $a[self::FIELD_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_QUANTITY] = $v; + } } if (null !== ($v = $this->getReadCoverage())) { - $a[self::FIELD_READ_COVERAGE] = $v->getValue(); - $a[self::FIELD_READ_COVERAGE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_READ_COVERAGE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_READ_COVERAGE_EXT] = $enc; + } + } else { + $a[self::FIELD_READ_COVERAGE] = $v; + } } if (null !== ($v = $this->getReferenceSeq())) { $a[self::FIELD_REFERENCE_SEQ] = $v; @@ -1503,7 +1582,15 @@ public function jsonSerialize() $a[self::FIELD_STRUCTURE_VARIANT] = $vs; } if (null !== ($v = $this->getType())) { - $a[self::FIELD_TYPE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TYPE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TYPE_EXT] = $enc; + } + } else { + $a[self::FIELD_TYPE] = $v; + } } if ([] !== ($vs = $this->getVariant())) { $a[self::FIELD_VARIANT] = $vs; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRNamingSystem.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRNamingSystem.php index 6f298bc313..7783fb85f2 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRNamingSystem.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRNamingSystem.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -89,10 +89,6 @@ class FHIRNamingSystem extends FHIRDomainResource implements PHPFHIRContainedTyp { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_NAMING_SYSTEM; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CONTACT = 'contact'; const FIELD_DATE = 'date'; const FIELD_DATE_EXT = '_date'; @@ -286,6 +282,9 @@ class FHIRNamingSystem extends FHIRDomainResource implements PHPFHIRContainedTyp */ protected $useContext = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRNamingSystem Constructor * @param null|array $data @@ -305,6 +304,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CONTACT])) { if (is_array($data[self::FIELD_CONTACT])) { foreach($data[self::FIELD_CONTACT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContactDetail) { $this->addContact($v); } else { @@ -323,8 +325,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATE] instanceof FHIRDateTime) { $this->setDate($data[self::FIELD_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_DATE])) { - $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime(array_merge($ext, $data[self::FIELD_DATE]))); + } } else { $this->setDate(new FHIRDateTime($data[self::FIELD_DATE])); } @@ -335,8 +341,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRMarkdown) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRMarkdown($data[self::FIELD_DESCRIPTION])); } @@ -344,6 +354,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_JURISDICTION])) { if (is_array($data[self::FIELD_JURISDICTION])) { foreach($data[self::FIELD_JURISDICTION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addJurisdiction($v); } else { @@ -362,8 +375,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_KIND] instanceof FHIRNamingSystemType) { $this->setKind($data[self::FIELD_KIND]); - } elseif ($ext && is_scalar($data[self::FIELD_KIND])) { - $this->setKind(new FHIRNamingSystemType([FHIRNamingSystemType::FIELD_VALUE => $data[self::FIELD_KIND]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_KIND])) { + $this->setKind(new FHIRNamingSystemType([FHIRNamingSystemType::FIELD_VALUE => $data[self::FIELD_KIND]] + $ext)); + } else if (is_array($data[self::FIELD_KIND])) { + $this->setKind(new FHIRNamingSystemType(array_merge($ext, $data[self::FIELD_KIND]))); + } } else { $this->setKind(new FHIRNamingSystemType($data[self::FIELD_KIND])); } @@ -374,8 +391,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -386,8 +407,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PUBLISHER] instanceof FHIRString) { $this->setPublisher($data[self::FIELD_PUBLISHER]); - } elseif ($ext && is_scalar($data[self::FIELD_PUBLISHER])) { - $this->setPublisher(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PUBLISHER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PUBLISHER])) { + $this->setPublisher(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PUBLISHER]] + $ext)); + } else if (is_array($data[self::FIELD_PUBLISHER])) { + $this->setPublisher(new FHIRString(array_merge($ext, $data[self::FIELD_PUBLISHER]))); + } } else { $this->setPublisher(new FHIRString($data[self::FIELD_PUBLISHER])); } @@ -398,8 +423,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_RESPONSIBLE] instanceof FHIRString) { $this->setResponsible($data[self::FIELD_RESPONSIBLE]); - } elseif ($ext && is_scalar($data[self::FIELD_RESPONSIBLE])) { - $this->setResponsible(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_RESPONSIBLE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_RESPONSIBLE])) { + $this->setResponsible(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_RESPONSIBLE]] + $ext)); + } else if (is_array($data[self::FIELD_RESPONSIBLE])) { + $this->setResponsible(new FHIRString(array_merge($ext, $data[self::FIELD_RESPONSIBLE]))); + } } else { $this->setResponsible(new FHIRString($data[self::FIELD_RESPONSIBLE])); } @@ -410,8 +439,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRPublicationStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRPublicationStatus([FHIRPublicationStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRPublicationStatus([FHIRPublicationStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRPublicationStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRPublicationStatus($data[self::FIELD_STATUS])); } @@ -429,17 +462,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_UNIQUE_ID])) { foreach($data[self::FIELD_UNIQUE_ID] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRNamingSystemUniqueId) { $this->addUniqueId($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addUniqueId(new FHIRNamingSystemUniqueId([FHIRNamingSystemUniqueId::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addUniqueId(new FHIRNamingSystemUniqueId([FHIRNamingSystemUniqueId::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addUniqueId(new FHIRNamingSystemUniqueId(array_merge($v, $ext[$i]))); + } } else { $this->addUniqueId(new FHIRNamingSystemUniqueId($v)); } } } elseif ($data[self::FIELD_UNIQUE_ID] instanceof FHIRNamingSystemUniqueId) { $this->addUniqueId($data[self::FIELD_UNIQUE_ID]); - } elseif ($ext && is_scalar($data[self::FIELD_UNIQUE_ID])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_UNIQUE_ID])) { $this->addUniqueId(new FHIRNamingSystemUniqueId([FHIRNamingSystemUniqueId::FIELD_VALUE => $data[self::FIELD_UNIQUE_ID]] + $ext)); } else { $this->addUniqueId(new FHIRNamingSystemUniqueId($data[self::FIELD_UNIQUE_ID])); @@ -451,8 +491,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_USAGE] instanceof FHIRString) { $this->setUsage($data[self::FIELD_USAGE]); - } elseif ($ext && is_scalar($data[self::FIELD_USAGE])) { - $this->setUsage(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_USAGE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_USAGE])) { + $this->setUsage(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_USAGE]] + $ext)); + } else if (is_array($data[self::FIELD_USAGE])) { + $this->setUsage(new FHIRString(array_merge($ext, $data[self::FIELD_USAGE]))); + } } else { $this->setUsage(new FHIRString($data[self::FIELD_USAGE])); } @@ -460,6 +504,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_USE_CONTEXT])) { if (is_array($data[self::FIELD_USE_CONTEXT])) { foreach($data[self::FIELD_USE_CONTEXT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRUsageContext) { $this->addUseContext($v); } else { @@ -1252,7 +1299,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getContact())) { foreach($vs as $v) { if (null === $v) { @@ -1261,13 +1307,13 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_CONTACT, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DATE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getDescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESCRIPTION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getJurisdiction())) { foreach($vs as $v) { if (null === $v) { @@ -1289,15 +1335,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getResponsible())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RESPONSIBLE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getUniqueId())) { foreach($vs as $v) { if (null === $v) { @@ -1306,10 +1349,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_UNIQUE_ID, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getUsage())) { $v->xmlSerialize($sxe->addChild(self::FIELD_USAGE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getUseContext())) { foreach($vs as $v) { if (null === $v) { @@ -1318,6 +1361,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_USE_CONTEXT, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } @@ -1331,43 +1375,117 @@ public function jsonSerialize() $a[self::FIELD_CONTACT] = $vs; } if (null !== ($v = $this->getDate())) { - $a[self::FIELD_DATE] = $v->getValue(); - $a[self::FIELD_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_DATE] = $v; + } } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if ([] !== ($vs = $this->getJurisdiction())) { $a[self::FIELD_JURISDICTION] = $vs; } if (null !== ($v = $this->getKind())) { - $a[self::FIELD_KIND] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_KIND] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_KIND_EXT] = $enc; + } + } else { + $a[self::FIELD_KIND] = $v; + } } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if (null !== ($v = $this->getPublisher())) { - $a[self::FIELD_PUBLISHER] = $v->getValue(); - $a[self::FIELD_PUBLISHER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PUBLISHER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PUBLISHER_EXT] = $enc; + } + } else { + $a[self::FIELD_PUBLISHER] = $v; + } } if (null !== ($v = $this->getResponsible())) { - $a[self::FIELD_RESPONSIBLE] = $v->getValue(); - $a[self::FIELD_RESPONSIBLE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_RESPONSIBLE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_RESPONSIBLE_EXT] = $enc; + } + } else { + $a[self::FIELD_RESPONSIBLE] = $v; + } } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getType())) { $a[self::FIELD_TYPE] = $v; } if ([] !== ($vs = $this->getUniqueId())) { - $a[self::FIELD_UNIQUE_ID] = $vs; + $a[self::FIELD_UNIQUE_ID] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_UNIQUE_ID][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_UNIQUE_ID_EXT][] = $enc; + } else { + $a[self::FIELD_UNIQUE_ID_EXT][] = null; + } + } else { + $a[self::FIELD_UNIQUE_ID][] = $v; + } + } } if (null !== ($v = $this->getUsage())) { - $a[self::FIELD_USAGE] = $v->getValue(); - $a[self::FIELD_USAGE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_USAGE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_USAGE_EXT] = $enc; + } + } else { + $a[self::FIELD_USAGE] = $v; + } } if ([] !== ($vs = $this->getUseContext())) { $a[self::FIELD_USE_CONTEXT] = $vs; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRNutritionOrder.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRNutritionOrder.php index 3a562ce79b..cba92cc149 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRNutritionOrder.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRNutritionOrder.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -91,10 +91,6 @@ class FHIRNutritionOrder extends FHIRDomainResource implements PHPFHIRContainedT { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_NUTRITION_ORDER; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ALLERGY_INTOLERANCE = 'allergyIntolerance'; const FIELD_DATE_TIME = 'dateTime'; const FIELD_DATE_TIME_EXT = '_dateTime'; @@ -335,6 +331,9 @@ class FHIRNutritionOrder extends FHIRDomainResource implements PHPFHIRContainedT */ protected $supplement = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRNutritionOrder Constructor * @param null|array $data @@ -354,6 +353,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ALLERGY_INTOLERANCE])) { if (is_array($data[self::FIELD_ALLERGY_INTOLERANCE])) { foreach($data[self::FIELD_ALLERGY_INTOLERANCE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addAllergyIntolerance($v); } else { @@ -372,8 +374,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATE_TIME] instanceof FHIRDateTime) { $this->setDateTime($data[self::FIELD_DATE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_DATE_TIME])) { - $this->setDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATE_TIME])) { + $this->setDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_DATE_TIME])) { + $this->setDateTime(new FHIRDateTime(array_merge($ext, $data[self::FIELD_DATE_TIME]))); + } } else { $this->setDateTime(new FHIRDateTime($data[self::FIELD_DATE_TIME])); } @@ -395,6 +401,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_EXCLUDE_FOOD_MODIFIER])) { if (is_array($data[self::FIELD_EXCLUDE_FOOD_MODIFIER])) { foreach($data[self::FIELD_EXCLUDE_FOOD_MODIFIER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addExcludeFoodModifier($v); } else { @@ -410,6 +419,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_FOOD_PREFERENCE_MODIFIER])) { if (is_array($data[self::FIELD_FOOD_PREFERENCE_MODIFIER])) { foreach($data[self::FIELD_FOOD_PREFERENCE_MODIFIER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addFoodPreferenceModifier($v); } else { @@ -428,17 +440,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -450,17 +469,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_INSTANTIATES])) { foreach($data[self::FIELD_INSTANTIATES] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRUri) { $this->addInstantiates($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addInstantiates(new FHIRUri([FHIRUri::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addInstantiates(new FHIRUri([FHIRUri::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addInstantiates(new FHIRUri(array_merge($v, $ext[$i]))); + } } else { $this->addInstantiates(new FHIRUri($v)); } } } elseif ($data[self::FIELD_INSTANTIATES] instanceof FHIRUri) { $this->addInstantiates($data[self::FIELD_INSTANTIATES]); - } elseif ($ext && is_scalar($data[self::FIELD_INSTANTIATES])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_INSTANTIATES])) { $this->addInstantiates(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_INSTANTIATES]] + $ext)); } else { $this->addInstantiates(new FHIRUri($data[self::FIELD_INSTANTIATES])); @@ -472,17 +498,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_INSTANTIATES_CANONICAL])) { foreach($data[self::FIELD_INSTANTIATES_CANONICAL] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCanonical) { $this->addInstantiatesCanonical($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addInstantiatesCanonical(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addInstantiatesCanonical(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addInstantiatesCanonical(new FHIRCanonical(array_merge($v, $ext[$i]))); + } } else { $this->addInstantiatesCanonical(new FHIRCanonical($v)); } } } elseif ($data[self::FIELD_INSTANTIATES_CANONICAL] instanceof FHIRCanonical) { $this->addInstantiatesCanonical($data[self::FIELD_INSTANTIATES_CANONICAL]); - } elseif ($ext && is_scalar($data[self::FIELD_INSTANTIATES_CANONICAL])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_INSTANTIATES_CANONICAL])) { $this->addInstantiatesCanonical(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $data[self::FIELD_INSTANTIATES_CANONICAL]] + $ext)); } else { $this->addInstantiatesCanonical(new FHIRCanonical($data[self::FIELD_INSTANTIATES_CANONICAL])); @@ -494,17 +527,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_INSTANTIATES_URI])) { foreach($data[self::FIELD_INSTANTIATES_URI] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRUri) { $this->addInstantiatesUri($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addInstantiatesUri(new FHIRUri([FHIRUri::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addInstantiatesUri(new FHIRUri([FHIRUri::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addInstantiatesUri(new FHIRUri(array_merge($v, $ext[$i]))); + } } else { $this->addInstantiatesUri(new FHIRUri($v)); } } } elseif ($data[self::FIELD_INSTANTIATES_URI] instanceof FHIRUri) { $this->addInstantiatesUri($data[self::FIELD_INSTANTIATES_URI]); - } elseif ($ext && is_scalar($data[self::FIELD_INSTANTIATES_URI])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_INSTANTIATES_URI])) { $this->addInstantiatesUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_INSTANTIATES_URI]] + $ext)); } else { $this->addInstantiatesUri(new FHIRUri($data[self::FIELD_INSTANTIATES_URI])); @@ -516,8 +556,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_INTENT] instanceof FHIRRequestIntent) { $this->setIntent($data[self::FIELD_INTENT]); - } elseif ($ext && is_scalar($data[self::FIELD_INTENT])) { - $this->setIntent(new FHIRRequestIntent([FHIRRequestIntent::FIELD_VALUE => $data[self::FIELD_INTENT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_INTENT])) { + $this->setIntent(new FHIRRequestIntent([FHIRRequestIntent::FIELD_VALUE => $data[self::FIELD_INTENT]] + $ext)); + } else if (is_array($data[self::FIELD_INTENT])) { + $this->setIntent(new FHIRRequestIntent(array_merge($ext, $data[self::FIELD_INTENT]))); + } } else { $this->setIntent(new FHIRRequestIntent($data[self::FIELD_INTENT])); } @@ -525,6 +569,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_NOTE])) { if (is_array($data[self::FIELD_NOTE])) { foreach($data[self::FIELD_NOTE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRAnnotation) { $this->addNote($v); } else { @@ -564,8 +611,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRRequestStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRRequestStatus([FHIRRequestStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRRequestStatus([FHIRRequestStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRRequestStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRRequestStatus($data[self::FIELD_STATUS])); } @@ -573,6 +624,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SUPPLEMENT])) { if (is_array($data[self::FIELD_SUPPLEMENT])) { foreach($data[self::FIELD_SUPPLEMENT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRNutritionOrderSupplement) { $this->addSupplement($v); } else { @@ -1629,7 +1683,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getAllergyIntolerance())) { foreach($vs as $v) { if (null === $v) { @@ -1638,18 +1691,16 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_ALLERGY_INTOLERANCE, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getDateTime())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DATE_TIME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getEncounter())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ENCOUNTER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getEnteralFormula())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ENTERAL_FORMULA, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getExcludeFoodModifier())) { foreach($vs as $v) { if (null === $v) { @@ -1676,6 +1727,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } } + if ([] !== ($vs = $this->getInstantiates())) { foreach($vs as $v) { if (null === $v) { @@ -1684,6 +1736,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_INSTANTIATES, null, $v->_getFHIRXMLNamespace())); } } + if ([] !== ($vs = $this->getInstantiatesCanonical())) { foreach($vs as $v) { if (null === $v) { @@ -1692,6 +1745,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_INSTANTIATES_CANONICAL, null, $v->_getFHIRXMLNamespace())); } } + if ([] !== ($vs = $this->getInstantiatesUri())) { foreach($vs as $v) { if (null === $v) { @@ -1704,7 +1758,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getIntent())) { $v->xmlSerialize($sxe->addChild(self::FIELD_INTENT, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getNote())) { foreach($vs as $v) { if (null === $v) { @@ -1717,19 +1770,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getOralDiet())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ORAL_DIET, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOrderer())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ORDERER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPatient())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATIENT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getSupplement())) { foreach($vs as $v) { if (null === $v) { @@ -1738,6 +1787,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_SUPPLEMENT, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } @@ -1751,8 +1801,15 @@ public function jsonSerialize() $a[self::FIELD_ALLERGY_INTOLERANCE] = $vs; } if (null !== ($v = $this->getDateTime())) { - $a[self::FIELD_DATE_TIME] = $v->getValue(); - $a[self::FIELD_DATE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_DATE_TIME] = $v; + } } if (null !== ($v = $this->getEncounter())) { $a[self::FIELD_ENCOUNTER] = $v; @@ -1767,7 +1824,23 @@ public function jsonSerialize() $a[self::FIELD_FOOD_PREFERENCE_MODIFIER] = $vs; } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if ([] !== ($vs = $this->getInstantiates())) { $a[self::FIELD_INSTANTIATES] = []; @@ -1775,8 +1848,17 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_INSTANTIATES][] = $v->getValue(); - $a[self::FIELD_INSTANTIATES_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_INSTANTIATES][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_INSTANTIATES_EXT][] = $enc; + } else { + $a[self::FIELD_INSTANTIATES_EXT][] = null; + } + } else { + $a[self::FIELD_INSTANTIATES][] = $v; + } } } if ([] !== ($vs = $this->getInstantiatesCanonical())) { @@ -1785,8 +1867,17 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_INSTANTIATES_CANONICAL][] = $v->getValue(); - $a[self::FIELD_INSTANTIATES_CANONICAL_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_INSTANTIATES_CANONICAL][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_INSTANTIATES_CANONICAL_EXT][] = $enc; + } else { + $a[self::FIELD_INSTANTIATES_CANONICAL_EXT][] = null; + } + } else { + $a[self::FIELD_INSTANTIATES_CANONICAL][] = $v; + } } } if ([] !== ($vs = $this->getInstantiatesUri())) { @@ -1795,12 +1886,29 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_INSTANTIATES_URI][] = $v->getValue(); - $a[self::FIELD_INSTANTIATES_URI_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_INSTANTIATES_URI][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_INSTANTIATES_URI_EXT][] = $enc; + } else { + $a[self::FIELD_INSTANTIATES_URI_EXT][] = null; + } + } else { + $a[self::FIELD_INSTANTIATES_URI][] = $v; + } } } if (null !== ($v = $this->getIntent())) { - $a[self::FIELD_INTENT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_INTENT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_INTENT_EXT] = $enc; + } + } else { + $a[self::FIELD_INTENT] = $v; + } } if ([] !== ($vs = $this->getNote())) { $a[self::FIELD_NOTE] = $vs; @@ -1815,7 +1923,15 @@ public function jsonSerialize() $a[self::FIELD_PATIENT] = $v; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if ([] !== ($vs = $this->getSupplement())) { $a[self::FIELD_SUPPLEMENT] = $vs; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRObservation.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRObservation.php index f333ea7781..8c55854caf 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRObservation.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRObservation.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -98,10 +98,6 @@ class FHIRObservation extends FHIRDomainResource implements PHPFHIRContainedType { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_OBSERVATION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_BASED_ON = 'basedOn'; const FIELD_BODY_SITE = 'bodySite'; const FIELD_CATEGORY = 'category'; @@ -643,6 +639,9 @@ class FHIRObservation extends FHIRDomainResource implements PHPFHIRContainedType */ protected $valueTime = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRObservation Constructor * @param null|array $data @@ -662,6 +661,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_BASED_ON])) { if (is_array($data[self::FIELD_BASED_ON])) { foreach($data[self::FIELD_BASED_ON] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addBasedOn($v); } else { @@ -684,6 +686,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CATEGORY])) { if (is_array($data[self::FIELD_CATEGORY])) { foreach($data[self::FIELD_CATEGORY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addCategory($v); } else { @@ -706,6 +711,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_COMPONENT])) { if (is_array($data[self::FIELD_COMPONENT])) { foreach($data[self::FIELD_COMPONENT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRObservationComponent) { $this->addComponent($v); } else { @@ -728,6 +736,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_DERIVED_FROM])) { if (is_array($data[self::FIELD_DERIVED_FROM])) { foreach($data[self::FIELD_DERIVED_FROM] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addDerivedFrom($v); } else { @@ -753,8 +764,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EFFECTIVE_DATE_TIME] instanceof FHIRDateTime) { $this->setEffectiveDateTime($data[self::FIELD_EFFECTIVE_DATE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_EFFECTIVE_DATE_TIME])) { - $this->setEffectiveDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_EFFECTIVE_DATE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EFFECTIVE_DATE_TIME])) { + $this->setEffectiveDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_EFFECTIVE_DATE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_EFFECTIVE_DATE_TIME])) { + $this->setEffectiveDateTime(new FHIRDateTime(array_merge($ext, $data[self::FIELD_EFFECTIVE_DATE_TIME]))); + } } else { $this->setEffectiveDateTime(new FHIRDateTime($data[self::FIELD_EFFECTIVE_DATE_TIME])); } @@ -765,8 +780,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EFFECTIVE_INSTANT] instanceof FHIRInstant) { $this->setEffectiveInstant($data[self::FIELD_EFFECTIVE_INSTANT]); - } elseif ($ext && is_scalar($data[self::FIELD_EFFECTIVE_INSTANT])) { - $this->setEffectiveInstant(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_EFFECTIVE_INSTANT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EFFECTIVE_INSTANT])) { + $this->setEffectiveInstant(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_EFFECTIVE_INSTANT]] + $ext)); + } else if (is_array($data[self::FIELD_EFFECTIVE_INSTANT])) { + $this->setEffectiveInstant(new FHIRInstant(array_merge($ext, $data[self::FIELD_EFFECTIVE_INSTANT]))); + } } else { $this->setEffectiveInstant(new FHIRInstant($data[self::FIELD_EFFECTIVE_INSTANT])); } @@ -795,6 +814,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_FOCUS])) { if (is_array($data[self::FIELD_FOCUS])) { foreach($data[self::FIELD_FOCUS] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addFocus($v); } else { @@ -810,6 +832,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_HAS_MEMBER])) { if (is_array($data[self::FIELD_HAS_MEMBER])) { foreach($data[self::FIELD_HAS_MEMBER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addHasMember($v); } else { @@ -828,17 +853,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -847,6 +879,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_INTERPRETATION])) { if (is_array($data[self::FIELD_INTERPRETATION])) { foreach($data[self::FIELD_INTERPRETATION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addInterpretation($v); } else { @@ -865,8 +900,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ISSUED] instanceof FHIRInstant) { $this->setIssued($data[self::FIELD_ISSUED]); - } elseif ($ext && is_scalar($data[self::FIELD_ISSUED])) { - $this->setIssued(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_ISSUED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ISSUED])) { + $this->setIssued(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_ISSUED]] + $ext)); + } else if (is_array($data[self::FIELD_ISSUED])) { + $this->setIssued(new FHIRInstant(array_merge($ext, $data[self::FIELD_ISSUED]))); + } } else { $this->setIssued(new FHIRInstant($data[self::FIELD_ISSUED])); } @@ -881,6 +920,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_NOTE])) { if (is_array($data[self::FIELD_NOTE])) { foreach($data[self::FIELD_NOTE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRAnnotation) { $this->addNote($v); } else { @@ -896,6 +938,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PART_OF])) { if (is_array($data[self::FIELD_PART_OF])) { foreach($data[self::FIELD_PART_OF] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addPartOf($v); } else { @@ -911,6 +956,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PERFORMER])) { if (is_array($data[self::FIELD_PERFORMER])) { foreach($data[self::FIELD_PERFORMER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addPerformer($v); } else { @@ -926,6 +974,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REFERENCE_RANGE])) { if (is_array($data[self::FIELD_REFERENCE_RANGE])) { foreach($data[self::FIELD_REFERENCE_RANGE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRObservationReferenceRange) { $this->addReferenceRange($v); } else { @@ -951,8 +1002,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRObservationStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRObservationStatus([FHIRObservationStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRObservationStatus([FHIRObservationStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRObservationStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRObservationStatus($data[self::FIELD_STATUS])); } @@ -970,8 +1025,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_BOOLEAN] instanceof FHIRBoolean) { $this->setValueBoolean($data[self::FIELD_VALUE_BOOLEAN]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_BOOLEAN])) { - $this->setValueBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_VALUE_BOOLEAN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_BOOLEAN])) { + $this->setValueBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_VALUE_BOOLEAN]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_BOOLEAN])) { + $this->setValueBoolean(new FHIRBoolean(array_merge($ext, $data[self::FIELD_VALUE_BOOLEAN]))); + } } else { $this->setValueBoolean(new FHIRBoolean($data[self::FIELD_VALUE_BOOLEAN])); } @@ -989,8 +1048,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_DATE_TIME] instanceof FHIRDateTime) { $this->setValueDateTime($data[self::FIELD_VALUE_DATE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_DATE_TIME])) { - $this->setValueDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_VALUE_DATE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_DATE_TIME])) { + $this->setValueDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_VALUE_DATE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_DATE_TIME])) { + $this->setValueDateTime(new FHIRDateTime(array_merge($ext, $data[self::FIELD_VALUE_DATE_TIME]))); + } } else { $this->setValueDateTime(new FHIRDateTime($data[self::FIELD_VALUE_DATE_TIME])); } @@ -1001,8 +1064,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_INTEGER] instanceof FHIRInteger) { $this->setValueInteger($data[self::FIELD_VALUE_INTEGER]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_INTEGER])) { - $this->setValueInteger(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_VALUE_INTEGER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_INTEGER])) { + $this->setValueInteger(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_VALUE_INTEGER]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_INTEGER])) { + $this->setValueInteger(new FHIRInteger(array_merge($ext, $data[self::FIELD_VALUE_INTEGER]))); + } } else { $this->setValueInteger(new FHIRInteger($data[self::FIELD_VALUE_INTEGER])); } @@ -1020,8 +1087,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_QUANTITY] instanceof FHIRQuantity) { $this->setValueQuantity($data[self::FIELD_VALUE_QUANTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_QUANTITY])) { - $this->setValueQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_VALUE_QUANTITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_QUANTITY])) { + $this->setValueQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_VALUE_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_QUANTITY])) { + $this->setValueQuantity(new FHIRQuantity(array_merge($ext, $data[self::FIELD_VALUE_QUANTITY]))); + } } else { $this->setValueQuantity(new FHIRQuantity($data[self::FIELD_VALUE_QUANTITY])); } @@ -1053,8 +1124,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_STRING] instanceof FHIRString) { $this->setValueString($data[self::FIELD_VALUE_STRING]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_STRING])) { - $this->setValueString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VALUE_STRING]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_STRING])) { + $this->setValueString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VALUE_STRING]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_STRING])) { + $this->setValueString(new FHIRString(array_merge($ext, $data[self::FIELD_VALUE_STRING]))); + } } else { $this->setValueString(new FHIRString($data[self::FIELD_VALUE_STRING])); } @@ -1065,8 +1140,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_TIME] instanceof FHIRTime) { $this->setValueTime($data[self::FIELD_VALUE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_TIME])) { - $this->setValueTime(new FHIRTime([FHIRTime::FIELD_VALUE => $data[self::FIELD_VALUE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_TIME])) { + $this->setValueTime(new FHIRTime([FHIRTime::FIELD_VALUE => $data[self::FIELD_VALUE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_TIME])) { + $this->setValueTime(new FHIRTime(array_merge($ext, $data[self::FIELD_VALUE_TIME]))); + } } else { $this->setValueTime(new FHIRTime($data[self::FIELD_VALUE_TIME])); } @@ -3019,7 +3098,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getBasedOn())) { foreach($vs as $v) { if (null === $v) { @@ -3032,7 +3110,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getBodySite())) { $v->xmlSerialize($sxe->addChild(self::FIELD_BODY_SITE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getCategory())) { foreach($vs as $v) { if (null === $v) { @@ -3045,7 +3122,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getComponent())) { foreach($vs as $v) { if (null === $v) { @@ -3058,7 +3134,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDataAbsentReason())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DATA_ABSENT_REASON, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getDerivedFrom())) { foreach($vs as $v) { if (null === $v) { @@ -3077,19 +3152,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getEffectiveInstant())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EFFECTIVE_INSTANT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getEffectivePeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EFFECTIVE_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getEffectiveTiming())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EFFECTIVE_TIMING, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getEncounter())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ENCOUNTER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getFocus())) { foreach($vs as $v) { if (null === $v) { @@ -3125,14 +3196,13 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_INTERPRETATION, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getIssued())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ISSUED, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getMethod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_METHOD, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getNote())) { foreach($vs as $v) { if (null === $v) { @@ -3172,18 +3242,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getSpecimen())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SPECIMEN, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSubject())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBJECT, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getValueBoolean())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_BOOLEAN, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } @@ -3193,23 +3260,18 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getValueInteger())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_INTEGER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValuePeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_QUANTITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueRange())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_RANGE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueRatio())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_RATIO, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueSampledData())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_SAMPLED_DATA, null, $v->_getFHIRXMLNamespace())); } @@ -3253,12 +3315,26 @@ public function jsonSerialize() $a[self::FIELD_DEVICE] = $v; } if (null !== ($v = $this->getEffectiveDateTime())) { - $a[self::FIELD_EFFECTIVE_DATE_TIME] = $v->getValue(); - $a[self::FIELD_EFFECTIVE_DATE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EFFECTIVE_DATE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EFFECTIVE_DATE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_EFFECTIVE_DATE_TIME] = $v; + } } if (null !== ($v = $this->getEffectiveInstant())) { - $a[self::FIELD_EFFECTIVE_INSTANT] = $v->getValue(); - $a[self::FIELD_EFFECTIVE_INSTANT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EFFECTIVE_INSTANT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EFFECTIVE_INSTANT_EXT] = $enc; + } + } else { + $a[self::FIELD_EFFECTIVE_INSTANT] = $v; + } } if (null !== ($v = $this->getEffectivePeriod())) { $a[self::FIELD_EFFECTIVE_PERIOD] = $v; @@ -3276,14 +3352,37 @@ public function jsonSerialize() $a[self::FIELD_HAS_MEMBER] = $vs; } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if ([] !== ($vs = $this->getInterpretation())) { $a[self::FIELD_INTERPRETATION] = $vs; } if (null !== ($v = $this->getIssued())) { - $a[self::FIELD_ISSUED] = $v->getValue(); - $a[self::FIELD_ISSUED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ISSUED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ISSUED_EXT] = $enc; + } + } else { + $a[self::FIELD_ISSUED] = $v; + } } if (null !== ($v = $this->getMethod())) { $a[self::FIELD_METHOD] = $v; @@ -3304,31 +3403,68 @@ public function jsonSerialize() $a[self::FIELD_SPECIMEN] = $v; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getSubject())) { $a[self::FIELD_SUBJECT] = $v; } if (null !== ($v = $this->getValueBoolean())) { - $a[self::FIELD_VALUE_BOOLEAN] = $v->getValue(); - $a[self::FIELD_VALUE_BOOLEAN_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_BOOLEAN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_BOOLEAN_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_BOOLEAN] = $v; + } } if (null !== ($v = $this->getValueCodeableConcept())) { $a[self::FIELD_VALUE_CODEABLE_CONCEPT] = $v; } if (null !== ($v = $this->getValueDateTime())) { - $a[self::FIELD_VALUE_DATE_TIME] = $v->getValue(); - $a[self::FIELD_VALUE_DATE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_DATE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_DATE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_DATE_TIME] = $v; + } } if (null !== ($v = $this->getValueInteger())) { - $a[self::FIELD_VALUE_INTEGER] = $v->getValue(); - $a[self::FIELD_VALUE_INTEGER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_INTEGER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_INTEGER_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_INTEGER] = $v; + } } if (null !== ($v = $this->getValuePeriod())) { $a[self::FIELD_VALUE_PERIOD] = $v; } if (null !== ($v = $this->getValueQuantity())) { - $a[self::FIELD_VALUE_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_QUANTITY] = $v; + } } if (null !== ($v = $this->getValueRange())) { $a[self::FIELD_VALUE_RANGE] = $v; @@ -3340,12 +3476,26 @@ public function jsonSerialize() $a[self::FIELD_VALUE_SAMPLED_DATA] = $v; } if (null !== ($v = $this->getValueString())) { - $a[self::FIELD_VALUE_STRING] = $v->getValue(); - $a[self::FIELD_VALUE_STRING_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_STRING] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_STRING_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_STRING] = $v; + } } if (null !== ($v = $this->getValueTime())) { - $a[self::FIELD_VALUE_TIME] = $v->getValue(); - $a[self::FIELD_VALUE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_TIME] = $v; + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRObservationDefinition.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRObservationDefinition.php index e7e1a267a9..47efdbae1f 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRObservationDefinition.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRObservationDefinition.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -87,10 +87,6 @@ class FHIRObservationDefinition extends FHIRDomainResource implements PHPFHIRCon { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_OBSERVATION_DEFINITION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ABNORMAL_CODED_VALUE_SET = 'abnormalCodedValueSet'; const FIELD_CATEGORY = 'category'; const FIELD_CODE = 'code'; @@ -261,6 +257,9 @@ class FHIRObservationDefinition extends FHIRDomainResource implements PHPFHIRCon */ protected $validCodedValueSet = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRObservationDefinition Constructor * @param null|array $data @@ -287,6 +286,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CATEGORY])) { if (is_array($data[self::FIELD_CATEGORY])) { foreach($data[self::FIELD_CATEGORY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addCategory($v); } else { @@ -319,17 +321,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -348,8 +357,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MULTIPLE_RESULTS_ALLOWED] instanceof FHIRBoolean) { $this->setMultipleResultsAllowed($data[self::FIELD_MULTIPLE_RESULTS_ALLOWED]); - } elseif ($ext && is_scalar($data[self::FIELD_MULTIPLE_RESULTS_ALLOWED])) { - $this->setMultipleResultsAllowed(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_MULTIPLE_RESULTS_ALLOWED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MULTIPLE_RESULTS_ALLOWED])) { + $this->setMultipleResultsAllowed(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_MULTIPLE_RESULTS_ALLOWED]] + $ext)); + } else if (is_array($data[self::FIELD_MULTIPLE_RESULTS_ALLOWED])) { + $this->setMultipleResultsAllowed(new FHIRBoolean(array_merge($ext, $data[self::FIELD_MULTIPLE_RESULTS_ALLOWED]))); + } } else { $this->setMultipleResultsAllowed(new FHIRBoolean($data[self::FIELD_MULTIPLE_RESULTS_ALLOWED])); } @@ -367,17 +380,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_PERMITTED_DATA_TYPE])) { foreach($data[self::FIELD_PERMITTED_DATA_TYPE] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRObservationDataType) { $this->addPermittedDataType($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addPermittedDataType(new FHIRObservationDataType([FHIRObservationDataType::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addPermittedDataType(new FHIRObservationDataType([FHIRObservationDataType::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addPermittedDataType(new FHIRObservationDataType(array_merge($v, $ext[$i]))); + } } else { $this->addPermittedDataType(new FHIRObservationDataType($v)); } } } elseif ($data[self::FIELD_PERMITTED_DATA_TYPE] instanceof FHIRObservationDataType) { $this->addPermittedDataType($data[self::FIELD_PERMITTED_DATA_TYPE]); - } elseif ($ext && is_scalar($data[self::FIELD_PERMITTED_DATA_TYPE])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_PERMITTED_DATA_TYPE])) { $this->addPermittedDataType(new FHIRObservationDataType([FHIRObservationDataType::FIELD_VALUE => $data[self::FIELD_PERMITTED_DATA_TYPE]] + $ext)); } else { $this->addPermittedDataType(new FHIRObservationDataType($data[self::FIELD_PERMITTED_DATA_TYPE])); @@ -389,8 +409,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PREFERRED_REPORT_NAME] instanceof FHIRString) { $this->setPreferredReportName($data[self::FIELD_PREFERRED_REPORT_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_PREFERRED_REPORT_NAME])) { - $this->setPreferredReportName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PREFERRED_REPORT_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PREFERRED_REPORT_NAME])) { + $this->setPreferredReportName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PREFERRED_REPORT_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_PREFERRED_REPORT_NAME])) { + $this->setPreferredReportName(new FHIRString(array_merge($ext, $data[self::FIELD_PREFERRED_REPORT_NAME]))); + } } else { $this->setPreferredReportName(new FHIRString($data[self::FIELD_PREFERRED_REPORT_NAME])); } @@ -398,6 +422,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_QUALIFIED_INTERVAL])) { if (is_array($data[self::FIELD_QUALIFIED_INTERVAL])) { foreach($data[self::FIELD_QUALIFIED_INTERVAL] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRObservationDefinitionQualifiedInterval) { $this->addQualifiedInterval($v); } else { @@ -1116,11 +1143,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getAbnormalCodedValueSet())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ABNORMAL_CODED_VALUE_SET, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getCategory())) { foreach($vs as $v) { if (null === $v) { @@ -1133,11 +1158,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getCriticalCodedValueSet())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CRITICAL_CODED_VALUE_SET, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -1153,11 +1176,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getMultipleResultsAllowed())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MULTIPLE_RESULTS_ALLOWED, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getNormalCodedValueSet())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NORMAL_CODED_VALUE_SET, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getPermittedDataType())) { foreach($vs as $v) { if (null === $v) { @@ -1166,10 +1187,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_PERMITTED_DATA_TYPE, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getPreferredReportName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PREFERRED_REPORT_NAME, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getQualifiedInterval())) { foreach($vs as $v) { if (null === $v) { @@ -1182,7 +1203,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getQuantitativeDetails())) { $v->xmlSerialize($sxe->addChild(self::FIELD_QUANTITATIVE_DETAILS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValidCodedValueSet())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALID_CODED_VALUE_SET, null, $v->_getFHIRXMLNamespace())); } @@ -1208,24 +1228,70 @@ public function jsonSerialize() $a[self::FIELD_CRITICAL_CODED_VALUE_SET] = $v; } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if (null !== ($v = $this->getMethod())) { $a[self::FIELD_METHOD] = $v; } if (null !== ($v = $this->getMultipleResultsAllowed())) { - $a[self::FIELD_MULTIPLE_RESULTS_ALLOWED] = $v->getValue(); - $a[self::FIELD_MULTIPLE_RESULTS_ALLOWED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MULTIPLE_RESULTS_ALLOWED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MULTIPLE_RESULTS_ALLOWED_EXT] = $enc; + } + } else { + $a[self::FIELD_MULTIPLE_RESULTS_ALLOWED] = $v; + } } if (null !== ($v = $this->getNormalCodedValueSet())) { $a[self::FIELD_NORMAL_CODED_VALUE_SET] = $v; } if ([] !== ($vs = $this->getPermittedDataType())) { - $a[self::FIELD_PERMITTED_DATA_TYPE] = $vs; + $a[self::FIELD_PERMITTED_DATA_TYPE] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PERMITTED_DATA_TYPE][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PERMITTED_DATA_TYPE_EXT][] = $enc; + } else { + $a[self::FIELD_PERMITTED_DATA_TYPE_EXT][] = null; + } + } else { + $a[self::FIELD_PERMITTED_DATA_TYPE][] = $v; + } + } } if (null !== ($v = $this->getPreferredReportName())) { - $a[self::FIELD_PREFERRED_REPORT_NAME] = $v->getValue(); - $a[self::FIELD_PREFERRED_REPORT_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PREFERRED_REPORT_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PREFERRED_REPORT_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_PREFERRED_REPORT_NAME] = $v; + } } if ([] !== ($vs = $this->getQualifiedInterval())) { $a[self::FIELD_QUALIFIED_INTERVAL] = $vs; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIROperationDefinition.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIROperationDefinition.php index b94fcf13eb..58c406b850 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIROperationDefinition.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIROperationDefinition.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -93,10 +93,6 @@ class FHIROperationDefinition extends FHIRDomainResource implements PHPFHIRConta { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_OPERATION_DEFINITION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_AFFECTS_STATE = 'affectsState'; const FIELD_AFFECTS_STATE_EXT = '_affectsState'; const FIELD_BASE = 'base'; @@ -484,6 +480,9 @@ class FHIROperationDefinition extends FHIRDomainResource implements PHPFHIRConta */ protected $version = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIROperationDefinition Constructor * @param null|array $data @@ -506,8 +505,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_AFFECTS_STATE] instanceof FHIRBoolean) { $this->setAffectsState($data[self::FIELD_AFFECTS_STATE]); - } elseif ($ext && is_scalar($data[self::FIELD_AFFECTS_STATE])) { - $this->setAffectsState(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_AFFECTS_STATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_AFFECTS_STATE])) { + $this->setAffectsState(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_AFFECTS_STATE]] + $ext)); + } else if (is_array($data[self::FIELD_AFFECTS_STATE])) { + $this->setAffectsState(new FHIRBoolean(array_merge($ext, $data[self::FIELD_AFFECTS_STATE]))); + } } else { $this->setAffectsState(new FHIRBoolean($data[self::FIELD_AFFECTS_STATE])); } @@ -518,8 +521,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_BASE] instanceof FHIRCanonical) { $this->setBase($data[self::FIELD_BASE]); - } elseif ($ext && is_scalar($data[self::FIELD_BASE])) { - $this->setBase(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $data[self::FIELD_BASE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_BASE])) { + $this->setBase(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $data[self::FIELD_BASE]] + $ext)); + } else if (is_array($data[self::FIELD_BASE])) { + $this->setBase(new FHIRCanonical(array_merge($ext, $data[self::FIELD_BASE]))); + } } else { $this->setBase(new FHIRCanonical($data[self::FIELD_BASE])); } @@ -530,8 +537,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CODE] instanceof FHIRCode) { $this->setCode($data[self::FIELD_CODE]); - } elseif ($ext && is_scalar($data[self::FIELD_CODE])) { - $this->setCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_CODE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CODE])) { + $this->setCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_CODE]] + $ext)); + } else if (is_array($data[self::FIELD_CODE])) { + $this->setCode(new FHIRCode(array_merge($ext, $data[self::FIELD_CODE]))); + } } else { $this->setCode(new FHIRCode($data[self::FIELD_CODE])); } @@ -542,8 +553,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_COMMENT] instanceof FHIRMarkdown) { $this->setComment($data[self::FIELD_COMMENT]); - } elseif ($ext && is_scalar($data[self::FIELD_COMMENT])) { - $this->setComment(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_COMMENT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_COMMENT])) { + $this->setComment(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_COMMENT]] + $ext)); + } else if (is_array($data[self::FIELD_COMMENT])) { + $this->setComment(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_COMMENT]))); + } } else { $this->setComment(new FHIRMarkdown($data[self::FIELD_COMMENT])); } @@ -551,6 +566,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CONTACT])) { if (is_array($data[self::FIELD_CONTACT])) { foreach($data[self::FIELD_CONTACT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContactDetail) { $this->addContact($v); } else { @@ -569,8 +587,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATE] instanceof FHIRDateTime) { $this->setDate($data[self::FIELD_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_DATE])) { - $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime(array_merge($ext, $data[self::FIELD_DATE]))); + } } else { $this->setDate(new FHIRDateTime($data[self::FIELD_DATE])); } @@ -581,8 +603,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRMarkdown) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRMarkdown($data[self::FIELD_DESCRIPTION])); } @@ -593,8 +619,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EXPERIMENTAL] instanceof FHIRBoolean) { $this->setExperimental($data[self::FIELD_EXPERIMENTAL]); - } elseif ($ext && is_scalar($data[self::FIELD_EXPERIMENTAL])) { - $this->setExperimental(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_EXPERIMENTAL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EXPERIMENTAL])) { + $this->setExperimental(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_EXPERIMENTAL]] + $ext)); + } else if (is_array($data[self::FIELD_EXPERIMENTAL])) { + $this->setExperimental(new FHIRBoolean(array_merge($ext, $data[self::FIELD_EXPERIMENTAL]))); + } } else { $this->setExperimental(new FHIRBoolean($data[self::FIELD_EXPERIMENTAL])); } @@ -605,8 +635,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_INPUT_PROFILE] instanceof FHIRCanonical) { $this->setInputProfile($data[self::FIELD_INPUT_PROFILE]); - } elseif ($ext && is_scalar($data[self::FIELD_INPUT_PROFILE])) { - $this->setInputProfile(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $data[self::FIELD_INPUT_PROFILE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_INPUT_PROFILE])) { + $this->setInputProfile(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $data[self::FIELD_INPUT_PROFILE]] + $ext)); + } else if (is_array($data[self::FIELD_INPUT_PROFILE])) { + $this->setInputProfile(new FHIRCanonical(array_merge($ext, $data[self::FIELD_INPUT_PROFILE]))); + } } else { $this->setInputProfile(new FHIRCanonical($data[self::FIELD_INPUT_PROFILE])); } @@ -617,8 +651,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_INSTANCE] instanceof FHIRBoolean) { $this->setInstance($data[self::FIELD_INSTANCE]); - } elseif ($ext && is_scalar($data[self::FIELD_INSTANCE])) { - $this->setInstance(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_INSTANCE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_INSTANCE])) { + $this->setInstance(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_INSTANCE]] + $ext)); + } else if (is_array($data[self::FIELD_INSTANCE])) { + $this->setInstance(new FHIRBoolean(array_merge($ext, $data[self::FIELD_INSTANCE]))); + } } else { $this->setInstance(new FHIRBoolean($data[self::FIELD_INSTANCE])); } @@ -626,6 +664,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_JURISDICTION])) { if (is_array($data[self::FIELD_JURISDICTION])) { foreach($data[self::FIELD_JURISDICTION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addJurisdiction($v); } else { @@ -644,8 +685,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_KIND] instanceof FHIROperationKind) { $this->setKind($data[self::FIELD_KIND]); - } elseif ($ext && is_scalar($data[self::FIELD_KIND])) { - $this->setKind(new FHIROperationKind([FHIROperationKind::FIELD_VALUE => $data[self::FIELD_KIND]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_KIND])) { + $this->setKind(new FHIROperationKind([FHIROperationKind::FIELD_VALUE => $data[self::FIELD_KIND]] + $ext)); + } else if (is_array($data[self::FIELD_KIND])) { + $this->setKind(new FHIROperationKind(array_merge($ext, $data[self::FIELD_KIND]))); + } } else { $this->setKind(new FHIROperationKind($data[self::FIELD_KIND])); } @@ -656,8 +701,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -668,8 +717,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_OUTPUT_PROFILE] instanceof FHIRCanonical) { $this->setOutputProfile($data[self::FIELD_OUTPUT_PROFILE]); - } elseif ($ext && is_scalar($data[self::FIELD_OUTPUT_PROFILE])) { - $this->setOutputProfile(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $data[self::FIELD_OUTPUT_PROFILE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_OUTPUT_PROFILE])) { + $this->setOutputProfile(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $data[self::FIELD_OUTPUT_PROFILE]] + $ext)); + } else if (is_array($data[self::FIELD_OUTPUT_PROFILE])) { + $this->setOutputProfile(new FHIRCanonical(array_merge($ext, $data[self::FIELD_OUTPUT_PROFILE]))); + } } else { $this->setOutputProfile(new FHIRCanonical($data[self::FIELD_OUTPUT_PROFILE])); } @@ -677,6 +730,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_OVERLOAD])) { if (is_array($data[self::FIELD_OVERLOAD])) { foreach($data[self::FIELD_OVERLOAD] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIROperationDefinitionOverload) { $this->addOverload($v); } else { @@ -692,6 +748,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PARAMETER])) { if (is_array($data[self::FIELD_PARAMETER])) { foreach($data[self::FIELD_PARAMETER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIROperationDefinitionParameter) { $this->addParameter($v); } else { @@ -710,8 +769,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PUBLISHER] instanceof FHIRString) { $this->setPublisher($data[self::FIELD_PUBLISHER]); - } elseif ($ext && is_scalar($data[self::FIELD_PUBLISHER])) { - $this->setPublisher(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PUBLISHER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PUBLISHER])) { + $this->setPublisher(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PUBLISHER]] + $ext)); + } else if (is_array($data[self::FIELD_PUBLISHER])) { + $this->setPublisher(new FHIRString(array_merge($ext, $data[self::FIELD_PUBLISHER]))); + } } else { $this->setPublisher(new FHIRString($data[self::FIELD_PUBLISHER])); } @@ -722,8 +785,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PURPOSE] instanceof FHIRMarkdown) { $this->setPurpose($data[self::FIELD_PURPOSE]); - } elseif ($ext && is_scalar($data[self::FIELD_PURPOSE])) { - $this->setPurpose(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_PURPOSE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PURPOSE])) { + $this->setPurpose(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_PURPOSE]] + $ext)); + } else if (is_array($data[self::FIELD_PURPOSE])) { + $this->setPurpose(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_PURPOSE]))); + } } else { $this->setPurpose(new FHIRMarkdown($data[self::FIELD_PURPOSE])); } @@ -734,17 +801,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_RESOURCE])) { foreach($data[self::FIELD_RESOURCE] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCode) { $this->addResource($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addResource(new FHIRCode([FHIRCode::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addResource(new FHIRCode([FHIRCode::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addResource(new FHIRCode(array_merge($v, $ext[$i]))); + } } else { $this->addResource(new FHIRCode($v)); } } } elseif ($data[self::FIELD_RESOURCE] instanceof FHIRCode) { $this->addResource($data[self::FIELD_RESOURCE]); - } elseif ($ext && is_scalar($data[self::FIELD_RESOURCE])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_RESOURCE])) { $this->addResource(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_RESOURCE]] + $ext)); } else { $this->addResource(new FHIRCode($data[self::FIELD_RESOURCE])); @@ -756,8 +830,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRPublicationStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRPublicationStatus([FHIRPublicationStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRPublicationStatus([FHIRPublicationStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRPublicationStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRPublicationStatus($data[self::FIELD_STATUS])); } @@ -768,8 +846,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SYSTEM] instanceof FHIRBoolean) { $this->setSystem($data[self::FIELD_SYSTEM]); - } elseif ($ext && is_scalar($data[self::FIELD_SYSTEM])) { - $this->setSystem(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_SYSTEM]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SYSTEM])) { + $this->setSystem(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_SYSTEM]] + $ext)); + } else if (is_array($data[self::FIELD_SYSTEM])) { + $this->setSystem(new FHIRBoolean(array_merge($ext, $data[self::FIELD_SYSTEM]))); + } } else { $this->setSystem(new FHIRBoolean($data[self::FIELD_SYSTEM])); } @@ -780,8 +862,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TITLE] instanceof FHIRString) { $this->setTitle($data[self::FIELD_TITLE]); - } elseif ($ext && is_scalar($data[self::FIELD_TITLE])) { - $this->setTitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TITLE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TITLE])) { + $this->setTitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TITLE]] + $ext)); + } else if (is_array($data[self::FIELD_TITLE])) { + $this->setTitle(new FHIRString(array_merge($ext, $data[self::FIELD_TITLE]))); + } } else { $this->setTitle(new FHIRString($data[self::FIELD_TITLE])); } @@ -792,8 +878,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TYPE] instanceof FHIRBoolean) { $this->setType($data[self::FIELD_TYPE]); - } elseif ($ext && is_scalar($data[self::FIELD_TYPE])) { - $this->setType(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TYPE])) { + $this->setType(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } else if (is_array($data[self::FIELD_TYPE])) { + $this->setType(new FHIRBoolean(array_merge($ext, $data[self::FIELD_TYPE]))); + } } else { $this->setType(new FHIRBoolean($data[self::FIELD_TYPE])); } @@ -804,8 +894,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_URL] instanceof FHIRUri) { $this->setUrl($data[self::FIELD_URL]); - } elseif ($ext && is_scalar($data[self::FIELD_URL])) { - $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } else if (is_array($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri(array_merge($ext, $data[self::FIELD_URL]))); + } } else { $this->setUrl(new FHIRUri($data[self::FIELD_URL])); } @@ -813,6 +907,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_USE_CONTEXT])) { if (is_array($data[self::FIELD_USE_CONTEXT])) { foreach($data[self::FIELD_USE_CONTEXT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRUsageContext) { $this->addUseContext($v); } else { @@ -831,8 +928,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VERSION] instanceof FHIRString) { $this->setVersion($data[self::FIELD_VERSION]); - } elseif ($ext && is_scalar($data[self::FIELD_VERSION])) { - $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } else if (is_array($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString(array_merge($ext, $data[self::FIELD_VERSION]))); + } } else { $this->setVersion(new FHIRString($data[self::FIELD_VERSION])); } @@ -2310,7 +2411,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getComment())) { $v->xmlSerialize($sxe->addChild(self::FIELD_COMMENT, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getContact())) { foreach($vs as $v) { if (null === $v) { @@ -2319,6 +2419,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_CONTACT, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DATE, null, $v->_getFHIRXMLNamespace())); } @@ -2334,7 +2435,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getInstance())) { $v->xmlSerialize($sxe->addChild(self::FIELD_INSTANCE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getJurisdiction())) { foreach($vs as $v) { if (null === $v) { @@ -2353,7 +2453,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getOutputProfile())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OUTPUT_PROFILE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getOverload())) { foreach($vs as $v) { if (null === $v) { @@ -2371,6 +2470,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_PARAMETER, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getPublisher())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PUBLISHER, null, $v->_getFHIRXMLNamespace())); } @@ -2401,7 +2501,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getUrl())) { $v->xmlSerialize($sxe->addChild(self::FIELD_URL, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getUseContext())) { foreach($vs as $v) { if (null === $v) { @@ -2410,6 +2509,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_USE_CONTEXT, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getVersion())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VERSION, null, $v->_getFHIRXMLNamespace())); } @@ -2423,57 +2523,142 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getAffectsState())) { - $a[self::FIELD_AFFECTS_STATE] = $v->getValue(); - $a[self::FIELD_AFFECTS_STATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_AFFECTS_STATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_AFFECTS_STATE_EXT] = $enc; + } + } else { + $a[self::FIELD_AFFECTS_STATE] = $v; + } } if (null !== ($v = $this->getBase())) { - $a[self::FIELD_BASE] = $v->getValue(); - $a[self::FIELD_BASE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_BASE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_BASE_EXT] = $enc; + } + } else { + $a[self::FIELD_BASE] = $v; + } } if (null !== ($v = $this->getCode())) { - $a[self::FIELD_CODE] = $v->getValue(); - $a[self::FIELD_CODE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CODE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CODE_EXT] = $enc; + } + } else { + $a[self::FIELD_CODE] = $v; + } } if (null !== ($v = $this->getComment())) { - $a[self::FIELD_COMMENT] = $v->getValue(); - $a[self::FIELD_COMMENT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_COMMENT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_COMMENT_EXT] = $enc; + } + } else { + $a[self::FIELD_COMMENT] = $v; + } } if ([] !== ($vs = $this->getContact())) { $a[self::FIELD_CONTACT] = $vs; } if (null !== ($v = $this->getDate())) { - $a[self::FIELD_DATE] = $v->getValue(); - $a[self::FIELD_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_DATE] = $v; + } } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if (null !== ($v = $this->getExperimental())) { - $a[self::FIELD_EXPERIMENTAL] = $v->getValue(); - $a[self::FIELD_EXPERIMENTAL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EXPERIMENTAL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EXPERIMENTAL_EXT] = $enc; + } + } else { + $a[self::FIELD_EXPERIMENTAL] = $v; + } } if (null !== ($v = $this->getInputProfile())) { - $a[self::FIELD_INPUT_PROFILE] = $v->getValue(); - $a[self::FIELD_INPUT_PROFILE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_INPUT_PROFILE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_INPUT_PROFILE_EXT] = $enc; + } + } else { + $a[self::FIELD_INPUT_PROFILE] = $v; + } } if (null !== ($v = $this->getInstance())) { - $a[self::FIELD_INSTANCE] = $v->getValue(); - $a[self::FIELD_INSTANCE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_INSTANCE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_INSTANCE_EXT] = $enc; + } + } else { + $a[self::FIELD_INSTANCE] = $v; + } } if ([] !== ($vs = $this->getJurisdiction())) { $a[self::FIELD_JURISDICTION] = $vs; } if (null !== ($v = $this->getKind())) { - $a[self::FIELD_KIND] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_KIND] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_KIND_EXT] = $enc; + } + } else { + $a[self::FIELD_KIND] = $v; + } } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if (null !== ($v = $this->getOutputProfile())) { - $a[self::FIELD_OUTPUT_PROFILE] = $v->getValue(); - $a[self::FIELD_OUTPUT_PROFILE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_OUTPUT_PROFILE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_OUTPUT_PROFILE_EXT] = $enc; + } + } else { + $a[self::FIELD_OUTPUT_PROFILE] = $v; + } } if ([] !== ($vs = $this->getOverload())) { $a[self::FIELD_OVERLOAD] = $vs; @@ -2482,12 +2667,26 @@ public function jsonSerialize() $a[self::FIELD_PARAMETER] = $vs; } if (null !== ($v = $this->getPublisher())) { - $a[self::FIELD_PUBLISHER] = $v->getValue(); - $a[self::FIELD_PUBLISHER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PUBLISHER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PUBLISHER_EXT] = $enc; + } + } else { + $a[self::FIELD_PUBLISHER] = $v; + } } if (null !== ($v = $this->getPurpose())) { - $a[self::FIELD_PURPOSE] = $v->getValue(); - $a[self::FIELD_PURPOSE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PURPOSE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PURPOSE_EXT] = $enc; + } + } else { + $a[self::FIELD_PURPOSE] = $v; + } } if ([] !== ($vs = $this->getResource())) { $a[self::FIELD_RESOURCE] = []; @@ -2495,35 +2694,87 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_RESOURCE][] = $v->getValue(); - $a[self::FIELD_RESOURCE_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_RESOURCE][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_RESOURCE_EXT][] = $enc; + } else { + $a[self::FIELD_RESOURCE_EXT][] = null; + } + } else { + $a[self::FIELD_RESOURCE][] = $v; + } } } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getSystem())) { - $a[self::FIELD_SYSTEM] = $v->getValue(); - $a[self::FIELD_SYSTEM_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SYSTEM] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SYSTEM_EXT] = $enc; + } + } else { + $a[self::FIELD_SYSTEM] = $v; + } } if (null !== ($v = $this->getTitle())) { - $a[self::FIELD_TITLE] = $v->getValue(); - $a[self::FIELD_TITLE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TITLE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TITLE_EXT] = $enc; + } + } else { + $a[self::FIELD_TITLE] = $v; + } } if (null !== ($v = $this->getType())) { - $a[self::FIELD_TYPE] = $v->getValue(); - $a[self::FIELD_TYPE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TYPE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TYPE_EXT] = $enc; + } + } else { + $a[self::FIELD_TYPE] = $v; + } } if (null !== ($v = $this->getUrl())) { - $a[self::FIELD_URL] = $v->getValue(); - $a[self::FIELD_URL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_URL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_URL_EXT] = $enc; + } + } else { + $a[self::FIELD_URL] = $v; + } } if ([] !== ($vs = $this->getUseContext())) { $a[self::FIELD_USE_CONTEXT] = $vs; } if (null !== ($v = $this->getVersion())) { - $a[self::FIELD_VERSION] = $v->getValue(); - $a[self::FIELD_VERSION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VERSION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VERSION_EXT] = $enc; + } + } else { + $a[self::FIELD_VERSION] = $v; + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIROperationOutcome.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIROperationOutcome.php index bb6f015859..ce780d670c 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIROperationOutcome.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIROperationOutcome.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIROperationOutcome extends FHIRDomainResource implements PHPFHIRContaine { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_OPERATION_OUTCOME; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ISSUE = 'issue'; /** @@ -96,6 +92,9 @@ class FHIROperationOutcome extends FHIRDomainResource implements PHPFHIRContaine */ protected $issue = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIROperationOutcome Constructor * @param null|array $data @@ -115,6 +114,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ISSUE])) { if (is_array($data[self::FIELD_ISSUE])) { foreach($data[self::FIELD_ISSUE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIROperationOutcomeIssue) { $this->addIssue($v); } else { @@ -294,7 +296,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getIssue())) { foreach($vs as $v) { if (null === $v) { @@ -303,6 +304,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_ISSUE, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIROrganization.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIROrganization.php index 6136c28905..0fc8770de1 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIROrganization.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIROrganization.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -89,10 +89,6 @@ class FHIROrganization extends FHIRDomainResource implements PHPFHIRContainedTyp { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ORGANIZATION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ACTIVE = 'active'; const FIELD_ACTIVE_EXT = '_active'; const FIELD_ADDRESS = 'address'; @@ -228,6 +224,9 @@ class FHIROrganization extends FHIRDomainResource implements PHPFHIRContainedTyp */ protected $type = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIROrganization Constructor * @param null|array $data @@ -250,8 +249,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ACTIVE] instanceof FHIRBoolean) { $this->setActive($data[self::FIELD_ACTIVE]); - } elseif ($ext && is_scalar($data[self::FIELD_ACTIVE])) { - $this->setActive(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_ACTIVE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ACTIVE])) { + $this->setActive(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_ACTIVE]] + $ext)); + } else if (is_array($data[self::FIELD_ACTIVE])) { + $this->setActive(new FHIRBoolean(array_merge($ext, $data[self::FIELD_ACTIVE]))); + } } else { $this->setActive(new FHIRBoolean($data[self::FIELD_ACTIVE])); } @@ -259,6 +262,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ADDRESS])) { if (is_array($data[self::FIELD_ADDRESS])) { foreach($data[self::FIELD_ADDRESS] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRAddress) { $this->addAddress($v); } else { @@ -277,17 +283,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_ALIAS])) { foreach($data[self::FIELD_ALIAS] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRString) { $this->addAlias($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addAlias(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addAlias(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addAlias(new FHIRString(array_merge($v, $ext[$i]))); + } } else { $this->addAlias(new FHIRString($v)); } } } elseif ($data[self::FIELD_ALIAS] instanceof FHIRString) { $this->addAlias($data[self::FIELD_ALIAS]); - } elseif ($ext && is_scalar($data[self::FIELD_ALIAS])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_ALIAS])) { $this->addAlias(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_ALIAS]] + $ext)); } else { $this->addAlias(new FHIRString($data[self::FIELD_ALIAS])); @@ -296,6 +309,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CONTACT])) { if (is_array($data[self::FIELD_CONTACT])) { foreach($data[self::FIELD_CONTACT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIROrganizationContact) { $this->addContact($v); } else { @@ -311,6 +327,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ENDPOINT])) { if (is_array($data[self::FIELD_ENDPOINT])) { foreach($data[self::FIELD_ENDPOINT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addEndpoint($v); } else { @@ -329,17 +348,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -351,8 +377,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -370,17 +400,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_TELECOM])) { foreach($data[self::FIELD_TELECOM] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContactPoint) { $this->addTelecom($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addTelecom(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addTelecom(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addTelecom(new FHIRContactPoint(array_merge($v, $ext[$i]))); + } } else { $this->addTelecom(new FHIRContactPoint($v)); } } } elseif ($data[self::FIELD_TELECOM] instanceof FHIRContactPoint) { $this->addTelecom($data[self::FIELD_TELECOM]); - } elseif ($ext && is_scalar($data[self::FIELD_TELECOM])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_TELECOM])) { $this->addTelecom(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $data[self::FIELD_TELECOM]] + $ext)); } else { $this->addTelecom(new FHIRContactPoint($data[self::FIELD_TELECOM])); @@ -389,6 +426,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_TYPE])) { if (is_array($data[self::FIELD_TYPE])) { foreach($data[self::FIELD_TYPE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addType($v); } else { @@ -1100,7 +1140,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getActive())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ACTIVE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getAddress())) { foreach($vs as $v) { if (null === $v) { @@ -1109,6 +1148,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_ADDRESS, null, $v->_getFHIRXMLNamespace())); } } + if ([] !== ($vs = $this->getAlias())) { foreach($vs as $v) { if (null === $v) { @@ -1144,14 +1184,13 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NAME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPartOf())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PART_OF, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getTelecom())) { foreach($vs as $v) { if (null === $v) { @@ -1169,6 +1208,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } @@ -1179,8 +1219,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getActive())) { - $a[self::FIELD_ACTIVE] = $v->getValue(); - $a[self::FIELD_ACTIVE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ACTIVE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ACTIVE_EXT] = $enc; + } + } else { + $a[self::FIELD_ACTIVE] = $v; + } } if ([] !== ($vs = $this->getAddress())) { $a[self::FIELD_ADDRESS] = $vs; @@ -1191,8 +1238,17 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_ALIAS][] = $v->getValue(); - $a[self::FIELD_ALIAS_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ALIAS][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ALIAS_EXT][] = $enc; + } else { + $a[self::FIELD_ALIAS_EXT][] = null; + } + } else { + $a[self::FIELD_ALIAS][] = $v; + } } } if ([] !== ($vs = $this->getContact())) { @@ -1202,17 +1258,56 @@ public function jsonSerialize() $a[self::FIELD_ENDPOINT] = $vs; } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if (null !== ($v = $this->getPartOf())) { $a[self::FIELD_PART_OF] = $v; } if ([] !== ($vs = $this->getTelecom())) { - $a[self::FIELD_TELECOM] = $vs; + $a[self::FIELD_TELECOM] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TELECOM][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TELECOM_EXT][] = $enc; + } else { + $a[self::FIELD_TELECOM_EXT][] = null; + } + } else { + $a[self::FIELD_TELECOM][] = $v; + } + } } if ([] !== ($vs = $this->getType())) { $a[self::FIELD_TYPE] = $vs; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIROrganizationAffiliation.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIROrganizationAffiliation.php index 27272ca896..3ff53f9d6e 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIROrganizationAffiliation.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIROrganizationAffiliation.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -85,10 +85,6 @@ class FHIROrganizationAffiliation extends FHIRDomainResource implements PHPFHIRC { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ORGANIZATION_AFFILIATION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ACTIVE = 'active'; const FIELD_ACTIVE_EXT = '_active'; const FIELD_CODE = 'code'; @@ -244,6 +240,9 @@ class FHIROrganizationAffiliation extends FHIRDomainResource implements PHPFHIRC */ protected $telecom = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIROrganizationAffiliation Constructor * @param null|array $data @@ -266,8 +265,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ACTIVE] instanceof FHIRBoolean) { $this->setActive($data[self::FIELD_ACTIVE]); - } elseif ($ext && is_scalar($data[self::FIELD_ACTIVE])) { - $this->setActive(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_ACTIVE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ACTIVE])) { + $this->setActive(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_ACTIVE]] + $ext)); + } else if (is_array($data[self::FIELD_ACTIVE])) { + $this->setActive(new FHIRBoolean(array_merge($ext, $data[self::FIELD_ACTIVE]))); + } } else { $this->setActive(new FHIRBoolean($data[self::FIELD_ACTIVE])); } @@ -275,6 +278,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CODE])) { if (is_array($data[self::FIELD_CODE])) { foreach($data[self::FIELD_CODE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addCode($v); } else { @@ -290,6 +296,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ENDPOINT])) { if (is_array($data[self::FIELD_ENDPOINT])) { foreach($data[self::FIELD_ENDPOINT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addEndpoint($v); } else { @@ -305,6 +314,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_HEALTHCARE_SERVICE])) { if (is_array($data[self::FIELD_HEALTHCARE_SERVICE])) { foreach($data[self::FIELD_HEALTHCARE_SERVICE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addHealthcareService($v); } else { @@ -323,17 +335,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -342,6 +361,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_LOCATION])) { if (is_array($data[self::FIELD_LOCATION])) { foreach($data[self::FIELD_LOCATION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addLocation($v); } else { @@ -357,6 +379,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_NETWORK])) { if (is_array($data[self::FIELD_NETWORK])) { foreach($data[self::FIELD_NETWORK] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addNetwork($v); } else { @@ -393,6 +418,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SPECIALTY])) { if (is_array($data[self::FIELD_SPECIALTY])) { foreach($data[self::FIELD_SPECIALTY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addSpecialty($v); } else { @@ -411,17 +439,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_TELECOM])) { foreach($data[self::FIELD_TELECOM] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContactPoint) { $this->addTelecom($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addTelecom(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addTelecom(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addTelecom(new FHIRContactPoint(array_merge($v, $ext[$i]))); + } } else { $this->addTelecom(new FHIRContactPoint($v)); } } } elseif ($data[self::FIELD_TELECOM] instanceof FHIRContactPoint) { $this->addTelecom($data[self::FIELD_TELECOM]); - } elseif ($ext && is_scalar($data[self::FIELD_TELECOM])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_TELECOM])) { $this->addTelecom(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $data[self::FIELD_TELECOM]] + $ext)); } else { $this->addTelecom(new FHIRContactPoint($data[self::FIELD_TELECOM])); @@ -1190,7 +1225,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getActive())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ACTIVE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getCode())) { foreach($vs as $v) { if (null === $v) { @@ -1248,15 +1282,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getOrganization())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ORGANIZATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getParticipatingOrganization())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PARTICIPATING_ORGANIZATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getSpecialty())) { foreach($vs as $v) { if (null === $v) { @@ -1274,6 +1305,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_TELECOM, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } @@ -1284,8 +1316,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getActive())) { - $a[self::FIELD_ACTIVE] = $v->getValue(); - $a[self::FIELD_ACTIVE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ACTIVE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ACTIVE_EXT] = $enc; + } + } else { + $a[self::FIELD_ACTIVE] = $v; + } } if ([] !== ($vs = $this->getCode())) { $a[self::FIELD_CODE] = $vs; @@ -1297,7 +1336,23 @@ public function jsonSerialize() $a[self::FIELD_HEALTHCARE_SERVICE] = $vs; } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if ([] !== ($vs = $this->getLocation())) { $a[self::FIELD_LOCATION] = $vs; @@ -1318,7 +1373,23 @@ public function jsonSerialize() $a[self::FIELD_SPECIALTY] = $vs; } if ([] !== ($vs = $this->getTelecom())) { - $a[self::FIELD_TELECOM] = $vs; + $a[self::FIELD_TELECOM] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TELECOM][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TELECOM_EXT][] = $enc; + } else { + $a[self::FIELD_TELECOM_EXT][] = null; + } + } else { + $a[self::FIELD_TELECOM][] = $v; + } + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRPatient.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRPatient.php index fd94a6d90c..e4e3debfd8 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRPatient.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRPatient.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -94,10 +94,6 @@ class FHIRPatient extends FHIRDomainResource implements PHPFHIRContainedTypeInte { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_PATIENT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ACTIVE = 'active'; const FIELD_ACTIVE_EXT = '_active'; const FIELD_ADDRESS = 'address'; @@ -338,6 +334,9 @@ class FHIRPatient extends FHIRDomainResource implements PHPFHIRContainedTypeInte */ protected $telecom = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRPatient Constructor * @param null|array $data @@ -360,8 +359,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ACTIVE] instanceof FHIRBoolean) { $this->setActive($data[self::FIELD_ACTIVE]); - } elseif ($ext && is_scalar($data[self::FIELD_ACTIVE])) { - $this->setActive(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_ACTIVE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ACTIVE])) { + $this->setActive(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_ACTIVE]] + $ext)); + } else if (is_array($data[self::FIELD_ACTIVE])) { + $this->setActive(new FHIRBoolean(array_merge($ext, $data[self::FIELD_ACTIVE]))); + } } else { $this->setActive(new FHIRBoolean($data[self::FIELD_ACTIVE])); } @@ -369,6 +372,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ADDRESS])) { if (is_array($data[self::FIELD_ADDRESS])) { foreach($data[self::FIELD_ADDRESS] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRAddress) { $this->addAddress($v); } else { @@ -387,8 +393,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_BIRTH_DATE] instanceof FHIRDate) { $this->setBirthDate($data[self::FIELD_BIRTH_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_BIRTH_DATE])) { - $this->setBirthDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_BIRTH_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_BIRTH_DATE])) { + $this->setBirthDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_BIRTH_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_BIRTH_DATE])) { + $this->setBirthDate(new FHIRDate(array_merge($ext, $data[self::FIELD_BIRTH_DATE]))); + } } else { $this->setBirthDate(new FHIRDate($data[self::FIELD_BIRTH_DATE])); } @@ -396,6 +406,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_COMMUNICATION])) { if (is_array($data[self::FIELD_COMMUNICATION])) { foreach($data[self::FIELD_COMMUNICATION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRPatientCommunication) { $this->addCommunication($v); } else { @@ -411,6 +424,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CONTACT])) { if (is_array($data[self::FIELD_CONTACT])) { foreach($data[self::FIELD_CONTACT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRPatientContact) { $this->addContact($v); } else { @@ -429,8 +445,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DECEASED_BOOLEAN] instanceof FHIRBoolean) { $this->setDeceasedBoolean($data[self::FIELD_DECEASED_BOOLEAN]); - } elseif ($ext && is_scalar($data[self::FIELD_DECEASED_BOOLEAN])) { - $this->setDeceasedBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_DECEASED_BOOLEAN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DECEASED_BOOLEAN])) { + $this->setDeceasedBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_DECEASED_BOOLEAN]] + $ext)); + } else if (is_array($data[self::FIELD_DECEASED_BOOLEAN])) { + $this->setDeceasedBoolean(new FHIRBoolean(array_merge($ext, $data[self::FIELD_DECEASED_BOOLEAN]))); + } } else { $this->setDeceasedBoolean(new FHIRBoolean($data[self::FIELD_DECEASED_BOOLEAN])); } @@ -441,8 +461,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DECEASED_DATE_TIME] instanceof FHIRDateTime) { $this->setDeceasedDateTime($data[self::FIELD_DECEASED_DATE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_DECEASED_DATE_TIME])) { - $this->setDeceasedDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DECEASED_DATE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DECEASED_DATE_TIME])) { + $this->setDeceasedDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DECEASED_DATE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_DECEASED_DATE_TIME])) { + $this->setDeceasedDateTime(new FHIRDateTime(array_merge($ext, $data[self::FIELD_DECEASED_DATE_TIME]))); + } } else { $this->setDeceasedDateTime(new FHIRDateTime($data[self::FIELD_DECEASED_DATE_TIME])); } @@ -453,8 +477,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_GENDER] instanceof FHIRAdministrativeGender) { $this->setGender($data[self::FIELD_GENDER]); - } elseif ($ext && is_scalar($data[self::FIELD_GENDER])) { - $this->setGender(new FHIRAdministrativeGender([FHIRAdministrativeGender::FIELD_VALUE => $data[self::FIELD_GENDER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_GENDER])) { + $this->setGender(new FHIRAdministrativeGender([FHIRAdministrativeGender::FIELD_VALUE => $data[self::FIELD_GENDER]] + $ext)); + } else if (is_array($data[self::FIELD_GENDER])) { + $this->setGender(new FHIRAdministrativeGender(array_merge($ext, $data[self::FIELD_GENDER]))); + } } else { $this->setGender(new FHIRAdministrativeGender($data[self::FIELD_GENDER])); } @@ -462,6 +490,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_GENERAL_PRACTITIONER])) { if (is_array($data[self::FIELD_GENERAL_PRACTITIONER])) { foreach($data[self::FIELD_GENERAL_PRACTITIONER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addGeneralPractitioner($v); } else { @@ -480,17 +511,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -499,6 +537,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_LINK])) { if (is_array($data[self::FIELD_LINK])) { foreach($data[self::FIELD_LINK] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRPatientLink) { $this->addLink($v); } else { @@ -531,8 +572,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MULTIPLE_BIRTH_BOOLEAN] instanceof FHIRBoolean) { $this->setMultipleBirthBoolean($data[self::FIELD_MULTIPLE_BIRTH_BOOLEAN]); - } elseif ($ext && is_scalar($data[self::FIELD_MULTIPLE_BIRTH_BOOLEAN])) { - $this->setMultipleBirthBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_MULTIPLE_BIRTH_BOOLEAN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MULTIPLE_BIRTH_BOOLEAN])) { + $this->setMultipleBirthBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_MULTIPLE_BIRTH_BOOLEAN]] + $ext)); + } else if (is_array($data[self::FIELD_MULTIPLE_BIRTH_BOOLEAN])) { + $this->setMultipleBirthBoolean(new FHIRBoolean(array_merge($ext, $data[self::FIELD_MULTIPLE_BIRTH_BOOLEAN]))); + } } else { $this->setMultipleBirthBoolean(new FHIRBoolean($data[self::FIELD_MULTIPLE_BIRTH_BOOLEAN])); } @@ -543,8 +588,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MULTIPLE_BIRTH_INTEGER] instanceof FHIRInteger) { $this->setMultipleBirthInteger($data[self::FIELD_MULTIPLE_BIRTH_INTEGER]); - } elseif ($ext && is_scalar($data[self::FIELD_MULTIPLE_BIRTH_INTEGER])) { - $this->setMultipleBirthInteger(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_MULTIPLE_BIRTH_INTEGER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MULTIPLE_BIRTH_INTEGER])) { + $this->setMultipleBirthInteger(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_MULTIPLE_BIRTH_INTEGER]] + $ext)); + } else if (is_array($data[self::FIELD_MULTIPLE_BIRTH_INTEGER])) { + $this->setMultipleBirthInteger(new FHIRInteger(array_merge($ext, $data[self::FIELD_MULTIPLE_BIRTH_INTEGER]))); + } } else { $this->setMultipleBirthInteger(new FHIRInteger($data[self::FIELD_MULTIPLE_BIRTH_INTEGER])); } @@ -552,6 +601,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_NAME])) { if (is_array($data[self::FIELD_NAME])) { foreach($data[self::FIELD_NAME] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRHumanName) { $this->addName($v); } else { @@ -567,6 +619,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PHOTO])) { if (is_array($data[self::FIELD_PHOTO])) { foreach($data[self::FIELD_PHOTO] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRAttachment) { $this->addPhoto($v); } else { @@ -585,17 +640,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_TELECOM])) { foreach($data[self::FIELD_TELECOM] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContactPoint) { $this->addTelecom($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addTelecom(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addTelecom(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addTelecom(new FHIRContactPoint(array_merge($v, $ext[$i]))); + } } else { $this->addTelecom(new FHIRContactPoint($v)); } } } elseif ($data[self::FIELD_TELECOM] instanceof FHIRContactPoint) { $this->addTelecom($data[self::FIELD_TELECOM]); - } elseif ($ext && is_scalar($data[self::FIELD_TELECOM])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_TELECOM])) { $this->addTelecom(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $data[self::FIELD_TELECOM]] + $ext)); } else { $this->addTelecom(new FHIRContactPoint($data[self::FIELD_TELECOM])); @@ -1658,7 +1720,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getActive())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ACTIVE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getAddress())) { foreach($vs as $v) { if (null === $v) { @@ -1667,10 +1728,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_ADDRESS, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getBirthDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_BIRTH_DATE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getCommunication())) { foreach($vs as $v) { if (null === $v) { @@ -1688,17 +1749,16 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_CONTACT, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getDeceasedBoolean())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DECEASED_BOOLEAN, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getDeceasedDateTime())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DECEASED_DATE_TIME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getGender())) { $v->xmlSerialize($sxe->addChild(self::FIELD_GENDER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getGeneralPractitioner())) { foreach($vs as $v) { if (null === $v) { @@ -1729,7 +1789,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getManagingOrganization())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MANAGING_ORGANIZATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getMaritalStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MARITAL_STATUS, null, $v->_getFHIRXMLNamespace())); } @@ -1739,7 +1798,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getMultipleBirthInteger())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MULTIPLE_BIRTH_INTEGER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getName())) { foreach($vs as $v) { if (null === $v) { @@ -1766,6 +1824,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_TELECOM, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } @@ -1776,15 +1835,29 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getActive())) { - $a[self::FIELD_ACTIVE] = $v->getValue(); - $a[self::FIELD_ACTIVE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ACTIVE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ACTIVE_EXT] = $enc; + } + } else { + $a[self::FIELD_ACTIVE] = $v; + } } if ([] !== ($vs = $this->getAddress())) { $a[self::FIELD_ADDRESS] = $vs; } if (null !== ($v = $this->getBirthDate())) { - $a[self::FIELD_BIRTH_DATE] = $v->getValue(); - $a[self::FIELD_BIRTH_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_BIRTH_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_BIRTH_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_BIRTH_DATE] = $v; + } } if ([] !== ($vs = $this->getCommunication())) { $a[self::FIELD_COMMUNICATION] = $vs; @@ -1793,21 +1866,59 @@ public function jsonSerialize() $a[self::FIELD_CONTACT] = $vs; } if (null !== ($v = $this->getDeceasedBoolean())) { - $a[self::FIELD_DECEASED_BOOLEAN] = $v->getValue(); - $a[self::FIELD_DECEASED_BOOLEAN_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DECEASED_BOOLEAN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DECEASED_BOOLEAN_EXT] = $enc; + } + } else { + $a[self::FIELD_DECEASED_BOOLEAN] = $v; + } } if (null !== ($v = $this->getDeceasedDateTime())) { - $a[self::FIELD_DECEASED_DATE_TIME] = $v->getValue(); - $a[self::FIELD_DECEASED_DATE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DECEASED_DATE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DECEASED_DATE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_DECEASED_DATE_TIME] = $v; + } } if (null !== ($v = $this->getGender())) { - $a[self::FIELD_GENDER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_GENDER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_GENDER_EXT] = $enc; + } + } else { + $a[self::FIELD_GENDER] = $v; + } } if ([] !== ($vs = $this->getGeneralPractitioner())) { $a[self::FIELD_GENERAL_PRACTITIONER] = $vs; } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if ([] !== ($vs = $this->getLink())) { $a[self::FIELD_LINK] = $vs; @@ -1819,12 +1930,26 @@ public function jsonSerialize() $a[self::FIELD_MARITAL_STATUS] = $v; } if (null !== ($v = $this->getMultipleBirthBoolean())) { - $a[self::FIELD_MULTIPLE_BIRTH_BOOLEAN] = $v->getValue(); - $a[self::FIELD_MULTIPLE_BIRTH_BOOLEAN_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MULTIPLE_BIRTH_BOOLEAN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MULTIPLE_BIRTH_BOOLEAN_EXT] = $enc; + } + } else { + $a[self::FIELD_MULTIPLE_BIRTH_BOOLEAN] = $v; + } } if (null !== ($v = $this->getMultipleBirthInteger())) { - $a[self::FIELD_MULTIPLE_BIRTH_INTEGER] = $v->getValue(); - $a[self::FIELD_MULTIPLE_BIRTH_INTEGER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MULTIPLE_BIRTH_INTEGER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MULTIPLE_BIRTH_INTEGER_EXT] = $enc; + } + } else { + $a[self::FIELD_MULTIPLE_BIRTH_INTEGER] = $v; + } } if ([] !== ($vs = $this->getName())) { $a[self::FIELD_NAME] = $vs; @@ -1833,7 +1958,23 @@ public function jsonSerialize() $a[self::FIELD_PHOTO] = $vs; } if ([] !== ($vs = $this->getTelecom())) { - $a[self::FIELD_TELECOM] = $vs; + $a[self::FIELD_TELECOM] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TELECOM][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TELECOM_EXT][] = $enc; + } else { + $a[self::FIELD_TELECOM_EXT][] = null; + } + } else { + $a[self::FIELD_TELECOM][] = $v; + } + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRPaymentNotice.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRPaymentNotice.php index 3bb080c060..61c7261e93 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRPaymentNotice.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRPaymentNotice.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -86,10 +86,6 @@ class FHIRPaymentNotice extends FHIRDomainResource implements PHPFHIRContainedTy { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_PAYMENT_NOTICE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_AMOUNT = 'amount'; const FIELD_AMOUNT_EXT = '_amount'; const FIELD_CREATED = 'created'; @@ -246,6 +242,9 @@ class FHIRPaymentNotice extends FHIRDomainResource implements PHPFHIRContainedTy */ protected $status = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRPaymentNotice Constructor * @param null|array $data @@ -268,8 +267,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_AMOUNT] instanceof FHIRMoney) { $this->setAmount($data[self::FIELD_AMOUNT]); - } elseif ($ext && is_scalar($data[self::FIELD_AMOUNT])) { - $this->setAmount(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_AMOUNT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_AMOUNT])) { + $this->setAmount(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_AMOUNT]] + $ext)); + } else if (is_array($data[self::FIELD_AMOUNT])) { + $this->setAmount(new FHIRMoney(array_merge($ext, $data[self::FIELD_AMOUNT]))); + } } else { $this->setAmount(new FHIRMoney($data[self::FIELD_AMOUNT])); } @@ -280,8 +283,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CREATED] instanceof FHIRDateTime) { $this->setCreated($data[self::FIELD_CREATED]); - } elseif ($ext && is_scalar($data[self::FIELD_CREATED])) { - $this->setCreated(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_CREATED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CREATED])) { + $this->setCreated(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_CREATED]] + $ext)); + } else if (is_array($data[self::FIELD_CREATED])) { + $this->setCreated(new FHIRDateTime(array_merge($ext, $data[self::FIELD_CREATED]))); + } } else { $this->setCreated(new FHIRDateTime($data[self::FIELD_CREATED])); } @@ -292,17 +299,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -328,8 +342,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PAYMENT_DATE] instanceof FHIRDate) { $this->setPaymentDate($data[self::FIELD_PAYMENT_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_PAYMENT_DATE])) { - $this->setPaymentDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_PAYMENT_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PAYMENT_DATE])) { + $this->setPaymentDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_PAYMENT_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_PAYMENT_DATE])) { + $this->setPaymentDate(new FHIRDate(array_merge($ext, $data[self::FIELD_PAYMENT_DATE]))); + } } else { $this->setPaymentDate(new FHIRDate($data[self::FIELD_PAYMENT_DATE])); } @@ -375,8 +393,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRFinancialResourceStatusCodes) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRFinancialResourceStatusCodes([FHIRFinancialResourceStatusCodes::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRFinancialResourceStatusCodes([FHIRFinancialResourceStatusCodes::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRFinancialResourceStatusCodes(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRFinancialResourceStatusCodes($data[self::FIELD_STATUS])); } @@ -949,14 +971,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getAmount())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AMOUNT, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getCreated())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CREATED, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -969,34 +989,27 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getPayee())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PAYEE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPayment())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PAYMENT, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getPaymentDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PAYMENT_DATE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPaymentStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PAYMENT_STATUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getProvider())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PROVIDER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRecipient())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RECIPIENT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRequest())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REQUEST, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getResponse())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RESPONSE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } @@ -1010,14 +1023,45 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getAmount())) { - $a[self::FIELD_AMOUNT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_AMOUNT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_AMOUNT_EXT] = $enc; + } + } else { + $a[self::FIELD_AMOUNT] = $v; + } } if (null !== ($v = $this->getCreated())) { - $a[self::FIELD_CREATED] = $v->getValue(); - $a[self::FIELD_CREATED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CREATED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CREATED_EXT] = $enc; + } + } else { + $a[self::FIELD_CREATED] = $v; + } } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if (null !== ($v = $this->getPayee())) { $a[self::FIELD_PAYEE] = $v; @@ -1026,8 +1070,15 @@ public function jsonSerialize() $a[self::FIELD_PAYMENT] = $v; } if (null !== ($v = $this->getPaymentDate())) { - $a[self::FIELD_PAYMENT_DATE] = $v->getValue(); - $a[self::FIELD_PAYMENT_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PAYMENT_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PAYMENT_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_PAYMENT_DATE] = $v; + } } if (null !== ($v = $this->getPaymentStatus())) { $a[self::FIELD_PAYMENT_STATUS] = $v; @@ -1045,7 +1096,15 @@ public function jsonSerialize() $a[self::FIELD_RESPONSE] = $v; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRPaymentReconciliation.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRPaymentReconciliation.php index 6b2d358524..c6567388e6 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRPaymentReconciliation.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRPaymentReconciliation.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -91,10 +91,6 @@ class FHIRPaymentReconciliation extends FHIRDomainResource implements PHPFHIRCon { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_PAYMENT_RECONCILIATION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CREATED = 'created'; const FIELD_CREATED_EXT = '_created'; const FIELD_DETAIL = 'detail'; @@ -288,6 +284,9 @@ class FHIRPaymentReconciliation extends FHIRDomainResource implements PHPFHIRCon */ protected $status = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRPaymentReconciliation Constructor * @param null|array $data @@ -310,8 +309,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CREATED] instanceof FHIRDateTime) { $this->setCreated($data[self::FIELD_CREATED]); - } elseif ($ext && is_scalar($data[self::FIELD_CREATED])) { - $this->setCreated(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_CREATED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CREATED])) { + $this->setCreated(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_CREATED]] + $ext)); + } else if (is_array($data[self::FIELD_CREATED])) { + $this->setCreated(new FHIRDateTime(array_merge($ext, $data[self::FIELD_CREATED]))); + } } else { $this->setCreated(new FHIRDateTime($data[self::FIELD_CREATED])); } @@ -319,6 +322,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_DETAIL])) { if (is_array($data[self::FIELD_DETAIL])) { foreach($data[self::FIELD_DETAIL] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRPaymentReconciliationDetail) { $this->addDetail($v); } else { @@ -337,8 +343,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DISPOSITION] instanceof FHIRString) { $this->setDisposition($data[self::FIELD_DISPOSITION]); - } elseif ($ext && is_scalar($data[self::FIELD_DISPOSITION])) { - $this->setDisposition(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DISPOSITION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DISPOSITION])) { + $this->setDisposition(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DISPOSITION]] + $ext)); + } else if (is_array($data[self::FIELD_DISPOSITION])) { + $this->setDisposition(new FHIRString(array_merge($ext, $data[self::FIELD_DISPOSITION]))); + } } else { $this->setDisposition(new FHIRString($data[self::FIELD_DISPOSITION])); } @@ -356,17 +366,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -378,8 +395,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_OUTCOME] instanceof FHIRRemittanceOutcome) { $this->setOutcome($data[self::FIELD_OUTCOME]); - } elseif ($ext && is_scalar($data[self::FIELD_OUTCOME])) { - $this->setOutcome(new FHIRRemittanceOutcome([FHIRRemittanceOutcome::FIELD_VALUE => $data[self::FIELD_OUTCOME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_OUTCOME])) { + $this->setOutcome(new FHIRRemittanceOutcome([FHIRRemittanceOutcome::FIELD_VALUE => $data[self::FIELD_OUTCOME]] + $ext)); + } else if (is_array($data[self::FIELD_OUTCOME])) { + $this->setOutcome(new FHIRRemittanceOutcome(array_merge($ext, $data[self::FIELD_OUTCOME]))); + } } else { $this->setOutcome(new FHIRRemittanceOutcome($data[self::FIELD_OUTCOME])); } @@ -390,8 +411,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PAYMENT_AMOUNT] instanceof FHIRMoney) { $this->setPaymentAmount($data[self::FIELD_PAYMENT_AMOUNT]); - } elseif ($ext && is_scalar($data[self::FIELD_PAYMENT_AMOUNT])) { - $this->setPaymentAmount(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_PAYMENT_AMOUNT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PAYMENT_AMOUNT])) { + $this->setPaymentAmount(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_PAYMENT_AMOUNT]] + $ext)); + } else if (is_array($data[self::FIELD_PAYMENT_AMOUNT])) { + $this->setPaymentAmount(new FHIRMoney(array_merge($ext, $data[self::FIELD_PAYMENT_AMOUNT]))); + } } else { $this->setPaymentAmount(new FHIRMoney($data[self::FIELD_PAYMENT_AMOUNT])); } @@ -402,8 +427,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PAYMENT_DATE] instanceof FHIRDate) { $this->setPaymentDate($data[self::FIELD_PAYMENT_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_PAYMENT_DATE])) { - $this->setPaymentDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_PAYMENT_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PAYMENT_DATE])) { + $this->setPaymentDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_PAYMENT_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_PAYMENT_DATE])) { + $this->setPaymentDate(new FHIRDate(array_merge($ext, $data[self::FIELD_PAYMENT_DATE]))); + } } else { $this->setPaymentDate(new FHIRDate($data[self::FIELD_PAYMENT_DATE])); } @@ -414,8 +443,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PAYMENT_IDENTIFIER] instanceof FHIRIdentifier) { $this->setPaymentIdentifier($data[self::FIELD_PAYMENT_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_PAYMENT_IDENTIFIER])) { - $this->setPaymentIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_PAYMENT_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PAYMENT_IDENTIFIER])) { + $this->setPaymentIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_PAYMENT_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_PAYMENT_IDENTIFIER])) { + $this->setPaymentIdentifier(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_PAYMENT_IDENTIFIER]))); + } } else { $this->setPaymentIdentifier(new FHIRIdentifier($data[self::FIELD_PAYMENT_IDENTIFIER])); } @@ -437,6 +470,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PROCESS_NOTE])) { if (is_array($data[self::FIELD_PROCESS_NOTE])) { foreach($data[self::FIELD_PROCESS_NOTE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRPaymentReconciliationProcessNote) { $this->addProcessNote($v); } else { @@ -469,8 +505,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRFinancialResourceStatusCodes) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRFinancialResourceStatusCodes([FHIRFinancialResourceStatusCodes::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRFinancialResourceStatusCodes([FHIRFinancialResourceStatusCodes::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRFinancialResourceStatusCodes(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRFinancialResourceStatusCodes($data[self::FIELD_STATUS])); } @@ -1206,7 +1246,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getCreated())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CREATED, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getDetail())) { foreach($vs as $v) { if (null === $v) { @@ -1215,14 +1254,13 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_DETAIL, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getDisposition())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DISPOSITION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getFormCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FORM_CODE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -1235,26 +1273,21 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getOutcome())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OUTCOME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPaymentAmount())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PAYMENT_AMOUNT, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getPaymentDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PAYMENT_DATE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPaymentIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PAYMENT_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPaymentIssuer())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PAYMENT_ISSUER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getProcessNote())) { foreach($vs as $v) { if (null === $v) { @@ -1267,11 +1300,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getRequest())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REQUEST, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRequestor())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REQUESTOR, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } @@ -1285,34 +1316,95 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getCreated())) { - $a[self::FIELD_CREATED] = $v->getValue(); - $a[self::FIELD_CREATED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CREATED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CREATED_EXT] = $enc; + } + } else { + $a[self::FIELD_CREATED] = $v; + } } if ([] !== ($vs = $this->getDetail())) { $a[self::FIELD_DETAIL] = $vs; } if (null !== ($v = $this->getDisposition())) { - $a[self::FIELD_DISPOSITION] = $v->getValue(); - $a[self::FIELD_DISPOSITION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DISPOSITION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DISPOSITION_EXT] = $enc; + } + } else { + $a[self::FIELD_DISPOSITION] = $v; + } } if (null !== ($v = $this->getFormCode())) { $a[self::FIELD_FORM_CODE] = $v; } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if (null !== ($v = $this->getOutcome())) { - $a[self::FIELD_OUTCOME] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_OUTCOME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_OUTCOME_EXT] = $enc; + } + } else { + $a[self::FIELD_OUTCOME] = $v; + } } if (null !== ($v = $this->getPaymentAmount())) { - $a[self::FIELD_PAYMENT_AMOUNT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PAYMENT_AMOUNT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PAYMENT_AMOUNT_EXT] = $enc; + } + } else { + $a[self::FIELD_PAYMENT_AMOUNT] = $v; + } } if (null !== ($v = $this->getPaymentDate())) { - $a[self::FIELD_PAYMENT_DATE] = $v->getValue(); - $a[self::FIELD_PAYMENT_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PAYMENT_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PAYMENT_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_PAYMENT_DATE] = $v; + } } if (null !== ($v = $this->getPaymentIdentifier())) { - $a[self::FIELD_PAYMENT_IDENTIFIER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PAYMENT_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PAYMENT_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_PAYMENT_IDENTIFIER] = $v; + } } if (null !== ($v = $this->getPaymentIssuer())) { $a[self::FIELD_PAYMENT_ISSUER] = $v; @@ -1330,7 +1422,15 @@ public function jsonSerialize() $a[self::FIELD_REQUESTOR] = $v; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRPerson.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRPerson.php index d5e2f128fe..541c179b65 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRPerson.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRPerson.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -89,10 +89,6 @@ class FHIRPerson extends FHIRDomainResource implements PHPFHIRContainedTypeInter { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_PERSON; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ACTIVE = 'active'; const FIELD_ACTIVE_EXT = '_active'; const FIELD_ADDRESS = 'address'; @@ -223,6 +219,9 @@ class FHIRPerson extends FHIRDomainResource implements PHPFHIRContainedTypeInter */ protected $telecom = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRPerson Constructor * @param null|array $data @@ -245,8 +244,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ACTIVE] instanceof FHIRBoolean) { $this->setActive($data[self::FIELD_ACTIVE]); - } elseif ($ext && is_scalar($data[self::FIELD_ACTIVE])) { - $this->setActive(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_ACTIVE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ACTIVE])) { + $this->setActive(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_ACTIVE]] + $ext)); + } else if (is_array($data[self::FIELD_ACTIVE])) { + $this->setActive(new FHIRBoolean(array_merge($ext, $data[self::FIELD_ACTIVE]))); + } } else { $this->setActive(new FHIRBoolean($data[self::FIELD_ACTIVE])); } @@ -254,6 +257,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ADDRESS])) { if (is_array($data[self::FIELD_ADDRESS])) { foreach($data[self::FIELD_ADDRESS] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRAddress) { $this->addAddress($v); } else { @@ -272,8 +278,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_BIRTH_DATE] instanceof FHIRDate) { $this->setBirthDate($data[self::FIELD_BIRTH_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_BIRTH_DATE])) { - $this->setBirthDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_BIRTH_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_BIRTH_DATE])) { + $this->setBirthDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_BIRTH_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_BIRTH_DATE])) { + $this->setBirthDate(new FHIRDate(array_merge($ext, $data[self::FIELD_BIRTH_DATE]))); + } } else { $this->setBirthDate(new FHIRDate($data[self::FIELD_BIRTH_DATE])); } @@ -284,8 +294,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_GENDER] instanceof FHIRAdministrativeGender) { $this->setGender($data[self::FIELD_GENDER]); - } elseif ($ext && is_scalar($data[self::FIELD_GENDER])) { - $this->setGender(new FHIRAdministrativeGender([FHIRAdministrativeGender::FIELD_VALUE => $data[self::FIELD_GENDER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_GENDER])) { + $this->setGender(new FHIRAdministrativeGender([FHIRAdministrativeGender::FIELD_VALUE => $data[self::FIELD_GENDER]] + $ext)); + } else if (is_array($data[self::FIELD_GENDER])) { + $this->setGender(new FHIRAdministrativeGender(array_merge($ext, $data[self::FIELD_GENDER]))); + } } else { $this->setGender(new FHIRAdministrativeGender($data[self::FIELD_GENDER])); } @@ -296,17 +310,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -315,6 +336,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_LINK])) { if (is_array($data[self::FIELD_LINK])) { foreach($data[self::FIELD_LINK] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRPersonLink) { $this->addLink($v); } else { @@ -337,6 +361,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_NAME])) { if (is_array($data[self::FIELD_NAME])) { foreach($data[self::FIELD_NAME] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRHumanName) { $this->addName($v); } else { @@ -362,17 +389,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_TELECOM])) { foreach($data[self::FIELD_TELECOM] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContactPoint) { $this->addTelecom($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addTelecom(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addTelecom(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addTelecom(new FHIRContactPoint(array_merge($v, $ext[$i]))); + } } else { $this->addTelecom(new FHIRContactPoint($v)); } } } elseif ($data[self::FIELD_TELECOM] instanceof FHIRContactPoint) { $this->addTelecom($data[self::FIELD_TELECOM]); - } elseif ($ext && is_scalar($data[self::FIELD_TELECOM])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_TELECOM])) { $this->addTelecom(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $data[self::FIELD_TELECOM]] + $ext)); } else { $this->addTelecom(new FHIRContactPoint($data[self::FIELD_TELECOM])); @@ -995,7 +1029,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getActive())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ACTIVE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getAddress())) { foreach($vs as $v) { if (null === $v) { @@ -1004,14 +1037,13 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_ADDRESS, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getBirthDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_BIRTH_DATE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getGender())) { $v->xmlSerialize($sxe->addChild(self::FIELD_GENDER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -1033,7 +1065,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getManagingOrganization())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MANAGING_ORGANIZATION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getName())) { foreach($vs as $v) { if (null === $v) { @@ -1046,7 +1077,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getPhoto())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PHOTO, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getTelecom())) { foreach($vs as $v) { if (null === $v) { @@ -1055,6 +1085,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_TELECOM, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } @@ -1065,21 +1096,59 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getActive())) { - $a[self::FIELD_ACTIVE] = $v->getValue(); - $a[self::FIELD_ACTIVE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ACTIVE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ACTIVE_EXT] = $enc; + } + } else { + $a[self::FIELD_ACTIVE] = $v; + } } if ([] !== ($vs = $this->getAddress())) { $a[self::FIELD_ADDRESS] = $vs; } if (null !== ($v = $this->getBirthDate())) { - $a[self::FIELD_BIRTH_DATE] = $v->getValue(); - $a[self::FIELD_BIRTH_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_BIRTH_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_BIRTH_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_BIRTH_DATE] = $v; + } } if (null !== ($v = $this->getGender())) { - $a[self::FIELD_GENDER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_GENDER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_GENDER_EXT] = $enc; + } + } else { + $a[self::FIELD_GENDER] = $v; + } } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if ([] !== ($vs = $this->getLink())) { $a[self::FIELD_LINK] = $vs; @@ -1094,7 +1163,23 @@ public function jsonSerialize() $a[self::FIELD_PHOTO] = $v; } if ([] !== ($vs = $this->getTelecom())) { - $a[self::FIELD_TELECOM] = $vs; + $a[self::FIELD_TELECOM] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TELECOM][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TELECOM_EXT][] = $enc; + } else { + $a[self::FIELD_TELECOM_EXT][] = null; + } + } else { + $a[self::FIELD_TELECOM][] = $v; + } + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRPlanDefinition.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRPlanDefinition.php index 7cf67fe1d5..e1a2862c4f 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRPlanDefinition.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRPlanDefinition.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -98,10 +98,6 @@ class FHIRPlanDefinition extends FHIRDomainResource implements PHPFHIRContainedT { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_PLAN_DEFINITION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ACTION = 'action'; const FIELD_APPROVAL_DATE = 'approvalDate'; const FIELD_APPROVAL_DATE_EXT = '_approvalDate'; @@ -582,6 +578,9 @@ class FHIRPlanDefinition extends FHIRDomainResource implements PHPFHIRContainedT */ protected $version = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRPlanDefinition Constructor * @param null|array $data @@ -601,6 +600,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ACTION])) { if (is_array($data[self::FIELD_ACTION])) { foreach($data[self::FIELD_ACTION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRPlanDefinitionAction) { $this->addAction($v); } else { @@ -619,8 +621,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_APPROVAL_DATE] instanceof FHIRDate) { $this->setApprovalDate($data[self::FIELD_APPROVAL_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_APPROVAL_DATE])) { - $this->setApprovalDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_APPROVAL_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_APPROVAL_DATE])) { + $this->setApprovalDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_APPROVAL_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_APPROVAL_DATE])) { + $this->setApprovalDate(new FHIRDate(array_merge($ext, $data[self::FIELD_APPROVAL_DATE]))); + } } else { $this->setApprovalDate(new FHIRDate($data[self::FIELD_APPROVAL_DATE])); } @@ -628,6 +634,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_AUTHOR])) { if (is_array($data[self::FIELD_AUTHOR])) { foreach($data[self::FIELD_AUTHOR] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContactDetail) { $this->addAuthor($v); } else { @@ -643,6 +652,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CONTACT])) { if (is_array($data[self::FIELD_CONTACT])) { foreach($data[self::FIELD_CONTACT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContactDetail) { $this->addContact($v); } else { @@ -661,8 +673,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_COPYRIGHT] instanceof FHIRMarkdown) { $this->setCopyright($data[self::FIELD_COPYRIGHT]); - } elseif ($ext && is_scalar($data[self::FIELD_COPYRIGHT])) { - $this->setCopyright(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_COPYRIGHT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_COPYRIGHT])) { + $this->setCopyright(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_COPYRIGHT]] + $ext)); + } else if (is_array($data[self::FIELD_COPYRIGHT])) { + $this->setCopyright(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_COPYRIGHT]))); + } } else { $this->setCopyright(new FHIRMarkdown($data[self::FIELD_COPYRIGHT])); } @@ -673,8 +689,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATE] instanceof FHIRDateTime) { $this->setDate($data[self::FIELD_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_DATE])) { - $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime(array_merge($ext, $data[self::FIELD_DATE]))); + } } else { $this->setDate(new FHIRDateTime($data[self::FIELD_DATE])); } @@ -685,8 +705,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRMarkdown) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRMarkdown($data[self::FIELD_DESCRIPTION])); } @@ -694,6 +718,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_EDITOR])) { if (is_array($data[self::FIELD_EDITOR])) { foreach($data[self::FIELD_EDITOR] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContactDetail) { $this->addEditor($v); } else { @@ -716,6 +743,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ENDORSER])) { if (is_array($data[self::FIELD_ENDORSER])) { foreach($data[self::FIELD_ENDORSER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContactDetail) { $this->addEndorser($v); } else { @@ -734,8 +764,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EXPERIMENTAL] instanceof FHIRBoolean) { $this->setExperimental($data[self::FIELD_EXPERIMENTAL]); - } elseif ($ext && is_scalar($data[self::FIELD_EXPERIMENTAL])) { - $this->setExperimental(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_EXPERIMENTAL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EXPERIMENTAL])) { + $this->setExperimental(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_EXPERIMENTAL]] + $ext)); + } else if (is_array($data[self::FIELD_EXPERIMENTAL])) { + $this->setExperimental(new FHIRBoolean(array_merge($ext, $data[self::FIELD_EXPERIMENTAL]))); + } } else { $this->setExperimental(new FHIRBoolean($data[self::FIELD_EXPERIMENTAL])); } @@ -743,6 +777,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_GOAL])) { if (is_array($data[self::FIELD_GOAL])) { foreach($data[self::FIELD_GOAL] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRPlanDefinitionGoal) { $this->addGoal($v); } else { @@ -761,17 +798,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -780,6 +824,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_JURISDICTION])) { if (is_array($data[self::FIELD_JURISDICTION])) { foreach($data[self::FIELD_JURISDICTION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addJurisdiction($v); } else { @@ -798,8 +845,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_LAST_REVIEW_DATE] instanceof FHIRDate) { $this->setLastReviewDate($data[self::FIELD_LAST_REVIEW_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_LAST_REVIEW_DATE])) { - $this->setLastReviewDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_LAST_REVIEW_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_LAST_REVIEW_DATE])) { + $this->setLastReviewDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_LAST_REVIEW_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_LAST_REVIEW_DATE])) { + $this->setLastReviewDate(new FHIRDate(array_merge($ext, $data[self::FIELD_LAST_REVIEW_DATE]))); + } } else { $this->setLastReviewDate(new FHIRDate($data[self::FIELD_LAST_REVIEW_DATE])); } @@ -810,17 +861,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_LIBRARY])) { foreach($data[self::FIELD_LIBRARY] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCanonical) { $this->addLibrary($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addLibrary(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addLibrary(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addLibrary(new FHIRCanonical(array_merge($v, $ext[$i]))); + } } else { $this->addLibrary(new FHIRCanonical($v)); } } } elseif ($data[self::FIELD_LIBRARY] instanceof FHIRCanonical) { $this->addLibrary($data[self::FIELD_LIBRARY]); - } elseif ($ext && is_scalar($data[self::FIELD_LIBRARY])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_LIBRARY])) { $this->addLibrary(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $data[self::FIELD_LIBRARY]] + $ext)); } else { $this->addLibrary(new FHIRCanonical($data[self::FIELD_LIBRARY])); @@ -832,8 +890,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -844,8 +906,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PUBLISHER] instanceof FHIRString) { $this->setPublisher($data[self::FIELD_PUBLISHER]); - } elseif ($ext && is_scalar($data[self::FIELD_PUBLISHER])) { - $this->setPublisher(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PUBLISHER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PUBLISHER])) { + $this->setPublisher(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PUBLISHER]] + $ext)); + } else if (is_array($data[self::FIELD_PUBLISHER])) { + $this->setPublisher(new FHIRString(array_merge($ext, $data[self::FIELD_PUBLISHER]))); + } } else { $this->setPublisher(new FHIRString($data[self::FIELD_PUBLISHER])); } @@ -856,8 +922,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PURPOSE] instanceof FHIRMarkdown) { $this->setPurpose($data[self::FIELD_PURPOSE]); - } elseif ($ext && is_scalar($data[self::FIELD_PURPOSE])) { - $this->setPurpose(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_PURPOSE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PURPOSE])) { + $this->setPurpose(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_PURPOSE]] + $ext)); + } else if (is_array($data[self::FIELD_PURPOSE])) { + $this->setPurpose(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_PURPOSE]))); + } } else { $this->setPurpose(new FHIRMarkdown($data[self::FIELD_PURPOSE])); } @@ -865,6 +935,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_RELATED_ARTIFACT])) { if (is_array($data[self::FIELD_RELATED_ARTIFACT])) { foreach($data[self::FIELD_RELATED_ARTIFACT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRRelatedArtifact) { $this->addRelatedArtifact($v); } else { @@ -880,6 +953,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REVIEWER])) { if (is_array($data[self::FIELD_REVIEWER])) { foreach($data[self::FIELD_REVIEWER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContactDetail) { $this->addReviewer($v); } else { @@ -898,8 +974,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRPublicationStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRPublicationStatus([FHIRPublicationStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRPublicationStatus([FHIRPublicationStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRPublicationStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRPublicationStatus($data[self::FIELD_STATUS])); } @@ -924,8 +1004,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SUBTITLE] instanceof FHIRString) { $this->setSubtitle($data[self::FIELD_SUBTITLE]); - } elseif ($ext && is_scalar($data[self::FIELD_SUBTITLE])) { - $this->setSubtitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SUBTITLE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SUBTITLE])) { + $this->setSubtitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SUBTITLE]] + $ext)); + } else if (is_array($data[self::FIELD_SUBTITLE])) { + $this->setSubtitle(new FHIRString(array_merge($ext, $data[self::FIELD_SUBTITLE]))); + } } else { $this->setSubtitle(new FHIRString($data[self::FIELD_SUBTITLE])); } @@ -936,8 +1020,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TITLE] instanceof FHIRString) { $this->setTitle($data[self::FIELD_TITLE]); - } elseif ($ext && is_scalar($data[self::FIELD_TITLE])) { - $this->setTitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TITLE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TITLE])) { + $this->setTitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TITLE]] + $ext)); + } else if (is_array($data[self::FIELD_TITLE])) { + $this->setTitle(new FHIRString(array_merge($ext, $data[self::FIELD_TITLE]))); + } } else { $this->setTitle(new FHIRString($data[self::FIELD_TITLE])); } @@ -945,6 +1033,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_TOPIC])) { if (is_array($data[self::FIELD_TOPIC])) { foreach($data[self::FIELD_TOPIC] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addTopic($v); } else { @@ -970,8 +1061,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_URL] instanceof FHIRUri) { $this->setUrl($data[self::FIELD_URL]); - } elseif ($ext && is_scalar($data[self::FIELD_URL])) { - $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } else if (is_array($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri(array_merge($ext, $data[self::FIELD_URL]))); + } } else { $this->setUrl(new FHIRUri($data[self::FIELD_URL])); } @@ -982,8 +1077,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_USAGE] instanceof FHIRString) { $this->setUsage($data[self::FIELD_USAGE]); - } elseif ($ext && is_scalar($data[self::FIELD_USAGE])) { - $this->setUsage(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_USAGE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_USAGE])) { + $this->setUsage(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_USAGE]] + $ext)); + } else if (is_array($data[self::FIELD_USAGE])) { + $this->setUsage(new FHIRString(array_merge($ext, $data[self::FIELD_USAGE]))); + } } else { $this->setUsage(new FHIRString($data[self::FIELD_USAGE])); } @@ -991,6 +1090,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_USE_CONTEXT])) { if (is_array($data[self::FIELD_USE_CONTEXT])) { foreach($data[self::FIELD_USE_CONTEXT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRUsageContext) { $this->addUseContext($v); } else { @@ -1009,8 +1111,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VERSION] instanceof FHIRString) { $this->setVersion($data[self::FIELD_VERSION]); - } elseif ($ext && is_scalar($data[self::FIELD_VERSION])) { - $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } else if (is_array($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString(array_merge($ext, $data[self::FIELD_VERSION]))); + } } else { $this->setVersion(new FHIRString($data[self::FIELD_VERSION])); } @@ -2893,7 +2999,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getAction())) { foreach($vs as $v) { if (null === $v) { @@ -2902,10 +3007,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_ACTION, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getApprovalDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_APPROVAL_DATE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getAuthor())) { foreach($vs as $v) { if (null === $v) { @@ -2923,6 +3028,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_CONTACT, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getCopyright())) { $v->xmlSerialize($sxe->addChild(self::FIELD_COPYRIGHT, null, $v->_getFHIRXMLNamespace())); } @@ -2932,7 +3038,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESCRIPTION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getEditor())) { foreach($vs as $v) { if (null === $v) { @@ -2945,7 +3050,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getEffectivePeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EFFECTIVE_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getEndorser())) { foreach($vs as $v) { if (null === $v) { @@ -2954,10 +3058,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_ENDORSER, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getExperimental())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EXPERIMENTAL, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getGoal())) { foreach($vs as $v) { if (null === $v) { @@ -2984,6 +3088,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_JURISDICTION, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getLastReviewDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_LAST_REVIEW_DATE, null, $v->_getFHIRXMLNamespace())); } @@ -2995,6 +3100,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_LIBRARY, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NAME, null, $v->_getFHIRXMLNamespace())); } @@ -3004,7 +3110,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getPurpose())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PURPOSE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getRelatedArtifact())) { foreach($vs as $v) { if (null === $v) { @@ -3026,11 +3131,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSubjectCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBJECT_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSubjectReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBJECT_REFERENCE, null, $v->_getFHIRXMLNamespace())); } @@ -3040,7 +3143,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getTitle())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TITLE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getTopic())) { foreach($vs as $v) { if (null === $v) { @@ -3059,7 +3161,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getUsage())) { $v->xmlSerialize($sxe->addChild(self::FIELD_USAGE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getUseContext())) { foreach($vs as $v) { if (null === $v) { @@ -3068,6 +3169,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_USE_CONTEXT, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getVersion())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VERSION, null, $v->_getFHIRXMLNamespace())); } @@ -3084,8 +3186,15 @@ public function jsonSerialize() $a[self::FIELD_ACTION] = $vs; } if (null !== ($v = $this->getApprovalDate())) { - $a[self::FIELD_APPROVAL_DATE] = $v->getValue(); - $a[self::FIELD_APPROVAL_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_APPROVAL_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_APPROVAL_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_APPROVAL_DATE] = $v; + } } if ([] !== ($vs = $this->getAuthor())) { $a[self::FIELD_AUTHOR] = $vs; @@ -3094,16 +3203,37 @@ public function jsonSerialize() $a[self::FIELD_CONTACT] = $vs; } if (null !== ($v = $this->getCopyright())) { - $a[self::FIELD_COPYRIGHT] = $v->getValue(); - $a[self::FIELD_COPYRIGHT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_COPYRIGHT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_COPYRIGHT_EXT] = $enc; + } + } else { + $a[self::FIELD_COPYRIGHT] = $v; + } } if (null !== ($v = $this->getDate())) { - $a[self::FIELD_DATE] = $v->getValue(); - $a[self::FIELD_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_DATE] = $v; + } } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if ([] !== ($vs = $this->getEditor())) { $a[self::FIELD_EDITOR] = $vs; @@ -3115,21 +3245,51 @@ public function jsonSerialize() $a[self::FIELD_ENDORSER] = $vs; } if (null !== ($v = $this->getExperimental())) { - $a[self::FIELD_EXPERIMENTAL] = $v->getValue(); - $a[self::FIELD_EXPERIMENTAL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EXPERIMENTAL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EXPERIMENTAL_EXT] = $enc; + } + } else { + $a[self::FIELD_EXPERIMENTAL] = $v; + } } if ([] !== ($vs = $this->getGoal())) { $a[self::FIELD_GOAL] = $vs; } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if ([] !== ($vs = $this->getJurisdiction())) { $a[self::FIELD_JURISDICTION] = $vs; } if (null !== ($v = $this->getLastReviewDate())) { - $a[self::FIELD_LAST_REVIEW_DATE] = $v->getValue(); - $a[self::FIELD_LAST_REVIEW_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_LAST_REVIEW_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_LAST_REVIEW_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_LAST_REVIEW_DATE] = $v; + } } if ([] !== ($vs = $this->getLibrary())) { $a[self::FIELD_LIBRARY] = []; @@ -3137,21 +3297,51 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_LIBRARY][] = $v->getValue(); - $a[self::FIELD_LIBRARY_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_LIBRARY][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_LIBRARY_EXT][] = $enc; + } else { + $a[self::FIELD_LIBRARY_EXT][] = null; + } + } else { + $a[self::FIELD_LIBRARY][] = $v; + } } } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if (null !== ($v = $this->getPublisher())) { - $a[self::FIELD_PUBLISHER] = $v->getValue(); - $a[self::FIELD_PUBLISHER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PUBLISHER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PUBLISHER_EXT] = $enc; + } + } else { + $a[self::FIELD_PUBLISHER] = $v; + } } if (null !== ($v = $this->getPurpose())) { - $a[self::FIELD_PURPOSE] = $v->getValue(); - $a[self::FIELD_PURPOSE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PURPOSE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PURPOSE_EXT] = $enc; + } + } else { + $a[self::FIELD_PURPOSE] = $v; + } } if ([] !== ($vs = $this->getRelatedArtifact())) { $a[self::FIELD_RELATED_ARTIFACT] = $vs; @@ -3160,7 +3350,15 @@ public function jsonSerialize() $a[self::FIELD_REVIEWER] = $vs; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getSubjectCodeableConcept())) { $a[self::FIELD_SUBJECT_CODEABLE_CONCEPT] = $v; @@ -3169,12 +3367,26 @@ public function jsonSerialize() $a[self::FIELD_SUBJECT_REFERENCE] = $v; } if (null !== ($v = $this->getSubtitle())) { - $a[self::FIELD_SUBTITLE] = $v->getValue(); - $a[self::FIELD_SUBTITLE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SUBTITLE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SUBTITLE_EXT] = $enc; + } + } else { + $a[self::FIELD_SUBTITLE] = $v; + } } if (null !== ($v = $this->getTitle())) { - $a[self::FIELD_TITLE] = $v->getValue(); - $a[self::FIELD_TITLE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TITLE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TITLE_EXT] = $enc; + } + } else { + $a[self::FIELD_TITLE] = $v; + } } if ([] !== ($vs = $this->getTopic())) { $a[self::FIELD_TOPIC] = $vs; @@ -3183,19 +3395,40 @@ public function jsonSerialize() $a[self::FIELD_TYPE] = $v; } if (null !== ($v = $this->getUrl())) { - $a[self::FIELD_URL] = $v->getValue(); - $a[self::FIELD_URL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_URL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_URL_EXT] = $enc; + } + } else { + $a[self::FIELD_URL] = $v; + } } if (null !== ($v = $this->getUsage())) { - $a[self::FIELD_USAGE] = $v->getValue(); - $a[self::FIELD_USAGE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_USAGE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_USAGE_EXT] = $enc; + } + } else { + $a[self::FIELD_USAGE] = $v; + } } if ([] !== ($vs = $this->getUseContext())) { $a[self::FIELD_USE_CONTEXT] = $vs; } if (null !== ($v = $this->getVersion())) { - $a[self::FIELD_VERSION] = $v->getValue(); - $a[self::FIELD_VERSION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VERSION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VERSION_EXT] = $enc; + } + } else { + $a[self::FIELD_VERSION] = $v; + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRPractitioner.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRPractitioner.php index 02ca2326cc..a0379514a6 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRPractitioner.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRPractitioner.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -89,10 +89,6 @@ class FHIRPractitioner extends FHIRDomainResource implements PHPFHIRContainedTyp { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_PRACTITIONER; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ACTIVE = 'active'; const FIELD_ACTIVE_EXT = '_active'; const FIELD_ADDRESS = 'address'; @@ -230,6 +226,9 @@ class FHIRPractitioner extends FHIRDomainResource implements PHPFHIRContainedTyp */ protected $telecom = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRPractitioner Constructor * @param null|array $data @@ -252,8 +251,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ACTIVE] instanceof FHIRBoolean) { $this->setActive($data[self::FIELD_ACTIVE]); - } elseif ($ext && is_scalar($data[self::FIELD_ACTIVE])) { - $this->setActive(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_ACTIVE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ACTIVE])) { + $this->setActive(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_ACTIVE]] + $ext)); + } else if (is_array($data[self::FIELD_ACTIVE])) { + $this->setActive(new FHIRBoolean(array_merge($ext, $data[self::FIELD_ACTIVE]))); + } } else { $this->setActive(new FHIRBoolean($data[self::FIELD_ACTIVE])); } @@ -261,6 +264,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ADDRESS])) { if (is_array($data[self::FIELD_ADDRESS])) { foreach($data[self::FIELD_ADDRESS] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRAddress) { $this->addAddress($v); } else { @@ -279,8 +285,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_BIRTH_DATE] instanceof FHIRDate) { $this->setBirthDate($data[self::FIELD_BIRTH_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_BIRTH_DATE])) { - $this->setBirthDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_BIRTH_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_BIRTH_DATE])) { + $this->setBirthDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_BIRTH_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_BIRTH_DATE])) { + $this->setBirthDate(new FHIRDate(array_merge($ext, $data[self::FIELD_BIRTH_DATE]))); + } } else { $this->setBirthDate(new FHIRDate($data[self::FIELD_BIRTH_DATE])); } @@ -288,6 +298,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_COMMUNICATION])) { if (is_array($data[self::FIELD_COMMUNICATION])) { foreach($data[self::FIELD_COMMUNICATION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addCommunication($v); } else { @@ -306,8 +319,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_GENDER] instanceof FHIRAdministrativeGender) { $this->setGender($data[self::FIELD_GENDER]); - } elseif ($ext && is_scalar($data[self::FIELD_GENDER])) { - $this->setGender(new FHIRAdministrativeGender([FHIRAdministrativeGender::FIELD_VALUE => $data[self::FIELD_GENDER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_GENDER])) { + $this->setGender(new FHIRAdministrativeGender([FHIRAdministrativeGender::FIELD_VALUE => $data[self::FIELD_GENDER]] + $ext)); + } else if (is_array($data[self::FIELD_GENDER])) { + $this->setGender(new FHIRAdministrativeGender(array_merge($ext, $data[self::FIELD_GENDER]))); + } } else { $this->setGender(new FHIRAdministrativeGender($data[self::FIELD_GENDER])); } @@ -318,17 +335,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -337,6 +361,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_NAME])) { if (is_array($data[self::FIELD_NAME])) { foreach($data[self::FIELD_NAME] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRHumanName) { $this->addName($v); } else { @@ -352,6 +379,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PHOTO])) { if (is_array($data[self::FIELD_PHOTO])) { foreach($data[self::FIELD_PHOTO] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRAttachment) { $this->addPhoto($v); } else { @@ -367,6 +397,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_QUALIFICATION])) { if (is_array($data[self::FIELD_QUALIFICATION])) { foreach($data[self::FIELD_QUALIFICATION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRPractitionerQualification) { $this->addQualification($v); } else { @@ -385,17 +418,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_TELECOM])) { foreach($data[self::FIELD_TELECOM] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContactPoint) { $this->addTelecom($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addTelecom(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addTelecom(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addTelecom(new FHIRContactPoint(array_merge($v, $ext[$i]))); + } } else { $this->addTelecom(new FHIRContactPoint($v)); } } } elseif ($data[self::FIELD_TELECOM] instanceof FHIRContactPoint) { $this->addTelecom($data[self::FIELD_TELECOM]); - } elseif ($ext && is_scalar($data[self::FIELD_TELECOM])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_TELECOM])) { $this->addTelecom(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $data[self::FIELD_TELECOM]] + $ext)); } else { $this->addTelecom(new FHIRContactPoint($data[self::FIELD_TELECOM])); @@ -1095,7 +1135,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getActive())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ACTIVE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getAddress())) { foreach($vs as $v) { if (null === $v) { @@ -1104,10 +1143,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_ADDRESS, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getBirthDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_BIRTH_DATE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getCommunication())) { foreach($vs as $v) { if (null === $v) { @@ -1120,7 +1159,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getGender())) { $v->xmlSerialize($sxe->addChild(self::FIELD_GENDER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -1165,6 +1203,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_TELECOM, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } @@ -1175,24 +1214,62 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getActive())) { - $a[self::FIELD_ACTIVE] = $v->getValue(); - $a[self::FIELD_ACTIVE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ACTIVE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ACTIVE_EXT] = $enc; + } + } else { + $a[self::FIELD_ACTIVE] = $v; + } } if ([] !== ($vs = $this->getAddress())) { $a[self::FIELD_ADDRESS] = $vs; } if (null !== ($v = $this->getBirthDate())) { - $a[self::FIELD_BIRTH_DATE] = $v->getValue(); - $a[self::FIELD_BIRTH_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_BIRTH_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_BIRTH_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_BIRTH_DATE] = $v; + } } if ([] !== ($vs = $this->getCommunication())) { $a[self::FIELD_COMMUNICATION] = $vs; } if (null !== ($v = $this->getGender())) { - $a[self::FIELD_GENDER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_GENDER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_GENDER_EXT] = $enc; + } + } else { + $a[self::FIELD_GENDER] = $v; + } } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if ([] !== ($vs = $this->getName())) { $a[self::FIELD_NAME] = $vs; @@ -1204,7 +1281,23 @@ public function jsonSerialize() $a[self::FIELD_QUALIFICATION] = $vs; } if ([] !== ($vs = $this->getTelecom())) { - $a[self::FIELD_TELECOM] = $vs; + $a[self::FIELD_TELECOM] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TELECOM][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TELECOM_EXT][] = $enc; + } else { + $a[self::FIELD_TELECOM_EXT][] = null; + } + } else { + $a[self::FIELD_TELECOM][] = $v; + } + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRPractitionerRole.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRPractitionerRole.php index 77e6305cc5..7a0bf1e43e 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRPractitionerRole.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRPractitionerRole.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -88,10 +88,6 @@ class FHIRPractitionerRole extends FHIRDomainResource implements PHPFHIRContaine { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_PRACTITIONER_ROLE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ACTIVE = 'active'; const FIELD_ACTIVE_EXT = '_active'; const FIELD_AVAILABILITY_EXCEPTIONS = 'availabilityExceptions'; @@ -273,6 +269,9 @@ class FHIRPractitionerRole extends FHIRDomainResource implements PHPFHIRContaine */ protected $telecom = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRPractitionerRole Constructor * @param null|array $data @@ -295,8 +294,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ACTIVE] instanceof FHIRBoolean) { $this->setActive($data[self::FIELD_ACTIVE]); - } elseif ($ext && is_scalar($data[self::FIELD_ACTIVE])) { - $this->setActive(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_ACTIVE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ACTIVE])) { + $this->setActive(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_ACTIVE]] + $ext)); + } else if (is_array($data[self::FIELD_ACTIVE])) { + $this->setActive(new FHIRBoolean(array_merge($ext, $data[self::FIELD_ACTIVE]))); + } } else { $this->setActive(new FHIRBoolean($data[self::FIELD_ACTIVE])); } @@ -307,8 +310,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_AVAILABILITY_EXCEPTIONS] instanceof FHIRString) { $this->setAvailabilityExceptions($data[self::FIELD_AVAILABILITY_EXCEPTIONS]); - } elseif ($ext && is_scalar($data[self::FIELD_AVAILABILITY_EXCEPTIONS])) { - $this->setAvailabilityExceptions(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_AVAILABILITY_EXCEPTIONS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_AVAILABILITY_EXCEPTIONS])) { + $this->setAvailabilityExceptions(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_AVAILABILITY_EXCEPTIONS]] + $ext)); + } else if (is_array($data[self::FIELD_AVAILABILITY_EXCEPTIONS])) { + $this->setAvailabilityExceptions(new FHIRString(array_merge($ext, $data[self::FIELD_AVAILABILITY_EXCEPTIONS]))); + } } else { $this->setAvailabilityExceptions(new FHIRString($data[self::FIELD_AVAILABILITY_EXCEPTIONS])); } @@ -316,6 +323,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_AVAILABLE_TIME])) { if (is_array($data[self::FIELD_AVAILABLE_TIME])) { foreach($data[self::FIELD_AVAILABLE_TIME] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRPractitionerRoleAvailableTime) { $this->addAvailableTime($v); } else { @@ -331,6 +341,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CODE])) { if (is_array($data[self::FIELD_CODE])) { foreach($data[self::FIELD_CODE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addCode($v); } else { @@ -346,6 +359,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ENDPOINT])) { if (is_array($data[self::FIELD_ENDPOINT])) { foreach($data[self::FIELD_ENDPOINT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addEndpoint($v); } else { @@ -361,6 +377,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_HEALTHCARE_SERVICE])) { if (is_array($data[self::FIELD_HEALTHCARE_SERVICE])) { foreach($data[self::FIELD_HEALTHCARE_SERVICE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addHealthcareService($v); } else { @@ -379,17 +398,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -398,6 +424,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_LOCATION])) { if (is_array($data[self::FIELD_LOCATION])) { foreach($data[self::FIELD_LOCATION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addLocation($v); } else { @@ -413,6 +442,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_NOT_AVAILABLE])) { if (is_array($data[self::FIELD_NOT_AVAILABLE])) { foreach($data[self::FIELD_NOT_AVAILABLE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRPractitionerRoleNotAvailable) { $this->addNotAvailable($v); } else { @@ -449,6 +481,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SPECIALTY])) { if (is_array($data[self::FIELD_SPECIALTY])) { foreach($data[self::FIELD_SPECIALTY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addSpecialty($v); } else { @@ -467,17 +502,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_TELECOM])) { foreach($data[self::FIELD_TELECOM] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContactPoint) { $this->addTelecom($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addTelecom(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addTelecom(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addTelecom(new FHIRContactPoint(array_merge($v, $ext[$i]))); + } } else { $this->addTelecom(new FHIRContactPoint($v)); } } } elseif ($data[self::FIELD_TELECOM] instanceof FHIRContactPoint) { $this->addTelecom($data[self::FIELD_TELECOM]); - } elseif ($ext && is_scalar($data[self::FIELD_TELECOM])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_TELECOM])) { $this->addTelecom(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $data[self::FIELD_TELECOM]] + $ext)); } else { $this->addTelecom(new FHIRContactPoint($data[self::FIELD_TELECOM])); @@ -1356,7 +1398,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getAvailabilityExceptions())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AVAILABILITY_EXCEPTIONS, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getAvailableTime())) { foreach($vs as $v) { if (null === $v) { @@ -1423,15 +1464,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getOrganization())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ORGANIZATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPractitioner())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PRACTITIONER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getSpecialty())) { foreach($vs as $v) { if (null === $v) { @@ -1449,6 +1487,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_TELECOM, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } @@ -1459,12 +1498,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getActive())) { - $a[self::FIELD_ACTIVE] = $v->getValue(); - $a[self::FIELD_ACTIVE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ACTIVE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ACTIVE_EXT] = $enc; + } + } else { + $a[self::FIELD_ACTIVE] = $v; + } } if (null !== ($v = $this->getAvailabilityExceptions())) { - $a[self::FIELD_AVAILABILITY_EXCEPTIONS] = $v->getValue(); - $a[self::FIELD_AVAILABILITY_EXCEPTIONS_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_AVAILABILITY_EXCEPTIONS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_AVAILABILITY_EXCEPTIONS_EXT] = $enc; + } + } else { + $a[self::FIELD_AVAILABILITY_EXCEPTIONS] = $v; + } } if ([] !== ($vs = $this->getAvailableTime())) { $a[self::FIELD_AVAILABLE_TIME] = $vs; @@ -1479,7 +1532,23 @@ public function jsonSerialize() $a[self::FIELD_HEALTHCARE_SERVICE] = $vs; } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if ([] !== ($vs = $this->getLocation())) { $a[self::FIELD_LOCATION] = $vs; @@ -1500,7 +1569,23 @@ public function jsonSerialize() $a[self::FIELD_SPECIALTY] = $vs; } if ([] !== ($vs = $this->getTelecom())) { - $a[self::FIELD_TELECOM] = $vs; + $a[self::FIELD_TELECOM] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TELECOM][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TELECOM_EXT][] = $enc; + } else { + $a[self::FIELD_TELECOM_EXT][] = null; + } + } else { + $a[self::FIELD_TELECOM][] = $v; + } + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRProcedure.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRProcedure.php index 2b4779dcb2..94411b60f9 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRProcedure.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRProcedure.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -94,10 +94,6 @@ class FHIRProcedure extends FHIRDomainResource implements PHPFHIRContainedTypeIn { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_PROCEDURE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ASSERTER = 'asserter'; const FIELD_BASED_ON = 'basedOn'; const FIELD_BODY_SITE = 'bodySite'; @@ -119,6 +115,7 @@ class FHIRProcedure extends FHIRDomainResource implements PHPFHIRContainedTypeIn const FIELD_OUTCOME = 'outcome'; const FIELD_PART_OF = 'partOf'; const FIELD_PERFORMED_AGE = 'performedAge'; + const FIELD_PERFORMED_AGE_EXT = '_performedAge'; const FIELD_PERFORMED_DATE_TIME = 'performedDateTime'; const FIELD_PERFORMED_DATE_TIME_EXT = '_performedDateTime'; const FIELD_PERFORMED_PERIOD = 'performedPeriod'; @@ -540,6 +537,9 @@ class FHIRProcedure extends FHIRDomainResource implements PHPFHIRContainedTypeIn */ protected $usedReference = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRProcedure Constructor * @param null|array $data @@ -566,6 +566,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_BASED_ON])) { if (is_array($data[self::FIELD_BASED_ON])) { foreach($data[self::FIELD_BASED_ON] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addBasedOn($v); } else { @@ -581,6 +584,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_BODY_SITE])) { if (is_array($data[self::FIELD_BODY_SITE])) { foreach($data[self::FIELD_BODY_SITE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addBodySite($v); } else { @@ -610,6 +616,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_COMPLICATION])) { if (is_array($data[self::FIELD_COMPLICATION])) { foreach($data[self::FIELD_COMPLICATION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addComplication($v); } else { @@ -625,6 +634,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_COMPLICATION_DETAIL])) { if (is_array($data[self::FIELD_COMPLICATION_DETAIL])) { foreach($data[self::FIELD_COMPLICATION_DETAIL] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addComplicationDetail($v); } else { @@ -647,6 +659,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_FOCAL_DEVICE])) { if (is_array($data[self::FIELD_FOCAL_DEVICE])) { foreach($data[self::FIELD_FOCAL_DEVICE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRProcedureFocalDevice) { $this->addFocalDevice($v); } else { @@ -662,6 +677,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_FOLLOW_UP])) { if (is_array($data[self::FIELD_FOLLOW_UP])) { foreach($data[self::FIELD_FOLLOW_UP] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addFollowUp($v); } else { @@ -680,17 +698,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -702,17 +727,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_INSTANTIATES_CANONICAL])) { foreach($data[self::FIELD_INSTANTIATES_CANONICAL] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCanonical) { $this->addInstantiatesCanonical($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addInstantiatesCanonical(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addInstantiatesCanonical(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addInstantiatesCanonical(new FHIRCanonical(array_merge($v, $ext[$i]))); + } } else { $this->addInstantiatesCanonical(new FHIRCanonical($v)); } } } elseif ($data[self::FIELD_INSTANTIATES_CANONICAL] instanceof FHIRCanonical) { $this->addInstantiatesCanonical($data[self::FIELD_INSTANTIATES_CANONICAL]); - } elseif ($ext && is_scalar($data[self::FIELD_INSTANTIATES_CANONICAL])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_INSTANTIATES_CANONICAL])) { $this->addInstantiatesCanonical(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $data[self::FIELD_INSTANTIATES_CANONICAL]] + $ext)); } else { $this->addInstantiatesCanonical(new FHIRCanonical($data[self::FIELD_INSTANTIATES_CANONICAL])); @@ -724,17 +756,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_INSTANTIATES_URI])) { foreach($data[self::FIELD_INSTANTIATES_URI] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRUri) { $this->addInstantiatesUri($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addInstantiatesUri(new FHIRUri([FHIRUri::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addInstantiatesUri(new FHIRUri([FHIRUri::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addInstantiatesUri(new FHIRUri(array_merge($v, $ext[$i]))); + } } else { $this->addInstantiatesUri(new FHIRUri($v)); } } } elseif ($data[self::FIELD_INSTANTIATES_URI] instanceof FHIRUri) { $this->addInstantiatesUri($data[self::FIELD_INSTANTIATES_URI]); - } elseif ($ext && is_scalar($data[self::FIELD_INSTANTIATES_URI])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_INSTANTIATES_URI])) { $this->addInstantiatesUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_INSTANTIATES_URI]] + $ext)); } else { $this->addInstantiatesUri(new FHIRUri($data[self::FIELD_INSTANTIATES_URI])); @@ -750,6 +789,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_NOTE])) { if (is_array($data[self::FIELD_NOTE])) { foreach($data[self::FIELD_NOTE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRAnnotation) { $this->addNote($v); } else { @@ -772,6 +814,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PART_OF])) { if (is_array($data[self::FIELD_PART_OF])) { foreach($data[self::FIELD_PART_OF] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addPartOf($v); } else { @@ -785,8 +830,17 @@ public function __construct($data = null) } } if (isset($data[self::FIELD_PERFORMED_AGE])) { + $ext = (isset($data[self::FIELD_PERFORMED_AGE_EXT]) && is_array($data[self::FIELD_PERFORMED_AGE_EXT])) + ? $data[self::FIELD_PERFORMED_AGE_EXT] + : null; if ($data[self::FIELD_PERFORMED_AGE] instanceof FHIRAge) { $this->setPerformedAge($data[self::FIELD_PERFORMED_AGE]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PERFORMED_AGE])) { + $this->setPerformedAge(new FHIRAge([FHIRAge::FIELD_VALUE => $data[self::FIELD_PERFORMED_AGE]] + $ext)); + } else if (is_array($data[self::FIELD_PERFORMED_AGE])) { + $this->setPerformedAge(new FHIRAge(array_merge($ext, $data[self::FIELD_PERFORMED_AGE]))); + } } else { $this->setPerformedAge(new FHIRAge($data[self::FIELD_PERFORMED_AGE])); } @@ -797,8 +851,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PERFORMED_DATE_TIME] instanceof FHIRDateTime) { $this->setPerformedDateTime($data[self::FIELD_PERFORMED_DATE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_PERFORMED_DATE_TIME])) { - $this->setPerformedDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_PERFORMED_DATE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PERFORMED_DATE_TIME])) { + $this->setPerformedDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_PERFORMED_DATE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_PERFORMED_DATE_TIME])) { + $this->setPerformedDateTime(new FHIRDateTime(array_merge($ext, $data[self::FIELD_PERFORMED_DATE_TIME]))); + } } else { $this->setPerformedDateTime(new FHIRDateTime($data[self::FIELD_PERFORMED_DATE_TIME])); } @@ -823,8 +881,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PERFORMED_STRING] instanceof FHIRString) { $this->setPerformedString($data[self::FIELD_PERFORMED_STRING]); - } elseif ($ext && is_scalar($data[self::FIELD_PERFORMED_STRING])) { - $this->setPerformedString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PERFORMED_STRING]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PERFORMED_STRING])) { + $this->setPerformedString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PERFORMED_STRING]] + $ext)); + } else if (is_array($data[self::FIELD_PERFORMED_STRING])) { + $this->setPerformedString(new FHIRString(array_merge($ext, $data[self::FIELD_PERFORMED_STRING]))); + } } else { $this->setPerformedString(new FHIRString($data[self::FIELD_PERFORMED_STRING])); } @@ -832,6 +894,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PERFORMER])) { if (is_array($data[self::FIELD_PERFORMER])) { foreach($data[self::FIELD_PERFORMER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRProcedurePerformer) { $this->addPerformer($v); } else { @@ -847,6 +912,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REASON_CODE])) { if (is_array($data[self::FIELD_REASON_CODE])) { foreach($data[self::FIELD_REASON_CODE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addReasonCode($v); } else { @@ -862,6 +930,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REASON_REFERENCE])) { if (is_array($data[self::FIELD_REASON_REFERENCE])) { foreach($data[self::FIELD_REASON_REFERENCE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addReasonReference($v); } else { @@ -884,6 +955,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REPORT])) { if (is_array($data[self::FIELD_REPORT])) { foreach($data[self::FIELD_REPORT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addReport($v); } else { @@ -902,8 +976,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIREventStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIREventStatus([FHIREventStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIREventStatus([FHIREventStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIREventStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIREventStatus($data[self::FIELD_STATUS])); } @@ -925,6 +1003,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_USED_CODE])) { if (is_array($data[self::FIELD_USED_CODE])) { foreach($data[self::FIELD_USED_CODE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addUsedCode($v); } else { @@ -940,6 +1021,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_USED_REFERENCE])) { if (is_array($data[self::FIELD_USED_REFERENCE])) { foreach($data[self::FIELD_USED_REFERENCE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addUsedReference($v); } else { @@ -2763,11 +2847,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getAsserter())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ASSERTER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getBasedOn())) { foreach($vs as $v) { if (null === $v) { @@ -2789,11 +2871,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getCategory())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CATEGORY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getComplication())) { foreach($vs as $v) { if (null === $v) { @@ -2815,7 +2895,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getEncounter())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ENCOUNTER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getFocalDevice())) { foreach($vs as $v) { if (null === $v) { @@ -2842,6 +2921,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } } + if ([] !== ($vs = $this->getInstantiatesCanonical())) { foreach($vs as $v) { if (null === $v) { @@ -2850,6 +2930,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_INSTANTIATES_CANONICAL, null, $v->_getFHIRXMLNamespace())); } } + if ([] !== ($vs = $this->getInstantiatesUri())) { foreach($vs as $v) { if (null === $v) { @@ -2862,7 +2943,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getLocation())) { $v->xmlSerialize($sxe->addChild(self::FIELD_LOCATION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getNote())) { foreach($vs as $v) { if (null === $v) { @@ -2875,7 +2955,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getOutcome())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OUTCOME, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getPartOf())) { foreach($vs as $v) { if (null === $v) { @@ -2891,18 +2970,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getPerformedDateTime())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PERFORMED_DATE_TIME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPerformedPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PERFORMED_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPerformedRange())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PERFORMED_RANGE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getPerformedString())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PERFORMED_STRING, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getPerformer())) { foreach($vs as $v) { if (null === $v) { @@ -2933,7 +3009,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getRecorder())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RECORDER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getReport())) { foreach($vs as $v) { if (null === $v) { @@ -2946,15 +3021,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatusReason())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS_REASON, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSubject())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBJECT, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getUsedCode())) { foreach($vs as $v) { if (null === $v) { @@ -2972,6 +3044,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_USED_REFERENCE, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } @@ -3012,7 +3085,23 @@ public function jsonSerialize() $a[self::FIELD_FOLLOW_UP] = $vs; } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if ([] !== ($vs = $this->getInstantiatesCanonical())) { $a[self::FIELD_INSTANTIATES_CANONICAL] = []; @@ -3020,8 +3109,17 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_INSTANTIATES_CANONICAL][] = $v->getValue(); - $a[self::FIELD_INSTANTIATES_CANONICAL_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_INSTANTIATES_CANONICAL][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_INSTANTIATES_CANONICAL_EXT][] = $enc; + } else { + $a[self::FIELD_INSTANTIATES_CANONICAL_EXT][] = null; + } + } else { + $a[self::FIELD_INSTANTIATES_CANONICAL][] = $v; + } } } if ([] !== ($vs = $this->getInstantiatesUri())) { @@ -3030,8 +3128,17 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_INSTANTIATES_URI][] = $v->getValue(); - $a[self::FIELD_INSTANTIATES_URI_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_INSTANTIATES_URI][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_INSTANTIATES_URI_EXT][] = $enc; + } else { + $a[self::FIELD_INSTANTIATES_URI_EXT][] = null; + } + } else { + $a[self::FIELD_INSTANTIATES_URI][] = $v; + } } } if (null !== ($v = $this->getLocation())) { @@ -3047,11 +3154,26 @@ public function jsonSerialize() $a[self::FIELD_PART_OF] = $vs; } if (null !== ($v = $this->getPerformedAge())) { - $a[self::FIELD_PERFORMED_AGE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PERFORMED_AGE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PERFORMED_AGE_EXT] = $enc; + } + } else { + $a[self::FIELD_PERFORMED_AGE] = $v; + } } if (null !== ($v = $this->getPerformedDateTime())) { - $a[self::FIELD_PERFORMED_DATE_TIME] = $v->getValue(); - $a[self::FIELD_PERFORMED_DATE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PERFORMED_DATE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PERFORMED_DATE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_PERFORMED_DATE_TIME] = $v; + } } if (null !== ($v = $this->getPerformedPeriod())) { $a[self::FIELD_PERFORMED_PERIOD] = $v; @@ -3060,8 +3182,15 @@ public function jsonSerialize() $a[self::FIELD_PERFORMED_RANGE] = $v; } if (null !== ($v = $this->getPerformedString())) { - $a[self::FIELD_PERFORMED_STRING] = $v->getValue(); - $a[self::FIELD_PERFORMED_STRING_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PERFORMED_STRING] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PERFORMED_STRING_EXT] = $enc; + } + } else { + $a[self::FIELD_PERFORMED_STRING] = $v; + } } if ([] !== ($vs = $this->getPerformer())) { $a[self::FIELD_PERFORMER] = $vs; @@ -3079,7 +3208,15 @@ public function jsonSerialize() $a[self::FIELD_REPORT] = $vs; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getStatusReason())) { $a[self::FIELD_STATUS_REASON] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRProvenance.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRProvenance.php index 3663bc33bf..4d66132b39 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRProvenance.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRProvenance.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -95,10 +95,6 @@ class FHIRProvenance extends FHIRDomainResource implements PHPFHIRContainedTypeI { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_PROVENANCE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ACTIVITY = 'activity'; const FIELD_AGENT = 'agent'; const FIELD_ENTITY = 'entity'; @@ -269,6 +265,9 @@ class FHIRProvenance extends FHIRDomainResource implements PHPFHIRContainedTypeI */ protected $target = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRProvenance Constructor * @param null|array $data @@ -295,6 +294,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_AGENT])) { if (is_array($data[self::FIELD_AGENT])) { foreach($data[self::FIELD_AGENT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRProvenanceAgent) { $this->addAgent($v); } else { @@ -310,6 +312,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ENTITY])) { if (is_array($data[self::FIELD_ENTITY])) { foreach($data[self::FIELD_ENTITY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRProvenanceEntity) { $this->addEntity($v); } else { @@ -335,8 +340,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_OCCURRED_DATE_TIME] instanceof FHIRDateTime) { $this->setOccurredDateTime($data[self::FIELD_OCCURRED_DATE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_OCCURRED_DATE_TIME])) { - $this->setOccurredDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_OCCURRED_DATE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_OCCURRED_DATE_TIME])) { + $this->setOccurredDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_OCCURRED_DATE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_OCCURRED_DATE_TIME])) { + $this->setOccurredDateTime(new FHIRDateTime(array_merge($ext, $data[self::FIELD_OCCURRED_DATE_TIME]))); + } } else { $this->setOccurredDateTime(new FHIRDateTime($data[self::FIELD_OCCURRED_DATE_TIME])); } @@ -354,17 +363,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_POLICY])) { foreach($data[self::FIELD_POLICY] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRUri) { $this->addPolicy($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addPolicy(new FHIRUri([FHIRUri::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addPolicy(new FHIRUri([FHIRUri::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addPolicy(new FHIRUri(array_merge($v, $ext[$i]))); + } } else { $this->addPolicy(new FHIRUri($v)); } } } elseif ($data[self::FIELD_POLICY] instanceof FHIRUri) { $this->addPolicy($data[self::FIELD_POLICY]); - } elseif ($ext && is_scalar($data[self::FIELD_POLICY])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_POLICY])) { $this->addPolicy(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_POLICY]] + $ext)); } else { $this->addPolicy(new FHIRUri($data[self::FIELD_POLICY])); @@ -373,6 +389,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REASON])) { if (is_array($data[self::FIELD_REASON])) { foreach($data[self::FIELD_REASON] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addReason($v); } else { @@ -391,8 +410,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_RECORDED] instanceof FHIRInstant) { $this->setRecorded($data[self::FIELD_RECORDED]); - } elseif ($ext && is_scalar($data[self::FIELD_RECORDED])) { - $this->setRecorded(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_RECORDED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_RECORDED])) { + $this->setRecorded(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_RECORDED]] + $ext)); + } else if (is_array($data[self::FIELD_RECORDED])) { + $this->setRecorded(new FHIRInstant(array_merge($ext, $data[self::FIELD_RECORDED]))); + } } else { $this->setRecorded(new FHIRInstant($data[self::FIELD_RECORDED])); } @@ -400,6 +423,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SIGNATURE])) { if (is_array($data[self::FIELD_SIGNATURE])) { foreach($data[self::FIELD_SIGNATURE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRSignature) { $this->addSignature($v); } else { @@ -415,6 +441,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_TARGET])) { if (is_array($data[self::FIELD_TARGET])) { foreach($data[self::FIELD_TARGET] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addTarget($v); } else { @@ -1191,11 +1220,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getActivity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ACTIVITY, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getAgent())) { foreach($vs as $v) { if (null === $v) { @@ -1220,7 +1247,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getOccurredDateTime())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OCCURRED_DATE_TIME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOccurredPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OCCURRED_PERIOD, null, $v->_getFHIRXMLNamespace())); } @@ -1241,10 +1267,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_REASON, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getRecorded())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RECORDED, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getSignature())) { foreach($vs as $v) { if (null === $v) { @@ -1262,6 +1288,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_TARGET, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } @@ -1284,8 +1311,15 @@ public function jsonSerialize() $a[self::FIELD_LOCATION] = $v; } if (null !== ($v = $this->getOccurredDateTime())) { - $a[self::FIELD_OCCURRED_DATE_TIME] = $v->getValue(); - $a[self::FIELD_OCCURRED_DATE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_OCCURRED_DATE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_OCCURRED_DATE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_OCCURRED_DATE_TIME] = $v; + } } if (null !== ($v = $this->getOccurredPeriod())) { $a[self::FIELD_OCCURRED_PERIOD] = $v; @@ -1296,16 +1330,32 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_POLICY][] = $v->getValue(); - $a[self::FIELD_POLICY_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_POLICY][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_POLICY_EXT][] = $enc; + } else { + $a[self::FIELD_POLICY_EXT][] = null; + } + } else { + $a[self::FIELD_POLICY][] = $v; + } } } if ([] !== ($vs = $this->getReason())) { $a[self::FIELD_REASON] = $vs; } if (null !== ($v = $this->getRecorded())) { - $a[self::FIELD_RECORDED] = $v->getValue(); - $a[self::FIELD_RECORDED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_RECORDED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_RECORDED_EXT] = $enc; + } + } else { + $a[self::FIELD_RECORDED] = $v; + } } if ([] !== ($vs = $this->getSignature())) { $a[self::FIELD_SIGNATURE] = $vs; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRQuestionnaire.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRQuestionnaire.php index 86107c784f..b710a6f117 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRQuestionnaire.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRQuestionnaire.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -96,10 +96,6 @@ class FHIRQuestionnaire extends FHIRDomainResource implements PHPFHIRContainedTy { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_QUESTIONNAIRE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_APPROVAL_DATE = 'approvalDate'; const FIELD_APPROVAL_DATE_EXT = '_approvalDate'; const FIELD_CODE = 'code'; @@ -437,6 +433,9 @@ class FHIRQuestionnaire extends FHIRDomainResource implements PHPFHIRContainedTy */ protected $version = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRQuestionnaire Constructor * @param null|array $data @@ -459,8 +458,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_APPROVAL_DATE] instanceof FHIRDate) { $this->setApprovalDate($data[self::FIELD_APPROVAL_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_APPROVAL_DATE])) { - $this->setApprovalDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_APPROVAL_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_APPROVAL_DATE])) { + $this->setApprovalDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_APPROVAL_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_APPROVAL_DATE])) { + $this->setApprovalDate(new FHIRDate(array_merge($ext, $data[self::FIELD_APPROVAL_DATE]))); + } } else { $this->setApprovalDate(new FHIRDate($data[self::FIELD_APPROVAL_DATE])); } @@ -468,6 +471,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CODE])) { if (is_array($data[self::FIELD_CODE])) { foreach($data[self::FIELD_CODE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCoding) { $this->addCode($v); } else { @@ -483,6 +489,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CONTACT])) { if (is_array($data[self::FIELD_CONTACT])) { foreach($data[self::FIELD_CONTACT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContactDetail) { $this->addContact($v); } else { @@ -501,8 +510,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_COPYRIGHT] instanceof FHIRMarkdown) { $this->setCopyright($data[self::FIELD_COPYRIGHT]); - } elseif ($ext && is_scalar($data[self::FIELD_COPYRIGHT])) { - $this->setCopyright(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_COPYRIGHT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_COPYRIGHT])) { + $this->setCopyright(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_COPYRIGHT]] + $ext)); + } else if (is_array($data[self::FIELD_COPYRIGHT])) { + $this->setCopyright(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_COPYRIGHT]))); + } } else { $this->setCopyright(new FHIRMarkdown($data[self::FIELD_COPYRIGHT])); } @@ -513,8 +526,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATE] instanceof FHIRDateTime) { $this->setDate($data[self::FIELD_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_DATE])) { - $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime(array_merge($ext, $data[self::FIELD_DATE]))); + } } else { $this->setDate(new FHIRDateTime($data[self::FIELD_DATE])); } @@ -525,17 +542,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_DERIVED_FROM])) { foreach($data[self::FIELD_DERIVED_FROM] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCanonical) { $this->addDerivedFrom($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addDerivedFrom(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addDerivedFrom(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addDerivedFrom(new FHIRCanonical(array_merge($v, $ext[$i]))); + } } else { $this->addDerivedFrom(new FHIRCanonical($v)); } } } elseif ($data[self::FIELD_DERIVED_FROM] instanceof FHIRCanonical) { $this->addDerivedFrom($data[self::FIELD_DERIVED_FROM]); - } elseif ($ext && is_scalar($data[self::FIELD_DERIVED_FROM])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_DERIVED_FROM])) { $this->addDerivedFrom(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $data[self::FIELD_DERIVED_FROM]] + $ext)); } else { $this->addDerivedFrom(new FHIRCanonical($data[self::FIELD_DERIVED_FROM])); @@ -547,8 +571,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRMarkdown) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRMarkdown($data[self::FIELD_DESCRIPTION])); } @@ -566,8 +594,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EXPERIMENTAL] instanceof FHIRBoolean) { $this->setExperimental($data[self::FIELD_EXPERIMENTAL]); - } elseif ($ext && is_scalar($data[self::FIELD_EXPERIMENTAL])) { - $this->setExperimental(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_EXPERIMENTAL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EXPERIMENTAL])) { + $this->setExperimental(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_EXPERIMENTAL]] + $ext)); + } else if (is_array($data[self::FIELD_EXPERIMENTAL])) { + $this->setExperimental(new FHIRBoolean(array_merge($ext, $data[self::FIELD_EXPERIMENTAL]))); + } } else { $this->setExperimental(new FHIRBoolean($data[self::FIELD_EXPERIMENTAL])); } @@ -578,17 +610,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -597,6 +636,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ITEM])) { if (is_array($data[self::FIELD_ITEM])) { foreach($data[self::FIELD_ITEM] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRQuestionnaireItem) { $this->addItem($v); } else { @@ -612,6 +654,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_JURISDICTION])) { if (is_array($data[self::FIELD_JURISDICTION])) { foreach($data[self::FIELD_JURISDICTION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addJurisdiction($v); } else { @@ -630,8 +675,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_LAST_REVIEW_DATE] instanceof FHIRDate) { $this->setLastReviewDate($data[self::FIELD_LAST_REVIEW_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_LAST_REVIEW_DATE])) { - $this->setLastReviewDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_LAST_REVIEW_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_LAST_REVIEW_DATE])) { + $this->setLastReviewDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_LAST_REVIEW_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_LAST_REVIEW_DATE])) { + $this->setLastReviewDate(new FHIRDate(array_merge($ext, $data[self::FIELD_LAST_REVIEW_DATE]))); + } } else { $this->setLastReviewDate(new FHIRDate($data[self::FIELD_LAST_REVIEW_DATE])); } @@ -642,8 +691,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -654,8 +707,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PUBLISHER] instanceof FHIRString) { $this->setPublisher($data[self::FIELD_PUBLISHER]); - } elseif ($ext && is_scalar($data[self::FIELD_PUBLISHER])) { - $this->setPublisher(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PUBLISHER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PUBLISHER])) { + $this->setPublisher(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PUBLISHER]] + $ext)); + } else if (is_array($data[self::FIELD_PUBLISHER])) { + $this->setPublisher(new FHIRString(array_merge($ext, $data[self::FIELD_PUBLISHER]))); + } } else { $this->setPublisher(new FHIRString($data[self::FIELD_PUBLISHER])); } @@ -666,8 +723,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PURPOSE] instanceof FHIRMarkdown) { $this->setPurpose($data[self::FIELD_PURPOSE]); - } elseif ($ext && is_scalar($data[self::FIELD_PURPOSE])) { - $this->setPurpose(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_PURPOSE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PURPOSE])) { + $this->setPurpose(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_PURPOSE]] + $ext)); + } else if (is_array($data[self::FIELD_PURPOSE])) { + $this->setPurpose(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_PURPOSE]))); + } } else { $this->setPurpose(new FHIRMarkdown($data[self::FIELD_PURPOSE])); } @@ -678,8 +739,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRPublicationStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRPublicationStatus([FHIRPublicationStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRPublicationStatus([FHIRPublicationStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRPublicationStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRPublicationStatus($data[self::FIELD_STATUS])); } @@ -690,17 +755,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_SUBJECT_TYPE])) { foreach($data[self::FIELD_SUBJECT_TYPE] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCode) { $this->addSubjectType($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addSubjectType(new FHIRCode([FHIRCode::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addSubjectType(new FHIRCode([FHIRCode::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addSubjectType(new FHIRCode(array_merge($v, $ext[$i]))); + } } else { $this->addSubjectType(new FHIRCode($v)); } } } elseif ($data[self::FIELD_SUBJECT_TYPE] instanceof FHIRCode) { $this->addSubjectType($data[self::FIELD_SUBJECT_TYPE]); - } elseif ($ext && is_scalar($data[self::FIELD_SUBJECT_TYPE])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_SUBJECT_TYPE])) { $this->addSubjectType(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_SUBJECT_TYPE]] + $ext)); } else { $this->addSubjectType(new FHIRCode($data[self::FIELD_SUBJECT_TYPE])); @@ -712,8 +784,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TITLE] instanceof FHIRString) { $this->setTitle($data[self::FIELD_TITLE]); - } elseif ($ext && is_scalar($data[self::FIELD_TITLE])) { - $this->setTitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TITLE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TITLE])) { + $this->setTitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TITLE]] + $ext)); + } else if (is_array($data[self::FIELD_TITLE])) { + $this->setTitle(new FHIRString(array_merge($ext, $data[self::FIELD_TITLE]))); + } } else { $this->setTitle(new FHIRString($data[self::FIELD_TITLE])); } @@ -724,8 +800,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_URL] instanceof FHIRUri) { $this->setUrl($data[self::FIELD_URL]); - } elseif ($ext && is_scalar($data[self::FIELD_URL])) { - $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } else if (is_array($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri(array_merge($ext, $data[self::FIELD_URL]))); + } } else { $this->setUrl(new FHIRUri($data[self::FIELD_URL])); } @@ -733,6 +813,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_USE_CONTEXT])) { if (is_array($data[self::FIELD_USE_CONTEXT])) { foreach($data[self::FIELD_USE_CONTEXT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRUsageContext) { $this->addUseContext($v); } else { @@ -751,8 +834,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VERSION] instanceof FHIRString) { $this->setVersion($data[self::FIELD_VERSION]); - } elseif ($ext && is_scalar($data[self::FIELD_VERSION])) { - $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } else if (is_array($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString(array_merge($ext, $data[self::FIELD_VERSION]))); + } } else { $this->setVersion(new FHIRString($data[self::FIELD_VERSION])); } @@ -2102,7 +2189,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getApprovalDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_APPROVAL_DATE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getCode())) { foreach($vs as $v) { if (null === $v) { @@ -2120,6 +2206,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_CONTACT, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getCopyright())) { $v->xmlSerialize($sxe->addChild(self::FIELD_COPYRIGHT, null, $v->_getFHIRXMLNamespace())); } @@ -2134,17 +2221,16 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_DERIVED_FROM, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getDescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESCRIPTION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getEffectivePeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EFFECTIVE_PERIOD, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getExperimental())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EXPERIMENTAL, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -2171,6 +2257,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_JURISDICTION, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getLastReviewDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_LAST_REVIEW_DATE, null, $v->_getFHIRXMLNamespace())); } @@ -2183,7 +2270,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getPurpose())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PURPOSE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } @@ -2195,13 +2281,13 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_SUBJECT_TYPE, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getTitle())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TITLE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getUrl())) { $v->xmlSerialize($sxe->addChild(self::FIELD_URL, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getUseContext())) { foreach($vs as $v) { if (null === $v) { @@ -2210,6 +2296,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_USE_CONTEXT, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getVersion())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VERSION, null, $v->_getFHIRXMLNamespace())); } @@ -2223,8 +2310,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getApprovalDate())) { - $a[self::FIELD_APPROVAL_DATE] = $v->getValue(); - $a[self::FIELD_APPROVAL_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_APPROVAL_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_APPROVAL_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_APPROVAL_DATE] = $v; + } } if ([] !== ($vs = $this->getCode())) { $a[self::FIELD_CODE] = $vs; @@ -2233,12 +2327,26 @@ public function jsonSerialize() $a[self::FIELD_CONTACT] = $vs; } if (null !== ($v = $this->getCopyright())) { - $a[self::FIELD_COPYRIGHT] = $v->getValue(); - $a[self::FIELD_COPYRIGHT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_COPYRIGHT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_COPYRIGHT_EXT] = $enc; + } + } else { + $a[self::FIELD_COPYRIGHT] = $v; + } } if (null !== ($v = $this->getDate())) { - $a[self::FIELD_DATE] = $v->getValue(); - $a[self::FIELD_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_DATE] = $v; + } } if ([] !== ($vs = $this->getDerivedFrom())) { $a[self::FIELD_DERIVED_FROM] = []; @@ -2246,23 +2354,62 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_DERIVED_FROM][] = $v->getValue(); - $a[self::FIELD_DERIVED_FROM_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DERIVED_FROM][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DERIVED_FROM_EXT][] = $enc; + } else { + $a[self::FIELD_DERIVED_FROM_EXT][] = null; + } + } else { + $a[self::FIELD_DERIVED_FROM][] = $v; + } } } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if (null !== ($v = $this->getEffectivePeriod())) { $a[self::FIELD_EFFECTIVE_PERIOD] = $v; } if (null !== ($v = $this->getExperimental())) { - $a[self::FIELD_EXPERIMENTAL] = $v->getValue(); - $a[self::FIELD_EXPERIMENTAL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EXPERIMENTAL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EXPERIMENTAL_EXT] = $enc; + } + } else { + $a[self::FIELD_EXPERIMENTAL] = $v; + } } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if ([] !== ($vs = $this->getItem())) { $a[self::FIELD_ITEM] = $vs; @@ -2271,23 +2418,59 @@ public function jsonSerialize() $a[self::FIELD_JURISDICTION] = $vs; } if (null !== ($v = $this->getLastReviewDate())) { - $a[self::FIELD_LAST_REVIEW_DATE] = $v->getValue(); - $a[self::FIELD_LAST_REVIEW_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_LAST_REVIEW_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_LAST_REVIEW_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_LAST_REVIEW_DATE] = $v; + } } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if (null !== ($v = $this->getPublisher())) { - $a[self::FIELD_PUBLISHER] = $v->getValue(); - $a[self::FIELD_PUBLISHER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PUBLISHER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PUBLISHER_EXT] = $enc; + } + } else { + $a[self::FIELD_PUBLISHER] = $v; + } } if (null !== ($v = $this->getPurpose())) { - $a[self::FIELD_PURPOSE] = $v->getValue(); - $a[self::FIELD_PURPOSE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PURPOSE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PURPOSE_EXT] = $enc; + } + } else { + $a[self::FIELD_PURPOSE] = $v; + } } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if ([] !== ($vs = $this->getSubjectType())) { $a[self::FIELD_SUBJECT_TYPE] = []; @@ -2295,24 +2478,54 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_SUBJECT_TYPE][] = $v->getValue(); - $a[self::FIELD_SUBJECT_TYPE_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SUBJECT_TYPE][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SUBJECT_TYPE_EXT][] = $enc; + } else { + $a[self::FIELD_SUBJECT_TYPE_EXT][] = null; + } + } else { + $a[self::FIELD_SUBJECT_TYPE][] = $v; + } } } if (null !== ($v = $this->getTitle())) { - $a[self::FIELD_TITLE] = $v->getValue(); - $a[self::FIELD_TITLE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TITLE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TITLE_EXT] = $enc; + } + } else { + $a[self::FIELD_TITLE] = $v; + } } if (null !== ($v = $this->getUrl())) { - $a[self::FIELD_URL] = $v->getValue(); - $a[self::FIELD_URL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_URL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_URL_EXT] = $enc; + } + } else { + $a[self::FIELD_URL] = $v; + } } if ([] !== ($vs = $this->getUseContext())) { $a[self::FIELD_USE_CONTEXT] = $vs; } if (null !== ($v = $this->getVersion())) { - $a[self::FIELD_VERSION] = $v->getValue(); - $a[self::FIELD_VERSION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VERSION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VERSION_EXT] = $enc; + } + } else { + $a[self::FIELD_VERSION] = $v; + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRQuestionnaireResponse.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRQuestionnaireResponse.php index 0207783c06..c090d60781 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRQuestionnaireResponse.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRQuestionnaireResponse.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -86,10 +86,6 @@ class FHIRQuestionnaireResponse extends FHIRDomainResource implements PHPFHIRCon { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_QUESTIONNAIRE_RESPONSE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_AUTHOR = 'author'; const FIELD_AUTHORED = 'authored'; const FIELD_AUTHORED_EXT = '_authored'; @@ -242,6 +238,9 @@ class FHIRQuestionnaireResponse extends FHIRDomainResource implements PHPFHIRCon */ protected $subject = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRQuestionnaireResponse Constructor * @param null|array $data @@ -271,8 +270,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_AUTHORED] instanceof FHIRDateTime) { $this->setAuthored($data[self::FIELD_AUTHORED]); - } elseif ($ext && is_scalar($data[self::FIELD_AUTHORED])) { - $this->setAuthored(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_AUTHORED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_AUTHORED])) { + $this->setAuthored(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_AUTHORED]] + $ext)); + } else if (is_array($data[self::FIELD_AUTHORED])) { + $this->setAuthored(new FHIRDateTime(array_merge($ext, $data[self::FIELD_AUTHORED]))); + } } else { $this->setAuthored(new FHIRDateTime($data[self::FIELD_AUTHORED])); } @@ -280,6 +283,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_BASED_ON])) { if (is_array($data[self::FIELD_BASED_ON])) { foreach($data[self::FIELD_BASED_ON] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addBasedOn($v); } else { @@ -305,8 +311,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->setIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { - $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_IDENTIFIER]))); + } } else { $this->setIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); } @@ -314,6 +324,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ITEM])) { if (is_array($data[self::FIELD_ITEM])) { foreach($data[self::FIELD_ITEM] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRQuestionnaireResponseItem) { $this->addItem($v); } else { @@ -329,6 +342,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PART_OF])) { if (is_array($data[self::FIELD_PART_OF])) { foreach($data[self::FIELD_PART_OF] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addPartOf($v); } else { @@ -347,8 +363,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_QUESTIONNAIRE] instanceof FHIRCanonical) { $this->setQuestionnaire($data[self::FIELD_QUESTIONNAIRE]); - } elseif ($ext && is_scalar($data[self::FIELD_QUESTIONNAIRE])) { - $this->setQuestionnaire(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $data[self::FIELD_QUESTIONNAIRE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_QUESTIONNAIRE])) { + $this->setQuestionnaire(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $data[self::FIELD_QUESTIONNAIRE]] + $ext)); + } else if (is_array($data[self::FIELD_QUESTIONNAIRE])) { + $this->setQuestionnaire(new FHIRCanonical(array_merge($ext, $data[self::FIELD_QUESTIONNAIRE]))); + } } else { $this->setQuestionnaire(new FHIRCanonical($data[self::FIELD_QUESTIONNAIRE])); } @@ -366,8 +386,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRQuestionnaireResponseStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRQuestionnaireResponseStatus([FHIRQuestionnaireResponseStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRQuestionnaireResponseStatus([FHIRQuestionnaireResponseStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRQuestionnaireResponseStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRQuestionnaireResponseStatus($data[self::FIELD_STATUS])); } @@ -992,14 +1016,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getAuthor())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AUTHOR, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getAuthored())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AUTHORED, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getBasedOn())) { foreach($vs as $v) { if (null === $v) { @@ -1012,11 +1034,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getEncounter())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ENCOUNTER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getItem())) { foreach($vs as $v) { if (null === $v) { @@ -1034,18 +1054,16 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_PART_OF, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getQuestionnaire())) { $v->xmlSerialize($sxe->addChild(self::FIELD_QUESTIONNAIRE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSource())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SOURCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSubject())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBJECT, null, $v->_getFHIRXMLNamespace())); } @@ -1062,8 +1080,15 @@ public function jsonSerialize() $a[self::FIELD_AUTHOR] = $v; } if (null !== ($v = $this->getAuthored())) { - $a[self::FIELD_AUTHORED] = $v->getValue(); - $a[self::FIELD_AUTHORED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_AUTHORED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_AUTHORED_EXT] = $enc; + } + } else { + $a[self::FIELD_AUTHORED] = $v; + } } if ([] !== ($vs = $this->getBasedOn())) { $a[self::FIELD_BASED_ON] = $vs; @@ -1072,7 +1097,15 @@ public function jsonSerialize() $a[self::FIELD_ENCOUNTER] = $v; } if (null !== ($v = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_IDENTIFIER] = $v; + } } if ([] !== ($vs = $this->getItem())) { $a[self::FIELD_ITEM] = $vs; @@ -1081,14 +1114,29 @@ public function jsonSerialize() $a[self::FIELD_PART_OF] = $vs; } if (null !== ($v = $this->getQuestionnaire())) { - $a[self::FIELD_QUESTIONNAIRE] = $v->getValue(); - $a[self::FIELD_QUESTIONNAIRE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_QUESTIONNAIRE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_QUESTIONNAIRE_EXT] = $enc; + } + } else { + $a[self::FIELD_QUESTIONNAIRE] = $v; + } } if (null !== ($v = $this->getSource())) { $a[self::FIELD_SOURCE] = $v; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getSubject())) { $a[self::FIELD_SUBJECT] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRRelatedPerson.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRRelatedPerson.php index 7cbcb19099..8a13612be1 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRRelatedPerson.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRRelatedPerson.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -92,10 +92,6 @@ class FHIRRelatedPerson extends FHIRDomainResource implements PHPFHIRContainedTy { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_RELATED_PERSON; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ACTIVE = 'active'; const FIELD_ACTIVE_EXT = '_active'; const FIELD_ADDRESS = 'address'; @@ -253,6 +249,9 @@ class FHIRRelatedPerson extends FHIRDomainResource implements PHPFHIRContainedTy */ protected $telecom = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRRelatedPerson Constructor * @param null|array $data @@ -275,8 +274,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ACTIVE] instanceof FHIRBoolean) { $this->setActive($data[self::FIELD_ACTIVE]); - } elseif ($ext && is_scalar($data[self::FIELD_ACTIVE])) { - $this->setActive(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_ACTIVE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ACTIVE])) { + $this->setActive(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_ACTIVE]] + $ext)); + } else if (is_array($data[self::FIELD_ACTIVE])) { + $this->setActive(new FHIRBoolean(array_merge($ext, $data[self::FIELD_ACTIVE]))); + } } else { $this->setActive(new FHIRBoolean($data[self::FIELD_ACTIVE])); } @@ -284,6 +287,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ADDRESS])) { if (is_array($data[self::FIELD_ADDRESS])) { foreach($data[self::FIELD_ADDRESS] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRAddress) { $this->addAddress($v); } else { @@ -302,8 +308,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_BIRTH_DATE] instanceof FHIRDate) { $this->setBirthDate($data[self::FIELD_BIRTH_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_BIRTH_DATE])) { - $this->setBirthDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_BIRTH_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_BIRTH_DATE])) { + $this->setBirthDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_BIRTH_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_BIRTH_DATE])) { + $this->setBirthDate(new FHIRDate(array_merge($ext, $data[self::FIELD_BIRTH_DATE]))); + } } else { $this->setBirthDate(new FHIRDate($data[self::FIELD_BIRTH_DATE])); } @@ -311,6 +321,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_COMMUNICATION])) { if (is_array($data[self::FIELD_COMMUNICATION])) { foreach($data[self::FIELD_COMMUNICATION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRRelatedPersonCommunication) { $this->addCommunication($v); } else { @@ -329,8 +342,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_GENDER] instanceof FHIRAdministrativeGender) { $this->setGender($data[self::FIELD_GENDER]); - } elseif ($ext && is_scalar($data[self::FIELD_GENDER])) { - $this->setGender(new FHIRAdministrativeGender([FHIRAdministrativeGender::FIELD_VALUE => $data[self::FIELD_GENDER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_GENDER])) { + $this->setGender(new FHIRAdministrativeGender([FHIRAdministrativeGender::FIELD_VALUE => $data[self::FIELD_GENDER]] + $ext)); + } else if (is_array($data[self::FIELD_GENDER])) { + $this->setGender(new FHIRAdministrativeGender(array_merge($ext, $data[self::FIELD_GENDER]))); + } } else { $this->setGender(new FHIRAdministrativeGender($data[self::FIELD_GENDER])); } @@ -341,17 +358,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -360,6 +384,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_NAME])) { if (is_array($data[self::FIELD_NAME])) { foreach($data[self::FIELD_NAME] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRHumanName) { $this->addName($v); } else { @@ -389,6 +416,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PHOTO])) { if (is_array($data[self::FIELD_PHOTO])) { foreach($data[self::FIELD_PHOTO] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRAttachment) { $this->addPhoto($v); } else { @@ -404,6 +434,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_RELATIONSHIP])) { if (is_array($data[self::FIELD_RELATIONSHIP])) { foreach($data[self::FIELD_RELATIONSHIP] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addRelationship($v); } else { @@ -422,17 +455,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_TELECOM])) { foreach($data[self::FIELD_TELECOM] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContactPoint) { $this->addTelecom($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addTelecom(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addTelecom(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addTelecom(new FHIRContactPoint(array_merge($v, $ext[$i]))); + } } else { $this->addTelecom(new FHIRContactPoint($v)); } } } elseif ($data[self::FIELD_TELECOM] instanceof FHIRContactPoint) { $this->addTelecom($data[self::FIELD_TELECOM]); - } elseif ($ext && is_scalar($data[self::FIELD_TELECOM])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_TELECOM])) { $this->addTelecom(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $data[self::FIELD_TELECOM]] + $ext)); } else { $this->addTelecom(new FHIRContactPoint($data[self::FIELD_TELECOM])); @@ -1185,7 +1225,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getActive())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ACTIVE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getAddress())) { foreach($vs as $v) { if (null === $v) { @@ -1194,10 +1233,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_ADDRESS, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getBirthDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_BIRTH_DATE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getCommunication())) { foreach($vs as $v) { if (null === $v) { @@ -1210,7 +1249,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getGender())) { $v->xmlSerialize($sxe->addChild(self::FIELD_GENDER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -1232,11 +1270,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getPatient())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATIENT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getPhoto())) { foreach($vs as $v) { if (null === $v) { @@ -1263,6 +1299,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_TELECOM, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } @@ -1273,24 +1310,62 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getActive())) { - $a[self::FIELD_ACTIVE] = $v->getValue(); - $a[self::FIELD_ACTIVE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ACTIVE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ACTIVE_EXT] = $enc; + } + } else { + $a[self::FIELD_ACTIVE] = $v; + } } if ([] !== ($vs = $this->getAddress())) { $a[self::FIELD_ADDRESS] = $vs; } if (null !== ($v = $this->getBirthDate())) { - $a[self::FIELD_BIRTH_DATE] = $v->getValue(); - $a[self::FIELD_BIRTH_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_BIRTH_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_BIRTH_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_BIRTH_DATE] = $v; + } } if ([] !== ($vs = $this->getCommunication())) { $a[self::FIELD_COMMUNICATION] = $vs; } if (null !== ($v = $this->getGender())) { - $a[self::FIELD_GENDER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_GENDER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_GENDER_EXT] = $enc; + } + } else { + $a[self::FIELD_GENDER] = $v; + } } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if ([] !== ($vs = $this->getName())) { $a[self::FIELD_NAME] = $vs; @@ -1308,7 +1383,23 @@ public function jsonSerialize() $a[self::FIELD_RELATIONSHIP] = $vs; } if ([] !== ($vs = $this->getTelecom())) { - $a[self::FIELD_TELECOM] = $vs; + $a[self::FIELD_TELECOM] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TELECOM][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TELECOM_EXT][] = $enc; + } else { + $a[self::FIELD_TELECOM_EXT][] = null; + } + } else { + $a[self::FIELD_TELECOM][] = $v; + } + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRRequestGroup.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRRequestGroup.php index 8eba83e47e..0ec67c2758 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRRequestGroup.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRRequestGroup.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -90,10 +90,6 @@ class FHIRRequestGroup extends FHIRDomainResource implements PHPFHIRContainedTyp { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_REQUEST_GROUP; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ACTION = 'action'; const FIELD_AUTHOR = 'author'; const FIELD_AUTHORED_ON = 'authoredOn'; @@ -333,6 +329,9 @@ class FHIRRequestGroup extends FHIRDomainResource implements PHPFHIRContainedTyp */ protected $subject = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRRequestGroup Constructor * @param null|array $data @@ -352,6 +351,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ACTION])) { if (is_array($data[self::FIELD_ACTION])) { foreach($data[self::FIELD_ACTION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRRequestGroupAction) { $this->addAction($v); } else { @@ -377,8 +379,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_AUTHORED_ON] instanceof FHIRDateTime) { $this->setAuthoredOn($data[self::FIELD_AUTHORED_ON]); - } elseif ($ext && is_scalar($data[self::FIELD_AUTHORED_ON])) { - $this->setAuthoredOn(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_AUTHORED_ON]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_AUTHORED_ON])) { + $this->setAuthoredOn(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_AUTHORED_ON]] + $ext)); + } else if (is_array($data[self::FIELD_AUTHORED_ON])) { + $this->setAuthoredOn(new FHIRDateTime(array_merge($ext, $data[self::FIELD_AUTHORED_ON]))); + } } else { $this->setAuthoredOn(new FHIRDateTime($data[self::FIELD_AUTHORED_ON])); } @@ -386,6 +392,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_BASED_ON])) { if (is_array($data[self::FIELD_BASED_ON])) { foreach($data[self::FIELD_BASED_ON] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addBasedOn($v); } else { @@ -418,8 +427,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_GROUP_IDENTIFIER] instanceof FHIRIdentifier) { $this->setGroupIdentifier($data[self::FIELD_GROUP_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_GROUP_IDENTIFIER])) { - $this->setGroupIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_GROUP_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_GROUP_IDENTIFIER])) { + $this->setGroupIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_GROUP_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_GROUP_IDENTIFIER])) { + $this->setGroupIdentifier(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_GROUP_IDENTIFIER]))); + } } else { $this->setGroupIdentifier(new FHIRIdentifier($data[self::FIELD_GROUP_IDENTIFIER])); } @@ -430,17 +443,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -452,17 +472,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_INSTANTIATES_CANONICAL])) { foreach($data[self::FIELD_INSTANTIATES_CANONICAL] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCanonical) { $this->addInstantiatesCanonical($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addInstantiatesCanonical(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addInstantiatesCanonical(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addInstantiatesCanonical(new FHIRCanonical(array_merge($v, $ext[$i]))); + } } else { $this->addInstantiatesCanonical(new FHIRCanonical($v)); } } } elseif ($data[self::FIELD_INSTANTIATES_CANONICAL] instanceof FHIRCanonical) { $this->addInstantiatesCanonical($data[self::FIELD_INSTANTIATES_CANONICAL]); - } elseif ($ext && is_scalar($data[self::FIELD_INSTANTIATES_CANONICAL])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_INSTANTIATES_CANONICAL])) { $this->addInstantiatesCanonical(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $data[self::FIELD_INSTANTIATES_CANONICAL]] + $ext)); } else { $this->addInstantiatesCanonical(new FHIRCanonical($data[self::FIELD_INSTANTIATES_CANONICAL])); @@ -474,17 +501,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_INSTANTIATES_URI])) { foreach($data[self::FIELD_INSTANTIATES_URI] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRUri) { $this->addInstantiatesUri($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addInstantiatesUri(new FHIRUri([FHIRUri::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addInstantiatesUri(new FHIRUri([FHIRUri::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addInstantiatesUri(new FHIRUri(array_merge($v, $ext[$i]))); + } } else { $this->addInstantiatesUri(new FHIRUri($v)); } } } elseif ($data[self::FIELD_INSTANTIATES_URI] instanceof FHIRUri) { $this->addInstantiatesUri($data[self::FIELD_INSTANTIATES_URI]); - } elseif ($ext && is_scalar($data[self::FIELD_INSTANTIATES_URI])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_INSTANTIATES_URI])) { $this->addInstantiatesUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_INSTANTIATES_URI]] + $ext)); } else { $this->addInstantiatesUri(new FHIRUri($data[self::FIELD_INSTANTIATES_URI])); @@ -496,8 +530,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_INTENT] instanceof FHIRRequestIntent) { $this->setIntent($data[self::FIELD_INTENT]); - } elseif ($ext && is_scalar($data[self::FIELD_INTENT])) { - $this->setIntent(new FHIRRequestIntent([FHIRRequestIntent::FIELD_VALUE => $data[self::FIELD_INTENT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_INTENT])) { + $this->setIntent(new FHIRRequestIntent([FHIRRequestIntent::FIELD_VALUE => $data[self::FIELD_INTENT]] + $ext)); + } else if (is_array($data[self::FIELD_INTENT])) { + $this->setIntent(new FHIRRequestIntent(array_merge($ext, $data[self::FIELD_INTENT]))); + } } else { $this->setIntent(new FHIRRequestIntent($data[self::FIELD_INTENT])); } @@ -505,6 +543,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_NOTE])) { if (is_array($data[self::FIELD_NOTE])) { foreach($data[self::FIELD_NOTE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRAnnotation) { $this->addNote($v); } else { @@ -523,8 +564,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PRIORITY] instanceof FHIRRequestPriority) { $this->setPriority($data[self::FIELD_PRIORITY]); - } elseif ($ext && is_scalar($data[self::FIELD_PRIORITY])) { - $this->setPriority(new FHIRRequestPriority([FHIRRequestPriority::FIELD_VALUE => $data[self::FIELD_PRIORITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PRIORITY])) { + $this->setPriority(new FHIRRequestPriority([FHIRRequestPriority::FIELD_VALUE => $data[self::FIELD_PRIORITY]] + $ext)); + } else if (is_array($data[self::FIELD_PRIORITY])) { + $this->setPriority(new FHIRRequestPriority(array_merge($ext, $data[self::FIELD_PRIORITY]))); + } } else { $this->setPriority(new FHIRRequestPriority($data[self::FIELD_PRIORITY])); } @@ -532,6 +577,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REASON_CODE])) { if (is_array($data[self::FIELD_REASON_CODE])) { foreach($data[self::FIELD_REASON_CODE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addReasonCode($v); } else { @@ -547,6 +595,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REASON_REFERENCE])) { if (is_array($data[self::FIELD_REASON_REFERENCE])) { foreach($data[self::FIELD_REASON_REFERENCE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addReasonReference($v); } else { @@ -562,6 +613,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REPLACES])) { if (is_array($data[self::FIELD_REPLACES])) { foreach($data[self::FIELD_REPLACES] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addReplaces($v); } else { @@ -580,8 +634,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRRequestStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRRequestStatus([FHIRRequestStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRRequestStatus([FHIRRequestStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRRequestStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRRequestStatus($data[self::FIELD_STATUS])); } @@ -1614,7 +1672,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getAction())) { foreach($vs as $v) { if (null === $v) { @@ -1630,7 +1687,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getAuthoredOn())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AUTHORED_ON, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getBasedOn())) { foreach($vs as $v) { if (null === $v) { @@ -1643,15 +1699,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getEncounter())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ENCOUNTER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getGroupIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_GROUP_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -1660,6 +1713,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } } + if ([] !== ($vs = $this->getInstantiatesCanonical())) { foreach($vs as $v) { if (null === $v) { @@ -1668,6 +1722,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_INSTANTIATES_CANONICAL, null, $v->_getFHIRXMLNamespace())); } } + if ([] !== ($vs = $this->getInstantiatesUri())) { foreach($vs as $v) { if (null === $v) { @@ -1680,7 +1735,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getIntent())) { $v->xmlSerialize($sxe->addChild(self::FIELD_INTENT, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getNote())) { foreach($vs as $v) { if (null === $v) { @@ -1693,7 +1747,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getPriority())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PRIORITY, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getReasonCode())) { foreach($vs as $v) { if (null === $v) { @@ -1724,7 +1777,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSubject())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBJECT, null, $v->_getFHIRXMLNamespace())); } @@ -1744,8 +1796,15 @@ public function jsonSerialize() $a[self::FIELD_AUTHOR] = $v; } if (null !== ($v = $this->getAuthoredOn())) { - $a[self::FIELD_AUTHORED_ON] = $v->getValue(); - $a[self::FIELD_AUTHORED_ON_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_AUTHORED_ON] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_AUTHORED_ON_EXT] = $enc; + } + } else { + $a[self::FIELD_AUTHORED_ON] = $v; + } } if ([] !== ($vs = $this->getBasedOn())) { $a[self::FIELD_BASED_ON] = $vs; @@ -1757,10 +1816,34 @@ public function jsonSerialize() $a[self::FIELD_ENCOUNTER] = $v; } if (null !== ($v = $this->getGroupIdentifier())) { - $a[self::FIELD_GROUP_IDENTIFIER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_GROUP_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_GROUP_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_GROUP_IDENTIFIER] = $v; + } } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if ([] !== ($vs = $this->getInstantiatesCanonical())) { $a[self::FIELD_INSTANTIATES_CANONICAL] = []; @@ -1768,8 +1851,17 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_INSTANTIATES_CANONICAL][] = $v->getValue(); - $a[self::FIELD_INSTANTIATES_CANONICAL_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_INSTANTIATES_CANONICAL][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_INSTANTIATES_CANONICAL_EXT][] = $enc; + } else { + $a[self::FIELD_INSTANTIATES_CANONICAL_EXT][] = null; + } + } else { + $a[self::FIELD_INSTANTIATES_CANONICAL][] = $v; + } } } if ([] !== ($vs = $this->getInstantiatesUri())) { @@ -1778,18 +1870,43 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_INSTANTIATES_URI][] = $v->getValue(); - $a[self::FIELD_INSTANTIATES_URI_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_INSTANTIATES_URI][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_INSTANTIATES_URI_EXT][] = $enc; + } else { + $a[self::FIELD_INSTANTIATES_URI_EXT][] = null; + } + } else { + $a[self::FIELD_INSTANTIATES_URI][] = $v; + } } } if (null !== ($v = $this->getIntent())) { - $a[self::FIELD_INTENT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_INTENT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_INTENT_EXT] = $enc; + } + } else { + $a[self::FIELD_INTENT] = $v; + } } if ([] !== ($vs = $this->getNote())) { $a[self::FIELD_NOTE] = $vs; } if (null !== ($v = $this->getPriority())) { - $a[self::FIELD_PRIORITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PRIORITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PRIORITY_EXT] = $enc; + } + } else { + $a[self::FIELD_PRIORITY] = $v; + } } if ([] !== ($vs = $this->getReasonCode())) { $a[self::FIELD_REASON_CODE] = $vs; @@ -1801,7 +1918,15 @@ public function jsonSerialize() $a[self::FIELD_REPLACES] = $vs; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getSubject())) { $a[self::FIELD_SUBJECT] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRResearchDefinition.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRResearchDefinition.php index 85c4da7cf7..4c280ec651 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRResearchDefinition.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRResearchDefinition.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -95,10 +95,6 @@ class FHIRResearchDefinition extends FHIRDomainResource implements PHPFHIRContai { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_RESEARCH_DEFINITION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_APPROVAL_DATE = 'approvalDate'; const FIELD_APPROVAL_DATE_EXT = '_approvalDate'; const FIELD_AUTHOR = 'author'; @@ -620,6 +616,9 @@ class FHIRResearchDefinition extends FHIRDomainResource implements PHPFHIRContai */ protected $version = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRResearchDefinition Constructor * @param null|array $data @@ -642,8 +641,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_APPROVAL_DATE] instanceof FHIRDate) { $this->setApprovalDate($data[self::FIELD_APPROVAL_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_APPROVAL_DATE])) { - $this->setApprovalDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_APPROVAL_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_APPROVAL_DATE])) { + $this->setApprovalDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_APPROVAL_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_APPROVAL_DATE])) { + $this->setApprovalDate(new FHIRDate(array_merge($ext, $data[self::FIELD_APPROVAL_DATE]))); + } } else { $this->setApprovalDate(new FHIRDate($data[self::FIELD_APPROVAL_DATE])); } @@ -651,6 +654,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_AUTHOR])) { if (is_array($data[self::FIELD_AUTHOR])) { foreach($data[self::FIELD_AUTHOR] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContactDetail) { $this->addAuthor($v); } else { @@ -669,17 +675,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_COMMENT])) { foreach($data[self::FIELD_COMMENT] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRString) { $this->addComment($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addComment(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addComment(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addComment(new FHIRString(array_merge($v, $ext[$i]))); + } } else { $this->addComment(new FHIRString($v)); } } } elseif ($data[self::FIELD_COMMENT] instanceof FHIRString) { $this->addComment($data[self::FIELD_COMMENT]); - } elseif ($ext && is_scalar($data[self::FIELD_COMMENT])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_COMMENT])) { $this->addComment(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_COMMENT]] + $ext)); } else { $this->addComment(new FHIRString($data[self::FIELD_COMMENT])); @@ -688,6 +701,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CONTACT])) { if (is_array($data[self::FIELD_CONTACT])) { foreach($data[self::FIELD_CONTACT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContactDetail) { $this->addContact($v); } else { @@ -706,8 +722,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_COPYRIGHT] instanceof FHIRMarkdown) { $this->setCopyright($data[self::FIELD_COPYRIGHT]); - } elseif ($ext && is_scalar($data[self::FIELD_COPYRIGHT])) { - $this->setCopyright(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_COPYRIGHT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_COPYRIGHT])) { + $this->setCopyright(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_COPYRIGHT]] + $ext)); + } else if (is_array($data[self::FIELD_COPYRIGHT])) { + $this->setCopyright(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_COPYRIGHT]))); + } } else { $this->setCopyright(new FHIRMarkdown($data[self::FIELD_COPYRIGHT])); } @@ -718,8 +738,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATE] instanceof FHIRDateTime) { $this->setDate($data[self::FIELD_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_DATE])) { - $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime(array_merge($ext, $data[self::FIELD_DATE]))); + } } else { $this->setDate(new FHIRDateTime($data[self::FIELD_DATE])); } @@ -730,8 +754,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRMarkdown) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRMarkdown($data[self::FIELD_DESCRIPTION])); } @@ -739,6 +767,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_EDITOR])) { if (is_array($data[self::FIELD_EDITOR])) { foreach($data[self::FIELD_EDITOR] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContactDetail) { $this->addEditor($v); } else { @@ -761,6 +792,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ENDORSER])) { if (is_array($data[self::FIELD_ENDORSER])) { foreach($data[self::FIELD_ENDORSER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContactDetail) { $this->addEndorser($v); } else { @@ -779,8 +813,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EXPERIMENTAL] instanceof FHIRBoolean) { $this->setExperimental($data[self::FIELD_EXPERIMENTAL]); - } elseif ($ext && is_scalar($data[self::FIELD_EXPERIMENTAL])) { - $this->setExperimental(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_EXPERIMENTAL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EXPERIMENTAL])) { + $this->setExperimental(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_EXPERIMENTAL]] + $ext)); + } else if (is_array($data[self::FIELD_EXPERIMENTAL])) { + $this->setExperimental(new FHIRBoolean(array_merge($ext, $data[self::FIELD_EXPERIMENTAL]))); + } } else { $this->setExperimental(new FHIRBoolean($data[self::FIELD_EXPERIMENTAL])); } @@ -805,17 +843,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -824,6 +869,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_JURISDICTION])) { if (is_array($data[self::FIELD_JURISDICTION])) { foreach($data[self::FIELD_JURISDICTION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addJurisdiction($v); } else { @@ -842,8 +890,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_LAST_REVIEW_DATE] instanceof FHIRDate) { $this->setLastReviewDate($data[self::FIELD_LAST_REVIEW_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_LAST_REVIEW_DATE])) { - $this->setLastReviewDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_LAST_REVIEW_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_LAST_REVIEW_DATE])) { + $this->setLastReviewDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_LAST_REVIEW_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_LAST_REVIEW_DATE])) { + $this->setLastReviewDate(new FHIRDate(array_merge($ext, $data[self::FIELD_LAST_REVIEW_DATE]))); + } } else { $this->setLastReviewDate(new FHIRDate($data[self::FIELD_LAST_REVIEW_DATE])); } @@ -854,17 +906,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_LIBRARY])) { foreach($data[self::FIELD_LIBRARY] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCanonical) { $this->addLibrary($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addLibrary(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addLibrary(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addLibrary(new FHIRCanonical(array_merge($v, $ext[$i]))); + } } else { $this->addLibrary(new FHIRCanonical($v)); } } } elseif ($data[self::FIELD_LIBRARY] instanceof FHIRCanonical) { $this->addLibrary($data[self::FIELD_LIBRARY]); - } elseif ($ext && is_scalar($data[self::FIELD_LIBRARY])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_LIBRARY])) { $this->addLibrary(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $data[self::FIELD_LIBRARY]] + $ext)); } else { $this->addLibrary(new FHIRCanonical($data[self::FIELD_LIBRARY])); @@ -876,8 +935,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -902,8 +965,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PUBLISHER] instanceof FHIRString) { $this->setPublisher($data[self::FIELD_PUBLISHER]); - } elseif ($ext && is_scalar($data[self::FIELD_PUBLISHER])) { - $this->setPublisher(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PUBLISHER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PUBLISHER])) { + $this->setPublisher(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PUBLISHER]] + $ext)); + } else if (is_array($data[self::FIELD_PUBLISHER])) { + $this->setPublisher(new FHIRString(array_merge($ext, $data[self::FIELD_PUBLISHER]))); + } } else { $this->setPublisher(new FHIRString($data[self::FIELD_PUBLISHER])); } @@ -914,8 +981,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PURPOSE] instanceof FHIRMarkdown) { $this->setPurpose($data[self::FIELD_PURPOSE]); - } elseif ($ext && is_scalar($data[self::FIELD_PURPOSE])) { - $this->setPurpose(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_PURPOSE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PURPOSE])) { + $this->setPurpose(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_PURPOSE]] + $ext)); + } else if (is_array($data[self::FIELD_PURPOSE])) { + $this->setPurpose(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_PURPOSE]))); + } } else { $this->setPurpose(new FHIRMarkdown($data[self::FIELD_PURPOSE])); } @@ -923,6 +994,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_RELATED_ARTIFACT])) { if (is_array($data[self::FIELD_RELATED_ARTIFACT])) { foreach($data[self::FIELD_RELATED_ARTIFACT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRRelatedArtifact) { $this->addRelatedArtifact($v); } else { @@ -938,6 +1012,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REVIEWER])) { if (is_array($data[self::FIELD_REVIEWER])) { foreach($data[self::FIELD_REVIEWER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContactDetail) { $this->addReviewer($v); } else { @@ -956,8 +1033,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SHORT_TITLE] instanceof FHIRString) { $this->setShortTitle($data[self::FIELD_SHORT_TITLE]); - } elseif ($ext && is_scalar($data[self::FIELD_SHORT_TITLE])) { - $this->setShortTitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SHORT_TITLE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SHORT_TITLE])) { + $this->setShortTitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SHORT_TITLE]] + $ext)); + } else if (is_array($data[self::FIELD_SHORT_TITLE])) { + $this->setShortTitle(new FHIRString(array_merge($ext, $data[self::FIELD_SHORT_TITLE]))); + } } else { $this->setShortTitle(new FHIRString($data[self::FIELD_SHORT_TITLE])); } @@ -968,8 +1049,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRPublicationStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRPublicationStatus([FHIRPublicationStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRPublicationStatus([FHIRPublicationStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRPublicationStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRPublicationStatus($data[self::FIELD_STATUS])); } @@ -994,8 +1079,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SUBTITLE] instanceof FHIRString) { $this->setSubtitle($data[self::FIELD_SUBTITLE]); - } elseif ($ext && is_scalar($data[self::FIELD_SUBTITLE])) { - $this->setSubtitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SUBTITLE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SUBTITLE])) { + $this->setSubtitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SUBTITLE]] + $ext)); + } else if (is_array($data[self::FIELD_SUBTITLE])) { + $this->setSubtitle(new FHIRString(array_merge($ext, $data[self::FIELD_SUBTITLE]))); + } } else { $this->setSubtitle(new FHIRString($data[self::FIELD_SUBTITLE])); } @@ -1006,8 +1095,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TITLE] instanceof FHIRString) { $this->setTitle($data[self::FIELD_TITLE]); - } elseif ($ext && is_scalar($data[self::FIELD_TITLE])) { - $this->setTitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TITLE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TITLE])) { + $this->setTitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TITLE]] + $ext)); + } else if (is_array($data[self::FIELD_TITLE])) { + $this->setTitle(new FHIRString(array_merge($ext, $data[self::FIELD_TITLE]))); + } } else { $this->setTitle(new FHIRString($data[self::FIELD_TITLE])); } @@ -1015,6 +1108,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_TOPIC])) { if (is_array($data[self::FIELD_TOPIC])) { foreach($data[self::FIELD_TOPIC] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addTopic($v); } else { @@ -1033,8 +1129,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_URL] instanceof FHIRUri) { $this->setUrl($data[self::FIELD_URL]); - } elseif ($ext && is_scalar($data[self::FIELD_URL])) { - $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } else if (is_array($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri(array_merge($ext, $data[self::FIELD_URL]))); + } } else { $this->setUrl(new FHIRUri($data[self::FIELD_URL])); } @@ -1045,8 +1145,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_USAGE] instanceof FHIRString) { $this->setUsage($data[self::FIELD_USAGE]); - } elseif ($ext && is_scalar($data[self::FIELD_USAGE])) { - $this->setUsage(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_USAGE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_USAGE])) { + $this->setUsage(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_USAGE]] + $ext)); + } else if (is_array($data[self::FIELD_USAGE])) { + $this->setUsage(new FHIRString(array_merge($ext, $data[self::FIELD_USAGE]))); + } } else { $this->setUsage(new FHIRString($data[self::FIELD_USAGE])); } @@ -1054,6 +1158,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_USE_CONTEXT])) { if (is_array($data[self::FIELD_USE_CONTEXT])) { foreach($data[self::FIELD_USE_CONTEXT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRUsageContext) { $this->addUseContext($v); } else { @@ -1072,8 +1179,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VERSION] instanceof FHIRString) { $this->setVersion($data[self::FIELD_VERSION]); - } elseif ($ext && is_scalar($data[self::FIELD_VERSION])) { - $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } else if (is_array($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString(array_merge($ext, $data[self::FIELD_VERSION]))); + } } else { $this->setVersion(new FHIRString($data[self::FIELD_VERSION])); } @@ -3054,7 +3165,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getApprovalDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_APPROVAL_DATE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getAuthor())) { foreach($vs as $v) { if (null === $v) { @@ -3063,6 +3173,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_AUTHOR, null, $v->_getFHIRXMLNamespace())); } } + if ([] !== ($vs = $this->getComment())) { foreach($vs as $v) { if (null === $v) { @@ -3080,6 +3191,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_CONTACT, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getCopyright())) { $v->xmlSerialize($sxe->addChild(self::FIELD_COPYRIGHT, null, $v->_getFHIRXMLNamespace())); } @@ -3089,7 +3201,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESCRIPTION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getEditor())) { foreach($vs as $v) { if (null === $v) { @@ -3102,7 +3213,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getEffectivePeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EFFECTIVE_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getEndorser())) { foreach($vs as $v) { if (null === $v) { @@ -3111,18 +3221,16 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_ENDORSER, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getExperimental())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EXPERIMENTAL, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getExposure())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EXPOSURE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getExposureAlternative())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EXPOSURE_ALTERNATIVE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -3140,6 +3248,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_JURISDICTION, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getLastReviewDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_LAST_REVIEW_DATE, null, $v->_getFHIRXMLNamespace())); } @@ -3151,14 +3260,13 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_LIBRARY, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NAME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOutcome())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OUTCOME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPopulation())) { $v->xmlSerialize($sxe->addChild(self::FIELD_POPULATION, null, $v->_getFHIRXMLNamespace())); } @@ -3168,7 +3276,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getPurpose())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PURPOSE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getRelatedArtifact())) { foreach($vs as $v) { if (null === $v) { @@ -3186,18 +3293,16 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_REVIEWER, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getShortTitle())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SHORT_TITLE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSubjectCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBJECT_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSubjectReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBJECT_REFERENCE, null, $v->_getFHIRXMLNamespace())); } @@ -3207,7 +3312,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getTitle())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TITLE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getTopic())) { foreach($vs as $v) { if (null === $v) { @@ -3216,13 +3320,13 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_TOPIC, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getUrl())) { $v->xmlSerialize($sxe->addChild(self::FIELD_URL, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getUsage())) { $v->xmlSerialize($sxe->addChild(self::FIELD_USAGE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getUseContext())) { foreach($vs as $v) { if (null === $v) { @@ -3231,6 +3335,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_USE_CONTEXT, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getVersion())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VERSION, null, $v->_getFHIRXMLNamespace())); } @@ -3244,8 +3349,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getApprovalDate())) { - $a[self::FIELD_APPROVAL_DATE] = $v->getValue(); - $a[self::FIELD_APPROVAL_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_APPROVAL_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_APPROVAL_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_APPROVAL_DATE] = $v; + } } if ([] !== ($vs = $this->getAuthor())) { $a[self::FIELD_AUTHOR] = $vs; @@ -3256,24 +3368,54 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_COMMENT][] = $v->getValue(); - $a[self::FIELD_COMMENT_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_COMMENT][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_COMMENT_EXT][] = $enc; + } else { + $a[self::FIELD_COMMENT_EXT][] = null; + } + } else { + $a[self::FIELD_COMMENT][] = $v; + } } } if ([] !== ($vs = $this->getContact())) { $a[self::FIELD_CONTACT] = $vs; } if (null !== ($v = $this->getCopyright())) { - $a[self::FIELD_COPYRIGHT] = $v->getValue(); - $a[self::FIELD_COPYRIGHT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_COPYRIGHT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_COPYRIGHT_EXT] = $enc; + } + } else { + $a[self::FIELD_COPYRIGHT] = $v; + } } if (null !== ($v = $this->getDate())) { - $a[self::FIELD_DATE] = $v->getValue(); - $a[self::FIELD_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_DATE] = $v; + } } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if ([] !== ($vs = $this->getEditor())) { $a[self::FIELD_EDITOR] = $vs; @@ -3285,8 +3427,15 @@ public function jsonSerialize() $a[self::FIELD_ENDORSER] = $vs; } if (null !== ($v = $this->getExperimental())) { - $a[self::FIELD_EXPERIMENTAL] = $v->getValue(); - $a[self::FIELD_EXPERIMENTAL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EXPERIMENTAL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EXPERIMENTAL_EXT] = $enc; + } + } else { + $a[self::FIELD_EXPERIMENTAL] = $v; + } } if (null !== ($v = $this->getExposure())) { $a[self::FIELD_EXPOSURE] = $v; @@ -3295,14 +3444,37 @@ public function jsonSerialize() $a[self::FIELD_EXPOSURE_ALTERNATIVE] = $v; } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if ([] !== ($vs = $this->getJurisdiction())) { $a[self::FIELD_JURISDICTION] = $vs; } if (null !== ($v = $this->getLastReviewDate())) { - $a[self::FIELD_LAST_REVIEW_DATE] = $v->getValue(); - $a[self::FIELD_LAST_REVIEW_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_LAST_REVIEW_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_LAST_REVIEW_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_LAST_REVIEW_DATE] = $v; + } } if ([] !== ($vs = $this->getLibrary())) { $a[self::FIELD_LIBRARY] = []; @@ -3310,13 +3482,29 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_LIBRARY][] = $v->getValue(); - $a[self::FIELD_LIBRARY_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_LIBRARY][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_LIBRARY_EXT][] = $enc; + } else { + $a[self::FIELD_LIBRARY_EXT][] = null; + } + } else { + $a[self::FIELD_LIBRARY][] = $v; + } } } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if (null !== ($v = $this->getOutcome())) { $a[self::FIELD_OUTCOME] = $v; @@ -3325,12 +3513,26 @@ public function jsonSerialize() $a[self::FIELD_POPULATION] = $v; } if (null !== ($v = $this->getPublisher())) { - $a[self::FIELD_PUBLISHER] = $v->getValue(); - $a[self::FIELD_PUBLISHER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PUBLISHER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PUBLISHER_EXT] = $enc; + } + } else { + $a[self::FIELD_PUBLISHER] = $v; + } } if (null !== ($v = $this->getPurpose())) { - $a[self::FIELD_PURPOSE] = $v->getValue(); - $a[self::FIELD_PURPOSE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PURPOSE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PURPOSE_EXT] = $enc; + } + } else { + $a[self::FIELD_PURPOSE] = $v; + } } if ([] !== ($vs = $this->getRelatedArtifact())) { $a[self::FIELD_RELATED_ARTIFACT] = $vs; @@ -3339,11 +3541,26 @@ public function jsonSerialize() $a[self::FIELD_REVIEWER] = $vs; } if (null !== ($v = $this->getShortTitle())) { - $a[self::FIELD_SHORT_TITLE] = $v->getValue(); - $a[self::FIELD_SHORT_TITLE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SHORT_TITLE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SHORT_TITLE_EXT] = $enc; + } + } else { + $a[self::FIELD_SHORT_TITLE] = $v; + } } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getSubjectCodeableConcept())) { $a[self::FIELD_SUBJECT_CODEABLE_CONCEPT] = $v; @@ -3352,30 +3569,65 @@ public function jsonSerialize() $a[self::FIELD_SUBJECT_REFERENCE] = $v; } if (null !== ($v = $this->getSubtitle())) { - $a[self::FIELD_SUBTITLE] = $v->getValue(); - $a[self::FIELD_SUBTITLE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SUBTITLE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SUBTITLE_EXT] = $enc; + } + } else { + $a[self::FIELD_SUBTITLE] = $v; + } } if (null !== ($v = $this->getTitle())) { - $a[self::FIELD_TITLE] = $v->getValue(); - $a[self::FIELD_TITLE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TITLE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TITLE_EXT] = $enc; + } + } else { + $a[self::FIELD_TITLE] = $v; + } } if ([] !== ($vs = $this->getTopic())) { $a[self::FIELD_TOPIC] = $vs; } if (null !== ($v = $this->getUrl())) { - $a[self::FIELD_URL] = $v->getValue(); - $a[self::FIELD_URL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_URL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_URL_EXT] = $enc; + } + } else { + $a[self::FIELD_URL] = $v; + } } if (null !== ($v = $this->getUsage())) { - $a[self::FIELD_USAGE] = $v->getValue(); - $a[self::FIELD_USAGE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_USAGE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_USAGE_EXT] = $enc; + } + } else { + $a[self::FIELD_USAGE] = $v; + } } if ([] !== ($vs = $this->getUseContext())) { $a[self::FIELD_USE_CONTEXT] = $vs; } if (null !== ($v = $this->getVersion())) { - $a[self::FIELD_VERSION] = $v->getValue(); - $a[self::FIELD_VERSION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VERSION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VERSION_EXT] = $enc; + } + } else { + $a[self::FIELD_VERSION] = $v; + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRResearchElementDefinition.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRResearchElementDefinition.php index 3ed79f750d..946e83b6a5 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRResearchElementDefinition.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRResearchElementDefinition.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -97,10 +97,6 @@ class FHIRResearchElementDefinition extends FHIRDomainResource implements PHPFHI { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_RESEARCH_ELEMENT_DEFINITION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_APPROVAL_DATE = 'approvalDate'; const FIELD_APPROVAL_DATE_EXT = '_approvalDate'; const FIELD_AUTHOR = 'author'; @@ -610,6 +606,9 @@ class FHIRResearchElementDefinition extends FHIRDomainResource implements PHPFHI */ protected $version = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRResearchElementDefinition Constructor * @param null|array $data @@ -632,8 +631,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_APPROVAL_DATE] instanceof FHIRDate) { $this->setApprovalDate($data[self::FIELD_APPROVAL_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_APPROVAL_DATE])) { - $this->setApprovalDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_APPROVAL_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_APPROVAL_DATE])) { + $this->setApprovalDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_APPROVAL_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_APPROVAL_DATE])) { + $this->setApprovalDate(new FHIRDate(array_merge($ext, $data[self::FIELD_APPROVAL_DATE]))); + } } else { $this->setApprovalDate(new FHIRDate($data[self::FIELD_APPROVAL_DATE])); } @@ -641,6 +644,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_AUTHOR])) { if (is_array($data[self::FIELD_AUTHOR])) { foreach($data[self::FIELD_AUTHOR] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContactDetail) { $this->addAuthor($v); } else { @@ -656,6 +662,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CHARACTERISTIC])) { if (is_array($data[self::FIELD_CHARACTERISTIC])) { foreach($data[self::FIELD_CHARACTERISTIC] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRResearchElementDefinitionCharacteristic) { $this->addCharacteristic($v); } else { @@ -674,17 +683,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_COMMENT])) { foreach($data[self::FIELD_COMMENT] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRString) { $this->addComment($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addComment(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addComment(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addComment(new FHIRString(array_merge($v, $ext[$i]))); + } } else { $this->addComment(new FHIRString($v)); } } } elseif ($data[self::FIELD_COMMENT] instanceof FHIRString) { $this->addComment($data[self::FIELD_COMMENT]); - } elseif ($ext && is_scalar($data[self::FIELD_COMMENT])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_COMMENT])) { $this->addComment(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_COMMENT]] + $ext)); } else { $this->addComment(new FHIRString($data[self::FIELD_COMMENT])); @@ -693,6 +709,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CONTACT])) { if (is_array($data[self::FIELD_CONTACT])) { foreach($data[self::FIELD_CONTACT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContactDetail) { $this->addContact($v); } else { @@ -711,8 +730,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_COPYRIGHT] instanceof FHIRMarkdown) { $this->setCopyright($data[self::FIELD_COPYRIGHT]); - } elseif ($ext && is_scalar($data[self::FIELD_COPYRIGHT])) { - $this->setCopyright(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_COPYRIGHT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_COPYRIGHT])) { + $this->setCopyright(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_COPYRIGHT]] + $ext)); + } else if (is_array($data[self::FIELD_COPYRIGHT])) { + $this->setCopyright(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_COPYRIGHT]))); + } } else { $this->setCopyright(new FHIRMarkdown($data[self::FIELD_COPYRIGHT])); } @@ -723,8 +746,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATE] instanceof FHIRDateTime) { $this->setDate($data[self::FIELD_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_DATE])) { - $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime(array_merge($ext, $data[self::FIELD_DATE]))); + } } else { $this->setDate(new FHIRDateTime($data[self::FIELD_DATE])); } @@ -735,8 +762,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRMarkdown) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRMarkdown($data[self::FIELD_DESCRIPTION])); } @@ -744,6 +775,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_EDITOR])) { if (is_array($data[self::FIELD_EDITOR])) { foreach($data[self::FIELD_EDITOR] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContactDetail) { $this->addEditor($v); } else { @@ -766,6 +800,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ENDORSER])) { if (is_array($data[self::FIELD_ENDORSER])) { foreach($data[self::FIELD_ENDORSER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContactDetail) { $this->addEndorser($v); } else { @@ -784,8 +821,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EXPERIMENTAL] instanceof FHIRBoolean) { $this->setExperimental($data[self::FIELD_EXPERIMENTAL]); - } elseif ($ext && is_scalar($data[self::FIELD_EXPERIMENTAL])) { - $this->setExperimental(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_EXPERIMENTAL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EXPERIMENTAL])) { + $this->setExperimental(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_EXPERIMENTAL]] + $ext)); + } else if (is_array($data[self::FIELD_EXPERIMENTAL])) { + $this->setExperimental(new FHIRBoolean(array_merge($ext, $data[self::FIELD_EXPERIMENTAL]))); + } } else { $this->setExperimental(new FHIRBoolean($data[self::FIELD_EXPERIMENTAL])); } @@ -796,17 +837,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -815,6 +863,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_JURISDICTION])) { if (is_array($data[self::FIELD_JURISDICTION])) { foreach($data[self::FIELD_JURISDICTION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addJurisdiction($v); } else { @@ -833,8 +884,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_LAST_REVIEW_DATE] instanceof FHIRDate) { $this->setLastReviewDate($data[self::FIELD_LAST_REVIEW_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_LAST_REVIEW_DATE])) { - $this->setLastReviewDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_LAST_REVIEW_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_LAST_REVIEW_DATE])) { + $this->setLastReviewDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_LAST_REVIEW_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_LAST_REVIEW_DATE])) { + $this->setLastReviewDate(new FHIRDate(array_merge($ext, $data[self::FIELD_LAST_REVIEW_DATE]))); + } } else { $this->setLastReviewDate(new FHIRDate($data[self::FIELD_LAST_REVIEW_DATE])); } @@ -845,17 +900,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_LIBRARY])) { foreach($data[self::FIELD_LIBRARY] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCanonical) { $this->addLibrary($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addLibrary(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addLibrary(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addLibrary(new FHIRCanonical(array_merge($v, $ext[$i]))); + } } else { $this->addLibrary(new FHIRCanonical($v)); } } } elseif ($data[self::FIELD_LIBRARY] instanceof FHIRCanonical) { $this->addLibrary($data[self::FIELD_LIBRARY]); - } elseif ($ext && is_scalar($data[self::FIELD_LIBRARY])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_LIBRARY])) { $this->addLibrary(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $data[self::FIELD_LIBRARY]] + $ext)); } else { $this->addLibrary(new FHIRCanonical($data[self::FIELD_LIBRARY])); @@ -867,8 +929,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -879,8 +945,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PUBLISHER] instanceof FHIRString) { $this->setPublisher($data[self::FIELD_PUBLISHER]); - } elseif ($ext && is_scalar($data[self::FIELD_PUBLISHER])) { - $this->setPublisher(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PUBLISHER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PUBLISHER])) { + $this->setPublisher(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PUBLISHER]] + $ext)); + } else if (is_array($data[self::FIELD_PUBLISHER])) { + $this->setPublisher(new FHIRString(array_merge($ext, $data[self::FIELD_PUBLISHER]))); + } } else { $this->setPublisher(new FHIRString($data[self::FIELD_PUBLISHER])); } @@ -891,8 +961,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PURPOSE] instanceof FHIRMarkdown) { $this->setPurpose($data[self::FIELD_PURPOSE]); - } elseif ($ext && is_scalar($data[self::FIELD_PURPOSE])) { - $this->setPurpose(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_PURPOSE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PURPOSE])) { + $this->setPurpose(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_PURPOSE]] + $ext)); + } else if (is_array($data[self::FIELD_PURPOSE])) { + $this->setPurpose(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_PURPOSE]))); + } } else { $this->setPurpose(new FHIRMarkdown($data[self::FIELD_PURPOSE])); } @@ -900,6 +974,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_RELATED_ARTIFACT])) { if (is_array($data[self::FIELD_RELATED_ARTIFACT])) { foreach($data[self::FIELD_RELATED_ARTIFACT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRRelatedArtifact) { $this->addRelatedArtifact($v); } else { @@ -915,6 +992,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REVIEWER])) { if (is_array($data[self::FIELD_REVIEWER])) { foreach($data[self::FIELD_REVIEWER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContactDetail) { $this->addReviewer($v); } else { @@ -933,8 +1013,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SHORT_TITLE] instanceof FHIRString) { $this->setShortTitle($data[self::FIELD_SHORT_TITLE]); - } elseif ($ext && is_scalar($data[self::FIELD_SHORT_TITLE])) { - $this->setShortTitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SHORT_TITLE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SHORT_TITLE])) { + $this->setShortTitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SHORT_TITLE]] + $ext)); + } else if (is_array($data[self::FIELD_SHORT_TITLE])) { + $this->setShortTitle(new FHIRString(array_merge($ext, $data[self::FIELD_SHORT_TITLE]))); + } } else { $this->setShortTitle(new FHIRString($data[self::FIELD_SHORT_TITLE])); } @@ -945,8 +1029,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRPublicationStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRPublicationStatus([FHIRPublicationStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRPublicationStatus([FHIRPublicationStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRPublicationStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRPublicationStatus($data[self::FIELD_STATUS])); } @@ -971,8 +1059,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SUBTITLE] instanceof FHIRString) { $this->setSubtitle($data[self::FIELD_SUBTITLE]); - } elseif ($ext && is_scalar($data[self::FIELD_SUBTITLE])) { - $this->setSubtitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SUBTITLE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SUBTITLE])) { + $this->setSubtitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SUBTITLE]] + $ext)); + } else if (is_array($data[self::FIELD_SUBTITLE])) { + $this->setSubtitle(new FHIRString(array_merge($ext, $data[self::FIELD_SUBTITLE]))); + } } else { $this->setSubtitle(new FHIRString($data[self::FIELD_SUBTITLE])); } @@ -983,8 +1075,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TITLE] instanceof FHIRString) { $this->setTitle($data[self::FIELD_TITLE]); - } elseif ($ext && is_scalar($data[self::FIELD_TITLE])) { - $this->setTitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TITLE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TITLE])) { + $this->setTitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TITLE]] + $ext)); + } else if (is_array($data[self::FIELD_TITLE])) { + $this->setTitle(new FHIRString(array_merge($ext, $data[self::FIELD_TITLE]))); + } } else { $this->setTitle(new FHIRString($data[self::FIELD_TITLE])); } @@ -992,6 +1088,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_TOPIC])) { if (is_array($data[self::FIELD_TOPIC])) { foreach($data[self::FIELD_TOPIC] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addTopic($v); } else { @@ -1010,8 +1109,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TYPE] instanceof FHIRResearchElementType) { $this->setType($data[self::FIELD_TYPE]); - } elseif ($ext && is_scalar($data[self::FIELD_TYPE])) { - $this->setType(new FHIRResearchElementType([FHIRResearchElementType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TYPE])) { + $this->setType(new FHIRResearchElementType([FHIRResearchElementType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } else if (is_array($data[self::FIELD_TYPE])) { + $this->setType(new FHIRResearchElementType(array_merge($ext, $data[self::FIELD_TYPE]))); + } } else { $this->setType(new FHIRResearchElementType($data[self::FIELD_TYPE])); } @@ -1022,8 +1125,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_URL] instanceof FHIRUri) { $this->setUrl($data[self::FIELD_URL]); - } elseif ($ext && is_scalar($data[self::FIELD_URL])) { - $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } else if (is_array($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri(array_merge($ext, $data[self::FIELD_URL]))); + } } else { $this->setUrl(new FHIRUri($data[self::FIELD_URL])); } @@ -1034,8 +1141,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_USAGE] instanceof FHIRString) { $this->setUsage($data[self::FIELD_USAGE]); - } elseif ($ext && is_scalar($data[self::FIELD_USAGE])) { - $this->setUsage(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_USAGE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_USAGE])) { + $this->setUsage(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_USAGE]] + $ext)); + } else if (is_array($data[self::FIELD_USAGE])) { + $this->setUsage(new FHIRString(array_merge($ext, $data[self::FIELD_USAGE]))); + } } else { $this->setUsage(new FHIRString($data[self::FIELD_USAGE])); } @@ -1043,6 +1154,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_USE_CONTEXT])) { if (is_array($data[self::FIELD_USE_CONTEXT])) { foreach($data[self::FIELD_USE_CONTEXT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRUsageContext) { $this->addUseContext($v); } else { @@ -1061,8 +1175,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VARIABLE_TYPE] instanceof FHIRVariableType) { $this->setVariableType($data[self::FIELD_VARIABLE_TYPE]); - } elseif ($ext && is_scalar($data[self::FIELD_VARIABLE_TYPE])) { - $this->setVariableType(new FHIRVariableType([FHIRVariableType::FIELD_VALUE => $data[self::FIELD_VARIABLE_TYPE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VARIABLE_TYPE])) { + $this->setVariableType(new FHIRVariableType([FHIRVariableType::FIELD_VALUE => $data[self::FIELD_VARIABLE_TYPE]] + $ext)); + } else if (is_array($data[self::FIELD_VARIABLE_TYPE])) { + $this->setVariableType(new FHIRVariableType(array_merge($ext, $data[self::FIELD_VARIABLE_TYPE]))); + } } else { $this->setVariableType(new FHIRVariableType($data[self::FIELD_VARIABLE_TYPE])); } @@ -1073,8 +1191,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VERSION] instanceof FHIRString) { $this->setVersion($data[self::FIELD_VERSION]); - } elseif ($ext && is_scalar($data[self::FIELD_VERSION])) { - $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } else if (is_array($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString(array_merge($ext, $data[self::FIELD_VERSION]))); + } } else { $this->setVersion(new FHIRString($data[self::FIELD_VERSION])); } @@ -3046,7 +3168,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getApprovalDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_APPROVAL_DATE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getAuthor())) { foreach($vs as $v) { if (null === $v) { @@ -3064,6 +3185,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_CHARACTERISTIC, null, $v->_getFHIRXMLNamespace())); } } + if ([] !== ($vs = $this->getComment())) { foreach($vs as $v) { if (null === $v) { @@ -3081,6 +3203,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_CONTACT, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getCopyright())) { $v->xmlSerialize($sxe->addChild(self::FIELD_COPYRIGHT, null, $v->_getFHIRXMLNamespace())); } @@ -3090,7 +3213,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESCRIPTION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getEditor())) { foreach($vs as $v) { if (null === $v) { @@ -3103,7 +3225,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getEffectivePeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EFFECTIVE_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getEndorser())) { foreach($vs as $v) { if (null === $v) { @@ -3112,10 +3233,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_ENDORSER, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getExperimental())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EXPERIMENTAL, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -3133,6 +3254,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_JURISDICTION, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getLastReviewDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_LAST_REVIEW_DATE, null, $v->_getFHIRXMLNamespace())); } @@ -3144,6 +3266,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_LIBRARY, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NAME, null, $v->_getFHIRXMLNamespace())); } @@ -3153,7 +3276,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getPurpose())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PURPOSE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getRelatedArtifact())) { foreach($vs as $v) { if (null === $v) { @@ -3171,18 +3293,16 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_REVIEWER, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getShortTitle())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SHORT_TITLE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSubjectCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBJECT_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSubjectReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBJECT_REFERENCE, null, $v->_getFHIRXMLNamespace())); } @@ -3192,7 +3312,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getTitle())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TITLE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getTopic())) { foreach($vs as $v) { if (null === $v) { @@ -3211,7 +3330,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getUsage())) { $v->xmlSerialize($sxe->addChild(self::FIELD_USAGE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getUseContext())) { foreach($vs as $v) { if (null === $v) { @@ -3237,8 +3355,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getApprovalDate())) { - $a[self::FIELD_APPROVAL_DATE] = $v->getValue(); - $a[self::FIELD_APPROVAL_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_APPROVAL_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_APPROVAL_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_APPROVAL_DATE] = $v; + } } if ([] !== ($vs = $this->getAuthor())) { $a[self::FIELD_AUTHOR] = $vs; @@ -3252,24 +3377,54 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_COMMENT][] = $v->getValue(); - $a[self::FIELD_COMMENT_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_COMMENT][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_COMMENT_EXT][] = $enc; + } else { + $a[self::FIELD_COMMENT_EXT][] = null; + } + } else { + $a[self::FIELD_COMMENT][] = $v; + } } } if ([] !== ($vs = $this->getContact())) { $a[self::FIELD_CONTACT] = $vs; } if (null !== ($v = $this->getCopyright())) { - $a[self::FIELD_COPYRIGHT] = $v->getValue(); - $a[self::FIELD_COPYRIGHT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_COPYRIGHT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_COPYRIGHT_EXT] = $enc; + } + } else { + $a[self::FIELD_COPYRIGHT] = $v; + } } if (null !== ($v = $this->getDate())) { - $a[self::FIELD_DATE] = $v->getValue(); - $a[self::FIELD_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_DATE] = $v; + } } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if ([] !== ($vs = $this->getEditor())) { $a[self::FIELD_EDITOR] = $vs; @@ -3281,18 +3436,48 @@ public function jsonSerialize() $a[self::FIELD_ENDORSER] = $vs; } if (null !== ($v = $this->getExperimental())) { - $a[self::FIELD_EXPERIMENTAL] = $v->getValue(); - $a[self::FIELD_EXPERIMENTAL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EXPERIMENTAL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EXPERIMENTAL_EXT] = $enc; + } + } else { + $a[self::FIELD_EXPERIMENTAL] = $v; + } } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if ([] !== ($vs = $this->getJurisdiction())) { $a[self::FIELD_JURISDICTION] = $vs; } if (null !== ($v = $this->getLastReviewDate())) { - $a[self::FIELD_LAST_REVIEW_DATE] = $v->getValue(); - $a[self::FIELD_LAST_REVIEW_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_LAST_REVIEW_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_LAST_REVIEW_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_LAST_REVIEW_DATE] = $v; + } } if ([] !== ($vs = $this->getLibrary())) { $a[self::FIELD_LIBRARY] = []; @@ -3300,21 +3485,51 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_LIBRARY][] = $v->getValue(); - $a[self::FIELD_LIBRARY_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_LIBRARY][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_LIBRARY_EXT][] = $enc; + } else { + $a[self::FIELD_LIBRARY_EXT][] = null; + } + } else { + $a[self::FIELD_LIBRARY][] = $v; + } } } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if (null !== ($v = $this->getPublisher())) { - $a[self::FIELD_PUBLISHER] = $v->getValue(); - $a[self::FIELD_PUBLISHER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PUBLISHER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PUBLISHER_EXT] = $enc; + } + } else { + $a[self::FIELD_PUBLISHER] = $v; + } } if (null !== ($v = $this->getPurpose())) { - $a[self::FIELD_PURPOSE] = $v->getValue(); - $a[self::FIELD_PURPOSE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PURPOSE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PURPOSE_EXT] = $enc; + } + } else { + $a[self::FIELD_PURPOSE] = $v; + } } if ([] !== ($vs = $this->getRelatedArtifact())) { $a[self::FIELD_RELATED_ARTIFACT] = $vs; @@ -3323,11 +3538,26 @@ public function jsonSerialize() $a[self::FIELD_REVIEWER] = $vs; } if (null !== ($v = $this->getShortTitle())) { - $a[self::FIELD_SHORT_TITLE] = $v->getValue(); - $a[self::FIELD_SHORT_TITLE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SHORT_TITLE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SHORT_TITLE_EXT] = $enc; + } + } else { + $a[self::FIELD_SHORT_TITLE] = $v; + } } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getSubjectCodeableConcept())) { $a[self::FIELD_SUBJECT_CODEABLE_CONCEPT] = $v; @@ -3336,36 +3566,87 @@ public function jsonSerialize() $a[self::FIELD_SUBJECT_REFERENCE] = $v; } if (null !== ($v = $this->getSubtitle())) { - $a[self::FIELD_SUBTITLE] = $v->getValue(); - $a[self::FIELD_SUBTITLE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SUBTITLE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SUBTITLE_EXT] = $enc; + } + } else { + $a[self::FIELD_SUBTITLE] = $v; + } } if (null !== ($v = $this->getTitle())) { - $a[self::FIELD_TITLE] = $v->getValue(); - $a[self::FIELD_TITLE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TITLE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TITLE_EXT] = $enc; + } + } else { + $a[self::FIELD_TITLE] = $v; + } } if ([] !== ($vs = $this->getTopic())) { $a[self::FIELD_TOPIC] = $vs; } if (null !== ($v = $this->getType())) { - $a[self::FIELD_TYPE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TYPE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TYPE_EXT] = $enc; + } + } else { + $a[self::FIELD_TYPE] = $v; + } } if (null !== ($v = $this->getUrl())) { - $a[self::FIELD_URL] = $v->getValue(); - $a[self::FIELD_URL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_URL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_URL_EXT] = $enc; + } + } else { + $a[self::FIELD_URL] = $v; + } } if (null !== ($v = $this->getUsage())) { - $a[self::FIELD_USAGE] = $v->getValue(); - $a[self::FIELD_USAGE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_USAGE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_USAGE_EXT] = $enc; + } + } else { + $a[self::FIELD_USAGE] = $v; + } } if ([] !== ($vs = $this->getUseContext())) { $a[self::FIELD_USE_CONTEXT] = $vs; } if (null !== ($v = $this->getVariableType())) { - $a[self::FIELD_VARIABLE_TYPE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VARIABLE_TYPE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VARIABLE_TYPE_EXT] = $enc; + } + } else { + $a[self::FIELD_VARIABLE_TYPE] = $v; + } } if (null !== ($v = $this->getVersion())) { - $a[self::FIELD_VERSION] = $v->getValue(); - $a[self::FIELD_VERSION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VERSION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VERSION_EXT] = $enc; + } + } else { + $a[self::FIELD_VERSION] = $v; + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRResearchStudy.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRResearchStudy.php index 1df11d6c63..46467b51ee 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRResearchStudy.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRResearchStudy.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -95,10 +95,6 @@ class FHIRResearchStudy extends FHIRDomainResource implements PHPFHIRContainedTy { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_RESEARCH_STUDY; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ARM = 'arm'; const FIELD_CATEGORY = 'category'; const FIELD_CONDITION = 'condition'; @@ -428,6 +424,9 @@ class FHIRResearchStudy extends FHIRDomainResource implements PHPFHIRContainedTy */ protected $title = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRResearchStudy Constructor * @param null|array $data @@ -447,6 +446,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ARM])) { if (is_array($data[self::FIELD_ARM])) { foreach($data[self::FIELD_ARM] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRResearchStudyArm) { $this->addArm($v); } else { @@ -462,6 +464,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CATEGORY])) { if (is_array($data[self::FIELD_CATEGORY])) { foreach($data[self::FIELD_CATEGORY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addCategory($v); } else { @@ -477,6 +482,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CONDITION])) { if (is_array($data[self::FIELD_CONDITION])) { foreach($data[self::FIELD_CONDITION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addCondition($v); } else { @@ -492,6 +500,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CONTACT])) { if (is_array($data[self::FIELD_CONTACT])) { foreach($data[self::FIELD_CONTACT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContactDetail) { $this->addContact($v); } else { @@ -510,8 +521,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRMarkdown) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRMarkdown($data[self::FIELD_DESCRIPTION])); } @@ -519,6 +534,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ENROLLMENT])) { if (is_array($data[self::FIELD_ENROLLMENT])) { foreach($data[self::FIELD_ENROLLMENT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addEnrollment($v); } else { @@ -534,6 +552,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_FOCUS])) { if (is_array($data[self::FIELD_FOCUS])) { foreach($data[self::FIELD_FOCUS] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addFocus($v); } else { @@ -552,17 +573,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -571,6 +599,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_KEYWORD])) { if (is_array($data[self::FIELD_KEYWORD])) { foreach($data[self::FIELD_KEYWORD] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addKeyword($v); } else { @@ -586,6 +617,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_LOCATION])) { if (is_array($data[self::FIELD_LOCATION])) { foreach($data[self::FIELD_LOCATION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addLocation($v); } else { @@ -601,6 +635,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_NOTE])) { if (is_array($data[self::FIELD_NOTE])) { foreach($data[self::FIELD_NOTE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRAnnotation) { $this->addNote($v); } else { @@ -616,6 +653,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_OBJECTIVE])) { if (is_array($data[self::FIELD_OBJECTIVE])) { foreach($data[self::FIELD_OBJECTIVE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRResearchStudyObjective) { $this->addObjective($v); } else { @@ -631,6 +671,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PART_OF])) { if (is_array($data[self::FIELD_PART_OF])) { foreach($data[self::FIELD_PART_OF] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addPartOf($v); } else { @@ -674,6 +717,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PROTOCOL])) { if (is_array($data[self::FIELD_PROTOCOL])) { foreach($data[self::FIELD_PROTOCOL] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addProtocol($v); } else { @@ -696,6 +742,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_RELATED_ARTIFACT])) { if (is_array($data[self::FIELD_RELATED_ARTIFACT])) { foreach($data[self::FIELD_RELATED_ARTIFACT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRRelatedArtifact) { $this->addRelatedArtifact($v); } else { @@ -711,6 +760,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SITE])) { if (is_array($data[self::FIELD_SITE])) { foreach($data[self::FIELD_SITE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addSite($v); } else { @@ -736,8 +788,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRResearchStudyStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRResearchStudyStatus([FHIRResearchStudyStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRResearchStudyStatus([FHIRResearchStudyStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRResearchStudyStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRResearchStudyStatus($data[self::FIELD_STATUS])); } @@ -748,8 +804,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TITLE] instanceof FHIRString) { $this->setTitle($data[self::FIELD_TITLE]); - } elseif ($ext && is_scalar($data[self::FIELD_TITLE])) { - $this->setTitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TITLE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TITLE])) { + $this->setTitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TITLE]] + $ext)); + } else if (is_array($data[self::FIELD_TITLE])) { + $this->setTitle(new FHIRString(array_merge($ext, $data[self::FIELD_TITLE]))); + } } else { $this->setTitle(new FHIRString($data[self::FIELD_TITLE])); } @@ -2192,7 +2252,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getArm())) { foreach($vs as $v) { if (null === $v) { @@ -2228,10 +2287,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_CONTACT, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getDescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESCRIPTION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getEnrollment())) { foreach($vs as $v) { if (null === $v) { @@ -2307,19 +2366,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPhase())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PHASE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPrimaryPurposeType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PRIMARY_PURPOSE_TYPE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPrincipalInvestigator())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PRINCIPAL_INVESTIGATOR, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getProtocol())) { foreach($vs as $v) { if (null === $v) { @@ -2332,7 +2387,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getReasonStopped())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REASON_STOPPED, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getRelatedArtifact())) { foreach($vs as $v) { if (null === $v) { @@ -2354,7 +2408,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getSponsor())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SPONSOR, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } @@ -2383,8 +2436,15 @@ public function jsonSerialize() $a[self::FIELD_CONTACT] = $vs; } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if ([] !== ($vs = $this->getEnrollment())) { $a[self::FIELD_ENROLLMENT] = $vs; @@ -2393,7 +2453,23 @@ public function jsonSerialize() $a[self::FIELD_FOCUS] = $vs; } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if ([] !== ($vs = $this->getKeyword())) { $a[self::FIELD_KEYWORD] = $vs; @@ -2438,11 +2514,26 @@ public function jsonSerialize() $a[self::FIELD_SPONSOR] = $v; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getTitle())) { - $a[self::FIELD_TITLE] = $v->getValue(); - $a[self::FIELD_TITLE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TITLE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TITLE_EXT] = $enc; + } + } else { + $a[self::FIELD_TITLE] = $v; + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRResearchSubject.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRResearchSubject.php index e98b23e1b7..26755854ec 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRResearchSubject.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRResearchSubject.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -84,10 +84,6 @@ class FHIRResearchSubject extends FHIRDomainResource implements PHPFHIRContained { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_RESEARCH_SUBJECT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ACTUAL_ARM = 'actualArm'; const FIELD_ACTUAL_ARM_EXT = '_actualArm'; const FIELD_ASSIGNED_ARM = 'assignedArm'; @@ -191,6 +187,9 @@ class FHIRResearchSubject extends FHIRDomainResource implements PHPFHIRContained */ protected $study = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRResearchSubject Constructor * @param null|array $data @@ -213,8 +212,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ACTUAL_ARM] instanceof FHIRString) { $this->setActualArm($data[self::FIELD_ACTUAL_ARM]); - } elseif ($ext && is_scalar($data[self::FIELD_ACTUAL_ARM])) { - $this->setActualArm(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_ACTUAL_ARM]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ACTUAL_ARM])) { + $this->setActualArm(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_ACTUAL_ARM]] + $ext)); + } else if (is_array($data[self::FIELD_ACTUAL_ARM])) { + $this->setActualArm(new FHIRString(array_merge($ext, $data[self::FIELD_ACTUAL_ARM]))); + } } else { $this->setActualArm(new FHIRString($data[self::FIELD_ACTUAL_ARM])); } @@ -225,8 +228,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ASSIGNED_ARM] instanceof FHIRString) { $this->setAssignedArm($data[self::FIELD_ASSIGNED_ARM]); - } elseif ($ext && is_scalar($data[self::FIELD_ASSIGNED_ARM])) { - $this->setAssignedArm(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_ASSIGNED_ARM]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ASSIGNED_ARM])) { + $this->setAssignedArm(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_ASSIGNED_ARM]] + $ext)); + } else if (is_array($data[self::FIELD_ASSIGNED_ARM])) { + $this->setAssignedArm(new FHIRString(array_merge($ext, $data[self::FIELD_ASSIGNED_ARM]))); + } } else { $this->setAssignedArm(new FHIRString($data[self::FIELD_ASSIGNED_ARM])); } @@ -244,17 +251,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -280,8 +294,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRResearchSubjectStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRResearchSubjectStatus([FHIRResearchSubjectStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRResearchSubjectStatus([FHIRResearchSubjectStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRResearchSubjectStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRResearchSubjectStatus($data[self::FIELD_STATUS])); } @@ -727,11 +745,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getAssignedArm())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ASSIGNED_ARM, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getConsent())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CONSENT, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -744,15 +760,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getIndividual())) { $v->xmlSerialize($sxe->addChild(self::FIELD_INDIVIDUAL, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStudy())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STUDY, null, $v->_getFHIRXMLNamespace())); } @@ -766,18 +779,48 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getActualArm())) { - $a[self::FIELD_ACTUAL_ARM] = $v->getValue(); - $a[self::FIELD_ACTUAL_ARM_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ACTUAL_ARM] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ACTUAL_ARM_EXT] = $enc; + } + } else { + $a[self::FIELD_ACTUAL_ARM] = $v; + } } if (null !== ($v = $this->getAssignedArm())) { - $a[self::FIELD_ASSIGNED_ARM] = $v->getValue(); - $a[self::FIELD_ASSIGNED_ARM_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ASSIGNED_ARM] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ASSIGNED_ARM_EXT] = $enc; + } + } else { + $a[self::FIELD_ASSIGNED_ARM] = $v; + } } if (null !== ($v = $this->getConsent())) { $a[self::FIELD_CONSENT] = $v; } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if (null !== ($v = $this->getIndividual())) { $a[self::FIELD_INDIVIDUAL] = $v; @@ -786,7 +829,15 @@ public function jsonSerialize() $a[self::FIELD_PERIOD] = $v; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getStudy())) { $a[self::FIELD_STUDY] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRRiskAssessment.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRRiskAssessment.php index f32d231474..acd8b2573c 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRRiskAssessment.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRRiskAssessment.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -88,10 +88,6 @@ class FHIRRiskAssessment extends FHIRDomainResource implements PHPFHIRContainedT { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_RISK_ASSESSMENT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_BASED_ON = 'basedOn'; const FIELD_BASIS = 'basis'; const FIELD_CODE = 'code'; @@ -324,6 +320,9 @@ class FHIRRiskAssessment extends FHIRDomainResource implements PHPFHIRContainedT */ protected $subject = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRRiskAssessment Constructor * @param null|array $data @@ -350,6 +349,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_BASIS])) { if (is_array($data[self::FIELD_BASIS])) { foreach($data[self::FIELD_BASIS] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addBasis($v); } else { @@ -389,17 +391,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -418,8 +427,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MITIGATION] instanceof FHIRString) { $this->setMitigation($data[self::FIELD_MITIGATION]); - } elseif ($ext && is_scalar($data[self::FIELD_MITIGATION])) { - $this->setMitigation(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_MITIGATION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MITIGATION])) { + $this->setMitigation(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_MITIGATION]] + $ext)); + } else if (is_array($data[self::FIELD_MITIGATION])) { + $this->setMitigation(new FHIRString(array_merge($ext, $data[self::FIELD_MITIGATION]))); + } } else { $this->setMitigation(new FHIRString($data[self::FIELD_MITIGATION])); } @@ -427,6 +440,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_NOTE])) { if (is_array($data[self::FIELD_NOTE])) { foreach($data[self::FIELD_NOTE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRAnnotation) { $this->addNote($v); } else { @@ -445,8 +461,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_OCCURRENCE_DATE_TIME] instanceof FHIRDateTime) { $this->setOccurrenceDateTime($data[self::FIELD_OCCURRENCE_DATE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_OCCURRENCE_DATE_TIME])) { - $this->setOccurrenceDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_OCCURRENCE_DATE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_OCCURRENCE_DATE_TIME])) { + $this->setOccurrenceDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_OCCURRENCE_DATE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_OCCURRENCE_DATE_TIME])) { + $this->setOccurrenceDateTime(new FHIRDateTime(array_merge($ext, $data[self::FIELD_OCCURRENCE_DATE_TIME]))); + } } else { $this->setOccurrenceDateTime(new FHIRDateTime($data[self::FIELD_OCCURRENCE_DATE_TIME])); } @@ -475,6 +495,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PREDICTION])) { if (is_array($data[self::FIELD_PREDICTION])) { foreach($data[self::FIELD_PREDICTION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRRiskAssessmentPrediction) { $this->addPrediction($v); } else { @@ -490,6 +513,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REASON_CODE])) { if (is_array($data[self::FIELD_REASON_CODE])) { foreach($data[self::FIELD_REASON_CODE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addReasonCode($v); } else { @@ -505,6 +531,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REASON_REFERENCE])) { if (is_array($data[self::FIELD_REASON_REFERENCE])) { foreach($data[self::FIELD_REASON_REFERENCE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addReasonReference($v); } else { @@ -523,8 +552,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRObservationStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRObservationStatus([FHIRObservationStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRObservationStatus([FHIRObservationStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRObservationStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRObservationStatus($data[self::FIELD_STATUS])); } @@ -1454,11 +1487,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getBasedOn())) { $v->xmlSerialize($sxe->addChild(self::FIELD_BASED_ON, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getBasis())) { foreach($vs as $v) { if (null === $v) { @@ -1471,15 +1502,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getCondition())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CONDITION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getEncounter())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ENCOUNTER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -1495,7 +1523,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getMitigation())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MITIGATION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getNote())) { foreach($vs as $v) { if (null === $v) { @@ -1504,22 +1531,19 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_NOTE, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getOccurrenceDateTime())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OCCURRENCE_DATE_TIME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOccurrencePeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OCCURRENCE_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getParent())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PARENT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPerformer())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PERFORMER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getPrediction())) { foreach($vs as $v) { if (null === $v) { @@ -1550,7 +1574,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSubject())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBJECT, null, $v->_getFHIRXMLNamespace())); } @@ -1579,21 +1602,51 @@ public function jsonSerialize() $a[self::FIELD_ENCOUNTER] = $v; } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if (null !== ($v = $this->getMethod())) { $a[self::FIELD_METHOD] = $v; } if (null !== ($v = $this->getMitigation())) { - $a[self::FIELD_MITIGATION] = $v->getValue(); - $a[self::FIELD_MITIGATION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MITIGATION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MITIGATION_EXT] = $enc; + } + } else { + $a[self::FIELD_MITIGATION] = $v; + } } if ([] !== ($vs = $this->getNote())) { $a[self::FIELD_NOTE] = $vs; } if (null !== ($v = $this->getOccurrenceDateTime())) { - $a[self::FIELD_OCCURRENCE_DATE_TIME] = $v->getValue(); - $a[self::FIELD_OCCURRENCE_DATE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_OCCURRENCE_DATE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_OCCURRENCE_DATE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_OCCURRENCE_DATE_TIME] = $v; + } } if (null !== ($v = $this->getOccurrencePeriod())) { $a[self::FIELD_OCCURRENCE_PERIOD] = $v; @@ -1614,7 +1667,15 @@ public function jsonSerialize() $a[self::FIELD_REASON_REFERENCE] = $vs; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getSubject())) { $a[self::FIELD_SUBJECT] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRRiskEvidenceSynthesis.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRRiskEvidenceSynthesis.php index 6865610101..b3fa601030 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRRiskEvidenceSynthesis.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRRiskEvidenceSynthesis.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -97,10 +97,6 @@ class FHIRRiskEvidenceSynthesis extends FHIRDomainResource implements PHPFHIRCon { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_RISK_EVIDENCE_SYNTHESIS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_APPROVAL_DATE = 'approvalDate'; const FIELD_APPROVAL_DATE_EXT = '_approvalDate'; const FIELD_AUTHOR = 'author'; @@ -550,6 +546,9 @@ class FHIRRiskEvidenceSynthesis extends FHIRDomainResource implements PHPFHIRCon */ protected $version = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRRiskEvidenceSynthesis Constructor * @param null|array $data @@ -572,8 +571,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_APPROVAL_DATE] instanceof FHIRDate) { $this->setApprovalDate($data[self::FIELD_APPROVAL_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_APPROVAL_DATE])) { - $this->setApprovalDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_APPROVAL_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_APPROVAL_DATE])) { + $this->setApprovalDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_APPROVAL_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_APPROVAL_DATE])) { + $this->setApprovalDate(new FHIRDate(array_merge($ext, $data[self::FIELD_APPROVAL_DATE]))); + } } else { $this->setApprovalDate(new FHIRDate($data[self::FIELD_APPROVAL_DATE])); } @@ -581,6 +584,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_AUTHOR])) { if (is_array($data[self::FIELD_AUTHOR])) { foreach($data[self::FIELD_AUTHOR] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContactDetail) { $this->addAuthor($v); } else { @@ -596,6 +602,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CERTAINTY])) { if (is_array($data[self::FIELD_CERTAINTY])) { foreach($data[self::FIELD_CERTAINTY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRRiskEvidenceSynthesisCertainty) { $this->addCertainty($v); } else { @@ -611,6 +620,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CONTACT])) { if (is_array($data[self::FIELD_CONTACT])) { foreach($data[self::FIELD_CONTACT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContactDetail) { $this->addContact($v); } else { @@ -629,8 +641,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_COPYRIGHT] instanceof FHIRMarkdown) { $this->setCopyright($data[self::FIELD_COPYRIGHT]); - } elseif ($ext && is_scalar($data[self::FIELD_COPYRIGHT])) { - $this->setCopyright(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_COPYRIGHT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_COPYRIGHT])) { + $this->setCopyright(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_COPYRIGHT]] + $ext)); + } else if (is_array($data[self::FIELD_COPYRIGHT])) { + $this->setCopyright(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_COPYRIGHT]))); + } } else { $this->setCopyright(new FHIRMarkdown($data[self::FIELD_COPYRIGHT])); } @@ -641,8 +657,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATE] instanceof FHIRDateTime) { $this->setDate($data[self::FIELD_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_DATE])) { - $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime(array_merge($ext, $data[self::FIELD_DATE]))); + } } else { $this->setDate(new FHIRDateTime($data[self::FIELD_DATE])); } @@ -653,8 +673,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRMarkdown) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRMarkdown($data[self::FIELD_DESCRIPTION])); } @@ -662,6 +686,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_EDITOR])) { if (is_array($data[self::FIELD_EDITOR])) { foreach($data[self::FIELD_EDITOR] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContactDetail) { $this->addEditor($v); } else { @@ -684,6 +711,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ENDORSER])) { if (is_array($data[self::FIELD_ENDORSER])) { foreach($data[self::FIELD_ENDORSER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContactDetail) { $this->addEndorser($v); } else { @@ -709,17 +739,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -728,6 +765,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_JURISDICTION])) { if (is_array($data[self::FIELD_JURISDICTION])) { foreach($data[self::FIELD_JURISDICTION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addJurisdiction($v); } else { @@ -746,8 +786,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_LAST_REVIEW_DATE] instanceof FHIRDate) { $this->setLastReviewDate($data[self::FIELD_LAST_REVIEW_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_LAST_REVIEW_DATE])) { - $this->setLastReviewDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_LAST_REVIEW_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_LAST_REVIEW_DATE])) { + $this->setLastReviewDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_LAST_REVIEW_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_LAST_REVIEW_DATE])) { + $this->setLastReviewDate(new FHIRDate(array_merge($ext, $data[self::FIELD_LAST_REVIEW_DATE]))); + } } else { $this->setLastReviewDate(new FHIRDate($data[self::FIELD_LAST_REVIEW_DATE])); } @@ -758,8 +802,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -767,6 +815,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_NOTE])) { if (is_array($data[self::FIELD_NOTE])) { foreach($data[self::FIELD_NOTE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRAnnotation) { $this->addNote($v); } else { @@ -799,8 +850,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PUBLISHER] instanceof FHIRString) { $this->setPublisher($data[self::FIELD_PUBLISHER]); - } elseif ($ext && is_scalar($data[self::FIELD_PUBLISHER])) { - $this->setPublisher(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PUBLISHER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PUBLISHER])) { + $this->setPublisher(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PUBLISHER]] + $ext)); + } else if (is_array($data[self::FIELD_PUBLISHER])) { + $this->setPublisher(new FHIRString(array_merge($ext, $data[self::FIELD_PUBLISHER]))); + } } else { $this->setPublisher(new FHIRString($data[self::FIELD_PUBLISHER])); } @@ -808,6 +863,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_RELATED_ARTIFACT])) { if (is_array($data[self::FIELD_RELATED_ARTIFACT])) { foreach($data[self::FIELD_RELATED_ARTIFACT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRRelatedArtifact) { $this->addRelatedArtifact($v); } else { @@ -823,6 +881,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REVIEWER])) { if (is_array($data[self::FIELD_REVIEWER])) { foreach($data[self::FIELD_REVIEWER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContactDetail) { $this->addReviewer($v); } else { @@ -841,8 +902,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_RISK_ESTIMATE] instanceof FHIRRiskEvidenceSynthesisRiskEstimate) { $this->setRiskEstimate($data[self::FIELD_RISK_ESTIMATE]); - } elseif ($ext && is_scalar($data[self::FIELD_RISK_ESTIMATE])) { - $this->setRiskEstimate(new FHIRRiskEvidenceSynthesisRiskEstimate([FHIRRiskEvidenceSynthesisRiskEstimate::FIELD_VALUE => $data[self::FIELD_RISK_ESTIMATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_RISK_ESTIMATE])) { + $this->setRiskEstimate(new FHIRRiskEvidenceSynthesisRiskEstimate([FHIRRiskEvidenceSynthesisRiskEstimate::FIELD_VALUE => $data[self::FIELD_RISK_ESTIMATE]] + $ext)); + } else if (is_array($data[self::FIELD_RISK_ESTIMATE])) { + $this->setRiskEstimate(new FHIRRiskEvidenceSynthesisRiskEstimate(array_merge($ext, $data[self::FIELD_RISK_ESTIMATE]))); + } } else { $this->setRiskEstimate(new FHIRRiskEvidenceSynthesisRiskEstimate($data[self::FIELD_RISK_ESTIMATE])); } @@ -860,8 +925,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRPublicationStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRPublicationStatus([FHIRPublicationStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRPublicationStatus([FHIRPublicationStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRPublicationStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRPublicationStatus($data[self::FIELD_STATUS])); } @@ -886,8 +955,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TITLE] instanceof FHIRString) { $this->setTitle($data[self::FIELD_TITLE]); - } elseif ($ext && is_scalar($data[self::FIELD_TITLE])) { - $this->setTitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TITLE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TITLE])) { + $this->setTitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TITLE]] + $ext)); + } else if (is_array($data[self::FIELD_TITLE])) { + $this->setTitle(new FHIRString(array_merge($ext, $data[self::FIELD_TITLE]))); + } } else { $this->setTitle(new FHIRString($data[self::FIELD_TITLE])); } @@ -895,6 +968,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_TOPIC])) { if (is_array($data[self::FIELD_TOPIC])) { foreach($data[self::FIELD_TOPIC] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addTopic($v); } else { @@ -913,8 +989,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_URL] instanceof FHIRUri) { $this->setUrl($data[self::FIELD_URL]); - } elseif ($ext && is_scalar($data[self::FIELD_URL])) { - $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } else if (is_array($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri(array_merge($ext, $data[self::FIELD_URL]))); + } } else { $this->setUrl(new FHIRUri($data[self::FIELD_URL])); } @@ -922,6 +1002,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_USE_CONTEXT])) { if (is_array($data[self::FIELD_USE_CONTEXT])) { foreach($data[self::FIELD_USE_CONTEXT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRUsageContext) { $this->addUseContext($v); } else { @@ -940,8 +1023,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VERSION] instanceof FHIRString) { $this->setVersion($data[self::FIELD_VERSION]); - } elseif ($ext && is_scalar($data[self::FIELD_VERSION])) { - $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } else if (is_array($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString(array_merge($ext, $data[self::FIELD_VERSION]))); + } } else { $this->setVersion(new FHIRString($data[self::FIELD_VERSION])); } @@ -2676,7 +2763,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getApprovalDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_APPROVAL_DATE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getAuthor())) { foreach($vs as $v) { if (null === $v) { @@ -2703,6 +2789,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_CONTACT, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getCopyright())) { $v->xmlSerialize($sxe->addChild(self::FIELD_COPYRIGHT, null, $v->_getFHIRXMLNamespace())); } @@ -2712,7 +2799,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESCRIPTION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getEditor())) { foreach($vs as $v) { if (null === $v) { @@ -2725,7 +2811,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getEffectivePeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EFFECTIVE_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getEndorser())) { foreach($vs as $v) { if (null === $v) { @@ -2738,7 +2823,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getExposure())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EXPOSURE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -2756,13 +2840,13 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_JURISDICTION, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getLastReviewDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_LAST_REVIEW_DATE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NAME, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getNote())) { foreach($vs as $v) { if (null === $v) { @@ -2775,14 +2859,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getOutcome())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OUTCOME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPopulation())) { $v->xmlSerialize($sxe->addChild(self::FIELD_POPULATION, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getPublisher())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PUBLISHER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getRelatedArtifact())) { foreach($vs as $v) { if (null === $v) { @@ -2804,26 +2886,21 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getRiskEstimate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RISK_ESTIMATE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSampleSize())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SAMPLE_SIZE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStudyType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STUDY_TYPE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSynthesisType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SYNTHESIS_TYPE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getTitle())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TITLE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getTopic())) { foreach($vs as $v) { if (null === $v) { @@ -2832,10 +2909,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_TOPIC, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getUrl())) { $v->xmlSerialize($sxe->addChild(self::FIELD_URL, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getUseContext())) { foreach($vs as $v) { if (null === $v) { @@ -2844,6 +2921,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_USE_CONTEXT, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getVersion())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VERSION, null, $v->_getFHIRXMLNamespace())); } @@ -2857,8 +2935,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getApprovalDate())) { - $a[self::FIELD_APPROVAL_DATE] = $v->getValue(); - $a[self::FIELD_APPROVAL_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_APPROVAL_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_APPROVAL_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_APPROVAL_DATE] = $v; + } } if ([] !== ($vs = $this->getAuthor())) { $a[self::FIELD_AUTHOR] = $vs; @@ -2870,16 +2955,37 @@ public function jsonSerialize() $a[self::FIELD_CONTACT] = $vs; } if (null !== ($v = $this->getCopyright())) { - $a[self::FIELD_COPYRIGHT] = $v->getValue(); - $a[self::FIELD_COPYRIGHT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_COPYRIGHT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_COPYRIGHT_EXT] = $enc; + } + } else { + $a[self::FIELD_COPYRIGHT] = $v; + } } if (null !== ($v = $this->getDate())) { - $a[self::FIELD_DATE] = $v->getValue(); - $a[self::FIELD_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_DATE] = $v; + } } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if ([] !== ($vs = $this->getEditor())) { $a[self::FIELD_EDITOR] = $vs; @@ -2894,18 +3000,48 @@ public function jsonSerialize() $a[self::FIELD_EXPOSURE] = $v; } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if ([] !== ($vs = $this->getJurisdiction())) { $a[self::FIELD_JURISDICTION] = $vs; } if (null !== ($v = $this->getLastReviewDate())) { - $a[self::FIELD_LAST_REVIEW_DATE] = $v->getValue(); - $a[self::FIELD_LAST_REVIEW_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_LAST_REVIEW_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_LAST_REVIEW_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_LAST_REVIEW_DATE] = $v; + } } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if ([] !== ($vs = $this->getNote())) { $a[self::FIELD_NOTE] = $vs; @@ -2917,8 +3053,15 @@ public function jsonSerialize() $a[self::FIELD_POPULATION] = $v; } if (null !== ($v = $this->getPublisher())) { - $a[self::FIELD_PUBLISHER] = $v->getValue(); - $a[self::FIELD_PUBLISHER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PUBLISHER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PUBLISHER_EXT] = $enc; + } + } else { + $a[self::FIELD_PUBLISHER] = $v; + } } if ([] !== ($vs = $this->getRelatedArtifact())) { $a[self::FIELD_RELATED_ARTIFACT] = $vs; @@ -2927,13 +3070,29 @@ public function jsonSerialize() $a[self::FIELD_REVIEWER] = $vs; } if (null !== ($v = $this->getRiskEstimate())) { - $a[self::FIELD_RISK_ESTIMATE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_RISK_ESTIMATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_RISK_ESTIMATE_EXT] = $enc; + } + } else { + $a[self::FIELD_RISK_ESTIMATE] = $v; + } } if (null !== ($v = $this->getSampleSize())) { $a[self::FIELD_SAMPLE_SIZE] = $v; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getStudyType())) { $a[self::FIELD_STUDY_TYPE] = $v; @@ -2942,22 +3101,43 @@ public function jsonSerialize() $a[self::FIELD_SYNTHESIS_TYPE] = $v; } if (null !== ($v = $this->getTitle())) { - $a[self::FIELD_TITLE] = $v->getValue(); - $a[self::FIELD_TITLE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TITLE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TITLE_EXT] = $enc; + } + } else { + $a[self::FIELD_TITLE] = $v; + } } if ([] !== ($vs = $this->getTopic())) { $a[self::FIELD_TOPIC] = $vs; } if (null !== ($v = $this->getUrl())) { - $a[self::FIELD_URL] = $v->getValue(); - $a[self::FIELD_URL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_URL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_URL_EXT] = $enc; + } + } else { + $a[self::FIELD_URL] = $v; + } } if ([] !== ($vs = $this->getUseContext())) { $a[self::FIELD_USE_CONTEXT] = $vs; } if (null !== ($v = $this->getVersion())) { - $a[self::FIELD_VERSION] = $v->getValue(); - $a[self::FIELD_VERSION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VERSION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VERSION_EXT] = $enc; + } + } else { + $a[self::FIELD_VERSION] = $v; + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRSchedule.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRSchedule.php index bb2b5e46ad..4e0ee7e5dc 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRSchedule.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRSchedule.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -84,10 +84,6 @@ class FHIRSchedule extends FHIRDomainResource implements PHPFHIRContainedTypeInt { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SCHEDULE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ACTIVE = 'active'; const FIELD_ACTIVE_EXT = '_active'; const FIELD_ACTOR = 'actor'; @@ -200,6 +196,9 @@ class FHIRSchedule extends FHIRDomainResource implements PHPFHIRContainedTypeInt */ protected $specialty = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSchedule Constructor * @param null|array $data @@ -222,8 +221,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ACTIVE] instanceof FHIRBoolean) { $this->setActive($data[self::FIELD_ACTIVE]); - } elseif ($ext && is_scalar($data[self::FIELD_ACTIVE])) { - $this->setActive(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_ACTIVE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ACTIVE])) { + $this->setActive(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_ACTIVE]] + $ext)); + } else if (is_array($data[self::FIELD_ACTIVE])) { + $this->setActive(new FHIRBoolean(array_merge($ext, $data[self::FIELD_ACTIVE]))); + } } else { $this->setActive(new FHIRBoolean($data[self::FIELD_ACTIVE])); } @@ -231,6 +234,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ACTOR])) { if (is_array($data[self::FIELD_ACTOR])) { foreach($data[self::FIELD_ACTOR] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addActor($v); } else { @@ -249,8 +255,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_COMMENT] instanceof FHIRString) { $this->setComment($data[self::FIELD_COMMENT]); - } elseif ($ext && is_scalar($data[self::FIELD_COMMENT])) { - $this->setComment(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_COMMENT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_COMMENT])) { + $this->setComment(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_COMMENT]] + $ext)); + } else if (is_array($data[self::FIELD_COMMENT])) { + $this->setComment(new FHIRString(array_merge($ext, $data[self::FIELD_COMMENT]))); + } } else { $this->setComment(new FHIRString($data[self::FIELD_COMMENT])); } @@ -261,17 +271,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -287,6 +304,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SERVICE_CATEGORY])) { if (is_array($data[self::FIELD_SERVICE_CATEGORY])) { foreach($data[self::FIELD_SERVICE_CATEGORY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addServiceCategory($v); } else { @@ -302,6 +322,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SERVICE_TYPE])) { if (is_array($data[self::FIELD_SERVICE_TYPE])) { foreach($data[self::FIELD_SERVICE_TYPE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addServiceType($v); } else { @@ -317,6 +340,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SPECIALTY])) { if (is_array($data[self::FIELD_SPECIALTY])) { foreach($data[self::FIELD_SPECIALTY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addSpecialty($v); } else { @@ -898,7 +924,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getActive())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ACTIVE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getActor())) { foreach($vs as $v) { if (null === $v) { @@ -907,10 +932,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_ACTOR, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getComment())) { $v->xmlSerialize($sxe->addChild(self::FIELD_COMMENT, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -923,7 +948,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getPlanningHorizon())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PLANNING_HORIZON, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getServiceCategory())) { foreach($vs as $v) { if (null === $v) { @@ -950,6 +974,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_SPECIALTY, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } @@ -960,18 +985,48 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getActive())) { - $a[self::FIELD_ACTIVE] = $v->getValue(); - $a[self::FIELD_ACTIVE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ACTIVE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ACTIVE_EXT] = $enc; + } + } else { + $a[self::FIELD_ACTIVE] = $v; + } } if ([] !== ($vs = $this->getActor())) { $a[self::FIELD_ACTOR] = $vs; } if (null !== ($v = $this->getComment())) { - $a[self::FIELD_COMMENT] = $v->getValue(); - $a[self::FIELD_COMMENT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_COMMENT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_COMMENT_EXT] = $enc; + } + } else { + $a[self::FIELD_COMMENT] = $v; + } } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if (null !== ($v = $this->getPlanningHorizon())) { $a[self::FIELD_PLANNING_HORIZON] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRSearchParameter.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRSearchParameter.php index dca86def82..fc790494a9 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRSearchParameter.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRSearchParameter.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -95,10 +95,6 @@ class FHIRSearchParameter extends FHIRDomainResource implements PHPFHIRContained { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SEARCH_PARAMETER; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_BASE = 'base'; const FIELD_BASE_EXT = '_base'; const FIELD_CHAIN = 'chain'; @@ -482,6 +478,9 @@ class FHIRSearchParameter extends FHIRDomainResource implements PHPFHIRContained */ protected $xpathUsage = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSearchParameter Constructor * @param null|array $data @@ -504,17 +503,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_BASE])) { foreach($data[self::FIELD_BASE] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCode) { $this->addBase($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addBase(new FHIRCode([FHIRCode::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addBase(new FHIRCode([FHIRCode::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addBase(new FHIRCode(array_merge($v, $ext[$i]))); + } } else { $this->addBase(new FHIRCode($v)); } } } elseif ($data[self::FIELD_BASE] instanceof FHIRCode) { $this->addBase($data[self::FIELD_BASE]); - } elseif ($ext && is_scalar($data[self::FIELD_BASE])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_BASE])) { $this->addBase(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_BASE]] + $ext)); } else { $this->addBase(new FHIRCode($data[self::FIELD_BASE])); @@ -526,17 +532,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_CHAIN])) { foreach($data[self::FIELD_CHAIN] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRString) { $this->addChain($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addChain(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addChain(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addChain(new FHIRString(array_merge($v, $ext[$i]))); + } } else { $this->addChain(new FHIRString($v)); } } } elseif ($data[self::FIELD_CHAIN] instanceof FHIRString) { $this->addChain($data[self::FIELD_CHAIN]); - } elseif ($ext && is_scalar($data[self::FIELD_CHAIN])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_CHAIN])) { $this->addChain(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_CHAIN]] + $ext)); } else { $this->addChain(new FHIRString($data[self::FIELD_CHAIN])); @@ -548,8 +561,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CODE] instanceof FHIRCode) { $this->setCode($data[self::FIELD_CODE]); - } elseif ($ext && is_scalar($data[self::FIELD_CODE])) { - $this->setCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_CODE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CODE])) { + $this->setCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_CODE]] + $ext)); + } else if (is_array($data[self::FIELD_CODE])) { + $this->setCode(new FHIRCode(array_merge($ext, $data[self::FIELD_CODE]))); + } } else { $this->setCode(new FHIRCode($data[self::FIELD_CODE])); } @@ -560,17 +577,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_COMPARATOR])) { foreach($data[self::FIELD_COMPARATOR] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRSearchComparator) { $this->addComparator($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addComparator(new FHIRSearchComparator([FHIRSearchComparator::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addComparator(new FHIRSearchComparator([FHIRSearchComparator::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addComparator(new FHIRSearchComparator(array_merge($v, $ext[$i]))); + } } else { $this->addComparator(new FHIRSearchComparator($v)); } } } elseif ($data[self::FIELD_COMPARATOR] instanceof FHIRSearchComparator) { $this->addComparator($data[self::FIELD_COMPARATOR]); - } elseif ($ext && is_scalar($data[self::FIELD_COMPARATOR])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_COMPARATOR])) { $this->addComparator(new FHIRSearchComparator([FHIRSearchComparator::FIELD_VALUE => $data[self::FIELD_COMPARATOR]] + $ext)); } else { $this->addComparator(new FHIRSearchComparator($data[self::FIELD_COMPARATOR])); @@ -579,6 +603,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_COMPONENT])) { if (is_array($data[self::FIELD_COMPONENT])) { foreach($data[self::FIELD_COMPONENT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRSearchParameterComponent) { $this->addComponent($v); } else { @@ -594,6 +621,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CONTACT])) { if (is_array($data[self::FIELD_CONTACT])) { foreach($data[self::FIELD_CONTACT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContactDetail) { $this->addContact($v); } else { @@ -612,8 +642,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATE] instanceof FHIRDateTime) { $this->setDate($data[self::FIELD_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_DATE])) { - $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime(array_merge($ext, $data[self::FIELD_DATE]))); + } } else { $this->setDate(new FHIRDateTime($data[self::FIELD_DATE])); } @@ -624,8 +658,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DERIVED_FROM] instanceof FHIRCanonical) { $this->setDerivedFrom($data[self::FIELD_DERIVED_FROM]); - } elseif ($ext && is_scalar($data[self::FIELD_DERIVED_FROM])) { - $this->setDerivedFrom(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $data[self::FIELD_DERIVED_FROM]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DERIVED_FROM])) { + $this->setDerivedFrom(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $data[self::FIELD_DERIVED_FROM]] + $ext)); + } else if (is_array($data[self::FIELD_DERIVED_FROM])) { + $this->setDerivedFrom(new FHIRCanonical(array_merge($ext, $data[self::FIELD_DERIVED_FROM]))); + } } else { $this->setDerivedFrom(new FHIRCanonical($data[self::FIELD_DERIVED_FROM])); } @@ -636,8 +674,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRMarkdown) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRMarkdown($data[self::FIELD_DESCRIPTION])); } @@ -648,8 +690,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EXPERIMENTAL] instanceof FHIRBoolean) { $this->setExperimental($data[self::FIELD_EXPERIMENTAL]); - } elseif ($ext && is_scalar($data[self::FIELD_EXPERIMENTAL])) { - $this->setExperimental(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_EXPERIMENTAL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EXPERIMENTAL])) { + $this->setExperimental(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_EXPERIMENTAL]] + $ext)); + } else if (is_array($data[self::FIELD_EXPERIMENTAL])) { + $this->setExperimental(new FHIRBoolean(array_merge($ext, $data[self::FIELD_EXPERIMENTAL]))); + } } else { $this->setExperimental(new FHIRBoolean($data[self::FIELD_EXPERIMENTAL])); } @@ -660,8 +706,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EXPRESSION] instanceof FHIRString) { $this->setExpression($data[self::FIELD_EXPRESSION]); - } elseif ($ext && is_scalar($data[self::FIELD_EXPRESSION])) { - $this->setExpression(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_EXPRESSION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EXPRESSION])) { + $this->setExpression(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_EXPRESSION]] + $ext)); + } else if (is_array($data[self::FIELD_EXPRESSION])) { + $this->setExpression(new FHIRString(array_merge($ext, $data[self::FIELD_EXPRESSION]))); + } } else { $this->setExpression(new FHIRString($data[self::FIELD_EXPRESSION])); } @@ -669,6 +719,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_JURISDICTION])) { if (is_array($data[self::FIELD_JURISDICTION])) { foreach($data[self::FIELD_JURISDICTION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addJurisdiction($v); } else { @@ -687,17 +740,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_MODIFIER])) { foreach($data[self::FIELD_MODIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRSearchModifierCode) { $this->addModifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addModifier(new FHIRSearchModifierCode([FHIRSearchModifierCode::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addModifier(new FHIRSearchModifierCode([FHIRSearchModifierCode::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addModifier(new FHIRSearchModifierCode(array_merge($v, $ext[$i]))); + } } else { $this->addModifier(new FHIRSearchModifierCode($v)); } } } elseif ($data[self::FIELD_MODIFIER] instanceof FHIRSearchModifierCode) { $this->addModifier($data[self::FIELD_MODIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_MODIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_MODIFIER])) { $this->addModifier(new FHIRSearchModifierCode([FHIRSearchModifierCode::FIELD_VALUE => $data[self::FIELD_MODIFIER]] + $ext)); } else { $this->addModifier(new FHIRSearchModifierCode($data[self::FIELD_MODIFIER])); @@ -709,8 +769,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MULTIPLE_AND] instanceof FHIRBoolean) { $this->setMultipleAnd($data[self::FIELD_MULTIPLE_AND]); - } elseif ($ext && is_scalar($data[self::FIELD_MULTIPLE_AND])) { - $this->setMultipleAnd(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_MULTIPLE_AND]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MULTIPLE_AND])) { + $this->setMultipleAnd(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_MULTIPLE_AND]] + $ext)); + } else if (is_array($data[self::FIELD_MULTIPLE_AND])) { + $this->setMultipleAnd(new FHIRBoolean(array_merge($ext, $data[self::FIELD_MULTIPLE_AND]))); + } } else { $this->setMultipleAnd(new FHIRBoolean($data[self::FIELD_MULTIPLE_AND])); } @@ -721,8 +785,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MULTIPLE_OR] instanceof FHIRBoolean) { $this->setMultipleOr($data[self::FIELD_MULTIPLE_OR]); - } elseif ($ext && is_scalar($data[self::FIELD_MULTIPLE_OR])) { - $this->setMultipleOr(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_MULTIPLE_OR]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MULTIPLE_OR])) { + $this->setMultipleOr(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_MULTIPLE_OR]] + $ext)); + } else if (is_array($data[self::FIELD_MULTIPLE_OR])) { + $this->setMultipleOr(new FHIRBoolean(array_merge($ext, $data[self::FIELD_MULTIPLE_OR]))); + } } else { $this->setMultipleOr(new FHIRBoolean($data[self::FIELD_MULTIPLE_OR])); } @@ -733,8 +801,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -745,8 +817,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PUBLISHER] instanceof FHIRString) { $this->setPublisher($data[self::FIELD_PUBLISHER]); - } elseif ($ext && is_scalar($data[self::FIELD_PUBLISHER])) { - $this->setPublisher(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PUBLISHER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PUBLISHER])) { + $this->setPublisher(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PUBLISHER]] + $ext)); + } else if (is_array($data[self::FIELD_PUBLISHER])) { + $this->setPublisher(new FHIRString(array_merge($ext, $data[self::FIELD_PUBLISHER]))); + } } else { $this->setPublisher(new FHIRString($data[self::FIELD_PUBLISHER])); } @@ -757,8 +833,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PURPOSE] instanceof FHIRMarkdown) { $this->setPurpose($data[self::FIELD_PURPOSE]); - } elseif ($ext && is_scalar($data[self::FIELD_PURPOSE])) { - $this->setPurpose(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_PURPOSE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PURPOSE])) { + $this->setPurpose(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_PURPOSE]] + $ext)); + } else if (is_array($data[self::FIELD_PURPOSE])) { + $this->setPurpose(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_PURPOSE]))); + } } else { $this->setPurpose(new FHIRMarkdown($data[self::FIELD_PURPOSE])); } @@ -769,8 +849,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRPublicationStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRPublicationStatus([FHIRPublicationStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRPublicationStatus([FHIRPublicationStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRPublicationStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRPublicationStatus($data[self::FIELD_STATUS])); } @@ -781,17 +865,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_TARGET])) { foreach($data[self::FIELD_TARGET] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCode) { $this->addTarget($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addTarget(new FHIRCode([FHIRCode::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addTarget(new FHIRCode([FHIRCode::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addTarget(new FHIRCode(array_merge($v, $ext[$i]))); + } } else { $this->addTarget(new FHIRCode($v)); } } } elseif ($data[self::FIELD_TARGET] instanceof FHIRCode) { $this->addTarget($data[self::FIELD_TARGET]); - } elseif ($ext && is_scalar($data[self::FIELD_TARGET])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_TARGET])) { $this->addTarget(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_TARGET]] + $ext)); } else { $this->addTarget(new FHIRCode($data[self::FIELD_TARGET])); @@ -803,8 +894,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TYPE] instanceof FHIRSearchParamType) { $this->setType($data[self::FIELD_TYPE]); - } elseif ($ext && is_scalar($data[self::FIELD_TYPE])) { - $this->setType(new FHIRSearchParamType([FHIRSearchParamType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TYPE])) { + $this->setType(new FHIRSearchParamType([FHIRSearchParamType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } else if (is_array($data[self::FIELD_TYPE])) { + $this->setType(new FHIRSearchParamType(array_merge($ext, $data[self::FIELD_TYPE]))); + } } else { $this->setType(new FHIRSearchParamType($data[self::FIELD_TYPE])); } @@ -815,8 +910,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_URL] instanceof FHIRUri) { $this->setUrl($data[self::FIELD_URL]); - } elseif ($ext && is_scalar($data[self::FIELD_URL])) { - $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } else if (is_array($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri(array_merge($ext, $data[self::FIELD_URL]))); + } } else { $this->setUrl(new FHIRUri($data[self::FIELD_URL])); } @@ -824,6 +923,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_USE_CONTEXT])) { if (is_array($data[self::FIELD_USE_CONTEXT])) { foreach($data[self::FIELD_USE_CONTEXT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRUsageContext) { $this->addUseContext($v); } else { @@ -842,8 +944,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VERSION] instanceof FHIRString) { $this->setVersion($data[self::FIELD_VERSION]); - } elseif ($ext && is_scalar($data[self::FIELD_VERSION])) { - $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } else if (is_array($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString(array_merge($ext, $data[self::FIELD_VERSION]))); + } } else { $this->setVersion(new FHIRString($data[self::FIELD_VERSION])); } @@ -854,8 +960,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_XPATH] instanceof FHIRString) { $this->setXpath($data[self::FIELD_XPATH]); - } elseif ($ext && is_scalar($data[self::FIELD_XPATH])) { - $this->setXpath(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_XPATH]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_XPATH])) { + $this->setXpath(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_XPATH]] + $ext)); + } else if (is_array($data[self::FIELD_XPATH])) { + $this->setXpath(new FHIRString(array_merge($ext, $data[self::FIELD_XPATH]))); + } } else { $this->setXpath(new FHIRString($data[self::FIELD_XPATH])); } @@ -866,8 +976,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_XPATH_USAGE] instanceof FHIRXPathUsageType) { $this->setXpathUsage($data[self::FIELD_XPATH_USAGE]); - } elseif ($ext && is_scalar($data[self::FIELD_XPATH_USAGE])) { - $this->setXpathUsage(new FHIRXPathUsageType([FHIRXPathUsageType::FIELD_VALUE => $data[self::FIELD_XPATH_USAGE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_XPATH_USAGE])) { + $this->setXpathUsage(new FHIRXPathUsageType([FHIRXPathUsageType::FIELD_VALUE => $data[self::FIELD_XPATH_USAGE]] + $ext)); + } else if (is_array($data[self::FIELD_XPATH_USAGE])) { + $this->setXpathUsage(new FHIRXPathUsageType(array_merge($ext, $data[self::FIELD_XPATH_USAGE]))); + } } else { $this->setXpathUsage(new FHIRXPathUsageType($data[self::FIELD_XPATH_USAGE])); } @@ -2396,6 +2510,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_BASE, null, $v->_getFHIRXMLNamespace())); } } + if ([] !== ($vs = $this->getChain())) { foreach($vs as $v) { if (null === $v) { @@ -2404,10 +2519,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_CHAIN, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getComparator())) { foreach($vs as $v) { if (null === $v) { @@ -2434,6 +2549,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_CONTACT, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DATE, null, $v->_getFHIRXMLNamespace())); } @@ -2449,7 +2565,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getExpression())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EXPRESSION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getJurisdiction())) { foreach($vs as $v) { if (null === $v) { @@ -2467,6 +2582,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_MODIFIER, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getMultipleAnd())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MULTIPLE_AND, null, $v->_getFHIRXMLNamespace())); } @@ -2482,7 +2598,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getPurpose())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PURPOSE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } @@ -2501,7 +2616,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getUrl())) { $v->xmlSerialize($sxe->addChild(self::FIELD_URL, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getUseContext())) { foreach($vs as $v) { if (null === $v) { @@ -2510,13 +2624,13 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_USE_CONTEXT, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getVersion())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VERSION, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getXpath())) { $v->xmlSerialize($sxe->addChild(self::FIELD_XPATH, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getXpathUsage())) { $v->xmlSerialize($sxe->addChild(self::FIELD_XPATH_USAGE, null, $v->_getFHIRXMLNamespace())); } @@ -2535,8 +2649,17 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_BASE][] = $v->getValue(); - $a[self::FIELD_BASE_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_BASE][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_BASE_EXT][] = $enc; + } else { + $a[self::FIELD_BASE_EXT][] = null; + } + } else { + $a[self::FIELD_BASE][] = $v; + } } } if ([] !== ($vs = $this->getChain())) { @@ -2545,16 +2668,48 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_CHAIN][] = $v->getValue(); - $a[self::FIELD_CHAIN_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CHAIN][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CHAIN_EXT][] = $enc; + } else { + $a[self::FIELD_CHAIN_EXT][] = null; + } + } else { + $a[self::FIELD_CHAIN][] = $v; + } } } if (null !== ($v = $this->getCode())) { - $a[self::FIELD_CODE] = $v->getValue(); - $a[self::FIELD_CODE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CODE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CODE_EXT] = $enc; + } + } else { + $a[self::FIELD_CODE] = $v; + } } if ([] !== ($vs = $this->getComparator())) { - $a[self::FIELD_COMPARATOR] = $vs; + $a[self::FIELD_COMPARATOR] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_COMPARATOR][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_COMPARATOR_EXT][] = $enc; + } else { + $a[self::FIELD_COMPARATOR_EXT][] = null; + } + } else { + $a[self::FIELD_COMPARATOR][] = $v; + } + } } if ([] !== ($vs = $this->getComponent())) { $a[self::FIELD_COMPONENT] = $vs; @@ -2563,53 +2718,147 @@ public function jsonSerialize() $a[self::FIELD_CONTACT] = $vs; } if (null !== ($v = $this->getDate())) { - $a[self::FIELD_DATE] = $v->getValue(); - $a[self::FIELD_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_DATE] = $v; + } } if (null !== ($v = $this->getDerivedFrom())) { - $a[self::FIELD_DERIVED_FROM] = $v->getValue(); - $a[self::FIELD_DERIVED_FROM_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DERIVED_FROM] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DERIVED_FROM_EXT] = $enc; + } + } else { + $a[self::FIELD_DERIVED_FROM] = $v; + } } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if (null !== ($v = $this->getExperimental())) { - $a[self::FIELD_EXPERIMENTAL] = $v->getValue(); - $a[self::FIELD_EXPERIMENTAL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EXPERIMENTAL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EXPERIMENTAL_EXT] = $enc; + } + } else { + $a[self::FIELD_EXPERIMENTAL] = $v; + } } if (null !== ($v = $this->getExpression())) { - $a[self::FIELD_EXPRESSION] = $v->getValue(); - $a[self::FIELD_EXPRESSION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EXPRESSION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EXPRESSION_EXT] = $enc; + } + } else { + $a[self::FIELD_EXPRESSION] = $v; + } } if ([] !== ($vs = $this->getJurisdiction())) { $a[self::FIELD_JURISDICTION] = $vs; } if ([] !== ($vs = $this->getModifier())) { - $a[self::FIELD_MODIFIER] = $vs; + $a[self::FIELD_MODIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MODIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MODIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_MODIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_MODIFIER][] = $v; + } + } } if (null !== ($v = $this->getMultipleAnd())) { - $a[self::FIELD_MULTIPLE_AND] = $v->getValue(); - $a[self::FIELD_MULTIPLE_AND_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MULTIPLE_AND] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MULTIPLE_AND_EXT] = $enc; + } + } else { + $a[self::FIELD_MULTIPLE_AND] = $v; + } } if (null !== ($v = $this->getMultipleOr())) { - $a[self::FIELD_MULTIPLE_OR] = $v->getValue(); - $a[self::FIELD_MULTIPLE_OR_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MULTIPLE_OR] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MULTIPLE_OR_EXT] = $enc; + } + } else { + $a[self::FIELD_MULTIPLE_OR] = $v; + } } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if (null !== ($v = $this->getPublisher())) { - $a[self::FIELD_PUBLISHER] = $v->getValue(); - $a[self::FIELD_PUBLISHER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PUBLISHER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PUBLISHER_EXT] = $enc; + } + } else { + $a[self::FIELD_PUBLISHER] = $v; + } } if (null !== ($v = $this->getPurpose())) { - $a[self::FIELD_PURPOSE] = $v->getValue(); - $a[self::FIELD_PURPOSE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PURPOSE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PURPOSE_EXT] = $enc; + } + } else { + $a[self::FIELD_PURPOSE] = $v; + } } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if ([] !== ($vs = $this->getTarget())) { $a[self::FIELD_TARGET] = []; @@ -2617,30 +2866,76 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_TARGET][] = $v->getValue(); - $a[self::FIELD_TARGET_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TARGET][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TARGET_EXT][] = $enc; + } else { + $a[self::FIELD_TARGET_EXT][] = null; + } + } else { + $a[self::FIELD_TARGET][] = $v; + } } } if (null !== ($v = $this->getType())) { - $a[self::FIELD_TYPE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TYPE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TYPE_EXT] = $enc; + } + } else { + $a[self::FIELD_TYPE] = $v; + } } if (null !== ($v = $this->getUrl())) { - $a[self::FIELD_URL] = $v->getValue(); - $a[self::FIELD_URL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_URL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_URL_EXT] = $enc; + } + } else { + $a[self::FIELD_URL] = $v; + } } if ([] !== ($vs = $this->getUseContext())) { $a[self::FIELD_USE_CONTEXT] = $vs; } if (null !== ($v = $this->getVersion())) { - $a[self::FIELD_VERSION] = $v->getValue(); - $a[self::FIELD_VERSION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VERSION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VERSION_EXT] = $enc; + } + } else { + $a[self::FIELD_VERSION] = $v; + } } if (null !== ($v = $this->getXpath())) { - $a[self::FIELD_XPATH] = $v->getValue(); - $a[self::FIELD_XPATH_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_XPATH] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_XPATH_EXT] = $enc; + } + } else { + $a[self::FIELD_XPATH] = $v; + } } if (null !== ($v = $this->getXpathUsage())) { - $a[self::FIELD_XPATH_USAGE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_XPATH_USAGE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_XPATH_USAGE_EXT] = $enc; + } + } else { + $a[self::FIELD_XPATH_USAGE] = $v; + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRServiceRequest.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRServiceRequest.php index e4ed4fbc09..14570a81e6 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRServiceRequest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRServiceRequest.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -96,10 +96,6 @@ class FHIRServiceRequest extends FHIRDomainResource implements PHPFHIRContainedT { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SERVICE_REQUEST; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_AS_NEEDED_BOOLEAN = 'asNeededBoolean'; const FIELD_AS_NEEDED_BOOLEAN_EXT = '_asNeededBoolean'; const FIELD_AS_NEEDED_CODEABLE_CONCEPT = 'asNeededCodeableConcept'; @@ -640,6 +636,9 @@ class FHIRServiceRequest extends FHIRDomainResource implements PHPFHIRContainedT */ protected $supportingInfo = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRServiceRequest Constructor * @param null|array $data @@ -662,8 +661,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_AS_NEEDED_BOOLEAN] instanceof FHIRBoolean) { $this->setAsNeededBoolean($data[self::FIELD_AS_NEEDED_BOOLEAN]); - } elseif ($ext && is_scalar($data[self::FIELD_AS_NEEDED_BOOLEAN])) { - $this->setAsNeededBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_AS_NEEDED_BOOLEAN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_AS_NEEDED_BOOLEAN])) { + $this->setAsNeededBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_AS_NEEDED_BOOLEAN]] + $ext)); + } else if (is_array($data[self::FIELD_AS_NEEDED_BOOLEAN])) { + $this->setAsNeededBoolean(new FHIRBoolean(array_merge($ext, $data[self::FIELD_AS_NEEDED_BOOLEAN]))); + } } else { $this->setAsNeededBoolean(new FHIRBoolean($data[self::FIELD_AS_NEEDED_BOOLEAN])); } @@ -681,8 +684,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_AUTHORED_ON] instanceof FHIRDateTime) { $this->setAuthoredOn($data[self::FIELD_AUTHORED_ON]); - } elseif ($ext && is_scalar($data[self::FIELD_AUTHORED_ON])) { - $this->setAuthoredOn(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_AUTHORED_ON]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_AUTHORED_ON])) { + $this->setAuthoredOn(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_AUTHORED_ON]] + $ext)); + } else if (is_array($data[self::FIELD_AUTHORED_ON])) { + $this->setAuthoredOn(new FHIRDateTime(array_merge($ext, $data[self::FIELD_AUTHORED_ON]))); + } } else { $this->setAuthoredOn(new FHIRDateTime($data[self::FIELD_AUTHORED_ON])); } @@ -690,6 +697,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_BASED_ON])) { if (is_array($data[self::FIELD_BASED_ON])) { foreach($data[self::FIELD_BASED_ON] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addBasedOn($v); } else { @@ -705,6 +715,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_BODY_SITE])) { if (is_array($data[self::FIELD_BODY_SITE])) { foreach($data[self::FIELD_BODY_SITE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addBodySite($v); } else { @@ -720,6 +733,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CATEGORY])) { if (is_array($data[self::FIELD_CATEGORY])) { foreach($data[self::FIELD_CATEGORY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addCategory($v); } else { @@ -745,8 +761,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DO_NOT_PERFORM] instanceof FHIRBoolean) { $this->setDoNotPerform($data[self::FIELD_DO_NOT_PERFORM]); - } elseif ($ext && is_scalar($data[self::FIELD_DO_NOT_PERFORM])) { - $this->setDoNotPerform(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_DO_NOT_PERFORM]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DO_NOT_PERFORM])) { + $this->setDoNotPerform(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_DO_NOT_PERFORM]] + $ext)); + } else if (is_array($data[self::FIELD_DO_NOT_PERFORM])) { + $this->setDoNotPerform(new FHIRBoolean(array_merge($ext, $data[self::FIELD_DO_NOT_PERFORM]))); + } } else { $this->setDoNotPerform(new FHIRBoolean($data[self::FIELD_DO_NOT_PERFORM])); } @@ -764,17 +784,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -786,17 +813,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_INSTANTIATES_CANONICAL])) { foreach($data[self::FIELD_INSTANTIATES_CANONICAL] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCanonical) { $this->addInstantiatesCanonical($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addInstantiatesCanonical(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addInstantiatesCanonical(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addInstantiatesCanonical(new FHIRCanonical(array_merge($v, $ext[$i]))); + } } else { $this->addInstantiatesCanonical(new FHIRCanonical($v)); } } } elseif ($data[self::FIELD_INSTANTIATES_CANONICAL] instanceof FHIRCanonical) { $this->addInstantiatesCanonical($data[self::FIELD_INSTANTIATES_CANONICAL]); - } elseif ($ext && is_scalar($data[self::FIELD_INSTANTIATES_CANONICAL])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_INSTANTIATES_CANONICAL])) { $this->addInstantiatesCanonical(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $data[self::FIELD_INSTANTIATES_CANONICAL]] + $ext)); } else { $this->addInstantiatesCanonical(new FHIRCanonical($data[self::FIELD_INSTANTIATES_CANONICAL])); @@ -808,17 +842,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_INSTANTIATES_URI])) { foreach($data[self::FIELD_INSTANTIATES_URI] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRUri) { $this->addInstantiatesUri($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addInstantiatesUri(new FHIRUri([FHIRUri::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addInstantiatesUri(new FHIRUri([FHIRUri::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addInstantiatesUri(new FHIRUri(array_merge($v, $ext[$i]))); + } } else { $this->addInstantiatesUri(new FHIRUri($v)); } } } elseif ($data[self::FIELD_INSTANTIATES_URI] instanceof FHIRUri) { $this->addInstantiatesUri($data[self::FIELD_INSTANTIATES_URI]); - } elseif ($ext && is_scalar($data[self::FIELD_INSTANTIATES_URI])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_INSTANTIATES_URI])) { $this->addInstantiatesUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_INSTANTIATES_URI]] + $ext)); } else { $this->addInstantiatesUri(new FHIRUri($data[self::FIELD_INSTANTIATES_URI])); @@ -827,6 +868,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_INSURANCE])) { if (is_array($data[self::FIELD_INSURANCE])) { foreach($data[self::FIELD_INSURANCE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addInsurance($v); } else { @@ -845,8 +889,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_INTENT] instanceof FHIRRequestIntent) { $this->setIntent($data[self::FIELD_INTENT]); - } elseif ($ext && is_scalar($data[self::FIELD_INTENT])) { - $this->setIntent(new FHIRRequestIntent([FHIRRequestIntent::FIELD_VALUE => $data[self::FIELD_INTENT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_INTENT])) { + $this->setIntent(new FHIRRequestIntent([FHIRRequestIntent::FIELD_VALUE => $data[self::FIELD_INTENT]] + $ext)); + } else if (is_array($data[self::FIELD_INTENT])) { + $this->setIntent(new FHIRRequestIntent(array_merge($ext, $data[self::FIELD_INTENT]))); + } } else { $this->setIntent(new FHIRRequestIntent($data[self::FIELD_INTENT])); } @@ -854,6 +902,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_LOCATION_CODE])) { if (is_array($data[self::FIELD_LOCATION_CODE])) { foreach($data[self::FIELD_LOCATION_CODE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addLocationCode($v); } else { @@ -869,6 +920,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_LOCATION_REFERENCE])) { if (is_array($data[self::FIELD_LOCATION_REFERENCE])) { foreach($data[self::FIELD_LOCATION_REFERENCE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addLocationReference($v); } else { @@ -884,6 +938,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_NOTE])) { if (is_array($data[self::FIELD_NOTE])) { foreach($data[self::FIELD_NOTE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRAnnotation) { $this->addNote($v); } else { @@ -902,8 +959,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_OCCURRENCE_DATE_TIME] instanceof FHIRDateTime) { $this->setOccurrenceDateTime($data[self::FIELD_OCCURRENCE_DATE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_OCCURRENCE_DATE_TIME])) { - $this->setOccurrenceDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_OCCURRENCE_DATE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_OCCURRENCE_DATE_TIME])) { + $this->setOccurrenceDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_OCCURRENCE_DATE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_OCCURRENCE_DATE_TIME])) { + $this->setOccurrenceDateTime(new FHIRDateTime(array_merge($ext, $data[self::FIELD_OCCURRENCE_DATE_TIME]))); + } } else { $this->setOccurrenceDateTime(new FHIRDateTime($data[self::FIELD_OCCURRENCE_DATE_TIME])); } @@ -925,6 +986,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ORDER_DETAIL])) { if (is_array($data[self::FIELD_ORDER_DETAIL])) { foreach($data[self::FIELD_ORDER_DETAIL] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addOrderDetail($v); } else { @@ -943,8 +1007,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PATIENT_INSTRUCTION] instanceof FHIRString) { $this->setPatientInstruction($data[self::FIELD_PATIENT_INSTRUCTION]); - } elseif ($ext && is_scalar($data[self::FIELD_PATIENT_INSTRUCTION])) { - $this->setPatientInstruction(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PATIENT_INSTRUCTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PATIENT_INSTRUCTION])) { + $this->setPatientInstruction(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PATIENT_INSTRUCTION]] + $ext)); + } else if (is_array($data[self::FIELD_PATIENT_INSTRUCTION])) { + $this->setPatientInstruction(new FHIRString(array_merge($ext, $data[self::FIELD_PATIENT_INSTRUCTION]))); + } } else { $this->setPatientInstruction(new FHIRString($data[self::FIELD_PATIENT_INSTRUCTION])); } @@ -952,6 +1020,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PERFORMER])) { if (is_array($data[self::FIELD_PERFORMER])) { foreach($data[self::FIELD_PERFORMER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addPerformer($v); } else { @@ -977,8 +1048,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PRIORITY] instanceof FHIRRequestPriority) { $this->setPriority($data[self::FIELD_PRIORITY]); - } elseif ($ext && is_scalar($data[self::FIELD_PRIORITY])) { - $this->setPriority(new FHIRRequestPriority([FHIRRequestPriority::FIELD_VALUE => $data[self::FIELD_PRIORITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PRIORITY])) { + $this->setPriority(new FHIRRequestPriority([FHIRRequestPriority::FIELD_VALUE => $data[self::FIELD_PRIORITY]] + $ext)); + } else if (is_array($data[self::FIELD_PRIORITY])) { + $this->setPriority(new FHIRRequestPriority(array_merge($ext, $data[self::FIELD_PRIORITY]))); + } } else { $this->setPriority(new FHIRRequestPriority($data[self::FIELD_PRIORITY])); } @@ -989,8 +1064,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_QUANTITY_QUANTITY] instanceof FHIRQuantity) { $this->setQuantityQuantity($data[self::FIELD_QUANTITY_QUANTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_QUANTITY_QUANTITY])) { - $this->setQuantityQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_QUANTITY_QUANTITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_QUANTITY_QUANTITY])) { + $this->setQuantityQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_QUANTITY_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_QUANTITY_QUANTITY])) { + $this->setQuantityQuantity(new FHIRQuantity(array_merge($ext, $data[self::FIELD_QUANTITY_QUANTITY]))); + } } else { $this->setQuantityQuantity(new FHIRQuantity($data[self::FIELD_QUANTITY_QUANTITY])); } @@ -1012,6 +1091,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REASON_CODE])) { if (is_array($data[self::FIELD_REASON_CODE])) { foreach($data[self::FIELD_REASON_CODE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addReasonCode($v); } else { @@ -1027,6 +1109,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REASON_REFERENCE])) { if (is_array($data[self::FIELD_REASON_REFERENCE])) { foreach($data[self::FIELD_REASON_REFERENCE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addReasonReference($v); } else { @@ -1042,6 +1127,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_RELEVANT_HISTORY])) { if (is_array($data[self::FIELD_RELEVANT_HISTORY])) { foreach($data[self::FIELD_RELEVANT_HISTORY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addRelevantHistory($v); } else { @@ -1057,6 +1145,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REPLACES])) { if (is_array($data[self::FIELD_REPLACES])) { foreach($data[self::FIELD_REPLACES] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addReplaces($v); } else { @@ -1082,8 +1173,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_REQUISITION] instanceof FHIRIdentifier) { $this->setRequisition($data[self::FIELD_REQUISITION]); - } elseif ($ext && is_scalar($data[self::FIELD_REQUISITION])) { - $this->setRequisition(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_REQUISITION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_REQUISITION])) { + $this->setRequisition(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_REQUISITION]] + $ext)); + } else if (is_array($data[self::FIELD_REQUISITION])) { + $this->setRequisition(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_REQUISITION]))); + } } else { $this->setRequisition(new FHIRIdentifier($data[self::FIELD_REQUISITION])); } @@ -1091,6 +1186,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SPECIMEN])) { if (is_array($data[self::FIELD_SPECIMEN])) { foreach($data[self::FIELD_SPECIMEN] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addSpecimen($v); } else { @@ -1109,8 +1207,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRRequestStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRRequestStatus([FHIRRequestStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRRequestStatus([FHIRRequestStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRRequestStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRRequestStatus($data[self::FIELD_STATUS])); } @@ -1125,6 +1227,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SUPPORTING_INFO])) { if (is_array($data[self::FIELD_SUPPORTING_INFO])) { foreach($data[self::FIELD_SUPPORTING_INFO] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addSupportingInfo($v); } else { @@ -3255,14 +3360,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getAsNeededBoolean())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AS_NEEDED_BOOLEAN, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getAsNeededCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AS_NEEDED_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getAuthoredOn())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AUTHORED_ON, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getBasedOn())) { foreach($vs as $v) { if (null === $v) { @@ -3296,11 +3399,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDoNotPerform())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DO_NOT_PERFORM, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getEncounter())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ENCOUNTER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -3309,6 +3410,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } } + if ([] !== ($vs = $this->getInstantiatesCanonical())) { foreach($vs as $v) { if (null === $v) { @@ -3317,6 +3419,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_INSTANTIATES_CANONICAL, null, $v->_getFHIRXMLNamespace())); } } + if ([] !== ($vs = $this->getInstantiatesUri())) { foreach($vs as $v) { if (null === $v) { @@ -3338,7 +3441,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getIntent())) { $v->xmlSerialize($sxe->addChild(self::FIELD_INTENT, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getLocationCode())) { foreach($vs as $v) { if (null === $v) { @@ -3365,18 +3467,16 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_NOTE, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getOccurrenceDateTime())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OCCURRENCE_DATE_TIME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOccurrencePeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OCCURRENCE_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOccurrenceTiming())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OCCURRENCE_TIMING, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getOrderDetail())) { foreach($vs as $v) { if (null === $v) { @@ -3385,10 +3485,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_ORDER_DETAIL, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getPatientInstruction())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATIENT_INSTRUCTION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getPerformer())) { foreach($vs as $v) { if (null === $v) { @@ -3401,23 +3501,18 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getPerformerType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PERFORMER_TYPE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPriority())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PRIORITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getQuantityQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_QUANTITY_QUANTITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getQuantityRange())) { $v->xmlSerialize($sxe->addChild(self::FIELD_QUANTITY_RANGE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getQuantityRatio())) { $v->xmlSerialize($sxe->addChild(self::FIELD_QUANTITY_RATIO, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getReasonCode())) { foreach($vs as $v) { if (null === $v) { @@ -3457,11 +3552,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getRequester())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REQUESTER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRequisition())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REQUISITION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getSpecimen())) { foreach($vs as $v) { if (null === $v) { @@ -3474,11 +3567,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSubject())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBJECT, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getSupportingInfo())) { foreach($vs as $v) { if (null === $v) { @@ -3487,6 +3578,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_SUPPORTING_INFO, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } @@ -3497,15 +3589,29 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getAsNeededBoolean())) { - $a[self::FIELD_AS_NEEDED_BOOLEAN] = $v->getValue(); - $a[self::FIELD_AS_NEEDED_BOOLEAN_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_AS_NEEDED_BOOLEAN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_AS_NEEDED_BOOLEAN_EXT] = $enc; + } + } else { + $a[self::FIELD_AS_NEEDED_BOOLEAN] = $v; + } } if (null !== ($v = $this->getAsNeededCodeableConcept())) { $a[self::FIELD_AS_NEEDED_CODEABLE_CONCEPT] = $v; } if (null !== ($v = $this->getAuthoredOn())) { - $a[self::FIELD_AUTHORED_ON] = $v->getValue(); - $a[self::FIELD_AUTHORED_ON_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_AUTHORED_ON] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_AUTHORED_ON_EXT] = $enc; + } + } else { + $a[self::FIELD_AUTHORED_ON] = $v; + } } if ([] !== ($vs = $this->getBasedOn())) { $a[self::FIELD_BASED_ON] = $vs; @@ -3520,14 +3626,37 @@ public function jsonSerialize() $a[self::FIELD_CODE] = $v; } if (null !== ($v = $this->getDoNotPerform())) { - $a[self::FIELD_DO_NOT_PERFORM] = $v->getValue(); - $a[self::FIELD_DO_NOT_PERFORM_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DO_NOT_PERFORM] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DO_NOT_PERFORM_EXT] = $enc; + } + } else { + $a[self::FIELD_DO_NOT_PERFORM] = $v; + } } if (null !== ($v = $this->getEncounter())) { $a[self::FIELD_ENCOUNTER] = $v; } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if ([] !== ($vs = $this->getInstantiatesCanonical())) { $a[self::FIELD_INSTANTIATES_CANONICAL] = []; @@ -3535,8 +3664,17 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_INSTANTIATES_CANONICAL][] = $v->getValue(); - $a[self::FIELD_INSTANTIATES_CANONICAL_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_INSTANTIATES_CANONICAL][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_INSTANTIATES_CANONICAL_EXT][] = $enc; + } else { + $a[self::FIELD_INSTANTIATES_CANONICAL_EXT][] = null; + } + } else { + $a[self::FIELD_INSTANTIATES_CANONICAL][] = $v; + } } } if ([] !== ($vs = $this->getInstantiatesUri())) { @@ -3545,15 +3683,32 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_INSTANTIATES_URI][] = $v->getValue(); - $a[self::FIELD_INSTANTIATES_URI_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_INSTANTIATES_URI][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_INSTANTIATES_URI_EXT][] = $enc; + } else { + $a[self::FIELD_INSTANTIATES_URI_EXT][] = null; + } + } else { + $a[self::FIELD_INSTANTIATES_URI][] = $v; + } } } if ([] !== ($vs = $this->getInsurance())) { $a[self::FIELD_INSURANCE] = $vs; } if (null !== ($v = $this->getIntent())) { - $a[self::FIELD_INTENT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_INTENT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_INTENT_EXT] = $enc; + } + } else { + $a[self::FIELD_INTENT] = $v; + } } if ([] !== ($vs = $this->getLocationCode())) { $a[self::FIELD_LOCATION_CODE] = $vs; @@ -3565,8 +3720,15 @@ public function jsonSerialize() $a[self::FIELD_NOTE] = $vs; } if (null !== ($v = $this->getOccurrenceDateTime())) { - $a[self::FIELD_OCCURRENCE_DATE_TIME] = $v->getValue(); - $a[self::FIELD_OCCURRENCE_DATE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_OCCURRENCE_DATE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_OCCURRENCE_DATE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_OCCURRENCE_DATE_TIME] = $v; + } } if (null !== ($v = $this->getOccurrencePeriod())) { $a[self::FIELD_OCCURRENCE_PERIOD] = $v; @@ -3578,8 +3740,15 @@ public function jsonSerialize() $a[self::FIELD_ORDER_DETAIL] = $vs; } if (null !== ($v = $this->getPatientInstruction())) { - $a[self::FIELD_PATIENT_INSTRUCTION] = $v->getValue(); - $a[self::FIELD_PATIENT_INSTRUCTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PATIENT_INSTRUCTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PATIENT_INSTRUCTION_EXT] = $enc; + } + } else { + $a[self::FIELD_PATIENT_INSTRUCTION] = $v; + } } if ([] !== ($vs = $this->getPerformer())) { $a[self::FIELD_PERFORMER] = $vs; @@ -3588,10 +3757,26 @@ public function jsonSerialize() $a[self::FIELD_PERFORMER_TYPE] = $v; } if (null !== ($v = $this->getPriority())) { - $a[self::FIELD_PRIORITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PRIORITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PRIORITY_EXT] = $enc; + } + } else { + $a[self::FIELD_PRIORITY] = $v; + } } if (null !== ($v = $this->getQuantityQuantity())) { - $a[self::FIELD_QUANTITY_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_QUANTITY_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_QUANTITY_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_QUANTITY_QUANTITY] = $v; + } } if (null !== ($v = $this->getQuantityRange())) { $a[self::FIELD_QUANTITY_RANGE] = $v; @@ -3615,13 +3800,29 @@ public function jsonSerialize() $a[self::FIELD_REQUESTER] = $v; } if (null !== ($v = $this->getRequisition())) { - $a[self::FIELD_REQUISITION] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_REQUISITION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_REQUISITION_EXT] = $enc; + } + } else { + $a[self::FIELD_REQUISITION] = $v; + } } if ([] !== ($vs = $this->getSpecimen())) { $a[self::FIELD_SPECIMEN] = $vs; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getSubject())) { $a[self::FIELD_SUBJECT] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRSlot.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRSlot.php index 3eacc2e130..3e9a476599 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRSlot.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRSlot.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -85,10 +85,6 @@ class FHIRSlot extends FHIRDomainResource implements PHPFHIRContainedTypeInterfa { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SLOT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_APPOINTMENT_TYPE = 'appointmentType'; const FIELD_COMMENT = 'comment'; const FIELD_COMMENT_EXT = '_comment'; @@ -245,6 +241,9 @@ class FHIRSlot extends FHIRDomainResource implements PHPFHIRContainedTypeInterfa */ protected $status = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSlot Constructor * @param null|array $data @@ -274,8 +273,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_COMMENT] instanceof FHIRString) { $this->setComment($data[self::FIELD_COMMENT]); - } elseif ($ext && is_scalar($data[self::FIELD_COMMENT])) { - $this->setComment(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_COMMENT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_COMMENT])) { + $this->setComment(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_COMMENT]] + $ext)); + } else if (is_array($data[self::FIELD_COMMENT])) { + $this->setComment(new FHIRString(array_merge($ext, $data[self::FIELD_COMMENT]))); + } } else { $this->setComment(new FHIRString($data[self::FIELD_COMMENT])); } @@ -286,8 +289,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_END] instanceof FHIRInstant) { $this->setEnd($data[self::FIELD_END]); - } elseif ($ext && is_scalar($data[self::FIELD_END])) { - $this->setEnd(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_END]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_END])) { + $this->setEnd(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_END]] + $ext)); + } else if (is_array($data[self::FIELD_END])) { + $this->setEnd(new FHIRInstant(array_merge($ext, $data[self::FIELD_END]))); + } } else { $this->setEnd(new FHIRInstant($data[self::FIELD_END])); } @@ -298,17 +305,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -320,8 +334,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_OVERBOOKED] instanceof FHIRBoolean) { $this->setOverbooked($data[self::FIELD_OVERBOOKED]); - } elseif ($ext && is_scalar($data[self::FIELD_OVERBOOKED])) { - $this->setOverbooked(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_OVERBOOKED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_OVERBOOKED])) { + $this->setOverbooked(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_OVERBOOKED]] + $ext)); + } else if (is_array($data[self::FIELD_OVERBOOKED])) { + $this->setOverbooked(new FHIRBoolean(array_merge($ext, $data[self::FIELD_OVERBOOKED]))); + } } else { $this->setOverbooked(new FHIRBoolean($data[self::FIELD_OVERBOOKED])); } @@ -336,6 +354,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SERVICE_CATEGORY])) { if (is_array($data[self::FIELD_SERVICE_CATEGORY])) { foreach($data[self::FIELD_SERVICE_CATEGORY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addServiceCategory($v); } else { @@ -351,6 +372,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SERVICE_TYPE])) { if (is_array($data[self::FIELD_SERVICE_TYPE])) { foreach($data[self::FIELD_SERVICE_TYPE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addServiceType($v); } else { @@ -366,6 +390,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SPECIALTY])) { if (is_array($data[self::FIELD_SPECIALTY])) { foreach($data[self::FIELD_SPECIALTY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addSpecialty($v); } else { @@ -384,8 +411,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_START] instanceof FHIRInstant) { $this->setStart($data[self::FIELD_START]); - } elseif ($ext && is_scalar($data[self::FIELD_START])) { - $this->setStart(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_START]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_START])) { + $this->setStart(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_START]] + $ext)); + } else if (is_array($data[self::FIELD_START])) { + $this->setStart(new FHIRInstant(array_merge($ext, $data[self::FIELD_START]))); + } } else { $this->setStart(new FHIRInstant($data[self::FIELD_START])); } @@ -396,8 +427,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRSlotStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRSlotStatus([FHIRSlotStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRSlotStatus([FHIRSlotStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRSlotStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRSlotStatus($data[self::FIELD_STATUS])); } @@ -1073,7 +1108,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getAppointmentType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_APPOINTMENT_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -1083,7 +1117,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getEnd())) { $v->xmlSerialize($sxe->addChild(self::FIELD_END, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -1092,14 +1125,13 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getOverbooked())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OVERBOOKED, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSchedule())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SCHEDULE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getServiceCategory())) { foreach($vs as $v) { if (null === $v) { @@ -1126,10 +1158,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_SPECIALTY, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getStart())) { $v->xmlSerialize($sxe->addChild(self::FIELD_START, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } @@ -1146,19 +1178,56 @@ public function jsonSerialize() $a[self::FIELD_APPOINTMENT_TYPE] = $v; } if (null !== ($v = $this->getComment())) { - $a[self::FIELD_COMMENT] = $v->getValue(); - $a[self::FIELD_COMMENT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_COMMENT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_COMMENT_EXT] = $enc; + } + } else { + $a[self::FIELD_COMMENT] = $v; + } } if (null !== ($v = $this->getEnd())) { - $a[self::FIELD_END] = $v->getValue(); - $a[self::FIELD_END_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_END] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_END_EXT] = $enc; + } + } else { + $a[self::FIELD_END] = $v; + } } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if (null !== ($v = $this->getOverbooked())) { - $a[self::FIELD_OVERBOOKED] = $v->getValue(); - $a[self::FIELD_OVERBOOKED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_OVERBOOKED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_OVERBOOKED_EXT] = $enc; + } + } else { + $a[self::FIELD_OVERBOOKED] = $v; + } } if (null !== ($v = $this->getSchedule())) { $a[self::FIELD_SCHEDULE] = $v; @@ -1173,11 +1242,26 @@ public function jsonSerialize() $a[self::FIELD_SPECIALTY] = $vs; } if (null !== ($v = $this->getStart())) { - $a[self::FIELD_START] = $v->getValue(); - $a[self::FIELD_START_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_START] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_START_EXT] = $enc; + } + } else { + $a[self::FIELD_START] = $v; + } } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRSpecimen.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRSpecimen.php index a1d9abb824..b3a41b30ce 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRSpecimen.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRSpecimen.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -87,10 +87,6 @@ class FHIRSpecimen extends FHIRDomainResource implements PHPFHIRContainedTypeInt { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SPECIMEN; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ACCESSION_IDENTIFIER = 'accessionIdentifier'; const FIELD_ACCESSION_IDENTIFIER_EXT = '_accessionIdentifier'; const FIELD_COLLECTION = 'collection'; @@ -260,6 +256,9 @@ class FHIRSpecimen extends FHIRDomainResource implements PHPFHIRContainedTypeInt */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSpecimen Constructor * @param null|array $data @@ -282,8 +281,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ACCESSION_IDENTIFIER] instanceof FHIRIdentifier) { $this->setAccessionIdentifier($data[self::FIELD_ACCESSION_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_ACCESSION_IDENTIFIER])) { - $this->setAccessionIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_ACCESSION_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ACCESSION_IDENTIFIER])) { + $this->setAccessionIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_ACCESSION_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_ACCESSION_IDENTIFIER])) { + $this->setAccessionIdentifier(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_ACCESSION_IDENTIFIER]))); + } } else { $this->setAccessionIdentifier(new FHIRIdentifier($data[self::FIELD_ACCESSION_IDENTIFIER])); } @@ -298,6 +301,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CONDITION])) { if (is_array($data[self::FIELD_CONDITION])) { foreach($data[self::FIELD_CONDITION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addCondition($v); } else { @@ -313,6 +319,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CONTAINER])) { if (is_array($data[self::FIELD_CONTAINER])) { foreach($data[self::FIELD_CONTAINER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRSpecimenContainer) { $this->addContainer($v); } else { @@ -331,17 +340,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -350,6 +366,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_NOTE])) { if (is_array($data[self::FIELD_NOTE])) { foreach($data[self::FIELD_NOTE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRAnnotation) { $this->addNote($v); } else { @@ -365,6 +384,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PARENT])) { if (is_array($data[self::FIELD_PARENT])) { foreach($data[self::FIELD_PARENT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addParent($v); } else { @@ -380,6 +402,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PROCESSING])) { if (is_array($data[self::FIELD_PROCESSING])) { foreach($data[self::FIELD_PROCESSING] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRSpecimenProcessing) { $this->addProcessing($v); } else { @@ -398,8 +423,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_RECEIVED_TIME] instanceof FHIRDateTime) { $this->setReceivedTime($data[self::FIELD_RECEIVED_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_RECEIVED_TIME])) { - $this->setReceivedTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_RECEIVED_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_RECEIVED_TIME])) { + $this->setReceivedTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_RECEIVED_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_RECEIVED_TIME])) { + $this->setReceivedTime(new FHIRDateTime(array_merge($ext, $data[self::FIELD_RECEIVED_TIME]))); + } } else { $this->setReceivedTime(new FHIRDateTime($data[self::FIELD_RECEIVED_TIME])); } @@ -407,6 +436,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REQUEST])) { if (is_array($data[self::FIELD_REQUEST])) { foreach($data[self::FIELD_REQUEST] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addRequest($v); } else { @@ -425,8 +457,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRSpecimenStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRSpecimenStatus([FHIRSpecimenStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRSpecimenStatus([FHIRSpecimenStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRSpecimenStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRSpecimenStatus($data[self::FIELD_STATUS])); } @@ -1208,15 +1244,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getAccessionIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ACCESSION_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getCollection())) { $v->xmlSerialize($sxe->addChild(self::FIELD_COLLECTION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getCondition())) { foreach($vs as $v) { if (null === $v) { @@ -1270,10 +1303,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_PROCESSING, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getReceivedTime())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RECEIVED_TIME, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getRequest())) { foreach($vs as $v) { if (null === $v) { @@ -1286,11 +1319,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSubject())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBJECT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -1304,7 +1335,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getAccessionIdentifier())) { - $a[self::FIELD_ACCESSION_IDENTIFIER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ACCESSION_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ACCESSION_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_ACCESSION_IDENTIFIER] = $v; + } } if (null !== ($v = $this->getCollection())) { $a[self::FIELD_COLLECTION] = $v; @@ -1316,7 +1355,23 @@ public function jsonSerialize() $a[self::FIELD_CONTAINER] = $vs; } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if ([] !== ($vs = $this->getNote())) { $a[self::FIELD_NOTE] = $vs; @@ -1328,14 +1383,29 @@ public function jsonSerialize() $a[self::FIELD_PROCESSING] = $vs; } if (null !== ($v = $this->getReceivedTime())) { - $a[self::FIELD_RECEIVED_TIME] = $v->getValue(); - $a[self::FIELD_RECEIVED_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_RECEIVED_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_RECEIVED_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_RECEIVED_TIME] = $v; + } } if ([] !== ($vs = $this->getRequest())) { $a[self::FIELD_REQUEST] = $vs; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getSubject())) { $a[self::FIELD_SUBJECT] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRSpecimenDefinition.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRSpecimenDefinition.php index 47a08f928e..e8c5d16721 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRSpecimenDefinition.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRSpecimenDefinition.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -82,10 +82,6 @@ class FHIRSpecimenDefinition extends FHIRDomainResource implements PHPFHIRContai { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SPECIMEN_DEFINITION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_COLLECTION = 'collection'; const FIELD_IDENTIFIER = 'identifier'; const FIELD_IDENTIFIER_EXT = '_identifier'; @@ -163,6 +159,9 @@ class FHIRSpecimenDefinition extends FHIRDomainResource implements PHPFHIRContai */ protected $typeTested = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSpecimenDefinition Constructor * @param null|array $data @@ -182,6 +181,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_COLLECTION])) { if (is_array($data[self::FIELD_COLLECTION])) { foreach($data[self::FIELD_COLLECTION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addCollection($v); } else { @@ -200,8 +202,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->setIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { - $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_IDENTIFIER]))); + } } else { $this->setIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); } @@ -209,6 +215,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PATIENT_PREPARATION])) { if (is_array($data[self::FIELD_PATIENT_PREPARATION])) { foreach($data[self::FIELD_PATIENT_PREPARATION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addPatientPreparation($v); } else { @@ -227,8 +236,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TIME_ASPECT] instanceof FHIRString) { $this->setTimeAspect($data[self::FIELD_TIME_ASPECT]); - } elseif ($ext && is_scalar($data[self::FIELD_TIME_ASPECT])) { - $this->setTimeAspect(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TIME_ASPECT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TIME_ASPECT])) { + $this->setTimeAspect(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TIME_ASPECT]] + $ext)); + } else if (is_array($data[self::FIELD_TIME_ASPECT])) { + $this->setTimeAspect(new FHIRString(array_merge($ext, $data[self::FIELD_TIME_ASPECT]))); + } } else { $this->setTimeAspect(new FHIRString($data[self::FIELD_TIME_ASPECT])); } @@ -243,6 +256,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_TYPE_TESTED])) { if (is_array($data[self::FIELD_TYPE_TESTED])) { foreach($data[self::FIELD_TYPE_TESTED] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRSpecimenDefinitionTypeTested) { $this->addTypeTested($v); } else { @@ -661,7 +677,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getCollection())) { foreach($vs as $v) { if (null === $v) { @@ -674,7 +689,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getPatientPreparation())) { foreach($vs as $v) { if (null === $v) { @@ -683,14 +697,13 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_PATIENT_PREPARATION, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getTimeAspect())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TIME_ASPECT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getTypeCollected())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE_COLLECTED, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getTypeTested())) { foreach($vs as $v) { if (null === $v) { @@ -699,6 +712,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE_TESTED, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } @@ -712,14 +726,29 @@ public function jsonSerialize() $a[self::FIELD_COLLECTION] = $vs; } if (null !== ($v = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_IDENTIFIER] = $v; + } } if ([] !== ($vs = $this->getPatientPreparation())) { $a[self::FIELD_PATIENT_PREPARATION] = $vs; } if (null !== ($v = $this->getTimeAspect())) { - $a[self::FIELD_TIME_ASPECT] = $v->getValue(); - $a[self::FIELD_TIME_ASPECT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TIME_ASPECT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TIME_ASPECT_EXT] = $enc; + } + } else { + $a[self::FIELD_TIME_ASPECT] = $v; + } } if (null !== ($v = $this->getTypeCollected())) { $a[self::FIELD_TYPE_COLLECTED] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRStructureDefinition.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRStructureDefinition.php index 18d2e2c971..6f30df2160 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRStructureDefinition.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRStructureDefinition.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -99,10 +99,6 @@ class FHIRStructureDefinition extends FHIRDomainResource implements PHPFHIRConta { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_STRUCTURE_DEFINITION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ABSTRACT = 'abstract'; const FIELD_ABSTRACT_EXT = '_abstract'; const FIELD_BASE_DEFINITION = 'baseDefinition'; @@ -510,6 +506,9 @@ class FHIRStructureDefinition extends FHIRDomainResource implements PHPFHIRConta */ protected $version = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRStructureDefinition Constructor * @param null|array $data @@ -532,8 +531,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ABSTRACT] instanceof FHIRBoolean) { $this->setAbstract($data[self::FIELD_ABSTRACT]); - } elseif ($ext && is_scalar($data[self::FIELD_ABSTRACT])) { - $this->setAbstract(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_ABSTRACT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ABSTRACT])) { + $this->setAbstract(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_ABSTRACT]] + $ext)); + } else if (is_array($data[self::FIELD_ABSTRACT])) { + $this->setAbstract(new FHIRBoolean(array_merge($ext, $data[self::FIELD_ABSTRACT]))); + } } else { $this->setAbstract(new FHIRBoolean($data[self::FIELD_ABSTRACT])); } @@ -544,8 +547,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_BASE_DEFINITION] instanceof FHIRCanonical) { $this->setBaseDefinition($data[self::FIELD_BASE_DEFINITION]); - } elseif ($ext && is_scalar($data[self::FIELD_BASE_DEFINITION])) { - $this->setBaseDefinition(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $data[self::FIELD_BASE_DEFINITION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_BASE_DEFINITION])) { + $this->setBaseDefinition(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $data[self::FIELD_BASE_DEFINITION]] + $ext)); + } else if (is_array($data[self::FIELD_BASE_DEFINITION])) { + $this->setBaseDefinition(new FHIRCanonical(array_merge($ext, $data[self::FIELD_BASE_DEFINITION]))); + } } else { $this->setBaseDefinition(new FHIRCanonical($data[self::FIELD_BASE_DEFINITION])); } @@ -553,6 +560,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CONTACT])) { if (is_array($data[self::FIELD_CONTACT])) { foreach($data[self::FIELD_CONTACT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContactDetail) { $this->addContact($v); } else { @@ -568,6 +578,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CONTEXT])) { if (is_array($data[self::FIELD_CONTEXT])) { foreach($data[self::FIELD_CONTEXT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRStructureDefinitionContext) { $this->addContext($v); } else { @@ -586,17 +599,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_CONTEXT_INVARIANT])) { foreach($data[self::FIELD_CONTEXT_INVARIANT] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRString) { $this->addContextInvariant($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addContextInvariant(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addContextInvariant(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addContextInvariant(new FHIRString(array_merge($v, $ext[$i]))); + } } else { $this->addContextInvariant(new FHIRString($v)); } } } elseif ($data[self::FIELD_CONTEXT_INVARIANT] instanceof FHIRString) { $this->addContextInvariant($data[self::FIELD_CONTEXT_INVARIANT]); - } elseif ($ext && is_scalar($data[self::FIELD_CONTEXT_INVARIANT])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_CONTEXT_INVARIANT])) { $this->addContextInvariant(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_CONTEXT_INVARIANT]] + $ext)); } else { $this->addContextInvariant(new FHIRString($data[self::FIELD_CONTEXT_INVARIANT])); @@ -608,8 +628,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_COPYRIGHT] instanceof FHIRMarkdown) { $this->setCopyright($data[self::FIELD_COPYRIGHT]); - } elseif ($ext && is_scalar($data[self::FIELD_COPYRIGHT])) { - $this->setCopyright(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_COPYRIGHT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_COPYRIGHT])) { + $this->setCopyright(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_COPYRIGHT]] + $ext)); + } else if (is_array($data[self::FIELD_COPYRIGHT])) { + $this->setCopyright(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_COPYRIGHT]))); + } } else { $this->setCopyright(new FHIRMarkdown($data[self::FIELD_COPYRIGHT])); } @@ -620,8 +644,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATE] instanceof FHIRDateTime) { $this->setDate($data[self::FIELD_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_DATE])) { - $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime(array_merge($ext, $data[self::FIELD_DATE]))); + } } else { $this->setDate(new FHIRDateTime($data[self::FIELD_DATE])); } @@ -632,8 +660,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DERIVATION] instanceof FHIRTypeDerivationRule) { $this->setDerivation($data[self::FIELD_DERIVATION]); - } elseif ($ext && is_scalar($data[self::FIELD_DERIVATION])) { - $this->setDerivation(new FHIRTypeDerivationRule([FHIRTypeDerivationRule::FIELD_VALUE => $data[self::FIELD_DERIVATION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DERIVATION])) { + $this->setDerivation(new FHIRTypeDerivationRule([FHIRTypeDerivationRule::FIELD_VALUE => $data[self::FIELD_DERIVATION]] + $ext)); + } else if (is_array($data[self::FIELD_DERIVATION])) { + $this->setDerivation(new FHIRTypeDerivationRule(array_merge($ext, $data[self::FIELD_DERIVATION]))); + } } else { $this->setDerivation(new FHIRTypeDerivationRule($data[self::FIELD_DERIVATION])); } @@ -644,8 +676,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRMarkdown) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRMarkdown($data[self::FIELD_DESCRIPTION])); } @@ -663,8 +699,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EXPERIMENTAL] instanceof FHIRBoolean) { $this->setExperimental($data[self::FIELD_EXPERIMENTAL]); - } elseif ($ext && is_scalar($data[self::FIELD_EXPERIMENTAL])) { - $this->setExperimental(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_EXPERIMENTAL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EXPERIMENTAL])) { + $this->setExperimental(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_EXPERIMENTAL]] + $ext)); + } else if (is_array($data[self::FIELD_EXPERIMENTAL])) { + $this->setExperimental(new FHIRBoolean(array_merge($ext, $data[self::FIELD_EXPERIMENTAL]))); + } } else { $this->setExperimental(new FHIRBoolean($data[self::FIELD_EXPERIMENTAL])); } @@ -675,8 +715,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_FHIR_VERSION] instanceof FHIRFHIRVersion) { $this->setFhirVersion($data[self::FIELD_FHIR_VERSION]); - } elseif ($ext && is_scalar($data[self::FIELD_FHIR_VERSION])) { - $this->setFhirVersion(new FHIRFHIRVersion([FHIRFHIRVersion::FIELD_VALUE => $data[self::FIELD_FHIR_VERSION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_FHIR_VERSION])) { + $this->setFhirVersion(new FHIRFHIRVersion([FHIRFHIRVersion::FIELD_VALUE => $data[self::FIELD_FHIR_VERSION]] + $ext)); + } else if (is_array($data[self::FIELD_FHIR_VERSION])) { + $this->setFhirVersion(new FHIRFHIRVersion(array_merge($ext, $data[self::FIELD_FHIR_VERSION]))); + } } else { $this->setFhirVersion(new FHIRFHIRVersion($data[self::FIELD_FHIR_VERSION])); } @@ -687,17 +731,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -706,6 +757,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_JURISDICTION])) { if (is_array($data[self::FIELD_JURISDICTION])) { foreach($data[self::FIELD_JURISDICTION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addJurisdiction($v); } else { @@ -721,6 +775,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_KEYWORD])) { if (is_array($data[self::FIELD_KEYWORD])) { foreach($data[self::FIELD_KEYWORD] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCoding) { $this->addKeyword($v); } else { @@ -739,8 +796,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_KIND] instanceof FHIRStructureDefinitionKind) { $this->setKind($data[self::FIELD_KIND]); - } elseif ($ext && is_scalar($data[self::FIELD_KIND])) { - $this->setKind(new FHIRStructureDefinitionKind([FHIRStructureDefinitionKind::FIELD_VALUE => $data[self::FIELD_KIND]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_KIND])) { + $this->setKind(new FHIRStructureDefinitionKind([FHIRStructureDefinitionKind::FIELD_VALUE => $data[self::FIELD_KIND]] + $ext)); + } else if (is_array($data[self::FIELD_KIND])) { + $this->setKind(new FHIRStructureDefinitionKind(array_merge($ext, $data[self::FIELD_KIND]))); + } } else { $this->setKind(new FHIRStructureDefinitionKind($data[self::FIELD_KIND])); } @@ -748,6 +809,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_MAPPING])) { if (is_array($data[self::FIELD_MAPPING])) { foreach($data[self::FIELD_MAPPING] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRStructureDefinitionMapping) { $this->addMapping($v); } else { @@ -766,8 +830,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -778,8 +846,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PUBLISHER] instanceof FHIRString) { $this->setPublisher($data[self::FIELD_PUBLISHER]); - } elseif ($ext && is_scalar($data[self::FIELD_PUBLISHER])) { - $this->setPublisher(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PUBLISHER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PUBLISHER])) { + $this->setPublisher(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PUBLISHER]] + $ext)); + } else if (is_array($data[self::FIELD_PUBLISHER])) { + $this->setPublisher(new FHIRString(array_merge($ext, $data[self::FIELD_PUBLISHER]))); + } } else { $this->setPublisher(new FHIRString($data[self::FIELD_PUBLISHER])); } @@ -790,8 +862,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PURPOSE] instanceof FHIRMarkdown) { $this->setPurpose($data[self::FIELD_PURPOSE]); - } elseif ($ext && is_scalar($data[self::FIELD_PURPOSE])) { - $this->setPurpose(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_PURPOSE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PURPOSE])) { + $this->setPurpose(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_PURPOSE]] + $ext)); + } else if (is_array($data[self::FIELD_PURPOSE])) { + $this->setPurpose(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_PURPOSE]))); + } } else { $this->setPurpose(new FHIRMarkdown($data[self::FIELD_PURPOSE])); } @@ -809,8 +885,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRPublicationStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRPublicationStatus([FHIRPublicationStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRPublicationStatus([FHIRPublicationStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRPublicationStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRPublicationStatus($data[self::FIELD_STATUS])); } @@ -821,8 +901,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TITLE] instanceof FHIRString) { $this->setTitle($data[self::FIELD_TITLE]); - } elseif ($ext && is_scalar($data[self::FIELD_TITLE])) { - $this->setTitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TITLE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TITLE])) { + $this->setTitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TITLE]] + $ext)); + } else if (is_array($data[self::FIELD_TITLE])) { + $this->setTitle(new FHIRString(array_merge($ext, $data[self::FIELD_TITLE]))); + } } else { $this->setTitle(new FHIRString($data[self::FIELD_TITLE])); } @@ -833,8 +917,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TYPE] instanceof FHIRUri) { $this->setType($data[self::FIELD_TYPE]); - } elseif ($ext && is_scalar($data[self::FIELD_TYPE])) { - $this->setType(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TYPE])) { + $this->setType(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } else if (is_array($data[self::FIELD_TYPE])) { + $this->setType(new FHIRUri(array_merge($ext, $data[self::FIELD_TYPE]))); + } } else { $this->setType(new FHIRUri($data[self::FIELD_TYPE])); } @@ -845,8 +933,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_URL] instanceof FHIRUri) { $this->setUrl($data[self::FIELD_URL]); - } elseif ($ext && is_scalar($data[self::FIELD_URL])) { - $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } else if (is_array($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri(array_merge($ext, $data[self::FIELD_URL]))); + } } else { $this->setUrl(new FHIRUri($data[self::FIELD_URL])); } @@ -854,6 +946,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_USE_CONTEXT])) { if (is_array($data[self::FIELD_USE_CONTEXT])) { foreach($data[self::FIELD_USE_CONTEXT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRUsageContext) { $this->addUseContext($v); } else { @@ -872,8 +967,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VERSION] instanceof FHIRString) { $this->setVersion($data[self::FIELD_VERSION]); - } elseif ($ext && is_scalar($data[self::FIELD_VERSION])) { - $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } else if (is_array($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString(array_merge($ext, $data[self::FIELD_VERSION]))); + } } else { $this->setVersion(new FHIRString($data[self::FIELD_VERSION])); } @@ -2405,7 +2504,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getBaseDefinition())) { $v->xmlSerialize($sxe->addChild(self::FIELD_BASE_DEFINITION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getContact())) { foreach($vs as $v) { if (null === $v) { @@ -2423,6 +2521,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_CONTEXT, null, $v->_getFHIRXMLNamespace())); } } + if ([] !== ($vs = $this->getContextInvariant())) { foreach($vs as $v) { if (null === $v) { @@ -2431,31 +2530,28 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_CONTEXT_INVARIANT, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getCopyright())) { $v->xmlSerialize($sxe->addChild(self::FIELD_COPYRIGHT, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DATE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDerivation())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DERIVATION, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getDescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESCRIPTION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDifferential())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DIFFERENTIAL, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getExperimental())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EXPERIMENTAL, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getFhirVersion())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FHIR_VERSION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -2486,7 +2582,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getKind())) { $v->xmlSerialize($sxe->addChild(self::FIELD_KIND, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getMapping())) { foreach($vs as $v) { if (null === $v) { @@ -2495,6 +2590,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_MAPPING, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NAME, null, $v->_getFHIRXMLNamespace())); } @@ -2504,11 +2600,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getPurpose())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PURPOSE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSnapshot())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SNAPSHOT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } @@ -2521,7 +2615,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getUrl())) { $v->xmlSerialize($sxe->addChild(self::FIELD_URL, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getUseContext())) { foreach($vs as $v) { if (null === $v) { @@ -2530,6 +2623,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_USE_CONTEXT, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getVersion())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VERSION, null, $v->_getFHIRXMLNamespace())); } @@ -2543,12 +2637,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getAbstract())) { - $a[self::FIELD_ABSTRACT] = $v->getValue(); - $a[self::FIELD_ABSTRACT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ABSTRACT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ABSTRACT_EXT] = $enc; + } + } else { + $a[self::FIELD_ABSTRACT] = $v; + } } if (null !== ($v = $this->getBaseDefinition())) { - $a[self::FIELD_BASE_DEFINITION] = $v->getValue(); - $a[self::FIELD_BASE_DEFINITION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_BASE_DEFINITION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_BASE_DEFINITION_EXT] = $enc; + } + } else { + $a[self::FIELD_BASE_DEFINITION] = $v; + } } if ([] !== ($vs = $this->getContact())) { $a[self::FIELD_CONTACT] = $vs; @@ -2562,37 +2670,106 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_CONTEXT_INVARIANT][] = $v->getValue(); - $a[self::FIELD_CONTEXT_INVARIANT_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CONTEXT_INVARIANT][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CONTEXT_INVARIANT_EXT][] = $enc; + } else { + $a[self::FIELD_CONTEXT_INVARIANT_EXT][] = null; + } + } else { + $a[self::FIELD_CONTEXT_INVARIANT][] = $v; + } } } if (null !== ($v = $this->getCopyright())) { - $a[self::FIELD_COPYRIGHT] = $v->getValue(); - $a[self::FIELD_COPYRIGHT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_COPYRIGHT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_COPYRIGHT_EXT] = $enc; + } + } else { + $a[self::FIELD_COPYRIGHT] = $v; + } } if (null !== ($v = $this->getDate())) { - $a[self::FIELD_DATE] = $v->getValue(); - $a[self::FIELD_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_DATE] = $v; + } } if (null !== ($v = $this->getDerivation())) { - $a[self::FIELD_DERIVATION] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DERIVATION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DERIVATION_EXT] = $enc; + } + } else { + $a[self::FIELD_DERIVATION] = $v; + } } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if (null !== ($v = $this->getDifferential())) { $a[self::FIELD_DIFFERENTIAL] = $v; } if (null !== ($v = $this->getExperimental())) { - $a[self::FIELD_EXPERIMENTAL] = $v->getValue(); - $a[self::FIELD_EXPERIMENTAL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EXPERIMENTAL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EXPERIMENTAL_EXT] = $enc; + } + } else { + $a[self::FIELD_EXPERIMENTAL] = $v; + } } if (null !== ($v = $this->getFhirVersion())) { - $a[self::FIELD_FHIR_VERSION] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FHIR_VERSION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FHIR_VERSION_EXT] = $enc; + } + } else { + $a[self::FIELD_FHIR_VERSION] = $v; + } } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if ([] !== ($vs = $this->getJurisdiction())) { $a[self::FIELD_JURISDICTION] = $vs; @@ -2601,47 +2778,112 @@ public function jsonSerialize() $a[self::FIELD_KEYWORD] = $vs; } if (null !== ($v = $this->getKind())) { - $a[self::FIELD_KIND] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_KIND] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_KIND_EXT] = $enc; + } + } else { + $a[self::FIELD_KIND] = $v; + } } if ([] !== ($vs = $this->getMapping())) { $a[self::FIELD_MAPPING] = $vs; } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if (null !== ($v = $this->getPublisher())) { - $a[self::FIELD_PUBLISHER] = $v->getValue(); - $a[self::FIELD_PUBLISHER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PUBLISHER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PUBLISHER_EXT] = $enc; + } + } else { + $a[self::FIELD_PUBLISHER] = $v; + } } if (null !== ($v = $this->getPurpose())) { - $a[self::FIELD_PURPOSE] = $v->getValue(); - $a[self::FIELD_PURPOSE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PURPOSE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PURPOSE_EXT] = $enc; + } + } else { + $a[self::FIELD_PURPOSE] = $v; + } } if (null !== ($v = $this->getSnapshot())) { $a[self::FIELD_SNAPSHOT] = $v; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getTitle())) { - $a[self::FIELD_TITLE] = $v->getValue(); - $a[self::FIELD_TITLE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TITLE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TITLE_EXT] = $enc; + } + } else { + $a[self::FIELD_TITLE] = $v; + } } if (null !== ($v = $this->getType())) { - $a[self::FIELD_TYPE] = $v->getValue(); - $a[self::FIELD_TYPE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TYPE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TYPE_EXT] = $enc; + } + } else { + $a[self::FIELD_TYPE] = $v; + } } if (null !== ($v = $this->getUrl())) { - $a[self::FIELD_URL] = $v->getValue(); - $a[self::FIELD_URL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_URL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_URL_EXT] = $enc; + } + } else { + $a[self::FIELD_URL] = $v; + } } if ([] !== ($vs = $this->getUseContext())) { $a[self::FIELD_USE_CONTEXT] = $vs; } if (null !== ($v = $this->getVersion())) { - $a[self::FIELD_VERSION] = $v->getValue(); - $a[self::FIELD_VERSION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VERSION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VERSION_EXT] = $enc; + } + } else { + $a[self::FIELD_VERSION] = $v; + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRStructureMap.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRStructureMap.php index b0f4947a22..cf5aaf04ba 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRStructureMap.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRStructureMap.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -91,10 +91,6 @@ class FHIRStructureMap extends FHIRDomainResource implements PHPFHIRContainedTyp { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_STRUCTURE_MAP; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CONTACT = 'contact'; const FIELD_COPYRIGHT = 'copyright'; const FIELD_COPYRIGHT_EXT = '_copyright'; @@ -370,6 +366,9 @@ class FHIRStructureMap extends FHIRDomainResource implements PHPFHIRContainedTyp */ protected $version = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRStructureMap Constructor * @param null|array $data @@ -389,6 +388,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CONTACT])) { if (is_array($data[self::FIELD_CONTACT])) { foreach($data[self::FIELD_CONTACT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContactDetail) { $this->addContact($v); } else { @@ -407,8 +409,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_COPYRIGHT] instanceof FHIRMarkdown) { $this->setCopyright($data[self::FIELD_COPYRIGHT]); - } elseif ($ext && is_scalar($data[self::FIELD_COPYRIGHT])) { - $this->setCopyright(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_COPYRIGHT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_COPYRIGHT])) { + $this->setCopyright(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_COPYRIGHT]] + $ext)); + } else if (is_array($data[self::FIELD_COPYRIGHT])) { + $this->setCopyright(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_COPYRIGHT]))); + } } else { $this->setCopyright(new FHIRMarkdown($data[self::FIELD_COPYRIGHT])); } @@ -419,8 +425,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATE] instanceof FHIRDateTime) { $this->setDate($data[self::FIELD_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_DATE])) { - $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime(array_merge($ext, $data[self::FIELD_DATE]))); + } } else { $this->setDate(new FHIRDateTime($data[self::FIELD_DATE])); } @@ -431,8 +441,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRMarkdown) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRMarkdown($data[self::FIELD_DESCRIPTION])); } @@ -443,8 +457,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EXPERIMENTAL] instanceof FHIRBoolean) { $this->setExperimental($data[self::FIELD_EXPERIMENTAL]); - } elseif ($ext && is_scalar($data[self::FIELD_EXPERIMENTAL])) { - $this->setExperimental(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_EXPERIMENTAL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EXPERIMENTAL])) { + $this->setExperimental(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_EXPERIMENTAL]] + $ext)); + } else if (is_array($data[self::FIELD_EXPERIMENTAL])) { + $this->setExperimental(new FHIRBoolean(array_merge($ext, $data[self::FIELD_EXPERIMENTAL]))); + } } else { $this->setExperimental(new FHIRBoolean($data[self::FIELD_EXPERIMENTAL])); } @@ -452,6 +470,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_GROUP])) { if (is_array($data[self::FIELD_GROUP])) { foreach($data[self::FIELD_GROUP] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRStructureMapGroup) { $this->addGroup($v); } else { @@ -470,17 +491,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -492,17 +520,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IMPORT])) { foreach($data[self::FIELD_IMPORT] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCanonical) { $this->addImport($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addImport(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addImport(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addImport(new FHIRCanonical(array_merge($v, $ext[$i]))); + } } else { $this->addImport(new FHIRCanonical($v)); } } } elseif ($data[self::FIELD_IMPORT] instanceof FHIRCanonical) { $this->addImport($data[self::FIELD_IMPORT]); - } elseif ($ext && is_scalar($data[self::FIELD_IMPORT])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IMPORT])) { $this->addImport(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $data[self::FIELD_IMPORT]] + $ext)); } else { $this->addImport(new FHIRCanonical($data[self::FIELD_IMPORT])); @@ -511,6 +546,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_JURISDICTION])) { if (is_array($data[self::FIELD_JURISDICTION])) { foreach($data[self::FIELD_JURISDICTION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addJurisdiction($v); } else { @@ -529,8 +567,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -541,8 +583,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PUBLISHER] instanceof FHIRString) { $this->setPublisher($data[self::FIELD_PUBLISHER]); - } elseif ($ext && is_scalar($data[self::FIELD_PUBLISHER])) { - $this->setPublisher(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PUBLISHER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PUBLISHER])) { + $this->setPublisher(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PUBLISHER]] + $ext)); + } else if (is_array($data[self::FIELD_PUBLISHER])) { + $this->setPublisher(new FHIRString(array_merge($ext, $data[self::FIELD_PUBLISHER]))); + } } else { $this->setPublisher(new FHIRString($data[self::FIELD_PUBLISHER])); } @@ -553,8 +599,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PURPOSE] instanceof FHIRMarkdown) { $this->setPurpose($data[self::FIELD_PURPOSE]); - } elseif ($ext && is_scalar($data[self::FIELD_PURPOSE])) { - $this->setPurpose(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_PURPOSE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PURPOSE])) { + $this->setPurpose(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_PURPOSE]] + $ext)); + } else if (is_array($data[self::FIELD_PURPOSE])) { + $this->setPurpose(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_PURPOSE]))); + } } else { $this->setPurpose(new FHIRMarkdown($data[self::FIELD_PURPOSE])); } @@ -565,8 +615,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRPublicationStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRPublicationStatus([FHIRPublicationStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRPublicationStatus([FHIRPublicationStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRPublicationStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRPublicationStatus($data[self::FIELD_STATUS])); } @@ -574,6 +628,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_STRUCTURE])) { if (is_array($data[self::FIELD_STRUCTURE])) { foreach($data[self::FIELD_STRUCTURE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRStructureMapStructure) { $this->addStructure($v); } else { @@ -592,8 +649,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TITLE] instanceof FHIRString) { $this->setTitle($data[self::FIELD_TITLE]); - } elseif ($ext && is_scalar($data[self::FIELD_TITLE])) { - $this->setTitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TITLE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TITLE])) { + $this->setTitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TITLE]] + $ext)); + } else if (is_array($data[self::FIELD_TITLE])) { + $this->setTitle(new FHIRString(array_merge($ext, $data[self::FIELD_TITLE]))); + } } else { $this->setTitle(new FHIRString($data[self::FIELD_TITLE])); } @@ -604,8 +665,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_URL] instanceof FHIRUri) { $this->setUrl($data[self::FIELD_URL]); - } elseif ($ext && is_scalar($data[self::FIELD_URL])) { - $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } else if (is_array($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri(array_merge($ext, $data[self::FIELD_URL]))); + } } else { $this->setUrl(new FHIRUri($data[self::FIELD_URL])); } @@ -613,6 +678,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_USE_CONTEXT])) { if (is_array($data[self::FIELD_USE_CONTEXT])) { foreach($data[self::FIELD_USE_CONTEXT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRUsageContext) { $this->addUseContext($v); } else { @@ -631,8 +699,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VERSION] instanceof FHIRString) { $this->setVersion($data[self::FIELD_VERSION]); - } elseif ($ext && is_scalar($data[self::FIELD_VERSION])) { - $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } else if (is_array($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString(array_merge($ext, $data[self::FIELD_VERSION]))); + } } else { $this->setVersion(new FHIRString($data[self::FIELD_VERSION])); } @@ -1758,7 +1830,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getContact())) { foreach($vs as $v) { if (null === $v) { @@ -1767,6 +1838,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_CONTACT, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getCopyright())) { $v->xmlSerialize($sxe->addChild(self::FIELD_COPYRIGHT, null, $v->_getFHIRXMLNamespace())); } @@ -1779,7 +1851,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getExperimental())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EXPERIMENTAL, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getGroup())) { foreach($vs as $v) { if (null === $v) { @@ -1797,6 +1868,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } } + if ([] !== ($vs = $this->getImport())) { foreach($vs as $v) { if (null === $v) { @@ -1814,6 +1886,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_JURISDICTION, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NAME, null, $v->_getFHIRXMLNamespace())); } @@ -1823,11 +1896,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getPurpose())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PURPOSE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getStructure())) { foreach($vs as $v) { if (null === $v) { @@ -1836,13 +1907,13 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_STRUCTURE, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getTitle())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TITLE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getUrl())) { $v->xmlSerialize($sxe->addChild(self::FIELD_URL, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getUseContext())) { foreach($vs as $v) { if (null === $v) { @@ -1851,6 +1922,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_USE_CONTEXT, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getVersion())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VERSION, null, $v->_getFHIRXMLNamespace())); } @@ -1867,26 +1939,70 @@ public function jsonSerialize() $a[self::FIELD_CONTACT] = $vs; } if (null !== ($v = $this->getCopyright())) { - $a[self::FIELD_COPYRIGHT] = $v->getValue(); - $a[self::FIELD_COPYRIGHT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_COPYRIGHT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_COPYRIGHT_EXT] = $enc; + } + } else { + $a[self::FIELD_COPYRIGHT] = $v; + } } if (null !== ($v = $this->getDate())) { - $a[self::FIELD_DATE] = $v->getValue(); - $a[self::FIELD_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_DATE] = $v; + } } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if (null !== ($v = $this->getExperimental())) { - $a[self::FIELD_EXPERIMENTAL] = $v->getValue(); - $a[self::FIELD_EXPERIMENTAL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EXPERIMENTAL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EXPERIMENTAL_EXT] = $enc; + } + } else { + $a[self::FIELD_EXPERIMENTAL] = $v; + } } if ([] !== ($vs = $this->getGroup())) { $a[self::FIELD_GROUP] = $vs; } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if ([] !== ($vs = $this->getImport())) { $a[self::FIELD_IMPORT] = []; @@ -1894,45 +2010,104 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_IMPORT][] = $v->getValue(); - $a[self::FIELD_IMPORT_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IMPORT][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IMPORT_EXT][] = $enc; + } else { + $a[self::FIELD_IMPORT_EXT][] = null; + } + } else { + $a[self::FIELD_IMPORT][] = $v; + } } } if ([] !== ($vs = $this->getJurisdiction())) { $a[self::FIELD_JURISDICTION] = $vs; } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if (null !== ($v = $this->getPublisher())) { - $a[self::FIELD_PUBLISHER] = $v->getValue(); - $a[self::FIELD_PUBLISHER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PUBLISHER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PUBLISHER_EXT] = $enc; + } + } else { + $a[self::FIELD_PUBLISHER] = $v; + } } if (null !== ($v = $this->getPurpose())) { - $a[self::FIELD_PURPOSE] = $v->getValue(); - $a[self::FIELD_PURPOSE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PURPOSE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PURPOSE_EXT] = $enc; + } + } else { + $a[self::FIELD_PURPOSE] = $v; + } } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if ([] !== ($vs = $this->getStructure())) { $a[self::FIELD_STRUCTURE] = $vs; } if (null !== ($v = $this->getTitle())) { - $a[self::FIELD_TITLE] = $v->getValue(); - $a[self::FIELD_TITLE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TITLE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TITLE_EXT] = $enc; + } + } else { + $a[self::FIELD_TITLE] = $v; + } } if (null !== ($v = $this->getUrl())) { - $a[self::FIELD_URL] = $v->getValue(); - $a[self::FIELD_URL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_URL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_URL_EXT] = $enc; + } + } else { + $a[self::FIELD_URL] = $v; + } } if ([] !== ($vs = $this->getUseContext())) { $a[self::FIELD_USE_CONTEXT] = $vs; } if (null !== ($v = $this->getVersion())) { - $a[self::FIELD_VERSION] = $v->getValue(); - $a[self::FIELD_VERSION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VERSION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VERSION_EXT] = $enc; + } + } else { + $a[self::FIELD_VERSION] = $v; + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRSubscription.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRSubscription.php index 04853a44b4..46356a9535 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRSubscription.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRSubscription.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -87,10 +87,6 @@ class FHIRSubscription extends FHIRDomainResource implements PHPFHIRContainedTyp { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SUBSCRIPTION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CHANNEL = 'channel'; const FIELD_CONTACT = 'contact'; const FIELD_CONTACT_EXT = '_contact'; @@ -192,6 +188,9 @@ class FHIRSubscription extends FHIRDomainResource implements PHPFHIRContainedTyp */ protected $status = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSubscription Constructor * @param null|array $data @@ -221,17 +220,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_CONTACT])) { foreach($data[self::FIELD_CONTACT] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContactPoint) { $this->addContact($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addContact(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addContact(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addContact(new FHIRContactPoint(array_merge($v, $ext[$i]))); + } } else { $this->addContact(new FHIRContactPoint($v)); } } } elseif ($data[self::FIELD_CONTACT] instanceof FHIRContactPoint) { $this->addContact($data[self::FIELD_CONTACT]); - } elseif ($ext && is_scalar($data[self::FIELD_CONTACT])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_CONTACT])) { $this->addContact(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $data[self::FIELD_CONTACT]] + $ext)); } else { $this->addContact(new FHIRContactPoint($data[self::FIELD_CONTACT])); @@ -243,8 +249,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CRITERIA] instanceof FHIRString) { $this->setCriteria($data[self::FIELD_CRITERIA]); - } elseif ($ext && is_scalar($data[self::FIELD_CRITERIA])) { - $this->setCriteria(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_CRITERIA]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CRITERIA])) { + $this->setCriteria(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_CRITERIA]] + $ext)); + } else if (is_array($data[self::FIELD_CRITERIA])) { + $this->setCriteria(new FHIRString(array_merge($ext, $data[self::FIELD_CRITERIA]))); + } } else { $this->setCriteria(new FHIRString($data[self::FIELD_CRITERIA])); } @@ -255,8 +265,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_END] instanceof FHIRInstant) { $this->setEnd($data[self::FIELD_END]); - } elseif ($ext && is_scalar($data[self::FIELD_END])) { - $this->setEnd(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_END]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_END])) { + $this->setEnd(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_END]] + $ext)); + } else if (is_array($data[self::FIELD_END])) { + $this->setEnd(new FHIRInstant(array_merge($ext, $data[self::FIELD_END]))); + } } else { $this->setEnd(new FHIRInstant($data[self::FIELD_END])); } @@ -267,8 +281,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ERROR] instanceof FHIRString) { $this->setError($data[self::FIELD_ERROR]); - } elseif ($ext && is_scalar($data[self::FIELD_ERROR])) { - $this->setError(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_ERROR]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ERROR])) { + $this->setError(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_ERROR]] + $ext)); + } else if (is_array($data[self::FIELD_ERROR])) { + $this->setError(new FHIRString(array_merge($ext, $data[self::FIELD_ERROR]))); + } } else { $this->setError(new FHIRString($data[self::FIELD_ERROR])); } @@ -279,8 +297,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_REASON] instanceof FHIRString) { $this->setReason($data[self::FIELD_REASON]); - } elseif ($ext && is_scalar($data[self::FIELD_REASON])) { - $this->setReason(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_REASON]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_REASON])) { + $this->setReason(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_REASON]] + $ext)); + } else if (is_array($data[self::FIELD_REASON])) { + $this->setReason(new FHIRString(array_merge($ext, $data[self::FIELD_REASON]))); + } } else { $this->setReason(new FHIRString($data[self::FIELD_REASON])); } @@ -291,8 +313,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRSubscriptionStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRSubscriptionStatus([FHIRSubscriptionStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRSubscriptionStatus([FHIRSubscriptionStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRSubscriptionStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRSubscriptionStatus($data[self::FIELD_STATUS])); } @@ -731,11 +757,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getChannel())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CHANNEL, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getContact())) { foreach($vs as $v) { if (null === $v) { @@ -744,6 +768,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_CONTACT, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getCriteria())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CRITERIA, null, $v->_getFHIRXMLNamespace())); } @@ -756,7 +781,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getReason())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REASON, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } @@ -773,26 +797,78 @@ public function jsonSerialize() $a[self::FIELD_CHANNEL] = $v; } if ([] !== ($vs = $this->getContact())) { - $a[self::FIELD_CONTACT] = $vs; + $a[self::FIELD_CONTACT] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CONTACT][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CONTACT_EXT][] = $enc; + } else { + $a[self::FIELD_CONTACT_EXT][] = null; + } + } else { + $a[self::FIELD_CONTACT][] = $v; + } + } } if (null !== ($v = $this->getCriteria())) { - $a[self::FIELD_CRITERIA] = $v->getValue(); - $a[self::FIELD_CRITERIA_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CRITERIA] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CRITERIA_EXT] = $enc; + } + } else { + $a[self::FIELD_CRITERIA] = $v; + } } if (null !== ($v = $this->getEnd())) { - $a[self::FIELD_END] = $v->getValue(); - $a[self::FIELD_END_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_END] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_END_EXT] = $enc; + } + } else { + $a[self::FIELD_END] = $v; + } } if (null !== ($v = $this->getError())) { - $a[self::FIELD_ERROR] = $v->getValue(); - $a[self::FIELD_ERROR_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ERROR] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ERROR_EXT] = $enc; + } + } else { + $a[self::FIELD_ERROR] = $v; + } } if (null !== ($v = $this->getReason())) { - $a[self::FIELD_REASON] = $v->getValue(); - $a[self::FIELD_REASON_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_REASON] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_REASON_EXT] = $enc; + } + } else { + $a[self::FIELD_REASON] = $v; + } } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRSubstance.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRSubstance.php index 05bf624346..f9886e5845 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRSubstance.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRSubstance.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -84,10 +84,6 @@ class FHIRSubstance extends FHIRDomainResource implements PHPFHIRContainedTypeIn { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SUBSTANCE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CATEGORY = 'category'; const FIELD_CODE = 'code'; const FIELD_DESCRIPTION = 'description'; @@ -177,6 +173,9 @@ class FHIRSubstance extends FHIRDomainResource implements PHPFHIRContainedTypeIn */ protected $status = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSubstance Constructor * @param null|array $data @@ -196,6 +195,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CATEGORY])) { if (is_array($data[self::FIELD_CATEGORY])) { foreach($data[self::FIELD_CATEGORY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addCategory($v); } else { @@ -221,8 +223,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -233,17 +239,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -252,6 +265,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_INGREDIENT])) { if (is_array($data[self::FIELD_INGREDIENT])) { foreach($data[self::FIELD_INGREDIENT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRSubstanceIngredient) { $this->addIngredient($v); } else { @@ -267,6 +283,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_INSTANCE])) { if (is_array($data[self::FIELD_INSTANCE])) { foreach($data[self::FIELD_INSTANCE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRSubstanceInstance) { $this->addInstance($v); } else { @@ -285,8 +304,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRFHIRSubstanceStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRFHIRSubstanceStatus([FHIRFHIRSubstanceStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRFHIRSubstanceStatus([FHIRFHIRSubstanceStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRFHIRSubstanceStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRFHIRSubstanceStatus($data[self::FIELD_STATUS])); } @@ -756,7 +779,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getCategory())) { foreach($vs as $v) { if (null === $v) { @@ -772,7 +794,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESCRIPTION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -819,11 +840,34 @@ public function jsonSerialize() $a[self::FIELD_CODE] = $v; } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if ([] !== ($vs = $this->getIngredient())) { $a[self::FIELD_INGREDIENT] = $vs; @@ -832,7 +876,15 @@ public function jsonSerialize() $a[self::FIELD_INSTANCE] = $vs; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRSubstanceNucleicAcid.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRSubstanceNucleicAcid.php index b02f4140a7..33e0bb458f 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRSubstanceNucleicAcid.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRSubstanceNucleicAcid.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -85,10 +85,6 @@ class FHIRSubstanceNucleicAcid extends FHIRDomainResource implements PHPFHIRCont { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SUBSTANCE_NUCLEIC_ACID; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_AREA_OF_HYBRIDISATION = 'areaOfHybridisation'; const FIELD_AREA_OF_HYBRIDISATION_EXT = '_areaOfHybridisation'; const FIELD_NUMBER_OF_SUBUNITS = 'numberOfSubunits'; @@ -163,6 +159,9 @@ class FHIRSubstanceNucleicAcid extends FHIRDomainResource implements PHPFHIRCont */ protected $subunit = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSubstanceNucleicAcid Constructor * @param null|array $data @@ -185,8 +184,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_AREA_OF_HYBRIDISATION] instanceof FHIRString) { $this->setAreaOfHybridisation($data[self::FIELD_AREA_OF_HYBRIDISATION]); - } elseif ($ext && is_scalar($data[self::FIELD_AREA_OF_HYBRIDISATION])) { - $this->setAreaOfHybridisation(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_AREA_OF_HYBRIDISATION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_AREA_OF_HYBRIDISATION])) { + $this->setAreaOfHybridisation(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_AREA_OF_HYBRIDISATION]] + $ext)); + } else if (is_array($data[self::FIELD_AREA_OF_HYBRIDISATION])) { + $this->setAreaOfHybridisation(new FHIRString(array_merge($ext, $data[self::FIELD_AREA_OF_HYBRIDISATION]))); + } } else { $this->setAreaOfHybridisation(new FHIRString($data[self::FIELD_AREA_OF_HYBRIDISATION])); } @@ -197,8 +200,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NUMBER_OF_SUBUNITS] instanceof FHIRInteger) { $this->setNumberOfSubunits($data[self::FIELD_NUMBER_OF_SUBUNITS]); - } elseif ($ext && is_scalar($data[self::FIELD_NUMBER_OF_SUBUNITS])) { - $this->setNumberOfSubunits(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_NUMBER_OF_SUBUNITS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NUMBER_OF_SUBUNITS])) { + $this->setNumberOfSubunits(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_NUMBER_OF_SUBUNITS]] + $ext)); + } else if (is_array($data[self::FIELD_NUMBER_OF_SUBUNITS])) { + $this->setNumberOfSubunits(new FHIRInteger(array_merge($ext, $data[self::FIELD_NUMBER_OF_SUBUNITS]))); + } } else { $this->setNumberOfSubunits(new FHIRInteger($data[self::FIELD_NUMBER_OF_SUBUNITS])); } @@ -220,6 +227,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SUBUNIT])) { if (is_array($data[self::FIELD_SUBUNIT])) { foreach($data[self::FIELD_SUBUNIT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRSubstanceNucleicAcidSubunit) { $this->addSubunit($v); } else { @@ -587,15 +597,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getNumberOfSubunits())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NUMBER_OF_SUBUNITS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOligoNucleotideType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OLIGO_NUCLEOTIDE_TYPE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSequenceType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SEQUENCE_TYPE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getSubunit())) { foreach($vs as $v) { if (null === $v) { @@ -604,6 +611,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_SUBUNIT, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } @@ -614,12 +622,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getAreaOfHybridisation())) { - $a[self::FIELD_AREA_OF_HYBRIDISATION] = $v->getValue(); - $a[self::FIELD_AREA_OF_HYBRIDISATION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_AREA_OF_HYBRIDISATION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_AREA_OF_HYBRIDISATION_EXT] = $enc; + } + } else { + $a[self::FIELD_AREA_OF_HYBRIDISATION] = $v; + } } if (null !== ($v = $this->getNumberOfSubunits())) { - $a[self::FIELD_NUMBER_OF_SUBUNITS] = $v->getValue(); - $a[self::FIELD_NUMBER_OF_SUBUNITS_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NUMBER_OF_SUBUNITS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NUMBER_OF_SUBUNITS_EXT] = $enc; + } + } else { + $a[self::FIELD_NUMBER_OF_SUBUNITS] = $v; + } } if (null !== ($v = $this->getOligoNucleotideType())) { $a[self::FIELD_OLIGO_NUCLEOTIDE_TYPE] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRSubstancePolymer.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRSubstancePolymer.php index 9ce7c51576..8bb7a4df8d 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRSubstancePolymer.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRSubstancePolymer.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -82,10 +82,6 @@ class FHIRSubstancePolymer extends FHIRDomainResource implements PHPFHIRContaine { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SUBSTANCE_POLYMER; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CLASS = 'class'; const FIELD_COPOLYMER_CONNECTIVITY = 'copolymerConnectivity'; const FIELD_GEOMETRY = 'geometry'; @@ -159,6 +155,9 @@ class FHIRSubstancePolymer extends FHIRDomainResource implements PHPFHIRContaine */ protected $repeat = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSubstancePolymer Constructor * @param null|array $data @@ -185,6 +184,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_COPOLYMER_CONNECTIVITY])) { if (is_array($data[self::FIELD_COPOLYMER_CONNECTIVITY])) { foreach($data[self::FIELD_COPOLYMER_CONNECTIVITY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addCopolymerConnectivity($v); } else { @@ -210,17 +212,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_MODIFICATION])) { foreach($data[self::FIELD_MODIFICATION] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRString) { $this->addModification($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addModification(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addModification(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addModification(new FHIRString(array_merge($v, $ext[$i]))); + } } else { $this->addModification(new FHIRString($v)); } } } elseif ($data[self::FIELD_MODIFICATION] instanceof FHIRString) { $this->addModification($data[self::FIELD_MODIFICATION]); - } elseif ($ext && is_scalar($data[self::FIELD_MODIFICATION])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_MODIFICATION])) { $this->addModification(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_MODIFICATION]] + $ext)); } else { $this->addModification(new FHIRString($data[self::FIELD_MODIFICATION])); @@ -229,6 +238,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_MONOMER_SET])) { if (is_array($data[self::FIELD_MONOMER_SET])) { foreach($data[self::FIELD_MONOMER_SET] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRSubstancePolymerMonomerSet) { $this->addMonomerSet($v); } else { @@ -244,6 +256,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REPEAT])) { if (is_array($data[self::FIELD_REPEAT])) { foreach($data[self::FIELD_REPEAT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRSubstancePolymerRepeat) { $this->addRepeat($v); } else { @@ -681,11 +696,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getClass())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CLASS, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getCopolymerConnectivity())) { foreach($vs as $v) { if (null === $v) { @@ -724,6 +737,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_REPEAT, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } @@ -748,8 +762,17 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_MODIFICATION][] = $v->getValue(); - $a[self::FIELD_MODIFICATION_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MODIFICATION][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MODIFICATION_EXT][] = $enc; + } else { + $a[self::FIELD_MODIFICATION_EXT][] = null; + } + } else { + $a[self::FIELD_MODIFICATION][] = $v; + } } } if ([] !== ($vs = $this->getMonomerSet())) { diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRSubstanceProtein.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRSubstanceProtein.php index dc39ca285e..355ca80e8e 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRSubstanceProtein.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRSubstanceProtein.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -89,10 +89,6 @@ class FHIRSubstanceProtein extends FHIRDomainResource implements PHPFHIRContaine { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SUBSTANCE_PROTEIN; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DISULFIDE_LINKAGE = 'disulfideLinkage'; const FIELD_DISULFIDE_LINKAGE_EXT = '_disulfideLinkage'; const FIELD_NUMBER_OF_SUBUNITS = 'numberOfSubunits'; @@ -166,6 +162,9 @@ class FHIRSubstanceProtein extends FHIRDomainResource implements PHPFHIRContaine */ protected $subunit = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSubstanceProtein Constructor * @param null|array $data @@ -188,17 +187,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_DISULFIDE_LINKAGE])) { foreach($data[self::FIELD_DISULFIDE_LINKAGE] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRString) { $this->addDisulfideLinkage($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addDisulfideLinkage(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addDisulfideLinkage(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addDisulfideLinkage(new FHIRString(array_merge($v, $ext[$i]))); + } } else { $this->addDisulfideLinkage(new FHIRString($v)); } } } elseif ($data[self::FIELD_DISULFIDE_LINKAGE] instanceof FHIRString) { $this->addDisulfideLinkage($data[self::FIELD_DISULFIDE_LINKAGE]); - } elseif ($ext && is_scalar($data[self::FIELD_DISULFIDE_LINKAGE])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_DISULFIDE_LINKAGE])) { $this->addDisulfideLinkage(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DISULFIDE_LINKAGE]] + $ext)); } else { $this->addDisulfideLinkage(new FHIRString($data[self::FIELD_DISULFIDE_LINKAGE])); @@ -210,8 +216,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NUMBER_OF_SUBUNITS] instanceof FHIRInteger) { $this->setNumberOfSubunits($data[self::FIELD_NUMBER_OF_SUBUNITS]); - } elseif ($ext && is_scalar($data[self::FIELD_NUMBER_OF_SUBUNITS])) { - $this->setNumberOfSubunits(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_NUMBER_OF_SUBUNITS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NUMBER_OF_SUBUNITS])) { + $this->setNumberOfSubunits(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_NUMBER_OF_SUBUNITS]] + $ext)); + } else if (is_array($data[self::FIELD_NUMBER_OF_SUBUNITS])) { + $this->setNumberOfSubunits(new FHIRInteger(array_merge($ext, $data[self::FIELD_NUMBER_OF_SUBUNITS]))); + } } else { $this->setNumberOfSubunits(new FHIRInteger($data[self::FIELD_NUMBER_OF_SUBUNITS])); } @@ -226,6 +236,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SUBUNIT])) { if (is_array($data[self::FIELD_SUBUNIT])) { foreach($data[self::FIELD_SUBUNIT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRSubstanceProteinSubunit) { $this->addSubunit($v); } else { @@ -626,14 +639,13 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_DISULFIDE_LINKAGE, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getNumberOfSubunits())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NUMBER_OF_SUBUNITS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSequenceType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SEQUENCE_TYPE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getSubunit())) { foreach($vs as $v) { if (null === $v) { @@ -642,6 +654,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_SUBUNIT, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } @@ -657,13 +670,29 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_DISULFIDE_LINKAGE][] = $v->getValue(); - $a[self::FIELD_DISULFIDE_LINKAGE_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DISULFIDE_LINKAGE][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DISULFIDE_LINKAGE_EXT][] = $enc; + } else { + $a[self::FIELD_DISULFIDE_LINKAGE_EXT][] = null; + } + } else { + $a[self::FIELD_DISULFIDE_LINKAGE][] = $v; + } } } if (null !== ($v = $this->getNumberOfSubunits())) { - $a[self::FIELD_NUMBER_OF_SUBUNITS] = $v->getValue(); - $a[self::FIELD_NUMBER_OF_SUBUNITS_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NUMBER_OF_SUBUNITS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NUMBER_OF_SUBUNITS_EXT] = $enc; + } + } else { + $a[self::FIELD_NUMBER_OF_SUBUNITS] = $v; + } } if (null !== ($v = $this->getSequenceType())) { $a[self::FIELD_SEQUENCE_TYPE] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRSubstanceReferenceInformation.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRSubstanceReferenceInformation.php index 7041933149..462c0677d5 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRSubstanceReferenceInformation.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRSubstanceReferenceInformation.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -83,10 +83,6 @@ class FHIRSubstanceReferenceInformation extends FHIRDomainResource implements PH { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SUBSTANCE_REFERENCE_INFORMATION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CLASSIFICATION = 'classification'; const FIELD_COMMENT = 'comment'; const FIELD_COMMENT_EXT = '_comment'; @@ -141,6 +137,9 @@ class FHIRSubstanceReferenceInformation extends FHIRDomainResource implements PH */ protected $target = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSubstanceReferenceInformation Constructor * @param null|array $data @@ -160,6 +159,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CLASSIFICATION])) { if (is_array($data[self::FIELD_CLASSIFICATION])) { foreach($data[self::FIELD_CLASSIFICATION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRSubstanceReferenceInformationClassification) { $this->addClassification($v); } else { @@ -178,8 +180,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_COMMENT] instanceof FHIRString) { $this->setComment($data[self::FIELD_COMMENT]); - } elseif ($ext && is_scalar($data[self::FIELD_COMMENT])) { - $this->setComment(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_COMMENT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_COMMENT])) { + $this->setComment(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_COMMENT]] + $ext)); + } else if (is_array($data[self::FIELD_COMMENT])) { + $this->setComment(new FHIRString(array_merge($ext, $data[self::FIELD_COMMENT]))); + } } else { $this->setComment(new FHIRString($data[self::FIELD_COMMENT])); } @@ -187,6 +193,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_GENE])) { if (is_array($data[self::FIELD_GENE])) { foreach($data[self::FIELD_GENE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRSubstanceReferenceInformationGene) { $this->addGene($v); } else { @@ -202,6 +211,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_GENE_ELEMENT])) { if (is_array($data[self::FIELD_GENE_ELEMENT])) { foreach($data[self::FIELD_GENE_ELEMENT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRSubstanceReferenceInformationGeneElement) { $this->addGeneElement($v); } else { @@ -217,6 +229,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_TARGET])) { if (is_array($data[self::FIELD_TARGET])) { foreach($data[self::FIELD_TARGET] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRSubstanceReferenceInformationTarget) { $this->addTarget($v); } else { @@ -602,7 +617,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getClassification())) { foreach($vs as $v) { if (null === $v) { @@ -611,10 +625,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_CLASSIFICATION, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getComment())) { $v->xmlSerialize($sxe->addChild(self::FIELD_COMMENT, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getGene())) { foreach($vs as $v) { if (null === $v) { @@ -641,6 +655,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_TARGET, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } @@ -654,8 +669,15 @@ public function jsonSerialize() $a[self::FIELD_CLASSIFICATION] = $vs; } if (null !== ($v = $this->getComment())) { - $a[self::FIELD_COMMENT] = $v->getValue(); - $a[self::FIELD_COMMENT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_COMMENT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_COMMENT_EXT] = $enc; + } + } else { + $a[self::FIELD_COMMENT] = $v; + } } if ([] !== ($vs = $this->getGene())) { $a[self::FIELD_GENE] = $vs; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRSubstanceSourceMaterial.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRSubstanceSourceMaterial.php index 4ec7df707b..674ccb337c 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRSubstanceSourceMaterial.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRSubstanceSourceMaterial.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -96,10 +96,6 @@ class FHIRSubstanceSourceMaterial extends FHIRDomainResource implements PHPFHIRC { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SUBSTANCE_SOURCE_MATERIAL; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_COUNTRY_OF_ORIGIN = 'countryOfOrigin'; const FIELD_DEVELOPMENT_STAGE = 'developmentStage'; const FIELD_FRACTION_DESCRIPTION = 'fractionDescription'; @@ -322,6 +318,9 @@ class FHIRSubstanceSourceMaterial extends FHIRDomainResource implements PHPFHIRC */ protected $sourceMaterialType = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSubstanceSourceMaterial Constructor * @param null|array $data @@ -341,6 +340,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_COUNTRY_OF_ORIGIN])) { if (is_array($data[self::FIELD_COUNTRY_OF_ORIGIN])) { foreach($data[self::FIELD_COUNTRY_OF_ORIGIN] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addCountryOfOrigin($v); } else { @@ -363,6 +365,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_FRACTION_DESCRIPTION])) { if (is_array($data[self::FIELD_FRACTION_DESCRIPTION])) { foreach($data[self::FIELD_FRACTION_DESCRIPTION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRSubstanceSourceMaterialFractionDescription) { $this->addFractionDescription($v); } else { @@ -381,17 +386,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_GEOGRAPHICAL_LOCATION])) { foreach($data[self::FIELD_GEOGRAPHICAL_LOCATION] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRString) { $this->addGeographicalLocation($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addGeographicalLocation(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addGeographicalLocation(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addGeographicalLocation(new FHIRString(array_merge($v, $ext[$i]))); + } } else { $this->addGeographicalLocation(new FHIRString($v)); } } } elseif ($data[self::FIELD_GEOGRAPHICAL_LOCATION] instanceof FHIRString) { $this->addGeographicalLocation($data[self::FIELD_GEOGRAPHICAL_LOCATION]); - } elseif ($ext && is_scalar($data[self::FIELD_GEOGRAPHICAL_LOCATION])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_GEOGRAPHICAL_LOCATION])) { $this->addGeographicalLocation(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_GEOGRAPHICAL_LOCATION]] + $ext)); } else { $this->addGeographicalLocation(new FHIRString($data[self::FIELD_GEOGRAPHICAL_LOCATION])); @@ -410,8 +422,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ORGANISM_ID] instanceof FHIRIdentifier) { $this->setOrganismId($data[self::FIELD_ORGANISM_ID]); - } elseif ($ext && is_scalar($data[self::FIELD_ORGANISM_ID])) { - $this->setOrganismId(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_ORGANISM_ID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ORGANISM_ID])) { + $this->setOrganismId(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_ORGANISM_ID]] + $ext)); + } else if (is_array($data[self::FIELD_ORGANISM_ID])) { + $this->setOrganismId(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_ORGANISM_ID]))); + } } else { $this->setOrganismId(new FHIRIdentifier($data[self::FIELD_ORGANISM_ID])); } @@ -422,8 +438,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ORGANISM_NAME] instanceof FHIRString) { $this->setOrganismName($data[self::FIELD_ORGANISM_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_ORGANISM_NAME])) { - $this->setOrganismName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_ORGANISM_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ORGANISM_NAME])) { + $this->setOrganismName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_ORGANISM_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_ORGANISM_NAME])) { + $this->setOrganismName(new FHIRString(array_merge($ext, $data[self::FIELD_ORGANISM_NAME]))); + } } else { $this->setOrganismName(new FHIRString($data[self::FIELD_ORGANISM_NAME])); } @@ -434,17 +454,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_PARENT_SUBSTANCE_ID])) { foreach($data[self::FIELD_PARENT_SUBSTANCE_ID] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addParentSubstanceId($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addParentSubstanceId(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addParentSubstanceId(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addParentSubstanceId(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addParentSubstanceId(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_PARENT_SUBSTANCE_ID] instanceof FHIRIdentifier) { $this->addParentSubstanceId($data[self::FIELD_PARENT_SUBSTANCE_ID]); - } elseif ($ext && is_scalar($data[self::FIELD_PARENT_SUBSTANCE_ID])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_PARENT_SUBSTANCE_ID])) { $this->addParentSubstanceId(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_PARENT_SUBSTANCE_ID]] + $ext)); } else { $this->addParentSubstanceId(new FHIRIdentifier($data[self::FIELD_PARENT_SUBSTANCE_ID])); @@ -456,17 +483,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_PARENT_SUBSTANCE_NAME])) { foreach($data[self::FIELD_PARENT_SUBSTANCE_NAME] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRString) { $this->addParentSubstanceName($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addParentSubstanceName(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addParentSubstanceName(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addParentSubstanceName(new FHIRString(array_merge($v, $ext[$i]))); + } } else { $this->addParentSubstanceName(new FHIRString($v)); } } } elseif ($data[self::FIELD_PARENT_SUBSTANCE_NAME] instanceof FHIRString) { $this->addParentSubstanceName($data[self::FIELD_PARENT_SUBSTANCE_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_PARENT_SUBSTANCE_NAME])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_PARENT_SUBSTANCE_NAME])) { $this->addParentSubstanceName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PARENT_SUBSTANCE_NAME]] + $ext)); } else { $this->addParentSubstanceName(new FHIRString($data[self::FIELD_PARENT_SUBSTANCE_NAME])); @@ -475,6 +509,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PART_DESCRIPTION])) { if (is_array($data[self::FIELD_PART_DESCRIPTION])) { foreach($data[self::FIELD_PART_DESCRIPTION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRSubstanceSourceMaterialPartDescription) { $this->addPartDescription($v); } else { @@ -1402,7 +1439,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getCountryOfOrigin())) { foreach($vs as $v) { if (null === $v) { @@ -1415,7 +1451,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDevelopmentStage())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEVELOPMENT_STAGE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getFractionDescription())) { foreach($vs as $v) { if (null === $v) { @@ -1424,6 +1459,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_FRACTION_DESCRIPTION, null, $v->_getFHIRXMLNamespace())); } } + if ([] !== ($vs = $this->getGeographicalLocation())) { foreach($vs as $v) { if (null === $v) { @@ -1436,14 +1472,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getOrganism())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ORGANISM, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOrganismId())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ORGANISM_ID, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getOrganismName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ORGANISM_NAME, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getParentSubstanceId())) { foreach($vs as $v) { if (null === $v) { @@ -1452,6 +1486,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_PARENT_SUBSTANCE_ID, null, $v->_getFHIRXMLNamespace())); } } + if ([] !== ($vs = $this->getParentSubstanceName())) { foreach($vs as $v) { if (null === $v) { @@ -1473,11 +1508,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getSourceMaterialClass())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SOURCE_MATERIAL_CLASS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSourceMaterialState())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SOURCE_MATERIAL_STATE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSourceMaterialType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SOURCE_MATERIAL_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -1505,22 +1538,62 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_GEOGRAPHICAL_LOCATION][] = $v->getValue(); - $a[self::FIELD_GEOGRAPHICAL_LOCATION_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_GEOGRAPHICAL_LOCATION][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_GEOGRAPHICAL_LOCATION_EXT][] = $enc; + } else { + $a[self::FIELD_GEOGRAPHICAL_LOCATION_EXT][] = null; + } + } else { + $a[self::FIELD_GEOGRAPHICAL_LOCATION][] = $v; + } } } if (null !== ($v = $this->getOrganism())) { $a[self::FIELD_ORGANISM] = $v; } if (null !== ($v = $this->getOrganismId())) { - $a[self::FIELD_ORGANISM_ID] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ORGANISM_ID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ORGANISM_ID_EXT] = $enc; + } + } else { + $a[self::FIELD_ORGANISM_ID] = $v; + } } if (null !== ($v = $this->getOrganismName())) { - $a[self::FIELD_ORGANISM_NAME] = $v->getValue(); - $a[self::FIELD_ORGANISM_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ORGANISM_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ORGANISM_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_ORGANISM_NAME] = $v; + } } if ([] !== ($vs = $this->getParentSubstanceId())) { - $a[self::FIELD_PARENT_SUBSTANCE_ID] = $vs; + $a[self::FIELD_PARENT_SUBSTANCE_ID] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PARENT_SUBSTANCE_ID][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PARENT_SUBSTANCE_ID_EXT][] = $enc; + } else { + $a[self::FIELD_PARENT_SUBSTANCE_ID_EXT][] = null; + } + } else { + $a[self::FIELD_PARENT_SUBSTANCE_ID][] = $v; + } + } } if ([] !== ($vs = $this->getParentSubstanceName())) { $a[self::FIELD_PARENT_SUBSTANCE_NAME] = []; @@ -1528,8 +1601,17 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_PARENT_SUBSTANCE_NAME][] = $v->getValue(); - $a[self::FIELD_PARENT_SUBSTANCE_NAME_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PARENT_SUBSTANCE_NAME][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PARENT_SUBSTANCE_NAME_EXT][] = $enc; + } else { + $a[self::FIELD_PARENT_SUBSTANCE_NAME_EXT][] = null; + } + } else { + $a[self::FIELD_PARENT_SUBSTANCE_NAME][] = $v; + } } } if ([] !== ($vs = $this->getPartDescription())) { diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRSubstanceSpecification.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRSubstanceSpecification.php index cef4d51822..d5704c4590 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRSubstanceSpecification.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRSubstanceSpecification.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -90,10 +90,6 @@ class FHIRSubstanceSpecification extends FHIRDomainResource implements PHPFHIRCo { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SUBSTANCE_SPECIFICATION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CODE = 'code'; const FIELD_COMMENT = 'comment'; const FIELD_COMMENT_EXT = '_comment'; @@ -324,6 +320,9 @@ class FHIRSubstanceSpecification extends FHIRDomainResource implements PHPFHIRCo */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSubstanceSpecification Constructor * @param null|array $data @@ -343,6 +342,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CODE])) { if (is_array($data[self::FIELD_CODE])) { foreach($data[self::FIELD_CODE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRSubstanceSpecificationCode) { $this->addCode($v); } else { @@ -361,8 +363,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_COMMENT] instanceof FHIRString) { $this->setComment($data[self::FIELD_COMMENT]); - } elseif ($ext && is_scalar($data[self::FIELD_COMMENT])) { - $this->setComment(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_COMMENT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_COMMENT])) { + $this->setComment(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_COMMENT]] + $ext)); + } else if (is_array($data[self::FIELD_COMMENT])) { + $this->setComment(new FHIRString(array_merge($ext, $data[self::FIELD_COMMENT]))); + } } else { $this->setComment(new FHIRString($data[self::FIELD_COMMENT])); } @@ -373,8 +379,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -392,8 +402,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->setIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { - $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_IDENTIFIER]))); + } } else { $this->setIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); } @@ -401,6 +415,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_MOIETY])) { if (is_array($data[self::FIELD_MOIETY])) { foreach($data[self::FIELD_MOIETY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRSubstanceSpecificationMoiety) { $this->addMoiety($v); } else { @@ -416,6 +433,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_MOLECULAR_WEIGHT])) { if (is_array($data[self::FIELD_MOLECULAR_WEIGHT])) { foreach($data[self::FIELD_MOLECULAR_WEIGHT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRSubstanceSpecificationMolecularWeight) { $this->addMolecularWeight($v); } else { @@ -431,6 +451,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_NAME])) { if (is_array($data[self::FIELD_NAME])) { foreach($data[self::FIELD_NAME] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRSubstanceSpecificationName) { $this->addName($v); } else { @@ -460,6 +483,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PROPERTY])) { if (is_array($data[self::FIELD_PROPERTY])) { foreach($data[self::FIELD_PROPERTY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRSubstanceSpecificationProperty) { $this->addProperty($v); } else { @@ -489,6 +515,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_RELATIONSHIP])) { if (is_array($data[self::FIELD_RELATIONSHIP])) { foreach($data[self::FIELD_RELATIONSHIP] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRSubstanceSpecificationRelationship) { $this->addRelationship($v); } else { @@ -504,6 +533,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SOURCE])) { if (is_array($data[self::FIELD_SOURCE])) { foreach($data[self::FIELD_SOURCE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addSource($v); } else { @@ -1489,7 +1521,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getCode())) { foreach($vs as $v) { if (null === $v) { @@ -1498,21 +1529,19 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getComment())) { $v->xmlSerialize($sxe->addChild(self::FIELD_COMMENT, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getDescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESCRIPTION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDomain())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DOMAIN, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getMoiety())) { foreach($vs as $v) { if (null === $v) { @@ -1543,11 +1572,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getNucleicAcid())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NUCLEIC_ACID, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPolymer())) { $v->xmlSerialize($sxe->addChild(self::FIELD_POLYMER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getProperty())) { foreach($vs as $v) { if (null === $v) { @@ -1560,11 +1587,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getProtein())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PROTEIN, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getReferenceInformation())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REFERENCE_INFORMATION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getRelationship())) { foreach($vs as $v) { if (null === $v) { @@ -1586,15 +1611,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getSourceMaterial())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SOURCE_MATERIAL, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStructure())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STRUCTURE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -1611,18 +1633,40 @@ public function jsonSerialize() $a[self::FIELD_CODE] = $vs; } if (null !== ($v = $this->getComment())) { - $a[self::FIELD_COMMENT] = $v->getValue(); - $a[self::FIELD_COMMENT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_COMMENT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_COMMENT_EXT] = $enc; + } + } else { + $a[self::FIELD_COMMENT] = $v; + } } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if (null !== ($v = $this->getDomain())) { $a[self::FIELD_DOMAIN] = $v; } if (null !== ($v = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_IDENTIFIER] = $v; + } } if ([] !== ($vs = $this->getMoiety())) { $a[self::FIELD_MOIETY] = $vs; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRSupplyDelivery.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRSupplyDelivery.php index 914e2742c7..cd8b89f93b 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRSupplyDelivery.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRSupplyDelivery.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -86,10 +86,6 @@ class FHIRSupplyDelivery extends FHIRDomainResource implements PHPFHIRContainedT { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SUPPLY_DELIVERY; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_BASED_ON = 'basedOn'; const FIELD_DESTINATION = 'destination'; const FIELD_IDENTIFIER = 'identifier'; @@ -262,6 +258,9 @@ class FHIRSupplyDelivery extends FHIRDomainResource implements PHPFHIRContainedT */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSupplyDelivery Constructor * @param null|array $data @@ -281,6 +280,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_BASED_ON])) { if (is_array($data[self::FIELD_BASED_ON])) { foreach($data[self::FIELD_BASED_ON] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addBasedOn($v); } else { @@ -306,17 +308,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -328,8 +337,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_OCCURRENCE_DATE_TIME] instanceof FHIRDateTime) { $this->setOccurrenceDateTime($data[self::FIELD_OCCURRENCE_DATE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_OCCURRENCE_DATE_TIME])) { - $this->setOccurrenceDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_OCCURRENCE_DATE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_OCCURRENCE_DATE_TIME])) { + $this->setOccurrenceDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_OCCURRENCE_DATE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_OCCURRENCE_DATE_TIME])) { + $this->setOccurrenceDateTime(new FHIRDateTime(array_merge($ext, $data[self::FIELD_OCCURRENCE_DATE_TIME]))); + } } else { $this->setOccurrenceDateTime(new FHIRDateTime($data[self::FIELD_OCCURRENCE_DATE_TIME])); } @@ -351,6 +364,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PART_OF])) { if (is_array($data[self::FIELD_PART_OF])) { foreach($data[self::FIELD_PART_OF] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addPartOf($v); } else { @@ -373,6 +389,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_RECEIVER])) { if (is_array($data[self::FIELD_RECEIVER])) { foreach($data[self::FIELD_RECEIVER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addReceiver($v); } else { @@ -391,8 +410,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRSupplyDeliveryStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRSupplyDeliveryStatus([FHIRSupplyDeliveryStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRSupplyDeliveryStatus([FHIRSupplyDeliveryStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRSupplyDeliveryStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRSupplyDeliveryStatus($data[self::FIELD_STATUS])); } @@ -1105,7 +1128,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getBasedOn())) { foreach($vs as $v) { if (null === $v) { @@ -1118,7 +1140,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDestination())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESTINATION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -1127,18 +1148,16 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getOccurrenceDateTime())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OCCURRENCE_DATE_TIME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOccurrencePeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OCCURRENCE_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOccurrenceTiming())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OCCURRENCE_TIMING, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getPartOf())) { foreach($vs as $v) { if (null === $v) { @@ -1151,7 +1170,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getPatient())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATIENT, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getReceiver())) { foreach($vs as $v) { if (null === $v) { @@ -1164,15 +1182,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSuppliedItem())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUPPLIED_ITEM, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSupplier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUPPLIER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -1192,11 +1207,34 @@ public function jsonSerialize() $a[self::FIELD_DESTINATION] = $v; } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if (null !== ($v = $this->getOccurrenceDateTime())) { - $a[self::FIELD_OCCURRENCE_DATE_TIME] = $v->getValue(); - $a[self::FIELD_OCCURRENCE_DATE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_OCCURRENCE_DATE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_OCCURRENCE_DATE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_OCCURRENCE_DATE_TIME] = $v; + } } if (null !== ($v = $this->getOccurrencePeriod())) { $a[self::FIELD_OCCURRENCE_PERIOD] = $v; @@ -1214,7 +1252,15 @@ public function jsonSerialize() $a[self::FIELD_RECEIVER] = $vs; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getSuppliedItem())) { $a[self::FIELD_SUPPLIED_ITEM] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRSupplyRequest.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRSupplyRequest.php index d9a4fe041a..d96b75a1ef 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRSupplyRequest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRSupplyRequest.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -89,10 +89,6 @@ class FHIRSupplyRequest extends FHIRDomainResource implements PHPFHIRContainedTy { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SUPPLY_REQUEST; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_AUTHORED_ON = 'authoredOn'; const FIELD_AUTHORED_ON_EXT = '_authoredOn'; const FIELD_CATEGORY = 'category'; @@ -341,6 +337,9 @@ class FHIRSupplyRequest extends FHIRDomainResource implements PHPFHIRContainedTy */ protected $supplier = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSupplyRequest Constructor * @param null|array $data @@ -363,8 +362,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_AUTHORED_ON] instanceof FHIRDateTime) { $this->setAuthoredOn($data[self::FIELD_AUTHORED_ON]); - } elseif ($ext && is_scalar($data[self::FIELD_AUTHORED_ON])) { - $this->setAuthoredOn(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_AUTHORED_ON]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_AUTHORED_ON])) { + $this->setAuthoredOn(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_AUTHORED_ON]] + $ext)); + } else if (is_array($data[self::FIELD_AUTHORED_ON])) { + $this->setAuthoredOn(new FHIRDateTime(array_merge($ext, $data[self::FIELD_AUTHORED_ON]))); + } } else { $this->setAuthoredOn(new FHIRDateTime($data[self::FIELD_AUTHORED_ON])); } @@ -396,17 +399,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -432,8 +442,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_OCCURRENCE_DATE_TIME] instanceof FHIRDateTime) { $this->setOccurrenceDateTime($data[self::FIELD_OCCURRENCE_DATE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_OCCURRENCE_DATE_TIME])) { - $this->setOccurrenceDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_OCCURRENCE_DATE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_OCCURRENCE_DATE_TIME])) { + $this->setOccurrenceDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_OCCURRENCE_DATE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_OCCURRENCE_DATE_TIME])) { + $this->setOccurrenceDateTime(new FHIRDateTime(array_merge($ext, $data[self::FIELD_OCCURRENCE_DATE_TIME]))); + } } else { $this->setOccurrenceDateTime(new FHIRDateTime($data[self::FIELD_OCCURRENCE_DATE_TIME])); } @@ -455,6 +469,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PARAMETER])) { if (is_array($data[self::FIELD_PARAMETER])) { foreach($data[self::FIELD_PARAMETER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRSupplyRequestParameter) { $this->addParameter($v); } else { @@ -473,8 +490,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PRIORITY] instanceof FHIRRequestPriority) { $this->setPriority($data[self::FIELD_PRIORITY]); - } elseif ($ext && is_scalar($data[self::FIELD_PRIORITY])) { - $this->setPriority(new FHIRRequestPriority([FHIRRequestPriority::FIELD_VALUE => $data[self::FIELD_PRIORITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PRIORITY])) { + $this->setPriority(new FHIRRequestPriority([FHIRRequestPriority::FIELD_VALUE => $data[self::FIELD_PRIORITY]] + $ext)); + } else if (is_array($data[self::FIELD_PRIORITY])) { + $this->setPriority(new FHIRRequestPriority(array_merge($ext, $data[self::FIELD_PRIORITY]))); + } } else { $this->setPriority(new FHIRRequestPriority($data[self::FIELD_PRIORITY])); } @@ -485,8 +506,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_QUANTITY] instanceof FHIRQuantity) { $this->setQuantity($data[self::FIELD_QUANTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_QUANTITY])) { - $this->setQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_QUANTITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_QUANTITY])) { + $this->setQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_QUANTITY])) { + $this->setQuantity(new FHIRQuantity(array_merge($ext, $data[self::FIELD_QUANTITY]))); + } } else { $this->setQuantity(new FHIRQuantity($data[self::FIELD_QUANTITY])); } @@ -494,6 +519,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REASON_CODE])) { if (is_array($data[self::FIELD_REASON_CODE])) { foreach($data[self::FIELD_REASON_CODE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addReasonCode($v); } else { @@ -509,6 +537,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REASON_REFERENCE])) { if (is_array($data[self::FIELD_REASON_REFERENCE])) { foreach($data[self::FIELD_REASON_REFERENCE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addReasonReference($v); } else { @@ -534,8 +565,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRSupplyRequestStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRSupplyRequestStatus([FHIRSupplyRequestStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRSupplyRequestStatus([FHIRSupplyRequestStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRSupplyRequestStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRSupplyRequestStatus($data[self::FIELD_STATUS])); } @@ -543,6 +578,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SUPPLIER])) { if (is_array($data[self::FIELD_SUPPLIER])) { foreach($data[self::FIELD_SUPPLIER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addSupplier($v); } else { @@ -1477,19 +1515,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getAuthoredOn())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AUTHORED_ON, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getCategory())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CATEGORY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDeliverFrom())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DELIVER_FROM, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDeliverTo())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DELIVER_TO, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -1502,22 +1536,18 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getItemCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ITEM_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getItemReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ITEM_REFERENCE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getOccurrenceDateTime())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OCCURRENCE_DATE_TIME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOccurrencePeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OCCURRENCE_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOccurrenceTiming())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OCCURRENCE_TIMING, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getParameter())) { foreach($vs as $v) { if (null === $v) { @@ -1530,11 +1560,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getPriority())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PRIORITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_QUANTITY, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getReasonCode())) { foreach($vs as $v) { if (null === $v) { @@ -1556,11 +1584,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getRequester())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REQUESTER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getSupplier())) { foreach($vs as $v) { if (null === $v) { @@ -1569,6 +1595,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_SUPPLIER, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } @@ -1579,8 +1606,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getAuthoredOn())) { - $a[self::FIELD_AUTHORED_ON] = $v->getValue(); - $a[self::FIELD_AUTHORED_ON_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_AUTHORED_ON] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_AUTHORED_ON_EXT] = $enc; + } + } else { + $a[self::FIELD_AUTHORED_ON] = $v; + } } if (null !== ($v = $this->getCategory())) { $a[self::FIELD_CATEGORY] = $v; @@ -1592,7 +1626,23 @@ public function jsonSerialize() $a[self::FIELD_DELIVER_TO] = $v; } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if (null !== ($v = $this->getItemCodeableConcept())) { $a[self::FIELD_ITEM_CODEABLE_CONCEPT] = $v; @@ -1601,8 +1651,15 @@ public function jsonSerialize() $a[self::FIELD_ITEM_REFERENCE] = $v; } if (null !== ($v = $this->getOccurrenceDateTime())) { - $a[self::FIELD_OCCURRENCE_DATE_TIME] = $v->getValue(); - $a[self::FIELD_OCCURRENCE_DATE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_OCCURRENCE_DATE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_OCCURRENCE_DATE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_OCCURRENCE_DATE_TIME] = $v; + } } if (null !== ($v = $this->getOccurrencePeriod())) { $a[self::FIELD_OCCURRENCE_PERIOD] = $v; @@ -1614,10 +1671,26 @@ public function jsonSerialize() $a[self::FIELD_PARAMETER] = $vs; } if (null !== ($v = $this->getPriority())) { - $a[self::FIELD_PRIORITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PRIORITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PRIORITY_EXT] = $enc; + } + } else { + $a[self::FIELD_PRIORITY] = $v; + } } if (null !== ($v = $this->getQuantity())) { - $a[self::FIELD_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_QUANTITY] = $v; + } } if ([] !== ($vs = $this->getReasonCode())) { $a[self::FIELD_REASON_CODE] = $vs; @@ -1629,7 +1702,15 @@ public function jsonSerialize() $a[self::FIELD_REQUESTER] = $v; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if ([] !== ($vs = $this->getSupplier())) { $a[self::FIELD_SUPPLIER] = $vs; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRTask.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRTask.php index 88c69681c7..ff3e7242ce 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRTask.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRTask.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -93,10 +93,6 @@ class FHIRTask extends FHIRDomainResource implements PHPFHIRContainedTypeInterfa { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_TASK; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_AUTHORED_ON = 'authoredOn'; const FIELD_AUTHORED_ON_EXT = '_authoredOn'; const FIELD_BASED_ON = 'basedOn'; @@ -506,6 +502,9 @@ class FHIRTask extends FHIRDomainResource implements PHPFHIRContainedTypeInterfa */ protected $statusReason = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRTask Constructor * @param null|array $data @@ -528,8 +527,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_AUTHORED_ON] instanceof FHIRDateTime) { $this->setAuthoredOn($data[self::FIELD_AUTHORED_ON]); - } elseif ($ext && is_scalar($data[self::FIELD_AUTHORED_ON])) { - $this->setAuthoredOn(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_AUTHORED_ON]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_AUTHORED_ON])) { + $this->setAuthoredOn(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_AUTHORED_ON]] + $ext)); + } else if (is_array($data[self::FIELD_AUTHORED_ON])) { + $this->setAuthoredOn(new FHIRDateTime(array_merge($ext, $data[self::FIELD_AUTHORED_ON]))); + } } else { $this->setAuthoredOn(new FHIRDateTime($data[self::FIELD_AUTHORED_ON])); } @@ -537,6 +540,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_BASED_ON])) { if (is_array($data[self::FIELD_BASED_ON])) { foreach($data[self::FIELD_BASED_ON] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addBasedOn($v); } else { @@ -569,8 +575,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -609,8 +619,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_GROUP_IDENTIFIER] instanceof FHIRIdentifier) { $this->setGroupIdentifier($data[self::FIELD_GROUP_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_GROUP_IDENTIFIER])) { - $this->setGroupIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_GROUP_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_GROUP_IDENTIFIER])) { + $this->setGroupIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_GROUP_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_GROUP_IDENTIFIER])) { + $this->setGroupIdentifier(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_GROUP_IDENTIFIER]))); + } } else { $this->setGroupIdentifier(new FHIRIdentifier($data[self::FIELD_GROUP_IDENTIFIER])); } @@ -621,17 +635,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -640,6 +661,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_INPUT])) { if (is_array($data[self::FIELD_INPUT])) { foreach($data[self::FIELD_INPUT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRTaskInput) { $this->addInput($v); } else { @@ -658,8 +682,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_INSTANTIATES_CANONICAL] instanceof FHIRCanonical) { $this->setInstantiatesCanonical($data[self::FIELD_INSTANTIATES_CANONICAL]); - } elseif ($ext && is_scalar($data[self::FIELD_INSTANTIATES_CANONICAL])) { - $this->setInstantiatesCanonical(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $data[self::FIELD_INSTANTIATES_CANONICAL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_INSTANTIATES_CANONICAL])) { + $this->setInstantiatesCanonical(new FHIRCanonical([FHIRCanonical::FIELD_VALUE => $data[self::FIELD_INSTANTIATES_CANONICAL]] + $ext)); + } else if (is_array($data[self::FIELD_INSTANTIATES_CANONICAL])) { + $this->setInstantiatesCanonical(new FHIRCanonical(array_merge($ext, $data[self::FIELD_INSTANTIATES_CANONICAL]))); + } } else { $this->setInstantiatesCanonical(new FHIRCanonical($data[self::FIELD_INSTANTIATES_CANONICAL])); } @@ -670,8 +698,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_INSTANTIATES_URI] instanceof FHIRUri) { $this->setInstantiatesUri($data[self::FIELD_INSTANTIATES_URI]); - } elseif ($ext && is_scalar($data[self::FIELD_INSTANTIATES_URI])) { - $this->setInstantiatesUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_INSTANTIATES_URI]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_INSTANTIATES_URI])) { + $this->setInstantiatesUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_INSTANTIATES_URI]] + $ext)); + } else if (is_array($data[self::FIELD_INSTANTIATES_URI])) { + $this->setInstantiatesUri(new FHIRUri(array_merge($ext, $data[self::FIELD_INSTANTIATES_URI]))); + } } else { $this->setInstantiatesUri(new FHIRUri($data[self::FIELD_INSTANTIATES_URI])); } @@ -679,6 +711,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_INSURANCE])) { if (is_array($data[self::FIELD_INSURANCE])) { foreach($data[self::FIELD_INSURANCE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addInsurance($v); } else { @@ -697,8 +732,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_INTENT] instanceof FHIRTaskIntent) { $this->setIntent($data[self::FIELD_INTENT]); - } elseif ($ext && is_scalar($data[self::FIELD_INTENT])) { - $this->setIntent(new FHIRTaskIntent([FHIRTaskIntent::FIELD_VALUE => $data[self::FIELD_INTENT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_INTENT])) { + $this->setIntent(new FHIRTaskIntent([FHIRTaskIntent::FIELD_VALUE => $data[self::FIELD_INTENT]] + $ext)); + } else if (is_array($data[self::FIELD_INTENT])) { + $this->setIntent(new FHIRTaskIntent(array_merge($ext, $data[self::FIELD_INTENT]))); + } } else { $this->setIntent(new FHIRTaskIntent($data[self::FIELD_INTENT])); } @@ -709,8 +748,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_LAST_MODIFIED] instanceof FHIRDateTime) { $this->setLastModified($data[self::FIELD_LAST_MODIFIED]); - } elseif ($ext && is_scalar($data[self::FIELD_LAST_MODIFIED])) { - $this->setLastModified(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_LAST_MODIFIED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_LAST_MODIFIED])) { + $this->setLastModified(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_LAST_MODIFIED]] + $ext)); + } else if (is_array($data[self::FIELD_LAST_MODIFIED])) { + $this->setLastModified(new FHIRDateTime(array_merge($ext, $data[self::FIELD_LAST_MODIFIED]))); + } } else { $this->setLastModified(new FHIRDateTime($data[self::FIELD_LAST_MODIFIED])); } @@ -725,6 +768,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_NOTE])) { if (is_array($data[self::FIELD_NOTE])) { foreach($data[self::FIELD_NOTE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRAnnotation) { $this->addNote($v); } else { @@ -740,6 +786,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_OUTPUT])) { if (is_array($data[self::FIELD_OUTPUT])) { foreach($data[self::FIELD_OUTPUT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRTaskOutput) { $this->addOutput($v); } else { @@ -762,6 +811,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PART_OF])) { if (is_array($data[self::FIELD_PART_OF])) { foreach($data[self::FIELD_PART_OF] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addPartOf($v); } else { @@ -777,6 +829,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PERFORMER_TYPE])) { if (is_array($data[self::FIELD_PERFORMER_TYPE])) { foreach($data[self::FIELD_PERFORMER_TYPE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addPerformerType($v); } else { @@ -795,8 +850,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PRIORITY] instanceof FHIRRequestPriority) { $this->setPriority($data[self::FIELD_PRIORITY]); - } elseif ($ext && is_scalar($data[self::FIELD_PRIORITY])) { - $this->setPriority(new FHIRRequestPriority([FHIRRequestPriority::FIELD_VALUE => $data[self::FIELD_PRIORITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PRIORITY])) { + $this->setPriority(new FHIRRequestPriority([FHIRRequestPriority::FIELD_VALUE => $data[self::FIELD_PRIORITY]] + $ext)); + } else if (is_array($data[self::FIELD_PRIORITY])) { + $this->setPriority(new FHIRRequestPriority(array_merge($ext, $data[self::FIELD_PRIORITY]))); + } } else { $this->setPriority(new FHIRRequestPriority($data[self::FIELD_PRIORITY])); } @@ -818,6 +877,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_RELEVANT_HISTORY])) { if (is_array($data[self::FIELD_RELEVANT_HISTORY])) { foreach($data[self::FIELD_RELEVANT_HISTORY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addRelevantHistory($v); } else { @@ -850,8 +912,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRTaskStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRTaskStatus([FHIRTaskStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRTaskStatus([FHIRTaskStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRTaskStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRTaskStatus($data[self::FIELD_STATUS])); } @@ -2365,7 +2431,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getAuthoredOn())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AUTHORED_ON, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getBasedOn())) { foreach($vs as $v) { if (null === $v) { @@ -2378,34 +2443,27 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getBusinessStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_BUSINESS_STATUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getDescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESCRIPTION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getEncounter())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ENCOUNTER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getExecutionPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EXECUTION_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getFocus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FOCUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getFor())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FOR, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getGroupIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_GROUP_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -2423,13 +2481,13 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_INPUT, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getInstantiatesCanonical())) { $v->xmlSerialize($sxe->addChild(self::FIELD_INSTANTIATES_CANONICAL, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getInstantiatesUri())) { $v->xmlSerialize($sxe->addChild(self::FIELD_INSTANTIATES_URI, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getInsurance())) { foreach($vs as $v) { if (null === $v) { @@ -2445,11 +2503,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getLastModified())) { $v->xmlSerialize($sxe->addChild(self::FIELD_LAST_MODIFIED, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getLocation())) { $v->xmlSerialize($sxe->addChild(self::FIELD_LOCATION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getNote())) { foreach($vs as $v) { if (null === $v) { @@ -2471,7 +2527,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getOwner())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OWNER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getPartOf())) { foreach($vs as $v) { if (null === $v) { @@ -2493,15 +2548,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getPriority())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PRIORITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getReasonCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REASON_CODE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getReasonReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REASON_REFERENCE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getRelevantHistory())) { foreach($vs as $v) { if (null === $v) { @@ -2514,15 +2566,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getRequester())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REQUESTER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRestriction())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RESTRICTION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatusReason())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS_REASON, null, $v->_getFHIRXMLNamespace())); } @@ -2536,8 +2585,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getAuthoredOn())) { - $a[self::FIELD_AUTHORED_ON] = $v->getValue(); - $a[self::FIELD_AUTHORED_ON_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_AUTHORED_ON] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_AUTHORED_ON_EXT] = $enc; + } + } else { + $a[self::FIELD_AUTHORED_ON] = $v; + } } if ([] !== ($vs = $this->getBasedOn())) { $a[self::FIELD_BASED_ON] = $vs; @@ -2549,8 +2605,15 @@ public function jsonSerialize() $a[self::FIELD_CODE] = $v; } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if (null !== ($v = $this->getEncounter())) { $a[self::FIELD_ENCOUNTER] = $v; @@ -2565,31 +2628,84 @@ public function jsonSerialize() $a[self::FIELD_FOR] = $v; } if (null !== ($v = $this->getGroupIdentifier())) { - $a[self::FIELD_GROUP_IDENTIFIER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_GROUP_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_GROUP_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_GROUP_IDENTIFIER] = $v; + } } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if ([] !== ($vs = $this->getInput())) { $a[self::FIELD_INPUT] = $vs; } if (null !== ($v = $this->getInstantiatesCanonical())) { - $a[self::FIELD_INSTANTIATES_CANONICAL] = $v->getValue(); - $a[self::FIELD_INSTANTIATES_CANONICAL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_INSTANTIATES_CANONICAL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_INSTANTIATES_CANONICAL_EXT] = $enc; + } + } else { + $a[self::FIELD_INSTANTIATES_CANONICAL] = $v; + } } if (null !== ($v = $this->getInstantiatesUri())) { - $a[self::FIELD_INSTANTIATES_URI] = $v->getValue(); - $a[self::FIELD_INSTANTIATES_URI_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_INSTANTIATES_URI] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_INSTANTIATES_URI_EXT] = $enc; + } + } else { + $a[self::FIELD_INSTANTIATES_URI] = $v; + } } if ([] !== ($vs = $this->getInsurance())) { $a[self::FIELD_INSURANCE] = $vs; } if (null !== ($v = $this->getIntent())) { - $a[self::FIELD_INTENT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_INTENT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_INTENT_EXT] = $enc; + } + } else { + $a[self::FIELD_INTENT] = $v; + } } if (null !== ($v = $this->getLastModified())) { - $a[self::FIELD_LAST_MODIFIED] = $v->getValue(); - $a[self::FIELD_LAST_MODIFIED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_LAST_MODIFIED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_LAST_MODIFIED_EXT] = $enc; + } + } else { + $a[self::FIELD_LAST_MODIFIED] = $v; + } } if (null !== ($v = $this->getLocation())) { $a[self::FIELD_LOCATION] = $v; @@ -2610,7 +2726,15 @@ public function jsonSerialize() $a[self::FIELD_PERFORMER_TYPE] = $vs; } if (null !== ($v = $this->getPriority())) { - $a[self::FIELD_PRIORITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PRIORITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PRIORITY_EXT] = $enc; + } + } else { + $a[self::FIELD_PRIORITY] = $v; + } } if (null !== ($v = $this->getReasonCode())) { $a[self::FIELD_REASON_CODE] = $v; @@ -2628,7 +2752,15 @@ public function jsonSerialize() $a[self::FIELD_RESTRICTION] = $v; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getStatusReason())) { $a[self::FIELD_STATUS_REASON] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRTerminologyCapabilities.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRTerminologyCapabilities.php index 02599ff81d..b73083be2e 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRTerminologyCapabilities.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRTerminologyCapabilities.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -98,10 +98,6 @@ class FHIRTerminologyCapabilities extends FHIRDomainResource implements PHPFHIRC { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_TERMINOLOGY_CAPABILITIES; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CLOSURE = 'closure'; const FIELD_CODE_SEARCH = 'codeSearch'; const FIELD_CODE_SEARCH_EXT = '_codeSearch'; @@ -463,6 +459,9 @@ class FHIRTerminologyCapabilities extends FHIRDomainResource implements PHPFHIRC */ protected $version = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRTerminologyCapabilities Constructor * @param null|array $data @@ -492,8 +491,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CODE_SEARCH] instanceof FHIRCodeSearchSupport) { $this->setCodeSearch($data[self::FIELD_CODE_SEARCH]); - } elseif ($ext && is_scalar($data[self::FIELD_CODE_SEARCH])) { - $this->setCodeSearch(new FHIRCodeSearchSupport([FHIRCodeSearchSupport::FIELD_VALUE => $data[self::FIELD_CODE_SEARCH]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CODE_SEARCH])) { + $this->setCodeSearch(new FHIRCodeSearchSupport([FHIRCodeSearchSupport::FIELD_VALUE => $data[self::FIELD_CODE_SEARCH]] + $ext)); + } else if (is_array($data[self::FIELD_CODE_SEARCH])) { + $this->setCodeSearch(new FHIRCodeSearchSupport(array_merge($ext, $data[self::FIELD_CODE_SEARCH]))); + } } else { $this->setCodeSearch(new FHIRCodeSearchSupport($data[self::FIELD_CODE_SEARCH])); } @@ -501,6 +504,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CODE_SYSTEM])) { if (is_array($data[self::FIELD_CODE_SYSTEM])) { foreach($data[self::FIELD_CODE_SYSTEM] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRTerminologyCapabilitiesCodeSystem) { $this->addCodeSystem($v); } else { @@ -516,6 +522,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CONTACT])) { if (is_array($data[self::FIELD_CONTACT])) { foreach($data[self::FIELD_CONTACT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContactDetail) { $this->addContact($v); } else { @@ -534,8 +543,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_COPYRIGHT] instanceof FHIRMarkdown) { $this->setCopyright($data[self::FIELD_COPYRIGHT]); - } elseif ($ext && is_scalar($data[self::FIELD_COPYRIGHT])) { - $this->setCopyright(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_COPYRIGHT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_COPYRIGHT])) { + $this->setCopyright(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_COPYRIGHT]] + $ext)); + } else if (is_array($data[self::FIELD_COPYRIGHT])) { + $this->setCopyright(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_COPYRIGHT]))); + } } else { $this->setCopyright(new FHIRMarkdown($data[self::FIELD_COPYRIGHT])); } @@ -546,8 +559,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATE] instanceof FHIRDateTime) { $this->setDate($data[self::FIELD_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_DATE])) { - $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime(array_merge($ext, $data[self::FIELD_DATE]))); + } } else { $this->setDate(new FHIRDateTime($data[self::FIELD_DATE])); } @@ -558,8 +575,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRMarkdown) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRMarkdown($data[self::FIELD_DESCRIPTION])); } @@ -577,8 +598,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EXPERIMENTAL] instanceof FHIRBoolean) { $this->setExperimental($data[self::FIELD_EXPERIMENTAL]); - } elseif ($ext && is_scalar($data[self::FIELD_EXPERIMENTAL])) { - $this->setExperimental(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_EXPERIMENTAL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EXPERIMENTAL])) { + $this->setExperimental(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_EXPERIMENTAL]] + $ext)); + } else if (is_array($data[self::FIELD_EXPERIMENTAL])) { + $this->setExperimental(new FHIRBoolean(array_merge($ext, $data[self::FIELD_EXPERIMENTAL]))); + } } else { $this->setExperimental(new FHIRBoolean($data[self::FIELD_EXPERIMENTAL])); } @@ -593,6 +618,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_JURISDICTION])) { if (is_array($data[self::FIELD_JURISDICTION])) { foreach($data[self::FIELD_JURISDICTION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addJurisdiction($v); } else { @@ -611,8 +639,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_KIND] instanceof FHIRCapabilityStatementKind) { $this->setKind($data[self::FIELD_KIND]); - } elseif ($ext && is_scalar($data[self::FIELD_KIND])) { - $this->setKind(new FHIRCapabilityStatementKind([FHIRCapabilityStatementKind::FIELD_VALUE => $data[self::FIELD_KIND]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_KIND])) { + $this->setKind(new FHIRCapabilityStatementKind([FHIRCapabilityStatementKind::FIELD_VALUE => $data[self::FIELD_KIND]] + $ext)); + } else if (is_array($data[self::FIELD_KIND])) { + $this->setKind(new FHIRCapabilityStatementKind(array_merge($ext, $data[self::FIELD_KIND]))); + } } else { $this->setKind(new FHIRCapabilityStatementKind($data[self::FIELD_KIND])); } @@ -623,8 +655,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_LOCKED_DATE] instanceof FHIRBoolean) { $this->setLockedDate($data[self::FIELD_LOCKED_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_LOCKED_DATE])) { - $this->setLockedDate(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_LOCKED_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_LOCKED_DATE])) { + $this->setLockedDate(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_LOCKED_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_LOCKED_DATE])) { + $this->setLockedDate(new FHIRBoolean(array_merge($ext, $data[self::FIELD_LOCKED_DATE]))); + } } else { $this->setLockedDate(new FHIRBoolean($data[self::FIELD_LOCKED_DATE])); } @@ -635,8 +671,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -647,8 +687,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PUBLISHER] instanceof FHIRString) { $this->setPublisher($data[self::FIELD_PUBLISHER]); - } elseif ($ext && is_scalar($data[self::FIELD_PUBLISHER])) { - $this->setPublisher(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PUBLISHER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PUBLISHER])) { + $this->setPublisher(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PUBLISHER]] + $ext)); + } else if (is_array($data[self::FIELD_PUBLISHER])) { + $this->setPublisher(new FHIRString(array_merge($ext, $data[self::FIELD_PUBLISHER]))); + } } else { $this->setPublisher(new FHIRString($data[self::FIELD_PUBLISHER])); } @@ -659,8 +703,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PURPOSE] instanceof FHIRMarkdown) { $this->setPurpose($data[self::FIELD_PURPOSE]); - } elseif ($ext && is_scalar($data[self::FIELD_PURPOSE])) { - $this->setPurpose(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_PURPOSE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PURPOSE])) { + $this->setPurpose(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_PURPOSE]] + $ext)); + } else if (is_array($data[self::FIELD_PURPOSE])) { + $this->setPurpose(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_PURPOSE]))); + } } else { $this->setPurpose(new FHIRMarkdown($data[self::FIELD_PURPOSE])); } @@ -678,8 +726,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRPublicationStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRPublicationStatus([FHIRPublicationStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRPublicationStatus([FHIRPublicationStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRPublicationStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRPublicationStatus($data[self::FIELD_STATUS])); } @@ -690,8 +742,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TITLE] instanceof FHIRString) { $this->setTitle($data[self::FIELD_TITLE]); - } elseif ($ext && is_scalar($data[self::FIELD_TITLE])) { - $this->setTitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TITLE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TITLE])) { + $this->setTitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TITLE]] + $ext)); + } else if (is_array($data[self::FIELD_TITLE])) { + $this->setTitle(new FHIRString(array_merge($ext, $data[self::FIELD_TITLE]))); + } } else { $this->setTitle(new FHIRString($data[self::FIELD_TITLE])); } @@ -709,8 +765,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_URL] instanceof FHIRUri) { $this->setUrl($data[self::FIELD_URL]); - } elseif ($ext && is_scalar($data[self::FIELD_URL])) { - $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } else if (is_array($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri(array_merge($ext, $data[self::FIELD_URL]))); + } } else { $this->setUrl(new FHIRUri($data[self::FIELD_URL])); } @@ -718,6 +778,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_USE_CONTEXT])) { if (is_array($data[self::FIELD_USE_CONTEXT])) { foreach($data[self::FIELD_USE_CONTEXT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRUsageContext) { $this->addUseContext($v); } else { @@ -743,8 +806,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VERSION] instanceof FHIRString) { $this->setVersion($data[self::FIELD_VERSION]); - } elseif ($ext && is_scalar($data[self::FIELD_VERSION])) { - $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } else if (is_array($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString(array_merge($ext, $data[self::FIELD_VERSION]))); + } } else { $this->setVersion(new FHIRString($data[self::FIELD_VERSION])); } @@ -2011,15 +2078,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getClosure())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CLOSURE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getCodeSearch())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE_SEARCH, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getCodeSystem())) { foreach($vs as $v) { if (null === $v) { @@ -2037,6 +2101,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_CONTACT, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getCopyright())) { $v->xmlSerialize($sxe->addChild(self::FIELD_COPYRIGHT, null, $v->_getFHIRXMLNamespace())); } @@ -2046,18 +2111,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESCRIPTION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getExpansion())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EXPANSION, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getExperimental())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EXPERIMENTAL, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getImplementation())) { $v->xmlSerialize($sxe->addChild(self::FIELD_IMPLEMENTATION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getJurisdiction())) { foreach($vs as $v) { if (null === $v) { @@ -2082,25 +2144,21 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getPurpose())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PURPOSE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSoftware())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SOFTWARE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getTitle())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TITLE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getTranslation())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TRANSLATION, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getUrl())) { $v->xmlSerialize($sxe->addChild(self::FIELD_URL, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getUseContext())) { foreach($vs as $v) { if (null === $v) { @@ -2129,7 +2187,15 @@ public function jsonSerialize() $a[self::FIELD_CLOSURE] = $v; } if (null !== ($v = $this->getCodeSearch())) { - $a[self::FIELD_CODE_SEARCH] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CODE_SEARCH] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CODE_SEARCH_EXT] = $enc; + } + } else { + $a[self::FIELD_CODE_SEARCH] = $v; + } } if ([] !== ($vs = $this->getCodeSystem())) { $a[self::FIELD_CODE_SYSTEM] = $vs; @@ -2138,23 +2204,51 @@ public function jsonSerialize() $a[self::FIELD_CONTACT] = $vs; } if (null !== ($v = $this->getCopyright())) { - $a[self::FIELD_COPYRIGHT] = $v->getValue(); - $a[self::FIELD_COPYRIGHT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_COPYRIGHT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_COPYRIGHT_EXT] = $enc; + } + } else { + $a[self::FIELD_COPYRIGHT] = $v; + } } if (null !== ($v = $this->getDate())) { - $a[self::FIELD_DATE] = $v->getValue(); - $a[self::FIELD_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_DATE] = $v; + } } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if (null !== ($v = $this->getExpansion())) { $a[self::FIELD_EXPANSION] = $v; } if (null !== ($v = $this->getExperimental())) { - $a[self::FIELD_EXPERIMENTAL] = $v->getValue(); - $a[self::FIELD_EXPERIMENTAL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EXPERIMENTAL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EXPERIMENTAL_EXT] = $enc; + } + } else { + $a[self::FIELD_EXPERIMENTAL] = $v; + } } if (null !== ($v = $this->getImplementation())) { $a[self::FIELD_IMPLEMENTATION] = $v; @@ -2163,40 +2257,98 @@ public function jsonSerialize() $a[self::FIELD_JURISDICTION] = $vs; } if (null !== ($v = $this->getKind())) { - $a[self::FIELD_KIND] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_KIND] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_KIND_EXT] = $enc; + } + } else { + $a[self::FIELD_KIND] = $v; + } } if (null !== ($v = $this->getLockedDate())) { - $a[self::FIELD_LOCKED_DATE] = $v->getValue(); - $a[self::FIELD_LOCKED_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_LOCKED_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_LOCKED_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_LOCKED_DATE] = $v; + } } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if (null !== ($v = $this->getPublisher())) { - $a[self::FIELD_PUBLISHER] = $v->getValue(); - $a[self::FIELD_PUBLISHER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PUBLISHER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PUBLISHER_EXT] = $enc; + } + } else { + $a[self::FIELD_PUBLISHER] = $v; + } } if (null !== ($v = $this->getPurpose())) { - $a[self::FIELD_PURPOSE] = $v->getValue(); - $a[self::FIELD_PURPOSE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PURPOSE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PURPOSE_EXT] = $enc; + } + } else { + $a[self::FIELD_PURPOSE] = $v; + } } if (null !== ($v = $this->getSoftware())) { $a[self::FIELD_SOFTWARE] = $v; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getTitle())) { - $a[self::FIELD_TITLE] = $v->getValue(); - $a[self::FIELD_TITLE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TITLE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TITLE_EXT] = $enc; + } + } else { + $a[self::FIELD_TITLE] = $v; + } } if (null !== ($v = $this->getTranslation())) { $a[self::FIELD_TRANSLATION] = $v; } if (null !== ($v = $this->getUrl())) { - $a[self::FIELD_URL] = $v->getValue(); - $a[self::FIELD_URL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_URL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_URL_EXT] = $enc; + } + } else { + $a[self::FIELD_URL] = $v; + } } if ([] !== ($vs = $this->getUseContext())) { $a[self::FIELD_USE_CONTEXT] = $vs; @@ -2205,8 +2357,15 @@ public function jsonSerialize() $a[self::FIELD_VALIDATE_CODE] = $v; } if (null !== ($v = $this->getVersion())) { - $a[self::FIELD_VERSION] = $v->getValue(); - $a[self::FIELD_VERSION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VERSION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VERSION_EXT] = $enc; + } + } else { + $a[self::FIELD_VERSION] = $v; + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRTestReport.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRTestReport.php index e152e0600a..438bb93fe6 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRTestReport.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRTestReport.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -89,10 +89,6 @@ class FHIRTestReport extends FHIRDomainResource implements PHPFHIRContainedTypeI { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_TEST_REPORT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_IDENTIFIER = 'identifier'; const FIELD_IDENTIFIER_EXT = '_identifier'; const FIELD_ISSUED = 'issued'; @@ -246,6 +242,9 @@ class FHIRTestReport extends FHIRDomainResource implements PHPFHIRContainedTypeI */ protected $tester = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRTestReport Constructor * @param null|array $data @@ -268,8 +267,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->setIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { - $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_IDENTIFIER]))); + } } else { $this->setIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); } @@ -280,8 +283,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ISSUED] instanceof FHIRDateTime) { $this->setIssued($data[self::FIELD_ISSUED]); - } elseif ($ext && is_scalar($data[self::FIELD_ISSUED])) { - $this->setIssued(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_ISSUED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ISSUED])) { + $this->setIssued(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_ISSUED]] + $ext)); + } else if (is_array($data[self::FIELD_ISSUED])) { + $this->setIssued(new FHIRDateTime(array_merge($ext, $data[self::FIELD_ISSUED]))); + } } else { $this->setIssued(new FHIRDateTime($data[self::FIELD_ISSUED])); } @@ -292,8 +299,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -301,6 +312,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PARTICIPANT])) { if (is_array($data[self::FIELD_PARTICIPANT])) { foreach($data[self::FIELD_PARTICIPANT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRTestReportParticipant) { $this->addParticipant($v); } else { @@ -319,8 +333,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_RESULT] instanceof FHIRTestReportResult) { $this->setResult($data[self::FIELD_RESULT]); - } elseif ($ext && is_scalar($data[self::FIELD_RESULT])) { - $this->setResult(new FHIRTestReportResult([FHIRTestReportResult::FIELD_VALUE => $data[self::FIELD_RESULT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_RESULT])) { + $this->setResult(new FHIRTestReportResult([FHIRTestReportResult::FIELD_VALUE => $data[self::FIELD_RESULT]] + $ext)); + } else if (is_array($data[self::FIELD_RESULT])) { + $this->setResult(new FHIRTestReportResult(array_merge($ext, $data[self::FIELD_RESULT]))); + } } else { $this->setResult(new FHIRTestReportResult($data[self::FIELD_RESULT])); } @@ -331,8 +349,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SCORE] instanceof FHIRDecimal) { $this->setScore($data[self::FIELD_SCORE]); - } elseif ($ext && is_scalar($data[self::FIELD_SCORE])) { - $this->setScore(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_SCORE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SCORE])) { + $this->setScore(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_SCORE]] + $ext)); + } else if (is_array($data[self::FIELD_SCORE])) { + $this->setScore(new FHIRDecimal(array_merge($ext, $data[self::FIELD_SCORE]))); + } } else { $this->setScore(new FHIRDecimal($data[self::FIELD_SCORE])); } @@ -350,8 +372,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRTestReportStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRTestReportStatus([FHIRTestReportStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRTestReportStatus([FHIRTestReportStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRTestReportStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRTestReportStatus($data[self::FIELD_STATUS])); } @@ -366,6 +392,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_TEST])) { if (is_array($data[self::FIELD_TEST])) { foreach($data[self::FIELD_TEST] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRTestReportTest) { $this->addTest($v); } else { @@ -391,8 +420,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TESTER] instanceof FHIRString) { $this->setTester($data[self::FIELD_TESTER]); - } elseif ($ext && is_scalar($data[self::FIELD_TESTER])) { - $this->setTester(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TESTER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TESTER])) { + $this->setTester(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TESTER]] + $ext)); + } else if (is_array($data[self::FIELD_TESTER])) { + $this->setTester(new FHIRString(array_merge($ext, $data[self::FIELD_TESTER]))); + } } else { $this->setTester(new FHIRString($data[self::FIELD_TESTER])); } @@ -1001,7 +1034,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } @@ -1011,7 +1043,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NAME, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getParticipant())) { foreach($vs as $v) { if (null === $v) { @@ -1027,19 +1058,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getScore())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SCORE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSetup())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SETUP, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getTeardown())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TEARDOWN, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getTest())) { foreach($vs as $v) { if (null === $v) { @@ -1065,31 +1092,76 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_IDENTIFIER] = $v; + } } if (null !== ($v = $this->getIssued())) { - $a[self::FIELD_ISSUED] = $v->getValue(); - $a[self::FIELD_ISSUED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ISSUED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ISSUED_EXT] = $enc; + } + } else { + $a[self::FIELD_ISSUED] = $v; + } } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if ([] !== ($vs = $this->getParticipant())) { $a[self::FIELD_PARTICIPANT] = $vs; } if (null !== ($v = $this->getResult())) { - $a[self::FIELD_RESULT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_RESULT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_RESULT_EXT] = $enc; + } + } else { + $a[self::FIELD_RESULT] = $v; + } } if (null !== ($v = $this->getScore())) { - $a[self::FIELD_SCORE] = $v->getValue(); - $a[self::FIELD_SCORE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SCORE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SCORE_EXT] = $enc; + } + } else { + $a[self::FIELD_SCORE] = $v; + } } if (null !== ($v = $this->getSetup())) { $a[self::FIELD_SETUP] = $v; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getTeardown())) { $a[self::FIELD_TEARDOWN] = $v; @@ -1101,8 +1173,15 @@ public function jsonSerialize() $a[self::FIELD_TEST_SCRIPT] = $v; } if (null !== ($v = $this->getTester())) { - $a[self::FIELD_TESTER] = $v->getValue(); - $a[self::FIELD_TESTER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TESTER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TESTER_EXT] = $enc; + } + } else { + $a[self::FIELD_TESTER] = $v; + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRTestScript.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRTestScript.php index 1d20f6c96b..0083e14858 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRTestScript.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRTestScript.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -98,10 +98,6 @@ class FHIRTestScript extends FHIRDomainResource implements PHPFHIRContainedTypeI { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_TEST_SCRIPT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CONTACT = 'contact'; const FIELD_COPYRIGHT = 'copyright'; const FIELD_COPYRIGHT_EXT = '_copyright'; @@ -446,6 +442,9 @@ class FHIRTestScript extends FHIRDomainResource implements PHPFHIRContainedTypeI */ protected $version = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRTestScript Constructor * @param null|array $data @@ -465,6 +464,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CONTACT])) { if (is_array($data[self::FIELD_CONTACT])) { foreach($data[self::FIELD_CONTACT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContactDetail) { $this->addContact($v); } else { @@ -483,8 +485,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_COPYRIGHT] instanceof FHIRMarkdown) { $this->setCopyright($data[self::FIELD_COPYRIGHT]); - } elseif ($ext && is_scalar($data[self::FIELD_COPYRIGHT])) { - $this->setCopyright(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_COPYRIGHT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_COPYRIGHT])) { + $this->setCopyright(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_COPYRIGHT]] + $ext)); + } else if (is_array($data[self::FIELD_COPYRIGHT])) { + $this->setCopyright(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_COPYRIGHT]))); + } } else { $this->setCopyright(new FHIRMarkdown($data[self::FIELD_COPYRIGHT])); } @@ -495,8 +501,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATE] instanceof FHIRDateTime) { $this->setDate($data[self::FIELD_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_DATE])) { - $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime(array_merge($ext, $data[self::FIELD_DATE]))); + } } else { $this->setDate(new FHIRDateTime($data[self::FIELD_DATE])); } @@ -507,8 +517,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRMarkdown) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRMarkdown($data[self::FIELD_DESCRIPTION])); } @@ -516,6 +530,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_DESTINATION])) { if (is_array($data[self::FIELD_DESTINATION])) { foreach($data[self::FIELD_DESTINATION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRTestScriptDestination) { $this->addDestination($v); } else { @@ -534,8 +551,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EXPERIMENTAL] instanceof FHIRBoolean) { $this->setExperimental($data[self::FIELD_EXPERIMENTAL]); - } elseif ($ext && is_scalar($data[self::FIELD_EXPERIMENTAL])) { - $this->setExperimental(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_EXPERIMENTAL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EXPERIMENTAL])) { + $this->setExperimental(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_EXPERIMENTAL]] + $ext)); + } else if (is_array($data[self::FIELD_EXPERIMENTAL])) { + $this->setExperimental(new FHIRBoolean(array_merge($ext, $data[self::FIELD_EXPERIMENTAL]))); + } } else { $this->setExperimental(new FHIRBoolean($data[self::FIELD_EXPERIMENTAL])); } @@ -543,6 +564,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_FIXTURE])) { if (is_array($data[self::FIELD_FIXTURE])) { foreach($data[self::FIELD_FIXTURE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRTestScriptFixture) { $this->addFixture($v); } else { @@ -561,8 +585,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->setIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { - $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_IDENTIFIER]))); + } } else { $this->setIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); } @@ -570,6 +598,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_JURISDICTION])) { if (is_array($data[self::FIELD_JURISDICTION])) { foreach($data[self::FIELD_JURISDICTION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addJurisdiction($v); } else { @@ -595,8 +626,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -604,6 +639,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ORIGIN])) { if (is_array($data[self::FIELD_ORIGIN])) { foreach($data[self::FIELD_ORIGIN] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRTestScriptOrigin) { $this->addOrigin($v); } else { @@ -619,6 +657,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PROFILE])) { if (is_array($data[self::FIELD_PROFILE])) { foreach($data[self::FIELD_PROFILE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addProfile($v); } else { @@ -637,8 +678,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PUBLISHER] instanceof FHIRString) { $this->setPublisher($data[self::FIELD_PUBLISHER]); - } elseif ($ext && is_scalar($data[self::FIELD_PUBLISHER])) { - $this->setPublisher(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PUBLISHER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PUBLISHER])) { + $this->setPublisher(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PUBLISHER]] + $ext)); + } else if (is_array($data[self::FIELD_PUBLISHER])) { + $this->setPublisher(new FHIRString(array_merge($ext, $data[self::FIELD_PUBLISHER]))); + } } else { $this->setPublisher(new FHIRString($data[self::FIELD_PUBLISHER])); } @@ -649,8 +694,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PURPOSE] instanceof FHIRMarkdown) { $this->setPurpose($data[self::FIELD_PURPOSE]); - } elseif ($ext && is_scalar($data[self::FIELD_PURPOSE])) { - $this->setPurpose(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_PURPOSE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PURPOSE])) { + $this->setPurpose(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_PURPOSE]] + $ext)); + } else if (is_array($data[self::FIELD_PURPOSE])) { + $this->setPurpose(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_PURPOSE]))); + } } else { $this->setPurpose(new FHIRMarkdown($data[self::FIELD_PURPOSE])); } @@ -668,8 +717,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRPublicationStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRPublicationStatus([FHIRPublicationStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRPublicationStatus([FHIRPublicationStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRPublicationStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRPublicationStatus($data[self::FIELD_STATUS])); } @@ -684,6 +737,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_TEST])) { if (is_array($data[self::FIELD_TEST])) { foreach($data[self::FIELD_TEST] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRTestScriptTest) { $this->addTest($v); } else { @@ -702,8 +758,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TITLE] instanceof FHIRString) { $this->setTitle($data[self::FIELD_TITLE]); - } elseif ($ext && is_scalar($data[self::FIELD_TITLE])) { - $this->setTitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TITLE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TITLE])) { + $this->setTitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TITLE]] + $ext)); + } else if (is_array($data[self::FIELD_TITLE])) { + $this->setTitle(new FHIRString(array_merge($ext, $data[self::FIELD_TITLE]))); + } } else { $this->setTitle(new FHIRString($data[self::FIELD_TITLE])); } @@ -714,8 +774,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_URL] instanceof FHIRUri) { $this->setUrl($data[self::FIELD_URL]); - } elseif ($ext && is_scalar($data[self::FIELD_URL])) { - $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } else if (is_array($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri(array_merge($ext, $data[self::FIELD_URL]))); + } } else { $this->setUrl(new FHIRUri($data[self::FIELD_URL])); } @@ -723,6 +787,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_USE_CONTEXT])) { if (is_array($data[self::FIELD_USE_CONTEXT])) { foreach($data[self::FIELD_USE_CONTEXT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRUsageContext) { $this->addUseContext($v); } else { @@ -738,6 +805,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_VARIABLE])) { if (is_array($data[self::FIELD_VARIABLE])) { foreach($data[self::FIELD_VARIABLE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRTestScriptVariable) { $this->addVariable($v); } else { @@ -756,8 +826,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VERSION] instanceof FHIRString) { $this->setVersion($data[self::FIELD_VERSION]); - } elseif ($ext && is_scalar($data[self::FIELD_VERSION])) { - $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } else if (is_array($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString(array_merge($ext, $data[self::FIELD_VERSION]))); + } } else { $this->setVersion(new FHIRString($data[self::FIELD_VERSION])); } @@ -2119,7 +2193,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getContact())) { foreach($vs as $v) { if (null === $v) { @@ -2128,6 +2201,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_CONTACT, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getCopyright())) { $v->xmlSerialize($sxe->addChild(self::FIELD_COPYRIGHT, null, $v->_getFHIRXMLNamespace())); } @@ -2137,7 +2211,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESCRIPTION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getDestination())) { foreach($vs as $v) { if (null === $v) { @@ -2146,10 +2219,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_DESTINATION, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getExperimental())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EXPERIMENTAL, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getFixture())) { foreach($vs as $v) { if (null === $v) { @@ -2162,7 +2235,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getJurisdiction())) { foreach($vs as $v) { if (null === $v) { @@ -2178,7 +2250,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NAME, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getOrigin())) { foreach($vs as $v) { if (null === $v) { @@ -2196,25 +2267,22 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_PROFILE, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getPublisher())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PUBLISHER, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getPurpose())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PURPOSE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSetup())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SETUP, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getTeardown())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TEARDOWN, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getTest())) { foreach($vs as $v) { if (null === $v) { @@ -2223,13 +2291,13 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_TEST, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getTitle())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TITLE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getUrl())) { $v->xmlSerialize($sxe->addChild(self::FIELD_URL, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getUseContext())) { foreach($vs as $v) { if (null === $v) { @@ -2247,6 +2315,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_VARIABLE, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getVersion())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VERSION, null, $v->_getFHIRXMLNamespace())); } @@ -2263,29 +2332,65 @@ public function jsonSerialize() $a[self::FIELD_CONTACT] = $vs; } if (null !== ($v = $this->getCopyright())) { - $a[self::FIELD_COPYRIGHT] = $v->getValue(); - $a[self::FIELD_COPYRIGHT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_COPYRIGHT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_COPYRIGHT_EXT] = $enc; + } + } else { + $a[self::FIELD_COPYRIGHT] = $v; + } } if (null !== ($v = $this->getDate())) { - $a[self::FIELD_DATE] = $v->getValue(); - $a[self::FIELD_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_DATE] = $v; + } } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if ([] !== ($vs = $this->getDestination())) { $a[self::FIELD_DESTINATION] = $vs; } if (null !== ($v = $this->getExperimental())) { - $a[self::FIELD_EXPERIMENTAL] = $v->getValue(); - $a[self::FIELD_EXPERIMENTAL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EXPERIMENTAL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EXPERIMENTAL_EXT] = $enc; + } + } else { + $a[self::FIELD_EXPERIMENTAL] = $v; + } } if ([] !== ($vs = $this->getFixture())) { $a[self::FIELD_FIXTURE] = $vs; } if (null !== ($v = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_IDENTIFIER] = $v; + } } if ([] !== ($vs = $this->getJurisdiction())) { $a[self::FIELD_JURISDICTION] = $vs; @@ -2294,8 +2399,15 @@ public function jsonSerialize() $a[self::FIELD_METADATA] = $v; } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if ([] !== ($vs = $this->getOrigin())) { $a[self::FIELD_ORIGIN] = $vs; @@ -2304,18 +2416,40 @@ public function jsonSerialize() $a[self::FIELD_PROFILE] = $vs; } if (null !== ($v = $this->getPublisher())) { - $a[self::FIELD_PUBLISHER] = $v->getValue(); - $a[self::FIELD_PUBLISHER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PUBLISHER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PUBLISHER_EXT] = $enc; + } + } else { + $a[self::FIELD_PUBLISHER] = $v; + } } if (null !== ($v = $this->getPurpose())) { - $a[self::FIELD_PURPOSE] = $v->getValue(); - $a[self::FIELD_PURPOSE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PURPOSE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PURPOSE_EXT] = $enc; + } + } else { + $a[self::FIELD_PURPOSE] = $v; + } } if (null !== ($v = $this->getSetup())) { $a[self::FIELD_SETUP] = $v; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getTeardown())) { $a[self::FIELD_TEARDOWN] = $v; @@ -2324,12 +2458,26 @@ public function jsonSerialize() $a[self::FIELD_TEST] = $vs; } if (null !== ($v = $this->getTitle())) { - $a[self::FIELD_TITLE] = $v->getValue(); - $a[self::FIELD_TITLE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TITLE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TITLE_EXT] = $enc; + } + } else { + $a[self::FIELD_TITLE] = $v; + } } if (null !== ($v = $this->getUrl())) { - $a[self::FIELD_URL] = $v->getValue(); - $a[self::FIELD_URL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_URL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_URL_EXT] = $enc; + } + } else { + $a[self::FIELD_URL] = $v; + } } if ([] !== ($vs = $this->getUseContext())) { $a[self::FIELD_USE_CONTEXT] = $vs; @@ -2338,8 +2486,15 @@ public function jsonSerialize() $a[self::FIELD_VARIABLE] = $vs; } if (null !== ($v = $this->getVersion())) { - $a[self::FIELD_VERSION] = $v->getValue(); - $a[self::FIELD_VERSION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VERSION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VERSION_EXT] = $enc; + } + } else { + $a[self::FIELD_VERSION] = $v; + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRValueSet.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRValueSet.php index 10a791b9f5..e42f71dc85 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRValueSet.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRValueSet.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -93,10 +93,6 @@ class FHIRValueSet extends FHIRDomainResource implements PHPFHIRContainedTypeInt { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_VALUE_SET; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_COMPOSE = 'compose'; const FIELD_CONTACT = 'contact'; const FIELD_COPYRIGHT = 'copyright'; @@ -381,6 +377,9 @@ class FHIRValueSet extends FHIRDomainResource implements PHPFHIRContainedTypeInt */ protected $version = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRValueSet Constructor * @param null|array $data @@ -407,6 +406,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CONTACT])) { if (is_array($data[self::FIELD_CONTACT])) { foreach($data[self::FIELD_CONTACT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContactDetail) { $this->addContact($v); } else { @@ -425,8 +427,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_COPYRIGHT] instanceof FHIRMarkdown) { $this->setCopyright($data[self::FIELD_COPYRIGHT]); - } elseif ($ext && is_scalar($data[self::FIELD_COPYRIGHT])) { - $this->setCopyright(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_COPYRIGHT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_COPYRIGHT])) { + $this->setCopyright(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_COPYRIGHT]] + $ext)); + } else if (is_array($data[self::FIELD_COPYRIGHT])) { + $this->setCopyright(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_COPYRIGHT]))); + } } else { $this->setCopyright(new FHIRMarkdown($data[self::FIELD_COPYRIGHT])); } @@ -437,8 +443,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATE] instanceof FHIRDateTime) { $this->setDate($data[self::FIELD_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_DATE])) { - $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime(array_merge($ext, $data[self::FIELD_DATE]))); + } } else { $this->setDate(new FHIRDateTime($data[self::FIELD_DATE])); } @@ -449,8 +459,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRMarkdown) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRMarkdown($data[self::FIELD_DESCRIPTION])); } @@ -468,8 +482,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EXPERIMENTAL] instanceof FHIRBoolean) { $this->setExperimental($data[self::FIELD_EXPERIMENTAL]); - } elseif ($ext && is_scalar($data[self::FIELD_EXPERIMENTAL])) { - $this->setExperimental(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_EXPERIMENTAL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EXPERIMENTAL])) { + $this->setExperimental(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_EXPERIMENTAL]] + $ext)); + } else if (is_array($data[self::FIELD_EXPERIMENTAL])) { + $this->setExperimental(new FHIRBoolean(array_merge($ext, $data[self::FIELD_EXPERIMENTAL]))); + } } else { $this->setExperimental(new FHIRBoolean($data[self::FIELD_EXPERIMENTAL])); } @@ -480,17 +498,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -502,8 +527,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IMMUTABLE] instanceof FHIRBoolean) { $this->setImmutable($data[self::FIELD_IMMUTABLE]); - } elseif ($ext && is_scalar($data[self::FIELD_IMMUTABLE])) { - $this->setImmutable(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_IMMUTABLE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IMMUTABLE])) { + $this->setImmutable(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_IMMUTABLE]] + $ext)); + } else if (is_array($data[self::FIELD_IMMUTABLE])) { + $this->setImmutable(new FHIRBoolean(array_merge($ext, $data[self::FIELD_IMMUTABLE]))); + } } else { $this->setImmutable(new FHIRBoolean($data[self::FIELD_IMMUTABLE])); } @@ -511,6 +540,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_JURISDICTION])) { if (is_array($data[self::FIELD_JURISDICTION])) { foreach($data[self::FIELD_JURISDICTION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addJurisdiction($v); } else { @@ -529,8 +561,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -541,8 +577,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PUBLISHER] instanceof FHIRString) { $this->setPublisher($data[self::FIELD_PUBLISHER]); - } elseif ($ext && is_scalar($data[self::FIELD_PUBLISHER])) { - $this->setPublisher(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PUBLISHER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PUBLISHER])) { + $this->setPublisher(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PUBLISHER]] + $ext)); + } else if (is_array($data[self::FIELD_PUBLISHER])) { + $this->setPublisher(new FHIRString(array_merge($ext, $data[self::FIELD_PUBLISHER]))); + } } else { $this->setPublisher(new FHIRString($data[self::FIELD_PUBLISHER])); } @@ -553,8 +593,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PURPOSE] instanceof FHIRMarkdown) { $this->setPurpose($data[self::FIELD_PURPOSE]); - } elseif ($ext && is_scalar($data[self::FIELD_PURPOSE])) { - $this->setPurpose(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_PURPOSE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PURPOSE])) { + $this->setPurpose(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_PURPOSE]] + $ext)); + } else if (is_array($data[self::FIELD_PURPOSE])) { + $this->setPurpose(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_PURPOSE]))); + } } else { $this->setPurpose(new FHIRMarkdown($data[self::FIELD_PURPOSE])); } @@ -565,8 +609,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRPublicationStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRPublicationStatus([FHIRPublicationStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRPublicationStatus([FHIRPublicationStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRPublicationStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRPublicationStatus($data[self::FIELD_STATUS])); } @@ -577,8 +625,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TITLE] instanceof FHIRString) { $this->setTitle($data[self::FIELD_TITLE]); - } elseif ($ext && is_scalar($data[self::FIELD_TITLE])) { - $this->setTitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TITLE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TITLE])) { + $this->setTitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TITLE]] + $ext)); + } else if (is_array($data[self::FIELD_TITLE])) { + $this->setTitle(new FHIRString(array_merge($ext, $data[self::FIELD_TITLE]))); + } } else { $this->setTitle(new FHIRString($data[self::FIELD_TITLE])); } @@ -589,8 +641,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_URL] instanceof FHIRUri) { $this->setUrl($data[self::FIELD_URL]); - } elseif ($ext && is_scalar($data[self::FIELD_URL])) { - $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } else if (is_array($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri(array_merge($ext, $data[self::FIELD_URL]))); + } } else { $this->setUrl(new FHIRUri($data[self::FIELD_URL])); } @@ -598,6 +654,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_USE_CONTEXT])) { if (is_array($data[self::FIELD_USE_CONTEXT])) { foreach($data[self::FIELD_USE_CONTEXT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRUsageContext) { $this->addUseContext($v); } else { @@ -616,8 +675,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VERSION] instanceof FHIRString) { $this->setVersion($data[self::FIELD_VERSION]); - } elseif ($ext && is_scalar($data[self::FIELD_VERSION])) { - $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } else if (is_array($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString(array_merge($ext, $data[self::FIELD_VERSION]))); + } } else { $this->setVersion(new FHIRString($data[self::FIELD_VERSION])); } @@ -1678,11 +1741,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getCompose())) { $v->xmlSerialize($sxe->addChild(self::FIELD_COMPOSE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getContact())) { foreach($vs as $v) { if (null === $v) { @@ -1691,6 +1752,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_CONTACT, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getCopyright())) { $v->xmlSerialize($sxe->addChild(self::FIELD_COPYRIGHT, null, $v->_getFHIRXMLNamespace())); } @@ -1700,14 +1762,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESCRIPTION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getExpansion())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EXPANSION, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getExperimental())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EXPERIMENTAL, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -1716,10 +1776,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getImmutable())) { $v->xmlSerialize($sxe->addChild(self::FIELD_IMMUTABLE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getJurisdiction())) { foreach($vs as $v) { if (null === $v) { @@ -1728,6 +1788,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_JURISDICTION, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NAME, null, $v->_getFHIRXMLNamespace())); } @@ -1737,7 +1798,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getPurpose())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PURPOSE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } @@ -1747,7 +1807,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getUrl())) { $v->xmlSerialize($sxe->addChild(self::FIELD_URL, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getUseContext())) { foreach($vs as $v) { if (null === $v) { @@ -1756,6 +1815,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_USE_CONTEXT, null, $v->_getFHIRXMLNamespace())); } } + if (null !== ($v = $this->getVersion())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VERSION, null, $v->_getFHIRXMLNamespace())); } @@ -1775,63 +1835,164 @@ public function jsonSerialize() $a[self::FIELD_CONTACT] = $vs; } if (null !== ($v = $this->getCopyright())) { - $a[self::FIELD_COPYRIGHT] = $v->getValue(); - $a[self::FIELD_COPYRIGHT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_COPYRIGHT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_COPYRIGHT_EXT] = $enc; + } + } else { + $a[self::FIELD_COPYRIGHT] = $v; + } } if (null !== ($v = $this->getDate())) { - $a[self::FIELD_DATE] = $v->getValue(); - $a[self::FIELD_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_DATE] = $v; + } } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if (null !== ($v = $this->getExpansion())) { $a[self::FIELD_EXPANSION] = $v; } if (null !== ($v = $this->getExperimental())) { - $a[self::FIELD_EXPERIMENTAL] = $v->getValue(); - $a[self::FIELD_EXPERIMENTAL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EXPERIMENTAL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EXPERIMENTAL_EXT] = $enc; + } + } else { + $a[self::FIELD_EXPERIMENTAL] = $v; + } } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if (null !== ($v = $this->getImmutable())) { - $a[self::FIELD_IMMUTABLE] = $v->getValue(); - $a[self::FIELD_IMMUTABLE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IMMUTABLE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IMMUTABLE_EXT] = $enc; + } + } else { + $a[self::FIELD_IMMUTABLE] = $v; + } } if ([] !== ($vs = $this->getJurisdiction())) { $a[self::FIELD_JURISDICTION] = $vs; } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if (null !== ($v = $this->getPublisher())) { - $a[self::FIELD_PUBLISHER] = $v->getValue(); - $a[self::FIELD_PUBLISHER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PUBLISHER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PUBLISHER_EXT] = $enc; + } + } else { + $a[self::FIELD_PUBLISHER] = $v; + } } if (null !== ($v = $this->getPurpose())) { - $a[self::FIELD_PURPOSE] = $v->getValue(); - $a[self::FIELD_PURPOSE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PURPOSE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PURPOSE_EXT] = $enc; + } + } else { + $a[self::FIELD_PURPOSE] = $v; + } } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getTitle())) { - $a[self::FIELD_TITLE] = $v->getValue(); - $a[self::FIELD_TITLE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TITLE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TITLE_EXT] = $enc; + } + } else { + $a[self::FIELD_TITLE] = $v; + } } if (null !== ($v = $this->getUrl())) { - $a[self::FIELD_URL] = $v->getValue(); - $a[self::FIELD_URL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_URL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_URL_EXT] = $enc; + } + } else { + $a[self::FIELD_URL] = $v; + } } if ([] !== ($vs = $this->getUseContext())) { $a[self::FIELD_USE_CONTEXT] = $vs; } if (null !== ($v = $this->getVersion())) { - $a[self::FIELD_VERSION] = $v->getValue(); - $a[self::FIELD_VERSION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VERSION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VERSION_EXT] = $enc; + } + } else { + $a[self::FIELD_VERSION] = $v; + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRVerificationResult.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRVerificationResult.php index fabb9970c4..3a91825a86 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRVerificationResult.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRVerificationResult.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -89,10 +89,6 @@ class FHIRVerificationResult extends FHIRDomainResource implements PHPFHIRContai { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_VERIFICATION_RESULT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ATTESTATION = 'attestation'; const FIELD_FAILURE_ACTION = 'failureAction'; const FIELD_FREQUENCY = 'frequency'; @@ -281,6 +277,9 @@ class FHIRVerificationResult extends FHIRDomainResource implements PHPFHIRContai */ protected $validator = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRVerificationResult Constructor * @param null|array $data @@ -324,8 +323,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_LAST_PERFORMED] instanceof FHIRDateTime) { $this->setLastPerformed($data[self::FIELD_LAST_PERFORMED]); - } elseif ($ext && is_scalar($data[self::FIELD_LAST_PERFORMED])) { - $this->setLastPerformed(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_LAST_PERFORMED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_LAST_PERFORMED])) { + $this->setLastPerformed(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_LAST_PERFORMED]] + $ext)); + } else if (is_array($data[self::FIELD_LAST_PERFORMED])) { + $this->setLastPerformed(new FHIRDateTime(array_merge($ext, $data[self::FIELD_LAST_PERFORMED]))); + } } else { $this->setLastPerformed(new FHIRDateTime($data[self::FIELD_LAST_PERFORMED])); } @@ -343,8 +346,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NEXT_SCHEDULED] instanceof FHIRDate) { $this->setNextScheduled($data[self::FIELD_NEXT_SCHEDULED]); - } elseif ($ext && is_scalar($data[self::FIELD_NEXT_SCHEDULED])) { - $this->setNextScheduled(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_NEXT_SCHEDULED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NEXT_SCHEDULED])) { + $this->setNextScheduled(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_NEXT_SCHEDULED]] + $ext)); + } else if (is_array($data[self::FIELD_NEXT_SCHEDULED])) { + $this->setNextScheduled(new FHIRDate(array_merge($ext, $data[self::FIELD_NEXT_SCHEDULED]))); + } } else { $this->setNextScheduled(new FHIRDate($data[self::FIELD_NEXT_SCHEDULED])); } @@ -352,6 +359,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PRIMARY_SOURCE])) { if (is_array($data[self::FIELD_PRIMARY_SOURCE])) { foreach($data[self::FIELD_PRIMARY_SOURCE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRVerificationResultPrimarySource) { $this->addPrimarySource($v); } else { @@ -370,8 +380,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRStatus([FHIRStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRStatus([FHIRStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRStatus($data[self::FIELD_STATUS])); } @@ -382,8 +396,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS_DATE] instanceof FHIRDateTime) { $this->setStatusDate($data[self::FIELD_STATUS_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS_DATE])) { - $this->setStatusDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_STATUS_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS_DATE])) { + $this->setStatusDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_STATUS_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS_DATE])) { + $this->setStatusDate(new FHIRDateTime(array_merge($ext, $data[self::FIELD_STATUS_DATE]))); + } } else { $this->setStatusDate(new FHIRDateTime($data[self::FIELD_STATUS_DATE])); } @@ -391,6 +409,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_TARGET])) { if (is_array($data[self::FIELD_TARGET])) { foreach($data[self::FIELD_TARGET] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addTarget($v); } else { @@ -409,17 +430,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_TARGET_LOCATION])) { foreach($data[self::FIELD_TARGET_LOCATION] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRString) { $this->addTargetLocation($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addTargetLocation(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addTargetLocation(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addTargetLocation(new FHIRString(array_merge($v, $ext[$i]))); + } } else { $this->addTargetLocation(new FHIRString($v)); } } } elseif ($data[self::FIELD_TARGET_LOCATION] instanceof FHIRString) { $this->addTargetLocation($data[self::FIELD_TARGET_LOCATION]); - } elseif ($ext && is_scalar($data[self::FIELD_TARGET_LOCATION])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_TARGET_LOCATION])) { $this->addTargetLocation(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TARGET_LOCATION]] + $ext)); } else { $this->addTargetLocation(new FHIRString($data[self::FIELD_TARGET_LOCATION])); @@ -428,6 +456,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_VALIDATION_PROCESS])) { if (is_array($data[self::FIELD_VALIDATION_PROCESS])) { foreach($data[self::FIELD_VALIDATION_PROCESS] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addValidationProcess($v); } else { @@ -450,6 +481,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_VALIDATOR])) { if (is_array($data[self::FIELD_VALIDATOR])) { foreach($data[self::FIELD_VALIDATOR] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRVerificationResultValidator) { $this->addValidator($v); } else { @@ -1245,29 +1279,24 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if (null !== ($v = $this->getAttestation())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ATTESTATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getFailureAction())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FAILURE_ACTION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getFrequency())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FREQUENCY, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getLastPerformed())) { $v->xmlSerialize($sxe->addChild(self::FIELD_LAST_PERFORMED, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getNeed())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NEED, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getNextScheduled())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NEXT_SCHEDULED, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getPrimarySource())) { foreach($vs as $v) { if (null === $v) { @@ -1283,7 +1312,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getStatusDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS_DATE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getTarget())) { foreach($vs as $v) { if (null === $v) { @@ -1292,6 +1320,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_TARGET, null, $v->_getFHIRXMLNamespace())); } } + if ([] !== ($vs = $this->getTargetLocation())) { foreach($vs as $v) { if (null === $v) { @@ -1313,7 +1342,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getValidationType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALIDATION_TYPE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getValidator())) { foreach($vs as $v) { if (null === $v) { @@ -1322,6 +1350,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_VALIDATOR, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } @@ -1341,25 +1370,54 @@ public function jsonSerialize() $a[self::FIELD_FREQUENCY] = $v; } if (null !== ($v = $this->getLastPerformed())) { - $a[self::FIELD_LAST_PERFORMED] = $v->getValue(); - $a[self::FIELD_LAST_PERFORMED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_LAST_PERFORMED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_LAST_PERFORMED_EXT] = $enc; + } + } else { + $a[self::FIELD_LAST_PERFORMED] = $v; + } } if (null !== ($v = $this->getNeed())) { $a[self::FIELD_NEED] = $v; } if (null !== ($v = $this->getNextScheduled())) { - $a[self::FIELD_NEXT_SCHEDULED] = $v->getValue(); - $a[self::FIELD_NEXT_SCHEDULED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NEXT_SCHEDULED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NEXT_SCHEDULED_EXT] = $enc; + } + } else { + $a[self::FIELD_NEXT_SCHEDULED] = $v; + } } if ([] !== ($vs = $this->getPrimarySource())) { $a[self::FIELD_PRIMARY_SOURCE] = $vs; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getStatusDate())) { - $a[self::FIELD_STATUS_DATE] = $v->getValue(); - $a[self::FIELD_STATUS_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS_DATE] = $v; + } } if ([] !== ($vs = $this->getTarget())) { $a[self::FIELD_TARGET] = $vs; @@ -1370,8 +1428,17 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_TARGET_LOCATION][] = $v->getValue(); - $a[self::FIELD_TARGET_LOCATION_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TARGET_LOCATION][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TARGET_LOCATION_EXT][] = $enc; + } else { + $a[self::FIELD_TARGET_LOCATION_EXT][] = null; + } + } else { + $a[self::FIELD_TARGET_LOCATION][] = $v; + } } } if ([] !== ($vs = $this->getValidationProcess())) { diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRVisionPrescription.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRVisionPrescription.php index a8586a8d15..b6d8c2d28f 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRVisionPrescription.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRDomainResource/FHIRVisionPrescription.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -84,10 +84,6 @@ class FHIRVisionPrescription extends FHIRDomainResource implements PHPFHIRContai { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_VISION_PRESCRIPTION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CREATED = 'created'; const FIELD_CREATED_EXT = '_created'; const FIELD_DATE_WRITTEN = 'dateWritten'; @@ -197,6 +193,9 @@ class FHIRVisionPrescription extends FHIRDomainResource implements PHPFHIRContai */ protected $status = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRVisionPrescription Constructor * @param null|array $data @@ -219,8 +218,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CREATED] instanceof FHIRDateTime) { $this->setCreated($data[self::FIELD_CREATED]); - } elseif ($ext && is_scalar($data[self::FIELD_CREATED])) { - $this->setCreated(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_CREATED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CREATED])) { + $this->setCreated(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_CREATED]] + $ext)); + } else if (is_array($data[self::FIELD_CREATED])) { + $this->setCreated(new FHIRDateTime(array_merge($ext, $data[self::FIELD_CREATED]))); + } } else { $this->setCreated(new FHIRDateTime($data[self::FIELD_CREATED])); } @@ -231,8 +234,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATE_WRITTEN] instanceof FHIRDateTime) { $this->setDateWritten($data[self::FIELD_DATE_WRITTEN]); - } elseif ($ext && is_scalar($data[self::FIELD_DATE_WRITTEN])) { - $this->setDateWritten(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE_WRITTEN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATE_WRITTEN])) { + $this->setDateWritten(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE_WRITTEN]] + $ext)); + } else if (is_array($data[self::FIELD_DATE_WRITTEN])) { + $this->setDateWritten(new FHIRDateTime(array_merge($ext, $data[self::FIELD_DATE_WRITTEN]))); + } } else { $this->setDateWritten(new FHIRDateTime($data[self::FIELD_DATE_WRITTEN])); } @@ -250,17 +257,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -269,6 +283,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_LENS_SPECIFICATION])) { if (is_array($data[self::FIELD_LENS_SPECIFICATION])) { foreach($data[self::FIELD_LENS_SPECIFICATION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRVisionPrescriptionLensSpecification) { $this->addLensSpecification($v); } else { @@ -301,8 +318,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRFinancialResourceStatusCodes) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRFinancialResourceStatusCodes([FHIRFinancialResourceStatusCodes::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRFinancialResourceStatusCodes([FHIRFinancialResourceStatusCodes::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRFinancialResourceStatusCodes(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRFinancialResourceStatusCodes($data[self::FIELD_STATUS])); } @@ -781,11 +802,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDateWritten())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DATE_WRITTEN, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getEncounter())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ENCOUNTER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -807,11 +826,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getPatient())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATIENT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPrescriber())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PRESCRIBER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } @@ -825,18 +842,48 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getCreated())) { - $a[self::FIELD_CREATED] = $v->getValue(); - $a[self::FIELD_CREATED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CREATED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CREATED_EXT] = $enc; + } + } else { + $a[self::FIELD_CREATED] = $v; + } } if (null !== ($v = $this->getDateWritten())) { - $a[self::FIELD_DATE_WRITTEN] = $v->getValue(); - $a[self::FIELD_DATE_WRITTEN_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATE_WRITTEN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATE_WRITTEN_EXT] = $enc; + } + } else { + $a[self::FIELD_DATE_WRITTEN] = $v; + } } if (null !== ($v = $this->getEncounter())) { $a[self::FIELD_ENCOUNTER] = $v; } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if ([] !== ($vs = $this->getLensSpecification())) { $a[self::FIELD_LENS_SPECIFICATION] = $vs; @@ -848,7 +895,15 @@ public function jsonSerialize() $a[self::FIELD_PRESCRIBER] = $v; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRParameters.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRParameters.php index 4cc7b86017..09215a28d4 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRParameters.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResource/FHIRParameters.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -81,10 +81,6 @@ class FHIRParameters extends FHIRResource implements PHPFHIRContainedTypeInterfa { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_PARAMETERS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_PARAMETER = 'parameter'; /** @@ -98,6 +94,9 @@ class FHIRParameters extends FHIRResource implements PHPFHIRContainedTypeInterfa */ protected $parameter = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRParameters Constructor * @param null|array $data @@ -117,6 +116,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PARAMETER])) { if (is_array($data[self::FIELD_PARAMETER])) { foreach($data[self::FIELD_PARAMETER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRParametersParameter) { $this->addParameter($v); } else { @@ -299,7 +301,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); - if ([] !== ($vs = $this->getParameter())) { foreach($vs as $v) { if (null === $v) { @@ -308,6 +309,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_PARAMETER, null, $v->_getFHIRXMLNamespace())); } } + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResourceContainer.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResourceContainer.php index 39c90e1a7f..a7147c9abb 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResourceContainer.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResourceContainer.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -221,9 +221,7 @@ class FHIRResourceContainer implements PHPFHIRCommentContainerInterface, PHPFHIR // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_RESOURCE_CONTAINER; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; + const FIELD_FHIR_COMMENTS = 'fhir_comments'; const FIELD_ACCOUNT = 'Account'; const FIELD_ACTIVITY_DEFINITION = 'ActivityDefinition'; @@ -1797,6 +1795,9 @@ class FHIRResourceContainer implements PHPFHIRCommentContainerInterface, PHPFHIR */ protected $VisionPrescription = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRResourceContainer Constructor * @param null|array $data @@ -1812,6 +1813,13 @@ public function __construct($data = null) gettype($data) )); } + if (isset($data[self::FIELD_FHIR_COMMENTS])) { + if (is_array($data[self::FIELD_FHIR_COMMENTS])) { + $this->_setFHIRComments($data[self::FIELD_FHIR_COMMENTS]); + } else if (is_string($data[self::FIELD_FHIR_COMMENTS])) { + $this->_addFHIRComment($data[self::FIELD_FHIR_COMMENTS]); + } + } if (isset($data[self::FIELD_ACCOUNT])) { if ($data[self::FIELD_ACCOUNT] instanceof FHIRAccount) { $this->setAccount($data[self::FIELD_ACCOUNT]); @@ -7973,6 +7981,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResourceType.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResourceType.php index 0384bf37b0..f3c9ad2191 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResourceType.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResourceType.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -246,6 +246,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResourceTypeList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResourceTypeList.php index 8f244de3c7..feaed4bbe1 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResourceTypeList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResourceTypeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -391,6 +391,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResourceVersionPolicyList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResourceVersionPolicyList.php index a35235fedd..129bf485de 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResourceVersionPolicyList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResourceVersionPolicyList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -246,6 +246,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResponseTypeList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResponseTypeList.php index 492a3dd7d6..5579207588 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRResponseTypeList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRResponseTypeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -246,6 +246,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRRestfulCapabilityModeList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRRestfulCapabilityModeList.php index 09071a4a15..baf1d35c42 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRRestfulCapabilityModeList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRRestfulCapabilityModeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -245,6 +245,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRSPDXLicenseList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRSPDXLicenseList.php index 7c15d1cecd..91dd14ece1 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRSPDXLicenseList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRSPDXLicenseList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -589,6 +589,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRSampledDataDataTypePrimitive.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRSampledDataDataTypePrimitive.php index a0a2f7de90..910d2036e8 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRSampledDataDataTypePrimitive.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRSampledDataDataTypePrimitive.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -229,6 +229,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRSearchComparatorList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRSearchComparatorList.php index 23ccb652aa..ab6bd6eb27 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRSearchComparatorList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRSearchComparatorList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -252,6 +252,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRSearchEntryModeList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRSearchEntryModeList.php index a20a9b4083..161872bc84 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRSearchEntryModeList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRSearchEntryModeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -246,6 +246,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRSearchModifierCodeList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRSearchModifierCodeList.php index 5a4d01d29c..46c35bf94c 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRSearchModifierCodeList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRSearchModifierCodeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -255,6 +255,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRSearchParamTypeList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRSearchParamTypeList.php index 33ea86ffa7..877505e3c4 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRSearchParamTypeList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRSearchParamTypeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -252,6 +252,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRSequenceTypeList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRSequenceTypeList.php index 5367ddca08..821a759ae6 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRSequenceTypeList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRSequenceTypeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -246,6 +246,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRSlicingRulesList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRSlicingRulesList.php index ad2fa1723e..cb7ec9c306 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRSlicingRulesList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRSlicingRulesList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -246,6 +246,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRSlotStatusList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRSlotStatusList.php index 16ca597264..c47672fc39 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRSlotStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRSlotStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -248,6 +248,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRSortDirectionList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRSortDirectionList.php index d197e173d2..6d8aee8bbc 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRSortDirectionList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRSortDirectionList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -245,6 +245,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRSpecimenContainedPreferenceList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRSpecimenContainedPreferenceList.php index 34c7df5f5d..2cc3f890f5 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRSpecimenContainedPreferenceList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRSpecimenContainedPreferenceList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -245,6 +245,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRSpecimenStatusList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRSpecimenStatusList.php index 162996f9ee..2ba7ead037 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRSpecimenStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRSpecimenStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -247,6 +247,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRStatusList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRStatusList.php index 4ed6c0aaa7..1815cf126e 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -249,6 +249,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRStrandTypeList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRStrandTypeList.php index 1da96517c8..e2d321f133 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRStrandTypeList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRStrandTypeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -245,6 +245,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRStringPrimitive.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRStringPrimitive.php index f3727a0aa9..102c5e217b 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRStringPrimitive.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRStringPrimitive.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -229,6 +229,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRStructureDefinitionKindList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRStructureDefinitionKindList.php index 87056214db..338ecc31bd 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRStructureDefinitionKindList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRStructureDefinitionKindList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -247,6 +247,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRStructureMapContextTypeList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRStructureMapContextTypeList.php index fe41efc6e7..6470d51633 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRStructureMapContextTypeList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRStructureMapContextTypeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -245,6 +245,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRStructureMapGroupTypeModeList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRStructureMapGroupTypeModeList.php index c4f1b158eb..44d2853029 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRStructureMapGroupTypeModeList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRStructureMapGroupTypeModeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -246,6 +246,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRStructureMapInputModeList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRStructureMapInputModeList.php index 64df8cfda7..016265d555 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRStructureMapInputModeList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRStructureMapInputModeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -245,6 +245,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRStructureMapModelModeList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRStructureMapModelModeList.php index 748449be76..a946e454f4 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRStructureMapModelModeList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRStructureMapModelModeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -247,6 +247,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRStructureMapSourceListModeList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRStructureMapSourceListModeList.php index 5e87c9637a..782892196f 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRStructureMapSourceListModeList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRStructureMapSourceListModeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -248,6 +248,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRStructureMapTargetListModeList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRStructureMapTargetListModeList.php index 044f4ff4e0..24b3a316b4 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRStructureMapTargetListModeList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRStructureMapTargetListModeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -247,6 +247,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRStructureMapTransformList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRStructureMapTransformList.php index 9136ef48c4..577ba2e5c1 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRStructureMapTransformList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRStructureMapTransformList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -260,6 +260,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRSubscriptionChannelTypeList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRSubscriptionChannelTypeList.php index acd0a69a90..b8a6214b45 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRSubscriptionChannelTypeList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRSubscriptionChannelTypeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -248,6 +248,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRSubscriptionStatusList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRSubscriptionStatusList.php index 17fa67a98d..a0c6807e66 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRSubscriptionStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRSubscriptionStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -247,6 +247,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRSupplyDeliveryStatusList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRSupplyDeliveryStatusList.php index 10fb8f2bce..a35c84d98d 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRSupplyDeliveryStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRSupplyDeliveryStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -247,6 +247,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRSupplyRequestStatusList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRSupplyRequestStatusList.php index eb41a37a57..2abedff702 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRSupplyRequestStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRSupplyRequestStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -250,6 +250,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRSystemRestfulInteractionList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRSystemRestfulInteractionList.php index 5493f34022..c5968555e4 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRSystemRestfulInteractionList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRSystemRestfulInteractionList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -247,6 +247,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRTaskIntentList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRTaskIntentList.php index 4667dfd2bf..4b4cb55589 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRTaskIntentList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRTaskIntentList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -252,6 +252,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRTaskStatusList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRTaskStatusList.php index e9b9fbe865..0dab0e795c 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRTaskStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRTaskStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -255,6 +255,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRTestReportActionResultList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRTestReportActionResultList.php index 94fa86e70b..f132901963 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRTestReportActionResultList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRTestReportActionResultList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -248,6 +248,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRTestReportParticipantTypeList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRTestReportParticipantTypeList.php index 3979bebc8a..cd72297faa 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRTestReportParticipantTypeList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRTestReportParticipantTypeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -246,6 +246,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRTestReportResultList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRTestReportResultList.php index 882e3e4d14..fda1bd4772 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRTestReportResultList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRTestReportResultList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -246,6 +246,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRTestReportStatusList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRTestReportStatusList.php index ba27e22a61..abd02e5f5c 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRTestReportStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRTestReportStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -248,6 +248,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRTestScriptRequestMethodCodeList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRTestScriptRequestMethodCodeList.php index d97be8653c..49ce37aac5 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRTestScriptRequestMethodCodeList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRTestScriptRequestMethodCodeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -250,6 +250,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRTimePrimitive.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRTimePrimitive.php index 233bb09be8..18c6232d83 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRTimePrimitive.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRTimePrimitive.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -256,6 +256,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRTriggerTypeList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRTriggerTypeList.php index db6d7ea383..5af028fb2d 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRTriggerTypeList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRTriggerTypeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -251,6 +251,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRTypeDerivationRuleList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRTypeDerivationRuleList.php index 138c8db982..a8e94ba834 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRTypeDerivationRuleList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRTypeDerivationRuleList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -245,6 +245,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRTypeRestfulInteractionList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRTypeRestfulInteractionList.php index 97c4fe9863..b90e3804db 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRTypeRestfulInteractionList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRTypeRestfulInteractionList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -252,6 +252,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRUDIEntryTypeList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRUDIEntryTypeList.php index 141597723d..2837255c9b 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRUDIEntryTypeList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRUDIEntryTypeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -249,6 +249,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRUnitsOfTimeList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRUnitsOfTimeList.php index 868044e934..c3a9e6b29e 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRUnitsOfTimeList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRUnitsOfTimeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -250,6 +250,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRUnsignedIntPrimitive.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRUnsignedIntPrimitive.php index 3b4bdba94c..8c3d8c5392 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRUnsignedIntPrimitive.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRUnsignedIntPrimitive.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -241,6 +241,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRUriPrimitive.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRUriPrimitive.php index fdd394fa18..88bbb24db9 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRUriPrimitive.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRUriPrimitive.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -229,6 +229,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRUrlPrimitive.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRUrlPrimitive.php index ffe578b508..27ff5b9fb1 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRUrlPrimitive.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRUrlPrimitive.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -229,6 +229,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRUseList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRUseList.php index 3303f7a7ff..1d0bc11c59 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRUseList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRUseList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -246,6 +246,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRUuidPrimitive.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRUuidPrimitive.php index e0a8d239b4..86054ceff5 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRUuidPrimitive.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRUuidPrimitive.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -229,6 +229,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRVConfidentialityClassificationList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRVConfidentialityClassificationList.php index 4683d1dc59..c7030c39d9 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRVConfidentialityClassificationList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRVConfidentialityClassificationList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -249,6 +249,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRVariableTypeList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRVariableTypeList.php index 2a80e51b9d..a2aa5bf839 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRVariableTypeList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRVariableTypeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -246,6 +246,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRVisionBaseList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRVisionBaseList.php index e6837128d9..d7d377c33f 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRVisionBaseList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRVisionBaseList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -247,6 +247,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRVisionEyesList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRVisionEyesList.php index bfce606e3d..c6ef60319e 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRVisionEyesList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRVisionEyesList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -245,6 +245,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/FHIRXPathUsageTypeList.php b/src/DCarbone/PHPFHIRGenerated/R4/FHIRXPathUsageTypeList.php index 8d50b8be90..a556717be1 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/FHIRXPathUsageTypeList.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/FHIRXPathUsageTypeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -248,6 +248,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } $sxe->addAttribute(self::FIELD_VALUE, (string)$this); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRAutoloader.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRAutoloader.php index 4c88e12f50..33eae2880f 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRAutoloader.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRAutoloader.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRCommentContainerInterface.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRCommentContainerInterface.php index 30b4222824..c992831df8 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRCommentContainerInterface.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRCommentContainerInterface.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRCommentContainerTrait.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRCommentContainerTrait.php index be45b4f236..dc2b0de418 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRCommentContainerTrait.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRCommentContainerTrait.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -69,7 +69,7 @@ trait PHPFHIRCommentContainerTrait { /** @var array */ - private $_fhirComments = []; + protected $_fhirComments = []; /** * Arbitrary comments of a hopefully useful nature diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRConstants.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRConstants.php index b2a3d2ebbe..369965fc88 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRConstants.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRConstants.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * @@ -73,7 +73,7 @@ abstract class PHPFHIRConstants const SOURCE_GENERATION_DATE = 'Fri, Nov 1, 2019 09:29+1100'; // PHPFHIR - const CODE_GENERATION_DATE = 'November 10th, 2019 18:12+0000'; + const CODE_GENERATION_DATE = 'November 17th, 2019 04:21+0000'; // Common const JSON_FIELD_RESOURCE_TYPE = 'resourceType'; diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRContainedTypeInterface.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRContainedTypeInterface.php index 37dc124fdc..9fe01e4e3a 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRContainedTypeInterface.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRContainedTypeInterface.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRResponseParser.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRResponseParser.php index 76aa862019..aba6c329d2 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRResponseParser.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRResponseParser.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRResponseParserConfig.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRResponseParserConfig.php index 245afcf5e3..9018fbec55 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRResponseParserConfig.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRResponseParserConfig.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRAccountStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRAccountStatusListTest.php index 5a166177c1..a76d62016d 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRAccountStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRAccountStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRActionCardinalityBehaviorListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRActionCardinalityBehaviorListTest.php index e87daddc9d..c28c359b60 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRActionCardinalityBehaviorListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRActionCardinalityBehaviorListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRActionConditionKindListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRActionConditionKindListTest.php index d0f228eb11..10e51d0277 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRActionConditionKindListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRActionConditionKindListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRActionGroupingBehaviorListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRActionGroupingBehaviorListTest.php index 835506588c..c7134936d4 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRActionGroupingBehaviorListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRActionGroupingBehaviorListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRActionParticipantTypeListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRActionParticipantTypeListTest.php index 94a28a5bbd..7bb04fdb6b 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRActionParticipantTypeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRActionParticipantTypeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRActionPrecheckBehaviorListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRActionPrecheckBehaviorListTest.php index e9a755750a..948e7cd8c1 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRActionPrecheckBehaviorListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRActionPrecheckBehaviorListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRActionRelationshipTypeListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRActionRelationshipTypeListTest.php index 2406024532..f03cc5b3b9 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRActionRelationshipTypeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRActionRelationshipTypeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRActionRequiredBehaviorListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRActionRequiredBehaviorListTest.php index 657326cec9..ef6f006c49 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRActionRequiredBehaviorListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRActionRequiredBehaviorListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRActionSelectionBehaviorListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRActionSelectionBehaviorListTest.php index 825ede5060..4389f9bcd9 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRActionSelectionBehaviorListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRActionSelectionBehaviorListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRAddressTypeListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRAddressTypeListTest.php index 7a20ff1782..d90d363f8f 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRAddressTypeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRAddressTypeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRAddressUseListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRAddressUseListTest.php index 568d8e6c6a..411f0ae092 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRAddressUseListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRAddressUseListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRAdministrativeGenderListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRAdministrativeGenderListTest.php index 79ca265a24..519c96c506 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRAdministrativeGenderListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRAdministrativeGenderListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRAdverseEventActualityListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRAdverseEventActualityListTest.php index 7b6828a096..c84e8c2536 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRAdverseEventActualityListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRAdverseEventActualityListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRAggregationModeListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRAggregationModeListTest.php index 6b7b849002..546a4dcb1c 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRAggregationModeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRAggregationModeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRAllergyIntoleranceCategoryListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRAllergyIntoleranceCategoryListTest.php index e6827b03ab..86dc9d4279 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRAllergyIntoleranceCategoryListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRAllergyIntoleranceCategoryListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRAllergyIntoleranceCriticalityListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRAllergyIntoleranceCriticalityListTest.php index 75b684916d..a70c18923b 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRAllergyIntoleranceCriticalityListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRAllergyIntoleranceCriticalityListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRAllergyIntoleranceSeverityListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRAllergyIntoleranceSeverityListTest.php index ed6e592414..7302b7d4d4 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRAllergyIntoleranceSeverityListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRAllergyIntoleranceSeverityListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRAllergyIntoleranceTypeListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRAllergyIntoleranceTypeListTest.php index 6e447de2ef..ffda74d4af 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRAllergyIntoleranceTypeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRAllergyIntoleranceTypeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRAppointmentStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRAppointmentStatusListTest.php index 269d030698..3c8aeee53a 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRAppointmentStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRAppointmentStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRAssertionDirectionTypeListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRAssertionDirectionTypeListTest.php index 0000917bf4..270492e2bd 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRAssertionDirectionTypeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRAssertionDirectionTypeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRAssertionOperatorTypeListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRAssertionOperatorTypeListTest.php index 64f1cd737f..e79c56d8d8 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRAssertionOperatorTypeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRAssertionOperatorTypeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRAssertionResponseTypesListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRAssertionResponseTypesListTest.php index c1ca3492ca..317e53933d 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRAssertionResponseTypesListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRAssertionResponseTypesListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRAuditEventActionListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRAuditEventActionListTest.php index 451ac5c6a5..4c2d0ab564 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRAuditEventActionListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRAuditEventActionListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRAuditEventAgentNetworkTypeListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRAuditEventAgentNetworkTypeListTest.php index b84a7c8a65..a05f6579d5 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRAuditEventAgentNetworkTypeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRAuditEventAgentNetworkTypeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRAuditEventOutcomeListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRAuditEventOutcomeListTest.php index e23a2a958d..dbe0b3ddbc 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRAuditEventOutcomeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRAuditEventOutcomeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRBase64BinaryPrimitiveTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRBase64BinaryPrimitiveTest.php index 80ad15872c..352efe3628 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRBase64BinaryPrimitiveTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRBase64BinaryPrimitiveTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRBindingStrengthListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRBindingStrengthListTest.php index c32afb0bc6..4b79d62041 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRBindingStrengthListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRBindingStrengthListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRBiologicallyDerivedProductCategoryListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRBiologicallyDerivedProductCategoryListTest.php index 9fc6f6a603..f9c3bdb110 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRBiologicallyDerivedProductCategoryListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRBiologicallyDerivedProductCategoryListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRBiologicallyDerivedProductStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRBiologicallyDerivedProductStatusListTest.php index c1da88a2eb..621b408ef0 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRBiologicallyDerivedProductStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRBiologicallyDerivedProductStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRBiologicallyDerivedProductStorageScaleListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRBiologicallyDerivedProductStorageScaleListTest.php index fd13279597..b49b35a7da 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRBiologicallyDerivedProductStorageScaleListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRBiologicallyDerivedProductStorageScaleListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRBooleanPrimitiveTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRBooleanPrimitiveTest.php index 5a72247df7..9d3666ce31 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRBooleanPrimitiveTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRBooleanPrimitiveTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRBundleTypeListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRBundleTypeListTest.php index 23c58b2fc1..b4a0cc6bff 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRBundleTypeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRBundleTypeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRCanonicalPrimitiveTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRCanonicalPrimitiveTest.php index 6c7a036f5d..96f3119b61 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRCanonicalPrimitiveTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRCanonicalPrimitiveTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRCapabilityStatementKindListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRCapabilityStatementKindListTest.php index aedd5258c1..6b42f0a257 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRCapabilityStatementKindListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRCapabilityStatementKindListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRCarePlanActivityKindListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRCarePlanActivityKindListTest.php index 55d368e4de..9c751409ed 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRCarePlanActivityKindListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRCarePlanActivityKindListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRCarePlanActivityStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRCarePlanActivityStatusListTest.php index 211ec033af..5c04b9d200 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRCarePlanActivityStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRCarePlanActivityStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRCarePlanIntentListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRCarePlanIntentListTest.php index 84946d834d..76ba901457 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRCarePlanIntentListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRCarePlanIntentListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRCareTeamStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRCareTeamStatusListTest.php index 69328e2e6e..c8a92e257a 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRCareTeamStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRCareTeamStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRCatalogEntryRelationTypeListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRCatalogEntryRelationTypeListTest.php index a6576aea5b..28b426ae22 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRCatalogEntryRelationTypeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRCatalogEntryRelationTypeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRChargeItemStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRChargeItemStatusListTest.php index 7dde7644cc..a52f7bd2e4 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRChargeItemStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRChargeItemStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRClaimProcessingCodesListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRClaimProcessingCodesListTest.php index 13c4215a99..2e14214b2e 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRClaimProcessingCodesListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRClaimProcessingCodesListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRClinicalImpressionStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRClinicalImpressionStatusListTest.php index 2e86ba784e..b32c5b8721 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRClinicalImpressionStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRClinicalImpressionStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRCodePrimitiveTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRCodePrimitiveTest.php index 313048c375..4d7ae00aa3 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRCodePrimitiveTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRCodePrimitiveTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRCodeSearchSupportListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRCodeSearchSupportListTest.php index 637843baf5..a18a731f13 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRCodeSearchSupportListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRCodeSearchSupportListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRCodeSystemContentModeListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRCodeSystemContentModeListTest.php index 4785669d13..8f2d965c22 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRCodeSystemContentModeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRCodeSystemContentModeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRCodeSystemHierarchyMeaningListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRCodeSystemHierarchyMeaningListTest.php index 62e352034d..4b920e46cf 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRCodeSystemHierarchyMeaningListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRCodeSystemHierarchyMeaningListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRCompartmentTypeListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRCompartmentTypeListTest.php index 0e653ad806..0d742c689b 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRCompartmentTypeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRCompartmentTypeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRCompositionAttestationModeListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRCompositionAttestationModeListTest.php index d5690b14fb..19ae2ed349 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRCompositionAttestationModeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRCompositionAttestationModeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRCompositionStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRCompositionStatusListTest.php index 76e3ee177c..f8a9104e1f 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRCompositionStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRCompositionStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRConceptMapEquivalenceListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRConceptMapEquivalenceListTest.php index 8be2897281..3f19fd0928 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRConceptMapEquivalenceListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRConceptMapEquivalenceListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRConceptMapGroupUnmappedModeListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRConceptMapGroupUnmappedModeListTest.php index 3cf47b26e1..88f8f43b74 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRConceptMapGroupUnmappedModeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRConceptMapGroupUnmappedModeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRConditionalDeleteStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRConditionalDeleteStatusListTest.php index 7cbf09c920..f5813420f2 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRConditionalDeleteStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRConditionalDeleteStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRConditionalReadStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRConditionalReadStatusListTest.php index e385a0701b..9d2866d7e3 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRConditionalReadStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRConditionalReadStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRConsentDataMeaningListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRConsentDataMeaningListTest.php index 83462beebd..175ecdc714 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRConsentDataMeaningListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRConsentDataMeaningListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRConsentProvisionTypeListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRConsentProvisionTypeListTest.php index 26231f86d4..7a635470cb 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRConsentProvisionTypeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRConsentProvisionTypeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRConsentStateListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRConsentStateListTest.php index 2f09b4afec..ad630697c2 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRConsentStateListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRConsentStateListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRConstraintSeverityListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRConstraintSeverityListTest.php index 5855642b67..3ceaf69dc6 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRConstraintSeverityListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRConstraintSeverityListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRContactPointSystemListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRContactPointSystemListTest.php index ad01d814d8..38fd908d70 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRContactPointSystemListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRContactPointSystemListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRContactPointUseListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRContactPointUseListTest.php index 31746c76f5..24772dde8f 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRContactPointUseListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRContactPointUseListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRContractResourcePublicationStatusCodesListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRContractResourcePublicationStatusCodesListTest.php index 3ad9ee2061..6494aed3c3 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRContractResourcePublicationStatusCodesListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRContractResourcePublicationStatusCodesListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRContractResourceStatusCodesListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRContractResourceStatusCodesListTest.php index 7bcb02c257..27fbadb86d 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRContractResourceStatusCodesListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRContractResourceStatusCodesListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRContributorTypeListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRContributorTypeListTest.php index 6973caa900..1a757f1b39 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRContributorTypeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRContributorTypeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRDatePrimitiveTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRDatePrimitiveTest.php index 6b4df34d99..ce909b5258 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRDatePrimitiveTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRDatePrimitiveTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRDateTimePrimitiveTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRDateTimePrimitiveTest.php index 8c297d984f..56cae967f1 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRDateTimePrimitiveTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRDateTimePrimitiveTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRDaysOfWeekListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRDaysOfWeekListTest.php index 1bdd51dd2f..17d2d2f72d 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRDaysOfWeekListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRDaysOfWeekListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRDecimalPrimitiveTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRDecimalPrimitiveTest.php index df6bce225d..5560d391f9 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRDecimalPrimitiveTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRDecimalPrimitiveTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRDetectedIssueSeverityListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRDetectedIssueSeverityListTest.php index 81d75bd760..5fbda549aa 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRDetectedIssueSeverityListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRDetectedIssueSeverityListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRDeviceMetricCalibrationStateListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRDeviceMetricCalibrationStateListTest.php index f5fed1c04c..d9d714b0f3 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRDeviceMetricCalibrationStateListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRDeviceMetricCalibrationStateListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRDeviceMetricCalibrationTypeListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRDeviceMetricCalibrationTypeListTest.php index 28ae94d2df..aefbbf370d 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRDeviceMetricCalibrationTypeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRDeviceMetricCalibrationTypeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRDeviceMetricCategoryListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRDeviceMetricCategoryListTest.php index cfc385a058..59b00b61a8 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRDeviceMetricCategoryListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRDeviceMetricCategoryListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRDeviceMetricColorListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRDeviceMetricColorListTest.php index f6ba14783b..a2d382b16c 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRDeviceMetricColorListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRDeviceMetricColorListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRDeviceMetricOperationalStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRDeviceMetricOperationalStatusListTest.php index ae4d437658..9d185802fc 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRDeviceMetricOperationalStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRDeviceMetricOperationalStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRDeviceNameTypeListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRDeviceNameTypeListTest.php index c6637ac19f..1e87f3a9b0 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRDeviceNameTypeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRDeviceNameTypeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRDeviceUseStatementStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRDeviceUseStatementStatusListTest.php index cc070b7341..570eb99421 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRDeviceUseStatementStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRDeviceUseStatementStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRDiagnosticReportStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRDiagnosticReportStatusListTest.php index c11963b173..7845afdb08 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRDiagnosticReportStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRDiagnosticReportStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRDiscriminatorTypeListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRDiscriminatorTypeListTest.php index b3d6feaa4b..0592a48d60 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRDiscriminatorTypeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRDiscriminatorTypeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRDocumentModeListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRDocumentModeListTest.php index 6011eb6bd6..a4b29bc8ca 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRDocumentModeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRDocumentModeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRDocumentReferenceStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRDocumentReferenceStatusListTest.php index de2813a3f2..bb8dd04ee4 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRDocumentReferenceStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRDocumentReferenceStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRDocumentRelationshipTypeListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRDocumentRelationshipTypeListTest.php index e250b8adea..8eaf5a9086 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRDocumentRelationshipTypeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRDocumentRelationshipTypeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRAccountStatusTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRAccountStatusTest.php index f85ad94a8e..5588524234 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRAccountStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRAccountStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRActionCardinalityBehaviorTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRActionCardinalityBehaviorTest.php index 254bb99f66..d7c60d1b0b 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRActionCardinalityBehaviorTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRActionCardinalityBehaviorTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRActionConditionKindTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRActionConditionKindTest.php index ae1ae4bcfc..a331dc80c0 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRActionConditionKindTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRActionConditionKindTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRActionGroupingBehaviorTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRActionGroupingBehaviorTest.php index 73898b7a86..f612374b64 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRActionGroupingBehaviorTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRActionGroupingBehaviorTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRActionParticipantTypeTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRActionParticipantTypeTest.php index 199b4c7f76..8bca130d88 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRActionParticipantTypeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRActionParticipantTypeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRActionPrecheckBehaviorTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRActionPrecheckBehaviorTest.php index 4a3ecd3ee4..028eeeb434 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRActionPrecheckBehaviorTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRActionPrecheckBehaviorTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRActionRelationshipTypeTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRActionRelationshipTypeTest.php index c531fb871b..9c002315a0 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRActionRelationshipTypeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRActionRelationshipTypeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRActionRequiredBehaviorTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRActionRequiredBehaviorTest.php index c4b2a7f0f7..b8d8874467 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRActionRequiredBehaviorTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRActionRequiredBehaviorTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRActionSelectionBehaviorTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRActionSelectionBehaviorTest.php index 7b870f78d8..630c75b788 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRActionSelectionBehaviorTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRActionSelectionBehaviorTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRAddressTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRAddressTest.php index 51a9807378..88c9206a50 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRAddressTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRAddressTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRAddressTypeTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRAddressTypeTest.php index 9937be2e17..d97ceb369f 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRAddressTypeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRAddressTypeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRAddressUseTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRAddressUseTest.php index 10f6473229..068c2ceb18 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRAddressUseTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRAddressUseTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRAdministrativeGenderTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRAdministrativeGenderTest.php index cde8316b2d..51277942f0 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRAdministrativeGenderTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRAdministrativeGenderTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRAdverseEventActualityTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRAdverseEventActualityTest.php index 89bd6c3b71..04ea87a81a 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRAdverseEventActualityTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRAdverseEventActualityTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRAggregationModeTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRAggregationModeTest.php index 51483fdf7a..54c568116b 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRAggregationModeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRAggregationModeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRAllergyIntoleranceCategoryTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRAllergyIntoleranceCategoryTest.php index c7aba7c6f4..d39568bd3f 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRAllergyIntoleranceCategoryTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRAllergyIntoleranceCategoryTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRAllergyIntoleranceCriticalityTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRAllergyIntoleranceCriticalityTest.php index 6a2f3fdc1f..95cd393271 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRAllergyIntoleranceCriticalityTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRAllergyIntoleranceCriticalityTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRAllergyIntoleranceSeverityTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRAllergyIntoleranceSeverityTest.php index 16e0a4789e..0637226cbe 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRAllergyIntoleranceSeverityTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRAllergyIntoleranceSeverityTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRAllergyIntoleranceTypeTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRAllergyIntoleranceTypeTest.php index 2b91b6d86b..0eddf598f5 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRAllergyIntoleranceTypeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRAllergyIntoleranceTypeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRAnnotationTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRAnnotationTest.php index 359d960b4c..4e771e3a08 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRAnnotationTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRAnnotationTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRAppointmentStatusTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRAppointmentStatusTest.php index be7ddfa1d0..ad1bcf8caa 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRAppointmentStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRAppointmentStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRAssertionDirectionTypeTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRAssertionDirectionTypeTest.php index 6258bbe6cd..04affe81d0 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRAssertionDirectionTypeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRAssertionDirectionTypeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRAssertionOperatorTypeTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRAssertionOperatorTypeTest.php index 321773ad88..0e55e312d6 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRAssertionOperatorTypeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRAssertionOperatorTypeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRAssertionResponseTypesTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRAssertionResponseTypesTest.php index 03172bb94d..a86a6046c5 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRAssertionResponseTypesTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRAssertionResponseTypesTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRAttachmentTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRAttachmentTest.php index 631665b093..1b4ee27e44 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRAttachmentTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRAttachmentTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRAuditEventActionTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRAuditEventActionTest.php index 5200672bae..1994145eae 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRAuditEventActionTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRAuditEventActionTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRAuditEventAgentNetworkTypeTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRAuditEventAgentNetworkTypeTest.php index 7bb347c435..a9b14ae6eb 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRAuditEventAgentNetworkTypeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRAuditEventAgentNetworkTypeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRAuditEventOutcomeTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRAuditEventOutcomeTest.php index c4c716ad29..0d4d7963e1 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRAuditEventOutcomeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRAuditEventOutcomeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRAccount/FHIRAccountCoverageTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRAccount/FHIRAccountCoverageTest.php index 5025182554..a50efb60e9 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRAccount/FHIRAccountCoverageTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRAccount/FHIRAccountCoverageTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRAccount/FHIRAccountGuarantorTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRAccount/FHIRAccountGuarantorTest.php index 528015dc8f..efe619f5fc 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRAccount/FHIRAccountGuarantorTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRAccount/FHIRAccountGuarantorTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRActivityDefinition/FHIRActivityDefinitionDynamicValueTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRActivityDefinition/FHIRActivityDefinitionDynamicValueTest.php index 2fb41f2777..1b7c255869 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRActivityDefinition/FHIRActivityDefinitionDynamicValueTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRActivityDefinition/FHIRActivityDefinitionDynamicValueTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRActivityDefinition/FHIRActivityDefinitionParticipantTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRActivityDefinition/FHIRActivityDefinitionParticipantTest.php index 394cad17e9..6f389da143 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRActivityDefinition/FHIRActivityDefinitionParticipantTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRActivityDefinition/FHIRActivityDefinitionParticipantTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRAdverseEvent/FHIRAdverseEventCausalityTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRAdverseEvent/FHIRAdverseEventCausalityTest.php index 3a5b3295e9..fc1d79ee9a 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRAdverseEvent/FHIRAdverseEventCausalityTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRAdverseEvent/FHIRAdverseEventCausalityTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRAdverseEvent/FHIRAdverseEventSuspectEntityTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRAdverseEvent/FHIRAdverseEventSuspectEntityTest.php index b063b8476c..55c2f1d63e 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRAdverseEvent/FHIRAdverseEventSuspectEntityTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRAdverseEvent/FHIRAdverseEventSuspectEntityTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRAllergyIntolerance/FHIRAllergyIntoleranceReactionTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRAllergyIntolerance/FHIRAllergyIntoleranceReactionTest.php index 992418afb3..db8244d0d0 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRAllergyIntolerance/FHIRAllergyIntoleranceReactionTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRAllergyIntolerance/FHIRAllergyIntoleranceReactionTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRAppointment/FHIRAppointmentParticipantTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRAppointment/FHIRAppointmentParticipantTest.php index ed302360fe..b13628c1db 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRAppointment/FHIRAppointmentParticipantTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRAppointment/FHIRAppointmentParticipantTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRAuditEvent/FHIRAuditEventAgentTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRAuditEvent/FHIRAuditEventAgentTest.php index 46d07c830b..a0acfc2498 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRAuditEvent/FHIRAuditEventAgentTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRAuditEvent/FHIRAuditEventAgentTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRAuditEvent/FHIRAuditEventDetailTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRAuditEvent/FHIRAuditEventDetailTest.php index e0a8ccc70c..c69a613b0a 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRAuditEvent/FHIRAuditEventDetailTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRAuditEvent/FHIRAuditEventDetailTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRAuditEvent/FHIRAuditEventEntityTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRAuditEvent/FHIRAuditEventEntityTest.php index 75161485a3..319baa1379 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRAuditEvent/FHIRAuditEventEntityTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRAuditEvent/FHIRAuditEventEntityTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRAuditEvent/FHIRAuditEventNetworkTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRAuditEvent/FHIRAuditEventNetworkTest.php index 7cd5feb568..6eaf238649 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRAuditEvent/FHIRAuditEventNetworkTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRAuditEvent/FHIRAuditEventNetworkTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRAuditEvent/FHIRAuditEventSourceTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRAuditEvent/FHIRAuditEventSourceTest.php index 2195db4d48..4e29cf6a61 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRAuditEvent/FHIRAuditEventSourceTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRAuditEvent/FHIRAuditEventSourceTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRBiologicallyDerivedProduct/FHIRBiologicallyDerivedProductCollectionTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRBiologicallyDerivedProduct/FHIRBiologicallyDerivedProductCollectionTest.php index 559d036dfb..4adeec1ba5 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRBiologicallyDerivedProduct/FHIRBiologicallyDerivedProductCollectionTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRBiologicallyDerivedProduct/FHIRBiologicallyDerivedProductCollectionTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRBiologicallyDerivedProduct/FHIRBiologicallyDerivedProductManipulationTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRBiologicallyDerivedProduct/FHIRBiologicallyDerivedProductManipulationTest.php index 0b087183c0..c583b6fc51 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRBiologicallyDerivedProduct/FHIRBiologicallyDerivedProductManipulationTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRBiologicallyDerivedProduct/FHIRBiologicallyDerivedProductManipulationTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRBiologicallyDerivedProduct/FHIRBiologicallyDerivedProductProcessingTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRBiologicallyDerivedProduct/FHIRBiologicallyDerivedProductProcessingTest.php index 08999f59f7..c0b820d9ff 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRBiologicallyDerivedProduct/FHIRBiologicallyDerivedProductProcessingTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRBiologicallyDerivedProduct/FHIRBiologicallyDerivedProductProcessingTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRBiologicallyDerivedProduct/FHIRBiologicallyDerivedProductStorageTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRBiologicallyDerivedProduct/FHIRBiologicallyDerivedProductStorageTest.php index ae65f04aa8..1cfded66fa 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRBiologicallyDerivedProduct/FHIRBiologicallyDerivedProductStorageTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRBiologicallyDerivedProduct/FHIRBiologicallyDerivedProductStorageTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRBundle/FHIRBundleEntryTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRBundle/FHIRBundleEntryTest.php index 9eb78d767f..86fb2e9291 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRBundle/FHIRBundleEntryTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRBundle/FHIRBundleEntryTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRBundle/FHIRBundleLinkTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRBundle/FHIRBundleLinkTest.php index b0f200e132..f46c05b350 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRBundle/FHIRBundleLinkTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRBundle/FHIRBundleLinkTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRBundle/FHIRBundleRequestTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRBundle/FHIRBundleRequestTest.php index 5f8d58d2d0..f3e46adebd 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRBundle/FHIRBundleRequestTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRBundle/FHIRBundleRequestTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRBundle/FHIRBundleResponseTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRBundle/FHIRBundleResponseTest.php index b2c8dffb0d..0f24c0b379 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRBundle/FHIRBundleResponseTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRBundle/FHIRBundleResponseTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRBundle/FHIRBundleSearchTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRBundle/FHIRBundleSearchTest.php index 6fcd445d0e..8c66bf906a 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRBundle/FHIRBundleSearchTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRBundle/FHIRBundleSearchTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementDocumentTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementDocumentTest.php index beb3c5f22e..1438dae99c 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementDocumentTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementDocumentTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementEndpointTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementEndpointTest.php index 3ff6d72aef..b962f41885 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementEndpointTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementEndpointTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementImplementationTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementImplementationTest.php index a120497cc9..7826b97a5b 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementImplementationTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementImplementationTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementInteraction1Test.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementInteraction1Test.php index e9a10814d0..75c6c4d184 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementInteraction1Test.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementInteraction1Test.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementInteractionTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementInteractionTest.php index 0743bd37bf..d45d8453e4 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementInteractionTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementInteractionTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementMessagingTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementMessagingTest.php index f82546adea..5c94d94de4 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementMessagingTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementMessagingTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementOperationTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementOperationTest.php index cc3ebcb840..439df58f40 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementOperationTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementOperationTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementResourceTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementResourceTest.php index 1b0690aa4e..50e05c5fa1 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementResourceTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementResourceTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementRestTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementRestTest.php index f09499dfe3..d968b0b986 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementRestTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementRestTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementSearchParamTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementSearchParamTest.php index 0c0e13489e..bb821d87d3 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementSearchParamTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementSearchParamTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementSecurityTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementSecurityTest.php index d656b5e206..eafdbe2600 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementSecurityTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementSecurityTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementSoftwareTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementSoftwareTest.php index 247b14873d..bfd2894996 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementSoftwareTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementSoftwareTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementSupportedMessageTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementSupportedMessageTest.php index 09ddaa252c..9a378d4b89 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementSupportedMessageTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementSupportedMessageTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCarePlan/FHIRCarePlanActivityTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCarePlan/FHIRCarePlanActivityTest.php index 1afaf42e5b..f1c369e587 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCarePlan/FHIRCarePlanActivityTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCarePlan/FHIRCarePlanActivityTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCarePlan/FHIRCarePlanDetailTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCarePlan/FHIRCarePlanDetailTest.php index 92aabe87cb..af16b751f5 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCarePlan/FHIRCarePlanDetailTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCarePlan/FHIRCarePlanDetailTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCareTeam/FHIRCareTeamParticipantTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCareTeam/FHIRCareTeamParticipantTest.php index f5945afd97..f906c2875f 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCareTeam/FHIRCareTeamParticipantTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCareTeam/FHIRCareTeamParticipantTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCatalogEntry/FHIRCatalogEntryRelatedEntryTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCatalogEntry/FHIRCatalogEntryRelatedEntryTest.php index ccc84b7fca..dd4b76d138 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCatalogEntry/FHIRCatalogEntryRelatedEntryTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCatalogEntry/FHIRCatalogEntryRelatedEntryTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRChargeItem/FHIRChargeItemPerformerTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRChargeItem/FHIRChargeItemPerformerTest.php index f04be67aae..c67a68d1be 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRChargeItem/FHIRChargeItemPerformerTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRChargeItem/FHIRChargeItemPerformerTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRChargeItemDefinition/FHIRChargeItemDefinitionApplicabilityTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRChargeItemDefinition/FHIRChargeItemDefinitionApplicabilityTest.php index 660b47cfbe..b9186c808b 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRChargeItemDefinition/FHIRChargeItemDefinitionApplicabilityTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRChargeItemDefinition/FHIRChargeItemDefinitionApplicabilityTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRChargeItemDefinition/FHIRChargeItemDefinitionPriceComponentTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRChargeItemDefinition/FHIRChargeItemDefinitionPriceComponentTest.php index 27a14a930b..42fe887f85 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRChargeItemDefinition/FHIRChargeItemDefinitionPriceComponentTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRChargeItemDefinition/FHIRChargeItemDefinitionPriceComponentTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRChargeItemDefinition/FHIRChargeItemDefinitionPropertyGroupTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRChargeItemDefinition/FHIRChargeItemDefinitionPropertyGroupTest.php index 513e830874..40b5aea38c 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRChargeItemDefinition/FHIRChargeItemDefinitionPropertyGroupTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRChargeItemDefinition/FHIRChargeItemDefinitionPropertyGroupTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimAccidentTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimAccidentTest.php index ae0fe7689f..7e8113975e 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimAccidentTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimAccidentTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimCareTeamTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimCareTeamTest.php index 115022d141..917604061c 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimCareTeamTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimCareTeamTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimDetailTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimDetailTest.php index 1a9158df76..0e03a33559 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimDetailTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimDetailTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimDiagnosisTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimDiagnosisTest.php index 443a5a8b58..fc3c403364 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimDiagnosisTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimDiagnosisTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimInsuranceTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimInsuranceTest.php index a534f3123b..675816fb26 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimInsuranceTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimInsuranceTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimItemTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimItemTest.php index 49a4270c20..a0d101f2d1 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimItemTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimItemTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimPayeeTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimPayeeTest.php index db54935f1d..6a2a3f9ab7 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimPayeeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimPayeeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimProcedureTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimProcedureTest.php index cec4c88bfb..f9137902a4 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimProcedureTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimProcedureTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimRelatedTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimRelatedTest.php index f5be40258c..adecb8616f 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimRelatedTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimRelatedTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimSubDetailTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimSubDetailTest.php index b930e5089a..57380f3abc 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimSubDetailTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimSubDetailTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimSupportingInfoTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimSupportingInfoTest.php index 3444a2af9f..7cfcd80fa3 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimSupportingInfoTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimSupportingInfoTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseAddItemTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseAddItemTest.php index 882ae438be..5200a921ca 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseAddItemTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseAddItemTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseAdjudicationTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseAdjudicationTest.php index da40337bb9..1a82c0cc70 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseAdjudicationTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseAdjudicationTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseDetail1Test.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseDetail1Test.php index adeacfb84b..2eb0387a9b 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseDetail1Test.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseDetail1Test.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseDetailTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseDetailTest.php index ef461391f1..1f11787e81 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseDetailTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseDetailTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseErrorTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseErrorTest.php index 5b2fd95d8d..4c6864e178 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseErrorTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseErrorTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseInsuranceTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseInsuranceTest.php index b2e0242e44..0d4dba188b 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseInsuranceTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseInsuranceTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseItemTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseItemTest.php index 9cf8249486..ca9c315f59 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseItemTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseItemTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponsePaymentTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponsePaymentTest.php index 6faf410037..a43b9401ba 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponsePaymentTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponsePaymentTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseProcessNoteTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseProcessNoteTest.php index 7f5500c127..8217ffaf5f 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseProcessNoteTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseProcessNoteTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseSubDetail1Test.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseSubDetail1Test.php index e06d1a0969..7d89884d1c 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseSubDetail1Test.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseSubDetail1Test.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseSubDetailTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseSubDetailTest.php index 0bce9cf46b..220382d6ba 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseSubDetailTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseSubDetailTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseTotalTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseTotalTest.php index fa29f16b73..887cbd406e 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseTotalTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseTotalTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClinicalImpression/FHIRClinicalImpressionFindingTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClinicalImpression/FHIRClinicalImpressionFindingTest.php index ee383c8dbb..e33b53cf39 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClinicalImpression/FHIRClinicalImpressionFindingTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClinicalImpression/FHIRClinicalImpressionFindingTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClinicalImpression/FHIRClinicalImpressionInvestigationTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClinicalImpression/FHIRClinicalImpressionInvestigationTest.php index b80fdfde4d..908a009d2f 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClinicalImpression/FHIRClinicalImpressionInvestigationTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClinicalImpression/FHIRClinicalImpressionInvestigationTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCodeSystem/FHIRCodeSystemConceptTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCodeSystem/FHIRCodeSystemConceptTest.php index 218de49c24..ee7b51dc08 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCodeSystem/FHIRCodeSystemConceptTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCodeSystem/FHIRCodeSystemConceptTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCodeSystem/FHIRCodeSystemDesignationTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCodeSystem/FHIRCodeSystemDesignationTest.php index 26526aef80..fb926f0cfa 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCodeSystem/FHIRCodeSystemDesignationTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCodeSystem/FHIRCodeSystemDesignationTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCodeSystem/FHIRCodeSystemFilterTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCodeSystem/FHIRCodeSystemFilterTest.php index 4213c4c31f..d7d4f4f32f 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCodeSystem/FHIRCodeSystemFilterTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCodeSystem/FHIRCodeSystemFilterTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCodeSystem/FHIRCodeSystemProperty1Test.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCodeSystem/FHIRCodeSystemProperty1Test.php index 7cc3dda100..68805db0f0 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCodeSystem/FHIRCodeSystemProperty1Test.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCodeSystem/FHIRCodeSystemProperty1Test.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCodeSystem/FHIRCodeSystemPropertyTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCodeSystem/FHIRCodeSystemPropertyTest.php index 1c389f8d97..1d05cb38b8 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCodeSystem/FHIRCodeSystemPropertyTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCodeSystem/FHIRCodeSystemPropertyTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCommunication/FHIRCommunicationPayloadTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCommunication/FHIRCommunicationPayloadTest.php index ec2a4b1ca8..3984b04085 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCommunication/FHIRCommunicationPayloadTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCommunication/FHIRCommunicationPayloadTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCommunicationRequest/FHIRCommunicationRequestPayloadTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCommunicationRequest/FHIRCommunicationRequestPayloadTest.php index d936949ea6..b662e0e8d8 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCommunicationRequest/FHIRCommunicationRequestPayloadTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCommunicationRequest/FHIRCommunicationRequestPayloadTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCompartmentDefinition/FHIRCompartmentDefinitionResourceTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCompartmentDefinition/FHIRCompartmentDefinitionResourceTest.php index 190bf3a182..abcf2e5e6c 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCompartmentDefinition/FHIRCompartmentDefinitionResourceTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCompartmentDefinition/FHIRCompartmentDefinitionResourceTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRComposition/FHIRCompositionAttesterTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRComposition/FHIRCompositionAttesterTest.php index 092e16780f..239fbe6cb6 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRComposition/FHIRCompositionAttesterTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRComposition/FHIRCompositionAttesterTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRComposition/FHIRCompositionEventTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRComposition/FHIRCompositionEventTest.php index 7e481c9403..2e1b4a2f2d 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRComposition/FHIRCompositionEventTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRComposition/FHIRCompositionEventTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRComposition/FHIRCompositionRelatesToTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRComposition/FHIRCompositionRelatesToTest.php index 878cae195c..3dfafd0094 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRComposition/FHIRCompositionRelatesToTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRComposition/FHIRCompositionRelatesToTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRComposition/FHIRCompositionSectionTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRComposition/FHIRCompositionSectionTest.php index 6effdcde09..edba626574 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRComposition/FHIRCompositionSectionTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRComposition/FHIRCompositionSectionTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConceptMap/FHIRConceptMapDependsOnTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConceptMap/FHIRConceptMapDependsOnTest.php index 0147d63f7d..9550fbcbcb 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConceptMap/FHIRConceptMapDependsOnTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConceptMap/FHIRConceptMapDependsOnTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConceptMap/FHIRConceptMapElementTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConceptMap/FHIRConceptMapElementTest.php index 399da249a3..aeb9662d66 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConceptMap/FHIRConceptMapElementTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConceptMap/FHIRConceptMapElementTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConceptMap/FHIRConceptMapGroupTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConceptMap/FHIRConceptMapGroupTest.php index e95064b2cd..9bd6906cdd 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConceptMap/FHIRConceptMapGroupTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConceptMap/FHIRConceptMapGroupTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConceptMap/FHIRConceptMapTargetTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConceptMap/FHIRConceptMapTargetTest.php index 3662caa7b5..163f624cfc 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConceptMap/FHIRConceptMapTargetTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConceptMap/FHIRConceptMapTargetTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConceptMap/FHIRConceptMapUnmappedTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConceptMap/FHIRConceptMapUnmappedTest.php index 98ce6675de..a8a8dbbafe 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConceptMap/FHIRConceptMapUnmappedTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConceptMap/FHIRConceptMapUnmappedTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCondition/FHIRConditionEvidenceTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCondition/FHIRConditionEvidenceTest.php index bb5b4adc01..ce9846858c 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCondition/FHIRConditionEvidenceTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCondition/FHIRConditionEvidenceTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCondition/FHIRConditionStageTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCondition/FHIRConditionStageTest.php index 3d436210b2..7dfe3695e2 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCondition/FHIRConditionStageTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCondition/FHIRConditionStageTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConsent/FHIRConsentActorTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConsent/FHIRConsentActorTest.php index fc08ece020..7cdcef02aa 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConsent/FHIRConsentActorTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConsent/FHIRConsentActorTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConsent/FHIRConsentDataTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConsent/FHIRConsentDataTest.php index a3539e0708..1b3704d6b1 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConsent/FHIRConsentDataTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConsent/FHIRConsentDataTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConsent/FHIRConsentPolicyTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConsent/FHIRConsentPolicyTest.php index e5f807c646..8aa128d92c 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConsent/FHIRConsentPolicyTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConsent/FHIRConsentPolicyTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConsent/FHIRConsentProvisionTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConsent/FHIRConsentProvisionTest.php index 9efe051e90..c8632f3375 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConsent/FHIRConsentProvisionTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConsent/FHIRConsentProvisionTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConsent/FHIRConsentVerificationTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConsent/FHIRConsentVerificationTest.php index 748f2d11e4..deb4884b00 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConsent/FHIRConsentVerificationTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConsent/FHIRConsentVerificationTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractActionTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractActionTest.php index 983b45815f..9320bda722 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractActionTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractActionTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractAnswerTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractAnswerTest.php index 4ff7d4b5b7..ee7cdb7ebd 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractAnswerTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractAnswerTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractAssetTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractAssetTest.php index f3a1c5c357..84508dc6c6 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractAssetTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractAssetTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractContentDefinitionTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractContentDefinitionTest.php index 2b88c5de26..b02d4957fe 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractContentDefinitionTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractContentDefinitionTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractContextTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractContextTest.php index 9c4fe79389..a712387c9c 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractContextTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractContextTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractFriendlyTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractFriendlyTest.php index b0805900e5..ea1283bd79 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractFriendlyTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractFriendlyTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractLegalTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractLegalTest.php index 5f3e8d0c6b..d7b54f4c04 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractLegalTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractLegalTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractOfferTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractOfferTest.php index 96705a1410..d3ff030a67 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractOfferTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractOfferTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractPartyTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractPartyTest.php index 314740b24b..368d5b1565 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractPartyTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractPartyTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractRuleTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractRuleTest.php index eec4f7aff2..1261ef88be 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractRuleTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractRuleTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractSecurityLabelTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractSecurityLabelTest.php index d766b0b6d3..874bddaf2a 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractSecurityLabelTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractSecurityLabelTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractSignerTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractSignerTest.php index fe08859801..0c6c736bc8 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractSignerTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractSignerTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractSubjectTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractSubjectTest.php index d2e560978d..d7c33fdc2a 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractSubjectTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractSubjectTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractTermTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractTermTest.php index 716943bf8e..8dd62bd23e 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractTermTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractTermTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractValuedItemTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractValuedItemTest.php index c3406b08a2..f3f3601a90 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractValuedItemTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractValuedItemTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCoverage/FHIRCoverageClassTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCoverage/FHIRCoverageClassTest.php index 74187d446e..9c07c80b62 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCoverage/FHIRCoverageClassTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCoverage/FHIRCoverageClassTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCoverage/FHIRCoverageCostToBeneficiaryTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCoverage/FHIRCoverageCostToBeneficiaryTest.php index ecebb1322d..2e1e7796b4 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCoverage/FHIRCoverageCostToBeneficiaryTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCoverage/FHIRCoverageCostToBeneficiaryTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCoverage/FHIRCoverageExceptionTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCoverage/FHIRCoverageExceptionTest.php index 9785f3816e..0003959265 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCoverage/FHIRCoverageExceptionTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCoverage/FHIRCoverageExceptionTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCoverageEligibilityRequest/FHIRCoverageEligibilityRequestDiagnosisTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCoverageEligibilityRequest/FHIRCoverageEligibilityRequestDiagnosisTest.php index 0f6ca84363..2ff1dc1be2 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCoverageEligibilityRequest/FHIRCoverageEligibilityRequestDiagnosisTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCoverageEligibilityRequest/FHIRCoverageEligibilityRequestDiagnosisTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCoverageEligibilityRequest/FHIRCoverageEligibilityRequestInsuranceTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCoverageEligibilityRequest/FHIRCoverageEligibilityRequestInsuranceTest.php index 583461aba8..c3fadd1a2d 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCoverageEligibilityRequest/FHIRCoverageEligibilityRequestInsuranceTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCoverageEligibilityRequest/FHIRCoverageEligibilityRequestInsuranceTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCoverageEligibilityRequest/FHIRCoverageEligibilityRequestItemTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCoverageEligibilityRequest/FHIRCoverageEligibilityRequestItemTest.php index dffee1b5fe..ed1135604c 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCoverageEligibilityRequest/FHIRCoverageEligibilityRequestItemTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCoverageEligibilityRequest/FHIRCoverageEligibilityRequestItemTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCoverageEligibilityRequest/FHIRCoverageEligibilityRequestSupportingInfoTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCoverageEligibilityRequest/FHIRCoverageEligibilityRequestSupportingInfoTest.php index 76bf68ee87..2642f7860e 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCoverageEligibilityRequest/FHIRCoverageEligibilityRequestSupportingInfoTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCoverageEligibilityRequest/FHIRCoverageEligibilityRequestSupportingInfoTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCoverageEligibilityResponse/FHIRCoverageEligibilityResponseBenefitTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCoverageEligibilityResponse/FHIRCoverageEligibilityResponseBenefitTest.php index 7c0ff20b30..06039fff45 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCoverageEligibilityResponse/FHIRCoverageEligibilityResponseBenefitTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCoverageEligibilityResponse/FHIRCoverageEligibilityResponseBenefitTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCoverageEligibilityResponse/FHIRCoverageEligibilityResponseErrorTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCoverageEligibilityResponse/FHIRCoverageEligibilityResponseErrorTest.php index 718e19aba3..1f3c7c4241 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCoverageEligibilityResponse/FHIRCoverageEligibilityResponseErrorTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCoverageEligibilityResponse/FHIRCoverageEligibilityResponseErrorTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCoverageEligibilityResponse/FHIRCoverageEligibilityResponseInsuranceTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCoverageEligibilityResponse/FHIRCoverageEligibilityResponseInsuranceTest.php index 7ad7e708ae..80af4882ef 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCoverageEligibilityResponse/FHIRCoverageEligibilityResponseInsuranceTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCoverageEligibilityResponse/FHIRCoverageEligibilityResponseInsuranceTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCoverageEligibilityResponse/FHIRCoverageEligibilityResponseItemTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCoverageEligibilityResponse/FHIRCoverageEligibilityResponseItemTest.php index 402ff410fb..5b10bebd63 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCoverageEligibilityResponse/FHIRCoverageEligibilityResponseItemTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCoverageEligibilityResponse/FHIRCoverageEligibilityResponseItemTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDetectedIssue/FHIRDetectedIssueEvidenceTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDetectedIssue/FHIRDetectedIssueEvidenceTest.php index 29f1dccd05..018d618df1 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDetectedIssue/FHIRDetectedIssueEvidenceTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDetectedIssue/FHIRDetectedIssueEvidenceTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDetectedIssue/FHIRDetectedIssueMitigationTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDetectedIssue/FHIRDetectedIssueMitigationTest.php index 4649b20769..4e52bc16cc 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDetectedIssue/FHIRDetectedIssueMitigationTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDetectedIssue/FHIRDetectedIssueMitigationTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDevice/FHIRDeviceDeviceNameTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDevice/FHIRDeviceDeviceNameTest.php index b3f82956a0..8b6306afa2 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDevice/FHIRDeviceDeviceNameTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDevice/FHIRDeviceDeviceNameTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDevice/FHIRDevicePropertyTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDevice/FHIRDevicePropertyTest.php index 42ccee2e77..ca21392d1b 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDevice/FHIRDevicePropertyTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDevice/FHIRDevicePropertyTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDevice/FHIRDeviceSpecializationTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDevice/FHIRDeviceSpecializationTest.php index 3c28b45405..afdb30d70f 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDevice/FHIRDeviceSpecializationTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDevice/FHIRDeviceSpecializationTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDevice/FHIRDeviceUdiCarrierTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDevice/FHIRDeviceUdiCarrierTest.php index c1b1f28703..82797200d5 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDevice/FHIRDeviceUdiCarrierTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDevice/FHIRDeviceUdiCarrierTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDevice/FHIRDeviceVersionTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDevice/FHIRDeviceVersionTest.php index 4ff1e39167..352cba7b93 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDevice/FHIRDeviceVersionTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDevice/FHIRDeviceVersionTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDeviceDefinition/FHIRDeviceDefinitionCapabilityTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDeviceDefinition/FHIRDeviceDefinitionCapabilityTest.php index 3ca39aea4c..b20f40fe49 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDeviceDefinition/FHIRDeviceDefinitionCapabilityTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDeviceDefinition/FHIRDeviceDefinitionCapabilityTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDeviceDefinition/FHIRDeviceDefinitionDeviceNameTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDeviceDefinition/FHIRDeviceDefinitionDeviceNameTest.php index d1710fd330..f9f632a447 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDeviceDefinition/FHIRDeviceDefinitionDeviceNameTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDeviceDefinition/FHIRDeviceDefinitionDeviceNameTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDeviceDefinition/FHIRDeviceDefinitionMaterialTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDeviceDefinition/FHIRDeviceDefinitionMaterialTest.php index 2ebf7ef212..c22bc41968 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDeviceDefinition/FHIRDeviceDefinitionMaterialTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDeviceDefinition/FHIRDeviceDefinitionMaterialTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDeviceDefinition/FHIRDeviceDefinitionPropertyTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDeviceDefinition/FHIRDeviceDefinitionPropertyTest.php index ac50b28ec5..81a54cefbc 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDeviceDefinition/FHIRDeviceDefinitionPropertyTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDeviceDefinition/FHIRDeviceDefinitionPropertyTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDeviceDefinition/FHIRDeviceDefinitionSpecializationTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDeviceDefinition/FHIRDeviceDefinitionSpecializationTest.php index 190f284ca5..994b9f0cb6 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDeviceDefinition/FHIRDeviceDefinitionSpecializationTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDeviceDefinition/FHIRDeviceDefinitionSpecializationTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDeviceDefinition/FHIRDeviceDefinitionUdiDeviceIdentifierTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDeviceDefinition/FHIRDeviceDefinitionUdiDeviceIdentifierTest.php index ea71d01317..91e1a47f57 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDeviceDefinition/FHIRDeviceDefinitionUdiDeviceIdentifierTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDeviceDefinition/FHIRDeviceDefinitionUdiDeviceIdentifierTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDeviceMetric/FHIRDeviceMetricCalibrationTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDeviceMetric/FHIRDeviceMetricCalibrationTest.php index f47a537201..f1d12c7da3 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDeviceMetric/FHIRDeviceMetricCalibrationTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDeviceMetric/FHIRDeviceMetricCalibrationTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDeviceRequest/FHIRDeviceRequestParameterTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDeviceRequest/FHIRDeviceRequestParameterTest.php index b0d03e9773..87d641814d 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDeviceRequest/FHIRDeviceRequestParameterTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDeviceRequest/FHIRDeviceRequestParameterTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDiagnosticReport/FHIRDiagnosticReportMediaTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDiagnosticReport/FHIRDiagnosticReportMediaTest.php index 900a86d429..a90e140401 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDiagnosticReport/FHIRDiagnosticReportMediaTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDiagnosticReport/FHIRDiagnosticReportMediaTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDocumentManifest/FHIRDocumentManifestRelatedTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDocumentManifest/FHIRDocumentManifestRelatedTest.php index f78de0a2e8..3c0c895466 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDocumentManifest/FHIRDocumentManifestRelatedTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDocumentManifest/FHIRDocumentManifestRelatedTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDocumentReference/FHIRDocumentReferenceContentTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDocumentReference/FHIRDocumentReferenceContentTest.php index f2a0fd5031..de284b79f9 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDocumentReference/FHIRDocumentReferenceContentTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDocumentReference/FHIRDocumentReferenceContentTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDocumentReference/FHIRDocumentReferenceContextTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDocumentReference/FHIRDocumentReferenceContextTest.php index 719a2880b1..763a19cf66 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDocumentReference/FHIRDocumentReferenceContextTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDocumentReference/FHIRDocumentReferenceContextTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDocumentReference/FHIRDocumentReferenceRelatesToTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDocumentReference/FHIRDocumentReferenceRelatesToTest.php index 640d8c7ed8..8f595974e6 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDocumentReference/FHIRDocumentReferenceRelatesToTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDocumentReference/FHIRDocumentReferenceRelatesToTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDosage/FHIRDosageDoseAndRateTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDosage/FHIRDosageDoseAndRateTest.php index 2ab3de34c3..636c5e4b41 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDosage/FHIRDosageDoseAndRateTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDosage/FHIRDosageDoseAndRateTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDosageTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDosageTest.php index 876e7d59e9..e3e6eaa8bf 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDosageTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDosageTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIREffectEvidenceSynthesis/FHIREffectEvidenceSynthesisCertaintySubcomponentTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIREffectEvidenceSynthesis/FHIREffectEvidenceSynthesisCertaintySubcomponentTest.php index 328e10afea..dc43653d8c 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIREffectEvidenceSynthesis/FHIREffectEvidenceSynthesisCertaintySubcomponentTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIREffectEvidenceSynthesis/FHIREffectEvidenceSynthesisCertaintySubcomponentTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIREffectEvidenceSynthesis/FHIREffectEvidenceSynthesisCertaintyTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIREffectEvidenceSynthesis/FHIREffectEvidenceSynthesisCertaintyTest.php index f3768ca1cd..4fc55b92b7 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIREffectEvidenceSynthesis/FHIREffectEvidenceSynthesisCertaintyTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIREffectEvidenceSynthesis/FHIREffectEvidenceSynthesisCertaintyTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIREffectEvidenceSynthesis/FHIREffectEvidenceSynthesisEffectEstimateTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIREffectEvidenceSynthesis/FHIREffectEvidenceSynthesisEffectEstimateTest.php index 592fa0e222..7698093bb9 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIREffectEvidenceSynthesis/FHIREffectEvidenceSynthesisEffectEstimateTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIREffectEvidenceSynthesis/FHIREffectEvidenceSynthesisEffectEstimateTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIREffectEvidenceSynthesis/FHIREffectEvidenceSynthesisPrecisionEstimateTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIREffectEvidenceSynthesis/FHIREffectEvidenceSynthesisPrecisionEstimateTest.php index 38071ee5e9..8e57f1dd2d 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIREffectEvidenceSynthesis/FHIREffectEvidenceSynthesisPrecisionEstimateTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIREffectEvidenceSynthesis/FHIREffectEvidenceSynthesisPrecisionEstimateTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIREffectEvidenceSynthesis/FHIREffectEvidenceSynthesisResultsByExposureTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIREffectEvidenceSynthesis/FHIREffectEvidenceSynthesisResultsByExposureTest.php index 2b4aa8e295..75a8089d5f 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIREffectEvidenceSynthesis/FHIREffectEvidenceSynthesisResultsByExposureTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIREffectEvidenceSynthesis/FHIREffectEvidenceSynthesisResultsByExposureTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIREffectEvidenceSynthesis/FHIREffectEvidenceSynthesisSampleSizeTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIREffectEvidenceSynthesis/FHIREffectEvidenceSynthesisSampleSizeTest.php index cfa2ddf24e..7a1c6cbbbc 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIREffectEvidenceSynthesis/FHIREffectEvidenceSynthesisSampleSizeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIREffectEvidenceSynthesis/FHIREffectEvidenceSynthesisSampleSizeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRElementDefinition/FHIRElementDefinitionBaseTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRElementDefinition/FHIRElementDefinitionBaseTest.php index bce58972fd..0370b0b17d 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRElementDefinition/FHIRElementDefinitionBaseTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRElementDefinition/FHIRElementDefinitionBaseTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRElementDefinition/FHIRElementDefinitionBindingTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRElementDefinition/FHIRElementDefinitionBindingTest.php index 9f5ab1a56b..0572fdbcc1 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRElementDefinition/FHIRElementDefinitionBindingTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRElementDefinition/FHIRElementDefinitionBindingTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRElementDefinition/FHIRElementDefinitionConstraintTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRElementDefinition/FHIRElementDefinitionConstraintTest.php index 181e8a7db8..4029b7bf19 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRElementDefinition/FHIRElementDefinitionConstraintTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRElementDefinition/FHIRElementDefinitionConstraintTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRElementDefinition/FHIRElementDefinitionDiscriminatorTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRElementDefinition/FHIRElementDefinitionDiscriminatorTest.php index 19a1e216e5..30749303fd 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRElementDefinition/FHIRElementDefinitionDiscriminatorTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRElementDefinition/FHIRElementDefinitionDiscriminatorTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRElementDefinition/FHIRElementDefinitionExampleTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRElementDefinition/FHIRElementDefinitionExampleTest.php index 43b3936709..54da5e7056 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRElementDefinition/FHIRElementDefinitionExampleTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRElementDefinition/FHIRElementDefinitionExampleTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRElementDefinition/FHIRElementDefinitionMappingTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRElementDefinition/FHIRElementDefinitionMappingTest.php index 7cb49e0025..f3345c0fed 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRElementDefinition/FHIRElementDefinitionMappingTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRElementDefinition/FHIRElementDefinitionMappingTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRElementDefinition/FHIRElementDefinitionSlicingTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRElementDefinition/FHIRElementDefinitionSlicingTest.php index 824c68affb..3d6ba0dceb 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRElementDefinition/FHIRElementDefinitionSlicingTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRElementDefinition/FHIRElementDefinitionSlicingTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRElementDefinition/FHIRElementDefinitionTypeTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRElementDefinition/FHIRElementDefinitionTypeTest.php index bbb169d433..ecada3f7b5 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRElementDefinition/FHIRElementDefinitionTypeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRElementDefinition/FHIRElementDefinitionTypeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRElementDefinitionTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRElementDefinitionTest.php index ff91386039..e495ce1cf6 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRElementDefinitionTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRElementDefinitionTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIREncounter/FHIREncounterClassHistoryTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIREncounter/FHIREncounterClassHistoryTest.php index da02eefdf0..194fad44da 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIREncounter/FHIREncounterClassHistoryTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIREncounter/FHIREncounterClassHistoryTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIREncounter/FHIREncounterDiagnosisTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIREncounter/FHIREncounterDiagnosisTest.php index 131d01380d..c3f1dafee4 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIREncounter/FHIREncounterDiagnosisTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIREncounter/FHIREncounterDiagnosisTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIREncounter/FHIREncounterHospitalizationTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIREncounter/FHIREncounterHospitalizationTest.php index 182cd0017e..f22570d201 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIREncounter/FHIREncounterHospitalizationTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIREncounter/FHIREncounterHospitalizationTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIREncounter/FHIREncounterLocationTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIREncounter/FHIREncounterLocationTest.php index 7a102c3aaf..2723de27ed 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIREncounter/FHIREncounterLocationTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIREncounter/FHIREncounterLocationTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIREncounter/FHIREncounterParticipantTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIREncounter/FHIREncounterParticipantTest.php index 025bebae32..29b81762a6 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIREncounter/FHIREncounterParticipantTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIREncounter/FHIREncounterParticipantTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIREncounter/FHIREncounterStatusHistoryTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIREncounter/FHIREncounterStatusHistoryTest.php index 3bdb42f084..fde4eed8a5 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIREncounter/FHIREncounterStatusHistoryTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIREncounter/FHIREncounterStatusHistoryTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIREpisodeOfCare/FHIREpisodeOfCareDiagnosisTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIREpisodeOfCare/FHIREpisodeOfCareDiagnosisTest.php index 6761095251..5965e2ed49 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIREpisodeOfCare/FHIREpisodeOfCareDiagnosisTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIREpisodeOfCare/FHIREpisodeOfCareDiagnosisTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIREpisodeOfCare/FHIREpisodeOfCareStatusHistoryTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIREpisodeOfCare/FHIREpisodeOfCareStatusHistoryTest.php index b601a9846a..16e32b5a75 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIREpisodeOfCare/FHIREpisodeOfCareStatusHistoryTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIREpisodeOfCare/FHIREpisodeOfCareStatusHistoryTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIREvidenceVariable/FHIREvidenceVariableCharacteristicTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIREvidenceVariable/FHIREvidenceVariableCharacteristicTest.php index a91c0289e7..4fd81c123b 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIREvidenceVariable/FHIREvidenceVariableCharacteristicTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIREvidenceVariable/FHIREvidenceVariableCharacteristicTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExampleScenario/FHIRExampleScenarioActorTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExampleScenario/FHIRExampleScenarioActorTest.php index 79ae552b4a..06797df6fc 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExampleScenario/FHIRExampleScenarioActorTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExampleScenario/FHIRExampleScenarioActorTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExampleScenario/FHIRExampleScenarioAlternativeTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExampleScenario/FHIRExampleScenarioAlternativeTest.php index 3d51673999..2343873b58 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExampleScenario/FHIRExampleScenarioAlternativeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExampleScenario/FHIRExampleScenarioAlternativeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExampleScenario/FHIRExampleScenarioContainedInstanceTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExampleScenario/FHIRExampleScenarioContainedInstanceTest.php index 50c2885a97..6f0318ff78 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExampleScenario/FHIRExampleScenarioContainedInstanceTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExampleScenario/FHIRExampleScenarioContainedInstanceTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExampleScenario/FHIRExampleScenarioInstanceTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExampleScenario/FHIRExampleScenarioInstanceTest.php index c19de70ebc..d8d39f1821 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExampleScenario/FHIRExampleScenarioInstanceTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExampleScenario/FHIRExampleScenarioInstanceTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExampleScenario/FHIRExampleScenarioOperationTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExampleScenario/FHIRExampleScenarioOperationTest.php index b1ce3de8ff..53696febb5 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExampleScenario/FHIRExampleScenarioOperationTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExampleScenario/FHIRExampleScenarioOperationTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExampleScenario/FHIRExampleScenarioProcessTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExampleScenario/FHIRExampleScenarioProcessTest.php index 17de52994c..c36b92a8d1 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExampleScenario/FHIRExampleScenarioProcessTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExampleScenario/FHIRExampleScenarioProcessTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExampleScenario/FHIRExampleScenarioStepTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExampleScenario/FHIRExampleScenarioStepTest.php index 7668f5f22e..77a56cc9e8 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExampleScenario/FHIRExampleScenarioStepTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExampleScenario/FHIRExampleScenarioStepTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExampleScenario/FHIRExampleScenarioVersionTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExampleScenario/FHIRExampleScenarioVersionTest.php index f567e5adfc..9ea3b8c10a 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExampleScenario/FHIRExampleScenarioVersionTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExampleScenario/FHIRExampleScenarioVersionTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitAccidentTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitAccidentTest.php index c120f7e2b2..ceed135791 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitAccidentTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitAccidentTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitAddItemTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitAddItemTest.php index a24a37afa6..f12dad5965 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitAddItemTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitAddItemTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitAdjudicationTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitAdjudicationTest.php index 8c9b2a482d..702f7539d2 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitAdjudicationTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitAdjudicationTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitBenefitBalanceTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitBenefitBalanceTest.php index 73d4a99e67..1b6a22aaa1 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitBenefitBalanceTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitBenefitBalanceTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitCareTeamTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitCareTeamTest.php index a8a1d67657..6c44a9422d 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitCareTeamTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitCareTeamTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitDetail1Test.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitDetail1Test.php index 08432d4a91..d24917325a 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitDetail1Test.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitDetail1Test.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitDetailTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitDetailTest.php index 5e8bc85028..e7d8fc4a9f 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitDetailTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitDetailTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitDiagnosisTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitDiagnosisTest.php index 5388ee13d5..0384bf5d38 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitDiagnosisTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitDiagnosisTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitFinancialTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitFinancialTest.php index be9b1e1086..346ae6815c 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitFinancialTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitFinancialTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitInsuranceTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitInsuranceTest.php index 7c91bffbe1..bbba51c4dd 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitInsuranceTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitInsuranceTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitItemTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitItemTest.php index 5a4f776e1a..f253562729 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitItemTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitItemTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitPayeeTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitPayeeTest.php index f205fdaaba..4b5eac4070 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitPayeeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitPayeeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitPaymentTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitPaymentTest.php index 94d82ca8fd..7b56b08720 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitPaymentTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitPaymentTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitProcedureTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitProcedureTest.php index 1edd9c5e52..f1005ff036 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitProcedureTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitProcedureTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitProcessNoteTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitProcessNoteTest.php index 1101ed599e..e51dcfce08 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitProcessNoteTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitProcessNoteTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitRelatedTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitRelatedTest.php index 54ab70f7b5..e524e90457 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitRelatedTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitRelatedTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitSubDetail1Test.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitSubDetail1Test.php index 39c135c989..5ebe4307e0 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitSubDetail1Test.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitSubDetail1Test.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitSubDetailTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitSubDetailTest.php index af94ab829f..829ce9db47 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitSubDetailTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitSubDetailTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitSupportingInfoTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitSupportingInfoTest.php index a17c7e0ee3..9caaa26db0 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitSupportingInfoTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitSupportingInfoTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitTotalTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitTotalTest.php index 7863c1e3af..3a85a70433 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitTotalTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitTotalTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRFamilyMemberHistory/FHIRFamilyMemberHistoryConditionTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRFamilyMemberHistory/FHIRFamilyMemberHistoryConditionTest.php index faf85a2e95..f32369df53 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRFamilyMemberHistory/FHIRFamilyMemberHistoryConditionTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRFamilyMemberHistory/FHIRFamilyMemberHistoryConditionTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRGoal/FHIRGoalTargetTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRGoal/FHIRGoalTargetTest.php index 4f790ac752..009376bece 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRGoal/FHIRGoalTargetTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRGoal/FHIRGoalTargetTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRGraphDefinition/FHIRGraphDefinitionCompartmentTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRGraphDefinition/FHIRGraphDefinitionCompartmentTest.php index d984d7528f..7a99581747 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRGraphDefinition/FHIRGraphDefinitionCompartmentTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRGraphDefinition/FHIRGraphDefinitionCompartmentTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRGraphDefinition/FHIRGraphDefinitionLinkTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRGraphDefinition/FHIRGraphDefinitionLinkTest.php index bf5ed52b7f..6fc0faf85d 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRGraphDefinition/FHIRGraphDefinitionLinkTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRGraphDefinition/FHIRGraphDefinitionLinkTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRGraphDefinition/FHIRGraphDefinitionTargetTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRGraphDefinition/FHIRGraphDefinitionTargetTest.php index 40d79b4c4b..b1e15429d4 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRGraphDefinition/FHIRGraphDefinitionTargetTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRGraphDefinition/FHIRGraphDefinitionTargetTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRGroup/FHIRGroupCharacteristicTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRGroup/FHIRGroupCharacteristicTest.php index bd25729449..0ef8700453 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRGroup/FHIRGroupCharacteristicTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRGroup/FHIRGroupCharacteristicTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRGroup/FHIRGroupMemberTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRGroup/FHIRGroupMemberTest.php index 63246a6e8f..790dddd348 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRGroup/FHIRGroupMemberTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRGroup/FHIRGroupMemberTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRHealthcareService/FHIRHealthcareServiceAvailableTimeTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRHealthcareService/FHIRHealthcareServiceAvailableTimeTest.php index 7c2dee2c6a..75663fed24 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRHealthcareService/FHIRHealthcareServiceAvailableTimeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRHealthcareService/FHIRHealthcareServiceAvailableTimeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRHealthcareService/FHIRHealthcareServiceEligibilityTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRHealthcareService/FHIRHealthcareServiceEligibilityTest.php index e6973a41c1..ee7e4fa420 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRHealthcareService/FHIRHealthcareServiceEligibilityTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRHealthcareService/FHIRHealthcareServiceEligibilityTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRHealthcareService/FHIRHealthcareServiceNotAvailableTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRHealthcareService/FHIRHealthcareServiceNotAvailableTest.php index f7544007b7..db72de944c 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRHealthcareService/FHIRHealthcareServiceNotAvailableTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRHealthcareService/FHIRHealthcareServiceNotAvailableTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImagingStudy/FHIRImagingStudyInstanceTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImagingStudy/FHIRImagingStudyInstanceTest.php index 82ad8703e2..ad8e22e0e9 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImagingStudy/FHIRImagingStudyInstanceTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImagingStudy/FHIRImagingStudyInstanceTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImagingStudy/FHIRImagingStudyPerformerTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImagingStudy/FHIRImagingStudyPerformerTest.php index 5c1d61fb3d..5daef72273 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImagingStudy/FHIRImagingStudyPerformerTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImagingStudy/FHIRImagingStudyPerformerTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImagingStudy/FHIRImagingStudySeriesTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImagingStudy/FHIRImagingStudySeriesTest.php index 7574879fd5..f7965cbf4a 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImagingStudy/FHIRImagingStudySeriesTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImagingStudy/FHIRImagingStudySeriesTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImmunization/FHIRImmunizationEducationTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImmunization/FHIRImmunizationEducationTest.php index b1990b9ffd..6599a0d5c3 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImmunization/FHIRImmunizationEducationTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImmunization/FHIRImmunizationEducationTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImmunization/FHIRImmunizationPerformerTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImmunization/FHIRImmunizationPerformerTest.php index ffabc89c96..a21f4cceaa 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImmunization/FHIRImmunizationPerformerTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImmunization/FHIRImmunizationPerformerTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImmunization/FHIRImmunizationProtocolAppliedTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImmunization/FHIRImmunizationProtocolAppliedTest.php index cbe77fd78f..18d4edef32 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImmunization/FHIRImmunizationProtocolAppliedTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImmunization/FHIRImmunizationProtocolAppliedTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImmunization/FHIRImmunizationReactionTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImmunization/FHIRImmunizationReactionTest.php index 66236fcfbe..b23ddf981d 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImmunization/FHIRImmunizationReactionTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImmunization/FHIRImmunizationReactionTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImmunizationRecommendation/FHIRImmunizationRecommendationDateCriterionTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImmunizationRecommendation/FHIRImmunizationRecommendationDateCriterionTest.php index c34b35ae6b..b5ff28cfa0 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImmunizationRecommendation/FHIRImmunizationRecommendationDateCriterionTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImmunizationRecommendation/FHIRImmunizationRecommendationDateCriterionTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImmunizationRecommendation/FHIRImmunizationRecommendationRecommendationTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImmunizationRecommendation/FHIRImmunizationRecommendationRecommendationTest.php index ff009325e1..f2ac8db6ed 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImmunizationRecommendation/FHIRImmunizationRecommendationRecommendationTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImmunizationRecommendation/FHIRImmunizationRecommendationRecommendationTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuideDefinitionTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuideDefinitionTest.php index 28fc70d64b..0f19ad1ed1 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuideDefinitionTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuideDefinitionTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuideDependsOnTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuideDependsOnTest.php index 3d7f5aad63..c785ad89a4 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuideDependsOnTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuideDependsOnTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuideGlobalTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuideGlobalTest.php index 58c7dd8dd3..4e6056883c 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuideGlobalTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuideGlobalTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuideGroupingTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuideGroupingTest.php index 60ca81ca7d..2db41bd451 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuideGroupingTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuideGroupingTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuideManifestTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuideManifestTest.php index 87c33d9e95..b4b9dece63 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuideManifestTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuideManifestTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuidePage1Test.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuidePage1Test.php index a42bda0b32..b6688629c8 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuidePage1Test.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuidePage1Test.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuidePageTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuidePageTest.php index 0f92388aa9..df017ae2e1 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuidePageTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuidePageTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuideParameterTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuideParameterTest.php index 3eb4bcc235..859dca710b 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuideParameterTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuideParameterTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuideResource1Test.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuideResource1Test.php index a7e6a40067..757315fca1 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuideResource1Test.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuideResource1Test.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuideResourceTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuideResourceTest.php index fd2e7e43f4..0f19cfcb26 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuideResourceTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuideResourceTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuideTemplateTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuideTemplateTest.php index 118684791d..61e2279307 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuideTemplateTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuideTemplateTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRInsurancePlan/FHIRInsurancePlanBenefit1Test.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRInsurancePlan/FHIRInsurancePlanBenefit1Test.php index 4ab747d8c0..e5ac2aac38 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRInsurancePlan/FHIRInsurancePlanBenefit1Test.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRInsurancePlan/FHIRInsurancePlanBenefit1Test.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRInsurancePlan/FHIRInsurancePlanBenefitTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRInsurancePlan/FHIRInsurancePlanBenefitTest.php index e109f1b85d..8506b63c33 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRInsurancePlan/FHIRInsurancePlanBenefitTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRInsurancePlan/FHIRInsurancePlanBenefitTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRInsurancePlan/FHIRInsurancePlanContactTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRInsurancePlan/FHIRInsurancePlanContactTest.php index 52cd84989f..9f8a142b6e 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRInsurancePlan/FHIRInsurancePlanContactTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRInsurancePlan/FHIRInsurancePlanContactTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRInsurancePlan/FHIRInsurancePlanCostTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRInsurancePlan/FHIRInsurancePlanCostTest.php index 522969e0b0..3b03a4b5de 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRInsurancePlan/FHIRInsurancePlanCostTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRInsurancePlan/FHIRInsurancePlanCostTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRInsurancePlan/FHIRInsurancePlanCoverageTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRInsurancePlan/FHIRInsurancePlanCoverageTest.php index ed39b07a89..26a5a7d73d 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRInsurancePlan/FHIRInsurancePlanCoverageTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRInsurancePlan/FHIRInsurancePlanCoverageTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRInsurancePlan/FHIRInsurancePlanGeneralCostTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRInsurancePlan/FHIRInsurancePlanGeneralCostTest.php index c8a1205eb9..17c1d58e72 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRInsurancePlan/FHIRInsurancePlanGeneralCostTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRInsurancePlan/FHIRInsurancePlanGeneralCostTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRInsurancePlan/FHIRInsurancePlanLimitTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRInsurancePlan/FHIRInsurancePlanLimitTest.php index 105074c5a2..739bede323 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRInsurancePlan/FHIRInsurancePlanLimitTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRInsurancePlan/FHIRInsurancePlanLimitTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRInsurancePlan/FHIRInsurancePlanPlanTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRInsurancePlan/FHIRInsurancePlanPlanTest.php index 8188a19fd0..651831b3fc 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRInsurancePlan/FHIRInsurancePlanPlanTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRInsurancePlan/FHIRInsurancePlanPlanTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRInsurancePlan/FHIRInsurancePlanSpecificCostTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRInsurancePlan/FHIRInsurancePlanSpecificCostTest.php index e030ac5729..465164eac9 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRInsurancePlan/FHIRInsurancePlanSpecificCostTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRInsurancePlan/FHIRInsurancePlanSpecificCostTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRInvoice/FHIRInvoiceLineItemTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRInvoice/FHIRInvoiceLineItemTest.php index 1a99a3a735..29267753ec 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRInvoice/FHIRInvoiceLineItemTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRInvoice/FHIRInvoiceLineItemTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRInvoice/FHIRInvoiceParticipantTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRInvoice/FHIRInvoiceParticipantTest.php index fcf34dc737..f23662585b 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRInvoice/FHIRInvoiceParticipantTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRInvoice/FHIRInvoiceParticipantTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRInvoice/FHIRInvoicePriceComponentTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRInvoice/FHIRInvoicePriceComponentTest.php index d52ad33504..ea01c71e00 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRInvoice/FHIRInvoicePriceComponentTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRInvoice/FHIRInvoicePriceComponentTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRLinkage/FHIRLinkageItemTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRLinkage/FHIRLinkageItemTest.php index ca1d229524..3ed1cbf032 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRLinkage/FHIRLinkageItemTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRLinkage/FHIRLinkageItemTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRList/FHIRListEntryTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRList/FHIRListEntryTest.php index 33bed991e5..d9e7c99c73 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRList/FHIRListEntryTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRList/FHIRListEntryTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRLocation/FHIRLocationHoursOfOperationTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRLocation/FHIRLocationHoursOfOperationTest.php index 3c7a242d79..240f1ffb27 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRLocation/FHIRLocationHoursOfOperationTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRLocation/FHIRLocationHoursOfOperationTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRLocation/FHIRLocationPositionTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRLocation/FHIRLocationPositionTest.php index c9a223e3f9..719efe2245 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRLocation/FHIRLocationPositionTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRLocation/FHIRLocationPositionTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMarketingStatusTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMarketingStatusTest.php index c94d104027..6def7a18a7 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMarketingStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMarketingStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMeasure/FHIRMeasureComponentTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMeasure/FHIRMeasureComponentTest.php index a91145be95..ac4bcafd13 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMeasure/FHIRMeasureComponentTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMeasure/FHIRMeasureComponentTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMeasure/FHIRMeasureGroupTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMeasure/FHIRMeasureGroupTest.php index 70dd27b1d1..b495a75e30 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMeasure/FHIRMeasureGroupTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMeasure/FHIRMeasureGroupTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMeasure/FHIRMeasurePopulationTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMeasure/FHIRMeasurePopulationTest.php index 0d2488436f..1283f9b353 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMeasure/FHIRMeasurePopulationTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMeasure/FHIRMeasurePopulationTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMeasure/FHIRMeasureStratifierTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMeasure/FHIRMeasureStratifierTest.php index 7b0c49c98a..6b6bc977c4 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMeasure/FHIRMeasureStratifierTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMeasure/FHIRMeasureStratifierTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMeasure/FHIRMeasureSupplementalDataTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMeasure/FHIRMeasureSupplementalDataTest.php index 3431173aa6..f788394cb6 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMeasure/FHIRMeasureSupplementalDataTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMeasure/FHIRMeasureSupplementalDataTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMeasureReport/FHIRMeasureReportComponentTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMeasureReport/FHIRMeasureReportComponentTest.php index b2bd05a244..0b9524186b 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMeasureReport/FHIRMeasureReportComponentTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMeasureReport/FHIRMeasureReportComponentTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMeasureReport/FHIRMeasureReportGroupTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMeasureReport/FHIRMeasureReportGroupTest.php index 85fd02e4e4..e2bbadace7 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMeasureReport/FHIRMeasureReportGroupTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMeasureReport/FHIRMeasureReportGroupTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMeasureReport/FHIRMeasureReportPopulation1Test.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMeasureReport/FHIRMeasureReportPopulation1Test.php index e042ece238..04d0150cf7 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMeasureReport/FHIRMeasureReportPopulation1Test.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMeasureReport/FHIRMeasureReportPopulation1Test.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMeasureReport/FHIRMeasureReportPopulationTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMeasureReport/FHIRMeasureReportPopulationTest.php index 649793c4ce..f19f674a93 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMeasureReport/FHIRMeasureReportPopulationTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMeasureReport/FHIRMeasureReportPopulationTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMeasureReport/FHIRMeasureReportStratifierTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMeasureReport/FHIRMeasureReportStratifierTest.php index 8fa2dcee8c..f36128983d 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMeasureReport/FHIRMeasureReportStratifierTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMeasureReport/FHIRMeasureReportStratifierTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMeasureReport/FHIRMeasureReportStratumTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMeasureReport/FHIRMeasureReportStratumTest.php index 55b7fe2507..e3d3c8e211 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMeasureReport/FHIRMeasureReportStratumTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMeasureReport/FHIRMeasureReportStratumTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedication/FHIRMedicationBatchTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedication/FHIRMedicationBatchTest.php index 5dcccc7539..9c09efb4c3 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedication/FHIRMedicationBatchTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedication/FHIRMedicationBatchTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedication/FHIRMedicationIngredientTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedication/FHIRMedicationIngredientTest.php index 50c222b623..cf6da695ab 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedication/FHIRMedicationIngredientTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedication/FHIRMedicationIngredientTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationAdministration/FHIRMedicationAdministrationDosageTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationAdministration/FHIRMedicationAdministrationDosageTest.php index ae75157c10..ac2866e185 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationAdministration/FHIRMedicationAdministrationDosageTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationAdministration/FHIRMedicationAdministrationDosageTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationAdministration/FHIRMedicationAdministrationPerformerTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationAdministration/FHIRMedicationAdministrationPerformerTest.php index be6dca5900..3485a7e41a 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationAdministration/FHIRMedicationAdministrationPerformerTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationAdministration/FHIRMedicationAdministrationPerformerTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationDispense/FHIRMedicationDispensePerformerTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationDispense/FHIRMedicationDispensePerformerTest.php index 98011de9b9..c873363571 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationDispense/FHIRMedicationDispensePerformerTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationDispense/FHIRMedicationDispensePerformerTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationDispense/FHIRMedicationDispenseSubstitutionTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationDispense/FHIRMedicationDispenseSubstitutionTest.php index 7f7025c3c1..289cf8a31b 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationDispense/FHIRMedicationDispenseSubstitutionTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationDispense/FHIRMedicationDispenseSubstitutionTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationKnowledge/FHIRMedicationKnowledgeAdministrationGuidelinesTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationKnowledge/FHIRMedicationKnowledgeAdministrationGuidelinesTest.php index f2196a2853..97745cf8e8 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationKnowledge/FHIRMedicationKnowledgeAdministrationGuidelinesTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationKnowledge/FHIRMedicationKnowledgeAdministrationGuidelinesTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationKnowledge/FHIRMedicationKnowledgeCostTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationKnowledge/FHIRMedicationKnowledgeCostTest.php index fc20d7d9f9..e95b4d9b80 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationKnowledge/FHIRMedicationKnowledgeCostTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationKnowledge/FHIRMedicationKnowledgeCostTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationKnowledge/FHIRMedicationKnowledgeDosageTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationKnowledge/FHIRMedicationKnowledgeDosageTest.php index cd581b01be..0e1a4c1c4d 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationKnowledge/FHIRMedicationKnowledgeDosageTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationKnowledge/FHIRMedicationKnowledgeDosageTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationKnowledge/FHIRMedicationKnowledgeDrugCharacteristicTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationKnowledge/FHIRMedicationKnowledgeDrugCharacteristicTest.php index feef281333..ca991fd41d 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationKnowledge/FHIRMedicationKnowledgeDrugCharacteristicTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationKnowledge/FHIRMedicationKnowledgeDrugCharacteristicTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationKnowledge/FHIRMedicationKnowledgeIngredientTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationKnowledge/FHIRMedicationKnowledgeIngredientTest.php index 68b36672cd..7e344eebc7 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationKnowledge/FHIRMedicationKnowledgeIngredientTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationKnowledge/FHIRMedicationKnowledgeIngredientTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationKnowledge/FHIRMedicationKnowledgeKineticsTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationKnowledge/FHIRMedicationKnowledgeKineticsTest.php index 1ad5ce47aa..16e5695bd6 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationKnowledge/FHIRMedicationKnowledgeKineticsTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationKnowledge/FHIRMedicationKnowledgeKineticsTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationKnowledge/FHIRMedicationKnowledgeMaxDispenseTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationKnowledge/FHIRMedicationKnowledgeMaxDispenseTest.php index e50df70f53..a239d02ebf 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationKnowledge/FHIRMedicationKnowledgeMaxDispenseTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationKnowledge/FHIRMedicationKnowledgeMaxDispenseTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationKnowledge/FHIRMedicationKnowledgeMedicineClassificationTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationKnowledge/FHIRMedicationKnowledgeMedicineClassificationTest.php index 427bb00c16..4c49f9d467 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationKnowledge/FHIRMedicationKnowledgeMedicineClassificationTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationKnowledge/FHIRMedicationKnowledgeMedicineClassificationTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationKnowledge/FHIRMedicationKnowledgeMonitoringProgramTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationKnowledge/FHIRMedicationKnowledgeMonitoringProgramTest.php index fbbedd17f2..58dbfb1190 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationKnowledge/FHIRMedicationKnowledgeMonitoringProgramTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationKnowledge/FHIRMedicationKnowledgeMonitoringProgramTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationKnowledge/FHIRMedicationKnowledgeMonographTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationKnowledge/FHIRMedicationKnowledgeMonographTest.php index 3a013db2f0..361d822dbb 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationKnowledge/FHIRMedicationKnowledgeMonographTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationKnowledge/FHIRMedicationKnowledgeMonographTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationKnowledge/FHIRMedicationKnowledgePackagingTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationKnowledge/FHIRMedicationKnowledgePackagingTest.php index 8433940da0..d501da54ef 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationKnowledge/FHIRMedicationKnowledgePackagingTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationKnowledge/FHIRMedicationKnowledgePackagingTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationKnowledge/FHIRMedicationKnowledgePatientCharacteristicsTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationKnowledge/FHIRMedicationKnowledgePatientCharacteristicsTest.php index ca11464092..2839058fba 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationKnowledge/FHIRMedicationKnowledgePatientCharacteristicsTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationKnowledge/FHIRMedicationKnowledgePatientCharacteristicsTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationKnowledge/FHIRMedicationKnowledgeRegulatoryTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationKnowledge/FHIRMedicationKnowledgeRegulatoryTest.php index 282fc753e6..03bd0c1736 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationKnowledge/FHIRMedicationKnowledgeRegulatoryTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationKnowledge/FHIRMedicationKnowledgeRegulatoryTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationKnowledge/FHIRMedicationKnowledgeRelatedMedicationKnowledgeTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationKnowledge/FHIRMedicationKnowledgeRelatedMedicationKnowledgeTest.php index 11b316946d..52ce13101d 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationKnowledge/FHIRMedicationKnowledgeRelatedMedicationKnowledgeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationKnowledge/FHIRMedicationKnowledgeRelatedMedicationKnowledgeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationKnowledge/FHIRMedicationKnowledgeScheduleTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationKnowledge/FHIRMedicationKnowledgeScheduleTest.php index a1773d9073..b06e7e9be5 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationKnowledge/FHIRMedicationKnowledgeScheduleTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationKnowledge/FHIRMedicationKnowledgeScheduleTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationKnowledge/FHIRMedicationKnowledgeSubstitutionTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationKnowledge/FHIRMedicationKnowledgeSubstitutionTest.php index ba4ba8f080..5e7d12f845 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationKnowledge/FHIRMedicationKnowledgeSubstitutionTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationKnowledge/FHIRMedicationKnowledgeSubstitutionTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationRequest/FHIRMedicationRequestDispenseRequestTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationRequest/FHIRMedicationRequestDispenseRequestTest.php index 585deb845b..1cdb9e538d 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationRequest/FHIRMedicationRequestDispenseRequestTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationRequest/FHIRMedicationRequestDispenseRequestTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationRequest/FHIRMedicationRequestInitialFillTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationRequest/FHIRMedicationRequestInitialFillTest.php index 16903961c4..29e34265ca 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationRequest/FHIRMedicationRequestInitialFillTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationRequest/FHIRMedicationRequestInitialFillTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationRequest/FHIRMedicationRequestSubstitutionTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationRequest/FHIRMedicationRequestSubstitutionTest.php index 40256ae0b8..a7da51d966 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationRequest/FHIRMedicationRequestSubstitutionTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationRequest/FHIRMedicationRequestSubstitutionTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicinalProduct/FHIRMedicinalProductCountryLanguageTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicinalProduct/FHIRMedicinalProductCountryLanguageTest.php index 343fee9a20..17a7abac7f 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicinalProduct/FHIRMedicinalProductCountryLanguageTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicinalProduct/FHIRMedicinalProductCountryLanguageTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicinalProduct/FHIRMedicinalProductManufacturingBusinessOperationTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicinalProduct/FHIRMedicinalProductManufacturingBusinessOperationTest.php index 708dfaac17..004e0bfb23 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicinalProduct/FHIRMedicinalProductManufacturingBusinessOperationTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicinalProduct/FHIRMedicinalProductManufacturingBusinessOperationTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicinalProduct/FHIRMedicinalProductNamePartTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicinalProduct/FHIRMedicinalProductNamePartTest.php index 6b3315fa4d..8f01f1e71d 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicinalProduct/FHIRMedicinalProductNamePartTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicinalProduct/FHIRMedicinalProductNamePartTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicinalProduct/FHIRMedicinalProductNameTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicinalProduct/FHIRMedicinalProductNameTest.php index 54fe89ed05..d6df4fb70e 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicinalProduct/FHIRMedicinalProductNameTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicinalProduct/FHIRMedicinalProductNameTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicinalProduct/FHIRMedicinalProductSpecialDesignationTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicinalProduct/FHIRMedicinalProductSpecialDesignationTest.php index 644495c160..64e32921f9 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicinalProduct/FHIRMedicinalProductSpecialDesignationTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicinalProduct/FHIRMedicinalProductSpecialDesignationTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicinalProductAuthorization/FHIRMedicinalProductAuthorizationJurisdictionalAuthorizationTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicinalProductAuthorization/FHIRMedicinalProductAuthorizationJurisdictionalAuthorizationTest.php index d6ffa91d8c..35bb939e5b 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicinalProductAuthorization/FHIRMedicinalProductAuthorizationJurisdictionalAuthorizationTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicinalProductAuthorization/FHIRMedicinalProductAuthorizationJurisdictionalAuthorizationTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicinalProductAuthorization/FHIRMedicinalProductAuthorizationProcedureTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicinalProductAuthorization/FHIRMedicinalProductAuthorizationProcedureTest.php index b125612f30..2537fa8dc5 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicinalProductAuthorization/FHIRMedicinalProductAuthorizationProcedureTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicinalProductAuthorization/FHIRMedicinalProductAuthorizationProcedureTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicinalProductContraindication/FHIRMedicinalProductContraindicationOtherTherapyTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicinalProductContraindication/FHIRMedicinalProductContraindicationOtherTherapyTest.php index 05b33e3270..cf8ef7289e 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicinalProductContraindication/FHIRMedicinalProductContraindicationOtherTherapyTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicinalProductContraindication/FHIRMedicinalProductContraindicationOtherTherapyTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicinalProductIndication/FHIRMedicinalProductIndicationOtherTherapyTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicinalProductIndication/FHIRMedicinalProductIndicationOtherTherapyTest.php index 4150725382..ba54d5f897 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicinalProductIndication/FHIRMedicinalProductIndicationOtherTherapyTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicinalProductIndication/FHIRMedicinalProductIndicationOtherTherapyTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicinalProductIngredient/FHIRMedicinalProductIngredientReferenceStrengthTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicinalProductIngredient/FHIRMedicinalProductIngredientReferenceStrengthTest.php index 274d1e92d3..003634bcfe 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicinalProductIngredient/FHIRMedicinalProductIngredientReferenceStrengthTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicinalProductIngredient/FHIRMedicinalProductIngredientReferenceStrengthTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicinalProductIngredient/FHIRMedicinalProductIngredientSpecifiedSubstanceTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicinalProductIngredient/FHIRMedicinalProductIngredientSpecifiedSubstanceTest.php index 444906aee3..ae7045da5c 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicinalProductIngredient/FHIRMedicinalProductIngredientSpecifiedSubstanceTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicinalProductIngredient/FHIRMedicinalProductIngredientSpecifiedSubstanceTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicinalProductIngredient/FHIRMedicinalProductIngredientStrengthTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicinalProductIngredient/FHIRMedicinalProductIngredientStrengthTest.php index 840f00b10a..151d6e7bf3 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicinalProductIngredient/FHIRMedicinalProductIngredientStrengthTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicinalProductIngredient/FHIRMedicinalProductIngredientStrengthTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicinalProductIngredient/FHIRMedicinalProductIngredientSubstanceTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicinalProductIngredient/FHIRMedicinalProductIngredientSubstanceTest.php index 5f16f66c1e..f51966952b 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicinalProductIngredient/FHIRMedicinalProductIngredientSubstanceTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicinalProductIngredient/FHIRMedicinalProductIngredientSubstanceTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicinalProductInteraction/FHIRMedicinalProductInteractionInteractantTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicinalProductInteraction/FHIRMedicinalProductInteractionInteractantTest.php index 1c8c76509a..fb64f8a6d5 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicinalProductInteraction/FHIRMedicinalProductInteractionInteractantTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicinalProductInteraction/FHIRMedicinalProductInteractionInteractantTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicinalProductPackaged/FHIRMedicinalProductPackagedBatchIdentifierTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicinalProductPackaged/FHIRMedicinalProductPackagedBatchIdentifierTest.php index d36c25ef9a..f42406defd 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicinalProductPackaged/FHIRMedicinalProductPackagedBatchIdentifierTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicinalProductPackaged/FHIRMedicinalProductPackagedBatchIdentifierTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicinalProductPackaged/FHIRMedicinalProductPackagedPackageItemTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicinalProductPackaged/FHIRMedicinalProductPackagedPackageItemTest.php index 1b9bcf675a..13aaedb33d 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicinalProductPackaged/FHIRMedicinalProductPackagedPackageItemTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicinalProductPackaged/FHIRMedicinalProductPackagedPackageItemTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicinalProductPharmaceutical/FHIRMedicinalProductPharmaceuticalCharacteristicsTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicinalProductPharmaceutical/FHIRMedicinalProductPharmaceuticalCharacteristicsTest.php index d0e42f8bab..33afbe1529 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicinalProductPharmaceutical/FHIRMedicinalProductPharmaceuticalCharacteristicsTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicinalProductPharmaceutical/FHIRMedicinalProductPharmaceuticalCharacteristicsTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicinalProductPharmaceutical/FHIRMedicinalProductPharmaceuticalRouteOfAdministrationTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicinalProductPharmaceutical/FHIRMedicinalProductPharmaceuticalRouteOfAdministrationTest.php index 41a87d8d09..29b1988aad 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicinalProductPharmaceutical/FHIRMedicinalProductPharmaceuticalRouteOfAdministrationTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicinalProductPharmaceutical/FHIRMedicinalProductPharmaceuticalRouteOfAdministrationTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicinalProductPharmaceutical/FHIRMedicinalProductPharmaceuticalTargetSpeciesTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicinalProductPharmaceutical/FHIRMedicinalProductPharmaceuticalTargetSpeciesTest.php index ceb5b1416c..e814544532 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicinalProductPharmaceutical/FHIRMedicinalProductPharmaceuticalTargetSpeciesTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicinalProductPharmaceutical/FHIRMedicinalProductPharmaceuticalTargetSpeciesTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicinalProductPharmaceutical/FHIRMedicinalProductPharmaceuticalWithdrawalPeriodTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicinalProductPharmaceutical/FHIRMedicinalProductPharmaceuticalWithdrawalPeriodTest.php index 0a5ba8366b..392dfba15c 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicinalProductPharmaceutical/FHIRMedicinalProductPharmaceuticalWithdrawalPeriodTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicinalProductPharmaceutical/FHIRMedicinalProductPharmaceuticalWithdrawalPeriodTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMessageDefinition/FHIRMessageDefinitionAllowedResponseTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMessageDefinition/FHIRMessageDefinitionAllowedResponseTest.php index dd886f4348..bd1552a6d2 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMessageDefinition/FHIRMessageDefinitionAllowedResponseTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMessageDefinition/FHIRMessageDefinitionAllowedResponseTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMessageDefinition/FHIRMessageDefinitionFocusTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMessageDefinition/FHIRMessageDefinitionFocusTest.php index 7215292b0c..651df5c603 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMessageDefinition/FHIRMessageDefinitionFocusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMessageDefinition/FHIRMessageDefinitionFocusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMessageHeader/FHIRMessageHeaderDestinationTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMessageHeader/FHIRMessageHeaderDestinationTest.php index e81294abfb..639f23be20 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMessageHeader/FHIRMessageHeaderDestinationTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMessageHeader/FHIRMessageHeaderDestinationTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMessageHeader/FHIRMessageHeaderResponseTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMessageHeader/FHIRMessageHeaderResponseTest.php index 8117b02c55..e0bcabe0ea 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMessageHeader/FHIRMessageHeaderResponseTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMessageHeader/FHIRMessageHeaderResponseTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMessageHeader/FHIRMessageHeaderSourceTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMessageHeader/FHIRMessageHeaderSourceTest.php index 5a1e767e16..49c8373310 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMessageHeader/FHIRMessageHeaderSourceTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMessageHeader/FHIRMessageHeaderSourceTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMolecularSequence/FHIRMolecularSequenceInnerTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMolecularSequence/FHIRMolecularSequenceInnerTest.php index a61006258a..b1c821a495 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMolecularSequence/FHIRMolecularSequenceInnerTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMolecularSequence/FHIRMolecularSequenceInnerTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMolecularSequence/FHIRMolecularSequenceOuterTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMolecularSequence/FHIRMolecularSequenceOuterTest.php index bc9417c24b..9f962cbd5a 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMolecularSequence/FHIRMolecularSequenceOuterTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMolecularSequence/FHIRMolecularSequenceOuterTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMolecularSequence/FHIRMolecularSequenceQualityTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMolecularSequence/FHIRMolecularSequenceQualityTest.php index 5f63436b20..937864c0c4 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMolecularSequence/FHIRMolecularSequenceQualityTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMolecularSequence/FHIRMolecularSequenceQualityTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMolecularSequence/FHIRMolecularSequenceReferenceSeqTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMolecularSequence/FHIRMolecularSequenceReferenceSeqTest.php index 6dd4f42a3e..a85f6259bd 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMolecularSequence/FHIRMolecularSequenceReferenceSeqTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMolecularSequence/FHIRMolecularSequenceReferenceSeqTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMolecularSequence/FHIRMolecularSequenceRepositoryTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMolecularSequence/FHIRMolecularSequenceRepositoryTest.php index 10f0bd8231..d7a9e22124 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMolecularSequence/FHIRMolecularSequenceRepositoryTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMolecularSequence/FHIRMolecularSequenceRepositoryTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMolecularSequence/FHIRMolecularSequenceRocTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMolecularSequence/FHIRMolecularSequenceRocTest.php index fbea2c9b00..8142e6b3cd 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMolecularSequence/FHIRMolecularSequenceRocTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMolecularSequence/FHIRMolecularSequenceRocTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMolecularSequence/FHIRMolecularSequenceStructureVariantTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMolecularSequence/FHIRMolecularSequenceStructureVariantTest.php index c9d88c150c..f0b77536f7 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMolecularSequence/FHIRMolecularSequenceStructureVariantTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMolecularSequence/FHIRMolecularSequenceStructureVariantTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMolecularSequence/FHIRMolecularSequenceVariantTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMolecularSequence/FHIRMolecularSequenceVariantTest.php index 02b4d0e97b..7bf6ffffa4 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMolecularSequence/FHIRMolecularSequenceVariantTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMolecularSequence/FHIRMolecularSequenceVariantTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRNamingSystem/FHIRNamingSystemUniqueIdTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRNamingSystem/FHIRNamingSystemUniqueIdTest.php index c4632c3fdd..fad30aeccb 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRNamingSystem/FHIRNamingSystemUniqueIdTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRNamingSystem/FHIRNamingSystemUniqueIdTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRNutritionOrder/FHIRNutritionOrderAdministrationTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRNutritionOrder/FHIRNutritionOrderAdministrationTest.php index faf75dd58d..fd677b5c6d 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRNutritionOrder/FHIRNutritionOrderAdministrationTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRNutritionOrder/FHIRNutritionOrderAdministrationTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRNutritionOrder/FHIRNutritionOrderEnteralFormulaTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRNutritionOrder/FHIRNutritionOrderEnteralFormulaTest.php index dece1a9a77..749ec7bcac 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRNutritionOrder/FHIRNutritionOrderEnteralFormulaTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRNutritionOrder/FHIRNutritionOrderEnteralFormulaTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRNutritionOrder/FHIRNutritionOrderNutrientTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRNutritionOrder/FHIRNutritionOrderNutrientTest.php index 6ebfb42c71..5c9c03cc68 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRNutritionOrder/FHIRNutritionOrderNutrientTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRNutritionOrder/FHIRNutritionOrderNutrientTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRNutritionOrder/FHIRNutritionOrderOralDietTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRNutritionOrder/FHIRNutritionOrderOralDietTest.php index 8a4963d523..12cc1fc5fa 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRNutritionOrder/FHIRNutritionOrderOralDietTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRNutritionOrder/FHIRNutritionOrderOralDietTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRNutritionOrder/FHIRNutritionOrderSupplementTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRNutritionOrder/FHIRNutritionOrderSupplementTest.php index a09236adb8..169bdc32c4 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRNutritionOrder/FHIRNutritionOrderSupplementTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRNutritionOrder/FHIRNutritionOrderSupplementTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRNutritionOrder/FHIRNutritionOrderTextureTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRNutritionOrder/FHIRNutritionOrderTextureTest.php index acc46a0a5a..d0acbcb903 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRNutritionOrder/FHIRNutritionOrderTextureTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRNutritionOrder/FHIRNutritionOrderTextureTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRObservation/FHIRObservationComponentTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRObservation/FHIRObservationComponentTest.php index d3d1403564..4a25ce9f14 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRObservation/FHIRObservationComponentTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRObservation/FHIRObservationComponentTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRObservation/FHIRObservationReferenceRangeTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRObservation/FHIRObservationReferenceRangeTest.php index 13b154cce8..033c08e029 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRObservation/FHIRObservationReferenceRangeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRObservation/FHIRObservationReferenceRangeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRObservationDefinition/FHIRObservationDefinitionQualifiedIntervalTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRObservationDefinition/FHIRObservationDefinitionQualifiedIntervalTest.php index dcda82fca1..84968e04e2 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRObservationDefinition/FHIRObservationDefinitionQualifiedIntervalTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRObservationDefinition/FHIRObservationDefinitionQualifiedIntervalTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRObservationDefinition/FHIRObservationDefinitionQuantitativeDetailsTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRObservationDefinition/FHIRObservationDefinitionQuantitativeDetailsTest.php index e9c7ace6e9..d4006cfb4b 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRObservationDefinition/FHIRObservationDefinitionQuantitativeDetailsTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRObservationDefinition/FHIRObservationDefinitionQuantitativeDetailsTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIROperationDefinition/FHIROperationDefinitionBindingTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIROperationDefinition/FHIROperationDefinitionBindingTest.php index 7231d94d49..e46791a531 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIROperationDefinition/FHIROperationDefinitionBindingTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIROperationDefinition/FHIROperationDefinitionBindingTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIROperationDefinition/FHIROperationDefinitionOverloadTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIROperationDefinition/FHIROperationDefinitionOverloadTest.php index 22d318373d..40d3491705 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIROperationDefinition/FHIROperationDefinitionOverloadTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIROperationDefinition/FHIROperationDefinitionOverloadTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIROperationDefinition/FHIROperationDefinitionParameterTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIROperationDefinition/FHIROperationDefinitionParameterTest.php index 478bba38d9..e4f5a91db0 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIROperationDefinition/FHIROperationDefinitionParameterTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIROperationDefinition/FHIROperationDefinitionParameterTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIROperationDefinition/FHIROperationDefinitionReferencedFromTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIROperationDefinition/FHIROperationDefinitionReferencedFromTest.php index 4de6b4228e..6b1822e759 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIROperationDefinition/FHIROperationDefinitionReferencedFromTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIROperationDefinition/FHIROperationDefinitionReferencedFromTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIROperationOutcome/FHIROperationOutcomeIssueTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIROperationOutcome/FHIROperationOutcomeIssueTest.php index 43306184f7..de292eb273 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIROperationOutcome/FHIROperationOutcomeIssueTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIROperationOutcome/FHIROperationOutcomeIssueTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIROrganization/FHIROrganizationContactTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIROrganization/FHIROrganizationContactTest.php index 33df295af0..7a8dff98b8 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIROrganization/FHIROrganizationContactTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIROrganization/FHIROrganizationContactTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRParameters/FHIRParametersParameterTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRParameters/FHIRParametersParameterTest.php index cc9506de1f..f5eebcb2f8 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRParameters/FHIRParametersParameterTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRParameters/FHIRParametersParameterTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPatient/FHIRPatientCommunicationTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPatient/FHIRPatientCommunicationTest.php index 277ce5ae76..54017a6655 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPatient/FHIRPatientCommunicationTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPatient/FHIRPatientCommunicationTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPatient/FHIRPatientContactTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPatient/FHIRPatientContactTest.php index b581304288..c405fc9917 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPatient/FHIRPatientContactTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPatient/FHIRPatientContactTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPatient/FHIRPatientLinkTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPatient/FHIRPatientLinkTest.php index 571485bab2..f5af1c0409 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPatient/FHIRPatientLinkTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPatient/FHIRPatientLinkTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPaymentReconciliation/FHIRPaymentReconciliationDetailTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPaymentReconciliation/FHIRPaymentReconciliationDetailTest.php index d74b3a3788..975d37ebbf 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPaymentReconciliation/FHIRPaymentReconciliationDetailTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPaymentReconciliation/FHIRPaymentReconciliationDetailTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPaymentReconciliation/FHIRPaymentReconciliationProcessNoteTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPaymentReconciliation/FHIRPaymentReconciliationProcessNoteTest.php index 088e045afc..f7948c4186 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPaymentReconciliation/FHIRPaymentReconciliationProcessNoteTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPaymentReconciliation/FHIRPaymentReconciliationProcessNoteTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPerson/FHIRPersonLinkTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPerson/FHIRPersonLinkTest.php index 64e9049eb0..65e10a1719 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPerson/FHIRPersonLinkTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPerson/FHIRPersonLinkTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPlanDefinition/FHIRPlanDefinitionActionTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPlanDefinition/FHIRPlanDefinitionActionTest.php index 236448aa9d..8e511436f1 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPlanDefinition/FHIRPlanDefinitionActionTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPlanDefinition/FHIRPlanDefinitionActionTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPlanDefinition/FHIRPlanDefinitionConditionTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPlanDefinition/FHIRPlanDefinitionConditionTest.php index 068a8799a8..7d03e77564 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPlanDefinition/FHIRPlanDefinitionConditionTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPlanDefinition/FHIRPlanDefinitionConditionTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPlanDefinition/FHIRPlanDefinitionDynamicValueTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPlanDefinition/FHIRPlanDefinitionDynamicValueTest.php index 046b8aebfa..159c543142 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPlanDefinition/FHIRPlanDefinitionDynamicValueTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPlanDefinition/FHIRPlanDefinitionDynamicValueTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPlanDefinition/FHIRPlanDefinitionGoalTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPlanDefinition/FHIRPlanDefinitionGoalTest.php index c8a8e16fb7..0f6277dbe8 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPlanDefinition/FHIRPlanDefinitionGoalTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPlanDefinition/FHIRPlanDefinitionGoalTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPlanDefinition/FHIRPlanDefinitionParticipantTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPlanDefinition/FHIRPlanDefinitionParticipantTest.php index d2c1188ee8..e62a72e543 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPlanDefinition/FHIRPlanDefinitionParticipantTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPlanDefinition/FHIRPlanDefinitionParticipantTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPlanDefinition/FHIRPlanDefinitionRelatedActionTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPlanDefinition/FHIRPlanDefinitionRelatedActionTest.php index 0673da2645..7fc1e63069 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPlanDefinition/FHIRPlanDefinitionRelatedActionTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPlanDefinition/FHIRPlanDefinitionRelatedActionTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPlanDefinition/FHIRPlanDefinitionTargetTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPlanDefinition/FHIRPlanDefinitionTargetTest.php index dbb9a7cc97..53f6c969d7 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPlanDefinition/FHIRPlanDefinitionTargetTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPlanDefinition/FHIRPlanDefinitionTargetTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPopulationTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPopulationTest.php index e5d1704023..52f6f95a06 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPopulationTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPopulationTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPractitioner/FHIRPractitionerQualificationTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPractitioner/FHIRPractitionerQualificationTest.php index 17ee9855ef..11e3e8af41 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPractitioner/FHIRPractitionerQualificationTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPractitioner/FHIRPractitionerQualificationTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPractitionerRole/FHIRPractitionerRoleAvailableTimeTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPractitionerRole/FHIRPractitionerRoleAvailableTimeTest.php index a56dda5418..7535edcc1a 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPractitionerRole/FHIRPractitionerRoleAvailableTimeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPractitionerRole/FHIRPractitionerRoleAvailableTimeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPractitionerRole/FHIRPractitionerRoleNotAvailableTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPractitionerRole/FHIRPractitionerRoleNotAvailableTest.php index 8aa21fd05f..99dd8088e4 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPractitionerRole/FHIRPractitionerRoleNotAvailableTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPractitionerRole/FHIRPractitionerRoleNotAvailableTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRProcedure/FHIRProcedureFocalDeviceTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRProcedure/FHIRProcedureFocalDeviceTest.php index 6a4108b095..5c79f47022 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRProcedure/FHIRProcedureFocalDeviceTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRProcedure/FHIRProcedureFocalDeviceTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRProcedure/FHIRProcedurePerformerTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRProcedure/FHIRProcedurePerformerTest.php index 863e3e4eac..3be603d431 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRProcedure/FHIRProcedurePerformerTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRProcedure/FHIRProcedurePerformerTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRProdCharacteristicTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRProdCharacteristicTest.php index caf5917f2f..21f4da6445 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRProdCharacteristicTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRProdCharacteristicTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRProductShelfLifeTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRProductShelfLifeTest.php index f119b74ce4..39172775a4 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRProductShelfLifeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRProductShelfLifeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRProvenance/FHIRProvenanceAgentTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRProvenance/FHIRProvenanceAgentTest.php index ddee6a435e..96e40826f5 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRProvenance/FHIRProvenanceAgentTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRProvenance/FHIRProvenanceAgentTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRProvenance/FHIRProvenanceEntityTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRProvenance/FHIRProvenanceEntityTest.php index 47a4b0752f..b60a1b6a9d 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRProvenance/FHIRProvenanceEntityTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRProvenance/FHIRProvenanceEntityTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRQuestionnaire/FHIRQuestionnaireAnswerOptionTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRQuestionnaire/FHIRQuestionnaireAnswerOptionTest.php index e3f6c9dad0..8c3ec90e63 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRQuestionnaire/FHIRQuestionnaireAnswerOptionTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRQuestionnaire/FHIRQuestionnaireAnswerOptionTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRQuestionnaire/FHIRQuestionnaireEnableWhenTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRQuestionnaire/FHIRQuestionnaireEnableWhenTest.php index b4f386867e..b8aa19cffb 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRQuestionnaire/FHIRQuestionnaireEnableWhenTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRQuestionnaire/FHIRQuestionnaireEnableWhenTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRQuestionnaire/FHIRQuestionnaireInitialTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRQuestionnaire/FHIRQuestionnaireInitialTest.php index 21412ff4d8..f228e50a6c 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRQuestionnaire/FHIRQuestionnaireInitialTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRQuestionnaire/FHIRQuestionnaireInitialTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRQuestionnaire/FHIRQuestionnaireItemTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRQuestionnaire/FHIRQuestionnaireItemTest.php index 7cd271c672..9af5e1e716 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRQuestionnaire/FHIRQuestionnaireItemTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRQuestionnaire/FHIRQuestionnaireItemTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRQuestionnaireResponse/FHIRQuestionnaireResponseAnswerTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRQuestionnaireResponse/FHIRQuestionnaireResponseAnswerTest.php index 80af603b3b..6987003806 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRQuestionnaireResponse/FHIRQuestionnaireResponseAnswerTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRQuestionnaireResponse/FHIRQuestionnaireResponseAnswerTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRQuestionnaireResponse/FHIRQuestionnaireResponseItemTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRQuestionnaireResponse/FHIRQuestionnaireResponseItemTest.php index 45f436b2a8..13f487d8f5 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRQuestionnaireResponse/FHIRQuestionnaireResponseItemTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRQuestionnaireResponse/FHIRQuestionnaireResponseItemTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRRelatedPerson/FHIRRelatedPersonCommunicationTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRRelatedPerson/FHIRRelatedPersonCommunicationTest.php index a726d029fe..97e8aaf17f 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRRelatedPerson/FHIRRelatedPersonCommunicationTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRRelatedPerson/FHIRRelatedPersonCommunicationTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRRequestGroup/FHIRRequestGroupActionTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRRequestGroup/FHIRRequestGroupActionTest.php index ba8dae73f3..76801e10f9 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRRequestGroup/FHIRRequestGroupActionTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRRequestGroup/FHIRRequestGroupActionTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRRequestGroup/FHIRRequestGroupConditionTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRRequestGroup/FHIRRequestGroupConditionTest.php index 46fd5ef779..4eb221da81 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRRequestGroup/FHIRRequestGroupConditionTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRRequestGroup/FHIRRequestGroupConditionTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRRequestGroup/FHIRRequestGroupRelatedActionTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRRequestGroup/FHIRRequestGroupRelatedActionTest.php index b48b40b4c7..3b9d78fc42 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRRequestGroup/FHIRRequestGroupRelatedActionTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRRequestGroup/FHIRRequestGroupRelatedActionTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResearchElementDefinition/FHIRResearchElementDefinitionCharacteristicTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResearchElementDefinition/FHIRResearchElementDefinitionCharacteristicTest.php index a8eef0d0a1..b81d75fe47 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResearchElementDefinition/FHIRResearchElementDefinitionCharacteristicTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResearchElementDefinition/FHIRResearchElementDefinitionCharacteristicTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResearchStudy/FHIRResearchStudyArmTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResearchStudy/FHIRResearchStudyArmTest.php index fa1b3e9ed0..c4178da329 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResearchStudy/FHIRResearchStudyArmTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResearchStudy/FHIRResearchStudyArmTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResearchStudy/FHIRResearchStudyObjectiveTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResearchStudy/FHIRResearchStudyObjectiveTest.php index 433608e511..da042fbf28 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResearchStudy/FHIRResearchStudyObjectiveTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResearchStudy/FHIRResearchStudyObjectiveTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRRiskAssessment/FHIRRiskAssessmentPredictionTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRRiskAssessment/FHIRRiskAssessmentPredictionTest.php index c9a9882ae0..8074d8cbe4 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRRiskAssessment/FHIRRiskAssessmentPredictionTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRRiskAssessment/FHIRRiskAssessmentPredictionTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRRiskEvidenceSynthesis/FHIRRiskEvidenceSynthesisCertaintySubcomponentTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRRiskEvidenceSynthesis/FHIRRiskEvidenceSynthesisCertaintySubcomponentTest.php index 2c1c97d740..539265033b 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRRiskEvidenceSynthesis/FHIRRiskEvidenceSynthesisCertaintySubcomponentTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRRiskEvidenceSynthesis/FHIRRiskEvidenceSynthesisCertaintySubcomponentTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRRiskEvidenceSynthesis/FHIRRiskEvidenceSynthesisCertaintyTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRRiskEvidenceSynthesis/FHIRRiskEvidenceSynthesisCertaintyTest.php index b3ff896048..15502c043f 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRRiskEvidenceSynthesis/FHIRRiskEvidenceSynthesisCertaintyTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRRiskEvidenceSynthesis/FHIRRiskEvidenceSynthesisCertaintyTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRRiskEvidenceSynthesis/FHIRRiskEvidenceSynthesisPrecisionEstimateTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRRiskEvidenceSynthesis/FHIRRiskEvidenceSynthesisPrecisionEstimateTest.php index e2754e6ecd..ee659766a5 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRRiskEvidenceSynthesis/FHIRRiskEvidenceSynthesisPrecisionEstimateTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRRiskEvidenceSynthesis/FHIRRiskEvidenceSynthesisPrecisionEstimateTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRRiskEvidenceSynthesis/FHIRRiskEvidenceSynthesisRiskEstimateTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRRiskEvidenceSynthesis/FHIRRiskEvidenceSynthesisRiskEstimateTest.php index 0a1de60951..bc3c0041d5 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRRiskEvidenceSynthesis/FHIRRiskEvidenceSynthesisRiskEstimateTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRRiskEvidenceSynthesis/FHIRRiskEvidenceSynthesisRiskEstimateTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRRiskEvidenceSynthesis/FHIRRiskEvidenceSynthesisSampleSizeTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRRiskEvidenceSynthesis/FHIRRiskEvidenceSynthesisSampleSizeTest.php index 86565669f0..c2ccd9fdf6 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRRiskEvidenceSynthesis/FHIRRiskEvidenceSynthesisSampleSizeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRRiskEvidenceSynthesis/FHIRRiskEvidenceSynthesisSampleSizeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSearchParameter/FHIRSearchParameterComponentTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSearchParameter/FHIRSearchParameterComponentTest.php index 0e67d7782c..09e98059a5 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSearchParameter/FHIRSearchParameterComponentTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSearchParameter/FHIRSearchParameterComponentTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSpecimen/FHIRSpecimenCollectionTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSpecimen/FHIRSpecimenCollectionTest.php index 168a27b390..ffe248aad0 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSpecimen/FHIRSpecimenCollectionTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSpecimen/FHIRSpecimenCollectionTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSpecimen/FHIRSpecimenContainerTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSpecimen/FHIRSpecimenContainerTest.php index 41029dff47..ce0445061d 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSpecimen/FHIRSpecimenContainerTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSpecimen/FHIRSpecimenContainerTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSpecimen/FHIRSpecimenProcessingTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSpecimen/FHIRSpecimenProcessingTest.php index 0210adb36b..22dc7f8541 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSpecimen/FHIRSpecimenProcessingTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSpecimen/FHIRSpecimenProcessingTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSpecimenDefinition/FHIRSpecimenDefinitionAdditiveTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSpecimenDefinition/FHIRSpecimenDefinitionAdditiveTest.php index 166e52a9b6..f2c177acb1 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSpecimenDefinition/FHIRSpecimenDefinitionAdditiveTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSpecimenDefinition/FHIRSpecimenDefinitionAdditiveTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSpecimenDefinition/FHIRSpecimenDefinitionContainerTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSpecimenDefinition/FHIRSpecimenDefinitionContainerTest.php index 791faae480..ceb7bf9a9c 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSpecimenDefinition/FHIRSpecimenDefinitionContainerTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSpecimenDefinition/FHIRSpecimenDefinitionContainerTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSpecimenDefinition/FHIRSpecimenDefinitionHandlingTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSpecimenDefinition/FHIRSpecimenDefinitionHandlingTest.php index 44ce6dbf13..6bc5a0886f 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSpecimenDefinition/FHIRSpecimenDefinitionHandlingTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSpecimenDefinition/FHIRSpecimenDefinitionHandlingTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSpecimenDefinition/FHIRSpecimenDefinitionTypeTestedTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSpecimenDefinition/FHIRSpecimenDefinitionTypeTestedTest.php index 0980328729..3605af9bf3 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSpecimenDefinition/FHIRSpecimenDefinitionTypeTestedTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSpecimenDefinition/FHIRSpecimenDefinitionTypeTestedTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRStructureDefinition/FHIRStructureDefinitionContextTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRStructureDefinition/FHIRStructureDefinitionContextTest.php index 2647be59d9..0056319700 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRStructureDefinition/FHIRStructureDefinitionContextTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRStructureDefinition/FHIRStructureDefinitionContextTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRStructureDefinition/FHIRStructureDefinitionDifferentialTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRStructureDefinition/FHIRStructureDefinitionDifferentialTest.php index ff9aa7f057..a78d58db7c 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRStructureDefinition/FHIRStructureDefinitionDifferentialTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRStructureDefinition/FHIRStructureDefinitionDifferentialTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRStructureDefinition/FHIRStructureDefinitionMappingTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRStructureDefinition/FHIRStructureDefinitionMappingTest.php index 4d023d0f89..4c61f925dd 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRStructureDefinition/FHIRStructureDefinitionMappingTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRStructureDefinition/FHIRStructureDefinitionMappingTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRStructureDefinition/FHIRStructureDefinitionSnapshotTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRStructureDefinition/FHIRStructureDefinitionSnapshotTest.php index 5a23faf2aa..067c2e10d0 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRStructureDefinition/FHIRStructureDefinitionSnapshotTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRStructureDefinition/FHIRStructureDefinitionSnapshotTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRStructureMap/FHIRStructureMapDependentTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRStructureMap/FHIRStructureMapDependentTest.php index 1076977df5..6e2b9217ef 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRStructureMap/FHIRStructureMapDependentTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRStructureMap/FHIRStructureMapDependentTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRStructureMap/FHIRStructureMapGroupTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRStructureMap/FHIRStructureMapGroupTest.php index 2d194cf04e..a229117d6a 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRStructureMap/FHIRStructureMapGroupTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRStructureMap/FHIRStructureMapGroupTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRStructureMap/FHIRStructureMapInputTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRStructureMap/FHIRStructureMapInputTest.php index 12349499b0..9b6eafe7ac 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRStructureMap/FHIRStructureMapInputTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRStructureMap/FHIRStructureMapInputTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRStructureMap/FHIRStructureMapParameterTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRStructureMap/FHIRStructureMapParameterTest.php index 52374155aa..7d5eede119 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRStructureMap/FHIRStructureMapParameterTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRStructureMap/FHIRStructureMapParameterTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRStructureMap/FHIRStructureMapRuleTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRStructureMap/FHIRStructureMapRuleTest.php index 1dc408b35a..90a8a37677 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRStructureMap/FHIRStructureMapRuleTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRStructureMap/FHIRStructureMapRuleTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRStructureMap/FHIRStructureMapSourceTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRStructureMap/FHIRStructureMapSourceTest.php index 555d99052b..712e3528da 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRStructureMap/FHIRStructureMapSourceTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRStructureMap/FHIRStructureMapSourceTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRStructureMap/FHIRStructureMapStructureTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRStructureMap/FHIRStructureMapStructureTest.php index 65626172e5..9222456461 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRStructureMap/FHIRStructureMapStructureTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRStructureMap/FHIRStructureMapStructureTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRStructureMap/FHIRStructureMapTargetTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRStructureMap/FHIRStructureMapTargetTest.php index 9533022b85..1a73ecdf49 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRStructureMap/FHIRStructureMapTargetTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRStructureMap/FHIRStructureMapTargetTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubscription/FHIRSubscriptionChannelTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubscription/FHIRSubscriptionChannelTest.php index 3f83430ef3..53daaf0444 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubscription/FHIRSubscriptionChannelTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubscription/FHIRSubscriptionChannelTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubstance/FHIRSubstanceIngredientTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubstance/FHIRSubstanceIngredientTest.php index 1d3acafe76..ed22e99a0e 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubstance/FHIRSubstanceIngredientTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubstance/FHIRSubstanceIngredientTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubstance/FHIRSubstanceInstanceTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubstance/FHIRSubstanceInstanceTest.php index 76689d49e7..6b2c81b2de 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubstance/FHIRSubstanceInstanceTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubstance/FHIRSubstanceInstanceTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubstanceAmount/FHIRSubstanceAmountReferenceRangeTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubstanceAmount/FHIRSubstanceAmountReferenceRangeTest.php index 5259c0921c..e8ed3af937 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubstanceAmount/FHIRSubstanceAmountReferenceRangeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubstanceAmount/FHIRSubstanceAmountReferenceRangeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubstanceAmountTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubstanceAmountTest.php index 01fff7c76e..58cc7982d5 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubstanceAmountTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubstanceAmountTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubstanceNucleicAcid/FHIRSubstanceNucleicAcidLinkageTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubstanceNucleicAcid/FHIRSubstanceNucleicAcidLinkageTest.php index bc07787f13..42be4f860d 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubstanceNucleicAcid/FHIRSubstanceNucleicAcidLinkageTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubstanceNucleicAcid/FHIRSubstanceNucleicAcidLinkageTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubstanceNucleicAcid/FHIRSubstanceNucleicAcidSubunitTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubstanceNucleicAcid/FHIRSubstanceNucleicAcidSubunitTest.php index 8a1c3d1003..6ece512207 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubstanceNucleicAcid/FHIRSubstanceNucleicAcidSubunitTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubstanceNucleicAcid/FHIRSubstanceNucleicAcidSubunitTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubstanceNucleicAcid/FHIRSubstanceNucleicAcidSugarTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubstanceNucleicAcid/FHIRSubstanceNucleicAcidSugarTest.php index c557be58ba..59252b93d3 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubstanceNucleicAcid/FHIRSubstanceNucleicAcidSugarTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubstanceNucleicAcid/FHIRSubstanceNucleicAcidSugarTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubstancePolymer/FHIRSubstancePolymerDegreeOfPolymerisationTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubstancePolymer/FHIRSubstancePolymerDegreeOfPolymerisationTest.php index 695b585a3a..80be448b67 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubstancePolymer/FHIRSubstancePolymerDegreeOfPolymerisationTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubstancePolymer/FHIRSubstancePolymerDegreeOfPolymerisationTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubstancePolymer/FHIRSubstancePolymerMonomerSetTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubstancePolymer/FHIRSubstancePolymerMonomerSetTest.php index 5f4a5ca0f1..89abee223a 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubstancePolymer/FHIRSubstancePolymerMonomerSetTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubstancePolymer/FHIRSubstancePolymerMonomerSetTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubstancePolymer/FHIRSubstancePolymerRepeatTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubstancePolymer/FHIRSubstancePolymerRepeatTest.php index a896033b64..6a707238ed 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubstancePolymer/FHIRSubstancePolymerRepeatTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubstancePolymer/FHIRSubstancePolymerRepeatTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubstancePolymer/FHIRSubstancePolymerRepeatUnitTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubstancePolymer/FHIRSubstancePolymerRepeatUnitTest.php index 773582295c..e0e1721b34 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubstancePolymer/FHIRSubstancePolymerRepeatUnitTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubstancePolymer/FHIRSubstancePolymerRepeatUnitTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubstancePolymer/FHIRSubstancePolymerStartingMaterialTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubstancePolymer/FHIRSubstancePolymerStartingMaterialTest.php index 5af0611c7c..ceaeca12bc 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubstancePolymer/FHIRSubstancePolymerStartingMaterialTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubstancePolymer/FHIRSubstancePolymerStartingMaterialTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubstancePolymer/FHIRSubstancePolymerStructuralRepresentationTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubstancePolymer/FHIRSubstancePolymerStructuralRepresentationTest.php index db248cbb45..420dc7f03c 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubstancePolymer/FHIRSubstancePolymerStructuralRepresentationTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubstancePolymer/FHIRSubstancePolymerStructuralRepresentationTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubstanceProtein/FHIRSubstanceProteinSubunitTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubstanceProtein/FHIRSubstanceProteinSubunitTest.php index a0719bedfe..2e4e2da38b 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubstanceProtein/FHIRSubstanceProteinSubunitTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubstanceProtein/FHIRSubstanceProteinSubunitTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubstanceReferenceInformation/FHIRSubstanceReferenceInformationClassificationTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubstanceReferenceInformation/FHIRSubstanceReferenceInformationClassificationTest.php index d2b1dd64de..6e1af7d10b 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubstanceReferenceInformation/FHIRSubstanceReferenceInformationClassificationTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubstanceReferenceInformation/FHIRSubstanceReferenceInformationClassificationTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubstanceReferenceInformation/FHIRSubstanceReferenceInformationGeneElementTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubstanceReferenceInformation/FHIRSubstanceReferenceInformationGeneElementTest.php index c31fa243b7..424bbf686e 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubstanceReferenceInformation/FHIRSubstanceReferenceInformationGeneElementTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubstanceReferenceInformation/FHIRSubstanceReferenceInformationGeneElementTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubstanceReferenceInformation/FHIRSubstanceReferenceInformationGeneTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubstanceReferenceInformation/FHIRSubstanceReferenceInformationGeneTest.php index d5cf3019e8..f06e143a70 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubstanceReferenceInformation/FHIRSubstanceReferenceInformationGeneTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubstanceReferenceInformation/FHIRSubstanceReferenceInformationGeneTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubstanceReferenceInformation/FHIRSubstanceReferenceInformationTargetTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubstanceReferenceInformation/FHIRSubstanceReferenceInformationTargetTest.php index 9d9ef2e75d..22a40d20b5 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubstanceReferenceInformation/FHIRSubstanceReferenceInformationTargetTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubstanceReferenceInformation/FHIRSubstanceReferenceInformationTargetTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubstanceSourceMaterial/FHIRSubstanceSourceMaterialAuthorTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubstanceSourceMaterial/FHIRSubstanceSourceMaterialAuthorTest.php index 6a5a2baef2..855c4342c7 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubstanceSourceMaterial/FHIRSubstanceSourceMaterialAuthorTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubstanceSourceMaterial/FHIRSubstanceSourceMaterialAuthorTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubstanceSourceMaterial/FHIRSubstanceSourceMaterialFractionDescriptionTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubstanceSourceMaterial/FHIRSubstanceSourceMaterialFractionDescriptionTest.php index 1481d71178..a8787b5506 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubstanceSourceMaterial/FHIRSubstanceSourceMaterialFractionDescriptionTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubstanceSourceMaterial/FHIRSubstanceSourceMaterialFractionDescriptionTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubstanceSourceMaterial/FHIRSubstanceSourceMaterialHybridTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubstanceSourceMaterial/FHIRSubstanceSourceMaterialHybridTest.php index 52df1d97f1..72b0c5d029 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubstanceSourceMaterial/FHIRSubstanceSourceMaterialHybridTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubstanceSourceMaterial/FHIRSubstanceSourceMaterialHybridTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubstanceSourceMaterial/FHIRSubstanceSourceMaterialOrganismGeneralTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubstanceSourceMaterial/FHIRSubstanceSourceMaterialOrganismGeneralTest.php index 3fe1fbefa8..727f46a37e 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubstanceSourceMaterial/FHIRSubstanceSourceMaterialOrganismGeneralTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubstanceSourceMaterial/FHIRSubstanceSourceMaterialOrganismGeneralTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubstanceSourceMaterial/FHIRSubstanceSourceMaterialOrganismTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubstanceSourceMaterial/FHIRSubstanceSourceMaterialOrganismTest.php index d9d63eb754..799a5f3596 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubstanceSourceMaterial/FHIRSubstanceSourceMaterialOrganismTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubstanceSourceMaterial/FHIRSubstanceSourceMaterialOrganismTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubstanceSourceMaterial/FHIRSubstanceSourceMaterialPartDescriptionTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubstanceSourceMaterial/FHIRSubstanceSourceMaterialPartDescriptionTest.php index 5b92b51be3..6c4d35140f 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubstanceSourceMaterial/FHIRSubstanceSourceMaterialPartDescriptionTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubstanceSourceMaterial/FHIRSubstanceSourceMaterialPartDescriptionTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubstanceSpecification/FHIRSubstanceSpecificationCodeTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubstanceSpecification/FHIRSubstanceSpecificationCodeTest.php index ac37a84607..b030595746 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubstanceSpecification/FHIRSubstanceSpecificationCodeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubstanceSpecification/FHIRSubstanceSpecificationCodeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubstanceSpecification/FHIRSubstanceSpecificationIsotopeTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubstanceSpecification/FHIRSubstanceSpecificationIsotopeTest.php index 0e2feae05f..3828bd6574 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubstanceSpecification/FHIRSubstanceSpecificationIsotopeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubstanceSpecification/FHIRSubstanceSpecificationIsotopeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubstanceSpecification/FHIRSubstanceSpecificationMoietyTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubstanceSpecification/FHIRSubstanceSpecificationMoietyTest.php index f5a8bc9102..967bc5707a 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubstanceSpecification/FHIRSubstanceSpecificationMoietyTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubstanceSpecification/FHIRSubstanceSpecificationMoietyTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubstanceSpecification/FHIRSubstanceSpecificationMolecularWeightTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubstanceSpecification/FHIRSubstanceSpecificationMolecularWeightTest.php index b67d24a460..329f7f7231 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubstanceSpecification/FHIRSubstanceSpecificationMolecularWeightTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubstanceSpecification/FHIRSubstanceSpecificationMolecularWeightTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubstanceSpecification/FHIRSubstanceSpecificationNameTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubstanceSpecification/FHIRSubstanceSpecificationNameTest.php index a11b358a0e..b18e73bafa 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubstanceSpecification/FHIRSubstanceSpecificationNameTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubstanceSpecification/FHIRSubstanceSpecificationNameTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubstanceSpecification/FHIRSubstanceSpecificationOfficialTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubstanceSpecification/FHIRSubstanceSpecificationOfficialTest.php index 4a85f01dfc..a4ed06599e 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubstanceSpecification/FHIRSubstanceSpecificationOfficialTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubstanceSpecification/FHIRSubstanceSpecificationOfficialTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubstanceSpecification/FHIRSubstanceSpecificationPropertyTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubstanceSpecification/FHIRSubstanceSpecificationPropertyTest.php index 752a50cae7..a91a1e0f3b 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubstanceSpecification/FHIRSubstanceSpecificationPropertyTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubstanceSpecification/FHIRSubstanceSpecificationPropertyTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubstanceSpecification/FHIRSubstanceSpecificationRelationshipTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubstanceSpecification/FHIRSubstanceSpecificationRelationshipTest.php index 30873ab691..e53ac70afa 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubstanceSpecification/FHIRSubstanceSpecificationRelationshipTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubstanceSpecification/FHIRSubstanceSpecificationRelationshipTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubstanceSpecification/FHIRSubstanceSpecificationRepresentationTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubstanceSpecification/FHIRSubstanceSpecificationRepresentationTest.php index 1c0be703ba..220bd92103 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubstanceSpecification/FHIRSubstanceSpecificationRepresentationTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubstanceSpecification/FHIRSubstanceSpecificationRepresentationTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubstanceSpecification/FHIRSubstanceSpecificationStructureTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubstanceSpecification/FHIRSubstanceSpecificationStructureTest.php index db11750cc6..6ed4f70027 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubstanceSpecification/FHIRSubstanceSpecificationStructureTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubstanceSpecification/FHIRSubstanceSpecificationStructureTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSupplyDelivery/FHIRSupplyDeliverySuppliedItemTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSupplyDelivery/FHIRSupplyDeliverySuppliedItemTest.php index f4390ec002..fec44d6fcf 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSupplyDelivery/FHIRSupplyDeliverySuppliedItemTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSupplyDelivery/FHIRSupplyDeliverySuppliedItemTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSupplyRequest/FHIRSupplyRequestParameterTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSupplyRequest/FHIRSupplyRequestParameterTest.php index fd8c72cdf9..00bfb823b5 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSupplyRequest/FHIRSupplyRequestParameterTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSupplyRequest/FHIRSupplyRequestParameterTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTask/FHIRTaskInputTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTask/FHIRTaskInputTest.php index 63486f885a..b9a02ce477 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTask/FHIRTaskInputTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTask/FHIRTaskInputTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTask/FHIRTaskOutputTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTask/FHIRTaskOutputTest.php index 82654c7734..c241ad4d7d 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTask/FHIRTaskOutputTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTask/FHIRTaskOutputTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTask/FHIRTaskRestrictionTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTask/FHIRTaskRestrictionTest.php index d56aac2e9f..c7cceaf255 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTask/FHIRTaskRestrictionTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTask/FHIRTaskRestrictionTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTerminologyCapabilities/FHIRTerminologyCapabilitiesClosureTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTerminologyCapabilities/FHIRTerminologyCapabilitiesClosureTest.php index a3d2df78bd..4962d7c921 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTerminologyCapabilities/FHIRTerminologyCapabilitiesClosureTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTerminologyCapabilities/FHIRTerminologyCapabilitiesClosureTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTerminologyCapabilities/FHIRTerminologyCapabilitiesCodeSystemTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTerminologyCapabilities/FHIRTerminologyCapabilitiesCodeSystemTest.php index f01cfa1596..93d117f8e7 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTerminologyCapabilities/FHIRTerminologyCapabilitiesCodeSystemTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTerminologyCapabilities/FHIRTerminologyCapabilitiesCodeSystemTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTerminologyCapabilities/FHIRTerminologyCapabilitiesExpansionTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTerminologyCapabilities/FHIRTerminologyCapabilitiesExpansionTest.php index 98989a2bf3..d5f81f0fce 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTerminologyCapabilities/FHIRTerminologyCapabilitiesExpansionTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTerminologyCapabilities/FHIRTerminologyCapabilitiesExpansionTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTerminologyCapabilities/FHIRTerminologyCapabilitiesFilterTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTerminologyCapabilities/FHIRTerminologyCapabilitiesFilterTest.php index cdc2772331..69129d27fa 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTerminologyCapabilities/FHIRTerminologyCapabilitiesFilterTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTerminologyCapabilities/FHIRTerminologyCapabilitiesFilterTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTerminologyCapabilities/FHIRTerminologyCapabilitiesImplementationTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTerminologyCapabilities/FHIRTerminologyCapabilitiesImplementationTest.php index 0941c80502..dc92d41dde 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTerminologyCapabilities/FHIRTerminologyCapabilitiesImplementationTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTerminologyCapabilities/FHIRTerminologyCapabilitiesImplementationTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTerminologyCapabilities/FHIRTerminologyCapabilitiesParameterTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTerminologyCapabilities/FHIRTerminologyCapabilitiesParameterTest.php index 69a772d432..2117a6eb1d 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTerminologyCapabilities/FHIRTerminologyCapabilitiesParameterTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTerminologyCapabilities/FHIRTerminologyCapabilitiesParameterTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTerminologyCapabilities/FHIRTerminologyCapabilitiesSoftwareTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTerminologyCapabilities/FHIRTerminologyCapabilitiesSoftwareTest.php index 7fca02adb3..374f97b016 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTerminologyCapabilities/FHIRTerminologyCapabilitiesSoftwareTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTerminologyCapabilities/FHIRTerminologyCapabilitiesSoftwareTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTerminologyCapabilities/FHIRTerminologyCapabilitiesTranslationTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTerminologyCapabilities/FHIRTerminologyCapabilitiesTranslationTest.php index d82bb1225d..488813d606 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTerminologyCapabilities/FHIRTerminologyCapabilitiesTranslationTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTerminologyCapabilities/FHIRTerminologyCapabilitiesTranslationTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTerminologyCapabilities/FHIRTerminologyCapabilitiesValidateCodeTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTerminologyCapabilities/FHIRTerminologyCapabilitiesValidateCodeTest.php index f153cb137e..08efb5c085 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTerminologyCapabilities/FHIRTerminologyCapabilitiesValidateCodeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTerminologyCapabilities/FHIRTerminologyCapabilitiesValidateCodeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTerminologyCapabilities/FHIRTerminologyCapabilitiesVersionTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTerminologyCapabilities/FHIRTerminologyCapabilitiesVersionTest.php index 40310e8022..8fd6cc41e2 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTerminologyCapabilities/FHIRTerminologyCapabilitiesVersionTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTerminologyCapabilities/FHIRTerminologyCapabilitiesVersionTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestReport/FHIRTestReportAction1Test.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestReport/FHIRTestReportAction1Test.php index 704aeac27f..fd388b363f 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestReport/FHIRTestReportAction1Test.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestReport/FHIRTestReportAction1Test.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestReport/FHIRTestReportAction2Test.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestReport/FHIRTestReportAction2Test.php index 8ebf2c40c3..c0700a4436 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestReport/FHIRTestReportAction2Test.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestReport/FHIRTestReportAction2Test.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestReport/FHIRTestReportActionTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestReport/FHIRTestReportActionTest.php index 6116382c94..b6d41775fe 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestReport/FHIRTestReportActionTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestReport/FHIRTestReportActionTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestReport/FHIRTestReportAssertTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestReport/FHIRTestReportAssertTest.php index c7b88d99e0..07f3e64602 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestReport/FHIRTestReportAssertTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestReport/FHIRTestReportAssertTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestReport/FHIRTestReportOperationTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestReport/FHIRTestReportOperationTest.php index 67e2a70a44..5b28fb4b97 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestReport/FHIRTestReportOperationTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestReport/FHIRTestReportOperationTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestReport/FHIRTestReportParticipantTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestReport/FHIRTestReportParticipantTest.php index 02f5c78537..21b745b6d7 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestReport/FHIRTestReportParticipantTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestReport/FHIRTestReportParticipantTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestReport/FHIRTestReportSetupTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestReport/FHIRTestReportSetupTest.php index 4d2939d964..dc350446a7 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestReport/FHIRTestReportSetupTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestReport/FHIRTestReportSetupTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestReport/FHIRTestReportTeardownTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestReport/FHIRTestReportTeardownTest.php index 31201edd14..9d12265642 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestReport/FHIRTestReportTeardownTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestReport/FHIRTestReportTeardownTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestReport/FHIRTestReportTestTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestReport/FHIRTestReportTestTest.php index d4ccb46387..34b7a80955 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestReport/FHIRTestReportTestTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestReport/FHIRTestReportTestTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptAction1Test.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptAction1Test.php index 803e74a8cc..a63def720c 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptAction1Test.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptAction1Test.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptAction2Test.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptAction2Test.php index f82f73e85c..503b736913 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptAction2Test.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptAction2Test.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptActionTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptActionTest.php index 29e020bb7b..9c5bf4c5dd 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptActionTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptActionTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptAssertTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptAssertTest.php index d4b4a30c2b..1afc78a7d5 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptAssertTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptAssertTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptCapabilityTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptCapabilityTest.php index b7bd7c801d..e320513a7f 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptCapabilityTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptCapabilityTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptDestinationTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptDestinationTest.php index 17ec9e1178..dd5c244bb2 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptDestinationTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptDestinationTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptFixtureTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptFixtureTest.php index 39597d3756..139cbaf26e 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptFixtureTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptFixtureTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptLinkTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptLinkTest.php index ebf0e3606b..dffa5f405b 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptLinkTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptLinkTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptMetadataTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptMetadataTest.php index ff3284c151..23df6ca81c 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptMetadataTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptMetadataTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptOperationTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptOperationTest.php index e088e3a039..0843325d60 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptOperationTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptOperationTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptOriginTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptOriginTest.php index d5cb98e8af..3bce4af451 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptOriginTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptOriginTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptRequestHeaderTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptRequestHeaderTest.php index 89fc5e518a..97f845152d 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptRequestHeaderTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptRequestHeaderTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptSetupTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptSetupTest.php index ea3c37cb7c..2a11e73602 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptSetupTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptSetupTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptTeardownTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptTeardownTest.php index d10dd9c5fa..29b37a1c27 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptTeardownTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptTeardownTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptTestTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptTestTest.php index 37fb051d9a..1b64cb28ff 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptTestTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptTestTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptVariableTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptVariableTest.php index 1ca64ff496..c830997156 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptVariableTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptVariableTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTiming/FHIRTimingRepeatTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTiming/FHIRTimingRepeatTest.php index 6a95ce34fc..3ef4354b6a 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTiming/FHIRTimingRepeatTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTiming/FHIRTimingRepeatTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTimingTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTimingTest.php index 7872078820..4f489a4274 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTimingTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTimingTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetComposeTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetComposeTest.php index edb821d4f5..e6ac10ef5c 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetComposeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetComposeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetConceptTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetConceptTest.php index 16ee4ff308..a9f35b8b5e 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetConceptTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetConceptTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetContainsTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetContainsTest.php index b248dd862f..0569c920f2 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetContainsTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetContainsTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetDesignationTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetDesignationTest.php index 96c75224cf..7c3f1edd41 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetDesignationTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetDesignationTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetExpansionTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetExpansionTest.php index a3994300ba..7fb73c1461 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetExpansionTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetExpansionTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetFilterTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetFilterTest.php index 7b97309ed5..9fb7123af7 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetFilterTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetFilterTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetIncludeTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetIncludeTest.php index f1cfd00d65..532c322f02 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetIncludeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetIncludeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetParameterTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetParameterTest.php index 1b55d37953..8ce81980f8 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetParameterTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetParameterTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRVerificationResult/FHIRVerificationResultAttestationTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRVerificationResult/FHIRVerificationResultAttestationTest.php index 4229cafbaa..f14da3d19b 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRVerificationResult/FHIRVerificationResultAttestationTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRVerificationResult/FHIRVerificationResultAttestationTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRVerificationResult/FHIRVerificationResultPrimarySourceTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRVerificationResult/FHIRVerificationResultPrimarySourceTest.php index d12b8d7f61..4f35cf2f4c 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRVerificationResult/FHIRVerificationResultPrimarySourceTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRVerificationResult/FHIRVerificationResultPrimarySourceTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRVerificationResult/FHIRVerificationResultValidatorTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRVerificationResult/FHIRVerificationResultValidatorTest.php index 31a81dcf26..273552532e 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRVerificationResult/FHIRVerificationResultValidatorTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRVerificationResult/FHIRVerificationResultValidatorTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRVisionPrescription/FHIRVisionPrescriptionLensSpecificationTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRVisionPrescription/FHIRVisionPrescriptionLensSpecificationTest.php index d06e95604a..c9a7ff23a1 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRVisionPrescription/FHIRVisionPrescriptionLensSpecificationTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRVisionPrescription/FHIRVisionPrescriptionLensSpecificationTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRVisionPrescription/FHIRVisionPrescriptionPrismTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRVisionPrescription/FHIRVisionPrescriptionPrismTest.php index e560e9bb1d..849ef92283 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRVisionPrescription/FHIRVisionPrescriptionPrismTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRVisionPrescription/FHIRVisionPrescriptionPrismTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElementTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElementTest.php index 2bbbe989a7..c58208f14e 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElementTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBackboneElementTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBase64BinaryTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBase64BinaryTest.php index b4de9960a4..01f85f7009 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBase64BinaryTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBase64BinaryTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBindingStrengthTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBindingStrengthTest.php index 215f91e483..6e7dc30d89 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBindingStrengthTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBindingStrengthTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBiologicallyDerivedProductCategoryTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBiologicallyDerivedProductCategoryTest.php index 81a7ee5111..8b2ff0294b 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBiologicallyDerivedProductCategoryTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBiologicallyDerivedProductCategoryTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBiologicallyDerivedProductStatusTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBiologicallyDerivedProductStatusTest.php index 54e273f003..74885fc679 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBiologicallyDerivedProductStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBiologicallyDerivedProductStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBiologicallyDerivedProductStorageScaleTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBiologicallyDerivedProductStorageScaleTest.php index cc26110bdc..14fe84d8d6 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBiologicallyDerivedProductStorageScaleTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBiologicallyDerivedProductStorageScaleTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBooleanTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBooleanTest.php index e4b9297969..dc30037178 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBooleanTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBooleanTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBundleTypeTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBundleTypeTest.php index f8daeb4c1e..4a407cebf5 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBundleTypeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRBundleTypeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRCanonicalTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRCanonicalTest.php index 700e8bc4c9..55f9f0d743 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRCanonicalTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRCanonicalTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRCapabilityStatementKindTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRCapabilityStatementKindTest.php index 780f1a342c..cc8b667459 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRCapabilityStatementKindTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRCapabilityStatementKindTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRCarePlanActivityKindTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRCarePlanActivityKindTest.php index 82abc4c6a5..c2464cb73a 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRCarePlanActivityKindTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRCarePlanActivityKindTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRCarePlanActivityStatusTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRCarePlanActivityStatusTest.php index aac6823293..2049f9244f 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRCarePlanActivityStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRCarePlanActivityStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRCarePlanIntentTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRCarePlanIntentTest.php index 01a36e5263..a830ddaaeb 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRCarePlanIntentTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRCarePlanIntentTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRCareTeamStatusTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRCareTeamStatusTest.php index ade491b7b5..5959e450cc 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRCareTeamStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRCareTeamStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRCatalogEntryRelationTypeTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRCatalogEntryRelationTypeTest.php index c10e2fe22a..042fcb77b8 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRCatalogEntryRelationTypeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRCatalogEntryRelationTypeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRChargeItemStatusTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRChargeItemStatusTest.php index f168676c93..d09647c40e 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRChargeItemStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRChargeItemStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRClaimProcessingCodesTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRClaimProcessingCodesTest.php index 92de7c262b..aeca623fc9 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRClaimProcessingCodesTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRClaimProcessingCodesTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRClinicalImpressionStatusTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRClinicalImpressionStatusTest.php index 382a729f74..dcf884661c 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRClinicalImpressionStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRClinicalImpressionStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRCodeSearchSupportTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRCodeSearchSupportTest.php index 862d9178c6..2878a37155 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRCodeSearchSupportTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRCodeSearchSupportTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRCodeSystemContentModeTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRCodeSystemContentModeTest.php index 6b8c407166..b09dce35ed 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRCodeSystemContentModeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRCodeSystemContentModeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRCodeSystemHierarchyMeaningTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRCodeSystemHierarchyMeaningTest.php index 360061e1bf..fe587858c9 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRCodeSystemHierarchyMeaningTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRCodeSystemHierarchyMeaningTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRCodeTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRCodeTest.php index a457e41418..728ecd55a7 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRCodeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRCodeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRCodeableConceptTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRCodeableConceptTest.php index 9cc6e381ba..9da51b6c66 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRCodeableConceptTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRCodeableConceptTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRCodingTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRCodingTest.php index 156ab1ee53..c25b207e8b 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRCodingTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRCodingTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRCompartmentTypeTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRCompartmentTypeTest.php index d61b1e41d8..7949e96345 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRCompartmentTypeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRCompartmentTypeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRCompositionAttestationModeTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRCompositionAttestationModeTest.php index 0ef5f36534..bb50c567f0 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRCompositionAttestationModeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRCompositionAttestationModeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRCompositionStatusTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRCompositionStatusTest.php index 234759ccbc..f7154d419b 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRCompositionStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRCompositionStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRConceptMapEquivalenceTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRConceptMapEquivalenceTest.php index 332c95c44f..2bbd0a5649 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRConceptMapEquivalenceTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRConceptMapEquivalenceTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRConceptMapGroupUnmappedModeTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRConceptMapGroupUnmappedModeTest.php index c2de277862..69dc58600c 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRConceptMapGroupUnmappedModeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRConceptMapGroupUnmappedModeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRConditionalDeleteStatusTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRConditionalDeleteStatusTest.php index 262997f3e3..aca9c0a985 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRConditionalDeleteStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRConditionalDeleteStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRConditionalReadStatusTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRConditionalReadStatusTest.php index 984fc61892..d0c14a0825 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRConditionalReadStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRConditionalReadStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRConsentDataMeaningTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRConsentDataMeaningTest.php index e4ee224bd0..3f40ecc0be 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRConsentDataMeaningTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRConsentDataMeaningTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRConsentProvisionTypeTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRConsentProvisionTypeTest.php index bb754f10a0..8934487098 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRConsentProvisionTypeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRConsentProvisionTypeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRConsentStateTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRConsentStateTest.php index 8a73cb8f5e..6ca8f19fba 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRConsentStateTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRConsentStateTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRConstraintSeverityTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRConstraintSeverityTest.php index 127b1244e8..37f2c2ce15 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRConstraintSeverityTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRConstraintSeverityTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRContactDetailTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRContactDetailTest.php index 1e6d6681dc..49d6b6285b 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRContactDetailTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRContactDetailTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRContactPointSystemTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRContactPointSystemTest.php index 5d68e6c0b3..b0773f619a 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRContactPointSystemTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRContactPointSystemTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRContactPointTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRContactPointTest.php index e3098d26c9..15f4296101 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRContactPointTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRContactPointTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRContactPointUseTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRContactPointUseTest.php index 0eb1e7a352..ad86f432cc 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRContactPointUseTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRContactPointUseTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRContractResourcePublicationStatusCodesTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRContractResourcePublicationStatusCodesTest.php index 2003cc5600..0757cfcbe2 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRContractResourcePublicationStatusCodesTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRContractResourcePublicationStatusCodesTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRContractResourceStatusCodesTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRContractResourceStatusCodesTest.php index 40dcc355d7..8f40aed261 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRContractResourceStatusCodesTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRContractResourceStatusCodesTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRContributorTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRContributorTest.php index e91f312fb4..4e046d2ca1 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRContributorTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRContributorTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRContributorTypeTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRContributorTypeTest.php index 69b466975a..2fa13270ff 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRContributorTypeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRContributorTypeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRDataRequirement/FHIRDataRequirementCodeFilterTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRDataRequirement/FHIRDataRequirementCodeFilterTest.php index f73c2c9f7d..af278d9f50 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRDataRequirement/FHIRDataRequirementCodeFilterTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRDataRequirement/FHIRDataRequirementCodeFilterTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRDataRequirement/FHIRDataRequirementDateFilterTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRDataRequirement/FHIRDataRequirementDateFilterTest.php index 3007c68d9d..5bec9f4470 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRDataRequirement/FHIRDataRequirementDateFilterTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRDataRequirement/FHIRDataRequirementDateFilterTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRDataRequirement/FHIRDataRequirementSortTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRDataRequirement/FHIRDataRequirementSortTest.php index b43f744e68..6cb1535cd5 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRDataRequirement/FHIRDataRequirementSortTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRDataRequirement/FHIRDataRequirementSortTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRDataRequirementTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRDataRequirementTest.php index 5ef9c0d91c..a42f32f60c 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRDataRequirementTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRDataRequirementTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRDateTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRDateTest.php index c2c81749a6..738e9b79b7 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRDateTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRDateTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRDateTimeTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRDateTimeTest.php index 76f8edc516..e702c9e315 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRDateTimeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRDateTimeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRDaysOfWeekTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRDaysOfWeekTest.php index 1186a50122..b0ce12e729 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRDaysOfWeekTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRDaysOfWeekTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRDecimalTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRDecimalTest.php index 6865873979..c8fc276566 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRDecimalTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRDecimalTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRDetectedIssueSeverityTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRDetectedIssueSeverityTest.php index e313b61290..3e70ed4bec 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRDetectedIssueSeverityTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRDetectedIssueSeverityTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRDeviceMetricCalibrationStateTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRDeviceMetricCalibrationStateTest.php index 2cec7599d1..f6c0e02d2f 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRDeviceMetricCalibrationStateTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRDeviceMetricCalibrationStateTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRDeviceMetricCalibrationTypeTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRDeviceMetricCalibrationTypeTest.php index 38873d2695..648efa9647 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRDeviceMetricCalibrationTypeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRDeviceMetricCalibrationTypeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRDeviceMetricCategoryTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRDeviceMetricCategoryTest.php index 3d7e50f962..18da52521e 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRDeviceMetricCategoryTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRDeviceMetricCategoryTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRDeviceMetricColorTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRDeviceMetricColorTest.php index 2179a07fa9..55f65afa72 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRDeviceMetricColorTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRDeviceMetricColorTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRDeviceMetricOperationalStatusTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRDeviceMetricOperationalStatusTest.php index 46ef909cad..0586fdf4b4 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRDeviceMetricOperationalStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRDeviceMetricOperationalStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRDeviceNameTypeTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRDeviceNameTypeTest.php index f5048dea89..395f11ff2e 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRDeviceNameTypeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRDeviceNameTypeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRDeviceUseStatementStatusTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRDeviceUseStatementStatusTest.php index 9b21ebc780..e877735c9e 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRDeviceUseStatementStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRDeviceUseStatementStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRDiagnosticReportStatusTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRDiagnosticReportStatusTest.php index bb56efd483..3b2af8bf84 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRDiagnosticReportStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRDiagnosticReportStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRDiscriminatorTypeTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRDiscriminatorTypeTest.php index 2f4b5e6eef..f59a4fd1a1 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRDiscriminatorTypeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRDiscriminatorTypeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRDocumentModeTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRDocumentModeTest.php index b45d42f255..0bfac64ba0 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRDocumentModeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRDocumentModeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRDocumentReferenceStatusTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRDocumentReferenceStatusTest.php index 728932cdfc..aff048cbaa 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRDocumentReferenceStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRDocumentReferenceStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRDocumentRelationshipTypeTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRDocumentRelationshipTypeTest.php index 8adc17415a..a4f5e7ecef 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRDocumentRelationshipTypeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRDocumentRelationshipTypeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIREligibilityRequestPurposeTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIREligibilityRequestPurposeTest.php index 961d09c6c5..e706d011a5 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIREligibilityRequestPurposeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIREligibilityRequestPurposeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIREligibilityResponsePurposeTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIREligibilityResponsePurposeTest.php index a276155324..c4e3b02868 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIREligibilityResponsePurposeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIREligibilityResponsePurposeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIREnableWhenBehaviorTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIREnableWhenBehaviorTest.php index 83f74bef78..b65bc2e979 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIREnableWhenBehaviorTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIREnableWhenBehaviorTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIREncounterLocationStatusTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIREncounterLocationStatusTest.php index dcc59ff6e4..bdbf41cce8 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIREncounterLocationStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIREncounterLocationStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIREncounterStatusTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIREncounterStatusTest.php index ecde1e8eeb..c1cf58ef59 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIREncounterStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIREncounterStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIREndpointStatusTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIREndpointStatusTest.php index 6c65861ab4..081c767a97 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIREndpointStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIREndpointStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIREpisodeOfCareStatusTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIREpisodeOfCareStatusTest.php index b0d34dcf66..e4ec47a09e 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIREpisodeOfCareStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIREpisodeOfCareStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIREventCapabilityModeTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIREventCapabilityModeTest.php index 4c8ae606a2..042c70590e 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIREventCapabilityModeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIREventCapabilityModeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIREventStatusTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIREventStatusTest.php index 9e7eb6fe79..608abbd418 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIREventStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIREventStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIREventTimingTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIREventTimingTest.php index c3f69ecc50..3dc5976a4f 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIREventTimingTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIREventTimingTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIREvidenceVariableTypeTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIREvidenceVariableTypeTest.php index 9d4aeaa857..e39fe588c8 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIREvidenceVariableTypeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIREvidenceVariableTypeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRExampleScenarioActorTypeTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRExampleScenarioActorTypeTest.php index a6539b66e9..bb4705c82c 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRExampleScenarioActorTypeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRExampleScenarioActorTypeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRExplanationOfBenefitStatusTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRExplanationOfBenefitStatusTest.php index 831ac01eac..a92da6c07f 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRExplanationOfBenefitStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRExplanationOfBenefitStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRExposureStateTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRExposureStateTest.php index 2d6d20b666..4cdfa279ec 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRExposureStateTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRExposureStateTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRExpressionLanguageTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRExpressionLanguageTest.php index 7e2399227d..bc7ab4f309 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRExpressionLanguageTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRExpressionLanguageTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRExpressionTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRExpressionTest.php index adc966cec3..56ab0b4590 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRExpressionTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRExpressionTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRExtensionContextTypeTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRExtensionContextTypeTest.php index 3c131c62b6..6d01f6a255 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRExtensionContextTypeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRExtensionContextTypeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRExtensionTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRExtensionTest.php index ab96a7e309..1e23e8b9f3 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRExtensionTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRExtensionTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRFHIRDeviceStatusTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRFHIRDeviceStatusTest.php index 3be139f3d9..05043770e4 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRFHIRDeviceStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRFHIRDeviceStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRFHIRSubstanceStatusTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRFHIRSubstanceStatusTest.php index f744a720f9..7a513e8a88 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRFHIRSubstanceStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRFHIRSubstanceStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRFHIRVersionTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRFHIRVersionTest.php index 7a09d49fbd..40b9612b54 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRFHIRVersionTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRFHIRVersionTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRFamilyHistoryStatusTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRFamilyHistoryStatusTest.php index 46ff363ef0..a46307d589 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRFamilyHistoryStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRFamilyHistoryStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRFilterOperatorTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRFilterOperatorTest.php index cee7f45a16..d0b6ed256d 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRFilterOperatorTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRFilterOperatorTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRFinancialResourceStatusCodesTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRFinancialResourceStatusCodesTest.php index 1424bb389f..49342a011e 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRFinancialResourceStatusCodesTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRFinancialResourceStatusCodesTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRFlagStatusTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRFlagStatusTest.php index 7544b011b2..ebf1119d57 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRFlagStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRFlagStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRGoalLifecycleStatusTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRGoalLifecycleStatusTest.php index 6f23b4ae2f..b1966a85d7 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRGoalLifecycleStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRGoalLifecycleStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRGraphCompartmentRuleTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRGraphCompartmentRuleTest.php index d9f4df4555..75d9b3200e 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRGraphCompartmentRuleTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRGraphCompartmentRuleTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRGraphCompartmentUseTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRGraphCompartmentUseTest.php index 4e0612617e..52b50e15ef 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRGraphCompartmentUseTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRGraphCompartmentUseTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRGroupMeasureTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRGroupMeasureTest.php index 2b70d41eae..e25eab16fc 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRGroupMeasureTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRGroupMeasureTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRGroupTypeTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRGroupTypeTest.php index d6111aee14..823218d3fc 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRGroupTypeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRGroupTypeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRGuidanceResponseStatusTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRGuidanceResponseStatusTest.php index 1c9befd0e2..9c8ec9f3d8 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRGuidanceResponseStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRGuidanceResponseStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRGuidePageGenerationTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRGuidePageGenerationTest.php index a0eaac080f..2900faff9f 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRGuidePageGenerationTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRGuidePageGenerationTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRGuideParameterCodeTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRGuideParameterCodeTest.php index 4fe9b0adf6..021a0eefb9 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRGuideParameterCodeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRGuideParameterCodeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRHTTPVerbTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRHTTPVerbTest.php index 6655373415..5bb57f1649 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRHTTPVerbTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRHTTPVerbTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRHumanNameTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRHumanNameTest.php index 5e26da2557..081c661c9c 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRHumanNameTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRHumanNameTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRIdTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRIdTest.php index 391dd5b832..c6b0ce9439 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRIdTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRIdTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRIdentifierTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRIdentifierTest.php index 3db4119bf3..89b9fc7140 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRIdentifierTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRIdentifierTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRIdentifierUseTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRIdentifierUseTest.php index 1ed1d43130..d2692e16e7 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRIdentifierUseTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRIdentifierUseTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRIdentityAssuranceLevelTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRIdentityAssuranceLevelTest.php index 96930399e3..324041cf48 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRIdentityAssuranceLevelTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRIdentityAssuranceLevelTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRImagingStudyStatusTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRImagingStudyStatusTest.php index f1b50d10a5..d184977b22 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRImagingStudyStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRImagingStudyStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRImmunizationEvaluationStatusCodesTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRImmunizationEvaluationStatusCodesTest.php index bf89f46eb7..08631dce49 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRImmunizationEvaluationStatusCodesTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRImmunizationEvaluationStatusCodesTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRImmunizationStatusCodesTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRImmunizationStatusCodesTest.php index 529468ab29..1c936dff55 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRImmunizationStatusCodesTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRImmunizationStatusCodesTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRInstantTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRInstantTest.php index 26f2c6f404..87f482a874 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRInstantTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRInstantTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRIntegerTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRIntegerTest.php index 950cb81218..2c5e6ea830 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRIntegerTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRIntegerTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRInvoicePriceComponentTypeTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRInvoicePriceComponentTypeTest.php index e5322acf3b..8e74aa7f4a 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRInvoicePriceComponentTypeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRInvoicePriceComponentTypeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRInvoiceStatusTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRInvoiceStatusTest.php index be42ae0290..e0f8464bbc 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRInvoiceStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRInvoiceStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRIssueSeverityTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRIssueSeverityTest.php index d892987cb2..7254f60c40 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRIssueSeverityTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRIssueSeverityTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRIssueTypeTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRIssueTypeTest.php index 0fd783fa7b..d79eab08b9 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRIssueTypeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRIssueTypeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRLinkTypeTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRLinkTypeTest.php index 3664ab0bdd..3da8faad17 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRLinkTypeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRLinkTypeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRLinkageTypeTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRLinkageTypeTest.php index 9bccceec36..02cafe3e0b 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRLinkageTypeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRLinkageTypeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRListModeTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRListModeTest.php index 2a23bbaf31..4bf0d32314 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRListModeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRListModeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRListStatusTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRListStatusTest.php index 12e4e565d1..51788d5836 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRListStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRListStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRLocationModeTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRLocationModeTest.php index cc8ab73f53..c0c4eb05c4 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRLocationModeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRLocationModeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRLocationStatusTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRLocationStatusTest.php index b4e9a3fd49..18be0da038 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRLocationStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRLocationStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRMarkdownTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRMarkdownTest.php index c59504f631..fc5686efdc 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRMarkdownTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRMarkdownTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRMeasureReportStatusTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRMeasureReportStatusTest.php index 61c11fb2b0..f062324c7f 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRMeasureReportStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRMeasureReportStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRMeasureReportTypeTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRMeasureReportTypeTest.php index 697800a5c7..016fb3d88f 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRMeasureReportTypeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRMeasureReportTypeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRMedicationRequestIntentTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRMedicationRequestIntentTest.php index f18a8412ea..6b724410b0 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRMedicationRequestIntentTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRMedicationRequestIntentTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRMedicationStatusCodesTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRMedicationStatusCodesTest.php index f854a2b330..335a3f5762 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRMedicationStatusCodesTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRMedicationStatusCodesTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRMedicationrequestStatusTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRMedicationrequestStatusTest.php index d0433a98c0..f44239082e 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRMedicationrequestStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRMedicationrequestStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRMessageSignificanceCategoryTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRMessageSignificanceCategoryTest.php index 52de2efd93..c25e53d99e 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRMessageSignificanceCategoryTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRMessageSignificanceCategoryTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRMessageheaderResponseRequestTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRMessageheaderResponseRequestTest.php index b4c0bdc222..bb9054024b 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRMessageheaderResponseRequestTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRMessageheaderResponseRequestTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRMetaTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRMetaTest.php index b330916701..f145aebc12 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRMetaTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRMetaTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRMoneyTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRMoneyTest.php index 1fb4f4d8b6..bf231c1c6b 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRMoneyTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRMoneyTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRNameUseTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRNameUseTest.php index 909d39fe63..2e28acadc7 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRNameUseTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRNameUseTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRNamingSystemIdentifierTypeTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRNamingSystemIdentifierTypeTest.php index 1dc214e187..88e3549817 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRNamingSystemIdentifierTypeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRNamingSystemIdentifierTypeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRNamingSystemTypeTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRNamingSystemTypeTest.php index cdf572e9e4..01ba0d14fc 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRNamingSystemTypeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRNamingSystemTypeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRNarrativeStatusTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRNarrativeStatusTest.php index 46c32c12d4..f46abc0e8f 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRNarrativeStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRNarrativeStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRNarrativeTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRNarrativeTest.php index ee5d54f189..a6c49003cf 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRNarrativeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRNarrativeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRNoteTypeTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRNoteTypeTest.php index a5c3d1bcaa..7679e21450 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRNoteTypeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRNoteTypeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRObservationDataTypeTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRObservationDataTypeTest.php index 972e921eb0..42f228a3b0 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRObservationDataTypeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRObservationDataTypeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRObservationRangeCategoryTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRObservationRangeCategoryTest.php index 94895af087..7519f9cd11 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRObservationRangeCategoryTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRObservationRangeCategoryTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRObservationStatusTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRObservationStatusTest.php index d2f3038f86..d5a7feba38 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRObservationStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRObservationStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIROidTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIROidTest.php index 47611152ec..a608777750 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIROidTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIROidTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIROperationKindTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIROperationKindTest.php index 17e44b502b..d85f860dd7 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIROperationKindTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIROperationKindTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIROperationParameterUseTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIROperationParameterUseTest.php index f7e1bc8b5e..c5790af07d 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIROperationParameterUseTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIROperationParameterUseTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIROrientationTypeTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIROrientationTypeTest.php index bc772ba687..eb84df9f5c 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIROrientationTypeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIROrientationTypeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRParameterDefinitionTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRParameterDefinitionTest.php index e174ad1b31..3c8d352257 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRParameterDefinitionTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRParameterDefinitionTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRParticipantRequiredTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRParticipantRequiredTest.php index 49df991137..2c3e941848 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRParticipantRequiredTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRParticipantRequiredTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRParticipationStatusTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRParticipationStatusTest.php index 54246d833f..58d8a8b127 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRParticipationStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRParticipationStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRPeriodTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRPeriodTest.php index 84c53c51c3..dd488eb9ef 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRPeriodTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRPeriodTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRPositiveIntTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRPositiveIntTest.php index b57afae1e8..a52ea91c62 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRPositiveIntTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRPositiveIntTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRPropertyRepresentationTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRPropertyRepresentationTest.php index 5d5b221137..9d1fdaeb67 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRPropertyRepresentationTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRPropertyRepresentationTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRPropertyTypeTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRPropertyTypeTest.php index 3d672466bb..218ed18140 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRPropertyTypeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRPropertyTypeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRProvenanceEntityRoleTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRProvenanceEntityRoleTest.php index 687f554c43..27e3a75ed4 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRProvenanceEntityRoleTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRProvenanceEntityRoleTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRPublicationStatusTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRPublicationStatusTest.php index 48785c0a18..aedfae47be 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRPublicationStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRPublicationStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRQualityTypeTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRQualityTypeTest.php index e395e99a24..a2ba30cf92 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRQualityTypeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRQualityTypeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRQuantity/FHIRAgeTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRQuantity/FHIRAgeTest.php index 8dae2cb838..228a3568ea 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRQuantity/FHIRAgeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRQuantity/FHIRAgeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRQuantity/FHIRCountTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRQuantity/FHIRCountTest.php index a6b75ecb7d..abb04889ae 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRQuantity/FHIRCountTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRQuantity/FHIRCountTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRQuantity/FHIRDistanceTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRQuantity/FHIRDistanceTest.php index 71361e7cab..fb0ebd08bb 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRQuantity/FHIRDistanceTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRQuantity/FHIRDistanceTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRQuantity/FHIRDurationTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRQuantity/FHIRDurationTest.php index 33fe229679..7045baa206 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRQuantity/FHIRDurationTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRQuantity/FHIRDurationTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRQuantityComparatorTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRQuantityComparatorTest.php index 7893a584d3..4d4d7346b0 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRQuantityComparatorTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRQuantityComparatorTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRQuantityTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRQuantityTest.php index 1d09bc2a51..cd555edd67 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRQuantityTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRQuantityTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRQuestionnaireItemOperatorTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRQuestionnaireItemOperatorTest.php index 6770127e9f..a29dbeb8a6 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRQuestionnaireItemOperatorTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRQuestionnaireItemOperatorTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRQuestionnaireItemTypeTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRQuestionnaireItemTypeTest.php index 222d6655f8..4105a521d4 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRQuestionnaireItemTypeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRQuestionnaireItemTypeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRQuestionnaireResponseStatusTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRQuestionnaireResponseStatusTest.php index db78917d18..c1ebc45bc4 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRQuestionnaireResponseStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRQuestionnaireResponseStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRRangeTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRRangeTest.php index b29358a710..221d22b691 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRRangeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRRangeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRRatioTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRRatioTest.php index c0eea78a95..4ada606c27 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRRatioTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRRatioTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRReferenceHandlingPolicyTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRReferenceHandlingPolicyTest.php index f2680cd6f0..40ea9a71f6 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRReferenceHandlingPolicyTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRReferenceHandlingPolicyTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRReferenceTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRReferenceTest.php index e4ac5536d9..ea088bdf93 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRReferenceTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRReferenceTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRReferenceVersionRulesTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRReferenceVersionRulesTest.php index 6704889a1f..01ff56be7d 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRReferenceVersionRulesTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRReferenceVersionRulesTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRRelatedArtifactTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRRelatedArtifactTest.php index 1ba8099805..047cfcd799 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRRelatedArtifactTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRRelatedArtifactTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRRelatedArtifactTypeTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRRelatedArtifactTypeTest.php index 88717e69f1..5878999fdf 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRRelatedArtifactTypeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRRelatedArtifactTypeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRRemittanceOutcomeTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRRemittanceOutcomeTest.php index 0b281a630c..97fec2842f 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRRemittanceOutcomeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRRemittanceOutcomeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRRepositoryTypeTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRRepositoryTypeTest.php index 11732d4095..2e24dbda0f 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRRepositoryTypeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRRepositoryTypeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRRequestIntentTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRRequestIntentTest.php index 91573f5f96..671896b10d 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRRequestIntentTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRRequestIntentTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRRequestPriorityTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRRequestPriorityTest.php index f85751466f..8bdfbbb7be 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRRequestPriorityTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRRequestPriorityTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRRequestResourceTypeTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRRequestResourceTypeTest.php index 4818dbb42d..49bc180081 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRRequestResourceTypeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRRequestResourceTypeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRRequestStatusTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRRequestStatusTest.php index c8e0a46f21..675e0a80fe 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRRequestStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRRequestStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRResearchElementTypeTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRResearchElementTypeTest.php index fc7f6df0d0..0fdfd9c938 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRResearchElementTypeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRResearchElementTypeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRResearchStudyStatusTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRResearchStudyStatusTest.php index ee025b7668..3ca951963e 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRResearchStudyStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRResearchStudyStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRResearchSubjectStatusTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRResearchSubjectStatusTest.php index 71e4f4b351..0528e7f654 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRResearchSubjectStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRResearchSubjectStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRResourceVersionPolicyTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRResourceVersionPolicyTest.php index 91bd52bfce..62f25f0f1f 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRResourceVersionPolicyTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRResourceVersionPolicyTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRResponseTypeTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRResponseTypeTest.php index a5561f71e3..78ee29d296 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRResponseTypeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRResponseTypeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRRestfulCapabilityModeTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRRestfulCapabilityModeTest.php index a51528d0a6..ae3c5ef07c 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRRestfulCapabilityModeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRRestfulCapabilityModeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRSPDXLicenseTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRSPDXLicenseTest.php index be1124bdb3..704df4b553 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRSPDXLicenseTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRSPDXLicenseTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRSampledDataDataTypeTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRSampledDataDataTypeTest.php index 1c053a0973..68daa0d6a0 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRSampledDataDataTypeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRSampledDataDataTypeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRSampledDataTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRSampledDataTest.php index 58b95eeb26..fbc7f14f8b 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRSampledDataTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRSampledDataTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRSearchComparatorTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRSearchComparatorTest.php index 8eb0af893d..9a907d4c42 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRSearchComparatorTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRSearchComparatorTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRSearchEntryModeTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRSearchEntryModeTest.php index 3e1260a85b..986e300367 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRSearchEntryModeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRSearchEntryModeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRSearchModifierCodeTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRSearchModifierCodeTest.php index ee5a0b0e4f..a36f945175 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRSearchModifierCodeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRSearchModifierCodeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRSearchParamTypeTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRSearchParamTypeTest.php index 9cd0aff1e6..fb27c962b3 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRSearchParamTypeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRSearchParamTypeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRSequenceTypeTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRSequenceTypeTest.php index fd098ad382..6c4bcdad78 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRSequenceTypeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRSequenceTypeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRSignatureTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRSignatureTest.php index e8f9cd36e1..ee4acca385 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRSignatureTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRSignatureTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRSlicingRulesTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRSlicingRulesTest.php index ca033c84d1..9458d90125 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRSlicingRulesTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRSlicingRulesTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRSlotStatusTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRSlotStatusTest.php index 2a43ed22c8..360099298e 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRSlotStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRSlotStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRSortDirectionTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRSortDirectionTest.php index ee17662e4f..221c75de97 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRSortDirectionTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRSortDirectionTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRSpecimenContainedPreferenceTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRSpecimenContainedPreferenceTest.php index 1e9a9714db..53a10e91e2 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRSpecimenContainedPreferenceTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRSpecimenContainedPreferenceTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRSpecimenStatusTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRSpecimenStatusTest.php index 762511dc7a..1e813e5e67 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRSpecimenStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRSpecimenStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRStatusTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRStatusTest.php index 9f28c25b55..1623f8e6c5 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRStrandTypeTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRStrandTypeTest.php index 6d5f0ded14..ed2c9468c7 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRStrandTypeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRStrandTypeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRStringTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRStringTest.php index b75f2ccfa5..da28d337cd 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRStringTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRStringTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRStructureDefinitionKindTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRStructureDefinitionKindTest.php index b358bd7403..13d9e9ee79 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRStructureDefinitionKindTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRStructureDefinitionKindTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRStructureMapContextTypeTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRStructureMapContextTypeTest.php index 2d6f7a2983..7db07ee648 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRStructureMapContextTypeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRStructureMapContextTypeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRStructureMapGroupTypeModeTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRStructureMapGroupTypeModeTest.php index 8d0bd90b70..702aa681fb 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRStructureMapGroupTypeModeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRStructureMapGroupTypeModeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRStructureMapInputModeTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRStructureMapInputModeTest.php index d8b034c6df..fe0871132a 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRStructureMapInputModeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRStructureMapInputModeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRStructureMapModelModeTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRStructureMapModelModeTest.php index 60e2c03b55..8672bb2bc2 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRStructureMapModelModeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRStructureMapModelModeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRStructureMapSourceListModeTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRStructureMapSourceListModeTest.php index 8ff01f7ebc..58e1edf201 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRStructureMapSourceListModeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRStructureMapSourceListModeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRStructureMapTargetListModeTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRStructureMapTargetListModeTest.php index d6fede163b..8bc0e04c1f 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRStructureMapTargetListModeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRStructureMapTargetListModeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRStructureMapTransformTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRStructureMapTransformTest.php index fed185b1fb..eb433ebb97 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRStructureMapTransformTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRStructureMapTransformTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRSubscriptionChannelTypeTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRSubscriptionChannelTypeTest.php index 2e63719b13..3416de9b14 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRSubscriptionChannelTypeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRSubscriptionChannelTypeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRSubscriptionStatusTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRSubscriptionStatusTest.php index 4d09ce2557..5c7f1178d5 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRSubscriptionStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRSubscriptionStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRSupplyDeliveryStatusTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRSupplyDeliveryStatusTest.php index 29c0e2ebb0..5ceb56b4be 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRSupplyDeliveryStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRSupplyDeliveryStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRSupplyRequestStatusTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRSupplyRequestStatusTest.php index 41a3715eee..1b44606bce 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRSupplyRequestStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRSupplyRequestStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRSystemRestfulInteractionTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRSystemRestfulInteractionTest.php index b54c9adb05..a1c6066abc 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRSystemRestfulInteractionTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRSystemRestfulInteractionTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRTaskIntentTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRTaskIntentTest.php index 069a4d0e91..b09d74cbdd 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRTaskIntentTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRTaskIntentTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRTaskStatusTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRTaskStatusTest.php index 289eb83b0a..ead2dfde60 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRTaskStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRTaskStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRTestReportActionResultTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRTestReportActionResultTest.php index e26942b40b..1a462be15d 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRTestReportActionResultTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRTestReportActionResultTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRTestReportParticipantTypeTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRTestReportParticipantTypeTest.php index 74635dd7fe..725812a046 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRTestReportParticipantTypeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRTestReportParticipantTypeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRTestReportResultTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRTestReportResultTest.php index e9cf61e56e..ccb823417f 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRTestReportResultTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRTestReportResultTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRTestReportStatusTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRTestReportStatusTest.php index 174113e4ec..85489e2be1 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRTestReportStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRTestReportStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRTestScriptRequestMethodCodeTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRTestScriptRequestMethodCodeTest.php index 8fca7044fa..19faa13f37 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRTestScriptRequestMethodCodeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRTestScriptRequestMethodCodeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRTimeTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRTimeTest.php index 54d9dc76ae..1da8ff74eb 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRTimeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRTimeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRTriggerDefinitionTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRTriggerDefinitionTest.php index 34b2dbfaea..04326b16b6 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRTriggerDefinitionTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRTriggerDefinitionTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRTriggerTypeTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRTriggerTypeTest.php index 56877aaae8..5cda0ec87e 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRTriggerTypeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRTriggerTypeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRTypeDerivationRuleTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRTypeDerivationRuleTest.php index 072445b493..8307704283 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRTypeDerivationRuleTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRTypeDerivationRuleTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRTypeRestfulInteractionTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRTypeRestfulInteractionTest.php index 653349fbb8..984d3a8a4d 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRTypeRestfulInteractionTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRTypeRestfulInteractionTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRUDIEntryTypeTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRUDIEntryTypeTest.php index eee4a514d8..e9e7f3f7a2 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRUDIEntryTypeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRUDIEntryTypeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRUnitsOfTimeTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRUnitsOfTimeTest.php index 334c546d88..1f220fe32e 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRUnitsOfTimeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRUnitsOfTimeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRUnsignedIntTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRUnsignedIntTest.php index 4d5805d57b..94fc2f3ea1 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRUnsignedIntTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRUnsignedIntTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRUriTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRUriTest.php index b702b3649e..e6c781b7da 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRUriTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRUriTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRUrlTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRUrlTest.php index 4ce7bc4f35..bf45b5dda8 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRUrlTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRUrlTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRUsageContextTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRUsageContextTest.php index c730231131..b383c7e9f4 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRUsageContextTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRUsageContextTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRUseTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRUseTest.php index 430fa02b97..c7eb187501 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRUseTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRUseTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRUuidTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRUuidTest.php index 8d6481aee1..1e984f3184 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRUuidTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRUuidTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRVConfidentialityClassificationTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRVConfidentialityClassificationTest.php index caa6ca5eb4..1a48c17a88 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRVConfidentialityClassificationTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRVConfidentialityClassificationTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRVariableTypeTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRVariableTypeTest.php index 17c13d2c92..6f9e949b46 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRVariableTypeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRVariableTypeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRVisionBaseTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRVisionBaseTest.php index 9c3b9f513a..9c3c29ee52 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRVisionBaseTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRVisionBaseTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRVisionEyesTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRVisionEyesTest.php index 543041cb3f..78ac733652 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRVisionEyesTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRVisionEyesTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRXPathUsageTypeTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRXPathUsageTypeTest.php index 977b07097e..a433bbb60a 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRXPathUsageTypeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElement/FHIRXPathUsageTypeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElementTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElementTest.php index 036131bc96..6eeedcf5f5 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElementTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRElementTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIREligibilityRequestPurposeListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIREligibilityRequestPurposeListTest.php index 10f5cc1499..69a6316bbb 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIREligibilityRequestPurposeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIREligibilityRequestPurposeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIREligibilityResponsePurposeListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIREligibilityResponsePurposeListTest.php index 76cd3f8ccc..63a5306ac2 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIREligibilityResponsePurposeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIREligibilityResponsePurposeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIREnableWhenBehaviorListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIREnableWhenBehaviorListTest.php index 69ba68e6b8..b319862890 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIREnableWhenBehaviorListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIREnableWhenBehaviorListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIREncounterLocationStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIREncounterLocationStatusListTest.php index 4983a8c605..fb51bb469a 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIREncounterLocationStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIREncounterLocationStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIREncounterStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIREncounterStatusListTest.php index ef54e43411..4ac5b6c9f2 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIREncounterStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIREncounterStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIREndpointStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIREndpointStatusListTest.php index 2a8d00f26e..964c8cca6b 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIREndpointStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIREndpointStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIREpisodeOfCareStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIREpisodeOfCareStatusListTest.php index d4e354cbdf..181b200513 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIREpisodeOfCareStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIREpisodeOfCareStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIREventCapabilityModeListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIREventCapabilityModeListTest.php index dbc3cb934d..69fabe91d3 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIREventCapabilityModeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIREventCapabilityModeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIREventStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIREventStatusListTest.php index fbdf9258bd..dbbdad0e3b 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIREventStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIREventStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIREventTimingListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIREventTimingListTest.php index 38c09fd7a5..c2f80b820a 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIREventTimingListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIREventTimingListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIREvidenceVariableTypeListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIREvidenceVariableTypeListTest.php index c2f35f53ee..f3969c6215 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIREvidenceVariableTypeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIREvidenceVariableTypeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRExampleScenarioActorTypeListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRExampleScenarioActorTypeListTest.php index 1fed0883d3..6ceb5f6d34 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRExampleScenarioActorTypeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRExampleScenarioActorTypeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRExplanationOfBenefitStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRExplanationOfBenefitStatusListTest.php index 7009b13d37..ac036d1ccb 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRExplanationOfBenefitStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRExplanationOfBenefitStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRExposureStateListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRExposureStateListTest.php index c6331b0883..f018a69049 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRExposureStateListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRExposureStateListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRExpressionLanguageListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRExpressionLanguageListTest.php index 59952af560..cf6fcc96f2 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRExpressionLanguageListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRExpressionLanguageListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRExtensionContextTypeListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRExtensionContextTypeListTest.php index 69cda55ea7..5bf9ddd92f 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRExtensionContextTypeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRExtensionContextTypeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRFHIRDeviceStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRFHIRDeviceStatusListTest.php index f24159921a..d8a4c7299e 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRFHIRDeviceStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRFHIRDeviceStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRFHIRSubstanceStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRFHIRSubstanceStatusListTest.php index 8f05391d66..575de693e0 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRFHIRSubstanceStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRFHIRSubstanceStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRFHIRVersionListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRFHIRVersionListTest.php index 7d9bf14050..5140c3de86 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRFHIRVersionListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRFHIRVersionListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRFamilyHistoryStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRFamilyHistoryStatusListTest.php index 5489c088e6..cc8c594825 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRFamilyHistoryStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRFamilyHistoryStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRFilterOperatorListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRFilterOperatorListTest.php index 31aa93c98e..80a14a7b58 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRFilterOperatorListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRFilterOperatorListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRFinancialResourceStatusCodesListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRFinancialResourceStatusCodesListTest.php index 65a2fa4974..35968d2650 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRFinancialResourceStatusCodesListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRFinancialResourceStatusCodesListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRFlagStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRFlagStatusListTest.php index 0898f91a96..3949345362 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRFlagStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRFlagStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRGoalLifecycleStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRGoalLifecycleStatusListTest.php index 25bc47c5bd..f702116b00 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRGoalLifecycleStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRGoalLifecycleStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRGraphCompartmentRuleListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRGraphCompartmentRuleListTest.php index 7b1d61e128..d49583959c 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRGraphCompartmentRuleListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRGraphCompartmentRuleListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRGraphCompartmentUseListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRGraphCompartmentUseListTest.php index 6c0cc4edb6..f1489d9ec8 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRGraphCompartmentUseListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRGraphCompartmentUseListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRGroupMeasureListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRGroupMeasureListTest.php index 93f9183bb9..f62647c52a 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRGroupMeasureListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRGroupMeasureListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRGroupTypeListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRGroupTypeListTest.php index 80475d0ba4..437eb639a1 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRGroupTypeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRGroupTypeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRGuidanceResponseStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRGuidanceResponseStatusListTest.php index 240e7f9578..e07cb0eca2 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRGuidanceResponseStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRGuidanceResponseStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRGuidePageGenerationListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRGuidePageGenerationListTest.php index 5f05e253c7..fcc6569ebe 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRGuidePageGenerationListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRGuidePageGenerationListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRGuideParameterCodeListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRGuideParameterCodeListTest.php index 48a58ee5b7..137857d96c 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRGuideParameterCodeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRGuideParameterCodeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRHTTPVerbListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRHTTPVerbListTest.php index 03b211ffc5..522ffac8e5 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRHTTPVerbListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRHTTPVerbListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRIdPrimitiveTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRIdPrimitiveTest.php index eee259a6fa..ada1bf2576 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRIdPrimitiveTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRIdPrimitiveTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRIdentifierUseListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRIdentifierUseListTest.php index 5ba47bf694..d68ab2ed91 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRIdentifierUseListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRIdentifierUseListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRIdentityAssuranceLevelListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRIdentityAssuranceLevelListTest.php index d6c7ebb245..5816d29868 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRIdentityAssuranceLevelListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRIdentityAssuranceLevelListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRImagingStudyStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRImagingStudyStatusListTest.php index a2c6b3a1a7..bb6e9a8aa8 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRImagingStudyStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRImagingStudyStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRImmunizationEvaluationStatusCodesListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRImmunizationEvaluationStatusCodesListTest.php index 14d3196e03..eb122385f4 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRImmunizationEvaluationStatusCodesListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRImmunizationEvaluationStatusCodesListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRImmunizationStatusCodesListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRImmunizationStatusCodesListTest.php index 3c3c49aa3d..de97569c3b 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRImmunizationStatusCodesListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRImmunizationStatusCodesListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRInstantPrimitiveTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRInstantPrimitiveTest.php index a8540ad37d..190d6f8024 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRInstantPrimitiveTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRInstantPrimitiveTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRIntegerPrimitiveTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRIntegerPrimitiveTest.php index ef865acd97..e05a67516d 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRIntegerPrimitiveTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRIntegerPrimitiveTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRInvoicePriceComponentTypeListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRInvoicePriceComponentTypeListTest.php index ae21ce8867..8eedf6594b 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRInvoicePriceComponentTypeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRInvoicePriceComponentTypeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRInvoiceStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRInvoiceStatusListTest.php index 36588ac85c..82ff9217c6 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRInvoiceStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRInvoiceStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRIssueSeverityListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRIssueSeverityListTest.php index 6df36b7272..abd098104a 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRIssueSeverityListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRIssueSeverityListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRIssueTypeListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRIssueTypeListTest.php index ae9a96b442..314dc35d3b 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRIssueTypeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRIssueTypeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRLinkTypeListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRLinkTypeListTest.php index 8be3a463a8..2b18a00f43 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRLinkTypeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRLinkTypeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRLinkageTypeListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRLinkageTypeListTest.php index 280e4fae62..ab932e6c08 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRLinkageTypeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRLinkageTypeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRListModeListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRListModeListTest.php index e7c439cd56..5433a87c57 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRListModeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRListModeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRListStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRListStatusListTest.php index 86ab1ecf9f..97edc896fb 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRListStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRListStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRLocationModeListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRLocationModeListTest.php index c4d7ab2b99..2012674fff 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRLocationModeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRLocationModeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRLocationStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRLocationStatusListTest.php index 69207bd780..eefdcfd431 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRLocationStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRLocationStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRMarkdownPrimitiveTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRMarkdownPrimitiveTest.php index f483da3cb2..d849045f73 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRMarkdownPrimitiveTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRMarkdownPrimitiveTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRMeasureReportStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRMeasureReportStatusListTest.php index c730bbba75..03172c8b35 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRMeasureReportStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRMeasureReportStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRMeasureReportTypeListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRMeasureReportTypeListTest.php index 76547ce828..1560fd28cc 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRMeasureReportTypeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRMeasureReportTypeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRMedicationRequestIntentListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRMedicationRequestIntentListTest.php index dcdb163c7c..89af4654a2 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRMedicationRequestIntentListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRMedicationRequestIntentListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRMedicationStatusCodesListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRMedicationStatusCodesListTest.php index 53441a3f61..b02f50bb94 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRMedicationStatusCodesListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRMedicationStatusCodesListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRMedicationrequestStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRMedicationrequestStatusListTest.php index 7ffe14751b..5f6d9c40a1 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRMedicationrequestStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRMedicationrequestStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRMessageSignificanceCategoryListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRMessageSignificanceCategoryListTest.php index bd2ad907c3..d1d1b97c53 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRMessageSignificanceCategoryListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRMessageSignificanceCategoryListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRMessageheaderResponseRequestListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRMessageheaderResponseRequestListTest.php index e2a92cb49e..8f83b612ae 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRMessageheaderResponseRequestListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRMessageheaderResponseRequestListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRNameUseListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRNameUseListTest.php index fefed851db..4833ce0a41 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRNameUseListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRNameUseListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRNamingSystemIdentifierTypeListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRNamingSystemIdentifierTypeListTest.php index bbacd06c58..44e431b4be 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRNamingSystemIdentifierTypeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRNamingSystemIdentifierTypeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRNamingSystemTypeListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRNamingSystemTypeListTest.php index db5ac6afa3..780cae3f72 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRNamingSystemTypeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRNamingSystemTypeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRNarrativeStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRNarrativeStatusListTest.php index 1b4c390086..9813f69fb5 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRNarrativeStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRNarrativeStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRNoteTypeListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRNoteTypeListTest.php index ebabef6fe1..2ec1f63129 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRNoteTypeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRNoteTypeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRObservationDataTypeListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRObservationDataTypeListTest.php index 689fa63714..66b895c200 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRObservationDataTypeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRObservationDataTypeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRObservationRangeCategoryListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRObservationRangeCategoryListTest.php index 64a899c9f7..ef792b8dc7 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRObservationRangeCategoryListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRObservationRangeCategoryListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRObservationStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRObservationStatusListTest.php index 004df8c79f..0efccb70c4 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRObservationStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRObservationStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIROidPrimitiveTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIROidPrimitiveTest.php index f554a2864c..aa6413c33d 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIROidPrimitiveTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIROidPrimitiveTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIROperationKindListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIROperationKindListTest.php index e32f18affd..b04ddfa224 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIROperationKindListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIROperationKindListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIROperationParameterUseListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIROperationParameterUseListTest.php index cb8d7b161f..219a8025ba 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIROperationParameterUseListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIROperationParameterUseListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIROrientationTypeListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIROrientationTypeListTest.php index 2a71baebf1..3526327078 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIROrientationTypeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIROrientationTypeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRParticipantRequiredListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRParticipantRequiredListTest.php index d5f693d626..03f432b7bf 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRParticipantRequiredListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRParticipantRequiredListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRParticipationStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRParticipationStatusListTest.php index 8e9a058b9e..8a1efec352 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRParticipationStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRParticipationStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRPositiveIntPrimitiveTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRPositiveIntPrimitiveTest.php index 95784992a5..76d6701728 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRPositiveIntPrimitiveTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRPositiveIntPrimitiveTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRPropertyRepresentationListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRPropertyRepresentationListTest.php index 48427a7ff2..3632873702 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRPropertyRepresentationListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRPropertyRepresentationListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRPropertyTypeListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRPropertyTypeListTest.php index ea1b1af959..02ae489eb7 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRPropertyTypeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRPropertyTypeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRProvenanceEntityRoleListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRProvenanceEntityRoleListTest.php index 7e075a0ff3..715c101b0f 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRProvenanceEntityRoleListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRProvenanceEntityRoleListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRPublicationStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRPublicationStatusListTest.php index c3b717a2e1..afb9cef023 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRPublicationStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRPublicationStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRQualityTypeListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRQualityTypeListTest.php index 539f8dc1eb..ef182396d3 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRQualityTypeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRQualityTypeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRQuantityComparatorListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRQuantityComparatorListTest.php index 499e507602..f7248caa38 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRQuantityComparatorListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRQuantityComparatorListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRQuestionnaireItemOperatorListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRQuestionnaireItemOperatorListTest.php index 1b0e71fa4b..84eab28a89 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRQuestionnaireItemOperatorListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRQuestionnaireItemOperatorListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRQuestionnaireItemTypeListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRQuestionnaireItemTypeListTest.php index ca62458362..fb84fd14a4 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRQuestionnaireItemTypeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRQuestionnaireItemTypeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRQuestionnaireResponseStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRQuestionnaireResponseStatusListTest.php index f8cf91e8af..a5268de22f 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRQuestionnaireResponseStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRQuestionnaireResponseStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRReferenceHandlingPolicyListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRReferenceHandlingPolicyListTest.php index ed11125f37..9461187af4 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRReferenceHandlingPolicyListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRReferenceHandlingPolicyListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRReferenceVersionRulesListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRReferenceVersionRulesListTest.php index 1eb98afb09..e918592f5d 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRReferenceVersionRulesListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRReferenceVersionRulesListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRRelatedArtifactTypeListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRRelatedArtifactTypeListTest.php index 7319763ff6..b3594a4be7 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRRelatedArtifactTypeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRRelatedArtifactTypeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRRemittanceOutcomeListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRRemittanceOutcomeListTest.php index bd8956ce07..6a68a2d180 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRRemittanceOutcomeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRRemittanceOutcomeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRRepositoryTypeListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRRepositoryTypeListTest.php index 5cb5639ff1..cc19cccbc7 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRRepositoryTypeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRRepositoryTypeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRRequestIntentListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRRequestIntentListTest.php index a577e1abee..e3e2ab18e9 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRRequestIntentListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRRequestIntentListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRRequestPriorityListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRRequestPriorityListTest.php index 9305e5f971..964b5f18f3 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRRequestPriorityListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRRequestPriorityListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRRequestResourceTypeListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRRequestResourceTypeListTest.php index eff027db31..5d347dea68 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRRequestResourceTypeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRRequestResourceTypeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRRequestStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRRequestStatusListTest.php index df6fd06e33..6b12f0f6f7 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRRequestStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRRequestStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResearchElementTypeListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResearchElementTypeListTest.php index f16a81b907..7243d5b64d 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResearchElementTypeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResearchElementTypeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResearchStudyStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResearchStudyStatusListTest.php index a2d820ba53..e88740227d 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResearchStudyStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResearchStudyStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResearchSubjectStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResearchSubjectStatusListTest.php index f8f039f049..5f0cb7f8ec 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResearchSubjectStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResearchSubjectStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRBinaryTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRBinaryTest.php index b1dd2683c4..8e2ea83f3f 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRBinaryTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRBinaryTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRBundleTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRBundleTest.php index 00d2249660..40cb46b96d 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRBundleTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRBundleTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRAccountTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRAccountTest.php index aafc662729..623e4f6582 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRAccountTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRAccountTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRActivityDefinitionTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRActivityDefinitionTest.php index 1b03774928..f22fd2c7f7 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRActivityDefinitionTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRActivityDefinitionTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRAdverseEventTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRAdverseEventTest.php index 98b97cd0f4..e84b1dd845 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRAdverseEventTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRAdverseEventTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRAllergyIntoleranceTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRAllergyIntoleranceTest.php index 8373e7ef1d..37d3f0925c 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRAllergyIntoleranceTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRAllergyIntoleranceTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRAppointmentResponseTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRAppointmentResponseTest.php index 3a6eaf45fe..dabf0d3cfa 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRAppointmentResponseTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRAppointmentResponseTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRAppointmentTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRAppointmentTest.php index eb8ff07d17..906a17cdc4 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRAppointmentTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRAppointmentTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRAuditEventTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRAuditEventTest.php index 44edc2f70b..5e6d61be06 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRAuditEventTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRAuditEventTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRBasicTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRBasicTest.php index 53179f8d72..d99ef0b731 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRBasicTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRBasicTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRBiologicallyDerivedProductTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRBiologicallyDerivedProductTest.php index 03fd74fd1a..804f3ed176 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRBiologicallyDerivedProductTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRBiologicallyDerivedProductTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRBodyStructureTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRBodyStructureTest.php index 1cef7b6c20..d473450887 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRBodyStructureTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRBodyStructureTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRCapabilityStatementTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRCapabilityStatementTest.php index 5538262e9d..9f06c11390 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRCapabilityStatementTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRCapabilityStatementTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRCarePlanTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRCarePlanTest.php index 3a0ca2a9f4..750ef2a482 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRCarePlanTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRCarePlanTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRCareTeamTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRCareTeamTest.php index bb88001e2f..e3821ee9e8 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRCareTeamTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRCareTeamTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRCatalogEntryTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRCatalogEntryTest.php index 2ac31beead..8630f7777c 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRCatalogEntryTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRCatalogEntryTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRChargeItemDefinitionTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRChargeItemDefinitionTest.php index 814f40079f..9a090d8586 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRChargeItemDefinitionTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRChargeItemDefinitionTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRChargeItemTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRChargeItemTest.php index df531ce89c..ea9c6f9db8 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRChargeItemTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRChargeItemTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRClaimResponseTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRClaimResponseTest.php index dda60baabe..7357d53450 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRClaimResponseTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRClaimResponseTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRClaimTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRClaimTest.php index a46e4dc233..6a407d7746 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRClaimTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRClaimTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRClinicalImpressionTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRClinicalImpressionTest.php index 582ed7dd31..0e7b44ea5d 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRClinicalImpressionTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRClinicalImpressionTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRCodeSystemTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRCodeSystemTest.php index 54ed19b222..b0491767a6 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRCodeSystemTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRCodeSystemTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRCommunicationRequestTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRCommunicationRequestTest.php index 8bafb11193..61d699fe12 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRCommunicationRequestTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRCommunicationRequestTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRCommunicationTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRCommunicationTest.php index 3fe057fdb6..34e3e4cbda 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRCommunicationTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRCommunicationTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRCompartmentDefinitionTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRCompartmentDefinitionTest.php index 01df403042..7fb149b46b 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRCompartmentDefinitionTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRCompartmentDefinitionTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRCompositionTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRCompositionTest.php index cb31c582e3..cb5a6a89a3 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRCompositionTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRCompositionTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRConceptMapTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRConceptMapTest.php index 536b9116f7..030a3ace2b 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRConceptMapTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRConceptMapTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRConditionTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRConditionTest.php index 695924a325..0225efb977 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRConditionTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRConditionTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRConsentTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRConsentTest.php index fbaaa5dae5..edcf5393f0 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRConsentTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRConsentTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRContractTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRContractTest.php index 2086f75d0b..dd3812d08d 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRContractTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRContractTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRCoverageEligibilityRequestTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRCoverageEligibilityRequestTest.php index 1f8fdb3882..53a66a74e1 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRCoverageEligibilityRequestTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRCoverageEligibilityRequestTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRCoverageEligibilityResponseTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRCoverageEligibilityResponseTest.php index aaf3a242c8..49a7c32ae1 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRCoverageEligibilityResponseTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRCoverageEligibilityResponseTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRCoverageTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRCoverageTest.php index 0316b2331d..dfa30fbc1a 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRCoverageTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRCoverageTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRDetectedIssueTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRDetectedIssueTest.php index 072aef840d..2e992a66ed 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRDetectedIssueTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRDetectedIssueTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRDeviceDefinitionTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRDeviceDefinitionTest.php index 5153046ac0..eabc71bb48 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRDeviceDefinitionTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRDeviceDefinitionTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRDeviceMetricTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRDeviceMetricTest.php index 224521ddb6..f840d84ca1 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRDeviceMetricTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRDeviceMetricTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRDeviceRequestTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRDeviceRequestTest.php index fd667a3945..e3864253c6 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRDeviceRequestTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRDeviceRequestTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRDeviceTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRDeviceTest.php index 6aeb6062a1..148fe764ff 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRDeviceTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRDeviceTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRDeviceUseStatementTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRDeviceUseStatementTest.php index 95d2a01257..f542a3f6b7 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRDeviceUseStatementTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRDeviceUseStatementTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRDiagnosticReportTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRDiagnosticReportTest.php index b5c3a7f527..26b15de467 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRDiagnosticReportTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRDiagnosticReportTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRDocumentManifestTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRDocumentManifestTest.php index 1ce56d382d..026e9aa5b6 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRDocumentManifestTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRDocumentManifestTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRDocumentReferenceTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRDocumentReferenceTest.php index 18eaa7bb4c..b21bcffb7e 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRDocumentReferenceTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRDocumentReferenceTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIREffectEvidenceSynthesisTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIREffectEvidenceSynthesisTest.php index 714f4164c2..005762a1f1 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIREffectEvidenceSynthesisTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIREffectEvidenceSynthesisTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIREncounterTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIREncounterTest.php index 4344dc1a6a..0415545367 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIREncounterTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIREncounterTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIREndpointTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIREndpointTest.php index a5f5baf72b..b3bb2fb246 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIREndpointTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIREndpointTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIREnrollmentRequestTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIREnrollmentRequestTest.php index 24190ac544..eb64daf57b 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIREnrollmentRequestTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIREnrollmentRequestTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIREnrollmentResponseTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIREnrollmentResponseTest.php index 9edff5ab09..60e4d9ac35 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIREnrollmentResponseTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIREnrollmentResponseTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIREpisodeOfCareTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIREpisodeOfCareTest.php index e3b4339d01..e17da5ec5e 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIREpisodeOfCareTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIREpisodeOfCareTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIREventDefinitionTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIREventDefinitionTest.php index 65afa43119..81acd5f5f4 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIREventDefinitionTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIREventDefinitionTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIREvidenceTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIREvidenceTest.php index 48e8f54c99..dd84b37431 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIREvidenceTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIREvidenceTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIREvidenceVariableTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIREvidenceVariableTest.php index 86a450ab96..43fd225c63 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIREvidenceVariableTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIREvidenceVariableTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRExampleScenarioTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRExampleScenarioTest.php index c51998b748..d304e2f47b 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRExampleScenarioTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRExampleScenarioTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRExplanationOfBenefitTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRExplanationOfBenefitTest.php index 884ba42ef3..a699e567bf 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRExplanationOfBenefitTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRExplanationOfBenefitTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRFamilyMemberHistoryTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRFamilyMemberHistoryTest.php index 1d52e16cdb..eae0419d5e 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRFamilyMemberHistoryTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRFamilyMemberHistoryTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRFlagTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRFlagTest.php index 37fb235b13..e129b7978e 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRFlagTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRFlagTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRGoalTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRGoalTest.php index 2f12e6102d..e5d843a329 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRGoalTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRGoalTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRGraphDefinitionTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRGraphDefinitionTest.php index 5fa2683e03..1877134742 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRGraphDefinitionTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRGraphDefinitionTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRGroupTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRGroupTest.php index acf89b0ca2..a0a40076ef 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRGroupTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRGroupTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRGuidanceResponseTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRGuidanceResponseTest.php index 773e4d100c..41d7bb2329 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRGuidanceResponseTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRGuidanceResponseTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRHealthcareServiceTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRHealthcareServiceTest.php index 5189516a0a..c24020a4e9 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRHealthcareServiceTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRHealthcareServiceTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRImagingStudyTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRImagingStudyTest.php index ef6ec55139..2c3649183d 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRImagingStudyTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRImagingStudyTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRImmunizationEvaluationTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRImmunizationEvaluationTest.php index 6e6400ec3b..51c11510a4 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRImmunizationEvaluationTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRImmunizationEvaluationTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRImmunizationRecommendationTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRImmunizationRecommendationTest.php index 90eeac600c..b8ee1a0729 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRImmunizationRecommendationTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRImmunizationRecommendationTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRImmunizationTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRImmunizationTest.php index 369caa63ec..f6d83a9a11 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRImmunizationTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRImmunizationTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRImplementationGuideTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRImplementationGuideTest.php index cdbfb373a3..620f79f33c 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRImplementationGuideTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRImplementationGuideTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRInsurancePlanTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRInsurancePlanTest.php index b0592838e3..30746be83e 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRInsurancePlanTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRInsurancePlanTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRInvoiceTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRInvoiceTest.php index c93be690e1..6e77c6e6d8 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRInvoiceTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRInvoiceTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRLibraryTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRLibraryTest.php index dfa9dd0915..3c2033e43e 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRLibraryTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRLibraryTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRLinkageTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRLinkageTest.php index 5508d06960..17a1129c2b 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRLinkageTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRLinkageTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRListTest.php index c096577a39..bf3a79a2a9 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRLocationTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRLocationTest.php index 016c1a1dfb..4fed0e05be 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRLocationTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRLocationTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRMeasureReportTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRMeasureReportTest.php index 41feca4cf2..81b4625874 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRMeasureReportTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRMeasureReportTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRMeasureTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRMeasureTest.php index 921d268a8d..0836fcc6dd 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRMeasureTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRMeasureTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRMediaTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRMediaTest.php index ea021b5de0..6a6569ddbf 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRMediaTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRMediaTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRMedicationAdministrationTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRMedicationAdministrationTest.php index 47d6d02c0e..cd3f4a32b6 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRMedicationAdministrationTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRMedicationAdministrationTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRMedicationDispenseTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRMedicationDispenseTest.php index 27c3df500a..01e5af4d03 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRMedicationDispenseTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRMedicationDispenseTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRMedicationKnowledgeTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRMedicationKnowledgeTest.php index a8c530839a..7f5ab9ded6 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRMedicationKnowledgeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRMedicationKnowledgeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRMedicationRequestTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRMedicationRequestTest.php index 4477de3d94..c518288972 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRMedicationRequestTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRMedicationRequestTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRMedicationStatementTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRMedicationStatementTest.php index 7cf3352b0b..cbc71983a3 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRMedicationStatementTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRMedicationStatementTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRMedicationTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRMedicationTest.php index fe09ae6aea..7cdb6e12d7 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRMedicationTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRMedicationTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRMedicinalProductAuthorizationTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRMedicinalProductAuthorizationTest.php index f09928f2ec..23e3b3beb6 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRMedicinalProductAuthorizationTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRMedicinalProductAuthorizationTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRMedicinalProductContraindicationTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRMedicinalProductContraindicationTest.php index ad6d8cbcbe..3260ab6a14 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRMedicinalProductContraindicationTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRMedicinalProductContraindicationTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRMedicinalProductIndicationTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRMedicinalProductIndicationTest.php index 82e464e417..a6bbe049ae 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRMedicinalProductIndicationTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRMedicinalProductIndicationTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRMedicinalProductIngredientTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRMedicinalProductIngredientTest.php index 53bdb7fe83..5bac00a50f 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRMedicinalProductIngredientTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRMedicinalProductIngredientTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRMedicinalProductInteractionTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRMedicinalProductInteractionTest.php index e5218c77af..b33d626989 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRMedicinalProductInteractionTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRMedicinalProductInteractionTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRMedicinalProductManufacturedTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRMedicinalProductManufacturedTest.php index 9d562b8770..f94db15ac9 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRMedicinalProductManufacturedTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRMedicinalProductManufacturedTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRMedicinalProductPackagedTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRMedicinalProductPackagedTest.php index b851e7425c..0ee95df347 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRMedicinalProductPackagedTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRMedicinalProductPackagedTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRMedicinalProductPharmaceuticalTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRMedicinalProductPharmaceuticalTest.php index 84f3224a8d..eb2c0fd05c 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRMedicinalProductPharmaceuticalTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRMedicinalProductPharmaceuticalTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRMedicinalProductTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRMedicinalProductTest.php index 41808279bd..643558f2a0 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRMedicinalProductTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRMedicinalProductTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRMedicinalProductUndesirableEffectTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRMedicinalProductUndesirableEffectTest.php index 252cf7a192..35fb2b4068 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRMedicinalProductUndesirableEffectTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRMedicinalProductUndesirableEffectTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRMessageDefinitionTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRMessageDefinitionTest.php index 5403eb7b70..42c4d354f1 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRMessageDefinitionTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRMessageDefinitionTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRMessageHeaderTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRMessageHeaderTest.php index 26711b58ff..d928d12067 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRMessageHeaderTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRMessageHeaderTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRMolecularSequenceTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRMolecularSequenceTest.php index b07ab308ef..1d5c6bac20 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRMolecularSequenceTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRMolecularSequenceTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRNamingSystemTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRNamingSystemTest.php index c24c39cf76..282cdb3a19 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRNamingSystemTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRNamingSystemTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRNutritionOrderTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRNutritionOrderTest.php index 85dbffe534..1ee4579133 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRNutritionOrderTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRNutritionOrderTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRObservationDefinitionTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRObservationDefinitionTest.php index b389c0f8b0..bc40f975f3 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRObservationDefinitionTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRObservationDefinitionTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRObservationTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRObservationTest.php index f890acbabb..6c554c77c9 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRObservationTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRObservationTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIROperationDefinitionTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIROperationDefinitionTest.php index f3262d47ca..45cc7aab4d 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIROperationDefinitionTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIROperationDefinitionTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIROperationOutcomeTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIROperationOutcomeTest.php index 12eccf48c9..83a3eb5fbb 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIROperationOutcomeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIROperationOutcomeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIROrganizationAffiliationTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIROrganizationAffiliationTest.php index 9621e2f986..68b9500882 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIROrganizationAffiliationTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIROrganizationAffiliationTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIROrganizationTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIROrganizationTest.php index 26e04fab87..40e9884318 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIROrganizationTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIROrganizationTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRPatientTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRPatientTest.php index 39638594d7..6ec1842f28 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRPatientTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRPatientTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRPaymentNoticeTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRPaymentNoticeTest.php index 5fb0a0a55a..e05865aa3e 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRPaymentNoticeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRPaymentNoticeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRPaymentReconciliationTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRPaymentReconciliationTest.php index ef904ed316..71d103d8bc 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRPaymentReconciliationTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRPaymentReconciliationTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRPersonTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRPersonTest.php index 536c2718df..7fe4517020 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRPersonTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRPersonTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRPlanDefinitionTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRPlanDefinitionTest.php index 5d2816e2e2..3f7aad7617 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRPlanDefinitionTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRPlanDefinitionTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRPractitionerRoleTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRPractitionerRoleTest.php index 353eaca300..3f9eb8d12c 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRPractitionerRoleTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRPractitionerRoleTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRPractitionerTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRPractitionerTest.php index 83d9548838..254c2ad9ea 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRPractitionerTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRPractitionerTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRProcedureTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRProcedureTest.php index 50ef8f5ae5..8716e04881 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRProcedureTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRProcedureTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRProvenanceTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRProvenanceTest.php index 935f3e7843..e5df246ff0 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRProvenanceTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRProvenanceTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRQuestionnaireResponseTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRQuestionnaireResponseTest.php index 4256b9234e..8ec191ef24 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRQuestionnaireResponseTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRQuestionnaireResponseTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRQuestionnaireTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRQuestionnaireTest.php index 964bb476c4..ab46a4369c 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRQuestionnaireTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRQuestionnaireTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRRelatedPersonTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRRelatedPersonTest.php index 8c42b21811..9dd98c1958 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRRelatedPersonTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRRelatedPersonTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRRequestGroupTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRRequestGroupTest.php index d7e43145f8..653fc61669 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRRequestGroupTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRRequestGroupTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRResearchDefinitionTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRResearchDefinitionTest.php index 9c10eb8943..1763a570d3 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRResearchDefinitionTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRResearchDefinitionTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRResearchElementDefinitionTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRResearchElementDefinitionTest.php index a3220ef14b..e9e378afe5 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRResearchElementDefinitionTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRResearchElementDefinitionTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRResearchStudyTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRResearchStudyTest.php index ef8e23f20e..cb9cc0bb79 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRResearchStudyTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRResearchStudyTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRResearchSubjectTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRResearchSubjectTest.php index edb181b960..8e7cb64598 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRResearchSubjectTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRResearchSubjectTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRRiskAssessmentTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRRiskAssessmentTest.php index 787b2492d3..1a466b9c4a 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRRiskAssessmentTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRRiskAssessmentTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRRiskEvidenceSynthesisTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRRiskEvidenceSynthesisTest.php index e44b1548e8..5cd95690e9 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRRiskEvidenceSynthesisTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRRiskEvidenceSynthesisTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRScheduleTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRScheduleTest.php index cd966ab4a5..47b8a43a9c 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRScheduleTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRScheduleTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRSearchParameterTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRSearchParameterTest.php index ba5e0da752..34f6b9e4f2 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRSearchParameterTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRSearchParameterTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRServiceRequestTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRServiceRequestTest.php index dafec89d33..f32b7c90e0 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRServiceRequestTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRServiceRequestTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRSlotTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRSlotTest.php index 9c76cf881b..e3b5d50077 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRSlotTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRSlotTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRSpecimenDefinitionTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRSpecimenDefinitionTest.php index d48fc407c2..6672964c58 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRSpecimenDefinitionTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRSpecimenDefinitionTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRSpecimenTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRSpecimenTest.php index d4b0978b1e..5b59ea23b2 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRSpecimenTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRSpecimenTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRStructureDefinitionTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRStructureDefinitionTest.php index 28fd97aa07..f54a05b4ad 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRStructureDefinitionTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRStructureDefinitionTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRStructureMapTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRStructureMapTest.php index 648c02ce29..7ae7bcc4ba 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRStructureMapTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRStructureMapTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRSubscriptionTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRSubscriptionTest.php index 57484025e8..d8005c7d79 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRSubscriptionTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRSubscriptionTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRSubstanceNucleicAcidTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRSubstanceNucleicAcidTest.php index d8be2715c0..50aa89039a 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRSubstanceNucleicAcidTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRSubstanceNucleicAcidTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRSubstancePolymerTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRSubstancePolymerTest.php index 87b6c6bfaf..61eb094f90 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRSubstancePolymerTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRSubstancePolymerTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRSubstanceProteinTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRSubstanceProteinTest.php index fac144c864..e5b7df4436 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRSubstanceProteinTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRSubstanceProteinTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRSubstanceReferenceInformationTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRSubstanceReferenceInformationTest.php index ccbbba1a3d..382d59eded 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRSubstanceReferenceInformationTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRSubstanceReferenceInformationTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRSubstanceSourceMaterialTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRSubstanceSourceMaterialTest.php index 3d241a4df9..71f65a2d03 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRSubstanceSourceMaterialTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRSubstanceSourceMaterialTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRSubstanceSpecificationTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRSubstanceSpecificationTest.php index 5ae4eaa813..b17f8776e8 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRSubstanceSpecificationTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRSubstanceSpecificationTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRSubstanceTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRSubstanceTest.php index ff3e198caf..09b9b8c7a5 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRSubstanceTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRSubstanceTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRSupplyDeliveryTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRSupplyDeliveryTest.php index 279f1c3694..f10b282d70 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRSupplyDeliveryTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRSupplyDeliveryTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRSupplyRequestTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRSupplyRequestTest.php index d7300c2a70..ed6c16b412 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRSupplyRequestTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRSupplyRequestTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRTaskTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRTaskTest.php index 46ecdd67e1..c9e1c1e476 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRTaskTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRTaskTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRTerminologyCapabilitiesTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRTerminologyCapabilitiesTest.php index f5ab439f65..916d374d55 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRTerminologyCapabilitiesTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRTerminologyCapabilitiesTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRTestReportTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRTestReportTest.php index 55b7a276a7..84884a06a6 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRTestReportTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRTestReportTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRTestScriptTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRTestScriptTest.php index 5b6494dcc8..71a335e22a 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRTestScriptTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRTestScriptTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRValueSetTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRValueSetTest.php index 5994de09de..579fd15677 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRValueSetTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRValueSetTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRVerificationResultTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRVerificationResultTest.php index b4fe61c5a3..e3de16b5f9 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRVerificationResultTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRVerificationResultTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRVisionPrescriptionTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRVisionPrescriptionTest.php index 8ed1b75f6a..210c68c409 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRVisionPrescriptionTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRVisionPrescriptionTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResourceTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResourceTest.php index 3db3eb3256..b6d9612b53 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResourceTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRDomainResourceTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRParametersTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRParametersTest.php index 8abba936c4..347811df8f 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRParametersTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResource/FHIRParametersTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResourceContainerTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResourceContainerTest.php index 9a1e2fcdb1..0f02e12a3e 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResourceContainerTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResourceContainerTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResourceTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResourceTest.php index bcbd40922f..1074da813b 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResourceTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResourceTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResourceTypeListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResourceTypeListTest.php index 2088d67dbb..d9de7aa5fb 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResourceTypeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResourceTypeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResourceTypeTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResourceTypeTest.php index 02674b56fe..4a6b4dfe6b 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResourceTypeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResourceTypeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResourceVersionPolicyListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResourceVersionPolicyListTest.php index c65e61d769..c085cf5491 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResourceVersionPolicyListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResourceVersionPolicyListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResponseTypeListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResponseTypeListTest.php index 74efc88450..e45f93a8a2 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResponseTypeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRResponseTypeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRRestfulCapabilityModeListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRRestfulCapabilityModeListTest.php index aa5badab6c..5692f02886 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRRestfulCapabilityModeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRRestfulCapabilityModeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRSPDXLicenseListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRSPDXLicenseListTest.php index d677672f81..3d7a3068bb 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRSPDXLicenseListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRSPDXLicenseListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRSampledDataDataTypePrimitiveTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRSampledDataDataTypePrimitiveTest.php index 53771427b0..f921937e92 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRSampledDataDataTypePrimitiveTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRSampledDataDataTypePrimitiveTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRSearchComparatorListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRSearchComparatorListTest.php index 0ed5683686..5b117cdbe9 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRSearchComparatorListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRSearchComparatorListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRSearchEntryModeListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRSearchEntryModeListTest.php index 3c23a850a6..3cfe39f025 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRSearchEntryModeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRSearchEntryModeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRSearchModifierCodeListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRSearchModifierCodeListTest.php index 0a5c53c700..74880d1a3f 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRSearchModifierCodeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRSearchModifierCodeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRSearchParamTypeListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRSearchParamTypeListTest.php index bdae8d6f23..593d525c4c 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRSearchParamTypeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRSearchParamTypeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRSequenceTypeListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRSequenceTypeListTest.php index 9068a72d19..4c744c967a 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRSequenceTypeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRSequenceTypeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRSlicingRulesListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRSlicingRulesListTest.php index bf71c5e866..8f6bfe3671 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRSlicingRulesListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRSlicingRulesListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRSlotStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRSlotStatusListTest.php index 80d0267cea..3332da4e94 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRSlotStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRSlotStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRSortDirectionListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRSortDirectionListTest.php index 93e5ada492..78bccd1f92 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRSortDirectionListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRSortDirectionListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRSpecimenContainedPreferenceListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRSpecimenContainedPreferenceListTest.php index f1e80cc87c..481510cb30 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRSpecimenContainedPreferenceListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRSpecimenContainedPreferenceListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRSpecimenStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRSpecimenStatusListTest.php index 8ba5b67465..608e4306ad 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRSpecimenStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRSpecimenStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRStatusListTest.php index 4a21e93931..55951f892c 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRStrandTypeListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRStrandTypeListTest.php index 77a9b9b95b..47771d8025 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRStrandTypeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRStrandTypeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRStringPrimitiveTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRStringPrimitiveTest.php index 0501e6519e..e6c50cd60f 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRStringPrimitiveTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRStringPrimitiveTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRStructureDefinitionKindListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRStructureDefinitionKindListTest.php index 9a1d18d7ff..fab2ee6104 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRStructureDefinitionKindListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRStructureDefinitionKindListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRStructureMapContextTypeListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRStructureMapContextTypeListTest.php index 53f515094d..dfde3cef74 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRStructureMapContextTypeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRStructureMapContextTypeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRStructureMapGroupTypeModeListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRStructureMapGroupTypeModeListTest.php index 87b51c6573..5422a13e10 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRStructureMapGroupTypeModeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRStructureMapGroupTypeModeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRStructureMapInputModeListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRStructureMapInputModeListTest.php index 3846266bdf..5fad5fca60 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRStructureMapInputModeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRStructureMapInputModeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRStructureMapModelModeListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRStructureMapModelModeListTest.php index 9aa67b42a3..a980fd1868 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRStructureMapModelModeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRStructureMapModelModeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRStructureMapSourceListModeListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRStructureMapSourceListModeListTest.php index fc75e5e67b..f2ee57bd09 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRStructureMapSourceListModeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRStructureMapSourceListModeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRStructureMapTargetListModeListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRStructureMapTargetListModeListTest.php index 5ac4e91202..7cf9462ff1 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRStructureMapTargetListModeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRStructureMapTargetListModeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRStructureMapTransformListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRStructureMapTransformListTest.php index 5e2491b2b6..51a026153b 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRStructureMapTransformListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRStructureMapTransformListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRSubscriptionChannelTypeListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRSubscriptionChannelTypeListTest.php index 292c375023..5d796e12eb 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRSubscriptionChannelTypeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRSubscriptionChannelTypeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRSubscriptionStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRSubscriptionStatusListTest.php index 0b2380ab88..50760cc43a 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRSubscriptionStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRSubscriptionStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRSupplyDeliveryStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRSupplyDeliveryStatusListTest.php index bb7a84a989..318c9ec1e4 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRSupplyDeliveryStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRSupplyDeliveryStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRSupplyRequestStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRSupplyRequestStatusListTest.php index 60cc59c3e7..eac6583b65 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRSupplyRequestStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRSupplyRequestStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRSystemRestfulInteractionListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRSystemRestfulInteractionListTest.php index 85ec556405..003b130195 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRSystemRestfulInteractionListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRSystemRestfulInteractionListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRTaskIntentListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRTaskIntentListTest.php index 249848a5e5..c6e356faa7 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRTaskIntentListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRTaskIntentListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRTaskStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRTaskStatusListTest.php index 2289409e8e..639e5ef6aa 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRTaskStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRTaskStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRTestReportActionResultListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRTestReportActionResultListTest.php index cb09eea214..0cdce9854a 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRTestReportActionResultListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRTestReportActionResultListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRTestReportParticipantTypeListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRTestReportParticipantTypeListTest.php index 7457e62cc4..a2743193b7 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRTestReportParticipantTypeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRTestReportParticipantTypeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRTestReportResultListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRTestReportResultListTest.php index 6457d1e957..1d3401b0a8 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRTestReportResultListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRTestReportResultListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRTestReportStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRTestReportStatusListTest.php index 8f1d1a7a87..dba2b924d6 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRTestReportStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRTestReportStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRTestScriptRequestMethodCodeListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRTestScriptRequestMethodCodeListTest.php index 12f59ec16e..4692878299 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRTestScriptRequestMethodCodeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRTestScriptRequestMethodCodeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRTimePrimitiveTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRTimePrimitiveTest.php index ea2e014b85..b2adcf5c47 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRTimePrimitiveTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRTimePrimitiveTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRTriggerTypeListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRTriggerTypeListTest.php index 7db3dada20..3bf630f862 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRTriggerTypeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRTriggerTypeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRTypeDerivationRuleListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRTypeDerivationRuleListTest.php index 4de7a7d504..3786b703f3 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRTypeDerivationRuleListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRTypeDerivationRuleListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRTypeRestfulInteractionListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRTypeRestfulInteractionListTest.php index 6f78572c59..5e318ea0f5 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRTypeRestfulInteractionListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRTypeRestfulInteractionListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRUDIEntryTypeListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRUDIEntryTypeListTest.php index c19a0ddcc5..9618470c13 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRUDIEntryTypeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRUDIEntryTypeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRUnitsOfTimeListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRUnitsOfTimeListTest.php index d7127e119e..759f48022c 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRUnitsOfTimeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRUnitsOfTimeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRUnsignedIntPrimitiveTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRUnsignedIntPrimitiveTest.php index 1859e3260d..863ebc4d55 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRUnsignedIntPrimitiveTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRUnsignedIntPrimitiveTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRUriPrimitiveTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRUriPrimitiveTest.php index 9a0f64df75..096e0d9c06 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRUriPrimitiveTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRUriPrimitiveTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRUrlPrimitiveTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRUrlPrimitiveTest.php index 51cae5e1da..0e6b01ea30 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRUrlPrimitiveTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRUrlPrimitiveTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRUseListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRUseListTest.php index 43ed135d21..db8987faa7 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRUseListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRUseListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRUuidPrimitiveTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRUuidPrimitiveTest.php index cde736a30c..7d0ba9638b 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRUuidPrimitiveTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRUuidPrimitiveTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRVConfidentialityClassificationListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRVConfidentialityClassificationListTest.php index e0726bf6b2..fd830c2aa2 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRVConfidentialityClassificationListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRVConfidentialityClassificationListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRVariableTypeListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRVariableTypeListTest.php index 2e018a6a63..126fec803e 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRVariableTypeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRVariableTypeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRVisionBaseListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRVisionBaseListTest.php index 7df3c9c630..7a54ba93b6 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRVisionBaseListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRVisionBaseListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRVisionEyesListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRVisionEyesListTest.php index 3716838be9..901ed838d3 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRVisionEyesListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRVisionEyesListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRXPathUsageTypeListTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRXPathUsageTypeListTest.php index 8cf9df1322..bb323d0b6e 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRXPathUsageTypeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/FHIRXPathUsageTypeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/PHPFHIRConstantsTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/PHPFHIRConstantsTest.php index 69819c9694..3df39d3491 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/PHPFHIRConstantsTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/PHPFHIRConstantsTest.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/PHPFHIRTypeMapTest.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/PHPFHIRTypeMapTest.php index adb4dc4db3..aba4460df6 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/PHPFHIRTypeMapTest.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTests/PHPFHIRTypeMapTest.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTypeInterface.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTypeInterface.php index d541cf6bea..b1e777975c 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTypeInterface.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTypeInterface.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTypeMap.php b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTypeMap.php index ae60473987..d2068b6477 100644 --- a/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTypeMap.php +++ b/src/DCarbone/PHPFHIRGenerated/R4/PHPFHIRTypeMap.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:21+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRAccountStatusList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRAccountStatusList.php index bb7c005c67..08bef74dbe 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRAccountStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRAccountStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRActionCardinalityBehaviorList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRActionCardinalityBehaviorList.php index 38b81b258b..cd1a079acb 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRActionCardinalityBehaviorList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRActionCardinalityBehaviorList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRActionConditionKindList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRActionConditionKindList.php index 945f3a1c1c..772d317ed2 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRActionConditionKindList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRActionConditionKindList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRActionGroupingBehaviorList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRActionGroupingBehaviorList.php index ef2a3e5736..bfc8cf3c77 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRActionGroupingBehaviorList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRActionGroupingBehaviorList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRActionListList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRActionListList.php index d51d76dbc3..1d5405e6ee 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRActionListList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRActionListList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRActionParticipantTypeList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRActionParticipantTypeList.php index 9b051a1552..20d89818b4 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRActionParticipantTypeList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRActionParticipantTypeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRActionPrecheckBehaviorList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRActionPrecheckBehaviorList.php index 69b10be2ec..67c979374c 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRActionPrecheckBehaviorList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRActionPrecheckBehaviorList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRActionRelationshipTypeList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRActionRelationshipTypeList.php index 96ee3a24bc..b23e5d8e02 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRActionRelationshipTypeList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRActionRelationshipTypeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRActionRequiredBehaviorList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRActionRequiredBehaviorList.php index ea8a5f4e6b..03e317cdb8 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRActionRequiredBehaviorList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRActionRequiredBehaviorList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRActionSelectionBehaviorList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRActionSelectionBehaviorList.php index ee536ce928..b610283b04 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRActionSelectionBehaviorList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRActionSelectionBehaviorList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRAddressTypeList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRAddressTypeList.php index dac54807e3..5a9ff36679 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRAddressTypeList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRAddressTypeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRAddressUseList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRAddressUseList.php index 33d3dde254..4ac8f95581 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRAddressUseList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRAddressUseList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRAdministrativeGenderList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRAdministrativeGenderList.php index 93c8fdbd96..c61db6283d 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRAdministrativeGenderList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRAdministrativeGenderList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRAdverseEventCategoryList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRAdverseEventCategoryList.php index f2c0d2b60b..38bb939647 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRAdverseEventCategoryList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRAdverseEventCategoryList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRAdverseEventCausalityList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRAdverseEventCausalityList.php index e190a562c4..17895e5bd9 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRAdverseEventCausalityList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRAdverseEventCausalityList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRAggregationModeList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRAggregationModeList.php index f3d63a9248..812a25dd75 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRAggregationModeList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRAggregationModeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRAllergyIntoleranceCategoryList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRAllergyIntoleranceCategoryList.php index 85b354065c..1002fa0d7e 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRAllergyIntoleranceCategoryList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRAllergyIntoleranceCategoryList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRAllergyIntoleranceClinicalStatusList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRAllergyIntoleranceClinicalStatusList.php index 4f6ae82711..1b0efd5ca8 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRAllergyIntoleranceClinicalStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRAllergyIntoleranceClinicalStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRAllergyIntoleranceCriticalityList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRAllergyIntoleranceCriticalityList.php index 2ccb4c3a7f..baf99be681 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRAllergyIntoleranceCriticalityList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRAllergyIntoleranceCriticalityList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRAllergyIntoleranceSeverityList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRAllergyIntoleranceSeverityList.php index 286eac3daa..221cfcde37 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRAllergyIntoleranceSeverityList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRAllergyIntoleranceSeverityList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRAllergyIntoleranceTypeList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRAllergyIntoleranceTypeList.php index 7f70872d66..d68ad93910 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRAllergyIntoleranceTypeList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRAllergyIntoleranceTypeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRAllergyIntoleranceVerificationStatusList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRAllergyIntoleranceVerificationStatusList.php index 65ca5d35b7..cd89d5f0b3 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRAllergyIntoleranceVerificationStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRAllergyIntoleranceVerificationStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRAppointmentStatusList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRAppointmentStatusList.php index c727c22335..8229a0a1dd 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRAppointmentStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRAppointmentStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRAssertionDirectionTypeList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRAssertionDirectionTypeList.php index 03730181c3..94239ff9b5 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRAssertionDirectionTypeList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRAssertionDirectionTypeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRAssertionOperatorTypeList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRAssertionOperatorTypeList.php index 43825d98ab..d5a688dd8d 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRAssertionOperatorTypeList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRAssertionOperatorTypeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRAssertionResponseTypesList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRAssertionResponseTypesList.php index c8640199f0..38038e0ea8 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRAssertionResponseTypesList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRAssertionResponseTypesList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRAuditEventActionList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRAuditEventActionList.php index 700e2d2289..65fb4fe121 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRAuditEventActionList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRAuditEventActionList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRAuditEventAgentNetworkTypeList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRAuditEventAgentNetworkTypeList.php index 9351f51710..50ae50469c 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRAuditEventAgentNetworkTypeList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRAuditEventAgentNetworkTypeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRAuditEventOutcomeList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRAuditEventOutcomeList.php index abf328e7dc..861c2085d6 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRAuditEventOutcomeList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRAuditEventOutcomeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRBase64BinaryPrimitive.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRBase64BinaryPrimitive.php index ce5a3e67c4..8002816bc6 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRBase64BinaryPrimitive.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRBase64BinaryPrimitive.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRBindingStrengthList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRBindingStrengthList.php index 8e85832d88..0334027a8b 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRBindingStrengthList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRBindingStrengthList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRBooleanPrimitive.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRBooleanPrimitive.php index bb368adb28..bbc25fa72c 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRBooleanPrimitive.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRBooleanPrimitive.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRBundleTypeList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRBundleTypeList.php index f39bb51207..f5974a972c 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRBundleTypeList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRBundleTypeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRCapabilityStatementKindList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRCapabilityStatementKindList.php index a9117a658c..49ad677d7f 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRCapabilityStatementKindList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRCapabilityStatementKindList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRCarePlanActivityStatusList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRCarePlanActivityStatusList.php index a4fc85acf1..ba6dd8bd70 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRCarePlanActivityStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRCarePlanActivityStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRCarePlanIntentList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRCarePlanIntentList.php index 7bb569fe50..fa0ab2131e 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRCarePlanIntentList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRCarePlanIntentList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRCarePlanStatusList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRCarePlanStatusList.php index cd54684bc7..bb8571df46 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRCarePlanStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRCarePlanStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRCareTeamStatusList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRCareTeamStatusList.php index 7844a2be57..3c0f55d3ee 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRCareTeamStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRCareTeamStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRChargeItemStatusList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRChargeItemStatusList.php index 9f55c66d53..029cb12333 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRChargeItemStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRChargeItemStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRClinicalImpressionStatusList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRClinicalImpressionStatusList.php index 1bf77f4f26..9617b4a217 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRClinicalImpressionStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRClinicalImpressionStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRCodePrimitive.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRCodePrimitive.php index cfb780fc76..99c2a3f787 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRCodePrimitive.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRCodePrimitive.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRCodeSystemContentModeList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRCodeSystemContentModeList.php index 074d3d4bac..0158cdf95b 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRCodeSystemContentModeList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRCodeSystemContentModeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRCodeSystemHierarchyMeaningList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRCodeSystemHierarchyMeaningList.php index 4dc73fe541..3348d614d4 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRCodeSystemHierarchyMeaningList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRCodeSystemHierarchyMeaningList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRCompartmentTypeList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRCompartmentTypeList.php index 99f6f83127..6a46588935 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRCompartmentTypeList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRCompartmentTypeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRCompositionAttestationModeList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRCompositionAttestationModeList.php index 85d4e3267a..17ef764c0c 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRCompositionAttestationModeList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRCompositionAttestationModeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRCompositionStatusList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRCompositionStatusList.php index 99a28f5c43..2575d3b565 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRCompositionStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRCompositionStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRConceptMapEquivalenceList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRConceptMapEquivalenceList.php index 08833c365a..8596812d65 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRConceptMapEquivalenceList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRConceptMapEquivalenceList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRConceptMapGroupUnmappedModeList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRConceptMapGroupUnmappedModeList.php index e47123d1b6..b1e573e830 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRConceptMapGroupUnmappedModeList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRConceptMapGroupUnmappedModeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRConditionClinicalStatusCodesList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRConditionClinicalStatusCodesList.php index c68625e3da..4de05e1518 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRConditionClinicalStatusCodesList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRConditionClinicalStatusCodesList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRConditionVerificationStatusList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRConditionVerificationStatusList.php index e55e7359e1..2b2213e97a 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRConditionVerificationStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRConditionVerificationStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRConditionalDeleteStatusList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRConditionalDeleteStatusList.php index d9a717ca22..bb4f90503a 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRConditionalDeleteStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRConditionalDeleteStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRConditionalReadStatusList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRConditionalReadStatusList.php index c316187760..6ee9239802 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRConditionalReadStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRConditionalReadStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRConfidentialityClassificationList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRConfidentialityClassificationList.php index 0f1040ee88..c08c62da6b 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRConfidentialityClassificationList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRConfidentialityClassificationList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRConsentDataMeaningList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRConsentDataMeaningList.php index 8a7964e2ca..358c04b94e 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRConsentDataMeaningList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRConsentDataMeaningList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRConsentExceptTypeList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRConsentExceptTypeList.php index 7221d58d64..ef354f5eb9 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRConsentExceptTypeList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRConsentExceptTypeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRConsentStateList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRConsentStateList.php index 3ee0a99afd..7c47f00008 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRConsentStateList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRConsentStateList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRConstraintSeverityList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRConstraintSeverityList.php index 7f110455d8..f26e75b4f6 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRConstraintSeverityList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRConstraintSeverityList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRContactPointSystemList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRContactPointSystemList.php index f550d21ca7..ea803025c1 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRContactPointSystemList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRContactPointSystemList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRContactPointUseList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRContactPointUseList.php index 02e3782c4c..76d399ad9d 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRContactPointUseList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRContactPointUseList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRContentTypeList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRContentTypeList.php index 155d812a87..391f85d523 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRContentTypeList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRContentTypeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRContractResourceStatusCodesList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRContractResourceStatusCodesList.php index 60635dc415..686d84f61a 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRContractResourceStatusCodesList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRContractResourceStatusCodesList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRContributorTypeList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRContributorTypeList.php index f37b96b474..03c413229a 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRContributorTypeList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRContributorTypeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRDataElementStringencyList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRDataElementStringencyList.php index ff140b2408..0bf4d879c5 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRDataElementStringencyList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRDataElementStringencyList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRDatePrimitive.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRDatePrimitive.php index b160fe7394..6f2dff5f0b 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRDatePrimitive.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRDatePrimitive.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRDateTimePrimitive.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRDateTimePrimitive.php index bd6dd4f694..03a0937d76 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRDateTimePrimitive.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRDateTimePrimitive.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRDaysOfWeekList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRDaysOfWeekList.php index a972d5a1d0..9239fc03e1 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRDaysOfWeekList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRDaysOfWeekList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRDecimalPrimitive.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRDecimalPrimitive.php index 4e4495d73e..ae38a307c0 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRDecimalPrimitive.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRDecimalPrimitive.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRDetectedIssueSeverityList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRDetectedIssueSeverityList.php index 9c79ead8fa..15767f3ddf 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRDetectedIssueSeverityList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRDetectedIssueSeverityList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRDeviceMetricCalibrationStateList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRDeviceMetricCalibrationStateList.php index 0d64413f8d..17de87a880 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRDeviceMetricCalibrationStateList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRDeviceMetricCalibrationStateList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRDeviceMetricCalibrationTypeList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRDeviceMetricCalibrationTypeList.php index 65b5cf220a..8ed7691fee 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRDeviceMetricCalibrationTypeList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRDeviceMetricCalibrationTypeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRDeviceMetricCategoryList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRDeviceMetricCategoryList.php index db8ed94cfb..3e35ae8a78 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRDeviceMetricCategoryList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRDeviceMetricCategoryList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRDeviceMetricColorList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRDeviceMetricColorList.php index 9cd694f8b6..d935bef3a9 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRDeviceMetricColorList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRDeviceMetricColorList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRDeviceMetricOperationalStatusList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRDeviceMetricOperationalStatusList.php index d56a154ac8..8f5a50d0b4 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRDeviceMetricOperationalStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRDeviceMetricOperationalStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRDeviceUseStatementStatusList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRDeviceUseStatementStatusList.php index 732ffa81d9..72a5929e1f 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRDeviceUseStatementStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRDeviceUseStatementStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRDiagnosticReportStatusList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRDiagnosticReportStatusList.php index 080362e5ef..35e8592ef9 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRDiagnosticReportStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRDiagnosticReportStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRDigitalMediaTypeList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRDigitalMediaTypeList.php index a794f65c30..a923a823e5 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRDigitalMediaTypeList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRDigitalMediaTypeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRDiscriminatorTypeList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRDiscriminatorTypeList.php index 275504a952..dac5cc5ebf 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRDiscriminatorTypeList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRDiscriminatorTypeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRDocumentModeList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRDocumentModeList.php index d3464b2676..a9c4324d92 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRDocumentModeList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRDocumentModeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRDocumentReferenceStatusList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRDocumentReferenceStatusList.php index b43d031334..9a7f684284 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRDocumentReferenceStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRDocumentReferenceStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRDocumentRelationshipTypeList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRDocumentRelationshipTypeList.php index c13df59a6e..ec0a2e6a91 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRDocumentRelationshipTypeList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRDocumentRelationshipTypeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement.php index 0e0ce045f8..4e3072e3d2 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,9 +78,7 @@ class FHIRElement implements PHPFHIRCommentContainerInterface, PHPFHIRTypeInterf // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ELEMENT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; + const FIELD_FHIR_COMMENTS = 'fhir_comments'; const FIELD_EXTENSION = 'extension'; const FIELD_ID = 'id'; @@ -106,6 +104,9 @@ class FHIRElement implements PHPFHIRCommentContainerInterface, PHPFHIRTypeInterf */ protected $id = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRElement Constructor * @param null|array $data @@ -121,9 +122,19 @@ public function __construct($data = null) gettype($data) )); } + if (isset($data[self::FIELD_FHIR_COMMENTS])) { + if (is_array($data[self::FIELD_FHIR_COMMENTS])) { + $this->_setFHIRComments($data[self::FIELD_FHIR_COMMENTS]); + } else if (is_string($data[self::FIELD_FHIR_COMMENTS])) { + $this->_addFHIRComment($data[self::FIELD_FHIR_COMMENTS]); + } + } if (isset($data[self::FIELD_EXTENSION])) { if (is_array($data[self::FIELD_EXTENSION])) { foreach($data[self::FIELD_EXTENSION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRExtension) { $this->addExtension($v); } else { @@ -354,8 +365,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 } $v->xmlSerialize($sxe->addChild(self::FIELD_EXTENSION, null, $v->_getFHIRXMLNamespace())); } - } - if (null !== ($v = $this->getId())) { + } if (null !== ($v = $this->getId())) { $sxe->addAttribute(self::FIELD_ID, (string)$v); } return $sxe; @@ -367,6 +377,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 public function jsonSerialize() { $a = []; + if ([] !== ($vs = $this->_getFHIRComments())) { + $a[self::FIELD_FHIR_COMMENTS] = $vs; + } if ([] !== ($vs = $this->getExtension())) { $a[self::FIELD_EXTENSION] = $vs; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRAccountStatus.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRAccountStatus.php index f3d1603912..77621af380 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRAccountStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRAccountStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRAccountStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ACCOUNT_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRAccountStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRAccountStatus Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRActionCardinalityBehavior.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRActionCardinalityBehavior.php index fd5c60da83..208ae49682 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRActionCardinalityBehavior.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRActionCardinalityBehavior.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRActionCardinalityBehavior extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ACTION_CARDINALITY_BEHAVIOR; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -90,6 +86,9 @@ class FHIRActionCardinalityBehavior extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRActionCardinalityBehavior Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRActionConditionKind.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRActionConditionKind.php index 3078c44fd0..f59c7c584e 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRActionConditionKind.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRActionConditionKind.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRActionConditionKind extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ACTION_CONDITION_KIND; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRActionConditionKind extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRActionConditionKind Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRActionGroupingBehavior.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRActionGroupingBehavior.php index f15310b889..3698bc016a 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRActionGroupingBehavior.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRActionGroupingBehavior.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRActionGroupingBehavior extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ACTION_GROUPING_BEHAVIOR; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRActionGroupingBehavior extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRActionGroupingBehavior Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRActionList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRActionList.php index af8ca0e4ff..0ccf42f9ee 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRActionList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRActionList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRActionList extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ACTION_LIST; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRActionList extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRActionList Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRActionParticipantType.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRActionParticipantType.php index 82801d97ef..0d6c1327ae 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRActionParticipantType.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRActionParticipantType.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRActionParticipantType extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ACTION_PARTICIPANT_TYPE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRActionParticipantType extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRActionParticipantType Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRActionPrecheckBehavior.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRActionPrecheckBehavior.php index b7c1c60cac..cf30802891 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRActionPrecheckBehavior.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRActionPrecheckBehavior.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRActionPrecheckBehavior extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ACTION_PRECHECK_BEHAVIOR; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRActionPrecheckBehavior extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRActionPrecheckBehavior Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRActionRelationshipType.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRActionRelationshipType.php index d80c1a9b0e..601b5450aa 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRActionRelationshipType.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRActionRelationshipType.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRActionRelationshipType extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ACTION_RELATIONSHIP_TYPE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRActionRelationshipType extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRActionRelationshipType Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRActionRequiredBehavior.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRActionRequiredBehavior.php index 9322285b96..b31cdf2ceb 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRActionRequiredBehavior.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRActionRequiredBehavior.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRActionRequiredBehavior extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ACTION_REQUIRED_BEHAVIOR; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRActionRequiredBehavior extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRActionRequiredBehavior Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRActionSelectionBehavior.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRActionSelectionBehavior.php index 387782b450..fa7880be52 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRActionSelectionBehavior.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRActionSelectionBehavior.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRActionSelectionBehavior extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ACTION_SELECTION_BEHAVIOR; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRActionSelectionBehavior extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRActionSelectionBehavior Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRAddress.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRAddress.php index 4b21a5f12a..deb0e17cf2 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRAddress.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRAddress.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -82,10 +82,6 @@ class FHIRAddress extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ADDRESS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CITY = 'city'; const FIELD_CITY_EXT = '_city'; const FIELD_COUNTRY = 'country'; @@ -217,6 +213,9 @@ class FHIRAddress extends FHIRElement */ protected $use = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRAddress Constructor * @param null|array $data @@ -239,8 +238,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CITY] instanceof FHIRString) { $this->setCity($data[self::FIELD_CITY]); - } elseif ($ext && is_scalar($data[self::FIELD_CITY])) { - $this->setCity(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_CITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CITY])) { + $this->setCity(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_CITY]] + $ext)); + } else if (is_array($data[self::FIELD_CITY])) { + $this->setCity(new FHIRString(array_merge($ext, $data[self::FIELD_CITY]))); + } } else { $this->setCity(new FHIRString($data[self::FIELD_CITY])); } @@ -251,8 +254,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_COUNTRY] instanceof FHIRString) { $this->setCountry($data[self::FIELD_COUNTRY]); - } elseif ($ext && is_scalar($data[self::FIELD_COUNTRY])) { - $this->setCountry(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_COUNTRY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_COUNTRY])) { + $this->setCountry(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_COUNTRY]] + $ext)); + } else if (is_array($data[self::FIELD_COUNTRY])) { + $this->setCountry(new FHIRString(array_merge($ext, $data[self::FIELD_COUNTRY]))); + } } else { $this->setCountry(new FHIRString($data[self::FIELD_COUNTRY])); } @@ -263,8 +270,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DISTRICT] instanceof FHIRString) { $this->setDistrict($data[self::FIELD_DISTRICT]); - } elseif ($ext && is_scalar($data[self::FIELD_DISTRICT])) { - $this->setDistrict(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DISTRICT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DISTRICT])) { + $this->setDistrict(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DISTRICT]] + $ext)); + } else if (is_array($data[self::FIELD_DISTRICT])) { + $this->setDistrict(new FHIRString(array_merge($ext, $data[self::FIELD_DISTRICT]))); + } } else { $this->setDistrict(new FHIRString($data[self::FIELD_DISTRICT])); } @@ -275,17 +286,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_LINE])) { foreach($data[self::FIELD_LINE] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRString) { $this->addLine($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addLine(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addLine(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addLine(new FHIRString(array_merge($v, $ext[$i]))); + } } else { $this->addLine(new FHIRString($v)); } } } elseif ($data[self::FIELD_LINE] instanceof FHIRString) { $this->addLine($data[self::FIELD_LINE]); - } elseif ($ext && is_scalar($data[self::FIELD_LINE])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_LINE])) { $this->addLine(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_LINE]] + $ext)); } else { $this->addLine(new FHIRString($data[self::FIELD_LINE])); @@ -304,8 +322,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_POSTAL_CODE] instanceof FHIRString) { $this->setPostalCode($data[self::FIELD_POSTAL_CODE]); - } elseif ($ext && is_scalar($data[self::FIELD_POSTAL_CODE])) { - $this->setPostalCode(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_POSTAL_CODE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_POSTAL_CODE])) { + $this->setPostalCode(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_POSTAL_CODE]] + $ext)); + } else if (is_array($data[self::FIELD_POSTAL_CODE])) { + $this->setPostalCode(new FHIRString(array_merge($ext, $data[self::FIELD_POSTAL_CODE]))); + } } else { $this->setPostalCode(new FHIRString($data[self::FIELD_POSTAL_CODE])); } @@ -316,8 +338,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATE] instanceof FHIRString) { $this->setState($data[self::FIELD_STATE]); - } elseif ($ext && is_scalar($data[self::FIELD_STATE])) { - $this->setState(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_STATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATE])) { + $this->setState(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_STATE]] + $ext)); + } else if (is_array($data[self::FIELD_STATE])) { + $this->setState(new FHIRString(array_merge($ext, $data[self::FIELD_STATE]))); + } } else { $this->setState(new FHIRString($data[self::FIELD_STATE])); } @@ -328,8 +354,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TEXT] instanceof FHIRString) { $this->setText($data[self::FIELD_TEXT]); - } elseif ($ext && is_scalar($data[self::FIELD_TEXT])) { - $this->setText(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TEXT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TEXT])) { + $this->setText(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TEXT]] + $ext)); + } else if (is_array($data[self::FIELD_TEXT])) { + $this->setText(new FHIRString(array_merge($ext, $data[self::FIELD_TEXT]))); + } } else { $this->setText(new FHIRString($data[self::FIELD_TEXT])); } @@ -340,8 +370,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TYPE] instanceof FHIRAddressType) { $this->setType($data[self::FIELD_TYPE]); - } elseif ($ext && is_scalar($data[self::FIELD_TYPE])) { - $this->setType(new FHIRAddressType([FHIRAddressType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TYPE])) { + $this->setType(new FHIRAddressType([FHIRAddressType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } else if (is_array($data[self::FIELD_TYPE])) { + $this->setType(new FHIRAddressType(array_merge($ext, $data[self::FIELD_TYPE]))); + } } else { $this->setType(new FHIRAddressType($data[self::FIELD_TYPE])); } @@ -352,8 +386,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_USE] instanceof FHIRAddressUse) { $this->setUse($data[self::FIELD_USE]); - } elseif ($ext && is_scalar($data[self::FIELD_USE])) { - $this->setUse(new FHIRAddressUse([FHIRAddressUse::FIELD_VALUE => $data[self::FIELD_USE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_USE])) { + $this->setUse(new FHIRAddressUse([FHIRAddressUse::FIELD_VALUE => $data[self::FIELD_USE]] + $ext)); + } else if (is_array($data[self::FIELD_USE])) { + $this->setUse(new FHIRAddressUse(array_merge($ext, $data[self::FIELD_USE]))); + } } else { $this->setUse(new FHIRAddressUse($data[self::FIELD_USE])); } @@ -897,6 +935,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getCity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CITY, null, $v->_getFHIRXMLNamespace())); } @@ -914,7 +953,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_LINE, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PERIOD, null, $v->_getFHIRXMLNamespace())); } @@ -927,11 +965,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getText())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TEXT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getUse())) { $v->xmlSerialize($sxe->addChild(self::FIELD_USE, null, $v->_getFHIRXMLNamespace())); } @@ -945,16 +981,37 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getCity())) { - $a[self::FIELD_CITY] = $v->getValue(); - $a[self::FIELD_CITY_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CITY_EXT] = $enc; + } + } else { + $a[self::FIELD_CITY] = $v; + } } if (null !== ($v = $this->getCountry())) { - $a[self::FIELD_COUNTRY] = $v->getValue(); - $a[self::FIELD_COUNTRY_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_COUNTRY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_COUNTRY_EXT] = $enc; + } + } else { + $a[self::FIELD_COUNTRY] = $v; + } } if (null !== ($v = $this->getDistrict())) { - $a[self::FIELD_DISTRICT] = $v->getValue(); - $a[self::FIELD_DISTRICT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DISTRICT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DISTRICT_EXT] = $enc; + } + } else { + $a[self::FIELD_DISTRICT] = $v; + } } if ([] !== ($vs = $this->getLine())) { $a[self::FIELD_LINE] = []; @@ -962,30 +1019,76 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_LINE][] = $v->getValue(); - $a[self::FIELD_LINE_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_LINE][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_LINE_EXT][] = $enc; + } else { + $a[self::FIELD_LINE_EXT][] = null; + } + } else { + $a[self::FIELD_LINE][] = $v; + } } } if (null !== ($v = $this->getPeriod())) { $a[self::FIELD_PERIOD] = $v; } if (null !== ($v = $this->getPostalCode())) { - $a[self::FIELD_POSTAL_CODE] = $v->getValue(); - $a[self::FIELD_POSTAL_CODE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_POSTAL_CODE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_POSTAL_CODE_EXT] = $enc; + } + } else { + $a[self::FIELD_POSTAL_CODE] = $v; + } } if (null !== ($v = $this->getState())) { - $a[self::FIELD_STATE] = $v->getValue(); - $a[self::FIELD_STATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATE_EXT] = $enc; + } + } else { + $a[self::FIELD_STATE] = $v; + } } if (null !== ($v = $this->getText())) { - $a[self::FIELD_TEXT] = $v->getValue(); - $a[self::FIELD_TEXT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TEXT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TEXT_EXT] = $enc; + } + } else { + $a[self::FIELD_TEXT] = $v; + } } if (null !== ($v = $this->getType())) { - $a[self::FIELD_TYPE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TYPE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TYPE_EXT] = $enc; + } + } else { + $a[self::FIELD_TYPE] = $v; + } } if (null !== ($v = $this->getUse())) { - $a[self::FIELD_USE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_USE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_USE_EXT] = $enc; + } + } else { + $a[self::FIELD_USE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRAddressType.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRAddressType.php index 5e6da0e66a..24de501390 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRAddressType.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRAddressType.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRAddressType extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ADDRESS_TYPE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRAddressType extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRAddressType Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRAddressUse.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRAddressUse.php index 3eec73b548..961172fa08 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRAddressUse.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRAddressUse.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRAddressUse extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ADDRESS_USE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRAddressUse extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRAddressUse Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRAdministrativeGender.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRAdministrativeGender.php index 88a1ae99de..d3df9a5657 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRAdministrativeGender.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRAdministrativeGender.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -77,10 +77,6 @@ class FHIRAdministrativeGender extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ADMINISTRATIVE_GENDER; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -88,6 +84,9 @@ class FHIRAdministrativeGender extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRAdministrativeGender Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRAdverseEventCategory.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRAdverseEventCategory.php index bde923696a..64d6da9928 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRAdverseEventCategory.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRAdverseEventCategory.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRAdverseEventCategory extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ADVERSE_EVENT_CATEGORY; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRAdverseEventCategory extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRAdverseEventCategory Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRAdverseEventCausality.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRAdverseEventCausality.php index 90e4c42003..0d5ecaff31 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRAdverseEventCausality.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRAdverseEventCausality.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRAdverseEventCausality extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ADVERSE_EVENT_CAUSALITY; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRAdverseEventCausality extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRAdverseEventCausality Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRAggregationMode.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRAggregationMode.php index a710d00b18..1b0e6e9a91 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRAggregationMode.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRAggregationMode.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRAggregationMode extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_AGGREGATION_MODE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRAggregationMode extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRAggregationMode Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRAllergyIntoleranceCategory.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRAllergyIntoleranceCategory.php index be80cd30c6..c6ac7be7a7 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRAllergyIntoleranceCategory.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRAllergyIntoleranceCategory.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRAllergyIntoleranceCategory extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ALLERGY_INTOLERANCE_CATEGORY; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRAllergyIntoleranceCategory extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRAllergyIntoleranceCategory Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRAllergyIntoleranceClinicalStatus.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRAllergyIntoleranceClinicalStatus.php index 3fafd7908c..2b20a09d7e 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRAllergyIntoleranceClinicalStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRAllergyIntoleranceClinicalStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRAllergyIntoleranceClinicalStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ALLERGY_INTOLERANCE_CLINICAL_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRAllergyIntoleranceClinicalStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRAllergyIntoleranceClinicalStatus Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRAllergyIntoleranceCriticality.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRAllergyIntoleranceCriticality.php index da230d244c..463bbfc86a 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRAllergyIntoleranceCriticality.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRAllergyIntoleranceCriticality.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRAllergyIntoleranceCriticality extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ALLERGY_INTOLERANCE_CRITICALITY; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -90,6 +86,9 @@ class FHIRAllergyIntoleranceCriticality extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRAllergyIntoleranceCriticality Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRAllergyIntoleranceSeverity.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRAllergyIntoleranceSeverity.php index 3e4d0cb2b9..a3d2e21016 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRAllergyIntoleranceSeverity.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRAllergyIntoleranceSeverity.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRAllergyIntoleranceSeverity extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ALLERGY_INTOLERANCE_SEVERITY; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -90,6 +86,9 @@ class FHIRAllergyIntoleranceSeverity extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRAllergyIntoleranceSeverity Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRAllergyIntoleranceType.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRAllergyIntoleranceType.php index ea1bdee296..bcea789a7c 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRAllergyIntoleranceType.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRAllergyIntoleranceType.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRAllergyIntoleranceType extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ALLERGY_INTOLERANCE_TYPE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRAllergyIntoleranceType extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRAllergyIntoleranceType Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRAllergyIntoleranceVerificationStatus.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRAllergyIntoleranceVerificationStatus.php index e5d2d3e375..90433fbdea 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRAllergyIntoleranceVerificationStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRAllergyIntoleranceVerificationStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRAllergyIntoleranceVerificationStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ALLERGY_INTOLERANCE_VERIFICATION_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -90,6 +86,9 @@ class FHIRAllergyIntoleranceVerificationStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRAllergyIntoleranceVerificationStatus Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRAnnotation.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRAnnotation.php index a323c9f4d4..85eecd3d3c 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRAnnotation.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRAnnotation.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRAnnotation extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ANNOTATION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_AUTHOR_REFERENCE = 'authorReference'; const FIELD_AUTHOR_STRING = 'authorString'; const FIELD_AUTHOR_STRING_EXT = '_authorString'; @@ -138,6 +134,9 @@ class FHIRAnnotation extends FHIRElement */ protected $time = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRAnnotation Constructor * @param null|array $data @@ -167,8 +166,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_AUTHOR_STRING] instanceof FHIRString) { $this->setAuthorString($data[self::FIELD_AUTHOR_STRING]); - } elseif ($ext && is_scalar($data[self::FIELD_AUTHOR_STRING])) { - $this->setAuthorString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_AUTHOR_STRING]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_AUTHOR_STRING])) { + $this->setAuthorString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_AUTHOR_STRING]] + $ext)); + } else if (is_array($data[self::FIELD_AUTHOR_STRING])) { + $this->setAuthorString(new FHIRString(array_merge($ext, $data[self::FIELD_AUTHOR_STRING]))); + } } else { $this->setAuthorString(new FHIRString($data[self::FIELD_AUTHOR_STRING])); } @@ -179,8 +182,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TEXT] instanceof FHIRString) { $this->setText($data[self::FIELD_TEXT]); - } elseif ($ext && is_scalar($data[self::FIELD_TEXT])) { - $this->setText(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TEXT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TEXT])) { + $this->setText(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TEXT]] + $ext)); + } else if (is_array($data[self::FIELD_TEXT])) { + $this->setText(new FHIRString(array_merge($ext, $data[self::FIELD_TEXT]))); + } } else { $this->setText(new FHIRString($data[self::FIELD_TEXT])); } @@ -191,8 +198,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TIME] instanceof FHIRDateTime) { $this->setTime($data[self::FIELD_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_TIME])) { - $this->setTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TIME])) { + $this->setTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_TIME])) { + $this->setTime(new FHIRDateTime(array_merge($ext, $data[self::FIELD_TIME]))); + } } else { $this->setTime(new FHIRDateTime($data[self::FIELD_TIME])); } @@ -495,16 +506,37 @@ public function jsonSerialize() $a[self::FIELD_AUTHOR_REFERENCE] = $v; } if (null !== ($v = $this->getAuthorString())) { - $a[self::FIELD_AUTHOR_STRING] = $v->getValue(); - $a[self::FIELD_AUTHOR_STRING_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_AUTHOR_STRING] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_AUTHOR_STRING_EXT] = $enc; + } + } else { + $a[self::FIELD_AUTHOR_STRING] = $v; + } } if (null !== ($v = $this->getText())) { - $a[self::FIELD_TEXT] = $v->getValue(); - $a[self::FIELD_TEXT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TEXT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TEXT_EXT] = $enc; + } + } else { + $a[self::FIELD_TEXT] = $v; + } } if (null !== ($v = $this->getTime())) { - $a[self::FIELD_TIME] = $v->getValue(); - $a[self::FIELD_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_TIME] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRAppointmentStatus.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRAppointmentStatus.php index 0da3cd8133..e4d48c8214 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRAppointmentStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRAppointmentStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRAppointmentStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_APPOINTMENT_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRAppointmentStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRAppointmentStatus Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRAssertionDirectionType.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRAssertionDirectionType.php index ec9bbc6133..db05e2c966 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRAssertionDirectionType.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRAssertionDirectionType.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRAssertionDirectionType extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ASSERTION_DIRECTION_TYPE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRAssertionDirectionType extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRAssertionDirectionType Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRAssertionOperatorType.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRAssertionOperatorType.php index a27bf4c922..7549f3a83a 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRAssertionOperatorType.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRAssertionOperatorType.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRAssertionOperatorType extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ASSERTION_OPERATOR_TYPE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRAssertionOperatorType extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRAssertionOperatorType Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRAssertionResponseTypes.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRAssertionResponseTypes.php index 96961a0105..8f004cb8c8 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRAssertionResponseTypes.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRAssertionResponseTypes.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRAssertionResponseTypes extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ASSERTION_RESPONSE_TYPES; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRAssertionResponseTypes extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRAssertionResponseTypes Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRAttachment.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRAttachment.php index 073679c0ae..f8fa7c3487 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRAttachment.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRAttachment.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRAttachment extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ATTACHMENT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CONTENT_TYPE = 'contentType'; const FIELD_CONTENT_TYPE_EXT = '_contentType'; const FIELD_CREATION = 'creation'; @@ -197,6 +193,9 @@ class FHIRAttachment extends FHIRElement */ protected $url = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRAttachment Constructor * @param null|array $data @@ -219,8 +218,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CONTENT_TYPE] instanceof FHIRCode) { $this->setContentType($data[self::FIELD_CONTENT_TYPE]); - } elseif ($ext && is_scalar($data[self::FIELD_CONTENT_TYPE])) { - $this->setContentType(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_CONTENT_TYPE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CONTENT_TYPE])) { + $this->setContentType(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_CONTENT_TYPE]] + $ext)); + } else if (is_array($data[self::FIELD_CONTENT_TYPE])) { + $this->setContentType(new FHIRCode(array_merge($ext, $data[self::FIELD_CONTENT_TYPE]))); + } } else { $this->setContentType(new FHIRCode($data[self::FIELD_CONTENT_TYPE])); } @@ -231,8 +234,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CREATION] instanceof FHIRDateTime) { $this->setCreation($data[self::FIELD_CREATION]); - } elseif ($ext && is_scalar($data[self::FIELD_CREATION])) { - $this->setCreation(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_CREATION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CREATION])) { + $this->setCreation(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_CREATION]] + $ext)); + } else if (is_array($data[self::FIELD_CREATION])) { + $this->setCreation(new FHIRDateTime(array_merge($ext, $data[self::FIELD_CREATION]))); + } } else { $this->setCreation(new FHIRDateTime($data[self::FIELD_CREATION])); } @@ -243,8 +250,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATA] instanceof FHIRBase64Binary) { $this->setData($data[self::FIELD_DATA]); - } elseif ($ext && is_scalar($data[self::FIELD_DATA])) { - $this->setData(new FHIRBase64Binary([FHIRBase64Binary::FIELD_VALUE => $data[self::FIELD_DATA]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATA])) { + $this->setData(new FHIRBase64Binary([FHIRBase64Binary::FIELD_VALUE => $data[self::FIELD_DATA]] + $ext)); + } else if (is_array($data[self::FIELD_DATA])) { + $this->setData(new FHIRBase64Binary(array_merge($ext, $data[self::FIELD_DATA]))); + } } else { $this->setData(new FHIRBase64Binary($data[self::FIELD_DATA])); } @@ -255,8 +266,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_HASH] instanceof FHIRBase64Binary) { $this->setHash($data[self::FIELD_HASH]); - } elseif ($ext && is_scalar($data[self::FIELD_HASH])) { - $this->setHash(new FHIRBase64Binary([FHIRBase64Binary::FIELD_VALUE => $data[self::FIELD_HASH]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_HASH])) { + $this->setHash(new FHIRBase64Binary([FHIRBase64Binary::FIELD_VALUE => $data[self::FIELD_HASH]] + $ext)); + } else if (is_array($data[self::FIELD_HASH])) { + $this->setHash(new FHIRBase64Binary(array_merge($ext, $data[self::FIELD_HASH]))); + } } else { $this->setHash(new FHIRBase64Binary($data[self::FIELD_HASH])); } @@ -267,8 +282,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_LANGUAGE] instanceof FHIRCode) { $this->setLanguage($data[self::FIELD_LANGUAGE]); - } elseif ($ext && is_scalar($data[self::FIELD_LANGUAGE])) { - $this->setLanguage(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_LANGUAGE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_LANGUAGE])) { + $this->setLanguage(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_LANGUAGE]] + $ext)); + } else if (is_array($data[self::FIELD_LANGUAGE])) { + $this->setLanguage(new FHIRCode(array_merge($ext, $data[self::FIELD_LANGUAGE]))); + } } else { $this->setLanguage(new FHIRCode($data[self::FIELD_LANGUAGE])); } @@ -279,8 +298,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SIZE] instanceof FHIRUnsignedInt) { $this->setSize($data[self::FIELD_SIZE]); - } elseif ($ext && is_scalar($data[self::FIELD_SIZE])) { - $this->setSize(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_SIZE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SIZE])) { + $this->setSize(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_SIZE]] + $ext)); + } else if (is_array($data[self::FIELD_SIZE])) { + $this->setSize(new FHIRUnsignedInt(array_merge($ext, $data[self::FIELD_SIZE]))); + } } else { $this->setSize(new FHIRUnsignedInt($data[self::FIELD_SIZE])); } @@ -291,8 +314,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TITLE] instanceof FHIRString) { $this->setTitle($data[self::FIELD_TITLE]); - } elseif ($ext && is_scalar($data[self::FIELD_TITLE])) { - $this->setTitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TITLE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TITLE])) { + $this->setTitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TITLE]] + $ext)); + } else if (is_array($data[self::FIELD_TITLE])) { + $this->setTitle(new FHIRString(array_merge($ext, $data[self::FIELD_TITLE]))); + } } else { $this->setTitle(new FHIRString($data[self::FIELD_TITLE])); } @@ -303,8 +330,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_URL] instanceof FHIRUri) { $this->setUrl($data[self::FIELD_URL]); - } elseif ($ext && is_scalar($data[self::FIELD_URL])) { - $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } else if (is_array($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri(array_merge($ext, $data[self::FIELD_URL]))); + } } else { $this->setUrl(new FHIRUri($data[self::FIELD_URL])); } @@ -782,6 +813,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getContentType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CONTENT_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -816,36 +848,92 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getContentType())) { - $a[self::FIELD_CONTENT_TYPE] = $v->getValue(); - $a[self::FIELD_CONTENT_TYPE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CONTENT_TYPE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CONTENT_TYPE_EXT] = $enc; + } + } else { + $a[self::FIELD_CONTENT_TYPE] = $v; + } } if (null !== ($v = $this->getCreation())) { - $a[self::FIELD_CREATION] = $v->getValue(); - $a[self::FIELD_CREATION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CREATION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CREATION_EXT] = $enc; + } + } else { + $a[self::FIELD_CREATION] = $v; + } } if (null !== ($v = $this->getData())) { - $a[self::FIELD_DATA] = $v->getValue(); - $a[self::FIELD_DATA_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATA] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATA_EXT] = $enc; + } + } else { + $a[self::FIELD_DATA] = $v; + } } if (null !== ($v = $this->getHash())) { - $a[self::FIELD_HASH] = $v->getValue(); - $a[self::FIELD_HASH_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_HASH] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_HASH_EXT] = $enc; + } + } else { + $a[self::FIELD_HASH] = $v; + } } if (null !== ($v = $this->getLanguage())) { - $a[self::FIELD_LANGUAGE] = $v->getValue(); - $a[self::FIELD_LANGUAGE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_LANGUAGE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_LANGUAGE_EXT] = $enc; + } + } else { + $a[self::FIELD_LANGUAGE] = $v; + } } if (null !== ($v = $this->getSize())) { - $a[self::FIELD_SIZE] = $v->getValue(); - $a[self::FIELD_SIZE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SIZE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SIZE_EXT] = $enc; + } + } else { + $a[self::FIELD_SIZE] = $v; + } } if (null !== ($v = $this->getTitle())) { - $a[self::FIELD_TITLE] = $v->getValue(); - $a[self::FIELD_TITLE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TITLE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TITLE_EXT] = $enc; + } + } else { + $a[self::FIELD_TITLE] = $v; + } } if (null !== ($v = $this->getUrl())) { - $a[self::FIELD_URL] = $v->getValue(); - $a[self::FIELD_URL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_URL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_URL_EXT] = $enc; + } + } else { + $a[self::FIELD_URL] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRAuditEventAction.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRAuditEventAction.php index a7d1366001..0361dc70de 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRAuditEventAction.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRAuditEventAction.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRAuditEventAction extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_AUDIT_EVENT_ACTION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRAuditEventAction extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRAuditEventAction Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRAuditEventAgentNetworkType.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRAuditEventAgentNetworkType.php index 914b6e112a..2c5d4d4e6c 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRAuditEventAgentNetworkType.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRAuditEventAgentNetworkType.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRAuditEventAgentNetworkType extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_AUDIT_EVENT_AGENT_NETWORK_TYPE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRAuditEventAgentNetworkType extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRAuditEventAgentNetworkType Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRAuditEventOutcome.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRAuditEventOutcome.php index 4aa333fe9b..e601d4fdc8 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRAuditEventOutcome.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRAuditEventOutcome.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRAuditEventOutcome extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_AUDIT_EVENT_OUTCOME; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRAuditEventOutcome extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRAuditEventOutcome Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement.php index 54ce1bfa2c..425ee08187 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRBackboneElement extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_BACKBONE_ELEMENT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_MODIFIER_EXTENSION = 'modifierExtension'; /** @@ -103,6 +99,9 @@ class FHIRBackboneElement extends FHIRElement */ protected $modifierExtension = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRBackboneElement Constructor * @param null|array $data @@ -122,6 +121,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_MODIFIER_EXTENSION])) { if (is_array($data[self::FIELD_MODIFIER_EXTENSION])) { foreach($data[self::FIELD_MODIFIER_EXTENSION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRExtension) { $this->addModifierExtension($v); } else { diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRAccount/FHIRAccountCoverage.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRAccount/FHIRAccountCoverage.php index 7fb7d1eb18..b453d753c9 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRAccount/FHIRAccountCoverage.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRAccount/FHIRAccountCoverage.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRAccountCoverage extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ACCOUNT_DOT_COVERAGE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_COVERAGE = 'coverage'; const FIELD_PRIORITY = 'priority'; const FIELD_PRIORITY_EXT = '_priority'; @@ -112,6 +108,9 @@ class FHIRAccountCoverage extends FHIRBackboneElement */ protected $priority = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRAccountCoverage Constructor * @param null|array $data @@ -141,8 +140,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PRIORITY] instanceof FHIRPositiveInt) { $this->setPriority($data[self::FIELD_PRIORITY]); - } elseif ($ext && is_scalar($data[self::FIELD_PRIORITY])) { - $this->setPriority(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_PRIORITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PRIORITY])) { + $this->setPriority(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_PRIORITY]] + $ext)); + } else if (is_array($data[self::FIELD_PRIORITY])) { + $this->setPriority(new FHIRPositiveInt(array_merge($ext, $data[self::FIELD_PRIORITY]))); + } } else { $this->setPriority(new FHIRPositiveInt($data[self::FIELD_PRIORITY])); } @@ -351,8 +354,15 @@ public function jsonSerialize() $a[self::FIELD_COVERAGE] = $v; } if (null !== ($v = $this->getPriority())) { - $a[self::FIELD_PRIORITY] = $v->getValue(); - $a[self::FIELD_PRIORITY_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PRIORITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PRIORITY_EXT] = $enc; + } + } else { + $a[self::FIELD_PRIORITY] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRAccount/FHIRAccountGuarantor.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRAccount/FHIRAccountGuarantor.php index dc9dcae729..5d02a4913d 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRAccount/FHIRAccountGuarantor.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRAccount/FHIRAccountGuarantor.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRAccountGuarantor extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ACCOUNT_DOT_GUARANTOR; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ON_HOLD = 'onHold'; const FIELD_ON_HOLD_EXT = '_onHold'; const FIELD_PARTY = 'party'; @@ -122,6 +118,9 @@ class FHIRAccountGuarantor extends FHIRBackboneElement */ protected $period = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRAccountGuarantor Constructor * @param null|array $data @@ -144,8 +143,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ON_HOLD] instanceof FHIRBoolean) { $this->setOnHold($data[self::FIELD_ON_HOLD]); - } elseif ($ext && is_scalar($data[self::FIELD_ON_HOLD])) { - $this->setOnHold(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_ON_HOLD]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ON_HOLD])) { + $this->setOnHold(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_ON_HOLD]] + $ext)); + } else if (is_array($data[self::FIELD_ON_HOLD])) { + $this->setOnHold(new FHIRBoolean(array_merge($ext, $data[self::FIELD_ON_HOLD]))); + } } else { $this->setOnHold(new FHIRBoolean($data[self::FIELD_ON_HOLD])); } @@ -375,14 +378,13 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getOnHold())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ON_HOLD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getParty())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PARTY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PERIOD, null, $v->_getFHIRXMLNamespace())); } @@ -396,8 +398,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getOnHold())) { - $a[self::FIELD_ON_HOLD] = $v->getValue(); - $a[self::FIELD_ON_HOLD_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ON_HOLD] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ON_HOLD_EXT] = $enc; + } + } else { + $a[self::FIELD_ON_HOLD] = $v; + } } if (null !== ($v = $this->getParty())) { $a[self::FIELD_PARTY] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRActivityDefinition/FHIRActivityDefinitionDynamicValue.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRActivityDefinition/FHIRActivityDefinitionDynamicValue.php index e8534d6b57..9cbeec5caa 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRActivityDefinition/FHIRActivityDefinitionDynamicValue.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRActivityDefinition/FHIRActivityDefinitionDynamicValue.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRActivityDefinitionDynamicValue extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ACTIVITY_DEFINITION_DOT_DYNAMIC_VALUE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DESCRIPTION = 'description'; const FIELD_DESCRIPTION_EXT = '_description'; const FIELD_EXPRESSION = 'expression'; @@ -137,6 +133,9 @@ class FHIRActivityDefinitionDynamicValue extends FHIRBackboneElement */ protected $path = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRActivityDefinitionDynamicValue Constructor * @param null|array $data @@ -159,8 +158,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -171,8 +174,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EXPRESSION] instanceof FHIRString) { $this->setExpression($data[self::FIELD_EXPRESSION]); - } elseif ($ext && is_scalar($data[self::FIELD_EXPRESSION])) { - $this->setExpression(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_EXPRESSION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EXPRESSION])) { + $this->setExpression(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_EXPRESSION]] + $ext)); + } else if (is_array($data[self::FIELD_EXPRESSION])) { + $this->setExpression(new FHIRString(array_merge($ext, $data[self::FIELD_EXPRESSION]))); + } } else { $this->setExpression(new FHIRString($data[self::FIELD_EXPRESSION])); } @@ -183,8 +190,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_LANGUAGE] instanceof FHIRString) { $this->setLanguage($data[self::FIELD_LANGUAGE]); - } elseif ($ext && is_scalar($data[self::FIELD_LANGUAGE])) { - $this->setLanguage(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_LANGUAGE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_LANGUAGE])) { + $this->setLanguage(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_LANGUAGE]] + $ext)); + } else if (is_array($data[self::FIELD_LANGUAGE])) { + $this->setLanguage(new FHIRString(array_merge($ext, $data[self::FIELD_LANGUAGE]))); + } } else { $this->setLanguage(new FHIRString($data[self::FIELD_LANGUAGE])); } @@ -195,8 +206,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PATH] instanceof FHIRString) { $this->setPath($data[self::FIELD_PATH]); - } elseif ($ext && is_scalar($data[self::FIELD_PATH])) { - $this->setPath(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PATH]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PATH])) { + $this->setPath(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PATH]] + $ext)); + } else if (is_array($data[self::FIELD_PATH])) { + $this->setPath(new FHIRString(array_merge($ext, $data[self::FIELD_PATH]))); + } } else { $this->setPath(new FHIRString($data[self::FIELD_PATH])); } @@ -482,6 +497,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getDescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESCRIPTION, null, $v->_getFHIRXMLNamespace())); } @@ -504,20 +520,48 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if (null !== ($v = $this->getExpression())) { - $a[self::FIELD_EXPRESSION] = $v->getValue(); - $a[self::FIELD_EXPRESSION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EXPRESSION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EXPRESSION_EXT] = $enc; + } + } else { + $a[self::FIELD_EXPRESSION] = $v; + } } if (null !== ($v = $this->getLanguage())) { - $a[self::FIELD_LANGUAGE] = $v->getValue(); - $a[self::FIELD_LANGUAGE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_LANGUAGE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_LANGUAGE_EXT] = $enc; + } + } else { + $a[self::FIELD_LANGUAGE] = $v; + } } if (null !== ($v = $this->getPath())) { - $a[self::FIELD_PATH] = $v->getValue(); - $a[self::FIELD_PATH_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PATH] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PATH_EXT] = $enc; + } + } else { + $a[self::FIELD_PATH] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRActivityDefinition/FHIRActivityDefinitionParticipant.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRActivityDefinition/FHIRActivityDefinitionParticipant.php index 2f6c2133fb..83f2329520 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRActivityDefinition/FHIRActivityDefinitionParticipant.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRActivityDefinition/FHIRActivityDefinitionParticipant.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRActivityDefinitionParticipant extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ACTIVITY_DEFINITION_DOT_PARTICIPANT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ROLE = 'role'; const FIELD_TYPE = 'type'; const FIELD_TYPE_EXT = '_type'; @@ -109,6 +105,9 @@ class FHIRActivityDefinitionParticipant extends FHIRBackboneElement */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRActivityDefinitionParticipant Constructor * @param null|array $data @@ -138,8 +137,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TYPE] instanceof FHIRActionParticipantType) { $this->setType($data[self::FIELD_TYPE]); - } elseif ($ext && is_scalar($data[self::FIELD_TYPE])) { - $this->setType(new FHIRActionParticipantType([FHIRActionParticipantType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TYPE])) { + $this->setType(new FHIRActionParticipantType([FHIRActionParticipantType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } else if (is_array($data[self::FIELD_TYPE])) { + $this->setType(new FHIRActionParticipantType(array_merge($ext, $data[self::FIELD_TYPE]))); + } } else { $this->setType(new FHIRActionParticipantType($data[self::FIELD_TYPE])); } @@ -315,7 +318,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getRole())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ROLE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -332,7 +334,15 @@ public function jsonSerialize() $a[self::FIELD_ROLE] = $v; } if (null !== ($v = $this->getType())) { - $a[self::FIELD_TYPE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TYPE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TYPE_EXT] = $enc; + } + } else { + $a[self::FIELD_TYPE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRAdverseEvent/FHIRAdverseEventSuspectEntity.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRAdverseEvent/FHIRAdverseEventSuspectEntity.php index 958664eeb4..7b5c16de01 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRAdverseEvent/FHIRAdverseEventSuspectEntity.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRAdverseEvent/FHIRAdverseEventSuspectEntity.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -83,10 +83,6 @@ class FHIRAdverseEventSuspectEntity extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ADVERSE_EVENT_DOT_SUSPECT_ENTITY; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CAUSALITY = 'causality'; const FIELD_CAUSALITY_EXT = '_causality'; const FIELD_CAUSALITY_ASSESSMENT = 'causalityAssessment'; @@ -178,6 +174,9 @@ class FHIRAdverseEventSuspectEntity extends FHIRBackboneElement */ protected $instance = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRAdverseEventSuspectEntity Constructor * @param null|array $data @@ -200,8 +199,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CAUSALITY] instanceof FHIRAdverseEventCausality) { $this->setCausality($data[self::FIELD_CAUSALITY]); - } elseif ($ext && is_scalar($data[self::FIELD_CAUSALITY])) { - $this->setCausality(new FHIRAdverseEventCausality([FHIRAdverseEventCausality::FIELD_VALUE => $data[self::FIELD_CAUSALITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CAUSALITY])) { + $this->setCausality(new FHIRAdverseEventCausality([FHIRAdverseEventCausality::FIELD_VALUE => $data[self::FIELD_CAUSALITY]] + $ext)); + } else if (is_array($data[self::FIELD_CAUSALITY])) { + $this->setCausality(new FHIRAdverseEventCausality(array_merge($ext, $data[self::FIELD_CAUSALITY]))); + } } else { $this->setCausality(new FHIRAdverseEventCausality($data[self::FIELD_CAUSALITY])); } @@ -233,8 +236,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CAUSALITY_PRODUCT_RELATEDNESS] instanceof FHIRString) { $this->setCausalityProductRelatedness($data[self::FIELD_CAUSALITY_PRODUCT_RELATEDNESS]); - } elseif ($ext && is_scalar($data[self::FIELD_CAUSALITY_PRODUCT_RELATEDNESS])) { - $this->setCausalityProductRelatedness(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_CAUSALITY_PRODUCT_RELATEDNESS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CAUSALITY_PRODUCT_RELATEDNESS])) { + $this->setCausalityProductRelatedness(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_CAUSALITY_PRODUCT_RELATEDNESS]] + $ext)); + } else if (is_array($data[self::FIELD_CAUSALITY_PRODUCT_RELATEDNESS])) { + $this->setCausalityProductRelatedness(new FHIRString(array_merge($ext, $data[self::FIELD_CAUSALITY_PRODUCT_RELATEDNESS]))); + } } else { $this->setCausalityProductRelatedness(new FHIRString($data[self::FIELD_CAUSALITY_PRODUCT_RELATEDNESS])); } @@ -608,26 +615,21 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getCausality())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CAUSALITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getCausalityAssessment())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CAUSALITY_ASSESSMENT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getCausalityAuthor())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CAUSALITY_AUTHOR, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getCausalityMethod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CAUSALITY_METHOD, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getCausalityProductRelatedness())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CAUSALITY_PRODUCT_RELATEDNESS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getCausalityResult())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CAUSALITY_RESULT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getInstance())) { $v->xmlSerialize($sxe->addChild(self::FIELD_INSTANCE, null, $v->_getFHIRXMLNamespace())); } @@ -641,7 +643,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getCausality())) { - $a[self::FIELD_CAUSALITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CAUSALITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CAUSALITY_EXT] = $enc; + } + } else { + $a[self::FIELD_CAUSALITY] = $v; + } } if (null !== ($v = $this->getCausalityAssessment())) { $a[self::FIELD_CAUSALITY_ASSESSMENT] = $v; @@ -653,8 +663,15 @@ public function jsonSerialize() $a[self::FIELD_CAUSALITY_METHOD] = $v; } if (null !== ($v = $this->getCausalityProductRelatedness())) { - $a[self::FIELD_CAUSALITY_PRODUCT_RELATEDNESS] = $v->getValue(); - $a[self::FIELD_CAUSALITY_PRODUCT_RELATEDNESS_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CAUSALITY_PRODUCT_RELATEDNESS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CAUSALITY_PRODUCT_RELATEDNESS_EXT] = $enc; + } + } else { + $a[self::FIELD_CAUSALITY_PRODUCT_RELATEDNESS] = $v; + } } if (null !== ($v = $this->getCausalityResult())) { $a[self::FIELD_CAUSALITY_RESULT] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRAllergyIntolerance/FHIRAllergyIntoleranceReaction.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRAllergyIntolerance/FHIRAllergyIntoleranceReaction.php index 43c6c02704..48368a7e6e 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRAllergyIntolerance/FHIRAllergyIntoleranceReaction.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRAllergyIntolerance/FHIRAllergyIntoleranceReaction.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -82,10 +82,6 @@ class FHIRAllergyIntoleranceReaction extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ALLERGY_INTOLERANCE_DOT_REACTION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DESCRIPTION = 'description'; const FIELD_DESCRIPTION_EXT = '_description'; const FIELD_EXPOSURE_ROUTE = 'exposureRoute'; @@ -190,6 +186,9 @@ class FHIRAllergyIntoleranceReaction extends FHIRBackboneElement */ protected $substance = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRAllergyIntoleranceReaction Constructor * @param null|array $data @@ -212,8 +211,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -228,6 +231,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_MANIFESTATION])) { if (is_array($data[self::FIELD_MANIFESTATION])) { foreach($data[self::FIELD_MANIFESTATION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addManifestation($v); } else { @@ -243,6 +249,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_NOTE])) { if (is_array($data[self::FIELD_NOTE])) { foreach($data[self::FIELD_NOTE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRAnnotation) { $this->addNote($v); } else { @@ -261,8 +270,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ONSET] instanceof FHIRDateTime) { $this->setOnset($data[self::FIELD_ONSET]); - } elseif ($ext && is_scalar($data[self::FIELD_ONSET])) { - $this->setOnset(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_ONSET]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ONSET])) { + $this->setOnset(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_ONSET]] + $ext)); + } else if (is_array($data[self::FIELD_ONSET])) { + $this->setOnset(new FHIRDateTime(array_merge($ext, $data[self::FIELD_ONSET]))); + } } else { $this->setOnset(new FHIRDateTime($data[self::FIELD_ONSET])); } @@ -273,8 +286,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SEVERITY] instanceof FHIRAllergyIntoleranceSeverity) { $this->setSeverity($data[self::FIELD_SEVERITY]); - } elseif ($ext && is_scalar($data[self::FIELD_SEVERITY])) { - $this->setSeverity(new FHIRAllergyIntoleranceSeverity([FHIRAllergyIntoleranceSeverity::FIELD_VALUE => $data[self::FIELD_SEVERITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SEVERITY])) { + $this->setSeverity(new FHIRAllergyIntoleranceSeverity([FHIRAllergyIntoleranceSeverity::FIELD_VALUE => $data[self::FIELD_SEVERITY]] + $ext)); + } else if (is_array($data[self::FIELD_SEVERITY])) { + $this->setSeverity(new FHIRAllergyIntoleranceSeverity(array_merge($ext, $data[self::FIELD_SEVERITY]))); + } } else { $this->setSeverity(new FHIRAllergyIntoleranceSeverity($data[self::FIELD_SEVERITY])); } @@ -731,14 +748,13 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getDescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESCRIPTION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getExposureRoute())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EXPOSURE_ROUTE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getManifestation())) { foreach($vs as $v) { if (null === $v) { @@ -747,7 +763,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_MANIFESTATION, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getNote())) { foreach($vs as $v) { if (null === $v) { @@ -759,11 +774,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getOnset())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ONSET, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSeverity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SEVERITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSubstance())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBSTANCE, null, $v->_getFHIRXMLNamespace())); } @@ -777,8 +790,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if (null !== ($v = $this->getExposureRoute())) { $a[self::FIELD_EXPOSURE_ROUTE] = $v; @@ -790,11 +810,26 @@ public function jsonSerialize() $a[self::FIELD_NOTE] = $vs; } if (null !== ($v = $this->getOnset())) { - $a[self::FIELD_ONSET] = $v->getValue(); - $a[self::FIELD_ONSET_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ONSET] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ONSET_EXT] = $enc; + } + } else { + $a[self::FIELD_ONSET] = $v; + } } if (null !== ($v = $this->getSeverity())) { - $a[self::FIELD_SEVERITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SEVERITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SEVERITY_EXT] = $enc; + } + } else { + $a[self::FIELD_SEVERITY] = $v; + } } if (null !== ($v = $this->getSubstance())) { $a[self::FIELD_SUBSTANCE] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRAppointment/FHIRAppointmentParticipant.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRAppointment/FHIRAppointmentParticipant.php index 253557a90d..4bc297ea44 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRAppointment/FHIRAppointmentParticipant.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRAppointment/FHIRAppointmentParticipant.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -82,10 +82,6 @@ class FHIRAppointmentParticipant extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_APPOINTMENT_DOT_PARTICIPANT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ACTOR = 'actor'; const FIELD_REQUIRED = 'required'; const FIELD_REQUIRED_EXT = '_required'; @@ -139,6 +135,9 @@ class FHIRAppointmentParticipant extends FHIRBackboneElement */ protected $type = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRAppointmentParticipant Constructor * @param null|array $data @@ -168,8 +167,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_REQUIRED] instanceof FHIRParticipantRequired) { $this->setRequired($data[self::FIELD_REQUIRED]); - } elseif ($ext && is_scalar($data[self::FIELD_REQUIRED])) { - $this->setRequired(new FHIRParticipantRequired([FHIRParticipantRequired::FIELD_VALUE => $data[self::FIELD_REQUIRED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_REQUIRED])) { + $this->setRequired(new FHIRParticipantRequired([FHIRParticipantRequired::FIELD_VALUE => $data[self::FIELD_REQUIRED]] + $ext)); + } else if (is_array($data[self::FIELD_REQUIRED])) { + $this->setRequired(new FHIRParticipantRequired(array_merge($ext, $data[self::FIELD_REQUIRED]))); + } } else { $this->setRequired(new FHIRParticipantRequired($data[self::FIELD_REQUIRED])); } @@ -180,8 +183,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRParticipationStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRParticipationStatus([FHIRParticipationStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRParticipationStatus([FHIRParticipationStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRParticipationStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRParticipationStatus($data[self::FIELD_STATUS])); } @@ -189,6 +196,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_TYPE])) { if (is_array($data[self::FIELD_TYPE])) { foreach($data[self::FIELD_TYPE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addType($v); } else { @@ -471,15 +481,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getActor())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ACTOR, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRequired())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REQUIRED, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getType())) { foreach($vs as $v) { if (null === $v) { @@ -501,10 +508,26 @@ public function jsonSerialize() $a[self::FIELD_ACTOR] = $v; } if (null !== ($v = $this->getRequired())) { - $a[self::FIELD_REQUIRED] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_REQUIRED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_REQUIRED_EXT] = $enc; + } + } else { + $a[self::FIELD_REQUIRED] = $v; + } } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if ([] !== ($vs = $this->getType())) { $a[self::FIELD_TYPE] = $vs; diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRAuditEvent/FHIRAuditEventAgent.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRAuditEvent/FHIRAuditEventAgent.php index d32a8a528b..4a4287537a 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRAuditEvent/FHIRAuditEventAgent.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRAuditEvent/FHIRAuditEventAgent.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -85,10 +85,6 @@ class FHIRAuditEventAgent extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_AUDIT_EVENT_DOT_AGENT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ALT_ID = 'altId'; const FIELD_ALT_ID_EXT = '_altId'; const FIELD_LOCATION = 'location'; @@ -238,6 +234,9 @@ class FHIRAuditEventAgent extends FHIRBackboneElement */ protected $userId = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRAuditEventAgent Constructor * @param null|array $data @@ -260,8 +259,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ALT_ID] instanceof FHIRString) { $this->setAltId($data[self::FIELD_ALT_ID]); - } elseif ($ext && is_scalar($data[self::FIELD_ALT_ID])) { - $this->setAltId(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_ALT_ID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ALT_ID])) { + $this->setAltId(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_ALT_ID]] + $ext)); + } else if (is_array($data[self::FIELD_ALT_ID])) { + $this->setAltId(new FHIRString(array_merge($ext, $data[self::FIELD_ALT_ID]))); + } } else { $this->setAltId(new FHIRString($data[self::FIELD_ALT_ID])); } @@ -286,8 +289,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -305,17 +312,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_POLICY])) { foreach($data[self::FIELD_POLICY] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRUri) { $this->addPolicy($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addPolicy(new FHIRUri([FHIRUri::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addPolicy(new FHIRUri([FHIRUri::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addPolicy(new FHIRUri(array_merge($v, $ext[$i]))); + } } else { $this->addPolicy(new FHIRUri($v)); } } } elseif ($data[self::FIELD_POLICY] instanceof FHIRUri) { $this->addPolicy($data[self::FIELD_POLICY]); - } elseif ($ext && is_scalar($data[self::FIELD_POLICY])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_POLICY])) { $this->addPolicy(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_POLICY]] + $ext)); } else { $this->addPolicy(new FHIRUri($data[self::FIELD_POLICY])); @@ -324,6 +338,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PURPOSE_OF_USE])) { if (is_array($data[self::FIELD_PURPOSE_OF_USE])) { foreach($data[self::FIELD_PURPOSE_OF_USE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addPurposeOfUse($v); } else { @@ -349,8 +366,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_REQUESTOR] instanceof FHIRBoolean) { $this->setRequestor($data[self::FIELD_REQUESTOR]); - } elseif ($ext && is_scalar($data[self::FIELD_REQUESTOR])) { - $this->setRequestor(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_REQUESTOR]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_REQUESTOR])) { + $this->setRequestor(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_REQUESTOR]] + $ext)); + } else if (is_array($data[self::FIELD_REQUESTOR])) { + $this->setRequestor(new FHIRBoolean(array_merge($ext, $data[self::FIELD_REQUESTOR]))); + } } else { $this->setRequestor(new FHIRBoolean($data[self::FIELD_REQUESTOR])); } @@ -358,6 +379,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ROLE])) { if (is_array($data[self::FIELD_ROLE])) { foreach($data[self::FIELD_ROLE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addRole($v); } else { @@ -376,8 +400,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_USER_ID] instanceof FHIRIdentifier) { $this->setUserId($data[self::FIELD_USER_ID]); - } elseif ($ext && is_scalar($data[self::FIELD_USER_ID])) { - $this->setUserId(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_USER_ID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_USER_ID])) { + $this->setUserId(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_USER_ID]] + $ext)); + } else if (is_array($data[self::FIELD_USER_ID])) { + $this->setUserId(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_USER_ID]))); + } } else { $this->setUserId(new FHIRIdentifier($data[self::FIELD_USER_ID])); } @@ -1003,21 +1031,19 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getAltId())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ALT_ID, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getLocation())) { $v->xmlSerialize($sxe->addChild(self::FIELD_LOCATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getMedia())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MEDIA, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NAME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getNetwork())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NETWORK, null, $v->_getFHIRXMLNamespace())); } @@ -1029,7 +1055,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_POLICY, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getPurposeOfUse())) { foreach($vs as $v) { if (null === $v) { @@ -1038,14 +1063,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_PURPOSE_OF_USE, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REFERENCE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getRequestor())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REQUESTOR, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getRole())) { foreach($vs as $v) { if (null === $v) { @@ -1054,7 +1077,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_ROLE, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getUserId())) { $v->xmlSerialize($sxe->addChild(self::FIELD_USER_ID, null, $v->_getFHIRXMLNamespace())); } @@ -1068,8 +1090,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getAltId())) { - $a[self::FIELD_ALT_ID] = $v->getValue(); - $a[self::FIELD_ALT_ID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ALT_ID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ALT_ID_EXT] = $enc; + } + } else { + $a[self::FIELD_ALT_ID] = $v; + } } if (null !== ($v = $this->getLocation())) { $a[self::FIELD_LOCATION] = $v; @@ -1078,8 +1107,15 @@ public function jsonSerialize() $a[self::FIELD_MEDIA] = $v; } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if (null !== ($v = $this->getNetwork())) { $a[self::FIELD_NETWORK] = $v; @@ -1090,8 +1126,17 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_POLICY][] = $v->getValue(); - $a[self::FIELD_POLICY_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_POLICY][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_POLICY_EXT][] = $enc; + } else { + $a[self::FIELD_POLICY_EXT][] = null; + } + } else { + $a[self::FIELD_POLICY][] = $v; + } } } if ([] !== ($vs = $this->getPurposeOfUse())) { @@ -1101,14 +1146,29 @@ public function jsonSerialize() $a[self::FIELD_REFERENCE] = $v; } if (null !== ($v = $this->getRequestor())) { - $a[self::FIELD_REQUESTOR] = $v->getValue(); - $a[self::FIELD_REQUESTOR_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_REQUESTOR] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_REQUESTOR_EXT] = $enc; + } + } else { + $a[self::FIELD_REQUESTOR] = $v; + } } if ([] !== ($vs = $this->getRole())) { $a[self::FIELD_ROLE] = $vs; } if (null !== ($v = $this->getUserId())) { - $a[self::FIELD_USER_ID] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_USER_ID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_USER_ID_EXT] = $enc; + } + } else { + $a[self::FIELD_USER_ID] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRAuditEvent/FHIRAuditEventDetail.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRAuditEvent/FHIRAuditEventDetail.php index dbf8711c52..bdc4f6bbbe 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRAuditEvent/FHIRAuditEventDetail.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRAuditEvent/FHIRAuditEventDetail.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRAuditEventDetail extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_AUDIT_EVENT_DOT_DETAIL; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_TYPE = 'type'; const FIELD_TYPE_EXT = '_type'; const FIELD_VALUE = 'value'; @@ -111,6 +107,9 @@ class FHIRAuditEventDetail extends FHIRBackboneElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRAuditEventDetail Constructor * @param null|array $data @@ -137,8 +136,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TYPE] instanceof FHIRString) { $this->setType($data[self::FIELD_TYPE]); - } elseif ($ext && is_scalar($data[self::FIELD_TYPE])) { - $this->setType(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TYPE])) { + $this->setType(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } else if (is_array($data[self::FIELD_TYPE])) { + $this->setType(new FHIRString(array_merge($ext, $data[self::FIELD_TYPE]))); + } } else { $this->setType(new FHIRString($data[self::FIELD_TYPE])); } @@ -149,8 +152,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE] instanceof FHIRBase64Binary) { $this->setValue($data[self::FIELD_VALUE]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE])) { - $this->setValue(new FHIRBase64Binary([FHIRBase64Binary::FIELD_VALUE => $data[self::FIELD_VALUE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE])) { + $this->setValue(new FHIRBase64Binary([FHIRBase64Binary::FIELD_VALUE => $data[self::FIELD_VALUE]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE])) { + $this->setValue(new FHIRBase64Binary(array_merge($ext, $data[self::FIELD_VALUE]))); + } } else { $this->setValue(new FHIRBase64Binary($data[self::FIELD_VALUE])); } @@ -344,10 +351,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getValue())) { + $sxe->addAttribute(self::FIELD_VALUE, (string)$v); $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE, null, $v->_getFHIRXMLNamespace())); } return $sxe; @@ -360,12 +369,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getType())) { - $a[self::FIELD_TYPE] = $v->getValue(); - $a[self::FIELD_TYPE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TYPE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TYPE_EXT] = $enc; + } + } else { + $a[self::FIELD_TYPE] = $v; + } } if (null !== ($v = $this->getValue())) { - $a[self::FIELD_VALUE] = $v->getValue(); - $a[self::FIELD_VALUE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRAuditEvent/FHIRAuditEventEntity.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRAuditEvent/FHIRAuditEventEntity.php index a33fdf4210..edf862a2a2 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRAuditEvent/FHIRAuditEventEntity.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRAuditEvent/FHIRAuditEventEntity.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -83,10 +83,6 @@ class FHIRAuditEventEntity extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_AUDIT_EVENT_DOT_ENTITY; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DESCRIPTION = 'description'; const FIELD_DESCRIPTION_EXT = '_description'; const FIELD_DETAIL = 'detail'; @@ -215,6 +211,9 @@ class FHIRAuditEventEntity extends FHIRBackboneElement */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRAuditEventEntity Constructor * @param null|array $data @@ -237,8 +236,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -249,17 +252,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_DETAIL])) { foreach($data[self::FIELD_DETAIL] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRAuditEventDetail) { $this->addDetail($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addDetail(new FHIRAuditEventDetail([FHIRAuditEventDetail::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addDetail(new FHIRAuditEventDetail([FHIRAuditEventDetail::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addDetail(new FHIRAuditEventDetail(array_merge($v, $ext[$i]))); + } } else { $this->addDetail(new FHIRAuditEventDetail($v)); } } } elseif ($data[self::FIELD_DETAIL] instanceof FHIRAuditEventDetail) { $this->addDetail($data[self::FIELD_DETAIL]); - } elseif ($ext && is_scalar($data[self::FIELD_DETAIL])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_DETAIL])) { $this->addDetail(new FHIRAuditEventDetail([FHIRAuditEventDetail::FIELD_VALUE => $data[self::FIELD_DETAIL]] + $ext)); } else { $this->addDetail(new FHIRAuditEventDetail($data[self::FIELD_DETAIL])); @@ -271,8 +281,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->setIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { - $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_IDENTIFIER]))); + } } else { $this->setIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); } @@ -290,8 +304,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -302,8 +320,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_QUERY] instanceof FHIRBase64Binary) { $this->setQuery($data[self::FIELD_QUERY]); - } elseif ($ext && is_scalar($data[self::FIELD_QUERY])) { - $this->setQuery(new FHIRBase64Binary([FHIRBase64Binary::FIELD_VALUE => $data[self::FIELD_QUERY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_QUERY])) { + $this->setQuery(new FHIRBase64Binary([FHIRBase64Binary::FIELD_VALUE => $data[self::FIELD_QUERY]] + $ext)); + } else if (is_array($data[self::FIELD_QUERY])) { + $this->setQuery(new FHIRBase64Binary(array_merge($ext, $data[self::FIELD_QUERY]))); + } } else { $this->setQuery(new FHIRBase64Binary($data[self::FIELD_QUERY])); } @@ -325,6 +347,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SECURITY_LABEL])) { if (is_array($data[self::FIELD_SECURITY_LABEL])) { foreach($data[self::FIELD_SECURITY_LABEL] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCoding) { $this->addSecurityLabel($v); } else { @@ -868,10 +893,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getDescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESCRIPTION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getDetail())) { foreach($vs as $v) { if (null === $v) { @@ -880,11 +905,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_DETAIL, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getLifecycle())) { $v->xmlSerialize($sxe->addChild(self::FIELD_LIFECYCLE, null, $v->_getFHIRXMLNamespace())); } @@ -894,15 +917,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getQuery())) { $v->xmlSerialize($sxe->addChild(self::FIELD_QUERY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REFERENCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRole())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ROLE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getSecurityLabel())) { foreach($vs as $v) { if (null === $v) { @@ -911,7 +931,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_SECURITY_LABEL, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -925,25 +944,70 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if ([] !== ($vs = $this->getDetail())) { - $a[self::FIELD_DETAIL] = $vs; + $a[self::FIELD_DETAIL] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DETAIL][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DETAIL_EXT][] = $enc; + } else { + $a[self::FIELD_DETAIL_EXT][] = null; + } + } else { + $a[self::FIELD_DETAIL][] = $v; + } + } } if (null !== ($v = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_IDENTIFIER] = $v; + } } if (null !== ($v = $this->getLifecycle())) { $a[self::FIELD_LIFECYCLE] = $v; } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if (null !== ($v = $this->getQuery())) { - $a[self::FIELD_QUERY] = $v->getValue(); - $a[self::FIELD_QUERY_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_QUERY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_QUERY_EXT] = $enc; + } + } else { + $a[self::FIELD_QUERY] = $v; + } } if (null !== ($v = $this->getReference())) { $a[self::FIELD_REFERENCE] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRAuditEvent/FHIRAuditEventNetwork.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRAuditEvent/FHIRAuditEventNetwork.php index 781cb8eac4..a3f4d76213 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRAuditEvent/FHIRAuditEventNetwork.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRAuditEvent/FHIRAuditEventNetwork.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRAuditEventNetwork extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_AUDIT_EVENT_DOT_NETWORK; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ADDRESS = 'address'; const FIELD_ADDRESS_EXT = '_address'; const FIELD_TYPE = 'type'; @@ -112,6 +108,9 @@ class FHIRAuditEventNetwork extends FHIRBackboneElement */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRAuditEventNetwork Constructor * @param null|array $data @@ -134,8 +133,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ADDRESS] instanceof FHIRString) { $this->setAddress($data[self::FIELD_ADDRESS]); - } elseif ($ext && is_scalar($data[self::FIELD_ADDRESS])) { - $this->setAddress(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_ADDRESS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ADDRESS])) { + $this->setAddress(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_ADDRESS]] + $ext)); + } else if (is_array($data[self::FIELD_ADDRESS])) { + $this->setAddress(new FHIRString(array_merge($ext, $data[self::FIELD_ADDRESS]))); + } } else { $this->setAddress(new FHIRString($data[self::FIELD_ADDRESS])); } @@ -146,8 +149,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TYPE] instanceof FHIRAuditEventAgentNetworkType) { $this->setType($data[self::FIELD_TYPE]); - } elseif ($ext && is_scalar($data[self::FIELD_TYPE])) { - $this->setType(new FHIRAuditEventAgentNetworkType([FHIRAuditEventAgentNetworkType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TYPE])) { + $this->setType(new FHIRAuditEventAgentNetworkType([FHIRAuditEventAgentNetworkType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } else if (is_array($data[self::FIELD_TYPE])) { + $this->setType(new FHIRAuditEventAgentNetworkType(array_merge($ext, $data[self::FIELD_TYPE]))); + } } else { $this->setType(new FHIRAuditEventAgentNetworkType($data[self::FIELD_TYPE])); } @@ -332,10 +339,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getAddress())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ADDRESS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -349,11 +356,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getAddress())) { - $a[self::FIELD_ADDRESS] = $v->getValue(); - $a[self::FIELD_ADDRESS_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ADDRESS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ADDRESS_EXT] = $enc; + } + } else { + $a[self::FIELD_ADDRESS] = $v; + } } if (null !== ($v = $this->getType())) { - $a[self::FIELD_TYPE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TYPE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TYPE_EXT] = $enc; + } + } else { + $a[self::FIELD_TYPE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRAuditEvent/FHIRAuditEventSource.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRAuditEvent/FHIRAuditEventSource.php index 7b42ec4431..274218d235 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRAuditEvent/FHIRAuditEventSource.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRAuditEvent/FHIRAuditEventSource.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -81,10 +81,6 @@ class FHIRAuditEventSource extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_AUDIT_EVENT_DOT_SOURCE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_IDENTIFIER = 'identifier'; const FIELD_IDENTIFIER_EXT = '_identifier'; const FIELD_SITE = 'site'; @@ -125,6 +121,9 @@ class FHIRAuditEventSource extends FHIRBackboneElement */ protected $type = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRAuditEventSource Constructor * @param null|array $data @@ -147,8 +146,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->setIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { - $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_IDENTIFIER]))); + } } else { $this->setIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); } @@ -159,8 +162,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SITE] instanceof FHIRString) { $this->setSite($data[self::FIELD_SITE]); - } elseif ($ext && is_scalar($data[self::FIELD_SITE])) { - $this->setSite(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SITE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SITE])) { + $this->setSite(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SITE]] + $ext)); + } else if (is_array($data[self::FIELD_SITE])) { + $this->setSite(new FHIRString(array_merge($ext, $data[self::FIELD_SITE]))); + } } else { $this->setSite(new FHIRString($data[self::FIELD_SITE])); } @@ -168,6 +175,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_TYPE])) { if (is_array($data[self::FIELD_TYPE])) { foreach($data[self::FIELD_TYPE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCoding) { $this->addType($v); } else { @@ -428,7 +438,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getSite())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SITE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getType())) { foreach($vs as $v) { if (null === $v) { @@ -447,11 +456,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_IDENTIFIER] = $v; + } } if (null !== ($v = $this->getSite())) { - $a[self::FIELD_SITE] = $v->getValue(); - $a[self::FIELD_SITE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SITE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SITE_EXT] = $enc; + } + } else { + $a[self::FIELD_SITE] = $v; + } } if ([] !== ($vs = $this->getType())) { $a[self::FIELD_TYPE] = $vs; diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRBundle/FHIRBundleEntry.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRBundle/FHIRBundleEntry.php index 8bf899d6fd..3942456038 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRBundle/FHIRBundleEntry.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRBundle/FHIRBundleEntry.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRBundleEntry extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_BUNDLE_DOT_ENTRY; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_FULL_URL = 'fullUrl'; const FIELD_FULL_URL_EXT = '_fullUrl'; const FIELD_LINK = 'link'; @@ -152,6 +148,9 @@ class FHIRBundleEntry extends FHIRBackboneElement */ protected $search = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRBundleEntry Constructor * @param null|array $data @@ -174,8 +173,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_FULL_URL] instanceof FHIRUri) { $this->setFullUrl($data[self::FIELD_FULL_URL]); - } elseif ($ext && is_scalar($data[self::FIELD_FULL_URL])) { - $this->setFullUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_FULL_URL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_FULL_URL])) { + $this->setFullUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_FULL_URL]] + $ext)); + } else if (is_array($data[self::FIELD_FULL_URL])) { + $this->setFullUrl(new FHIRUri(array_merge($ext, $data[self::FIELD_FULL_URL]))); + } } else { $this->setFullUrl(new FHIRUri($data[self::FIELD_FULL_URL])); } @@ -183,6 +186,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_LINK])) { if (is_array($data[self::FIELD_LINK])) { foreach($data[self::FIELD_LINK] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRBundleLink) { $this->addLink($v); } else { @@ -573,10 +579,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getFullUrl())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FULL_URL, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getLink())) { foreach($vs as $v) { if (null === $v) { @@ -585,20 +591,16 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_LINK, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getRequest())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REQUEST, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getResource())) { $tsxe = $sxe->addChild(self::FIELD_RESOURCE); $v->xmlSerialize($tsxe->addChild($v->_getFHIRTypeName(), null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getResponse())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RESPONSE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSearch())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SEARCH, null, $v->_getFHIRXMLNamespace())); } @@ -612,8 +614,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getFullUrl())) { - $a[self::FIELD_FULL_URL] = $v->getValue(); - $a[self::FIELD_FULL_URL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FULL_URL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FULL_URL_EXT] = $enc; + } + } else { + $a[self::FIELD_FULL_URL] = $v; + } } if ([] !== ($vs = $this->getLink())) { $a[self::FIELD_LINK] = $vs; diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRBundle/FHIRBundleLink.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRBundle/FHIRBundleLink.php index 3adfd33934..1c34007acc 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRBundle/FHIRBundleLink.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRBundle/FHIRBundleLink.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRBundleLink extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_BUNDLE_DOT_LINK; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_RELATION = 'relation'; const FIELD_RELATION_EXT = '_relation'; const FIELD_URL = 'url'; @@ -110,6 +106,9 @@ class FHIRBundleLink extends FHIRBackboneElement */ protected $url = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRBundleLink Constructor * @param null|array $data @@ -132,8 +131,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_RELATION] instanceof FHIRString) { $this->setRelation($data[self::FIELD_RELATION]); - } elseif ($ext && is_scalar($data[self::FIELD_RELATION])) { - $this->setRelation(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_RELATION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_RELATION])) { + $this->setRelation(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_RELATION]] + $ext)); + } else if (is_array($data[self::FIELD_RELATION])) { + $this->setRelation(new FHIRString(array_merge($ext, $data[self::FIELD_RELATION]))); + } } else { $this->setRelation(new FHIRString($data[self::FIELD_RELATION])); } @@ -144,8 +147,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_URL] instanceof FHIRUri) { $this->setUrl($data[self::FIELD_URL]); - } elseif ($ext && is_scalar($data[self::FIELD_URL])) { - $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } else if (is_array($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri(array_merge($ext, $data[self::FIELD_URL]))); + } } else { $this->setUrl(new FHIRUri($data[self::FIELD_URL])); } @@ -341,6 +348,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getRelation())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RELATION, null, $v->_getFHIRXMLNamespace())); } @@ -357,12 +365,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getRelation())) { - $a[self::FIELD_RELATION] = $v->getValue(); - $a[self::FIELD_RELATION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_RELATION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_RELATION_EXT] = $enc; + } + } else { + $a[self::FIELD_RELATION] = $v; + } } if (null !== ($v = $this->getUrl())) { - $a[self::FIELD_URL] = $v->getValue(); - $a[self::FIELD_URL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_URL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_URL_EXT] = $enc; + } + } else { + $a[self::FIELD_URL] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRBundle/FHIRBundleRequest.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRBundle/FHIRBundleRequest.php index 2851b5f5e6..a111fbb2f6 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRBundle/FHIRBundleRequest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRBundle/FHIRBundleRequest.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRBundleRequest extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_BUNDLE_DOT_REQUEST; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_IF_MATCH = 'ifMatch'; const FIELD_IF_MATCH_EXT = '_ifMatch'; const FIELD_IF_MODIFIED_SINCE = 'ifModifiedSince'; @@ -172,6 +168,9 @@ class FHIRBundleRequest extends FHIRBackboneElement */ protected $url = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRBundleRequest Constructor * @param null|array $data @@ -194,8 +193,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IF_MATCH] instanceof FHIRString) { $this->setIfMatch($data[self::FIELD_IF_MATCH]); - } elseif ($ext && is_scalar($data[self::FIELD_IF_MATCH])) { - $this->setIfMatch(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_IF_MATCH]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IF_MATCH])) { + $this->setIfMatch(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_IF_MATCH]] + $ext)); + } else if (is_array($data[self::FIELD_IF_MATCH])) { + $this->setIfMatch(new FHIRString(array_merge($ext, $data[self::FIELD_IF_MATCH]))); + } } else { $this->setIfMatch(new FHIRString($data[self::FIELD_IF_MATCH])); } @@ -206,8 +209,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IF_MODIFIED_SINCE] instanceof FHIRInstant) { $this->setIfModifiedSince($data[self::FIELD_IF_MODIFIED_SINCE]); - } elseif ($ext && is_scalar($data[self::FIELD_IF_MODIFIED_SINCE])) { - $this->setIfModifiedSince(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_IF_MODIFIED_SINCE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IF_MODIFIED_SINCE])) { + $this->setIfModifiedSince(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_IF_MODIFIED_SINCE]] + $ext)); + } else if (is_array($data[self::FIELD_IF_MODIFIED_SINCE])) { + $this->setIfModifiedSince(new FHIRInstant(array_merge($ext, $data[self::FIELD_IF_MODIFIED_SINCE]))); + } } else { $this->setIfModifiedSince(new FHIRInstant($data[self::FIELD_IF_MODIFIED_SINCE])); } @@ -218,8 +225,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IF_NONE_EXIST] instanceof FHIRString) { $this->setIfNoneExist($data[self::FIELD_IF_NONE_EXIST]); - } elseif ($ext && is_scalar($data[self::FIELD_IF_NONE_EXIST])) { - $this->setIfNoneExist(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_IF_NONE_EXIST]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IF_NONE_EXIST])) { + $this->setIfNoneExist(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_IF_NONE_EXIST]] + $ext)); + } else if (is_array($data[self::FIELD_IF_NONE_EXIST])) { + $this->setIfNoneExist(new FHIRString(array_merge($ext, $data[self::FIELD_IF_NONE_EXIST]))); + } } else { $this->setIfNoneExist(new FHIRString($data[self::FIELD_IF_NONE_EXIST])); } @@ -230,8 +241,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IF_NONE_MATCH] instanceof FHIRString) { $this->setIfNoneMatch($data[self::FIELD_IF_NONE_MATCH]); - } elseif ($ext && is_scalar($data[self::FIELD_IF_NONE_MATCH])) { - $this->setIfNoneMatch(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_IF_NONE_MATCH]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IF_NONE_MATCH])) { + $this->setIfNoneMatch(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_IF_NONE_MATCH]] + $ext)); + } else if (is_array($data[self::FIELD_IF_NONE_MATCH])) { + $this->setIfNoneMatch(new FHIRString(array_merge($ext, $data[self::FIELD_IF_NONE_MATCH]))); + } } else { $this->setIfNoneMatch(new FHIRString($data[self::FIELD_IF_NONE_MATCH])); } @@ -242,8 +257,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_METHOD] instanceof FHIRHTTPVerb) { $this->setMethod($data[self::FIELD_METHOD]); - } elseif ($ext && is_scalar($data[self::FIELD_METHOD])) { - $this->setMethod(new FHIRHTTPVerb([FHIRHTTPVerb::FIELD_VALUE => $data[self::FIELD_METHOD]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_METHOD])) { + $this->setMethod(new FHIRHTTPVerb([FHIRHTTPVerb::FIELD_VALUE => $data[self::FIELD_METHOD]] + $ext)); + } else if (is_array($data[self::FIELD_METHOD])) { + $this->setMethod(new FHIRHTTPVerb(array_merge($ext, $data[self::FIELD_METHOD]))); + } } else { $this->setMethod(new FHIRHTTPVerb($data[self::FIELD_METHOD])); } @@ -254,8 +273,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_URL] instanceof FHIRUri) { $this->setUrl($data[self::FIELD_URL]); - } elseif ($ext && is_scalar($data[self::FIELD_URL])) { - $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } else if (is_array($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri(array_merge($ext, $data[self::FIELD_URL]))); + } } else { $this->setUrl(new FHIRUri($data[self::FIELD_URL])); } @@ -632,6 +655,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getIfMatch())) { $v->xmlSerialize($sxe->addChild(self::FIELD_IF_MATCH, null, $v->_getFHIRXMLNamespace())); } @@ -644,7 +668,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getIfNoneMatch())) { $v->xmlSerialize($sxe->addChild(self::FIELD_IF_NONE_MATCH, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getMethod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_METHOD, null, $v->_getFHIRXMLNamespace())); } @@ -661,27 +684,70 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getIfMatch())) { - $a[self::FIELD_IF_MATCH] = $v->getValue(); - $a[self::FIELD_IF_MATCH_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IF_MATCH] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IF_MATCH_EXT] = $enc; + } + } else { + $a[self::FIELD_IF_MATCH] = $v; + } } if (null !== ($v = $this->getIfModifiedSince())) { - $a[self::FIELD_IF_MODIFIED_SINCE] = $v->getValue(); - $a[self::FIELD_IF_MODIFIED_SINCE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IF_MODIFIED_SINCE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IF_MODIFIED_SINCE_EXT] = $enc; + } + } else { + $a[self::FIELD_IF_MODIFIED_SINCE] = $v; + } } if (null !== ($v = $this->getIfNoneExist())) { - $a[self::FIELD_IF_NONE_EXIST] = $v->getValue(); - $a[self::FIELD_IF_NONE_EXIST_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IF_NONE_EXIST] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IF_NONE_EXIST_EXT] = $enc; + } + } else { + $a[self::FIELD_IF_NONE_EXIST] = $v; + } } if (null !== ($v = $this->getIfNoneMatch())) { - $a[self::FIELD_IF_NONE_MATCH] = $v->getValue(); - $a[self::FIELD_IF_NONE_MATCH_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IF_NONE_MATCH] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IF_NONE_MATCH_EXT] = $enc; + } + } else { + $a[self::FIELD_IF_NONE_MATCH] = $v; + } } if (null !== ($v = $this->getMethod())) { - $a[self::FIELD_METHOD] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_METHOD] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_METHOD_EXT] = $enc; + } + } else { + $a[self::FIELD_METHOD] = $v; + } } if (null !== ($v = $this->getUrl())) { - $a[self::FIELD_URL] = $v->getValue(); - $a[self::FIELD_URL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_URL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_URL_EXT] = $enc; + } + } else { + $a[self::FIELD_URL] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRBundle/FHIRBundleResponse.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRBundle/FHIRBundleResponse.php index 2279081454..10f4474d70 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRBundle/FHIRBundleResponse.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRBundle/FHIRBundleResponse.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -81,10 +81,6 @@ class FHIRBundleResponse extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_BUNDLE_DOT_RESPONSE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ETAG = 'etag'; const FIELD_ETAG_EXT = '_etag'; const FIELD_LAST_MODIFIED = 'lastModified'; @@ -153,6 +149,9 @@ class FHIRBundleResponse extends FHIRBackboneElement */ protected $status = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRBundleResponse Constructor * @param null|array $data @@ -175,8 +174,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ETAG] instanceof FHIRString) { $this->setEtag($data[self::FIELD_ETAG]); - } elseif ($ext && is_scalar($data[self::FIELD_ETAG])) { - $this->setEtag(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_ETAG]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ETAG])) { + $this->setEtag(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_ETAG]] + $ext)); + } else if (is_array($data[self::FIELD_ETAG])) { + $this->setEtag(new FHIRString(array_merge($ext, $data[self::FIELD_ETAG]))); + } } else { $this->setEtag(new FHIRString($data[self::FIELD_ETAG])); } @@ -187,8 +190,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_LAST_MODIFIED] instanceof FHIRInstant) { $this->setLastModified($data[self::FIELD_LAST_MODIFIED]); - } elseif ($ext && is_scalar($data[self::FIELD_LAST_MODIFIED])) { - $this->setLastModified(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_LAST_MODIFIED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_LAST_MODIFIED])) { + $this->setLastModified(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_LAST_MODIFIED]] + $ext)); + } else if (is_array($data[self::FIELD_LAST_MODIFIED])) { + $this->setLastModified(new FHIRInstant(array_merge($ext, $data[self::FIELD_LAST_MODIFIED]))); + } } else { $this->setLastModified(new FHIRInstant($data[self::FIELD_LAST_MODIFIED])); } @@ -199,8 +206,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_LOCATION] instanceof FHIRUri) { $this->setLocation($data[self::FIELD_LOCATION]); - } elseif ($ext && is_scalar($data[self::FIELD_LOCATION])) { - $this->setLocation(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_LOCATION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_LOCATION])) { + $this->setLocation(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_LOCATION]] + $ext)); + } else if (is_array($data[self::FIELD_LOCATION])) { + $this->setLocation(new FHIRUri(array_merge($ext, $data[self::FIELD_LOCATION]))); + } } else { $this->setLocation(new FHIRUri($data[self::FIELD_LOCATION])); } @@ -237,8 +248,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRString) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRString(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRString($data[self::FIELD_STATUS])); } @@ -564,6 +579,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getEtag())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ETAG, null, $v->_getFHIRXMLNamespace())); } @@ -573,7 +589,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getLocation())) { $v->xmlSerialize($sxe->addChild(self::FIELD_LOCATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOutcome())) { $tsxe = $sxe->addChild(self::FIELD_OUTCOME); $v->xmlSerialize($tsxe->addChild($v->_getFHIRTypeName(), null, $v->_getFHIRXMLNamespace())); @@ -591,23 +606,51 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getEtag())) { - $a[self::FIELD_ETAG] = $v->getValue(); - $a[self::FIELD_ETAG_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ETAG] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ETAG_EXT] = $enc; + } + } else { + $a[self::FIELD_ETAG] = $v; + } } if (null !== ($v = $this->getLastModified())) { - $a[self::FIELD_LAST_MODIFIED] = $v->getValue(); - $a[self::FIELD_LAST_MODIFIED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_LAST_MODIFIED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_LAST_MODIFIED_EXT] = $enc; + } + } else { + $a[self::FIELD_LAST_MODIFIED] = $v; + } } if (null !== ($v = $this->getLocation())) { - $a[self::FIELD_LOCATION] = $v->getValue(); - $a[self::FIELD_LOCATION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_LOCATION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_LOCATION_EXT] = $enc; + } + } else { + $a[self::FIELD_LOCATION] = $v; + } } if (null !== ($v = $this->getOutcome())) { $a[self::FIELD_OUTCOME] = $v; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v->getValue(); - $a[self::FIELD_STATUS_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRBundle/FHIRBundleSearch.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRBundle/FHIRBundleSearch.php index 6d27489a0e..3379af8523 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRBundle/FHIRBundleSearch.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRBundle/FHIRBundleSearch.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRBundleSearch extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_BUNDLE_DOT_SEARCH; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_MODE = 'mode'; const FIELD_MODE_EXT = '_mode'; const FIELD_SCORE = 'score'; @@ -111,6 +107,9 @@ class FHIRBundleSearch extends FHIRBackboneElement */ protected $score = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRBundleSearch Constructor * @param null|array $data @@ -133,8 +132,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MODE] instanceof FHIRSearchEntryMode) { $this->setMode($data[self::FIELD_MODE]); - } elseif ($ext && is_scalar($data[self::FIELD_MODE])) { - $this->setMode(new FHIRSearchEntryMode([FHIRSearchEntryMode::FIELD_VALUE => $data[self::FIELD_MODE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MODE])) { + $this->setMode(new FHIRSearchEntryMode([FHIRSearchEntryMode::FIELD_VALUE => $data[self::FIELD_MODE]] + $ext)); + } else if (is_array($data[self::FIELD_MODE])) { + $this->setMode(new FHIRSearchEntryMode(array_merge($ext, $data[self::FIELD_MODE]))); + } } else { $this->setMode(new FHIRSearchEntryMode($data[self::FIELD_MODE])); } @@ -145,8 +148,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SCORE] instanceof FHIRDecimal) { $this->setScore($data[self::FIELD_SCORE]); - } elseif ($ext && is_scalar($data[self::FIELD_SCORE])) { - $this->setScore(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_SCORE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SCORE])) { + $this->setScore(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_SCORE]] + $ext)); + } else if (is_array($data[self::FIELD_SCORE])) { + $this->setScore(new FHIRDecimal(array_merge($ext, $data[self::FIELD_SCORE]))); + } } else { $this->setScore(new FHIRDecimal($data[self::FIELD_SCORE])); } @@ -350,11 +357,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getMode())) { - $a[self::FIELD_MODE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MODE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MODE_EXT] = $enc; + } + } else { + $a[self::FIELD_MODE] = $v; + } } if (null !== ($v = $this->getScore())) { - $a[self::FIELD_SCORE] = $v->getValue(); - $a[self::FIELD_SCORE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SCORE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SCORE_EXT] = $enc; + } + } else { + $a[self::FIELD_SCORE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementCertificate.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementCertificate.php index 15ec337250..02f7a79ebb 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementCertificate.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementCertificate.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRCapabilityStatementCertificate extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CAPABILITY_STATEMENT_DOT_CERTIFICATE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_BLOB = 'blob'; const FIELD_BLOB_EXT = '_blob'; const FIELD_TYPE = 'type'; @@ -112,6 +108,9 @@ class FHIRCapabilityStatementCertificate extends FHIRBackboneElement */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRCapabilityStatementCertificate Constructor * @param null|array $data @@ -134,8 +133,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_BLOB] instanceof FHIRBase64Binary) { $this->setBlob($data[self::FIELD_BLOB]); - } elseif ($ext && is_scalar($data[self::FIELD_BLOB])) { - $this->setBlob(new FHIRBase64Binary([FHIRBase64Binary::FIELD_VALUE => $data[self::FIELD_BLOB]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_BLOB])) { + $this->setBlob(new FHIRBase64Binary([FHIRBase64Binary::FIELD_VALUE => $data[self::FIELD_BLOB]] + $ext)); + } else if (is_array($data[self::FIELD_BLOB])) { + $this->setBlob(new FHIRBase64Binary(array_merge($ext, $data[self::FIELD_BLOB]))); + } } else { $this->setBlob(new FHIRBase64Binary($data[self::FIELD_BLOB])); } @@ -146,8 +149,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TYPE] instanceof FHIRCode) { $this->setType($data[self::FIELD_TYPE]); - } elseif ($ext && is_scalar($data[self::FIELD_TYPE])) { - $this->setType(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TYPE])) { + $this->setType(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } else if (is_array($data[self::FIELD_TYPE])) { + $this->setType(new FHIRCode(array_merge($ext, $data[self::FIELD_TYPE]))); + } } else { $this->setType(new FHIRCode($data[self::FIELD_TYPE])); } @@ -343,6 +350,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getBlob())) { $v->xmlSerialize($sxe->addChild(self::FIELD_BLOB, null, $v->_getFHIRXMLNamespace())); } @@ -359,12 +367,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getBlob())) { - $a[self::FIELD_BLOB] = $v->getValue(); - $a[self::FIELD_BLOB_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_BLOB] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_BLOB_EXT] = $enc; + } + } else { + $a[self::FIELD_BLOB] = $v; + } } if (null !== ($v = $this->getType())) { - $a[self::FIELD_TYPE] = $v->getValue(); - $a[self::FIELD_TYPE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TYPE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TYPE_EXT] = $enc; + } + } else { + $a[self::FIELD_TYPE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementDocument.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementDocument.php index b5110eb91d..be7456651b 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementDocument.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementDocument.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -81,10 +81,6 @@ class FHIRCapabilityStatementDocument extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CAPABILITY_STATEMENT_DOT_DOCUMENT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DOCUMENTATION = 'documentation'; const FIELD_DOCUMENTATION_EXT = '_documentation'; const FIELD_MODE = 'mode'; @@ -126,6 +122,9 @@ class FHIRCapabilityStatementDocument extends FHIRBackboneElement */ protected $profile = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRCapabilityStatementDocument Constructor * @param null|array $data @@ -148,8 +147,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DOCUMENTATION] instanceof FHIRString) { $this->setDocumentation($data[self::FIELD_DOCUMENTATION]); - } elseif ($ext && is_scalar($data[self::FIELD_DOCUMENTATION])) { - $this->setDocumentation(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DOCUMENTATION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DOCUMENTATION])) { + $this->setDocumentation(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DOCUMENTATION]] + $ext)); + } else if (is_array($data[self::FIELD_DOCUMENTATION])) { + $this->setDocumentation(new FHIRString(array_merge($ext, $data[self::FIELD_DOCUMENTATION]))); + } } else { $this->setDocumentation(new FHIRString($data[self::FIELD_DOCUMENTATION])); } @@ -160,8 +163,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MODE] instanceof FHIRDocumentMode) { $this->setMode($data[self::FIELD_MODE]); - } elseif ($ext && is_scalar($data[self::FIELD_MODE])) { - $this->setMode(new FHIRDocumentMode([FHIRDocumentMode::FIELD_VALUE => $data[self::FIELD_MODE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MODE])) { + $this->setMode(new FHIRDocumentMode([FHIRDocumentMode::FIELD_VALUE => $data[self::FIELD_MODE]] + $ext)); + } else if (is_array($data[self::FIELD_MODE])) { + $this->setMode(new FHIRDocumentMode(array_merge($ext, $data[self::FIELD_MODE]))); + } } else { $this->setMode(new FHIRDocumentMode($data[self::FIELD_MODE])); } @@ -388,14 +395,13 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getDocumentation())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DOCUMENTATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getMode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MODE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getProfile())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PROFILE, null, $v->_getFHIRXMLNamespace())); } @@ -409,11 +415,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getDocumentation())) { - $a[self::FIELD_DOCUMENTATION] = $v->getValue(); - $a[self::FIELD_DOCUMENTATION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DOCUMENTATION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DOCUMENTATION_EXT] = $enc; + } + } else { + $a[self::FIELD_DOCUMENTATION] = $v; + } } if (null !== ($v = $this->getMode())) { - $a[self::FIELD_MODE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MODE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MODE_EXT] = $enc; + } + } else { + $a[self::FIELD_MODE] = $v; + } } if (null !== ($v = $this->getProfile())) { $a[self::FIELD_PROFILE] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementEndpoint.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementEndpoint.php index 4b5554ed37..9d8c5bdda6 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementEndpoint.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementEndpoint.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRCapabilityStatementEndpoint extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CAPABILITY_STATEMENT_DOT_ENDPOINT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ADDRESS = 'address'; const FIELD_ADDRESS_EXT = '_address'; const FIELD_PROTOCOL = 'protocol'; @@ -112,6 +108,9 @@ class FHIRCapabilityStatementEndpoint extends FHIRBackboneElement */ protected $protocol = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRCapabilityStatementEndpoint Constructor * @param null|array $data @@ -134,8 +133,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ADDRESS] instanceof FHIRUri) { $this->setAddress($data[self::FIELD_ADDRESS]); - } elseif ($ext && is_scalar($data[self::FIELD_ADDRESS])) { - $this->setAddress(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_ADDRESS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ADDRESS])) { + $this->setAddress(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_ADDRESS]] + $ext)); + } else if (is_array($data[self::FIELD_ADDRESS])) { + $this->setAddress(new FHIRUri(array_merge($ext, $data[self::FIELD_ADDRESS]))); + } } else { $this->setAddress(new FHIRUri($data[self::FIELD_ADDRESS])); } @@ -329,10 +332,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getAddress())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ADDRESS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getProtocol())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PROTOCOL, null, $v->_getFHIRXMLNamespace())); } @@ -346,8 +349,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getAddress())) { - $a[self::FIELD_ADDRESS] = $v->getValue(); - $a[self::FIELD_ADDRESS_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ADDRESS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ADDRESS_EXT] = $enc; + } + } else { + $a[self::FIELD_ADDRESS] = $v; + } } if (null !== ($v = $this->getProtocol())) { $a[self::FIELD_PROTOCOL] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementEvent.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementEvent.php index 66e49f7e1a..403abcc900 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementEvent.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementEvent.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -84,10 +84,6 @@ class FHIRCapabilityStatementEvent extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CAPABILITY_STATEMENT_DOT_EVENT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CATEGORY = 'category'; const FIELD_CATEGORY_EXT = '_category'; const FIELD_CODE = 'code'; @@ -176,6 +172,9 @@ class FHIRCapabilityStatementEvent extends FHIRBackboneElement */ protected $response = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRCapabilityStatementEvent Constructor * @param null|array $data @@ -198,8 +197,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CATEGORY] instanceof FHIRMessageSignificanceCategory) { $this->setCategory($data[self::FIELD_CATEGORY]); - } elseif ($ext && is_scalar($data[self::FIELD_CATEGORY])) { - $this->setCategory(new FHIRMessageSignificanceCategory([FHIRMessageSignificanceCategory::FIELD_VALUE => $data[self::FIELD_CATEGORY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CATEGORY])) { + $this->setCategory(new FHIRMessageSignificanceCategory([FHIRMessageSignificanceCategory::FIELD_VALUE => $data[self::FIELD_CATEGORY]] + $ext)); + } else if (is_array($data[self::FIELD_CATEGORY])) { + $this->setCategory(new FHIRMessageSignificanceCategory(array_merge($ext, $data[self::FIELD_CATEGORY]))); + } } else { $this->setCategory(new FHIRMessageSignificanceCategory($data[self::FIELD_CATEGORY])); } @@ -217,8 +220,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DOCUMENTATION] instanceof FHIRString) { $this->setDocumentation($data[self::FIELD_DOCUMENTATION]); - } elseif ($ext && is_scalar($data[self::FIELD_DOCUMENTATION])) { - $this->setDocumentation(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DOCUMENTATION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DOCUMENTATION])) { + $this->setDocumentation(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DOCUMENTATION]] + $ext)); + } else if (is_array($data[self::FIELD_DOCUMENTATION])) { + $this->setDocumentation(new FHIRString(array_merge($ext, $data[self::FIELD_DOCUMENTATION]))); + } } else { $this->setDocumentation(new FHIRString($data[self::FIELD_DOCUMENTATION])); } @@ -232,8 +239,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MODE] instanceof FHIREventCapabilityMode) { $this->setMode($data[self::FIELD_MODE]); - } elseif ($ext && is_scalar($data[self::FIELD_MODE])) { - $this->setMode(new FHIREventCapabilityMode([FHIREventCapabilityMode::FIELD_VALUE => $data[self::FIELD_MODE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MODE])) { + $this->setMode(new FHIREventCapabilityMode([FHIREventCapabilityMode::FIELD_VALUE => $data[self::FIELD_MODE]] + $ext)); + } else if (is_array($data[self::FIELD_MODE])) { + $this->setMode(new FHIREventCapabilityMode(array_merge($ext, $data[self::FIELD_MODE]))); + } } else { $this->setMode(new FHIREventCapabilityMode($data[self::FIELD_MODE])); } @@ -610,25 +621,20 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getCategory())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CATEGORY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getDocumentation())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DOCUMENTATION, null, $v->_getFHIRXMLNamespace())); - } - if (null !== ($v = $this->getFocus())) { + } if (null !== ($v = $this->getFocus())) { $sxe->addAttribute(self::FIELD_FOCUS, (string)$v); } - if (null !== ($v = $this->getMode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MODE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRequest())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REQUEST, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getResponse())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RESPONSE, null, $v->_getFHIRXMLNamespace())); } @@ -642,20 +648,43 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getCategory())) { - $a[self::FIELD_CATEGORY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CATEGORY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CATEGORY_EXT] = $enc; + } + } else { + $a[self::FIELD_CATEGORY] = $v; + } } if (null !== ($v = $this->getCode())) { $a[self::FIELD_CODE] = $v; } if (null !== ($v = $this->getDocumentation())) { - $a[self::FIELD_DOCUMENTATION] = $v->getValue(); - $a[self::FIELD_DOCUMENTATION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DOCUMENTATION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DOCUMENTATION_EXT] = $enc; + } + } else { + $a[self::FIELD_DOCUMENTATION] = $v; + } } if (null !== ($v = $this->getFocus())) { $a[self::FIELD_FOCUS] = $v; } if (null !== ($v = $this->getMode())) { - $a[self::FIELD_MODE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MODE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MODE_EXT] = $enc; + } + } else { + $a[self::FIELD_MODE] = $v; + } } if (null !== ($v = $this->getRequest())) { $a[self::FIELD_REQUEST] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementImplementation.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementImplementation.php index 6932c24ab7..f72b05e7dd 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementImplementation.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementImplementation.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRCapabilityStatementImplementation extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CAPABILITY_STATEMENT_DOT_IMPLEMENTATION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DESCRIPTION = 'description'; const FIELD_DESCRIPTION_EXT = '_description'; const FIELD_URL = 'url'; @@ -113,6 +109,9 @@ class FHIRCapabilityStatementImplementation extends FHIRBackboneElement */ protected $url = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRCapabilityStatementImplementation Constructor * @param null|array $data @@ -135,8 +134,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -147,8 +150,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_URL] instanceof FHIRUri) { $this->setUrl($data[self::FIELD_URL]); - } elseif ($ext && is_scalar($data[self::FIELD_URL])) { - $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } else if (is_array($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri(array_merge($ext, $data[self::FIELD_URL]))); + } } else { $this->setUrl(new FHIRUri($data[self::FIELD_URL])); } @@ -346,6 +353,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getDescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESCRIPTION, null, $v->_getFHIRXMLNamespace())); } @@ -362,12 +370,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if (null !== ($v = $this->getUrl())) { - $a[self::FIELD_URL] = $v->getValue(); - $a[self::FIELD_URL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_URL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_URL_EXT] = $enc; + } + } else { + $a[self::FIELD_URL] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementInteraction.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementInteraction.php index 05430f6d08..9428aabe5d 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementInteraction.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementInteraction.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRCapabilityStatementInteraction extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CAPABILITY_STATEMENT_DOT_INTERACTION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CODE = 'code'; const FIELD_CODE_EXT = '_code'; const FIELD_DOCUMENTATION = 'documentation'; @@ -112,6 +108,9 @@ class FHIRCapabilityStatementInteraction extends FHIRBackboneElement */ protected $documentation = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRCapabilityStatementInteraction Constructor * @param null|array $data @@ -134,8 +133,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CODE] instanceof FHIRTypeRestfulInteraction) { $this->setCode($data[self::FIELD_CODE]); - } elseif ($ext && is_scalar($data[self::FIELD_CODE])) { - $this->setCode(new FHIRTypeRestfulInteraction([FHIRTypeRestfulInteraction::FIELD_VALUE => $data[self::FIELD_CODE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CODE])) { + $this->setCode(new FHIRTypeRestfulInteraction([FHIRTypeRestfulInteraction::FIELD_VALUE => $data[self::FIELD_CODE]] + $ext)); + } else if (is_array($data[self::FIELD_CODE])) { + $this->setCode(new FHIRTypeRestfulInteraction(array_merge($ext, $data[self::FIELD_CODE]))); + } } else { $this->setCode(new FHIRTypeRestfulInteraction($data[self::FIELD_CODE])); } @@ -146,8 +149,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DOCUMENTATION] instanceof FHIRString) { $this->setDocumentation($data[self::FIELD_DOCUMENTATION]); - } elseif ($ext && is_scalar($data[self::FIELD_DOCUMENTATION])) { - $this->setDocumentation(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DOCUMENTATION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DOCUMENTATION])) { + $this->setDocumentation(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DOCUMENTATION]] + $ext)); + } else if (is_array($data[self::FIELD_DOCUMENTATION])) { + $this->setDocumentation(new FHIRString(array_merge($ext, $data[self::FIELD_DOCUMENTATION]))); + } } else { $this->setDocumentation(new FHIRString($data[self::FIELD_DOCUMENTATION])); } @@ -349,11 +356,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getCode())) { - $a[self::FIELD_CODE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CODE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CODE_EXT] = $enc; + } + } else { + $a[self::FIELD_CODE] = $v; + } } if (null !== ($v = $this->getDocumentation())) { - $a[self::FIELD_DOCUMENTATION] = $v->getValue(); - $a[self::FIELD_DOCUMENTATION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DOCUMENTATION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DOCUMENTATION_EXT] = $enc; + } + } else { + $a[self::FIELD_DOCUMENTATION] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementInteraction1.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementInteraction1.php index 5be3ac070a..c39066fb4e 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementInteraction1.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementInteraction1.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRCapabilityStatementInteraction1 extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CAPABILITY_STATEMENT_DOT_INTERACTION_1; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CODE = 'code'; const FIELD_CODE_EXT = '_code'; const FIELD_DOCUMENTATION = 'documentation'; @@ -112,6 +108,9 @@ class FHIRCapabilityStatementInteraction1 extends FHIRBackboneElement */ protected $documentation = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRCapabilityStatementInteraction1 Constructor * @param null|array $data @@ -134,8 +133,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CODE] instanceof FHIRSystemRestfulInteraction) { $this->setCode($data[self::FIELD_CODE]); - } elseif ($ext && is_scalar($data[self::FIELD_CODE])) { - $this->setCode(new FHIRSystemRestfulInteraction([FHIRSystemRestfulInteraction::FIELD_VALUE => $data[self::FIELD_CODE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CODE])) { + $this->setCode(new FHIRSystemRestfulInteraction([FHIRSystemRestfulInteraction::FIELD_VALUE => $data[self::FIELD_CODE]] + $ext)); + } else if (is_array($data[self::FIELD_CODE])) { + $this->setCode(new FHIRSystemRestfulInteraction(array_merge($ext, $data[self::FIELD_CODE]))); + } } else { $this->setCode(new FHIRSystemRestfulInteraction($data[self::FIELD_CODE])); } @@ -146,8 +149,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DOCUMENTATION] instanceof FHIRString) { $this->setDocumentation($data[self::FIELD_DOCUMENTATION]); - } elseif ($ext && is_scalar($data[self::FIELD_DOCUMENTATION])) { - $this->setDocumentation(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DOCUMENTATION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DOCUMENTATION])) { + $this->setDocumentation(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DOCUMENTATION]] + $ext)); + } else if (is_array($data[self::FIELD_DOCUMENTATION])) { + $this->setDocumentation(new FHIRString(array_merge($ext, $data[self::FIELD_DOCUMENTATION]))); + } } else { $this->setDocumentation(new FHIRString($data[self::FIELD_DOCUMENTATION])); } @@ -349,11 +356,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getCode())) { - $a[self::FIELD_CODE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CODE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CODE_EXT] = $enc; + } + } else { + $a[self::FIELD_CODE] = $v; + } } if (null !== ($v = $this->getDocumentation())) { - $a[self::FIELD_DOCUMENTATION] = $v->getValue(); - $a[self::FIELD_DOCUMENTATION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DOCUMENTATION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DOCUMENTATION_EXT] = $enc; + } + } else { + $a[self::FIELD_DOCUMENTATION] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementMessaging.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementMessaging.php index a5f6300ba9..e37651e01b 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementMessaging.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementMessaging.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRCapabilityStatementMessaging extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CAPABILITY_STATEMENT_DOT_MESSAGING; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DOCUMENTATION = 'documentation'; const FIELD_DOCUMENTATION_EXT = '_documentation'; const FIELD_ENDPOINT = 'endpoint'; @@ -151,6 +147,9 @@ class FHIRCapabilityStatementMessaging extends FHIRBackboneElement */ protected $supportedMessage = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRCapabilityStatementMessaging Constructor * @param null|array $data @@ -173,8 +172,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DOCUMENTATION] instanceof FHIRString) { $this->setDocumentation($data[self::FIELD_DOCUMENTATION]); - } elseif ($ext && is_scalar($data[self::FIELD_DOCUMENTATION])) { - $this->setDocumentation(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DOCUMENTATION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DOCUMENTATION])) { + $this->setDocumentation(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DOCUMENTATION]] + $ext)); + } else if (is_array($data[self::FIELD_DOCUMENTATION])) { + $this->setDocumentation(new FHIRString(array_merge($ext, $data[self::FIELD_DOCUMENTATION]))); + } } else { $this->setDocumentation(new FHIRString($data[self::FIELD_DOCUMENTATION])); } @@ -182,6 +185,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ENDPOINT])) { if (is_array($data[self::FIELD_ENDPOINT])) { foreach($data[self::FIELD_ENDPOINT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCapabilityStatementEndpoint) { $this->addEndpoint($v); } else { @@ -197,6 +203,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_EVENT])) { if (is_array($data[self::FIELD_EVENT])) { foreach($data[self::FIELD_EVENT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCapabilityStatementEvent) { $this->addEvent($v); } else { @@ -215,8 +224,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_RELIABLE_CACHE] instanceof FHIRUnsignedInt) { $this->setReliableCache($data[self::FIELD_RELIABLE_CACHE]); - } elseif ($ext && is_scalar($data[self::FIELD_RELIABLE_CACHE])) { - $this->setReliableCache(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_RELIABLE_CACHE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_RELIABLE_CACHE])) { + $this->setReliableCache(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_RELIABLE_CACHE]] + $ext)); + } else if (is_array($data[self::FIELD_RELIABLE_CACHE])) { + $this->setReliableCache(new FHIRUnsignedInt(array_merge($ext, $data[self::FIELD_RELIABLE_CACHE]))); + } } else { $this->setReliableCache(new FHIRUnsignedInt($data[self::FIELD_RELIABLE_CACHE])); } @@ -224,6 +237,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SUPPORTED_MESSAGE])) { if (is_array($data[self::FIELD_SUPPORTED_MESSAGE])) { foreach($data[self::FIELD_SUPPORTED_MESSAGE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCapabilityStatementSupportedMessage) { $this->addSupportedMessage($v); } else { @@ -617,10 +633,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getDocumentation())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DOCUMENTATION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getEndpoint())) { foreach($vs as $v) { if (null === $v) { @@ -629,7 +645,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_ENDPOINT, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getEvent())) { foreach($vs as $v) { if (null === $v) { @@ -641,7 +656,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getReliableCache())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RELIABLE_CACHE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getSupportedMessage())) { foreach($vs as $v) { if (null === $v) { @@ -660,8 +674,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getDocumentation())) { - $a[self::FIELD_DOCUMENTATION] = $v->getValue(); - $a[self::FIELD_DOCUMENTATION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DOCUMENTATION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DOCUMENTATION_EXT] = $enc; + } + } else { + $a[self::FIELD_DOCUMENTATION] = $v; + } } if ([] !== ($vs = $this->getEndpoint())) { $a[self::FIELD_ENDPOINT] = $vs; @@ -670,8 +691,15 @@ public function jsonSerialize() $a[self::FIELD_EVENT] = $vs; } if (null !== ($v = $this->getReliableCache())) { - $a[self::FIELD_RELIABLE_CACHE] = $v->getValue(); - $a[self::FIELD_RELIABLE_CACHE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_RELIABLE_CACHE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_RELIABLE_CACHE_EXT] = $enc; + } + } else { + $a[self::FIELD_RELIABLE_CACHE] = $v; + } } if ([] !== ($vs = $this->getSupportedMessage())) { $a[self::FIELD_SUPPORTED_MESSAGE] = $vs; diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementOperation.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementOperation.php index f270e6c478..54488a9553 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementOperation.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementOperation.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRCapabilityStatementOperation extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CAPABILITY_STATEMENT_DOT_OPERATION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DEFINITION = 'definition'; const FIELD_NAME = 'name'; const FIELD_NAME_EXT = '_name'; @@ -112,6 +108,9 @@ class FHIRCapabilityStatementOperation extends FHIRBackboneElement */ protected $name = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRCapabilityStatementOperation Constructor * @param null|array $data @@ -141,8 +140,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -349,8 +352,15 @@ public function jsonSerialize() $a[self::FIELD_DEFINITION] = $v; } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementResource.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementResource.php index 115b66e898..8bf11c775c 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementResource.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementResource.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -87,10 +87,6 @@ class FHIRCapabilityStatementResource extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CAPABILITY_STATEMENT_DOT_RESOURCE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CONDITIONAL_CREATE = 'conditionalCreate'; const FIELD_CONDITIONAL_CREATE_EXT = '_conditionalCreate'; const FIELD_CONDITIONAL_DELETE = 'conditionalDelete'; @@ -294,6 +290,9 @@ class FHIRCapabilityStatementResource extends FHIRBackboneElement */ protected $versioning = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRCapabilityStatementResource Constructor * @param null|array $data @@ -316,8 +315,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CONDITIONAL_CREATE] instanceof FHIRBoolean) { $this->setConditionalCreate($data[self::FIELD_CONDITIONAL_CREATE]); - } elseif ($ext && is_scalar($data[self::FIELD_CONDITIONAL_CREATE])) { - $this->setConditionalCreate(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_CONDITIONAL_CREATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CONDITIONAL_CREATE])) { + $this->setConditionalCreate(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_CONDITIONAL_CREATE]] + $ext)); + } else if (is_array($data[self::FIELD_CONDITIONAL_CREATE])) { + $this->setConditionalCreate(new FHIRBoolean(array_merge($ext, $data[self::FIELD_CONDITIONAL_CREATE]))); + } } else { $this->setConditionalCreate(new FHIRBoolean($data[self::FIELD_CONDITIONAL_CREATE])); } @@ -328,8 +331,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CONDITIONAL_DELETE] instanceof FHIRConditionalDeleteStatus) { $this->setConditionalDelete($data[self::FIELD_CONDITIONAL_DELETE]); - } elseif ($ext && is_scalar($data[self::FIELD_CONDITIONAL_DELETE])) { - $this->setConditionalDelete(new FHIRConditionalDeleteStatus([FHIRConditionalDeleteStatus::FIELD_VALUE => $data[self::FIELD_CONDITIONAL_DELETE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CONDITIONAL_DELETE])) { + $this->setConditionalDelete(new FHIRConditionalDeleteStatus([FHIRConditionalDeleteStatus::FIELD_VALUE => $data[self::FIELD_CONDITIONAL_DELETE]] + $ext)); + } else if (is_array($data[self::FIELD_CONDITIONAL_DELETE])) { + $this->setConditionalDelete(new FHIRConditionalDeleteStatus(array_merge($ext, $data[self::FIELD_CONDITIONAL_DELETE]))); + } } else { $this->setConditionalDelete(new FHIRConditionalDeleteStatus($data[self::FIELD_CONDITIONAL_DELETE])); } @@ -340,8 +347,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CONDITIONAL_READ] instanceof FHIRConditionalReadStatus) { $this->setConditionalRead($data[self::FIELD_CONDITIONAL_READ]); - } elseif ($ext && is_scalar($data[self::FIELD_CONDITIONAL_READ])) { - $this->setConditionalRead(new FHIRConditionalReadStatus([FHIRConditionalReadStatus::FIELD_VALUE => $data[self::FIELD_CONDITIONAL_READ]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CONDITIONAL_READ])) { + $this->setConditionalRead(new FHIRConditionalReadStatus([FHIRConditionalReadStatus::FIELD_VALUE => $data[self::FIELD_CONDITIONAL_READ]] + $ext)); + } else if (is_array($data[self::FIELD_CONDITIONAL_READ])) { + $this->setConditionalRead(new FHIRConditionalReadStatus(array_merge($ext, $data[self::FIELD_CONDITIONAL_READ]))); + } } else { $this->setConditionalRead(new FHIRConditionalReadStatus($data[self::FIELD_CONDITIONAL_READ])); } @@ -352,8 +363,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CONDITIONAL_UPDATE] instanceof FHIRBoolean) { $this->setConditionalUpdate($data[self::FIELD_CONDITIONAL_UPDATE]); - } elseif ($ext && is_scalar($data[self::FIELD_CONDITIONAL_UPDATE])) { - $this->setConditionalUpdate(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_CONDITIONAL_UPDATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CONDITIONAL_UPDATE])) { + $this->setConditionalUpdate(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_CONDITIONAL_UPDATE]] + $ext)); + } else if (is_array($data[self::FIELD_CONDITIONAL_UPDATE])) { + $this->setConditionalUpdate(new FHIRBoolean(array_merge($ext, $data[self::FIELD_CONDITIONAL_UPDATE]))); + } } else { $this->setConditionalUpdate(new FHIRBoolean($data[self::FIELD_CONDITIONAL_UPDATE])); } @@ -364,8 +379,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DOCUMENTATION] instanceof FHIRMarkdown) { $this->setDocumentation($data[self::FIELD_DOCUMENTATION]); - } elseif ($ext && is_scalar($data[self::FIELD_DOCUMENTATION])) { - $this->setDocumentation(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_DOCUMENTATION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DOCUMENTATION])) { + $this->setDocumentation(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_DOCUMENTATION]] + $ext)); + } else if (is_array($data[self::FIELD_DOCUMENTATION])) { + $this->setDocumentation(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_DOCUMENTATION]))); + } } else { $this->setDocumentation(new FHIRMarkdown($data[self::FIELD_DOCUMENTATION])); } @@ -373,6 +392,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_INTERACTION])) { if (is_array($data[self::FIELD_INTERACTION])) { foreach($data[self::FIELD_INTERACTION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCapabilityStatementInteraction) { $this->addInteraction($v); } else { @@ -398,8 +420,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_READ_HISTORY] instanceof FHIRBoolean) { $this->setReadHistory($data[self::FIELD_READ_HISTORY]); - } elseif ($ext && is_scalar($data[self::FIELD_READ_HISTORY])) { - $this->setReadHistory(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_READ_HISTORY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_READ_HISTORY])) { + $this->setReadHistory(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_READ_HISTORY]] + $ext)); + } else if (is_array($data[self::FIELD_READ_HISTORY])) { + $this->setReadHistory(new FHIRBoolean(array_merge($ext, $data[self::FIELD_READ_HISTORY]))); + } } else { $this->setReadHistory(new FHIRBoolean($data[self::FIELD_READ_HISTORY])); } @@ -410,17 +436,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_REFERENCE_POLICY])) { foreach($data[self::FIELD_REFERENCE_POLICY] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReferenceHandlingPolicy) { $this->addReferencePolicy($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addReferencePolicy(new FHIRReferenceHandlingPolicy([FHIRReferenceHandlingPolicy::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addReferencePolicy(new FHIRReferenceHandlingPolicy([FHIRReferenceHandlingPolicy::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addReferencePolicy(new FHIRReferenceHandlingPolicy(array_merge($v, $ext[$i]))); + } } else { $this->addReferencePolicy(new FHIRReferenceHandlingPolicy($v)); } } } elseif ($data[self::FIELD_REFERENCE_POLICY] instanceof FHIRReferenceHandlingPolicy) { $this->addReferencePolicy($data[self::FIELD_REFERENCE_POLICY]); - } elseif ($ext && is_scalar($data[self::FIELD_REFERENCE_POLICY])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_REFERENCE_POLICY])) { $this->addReferencePolicy(new FHIRReferenceHandlingPolicy([FHIRReferenceHandlingPolicy::FIELD_VALUE => $data[self::FIELD_REFERENCE_POLICY]] + $ext)); } else { $this->addReferencePolicy(new FHIRReferenceHandlingPolicy($data[self::FIELD_REFERENCE_POLICY])); @@ -432,17 +465,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_SEARCH_INCLUDE])) { foreach($data[self::FIELD_SEARCH_INCLUDE] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRString) { $this->addSearchInclude($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addSearchInclude(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addSearchInclude(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addSearchInclude(new FHIRString(array_merge($v, $ext[$i]))); + } } else { $this->addSearchInclude(new FHIRString($v)); } } } elseif ($data[self::FIELD_SEARCH_INCLUDE] instanceof FHIRString) { $this->addSearchInclude($data[self::FIELD_SEARCH_INCLUDE]); - } elseif ($ext && is_scalar($data[self::FIELD_SEARCH_INCLUDE])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_SEARCH_INCLUDE])) { $this->addSearchInclude(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SEARCH_INCLUDE]] + $ext)); } else { $this->addSearchInclude(new FHIRString($data[self::FIELD_SEARCH_INCLUDE])); @@ -451,6 +491,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SEARCH_PARAM])) { if (is_array($data[self::FIELD_SEARCH_PARAM])) { foreach($data[self::FIELD_SEARCH_PARAM] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCapabilityStatementSearchParam) { $this->addSearchParam($v); } else { @@ -469,17 +512,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_SEARCH_REV_INCLUDE])) { foreach($data[self::FIELD_SEARCH_REV_INCLUDE] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRString) { $this->addSearchRevInclude($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addSearchRevInclude(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addSearchRevInclude(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addSearchRevInclude(new FHIRString(array_merge($v, $ext[$i]))); + } } else { $this->addSearchRevInclude(new FHIRString($v)); } } } elseif ($data[self::FIELD_SEARCH_REV_INCLUDE] instanceof FHIRString) { $this->addSearchRevInclude($data[self::FIELD_SEARCH_REV_INCLUDE]); - } elseif ($ext && is_scalar($data[self::FIELD_SEARCH_REV_INCLUDE])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_SEARCH_REV_INCLUDE])) { $this->addSearchRevInclude(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SEARCH_REV_INCLUDE]] + $ext)); } else { $this->addSearchRevInclude(new FHIRString($data[self::FIELD_SEARCH_REV_INCLUDE])); @@ -494,8 +544,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_UPDATE_CREATE] instanceof FHIRBoolean) { $this->setUpdateCreate($data[self::FIELD_UPDATE_CREATE]); - } elseif ($ext && is_scalar($data[self::FIELD_UPDATE_CREATE])) { - $this->setUpdateCreate(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_UPDATE_CREATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_UPDATE_CREATE])) { + $this->setUpdateCreate(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_UPDATE_CREATE]] + $ext)); + } else if (is_array($data[self::FIELD_UPDATE_CREATE])) { + $this->setUpdateCreate(new FHIRBoolean(array_merge($ext, $data[self::FIELD_UPDATE_CREATE]))); + } } else { $this->setUpdateCreate(new FHIRBoolean($data[self::FIELD_UPDATE_CREATE])); } @@ -506,8 +560,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VERSIONING] instanceof FHIRResourceVersionPolicy) { $this->setVersioning($data[self::FIELD_VERSIONING]); - } elseif ($ext && is_scalar($data[self::FIELD_VERSIONING])) { - $this->setVersioning(new FHIRResourceVersionPolicy([FHIRResourceVersionPolicy::FIELD_VALUE => $data[self::FIELD_VERSIONING]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VERSIONING])) { + $this->setVersioning(new FHIRResourceVersionPolicy([FHIRResourceVersionPolicy::FIELD_VALUE => $data[self::FIELD_VERSIONING]] + $ext)); + } else if (is_array($data[self::FIELD_VERSIONING])) { + $this->setVersioning(new FHIRResourceVersionPolicy(array_merge($ext, $data[self::FIELD_VERSIONING]))); + } } else { $this->setVersioning(new FHIRResourceVersionPolicy($data[self::FIELD_VERSIONING])); } @@ -1359,14 +1417,13 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getConditionalCreate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CONDITIONAL_CREATE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getConditionalDelete())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CONDITIONAL_DELETE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getConditionalRead())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CONDITIONAL_READ, null, $v->_getFHIRXMLNamespace())); } @@ -1376,7 +1433,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDocumentation())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DOCUMENTATION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getInteraction())) { foreach($vs as $v) { if (null === $v) { @@ -1385,14 +1441,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_INTERACTION, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getProfile())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PROFILE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getReadHistory())) { $v->xmlSerialize($sxe->addChild(self::FIELD_READ_HISTORY, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getReferencePolicy())) { foreach($vs as $v) { if (null === $v) { @@ -1409,7 +1463,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_SEARCH_INCLUDE, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getSearchParam())) { foreach($vs as $v) { if (null === $v) { @@ -1425,14 +1478,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 } $v->xmlSerialize($sxe->addChild(self::FIELD_SEARCH_REV_INCLUDE, null, $v->_getFHIRXMLNamespace())); } - } - if (null !== ($v = $this->getType())) { + } if (null !== ($v = $this->getType())) { $sxe->addAttribute(self::FIELD_TYPE, (string)$v); } if (null !== ($v = $this->getUpdateCreate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_UPDATE_CREATE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getVersioning())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VERSIONING, null, $v->_getFHIRXMLNamespace())); } @@ -1446,22 +1497,59 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getConditionalCreate())) { - $a[self::FIELD_CONDITIONAL_CREATE] = $v->getValue(); - $a[self::FIELD_CONDITIONAL_CREATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CONDITIONAL_CREATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CONDITIONAL_CREATE_EXT] = $enc; + } + } else { + $a[self::FIELD_CONDITIONAL_CREATE] = $v; + } } if (null !== ($v = $this->getConditionalDelete())) { - $a[self::FIELD_CONDITIONAL_DELETE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CONDITIONAL_DELETE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CONDITIONAL_DELETE_EXT] = $enc; + } + } else { + $a[self::FIELD_CONDITIONAL_DELETE] = $v; + } } if (null !== ($v = $this->getConditionalRead())) { - $a[self::FIELD_CONDITIONAL_READ] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CONDITIONAL_READ] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CONDITIONAL_READ_EXT] = $enc; + } + } else { + $a[self::FIELD_CONDITIONAL_READ] = $v; + } } if (null !== ($v = $this->getConditionalUpdate())) { - $a[self::FIELD_CONDITIONAL_UPDATE] = $v->getValue(); - $a[self::FIELD_CONDITIONAL_UPDATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CONDITIONAL_UPDATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CONDITIONAL_UPDATE_EXT] = $enc; + } + } else { + $a[self::FIELD_CONDITIONAL_UPDATE] = $v; + } } if (null !== ($v = $this->getDocumentation())) { - $a[self::FIELD_DOCUMENTATION] = $v->getValue(); - $a[self::FIELD_DOCUMENTATION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DOCUMENTATION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DOCUMENTATION_EXT] = $enc; + } + } else { + $a[self::FIELD_DOCUMENTATION] = $v; + } } if ([] !== ($vs = $this->getInteraction())) { $a[self::FIELD_INTERACTION] = $vs; @@ -1470,11 +1558,34 @@ public function jsonSerialize() $a[self::FIELD_PROFILE] = $v; } if (null !== ($v = $this->getReadHistory())) { - $a[self::FIELD_READ_HISTORY] = $v->getValue(); - $a[self::FIELD_READ_HISTORY_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_READ_HISTORY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_READ_HISTORY_EXT] = $enc; + } + } else { + $a[self::FIELD_READ_HISTORY] = $v; + } } if ([] !== ($vs = $this->getReferencePolicy())) { - $a[self::FIELD_REFERENCE_POLICY] = $vs; + $a[self::FIELD_REFERENCE_POLICY] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_REFERENCE_POLICY][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_REFERENCE_POLICY_EXT][] = $enc; + } else { + $a[self::FIELD_REFERENCE_POLICY_EXT][] = null; + } + } else { + $a[self::FIELD_REFERENCE_POLICY][] = $v; + } + } } if ([] !== ($vs = $this->getSearchInclude())) { $a[self::FIELD_SEARCH_INCLUDE] = []; @@ -1482,8 +1593,17 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_SEARCH_INCLUDE][] = $v->getValue(); - $a[self::FIELD_SEARCH_INCLUDE_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SEARCH_INCLUDE][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SEARCH_INCLUDE_EXT][] = $enc; + } else { + $a[self::FIELD_SEARCH_INCLUDE_EXT][] = null; + } + } else { + $a[self::FIELD_SEARCH_INCLUDE][] = $v; + } } } if ([] !== ($vs = $this->getSearchParam())) { @@ -1495,19 +1615,43 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_SEARCH_REV_INCLUDE][] = $v->getValue(); - $a[self::FIELD_SEARCH_REV_INCLUDE_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SEARCH_REV_INCLUDE][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SEARCH_REV_INCLUDE_EXT][] = $enc; + } else { + $a[self::FIELD_SEARCH_REV_INCLUDE_EXT][] = null; + } + } else { + $a[self::FIELD_SEARCH_REV_INCLUDE][] = $v; + } } } if (null !== ($v = $this->getType())) { $a[self::FIELD_TYPE] = $v; } if (null !== ($v = $this->getUpdateCreate())) { - $a[self::FIELD_UPDATE_CREATE] = $v->getValue(); - $a[self::FIELD_UPDATE_CREATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_UPDATE_CREATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_UPDATE_CREATE_EXT] = $enc; + } + } else { + $a[self::FIELD_UPDATE_CREATE] = $v; + } } if (null !== ($v = $this->getVersioning())) { - $a[self::FIELD_VERSIONING] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VERSIONING] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VERSIONING_EXT] = $enc; + } + } else { + $a[self::FIELD_VERSIONING] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementRest.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementRest.php index 40a152bbfa..1b19982183 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementRest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementRest.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -81,10 +81,6 @@ class FHIRCapabilityStatementRest extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CAPABILITY_STATEMENT_DOT_REST; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_COMPARTMENT = 'compartment'; const FIELD_COMPARTMENT_EXT = '_compartment'; const FIELD_DOCUMENTATION = 'documentation'; @@ -194,6 +190,9 @@ class FHIRCapabilityStatementRest extends FHIRBackboneElement */ protected $security = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRCapabilityStatementRest Constructor * @param null|array $data @@ -216,17 +215,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_COMPARTMENT])) { foreach($data[self::FIELD_COMPARTMENT] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRUri) { $this->addCompartment($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addCompartment(new FHIRUri([FHIRUri::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addCompartment(new FHIRUri([FHIRUri::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addCompartment(new FHIRUri(array_merge($v, $ext[$i]))); + } } else { $this->addCompartment(new FHIRUri($v)); } } } elseif ($data[self::FIELD_COMPARTMENT] instanceof FHIRUri) { $this->addCompartment($data[self::FIELD_COMPARTMENT]); - } elseif ($ext && is_scalar($data[self::FIELD_COMPARTMENT])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_COMPARTMENT])) { $this->addCompartment(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_COMPARTMENT]] + $ext)); } else { $this->addCompartment(new FHIRUri($data[self::FIELD_COMPARTMENT])); @@ -238,8 +244,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DOCUMENTATION] instanceof FHIRString) { $this->setDocumentation($data[self::FIELD_DOCUMENTATION]); - } elseif ($ext && is_scalar($data[self::FIELD_DOCUMENTATION])) { - $this->setDocumentation(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DOCUMENTATION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DOCUMENTATION])) { + $this->setDocumentation(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DOCUMENTATION]] + $ext)); + } else if (is_array($data[self::FIELD_DOCUMENTATION])) { + $this->setDocumentation(new FHIRString(array_merge($ext, $data[self::FIELD_DOCUMENTATION]))); + } } else { $this->setDocumentation(new FHIRString($data[self::FIELD_DOCUMENTATION])); } @@ -247,6 +257,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_INTERACTION])) { if (is_array($data[self::FIELD_INTERACTION])) { foreach($data[self::FIELD_INTERACTION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCapabilityStatementInteraction1) { $this->addInteraction($v); } else { @@ -265,8 +278,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MODE] instanceof FHIRRestfulCapabilityMode) { $this->setMode($data[self::FIELD_MODE]); - } elseif ($ext && is_scalar($data[self::FIELD_MODE])) { - $this->setMode(new FHIRRestfulCapabilityMode([FHIRRestfulCapabilityMode::FIELD_VALUE => $data[self::FIELD_MODE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MODE])) { + $this->setMode(new FHIRRestfulCapabilityMode([FHIRRestfulCapabilityMode::FIELD_VALUE => $data[self::FIELD_MODE]] + $ext)); + } else if (is_array($data[self::FIELD_MODE])) { + $this->setMode(new FHIRRestfulCapabilityMode(array_merge($ext, $data[self::FIELD_MODE]))); + } } else { $this->setMode(new FHIRRestfulCapabilityMode($data[self::FIELD_MODE])); } @@ -274,6 +291,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_OPERATION])) { if (is_array($data[self::FIELD_OPERATION])) { foreach($data[self::FIELD_OPERATION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCapabilityStatementOperation) { $this->addOperation($v); } else { @@ -289,6 +309,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_RESOURCE])) { if (is_array($data[self::FIELD_RESOURCE])) { foreach($data[self::FIELD_RESOURCE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCapabilityStatementResource) { $this->addResource($v); } else { @@ -304,6 +327,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SEARCH_PARAM])) { if (is_array($data[self::FIELD_SEARCH_PARAM])) { foreach($data[self::FIELD_SEARCH_PARAM] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCapabilityStatementSearchParam) { $this->addSearchParam($v); } else { @@ -875,6 +901,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if ([] !== ($vs = $this->getCompartment())) { foreach($vs as $v) { if (null === $v) { @@ -886,7 +913,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDocumentation())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DOCUMENTATION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getInteraction())) { foreach($vs as $v) { if (null === $v) { @@ -895,11 +921,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_INTERACTION, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getMode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MODE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getOperation())) { foreach($vs as $v) { if (null === $v) { @@ -908,7 +932,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_OPERATION, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getResource())) { foreach($vs as $v) { if (null === $v) { @@ -917,7 +940,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_RESOURCE, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getSearchParam())) { foreach($vs as $v) { if (null === $v) { @@ -926,7 +948,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_SEARCH_PARAM, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getSecurity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SECURITY, null, $v->_getFHIRXMLNamespace())); } @@ -945,19 +966,43 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_COMPARTMENT][] = $v->getValue(); - $a[self::FIELD_COMPARTMENT_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_COMPARTMENT][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_COMPARTMENT_EXT][] = $enc; + } else { + $a[self::FIELD_COMPARTMENT_EXT][] = null; + } + } else { + $a[self::FIELD_COMPARTMENT][] = $v; + } } } if (null !== ($v = $this->getDocumentation())) { - $a[self::FIELD_DOCUMENTATION] = $v->getValue(); - $a[self::FIELD_DOCUMENTATION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DOCUMENTATION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DOCUMENTATION_EXT] = $enc; + } + } else { + $a[self::FIELD_DOCUMENTATION] = $v; + } } if ([] !== ($vs = $this->getInteraction())) { $a[self::FIELD_INTERACTION] = $vs; } if (null !== ($v = $this->getMode())) { - $a[self::FIELD_MODE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MODE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MODE_EXT] = $enc; + } + } else { + $a[self::FIELD_MODE] = $v; + } } if ([] !== ($vs = $this->getOperation())) { $a[self::FIELD_OPERATION] = $vs; diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementSearchParam.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementSearchParam.php index d21444f642..240172e89c 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementSearchParam.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementSearchParam.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -81,10 +81,6 @@ class FHIRCapabilityStatementSearchParam extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CAPABILITY_STATEMENT_DOT_SEARCH_PARAM; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DEFINITION = 'definition'; const FIELD_DEFINITION_EXT = '_definition'; const FIELD_DOCUMENTATION = 'documentation'; @@ -140,6 +136,9 @@ class FHIRCapabilityStatementSearchParam extends FHIRBackboneElement */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRCapabilityStatementSearchParam Constructor * @param null|array $data @@ -162,8 +161,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DEFINITION] instanceof FHIRUri) { $this->setDefinition($data[self::FIELD_DEFINITION]); - } elseif ($ext && is_scalar($data[self::FIELD_DEFINITION])) { - $this->setDefinition(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_DEFINITION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DEFINITION])) { + $this->setDefinition(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_DEFINITION]] + $ext)); + } else if (is_array($data[self::FIELD_DEFINITION])) { + $this->setDefinition(new FHIRUri(array_merge($ext, $data[self::FIELD_DEFINITION]))); + } } else { $this->setDefinition(new FHIRUri($data[self::FIELD_DEFINITION])); } @@ -174,8 +177,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DOCUMENTATION] instanceof FHIRString) { $this->setDocumentation($data[self::FIELD_DOCUMENTATION]); - } elseif ($ext && is_scalar($data[self::FIELD_DOCUMENTATION])) { - $this->setDocumentation(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DOCUMENTATION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DOCUMENTATION])) { + $this->setDocumentation(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DOCUMENTATION]] + $ext)); + } else if (is_array($data[self::FIELD_DOCUMENTATION])) { + $this->setDocumentation(new FHIRString(array_merge($ext, $data[self::FIELD_DOCUMENTATION]))); + } } else { $this->setDocumentation(new FHIRString($data[self::FIELD_DOCUMENTATION])); } @@ -186,8 +193,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -198,8 +209,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TYPE] instanceof FHIRSearchParamType) { $this->setType($data[self::FIELD_TYPE]); - } elseif ($ext && is_scalar($data[self::FIELD_TYPE])) { - $this->setType(new FHIRSearchParamType([FHIRSearchParamType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TYPE])) { + $this->setType(new FHIRSearchParamType([FHIRSearchParamType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } else if (is_array($data[self::FIELD_TYPE])) { + $this->setType(new FHIRSearchParamType(array_merge($ext, $data[self::FIELD_TYPE]))); + } } else { $this->setType(new FHIRSearchParamType($data[self::FIELD_TYPE])); } @@ -474,6 +489,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getDefinition())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFINITION, null, $v->_getFHIRXMLNamespace())); } @@ -483,7 +499,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NAME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -497,19 +512,48 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getDefinition())) { - $a[self::FIELD_DEFINITION] = $v->getValue(); - $a[self::FIELD_DEFINITION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DEFINITION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DEFINITION_EXT] = $enc; + } + } else { + $a[self::FIELD_DEFINITION] = $v; + } } if (null !== ($v = $this->getDocumentation())) { - $a[self::FIELD_DOCUMENTATION] = $v->getValue(); - $a[self::FIELD_DOCUMENTATION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DOCUMENTATION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DOCUMENTATION_EXT] = $enc; + } + } else { + $a[self::FIELD_DOCUMENTATION] = $v; + } } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if (null !== ($v = $this->getType())) { - $a[self::FIELD_TYPE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TYPE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TYPE_EXT] = $enc; + } + } else { + $a[self::FIELD_TYPE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementSecurity.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementSecurity.php index a7b66119b5..23dd6be692 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementSecurity.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementSecurity.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -81,10 +81,6 @@ class FHIRCapabilityStatementSecurity extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CAPABILITY_STATEMENT_DOT_SECURITY; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CERTIFICATE = 'certificate'; const FIELD_CORS = 'cors'; const FIELD_CORS_EXT = '_cors'; @@ -137,6 +133,9 @@ class FHIRCapabilityStatementSecurity extends FHIRBackboneElement */ protected $service = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRCapabilityStatementSecurity Constructor * @param null|array $data @@ -156,6 +155,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CERTIFICATE])) { if (is_array($data[self::FIELD_CERTIFICATE])) { foreach($data[self::FIELD_CERTIFICATE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCapabilityStatementCertificate) { $this->addCertificate($v); } else { @@ -174,8 +176,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CORS] instanceof FHIRBoolean) { $this->setCors($data[self::FIELD_CORS]); - } elseif ($ext && is_scalar($data[self::FIELD_CORS])) { - $this->setCors(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_CORS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CORS])) { + $this->setCors(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_CORS]] + $ext)); + } else if (is_array($data[self::FIELD_CORS])) { + $this->setCors(new FHIRBoolean(array_merge($ext, $data[self::FIELD_CORS]))); + } } else { $this->setCors(new FHIRBoolean($data[self::FIELD_CORS])); } @@ -186,8 +192,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -195,6 +205,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SERVICE])) { if (is_array($data[self::FIELD_SERVICE])) { foreach($data[self::FIELD_SERVICE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addService($v); } else { @@ -536,7 +549,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESCRIPTION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getService())) { foreach($vs as $v) { if (null === $v) { @@ -558,12 +570,26 @@ public function jsonSerialize() $a[self::FIELD_CERTIFICATE] = $vs; } if (null !== ($v = $this->getCors())) { - $a[self::FIELD_CORS] = $v->getValue(); - $a[self::FIELD_CORS_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CORS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CORS_EXT] = $enc; + } + } else { + $a[self::FIELD_CORS] = $v; + } } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if ([] !== ($vs = $this->getService())) { $a[self::FIELD_SERVICE] = $vs; diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementSoftware.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementSoftware.php index e401b43e0a..46f8fe1e40 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementSoftware.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementSoftware.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRCapabilityStatementSoftware extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CAPABILITY_STATEMENT_DOT_SOFTWARE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_NAME = 'name'; const FIELD_NAME_EXT = '_name'; const FIELD_RELEASE_DATE = 'releaseDate'; @@ -127,6 +123,9 @@ class FHIRCapabilityStatementSoftware extends FHIRBackboneElement */ protected $version = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRCapabilityStatementSoftware Constructor * @param null|array $data @@ -149,8 +148,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -161,8 +164,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_RELEASE_DATE] instanceof FHIRDateTime) { $this->setReleaseDate($data[self::FIELD_RELEASE_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_RELEASE_DATE])) { - $this->setReleaseDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_RELEASE_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_RELEASE_DATE])) { + $this->setReleaseDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_RELEASE_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_RELEASE_DATE])) { + $this->setReleaseDate(new FHIRDateTime(array_merge($ext, $data[self::FIELD_RELEASE_DATE]))); + } } else { $this->setReleaseDate(new FHIRDateTime($data[self::FIELD_RELEASE_DATE])); } @@ -173,8 +180,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VERSION] instanceof FHIRString) { $this->setVersion($data[self::FIELD_VERSION]); - } elseif ($ext && is_scalar($data[self::FIELD_VERSION])) { - $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } else if (is_array($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString(array_merge($ext, $data[self::FIELD_VERSION]))); + } } else { $this->setVersion(new FHIRString($data[self::FIELD_VERSION])); } @@ -418,6 +429,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NAME, null, $v->_getFHIRXMLNamespace())); } @@ -437,16 +449,37 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if (null !== ($v = $this->getReleaseDate())) { - $a[self::FIELD_RELEASE_DATE] = $v->getValue(); - $a[self::FIELD_RELEASE_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_RELEASE_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_RELEASE_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_RELEASE_DATE] = $v; + } } if (null !== ($v = $this->getVersion())) { - $a[self::FIELD_VERSION] = $v->getValue(); - $a[self::FIELD_VERSION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VERSION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VERSION_EXT] = $enc; + } + } else { + $a[self::FIELD_VERSION] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementSupportedMessage.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementSupportedMessage.php index d0388a0e0c..634ee82408 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementSupportedMessage.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementSupportedMessage.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRCapabilityStatementSupportedMessage extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CAPABILITY_STATEMENT_DOT_SUPPORTED_MESSAGE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DEFINITION = 'definition'; const FIELD_MODE = 'mode'; const FIELD_MODE_EXT = '_mode'; @@ -110,6 +106,9 @@ class FHIRCapabilityStatementSupportedMessage extends FHIRBackboneElement */ protected $mode = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRCapabilityStatementSupportedMessage Constructor * @param null|array $data @@ -139,8 +138,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MODE] instanceof FHIREventCapabilityMode) { $this->setMode($data[self::FIELD_MODE]); - } elseif ($ext && is_scalar($data[self::FIELD_MODE])) { - $this->setMode(new FHIREventCapabilityMode([FHIREventCapabilityMode::FIELD_VALUE => $data[self::FIELD_MODE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MODE])) { + $this->setMode(new FHIREventCapabilityMode([FHIREventCapabilityMode::FIELD_VALUE => $data[self::FIELD_MODE]] + $ext)); + } else if (is_array($data[self::FIELD_MODE])) { + $this->setMode(new FHIREventCapabilityMode(array_merge($ext, $data[self::FIELD_MODE]))); + } } else { $this->setMode(new FHIREventCapabilityMode($data[self::FIELD_MODE])); } @@ -316,7 +319,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDefinition())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFINITION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getMode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MODE, null, $v->_getFHIRXMLNamespace())); } @@ -333,7 +335,15 @@ public function jsonSerialize() $a[self::FIELD_DEFINITION] = $v; } if (null !== ($v = $this->getMode())) { - $a[self::FIELD_MODE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MODE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MODE_EXT] = $enc; + } + } else { + $a[self::FIELD_MODE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRCarePlan/FHIRCarePlanActivity.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRCarePlan/FHIRCarePlanActivity.php index 3c513101ba..51bf915ca4 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRCarePlan/FHIRCarePlanActivity.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRCarePlan/FHIRCarePlanActivity.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -81,10 +81,6 @@ class FHIRCarePlanActivity extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CARE_PLAN_DOT_ACTIVITY; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DETAIL = 'detail'; const FIELD_OUTCOME_CODEABLE_CONCEPT = 'outcomeCodeableConcept'; const FIELD_OUTCOME_REFERENCE = 'outcomeReference'; @@ -156,6 +152,9 @@ class FHIRCarePlanActivity extends FHIRBackboneElement */ protected $reference = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRCarePlanActivity Constructor * @param null|array $data @@ -182,6 +181,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_OUTCOME_CODEABLE_CONCEPT])) { if (is_array($data[self::FIELD_OUTCOME_CODEABLE_CONCEPT])) { foreach($data[self::FIELD_OUTCOME_CODEABLE_CONCEPT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addOutcomeCodeableConcept($v); } else { @@ -197,6 +199,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_OUTCOME_REFERENCE])) { if (is_array($data[self::FIELD_OUTCOME_REFERENCE])) { foreach($data[self::FIELD_OUTCOME_REFERENCE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addOutcomeReference($v); } else { @@ -212,6 +217,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PROGRESS])) { if (is_array($data[self::FIELD_PROGRESS])) { foreach($data[self::FIELD_PROGRESS] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRAnnotation) { $this->addProgress($v); } else { @@ -613,7 +621,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDetail())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DETAIL, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getOutcomeCodeableConcept())) { foreach($vs as $v) { if (null === $v) { @@ -622,7 +629,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_OUTCOME_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getOutcomeReference())) { foreach($vs as $v) { if (null === $v) { @@ -631,7 +637,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_OUTCOME_REFERENCE, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getProgress())) { foreach($vs as $v) { if (null === $v) { @@ -640,7 +645,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_PROGRESS, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REFERENCE, null, $v->_getFHIRXMLNamespace())); } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRCarePlan/FHIRCarePlanDetail.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRCarePlan/FHIRCarePlanDetail.php index 7cbd7255d5..e9fc1ddc18 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRCarePlan/FHIRCarePlanDetail.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRCarePlan/FHIRCarePlanDetail.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -86,10 +86,6 @@ class FHIRCarePlanDetail extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CARE_PLAN_DOT_DETAIL; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CATEGORY = 'category'; const FIELD_CODE = 'code'; const FIELD_DAILY_AMOUNT = 'dailyAmount'; @@ -351,6 +347,9 @@ class FHIRCarePlanDetail extends FHIRBackboneElement */ protected $statusReason = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRCarePlanDetail Constructor * @param null|array $data @@ -387,8 +386,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DAILY_AMOUNT] instanceof FHIRQuantity) { $this->setDailyAmount($data[self::FIELD_DAILY_AMOUNT]); - } elseif ($ext && is_scalar($data[self::FIELD_DAILY_AMOUNT])) { - $this->setDailyAmount(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_DAILY_AMOUNT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DAILY_AMOUNT])) { + $this->setDailyAmount(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_DAILY_AMOUNT]] + $ext)); + } else if (is_array($data[self::FIELD_DAILY_AMOUNT])) { + $this->setDailyAmount(new FHIRQuantity(array_merge($ext, $data[self::FIELD_DAILY_AMOUNT]))); + } } else { $this->setDailyAmount(new FHIRQuantity($data[self::FIELD_DAILY_AMOUNT])); } @@ -406,8 +409,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -415,6 +422,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_GOAL])) { if (is_array($data[self::FIELD_GOAL])) { foreach($data[self::FIELD_GOAL] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addGoal($v); } else { @@ -437,6 +447,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PERFORMER])) { if (is_array($data[self::FIELD_PERFORMER])) { foreach($data[self::FIELD_PERFORMER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addPerformer($v); } else { @@ -469,8 +482,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PROHIBITED] instanceof FHIRBoolean) { $this->setProhibited($data[self::FIELD_PROHIBITED]); - } elseif ($ext && is_scalar($data[self::FIELD_PROHIBITED])) { - $this->setProhibited(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_PROHIBITED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PROHIBITED])) { + $this->setProhibited(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_PROHIBITED]] + $ext)); + } else if (is_array($data[self::FIELD_PROHIBITED])) { + $this->setProhibited(new FHIRBoolean(array_merge($ext, $data[self::FIELD_PROHIBITED]))); + } } else { $this->setProhibited(new FHIRBoolean($data[self::FIELD_PROHIBITED])); } @@ -481,8 +498,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_QUANTITY] instanceof FHIRQuantity) { $this->setQuantity($data[self::FIELD_QUANTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_QUANTITY])) { - $this->setQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_QUANTITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_QUANTITY])) { + $this->setQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_QUANTITY])) { + $this->setQuantity(new FHIRQuantity(array_merge($ext, $data[self::FIELD_QUANTITY]))); + } } else { $this->setQuantity(new FHIRQuantity($data[self::FIELD_QUANTITY])); } @@ -490,6 +511,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REASON_CODE])) { if (is_array($data[self::FIELD_REASON_CODE])) { foreach($data[self::FIELD_REASON_CODE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addReasonCode($v); } else { @@ -505,6 +529,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REASON_REFERENCE])) { if (is_array($data[self::FIELD_REASON_REFERENCE])) { foreach($data[self::FIELD_REASON_REFERENCE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addReasonReference($v); } else { @@ -530,8 +557,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SCHEDULED_STRING] instanceof FHIRString) { $this->setScheduledString($data[self::FIELD_SCHEDULED_STRING]); - } elseif ($ext && is_scalar($data[self::FIELD_SCHEDULED_STRING])) { - $this->setScheduledString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SCHEDULED_STRING]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SCHEDULED_STRING])) { + $this->setScheduledString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SCHEDULED_STRING]] + $ext)); + } else if (is_array($data[self::FIELD_SCHEDULED_STRING])) { + $this->setScheduledString(new FHIRString(array_merge($ext, $data[self::FIELD_SCHEDULED_STRING]))); + } } else { $this->setScheduledString(new FHIRString($data[self::FIELD_SCHEDULED_STRING])); } @@ -549,8 +580,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRCarePlanActivityStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRCarePlanActivityStatus([FHIRCarePlanActivityStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRCarePlanActivityStatus([FHIRCarePlanActivityStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRCarePlanActivityStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRCarePlanActivityStatus($data[self::FIELD_STATUS])); } @@ -561,8 +596,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS_REASON] instanceof FHIRString) { $this->setStatusReason($data[self::FIELD_STATUS_REASON]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS_REASON])) { - $this->setStatusReason(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_STATUS_REASON]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS_REASON])) { + $this->setStatusReason(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_STATUS_REASON]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS_REASON])) { + $this->setStatusReason(new FHIRString(array_merge($ext, $data[self::FIELD_STATUS_REASON]))); + } } else { $this->setStatusReason(new FHIRString($data[self::FIELD_STATUS_REASON])); } @@ -1509,22 +1548,18 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getCategory())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CATEGORY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDailyAmount())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DAILY_AMOUNT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDefinition())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFINITION, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getDescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESCRIPTION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getGoal())) { foreach($vs as $v) { if (null === $v) { @@ -1533,11 +1568,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_GOAL, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getLocation())) { $v->xmlSerialize($sxe->addChild(self::FIELD_LOCATION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getPerformer())) { foreach($vs as $v) { if (null === $v) { @@ -1546,22 +1579,18 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_PERFORMER, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getProductCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PRODUCT_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getProductReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PRODUCT_REFERENCE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getProhibited())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PROHIBITED, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_QUANTITY, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getReasonCode())) { foreach($vs as $v) { if (null === $v) { @@ -1570,7 +1599,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_REASON_CODE, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getReasonReference())) { foreach($vs as $v) { if (null === $v) { @@ -1579,18 +1607,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_REASON_REFERENCE, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getScheduledPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SCHEDULED_PERIOD, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getScheduledString())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SCHEDULED_STRING, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getScheduledTiming())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SCHEDULED_TIMING, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } @@ -1613,14 +1638,29 @@ public function jsonSerialize() $a[self::FIELD_CODE] = $v; } if (null !== ($v = $this->getDailyAmount())) { - $a[self::FIELD_DAILY_AMOUNT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DAILY_AMOUNT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DAILY_AMOUNT_EXT] = $enc; + } + } else { + $a[self::FIELD_DAILY_AMOUNT] = $v; + } } if (null !== ($v = $this->getDefinition())) { $a[self::FIELD_DEFINITION] = $v; } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if ([] !== ($vs = $this->getGoal())) { $a[self::FIELD_GOAL] = $vs; @@ -1638,11 +1678,26 @@ public function jsonSerialize() $a[self::FIELD_PRODUCT_REFERENCE] = $v; } if (null !== ($v = $this->getProhibited())) { - $a[self::FIELD_PROHIBITED] = $v->getValue(); - $a[self::FIELD_PROHIBITED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PROHIBITED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PROHIBITED_EXT] = $enc; + } + } else { + $a[self::FIELD_PROHIBITED] = $v; + } } if (null !== ($v = $this->getQuantity())) { - $a[self::FIELD_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_QUANTITY] = $v; + } } if ([] !== ($vs = $this->getReasonCode())) { $a[self::FIELD_REASON_CODE] = $vs; @@ -1654,18 +1709,40 @@ public function jsonSerialize() $a[self::FIELD_SCHEDULED_PERIOD] = $v; } if (null !== ($v = $this->getScheduledString())) { - $a[self::FIELD_SCHEDULED_STRING] = $v->getValue(); - $a[self::FIELD_SCHEDULED_STRING_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SCHEDULED_STRING] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SCHEDULED_STRING_EXT] = $enc; + } + } else { + $a[self::FIELD_SCHEDULED_STRING] = $v; + } } if (null !== ($v = $this->getScheduledTiming())) { $a[self::FIELD_SCHEDULED_TIMING] = $v; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getStatusReason())) { - $a[self::FIELD_STATUS_REASON] = $v->getValue(); - $a[self::FIELD_STATUS_REASON_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS_REASON] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_REASON_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS_REASON] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRCareTeam/FHIRCareTeamParticipant.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRCareTeam/FHIRCareTeamParticipant.php index 4b01ffc6a8..d0d1177005 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRCareTeam/FHIRCareTeamParticipant.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRCareTeam/FHIRCareTeamParticipant.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRCareTeamParticipant extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CARE_TEAM_DOT_PARTICIPANT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_MEMBER = 'member'; const FIELD_ON_BEHALF_OF = 'onBehalfOf'; const FIELD_PERIOD = 'period'; @@ -137,6 +133,9 @@ class FHIRCareTeamParticipant extends FHIRBackboneElement */ protected $role = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRCareTeamParticipant Constructor * @param null|array $data @@ -426,15 +425,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getMember())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MEMBER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOnBehalfOf())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ON_BEHALF_OF, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRole())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ROLE, null, $v->_getFHIRXMLNamespace())); } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRChargeItem/FHIRChargeItemParticipant.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRChargeItem/FHIRChargeItemParticipant.php index 7511b7fa11..53c66d2f98 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRChargeItem/FHIRChargeItemParticipant.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRChargeItem/FHIRChargeItemParticipant.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -82,10 +82,6 @@ class FHIRChargeItemParticipant extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CHARGE_ITEM_DOT_PARTICIPANT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ACTOR = 'actor'; const FIELD_ROLE = 'role'; @@ -113,6 +109,9 @@ class FHIRChargeItemParticipant extends FHIRBackboneElement */ protected $role = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRChargeItemParticipant Constructor * @param null|array $data @@ -318,7 +317,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getActor())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ACTOR, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRole())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ROLE, null, $v->_getFHIRXMLNamespace())); } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimAccident.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimAccident.php index 47132f623c..72a8566f7c 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimAccident.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimAccident.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -81,10 +81,6 @@ class FHIRClaimAccident extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CLAIM_DOT_ACCIDENT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DATE = 'date'; const FIELD_DATE_EXT = '_date'; const FIELD_LOCATION_ADDRESS = 'locationAddress'; @@ -141,6 +137,9 @@ class FHIRClaimAccident extends FHIRBackboneElement */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRClaimAccident Constructor * @param null|array $data @@ -163,8 +162,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATE] instanceof FHIRDate) { $this->setDate($data[self::FIELD_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_DATE])) { - $this->setDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDate(array_merge($ext, $data[self::FIELD_DATE]))); + } } else { $this->setDate(new FHIRDate($data[self::FIELD_DATE])); } @@ -446,18 +449,16 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DATE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getLocationAddress())) { $v->xmlSerialize($sxe->addChild(self::FIELD_LOCATION_ADDRESS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getLocationReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_LOCATION_REFERENCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -471,8 +472,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getDate())) { - $a[self::FIELD_DATE] = $v->getValue(); - $a[self::FIELD_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_DATE] = $v; + } } if (null !== ($v = $this->getLocationAddress())) { $a[self::FIELD_LOCATION_ADDRESS] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimCareTeam.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimCareTeam.php index ae072baf1f..69f1bdb0ad 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimCareTeam.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimCareTeam.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -81,10 +81,6 @@ class FHIRClaimCareTeam extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CLAIM_DOT_CARE_TEAM; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_PROVIDER = 'provider'; const FIELD_QUALIFICATION = 'qualification'; const FIELD_RESPONSIBLE = 'responsible'; @@ -151,6 +147,9 @@ class FHIRClaimCareTeam extends FHIRBackboneElement */ protected $sequence = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRClaimCareTeam Constructor * @param null|array $data @@ -187,8 +186,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_RESPONSIBLE] instanceof FHIRBoolean) { $this->setResponsible($data[self::FIELD_RESPONSIBLE]); - } elseif ($ext && is_scalar($data[self::FIELD_RESPONSIBLE])) { - $this->setResponsible(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_RESPONSIBLE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_RESPONSIBLE])) { + $this->setResponsible(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_RESPONSIBLE]] + $ext)); + } else if (is_array($data[self::FIELD_RESPONSIBLE])) { + $this->setResponsible(new FHIRBoolean(array_merge($ext, $data[self::FIELD_RESPONSIBLE]))); + } } else { $this->setResponsible(new FHIRBoolean($data[self::FIELD_RESPONSIBLE])); } @@ -206,8 +209,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SEQUENCE] instanceof FHIRPositiveInt) { $this->setSequence($data[self::FIELD_SEQUENCE]); - } elseif ($ext && is_scalar($data[self::FIELD_SEQUENCE])) { - $this->setSequence(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_SEQUENCE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SEQUENCE])) { + $this->setSequence(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_SEQUENCE]] + $ext)); + } else if (is_array($data[self::FIELD_SEQUENCE])) { + $this->setSequence(new FHIRPositiveInt(array_merge($ext, $data[self::FIELD_SEQUENCE]))); + } } else { $this->setSequence(new FHIRPositiveInt($data[self::FIELD_SEQUENCE])); } @@ -510,14 +517,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getProvider())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PROVIDER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getQualification())) { $v->xmlSerialize($sxe->addChild(self::FIELD_QUALIFICATION, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getResponsible())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RESPONSIBLE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRole())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ROLE, null, $v->_getFHIRXMLNamespace())); } @@ -540,15 +545,29 @@ public function jsonSerialize() $a[self::FIELD_QUALIFICATION] = $v; } if (null !== ($v = $this->getResponsible())) { - $a[self::FIELD_RESPONSIBLE] = $v->getValue(); - $a[self::FIELD_RESPONSIBLE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_RESPONSIBLE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_RESPONSIBLE_EXT] = $enc; + } + } else { + $a[self::FIELD_RESPONSIBLE] = $v; + } } if (null !== ($v = $this->getRole())) { $a[self::FIELD_ROLE] = $v; } if (null !== ($v = $this->getSequence())) { - $a[self::FIELD_SEQUENCE] = $v->getValue(); - $a[self::FIELD_SEQUENCE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SEQUENCE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SEQUENCE_EXT] = $enc; + } + } else { + $a[self::FIELD_SEQUENCE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimDetail.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimDetail.php index 2667c33a5b..5885562546 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimDetail.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimDetail.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -83,15 +83,12 @@ class FHIRClaimDetail extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CLAIM_DOT_DETAIL; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CATEGORY = 'category'; const FIELD_FACTOR = 'factor'; const FIELD_FACTOR_EXT = '_factor'; const FIELD_MODIFIER = 'modifier'; const FIELD_NET = 'net'; + const FIELD_NET_EXT = '_net'; const FIELD_PROGRAM_CODE = 'programCode'; const FIELD_QUANTITY = 'quantity'; const FIELD_QUANTITY_EXT = '_quantity'; @@ -102,6 +99,7 @@ class FHIRClaimDetail extends FHIRBackboneElement const FIELD_SUB_DETAIL = 'subDetail'; const FIELD_UDI = 'udi'; const FIELD_UNIT_PRICE = 'unitPrice'; + const FIELD_UNIT_PRICE_EXT = '_unitPrice'; /** * A concept that may be defined by a formal reference to a terminology or ontology @@ -255,6 +253,9 @@ class FHIRClaimDetail extends FHIRBackboneElement */ protected $unitPrice = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRClaimDetail Constructor * @param null|array $data @@ -284,8 +285,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_FACTOR] instanceof FHIRDecimal) { $this->setFactor($data[self::FIELD_FACTOR]); - } elseif ($ext && is_scalar($data[self::FIELD_FACTOR])) { - $this->setFactor(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_FACTOR]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_FACTOR])) { + $this->setFactor(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_FACTOR]] + $ext)); + } else if (is_array($data[self::FIELD_FACTOR])) { + $this->setFactor(new FHIRDecimal(array_merge($ext, $data[self::FIELD_FACTOR]))); + } } else { $this->setFactor(new FHIRDecimal($data[self::FIELD_FACTOR])); } @@ -293,6 +298,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_MODIFIER])) { if (is_array($data[self::FIELD_MODIFIER])) { foreach($data[self::FIELD_MODIFIER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addModifier($v); } else { @@ -306,8 +314,17 @@ public function __construct($data = null) } } if (isset($data[self::FIELD_NET])) { + $ext = (isset($data[self::FIELD_NET_EXT]) && is_array($data[self::FIELD_NET_EXT])) + ? $data[self::FIELD_NET_EXT] + : null; if ($data[self::FIELD_NET] instanceof FHIRMoney) { $this->setNet($data[self::FIELD_NET]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NET])) { + $this->setNet(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_NET]] + $ext)); + } else if (is_array($data[self::FIELD_NET])) { + $this->setNet(new FHIRMoney(array_merge($ext, $data[self::FIELD_NET]))); + } } else { $this->setNet(new FHIRMoney($data[self::FIELD_NET])); } @@ -315,6 +332,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PROGRAM_CODE])) { if (is_array($data[self::FIELD_PROGRAM_CODE])) { foreach($data[self::FIELD_PROGRAM_CODE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addProgramCode($v); } else { @@ -333,8 +353,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_QUANTITY] instanceof FHIRQuantity) { $this->setQuantity($data[self::FIELD_QUANTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_QUANTITY])) { - $this->setQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_QUANTITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_QUANTITY])) { + $this->setQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_QUANTITY])) { + $this->setQuantity(new FHIRQuantity(array_merge($ext, $data[self::FIELD_QUANTITY]))); + } } else { $this->setQuantity(new FHIRQuantity($data[self::FIELD_QUANTITY])); } @@ -352,8 +376,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SEQUENCE] instanceof FHIRPositiveInt) { $this->setSequence($data[self::FIELD_SEQUENCE]); - } elseif ($ext && is_scalar($data[self::FIELD_SEQUENCE])) { - $this->setSequence(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_SEQUENCE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SEQUENCE])) { + $this->setSequence(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_SEQUENCE]] + $ext)); + } else if (is_array($data[self::FIELD_SEQUENCE])) { + $this->setSequence(new FHIRPositiveInt(array_merge($ext, $data[self::FIELD_SEQUENCE]))); + } } else { $this->setSequence(new FHIRPositiveInt($data[self::FIELD_SEQUENCE])); } @@ -368,6 +396,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SUB_DETAIL])) { if (is_array($data[self::FIELD_SUB_DETAIL])) { foreach($data[self::FIELD_SUB_DETAIL] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRClaimSubDetail) { $this->addSubDetail($v); } else { @@ -383,6 +414,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_UDI])) { if (is_array($data[self::FIELD_UDI])) { foreach($data[self::FIELD_UDI] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addUdi($v); } else { @@ -396,8 +430,17 @@ public function __construct($data = null) } } if (isset($data[self::FIELD_UNIT_PRICE])) { + $ext = (isset($data[self::FIELD_UNIT_PRICE_EXT]) && is_array($data[self::FIELD_UNIT_PRICE_EXT])) + ? $data[self::FIELD_UNIT_PRICE_EXT] + : null; if ($data[self::FIELD_UNIT_PRICE] instanceof FHIRMoney) { $this->setUnitPrice($data[self::FIELD_UNIT_PRICE]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_UNIT_PRICE])) { + $this->setUnitPrice(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_UNIT_PRICE]] + $ext)); + } else if (is_array($data[self::FIELD_UNIT_PRICE])) { + $this->setUnitPrice(new FHIRMoney(array_merge($ext, $data[self::FIELD_UNIT_PRICE]))); + } } else { $this->setUnitPrice(new FHIRMoney($data[self::FIELD_UNIT_PRICE])); } @@ -1084,7 +1127,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getFactor())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FACTOR, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getModifier())) { foreach($vs as $v) { if (null === $v) { @@ -1093,11 +1135,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_MODIFIER, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getNet())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NET, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getProgramCode())) { foreach($vs as $v) { if (null === $v) { @@ -1106,22 +1146,18 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_PROGRAM_CODE, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_QUANTITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRevenue())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REVENUE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getSequence())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SEQUENCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getService())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SERVICE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getSubDetail())) { foreach($vs as $v) { if (null === $v) { @@ -1130,7 +1166,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_SUB_DETAIL, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getUdi())) { foreach($vs as $v) { if (null === $v) { @@ -1139,7 +1174,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_UDI, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getUnitPrice())) { $v->xmlSerialize($sxe->addChild(self::FIELD_UNIT_PRICE, null, $v->_getFHIRXMLNamespace())); } @@ -1156,27 +1190,57 @@ public function jsonSerialize() $a[self::FIELD_CATEGORY] = $v; } if (null !== ($v = $this->getFactor())) { - $a[self::FIELD_FACTOR] = $v->getValue(); - $a[self::FIELD_FACTOR_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FACTOR] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FACTOR_EXT] = $enc; + } + } else { + $a[self::FIELD_FACTOR] = $v; + } } if ([] !== ($vs = $this->getModifier())) { $a[self::FIELD_MODIFIER] = $vs; } if (null !== ($v = $this->getNet())) { - $a[self::FIELD_NET] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NET] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NET_EXT] = $enc; + } + } else { + $a[self::FIELD_NET] = $v; + } } if ([] !== ($vs = $this->getProgramCode())) { $a[self::FIELD_PROGRAM_CODE] = $vs; } if (null !== ($v = $this->getQuantity())) { - $a[self::FIELD_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_QUANTITY] = $v; + } } if (null !== ($v = $this->getRevenue())) { $a[self::FIELD_REVENUE] = $v; } if (null !== ($v = $this->getSequence())) { - $a[self::FIELD_SEQUENCE] = $v->getValue(); - $a[self::FIELD_SEQUENCE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SEQUENCE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SEQUENCE_EXT] = $enc; + } + } else { + $a[self::FIELD_SEQUENCE] = $v; + } } if (null !== ($v = $this->getService())) { $a[self::FIELD_SERVICE] = $v; @@ -1188,7 +1252,15 @@ public function jsonSerialize() $a[self::FIELD_UDI] = $vs; } if (null !== ($v = $this->getUnitPrice())) { - $a[self::FIELD_UNIT_PRICE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_UNIT_PRICE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_UNIT_PRICE_EXT] = $enc; + } + } else { + $a[self::FIELD_UNIT_PRICE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimDiagnosis.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimDiagnosis.php index 2aff619535..c282f7691b 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimDiagnosis.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimDiagnosis.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRClaimDiagnosis extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CLAIM_DOT_DIAGNOSIS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DIAGNOSIS_CODEABLE_CONCEPT = 'diagnosisCodeableConcept'; const FIELD_DIAGNOSIS_REFERENCE = 'diagnosisReference'; const FIELD_PACKAGE_CODE = 'packageCode'; @@ -151,6 +147,9 @@ class FHIRClaimDiagnosis extends FHIRBackboneElement */ protected $type = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRClaimDiagnosis Constructor * @param null|array $data @@ -194,8 +193,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SEQUENCE] instanceof FHIRPositiveInt) { $this->setSequence($data[self::FIELD_SEQUENCE]); - } elseif ($ext && is_scalar($data[self::FIELD_SEQUENCE])) { - $this->setSequence(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_SEQUENCE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SEQUENCE])) { + $this->setSequence(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_SEQUENCE]] + $ext)); + } else if (is_array($data[self::FIELD_SEQUENCE])) { + $this->setSequence(new FHIRPositiveInt(array_merge($ext, $data[self::FIELD_SEQUENCE]))); + } } else { $this->setSequence(new FHIRPositiveInt($data[self::FIELD_SEQUENCE])); } @@ -203,6 +206,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_TYPE])) { if (is_array($data[self::FIELD_TYPE])) { foreach($data[self::FIELD_TYPE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addType($v); } else { @@ -536,18 +542,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDiagnosisCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DIAGNOSIS_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDiagnosisReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DIAGNOSIS_REFERENCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPackageCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PACKAGE_CODE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getSequence())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SEQUENCE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getType())) { foreach($vs as $v) { if (null === $v) { @@ -575,8 +578,15 @@ public function jsonSerialize() $a[self::FIELD_PACKAGE_CODE] = $v; } if (null !== ($v = $this->getSequence())) { - $a[self::FIELD_SEQUENCE] = $v->getValue(); - $a[self::FIELD_SEQUENCE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SEQUENCE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SEQUENCE_EXT] = $enc; + } + } else { + $a[self::FIELD_SEQUENCE] = $v; + } } if ([] !== ($vs = $this->getType())) { $a[self::FIELD_TYPE] = $vs; diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimInformation.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimInformation.php index 1b19f97ac2..f382bf92c2 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimInformation.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimInformation.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -85,10 +85,6 @@ class FHIRClaimInformation extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CLAIM_DOT_INFORMATION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CATEGORY = 'category'; const FIELD_CODE = 'code'; const FIELD_REASON = 'reason'; @@ -228,6 +224,9 @@ class FHIRClaimInformation extends FHIRBackboneElement */ protected $valueString = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRClaimInformation Constructor * @param null|array $data @@ -271,8 +270,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SEQUENCE] instanceof FHIRPositiveInt) { $this->setSequence($data[self::FIELD_SEQUENCE]); - } elseif ($ext && is_scalar($data[self::FIELD_SEQUENCE])) { - $this->setSequence(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_SEQUENCE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SEQUENCE])) { + $this->setSequence(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_SEQUENCE]] + $ext)); + } else if (is_array($data[self::FIELD_SEQUENCE])) { + $this->setSequence(new FHIRPositiveInt(array_merge($ext, $data[self::FIELD_SEQUENCE]))); + } } else { $this->setSequence(new FHIRPositiveInt($data[self::FIELD_SEQUENCE])); } @@ -283,8 +286,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TIMING_DATE] instanceof FHIRDate) { $this->setTimingDate($data[self::FIELD_TIMING_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_TIMING_DATE])) { - $this->setTimingDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_TIMING_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TIMING_DATE])) { + $this->setTimingDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_TIMING_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_TIMING_DATE])) { + $this->setTimingDate(new FHIRDate(array_merge($ext, $data[self::FIELD_TIMING_DATE]))); + } } else { $this->setTimingDate(new FHIRDate($data[self::FIELD_TIMING_DATE])); } @@ -309,8 +316,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_QUANTITY] instanceof FHIRQuantity) { $this->setValueQuantity($data[self::FIELD_VALUE_QUANTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_QUANTITY])) { - $this->setValueQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_VALUE_QUANTITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_QUANTITY])) { + $this->setValueQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_VALUE_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_QUANTITY])) { + $this->setValueQuantity(new FHIRQuantity(array_merge($ext, $data[self::FIELD_VALUE_QUANTITY]))); + } } else { $this->setValueQuantity(new FHIRQuantity($data[self::FIELD_VALUE_QUANTITY])); } @@ -328,8 +339,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_STRING] instanceof FHIRString) { $this->setValueString($data[self::FIELD_VALUE_STRING]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_STRING])) { - $this->setValueString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VALUE_STRING]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_STRING])) { + $this->setValueString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VALUE_STRING]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_STRING])) { + $this->setValueString(new FHIRString(array_merge($ext, $data[self::FIELD_VALUE_STRING]))); + } } else { $this->setValueString(new FHIRString($data[self::FIELD_VALUE_STRING])); } @@ -830,11 +845,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getCategory())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CATEGORY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getReason())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REASON, null, $v->_getFHIRXMLNamespace())); } @@ -844,19 +857,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getTimingDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TIMING_DATE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getTimingPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TIMING_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueAttachment())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_ATTACHMENT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_QUANTITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_REFERENCE, null, $v->_getFHIRXMLNamespace())); } @@ -882,12 +891,26 @@ public function jsonSerialize() $a[self::FIELD_REASON] = $v; } if (null !== ($v = $this->getSequence())) { - $a[self::FIELD_SEQUENCE] = $v->getValue(); - $a[self::FIELD_SEQUENCE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SEQUENCE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SEQUENCE_EXT] = $enc; + } + } else { + $a[self::FIELD_SEQUENCE] = $v; + } } if (null !== ($v = $this->getTimingDate())) { - $a[self::FIELD_TIMING_DATE] = $v->getValue(); - $a[self::FIELD_TIMING_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TIMING_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TIMING_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_TIMING_DATE] = $v; + } } if (null !== ($v = $this->getTimingPeriod())) { $a[self::FIELD_TIMING_PERIOD] = $v; @@ -896,14 +919,29 @@ public function jsonSerialize() $a[self::FIELD_VALUE_ATTACHMENT] = $v; } if (null !== ($v = $this->getValueQuantity())) { - $a[self::FIELD_VALUE_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_QUANTITY] = $v; + } } if (null !== ($v = $this->getValueReference())) { $a[self::FIELD_VALUE_REFERENCE] = $v; } if (null !== ($v = $this->getValueString())) { - $a[self::FIELD_VALUE_STRING] = $v->getValue(); - $a[self::FIELD_VALUE_STRING_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_STRING] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_STRING_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_STRING] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimInsurance.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimInsurance.php index 9ae9186aa8..f5264ad1b6 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimInsurance.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimInsurance.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -81,10 +81,6 @@ class FHIRClaimInsurance extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CLAIM_DOT_INSURANCE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_BUSINESS_ARRANGEMENT = 'businessArrangement'; const FIELD_BUSINESS_ARRANGEMENT_EXT = '_businessArrangement'; const FIELD_CLAIM_RESPONSE = 'claimResponse'; @@ -164,6 +160,9 @@ class FHIRClaimInsurance extends FHIRBackboneElement */ protected $sequence = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRClaimInsurance Constructor * @param null|array $data @@ -186,8 +185,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_BUSINESS_ARRANGEMENT] instanceof FHIRString) { $this->setBusinessArrangement($data[self::FIELD_BUSINESS_ARRANGEMENT]); - } elseif ($ext && is_scalar($data[self::FIELD_BUSINESS_ARRANGEMENT])) { - $this->setBusinessArrangement(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_BUSINESS_ARRANGEMENT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_BUSINESS_ARRANGEMENT])) { + $this->setBusinessArrangement(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_BUSINESS_ARRANGEMENT]] + $ext)); + } else if (is_array($data[self::FIELD_BUSINESS_ARRANGEMENT])) { + $this->setBusinessArrangement(new FHIRString(array_merge($ext, $data[self::FIELD_BUSINESS_ARRANGEMENT]))); + } } else { $this->setBusinessArrangement(new FHIRString($data[self::FIELD_BUSINESS_ARRANGEMENT])); } @@ -212,8 +215,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_FOCAL] instanceof FHIRBoolean) { $this->setFocal($data[self::FIELD_FOCAL]); - } elseif ($ext && is_scalar($data[self::FIELD_FOCAL])) { - $this->setFocal(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_FOCAL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_FOCAL])) { + $this->setFocal(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_FOCAL]] + $ext)); + } else if (is_array($data[self::FIELD_FOCAL])) { + $this->setFocal(new FHIRBoolean(array_merge($ext, $data[self::FIELD_FOCAL]))); + } } else { $this->setFocal(new FHIRBoolean($data[self::FIELD_FOCAL])); } @@ -224,17 +231,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_PRE_AUTH_REF])) { foreach($data[self::FIELD_PRE_AUTH_REF] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRString) { $this->addPreAuthRef($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addPreAuthRef(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addPreAuthRef(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addPreAuthRef(new FHIRString(array_merge($v, $ext[$i]))); + } } else { $this->addPreAuthRef(new FHIRString($v)); } } } elseif ($data[self::FIELD_PRE_AUTH_REF] instanceof FHIRString) { $this->addPreAuthRef($data[self::FIELD_PRE_AUTH_REF]); - } elseif ($ext && is_scalar($data[self::FIELD_PRE_AUTH_REF])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_PRE_AUTH_REF])) { $this->addPreAuthRef(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PRE_AUTH_REF]] + $ext)); } else { $this->addPreAuthRef(new FHIRString($data[self::FIELD_PRE_AUTH_REF])); @@ -246,8 +260,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SEQUENCE] instanceof FHIRPositiveInt) { $this->setSequence($data[self::FIELD_SEQUENCE]); - } elseif ($ext && is_scalar($data[self::FIELD_SEQUENCE])) { - $this->setSequence(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_SEQUENCE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SEQUENCE])) { + $this->setSequence(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_SEQUENCE]] + $ext)); + } else if (is_array($data[self::FIELD_SEQUENCE])) { + $this->setSequence(new FHIRPositiveInt(array_merge($ext, $data[self::FIELD_SEQUENCE]))); + } } else { $this->setSequence(new FHIRPositiveInt($data[self::FIELD_SEQUENCE])); } @@ -627,14 +645,13 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getBusinessArrangement())) { $v->xmlSerialize($sxe->addChild(self::FIELD_BUSINESS_ARRANGEMENT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getClaimResponse())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CLAIM_RESPONSE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getCoverage())) { $v->xmlSerialize($sxe->addChild(self::FIELD_COVERAGE, null, $v->_getFHIRXMLNamespace())); } @@ -662,8 +679,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getBusinessArrangement())) { - $a[self::FIELD_BUSINESS_ARRANGEMENT] = $v->getValue(); - $a[self::FIELD_BUSINESS_ARRANGEMENT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_BUSINESS_ARRANGEMENT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_BUSINESS_ARRANGEMENT_EXT] = $enc; + } + } else { + $a[self::FIELD_BUSINESS_ARRANGEMENT] = $v; + } } if (null !== ($v = $this->getClaimResponse())) { $a[self::FIELD_CLAIM_RESPONSE] = $v; @@ -672,8 +696,15 @@ public function jsonSerialize() $a[self::FIELD_COVERAGE] = $v; } if (null !== ($v = $this->getFocal())) { - $a[self::FIELD_FOCAL] = $v->getValue(); - $a[self::FIELD_FOCAL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FOCAL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FOCAL_EXT] = $enc; + } + } else { + $a[self::FIELD_FOCAL] = $v; + } } if ([] !== ($vs = $this->getPreAuthRef())) { $a[self::FIELD_PRE_AUTH_REF] = []; @@ -681,13 +712,29 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_PRE_AUTH_REF][] = $v->getValue(); - $a[self::FIELD_PRE_AUTH_REF_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PRE_AUTH_REF][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PRE_AUTH_REF_EXT][] = $enc; + } else { + $a[self::FIELD_PRE_AUTH_REF_EXT][] = null; + } + } else { + $a[self::FIELD_PRE_AUTH_REF][] = $v; + } } } if (null !== ($v = $this->getSequence())) { - $a[self::FIELD_SEQUENCE] = $v->getValue(); - $a[self::FIELD_SEQUENCE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SEQUENCE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SEQUENCE_EXT] = $enc; + } + } else { + $a[self::FIELD_SEQUENCE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimItem.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimItem.php index 5e171c1684..a318b2ef8b 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimItem.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimItem.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -86,10 +86,6 @@ class FHIRClaimItem extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CLAIM_DOT_ITEM; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_BODY_SITE = 'bodySite'; const FIELD_CARE_TEAM_LINK_ID = 'careTeamLinkId'; const FIELD_CARE_TEAM_LINK_ID_EXT = '_careTeamLinkId'; @@ -107,6 +103,7 @@ class FHIRClaimItem extends FHIRBackboneElement const FIELD_LOCATION_REFERENCE = 'locationReference'; const FIELD_MODIFIER = 'modifier'; const FIELD_NET = 'net'; + const FIELD_NET_EXT = '_net'; const FIELD_PROCEDURE_LINK_ID = 'procedureLinkId'; const FIELD_PROCEDURE_LINK_ID_EXT = '_procedureLinkId'; const FIELD_PROGRAM_CODE = 'programCode'; @@ -122,6 +119,7 @@ class FHIRClaimItem extends FHIRBackboneElement const FIELD_SUB_SITE = 'subSite'; const FIELD_UDI = 'udi'; const FIELD_UNIT_PRICE = 'unitPrice'; + const FIELD_UNIT_PRICE_EXT = '_unitPrice'; /** * A concept that may be defined by a formal reference to a terminology or ontology @@ -419,6 +417,9 @@ class FHIRClaimItem extends FHIRBackboneElement */ protected $unitPrice = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRClaimItem Constructor * @param null|array $data @@ -448,17 +449,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_CARE_TEAM_LINK_ID])) { foreach($data[self::FIELD_CARE_TEAM_LINK_ID] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRPositiveInt) { $this->addCareTeamLinkId($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addCareTeamLinkId(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addCareTeamLinkId(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addCareTeamLinkId(new FHIRPositiveInt(array_merge($v, $ext[$i]))); + } } else { $this->addCareTeamLinkId(new FHIRPositiveInt($v)); } } } elseif ($data[self::FIELD_CARE_TEAM_LINK_ID] instanceof FHIRPositiveInt) { $this->addCareTeamLinkId($data[self::FIELD_CARE_TEAM_LINK_ID]); - } elseif ($ext && is_scalar($data[self::FIELD_CARE_TEAM_LINK_ID])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_CARE_TEAM_LINK_ID])) { $this->addCareTeamLinkId(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_CARE_TEAM_LINK_ID]] + $ext)); } else { $this->addCareTeamLinkId(new FHIRPositiveInt($data[self::FIELD_CARE_TEAM_LINK_ID])); @@ -474,6 +482,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_DETAIL])) { if (is_array($data[self::FIELD_DETAIL])) { foreach($data[self::FIELD_DETAIL] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRClaimDetail) { $this->addDetail($v); } else { @@ -492,17 +503,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_DIAGNOSIS_LINK_ID])) { foreach($data[self::FIELD_DIAGNOSIS_LINK_ID] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRPositiveInt) { $this->addDiagnosisLinkId($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addDiagnosisLinkId(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addDiagnosisLinkId(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addDiagnosisLinkId(new FHIRPositiveInt(array_merge($v, $ext[$i]))); + } } else { $this->addDiagnosisLinkId(new FHIRPositiveInt($v)); } } } elseif ($data[self::FIELD_DIAGNOSIS_LINK_ID] instanceof FHIRPositiveInt) { $this->addDiagnosisLinkId($data[self::FIELD_DIAGNOSIS_LINK_ID]); - } elseif ($ext && is_scalar($data[self::FIELD_DIAGNOSIS_LINK_ID])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_DIAGNOSIS_LINK_ID])) { $this->addDiagnosisLinkId(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_DIAGNOSIS_LINK_ID]] + $ext)); } else { $this->addDiagnosisLinkId(new FHIRPositiveInt($data[self::FIELD_DIAGNOSIS_LINK_ID])); @@ -511,6 +529,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ENCOUNTER])) { if (is_array($data[self::FIELD_ENCOUNTER])) { foreach($data[self::FIELD_ENCOUNTER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addEncounter($v); } else { @@ -529,8 +550,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_FACTOR] instanceof FHIRDecimal) { $this->setFactor($data[self::FIELD_FACTOR]); - } elseif ($ext && is_scalar($data[self::FIELD_FACTOR])) { - $this->setFactor(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_FACTOR]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_FACTOR])) { + $this->setFactor(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_FACTOR]] + $ext)); + } else if (is_array($data[self::FIELD_FACTOR])) { + $this->setFactor(new FHIRDecimal(array_merge($ext, $data[self::FIELD_FACTOR]))); + } } else { $this->setFactor(new FHIRDecimal($data[self::FIELD_FACTOR])); } @@ -541,17 +566,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_INFORMATION_LINK_ID])) { foreach($data[self::FIELD_INFORMATION_LINK_ID] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRPositiveInt) { $this->addInformationLinkId($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addInformationLinkId(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addInformationLinkId(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addInformationLinkId(new FHIRPositiveInt(array_merge($v, $ext[$i]))); + } } else { $this->addInformationLinkId(new FHIRPositiveInt($v)); } } } elseif ($data[self::FIELD_INFORMATION_LINK_ID] instanceof FHIRPositiveInt) { $this->addInformationLinkId($data[self::FIELD_INFORMATION_LINK_ID]); - } elseif ($ext && is_scalar($data[self::FIELD_INFORMATION_LINK_ID])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_INFORMATION_LINK_ID])) { $this->addInformationLinkId(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_INFORMATION_LINK_ID]] + $ext)); } else { $this->addInformationLinkId(new FHIRPositiveInt($data[self::FIELD_INFORMATION_LINK_ID])); @@ -581,6 +613,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_MODIFIER])) { if (is_array($data[self::FIELD_MODIFIER])) { foreach($data[self::FIELD_MODIFIER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addModifier($v); } else { @@ -594,8 +629,17 @@ public function __construct($data = null) } } if (isset($data[self::FIELD_NET])) { + $ext = (isset($data[self::FIELD_NET_EXT]) && is_array($data[self::FIELD_NET_EXT])) + ? $data[self::FIELD_NET_EXT] + : null; if ($data[self::FIELD_NET] instanceof FHIRMoney) { $this->setNet($data[self::FIELD_NET]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NET])) { + $this->setNet(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_NET]] + $ext)); + } else if (is_array($data[self::FIELD_NET])) { + $this->setNet(new FHIRMoney(array_merge($ext, $data[self::FIELD_NET]))); + } } else { $this->setNet(new FHIRMoney($data[self::FIELD_NET])); } @@ -606,17 +650,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_PROCEDURE_LINK_ID])) { foreach($data[self::FIELD_PROCEDURE_LINK_ID] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRPositiveInt) { $this->addProcedureLinkId($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addProcedureLinkId(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addProcedureLinkId(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addProcedureLinkId(new FHIRPositiveInt(array_merge($v, $ext[$i]))); + } } else { $this->addProcedureLinkId(new FHIRPositiveInt($v)); } } } elseif ($data[self::FIELD_PROCEDURE_LINK_ID] instanceof FHIRPositiveInt) { $this->addProcedureLinkId($data[self::FIELD_PROCEDURE_LINK_ID]); - } elseif ($ext && is_scalar($data[self::FIELD_PROCEDURE_LINK_ID])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_PROCEDURE_LINK_ID])) { $this->addProcedureLinkId(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_PROCEDURE_LINK_ID]] + $ext)); } else { $this->addProcedureLinkId(new FHIRPositiveInt($data[self::FIELD_PROCEDURE_LINK_ID])); @@ -625,6 +676,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PROGRAM_CODE])) { if (is_array($data[self::FIELD_PROGRAM_CODE])) { foreach($data[self::FIELD_PROGRAM_CODE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addProgramCode($v); } else { @@ -643,8 +697,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_QUANTITY] instanceof FHIRQuantity) { $this->setQuantity($data[self::FIELD_QUANTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_QUANTITY])) { - $this->setQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_QUANTITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_QUANTITY])) { + $this->setQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_QUANTITY])) { + $this->setQuantity(new FHIRQuantity(array_merge($ext, $data[self::FIELD_QUANTITY]))); + } } else { $this->setQuantity(new FHIRQuantity($data[self::FIELD_QUANTITY])); } @@ -662,8 +720,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SEQUENCE] instanceof FHIRPositiveInt) { $this->setSequence($data[self::FIELD_SEQUENCE]); - } elseif ($ext && is_scalar($data[self::FIELD_SEQUENCE])) { - $this->setSequence(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_SEQUENCE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SEQUENCE])) { + $this->setSequence(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_SEQUENCE]] + $ext)); + } else if (is_array($data[self::FIELD_SEQUENCE])) { + $this->setSequence(new FHIRPositiveInt(array_merge($ext, $data[self::FIELD_SEQUENCE]))); + } } else { $this->setSequence(new FHIRPositiveInt($data[self::FIELD_SEQUENCE])); } @@ -681,8 +743,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SERVICED_DATE] instanceof FHIRDate) { $this->setServicedDate($data[self::FIELD_SERVICED_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_SERVICED_DATE])) { - $this->setServicedDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_SERVICED_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SERVICED_DATE])) { + $this->setServicedDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_SERVICED_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_SERVICED_DATE])) { + $this->setServicedDate(new FHIRDate(array_merge($ext, $data[self::FIELD_SERVICED_DATE]))); + } } else { $this->setServicedDate(new FHIRDate($data[self::FIELD_SERVICED_DATE])); } @@ -697,6 +763,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SUB_SITE])) { if (is_array($data[self::FIELD_SUB_SITE])) { foreach($data[self::FIELD_SUB_SITE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addSubSite($v); } else { @@ -712,6 +781,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_UDI])) { if (is_array($data[self::FIELD_UDI])) { foreach($data[self::FIELD_UDI] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addUdi($v); } else { @@ -725,8 +797,17 @@ public function __construct($data = null) } } if (isset($data[self::FIELD_UNIT_PRICE])) { + $ext = (isset($data[self::FIELD_UNIT_PRICE_EXT]) && is_array($data[self::FIELD_UNIT_PRICE_EXT])) + ? $data[self::FIELD_UNIT_PRICE_EXT] + : null; if ($data[self::FIELD_UNIT_PRICE] instanceof FHIRMoney) { $this->setUnitPrice($data[self::FIELD_UNIT_PRICE]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_UNIT_PRICE])) { + $this->setUnitPrice(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_UNIT_PRICE]] + $ext)); + } else if (is_array($data[self::FIELD_UNIT_PRICE])) { + $this->setUnitPrice(new FHIRMoney(array_merge($ext, $data[self::FIELD_UNIT_PRICE]))); + } } else { $this->setUnitPrice(new FHIRMoney($data[self::FIELD_UNIT_PRICE])); } @@ -2063,11 +2144,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_CARE_TEAM_LINK_ID, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getCategory())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CATEGORY, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getDetail())) { foreach($vs as $v) { if (null === $v) { @@ -2084,7 +2163,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_DIAGNOSIS_LINK_ID, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getEncounter())) { foreach($vs as $v) { if (null === $v) { @@ -2104,19 +2182,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_INFORMATION_LINK_ID, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getLocationAddress())) { $v->xmlSerialize($sxe->addChild(self::FIELD_LOCATION_ADDRESS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getLocationCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_LOCATION_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getLocationReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_LOCATION_REFERENCE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getModifier())) { foreach($vs as $v) { if (null === $v) { @@ -2125,7 +2199,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_MODIFIER, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getNet())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NET, null, $v->_getFHIRXMLNamespace())); } @@ -2137,7 +2210,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_PROCEDURE_LINK_ID, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getProgramCode())) { foreach($vs as $v) { if (null === $v) { @@ -2146,29 +2218,24 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_PROGRAM_CODE, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_QUANTITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRevenue())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REVENUE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getSequence())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SEQUENCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getService())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SERVICE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getServicedDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SERVICED_DATE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getServicedPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SERVICED_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getSubSite())) { foreach($vs as $v) { if (null === $v) { @@ -2177,7 +2244,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_SUB_SITE, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getUdi())) { foreach($vs as $v) { if (null === $v) { @@ -2186,7 +2252,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_UDI, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getUnitPrice())) { $v->xmlSerialize($sxe->addChild(self::FIELD_UNIT_PRICE, null, $v->_getFHIRXMLNamespace())); } @@ -2208,8 +2273,17 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_CARE_TEAM_LINK_ID][] = $v->getValue(); - $a[self::FIELD_CARE_TEAM_LINK_ID_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CARE_TEAM_LINK_ID][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CARE_TEAM_LINK_ID_EXT][] = $enc; + } else { + $a[self::FIELD_CARE_TEAM_LINK_ID_EXT][] = null; + } + } else { + $a[self::FIELD_CARE_TEAM_LINK_ID][] = $v; + } } } if (null !== ($v = $this->getCategory())) { @@ -2224,16 +2298,32 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_DIAGNOSIS_LINK_ID][] = $v->getValue(); - $a[self::FIELD_DIAGNOSIS_LINK_ID_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DIAGNOSIS_LINK_ID][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DIAGNOSIS_LINK_ID_EXT][] = $enc; + } else { + $a[self::FIELD_DIAGNOSIS_LINK_ID_EXT][] = null; + } + } else { + $a[self::FIELD_DIAGNOSIS_LINK_ID][] = $v; + } } } if ([] !== ($vs = $this->getEncounter())) { $a[self::FIELD_ENCOUNTER] = $vs; } if (null !== ($v = $this->getFactor())) { - $a[self::FIELD_FACTOR] = $v->getValue(); - $a[self::FIELD_FACTOR_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FACTOR] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FACTOR_EXT] = $enc; + } + } else { + $a[self::FIELD_FACTOR] = $v; + } } if ([] !== ($vs = $this->getInformationLinkId())) { $a[self::FIELD_INFORMATION_LINK_ID] = []; @@ -2241,8 +2331,17 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_INFORMATION_LINK_ID][] = $v->getValue(); - $a[self::FIELD_INFORMATION_LINK_ID_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_INFORMATION_LINK_ID][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_INFORMATION_LINK_ID_EXT][] = $enc; + } else { + $a[self::FIELD_INFORMATION_LINK_ID_EXT][] = null; + } + } else { + $a[self::FIELD_INFORMATION_LINK_ID][] = $v; + } } } if (null !== ($v = $this->getLocationAddress())) { @@ -2258,7 +2357,15 @@ public function jsonSerialize() $a[self::FIELD_MODIFIER] = $vs; } if (null !== ($v = $this->getNet())) { - $a[self::FIELD_NET] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NET] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NET_EXT] = $enc; + } + } else { + $a[self::FIELD_NET] = $v; + } } if ([] !== ($vs = $this->getProcedureLinkId())) { $a[self::FIELD_PROCEDURE_LINK_ID] = []; @@ -2266,29 +2373,60 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_PROCEDURE_LINK_ID][] = $v->getValue(); - $a[self::FIELD_PROCEDURE_LINK_ID_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PROCEDURE_LINK_ID][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PROCEDURE_LINK_ID_EXT][] = $enc; + } else { + $a[self::FIELD_PROCEDURE_LINK_ID_EXT][] = null; + } + } else { + $a[self::FIELD_PROCEDURE_LINK_ID][] = $v; + } } } if ([] !== ($vs = $this->getProgramCode())) { $a[self::FIELD_PROGRAM_CODE] = $vs; } if (null !== ($v = $this->getQuantity())) { - $a[self::FIELD_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_QUANTITY] = $v; + } } if (null !== ($v = $this->getRevenue())) { $a[self::FIELD_REVENUE] = $v; } if (null !== ($v = $this->getSequence())) { - $a[self::FIELD_SEQUENCE] = $v->getValue(); - $a[self::FIELD_SEQUENCE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SEQUENCE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SEQUENCE_EXT] = $enc; + } + } else { + $a[self::FIELD_SEQUENCE] = $v; + } } if (null !== ($v = $this->getService())) { $a[self::FIELD_SERVICE] = $v; } if (null !== ($v = $this->getServicedDate())) { - $a[self::FIELD_SERVICED_DATE] = $v->getValue(); - $a[self::FIELD_SERVICED_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SERVICED_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SERVICED_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_SERVICED_DATE] = $v; + } } if (null !== ($v = $this->getServicedPeriod())) { $a[self::FIELD_SERVICED_PERIOD] = $v; @@ -2300,7 +2438,15 @@ public function jsonSerialize() $a[self::FIELD_UDI] = $vs; } if (null !== ($v = $this->getUnitPrice())) { - $a[self::FIELD_UNIT_PRICE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_UNIT_PRICE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_UNIT_PRICE_EXT] = $enc; + } + } else { + $a[self::FIELD_UNIT_PRICE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimPayee.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimPayee.php index 7a500f5796..0a5b1337b6 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimPayee.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimPayee.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRClaimPayee extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CLAIM_DOT_PAYEE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_PARTY = 'party'; const FIELD_RESOURCE_TYPE = 'resourceType'; const FIELD_TYPE = 'type'; @@ -122,6 +118,9 @@ class FHIRClaimPayee extends FHIRBackboneElement */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRClaimPayee Constructor * @param null|array $data @@ -365,11 +364,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getParty())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PARTY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getResourceType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RESOURCE_TYPE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimProcedure.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimProcedure.php index 2416ce5c9b..97323bcbdb 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimProcedure.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimProcedure.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -81,10 +81,6 @@ class FHIRClaimProcedure extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CLAIM_DOT_PROCEDURE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DATE = 'date'; const FIELD_DATE_EXT = '_date'; const FIELD_PROCEDURE_CODEABLE_CONCEPT = 'procedureCodeableConcept'; @@ -140,6 +136,9 @@ class FHIRClaimProcedure extends FHIRBackboneElement */ protected $sequence = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRClaimProcedure Constructor * @param null|array $data @@ -162,8 +161,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATE] instanceof FHIRDateTime) { $this->setDate($data[self::FIELD_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_DATE])) { - $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime(array_merge($ext, $data[self::FIELD_DATE]))); + } } else { $this->setDate(new FHIRDateTime($data[self::FIELD_DATE])); } @@ -188,8 +191,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SEQUENCE] instanceof FHIRPositiveInt) { $this->setSequence($data[self::FIELD_SEQUENCE]); - } elseif ($ext && is_scalar($data[self::FIELD_SEQUENCE])) { - $this->setSequence(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_SEQUENCE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SEQUENCE])) { + $this->setSequence(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_SEQUENCE]] + $ext)); + } else if (is_array($data[self::FIELD_SEQUENCE])) { + $this->setSequence(new FHIRPositiveInt(array_merge($ext, $data[self::FIELD_SEQUENCE]))); + } } else { $this->setSequence(new FHIRPositiveInt($data[self::FIELD_SEQUENCE])); } @@ -457,14 +464,13 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DATE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getProcedureCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PROCEDURE_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getProcedureReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PROCEDURE_REFERENCE, null, $v->_getFHIRXMLNamespace())); } @@ -481,8 +487,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getDate())) { - $a[self::FIELD_DATE] = $v->getValue(); - $a[self::FIELD_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_DATE] = $v; + } } if (null !== ($v = $this->getProcedureCodeableConcept())) { $a[self::FIELD_PROCEDURE_CODEABLE_CONCEPT] = $v; @@ -491,8 +504,15 @@ public function jsonSerialize() $a[self::FIELD_PROCEDURE_REFERENCE] = $v; } if (null !== ($v = $this->getSequence())) { - $a[self::FIELD_SEQUENCE] = $v->getValue(); - $a[self::FIELD_SEQUENCE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SEQUENCE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SEQUENCE_EXT] = $enc; + } + } else { + $a[self::FIELD_SEQUENCE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimRelated.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimRelated.php index 948972987a..d37a6a0106 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimRelated.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimRelated.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRClaimRelated extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CLAIM_DOT_RELATED; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CLAIM = 'claim'; const FIELD_REFERENCE = 'reference'; const FIELD_REFERENCE_EXT = '_reference'; @@ -126,6 +122,9 @@ class FHIRClaimRelated extends FHIRBackboneElement */ protected $relationship = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRClaimRelated Constructor * @param null|array $data @@ -155,8 +154,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_REFERENCE] instanceof FHIRIdentifier) { $this->setReference($data[self::FIELD_REFERENCE]); - } elseif ($ext && is_scalar($data[self::FIELD_REFERENCE])) { - $this->setReference(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_REFERENCE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_REFERENCE])) { + $this->setReference(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_REFERENCE]] + $ext)); + } else if (is_array($data[self::FIELD_REFERENCE])) { + $this->setReference(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_REFERENCE]))); + } } else { $this->setReference(new FHIRIdentifier($data[self::FIELD_REFERENCE])); } @@ -380,11 +383,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getClaim())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CLAIM, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REFERENCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRelationship())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RELATIONSHIP, null, $v->_getFHIRXMLNamespace())); } @@ -401,7 +402,15 @@ public function jsonSerialize() $a[self::FIELD_CLAIM] = $v; } if (null !== ($v = $this->getReference())) { - $a[self::FIELD_REFERENCE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_REFERENCE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_REFERENCE_EXT] = $enc; + } + } else { + $a[self::FIELD_REFERENCE] = $v; + } } if (null !== ($v = $this->getRelationship())) { $a[self::FIELD_RELATIONSHIP] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimSubDetail.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimSubDetail.php index 13a12a9c8b..028e76f6db 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimSubDetail.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimSubDetail.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -83,15 +83,12 @@ class FHIRClaimSubDetail extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CLAIM_DOT_SUB_DETAIL; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CATEGORY = 'category'; const FIELD_FACTOR = 'factor'; const FIELD_FACTOR_EXT = '_factor'; const FIELD_MODIFIER = 'modifier'; const FIELD_NET = 'net'; + const FIELD_NET_EXT = '_net'; const FIELD_PROGRAM_CODE = 'programCode'; const FIELD_QUANTITY = 'quantity'; const FIELD_QUANTITY_EXT = '_quantity'; @@ -101,6 +98,7 @@ class FHIRClaimSubDetail extends FHIRBackboneElement const FIELD_SERVICE = 'service'; const FIELD_UDI = 'udi'; const FIELD_UNIT_PRICE = 'unitPrice'; + const FIELD_UNIT_PRICE_EXT = '_unitPrice'; /** * A concept that may be defined by a formal reference to a terminology or ontology @@ -241,6 +239,9 @@ class FHIRClaimSubDetail extends FHIRBackboneElement */ protected $unitPrice = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRClaimSubDetail Constructor * @param null|array $data @@ -270,8 +271,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_FACTOR] instanceof FHIRDecimal) { $this->setFactor($data[self::FIELD_FACTOR]); - } elseif ($ext && is_scalar($data[self::FIELD_FACTOR])) { - $this->setFactor(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_FACTOR]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_FACTOR])) { + $this->setFactor(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_FACTOR]] + $ext)); + } else if (is_array($data[self::FIELD_FACTOR])) { + $this->setFactor(new FHIRDecimal(array_merge($ext, $data[self::FIELD_FACTOR]))); + } } else { $this->setFactor(new FHIRDecimal($data[self::FIELD_FACTOR])); } @@ -279,6 +284,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_MODIFIER])) { if (is_array($data[self::FIELD_MODIFIER])) { foreach($data[self::FIELD_MODIFIER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addModifier($v); } else { @@ -292,8 +300,17 @@ public function __construct($data = null) } } if (isset($data[self::FIELD_NET])) { + $ext = (isset($data[self::FIELD_NET_EXT]) && is_array($data[self::FIELD_NET_EXT])) + ? $data[self::FIELD_NET_EXT] + : null; if ($data[self::FIELD_NET] instanceof FHIRMoney) { $this->setNet($data[self::FIELD_NET]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NET])) { + $this->setNet(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_NET]] + $ext)); + } else if (is_array($data[self::FIELD_NET])) { + $this->setNet(new FHIRMoney(array_merge($ext, $data[self::FIELD_NET]))); + } } else { $this->setNet(new FHIRMoney($data[self::FIELD_NET])); } @@ -301,6 +318,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PROGRAM_CODE])) { if (is_array($data[self::FIELD_PROGRAM_CODE])) { foreach($data[self::FIELD_PROGRAM_CODE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addProgramCode($v); } else { @@ -319,8 +339,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_QUANTITY] instanceof FHIRQuantity) { $this->setQuantity($data[self::FIELD_QUANTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_QUANTITY])) { - $this->setQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_QUANTITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_QUANTITY])) { + $this->setQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_QUANTITY])) { + $this->setQuantity(new FHIRQuantity(array_merge($ext, $data[self::FIELD_QUANTITY]))); + } } else { $this->setQuantity(new FHIRQuantity($data[self::FIELD_QUANTITY])); } @@ -338,8 +362,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SEQUENCE] instanceof FHIRPositiveInt) { $this->setSequence($data[self::FIELD_SEQUENCE]); - } elseif ($ext && is_scalar($data[self::FIELD_SEQUENCE])) { - $this->setSequence(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_SEQUENCE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SEQUENCE])) { + $this->setSequence(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_SEQUENCE]] + $ext)); + } else if (is_array($data[self::FIELD_SEQUENCE])) { + $this->setSequence(new FHIRPositiveInt(array_merge($ext, $data[self::FIELD_SEQUENCE]))); + } } else { $this->setSequence(new FHIRPositiveInt($data[self::FIELD_SEQUENCE])); } @@ -354,6 +382,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_UDI])) { if (is_array($data[self::FIELD_UDI])) { foreach($data[self::FIELD_UDI] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addUdi($v); } else { @@ -367,8 +398,17 @@ public function __construct($data = null) } } if (isset($data[self::FIELD_UNIT_PRICE])) { + $ext = (isset($data[self::FIELD_UNIT_PRICE_EXT]) && is_array($data[self::FIELD_UNIT_PRICE_EXT])) + ? $data[self::FIELD_UNIT_PRICE_EXT] + : null; if ($data[self::FIELD_UNIT_PRICE] instanceof FHIRMoney) { $this->setUnitPrice($data[self::FIELD_UNIT_PRICE]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_UNIT_PRICE])) { + $this->setUnitPrice(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_UNIT_PRICE]] + $ext)); + } else if (is_array($data[self::FIELD_UNIT_PRICE])) { + $this->setUnitPrice(new FHIRMoney(array_merge($ext, $data[self::FIELD_UNIT_PRICE]))); + } } else { $this->setUnitPrice(new FHIRMoney($data[self::FIELD_UNIT_PRICE])); } @@ -991,7 +1031,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getFactor())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FACTOR, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getModifier())) { foreach($vs as $v) { if (null === $v) { @@ -1000,11 +1039,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_MODIFIER, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getNet())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NET, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getProgramCode())) { foreach($vs as $v) { if (null === $v) { @@ -1013,22 +1050,18 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_PROGRAM_CODE, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_QUANTITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRevenue())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REVENUE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getSequence())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SEQUENCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getService())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SERVICE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getUdi())) { foreach($vs as $v) { if (null === $v) { @@ -1037,7 +1070,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_UDI, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getUnitPrice())) { $v->xmlSerialize($sxe->addChild(self::FIELD_UNIT_PRICE, null, $v->_getFHIRXMLNamespace())); } @@ -1054,27 +1086,57 @@ public function jsonSerialize() $a[self::FIELD_CATEGORY] = $v; } if (null !== ($v = $this->getFactor())) { - $a[self::FIELD_FACTOR] = $v->getValue(); - $a[self::FIELD_FACTOR_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FACTOR] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FACTOR_EXT] = $enc; + } + } else { + $a[self::FIELD_FACTOR] = $v; + } } if ([] !== ($vs = $this->getModifier())) { $a[self::FIELD_MODIFIER] = $vs; } if (null !== ($v = $this->getNet())) { - $a[self::FIELD_NET] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NET] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NET_EXT] = $enc; + } + } else { + $a[self::FIELD_NET] = $v; + } } if ([] !== ($vs = $this->getProgramCode())) { $a[self::FIELD_PROGRAM_CODE] = $vs; } if (null !== ($v = $this->getQuantity())) { - $a[self::FIELD_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_QUANTITY] = $v; + } } if (null !== ($v = $this->getRevenue())) { $a[self::FIELD_REVENUE] = $v; } if (null !== ($v = $this->getSequence())) { - $a[self::FIELD_SEQUENCE] = $v->getValue(); - $a[self::FIELD_SEQUENCE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SEQUENCE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SEQUENCE_EXT] = $enc; + } + } else { + $a[self::FIELD_SEQUENCE] = $v; + } } if (null !== ($v = $this->getService())) { $a[self::FIELD_SERVICE] = $v; @@ -1083,7 +1145,15 @@ public function jsonSerialize() $a[self::FIELD_UDI] = $vs; } if (null !== ($v = $this->getUnitPrice())) { - $a[self::FIELD_UNIT_PRICE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_UNIT_PRICE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_UNIT_PRICE_EXT] = $enc; + } + } else { + $a[self::FIELD_UNIT_PRICE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseAddItem.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseAddItem.php index 85fd78e81c..35a9266d1a 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseAddItem.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseAddItem.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -80,15 +80,12 @@ class FHIRClaimResponseAddItem extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CLAIM_RESPONSE_DOT_ADD_ITEM; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ADJUDICATION = 'adjudication'; const FIELD_ADJUDICATION_EXT = '_adjudication'; const FIELD_CATEGORY = 'category'; const FIELD_DETAIL = 'detail'; const FIELD_FEE = 'fee'; + const FIELD_FEE_EXT = '_fee'; const FIELD_MODIFIER = 'modifier'; const FIELD_NOTE_NUMBER = 'noteNumber'; const FIELD_NOTE_NUMBER_EXT = '_noteNumber'; @@ -201,6 +198,9 @@ class FHIRClaimResponseAddItem extends FHIRBackboneElement */ protected $service = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRClaimResponseAddItem Constructor * @param null|array $data @@ -223,17 +223,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_ADJUDICATION])) { foreach($data[self::FIELD_ADJUDICATION] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRClaimResponseAdjudication) { $this->addAdjudication($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addAdjudication(new FHIRClaimResponseAdjudication([FHIRClaimResponseAdjudication::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addAdjudication(new FHIRClaimResponseAdjudication([FHIRClaimResponseAdjudication::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addAdjudication(new FHIRClaimResponseAdjudication(array_merge($v, $ext[$i]))); + } } else { $this->addAdjudication(new FHIRClaimResponseAdjudication($v)); } } } elseif ($data[self::FIELD_ADJUDICATION] instanceof FHIRClaimResponseAdjudication) { $this->addAdjudication($data[self::FIELD_ADJUDICATION]); - } elseif ($ext && is_scalar($data[self::FIELD_ADJUDICATION])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_ADJUDICATION])) { $this->addAdjudication(new FHIRClaimResponseAdjudication([FHIRClaimResponseAdjudication::FIELD_VALUE => $data[self::FIELD_ADJUDICATION]] + $ext)); } else { $this->addAdjudication(new FHIRClaimResponseAdjudication($data[self::FIELD_ADJUDICATION])); @@ -249,6 +256,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_DETAIL])) { if (is_array($data[self::FIELD_DETAIL])) { foreach($data[self::FIELD_DETAIL] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRClaimResponseDetail1) { $this->addDetail($v); } else { @@ -262,8 +272,17 @@ public function __construct($data = null) } } if (isset($data[self::FIELD_FEE])) { + $ext = (isset($data[self::FIELD_FEE_EXT]) && is_array($data[self::FIELD_FEE_EXT])) + ? $data[self::FIELD_FEE_EXT] + : null; if ($data[self::FIELD_FEE] instanceof FHIRMoney) { $this->setFee($data[self::FIELD_FEE]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_FEE])) { + $this->setFee(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_FEE]] + $ext)); + } else if (is_array($data[self::FIELD_FEE])) { + $this->setFee(new FHIRMoney(array_merge($ext, $data[self::FIELD_FEE]))); + } } else { $this->setFee(new FHIRMoney($data[self::FIELD_FEE])); } @@ -271,6 +290,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_MODIFIER])) { if (is_array($data[self::FIELD_MODIFIER])) { foreach($data[self::FIELD_MODIFIER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addModifier($v); } else { @@ -289,17 +311,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_NOTE_NUMBER])) { foreach($data[self::FIELD_NOTE_NUMBER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRPositiveInt) { $this->addNoteNumber($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addNoteNumber(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addNoteNumber(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addNoteNumber(new FHIRPositiveInt(array_merge($v, $ext[$i]))); + } } else { $this->addNoteNumber(new FHIRPositiveInt($v)); } } } elseif ($data[self::FIELD_NOTE_NUMBER] instanceof FHIRPositiveInt) { $this->addNoteNumber($data[self::FIELD_NOTE_NUMBER]); - } elseif ($ext && is_scalar($data[self::FIELD_NOTE_NUMBER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_NOTE_NUMBER])) { $this->addNoteNumber(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_NOTE_NUMBER]] + $ext)); } else { $this->addNoteNumber(new FHIRPositiveInt($data[self::FIELD_NOTE_NUMBER])); @@ -318,17 +347,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_SEQUENCE_LINK_ID])) { foreach($data[self::FIELD_SEQUENCE_LINK_ID] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRPositiveInt) { $this->addSequenceLinkId($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addSequenceLinkId(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addSequenceLinkId(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addSequenceLinkId(new FHIRPositiveInt(array_merge($v, $ext[$i]))); + } } else { $this->addSequenceLinkId(new FHIRPositiveInt($v)); } } } elseif ($data[self::FIELD_SEQUENCE_LINK_ID] instanceof FHIRPositiveInt) { $this->addSequenceLinkId($data[self::FIELD_SEQUENCE_LINK_ID]); - } elseif ($ext && is_scalar($data[self::FIELD_SEQUENCE_LINK_ID])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_SEQUENCE_LINK_ID])) { $this->addSequenceLinkId(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_SEQUENCE_LINK_ID]] + $ext)); } else { $this->addSequenceLinkId(new FHIRPositiveInt($data[self::FIELD_SEQUENCE_LINK_ID])); @@ -921,11 +957,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_ADJUDICATION, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getCategory())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CATEGORY, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getDetail())) { foreach($vs as $v) { if (null === $v) { @@ -934,11 +968,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_DETAIL, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getFee())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FEE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getModifier())) { foreach($vs as $v) { if (null === $v) { @@ -955,7 +987,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_NOTE_NUMBER, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getRevenue())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REVENUE, null, $v->_getFHIRXMLNamespace())); } @@ -967,7 +998,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_SEQUENCE_LINK_ID, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getService())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SERVICE, null, $v->_getFHIRXMLNamespace())); } @@ -981,7 +1011,23 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if ([] !== ($vs = $this->getAdjudication())) { - $a[self::FIELD_ADJUDICATION] = $vs; + $a[self::FIELD_ADJUDICATION] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ADJUDICATION][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ADJUDICATION_EXT][] = $enc; + } else { + $a[self::FIELD_ADJUDICATION_EXT][] = null; + } + } else { + $a[self::FIELD_ADJUDICATION][] = $v; + } + } } if (null !== ($v = $this->getCategory())) { $a[self::FIELD_CATEGORY] = $v; @@ -990,7 +1036,15 @@ public function jsonSerialize() $a[self::FIELD_DETAIL] = $vs; } if (null !== ($v = $this->getFee())) { - $a[self::FIELD_FEE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FEE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FEE_EXT] = $enc; + } + } else { + $a[self::FIELD_FEE] = $v; + } } if ([] !== ($vs = $this->getModifier())) { $a[self::FIELD_MODIFIER] = $vs; @@ -1001,8 +1055,17 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_NOTE_NUMBER][] = $v->getValue(); - $a[self::FIELD_NOTE_NUMBER_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NOTE_NUMBER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NOTE_NUMBER_EXT][] = $enc; + } else { + $a[self::FIELD_NOTE_NUMBER_EXT][] = null; + } + } else { + $a[self::FIELD_NOTE_NUMBER][] = $v; + } } } if (null !== ($v = $this->getRevenue())) { @@ -1014,8 +1077,17 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_SEQUENCE_LINK_ID][] = $v->getValue(); - $a[self::FIELD_SEQUENCE_LINK_ID_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SEQUENCE_LINK_ID][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SEQUENCE_LINK_ID_EXT][] = $enc; + } else { + $a[self::FIELD_SEQUENCE_LINK_ID_EXT][] = null; + } + } else { + $a[self::FIELD_SEQUENCE_LINK_ID][] = $v; + } } } if (null !== ($v = $this->getService())) { diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseAdjudication.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseAdjudication.php index 9240a91f91..23b1de7ab3 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseAdjudication.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseAdjudication.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -80,11 +80,8 @@ class FHIRClaimResponseAdjudication extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CLAIM_RESPONSE_DOT_ADJUDICATION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_AMOUNT = 'amount'; + const FIELD_AMOUNT_EXT = '_amount'; const FIELD_CATEGORY = 'category'; const FIELD_REASON = 'reason'; const FIELD_VALUE = 'value'; @@ -138,6 +135,9 @@ class FHIRClaimResponseAdjudication extends FHIRBackboneElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRClaimResponseAdjudication Constructor * @param null|array $data @@ -159,8 +159,17 @@ public function __construct($data = null) } parent::__construct($data); if (isset($data[self::FIELD_AMOUNT])) { + $ext = (isset($data[self::FIELD_AMOUNT_EXT]) && is_array($data[self::FIELD_AMOUNT_EXT])) + ? $data[self::FIELD_AMOUNT_EXT] + : null; if ($data[self::FIELD_AMOUNT] instanceof FHIRMoney) { $this->setAmount($data[self::FIELD_AMOUNT]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_AMOUNT])) { + $this->setAmount(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_AMOUNT]] + $ext)); + } else if (is_array($data[self::FIELD_AMOUNT])) { + $this->setAmount(new FHIRMoney(array_merge($ext, $data[self::FIELD_AMOUNT]))); + } } else { $this->setAmount(new FHIRMoney($data[self::FIELD_AMOUNT])); } @@ -185,8 +194,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE] instanceof FHIRDecimal) { $this->setValue($data[self::FIELD_VALUE]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE])) { - $this->setValue(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_VALUE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE])) { + $this->setValue(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_VALUE]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE])) { + $this->setValue(new FHIRDecimal(array_merge($ext, $data[self::FIELD_VALUE]))); + } } else { $this->setValue(new FHIRDecimal($data[self::FIELD_VALUE])); } @@ -447,15 +460,14 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getAmount())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AMOUNT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getCategory())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CATEGORY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getReason())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REASON, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getValue())) { + $sxe->addAttribute(self::FIELD_VALUE, (string)$v); $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE, null, $v->_getFHIRXMLNamespace())); } return $sxe; @@ -468,7 +480,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getAmount())) { - $a[self::FIELD_AMOUNT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_AMOUNT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_AMOUNT_EXT] = $enc; + } + } else { + $a[self::FIELD_AMOUNT] = $v; + } } if (null !== ($v = $this->getCategory())) { $a[self::FIELD_CATEGORY] = $v; @@ -477,8 +497,15 @@ public function jsonSerialize() $a[self::FIELD_REASON] = $v; } if (null !== ($v = $this->getValue())) { - $a[self::FIELD_VALUE] = $v->getValue(); - $a[self::FIELD_VALUE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseDetail.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseDetail.php index 92544d2238..3120cc1311 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseDetail.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseDetail.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRClaimResponseDetail extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CLAIM_RESPONSE_DOT_DETAIL; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ADJUDICATION = 'adjudication'; const FIELD_ADJUDICATION_EXT = '_adjudication'; const FIELD_NOTE_NUMBER = 'noteNumber'; @@ -132,6 +128,9 @@ class FHIRClaimResponseDetail extends FHIRBackboneElement */ protected $subDetail = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRClaimResponseDetail Constructor * @param null|array $data @@ -154,17 +153,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_ADJUDICATION])) { foreach($data[self::FIELD_ADJUDICATION] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRClaimResponseAdjudication) { $this->addAdjudication($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addAdjudication(new FHIRClaimResponseAdjudication([FHIRClaimResponseAdjudication::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addAdjudication(new FHIRClaimResponseAdjudication([FHIRClaimResponseAdjudication::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addAdjudication(new FHIRClaimResponseAdjudication(array_merge($v, $ext[$i]))); + } } else { $this->addAdjudication(new FHIRClaimResponseAdjudication($v)); } } } elseif ($data[self::FIELD_ADJUDICATION] instanceof FHIRClaimResponseAdjudication) { $this->addAdjudication($data[self::FIELD_ADJUDICATION]); - } elseif ($ext && is_scalar($data[self::FIELD_ADJUDICATION])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_ADJUDICATION])) { $this->addAdjudication(new FHIRClaimResponseAdjudication([FHIRClaimResponseAdjudication::FIELD_VALUE => $data[self::FIELD_ADJUDICATION]] + $ext)); } else { $this->addAdjudication(new FHIRClaimResponseAdjudication($data[self::FIELD_ADJUDICATION])); @@ -176,17 +182,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_NOTE_NUMBER])) { foreach($data[self::FIELD_NOTE_NUMBER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRPositiveInt) { $this->addNoteNumber($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addNoteNumber(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addNoteNumber(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addNoteNumber(new FHIRPositiveInt(array_merge($v, $ext[$i]))); + } } else { $this->addNoteNumber(new FHIRPositiveInt($v)); } } } elseif ($data[self::FIELD_NOTE_NUMBER] instanceof FHIRPositiveInt) { $this->addNoteNumber($data[self::FIELD_NOTE_NUMBER]); - } elseif ($ext && is_scalar($data[self::FIELD_NOTE_NUMBER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_NOTE_NUMBER])) { $this->addNoteNumber(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_NOTE_NUMBER]] + $ext)); } else { $this->addNoteNumber(new FHIRPositiveInt($data[self::FIELD_NOTE_NUMBER])); @@ -198,8 +211,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SEQUENCE_LINK_ID] instanceof FHIRPositiveInt) { $this->setSequenceLinkId($data[self::FIELD_SEQUENCE_LINK_ID]); - } elseif ($ext && is_scalar($data[self::FIELD_SEQUENCE_LINK_ID])) { - $this->setSequenceLinkId(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_SEQUENCE_LINK_ID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SEQUENCE_LINK_ID])) { + $this->setSequenceLinkId(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_SEQUENCE_LINK_ID]] + $ext)); + } else if (is_array($data[self::FIELD_SEQUENCE_LINK_ID])) { + $this->setSequenceLinkId(new FHIRPositiveInt(array_merge($ext, $data[self::FIELD_SEQUENCE_LINK_ID]))); + } } else { $this->setSequenceLinkId(new FHIRPositiveInt($data[self::FIELD_SEQUENCE_LINK_ID])); } @@ -207,6 +224,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SUB_DETAIL])) { if (is_array($data[self::FIELD_SUB_DETAIL])) { foreach($data[self::FIELD_SUB_DETAIL] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRClaimResponseSubDetail) { $this->addSubDetail($v); } else { @@ -572,7 +592,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getSequenceLinkId())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SEQUENCE_LINK_ID, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getSubDetail())) { foreach($vs as $v) { if (null === $v) { @@ -591,7 +610,23 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if ([] !== ($vs = $this->getAdjudication())) { - $a[self::FIELD_ADJUDICATION] = $vs; + $a[self::FIELD_ADJUDICATION] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ADJUDICATION][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ADJUDICATION_EXT][] = $enc; + } else { + $a[self::FIELD_ADJUDICATION_EXT][] = null; + } + } else { + $a[self::FIELD_ADJUDICATION][] = $v; + } + } } if ([] !== ($vs = $this->getNoteNumber())) { $a[self::FIELD_NOTE_NUMBER] = []; @@ -599,13 +634,29 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_NOTE_NUMBER][] = $v->getValue(); - $a[self::FIELD_NOTE_NUMBER_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NOTE_NUMBER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NOTE_NUMBER_EXT][] = $enc; + } else { + $a[self::FIELD_NOTE_NUMBER_EXT][] = null; + } + } else { + $a[self::FIELD_NOTE_NUMBER][] = $v; + } } } if (null !== ($v = $this->getSequenceLinkId())) { - $a[self::FIELD_SEQUENCE_LINK_ID] = $v->getValue(); - $a[self::FIELD_SEQUENCE_LINK_ID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SEQUENCE_LINK_ID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SEQUENCE_LINK_ID_EXT] = $enc; + } + } else { + $a[self::FIELD_SEQUENCE_LINK_ID] = $v; + } } if ([] !== ($vs = $this->getSubDetail())) { $a[self::FIELD_SUB_DETAIL] = $vs; diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseDetail1.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseDetail1.php index 996bfb8478..50abf63cae 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseDetail1.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseDetail1.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -80,14 +80,11 @@ class FHIRClaimResponseDetail1 extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CLAIM_RESPONSE_DOT_DETAIL_1; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ADJUDICATION = 'adjudication'; const FIELD_ADJUDICATION_EXT = '_adjudication'; const FIELD_CATEGORY = 'category'; const FIELD_FEE = 'fee'; + const FIELD_FEE_EXT = '_fee'; const FIELD_MODIFIER = 'modifier'; const FIELD_NOTE_NUMBER = 'noteNumber'; const FIELD_NOTE_NUMBER_EXT = '_noteNumber'; @@ -177,6 +174,9 @@ class FHIRClaimResponseDetail1 extends FHIRBackboneElement */ protected $service = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRClaimResponseDetail1 Constructor * @param null|array $data @@ -199,17 +199,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_ADJUDICATION])) { foreach($data[self::FIELD_ADJUDICATION] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRClaimResponseAdjudication) { $this->addAdjudication($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addAdjudication(new FHIRClaimResponseAdjudication([FHIRClaimResponseAdjudication::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addAdjudication(new FHIRClaimResponseAdjudication([FHIRClaimResponseAdjudication::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addAdjudication(new FHIRClaimResponseAdjudication(array_merge($v, $ext[$i]))); + } } else { $this->addAdjudication(new FHIRClaimResponseAdjudication($v)); } } } elseif ($data[self::FIELD_ADJUDICATION] instanceof FHIRClaimResponseAdjudication) { $this->addAdjudication($data[self::FIELD_ADJUDICATION]); - } elseif ($ext && is_scalar($data[self::FIELD_ADJUDICATION])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_ADJUDICATION])) { $this->addAdjudication(new FHIRClaimResponseAdjudication([FHIRClaimResponseAdjudication::FIELD_VALUE => $data[self::FIELD_ADJUDICATION]] + $ext)); } else { $this->addAdjudication(new FHIRClaimResponseAdjudication($data[self::FIELD_ADJUDICATION])); @@ -223,8 +230,17 @@ public function __construct($data = null) } } if (isset($data[self::FIELD_FEE])) { + $ext = (isset($data[self::FIELD_FEE_EXT]) && is_array($data[self::FIELD_FEE_EXT])) + ? $data[self::FIELD_FEE_EXT] + : null; if ($data[self::FIELD_FEE] instanceof FHIRMoney) { $this->setFee($data[self::FIELD_FEE]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_FEE])) { + $this->setFee(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_FEE]] + $ext)); + } else if (is_array($data[self::FIELD_FEE])) { + $this->setFee(new FHIRMoney(array_merge($ext, $data[self::FIELD_FEE]))); + } } else { $this->setFee(new FHIRMoney($data[self::FIELD_FEE])); } @@ -232,6 +248,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_MODIFIER])) { if (is_array($data[self::FIELD_MODIFIER])) { foreach($data[self::FIELD_MODIFIER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addModifier($v); } else { @@ -250,17 +269,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_NOTE_NUMBER])) { foreach($data[self::FIELD_NOTE_NUMBER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRPositiveInt) { $this->addNoteNumber($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addNoteNumber(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addNoteNumber(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addNoteNumber(new FHIRPositiveInt(array_merge($v, $ext[$i]))); + } } else { $this->addNoteNumber(new FHIRPositiveInt($v)); } } } elseif ($data[self::FIELD_NOTE_NUMBER] instanceof FHIRPositiveInt) { $this->addNoteNumber($data[self::FIELD_NOTE_NUMBER]); - } elseif ($ext && is_scalar($data[self::FIELD_NOTE_NUMBER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_NOTE_NUMBER])) { $this->addNoteNumber(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_NOTE_NUMBER]] + $ext)); } else { $this->addNoteNumber(new FHIRPositiveInt($data[self::FIELD_NOTE_NUMBER])); @@ -730,15 +756,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_ADJUDICATION, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getCategory())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CATEGORY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getFee())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FEE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getModifier())) { foreach($vs as $v) { if (null === $v) { @@ -755,11 +778,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_NOTE_NUMBER, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getRevenue())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REVENUE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getService())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SERVICE, null, $v->_getFHIRXMLNamespace())); } @@ -773,13 +794,37 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if ([] !== ($vs = $this->getAdjudication())) { - $a[self::FIELD_ADJUDICATION] = $vs; + $a[self::FIELD_ADJUDICATION] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ADJUDICATION][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ADJUDICATION_EXT][] = $enc; + } else { + $a[self::FIELD_ADJUDICATION_EXT][] = null; + } + } else { + $a[self::FIELD_ADJUDICATION][] = $v; + } + } } if (null !== ($v = $this->getCategory())) { $a[self::FIELD_CATEGORY] = $v; } if (null !== ($v = $this->getFee())) { - $a[self::FIELD_FEE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FEE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FEE_EXT] = $enc; + } + } else { + $a[self::FIELD_FEE] = $v; + } } if ([] !== ($vs = $this->getModifier())) { $a[self::FIELD_MODIFIER] = $vs; @@ -790,8 +835,17 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_NOTE_NUMBER][] = $v->getValue(); - $a[self::FIELD_NOTE_NUMBER_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NOTE_NUMBER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NOTE_NUMBER_EXT][] = $enc; + } else { + $a[self::FIELD_NOTE_NUMBER_EXT][] = null; + } + } else { + $a[self::FIELD_NOTE_NUMBER][] = $v; + } } } if (null !== ($v = $this->getRevenue())) { diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseError.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseError.php index d8d451728e..7cc81cea88 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseError.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseError.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRClaimResponseError extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CLAIM_RESPONSE_DOT_ERROR; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CODE = 'code'; const FIELD_DETAIL_SEQUENCE_LINK_ID = 'detailSequenceLinkId'; const FIELD_DETAIL_SEQUENCE_LINK_ID_EXT = '_detailSequenceLinkId'; @@ -142,6 +138,9 @@ class FHIRClaimResponseError extends FHIRBackboneElement */ protected $subdetailSequenceLinkId = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRClaimResponseError Constructor * @param null|array $data @@ -171,8 +170,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DETAIL_SEQUENCE_LINK_ID] instanceof FHIRPositiveInt) { $this->setDetailSequenceLinkId($data[self::FIELD_DETAIL_SEQUENCE_LINK_ID]); - } elseif ($ext && is_scalar($data[self::FIELD_DETAIL_SEQUENCE_LINK_ID])) { - $this->setDetailSequenceLinkId(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_DETAIL_SEQUENCE_LINK_ID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DETAIL_SEQUENCE_LINK_ID])) { + $this->setDetailSequenceLinkId(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_DETAIL_SEQUENCE_LINK_ID]] + $ext)); + } else if (is_array($data[self::FIELD_DETAIL_SEQUENCE_LINK_ID])) { + $this->setDetailSequenceLinkId(new FHIRPositiveInt(array_merge($ext, $data[self::FIELD_DETAIL_SEQUENCE_LINK_ID]))); + } } else { $this->setDetailSequenceLinkId(new FHIRPositiveInt($data[self::FIELD_DETAIL_SEQUENCE_LINK_ID])); } @@ -183,8 +186,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SEQUENCE_LINK_ID] instanceof FHIRPositiveInt) { $this->setSequenceLinkId($data[self::FIELD_SEQUENCE_LINK_ID]); - } elseif ($ext && is_scalar($data[self::FIELD_SEQUENCE_LINK_ID])) { - $this->setSequenceLinkId(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_SEQUENCE_LINK_ID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SEQUENCE_LINK_ID])) { + $this->setSequenceLinkId(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_SEQUENCE_LINK_ID]] + $ext)); + } else if (is_array($data[self::FIELD_SEQUENCE_LINK_ID])) { + $this->setSequenceLinkId(new FHIRPositiveInt(array_merge($ext, $data[self::FIELD_SEQUENCE_LINK_ID]))); + } } else { $this->setSequenceLinkId(new FHIRPositiveInt($data[self::FIELD_SEQUENCE_LINK_ID])); } @@ -195,8 +202,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SUBDETAIL_SEQUENCE_LINK_ID] instanceof FHIRPositiveInt) { $this->setSubdetailSequenceLinkId($data[self::FIELD_SUBDETAIL_SEQUENCE_LINK_ID]); - } elseif ($ext && is_scalar($data[self::FIELD_SUBDETAIL_SEQUENCE_LINK_ID])) { - $this->setSubdetailSequenceLinkId(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_SUBDETAIL_SEQUENCE_LINK_ID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SUBDETAIL_SEQUENCE_LINK_ID])) { + $this->setSubdetailSequenceLinkId(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_SUBDETAIL_SEQUENCE_LINK_ID]] + $ext)); + } else if (is_array($data[self::FIELD_SUBDETAIL_SEQUENCE_LINK_ID])) { + $this->setSubdetailSequenceLinkId(new FHIRPositiveInt(array_merge($ext, $data[self::FIELD_SUBDETAIL_SEQUENCE_LINK_ID]))); + } } else { $this->setSubdetailSequenceLinkId(new FHIRPositiveInt($data[self::FIELD_SUBDETAIL_SEQUENCE_LINK_ID])); } @@ -507,16 +518,37 @@ public function jsonSerialize() $a[self::FIELD_CODE] = $v; } if (null !== ($v = $this->getDetailSequenceLinkId())) { - $a[self::FIELD_DETAIL_SEQUENCE_LINK_ID] = $v->getValue(); - $a[self::FIELD_DETAIL_SEQUENCE_LINK_ID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DETAIL_SEQUENCE_LINK_ID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DETAIL_SEQUENCE_LINK_ID_EXT] = $enc; + } + } else { + $a[self::FIELD_DETAIL_SEQUENCE_LINK_ID] = $v; + } } if (null !== ($v = $this->getSequenceLinkId())) { - $a[self::FIELD_SEQUENCE_LINK_ID] = $v->getValue(); - $a[self::FIELD_SEQUENCE_LINK_ID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SEQUENCE_LINK_ID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SEQUENCE_LINK_ID_EXT] = $enc; + } + } else { + $a[self::FIELD_SEQUENCE_LINK_ID] = $v; + } } if (null !== ($v = $this->getSubdetailSequenceLinkId())) { - $a[self::FIELD_SUBDETAIL_SEQUENCE_LINK_ID] = $v->getValue(); - $a[self::FIELD_SUBDETAIL_SEQUENCE_LINK_ID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SUBDETAIL_SEQUENCE_LINK_ID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SUBDETAIL_SEQUENCE_LINK_ID_EXT] = $enc; + } + } else { + $a[self::FIELD_SUBDETAIL_SEQUENCE_LINK_ID] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseInsurance.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseInsurance.php index aea3fed900..d6d7b7db7c 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseInsurance.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseInsurance.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -81,10 +81,6 @@ class FHIRClaimResponseInsurance extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CLAIM_RESPONSE_DOT_INSURANCE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_BUSINESS_ARRANGEMENT = 'businessArrangement'; const FIELD_BUSINESS_ARRANGEMENT_EXT = '_businessArrangement'; const FIELD_CLAIM_RESPONSE = 'claimResponse'; @@ -163,6 +159,9 @@ class FHIRClaimResponseInsurance extends FHIRBackboneElement */ protected $sequence = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRClaimResponseInsurance Constructor * @param null|array $data @@ -185,8 +184,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_BUSINESS_ARRANGEMENT] instanceof FHIRString) { $this->setBusinessArrangement($data[self::FIELD_BUSINESS_ARRANGEMENT]); - } elseif ($ext && is_scalar($data[self::FIELD_BUSINESS_ARRANGEMENT])) { - $this->setBusinessArrangement(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_BUSINESS_ARRANGEMENT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_BUSINESS_ARRANGEMENT])) { + $this->setBusinessArrangement(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_BUSINESS_ARRANGEMENT]] + $ext)); + } else if (is_array($data[self::FIELD_BUSINESS_ARRANGEMENT])) { + $this->setBusinessArrangement(new FHIRString(array_merge($ext, $data[self::FIELD_BUSINESS_ARRANGEMENT]))); + } } else { $this->setBusinessArrangement(new FHIRString($data[self::FIELD_BUSINESS_ARRANGEMENT])); } @@ -211,8 +214,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_FOCAL] instanceof FHIRBoolean) { $this->setFocal($data[self::FIELD_FOCAL]); - } elseif ($ext && is_scalar($data[self::FIELD_FOCAL])) { - $this->setFocal(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_FOCAL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_FOCAL])) { + $this->setFocal(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_FOCAL]] + $ext)); + } else if (is_array($data[self::FIELD_FOCAL])) { + $this->setFocal(new FHIRBoolean(array_merge($ext, $data[self::FIELD_FOCAL]))); + } } else { $this->setFocal(new FHIRBoolean($data[self::FIELD_FOCAL])); } @@ -223,17 +230,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_PRE_AUTH_REF])) { foreach($data[self::FIELD_PRE_AUTH_REF] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRString) { $this->addPreAuthRef($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addPreAuthRef(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addPreAuthRef(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addPreAuthRef(new FHIRString(array_merge($v, $ext[$i]))); + } } else { $this->addPreAuthRef(new FHIRString($v)); } } } elseif ($data[self::FIELD_PRE_AUTH_REF] instanceof FHIRString) { $this->addPreAuthRef($data[self::FIELD_PRE_AUTH_REF]); - } elseif ($ext && is_scalar($data[self::FIELD_PRE_AUTH_REF])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_PRE_AUTH_REF])) { $this->addPreAuthRef(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PRE_AUTH_REF]] + $ext)); } else { $this->addPreAuthRef(new FHIRString($data[self::FIELD_PRE_AUTH_REF])); @@ -245,8 +259,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SEQUENCE] instanceof FHIRPositiveInt) { $this->setSequence($data[self::FIELD_SEQUENCE]); - } elseif ($ext && is_scalar($data[self::FIELD_SEQUENCE])) { - $this->setSequence(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_SEQUENCE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SEQUENCE])) { + $this->setSequence(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_SEQUENCE]] + $ext)); + } else if (is_array($data[self::FIELD_SEQUENCE])) { + $this->setSequence(new FHIRPositiveInt(array_merge($ext, $data[self::FIELD_SEQUENCE]))); + } } else { $this->setSequence(new FHIRPositiveInt($data[self::FIELD_SEQUENCE])); } @@ -624,14 +642,13 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getBusinessArrangement())) { $v->xmlSerialize($sxe->addChild(self::FIELD_BUSINESS_ARRANGEMENT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getClaimResponse())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CLAIM_RESPONSE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getCoverage())) { $v->xmlSerialize($sxe->addChild(self::FIELD_COVERAGE, null, $v->_getFHIRXMLNamespace())); } @@ -659,8 +676,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getBusinessArrangement())) { - $a[self::FIELD_BUSINESS_ARRANGEMENT] = $v->getValue(); - $a[self::FIELD_BUSINESS_ARRANGEMENT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_BUSINESS_ARRANGEMENT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_BUSINESS_ARRANGEMENT_EXT] = $enc; + } + } else { + $a[self::FIELD_BUSINESS_ARRANGEMENT] = $v; + } } if (null !== ($v = $this->getClaimResponse())) { $a[self::FIELD_CLAIM_RESPONSE] = $v; @@ -669,8 +693,15 @@ public function jsonSerialize() $a[self::FIELD_COVERAGE] = $v; } if (null !== ($v = $this->getFocal())) { - $a[self::FIELD_FOCAL] = $v->getValue(); - $a[self::FIELD_FOCAL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FOCAL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FOCAL_EXT] = $enc; + } + } else { + $a[self::FIELD_FOCAL] = $v; + } } if ([] !== ($vs = $this->getPreAuthRef())) { $a[self::FIELD_PRE_AUTH_REF] = []; @@ -678,13 +709,29 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_PRE_AUTH_REF][] = $v->getValue(); - $a[self::FIELD_PRE_AUTH_REF_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PRE_AUTH_REF][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PRE_AUTH_REF_EXT][] = $enc; + } else { + $a[self::FIELD_PRE_AUTH_REF_EXT][] = null; + } + } else { + $a[self::FIELD_PRE_AUTH_REF][] = $v; + } } } if (null !== ($v = $this->getSequence())) { - $a[self::FIELD_SEQUENCE] = $v->getValue(); - $a[self::FIELD_SEQUENCE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SEQUENCE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SEQUENCE_EXT] = $enc; + } + } else { + $a[self::FIELD_SEQUENCE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseItem.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseItem.php index 0b234b83b5..80476804dc 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseItem.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseItem.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRClaimResponseItem extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CLAIM_RESPONSE_DOT_ITEM; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ADJUDICATION = 'adjudication'; const FIELD_ADJUDICATION_EXT = '_adjudication'; const FIELD_DETAIL = 'detail'; @@ -132,6 +128,9 @@ class FHIRClaimResponseItem extends FHIRBackboneElement */ protected $sequenceLinkId = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRClaimResponseItem Constructor * @param null|array $data @@ -154,17 +153,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_ADJUDICATION])) { foreach($data[self::FIELD_ADJUDICATION] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRClaimResponseAdjudication) { $this->addAdjudication($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addAdjudication(new FHIRClaimResponseAdjudication([FHIRClaimResponseAdjudication::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addAdjudication(new FHIRClaimResponseAdjudication([FHIRClaimResponseAdjudication::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addAdjudication(new FHIRClaimResponseAdjudication(array_merge($v, $ext[$i]))); + } } else { $this->addAdjudication(new FHIRClaimResponseAdjudication($v)); } } } elseif ($data[self::FIELD_ADJUDICATION] instanceof FHIRClaimResponseAdjudication) { $this->addAdjudication($data[self::FIELD_ADJUDICATION]); - } elseif ($ext && is_scalar($data[self::FIELD_ADJUDICATION])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_ADJUDICATION])) { $this->addAdjudication(new FHIRClaimResponseAdjudication([FHIRClaimResponseAdjudication::FIELD_VALUE => $data[self::FIELD_ADJUDICATION]] + $ext)); } else { $this->addAdjudication(new FHIRClaimResponseAdjudication($data[self::FIELD_ADJUDICATION])); @@ -173,6 +179,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_DETAIL])) { if (is_array($data[self::FIELD_DETAIL])) { foreach($data[self::FIELD_DETAIL] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRClaimResponseDetail) { $this->addDetail($v); } else { @@ -191,17 +200,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_NOTE_NUMBER])) { foreach($data[self::FIELD_NOTE_NUMBER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRPositiveInt) { $this->addNoteNumber($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addNoteNumber(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addNoteNumber(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addNoteNumber(new FHIRPositiveInt(array_merge($v, $ext[$i]))); + } } else { $this->addNoteNumber(new FHIRPositiveInt($v)); } } } elseif ($data[self::FIELD_NOTE_NUMBER] instanceof FHIRPositiveInt) { $this->addNoteNumber($data[self::FIELD_NOTE_NUMBER]); - } elseif ($ext && is_scalar($data[self::FIELD_NOTE_NUMBER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_NOTE_NUMBER])) { $this->addNoteNumber(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_NOTE_NUMBER]] + $ext)); } else { $this->addNoteNumber(new FHIRPositiveInt($data[self::FIELD_NOTE_NUMBER])); @@ -213,8 +229,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SEQUENCE_LINK_ID] instanceof FHIRPositiveInt) { $this->setSequenceLinkId($data[self::FIELD_SEQUENCE_LINK_ID]); - } elseif ($ext && is_scalar($data[self::FIELD_SEQUENCE_LINK_ID])) { - $this->setSequenceLinkId(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_SEQUENCE_LINK_ID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SEQUENCE_LINK_ID])) { + $this->setSequenceLinkId(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_SEQUENCE_LINK_ID]] + $ext)); + } else if (is_array($data[self::FIELD_SEQUENCE_LINK_ID])) { + $this->setSequenceLinkId(new FHIRPositiveInt(array_merge($ext, $data[self::FIELD_SEQUENCE_LINK_ID]))); + } } else { $this->setSequenceLinkId(new FHIRPositiveInt($data[self::FIELD_SEQUENCE_LINK_ID])); } @@ -561,7 +581,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_ADJUDICATION, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getDetail())) { foreach($vs as $v) { if (null === $v) { @@ -591,7 +610,23 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if ([] !== ($vs = $this->getAdjudication())) { - $a[self::FIELD_ADJUDICATION] = $vs; + $a[self::FIELD_ADJUDICATION] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ADJUDICATION][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ADJUDICATION_EXT][] = $enc; + } else { + $a[self::FIELD_ADJUDICATION_EXT][] = null; + } + } else { + $a[self::FIELD_ADJUDICATION][] = $v; + } + } } if ([] !== ($vs = $this->getDetail())) { $a[self::FIELD_DETAIL] = $vs; @@ -602,13 +637,29 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_NOTE_NUMBER][] = $v->getValue(); - $a[self::FIELD_NOTE_NUMBER_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NOTE_NUMBER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NOTE_NUMBER_EXT][] = $enc; + } else { + $a[self::FIELD_NOTE_NUMBER_EXT][] = null; + } + } else { + $a[self::FIELD_NOTE_NUMBER][] = $v; + } } } if (null !== ($v = $this->getSequenceLinkId())) { - $a[self::FIELD_SEQUENCE_LINK_ID] = $v->getValue(); - $a[self::FIELD_SEQUENCE_LINK_ID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SEQUENCE_LINK_ID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SEQUENCE_LINK_ID_EXT] = $enc; + } + } else { + $a[self::FIELD_SEQUENCE_LINK_ID] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponsePayment.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponsePayment.php index 9d376589ef..39450913cb 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponsePayment.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponsePayment.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -81,13 +81,11 @@ class FHIRClaimResponsePayment extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CLAIM_RESPONSE_DOT_PAYMENT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ADJUSTMENT = 'adjustment'; + const FIELD_ADJUSTMENT_EXT = '_adjustment'; const FIELD_ADJUSTMENT_REASON = 'adjustmentReason'; const FIELD_AMOUNT = 'amount'; + const FIELD_AMOUNT_EXT = '_amount'; const FIELD_DATE = 'date'; const FIELD_DATE_EXT = '_date'; const FIELD_IDENTIFIER = 'identifier'; @@ -164,6 +162,9 @@ class FHIRClaimResponsePayment extends FHIRBackboneElement */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRClaimResponsePayment Constructor * @param null|array $data @@ -181,8 +182,17 @@ public function __construct($data = null) } parent::__construct($data); if (isset($data[self::FIELD_ADJUSTMENT])) { + $ext = (isset($data[self::FIELD_ADJUSTMENT_EXT]) && is_array($data[self::FIELD_ADJUSTMENT_EXT])) + ? $data[self::FIELD_ADJUSTMENT_EXT] + : null; if ($data[self::FIELD_ADJUSTMENT] instanceof FHIRMoney) { $this->setAdjustment($data[self::FIELD_ADJUSTMENT]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ADJUSTMENT])) { + $this->setAdjustment(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_ADJUSTMENT]] + $ext)); + } else if (is_array($data[self::FIELD_ADJUSTMENT])) { + $this->setAdjustment(new FHIRMoney(array_merge($ext, $data[self::FIELD_ADJUSTMENT]))); + } } else { $this->setAdjustment(new FHIRMoney($data[self::FIELD_ADJUSTMENT])); } @@ -195,8 +205,17 @@ public function __construct($data = null) } } if (isset($data[self::FIELD_AMOUNT])) { + $ext = (isset($data[self::FIELD_AMOUNT_EXT]) && is_array($data[self::FIELD_AMOUNT_EXT])) + ? $data[self::FIELD_AMOUNT_EXT] + : null; if ($data[self::FIELD_AMOUNT] instanceof FHIRMoney) { $this->setAmount($data[self::FIELD_AMOUNT]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_AMOUNT])) { + $this->setAmount(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_AMOUNT]] + $ext)); + } else if (is_array($data[self::FIELD_AMOUNT])) { + $this->setAmount(new FHIRMoney(array_merge($ext, $data[self::FIELD_AMOUNT]))); + } } else { $this->setAmount(new FHIRMoney($data[self::FIELD_AMOUNT])); } @@ -207,8 +226,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATE] instanceof FHIRDate) { $this->setDate($data[self::FIELD_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_DATE])) { - $this->setDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDate(array_merge($ext, $data[self::FIELD_DATE]))); + } } else { $this->setDate(new FHIRDate($data[self::FIELD_DATE])); } @@ -219,8 +242,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->setIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { - $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_IDENTIFIER]))); + } } else { $this->setIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); } @@ -554,22 +581,18 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getAdjustment())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ADJUSTMENT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getAdjustmentReason())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ADJUSTMENT_REASON, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getAmount())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AMOUNT, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DATE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -583,20 +606,51 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getAdjustment())) { - $a[self::FIELD_ADJUSTMENT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ADJUSTMENT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ADJUSTMENT_EXT] = $enc; + } + } else { + $a[self::FIELD_ADJUSTMENT] = $v; + } } if (null !== ($v = $this->getAdjustmentReason())) { $a[self::FIELD_ADJUSTMENT_REASON] = $v; } if (null !== ($v = $this->getAmount())) { - $a[self::FIELD_AMOUNT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_AMOUNT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_AMOUNT_EXT] = $enc; + } + } else { + $a[self::FIELD_AMOUNT] = $v; + } } if (null !== ($v = $this->getDate())) { - $a[self::FIELD_DATE] = $v->getValue(); - $a[self::FIELD_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_DATE] = $v; + } } if (null !== ($v = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_IDENTIFIER] = $v; + } } if (null !== ($v = $this->getType())) { $a[self::FIELD_TYPE] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseProcessNote.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseProcessNote.php index b42b0a5a99..6bfed41a07 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseProcessNote.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseProcessNote.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRClaimResponseProcessNote extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CLAIM_RESPONSE_DOT_PROCESS_NOTE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_LANGUAGE = 'language'; const FIELD_NUMBER = 'number'; const FIELD_NUMBER_EXT = '_number'; @@ -141,6 +137,9 @@ class FHIRClaimResponseProcessNote extends FHIRBackboneElement */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRClaimResponseProcessNote Constructor * @param null|array $data @@ -170,8 +169,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NUMBER] instanceof FHIRPositiveInt) { $this->setNumber($data[self::FIELD_NUMBER]); - } elseif ($ext && is_scalar($data[self::FIELD_NUMBER])) { - $this->setNumber(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_NUMBER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NUMBER])) { + $this->setNumber(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_NUMBER]] + $ext)); + } else if (is_array($data[self::FIELD_NUMBER])) { + $this->setNumber(new FHIRPositiveInt(array_merge($ext, $data[self::FIELD_NUMBER]))); + } } else { $this->setNumber(new FHIRPositiveInt($data[self::FIELD_NUMBER])); } @@ -182,8 +185,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TEXT] instanceof FHIRString) { $this->setText($data[self::FIELD_TEXT]); - } elseif ($ext && is_scalar($data[self::FIELD_TEXT])) { - $this->setText(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TEXT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TEXT])) { + $this->setText(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TEXT]] + $ext)); + } else if (is_array($data[self::FIELD_TEXT])) { + $this->setText(new FHIRString(array_merge($ext, $data[self::FIELD_TEXT]))); + } } else { $this->setText(new FHIRString($data[self::FIELD_TEXT])); } @@ -472,7 +479,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getText())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TEXT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -489,12 +495,26 @@ public function jsonSerialize() $a[self::FIELD_LANGUAGE] = $v; } if (null !== ($v = $this->getNumber())) { - $a[self::FIELD_NUMBER] = $v->getValue(); - $a[self::FIELD_NUMBER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NUMBER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NUMBER_EXT] = $enc; + } + } else { + $a[self::FIELD_NUMBER] = $v; + } } if (null !== ($v = $this->getText())) { - $a[self::FIELD_TEXT] = $v->getValue(); - $a[self::FIELD_TEXT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TEXT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TEXT_EXT] = $enc; + } + } else { + $a[self::FIELD_TEXT] = $v; + } } if (null !== ($v = $this->getType())) { $a[self::FIELD_TYPE] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseSubDetail.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseSubDetail.php index 15c03d213c..fbe565442f 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseSubDetail.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseSubDetail.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRClaimResponseSubDetail extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CLAIM_RESPONSE_DOT_SUB_DETAIL; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ADJUDICATION = 'adjudication'; const FIELD_ADJUDICATION_EXT = '_adjudication'; const FIELD_NOTE_NUMBER = 'noteNumber'; @@ -121,6 +117,9 @@ class FHIRClaimResponseSubDetail extends FHIRBackboneElement */ protected $sequenceLinkId = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRClaimResponseSubDetail Constructor * @param null|array $data @@ -143,17 +142,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_ADJUDICATION])) { foreach($data[self::FIELD_ADJUDICATION] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRClaimResponseAdjudication) { $this->addAdjudication($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addAdjudication(new FHIRClaimResponseAdjudication([FHIRClaimResponseAdjudication::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addAdjudication(new FHIRClaimResponseAdjudication([FHIRClaimResponseAdjudication::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addAdjudication(new FHIRClaimResponseAdjudication(array_merge($v, $ext[$i]))); + } } else { $this->addAdjudication(new FHIRClaimResponseAdjudication($v)); } } } elseif ($data[self::FIELD_ADJUDICATION] instanceof FHIRClaimResponseAdjudication) { $this->addAdjudication($data[self::FIELD_ADJUDICATION]); - } elseif ($ext && is_scalar($data[self::FIELD_ADJUDICATION])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_ADJUDICATION])) { $this->addAdjudication(new FHIRClaimResponseAdjudication([FHIRClaimResponseAdjudication::FIELD_VALUE => $data[self::FIELD_ADJUDICATION]] + $ext)); } else { $this->addAdjudication(new FHIRClaimResponseAdjudication($data[self::FIELD_ADJUDICATION])); @@ -165,17 +171,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_NOTE_NUMBER])) { foreach($data[self::FIELD_NOTE_NUMBER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRPositiveInt) { $this->addNoteNumber($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addNoteNumber(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addNoteNumber(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addNoteNumber(new FHIRPositiveInt(array_merge($v, $ext[$i]))); + } } else { $this->addNoteNumber(new FHIRPositiveInt($v)); } } } elseif ($data[self::FIELD_NOTE_NUMBER] instanceof FHIRPositiveInt) { $this->addNoteNumber($data[self::FIELD_NOTE_NUMBER]); - } elseif ($ext && is_scalar($data[self::FIELD_NOTE_NUMBER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_NOTE_NUMBER])) { $this->addNoteNumber(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_NOTE_NUMBER]] + $ext)); } else { $this->addNoteNumber(new FHIRPositiveInt($data[self::FIELD_NOTE_NUMBER])); @@ -187,8 +200,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SEQUENCE_LINK_ID] instanceof FHIRPositiveInt) { $this->setSequenceLinkId($data[self::FIELD_SEQUENCE_LINK_ID]); - } elseif ($ext && is_scalar($data[self::FIELD_SEQUENCE_LINK_ID])) { - $this->setSequenceLinkId(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_SEQUENCE_LINK_ID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SEQUENCE_LINK_ID])) { + $this->setSequenceLinkId(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_SEQUENCE_LINK_ID]] + $ext)); + } else if (is_array($data[self::FIELD_SEQUENCE_LINK_ID])) { + $this->setSequenceLinkId(new FHIRPositiveInt(array_merge($ext, $data[self::FIELD_SEQUENCE_LINK_ID]))); + } } else { $this->setSequenceLinkId(new FHIRPositiveInt($data[self::FIELD_SEQUENCE_LINK_ID])); } @@ -498,7 +515,23 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if ([] !== ($vs = $this->getAdjudication())) { - $a[self::FIELD_ADJUDICATION] = $vs; + $a[self::FIELD_ADJUDICATION] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ADJUDICATION][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ADJUDICATION_EXT][] = $enc; + } else { + $a[self::FIELD_ADJUDICATION_EXT][] = null; + } + } else { + $a[self::FIELD_ADJUDICATION][] = $v; + } + } } if ([] !== ($vs = $this->getNoteNumber())) { $a[self::FIELD_NOTE_NUMBER] = []; @@ -506,13 +539,29 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_NOTE_NUMBER][] = $v->getValue(); - $a[self::FIELD_NOTE_NUMBER_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NOTE_NUMBER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NOTE_NUMBER_EXT][] = $enc; + } else { + $a[self::FIELD_NOTE_NUMBER_EXT][] = null; + } + } else { + $a[self::FIELD_NOTE_NUMBER][] = $v; + } } } if (null !== ($v = $this->getSequenceLinkId())) { - $a[self::FIELD_SEQUENCE_LINK_ID] = $v->getValue(); - $a[self::FIELD_SEQUENCE_LINK_ID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SEQUENCE_LINK_ID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SEQUENCE_LINK_ID_EXT] = $enc; + } + } else { + $a[self::FIELD_SEQUENCE_LINK_ID] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRClinicalImpression/FHIRClinicalImpressionFinding.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRClinicalImpression/FHIRClinicalImpressionFinding.php index 434f31544f..659f7d50d7 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRClinicalImpression/FHIRClinicalImpressionFinding.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRClinicalImpression/FHIRClinicalImpressionFinding.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -85,10 +85,6 @@ class FHIRClinicalImpressionFinding extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CLINICAL_IMPRESSION_DOT_FINDING; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_BASIS = 'basis'; const FIELD_BASIS_EXT = '_basis'; const FIELD_ITEM_CODEABLE_CONCEPT = 'itemCodeableConcept'; @@ -130,6 +126,9 @@ class FHIRClinicalImpressionFinding extends FHIRBackboneElement */ protected $itemReference = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRClinicalImpressionFinding Constructor * @param null|array $data @@ -152,8 +151,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_BASIS] instanceof FHIRString) { $this->setBasis($data[self::FIELD_BASIS]); - } elseif ($ext && is_scalar($data[self::FIELD_BASIS])) { - $this->setBasis(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_BASIS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_BASIS])) { + $this->setBasis(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_BASIS]] + $ext)); + } else if (is_array($data[self::FIELD_BASIS])) { + $this->setBasis(new FHIRString(array_merge($ext, $data[self::FIELD_BASIS]))); + } } else { $this->setBasis(new FHIRString($data[self::FIELD_BASIS])); } @@ -389,14 +392,13 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getBasis())) { $v->xmlSerialize($sxe->addChild(self::FIELD_BASIS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getItemCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ITEM_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getItemReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ITEM_REFERENCE, null, $v->_getFHIRXMLNamespace())); } @@ -410,8 +412,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getBasis())) { - $a[self::FIELD_BASIS] = $v->getValue(); - $a[self::FIELD_BASIS_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_BASIS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_BASIS_EXT] = $enc; + } + } else { + $a[self::FIELD_BASIS] = $v; + } } if (null !== ($v = $this->getItemCodeableConcept())) { $a[self::FIELD_ITEM_CODEABLE_CONCEPT] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRClinicalImpression/FHIRClinicalImpressionInvestigation.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRClinicalImpression/FHIRClinicalImpressionInvestigation.php index e25a429c50..c41eea8a84 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRClinicalImpression/FHIRClinicalImpressionInvestigation.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRClinicalImpression/FHIRClinicalImpressionInvestigation.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -84,10 +84,6 @@ class FHIRClinicalImpressionInvestigation extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CLINICAL_IMPRESSION_DOT_INVESTIGATION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CODE = 'code'; const FIELD_ITEM = 'item'; @@ -117,6 +113,9 @@ class FHIRClinicalImpressionInvestigation extends FHIRBackboneElement */ protected $item = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRClinicalImpressionInvestigation Constructor * @param null|array $data @@ -143,6 +142,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ITEM])) { if (is_array($data[self::FIELD_ITEM])) { foreach($data[self::FIELD_ITEM] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addItem($v); } else { @@ -362,7 +364,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getItem())) { foreach($vs as $v) { if (null === $v) { diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRCodeSystem/FHIRCodeSystemConcept.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRCodeSystem/FHIRCodeSystemConcept.php index 14ae47cee1..83764a66d0 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRCodeSystem/FHIRCodeSystemConcept.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRCodeSystem/FHIRCodeSystemConcept.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRCodeSystemConcept extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CODE_SYSTEM_DOT_CONCEPT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CODE = 'code'; const FIELD_CODE_EXT = '_code'; const FIELD_CONCEPT = 'concept'; @@ -166,6 +162,9 @@ class FHIRCodeSystemConcept extends FHIRBackboneElement */ protected $property = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRCodeSystemConcept Constructor * @param null|array $data @@ -188,8 +187,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CODE] instanceof FHIRCode) { $this->setCode($data[self::FIELD_CODE]); - } elseif ($ext && is_scalar($data[self::FIELD_CODE])) { - $this->setCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_CODE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CODE])) { + $this->setCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_CODE]] + $ext)); + } else if (is_array($data[self::FIELD_CODE])) { + $this->setCode(new FHIRCode(array_merge($ext, $data[self::FIELD_CODE]))); + } } else { $this->setCode(new FHIRCode($data[self::FIELD_CODE])); } @@ -197,6 +200,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CONCEPT])) { if (is_array($data[self::FIELD_CONCEPT])) { foreach($data[self::FIELD_CONCEPT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeSystemConcept) { $this->addConcept($v); } else { @@ -215,8 +221,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DEFINITION] instanceof FHIRString) { $this->setDefinition($data[self::FIELD_DEFINITION]); - } elseif ($ext && is_scalar($data[self::FIELD_DEFINITION])) { - $this->setDefinition(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DEFINITION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DEFINITION])) { + $this->setDefinition(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DEFINITION]] + $ext)); + } else if (is_array($data[self::FIELD_DEFINITION])) { + $this->setDefinition(new FHIRString(array_merge($ext, $data[self::FIELD_DEFINITION]))); + } } else { $this->setDefinition(new FHIRString($data[self::FIELD_DEFINITION])); } @@ -227,17 +237,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_DESIGNATION])) { foreach($data[self::FIELD_DESIGNATION] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeSystemDesignation) { $this->addDesignation($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addDesignation(new FHIRCodeSystemDesignation([FHIRCodeSystemDesignation::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addDesignation(new FHIRCodeSystemDesignation([FHIRCodeSystemDesignation::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addDesignation(new FHIRCodeSystemDesignation(array_merge($v, $ext[$i]))); + } } else { $this->addDesignation(new FHIRCodeSystemDesignation($v)); } } } elseif ($data[self::FIELD_DESIGNATION] instanceof FHIRCodeSystemDesignation) { $this->addDesignation($data[self::FIELD_DESIGNATION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESIGNATION])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_DESIGNATION])) { $this->addDesignation(new FHIRCodeSystemDesignation([FHIRCodeSystemDesignation::FIELD_VALUE => $data[self::FIELD_DESIGNATION]] + $ext)); } else { $this->addDesignation(new FHIRCodeSystemDesignation($data[self::FIELD_DESIGNATION])); @@ -249,8 +266,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DISPLAY] instanceof FHIRString) { $this->setDisplay($data[self::FIELD_DISPLAY]); - } elseif ($ext && is_scalar($data[self::FIELD_DISPLAY])) { - $this->setDisplay(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DISPLAY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DISPLAY])) { + $this->setDisplay(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DISPLAY]] + $ext)); + } else if (is_array($data[self::FIELD_DISPLAY])) { + $this->setDisplay(new FHIRString(array_merge($ext, $data[self::FIELD_DISPLAY]))); + } } else { $this->setDisplay(new FHIRString($data[self::FIELD_DISPLAY])); } @@ -258,6 +279,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PROPERTY])) { if (is_array($data[self::FIELD_PROPERTY])) { foreach($data[self::FIELD_PROPERTY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeSystemProperty1) { $this->addProperty($v); } else { @@ -698,10 +722,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getConcept())) { foreach($vs as $v) { if (null === $v) { @@ -713,7 +737,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDefinition())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFINITION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getDesignation())) { foreach($vs as $v) { if (null === $v) { @@ -725,7 +748,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDisplay())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DISPLAY, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getProperty())) { foreach($vs as $v) { if (null === $v) { @@ -744,22 +766,59 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getCode())) { - $a[self::FIELD_CODE] = $v->getValue(); - $a[self::FIELD_CODE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CODE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CODE_EXT] = $enc; + } + } else { + $a[self::FIELD_CODE] = $v; + } } if ([] !== ($vs = $this->getConcept())) { $a[self::FIELD_CONCEPT] = $vs; } if (null !== ($v = $this->getDefinition())) { - $a[self::FIELD_DEFINITION] = $v->getValue(); - $a[self::FIELD_DEFINITION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DEFINITION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DEFINITION_EXT] = $enc; + } + } else { + $a[self::FIELD_DEFINITION] = $v; + } } if ([] !== ($vs = $this->getDesignation())) { - $a[self::FIELD_DESIGNATION] = $vs; + $a[self::FIELD_DESIGNATION] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESIGNATION][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESIGNATION_EXT][] = $enc; + } else { + $a[self::FIELD_DESIGNATION_EXT][] = null; + } + } else { + $a[self::FIELD_DESIGNATION][] = $v; + } + } } if (null !== ($v = $this->getDisplay())) { - $a[self::FIELD_DISPLAY] = $v->getValue(); - $a[self::FIELD_DISPLAY_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DISPLAY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DISPLAY_EXT] = $enc; + } + } else { + $a[self::FIELD_DISPLAY] = $v; + } } if ([] !== ($vs = $this->getProperty())) { $a[self::FIELD_PROPERTY] = $vs; diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRCodeSystem/FHIRCodeSystemDesignation.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRCodeSystem/FHIRCodeSystemDesignation.php index 583da9a1cb..9304dd1797 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRCodeSystem/FHIRCodeSystemDesignation.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRCodeSystem/FHIRCodeSystemDesignation.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRCodeSystemDesignation extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CODE_SYSTEM_DOT_DESIGNATION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_LANGUAGE = 'language'; const FIELD_LANGUAGE_EXT = '_language'; const FIELD_USE = 'use'; @@ -124,6 +120,9 @@ class FHIRCodeSystemDesignation extends FHIRBackboneElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRCodeSystemDesignation Constructor * @param null|array $data @@ -150,8 +149,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_LANGUAGE] instanceof FHIRCode) { $this->setLanguage($data[self::FIELD_LANGUAGE]); - } elseif ($ext && is_scalar($data[self::FIELD_LANGUAGE])) { - $this->setLanguage(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_LANGUAGE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_LANGUAGE])) { + $this->setLanguage(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_LANGUAGE]] + $ext)); + } else if (is_array($data[self::FIELD_LANGUAGE])) { + $this->setLanguage(new FHIRCode(array_merge($ext, $data[self::FIELD_LANGUAGE]))); + } } else { $this->setLanguage(new FHIRCode($data[self::FIELD_LANGUAGE])); } @@ -169,8 +172,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE] instanceof FHIRString) { $this->setValue($data[self::FIELD_VALUE]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE])) { - $this->setValue(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VALUE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE])) { + $this->setValue(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VALUE]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE])) { + $this->setValue(new FHIRString(array_merge($ext, $data[self::FIELD_VALUE]))); + } } else { $this->setValue(new FHIRString($data[self::FIELD_VALUE])); } @@ -399,14 +406,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getLanguage())) { $v->xmlSerialize($sxe->addChild(self::FIELD_LANGUAGE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getUse())) { $v->xmlSerialize($sxe->addChild(self::FIELD_USE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getValue())) { + $sxe->addAttribute(self::FIELD_VALUE, (string)$v); $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE, null, $v->_getFHIRXMLNamespace())); } return $sxe; @@ -419,15 +427,29 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getLanguage())) { - $a[self::FIELD_LANGUAGE] = $v->getValue(); - $a[self::FIELD_LANGUAGE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_LANGUAGE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_LANGUAGE_EXT] = $enc; + } + } else { + $a[self::FIELD_LANGUAGE] = $v; + } } if (null !== ($v = $this->getUse())) { $a[self::FIELD_USE] = $v; } if (null !== ($v = $this->getValue())) { - $a[self::FIELD_VALUE] = $v->getValue(); - $a[self::FIELD_VALUE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRCodeSystem/FHIRCodeSystemFilter.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRCodeSystem/FHIRCodeSystemFilter.php index 6b7ea064b4..6399bc9497 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRCodeSystem/FHIRCodeSystemFilter.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRCodeSystem/FHIRCodeSystemFilter.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRCodeSystemFilter extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CODE_SYSTEM_DOT_FILTER; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CODE = 'code'; const FIELD_CODE_EXT = '_code'; const FIELD_DESCRIPTION = 'description'; @@ -137,6 +133,9 @@ class FHIRCodeSystemFilter extends FHIRBackboneElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRCodeSystemFilter Constructor * @param null|array $data @@ -163,8 +162,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CODE] instanceof FHIRCode) { $this->setCode($data[self::FIELD_CODE]); - } elseif ($ext && is_scalar($data[self::FIELD_CODE])) { - $this->setCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_CODE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CODE])) { + $this->setCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_CODE]] + $ext)); + } else if (is_array($data[self::FIELD_CODE])) { + $this->setCode(new FHIRCode(array_merge($ext, $data[self::FIELD_CODE]))); + } } else { $this->setCode(new FHIRCode($data[self::FIELD_CODE])); } @@ -175,8 +178,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -187,17 +194,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_OPERATOR])) { foreach($data[self::FIELD_OPERATOR] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRFilterOperator) { $this->addOperator($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addOperator(new FHIRFilterOperator([FHIRFilterOperator::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addOperator(new FHIRFilterOperator([FHIRFilterOperator::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addOperator(new FHIRFilterOperator(array_merge($v, $ext[$i]))); + } } else { $this->addOperator(new FHIRFilterOperator($v)); } } } elseif ($data[self::FIELD_OPERATOR] instanceof FHIRFilterOperator) { $this->addOperator($data[self::FIELD_OPERATOR]); - } elseif ($ext && is_scalar($data[self::FIELD_OPERATOR])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_OPERATOR])) { $this->addOperator(new FHIRFilterOperator([FHIRFilterOperator::FIELD_VALUE => $data[self::FIELD_OPERATOR]] + $ext)); } else { $this->addOperator(new FHIRFilterOperator($data[self::FIELD_OPERATOR])); @@ -209,8 +223,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE] instanceof FHIRString) { $this->setValue($data[self::FIELD_VALUE]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE])) { - $this->setValue(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VALUE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE])) { + $this->setValue(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VALUE]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE])) { + $this->setValue(new FHIRString(array_merge($ext, $data[self::FIELD_VALUE]))); + } } else { $this->setValue(new FHIRString($data[self::FIELD_VALUE])); } @@ -508,13 +526,13 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getDescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESCRIPTION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getOperator())) { foreach($vs as $v) { if (null === $v) { @@ -524,6 +542,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 } } if (null !== ($v = $this->getValue())) { + $sxe->addAttribute(self::FIELD_VALUE, (string)$v); $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE, null, $v->_getFHIRXMLNamespace())); } return $sxe; @@ -536,19 +555,56 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getCode())) { - $a[self::FIELD_CODE] = $v->getValue(); - $a[self::FIELD_CODE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CODE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CODE_EXT] = $enc; + } + } else { + $a[self::FIELD_CODE] = $v; + } } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if ([] !== ($vs = $this->getOperator())) { - $a[self::FIELD_OPERATOR] = $vs; + $a[self::FIELD_OPERATOR] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_OPERATOR][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_OPERATOR_EXT][] = $enc; + } else { + $a[self::FIELD_OPERATOR_EXT][] = null; + } + } else { + $a[self::FIELD_OPERATOR][] = $v; + } + } } if (null !== ($v = $this->getValue())) { - $a[self::FIELD_VALUE] = $v->getValue(); - $a[self::FIELD_VALUE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRCodeSystem/FHIRCodeSystemProperty.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRCodeSystem/FHIRCodeSystemProperty.php index e25962c1e8..a7c59d9056 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRCodeSystem/FHIRCodeSystemProperty.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRCodeSystem/FHIRCodeSystemProperty.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -81,10 +81,6 @@ class FHIRCodeSystemProperty extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CODE_SYSTEM_DOT_PROPERTY; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CODE = 'code'; const FIELD_CODE_EXT = '_code'; const FIELD_DESCRIPTION = 'description'; @@ -143,6 +139,9 @@ class FHIRCodeSystemProperty extends FHIRBackboneElement */ protected $uri = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRCodeSystemProperty Constructor * @param null|array $data @@ -165,8 +164,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CODE] instanceof FHIRCode) { $this->setCode($data[self::FIELD_CODE]); - } elseif ($ext && is_scalar($data[self::FIELD_CODE])) { - $this->setCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_CODE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CODE])) { + $this->setCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_CODE]] + $ext)); + } else if (is_array($data[self::FIELD_CODE])) { + $this->setCode(new FHIRCode(array_merge($ext, $data[self::FIELD_CODE]))); + } } else { $this->setCode(new FHIRCode($data[self::FIELD_CODE])); } @@ -177,8 +180,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -189,8 +196,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TYPE] instanceof FHIRPropertyType) { $this->setType($data[self::FIELD_TYPE]); - } elseif ($ext && is_scalar($data[self::FIELD_TYPE])) { - $this->setType(new FHIRPropertyType([FHIRPropertyType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TYPE])) { + $this->setType(new FHIRPropertyType([FHIRPropertyType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } else if (is_array($data[self::FIELD_TYPE])) { + $this->setType(new FHIRPropertyType(array_merge($ext, $data[self::FIELD_TYPE]))); + } } else { $this->setType(new FHIRPropertyType($data[self::FIELD_TYPE])); } @@ -201,8 +212,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_URI] instanceof FHIRUri) { $this->setUri($data[self::FIELD_URI]); - } elseif ($ext && is_scalar($data[self::FIELD_URI])) { - $this->setUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URI]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_URI])) { + $this->setUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URI]] + $ext)); + } else if (is_array($data[self::FIELD_URI])) { + $this->setUri(new FHIRUri(array_merge($ext, $data[self::FIELD_URI]))); + } } else { $this->setUri(new FHIRUri($data[self::FIELD_URI])); } @@ -483,13 +498,13 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getDescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESCRIPTION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -506,19 +521,48 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getCode())) { - $a[self::FIELD_CODE] = $v->getValue(); - $a[self::FIELD_CODE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CODE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CODE_EXT] = $enc; + } + } else { + $a[self::FIELD_CODE] = $v; + } } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if (null !== ($v = $this->getType())) { - $a[self::FIELD_TYPE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TYPE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TYPE_EXT] = $enc; + } + } else { + $a[self::FIELD_TYPE] = $v; + } } if (null !== ($v = $this->getUri())) { - $a[self::FIELD_URI] = $v->getValue(); - $a[self::FIELD_URI_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_URI] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_URI_EXT] = $enc; + } + } else { + $a[self::FIELD_URI] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRCodeSystem/FHIRCodeSystemProperty1.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRCodeSystem/FHIRCodeSystemProperty1.php index 81f7184279..8945731850 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRCodeSystem/FHIRCodeSystemProperty1.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRCodeSystem/FHIRCodeSystemProperty1.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -83,10 +83,6 @@ class FHIRCodeSystemProperty1 extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CODE_SYSTEM_DOT_PROPERTY_1; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CODE = 'code'; const FIELD_CODE_EXT = '_code'; const FIELD_VALUE_BOOLEAN = 'valueBoolean'; @@ -182,6 +178,9 @@ class FHIRCodeSystemProperty1 extends FHIRBackboneElement */ protected $valueString = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRCodeSystemProperty1 Constructor * @param null|array $data @@ -204,8 +203,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CODE] instanceof FHIRCode) { $this->setCode($data[self::FIELD_CODE]); - } elseif ($ext && is_scalar($data[self::FIELD_CODE])) { - $this->setCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_CODE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CODE])) { + $this->setCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_CODE]] + $ext)); + } else if (is_array($data[self::FIELD_CODE])) { + $this->setCode(new FHIRCode(array_merge($ext, $data[self::FIELD_CODE]))); + } } else { $this->setCode(new FHIRCode($data[self::FIELD_CODE])); } @@ -216,8 +219,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_BOOLEAN] instanceof FHIRBoolean) { $this->setValueBoolean($data[self::FIELD_VALUE_BOOLEAN]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_BOOLEAN])) { - $this->setValueBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_VALUE_BOOLEAN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_BOOLEAN])) { + $this->setValueBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_VALUE_BOOLEAN]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_BOOLEAN])) { + $this->setValueBoolean(new FHIRBoolean(array_merge($ext, $data[self::FIELD_VALUE_BOOLEAN]))); + } } else { $this->setValueBoolean(new FHIRBoolean($data[self::FIELD_VALUE_BOOLEAN])); } @@ -228,8 +235,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_CODE] instanceof FHIRCode) { $this->setValueCode($data[self::FIELD_VALUE_CODE]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_CODE])) { - $this->setValueCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_VALUE_CODE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_CODE])) { + $this->setValueCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_VALUE_CODE]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_CODE])) { + $this->setValueCode(new FHIRCode(array_merge($ext, $data[self::FIELD_VALUE_CODE]))); + } } else { $this->setValueCode(new FHIRCode($data[self::FIELD_VALUE_CODE])); } @@ -247,8 +258,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_DATE_TIME] instanceof FHIRDateTime) { $this->setValueDateTime($data[self::FIELD_VALUE_DATE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_DATE_TIME])) { - $this->setValueDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_VALUE_DATE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_DATE_TIME])) { + $this->setValueDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_VALUE_DATE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_DATE_TIME])) { + $this->setValueDateTime(new FHIRDateTime(array_merge($ext, $data[self::FIELD_VALUE_DATE_TIME]))); + } } else { $this->setValueDateTime(new FHIRDateTime($data[self::FIELD_VALUE_DATE_TIME])); } @@ -259,8 +274,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_INTEGER] instanceof FHIRInteger) { $this->setValueInteger($data[self::FIELD_VALUE_INTEGER]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_INTEGER])) { - $this->setValueInteger(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_VALUE_INTEGER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_INTEGER])) { + $this->setValueInteger(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_VALUE_INTEGER]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_INTEGER])) { + $this->setValueInteger(new FHIRInteger(array_merge($ext, $data[self::FIELD_VALUE_INTEGER]))); + } } else { $this->setValueInteger(new FHIRInteger($data[self::FIELD_VALUE_INTEGER])); } @@ -271,8 +290,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_STRING] instanceof FHIRString) { $this->setValueString($data[self::FIELD_VALUE_STRING]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_STRING])) { - $this->setValueString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VALUE_STRING]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_STRING])) { + $this->setValueString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VALUE_STRING]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_STRING])) { + $this->setValueString(new FHIRString(array_merge($ext, $data[self::FIELD_VALUE_STRING]))); + } } else { $this->setValueString(new FHIRString($data[self::FIELD_VALUE_STRING])); } @@ -683,6 +706,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } @@ -692,7 +716,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getValueCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_CODE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueCoding())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_CODING, null, $v->_getFHIRXMLNamespace())); } @@ -715,31 +738,73 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getCode())) { - $a[self::FIELD_CODE] = $v->getValue(); - $a[self::FIELD_CODE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CODE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CODE_EXT] = $enc; + } + } else { + $a[self::FIELD_CODE] = $v; + } } if (null !== ($v = $this->getValueBoolean())) { - $a[self::FIELD_VALUE_BOOLEAN] = $v->getValue(); - $a[self::FIELD_VALUE_BOOLEAN_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_BOOLEAN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_BOOLEAN_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_BOOLEAN] = $v; + } } if (null !== ($v = $this->getValueCode())) { - $a[self::FIELD_VALUE_CODE] = $v->getValue(); - $a[self::FIELD_VALUE_CODE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_CODE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_CODE_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_CODE] = $v; + } } if (null !== ($v = $this->getValueCoding())) { $a[self::FIELD_VALUE_CODING] = $v; } if (null !== ($v = $this->getValueDateTime())) { - $a[self::FIELD_VALUE_DATE_TIME] = $v->getValue(); - $a[self::FIELD_VALUE_DATE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_DATE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_DATE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_DATE_TIME] = $v; + } } if (null !== ($v = $this->getValueInteger())) { - $a[self::FIELD_VALUE_INTEGER] = $v->getValue(); - $a[self::FIELD_VALUE_INTEGER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_INTEGER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_INTEGER_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_INTEGER] = $v; + } } if (null !== ($v = $this->getValueString())) { - $a[self::FIELD_VALUE_STRING] = $v->getValue(); - $a[self::FIELD_VALUE_STRING_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_STRING] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_STRING_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_STRING] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRCommunication/FHIRCommunicationPayload.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRCommunication/FHIRCommunicationPayload.php index 65d92bf45d..505268f124 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRCommunication/FHIRCommunicationPayload.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRCommunication/FHIRCommunicationPayload.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -81,10 +81,6 @@ class FHIRCommunicationPayload extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_COMMUNICATION_DOT_PAYLOAD; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CONTENT_ATTACHMENT = 'contentAttachment'; const FIELD_CONTENT_REFERENCE = 'contentReference'; const FIELD_CONTENT_STRING = 'contentString'; @@ -126,6 +122,9 @@ class FHIRCommunicationPayload extends FHIRBackboneElement */ protected $contentString = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRCommunicationPayload Constructor * @param null|array $data @@ -162,8 +161,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CONTENT_STRING] instanceof FHIRString) { $this->setContentString($data[self::FIELD_CONTENT_STRING]); - } elseif ($ext && is_scalar($data[self::FIELD_CONTENT_STRING])) { - $this->setContentString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_CONTENT_STRING]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CONTENT_STRING])) { + $this->setContentString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_CONTENT_STRING]] + $ext)); + } else if (is_array($data[self::FIELD_CONTENT_STRING])) { + $this->setContentString(new FHIRString(array_merge($ext, $data[self::FIELD_CONTENT_STRING]))); + } } else { $this->setContentString(new FHIRString($data[self::FIELD_CONTENT_STRING])); } @@ -389,7 +392,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getContentAttachment())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CONTENT_ATTACHMENT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getContentReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CONTENT_REFERENCE, null, $v->_getFHIRXMLNamespace())); } @@ -412,8 +414,15 @@ public function jsonSerialize() $a[self::FIELD_CONTENT_REFERENCE] = $v; } if (null !== ($v = $this->getContentString())) { - $a[self::FIELD_CONTENT_STRING] = $v->getValue(); - $a[self::FIELD_CONTENT_STRING_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CONTENT_STRING] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CONTENT_STRING_EXT] = $enc; + } + } else { + $a[self::FIELD_CONTENT_STRING] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRCommunicationRequest/FHIRCommunicationRequestPayload.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRCommunicationRequest/FHIRCommunicationRequestPayload.php index c44bc78456..044a2e3418 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRCommunicationRequest/FHIRCommunicationRequestPayload.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRCommunicationRequest/FHIRCommunicationRequestPayload.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -81,10 +81,6 @@ class FHIRCommunicationRequestPayload extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_COMMUNICATION_REQUEST_DOT_PAYLOAD; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CONTENT_ATTACHMENT = 'contentAttachment'; const FIELD_CONTENT_REFERENCE = 'contentReference'; const FIELD_CONTENT_STRING = 'contentString'; @@ -126,6 +122,9 @@ class FHIRCommunicationRequestPayload extends FHIRBackboneElement */ protected $contentString = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRCommunicationRequestPayload Constructor * @param null|array $data @@ -162,8 +161,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CONTENT_STRING] instanceof FHIRString) { $this->setContentString($data[self::FIELD_CONTENT_STRING]); - } elseif ($ext && is_scalar($data[self::FIELD_CONTENT_STRING])) { - $this->setContentString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_CONTENT_STRING]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CONTENT_STRING])) { + $this->setContentString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_CONTENT_STRING]] + $ext)); + } else if (is_array($data[self::FIELD_CONTENT_STRING])) { + $this->setContentString(new FHIRString(array_merge($ext, $data[self::FIELD_CONTENT_STRING]))); + } } else { $this->setContentString(new FHIRString($data[self::FIELD_CONTENT_STRING])); } @@ -389,7 +392,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getContentAttachment())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CONTENT_ATTACHMENT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getContentReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CONTENT_REFERENCE, null, $v->_getFHIRXMLNamespace())); } @@ -412,8 +414,15 @@ public function jsonSerialize() $a[self::FIELD_CONTENT_REFERENCE] = $v; } if (null !== ($v = $this->getContentString())) { - $a[self::FIELD_CONTENT_STRING] = $v->getValue(); - $a[self::FIELD_CONTENT_STRING_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CONTENT_STRING] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CONTENT_STRING_EXT] = $enc; + } + } else { + $a[self::FIELD_CONTENT_STRING] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRCommunicationRequest/FHIRCommunicationRequestRequester.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRCommunicationRequest/FHIRCommunicationRequestRequester.php index 0070ec25c9..70f66f1455 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRCommunicationRequest/FHIRCommunicationRequestRequester.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRCommunicationRequest/FHIRCommunicationRequestRequester.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRCommunicationRequestRequester extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_COMMUNICATION_REQUEST_DOT_REQUESTER; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_AGENT = 'agent'; const FIELD_ON_BEHALF_OF = 'onBehalfOf'; @@ -108,6 +104,9 @@ class FHIRCommunicationRequestRequester extends FHIRBackboneElement */ protected $onBehalfOf = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRCommunicationRequestRequester Constructor * @param null|array $data @@ -309,7 +308,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getAgent())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AGENT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOnBehalfOf())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ON_BEHALF_OF, null, $v->_getFHIRXMLNamespace())); } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRCompartmentDefinition/FHIRCompartmentDefinitionResource.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRCompartmentDefinition/FHIRCompartmentDefinitionResource.php index 60c73d54cc..b2fd33c3b3 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRCompartmentDefinition/FHIRCompartmentDefinitionResource.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRCompartmentDefinition/FHIRCompartmentDefinitionResource.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRCompartmentDefinitionResource extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_COMPARTMENT_DEFINITION_DOT_RESOURCE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CODE = 'code'; const FIELD_DOCUMENTATION = 'documentation'; const FIELD_DOCUMENTATION_EXT = '_documentation'; @@ -122,6 +118,9 @@ class FHIRCompartmentDefinitionResource extends FHIRBackboneElement */ protected $param = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRCompartmentDefinitionResource Constructor * @param null|array $data @@ -147,8 +146,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DOCUMENTATION] instanceof FHIRString) { $this->setDocumentation($data[self::FIELD_DOCUMENTATION]); - } elseif ($ext && is_scalar($data[self::FIELD_DOCUMENTATION])) { - $this->setDocumentation(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DOCUMENTATION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DOCUMENTATION])) { + $this->setDocumentation(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DOCUMENTATION]] + $ext)); + } else if (is_array($data[self::FIELD_DOCUMENTATION])) { + $this->setDocumentation(new FHIRString(array_merge($ext, $data[self::FIELD_DOCUMENTATION]))); + } } else { $this->setDocumentation(new FHIRString($data[self::FIELD_DOCUMENTATION])); } @@ -159,17 +162,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_PARAM])) { foreach($data[self::FIELD_PARAM] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRString) { $this->addParam($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addParam(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addParam(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addParam(new FHIRString(array_merge($v, $ext[$i]))); + } } else { $this->addParam(new FHIRString($v)); } } } elseif ($data[self::FIELD_PARAM] instanceof FHIRString) { $this->addParam($data[self::FIELD_PARAM]); - } elseif ($ext && is_scalar($data[self::FIELD_PARAM])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_PARAM])) { $this->addParam(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PARAM]] + $ext)); } else { $this->addParam(new FHIRString($data[self::FIELD_PARAM])); @@ -467,8 +477,15 @@ public function jsonSerialize() $a[self::FIELD_CODE] = $v; } if (null !== ($v = $this->getDocumentation())) { - $a[self::FIELD_DOCUMENTATION] = $v->getValue(); - $a[self::FIELD_DOCUMENTATION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DOCUMENTATION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DOCUMENTATION_EXT] = $enc; + } + } else { + $a[self::FIELD_DOCUMENTATION] = $v; + } } if ([] !== ($vs = $this->getParam())) { $a[self::FIELD_PARAM] = []; @@ -476,8 +493,17 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_PARAM][] = $v->getValue(); - $a[self::FIELD_PARAM_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PARAM][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PARAM_EXT][] = $enc; + } else { + $a[self::FIELD_PARAM_EXT][] = null; + } + } else { + $a[self::FIELD_PARAM][] = $v; + } } } return $a; diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRComposition/FHIRCompositionAttester.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRComposition/FHIRCompositionAttester.php index 68298d90c3..3500284e28 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRComposition/FHIRCompositionAttester.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRComposition/FHIRCompositionAttester.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -84,10 +84,6 @@ class FHIRCompositionAttester extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_COMPOSITION_DOT_ATTESTER; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_MODE = 'mode'; const FIELD_MODE_EXT = '_mode'; const FIELD_PARTY = 'party'; @@ -129,6 +125,9 @@ class FHIRCompositionAttester extends FHIRBackboneElement */ protected $time = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRCompositionAttester Constructor * @param null|array $data @@ -151,17 +150,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_MODE])) { foreach($data[self::FIELD_MODE] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCompositionAttestationMode) { $this->addMode($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addMode(new FHIRCompositionAttestationMode([FHIRCompositionAttestationMode::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addMode(new FHIRCompositionAttestationMode([FHIRCompositionAttestationMode::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addMode(new FHIRCompositionAttestationMode(array_merge($v, $ext[$i]))); + } } else { $this->addMode(new FHIRCompositionAttestationMode($v)); } } } elseif ($data[self::FIELD_MODE] instanceof FHIRCompositionAttestationMode) { $this->addMode($data[self::FIELD_MODE]); - } elseif ($ext && is_scalar($data[self::FIELD_MODE])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_MODE])) { $this->addMode(new FHIRCompositionAttestationMode([FHIRCompositionAttestationMode::FIELD_VALUE => $data[self::FIELD_MODE]] + $ext)); } else { $this->addMode(new FHIRCompositionAttestationMode($data[self::FIELD_MODE])); @@ -180,8 +186,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TIME] instanceof FHIRDateTime) { $this->setTime($data[self::FIELD_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_TIME])) { - $this->setTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TIME])) { + $this->setTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_TIME])) { + $this->setTime(new FHIRDateTime(array_merge($ext, $data[self::FIELD_TIME]))); + } } else { $this->setTime(new FHIRDateTime($data[self::FIELD_TIME])); } @@ -437,7 +447,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_MODE, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getParty())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PARTY, null, $v->_getFHIRXMLNamespace())); } @@ -454,14 +463,37 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if ([] !== ($vs = $this->getMode())) { - $a[self::FIELD_MODE] = $vs; + $a[self::FIELD_MODE] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MODE][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MODE_EXT][] = $enc; + } else { + $a[self::FIELD_MODE_EXT][] = null; + } + } else { + $a[self::FIELD_MODE][] = $v; + } + } } if (null !== ($v = $this->getParty())) { $a[self::FIELD_PARTY] = $v; } if (null !== ($v = $this->getTime())) { - $a[self::FIELD_TIME] = $v->getValue(); - $a[self::FIELD_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_TIME] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRComposition/FHIRCompositionEvent.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRComposition/FHIRCompositionEvent.php index 271884cf97..4d3a0919e9 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRComposition/FHIRCompositionEvent.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRComposition/FHIRCompositionEvent.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -84,10 +84,6 @@ class FHIRCompositionEvent extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_COMPOSITION_DOT_EVENT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CODE = 'code'; const FIELD_DETAIL = 'detail'; const FIELD_PERIOD = 'period'; @@ -132,6 +128,9 @@ class FHIRCompositionEvent extends FHIRBackboneElement */ protected $period = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRCompositionEvent Constructor * @param null|array $data @@ -151,6 +150,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CODE])) { if (is_array($data[self::FIELD_CODE])) { foreach($data[self::FIELD_CODE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addCode($v); } else { @@ -166,6 +168,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_DETAIL])) { if (is_array($data[self::FIELD_DETAIL])) { foreach($data[self::FIELD_DETAIL] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addDetail($v); } else { @@ -469,7 +474,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getDetail())) { foreach($vs as $v) { if (null === $v) { @@ -478,7 +482,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_DETAIL, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PERIOD, null, $v->_getFHIRXMLNamespace())); } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRComposition/FHIRCompositionRelatesTo.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRComposition/FHIRCompositionRelatesTo.php index 659e51b9a1..e7369bfc3c 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRComposition/FHIRCompositionRelatesTo.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRComposition/FHIRCompositionRelatesTo.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -84,10 +84,6 @@ class FHIRCompositionRelatesTo extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_COMPOSITION_DOT_RELATES_TO; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CODE = 'code'; const FIELD_CODE_EXT = '_code'; const FIELD_TARGET_IDENTIFIER = 'targetIdentifier'; @@ -127,6 +123,9 @@ class FHIRCompositionRelatesTo extends FHIRBackboneElement */ protected $targetReference = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRCompositionRelatesTo Constructor * @param null|array $data @@ -149,8 +148,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CODE] instanceof FHIRDocumentRelationshipType) { $this->setCode($data[self::FIELD_CODE]); - } elseif ($ext && is_scalar($data[self::FIELD_CODE])) { - $this->setCode(new FHIRDocumentRelationshipType([FHIRDocumentRelationshipType::FIELD_VALUE => $data[self::FIELD_CODE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CODE])) { + $this->setCode(new FHIRDocumentRelationshipType([FHIRDocumentRelationshipType::FIELD_VALUE => $data[self::FIELD_CODE]] + $ext)); + } else if (is_array($data[self::FIELD_CODE])) { + $this->setCode(new FHIRDocumentRelationshipType(array_merge($ext, $data[self::FIELD_CODE]))); + } } else { $this->setCode(new FHIRDocumentRelationshipType($data[self::FIELD_CODE])); } @@ -161,8 +164,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TARGET_IDENTIFIER] instanceof FHIRIdentifier) { $this->setTargetIdentifier($data[self::FIELD_TARGET_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_TARGET_IDENTIFIER])) { - $this->setTargetIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_TARGET_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TARGET_IDENTIFIER])) { + $this->setTargetIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_TARGET_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_TARGET_IDENTIFIER])) { + $this->setTargetIdentifier(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_TARGET_IDENTIFIER]))); + } } else { $this->setTargetIdentifier(new FHIRIdentifier($data[self::FIELD_TARGET_IDENTIFIER])); } @@ -378,11 +385,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getTargetIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TARGET_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getTargetReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TARGET_REFERENCE, null, $v->_getFHIRXMLNamespace())); } @@ -396,10 +401,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getCode())) { - $a[self::FIELD_CODE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CODE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CODE_EXT] = $enc; + } + } else { + $a[self::FIELD_CODE] = $v; + } } if (null !== ($v = $this->getTargetIdentifier())) { - $a[self::FIELD_TARGET_IDENTIFIER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TARGET_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TARGET_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_TARGET_IDENTIFIER] = $v; + } } if (null !== ($v = $this->getTargetReference())) { $a[self::FIELD_TARGET_REFERENCE] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRComposition/FHIRCompositionSection.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRComposition/FHIRCompositionSection.php index 2dbd7ce43f..16f149f720 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRComposition/FHIRCompositionSection.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRComposition/FHIRCompositionSection.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -86,10 +86,6 @@ class FHIRCompositionSection extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_COMPOSITION_DOT_SECTION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CODE = 'code'; const FIELD_EMPTY_REASON = 'emptyReason'; const FIELD_ENTRY = 'entry'; @@ -204,6 +200,9 @@ class FHIRCompositionSection extends FHIRBackboneElement */ protected $title = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRCompositionSection Constructor * @param null|array $data @@ -237,6 +236,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ENTRY])) { if (is_array($data[self::FIELD_ENTRY])) { foreach($data[self::FIELD_ENTRY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addEntry($v); } else { @@ -255,8 +257,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MODE] instanceof FHIRListMode) { $this->setMode($data[self::FIELD_MODE]); - } elseif ($ext && is_scalar($data[self::FIELD_MODE])) { - $this->setMode(new FHIRListMode([FHIRListMode::FIELD_VALUE => $data[self::FIELD_MODE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MODE])) { + $this->setMode(new FHIRListMode([FHIRListMode::FIELD_VALUE => $data[self::FIELD_MODE]] + $ext)); + } else if (is_array($data[self::FIELD_MODE])) { + $this->setMode(new FHIRListMode(array_merge($ext, $data[self::FIELD_MODE]))); + } } else { $this->setMode(new FHIRListMode($data[self::FIELD_MODE])); } @@ -271,6 +277,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SECTION])) { if (is_array($data[self::FIELD_SECTION])) { foreach($data[self::FIELD_SECTION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCompositionSection) { $this->addSection($v); } else { @@ -296,8 +305,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TITLE] instanceof FHIRString) { $this->setTitle($data[self::FIELD_TITLE]); - } elseif ($ext && is_scalar($data[self::FIELD_TITLE])) { - $this->setTitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TITLE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TITLE])) { + $this->setTitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TITLE]] + $ext)); + } else if (is_array($data[self::FIELD_TITLE])) { + $this->setTitle(new FHIRString(array_merge($ext, $data[self::FIELD_TITLE]))); + } } else { $this->setTitle(new FHIRString($data[self::FIELD_TITLE])); } @@ -772,11 +785,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getEmptyReason())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EMPTY_REASON, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getEntry())) { foreach($vs as $v) { if (null === $v) { @@ -785,15 +796,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_ENTRY, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getMode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MODE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOrderedBy())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ORDERED_BY, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getSection())) { foreach($vs as $v) { if (null === $v) { @@ -802,7 +810,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_SECTION, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getText())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TEXT, null, $v->_getFHIRXMLNamespace())); } @@ -828,7 +835,15 @@ public function jsonSerialize() $a[self::FIELD_ENTRY] = $vs; } if (null !== ($v = $this->getMode())) { - $a[self::FIELD_MODE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MODE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MODE_EXT] = $enc; + } + } else { + $a[self::FIELD_MODE] = $v; + } } if (null !== ($v = $this->getOrderedBy())) { $a[self::FIELD_ORDERED_BY] = $v; @@ -840,8 +855,15 @@ public function jsonSerialize() $a[self::FIELD_TEXT] = $v; } if (null !== ($v = $this->getTitle())) { - $a[self::FIELD_TITLE] = $v->getValue(); - $a[self::FIELD_TITLE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TITLE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TITLE_EXT] = $enc; + } + } else { + $a[self::FIELD_TITLE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRConceptMap/FHIRConceptMapDependsOn.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRConceptMap/FHIRConceptMapDependsOn.php index a86ba35b5d..ce53ee989e 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRConceptMap/FHIRConceptMapDependsOn.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRConceptMap/FHIRConceptMapDependsOn.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRConceptMapDependsOn extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONCEPT_MAP_DOT_DEPENDS_ON; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CODE = 'code'; const FIELD_CODE_EXT = '_code'; const FIELD_DISPLAY = 'display'; @@ -141,6 +137,9 @@ class FHIRConceptMapDependsOn extends FHIRBackboneElement */ protected $system = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRConceptMapDependsOn Constructor * @param null|array $data @@ -163,8 +162,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CODE] instanceof FHIRString) { $this->setCode($data[self::FIELD_CODE]); - } elseif ($ext && is_scalar($data[self::FIELD_CODE])) { - $this->setCode(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_CODE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CODE])) { + $this->setCode(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_CODE]] + $ext)); + } else if (is_array($data[self::FIELD_CODE])) { + $this->setCode(new FHIRString(array_merge($ext, $data[self::FIELD_CODE]))); + } } else { $this->setCode(new FHIRString($data[self::FIELD_CODE])); } @@ -175,8 +178,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DISPLAY] instanceof FHIRString) { $this->setDisplay($data[self::FIELD_DISPLAY]); - } elseif ($ext && is_scalar($data[self::FIELD_DISPLAY])) { - $this->setDisplay(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DISPLAY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DISPLAY])) { + $this->setDisplay(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DISPLAY]] + $ext)); + } else if (is_array($data[self::FIELD_DISPLAY])) { + $this->setDisplay(new FHIRString(array_merge($ext, $data[self::FIELD_DISPLAY]))); + } } else { $this->setDisplay(new FHIRString($data[self::FIELD_DISPLAY])); } @@ -187,8 +194,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PROPERTY] instanceof FHIRUri) { $this->setProperty($data[self::FIELD_PROPERTY]); - } elseif ($ext && is_scalar($data[self::FIELD_PROPERTY])) { - $this->setProperty(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_PROPERTY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PROPERTY])) { + $this->setProperty(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_PROPERTY]] + $ext)); + } else if (is_array($data[self::FIELD_PROPERTY])) { + $this->setProperty(new FHIRUri(array_merge($ext, $data[self::FIELD_PROPERTY]))); + } } else { $this->setProperty(new FHIRUri($data[self::FIELD_PROPERTY])); } @@ -199,8 +210,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SYSTEM] instanceof FHIRUri) { $this->setSystem($data[self::FIELD_SYSTEM]); - } elseif ($ext && is_scalar($data[self::FIELD_SYSTEM])) { - $this->setSystem(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_SYSTEM]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SYSTEM])) { + $this->setSystem(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_SYSTEM]] + $ext)); + } else if (is_array($data[self::FIELD_SYSTEM])) { + $this->setSystem(new FHIRUri(array_merge($ext, $data[self::FIELD_SYSTEM]))); + } } else { $this->setSystem(new FHIRUri($data[self::FIELD_SYSTEM])); } @@ -492,6 +507,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } @@ -514,20 +530,48 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getCode())) { - $a[self::FIELD_CODE] = $v->getValue(); - $a[self::FIELD_CODE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CODE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CODE_EXT] = $enc; + } + } else { + $a[self::FIELD_CODE] = $v; + } } if (null !== ($v = $this->getDisplay())) { - $a[self::FIELD_DISPLAY] = $v->getValue(); - $a[self::FIELD_DISPLAY_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DISPLAY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DISPLAY_EXT] = $enc; + } + } else { + $a[self::FIELD_DISPLAY] = $v; + } } if (null !== ($v = $this->getProperty())) { - $a[self::FIELD_PROPERTY] = $v->getValue(); - $a[self::FIELD_PROPERTY_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PROPERTY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PROPERTY_EXT] = $enc; + } + } else { + $a[self::FIELD_PROPERTY] = $v; + } } if (null !== ($v = $this->getSystem())) { - $a[self::FIELD_SYSTEM] = $v->getValue(); - $a[self::FIELD_SYSTEM_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SYSTEM] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SYSTEM_EXT] = $enc; + } + } else { + $a[self::FIELD_SYSTEM] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRConceptMap/FHIRConceptMapElement.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRConceptMap/FHIRConceptMapElement.php index 460179c7cd..7cbcc2cd9f 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRConceptMap/FHIRConceptMapElement.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRConceptMap/FHIRConceptMapElement.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRConceptMapElement extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONCEPT_MAP_DOT_ELEMENT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CODE = 'code'; const FIELD_CODE_EXT = '_code'; const FIELD_DISPLAY = 'display'; @@ -123,6 +119,9 @@ class FHIRConceptMapElement extends FHIRBackboneElement */ protected $target = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRConceptMapElement Constructor * @param null|array $data @@ -145,8 +144,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CODE] instanceof FHIRCode) { $this->setCode($data[self::FIELD_CODE]); - } elseif ($ext && is_scalar($data[self::FIELD_CODE])) { - $this->setCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_CODE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CODE])) { + $this->setCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_CODE]] + $ext)); + } else if (is_array($data[self::FIELD_CODE])) { + $this->setCode(new FHIRCode(array_merge($ext, $data[self::FIELD_CODE]))); + } } else { $this->setCode(new FHIRCode($data[self::FIELD_CODE])); } @@ -157,8 +160,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DISPLAY] instanceof FHIRString) { $this->setDisplay($data[self::FIELD_DISPLAY]); - } elseif ($ext && is_scalar($data[self::FIELD_DISPLAY])) { - $this->setDisplay(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DISPLAY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DISPLAY])) { + $this->setDisplay(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DISPLAY]] + $ext)); + } else if (is_array($data[self::FIELD_DISPLAY])) { + $this->setDisplay(new FHIRString(array_merge($ext, $data[self::FIELD_DISPLAY]))); + } } else { $this->setDisplay(new FHIRString($data[self::FIELD_DISPLAY])); } @@ -166,6 +173,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_TARGET])) { if (is_array($data[self::FIELD_TARGET])) { foreach($data[self::FIELD_TARGET] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRConceptMapTarget) { $this->addTarget($v); } else { @@ -429,13 +439,13 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getDisplay())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DISPLAY, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getTarget())) { foreach($vs as $v) { if (null === $v) { @@ -454,12 +464,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getCode())) { - $a[self::FIELD_CODE] = $v->getValue(); - $a[self::FIELD_CODE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CODE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CODE_EXT] = $enc; + } + } else { + $a[self::FIELD_CODE] = $v; + } } if (null !== ($v = $this->getDisplay())) { - $a[self::FIELD_DISPLAY] = $v->getValue(); - $a[self::FIELD_DISPLAY_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DISPLAY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DISPLAY_EXT] = $enc; + } + } else { + $a[self::FIELD_DISPLAY] = $v; + } } if ([] !== ($vs = $this->getTarget())) { $a[self::FIELD_TARGET] = $vs; diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRConceptMap/FHIRConceptMapGroup.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRConceptMap/FHIRConceptMapGroup.php index 1123bbcde6..e3be09a34e 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRConceptMap/FHIRConceptMapGroup.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRConceptMap/FHIRConceptMapGroup.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRConceptMapGroup extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONCEPT_MAP_DOT_GROUP; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ELEMENT = 'element'; const FIELD_SOURCE = 'source'; const FIELD_SOURCE_EXT = '_source'; @@ -163,6 +159,9 @@ class FHIRConceptMapGroup extends FHIRBackboneElement */ protected $unmapped = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRConceptMapGroup Constructor * @param null|array $data @@ -182,6 +181,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ELEMENT])) { if (is_array($data[self::FIELD_ELEMENT])) { foreach($data[self::FIELD_ELEMENT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRConceptMapElement) { $this->addElement($v); } else { @@ -200,8 +202,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SOURCE] instanceof FHIRUri) { $this->setSource($data[self::FIELD_SOURCE]); - } elseif ($ext && is_scalar($data[self::FIELD_SOURCE])) { - $this->setSource(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_SOURCE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SOURCE])) { + $this->setSource(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_SOURCE]] + $ext)); + } else if (is_array($data[self::FIELD_SOURCE])) { + $this->setSource(new FHIRUri(array_merge($ext, $data[self::FIELD_SOURCE]))); + } } else { $this->setSource(new FHIRUri($data[self::FIELD_SOURCE])); } @@ -212,8 +218,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SOURCE_VERSION] instanceof FHIRString) { $this->setSourceVersion($data[self::FIELD_SOURCE_VERSION]); - } elseif ($ext && is_scalar($data[self::FIELD_SOURCE_VERSION])) { - $this->setSourceVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SOURCE_VERSION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SOURCE_VERSION])) { + $this->setSourceVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SOURCE_VERSION]] + $ext)); + } else if (is_array($data[self::FIELD_SOURCE_VERSION])) { + $this->setSourceVersion(new FHIRString(array_merge($ext, $data[self::FIELD_SOURCE_VERSION]))); + } } else { $this->setSourceVersion(new FHIRString($data[self::FIELD_SOURCE_VERSION])); } @@ -224,8 +234,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TARGET] instanceof FHIRUri) { $this->setTarget($data[self::FIELD_TARGET]); - } elseif ($ext && is_scalar($data[self::FIELD_TARGET])) { - $this->setTarget(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_TARGET]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TARGET])) { + $this->setTarget(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_TARGET]] + $ext)); + } else if (is_array($data[self::FIELD_TARGET])) { + $this->setTarget(new FHIRUri(array_merge($ext, $data[self::FIELD_TARGET]))); + } } else { $this->setTarget(new FHIRUri($data[self::FIELD_TARGET])); } @@ -236,8 +250,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TARGET_VERSION] instanceof FHIRString) { $this->setTargetVersion($data[self::FIELD_TARGET_VERSION]); - } elseif ($ext && is_scalar($data[self::FIELD_TARGET_VERSION])) { - $this->setTargetVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TARGET_VERSION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TARGET_VERSION])) { + $this->setTargetVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TARGET_VERSION]] + $ext)); + } else if (is_array($data[self::FIELD_TARGET_VERSION])) { + $this->setTargetVersion(new FHIRString(array_merge($ext, $data[self::FIELD_TARGET_VERSION]))); + } } else { $this->setTargetVersion(new FHIRString($data[self::FIELD_TARGET_VERSION])); } @@ -647,7 +665,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getTargetVersion())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TARGET_VERSION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getUnmapped())) { $v->xmlSerialize($sxe->addChild(self::FIELD_UNMAPPED, null, $v->_getFHIRXMLNamespace())); } @@ -664,20 +681,48 @@ public function jsonSerialize() $a[self::FIELD_ELEMENT] = $vs; } if (null !== ($v = $this->getSource())) { - $a[self::FIELD_SOURCE] = $v->getValue(); - $a[self::FIELD_SOURCE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SOURCE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SOURCE_EXT] = $enc; + } + } else { + $a[self::FIELD_SOURCE] = $v; + } } if (null !== ($v = $this->getSourceVersion())) { - $a[self::FIELD_SOURCE_VERSION] = $v->getValue(); - $a[self::FIELD_SOURCE_VERSION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SOURCE_VERSION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SOURCE_VERSION_EXT] = $enc; + } + } else { + $a[self::FIELD_SOURCE_VERSION] = $v; + } } if (null !== ($v = $this->getTarget())) { - $a[self::FIELD_TARGET] = $v->getValue(); - $a[self::FIELD_TARGET_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TARGET] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TARGET_EXT] = $enc; + } + } else { + $a[self::FIELD_TARGET] = $v; + } } if (null !== ($v = $this->getTargetVersion())) { - $a[self::FIELD_TARGET_VERSION] = $v->getValue(); - $a[self::FIELD_TARGET_VERSION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TARGET_VERSION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TARGET_VERSION_EXT] = $enc; + } + } else { + $a[self::FIELD_TARGET_VERSION] = $v; + } } if (null !== ($v = $this->getUnmapped())) { $a[self::FIELD_UNMAPPED] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRConceptMap/FHIRConceptMapTarget.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRConceptMap/FHIRConceptMapTarget.php index 7fcf49658b..bcf7ff7a1e 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRConceptMap/FHIRConceptMapTarget.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRConceptMap/FHIRConceptMapTarget.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRConceptMapTarget extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONCEPT_MAP_DOT_TARGET; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CODE = 'code'; const FIELD_CODE_EXT = '_code'; const FIELD_COMMENT = 'comment'; @@ -167,6 +163,9 @@ class FHIRConceptMapTarget extends FHIRBackboneElement */ protected $product = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRConceptMapTarget Constructor * @param null|array $data @@ -189,8 +188,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CODE] instanceof FHIRCode) { $this->setCode($data[self::FIELD_CODE]); - } elseif ($ext && is_scalar($data[self::FIELD_CODE])) { - $this->setCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_CODE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CODE])) { + $this->setCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_CODE]] + $ext)); + } else if (is_array($data[self::FIELD_CODE])) { + $this->setCode(new FHIRCode(array_merge($ext, $data[self::FIELD_CODE]))); + } } else { $this->setCode(new FHIRCode($data[self::FIELD_CODE])); } @@ -201,8 +204,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_COMMENT] instanceof FHIRString) { $this->setComment($data[self::FIELD_COMMENT]); - } elseif ($ext && is_scalar($data[self::FIELD_COMMENT])) { - $this->setComment(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_COMMENT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_COMMENT])) { + $this->setComment(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_COMMENT]] + $ext)); + } else if (is_array($data[self::FIELD_COMMENT])) { + $this->setComment(new FHIRString(array_merge($ext, $data[self::FIELD_COMMENT]))); + } } else { $this->setComment(new FHIRString($data[self::FIELD_COMMENT])); } @@ -210,6 +217,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_DEPENDS_ON])) { if (is_array($data[self::FIELD_DEPENDS_ON])) { foreach($data[self::FIELD_DEPENDS_ON] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRConceptMapDependsOn) { $this->addDependsOn($v); } else { @@ -228,8 +238,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DISPLAY] instanceof FHIRString) { $this->setDisplay($data[self::FIELD_DISPLAY]); - } elseif ($ext && is_scalar($data[self::FIELD_DISPLAY])) { - $this->setDisplay(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DISPLAY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DISPLAY])) { + $this->setDisplay(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DISPLAY]] + $ext)); + } else if (is_array($data[self::FIELD_DISPLAY])) { + $this->setDisplay(new FHIRString(array_merge($ext, $data[self::FIELD_DISPLAY]))); + } } else { $this->setDisplay(new FHIRString($data[self::FIELD_DISPLAY])); } @@ -240,8 +254,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EQUIVALENCE] instanceof FHIRConceptMapEquivalence) { $this->setEquivalence($data[self::FIELD_EQUIVALENCE]); - } elseif ($ext && is_scalar($data[self::FIELD_EQUIVALENCE])) { - $this->setEquivalence(new FHIRConceptMapEquivalence([FHIRConceptMapEquivalence::FIELD_VALUE => $data[self::FIELD_EQUIVALENCE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EQUIVALENCE])) { + $this->setEquivalence(new FHIRConceptMapEquivalence([FHIRConceptMapEquivalence::FIELD_VALUE => $data[self::FIELD_EQUIVALENCE]] + $ext)); + } else if (is_array($data[self::FIELD_EQUIVALENCE])) { + $this->setEquivalence(new FHIRConceptMapEquivalence(array_merge($ext, $data[self::FIELD_EQUIVALENCE]))); + } } else { $this->setEquivalence(new FHIRConceptMapEquivalence($data[self::FIELD_EQUIVALENCE])); } @@ -249,6 +267,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PRODUCT])) { if (is_array($data[self::FIELD_PRODUCT])) { foreach($data[self::FIELD_PRODUCT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRConceptMapDependsOn) { $this->addProduct($v); } else { @@ -664,13 +685,13 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getComment())) { $v->xmlSerialize($sxe->addChild(self::FIELD_COMMENT, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getDependsOn())) { foreach($vs as $v) { if (null === $v) { @@ -682,11 +703,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDisplay())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DISPLAY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getEquivalence())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EQUIVALENCE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getProduct())) { foreach($vs as $v) { if (null === $v) { @@ -705,22 +724,51 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getCode())) { - $a[self::FIELD_CODE] = $v->getValue(); - $a[self::FIELD_CODE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CODE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CODE_EXT] = $enc; + } + } else { + $a[self::FIELD_CODE] = $v; + } } if (null !== ($v = $this->getComment())) { - $a[self::FIELD_COMMENT] = $v->getValue(); - $a[self::FIELD_COMMENT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_COMMENT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_COMMENT_EXT] = $enc; + } + } else { + $a[self::FIELD_COMMENT] = $v; + } } if ([] !== ($vs = $this->getDependsOn())) { $a[self::FIELD_DEPENDS_ON] = $vs; } if (null !== ($v = $this->getDisplay())) { - $a[self::FIELD_DISPLAY] = $v->getValue(); - $a[self::FIELD_DISPLAY_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DISPLAY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DISPLAY_EXT] = $enc; + } + } else { + $a[self::FIELD_DISPLAY] = $v; + } } if (null !== ($v = $this->getEquivalence())) { - $a[self::FIELD_EQUIVALENCE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EQUIVALENCE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EQUIVALENCE_EXT] = $enc; + } + } else { + $a[self::FIELD_EQUIVALENCE] = $v; + } } if ([] !== ($vs = $this->getProduct())) { $a[self::FIELD_PRODUCT] = $vs; diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRConceptMap/FHIRConceptMapUnmapped.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRConceptMap/FHIRConceptMapUnmapped.php index fed47aa774..03a3b8b6b8 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRConceptMap/FHIRConceptMapUnmapped.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRConceptMap/FHIRConceptMapUnmapped.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -81,10 +81,6 @@ class FHIRConceptMapUnmapped extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONCEPT_MAP_DOT_UNMAPPED; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CODE = 'code'; const FIELD_CODE_EXT = '_code'; const FIELD_DISPLAY = 'display'; @@ -144,6 +140,9 @@ class FHIRConceptMapUnmapped extends FHIRBackboneElement */ protected $url = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRConceptMapUnmapped Constructor * @param null|array $data @@ -166,8 +165,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CODE] instanceof FHIRCode) { $this->setCode($data[self::FIELD_CODE]); - } elseif ($ext && is_scalar($data[self::FIELD_CODE])) { - $this->setCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_CODE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CODE])) { + $this->setCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_CODE]] + $ext)); + } else if (is_array($data[self::FIELD_CODE])) { + $this->setCode(new FHIRCode(array_merge($ext, $data[self::FIELD_CODE]))); + } } else { $this->setCode(new FHIRCode($data[self::FIELD_CODE])); } @@ -178,8 +181,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DISPLAY] instanceof FHIRString) { $this->setDisplay($data[self::FIELD_DISPLAY]); - } elseif ($ext && is_scalar($data[self::FIELD_DISPLAY])) { - $this->setDisplay(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DISPLAY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DISPLAY])) { + $this->setDisplay(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DISPLAY]] + $ext)); + } else if (is_array($data[self::FIELD_DISPLAY])) { + $this->setDisplay(new FHIRString(array_merge($ext, $data[self::FIELD_DISPLAY]))); + } } else { $this->setDisplay(new FHIRString($data[self::FIELD_DISPLAY])); } @@ -190,8 +197,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MODE] instanceof FHIRConceptMapGroupUnmappedMode) { $this->setMode($data[self::FIELD_MODE]); - } elseif ($ext && is_scalar($data[self::FIELD_MODE])) { - $this->setMode(new FHIRConceptMapGroupUnmappedMode([FHIRConceptMapGroupUnmappedMode::FIELD_VALUE => $data[self::FIELD_MODE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MODE])) { + $this->setMode(new FHIRConceptMapGroupUnmappedMode([FHIRConceptMapGroupUnmappedMode::FIELD_VALUE => $data[self::FIELD_MODE]] + $ext)); + } else if (is_array($data[self::FIELD_MODE])) { + $this->setMode(new FHIRConceptMapGroupUnmappedMode(array_merge($ext, $data[self::FIELD_MODE]))); + } } else { $this->setMode(new FHIRConceptMapGroupUnmappedMode($data[self::FIELD_MODE])); } @@ -202,8 +213,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_URL] instanceof FHIRUri) { $this->setUrl($data[self::FIELD_URL]); - } elseif ($ext && is_scalar($data[self::FIELD_URL])) { - $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } else if (is_array($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri(array_merge($ext, $data[self::FIELD_URL]))); + } } else { $this->setUrl(new FHIRUri($data[self::FIELD_URL])); } @@ -486,13 +501,13 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getDisplay())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DISPLAY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getMode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MODE, null, $v->_getFHIRXMLNamespace())); } @@ -509,19 +524,48 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getCode())) { - $a[self::FIELD_CODE] = $v->getValue(); - $a[self::FIELD_CODE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CODE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CODE_EXT] = $enc; + } + } else { + $a[self::FIELD_CODE] = $v; + } } if (null !== ($v = $this->getDisplay())) { - $a[self::FIELD_DISPLAY] = $v->getValue(); - $a[self::FIELD_DISPLAY_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DISPLAY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DISPLAY_EXT] = $enc; + } + } else { + $a[self::FIELD_DISPLAY] = $v; + } } if (null !== ($v = $this->getMode())) { - $a[self::FIELD_MODE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MODE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MODE_EXT] = $enc; + } + } else { + $a[self::FIELD_MODE] = $v; + } } if (null !== ($v = $this->getUrl())) { - $a[self::FIELD_URL] = $v->getValue(); - $a[self::FIELD_URL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_URL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_URL_EXT] = $enc; + } + } else { + $a[self::FIELD_URL] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRCondition/FHIRConditionEvidence.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRCondition/FHIRConditionEvidence.php index 3377f31229..86356e8ec5 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRCondition/FHIRConditionEvidence.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRCondition/FHIRConditionEvidence.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRConditionEvidence extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONDITION_DOT_EVIDENCE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CODE = 'code'; const FIELD_DETAIL = 'detail'; @@ -109,6 +105,9 @@ class FHIRConditionEvidence extends FHIRBackboneElement */ protected $detail = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRConditionEvidence Constructor * @param null|array $data @@ -128,6 +127,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CODE])) { if (is_array($data[self::FIELD_CODE])) { foreach($data[self::FIELD_CODE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addCode($v); } else { @@ -143,6 +145,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_DETAIL])) { if (is_array($data[self::FIELD_DETAIL])) { foreach($data[self::FIELD_DETAIL] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addDetail($v); } else { @@ -390,7 +395,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getDetail())) { foreach($vs as $v) { if (null === $v) { diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRCondition/FHIRConditionStage.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRCondition/FHIRConditionStage.php index 258495644b..35bf900619 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRCondition/FHIRConditionStage.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRCondition/FHIRConditionStage.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRConditionStage extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONDITION_DOT_STAGE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ASSESSMENT = 'assessment'; const FIELD_SUMMARY = 'summary'; @@ -111,6 +107,9 @@ class FHIRConditionStage extends FHIRBackboneElement */ protected $summary = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRConditionStage Constructor * @param null|array $data @@ -130,6 +129,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ASSESSMENT])) { if (is_array($data[self::FIELD_ASSESSMENT])) { foreach($data[self::FIELD_ASSESSMENT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addAssessment($v); } else { @@ -360,7 +362,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_ASSESSMENT, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getSummary())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUMMARY, null, $v->_getFHIRXMLNamespace())); } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRConsent/FHIRConsentActor.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRConsent/FHIRConsentActor.php index 667354e4ab..170fdbf541 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRConsent/FHIRConsentActor.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRConsent/FHIRConsentActor.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRConsentActor extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONSENT_DOT_ACTOR; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_REFERENCE = 'reference'; const FIELD_ROLE = 'role'; @@ -113,6 +109,9 @@ class FHIRConsentActor extends FHIRBackboneElement */ protected $role = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRConsentActor Constructor * @param null|array $data @@ -322,7 +321,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REFERENCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRole())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ROLE, null, $v->_getFHIRXMLNamespace())); } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRConsent/FHIRConsentActor1.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRConsent/FHIRConsentActor1.php index 88c1c73cab..099a107eae 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRConsent/FHIRConsentActor1.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRConsent/FHIRConsentActor1.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRConsentActor1 extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONSENT_DOT_ACTOR_1; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_REFERENCE = 'reference'; const FIELD_ROLE = 'role'; @@ -113,6 +109,9 @@ class FHIRConsentActor1 extends FHIRBackboneElement */ protected $role = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRConsentActor1 Constructor * @param null|array $data @@ -322,7 +321,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REFERENCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRole())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ROLE, null, $v->_getFHIRXMLNamespace())); } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRConsent/FHIRConsentData.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRConsent/FHIRConsentData.php index 9f9f7a932e..73f2fe8a48 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRConsent/FHIRConsentData.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRConsent/FHIRConsentData.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRConsentData extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONSENT_DOT_DATA; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_MEANING = 'meaning'; const FIELD_MEANING_EXT = '_meaning'; const FIELD_REFERENCE = 'reference'; @@ -110,6 +106,9 @@ class FHIRConsentData extends FHIRBackboneElement */ protected $reference = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRConsentData Constructor * @param null|array $data @@ -132,8 +131,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MEANING] instanceof FHIRConsentDataMeaning) { $this->setMeaning($data[self::FIELD_MEANING]); - } elseif ($ext && is_scalar($data[self::FIELD_MEANING])) { - $this->setMeaning(new FHIRConsentDataMeaning([FHIRConsentDataMeaning::FIELD_VALUE => $data[self::FIELD_MEANING]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MEANING])) { + $this->setMeaning(new FHIRConsentDataMeaning([FHIRConsentDataMeaning::FIELD_VALUE => $data[self::FIELD_MEANING]] + $ext)); + } else if (is_array($data[self::FIELD_MEANING])) { + $this->setMeaning(new FHIRConsentDataMeaning(array_merge($ext, $data[self::FIELD_MEANING]))); + } } else { $this->setMeaning(new FHIRConsentDataMeaning($data[self::FIELD_MEANING])); } @@ -316,7 +319,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getMeaning())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MEANING, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REFERENCE, null, $v->_getFHIRXMLNamespace())); } @@ -330,7 +332,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getMeaning())) { - $a[self::FIELD_MEANING] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MEANING] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MEANING_EXT] = $enc; + } + } else { + $a[self::FIELD_MEANING] = $v; + } } if (null !== ($v = $this->getReference())) { $a[self::FIELD_REFERENCE] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRConsent/FHIRConsentData1.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRConsent/FHIRConsentData1.php index 508fa3ff1a..90011a8320 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRConsent/FHIRConsentData1.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRConsent/FHIRConsentData1.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRConsentData1 extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONSENT_DOT_DATA_1; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_MEANING = 'meaning'; const FIELD_MEANING_EXT = '_meaning'; const FIELD_REFERENCE = 'reference'; @@ -110,6 +106,9 @@ class FHIRConsentData1 extends FHIRBackboneElement */ protected $reference = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRConsentData1 Constructor * @param null|array $data @@ -132,8 +131,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MEANING] instanceof FHIRConsentDataMeaning) { $this->setMeaning($data[self::FIELD_MEANING]); - } elseif ($ext && is_scalar($data[self::FIELD_MEANING])) { - $this->setMeaning(new FHIRConsentDataMeaning([FHIRConsentDataMeaning::FIELD_VALUE => $data[self::FIELD_MEANING]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MEANING])) { + $this->setMeaning(new FHIRConsentDataMeaning([FHIRConsentDataMeaning::FIELD_VALUE => $data[self::FIELD_MEANING]] + $ext)); + } else if (is_array($data[self::FIELD_MEANING])) { + $this->setMeaning(new FHIRConsentDataMeaning(array_merge($ext, $data[self::FIELD_MEANING]))); + } } else { $this->setMeaning(new FHIRConsentDataMeaning($data[self::FIELD_MEANING])); } @@ -316,7 +319,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getMeaning())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MEANING, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REFERENCE, null, $v->_getFHIRXMLNamespace())); } @@ -330,7 +332,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getMeaning())) { - $a[self::FIELD_MEANING] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MEANING] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MEANING_EXT] = $enc; + } + } else { + $a[self::FIELD_MEANING] = $v; + } } if (null !== ($v = $this->getReference())) { $a[self::FIELD_REFERENCE] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRConsent/FHIRConsentExcept.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRConsent/FHIRConsentExcept.php index c438e68ffa..b321cb1da8 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRConsent/FHIRConsentExcept.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRConsent/FHIRConsentExcept.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -82,10 +82,6 @@ class FHIRConsentExcept extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONSENT_DOT_EXCEPT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ACTION = 'action'; const FIELD_ACTOR = 'actor'; const FIELD_CLASS = 'class'; @@ -217,6 +213,9 @@ class FHIRConsentExcept extends FHIRBackboneElement */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRConsentExcept Constructor * @param null|array $data @@ -236,6 +235,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ACTION])) { if (is_array($data[self::FIELD_ACTION])) { foreach($data[self::FIELD_ACTION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addAction($v); } else { @@ -251,6 +253,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ACTOR])) { if (is_array($data[self::FIELD_ACTOR])) { foreach($data[self::FIELD_ACTOR] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRConsentActor1) { $this->addActor($v); } else { @@ -266,6 +271,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CLASS])) { if (is_array($data[self::FIELD_CLASS])) { foreach($data[self::FIELD_CLASS] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCoding) { $this->addClass($v); } else { @@ -281,6 +289,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CODE])) { if (is_array($data[self::FIELD_CODE])) { foreach($data[self::FIELD_CODE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCoding) { $this->addCode($v); } else { @@ -296,6 +307,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_DATA])) { if (is_array($data[self::FIELD_DATA])) { foreach($data[self::FIELD_DATA] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRConsentData1) { $this->addData($v); } else { @@ -325,6 +339,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PURPOSE])) { if (is_array($data[self::FIELD_PURPOSE])) { foreach($data[self::FIELD_PURPOSE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCoding) { $this->addPurpose($v); } else { @@ -340,6 +357,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SECURITY_LABEL])) { if (is_array($data[self::FIELD_SECURITY_LABEL])) { foreach($data[self::FIELD_SECURITY_LABEL] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCoding) { $this->addSecurityLabel($v); } else { @@ -358,8 +378,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TYPE] instanceof FHIRConsentExceptType) { $this->setType($data[self::FIELD_TYPE]); - } elseif ($ext && is_scalar($data[self::FIELD_TYPE])) { - $this->setType(new FHIRConsentExceptType([FHIRConsentExceptType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TYPE])) { + $this->setType(new FHIRConsentExceptType([FHIRConsentExceptType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } else if (is_array($data[self::FIELD_TYPE])) { + $this->setType(new FHIRConsentExceptType(array_merge($ext, $data[self::FIELD_TYPE]))); + } } else { $this->setType(new FHIRConsentExceptType($data[self::FIELD_TYPE])); } @@ -1026,7 +1050,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_ACTION, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getActor())) { foreach($vs as $v) { if (null === $v) { @@ -1035,7 +1058,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_ACTOR, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getClass())) { foreach($vs as $v) { if (null === $v) { @@ -1044,7 +1066,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_CLASS, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getCode())) { foreach($vs as $v) { if (null === $v) { @@ -1053,7 +1074,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getData())) { foreach($vs as $v) { if (null === $v) { @@ -1062,15 +1082,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_DATA, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getDataPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DATA_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getPurpose())) { foreach($vs as $v) { if (null === $v) { @@ -1079,7 +1096,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_PURPOSE, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getSecurityLabel())) { foreach($vs as $v) { if (null === $v) { @@ -1088,7 +1104,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_SECURITY_LABEL, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -1129,7 +1144,15 @@ public function jsonSerialize() $a[self::FIELD_SECURITY_LABEL] = $vs; } if (null !== ($v = $this->getType())) { - $a[self::FIELD_TYPE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TYPE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TYPE_EXT] = $enc; + } + } else { + $a[self::FIELD_TYPE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRConsent/FHIRConsentPolicy.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRConsent/FHIRConsentPolicy.php index 065d0be535..5246196ce3 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRConsent/FHIRConsentPolicy.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRConsent/FHIRConsentPolicy.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRConsentPolicy extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONSENT_DOT_POLICY; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_AUTHORITY = 'authority'; const FIELD_AUTHORITY_EXT = '_authority'; const FIELD_URI = 'uri'; @@ -112,6 +108,9 @@ class FHIRConsentPolicy extends FHIRBackboneElement */ protected $uri = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRConsentPolicy Constructor * @param null|array $data @@ -134,8 +133,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_AUTHORITY] instanceof FHIRUri) { $this->setAuthority($data[self::FIELD_AUTHORITY]); - } elseif ($ext && is_scalar($data[self::FIELD_AUTHORITY])) { - $this->setAuthority(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_AUTHORITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_AUTHORITY])) { + $this->setAuthority(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_AUTHORITY]] + $ext)); + } else if (is_array($data[self::FIELD_AUTHORITY])) { + $this->setAuthority(new FHIRUri(array_merge($ext, $data[self::FIELD_AUTHORITY]))); + } } else { $this->setAuthority(new FHIRUri($data[self::FIELD_AUTHORITY])); } @@ -146,8 +149,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_URI] instanceof FHIRUri) { $this->setUri($data[self::FIELD_URI]); - } elseif ($ext && is_scalar($data[self::FIELD_URI])) { - $this->setUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URI]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_URI])) { + $this->setUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URI]] + $ext)); + } else if (is_array($data[self::FIELD_URI])) { + $this->setUri(new FHIRUri(array_merge($ext, $data[self::FIELD_URI]))); + } } else { $this->setUri(new FHIRUri($data[self::FIELD_URI])); } @@ -345,6 +352,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getAuthority())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AUTHORITY, null, $v->_getFHIRXMLNamespace())); } @@ -361,12 +369,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getAuthority())) { - $a[self::FIELD_AUTHORITY] = $v->getValue(); - $a[self::FIELD_AUTHORITY_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_AUTHORITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_AUTHORITY_EXT] = $enc; + } + } else { + $a[self::FIELD_AUTHORITY] = $v; + } } if (null !== ($v = $this->getUri())) { - $a[self::FIELD_URI] = $v->getValue(); - $a[self::FIELD_URI_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_URI] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_URI_EXT] = $enc; + } + } else { + $a[self::FIELD_URI] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractAgent.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractAgent.php index bf28d21db8..a71dd60ffe 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractAgent.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractAgent.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRContractAgent extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONTRACT_DOT_AGENT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ACTOR = 'actor'; const FIELD_ROLE = 'role'; @@ -109,6 +105,9 @@ class FHIRContractAgent extends FHIRBackboneElement */ protected $role = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRContractAgent Constructor * @param null|array $data @@ -135,6 +134,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ROLE])) { if (is_array($data[self::FIELD_ROLE])) { foreach($data[self::FIELD_ROLE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addRole($v); } else { @@ -349,7 +351,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getActor())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ACTOR, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getRole())) { foreach($vs as $v) { if (null === $v) { diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractAgent1.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractAgent1.php index 26d9a07843..b36a46851d 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractAgent1.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractAgent1.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRContractAgent1 extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONTRACT_DOT_AGENT_1; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ACTOR = 'actor'; const FIELD_ROLE = 'role'; @@ -110,6 +106,9 @@ class FHIRContractAgent1 extends FHIRBackboneElement */ protected $role = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRContractAgent1 Constructor * @param null|array $data @@ -136,6 +135,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ROLE])) { if (is_array($data[self::FIELD_ROLE])) { foreach($data[self::FIELD_ROLE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addRole($v); } else { @@ -353,7 +355,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getActor())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ACTOR, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getRole())) { foreach($vs as $v) { if (null === $v) { diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractFriendly.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractFriendly.php index ac3f5b3e1d..c7a0708fd0 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractFriendly.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractFriendly.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRContractFriendly extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONTRACT_DOT_FRIENDLY; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CONTENT_ATTACHMENT = 'contentAttachment'; const FIELD_CONTENT_REFERENCE = 'contentReference'; @@ -110,6 +106,9 @@ class FHIRContractFriendly extends FHIRBackboneElement */ protected $contentReference = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRContractFriendly Constructor * @param null|array $data @@ -315,7 +314,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getContentAttachment())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CONTENT_ATTACHMENT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getContentReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CONTENT_REFERENCE, null, $v->_getFHIRXMLNamespace())); } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractLegal.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractLegal.php index cea33c61f6..9d34552003 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractLegal.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractLegal.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRContractLegal extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONTRACT_DOT_LEGAL; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CONTENT_ATTACHMENT = 'contentAttachment'; const FIELD_CONTENT_REFERENCE = 'contentReference'; @@ -108,6 +104,9 @@ class FHIRContractLegal extends FHIRBackboneElement */ protected $contentReference = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRContractLegal Constructor * @param null|array $data @@ -309,7 +308,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getContentAttachment())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CONTENT_ATTACHMENT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getContentReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CONTENT_REFERENCE, null, $v->_getFHIRXMLNamespace())); } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractRule.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractRule.php index 3ea6dc6c94..fca7e9ee48 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractRule.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractRule.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRContractRule extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONTRACT_DOT_RULE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CONTENT_ATTACHMENT = 'contentAttachment'; const FIELD_CONTENT_REFERENCE = 'contentReference'; @@ -110,6 +106,9 @@ class FHIRContractRule extends FHIRBackboneElement */ protected $contentReference = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRContractRule Constructor * @param null|array $data @@ -315,7 +314,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getContentAttachment())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CONTENT_ATTACHMENT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getContentReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CONTENT_REFERENCE, null, $v->_getFHIRXMLNamespace())); } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractSigner.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractSigner.php index f371da4f9e..962335b6a4 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractSigner.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractSigner.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRContractSigner extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONTRACT_DOT_SIGNER; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_PARTY = 'party'; const FIELD_SIGNATURE = 'signature'; const FIELD_TYPE = 'type'; @@ -124,6 +120,9 @@ class FHIRContractSigner extends FHIRBackboneElement */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRContractSigner Constructor * @param null|array $data @@ -150,6 +149,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SIGNATURE])) { if (is_array($data[self::FIELD_SIGNATURE])) { foreach($data[self::FIELD_SIGNATURE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRSignature) { $this->addSignature($v); } else { @@ -410,7 +412,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getParty())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PARTY, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getSignature())) { foreach($vs as $v) { if (null === $v) { @@ -419,7 +420,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_SIGNATURE, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractTerm.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractTerm.php index 3cc9290380..76229618fd 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractTerm.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractTerm.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -84,10 +84,6 @@ class FHIRContractTerm extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONTRACT_DOT_TERM; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ACTION = 'action'; const FIELD_ACTION_REASON = 'actionReason'; const FIELD_AGENT = 'agent'; @@ -256,6 +252,9 @@ class FHIRContractTerm extends FHIRBackboneElement */ protected $valuedItem = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRContractTerm Constructor * @param null|array $data @@ -275,6 +274,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ACTION])) { if (is_array($data[self::FIELD_ACTION])) { foreach($data[self::FIELD_ACTION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addAction($v); } else { @@ -290,6 +292,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ACTION_REASON])) { if (is_array($data[self::FIELD_ACTION_REASON])) { foreach($data[self::FIELD_ACTION_REASON] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addActionReason($v); } else { @@ -305,6 +310,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_AGENT])) { if (is_array($data[self::FIELD_AGENT])) { foreach($data[self::FIELD_AGENT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContractAgent1) { $this->addAgent($v); } else { @@ -327,6 +335,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_GROUP])) { if (is_array($data[self::FIELD_GROUP])) { foreach($data[self::FIELD_GROUP] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContractTerm) { $this->addGroup($v); } else { @@ -345,8 +356,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->setIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { - $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_IDENTIFIER]))); + } } else { $this->setIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); } @@ -357,8 +372,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ISSUED] instanceof FHIRDateTime) { $this->setIssued($data[self::FIELD_ISSUED]); - } elseif ($ext && is_scalar($data[self::FIELD_ISSUED])) { - $this->setIssued(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_ISSUED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ISSUED])) { + $this->setIssued(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_ISSUED]] + $ext)); + } else if (is_array($data[self::FIELD_ISSUED])) { + $this->setIssued(new FHIRDateTime(array_merge($ext, $data[self::FIELD_ISSUED]))); + } } else { $this->setIssued(new FHIRDateTime($data[self::FIELD_ISSUED])); } @@ -366,6 +385,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SECURITY_LABEL])) { if (is_array($data[self::FIELD_SECURITY_LABEL])) { foreach($data[self::FIELD_SECURITY_LABEL] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCoding) { $this->addSecurityLabel($v); } else { @@ -391,8 +413,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TEXT] instanceof FHIRString) { $this->setText($data[self::FIELD_TEXT]); - } elseif ($ext && is_scalar($data[self::FIELD_TEXT])) { - $this->setText(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TEXT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TEXT])) { + $this->setText(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TEXT]] + $ext)); + } else if (is_array($data[self::FIELD_TEXT])) { + $this->setText(new FHIRString(array_merge($ext, $data[self::FIELD_TEXT]))); + } } else { $this->setText(new FHIRString($data[self::FIELD_TEXT])); } @@ -400,6 +426,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_TOPIC])) { if (is_array($data[self::FIELD_TOPIC])) { foreach($data[self::FIELD_TOPIC] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addTopic($v); } else { @@ -422,6 +451,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_VALUED_ITEM])) { if (is_array($data[self::FIELD_VALUED_ITEM])) { foreach($data[self::FIELD_VALUED_ITEM] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContractValuedItem1) { $this->addValuedItem($v); } else { @@ -1208,7 +1240,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_ACTION, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getActionReason())) { foreach($vs as $v) { if (null === $v) { @@ -1217,7 +1248,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_ACTION_REASON, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getAgent())) { foreach($vs as $v) { if (null === $v) { @@ -1226,11 +1256,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_AGENT, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getApplies())) { $v->xmlSerialize($sxe->addChild(self::FIELD_APPLIES, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getGroup())) { foreach($vs as $v) { if (null === $v) { @@ -1239,14 +1267,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_GROUP, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getIssued())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ISSUED, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getSecurityLabel())) { foreach($vs as $v) { if (null === $v) { @@ -1255,14 +1281,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_SECURITY_LABEL, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getSubType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUB_TYPE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getText())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TEXT, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getTopic())) { foreach($vs as $v) { if (null === $v) { @@ -1271,11 +1295,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_TOPIC, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getValuedItem())) { foreach($vs as $v) { if (null === $v) { @@ -1309,11 +1331,26 @@ public function jsonSerialize() $a[self::FIELD_GROUP] = $vs; } if (null !== ($v = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_IDENTIFIER] = $v; + } } if (null !== ($v = $this->getIssued())) { - $a[self::FIELD_ISSUED] = $v->getValue(); - $a[self::FIELD_ISSUED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ISSUED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ISSUED_EXT] = $enc; + } + } else { + $a[self::FIELD_ISSUED] = $v; + } } if ([] !== ($vs = $this->getSecurityLabel())) { $a[self::FIELD_SECURITY_LABEL] = $vs; @@ -1322,8 +1359,15 @@ public function jsonSerialize() $a[self::FIELD_SUB_TYPE] = $v; } if (null !== ($v = $this->getText())) { - $a[self::FIELD_TEXT] = $v->getValue(); - $a[self::FIELD_TEXT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TEXT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TEXT_EXT] = $enc; + } + } else { + $a[self::FIELD_TEXT] = $v; + } } if ([] !== ($vs = $this->getTopic())) { $a[self::FIELD_TOPIC] = $vs; diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractValuedItem.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractValuedItem.php index 7303da6761..298ef514c2 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractValuedItem.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractValuedItem.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -84,10 +84,6 @@ class FHIRContractValuedItem extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONTRACT_DOT_VALUED_ITEM; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_EFFECTIVE_TIME = 'effectiveTime'; const FIELD_EFFECTIVE_TIME_EXT = '_effectiveTime'; const FIELD_ENTITY_CODEABLE_CONCEPT = 'entityCodeableConcept'; @@ -97,11 +93,13 @@ class FHIRContractValuedItem extends FHIRBackboneElement const FIELD_IDENTIFIER = 'identifier'; const FIELD_IDENTIFIER_EXT = '_identifier'; const FIELD_NET = 'net'; + const FIELD_NET_EXT = '_net'; const FIELD_POINTS = 'points'; const FIELD_POINTS_EXT = '_points'; const FIELD_QUANTITY = 'quantity'; const FIELD_QUANTITY_EXT = '_quantity'; const FIELD_UNIT_PRICE = 'unitPrice'; + const FIELD_UNIT_PRICE_EXT = '_unitPrice'; /** * A date, date-time or partial date (e.g. just year or year + month). If hours and @@ -220,6 +218,9 @@ class FHIRContractValuedItem extends FHIRBackboneElement */ protected $unitPrice = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRContractValuedItem Constructor * @param null|array $data @@ -242,8 +243,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EFFECTIVE_TIME] instanceof FHIRDateTime) { $this->setEffectiveTime($data[self::FIELD_EFFECTIVE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_EFFECTIVE_TIME])) { - $this->setEffectiveTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_EFFECTIVE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EFFECTIVE_TIME])) { + $this->setEffectiveTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_EFFECTIVE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_EFFECTIVE_TIME])) { + $this->setEffectiveTime(new FHIRDateTime(array_merge($ext, $data[self::FIELD_EFFECTIVE_TIME]))); + } } else { $this->setEffectiveTime(new FHIRDateTime($data[self::FIELD_EFFECTIVE_TIME])); } @@ -268,8 +273,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_FACTOR] instanceof FHIRDecimal) { $this->setFactor($data[self::FIELD_FACTOR]); - } elseif ($ext && is_scalar($data[self::FIELD_FACTOR])) { - $this->setFactor(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_FACTOR]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_FACTOR])) { + $this->setFactor(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_FACTOR]] + $ext)); + } else if (is_array($data[self::FIELD_FACTOR])) { + $this->setFactor(new FHIRDecimal(array_merge($ext, $data[self::FIELD_FACTOR]))); + } } else { $this->setFactor(new FHIRDecimal($data[self::FIELD_FACTOR])); } @@ -280,15 +289,28 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->setIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { - $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_IDENTIFIER]))); + } } else { $this->setIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); } } if (isset($data[self::FIELD_NET])) { + $ext = (isset($data[self::FIELD_NET_EXT]) && is_array($data[self::FIELD_NET_EXT])) + ? $data[self::FIELD_NET_EXT] + : null; if ($data[self::FIELD_NET] instanceof FHIRMoney) { $this->setNet($data[self::FIELD_NET]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NET])) { + $this->setNet(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_NET]] + $ext)); + } else if (is_array($data[self::FIELD_NET])) { + $this->setNet(new FHIRMoney(array_merge($ext, $data[self::FIELD_NET]))); + } } else { $this->setNet(new FHIRMoney($data[self::FIELD_NET])); } @@ -299,8 +321,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_POINTS] instanceof FHIRDecimal) { $this->setPoints($data[self::FIELD_POINTS]); - } elseif ($ext && is_scalar($data[self::FIELD_POINTS])) { - $this->setPoints(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_POINTS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_POINTS])) { + $this->setPoints(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_POINTS]] + $ext)); + } else if (is_array($data[self::FIELD_POINTS])) { + $this->setPoints(new FHIRDecimal(array_merge($ext, $data[self::FIELD_POINTS]))); + } } else { $this->setPoints(new FHIRDecimal($data[self::FIELD_POINTS])); } @@ -311,15 +337,28 @@ public function __construct($data = null) : null; if ($data[self::FIELD_QUANTITY] instanceof FHIRQuantity) { $this->setQuantity($data[self::FIELD_QUANTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_QUANTITY])) { - $this->setQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_QUANTITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_QUANTITY])) { + $this->setQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_QUANTITY])) { + $this->setQuantity(new FHIRQuantity(array_merge($ext, $data[self::FIELD_QUANTITY]))); + } } else { $this->setQuantity(new FHIRQuantity($data[self::FIELD_QUANTITY])); } } if (isset($data[self::FIELD_UNIT_PRICE])) { + $ext = (isset($data[self::FIELD_UNIT_PRICE_EXT]) && is_array($data[self::FIELD_UNIT_PRICE_EXT])) + ? $data[self::FIELD_UNIT_PRICE_EXT] + : null; if ($data[self::FIELD_UNIT_PRICE] instanceof FHIRMoney) { $this->setUnitPrice($data[self::FIELD_UNIT_PRICE]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_UNIT_PRICE])) { + $this->setUnitPrice(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_UNIT_PRICE]] + $ext)); + } else if (is_array($data[self::FIELD_UNIT_PRICE])) { + $this->setUnitPrice(new FHIRMoney(array_merge($ext, $data[self::FIELD_UNIT_PRICE]))); + } } else { $this->setUnitPrice(new FHIRMoney($data[self::FIELD_UNIT_PRICE])); } @@ -791,36 +830,31 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getEffectiveTime())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EFFECTIVE_TIME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getEntityCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ENTITY_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getEntityReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ENTITY_REFERENCE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getFactor())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FACTOR, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getNet())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NET, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getPoints())) { $v->xmlSerialize($sxe->addChild(self::FIELD_POINTS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_QUANTITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getUnitPrice())) { $v->xmlSerialize($sxe->addChild(self::FIELD_UNIT_PRICE, null, $v->_getFHIRXMLNamespace())); } @@ -834,8 +868,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getEffectiveTime())) { - $a[self::FIELD_EFFECTIVE_TIME] = $v->getValue(); - $a[self::FIELD_EFFECTIVE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EFFECTIVE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EFFECTIVE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_EFFECTIVE_TIME] = $v; + } } if (null !== ($v = $this->getEntityCodeableConcept())) { $a[self::FIELD_ENTITY_CODEABLE_CONCEPT] = $v; @@ -844,24 +885,70 @@ public function jsonSerialize() $a[self::FIELD_ENTITY_REFERENCE] = $v; } if (null !== ($v = $this->getFactor())) { - $a[self::FIELD_FACTOR] = $v->getValue(); - $a[self::FIELD_FACTOR_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FACTOR] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FACTOR_EXT] = $enc; + } + } else { + $a[self::FIELD_FACTOR] = $v; + } } if (null !== ($v = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_IDENTIFIER] = $v; + } } if (null !== ($v = $this->getNet())) { - $a[self::FIELD_NET] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NET] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NET_EXT] = $enc; + } + } else { + $a[self::FIELD_NET] = $v; + } } if (null !== ($v = $this->getPoints())) { - $a[self::FIELD_POINTS] = $v->getValue(); - $a[self::FIELD_POINTS_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_POINTS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_POINTS_EXT] = $enc; + } + } else { + $a[self::FIELD_POINTS] = $v; + } } if (null !== ($v = $this->getQuantity())) { - $a[self::FIELD_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_QUANTITY] = $v; + } } if (null !== ($v = $this->getUnitPrice())) { - $a[self::FIELD_UNIT_PRICE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_UNIT_PRICE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_UNIT_PRICE_EXT] = $enc; + } + } else { + $a[self::FIELD_UNIT_PRICE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractValuedItem1.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractValuedItem1.php index 6c79833566..4042842258 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractValuedItem1.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractValuedItem1.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -84,10 +84,6 @@ class FHIRContractValuedItem1 extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONTRACT_DOT_VALUED_ITEM_1; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_EFFECTIVE_TIME = 'effectiveTime'; const FIELD_EFFECTIVE_TIME_EXT = '_effectiveTime'; const FIELD_ENTITY_CODEABLE_CONCEPT = 'entityCodeableConcept'; @@ -97,11 +93,13 @@ class FHIRContractValuedItem1 extends FHIRBackboneElement const FIELD_IDENTIFIER = 'identifier'; const FIELD_IDENTIFIER_EXT = '_identifier'; const FIELD_NET = 'net'; + const FIELD_NET_EXT = '_net'; const FIELD_POINTS = 'points'; const FIELD_POINTS_EXT = '_points'; const FIELD_QUANTITY = 'quantity'; const FIELD_QUANTITY_EXT = '_quantity'; const FIELD_UNIT_PRICE = 'unitPrice'; + const FIELD_UNIT_PRICE_EXT = '_unitPrice'; /** * A date, date-time or partial date (e.g. just year or year + month). If hours and @@ -222,6 +220,9 @@ class FHIRContractValuedItem1 extends FHIRBackboneElement */ protected $unitPrice = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRContractValuedItem1 Constructor * @param null|array $data @@ -244,8 +245,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EFFECTIVE_TIME] instanceof FHIRDateTime) { $this->setEffectiveTime($data[self::FIELD_EFFECTIVE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_EFFECTIVE_TIME])) { - $this->setEffectiveTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_EFFECTIVE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EFFECTIVE_TIME])) { + $this->setEffectiveTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_EFFECTIVE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_EFFECTIVE_TIME])) { + $this->setEffectiveTime(new FHIRDateTime(array_merge($ext, $data[self::FIELD_EFFECTIVE_TIME]))); + } } else { $this->setEffectiveTime(new FHIRDateTime($data[self::FIELD_EFFECTIVE_TIME])); } @@ -270,8 +275,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_FACTOR] instanceof FHIRDecimal) { $this->setFactor($data[self::FIELD_FACTOR]); - } elseif ($ext && is_scalar($data[self::FIELD_FACTOR])) { - $this->setFactor(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_FACTOR]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_FACTOR])) { + $this->setFactor(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_FACTOR]] + $ext)); + } else if (is_array($data[self::FIELD_FACTOR])) { + $this->setFactor(new FHIRDecimal(array_merge($ext, $data[self::FIELD_FACTOR]))); + } } else { $this->setFactor(new FHIRDecimal($data[self::FIELD_FACTOR])); } @@ -282,15 +291,28 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->setIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { - $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_IDENTIFIER]))); + } } else { $this->setIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); } } if (isset($data[self::FIELD_NET])) { + $ext = (isset($data[self::FIELD_NET_EXT]) && is_array($data[self::FIELD_NET_EXT])) + ? $data[self::FIELD_NET_EXT] + : null; if ($data[self::FIELD_NET] instanceof FHIRMoney) { $this->setNet($data[self::FIELD_NET]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NET])) { + $this->setNet(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_NET]] + $ext)); + } else if (is_array($data[self::FIELD_NET])) { + $this->setNet(new FHIRMoney(array_merge($ext, $data[self::FIELD_NET]))); + } } else { $this->setNet(new FHIRMoney($data[self::FIELD_NET])); } @@ -301,8 +323,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_POINTS] instanceof FHIRDecimal) { $this->setPoints($data[self::FIELD_POINTS]); - } elseif ($ext && is_scalar($data[self::FIELD_POINTS])) { - $this->setPoints(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_POINTS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_POINTS])) { + $this->setPoints(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_POINTS]] + $ext)); + } else if (is_array($data[self::FIELD_POINTS])) { + $this->setPoints(new FHIRDecimal(array_merge($ext, $data[self::FIELD_POINTS]))); + } } else { $this->setPoints(new FHIRDecimal($data[self::FIELD_POINTS])); } @@ -313,15 +339,28 @@ public function __construct($data = null) : null; if ($data[self::FIELD_QUANTITY] instanceof FHIRQuantity) { $this->setQuantity($data[self::FIELD_QUANTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_QUANTITY])) { - $this->setQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_QUANTITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_QUANTITY])) { + $this->setQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_QUANTITY])) { + $this->setQuantity(new FHIRQuantity(array_merge($ext, $data[self::FIELD_QUANTITY]))); + } } else { $this->setQuantity(new FHIRQuantity($data[self::FIELD_QUANTITY])); } } if (isset($data[self::FIELD_UNIT_PRICE])) { + $ext = (isset($data[self::FIELD_UNIT_PRICE_EXT]) && is_array($data[self::FIELD_UNIT_PRICE_EXT])) + ? $data[self::FIELD_UNIT_PRICE_EXT] + : null; if ($data[self::FIELD_UNIT_PRICE] instanceof FHIRMoney) { $this->setUnitPrice($data[self::FIELD_UNIT_PRICE]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_UNIT_PRICE])) { + $this->setUnitPrice(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_UNIT_PRICE]] + $ext)); + } else if (is_array($data[self::FIELD_UNIT_PRICE])) { + $this->setUnitPrice(new FHIRMoney(array_merge($ext, $data[self::FIELD_UNIT_PRICE]))); + } } else { $this->setUnitPrice(new FHIRMoney($data[self::FIELD_UNIT_PRICE])); } @@ -797,36 +836,31 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getEffectiveTime())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EFFECTIVE_TIME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getEntityCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ENTITY_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getEntityReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ENTITY_REFERENCE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getFactor())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FACTOR, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getNet())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NET, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getPoints())) { $v->xmlSerialize($sxe->addChild(self::FIELD_POINTS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_QUANTITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getUnitPrice())) { $v->xmlSerialize($sxe->addChild(self::FIELD_UNIT_PRICE, null, $v->_getFHIRXMLNamespace())); } @@ -840,8 +874,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getEffectiveTime())) { - $a[self::FIELD_EFFECTIVE_TIME] = $v->getValue(); - $a[self::FIELD_EFFECTIVE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EFFECTIVE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EFFECTIVE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_EFFECTIVE_TIME] = $v; + } } if (null !== ($v = $this->getEntityCodeableConcept())) { $a[self::FIELD_ENTITY_CODEABLE_CONCEPT] = $v; @@ -850,24 +891,70 @@ public function jsonSerialize() $a[self::FIELD_ENTITY_REFERENCE] = $v; } if (null !== ($v = $this->getFactor())) { - $a[self::FIELD_FACTOR] = $v->getValue(); - $a[self::FIELD_FACTOR_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FACTOR] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FACTOR_EXT] = $enc; + } + } else { + $a[self::FIELD_FACTOR] = $v; + } } if (null !== ($v = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_IDENTIFIER] = $v; + } } if (null !== ($v = $this->getNet())) { - $a[self::FIELD_NET] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NET] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NET_EXT] = $enc; + } + } else { + $a[self::FIELD_NET] = $v; + } } if (null !== ($v = $this->getPoints())) { - $a[self::FIELD_POINTS] = $v->getValue(); - $a[self::FIELD_POINTS_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_POINTS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_POINTS_EXT] = $enc; + } + } else { + $a[self::FIELD_POINTS] = $v; + } } if (null !== ($v = $this->getQuantity())) { - $a[self::FIELD_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_QUANTITY] = $v; + } } if (null !== ($v = $this->getUnitPrice())) { - $a[self::FIELD_UNIT_PRICE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_UNIT_PRICE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_UNIT_PRICE_EXT] = $enc; + } + } else { + $a[self::FIELD_UNIT_PRICE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRCoverage/FHIRCoverageGrouping.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRCoverage/FHIRCoverageGrouping.php index f2370663b4..f545d8a40d 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRCoverage/FHIRCoverageGrouping.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRCoverage/FHIRCoverageGrouping.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRCoverageGrouping extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_COVERAGE_DOT_GROUPING; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CLASS = 'class'; const FIELD_CLASS_EXT = '_class'; const FIELD_CLASS_DISPLAY = 'classDisplay'; @@ -250,6 +246,9 @@ class FHIRCoverageGrouping extends FHIRBackboneElement */ protected $subPlanDisplay = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRCoverageGrouping Constructor * @param null|array $data @@ -272,8 +271,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CLASS] instanceof FHIRString) { $this->setClass($data[self::FIELD_CLASS]); - } elseif ($ext && is_scalar($data[self::FIELD_CLASS])) { - $this->setClass(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_CLASS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CLASS])) { + $this->setClass(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_CLASS]] + $ext)); + } else if (is_array($data[self::FIELD_CLASS])) { + $this->setClass(new FHIRString(array_merge($ext, $data[self::FIELD_CLASS]))); + } } else { $this->setClass(new FHIRString($data[self::FIELD_CLASS])); } @@ -284,8 +287,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CLASS_DISPLAY] instanceof FHIRString) { $this->setClassDisplay($data[self::FIELD_CLASS_DISPLAY]); - } elseif ($ext && is_scalar($data[self::FIELD_CLASS_DISPLAY])) { - $this->setClassDisplay(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_CLASS_DISPLAY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CLASS_DISPLAY])) { + $this->setClassDisplay(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_CLASS_DISPLAY]] + $ext)); + } else if (is_array($data[self::FIELD_CLASS_DISPLAY])) { + $this->setClassDisplay(new FHIRString(array_merge($ext, $data[self::FIELD_CLASS_DISPLAY]))); + } } else { $this->setClassDisplay(new FHIRString($data[self::FIELD_CLASS_DISPLAY])); } @@ -296,8 +303,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_GROUP] instanceof FHIRString) { $this->setGroup($data[self::FIELD_GROUP]); - } elseif ($ext && is_scalar($data[self::FIELD_GROUP])) { - $this->setGroup(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_GROUP]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_GROUP])) { + $this->setGroup(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_GROUP]] + $ext)); + } else if (is_array($data[self::FIELD_GROUP])) { + $this->setGroup(new FHIRString(array_merge($ext, $data[self::FIELD_GROUP]))); + } } else { $this->setGroup(new FHIRString($data[self::FIELD_GROUP])); } @@ -308,8 +319,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_GROUP_DISPLAY] instanceof FHIRString) { $this->setGroupDisplay($data[self::FIELD_GROUP_DISPLAY]); - } elseif ($ext && is_scalar($data[self::FIELD_GROUP_DISPLAY])) { - $this->setGroupDisplay(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_GROUP_DISPLAY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_GROUP_DISPLAY])) { + $this->setGroupDisplay(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_GROUP_DISPLAY]] + $ext)); + } else if (is_array($data[self::FIELD_GROUP_DISPLAY])) { + $this->setGroupDisplay(new FHIRString(array_merge($ext, $data[self::FIELD_GROUP_DISPLAY]))); + } } else { $this->setGroupDisplay(new FHIRString($data[self::FIELD_GROUP_DISPLAY])); } @@ -320,8 +335,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PLAN] instanceof FHIRString) { $this->setPlan($data[self::FIELD_PLAN]); - } elseif ($ext && is_scalar($data[self::FIELD_PLAN])) { - $this->setPlan(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PLAN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PLAN])) { + $this->setPlan(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PLAN]] + $ext)); + } else if (is_array($data[self::FIELD_PLAN])) { + $this->setPlan(new FHIRString(array_merge($ext, $data[self::FIELD_PLAN]))); + } } else { $this->setPlan(new FHIRString($data[self::FIELD_PLAN])); } @@ -332,8 +351,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PLAN_DISPLAY] instanceof FHIRString) { $this->setPlanDisplay($data[self::FIELD_PLAN_DISPLAY]); - } elseif ($ext && is_scalar($data[self::FIELD_PLAN_DISPLAY])) { - $this->setPlanDisplay(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PLAN_DISPLAY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PLAN_DISPLAY])) { + $this->setPlanDisplay(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PLAN_DISPLAY]] + $ext)); + } else if (is_array($data[self::FIELD_PLAN_DISPLAY])) { + $this->setPlanDisplay(new FHIRString(array_merge($ext, $data[self::FIELD_PLAN_DISPLAY]))); + } } else { $this->setPlanDisplay(new FHIRString($data[self::FIELD_PLAN_DISPLAY])); } @@ -344,8 +367,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SUB_CLASS] instanceof FHIRString) { $this->setSubClass($data[self::FIELD_SUB_CLASS]); - } elseif ($ext && is_scalar($data[self::FIELD_SUB_CLASS])) { - $this->setSubClass(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SUB_CLASS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SUB_CLASS])) { + $this->setSubClass(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SUB_CLASS]] + $ext)); + } else if (is_array($data[self::FIELD_SUB_CLASS])) { + $this->setSubClass(new FHIRString(array_merge($ext, $data[self::FIELD_SUB_CLASS]))); + } } else { $this->setSubClass(new FHIRString($data[self::FIELD_SUB_CLASS])); } @@ -356,8 +383,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SUB_CLASS_DISPLAY] instanceof FHIRString) { $this->setSubClassDisplay($data[self::FIELD_SUB_CLASS_DISPLAY]); - } elseif ($ext && is_scalar($data[self::FIELD_SUB_CLASS_DISPLAY])) { - $this->setSubClassDisplay(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SUB_CLASS_DISPLAY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SUB_CLASS_DISPLAY])) { + $this->setSubClassDisplay(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SUB_CLASS_DISPLAY]] + $ext)); + } else if (is_array($data[self::FIELD_SUB_CLASS_DISPLAY])) { + $this->setSubClassDisplay(new FHIRString(array_merge($ext, $data[self::FIELD_SUB_CLASS_DISPLAY]))); + } } else { $this->setSubClassDisplay(new FHIRString($data[self::FIELD_SUB_CLASS_DISPLAY])); } @@ -368,8 +399,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SUB_GROUP] instanceof FHIRString) { $this->setSubGroup($data[self::FIELD_SUB_GROUP]); - } elseif ($ext && is_scalar($data[self::FIELD_SUB_GROUP])) { - $this->setSubGroup(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SUB_GROUP]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SUB_GROUP])) { + $this->setSubGroup(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SUB_GROUP]] + $ext)); + } else if (is_array($data[self::FIELD_SUB_GROUP])) { + $this->setSubGroup(new FHIRString(array_merge($ext, $data[self::FIELD_SUB_GROUP]))); + } } else { $this->setSubGroup(new FHIRString($data[self::FIELD_SUB_GROUP])); } @@ -380,8 +415,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SUB_GROUP_DISPLAY] instanceof FHIRString) { $this->setSubGroupDisplay($data[self::FIELD_SUB_GROUP_DISPLAY]); - } elseif ($ext && is_scalar($data[self::FIELD_SUB_GROUP_DISPLAY])) { - $this->setSubGroupDisplay(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SUB_GROUP_DISPLAY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SUB_GROUP_DISPLAY])) { + $this->setSubGroupDisplay(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SUB_GROUP_DISPLAY]] + $ext)); + } else if (is_array($data[self::FIELD_SUB_GROUP_DISPLAY])) { + $this->setSubGroupDisplay(new FHIRString(array_merge($ext, $data[self::FIELD_SUB_GROUP_DISPLAY]))); + } } else { $this->setSubGroupDisplay(new FHIRString($data[self::FIELD_SUB_GROUP_DISPLAY])); } @@ -392,8 +431,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SUB_PLAN] instanceof FHIRString) { $this->setSubPlan($data[self::FIELD_SUB_PLAN]); - } elseif ($ext && is_scalar($data[self::FIELD_SUB_PLAN])) { - $this->setSubPlan(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SUB_PLAN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SUB_PLAN])) { + $this->setSubPlan(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SUB_PLAN]] + $ext)); + } else if (is_array($data[self::FIELD_SUB_PLAN])) { + $this->setSubPlan(new FHIRString(array_merge($ext, $data[self::FIELD_SUB_PLAN]))); + } } else { $this->setSubPlan(new FHIRString($data[self::FIELD_SUB_PLAN])); } @@ -404,8 +447,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SUB_PLAN_DISPLAY] instanceof FHIRString) { $this->setSubPlanDisplay($data[self::FIELD_SUB_PLAN_DISPLAY]); - } elseif ($ext && is_scalar($data[self::FIELD_SUB_PLAN_DISPLAY])) { - $this->setSubPlanDisplay(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SUB_PLAN_DISPLAY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SUB_PLAN_DISPLAY])) { + $this->setSubPlanDisplay(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SUB_PLAN_DISPLAY]] + $ext)); + } else if (is_array($data[self::FIELD_SUB_PLAN_DISPLAY])) { + $this->setSubPlanDisplay(new FHIRString(array_merge($ext, $data[self::FIELD_SUB_PLAN_DISPLAY]))); + } } else { $this->setSubPlanDisplay(new FHIRString($data[self::FIELD_SUB_PLAN_DISPLAY])); } @@ -1061,6 +1108,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getClass())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CLASS, null, $v->_getFHIRXMLNamespace())); } @@ -1107,52 +1155,136 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getClass())) { - $a[self::FIELD_CLASS] = $v->getValue(); - $a[self::FIELD_CLASS_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CLASS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CLASS_EXT] = $enc; + } + } else { + $a[self::FIELD_CLASS] = $v; + } } if (null !== ($v = $this->getClassDisplay())) { - $a[self::FIELD_CLASS_DISPLAY] = $v->getValue(); - $a[self::FIELD_CLASS_DISPLAY_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CLASS_DISPLAY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CLASS_DISPLAY_EXT] = $enc; + } + } else { + $a[self::FIELD_CLASS_DISPLAY] = $v; + } } if (null !== ($v = $this->getGroup())) { - $a[self::FIELD_GROUP] = $v->getValue(); - $a[self::FIELD_GROUP_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_GROUP] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_GROUP_EXT] = $enc; + } + } else { + $a[self::FIELD_GROUP] = $v; + } } if (null !== ($v = $this->getGroupDisplay())) { - $a[self::FIELD_GROUP_DISPLAY] = $v->getValue(); - $a[self::FIELD_GROUP_DISPLAY_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_GROUP_DISPLAY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_GROUP_DISPLAY_EXT] = $enc; + } + } else { + $a[self::FIELD_GROUP_DISPLAY] = $v; + } } if (null !== ($v = $this->getPlan())) { - $a[self::FIELD_PLAN] = $v->getValue(); - $a[self::FIELD_PLAN_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PLAN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PLAN_EXT] = $enc; + } + } else { + $a[self::FIELD_PLAN] = $v; + } } if (null !== ($v = $this->getPlanDisplay())) { - $a[self::FIELD_PLAN_DISPLAY] = $v->getValue(); - $a[self::FIELD_PLAN_DISPLAY_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PLAN_DISPLAY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PLAN_DISPLAY_EXT] = $enc; + } + } else { + $a[self::FIELD_PLAN_DISPLAY] = $v; + } } if (null !== ($v = $this->getSubClass())) { - $a[self::FIELD_SUB_CLASS] = $v->getValue(); - $a[self::FIELD_SUB_CLASS_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SUB_CLASS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SUB_CLASS_EXT] = $enc; + } + } else { + $a[self::FIELD_SUB_CLASS] = $v; + } } if (null !== ($v = $this->getSubClassDisplay())) { - $a[self::FIELD_SUB_CLASS_DISPLAY] = $v->getValue(); - $a[self::FIELD_SUB_CLASS_DISPLAY_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SUB_CLASS_DISPLAY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SUB_CLASS_DISPLAY_EXT] = $enc; + } + } else { + $a[self::FIELD_SUB_CLASS_DISPLAY] = $v; + } } if (null !== ($v = $this->getSubGroup())) { - $a[self::FIELD_SUB_GROUP] = $v->getValue(); - $a[self::FIELD_SUB_GROUP_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SUB_GROUP] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SUB_GROUP_EXT] = $enc; + } + } else { + $a[self::FIELD_SUB_GROUP] = $v; + } } if (null !== ($v = $this->getSubGroupDisplay())) { - $a[self::FIELD_SUB_GROUP_DISPLAY] = $v->getValue(); - $a[self::FIELD_SUB_GROUP_DISPLAY_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SUB_GROUP_DISPLAY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SUB_GROUP_DISPLAY_EXT] = $enc; + } + } else { + $a[self::FIELD_SUB_GROUP_DISPLAY] = $v; + } } if (null !== ($v = $this->getSubPlan())) { - $a[self::FIELD_SUB_PLAN] = $v->getValue(); - $a[self::FIELD_SUB_PLAN_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SUB_PLAN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SUB_PLAN_EXT] = $enc; + } + } else { + $a[self::FIELD_SUB_PLAN] = $v; + } } if (null !== ($v = $this->getSubPlanDisplay())) { - $a[self::FIELD_SUB_PLAN_DISPLAY] = $v->getValue(); - $a[self::FIELD_SUB_PLAN_DISPLAY_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SUB_PLAN_DISPLAY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SUB_PLAN_DISPLAY_EXT] = $enc; + } + } else { + $a[self::FIELD_SUB_PLAN_DISPLAY] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRDataElement/FHIRDataElementMapping.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRDataElement/FHIRDataElementMapping.php index 5c877a7156..839299266c 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRDataElement/FHIRDataElementMapping.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRDataElement/FHIRDataElementMapping.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRDataElementMapping extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DATA_ELEMENT_DOT_MAPPING; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_COMMENT = 'comment'; const FIELD_COMMENT_EXT = '_comment'; const FIELD_IDENTITY = 'identity'; @@ -143,6 +139,9 @@ class FHIRDataElementMapping extends FHIRBackboneElement */ protected $uri = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRDataElementMapping Constructor * @param null|array $data @@ -165,8 +164,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_COMMENT] instanceof FHIRString) { $this->setComment($data[self::FIELD_COMMENT]); - } elseif ($ext && is_scalar($data[self::FIELD_COMMENT])) { - $this->setComment(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_COMMENT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_COMMENT])) { + $this->setComment(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_COMMENT]] + $ext)); + } else if (is_array($data[self::FIELD_COMMENT])) { + $this->setComment(new FHIRString(array_merge($ext, $data[self::FIELD_COMMENT]))); + } } else { $this->setComment(new FHIRString($data[self::FIELD_COMMENT])); } @@ -177,8 +180,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IDENTITY] instanceof FHIRId) { $this->setIdentity($data[self::FIELD_IDENTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTITY])) { - $this->setIdentity(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_IDENTITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IDENTITY])) { + $this->setIdentity(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_IDENTITY]] + $ext)); + } else if (is_array($data[self::FIELD_IDENTITY])) { + $this->setIdentity(new FHIRId(array_merge($ext, $data[self::FIELD_IDENTITY]))); + } } else { $this->setIdentity(new FHIRId($data[self::FIELD_IDENTITY])); } @@ -189,8 +196,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -201,8 +212,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_URI] instanceof FHIRUri) { $this->setUri($data[self::FIELD_URI]); - } elseif ($ext && is_scalar($data[self::FIELD_URI])) { - $this->setUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URI]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_URI])) { + $this->setUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URI]] + $ext)); + } else if (is_array($data[self::FIELD_URI])) { + $this->setUri(new FHIRUri(array_merge($ext, $data[self::FIELD_URI]))); + } } else { $this->setUri(new FHIRUri($data[self::FIELD_URI])); } @@ -496,6 +511,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getComment())) { $v->xmlSerialize($sxe->addChild(self::FIELD_COMMENT, null, $v->_getFHIRXMLNamespace())); } @@ -518,20 +534,48 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getComment())) { - $a[self::FIELD_COMMENT] = $v->getValue(); - $a[self::FIELD_COMMENT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_COMMENT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_COMMENT_EXT] = $enc; + } + } else { + $a[self::FIELD_COMMENT] = $v; + } } if (null !== ($v = $this->getIdentity())) { - $a[self::FIELD_IDENTITY] = $v->getValue(); - $a[self::FIELD_IDENTITY_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_IDENTITY] = $v; + } } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if (null !== ($v = $this->getUri())) { - $a[self::FIELD_URI] = $v->getValue(); - $a[self::FIELD_URI_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_URI] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_URI_EXT] = $enc; + } + } else { + $a[self::FIELD_URI] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRDetectedIssue/FHIRDetectedIssueMitigation.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRDetectedIssue/FHIRDetectedIssueMitigation.php index df04b21d59..199103cc80 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRDetectedIssue/FHIRDetectedIssueMitigation.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRDetectedIssue/FHIRDetectedIssueMitigation.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -81,10 +81,6 @@ class FHIRDetectedIssueMitigation extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DETECTED_ISSUE_DOT_MITIGATION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ACTION = 'action'; const FIELD_AUTHOR = 'author'; const FIELD_DATE = 'date'; @@ -129,6 +125,9 @@ class FHIRDetectedIssueMitigation extends FHIRBackboneElement */ protected $date = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRDetectedIssueMitigation Constructor * @param null|array $data @@ -165,8 +164,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATE] instanceof FHIRDateTime) { $this->setDate($data[self::FIELD_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_DATE])) { - $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime(array_merge($ext, $data[self::FIELD_DATE]))); + } } else { $this->setDate(new FHIRDateTime($data[self::FIELD_DATE])); } @@ -398,7 +401,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getAction())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ACTION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getAuthor())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AUTHOR, null, $v->_getFHIRXMLNamespace())); } @@ -421,8 +423,15 @@ public function jsonSerialize() $a[self::FIELD_AUTHOR] = $v; } if (null !== ($v = $this->getDate())) { - $a[self::FIELD_DATE] = $v->getValue(); - $a[self::FIELD_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_DATE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRDevice/FHIRDeviceUdi.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRDevice/FHIRDeviceUdi.php index 383c235e67..cf00539a89 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRDevice/FHIRDeviceUdi.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRDevice/FHIRDeviceUdi.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -86,10 +86,6 @@ class FHIRDeviceUdi extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DEVICE_DOT_UDI; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CARRIER_AIDC = 'carrierAIDC'; const FIELD_CARRIER_AIDC_EXT = '_carrierAIDC'; const FIELD_CARRIER_HRF = 'carrierHRF'; @@ -194,6 +190,9 @@ class FHIRDeviceUdi extends FHIRBackboneElement */ protected $name = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRDeviceUdi Constructor * @param null|array $data @@ -216,8 +215,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CARRIER_AIDC] instanceof FHIRBase64Binary) { $this->setCarrierAIDC($data[self::FIELD_CARRIER_AIDC]); - } elseif ($ext && is_scalar($data[self::FIELD_CARRIER_AIDC])) { - $this->setCarrierAIDC(new FHIRBase64Binary([FHIRBase64Binary::FIELD_VALUE => $data[self::FIELD_CARRIER_AIDC]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CARRIER_AIDC])) { + $this->setCarrierAIDC(new FHIRBase64Binary([FHIRBase64Binary::FIELD_VALUE => $data[self::FIELD_CARRIER_AIDC]] + $ext)); + } else if (is_array($data[self::FIELD_CARRIER_AIDC])) { + $this->setCarrierAIDC(new FHIRBase64Binary(array_merge($ext, $data[self::FIELD_CARRIER_AIDC]))); + } } else { $this->setCarrierAIDC(new FHIRBase64Binary($data[self::FIELD_CARRIER_AIDC])); } @@ -228,8 +231,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CARRIER_HRF] instanceof FHIRString) { $this->setCarrierHRF($data[self::FIELD_CARRIER_HRF]); - } elseif ($ext && is_scalar($data[self::FIELD_CARRIER_HRF])) { - $this->setCarrierHRF(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_CARRIER_HRF]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CARRIER_HRF])) { + $this->setCarrierHRF(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_CARRIER_HRF]] + $ext)); + } else if (is_array($data[self::FIELD_CARRIER_HRF])) { + $this->setCarrierHRF(new FHIRString(array_merge($ext, $data[self::FIELD_CARRIER_HRF]))); + } } else { $this->setCarrierHRF(new FHIRString($data[self::FIELD_CARRIER_HRF])); } @@ -240,8 +247,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DEVICE_IDENTIFIER] instanceof FHIRString) { $this->setDeviceIdentifier($data[self::FIELD_DEVICE_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_DEVICE_IDENTIFIER])) { - $this->setDeviceIdentifier(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DEVICE_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DEVICE_IDENTIFIER])) { + $this->setDeviceIdentifier(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DEVICE_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_DEVICE_IDENTIFIER])) { + $this->setDeviceIdentifier(new FHIRString(array_merge($ext, $data[self::FIELD_DEVICE_IDENTIFIER]))); + } } else { $this->setDeviceIdentifier(new FHIRString($data[self::FIELD_DEVICE_IDENTIFIER])); } @@ -252,8 +263,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ENTRY_TYPE] instanceof FHIRUDIEntryType) { $this->setEntryType($data[self::FIELD_ENTRY_TYPE]); - } elseif ($ext && is_scalar($data[self::FIELD_ENTRY_TYPE])) { - $this->setEntryType(new FHIRUDIEntryType([FHIRUDIEntryType::FIELD_VALUE => $data[self::FIELD_ENTRY_TYPE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ENTRY_TYPE])) { + $this->setEntryType(new FHIRUDIEntryType([FHIRUDIEntryType::FIELD_VALUE => $data[self::FIELD_ENTRY_TYPE]] + $ext)); + } else if (is_array($data[self::FIELD_ENTRY_TYPE])) { + $this->setEntryType(new FHIRUDIEntryType(array_merge($ext, $data[self::FIELD_ENTRY_TYPE]))); + } } else { $this->setEntryType(new FHIRUDIEntryType($data[self::FIELD_ENTRY_TYPE])); } @@ -264,8 +279,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ISSUER] instanceof FHIRUri) { $this->setIssuer($data[self::FIELD_ISSUER]); - } elseif ($ext && is_scalar($data[self::FIELD_ISSUER])) { - $this->setIssuer(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_ISSUER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ISSUER])) { + $this->setIssuer(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_ISSUER]] + $ext)); + } else if (is_array($data[self::FIELD_ISSUER])) { + $this->setIssuer(new FHIRUri(array_merge($ext, $data[self::FIELD_ISSUER]))); + } } else { $this->setIssuer(new FHIRUri($data[self::FIELD_ISSUER])); } @@ -276,8 +295,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_JURISDICTION] instanceof FHIRUri) { $this->setJurisdiction($data[self::FIELD_JURISDICTION]); - } elseif ($ext && is_scalar($data[self::FIELD_JURISDICTION])) { - $this->setJurisdiction(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_JURISDICTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_JURISDICTION])) { + $this->setJurisdiction(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_JURISDICTION]] + $ext)); + } else if (is_array($data[self::FIELD_JURISDICTION])) { + $this->setJurisdiction(new FHIRUri(array_merge($ext, $data[self::FIELD_JURISDICTION]))); + } } else { $this->setJurisdiction(new FHIRUri($data[self::FIELD_JURISDICTION])); } @@ -288,8 +311,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -716,6 +743,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getCarrierAIDC())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CARRIER_AIDC, null, $v->_getFHIRXMLNamespace())); } @@ -725,7 +753,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDeviceIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEVICE_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getEntryType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ENTRY_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -748,31 +775,81 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getCarrierAIDC())) { - $a[self::FIELD_CARRIER_AIDC] = $v->getValue(); - $a[self::FIELD_CARRIER_AIDC_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CARRIER_AIDC] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CARRIER_AIDC_EXT] = $enc; + } + } else { + $a[self::FIELD_CARRIER_AIDC] = $v; + } } if (null !== ($v = $this->getCarrierHRF())) { - $a[self::FIELD_CARRIER_HRF] = $v->getValue(); - $a[self::FIELD_CARRIER_HRF_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CARRIER_HRF] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CARRIER_HRF_EXT] = $enc; + } + } else { + $a[self::FIELD_CARRIER_HRF] = $v; + } } if (null !== ($v = $this->getDeviceIdentifier())) { - $a[self::FIELD_DEVICE_IDENTIFIER] = $v->getValue(); - $a[self::FIELD_DEVICE_IDENTIFIER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DEVICE_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DEVICE_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_DEVICE_IDENTIFIER] = $v; + } } if (null !== ($v = $this->getEntryType())) { - $a[self::FIELD_ENTRY_TYPE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ENTRY_TYPE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ENTRY_TYPE_EXT] = $enc; + } + } else { + $a[self::FIELD_ENTRY_TYPE] = $v; + } } if (null !== ($v = $this->getIssuer())) { - $a[self::FIELD_ISSUER] = $v->getValue(); - $a[self::FIELD_ISSUER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ISSUER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ISSUER_EXT] = $enc; + } + } else { + $a[self::FIELD_ISSUER] = $v; + } } if (null !== ($v = $this->getJurisdiction())) { - $a[self::FIELD_JURISDICTION] = $v->getValue(); - $a[self::FIELD_JURISDICTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_JURISDICTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_JURISDICTION_EXT] = $enc; + } + } else { + $a[self::FIELD_JURISDICTION] = $v; + } } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRDeviceComponent/FHIRDeviceComponentProductionSpecification.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRDeviceComponent/FHIRDeviceComponentProductionSpecification.php index 75660a8f38..c0092dc7e6 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRDeviceComponent/FHIRDeviceComponentProductionSpecification.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRDeviceComponent/FHIRDeviceComponentProductionSpecification.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRDeviceComponentProductionSpecification extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DEVICE_COMPONENT_DOT_PRODUCTION_SPECIFICATION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_COMPONENT_ID = 'componentId'; const FIELD_COMPONENT_ID_EXT = '_componentId'; const FIELD_PRODUCTION_SPEC = 'productionSpec'; @@ -127,6 +123,9 @@ class FHIRDeviceComponentProductionSpecification extends FHIRBackboneElement */ protected $specType = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRDeviceComponentProductionSpecification Constructor * @param null|array $data @@ -149,8 +148,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_COMPONENT_ID] instanceof FHIRIdentifier) { $this->setComponentId($data[self::FIELD_COMPONENT_ID]); - } elseif ($ext && is_scalar($data[self::FIELD_COMPONENT_ID])) { - $this->setComponentId(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_COMPONENT_ID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_COMPONENT_ID])) { + $this->setComponentId(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_COMPONENT_ID]] + $ext)); + } else if (is_array($data[self::FIELD_COMPONENT_ID])) { + $this->setComponentId(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_COMPONENT_ID]))); + } } else { $this->setComponentId(new FHIRIdentifier($data[self::FIELD_COMPONENT_ID])); } @@ -161,8 +164,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PRODUCTION_SPEC] instanceof FHIRString) { $this->setProductionSpec($data[self::FIELD_PRODUCTION_SPEC]); - } elseif ($ext && is_scalar($data[self::FIELD_PRODUCTION_SPEC])) { - $this->setProductionSpec(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PRODUCTION_SPEC]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PRODUCTION_SPEC])) { + $this->setProductionSpec(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PRODUCTION_SPEC]] + $ext)); + } else if (is_array($data[self::FIELD_PRODUCTION_SPEC])) { + $this->setProductionSpec(new FHIRString(array_merge($ext, $data[self::FIELD_PRODUCTION_SPEC]))); + } } else { $this->setProductionSpec(new FHIRString($data[self::FIELD_PRODUCTION_SPEC])); } @@ -400,7 +407,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getProductionSpec())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PRODUCTION_SPEC, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSpecType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SPEC_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -414,11 +420,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getComponentId())) { - $a[self::FIELD_COMPONENT_ID] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_COMPONENT_ID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_COMPONENT_ID_EXT] = $enc; + } + } else { + $a[self::FIELD_COMPONENT_ID] = $v; + } } if (null !== ($v = $this->getProductionSpec())) { - $a[self::FIELD_PRODUCTION_SPEC] = $v->getValue(); - $a[self::FIELD_PRODUCTION_SPEC_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PRODUCTION_SPEC] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PRODUCTION_SPEC_EXT] = $enc; + } + } else { + $a[self::FIELD_PRODUCTION_SPEC] = $v; + } } if (null !== ($v = $this->getSpecType())) { $a[self::FIELD_SPEC_TYPE] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRDeviceMetric/FHIRDeviceMetricCalibration.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRDeviceMetric/FHIRDeviceMetricCalibration.php index a7a0debdd7..b2059a72d2 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRDeviceMetric/FHIRDeviceMetricCalibration.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRDeviceMetric/FHIRDeviceMetricCalibration.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRDeviceMetricCalibration extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DEVICE_METRIC_DOT_CALIBRATION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_STATE = 'state'; const FIELD_STATE_EXT = '_state'; const FIELD_TIME = 'time'; @@ -123,6 +119,9 @@ class FHIRDeviceMetricCalibration extends FHIRBackboneElement */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRDeviceMetricCalibration Constructor * @param null|array $data @@ -145,8 +144,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATE] instanceof FHIRDeviceMetricCalibrationState) { $this->setState($data[self::FIELD_STATE]); - } elseif ($ext && is_scalar($data[self::FIELD_STATE])) { - $this->setState(new FHIRDeviceMetricCalibrationState([FHIRDeviceMetricCalibrationState::FIELD_VALUE => $data[self::FIELD_STATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATE])) { + $this->setState(new FHIRDeviceMetricCalibrationState([FHIRDeviceMetricCalibrationState::FIELD_VALUE => $data[self::FIELD_STATE]] + $ext)); + } else if (is_array($data[self::FIELD_STATE])) { + $this->setState(new FHIRDeviceMetricCalibrationState(array_merge($ext, $data[self::FIELD_STATE]))); + } } else { $this->setState(new FHIRDeviceMetricCalibrationState($data[self::FIELD_STATE])); } @@ -157,8 +160,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TIME] instanceof FHIRInstant) { $this->setTime($data[self::FIELD_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_TIME])) { - $this->setTime(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TIME])) { + $this->setTime(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_TIME])) { + $this->setTime(new FHIRInstant(array_merge($ext, $data[self::FIELD_TIME]))); + } } else { $this->setTime(new FHIRInstant($data[self::FIELD_TIME])); } @@ -169,8 +176,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TYPE] instanceof FHIRDeviceMetricCalibrationType) { $this->setType($data[self::FIELD_TYPE]); - } elseif ($ext && is_scalar($data[self::FIELD_TYPE])) { - $this->setType(new FHIRDeviceMetricCalibrationType([FHIRDeviceMetricCalibrationType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TYPE])) { + $this->setType(new FHIRDeviceMetricCalibrationType([FHIRDeviceMetricCalibrationType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } else if (is_array($data[self::FIELD_TYPE])) { + $this->setType(new FHIRDeviceMetricCalibrationType(array_merge($ext, $data[self::FIELD_TYPE]))); + } } else { $this->setType(new FHIRDeviceMetricCalibrationType($data[self::FIELD_TYPE])); } @@ -393,7 +404,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getTime())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TIME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -407,14 +417,37 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getState())) { - $a[self::FIELD_STATE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATE_EXT] = $enc; + } + } else { + $a[self::FIELD_STATE] = $v; + } } if (null !== ($v = $this->getTime())) { - $a[self::FIELD_TIME] = $v->getValue(); - $a[self::FIELD_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_TIME] = $v; + } } if (null !== ($v = $this->getType())) { - $a[self::FIELD_TYPE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TYPE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TYPE_EXT] = $enc; + } + } else { + $a[self::FIELD_TYPE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRDeviceRequest/FHIRDeviceRequestRequester.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRDeviceRequest/FHIRDeviceRequestRequester.php index 345e1f2bf7..3b674d72bd 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRDeviceRequest/FHIRDeviceRequestRequester.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRDeviceRequest/FHIRDeviceRequestRequester.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRDeviceRequestRequester extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DEVICE_REQUEST_DOT_REQUESTER; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_AGENT = 'agent'; const FIELD_ON_BEHALF_OF = 'onBehalfOf'; @@ -107,6 +103,9 @@ class FHIRDeviceRequestRequester extends FHIRBackboneElement */ protected $onBehalfOf = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRDeviceRequestRequester Constructor * @param null|array $data @@ -308,7 +307,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getAgent())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AGENT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOnBehalfOf())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ON_BEHALF_OF, null, $v->_getFHIRXMLNamespace())); } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRDiagnosticReport/FHIRDiagnosticReportImage.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRDiagnosticReport/FHIRDiagnosticReportImage.php index 70e9cb4d24..65164d14d5 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRDiagnosticReport/FHIRDiagnosticReportImage.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRDiagnosticReport/FHIRDiagnosticReportImage.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -82,10 +82,6 @@ class FHIRDiagnosticReportImage extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DIAGNOSTIC_REPORT_DOT_IMAGE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_COMMENT = 'comment'; const FIELD_COMMENT_EXT = '_comment'; const FIELD_LINK = 'link'; @@ -114,6 +110,9 @@ class FHIRDiagnosticReportImage extends FHIRBackboneElement */ protected $link = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRDiagnosticReportImage Constructor * @param null|array $data @@ -136,8 +135,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_COMMENT] instanceof FHIRString) { $this->setComment($data[self::FIELD_COMMENT]); - } elseif ($ext && is_scalar($data[self::FIELD_COMMENT])) { - $this->setComment(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_COMMENT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_COMMENT])) { + $this->setComment(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_COMMENT]] + $ext)); + } else if (is_array($data[self::FIELD_COMMENT])) { + $this->setComment(new FHIRString(array_merge($ext, $data[self::FIELD_COMMENT]))); + } } else { $this->setComment(new FHIRString($data[self::FIELD_COMMENT])); } @@ -331,10 +334,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getComment())) { $v->xmlSerialize($sxe->addChild(self::FIELD_COMMENT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getLink())) { $v->xmlSerialize($sxe->addChild(self::FIELD_LINK, null, $v->_getFHIRXMLNamespace())); } @@ -348,8 +351,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getComment())) { - $a[self::FIELD_COMMENT] = $v->getValue(); - $a[self::FIELD_COMMENT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_COMMENT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_COMMENT_EXT] = $enc; + } + } else { + $a[self::FIELD_COMMENT] = $v; + } } if (null !== ($v = $this->getLink())) { $a[self::FIELD_LINK] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRDiagnosticReport/FHIRDiagnosticReportPerformer.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRDiagnosticReport/FHIRDiagnosticReportPerformer.php index 7d9e3e6211..8527339783 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRDiagnosticReport/FHIRDiagnosticReportPerformer.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRDiagnosticReport/FHIRDiagnosticReportPerformer.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -82,10 +82,6 @@ class FHIRDiagnosticReportPerformer extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DIAGNOSTIC_REPORT_DOT_PERFORMER; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ACTOR = 'actor'; const FIELD_ROLE = 'role'; @@ -115,6 +111,9 @@ class FHIRDiagnosticReportPerformer extends FHIRBackboneElement */ protected $role = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRDiagnosticReportPerformer Constructor * @param null|array $data @@ -324,7 +323,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getActor())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ACTOR, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRole())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ROLE, null, $v->_getFHIRXMLNamespace())); } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRDocumentManifest/FHIRDocumentManifestContent.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRDocumentManifest/FHIRDocumentManifestContent.php index 3130e918c4..5b0e5a2a36 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRDocumentManifest/FHIRDocumentManifestContent.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRDocumentManifest/FHIRDocumentManifestContent.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRDocumentManifestContent extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DOCUMENT_MANIFEST_DOT_CONTENT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_P_ATTACHMENT = 'pAttachment'; const FIELD_P_REFERENCE = 'pReference'; @@ -112,6 +108,9 @@ class FHIRDocumentManifestContent extends FHIRBackboneElement */ protected $pReference = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRDocumentManifestContent Constructor * @param null|array $data @@ -321,7 +320,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getPAttachment())) { $v->xmlSerialize($sxe->addChild(self::FIELD_P_ATTACHMENT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_P_REFERENCE, null, $v->_getFHIRXMLNamespace())); } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRDocumentManifest/FHIRDocumentManifestRelated.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRDocumentManifest/FHIRDocumentManifestRelated.php index eb4625fe1c..130e0df4ef 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRDocumentManifest/FHIRDocumentManifestRelated.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRDocumentManifest/FHIRDocumentManifestRelated.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRDocumentManifestRelated extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DOCUMENT_MANIFEST_DOT_RELATED; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_IDENTIFIER = 'identifier'; const FIELD_IDENTIFIER_EXT = '_identifier'; const FIELD_REF = 'ref'; @@ -111,6 +107,9 @@ class FHIRDocumentManifestRelated extends FHIRBackboneElement */ protected $ref = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRDocumentManifestRelated Constructor * @param null|array $data @@ -133,8 +132,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->setIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { - $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_IDENTIFIER]))); + } } else { $this->setIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); } @@ -321,7 +324,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRef())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REF, null, $v->_getFHIRXMLNamespace())); } @@ -335,7 +337,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_IDENTIFIER] = $v; + } } if (null !== ($v = $this->getRef())) { $a[self::FIELD_REF] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRDocumentReference/FHIRDocumentReferenceContent.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRDocumentReference/FHIRDocumentReferenceContent.php index 46c28f6df8..af7ef46446 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRDocumentReference/FHIRDocumentReferenceContent.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRDocumentReference/FHIRDocumentReferenceContent.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRDocumentReferenceContent extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DOCUMENT_REFERENCE_DOT_CONTENT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ATTACHMENT = 'attachment'; const FIELD_FORMAT = 'format'; @@ -109,6 +105,9 @@ class FHIRDocumentReferenceContent extends FHIRBackboneElement */ protected $format = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRDocumentReferenceContent Constructor * @param null|array $data @@ -314,7 +313,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getAttachment())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ATTACHMENT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getFormat())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FORMAT, null, $v->_getFHIRXMLNamespace())); } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRDocumentReference/FHIRDocumentReferenceContext.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRDocumentReference/FHIRDocumentReferenceContext.php index 79618ba5fc..ba004f39ed 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRDocumentReference/FHIRDocumentReferenceContext.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRDocumentReference/FHIRDocumentReferenceContext.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRDocumentReferenceContext extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DOCUMENT_REFERENCE_DOT_CONTEXT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ENCOUNTER = 'encounter'; const FIELD_EVENT = 'event'; const FIELD_FACILITY_TYPE = 'facilityType'; @@ -176,6 +172,9 @@ class FHIRDocumentReferenceContext extends FHIRBackboneElement */ protected $sourcePatientInfo = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRDocumentReferenceContext Constructor * @param null|array $data @@ -202,6 +201,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_EVENT])) { if (is_array($data[self::FIELD_EVENT])) { foreach($data[self::FIELD_EVENT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addEvent($v); } else { @@ -238,6 +240,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_RELATED])) { if (is_array($data[self::FIELD_RELATED])) { foreach($data[self::FIELD_RELATED] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRDocumentReferenceRelated) { $this->addRelated($v); } else { @@ -667,7 +672,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getEncounter())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ENCOUNTER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getEvent())) { foreach($vs as $v) { if (null === $v) { @@ -676,19 +680,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_EVENT, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getFacilityType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FACILITY_TYPE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPracticeSetting())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PRACTICE_SETTING, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getRelated())) { foreach($vs as $v) { if (null === $v) { @@ -697,7 +697,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_RELATED, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getSourcePatientInfo())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SOURCE_PATIENT_INFO, null, $v->_getFHIRXMLNamespace())); } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRDocumentReference/FHIRDocumentReferenceRelated.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRDocumentReference/FHIRDocumentReferenceRelated.php index 9b794b07c9..7ad90548da 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRDocumentReference/FHIRDocumentReferenceRelated.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRDocumentReference/FHIRDocumentReferenceRelated.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRDocumentReferenceRelated extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DOCUMENT_REFERENCE_DOT_RELATED; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_IDENTIFIER = 'identifier'; const FIELD_IDENTIFIER_EXT = '_identifier'; const FIELD_REF = 'ref'; @@ -110,6 +106,9 @@ class FHIRDocumentReferenceRelated extends FHIRBackboneElement */ protected $ref = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRDocumentReferenceRelated Constructor * @param null|array $data @@ -132,8 +131,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->setIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { - $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_IDENTIFIER]))); + } } else { $this->setIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); } @@ -320,7 +323,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRef())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REF, null, $v->_getFHIRXMLNamespace())); } @@ -334,7 +336,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_IDENTIFIER] = $v; + } } if (null !== ($v = $this->getRef())) { $a[self::FIELD_REF] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRDocumentReference/FHIRDocumentReferenceRelatesTo.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRDocumentReference/FHIRDocumentReferenceRelatesTo.php index 63c4a315b3..00ee2a401a 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRDocumentReference/FHIRDocumentReferenceRelatesTo.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRDocumentReference/FHIRDocumentReferenceRelatesTo.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRDocumentReferenceRelatesTo extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DOCUMENT_REFERENCE_DOT_RELATES_TO; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CODE = 'code'; const FIELD_CODE_EXT = '_code'; const FIELD_TARGET = 'target'; @@ -107,6 +103,9 @@ class FHIRDocumentReferenceRelatesTo extends FHIRBackboneElement */ protected $target = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRDocumentReferenceRelatesTo Constructor * @param null|array $data @@ -129,8 +128,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CODE] instanceof FHIRDocumentRelationshipType) { $this->setCode($data[self::FIELD_CODE]); - } elseif ($ext && is_scalar($data[self::FIELD_CODE])) { - $this->setCode(new FHIRDocumentRelationshipType([FHIRDocumentRelationshipType::FIELD_VALUE => $data[self::FIELD_CODE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CODE])) { + $this->setCode(new FHIRDocumentRelationshipType([FHIRDocumentRelationshipType::FIELD_VALUE => $data[self::FIELD_CODE]] + $ext)); + } else if (is_array($data[self::FIELD_CODE])) { + $this->setCode(new FHIRDocumentRelationshipType(array_merge($ext, $data[self::FIELD_CODE]))); + } } else { $this->setCode(new FHIRDocumentRelationshipType($data[self::FIELD_CODE])); } @@ -311,7 +314,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getTarget())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TARGET, null, $v->_getFHIRXMLNamespace())); } @@ -325,7 +327,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getCode())) { - $a[self::FIELD_CODE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CODE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CODE_EXT] = $enc; + } + } else { + $a[self::FIELD_CODE] = $v; + } } if (null !== ($v = $this->getTarget())) { $a[self::FIELD_TARGET] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIREligibilityResponse/FHIREligibilityResponseBenefitBalance.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIREligibilityResponse/FHIREligibilityResponseBenefitBalance.php index efacecbd8e..98242402eb 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIREligibilityResponse/FHIREligibilityResponseBenefitBalance.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIREligibilityResponse/FHIREligibilityResponseBenefitBalance.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIREligibilityResponseBenefitBalance extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ELIGIBILITY_RESPONSE_DOT_BENEFIT_BALANCE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CATEGORY = 'category'; const FIELD_DESCRIPTION = 'description'; const FIELD_DESCRIPTION_EXT = '_description'; @@ -202,6 +198,9 @@ class FHIREligibilityResponseBenefitBalance extends FHIRBackboneElement */ protected $unit = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIREligibilityResponseBenefitBalance Constructor * @param null|array $data @@ -231,8 +230,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -243,8 +246,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EXCLUDED] instanceof FHIRBoolean) { $this->setExcluded($data[self::FIELD_EXCLUDED]); - } elseif ($ext && is_scalar($data[self::FIELD_EXCLUDED])) { - $this->setExcluded(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_EXCLUDED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EXCLUDED])) { + $this->setExcluded(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_EXCLUDED]] + $ext)); + } else if (is_array($data[self::FIELD_EXCLUDED])) { + $this->setExcluded(new FHIRBoolean(array_merge($ext, $data[self::FIELD_EXCLUDED]))); + } } else { $this->setExcluded(new FHIRBoolean($data[self::FIELD_EXCLUDED])); } @@ -252,6 +259,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_FINANCIAL])) { if (is_array($data[self::FIELD_FINANCIAL])) { foreach($data[self::FIELD_FINANCIAL] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIREligibilityResponseFinancial) { $this->addFinancial($v); } else { @@ -270,8 +280,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -784,7 +798,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getExcluded())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EXCLUDED, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getFinancial())) { foreach($vs as $v) { if (null === $v) { @@ -796,19 +809,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NAME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getNetwork())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NETWORK, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSubCategory())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUB_CATEGORY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getTerm())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TERM, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getUnit())) { $v->xmlSerialize($sxe->addChild(self::FIELD_UNIT, null, $v->_getFHIRXMLNamespace())); } @@ -825,19 +834,40 @@ public function jsonSerialize() $a[self::FIELD_CATEGORY] = $v; } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if (null !== ($v = $this->getExcluded())) { - $a[self::FIELD_EXCLUDED] = $v->getValue(); - $a[self::FIELD_EXCLUDED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EXCLUDED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EXCLUDED_EXT] = $enc; + } + } else { + $a[self::FIELD_EXCLUDED] = $v; + } } if ([] !== ($vs = $this->getFinancial())) { $a[self::FIELD_FINANCIAL] = $vs; } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if (null !== ($v = $this->getNetwork())) { $a[self::FIELD_NETWORK] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIREligibilityResponse/FHIREligibilityResponseError.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIREligibilityResponse/FHIREligibilityResponseError.php index 89f74535af..8ebff55ccc 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIREligibilityResponse/FHIREligibilityResponseError.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIREligibilityResponse/FHIREligibilityResponseError.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIREligibilityResponseError extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ELIGIBILITY_RESPONSE_DOT_ERROR; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CODE = 'code'; /** @@ -97,6 +93,9 @@ class FHIREligibilityResponseError extends FHIRBackboneElement */ protected $code = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIREligibilityResponseError Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIREligibilityResponse/FHIREligibilityResponseFinancial.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIREligibilityResponse/FHIREligibilityResponseFinancial.php index 460cf20821..5f57990dac 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIREligibilityResponse/FHIREligibilityResponseFinancial.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIREligibilityResponse/FHIREligibilityResponseFinancial.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -81,17 +81,15 @@ class FHIREligibilityResponseFinancial extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ELIGIBILITY_RESPONSE_DOT_FINANCIAL; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ALLOWED_MONEY = 'allowedMoney'; + const FIELD_ALLOWED_MONEY_EXT = '_allowedMoney'; const FIELD_ALLOWED_STRING = 'allowedString'; const FIELD_ALLOWED_STRING_EXT = '_allowedString'; const FIELD_ALLOWED_UNSIGNED_INT = 'allowedUnsignedInt'; const FIELD_ALLOWED_UNSIGNED_INT_EXT = '_allowedUnsignedInt'; const FIELD_TYPE = 'type'; const FIELD_USED_MONEY = 'usedMoney'; + const FIELD_USED_MONEY_EXT = '_usedMoney'; const FIELD_USED_UNSIGNED_INT = 'usedUnsignedInt'; const FIELD_USED_UNSIGNED_INT_EXT = '_usedUnsignedInt'; @@ -162,6 +160,9 @@ class FHIREligibilityResponseFinancial extends FHIRBackboneElement */ protected $usedUnsignedInt = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIREligibilityResponseFinancial Constructor * @param null|array $data @@ -179,8 +180,17 @@ public function __construct($data = null) } parent::__construct($data); if (isset($data[self::FIELD_ALLOWED_MONEY])) { + $ext = (isset($data[self::FIELD_ALLOWED_MONEY_EXT]) && is_array($data[self::FIELD_ALLOWED_MONEY_EXT])) + ? $data[self::FIELD_ALLOWED_MONEY_EXT] + : null; if ($data[self::FIELD_ALLOWED_MONEY] instanceof FHIRMoney) { $this->setAllowedMoney($data[self::FIELD_ALLOWED_MONEY]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ALLOWED_MONEY])) { + $this->setAllowedMoney(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_ALLOWED_MONEY]] + $ext)); + } else if (is_array($data[self::FIELD_ALLOWED_MONEY])) { + $this->setAllowedMoney(new FHIRMoney(array_merge($ext, $data[self::FIELD_ALLOWED_MONEY]))); + } } else { $this->setAllowedMoney(new FHIRMoney($data[self::FIELD_ALLOWED_MONEY])); } @@ -191,8 +201,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ALLOWED_STRING] instanceof FHIRString) { $this->setAllowedString($data[self::FIELD_ALLOWED_STRING]); - } elseif ($ext && is_scalar($data[self::FIELD_ALLOWED_STRING])) { - $this->setAllowedString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_ALLOWED_STRING]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ALLOWED_STRING])) { + $this->setAllowedString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_ALLOWED_STRING]] + $ext)); + } else if (is_array($data[self::FIELD_ALLOWED_STRING])) { + $this->setAllowedString(new FHIRString(array_merge($ext, $data[self::FIELD_ALLOWED_STRING]))); + } } else { $this->setAllowedString(new FHIRString($data[self::FIELD_ALLOWED_STRING])); } @@ -203,8 +217,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ALLOWED_UNSIGNED_INT] instanceof FHIRUnsignedInt) { $this->setAllowedUnsignedInt($data[self::FIELD_ALLOWED_UNSIGNED_INT]); - } elseif ($ext && is_scalar($data[self::FIELD_ALLOWED_UNSIGNED_INT])) { - $this->setAllowedUnsignedInt(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_ALLOWED_UNSIGNED_INT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ALLOWED_UNSIGNED_INT])) { + $this->setAllowedUnsignedInt(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_ALLOWED_UNSIGNED_INT]] + $ext)); + } else if (is_array($data[self::FIELD_ALLOWED_UNSIGNED_INT])) { + $this->setAllowedUnsignedInt(new FHIRUnsignedInt(array_merge($ext, $data[self::FIELD_ALLOWED_UNSIGNED_INT]))); + } } else { $this->setAllowedUnsignedInt(new FHIRUnsignedInt($data[self::FIELD_ALLOWED_UNSIGNED_INT])); } @@ -217,8 +235,17 @@ public function __construct($data = null) } } if (isset($data[self::FIELD_USED_MONEY])) { + $ext = (isset($data[self::FIELD_USED_MONEY_EXT]) && is_array($data[self::FIELD_USED_MONEY_EXT])) + ? $data[self::FIELD_USED_MONEY_EXT] + : null; if ($data[self::FIELD_USED_MONEY] instanceof FHIRMoney) { $this->setUsedMoney($data[self::FIELD_USED_MONEY]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_USED_MONEY])) { + $this->setUsedMoney(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_USED_MONEY]] + $ext)); + } else if (is_array($data[self::FIELD_USED_MONEY])) { + $this->setUsedMoney(new FHIRMoney(array_merge($ext, $data[self::FIELD_USED_MONEY]))); + } } else { $this->setUsedMoney(new FHIRMoney($data[self::FIELD_USED_MONEY])); } @@ -229,8 +256,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_USED_UNSIGNED_INT] instanceof FHIRUnsignedInt) { $this->setUsedUnsignedInt($data[self::FIELD_USED_UNSIGNED_INT]); - } elseif ($ext && is_scalar($data[self::FIELD_USED_UNSIGNED_INT])) { - $this->setUsedUnsignedInt(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_USED_UNSIGNED_INT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_USED_UNSIGNED_INT])) { + $this->setUsedUnsignedInt(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_USED_UNSIGNED_INT]] + $ext)); + } else if (is_array($data[self::FIELD_USED_UNSIGNED_INT])) { + $this->setUsedUnsignedInt(new FHIRUnsignedInt(array_merge($ext, $data[self::FIELD_USED_UNSIGNED_INT]))); + } } else { $this->setUsedUnsignedInt(new FHIRUnsignedInt($data[self::FIELD_USED_UNSIGNED_INT])); } @@ -579,11 +610,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getAllowedUnsignedInt())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ALLOWED_UNSIGNED_INT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getUsedMoney())) { $v->xmlSerialize($sxe->addChild(self::FIELD_USED_MONEY, null, $v->_getFHIRXMLNamespace())); } @@ -600,25 +629,62 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getAllowedMoney())) { - $a[self::FIELD_ALLOWED_MONEY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ALLOWED_MONEY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ALLOWED_MONEY_EXT] = $enc; + } + } else { + $a[self::FIELD_ALLOWED_MONEY] = $v; + } } if (null !== ($v = $this->getAllowedString())) { - $a[self::FIELD_ALLOWED_STRING] = $v->getValue(); - $a[self::FIELD_ALLOWED_STRING_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ALLOWED_STRING] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ALLOWED_STRING_EXT] = $enc; + } + } else { + $a[self::FIELD_ALLOWED_STRING] = $v; + } } if (null !== ($v = $this->getAllowedUnsignedInt())) { - $a[self::FIELD_ALLOWED_UNSIGNED_INT] = $v->getValue(); - $a[self::FIELD_ALLOWED_UNSIGNED_INT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ALLOWED_UNSIGNED_INT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ALLOWED_UNSIGNED_INT_EXT] = $enc; + } + } else { + $a[self::FIELD_ALLOWED_UNSIGNED_INT] = $v; + } } if (null !== ($v = $this->getType())) { $a[self::FIELD_TYPE] = $v; } if (null !== ($v = $this->getUsedMoney())) { - $a[self::FIELD_USED_MONEY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_USED_MONEY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_USED_MONEY_EXT] = $enc; + } + } else { + $a[self::FIELD_USED_MONEY] = $v; + } } if (null !== ($v = $this->getUsedUnsignedInt())) { - $a[self::FIELD_USED_UNSIGNED_INT] = $v->getValue(); - $a[self::FIELD_USED_UNSIGNED_INT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_USED_UNSIGNED_INT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_USED_UNSIGNED_INT_EXT] = $enc; + } + } else { + $a[self::FIELD_USED_UNSIGNED_INT] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIREligibilityResponse/FHIREligibilityResponseInsurance.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIREligibilityResponse/FHIREligibilityResponseInsurance.php index 114c87e419..4fe435579d 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIREligibilityResponse/FHIREligibilityResponseInsurance.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIREligibilityResponse/FHIREligibilityResponseInsurance.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIREligibilityResponseInsurance extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ELIGIBILITY_RESPONSE_DOT_INSURANCE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_BENEFIT_BALANCE = 'benefitBalance'; const FIELD_CONTRACT = 'contract'; const FIELD_COVERAGE = 'coverage'; @@ -118,6 +114,9 @@ class FHIREligibilityResponseInsurance extends FHIRBackboneElement */ protected $coverage = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIREligibilityResponseInsurance Constructor * @param null|array $data @@ -137,6 +136,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_BENEFIT_BALANCE])) { if (is_array($data[self::FIELD_BENEFIT_BALANCE])) { foreach($data[self::FIELD_BENEFIT_BALANCE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIREligibilityResponseBenefitBalance) { $this->addBenefitBalance($v); } else { @@ -397,11 +399,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_BENEFIT_BALANCE, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getContract())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CONTRACT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getCoverage())) { $v->xmlSerialize($sxe->addChild(self::FIELD_COVERAGE, null, $v->_getFHIRXMLNamespace())); } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIREncounter/FHIREncounterClassHistory.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIREncounter/FHIREncounterClassHistory.php index f81ffc1839..713349afaf 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIREncounter/FHIREncounterClassHistory.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIREncounter/FHIREncounterClassHistory.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIREncounterClassHistory extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ENCOUNTER_DOT_CLASS_HISTORY; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CLASS = 'class'; const FIELD_PERIOD = 'period'; @@ -108,6 +104,9 @@ class FHIREncounterClassHistory extends FHIRBackboneElement */ protected $period = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIREncounterClassHistory Constructor * @param null|array $data @@ -309,7 +308,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getClass())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CLASS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PERIOD, null, $v->_getFHIRXMLNamespace())); } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIREncounter/FHIREncounterDiagnosis.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIREncounter/FHIREncounterDiagnosis.php index 241ca01176..1e3e82c849 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIREncounter/FHIREncounterDiagnosis.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIREncounter/FHIREncounterDiagnosis.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIREncounterDiagnosis extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ENCOUNTER_DOT_DIAGNOSIS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CONDITION = 'condition'; const FIELD_RANK = 'rank'; const FIELD_RANK_EXT = '_rank'; @@ -127,6 +123,9 @@ class FHIREncounterDiagnosis extends FHIRBackboneElement */ protected $role = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIREncounterDiagnosis Constructor * @param null|array $data @@ -156,8 +155,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_RANK] instanceof FHIRPositiveInt) { $this->setRank($data[self::FIELD_RANK]); - } elseif ($ext && is_scalar($data[self::FIELD_RANK])) { - $this->setRank(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_RANK]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_RANK])) { + $this->setRank(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_RANK]] + $ext)); + } else if (is_array($data[self::FIELD_RANK])) { + $this->setRank(new FHIRPositiveInt(array_merge($ext, $data[self::FIELD_RANK]))); + } } else { $this->setRank(new FHIRPositiveInt($data[self::FIELD_RANK])); } @@ -397,7 +400,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getRank())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RANK, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRole())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ROLE, null, $v->_getFHIRXMLNamespace())); } @@ -414,8 +416,15 @@ public function jsonSerialize() $a[self::FIELD_CONDITION] = $v; } if (null !== ($v = $this->getRank())) { - $a[self::FIELD_RANK] = $v->getValue(); - $a[self::FIELD_RANK_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_RANK] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_RANK_EXT] = $enc; + } + } else { + $a[self::FIELD_RANK] = $v; + } } if (null !== ($v = $this->getRole())) { $a[self::FIELD_ROLE] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIREncounter/FHIREncounterHospitalization.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIREncounter/FHIREncounterHospitalization.php index 34b7c60107..16ca8b9249 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIREncounter/FHIREncounterHospitalization.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIREncounter/FHIREncounterHospitalization.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIREncounterHospitalization extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ENCOUNTER_DOT_HOSPITALIZATION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ADMIT_SOURCE = 'admitSource'; const FIELD_DESTINATION = 'destination'; const FIELD_DIET_PREFERENCE = 'dietPreference'; @@ -201,6 +197,9 @@ class FHIREncounterHospitalization extends FHIRBackboneElement */ protected $specialCourtesy = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIREncounterHospitalization Constructor * @param null|array $data @@ -234,6 +233,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_DIET_PREFERENCE])) { if (is_array($data[self::FIELD_DIET_PREFERENCE])) { foreach($data[self::FIELD_DIET_PREFERENCE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addDietPreference($v); } else { @@ -266,8 +268,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PRE_ADMISSION_IDENTIFIER] instanceof FHIRIdentifier) { $this->setPreAdmissionIdentifier($data[self::FIELD_PRE_ADMISSION_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_PRE_ADMISSION_IDENTIFIER])) { - $this->setPreAdmissionIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_PRE_ADMISSION_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PRE_ADMISSION_IDENTIFIER])) { + $this->setPreAdmissionIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_PRE_ADMISSION_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_PRE_ADMISSION_IDENTIFIER])) { + $this->setPreAdmissionIdentifier(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_PRE_ADMISSION_IDENTIFIER]))); + } } else { $this->setPreAdmissionIdentifier(new FHIRIdentifier($data[self::FIELD_PRE_ADMISSION_IDENTIFIER])); } @@ -282,6 +288,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SPECIAL_ARRANGEMENT])) { if (is_array($data[self::FIELD_SPECIAL_ARRANGEMENT])) { foreach($data[self::FIELD_SPECIAL_ARRANGEMENT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addSpecialArrangement($v); } else { @@ -297,6 +306,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SPECIAL_COURTESY])) { if (is_array($data[self::FIELD_SPECIAL_COURTESY])) { foreach($data[self::FIELD_SPECIAL_COURTESY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addSpecialCourtesy($v); } else { @@ -813,11 +825,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getAdmitSource())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ADMIT_SOURCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDestination())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESTINATION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getDietPreference())) { foreach($vs as $v) { if (null === $v) { @@ -826,23 +836,18 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_DIET_PREFERENCE, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getDischargeDisposition())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DISCHARGE_DISPOSITION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOrigin())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ORIGIN, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPreAdmissionIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PRE_ADMISSION_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getReAdmission())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RE_ADMISSION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getSpecialArrangement())) { foreach($vs as $v) { if (null === $v) { @@ -851,7 +856,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_SPECIAL_ARRANGEMENT, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getSpecialCourtesy())) { foreach($vs as $v) { if (null === $v) { @@ -885,7 +889,15 @@ public function jsonSerialize() $a[self::FIELD_ORIGIN] = $v; } if (null !== ($v = $this->getPreAdmissionIdentifier())) { - $a[self::FIELD_PRE_ADMISSION_IDENTIFIER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PRE_ADMISSION_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PRE_ADMISSION_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_PRE_ADMISSION_IDENTIFIER] = $v; + } } if (null !== ($v = $this->getReAdmission())) { $a[self::FIELD_RE_ADMISSION] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIREncounter/FHIREncounterLocation.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIREncounter/FHIREncounterLocation.php index 8cf3641fdb..d0ef4a3160 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIREncounter/FHIREncounterLocation.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIREncounter/FHIREncounterLocation.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIREncounterLocation extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ENCOUNTER_DOT_LOCATION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_LOCATION = 'location'; const FIELD_PERIOD = 'period'; const FIELD_STATUS = 'status'; @@ -123,6 +119,9 @@ class FHIREncounterLocation extends FHIRBackboneElement */ protected $status = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIREncounterLocation Constructor * @param null|array $data @@ -159,8 +158,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIREncounterLocationStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIREncounterLocationStatus([FHIREncounterLocationStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIREncounterLocationStatus([FHIREncounterLocationStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIREncounterLocationStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIREncounterLocationStatus($data[self::FIELD_STATUS])); } @@ -371,11 +374,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getLocation())) { $v->xmlSerialize($sxe->addChild(self::FIELD_LOCATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } @@ -395,7 +396,15 @@ public function jsonSerialize() $a[self::FIELD_PERIOD] = $v; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIREncounter/FHIREncounterParticipant.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIREncounter/FHIREncounterParticipant.php index 60f57948ad..0295bb4c50 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIREncounter/FHIREncounterParticipant.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIREncounter/FHIREncounterParticipant.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIREncounterParticipant extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ENCOUNTER_DOT_PARTICIPANT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_INDIVIDUAL = 'individual'; const FIELD_PERIOD = 'period'; const FIELD_TYPE = 'type'; @@ -123,6 +119,9 @@ class FHIREncounterParticipant extends FHIRBackboneElement */ protected $type = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIREncounterParticipant Constructor * @param null|array $data @@ -156,6 +155,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_TYPE])) { if (is_array($data[self::FIELD_TYPE])) { foreach($data[self::FIELD_TYPE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addType($v); } else { @@ -405,11 +407,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getIndividual())) { $v->xmlSerialize($sxe->addChild(self::FIELD_INDIVIDUAL, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getType())) { foreach($vs as $v) { if (null === $v) { diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIREncounter/FHIREncounterStatusHistory.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIREncounter/FHIREncounterStatusHistory.php index 7b3db427d8..98a2055c89 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIREncounter/FHIREncounterStatusHistory.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIREncounter/FHIREncounterStatusHistory.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIREncounterStatusHistory extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ENCOUNTER_DOT_STATUS_HISTORY; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_PERIOD = 'period'; const FIELD_STATUS = 'status'; const FIELD_STATUS_EXT = '_status'; @@ -108,6 +104,9 @@ class FHIREncounterStatusHistory extends FHIRBackboneElement */ protected $status = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIREncounterStatusHistory Constructor * @param null|array $data @@ -137,8 +136,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIREncounterStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIREncounterStatus([FHIREncounterStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIREncounterStatus([FHIREncounterStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIREncounterStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIREncounterStatus($data[self::FIELD_STATUS])); } @@ -312,7 +315,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } @@ -329,7 +331,15 @@ public function jsonSerialize() $a[self::FIELD_PERIOD] = $v; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIREpisodeOfCare/FHIREpisodeOfCareDiagnosis.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIREpisodeOfCare/FHIREpisodeOfCareDiagnosis.php index 257d7fc126..7083b32ff9 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIREpisodeOfCare/FHIREpisodeOfCareDiagnosis.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIREpisodeOfCare/FHIREpisodeOfCareDiagnosis.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -81,10 +81,6 @@ class FHIREpisodeOfCareDiagnosis extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_EPISODE_OF_CARE_DOT_DIAGNOSIS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CONDITION = 'condition'; const FIELD_RANK = 'rank'; const FIELD_RANK_EXT = '_rank'; @@ -126,6 +122,9 @@ class FHIREpisodeOfCareDiagnosis extends FHIRBackboneElement */ protected $role = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIREpisodeOfCareDiagnosis Constructor * @param null|array $data @@ -155,8 +154,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_RANK] instanceof FHIRPositiveInt) { $this->setRank($data[self::FIELD_RANK]); - } elseif ($ext && is_scalar($data[self::FIELD_RANK])) { - $this->setRank(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_RANK]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_RANK])) { + $this->setRank(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_RANK]] + $ext)); + } else if (is_array($data[self::FIELD_RANK])) { + $this->setRank(new FHIRPositiveInt(array_merge($ext, $data[self::FIELD_RANK]))); + } } else { $this->setRank(new FHIRPositiveInt($data[self::FIELD_RANK])); } @@ -392,7 +395,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getRank())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RANK, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRole())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ROLE, null, $v->_getFHIRXMLNamespace())); } @@ -409,8 +411,15 @@ public function jsonSerialize() $a[self::FIELD_CONDITION] = $v; } if (null !== ($v = $this->getRank())) { - $a[self::FIELD_RANK] = $v->getValue(); - $a[self::FIELD_RANK_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_RANK] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_RANK_EXT] = $enc; + } + } else { + $a[self::FIELD_RANK] = $v; + } } if (null !== ($v = $this->getRole())) { $a[self::FIELD_ROLE] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIREpisodeOfCare/FHIREpisodeOfCareStatusHistory.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIREpisodeOfCare/FHIREpisodeOfCareStatusHistory.php index 00868a6df2..56fe574b83 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIREpisodeOfCare/FHIREpisodeOfCareStatusHistory.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIREpisodeOfCare/FHIREpisodeOfCareStatusHistory.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIREpisodeOfCareStatusHistory extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_EPISODE_OF_CARE_DOT_STATUS_HISTORY; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_PERIOD = 'period'; const FIELD_STATUS = 'status'; const FIELD_STATUS_EXT = '_status'; @@ -109,6 +105,9 @@ class FHIREpisodeOfCareStatusHistory extends FHIRBackboneElement */ protected $status = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIREpisodeOfCareStatusHistory Constructor * @param null|array $data @@ -138,8 +137,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIREpisodeOfCareStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIREpisodeOfCareStatus([FHIREpisodeOfCareStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIREpisodeOfCareStatus([FHIREpisodeOfCareStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIREpisodeOfCareStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIREpisodeOfCareStatus($data[self::FIELD_STATUS])); } @@ -313,7 +316,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } @@ -330,7 +332,15 @@ public function jsonSerialize() $a[self::FIELD_PERIOD] = $v; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRExpansionProfile/FHIRExpansionProfileDesignation.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRExpansionProfile/FHIRExpansionProfileDesignation.php index 42e6539ccc..131a3fa473 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRExpansionProfile/FHIRExpansionProfileDesignation.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRExpansionProfile/FHIRExpansionProfileDesignation.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -76,10 +76,6 @@ class FHIRExpansionProfileDesignation extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_EXPANSION_PROFILE_DOT_DESIGNATION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_EXCLUDE = 'exclude'; const FIELD_INCLUDE = 'include'; @@ -101,6 +97,9 @@ class FHIRExpansionProfileDesignation extends FHIRBackboneElement */ protected $include = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRExpansionProfileDesignation Constructor * @param null|array $data @@ -294,7 +293,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getExclude())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EXCLUDE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getInclude())) { $v->xmlSerialize($sxe->addChild(self::FIELD_INCLUDE, null, $v->_getFHIRXMLNamespace())); } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRExpansionProfile/FHIRExpansionProfileDesignation1.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRExpansionProfile/FHIRExpansionProfileDesignation1.php index ad0fb46fce..8ea3b00a8c 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRExpansionProfile/FHIRExpansionProfileDesignation1.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRExpansionProfile/FHIRExpansionProfileDesignation1.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRExpansionProfileDesignation1 extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_EXPANSION_PROFILE_DOT_DESIGNATION_1; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_LANGUAGE = 'language'; const FIELD_LANGUAGE_EXT = '_language'; const FIELD_USE = 'use'; @@ -109,6 +105,9 @@ class FHIRExpansionProfileDesignation1 extends FHIRBackboneElement */ protected $use = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRExpansionProfileDesignation1 Constructor * @param null|array $data @@ -131,8 +130,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_LANGUAGE] instanceof FHIRCode) { $this->setLanguage($data[self::FIELD_LANGUAGE]); - } elseif ($ext && is_scalar($data[self::FIELD_LANGUAGE])) { - $this->setLanguage(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_LANGUAGE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_LANGUAGE])) { + $this->setLanguage(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_LANGUAGE]] + $ext)); + } else if (is_array($data[self::FIELD_LANGUAGE])) { + $this->setLanguage(new FHIRCode(array_merge($ext, $data[self::FIELD_LANGUAGE]))); + } } else { $this->setLanguage(new FHIRCode($data[self::FIELD_LANGUAGE])); } @@ -324,10 +327,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getLanguage())) { $v->xmlSerialize($sxe->addChild(self::FIELD_LANGUAGE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getUse())) { $v->xmlSerialize($sxe->addChild(self::FIELD_USE, null, $v->_getFHIRXMLNamespace())); } @@ -341,8 +344,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getLanguage())) { - $a[self::FIELD_LANGUAGE] = $v->getValue(); - $a[self::FIELD_LANGUAGE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_LANGUAGE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_LANGUAGE_EXT] = $enc; + } + } else { + $a[self::FIELD_LANGUAGE] = $v; + } } if (null !== ($v = $this->getUse())) { $a[self::FIELD_USE] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRExpansionProfile/FHIRExpansionProfileDesignation2.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRExpansionProfile/FHIRExpansionProfileDesignation2.php index 481a4670a0..2c84e64a65 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRExpansionProfile/FHIRExpansionProfileDesignation2.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRExpansionProfile/FHIRExpansionProfileDesignation2.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRExpansionProfileDesignation2 extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_EXPANSION_PROFILE_DOT_DESIGNATION_2; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_LANGUAGE = 'language'; const FIELD_LANGUAGE_EXT = '_language'; const FIELD_USE = 'use'; @@ -109,6 +105,9 @@ class FHIRExpansionProfileDesignation2 extends FHIRBackboneElement */ protected $use = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRExpansionProfileDesignation2 Constructor * @param null|array $data @@ -131,8 +130,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_LANGUAGE] instanceof FHIRCode) { $this->setLanguage($data[self::FIELD_LANGUAGE]); - } elseif ($ext && is_scalar($data[self::FIELD_LANGUAGE])) { - $this->setLanguage(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_LANGUAGE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_LANGUAGE])) { + $this->setLanguage(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_LANGUAGE]] + $ext)); + } else if (is_array($data[self::FIELD_LANGUAGE])) { + $this->setLanguage(new FHIRCode(array_merge($ext, $data[self::FIELD_LANGUAGE]))); + } } else { $this->setLanguage(new FHIRCode($data[self::FIELD_LANGUAGE])); } @@ -324,10 +327,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getLanguage())) { $v->xmlSerialize($sxe->addChild(self::FIELD_LANGUAGE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getUse())) { $v->xmlSerialize($sxe->addChild(self::FIELD_USE, null, $v->_getFHIRXMLNamespace())); } @@ -341,8 +344,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getLanguage())) { - $a[self::FIELD_LANGUAGE] = $v->getValue(); - $a[self::FIELD_LANGUAGE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_LANGUAGE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_LANGUAGE_EXT] = $enc; + } + } else { + $a[self::FIELD_LANGUAGE] = $v; + } } if (null !== ($v = $this->getUse())) { $a[self::FIELD_USE] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRExpansionProfile/FHIRExpansionProfileExclude.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRExpansionProfile/FHIRExpansionProfileExclude.php index c8359ad813..4642615ea3 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRExpansionProfile/FHIRExpansionProfileExclude.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRExpansionProfile/FHIRExpansionProfileExclude.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -76,10 +76,6 @@ class FHIRExpansionProfileExclude extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_EXPANSION_PROFILE_DOT_EXCLUDE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DESIGNATION = 'designation'; /** @@ -91,6 +87,9 @@ class FHIRExpansionProfileExclude extends FHIRBackboneElement */ protected $designation = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRExpansionProfileExclude Constructor * @param null|array $data @@ -110,6 +109,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_DESIGNATION])) { if (is_array($data[self::FIELD_DESIGNATION])) { foreach($data[self::FIELD_DESIGNATION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRExpansionProfileDesignation2) { $this->addDesignation($v); } else { diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRExpansionProfile/FHIRExpansionProfileExcludedSystem.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRExpansionProfile/FHIRExpansionProfileExcludedSystem.php index e8091d49d1..b3ac54da73 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRExpansionProfile/FHIRExpansionProfileExcludedSystem.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRExpansionProfile/FHIRExpansionProfileExcludedSystem.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRExpansionProfileExcludedSystem extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_EXPANSION_PROFILE_DOT_EXCLUDED_SYSTEM; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_SYSTEM = 'system'; const FIELD_SYSTEM_EXT = '_system'; const FIELD_VERSION = 'version'; @@ -110,6 +106,9 @@ class FHIRExpansionProfileExcludedSystem extends FHIRBackboneElement */ protected $version = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRExpansionProfileExcludedSystem Constructor * @param null|array $data @@ -132,8 +131,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SYSTEM] instanceof FHIRUri) { $this->setSystem($data[self::FIELD_SYSTEM]); - } elseif ($ext && is_scalar($data[self::FIELD_SYSTEM])) { - $this->setSystem(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_SYSTEM]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SYSTEM])) { + $this->setSystem(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_SYSTEM]] + $ext)); + } else if (is_array($data[self::FIELD_SYSTEM])) { + $this->setSystem(new FHIRUri(array_merge($ext, $data[self::FIELD_SYSTEM]))); + } } else { $this->setSystem(new FHIRUri($data[self::FIELD_SYSTEM])); } @@ -144,8 +147,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VERSION] instanceof FHIRString) { $this->setVersion($data[self::FIELD_VERSION]); - } elseif ($ext && is_scalar($data[self::FIELD_VERSION])) { - $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } else if (is_array($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString(array_merge($ext, $data[self::FIELD_VERSION]))); + } } else { $this->setVersion(new FHIRString($data[self::FIELD_VERSION])); } @@ -341,6 +348,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getSystem())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SYSTEM, null, $v->_getFHIRXMLNamespace())); } @@ -357,12 +365,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getSystem())) { - $a[self::FIELD_SYSTEM] = $v->getValue(); - $a[self::FIELD_SYSTEM_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SYSTEM] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SYSTEM_EXT] = $enc; + } + } else { + $a[self::FIELD_SYSTEM] = $v; + } } if (null !== ($v = $this->getVersion())) { - $a[self::FIELD_VERSION] = $v->getValue(); - $a[self::FIELD_VERSION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VERSION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VERSION_EXT] = $enc; + } + } else { + $a[self::FIELD_VERSION] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRExpansionProfile/FHIRExpansionProfileFixedVersion.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRExpansionProfile/FHIRExpansionProfileFixedVersion.php index aa87e03831..f49173bafd 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRExpansionProfile/FHIRExpansionProfileFixedVersion.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRExpansionProfile/FHIRExpansionProfileFixedVersion.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRExpansionProfileFixedVersion extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_EXPANSION_PROFILE_DOT_FIXED_VERSION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_MODE = 'mode'; const FIELD_MODE_EXT = '_mode'; const FIELD_SYSTEM = 'system'; @@ -125,6 +121,9 @@ class FHIRExpansionProfileFixedVersion extends FHIRBackboneElement */ protected $version = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRExpansionProfileFixedVersion Constructor * @param null|array $data @@ -147,8 +146,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MODE] instanceof FHIRSystemVersionProcessingMode) { $this->setMode($data[self::FIELD_MODE]); - } elseif ($ext && is_scalar($data[self::FIELD_MODE])) { - $this->setMode(new FHIRSystemVersionProcessingMode([FHIRSystemVersionProcessingMode::FIELD_VALUE => $data[self::FIELD_MODE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MODE])) { + $this->setMode(new FHIRSystemVersionProcessingMode([FHIRSystemVersionProcessingMode::FIELD_VALUE => $data[self::FIELD_MODE]] + $ext)); + } else if (is_array($data[self::FIELD_MODE])) { + $this->setMode(new FHIRSystemVersionProcessingMode(array_merge($ext, $data[self::FIELD_MODE]))); + } } else { $this->setMode(new FHIRSystemVersionProcessingMode($data[self::FIELD_MODE])); } @@ -159,8 +162,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SYSTEM] instanceof FHIRUri) { $this->setSystem($data[self::FIELD_SYSTEM]); - } elseif ($ext && is_scalar($data[self::FIELD_SYSTEM])) { - $this->setSystem(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_SYSTEM]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SYSTEM])) { + $this->setSystem(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_SYSTEM]] + $ext)); + } else if (is_array($data[self::FIELD_SYSTEM])) { + $this->setSystem(new FHIRUri(array_merge($ext, $data[self::FIELD_SYSTEM]))); + } } else { $this->setSystem(new FHIRUri($data[self::FIELD_SYSTEM])); } @@ -171,8 +178,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VERSION] instanceof FHIRString) { $this->setVersion($data[self::FIELD_VERSION]); - } elseif ($ext && is_scalar($data[self::FIELD_VERSION])) { - $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } else if (is_array($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString(array_merge($ext, $data[self::FIELD_VERSION]))); + } } else { $this->setVersion(new FHIRString($data[self::FIELD_VERSION])); } @@ -423,15 +434,37 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getMode())) { - $a[self::FIELD_MODE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MODE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MODE_EXT] = $enc; + } + } else { + $a[self::FIELD_MODE] = $v; + } } if (null !== ($v = $this->getSystem())) { - $a[self::FIELD_SYSTEM] = $v->getValue(); - $a[self::FIELD_SYSTEM_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SYSTEM] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SYSTEM_EXT] = $enc; + } + } else { + $a[self::FIELD_SYSTEM] = $v; + } } if (null !== ($v = $this->getVersion())) { - $a[self::FIELD_VERSION] = $v->getValue(); - $a[self::FIELD_VERSION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VERSION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VERSION_EXT] = $enc; + } + } else { + $a[self::FIELD_VERSION] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRExpansionProfile/FHIRExpansionProfileInclude.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRExpansionProfile/FHIRExpansionProfileInclude.php index 9d3a14e81f..6dbc0eadfc 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRExpansionProfile/FHIRExpansionProfileInclude.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRExpansionProfile/FHIRExpansionProfileInclude.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -76,10 +76,6 @@ class FHIRExpansionProfileInclude extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_EXPANSION_PROFILE_DOT_INCLUDE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DESIGNATION = 'designation'; /** @@ -91,6 +87,9 @@ class FHIRExpansionProfileInclude extends FHIRBackboneElement */ protected $designation = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRExpansionProfileInclude Constructor * @param null|array $data @@ -110,6 +109,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_DESIGNATION])) { if (is_array($data[self::FIELD_DESIGNATION])) { foreach($data[self::FIELD_DESIGNATION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRExpansionProfileDesignation1) { $this->addDesignation($v); } else { diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitAccident.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitAccident.php index cb0b403347..3104a726a7 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitAccident.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitAccident.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -82,10 +82,6 @@ class FHIRExplanationOfBenefitAccident extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_EXPLANATION_OF_BENEFIT_DOT_ACCIDENT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DATE = 'date'; const FIELD_DATE_EXT = '_date'; const FIELD_LOCATION_ADDRESS = 'locationAddress'; @@ -142,6 +138,9 @@ class FHIRExplanationOfBenefitAccident extends FHIRBackboneElement */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRExplanationOfBenefitAccident Constructor * @param null|array $data @@ -164,8 +163,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATE] instanceof FHIRDate) { $this->setDate($data[self::FIELD_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_DATE])) { - $this->setDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDate(array_merge($ext, $data[self::FIELD_DATE]))); + } } else { $this->setDate(new FHIRDate($data[self::FIELD_DATE])); } @@ -447,18 +450,16 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DATE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getLocationAddress())) { $v->xmlSerialize($sxe->addChild(self::FIELD_LOCATION_ADDRESS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getLocationReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_LOCATION_REFERENCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -472,8 +473,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getDate())) { - $a[self::FIELD_DATE] = $v->getValue(); - $a[self::FIELD_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_DATE] = $v; + } } if (null !== ($v = $this->getLocationAddress())) { $a[self::FIELD_LOCATION_ADDRESS] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitAddItem.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitAddItem.php index b369f88718..dee532d913 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitAddItem.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitAddItem.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -81,15 +81,12 @@ class FHIRExplanationOfBenefitAddItem extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_EXPLANATION_OF_BENEFIT_DOT_ADD_ITEM; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ADJUDICATION = 'adjudication'; const FIELD_ADJUDICATION_EXT = '_adjudication'; const FIELD_CATEGORY = 'category'; const FIELD_DETAIL = 'detail'; const FIELD_FEE = 'fee'; + const FIELD_FEE_EXT = '_fee'; const FIELD_MODIFIER = 'modifier'; const FIELD_NOTE_NUMBER = 'noteNumber'; const FIELD_NOTE_NUMBER_EXT = '_noteNumber'; @@ -207,6 +204,9 @@ class FHIRExplanationOfBenefitAddItem extends FHIRBackboneElement */ protected $service = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRExplanationOfBenefitAddItem Constructor * @param null|array $data @@ -229,17 +229,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_ADJUDICATION])) { foreach($data[self::FIELD_ADJUDICATION] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRExplanationOfBenefitAdjudication) { $this->addAdjudication($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addAdjudication(new FHIRExplanationOfBenefitAdjudication([FHIRExplanationOfBenefitAdjudication::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addAdjudication(new FHIRExplanationOfBenefitAdjudication([FHIRExplanationOfBenefitAdjudication::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addAdjudication(new FHIRExplanationOfBenefitAdjudication(array_merge($v, $ext[$i]))); + } } else { $this->addAdjudication(new FHIRExplanationOfBenefitAdjudication($v)); } } } elseif ($data[self::FIELD_ADJUDICATION] instanceof FHIRExplanationOfBenefitAdjudication) { $this->addAdjudication($data[self::FIELD_ADJUDICATION]); - } elseif ($ext && is_scalar($data[self::FIELD_ADJUDICATION])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_ADJUDICATION])) { $this->addAdjudication(new FHIRExplanationOfBenefitAdjudication([FHIRExplanationOfBenefitAdjudication::FIELD_VALUE => $data[self::FIELD_ADJUDICATION]] + $ext)); } else { $this->addAdjudication(new FHIRExplanationOfBenefitAdjudication($data[self::FIELD_ADJUDICATION])); @@ -255,6 +262,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_DETAIL])) { if (is_array($data[self::FIELD_DETAIL])) { foreach($data[self::FIELD_DETAIL] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRExplanationOfBenefitDetail1) { $this->addDetail($v); } else { @@ -268,8 +278,17 @@ public function __construct($data = null) } } if (isset($data[self::FIELD_FEE])) { + $ext = (isset($data[self::FIELD_FEE_EXT]) && is_array($data[self::FIELD_FEE_EXT])) + ? $data[self::FIELD_FEE_EXT] + : null; if ($data[self::FIELD_FEE] instanceof FHIRMoney) { $this->setFee($data[self::FIELD_FEE]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_FEE])) { + $this->setFee(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_FEE]] + $ext)); + } else if (is_array($data[self::FIELD_FEE])) { + $this->setFee(new FHIRMoney(array_merge($ext, $data[self::FIELD_FEE]))); + } } else { $this->setFee(new FHIRMoney($data[self::FIELD_FEE])); } @@ -277,6 +296,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_MODIFIER])) { if (is_array($data[self::FIELD_MODIFIER])) { foreach($data[self::FIELD_MODIFIER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addModifier($v); } else { @@ -295,17 +317,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_NOTE_NUMBER])) { foreach($data[self::FIELD_NOTE_NUMBER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRPositiveInt) { $this->addNoteNumber($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addNoteNumber(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addNoteNumber(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addNoteNumber(new FHIRPositiveInt(array_merge($v, $ext[$i]))); + } } else { $this->addNoteNumber(new FHIRPositiveInt($v)); } } } elseif ($data[self::FIELD_NOTE_NUMBER] instanceof FHIRPositiveInt) { $this->addNoteNumber($data[self::FIELD_NOTE_NUMBER]); - } elseif ($ext && is_scalar($data[self::FIELD_NOTE_NUMBER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_NOTE_NUMBER])) { $this->addNoteNumber(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_NOTE_NUMBER]] + $ext)); } else { $this->addNoteNumber(new FHIRPositiveInt($data[self::FIELD_NOTE_NUMBER])); @@ -324,17 +353,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_SEQUENCE_LINK_ID])) { foreach($data[self::FIELD_SEQUENCE_LINK_ID] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRPositiveInt) { $this->addSequenceLinkId($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addSequenceLinkId(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addSequenceLinkId(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addSequenceLinkId(new FHIRPositiveInt(array_merge($v, $ext[$i]))); + } } else { $this->addSequenceLinkId(new FHIRPositiveInt($v)); } } } elseif ($data[self::FIELD_SEQUENCE_LINK_ID] instanceof FHIRPositiveInt) { $this->addSequenceLinkId($data[self::FIELD_SEQUENCE_LINK_ID]); - } elseif ($ext && is_scalar($data[self::FIELD_SEQUENCE_LINK_ID])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_SEQUENCE_LINK_ID])) { $this->addSequenceLinkId(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_SEQUENCE_LINK_ID]] + $ext)); } else { $this->addSequenceLinkId(new FHIRPositiveInt($data[self::FIELD_SEQUENCE_LINK_ID])); @@ -939,11 +975,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_ADJUDICATION, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getCategory())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CATEGORY, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getDetail())) { foreach($vs as $v) { if (null === $v) { @@ -952,11 +986,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_DETAIL, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getFee())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FEE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getModifier())) { foreach($vs as $v) { if (null === $v) { @@ -973,7 +1005,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_NOTE_NUMBER, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getRevenue())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REVENUE, null, $v->_getFHIRXMLNamespace())); } @@ -985,7 +1016,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_SEQUENCE_LINK_ID, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getService())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SERVICE, null, $v->_getFHIRXMLNamespace())); } @@ -999,7 +1029,23 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if ([] !== ($vs = $this->getAdjudication())) { - $a[self::FIELD_ADJUDICATION] = $vs; + $a[self::FIELD_ADJUDICATION] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ADJUDICATION][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ADJUDICATION_EXT][] = $enc; + } else { + $a[self::FIELD_ADJUDICATION_EXT][] = null; + } + } else { + $a[self::FIELD_ADJUDICATION][] = $v; + } + } } if (null !== ($v = $this->getCategory())) { $a[self::FIELD_CATEGORY] = $v; @@ -1008,7 +1054,15 @@ public function jsonSerialize() $a[self::FIELD_DETAIL] = $vs; } if (null !== ($v = $this->getFee())) { - $a[self::FIELD_FEE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FEE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FEE_EXT] = $enc; + } + } else { + $a[self::FIELD_FEE] = $v; + } } if ([] !== ($vs = $this->getModifier())) { $a[self::FIELD_MODIFIER] = $vs; @@ -1019,8 +1073,17 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_NOTE_NUMBER][] = $v->getValue(); - $a[self::FIELD_NOTE_NUMBER_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NOTE_NUMBER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NOTE_NUMBER_EXT][] = $enc; + } else { + $a[self::FIELD_NOTE_NUMBER_EXT][] = null; + } + } else { + $a[self::FIELD_NOTE_NUMBER][] = $v; + } } } if (null !== ($v = $this->getRevenue())) { @@ -1032,8 +1095,17 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_SEQUENCE_LINK_ID][] = $v->getValue(); - $a[self::FIELD_SEQUENCE_LINK_ID_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SEQUENCE_LINK_ID][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SEQUENCE_LINK_ID_EXT][] = $enc; + } else { + $a[self::FIELD_SEQUENCE_LINK_ID_EXT][] = null; + } + } else { + $a[self::FIELD_SEQUENCE_LINK_ID][] = $v; + } } } if (null !== ($v = $this->getService())) { diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitAdjudication.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitAdjudication.php index e9505771e6..18a0d52b59 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitAdjudication.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitAdjudication.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -81,11 +81,8 @@ class FHIRExplanationOfBenefitAdjudication extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_EXPLANATION_OF_BENEFIT_DOT_ADJUDICATION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_AMOUNT = 'amount'; + const FIELD_AMOUNT_EXT = '_amount'; const FIELD_CATEGORY = 'category'; const FIELD_REASON = 'reason'; const FIELD_VALUE = 'value'; @@ -139,6 +136,9 @@ class FHIRExplanationOfBenefitAdjudication extends FHIRBackboneElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRExplanationOfBenefitAdjudication Constructor * @param null|array $data @@ -160,8 +160,17 @@ public function __construct($data = null) } parent::__construct($data); if (isset($data[self::FIELD_AMOUNT])) { + $ext = (isset($data[self::FIELD_AMOUNT_EXT]) && is_array($data[self::FIELD_AMOUNT_EXT])) + ? $data[self::FIELD_AMOUNT_EXT] + : null; if ($data[self::FIELD_AMOUNT] instanceof FHIRMoney) { $this->setAmount($data[self::FIELD_AMOUNT]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_AMOUNT])) { + $this->setAmount(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_AMOUNT]] + $ext)); + } else if (is_array($data[self::FIELD_AMOUNT])) { + $this->setAmount(new FHIRMoney(array_merge($ext, $data[self::FIELD_AMOUNT]))); + } } else { $this->setAmount(new FHIRMoney($data[self::FIELD_AMOUNT])); } @@ -186,8 +195,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE] instanceof FHIRDecimal) { $this->setValue($data[self::FIELD_VALUE]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE])) { - $this->setValue(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_VALUE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE])) { + $this->setValue(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_VALUE]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE])) { + $this->setValue(new FHIRDecimal(array_merge($ext, $data[self::FIELD_VALUE]))); + } } else { $this->setValue(new FHIRDecimal($data[self::FIELD_VALUE])); } @@ -448,15 +461,14 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getAmount())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AMOUNT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getCategory())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CATEGORY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getReason())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REASON, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getValue())) { + $sxe->addAttribute(self::FIELD_VALUE, (string)$v); $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE, null, $v->_getFHIRXMLNamespace())); } return $sxe; @@ -469,7 +481,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getAmount())) { - $a[self::FIELD_AMOUNT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_AMOUNT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_AMOUNT_EXT] = $enc; + } + } else { + $a[self::FIELD_AMOUNT] = $v; + } } if (null !== ($v = $this->getCategory())) { $a[self::FIELD_CATEGORY] = $v; @@ -478,8 +498,15 @@ public function jsonSerialize() $a[self::FIELD_REASON] = $v; } if (null !== ($v = $this->getValue())) { - $a[self::FIELD_VALUE] = $v->getValue(); - $a[self::FIELD_VALUE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitBenefitBalance.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitBenefitBalance.php index ad0e58c0e9..678514807e 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitBenefitBalance.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitBenefitBalance.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -81,10 +81,6 @@ class FHIRExplanationOfBenefitBenefitBalance extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_EXPLANATION_OF_BENEFIT_DOT_BENEFIT_BALANCE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CATEGORY = 'category'; const FIELD_DESCRIPTION = 'description'; const FIELD_DESCRIPTION_EXT = '_description'; @@ -204,6 +200,9 @@ class FHIRExplanationOfBenefitBenefitBalance extends FHIRBackboneElement */ protected $unit = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRExplanationOfBenefitBenefitBalance Constructor * @param null|array $data @@ -233,8 +232,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -245,8 +248,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EXCLUDED] instanceof FHIRBoolean) { $this->setExcluded($data[self::FIELD_EXCLUDED]); - } elseif ($ext && is_scalar($data[self::FIELD_EXCLUDED])) { - $this->setExcluded(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_EXCLUDED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EXCLUDED])) { + $this->setExcluded(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_EXCLUDED]] + $ext)); + } else if (is_array($data[self::FIELD_EXCLUDED])) { + $this->setExcluded(new FHIRBoolean(array_merge($ext, $data[self::FIELD_EXCLUDED]))); + } } else { $this->setExcluded(new FHIRBoolean($data[self::FIELD_EXCLUDED])); } @@ -254,6 +261,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_FINANCIAL])) { if (is_array($data[self::FIELD_FINANCIAL])) { foreach($data[self::FIELD_FINANCIAL] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRExplanationOfBenefitFinancial) { $this->addFinancial($v); } else { @@ -272,8 +282,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -789,7 +803,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getExcluded())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EXCLUDED, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getFinancial())) { foreach($vs as $v) { if (null === $v) { @@ -801,19 +814,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NAME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getNetwork())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NETWORK, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSubCategory())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUB_CATEGORY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getTerm())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TERM, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getUnit())) { $v->xmlSerialize($sxe->addChild(self::FIELD_UNIT, null, $v->_getFHIRXMLNamespace())); } @@ -830,19 +839,40 @@ public function jsonSerialize() $a[self::FIELD_CATEGORY] = $v; } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if (null !== ($v = $this->getExcluded())) { - $a[self::FIELD_EXCLUDED] = $v->getValue(); - $a[self::FIELD_EXCLUDED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EXCLUDED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EXCLUDED_EXT] = $enc; + } + } else { + $a[self::FIELD_EXCLUDED] = $v; + } } if ([] !== ($vs = $this->getFinancial())) { $a[self::FIELD_FINANCIAL] = $vs; } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if (null !== ($v = $this->getNetwork())) { $a[self::FIELD_NETWORK] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitCareTeam.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitCareTeam.php index c579f0b76c..2f0aa35866 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitCareTeam.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitCareTeam.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -82,10 +82,6 @@ class FHIRExplanationOfBenefitCareTeam extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_EXPLANATION_OF_BENEFIT_DOT_CARE_TEAM; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_PROVIDER = 'provider'; const FIELD_QUALIFICATION = 'qualification'; const FIELD_RESPONSIBLE = 'responsible'; @@ -152,6 +148,9 @@ class FHIRExplanationOfBenefitCareTeam extends FHIRBackboneElement */ protected $sequence = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRExplanationOfBenefitCareTeam Constructor * @param null|array $data @@ -188,8 +187,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_RESPONSIBLE] instanceof FHIRBoolean) { $this->setResponsible($data[self::FIELD_RESPONSIBLE]); - } elseif ($ext && is_scalar($data[self::FIELD_RESPONSIBLE])) { - $this->setResponsible(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_RESPONSIBLE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_RESPONSIBLE])) { + $this->setResponsible(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_RESPONSIBLE]] + $ext)); + } else if (is_array($data[self::FIELD_RESPONSIBLE])) { + $this->setResponsible(new FHIRBoolean(array_merge($ext, $data[self::FIELD_RESPONSIBLE]))); + } } else { $this->setResponsible(new FHIRBoolean($data[self::FIELD_RESPONSIBLE])); } @@ -207,8 +210,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SEQUENCE] instanceof FHIRPositiveInt) { $this->setSequence($data[self::FIELD_SEQUENCE]); - } elseif ($ext && is_scalar($data[self::FIELD_SEQUENCE])) { - $this->setSequence(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_SEQUENCE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SEQUENCE])) { + $this->setSequence(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_SEQUENCE]] + $ext)); + } else if (is_array($data[self::FIELD_SEQUENCE])) { + $this->setSequence(new FHIRPositiveInt(array_merge($ext, $data[self::FIELD_SEQUENCE]))); + } } else { $this->setSequence(new FHIRPositiveInt($data[self::FIELD_SEQUENCE])); } @@ -511,14 +518,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getProvider())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PROVIDER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getQualification())) { $v->xmlSerialize($sxe->addChild(self::FIELD_QUALIFICATION, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getResponsible())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RESPONSIBLE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRole())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ROLE, null, $v->_getFHIRXMLNamespace())); } @@ -541,15 +546,29 @@ public function jsonSerialize() $a[self::FIELD_QUALIFICATION] = $v; } if (null !== ($v = $this->getResponsible())) { - $a[self::FIELD_RESPONSIBLE] = $v->getValue(); - $a[self::FIELD_RESPONSIBLE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_RESPONSIBLE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_RESPONSIBLE_EXT] = $enc; + } + } else { + $a[self::FIELD_RESPONSIBLE] = $v; + } } if (null !== ($v = $this->getRole())) { $a[self::FIELD_ROLE] = $v; } if (null !== ($v = $this->getSequence())) { - $a[self::FIELD_SEQUENCE] = $v->getValue(); - $a[self::FIELD_SEQUENCE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SEQUENCE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SEQUENCE_EXT] = $enc; + } + } else { + $a[self::FIELD_SEQUENCE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitDetail.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitDetail.php index 5b0cf2c720..d7844dfec2 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitDetail.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitDetail.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -84,10 +84,6 @@ class FHIRExplanationOfBenefitDetail extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_EXPLANATION_OF_BENEFIT_DOT_DETAIL; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ADJUDICATION = 'adjudication'; const FIELD_ADJUDICATION_EXT = '_adjudication'; const FIELD_CATEGORY = 'category'; @@ -95,6 +91,7 @@ class FHIRExplanationOfBenefitDetail extends FHIRBackboneElement const FIELD_FACTOR_EXT = '_factor'; const FIELD_MODIFIER = 'modifier'; const FIELD_NET = 'net'; + const FIELD_NET_EXT = '_net'; const FIELD_NOTE_NUMBER = 'noteNumber'; const FIELD_NOTE_NUMBER_EXT = '_noteNumber'; const FIELD_PROGRAM_CODE = 'programCode'; @@ -108,6 +105,7 @@ class FHIRExplanationOfBenefitDetail extends FHIRBackboneElement const FIELD_TYPE = 'type'; const FIELD_UDI = 'udi'; const FIELD_UNIT_PRICE = 'unitPrice'; + const FIELD_UNIT_PRICE_EXT = '_unitPrice'; /** * This resource provides: the claim details; adjudication details from the @@ -296,6 +294,9 @@ class FHIRExplanationOfBenefitDetail extends FHIRBackboneElement */ protected $unitPrice = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRExplanationOfBenefitDetail Constructor * @param null|array $data @@ -318,17 +319,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_ADJUDICATION])) { foreach($data[self::FIELD_ADJUDICATION] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRExplanationOfBenefitAdjudication) { $this->addAdjudication($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addAdjudication(new FHIRExplanationOfBenefitAdjudication([FHIRExplanationOfBenefitAdjudication::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addAdjudication(new FHIRExplanationOfBenefitAdjudication([FHIRExplanationOfBenefitAdjudication::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addAdjudication(new FHIRExplanationOfBenefitAdjudication(array_merge($v, $ext[$i]))); + } } else { $this->addAdjudication(new FHIRExplanationOfBenefitAdjudication($v)); } } } elseif ($data[self::FIELD_ADJUDICATION] instanceof FHIRExplanationOfBenefitAdjudication) { $this->addAdjudication($data[self::FIELD_ADJUDICATION]); - } elseif ($ext && is_scalar($data[self::FIELD_ADJUDICATION])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_ADJUDICATION])) { $this->addAdjudication(new FHIRExplanationOfBenefitAdjudication([FHIRExplanationOfBenefitAdjudication::FIELD_VALUE => $data[self::FIELD_ADJUDICATION]] + $ext)); } else { $this->addAdjudication(new FHIRExplanationOfBenefitAdjudication($data[self::FIELD_ADJUDICATION])); @@ -347,8 +355,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_FACTOR] instanceof FHIRDecimal) { $this->setFactor($data[self::FIELD_FACTOR]); - } elseif ($ext && is_scalar($data[self::FIELD_FACTOR])) { - $this->setFactor(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_FACTOR]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_FACTOR])) { + $this->setFactor(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_FACTOR]] + $ext)); + } else if (is_array($data[self::FIELD_FACTOR])) { + $this->setFactor(new FHIRDecimal(array_merge($ext, $data[self::FIELD_FACTOR]))); + } } else { $this->setFactor(new FHIRDecimal($data[self::FIELD_FACTOR])); } @@ -356,6 +368,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_MODIFIER])) { if (is_array($data[self::FIELD_MODIFIER])) { foreach($data[self::FIELD_MODIFIER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addModifier($v); } else { @@ -369,8 +384,17 @@ public function __construct($data = null) } } if (isset($data[self::FIELD_NET])) { + $ext = (isset($data[self::FIELD_NET_EXT]) && is_array($data[self::FIELD_NET_EXT])) + ? $data[self::FIELD_NET_EXT] + : null; if ($data[self::FIELD_NET] instanceof FHIRMoney) { $this->setNet($data[self::FIELD_NET]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NET])) { + $this->setNet(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_NET]] + $ext)); + } else if (is_array($data[self::FIELD_NET])) { + $this->setNet(new FHIRMoney(array_merge($ext, $data[self::FIELD_NET]))); + } } else { $this->setNet(new FHIRMoney($data[self::FIELD_NET])); } @@ -381,17 +405,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_NOTE_NUMBER])) { foreach($data[self::FIELD_NOTE_NUMBER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRPositiveInt) { $this->addNoteNumber($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addNoteNumber(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addNoteNumber(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addNoteNumber(new FHIRPositiveInt(array_merge($v, $ext[$i]))); + } } else { $this->addNoteNumber(new FHIRPositiveInt($v)); } } } elseif ($data[self::FIELD_NOTE_NUMBER] instanceof FHIRPositiveInt) { $this->addNoteNumber($data[self::FIELD_NOTE_NUMBER]); - } elseif ($ext && is_scalar($data[self::FIELD_NOTE_NUMBER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_NOTE_NUMBER])) { $this->addNoteNumber(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_NOTE_NUMBER]] + $ext)); } else { $this->addNoteNumber(new FHIRPositiveInt($data[self::FIELD_NOTE_NUMBER])); @@ -400,6 +431,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PROGRAM_CODE])) { if (is_array($data[self::FIELD_PROGRAM_CODE])) { foreach($data[self::FIELD_PROGRAM_CODE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addProgramCode($v); } else { @@ -418,8 +452,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_QUANTITY] instanceof FHIRQuantity) { $this->setQuantity($data[self::FIELD_QUANTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_QUANTITY])) { - $this->setQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_QUANTITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_QUANTITY])) { + $this->setQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_QUANTITY])) { + $this->setQuantity(new FHIRQuantity(array_merge($ext, $data[self::FIELD_QUANTITY]))); + } } else { $this->setQuantity(new FHIRQuantity($data[self::FIELD_QUANTITY])); } @@ -437,8 +475,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SEQUENCE] instanceof FHIRPositiveInt) { $this->setSequence($data[self::FIELD_SEQUENCE]); - } elseif ($ext && is_scalar($data[self::FIELD_SEQUENCE])) { - $this->setSequence(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_SEQUENCE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SEQUENCE])) { + $this->setSequence(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_SEQUENCE]] + $ext)); + } else if (is_array($data[self::FIELD_SEQUENCE])) { + $this->setSequence(new FHIRPositiveInt(array_merge($ext, $data[self::FIELD_SEQUENCE]))); + } } else { $this->setSequence(new FHIRPositiveInt($data[self::FIELD_SEQUENCE])); } @@ -453,6 +495,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SUB_DETAIL])) { if (is_array($data[self::FIELD_SUB_DETAIL])) { foreach($data[self::FIELD_SUB_DETAIL] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRExplanationOfBenefitSubDetail) { $this->addSubDetail($v); } else { @@ -475,6 +520,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_UDI])) { if (is_array($data[self::FIELD_UDI])) { foreach($data[self::FIELD_UDI] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addUdi($v); } else { @@ -488,8 +536,17 @@ public function __construct($data = null) } } if (isset($data[self::FIELD_UNIT_PRICE])) { + $ext = (isset($data[self::FIELD_UNIT_PRICE_EXT]) && is_array($data[self::FIELD_UNIT_PRICE_EXT])) + ? $data[self::FIELD_UNIT_PRICE_EXT] + : null; if ($data[self::FIELD_UNIT_PRICE] instanceof FHIRMoney) { $this->setUnitPrice($data[self::FIELD_UNIT_PRICE]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_UNIT_PRICE])) { + $this->setUnitPrice(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_UNIT_PRICE]] + $ext)); + } else if (is_array($data[self::FIELD_UNIT_PRICE])) { + $this->setUnitPrice(new FHIRMoney(array_merge($ext, $data[self::FIELD_UNIT_PRICE]))); + } } else { $this->setUnitPrice(new FHIRMoney($data[self::FIELD_UNIT_PRICE])); } @@ -1349,14 +1406,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_ADJUDICATION, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getCategory())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CATEGORY, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getFactor())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FACTOR, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getModifier())) { foreach($vs as $v) { if (null === $v) { @@ -1365,7 +1420,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_MODIFIER, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getNet())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NET, null, $v->_getFHIRXMLNamespace())); } @@ -1377,7 +1431,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_NOTE_NUMBER, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getProgramCode())) { foreach($vs as $v) { if (null === $v) { @@ -1386,22 +1439,18 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_PROGRAM_CODE, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_QUANTITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRevenue())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REVENUE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getSequence())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SEQUENCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getService())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SERVICE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getSubDetail())) { foreach($vs as $v) { if (null === $v) { @@ -1410,11 +1459,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_SUB_DETAIL, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getUdi())) { foreach($vs as $v) { if (null === $v) { @@ -1423,7 +1470,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_UDI, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getUnitPrice())) { $v->xmlSerialize($sxe->addChild(self::FIELD_UNIT_PRICE, null, $v->_getFHIRXMLNamespace())); } @@ -1437,20 +1483,51 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if ([] !== ($vs = $this->getAdjudication())) { - $a[self::FIELD_ADJUDICATION] = $vs; + $a[self::FIELD_ADJUDICATION] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ADJUDICATION][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ADJUDICATION_EXT][] = $enc; + } else { + $a[self::FIELD_ADJUDICATION_EXT][] = null; + } + } else { + $a[self::FIELD_ADJUDICATION][] = $v; + } + } } if (null !== ($v = $this->getCategory())) { $a[self::FIELD_CATEGORY] = $v; } if (null !== ($v = $this->getFactor())) { - $a[self::FIELD_FACTOR] = $v->getValue(); - $a[self::FIELD_FACTOR_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FACTOR] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FACTOR_EXT] = $enc; + } + } else { + $a[self::FIELD_FACTOR] = $v; + } } if ([] !== ($vs = $this->getModifier())) { $a[self::FIELD_MODIFIER] = $vs; } if (null !== ($v = $this->getNet())) { - $a[self::FIELD_NET] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NET] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NET_EXT] = $enc; + } + } else { + $a[self::FIELD_NET] = $v; + } } if ([] !== ($vs = $this->getNoteNumber())) { $a[self::FIELD_NOTE_NUMBER] = []; @@ -1458,22 +1535,46 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_NOTE_NUMBER][] = $v->getValue(); - $a[self::FIELD_NOTE_NUMBER_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NOTE_NUMBER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NOTE_NUMBER_EXT][] = $enc; + } else { + $a[self::FIELD_NOTE_NUMBER_EXT][] = null; + } + } else { + $a[self::FIELD_NOTE_NUMBER][] = $v; + } } } if ([] !== ($vs = $this->getProgramCode())) { $a[self::FIELD_PROGRAM_CODE] = $vs; } if (null !== ($v = $this->getQuantity())) { - $a[self::FIELD_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_QUANTITY] = $v; + } } if (null !== ($v = $this->getRevenue())) { $a[self::FIELD_REVENUE] = $v; } if (null !== ($v = $this->getSequence())) { - $a[self::FIELD_SEQUENCE] = $v->getValue(); - $a[self::FIELD_SEQUENCE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SEQUENCE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SEQUENCE_EXT] = $enc; + } + } else { + $a[self::FIELD_SEQUENCE] = $v; + } } if (null !== ($v = $this->getService())) { $a[self::FIELD_SERVICE] = $v; @@ -1488,7 +1589,15 @@ public function jsonSerialize() $a[self::FIELD_UDI] = $vs; } if (null !== ($v = $this->getUnitPrice())) { - $a[self::FIELD_UNIT_PRICE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_UNIT_PRICE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_UNIT_PRICE_EXT] = $enc; + } + } else { + $a[self::FIELD_UNIT_PRICE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitDetail1.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitDetail1.php index 4ddac94ca2..593d5dacc2 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitDetail1.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitDetail1.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -81,14 +81,11 @@ class FHIRExplanationOfBenefitDetail1 extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_EXPLANATION_OF_BENEFIT_DOT_DETAIL_1; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ADJUDICATION = 'adjudication'; const FIELD_ADJUDICATION_EXT = '_adjudication'; const FIELD_CATEGORY = 'category'; const FIELD_FEE = 'fee'; + const FIELD_FEE_EXT = '_fee'; const FIELD_MODIFIER = 'modifier'; const FIELD_NOTE_NUMBER = 'noteNumber'; const FIELD_NOTE_NUMBER_EXT = '_noteNumber'; @@ -180,6 +177,9 @@ class FHIRExplanationOfBenefitDetail1 extends FHIRBackboneElement */ protected $service = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRExplanationOfBenefitDetail1 Constructor * @param null|array $data @@ -202,17 +202,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_ADJUDICATION])) { foreach($data[self::FIELD_ADJUDICATION] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRExplanationOfBenefitAdjudication) { $this->addAdjudication($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addAdjudication(new FHIRExplanationOfBenefitAdjudication([FHIRExplanationOfBenefitAdjudication::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addAdjudication(new FHIRExplanationOfBenefitAdjudication([FHIRExplanationOfBenefitAdjudication::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addAdjudication(new FHIRExplanationOfBenefitAdjudication(array_merge($v, $ext[$i]))); + } } else { $this->addAdjudication(new FHIRExplanationOfBenefitAdjudication($v)); } } } elseif ($data[self::FIELD_ADJUDICATION] instanceof FHIRExplanationOfBenefitAdjudication) { $this->addAdjudication($data[self::FIELD_ADJUDICATION]); - } elseif ($ext && is_scalar($data[self::FIELD_ADJUDICATION])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_ADJUDICATION])) { $this->addAdjudication(new FHIRExplanationOfBenefitAdjudication([FHIRExplanationOfBenefitAdjudication::FIELD_VALUE => $data[self::FIELD_ADJUDICATION]] + $ext)); } else { $this->addAdjudication(new FHIRExplanationOfBenefitAdjudication($data[self::FIELD_ADJUDICATION])); @@ -226,8 +233,17 @@ public function __construct($data = null) } } if (isset($data[self::FIELD_FEE])) { + $ext = (isset($data[self::FIELD_FEE_EXT]) && is_array($data[self::FIELD_FEE_EXT])) + ? $data[self::FIELD_FEE_EXT] + : null; if ($data[self::FIELD_FEE] instanceof FHIRMoney) { $this->setFee($data[self::FIELD_FEE]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_FEE])) { + $this->setFee(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_FEE]] + $ext)); + } else if (is_array($data[self::FIELD_FEE])) { + $this->setFee(new FHIRMoney(array_merge($ext, $data[self::FIELD_FEE]))); + } } else { $this->setFee(new FHIRMoney($data[self::FIELD_FEE])); } @@ -235,6 +251,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_MODIFIER])) { if (is_array($data[self::FIELD_MODIFIER])) { foreach($data[self::FIELD_MODIFIER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addModifier($v); } else { @@ -253,17 +272,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_NOTE_NUMBER])) { foreach($data[self::FIELD_NOTE_NUMBER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRPositiveInt) { $this->addNoteNumber($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addNoteNumber(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addNoteNumber(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addNoteNumber(new FHIRPositiveInt(array_merge($v, $ext[$i]))); + } } else { $this->addNoteNumber(new FHIRPositiveInt($v)); } } } elseif ($data[self::FIELD_NOTE_NUMBER] instanceof FHIRPositiveInt) { $this->addNoteNumber($data[self::FIELD_NOTE_NUMBER]); - } elseif ($ext && is_scalar($data[self::FIELD_NOTE_NUMBER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_NOTE_NUMBER])) { $this->addNoteNumber(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_NOTE_NUMBER]] + $ext)); } else { $this->addNoteNumber(new FHIRPositiveInt($data[self::FIELD_NOTE_NUMBER])); @@ -738,15 +764,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_ADJUDICATION, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getCategory())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CATEGORY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getFee())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FEE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getModifier())) { foreach($vs as $v) { if (null === $v) { @@ -763,11 +786,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_NOTE_NUMBER, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getRevenue())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REVENUE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getService())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SERVICE, null, $v->_getFHIRXMLNamespace())); } @@ -781,13 +802,37 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if ([] !== ($vs = $this->getAdjudication())) { - $a[self::FIELD_ADJUDICATION] = $vs; + $a[self::FIELD_ADJUDICATION] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ADJUDICATION][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ADJUDICATION_EXT][] = $enc; + } else { + $a[self::FIELD_ADJUDICATION_EXT][] = null; + } + } else { + $a[self::FIELD_ADJUDICATION][] = $v; + } + } } if (null !== ($v = $this->getCategory())) { $a[self::FIELD_CATEGORY] = $v; } if (null !== ($v = $this->getFee())) { - $a[self::FIELD_FEE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FEE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FEE_EXT] = $enc; + } + } else { + $a[self::FIELD_FEE] = $v; + } } if ([] !== ($vs = $this->getModifier())) { $a[self::FIELD_MODIFIER] = $vs; @@ -798,8 +843,17 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_NOTE_NUMBER][] = $v->getValue(); - $a[self::FIELD_NOTE_NUMBER_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NOTE_NUMBER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NOTE_NUMBER_EXT][] = $enc; + } else { + $a[self::FIELD_NOTE_NUMBER_EXT][] = null; + } + } else { + $a[self::FIELD_NOTE_NUMBER][] = $v; + } } } if (null !== ($v = $this->getRevenue())) { diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitDiagnosis.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitDiagnosis.php index 7aed334f32..21d81cc0fb 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitDiagnosis.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitDiagnosis.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -81,10 +81,6 @@ class FHIRExplanationOfBenefitDiagnosis extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_EXPLANATION_OF_BENEFIT_DOT_DIAGNOSIS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DIAGNOSIS_CODEABLE_CONCEPT = 'diagnosisCodeableConcept'; const FIELD_DIAGNOSIS_REFERENCE = 'diagnosisReference'; const FIELD_PACKAGE_CODE = 'packageCode'; @@ -152,6 +148,9 @@ class FHIRExplanationOfBenefitDiagnosis extends FHIRBackboneElement */ protected $type = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRExplanationOfBenefitDiagnosis Constructor * @param null|array $data @@ -195,8 +194,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SEQUENCE] instanceof FHIRPositiveInt) { $this->setSequence($data[self::FIELD_SEQUENCE]); - } elseif ($ext && is_scalar($data[self::FIELD_SEQUENCE])) { - $this->setSequence(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_SEQUENCE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SEQUENCE])) { + $this->setSequence(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_SEQUENCE]] + $ext)); + } else if (is_array($data[self::FIELD_SEQUENCE])) { + $this->setSequence(new FHIRPositiveInt(array_merge($ext, $data[self::FIELD_SEQUENCE]))); + } } else { $this->setSequence(new FHIRPositiveInt($data[self::FIELD_SEQUENCE])); } @@ -204,6 +207,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_TYPE])) { if (is_array($data[self::FIELD_TYPE])) { foreach($data[self::FIELD_TYPE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addType($v); } else { @@ -537,18 +543,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDiagnosisCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DIAGNOSIS_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDiagnosisReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DIAGNOSIS_REFERENCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPackageCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PACKAGE_CODE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getSequence())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SEQUENCE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getType())) { foreach($vs as $v) { if (null === $v) { @@ -576,8 +579,15 @@ public function jsonSerialize() $a[self::FIELD_PACKAGE_CODE] = $v; } if (null !== ($v = $this->getSequence())) { - $a[self::FIELD_SEQUENCE] = $v->getValue(); - $a[self::FIELD_SEQUENCE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SEQUENCE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SEQUENCE_EXT] = $enc; + } + } else { + $a[self::FIELD_SEQUENCE] = $v; + } } if ([] !== ($vs = $this->getType())) { $a[self::FIELD_TYPE] = $vs; diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitFinancial.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitFinancial.php index 6fbaf455ee..f2cf1fc8cf 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitFinancial.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitFinancial.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -82,17 +82,15 @@ class FHIRExplanationOfBenefitFinancial extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_EXPLANATION_OF_BENEFIT_DOT_FINANCIAL; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ALLOWED_MONEY = 'allowedMoney'; + const FIELD_ALLOWED_MONEY_EXT = '_allowedMoney'; const FIELD_ALLOWED_STRING = 'allowedString'; const FIELD_ALLOWED_STRING_EXT = '_allowedString'; const FIELD_ALLOWED_UNSIGNED_INT = 'allowedUnsignedInt'; const FIELD_ALLOWED_UNSIGNED_INT_EXT = '_allowedUnsignedInt'; const FIELD_TYPE = 'type'; const FIELD_USED_MONEY = 'usedMoney'; + const FIELD_USED_MONEY_EXT = '_usedMoney'; const FIELD_USED_UNSIGNED_INT = 'usedUnsignedInt'; const FIELD_USED_UNSIGNED_INT_EXT = '_usedUnsignedInt'; @@ -163,6 +161,9 @@ class FHIRExplanationOfBenefitFinancial extends FHIRBackboneElement */ protected $usedUnsignedInt = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRExplanationOfBenefitFinancial Constructor * @param null|array $data @@ -180,8 +181,17 @@ public function __construct($data = null) } parent::__construct($data); if (isset($data[self::FIELD_ALLOWED_MONEY])) { + $ext = (isset($data[self::FIELD_ALLOWED_MONEY_EXT]) && is_array($data[self::FIELD_ALLOWED_MONEY_EXT])) + ? $data[self::FIELD_ALLOWED_MONEY_EXT] + : null; if ($data[self::FIELD_ALLOWED_MONEY] instanceof FHIRMoney) { $this->setAllowedMoney($data[self::FIELD_ALLOWED_MONEY]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ALLOWED_MONEY])) { + $this->setAllowedMoney(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_ALLOWED_MONEY]] + $ext)); + } else if (is_array($data[self::FIELD_ALLOWED_MONEY])) { + $this->setAllowedMoney(new FHIRMoney(array_merge($ext, $data[self::FIELD_ALLOWED_MONEY]))); + } } else { $this->setAllowedMoney(new FHIRMoney($data[self::FIELD_ALLOWED_MONEY])); } @@ -192,8 +202,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ALLOWED_STRING] instanceof FHIRString) { $this->setAllowedString($data[self::FIELD_ALLOWED_STRING]); - } elseif ($ext && is_scalar($data[self::FIELD_ALLOWED_STRING])) { - $this->setAllowedString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_ALLOWED_STRING]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ALLOWED_STRING])) { + $this->setAllowedString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_ALLOWED_STRING]] + $ext)); + } else if (is_array($data[self::FIELD_ALLOWED_STRING])) { + $this->setAllowedString(new FHIRString(array_merge($ext, $data[self::FIELD_ALLOWED_STRING]))); + } } else { $this->setAllowedString(new FHIRString($data[self::FIELD_ALLOWED_STRING])); } @@ -204,8 +218,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ALLOWED_UNSIGNED_INT] instanceof FHIRUnsignedInt) { $this->setAllowedUnsignedInt($data[self::FIELD_ALLOWED_UNSIGNED_INT]); - } elseif ($ext && is_scalar($data[self::FIELD_ALLOWED_UNSIGNED_INT])) { - $this->setAllowedUnsignedInt(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_ALLOWED_UNSIGNED_INT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ALLOWED_UNSIGNED_INT])) { + $this->setAllowedUnsignedInt(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_ALLOWED_UNSIGNED_INT]] + $ext)); + } else if (is_array($data[self::FIELD_ALLOWED_UNSIGNED_INT])) { + $this->setAllowedUnsignedInt(new FHIRUnsignedInt(array_merge($ext, $data[self::FIELD_ALLOWED_UNSIGNED_INT]))); + } } else { $this->setAllowedUnsignedInt(new FHIRUnsignedInt($data[self::FIELD_ALLOWED_UNSIGNED_INT])); } @@ -218,8 +236,17 @@ public function __construct($data = null) } } if (isset($data[self::FIELD_USED_MONEY])) { + $ext = (isset($data[self::FIELD_USED_MONEY_EXT]) && is_array($data[self::FIELD_USED_MONEY_EXT])) + ? $data[self::FIELD_USED_MONEY_EXT] + : null; if ($data[self::FIELD_USED_MONEY] instanceof FHIRMoney) { $this->setUsedMoney($data[self::FIELD_USED_MONEY]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_USED_MONEY])) { + $this->setUsedMoney(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_USED_MONEY]] + $ext)); + } else if (is_array($data[self::FIELD_USED_MONEY])) { + $this->setUsedMoney(new FHIRMoney(array_merge($ext, $data[self::FIELD_USED_MONEY]))); + } } else { $this->setUsedMoney(new FHIRMoney($data[self::FIELD_USED_MONEY])); } @@ -230,8 +257,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_USED_UNSIGNED_INT] instanceof FHIRUnsignedInt) { $this->setUsedUnsignedInt($data[self::FIELD_USED_UNSIGNED_INT]); - } elseif ($ext && is_scalar($data[self::FIELD_USED_UNSIGNED_INT])) { - $this->setUsedUnsignedInt(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_USED_UNSIGNED_INT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_USED_UNSIGNED_INT])) { + $this->setUsedUnsignedInt(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_USED_UNSIGNED_INT]] + $ext)); + } else if (is_array($data[self::FIELD_USED_UNSIGNED_INT])) { + $this->setUsedUnsignedInt(new FHIRUnsignedInt(array_merge($ext, $data[self::FIELD_USED_UNSIGNED_INT]))); + } } else { $this->setUsedUnsignedInt(new FHIRUnsignedInt($data[self::FIELD_USED_UNSIGNED_INT])); } @@ -580,11 +611,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getAllowedUnsignedInt())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ALLOWED_UNSIGNED_INT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getUsedMoney())) { $v->xmlSerialize($sxe->addChild(self::FIELD_USED_MONEY, null, $v->_getFHIRXMLNamespace())); } @@ -601,25 +630,62 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getAllowedMoney())) { - $a[self::FIELD_ALLOWED_MONEY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ALLOWED_MONEY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ALLOWED_MONEY_EXT] = $enc; + } + } else { + $a[self::FIELD_ALLOWED_MONEY] = $v; + } } if (null !== ($v = $this->getAllowedString())) { - $a[self::FIELD_ALLOWED_STRING] = $v->getValue(); - $a[self::FIELD_ALLOWED_STRING_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ALLOWED_STRING] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ALLOWED_STRING_EXT] = $enc; + } + } else { + $a[self::FIELD_ALLOWED_STRING] = $v; + } } if (null !== ($v = $this->getAllowedUnsignedInt())) { - $a[self::FIELD_ALLOWED_UNSIGNED_INT] = $v->getValue(); - $a[self::FIELD_ALLOWED_UNSIGNED_INT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ALLOWED_UNSIGNED_INT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ALLOWED_UNSIGNED_INT_EXT] = $enc; + } + } else { + $a[self::FIELD_ALLOWED_UNSIGNED_INT] = $v; + } } if (null !== ($v = $this->getType())) { $a[self::FIELD_TYPE] = $v; } if (null !== ($v = $this->getUsedMoney())) { - $a[self::FIELD_USED_MONEY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_USED_MONEY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_USED_MONEY_EXT] = $enc; + } + } else { + $a[self::FIELD_USED_MONEY] = $v; + } } if (null !== ($v = $this->getUsedUnsignedInt())) { - $a[self::FIELD_USED_UNSIGNED_INT] = $v->getValue(); - $a[self::FIELD_USED_UNSIGNED_INT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_USED_UNSIGNED_INT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_USED_UNSIGNED_INT_EXT] = $enc; + } + } else { + $a[self::FIELD_USED_UNSIGNED_INT] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitInformation.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitInformation.php index fd702f1941..643dd0bfe9 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitInformation.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitInformation.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -87,10 +87,6 @@ class FHIRExplanationOfBenefitInformation extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_EXPLANATION_OF_BENEFIT_DOT_INFORMATION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CATEGORY = 'category'; const FIELD_CODE = 'code'; const FIELD_REASON = 'reason'; @@ -229,6 +225,9 @@ class FHIRExplanationOfBenefitInformation extends FHIRBackboneElement */ protected $valueString = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRExplanationOfBenefitInformation Constructor * @param null|array $data @@ -272,8 +271,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SEQUENCE] instanceof FHIRPositiveInt) { $this->setSequence($data[self::FIELD_SEQUENCE]); - } elseif ($ext && is_scalar($data[self::FIELD_SEQUENCE])) { - $this->setSequence(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_SEQUENCE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SEQUENCE])) { + $this->setSequence(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_SEQUENCE]] + $ext)); + } else if (is_array($data[self::FIELD_SEQUENCE])) { + $this->setSequence(new FHIRPositiveInt(array_merge($ext, $data[self::FIELD_SEQUENCE]))); + } } else { $this->setSequence(new FHIRPositiveInt($data[self::FIELD_SEQUENCE])); } @@ -284,8 +287,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TIMING_DATE] instanceof FHIRDate) { $this->setTimingDate($data[self::FIELD_TIMING_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_TIMING_DATE])) { - $this->setTimingDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_TIMING_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TIMING_DATE])) { + $this->setTimingDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_TIMING_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_TIMING_DATE])) { + $this->setTimingDate(new FHIRDate(array_merge($ext, $data[self::FIELD_TIMING_DATE]))); + } } else { $this->setTimingDate(new FHIRDate($data[self::FIELD_TIMING_DATE])); } @@ -310,8 +317,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_QUANTITY] instanceof FHIRQuantity) { $this->setValueQuantity($data[self::FIELD_VALUE_QUANTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_QUANTITY])) { - $this->setValueQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_VALUE_QUANTITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_QUANTITY])) { + $this->setValueQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_VALUE_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_QUANTITY])) { + $this->setValueQuantity(new FHIRQuantity(array_merge($ext, $data[self::FIELD_VALUE_QUANTITY]))); + } } else { $this->setValueQuantity(new FHIRQuantity($data[self::FIELD_VALUE_QUANTITY])); } @@ -329,8 +340,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_STRING] instanceof FHIRString) { $this->setValueString($data[self::FIELD_VALUE_STRING]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_STRING])) { - $this->setValueString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VALUE_STRING]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_STRING])) { + $this->setValueString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VALUE_STRING]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_STRING])) { + $this->setValueString(new FHIRString(array_merge($ext, $data[self::FIELD_VALUE_STRING]))); + } } else { $this->setValueString(new FHIRString($data[self::FIELD_VALUE_STRING])); } @@ -829,11 +844,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getCategory())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CATEGORY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getReason())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REASON, null, $v->_getFHIRXMLNamespace())); } @@ -843,19 +856,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getTimingDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TIMING_DATE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getTimingPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TIMING_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueAttachment())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_ATTACHMENT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_QUANTITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_REFERENCE, null, $v->_getFHIRXMLNamespace())); } @@ -881,12 +890,26 @@ public function jsonSerialize() $a[self::FIELD_REASON] = $v; } if (null !== ($v = $this->getSequence())) { - $a[self::FIELD_SEQUENCE] = $v->getValue(); - $a[self::FIELD_SEQUENCE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SEQUENCE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SEQUENCE_EXT] = $enc; + } + } else { + $a[self::FIELD_SEQUENCE] = $v; + } } if (null !== ($v = $this->getTimingDate())) { - $a[self::FIELD_TIMING_DATE] = $v->getValue(); - $a[self::FIELD_TIMING_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TIMING_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TIMING_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_TIMING_DATE] = $v; + } } if (null !== ($v = $this->getTimingPeriod())) { $a[self::FIELD_TIMING_PERIOD] = $v; @@ -895,14 +918,29 @@ public function jsonSerialize() $a[self::FIELD_VALUE_ATTACHMENT] = $v; } if (null !== ($v = $this->getValueQuantity())) { - $a[self::FIELD_VALUE_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_QUANTITY] = $v; + } } if (null !== ($v = $this->getValueReference())) { $a[self::FIELD_VALUE_REFERENCE] = $v; } if (null !== ($v = $this->getValueString())) { - $a[self::FIELD_VALUE_STRING] = $v->getValue(); - $a[self::FIELD_VALUE_STRING_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_STRING] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_STRING_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_STRING] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitInsurance.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitInsurance.php index bcbe1434d6..e274076da9 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitInsurance.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitInsurance.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRExplanationOfBenefitInsurance extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_EXPLANATION_OF_BENEFIT_DOT_INSURANCE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_COVERAGE = 'coverage'; const FIELD_PRE_AUTH_REF = 'preAuthRef'; const FIELD_PRE_AUTH_REF_EXT = '_preAuthRef'; @@ -110,6 +106,9 @@ class FHIRExplanationOfBenefitInsurance extends FHIRBackboneElement */ protected $preAuthRef = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRExplanationOfBenefitInsurance Constructor * @param null|array $data @@ -139,17 +138,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_PRE_AUTH_REF])) { foreach($data[self::FIELD_PRE_AUTH_REF] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRString) { $this->addPreAuthRef($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addPreAuthRef(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addPreAuthRef(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addPreAuthRef(new FHIRString(array_merge($v, $ext[$i]))); + } } else { $this->addPreAuthRef(new FHIRString($v)); } } } elseif ($data[self::FIELD_PRE_AUTH_REF] instanceof FHIRString) { $this->addPreAuthRef($data[self::FIELD_PRE_AUTH_REF]); - } elseif ($ext && is_scalar($data[self::FIELD_PRE_AUTH_REF])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_PRE_AUTH_REF])) { $this->addPreAuthRef(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PRE_AUTH_REF]] + $ext)); } else { $this->addPreAuthRef(new FHIRString($data[self::FIELD_PRE_AUTH_REF])); @@ -391,8 +397,17 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_PRE_AUTH_REF][] = $v->getValue(); - $a[self::FIELD_PRE_AUTH_REF_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PRE_AUTH_REF][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PRE_AUTH_REF_EXT][] = $enc; + } else { + $a[self::FIELD_PRE_AUTH_REF_EXT][] = null; + } + } else { + $a[self::FIELD_PRE_AUTH_REF][] = $v; + } } } return $a; diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitItem.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitItem.php index 3a37801c24..48780bfd2d 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitItem.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitItem.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -87,10 +87,6 @@ class FHIRExplanationOfBenefitItem extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_EXPLANATION_OF_BENEFIT_DOT_ITEM; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ADJUDICATION = 'adjudication'; const FIELD_ADJUDICATION_EXT = '_adjudication'; const FIELD_BODY_SITE = 'bodySite'; @@ -110,6 +106,7 @@ class FHIRExplanationOfBenefitItem extends FHIRBackboneElement const FIELD_LOCATION_REFERENCE = 'locationReference'; const FIELD_MODIFIER = 'modifier'; const FIELD_NET = 'net'; + const FIELD_NET_EXT = '_net'; const FIELD_NOTE_NUMBER = 'noteNumber'; const FIELD_NOTE_NUMBER_EXT = '_noteNumber'; const FIELD_PROCEDURE_LINK_ID = 'procedureLinkId'; @@ -127,6 +124,7 @@ class FHIRExplanationOfBenefitItem extends FHIRBackboneElement const FIELD_SUB_SITE = 'subSite'; const FIELD_UDI = 'udi'; const FIELD_UNIT_PRICE = 'unitPrice'; + const FIELD_UNIT_PRICE_EXT = '_unitPrice'; /** * This resource provides: the claim details; adjudication details from the @@ -446,6 +444,9 @@ class FHIRExplanationOfBenefitItem extends FHIRBackboneElement */ protected $unitPrice = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRExplanationOfBenefitItem Constructor * @param null|array $data @@ -468,17 +469,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_ADJUDICATION])) { foreach($data[self::FIELD_ADJUDICATION] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRExplanationOfBenefitAdjudication) { $this->addAdjudication($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addAdjudication(new FHIRExplanationOfBenefitAdjudication([FHIRExplanationOfBenefitAdjudication::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addAdjudication(new FHIRExplanationOfBenefitAdjudication([FHIRExplanationOfBenefitAdjudication::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addAdjudication(new FHIRExplanationOfBenefitAdjudication(array_merge($v, $ext[$i]))); + } } else { $this->addAdjudication(new FHIRExplanationOfBenefitAdjudication($v)); } } } elseif ($data[self::FIELD_ADJUDICATION] instanceof FHIRExplanationOfBenefitAdjudication) { $this->addAdjudication($data[self::FIELD_ADJUDICATION]); - } elseif ($ext && is_scalar($data[self::FIELD_ADJUDICATION])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_ADJUDICATION])) { $this->addAdjudication(new FHIRExplanationOfBenefitAdjudication([FHIRExplanationOfBenefitAdjudication::FIELD_VALUE => $data[self::FIELD_ADJUDICATION]] + $ext)); } else { $this->addAdjudication(new FHIRExplanationOfBenefitAdjudication($data[self::FIELD_ADJUDICATION])); @@ -497,17 +505,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_CARE_TEAM_LINK_ID])) { foreach($data[self::FIELD_CARE_TEAM_LINK_ID] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRPositiveInt) { $this->addCareTeamLinkId($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addCareTeamLinkId(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addCareTeamLinkId(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addCareTeamLinkId(new FHIRPositiveInt(array_merge($v, $ext[$i]))); + } } else { $this->addCareTeamLinkId(new FHIRPositiveInt($v)); } } } elseif ($data[self::FIELD_CARE_TEAM_LINK_ID] instanceof FHIRPositiveInt) { $this->addCareTeamLinkId($data[self::FIELD_CARE_TEAM_LINK_ID]); - } elseif ($ext && is_scalar($data[self::FIELD_CARE_TEAM_LINK_ID])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_CARE_TEAM_LINK_ID])) { $this->addCareTeamLinkId(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_CARE_TEAM_LINK_ID]] + $ext)); } else { $this->addCareTeamLinkId(new FHIRPositiveInt($data[self::FIELD_CARE_TEAM_LINK_ID])); @@ -523,6 +538,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_DETAIL])) { if (is_array($data[self::FIELD_DETAIL])) { foreach($data[self::FIELD_DETAIL] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRExplanationOfBenefitDetail) { $this->addDetail($v); } else { @@ -541,17 +559,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_DIAGNOSIS_LINK_ID])) { foreach($data[self::FIELD_DIAGNOSIS_LINK_ID] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRPositiveInt) { $this->addDiagnosisLinkId($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addDiagnosisLinkId(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addDiagnosisLinkId(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addDiagnosisLinkId(new FHIRPositiveInt(array_merge($v, $ext[$i]))); + } } else { $this->addDiagnosisLinkId(new FHIRPositiveInt($v)); } } } elseif ($data[self::FIELD_DIAGNOSIS_LINK_ID] instanceof FHIRPositiveInt) { $this->addDiagnosisLinkId($data[self::FIELD_DIAGNOSIS_LINK_ID]); - } elseif ($ext && is_scalar($data[self::FIELD_DIAGNOSIS_LINK_ID])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_DIAGNOSIS_LINK_ID])) { $this->addDiagnosisLinkId(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_DIAGNOSIS_LINK_ID]] + $ext)); } else { $this->addDiagnosisLinkId(new FHIRPositiveInt($data[self::FIELD_DIAGNOSIS_LINK_ID])); @@ -560,6 +585,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ENCOUNTER])) { if (is_array($data[self::FIELD_ENCOUNTER])) { foreach($data[self::FIELD_ENCOUNTER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addEncounter($v); } else { @@ -578,8 +606,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_FACTOR] instanceof FHIRDecimal) { $this->setFactor($data[self::FIELD_FACTOR]); - } elseif ($ext && is_scalar($data[self::FIELD_FACTOR])) { - $this->setFactor(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_FACTOR]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_FACTOR])) { + $this->setFactor(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_FACTOR]] + $ext)); + } else if (is_array($data[self::FIELD_FACTOR])) { + $this->setFactor(new FHIRDecimal(array_merge($ext, $data[self::FIELD_FACTOR]))); + } } else { $this->setFactor(new FHIRDecimal($data[self::FIELD_FACTOR])); } @@ -590,17 +622,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_INFORMATION_LINK_ID])) { foreach($data[self::FIELD_INFORMATION_LINK_ID] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRPositiveInt) { $this->addInformationLinkId($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addInformationLinkId(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addInformationLinkId(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addInformationLinkId(new FHIRPositiveInt(array_merge($v, $ext[$i]))); + } } else { $this->addInformationLinkId(new FHIRPositiveInt($v)); } } } elseif ($data[self::FIELD_INFORMATION_LINK_ID] instanceof FHIRPositiveInt) { $this->addInformationLinkId($data[self::FIELD_INFORMATION_LINK_ID]); - } elseif ($ext && is_scalar($data[self::FIELD_INFORMATION_LINK_ID])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_INFORMATION_LINK_ID])) { $this->addInformationLinkId(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_INFORMATION_LINK_ID]] + $ext)); } else { $this->addInformationLinkId(new FHIRPositiveInt($data[self::FIELD_INFORMATION_LINK_ID])); @@ -630,6 +669,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_MODIFIER])) { if (is_array($data[self::FIELD_MODIFIER])) { foreach($data[self::FIELD_MODIFIER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addModifier($v); } else { @@ -643,8 +685,17 @@ public function __construct($data = null) } } if (isset($data[self::FIELD_NET])) { + $ext = (isset($data[self::FIELD_NET_EXT]) && is_array($data[self::FIELD_NET_EXT])) + ? $data[self::FIELD_NET_EXT] + : null; if ($data[self::FIELD_NET] instanceof FHIRMoney) { $this->setNet($data[self::FIELD_NET]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NET])) { + $this->setNet(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_NET]] + $ext)); + } else if (is_array($data[self::FIELD_NET])) { + $this->setNet(new FHIRMoney(array_merge($ext, $data[self::FIELD_NET]))); + } } else { $this->setNet(new FHIRMoney($data[self::FIELD_NET])); } @@ -655,17 +706,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_NOTE_NUMBER])) { foreach($data[self::FIELD_NOTE_NUMBER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRPositiveInt) { $this->addNoteNumber($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addNoteNumber(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addNoteNumber(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addNoteNumber(new FHIRPositiveInt(array_merge($v, $ext[$i]))); + } } else { $this->addNoteNumber(new FHIRPositiveInt($v)); } } } elseif ($data[self::FIELD_NOTE_NUMBER] instanceof FHIRPositiveInt) { $this->addNoteNumber($data[self::FIELD_NOTE_NUMBER]); - } elseif ($ext && is_scalar($data[self::FIELD_NOTE_NUMBER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_NOTE_NUMBER])) { $this->addNoteNumber(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_NOTE_NUMBER]] + $ext)); } else { $this->addNoteNumber(new FHIRPositiveInt($data[self::FIELD_NOTE_NUMBER])); @@ -677,17 +735,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_PROCEDURE_LINK_ID])) { foreach($data[self::FIELD_PROCEDURE_LINK_ID] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRPositiveInt) { $this->addProcedureLinkId($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addProcedureLinkId(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addProcedureLinkId(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addProcedureLinkId(new FHIRPositiveInt(array_merge($v, $ext[$i]))); + } } else { $this->addProcedureLinkId(new FHIRPositiveInt($v)); } } } elseif ($data[self::FIELD_PROCEDURE_LINK_ID] instanceof FHIRPositiveInt) { $this->addProcedureLinkId($data[self::FIELD_PROCEDURE_LINK_ID]); - } elseif ($ext && is_scalar($data[self::FIELD_PROCEDURE_LINK_ID])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_PROCEDURE_LINK_ID])) { $this->addProcedureLinkId(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_PROCEDURE_LINK_ID]] + $ext)); } else { $this->addProcedureLinkId(new FHIRPositiveInt($data[self::FIELD_PROCEDURE_LINK_ID])); @@ -696,6 +761,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PROGRAM_CODE])) { if (is_array($data[self::FIELD_PROGRAM_CODE])) { foreach($data[self::FIELD_PROGRAM_CODE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addProgramCode($v); } else { @@ -714,8 +782,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_QUANTITY] instanceof FHIRQuantity) { $this->setQuantity($data[self::FIELD_QUANTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_QUANTITY])) { - $this->setQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_QUANTITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_QUANTITY])) { + $this->setQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_QUANTITY])) { + $this->setQuantity(new FHIRQuantity(array_merge($ext, $data[self::FIELD_QUANTITY]))); + } } else { $this->setQuantity(new FHIRQuantity($data[self::FIELD_QUANTITY])); } @@ -733,8 +805,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SEQUENCE] instanceof FHIRPositiveInt) { $this->setSequence($data[self::FIELD_SEQUENCE]); - } elseif ($ext && is_scalar($data[self::FIELD_SEQUENCE])) { - $this->setSequence(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_SEQUENCE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SEQUENCE])) { + $this->setSequence(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_SEQUENCE]] + $ext)); + } else if (is_array($data[self::FIELD_SEQUENCE])) { + $this->setSequence(new FHIRPositiveInt(array_merge($ext, $data[self::FIELD_SEQUENCE]))); + } } else { $this->setSequence(new FHIRPositiveInt($data[self::FIELD_SEQUENCE])); } @@ -752,8 +828,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SERVICED_DATE] instanceof FHIRDate) { $this->setServicedDate($data[self::FIELD_SERVICED_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_SERVICED_DATE])) { - $this->setServicedDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_SERVICED_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SERVICED_DATE])) { + $this->setServicedDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_SERVICED_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_SERVICED_DATE])) { + $this->setServicedDate(new FHIRDate(array_merge($ext, $data[self::FIELD_SERVICED_DATE]))); + } } else { $this->setServicedDate(new FHIRDate($data[self::FIELD_SERVICED_DATE])); } @@ -768,6 +848,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SUB_SITE])) { if (is_array($data[self::FIELD_SUB_SITE])) { foreach($data[self::FIELD_SUB_SITE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addSubSite($v); } else { @@ -783,6 +866,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_UDI])) { if (is_array($data[self::FIELD_UDI])) { foreach($data[self::FIELD_UDI] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addUdi($v); } else { @@ -796,8 +882,17 @@ public function __construct($data = null) } } if (isset($data[self::FIELD_UNIT_PRICE])) { + $ext = (isset($data[self::FIELD_UNIT_PRICE_EXT]) && is_array($data[self::FIELD_UNIT_PRICE_EXT])) + ? $data[self::FIELD_UNIT_PRICE_EXT] + : null; if ($data[self::FIELD_UNIT_PRICE] instanceof FHIRMoney) { $this->setUnitPrice($data[self::FIELD_UNIT_PRICE]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_UNIT_PRICE])) { + $this->setUnitPrice(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_UNIT_PRICE]] + $ext)); + } else if (is_array($data[self::FIELD_UNIT_PRICE])) { + $this->setUnitPrice(new FHIRMoney(array_merge($ext, $data[self::FIELD_UNIT_PRICE]))); + } } else { $this->setUnitPrice(new FHIRMoney($data[self::FIELD_UNIT_PRICE])); } @@ -2265,7 +2360,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_ADJUDICATION, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getBodySite())) { $v->xmlSerialize($sxe->addChild(self::FIELD_BODY_SITE, null, $v->_getFHIRXMLNamespace())); } @@ -2277,11 +2371,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_CARE_TEAM_LINK_ID, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getCategory())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CATEGORY, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getDetail())) { foreach($vs as $v) { if (null === $v) { @@ -2298,7 +2390,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_DIAGNOSIS_LINK_ID, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getEncounter())) { foreach($vs as $v) { if (null === $v) { @@ -2318,19 +2409,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_INFORMATION_LINK_ID, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getLocationAddress())) { $v->xmlSerialize($sxe->addChild(self::FIELD_LOCATION_ADDRESS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getLocationCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_LOCATION_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getLocationReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_LOCATION_REFERENCE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getModifier())) { foreach($vs as $v) { if (null === $v) { @@ -2339,7 +2426,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_MODIFIER, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getNet())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NET, null, $v->_getFHIRXMLNamespace())); } @@ -2359,7 +2445,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_PROCEDURE_LINK_ID, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getProgramCode())) { foreach($vs as $v) { if (null === $v) { @@ -2368,29 +2453,24 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_PROGRAM_CODE, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_QUANTITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRevenue())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REVENUE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getSequence())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SEQUENCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getService())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SERVICE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getServicedDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SERVICED_DATE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getServicedPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SERVICED_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getSubSite())) { foreach($vs as $v) { if (null === $v) { @@ -2399,7 +2479,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_SUB_SITE, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getUdi())) { foreach($vs as $v) { if (null === $v) { @@ -2408,7 +2487,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_UDI, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getUnitPrice())) { $v->xmlSerialize($sxe->addChild(self::FIELD_UNIT_PRICE, null, $v->_getFHIRXMLNamespace())); } @@ -2422,7 +2500,23 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if ([] !== ($vs = $this->getAdjudication())) { - $a[self::FIELD_ADJUDICATION] = $vs; + $a[self::FIELD_ADJUDICATION] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ADJUDICATION][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ADJUDICATION_EXT][] = $enc; + } else { + $a[self::FIELD_ADJUDICATION_EXT][] = null; + } + } else { + $a[self::FIELD_ADJUDICATION][] = $v; + } + } } if (null !== ($v = $this->getBodySite())) { $a[self::FIELD_BODY_SITE] = $v; @@ -2433,8 +2527,17 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_CARE_TEAM_LINK_ID][] = $v->getValue(); - $a[self::FIELD_CARE_TEAM_LINK_ID_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CARE_TEAM_LINK_ID][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CARE_TEAM_LINK_ID_EXT][] = $enc; + } else { + $a[self::FIELD_CARE_TEAM_LINK_ID_EXT][] = null; + } + } else { + $a[self::FIELD_CARE_TEAM_LINK_ID][] = $v; + } } } if (null !== ($v = $this->getCategory())) { @@ -2449,16 +2552,32 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_DIAGNOSIS_LINK_ID][] = $v->getValue(); - $a[self::FIELD_DIAGNOSIS_LINK_ID_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DIAGNOSIS_LINK_ID][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DIAGNOSIS_LINK_ID_EXT][] = $enc; + } else { + $a[self::FIELD_DIAGNOSIS_LINK_ID_EXT][] = null; + } + } else { + $a[self::FIELD_DIAGNOSIS_LINK_ID][] = $v; + } } } if ([] !== ($vs = $this->getEncounter())) { $a[self::FIELD_ENCOUNTER] = $vs; } if (null !== ($v = $this->getFactor())) { - $a[self::FIELD_FACTOR] = $v->getValue(); - $a[self::FIELD_FACTOR_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FACTOR] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FACTOR_EXT] = $enc; + } + } else { + $a[self::FIELD_FACTOR] = $v; + } } if ([] !== ($vs = $this->getInformationLinkId())) { $a[self::FIELD_INFORMATION_LINK_ID] = []; @@ -2466,8 +2585,17 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_INFORMATION_LINK_ID][] = $v->getValue(); - $a[self::FIELD_INFORMATION_LINK_ID_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_INFORMATION_LINK_ID][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_INFORMATION_LINK_ID_EXT][] = $enc; + } else { + $a[self::FIELD_INFORMATION_LINK_ID_EXT][] = null; + } + } else { + $a[self::FIELD_INFORMATION_LINK_ID][] = $v; + } } } if (null !== ($v = $this->getLocationAddress())) { @@ -2483,7 +2611,15 @@ public function jsonSerialize() $a[self::FIELD_MODIFIER] = $vs; } if (null !== ($v = $this->getNet())) { - $a[self::FIELD_NET] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NET] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NET_EXT] = $enc; + } + } else { + $a[self::FIELD_NET] = $v; + } } if ([] !== ($vs = $this->getNoteNumber())) { $a[self::FIELD_NOTE_NUMBER] = []; @@ -2491,8 +2627,17 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_NOTE_NUMBER][] = $v->getValue(); - $a[self::FIELD_NOTE_NUMBER_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NOTE_NUMBER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NOTE_NUMBER_EXT][] = $enc; + } else { + $a[self::FIELD_NOTE_NUMBER_EXT][] = null; + } + } else { + $a[self::FIELD_NOTE_NUMBER][] = $v; + } } } if ([] !== ($vs = $this->getProcedureLinkId())) { @@ -2501,29 +2646,60 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_PROCEDURE_LINK_ID][] = $v->getValue(); - $a[self::FIELD_PROCEDURE_LINK_ID_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PROCEDURE_LINK_ID][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PROCEDURE_LINK_ID_EXT][] = $enc; + } else { + $a[self::FIELD_PROCEDURE_LINK_ID_EXT][] = null; + } + } else { + $a[self::FIELD_PROCEDURE_LINK_ID][] = $v; + } } } if ([] !== ($vs = $this->getProgramCode())) { $a[self::FIELD_PROGRAM_CODE] = $vs; } if (null !== ($v = $this->getQuantity())) { - $a[self::FIELD_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_QUANTITY] = $v; + } } if (null !== ($v = $this->getRevenue())) { $a[self::FIELD_REVENUE] = $v; } if (null !== ($v = $this->getSequence())) { - $a[self::FIELD_SEQUENCE] = $v->getValue(); - $a[self::FIELD_SEQUENCE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SEQUENCE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SEQUENCE_EXT] = $enc; + } + } else { + $a[self::FIELD_SEQUENCE] = $v; + } } if (null !== ($v = $this->getService())) { $a[self::FIELD_SERVICE] = $v; } if (null !== ($v = $this->getServicedDate())) { - $a[self::FIELD_SERVICED_DATE] = $v->getValue(); - $a[self::FIELD_SERVICED_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SERVICED_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SERVICED_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_SERVICED_DATE] = $v; + } } if (null !== ($v = $this->getServicedPeriod())) { $a[self::FIELD_SERVICED_PERIOD] = $v; @@ -2535,7 +2711,15 @@ public function jsonSerialize() $a[self::FIELD_UDI] = $vs; } if (null !== ($v = $this->getUnitPrice())) { - $a[self::FIELD_UNIT_PRICE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_UNIT_PRICE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_UNIT_PRICE_EXT] = $enc; + } + } else { + $a[self::FIELD_UNIT_PRICE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitPayee.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitPayee.php index 9dcd483fcb..29d37b872b 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitPayee.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitPayee.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRExplanationOfBenefitPayee extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_EXPLANATION_OF_BENEFIT_DOT_PAYEE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_PARTY = 'party'; const FIELD_RESOURCE_TYPE = 'resourceType'; const FIELD_TYPE = 'type'; @@ -123,6 +119,9 @@ class FHIRExplanationOfBenefitPayee extends FHIRBackboneElement */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRExplanationOfBenefitPayee Constructor * @param null|array $data @@ -368,11 +367,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getParty())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PARTY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getResourceType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RESOURCE_TYPE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitPayment.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitPayment.php index 2487f9f7dc..09486d6c81 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitPayment.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitPayment.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -82,13 +82,11 @@ class FHIRExplanationOfBenefitPayment extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_EXPLANATION_OF_BENEFIT_DOT_PAYMENT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ADJUSTMENT = 'adjustment'; + const FIELD_ADJUSTMENT_EXT = '_adjustment'; const FIELD_ADJUSTMENT_REASON = 'adjustmentReason'; const FIELD_AMOUNT = 'amount'; + const FIELD_AMOUNT_EXT = '_amount'; const FIELD_DATE = 'date'; const FIELD_DATE_EXT = '_date'; const FIELD_IDENTIFIER = 'identifier'; @@ -165,6 +163,9 @@ class FHIRExplanationOfBenefitPayment extends FHIRBackboneElement */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRExplanationOfBenefitPayment Constructor * @param null|array $data @@ -182,8 +183,17 @@ public function __construct($data = null) } parent::__construct($data); if (isset($data[self::FIELD_ADJUSTMENT])) { + $ext = (isset($data[self::FIELD_ADJUSTMENT_EXT]) && is_array($data[self::FIELD_ADJUSTMENT_EXT])) + ? $data[self::FIELD_ADJUSTMENT_EXT] + : null; if ($data[self::FIELD_ADJUSTMENT] instanceof FHIRMoney) { $this->setAdjustment($data[self::FIELD_ADJUSTMENT]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ADJUSTMENT])) { + $this->setAdjustment(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_ADJUSTMENT]] + $ext)); + } else if (is_array($data[self::FIELD_ADJUSTMENT])) { + $this->setAdjustment(new FHIRMoney(array_merge($ext, $data[self::FIELD_ADJUSTMENT]))); + } } else { $this->setAdjustment(new FHIRMoney($data[self::FIELD_ADJUSTMENT])); } @@ -196,8 +206,17 @@ public function __construct($data = null) } } if (isset($data[self::FIELD_AMOUNT])) { + $ext = (isset($data[self::FIELD_AMOUNT_EXT]) && is_array($data[self::FIELD_AMOUNT_EXT])) + ? $data[self::FIELD_AMOUNT_EXT] + : null; if ($data[self::FIELD_AMOUNT] instanceof FHIRMoney) { $this->setAmount($data[self::FIELD_AMOUNT]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_AMOUNT])) { + $this->setAmount(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_AMOUNT]] + $ext)); + } else if (is_array($data[self::FIELD_AMOUNT])) { + $this->setAmount(new FHIRMoney(array_merge($ext, $data[self::FIELD_AMOUNT]))); + } } else { $this->setAmount(new FHIRMoney($data[self::FIELD_AMOUNT])); } @@ -208,8 +227,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATE] instanceof FHIRDate) { $this->setDate($data[self::FIELD_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_DATE])) { - $this->setDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDate(array_merge($ext, $data[self::FIELD_DATE]))); + } } else { $this->setDate(new FHIRDate($data[self::FIELD_DATE])); } @@ -220,8 +243,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->setIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { - $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_IDENTIFIER]))); + } } else { $this->setIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); } @@ -555,22 +582,18 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getAdjustment())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ADJUSTMENT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getAdjustmentReason())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ADJUSTMENT_REASON, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getAmount())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AMOUNT, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DATE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -584,20 +607,51 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getAdjustment())) { - $a[self::FIELD_ADJUSTMENT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ADJUSTMENT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ADJUSTMENT_EXT] = $enc; + } + } else { + $a[self::FIELD_ADJUSTMENT] = $v; + } } if (null !== ($v = $this->getAdjustmentReason())) { $a[self::FIELD_ADJUSTMENT_REASON] = $v; } if (null !== ($v = $this->getAmount())) { - $a[self::FIELD_AMOUNT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_AMOUNT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_AMOUNT_EXT] = $enc; + } + } else { + $a[self::FIELD_AMOUNT] = $v; + } } if (null !== ($v = $this->getDate())) { - $a[self::FIELD_DATE] = $v->getValue(); - $a[self::FIELD_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_DATE] = $v; + } } if (null !== ($v = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_IDENTIFIER] = $v; + } } if (null !== ($v = $this->getType())) { $a[self::FIELD_TYPE] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitProcedure.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitProcedure.php index 3f52dce173..f95c501ef9 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitProcedure.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitProcedure.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -82,10 +82,6 @@ class FHIRExplanationOfBenefitProcedure extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_EXPLANATION_OF_BENEFIT_DOT_PROCEDURE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DATE = 'date'; const FIELD_DATE_EXT = '_date'; const FIELD_PROCEDURE_CODEABLE_CONCEPT = 'procedureCodeableConcept'; @@ -141,6 +137,9 @@ class FHIRExplanationOfBenefitProcedure extends FHIRBackboneElement */ protected $sequence = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRExplanationOfBenefitProcedure Constructor * @param null|array $data @@ -163,8 +162,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATE] instanceof FHIRDateTime) { $this->setDate($data[self::FIELD_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_DATE])) { - $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime(array_merge($ext, $data[self::FIELD_DATE]))); + } } else { $this->setDate(new FHIRDateTime($data[self::FIELD_DATE])); } @@ -189,8 +192,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SEQUENCE] instanceof FHIRPositiveInt) { $this->setSequence($data[self::FIELD_SEQUENCE]); - } elseif ($ext && is_scalar($data[self::FIELD_SEQUENCE])) { - $this->setSequence(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_SEQUENCE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SEQUENCE])) { + $this->setSequence(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_SEQUENCE]] + $ext)); + } else if (is_array($data[self::FIELD_SEQUENCE])) { + $this->setSequence(new FHIRPositiveInt(array_merge($ext, $data[self::FIELD_SEQUENCE]))); + } } else { $this->setSequence(new FHIRPositiveInt($data[self::FIELD_SEQUENCE])); } @@ -458,14 +465,13 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DATE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getProcedureCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PROCEDURE_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getProcedureReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PROCEDURE_REFERENCE, null, $v->_getFHIRXMLNamespace())); } @@ -482,8 +488,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getDate())) { - $a[self::FIELD_DATE] = $v->getValue(); - $a[self::FIELD_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_DATE] = $v; + } } if (null !== ($v = $this->getProcedureCodeableConcept())) { $a[self::FIELD_PROCEDURE_CODEABLE_CONCEPT] = $v; @@ -492,8 +505,15 @@ public function jsonSerialize() $a[self::FIELD_PROCEDURE_REFERENCE] = $v; } if (null !== ($v = $this->getSequence())) { - $a[self::FIELD_SEQUENCE] = $v->getValue(); - $a[self::FIELD_SEQUENCE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SEQUENCE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SEQUENCE_EXT] = $enc; + } + } else { + $a[self::FIELD_SEQUENCE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitProcessNote.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitProcessNote.php index dfddda65e7..7464ea898d 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitProcessNote.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitProcessNote.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -81,10 +81,6 @@ class FHIRExplanationOfBenefitProcessNote extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_EXPLANATION_OF_BENEFIT_DOT_PROCESS_NOTE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_LANGUAGE = 'language'; const FIELD_NUMBER = 'number'; const FIELD_NUMBER_EXT = '_number'; @@ -142,6 +138,9 @@ class FHIRExplanationOfBenefitProcessNote extends FHIRBackboneElement */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRExplanationOfBenefitProcessNote Constructor * @param null|array $data @@ -171,8 +170,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NUMBER] instanceof FHIRPositiveInt) { $this->setNumber($data[self::FIELD_NUMBER]); - } elseif ($ext && is_scalar($data[self::FIELD_NUMBER])) { - $this->setNumber(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_NUMBER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NUMBER])) { + $this->setNumber(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_NUMBER]] + $ext)); + } else if (is_array($data[self::FIELD_NUMBER])) { + $this->setNumber(new FHIRPositiveInt(array_merge($ext, $data[self::FIELD_NUMBER]))); + } } else { $this->setNumber(new FHIRPositiveInt($data[self::FIELD_NUMBER])); } @@ -183,8 +186,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TEXT] instanceof FHIRString) { $this->setText($data[self::FIELD_TEXT]); - } elseif ($ext && is_scalar($data[self::FIELD_TEXT])) { - $this->setText(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TEXT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TEXT])) { + $this->setText(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TEXT]] + $ext)); + } else if (is_array($data[self::FIELD_TEXT])) { + $this->setText(new FHIRString(array_merge($ext, $data[self::FIELD_TEXT]))); + } } else { $this->setText(new FHIRString($data[self::FIELD_TEXT])); } @@ -473,7 +480,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getText())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TEXT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -490,12 +496,26 @@ public function jsonSerialize() $a[self::FIELD_LANGUAGE] = $v; } if (null !== ($v = $this->getNumber())) { - $a[self::FIELD_NUMBER] = $v->getValue(); - $a[self::FIELD_NUMBER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NUMBER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NUMBER_EXT] = $enc; + } + } else { + $a[self::FIELD_NUMBER] = $v; + } } if (null !== ($v = $this->getText())) { - $a[self::FIELD_TEXT] = $v->getValue(); - $a[self::FIELD_TEXT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TEXT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TEXT_EXT] = $enc; + } + } else { + $a[self::FIELD_TEXT] = $v; + } } if (null !== ($v = $this->getType())) { $a[self::FIELD_TYPE] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitRelated.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitRelated.php index 919d518b46..d14cfe69f5 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitRelated.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitRelated.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -81,10 +81,6 @@ class FHIRExplanationOfBenefitRelated extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_EXPLANATION_OF_BENEFIT_DOT_RELATED; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CLAIM = 'claim'; const FIELD_REFERENCE = 'reference'; const FIELD_REFERENCE_EXT = '_reference'; @@ -127,6 +123,9 @@ class FHIRExplanationOfBenefitRelated extends FHIRBackboneElement */ protected $relationship = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRExplanationOfBenefitRelated Constructor * @param null|array $data @@ -156,8 +155,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_REFERENCE] instanceof FHIRIdentifier) { $this->setReference($data[self::FIELD_REFERENCE]); - } elseif ($ext && is_scalar($data[self::FIELD_REFERENCE])) { - $this->setReference(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_REFERENCE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_REFERENCE])) { + $this->setReference(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_REFERENCE]] + $ext)); + } else if (is_array($data[self::FIELD_REFERENCE])) { + $this->setReference(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_REFERENCE]))); + } } else { $this->setReference(new FHIRIdentifier($data[self::FIELD_REFERENCE])); } @@ -381,11 +384,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getClaim())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CLAIM, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REFERENCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRelationship())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RELATIONSHIP, null, $v->_getFHIRXMLNamespace())); } @@ -402,7 +403,15 @@ public function jsonSerialize() $a[self::FIELD_CLAIM] = $v; } if (null !== ($v = $this->getReference())) { - $a[self::FIELD_REFERENCE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_REFERENCE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_REFERENCE_EXT] = $enc; + } + } else { + $a[self::FIELD_REFERENCE] = $v; + } } if (null !== ($v = $this->getRelationship())) { $a[self::FIELD_RELATIONSHIP] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitSubDetail.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitSubDetail.php index 0caf7ee0da..170334d9a2 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitSubDetail.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitSubDetail.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -84,10 +84,6 @@ class FHIRExplanationOfBenefitSubDetail extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_EXPLANATION_OF_BENEFIT_DOT_SUB_DETAIL; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ADJUDICATION = 'adjudication'; const FIELD_ADJUDICATION_EXT = '_adjudication'; const FIELD_CATEGORY = 'category'; @@ -95,6 +91,7 @@ class FHIRExplanationOfBenefitSubDetail extends FHIRBackboneElement const FIELD_FACTOR_EXT = '_factor'; const FIELD_MODIFIER = 'modifier'; const FIELD_NET = 'net'; + const FIELD_NET_EXT = '_net'; const FIELD_NOTE_NUMBER = 'noteNumber'; const FIELD_NOTE_NUMBER_EXT = '_noteNumber'; const FIELD_PROGRAM_CODE = 'programCode'; @@ -107,6 +104,7 @@ class FHIRExplanationOfBenefitSubDetail extends FHIRBackboneElement const FIELD_TYPE = 'type'; const FIELD_UDI = 'udi'; const FIELD_UNIT_PRICE = 'unitPrice'; + const FIELD_UNIT_PRICE_EXT = '_unitPrice'; /** * This resource provides: the claim details; adjudication details from the @@ -281,6 +279,9 @@ class FHIRExplanationOfBenefitSubDetail extends FHIRBackboneElement */ protected $unitPrice = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRExplanationOfBenefitSubDetail Constructor * @param null|array $data @@ -303,17 +304,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_ADJUDICATION])) { foreach($data[self::FIELD_ADJUDICATION] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRExplanationOfBenefitAdjudication) { $this->addAdjudication($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addAdjudication(new FHIRExplanationOfBenefitAdjudication([FHIRExplanationOfBenefitAdjudication::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addAdjudication(new FHIRExplanationOfBenefitAdjudication([FHIRExplanationOfBenefitAdjudication::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addAdjudication(new FHIRExplanationOfBenefitAdjudication(array_merge($v, $ext[$i]))); + } } else { $this->addAdjudication(new FHIRExplanationOfBenefitAdjudication($v)); } } } elseif ($data[self::FIELD_ADJUDICATION] instanceof FHIRExplanationOfBenefitAdjudication) { $this->addAdjudication($data[self::FIELD_ADJUDICATION]); - } elseif ($ext && is_scalar($data[self::FIELD_ADJUDICATION])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_ADJUDICATION])) { $this->addAdjudication(new FHIRExplanationOfBenefitAdjudication([FHIRExplanationOfBenefitAdjudication::FIELD_VALUE => $data[self::FIELD_ADJUDICATION]] + $ext)); } else { $this->addAdjudication(new FHIRExplanationOfBenefitAdjudication($data[self::FIELD_ADJUDICATION])); @@ -332,8 +340,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_FACTOR] instanceof FHIRDecimal) { $this->setFactor($data[self::FIELD_FACTOR]); - } elseif ($ext && is_scalar($data[self::FIELD_FACTOR])) { - $this->setFactor(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_FACTOR]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_FACTOR])) { + $this->setFactor(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_FACTOR]] + $ext)); + } else if (is_array($data[self::FIELD_FACTOR])) { + $this->setFactor(new FHIRDecimal(array_merge($ext, $data[self::FIELD_FACTOR]))); + } } else { $this->setFactor(new FHIRDecimal($data[self::FIELD_FACTOR])); } @@ -341,6 +353,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_MODIFIER])) { if (is_array($data[self::FIELD_MODIFIER])) { foreach($data[self::FIELD_MODIFIER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addModifier($v); } else { @@ -354,8 +369,17 @@ public function __construct($data = null) } } if (isset($data[self::FIELD_NET])) { + $ext = (isset($data[self::FIELD_NET_EXT]) && is_array($data[self::FIELD_NET_EXT])) + ? $data[self::FIELD_NET_EXT] + : null; if ($data[self::FIELD_NET] instanceof FHIRMoney) { $this->setNet($data[self::FIELD_NET]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NET])) { + $this->setNet(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_NET]] + $ext)); + } else if (is_array($data[self::FIELD_NET])) { + $this->setNet(new FHIRMoney(array_merge($ext, $data[self::FIELD_NET]))); + } } else { $this->setNet(new FHIRMoney($data[self::FIELD_NET])); } @@ -366,17 +390,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_NOTE_NUMBER])) { foreach($data[self::FIELD_NOTE_NUMBER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRPositiveInt) { $this->addNoteNumber($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addNoteNumber(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addNoteNumber(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addNoteNumber(new FHIRPositiveInt(array_merge($v, $ext[$i]))); + } } else { $this->addNoteNumber(new FHIRPositiveInt($v)); } } } elseif ($data[self::FIELD_NOTE_NUMBER] instanceof FHIRPositiveInt) { $this->addNoteNumber($data[self::FIELD_NOTE_NUMBER]); - } elseif ($ext && is_scalar($data[self::FIELD_NOTE_NUMBER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_NOTE_NUMBER])) { $this->addNoteNumber(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_NOTE_NUMBER]] + $ext)); } else { $this->addNoteNumber(new FHIRPositiveInt($data[self::FIELD_NOTE_NUMBER])); @@ -385,6 +416,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PROGRAM_CODE])) { if (is_array($data[self::FIELD_PROGRAM_CODE])) { foreach($data[self::FIELD_PROGRAM_CODE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addProgramCode($v); } else { @@ -403,8 +437,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_QUANTITY] instanceof FHIRQuantity) { $this->setQuantity($data[self::FIELD_QUANTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_QUANTITY])) { - $this->setQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_QUANTITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_QUANTITY])) { + $this->setQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_QUANTITY])) { + $this->setQuantity(new FHIRQuantity(array_merge($ext, $data[self::FIELD_QUANTITY]))); + } } else { $this->setQuantity(new FHIRQuantity($data[self::FIELD_QUANTITY])); } @@ -422,8 +460,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SEQUENCE] instanceof FHIRPositiveInt) { $this->setSequence($data[self::FIELD_SEQUENCE]); - } elseif ($ext && is_scalar($data[self::FIELD_SEQUENCE])) { - $this->setSequence(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_SEQUENCE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SEQUENCE])) { + $this->setSequence(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_SEQUENCE]] + $ext)); + } else if (is_array($data[self::FIELD_SEQUENCE])) { + $this->setSequence(new FHIRPositiveInt(array_merge($ext, $data[self::FIELD_SEQUENCE]))); + } } else { $this->setSequence(new FHIRPositiveInt($data[self::FIELD_SEQUENCE])); } @@ -445,6 +487,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_UDI])) { if (is_array($data[self::FIELD_UDI])) { foreach($data[self::FIELD_UDI] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addUdi($v); } else { @@ -458,8 +503,17 @@ public function __construct($data = null) } } if (isset($data[self::FIELD_UNIT_PRICE])) { + $ext = (isset($data[self::FIELD_UNIT_PRICE_EXT]) && is_array($data[self::FIELD_UNIT_PRICE_EXT])) + ? $data[self::FIELD_UNIT_PRICE_EXT] + : null; if ($data[self::FIELD_UNIT_PRICE] instanceof FHIRMoney) { $this->setUnitPrice($data[self::FIELD_UNIT_PRICE]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_UNIT_PRICE])) { + $this->setUnitPrice(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_UNIT_PRICE]] + $ext)); + } else if (is_array($data[self::FIELD_UNIT_PRICE])) { + $this->setUnitPrice(new FHIRMoney(array_merge($ext, $data[self::FIELD_UNIT_PRICE]))); + } } else { $this->setUnitPrice(new FHIRMoney($data[self::FIELD_UNIT_PRICE])); } @@ -1252,14 +1306,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_ADJUDICATION, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getCategory())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CATEGORY, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getFactor())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FACTOR, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getModifier())) { foreach($vs as $v) { if (null === $v) { @@ -1268,7 +1320,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_MODIFIER, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getNet())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NET, null, $v->_getFHIRXMLNamespace())); } @@ -1280,7 +1331,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_NOTE_NUMBER, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getProgramCode())) { foreach($vs as $v) { if (null === $v) { @@ -1289,26 +1339,21 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_PROGRAM_CODE, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_QUANTITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRevenue())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REVENUE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getSequence())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SEQUENCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getService())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SERVICE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getUdi())) { foreach($vs as $v) { if (null === $v) { @@ -1317,7 +1362,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_UDI, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getUnitPrice())) { $v->xmlSerialize($sxe->addChild(self::FIELD_UNIT_PRICE, null, $v->_getFHIRXMLNamespace())); } @@ -1331,20 +1375,51 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if ([] !== ($vs = $this->getAdjudication())) { - $a[self::FIELD_ADJUDICATION] = $vs; + $a[self::FIELD_ADJUDICATION] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ADJUDICATION][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ADJUDICATION_EXT][] = $enc; + } else { + $a[self::FIELD_ADJUDICATION_EXT][] = null; + } + } else { + $a[self::FIELD_ADJUDICATION][] = $v; + } + } } if (null !== ($v = $this->getCategory())) { $a[self::FIELD_CATEGORY] = $v; } if (null !== ($v = $this->getFactor())) { - $a[self::FIELD_FACTOR] = $v->getValue(); - $a[self::FIELD_FACTOR_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FACTOR] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FACTOR_EXT] = $enc; + } + } else { + $a[self::FIELD_FACTOR] = $v; + } } if ([] !== ($vs = $this->getModifier())) { $a[self::FIELD_MODIFIER] = $vs; } if (null !== ($v = $this->getNet())) { - $a[self::FIELD_NET] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NET] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NET_EXT] = $enc; + } + } else { + $a[self::FIELD_NET] = $v; + } } if ([] !== ($vs = $this->getNoteNumber())) { $a[self::FIELD_NOTE_NUMBER] = []; @@ -1352,22 +1427,46 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_NOTE_NUMBER][] = $v->getValue(); - $a[self::FIELD_NOTE_NUMBER_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NOTE_NUMBER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NOTE_NUMBER_EXT][] = $enc; + } else { + $a[self::FIELD_NOTE_NUMBER_EXT][] = null; + } + } else { + $a[self::FIELD_NOTE_NUMBER][] = $v; + } } } if ([] !== ($vs = $this->getProgramCode())) { $a[self::FIELD_PROGRAM_CODE] = $vs; } if (null !== ($v = $this->getQuantity())) { - $a[self::FIELD_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_QUANTITY] = $v; + } } if (null !== ($v = $this->getRevenue())) { $a[self::FIELD_REVENUE] = $v; } if (null !== ($v = $this->getSequence())) { - $a[self::FIELD_SEQUENCE] = $v->getValue(); - $a[self::FIELD_SEQUENCE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SEQUENCE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SEQUENCE_EXT] = $enc; + } + } else { + $a[self::FIELD_SEQUENCE] = $v; + } } if (null !== ($v = $this->getService())) { $a[self::FIELD_SERVICE] = $v; @@ -1379,7 +1478,15 @@ public function jsonSerialize() $a[self::FIELD_UDI] = $vs; } if (null !== ($v = $this->getUnitPrice())) { - $a[self::FIELD_UNIT_PRICE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_UNIT_PRICE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_UNIT_PRICE_EXT] = $enc; + } + } else { + $a[self::FIELD_UNIT_PRICE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRFamilyMemberHistory/FHIRFamilyMemberHistoryCondition.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRFamilyMemberHistory/FHIRFamilyMemberHistoryCondition.php index 17159e5832..9c122c04b7 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRFamilyMemberHistory/FHIRFamilyMemberHistoryCondition.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRFamilyMemberHistory/FHIRFamilyMemberHistoryCondition.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -83,13 +83,10 @@ class FHIRFamilyMemberHistoryCondition extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_FAMILY_MEMBER_HISTORY_DOT_CONDITION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CODE = 'code'; const FIELD_NOTE = 'note'; const FIELD_ONSET_AGE = 'onsetAge'; + const FIELD_ONSET_AGE_EXT = '_onsetAge'; const FIELD_ONSET_PERIOD = 'onsetPeriod'; const FIELD_ONSET_RANGE = 'onsetRange'; const FIELD_ONSET_STRING = 'onsetString'; @@ -187,6 +184,9 @@ class FHIRFamilyMemberHistoryCondition extends FHIRBackboneElement */ protected $outcome = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRFamilyMemberHistoryCondition Constructor * @param null|array $data @@ -213,6 +213,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_NOTE])) { if (is_array($data[self::FIELD_NOTE])) { foreach($data[self::FIELD_NOTE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRAnnotation) { $this->addNote($v); } else { @@ -226,8 +229,17 @@ public function __construct($data = null) } } if (isset($data[self::FIELD_ONSET_AGE])) { + $ext = (isset($data[self::FIELD_ONSET_AGE_EXT]) && is_array($data[self::FIELD_ONSET_AGE_EXT])) + ? $data[self::FIELD_ONSET_AGE_EXT] + : null; if ($data[self::FIELD_ONSET_AGE] instanceof FHIRAge) { $this->setOnsetAge($data[self::FIELD_ONSET_AGE]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ONSET_AGE])) { + $this->setOnsetAge(new FHIRAge([FHIRAge::FIELD_VALUE => $data[self::FIELD_ONSET_AGE]] + $ext)); + } else if (is_array($data[self::FIELD_ONSET_AGE])) { + $this->setOnsetAge(new FHIRAge(array_merge($ext, $data[self::FIELD_ONSET_AGE]))); + } } else { $this->setOnsetAge(new FHIRAge($data[self::FIELD_ONSET_AGE])); } @@ -252,8 +264,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ONSET_STRING] instanceof FHIRString) { $this->setOnsetString($data[self::FIELD_ONSET_STRING]); - } elseif ($ext && is_scalar($data[self::FIELD_ONSET_STRING])) { - $this->setOnsetString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_ONSET_STRING]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ONSET_STRING])) { + $this->setOnsetString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_ONSET_STRING]] + $ext)); + } else if (is_array($data[self::FIELD_ONSET_STRING])) { + $this->setOnsetString(new FHIRString(array_merge($ext, $data[self::FIELD_ONSET_STRING]))); + } } else { $this->setOnsetString(new FHIRString($data[self::FIELD_ONSET_STRING])); } @@ -669,7 +685,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getNote())) { foreach($vs as $v) { if (null === $v) { @@ -678,22 +693,18 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_NOTE, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getOnsetAge())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ONSET_AGE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOnsetPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ONSET_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOnsetRange())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ONSET_RANGE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getOnsetString())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ONSET_STRING, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOutcome())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OUTCOME, null, $v->_getFHIRXMLNamespace())); } @@ -713,7 +724,15 @@ public function jsonSerialize() $a[self::FIELD_NOTE] = $vs; } if (null !== ($v = $this->getOnsetAge())) { - $a[self::FIELD_ONSET_AGE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ONSET_AGE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ONSET_AGE_EXT] = $enc; + } + } else { + $a[self::FIELD_ONSET_AGE] = $v; + } } if (null !== ($v = $this->getOnsetPeriod())) { $a[self::FIELD_ONSET_PERIOD] = $v; @@ -722,8 +741,15 @@ public function jsonSerialize() $a[self::FIELD_ONSET_RANGE] = $v; } if (null !== ($v = $this->getOnsetString())) { - $a[self::FIELD_ONSET_STRING] = $v->getValue(); - $a[self::FIELD_ONSET_STRING_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ONSET_STRING] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ONSET_STRING_EXT] = $enc; + } + } else { + $a[self::FIELD_ONSET_STRING] = $v; + } } if (null !== ($v = $this->getOutcome())) { $a[self::FIELD_OUTCOME] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRGoal/FHIRGoalTarget.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRGoal/FHIRGoalTarget.php index bc5915a243..3150a6362f 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRGoal/FHIRGoalTarget.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRGoal/FHIRGoalTarget.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -83,10 +83,6 @@ class FHIRGoalTarget extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_GOAL_DOT_TARGET; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DETAIL_CODEABLE_CONCEPT = 'detailCodeableConcept'; const FIELD_DETAIL_QUANTITY = 'detailQuantity'; const FIELD_DETAIL_QUANTITY_EXT = '_detailQuantity'; @@ -94,6 +90,7 @@ class FHIRGoalTarget extends FHIRBackboneElement const FIELD_DUE_DATE = 'dueDate'; const FIELD_DUE_DATE_EXT = '_dueDate'; const FIELD_DUE_DURATION = 'dueDuration'; + const FIELD_DUE_DURATION_EXT = '_dueDuration'; const FIELD_MEASURE = 'measure'; /** @@ -185,6 +182,9 @@ class FHIRGoalTarget extends FHIRBackboneElement */ protected $measure = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRGoalTarget Constructor * @param null|array $data @@ -214,8 +214,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DETAIL_QUANTITY] instanceof FHIRQuantity) { $this->setDetailQuantity($data[self::FIELD_DETAIL_QUANTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_DETAIL_QUANTITY])) { - $this->setDetailQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_DETAIL_QUANTITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DETAIL_QUANTITY])) { + $this->setDetailQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_DETAIL_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_DETAIL_QUANTITY])) { + $this->setDetailQuantity(new FHIRQuantity(array_merge($ext, $data[self::FIELD_DETAIL_QUANTITY]))); + } } else { $this->setDetailQuantity(new FHIRQuantity($data[self::FIELD_DETAIL_QUANTITY])); } @@ -233,15 +237,28 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DUE_DATE] instanceof FHIRDate) { $this->setDueDate($data[self::FIELD_DUE_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_DUE_DATE])) { - $this->setDueDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_DUE_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DUE_DATE])) { + $this->setDueDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_DUE_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_DUE_DATE])) { + $this->setDueDate(new FHIRDate(array_merge($ext, $data[self::FIELD_DUE_DATE]))); + } } else { $this->setDueDate(new FHIRDate($data[self::FIELD_DUE_DATE])); } } if (isset($data[self::FIELD_DUE_DURATION])) { + $ext = (isset($data[self::FIELD_DUE_DURATION_EXT]) && is_array($data[self::FIELD_DUE_DURATION_EXT])) + ? $data[self::FIELD_DUE_DURATION_EXT] + : null; if ($data[self::FIELD_DUE_DURATION] instanceof FHIRDuration) { $this->setDueDuration($data[self::FIELD_DUE_DURATION]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DUE_DURATION])) { + $this->setDueDuration(new FHIRDuration([FHIRDuration::FIELD_VALUE => $data[self::FIELD_DUE_DURATION]] + $ext)); + } else if (is_array($data[self::FIELD_DUE_DURATION])) { + $this->setDueDuration(new FHIRDuration(array_merge($ext, $data[self::FIELD_DUE_DURATION]))); + } } else { $this->setDueDuration(new FHIRDuration($data[self::FIELD_DUE_DURATION])); } @@ -613,22 +630,18 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDetailCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DETAIL_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDetailQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DETAIL_QUANTITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDetailRange())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DETAIL_RANGE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getDueDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DUE_DATE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDueDuration())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DUE_DURATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getMeasure())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MEASURE, null, $v->_getFHIRXMLNamespace())); } @@ -645,17 +658,40 @@ public function jsonSerialize() $a[self::FIELD_DETAIL_CODEABLE_CONCEPT] = $v; } if (null !== ($v = $this->getDetailQuantity())) { - $a[self::FIELD_DETAIL_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DETAIL_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DETAIL_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_DETAIL_QUANTITY] = $v; + } } if (null !== ($v = $this->getDetailRange())) { $a[self::FIELD_DETAIL_RANGE] = $v; } if (null !== ($v = $this->getDueDate())) { - $a[self::FIELD_DUE_DATE] = $v->getValue(); - $a[self::FIELD_DUE_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DUE_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DUE_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_DUE_DATE] = $v; + } } if (null !== ($v = $this->getDueDuration())) { - $a[self::FIELD_DUE_DURATION] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DUE_DURATION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DUE_DURATION_EXT] = $enc; + } + } else { + $a[self::FIELD_DUE_DURATION] = $v; + } } if (null !== ($v = $this->getMeasure())) { $a[self::FIELD_MEASURE] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRGraphDefinition/FHIRGraphDefinitionCompartment.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRGraphDefinition/FHIRGraphDefinitionCompartment.php index d88d2e49c8..94ed5b8489 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRGraphDefinition/FHIRGraphDefinitionCompartment.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRGraphDefinition/FHIRGraphDefinitionCompartment.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -81,10 +81,6 @@ class FHIRGraphDefinitionCompartment extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_GRAPH_DEFINITION_DOT_COMPARTMENT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CODE = 'code'; const FIELD_CODE_EXT = '_code'; const FIELD_DESCRIPTION = 'description'; @@ -136,6 +132,9 @@ class FHIRGraphDefinitionCompartment extends FHIRBackboneElement */ protected $rule = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRGraphDefinitionCompartment Constructor * @param null|array $data @@ -158,8 +157,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CODE] instanceof FHIRCompartmentType) { $this->setCode($data[self::FIELD_CODE]); - } elseif ($ext && is_scalar($data[self::FIELD_CODE])) { - $this->setCode(new FHIRCompartmentType([FHIRCompartmentType::FIELD_VALUE => $data[self::FIELD_CODE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CODE])) { + $this->setCode(new FHIRCompartmentType([FHIRCompartmentType::FIELD_VALUE => $data[self::FIELD_CODE]] + $ext)); + } else if (is_array($data[self::FIELD_CODE])) { + $this->setCode(new FHIRCompartmentType(array_merge($ext, $data[self::FIELD_CODE]))); + } } else { $this->setCode(new FHIRCompartmentType($data[self::FIELD_CODE])); } @@ -170,8 +173,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -182,8 +189,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EXPRESSION] instanceof FHIRString) { $this->setExpression($data[self::FIELD_EXPRESSION]); - } elseif ($ext && is_scalar($data[self::FIELD_EXPRESSION])) { - $this->setExpression(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_EXPRESSION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EXPRESSION])) { + $this->setExpression(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_EXPRESSION]] + $ext)); + } else if (is_array($data[self::FIELD_EXPRESSION])) { + $this->setExpression(new FHIRString(array_merge($ext, $data[self::FIELD_EXPRESSION]))); + } } else { $this->setExpression(new FHIRString($data[self::FIELD_EXPRESSION])); } @@ -194,8 +205,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_RULE] instanceof FHIRGraphCompartmentRule) { $this->setRule($data[self::FIELD_RULE]); - } elseif ($ext && is_scalar($data[self::FIELD_RULE])) { - $this->setRule(new FHIRGraphCompartmentRule([FHIRGraphCompartmentRule::FIELD_VALUE => $data[self::FIELD_RULE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_RULE])) { + $this->setRule(new FHIRGraphCompartmentRule([FHIRGraphCompartmentRule::FIELD_VALUE => $data[self::FIELD_RULE]] + $ext)); + } else if (is_array($data[self::FIELD_RULE])) { + $this->setRule(new FHIRGraphCompartmentRule(array_merge($ext, $data[self::FIELD_RULE]))); + } } else { $this->setRule(new FHIRGraphCompartmentRule($data[self::FIELD_RULE])); } @@ -461,7 +476,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getExpression())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EXPRESSION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRule())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RULE, null, $v->_getFHIRXMLNamespace())); } @@ -475,18 +489,48 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getCode())) { - $a[self::FIELD_CODE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CODE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CODE_EXT] = $enc; + } + } else { + $a[self::FIELD_CODE] = $v; + } } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if (null !== ($v = $this->getExpression())) { - $a[self::FIELD_EXPRESSION] = $v->getValue(); - $a[self::FIELD_EXPRESSION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EXPRESSION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EXPRESSION_EXT] = $enc; + } + } else { + $a[self::FIELD_EXPRESSION] = $v; + } } if (null !== ($v = $this->getRule())) { - $a[self::FIELD_RULE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_RULE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_RULE_EXT] = $enc; + } + } else { + $a[self::FIELD_RULE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRGraphDefinition/FHIRGraphDefinitionLink.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRGraphDefinition/FHIRGraphDefinitionLink.php index 80c60adfc2..cecf844142 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRGraphDefinition/FHIRGraphDefinitionLink.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRGraphDefinition/FHIRGraphDefinitionLink.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRGraphDefinitionLink extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_GRAPH_DEFINITION_DOT_LINK; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DESCRIPTION = 'description'; const FIELD_DESCRIPTION_EXT = '_description'; const FIELD_MAX = 'max'; @@ -162,6 +158,9 @@ class FHIRGraphDefinitionLink extends FHIRBackboneElement */ protected $target = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRGraphDefinitionLink Constructor * @param null|array $data @@ -184,8 +183,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -196,8 +199,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MAX] instanceof FHIRString) { $this->setMax($data[self::FIELD_MAX]); - } elseif ($ext && is_scalar($data[self::FIELD_MAX])) { - $this->setMax(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_MAX]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MAX])) { + $this->setMax(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_MAX]] + $ext)); + } else if (is_array($data[self::FIELD_MAX])) { + $this->setMax(new FHIRString(array_merge($ext, $data[self::FIELD_MAX]))); + } } else { $this->setMax(new FHIRString($data[self::FIELD_MAX])); } @@ -208,8 +215,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MIN] instanceof FHIRInteger) { $this->setMin($data[self::FIELD_MIN]); - } elseif ($ext && is_scalar($data[self::FIELD_MIN])) { - $this->setMin(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_MIN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MIN])) { + $this->setMin(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_MIN]] + $ext)); + } else if (is_array($data[self::FIELD_MIN])) { + $this->setMin(new FHIRInteger(array_merge($ext, $data[self::FIELD_MIN]))); + } } else { $this->setMin(new FHIRInteger($data[self::FIELD_MIN])); } @@ -220,8 +231,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PATH] instanceof FHIRString) { $this->setPath($data[self::FIELD_PATH]); - } elseif ($ext && is_scalar($data[self::FIELD_PATH])) { - $this->setPath(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PATH]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PATH])) { + $this->setPath(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PATH]] + $ext)); + } else if (is_array($data[self::FIELD_PATH])) { + $this->setPath(new FHIRString(array_merge($ext, $data[self::FIELD_PATH]))); + } } else { $this->setPath(new FHIRString($data[self::FIELD_PATH])); } @@ -232,8 +247,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SLICE_NAME] instanceof FHIRString) { $this->setSliceName($data[self::FIELD_SLICE_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_SLICE_NAME])) { - $this->setSliceName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SLICE_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SLICE_NAME])) { + $this->setSliceName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SLICE_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_SLICE_NAME])) { + $this->setSliceName(new FHIRString(array_merge($ext, $data[self::FIELD_SLICE_NAME]))); + } } else { $this->setSliceName(new FHIRString($data[self::FIELD_SLICE_NAME])); } @@ -241,6 +260,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_TARGET])) { if (is_array($data[self::FIELD_TARGET])) { foreach($data[self::FIELD_TARGET] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRGraphDefinitionTarget) { $this->addTarget($v); } else { @@ -635,6 +657,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getDescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESCRIPTION, null, $v->_getFHIRXMLNamespace())); } @@ -650,7 +673,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getSliceName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SLICE_NAME, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getTarget())) { foreach($vs as $v) { if (null === $v) { @@ -669,24 +691,59 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if (null !== ($v = $this->getMax())) { - $a[self::FIELD_MAX] = $v->getValue(); - $a[self::FIELD_MAX_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MAX] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MAX_EXT] = $enc; + } + } else { + $a[self::FIELD_MAX] = $v; + } } if (null !== ($v = $this->getMin())) { - $a[self::FIELD_MIN] = $v->getValue(); - $a[self::FIELD_MIN_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MIN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MIN_EXT] = $enc; + } + } else { + $a[self::FIELD_MIN] = $v; + } } if (null !== ($v = $this->getPath())) { - $a[self::FIELD_PATH] = $v->getValue(); - $a[self::FIELD_PATH_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PATH] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PATH_EXT] = $enc; + } + } else { + $a[self::FIELD_PATH] = $v; + } } if (null !== ($v = $this->getSliceName())) { - $a[self::FIELD_SLICE_NAME] = $v->getValue(); - $a[self::FIELD_SLICE_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SLICE_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SLICE_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_SLICE_NAME] = $v; + } } if ([] !== ($vs = $this->getTarget())) { $a[self::FIELD_TARGET] = $vs; diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRGraphDefinition/FHIRGraphDefinitionTarget.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRGraphDefinition/FHIRGraphDefinitionTarget.php index 26c51a4edb..9e9800dfd4 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRGraphDefinition/FHIRGraphDefinitionTarget.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRGraphDefinition/FHIRGraphDefinitionTarget.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRGraphDefinitionTarget extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_GRAPH_DEFINITION_DOT_TARGET; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_COMPARTMENT = 'compartment'; const FIELD_LINK = 'link'; const FIELD_PROFILE = 'profile'; @@ -133,6 +129,9 @@ class FHIRGraphDefinitionTarget extends FHIRBackboneElement */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRGraphDefinitionTarget Constructor * @param null|array $data @@ -152,6 +151,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_COMPARTMENT])) { if (is_array($data[self::FIELD_COMPARTMENT])) { foreach($data[self::FIELD_COMPARTMENT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRGraphDefinitionCompartment) { $this->addCompartment($v); } else { @@ -167,6 +169,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_LINK])) { if (is_array($data[self::FIELD_LINK])) { foreach($data[self::FIELD_LINK] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRGraphDefinitionLink) { $this->addLink($v); } else { @@ -185,8 +190,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PROFILE] instanceof FHIRUri) { $this->setProfile($data[self::FIELD_PROFILE]); - } elseif ($ext && is_scalar($data[self::FIELD_PROFILE])) { - $this->setProfile(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_PROFILE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PROFILE])) { + $this->setProfile(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_PROFILE]] + $ext)); + } else if (is_array($data[self::FIELD_PROFILE])) { + $this->setProfile(new FHIRUri(array_merge($ext, $data[self::FIELD_PROFILE]))); + } } else { $this->setProfile(new FHIRUri($data[self::FIELD_PROFILE])); } @@ -512,7 +521,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_COMPARTMENT, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getLink())) { foreach($vs as $v) { if (null === $v) { @@ -523,8 +531,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 } if (null !== ($v = $this->getProfile())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PROFILE, null, $v->_getFHIRXMLNamespace())); - } - if (null !== ($v = $this->getType())) { + } if (null !== ($v = $this->getType())) { $sxe->addAttribute(self::FIELD_TYPE, (string)$v); } return $sxe; @@ -543,8 +550,15 @@ public function jsonSerialize() $a[self::FIELD_LINK] = $vs; } if (null !== ($v = $this->getProfile())) { - $a[self::FIELD_PROFILE] = $v->getValue(); - $a[self::FIELD_PROFILE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PROFILE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PROFILE_EXT] = $enc; + } + } else { + $a[self::FIELD_PROFILE] = $v; + } } if (null !== ($v = $this->getType())) { $a[self::FIELD_TYPE] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRGroup/FHIRGroupCharacteristic.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRGroup/FHIRGroupCharacteristic.php index 1d9f0142e4..ffba80fed7 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRGroup/FHIRGroupCharacteristic.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRGroup/FHIRGroupCharacteristic.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -83,10 +83,6 @@ class FHIRGroupCharacteristic extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_GROUP_DOT_CHARACTERISTIC; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CODE = 'code'; const FIELD_EXCLUDE = 'exclude'; const FIELD_EXCLUDE_EXT = '_exclude'; @@ -183,6 +179,9 @@ class FHIRGroupCharacteristic extends FHIRBackboneElement */ protected $valueRange = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRGroupCharacteristic Constructor * @param null|array $data @@ -212,8 +211,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EXCLUDE] instanceof FHIRBoolean) { $this->setExclude($data[self::FIELD_EXCLUDE]); - } elseif ($ext && is_scalar($data[self::FIELD_EXCLUDE])) { - $this->setExclude(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_EXCLUDE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EXCLUDE])) { + $this->setExclude(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_EXCLUDE]] + $ext)); + } else if (is_array($data[self::FIELD_EXCLUDE])) { + $this->setExclude(new FHIRBoolean(array_merge($ext, $data[self::FIELD_EXCLUDE]))); + } } else { $this->setExclude(new FHIRBoolean($data[self::FIELD_EXCLUDE])); } @@ -231,8 +234,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_BOOLEAN] instanceof FHIRBoolean) { $this->setValueBoolean($data[self::FIELD_VALUE_BOOLEAN]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_BOOLEAN])) { - $this->setValueBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_VALUE_BOOLEAN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_BOOLEAN])) { + $this->setValueBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_VALUE_BOOLEAN]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_BOOLEAN])) { + $this->setValueBoolean(new FHIRBoolean(array_merge($ext, $data[self::FIELD_VALUE_BOOLEAN]))); + } } else { $this->setValueBoolean(new FHIRBoolean($data[self::FIELD_VALUE_BOOLEAN])); } @@ -250,8 +257,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_QUANTITY] instanceof FHIRQuantity) { $this->setValueQuantity($data[self::FIELD_VALUE_QUANTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_QUANTITY])) { - $this->setValueQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_VALUE_QUANTITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_QUANTITY])) { + $this->setValueQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_VALUE_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_QUANTITY])) { + $this->setValueQuantity(new FHIRQuantity(array_merge($ext, $data[self::FIELD_VALUE_QUANTITY]))); + } } else { $this->setValueQuantity(new FHIRQuantity($data[self::FIELD_VALUE_QUANTITY])); } @@ -640,22 +651,18 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getExclude())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EXCLUDE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PERIOD, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getValueBoolean())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_BOOLEAN, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_QUANTITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueRange())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_RANGE, null, $v->_getFHIRXMLNamespace())); } @@ -672,21 +679,43 @@ public function jsonSerialize() $a[self::FIELD_CODE] = $v; } if (null !== ($v = $this->getExclude())) { - $a[self::FIELD_EXCLUDE] = $v->getValue(); - $a[self::FIELD_EXCLUDE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EXCLUDE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EXCLUDE_EXT] = $enc; + } + } else { + $a[self::FIELD_EXCLUDE] = $v; + } } if (null !== ($v = $this->getPeriod())) { $a[self::FIELD_PERIOD] = $v; } if (null !== ($v = $this->getValueBoolean())) { - $a[self::FIELD_VALUE_BOOLEAN] = $v->getValue(); - $a[self::FIELD_VALUE_BOOLEAN_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_BOOLEAN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_BOOLEAN_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_BOOLEAN] = $v; + } } if (null !== ($v = $this->getValueCodeableConcept())) { $a[self::FIELD_VALUE_CODEABLE_CONCEPT] = $v; } if (null !== ($v = $this->getValueQuantity())) { - $a[self::FIELD_VALUE_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_QUANTITY] = $v; + } } if (null !== ($v = $this->getValueRange())) { $a[self::FIELD_VALUE_RANGE] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRGroup/FHIRGroupMember.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRGroup/FHIRGroupMember.php index a1a9505941..d4791dd349 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRGroup/FHIRGroupMember.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRGroup/FHIRGroupMember.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -81,10 +81,6 @@ class FHIRGroupMember extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_GROUP_DOT_MEMBER; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ENTITY = 'entity'; const FIELD_INACTIVE = 'inactive'; const FIELD_INACTIVE_EXT = '_inactive'; @@ -124,6 +120,9 @@ class FHIRGroupMember extends FHIRBackboneElement */ protected $period = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRGroupMember Constructor * @param null|array $data @@ -153,8 +152,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_INACTIVE] instanceof FHIRBoolean) { $this->setInactive($data[self::FIELD_INACTIVE]); - } elseif ($ext && is_scalar($data[self::FIELD_INACTIVE])) { - $this->setInactive(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_INACTIVE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_INACTIVE])) { + $this->setInactive(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_INACTIVE]] + $ext)); + } else if (is_array($data[self::FIELD_INACTIVE])) { + $this->setInactive(new FHIRBoolean(array_merge($ext, $data[self::FIELD_INACTIVE]))); + } } else { $this->setInactive(new FHIRBoolean($data[self::FIELD_INACTIVE])); } @@ -386,7 +389,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getInactive())) { $v->xmlSerialize($sxe->addChild(self::FIELD_INACTIVE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PERIOD, null, $v->_getFHIRXMLNamespace())); } @@ -403,8 +405,15 @@ public function jsonSerialize() $a[self::FIELD_ENTITY] = $v; } if (null !== ($v = $this->getInactive())) { - $a[self::FIELD_INACTIVE] = $v->getValue(); - $a[self::FIELD_INACTIVE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_INACTIVE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_INACTIVE_EXT] = $enc; + } + } else { + $a[self::FIELD_INACTIVE] = $v; + } } if (null !== ($v = $this->getPeriod())) { $a[self::FIELD_PERIOD] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRHealthcareService/FHIRHealthcareServiceAvailableTime.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRHealthcareService/FHIRHealthcareServiceAvailableTime.php index 6b79e4166e..249c089341 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRHealthcareService/FHIRHealthcareServiceAvailableTime.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRHealthcareService/FHIRHealthcareServiceAvailableTime.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRHealthcareServiceAvailableTime extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_HEALTHCARE_SERVICE_DOT_AVAILABLE_TIME; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ALL_DAY = 'allDay'; const FIELD_ALL_DAY_EXT = '_allDay'; const FIELD_AVAILABLE_END_TIME = 'availableEndTime'; @@ -134,6 +130,9 @@ class FHIRHealthcareServiceAvailableTime extends FHIRBackboneElement */ protected $daysOfWeek = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRHealthcareServiceAvailableTime Constructor * @param null|array $data @@ -156,8 +155,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ALL_DAY] instanceof FHIRBoolean) { $this->setAllDay($data[self::FIELD_ALL_DAY]); - } elseif ($ext && is_scalar($data[self::FIELD_ALL_DAY])) { - $this->setAllDay(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_ALL_DAY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ALL_DAY])) { + $this->setAllDay(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_ALL_DAY]] + $ext)); + } else if (is_array($data[self::FIELD_ALL_DAY])) { + $this->setAllDay(new FHIRBoolean(array_merge($ext, $data[self::FIELD_ALL_DAY]))); + } } else { $this->setAllDay(new FHIRBoolean($data[self::FIELD_ALL_DAY])); } @@ -168,8 +171,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_AVAILABLE_END_TIME] instanceof FHIRTime) { $this->setAvailableEndTime($data[self::FIELD_AVAILABLE_END_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_AVAILABLE_END_TIME])) { - $this->setAvailableEndTime(new FHIRTime([FHIRTime::FIELD_VALUE => $data[self::FIELD_AVAILABLE_END_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_AVAILABLE_END_TIME])) { + $this->setAvailableEndTime(new FHIRTime([FHIRTime::FIELD_VALUE => $data[self::FIELD_AVAILABLE_END_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_AVAILABLE_END_TIME])) { + $this->setAvailableEndTime(new FHIRTime(array_merge($ext, $data[self::FIELD_AVAILABLE_END_TIME]))); + } } else { $this->setAvailableEndTime(new FHIRTime($data[self::FIELD_AVAILABLE_END_TIME])); } @@ -180,8 +187,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_AVAILABLE_START_TIME] instanceof FHIRTime) { $this->setAvailableStartTime($data[self::FIELD_AVAILABLE_START_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_AVAILABLE_START_TIME])) { - $this->setAvailableStartTime(new FHIRTime([FHIRTime::FIELD_VALUE => $data[self::FIELD_AVAILABLE_START_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_AVAILABLE_START_TIME])) { + $this->setAvailableStartTime(new FHIRTime([FHIRTime::FIELD_VALUE => $data[self::FIELD_AVAILABLE_START_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_AVAILABLE_START_TIME])) { + $this->setAvailableStartTime(new FHIRTime(array_merge($ext, $data[self::FIELD_AVAILABLE_START_TIME]))); + } } else { $this->setAvailableStartTime(new FHIRTime($data[self::FIELD_AVAILABLE_START_TIME])); } @@ -192,17 +203,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_DAYS_OF_WEEK])) { foreach($data[self::FIELD_DAYS_OF_WEEK] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRDaysOfWeek) { $this->addDaysOfWeek($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addDaysOfWeek(new FHIRDaysOfWeek([FHIRDaysOfWeek::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addDaysOfWeek(new FHIRDaysOfWeek([FHIRDaysOfWeek::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addDaysOfWeek(new FHIRDaysOfWeek(array_merge($v, $ext[$i]))); + } } else { $this->addDaysOfWeek(new FHIRDaysOfWeek($v)); } } } elseif ($data[self::FIELD_DAYS_OF_WEEK] instanceof FHIRDaysOfWeek) { $this->addDaysOfWeek($data[self::FIELD_DAYS_OF_WEEK]); - } elseif ($ext && is_scalar($data[self::FIELD_DAYS_OF_WEEK])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_DAYS_OF_WEEK])) { $this->addDaysOfWeek(new FHIRDaysOfWeek([FHIRDaysOfWeek::FIELD_VALUE => $data[self::FIELD_DAYS_OF_WEEK]] + $ext)); } else { $this->addDaysOfWeek(new FHIRDaysOfWeek($data[self::FIELD_DAYS_OF_WEEK])); @@ -497,6 +515,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getAllDay())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ALL_DAY, null, $v->_getFHIRXMLNamespace())); } @@ -506,7 +525,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getAvailableStartTime())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AVAILABLE_START_TIME, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getDaysOfWeek())) { foreach($vs as $v) { if (null === $v) { @@ -525,19 +543,56 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getAllDay())) { - $a[self::FIELD_ALL_DAY] = $v->getValue(); - $a[self::FIELD_ALL_DAY_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ALL_DAY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ALL_DAY_EXT] = $enc; + } + } else { + $a[self::FIELD_ALL_DAY] = $v; + } } if (null !== ($v = $this->getAvailableEndTime())) { - $a[self::FIELD_AVAILABLE_END_TIME] = $v->getValue(); - $a[self::FIELD_AVAILABLE_END_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_AVAILABLE_END_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_AVAILABLE_END_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_AVAILABLE_END_TIME] = $v; + } } if (null !== ($v = $this->getAvailableStartTime())) { - $a[self::FIELD_AVAILABLE_START_TIME] = $v->getValue(); - $a[self::FIELD_AVAILABLE_START_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_AVAILABLE_START_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_AVAILABLE_START_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_AVAILABLE_START_TIME] = $v; + } } if ([] !== ($vs = $this->getDaysOfWeek())) { - $a[self::FIELD_DAYS_OF_WEEK] = $vs; + $a[self::FIELD_DAYS_OF_WEEK] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DAYS_OF_WEEK][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DAYS_OF_WEEK_EXT][] = $enc; + } else { + $a[self::FIELD_DAYS_OF_WEEK_EXT][] = null; + } + } else { + $a[self::FIELD_DAYS_OF_WEEK][] = $v; + } + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRHealthcareService/FHIRHealthcareServiceNotAvailable.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRHealthcareService/FHIRHealthcareServiceNotAvailable.php index 0ea3ed8899..46afa728cf 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRHealthcareService/FHIRHealthcareServiceNotAvailable.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRHealthcareService/FHIRHealthcareServiceNotAvailable.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRHealthcareServiceNotAvailable extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_HEALTHCARE_SERVICE_DOT_NOT_AVAILABLE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DESCRIPTION = 'description'; const FIELD_DESCRIPTION_EXT = '_description'; const FIELD_DURING = 'during'; @@ -109,6 +105,9 @@ class FHIRHealthcareServiceNotAvailable extends FHIRBackboneElement */ protected $during = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRHealthcareServiceNotAvailable Constructor * @param null|array $data @@ -131,8 +130,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -324,10 +327,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getDescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESCRIPTION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDuring())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DURING, null, $v->_getFHIRXMLNamespace())); } @@ -341,8 +344,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if (null !== ($v = $this->getDuring())) { $a[self::FIELD_DURING] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRImagingManifest/FHIRImagingManifestInstance.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRImagingManifest/FHIRImagingManifestInstance.php index afa896e0d9..80635fdf68 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRImagingManifest/FHIRImagingManifestInstance.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRImagingManifest/FHIRImagingManifestInstance.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRImagingManifestInstance extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_IMAGING_MANIFEST_DOT_INSTANCE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_SOP_CLASS = 'sopClass'; const FIELD_SOP_CLASS_EXT = '_sopClass'; const FIELD_UID = 'uid'; @@ -111,6 +107,9 @@ class FHIRImagingManifestInstance extends FHIRBackboneElement */ protected $uid = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRImagingManifestInstance Constructor * @param null|array $data @@ -133,8 +132,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SOP_CLASS] instanceof FHIROid) { $this->setSopClass($data[self::FIELD_SOP_CLASS]); - } elseif ($ext && is_scalar($data[self::FIELD_SOP_CLASS])) { - $this->setSopClass(new FHIROid([FHIROid::FIELD_VALUE => $data[self::FIELD_SOP_CLASS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SOP_CLASS])) { + $this->setSopClass(new FHIROid([FHIROid::FIELD_VALUE => $data[self::FIELD_SOP_CLASS]] + $ext)); + } else if (is_array($data[self::FIELD_SOP_CLASS])) { + $this->setSopClass(new FHIROid(array_merge($ext, $data[self::FIELD_SOP_CLASS]))); + } } else { $this->setSopClass(new FHIROid($data[self::FIELD_SOP_CLASS])); } @@ -145,8 +148,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_UID] instanceof FHIROid) { $this->setUid($data[self::FIELD_UID]); - } elseif ($ext && is_scalar($data[self::FIELD_UID])) { - $this->setUid(new FHIROid([FHIROid::FIELD_VALUE => $data[self::FIELD_UID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_UID])) { + $this->setUid(new FHIROid([FHIROid::FIELD_VALUE => $data[self::FIELD_UID]] + $ext)); + } else if (is_array($data[self::FIELD_UID])) { + $this->setUid(new FHIROid(array_merge($ext, $data[self::FIELD_UID]))); + } } else { $this->setUid(new FHIROid($data[self::FIELD_UID])); } @@ -344,6 +351,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getSopClass())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SOP_CLASS, null, $v->_getFHIRXMLNamespace())); } @@ -360,12 +368,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getSopClass())) { - $a[self::FIELD_SOP_CLASS] = $v->getValue(); - $a[self::FIELD_SOP_CLASS_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SOP_CLASS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SOP_CLASS_EXT] = $enc; + } + } else { + $a[self::FIELD_SOP_CLASS] = $v; + } } if (null !== ($v = $this->getUid())) { - $a[self::FIELD_UID] = $v->getValue(); - $a[self::FIELD_UID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_UID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_UID_EXT] = $enc; + } + } else { + $a[self::FIELD_UID] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRImagingManifest/FHIRImagingManifestSeries.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRImagingManifest/FHIRImagingManifestSeries.php index d4abd4ca15..a0b66b5a5b 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRImagingManifest/FHIRImagingManifestSeries.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRImagingManifest/FHIRImagingManifestSeries.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRImagingManifestSeries extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_IMAGING_MANIFEST_DOT_SERIES; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ENDPOINT = 'endpoint'; const FIELD_INSTANCE = 'instance'; const FIELD_UID = 'uid'; @@ -124,6 +120,9 @@ class FHIRImagingManifestSeries extends FHIRBackboneElement */ protected $uid = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRImagingManifestSeries Constructor * @param null|array $data @@ -143,6 +142,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ENDPOINT])) { if (is_array($data[self::FIELD_ENDPOINT])) { foreach($data[self::FIELD_ENDPOINT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addEndpoint($v); } else { @@ -158,6 +160,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_INSTANCE])) { if (is_array($data[self::FIELD_INSTANCE])) { foreach($data[self::FIELD_INSTANCE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRImagingManifestInstance) { $this->addInstance($v); } else { @@ -176,8 +181,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_UID] instanceof FHIROid) { $this->setUid($data[self::FIELD_UID]); - } elseif ($ext && is_scalar($data[self::FIELD_UID])) { - $this->setUid(new FHIROid([FHIROid::FIELD_VALUE => $data[self::FIELD_UID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_UID])) { + $this->setUid(new FHIROid([FHIROid::FIELD_VALUE => $data[self::FIELD_UID]] + $ext)); + } else if (is_array($data[self::FIELD_UID])) { + $this->setUid(new FHIROid(array_merge($ext, $data[self::FIELD_UID]))); + } } else { $this->setUid(new FHIROid($data[self::FIELD_UID])); } @@ -466,7 +475,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_ENDPOINT, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getInstance())) { foreach($vs as $v) { if (null === $v) { @@ -494,8 +502,15 @@ public function jsonSerialize() $a[self::FIELD_INSTANCE] = $vs; } if (null !== ($v = $this->getUid())) { - $a[self::FIELD_UID] = $v->getValue(); - $a[self::FIELD_UID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_UID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_UID_EXT] = $enc; + } + } else { + $a[self::FIELD_UID] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRImagingManifest/FHIRImagingManifestStudy.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRImagingManifest/FHIRImagingManifestStudy.php index 105c9b3e85..e77b78bed8 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRImagingManifest/FHIRImagingManifestStudy.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRImagingManifest/FHIRImagingManifestStudy.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRImagingManifestStudy extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_IMAGING_MANIFEST_DOT_STUDY; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ENDPOINT = 'endpoint'; const FIELD_IMAGING_STUDY = 'imagingStudy'; const FIELD_SERIES = 'series'; @@ -137,6 +133,9 @@ class FHIRImagingManifestStudy extends FHIRBackboneElement */ protected $uid = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRImagingManifestStudy Constructor * @param null|array $data @@ -156,6 +155,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ENDPOINT])) { if (is_array($data[self::FIELD_ENDPOINT])) { foreach($data[self::FIELD_ENDPOINT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addEndpoint($v); } else { @@ -178,6 +180,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SERIES])) { if (is_array($data[self::FIELD_SERIES])) { foreach($data[self::FIELD_SERIES] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRImagingManifestSeries) { $this->addSeries($v); } else { @@ -196,8 +201,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_UID] instanceof FHIROid) { $this->setUid($data[self::FIELD_UID]); - } elseif ($ext && is_scalar($data[self::FIELD_UID])) { - $this->setUid(new FHIROid([FHIROid::FIELD_VALUE => $data[self::FIELD_UID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_UID])) { + $this->setUid(new FHIROid([FHIROid::FIELD_VALUE => $data[self::FIELD_UID]] + $ext)); + } else if (is_array($data[self::FIELD_UID])) { + $this->setUid(new FHIROid(array_merge($ext, $data[self::FIELD_UID]))); + } } else { $this->setUid(new FHIROid($data[self::FIELD_UID])); } @@ -522,11 +531,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_ENDPOINT, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getImagingStudy())) { $v->xmlSerialize($sxe->addChild(self::FIELD_IMAGING_STUDY, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getSeries())) { foreach($vs as $v) { if (null === $v) { @@ -557,8 +564,15 @@ public function jsonSerialize() $a[self::FIELD_SERIES] = $vs; } if (null !== ($v = $this->getUid())) { - $a[self::FIELD_UID] = $v->getValue(); - $a[self::FIELD_UID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_UID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_UID_EXT] = $enc; + } + } else { + $a[self::FIELD_UID] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRImagingStudy/FHIRImagingStudyInstance.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRImagingStudy/FHIRImagingStudyInstance.php index 094070c482..116dcc7f9b 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRImagingStudy/FHIRImagingStudyInstance.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRImagingStudy/FHIRImagingStudyInstance.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -83,10 +83,6 @@ class FHIRImagingStudyInstance extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_IMAGING_STUDY_DOT_INSTANCE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_NUMBER = 'number'; const FIELD_NUMBER_EXT = '_number'; const FIELD_SOP_CLASS = 'sopClass'; @@ -142,6 +138,9 @@ class FHIRImagingStudyInstance extends FHIRBackboneElement */ protected $uid = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRImagingStudyInstance Constructor * @param null|array $data @@ -164,8 +163,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NUMBER] instanceof FHIRUnsignedInt) { $this->setNumber($data[self::FIELD_NUMBER]); - } elseif ($ext && is_scalar($data[self::FIELD_NUMBER])) { - $this->setNumber(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_NUMBER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NUMBER])) { + $this->setNumber(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_NUMBER]] + $ext)); + } else if (is_array($data[self::FIELD_NUMBER])) { + $this->setNumber(new FHIRUnsignedInt(array_merge($ext, $data[self::FIELD_NUMBER]))); + } } else { $this->setNumber(new FHIRUnsignedInt($data[self::FIELD_NUMBER])); } @@ -176,8 +179,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SOP_CLASS] instanceof FHIROid) { $this->setSopClass($data[self::FIELD_SOP_CLASS]); - } elseif ($ext && is_scalar($data[self::FIELD_SOP_CLASS])) { - $this->setSopClass(new FHIROid([FHIROid::FIELD_VALUE => $data[self::FIELD_SOP_CLASS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SOP_CLASS])) { + $this->setSopClass(new FHIROid([FHIROid::FIELD_VALUE => $data[self::FIELD_SOP_CLASS]] + $ext)); + } else if (is_array($data[self::FIELD_SOP_CLASS])) { + $this->setSopClass(new FHIROid(array_merge($ext, $data[self::FIELD_SOP_CLASS]))); + } } else { $this->setSopClass(new FHIROid($data[self::FIELD_SOP_CLASS])); } @@ -188,8 +195,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TITLE] instanceof FHIRString) { $this->setTitle($data[self::FIELD_TITLE]); - } elseif ($ext && is_scalar($data[self::FIELD_TITLE])) { - $this->setTitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TITLE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TITLE])) { + $this->setTitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TITLE]] + $ext)); + } else if (is_array($data[self::FIELD_TITLE])) { + $this->setTitle(new FHIRString(array_merge($ext, $data[self::FIELD_TITLE]))); + } } else { $this->setTitle(new FHIRString($data[self::FIELD_TITLE])); } @@ -200,8 +211,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_UID] instanceof FHIROid) { $this->setUid($data[self::FIELD_UID]); - } elseif ($ext && is_scalar($data[self::FIELD_UID])) { - $this->setUid(new FHIROid([FHIROid::FIELD_VALUE => $data[self::FIELD_UID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_UID])) { + $this->setUid(new FHIROid([FHIROid::FIELD_VALUE => $data[self::FIELD_UID]] + $ext)); + } else if (is_array($data[self::FIELD_UID])) { + $this->setUid(new FHIROid(array_merge($ext, $data[self::FIELD_UID]))); + } } else { $this->setUid(new FHIROid($data[self::FIELD_UID])); } @@ -487,6 +502,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getNumber())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NUMBER, null, $v->_getFHIRXMLNamespace())); } @@ -509,20 +525,48 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getNumber())) { - $a[self::FIELD_NUMBER] = $v->getValue(); - $a[self::FIELD_NUMBER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NUMBER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NUMBER_EXT] = $enc; + } + } else { + $a[self::FIELD_NUMBER] = $v; + } } if (null !== ($v = $this->getSopClass())) { - $a[self::FIELD_SOP_CLASS] = $v->getValue(); - $a[self::FIELD_SOP_CLASS_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SOP_CLASS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SOP_CLASS_EXT] = $enc; + } + } else { + $a[self::FIELD_SOP_CLASS] = $v; + } } if (null !== ($v = $this->getTitle())) { - $a[self::FIELD_TITLE] = $v->getValue(); - $a[self::FIELD_TITLE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TITLE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TITLE_EXT] = $enc; + } + } else { + $a[self::FIELD_TITLE] = $v; + } } if (null !== ($v = $this->getUid())) { - $a[self::FIELD_UID] = $v->getValue(); - $a[self::FIELD_UID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_UID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_UID_EXT] = $enc; + } + } else { + $a[self::FIELD_UID] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRImagingStudy/FHIRImagingStudySeries.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRImagingStudy/FHIRImagingStudySeries.php index 8a5aa221f0..33584b74c2 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRImagingStudy/FHIRImagingStudySeries.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRImagingStudy/FHIRImagingStudySeries.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -87,10 +87,6 @@ class FHIRImagingStudySeries extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_IMAGING_STUDY_DOT_SERIES; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_AVAILABILITY = 'availability'; const FIELD_AVAILABILITY_EXT = '_availability'; const FIELD_BODY_SITE = 'bodySite'; @@ -262,6 +258,9 @@ class FHIRImagingStudySeries extends FHIRBackboneElement */ protected $uid = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRImagingStudySeries Constructor * @param null|array $data @@ -284,8 +283,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_AVAILABILITY] instanceof FHIRInstanceAvailability) { $this->setAvailability($data[self::FIELD_AVAILABILITY]); - } elseif ($ext && is_scalar($data[self::FIELD_AVAILABILITY])) { - $this->setAvailability(new FHIRInstanceAvailability([FHIRInstanceAvailability::FIELD_VALUE => $data[self::FIELD_AVAILABILITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_AVAILABILITY])) { + $this->setAvailability(new FHIRInstanceAvailability([FHIRInstanceAvailability::FIELD_VALUE => $data[self::FIELD_AVAILABILITY]] + $ext)); + } else if (is_array($data[self::FIELD_AVAILABILITY])) { + $this->setAvailability(new FHIRInstanceAvailability(array_merge($ext, $data[self::FIELD_AVAILABILITY]))); + } } else { $this->setAvailability(new FHIRInstanceAvailability($data[self::FIELD_AVAILABILITY])); } @@ -303,8 +306,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -312,6 +319,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ENDPOINT])) { if (is_array($data[self::FIELD_ENDPOINT])) { foreach($data[self::FIELD_ENDPOINT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addEndpoint($v); } else { @@ -327,6 +337,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_INSTANCE])) { if (is_array($data[self::FIELD_INSTANCE])) { foreach($data[self::FIELD_INSTANCE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRImagingStudyInstance) { $this->addInstance($v); } else { @@ -359,8 +372,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NUMBER] instanceof FHIRUnsignedInt) { $this->setNumber($data[self::FIELD_NUMBER]); - } elseif ($ext && is_scalar($data[self::FIELD_NUMBER])) { - $this->setNumber(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_NUMBER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NUMBER])) { + $this->setNumber(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_NUMBER]] + $ext)); + } else if (is_array($data[self::FIELD_NUMBER])) { + $this->setNumber(new FHIRUnsignedInt(array_merge($ext, $data[self::FIELD_NUMBER]))); + } } else { $this->setNumber(new FHIRUnsignedInt($data[self::FIELD_NUMBER])); } @@ -371,8 +388,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NUMBER_OF_INSTANCES] instanceof FHIRUnsignedInt) { $this->setNumberOfInstances($data[self::FIELD_NUMBER_OF_INSTANCES]); - } elseif ($ext && is_scalar($data[self::FIELD_NUMBER_OF_INSTANCES])) { - $this->setNumberOfInstances(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_NUMBER_OF_INSTANCES]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NUMBER_OF_INSTANCES])) { + $this->setNumberOfInstances(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_NUMBER_OF_INSTANCES]] + $ext)); + } else if (is_array($data[self::FIELD_NUMBER_OF_INSTANCES])) { + $this->setNumberOfInstances(new FHIRUnsignedInt(array_merge($ext, $data[self::FIELD_NUMBER_OF_INSTANCES]))); + } } else { $this->setNumberOfInstances(new FHIRUnsignedInt($data[self::FIELD_NUMBER_OF_INSTANCES])); } @@ -380,6 +401,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PERFORMER])) { if (is_array($data[self::FIELD_PERFORMER])) { foreach($data[self::FIELD_PERFORMER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addPerformer($v); } else { @@ -398,8 +422,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STARTED] instanceof FHIRDateTime) { $this->setStarted($data[self::FIELD_STARTED]); - } elseif ($ext && is_scalar($data[self::FIELD_STARTED])) { - $this->setStarted(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_STARTED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STARTED])) { + $this->setStarted(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_STARTED]] + $ext)); + } else if (is_array($data[self::FIELD_STARTED])) { + $this->setStarted(new FHIRDateTime(array_merge($ext, $data[self::FIELD_STARTED]))); + } } else { $this->setStarted(new FHIRDateTime($data[self::FIELD_STARTED])); } @@ -410,8 +438,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_UID] instanceof FHIROid) { $this->setUid($data[self::FIELD_UID]); - } elseif ($ext && is_scalar($data[self::FIELD_UID])) { - $this->setUid(new FHIROid([FHIROid::FIELD_VALUE => $data[self::FIELD_UID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_UID])) { + $this->setUid(new FHIROid([FHIROid::FIELD_VALUE => $data[self::FIELD_UID]] + $ext)); + } else if (is_array($data[self::FIELD_UID])) { + $this->setUid(new FHIROid(array_merge($ext, $data[self::FIELD_UID]))); + } } else { $this->setUid(new FHIROid($data[self::FIELD_UID])); } @@ -1104,14 +1136,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getAvailability())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AVAILABILITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getBodySite())) { $v->xmlSerialize($sxe->addChild(self::FIELD_BODY_SITE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getDescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESCRIPTION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getEndpoint())) { foreach($vs as $v) { if (null === $v) { @@ -1120,7 +1150,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_ENDPOINT, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getInstance())) { foreach($vs as $v) { if (null === $v) { @@ -1129,11 +1158,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_INSTANCE, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getLaterality())) { $v->xmlSerialize($sxe->addChild(self::FIELD_LATERALITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getModality())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MODALITY, null, $v->_getFHIRXMLNamespace())); } @@ -1143,7 +1170,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getNumberOfInstances())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NUMBER_OF_INSTANCES, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getPerformer())) { foreach($vs as $v) { if (null === $v) { @@ -1168,14 +1194,29 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getAvailability())) { - $a[self::FIELD_AVAILABILITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_AVAILABILITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_AVAILABILITY_EXT] = $enc; + } + } else { + $a[self::FIELD_AVAILABILITY] = $v; + } } if (null !== ($v = $this->getBodySite())) { $a[self::FIELD_BODY_SITE] = $v; } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if ([] !== ($vs = $this->getEndpoint())) { $a[self::FIELD_ENDPOINT] = $vs; @@ -1190,23 +1231,51 @@ public function jsonSerialize() $a[self::FIELD_MODALITY] = $v; } if (null !== ($v = $this->getNumber())) { - $a[self::FIELD_NUMBER] = $v->getValue(); - $a[self::FIELD_NUMBER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NUMBER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NUMBER_EXT] = $enc; + } + } else { + $a[self::FIELD_NUMBER] = $v; + } } if (null !== ($v = $this->getNumberOfInstances())) { - $a[self::FIELD_NUMBER_OF_INSTANCES] = $v->getValue(); - $a[self::FIELD_NUMBER_OF_INSTANCES_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NUMBER_OF_INSTANCES] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NUMBER_OF_INSTANCES_EXT] = $enc; + } + } else { + $a[self::FIELD_NUMBER_OF_INSTANCES] = $v; + } } if ([] !== ($vs = $this->getPerformer())) { $a[self::FIELD_PERFORMER] = $vs; } if (null !== ($v = $this->getStarted())) { - $a[self::FIELD_STARTED] = $v->getValue(); - $a[self::FIELD_STARTED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STARTED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STARTED_EXT] = $enc; + } + } else { + $a[self::FIELD_STARTED] = $v; + } } if (null !== ($v = $this->getUid())) { - $a[self::FIELD_UID] = $v->getValue(); - $a[self::FIELD_UID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_UID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_UID_EXT] = $enc; + } + } else { + $a[self::FIELD_UID] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRImmunization/FHIRImmunizationExplanation.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRImmunization/FHIRImmunizationExplanation.php index 7060d62162..ef2cecb435 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRImmunization/FHIRImmunizationExplanation.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRImmunization/FHIRImmunizationExplanation.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRImmunizationExplanation extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_IMMUNIZATION_DOT_EXPLANATION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_REASON = 'reason'; const FIELD_REASON_NOT_GIVEN = 'reasonNotGiven'; @@ -110,6 +106,9 @@ class FHIRImmunizationExplanation extends FHIRBackboneElement */ protected $reasonNotGiven = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRImmunizationExplanation Constructor * @param null|array $data @@ -129,6 +128,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REASON])) { if (is_array($data[self::FIELD_REASON])) { foreach($data[self::FIELD_REASON] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addReason($v); } else { @@ -144,6 +146,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REASON_NOT_GIVEN])) { if (is_array($data[self::FIELD_REASON_NOT_GIVEN])) { foreach($data[self::FIELD_REASON_NOT_GIVEN] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addReasonNotGiven($v); } else { @@ -394,7 +399,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_REASON, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getReasonNotGiven())) { foreach($vs as $v) { if (null === $v) { diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRImmunization/FHIRImmunizationPractitioner.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRImmunization/FHIRImmunizationPractitioner.php index 6f5d3412de..a77b8f3db3 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRImmunization/FHIRImmunizationPractitioner.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRImmunization/FHIRImmunizationPractitioner.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRImmunizationPractitioner extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_IMMUNIZATION_DOT_PRACTITIONER; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ACTOR = 'actor'; const FIELD_ROLE = 'role'; @@ -111,6 +107,9 @@ class FHIRImmunizationPractitioner extends FHIRBackboneElement */ protected $role = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRImmunizationPractitioner Constructor * @param null|array $data @@ -316,7 +315,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getActor())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ACTOR, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRole())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ROLE, null, $v->_getFHIRXMLNamespace())); } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRImmunization/FHIRImmunizationReaction.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRImmunization/FHIRImmunizationReaction.php index 582295647d..27f93ff702 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRImmunization/FHIRImmunizationReaction.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRImmunization/FHIRImmunizationReaction.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -81,10 +81,6 @@ class FHIRImmunizationReaction extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_IMMUNIZATION_DOT_REACTION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DATE = 'date'; const FIELD_DATE_EXT = '_date'; const FIELD_DETAIL = 'detail'; @@ -126,6 +122,9 @@ class FHIRImmunizationReaction extends FHIRBackboneElement */ protected $reported = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRImmunizationReaction Constructor * @param null|array $data @@ -148,8 +147,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATE] instanceof FHIRDateTime) { $this->setDate($data[self::FIELD_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_DATE])) { - $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime(array_merge($ext, $data[self::FIELD_DATE]))); + } } else { $this->setDate(new FHIRDateTime($data[self::FIELD_DATE])); } @@ -167,8 +170,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_REPORTED] instanceof FHIRBoolean) { $this->setReported($data[self::FIELD_REPORTED]); - } elseif ($ext && is_scalar($data[self::FIELD_REPORTED])) { - $this->setReported(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_REPORTED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_REPORTED])) { + $this->setReported(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_REPORTED]] + $ext)); + } else if (is_array($data[self::FIELD_REPORTED])) { + $this->setReported(new FHIRBoolean(array_merge($ext, $data[self::FIELD_REPORTED]))); + } } else { $this->setReported(new FHIRBoolean($data[self::FIELD_REPORTED])); } @@ -399,10 +406,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DATE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDetail())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DETAIL, null, $v->_getFHIRXMLNamespace())); } @@ -419,15 +426,29 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getDate())) { - $a[self::FIELD_DATE] = $v->getValue(); - $a[self::FIELD_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_DATE] = $v; + } } if (null !== ($v = $this->getDetail())) { $a[self::FIELD_DETAIL] = $v; } if (null !== ($v = $this->getReported())) { - $a[self::FIELD_REPORTED] = $v->getValue(); - $a[self::FIELD_REPORTED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_REPORTED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_REPORTED_EXT] = $enc; + } + } else { + $a[self::FIELD_REPORTED] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRImmunization/FHIRImmunizationVaccinationProtocol.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRImmunization/FHIRImmunizationVaccinationProtocol.php index a063370b41..b74a322939 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRImmunization/FHIRImmunizationVaccinationProtocol.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRImmunization/FHIRImmunizationVaccinationProtocol.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -82,10 +82,6 @@ class FHIRImmunizationVaccinationProtocol extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_IMMUNIZATION_DOT_VACCINATION_PROTOCOL; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_AUTHORITY = 'authority'; const FIELD_DESCRIPTION = 'description'; const FIELD_DESCRIPTION_EXT = '_description'; @@ -193,6 +189,9 @@ class FHIRImmunizationVaccinationProtocol extends FHIRBackboneElement */ protected $targetDisease = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRImmunizationVaccinationProtocol Constructor * @param null|array $data @@ -222,8 +221,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -234,8 +237,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DOSE_SEQUENCE] instanceof FHIRPositiveInt) { $this->setDoseSequence($data[self::FIELD_DOSE_SEQUENCE]); - } elseif ($ext && is_scalar($data[self::FIELD_DOSE_SEQUENCE])) { - $this->setDoseSequence(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_DOSE_SEQUENCE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DOSE_SEQUENCE])) { + $this->setDoseSequence(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_DOSE_SEQUENCE]] + $ext)); + } else if (is_array($data[self::FIELD_DOSE_SEQUENCE])) { + $this->setDoseSequence(new FHIRPositiveInt(array_merge($ext, $data[self::FIELD_DOSE_SEQUENCE]))); + } } else { $this->setDoseSequence(new FHIRPositiveInt($data[self::FIELD_DOSE_SEQUENCE])); } @@ -260,8 +267,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SERIES] instanceof FHIRString) { $this->setSeries($data[self::FIELD_SERIES]); - } elseif ($ext && is_scalar($data[self::FIELD_SERIES])) { - $this->setSeries(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SERIES]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SERIES])) { + $this->setSeries(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SERIES]] + $ext)); + } else if (is_array($data[self::FIELD_SERIES])) { + $this->setSeries(new FHIRString(array_merge($ext, $data[self::FIELD_SERIES]))); + } } else { $this->setSeries(new FHIRString($data[self::FIELD_SERIES])); } @@ -272,8 +283,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SERIES_DOSES] instanceof FHIRPositiveInt) { $this->setSeriesDoses($data[self::FIELD_SERIES_DOSES]); - } elseif ($ext && is_scalar($data[self::FIELD_SERIES_DOSES])) { - $this->setSeriesDoses(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_SERIES_DOSES]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SERIES_DOSES])) { + $this->setSeriesDoses(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_SERIES_DOSES]] + $ext)); + } else if (is_array($data[self::FIELD_SERIES_DOSES])) { + $this->setSeriesDoses(new FHIRPositiveInt(array_merge($ext, $data[self::FIELD_SERIES_DOSES]))); + } } else { $this->setSeriesDoses(new FHIRPositiveInt($data[self::FIELD_SERIES_DOSES])); } @@ -281,6 +296,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_TARGET_DISEASE])) { if (is_array($data[self::FIELD_TARGET_DISEASE])) { foreach($data[self::FIELD_TARGET_DISEASE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addTargetDisease($v); } else { @@ -753,11 +771,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDoseSequence())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DOSE_SEQUENCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDoseStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DOSE_STATUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDoseStatusReason())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DOSE_STATUS_REASON, null, $v->_getFHIRXMLNamespace())); } @@ -767,7 +783,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getSeriesDoses())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SERIES_DOSES, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getTargetDisease())) { foreach($vs as $v) { if (null === $v) { @@ -789,12 +804,26 @@ public function jsonSerialize() $a[self::FIELD_AUTHORITY] = $v; } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if (null !== ($v = $this->getDoseSequence())) { - $a[self::FIELD_DOSE_SEQUENCE] = $v->getValue(); - $a[self::FIELD_DOSE_SEQUENCE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DOSE_SEQUENCE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DOSE_SEQUENCE_EXT] = $enc; + } + } else { + $a[self::FIELD_DOSE_SEQUENCE] = $v; + } } if (null !== ($v = $this->getDoseStatus())) { $a[self::FIELD_DOSE_STATUS] = $v; @@ -803,12 +832,26 @@ public function jsonSerialize() $a[self::FIELD_DOSE_STATUS_REASON] = $v; } if (null !== ($v = $this->getSeries())) { - $a[self::FIELD_SERIES] = $v->getValue(); - $a[self::FIELD_SERIES_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SERIES] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SERIES_EXT] = $enc; + } + } else { + $a[self::FIELD_SERIES] = $v; + } } if (null !== ($v = $this->getSeriesDoses())) { - $a[self::FIELD_SERIES_DOSES] = $v->getValue(); - $a[self::FIELD_SERIES_DOSES_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SERIES_DOSES] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SERIES_DOSES_EXT] = $enc; + } + } else { + $a[self::FIELD_SERIES_DOSES] = $v; + } } if ([] !== ($vs = $this->getTargetDisease())) { $a[self::FIELD_TARGET_DISEASE] = $vs; diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRImmunizationRecommendation/FHIRImmunizationRecommendationDateCriterion.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRImmunizationRecommendation/FHIRImmunizationRecommendationDateCriterion.php index 517f1ee711..04f83f92d5 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRImmunizationRecommendation/FHIRImmunizationRecommendationDateCriterion.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRImmunizationRecommendation/FHIRImmunizationRecommendationDateCriterion.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRImmunizationRecommendationDateCriterion extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_IMMUNIZATION_RECOMMENDATION_DOT_DATE_CRITERION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CODE = 'code'; const FIELD_VALUE = 'value'; const FIELD_VALUE_EXT = '_value'; @@ -115,6 +111,9 @@ class FHIRImmunizationRecommendationDateCriterion extends FHIRBackboneElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRImmunizationRecommendationDateCriterion Constructor * @param null|array $data @@ -148,8 +147,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE] instanceof FHIRDateTime) { $this->setValue($data[self::FIELD_VALUE]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE])) { - $this->setValue(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_VALUE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE])) { + $this->setValue(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_VALUE]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE])) { + $this->setValue(new FHIRDateTime(array_merge($ext, $data[self::FIELD_VALUE]))); + } } else { $this->setValue(new FHIRDateTime($data[self::FIELD_VALUE])); } @@ -347,6 +350,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getValue())) { + $sxe->addAttribute(self::FIELD_VALUE, (string)$v); $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE, null, $v->_getFHIRXMLNamespace())); } return $sxe; @@ -362,8 +366,15 @@ public function jsonSerialize() $a[self::FIELD_CODE] = $v; } if (null !== ($v = $this->getValue())) { - $a[self::FIELD_VALUE] = $v->getValue(); - $a[self::FIELD_VALUE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRImmunizationRecommendation/FHIRImmunizationRecommendationProtocol.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRImmunizationRecommendation/FHIRImmunizationRecommendationProtocol.php index a81b904544..a8af1eddd2 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRImmunizationRecommendation/FHIRImmunizationRecommendationProtocol.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRImmunizationRecommendation/FHIRImmunizationRecommendationProtocol.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -81,10 +81,6 @@ class FHIRImmunizationRecommendationProtocol extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_IMMUNIZATION_RECOMMENDATION_DOT_PROTOCOL; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_AUTHORITY = 'authority'; const FIELD_DESCRIPTION = 'description'; const FIELD_DESCRIPTION_EXT = '_description'; @@ -140,6 +136,9 @@ class FHIRImmunizationRecommendationProtocol extends FHIRBackboneElement */ protected $series = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRImmunizationRecommendationProtocol Constructor * @param null|array $data @@ -169,8 +168,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -181,8 +184,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DOSE_SEQUENCE] instanceof FHIRPositiveInt) { $this->setDoseSequence($data[self::FIELD_DOSE_SEQUENCE]); - } elseif ($ext && is_scalar($data[self::FIELD_DOSE_SEQUENCE])) { - $this->setDoseSequence(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_DOSE_SEQUENCE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DOSE_SEQUENCE])) { + $this->setDoseSequence(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_DOSE_SEQUENCE]] + $ext)); + } else if (is_array($data[self::FIELD_DOSE_SEQUENCE])) { + $this->setDoseSequence(new FHIRPositiveInt(array_merge($ext, $data[self::FIELD_DOSE_SEQUENCE]))); + } } else { $this->setDoseSequence(new FHIRPositiveInt($data[self::FIELD_DOSE_SEQUENCE])); } @@ -193,8 +200,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SERIES] instanceof FHIRString) { $this->setSeries($data[self::FIELD_SERIES]); - } elseif ($ext && is_scalar($data[self::FIELD_SERIES])) { - $this->setSeries(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SERIES]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SERIES])) { + $this->setSeries(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SERIES]] + $ext)); + } else if (is_array($data[self::FIELD_SERIES])) { + $this->setSeries(new FHIRString(array_merge($ext, $data[self::FIELD_SERIES]))); + } } else { $this->setSeries(new FHIRString($data[self::FIELD_SERIES])); } @@ -497,16 +508,37 @@ public function jsonSerialize() $a[self::FIELD_AUTHORITY] = $v; } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if (null !== ($v = $this->getDoseSequence())) { - $a[self::FIELD_DOSE_SEQUENCE] = $v->getValue(); - $a[self::FIELD_DOSE_SEQUENCE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DOSE_SEQUENCE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DOSE_SEQUENCE_EXT] = $enc; + } + } else { + $a[self::FIELD_DOSE_SEQUENCE] = $v; + } } if (null !== ($v = $this->getSeries())) { - $a[self::FIELD_SERIES] = $v->getValue(); - $a[self::FIELD_SERIES_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SERIES] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SERIES_EXT] = $enc; + } + } else { + $a[self::FIELD_SERIES] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRImmunizationRecommendation/FHIRImmunizationRecommendationRecommendation.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRImmunizationRecommendation/FHIRImmunizationRecommendationRecommendation.php index 224666d92c..46d8f49096 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRImmunizationRecommendation/FHIRImmunizationRecommendationRecommendation.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRImmunizationRecommendation/FHIRImmunizationRecommendationRecommendation.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -82,10 +82,6 @@ class FHIRImmunizationRecommendationRecommendation extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_IMMUNIZATION_RECOMMENDATION_DOT_RECOMMENDATION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DATE = 'date'; const FIELD_DATE_EXT = '_date'; const FIELD_DATE_CRITERION = 'dateCriterion'; @@ -207,6 +203,9 @@ class FHIRImmunizationRecommendationRecommendation extends FHIRBackboneElement */ protected $vaccineCode = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRImmunizationRecommendationRecommendation Constructor * @param null|array $data @@ -229,8 +228,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATE] instanceof FHIRDateTime) { $this->setDate($data[self::FIELD_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_DATE])) { - $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime(array_merge($ext, $data[self::FIELD_DATE]))); + } } else { $this->setDate(new FHIRDateTime($data[self::FIELD_DATE])); } @@ -241,17 +244,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_DATE_CRITERION])) { foreach($data[self::FIELD_DATE_CRITERION] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRImmunizationRecommendationDateCriterion) { $this->addDateCriterion($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addDateCriterion(new FHIRImmunizationRecommendationDateCriterion([FHIRImmunizationRecommendationDateCriterion::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addDateCriterion(new FHIRImmunizationRecommendationDateCriterion([FHIRImmunizationRecommendationDateCriterion::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addDateCriterion(new FHIRImmunizationRecommendationDateCriterion(array_merge($v, $ext[$i]))); + } } else { $this->addDateCriterion(new FHIRImmunizationRecommendationDateCriterion($v)); } } } elseif ($data[self::FIELD_DATE_CRITERION] instanceof FHIRImmunizationRecommendationDateCriterion) { $this->addDateCriterion($data[self::FIELD_DATE_CRITERION]); - } elseif ($ext && is_scalar($data[self::FIELD_DATE_CRITERION])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_DATE_CRITERION])) { $this->addDateCriterion(new FHIRImmunizationRecommendationDateCriterion([FHIRImmunizationRecommendationDateCriterion::FIELD_VALUE => $data[self::FIELD_DATE_CRITERION]] + $ext)); } else { $this->addDateCriterion(new FHIRImmunizationRecommendationDateCriterion($data[self::FIELD_DATE_CRITERION])); @@ -263,8 +273,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DOSE_NUMBER] instanceof FHIRPositiveInt) { $this->setDoseNumber($data[self::FIELD_DOSE_NUMBER]); - } elseif ($ext && is_scalar($data[self::FIELD_DOSE_NUMBER])) { - $this->setDoseNumber(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_DOSE_NUMBER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DOSE_NUMBER])) { + $this->setDoseNumber(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_DOSE_NUMBER]] + $ext)); + } else if (is_array($data[self::FIELD_DOSE_NUMBER])) { + $this->setDoseNumber(new FHIRPositiveInt(array_merge($ext, $data[self::FIELD_DOSE_NUMBER]))); + } } else { $this->setDoseNumber(new FHIRPositiveInt($data[self::FIELD_DOSE_NUMBER])); } @@ -286,6 +300,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SUPPORTING_IMMUNIZATION])) { if (is_array($data[self::FIELD_SUPPORTING_IMMUNIZATION])) { foreach($data[self::FIELD_SUPPORTING_IMMUNIZATION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addSupportingImmunization($v); } else { @@ -301,6 +318,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SUPPORTING_PATIENT_INFORMATION])) { if (is_array($data[self::FIELD_SUPPORTING_PATIENT_INFORMATION])) { foreach($data[self::FIELD_SUPPORTING_PATIENT_INFORMATION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addSupportingPatientInformation($v); } else { @@ -851,10 +871,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DATE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getDateCriterion())) { foreach($vs as $v) { if (null === $v) { @@ -866,15 +886,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDoseNumber())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DOSE_NUMBER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getForecastStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FORECAST_STATUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getProtocol())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PROTOCOL, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getSupportingImmunization())) { foreach($vs as $v) { if (null === $v) { @@ -883,7 +900,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_SUPPORTING_IMMUNIZATION, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getSupportingPatientInformation())) { foreach($vs as $v) { if (null === $v) { @@ -892,11 +908,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_SUPPORTING_PATIENT_INFORMATION, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getTargetDisease())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TARGET_DISEASE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getVaccineCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VACCINE_CODE, null, $v->_getFHIRXMLNamespace())); } @@ -910,15 +924,45 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getDate())) { - $a[self::FIELD_DATE] = $v->getValue(); - $a[self::FIELD_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_DATE] = $v; + } } if ([] !== ($vs = $this->getDateCriterion())) { - $a[self::FIELD_DATE_CRITERION] = $vs; + $a[self::FIELD_DATE_CRITERION] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATE_CRITERION][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATE_CRITERION_EXT][] = $enc; + } else { + $a[self::FIELD_DATE_CRITERION_EXT][] = null; + } + } else { + $a[self::FIELD_DATE_CRITERION][] = $v; + } + } } if (null !== ($v = $this->getDoseNumber())) { - $a[self::FIELD_DOSE_NUMBER] = $v->getValue(); - $a[self::FIELD_DOSE_NUMBER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DOSE_NUMBER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DOSE_NUMBER_EXT] = $enc; + } + } else { + $a[self::FIELD_DOSE_NUMBER] = $v; + } } if (null !== ($v = $this->getForecastStatus())) { $a[self::FIELD_FORECAST_STATUS] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuideDependency.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuideDependency.php index 56dddf318c..6babb41135 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuideDependency.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuideDependency.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRImplementationGuideDependency extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_IMPLEMENTATION_GUIDE_DOT_DEPENDENCY; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_TYPE = 'type'; const FIELD_TYPE_EXT = '_type'; const FIELD_URI = 'uri'; @@ -110,6 +106,9 @@ class FHIRImplementationGuideDependency extends FHIRBackboneElement */ protected $uri = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRImplementationGuideDependency Constructor * @param null|array $data @@ -132,8 +131,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TYPE] instanceof FHIRGuideDependencyType) { $this->setType($data[self::FIELD_TYPE]); - } elseif ($ext && is_scalar($data[self::FIELD_TYPE])) { - $this->setType(new FHIRGuideDependencyType([FHIRGuideDependencyType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TYPE])) { + $this->setType(new FHIRGuideDependencyType([FHIRGuideDependencyType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } else if (is_array($data[self::FIELD_TYPE])) { + $this->setType(new FHIRGuideDependencyType(array_merge($ext, $data[self::FIELD_TYPE]))); + } } else { $this->setType(new FHIRGuideDependencyType($data[self::FIELD_TYPE])); } @@ -144,8 +147,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_URI] instanceof FHIRUri) { $this->setUri($data[self::FIELD_URI]); - } elseif ($ext && is_scalar($data[self::FIELD_URI])) { - $this->setUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URI]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_URI])) { + $this->setUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URI]] + $ext)); + } else if (is_array($data[self::FIELD_URI])) { + $this->setUri(new FHIRUri(array_merge($ext, $data[self::FIELD_URI]))); + } } else { $this->setUri(new FHIRUri($data[self::FIELD_URI])); } @@ -343,11 +350,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getType())) { - $a[self::FIELD_TYPE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TYPE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TYPE_EXT] = $enc; + } + } else { + $a[self::FIELD_TYPE] = $v; + } } if (null !== ($v = $this->getUri())) { - $a[self::FIELD_URI] = $v->getValue(); - $a[self::FIELD_URI_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_URI] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_URI_EXT] = $enc; + } + } else { + $a[self::FIELD_URI] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuideGlobal.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuideGlobal.php index 4f2ffc5de9..e318bb8aab 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuideGlobal.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuideGlobal.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRImplementationGuideGlobal extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_IMPLEMENTATION_GUIDE_DOT_GLOBAL; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_PROFILE = 'profile'; const FIELD_TYPE = 'type'; @@ -108,6 +104,9 @@ class FHIRImplementationGuideGlobal extends FHIRBackboneElement */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRImplementationGuideGlobal Constructor * @param null|array $data @@ -313,8 +312,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getProfile())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PROFILE, null, $v->_getFHIRXMLNamespace())); - } - if (null !== ($v = $this->getType())) { + } if (null !== ($v = $this->getType())) { $sxe->addAttribute(self::FIELD_TYPE, (string)$v); } return $sxe; diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuidePackage.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuidePackage.php index 04bbfd57c1..f40d45821a 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuidePackage.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuidePackage.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRImplementationGuidePackage extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_IMPLEMENTATION_GUIDE_DOT_PACKAGE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DESCRIPTION = 'description'; const FIELD_DESCRIPTION_EXT = '_description'; const FIELD_NAME = 'name'; @@ -125,6 +121,9 @@ class FHIRImplementationGuidePackage extends FHIRBackboneElement */ protected $resource = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRImplementationGuidePackage Constructor * @param null|array $data @@ -147,8 +146,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -159,8 +162,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -168,6 +175,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_RESOURCE])) { if (is_array($data[self::FIELD_RESOURCE])) { foreach($data[self::FIELD_RESOURCE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRImplementationGuideResource) { $this->addResource($v); } else { @@ -439,13 +449,13 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getDescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESCRIPTION, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NAME, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getResource())) { foreach($vs as $v) { if (null === $v) { @@ -464,12 +474,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if ([] !== ($vs = $this->getResource())) { $a[self::FIELD_RESOURCE] = $vs; diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuidePage.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuidePage.php index 84753a2349..bc9a66b06b 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuidePage.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuidePage.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -83,10 +83,6 @@ class FHIRImplementationGuidePage extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_IMPLEMENTATION_GUIDE_DOT_PAGE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_FORMAT = 'format'; const FIELD_FORMAT_EXT = '_format'; const FIELD_KIND = 'kind'; @@ -180,6 +176,9 @@ class FHIRImplementationGuidePage extends FHIRBackboneElement */ protected $type = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRImplementationGuidePage Constructor * @param null|array $data @@ -202,8 +201,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_FORMAT] instanceof FHIRCode) { $this->setFormat($data[self::FIELD_FORMAT]); - } elseif ($ext && is_scalar($data[self::FIELD_FORMAT])) { - $this->setFormat(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_FORMAT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_FORMAT])) { + $this->setFormat(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_FORMAT]] + $ext)); + } else if (is_array($data[self::FIELD_FORMAT])) { + $this->setFormat(new FHIRCode(array_merge($ext, $data[self::FIELD_FORMAT]))); + } } else { $this->setFormat(new FHIRCode($data[self::FIELD_FORMAT])); } @@ -214,8 +217,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_KIND] instanceof FHIRGuidePageKind) { $this->setKind($data[self::FIELD_KIND]); - } elseif ($ext && is_scalar($data[self::FIELD_KIND])) { - $this->setKind(new FHIRGuidePageKind([FHIRGuidePageKind::FIELD_VALUE => $data[self::FIELD_KIND]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_KIND])) { + $this->setKind(new FHIRGuidePageKind([FHIRGuidePageKind::FIELD_VALUE => $data[self::FIELD_KIND]] + $ext)); + } else if (is_array($data[self::FIELD_KIND])) { + $this->setKind(new FHIRGuidePageKind(array_merge($ext, $data[self::FIELD_KIND]))); + } } else { $this->setKind(new FHIRGuidePageKind($data[self::FIELD_KIND])); } @@ -226,17 +233,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_PACKAGE])) { foreach($data[self::FIELD_PACKAGE] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRString) { $this->addPackage($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addPackage(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addPackage(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addPackage(new FHIRString(array_merge($v, $ext[$i]))); + } } else { $this->addPackage(new FHIRString($v)); } } } elseif ($data[self::FIELD_PACKAGE] instanceof FHIRString) { $this->addPackage($data[self::FIELD_PACKAGE]); - } elseif ($ext && is_scalar($data[self::FIELD_PACKAGE])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_PACKAGE])) { $this->addPackage(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PACKAGE]] + $ext)); } else { $this->addPackage(new FHIRString($data[self::FIELD_PACKAGE])); @@ -245,6 +259,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PAGE])) { if (is_array($data[self::FIELD_PAGE])) { foreach($data[self::FIELD_PAGE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRImplementationGuidePage) { $this->addPage($v); } else { @@ -263,8 +280,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SOURCE] instanceof FHIRUri) { $this->setSource($data[self::FIELD_SOURCE]); - } elseif ($ext && is_scalar($data[self::FIELD_SOURCE])) { - $this->setSource(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_SOURCE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SOURCE])) { + $this->setSource(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_SOURCE]] + $ext)); + } else if (is_array($data[self::FIELD_SOURCE])) { + $this->setSource(new FHIRUri(array_merge($ext, $data[self::FIELD_SOURCE]))); + } } else { $this->setSource(new FHIRUri($data[self::FIELD_SOURCE])); } @@ -275,8 +296,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TITLE] instanceof FHIRString) { $this->setTitle($data[self::FIELD_TITLE]); - } elseif ($ext && is_scalar($data[self::FIELD_TITLE])) { - $this->setTitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TITLE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TITLE])) { + $this->setTitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TITLE]] + $ext)); + } else if (is_array($data[self::FIELD_TITLE])) { + $this->setTitle(new FHIRString(array_merge($ext, $data[self::FIELD_TITLE]))); + } } else { $this->setTitle(new FHIRString($data[self::FIELD_TITLE])); } @@ -284,6 +309,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_TYPE])) { if (is_array($data[self::FIELD_TYPE])) { foreach($data[self::FIELD_TYPE] as $v) { + if (null === $v) { + continue; + } $this->addType($v); } } else { @@ -767,10 +795,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getFormat())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FORMAT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getKind())) { $v->xmlSerialize($sxe->addChild(self::FIELD_KIND, null, $v->_getFHIRXMLNamespace())); } @@ -782,7 +810,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_PACKAGE, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getPage())) { foreach($vs as $v) { if (null === $v) { @@ -796,8 +823,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 } if (null !== ($v = $this->getTitle())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TITLE, null, $v->_getFHIRXMLNamespace())); - } - if ([] !== ($vs = $this->getType())) { + } if ([] !== ($vs = $this->getType())) { foreach($vs as $v) { if (null === $v) { continue; @@ -815,11 +841,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getFormat())) { - $a[self::FIELD_FORMAT] = $v->getValue(); - $a[self::FIELD_FORMAT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FORMAT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FORMAT_EXT] = $enc; + } + } else { + $a[self::FIELD_FORMAT] = $v; + } } if (null !== ($v = $this->getKind())) { - $a[self::FIELD_KIND] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_KIND] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_KIND_EXT] = $enc; + } + } else { + $a[self::FIELD_KIND] = $v; + } } if ([] !== ($vs = $this->getPackage())) { $a[self::FIELD_PACKAGE] = []; @@ -827,20 +868,43 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_PACKAGE][] = $v->getValue(); - $a[self::FIELD_PACKAGE_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PACKAGE][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PACKAGE_EXT][] = $enc; + } else { + $a[self::FIELD_PACKAGE_EXT][] = null; + } + } else { + $a[self::FIELD_PACKAGE][] = $v; + } } } if ([] !== ($vs = $this->getPage())) { $a[self::FIELD_PAGE] = $vs; } if (null !== ($v = $this->getSource())) { - $a[self::FIELD_SOURCE] = $v->getValue(); - $a[self::FIELD_SOURCE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SOURCE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SOURCE_EXT] = $enc; + } + } else { + $a[self::FIELD_SOURCE] = $v; + } } if (null !== ($v = $this->getTitle())) { - $a[self::FIELD_TITLE] = $v->getValue(); - $a[self::FIELD_TITLE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TITLE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TITLE_EXT] = $enc; + } + } else { + $a[self::FIELD_TITLE] = $v; + } } if ([] !== ($vs = $this->getType())) { $a[self::FIELD_TYPE] = $vs; diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuideResource.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuideResource.php index 59a680c463..97c67510be 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuideResource.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuideResource.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -82,10 +82,6 @@ class FHIRImplementationGuideResource extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_IMPLEMENTATION_GUIDE_DOT_RESOURCE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ACRONYM = 'acronym'; const FIELD_ACRONYM_EXT = '_acronym'; const FIELD_DESCRIPTION = 'description'; @@ -181,6 +177,9 @@ class FHIRImplementationGuideResource extends FHIRBackboneElement */ protected $sourceUri = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRImplementationGuideResource Constructor * @param null|array $data @@ -203,8 +202,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ACRONYM] instanceof FHIRString) { $this->setAcronym($data[self::FIELD_ACRONYM]); - } elseif ($ext && is_scalar($data[self::FIELD_ACRONYM])) { - $this->setAcronym(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_ACRONYM]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ACRONYM])) { + $this->setAcronym(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_ACRONYM]] + $ext)); + } else if (is_array($data[self::FIELD_ACRONYM])) { + $this->setAcronym(new FHIRString(array_merge($ext, $data[self::FIELD_ACRONYM]))); + } } else { $this->setAcronym(new FHIRString($data[self::FIELD_ACRONYM])); } @@ -215,8 +218,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -227,8 +234,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EXAMPLE] instanceof FHIRBoolean) { $this->setExample($data[self::FIELD_EXAMPLE]); - } elseif ($ext && is_scalar($data[self::FIELD_EXAMPLE])) { - $this->setExample(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_EXAMPLE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EXAMPLE])) { + $this->setExample(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_EXAMPLE]] + $ext)); + } else if (is_array($data[self::FIELD_EXAMPLE])) { + $this->setExample(new FHIRBoolean(array_merge($ext, $data[self::FIELD_EXAMPLE]))); + } } else { $this->setExample(new FHIRBoolean($data[self::FIELD_EXAMPLE])); } @@ -246,8 +257,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -265,8 +280,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SOURCE_URI] instanceof FHIRUri) { $this->setSourceUri($data[self::FIELD_SOURCE_URI]); - } elseif ($ext && is_scalar($data[self::FIELD_SOURCE_URI])) { - $this->setSourceUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_SOURCE_URI]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SOURCE_URI])) { + $this->setSourceUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_SOURCE_URI]] + $ext)); + } else if (is_array($data[self::FIELD_SOURCE_URI])) { + $this->setSourceUri(new FHIRUri(array_merge($ext, $data[self::FIELD_SOURCE_URI]))); + } } else { $this->setSourceUri(new FHIRUri($data[self::FIELD_SOURCE_URI])); } @@ -668,6 +687,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getAcronym())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ACRONYM, null, $v->_getFHIRXMLNamespace())); } @@ -677,14 +697,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getExample())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EXAMPLE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getExampleFor())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EXAMPLE_FOR, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NAME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSourceReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SOURCE_REFERENCE, null, $v->_getFHIRXMLNamespace())); } @@ -701,30 +719,65 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getAcronym())) { - $a[self::FIELD_ACRONYM] = $v->getValue(); - $a[self::FIELD_ACRONYM_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ACRONYM] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ACRONYM_EXT] = $enc; + } + } else { + $a[self::FIELD_ACRONYM] = $v; + } } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if (null !== ($v = $this->getExample())) { - $a[self::FIELD_EXAMPLE] = $v->getValue(); - $a[self::FIELD_EXAMPLE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EXAMPLE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EXAMPLE_EXT] = $enc; + } + } else { + $a[self::FIELD_EXAMPLE] = $v; + } } if (null !== ($v = $this->getExampleFor())) { $a[self::FIELD_EXAMPLE_FOR] = $v; } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if (null !== ($v = $this->getSourceReference())) { $a[self::FIELD_SOURCE_REFERENCE] = $v; } if (null !== ($v = $this->getSourceUri())) { - $a[self::FIELD_SOURCE_URI] = $v->getValue(); - $a[self::FIELD_SOURCE_URI_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SOURCE_URI] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SOURCE_URI_EXT] = $enc; + } + } else { + $a[self::FIELD_SOURCE_URI] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRLinkage/FHIRLinkageItem.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRLinkage/FHIRLinkageItem.php index d4ed473f14..37aac6ac4e 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRLinkage/FHIRLinkageItem.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRLinkage/FHIRLinkageItem.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRLinkageItem extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_LINKAGE_DOT_ITEM; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_RESOURCE = 'resource'; const FIELD_TYPE = 'type'; const FIELD_TYPE_EXT = '_type'; @@ -110,6 +106,9 @@ class FHIRLinkageItem extends FHIRBackboneElement */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRLinkageItem Constructor * @param null|array $data @@ -139,8 +138,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TYPE] instanceof FHIRLinkageType) { $this->setType($data[self::FIELD_TYPE]); - } elseif ($ext && is_scalar($data[self::FIELD_TYPE])) { - $this->setType(new FHIRLinkageType([FHIRLinkageType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TYPE])) { + $this->setType(new FHIRLinkageType([FHIRLinkageType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } else if (is_array($data[self::FIELD_TYPE])) { + $this->setType(new FHIRLinkageType(array_merge($ext, $data[self::FIELD_TYPE]))); + } } else { $this->setType(new FHIRLinkageType($data[self::FIELD_TYPE])); } @@ -318,7 +321,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getResource())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RESOURCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -335,7 +337,15 @@ public function jsonSerialize() $a[self::FIELD_RESOURCE] = $v; } if (null !== ($v = $this->getType())) { - $a[self::FIELD_TYPE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TYPE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TYPE_EXT] = $enc; + } + } else { + $a[self::FIELD_TYPE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRList/FHIRListEntry.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRList/FHIRListEntry.php index 26595d9017..6fdee9042f 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRList/FHIRListEntry.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRList/FHIRListEntry.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRListEntry extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_LIST_DOT_ENTRY; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DATE = 'date'; const FIELD_DATE_EXT = '_date'; const FIELD_DELETED = 'deleted'; @@ -139,6 +135,9 @@ class FHIRListEntry extends FHIRBackboneElement */ protected $item = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRListEntry Constructor * @param null|array $data @@ -161,8 +160,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATE] instanceof FHIRDateTime) { $this->setDate($data[self::FIELD_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_DATE])) { - $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime(array_merge($ext, $data[self::FIELD_DATE]))); + } } else { $this->setDate(new FHIRDateTime($data[self::FIELD_DATE])); } @@ -173,8 +176,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DELETED] instanceof FHIRBoolean) { $this->setDeleted($data[self::FIELD_DELETED]); - } elseif ($ext && is_scalar($data[self::FIELD_DELETED])) { - $this->setDeleted(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_DELETED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DELETED])) { + $this->setDeleted(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_DELETED]] + $ext)); + } else if (is_array($data[self::FIELD_DELETED])) { + $this->setDeleted(new FHIRBoolean(array_merge($ext, $data[self::FIELD_DELETED]))); + } } else { $this->setDeleted(new FHIRBoolean($data[self::FIELD_DELETED])); } @@ -456,17 +463,16 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DATE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getDeleted())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DELETED, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getFlag())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FLAG, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getItem())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ITEM, null, $v->_getFHIRXMLNamespace())); } @@ -480,12 +486,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getDate())) { - $a[self::FIELD_DATE] = $v->getValue(); - $a[self::FIELD_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_DATE] = $v; + } } if (null !== ($v = $this->getDeleted())) { - $a[self::FIELD_DELETED] = $v->getValue(); - $a[self::FIELD_DELETED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DELETED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DELETED_EXT] = $enc; + } + } else { + $a[self::FIELD_DELETED] = $v; + } } if (null !== ($v = $this->getFlag())) { $a[self::FIELD_FLAG] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRLocation/FHIRLocationPosition.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRLocation/FHIRLocationPosition.php index 97b3bf17db..09da6a64f2 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRLocation/FHIRLocationPosition.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRLocation/FHIRLocationPosition.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRLocationPosition extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_LOCATION_DOT_POSITION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ALTITUDE = 'altitude'; const FIELD_ALTITUDE_EXT = '_altitude'; const FIELD_LATITUDE = 'latitude'; @@ -129,6 +125,9 @@ class FHIRLocationPosition extends FHIRBackboneElement */ protected $longitude = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRLocationPosition Constructor * @param null|array $data @@ -151,8 +150,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ALTITUDE] instanceof FHIRDecimal) { $this->setAltitude($data[self::FIELD_ALTITUDE]); - } elseif ($ext && is_scalar($data[self::FIELD_ALTITUDE])) { - $this->setAltitude(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_ALTITUDE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ALTITUDE])) { + $this->setAltitude(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_ALTITUDE]] + $ext)); + } else if (is_array($data[self::FIELD_ALTITUDE])) { + $this->setAltitude(new FHIRDecimal(array_merge($ext, $data[self::FIELD_ALTITUDE]))); + } } else { $this->setAltitude(new FHIRDecimal($data[self::FIELD_ALTITUDE])); } @@ -163,8 +166,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_LATITUDE] instanceof FHIRDecimal) { $this->setLatitude($data[self::FIELD_LATITUDE]); - } elseif ($ext && is_scalar($data[self::FIELD_LATITUDE])) { - $this->setLatitude(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_LATITUDE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_LATITUDE])) { + $this->setLatitude(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_LATITUDE]] + $ext)); + } else if (is_array($data[self::FIELD_LATITUDE])) { + $this->setLatitude(new FHIRDecimal(array_merge($ext, $data[self::FIELD_LATITUDE]))); + } } else { $this->setLatitude(new FHIRDecimal($data[self::FIELD_LATITUDE])); } @@ -175,8 +182,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_LONGITUDE] instanceof FHIRDecimal) { $this->setLongitude($data[self::FIELD_LONGITUDE]); - } elseif ($ext && is_scalar($data[self::FIELD_LONGITUDE])) { - $this->setLongitude(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_LONGITUDE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_LONGITUDE])) { + $this->setLongitude(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_LONGITUDE]] + $ext)); + } else if (is_array($data[self::FIELD_LONGITUDE])) { + $this->setLongitude(new FHIRDecimal(array_merge($ext, $data[self::FIELD_LONGITUDE]))); + } } else { $this->setLongitude(new FHIRDecimal($data[self::FIELD_LONGITUDE])); } @@ -426,6 +437,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getAltitude())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ALTITUDE, null, $v->_getFHIRXMLNamespace())); } @@ -445,16 +457,37 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getAltitude())) { - $a[self::FIELD_ALTITUDE] = $v->getValue(); - $a[self::FIELD_ALTITUDE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ALTITUDE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ALTITUDE_EXT] = $enc; + } + } else { + $a[self::FIELD_ALTITUDE] = $v; + } } if (null !== ($v = $this->getLatitude())) { - $a[self::FIELD_LATITUDE] = $v->getValue(); - $a[self::FIELD_LATITUDE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_LATITUDE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_LATITUDE_EXT] = $enc; + } + } else { + $a[self::FIELD_LATITUDE] = $v; + } } if (null !== ($v = $this->getLongitude())) { - $a[self::FIELD_LONGITUDE] = $v->getValue(); - $a[self::FIELD_LONGITUDE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_LONGITUDE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_LONGITUDE_EXT] = $enc; + } + } else { + $a[self::FIELD_LONGITUDE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRMeasure/FHIRMeasureGroup.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRMeasure/FHIRMeasureGroup.php index a8b421da68..e25f6069d2 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRMeasure/FHIRMeasureGroup.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRMeasure/FHIRMeasureGroup.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRMeasureGroup extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MEASURE_DOT_GROUP; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DESCRIPTION = 'description'; const FIELD_DESCRIPTION_EXT = '_description'; const FIELD_IDENTIFIER = 'identifier'; @@ -145,6 +141,9 @@ class FHIRMeasureGroup extends FHIRBackboneElement */ protected $stratifier = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMeasureGroup Constructor * @param null|array $data @@ -167,8 +166,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -179,8 +182,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->setIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { - $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_IDENTIFIER]))); + } } else { $this->setIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); } @@ -191,8 +198,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -200,6 +211,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_POPULATION])) { if (is_array($data[self::FIELD_POPULATION])) { foreach($data[self::FIELD_POPULATION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRMeasurePopulation) { $this->addPopulation($v); } else { @@ -215,6 +229,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_STRATIFIER])) { if (is_array($data[self::FIELD_STRATIFIER])) { foreach($data[self::FIELD_STRATIFIER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRMeasureStratifier) { $this->addStratifier($v); } else { @@ -567,17 +584,16 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getDescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESCRIPTION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NAME, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getPopulation())) { foreach($vs as $v) { if (null === $v) { @@ -586,7 +602,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_POPULATION, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getStratifier())) { foreach($vs as $v) { if (null === $v) { @@ -605,15 +620,37 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if (null !== ($v = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_IDENTIFIER] = $v; + } } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if ([] !== ($vs = $this->getPopulation())) { $a[self::FIELD_POPULATION] = $vs; diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRMeasure/FHIRMeasurePopulation.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRMeasure/FHIRMeasurePopulation.php index 77a92eaed3..7bb851825b 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRMeasure/FHIRMeasurePopulation.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRMeasure/FHIRMeasurePopulation.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRMeasurePopulation extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MEASURE_DOT_POPULATION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CODE = 'code'; const FIELD_CRITERIA = 'criteria'; const FIELD_CRITERIA_EXT = '_criteria'; @@ -151,6 +147,9 @@ class FHIRMeasurePopulation extends FHIRBackboneElement */ protected $name = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMeasurePopulation Constructor * @param null|array $data @@ -180,8 +179,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CRITERIA] instanceof FHIRString) { $this->setCriteria($data[self::FIELD_CRITERIA]); - } elseif ($ext && is_scalar($data[self::FIELD_CRITERIA])) { - $this->setCriteria(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_CRITERIA]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CRITERIA])) { + $this->setCriteria(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_CRITERIA]] + $ext)); + } else if (is_array($data[self::FIELD_CRITERIA])) { + $this->setCriteria(new FHIRString(array_merge($ext, $data[self::FIELD_CRITERIA]))); + } } else { $this->setCriteria(new FHIRString($data[self::FIELD_CRITERIA])); } @@ -192,8 +195,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -204,8 +211,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->setIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { - $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_IDENTIFIER]))); + } } else { $this->setIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); } @@ -216,8 +227,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -537,7 +552,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESCRIPTION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } @@ -557,19 +571,48 @@ public function jsonSerialize() $a[self::FIELD_CODE] = $v; } if (null !== ($v = $this->getCriteria())) { - $a[self::FIELD_CRITERIA] = $v->getValue(); - $a[self::FIELD_CRITERIA_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CRITERIA] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CRITERIA_EXT] = $enc; + } + } else { + $a[self::FIELD_CRITERIA] = $v; + } } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if (null !== ($v = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_IDENTIFIER] = $v; + } } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRMeasure/FHIRMeasureStratifier.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRMeasure/FHIRMeasureStratifier.php index 1e7c08486e..ef3da751ae 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRMeasure/FHIRMeasureStratifier.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRMeasure/FHIRMeasureStratifier.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRMeasureStratifier extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MEASURE_DOT_STRATIFIER; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CRITERIA = 'criteria'; const FIELD_CRITERIA_EXT = '_criteria'; const FIELD_IDENTIFIER = 'identifier'; @@ -125,6 +121,9 @@ class FHIRMeasureStratifier extends FHIRBackboneElement */ protected $path = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMeasureStratifier Constructor * @param null|array $data @@ -147,8 +146,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CRITERIA] instanceof FHIRString) { $this->setCriteria($data[self::FIELD_CRITERIA]); - } elseif ($ext && is_scalar($data[self::FIELD_CRITERIA])) { - $this->setCriteria(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_CRITERIA]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CRITERIA])) { + $this->setCriteria(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_CRITERIA]] + $ext)); + } else if (is_array($data[self::FIELD_CRITERIA])) { + $this->setCriteria(new FHIRString(array_merge($ext, $data[self::FIELD_CRITERIA]))); + } } else { $this->setCriteria(new FHIRString($data[self::FIELD_CRITERIA])); } @@ -159,8 +162,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->setIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { - $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_IDENTIFIER]))); + } } else { $this->setIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); } @@ -171,8 +178,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PATH] instanceof FHIRString) { $this->setPath($data[self::FIELD_PATH]); - } elseif ($ext && is_scalar($data[self::FIELD_PATH])) { - $this->setPath(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PATH]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PATH])) { + $this->setPath(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PATH]] + $ext)); + } else if (is_array($data[self::FIELD_PATH])) { + $this->setPath(new FHIRString(array_merge($ext, $data[self::FIELD_PATH]))); + } } else { $this->setPath(new FHIRString($data[self::FIELD_PATH])); } @@ -405,10 +416,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getCriteria())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CRITERIA, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } @@ -425,15 +436,37 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getCriteria())) { - $a[self::FIELD_CRITERIA] = $v->getValue(); - $a[self::FIELD_CRITERIA_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CRITERIA] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CRITERIA_EXT] = $enc; + } + } else { + $a[self::FIELD_CRITERIA] = $v; + } } if (null !== ($v = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_IDENTIFIER] = $v; + } } if (null !== ($v = $this->getPath())) { - $a[self::FIELD_PATH] = $v->getValue(); - $a[self::FIELD_PATH_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PATH] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PATH_EXT] = $enc; + } + } else { + $a[self::FIELD_PATH] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRMeasure/FHIRMeasureSupplementalData.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRMeasure/FHIRMeasureSupplementalData.php index 76eaf78fed..e812ed9703 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRMeasure/FHIRMeasureSupplementalData.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRMeasure/FHIRMeasureSupplementalData.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRMeasureSupplementalData extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MEASURE_DOT_SUPPLEMENTAL_DATA; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CRITERIA = 'criteria'; const FIELD_CRITERIA_EXT = '_criteria'; const FIELD_IDENTIFIER = 'identifier'; @@ -143,6 +139,9 @@ class FHIRMeasureSupplementalData extends FHIRBackboneElement */ protected $usage = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMeasureSupplementalData Constructor * @param null|array $data @@ -165,8 +164,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CRITERIA] instanceof FHIRString) { $this->setCriteria($data[self::FIELD_CRITERIA]); - } elseif ($ext && is_scalar($data[self::FIELD_CRITERIA])) { - $this->setCriteria(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_CRITERIA]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CRITERIA])) { + $this->setCriteria(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_CRITERIA]] + $ext)); + } else if (is_array($data[self::FIELD_CRITERIA])) { + $this->setCriteria(new FHIRString(array_merge($ext, $data[self::FIELD_CRITERIA]))); + } } else { $this->setCriteria(new FHIRString($data[self::FIELD_CRITERIA])); } @@ -177,8 +180,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->setIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { - $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_IDENTIFIER]))); + } } else { $this->setIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); } @@ -189,8 +196,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PATH] instanceof FHIRString) { $this->setPath($data[self::FIELD_PATH]); - } elseif ($ext && is_scalar($data[self::FIELD_PATH])) { - $this->setPath(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PATH]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PATH])) { + $this->setPath(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PATH]] + $ext)); + } else if (is_array($data[self::FIELD_PATH])) { + $this->setPath(new FHIRString(array_merge($ext, $data[self::FIELD_PATH]))); + } } else { $this->setPath(new FHIRString($data[self::FIELD_PATH])); } @@ -198,6 +209,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_USAGE])) { if (is_array($data[self::FIELD_USAGE])) { foreach($data[self::FIELD_USAGE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addUsage($v); } else { @@ -514,17 +528,16 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getCriteria())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CRITERIA, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getPath())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATH, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getUsage())) { foreach($vs as $v) { if (null === $v) { @@ -543,15 +556,37 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getCriteria())) { - $a[self::FIELD_CRITERIA] = $v->getValue(); - $a[self::FIELD_CRITERIA_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CRITERIA] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CRITERIA_EXT] = $enc; + } + } else { + $a[self::FIELD_CRITERIA] = $v; + } } if (null !== ($v = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_IDENTIFIER] = $v; + } } if (null !== ($v = $this->getPath())) { - $a[self::FIELD_PATH] = $v->getValue(); - $a[self::FIELD_PATH_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PATH] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PATH_EXT] = $enc; + } + } else { + $a[self::FIELD_PATH] = $v; + } } if ([] !== ($vs = $this->getUsage())) { $a[self::FIELD_USAGE] = $vs; diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRMeasureReport/FHIRMeasureReportGroup.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRMeasureReport/FHIRMeasureReportGroup.php index 2db11db978..28e21b96a8 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRMeasureReport/FHIRMeasureReportGroup.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRMeasureReport/FHIRMeasureReportGroup.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRMeasureReportGroup extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MEASURE_REPORT_DOT_GROUP; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_IDENTIFIER = 'identifier'; const FIELD_IDENTIFIER_EXT = '_identifier'; const FIELD_MEASURE_SCORE = 'measureScore'; @@ -134,6 +130,9 @@ class FHIRMeasureReportGroup extends FHIRBackboneElement */ protected $stratifier = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMeasureReportGroup Constructor * @param null|array $data @@ -156,8 +155,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->setIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { - $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_IDENTIFIER]))); + } } else { $this->setIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); } @@ -168,8 +171,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MEASURE_SCORE] instanceof FHIRDecimal) { $this->setMeasureScore($data[self::FIELD_MEASURE_SCORE]); - } elseif ($ext && is_scalar($data[self::FIELD_MEASURE_SCORE])) { - $this->setMeasureScore(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_MEASURE_SCORE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MEASURE_SCORE])) { + $this->setMeasureScore(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_MEASURE_SCORE]] + $ext)); + } else if (is_array($data[self::FIELD_MEASURE_SCORE])) { + $this->setMeasureScore(new FHIRDecimal(array_merge($ext, $data[self::FIELD_MEASURE_SCORE]))); + } } else { $this->setMeasureScore(new FHIRDecimal($data[self::FIELD_MEASURE_SCORE])); } @@ -177,6 +184,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_POPULATION])) { if (is_array($data[self::FIELD_POPULATION])) { foreach($data[self::FIELD_POPULATION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRMeasureReportPopulation) { $this->addPopulation($v); } else { @@ -192,6 +202,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_STRATIFIER])) { if (is_array($data[self::FIELD_STRATIFIER])) { foreach($data[self::FIELD_STRATIFIER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRMeasureReportStratifier) { $this->addStratifier($v); } else { @@ -511,7 +524,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getMeasureScore())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MEASURE_SCORE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getPopulation())) { foreach($vs as $v) { if (null === $v) { @@ -520,7 +532,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_POPULATION, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getStratifier())) { foreach($vs as $v) { if (null === $v) { @@ -539,11 +550,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_IDENTIFIER] = $v; + } } if (null !== ($v = $this->getMeasureScore())) { - $a[self::FIELD_MEASURE_SCORE] = $v->getValue(); - $a[self::FIELD_MEASURE_SCORE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MEASURE_SCORE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MEASURE_SCORE_EXT] = $enc; + } + } else { + $a[self::FIELD_MEASURE_SCORE] = $v; + } } if ([] !== ($vs = $this->getPopulation())) { $a[self::FIELD_POPULATION] = $vs; diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRMeasureReport/FHIRMeasureReportPopulation.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRMeasureReport/FHIRMeasureReportPopulation.php index 5ae12e2765..d090ba9381 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRMeasureReport/FHIRMeasureReportPopulation.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRMeasureReport/FHIRMeasureReportPopulation.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRMeasureReportPopulation extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MEASURE_REPORT_DOT_POPULATION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CODE = 'code'; const FIELD_COUNT = 'count'; const FIELD_COUNT_EXT = '_count'; @@ -138,6 +134,9 @@ class FHIRMeasureReportPopulation extends FHIRBackboneElement */ protected $patients = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMeasureReportPopulation Constructor * @param null|array $data @@ -167,8 +166,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_COUNT] instanceof FHIRInteger) { $this->setCount($data[self::FIELD_COUNT]); - } elseif ($ext && is_scalar($data[self::FIELD_COUNT])) { - $this->setCount(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_COUNT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_COUNT])) { + $this->setCount(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_COUNT]] + $ext)); + } else if (is_array($data[self::FIELD_COUNT])) { + $this->setCount(new FHIRInteger(array_merge($ext, $data[self::FIELD_COUNT]))); + } } else { $this->setCount(new FHIRInteger($data[self::FIELD_COUNT])); } @@ -179,8 +182,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->setIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { - $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_IDENTIFIER]))); + } } else { $this->setIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); } @@ -449,11 +456,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getCount())) { $v->xmlSerialize($sxe->addChild(self::FIELD_COUNT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPatients())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATIENTS, null, $v->_getFHIRXMLNamespace())); } @@ -470,11 +475,26 @@ public function jsonSerialize() $a[self::FIELD_CODE] = $v; } if (null !== ($v = $this->getCount())) { - $a[self::FIELD_COUNT] = $v->getValue(); - $a[self::FIELD_COUNT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_COUNT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_COUNT_EXT] = $enc; + } + } else { + $a[self::FIELD_COUNT] = $v; + } } if (null !== ($v = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_IDENTIFIER] = $v; + } } if (null !== ($v = $this->getPatients())) { $a[self::FIELD_PATIENTS] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRMeasureReport/FHIRMeasureReportPopulation1.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRMeasureReport/FHIRMeasureReportPopulation1.php index d4911f9c63..a9cdb65418 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRMeasureReport/FHIRMeasureReportPopulation1.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRMeasureReport/FHIRMeasureReportPopulation1.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRMeasureReportPopulation1 extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MEASURE_REPORT_DOT_POPULATION_1; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CODE = 'code'; const FIELD_COUNT = 'count'; const FIELD_COUNT_EXT = '_count'; @@ -138,6 +134,9 @@ class FHIRMeasureReportPopulation1 extends FHIRBackboneElement */ protected $patients = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMeasureReportPopulation1 Constructor * @param null|array $data @@ -167,8 +166,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_COUNT] instanceof FHIRInteger) { $this->setCount($data[self::FIELD_COUNT]); - } elseif ($ext && is_scalar($data[self::FIELD_COUNT])) { - $this->setCount(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_COUNT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_COUNT])) { + $this->setCount(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_COUNT]] + $ext)); + } else if (is_array($data[self::FIELD_COUNT])) { + $this->setCount(new FHIRInteger(array_merge($ext, $data[self::FIELD_COUNT]))); + } } else { $this->setCount(new FHIRInteger($data[self::FIELD_COUNT])); } @@ -179,8 +182,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->setIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { - $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_IDENTIFIER]))); + } } else { $this->setIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); } @@ -449,11 +456,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getCount())) { $v->xmlSerialize($sxe->addChild(self::FIELD_COUNT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPatients())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATIENTS, null, $v->_getFHIRXMLNamespace())); } @@ -470,11 +475,26 @@ public function jsonSerialize() $a[self::FIELD_CODE] = $v; } if (null !== ($v = $this->getCount())) { - $a[self::FIELD_COUNT] = $v->getValue(); - $a[self::FIELD_COUNT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_COUNT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_COUNT_EXT] = $enc; + } + } else { + $a[self::FIELD_COUNT] = $v; + } } if (null !== ($v = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_IDENTIFIER] = $v; + } } if (null !== ($v = $this->getPatients())) { $a[self::FIELD_PATIENTS] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRMeasureReport/FHIRMeasureReportStratifier.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRMeasureReport/FHIRMeasureReportStratifier.php index 38e7826fa7..2f84df7d58 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRMeasureReport/FHIRMeasureReportStratifier.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRMeasureReport/FHIRMeasureReportStratifier.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -77,10 +77,6 @@ class FHIRMeasureReportStratifier extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MEASURE_REPORT_DOT_STRATIFIER; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_IDENTIFIER = 'identifier'; const FIELD_IDENTIFIER_EXT = '_identifier'; const FIELD_STRATUM = 'stratum'; @@ -108,6 +104,9 @@ class FHIRMeasureReportStratifier extends FHIRBackboneElement */ protected $stratum = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMeasureReportStratifier Constructor * @param null|array $data @@ -130,8 +129,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->setIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { - $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_IDENTIFIER]))); + } } else { $this->setIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); } @@ -142,17 +145,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_STRATUM])) { foreach($data[self::FIELD_STRATUM] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRMeasureReportStratum) { $this->addStratum($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addStratum(new FHIRMeasureReportStratum([FHIRMeasureReportStratum::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addStratum(new FHIRMeasureReportStratum([FHIRMeasureReportStratum::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addStratum(new FHIRMeasureReportStratum(array_merge($v, $ext[$i]))); + } } else { $this->addStratum(new FHIRMeasureReportStratum($v)); } } } elseif ($data[self::FIELD_STRATUM] instanceof FHIRMeasureReportStratum) { $this->addStratum($data[self::FIELD_STRATUM]); - } elseif ($ext && is_scalar($data[self::FIELD_STRATUM])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_STRATUM])) { $this->addStratum(new FHIRMeasureReportStratum([FHIRMeasureReportStratum::FIELD_VALUE => $data[self::FIELD_STRATUM]] + $ext)); } else { $this->addStratum(new FHIRMeasureReportStratum($data[self::FIELD_STRATUM])); @@ -357,7 +367,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getStratum())) { foreach($vs as $v) { if (null === $v) { @@ -376,10 +385,34 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_IDENTIFIER] = $v; + } } if ([] !== ($vs = $this->getStratum())) { - $a[self::FIELD_STRATUM] = $vs; + $a[self::FIELD_STRATUM] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STRATUM][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STRATUM_EXT][] = $enc; + } else { + $a[self::FIELD_STRATUM_EXT][] = null; + } + } else { + $a[self::FIELD_STRATUM][] = $v; + } + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRMeasureReport/FHIRMeasureReportStratum.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRMeasureReport/FHIRMeasureReportStratum.php index b64ba87319..fb1a470ab9 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRMeasureReport/FHIRMeasureReportStratum.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRMeasureReport/FHIRMeasureReportStratum.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRMeasureReportStratum extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MEASURE_REPORT_DOT_STRATUM; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_MEASURE_SCORE = 'measureScore'; const FIELD_MEASURE_SCORE_EXT = '_measureScore'; const FIELD_POPULATION = 'population'; @@ -124,6 +120,9 @@ class FHIRMeasureReportStratum extends FHIRBackboneElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMeasureReportStratum Constructor * @param null|array $data @@ -150,8 +149,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MEASURE_SCORE] instanceof FHIRDecimal) { $this->setMeasureScore($data[self::FIELD_MEASURE_SCORE]); - } elseif ($ext && is_scalar($data[self::FIELD_MEASURE_SCORE])) { - $this->setMeasureScore(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_MEASURE_SCORE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MEASURE_SCORE])) { + $this->setMeasureScore(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_MEASURE_SCORE]] + $ext)); + } else if (is_array($data[self::FIELD_MEASURE_SCORE])) { + $this->setMeasureScore(new FHIRDecimal(array_merge($ext, $data[self::FIELD_MEASURE_SCORE]))); + } } else { $this->setMeasureScore(new FHIRDecimal($data[self::FIELD_MEASURE_SCORE])); } @@ -159,6 +162,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_POPULATION])) { if (is_array($data[self::FIELD_POPULATION])) { foreach($data[self::FIELD_POPULATION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRMeasureReportPopulation1) { $this->addPopulation($v); } else { @@ -177,8 +183,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE] instanceof FHIRString) { $this->setValue($data[self::FIELD_VALUE]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE])) { - $this->setValue(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VALUE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE])) { + $this->setValue(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VALUE]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE])) { + $this->setValue(new FHIRString(array_merge($ext, $data[self::FIELD_VALUE]))); + } } else { $this->setValue(new FHIRString($data[self::FIELD_VALUE])); } @@ -438,10 +448,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getMeasureScore())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MEASURE_SCORE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getPopulation())) { foreach($vs as $v) { if (null === $v) { @@ -451,6 +461,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 } } if (null !== ($v = $this->getValue())) { + $sxe->addAttribute(self::FIELD_VALUE, (string)$v); $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE, null, $v->_getFHIRXMLNamespace())); } return $sxe; @@ -463,15 +474,29 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getMeasureScore())) { - $a[self::FIELD_MEASURE_SCORE] = $v->getValue(); - $a[self::FIELD_MEASURE_SCORE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MEASURE_SCORE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MEASURE_SCORE_EXT] = $enc; + } + } else { + $a[self::FIELD_MEASURE_SCORE] = $v; + } } if ([] !== ($vs = $this->getPopulation())) { $a[self::FIELD_POPULATION] = $vs; } if (null !== ($v = $this->getValue())) { - $a[self::FIELD_VALUE] = $v->getValue(); - $a[self::FIELD_VALUE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRMedication/FHIRMedicationBatch.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRMedication/FHIRMedicationBatch.php index 47a0a6b91e..d8d486b48d 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRMedication/FHIRMedicationBatch.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRMedication/FHIRMedicationBatch.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRMedicationBatch extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MEDICATION_DOT_BATCH; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_EXPIRATION_DATE = 'expirationDate'; const FIELD_EXPIRATION_DATE_EXT = '_expirationDate'; const FIELD_LOT_NUMBER = 'lotNumber'; @@ -113,6 +109,9 @@ class FHIRMedicationBatch extends FHIRBackboneElement */ protected $lotNumber = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMedicationBatch Constructor * @param null|array $data @@ -135,8 +134,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EXPIRATION_DATE] instanceof FHIRDateTime) { $this->setExpirationDate($data[self::FIELD_EXPIRATION_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_EXPIRATION_DATE])) { - $this->setExpirationDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_EXPIRATION_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EXPIRATION_DATE])) { + $this->setExpirationDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_EXPIRATION_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_EXPIRATION_DATE])) { + $this->setExpirationDate(new FHIRDateTime(array_merge($ext, $data[self::FIELD_EXPIRATION_DATE]))); + } } else { $this->setExpirationDate(new FHIRDateTime($data[self::FIELD_EXPIRATION_DATE])); } @@ -147,8 +150,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_LOT_NUMBER] instanceof FHIRString) { $this->setLotNumber($data[self::FIELD_LOT_NUMBER]); - } elseif ($ext && is_scalar($data[self::FIELD_LOT_NUMBER])) { - $this->setLotNumber(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_LOT_NUMBER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_LOT_NUMBER])) { + $this->setLotNumber(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_LOT_NUMBER]] + $ext)); + } else if (is_array($data[self::FIELD_LOT_NUMBER])) { + $this->setLotNumber(new FHIRString(array_merge($ext, $data[self::FIELD_LOT_NUMBER]))); + } } else { $this->setLotNumber(new FHIRString($data[self::FIELD_LOT_NUMBER])); } @@ -348,6 +355,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getExpirationDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EXPIRATION_DATE, null, $v->_getFHIRXMLNamespace())); } @@ -364,12 +372,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getExpirationDate())) { - $a[self::FIELD_EXPIRATION_DATE] = $v->getValue(); - $a[self::FIELD_EXPIRATION_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EXPIRATION_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EXPIRATION_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_EXPIRATION_DATE] = $v; + } } if (null !== ($v = $this->getLotNumber())) { - $a[self::FIELD_LOT_NUMBER] = $v->getValue(); - $a[self::FIELD_LOT_NUMBER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_LOT_NUMBER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_LOT_NUMBER_EXT] = $enc; + } + } else { + $a[self::FIELD_LOT_NUMBER] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRMedication/FHIRMedicationContent.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRMedication/FHIRMedicationContent.php index 15bf87163f..a51e574005 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRMedication/FHIRMedicationContent.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRMedication/FHIRMedicationContent.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRMedicationContent extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MEDICATION_DOT_CONTENT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_AMOUNT = 'amount'; const FIELD_AMOUNT_EXT = '_amount'; const FIELD_ITEM_CODEABLE_CONCEPT = 'itemCodeableConcept'; @@ -125,6 +121,9 @@ class FHIRMedicationContent extends FHIRBackboneElement */ protected $itemReference = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMedicationContent Constructor * @param null|array $data @@ -147,8 +146,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_AMOUNT] instanceof FHIRQuantity) { $this->setAmount($data[self::FIELD_AMOUNT]); - } elseif ($ext && is_scalar($data[self::FIELD_AMOUNT])) { - $this->setAmount(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_AMOUNT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_AMOUNT])) { + $this->setAmount(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_AMOUNT]] + $ext)); + } else if (is_array($data[self::FIELD_AMOUNT])) { + $this->setAmount(new FHIRQuantity(array_merge($ext, $data[self::FIELD_AMOUNT]))); + } } else { $this->setAmount(new FHIRQuantity($data[self::FIELD_AMOUNT])); } @@ -377,11 +380,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getAmount())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AMOUNT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getItemCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ITEM_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getItemReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ITEM_REFERENCE, null, $v->_getFHIRXMLNamespace())); } @@ -395,7 +396,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getAmount())) { - $a[self::FIELD_AMOUNT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_AMOUNT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_AMOUNT_EXT] = $enc; + } + } else { + $a[self::FIELD_AMOUNT] = $v; + } } if (null !== ($v = $this->getItemCodeableConcept())) { $a[self::FIELD_ITEM_CODEABLE_CONCEPT] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRMedication/FHIRMedicationIngredient.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRMedication/FHIRMedicationIngredient.php index f8f97f20b3..4fcfe3020b 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRMedication/FHIRMedicationIngredient.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRMedication/FHIRMedicationIngredient.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -81,10 +81,6 @@ class FHIRMedicationIngredient extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MEDICATION_DOT_INGREDIENT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_AMOUNT = 'amount'; const FIELD_IS_ACTIVE = 'isActive'; const FIELD_IS_ACTIVE_EXT = '_isActive'; @@ -141,6 +137,9 @@ class FHIRMedicationIngredient extends FHIRBackboneElement */ protected $itemReference = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMedicationIngredient Constructor * @param null|array $data @@ -170,8 +169,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IS_ACTIVE] instanceof FHIRBoolean) { $this->setIsActive($data[self::FIELD_IS_ACTIVE]); - } elseif ($ext && is_scalar($data[self::FIELD_IS_ACTIVE])) { - $this->setIsActive(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_IS_ACTIVE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IS_ACTIVE])) { + $this->setIsActive(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_IS_ACTIVE]] + $ext)); + } else if (is_array($data[self::FIELD_IS_ACTIVE])) { + $this->setIsActive(new FHIRBoolean(array_merge($ext, $data[self::FIELD_IS_ACTIVE]))); + } } else { $this->setIsActive(new FHIRBoolean($data[self::FIELD_IS_ACTIVE])); } @@ -453,11 +456,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getIsActive())) { $v->xmlSerialize($sxe->addChild(self::FIELD_IS_ACTIVE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getItemCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ITEM_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getItemReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ITEM_REFERENCE, null, $v->_getFHIRXMLNamespace())); } @@ -474,8 +475,15 @@ public function jsonSerialize() $a[self::FIELD_AMOUNT] = $v; } if (null !== ($v = $this->getIsActive())) { - $a[self::FIELD_IS_ACTIVE] = $v->getValue(); - $a[self::FIELD_IS_ACTIVE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IS_ACTIVE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IS_ACTIVE_EXT] = $enc; + } + } else { + $a[self::FIELD_IS_ACTIVE] = $v; + } } if (null !== ($v = $this->getItemCodeableConcept())) { $a[self::FIELD_ITEM_CODEABLE_CONCEPT] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRMedication/FHIRMedicationPackage.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRMedication/FHIRMedicationPackage.php index 4767fcd595..e2b791648d 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRMedication/FHIRMedicationPackage.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRMedication/FHIRMedicationPackage.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRMedicationPackage extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MEDICATION_DOT_PACKAGE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_BATCH = 'batch'; const FIELD_CONTAINER = 'container'; const FIELD_CONTENT = 'content'; @@ -119,6 +115,9 @@ class FHIRMedicationPackage extends FHIRBackboneElement */ protected $content = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMedicationPackage Constructor * @param null|array $data @@ -138,6 +137,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_BATCH])) { if (is_array($data[self::FIELD_BATCH])) { foreach($data[self::FIELD_BATCH] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRMedicationBatch) { $this->addBatch($v); } else { @@ -160,6 +162,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CONTENT])) { if (is_array($data[self::FIELD_CONTENT])) { foreach($data[self::FIELD_CONTENT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRMedicationContent) { $this->addContent($v); } else { @@ -436,11 +441,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_BATCH, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getContainer())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CONTAINER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getContent())) { foreach($vs as $v) { if (null === $v) { diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRMedicationAdministration/FHIRMedicationAdministrationDosage.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRMedicationAdministration/FHIRMedicationAdministrationDosage.php index 28d949b859..7b0ba3889b 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRMedicationAdministration/FHIRMedicationAdministrationDosage.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRMedicationAdministration/FHIRMedicationAdministrationDosage.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -84,10 +84,6 @@ class FHIRMedicationAdministrationDosage extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MEDICATION_ADMINISTRATION_DOT_DOSAGE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DOSE = 'dose'; const FIELD_DOSE_EXT = '_dose'; const FIELD_METHOD = 'method'; @@ -201,6 +197,9 @@ class FHIRMedicationAdministrationDosage extends FHIRBackboneElement */ protected $text = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMedicationAdministrationDosage Constructor * @param null|array $data @@ -223,8 +222,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DOSE] instanceof FHIRQuantity) { $this->setDose($data[self::FIELD_DOSE]); - } elseif ($ext && is_scalar($data[self::FIELD_DOSE])) { - $this->setDose(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_DOSE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DOSE])) { + $this->setDose(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_DOSE]] + $ext)); + } else if (is_array($data[self::FIELD_DOSE])) { + $this->setDose(new FHIRQuantity(array_merge($ext, $data[self::FIELD_DOSE]))); + } } else { $this->setDose(new FHIRQuantity($data[self::FIELD_DOSE])); } @@ -242,8 +245,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_RATE_QUANTITY] instanceof FHIRQuantity) { $this->setRateQuantity($data[self::FIELD_RATE_QUANTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_RATE_QUANTITY])) { - $this->setRateQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_RATE_QUANTITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_RATE_QUANTITY])) { + $this->setRateQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_RATE_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_RATE_QUANTITY])) { + $this->setRateQuantity(new FHIRQuantity(array_merge($ext, $data[self::FIELD_RATE_QUANTITY]))); + } } else { $this->setRateQuantity(new FHIRQuantity($data[self::FIELD_RATE_QUANTITY])); } @@ -275,8 +282,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TEXT] instanceof FHIRString) { $this->setText($data[self::FIELD_TEXT]); - } elseif ($ext && is_scalar($data[self::FIELD_TEXT])) { - $this->setText(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TEXT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TEXT])) { + $this->setText(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TEXT]] + $ext)); + } else if (is_array($data[self::FIELD_TEXT])) { + $this->setText(new FHIRString(array_merge($ext, $data[self::FIELD_TEXT]))); + } } else { $this->setText(new FHIRString($data[self::FIELD_TEXT])); } @@ -678,23 +689,18 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDose())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DOSE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getMethod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_METHOD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRateQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RATE_QUANTITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRateRatio())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RATE_RATIO, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRoute())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ROUTE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSite())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SITE, null, $v->_getFHIRXMLNamespace())); } @@ -711,13 +717,29 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getDose())) { - $a[self::FIELD_DOSE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DOSE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DOSE_EXT] = $enc; + } + } else { + $a[self::FIELD_DOSE] = $v; + } } if (null !== ($v = $this->getMethod())) { $a[self::FIELD_METHOD] = $v; } if (null !== ($v = $this->getRateQuantity())) { - $a[self::FIELD_RATE_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_RATE_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_RATE_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_RATE_QUANTITY] = $v; + } } if (null !== ($v = $this->getRateRatio())) { $a[self::FIELD_RATE_RATIO] = $v; @@ -729,8 +751,15 @@ public function jsonSerialize() $a[self::FIELD_SITE] = $v; } if (null !== ($v = $this->getText())) { - $a[self::FIELD_TEXT] = $v->getValue(); - $a[self::FIELD_TEXT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TEXT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TEXT_EXT] = $enc; + } + } else { + $a[self::FIELD_TEXT] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRMedicationAdministration/FHIRMedicationAdministrationPerformer.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRMedicationAdministration/FHIRMedicationAdministrationPerformer.php index 8553e2ccfb..82538ff532 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRMedicationAdministration/FHIRMedicationAdministrationPerformer.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRMedicationAdministration/FHIRMedicationAdministrationPerformer.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -81,10 +81,6 @@ class FHIRMedicationAdministrationPerformer extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MEDICATION_ADMINISTRATION_DOT_PERFORMER; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ACTOR = 'actor'; const FIELD_ON_BEHALF_OF = 'onBehalfOf'; @@ -110,6 +106,9 @@ class FHIRMedicationAdministrationPerformer extends FHIRBackboneElement */ protected $onBehalfOf = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMedicationAdministrationPerformer Constructor * @param null|array $data @@ -311,7 +310,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getActor())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ACTOR, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOnBehalfOf())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ON_BEHALF_OF, null, $v->_getFHIRXMLNamespace())); } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRMedicationDispense/FHIRMedicationDispensePerformer.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRMedicationDispense/FHIRMedicationDispensePerformer.php index cfbe0da7ef..fdb5346eb8 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRMedicationDispense/FHIRMedicationDispensePerformer.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRMedicationDispense/FHIRMedicationDispensePerformer.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRMedicationDispensePerformer extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MEDICATION_DISPENSE_DOT_PERFORMER; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ACTOR = 'actor'; const FIELD_ON_BEHALF_OF = 'onBehalfOf'; @@ -110,6 +106,9 @@ class FHIRMedicationDispensePerformer extends FHIRBackboneElement */ protected $onBehalfOf = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMedicationDispensePerformer Constructor * @param null|array $data @@ -313,7 +312,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getActor())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ACTOR, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOnBehalfOf())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ON_BEHALF_OF, null, $v->_getFHIRXMLNamespace())); } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRMedicationDispense/FHIRMedicationDispenseSubstitution.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRMedicationDispense/FHIRMedicationDispenseSubstitution.php index 58e5038372..b947991072 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRMedicationDispense/FHIRMedicationDispenseSubstitution.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRMedicationDispense/FHIRMedicationDispenseSubstitution.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -82,10 +82,6 @@ class FHIRMedicationDispenseSubstitution extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MEDICATION_DISPENSE_DOT_SUBSTITUTION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_REASON = 'reason'; const FIELD_RESPONSIBLE_PARTY = 'responsibleParty'; const FIELD_TYPE = 'type'; @@ -140,6 +136,9 @@ class FHIRMedicationDispenseSubstitution extends FHIRBackboneElement */ protected $wasSubstituted = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMedicationDispenseSubstitution Constructor * @param null|array $data @@ -159,6 +158,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REASON])) { if (is_array($data[self::FIELD_REASON])) { foreach($data[self::FIELD_REASON] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addReason($v); } else { @@ -174,6 +176,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_RESPONSIBLE_PARTY])) { if (is_array($data[self::FIELD_RESPONSIBLE_PARTY])) { foreach($data[self::FIELD_RESPONSIBLE_PARTY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addResponsibleParty($v); } else { @@ -199,8 +204,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_WAS_SUBSTITUTED] instanceof FHIRBoolean) { $this->setWasSubstituted($data[self::FIELD_WAS_SUBSTITUTED]); - } elseif ($ext && is_scalar($data[self::FIELD_WAS_SUBSTITUTED])) { - $this->setWasSubstituted(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_WAS_SUBSTITUTED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_WAS_SUBSTITUTED])) { + $this->setWasSubstituted(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_WAS_SUBSTITUTED]] + $ext)); + } else if (is_array($data[self::FIELD_WAS_SUBSTITUTED])) { + $this->setWasSubstituted(new FHIRBoolean(array_merge($ext, $data[self::FIELD_WAS_SUBSTITUTED]))); + } } else { $this->setWasSubstituted(new FHIRBoolean($data[self::FIELD_WAS_SUBSTITUTED])); } @@ -524,7 +533,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_REASON, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getResponsibleParty())) { foreach($vs as $v) { if (null === $v) { @@ -533,7 +541,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_RESPONSIBLE_PARTY, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -559,8 +566,15 @@ public function jsonSerialize() $a[self::FIELD_TYPE] = $v; } if (null !== ($v = $this->getWasSubstituted())) { - $a[self::FIELD_WAS_SUBSTITUTED] = $v->getValue(); - $a[self::FIELD_WAS_SUBSTITUTED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_WAS_SUBSTITUTED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_WAS_SUBSTITUTED_EXT] = $enc; + } + } else { + $a[self::FIELD_WAS_SUBSTITUTED] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRMedicationRequest/FHIRMedicationRequestDispenseRequest.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRMedicationRequest/FHIRMedicationRequestDispenseRequest.php index 4c5eca795b..b90de88460 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRMedicationRequest/FHIRMedicationRequestDispenseRequest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRMedicationRequest/FHIRMedicationRequestDispenseRequest.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -85,11 +85,8 @@ class FHIRMedicationRequestDispenseRequest extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MEDICATION_REQUEST_DOT_DISPENSE_REQUEST; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_EXPECTED_SUPPLY_DURATION = 'expectedSupplyDuration'; + const FIELD_EXPECTED_SUPPLY_DURATION_EXT = '_expectedSupplyDuration'; const FIELD_NUMBER_OF_REPEATS_ALLOWED = 'numberOfRepeatsAllowed'; const FIELD_NUMBER_OF_REPEATS_ALLOWED_EXT = '_numberOfRepeatsAllowed'; const FIELD_PERFORMER = 'performer'; @@ -161,6 +158,9 @@ class FHIRMedicationRequestDispenseRequest extends FHIRBackboneElement */ protected $validityPeriod = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMedicationRequestDispenseRequest Constructor * @param null|array $data @@ -178,8 +178,17 @@ public function __construct($data = null) } parent::__construct($data); if (isset($data[self::FIELD_EXPECTED_SUPPLY_DURATION])) { + $ext = (isset($data[self::FIELD_EXPECTED_SUPPLY_DURATION_EXT]) && is_array($data[self::FIELD_EXPECTED_SUPPLY_DURATION_EXT])) + ? $data[self::FIELD_EXPECTED_SUPPLY_DURATION_EXT] + : null; if ($data[self::FIELD_EXPECTED_SUPPLY_DURATION] instanceof FHIRDuration) { $this->setExpectedSupplyDuration($data[self::FIELD_EXPECTED_SUPPLY_DURATION]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EXPECTED_SUPPLY_DURATION])) { + $this->setExpectedSupplyDuration(new FHIRDuration([FHIRDuration::FIELD_VALUE => $data[self::FIELD_EXPECTED_SUPPLY_DURATION]] + $ext)); + } else if (is_array($data[self::FIELD_EXPECTED_SUPPLY_DURATION])) { + $this->setExpectedSupplyDuration(new FHIRDuration(array_merge($ext, $data[self::FIELD_EXPECTED_SUPPLY_DURATION]))); + } } else { $this->setExpectedSupplyDuration(new FHIRDuration($data[self::FIELD_EXPECTED_SUPPLY_DURATION])); } @@ -190,8 +199,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NUMBER_OF_REPEATS_ALLOWED] instanceof FHIRPositiveInt) { $this->setNumberOfRepeatsAllowed($data[self::FIELD_NUMBER_OF_REPEATS_ALLOWED]); - } elseif ($ext && is_scalar($data[self::FIELD_NUMBER_OF_REPEATS_ALLOWED])) { - $this->setNumberOfRepeatsAllowed(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_NUMBER_OF_REPEATS_ALLOWED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NUMBER_OF_REPEATS_ALLOWED])) { + $this->setNumberOfRepeatsAllowed(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_NUMBER_OF_REPEATS_ALLOWED]] + $ext)); + } else if (is_array($data[self::FIELD_NUMBER_OF_REPEATS_ALLOWED])) { + $this->setNumberOfRepeatsAllowed(new FHIRPositiveInt(array_merge($ext, $data[self::FIELD_NUMBER_OF_REPEATS_ALLOWED]))); + } } else { $this->setNumberOfRepeatsAllowed(new FHIRPositiveInt($data[self::FIELD_NUMBER_OF_REPEATS_ALLOWED])); } @@ -209,8 +222,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_QUANTITY] instanceof FHIRQuantity) { $this->setQuantity($data[self::FIELD_QUANTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_QUANTITY])) { - $this->setQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_QUANTITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_QUANTITY])) { + $this->setQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_QUANTITY])) { + $this->setQuantity(new FHIRQuantity(array_merge($ext, $data[self::FIELD_QUANTITY]))); + } } else { $this->setQuantity(new FHIRQuantity($data[self::FIELD_QUANTITY])); } @@ -524,15 +541,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getNumberOfRepeatsAllowed())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NUMBER_OF_REPEATS_ALLOWED, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPerformer())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PERFORMER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_QUANTITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValidityPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALIDITY_PERIOD, null, $v->_getFHIRXMLNamespace())); } @@ -546,17 +560,40 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getExpectedSupplyDuration())) { - $a[self::FIELD_EXPECTED_SUPPLY_DURATION] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EXPECTED_SUPPLY_DURATION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EXPECTED_SUPPLY_DURATION_EXT] = $enc; + } + } else { + $a[self::FIELD_EXPECTED_SUPPLY_DURATION] = $v; + } } if (null !== ($v = $this->getNumberOfRepeatsAllowed())) { - $a[self::FIELD_NUMBER_OF_REPEATS_ALLOWED] = $v->getValue(); - $a[self::FIELD_NUMBER_OF_REPEATS_ALLOWED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NUMBER_OF_REPEATS_ALLOWED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NUMBER_OF_REPEATS_ALLOWED_EXT] = $enc; + } + } else { + $a[self::FIELD_NUMBER_OF_REPEATS_ALLOWED] = $v; + } } if (null !== ($v = $this->getPerformer())) { $a[self::FIELD_PERFORMER] = $v; } if (null !== ($v = $this->getQuantity())) { - $a[self::FIELD_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_QUANTITY] = $v; + } } if (null !== ($v = $this->getValidityPeriod())) { $a[self::FIELD_VALIDITY_PERIOD] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRMedicationRequest/FHIRMedicationRequestRequester.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRMedicationRequest/FHIRMedicationRequestRequester.php index bd7440c1b6..c9cd89c737 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRMedicationRequest/FHIRMedicationRequestRequester.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRMedicationRequest/FHIRMedicationRequestRequester.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -81,10 +81,6 @@ class FHIRMedicationRequestRequester extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MEDICATION_REQUEST_DOT_REQUESTER; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_AGENT = 'agent'; const FIELD_ON_BEHALF_OF = 'onBehalfOf'; @@ -111,6 +107,9 @@ class FHIRMedicationRequestRequester extends FHIRBackboneElement */ protected $onBehalfOf = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMedicationRequestRequester Constructor * @param null|array $data @@ -314,7 +313,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getAgent())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AGENT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOnBehalfOf())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ON_BEHALF_OF, null, $v->_getFHIRXMLNamespace())); } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRMedicationRequest/FHIRMedicationRequestSubstitution.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRMedicationRequest/FHIRMedicationRequestSubstitution.php index 0604103d7b..c5dd904680 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRMedicationRequest/FHIRMedicationRequestSubstitution.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRMedicationRequest/FHIRMedicationRequestSubstitution.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -82,10 +82,6 @@ class FHIRMedicationRequestSubstitution extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MEDICATION_REQUEST_DOT_SUBSTITUTION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ALLOWED = 'allowed'; const FIELD_ALLOWED_EXT = '_allowed'; const FIELD_REASON = 'reason'; @@ -114,6 +110,9 @@ class FHIRMedicationRequestSubstitution extends FHIRBackboneElement */ protected $reason = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMedicationRequestSubstitution Constructor * @param null|array $data @@ -136,8 +135,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ALLOWED] instanceof FHIRBoolean) { $this->setAllowed($data[self::FIELD_ALLOWED]); - } elseif ($ext && is_scalar($data[self::FIELD_ALLOWED])) { - $this->setAllowed(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_ALLOWED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ALLOWED])) { + $this->setAllowed(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_ALLOWED]] + $ext)); + } else if (is_array($data[self::FIELD_ALLOWED])) { + $this->setAllowed(new FHIRBoolean(array_merge($ext, $data[self::FIELD_ALLOWED]))); + } } else { $this->setAllowed(new FHIRBoolean($data[self::FIELD_ALLOWED])); } @@ -331,10 +334,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getAllowed())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ALLOWED, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getReason())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REASON, null, $v->_getFHIRXMLNamespace())); } @@ -348,8 +351,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getAllowed())) { - $a[self::FIELD_ALLOWED] = $v->getValue(); - $a[self::FIELD_ALLOWED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ALLOWED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ALLOWED_EXT] = $enc; + } + } else { + $a[self::FIELD_ALLOWED] = $v; + } } if (null !== ($v = $this->getReason())) { $a[self::FIELD_REASON] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRMessageDefinition/FHIRMessageDefinitionAllowedResponse.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRMessageDefinition/FHIRMessageDefinitionAllowedResponse.php index 58ff65d4f0..5fe904bea7 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRMessageDefinition/FHIRMessageDefinitionAllowedResponse.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRMessageDefinition/FHIRMessageDefinitionAllowedResponse.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRMessageDefinitionAllowedResponse extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MESSAGE_DEFINITION_DOT_ALLOWED_RESPONSE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_MESSAGE = 'message'; const FIELD_SITUATION = 'situation'; const FIELD_SITUATION_EXT = '_situation'; @@ -118,6 +114,9 @@ class FHIRMessageDefinitionAllowedResponse extends FHIRBackboneElement */ protected $situation = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMessageDefinitionAllowedResponse Constructor * @param null|array $data @@ -147,8 +146,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SITUATION] instanceof FHIRMarkdown) { $this->setSituation($data[self::FIELD_SITUATION]); - } elseif ($ext && is_scalar($data[self::FIELD_SITUATION])) { - $this->setSituation(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_SITUATION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SITUATION])) { + $this->setSituation(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_SITUATION]] + $ext)); + } else if (is_array($data[self::FIELD_SITUATION])) { + $this->setSituation(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_SITUATION]))); + } } else { $this->setSituation(new FHIRMarkdown($data[self::FIELD_SITUATION])); } @@ -367,8 +370,15 @@ public function jsonSerialize() $a[self::FIELD_MESSAGE] = $v; } if (null !== ($v = $this->getSituation())) { - $a[self::FIELD_SITUATION] = $v->getValue(); - $a[self::FIELD_SITUATION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SITUATION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SITUATION_EXT] = $enc; + } + } else { + $a[self::FIELD_SITUATION] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRMessageDefinition/FHIRMessageDefinitionFocus.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRMessageDefinition/FHIRMessageDefinitionFocus.php index 8e8418f163..e9cf842b44 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRMessageDefinition/FHIRMessageDefinitionFocus.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRMessageDefinition/FHIRMessageDefinitionFocus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -82,10 +82,6 @@ class FHIRMessageDefinitionFocus extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MESSAGE_DEFINITION_DOT_FOCUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CODE = 'code'; const FIELD_MAX = 'max'; const FIELD_MAX_EXT = '_max'; @@ -139,6 +135,9 @@ class FHIRMessageDefinitionFocus extends FHIRBackboneElement */ protected $profile = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMessageDefinitionFocus Constructor * @param null|array $data @@ -164,8 +163,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MAX] instanceof FHIRString) { $this->setMax($data[self::FIELD_MAX]); - } elseif ($ext && is_scalar($data[self::FIELD_MAX])) { - $this->setMax(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_MAX]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MAX])) { + $this->setMax(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_MAX]] + $ext)); + } else if (is_array($data[self::FIELD_MAX])) { + $this->setMax(new FHIRString(array_merge($ext, $data[self::FIELD_MAX]))); + } } else { $this->setMax(new FHIRString($data[self::FIELD_MAX])); } @@ -176,8 +179,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MIN] instanceof FHIRUnsignedInt) { $this->setMin($data[self::FIELD_MIN]); - } elseif ($ext && is_scalar($data[self::FIELD_MIN])) { - $this->setMin(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_MIN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MIN])) { + $this->setMin(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_MIN]] + $ext)); + } else if (is_array($data[self::FIELD_MIN])) { + $this->setMin(new FHIRUnsignedInt(array_merge($ext, $data[self::FIELD_MIN]))); + } } else { $this->setMin(new FHIRUnsignedInt($data[self::FIELD_MIN])); } @@ -468,7 +475,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getMin())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MIN, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getProfile())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PROFILE, null, $v->_getFHIRXMLNamespace())); } @@ -485,12 +491,26 @@ public function jsonSerialize() $a[self::FIELD_CODE] = $v; } if (null !== ($v = $this->getMax())) { - $a[self::FIELD_MAX] = $v->getValue(); - $a[self::FIELD_MAX_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MAX] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MAX_EXT] = $enc; + } + } else { + $a[self::FIELD_MAX] = $v; + } } if (null !== ($v = $this->getMin())) { - $a[self::FIELD_MIN] = $v->getValue(); - $a[self::FIELD_MIN_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MIN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MIN_EXT] = $enc; + } + } else { + $a[self::FIELD_MIN] = $v; + } } if (null !== ($v = $this->getProfile())) { $a[self::FIELD_PROFILE] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRMessageHeader/FHIRMessageHeaderDestination.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRMessageHeader/FHIRMessageHeaderDestination.php index e4b8d68711..a8a1aed771 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRMessageHeader/FHIRMessageHeaderDestination.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRMessageHeader/FHIRMessageHeaderDestination.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -82,10 +82,6 @@ class FHIRMessageHeaderDestination extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MESSAGE_HEADER_DOT_DESTINATION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ENDPOINT = 'endpoint'; const FIELD_ENDPOINT_EXT = '_endpoint'; const FIELD_NAME = 'name'; @@ -126,6 +122,9 @@ class FHIRMessageHeaderDestination extends FHIRBackboneElement */ protected $target = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMessageHeaderDestination Constructor * @param null|array $data @@ -148,8 +147,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ENDPOINT] instanceof FHIRUri) { $this->setEndpoint($data[self::FIELD_ENDPOINT]); - } elseif ($ext && is_scalar($data[self::FIELD_ENDPOINT])) { - $this->setEndpoint(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_ENDPOINT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ENDPOINT])) { + $this->setEndpoint(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_ENDPOINT]] + $ext)); + } else if (is_array($data[self::FIELD_ENDPOINT])) { + $this->setEndpoint(new FHIRUri(array_merge($ext, $data[self::FIELD_ENDPOINT]))); + } } else { $this->setEndpoint(new FHIRUri($data[self::FIELD_ENDPOINT])); } @@ -160,8 +163,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -397,13 +404,13 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getEndpoint())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ENDPOINT, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NAME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getTarget())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TARGET, null, $v->_getFHIRXMLNamespace())); } @@ -417,12 +424,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getEndpoint())) { - $a[self::FIELD_ENDPOINT] = $v->getValue(); - $a[self::FIELD_ENDPOINT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ENDPOINT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ENDPOINT_EXT] = $enc; + } + } else { + $a[self::FIELD_ENDPOINT] = $v; + } } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if (null !== ($v = $this->getTarget())) { $a[self::FIELD_TARGET] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRMessageHeader/FHIRMessageHeaderResponse.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRMessageHeader/FHIRMessageHeaderResponse.php index b7ad938b90..06bbd354ed 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRMessageHeader/FHIRMessageHeaderResponse.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRMessageHeader/FHIRMessageHeaderResponse.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -82,10 +82,6 @@ class FHIRMessageHeaderResponse extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MESSAGE_HEADER_DOT_RESPONSE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CODE = 'code'; const FIELD_CODE_EXT = '_code'; const FIELD_DETAILS = 'details'; @@ -128,6 +124,9 @@ class FHIRMessageHeaderResponse extends FHIRBackboneElement */ protected $identifier = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMessageHeaderResponse Constructor * @param null|array $data @@ -150,8 +149,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CODE] instanceof FHIRResponseType) { $this->setCode($data[self::FIELD_CODE]); - } elseif ($ext && is_scalar($data[self::FIELD_CODE])) { - $this->setCode(new FHIRResponseType([FHIRResponseType::FIELD_VALUE => $data[self::FIELD_CODE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CODE])) { + $this->setCode(new FHIRResponseType([FHIRResponseType::FIELD_VALUE => $data[self::FIELD_CODE]] + $ext)); + } else if (is_array($data[self::FIELD_CODE])) { + $this->setCode(new FHIRResponseType(array_merge($ext, $data[self::FIELD_CODE]))); + } } else { $this->setCode(new FHIRResponseType($data[self::FIELD_CODE])); } @@ -169,8 +172,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IDENTIFIER] instanceof FHIRId) { $this->setIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { - $this->setIdentifier(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRId(array_merge($ext, $data[self::FIELD_IDENTIFIER]))); + } } else { $this->setIdentifier(new FHIRId($data[self::FIELD_IDENTIFIER])); } @@ -396,7 +403,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDetails())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DETAILS, null, $v->_getFHIRXMLNamespace())); } @@ -413,14 +419,29 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getCode())) { - $a[self::FIELD_CODE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CODE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CODE_EXT] = $enc; + } + } else { + $a[self::FIELD_CODE] = $v; + } } if (null !== ($v = $this->getDetails())) { $a[self::FIELD_DETAILS] = $v; } if (null !== ($v = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $v->getValue(); - $a[self::FIELD_IDENTIFIER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_IDENTIFIER] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRMessageHeader/FHIRMessageHeaderSource.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRMessageHeader/FHIRMessageHeaderSource.php index 2a1a5c11ea..97fdd83d58 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRMessageHeader/FHIRMessageHeaderSource.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRMessageHeader/FHIRMessageHeaderSource.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -82,10 +82,6 @@ class FHIRMessageHeaderSource extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MESSAGE_HEADER_DOT_SOURCE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CONTACT = 'contact'; const FIELD_CONTACT_EXT = '_contact'; const FIELD_ENDPOINT = 'endpoint'; @@ -155,6 +151,9 @@ class FHIRMessageHeaderSource extends FHIRBackboneElement */ protected $version = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMessageHeaderSource Constructor * @param null|array $data @@ -177,8 +176,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CONTACT] instanceof FHIRContactPoint) { $this->setContact($data[self::FIELD_CONTACT]); - } elseif ($ext && is_scalar($data[self::FIELD_CONTACT])) { - $this->setContact(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $data[self::FIELD_CONTACT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CONTACT])) { + $this->setContact(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $data[self::FIELD_CONTACT]] + $ext)); + } else if (is_array($data[self::FIELD_CONTACT])) { + $this->setContact(new FHIRContactPoint(array_merge($ext, $data[self::FIELD_CONTACT]))); + } } else { $this->setContact(new FHIRContactPoint($data[self::FIELD_CONTACT])); } @@ -189,8 +192,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ENDPOINT] instanceof FHIRUri) { $this->setEndpoint($data[self::FIELD_ENDPOINT]); - } elseif ($ext && is_scalar($data[self::FIELD_ENDPOINT])) { - $this->setEndpoint(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_ENDPOINT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ENDPOINT])) { + $this->setEndpoint(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_ENDPOINT]] + $ext)); + } else if (is_array($data[self::FIELD_ENDPOINT])) { + $this->setEndpoint(new FHIRUri(array_merge($ext, $data[self::FIELD_ENDPOINT]))); + } } else { $this->setEndpoint(new FHIRUri($data[self::FIELD_ENDPOINT])); } @@ -201,8 +208,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -213,8 +224,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SOFTWARE] instanceof FHIRString) { $this->setSoftware($data[self::FIELD_SOFTWARE]); - } elseif ($ext && is_scalar($data[self::FIELD_SOFTWARE])) { - $this->setSoftware(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SOFTWARE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SOFTWARE])) { + $this->setSoftware(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SOFTWARE]] + $ext)); + } else if (is_array($data[self::FIELD_SOFTWARE])) { + $this->setSoftware(new FHIRString(array_merge($ext, $data[self::FIELD_SOFTWARE]))); + } } else { $this->setSoftware(new FHIRString($data[self::FIELD_SOFTWARE])); } @@ -225,8 +240,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VERSION] instanceof FHIRString) { $this->setVersion($data[self::FIELD_VERSION]); - } elseif ($ext && is_scalar($data[self::FIELD_VERSION])) { - $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } else if (is_array($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString(array_merge($ext, $data[self::FIELD_VERSION]))); + } } else { $this->setVersion(new FHIRString($data[self::FIELD_VERSION])); } @@ -573,23 +592,59 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getContact())) { - $a[self::FIELD_CONTACT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CONTACT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CONTACT_EXT] = $enc; + } + } else { + $a[self::FIELD_CONTACT] = $v; + } } if (null !== ($v = $this->getEndpoint())) { - $a[self::FIELD_ENDPOINT] = $v->getValue(); - $a[self::FIELD_ENDPOINT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ENDPOINT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ENDPOINT_EXT] = $enc; + } + } else { + $a[self::FIELD_ENDPOINT] = $v; + } } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if (null !== ($v = $this->getSoftware())) { - $a[self::FIELD_SOFTWARE] = $v->getValue(); - $a[self::FIELD_SOFTWARE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SOFTWARE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SOFTWARE_EXT] = $enc; + } + } else { + $a[self::FIELD_SOFTWARE] = $v; + } } if (null !== ($v = $this->getVersion())) { - $a[self::FIELD_VERSION] = $v->getValue(); - $a[self::FIELD_VERSION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VERSION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VERSION_EXT] = $enc; + } + } else { + $a[self::FIELD_VERSION] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRNamingSystem/FHIRNamingSystemUniqueId.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRNamingSystem/FHIRNamingSystemUniqueId.php index 2c17753e49..c2d48f5899 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRNamingSystem/FHIRNamingSystemUniqueId.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRNamingSystem/FHIRNamingSystemUniqueId.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -82,10 +82,6 @@ class FHIRNamingSystemUniqueId extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_NAMING_SYSTEM_DOT_UNIQUE_ID; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_COMMENT = 'comment'; const FIELD_COMMENT_EXT = '_comment'; const FIELD_PERIOD = 'period'; @@ -152,6 +148,9 @@ class FHIRNamingSystemUniqueId extends FHIRBackboneElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRNamingSystemUniqueId Constructor * @param null|array $data @@ -178,8 +177,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_COMMENT] instanceof FHIRString) { $this->setComment($data[self::FIELD_COMMENT]); - } elseif ($ext && is_scalar($data[self::FIELD_COMMENT])) { - $this->setComment(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_COMMENT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_COMMENT])) { + $this->setComment(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_COMMENT]] + $ext)); + } else if (is_array($data[self::FIELD_COMMENT])) { + $this->setComment(new FHIRString(array_merge($ext, $data[self::FIELD_COMMENT]))); + } } else { $this->setComment(new FHIRString($data[self::FIELD_COMMENT])); } @@ -197,8 +200,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PREFERRED] instanceof FHIRBoolean) { $this->setPreferred($data[self::FIELD_PREFERRED]); - } elseif ($ext && is_scalar($data[self::FIELD_PREFERRED])) { - $this->setPreferred(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_PREFERRED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PREFERRED])) { + $this->setPreferred(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_PREFERRED]] + $ext)); + } else if (is_array($data[self::FIELD_PREFERRED])) { + $this->setPreferred(new FHIRBoolean(array_merge($ext, $data[self::FIELD_PREFERRED]))); + } } else { $this->setPreferred(new FHIRBoolean($data[self::FIELD_PREFERRED])); } @@ -209,8 +216,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TYPE] instanceof FHIRNamingSystemIdentifierType) { $this->setType($data[self::FIELD_TYPE]); - } elseif ($ext && is_scalar($data[self::FIELD_TYPE])) { - $this->setType(new FHIRNamingSystemIdentifierType([FHIRNamingSystemIdentifierType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TYPE])) { + $this->setType(new FHIRNamingSystemIdentifierType([FHIRNamingSystemIdentifierType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } else if (is_array($data[self::FIELD_TYPE])) { + $this->setType(new FHIRNamingSystemIdentifierType(array_merge($ext, $data[self::FIELD_TYPE]))); + } } else { $this->setType(new FHIRNamingSystemIdentifierType($data[self::FIELD_TYPE])); } @@ -221,8 +232,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE] instanceof FHIRString) { $this->setValue($data[self::FIELD_VALUE]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE])) { - $this->setValue(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VALUE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE])) { + $this->setValue(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VALUE]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE])) { + $this->setValue(new FHIRString(array_merge($ext, $data[self::FIELD_VALUE]))); + } } else { $this->setValue(new FHIRString($data[self::FIELD_VALUE])); } @@ -528,21 +543,21 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getComment())) { $v->xmlSerialize($sxe->addChild(self::FIELD_COMMENT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PERIOD, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getPreferred())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PREFERRED, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getValue())) { + $sxe->addAttribute(self::FIELD_VALUE, (string)$v); $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE, null, $v->_getFHIRXMLNamespace())); } return $sxe; @@ -555,22 +570,51 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getComment())) { - $a[self::FIELD_COMMENT] = $v->getValue(); - $a[self::FIELD_COMMENT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_COMMENT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_COMMENT_EXT] = $enc; + } + } else { + $a[self::FIELD_COMMENT] = $v; + } } if (null !== ($v = $this->getPeriod())) { $a[self::FIELD_PERIOD] = $v; } if (null !== ($v = $this->getPreferred())) { - $a[self::FIELD_PREFERRED] = $v->getValue(); - $a[self::FIELD_PREFERRED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PREFERRED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PREFERRED_EXT] = $enc; + } + } else { + $a[self::FIELD_PREFERRED] = $v; + } } if (null !== ($v = $this->getType())) { - $a[self::FIELD_TYPE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TYPE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TYPE_EXT] = $enc; + } + } else { + $a[self::FIELD_TYPE] = $v; + } } if (null !== ($v = $this->getValue())) { - $a[self::FIELD_VALUE] = $v->getValue(); - $a[self::FIELD_VALUE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRNutritionOrder/FHIRNutritionOrderAdministration.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRNutritionOrder/FHIRNutritionOrderAdministration.php index 0ce2bae09e..416a1bf5dd 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRNutritionOrder/FHIRNutritionOrderAdministration.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRNutritionOrder/FHIRNutritionOrderAdministration.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRNutritionOrderAdministration extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_NUTRITION_ORDER_DOT_ADMINISTRATION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_QUANTITY = 'quantity'; const FIELD_QUANTITY_EXT = '_quantity'; const FIELD_RATE_QUANTITY = 'rateQuantity'; @@ -148,6 +144,9 @@ class FHIRNutritionOrderAdministration extends FHIRBackboneElement */ protected $schedule = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRNutritionOrderAdministration Constructor * @param null|array $data @@ -170,8 +169,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_QUANTITY] instanceof FHIRQuantity) { $this->setQuantity($data[self::FIELD_QUANTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_QUANTITY])) { - $this->setQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_QUANTITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_QUANTITY])) { + $this->setQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_QUANTITY])) { + $this->setQuantity(new FHIRQuantity(array_merge($ext, $data[self::FIELD_QUANTITY]))); + } } else { $this->setQuantity(new FHIRQuantity($data[self::FIELD_QUANTITY])); } @@ -182,8 +185,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_RATE_QUANTITY] instanceof FHIRQuantity) { $this->setRateQuantity($data[self::FIELD_RATE_QUANTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_RATE_QUANTITY])) { - $this->setRateQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_RATE_QUANTITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_RATE_QUANTITY])) { + $this->setRateQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_RATE_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_RATE_QUANTITY])) { + $this->setRateQuantity(new FHIRQuantity(array_merge($ext, $data[self::FIELD_RATE_QUANTITY]))); + } } else { $this->setRateQuantity(new FHIRQuantity($data[self::FIELD_RATE_QUANTITY])); } @@ -465,15 +472,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_QUANTITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRateQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RATE_QUANTITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRateRatio())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RATE_RATIO, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSchedule())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SCHEDULE, null, $v->_getFHIRXMLNamespace())); } @@ -487,10 +491,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getQuantity())) { - $a[self::FIELD_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_QUANTITY] = $v; + } } if (null !== ($v = $this->getRateQuantity())) { - $a[self::FIELD_RATE_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_RATE_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_RATE_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_RATE_QUANTITY] = $v; + } } if (null !== ($v = $this->getRateRatio())) { $a[self::FIELD_RATE_RATIO] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRNutritionOrder/FHIRNutritionOrderEnteralFormula.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRNutritionOrder/FHIRNutritionOrderEnteralFormula.php index c723d30112..7cbaeadb50 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRNutritionOrder/FHIRNutritionOrderEnteralFormula.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRNutritionOrder/FHIRNutritionOrderEnteralFormula.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRNutritionOrderEnteralFormula extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_NUTRITION_ORDER_DOT_ENTERAL_FORMULA; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ADDITIVE_PRODUCT_NAME = 'additiveProductName'; const FIELD_ADDITIVE_PRODUCT_NAME_EXT = '_additiveProductName'; const FIELD_ADDITIVE_TYPE = 'additiveType'; @@ -218,6 +214,9 @@ class FHIRNutritionOrderEnteralFormula extends FHIRBackboneElement */ protected $routeofAdministration = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRNutritionOrderEnteralFormula Constructor * @param null|array $data @@ -240,8 +239,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ADDITIVE_PRODUCT_NAME] instanceof FHIRString) { $this->setAdditiveProductName($data[self::FIELD_ADDITIVE_PRODUCT_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_ADDITIVE_PRODUCT_NAME])) { - $this->setAdditiveProductName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_ADDITIVE_PRODUCT_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ADDITIVE_PRODUCT_NAME])) { + $this->setAdditiveProductName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_ADDITIVE_PRODUCT_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_ADDITIVE_PRODUCT_NAME])) { + $this->setAdditiveProductName(new FHIRString(array_merge($ext, $data[self::FIELD_ADDITIVE_PRODUCT_NAME]))); + } } else { $this->setAdditiveProductName(new FHIRString($data[self::FIELD_ADDITIVE_PRODUCT_NAME])); } @@ -256,6 +259,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ADMINISTRATION])) { if (is_array($data[self::FIELD_ADMINISTRATION])) { foreach($data[self::FIELD_ADMINISTRATION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRNutritionOrderAdministration) { $this->addAdministration($v); } else { @@ -274,8 +280,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ADMINISTRATION_INSTRUCTION] instanceof FHIRString) { $this->setAdministrationInstruction($data[self::FIELD_ADMINISTRATION_INSTRUCTION]); - } elseif ($ext && is_scalar($data[self::FIELD_ADMINISTRATION_INSTRUCTION])) { - $this->setAdministrationInstruction(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_ADMINISTRATION_INSTRUCTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ADMINISTRATION_INSTRUCTION])) { + $this->setAdministrationInstruction(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_ADMINISTRATION_INSTRUCTION]] + $ext)); + } else if (is_array($data[self::FIELD_ADMINISTRATION_INSTRUCTION])) { + $this->setAdministrationInstruction(new FHIRString(array_merge($ext, $data[self::FIELD_ADMINISTRATION_INSTRUCTION]))); + } } else { $this->setAdministrationInstruction(new FHIRString($data[self::FIELD_ADMINISTRATION_INSTRUCTION])); } @@ -286,8 +296,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_BASE_FORMULA_PRODUCT_NAME] instanceof FHIRString) { $this->setBaseFormulaProductName($data[self::FIELD_BASE_FORMULA_PRODUCT_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_BASE_FORMULA_PRODUCT_NAME])) { - $this->setBaseFormulaProductName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_BASE_FORMULA_PRODUCT_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_BASE_FORMULA_PRODUCT_NAME])) { + $this->setBaseFormulaProductName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_BASE_FORMULA_PRODUCT_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_BASE_FORMULA_PRODUCT_NAME])) { + $this->setBaseFormulaProductName(new FHIRString(array_merge($ext, $data[self::FIELD_BASE_FORMULA_PRODUCT_NAME]))); + } } else { $this->setBaseFormulaProductName(new FHIRString($data[self::FIELD_BASE_FORMULA_PRODUCT_NAME])); } @@ -305,8 +319,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CALORIC_DENSITY] instanceof FHIRQuantity) { $this->setCaloricDensity($data[self::FIELD_CALORIC_DENSITY]); - } elseif ($ext && is_scalar($data[self::FIELD_CALORIC_DENSITY])) { - $this->setCaloricDensity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_CALORIC_DENSITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CALORIC_DENSITY])) { + $this->setCaloricDensity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_CALORIC_DENSITY]] + $ext)); + } else if (is_array($data[self::FIELD_CALORIC_DENSITY])) { + $this->setCaloricDensity(new FHIRQuantity(array_merge($ext, $data[self::FIELD_CALORIC_DENSITY]))); + } } else { $this->setCaloricDensity(new FHIRQuantity($data[self::FIELD_CALORIC_DENSITY])); } @@ -317,8 +335,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MAX_VOLUME_TO_DELIVER] instanceof FHIRQuantity) { $this->setMaxVolumeToDeliver($data[self::FIELD_MAX_VOLUME_TO_DELIVER]); - } elseif ($ext && is_scalar($data[self::FIELD_MAX_VOLUME_TO_DELIVER])) { - $this->setMaxVolumeToDeliver(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_MAX_VOLUME_TO_DELIVER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MAX_VOLUME_TO_DELIVER])) { + $this->setMaxVolumeToDeliver(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_MAX_VOLUME_TO_DELIVER]] + $ext)); + } else if (is_array($data[self::FIELD_MAX_VOLUME_TO_DELIVER])) { + $this->setMaxVolumeToDeliver(new FHIRQuantity(array_merge($ext, $data[self::FIELD_MAX_VOLUME_TO_DELIVER]))); + } } else { $this->setMaxVolumeToDeliver(new FHIRQuantity($data[self::FIELD_MAX_VOLUME_TO_DELIVER])); } @@ -831,14 +853,13 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getAdditiveProductName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ADDITIVE_PRODUCT_NAME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getAdditiveType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ADDITIVE_TYPE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getAdministration())) { foreach($vs as $v) { if (null === $v) { @@ -853,19 +874,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getBaseFormulaProductName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_BASE_FORMULA_PRODUCT_NAME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getBaseFormulaType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_BASE_FORMULA_TYPE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getCaloricDensity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CALORIC_DENSITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getMaxVolumeToDeliver())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MAX_VOLUME_TO_DELIVER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRouteofAdministration())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ROUTEOF_ADMINISTRATION, null, $v->_getFHIRXMLNamespace())); } @@ -879,8 +896,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getAdditiveProductName())) { - $a[self::FIELD_ADDITIVE_PRODUCT_NAME] = $v->getValue(); - $a[self::FIELD_ADDITIVE_PRODUCT_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ADDITIVE_PRODUCT_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ADDITIVE_PRODUCT_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_ADDITIVE_PRODUCT_NAME] = $v; + } } if (null !== ($v = $this->getAdditiveType())) { $a[self::FIELD_ADDITIVE_TYPE] = $v; @@ -889,21 +913,51 @@ public function jsonSerialize() $a[self::FIELD_ADMINISTRATION] = $vs; } if (null !== ($v = $this->getAdministrationInstruction())) { - $a[self::FIELD_ADMINISTRATION_INSTRUCTION] = $v->getValue(); - $a[self::FIELD_ADMINISTRATION_INSTRUCTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ADMINISTRATION_INSTRUCTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ADMINISTRATION_INSTRUCTION_EXT] = $enc; + } + } else { + $a[self::FIELD_ADMINISTRATION_INSTRUCTION] = $v; + } } if (null !== ($v = $this->getBaseFormulaProductName())) { - $a[self::FIELD_BASE_FORMULA_PRODUCT_NAME] = $v->getValue(); - $a[self::FIELD_BASE_FORMULA_PRODUCT_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_BASE_FORMULA_PRODUCT_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_BASE_FORMULA_PRODUCT_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_BASE_FORMULA_PRODUCT_NAME] = $v; + } } if (null !== ($v = $this->getBaseFormulaType())) { $a[self::FIELD_BASE_FORMULA_TYPE] = $v; } if (null !== ($v = $this->getCaloricDensity())) { - $a[self::FIELD_CALORIC_DENSITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CALORIC_DENSITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CALORIC_DENSITY_EXT] = $enc; + } + } else { + $a[self::FIELD_CALORIC_DENSITY] = $v; + } } if (null !== ($v = $this->getMaxVolumeToDeliver())) { - $a[self::FIELD_MAX_VOLUME_TO_DELIVER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MAX_VOLUME_TO_DELIVER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MAX_VOLUME_TO_DELIVER_EXT] = $enc; + } + } else { + $a[self::FIELD_MAX_VOLUME_TO_DELIVER] = $v; + } } if (null !== ($v = $this->getRouteofAdministration())) { $a[self::FIELD_ROUTEOF_ADMINISTRATION] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRNutritionOrder/FHIRNutritionOrderNutrient.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRNutritionOrder/FHIRNutritionOrderNutrient.php index 1aadd5089d..67cee9eb54 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRNutritionOrder/FHIRNutritionOrderNutrient.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRNutritionOrder/FHIRNutritionOrderNutrient.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRNutritionOrderNutrient extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_NUTRITION_ORDER_DOT_NUTRIENT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_AMOUNT = 'amount'; const FIELD_AMOUNT_EXT = '_amount'; const FIELD_MODIFIER = 'modifier'; @@ -112,6 +108,9 @@ class FHIRNutritionOrderNutrient extends FHIRBackboneElement */ protected $modifier = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRNutritionOrderNutrient Constructor * @param null|array $data @@ -134,8 +133,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_AMOUNT] instanceof FHIRQuantity) { $this->setAmount($data[self::FIELD_AMOUNT]); - } elseif ($ext && is_scalar($data[self::FIELD_AMOUNT])) { - $this->setAmount(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_AMOUNT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_AMOUNT])) { + $this->setAmount(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_AMOUNT]] + $ext)); + } else if (is_array($data[self::FIELD_AMOUNT])) { + $this->setAmount(new FHIRQuantity(array_merge($ext, $data[self::FIELD_AMOUNT]))); + } } else { $this->setAmount(new FHIRQuantity($data[self::FIELD_AMOUNT])); } @@ -324,7 +327,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getAmount())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AMOUNT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getModifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MODIFIER, null, $v->_getFHIRXMLNamespace())); } @@ -338,7 +340,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getAmount())) { - $a[self::FIELD_AMOUNT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_AMOUNT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_AMOUNT_EXT] = $enc; + } + } else { + $a[self::FIELD_AMOUNT] = $v; + } } if (null !== ($v = $this->getModifier())) { $a[self::FIELD_MODIFIER] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRNutritionOrder/FHIRNutritionOrderOralDiet.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRNutritionOrder/FHIRNutritionOrderOralDiet.php index f2413d2296..55a2653dca 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRNutritionOrder/FHIRNutritionOrderOralDiet.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRNutritionOrder/FHIRNutritionOrderOralDiet.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRNutritionOrderOralDiet extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_NUTRITION_ORDER_DOT_ORAL_DIET; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_FLUID_CONSISTENCY_TYPE = 'fluidConsistencyType'; const FIELD_INSTRUCTION = 'instruction'; const FIELD_INSTRUCTION_EXT = '_instruction'; @@ -168,6 +164,9 @@ class FHIRNutritionOrderOralDiet extends FHIRBackboneElement */ protected $type = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRNutritionOrderOralDiet Constructor * @param null|array $data @@ -187,6 +186,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_FLUID_CONSISTENCY_TYPE])) { if (is_array($data[self::FIELD_FLUID_CONSISTENCY_TYPE])) { foreach($data[self::FIELD_FLUID_CONSISTENCY_TYPE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addFluidConsistencyType($v); } else { @@ -205,8 +207,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_INSTRUCTION] instanceof FHIRString) { $this->setInstruction($data[self::FIELD_INSTRUCTION]); - } elseif ($ext && is_scalar($data[self::FIELD_INSTRUCTION])) { - $this->setInstruction(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_INSTRUCTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_INSTRUCTION])) { + $this->setInstruction(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_INSTRUCTION]] + $ext)); + } else if (is_array($data[self::FIELD_INSTRUCTION])) { + $this->setInstruction(new FHIRString(array_merge($ext, $data[self::FIELD_INSTRUCTION]))); + } } else { $this->setInstruction(new FHIRString($data[self::FIELD_INSTRUCTION])); } @@ -214,6 +220,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_NUTRIENT])) { if (is_array($data[self::FIELD_NUTRIENT])) { foreach($data[self::FIELD_NUTRIENT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRNutritionOrderNutrient) { $this->addNutrient($v); } else { @@ -229,6 +238,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SCHEDULE])) { if (is_array($data[self::FIELD_SCHEDULE])) { foreach($data[self::FIELD_SCHEDULE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRTiming) { $this->addSchedule($v); } else { @@ -244,6 +256,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_TEXTURE])) { if (is_array($data[self::FIELD_TEXTURE])) { foreach($data[self::FIELD_TEXTURE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRNutritionOrderTexture) { $this->addTexture($v); } else { @@ -259,6 +274,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_TYPE])) { if (is_array($data[self::FIELD_TYPE])) { foreach($data[self::FIELD_TYPE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addType($v); } else { @@ -763,7 +781,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getInstruction())) { $v->xmlSerialize($sxe->addChild(self::FIELD_INSTRUCTION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getNutrient())) { foreach($vs as $v) { if (null === $v) { @@ -772,7 +789,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_NUTRIENT, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getSchedule())) { foreach($vs as $v) { if (null === $v) { @@ -781,7 +797,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_SCHEDULE, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getTexture())) { foreach($vs as $v) { if (null === $v) { @@ -790,7 +805,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_TEXTURE, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getType())) { foreach($vs as $v) { if (null === $v) { @@ -812,8 +826,15 @@ public function jsonSerialize() $a[self::FIELD_FLUID_CONSISTENCY_TYPE] = $vs; } if (null !== ($v = $this->getInstruction())) { - $a[self::FIELD_INSTRUCTION] = $v->getValue(); - $a[self::FIELD_INSTRUCTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_INSTRUCTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_INSTRUCTION_EXT] = $enc; + } + } else { + $a[self::FIELD_INSTRUCTION] = $v; + } } if ([] !== ($vs = $this->getNutrient())) { $a[self::FIELD_NUTRIENT] = $vs; diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRNutritionOrder/FHIRNutritionOrderSupplement.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRNutritionOrder/FHIRNutritionOrderSupplement.php index c60a6f9356..8070cd82f3 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRNutritionOrder/FHIRNutritionOrderSupplement.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRNutritionOrder/FHIRNutritionOrderSupplement.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -81,10 +81,6 @@ class FHIRNutritionOrderSupplement extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_NUTRITION_ORDER_DOT_SUPPLEMENT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_INSTRUCTION = 'instruction'; const FIELD_INSTRUCTION_EXT = '_instruction'; const FIELD_PRODUCT_NAME = 'productName'; @@ -161,6 +157,9 @@ class FHIRNutritionOrderSupplement extends FHIRBackboneElement */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRNutritionOrderSupplement Constructor * @param null|array $data @@ -183,8 +182,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_INSTRUCTION] instanceof FHIRString) { $this->setInstruction($data[self::FIELD_INSTRUCTION]); - } elseif ($ext && is_scalar($data[self::FIELD_INSTRUCTION])) { - $this->setInstruction(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_INSTRUCTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_INSTRUCTION])) { + $this->setInstruction(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_INSTRUCTION]] + $ext)); + } else if (is_array($data[self::FIELD_INSTRUCTION])) { + $this->setInstruction(new FHIRString(array_merge($ext, $data[self::FIELD_INSTRUCTION]))); + } } else { $this->setInstruction(new FHIRString($data[self::FIELD_INSTRUCTION])); } @@ -195,8 +198,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PRODUCT_NAME] instanceof FHIRString) { $this->setProductName($data[self::FIELD_PRODUCT_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_PRODUCT_NAME])) { - $this->setProductName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PRODUCT_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PRODUCT_NAME])) { + $this->setProductName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PRODUCT_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_PRODUCT_NAME])) { + $this->setProductName(new FHIRString(array_merge($ext, $data[self::FIELD_PRODUCT_NAME]))); + } } else { $this->setProductName(new FHIRString($data[self::FIELD_PRODUCT_NAME])); } @@ -207,8 +214,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_QUANTITY] instanceof FHIRQuantity) { $this->setQuantity($data[self::FIELD_QUANTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_QUANTITY])) { - $this->setQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_QUANTITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_QUANTITY])) { + $this->setQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_QUANTITY])) { + $this->setQuantity(new FHIRQuantity(array_merge($ext, $data[self::FIELD_QUANTITY]))); + } } else { $this->setQuantity(new FHIRQuantity($data[self::FIELD_QUANTITY])); } @@ -216,6 +227,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SCHEDULE])) { if (is_array($data[self::FIELD_SCHEDULE])) { foreach($data[self::FIELD_SCHEDULE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRTiming) { $this->addSchedule($v); } else { @@ -581,17 +595,16 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getInstruction())) { $v->xmlSerialize($sxe->addChild(self::FIELD_INSTRUCTION, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getProductName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PRODUCT_NAME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_QUANTITY, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getSchedule())) { foreach($vs as $v) { if (null === $v) { @@ -600,7 +613,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_SCHEDULE, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -614,15 +626,37 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getInstruction())) { - $a[self::FIELD_INSTRUCTION] = $v->getValue(); - $a[self::FIELD_INSTRUCTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_INSTRUCTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_INSTRUCTION_EXT] = $enc; + } + } else { + $a[self::FIELD_INSTRUCTION] = $v; + } } if (null !== ($v = $this->getProductName())) { - $a[self::FIELD_PRODUCT_NAME] = $v->getValue(); - $a[self::FIELD_PRODUCT_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PRODUCT_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PRODUCT_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_PRODUCT_NAME] = $v; + } } if (null !== ($v = $this->getQuantity())) { - $a[self::FIELD_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_QUANTITY] = $v; + } } if ([] !== ($vs = $this->getSchedule())) { $a[self::FIELD_SCHEDULE] = $vs; diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRNutritionOrder/FHIRNutritionOrderTexture.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRNutritionOrder/FHIRNutritionOrderTexture.php index 596a155498..60c3fc1099 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRNutritionOrder/FHIRNutritionOrderTexture.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRNutritionOrder/FHIRNutritionOrderTexture.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRNutritionOrderTexture extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_NUTRITION_ORDER_DOT_TEXTURE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_FOOD_TYPE = 'foodType'; const FIELD_MODIFIER = 'modifier'; @@ -111,6 +107,9 @@ class FHIRNutritionOrderTexture extends FHIRBackboneElement */ protected $modifier = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRNutritionOrderTexture Constructor * @param null|array $data @@ -320,7 +319,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getFoodType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FOOD_TYPE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getModifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MODIFIER, null, $v->_getFHIRXMLNamespace())); } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRObservation/FHIRObservationComponent.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRObservation/FHIRObservationComponent.php index 28220bbd4f..20ed3bcc18 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRObservation/FHIRObservationComponent.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRObservation/FHIRObservationComponent.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -87,10 +87,6 @@ class FHIRObservationComponent extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_OBSERVATION_DOT_COMPONENT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CODE = 'code'; const FIELD_DATA_ABSENT_REASON = 'dataAbsentReason'; const FIELD_INTERPRETATION = 'interpretation'; @@ -288,6 +284,9 @@ class FHIRObservationComponent extends FHIRBackboneElement */ protected $valueTime = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRObservationComponent Constructor * @param null|array $data @@ -328,6 +327,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REFERENCE_RANGE])) { if (is_array($data[self::FIELD_REFERENCE_RANGE])) { foreach($data[self::FIELD_REFERENCE_RANGE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRObservationReferenceRange) { $this->addReferenceRange($v); } else { @@ -360,8 +362,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_DATE_TIME] instanceof FHIRDateTime) { $this->setValueDateTime($data[self::FIELD_VALUE_DATE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_DATE_TIME])) { - $this->setValueDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_VALUE_DATE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_DATE_TIME])) { + $this->setValueDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_VALUE_DATE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_DATE_TIME])) { + $this->setValueDateTime(new FHIRDateTime(array_merge($ext, $data[self::FIELD_VALUE_DATE_TIME]))); + } } else { $this->setValueDateTime(new FHIRDateTime($data[self::FIELD_VALUE_DATE_TIME])); } @@ -379,8 +385,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_QUANTITY] instanceof FHIRQuantity) { $this->setValueQuantity($data[self::FIELD_VALUE_QUANTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_QUANTITY])) { - $this->setValueQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_VALUE_QUANTITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_QUANTITY])) { + $this->setValueQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_VALUE_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_QUANTITY])) { + $this->setValueQuantity(new FHIRQuantity(array_merge($ext, $data[self::FIELD_VALUE_QUANTITY]))); + } } else { $this->setValueQuantity(new FHIRQuantity($data[self::FIELD_VALUE_QUANTITY])); } @@ -412,8 +422,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_STRING] instanceof FHIRString) { $this->setValueString($data[self::FIELD_VALUE_STRING]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_STRING])) { - $this->setValueString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VALUE_STRING]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_STRING])) { + $this->setValueString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VALUE_STRING]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_STRING])) { + $this->setValueString(new FHIRString(array_merge($ext, $data[self::FIELD_VALUE_STRING]))); + } } else { $this->setValueString(new FHIRString($data[self::FIELD_VALUE_STRING])); } @@ -424,8 +438,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_TIME] instanceof FHIRTime) { $this->setValueTime($data[self::FIELD_VALUE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_TIME])) { - $this->setValueTime(new FHIRTime([FHIRTime::FIELD_VALUE => $data[self::FIELD_VALUE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_TIME])) { + $this->setValueTime(new FHIRTime([FHIRTime::FIELD_VALUE => $data[self::FIELD_VALUE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_TIME])) { + $this->setValueTime(new FHIRTime(array_merge($ext, $data[self::FIELD_VALUE_TIME]))); + } } else { $this->setValueTime(new FHIRTime($data[self::FIELD_VALUE_TIME])); } @@ -1106,15 +1124,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDataAbsentReason())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DATA_ABSENT_REASON, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getInterpretation())) { $v->xmlSerialize($sxe->addChild(self::FIELD_INTERPRETATION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getReferenceRange())) { foreach($vs as $v) { if (null === $v) { @@ -1123,34 +1138,27 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_REFERENCE_RANGE, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getValueAttachment())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_ATTACHMENT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getValueDateTime())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_DATE_TIME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValuePeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_QUANTITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueRange())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_RANGE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueRatio())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_RATIO, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueSampledData())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_SAMPLED_DATA, null, $v->_getFHIRXMLNamespace())); } @@ -1188,14 +1196,29 @@ public function jsonSerialize() $a[self::FIELD_VALUE_CODEABLE_CONCEPT] = $v; } if (null !== ($v = $this->getValueDateTime())) { - $a[self::FIELD_VALUE_DATE_TIME] = $v->getValue(); - $a[self::FIELD_VALUE_DATE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_DATE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_DATE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_DATE_TIME] = $v; + } } if (null !== ($v = $this->getValuePeriod())) { $a[self::FIELD_VALUE_PERIOD] = $v; } if (null !== ($v = $this->getValueQuantity())) { - $a[self::FIELD_VALUE_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_QUANTITY] = $v; + } } if (null !== ($v = $this->getValueRange())) { $a[self::FIELD_VALUE_RANGE] = $v; @@ -1207,12 +1230,26 @@ public function jsonSerialize() $a[self::FIELD_VALUE_SAMPLED_DATA] = $v; } if (null !== ($v = $this->getValueString())) { - $a[self::FIELD_VALUE_STRING] = $v->getValue(); - $a[self::FIELD_VALUE_STRING_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_STRING] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_STRING_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_STRING] = $v; + } } if (null !== ($v = $this->getValueTime())) { - $a[self::FIELD_VALUE_TIME] = $v->getValue(); - $a[self::FIELD_VALUE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_TIME] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRObservation/FHIRObservationReferenceRange.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRObservation/FHIRObservationReferenceRange.php index ac2acb4dd7..5bcd9f71fb 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRObservation/FHIRObservationReferenceRange.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRObservation/FHIRObservationReferenceRange.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -81,10 +81,6 @@ class FHIRObservationReferenceRange extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_OBSERVATION_DOT_REFERENCE_RANGE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_AGE = 'age'; const FIELD_APPLIES_TO = 'appliesTo'; const FIELD_HIGH = 'high'; @@ -179,6 +175,9 @@ class FHIRObservationReferenceRange extends FHIRBackboneElement */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRObservationReferenceRange Constructor * @param null|array $data @@ -205,6 +204,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_APPLIES_TO])) { if (is_array($data[self::FIELD_APPLIES_TO])) { foreach($data[self::FIELD_APPLIES_TO] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addAppliesTo($v); } else { @@ -223,8 +225,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_HIGH] instanceof FHIRQuantity) { $this->setHigh($data[self::FIELD_HIGH]); - } elseif ($ext && is_scalar($data[self::FIELD_HIGH])) { - $this->setHigh(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_HIGH]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_HIGH])) { + $this->setHigh(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_HIGH]] + $ext)); + } else if (is_array($data[self::FIELD_HIGH])) { + $this->setHigh(new FHIRQuantity(array_merge($ext, $data[self::FIELD_HIGH]))); + } } else { $this->setHigh(new FHIRQuantity($data[self::FIELD_HIGH])); } @@ -235,8 +241,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_LOW] instanceof FHIRQuantity) { $this->setLow($data[self::FIELD_LOW]); - } elseif ($ext && is_scalar($data[self::FIELD_LOW])) { - $this->setLow(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_LOW]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_LOW])) { + $this->setLow(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_LOW]] + $ext)); + } else if (is_array($data[self::FIELD_LOW])) { + $this->setLow(new FHIRQuantity(array_merge($ext, $data[self::FIELD_LOW]))); + } } else { $this->setLow(new FHIRQuantity($data[self::FIELD_LOW])); } @@ -247,8 +257,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TEXT] instanceof FHIRString) { $this->setText($data[self::FIELD_TEXT]); - } elseif ($ext && is_scalar($data[self::FIELD_TEXT])) { - $this->setText(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TEXT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TEXT])) { + $this->setText(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TEXT]] + $ext)); + } else if (is_array($data[self::FIELD_TEXT])) { + $this->setText(new FHIRString(array_merge($ext, $data[self::FIELD_TEXT]))); + } } else { $this->setText(new FHIRString($data[self::FIELD_TEXT])); } @@ -641,7 +655,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getAge())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AGE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getAppliesTo())) { foreach($vs as $v) { if (null === $v) { @@ -650,18 +663,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_APPLIES_TO, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getHigh())) { $v->xmlSerialize($sxe->addChild(self::FIELD_HIGH, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getLow())) { $v->xmlSerialize($sxe->addChild(self::FIELD_LOW, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getText())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TEXT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -681,14 +691,37 @@ public function jsonSerialize() $a[self::FIELD_APPLIES_TO] = $vs; } if (null !== ($v = $this->getHigh())) { - $a[self::FIELD_HIGH] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_HIGH] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_HIGH_EXT] = $enc; + } + } else { + $a[self::FIELD_HIGH] = $v; + } } if (null !== ($v = $this->getLow())) { - $a[self::FIELD_LOW] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_LOW] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_LOW_EXT] = $enc; + } + } else { + $a[self::FIELD_LOW] = $v; + } } if (null !== ($v = $this->getText())) { - $a[self::FIELD_TEXT] = $v->getValue(); - $a[self::FIELD_TEXT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TEXT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TEXT_EXT] = $enc; + } + } else { + $a[self::FIELD_TEXT] = $v; + } } if (null !== ($v = $this->getType())) { $a[self::FIELD_TYPE] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRObservation/FHIRObservationRelated.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRObservation/FHIRObservationRelated.php index 4eb294d222..aaa68f04d2 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRObservation/FHIRObservationRelated.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRObservation/FHIRObservationRelated.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRObservationRelated extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_OBSERVATION_DOT_RELATED; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_TARGET = 'target'; const FIELD_TYPE = 'type'; const FIELD_TYPE_EXT = '_type'; @@ -109,6 +105,9 @@ class FHIRObservationRelated extends FHIRBackboneElement */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRObservationRelated Constructor * @param null|array $data @@ -138,8 +137,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TYPE] instanceof FHIRObservationRelationshipType) { $this->setType($data[self::FIELD_TYPE]); - } elseif ($ext && is_scalar($data[self::FIELD_TYPE])) { - $this->setType(new FHIRObservationRelationshipType([FHIRObservationRelationshipType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TYPE])) { + $this->setType(new FHIRObservationRelationshipType([FHIRObservationRelationshipType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } else if (is_array($data[self::FIELD_TYPE])) { + $this->setType(new FHIRObservationRelationshipType(array_merge($ext, $data[self::FIELD_TYPE]))); + } } else { $this->setType(new FHIRObservationRelationshipType($data[self::FIELD_TYPE])); } @@ -315,7 +318,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getTarget())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TARGET, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -332,7 +334,15 @@ public function jsonSerialize() $a[self::FIELD_TARGET] = $v; } if (null !== ($v = $this->getType())) { - $a[self::FIELD_TYPE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TYPE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TYPE_EXT] = $enc; + } + } else { + $a[self::FIELD_TYPE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIROperationDefinition/FHIROperationDefinitionBinding.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIROperationDefinition/FHIROperationDefinitionBinding.php index d4e078aaec..20d17af31a 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIROperationDefinition/FHIROperationDefinitionBinding.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIROperationDefinition/FHIROperationDefinitionBinding.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIROperationDefinitionBinding extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_OPERATION_DEFINITION_DOT_BINDING; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_STRENGTH = 'strength'; const FIELD_STRENGTH_EXT = '_strength'; const FIELD_VALUE_SET_REFERENCE = 'valueSetReference'; @@ -126,6 +122,9 @@ class FHIROperationDefinitionBinding extends FHIRBackboneElement */ protected $valueSetUri = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIROperationDefinitionBinding Constructor * @param null|array $data @@ -148,8 +147,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STRENGTH] instanceof FHIRBindingStrength) { $this->setStrength($data[self::FIELD_STRENGTH]); - } elseif ($ext && is_scalar($data[self::FIELD_STRENGTH])) { - $this->setStrength(new FHIRBindingStrength([FHIRBindingStrength::FIELD_VALUE => $data[self::FIELD_STRENGTH]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STRENGTH])) { + $this->setStrength(new FHIRBindingStrength([FHIRBindingStrength::FIELD_VALUE => $data[self::FIELD_STRENGTH]] + $ext)); + } else if (is_array($data[self::FIELD_STRENGTH])) { + $this->setStrength(new FHIRBindingStrength(array_merge($ext, $data[self::FIELD_STRENGTH]))); + } } else { $this->setStrength(new FHIRBindingStrength($data[self::FIELD_STRENGTH])); } @@ -167,8 +170,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_SET_URI] instanceof FHIRUri) { $this->setValueSetUri($data[self::FIELD_VALUE_SET_URI]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_SET_URI])) { - $this->setValueSetUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_VALUE_SET_URI]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_SET_URI])) { + $this->setValueSetUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_VALUE_SET_URI]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_SET_URI])) { + $this->setValueSetUri(new FHIRUri(array_merge($ext, $data[self::FIELD_VALUE_SET_URI]))); + } } else { $this->setValueSetUri(new FHIRUri($data[self::FIELD_VALUE_SET_URI])); } @@ -394,7 +401,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getStrength())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STRENGTH, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueSetReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_SET_REFERENCE, null, $v->_getFHIRXMLNamespace())); } @@ -411,14 +417,29 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getStrength())) { - $a[self::FIELD_STRENGTH] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STRENGTH] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STRENGTH_EXT] = $enc; + } + } else { + $a[self::FIELD_STRENGTH] = $v; + } } if (null !== ($v = $this->getValueSetReference())) { $a[self::FIELD_VALUE_SET_REFERENCE] = $v; } if (null !== ($v = $this->getValueSetUri())) { - $a[self::FIELD_VALUE_SET_URI] = $v->getValue(); - $a[self::FIELD_VALUE_SET_URI_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_SET_URI] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_SET_URI_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_SET_URI] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIROperationDefinition/FHIROperationDefinitionOverload.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIROperationDefinition/FHIROperationDefinitionOverload.php index e2bdbdbeab..d971db6959 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIROperationDefinition/FHIROperationDefinitionOverload.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIROperationDefinition/FHIROperationDefinitionOverload.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIROperationDefinitionOverload extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_OPERATION_DEFINITION_DOT_OVERLOAD; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_COMMENT = 'comment'; const FIELD_COMMENT_EXT = '_comment'; const FIELD_PARAMETER_NAME = 'parameterName'; @@ -109,6 +105,9 @@ class FHIROperationDefinitionOverload extends FHIRBackboneElement */ protected $parameterName = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIROperationDefinitionOverload Constructor * @param null|array $data @@ -131,8 +130,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_COMMENT] instanceof FHIRString) { $this->setComment($data[self::FIELD_COMMENT]); - } elseif ($ext && is_scalar($data[self::FIELD_COMMENT])) { - $this->setComment(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_COMMENT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_COMMENT])) { + $this->setComment(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_COMMENT]] + $ext)); + } else if (is_array($data[self::FIELD_COMMENT])) { + $this->setComment(new FHIRString(array_merge($ext, $data[self::FIELD_COMMENT]))); + } } else { $this->setComment(new FHIRString($data[self::FIELD_COMMENT])); } @@ -143,17 +146,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_PARAMETER_NAME])) { foreach($data[self::FIELD_PARAMETER_NAME] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRString) { $this->addParameterName($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addParameterName(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addParameterName(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addParameterName(new FHIRString(array_merge($v, $ext[$i]))); + } } else { $this->addParameterName(new FHIRString($v)); } } } elseif ($data[self::FIELD_PARAMETER_NAME] instanceof FHIRString) { $this->addParameterName($data[self::FIELD_PARAMETER_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_PARAMETER_NAME])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_PARAMETER_NAME])) { $this->addParameterName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PARAMETER_NAME]] + $ext)); } else { $this->addParameterName(new FHIRString($data[self::FIELD_PARAMETER_NAME])); @@ -376,6 +386,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getComment())) { $v->xmlSerialize($sxe->addChild(self::FIELD_COMMENT, null, $v->_getFHIRXMLNamespace())); } @@ -397,8 +408,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getComment())) { - $a[self::FIELD_COMMENT] = $v->getValue(); - $a[self::FIELD_COMMENT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_COMMENT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_COMMENT_EXT] = $enc; + } + } else { + $a[self::FIELD_COMMENT] = $v; + } } if ([] !== ($vs = $this->getParameterName())) { $a[self::FIELD_PARAMETER_NAME] = []; @@ -406,8 +424,17 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_PARAMETER_NAME][] = $v->getValue(); - $a[self::FIELD_PARAMETER_NAME_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PARAMETER_NAME][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PARAMETER_NAME_EXT][] = $enc; + } else { + $a[self::FIELD_PARAMETER_NAME_EXT][] = null; + } + } else { + $a[self::FIELD_PARAMETER_NAME][] = $v; + } } } return $a; diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIROperationDefinition/FHIROperationDefinitionParameter.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIROperationDefinition/FHIROperationDefinitionParameter.php index e668f35db9..9a366bbc08 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIROperationDefinition/FHIROperationDefinitionParameter.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIROperationDefinition/FHIROperationDefinitionParameter.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -84,10 +84,6 @@ class FHIROperationDefinitionParameter extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_OPERATION_DEFINITION_DOT_PARAMETER; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_BINDING = 'binding'; const FIELD_DOCUMENTATION = 'documentation'; const FIELD_DOCUMENTATION_EXT = '_documentation'; @@ -213,6 +209,9 @@ class FHIROperationDefinitionParameter extends FHIRBackboneElement */ protected $use = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIROperationDefinitionParameter Constructor * @param null|array $data @@ -242,8 +241,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DOCUMENTATION] instanceof FHIRString) { $this->setDocumentation($data[self::FIELD_DOCUMENTATION]); - } elseif ($ext && is_scalar($data[self::FIELD_DOCUMENTATION])) { - $this->setDocumentation(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DOCUMENTATION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DOCUMENTATION])) { + $this->setDocumentation(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DOCUMENTATION]] + $ext)); + } else if (is_array($data[self::FIELD_DOCUMENTATION])) { + $this->setDocumentation(new FHIRString(array_merge($ext, $data[self::FIELD_DOCUMENTATION]))); + } } else { $this->setDocumentation(new FHIRString($data[self::FIELD_DOCUMENTATION])); } @@ -254,8 +257,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MAX] instanceof FHIRString) { $this->setMax($data[self::FIELD_MAX]); - } elseif ($ext && is_scalar($data[self::FIELD_MAX])) { - $this->setMax(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_MAX]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MAX])) { + $this->setMax(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_MAX]] + $ext)); + } else if (is_array($data[self::FIELD_MAX])) { + $this->setMax(new FHIRString(array_merge($ext, $data[self::FIELD_MAX]))); + } } else { $this->setMax(new FHIRString($data[self::FIELD_MAX])); } @@ -266,8 +273,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MIN] instanceof FHIRInteger) { $this->setMin($data[self::FIELD_MIN]); - } elseif ($ext && is_scalar($data[self::FIELD_MIN])) { - $this->setMin(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_MIN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MIN])) { + $this->setMin(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_MIN]] + $ext)); + } else if (is_array($data[self::FIELD_MIN])) { + $this->setMin(new FHIRInteger(array_merge($ext, $data[self::FIELD_MIN]))); + } } else { $this->setMin(new FHIRInteger($data[self::FIELD_MIN])); } @@ -278,8 +289,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRCode) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRCode(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRCode($data[self::FIELD_NAME])); } @@ -287,6 +302,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PART])) { if (is_array($data[self::FIELD_PART])) { foreach($data[self::FIELD_PART] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIROperationDefinitionParameter) { $this->addPart($v); } else { @@ -312,8 +330,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SEARCH_TYPE] instanceof FHIRSearchParamType) { $this->setSearchType($data[self::FIELD_SEARCH_TYPE]); - } elseif ($ext && is_scalar($data[self::FIELD_SEARCH_TYPE])) { - $this->setSearchType(new FHIRSearchParamType([FHIRSearchParamType::FIELD_VALUE => $data[self::FIELD_SEARCH_TYPE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SEARCH_TYPE])) { + $this->setSearchType(new FHIRSearchParamType([FHIRSearchParamType::FIELD_VALUE => $data[self::FIELD_SEARCH_TYPE]] + $ext)); + } else if (is_array($data[self::FIELD_SEARCH_TYPE])) { + $this->setSearchType(new FHIRSearchParamType(array_merge($ext, $data[self::FIELD_SEARCH_TYPE]))); + } } else { $this->setSearchType(new FHIRSearchParamType($data[self::FIELD_SEARCH_TYPE])); } @@ -324,8 +346,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TYPE] instanceof FHIRFHIRAllTypes) { $this->setType($data[self::FIELD_TYPE]); - } elseif ($ext && is_scalar($data[self::FIELD_TYPE])) { - $this->setType(new FHIRFHIRAllTypes([FHIRFHIRAllTypes::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TYPE])) { + $this->setType(new FHIRFHIRAllTypes([FHIRFHIRAllTypes::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } else if (is_array($data[self::FIELD_TYPE])) { + $this->setType(new FHIRFHIRAllTypes(array_merge($ext, $data[self::FIELD_TYPE]))); + } } else { $this->setType(new FHIRFHIRAllTypes($data[self::FIELD_TYPE])); } @@ -336,8 +362,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_USE] instanceof FHIROperationParameterUse) { $this->setUse($data[self::FIELD_USE]); - } elseif ($ext && is_scalar($data[self::FIELD_USE])) { - $this->setUse(new FHIROperationParameterUse([FHIROperationParameterUse::FIELD_VALUE => $data[self::FIELD_USE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_USE])) { + $this->setUse(new FHIROperationParameterUse([FHIROperationParameterUse::FIELD_VALUE => $data[self::FIELD_USE]] + $ext)); + } else if (is_array($data[self::FIELD_USE])) { + $this->setUse(new FHIROperationParameterUse(array_merge($ext, $data[self::FIELD_USE]))); + } } else { $this->setUse(new FHIROperationParameterUse($data[self::FIELD_USE])); } @@ -854,7 +884,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NAME, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getPart())) { foreach($vs as $v) { if (null === $v) { @@ -863,19 +892,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_PART, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getProfile())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PROFILE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSearchType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SEARCH_TYPE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getUse())) { $v->xmlSerialize($sxe->addChild(self::FIELD_USE, null, $v->_getFHIRXMLNamespace())); } @@ -892,20 +917,48 @@ public function jsonSerialize() $a[self::FIELD_BINDING] = $v; } if (null !== ($v = $this->getDocumentation())) { - $a[self::FIELD_DOCUMENTATION] = $v->getValue(); - $a[self::FIELD_DOCUMENTATION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DOCUMENTATION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DOCUMENTATION_EXT] = $enc; + } + } else { + $a[self::FIELD_DOCUMENTATION] = $v; + } } if (null !== ($v = $this->getMax())) { - $a[self::FIELD_MAX] = $v->getValue(); - $a[self::FIELD_MAX_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MAX] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MAX_EXT] = $enc; + } + } else { + $a[self::FIELD_MAX] = $v; + } } if (null !== ($v = $this->getMin())) { - $a[self::FIELD_MIN] = $v->getValue(); - $a[self::FIELD_MIN_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MIN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MIN_EXT] = $enc; + } + } else { + $a[self::FIELD_MIN] = $v; + } } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if ([] !== ($vs = $this->getPart())) { $a[self::FIELD_PART] = $vs; @@ -914,13 +967,37 @@ public function jsonSerialize() $a[self::FIELD_PROFILE] = $v; } if (null !== ($v = $this->getSearchType())) { - $a[self::FIELD_SEARCH_TYPE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SEARCH_TYPE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SEARCH_TYPE_EXT] = $enc; + } + } else { + $a[self::FIELD_SEARCH_TYPE] = $v; + } } if (null !== ($v = $this->getType())) { - $a[self::FIELD_TYPE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TYPE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TYPE_EXT] = $enc; + } + } else { + $a[self::FIELD_TYPE] = $v; + } } if (null !== ($v = $this->getUse())) { - $a[self::FIELD_USE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_USE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_USE_EXT] = $enc; + } + } else { + $a[self::FIELD_USE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIROperationOutcome/FHIROperationOutcomeIssue.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIROperationOutcome/FHIROperationOutcomeIssue.php index dbebb3a1dc..d1f0af6c5f 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIROperationOutcome/FHIROperationOutcomeIssue.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIROperationOutcome/FHIROperationOutcomeIssue.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -81,10 +81,6 @@ class FHIROperationOutcomeIssue extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_OPERATION_OUTCOME_DOT_ISSUE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CODE = 'code'; const FIELD_CODE_EXT = '_code'; const FIELD_DETAILS = 'details'; @@ -172,6 +168,9 @@ class FHIROperationOutcomeIssue extends FHIRBackboneElement */ protected $severity = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIROperationOutcomeIssue Constructor * @param null|array $data @@ -194,8 +193,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CODE] instanceof FHIRIssueType) { $this->setCode($data[self::FIELD_CODE]); - } elseif ($ext && is_scalar($data[self::FIELD_CODE])) { - $this->setCode(new FHIRIssueType([FHIRIssueType::FIELD_VALUE => $data[self::FIELD_CODE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CODE])) { + $this->setCode(new FHIRIssueType([FHIRIssueType::FIELD_VALUE => $data[self::FIELD_CODE]] + $ext)); + } else if (is_array($data[self::FIELD_CODE])) { + $this->setCode(new FHIRIssueType(array_merge($ext, $data[self::FIELD_CODE]))); + } } else { $this->setCode(new FHIRIssueType($data[self::FIELD_CODE])); } @@ -213,8 +216,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DIAGNOSTICS] instanceof FHIRString) { $this->setDiagnostics($data[self::FIELD_DIAGNOSTICS]); - } elseif ($ext && is_scalar($data[self::FIELD_DIAGNOSTICS])) { - $this->setDiagnostics(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DIAGNOSTICS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DIAGNOSTICS])) { + $this->setDiagnostics(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DIAGNOSTICS]] + $ext)); + } else if (is_array($data[self::FIELD_DIAGNOSTICS])) { + $this->setDiagnostics(new FHIRString(array_merge($ext, $data[self::FIELD_DIAGNOSTICS]))); + } } else { $this->setDiagnostics(new FHIRString($data[self::FIELD_DIAGNOSTICS])); } @@ -225,17 +232,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_EXPRESSION])) { foreach($data[self::FIELD_EXPRESSION] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRString) { $this->addExpression($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addExpression(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addExpression(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addExpression(new FHIRString(array_merge($v, $ext[$i]))); + } } else { $this->addExpression(new FHIRString($v)); } } } elseif ($data[self::FIELD_EXPRESSION] instanceof FHIRString) { $this->addExpression($data[self::FIELD_EXPRESSION]); - } elseif ($ext && is_scalar($data[self::FIELD_EXPRESSION])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_EXPRESSION])) { $this->addExpression(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_EXPRESSION]] + $ext)); } else { $this->addExpression(new FHIRString($data[self::FIELD_EXPRESSION])); @@ -247,17 +261,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_LOCATION])) { foreach($data[self::FIELD_LOCATION] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRString) { $this->addLocation($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addLocation(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addLocation(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addLocation(new FHIRString(array_merge($v, $ext[$i]))); + } } else { $this->addLocation(new FHIRString($v)); } } } elseif ($data[self::FIELD_LOCATION] instanceof FHIRString) { $this->addLocation($data[self::FIELD_LOCATION]); - } elseif ($ext && is_scalar($data[self::FIELD_LOCATION])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_LOCATION])) { $this->addLocation(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_LOCATION]] + $ext)); } else { $this->addLocation(new FHIRString($data[self::FIELD_LOCATION])); @@ -269,8 +290,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SEVERITY] instanceof FHIRIssueSeverity) { $this->setSeverity($data[self::FIELD_SEVERITY]); - } elseif ($ext && is_scalar($data[self::FIELD_SEVERITY])) { - $this->setSeverity(new FHIRIssueSeverity([FHIRIssueSeverity::FIELD_VALUE => $data[self::FIELD_SEVERITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SEVERITY])) { + $this->setSeverity(new FHIRIssueSeverity([FHIRIssueSeverity::FIELD_VALUE => $data[self::FIELD_SEVERITY]] + $ext)); + } else if (is_array($data[self::FIELD_SEVERITY])) { + $this->setSeverity(new FHIRIssueSeverity(array_merge($ext, $data[self::FIELD_SEVERITY]))); + } } else { $this->setSeverity(new FHIRIssueSeverity($data[self::FIELD_SEVERITY])); } @@ -690,7 +715,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDetails())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DETAILS, null, $v->_getFHIRXMLNamespace())); } @@ -713,7 +737,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_LOCATION, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getSeverity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SEVERITY, null, $v->_getFHIRXMLNamespace())); } @@ -727,14 +750,29 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getCode())) { - $a[self::FIELD_CODE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CODE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CODE_EXT] = $enc; + } + } else { + $a[self::FIELD_CODE] = $v; + } } if (null !== ($v = $this->getDetails())) { $a[self::FIELD_DETAILS] = $v; } if (null !== ($v = $this->getDiagnostics())) { - $a[self::FIELD_DIAGNOSTICS] = $v->getValue(); - $a[self::FIELD_DIAGNOSTICS_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DIAGNOSTICS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DIAGNOSTICS_EXT] = $enc; + } + } else { + $a[self::FIELD_DIAGNOSTICS] = $v; + } } if ([] !== ($vs = $this->getExpression())) { $a[self::FIELD_EXPRESSION] = []; @@ -742,8 +780,17 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_EXPRESSION][] = $v->getValue(); - $a[self::FIELD_EXPRESSION_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EXPRESSION][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EXPRESSION_EXT][] = $enc; + } else { + $a[self::FIELD_EXPRESSION_EXT][] = null; + } + } else { + $a[self::FIELD_EXPRESSION][] = $v; + } } } if ([] !== ($vs = $this->getLocation())) { @@ -752,12 +799,29 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_LOCATION][] = $v->getValue(); - $a[self::FIELD_LOCATION_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_LOCATION][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_LOCATION_EXT][] = $enc; + } else { + $a[self::FIELD_LOCATION_EXT][] = null; + } + } else { + $a[self::FIELD_LOCATION][] = $v; + } } } if (null !== ($v = $this->getSeverity())) { - $a[self::FIELD_SEVERITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SEVERITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SEVERITY_EXT] = $enc; + } + } else { + $a[self::FIELD_SEVERITY] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIROrganization/FHIROrganizationContact.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIROrganization/FHIROrganizationContact.php index eb856ddb2b..d920f3c247 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIROrganization/FHIROrganizationContact.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIROrganization/FHIROrganizationContact.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -83,10 +83,6 @@ class FHIROrganizationContact extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ORGANIZATION_DOT_CONTACT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ADDRESS = 'address'; const FIELD_NAME = 'name'; const FIELD_PURPOSE = 'purpose'; @@ -144,6 +140,9 @@ class FHIROrganizationContact extends FHIRBackboneElement */ protected $telecom = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIROrganizationContact Constructor * @param null|array $data @@ -187,17 +186,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_TELECOM])) { foreach($data[self::FIELD_TELECOM] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContactPoint) { $this->addTelecom($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addTelecom(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addTelecom(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addTelecom(new FHIRContactPoint(array_merge($v, $ext[$i]))); + } } else { $this->addTelecom(new FHIRContactPoint($v)); } } } elseif ($data[self::FIELD_TELECOM] instanceof FHIRContactPoint) { $this->addTelecom($data[self::FIELD_TELECOM]); - } elseif ($ext && is_scalar($data[self::FIELD_TELECOM])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_TELECOM])) { $this->addTelecom(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $data[self::FIELD_TELECOM]] + $ext)); } else { $this->addTelecom(new FHIRContactPoint($data[self::FIELD_TELECOM])); @@ -484,15 +490,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getAddress())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ADDRESS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NAME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPurpose())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PURPOSE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getTelecom())) { foreach($vs as $v) { if (null === $v) { @@ -520,7 +523,23 @@ public function jsonSerialize() $a[self::FIELD_PURPOSE] = $v; } if ([] !== ($vs = $this->getTelecom())) { - $a[self::FIELD_TELECOM] = $vs; + $a[self::FIELD_TELECOM] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TELECOM][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TELECOM_EXT][] = $enc; + } else { + $a[self::FIELD_TELECOM_EXT][] = null; + } + } else { + $a[self::FIELD_TELECOM][] = $v; + } + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRParameters/FHIRParametersParameter.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRParameters/FHIRParametersParameter.php index a43732c703..86f856745f 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRParameters/FHIRParametersParameter.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRParameters/FHIRParametersParameter.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -118,16 +118,13 @@ class FHIRParametersParameter extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_PARAMETERS_DOT_PARAMETER; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_NAME = 'name'; const FIELD_NAME_EXT = '_name'; const FIELD_PART = 'part'; const FIELD_RESOURCE = 'resource'; const FIELD_VALUE_ADDRESS = 'valueAddress'; const FIELD_VALUE_AGE = 'valueAge'; + const FIELD_VALUE_AGE_EXT = '_valueAge'; const FIELD_VALUE_ANNOTATION = 'valueAnnotation'; const FIELD_VALUE_ATTACHMENT = 'valueAttachment'; const FIELD_VALUE_BASE_64BINARY = 'valueBase64Binary'; @@ -141,6 +138,7 @@ class FHIRParametersParameter extends FHIRBackboneElement const FIELD_VALUE_CONTACT_POINT = 'valueContactPoint'; const FIELD_VALUE_CONTACT_POINT_EXT = '_valueContactPoint'; const FIELD_VALUE_COUNT = 'valueCount'; + const FIELD_VALUE_COUNT_EXT = '_valueCount'; const FIELD_VALUE_DATE = 'valueDate'; const FIELD_VALUE_DATE_EXT = '_valueDate'; const FIELD_VALUE_DATE_TIME = 'valueDateTime'; @@ -148,7 +146,9 @@ class FHIRParametersParameter extends FHIRBackboneElement const FIELD_VALUE_DECIMAL = 'valueDecimal'; const FIELD_VALUE_DECIMAL_EXT = '_valueDecimal'; const FIELD_VALUE_DISTANCE = 'valueDistance'; + const FIELD_VALUE_DISTANCE_EXT = '_valueDistance'; const FIELD_VALUE_DURATION = 'valueDuration'; + const FIELD_VALUE_DURATION_EXT = '_valueDuration'; const FIELD_VALUE_HUMAN_NAME = 'valueHumanName'; const FIELD_VALUE_ID = 'valueId'; const FIELD_VALUE_ID_EXT = '_valueId'; @@ -162,6 +162,7 @@ class FHIRParametersParameter extends FHIRBackboneElement const FIELD_VALUE_MARKDOWN_EXT = '_valueMarkdown'; const FIELD_VALUE_META = 'valueMeta'; const FIELD_VALUE_MONEY = 'valueMoney'; + const FIELD_VALUE_MONEY_EXT = '_valueMoney'; const FIELD_VALUE_OID = 'valueOid'; const FIELD_VALUE_OID_EXT = '_valueOid'; const FIELD_VALUE_PERIOD = 'valuePeriod'; @@ -669,6 +670,9 @@ class FHIRParametersParameter extends FHIRBackboneElement */ protected $valueUri = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRParametersParameter Constructor * @param null|array $data @@ -691,8 +695,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -700,6 +708,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PART])) { if (is_array($data[self::FIELD_PART])) { foreach($data[self::FIELD_PART] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRParametersParameter) { $this->addPart($v); } else { @@ -746,8 +757,17 @@ public function __construct($data = null) } } if (isset($data[self::FIELD_VALUE_AGE])) { + $ext = (isset($data[self::FIELD_VALUE_AGE_EXT]) && is_array($data[self::FIELD_VALUE_AGE_EXT])) + ? $data[self::FIELD_VALUE_AGE_EXT] + : null; if ($data[self::FIELD_VALUE_AGE] instanceof FHIRAge) { $this->setValueAge($data[self::FIELD_VALUE_AGE]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_AGE])) { + $this->setValueAge(new FHIRAge([FHIRAge::FIELD_VALUE => $data[self::FIELD_VALUE_AGE]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_AGE])) { + $this->setValueAge(new FHIRAge(array_merge($ext, $data[self::FIELD_VALUE_AGE]))); + } } else { $this->setValueAge(new FHIRAge($data[self::FIELD_VALUE_AGE])); } @@ -772,8 +792,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_BASE_64BINARY] instanceof FHIRBase64Binary) { $this->setValueBase64Binary($data[self::FIELD_VALUE_BASE_64BINARY]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_BASE_64BINARY])) { - $this->setValueBase64Binary(new FHIRBase64Binary([FHIRBase64Binary::FIELD_VALUE => $data[self::FIELD_VALUE_BASE_64BINARY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_BASE_64BINARY])) { + $this->setValueBase64Binary(new FHIRBase64Binary([FHIRBase64Binary::FIELD_VALUE => $data[self::FIELD_VALUE_BASE_64BINARY]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_BASE_64BINARY])) { + $this->setValueBase64Binary(new FHIRBase64Binary(array_merge($ext, $data[self::FIELD_VALUE_BASE_64BINARY]))); + } } else { $this->setValueBase64Binary(new FHIRBase64Binary($data[self::FIELD_VALUE_BASE_64BINARY])); } @@ -784,8 +808,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_BOOLEAN] instanceof FHIRBoolean) { $this->setValueBoolean($data[self::FIELD_VALUE_BOOLEAN]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_BOOLEAN])) { - $this->setValueBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_VALUE_BOOLEAN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_BOOLEAN])) { + $this->setValueBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_VALUE_BOOLEAN]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_BOOLEAN])) { + $this->setValueBoolean(new FHIRBoolean(array_merge($ext, $data[self::FIELD_VALUE_BOOLEAN]))); + } } else { $this->setValueBoolean(new FHIRBoolean($data[self::FIELD_VALUE_BOOLEAN])); } @@ -796,8 +824,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_CODE] instanceof FHIRCode) { $this->setValueCode($data[self::FIELD_VALUE_CODE]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_CODE])) { - $this->setValueCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_VALUE_CODE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_CODE])) { + $this->setValueCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_VALUE_CODE]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_CODE])) { + $this->setValueCode(new FHIRCode(array_merge($ext, $data[self::FIELD_VALUE_CODE]))); + } } else { $this->setValueCode(new FHIRCode($data[self::FIELD_VALUE_CODE])); } @@ -822,15 +854,28 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_CONTACT_POINT] instanceof FHIRContactPoint) { $this->setValueContactPoint($data[self::FIELD_VALUE_CONTACT_POINT]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_CONTACT_POINT])) { - $this->setValueContactPoint(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $data[self::FIELD_VALUE_CONTACT_POINT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_CONTACT_POINT])) { + $this->setValueContactPoint(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $data[self::FIELD_VALUE_CONTACT_POINT]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_CONTACT_POINT])) { + $this->setValueContactPoint(new FHIRContactPoint(array_merge($ext, $data[self::FIELD_VALUE_CONTACT_POINT]))); + } } else { $this->setValueContactPoint(new FHIRContactPoint($data[self::FIELD_VALUE_CONTACT_POINT])); } } if (isset($data[self::FIELD_VALUE_COUNT])) { + $ext = (isset($data[self::FIELD_VALUE_COUNT_EXT]) && is_array($data[self::FIELD_VALUE_COUNT_EXT])) + ? $data[self::FIELD_VALUE_COUNT_EXT] + : null; if ($data[self::FIELD_VALUE_COUNT] instanceof FHIRCount) { $this->setValueCount($data[self::FIELD_VALUE_COUNT]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_COUNT])) { + $this->setValueCount(new FHIRCount([FHIRCount::FIELD_VALUE => $data[self::FIELD_VALUE_COUNT]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_COUNT])) { + $this->setValueCount(new FHIRCount(array_merge($ext, $data[self::FIELD_VALUE_COUNT]))); + } } else { $this->setValueCount(new FHIRCount($data[self::FIELD_VALUE_COUNT])); } @@ -841,8 +886,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_DATE] instanceof FHIRDate) { $this->setValueDate($data[self::FIELD_VALUE_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_DATE])) { - $this->setValueDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_VALUE_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_DATE])) { + $this->setValueDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_VALUE_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_DATE])) { + $this->setValueDate(new FHIRDate(array_merge($ext, $data[self::FIELD_VALUE_DATE]))); + } } else { $this->setValueDate(new FHIRDate($data[self::FIELD_VALUE_DATE])); } @@ -853,8 +902,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_DATE_TIME] instanceof FHIRDateTime) { $this->setValueDateTime($data[self::FIELD_VALUE_DATE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_DATE_TIME])) { - $this->setValueDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_VALUE_DATE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_DATE_TIME])) { + $this->setValueDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_VALUE_DATE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_DATE_TIME])) { + $this->setValueDateTime(new FHIRDateTime(array_merge($ext, $data[self::FIELD_VALUE_DATE_TIME]))); + } } else { $this->setValueDateTime(new FHIRDateTime($data[self::FIELD_VALUE_DATE_TIME])); } @@ -865,22 +918,44 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_DECIMAL] instanceof FHIRDecimal) { $this->setValueDecimal($data[self::FIELD_VALUE_DECIMAL]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_DECIMAL])) { - $this->setValueDecimal(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_VALUE_DECIMAL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_DECIMAL])) { + $this->setValueDecimal(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_VALUE_DECIMAL]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_DECIMAL])) { + $this->setValueDecimal(new FHIRDecimal(array_merge($ext, $data[self::FIELD_VALUE_DECIMAL]))); + } } else { $this->setValueDecimal(new FHIRDecimal($data[self::FIELD_VALUE_DECIMAL])); } } if (isset($data[self::FIELD_VALUE_DISTANCE])) { + $ext = (isset($data[self::FIELD_VALUE_DISTANCE_EXT]) && is_array($data[self::FIELD_VALUE_DISTANCE_EXT])) + ? $data[self::FIELD_VALUE_DISTANCE_EXT] + : null; if ($data[self::FIELD_VALUE_DISTANCE] instanceof FHIRDistance) { $this->setValueDistance($data[self::FIELD_VALUE_DISTANCE]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_DISTANCE])) { + $this->setValueDistance(new FHIRDistance([FHIRDistance::FIELD_VALUE => $data[self::FIELD_VALUE_DISTANCE]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_DISTANCE])) { + $this->setValueDistance(new FHIRDistance(array_merge($ext, $data[self::FIELD_VALUE_DISTANCE]))); + } } else { $this->setValueDistance(new FHIRDistance($data[self::FIELD_VALUE_DISTANCE])); } } if (isset($data[self::FIELD_VALUE_DURATION])) { + $ext = (isset($data[self::FIELD_VALUE_DURATION_EXT]) && is_array($data[self::FIELD_VALUE_DURATION_EXT])) + ? $data[self::FIELD_VALUE_DURATION_EXT] + : null; if ($data[self::FIELD_VALUE_DURATION] instanceof FHIRDuration) { $this->setValueDuration($data[self::FIELD_VALUE_DURATION]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_DURATION])) { + $this->setValueDuration(new FHIRDuration([FHIRDuration::FIELD_VALUE => $data[self::FIELD_VALUE_DURATION]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_DURATION])) { + $this->setValueDuration(new FHIRDuration(array_merge($ext, $data[self::FIELD_VALUE_DURATION]))); + } } else { $this->setValueDuration(new FHIRDuration($data[self::FIELD_VALUE_DURATION])); } @@ -898,8 +973,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_ID] instanceof FHIRId) { $this->setValueId($data[self::FIELD_VALUE_ID]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_ID])) { - $this->setValueId(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_VALUE_ID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_ID])) { + $this->setValueId(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_VALUE_ID]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_ID])) { + $this->setValueId(new FHIRId(array_merge($ext, $data[self::FIELD_VALUE_ID]))); + } } else { $this->setValueId(new FHIRId($data[self::FIELD_VALUE_ID])); } @@ -910,8 +989,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_IDENTIFIER] instanceof FHIRIdentifier) { $this->setValueIdentifier($data[self::FIELD_VALUE_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_IDENTIFIER])) { - $this->setValueIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_VALUE_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_IDENTIFIER])) { + $this->setValueIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_VALUE_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_IDENTIFIER])) { + $this->setValueIdentifier(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_VALUE_IDENTIFIER]))); + } } else { $this->setValueIdentifier(new FHIRIdentifier($data[self::FIELD_VALUE_IDENTIFIER])); } @@ -922,8 +1005,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_INSTANT] instanceof FHIRInstant) { $this->setValueInstant($data[self::FIELD_VALUE_INSTANT]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_INSTANT])) { - $this->setValueInstant(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_VALUE_INSTANT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_INSTANT])) { + $this->setValueInstant(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_VALUE_INSTANT]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_INSTANT])) { + $this->setValueInstant(new FHIRInstant(array_merge($ext, $data[self::FIELD_VALUE_INSTANT]))); + } } else { $this->setValueInstant(new FHIRInstant($data[self::FIELD_VALUE_INSTANT])); } @@ -934,8 +1021,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_INTEGER] instanceof FHIRInteger) { $this->setValueInteger($data[self::FIELD_VALUE_INTEGER]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_INTEGER])) { - $this->setValueInteger(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_VALUE_INTEGER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_INTEGER])) { + $this->setValueInteger(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_VALUE_INTEGER]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_INTEGER])) { + $this->setValueInteger(new FHIRInteger(array_merge($ext, $data[self::FIELD_VALUE_INTEGER]))); + } } else { $this->setValueInteger(new FHIRInteger($data[self::FIELD_VALUE_INTEGER])); } @@ -946,8 +1037,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_MARKDOWN] instanceof FHIRMarkdown) { $this->setValueMarkdown($data[self::FIELD_VALUE_MARKDOWN]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_MARKDOWN])) { - $this->setValueMarkdown(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_VALUE_MARKDOWN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_MARKDOWN])) { + $this->setValueMarkdown(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_VALUE_MARKDOWN]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_MARKDOWN])) { + $this->setValueMarkdown(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_VALUE_MARKDOWN]))); + } } else { $this->setValueMarkdown(new FHIRMarkdown($data[self::FIELD_VALUE_MARKDOWN])); } @@ -960,8 +1055,17 @@ public function __construct($data = null) } } if (isset($data[self::FIELD_VALUE_MONEY])) { + $ext = (isset($data[self::FIELD_VALUE_MONEY_EXT]) && is_array($data[self::FIELD_VALUE_MONEY_EXT])) + ? $data[self::FIELD_VALUE_MONEY_EXT] + : null; if ($data[self::FIELD_VALUE_MONEY] instanceof FHIRMoney) { $this->setValueMoney($data[self::FIELD_VALUE_MONEY]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_MONEY])) { + $this->setValueMoney(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_VALUE_MONEY]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_MONEY])) { + $this->setValueMoney(new FHIRMoney(array_merge($ext, $data[self::FIELD_VALUE_MONEY]))); + } } else { $this->setValueMoney(new FHIRMoney($data[self::FIELD_VALUE_MONEY])); } @@ -972,8 +1076,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_OID] instanceof FHIROid) { $this->setValueOid($data[self::FIELD_VALUE_OID]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_OID])) { - $this->setValueOid(new FHIROid([FHIROid::FIELD_VALUE => $data[self::FIELD_VALUE_OID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_OID])) { + $this->setValueOid(new FHIROid([FHIROid::FIELD_VALUE => $data[self::FIELD_VALUE_OID]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_OID])) { + $this->setValueOid(new FHIROid(array_merge($ext, $data[self::FIELD_VALUE_OID]))); + } } else { $this->setValueOid(new FHIROid($data[self::FIELD_VALUE_OID])); } @@ -991,8 +1099,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_POSITIVE_INT] instanceof FHIRPositiveInt) { $this->setValuePositiveInt($data[self::FIELD_VALUE_POSITIVE_INT]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_POSITIVE_INT])) { - $this->setValuePositiveInt(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_VALUE_POSITIVE_INT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_POSITIVE_INT])) { + $this->setValuePositiveInt(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_VALUE_POSITIVE_INT]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_POSITIVE_INT])) { + $this->setValuePositiveInt(new FHIRPositiveInt(array_merge($ext, $data[self::FIELD_VALUE_POSITIVE_INT]))); + } } else { $this->setValuePositiveInt(new FHIRPositiveInt($data[self::FIELD_VALUE_POSITIVE_INT])); } @@ -1003,8 +1115,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_QUANTITY] instanceof FHIRQuantity) { $this->setValueQuantity($data[self::FIELD_VALUE_QUANTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_QUANTITY])) { - $this->setValueQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_VALUE_QUANTITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_QUANTITY])) { + $this->setValueQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_VALUE_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_QUANTITY])) { + $this->setValueQuantity(new FHIRQuantity(array_merge($ext, $data[self::FIELD_VALUE_QUANTITY]))); + } } else { $this->setValueQuantity(new FHIRQuantity($data[self::FIELD_VALUE_QUANTITY])); } @@ -1050,8 +1166,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_STRING] instanceof FHIRString) { $this->setValueString($data[self::FIELD_VALUE_STRING]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_STRING])) { - $this->setValueString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VALUE_STRING]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_STRING])) { + $this->setValueString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VALUE_STRING]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_STRING])) { + $this->setValueString(new FHIRString(array_merge($ext, $data[self::FIELD_VALUE_STRING]))); + } } else { $this->setValueString(new FHIRString($data[self::FIELD_VALUE_STRING])); } @@ -1062,8 +1182,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_TIME] instanceof FHIRTime) { $this->setValueTime($data[self::FIELD_VALUE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_TIME])) { - $this->setValueTime(new FHIRTime([FHIRTime::FIELD_VALUE => $data[self::FIELD_VALUE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_TIME])) { + $this->setValueTime(new FHIRTime([FHIRTime::FIELD_VALUE => $data[self::FIELD_VALUE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_TIME])) { + $this->setValueTime(new FHIRTime(array_merge($ext, $data[self::FIELD_VALUE_TIME]))); + } } else { $this->setValueTime(new FHIRTime($data[self::FIELD_VALUE_TIME])); } @@ -1081,8 +1205,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_UNSIGNED_INT] instanceof FHIRUnsignedInt) { $this->setValueUnsignedInt($data[self::FIELD_VALUE_UNSIGNED_INT]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_UNSIGNED_INT])) { - $this->setValueUnsignedInt(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_VALUE_UNSIGNED_INT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_UNSIGNED_INT])) { + $this->setValueUnsignedInt(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_VALUE_UNSIGNED_INT]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_UNSIGNED_INT])) { + $this->setValueUnsignedInt(new FHIRUnsignedInt(array_merge($ext, $data[self::FIELD_VALUE_UNSIGNED_INT]))); + } } else { $this->setValueUnsignedInt(new FHIRUnsignedInt($data[self::FIELD_VALUE_UNSIGNED_INT])); } @@ -1093,8 +1221,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_URI] instanceof FHIRUri) { $this->setValueUri($data[self::FIELD_VALUE_URI]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_URI])) { - $this->setValueUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_VALUE_URI]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_URI])) { + $this->setValueUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_VALUE_URI]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_URI])) { + $this->setValueUri(new FHIRUri(array_merge($ext, $data[self::FIELD_VALUE_URI]))); + } } else { $this->setValueUri(new FHIRUri($data[self::FIELD_VALUE_URI])); } @@ -2841,10 +2973,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NAME, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getPart())) { foreach($vs as $v) { if (null === $v) { @@ -2853,24 +2985,19 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_PART, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getResource())) { $tsxe = $sxe->addChild(self::FIELD_RESOURCE); $v->xmlSerialize($tsxe->addChild($v->_getFHIRTypeName(), null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueAddress())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_ADDRESS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueAge())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_AGE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueAnnotation())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_ANNOTATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueAttachment())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_ATTACHMENT, null, $v->_getFHIRXMLNamespace())); } @@ -2883,19 +3010,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getValueCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_CODE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueCoding())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_CODING, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueContactPoint())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_CONTACT_POINT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueCount())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_COUNT, null, $v->_getFHIRXMLNamespace())); } @@ -2908,22 +3031,18 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getValueDecimal())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_DECIMAL, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueDistance())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_DISTANCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueDuration())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_DURATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueHumanName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_HUMAN_NAME, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getValueId())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_ID, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } @@ -2936,45 +3055,36 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getValueMarkdown())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_MARKDOWN, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueMeta())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_META, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueMoney())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_MONEY, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getValueOid())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_OID, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValuePeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_PERIOD, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getValuePositiveInt())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_POSITIVE_INT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_QUANTITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueRange())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_RANGE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueRatio())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_RATIO, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_REFERENCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueSampledData())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_SAMPLED_DATA, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueSignature())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_SIGNATURE, null, $v->_getFHIRXMLNamespace())); } @@ -2984,7 +3094,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getValueTime())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_TIME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueTiming())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_TIMING, null, $v->_getFHIRXMLNamespace())); } @@ -3004,8 +3113,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if ([] !== ($vs = $this->getPart())) { $a[self::FIELD_PART] = $vs; @@ -3017,7 +3133,15 @@ public function jsonSerialize() $a[self::FIELD_VALUE_ADDRESS] = $v; } if (null !== ($v = $this->getValueAge())) { - $a[self::FIELD_VALUE_AGE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_AGE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_AGE_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_AGE] = $v; + } } if (null !== ($v = $this->getValueAnnotation())) { $a[self::FIELD_VALUE_ANNOTATION] = $v; @@ -3026,16 +3150,37 @@ public function jsonSerialize() $a[self::FIELD_VALUE_ATTACHMENT] = $v; } if (null !== ($v = $this->getValueBase64Binary())) { - $a[self::FIELD_VALUE_BASE_64BINARY] = $v->getValue(); - $a[self::FIELD_VALUE_BASE_64BINARY_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_BASE_64BINARY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_BASE_64BINARY_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_BASE_64BINARY] = $v; + } } if (null !== ($v = $this->getValueBoolean())) { - $a[self::FIELD_VALUE_BOOLEAN] = $v->getValue(); - $a[self::FIELD_VALUE_BOOLEAN_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_BOOLEAN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_BOOLEAN_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_BOOLEAN] = $v; + } } if (null !== ($v = $this->getValueCode())) { - $a[self::FIELD_VALUE_CODE] = $v->getValue(); - $a[self::FIELD_VALUE_CODE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_CODE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_CODE_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_CODE] = $v; + } } if (null !== ($v = $this->getValueCodeableConcept())) { $a[self::FIELD_VALUE_CODEABLE_CONCEPT] = $v; @@ -3044,70 +3189,189 @@ public function jsonSerialize() $a[self::FIELD_VALUE_CODING] = $v; } if (null !== ($v = $this->getValueContactPoint())) { - $a[self::FIELD_VALUE_CONTACT_POINT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_CONTACT_POINT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_CONTACT_POINT_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_CONTACT_POINT] = $v; + } } if (null !== ($v = $this->getValueCount())) { - $a[self::FIELD_VALUE_COUNT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_COUNT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_COUNT_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_COUNT] = $v; + } } if (null !== ($v = $this->getValueDate())) { - $a[self::FIELD_VALUE_DATE] = $v->getValue(); - $a[self::FIELD_VALUE_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_DATE] = $v; + } } if (null !== ($v = $this->getValueDateTime())) { - $a[self::FIELD_VALUE_DATE_TIME] = $v->getValue(); - $a[self::FIELD_VALUE_DATE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_DATE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_DATE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_DATE_TIME] = $v; + } } if (null !== ($v = $this->getValueDecimal())) { - $a[self::FIELD_VALUE_DECIMAL] = $v->getValue(); - $a[self::FIELD_VALUE_DECIMAL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_DECIMAL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_DECIMAL_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_DECIMAL] = $v; + } } if (null !== ($v = $this->getValueDistance())) { - $a[self::FIELD_VALUE_DISTANCE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_DISTANCE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_DISTANCE_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_DISTANCE] = $v; + } } if (null !== ($v = $this->getValueDuration())) { - $a[self::FIELD_VALUE_DURATION] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_DURATION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_DURATION_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_DURATION] = $v; + } } if (null !== ($v = $this->getValueHumanName())) { $a[self::FIELD_VALUE_HUMAN_NAME] = $v; } if (null !== ($v = $this->getValueId())) { - $a[self::FIELD_VALUE_ID] = $v->getValue(); - $a[self::FIELD_VALUE_ID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_ID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_ID_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_ID] = $v; + } } if (null !== ($v = $this->getValueIdentifier())) { - $a[self::FIELD_VALUE_IDENTIFIER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_IDENTIFIER] = $v; + } } if (null !== ($v = $this->getValueInstant())) { - $a[self::FIELD_VALUE_INSTANT] = $v->getValue(); - $a[self::FIELD_VALUE_INSTANT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_INSTANT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_INSTANT_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_INSTANT] = $v; + } } if (null !== ($v = $this->getValueInteger())) { - $a[self::FIELD_VALUE_INTEGER] = $v->getValue(); - $a[self::FIELD_VALUE_INTEGER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_INTEGER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_INTEGER_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_INTEGER] = $v; + } } if (null !== ($v = $this->getValueMarkdown())) { - $a[self::FIELD_VALUE_MARKDOWN] = $v->getValue(); - $a[self::FIELD_VALUE_MARKDOWN_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_MARKDOWN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_MARKDOWN_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_MARKDOWN] = $v; + } } if (null !== ($v = $this->getValueMeta())) { $a[self::FIELD_VALUE_META] = $v; } if (null !== ($v = $this->getValueMoney())) { - $a[self::FIELD_VALUE_MONEY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_MONEY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_MONEY_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_MONEY] = $v; + } } if (null !== ($v = $this->getValueOid())) { - $a[self::FIELD_VALUE_OID] = $v->getValue(); - $a[self::FIELD_VALUE_OID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_OID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_OID_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_OID] = $v; + } } if (null !== ($v = $this->getValuePeriod())) { $a[self::FIELD_VALUE_PERIOD] = $v; } if (null !== ($v = $this->getValuePositiveInt())) { - $a[self::FIELD_VALUE_POSITIVE_INT] = $v->getValue(); - $a[self::FIELD_VALUE_POSITIVE_INT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_POSITIVE_INT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_POSITIVE_INT_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_POSITIVE_INT] = $v; + } } if (null !== ($v = $this->getValueQuantity())) { - $a[self::FIELD_VALUE_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_QUANTITY] = $v; + } } if (null !== ($v = $this->getValueRange())) { $a[self::FIELD_VALUE_RANGE] = $v; @@ -3125,23 +3389,51 @@ public function jsonSerialize() $a[self::FIELD_VALUE_SIGNATURE] = $v; } if (null !== ($v = $this->getValueString())) { - $a[self::FIELD_VALUE_STRING] = $v->getValue(); - $a[self::FIELD_VALUE_STRING_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_STRING] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_STRING_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_STRING] = $v; + } } if (null !== ($v = $this->getValueTime())) { - $a[self::FIELD_VALUE_TIME] = $v->getValue(); - $a[self::FIELD_VALUE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_TIME] = $v; + } } if (null !== ($v = $this->getValueTiming())) { $a[self::FIELD_VALUE_TIMING] = $v; } if (null !== ($v = $this->getValueUnsignedInt())) { - $a[self::FIELD_VALUE_UNSIGNED_INT] = $v->getValue(); - $a[self::FIELD_VALUE_UNSIGNED_INT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_UNSIGNED_INT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_UNSIGNED_INT_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_UNSIGNED_INT] = $v; + } } if (null !== ($v = $this->getValueUri())) { - $a[self::FIELD_VALUE_URI] = $v->getValue(); - $a[self::FIELD_VALUE_URI_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_URI] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_URI_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_URI] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRPatient/FHIRPatientAnimal.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRPatient/FHIRPatientAnimal.php index 00e53f0b89..f55f244eb3 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRPatient/FHIRPatientAnimal.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRPatient/FHIRPatientAnimal.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRPatientAnimal extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_PATIENT_DOT_ANIMAL; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_BREED = 'breed'; const FIELD_GENDER_STATUS = 'genderStatus'; const FIELD_SPECIES = 'species'; @@ -122,6 +118,9 @@ class FHIRPatientAnimal extends FHIRBackboneElement */ protected $species = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRPatientAnimal Constructor * @param null|array $data @@ -369,11 +368,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getBreed())) { $v->xmlSerialize($sxe->addChild(self::FIELD_BREED, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getGenderStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_GENDER_STATUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSpecies())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SPECIES, null, $v->_getFHIRXMLNamespace())); } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRPatient/FHIRPatientCommunication.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRPatient/FHIRPatientCommunication.php index 8f6cdb6b6f..d426c04eb6 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRPatient/FHIRPatientCommunication.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRPatient/FHIRPatientCommunication.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRPatientCommunication extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_PATIENT_DOT_COMMUNICATION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_LANGUAGE = 'language'; const FIELD_PREFERRED = 'preferred'; const FIELD_PREFERRED_EXT = '_preferred'; @@ -113,6 +109,9 @@ class FHIRPatientCommunication extends FHIRBackboneElement */ protected $preferred = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRPatientCommunication Constructor * @param null|array $data @@ -142,8 +141,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PREFERRED] instanceof FHIRBoolean) { $this->setPreferred($data[self::FIELD_PREFERRED]); - } elseif ($ext && is_scalar($data[self::FIELD_PREFERRED])) { - $this->setPreferred(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_PREFERRED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PREFERRED])) { + $this->setPreferred(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_PREFERRED]] + $ext)); + } else if (is_array($data[self::FIELD_PREFERRED])) { + $this->setPreferred(new FHIRBoolean(array_merge($ext, $data[self::FIELD_PREFERRED]))); + } } else { $this->setPreferred(new FHIRBoolean($data[self::FIELD_PREFERRED])); } @@ -354,8 +357,15 @@ public function jsonSerialize() $a[self::FIELD_LANGUAGE] = $v; } if (null !== ($v = $this->getPreferred())) { - $a[self::FIELD_PREFERRED] = $v->getValue(); - $a[self::FIELD_PREFERRED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PREFERRED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PREFERRED_EXT] = $enc; + } + } else { + $a[self::FIELD_PREFERRED] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRPatient/FHIRPatientContact.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRPatient/FHIRPatientContact.php index 2122e73e3f..38a3944d0f 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRPatient/FHIRPatientContact.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRPatient/FHIRPatientContact.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -84,10 +84,6 @@ class FHIRPatientContact extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_PATIENT_DOT_CONTACT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ADDRESS = 'address'; const FIELD_GENDER = 'gender'; const FIELD_GENDER_EXT = '_gender'; @@ -182,6 +178,9 @@ class FHIRPatientContact extends FHIRBackboneElement */ protected $telecom = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRPatientContact Constructor * @param null|array $data @@ -211,8 +210,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_GENDER] instanceof FHIRAdministrativeGender) { $this->setGender($data[self::FIELD_GENDER]); - } elseif ($ext && is_scalar($data[self::FIELD_GENDER])) { - $this->setGender(new FHIRAdministrativeGender([FHIRAdministrativeGender::FIELD_VALUE => $data[self::FIELD_GENDER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_GENDER])) { + $this->setGender(new FHIRAdministrativeGender([FHIRAdministrativeGender::FIELD_VALUE => $data[self::FIELD_GENDER]] + $ext)); + } else if (is_array($data[self::FIELD_GENDER])) { + $this->setGender(new FHIRAdministrativeGender(array_merge($ext, $data[self::FIELD_GENDER]))); + } } else { $this->setGender(new FHIRAdministrativeGender($data[self::FIELD_GENDER])); } @@ -241,6 +244,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_RELATIONSHIP])) { if (is_array($data[self::FIELD_RELATIONSHIP])) { foreach($data[self::FIELD_RELATIONSHIP] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addRelationship($v); } else { @@ -259,17 +265,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_TELECOM])) { foreach($data[self::FIELD_TELECOM] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContactPoint) { $this->addTelecom($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addTelecom(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addTelecom(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addTelecom(new FHIRContactPoint(array_merge($v, $ext[$i]))); + } } else { $this->addTelecom(new FHIRContactPoint($v)); } } } elseif ($data[self::FIELD_TELECOM] instanceof FHIRContactPoint) { $this->addTelecom($data[self::FIELD_TELECOM]); - } elseif ($ext && is_scalar($data[self::FIELD_TELECOM])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_TELECOM])) { $this->addTelecom(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $data[self::FIELD_TELECOM]] + $ext)); } else { $this->addTelecom(new FHIRContactPoint($data[self::FIELD_TELECOM])); @@ -683,23 +696,18 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getAddress())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ADDRESS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getGender())) { $v->xmlSerialize($sxe->addChild(self::FIELD_GENDER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NAME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOrganization())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ORGANIZATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getRelationship())) { foreach($vs as $v) { if (null === $v) { @@ -708,7 +716,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_RELATIONSHIP, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getTelecom())) { foreach($vs as $v) { if (null === $v) { @@ -730,7 +737,15 @@ public function jsonSerialize() $a[self::FIELD_ADDRESS] = $v; } if (null !== ($v = $this->getGender())) { - $a[self::FIELD_GENDER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_GENDER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_GENDER_EXT] = $enc; + } + } else { + $a[self::FIELD_GENDER] = $v; + } } if (null !== ($v = $this->getName())) { $a[self::FIELD_NAME] = $v; @@ -745,7 +760,23 @@ public function jsonSerialize() $a[self::FIELD_RELATIONSHIP] = $vs; } if ([] !== ($vs = $this->getTelecom())) { - $a[self::FIELD_TELECOM] = $vs; + $a[self::FIELD_TELECOM] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TELECOM][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TELECOM_EXT][] = $enc; + } else { + $a[self::FIELD_TELECOM_EXT][] = null; + } + } else { + $a[self::FIELD_TELECOM][] = $v; + } + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRPatient/FHIRPatientLink.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRPatient/FHIRPatientLink.php index c8d9ade87d..bf35684127 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRPatient/FHIRPatientLink.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRPatient/FHIRPatientLink.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRPatientLink extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_PATIENT_DOT_LINK; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_OTHER = 'other'; const FIELD_TYPE = 'type'; const FIELD_TYPE_EXT = '_type'; @@ -108,6 +104,9 @@ class FHIRPatientLink extends FHIRBackboneElement */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRPatientLink Constructor * @param null|array $data @@ -137,8 +136,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TYPE] instanceof FHIRLinkType) { $this->setType($data[self::FIELD_TYPE]); - } elseif ($ext && is_scalar($data[self::FIELD_TYPE])) { - $this->setType(new FHIRLinkType([FHIRLinkType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TYPE])) { + $this->setType(new FHIRLinkType([FHIRLinkType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } else if (is_array($data[self::FIELD_TYPE])) { + $this->setType(new FHIRLinkType(array_merge($ext, $data[self::FIELD_TYPE]))); + } } else { $this->setType(new FHIRLinkType($data[self::FIELD_TYPE])); } @@ -312,7 +315,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getOther())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OTHER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -329,7 +331,15 @@ public function jsonSerialize() $a[self::FIELD_OTHER] = $v; } if (null !== ($v = $this->getType())) { - $a[self::FIELD_TYPE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TYPE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TYPE_EXT] = $enc; + } + } else { + $a[self::FIELD_TYPE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRPaymentReconciliation/FHIRPaymentReconciliationDetail.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRPaymentReconciliation/FHIRPaymentReconciliationDetail.php index 93347450ba..3fedba0a68 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRPaymentReconciliation/FHIRPaymentReconciliationDetail.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRPaymentReconciliation/FHIRPaymentReconciliationDetail.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -81,11 +81,8 @@ class FHIRPaymentReconciliationDetail extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_PAYMENT_RECONCILIATION_DOT_DETAIL; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_AMOUNT = 'amount'; + const FIELD_AMOUNT_EXT = '_amount'; const FIELD_DATE = 'date'; const FIELD_DATE_EXT = '_date'; const FIELD_PAYEE = 'payee'; @@ -173,6 +170,9 @@ class FHIRPaymentReconciliationDetail extends FHIRBackboneElement */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRPaymentReconciliationDetail Constructor * @param null|array $data @@ -190,8 +190,17 @@ public function __construct($data = null) } parent::__construct($data); if (isset($data[self::FIELD_AMOUNT])) { + $ext = (isset($data[self::FIELD_AMOUNT_EXT]) && is_array($data[self::FIELD_AMOUNT_EXT])) + ? $data[self::FIELD_AMOUNT_EXT] + : null; if ($data[self::FIELD_AMOUNT] instanceof FHIRMoney) { $this->setAmount($data[self::FIELD_AMOUNT]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_AMOUNT])) { + $this->setAmount(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_AMOUNT]] + $ext)); + } else if (is_array($data[self::FIELD_AMOUNT])) { + $this->setAmount(new FHIRMoney(array_merge($ext, $data[self::FIELD_AMOUNT]))); + } } else { $this->setAmount(new FHIRMoney($data[self::FIELD_AMOUNT])); } @@ -202,8 +211,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATE] instanceof FHIRDate) { $this->setDate($data[self::FIELD_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_DATE])) { - $this->setDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDate(array_merge($ext, $data[self::FIELD_DATE]))); + } } else { $this->setDate(new FHIRDate($data[self::FIELD_DATE])); } @@ -597,23 +610,18 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DATE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPayee())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PAYEE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRequest())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REQUEST, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getResponse())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RESPONSE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSubmitter())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBMITTER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -627,11 +635,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getAmount())) { - $a[self::FIELD_AMOUNT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_AMOUNT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_AMOUNT_EXT] = $enc; + } + } else { + $a[self::FIELD_AMOUNT] = $v; + } } if (null !== ($v = $this->getDate())) { - $a[self::FIELD_DATE] = $v->getValue(); - $a[self::FIELD_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_DATE] = $v; + } } if (null !== ($v = $this->getPayee())) { $a[self::FIELD_PAYEE] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRPaymentReconciliation/FHIRPaymentReconciliationProcessNote.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRPaymentReconciliation/FHIRPaymentReconciliationProcessNote.php index efe25a88fb..cedcbcb129 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRPaymentReconciliation/FHIRPaymentReconciliationProcessNote.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRPaymentReconciliation/FHIRPaymentReconciliationProcessNote.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRPaymentReconciliationProcessNote extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_PAYMENT_RECONCILIATION_DOT_PROCESS_NOTE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_TEXT = 'text'; const FIELD_TEXT_EXT = '_text'; const FIELD_TYPE = 'type'; @@ -110,6 +106,9 @@ class FHIRPaymentReconciliationProcessNote extends FHIRBackboneElement */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRPaymentReconciliationProcessNote Constructor * @param null|array $data @@ -132,8 +131,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TEXT] instanceof FHIRString) { $this->setText($data[self::FIELD_TEXT]); - } elseif ($ext && is_scalar($data[self::FIELD_TEXT])) { - $this->setText(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TEXT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TEXT])) { + $this->setText(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TEXT]] + $ext)); + } else if (is_array($data[self::FIELD_TEXT])) { + $this->setText(new FHIRString(array_merge($ext, $data[self::FIELD_TEXT]))); + } } else { $this->setText(new FHIRString($data[self::FIELD_TEXT])); } @@ -325,10 +328,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getText())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TEXT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -342,8 +345,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getText())) { - $a[self::FIELD_TEXT] = $v->getValue(); - $a[self::FIELD_TEXT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TEXT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TEXT_EXT] = $enc; + } + } else { + $a[self::FIELD_TEXT] = $v; + } } if (null !== ($v = $this->getType())) { $a[self::FIELD_TYPE] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRPerson/FHIRPersonLink.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRPerson/FHIRPersonLink.php index cb854e32fb..376d449b37 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRPerson/FHIRPersonLink.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRPerson/FHIRPersonLink.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRPersonLink extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_PERSON_DOT_LINK; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ASSURANCE = 'assurance'; const FIELD_ASSURANCE_EXT = '_assurance'; const FIELD_TARGET = 'target'; @@ -110,6 +106,9 @@ class FHIRPersonLink extends FHIRBackboneElement */ protected $target = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRPersonLink Constructor * @param null|array $data @@ -132,8 +131,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ASSURANCE] instanceof FHIRIdentityAssuranceLevel) { $this->setAssurance($data[self::FIELD_ASSURANCE]); - } elseif ($ext && is_scalar($data[self::FIELD_ASSURANCE])) { - $this->setAssurance(new FHIRIdentityAssuranceLevel([FHIRIdentityAssuranceLevel::FIELD_VALUE => $data[self::FIELD_ASSURANCE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ASSURANCE])) { + $this->setAssurance(new FHIRIdentityAssuranceLevel([FHIRIdentityAssuranceLevel::FIELD_VALUE => $data[self::FIELD_ASSURANCE]] + $ext)); + } else if (is_array($data[self::FIELD_ASSURANCE])) { + $this->setAssurance(new FHIRIdentityAssuranceLevel(array_merge($ext, $data[self::FIELD_ASSURANCE]))); + } } else { $this->setAssurance(new FHIRIdentityAssuranceLevel($data[self::FIELD_ASSURANCE])); } @@ -318,7 +321,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getAssurance())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ASSURANCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getTarget())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TARGET, null, $v->_getFHIRXMLNamespace())); } @@ -332,7 +334,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getAssurance())) { - $a[self::FIELD_ASSURANCE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ASSURANCE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ASSURANCE_EXT] = $enc; + } + } else { + $a[self::FIELD_ASSURANCE] = $v; + } } if (null !== ($v = $this->getTarget())) { $a[self::FIELD_TARGET] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRPlanDefinition/FHIRPlanDefinitionAction.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRPlanDefinition/FHIRPlanDefinitionAction.php index d52fdd1c75..26adbe209b 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRPlanDefinition/FHIRPlanDefinitionAction.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRPlanDefinition/FHIRPlanDefinitionAction.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -97,10 +97,6 @@ class FHIRPlanDefinitionAction extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_PLAN_DEFINITION_DOT_ACTION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ACTION = 'action'; const FIELD_CARDINALITY_BEHAVIOR = 'cardinalityBehavior'; const FIELD_CARDINALITY_BEHAVIOR_EXT = '_cardinalityBehavior'; @@ -133,6 +129,7 @@ class FHIRPlanDefinitionAction extends FHIRBackboneElement const FIELD_TIMING_DATE_TIME = 'timingDateTime'; const FIELD_TIMING_DATE_TIME_EXT = '_timingDateTime'; const FIELD_TIMING_DURATION = 'timingDuration'; + const FIELD_TIMING_DURATION_EXT = '_timingDuration'; const FIELD_TIMING_PERIOD = 'timingPeriod'; const FIELD_TIMING_RANGE = 'timingRange'; const FIELD_TIMING_TIMING = 'timingTiming'; @@ -495,6 +492,9 @@ class FHIRPlanDefinitionAction extends FHIRBackboneElement */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRPlanDefinitionAction Constructor * @param null|array $data @@ -514,6 +514,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ACTION])) { if (is_array($data[self::FIELD_ACTION])) { foreach($data[self::FIELD_ACTION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRPlanDefinitionAction) { $this->addAction($v); } else { @@ -532,8 +535,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CARDINALITY_BEHAVIOR] instanceof FHIRActionCardinalityBehavior) { $this->setCardinalityBehavior($data[self::FIELD_CARDINALITY_BEHAVIOR]); - } elseif ($ext && is_scalar($data[self::FIELD_CARDINALITY_BEHAVIOR])) { - $this->setCardinalityBehavior(new FHIRActionCardinalityBehavior([FHIRActionCardinalityBehavior::FIELD_VALUE => $data[self::FIELD_CARDINALITY_BEHAVIOR]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CARDINALITY_BEHAVIOR])) { + $this->setCardinalityBehavior(new FHIRActionCardinalityBehavior([FHIRActionCardinalityBehavior::FIELD_VALUE => $data[self::FIELD_CARDINALITY_BEHAVIOR]] + $ext)); + } else if (is_array($data[self::FIELD_CARDINALITY_BEHAVIOR])) { + $this->setCardinalityBehavior(new FHIRActionCardinalityBehavior(array_merge($ext, $data[self::FIELD_CARDINALITY_BEHAVIOR]))); + } } else { $this->setCardinalityBehavior(new FHIRActionCardinalityBehavior($data[self::FIELD_CARDINALITY_BEHAVIOR])); } @@ -541,6 +548,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CODE])) { if (is_array($data[self::FIELD_CODE])) { foreach($data[self::FIELD_CODE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addCode($v); } else { @@ -556,6 +566,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CONDITION])) { if (is_array($data[self::FIELD_CONDITION])) { foreach($data[self::FIELD_CONDITION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRPlanDefinitionCondition) { $this->addCondition($v); } else { @@ -581,8 +594,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -590,6 +607,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_DOCUMENTATION])) { if (is_array($data[self::FIELD_DOCUMENTATION])) { foreach($data[self::FIELD_DOCUMENTATION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRRelatedArtifact) { $this->addDocumentation($v); } else { @@ -605,6 +625,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_DYNAMIC_VALUE])) { if (is_array($data[self::FIELD_DYNAMIC_VALUE])) { foreach($data[self::FIELD_DYNAMIC_VALUE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRPlanDefinitionDynamicValue) { $this->addDynamicValue($v); } else { @@ -623,17 +646,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_GOAL_ID])) { foreach($data[self::FIELD_GOAL_ID] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRId) { $this->addGoalId($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addGoalId(new FHIRId([FHIRId::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addGoalId(new FHIRId([FHIRId::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addGoalId(new FHIRId(array_merge($v, $ext[$i]))); + } } else { $this->addGoalId(new FHIRId($v)); } } } elseif ($data[self::FIELD_GOAL_ID] instanceof FHIRId) { $this->addGoalId($data[self::FIELD_GOAL_ID]); - } elseif ($ext && is_scalar($data[self::FIELD_GOAL_ID])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_GOAL_ID])) { $this->addGoalId(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_GOAL_ID]] + $ext)); } else { $this->addGoalId(new FHIRId($data[self::FIELD_GOAL_ID])); @@ -645,8 +675,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_GROUPING_BEHAVIOR] instanceof FHIRActionGroupingBehavior) { $this->setGroupingBehavior($data[self::FIELD_GROUPING_BEHAVIOR]); - } elseif ($ext && is_scalar($data[self::FIELD_GROUPING_BEHAVIOR])) { - $this->setGroupingBehavior(new FHIRActionGroupingBehavior([FHIRActionGroupingBehavior::FIELD_VALUE => $data[self::FIELD_GROUPING_BEHAVIOR]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_GROUPING_BEHAVIOR])) { + $this->setGroupingBehavior(new FHIRActionGroupingBehavior([FHIRActionGroupingBehavior::FIELD_VALUE => $data[self::FIELD_GROUPING_BEHAVIOR]] + $ext)); + } else if (is_array($data[self::FIELD_GROUPING_BEHAVIOR])) { + $this->setGroupingBehavior(new FHIRActionGroupingBehavior(array_merge($ext, $data[self::FIELD_GROUPING_BEHAVIOR]))); + } } else { $this->setGroupingBehavior(new FHIRActionGroupingBehavior($data[self::FIELD_GROUPING_BEHAVIOR])); } @@ -654,6 +688,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_INPUT])) { if (is_array($data[self::FIELD_INPUT])) { foreach($data[self::FIELD_INPUT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRDataRequirement) { $this->addInput($v); } else { @@ -672,8 +709,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_LABEL] instanceof FHIRString) { $this->setLabel($data[self::FIELD_LABEL]); - } elseif ($ext && is_scalar($data[self::FIELD_LABEL])) { - $this->setLabel(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_LABEL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_LABEL])) { + $this->setLabel(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_LABEL]] + $ext)); + } else if (is_array($data[self::FIELD_LABEL])) { + $this->setLabel(new FHIRString(array_merge($ext, $data[self::FIELD_LABEL]))); + } } else { $this->setLabel(new FHIRString($data[self::FIELD_LABEL])); } @@ -681,6 +722,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_OUTPUT])) { if (is_array($data[self::FIELD_OUTPUT])) { foreach($data[self::FIELD_OUTPUT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRDataRequirement) { $this->addOutput($v); } else { @@ -696,6 +740,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PARTICIPANT])) { if (is_array($data[self::FIELD_PARTICIPANT])) { foreach($data[self::FIELD_PARTICIPANT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRPlanDefinitionParticipant) { $this->addParticipant($v); } else { @@ -714,8 +761,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PRECHECK_BEHAVIOR] instanceof FHIRActionPrecheckBehavior) { $this->setPrecheckBehavior($data[self::FIELD_PRECHECK_BEHAVIOR]); - } elseif ($ext && is_scalar($data[self::FIELD_PRECHECK_BEHAVIOR])) { - $this->setPrecheckBehavior(new FHIRActionPrecheckBehavior([FHIRActionPrecheckBehavior::FIELD_VALUE => $data[self::FIELD_PRECHECK_BEHAVIOR]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PRECHECK_BEHAVIOR])) { + $this->setPrecheckBehavior(new FHIRActionPrecheckBehavior([FHIRActionPrecheckBehavior::FIELD_VALUE => $data[self::FIELD_PRECHECK_BEHAVIOR]] + $ext)); + } else if (is_array($data[self::FIELD_PRECHECK_BEHAVIOR])) { + $this->setPrecheckBehavior(new FHIRActionPrecheckBehavior(array_merge($ext, $data[self::FIELD_PRECHECK_BEHAVIOR]))); + } } else { $this->setPrecheckBehavior(new FHIRActionPrecheckBehavior($data[self::FIELD_PRECHECK_BEHAVIOR])); } @@ -723,6 +774,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REASON])) { if (is_array($data[self::FIELD_REASON])) { foreach($data[self::FIELD_REASON] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addReason($v); } else { @@ -738,6 +792,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_RELATED_ACTION])) { if (is_array($data[self::FIELD_RELATED_ACTION])) { foreach($data[self::FIELD_RELATED_ACTION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRPlanDefinitionRelatedAction) { $this->addRelatedAction($v); } else { @@ -756,8 +813,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_REQUIRED_BEHAVIOR] instanceof FHIRActionRequiredBehavior) { $this->setRequiredBehavior($data[self::FIELD_REQUIRED_BEHAVIOR]); - } elseif ($ext && is_scalar($data[self::FIELD_REQUIRED_BEHAVIOR])) { - $this->setRequiredBehavior(new FHIRActionRequiredBehavior([FHIRActionRequiredBehavior::FIELD_VALUE => $data[self::FIELD_REQUIRED_BEHAVIOR]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_REQUIRED_BEHAVIOR])) { + $this->setRequiredBehavior(new FHIRActionRequiredBehavior([FHIRActionRequiredBehavior::FIELD_VALUE => $data[self::FIELD_REQUIRED_BEHAVIOR]] + $ext)); + } else if (is_array($data[self::FIELD_REQUIRED_BEHAVIOR])) { + $this->setRequiredBehavior(new FHIRActionRequiredBehavior(array_merge($ext, $data[self::FIELD_REQUIRED_BEHAVIOR]))); + } } else { $this->setRequiredBehavior(new FHIRActionRequiredBehavior($data[self::FIELD_REQUIRED_BEHAVIOR])); } @@ -768,8 +829,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SELECTION_BEHAVIOR] instanceof FHIRActionSelectionBehavior) { $this->setSelectionBehavior($data[self::FIELD_SELECTION_BEHAVIOR]); - } elseif ($ext && is_scalar($data[self::FIELD_SELECTION_BEHAVIOR])) { - $this->setSelectionBehavior(new FHIRActionSelectionBehavior([FHIRActionSelectionBehavior::FIELD_VALUE => $data[self::FIELD_SELECTION_BEHAVIOR]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SELECTION_BEHAVIOR])) { + $this->setSelectionBehavior(new FHIRActionSelectionBehavior([FHIRActionSelectionBehavior::FIELD_VALUE => $data[self::FIELD_SELECTION_BEHAVIOR]] + $ext)); + } else if (is_array($data[self::FIELD_SELECTION_BEHAVIOR])) { + $this->setSelectionBehavior(new FHIRActionSelectionBehavior(array_merge($ext, $data[self::FIELD_SELECTION_BEHAVIOR]))); + } } else { $this->setSelectionBehavior(new FHIRActionSelectionBehavior($data[self::FIELD_SELECTION_BEHAVIOR])); } @@ -780,8 +845,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TEXT_EQUIVALENT] instanceof FHIRString) { $this->setTextEquivalent($data[self::FIELD_TEXT_EQUIVALENT]); - } elseif ($ext && is_scalar($data[self::FIELD_TEXT_EQUIVALENT])) { - $this->setTextEquivalent(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TEXT_EQUIVALENT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TEXT_EQUIVALENT])) { + $this->setTextEquivalent(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TEXT_EQUIVALENT]] + $ext)); + } else if (is_array($data[self::FIELD_TEXT_EQUIVALENT])) { + $this->setTextEquivalent(new FHIRString(array_merge($ext, $data[self::FIELD_TEXT_EQUIVALENT]))); + } } else { $this->setTextEquivalent(new FHIRString($data[self::FIELD_TEXT_EQUIVALENT])); } @@ -792,15 +861,28 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TIMING_DATE_TIME] instanceof FHIRDateTime) { $this->setTimingDateTime($data[self::FIELD_TIMING_DATE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_TIMING_DATE_TIME])) { - $this->setTimingDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_TIMING_DATE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TIMING_DATE_TIME])) { + $this->setTimingDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_TIMING_DATE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_TIMING_DATE_TIME])) { + $this->setTimingDateTime(new FHIRDateTime(array_merge($ext, $data[self::FIELD_TIMING_DATE_TIME]))); + } } else { $this->setTimingDateTime(new FHIRDateTime($data[self::FIELD_TIMING_DATE_TIME])); } } if (isset($data[self::FIELD_TIMING_DURATION])) { + $ext = (isset($data[self::FIELD_TIMING_DURATION_EXT]) && is_array($data[self::FIELD_TIMING_DURATION_EXT])) + ? $data[self::FIELD_TIMING_DURATION_EXT] + : null; if ($data[self::FIELD_TIMING_DURATION] instanceof FHIRDuration) { $this->setTimingDuration($data[self::FIELD_TIMING_DURATION]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TIMING_DURATION])) { + $this->setTimingDuration(new FHIRDuration([FHIRDuration::FIELD_VALUE => $data[self::FIELD_TIMING_DURATION]] + $ext)); + } else if (is_array($data[self::FIELD_TIMING_DURATION])) { + $this->setTimingDuration(new FHIRDuration(array_merge($ext, $data[self::FIELD_TIMING_DURATION]))); + } } else { $this->setTimingDuration(new FHIRDuration($data[self::FIELD_TIMING_DURATION])); } @@ -832,8 +914,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TITLE] instanceof FHIRString) { $this->setTitle($data[self::FIELD_TITLE]); - } elseif ($ext && is_scalar($data[self::FIELD_TITLE])) { - $this->setTitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TITLE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TITLE])) { + $this->setTitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TITLE]] + $ext)); + } else if (is_array($data[self::FIELD_TITLE])) { + $this->setTitle(new FHIRString(array_merge($ext, $data[self::FIELD_TITLE]))); + } } else { $this->setTitle(new FHIRString($data[self::FIELD_TITLE])); } @@ -848,6 +934,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_TRIGGER_DEFINITION])) { if (is_array($data[self::FIELD_TRIGGER_DEFINITION])) { foreach($data[self::FIELD_TRIGGER_DEFINITION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRTriggerDefinition) { $this->addTriggerDefinition($v); } else { @@ -2429,11 +2518,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_ACTION, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getCardinalityBehavior())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CARDINALITY_BEHAVIOR, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getCode())) { foreach($vs as $v) { if (null === $v) { @@ -2442,7 +2529,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getCondition())) { foreach($vs as $v) { if (null === $v) { @@ -2451,14 +2537,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_CONDITION, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getDefinition())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFINITION, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getDescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESCRIPTION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getDocumentation())) { foreach($vs as $v) { if (null === $v) { @@ -2467,7 +2551,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_DOCUMENTATION, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getDynamicValue())) { foreach($vs as $v) { if (null === $v) { @@ -2484,11 +2567,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_GOAL_ID, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getGroupingBehavior())) { $v->xmlSerialize($sxe->addChild(self::FIELD_GROUPING_BEHAVIOR, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getInput())) { foreach($vs as $v) { if (null === $v) { @@ -2500,7 +2581,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getLabel())) { $v->xmlSerialize($sxe->addChild(self::FIELD_LABEL, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getOutput())) { foreach($vs as $v) { if (null === $v) { @@ -2509,7 +2589,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_OUTPUT, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getParticipant())) { foreach($vs as $v) { if (null === $v) { @@ -2518,11 +2597,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_PARTICIPANT, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getPrecheckBehavior())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PRECHECK_BEHAVIOR, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getReason())) { foreach($vs as $v) { if (null === $v) { @@ -2531,7 +2608,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_REASON, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getRelatedAction())) { foreach($vs as $v) { if (null === $v) { @@ -2540,11 +2616,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_RELATED_ACTION, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getRequiredBehavior())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REQUIRED_BEHAVIOR, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSelectionBehavior())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SELECTION_BEHAVIOR, null, $v->_getFHIRXMLNamespace())); } @@ -2554,30 +2628,24 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getTimingDateTime())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TIMING_DATE_TIME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getTimingDuration())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TIMING_DURATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getTimingPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TIMING_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getTimingRange())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TIMING_RANGE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getTimingTiming())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TIMING_TIMING, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getTitle())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TITLE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getTransform())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TRANSFORM, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getTriggerDefinition())) { foreach($vs as $v) { if (null === $v) { @@ -2586,7 +2654,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_TRIGGER_DEFINITION, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -2603,7 +2670,15 @@ public function jsonSerialize() $a[self::FIELD_ACTION] = $vs; } if (null !== ($v = $this->getCardinalityBehavior())) { - $a[self::FIELD_CARDINALITY_BEHAVIOR] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CARDINALITY_BEHAVIOR] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CARDINALITY_BEHAVIOR_EXT] = $enc; + } + } else { + $a[self::FIELD_CARDINALITY_BEHAVIOR] = $v; + } } if ([] !== ($vs = $this->getCode())) { $a[self::FIELD_CODE] = $vs; @@ -2615,8 +2690,15 @@ public function jsonSerialize() $a[self::FIELD_DEFINITION] = $v; } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if ([] !== ($vs = $this->getDocumentation())) { $a[self::FIELD_DOCUMENTATION] = $vs; @@ -2630,19 +2712,43 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_GOAL_ID][] = $v->getValue(); - $a[self::FIELD_GOAL_ID_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_GOAL_ID][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_GOAL_ID_EXT][] = $enc; + } else { + $a[self::FIELD_GOAL_ID_EXT][] = null; + } + } else { + $a[self::FIELD_GOAL_ID][] = $v; + } } } if (null !== ($v = $this->getGroupingBehavior())) { - $a[self::FIELD_GROUPING_BEHAVIOR] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_GROUPING_BEHAVIOR] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_GROUPING_BEHAVIOR_EXT] = $enc; + } + } else { + $a[self::FIELD_GROUPING_BEHAVIOR] = $v; + } } if ([] !== ($vs = $this->getInput())) { $a[self::FIELD_INPUT] = $vs; } if (null !== ($v = $this->getLabel())) { - $a[self::FIELD_LABEL] = $v->getValue(); - $a[self::FIELD_LABEL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_LABEL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_LABEL_EXT] = $enc; + } + } else { + $a[self::FIELD_LABEL] = $v; + } } if ([] !== ($vs = $this->getOutput())) { $a[self::FIELD_OUTPUT] = $vs; @@ -2651,7 +2757,15 @@ public function jsonSerialize() $a[self::FIELD_PARTICIPANT] = $vs; } if (null !== ($v = $this->getPrecheckBehavior())) { - $a[self::FIELD_PRECHECK_BEHAVIOR] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PRECHECK_BEHAVIOR] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PRECHECK_BEHAVIOR_EXT] = $enc; + } + } else { + $a[self::FIELD_PRECHECK_BEHAVIOR] = $v; + } } if ([] !== ($vs = $this->getReason())) { $a[self::FIELD_REASON] = $vs; @@ -2660,21 +2774,59 @@ public function jsonSerialize() $a[self::FIELD_RELATED_ACTION] = $vs; } if (null !== ($v = $this->getRequiredBehavior())) { - $a[self::FIELD_REQUIRED_BEHAVIOR] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_REQUIRED_BEHAVIOR] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_REQUIRED_BEHAVIOR_EXT] = $enc; + } + } else { + $a[self::FIELD_REQUIRED_BEHAVIOR] = $v; + } } if (null !== ($v = $this->getSelectionBehavior())) { - $a[self::FIELD_SELECTION_BEHAVIOR] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SELECTION_BEHAVIOR] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SELECTION_BEHAVIOR_EXT] = $enc; + } + } else { + $a[self::FIELD_SELECTION_BEHAVIOR] = $v; + } } if (null !== ($v = $this->getTextEquivalent())) { - $a[self::FIELD_TEXT_EQUIVALENT] = $v->getValue(); - $a[self::FIELD_TEXT_EQUIVALENT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TEXT_EQUIVALENT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TEXT_EQUIVALENT_EXT] = $enc; + } + } else { + $a[self::FIELD_TEXT_EQUIVALENT] = $v; + } } if (null !== ($v = $this->getTimingDateTime())) { - $a[self::FIELD_TIMING_DATE_TIME] = $v->getValue(); - $a[self::FIELD_TIMING_DATE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TIMING_DATE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TIMING_DATE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_TIMING_DATE_TIME] = $v; + } } if (null !== ($v = $this->getTimingDuration())) { - $a[self::FIELD_TIMING_DURATION] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TIMING_DURATION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TIMING_DURATION_EXT] = $enc; + } + } else { + $a[self::FIELD_TIMING_DURATION] = $v; + } } if (null !== ($v = $this->getTimingPeriod())) { $a[self::FIELD_TIMING_PERIOD] = $v; @@ -2686,8 +2838,15 @@ public function jsonSerialize() $a[self::FIELD_TIMING_TIMING] = $v; } if (null !== ($v = $this->getTitle())) { - $a[self::FIELD_TITLE] = $v->getValue(); - $a[self::FIELD_TITLE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TITLE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TITLE_EXT] = $enc; + } + } else { + $a[self::FIELD_TITLE] = $v; + } } if (null !== ($v = $this->getTransform())) { $a[self::FIELD_TRANSFORM] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRPlanDefinition/FHIRPlanDefinitionCondition.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRPlanDefinition/FHIRPlanDefinitionCondition.php index e6e84fa308..8ff31c1c74 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRPlanDefinition/FHIRPlanDefinitionCondition.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRPlanDefinition/FHIRPlanDefinitionCondition.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -81,10 +81,6 @@ class FHIRPlanDefinitionCondition extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_PLAN_DEFINITION_DOT_CONDITION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DESCRIPTION = 'description'; const FIELD_DESCRIPTION_EXT = '_description'; const FIELD_EXPRESSION = 'expression'; @@ -139,6 +135,9 @@ class FHIRPlanDefinitionCondition extends FHIRBackboneElement */ protected $language = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRPlanDefinitionCondition Constructor * @param null|array $data @@ -161,8 +160,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -173,8 +176,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EXPRESSION] instanceof FHIRString) { $this->setExpression($data[self::FIELD_EXPRESSION]); - } elseif ($ext && is_scalar($data[self::FIELD_EXPRESSION])) { - $this->setExpression(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_EXPRESSION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EXPRESSION])) { + $this->setExpression(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_EXPRESSION]] + $ext)); + } else if (is_array($data[self::FIELD_EXPRESSION])) { + $this->setExpression(new FHIRString(array_merge($ext, $data[self::FIELD_EXPRESSION]))); + } } else { $this->setExpression(new FHIRString($data[self::FIELD_EXPRESSION])); } @@ -185,8 +192,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_KIND] instanceof FHIRActionConditionKind) { $this->setKind($data[self::FIELD_KIND]); - } elseif ($ext && is_scalar($data[self::FIELD_KIND])) { - $this->setKind(new FHIRActionConditionKind([FHIRActionConditionKind::FIELD_VALUE => $data[self::FIELD_KIND]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_KIND])) { + $this->setKind(new FHIRActionConditionKind([FHIRActionConditionKind::FIELD_VALUE => $data[self::FIELD_KIND]] + $ext)); + } else if (is_array($data[self::FIELD_KIND])) { + $this->setKind(new FHIRActionConditionKind(array_merge($ext, $data[self::FIELD_KIND]))); + } } else { $this->setKind(new FHIRActionConditionKind($data[self::FIELD_KIND])); } @@ -197,8 +208,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_LANGUAGE] instanceof FHIRString) { $this->setLanguage($data[self::FIELD_LANGUAGE]); - } elseif ($ext && is_scalar($data[self::FIELD_LANGUAGE])) { - $this->setLanguage(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_LANGUAGE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_LANGUAGE])) { + $this->setLanguage(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_LANGUAGE]] + $ext)); + } else if (is_array($data[self::FIELD_LANGUAGE])) { + $this->setLanguage(new FHIRString(array_merge($ext, $data[self::FIELD_LANGUAGE]))); + } } else { $this->setLanguage(new FHIRString($data[self::FIELD_LANGUAGE])); } @@ -471,13 +486,13 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getDescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESCRIPTION, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getExpression())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EXPRESSION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getKind())) { $v->xmlSerialize($sxe->addChild(self::FIELD_KIND, null, $v->_getFHIRXMLNamespace())); } @@ -494,19 +509,48 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if (null !== ($v = $this->getExpression())) { - $a[self::FIELD_EXPRESSION] = $v->getValue(); - $a[self::FIELD_EXPRESSION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EXPRESSION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EXPRESSION_EXT] = $enc; + } + } else { + $a[self::FIELD_EXPRESSION] = $v; + } } if (null !== ($v = $this->getKind())) { - $a[self::FIELD_KIND] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_KIND] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_KIND_EXT] = $enc; + } + } else { + $a[self::FIELD_KIND] = $v; + } } if (null !== ($v = $this->getLanguage())) { - $a[self::FIELD_LANGUAGE] = $v->getValue(); - $a[self::FIELD_LANGUAGE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_LANGUAGE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_LANGUAGE_EXT] = $enc; + } + } else { + $a[self::FIELD_LANGUAGE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRPlanDefinition/FHIRPlanDefinitionDynamicValue.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRPlanDefinition/FHIRPlanDefinitionDynamicValue.php index 3e990dfd58..cccce910a4 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRPlanDefinition/FHIRPlanDefinitionDynamicValue.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRPlanDefinition/FHIRPlanDefinitionDynamicValue.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRPlanDefinitionDynamicValue extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_PLAN_DEFINITION_DOT_DYNAMIC_VALUE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DESCRIPTION = 'description'; const FIELD_DESCRIPTION_EXT = '_description'; const FIELD_EXPRESSION = 'expression'; @@ -139,6 +135,9 @@ class FHIRPlanDefinitionDynamicValue extends FHIRBackboneElement */ protected $path = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRPlanDefinitionDynamicValue Constructor * @param null|array $data @@ -161,8 +160,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -173,8 +176,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EXPRESSION] instanceof FHIRString) { $this->setExpression($data[self::FIELD_EXPRESSION]); - } elseif ($ext && is_scalar($data[self::FIELD_EXPRESSION])) { - $this->setExpression(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_EXPRESSION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EXPRESSION])) { + $this->setExpression(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_EXPRESSION]] + $ext)); + } else if (is_array($data[self::FIELD_EXPRESSION])) { + $this->setExpression(new FHIRString(array_merge($ext, $data[self::FIELD_EXPRESSION]))); + } } else { $this->setExpression(new FHIRString($data[self::FIELD_EXPRESSION])); } @@ -185,8 +192,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_LANGUAGE] instanceof FHIRString) { $this->setLanguage($data[self::FIELD_LANGUAGE]); - } elseif ($ext && is_scalar($data[self::FIELD_LANGUAGE])) { - $this->setLanguage(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_LANGUAGE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_LANGUAGE])) { + $this->setLanguage(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_LANGUAGE]] + $ext)); + } else if (is_array($data[self::FIELD_LANGUAGE])) { + $this->setLanguage(new FHIRString(array_merge($ext, $data[self::FIELD_LANGUAGE]))); + } } else { $this->setLanguage(new FHIRString($data[self::FIELD_LANGUAGE])); } @@ -197,8 +208,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PATH] instanceof FHIRString) { $this->setPath($data[self::FIELD_PATH]); - } elseif ($ext && is_scalar($data[self::FIELD_PATH])) { - $this->setPath(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PATH]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PATH])) { + $this->setPath(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PATH]] + $ext)); + } else if (is_array($data[self::FIELD_PATH])) { + $this->setPath(new FHIRString(array_merge($ext, $data[self::FIELD_PATH]))); + } } else { $this->setPath(new FHIRString($data[self::FIELD_PATH])); } @@ -484,6 +499,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getDescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESCRIPTION, null, $v->_getFHIRXMLNamespace())); } @@ -506,20 +522,48 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if (null !== ($v = $this->getExpression())) { - $a[self::FIELD_EXPRESSION] = $v->getValue(); - $a[self::FIELD_EXPRESSION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EXPRESSION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EXPRESSION_EXT] = $enc; + } + } else { + $a[self::FIELD_EXPRESSION] = $v; + } } if (null !== ($v = $this->getLanguage())) { - $a[self::FIELD_LANGUAGE] = $v->getValue(); - $a[self::FIELD_LANGUAGE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_LANGUAGE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_LANGUAGE_EXT] = $enc; + } + } else { + $a[self::FIELD_LANGUAGE] = $v; + } } if (null !== ($v = $this->getPath())) { - $a[self::FIELD_PATH] = $v->getValue(); - $a[self::FIELD_PATH_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PATH] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PATH_EXT] = $enc; + } + } else { + $a[self::FIELD_PATH] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRPlanDefinition/FHIRPlanDefinitionGoal.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRPlanDefinition/FHIRPlanDefinitionGoal.php index f855d76666..c08ac7baf7 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRPlanDefinition/FHIRPlanDefinitionGoal.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRPlanDefinition/FHIRPlanDefinitionGoal.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -81,10 +81,6 @@ class FHIRPlanDefinitionGoal extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_PLAN_DEFINITION_DOT_GOAL; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ADDRESSES = 'addresses'; const FIELD_CATEGORY = 'category'; const FIELD_DESCRIPTION = 'description'; @@ -183,6 +179,9 @@ class FHIRPlanDefinitionGoal extends FHIRBackboneElement */ protected $target = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRPlanDefinitionGoal Constructor * @param null|array $data @@ -202,6 +201,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ADDRESSES])) { if (is_array($data[self::FIELD_ADDRESSES])) { foreach($data[self::FIELD_ADDRESSES] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addAddresses($v); } else { @@ -231,6 +233,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_DOCUMENTATION])) { if (is_array($data[self::FIELD_DOCUMENTATION])) { foreach($data[self::FIELD_DOCUMENTATION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRRelatedArtifact) { $this->addDocumentation($v); } else { @@ -260,6 +265,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_TARGET])) { if (is_array($data[self::FIELD_TARGET])) { foreach($data[self::FIELD_TARGET] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRPlanDefinitionTarget) { $this->addTarget($v); } else { @@ -729,15 +737,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_ADDRESSES, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getCategory())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CATEGORY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESCRIPTION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getDocumentation())) { foreach($vs as $v) { if (null === $v) { @@ -746,15 +751,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_DOCUMENTATION, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getPriority())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PRIORITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStart())) { $v->xmlSerialize($sxe->addChild(self::FIELD_START, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getTarget())) { foreach($vs as $v) { if (null === $v) { diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRPlanDefinition/FHIRPlanDefinitionParticipant.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRPlanDefinition/FHIRPlanDefinitionParticipant.php index 92e173a7bf..34c6f9672f 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRPlanDefinition/FHIRPlanDefinitionParticipant.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRPlanDefinition/FHIRPlanDefinitionParticipant.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -81,10 +81,6 @@ class FHIRPlanDefinitionParticipant extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_PLAN_DEFINITION_DOT_PARTICIPANT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ROLE = 'role'; const FIELD_TYPE = 'type'; const FIELD_TYPE_EXT = '_type'; @@ -111,6 +107,9 @@ class FHIRPlanDefinitionParticipant extends FHIRBackboneElement */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRPlanDefinitionParticipant Constructor * @param null|array $data @@ -140,8 +139,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TYPE] instanceof FHIRActionParticipantType) { $this->setType($data[self::FIELD_TYPE]); - } elseif ($ext && is_scalar($data[self::FIELD_TYPE])) { - $this->setType(new FHIRActionParticipantType([FHIRActionParticipantType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TYPE])) { + $this->setType(new FHIRActionParticipantType([FHIRActionParticipantType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } else if (is_array($data[self::FIELD_TYPE])) { + $this->setType(new FHIRActionParticipantType(array_merge($ext, $data[self::FIELD_TYPE]))); + } } else { $this->setType(new FHIRActionParticipantType($data[self::FIELD_TYPE])); } @@ -317,7 +320,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getRole())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ROLE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -334,7 +336,15 @@ public function jsonSerialize() $a[self::FIELD_ROLE] = $v; } if (null !== ($v = $this->getType())) { - $a[self::FIELD_TYPE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TYPE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TYPE_EXT] = $enc; + } + } else { + $a[self::FIELD_TYPE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRPlanDefinition/FHIRPlanDefinitionRelatedAction.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRPlanDefinition/FHIRPlanDefinitionRelatedAction.php index 815aaa197d..7f5a744c51 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRPlanDefinition/FHIRPlanDefinitionRelatedAction.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRPlanDefinition/FHIRPlanDefinitionRelatedAction.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -83,13 +83,10 @@ class FHIRPlanDefinitionRelatedAction extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_PLAN_DEFINITION_DOT_RELATED_ACTION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ACTION_ID = 'actionId'; const FIELD_ACTION_ID_EXT = '_actionId'; const FIELD_OFFSET_DURATION = 'offsetDuration'; + const FIELD_OFFSET_DURATION_EXT = '_offsetDuration'; const FIELD_OFFSET_RANGE = 'offsetRange'; const FIELD_RELATIONSHIP = 'relationship'; const FIELD_RELATIONSHIP_EXT = '_relationship'; @@ -142,6 +139,9 @@ class FHIRPlanDefinitionRelatedAction extends FHIRBackboneElement */ protected $relationship = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRPlanDefinitionRelatedAction Constructor * @param null|array $data @@ -164,15 +164,28 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ACTION_ID] instanceof FHIRId) { $this->setActionId($data[self::FIELD_ACTION_ID]); - } elseif ($ext && is_scalar($data[self::FIELD_ACTION_ID])) { - $this->setActionId(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_ACTION_ID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ACTION_ID])) { + $this->setActionId(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_ACTION_ID]] + $ext)); + } else if (is_array($data[self::FIELD_ACTION_ID])) { + $this->setActionId(new FHIRId(array_merge($ext, $data[self::FIELD_ACTION_ID]))); + } } else { $this->setActionId(new FHIRId($data[self::FIELD_ACTION_ID])); } } if (isset($data[self::FIELD_OFFSET_DURATION])) { + $ext = (isset($data[self::FIELD_OFFSET_DURATION_EXT]) && is_array($data[self::FIELD_OFFSET_DURATION_EXT])) + ? $data[self::FIELD_OFFSET_DURATION_EXT] + : null; if ($data[self::FIELD_OFFSET_DURATION] instanceof FHIRDuration) { $this->setOffsetDuration($data[self::FIELD_OFFSET_DURATION]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_OFFSET_DURATION])) { + $this->setOffsetDuration(new FHIRDuration([FHIRDuration::FIELD_VALUE => $data[self::FIELD_OFFSET_DURATION]] + $ext)); + } else if (is_array($data[self::FIELD_OFFSET_DURATION])) { + $this->setOffsetDuration(new FHIRDuration(array_merge($ext, $data[self::FIELD_OFFSET_DURATION]))); + } } else { $this->setOffsetDuration(new FHIRDuration($data[self::FIELD_OFFSET_DURATION])); } @@ -190,8 +203,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_RELATIONSHIP] instanceof FHIRActionRelationshipType) { $this->setRelationship($data[self::FIELD_RELATIONSHIP]); - } elseif ($ext && is_scalar($data[self::FIELD_RELATIONSHIP])) { - $this->setRelationship(new FHIRActionRelationshipType([FHIRActionRelationshipType::FIELD_VALUE => $data[self::FIELD_RELATIONSHIP]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_RELATIONSHIP])) { + $this->setRelationship(new FHIRActionRelationshipType([FHIRActionRelationshipType::FIELD_VALUE => $data[self::FIELD_RELATIONSHIP]] + $ext)); + } else if (is_array($data[self::FIELD_RELATIONSHIP])) { + $this->setRelationship(new FHIRActionRelationshipType(array_merge($ext, $data[self::FIELD_RELATIONSHIP]))); + } } else { $this->setRelationship(new FHIRActionRelationshipType($data[self::FIELD_RELATIONSHIP])); } @@ -448,18 +465,16 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getActionId())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ACTION_ID, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOffsetDuration())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OFFSET_DURATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOffsetRange())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OFFSET_RANGE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRelationship())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RELATIONSHIP, null, $v->_getFHIRXMLNamespace())); } @@ -473,17 +488,40 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getActionId())) { - $a[self::FIELD_ACTION_ID] = $v->getValue(); - $a[self::FIELD_ACTION_ID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ACTION_ID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ACTION_ID_EXT] = $enc; + } + } else { + $a[self::FIELD_ACTION_ID] = $v; + } } if (null !== ($v = $this->getOffsetDuration())) { - $a[self::FIELD_OFFSET_DURATION] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_OFFSET_DURATION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_OFFSET_DURATION_EXT] = $enc; + } + } else { + $a[self::FIELD_OFFSET_DURATION] = $v; + } } if (null !== ($v = $this->getOffsetRange())) { $a[self::FIELD_OFFSET_RANGE] = $v; } if (null !== ($v = $this->getRelationship())) { - $a[self::FIELD_RELATIONSHIP] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_RELATIONSHIP] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_RELATIONSHIP_EXT] = $enc; + } + } else { + $a[self::FIELD_RELATIONSHIP] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRPlanDefinition/FHIRPlanDefinitionTarget.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRPlanDefinition/FHIRPlanDefinitionTarget.php index 2cc1010c83..ea12e42e8b 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRPlanDefinition/FHIRPlanDefinitionTarget.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRPlanDefinition/FHIRPlanDefinitionTarget.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -83,15 +83,12 @@ class FHIRPlanDefinitionTarget extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_PLAN_DEFINITION_DOT_TARGET; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DETAIL_CODEABLE_CONCEPT = 'detailCodeableConcept'; const FIELD_DETAIL_QUANTITY = 'detailQuantity'; const FIELD_DETAIL_QUANTITY_EXT = '_detailQuantity'; const FIELD_DETAIL_RANGE = 'detailRange'; const FIELD_DUE = 'due'; + const FIELD_DUE_EXT = '_due'; const FIELD_MEASURE = 'measure'; /** @@ -170,6 +167,9 @@ class FHIRPlanDefinitionTarget extends FHIRBackboneElement */ protected $measure = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRPlanDefinitionTarget Constructor * @param null|array $data @@ -199,8 +199,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DETAIL_QUANTITY] instanceof FHIRQuantity) { $this->setDetailQuantity($data[self::FIELD_DETAIL_QUANTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_DETAIL_QUANTITY])) { - $this->setDetailQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_DETAIL_QUANTITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DETAIL_QUANTITY])) { + $this->setDetailQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_DETAIL_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_DETAIL_QUANTITY])) { + $this->setDetailQuantity(new FHIRQuantity(array_merge($ext, $data[self::FIELD_DETAIL_QUANTITY]))); + } } else { $this->setDetailQuantity(new FHIRQuantity($data[self::FIELD_DETAIL_QUANTITY])); } @@ -213,8 +217,17 @@ public function __construct($data = null) } } if (isset($data[self::FIELD_DUE])) { + $ext = (isset($data[self::FIELD_DUE_EXT]) && is_array($data[self::FIELD_DUE_EXT])) + ? $data[self::FIELD_DUE_EXT] + : null; if ($data[self::FIELD_DUE] instanceof FHIRDuration) { $this->setDue($data[self::FIELD_DUE]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DUE])) { + $this->setDue(new FHIRDuration([FHIRDuration::FIELD_VALUE => $data[self::FIELD_DUE]] + $ext)); + } else if (is_array($data[self::FIELD_DUE])) { + $this->setDue(new FHIRDuration(array_merge($ext, $data[self::FIELD_DUE]))); + } } else { $this->setDue(new FHIRDuration($data[self::FIELD_DUE])); } @@ -538,19 +551,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDetailCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DETAIL_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDetailQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DETAIL_QUANTITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDetailRange())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DETAIL_RANGE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDue())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DUE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getMeasure())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MEASURE, null, $v->_getFHIRXMLNamespace())); } @@ -567,13 +576,29 @@ public function jsonSerialize() $a[self::FIELD_DETAIL_CODEABLE_CONCEPT] = $v; } if (null !== ($v = $this->getDetailQuantity())) { - $a[self::FIELD_DETAIL_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DETAIL_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DETAIL_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_DETAIL_QUANTITY] = $v; + } } if (null !== ($v = $this->getDetailRange())) { $a[self::FIELD_DETAIL_RANGE] = $v; } if (null !== ($v = $this->getDue())) { - $a[self::FIELD_DUE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DUE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DUE_EXT] = $enc; + } + } else { + $a[self::FIELD_DUE] = $v; + } } if (null !== ($v = $this->getMeasure())) { $a[self::FIELD_MEASURE] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRPractitioner/FHIRPractitionerQualification.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRPractitioner/FHIRPractitionerQualification.php index 50f7122720..9d3df5af47 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRPractitioner/FHIRPractitionerQualification.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRPractitioner/FHIRPractitionerQualification.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -81,10 +81,6 @@ class FHIRPractitionerQualification extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_PRACTITIONER_DOT_QUALIFICATION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CODE = 'code'; const FIELD_IDENTIFIER = 'identifier'; const FIELD_IDENTIFIER_EXT = '_identifier'; @@ -136,6 +132,9 @@ class FHIRPractitionerQualification extends FHIRBackboneElement */ protected $period = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRPractitionerQualification Constructor * @param null|array $data @@ -165,17 +164,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -462,7 +468,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -471,11 +476,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getIssuer())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ISSUER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PERIOD, null, $v->_getFHIRXMLNamespace())); } @@ -492,7 +495,23 @@ public function jsonSerialize() $a[self::FIELD_CODE] = $v; } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if (null !== ($v = $this->getIssuer())) { $a[self::FIELD_ISSUER] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRPractitionerRole/FHIRPractitionerRoleAvailableTime.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRPractitionerRole/FHIRPractitionerRoleAvailableTime.php index 724c6541f0..a8c2ea2e4e 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRPractitionerRole/FHIRPractitionerRoleAvailableTime.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRPractitionerRole/FHIRPractitionerRoleAvailableTime.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRPractitionerRoleAvailableTime extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_PRACTITIONER_ROLE_DOT_AVAILABLE_TIME; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ALL_DAY = 'allDay'; const FIELD_ALL_DAY_EXT = '_allDay'; const FIELD_AVAILABLE_END_TIME = 'availableEndTime'; @@ -135,6 +131,9 @@ class FHIRPractitionerRoleAvailableTime extends FHIRBackboneElement */ protected $daysOfWeek = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRPractitionerRoleAvailableTime Constructor * @param null|array $data @@ -157,8 +156,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ALL_DAY] instanceof FHIRBoolean) { $this->setAllDay($data[self::FIELD_ALL_DAY]); - } elseif ($ext && is_scalar($data[self::FIELD_ALL_DAY])) { - $this->setAllDay(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_ALL_DAY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ALL_DAY])) { + $this->setAllDay(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_ALL_DAY]] + $ext)); + } else if (is_array($data[self::FIELD_ALL_DAY])) { + $this->setAllDay(new FHIRBoolean(array_merge($ext, $data[self::FIELD_ALL_DAY]))); + } } else { $this->setAllDay(new FHIRBoolean($data[self::FIELD_ALL_DAY])); } @@ -169,8 +172,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_AVAILABLE_END_TIME] instanceof FHIRTime) { $this->setAvailableEndTime($data[self::FIELD_AVAILABLE_END_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_AVAILABLE_END_TIME])) { - $this->setAvailableEndTime(new FHIRTime([FHIRTime::FIELD_VALUE => $data[self::FIELD_AVAILABLE_END_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_AVAILABLE_END_TIME])) { + $this->setAvailableEndTime(new FHIRTime([FHIRTime::FIELD_VALUE => $data[self::FIELD_AVAILABLE_END_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_AVAILABLE_END_TIME])) { + $this->setAvailableEndTime(new FHIRTime(array_merge($ext, $data[self::FIELD_AVAILABLE_END_TIME]))); + } } else { $this->setAvailableEndTime(new FHIRTime($data[self::FIELD_AVAILABLE_END_TIME])); } @@ -181,8 +188,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_AVAILABLE_START_TIME] instanceof FHIRTime) { $this->setAvailableStartTime($data[self::FIELD_AVAILABLE_START_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_AVAILABLE_START_TIME])) { - $this->setAvailableStartTime(new FHIRTime([FHIRTime::FIELD_VALUE => $data[self::FIELD_AVAILABLE_START_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_AVAILABLE_START_TIME])) { + $this->setAvailableStartTime(new FHIRTime([FHIRTime::FIELD_VALUE => $data[self::FIELD_AVAILABLE_START_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_AVAILABLE_START_TIME])) { + $this->setAvailableStartTime(new FHIRTime(array_merge($ext, $data[self::FIELD_AVAILABLE_START_TIME]))); + } } else { $this->setAvailableStartTime(new FHIRTime($data[self::FIELD_AVAILABLE_START_TIME])); } @@ -193,17 +204,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_DAYS_OF_WEEK])) { foreach($data[self::FIELD_DAYS_OF_WEEK] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRDaysOfWeek) { $this->addDaysOfWeek($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addDaysOfWeek(new FHIRDaysOfWeek([FHIRDaysOfWeek::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addDaysOfWeek(new FHIRDaysOfWeek([FHIRDaysOfWeek::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addDaysOfWeek(new FHIRDaysOfWeek(array_merge($v, $ext[$i]))); + } } else { $this->addDaysOfWeek(new FHIRDaysOfWeek($v)); } } } elseif ($data[self::FIELD_DAYS_OF_WEEK] instanceof FHIRDaysOfWeek) { $this->addDaysOfWeek($data[self::FIELD_DAYS_OF_WEEK]); - } elseif ($ext && is_scalar($data[self::FIELD_DAYS_OF_WEEK])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_DAYS_OF_WEEK])) { $this->addDaysOfWeek(new FHIRDaysOfWeek([FHIRDaysOfWeek::FIELD_VALUE => $data[self::FIELD_DAYS_OF_WEEK]] + $ext)); } else { $this->addDaysOfWeek(new FHIRDaysOfWeek($data[self::FIELD_DAYS_OF_WEEK])); @@ -498,6 +516,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getAllDay())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ALL_DAY, null, $v->_getFHIRXMLNamespace())); } @@ -507,7 +526,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getAvailableStartTime())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AVAILABLE_START_TIME, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getDaysOfWeek())) { foreach($vs as $v) { if (null === $v) { @@ -526,19 +544,56 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getAllDay())) { - $a[self::FIELD_ALL_DAY] = $v->getValue(); - $a[self::FIELD_ALL_DAY_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ALL_DAY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ALL_DAY_EXT] = $enc; + } + } else { + $a[self::FIELD_ALL_DAY] = $v; + } } if (null !== ($v = $this->getAvailableEndTime())) { - $a[self::FIELD_AVAILABLE_END_TIME] = $v->getValue(); - $a[self::FIELD_AVAILABLE_END_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_AVAILABLE_END_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_AVAILABLE_END_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_AVAILABLE_END_TIME] = $v; + } } if (null !== ($v = $this->getAvailableStartTime())) { - $a[self::FIELD_AVAILABLE_START_TIME] = $v->getValue(); - $a[self::FIELD_AVAILABLE_START_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_AVAILABLE_START_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_AVAILABLE_START_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_AVAILABLE_START_TIME] = $v; + } } if ([] !== ($vs = $this->getDaysOfWeek())) { - $a[self::FIELD_DAYS_OF_WEEK] = $vs; + $a[self::FIELD_DAYS_OF_WEEK] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DAYS_OF_WEEK][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DAYS_OF_WEEK_EXT][] = $enc; + } else { + $a[self::FIELD_DAYS_OF_WEEK_EXT][] = null; + } + } else { + $a[self::FIELD_DAYS_OF_WEEK][] = $v; + } + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRPractitionerRole/FHIRPractitionerRoleNotAvailable.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRPractitionerRole/FHIRPractitionerRoleNotAvailable.php index 675ec09c9b..5cebf0f366 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRPractitionerRole/FHIRPractitionerRoleNotAvailable.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRPractitionerRole/FHIRPractitionerRoleNotAvailable.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRPractitionerRoleNotAvailable extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_PRACTITIONER_ROLE_DOT_NOT_AVAILABLE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DESCRIPTION = 'description'; const FIELD_DESCRIPTION_EXT = '_description'; const FIELD_DURING = 'during'; @@ -110,6 +106,9 @@ class FHIRPractitionerRoleNotAvailable extends FHIRBackboneElement */ protected $during = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRPractitionerRoleNotAvailable Constructor * @param null|array $data @@ -132,8 +131,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -325,10 +328,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getDescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESCRIPTION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDuring())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DURING, null, $v->_getFHIRXMLNamespace())); } @@ -342,8 +345,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if (null !== ($v = $this->getDuring())) { $a[self::FIELD_DURING] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRProcedure/FHIRProcedureFocalDevice.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRProcedure/FHIRProcedureFocalDevice.php index 9d1dcf895c..bbbc36339a 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRProcedure/FHIRProcedureFocalDevice.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRProcedure/FHIRProcedureFocalDevice.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRProcedureFocalDevice extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_PROCEDURE_DOT_FOCAL_DEVICE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ACTION = 'action'; const FIELD_MANIPULATED = 'manipulated'; @@ -110,6 +106,9 @@ class FHIRProcedureFocalDevice extends FHIRBackboneElement */ protected $manipulated = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRProcedureFocalDevice Constructor * @param null|array $data @@ -313,7 +312,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getAction())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ACTION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getManipulated())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MANIPULATED, null, $v->_getFHIRXMLNamespace())); } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRProcedure/FHIRProcedurePerformer.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRProcedure/FHIRProcedurePerformer.php index aab5206992..2061874a67 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRProcedure/FHIRProcedurePerformer.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRProcedure/FHIRProcedurePerformer.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRProcedurePerformer extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_PROCEDURE_DOT_PERFORMER; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ACTOR = 'actor'; const FIELD_ON_BEHALF_OF = 'onBehalfOf'; const FIELD_ROLE = 'role'; @@ -122,6 +118,9 @@ class FHIRProcedurePerformer extends FHIRBackboneElement */ protected $role = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRProcedurePerformer Constructor * @param null|array $data @@ -365,11 +364,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getActor())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ACTOR, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOnBehalfOf())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ON_BEHALF_OF, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRole())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ROLE, null, $v->_getFHIRXMLNamespace())); } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRProcedureRequest/FHIRProcedureRequestRequester.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRProcedureRequest/FHIRProcedureRequestRequester.php index 2468e70cfa..1f82dcc0b5 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRProcedureRequest/FHIRProcedureRequestRequester.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRProcedureRequest/FHIRProcedureRequestRequester.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRProcedureRequestRequester extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_PROCEDURE_REQUEST_DOT_REQUESTER; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_AGENT = 'agent'; const FIELD_ON_BEHALF_OF = 'onBehalfOf'; @@ -107,6 +103,9 @@ class FHIRProcedureRequestRequester extends FHIRBackboneElement */ protected $onBehalfOf = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRProcedureRequestRequester Constructor * @param null|array $data @@ -308,7 +307,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getAgent())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AGENT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOnBehalfOf())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ON_BEHALF_OF, null, $v->_getFHIRXMLNamespace())); } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRProcessRequest/FHIRProcessRequestItem.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRProcessRequest/FHIRProcessRequestItem.php index 94b02e2868..5c6594c9aa 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRProcessRequest/FHIRProcessRequestItem.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRProcessRequest/FHIRProcessRequestItem.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRProcessRequestItem extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_PROCESS_REQUEST_DOT_ITEM; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_SEQUENCE_LINK_ID = 'sequenceLinkId'; const FIELD_SEQUENCE_LINK_ID_EXT = '_sequenceLinkId'; @@ -96,6 +92,9 @@ class FHIRProcessRequestItem extends FHIRBackboneElement */ protected $sequenceLinkId = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRProcessRequestItem Constructor * @param null|array $data @@ -118,8 +117,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SEQUENCE_LINK_ID] instanceof FHIRInteger) { $this->setSequenceLinkId($data[self::FIELD_SEQUENCE_LINK_ID]); - } elseif ($ext && is_scalar($data[self::FIELD_SEQUENCE_LINK_ID])) { - $this->setSequenceLinkId(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_SEQUENCE_LINK_ID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SEQUENCE_LINK_ID])) { + $this->setSequenceLinkId(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_SEQUENCE_LINK_ID]] + $ext)); + } else if (is_array($data[self::FIELD_SEQUENCE_LINK_ID])) { + $this->setSequenceLinkId(new FHIRInteger(array_merge($ext, $data[self::FIELD_SEQUENCE_LINK_ID]))); + } } else { $this->setSequenceLinkId(new FHIRInteger($data[self::FIELD_SEQUENCE_LINK_ID])); } @@ -269,6 +272,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getSequenceLinkId())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SEQUENCE_LINK_ID, null, $v->_getFHIRXMLNamespace())); } @@ -282,8 +286,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getSequenceLinkId())) { - $a[self::FIELD_SEQUENCE_LINK_ID] = $v->getValue(); - $a[self::FIELD_SEQUENCE_LINK_ID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SEQUENCE_LINK_ID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SEQUENCE_LINK_ID_EXT] = $enc; + } + } else { + $a[self::FIELD_SEQUENCE_LINK_ID] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRProcessResponse/FHIRProcessResponseProcessNote.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRProcessResponse/FHIRProcessResponseProcessNote.php index a461c349b6..65f7d3d223 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRProcessResponse/FHIRProcessResponseProcessNote.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRProcessResponse/FHIRProcessResponseProcessNote.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRProcessResponseProcessNote extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_PROCESS_RESPONSE_DOT_PROCESS_NOTE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_TEXT = 'text'; const FIELD_TEXT_EXT = '_text'; const FIELD_TYPE = 'type'; @@ -110,6 +106,9 @@ class FHIRProcessResponseProcessNote extends FHIRBackboneElement */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRProcessResponseProcessNote Constructor * @param null|array $data @@ -132,8 +131,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TEXT] instanceof FHIRString) { $this->setText($data[self::FIELD_TEXT]); - } elseif ($ext && is_scalar($data[self::FIELD_TEXT])) { - $this->setText(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TEXT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TEXT])) { + $this->setText(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TEXT]] + $ext)); + } else if (is_array($data[self::FIELD_TEXT])) { + $this->setText(new FHIRString(array_merge($ext, $data[self::FIELD_TEXT]))); + } } else { $this->setText(new FHIRString($data[self::FIELD_TEXT])); } @@ -325,10 +328,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getText())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TEXT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -342,8 +345,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getText())) { - $a[self::FIELD_TEXT] = $v->getValue(); - $a[self::FIELD_TEXT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TEXT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TEXT_EXT] = $enc; + } + } else { + $a[self::FIELD_TEXT] = $v; + } } if (null !== ($v = $this->getType())) { $a[self::FIELD_TYPE] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRProvenance/FHIRProvenanceAgent.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRProvenance/FHIRProvenanceAgent.php index f240f24922..91c2b540a4 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRProvenance/FHIRProvenanceAgent.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRProvenance/FHIRProvenanceAgent.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -87,10 +87,6 @@ class FHIRProvenanceAgent extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_PROVENANCE_DOT_AGENT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ON_BEHALF_OF_REFERENCE = 'onBehalfOfReference'; const FIELD_ON_BEHALF_OF_URI = 'onBehalfOfUri'; const FIELD_ON_BEHALF_OF_URI_EXT = '_onBehalfOfUri'; @@ -169,6 +165,9 @@ class FHIRProvenanceAgent extends FHIRBackboneElement */ protected $whoUri = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRProvenanceAgent Constructor * @param null|array $data @@ -198,8 +197,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ON_BEHALF_OF_URI] instanceof FHIRUri) { $this->setOnBehalfOfUri($data[self::FIELD_ON_BEHALF_OF_URI]); - } elseif ($ext && is_scalar($data[self::FIELD_ON_BEHALF_OF_URI])) { - $this->setOnBehalfOfUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_ON_BEHALF_OF_URI]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ON_BEHALF_OF_URI])) { + $this->setOnBehalfOfUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_ON_BEHALF_OF_URI]] + $ext)); + } else if (is_array($data[self::FIELD_ON_BEHALF_OF_URI])) { + $this->setOnBehalfOfUri(new FHIRUri(array_merge($ext, $data[self::FIELD_ON_BEHALF_OF_URI]))); + } } else { $this->setOnBehalfOfUri(new FHIRUri($data[self::FIELD_ON_BEHALF_OF_URI])); } @@ -214,6 +217,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ROLE])) { if (is_array($data[self::FIELD_ROLE])) { foreach($data[self::FIELD_ROLE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addRole($v); } else { @@ -239,8 +245,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_WHO_URI] instanceof FHIRUri) { $this->setWhoUri($data[self::FIELD_WHO_URI]); - } elseif ($ext && is_scalar($data[self::FIELD_WHO_URI])) { - $this->setWhoUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_WHO_URI]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_WHO_URI])) { + $this->setWhoUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_WHO_URI]] + $ext)); + } else if (is_array($data[self::FIELD_WHO_URI])) { + $this->setWhoUri(new FHIRUri(array_merge($ext, $data[self::FIELD_WHO_URI]))); + } } else { $this->setWhoUri(new FHIRUri($data[self::FIELD_WHO_URI])); } @@ -609,11 +619,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getOnBehalfOfUri())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ON_BEHALF_OF_URI, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRelatedAgentType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RELATED_AGENT_TYPE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getRole())) { foreach($vs as $v) { if (null === $v) { @@ -622,7 +630,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_ROLE, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getWhoReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_WHO_REFERENCE, null, $v->_getFHIRXMLNamespace())); } @@ -642,8 +649,15 @@ public function jsonSerialize() $a[self::FIELD_ON_BEHALF_OF_REFERENCE] = $v; } if (null !== ($v = $this->getOnBehalfOfUri())) { - $a[self::FIELD_ON_BEHALF_OF_URI] = $v->getValue(); - $a[self::FIELD_ON_BEHALF_OF_URI_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ON_BEHALF_OF_URI] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ON_BEHALF_OF_URI_EXT] = $enc; + } + } else { + $a[self::FIELD_ON_BEHALF_OF_URI] = $v; + } } if (null !== ($v = $this->getRelatedAgentType())) { $a[self::FIELD_RELATED_AGENT_TYPE] = $v; @@ -655,8 +669,15 @@ public function jsonSerialize() $a[self::FIELD_WHO_REFERENCE] = $v; } if (null !== ($v = $this->getWhoUri())) { - $a[self::FIELD_WHO_URI] = $v->getValue(); - $a[self::FIELD_WHO_URI_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_WHO_URI] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_WHO_URI_EXT] = $enc; + } + } else { + $a[self::FIELD_WHO_URI] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRProvenance/FHIRProvenanceEntity.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRProvenance/FHIRProvenanceEntity.php index 8448245f0e..d54fd24c98 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRProvenance/FHIRProvenanceEntity.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRProvenance/FHIRProvenanceEntity.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -88,10 +88,6 @@ class FHIRProvenanceEntity extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_PROVENANCE_DOT_ENTITY; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_AGENT = 'agent'; const FIELD_ROLE = 'role'; const FIELD_ROLE_EXT = '_role'; @@ -167,6 +163,9 @@ class FHIRProvenanceEntity extends FHIRBackboneElement */ protected $whatUri = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRProvenanceEntity Constructor * @param null|array $data @@ -186,6 +185,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_AGENT])) { if (is_array($data[self::FIELD_AGENT])) { foreach($data[self::FIELD_AGENT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRProvenanceAgent) { $this->addAgent($v); } else { @@ -204,8 +206,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ROLE] instanceof FHIRProvenanceEntityRole) { $this->setRole($data[self::FIELD_ROLE]); - } elseif ($ext && is_scalar($data[self::FIELD_ROLE])) { - $this->setRole(new FHIRProvenanceEntityRole([FHIRProvenanceEntityRole::FIELD_VALUE => $data[self::FIELD_ROLE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ROLE])) { + $this->setRole(new FHIRProvenanceEntityRole([FHIRProvenanceEntityRole::FIELD_VALUE => $data[self::FIELD_ROLE]] + $ext)); + } else if (is_array($data[self::FIELD_ROLE])) { + $this->setRole(new FHIRProvenanceEntityRole(array_merge($ext, $data[self::FIELD_ROLE]))); + } } else { $this->setRole(new FHIRProvenanceEntityRole($data[self::FIELD_ROLE])); } @@ -216,8 +222,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_WHAT_IDENTIFIER] instanceof FHIRIdentifier) { $this->setWhatIdentifier($data[self::FIELD_WHAT_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_WHAT_IDENTIFIER])) { - $this->setWhatIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_WHAT_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_WHAT_IDENTIFIER])) { + $this->setWhatIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_WHAT_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_WHAT_IDENTIFIER])) { + $this->setWhatIdentifier(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_WHAT_IDENTIFIER]))); + } } else { $this->setWhatIdentifier(new FHIRIdentifier($data[self::FIELD_WHAT_IDENTIFIER])); } @@ -235,8 +245,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_WHAT_URI] instanceof FHIRUri) { $this->setWhatUri($data[self::FIELD_WHAT_URI]); - } elseif ($ext && is_scalar($data[self::FIELD_WHAT_URI])) { - $this->setWhatUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_WHAT_URI]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_WHAT_URI])) { + $this->setWhatUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_WHAT_URI]] + $ext)); + } else if (is_array($data[self::FIELD_WHAT_URI])) { + $this->setWhatUri(new FHIRUri(array_merge($ext, $data[self::FIELD_WHAT_URI]))); + } } else { $this->setWhatUri(new FHIRUri($data[self::FIELD_WHAT_URI])); } @@ -586,15 +600,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_AGENT, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getRole())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ROLE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getWhatIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_WHAT_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getWhatReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_WHAT_REFERENCE, null, $v->_getFHIRXMLNamespace())); } @@ -614,17 +625,40 @@ public function jsonSerialize() $a[self::FIELD_AGENT] = $vs; } if (null !== ($v = $this->getRole())) { - $a[self::FIELD_ROLE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ROLE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ROLE_EXT] = $enc; + } + } else { + $a[self::FIELD_ROLE] = $v; + } } if (null !== ($v = $this->getWhatIdentifier())) { - $a[self::FIELD_WHAT_IDENTIFIER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_WHAT_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_WHAT_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_WHAT_IDENTIFIER] = $v; + } } if (null !== ($v = $this->getWhatReference())) { $a[self::FIELD_WHAT_REFERENCE] = $v; } if (null !== ($v = $this->getWhatUri())) { - $a[self::FIELD_WHAT_URI] = $v->getValue(); - $a[self::FIELD_WHAT_URI_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_WHAT_URI] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_WHAT_URI_EXT] = $enc; + } + } else { + $a[self::FIELD_WHAT_URI] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRQuestionnaire/FHIRQuestionnaireEnableWhen.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRQuestionnaire/FHIRQuestionnaireEnableWhen.php index 5cfb3e53b1..911fb8419c 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRQuestionnaire/FHIRQuestionnaireEnableWhen.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRQuestionnaire/FHIRQuestionnaireEnableWhen.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -90,10 +90,6 @@ class FHIRQuestionnaireEnableWhen extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_QUESTIONNAIRE_DOT_ENABLE_WHEN; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ANSWER_ATTACHMENT = 'answerAttachment'; const FIELD_ANSWER_BOOLEAN = 'answerBoolean'; const FIELD_ANSWER_BOOLEAN_EXT = '_answerBoolean'; @@ -292,6 +288,9 @@ class FHIRQuestionnaireEnableWhen extends FHIRBackboneElement */ protected $question = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRQuestionnaireEnableWhen Constructor * @param null|array $data @@ -321,8 +320,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ANSWER_BOOLEAN] instanceof FHIRBoolean) { $this->setAnswerBoolean($data[self::FIELD_ANSWER_BOOLEAN]); - } elseif ($ext && is_scalar($data[self::FIELD_ANSWER_BOOLEAN])) { - $this->setAnswerBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_ANSWER_BOOLEAN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ANSWER_BOOLEAN])) { + $this->setAnswerBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_ANSWER_BOOLEAN]] + $ext)); + } else if (is_array($data[self::FIELD_ANSWER_BOOLEAN])) { + $this->setAnswerBoolean(new FHIRBoolean(array_merge($ext, $data[self::FIELD_ANSWER_BOOLEAN]))); + } } else { $this->setAnswerBoolean(new FHIRBoolean($data[self::FIELD_ANSWER_BOOLEAN])); } @@ -340,8 +343,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ANSWER_DATE] instanceof FHIRDate) { $this->setAnswerDate($data[self::FIELD_ANSWER_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_ANSWER_DATE])) { - $this->setAnswerDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_ANSWER_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ANSWER_DATE])) { + $this->setAnswerDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_ANSWER_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_ANSWER_DATE])) { + $this->setAnswerDate(new FHIRDate(array_merge($ext, $data[self::FIELD_ANSWER_DATE]))); + } } else { $this->setAnswerDate(new FHIRDate($data[self::FIELD_ANSWER_DATE])); } @@ -352,8 +359,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ANSWER_DATE_TIME] instanceof FHIRDateTime) { $this->setAnswerDateTime($data[self::FIELD_ANSWER_DATE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_ANSWER_DATE_TIME])) { - $this->setAnswerDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_ANSWER_DATE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ANSWER_DATE_TIME])) { + $this->setAnswerDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_ANSWER_DATE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_ANSWER_DATE_TIME])) { + $this->setAnswerDateTime(new FHIRDateTime(array_merge($ext, $data[self::FIELD_ANSWER_DATE_TIME]))); + } } else { $this->setAnswerDateTime(new FHIRDateTime($data[self::FIELD_ANSWER_DATE_TIME])); } @@ -364,8 +375,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ANSWER_DECIMAL] instanceof FHIRDecimal) { $this->setAnswerDecimal($data[self::FIELD_ANSWER_DECIMAL]); - } elseif ($ext && is_scalar($data[self::FIELD_ANSWER_DECIMAL])) { - $this->setAnswerDecimal(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_ANSWER_DECIMAL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ANSWER_DECIMAL])) { + $this->setAnswerDecimal(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_ANSWER_DECIMAL]] + $ext)); + } else if (is_array($data[self::FIELD_ANSWER_DECIMAL])) { + $this->setAnswerDecimal(new FHIRDecimal(array_merge($ext, $data[self::FIELD_ANSWER_DECIMAL]))); + } } else { $this->setAnswerDecimal(new FHIRDecimal($data[self::FIELD_ANSWER_DECIMAL])); } @@ -376,8 +391,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ANSWER_INTEGER] instanceof FHIRInteger) { $this->setAnswerInteger($data[self::FIELD_ANSWER_INTEGER]); - } elseif ($ext && is_scalar($data[self::FIELD_ANSWER_INTEGER])) { - $this->setAnswerInteger(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_ANSWER_INTEGER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ANSWER_INTEGER])) { + $this->setAnswerInteger(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_ANSWER_INTEGER]] + $ext)); + } else if (is_array($data[self::FIELD_ANSWER_INTEGER])) { + $this->setAnswerInteger(new FHIRInteger(array_merge($ext, $data[self::FIELD_ANSWER_INTEGER]))); + } } else { $this->setAnswerInteger(new FHIRInteger($data[self::FIELD_ANSWER_INTEGER])); } @@ -388,8 +407,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ANSWER_QUANTITY] instanceof FHIRQuantity) { $this->setAnswerQuantity($data[self::FIELD_ANSWER_QUANTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_ANSWER_QUANTITY])) { - $this->setAnswerQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_ANSWER_QUANTITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ANSWER_QUANTITY])) { + $this->setAnswerQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_ANSWER_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_ANSWER_QUANTITY])) { + $this->setAnswerQuantity(new FHIRQuantity(array_merge($ext, $data[self::FIELD_ANSWER_QUANTITY]))); + } } else { $this->setAnswerQuantity(new FHIRQuantity($data[self::FIELD_ANSWER_QUANTITY])); } @@ -407,8 +430,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ANSWER_STRING] instanceof FHIRString) { $this->setAnswerString($data[self::FIELD_ANSWER_STRING]); - } elseif ($ext && is_scalar($data[self::FIELD_ANSWER_STRING])) { - $this->setAnswerString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_ANSWER_STRING]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ANSWER_STRING])) { + $this->setAnswerString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_ANSWER_STRING]] + $ext)); + } else if (is_array($data[self::FIELD_ANSWER_STRING])) { + $this->setAnswerString(new FHIRString(array_merge($ext, $data[self::FIELD_ANSWER_STRING]))); + } } else { $this->setAnswerString(new FHIRString($data[self::FIELD_ANSWER_STRING])); } @@ -419,8 +446,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ANSWER_TIME] instanceof FHIRTime) { $this->setAnswerTime($data[self::FIELD_ANSWER_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_ANSWER_TIME])) { - $this->setAnswerTime(new FHIRTime([FHIRTime::FIELD_VALUE => $data[self::FIELD_ANSWER_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ANSWER_TIME])) { + $this->setAnswerTime(new FHIRTime([FHIRTime::FIELD_VALUE => $data[self::FIELD_ANSWER_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_ANSWER_TIME])) { + $this->setAnswerTime(new FHIRTime(array_merge($ext, $data[self::FIELD_ANSWER_TIME]))); + } } else { $this->setAnswerTime(new FHIRTime($data[self::FIELD_ANSWER_TIME])); } @@ -431,8 +462,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ANSWER_URI] instanceof FHIRUri) { $this->setAnswerUri($data[self::FIELD_ANSWER_URI]); - } elseif ($ext && is_scalar($data[self::FIELD_ANSWER_URI])) { - $this->setAnswerUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_ANSWER_URI]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ANSWER_URI])) { + $this->setAnswerUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_ANSWER_URI]] + $ext)); + } else if (is_array($data[self::FIELD_ANSWER_URI])) { + $this->setAnswerUri(new FHIRUri(array_merge($ext, $data[self::FIELD_ANSWER_URI]))); + } } else { $this->setAnswerUri(new FHIRUri($data[self::FIELD_ANSWER_URI])); } @@ -443,8 +478,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_HAS_ANSWER] instanceof FHIRBoolean) { $this->setHasAnswer($data[self::FIELD_HAS_ANSWER]); - } elseif ($ext && is_scalar($data[self::FIELD_HAS_ANSWER])) { - $this->setHasAnswer(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_HAS_ANSWER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_HAS_ANSWER])) { + $this->setHasAnswer(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_HAS_ANSWER]] + $ext)); + } else if (is_array($data[self::FIELD_HAS_ANSWER])) { + $this->setHasAnswer(new FHIRBoolean(array_merge($ext, $data[self::FIELD_HAS_ANSWER]))); + } } else { $this->setHasAnswer(new FHIRBoolean($data[self::FIELD_HAS_ANSWER])); } @@ -455,8 +494,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_QUESTION] instanceof FHIRString) { $this->setQuestion($data[self::FIELD_QUESTION]); - } elseif ($ext && is_scalar($data[self::FIELD_QUESTION])) { - $this->setQuestion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_QUESTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_QUESTION])) { + $this->setQuestion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_QUESTION]] + $ext)); + } else if (is_array($data[self::FIELD_QUESTION])) { + $this->setQuestion(new FHIRString(array_merge($ext, $data[self::FIELD_QUESTION]))); + } } else { $this->setQuestion(new FHIRString($data[self::FIELD_QUESTION])); } @@ -1177,7 +1220,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getAnswerBoolean())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ANSWER_BOOLEAN, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getAnswerCoding())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ANSWER_CODING, null, $v->_getFHIRXMLNamespace())); } @@ -1193,11 +1235,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getAnswerInteger())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ANSWER_INTEGER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getAnswerQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ANSWER_QUANTITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getAnswerReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ANSWER_REFERENCE, null, $v->_getFHIRXMLNamespace())); } @@ -1229,53 +1269,131 @@ public function jsonSerialize() $a[self::FIELD_ANSWER_ATTACHMENT] = $v; } if (null !== ($v = $this->getAnswerBoolean())) { - $a[self::FIELD_ANSWER_BOOLEAN] = $v->getValue(); - $a[self::FIELD_ANSWER_BOOLEAN_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ANSWER_BOOLEAN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ANSWER_BOOLEAN_EXT] = $enc; + } + } else { + $a[self::FIELD_ANSWER_BOOLEAN] = $v; + } } if (null !== ($v = $this->getAnswerCoding())) { $a[self::FIELD_ANSWER_CODING] = $v; } if (null !== ($v = $this->getAnswerDate())) { - $a[self::FIELD_ANSWER_DATE] = $v->getValue(); - $a[self::FIELD_ANSWER_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ANSWER_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ANSWER_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_ANSWER_DATE] = $v; + } } if (null !== ($v = $this->getAnswerDateTime())) { - $a[self::FIELD_ANSWER_DATE_TIME] = $v->getValue(); - $a[self::FIELD_ANSWER_DATE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ANSWER_DATE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ANSWER_DATE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_ANSWER_DATE_TIME] = $v; + } } if (null !== ($v = $this->getAnswerDecimal())) { - $a[self::FIELD_ANSWER_DECIMAL] = $v->getValue(); - $a[self::FIELD_ANSWER_DECIMAL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ANSWER_DECIMAL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ANSWER_DECIMAL_EXT] = $enc; + } + } else { + $a[self::FIELD_ANSWER_DECIMAL] = $v; + } } if (null !== ($v = $this->getAnswerInteger())) { - $a[self::FIELD_ANSWER_INTEGER] = $v->getValue(); - $a[self::FIELD_ANSWER_INTEGER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ANSWER_INTEGER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ANSWER_INTEGER_EXT] = $enc; + } + } else { + $a[self::FIELD_ANSWER_INTEGER] = $v; + } } if (null !== ($v = $this->getAnswerQuantity())) { - $a[self::FIELD_ANSWER_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ANSWER_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ANSWER_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_ANSWER_QUANTITY] = $v; + } } if (null !== ($v = $this->getAnswerReference())) { $a[self::FIELD_ANSWER_REFERENCE] = $v; } if (null !== ($v = $this->getAnswerString())) { - $a[self::FIELD_ANSWER_STRING] = $v->getValue(); - $a[self::FIELD_ANSWER_STRING_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ANSWER_STRING] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ANSWER_STRING_EXT] = $enc; + } + } else { + $a[self::FIELD_ANSWER_STRING] = $v; + } } if (null !== ($v = $this->getAnswerTime())) { - $a[self::FIELD_ANSWER_TIME] = $v->getValue(); - $a[self::FIELD_ANSWER_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ANSWER_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ANSWER_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_ANSWER_TIME] = $v; + } } if (null !== ($v = $this->getAnswerUri())) { - $a[self::FIELD_ANSWER_URI] = $v->getValue(); - $a[self::FIELD_ANSWER_URI_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ANSWER_URI] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ANSWER_URI_EXT] = $enc; + } + } else { + $a[self::FIELD_ANSWER_URI] = $v; + } } if (null !== ($v = $this->getHasAnswer())) { - $a[self::FIELD_HAS_ANSWER] = $v->getValue(); - $a[self::FIELD_HAS_ANSWER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_HAS_ANSWER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_HAS_ANSWER_EXT] = $enc; + } + } else { + $a[self::FIELD_HAS_ANSWER] = $v; + } } if (null !== ($v = $this->getQuestion())) { - $a[self::FIELD_QUESTION] = $v->getValue(); - $a[self::FIELD_QUESTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_QUESTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_QUESTION_EXT] = $enc; + } + } else { + $a[self::FIELD_QUESTION] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRQuestionnaire/FHIRQuestionnaireItem.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRQuestionnaire/FHIRQuestionnaireItem.php index 210c0e1844..0964f7a98f 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRQuestionnaire/FHIRQuestionnaireItem.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRQuestionnaire/FHIRQuestionnaireItem.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -91,10 +91,6 @@ class FHIRQuestionnaireItem extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_QUESTIONNAIRE_DOT_ITEM; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CODE = 'code'; const FIELD_DEFINITION = 'definition'; const FIELD_DEFINITION_EXT = '_definition'; @@ -460,6 +456,9 @@ class FHIRQuestionnaireItem extends FHIRBackboneElement */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRQuestionnaireItem Constructor * @param null|array $data @@ -479,6 +478,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CODE])) { if (is_array($data[self::FIELD_CODE])) { foreach($data[self::FIELD_CODE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCoding) { $this->addCode($v); } else { @@ -497,8 +499,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DEFINITION] instanceof FHIRUri) { $this->setDefinition($data[self::FIELD_DEFINITION]); - } elseif ($ext && is_scalar($data[self::FIELD_DEFINITION])) { - $this->setDefinition(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_DEFINITION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DEFINITION])) { + $this->setDefinition(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_DEFINITION]] + $ext)); + } else if (is_array($data[self::FIELD_DEFINITION])) { + $this->setDefinition(new FHIRUri(array_merge($ext, $data[self::FIELD_DEFINITION]))); + } } else { $this->setDefinition(new FHIRUri($data[self::FIELD_DEFINITION])); } @@ -506,6 +512,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ENABLE_WHEN])) { if (is_array($data[self::FIELD_ENABLE_WHEN])) { foreach($data[self::FIELD_ENABLE_WHEN] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRQuestionnaireEnableWhen) { $this->addEnableWhen($v); } else { @@ -531,8 +540,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_INITIAL_BOOLEAN] instanceof FHIRBoolean) { $this->setInitialBoolean($data[self::FIELD_INITIAL_BOOLEAN]); - } elseif ($ext && is_scalar($data[self::FIELD_INITIAL_BOOLEAN])) { - $this->setInitialBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_INITIAL_BOOLEAN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_INITIAL_BOOLEAN])) { + $this->setInitialBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_INITIAL_BOOLEAN]] + $ext)); + } else if (is_array($data[self::FIELD_INITIAL_BOOLEAN])) { + $this->setInitialBoolean(new FHIRBoolean(array_merge($ext, $data[self::FIELD_INITIAL_BOOLEAN]))); + } } else { $this->setInitialBoolean(new FHIRBoolean($data[self::FIELD_INITIAL_BOOLEAN])); } @@ -550,8 +563,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_INITIAL_DATE] instanceof FHIRDate) { $this->setInitialDate($data[self::FIELD_INITIAL_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_INITIAL_DATE])) { - $this->setInitialDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_INITIAL_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_INITIAL_DATE])) { + $this->setInitialDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_INITIAL_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_INITIAL_DATE])) { + $this->setInitialDate(new FHIRDate(array_merge($ext, $data[self::FIELD_INITIAL_DATE]))); + } } else { $this->setInitialDate(new FHIRDate($data[self::FIELD_INITIAL_DATE])); } @@ -562,8 +579,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_INITIAL_DATE_TIME] instanceof FHIRDateTime) { $this->setInitialDateTime($data[self::FIELD_INITIAL_DATE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_INITIAL_DATE_TIME])) { - $this->setInitialDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_INITIAL_DATE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_INITIAL_DATE_TIME])) { + $this->setInitialDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_INITIAL_DATE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_INITIAL_DATE_TIME])) { + $this->setInitialDateTime(new FHIRDateTime(array_merge($ext, $data[self::FIELD_INITIAL_DATE_TIME]))); + } } else { $this->setInitialDateTime(new FHIRDateTime($data[self::FIELD_INITIAL_DATE_TIME])); } @@ -574,8 +595,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_INITIAL_DECIMAL] instanceof FHIRDecimal) { $this->setInitialDecimal($data[self::FIELD_INITIAL_DECIMAL]); - } elseif ($ext && is_scalar($data[self::FIELD_INITIAL_DECIMAL])) { - $this->setInitialDecimal(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_INITIAL_DECIMAL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_INITIAL_DECIMAL])) { + $this->setInitialDecimal(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_INITIAL_DECIMAL]] + $ext)); + } else if (is_array($data[self::FIELD_INITIAL_DECIMAL])) { + $this->setInitialDecimal(new FHIRDecimal(array_merge($ext, $data[self::FIELD_INITIAL_DECIMAL]))); + } } else { $this->setInitialDecimal(new FHIRDecimal($data[self::FIELD_INITIAL_DECIMAL])); } @@ -586,8 +611,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_INITIAL_INTEGER] instanceof FHIRInteger) { $this->setInitialInteger($data[self::FIELD_INITIAL_INTEGER]); - } elseif ($ext && is_scalar($data[self::FIELD_INITIAL_INTEGER])) { - $this->setInitialInteger(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_INITIAL_INTEGER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_INITIAL_INTEGER])) { + $this->setInitialInteger(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_INITIAL_INTEGER]] + $ext)); + } else if (is_array($data[self::FIELD_INITIAL_INTEGER])) { + $this->setInitialInteger(new FHIRInteger(array_merge($ext, $data[self::FIELD_INITIAL_INTEGER]))); + } } else { $this->setInitialInteger(new FHIRInteger($data[self::FIELD_INITIAL_INTEGER])); } @@ -598,8 +627,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_INITIAL_QUANTITY] instanceof FHIRQuantity) { $this->setInitialQuantity($data[self::FIELD_INITIAL_QUANTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_INITIAL_QUANTITY])) { - $this->setInitialQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_INITIAL_QUANTITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_INITIAL_QUANTITY])) { + $this->setInitialQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_INITIAL_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_INITIAL_QUANTITY])) { + $this->setInitialQuantity(new FHIRQuantity(array_merge($ext, $data[self::FIELD_INITIAL_QUANTITY]))); + } } else { $this->setInitialQuantity(new FHIRQuantity($data[self::FIELD_INITIAL_QUANTITY])); } @@ -617,8 +650,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_INITIAL_STRING] instanceof FHIRString) { $this->setInitialString($data[self::FIELD_INITIAL_STRING]); - } elseif ($ext && is_scalar($data[self::FIELD_INITIAL_STRING])) { - $this->setInitialString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_INITIAL_STRING]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_INITIAL_STRING])) { + $this->setInitialString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_INITIAL_STRING]] + $ext)); + } else if (is_array($data[self::FIELD_INITIAL_STRING])) { + $this->setInitialString(new FHIRString(array_merge($ext, $data[self::FIELD_INITIAL_STRING]))); + } } else { $this->setInitialString(new FHIRString($data[self::FIELD_INITIAL_STRING])); } @@ -629,8 +666,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_INITIAL_TIME] instanceof FHIRTime) { $this->setInitialTime($data[self::FIELD_INITIAL_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_INITIAL_TIME])) { - $this->setInitialTime(new FHIRTime([FHIRTime::FIELD_VALUE => $data[self::FIELD_INITIAL_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_INITIAL_TIME])) { + $this->setInitialTime(new FHIRTime([FHIRTime::FIELD_VALUE => $data[self::FIELD_INITIAL_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_INITIAL_TIME])) { + $this->setInitialTime(new FHIRTime(array_merge($ext, $data[self::FIELD_INITIAL_TIME]))); + } } else { $this->setInitialTime(new FHIRTime($data[self::FIELD_INITIAL_TIME])); } @@ -641,8 +682,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_INITIAL_URI] instanceof FHIRUri) { $this->setInitialUri($data[self::FIELD_INITIAL_URI]); - } elseif ($ext && is_scalar($data[self::FIELD_INITIAL_URI])) { - $this->setInitialUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_INITIAL_URI]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_INITIAL_URI])) { + $this->setInitialUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_INITIAL_URI]] + $ext)); + } else if (is_array($data[self::FIELD_INITIAL_URI])) { + $this->setInitialUri(new FHIRUri(array_merge($ext, $data[self::FIELD_INITIAL_URI]))); + } } else { $this->setInitialUri(new FHIRUri($data[self::FIELD_INITIAL_URI])); } @@ -650,6 +695,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ITEM])) { if (is_array($data[self::FIELD_ITEM])) { foreach($data[self::FIELD_ITEM] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRQuestionnaireItem) { $this->addItem($v); } else { @@ -668,8 +716,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_LINK_ID] instanceof FHIRString) { $this->setLinkId($data[self::FIELD_LINK_ID]); - } elseif ($ext && is_scalar($data[self::FIELD_LINK_ID])) { - $this->setLinkId(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_LINK_ID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_LINK_ID])) { + $this->setLinkId(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_LINK_ID]] + $ext)); + } else if (is_array($data[self::FIELD_LINK_ID])) { + $this->setLinkId(new FHIRString(array_merge($ext, $data[self::FIELD_LINK_ID]))); + } } else { $this->setLinkId(new FHIRString($data[self::FIELD_LINK_ID])); } @@ -680,8 +732,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MAX_LENGTH] instanceof FHIRInteger) { $this->setMaxLength($data[self::FIELD_MAX_LENGTH]); - } elseif ($ext && is_scalar($data[self::FIELD_MAX_LENGTH])) { - $this->setMaxLength(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_MAX_LENGTH]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MAX_LENGTH])) { + $this->setMaxLength(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_MAX_LENGTH]] + $ext)); + } else if (is_array($data[self::FIELD_MAX_LENGTH])) { + $this->setMaxLength(new FHIRInteger(array_merge($ext, $data[self::FIELD_MAX_LENGTH]))); + } } else { $this->setMaxLength(new FHIRInteger($data[self::FIELD_MAX_LENGTH])); } @@ -689,6 +745,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_OPTION])) { if (is_array($data[self::FIELD_OPTION])) { foreach($data[self::FIELD_OPTION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRQuestionnaireOption) { $this->addOption($v); } else { @@ -714,8 +773,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PREFIX] instanceof FHIRString) { $this->setPrefix($data[self::FIELD_PREFIX]); - } elseif ($ext && is_scalar($data[self::FIELD_PREFIX])) { - $this->setPrefix(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PREFIX]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PREFIX])) { + $this->setPrefix(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PREFIX]] + $ext)); + } else if (is_array($data[self::FIELD_PREFIX])) { + $this->setPrefix(new FHIRString(array_merge($ext, $data[self::FIELD_PREFIX]))); + } } else { $this->setPrefix(new FHIRString($data[self::FIELD_PREFIX])); } @@ -726,8 +789,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_READ_ONLY] instanceof FHIRBoolean) { $this->setReadOnly($data[self::FIELD_READ_ONLY]); - } elseif ($ext && is_scalar($data[self::FIELD_READ_ONLY])) { - $this->setReadOnly(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_READ_ONLY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_READ_ONLY])) { + $this->setReadOnly(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_READ_ONLY]] + $ext)); + } else if (is_array($data[self::FIELD_READ_ONLY])) { + $this->setReadOnly(new FHIRBoolean(array_merge($ext, $data[self::FIELD_READ_ONLY]))); + } } else { $this->setReadOnly(new FHIRBoolean($data[self::FIELD_READ_ONLY])); } @@ -738,8 +805,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_REPEATS] instanceof FHIRBoolean) { $this->setRepeats($data[self::FIELD_REPEATS]); - } elseif ($ext && is_scalar($data[self::FIELD_REPEATS])) { - $this->setRepeats(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_REPEATS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_REPEATS])) { + $this->setRepeats(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_REPEATS]] + $ext)); + } else if (is_array($data[self::FIELD_REPEATS])) { + $this->setRepeats(new FHIRBoolean(array_merge($ext, $data[self::FIELD_REPEATS]))); + } } else { $this->setRepeats(new FHIRBoolean($data[self::FIELD_REPEATS])); } @@ -750,8 +821,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_REQUIRED] instanceof FHIRBoolean) { $this->setRequired($data[self::FIELD_REQUIRED]); - } elseif ($ext && is_scalar($data[self::FIELD_REQUIRED])) { - $this->setRequired(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_REQUIRED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_REQUIRED])) { + $this->setRequired(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_REQUIRED]] + $ext)); + } else if (is_array($data[self::FIELD_REQUIRED])) { + $this->setRequired(new FHIRBoolean(array_merge($ext, $data[self::FIELD_REQUIRED]))); + } } else { $this->setRequired(new FHIRBoolean($data[self::FIELD_REQUIRED])); } @@ -762,8 +837,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TEXT] instanceof FHIRString) { $this->setText($data[self::FIELD_TEXT]); - } elseif ($ext && is_scalar($data[self::FIELD_TEXT])) { - $this->setText(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TEXT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TEXT])) { + $this->setText(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TEXT]] + $ext)); + } else if (is_array($data[self::FIELD_TEXT])) { + $this->setText(new FHIRString(array_merge($ext, $data[self::FIELD_TEXT]))); + } } else { $this->setText(new FHIRString($data[self::FIELD_TEXT])); } @@ -774,8 +853,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TYPE] instanceof FHIRQuestionnaireItemType) { $this->setType($data[self::FIELD_TYPE]); - } elseif ($ext && is_scalar($data[self::FIELD_TYPE])) { - $this->setType(new FHIRQuestionnaireItemType([FHIRQuestionnaireItemType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TYPE])) { + $this->setType(new FHIRQuestionnaireItemType([FHIRQuestionnaireItemType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } else if (is_array($data[self::FIELD_TYPE])) { + $this->setType(new FHIRQuestionnaireItemType(array_merge($ext, $data[self::FIELD_TYPE]))); + } } else { $this->setType(new FHIRQuestionnaireItemType($data[self::FIELD_TYPE])); } @@ -2109,7 +2192,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDefinition())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFINITION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getEnableWhen())) { foreach($vs as $v) { if (null === $v) { @@ -2118,14 +2200,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_ENABLE_WHEN, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getInitialAttachment())) { $v->xmlSerialize($sxe->addChild(self::FIELD_INITIAL_ATTACHMENT, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getInitialBoolean())) { $v->xmlSerialize($sxe->addChild(self::FIELD_INITIAL_BOOLEAN, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getInitialCoding())) { $v->xmlSerialize($sxe->addChild(self::FIELD_INITIAL_CODING, null, $v->_getFHIRXMLNamespace())); } @@ -2141,11 +2221,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getInitialInteger())) { $v->xmlSerialize($sxe->addChild(self::FIELD_INITIAL_INTEGER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getInitialQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_INITIAL_QUANTITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getInitialReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_INITIAL_REFERENCE, null, $v->_getFHIRXMLNamespace())); } @@ -2158,7 +2236,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getInitialUri())) { $v->xmlSerialize($sxe->addChild(self::FIELD_INITIAL_URI, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getItem())) { foreach($vs as $v) { if (null === $v) { @@ -2173,7 +2250,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getMaxLength())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MAX_LENGTH, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getOption())) { foreach($vs as $v) { if (null === $v) { @@ -2182,7 +2258,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_OPTION, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getOptions())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OPTIONS, null, $v->_getFHIRXMLNamespace())); } @@ -2201,7 +2276,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getText())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TEXT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -2218,8 +2292,15 @@ public function jsonSerialize() $a[self::FIELD_CODE] = $vs; } if (null !== ($v = $this->getDefinition())) { - $a[self::FIELD_DEFINITION] = $v->getValue(); - $a[self::FIELD_DEFINITION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DEFINITION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DEFINITION_EXT] = $enc; + } + } else { + $a[self::FIELD_DEFINITION] = $v; + } } if ([] !== ($vs = $this->getEnableWhen())) { $a[self::FIELD_ENABLE_WHEN] = $vs; @@ -2228,56 +2309,134 @@ public function jsonSerialize() $a[self::FIELD_INITIAL_ATTACHMENT] = $v; } if (null !== ($v = $this->getInitialBoolean())) { - $a[self::FIELD_INITIAL_BOOLEAN] = $v->getValue(); - $a[self::FIELD_INITIAL_BOOLEAN_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_INITIAL_BOOLEAN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_INITIAL_BOOLEAN_EXT] = $enc; + } + } else { + $a[self::FIELD_INITIAL_BOOLEAN] = $v; + } } if (null !== ($v = $this->getInitialCoding())) { $a[self::FIELD_INITIAL_CODING] = $v; } if (null !== ($v = $this->getInitialDate())) { - $a[self::FIELD_INITIAL_DATE] = $v->getValue(); - $a[self::FIELD_INITIAL_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_INITIAL_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_INITIAL_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_INITIAL_DATE] = $v; + } } if (null !== ($v = $this->getInitialDateTime())) { - $a[self::FIELD_INITIAL_DATE_TIME] = $v->getValue(); - $a[self::FIELD_INITIAL_DATE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_INITIAL_DATE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_INITIAL_DATE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_INITIAL_DATE_TIME] = $v; + } } if (null !== ($v = $this->getInitialDecimal())) { - $a[self::FIELD_INITIAL_DECIMAL] = $v->getValue(); - $a[self::FIELD_INITIAL_DECIMAL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_INITIAL_DECIMAL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_INITIAL_DECIMAL_EXT] = $enc; + } + } else { + $a[self::FIELD_INITIAL_DECIMAL] = $v; + } } if (null !== ($v = $this->getInitialInteger())) { - $a[self::FIELD_INITIAL_INTEGER] = $v->getValue(); - $a[self::FIELD_INITIAL_INTEGER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_INITIAL_INTEGER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_INITIAL_INTEGER_EXT] = $enc; + } + } else { + $a[self::FIELD_INITIAL_INTEGER] = $v; + } } if (null !== ($v = $this->getInitialQuantity())) { - $a[self::FIELD_INITIAL_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_INITIAL_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_INITIAL_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_INITIAL_QUANTITY] = $v; + } } if (null !== ($v = $this->getInitialReference())) { $a[self::FIELD_INITIAL_REFERENCE] = $v; } if (null !== ($v = $this->getInitialString())) { - $a[self::FIELD_INITIAL_STRING] = $v->getValue(); - $a[self::FIELD_INITIAL_STRING_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_INITIAL_STRING] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_INITIAL_STRING_EXT] = $enc; + } + } else { + $a[self::FIELD_INITIAL_STRING] = $v; + } } if (null !== ($v = $this->getInitialTime())) { - $a[self::FIELD_INITIAL_TIME] = $v->getValue(); - $a[self::FIELD_INITIAL_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_INITIAL_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_INITIAL_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_INITIAL_TIME] = $v; + } } if (null !== ($v = $this->getInitialUri())) { - $a[self::FIELD_INITIAL_URI] = $v->getValue(); - $a[self::FIELD_INITIAL_URI_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_INITIAL_URI] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_INITIAL_URI_EXT] = $enc; + } + } else { + $a[self::FIELD_INITIAL_URI] = $v; + } } if ([] !== ($vs = $this->getItem())) { $a[self::FIELD_ITEM] = $vs; } if (null !== ($v = $this->getLinkId())) { - $a[self::FIELD_LINK_ID] = $v->getValue(); - $a[self::FIELD_LINK_ID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_LINK_ID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_LINK_ID_EXT] = $enc; + } + } else { + $a[self::FIELD_LINK_ID] = $v; + } } if (null !== ($v = $this->getMaxLength())) { - $a[self::FIELD_MAX_LENGTH] = $v->getValue(); - $a[self::FIELD_MAX_LENGTH_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MAX_LENGTH] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MAX_LENGTH_EXT] = $enc; + } + } else { + $a[self::FIELD_MAX_LENGTH] = $v; + } } if ([] !== ($vs = $this->getOption())) { $a[self::FIELD_OPTION] = $vs; @@ -2286,27 +2445,70 @@ public function jsonSerialize() $a[self::FIELD_OPTIONS] = $v; } if (null !== ($v = $this->getPrefix())) { - $a[self::FIELD_PREFIX] = $v->getValue(); - $a[self::FIELD_PREFIX_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PREFIX] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PREFIX_EXT] = $enc; + } + } else { + $a[self::FIELD_PREFIX] = $v; + } } if (null !== ($v = $this->getReadOnly())) { - $a[self::FIELD_READ_ONLY] = $v->getValue(); - $a[self::FIELD_READ_ONLY_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_READ_ONLY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_READ_ONLY_EXT] = $enc; + } + } else { + $a[self::FIELD_READ_ONLY] = $v; + } } if (null !== ($v = $this->getRepeats())) { - $a[self::FIELD_REPEATS] = $v->getValue(); - $a[self::FIELD_REPEATS_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_REPEATS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_REPEATS_EXT] = $enc; + } + } else { + $a[self::FIELD_REPEATS] = $v; + } } if (null !== ($v = $this->getRequired())) { - $a[self::FIELD_REQUIRED] = $v->getValue(); - $a[self::FIELD_REQUIRED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_REQUIRED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_REQUIRED_EXT] = $enc; + } + } else { + $a[self::FIELD_REQUIRED] = $v; + } } if (null !== ($v = $this->getText())) { - $a[self::FIELD_TEXT] = $v->getValue(); - $a[self::FIELD_TEXT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TEXT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TEXT_EXT] = $enc; + } + } else { + $a[self::FIELD_TEXT] = $v; + } } if (null !== ($v = $this->getType())) { - $a[self::FIELD_TYPE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TYPE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TYPE_EXT] = $enc; + } + } else { + $a[self::FIELD_TYPE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRQuestionnaire/FHIRQuestionnaireOption.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRQuestionnaire/FHIRQuestionnaireOption.php index 7eb5f1f6d6..52f1c5f56e 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRQuestionnaire/FHIRQuestionnaireOption.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRQuestionnaire/FHIRQuestionnaireOption.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -83,10 +83,6 @@ class FHIRQuestionnaireOption extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_QUESTIONNAIRE_DOT_OPTION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE_CODING = 'valueCoding'; const FIELD_VALUE_DATE = 'valueDate'; const FIELD_VALUE_DATE_EXT = '_valueDate'; @@ -152,6 +148,9 @@ class FHIRQuestionnaireOption extends FHIRBackboneElement */ protected $valueTime = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRQuestionnaireOption Constructor * @param null|array $data @@ -181,8 +180,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_DATE] instanceof FHIRDate) { $this->setValueDate($data[self::FIELD_VALUE_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_DATE])) { - $this->setValueDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_VALUE_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_DATE])) { + $this->setValueDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_VALUE_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_DATE])) { + $this->setValueDate(new FHIRDate(array_merge($ext, $data[self::FIELD_VALUE_DATE]))); + } } else { $this->setValueDate(new FHIRDate($data[self::FIELD_VALUE_DATE])); } @@ -193,8 +196,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_INTEGER] instanceof FHIRInteger) { $this->setValueInteger($data[self::FIELD_VALUE_INTEGER]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_INTEGER])) { - $this->setValueInteger(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_VALUE_INTEGER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_INTEGER])) { + $this->setValueInteger(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_VALUE_INTEGER]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_INTEGER])) { + $this->setValueInteger(new FHIRInteger(array_merge($ext, $data[self::FIELD_VALUE_INTEGER]))); + } } else { $this->setValueInteger(new FHIRInteger($data[self::FIELD_VALUE_INTEGER])); } @@ -205,8 +212,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_STRING] instanceof FHIRString) { $this->setValueString($data[self::FIELD_VALUE_STRING]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_STRING])) { - $this->setValueString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VALUE_STRING]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_STRING])) { + $this->setValueString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VALUE_STRING]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_STRING])) { + $this->setValueString(new FHIRString(array_merge($ext, $data[self::FIELD_VALUE_STRING]))); + } } else { $this->setValueString(new FHIRString($data[self::FIELD_VALUE_STRING])); } @@ -217,8 +228,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_TIME] instanceof FHIRTime) { $this->setValueTime($data[self::FIELD_VALUE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_TIME])) { - $this->setValueTime(new FHIRTime([FHIRTime::FIELD_VALUE => $data[self::FIELD_VALUE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_TIME])) { + $this->setValueTime(new FHIRTime([FHIRTime::FIELD_VALUE => $data[self::FIELD_VALUE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_TIME])) { + $this->setValueTime(new FHIRTime(array_merge($ext, $data[self::FIELD_VALUE_TIME]))); + } } else { $this->setValueTime(new FHIRTime($data[self::FIELD_VALUE_TIME])); } @@ -562,20 +577,48 @@ public function jsonSerialize() $a[self::FIELD_VALUE_CODING] = $v; } if (null !== ($v = $this->getValueDate())) { - $a[self::FIELD_VALUE_DATE] = $v->getValue(); - $a[self::FIELD_VALUE_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_DATE] = $v; + } } if (null !== ($v = $this->getValueInteger())) { - $a[self::FIELD_VALUE_INTEGER] = $v->getValue(); - $a[self::FIELD_VALUE_INTEGER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_INTEGER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_INTEGER_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_INTEGER] = $v; + } } if (null !== ($v = $this->getValueString())) { - $a[self::FIELD_VALUE_STRING] = $v->getValue(); - $a[self::FIELD_VALUE_STRING_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_STRING] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_STRING_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_STRING] = $v; + } } if (null !== ($v = $this->getValueTime())) { - $a[self::FIELD_VALUE_TIME] = $v->getValue(); - $a[self::FIELD_VALUE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_TIME] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRQuestionnaireResponse/FHIRQuestionnaireResponseAnswer.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRQuestionnaireResponse/FHIRQuestionnaireResponseAnswer.php index 34608d440b..5bb7a9d420 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRQuestionnaireResponse/FHIRQuestionnaireResponseAnswer.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRQuestionnaireResponse/FHIRQuestionnaireResponseAnswer.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -90,10 +90,6 @@ class FHIRQuestionnaireResponseAnswer extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_QUESTIONNAIRE_RESPONSE_DOT_ANSWER; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ITEM = 'item'; const FIELD_VALUE_ATTACHMENT = 'valueAttachment'; const FIELD_VALUE_BOOLEAN = 'valueBoolean'; @@ -265,6 +261,9 @@ class FHIRQuestionnaireResponseAnswer extends FHIRBackboneElement */ protected $valueUri = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRQuestionnaireResponseAnswer Constructor * @param null|array $data @@ -284,6 +283,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ITEM])) { if (is_array($data[self::FIELD_ITEM])) { foreach($data[self::FIELD_ITEM] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRQuestionnaireResponseItem) { $this->addItem($v); } else { @@ -309,8 +311,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_BOOLEAN] instanceof FHIRBoolean) { $this->setValueBoolean($data[self::FIELD_VALUE_BOOLEAN]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_BOOLEAN])) { - $this->setValueBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_VALUE_BOOLEAN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_BOOLEAN])) { + $this->setValueBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_VALUE_BOOLEAN]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_BOOLEAN])) { + $this->setValueBoolean(new FHIRBoolean(array_merge($ext, $data[self::FIELD_VALUE_BOOLEAN]))); + } } else { $this->setValueBoolean(new FHIRBoolean($data[self::FIELD_VALUE_BOOLEAN])); } @@ -328,8 +334,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_DATE] instanceof FHIRDate) { $this->setValueDate($data[self::FIELD_VALUE_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_DATE])) { - $this->setValueDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_VALUE_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_DATE])) { + $this->setValueDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_VALUE_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_DATE])) { + $this->setValueDate(new FHIRDate(array_merge($ext, $data[self::FIELD_VALUE_DATE]))); + } } else { $this->setValueDate(new FHIRDate($data[self::FIELD_VALUE_DATE])); } @@ -340,8 +350,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_DATE_TIME] instanceof FHIRDateTime) { $this->setValueDateTime($data[self::FIELD_VALUE_DATE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_DATE_TIME])) { - $this->setValueDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_VALUE_DATE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_DATE_TIME])) { + $this->setValueDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_VALUE_DATE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_DATE_TIME])) { + $this->setValueDateTime(new FHIRDateTime(array_merge($ext, $data[self::FIELD_VALUE_DATE_TIME]))); + } } else { $this->setValueDateTime(new FHIRDateTime($data[self::FIELD_VALUE_DATE_TIME])); } @@ -352,8 +366,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_DECIMAL] instanceof FHIRDecimal) { $this->setValueDecimal($data[self::FIELD_VALUE_DECIMAL]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_DECIMAL])) { - $this->setValueDecimal(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_VALUE_DECIMAL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_DECIMAL])) { + $this->setValueDecimal(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_VALUE_DECIMAL]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_DECIMAL])) { + $this->setValueDecimal(new FHIRDecimal(array_merge($ext, $data[self::FIELD_VALUE_DECIMAL]))); + } } else { $this->setValueDecimal(new FHIRDecimal($data[self::FIELD_VALUE_DECIMAL])); } @@ -364,8 +382,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_INTEGER] instanceof FHIRInteger) { $this->setValueInteger($data[self::FIELD_VALUE_INTEGER]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_INTEGER])) { - $this->setValueInteger(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_VALUE_INTEGER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_INTEGER])) { + $this->setValueInteger(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_VALUE_INTEGER]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_INTEGER])) { + $this->setValueInteger(new FHIRInteger(array_merge($ext, $data[self::FIELD_VALUE_INTEGER]))); + } } else { $this->setValueInteger(new FHIRInteger($data[self::FIELD_VALUE_INTEGER])); } @@ -376,8 +398,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_QUANTITY] instanceof FHIRQuantity) { $this->setValueQuantity($data[self::FIELD_VALUE_QUANTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_QUANTITY])) { - $this->setValueQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_VALUE_QUANTITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_QUANTITY])) { + $this->setValueQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_VALUE_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_QUANTITY])) { + $this->setValueQuantity(new FHIRQuantity(array_merge($ext, $data[self::FIELD_VALUE_QUANTITY]))); + } } else { $this->setValueQuantity(new FHIRQuantity($data[self::FIELD_VALUE_QUANTITY])); } @@ -395,8 +421,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_STRING] instanceof FHIRString) { $this->setValueString($data[self::FIELD_VALUE_STRING]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_STRING])) { - $this->setValueString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VALUE_STRING]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_STRING])) { + $this->setValueString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VALUE_STRING]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_STRING])) { + $this->setValueString(new FHIRString(array_merge($ext, $data[self::FIELD_VALUE_STRING]))); + } } else { $this->setValueString(new FHIRString($data[self::FIELD_VALUE_STRING])); } @@ -407,8 +437,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_TIME] instanceof FHIRTime) { $this->setValueTime($data[self::FIELD_VALUE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_TIME])) { - $this->setValueTime(new FHIRTime([FHIRTime::FIELD_VALUE => $data[self::FIELD_VALUE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_TIME])) { + $this->setValueTime(new FHIRTime([FHIRTime::FIELD_VALUE => $data[self::FIELD_VALUE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_TIME])) { + $this->setValueTime(new FHIRTime(array_merge($ext, $data[self::FIELD_VALUE_TIME]))); + } } else { $this->setValueTime(new FHIRTime($data[self::FIELD_VALUE_TIME])); } @@ -419,8 +453,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_URI] instanceof FHIRUri) { $this->setValueUri($data[self::FIELD_VALUE_URI]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_URI])) { - $this->setValueUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_VALUE_URI]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_URI])) { + $this->setValueUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_VALUE_URI]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_URI])) { + $this->setValueUri(new FHIRUri(array_merge($ext, $data[self::FIELD_VALUE_URI]))); + } } else { $this->setValueUri(new FHIRUri($data[self::FIELD_VALUE_URI])); } @@ -1090,14 +1128,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_ITEM, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getValueAttachment())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_ATTACHMENT, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getValueBoolean())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_BOOLEAN, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueCoding())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_CODING, null, $v->_getFHIRXMLNamespace())); } @@ -1113,11 +1149,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getValueInteger())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_INTEGER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_QUANTITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_REFERENCE, null, $v->_getFHIRXMLNamespace())); } @@ -1146,45 +1180,109 @@ public function jsonSerialize() $a[self::FIELD_VALUE_ATTACHMENT] = $v; } if (null !== ($v = $this->getValueBoolean())) { - $a[self::FIELD_VALUE_BOOLEAN] = $v->getValue(); - $a[self::FIELD_VALUE_BOOLEAN_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_BOOLEAN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_BOOLEAN_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_BOOLEAN] = $v; + } } if (null !== ($v = $this->getValueCoding())) { $a[self::FIELD_VALUE_CODING] = $v; } if (null !== ($v = $this->getValueDate())) { - $a[self::FIELD_VALUE_DATE] = $v->getValue(); - $a[self::FIELD_VALUE_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_DATE] = $v; + } } if (null !== ($v = $this->getValueDateTime())) { - $a[self::FIELD_VALUE_DATE_TIME] = $v->getValue(); - $a[self::FIELD_VALUE_DATE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_DATE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_DATE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_DATE_TIME] = $v; + } } if (null !== ($v = $this->getValueDecimal())) { - $a[self::FIELD_VALUE_DECIMAL] = $v->getValue(); - $a[self::FIELD_VALUE_DECIMAL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_DECIMAL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_DECIMAL_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_DECIMAL] = $v; + } } if (null !== ($v = $this->getValueInteger())) { - $a[self::FIELD_VALUE_INTEGER] = $v->getValue(); - $a[self::FIELD_VALUE_INTEGER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_INTEGER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_INTEGER_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_INTEGER] = $v; + } } if (null !== ($v = $this->getValueQuantity())) { - $a[self::FIELD_VALUE_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_QUANTITY] = $v; + } } if (null !== ($v = $this->getValueReference())) { $a[self::FIELD_VALUE_REFERENCE] = $v; } if (null !== ($v = $this->getValueString())) { - $a[self::FIELD_VALUE_STRING] = $v->getValue(); - $a[self::FIELD_VALUE_STRING_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_STRING] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_STRING_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_STRING] = $v; + } } if (null !== ($v = $this->getValueTime())) { - $a[self::FIELD_VALUE_TIME] = $v->getValue(); - $a[self::FIELD_VALUE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_TIME] = $v; + } } if (null !== ($v = $this->getValueUri())) { - $a[self::FIELD_VALUE_URI] = $v->getValue(); - $a[self::FIELD_VALUE_URI_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_URI] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_URI_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_URI] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRQuestionnaireResponse/FHIRQuestionnaireResponseItem.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRQuestionnaireResponse/FHIRQuestionnaireResponseItem.php index 7808ee97e1..37c8ed8049 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRQuestionnaireResponse/FHIRQuestionnaireResponseItem.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRQuestionnaireResponse/FHIRQuestionnaireResponseItem.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -81,10 +81,6 @@ class FHIRQuestionnaireResponseItem extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_QUESTIONNAIRE_RESPONSE_DOT_ITEM; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ANSWER = 'answer'; const FIELD_DEFINITION = 'definition'; const FIELD_DEFINITION_EXT = '_definition'; @@ -165,6 +161,9 @@ class FHIRQuestionnaireResponseItem extends FHIRBackboneElement */ protected $text = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRQuestionnaireResponseItem Constructor * @param null|array $data @@ -184,6 +183,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ANSWER])) { if (is_array($data[self::FIELD_ANSWER])) { foreach($data[self::FIELD_ANSWER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRQuestionnaireResponseAnswer) { $this->addAnswer($v); } else { @@ -202,8 +204,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DEFINITION] instanceof FHIRUri) { $this->setDefinition($data[self::FIELD_DEFINITION]); - } elseif ($ext && is_scalar($data[self::FIELD_DEFINITION])) { - $this->setDefinition(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_DEFINITION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DEFINITION])) { + $this->setDefinition(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_DEFINITION]] + $ext)); + } else if (is_array($data[self::FIELD_DEFINITION])) { + $this->setDefinition(new FHIRUri(array_merge($ext, $data[self::FIELD_DEFINITION]))); + } } else { $this->setDefinition(new FHIRUri($data[self::FIELD_DEFINITION])); } @@ -211,6 +217,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ITEM])) { if (is_array($data[self::FIELD_ITEM])) { foreach($data[self::FIELD_ITEM] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRQuestionnaireResponseItem) { $this->addItem($v); } else { @@ -229,8 +238,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_LINK_ID] instanceof FHIRString) { $this->setLinkId($data[self::FIELD_LINK_ID]); - } elseif ($ext && is_scalar($data[self::FIELD_LINK_ID])) { - $this->setLinkId(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_LINK_ID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_LINK_ID])) { + $this->setLinkId(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_LINK_ID]] + $ext)); + } else if (is_array($data[self::FIELD_LINK_ID])) { + $this->setLinkId(new FHIRString(array_merge($ext, $data[self::FIELD_LINK_ID]))); + } } else { $this->setLinkId(new FHIRString($data[self::FIELD_LINK_ID])); } @@ -248,8 +261,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TEXT] instanceof FHIRString) { $this->setText($data[self::FIELD_TEXT]); - } elseif ($ext && is_scalar($data[self::FIELD_TEXT])) { - $this->setText(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TEXT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TEXT])) { + $this->setText(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TEXT]] + $ext)); + } else if (is_array($data[self::FIELD_TEXT])) { + $this->setText(new FHIRString(array_merge($ext, $data[self::FIELD_TEXT]))); + } } else { $this->setText(new FHIRString($data[self::FIELD_TEXT])); } @@ -662,7 +679,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDefinition())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFINITION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getItem())) { foreach($vs as $v) { if (null === $v) { @@ -674,7 +690,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getLinkId())) { $v->xmlSerialize($sxe->addChild(self::FIELD_LINK_ID, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSubject())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBJECT, null, $v->_getFHIRXMLNamespace())); } @@ -694,22 +709,43 @@ public function jsonSerialize() $a[self::FIELD_ANSWER] = $vs; } if (null !== ($v = $this->getDefinition())) { - $a[self::FIELD_DEFINITION] = $v->getValue(); - $a[self::FIELD_DEFINITION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DEFINITION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DEFINITION_EXT] = $enc; + } + } else { + $a[self::FIELD_DEFINITION] = $v; + } } if ([] !== ($vs = $this->getItem())) { $a[self::FIELD_ITEM] = $vs; } if (null !== ($v = $this->getLinkId())) { - $a[self::FIELD_LINK_ID] = $v->getValue(); - $a[self::FIELD_LINK_ID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_LINK_ID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_LINK_ID_EXT] = $enc; + } + } else { + $a[self::FIELD_LINK_ID] = $v; + } } if (null !== ($v = $this->getSubject())) { $a[self::FIELD_SUBJECT] = $v; } if (null !== ($v = $this->getText())) { - $a[self::FIELD_TEXT] = $v->getValue(); - $a[self::FIELD_TEXT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TEXT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TEXT_EXT] = $enc; + } + } else { + $a[self::FIELD_TEXT] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRReferralRequest/FHIRReferralRequestRequester.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRReferralRequest/FHIRReferralRequestRequester.php index 5fcad78d71..745ea11270 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRReferralRequest/FHIRReferralRequestRequester.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRReferralRequest/FHIRReferralRequestRequester.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRReferralRequestRequester extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_REFERRAL_REQUEST_DOT_REQUESTER; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_AGENT = 'agent'; const FIELD_ON_BEHALF_OF = 'onBehalfOf'; @@ -107,6 +103,9 @@ class FHIRReferralRequestRequester extends FHIRBackboneElement */ protected $onBehalfOf = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRReferralRequestRequester Constructor * @param null|array $data @@ -308,7 +307,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getAgent())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AGENT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOnBehalfOf())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ON_BEHALF_OF, null, $v->_getFHIRXMLNamespace())); } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRRequestGroup/FHIRRequestGroupAction.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRRequestGroup/FHIRRequestGroupAction.php index ddbea8fe01..c6f91e104f 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRRequestGroup/FHIRRequestGroupAction.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRRequestGroup/FHIRRequestGroupAction.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -92,10 +92,6 @@ class FHIRRequestGroupAction extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_REQUEST_GROUP_DOT_ACTION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ACTION = 'action'; const FIELD_CARDINALITY_BEHAVIOR = 'cardinalityBehavior'; const FIELD_CARDINALITY_BEHAVIOR_EXT = '_cardinalityBehavior'; @@ -122,6 +118,7 @@ class FHIRRequestGroupAction extends FHIRBackboneElement const FIELD_TIMING_DATE_TIME = 'timingDateTime'; const FIELD_TIMING_DATE_TIME_EXT = '_timingDateTime'; const FIELD_TIMING_DURATION = 'timingDuration'; + const FIELD_TIMING_DURATION_EXT = '_timingDuration'; const FIELD_TIMING_PERIOD = 'timingPeriod'; const FIELD_TIMING_RANGE = 'timingRange'; const FIELD_TIMING_TIMING = 'timingTiming'; @@ -381,6 +378,9 @@ class FHIRRequestGroupAction extends FHIRBackboneElement */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRRequestGroupAction Constructor * @param null|array $data @@ -400,6 +400,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ACTION])) { if (is_array($data[self::FIELD_ACTION])) { foreach($data[self::FIELD_ACTION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRRequestGroupAction) { $this->addAction($v); } else { @@ -418,8 +421,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CARDINALITY_BEHAVIOR] instanceof FHIRActionCardinalityBehavior) { $this->setCardinalityBehavior($data[self::FIELD_CARDINALITY_BEHAVIOR]); - } elseif ($ext && is_scalar($data[self::FIELD_CARDINALITY_BEHAVIOR])) { - $this->setCardinalityBehavior(new FHIRActionCardinalityBehavior([FHIRActionCardinalityBehavior::FIELD_VALUE => $data[self::FIELD_CARDINALITY_BEHAVIOR]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CARDINALITY_BEHAVIOR])) { + $this->setCardinalityBehavior(new FHIRActionCardinalityBehavior([FHIRActionCardinalityBehavior::FIELD_VALUE => $data[self::FIELD_CARDINALITY_BEHAVIOR]] + $ext)); + } else if (is_array($data[self::FIELD_CARDINALITY_BEHAVIOR])) { + $this->setCardinalityBehavior(new FHIRActionCardinalityBehavior(array_merge($ext, $data[self::FIELD_CARDINALITY_BEHAVIOR]))); + } } else { $this->setCardinalityBehavior(new FHIRActionCardinalityBehavior($data[self::FIELD_CARDINALITY_BEHAVIOR])); } @@ -427,6 +434,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CODE])) { if (is_array($data[self::FIELD_CODE])) { foreach($data[self::FIELD_CODE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addCode($v); } else { @@ -442,6 +452,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CONDITION])) { if (is_array($data[self::FIELD_CONDITION])) { foreach($data[self::FIELD_CONDITION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRRequestGroupCondition) { $this->addCondition($v); } else { @@ -460,8 +473,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -469,6 +486,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_DOCUMENTATION])) { if (is_array($data[self::FIELD_DOCUMENTATION])) { foreach($data[self::FIELD_DOCUMENTATION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRRelatedArtifact) { $this->addDocumentation($v); } else { @@ -487,8 +507,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_GROUPING_BEHAVIOR] instanceof FHIRActionGroupingBehavior) { $this->setGroupingBehavior($data[self::FIELD_GROUPING_BEHAVIOR]); - } elseif ($ext && is_scalar($data[self::FIELD_GROUPING_BEHAVIOR])) { - $this->setGroupingBehavior(new FHIRActionGroupingBehavior([FHIRActionGroupingBehavior::FIELD_VALUE => $data[self::FIELD_GROUPING_BEHAVIOR]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_GROUPING_BEHAVIOR])) { + $this->setGroupingBehavior(new FHIRActionGroupingBehavior([FHIRActionGroupingBehavior::FIELD_VALUE => $data[self::FIELD_GROUPING_BEHAVIOR]] + $ext)); + } else if (is_array($data[self::FIELD_GROUPING_BEHAVIOR])) { + $this->setGroupingBehavior(new FHIRActionGroupingBehavior(array_merge($ext, $data[self::FIELD_GROUPING_BEHAVIOR]))); + } } else { $this->setGroupingBehavior(new FHIRActionGroupingBehavior($data[self::FIELD_GROUPING_BEHAVIOR])); } @@ -499,8 +523,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_LABEL] instanceof FHIRString) { $this->setLabel($data[self::FIELD_LABEL]); - } elseif ($ext && is_scalar($data[self::FIELD_LABEL])) { - $this->setLabel(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_LABEL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_LABEL])) { + $this->setLabel(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_LABEL]] + $ext)); + } else if (is_array($data[self::FIELD_LABEL])) { + $this->setLabel(new FHIRString(array_merge($ext, $data[self::FIELD_LABEL]))); + } } else { $this->setLabel(new FHIRString($data[self::FIELD_LABEL])); } @@ -508,6 +536,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PARTICIPANT])) { if (is_array($data[self::FIELD_PARTICIPANT])) { foreach($data[self::FIELD_PARTICIPANT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addParticipant($v); } else { @@ -526,8 +557,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PRECHECK_BEHAVIOR] instanceof FHIRActionPrecheckBehavior) { $this->setPrecheckBehavior($data[self::FIELD_PRECHECK_BEHAVIOR]); - } elseif ($ext && is_scalar($data[self::FIELD_PRECHECK_BEHAVIOR])) { - $this->setPrecheckBehavior(new FHIRActionPrecheckBehavior([FHIRActionPrecheckBehavior::FIELD_VALUE => $data[self::FIELD_PRECHECK_BEHAVIOR]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PRECHECK_BEHAVIOR])) { + $this->setPrecheckBehavior(new FHIRActionPrecheckBehavior([FHIRActionPrecheckBehavior::FIELD_VALUE => $data[self::FIELD_PRECHECK_BEHAVIOR]] + $ext)); + } else if (is_array($data[self::FIELD_PRECHECK_BEHAVIOR])) { + $this->setPrecheckBehavior(new FHIRActionPrecheckBehavior(array_merge($ext, $data[self::FIELD_PRECHECK_BEHAVIOR]))); + } } else { $this->setPrecheckBehavior(new FHIRActionPrecheckBehavior($data[self::FIELD_PRECHECK_BEHAVIOR])); } @@ -535,6 +570,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_RELATED_ACTION])) { if (is_array($data[self::FIELD_RELATED_ACTION])) { foreach($data[self::FIELD_RELATED_ACTION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRRequestGroupRelatedAction) { $this->addRelatedAction($v); } else { @@ -553,8 +591,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_REQUIRED_BEHAVIOR] instanceof FHIRActionRequiredBehavior) { $this->setRequiredBehavior($data[self::FIELD_REQUIRED_BEHAVIOR]); - } elseif ($ext && is_scalar($data[self::FIELD_REQUIRED_BEHAVIOR])) { - $this->setRequiredBehavior(new FHIRActionRequiredBehavior([FHIRActionRequiredBehavior::FIELD_VALUE => $data[self::FIELD_REQUIRED_BEHAVIOR]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_REQUIRED_BEHAVIOR])) { + $this->setRequiredBehavior(new FHIRActionRequiredBehavior([FHIRActionRequiredBehavior::FIELD_VALUE => $data[self::FIELD_REQUIRED_BEHAVIOR]] + $ext)); + } else if (is_array($data[self::FIELD_REQUIRED_BEHAVIOR])) { + $this->setRequiredBehavior(new FHIRActionRequiredBehavior(array_merge($ext, $data[self::FIELD_REQUIRED_BEHAVIOR]))); + } } else { $this->setRequiredBehavior(new FHIRActionRequiredBehavior($data[self::FIELD_REQUIRED_BEHAVIOR])); } @@ -572,8 +614,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SELECTION_BEHAVIOR] instanceof FHIRActionSelectionBehavior) { $this->setSelectionBehavior($data[self::FIELD_SELECTION_BEHAVIOR]); - } elseif ($ext && is_scalar($data[self::FIELD_SELECTION_BEHAVIOR])) { - $this->setSelectionBehavior(new FHIRActionSelectionBehavior([FHIRActionSelectionBehavior::FIELD_VALUE => $data[self::FIELD_SELECTION_BEHAVIOR]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SELECTION_BEHAVIOR])) { + $this->setSelectionBehavior(new FHIRActionSelectionBehavior([FHIRActionSelectionBehavior::FIELD_VALUE => $data[self::FIELD_SELECTION_BEHAVIOR]] + $ext)); + } else if (is_array($data[self::FIELD_SELECTION_BEHAVIOR])) { + $this->setSelectionBehavior(new FHIRActionSelectionBehavior(array_merge($ext, $data[self::FIELD_SELECTION_BEHAVIOR]))); + } } else { $this->setSelectionBehavior(new FHIRActionSelectionBehavior($data[self::FIELD_SELECTION_BEHAVIOR])); } @@ -584,8 +630,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TEXT_EQUIVALENT] instanceof FHIRString) { $this->setTextEquivalent($data[self::FIELD_TEXT_EQUIVALENT]); - } elseif ($ext && is_scalar($data[self::FIELD_TEXT_EQUIVALENT])) { - $this->setTextEquivalent(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TEXT_EQUIVALENT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TEXT_EQUIVALENT])) { + $this->setTextEquivalent(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TEXT_EQUIVALENT]] + $ext)); + } else if (is_array($data[self::FIELD_TEXT_EQUIVALENT])) { + $this->setTextEquivalent(new FHIRString(array_merge($ext, $data[self::FIELD_TEXT_EQUIVALENT]))); + } } else { $this->setTextEquivalent(new FHIRString($data[self::FIELD_TEXT_EQUIVALENT])); } @@ -596,15 +646,28 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TIMING_DATE_TIME] instanceof FHIRDateTime) { $this->setTimingDateTime($data[self::FIELD_TIMING_DATE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_TIMING_DATE_TIME])) { - $this->setTimingDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_TIMING_DATE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TIMING_DATE_TIME])) { + $this->setTimingDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_TIMING_DATE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_TIMING_DATE_TIME])) { + $this->setTimingDateTime(new FHIRDateTime(array_merge($ext, $data[self::FIELD_TIMING_DATE_TIME]))); + } } else { $this->setTimingDateTime(new FHIRDateTime($data[self::FIELD_TIMING_DATE_TIME])); } } if (isset($data[self::FIELD_TIMING_DURATION])) { + $ext = (isset($data[self::FIELD_TIMING_DURATION_EXT]) && is_array($data[self::FIELD_TIMING_DURATION_EXT])) + ? $data[self::FIELD_TIMING_DURATION_EXT] + : null; if ($data[self::FIELD_TIMING_DURATION] instanceof FHIRDuration) { $this->setTimingDuration($data[self::FIELD_TIMING_DURATION]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TIMING_DURATION])) { + $this->setTimingDuration(new FHIRDuration([FHIRDuration::FIELD_VALUE => $data[self::FIELD_TIMING_DURATION]] + $ext)); + } else if (is_array($data[self::FIELD_TIMING_DURATION])) { + $this->setTimingDuration(new FHIRDuration(array_merge($ext, $data[self::FIELD_TIMING_DURATION]))); + } } else { $this->setTimingDuration(new FHIRDuration($data[self::FIELD_TIMING_DURATION])); } @@ -636,8 +699,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TITLE] instanceof FHIRString) { $this->setTitle($data[self::FIELD_TITLE]); - } elseif ($ext && is_scalar($data[self::FIELD_TITLE])) { - $this->setTitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TITLE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TITLE])) { + $this->setTitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TITLE]] + $ext)); + } else if (is_array($data[self::FIELD_TITLE])) { + $this->setTitle(new FHIRString(array_merge($ext, $data[self::FIELD_TITLE]))); + } } else { $this->setTitle(new FHIRString($data[self::FIELD_TITLE])); } @@ -1732,11 +1799,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_ACTION, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getCardinalityBehavior())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CARDINALITY_BEHAVIOR, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getCode())) { foreach($vs as $v) { if (null === $v) { @@ -1745,7 +1810,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getCondition())) { foreach($vs as $v) { if (null === $v) { @@ -1757,7 +1821,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESCRIPTION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getDocumentation())) { foreach($vs as $v) { if (null === $v) { @@ -1766,14 +1829,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_DOCUMENTATION, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getGroupingBehavior())) { $v->xmlSerialize($sxe->addChild(self::FIELD_GROUPING_BEHAVIOR, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getLabel())) { $v->xmlSerialize($sxe->addChild(self::FIELD_LABEL, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getParticipant())) { foreach($vs as $v) { if (null === $v) { @@ -1782,11 +1843,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_PARTICIPANT, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getPrecheckBehavior())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PRECHECK_BEHAVIOR, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getRelatedAction())) { foreach($vs as $v) { if (null === $v) { @@ -1795,15 +1854,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_RELATED_ACTION, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getRequiredBehavior())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REQUIRED_BEHAVIOR, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getResource())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RESOURCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSelectionBehavior())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SELECTION_BEHAVIOR, null, $v->_getFHIRXMLNamespace())); } @@ -1813,26 +1869,21 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getTimingDateTime())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TIMING_DATE_TIME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getTimingDuration())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TIMING_DURATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getTimingPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TIMING_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getTimingRange())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TIMING_RANGE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getTimingTiming())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TIMING_TIMING, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getTitle())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TITLE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -1849,7 +1900,15 @@ public function jsonSerialize() $a[self::FIELD_ACTION] = $vs; } if (null !== ($v = $this->getCardinalityBehavior())) { - $a[self::FIELD_CARDINALITY_BEHAVIOR] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CARDINALITY_BEHAVIOR] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CARDINALITY_BEHAVIOR_EXT] = $enc; + } + } else { + $a[self::FIELD_CARDINALITY_BEHAVIOR] = $v; + } } if ([] !== ($vs = $this->getCode())) { $a[self::FIELD_CODE] = $vs; @@ -1858,47 +1917,115 @@ public function jsonSerialize() $a[self::FIELD_CONDITION] = $vs; } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if ([] !== ($vs = $this->getDocumentation())) { $a[self::FIELD_DOCUMENTATION] = $vs; } if (null !== ($v = $this->getGroupingBehavior())) { - $a[self::FIELD_GROUPING_BEHAVIOR] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_GROUPING_BEHAVIOR] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_GROUPING_BEHAVIOR_EXT] = $enc; + } + } else { + $a[self::FIELD_GROUPING_BEHAVIOR] = $v; + } } if (null !== ($v = $this->getLabel())) { - $a[self::FIELD_LABEL] = $v->getValue(); - $a[self::FIELD_LABEL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_LABEL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_LABEL_EXT] = $enc; + } + } else { + $a[self::FIELD_LABEL] = $v; + } } if ([] !== ($vs = $this->getParticipant())) { $a[self::FIELD_PARTICIPANT] = $vs; } if (null !== ($v = $this->getPrecheckBehavior())) { - $a[self::FIELD_PRECHECK_BEHAVIOR] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PRECHECK_BEHAVIOR] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PRECHECK_BEHAVIOR_EXT] = $enc; + } + } else { + $a[self::FIELD_PRECHECK_BEHAVIOR] = $v; + } } if ([] !== ($vs = $this->getRelatedAction())) { $a[self::FIELD_RELATED_ACTION] = $vs; } if (null !== ($v = $this->getRequiredBehavior())) { - $a[self::FIELD_REQUIRED_BEHAVIOR] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_REQUIRED_BEHAVIOR] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_REQUIRED_BEHAVIOR_EXT] = $enc; + } + } else { + $a[self::FIELD_REQUIRED_BEHAVIOR] = $v; + } } if (null !== ($v = $this->getResource())) { $a[self::FIELD_RESOURCE] = $v; } if (null !== ($v = $this->getSelectionBehavior())) { - $a[self::FIELD_SELECTION_BEHAVIOR] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SELECTION_BEHAVIOR] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SELECTION_BEHAVIOR_EXT] = $enc; + } + } else { + $a[self::FIELD_SELECTION_BEHAVIOR] = $v; + } } if (null !== ($v = $this->getTextEquivalent())) { - $a[self::FIELD_TEXT_EQUIVALENT] = $v->getValue(); - $a[self::FIELD_TEXT_EQUIVALENT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TEXT_EQUIVALENT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TEXT_EQUIVALENT_EXT] = $enc; + } + } else { + $a[self::FIELD_TEXT_EQUIVALENT] = $v; + } } if (null !== ($v = $this->getTimingDateTime())) { - $a[self::FIELD_TIMING_DATE_TIME] = $v->getValue(); - $a[self::FIELD_TIMING_DATE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TIMING_DATE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TIMING_DATE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_TIMING_DATE_TIME] = $v; + } } if (null !== ($v = $this->getTimingDuration())) { - $a[self::FIELD_TIMING_DURATION] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TIMING_DURATION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TIMING_DURATION_EXT] = $enc; + } + } else { + $a[self::FIELD_TIMING_DURATION] = $v; + } } if (null !== ($v = $this->getTimingPeriod())) { $a[self::FIELD_TIMING_PERIOD] = $v; @@ -1910,8 +2037,15 @@ public function jsonSerialize() $a[self::FIELD_TIMING_TIMING] = $v; } if (null !== ($v = $this->getTitle())) { - $a[self::FIELD_TITLE] = $v->getValue(); - $a[self::FIELD_TITLE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TITLE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TITLE_EXT] = $enc; + } + } else { + $a[self::FIELD_TITLE] = $v; + } } if (null !== ($v = $this->getType())) { $a[self::FIELD_TYPE] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRRequestGroup/FHIRRequestGroupCondition.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRRequestGroup/FHIRRequestGroupCondition.php index db152460d7..586ce434f1 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRRequestGroup/FHIRRequestGroupCondition.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRRequestGroup/FHIRRequestGroupCondition.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRRequestGroupCondition extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_REQUEST_GROUP_DOT_CONDITION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DESCRIPTION = 'description'; const FIELD_DESCRIPTION_EXT = '_description'; const FIELD_EXPRESSION = 'expression'; @@ -137,6 +133,9 @@ class FHIRRequestGroupCondition extends FHIRBackboneElement */ protected $language = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRRequestGroupCondition Constructor * @param null|array $data @@ -159,8 +158,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -171,8 +174,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EXPRESSION] instanceof FHIRString) { $this->setExpression($data[self::FIELD_EXPRESSION]); - } elseif ($ext && is_scalar($data[self::FIELD_EXPRESSION])) { - $this->setExpression(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_EXPRESSION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EXPRESSION])) { + $this->setExpression(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_EXPRESSION]] + $ext)); + } else if (is_array($data[self::FIELD_EXPRESSION])) { + $this->setExpression(new FHIRString(array_merge($ext, $data[self::FIELD_EXPRESSION]))); + } } else { $this->setExpression(new FHIRString($data[self::FIELD_EXPRESSION])); } @@ -183,8 +190,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_KIND] instanceof FHIRActionConditionKind) { $this->setKind($data[self::FIELD_KIND]); - } elseif ($ext && is_scalar($data[self::FIELD_KIND])) { - $this->setKind(new FHIRActionConditionKind([FHIRActionConditionKind::FIELD_VALUE => $data[self::FIELD_KIND]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_KIND])) { + $this->setKind(new FHIRActionConditionKind([FHIRActionConditionKind::FIELD_VALUE => $data[self::FIELD_KIND]] + $ext)); + } else if (is_array($data[self::FIELD_KIND])) { + $this->setKind(new FHIRActionConditionKind(array_merge($ext, $data[self::FIELD_KIND]))); + } } else { $this->setKind(new FHIRActionConditionKind($data[self::FIELD_KIND])); } @@ -195,8 +206,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_LANGUAGE] instanceof FHIRString) { $this->setLanguage($data[self::FIELD_LANGUAGE]); - } elseif ($ext && is_scalar($data[self::FIELD_LANGUAGE])) { - $this->setLanguage(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_LANGUAGE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_LANGUAGE])) { + $this->setLanguage(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_LANGUAGE]] + $ext)); + } else if (is_array($data[self::FIELD_LANGUAGE])) { + $this->setLanguage(new FHIRString(array_merge($ext, $data[self::FIELD_LANGUAGE]))); + } } else { $this->setLanguage(new FHIRString($data[self::FIELD_LANGUAGE])); } @@ -469,13 +484,13 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getDescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESCRIPTION, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getExpression())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EXPRESSION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getKind())) { $v->xmlSerialize($sxe->addChild(self::FIELD_KIND, null, $v->_getFHIRXMLNamespace())); } @@ -492,19 +507,48 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if (null !== ($v = $this->getExpression())) { - $a[self::FIELD_EXPRESSION] = $v->getValue(); - $a[self::FIELD_EXPRESSION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EXPRESSION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EXPRESSION_EXT] = $enc; + } + } else { + $a[self::FIELD_EXPRESSION] = $v; + } } if (null !== ($v = $this->getKind())) { - $a[self::FIELD_KIND] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_KIND] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_KIND_EXT] = $enc; + } + } else { + $a[self::FIELD_KIND] = $v; + } } if (null !== ($v = $this->getLanguage())) { - $a[self::FIELD_LANGUAGE] = $v->getValue(); - $a[self::FIELD_LANGUAGE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_LANGUAGE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_LANGUAGE_EXT] = $enc; + } + } else { + $a[self::FIELD_LANGUAGE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRRequestGroup/FHIRRequestGroupRelatedAction.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRRequestGroup/FHIRRequestGroupRelatedAction.php index d670235ede..e4fec6b43e 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRRequestGroup/FHIRRequestGroupRelatedAction.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRRequestGroup/FHIRRequestGroupRelatedAction.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -81,13 +81,10 @@ class FHIRRequestGroupRelatedAction extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_REQUEST_GROUP_DOT_RELATED_ACTION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ACTION_ID = 'actionId'; const FIELD_ACTION_ID_EXT = '_actionId'; const FIELD_OFFSET_DURATION = 'offsetDuration'; + const FIELD_OFFSET_DURATION_EXT = '_offsetDuration'; const FIELD_OFFSET_RANGE = 'offsetRange'; const FIELD_RELATIONSHIP = 'relationship'; const FIELD_RELATIONSHIP_EXT = '_relationship'; @@ -140,6 +137,9 @@ class FHIRRequestGroupRelatedAction extends FHIRBackboneElement */ protected $relationship = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRRequestGroupRelatedAction Constructor * @param null|array $data @@ -162,15 +162,28 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ACTION_ID] instanceof FHIRId) { $this->setActionId($data[self::FIELD_ACTION_ID]); - } elseif ($ext && is_scalar($data[self::FIELD_ACTION_ID])) { - $this->setActionId(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_ACTION_ID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ACTION_ID])) { + $this->setActionId(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_ACTION_ID]] + $ext)); + } else if (is_array($data[self::FIELD_ACTION_ID])) { + $this->setActionId(new FHIRId(array_merge($ext, $data[self::FIELD_ACTION_ID]))); + } } else { $this->setActionId(new FHIRId($data[self::FIELD_ACTION_ID])); } } if (isset($data[self::FIELD_OFFSET_DURATION])) { + $ext = (isset($data[self::FIELD_OFFSET_DURATION_EXT]) && is_array($data[self::FIELD_OFFSET_DURATION_EXT])) + ? $data[self::FIELD_OFFSET_DURATION_EXT] + : null; if ($data[self::FIELD_OFFSET_DURATION] instanceof FHIRDuration) { $this->setOffsetDuration($data[self::FIELD_OFFSET_DURATION]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_OFFSET_DURATION])) { + $this->setOffsetDuration(new FHIRDuration([FHIRDuration::FIELD_VALUE => $data[self::FIELD_OFFSET_DURATION]] + $ext)); + } else if (is_array($data[self::FIELD_OFFSET_DURATION])) { + $this->setOffsetDuration(new FHIRDuration(array_merge($ext, $data[self::FIELD_OFFSET_DURATION]))); + } } else { $this->setOffsetDuration(new FHIRDuration($data[self::FIELD_OFFSET_DURATION])); } @@ -188,8 +201,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_RELATIONSHIP] instanceof FHIRActionRelationshipType) { $this->setRelationship($data[self::FIELD_RELATIONSHIP]); - } elseif ($ext && is_scalar($data[self::FIELD_RELATIONSHIP])) { - $this->setRelationship(new FHIRActionRelationshipType([FHIRActionRelationshipType::FIELD_VALUE => $data[self::FIELD_RELATIONSHIP]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_RELATIONSHIP])) { + $this->setRelationship(new FHIRActionRelationshipType([FHIRActionRelationshipType::FIELD_VALUE => $data[self::FIELD_RELATIONSHIP]] + $ext)); + } else if (is_array($data[self::FIELD_RELATIONSHIP])) { + $this->setRelationship(new FHIRActionRelationshipType(array_merge($ext, $data[self::FIELD_RELATIONSHIP]))); + } } else { $this->setRelationship(new FHIRActionRelationshipType($data[self::FIELD_RELATIONSHIP])); } @@ -446,18 +463,16 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getActionId())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ACTION_ID, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOffsetDuration())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OFFSET_DURATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOffsetRange())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OFFSET_RANGE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRelationship())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RELATIONSHIP, null, $v->_getFHIRXMLNamespace())); } @@ -471,17 +486,40 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getActionId())) { - $a[self::FIELD_ACTION_ID] = $v->getValue(); - $a[self::FIELD_ACTION_ID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ACTION_ID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ACTION_ID_EXT] = $enc; + } + } else { + $a[self::FIELD_ACTION_ID] = $v; + } } if (null !== ($v = $this->getOffsetDuration())) { - $a[self::FIELD_OFFSET_DURATION] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_OFFSET_DURATION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_OFFSET_DURATION_EXT] = $enc; + } + } else { + $a[self::FIELD_OFFSET_DURATION] = $v; + } } if (null !== ($v = $this->getOffsetRange())) { $a[self::FIELD_OFFSET_RANGE] = $v; } if (null !== ($v = $this->getRelationship())) { - $a[self::FIELD_RELATIONSHIP] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_RELATIONSHIP] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_RELATIONSHIP_EXT] = $enc; + } + } else { + $a[self::FIELD_RELATIONSHIP] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRResearchStudy/FHIRResearchStudyArm.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRResearchStudy/FHIRResearchStudyArm.php index 516a9f6f36..7550d8c742 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRResearchStudy/FHIRResearchStudyArm.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRResearchStudy/FHIRResearchStudyArm.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -83,10 +83,6 @@ class FHIRResearchStudyArm extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_RESEARCH_STUDY_DOT_ARM; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CODE = 'code'; const FIELD_DESCRIPTION = 'description'; const FIELD_DESCRIPTION_EXT = '_description'; @@ -129,6 +125,9 @@ class FHIRResearchStudyArm extends FHIRBackboneElement */ protected $name = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRResearchStudyArm Constructor * @param null|array $data @@ -158,8 +157,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -170,8 +173,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -427,12 +434,26 @@ public function jsonSerialize() $a[self::FIELD_CODE] = $v; } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRRiskAssessment/FHIRRiskAssessmentPrediction.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRRiskAssessment/FHIRRiskAssessmentPrediction.php index c577878476..2676020b73 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRRiskAssessment/FHIRRiskAssessmentPrediction.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRRiskAssessment/FHIRRiskAssessmentPrediction.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -82,10 +82,6 @@ class FHIRRiskAssessmentPrediction extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_RISK_ASSESSMENT_DOT_PREDICTION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_OUTCOME = 'outcome'; const FIELD_PROBABILITY_DECIMAL = 'probabilityDecimal'; const FIELD_PROBABILITY_DECIMAL_EXT = '_probabilityDecimal'; @@ -197,6 +193,9 @@ class FHIRRiskAssessmentPrediction extends FHIRBackboneElement */ protected $whenRange = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRRiskAssessmentPrediction Constructor * @param null|array $data @@ -226,8 +225,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PROBABILITY_DECIMAL] instanceof FHIRDecimal) { $this->setProbabilityDecimal($data[self::FIELD_PROBABILITY_DECIMAL]); - } elseif ($ext && is_scalar($data[self::FIELD_PROBABILITY_DECIMAL])) { - $this->setProbabilityDecimal(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_PROBABILITY_DECIMAL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PROBABILITY_DECIMAL])) { + $this->setProbabilityDecimal(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_PROBABILITY_DECIMAL]] + $ext)); + } else if (is_array($data[self::FIELD_PROBABILITY_DECIMAL])) { + $this->setProbabilityDecimal(new FHIRDecimal(array_merge($ext, $data[self::FIELD_PROBABILITY_DECIMAL]))); + } } else { $this->setProbabilityDecimal(new FHIRDecimal($data[self::FIELD_PROBABILITY_DECIMAL])); } @@ -252,8 +255,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_RATIONALE] instanceof FHIRString) { $this->setRationale($data[self::FIELD_RATIONALE]); - } elseif ($ext && is_scalar($data[self::FIELD_RATIONALE])) { - $this->setRationale(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_RATIONALE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_RATIONALE])) { + $this->setRationale(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_RATIONALE]] + $ext)); + } else if (is_array($data[self::FIELD_RATIONALE])) { + $this->setRationale(new FHIRString(array_merge($ext, $data[self::FIELD_RATIONALE]))); + } } else { $this->setRationale(new FHIRString($data[self::FIELD_RATIONALE])); } @@ -264,8 +271,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_RELATIVE_RISK] instanceof FHIRDecimal) { $this->setRelativeRisk($data[self::FIELD_RELATIVE_RISK]); - } elseif ($ext && is_scalar($data[self::FIELD_RELATIVE_RISK])) { - $this->setRelativeRisk(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_RELATIVE_RISK]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_RELATIVE_RISK])) { + $this->setRelativeRisk(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_RELATIVE_RISK]] + $ext)); + } else if (is_array($data[self::FIELD_RELATIVE_RISK])) { + $this->setRelativeRisk(new FHIRDecimal(array_merge($ext, $data[self::FIELD_RELATIVE_RISK]))); + } } else { $this->setRelativeRisk(new FHIRDecimal($data[self::FIELD_RELATIVE_RISK])); } @@ -711,11 +722,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getProbabilityDecimal())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PROBABILITY_DECIMAL, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getProbabilityRange())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PROBABILITY_RANGE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getQualitativeRisk())) { $v->xmlSerialize($sxe->addChild(self::FIELD_QUALITATIVE_RISK, null, $v->_getFHIRXMLNamespace())); } @@ -725,11 +734,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getRelativeRisk())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RELATIVE_RISK, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getWhenPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_WHEN_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getWhenRange())) { $v->xmlSerialize($sxe->addChild(self::FIELD_WHEN_RANGE, null, $v->_getFHIRXMLNamespace())); } @@ -746,8 +753,15 @@ public function jsonSerialize() $a[self::FIELD_OUTCOME] = $v; } if (null !== ($v = $this->getProbabilityDecimal())) { - $a[self::FIELD_PROBABILITY_DECIMAL] = $v->getValue(); - $a[self::FIELD_PROBABILITY_DECIMAL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PROBABILITY_DECIMAL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PROBABILITY_DECIMAL_EXT] = $enc; + } + } else { + $a[self::FIELD_PROBABILITY_DECIMAL] = $v; + } } if (null !== ($v = $this->getProbabilityRange())) { $a[self::FIELD_PROBABILITY_RANGE] = $v; @@ -756,12 +770,26 @@ public function jsonSerialize() $a[self::FIELD_QUALITATIVE_RISK] = $v; } if (null !== ($v = $this->getRationale())) { - $a[self::FIELD_RATIONALE] = $v->getValue(); - $a[self::FIELD_RATIONALE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_RATIONALE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_RATIONALE_EXT] = $enc; + } + } else { + $a[self::FIELD_RATIONALE] = $v; + } } if (null !== ($v = $this->getRelativeRisk())) { - $a[self::FIELD_RELATIVE_RISK] = $v->getValue(); - $a[self::FIELD_RELATIVE_RISK_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_RELATIVE_RISK] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_RELATIVE_RISK_EXT] = $enc; + } + } else { + $a[self::FIELD_RELATIVE_RISK] = $v; + } } if (null !== ($v = $this->getWhenPeriod())) { $a[self::FIELD_WHEN_PERIOD] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRSearchParameter/FHIRSearchParameterComponent.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRSearchParameter/FHIRSearchParameterComponent.php index 8a329199de..105a4c72a1 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRSearchParameter/FHIRSearchParameterComponent.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRSearchParameter/FHIRSearchParameterComponent.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRSearchParameterComponent extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SEARCH_PARAMETER_DOT_COMPONENT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DEFINITION = 'definition'; const FIELD_EXPRESSION = 'expression'; const FIELD_EXPRESSION_EXT = '_expression'; @@ -110,6 +106,9 @@ class FHIRSearchParameterComponent extends FHIRBackboneElement */ protected $expression = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSearchParameterComponent Constructor * @param null|array $data @@ -139,8 +138,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EXPRESSION] instanceof FHIRString) { $this->setExpression($data[self::FIELD_EXPRESSION]); - } elseif ($ext && is_scalar($data[self::FIELD_EXPRESSION])) { - $this->setExpression(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_EXPRESSION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EXPRESSION])) { + $this->setExpression(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_EXPRESSION]] + $ext)); + } else if (is_array($data[self::FIELD_EXPRESSION])) { + $this->setExpression(new FHIRString(array_merge($ext, $data[self::FIELD_EXPRESSION]))); + } } else { $this->setExpression(new FHIRString($data[self::FIELD_EXPRESSION])); } @@ -345,8 +348,15 @@ public function jsonSerialize() $a[self::FIELD_DEFINITION] = $v; } if (null !== ($v = $this->getExpression())) { - $a[self::FIELD_EXPRESSION] = $v->getValue(); - $a[self::FIELD_EXPRESSION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EXPRESSION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EXPRESSION_EXT] = $enc; + } + } else { + $a[self::FIELD_EXPRESSION] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRSequence/FHIRSequenceQuality.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRSequence/FHIRSequenceQuality.php index 8c62af5e0f..a7d3431c04 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRSequence/FHIRSequenceQuality.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRSequence/FHIRSequenceQuality.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -81,10 +81,6 @@ class FHIRSequenceQuality extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SEQUENCE_DOT_QUALITY; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_END = 'end'; const FIELD_END_EXT = '_end'; const FIELD_F_SCORE = 'fScore'; @@ -295,6 +291,9 @@ class FHIRSequenceQuality extends FHIRBackboneElement */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSequenceQuality Constructor * @param null|array $data @@ -317,8 +316,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_END] instanceof FHIRInteger) { $this->setEnd($data[self::FIELD_END]); - } elseif ($ext && is_scalar($data[self::FIELD_END])) { - $this->setEnd(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_END]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_END])) { + $this->setEnd(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_END]] + $ext)); + } else if (is_array($data[self::FIELD_END])) { + $this->setEnd(new FHIRInteger(array_merge($ext, $data[self::FIELD_END]))); + } } else { $this->setEnd(new FHIRInteger($data[self::FIELD_END])); } @@ -329,8 +332,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_F_SCORE] instanceof FHIRDecimal) { $this->setFScore($data[self::FIELD_F_SCORE]); - } elseif ($ext && is_scalar($data[self::FIELD_F_SCORE])) { - $this->setFScore(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_F_SCORE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_F_SCORE])) { + $this->setFScore(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_F_SCORE]] + $ext)); + } else if (is_array($data[self::FIELD_F_SCORE])) { + $this->setFScore(new FHIRDecimal(array_merge($ext, $data[self::FIELD_F_SCORE]))); + } } else { $this->setFScore(new FHIRDecimal($data[self::FIELD_F_SCORE])); } @@ -341,8 +348,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_GT_FP] instanceof FHIRDecimal) { $this->setGtFP($data[self::FIELD_GT_FP]); - } elseif ($ext && is_scalar($data[self::FIELD_GT_FP])) { - $this->setGtFP(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_GT_FP]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_GT_FP])) { + $this->setGtFP(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_GT_FP]] + $ext)); + } else if (is_array($data[self::FIELD_GT_FP])) { + $this->setGtFP(new FHIRDecimal(array_merge($ext, $data[self::FIELD_GT_FP]))); + } } else { $this->setGtFP(new FHIRDecimal($data[self::FIELD_GT_FP])); } @@ -360,8 +371,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PRECISION] instanceof FHIRDecimal) { $this->setPrecision($data[self::FIELD_PRECISION]); - } elseif ($ext && is_scalar($data[self::FIELD_PRECISION])) { - $this->setPrecision(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_PRECISION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PRECISION])) { + $this->setPrecision(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_PRECISION]] + $ext)); + } else if (is_array($data[self::FIELD_PRECISION])) { + $this->setPrecision(new FHIRDecimal(array_merge($ext, $data[self::FIELD_PRECISION]))); + } } else { $this->setPrecision(new FHIRDecimal($data[self::FIELD_PRECISION])); } @@ -372,8 +387,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_QUERY_FP] instanceof FHIRDecimal) { $this->setQueryFP($data[self::FIELD_QUERY_FP]); - } elseif ($ext && is_scalar($data[self::FIELD_QUERY_FP])) { - $this->setQueryFP(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_QUERY_FP]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_QUERY_FP])) { + $this->setQueryFP(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_QUERY_FP]] + $ext)); + } else if (is_array($data[self::FIELD_QUERY_FP])) { + $this->setQueryFP(new FHIRDecimal(array_merge($ext, $data[self::FIELD_QUERY_FP]))); + } } else { $this->setQueryFP(new FHIRDecimal($data[self::FIELD_QUERY_FP])); } @@ -384,8 +403,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_QUERY_TP] instanceof FHIRDecimal) { $this->setQueryTP($data[self::FIELD_QUERY_TP]); - } elseif ($ext && is_scalar($data[self::FIELD_QUERY_TP])) { - $this->setQueryTP(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_QUERY_TP]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_QUERY_TP])) { + $this->setQueryTP(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_QUERY_TP]] + $ext)); + } else if (is_array($data[self::FIELD_QUERY_TP])) { + $this->setQueryTP(new FHIRDecimal(array_merge($ext, $data[self::FIELD_QUERY_TP]))); + } } else { $this->setQueryTP(new FHIRDecimal($data[self::FIELD_QUERY_TP])); } @@ -396,8 +419,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_RECALL] instanceof FHIRDecimal) { $this->setRecall($data[self::FIELD_RECALL]); - } elseif ($ext && is_scalar($data[self::FIELD_RECALL])) { - $this->setRecall(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_RECALL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_RECALL])) { + $this->setRecall(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_RECALL]] + $ext)); + } else if (is_array($data[self::FIELD_RECALL])) { + $this->setRecall(new FHIRDecimal(array_merge($ext, $data[self::FIELD_RECALL]))); + } } else { $this->setRecall(new FHIRDecimal($data[self::FIELD_RECALL])); } @@ -408,8 +435,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SCORE] instanceof FHIRQuantity) { $this->setScore($data[self::FIELD_SCORE]); - } elseif ($ext && is_scalar($data[self::FIELD_SCORE])) { - $this->setScore(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_SCORE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SCORE])) { + $this->setScore(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_SCORE]] + $ext)); + } else if (is_array($data[self::FIELD_SCORE])) { + $this->setScore(new FHIRQuantity(array_merge($ext, $data[self::FIELD_SCORE]))); + } } else { $this->setScore(new FHIRQuantity($data[self::FIELD_SCORE])); } @@ -427,8 +458,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_START] instanceof FHIRInteger) { $this->setStart($data[self::FIELD_START]); - } elseif ($ext && is_scalar($data[self::FIELD_START])) { - $this->setStart(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_START]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_START])) { + $this->setStart(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_START]] + $ext)); + } else if (is_array($data[self::FIELD_START])) { + $this->setStart(new FHIRInteger(array_merge($ext, $data[self::FIELD_START]))); + } } else { $this->setStart(new FHIRInteger($data[self::FIELD_START])); } @@ -439,8 +474,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TRUTH_FN] instanceof FHIRDecimal) { $this->setTruthFN($data[self::FIELD_TRUTH_FN]); - } elseif ($ext && is_scalar($data[self::FIELD_TRUTH_FN])) { - $this->setTruthFN(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_TRUTH_FN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TRUTH_FN])) { + $this->setTruthFN(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_TRUTH_FN]] + $ext)); + } else if (is_array($data[self::FIELD_TRUTH_FN])) { + $this->setTruthFN(new FHIRDecimal(array_merge($ext, $data[self::FIELD_TRUTH_FN]))); + } } else { $this->setTruthFN(new FHIRDecimal($data[self::FIELD_TRUTH_FN])); } @@ -451,8 +490,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TRUTH_TP] instanceof FHIRDecimal) { $this->setTruthTP($data[self::FIELD_TRUTH_TP]); - } elseif ($ext && is_scalar($data[self::FIELD_TRUTH_TP])) { - $this->setTruthTP(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_TRUTH_TP]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TRUTH_TP])) { + $this->setTruthTP(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_TRUTH_TP]] + $ext)); + } else if (is_array($data[self::FIELD_TRUTH_TP])) { + $this->setTruthTP(new FHIRDecimal(array_merge($ext, $data[self::FIELD_TRUTH_TP]))); + } } else { $this->setTruthTP(new FHIRDecimal($data[self::FIELD_TRUTH_TP])); } @@ -463,8 +506,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TYPE] instanceof FHIRQualityType) { $this->setType($data[self::FIELD_TYPE]); - } elseif ($ext && is_scalar($data[self::FIELD_TYPE])) { - $this->setType(new FHIRQualityType([FHIRQualityType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TYPE])) { + $this->setType(new FHIRQualityType([FHIRQualityType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } else if (is_array($data[self::FIELD_TYPE])) { + $this->setType(new FHIRQualityType(array_merge($ext, $data[self::FIELD_TYPE]))); + } } else { $this->setType(new FHIRQualityType($data[self::FIELD_TYPE])); } @@ -1200,6 +1247,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getEnd())) { $v->xmlSerialize($sxe->addChild(self::FIELD_END, null, $v->_getFHIRXMLNamespace())); } @@ -1209,7 +1257,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getGtFP())) { $v->xmlSerialize($sxe->addChild(self::FIELD_GT_FP, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getMethod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_METHOD, null, $v->_getFHIRXMLNamespace())); } @@ -1225,11 +1272,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getRecall())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RECALL, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getScore())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SCORE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStandardSequence())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STANDARD_SEQUENCE, null, $v->_getFHIRXMLNamespace())); } @@ -1242,7 +1287,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getTruthTP())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TRUTH_TP, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -1256,56 +1300,142 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getEnd())) { - $a[self::FIELD_END] = $v->getValue(); - $a[self::FIELD_END_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_END] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_END_EXT] = $enc; + } + } else { + $a[self::FIELD_END] = $v; + } } if (null !== ($v = $this->getFScore())) { - $a[self::FIELD_F_SCORE] = $v->getValue(); - $a[self::FIELD_F_SCORE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_F_SCORE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_F_SCORE_EXT] = $enc; + } + } else { + $a[self::FIELD_F_SCORE] = $v; + } } if (null !== ($v = $this->getGtFP())) { - $a[self::FIELD_GT_FP] = $v->getValue(); - $a[self::FIELD_GT_FP_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_GT_FP] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_GT_FP_EXT] = $enc; + } + } else { + $a[self::FIELD_GT_FP] = $v; + } } if (null !== ($v = $this->getMethod())) { $a[self::FIELD_METHOD] = $v; } if (null !== ($v = $this->getPrecision())) { - $a[self::FIELD_PRECISION] = $v->getValue(); - $a[self::FIELD_PRECISION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PRECISION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PRECISION_EXT] = $enc; + } + } else { + $a[self::FIELD_PRECISION] = $v; + } } if (null !== ($v = $this->getQueryFP())) { - $a[self::FIELD_QUERY_FP] = $v->getValue(); - $a[self::FIELD_QUERY_FP_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_QUERY_FP] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_QUERY_FP_EXT] = $enc; + } + } else { + $a[self::FIELD_QUERY_FP] = $v; + } } if (null !== ($v = $this->getQueryTP())) { - $a[self::FIELD_QUERY_TP] = $v->getValue(); - $a[self::FIELD_QUERY_TP_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_QUERY_TP] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_QUERY_TP_EXT] = $enc; + } + } else { + $a[self::FIELD_QUERY_TP] = $v; + } } if (null !== ($v = $this->getRecall())) { - $a[self::FIELD_RECALL] = $v->getValue(); - $a[self::FIELD_RECALL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_RECALL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_RECALL_EXT] = $enc; + } + } else { + $a[self::FIELD_RECALL] = $v; + } } if (null !== ($v = $this->getScore())) { - $a[self::FIELD_SCORE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SCORE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SCORE_EXT] = $enc; + } + } else { + $a[self::FIELD_SCORE] = $v; + } } if (null !== ($v = $this->getStandardSequence())) { $a[self::FIELD_STANDARD_SEQUENCE] = $v; } if (null !== ($v = $this->getStart())) { - $a[self::FIELD_START] = $v->getValue(); - $a[self::FIELD_START_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_START] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_START_EXT] = $enc; + } + } else { + $a[self::FIELD_START] = $v; + } } if (null !== ($v = $this->getTruthFN())) { - $a[self::FIELD_TRUTH_FN] = $v->getValue(); - $a[self::FIELD_TRUTH_FN_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TRUTH_FN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TRUTH_FN_EXT] = $enc; + } + } else { + $a[self::FIELD_TRUTH_FN] = $v; + } } if (null !== ($v = $this->getTruthTP())) { - $a[self::FIELD_TRUTH_TP] = $v->getValue(); - $a[self::FIELD_TRUTH_TP_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TRUTH_TP] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TRUTH_TP_EXT] = $enc; + } + } else { + $a[self::FIELD_TRUTH_TP] = $v; + } } if (null !== ($v = $this->getType())) { - $a[self::FIELD_TYPE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TYPE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TYPE_EXT] = $enc; + } + } else { + $a[self::FIELD_TYPE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRSequence/FHIRSequenceReferenceSeq.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRSequence/FHIRSequenceReferenceSeq.php index c9397b432c..03cc9c16f3 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRSequence/FHIRSequenceReferenceSeq.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRSequence/FHIRSequenceReferenceSeq.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRSequenceReferenceSeq extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SEQUENCE_DOT_REFERENCE_SEQ; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CHROMOSOME = 'chromosome'; const FIELD_GENOME_BUILD = 'genomeBuild'; const FIELD_GENOME_BUILD_EXT = '_genomeBuild'; @@ -202,6 +198,9 @@ class FHIRSequenceReferenceSeq extends FHIRBackboneElement */ protected $windowStart = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSequenceReferenceSeq Constructor * @param null|array $data @@ -231,8 +230,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_GENOME_BUILD] instanceof FHIRString) { $this->setGenomeBuild($data[self::FIELD_GENOME_BUILD]); - } elseif ($ext && is_scalar($data[self::FIELD_GENOME_BUILD])) { - $this->setGenomeBuild(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_GENOME_BUILD]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_GENOME_BUILD])) { + $this->setGenomeBuild(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_GENOME_BUILD]] + $ext)); + } else if (is_array($data[self::FIELD_GENOME_BUILD])) { + $this->setGenomeBuild(new FHIRString(array_merge($ext, $data[self::FIELD_GENOME_BUILD]))); + } } else { $this->setGenomeBuild(new FHIRString($data[self::FIELD_GENOME_BUILD])); } @@ -257,8 +260,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_REFERENCE_SEQ_STRING] instanceof FHIRString) { $this->setReferenceSeqString($data[self::FIELD_REFERENCE_SEQ_STRING]); - } elseif ($ext && is_scalar($data[self::FIELD_REFERENCE_SEQ_STRING])) { - $this->setReferenceSeqString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_REFERENCE_SEQ_STRING]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_REFERENCE_SEQ_STRING])) { + $this->setReferenceSeqString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_REFERENCE_SEQ_STRING]] + $ext)); + } else if (is_array($data[self::FIELD_REFERENCE_SEQ_STRING])) { + $this->setReferenceSeqString(new FHIRString(array_merge($ext, $data[self::FIELD_REFERENCE_SEQ_STRING]))); + } } else { $this->setReferenceSeqString(new FHIRString($data[self::FIELD_REFERENCE_SEQ_STRING])); } @@ -269,8 +276,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STRAND] instanceof FHIRInteger) { $this->setStrand($data[self::FIELD_STRAND]); - } elseif ($ext && is_scalar($data[self::FIELD_STRAND])) { - $this->setStrand(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_STRAND]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STRAND])) { + $this->setStrand(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_STRAND]] + $ext)); + } else if (is_array($data[self::FIELD_STRAND])) { + $this->setStrand(new FHIRInteger(array_merge($ext, $data[self::FIELD_STRAND]))); + } } else { $this->setStrand(new FHIRInteger($data[self::FIELD_STRAND])); } @@ -281,8 +292,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_WINDOW_END] instanceof FHIRInteger) { $this->setWindowEnd($data[self::FIELD_WINDOW_END]); - } elseif ($ext && is_scalar($data[self::FIELD_WINDOW_END])) { - $this->setWindowEnd(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_WINDOW_END]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_WINDOW_END])) { + $this->setWindowEnd(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_WINDOW_END]] + $ext)); + } else if (is_array($data[self::FIELD_WINDOW_END])) { + $this->setWindowEnd(new FHIRInteger(array_merge($ext, $data[self::FIELD_WINDOW_END]))); + } } else { $this->setWindowEnd(new FHIRInteger($data[self::FIELD_WINDOW_END])); } @@ -293,8 +308,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_WINDOW_START] instanceof FHIRInteger) { $this->setWindowStart($data[self::FIELD_WINDOW_START]); - } elseif ($ext && is_scalar($data[self::FIELD_WINDOW_START])) { - $this->setWindowStart(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_WINDOW_START]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_WINDOW_START])) { + $this->setWindowStart(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_WINDOW_START]] + $ext)); + } else if (is_array($data[self::FIELD_WINDOW_START])) { + $this->setWindowStart(new FHIRInteger(array_merge($ext, $data[self::FIELD_WINDOW_START]))); + } } else { $this->setWindowStart(new FHIRInteger($data[self::FIELD_WINDOW_START])); } @@ -758,11 +777,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getGenomeBuild())) { $v->xmlSerialize($sxe->addChild(self::FIELD_GENOME_BUILD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getReferenceSeqId())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REFERENCE_SEQ_ID, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getReferenceSeqPointer())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REFERENCE_SEQ_POINTER, null, $v->_getFHIRXMLNamespace())); } @@ -791,8 +808,15 @@ public function jsonSerialize() $a[self::FIELD_CHROMOSOME] = $v; } if (null !== ($v = $this->getGenomeBuild())) { - $a[self::FIELD_GENOME_BUILD] = $v->getValue(); - $a[self::FIELD_GENOME_BUILD_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_GENOME_BUILD] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_GENOME_BUILD_EXT] = $enc; + } + } else { + $a[self::FIELD_GENOME_BUILD] = $v; + } } if (null !== ($v = $this->getReferenceSeqId())) { $a[self::FIELD_REFERENCE_SEQ_ID] = $v; @@ -801,20 +825,48 @@ public function jsonSerialize() $a[self::FIELD_REFERENCE_SEQ_POINTER] = $v; } if (null !== ($v = $this->getReferenceSeqString())) { - $a[self::FIELD_REFERENCE_SEQ_STRING] = $v->getValue(); - $a[self::FIELD_REFERENCE_SEQ_STRING_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_REFERENCE_SEQ_STRING] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_REFERENCE_SEQ_STRING_EXT] = $enc; + } + } else { + $a[self::FIELD_REFERENCE_SEQ_STRING] = $v; + } } if (null !== ($v = $this->getStrand())) { - $a[self::FIELD_STRAND] = $v->getValue(); - $a[self::FIELD_STRAND_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STRAND] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STRAND_EXT] = $enc; + } + } else { + $a[self::FIELD_STRAND] = $v; + } } if (null !== ($v = $this->getWindowEnd())) { - $a[self::FIELD_WINDOW_END] = $v->getValue(); - $a[self::FIELD_WINDOW_END_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_WINDOW_END] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_WINDOW_END_EXT] = $enc; + } + } else { + $a[self::FIELD_WINDOW_END] = $v; + } } if (null !== ($v = $this->getWindowStart())) { - $a[self::FIELD_WINDOW_START] = $v->getValue(); - $a[self::FIELD_WINDOW_START_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_WINDOW_START] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_WINDOW_START_EXT] = $enc; + } + } else { + $a[self::FIELD_WINDOW_START] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRSequence/FHIRSequenceRepository.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRSequence/FHIRSequenceRepository.php index e7002d2b0b..a745a70a8c 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRSequence/FHIRSequenceRepository.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRSequence/FHIRSequenceRepository.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRSequenceRepository extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SEQUENCE_DOT_REPOSITORY; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DATASET_ID = 'datasetId'; const FIELD_DATASET_ID_EXT = '_datasetId'; const FIELD_NAME = 'name'; @@ -166,6 +162,9 @@ class FHIRSequenceRepository extends FHIRBackboneElement */ protected $variantsetId = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSequenceRepository Constructor * @param null|array $data @@ -188,8 +187,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATASET_ID] instanceof FHIRString) { $this->setDatasetId($data[self::FIELD_DATASET_ID]); - } elseif ($ext && is_scalar($data[self::FIELD_DATASET_ID])) { - $this->setDatasetId(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DATASET_ID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATASET_ID])) { + $this->setDatasetId(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DATASET_ID]] + $ext)); + } else if (is_array($data[self::FIELD_DATASET_ID])) { + $this->setDatasetId(new FHIRString(array_merge($ext, $data[self::FIELD_DATASET_ID]))); + } } else { $this->setDatasetId(new FHIRString($data[self::FIELD_DATASET_ID])); } @@ -200,8 +203,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -212,8 +219,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_READSET_ID] instanceof FHIRString) { $this->setReadsetId($data[self::FIELD_READSET_ID]); - } elseif ($ext && is_scalar($data[self::FIELD_READSET_ID])) { - $this->setReadsetId(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_READSET_ID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_READSET_ID])) { + $this->setReadsetId(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_READSET_ID]] + $ext)); + } else if (is_array($data[self::FIELD_READSET_ID])) { + $this->setReadsetId(new FHIRString(array_merge($ext, $data[self::FIELD_READSET_ID]))); + } } else { $this->setReadsetId(new FHIRString($data[self::FIELD_READSET_ID])); } @@ -224,8 +235,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TYPE] instanceof FHIRRepositoryType) { $this->setType($data[self::FIELD_TYPE]); - } elseif ($ext && is_scalar($data[self::FIELD_TYPE])) { - $this->setType(new FHIRRepositoryType([FHIRRepositoryType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TYPE])) { + $this->setType(new FHIRRepositoryType([FHIRRepositoryType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } else if (is_array($data[self::FIELD_TYPE])) { + $this->setType(new FHIRRepositoryType(array_merge($ext, $data[self::FIELD_TYPE]))); + } } else { $this->setType(new FHIRRepositoryType($data[self::FIELD_TYPE])); } @@ -236,8 +251,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_URL] instanceof FHIRUri) { $this->setUrl($data[self::FIELD_URL]); - } elseif ($ext && is_scalar($data[self::FIELD_URL])) { - $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } else if (is_array($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri(array_merge($ext, $data[self::FIELD_URL]))); + } } else { $this->setUrl(new FHIRUri($data[self::FIELD_URL])); } @@ -248,8 +267,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VARIANTSET_ID] instanceof FHIRString) { $this->setVariantsetId($data[self::FIELD_VARIANTSET_ID]); - } elseif ($ext && is_scalar($data[self::FIELD_VARIANTSET_ID])) { - $this->setVariantsetId(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VARIANTSET_ID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VARIANTSET_ID])) { + $this->setVariantsetId(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VARIANTSET_ID]] + $ext)); + } else if (is_array($data[self::FIELD_VARIANTSET_ID])) { + $this->setVariantsetId(new FHIRString(array_merge($ext, $data[self::FIELD_VARIANTSET_ID]))); + } } else { $this->setVariantsetId(new FHIRString($data[self::FIELD_VARIANTSET_ID])); } @@ -616,6 +639,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getDatasetId())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DATASET_ID, null, $v->_getFHIRXMLNamespace())); } @@ -625,7 +649,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getReadsetId())) { $v->xmlSerialize($sxe->addChild(self::FIELD_READSET_ID, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -645,27 +668,70 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getDatasetId())) { - $a[self::FIELD_DATASET_ID] = $v->getValue(); - $a[self::FIELD_DATASET_ID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATASET_ID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATASET_ID_EXT] = $enc; + } + } else { + $a[self::FIELD_DATASET_ID] = $v; + } } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if (null !== ($v = $this->getReadsetId())) { - $a[self::FIELD_READSET_ID] = $v->getValue(); - $a[self::FIELD_READSET_ID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_READSET_ID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_READSET_ID_EXT] = $enc; + } + } else { + $a[self::FIELD_READSET_ID] = $v; + } } if (null !== ($v = $this->getType())) { - $a[self::FIELD_TYPE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TYPE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TYPE_EXT] = $enc; + } + } else { + $a[self::FIELD_TYPE] = $v; + } } if (null !== ($v = $this->getUrl())) { - $a[self::FIELD_URL] = $v->getValue(); - $a[self::FIELD_URL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_URL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_URL_EXT] = $enc; + } + } else { + $a[self::FIELD_URL] = $v; + } } if (null !== ($v = $this->getVariantsetId())) { - $a[self::FIELD_VARIANTSET_ID] = $v->getValue(); - $a[self::FIELD_VARIANTSET_ID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VARIANTSET_ID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VARIANTSET_ID_EXT] = $enc; + } + } else { + $a[self::FIELD_VARIANTSET_ID] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRSequence/FHIRSequenceVariant.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRSequence/FHIRSequenceVariant.php index 118193fac3..b90df53b03 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRSequence/FHIRSequenceVariant.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRSequence/FHIRSequenceVariant.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRSequenceVariant extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SEQUENCE_DOT_VARIANT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CIGAR = 'cigar'; const FIELD_CIGAR_EXT = '_cigar'; const FIELD_END = 'end'; @@ -177,6 +173,9 @@ class FHIRSequenceVariant extends FHIRBackboneElement */ protected $variantPointer = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSequenceVariant Constructor * @param null|array $data @@ -199,8 +198,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CIGAR] instanceof FHIRString) { $this->setCigar($data[self::FIELD_CIGAR]); - } elseif ($ext && is_scalar($data[self::FIELD_CIGAR])) { - $this->setCigar(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_CIGAR]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CIGAR])) { + $this->setCigar(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_CIGAR]] + $ext)); + } else if (is_array($data[self::FIELD_CIGAR])) { + $this->setCigar(new FHIRString(array_merge($ext, $data[self::FIELD_CIGAR]))); + } } else { $this->setCigar(new FHIRString($data[self::FIELD_CIGAR])); } @@ -211,8 +214,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_END] instanceof FHIRInteger) { $this->setEnd($data[self::FIELD_END]); - } elseif ($ext && is_scalar($data[self::FIELD_END])) { - $this->setEnd(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_END]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_END])) { + $this->setEnd(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_END]] + $ext)); + } else if (is_array($data[self::FIELD_END])) { + $this->setEnd(new FHIRInteger(array_merge($ext, $data[self::FIELD_END]))); + } } else { $this->setEnd(new FHIRInteger($data[self::FIELD_END])); } @@ -223,8 +230,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_OBSERVED_ALLELE] instanceof FHIRString) { $this->setObservedAllele($data[self::FIELD_OBSERVED_ALLELE]); - } elseif ($ext && is_scalar($data[self::FIELD_OBSERVED_ALLELE])) { - $this->setObservedAllele(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_OBSERVED_ALLELE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_OBSERVED_ALLELE])) { + $this->setObservedAllele(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_OBSERVED_ALLELE]] + $ext)); + } else if (is_array($data[self::FIELD_OBSERVED_ALLELE])) { + $this->setObservedAllele(new FHIRString(array_merge($ext, $data[self::FIELD_OBSERVED_ALLELE]))); + } } else { $this->setObservedAllele(new FHIRString($data[self::FIELD_OBSERVED_ALLELE])); } @@ -235,8 +246,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_REFERENCE_ALLELE] instanceof FHIRString) { $this->setReferenceAllele($data[self::FIELD_REFERENCE_ALLELE]); - } elseif ($ext && is_scalar($data[self::FIELD_REFERENCE_ALLELE])) { - $this->setReferenceAllele(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_REFERENCE_ALLELE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_REFERENCE_ALLELE])) { + $this->setReferenceAllele(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_REFERENCE_ALLELE]] + $ext)); + } else if (is_array($data[self::FIELD_REFERENCE_ALLELE])) { + $this->setReferenceAllele(new FHIRString(array_merge($ext, $data[self::FIELD_REFERENCE_ALLELE]))); + } } else { $this->setReferenceAllele(new FHIRString($data[self::FIELD_REFERENCE_ALLELE])); } @@ -247,8 +262,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_START] instanceof FHIRInteger) { $this->setStart($data[self::FIELD_START]); - } elseif ($ext && is_scalar($data[self::FIELD_START])) { - $this->setStart(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_START]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_START])) { + $this->setStart(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_START]] + $ext)); + } else if (is_array($data[self::FIELD_START])) { + $this->setStart(new FHIRInteger(array_merge($ext, $data[self::FIELD_START]))); + } } else { $this->setStart(new FHIRInteger($data[self::FIELD_START])); } @@ -646,6 +665,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getCigar())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CIGAR, null, $v->_getFHIRXMLNamespace())); } @@ -661,7 +681,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getStart())) { $v->xmlSerialize($sxe->addChild(self::FIELD_START, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getVariantPointer())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VARIANT_POINTER, null, $v->_getFHIRXMLNamespace())); } @@ -675,24 +694,59 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getCigar())) { - $a[self::FIELD_CIGAR] = $v->getValue(); - $a[self::FIELD_CIGAR_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CIGAR] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CIGAR_EXT] = $enc; + } + } else { + $a[self::FIELD_CIGAR] = $v; + } } if (null !== ($v = $this->getEnd())) { - $a[self::FIELD_END] = $v->getValue(); - $a[self::FIELD_END_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_END] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_END_EXT] = $enc; + } + } else { + $a[self::FIELD_END] = $v; + } } if (null !== ($v = $this->getObservedAllele())) { - $a[self::FIELD_OBSERVED_ALLELE] = $v->getValue(); - $a[self::FIELD_OBSERVED_ALLELE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_OBSERVED_ALLELE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_OBSERVED_ALLELE_EXT] = $enc; + } + } else { + $a[self::FIELD_OBSERVED_ALLELE] = $v; + } } if (null !== ($v = $this->getReferenceAllele())) { - $a[self::FIELD_REFERENCE_ALLELE] = $v->getValue(); - $a[self::FIELD_REFERENCE_ALLELE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_REFERENCE_ALLELE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_REFERENCE_ALLELE_EXT] = $enc; + } + } else { + $a[self::FIELD_REFERENCE_ALLELE] = $v; + } } if (null !== ($v = $this->getStart())) { - $a[self::FIELD_START] = $v->getValue(); - $a[self::FIELD_START_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_START] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_START_EXT] = $enc; + } + } else { + $a[self::FIELD_START] = $v; + } } if (null !== ($v = $this->getVariantPointer())) { $a[self::FIELD_VARIANT_POINTER] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRSpecimen/FHIRSpecimenCollection.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRSpecimen/FHIRSpecimenCollection.php index 663a08c5f1..47e3325d74 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRSpecimen/FHIRSpecimenCollection.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRSpecimen/FHIRSpecimenCollection.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -81,10 +81,6 @@ class FHIRSpecimenCollection extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SPECIMEN_DOT_COLLECTION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_BODY_SITE = 'bodySite'; const FIELD_COLLECTED_DATE_TIME = 'collectedDateTime'; const FIELD_COLLECTED_DATE_TIME_EXT = '_collectedDateTime'; @@ -172,6 +168,9 @@ class FHIRSpecimenCollection extends FHIRBackboneElement */ protected $quantity = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSpecimenCollection Constructor * @param null|array $data @@ -201,8 +200,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_COLLECTED_DATE_TIME] instanceof FHIRDateTime) { $this->setCollectedDateTime($data[self::FIELD_COLLECTED_DATE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_COLLECTED_DATE_TIME])) { - $this->setCollectedDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_COLLECTED_DATE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_COLLECTED_DATE_TIME])) { + $this->setCollectedDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_COLLECTED_DATE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_COLLECTED_DATE_TIME])) { + $this->setCollectedDateTime(new FHIRDateTime(array_merge($ext, $data[self::FIELD_COLLECTED_DATE_TIME]))); + } } else { $this->setCollectedDateTime(new FHIRDateTime($data[self::FIELD_COLLECTED_DATE_TIME])); } @@ -234,8 +237,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_QUANTITY] instanceof FHIRQuantity) { $this->setQuantity($data[self::FIELD_QUANTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_QUANTITY])) { - $this->setQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_QUANTITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_QUANTITY])) { + $this->setQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_QUANTITY])) { + $this->setQuantity(new FHIRQuantity(array_merge($ext, $data[self::FIELD_QUANTITY]))); + } } else { $this->setQuantity(new FHIRQuantity($data[self::FIELD_QUANTITY])); } @@ -581,19 +588,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getCollectedDateTime())) { $v->xmlSerialize($sxe->addChild(self::FIELD_COLLECTED_DATE_TIME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getCollectedPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_COLLECTED_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getCollector())) { $v->xmlSerialize($sxe->addChild(self::FIELD_COLLECTOR, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getMethod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_METHOD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_QUANTITY, null, $v->_getFHIRXMLNamespace())); } @@ -610,8 +613,15 @@ public function jsonSerialize() $a[self::FIELD_BODY_SITE] = $v; } if (null !== ($v = $this->getCollectedDateTime())) { - $a[self::FIELD_COLLECTED_DATE_TIME] = $v->getValue(); - $a[self::FIELD_COLLECTED_DATE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_COLLECTED_DATE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_COLLECTED_DATE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_COLLECTED_DATE_TIME] = $v; + } } if (null !== ($v = $this->getCollectedPeriod())) { $a[self::FIELD_COLLECTED_PERIOD] = $v; @@ -623,7 +633,15 @@ public function jsonSerialize() $a[self::FIELD_METHOD] = $v; } if (null !== ($v = $this->getQuantity())) { - $a[self::FIELD_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_QUANTITY] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRSpecimen/FHIRSpecimenContainer.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRSpecimen/FHIRSpecimenContainer.php index 4bc81a26e1..5b0822173c 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRSpecimen/FHIRSpecimenContainer.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRSpecimen/FHIRSpecimenContainer.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -81,10 +81,6 @@ class FHIRSpecimenContainer extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SPECIMEN_DOT_CONTAINER; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ADDITIVE_CODEABLE_CONCEPT = 'additiveCodeableConcept'; const FIELD_ADDITIVE_REFERENCE = 'additiveReference'; const FIELD_CAPACITY = 'capacity'; @@ -185,6 +181,9 @@ class FHIRSpecimenContainer extends FHIRBackboneElement */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSpecimenContainer Constructor * @param null|array $data @@ -221,8 +220,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CAPACITY] instanceof FHIRQuantity) { $this->setCapacity($data[self::FIELD_CAPACITY]); - } elseif ($ext && is_scalar($data[self::FIELD_CAPACITY])) { - $this->setCapacity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_CAPACITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CAPACITY])) { + $this->setCapacity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_CAPACITY]] + $ext)); + } else if (is_array($data[self::FIELD_CAPACITY])) { + $this->setCapacity(new FHIRQuantity(array_merge($ext, $data[self::FIELD_CAPACITY]))); + } } else { $this->setCapacity(new FHIRQuantity($data[self::FIELD_CAPACITY])); } @@ -233,8 +236,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -245,17 +252,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -267,8 +281,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SPECIMEN_QUANTITY] instanceof FHIRQuantity) { $this->setSpecimenQuantity($data[self::FIELD_SPECIMEN_QUANTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_SPECIMEN_QUANTITY])) { - $this->setSpecimenQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_SPECIMEN_QUANTITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SPECIMEN_QUANTITY])) { + $this->setSpecimenQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_SPECIMEN_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_SPECIMEN_QUANTITY])) { + $this->setSpecimenQuantity(new FHIRQuantity(array_merge($ext, $data[self::FIELD_SPECIMEN_QUANTITY]))); + } } else { $this->setSpecimenQuantity(new FHIRQuantity($data[self::FIELD_SPECIMEN_QUANTITY])); } @@ -679,18 +697,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getAdditiveCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ADDITIVE_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getAdditiveReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ADDITIVE_REFERENCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getCapacity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CAPACITY, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getDescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESCRIPTION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -699,11 +714,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getSpecimenQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SPECIMEN_QUANTITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -723,17 +736,56 @@ public function jsonSerialize() $a[self::FIELD_ADDITIVE_REFERENCE] = $v; } if (null !== ($v = $this->getCapacity())) { - $a[self::FIELD_CAPACITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CAPACITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CAPACITY_EXT] = $enc; + } + } else { + $a[self::FIELD_CAPACITY] = $v; + } } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if (null !== ($v = $this->getSpecimenQuantity())) { - $a[self::FIELD_SPECIMEN_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SPECIMEN_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SPECIMEN_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_SPECIMEN_QUANTITY] = $v; + } } if (null !== ($v = $this->getType())) { $a[self::FIELD_TYPE] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRSpecimen/FHIRSpecimenProcessing.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRSpecimen/FHIRSpecimenProcessing.php index 531535867c..a262b70a56 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRSpecimen/FHIRSpecimenProcessing.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRSpecimen/FHIRSpecimenProcessing.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -81,10 +81,6 @@ class FHIRSpecimenProcessing extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SPECIMEN_DOT_PROCESSING; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ADDITIVE = 'additive'; const FIELD_DESCRIPTION = 'description'; const FIELD_DESCRIPTION_EXT = '_description'; @@ -156,6 +152,9 @@ class FHIRSpecimenProcessing extends FHIRBackboneElement */ protected $timePeriod = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSpecimenProcessing Constructor * @param null|array $data @@ -175,6 +174,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ADDITIVE])) { if (is_array($data[self::FIELD_ADDITIVE])) { foreach($data[self::FIELD_ADDITIVE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addAdditive($v); } else { @@ -193,8 +195,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -212,8 +218,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TIME_DATE_TIME] instanceof FHIRDateTime) { $this->setTimeDateTime($data[self::FIELD_TIME_DATE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_TIME_DATE_TIME])) { - $this->setTimeDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_TIME_DATE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TIME_DATE_TIME])) { + $this->setTimeDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_TIME_DATE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_TIME_DATE_TIME])) { + $this->setTimeDateTime(new FHIRDateTime(array_merge($ext, $data[self::FIELD_TIME_DATE_TIME]))); + } } else { $this->setTimeDateTime(new FHIRDateTime($data[self::FIELD_TIME_DATE_TIME])); } @@ -569,14 +579,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESCRIPTION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getProcedure())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PROCEDURE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getTimeDateTime())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TIME_DATE_TIME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getTimePeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TIME_PERIOD, null, $v->_getFHIRXMLNamespace())); } @@ -593,15 +601,29 @@ public function jsonSerialize() $a[self::FIELD_ADDITIVE] = $vs; } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if (null !== ($v = $this->getProcedure())) { $a[self::FIELD_PROCEDURE] = $v; } if (null !== ($v = $this->getTimeDateTime())) { - $a[self::FIELD_TIME_DATE_TIME] = $v->getValue(); - $a[self::FIELD_TIME_DATE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TIME_DATE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TIME_DATE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_TIME_DATE_TIME] = $v; + } } if (null !== ($v = $this->getTimePeriod())) { $a[self::FIELD_TIME_PERIOD] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRStructureDefinition/FHIRStructureDefinitionDifferential.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRStructureDefinition/FHIRStructureDefinitionDifferential.php index 63f5c1e31d..4f0f01d760 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRStructureDefinition/FHIRStructureDefinitionDifferential.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRStructureDefinition/FHIRStructureDefinitionDifferential.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRStructureDefinitionDifferential extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_STRUCTURE_DEFINITION_DOT_DIFFERENTIAL; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ELEMENT = 'element'; /** @@ -96,6 +92,9 @@ class FHIRStructureDefinitionDifferential extends FHIRBackboneElement */ protected $element = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRStructureDefinitionDifferential Constructor * @param null|array $data @@ -115,6 +114,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ELEMENT])) { if (is_array($data[self::FIELD_ELEMENT])) { foreach($data[self::FIELD_ELEMENT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRElementDefinition) { $this->addElement($v); } else { diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRStructureDefinition/FHIRStructureDefinitionMapping.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRStructureDefinition/FHIRStructureDefinitionMapping.php index b10090e377..b2a940deb9 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRStructureDefinition/FHIRStructureDefinitionMapping.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRStructureDefinition/FHIRStructureDefinitionMapping.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -81,10 +81,6 @@ class FHIRStructureDefinitionMapping extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_STRUCTURE_DEFINITION_DOT_MAPPING; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_COMMENT = 'comment'; const FIELD_COMMENT_EXT = '_comment'; const FIELD_IDENTITY = 'identity'; @@ -144,6 +140,9 @@ class FHIRStructureDefinitionMapping extends FHIRBackboneElement */ protected $uri = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRStructureDefinitionMapping Constructor * @param null|array $data @@ -166,8 +165,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_COMMENT] instanceof FHIRString) { $this->setComment($data[self::FIELD_COMMENT]); - } elseif ($ext && is_scalar($data[self::FIELD_COMMENT])) { - $this->setComment(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_COMMENT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_COMMENT])) { + $this->setComment(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_COMMENT]] + $ext)); + } else if (is_array($data[self::FIELD_COMMENT])) { + $this->setComment(new FHIRString(array_merge($ext, $data[self::FIELD_COMMENT]))); + } } else { $this->setComment(new FHIRString($data[self::FIELD_COMMENT])); } @@ -178,8 +181,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IDENTITY] instanceof FHIRId) { $this->setIdentity($data[self::FIELD_IDENTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTITY])) { - $this->setIdentity(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_IDENTITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IDENTITY])) { + $this->setIdentity(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_IDENTITY]] + $ext)); + } else if (is_array($data[self::FIELD_IDENTITY])) { + $this->setIdentity(new FHIRId(array_merge($ext, $data[self::FIELD_IDENTITY]))); + } } else { $this->setIdentity(new FHIRId($data[self::FIELD_IDENTITY])); } @@ -190,8 +197,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -202,8 +213,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_URI] instanceof FHIRUri) { $this->setUri($data[self::FIELD_URI]); - } elseif ($ext && is_scalar($data[self::FIELD_URI])) { - $this->setUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URI]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_URI])) { + $this->setUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URI]] + $ext)); + } else if (is_array($data[self::FIELD_URI])) { + $this->setUri(new FHIRUri(array_merge($ext, $data[self::FIELD_URI]))); + } } else { $this->setUri(new FHIRUri($data[self::FIELD_URI])); } @@ -497,6 +512,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getComment())) { $v->xmlSerialize($sxe->addChild(self::FIELD_COMMENT, null, $v->_getFHIRXMLNamespace())); } @@ -519,20 +535,48 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getComment())) { - $a[self::FIELD_COMMENT] = $v->getValue(); - $a[self::FIELD_COMMENT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_COMMENT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_COMMENT_EXT] = $enc; + } + } else { + $a[self::FIELD_COMMENT] = $v; + } } if (null !== ($v = $this->getIdentity())) { - $a[self::FIELD_IDENTITY] = $v->getValue(); - $a[self::FIELD_IDENTITY_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_IDENTITY] = $v; + } } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if (null !== ($v = $this->getUri())) { - $a[self::FIELD_URI] = $v->getValue(); - $a[self::FIELD_URI_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_URI] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_URI_EXT] = $enc; + } + } else { + $a[self::FIELD_URI] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRStructureDefinition/FHIRStructureDefinitionSnapshot.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRStructureDefinition/FHIRStructureDefinitionSnapshot.php index 7a5d11c074..859ab98f51 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRStructureDefinition/FHIRStructureDefinitionSnapshot.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRStructureDefinition/FHIRStructureDefinitionSnapshot.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRStructureDefinitionSnapshot extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_STRUCTURE_DEFINITION_DOT_SNAPSHOT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ELEMENT = 'element'; /** @@ -96,6 +92,9 @@ class FHIRStructureDefinitionSnapshot extends FHIRBackboneElement */ protected $element = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRStructureDefinitionSnapshot Constructor * @param null|array $data @@ -115,6 +114,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ELEMENT])) { if (is_array($data[self::FIELD_ELEMENT])) { foreach($data[self::FIELD_ELEMENT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRElementDefinition) { $this->addElement($v); } else { diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRStructureMap/FHIRStructureMapDependent.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRStructureMap/FHIRStructureMapDependent.php index c043154ea1..91a7d6d224 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRStructureMap/FHIRStructureMapDependent.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRStructureMap/FHIRStructureMapDependent.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRStructureMapDependent extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_STRUCTURE_MAP_DOT_DEPENDENT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_NAME = 'name'; const FIELD_NAME_EXT = '_name'; const FIELD_VARIABLE = 'variable'; @@ -112,6 +108,9 @@ class FHIRStructureMapDependent extends FHIRBackboneElement */ protected $variable = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRStructureMapDependent Constructor * @param null|array $data @@ -134,8 +133,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRId) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRId(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRId($data[self::FIELD_NAME])); } @@ -146,17 +149,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_VARIABLE])) { foreach($data[self::FIELD_VARIABLE] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRString) { $this->addVariable($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addVariable(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addVariable(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addVariable(new FHIRString(array_merge($v, $ext[$i]))); + } } else { $this->addVariable(new FHIRString($v)); } } } elseif ($data[self::FIELD_VARIABLE] instanceof FHIRString) { $this->addVariable($data[self::FIELD_VARIABLE]); - } elseif ($ext && is_scalar($data[self::FIELD_VARIABLE])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_VARIABLE])) { $this->addVariable(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VARIABLE]] + $ext)); } else { $this->addVariable(new FHIRString($data[self::FIELD_VARIABLE])); @@ -385,6 +395,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NAME, null, $v->_getFHIRXMLNamespace())); } @@ -406,8 +417,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if ([] !== ($vs = $this->getVariable())) { $a[self::FIELD_VARIABLE] = []; @@ -415,8 +433,17 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_VARIABLE][] = $v->getValue(); - $a[self::FIELD_VARIABLE_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VARIABLE][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VARIABLE_EXT][] = $enc; + } else { + $a[self::FIELD_VARIABLE_EXT][] = null; + } + } else { + $a[self::FIELD_VARIABLE][] = $v; + } } } return $a; diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRStructureMap/FHIRStructureMapGroup.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRStructureMap/FHIRStructureMapGroup.php index 21dcd4ba1e..6a6b9c4d49 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRStructureMap/FHIRStructureMapGroup.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRStructureMap/FHIRStructureMapGroup.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRStructureMapGroup extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_STRUCTURE_MAP_DOT_GROUP; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DOCUMENTATION = 'documentation'; const FIELD_DOCUMENTATION_EXT = '_documentation'; const FIELD_EXTENDS = 'extends'; @@ -165,6 +161,9 @@ class FHIRStructureMapGroup extends FHIRBackboneElement */ protected $typeMode = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRStructureMapGroup Constructor * @param null|array $data @@ -187,8 +186,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DOCUMENTATION] instanceof FHIRString) { $this->setDocumentation($data[self::FIELD_DOCUMENTATION]); - } elseif ($ext && is_scalar($data[self::FIELD_DOCUMENTATION])) { - $this->setDocumentation(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DOCUMENTATION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DOCUMENTATION])) { + $this->setDocumentation(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DOCUMENTATION]] + $ext)); + } else if (is_array($data[self::FIELD_DOCUMENTATION])) { + $this->setDocumentation(new FHIRString(array_merge($ext, $data[self::FIELD_DOCUMENTATION]))); + } } else { $this->setDocumentation(new FHIRString($data[self::FIELD_DOCUMENTATION])); } @@ -199,8 +202,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EXTENDS] instanceof FHIRId) { $this->setExtends($data[self::FIELD_EXTENDS]); - } elseif ($ext && is_scalar($data[self::FIELD_EXTENDS])) { - $this->setExtends(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_EXTENDS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EXTENDS])) { + $this->setExtends(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_EXTENDS]] + $ext)); + } else if (is_array($data[self::FIELD_EXTENDS])) { + $this->setExtends(new FHIRId(array_merge($ext, $data[self::FIELD_EXTENDS]))); + } } else { $this->setExtends(new FHIRId($data[self::FIELD_EXTENDS])); } @@ -208,6 +215,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_INPUT])) { if (is_array($data[self::FIELD_INPUT])) { foreach($data[self::FIELD_INPUT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRStructureMapInput) { $this->addInput($v); } else { @@ -226,8 +236,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRId) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRId(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRId($data[self::FIELD_NAME])); } @@ -235,6 +249,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_RULE])) { if (is_array($data[self::FIELD_RULE])) { foreach($data[self::FIELD_RULE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRStructureMapRule) { $this->addRule($v); } else { @@ -253,8 +270,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TYPE_MODE] instanceof FHIRStructureMapGroupTypeMode) { $this->setTypeMode($data[self::FIELD_TYPE_MODE]); - } elseif ($ext && is_scalar($data[self::FIELD_TYPE_MODE])) { - $this->setTypeMode(new FHIRStructureMapGroupTypeMode([FHIRStructureMapGroupTypeMode::FIELD_VALUE => $data[self::FIELD_TYPE_MODE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TYPE_MODE])) { + $this->setTypeMode(new FHIRStructureMapGroupTypeMode([FHIRStructureMapGroupTypeMode::FIELD_VALUE => $data[self::FIELD_TYPE_MODE]] + $ext)); + } else if (is_array($data[self::FIELD_TYPE_MODE])) { + $this->setTypeMode(new FHIRStructureMapGroupTypeMode(array_merge($ext, $data[self::FIELD_TYPE_MODE]))); + } } else { $this->setTypeMode(new FHIRStructureMapGroupTypeMode($data[self::FIELD_TYPE_MODE])); } @@ -654,13 +675,13 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getDocumentation())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DOCUMENTATION, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getExtends())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EXTENDS, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getInput())) { foreach($vs as $v) { if (null === $v) { @@ -672,7 +693,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NAME, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getRule())) { foreach($vs as $v) { if (null === $v) { @@ -681,7 +701,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_RULE, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getTypeMode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE_MODE, null, $v->_getFHIRXMLNamespace())); } @@ -695,25 +714,54 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getDocumentation())) { - $a[self::FIELD_DOCUMENTATION] = $v->getValue(); - $a[self::FIELD_DOCUMENTATION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DOCUMENTATION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DOCUMENTATION_EXT] = $enc; + } + } else { + $a[self::FIELD_DOCUMENTATION] = $v; + } } if (null !== ($v = $this->getExtends())) { - $a[self::FIELD_EXTENDS] = $v->getValue(); - $a[self::FIELD_EXTENDS_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EXTENDS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EXTENDS_EXT] = $enc; + } + } else { + $a[self::FIELD_EXTENDS] = $v; + } } if ([] !== ($vs = $this->getInput())) { $a[self::FIELD_INPUT] = $vs; } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if ([] !== ($vs = $this->getRule())) { $a[self::FIELD_RULE] = $vs; } if (null !== ($v = $this->getTypeMode())) { - $a[self::FIELD_TYPE_MODE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TYPE_MODE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TYPE_MODE_EXT] = $enc; + } + } else { + $a[self::FIELD_TYPE_MODE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRStructureMap/FHIRStructureMapInput.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRStructureMap/FHIRStructureMapInput.php index 4b311bc942..0f77bb7a22 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRStructureMap/FHIRStructureMapInput.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRStructureMap/FHIRStructureMapInput.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRStructureMapInput extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_STRUCTURE_MAP_DOT_INPUT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DOCUMENTATION = 'documentation'; const FIELD_DOCUMENTATION_EXT = '_documentation'; const FIELD_MODE = 'mode'; @@ -138,6 +134,9 @@ class FHIRStructureMapInput extends FHIRBackboneElement */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRStructureMapInput Constructor * @param null|array $data @@ -160,8 +159,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DOCUMENTATION] instanceof FHIRString) { $this->setDocumentation($data[self::FIELD_DOCUMENTATION]); - } elseif ($ext && is_scalar($data[self::FIELD_DOCUMENTATION])) { - $this->setDocumentation(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DOCUMENTATION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DOCUMENTATION])) { + $this->setDocumentation(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DOCUMENTATION]] + $ext)); + } else if (is_array($data[self::FIELD_DOCUMENTATION])) { + $this->setDocumentation(new FHIRString(array_merge($ext, $data[self::FIELD_DOCUMENTATION]))); + } } else { $this->setDocumentation(new FHIRString($data[self::FIELD_DOCUMENTATION])); } @@ -172,8 +175,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MODE] instanceof FHIRStructureMapInputMode) { $this->setMode($data[self::FIELD_MODE]); - } elseif ($ext && is_scalar($data[self::FIELD_MODE])) { - $this->setMode(new FHIRStructureMapInputMode([FHIRStructureMapInputMode::FIELD_VALUE => $data[self::FIELD_MODE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MODE])) { + $this->setMode(new FHIRStructureMapInputMode([FHIRStructureMapInputMode::FIELD_VALUE => $data[self::FIELD_MODE]] + $ext)); + } else if (is_array($data[self::FIELD_MODE])) { + $this->setMode(new FHIRStructureMapInputMode(array_merge($ext, $data[self::FIELD_MODE]))); + } } else { $this->setMode(new FHIRStructureMapInputMode($data[self::FIELD_MODE])); } @@ -184,8 +191,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRId) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRId(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRId($data[self::FIELD_NAME])); } @@ -196,8 +207,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TYPE] instanceof FHIRString) { $this->setType($data[self::FIELD_TYPE]); - } elseif ($ext && is_scalar($data[self::FIELD_TYPE])) { - $this->setType(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TYPE])) { + $this->setType(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } else if (is_array($data[self::FIELD_TYPE])) { + $this->setType(new FHIRString(array_merge($ext, $data[self::FIELD_TYPE]))); + } } else { $this->setType(new FHIRString($data[self::FIELD_TYPE])); } @@ -472,10 +487,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getDocumentation())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DOCUMENTATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getMode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MODE, null, $v->_getFHIRXMLNamespace())); } @@ -495,19 +510,48 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getDocumentation())) { - $a[self::FIELD_DOCUMENTATION] = $v->getValue(); - $a[self::FIELD_DOCUMENTATION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DOCUMENTATION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DOCUMENTATION_EXT] = $enc; + } + } else { + $a[self::FIELD_DOCUMENTATION] = $v; + } } if (null !== ($v = $this->getMode())) { - $a[self::FIELD_MODE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MODE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MODE_EXT] = $enc; + } + } else { + $a[self::FIELD_MODE] = $v; + } } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if (null !== ($v = $this->getType())) { - $a[self::FIELD_TYPE] = $v->getValue(); - $a[self::FIELD_TYPE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TYPE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TYPE_EXT] = $enc; + } + } else { + $a[self::FIELD_TYPE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRStructureMap/FHIRStructureMapParameter.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRStructureMap/FHIRStructureMapParameter.php index f649de3404..586cbf40d2 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRStructureMap/FHIRStructureMapParameter.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRStructureMap/FHIRStructureMapParameter.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -81,10 +81,6 @@ class FHIRStructureMapParameter extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_STRUCTURE_MAP_DOT_PARAMETER; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE_BOOLEAN = 'valueBoolean'; const FIELD_VALUE_BOOLEAN_EXT = '_valueBoolean'; const FIELD_VALUE_DECIMAL = 'valueDecimal'; @@ -154,6 +150,9 @@ class FHIRStructureMapParameter extends FHIRBackboneElement */ protected $valueString = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRStructureMapParameter Constructor * @param null|array $data @@ -176,8 +175,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_BOOLEAN] instanceof FHIRBoolean) { $this->setValueBoolean($data[self::FIELD_VALUE_BOOLEAN]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_BOOLEAN])) { - $this->setValueBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_VALUE_BOOLEAN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_BOOLEAN])) { + $this->setValueBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_VALUE_BOOLEAN]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_BOOLEAN])) { + $this->setValueBoolean(new FHIRBoolean(array_merge($ext, $data[self::FIELD_VALUE_BOOLEAN]))); + } } else { $this->setValueBoolean(new FHIRBoolean($data[self::FIELD_VALUE_BOOLEAN])); } @@ -188,8 +191,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_DECIMAL] instanceof FHIRDecimal) { $this->setValueDecimal($data[self::FIELD_VALUE_DECIMAL]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_DECIMAL])) { - $this->setValueDecimal(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_VALUE_DECIMAL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_DECIMAL])) { + $this->setValueDecimal(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_VALUE_DECIMAL]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_DECIMAL])) { + $this->setValueDecimal(new FHIRDecimal(array_merge($ext, $data[self::FIELD_VALUE_DECIMAL]))); + } } else { $this->setValueDecimal(new FHIRDecimal($data[self::FIELD_VALUE_DECIMAL])); } @@ -200,8 +207,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_ID] instanceof FHIRId) { $this->setValueId($data[self::FIELD_VALUE_ID]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_ID])) { - $this->setValueId(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_VALUE_ID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_ID])) { + $this->setValueId(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_VALUE_ID]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_ID])) { + $this->setValueId(new FHIRId(array_merge($ext, $data[self::FIELD_VALUE_ID]))); + } } else { $this->setValueId(new FHIRId($data[self::FIELD_VALUE_ID])); } @@ -212,8 +223,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_INTEGER] instanceof FHIRInteger) { $this->setValueInteger($data[self::FIELD_VALUE_INTEGER]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_INTEGER])) { - $this->setValueInteger(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_VALUE_INTEGER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_INTEGER])) { + $this->setValueInteger(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_VALUE_INTEGER]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_INTEGER])) { + $this->setValueInteger(new FHIRInteger(array_merge($ext, $data[self::FIELD_VALUE_INTEGER]))); + } } else { $this->setValueInteger(new FHIRInteger($data[self::FIELD_VALUE_INTEGER])); } @@ -224,8 +239,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_STRING] instanceof FHIRString) { $this->setValueString($data[self::FIELD_VALUE_STRING]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_STRING])) { - $this->setValueString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VALUE_STRING]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_STRING])) { + $this->setValueString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VALUE_STRING]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_STRING])) { + $this->setValueString(new FHIRString(array_merge($ext, $data[self::FIELD_VALUE_STRING]))); + } } else { $this->setValueString(new FHIRString($data[self::FIELD_VALUE_STRING])); } @@ -557,6 +576,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getValueBoolean())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_BOOLEAN, null, $v->_getFHIRXMLNamespace())); } @@ -582,24 +602,59 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getValueBoolean())) { - $a[self::FIELD_VALUE_BOOLEAN] = $v->getValue(); - $a[self::FIELD_VALUE_BOOLEAN_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_BOOLEAN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_BOOLEAN_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_BOOLEAN] = $v; + } } if (null !== ($v = $this->getValueDecimal())) { - $a[self::FIELD_VALUE_DECIMAL] = $v->getValue(); - $a[self::FIELD_VALUE_DECIMAL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_DECIMAL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_DECIMAL_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_DECIMAL] = $v; + } } if (null !== ($v = $this->getValueId())) { - $a[self::FIELD_VALUE_ID] = $v->getValue(); - $a[self::FIELD_VALUE_ID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_ID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_ID_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_ID] = $v; + } } if (null !== ($v = $this->getValueInteger())) { - $a[self::FIELD_VALUE_INTEGER] = $v->getValue(); - $a[self::FIELD_VALUE_INTEGER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_INTEGER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_INTEGER_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_INTEGER] = $v; + } } if (null !== ($v = $this->getValueString())) { - $a[self::FIELD_VALUE_STRING] = $v->getValue(); - $a[self::FIELD_VALUE_STRING_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_STRING] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_STRING_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_STRING] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRStructureMap/FHIRStructureMapRule.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRStructureMap/FHIRStructureMapRule.php index d9d2638614..806ef98a40 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRStructureMap/FHIRStructureMapRule.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRStructureMap/FHIRStructureMapRule.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRStructureMapRule extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_STRUCTURE_MAP_DOT_RULE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DEPENDENT = 'dependent'; const FIELD_DOCUMENTATION = 'documentation'; const FIELD_DOCUMENTATION_EXT = '_documentation'; @@ -152,6 +148,9 @@ class FHIRStructureMapRule extends FHIRBackboneElement */ protected $target = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRStructureMapRule Constructor * @param null|array $data @@ -171,6 +170,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_DEPENDENT])) { if (is_array($data[self::FIELD_DEPENDENT])) { foreach($data[self::FIELD_DEPENDENT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRStructureMapDependent) { $this->addDependent($v); } else { @@ -189,8 +191,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DOCUMENTATION] instanceof FHIRString) { $this->setDocumentation($data[self::FIELD_DOCUMENTATION]); - } elseif ($ext && is_scalar($data[self::FIELD_DOCUMENTATION])) { - $this->setDocumentation(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DOCUMENTATION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DOCUMENTATION])) { + $this->setDocumentation(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DOCUMENTATION]] + $ext)); + } else if (is_array($data[self::FIELD_DOCUMENTATION])) { + $this->setDocumentation(new FHIRString(array_merge($ext, $data[self::FIELD_DOCUMENTATION]))); + } } else { $this->setDocumentation(new FHIRString($data[self::FIELD_DOCUMENTATION])); } @@ -201,8 +207,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRId) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRId(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRId($data[self::FIELD_NAME])); } @@ -210,6 +220,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_RULE])) { if (is_array($data[self::FIELD_RULE])) { foreach($data[self::FIELD_RULE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRStructureMapRule) { $this->addRule($v); } else { @@ -225,6 +238,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SOURCE])) { if (is_array($data[self::FIELD_SOURCE])) { foreach($data[self::FIELD_SOURCE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRStructureMapSource) { $this->addSource($v); } else { @@ -240,6 +256,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_TARGET])) { if (is_array($data[self::FIELD_TARGET])) { foreach($data[self::FIELD_TARGET] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRStructureMapTarget) { $this->addTarget($v); } else { @@ -682,7 +701,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NAME, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getRule())) { foreach($vs as $v) { if (null === $v) { @@ -691,7 +709,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_RULE, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getSource())) { foreach($vs as $v) { if (null === $v) { @@ -700,7 +717,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_SOURCE, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getTarget())) { foreach($vs as $v) { if (null === $v) { @@ -722,12 +738,26 @@ public function jsonSerialize() $a[self::FIELD_DEPENDENT] = $vs; } if (null !== ($v = $this->getDocumentation())) { - $a[self::FIELD_DOCUMENTATION] = $v->getValue(); - $a[self::FIELD_DOCUMENTATION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DOCUMENTATION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DOCUMENTATION_EXT] = $enc; + } + } else { + $a[self::FIELD_DOCUMENTATION] = $v; + } } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if ([] !== ($vs = $this->getRule())) { $a[self::FIELD_RULE] = $vs; diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRStructureMap/FHIRStructureMapSource.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRStructureMap/FHIRStructureMapSource.php index ef1fd6329a..d4c13aefbb 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRStructureMap/FHIRStructureMapSource.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRStructureMap/FHIRStructureMapSource.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -115,10 +115,6 @@ class FHIRStructureMapSource extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_STRUCTURE_MAP_DOT_SOURCE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CHECK = 'check'; const FIELD_CHECK_EXT = '_check'; const FIELD_CONDITION = 'condition'; @@ -127,6 +123,7 @@ class FHIRStructureMapSource extends FHIRBackboneElement const FIELD_CONTEXT_EXT = '_context'; const FIELD_DEFAULT_VALUE_ADDRESS = 'defaultValueAddress'; const FIELD_DEFAULT_VALUE_AGE = 'defaultValueAge'; + const FIELD_DEFAULT_VALUE_AGE_EXT = '_defaultValueAge'; const FIELD_DEFAULT_VALUE_ANNOTATION = 'defaultValueAnnotation'; const FIELD_DEFAULT_VALUE_ATTACHMENT = 'defaultValueAttachment'; const FIELD_DEFAULT_VALUE_BASE_64BINARY = 'defaultValueBase64Binary'; @@ -140,6 +137,7 @@ class FHIRStructureMapSource extends FHIRBackboneElement const FIELD_DEFAULT_VALUE_CONTACT_POINT = 'defaultValueContactPoint'; const FIELD_DEFAULT_VALUE_CONTACT_POINT_EXT = '_defaultValueContactPoint'; const FIELD_DEFAULT_VALUE_COUNT = 'defaultValueCount'; + const FIELD_DEFAULT_VALUE_COUNT_EXT = '_defaultValueCount'; const FIELD_DEFAULT_VALUE_DATE = 'defaultValueDate'; const FIELD_DEFAULT_VALUE_DATE_EXT = '_defaultValueDate'; const FIELD_DEFAULT_VALUE_DATE_TIME = 'defaultValueDateTime'; @@ -147,7 +145,9 @@ class FHIRStructureMapSource extends FHIRBackboneElement const FIELD_DEFAULT_VALUE_DECIMAL = 'defaultValueDecimal'; const FIELD_DEFAULT_VALUE_DECIMAL_EXT = '_defaultValueDecimal'; const FIELD_DEFAULT_VALUE_DISTANCE = 'defaultValueDistance'; + const FIELD_DEFAULT_VALUE_DISTANCE_EXT = '_defaultValueDistance'; const FIELD_DEFAULT_VALUE_DURATION = 'defaultValueDuration'; + const FIELD_DEFAULT_VALUE_DURATION_EXT = '_defaultValueDuration'; const FIELD_DEFAULT_VALUE_HUMAN_NAME = 'defaultValueHumanName'; const FIELD_DEFAULT_VALUE_ID = 'defaultValueId'; const FIELD_DEFAULT_VALUE_ID_EXT = '_defaultValueId'; @@ -161,6 +161,7 @@ class FHIRStructureMapSource extends FHIRBackboneElement const FIELD_DEFAULT_VALUE_MARKDOWN_EXT = '_defaultValueMarkdown'; const FIELD_DEFAULT_VALUE_META = 'defaultValueMeta'; const FIELD_DEFAULT_VALUE_MONEY = 'defaultValueMoney'; + const FIELD_DEFAULT_VALUE_MONEY_EXT = '_defaultValueMoney'; const FIELD_DEFAULT_VALUE_OID = 'defaultValueOid'; const FIELD_DEFAULT_VALUE_OID_EXT = '_defaultValueOid'; const FIELD_DEFAULT_VALUE_PERIOD = 'defaultValuePeriod'; @@ -760,6 +761,9 @@ class FHIRStructureMapSource extends FHIRBackboneElement */ protected $variable = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRStructureMapSource Constructor * @param null|array $data @@ -782,8 +786,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CHECK] instanceof FHIRString) { $this->setCheck($data[self::FIELD_CHECK]); - } elseif ($ext && is_scalar($data[self::FIELD_CHECK])) { - $this->setCheck(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_CHECK]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CHECK])) { + $this->setCheck(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_CHECK]] + $ext)); + } else if (is_array($data[self::FIELD_CHECK])) { + $this->setCheck(new FHIRString(array_merge($ext, $data[self::FIELD_CHECK]))); + } } else { $this->setCheck(new FHIRString($data[self::FIELD_CHECK])); } @@ -794,8 +802,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CONDITION] instanceof FHIRString) { $this->setCondition($data[self::FIELD_CONDITION]); - } elseif ($ext && is_scalar($data[self::FIELD_CONDITION])) { - $this->setCondition(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_CONDITION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CONDITION])) { + $this->setCondition(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_CONDITION]] + $ext)); + } else if (is_array($data[self::FIELD_CONDITION])) { + $this->setCondition(new FHIRString(array_merge($ext, $data[self::FIELD_CONDITION]))); + } } else { $this->setCondition(new FHIRString($data[self::FIELD_CONDITION])); } @@ -806,8 +818,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CONTEXT] instanceof FHIRId) { $this->setContext($data[self::FIELD_CONTEXT]); - } elseif ($ext && is_scalar($data[self::FIELD_CONTEXT])) { - $this->setContext(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_CONTEXT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CONTEXT])) { + $this->setContext(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_CONTEXT]] + $ext)); + } else if (is_array($data[self::FIELD_CONTEXT])) { + $this->setContext(new FHIRId(array_merge($ext, $data[self::FIELD_CONTEXT]))); + } } else { $this->setContext(new FHIRId($data[self::FIELD_CONTEXT])); } @@ -820,8 +836,17 @@ public function __construct($data = null) } } if (isset($data[self::FIELD_DEFAULT_VALUE_AGE])) { + $ext = (isset($data[self::FIELD_DEFAULT_VALUE_AGE_EXT]) && is_array($data[self::FIELD_DEFAULT_VALUE_AGE_EXT])) + ? $data[self::FIELD_DEFAULT_VALUE_AGE_EXT] + : null; if ($data[self::FIELD_DEFAULT_VALUE_AGE] instanceof FHIRAge) { $this->setDefaultValueAge($data[self::FIELD_DEFAULT_VALUE_AGE]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DEFAULT_VALUE_AGE])) { + $this->setDefaultValueAge(new FHIRAge([FHIRAge::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_AGE]] + $ext)); + } else if (is_array($data[self::FIELD_DEFAULT_VALUE_AGE])) { + $this->setDefaultValueAge(new FHIRAge(array_merge($ext, $data[self::FIELD_DEFAULT_VALUE_AGE]))); + } } else { $this->setDefaultValueAge(new FHIRAge($data[self::FIELD_DEFAULT_VALUE_AGE])); } @@ -846,8 +871,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DEFAULT_VALUE_BASE_64BINARY] instanceof FHIRBase64Binary) { $this->setDefaultValueBase64Binary($data[self::FIELD_DEFAULT_VALUE_BASE_64BINARY]); - } elseif ($ext && is_scalar($data[self::FIELD_DEFAULT_VALUE_BASE_64BINARY])) { - $this->setDefaultValueBase64Binary(new FHIRBase64Binary([FHIRBase64Binary::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_BASE_64BINARY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DEFAULT_VALUE_BASE_64BINARY])) { + $this->setDefaultValueBase64Binary(new FHIRBase64Binary([FHIRBase64Binary::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_BASE_64BINARY]] + $ext)); + } else if (is_array($data[self::FIELD_DEFAULT_VALUE_BASE_64BINARY])) { + $this->setDefaultValueBase64Binary(new FHIRBase64Binary(array_merge($ext, $data[self::FIELD_DEFAULT_VALUE_BASE_64BINARY]))); + } } else { $this->setDefaultValueBase64Binary(new FHIRBase64Binary($data[self::FIELD_DEFAULT_VALUE_BASE_64BINARY])); } @@ -858,8 +887,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DEFAULT_VALUE_BOOLEAN] instanceof FHIRBoolean) { $this->setDefaultValueBoolean($data[self::FIELD_DEFAULT_VALUE_BOOLEAN]); - } elseif ($ext && is_scalar($data[self::FIELD_DEFAULT_VALUE_BOOLEAN])) { - $this->setDefaultValueBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_BOOLEAN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DEFAULT_VALUE_BOOLEAN])) { + $this->setDefaultValueBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_BOOLEAN]] + $ext)); + } else if (is_array($data[self::FIELD_DEFAULT_VALUE_BOOLEAN])) { + $this->setDefaultValueBoolean(new FHIRBoolean(array_merge($ext, $data[self::FIELD_DEFAULT_VALUE_BOOLEAN]))); + } } else { $this->setDefaultValueBoolean(new FHIRBoolean($data[self::FIELD_DEFAULT_VALUE_BOOLEAN])); } @@ -870,8 +903,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DEFAULT_VALUE_CODE] instanceof FHIRCode) { $this->setDefaultValueCode($data[self::FIELD_DEFAULT_VALUE_CODE]); - } elseif ($ext && is_scalar($data[self::FIELD_DEFAULT_VALUE_CODE])) { - $this->setDefaultValueCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_CODE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DEFAULT_VALUE_CODE])) { + $this->setDefaultValueCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_CODE]] + $ext)); + } else if (is_array($data[self::FIELD_DEFAULT_VALUE_CODE])) { + $this->setDefaultValueCode(new FHIRCode(array_merge($ext, $data[self::FIELD_DEFAULT_VALUE_CODE]))); + } } else { $this->setDefaultValueCode(new FHIRCode($data[self::FIELD_DEFAULT_VALUE_CODE])); } @@ -896,15 +933,28 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DEFAULT_VALUE_CONTACT_POINT] instanceof FHIRContactPoint) { $this->setDefaultValueContactPoint($data[self::FIELD_DEFAULT_VALUE_CONTACT_POINT]); - } elseif ($ext && is_scalar($data[self::FIELD_DEFAULT_VALUE_CONTACT_POINT])) { - $this->setDefaultValueContactPoint(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_CONTACT_POINT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DEFAULT_VALUE_CONTACT_POINT])) { + $this->setDefaultValueContactPoint(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_CONTACT_POINT]] + $ext)); + } else if (is_array($data[self::FIELD_DEFAULT_VALUE_CONTACT_POINT])) { + $this->setDefaultValueContactPoint(new FHIRContactPoint(array_merge($ext, $data[self::FIELD_DEFAULT_VALUE_CONTACT_POINT]))); + } } else { $this->setDefaultValueContactPoint(new FHIRContactPoint($data[self::FIELD_DEFAULT_VALUE_CONTACT_POINT])); } } if (isset($data[self::FIELD_DEFAULT_VALUE_COUNT])) { + $ext = (isset($data[self::FIELD_DEFAULT_VALUE_COUNT_EXT]) && is_array($data[self::FIELD_DEFAULT_VALUE_COUNT_EXT])) + ? $data[self::FIELD_DEFAULT_VALUE_COUNT_EXT] + : null; if ($data[self::FIELD_DEFAULT_VALUE_COUNT] instanceof FHIRCount) { $this->setDefaultValueCount($data[self::FIELD_DEFAULT_VALUE_COUNT]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DEFAULT_VALUE_COUNT])) { + $this->setDefaultValueCount(new FHIRCount([FHIRCount::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_COUNT]] + $ext)); + } else if (is_array($data[self::FIELD_DEFAULT_VALUE_COUNT])) { + $this->setDefaultValueCount(new FHIRCount(array_merge($ext, $data[self::FIELD_DEFAULT_VALUE_COUNT]))); + } } else { $this->setDefaultValueCount(new FHIRCount($data[self::FIELD_DEFAULT_VALUE_COUNT])); } @@ -915,8 +965,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DEFAULT_VALUE_DATE] instanceof FHIRDate) { $this->setDefaultValueDate($data[self::FIELD_DEFAULT_VALUE_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_DEFAULT_VALUE_DATE])) { - $this->setDefaultValueDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DEFAULT_VALUE_DATE])) { + $this->setDefaultValueDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_DEFAULT_VALUE_DATE])) { + $this->setDefaultValueDate(new FHIRDate(array_merge($ext, $data[self::FIELD_DEFAULT_VALUE_DATE]))); + } } else { $this->setDefaultValueDate(new FHIRDate($data[self::FIELD_DEFAULT_VALUE_DATE])); } @@ -927,8 +981,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DEFAULT_VALUE_DATE_TIME] instanceof FHIRDateTime) { $this->setDefaultValueDateTime($data[self::FIELD_DEFAULT_VALUE_DATE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_DEFAULT_VALUE_DATE_TIME])) { - $this->setDefaultValueDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_DATE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DEFAULT_VALUE_DATE_TIME])) { + $this->setDefaultValueDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_DATE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_DEFAULT_VALUE_DATE_TIME])) { + $this->setDefaultValueDateTime(new FHIRDateTime(array_merge($ext, $data[self::FIELD_DEFAULT_VALUE_DATE_TIME]))); + } } else { $this->setDefaultValueDateTime(new FHIRDateTime($data[self::FIELD_DEFAULT_VALUE_DATE_TIME])); } @@ -939,22 +997,44 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DEFAULT_VALUE_DECIMAL] instanceof FHIRDecimal) { $this->setDefaultValueDecimal($data[self::FIELD_DEFAULT_VALUE_DECIMAL]); - } elseif ($ext && is_scalar($data[self::FIELD_DEFAULT_VALUE_DECIMAL])) { - $this->setDefaultValueDecimal(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_DECIMAL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DEFAULT_VALUE_DECIMAL])) { + $this->setDefaultValueDecimal(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_DECIMAL]] + $ext)); + } else if (is_array($data[self::FIELD_DEFAULT_VALUE_DECIMAL])) { + $this->setDefaultValueDecimal(new FHIRDecimal(array_merge($ext, $data[self::FIELD_DEFAULT_VALUE_DECIMAL]))); + } } else { $this->setDefaultValueDecimal(new FHIRDecimal($data[self::FIELD_DEFAULT_VALUE_DECIMAL])); } } if (isset($data[self::FIELD_DEFAULT_VALUE_DISTANCE])) { + $ext = (isset($data[self::FIELD_DEFAULT_VALUE_DISTANCE_EXT]) && is_array($data[self::FIELD_DEFAULT_VALUE_DISTANCE_EXT])) + ? $data[self::FIELD_DEFAULT_VALUE_DISTANCE_EXT] + : null; if ($data[self::FIELD_DEFAULT_VALUE_DISTANCE] instanceof FHIRDistance) { $this->setDefaultValueDistance($data[self::FIELD_DEFAULT_VALUE_DISTANCE]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DEFAULT_VALUE_DISTANCE])) { + $this->setDefaultValueDistance(new FHIRDistance([FHIRDistance::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_DISTANCE]] + $ext)); + } else if (is_array($data[self::FIELD_DEFAULT_VALUE_DISTANCE])) { + $this->setDefaultValueDistance(new FHIRDistance(array_merge($ext, $data[self::FIELD_DEFAULT_VALUE_DISTANCE]))); + } } else { $this->setDefaultValueDistance(new FHIRDistance($data[self::FIELD_DEFAULT_VALUE_DISTANCE])); } } if (isset($data[self::FIELD_DEFAULT_VALUE_DURATION])) { + $ext = (isset($data[self::FIELD_DEFAULT_VALUE_DURATION_EXT]) && is_array($data[self::FIELD_DEFAULT_VALUE_DURATION_EXT])) + ? $data[self::FIELD_DEFAULT_VALUE_DURATION_EXT] + : null; if ($data[self::FIELD_DEFAULT_VALUE_DURATION] instanceof FHIRDuration) { $this->setDefaultValueDuration($data[self::FIELD_DEFAULT_VALUE_DURATION]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DEFAULT_VALUE_DURATION])) { + $this->setDefaultValueDuration(new FHIRDuration([FHIRDuration::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_DURATION]] + $ext)); + } else if (is_array($data[self::FIELD_DEFAULT_VALUE_DURATION])) { + $this->setDefaultValueDuration(new FHIRDuration(array_merge($ext, $data[self::FIELD_DEFAULT_VALUE_DURATION]))); + } } else { $this->setDefaultValueDuration(new FHIRDuration($data[self::FIELD_DEFAULT_VALUE_DURATION])); } @@ -972,8 +1052,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DEFAULT_VALUE_ID] instanceof FHIRId) { $this->setDefaultValueId($data[self::FIELD_DEFAULT_VALUE_ID]); - } elseif ($ext && is_scalar($data[self::FIELD_DEFAULT_VALUE_ID])) { - $this->setDefaultValueId(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_ID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DEFAULT_VALUE_ID])) { + $this->setDefaultValueId(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_ID]] + $ext)); + } else if (is_array($data[self::FIELD_DEFAULT_VALUE_ID])) { + $this->setDefaultValueId(new FHIRId(array_merge($ext, $data[self::FIELD_DEFAULT_VALUE_ID]))); + } } else { $this->setDefaultValueId(new FHIRId($data[self::FIELD_DEFAULT_VALUE_ID])); } @@ -984,8 +1068,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DEFAULT_VALUE_IDENTIFIER] instanceof FHIRIdentifier) { $this->setDefaultValueIdentifier($data[self::FIELD_DEFAULT_VALUE_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_DEFAULT_VALUE_IDENTIFIER])) { - $this->setDefaultValueIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DEFAULT_VALUE_IDENTIFIER])) { + $this->setDefaultValueIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_DEFAULT_VALUE_IDENTIFIER])) { + $this->setDefaultValueIdentifier(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_DEFAULT_VALUE_IDENTIFIER]))); + } } else { $this->setDefaultValueIdentifier(new FHIRIdentifier($data[self::FIELD_DEFAULT_VALUE_IDENTIFIER])); } @@ -996,8 +1084,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DEFAULT_VALUE_INSTANT] instanceof FHIRInstant) { $this->setDefaultValueInstant($data[self::FIELD_DEFAULT_VALUE_INSTANT]); - } elseif ($ext && is_scalar($data[self::FIELD_DEFAULT_VALUE_INSTANT])) { - $this->setDefaultValueInstant(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_INSTANT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DEFAULT_VALUE_INSTANT])) { + $this->setDefaultValueInstant(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_INSTANT]] + $ext)); + } else if (is_array($data[self::FIELD_DEFAULT_VALUE_INSTANT])) { + $this->setDefaultValueInstant(new FHIRInstant(array_merge($ext, $data[self::FIELD_DEFAULT_VALUE_INSTANT]))); + } } else { $this->setDefaultValueInstant(new FHIRInstant($data[self::FIELD_DEFAULT_VALUE_INSTANT])); } @@ -1008,8 +1100,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DEFAULT_VALUE_INTEGER] instanceof FHIRInteger) { $this->setDefaultValueInteger($data[self::FIELD_DEFAULT_VALUE_INTEGER]); - } elseif ($ext && is_scalar($data[self::FIELD_DEFAULT_VALUE_INTEGER])) { - $this->setDefaultValueInteger(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_INTEGER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DEFAULT_VALUE_INTEGER])) { + $this->setDefaultValueInteger(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_INTEGER]] + $ext)); + } else if (is_array($data[self::FIELD_DEFAULT_VALUE_INTEGER])) { + $this->setDefaultValueInteger(new FHIRInteger(array_merge($ext, $data[self::FIELD_DEFAULT_VALUE_INTEGER]))); + } } else { $this->setDefaultValueInteger(new FHIRInteger($data[self::FIELD_DEFAULT_VALUE_INTEGER])); } @@ -1020,8 +1116,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DEFAULT_VALUE_MARKDOWN] instanceof FHIRMarkdown) { $this->setDefaultValueMarkdown($data[self::FIELD_DEFAULT_VALUE_MARKDOWN]); - } elseif ($ext && is_scalar($data[self::FIELD_DEFAULT_VALUE_MARKDOWN])) { - $this->setDefaultValueMarkdown(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_MARKDOWN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DEFAULT_VALUE_MARKDOWN])) { + $this->setDefaultValueMarkdown(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_MARKDOWN]] + $ext)); + } else if (is_array($data[self::FIELD_DEFAULT_VALUE_MARKDOWN])) { + $this->setDefaultValueMarkdown(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_DEFAULT_VALUE_MARKDOWN]))); + } } else { $this->setDefaultValueMarkdown(new FHIRMarkdown($data[self::FIELD_DEFAULT_VALUE_MARKDOWN])); } @@ -1034,8 +1134,17 @@ public function __construct($data = null) } } if (isset($data[self::FIELD_DEFAULT_VALUE_MONEY])) { + $ext = (isset($data[self::FIELD_DEFAULT_VALUE_MONEY_EXT]) && is_array($data[self::FIELD_DEFAULT_VALUE_MONEY_EXT])) + ? $data[self::FIELD_DEFAULT_VALUE_MONEY_EXT] + : null; if ($data[self::FIELD_DEFAULT_VALUE_MONEY] instanceof FHIRMoney) { $this->setDefaultValueMoney($data[self::FIELD_DEFAULT_VALUE_MONEY]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DEFAULT_VALUE_MONEY])) { + $this->setDefaultValueMoney(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_MONEY]] + $ext)); + } else if (is_array($data[self::FIELD_DEFAULT_VALUE_MONEY])) { + $this->setDefaultValueMoney(new FHIRMoney(array_merge($ext, $data[self::FIELD_DEFAULT_VALUE_MONEY]))); + } } else { $this->setDefaultValueMoney(new FHIRMoney($data[self::FIELD_DEFAULT_VALUE_MONEY])); } @@ -1046,8 +1155,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DEFAULT_VALUE_OID] instanceof FHIROid) { $this->setDefaultValueOid($data[self::FIELD_DEFAULT_VALUE_OID]); - } elseif ($ext && is_scalar($data[self::FIELD_DEFAULT_VALUE_OID])) { - $this->setDefaultValueOid(new FHIROid([FHIROid::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_OID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DEFAULT_VALUE_OID])) { + $this->setDefaultValueOid(new FHIROid([FHIROid::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_OID]] + $ext)); + } else if (is_array($data[self::FIELD_DEFAULT_VALUE_OID])) { + $this->setDefaultValueOid(new FHIROid(array_merge($ext, $data[self::FIELD_DEFAULT_VALUE_OID]))); + } } else { $this->setDefaultValueOid(new FHIROid($data[self::FIELD_DEFAULT_VALUE_OID])); } @@ -1065,8 +1178,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DEFAULT_VALUE_POSITIVE_INT] instanceof FHIRPositiveInt) { $this->setDefaultValuePositiveInt($data[self::FIELD_DEFAULT_VALUE_POSITIVE_INT]); - } elseif ($ext && is_scalar($data[self::FIELD_DEFAULT_VALUE_POSITIVE_INT])) { - $this->setDefaultValuePositiveInt(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_POSITIVE_INT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DEFAULT_VALUE_POSITIVE_INT])) { + $this->setDefaultValuePositiveInt(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_POSITIVE_INT]] + $ext)); + } else if (is_array($data[self::FIELD_DEFAULT_VALUE_POSITIVE_INT])) { + $this->setDefaultValuePositiveInt(new FHIRPositiveInt(array_merge($ext, $data[self::FIELD_DEFAULT_VALUE_POSITIVE_INT]))); + } } else { $this->setDefaultValuePositiveInt(new FHIRPositiveInt($data[self::FIELD_DEFAULT_VALUE_POSITIVE_INT])); } @@ -1077,8 +1194,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DEFAULT_VALUE_QUANTITY] instanceof FHIRQuantity) { $this->setDefaultValueQuantity($data[self::FIELD_DEFAULT_VALUE_QUANTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_DEFAULT_VALUE_QUANTITY])) { - $this->setDefaultValueQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_QUANTITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DEFAULT_VALUE_QUANTITY])) { + $this->setDefaultValueQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_DEFAULT_VALUE_QUANTITY])) { + $this->setDefaultValueQuantity(new FHIRQuantity(array_merge($ext, $data[self::FIELD_DEFAULT_VALUE_QUANTITY]))); + } } else { $this->setDefaultValueQuantity(new FHIRQuantity($data[self::FIELD_DEFAULT_VALUE_QUANTITY])); } @@ -1124,8 +1245,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DEFAULT_VALUE_STRING] instanceof FHIRString) { $this->setDefaultValueString($data[self::FIELD_DEFAULT_VALUE_STRING]); - } elseif ($ext && is_scalar($data[self::FIELD_DEFAULT_VALUE_STRING])) { - $this->setDefaultValueString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_STRING]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DEFAULT_VALUE_STRING])) { + $this->setDefaultValueString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_STRING]] + $ext)); + } else if (is_array($data[self::FIELD_DEFAULT_VALUE_STRING])) { + $this->setDefaultValueString(new FHIRString(array_merge($ext, $data[self::FIELD_DEFAULT_VALUE_STRING]))); + } } else { $this->setDefaultValueString(new FHIRString($data[self::FIELD_DEFAULT_VALUE_STRING])); } @@ -1136,8 +1261,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DEFAULT_VALUE_TIME] instanceof FHIRTime) { $this->setDefaultValueTime($data[self::FIELD_DEFAULT_VALUE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_DEFAULT_VALUE_TIME])) { - $this->setDefaultValueTime(new FHIRTime([FHIRTime::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DEFAULT_VALUE_TIME])) { + $this->setDefaultValueTime(new FHIRTime([FHIRTime::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_DEFAULT_VALUE_TIME])) { + $this->setDefaultValueTime(new FHIRTime(array_merge($ext, $data[self::FIELD_DEFAULT_VALUE_TIME]))); + } } else { $this->setDefaultValueTime(new FHIRTime($data[self::FIELD_DEFAULT_VALUE_TIME])); } @@ -1155,8 +1284,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DEFAULT_VALUE_UNSIGNED_INT] instanceof FHIRUnsignedInt) { $this->setDefaultValueUnsignedInt($data[self::FIELD_DEFAULT_VALUE_UNSIGNED_INT]); - } elseif ($ext && is_scalar($data[self::FIELD_DEFAULT_VALUE_UNSIGNED_INT])) { - $this->setDefaultValueUnsignedInt(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_UNSIGNED_INT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DEFAULT_VALUE_UNSIGNED_INT])) { + $this->setDefaultValueUnsignedInt(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_UNSIGNED_INT]] + $ext)); + } else if (is_array($data[self::FIELD_DEFAULT_VALUE_UNSIGNED_INT])) { + $this->setDefaultValueUnsignedInt(new FHIRUnsignedInt(array_merge($ext, $data[self::FIELD_DEFAULT_VALUE_UNSIGNED_INT]))); + } } else { $this->setDefaultValueUnsignedInt(new FHIRUnsignedInt($data[self::FIELD_DEFAULT_VALUE_UNSIGNED_INT])); } @@ -1167,8 +1300,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DEFAULT_VALUE_URI] instanceof FHIRUri) { $this->setDefaultValueUri($data[self::FIELD_DEFAULT_VALUE_URI]); - } elseif ($ext && is_scalar($data[self::FIELD_DEFAULT_VALUE_URI])) { - $this->setDefaultValueUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_URI]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DEFAULT_VALUE_URI])) { + $this->setDefaultValueUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_URI]] + $ext)); + } else if (is_array($data[self::FIELD_DEFAULT_VALUE_URI])) { + $this->setDefaultValueUri(new FHIRUri(array_merge($ext, $data[self::FIELD_DEFAULT_VALUE_URI]))); + } } else { $this->setDefaultValueUri(new FHIRUri($data[self::FIELD_DEFAULT_VALUE_URI])); } @@ -1179,8 +1316,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ELEMENT] instanceof FHIRString) { $this->setElement($data[self::FIELD_ELEMENT]); - } elseif ($ext && is_scalar($data[self::FIELD_ELEMENT])) { - $this->setElement(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_ELEMENT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ELEMENT])) { + $this->setElement(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_ELEMENT]] + $ext)); + } else if (is_array($data[self::FIELD_ELEMENT])) { + $this->setElement(new FHIRString(array_merge($ext, $data[self::FIELD_ELEMENT]))); + } } else { $this->setElement(new FHIRString($data[self::FIELD_ELEMENT])); } @@ -1191,8 +1332,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_LIST_MODE] instanceof FHIRStructureMapSourceListMode) { $this->setListMode($data[self::FIELD_LIST_MODE]); - } elseif ($ext && is_scalar($data[self::FIELD_LIST_MODE])) { - $this->setListMode(new FHIRStructureMapSourceListMode([FHIRStructureMapSourceListMode::FIELD_VALUE => $data[self::FIELD_LIST_MODE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_LIST_MODE])) { + $this->setListMode(new FHIRStructureMapSourceListMode([FHIRStructureMapSourceListMode::FIELD_VALUE => $data[self::FIELD_LIST_MODE]] + $ext)); + } else if (is_array($data[self::FIELD_LIST_MODE])) { + $this->setListMode(new FHIRStructureMapSourceListMode(array_merge($ext, $data[self::FIELD_LIST_MODE]))); + } } else { $this->setListMode(new FHIRStructureMapSourceListMode($data[self::FIELD_LIST_MODE])); } @@ -1203,8 +1348,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MAX] instanceof FHIRString) { $this->setMax($data[self::FIELD_MAX]); - } elseif ($ext && is_scalar($data[self::FIELD_MAX])) { - $this->setMax(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_MAX]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MAX])) { + $this->setMax(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_MAX]] + $ext)); + } else if (is_array($data[self::FIELD_MAX])) { + $this->setMax(new FHIRString(array_merge($ext, $data[self::FIELD_MAX]))); + } } else { $this->setMax(new FHIRString($data[self::FIELD_MAX])); } @@ -1215,8 +1364,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MIN] instanceof FHIRInteger) { $this->setMin($data[self::FIELD_MIN]); - } elseif ($ext && is_scalar($data[self::FIELD_MIN])) { - $this->setMin(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_MIN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MIN])) { + $this->setMin(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_MIN]] + $ext)); + } else if (is_array($data[self::FIELD_MIN])) { + $this->setMin(new FHIRInteger(array_merge($ext, $data[self::FIELD_MIN]))); + } } else { $this->setMin(new FHIRInteger($data[self::FIELD_MIN])); } @@ -1227,8 +1380,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TYPE] instanceof FHIRString) { $this->setType($data[self::FIELD_TYPE]); - } elseif ($ext && is_scalar($data[self::FIELD_TYPE])) { - $this->setType(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TYPE])) { + $this->setType(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } else if (is_array($data[self::FIELD_TYPE])) { + $this->setType(new FHIRString(array_merge($ext, $data[self::FIELD_TYPE]))); + } } else { $this->setType(new FHIRString($data[self::FIELD_TYPE])); } @@ -1239,8 +1396,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VARIABLE] instanceof FHIRId) { $this->setVariable($data[self::FIELD_VARIABLE]); - } elseif ($ext && is_scalar($data[self::FIELD_VARIABLE])) { - $this->setVariable(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_VARIABLE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VARIABLE])) { + $this->setVariable(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_VARIABLE]] + $ext)); + } else if (is_array($data[self::FIELD_VARIABLE])) { + $this->setVariable(new FHIRId(array_merge($ext, $data[self::FIELD_VARIABLE]))); + } } else { $this->setVariable(new FHIRId($data[self::FIELD_VARIABLE])); } @@ -3257,6 +3418,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getCheck())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CHECK, null, $v->_getFHIRXMLNamespace())); } @@ -3266,19 +3428,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getContext())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CONTEXT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDefaultValueAddress())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFAULT_VALUE_ADDRESS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDefaultValueAge())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFAULT_VALUE_AGE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDefaultValueAnnotation())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFAULT_VALUE_ANNOTATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDefaultValueAttachment())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFAULT_VALUE_ATTACHMENT, null, $v->_getFHIRXMLNamespace())); } @@ -3291,19 +3449,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDefaultValueCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFAULT_VALUE_CODE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDefaultValueCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFAULT_VALUE_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDefaultValueCoding())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFAULT_VALUE_CODING, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDefaultValueContactPoint())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFAULT_VALUE_CONTACT_POINT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDefaultValueCount())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFAULT_VALUE_COUNT, null, $v->_getFHIRXMLNamespace())); } @@ -3316,22 +3470,18 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDefaultValueDecimal())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFAULT_VALUE_DECIMAL, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDefaultValueDistance())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFAULT_VALUE_DISTANCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDefaultValueDuration())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFAULT_VALUE_DURATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDefaultValueHumanName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFAULT_VALUE_HUMAN_NAME, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getDefaultValueId())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFAULT_VALUE_ID, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDefaultValueIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFAULT_VALUE_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } @@ -3344,45 +3494,36 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDefaultValueMarkdown())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFAULT_VALUE_MARKDOWN, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDefaultValueMeta())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFAULT_VALUE_META, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDefaultValueMoney())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFAULT_VALUE_MONEY, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getDefaultValueOid())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFAULT_VALUE_OID, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDefaultValuePeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFAULT_VALUE_PERIOD, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getDefaultValuePositiveInt())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFAULT_VALUE_POSITIVE_INT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDefaultValueQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFAULT_VALUE_QUANTITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDefaultValueRange())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFAULT_VALUE_RANGE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDefaultValueRatio())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFAULT_VALUE_RATIO, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDefaultValueReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFAULT_VALUE_REFERENCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDefaultValueSampledData())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFAULT_VALUE_SAMPLED_DATA, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDefaultValueSignature())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFAULT_VALUE_SIGNATURE, null, $v->_getFHIRXMLNamespace())); } @@ -3392,7 +3533,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDefaultValueTime())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFAULT_VALUE_TIME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDefaultValueTiming())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFAULT_VALUE_TIMING, null, $v->_getFHIRXMLNamespace())); } @@ -3405,7 +3545,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getElement())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ELEMENT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getListMode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_LIST_MODE, null, $v->_getFHIRXMLNamespace())); } @@ -3431,22 +3570,51 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getCheck())) { - $a[self::FIELD_CHECK] = $v->getValue(); - $a[self::FIELD_CHECK_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CHECK] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CHECK_EXT] = $enc; + } + } else { + $a[self::FIELD_CHECK] = $v; + } } if (null !== ($v = $this->getCondition())) { - $a[self::FIELD_CONDITION] = $v->getValue(); - $a[self::FIELD_CONDITION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CONDITION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CONDITION_EXT] = $enc; + } + } else { + $a[self::FIELD_CONDITION] = $v; + } } if (null !== ($v = $this->getContext())) { - $a[self::FIELD_CONTEXT] = $v->getValue(); - $a[self::FIELD_CONTEXT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CONTEXT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CONTEXT_EXT] = $enc; + } + } else { + $a[self::FIELD_CONTEXT] = $v; + } } if (null !== ($v = $this->getDefaultValueAddress())) { $a[self::FIELD_DEFAULT_VALUE_ADDRESS] = $v; } if (null !== ($v = $this->getDefaultValueAge())) { - $a[self::FIELD_DEFAULT_VALUE_AGE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DEFAULT_VALUE_AGE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DEFAULT_VALUE_AGE_EXT] = $enc; + } + } else { + $a[self::FIELD_DEFAULT_VALUE_AGE] = $v; + } } if (null !== ($v = $this->getDefaultValueAnnotation())) { $a[self::FIELD_DEFAULT_VALUE_ANNOTATION] = $v; @@ -3455,16 +3623,37 @@ public function jsonSerialize() $a[self::FIELD_DEFAULT_VALUE_ATTACHMENT] = $v; } if (null !== ($v = $this->getDefaultValueBase64Binary())) { - $a[self::FIELD_DEFAULT_VALUE_BASE_64BINARY] = $v->getValue(); - $a[self::FIELD_DEFAULT_VALUE_BASE_64BINARY_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DEFAULT_VALUE_BASE_64BINARY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DEFAULT_VALUE_BASE_64BINARY_EXT] = $enc; + } + } else { + $a[self::FIELD_DEFAULT_VALUE_BASE_64BINARY] = $v; + } } if (null !== ($v = $this->getDefaultValueBoolean())) { - $a[self::FIELD_DEFAULT_VALUE_BOOLEAN] = $v->getValue(); - $a[self::FIELD_DEFAULT_VALUE_BOOLEAN_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DEFAULT_VALUE_BOOLEAN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DEFAULT_VALUE_BOOLEAN_EXT] = $enc; + } + } else { + $a[self::FIELD_DEFAULT_VALUE_BOOLEAN] = $v; + } } if (null !== ($v = $this->getDefaultValueCode())) { - $a[self::FIELD_DEFAULT_VALUE_CODE] = $v->getValue(); - $a[self::FIELD_DEFAULT_VALUE_CODE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DEFAULT_VALUE_CODE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DEFAULT_VALUE_CODE_EXT] = $enc; + } + } else { + $a[self::FIELD_DEFAULT_VALUE_CODE] = $v; + } } if (null !== ($v = $this->getDefaultValueCodeableConcept())) { $a[self::FIELD_DEFAULT_VALUE_CODEABLE_CONCEPT] = $v; @@ -3473,70 +3662,189 @@ public function jsonSerialize() $a[self::FIELD_DEFAULT_VALUE_CODING] = $v; } if (null !== ($v = $this->getDefaultValueContactPoint())) { - $a[self::FIELD_DEFAULT_VALUE_CONTACT_POINT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DEFAULT_VALUE_CONTACT_POINT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DEFAULT_VALUE_CONTACT_POINT_EXT] = $enc; + } + } else { + $a[self::FIELD_DEFAULT_VALUE_CONTACT_POINT] = $v; + } } if (null !== ($v = $this->getDefaultValueCount())) { - $a[self::FIELD_DEFAULT_VALUE_COUNT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DEFAULT_VALUE_COUNT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DEFAULT_VALUE_COUNT_EXT] = $enc; + } + } else { + $a[self::FIELD_DEFAULT_VALUE_COUNT] = $v; + } } if (null !== ($v = $this->getDefaultValueDate())) { - $a[self::FIELD_DEFAULT_VALUE_DATE] = $v->getValue(); - $a[self::FIELD_DEFAULT_VALUE_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DEFAULT_VALUE_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DEFAULT_VALUE_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_DEFAULT_VALUE_DATE] = $v; + } } if (null !== ($v = $this->getDefaultValueDateTime())) { - $a[self::FIELD_DEFAULT_VALUE_DATE_TIME] = $v->getValue(); - $a[self::FIELD_DEFAULT_VALUE_DATE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DEFAULT_VALUE_DATE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DEFAULT_VALUE_DATE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_DEFAULT_VALUE_DATE_TIME] = $v; + } } if (null !== ($v = $this->getDefaultValueDecimal())) { - $a[self::FIELD_DEFAULT_VALUE_DECIMAL] = $v->getValue(); - $a[self::FIELD_DEFAULT_VALUE_DECIMAL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DEFAULT_VALUE_DECIMAL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DEFAULT_VALUE_DECIMAL_EXT] = $enc; + } + } else { + $a[self::FIELD_DEFAULT_VALUE_DECIMAL] = $v; + } } if (null !== ($v = $this->getDefaultValueDistance())) { - $a[self::FIELD_DEFAULT_VALUE_DISTANCE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DEFAULT_VALUE_DISTANCE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DEFAULT_VALUE_DISTANCE_EXT] = $enc; + } + } else { + $a[self::FIELD_DEFAULT_VALUE_DISTANCE] = $v; + } } if (null !== ($v = $this->getDefaultValueDuration())) { - $a[self::FIELD_DEFAULT_VALUE_DURATION] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DEFAULT_VALUE_DURATION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DEFAULT_VALUE_DURATION_EXT] = $enc; + } + } else { + $a[self::FIELD_DEFAULT_VALUE_DURATION] = $v; + } } if (null !== ($v = $this->getDefaultValueHumanName())) { $a[self::FIELD_DEFAULT_VALUE_HUMAN_NAME] = $v; } if (null !== ($v = $this->getDefaultValueId())) { - $a[self::FIELD_DEFAULT_VALUE_ID] = $v->getValue(); - $a[self::FIELD_DEFAULT_VALUE_ID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DEFAULT_VALUE_ID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DEFAULT_VALUE_ID_EXT] = $enc; + } + } else { + $a[self::FIELD_DEFAULT_VALUE_ID] = $v; + } } if (null !== ($v = $this->getDefaultValueIdentifier())) { - $a[self::FIELD_DEFAULT_VALUE_IDENTIFIER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DEFAULT_VALUE_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DEFAULT_VALUE_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_DEFAULT_VALUE_IDENTIFIER] = $v; + } } if (null !== ($v = $this->getDefaultValueInstant())) { - $a[self::FIELD_DEFAULT_VALUE_INSTANT] = $v->getValue(); - $a[self::FIELD_DEFAULT_VALUE_INSTANT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DEFAULT_VALUE_INSTANT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DEFAULT_VALUE_INSTANT_EXT] = $enc; + } + } else { + $a[self::FIELD_DEFAULT_VALUE_INSTANT] = $v; + } } if (null !== ($v = $this->getDefaultValueInteger())) { - $a[self::FIELD_DEFAULT_VALUE_INTEGER] = $v->getValue(); - $a[self::FIELD_DEFAULT_VALUE_INTEGER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DEFAULT_VALUE_INTEGER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DEFAULT_VALUE_INTEGER_EXT] = $enc; + } + } else { + $a[self::FIELD_DEFAULT_VALUE_INTEGER] = $v; + } } if (null !== ($v = $this->getDefaultValueMarkdown())) { - $a[self::FIELD_DEFAULT_VALUE_MARKDOWN] = $v->getValue(); - $a[self::FIELD_DEFAULT_VALUE_MARKDOWN_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DEFAULT_VALUE_MARKDOWN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DEFAULT_VALUE_MARKDOWN_EXT] = $enc; + } + } else { + $a[self::FIELD_DEFAULT_VALUE_MARKDOWN] = $v; + } } if (null !== ($v = $this->getDefaultValueMeta())) { $a[self::FIELD_DEFAULT_VALUE_META] = $v; } if (null !== ($v = $this->getDefaultValueMoney())) { - $a[self::FIELD_DEFAULT_VALUE_MONEY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DEFAULT_VALUE_MONEY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DEFAULT_VALUE_MONEY_EXT] = $enc; + } + } else { + $a[self::FIELD_DEFAULT_VALUE_MONEY] = $v; + } } if (null !== ($v = $this->getDefaultValueOid())) { - $a[self::FIELD_DEFAULT_VALUE_OID] = $v->getValue(); - $a[self::FIELD_DEFAULT_VALUE_OID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DEFAULT_VALUE_OID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DEFAULT_VALUE_OID_EXT] = $enc; + } + } else { + $a[self::FIELD_DEFAULT_VALUE_OID] = $v; + } } if (null !== ($v = $this->getDefaultValuePeriod())) { $a[self::FIELD_DEFAULT_VALUE_PERIOD] = $v; } if (null !== ($v = $this->getDefaultValuePositiveInt())) { - $a[self::FIELD_DEFAULT_VALUE_POSITIVE_INT] = $v->getValue(); - $a[self::FIELD_DEFAULT_VALUE_POSITIVE_INT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DEFAULT_VALUE_POSITIVE_INT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DEFAULT_VALUE_POSITIVE_INT_EXT] = $enc; + } + } else { + $a[self::FIELD_DEFAULT_VALUE_POSITIVE_INT] = $v; + } } if (null !== ($v = $this->getDefaultValueQuantity())) { - $a[self::FIELD_DEFAULT_VALUE_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DEFAULT_VALUE_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DEFAULT_VALUE_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_DEFAULT_VALUE_QUANTITY] = $v; + } } if (null !== ($v = $this->getDefaultValueRange())) { $a[self::FIELD_DEFAULT_VALUE_RANGE] = $v; @@ -3554,46 +3862,117 @@ public function jsonSerialize() $a[self::FIELD_DEFAULT_VALUE_SIGNATURE] = $v; } if (null !== ($v = $this->getDefaultValueString())) { - $a[self::FIELD_DEFAULT_VALUE_STRING] = $v->getValue(); - $a[self::FIELD_DEFAULT_VALUE_STRING_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DEFAULT_VALUE_STRING] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DEFAULT_VALUE_STRING_EXT] = $enc; + } + } else { + $a[self::FIELD_DEFAULT_VALUE_STRING] = $v; + } } if (null !== ($v = $this->getDefaultValueTime())) { - $a[self::FIELD_DEFAULT_VALUE_TIME] = $v->getValue(); - $a[self::FIELD_DEFAULT_VALUE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DEFAULT_VALUE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DEFAULT_VALUE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_DEFAULT_VALUE_TIME] = $v; + } } if (null !== ($v = $this->getDefaultValueTiming())) { $a[self::FIELD_DEFAULT_VALUE_TIMING] = $v; } if (null !== ($v = $this->getDefaultValueUnsignedInt())) { - $a[self::FIELD_DEFAULT_VALUE_UNSIGNED_INT] = $v->getValue(); - $a[self::FIELD_DEFAULT_VALUE_UNSIGNED_INT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DEFAULT_VALUE_UNSIGNED_INT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DEFAULT_VALUE_UNSIGNED_INT_EXT] = $enc; + } + } else { + $a[self::FIELD_DEFAULT_VALUE_UNSIGNED_INT] = $v; + } } if (null !== ($v = $this->getDefaultValueUri())) { - $a[self::FIELD_DEFAULT_VALUE_URI] = $v->getValue(); - $a[self::FIELD_DEFAULT_VALUE_URI_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DEFAULT_VALUE_URI] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DEFAULT_VALUE_URI_EXT] = $enc; + } + } else { + $a[self::FIELD_DEFAULT_VALUE_URI] = $v; + } } if (null !== ($v = $this->getElement())) { - $a[self::FIELD_ELEMENT] = $v->getValue(); - $a[self::FIELD_ELEMENT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ELEMENT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ELEMENT_EXT] = $enc; + } + } else { + $a[self::FIELD_ELEMENT] = $v; + } } if (null !== ($v = $this->getListMode())) { - $a[self::FIELD_LIST_MODE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_LIST_MODE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_LIST_MODE_EXT] = $enc; + } + } else { + $a[self::FIELD_LIST_MODE] = $v; + } } if (null !== ($v = $this->getMax())) { - $a[self::FIELD_MAX] = $v->getValue(); - $a[self::FIELD_MAX_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MAX] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MAX_EXT] = $enc; + } + } else { + $a[self::FIELD_MAX] = $v; + } } if (null !== ($v = $this->getMin())) { - $a[self::FIELD_MIN] = $v->getValue(); - $a[self::FIELD_MIN_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MIN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MIN_EXT] = $enc; + } + } else { + $a[self::FIELD_MIN] = $v; + } } if (null !== ($v = $this->getType())) { - $a[self::FIELD_TYPE] = $v->getValue(); - $a[self::FIELD_TYPE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TYPE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TYPE_EXT] = $enc; + } + } else { + $a[self::FIELD_TYPE] = $v; + } } if (null !== ($v = $this->getVariable())) { - $a[self::FIELD_VARIABLE] = $v->getValue(); - $a[self::FIELD_VARIABLE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VARIABLE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VARIABLE_EXT] = $enc; + } + } else { + $a[self::FIELD_VARIABLE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRStructureMap/FHIRStructureMapStructure.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRStructureMap/FHIRStructureMapStructure.php index b324d5a5e5..40e551df2b 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRStructureMap/FHIRStructureMapStructure.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRStructureMap/FHIRStructureMapStructure.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRStructureMapStructure extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_STRUCTURE_MAP_DOT_STRUCTURE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ALIAS = 'alias'; const FIELD_ALIAS_EXT = '_alias'; const FIELD_DOCUMENTATION = 'documentation'; @@ -135,6 +131,9 @@ class FHIRStructureMapStructure extends FHIRBackboneElement */ protected $url = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRStructureMapStructure Constructor * @param null|array $data @@ -157,8 +156,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ALIAS] instanceof FHIRString) { $this->setAlias($data[self::FIELD_ALIAS]); - } elseif ($ext && is_scalar($data[self::FIELD_ALIAS])) { - $this->setAlias(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_ALIAS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ALIAS])) { + $this->setAlias(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_ALIAS]] + $ext)); + } else if (is_array($data[self::FIELD_ALIAS])) { + $this->setAlias(new FHIRString(array_merge($ext, $data[self::FIELD_ALIAS]))); + } } else { $this->setAlias(new FHIRString($data[self::FIELD_ALIAS])); } @@ -169,8 +172,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DOCUMENTATION] instanceof FHIRString) { $this->setDocumentation($data[self::FIELD_DOCUMENTATION]); - } elseif ($ext && is_scalar($data[self::FIELD_DOCUMENTATION])) { - $this->setDocumentation(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DOCUMENTATION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DOCUMENTATION])) { + $this->setDocumentation(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DOCUMENTATION]] + $ext)); + } else if (is_array($data[self::FIELD_DOCUMENTATION])) { + $this->setDocumentation(new FHIRString(array_merge($ext, $data[self::FIELD_DOCUMENTATION]))); + } } else { $this->setDocumentation(new FHIRString($data[self::FIELD_DOCUMENTATION])); } @@ -181,8 +188,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MODE] instanceof FHIRStructureMapModelMode) { $this->setMode($data[self::FIELD_MODE]); - } elseif ($ext && is_scalar($data[self::FIELD_MODE])) { - $this->setMode(new FHIRStructureMapModelMode([FHIRStructureMapModelMode::FIELD_VALUE => $data[self::FIELD_MODE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MODE])) { + $this->setMode(new FHIRStructureMapModelMode([FHIRStructureMapModelMode::FIELD_VALUE => $data[self::FIELD_MODE]] + $ext)); + } else if (is_array($data[self::FIELD_MODE])) { + $this->setMode(new FHIRStructureMapModelMode(array_merge($ext, $data[self::FIELD_MODE]))); + } } else { $this->setMode(new FHIRStructureMapModelMode($data[self::FIELD_MODE])); } @@ -193,8 +204,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_URL] instanceof FHIRUri) { $this->setUrl($data[self::FIELD_URL]); - } elseif ($ext && is_scalar($data[self::FIELD_URL])) { - $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } else if (is_array($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri(array_merge($ext, $data[self::FIELD_URL]))); + } } else { $this->setUrl(new FHIRUri($data[self::FIELD_URL])); } @@ -463,13 +478,13 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getAlias())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ALIAS, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getDocumentation())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DOCUMENTATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getMode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MODE, null, $v->_getFHIRXMLNamespace())); } @@ -486,19 +501,48 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getAlias())) { - $a[self::FIELD_ALIAS] = $v->getValue(); - $a[self::FIELD_ALIAS_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ALIAS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ALIAS_EXT] = $enc; + } + } else { + $a[self::FIELD_ALIAS] = $v; + } } if (null !== ($v = $this->getDocumentation())) { - $a[self::FIELD_DOCUMENTATION] = $v->getValue(); - $a[self::FIELD_DOCUMENTATION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DOCUMENTATION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DOCUMENTATION_EXT] = $enc; + } + } else { + $a[self::FIELD_DOCUMENTATION] = $v; + } } if (null !== ($v = $this->getMode())) { - $a[self::FIELD_MODE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MODE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MODE_EXT] = $enc; + } + } else { + $a[self::FIELD_MODE] = $v; + } } if (null !== ($v = $this->getUrl())) { - $a[self::FIELD_URL] = $v->getValue(); - $a[self::FIELD_URL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_URL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_URL_EXT] = $enc; + } + } else { + $a[self::FIELD_URL] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRStructureMap/FHIRStructureMapTarget.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRStructureMap/FHIRStructureMapTarget.php index fc2e0eb7d6..62e8cc6ed0 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRStructureMap/FHIRStructureMapTarget.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRStructureMap/FHIRStructureMapTarget.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -81,10 +81,6 @@ class FHIRStructureMapTarget extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_STRUCTURE_MAP_DOT_TARGET; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CONTEXT = 'context'; const FIELD_CONTEXT_EXT = '_context'; const FIELD_CONTEXT_TYPE = 'contextType'; @@ -193,6 +189,9 @@ class FHIRStructureMapTarget extends FHIRBackboneElement */ protected $variable = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRStructureMapTarget Constructor * @param null|array $data @@ -215,8 +214,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CONTEXT] instanceof FHIRId) { $this->setContext($data[self::FIELD_CONTEXT]); - } elseif ($ext && is_scalar($data[self::FIELD_CONTEXT])) { - $this->setContext(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_CONTEXT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CONTEXT])) { + $this->setContext(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_CONTEXT]] + $ext)); + } else if (is_array($data[self::FIELD_CONTEXT])) { + $this->setContext(new FHIRId(array_merge($ext, $data[self::FIELD_CONTEXT]))); + } } else { $this->setContext(new FHIRId($data[self::FIELD_CONTEXT])); } @@ -227,8 +230,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CONTEXT_TYPE] instanceof FHIRStructureMapContextType) { $this->setContextType($data[self::FIELD_CONTEXT_TYPE]); - } elseif ($ext && is_scalar($data[self::FIELD_CONTEXT_TYPE])) { - $this->setContextType(new FHIRStructureMapContextType([FHIRStructureMapContextType::FIELD_VALUE => $data[self::FIELD_CONTEXT_TYPE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CONTEXT_TYPE])) { + $this->setContextType(new FHIRStructureMapContextType([FHIRStructureMapContextType::FIELD_VALUE => $data[self::FIELD_CONTEXT_TYPE]] + $ext)); + } else if (is_array($data[self::FIELD_CONTEXT_TYPE])) { + $this->setContextType(new FHIRStructureMapContextType(array_merge($ext, $data[self::FIELD_CONTEXT_TYPE]))); + } } else { $this->setContextType(new FHIRStructureMapContextType($data[self::FIELD_CONTEXT_TYPE])); } @@ -239,8 +246,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ELEMENT] instanceof FHIRString) { $this->setElement($data[self::FIELD_ELEMENT]); - } elseif ($ext && is_scalar($data[self::FIELD_ELEMENT])) { - $this->setElement(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_ELEMENT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ELEMENT])) { + $this->setElement(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_ELEMENT]] + $ext)); + } else if (is_array($data[self::FIELD_ELEMENT])) { + $this->setElement(new FHIRString(array_merge($ext, $data[self::FIELD_ELEMENT]))); + } } else { $this->setElement(new FHIRString($data[self::FIELD_ELEMENT])); } @@ -251,17 +262,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_LIST_MODE])) { foreach($data[self::FIELD_LIST_MODE] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRStructureMapTargetListMode) { $this->addListMode($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addListMode(new FHIRStructureMapTargetListMode([FHIRStructureMapTargetListMode::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addListMode(new FHIRStructureMapTargetListMode([FHIRStructureMapTargetListMode::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addListMode(new FHIRStructureMapTargetListMode(array_merge($v, $ext[$i]))); + } } else { $this->addListMode(new FHIRStructureMapTargetListMode($v)); } } } elseif ($data[self::FIELD_LIST_MODE] instanceof FHIRStructureMapTargetListMode) { $this->addListMode($data[self::FIELD_LIST_MODE]); - } elseif ($ext && is_scalar($data[self::FIELD_LIST_MODE])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_LIST_MODE])) { $this->addListMode(new FHIRStructureMapTargetListMode([FHIRStructureMapTargetListMode::FIELD_VALUE => $data[self::FIELD_LIST_MODE]] + $ext)); } else { $this->addListMode(new FHIRStructureMapTargetListMode($data[self::FIELD_LIST_MODE])); @@ -273,8 +291,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_LIST_RULE_ID] instanceof FHIRId) { $this->setListRuleId($data[self::FIELD_LIST_RULE_ID]); - } elseif ($ext && is_scalar($data[self::FIELD_LIST_RULE_ID])) { - $this->setListRuleId(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_LIST_RULE_ID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_LIST_RULE_ID])) { + $this->setListRuleId(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_LIST_RULE_ID]] + $ext)); + } else if (is_array($data[self::FIELD_LIST_RULE_ID])) { + $this->setListRuleId(new FHIRId(array_merge($ext, $data[self::FIELD_LIST_RULE_ID]))); + } } else { $this->setListRuleId(new FHIRId($data[self::FIELD_LIST_RULE_ID])); } @@ -282,6 +304,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PARAMETER])) { if (is_array($data[self::FIELD_PARAMETER])) { foreach($data[self::FIELD_PARAMETER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRStructureMapParameter) { $this->addParameter($v); } else { @@ -300,8 +325,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TRANSFORM] instanceof FHIRStructureMapTransform) { $this->setTransform($data[self::FIELD_TRANSFORM]); - } elseif ($ext && is_scalar($data[self::FIELD_TRANSFORM])) { - $this->setTransform(new FHIRStructureMapTransform([FHIRStructureMapTransform::FIELD_VALUE => $data[self::FIELD_TRANSFORM]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TRANSFORM])) { + $this->setTransform(new FHIRStructureMapTransform([FHIRStructureMapTransform::FIELD_VALUE => $data[self::FIELD_TRANSFORM]] + $ext)); + } else if (is_array($data[self::FIELD_TRANSFORM])) { + $this->setTransform(new FHIRStructureMapTransform(array_merge($ext, $data[self::FIELD_TRANSFORM]))); + } } else { $this->setTransform(new FHIRStructureMapTransform($data[self::FIELD_TRANSFORM])); } @@ -312,8 +341,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VARIABLE] instanceof FHIRId) { $this->setVariable($data[self::FIELD_VARIABLE]); - } elseif ($ext && is_scalar($data[self::FIELD_VARIABLE])) { - $this->setVariable(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_VARIABLE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VARIABLE])) { + $this->setVariable(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_VARIABLE]] + $ext)); + } else if (is_array($data[self::FIELD_VARIABLE])) { + $this->setVariable(new FHIRId(array_merge($ext, $data[self::FIELD_VARIABLE]))); + } } else { $this->setVariable(new FHIRId($data[self::FIELD_VARIABLE])); } @@ -788,17 +821,16 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getContext())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CONTEXT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getContextType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CONTEXT_TYPE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getElement())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ELEMENT, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getListMode())) { foreach($vs as $v) { if (null === $v) { @@ -810,7 +842,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getListRuleId())) { $v->xmlSerialize($sxe->addChild(self::FIELD_LIST_RULE_ID, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getParameter())) { foreach($vs as $v) { if (null === $v) { @@ -819,7 +850,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_PARAMETER, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getTransform())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TRANSFORM, null, $v->_getFHIRXMLNamespace())); } @@ -836,32 +866,92 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getContext())) { - $a[self::FIELD_CONTEXT] = $v->getValue(); - $a[self::FIELD_CONTEXT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CONTEXT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CONTEXT_EXT] = $enc; + } + } else { + $a[self::FIELD_CONTEXT] = $v; + } } if (null !== ($v = $this->getContextType())) { - $a[self::FIELD_CONTEXT_TYPE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CONTEXT_TYPE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CONTEXT_TYPE_EXT] = $enc; + } + } else { + $a[self::FIELD_CONTEXT_TYPE] = $v; + } } if (null !== ($v = $this->getElement())) { - $a[self::FIELD_ELEMENT] = $v->getValue(); - $a[self::FIELD_ELEMENT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ELEMENT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ELEMENT_EXT] = $enc; + } + } else { + $a[self::FIELD_ELEMENT] = $v; + } } if ([] !== ($vs = $this->getListMode())) { - $a[self::FIELD_LIST_MODE] = $vs; + $a[self::FIELD_LIST_MODE] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_LIST_MODE][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_LIST_MODE_EXT][] = $enc; + } else { + $a[self::FIELD_LIST_MODE_EXT][] = null; + } + } else { + $a[self::FIELD_LIST_MODE][] = $v; + } + } } if (null !== ($v = $this->getListRuleId())) { - $a[self::FIELD_LIST_RULE_ID] = $v->getValue(); - $a[self::FIELD_LIST_RULE_ID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_LIST_RULE_ID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_LIST_RULE_ID_EXT] = $enc; + } + } else { + $a[self::FIELD_LIST_RULE_ID] = $v; + } } if ([] !== ($vs = $this->getParameter())) { $a[self::FIELD_PARAMETER] = $vs; } if (null !== ($v = $this->getTransform())) { - $a[self::FIELD_TRANSFORM] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TRANSFORM] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TRANSFORM_EXT] = $enc; + } + } else { + $a[self::FIELD_TRANSFORM] = $v; + } } if (null !== ($v = $this->getVariable())) { - $a[self::FIELD_VARIABLE] = $v->getValue(); - $a[self::FIELD_VARIABLE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VARIABLE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VARIABLE_EXT] = $enc; + } + } else { + $a[self::FIELD_VARIABLE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRSubscription/FHIRSubscriptionChannel.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRSubscription/FHIRSubscriptionChannel.php index f5a4f7066e..28435dc946 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRSubscription/FHIRSubscriptionChannel.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRSubscription/FHIRSubscriptionChannel.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -83,10 +83,6 @@ class FHIRSubscriptionChannel extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SUBSCRIPTION_DOT_CHANNEL; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ENDPOINT = 'endpoint'; const FIELD_ENDPOINT_EXT = '_endpoint'; const FIELD_HEADER = 'header'; @@ -141,6 +137,9 @@ class FHIRSubscriptionChannel extends FHIRBackboneElement */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSubscriptionChannel Constructor * @param null|array $data @@ -163,8 +162,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ENDPOINT] instanceof FHIRUri) { $this->setEndpoint($data[self::FIELD_ENDPOINT]); - } elseif ($ext && is_scalar($data[self::FIELD_ENDPOINT])) { - $this->setEndpoint(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_ENDPOINT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ENDPOINT])) { + $this->setEndpoint(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_ENDPOINT]] + $ext)); + } else if (is_array($data[self::FIELD_ENDPOINT])) { + $this->setEndpoint(new FHIRUri(array_merge($ext, $data[self::FIELD_ENDPOINT]))); + } } else { $this->setEndpoint(new FHIRUri($data[self::FIELD_ENDPOINT])); } @@ -175,17 +178,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_HEADER])) { foreach($data[self::FIELD_HEADER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRString) { $this->addHeader($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addHeader(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addHeader(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addHeader(new FHIRString(array_merge($v, $ext[$i]))); + } } else { $this->addHeader(new FHIRString($v)); } } } elseif ($data[self::FIELD_HEADER] instanceof FHIRString) { $this->addHeader($data[self::FIELD_HEADER]); - } elseif ($ext && is_scalar($data[self::FIELD_HEADER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_HEADER])) { $this->addHeader(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_HEADER]] + $ext)); } else { $this->addHeader(new FHIRString($data[self::FIELD_HEADER])); @@ -197,8 +207,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PAYLOAD] instanceof FHIRString) { $this->setPayload($data[self::FIELD_PAYLOAD]); - } elseif ($ext && is_scalar($data[self::FIELD_PAYLOAD])) { - $this->setPayload(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PAYLOAD]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PAYLOAD])) { + $this->setPayload(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PAYLOAD]] + $ext)); + } else if (is_array($data[self::FIELD_PAYLOAD])) { + $this->setPayload(new FHIRString(array_merge($ext, $data[self::FIELD_PAYLOAD]))); + } } else { $this->setPayload(new FHIRString($data[self::FIELD_PAYLOAD])); } @@ -209,8 +223,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TYPE] instanceof FHIRSubscriptionChannelType) { $this->setType($data[self::FIELD_TYPE]); - } elseif ($ext && is_scalar($data[self::FIELD_TYPE])) { - $this->setType(new FHIRSubscriptionChannelType([FHIRSubscriptionChannelType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TYPE])) { + $this->setType(new FHIRSubscriptionChannelType([FHIRSubscriptionChannelType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } else if (is_array($data[self::FIELD_TYPE])) { + $this->setType(new FHIRSubscriptionChannelType(array_merge($ext, $data[self::FIELD_TYPE]))); + } } else { $this->setType(new FHIRSubscriptionChannelType($data[self::FIELD_TYPE])); } @@ -511,6 +529,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getEndpoint())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ENDPOINT, null, $v->_getFHIRXMLNamespace())); } @@ -525,7 +544,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getPayload())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PAYLOAD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -539,8 +557,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getEndpoint())) { - $a[self::FIELD_ENDPOINT] = $v->getValue(); - $a[self::FIELD_ENDPOINT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ENDPOINT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ENDPOINT_EXT] = $enc; + } + } else { + $a[self::FIELD_ENDPOINT] = $v; + } } if ([] !== ($vs = $this->getHeader())) { $a[self::FIELD_HEADER] = []; @@ -548,16 +573,40 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_HEADER][] = $v->getValue(); - $a[self::FIELD_HEADER_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_HEADER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_HEADER_EXT][] = $enc; + } else { + $a[self::FIELD_HEADER_EXT][] = null; + } + } else { + $a[self::FIELD_HEADER][] = $v; + } } } if (null !== ($v = $this->getPayload())) { - $a[self::FIELD_PAYLOAD] = $v->getValue(); - $a[self::FIELD_PAYLOAD_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PAYLOAD] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PAYLOAD_EXT] = $enc; + } + } else { + $a[self::FIELD_PAYLOAD] = $v; + } } if (null !== ($v = $this->getType())) { - $a[self::FIELD_TYPE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TYPE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TYPE_EXT] = $enc; + } + } else { + $a[self::FIELD_TYPE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRSubstance/FHIRSubstanceIngredient.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRSubstance/FHIRSubstanceIngredient.php index 30002c43ee..2e38b11e5b 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRSubstance/FHIRSubstanceIngredient.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRSubstance/FHIRSubstanceIngredient.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRSubstanceIngredient extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SUBSTANCE_DOT_INGREDIENT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_QUANTITY = 'quantity'; const FIELD_SUBSTANCE_CODEABLE_CONCEPT = 'substanceCodeableConcept'; const FIELD_SUBSTANCE_REFERENCE = 'substanceReference'; @@ -122,6 +118,9 @@ class FHIRSubstanceIngredient extends FHIRBackboneElement */ protected $substanceReference = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSubstanceIngredient Constructor * @param null|array $data @@ -367,11 +366,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_QUANTITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSubstanceCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBSTANCE_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSubstanceReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBSTANCE_REFERENCE, null, $v->_getFHIRXMLNamespace())); } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRSubstance/FHIRSubstanceInstance.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRSubstance/FHIRSubstanceInstance.php index 86354828dd..4e579fb11d 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRSubstance/FHIRSubstanceInstance.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRSubstance/FHIRSubstanceInstance.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRSubstanceInstance extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SUBSTANCE_DOT_INSTANCE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_EXPIRY = 'expiry'; const FIELD_EXPIRY_EXT = '_expiry'; const FIELD_IDENTIFIER = 'identifier'; @@ -130,6 +126,9 @@ class FHIRSubstanceInstance extends FHIRBackboneElement */ protected $quantity = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSubstanceInstance Constructor * @param null|array $data @@ -152,8 +151,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EXPIRY] instanceof FHIRDateTime) { $this->setExpiry($data[self::FIELD_EXPIRY]); - } elseif ($ext && is_scalar($data[self::FIELD_EXPIRY])) { - $this->setExpiry(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_EXPIRY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EXPIRY])) { + $this->setExpiry(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_EXPIRY]] + $ext)); + } else if (is_array($data[self::FIELD_EXPIRY])) { + $this->setExpiry(new FHIRDateTime(array_merge($ext, $data[self::FIELD_EXPIRY]))); + } } else { $this->setExpiry(new FHIRDateTime($data[self::FIELD_EXPIRY])); } @@ -164,8 +167,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->setIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { - $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_IDENTIFIER]))); + } } else { $this->setIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); } @@ -176,8 +183,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_QUANTITY] instanceof FHIRQuantity) { $this->setQuantity($data[self::FIELD_QUANTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_QUANTITY])) { - $this->setQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_QUANTITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_QUANTITY])) { + $this->setQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_QUANTITY])) { + $this->setQuantity(new FHIRQuantity(array_merge($ext, $data[self::FIELD_QUANTITY]))); + } } else { $this->setQuantity(new FHIRQuantity($data[self::FIELD_QUANTITY])); } @@ -407,14 +418,13 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getExpiry())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EXPIRY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_QUANTITY, null, $v->_getFHIRXMLNamespace())); } @@ -428,14 +438,37 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getExpiry())) { - $a[self::FIELD_EXPIRY] = $v->getValue(); - $a[self::FIELD_EXPIRY_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EXPIRY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EXPIRY_EXT] = $enc; + } + } else { + $a[self::FIELD_EXPIRY] = $v; + } } if (null !== ($v = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_IDENTIFIER] = $v; + } } if (null !== ($v = $this->getQuantity())) { - $a[self::FIELD_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_QUANTITY] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRSupplyDelivery/FHIRSupplyDeliverySuppliedItem.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRSupplyDelivery/FHIRSupplyDeliverySuppliedItem.php index 2c52befa1e..2b36b87ce8 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRSupplyDelivery/FHIRSupplyDeliverySuppliedItem.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRSupplyDelivery/FHIRSupplyDeliverySuppliedItem.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRSupplyDeliverySuppliedItem extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SUPPLY_DELIVERY_DOT_SUPPLIED_ITEM; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ITEM_CODEABLE_CONCEPT = 'itemCodeableConcept'; const FIELD_ITEM_REFERENCE = 'itemReference'; const FIELD_QUANTITY = 'quantity'; @@ -128,6 +124,9 @@ class FHIRSupplyDeliverySuppliedItem extends FHIRBackboneElement */ protected $quantity = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSupplyDeliverySuppliedItem Constructor * @param null|array $data @@ -164,8 +163,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_QUANTITY] instanceof FHIRQuantity) { $this->setQuantity($data[self::FIELD_QUANTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_QUANTITY])) { - $this->setQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_QUANTITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_QUANTITY])) { + $this->setQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_QUANTITY])) { + $this->setQuantity(new FHIRQuantity(array_merge($ext, $data[self::FIELD_QUANTITY]))); + } } else { $this->setQuantity(new FHIRQuantity($data[self::FIELD_QUANTITY])); } @@ -388,11 +391,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getItemCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ITEM_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getItemReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ITEM_REFERENCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_QUANTITY, null, $v->_getFHIRXMLNamespace())); } @@ -412,7 +413,15 @@ public function jsonSerialize() $a[self::FIELD_ITEM_REFERENCE] = $v; } if (null !== ($v = $this->getQuantity())) { - $a[self::FIELD_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_QUANTITY] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRSupplyRequest/FHIRSupplyRequestOrderedItem.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRSupplyRequest/FHIRSupplyRequestOrderedItem.php index 02c6a836fc..38a8263678 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRSupplyRequest/FHIRSupplyRequestOrderedItem.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRSupplyRequest/FHIRSupplyRequestOrderedItem.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRSupplyRequestOrderedItem extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SUPPLY_REQUEST_DOT_ORDERED_ITEM; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ITEM_CODEABLE_CONCEPT = 'itemCodeableConcept'; const FIELD_ITEM_REFERENCE = 'itemReference'; const FIELD_QUANTITY = 'quantity'; @@ -129,6 +125,9 @@ class FHIRSupplyRequestOrderedItem extends FHIRBackboneElement */ protected $quantity = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSupplyRequestOrderedItem Constructor * @param null|array $data @@ -165,8 +164,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_QUANTITY] instanceof FHIRQuantity) { $this->setQuantity($data[self::FIELD_QUANTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_QUANTITY])) { - $this->setQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_QUANTITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_QUANTITY])) { + $this->setQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_QUANTITY])) { + $this->setQuantity(new FHIRQuantity(array_merge($ext, $data[self::FIELD_QUANTITY]))); + } } else { $this->setQuantity(new FHIRQuantity($data[self::FIELD_QUANTITY])); } @@ -389,11 +392,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getItemCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ITEM_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getItemReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ITEM_REFERENCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_QUANTITY, null, $v->_getFHIRXMLNamespace())); } @@ -413,7 +414,15 @@ public function jsonSerialize() $a[self::FIELD_ITEM_REFERENCE] = $v; } if (null !== ($v = $this->getQuantity())) { - $a[self::FIELD_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_QUANTITY] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRSupplyRequest/FHIRSupplyRequestRequester.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRSupplyRequest/FHIRSupplyRequestRequester.php index 1bcfc976e9..e2fd8b0b7c 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRSupplyRequest/FHIRSupplyRequestRequester.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRSupplyRequest/FHIRSupplyRequestRequester.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRSupplyRequestRequester extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SUPPLY_REQUEST_DOT_REQUESTER; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_AGENT = 'agent'; const FIELD_ON_BEHALF_OF = 'onBehalfOf'; @@ -107,6 +103,9 @@ class FHIRSupplyRequestRequester extends FHIRBackboneElement */ protected $onBehalfOf = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSupplyRequestRequester Constructor * @param null|array $data @@ -308,7 +307,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getAgent())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AGENT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOnBehalfOf())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ON_BEHALF_OF, null, $v->_getFHIRXMLNamespace())); } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRTask/FHIRTaskInput.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRTask/FHIRTaskInput.php index 29b44105b0..25d821a6f5 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRTask/FHIRTaskInput.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRTask/FHIRTaskInput.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -114,13 +114,10 @@ class FHIRTaskInput extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_TASK_DOT_INPUT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_TYPE = 'type'; const FIELD_VALUE_ADDRESS = 'valueAddress'; const FIELD_VALUE_AGE = 'valueAge'; + const FIELD_VALUE_AGE_EXT = '_valueAge'; const FIELD_VALUE_ANNOTATION = 'valueAnnotation'; const FIELD_VALUE_ATTACHMENT = 'valueAttachment'; const FIELD_VALUE_BASE_64BINARY = 'valueBase64Binary'; @@ -134,6 +131,7 @@ class FHIRTaskInput extends FHIRBackboneElement const FIELD_VALUE_CONTACT_POINT = 'valueContactPoint'; const FIELD_VALUE_CONTACT_POINT_EXT = '_valueContactPoint'; const FIELD_VALUE_COUNT = 'valueCount'; + const FIELD_VALUE_COUNT_EXT = '_valueCount'; const FIELD_VALUE_DATE = 'valueDate'; const FIELD_VALUE_DATE_EXT = '_valueDate'; const FIELD_VALUE_DATE_TIME = 'valueDateTime'; @@ -141,7 +139,9 @@ class FHIRTaskInput extends FHIRBackboneElement const FIELD_VALUE_DECIMAL = 'valueDecimal'; const FIELD_VALUE_DECIMAL_EXT = '_valueDecimal'; const FIELD_VALUE_DISTANCE = 'valueDistance'; + const FIELD_VALUE_DISTANCE_EXT = '_valueDistance'; const FIELD_VALUE_DURATION = 'valueDuration'; + const FIELD_VALUE_DURATION_EXT = '_valueDuration'; const FIELD_VALUE_HUMAN_NAME = 'valueHumanName'; const FIELD_VALUE_ID = 'valueId'; const FIELD_VALUE_ID_EXT = '_valueId'; @@ -155,6 +155,7 @@ class FHIRTaskInput extends FHIRBackboneElement const FIELD_VALUE_MARKDOWN_EXT = '_valueMarkdown'; const FIELD_VALUE_META = 'valueMeta'; const FIELD_VALUE_MONEY = 'valueMoney'; + const FIELD_VALUE_MONEY_EXT = '_valueMoney'; const FIELD_VALUE_OID = 'valueOid'; const FIELD_VALUE_OID_EXT = '_valueOid'; const FIELD_VALUE_PERIOD = 'valuePeriod'; @@ -646,6 +647,9 @@ class FHIRTaskInput extends FHIRBackboneElement */ protected $valueUri = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRTaskInput Constructor * @param null|array $data @@ -677,8 +681,17 @@ public function __construct($data = null) } } if (isset($data[self::FIELD_VALUE_AGE])) { + $ext = (isset($data[self::FIELD_VALUE_AGE_EXT]) && is_array($data[self::FIELD_VALUE_AGE_EXT])) + ? $data[self::FIELD_VALUE_AGE_EXT] + : null; if ($data[self::FIELD_VALUE_AGE] instanceof FHIRAge) { $this->setValueAge($data[self::FIELD_VALUE_AGE]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_AGE])) { + $this->setValueAge(new FHIRAge([FHIRAge::FIELD_VALUE => $data[self::FIELD_VALUE_AGE]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_AGE])) { + $this->setValueAge(new FHIRAge(array_merge($ext, $data[self::FIELD_VALUE_AGE]))); + } } else { $this->setValueAge(new FHIRAge($data[self::FIELD_VALUE_AGE])); } @@ -703,8 +716,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_BASE_64BINARY] instanceof FHIRBase64Binary) { $this->setValueBase64Binary($data[self::FIELD_VALUE_BASE_64BINARY]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_BASE_64BINARY])) { - $this->setValueBase64Binary(new FHIRBase64Binary([FHIRBase64Binary::FIELD_VALUE => $data[self::FIELD_VALUE_BASE_64BINARY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_BASE_64BINARY])) { + $this->setValueBase64Binary(new FHIRBase64Binary([FHIRBase64Binary::FIELD_VALUE => $data[self::FIELD_VALUE_BASE_64BINARY]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_BASE_64BINARY])) { + $this->setValueBase64Binary(new FHIRBase64Binary(array_merge($ext, $data[self::FIELD_VALUE_BASE_64BINARY]))); + } } else { $this->setValueBase64Binary(new FHIRBase64Binary($data[self::FIELD_VALUE_BASE_64BINARY])); } @@ -715,8 +732,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_BOOLEAN] instanceof FHIRBoolean) { $this->setValueBoolean($data[self::FIELD_VALUE_BOOLEAN]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_BOOLEAN])) { - $this->setValueBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_VALUE_BOOLEAN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_BOOLEAN])) { + $this->setValueBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_VALUE_BOOLEAN]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_BOOLEAN])) { + $this->setValueBoolean(new FHIRBoolean(array_merge($ext, $data[self::FIELD_VALUE_BOOLEAN]))); + } } else { $this->setValueBoolean(new FHIRBoolean($data[self::FIELD_VALUE_BOOLEAN])); } @@ -727,8 +748,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_CODE] instanceof FHIRCode) { $this->setValueCode($data[self::FIELD_VALUE_CODE]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_CODE])) { - $this->setValueCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_VALUE_CODE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_CODE])) { + $this->setValueCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_VALUE_CODE]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_CODE])) { + $this->setValueCode(new FHIRCode(array_merge($ext, $data[self::FIELD_VALUE_CODE]))); + } } else { $this->setValueCode(new FHIRCode($data[self::FIELD_VALUE_CODE])); } @@ -753,15 +778,28 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_CONTACT_POINT] instanceof FHIRContactPoint) { $this->setValueContactPoint($data[self::FIELD_VALUE_CONTACT_POINT]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_CONTACT_POINT])) { - $this->setValueContactPoint(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $data[self::FIELD_VALUE_CONTACT_POINT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_CONTACT_POINT])) { + $this->setValueContactPoint(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $data[self::FIELD_VALUE_CONTACT_POINT]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_CONTACT_POINT])) { + $this->setValueContactPoint(new FHIRContactPoint(array_merge($ext, $data[self::FIELD_VALUE_CONTACT_POINT]))); + } } else { $this->setValueContactPoint(new FHIRContactPoint($data[self::FIELD_VALUE_CONTACT_POINT])); } } if (isset($data[self::FIELD_VALUE_COUNT])) { + $ext = (isset($data[self::FIELD_VALUE_COUNT_EXT]) && is_array($data[self::FIELD_VALUE_COUNT_EXT])) + ? $data[self::FIELD_VALUE_COUNT_EXT] + : null; if ($data[self::FIELD_VALUE_COUNT] instanceof FHIRCount) { $this->setValueCount($data[self::FIELD_VALUE_COUNT]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_COUNT])) { + $this->setValueCount(new FHIRCount([FHIRCount::FIELD_VALUE => $data[self::FIELD_VALUE_COUNT]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_COUNT])) { + $this->setValueCount(new FHIRCount(array_merge($ext, $data[self::FIELD_VALUE_COUNT]))); + } } else { $this->setValueCount(new FHIRCount($data[self::FIELD_VALUE_COUNT])); } @@ -772,8 +810,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_DATE] instanceof FHIRDate) { $this->setValueDate($data[self::FIELD_VALUE_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_DATE])) { - $this->setValueDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_VALUE_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_DATE])) { + $this->setValueDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_VALUE_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_DATE])) { + $this->setValueDate(new FHIRDate(array_merge($ext, $data[self::FIELD_VALUE_DATE]))); + } } else { $this->setValueDate(new FHIRDate($data[self::FIELD_VALUE_DATE])); } @@ -784,8 +826,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_DATE_TIME] instanceof FHIRDateTime) { $this->setValueDateTime($data[self::FIELD_VALUE_DATE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_DATE_TIME])) { - $this->setValueDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_VALUE_DATE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_DATE_TIME])) { + $this->setValueDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_VALUE_DATE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_DATE_TIME])) { + $this->setValueDateTime(new FHIRDateTime(array_merge($ext, $data[self::FIELD_VALUE_DATE_TIME]))); + } } else { $this->setValueDateTime(new FHIRDateTime($data[self::FIELD_VALUE_DATE_TIME])); } @@ -796,22 +842,44 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_DECIMAL] instanceof FHIRDecimal) { $this->setValueDecimal($data[self::FIELD_VALUE_DECIMAL]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_DECIMAL])) { - $this->setValueDecimal(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_VALUE_DECIMAL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_DECIMAL])) { + $this->setValueDecimal(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_VALUE_DECIMAL]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_DECIMAL])) { + $this->setValueDecimal(new FHIRDecimal(array_merge($ext, $data[self::FIELD_VALUE_DECIMAL]))); + } } else { $this->setValueDecimal(new FHIRDecimal($data[self::FIELD_VALUE_DECIMAL])); } } if (isset($data[self::FIELD_VALUE_DISTANCE])) { + $ext = (isset($data[self::FIELD_VALUE_DISTANCE_EXT]) && is_array($data[self::FIELD_VALUE_DISTANCE_EXT])) + ? $data[self::FIELD_VALUE_DISTANCE_EXT] + : null; if ($data[self::FIELD_VALUE_DISTANCE] instanceof FHIRDistance) { $this->setValueDistance($data[self::FIELD_VALUE_DISTANCE]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_DISTANCE])) { + $this->setValueDistance(new FHIRDistance([FHIRDistance::FIELD_VALUE => $data[self::FIELD_VALUE_DISTANCE]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_DISTANCE])) { + $this->setValueDistance(new FHIRDistance(array_merge($ext, $data[self::FIELD_VALUE_DISTANCE]))); + } } else { $this->setValueDistance(new FHIRDistance($data[self::FIELD_VALUE_DISTANCE])); } } if (isset($data[self::FIELD_VALUE_DURATION])) { + $ext = (isset($data[self::FIELD_VALUE_DURATION_EXT]) && is_array($data[self::FIELD_VALUE_DURATION_EXT])) + ? $data[self::FIELD_VALUE_DURATION_EXT] + : null; if ($data[self::FIELD_VALUE_DURATION] instanceof FHIRDuration) { $this->setValueDuration($data[self::FIELD_VALUE_DURATION]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_DURATION])) { + $this->setValueDuration(new FHIRDuration([FHIRDuration::FIELD_VALUE => $data[self::FIELD_VALUE_DURATION]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_DURATION])) { + $this->setValueDuration(new FHIRDuration(array_merge($ext, $data[self::FIELD_VALUE_DURATION]))); + } } else { $this->setValueDuration(new FHIRDuration($data[self::FIELD_VALUE_DURATION])); } @@ -829,8 +897,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_ID] instanceof FHIRId) { $this->setValueId($data[self::FIELD_VALUE_ID]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_ID])) { - $this->setValueId(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_VALUE_ID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_ID])) { + $this->setValueId(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_VALUE_ID]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_ID])) { + $this->setValueId(new FHIRId(array_merge($ext, $data[self::FIELD_VALUE_ID]))); + } } else { $this->setValueId(new FHIRId($data[self::FIELD_VALUE_ID])); } @@ -841,8 +913,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_IDENTIFIER] instanceof FHIRIdentifier) { $this->setValueIdentifier($data[self::FIELD_VALUE_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_IDENTIFIER])) { - $this->setValueIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_VALUE_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_IDENTIFIER])) { + $this->setValueIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_VALUE_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_IDENTIFIER])) { + $this->setValueIdentifier(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_VALUE_IDENTIFIER]))); + } } else { $this->setValueIdentifier(new FHIRIdentifier($data[self::FIELD_VALUE_IDENTIFIER])); } @@ -853,8 +929,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_INSTANT] instanceof FHIRInstant) { $this->setValueInstant($data[self::FIELD_VALUE_INSTANT]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_INSTANT])) { - $this->setValueInstant(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_VALUE_INSTANT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_INSTANT])) { + $this->setValueInstant(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_VALUE_INSTANT]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_INSTANT])) { + $this->setValueInstant(new FHIRInstant(array_merge($ext, $data[self::FIELD_VALUE_INSTANT]))); + } } else { $this->setValueInstant(new FHIRInstant($data[self::FIELD_VALUE_INSTANT])); } @@ -865,8 +945,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_INTEGER] instanceof FHIRInteger) { $this->setValueInteger($data[self::FIELD_VALUE_INTEGER]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_INTEGER])) { - $this->setValueInteger(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_VALUE_INTEGER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_INTEGER])) { + $this->setValueInteger(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_VALUE_INTEGER]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_INTEGER])) { + $this->setValueInteger(new FHIRInteger(array_merge($ext, $data[self::FIELD_VALUE_INTEGER]))); + } } else { $this->setValueInteger(new FHIRInteger($data[self::FIELD_VALUE_INTEGER])); } @@ -877,8 +961,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_MARKDOWN] instanceof FHIRMarkdown) { $this->setValueMarkdown($data[self::FIELD_VALUE_MARKDOWN]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_MARKDOWN])) { - $this->setValueMarkdown(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_VALUE_MARKDOWN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_MARKDOWN])) { + $this->setValueMarkdown(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_VALUE_MARKDOWN]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_MARKDOWN])) { + $this->setValueMarkdown(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_VALUE_MARKDOWN]))); + } } else { $this->setValueMarkdown(new FHIRMarkdown($data[self::FIELD_VALUE_MARKDOWN])); } @@ -891,8 +979,17 @@ public function __construct($data = null) } } if (isset($data[self::FIELD_VALUE_MONEY])) { + $ext = (isset($data[self::FIELD_VALUE_MONEY_EXT]) && is_array($data[self::FIELD_VALUE_MONEY_EXT])) + ? $data[self::FIELD_VALUE_MONEY_EXT] + : null; if ($data[self::FIELD_VALUE_MONEY] instanceof FHIRMoney) { $this->setValueMoney($data[self::FIELD_VALUE_MONEY]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_MONEY])) { + $this->setValueMoney(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_VALUE_MONEY]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_MONEY])) { + $this->setValueMoney(new FHIRMoney(array_merge($ext, $data[self::FIELD_VALUE_MONEY]))); + } } else { $this->setValueMoney(new FHIRMoney($data[self::FIELD_VALUE_MONEY])); } @@ -903,8 +1000,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_OID] instanceof FHIROid) { $this->setValueOid($data[self::FIELD_VALUE_OID]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_OID])) { - $this->setValueOid(new FHIROid([FHIROid::FIELD_VALUE => $data[self::FIELD_VALUE_OID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_OID])) { + $this->setValueOid(new FHIROid([FHIROid::FIELD_VALUE => $data[self::FIELD_VALUE_OID]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_OID])) { + $this->setValueOid(new FHIROid(array_merge($ext, $data[self::FIELD_VALUE_OID]))); + } } else { $this->setValueOid(new FHIROid($data[self::FIELD_VALUE_OID])); } @@ -922,8 +1023,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_POSITIVE_INT] instanceof FHIRPositiveInt) { $this->setValuePositiveInt($data[self::FIELD_VALUE_POSITIVE_INT]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_POSITIVE_INT])) { - $this->setValuePositiveInt(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_VALUE_POSITIVE_INT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_POSITIVE_INT])) { + $this->setValuePositiveInt(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_VALUE_POSITIVE_INT]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_POSITIVE_INT])) { + $this->setValuePositiveInt(new FHIRPositiveInt(array_merge($ext, $data[self::FIELD_VALUE_POSITIVE_INT]))); + } } else { $this->setValuePositiveInt(new FHIRPositiveInt($data[self::FIELD_VALUE_POSITIVE_INT])); } @@ -934,8 +1039,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_QUANTITY] instanceof FHIRQuantity) { $this->setValueQuantity($data[self::FIELD_VALUE_QUANTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_QUANTITY])) { - $this->setValueQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_VALUE_QUANTITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_QUANTITY])) { + $this->setValueQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_VALUE_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_QUANTITY])) { + $this->setValueQuantity(new FHIRQuantity(array_merge($ext, $data[self::FIELD_VALUE_QUANTITY]))); + } } else { $this->setValueQuantity(new FHIRQuantity($data[self::FIELD_VALUE_QUANTITY])); } @@ -981,8 +1090,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_STRING] instanceof FHIRString) { $this->setValueString($data[self::FIELD_VALUE_STRING]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_STRING])) { - $this->setValueString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VALUE_STRING]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_STRING])) { + $this->setValueString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VALUE_STRING]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_STRING])) { + $this->setValueString(new FHIRString(array_merge($ext, $data[self::FIELD_VALUE_STRING]))); + } } else { $this->setValueString(new FHIRString($data[self::FIELD_VALUE_STRING])); } @@ -993,8 +1106,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_TIME] instanceof FHIRTime) { $this->setValueTime($data[self::FIELD_VALUE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_TIME])) { - $this->setValueTime(new FHIRTime([FHIRTime::FIELD_VALUE => $data[self::FIELD_VALUE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_TIME])) { + $this->setValueTime(new FHIRTime([FHIRTime::FIELD_VALUE => $data[self::FIELD_VALUE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_TIME])) { + $this->setValueTime(new FHIRTime(array_merge($ext, $data[self::FIELD_VALUE_TIME]))); + } } else { $this->setValueTime(new FHIRTime($data[self::FIELD_VALUE_TIME])); } @@ -1012,8 +1129,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_UNSIGNED_INT] instanceof FHIRUnsignedInt) { $this->setValueUnsignedInt($data[self::FIELD_VALUE_UNSIGNED_INT]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_UNSIGNED_INT])) { - $this->setValueUnsignedInt(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_VALUE_UNSIGNED_INT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_UNSIGNED_INT])) { + $this->setValueUnsignedInt(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_VALUE_UNSIGNED_INT]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_UNSIGNED_INT])) { + $this->setValueUnsignedInt(new FHIRUnsignedInt(array_merge($ext, $data[self::FIELD_VALUE_UNSIGNED_INT]))); + } } else { $this->setValueUnsignedInt(new FHIRUnsignedInt($data[self::FIELD_VALUE_UNSIGNED_INT])); } @@ -1024,8 +1145,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_URI] instanceof FHIRUri) { $this->setValueUri($data[self::FIELD_VALUE_URI]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_URI])) { - $this->setValueUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_VALUE_URI]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_URI])) { + $this->setValueUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_VALUE_URI]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_URI])) { + $this->setValueUri(new FHIRUri(array_merge($ext, $data[self::FIELD_VALUE_URI]))); + } } else { $this->setValueUri(new FHIRUri($data[self::FIELD_VALUE_URI])); } @@ -2678,19 +2803,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueAddress())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_ADDRESS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueAge())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_AGE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueAnnotation())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_ANNOTATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueAttachment())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_ATTACHMENT, null, $v->_getFHIRXMLNamespace())); } @@ -2703,19 +2824,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getValueCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_CODE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueCoding())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_CODING, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueContactPoint())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_CONTACT_POINT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueCount())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_COUNT, null, $v->_getFHIRXMLNamespace())); } @@ -2728,22 +2845,18 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getValueDecimal())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_DECIMAL, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueDistance())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_DISTANCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueDuration())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_DURATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueHumanName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_HUMAN_NAME, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getValueId())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_ID, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } @@ -2756,45 +2869,36 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getValueMarkdown())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_MARKDOWN, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueMeta())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_META, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueMoney())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_MONEY, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getValueOid())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_OID, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValuePeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_PERIOD, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getValuePositiveInt())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_POSITIVE_INT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_QUANTITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueRange())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_RANGE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueRatio())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_RATIO, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_REFERENCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueSampledData())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_SAMPLED_DATA, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueSignature())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_SIGNATURE, null, $v->_getFHIRXMLNamespace())); } @@ -2804,7 +2908,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getValueTime())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_TIME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueTiming())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_TIMING, null, $v->_getFHIRXMLNamespace())); } @@ -2830,7 +2933,15 @@ public function jsonSerialize() $a[self::FIELD_VALUE_ADDRESS] = $v; } if (null !== ($v = $this->getValueAge())) { - $a[self::FIELD_VALUE_AGE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_AGE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_AGE_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_AGE] = $v; + } } if (null !== ($v = $this->getValueAnnotation())) { $a[self::FIELD_VALUE_ANNOTATION] = $v; @@ -2839,16 +2950,37 @@ public function jsonSerialize() $a[self::FIELD_VALUE_ATTACHMENT] = $v; } if (null !== ($v = $this->getValueBase64Binary())) { - $a[self::FIELD_VALUE_BASE_64BINARY] = $v->getValue(); - $a[self::FIELD_VALUE_BASE_64BINARY_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_BASE_64BINARY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_BASE_64BINARY_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_BASE_64BINARY] = $v; + } } if (null !== ($v = $this->getValueBoolean())) { - $a[self::FIELD_VALUE_BOOLEAN] = $v->getValue(); - $a[self::FIELD_VALUE_BOOLEAN_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_BOOLEAN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_BOOLEAN_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_BOOLEAN] = $v; + } } if (null !== ($v = $this->getValueCode())) { - $a[self::FIELD_VALUE_CODE] = $v->getValue(); - $a[self::FIELD_VALUE_CODE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_CODE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_CODE_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_CODE] = $v; + } } if (null !== ($v = $this->getValueCodeableConcept())) { $a[self::FIELD_VALUE_CODEABLE_CONCEPT] = $v; @@ -2857,70 +2989,189 @@ public function jsonSerialize() $a[self::FIELD_VALUE_CODING] = $v; } if (null !== ($v = $this->getValueContactPoint())) { - $a[self::FIELD_VALUE_CONTACT_POINT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_CONTACT_POINT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_CONTACT_POINT_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_CONTACT_POINT] = $v; + } } if (null !== ($v = $this->getValueCount())) { - $a[self::FIELD_VALUE_COUNT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_COUNT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_COUNT_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_COUNT] = $v; + } } if (null !== ($v = $this->getValueDate())) { - $a[self::FIELD_VALUE_DATE] = $v->getValue(); - $a[self::FIELD_VALUE_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_DATE] = $v; + } } if (null !== ($v = $this->getValueDateTime())) { - $a[self::FIELD_VALUE_DATE_TIME] = $v->getValue(); - $a[self::FIELD_VALUE_DATE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_DATE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_DATE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_DATE_TIME] = $v; + } } if (null !== ($v = $this->getValueDecimal())) { - $a[self::FIELD_VALUE_DECIMAL] = $v->getValue(); - $a[self::FIELD_VALUE_DECIMAL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_DECIMAL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_DECIMAL_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_DECIMAL] = $v; + } } if (null !== ($v = $this->getValueDistance())) { - $a[self::FIELD_VALUE_DISTANCE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_DISTANCE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_DISTANCE_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_DISTANCE] = $v; + } } if (null !== ($v = $this->getValueDuration())) { - $a[self::FIELD_VALUE_DURATION] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_DURATION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_DURATION_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_DURATION] = $v; + } } if (null !== ($v = $this->getValueHumanName())) { $a[self::FIELD_VALUE_HUMAN_NAME] = $v; } if (null !== ($v = $this->getValueId())) { - $a[self::FIELD_VALUE_ID] = $v->getValue(); - $a[self::FIELD_VALUE_ID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_ID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_ID_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_ID] = $v; + } } if (null !== ($v = $this->getValueIdentifier())) { - $a[self::FIELD_VALUE_IDENTIFIER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_IDENTIFIER] = $v; + } } if (null !== ($v = $this->getValueInstant())) { - $a[self::FIELD_VALUE_INSTANT] = $v->getValue(); - $a[self::FIELD_VALUE_INSTANT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_INSTANT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_INSTANT_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_INSTANT] = $v; + } } if (null !== ($v = $this->getValueInteger())) { - $a[self::FIELD_VALUE_INTEGER] = $v->getValue(); - $a[self::FIELD_VALUE_INTEGER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_INTEGER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_INTEGER_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_INTEGER] = $v; + } } if (null !== ($v = $this->getValueMarkdown())) { - $a[self::FIELD_VALUE_MARKDOWN] = $v->getValue(); - $a[self::FIELD_VALUE_MARKDOWN_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_MARKDOWN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_MARKDOWN_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_MARKDOWN] = $v; + } } if (null !== ($v = $this->getValueMeta())) { $a[self::FIELD_VALUE_META] = $v; } if (null !== ($v = $this->getValueMoney())) { - $a[self::FIELD_VALUE_MONEY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_MONEY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_MONEY_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_MONEY] = $v; + } } if (null !== ($v = $this->getValueOid())) { - $a[self::FIELD_VALUE_OID] = $v->getValue(); - $a[self::FIELD_VALUE_OID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_OID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_OID_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_OID] = $v; + } } if (null !== ($v = $this->getValuePeriod())) { $a[self::FIELD_VALUE_PERIOD] = $v; } if (null !== ($v = $this->getValuePositiveInt())) { - $a[self::FIELD_VALUE_POSITIVE_INT] = $v->getValue(); - $a[self::FIELD_VALUE_POSITIVE_INT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_POSITIVE_INT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_POSITIVE_INT_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_POSITIVE_INT] = $v; + } } if (null !== ($v = $this->getValueQuantity())) { - $a[self::FIELD_VALUE_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_QUANTITY] = $v; + } } if (null !== ($v = $this->getValueRange())) { $a[self::FIELD_VALUE_RANGE] = $v; @@ -2938,23 +3189,51 @@ public function jsonSerialize() $a[self::FIELD_VALUE_SIGNATURE] = $v; } if (null !== ($v = $this->getValueString())) { - $a[self::FIELD_VALUE_STRING] = $v->getValue(); - $a[self::FIELD_VALUE_STRING_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_STRING] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_STRING_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_STRING] = $v; + } } if (null !== ($v = $this->getValueTime())) { - $a[self::FIELD_VALUE_TIME] = $v->getValue(); - $a[self::FIELD_VALUE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_TIME] = $v; + } } if (null !== ($v = $this->getValueTiming())) { $a[self::FIELD_VALUE_TIMING] = $v; } if (null !== ($v = $this->getValueUnsignedInt())) { - $a[self::FIELD_VALUE_UNSIGNED_INT] = $v->getValue(); - $a[self::FIELD_VALUE_UNSIGNED_INT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_UNSIGNED_INT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_UNSIGNED_INT_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_UNSIGNED_INT] = $v; + } } if (null !== ($v = $this->getValueUri())) { - $a[self::FIELD_VALUE_URI] = $v->getValue(); - $a[self::FIELD_VALUE_URI_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_URI] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_URI_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_URI] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRTask/FHIRTaskOutput.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRTask/FHIRTaskOutput.php index 60dce4dc27..13db36b4ed 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRTask/FHIRTaskOutput.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRTask/FHIRTaskOutput.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -114,13 +114,10 @@ class FHIRTaskOutput extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_TASK_DOT_OUTPUT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_TYPE = 'type'; const FIELD_VALUE_ADDRESS = 'valueAddress'; const FIELD_VALUE_AGE = 'valueAge'; + const FIELD_VALUE_AGE_EXT = '_valueAge'; const FIELD_VALUE_ANNOTATION = 'valueAnnotation'; const FIELD_VALUE_ATTACHMENT = 'valueAttachment'; const FIELD_VALUE_BASE_64BINARY = 'valueBase64Binary'; @@ -134,6 +131,7 @@ class FHIRTaskOutput extends FHIRBackboneElement const FIELD_VALUE_CONTACT_POINT = 'valueContactPoint'; const FIELD_VALUE_CONTACT_POINT_EXT = '_valueContactPoint'; const FIELD_VALUE_COUNT = 'valueCount'; + const FIELD_VALUE_COUNT_EXT = '_valueCount'; const FIELD_VALUE_DATE = 'valueDate'; const FIELD_VALUE_DATE_EXT = '_valueDate'; const FIELD_VALUE_DATE_TIME = 'valueDateTime'; @@ -141,7 +139,9 @@ class FHIRTaskOutput extends FHIRBackboneElement const FIELD_VALUE_DECIMAL = 'valueDecimal'; const FIELD_VALUE_DECIMAL_EXT = '_valueDecimal'; const FIELD_VALUE_DISTANCE = 'valueDistance'; + const FIELD_VALUE_DISTANCE_EXT = '_valueDistance'; const FIELD_VALUE_DURATION = 'valueDuration'; + const FIELD_VALUE_DURATION_EXT = '_valueDuration'; const FIELD_VALUE_HUMAN_NAME = 'valueHumanName'; const FIELD_VALUE_ID = 'valueId'; const FIELD_VALUE_ID_EXT = '_valueId'; @@ -155,6 +155,7 @@ class FHIRTaskOutput extends FHIRBackboneElement const FIELD_VALUE_MARKDOWN_EXT = '_valueMarkdown'; const FIELD_VALUE_META = 'valueMeta'; const FIELD_VALUE_MONEY = 'valueMoney'; + const FIELD_VALUE_MONEY_EXT = '_valueMoney'; const FIELD_VALUE_OID = 'valueOid'; const FIELD_VALUE_OID_EXT = '_valueOid'; const FIELD_VALUE_PERIOD = 'valuePeriod'; @@ -645,6 +646,9 @@ class FHIRTaskOutput extends FHIRBackboneElement */ protected $valueUri = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRTaskOutput Constructor * @param null|array $data @@ -676,8 +680,17 @@ public function __construct($data = null) } } if (isset($data[self::FIELD_VALUE_AGE])) { + $ext = (isset($data[self::FIELD_VALUE_AGE_EXT]) && is_array($data[self::FIELD_VALUE_AGE_EXT])) + ? $data[self::FIELD_VALUE_AGE_EXT] + : null; if ($data[self::FIELD_VALUE_AGE] instanceof FHIRAge) { $this->setValueAge($data[self::FIELD_VALUE_AGE]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_AGE])) { + $this->setValueAge(new FHIRAge([FHIRAge::FIELD_VALUE => $data[self::FIELD_VALUE_AGE]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_AGE])) { + $this->setValueAge(new FHIRAge(array_merge($ext, $data[self::FIELD_VALUE_AGE]))); + } } else { $this->setValueAge(new FHIRAge($data[self::FIELD_VALUE_AGE])); } @@ -702,8 +715,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_BASE_64BINARY] instanceof FHIRBase64Binary) { $this->setValueBase64Binary($data[self::FIELD_VALUE_BASE_64BINARY]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_BASE_64BINARY])) { - $this->setValueBase64Binary(new FHIRBase64Binary([FHIRBase64Binary::FIELD_VALUE => $data[self::FIELD_VALUE_BASE_64BINARY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_BASE_64BINARY])) { + $this->setValueBase64Binary(new FHIRBase64Binary([FHIRBase64Binary::FIELD_VALUE => $data[self::FIELD_VALUE_BASE_64BINARY]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_BASE_64BINARY])) { + $this->setValueBase64Binary(new FHIRBase64Binary(array_merge($ext, $data[self::FIELD_VALUE_BASE_64BINARY]))); + } } else { $this->setValueBase64Binary(new FHIRBase64Binary($data[self::FIELD_VALUE_BASE_64BINARY])); } @@ -714,8 +731,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_BOOLEAN] instanceof FHIRBoolean) { $this->setValueBoolean($data[self::FIELD_VALUE_BOOLEAN]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_BOOLEAN])) { - $this->setValueBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_VALUE_BOOLEAN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_BOOLEAN])) { + $this->setValueBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_VALUE_BOOLEAN]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_BOOLEAN])) { + $this->setValueBoolean(new FHIRBoolean(array_merge($ext, $data[self::FIELD_VALUE_BOOLEAN]))); + } } else { $this->setValueBoolean(new FHIRBoolean($data[self::FIELD_VALUE_BOOLEAN])); } @@ -726,8 +747,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_CODE] instanceof FHIRCode) { $this->setValueCode($data[self::FIELD_VALUE_CODE]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_CODE])) { - $this->setValueCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_VALUE_CODE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_CODE])) { + $this->setValueCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_VALUE_CODE]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_CODE])) { + $this->setValueCode(new FHIRCode(array_merge($ext, $data[self::FIELD_VALUE_CODE]))); + } } else { $this->setValueCode(new FHIRCode($data[self::FIELD_VALUE_CODE])); } @@ -752,15 +777,28 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_CONTACT_POINT] instanceof FHIRContactPoint) { $this->setValueContactPoint($data[self::FIELD_VALUE_CONTACT_POINT]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_CONTACT_POINT])) { - $this->setValueContactPoint(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $data[self::FIELD_VALUE_CONTACT_POINT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_CONTACT_POINT])) { + $this->setValueContactPoint(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $data[self::FIELD_VALUE_CONTACT_POINT]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_CONTACT_POINT])) { + $this->setValueContactPoint(new FHIRContactPoint(array_merge($ext, $data[self::FIELD_VALUE_CONTACT_POINT]))); + } } else { $this->setValueContactPoint(new FHIRContactPoint($data[self::FIELD_VALUE_CONTACT_POINT])); } } if (isset($data[self::FIELD_VALUE_COUNT])) { + $ext = (isset($data[self::FIELD_VALUE_COUNT_EXT]) && is_array($data[self::FIELD_VALUE_COUNT_EXT])) + ? $data[self::FIELD_VALUE_COUNT_EXT] + : null; if ($data[self::FIELD_VALUE_COUNT] instanceof FHIRCount) { $this->setValueCount($data[self::FIELD_VALUE_COUNT]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_COUNT])) { + $this->setValueCount(new FHIRCount([FHIRCount::FIELD_VALUE => $data[self::FIELD_VALUE_COUNT]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_COUNT])) { + $this->setValueCount(new FHIRCount(array_merge($ext, $data[self::FIELD_VALUE_COUNT]))); + } } else { $this->setValueCount(new FHIRCount($data[self::FIELD_VALUE_COUNT])); } @@ -771,8 +809,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_DATE] instanceof FHIRDate) { $this->setValueDate($data[self::FIELD_VALUE_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_DATE])) { - $this->setValueDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_VALUE_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_DATE])) { + $this->setValueDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_VALUE_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_DATE])) { + $this->setValueDate(new FHIRDate(array_merge($ext, $data[self::FIELD_VALUE_DATE]))); + } } else { $this->setValueDate(new FHIRDate($data[self::FIELD_VALUE_DATE])); } @@ -783,8 +825,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_DATE_TIME] instanceof FHIRDateTime) { $this->setValueDateTime($data[self::FIELD_VALUE_DATE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_DATE_TIME])) { - $this->setValueDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_VALUE_DATE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_DATE_TIME])) { + $this->setValueDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_VALUE_DATE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_DATE_TIME])) { + $this->setValueDateTime(new FHIRDateTime(array_merge($ext, $data[self::FIELD_VALUE_DATE_TIME]))); + } } else { $this->setValueDateTime(new FHIRDateTime($data[self::FIELD_VALUE_DATE_TIME])); } @@ -795,22 +841,44 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_DECIMAL] instanceof FHIRDecimal) { $this->setValueDecimal($data[self::FIELD_VALUE_DECIMAL]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_DECIMAL])) { - $this->setValueDecimal(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_VALUE_DECIMAL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_DECIMAL])) { + $this->setValueDecimal(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_VALUE_DECIMAL]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_DECIMAL])) { + $this->setValueDecimal(new FHIRDecimal(array_merge($ext, $data[self::FIELD_VALUE_DECIMAL]))); + } } else { $this->setValueDecimal(new FHIRDecimal($data[self::FIELD_VALUE_DECIMAL])); } } if (isset($data[self::FIELD_VALUE_DISTANCE])) { + $ext = (isset($data[self::FIELD_VALUE_DISTANCE_EXT]) && is_array($data[self::FIELD_VALUE_DISTANCE_EXT])) + ? $data[self::FIELD_VALUE_DISTANCE_EXT] + : null; if ($data[self::FIELD_VALUE_DISTANCE] instanceof FHIRDistance) { $this->setValueDistance($data[self::FIELD_VALUE_DISTANCE]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_DISTANCE])) { + $this->setValueDistance(new FHIRDistance([FHIRDistance::FIELD_VALUE => $data[self::FIELD_VALUE_DISTANCE]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_DISTANCE])) { + $this->setValueDistance(new FHIRDistance(array_merge($ext, $data[self::FIELD_VALUE_DISTANCE]))); + } } else { $this->setValueDistance(new FHIRDistance($data[self::FIELD_VALUE_DISTANCE])); } } if (isset($data[self::FIELD_VALUE_DURATION])) { + $ext = (isset($data[self::FIELD_VALUE_DURATION_EXT]) && is_array($data[self::FIELD_VALUE_DURATION_EXT])) + ? $data[self::FIELD_VALUE_DURATION_EXT] + : null; if ($data[self::FIELD_VALUE_DURATION] instanceof FHIRDuration) { $this->setValueDuration($data[self::FIELD_VALUE_DURATION]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_DURATION])) { + $this->setValueDuration(new FHIRDuration([FHIRDuration::FIELD_VALUE => $data[self::FIELD_VALUE_DURATION]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_DURATION])) { + $this->setValueDuration(new FHIRDuration(array_merge($ext, $data[self::FIELD_VALUE_DURATION]))); + } } else { $this->setValueDuration(new FHIRDuration($data[self::FIELD_VALUE_DURATION])); } @@ -828,8 +896,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_ID] instanceof FHIRId) { $this->setValueId($data[self::FIELD_VALUE_ID]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_ID])) { - $this->setValueId(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_VALUE_ID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_ID])) { + $this->setValueId(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_VALUE_ID]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_ID])) { + $this->setValueId(new FHIRId(array_merge($ext, $data[self::FIELD_VALUE_ID]))); + } } else { $this->setValueId(new FHIRId($data[self::FIELD_VALUE_ID])); } @@ -840,8 +912,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_IDENTIFIER] instanceof FHIRIdentifier) { $this->setValueIdentifier($data[self::FIELD_VALUE_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_IDENTIFIER])) { - $this->setValueIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_VALUE_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_IDENTIFIER])) { + $this->setValueIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_VALUE_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_IDENTIFIER])) { + $this->setValueIdentifier(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_VALUE_IDENTIFIER]))); + } } else { $this->setValueIdentifier(new FHIRIdentifier($data[self::FIELD_VALUE_IDENTIFIER])); } @@ -852,8 +928,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_INSTANT] instanceof FHIRInstant) { $this->setValueInstant($data[self::FIELD_VALUE_INSTANT]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_INSTANT])) { - $this->setValueInstant(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_VALUE_INSTANT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_INSTANT])) { + $this->setValueInstant(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_VALUE_INSTANT]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_INSTANT])) { + $this->setValueInstant(new FHIRInstant(array_merge($ext, $data[self::FIELD_VALUE_INSTANT]))); + } } else { $this->setValueInstant(new FHIRInstant($data[self::FIELD_VALUE_INSTANT])); } @@ -864,8 +944,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_INTEGER] instanceof FHIRInteger) { $this->setValueInteger($data[self::FIELD_VALUE_INTEGER]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_INTEGER])) { - $this->setValueInteger(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_VALUE_INTEGER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_INTEGER])) { + $this->setValueInteger(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_VALUE_INTEGER]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_INTEGER])) { + $this->setValueInteger(new FHIRInteger(array_merge($ext, $data[self::FIELD_VALUE_INTEGER]))); + } } else { $this->setValueInteger(new FHIRInteger($data[self::FIELD_VALUE_INTEGER])); } @@ -876,8 +960,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_MARKDOWN] instanceof FHIRMarkdown) { $this->setValueMarkdown($data[self::FIELD_VALUE_MARKDOWN]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_MARKDOWN])) { - $this->setValueMarkdown(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_VALUE_MARKDOWN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_MARKDOWN])) { + $this->setValueMarkdown(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_VALUE_MARKDOWN]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_MARKDOWN])) { + $this->setValueMarkdown(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_VALUE_MARKDOWN]))); + } } else { $this->setValueMarkdown(new FHIRMarkdown($data[self::FIELD_VALUE_MARKDOWN])); } @@ -890,8 +978,17 @@ public function __construct($data = null) } } if (isset($data[self::FIELD_VALUE_MONEY])) { + $ext = (isset($data[self::FIELD_VALUE_MONEY_EXT]) && is_array($data[self::FIELD_VALUE_MONEY_EXT])) + ? $data[self::FIELD_VALUE_MONEY_EXT] + : null; if ($data[self::FIELD_VALUE_MONEY] instanceof FHIRMoney) { $this->setValueMoney($data[self::FIELD_VALUE_MONEY]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_MONEY])) { + $this->setValueMoney(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_VALUE_MONEY]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_MONEY])) { + $this->setValueMoney(new FHIRMoney(array_merge($ext, $data[self::FIELD_VALUE_MONEY]))); + } } else { $this->setValueMoney(new FHIRMoney($data[self::FIELD_VALUE_MONEY])); } @@ -902,8 +999,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_OID] instanceof FHIROid) { $this->setValueOid($data[self::FIELD_VALUE_OID]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_OID])) { - $this->setValueOid(new FHIROid([FHIROid::FIELD_VALUE => $data[self::FIELD_VALUE_OID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_OID])) { + $this->setValueOid(new FHIROid([FHIROid::FIELD_VALUE => $data[self::FIELD_VALUE_OID]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_OID])) { + $this->setValueOid(new FHIROid(array_merge($ext, $data[self::FIELD_VALUE_OID]))); + } } else { $this->setValueOid(new FHIROid($data[self::FIELD_VALUE_OID])); } @@ -921,8 +1022,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_POSITIVE_INT] instanceof FHIRPositiveInt) { $this->setValuePositiveInt($data[self::FIELD_VALUE_POSITIVE_INT]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_POSITIVE_INT])) { - $this->setValuePositiveInt(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_VALUE_POSITIVE_INT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_POSITIVE_INT])) { + $this->setValuePositiveInt(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_VALUE_POSITIVE_INT]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_POSITIVE_INT])) { + $this->setValuePositiveInt(new FHIRPositiveInt(array_merge($ext, $data[self::FIELD_VALUE_POSITIVE_INT]))); + } } else { $this->setValuePositiveInt(new FHIRPositiveInt($data[self::FIELD_VALUE_POSITIVE_INT])); } @@ -933,8 +1038,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_QUANTITY] instanceof FHIRQuantity) { $this->setValueQuantity($data[self::FIELD_VALUE_QUANTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_QUANTITY])) { - $this->setValueQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_VALUE_QUANTITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_QUANTITY])) { + $this->setValueQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_VALUE_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_QUANTITY])) { + $this->setValueQuantity(new FHIRQuantity(array_merge($ext, $data[self::FIELD_VALUE_QUANTITY]))); + } } else { $this->setValueQuantity(new FHIRQuantity($data[self::FIELD_VALUE_QUANTITY])); } @@ -980,8 +1089,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_STRING] instanceof FHIRString) { $this->setValueString($data[self::FIELD_VALUE_STRING]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_STRING])) { - $this->setValueString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VALUE_STRING]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_STRING])) { + $this->setValueString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VALUE_STRING]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_STRING])) { + $this->setValueString(new FHIRString(array_merge($ext, $data[self::FIELD_VALUE_STRING]))); + } } else { $this->setValueString(new FHIRString($data[self::FIELD_VALUE_STRING])); } @@ -992,8 +1105,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_TIME] instanceof FHIRTime) { $this->setValueTime($data[self::FIELD_VALUE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_TIME])) { - $this->setValueTime(new FHIRTime([FHIRTime::FIELD_VALUE => $data[self::FIELD_VALUE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_TIME])) { + $this->setValueTime(new FHIRTime([FHIRTime::FIELD_VALUE => $data[self::FIELD_VALUE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_TIME])) { + $this->setValueTime(new FHIRTime(array_merge($ext, $data[self::FIELD_VALUE_TIME]))); + } } else { $this->setValueTime(new FHIRTime($data[self::FIELD_VALUE_TIME])); } @@ -1011,8 +1128,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_UNSIGNED_INT] instanceof FHIRUnsignedInt) { $this->setValueUnsignedInt($data[self::FIELD_VALUE_UNSIGNED_INT]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_UNSIGNED_INT])) { - $this->setValueUnsignedInt(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_VALUE_UNSIGNED_INT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_UNSIGNED_INT])) { + $this->setValueUnsignedInt(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_VALUE_UNSIGNED_INT]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_UNSIGNED_INT])) { + $this->setValueUnsignedInt(new FHIRUnsignedInt(array_merge($ext, $data[self::FIELD_VALUE_UNSIGNED_INT]))); + } } else { $this->setValueUnsignedInt(new FHIRUnsignedInt($data[self::FIELD_VALUE_UNSIGNED_INT])); } @@ -1023,8 +1144,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_URI] instanceof FHIRUri) { $this->setValueUri($data[self::FIELD_VALUE_URI]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_URI])) { - $this->setValueUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_VALUE_URI]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_URI])) { + $this->setValueUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_VALUE_URI]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_URI])) { + $this->setValueUri(new FHIRUri(array_merge($ext, $data[self::FIELD_VALUE_URI]))); + } } else { $this->setValueUri(new FHIRUri($data[self::FIELD_VALUE_URI])); } @@ -2675,19 +2800,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueAddress())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_ADDRESS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueAge())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_AGE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueAnnotation())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_ANNOTATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueAttachment())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_ATTACHMENT, null, $v->_getFHIRXMLNamespace())); } @@ -2700,19 +2821,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getValueCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_CODE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueCoding())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_CODING, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueContactPoint())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_CONTACT_POINT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueCount())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_COUNT, null, $v->_getFHIRXMLNamespace())); } @@ -2725,22 +2842,18 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getValueDecimal())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_DECIMAL, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueDistance())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_DISTANCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueDuration())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_DURATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueHumanName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_HUMAN_NAME, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getValueId())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_ID, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } @@ -2753,45 +2866,36 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getValueMarkdown())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_MARKDOWN, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueMeta())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_META, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueMoney())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_MONEY, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getValueOid())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_OID, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValuePeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_PERIOD, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getValuePositiveInt())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_POSITIVE_INT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_QUANTITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueRange())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_RANGE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueRatio())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_RATIO, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_REFERENCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueSampledData())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_SAMPLED_DATA, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueSignature())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_SIGNATURE, null, $v->_getFHIRXMLNamespace())); } @@ -2801,7 +2905,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getValueTime())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_TIME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueTiming())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_TIMING, null, $v->_getFHIRXMLNamespace())); } @@ -2827,7 +2930,15 @@ public function jsonSerialize() $a[self::FIELD_VALUE_ADDRESS] = $v; } if (null !== ($v = $this->getValueAge())) { - $a[self::FIELD_VALUE_AGE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_AGE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_AGE_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_AGE] = $v; + } } if (null !== ($v = $this->getValueAnnotation())) { $a[self::FIELD_VALUE_ANNOTATION] = $v; @@ -2836,16 +2947,37 @@ public function jsonSerialize() $a[self::FIELD_VALUE_ATTACHMENT] = $v; } if (null !== ($v = $this->getValueBase64Binary())) { - $a[self::FIELD_VALUE_BASE_64BINARY] = $v->getValue(); - $a[self::FIELD_VALUE_BASE_64BINARY_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_BASE_64BINARY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_BASE_64BINARY_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_BASE_64BINARY] = $v; + } } if (null !== ($v = $this->getValueBoolean())) { - $a[self::FIELD_VALUE_BOOLEAN] = $v->getValue(); - $a[self::FIELD_VALUE_BOOLEAN_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_BOOLEAN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_BOOLEAN_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_BOOLEAN] = $v; + } } if (null !== ($v = $this->getValueCode())) { - $a[self::FIELD_VALUE_CODE] = $v->getValue(); - $a[self::FIELD_VALUE_CODE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_CODE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_CODE_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_CODE] = $v; + } } if (null !== ($v = $this->getValueCodeableConcept())) { $a[self::FIELD_VALUE_CODEABLE_CONCEPT] = $v; @@ -2854,70 +2986,189 @@ public function jsonSerialize() $a[self::FIELD_VALUE_CODING] = $v; } if (null !== ($v = $this->getValueContactPoint())) { - $a[self::FIELD_VALUE_CONTACT_POINT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_CONTACT_POINT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_CONTACT_POINT_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_CONTACT_POINT] = $v; + } } if (null !== ($v = $this->getValueCount())) { - $a[self::FIELD_VALUE_COUNT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_COUNT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_COUNT_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_COUNT] = $v; + } } if (null !== ($v = $this->getValueDate())) { - $a[self::FIELD_VALUE_DATE] = $v->getValue(); - $a[self::FIELD_VALUE_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_DATE] = $v; + } } if (null !== ($v = $this->getValueDateTime())) { - $a[self::FIELD_VALUE_DATE_TIME] = $v->getValue(); - $a[self::FIELD_VALUE_DATE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_DATE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_DATE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_DATE_TIME] = $v; + } } if (null !== ($v = $this->getValueDecimal())) { - $a[self::FIELD_VALUE_DECIMAL] = $v->getValue(); - $a[self::FIELD_VALUE_DECIMAL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_DECIMAL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_DECIMAL_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_DECIMAL] = $v; + } } if (null !== ($v = $this->getValueDistance())) { - $a[self::FIELD_VALUE_DISTANCE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_DISTANCE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_DISTANCE_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_DISTANCE] = $v; + } } if (null !== ($v = $this->getValueDuration())) { - $a[self::FIELD_VALUE_DURATION] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_DURATION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_DURATION_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_DURATION] = $v; + } } if (null !== ($v = $this->getValueHumanName())) { $a[self::FIELD_VALUE_HUMAN_NAME] = $v; } if (null !== ($v = $this->getValueId())) { - $a[self::FIELD_VALUE_ID] = $v->getValue(); - $a[self::FIELD_VALUE_ID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_ID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_ID_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_ID] = $v; + } } if (null !== ($v = $this->getValueIdentifier())) { - $a[self::FIELD_VALUE_IDENTIFIER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_IDENTIFIER] = $v; + } } if (null !== ($v = $this->getValueInstant())) { - $a[self::FIELD_VALUE_INSTANT] = $v->getValue(); - $a[self::FIELD_VALUE_INSTANT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_INSTANT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_INSTANT_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_INSTANT] = $v; + } } if (null !== ($v = $this->getValueInteger())) { - $a[self::FIELD_VALUE_INTEGER] = $v->getValue(); - $a[self::FIELD_VALUE_INTEGER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_INTEGER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_INTEGER_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_INTEGER] = $v; + } } if (null !== ($v = $this->getValueMarkdown())) { - $a[self::FIELD_VALUE_MARKDOWN] = $v->getValue(); - $a[self::FIELD_VALUE_MARKDOWN_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_MARKDOWN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_MARKDOWN_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_MARKDOWN] = $v; + } } if (null !== ($v = $this->getValueMeta())) { $a[self::FIELD_VALUE_META] = $v; } if (null !== ($v = $this->getValueMoney())) { - $a[self::FIELD_VALUE_MONEY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_MONEY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_MONEY_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_MONEY] = $v; + } } if (null !== ($v = $this->getValueOid())) { - $a[self::FIELD_VALUE_OID] = $v->getValue(); - $a[self::FIELD_VALUE_OID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_OID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_OID_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_OID] = $v; + } } if (null !== ($v = $this->getValuePeriod())) { $a[self::FIELD_VALUE_PERIOD] = $v; } if (null !== ($v = $this->getValuePositiveInt())) { - $a[self::FIELD_VALUE_POSITIVE_INT] = $v->getValue(); - $a[self::FIELD_VALUE_POSITIVE_INT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_POSITIVE_INT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_POSITIVE_INT_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_POSITIVE_INT] = $v; + } } if (null !== ($v = $this->getValueQuantity())) { - $a[self::FIELD_VALUE_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_QUANTITY] = $v; + } } if (null !== ($v = $this->getValueRange())) { $a[self::FIELD_VALUE_RANGE] = $v; @@ -2935,23 +3186,51 @@ public function jsonSerialize() $a[self::FIELD_VALUE_SIGNATURE] = $v; } if (null !== ($v = $this->getValueString())) { - $a[self::FIELD_VALUE_STRING] = $v->getValue(); - $a[self::FIELD_VALUE_STRING_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_STRING] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_STRING_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_STRING] = $v; + } } if (null !== ($v = $this->getValueTime())) { - $a[self::FIELD_VALUE_TIME] = $v->getValue(); - $a[self::FIELD_VALUE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_TIME] = $v; + } } if (null !== ($v = $this->getValueTiming())) { $a[self::FIELD_VALUE_TIMING] = $v; } if (null !== ($v = $this->getValueUnsignedInt())) { - $a[self::FIELD_VALUE_UNSIGNED_INT] = $v->getValue(); - $a[self::FIELD_VALUE_UNSIGNED_INT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_UNSIGNED_INT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_UNSIGNED_INT_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_UNSIGNED_INT] = $v; + } } if (null !== ($v = $this->getValueUri())) { - $a[self::FIELD_VALUE_URI] = $v->getValue(); - $a[self::FIELD_VALUE_URI_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_URI] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_URI_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_URI] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRTask/FHIRTaskRequester.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRTask/FHIRTaskRequester.php index 39847a5479..5457c482a3 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRTask/FHIRTaskRequester.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRTask/FHIRTaskRequester.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -77,10 +77,6 @@ class FHIRTaskRequester extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_TASK_DOT_REQUESTER; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_AGENT = 'agent'; const FIELD_ON_BEHALF_OF = 'onBehalfOf'; @@ -107,6 +103,9 @@ class FHIRTaskRequester extends FHIRBackboneElement */ protected $onBehalfOf = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRTaskRequester Constructor * @param null|array $data @@ -310,7 +309,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getAgent())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AGENT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOnBehalfOf())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ON_BEHALF_OF, null, $v->_getFHIRXMLNamespace())); } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRTask/FHIRTaskRestriction.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRTask/FHIRTaskRestriction.php index 3776d1b4bf..038cfa2630 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRTask/FHIRTaskRestriction.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRTask/FHIRTaskRestriction.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRTaskRestriction extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_TASK_DOT_RESTRICTION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_PERIOD = 'period'; const FIELD_RECIPIENT = 'recipient'; const FIELD_REPETITIONS = 'repetitions'; @@ -122,6 +118,9 @@ class FHIRTaskRestriction extends FHIRBackboneElement */ protected $repetitions = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRTaskRestriction Constructor * @param null|array $data @@ -148,6 +147,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_RECIPIENT])) { if (is_array($data[self::FIELD_RECIPIENT])) { foreach($data[self::FIELD_RECIPIENT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addRecipient($v); } else { @@ -166,8 +168,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_REPETITIONS] instanceof FHIRPositiveInt) { $this->setRepetitions($data[self::FIELD_REPETITIONS]); - } elseif ($ext && is_scalar($data[self::FIELD_REPETITIONS])) { - $this->setRepetitions(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_REPETITIONS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_REPETITIONS])) { + $this->setRepetitions(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_REPETITIONS]] + $ext)); + } else if (is_array($data[self::FIELD_REPETITIONS])) { + $this->setRepetitions(new FHIRPositiveInt(array_merge($ext, $data[self::FIELD_REPETITIONS]))); + } } else { $this->setRepetitions(new FHIRPositiveInt($data[self::FIELD_REPETITIONS])); } @@ -418,7 +424,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getRecipient())) { foreach($vs as $v) { if (null === $v) { @@ -446,8 +451,15 @@ public function jsonSerialize() $a[self::FIELD_RECIPIENT] = $vs; } if (null !== ($v = $this->getRepetitions())) { - $a[self::FIELD_REPETITIONS] = $v->getValue(); - $a[self::FIELD_REPETITIONS_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_REPETITIONS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_REPETITIONS_EXT] = $enc; + } + } else { + $a[self::FIELD_REPETITIONS] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRTestReport/FHIRTestReportAction.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRTestReport/FHIRTestReportAction.php index ec2d0a9181..313a38a64d 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRTestReport/FHIRTestReportAction.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRTestReport/FHIRTestReportAction.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -76,10 +76,6 @@ class FHIRTestReportAction extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_TEST_REPORT_DOT_ACTION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ASSERT = 'assert'; const FIELD_OPERATION = 'operation'; @@ -101,6 +97,9 @@ class FHIRTestReportAction extends FHIRBackboneElement */ protected $operation = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRTestReportAction Constructor * @param null|array $data @@ -294,7 +293,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getAssert())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ASSERT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOperation())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OPERATION, null, $v->_getFHIRXMLNamespace())); } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRTestReport/FHIRTestReportAction1.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRTestReport/FHIRTestReportAction1.php index 98f182b039..22823716d4 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRTestReport/FHIRTestReportAction1.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRTestReport/FHIRTestReportAction1.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -76,10 +76,6 @@ class FHIRTestReportAction1 extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_TEST_REPORT_DOT_ACTION_1; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ASSERT = 'assert'; const FIELD_OPERATION = 'operation'; @@ -101,6 +97,9 @@ class FHIRTestReportAction1 extends FHIRBackboneElement */ protected $operation = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRTestReportAction1 Constructor * @param null|array $data @@ -294,7 +293,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getAssert())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ASSERT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOperation())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OPERATION, null, $v->_getFHIRXMLNamespace())); } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRTestReport/FHIRTestReportAction2.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRTestReport/FHIRTestReportAction2.php index 46ea4fb511..3ce4946a53 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRTestReport/FHIRTestReportAction2.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRTestReport/FHIRTestReportAction2.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -76,10 +76,6 @@ class FHIRTestReportAction2 extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_TEST_REPORT_DOT_ACTION_2; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_OPERATION = 'operation'; /** @@ -91,6 +87,9 @@ class FHIRTestReportAction2 extends FHIRBackboneElement */ protected $operation = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRTestReportAction2 Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRTestReport/FHIRTestReportAssert.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRTestReport/FHIRTestReportAssert.php index 321e876bcd..4f6481bc57 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRTestReport/FHIRTestReportAssert.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRTestReport/FHIRTestReportAssert.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRTestReportAssert extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_TEST_REPORT_DOT_ASSERT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DETAIL = 'detail'; const FIELD_DETAIL_EXT = '_detail'; const FIELD_MESSAGE = 'message'; @@ -128,6 +124,9 @@ class FHIRTestReportAssert extends FHIRBackboneElement */ protected $result = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRTestReportAssert Constructor * @param null|array $data @@ -150,8 +149,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DETAIL] instanceof FHIRString) { $this->setDetail($data[self::FIELD_DETAIL]); - } elseif ($ext && is_scalar($data[self::FIELD_DETAIL])) { - $this->setDetail(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DETAIL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DETAIL])) { + $this->setDetail(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DETAIL]] + $ext)); + } else if (is_array($data[self::FIELD_DETAIL])) { + $this->setDetail(new FHIRString(array_merge($ext, $data[self::FIELD_DETAIL]))); + } } else { $this->setDetail(new FHIRString($data[self::FIELD_DETAIL])); } @@ -162,8 +165,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MESSAGE] instanceof FHIRMarkdown) { $this->setMessage($data[self::FIELD_MESSAGE]); - } elseif ($ext && is_scalar($data[self::FIELD_MESSAGE])) { - $this->setMessage(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_MESSAGE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MESSAGE])) { + $this->setMessage(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_MESSAGE]] + $ext)); + } else if (is_array($data[self::FIELD_MESSAGE])) { + $this->setMessage(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_MESSAGE]))); + } } else { $this->setMessage(new FHIRMarkdown($data[self::FIELD_MESSAGE])); } @@ -174,8 +181,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_RESULT] instanceof FHIRTestReportActionResult) { $this->setResult($data[self::FIELD_RESULT]); - } elseif ($ext && is_scalar($data[self::FIELD_RESULT])) { - $this->setResult(new FHIRTestReportActionResult([FHIRTestReportActionResult::FIELD_VALUE => $data[self::FIELD_RESULT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_RESULT])) { + $this->setResult(new FHIRTestReportActionResult([FHIRTestReportActionResult::FIELD_VALUE => $data[self::FIELD_RESULT]] + $ext)); + } else if (is_array($data[self::FIELD_RESULT])) { + $this->setResult(new FHIRTestReportActionResult(array_merge($ext, $data[self::FIELD_RESULT]))); + } } else { $this->setResult(new FHIRTestReportActionResult($data[self::FIELD_RESULT])); } @@ -412,13 +423,13 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getDetail())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DETAIL, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getMessage())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MESSAGE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getResult())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RESULT, null, $v->_getFHIRXMLNamespace())); } @@ -432,15 +443,37 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getDetail())) { - $a[self::FIELD_DETAIL] = $v->getValue(); - $a[self::FIELD_DETAIL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DETAIL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DETAIL_EXT] = $enc; + } + } else { + $a[self::FIELD_DETAIL] = $v; + } } if (null !== ($v = $this->getMessage())) { - $a[self::FIELD_MESSAGE] = $v->getValue(); - $a[self::FIELD_MESSAGE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MESSAGE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MESSAGE_EXT] = $enc; + } + } else { + $a[self::FIELD_MESSAGE] = $v; + } } if (null !== ($v = $this->getResult())) { - $a[self::FIELD_RESULT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_RESULT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_RESULT_EXT] = $enc; + } + } else { + $a[self::FIELD_RESULT] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRTestReport/FHIRTestReportOperation.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRTestReport/FHIRTestReportOperation.php index 1e60ca111d..fe754426c3 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRTestReport/FHIRTestReportOperation.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRTestReport/FHIRTestReportOperation.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRTestReportOperation extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_TEST_REPORT_DOT_OPERATION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DETAIL = 'detail'; const FIELD_DETAIL_EXT = '_detail'; const FIELD_MESSAGE = 'message'; @@ -128,6 +124,9 @@ class FHIRTestReportOperation extends FHIRBackboneElement */ protected $result = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRTestReportOperation Constructor * @param null|array $data @@ -150,8 +149,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DETAIL] instanceof FHIRUri) { $this->setDetail($data[self::FIELD_DETAIL]); - } elseif ($ext && is_scalar($data[self::FIELD_DETAIL])) { - $this->setDetail(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_DETAIL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DETAIL])) { + $this->setDetail(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_DETAIL]] + $ext)); + } else if (is_array($data[self::FIELD_DETAIL])) { + $this->setDetail(new FHIRUri(array_merge($ext, $data[self::FIELD_DETAIL]))); + } } else { $this->setDetail(new FHIRUri($data[self::FIELD_DETAIL])); } @@ -162,8 +165,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MESSAGE] instanceof FHIRMarkdown) { $this->setMessage($data[self::FIELD_MESSAGE]); - } elseif ($ext && is_scalar($data[self::FIELD_MESSAGE])) { - $this->setMessage(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_MESSAGE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MESSAGE])) { + $this->setMessage(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_MESSAGE]] + $ext)); + } else if (is_array($data[self::FIELD_MESSAGE])) { + $this->setMessage(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_MESSAGE]))); + } } else { $this->setMessage(new FHIRMarkdown($data[self::FIELD_MESSAGE])); } @@ -174,8 +181,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_RESULT] instanceof FHIRTestReportActionResult) { $this->setResult($data[self::FIELD_RESULT]); - } elseif ($ext && is_scalar($data[self::FIELD_RESULT])) { - $this->setResult(new FHIRTestReportActionResult([FHIRTestReportActionResult::FIELD_VALUE => $data[self::FIELD_RESULT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_RESULT])) { + $this->setResult(new FHIRTestReportActionResult([FHIRTestReportActionResult::FIELD_VALUE => $data[self::FIELD_RESULT]] + $ext)); + } else if (is_array($data[self::FIELD_RESULT])) { + $this->setResult(new FHIRTestReportActionResult(array_merge($ext, $data[self::FIELD_RESULT]))); + } } else { $this->setResult(new FHIRTestReportActionResult($data[self::FIELD_RESULT])); } @@ -412,13 +423,13 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getDetail())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DETAIL, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getMessage())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MESSAGE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getResult())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RESULT, null, $v->_getFHIRXMLNamespace())); } @@ -432,15 +443,37 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getDetail())) { - $a[self::FIELD_DETAIL] = $v->getValue(); - $a[self::FIELD_DETAIL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DETAIL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DETAIL_EXT] = $enc; + } + } else { + $a[self::FIELD_DETAIL] = $v; + } } if (null !== ($v = $this->getMessage())) { - $a[self::FIELD_MESSAGE] = $v->getValue(); - $a[self::FIELD_MESSAGE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MESSAGE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MESSAGE_EXT] = $enc; + } + } else { + $a[self::FIELD_MESSAGE] = $v; + } } if (null !== ($v = $this->getResult())) { - $a[self::FIELD_RESULT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_RESULT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_RESULT_EXT] = $enc; + } + } else { + $a[self::FIELD_RESULT] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRTestReport/FHIRTestReportParticipant.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRTestReport/FHIRTestReportParticipant.php index 75c98f07a1..b293b0f309 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRTestReport/FHIRTestReportParticipant.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRTestReport/FHIRTestReportParticipant.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRTestReportParticipant extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_TEST_REPORT_DOT_PARTICIPANT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DISPLAY = 'display'; const FIELD_DISPLAY_EXT = '_display'; const FIELD_TYPE = 'type'; @@ -122,6 +118,9 @@ class FHIRTestReportParticipant extends FHIRBackboneElement */ protected $uri = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRTestReportParticipant Constructor * @param null|array $data @@ -144,8 +143,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DISPLAY] instanceof FHIRString) { $this->setDisplay($data[self::FIELD_DISPLAY]); - } elseif ($ext && is_scalar($data[self::FIELD_DISPLAY])) { - $this->setDisplay(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DISPLAY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DISPLAY])) { + $this->setDisplay(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DISPLAY]] + $ext)); + } else if (is_array($data[self::FIELD_DISPLAY])) { + $this->setDisplay(new FHIRString(array_merge($ext, $data[self::FIELD_DISPLAY]))); + } } else { $this->setDisplay(new FHIRString($data[self::FIELD_DISPLAY])); } @@ -156,8 +159,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TYPE] instanceof FHIRTestReportParticipantType) { $this->setType($data[self::FIELD_TYPE]); - } elseif ($ext && is_scalar($data[self::FIELD_TYPE])) { - $this->setType(new FHIRTestReportParticipantType([FHIRTestReportParticipantType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TYPE])) { + $this->setType(new FHIRTestReportParticipantType([FHIRTestReportParticipantType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } else if (is_array($data[self::FIELD_TYPE])) { + $this->setType(new FHIRTestReportParticipantType(array_merge($ext, $data[self::FIELD_TYPE]))); + } } else { $this->setType(new FHIRTestReportParticipantType($data[self::FIELD_TYPE])); } @@ -168,8 +175,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_URI] instanceof FHIRUri) { $this->setUri($data[self::FIELD_URI]); - } elseif ($ext && is_scalar($data[self::FIELD_URI])) { - $this->setUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URI]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_URI])) { + $this->setUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URI]] + $ext)); + } else if (is_array($data[self::FIELD_URI])) { + $this->setUri(new FHIRUri(array_merge($ext, $data[self::FIELD_URI]))); + } } else { $this->setUri(new FHIRUri($data[self::FIELD_URI])); } @@ -394,10 +405,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getDisplay())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DISPLAY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -414,15 +425,37 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getDisplay())) { - $a[self::FIELD_DISPLAY] = $v->getValue(); - $a[self::FIELD_DISPLAY_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DISPLAY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DISPLAY_EXT] = $enc; + } + } else { + $a[self::FIELD_DISPLAY] = $v; + } } if (null !== ($v = $this->getType())) { - $a[self::FIELD_TYPE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TYPE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TYPE_EXT] = $enc; + } + } else { + $a[self::FIELD_TYPE] = $v; + } } if (null !== ($v = $this->getUri())) { - $a[self::FIELD_URI] = $v->getValue(); - $a[self::FIELD_URI_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_URI] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_URI_EXT] = $enc; + } + } else { + $a[self::FIELD_URI] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRTestReport/FHIRTestReportSetup.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRTestReport/FHIRTestReportSetup.php index cf35209ed0..6c1829fb46 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRTestReport/FHIRTestReportSetup.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRTestReport/FHIRTestReportSetup.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -76,10 +76,6 @@ class FHIRTestReportSetup extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_TEST_REPORT_DOT_SETUP; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ACTION = 'action'; /** @@ -91,6 +87,9 @@ class FHIRTestReportSetup extends FHIRBackboneElement */ protected $action = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRTestReportSetup Constructor * @param null|array $data @@ -110,6 +109,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ACTION])) { if (is_array($data[self::FIELD_ACTION])) { foreach($data[self::FIELD_ACTION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRTestReportAction) { $this->addAction($v); } else { diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRTestReport/FHIRTestReportTeardown.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRTestReport/FHIRTestReportTeardown.php index 392a4c11ac..66ae2a3ef2 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRTestReport/FHIRTestReportTeardown.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRTestReport/FHIRTestReportTeardown.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -76,10 +76,6 @@ class FHIRTestReportTeardown extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_TEST_REPORT_DOT_TEARDOWN; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ACTION = 'action'; /** @@ -91,6 +87,9 @@ class FHIRTestReportTeardown extends FHIRBackboneElement */ protected $action = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRTestReportTeardown Constructor * @param null|array $data @@ -110,6 +109,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ACTION])) { if (is_array($data[self::FIELD_ACTION])) { foreach($data[self::FIELD_ACTION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRTestReportAction2) { $this->addAction($v); } else { diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRTestReport/FHIRTestReportTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRTestReport/FHIRTestReportTest.php index 9b12a00d0d..9571d2c926 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRTestReport/FHIRTestReportTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRTestReport/FHIRTestReportTest.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -77,10 +77,6 @@ class FHIRTestReportTest extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_TEST_REPORT_DOT_TEST; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ACTION = 'action'; const FIELD_DESCRIPTION = 'description'; const FIELD_DESCRIPTION_EXT = '_description'; @@ -119,6 +115,9 @@ class FHIRTestReportTest extends FHIRBackboneElement */ protected $name = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRTestReportTest Constructor * @param null|array $data @@ -138,6 +137,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ACTION])) { if (is_array($data[self::FIELD_ACTION])) { foreach($data[self::FIELD_ACTION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRTestReportAction1) { $this->addAction($v); } else { @@ -156,8 +158,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -168,8 +174,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -448,12 +458,26 @@ public function jsonSerialize() $a[self::FIELD_ACTION] = $vs; } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptAction.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptAction.php index 432a94e818..e296f5f49f 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptAction.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptAction.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -77,10 +77,6 @@ class FHIRTestScriptAction extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_TEST_SCRIPT_DOT_ACTION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ASSERT = 'assert'; const FIELD_ASSERT_EXT = '_assert'; const FIELD_OPERATION = 'operation'; @@ -106,6 +102,9 @@ class FHIRTestScriptAction extends FHIRBackboneElement */ protected $operation = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRTestScriptAction Constructor * @param null|array $data @@ -128,8 +127,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ASSERT] instanceof FHIRTestScriptAssert) { $this->setAssert($data[self::FIELD_ASSERT]); - } elseif ($ext && is_scalar($data[self::FIELD_ASSERT])) { - $this->setAssert(new FHIRTestScriptAssert([FHIRTestScriptAssert::FIELD_VALUE => $data[self::FIELD_ASSERT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ASSERT])) { + $this->setAssert(new FHIRTestScriptAssert([FHIRTestScriptAssert::FIELD_VALUE => $data[self::FIELD_ASSERT]] + $ext)); + } else if (is_array($data[self::FIELD_ASSERT])) { + $this->setAssert(new FHIRTestScriptAssert(array_merge($ext, $data[self::FIELD_ASSERT]))); + } } else { $this->setAssert(new FHIRTestScriptAssert($data[self::FIELD_ASSERT])); } @@ -310,7 +313,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getAssert())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ASSERT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOperation())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OPERATION, null, $v->_getFHIRXMLNamespace())); } @@ -324,7 +326,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getAssert())) { - $a[self::FIELD_ASSERT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ASSERT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ASSERT_EXT] = $enc; + } + } else { + $a[self::FIELD_ASSERT] = $v; + } } if (null !== ($v = $this->getOperation())) { $a[self::FIELD_OPERATION] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptAction1.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptAction1.php index ebbad919b0..1e7d19e53b 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptAction1.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptAction1.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -77,10 +77,6 @@ class FHIRTestScriptAction1 extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_TEST_SCRIPT_DOT_ACTION_1; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ASSERT = 'assert'; const FIELD_ASSERT_EXT = '_assert'; const FIELD_OPERATION = 'operation'; @@ -106,6 +102,9 @@ class FHIRTestScriptAction1 extends FHIRBackboneElement */ protected $operation = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRTestScriptAction1 Constructor * @param null|array $data @@ -128,8 +127,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ASSERT] instanceof FHIRTestScriptAssert) { $this->setAssert($data[self::FIELD_ASSERT]); - } elseif ($ext && is_scalar($data[self::FIELD_ASSERT])) { - $this->setAssert(new FHIRTestScriptAssert([FHIRTestScriptAssert::FIELD_VALUE => $data[self::FIELD_ASSERT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ASSERT])) { + $this->setAssert(new FHIRTestScriptAssert([FHIRTestScriptAssert::FIELD_VALUE => $data[self::FIELD_ASSERT]] + $ext)); + } else if (is_array($data[self::FIELD_ASSERT])) { + $this->setAssert(new FHIRTestScriptAssert(array_merge($ext, $data[self::FIELD_ASSERT]))); + } } else { $this->setAssert(new FHIRTestScriptAssert($data[self::FIELD_ASSERT])); } @@ -310,7 +313,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getAssert())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ASSERT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOperation())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OPERATION, null, $v->_getFHIRXMLNamespace())); } @@ -324,7 +326,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getAssert())) { - $a[self::FIELD_ASSERT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ASSERT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ASSERT_EXT] = $enc; + } + } else { + $a[self::FIELD_ASSERT] = $v; + } } if (null !== ($v = $this->getOperation())) { $a[self::FIELD_OPERATION] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptAction2.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptAction2.php index d83d85852e..f17f631a30 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptAction2.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptAction2.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -77,10 +77,6 @@ class FHIRTestScriptAction2 extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_TEST_SCRIPT_DOT_ACTION_2; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_OPERATION = 'operation'; /** @@ -93,6 +89,9 @@ class FHIRTestScriptAction2 extends FHIRBackboneElement */ protected $operation = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRTestScriptAction2 Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptAssert.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptAssert.php index a9cbb7dbae..417fb874fc 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptAssert.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptAssert.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -86,10 +86,6 @@ class FHIRTestScriptAssert extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_TEST_SCRIPT_DOT_ASSERT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_COMPARE_TO_SOURCE_EXPRESSION = 'compareToSourceExpression'; const FIELD_COMPARE_TO_SOURCE_EXPRESSION_EXT = '_compareToSourceExpression'; const FIELD_COMPARE_TO_SOURCE_ID = 'compareToSourceId'; @@ -411,6 +407,9 @@ class FHIRTestScriptAssert extends FHIRBackboneElement */ protected $warningOnly = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRTestScriptAssert Constructor * @param null|array $data @@ -437,8 +436,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_COMPARE_TO_SOURCE_EXPRESSION] instanceof FHIRString) { $this->setCompareToSourceExpression($data[self::FIELD_COMPARE_TO_SOURCE_EXPRESSION]); - } elseif ($ext && is_scalar($data[self::FIELD_COMPARE_TO_SOURCE_EXPRESSION])) { - $this->setCompareToSourceExpression(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_COMPARE_TO_SOURCE_EXPRESSION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_COMPARE_TO_SOURCE_EXPRESSION])) { + $this->setCompareToSourceExpression(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_COMPARE_TO_SOURCE_EXPRESSION]] + $ext)); + } else if (is_array($data[self::FIELD_COMPARE_TO_SOURCE_EXPRESSION])) { + $this->setCompareToSourceExpression(new FHIRString(array_merge($ext, $data[self::FIELD_COMPARE_TO_SOURCE_EXPRESSION]))); + } } else { $this->setCompareToSourceExpression(new FHIRString($data[self::FIELD_COMPARE_TO_SOURCE_EXPRESSION])); } @@ -449,8 +452,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_COMPARE_TO_SOURCE_ID] instanceof FHIRString) { $this->setCompareToSourceId($data[self::FIELD_COMPARE_TO_SOURCE_ID]); - } elseif ($ext && is_scalar($data[self::FIELD_COMPARE_TO_SOURCE_ID])) { - $this->setCompareToSourceId(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_COMPARE_TO_SOURCE_ID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_COMPARE_TO_SOURCE_ID])) { + $this->setCompareToSourceId(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_COMPARE_TO_SOURCE_ID]] + $ext)); + } else if (is_array($data[self::FIELD_COMPARE_TO_SOURCE_ID])) { + $this->setCompareToSourceId(new FHIRString(array_merge($ext, $data[self::FIELD_COMPARE_TO_SOURCE_ID]))); + } } else { $this->setCompareToSourceId(new FHIRString($data[self::FIELD_COMPARE_TO_SOURCE_ID])); } @@ -461,8 +468,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_COMPARE_TO_SOURCE_PATH] instanceof FHIRString) { $this->setCompareToSourcePath($data[self::FIELD_COMPARE_TO_SOURCE_PATH]); - } elseif ($ext && is_scalar($data[self::FIELD_COMPARE_TO_SOURCE_PATH])) { - $this->setCompareToSourcePath(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_COMPARE_TO_SOURCE_PATH]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_COMPARE_TO_SOURCE_PATH])) { + $this->setCompareToSourcePath(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_COMPARE_TO_SOURCE_PATH]] + $ext)); + } else if (is_array($data[self::FIELD_COMPARE_TO_SOURCE_PATH])) { + $this->setCompareToSourcePath(new FHIRString(array_merge($ext, $data[self::FIELD_COMPARE_TO_SOURCE_PATH]))); + } } else { $this->setCompareToSourcePath(new FHIRString($data[self::FIELD_COMPARE_TO_SOURCE_PATH])); } @@ -473,8 +484,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CONTENT_TYPE] instanceof FHIRContentType) { $this->setContentType($data[self::FIELD_CONTENT_TYPE]); - } elseif ($ext && is_scalar($data[self::FIELD_CONTENT_TYPE])) { - $this->setContentType(new FHIRContentType([FHIRContentType::FIELD_VALUE => $data[self::FIELD_CONTENT_TYPE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CONTENT_TYPE])) { + $this->setContentType(new FHIRContentType([FHIRContentType::FIELD_VALUE => $data[self::FIELD_CONTENT_TYPE]] + $ext)); + } else if (is_array($data[self::FIELD_CONTENT_TYPE])) { + $this->setContentType(new FHIRContentType(array_merge($ext, $data[self::FIELD_CONTENT_TYPE]))); + } } else { $this->setContentType(new FHIRContentType($data[self::FIELD_CONTENT_TYPE])); } @@ -485,8 +500,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -497,8 +516,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DIRECTION] instanceof FHIRAssertionDirectionType) { $this->setDirection($data[self::FIELD_DIRECTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DIRECTION])) { - $this->setDirection(new FHIRAssertionDirectionType([FHIRAssertionDirectionType::FIELD_VALUE => $data[self::FIELD_DIRECTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DIRECTION])) { + $this->setDirection(new FHIRAssertionDirectionType([FHIRAssertionDirectionType::FIELD_VALUE => $data[self::FIELD_DIRECTION]] + $ext)); + } else if (is_array($data[self::FIELD_DIRECTION])) { + $this->setDirection(new FHIRAssertionDirectionType(array_merge($ext, $data[self::FIELD_DIRECTION]))); + } } else { $this->setDirection(new FHIRAssertionDirectionType($data[self::FIELD_DIRECTION])); } @@ -509,8 +532,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EXPRESSION] instanceof FHIRString) { $this->setExpression($data[self::FIELD_EXPRESSION]); - } elseif ($ext && is_scalar($data[self::FIELD_EXPRESSION])) { - $this->setExpression(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_EXPRESSION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EXPRESSION])) { + $this->setExpression(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_EXPRESSION]] + $ext)); + } else if (is_array($data[self::FIELD_EXPRESSION])) { + $this->setExpression(new FHIRString(array_merge($ext, $data[self::FIELD_EXPRESSION]))); + } } else { $this->setExpression(new FHIRString($data[self::FIELD_EXPRESSION])); } @@ -521,8 +548,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_HEADER_FIELD] instanceof FHIRString) { $this->setHeaderField($data[self::FIELD_HEADER_FIELD]); - } elseif ($ext && is_scalar($data[self::FIELD_HEADER_FIELD])) { - $this->setHeaderField(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_HEADER_FIELD]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_HEADER_FIELD])) { + $this->setHeaderField(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_HEADER_FIELD]] + $ext)); + } else if (is_array($data[self::FIELD_HEADER_FIELD])) { + $this->setHeaderField(new FHIRString(array_merge($ext, $data[self::FIELD_HEADER_FIELD]))); + } } else { $this->setHeaderField(new FHIRString($data[self::FIELD_HEADER_FIELD])); } @@ -533,8 +564,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_LABEL] instanceof FHIRString) { $this->setLabel($data[self::FIELD_LABEL]); - } elseif ($ext && is_scalar($data[self::FIELD_LABEL])) { - $this->setLabel(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_LABEL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_LABEL])) { + $this->setLabel(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_LABEL]] + $ext)); + } else if (is_array($data[self::FIELD_LABEL])) { + $this->setLabel(new FHIRString(array_merge($ext, $data[self::FIELD_LABEL]))); + } } else { $this->setLabel(new FHIRString($data[self::FIELD_LABEL])); } @@ -545,8 +580,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MINIMUM_ID] instanceof FHIRString) { $this->setMinimumId($data[self::FIELD_MINIMUM_ID]); - } elseif ($ext && is_scalar($data[self::FIELD_MINIMUM_ID])) { - $this->setMinimumId(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_MINIMUM_ID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MINIMUM_ID])) { + $this->setMinimumId(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_MINIMUM_ID]] + $ext)); + } else if (is_array($data[self::FIELD_MINIMUM_ID])) { + $this->setMinimumId(new FHIRString(array_merge($ext, $data[self::FIELD_MINIMUM_ID]))); + } } else { $this->setMinimumId(new FHIRString($data[self::FIELD_MINIMUM_ID])); } @@ -557,8 +596,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAVIGATION_LINKS] instanceof FHIRBoolean) { $this->setNavigationLinks($data[self::FIELD_NAVIGATION_LINKS]); - } elseif ($ext && is_scalar($data[self::FIELD_NAVIGATION_LINKS])) { - $this->setNavigationLinks(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_NAVIGATION_LINKS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAVIGATION_LINKS])) { + $this->setNavigationLinks(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_NAVIGATION_LINKS]] + $ext)); + } else if (is_array($data[self::FIELD_NAVIGATION_LINKS])) { + $this->setNavigationLinks(new FHIRBoolean(array_merge($ext, $data[self::FIELD_NAVIGATION_LINKS]))); + } } else { $this->setNavigationLinks(new FHIRBoolean($data[self::FIELD_NAVIGATION_LINKS])); } @@ -569,8 +612,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_OPERATOR] instanceof FHIRAssertionOperatorType) { $this->setOperator($data[self::FIELD_OPERATOR]); - } elseif ($ext && is_scalar($data[self::FIELD_OPERATOR])) { - $this->setOperator(new FHIRAssertionOperatorType([FHIRAssertionOperatorType::FIELD_VALUE => $data[self::FIELD_OPERATOR]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_OPERATOR])) { + $this->setOperator(new FHIRAssertionOperatorType([FHIRAssertionOperatorType::FIELD_VALUE => $data[self::FIELD_OPERATOR]] + $ext)); + } else if (is_array($data[self::FIELD_OPERATOR])) { + $this->setOperator(new FHIRAssertionOperatorType(array_merge($ext, $data[self::FIELD_OPERATOR]))); + } } else { $this->setOperator(new FHIRAssertionOperatorType($data[self::FIELD_OPERATOR])); } @@ -581,8 +628,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PATH] instanceof FHIRString) { $this->setPath($data[self::FIELD_PATH]); - } elseif ($ext && is_scalar($data[self::FIELD_PATH])) { - $this->setPath(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PATH]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PATH])) { + $this->setPath(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PATH]] + $ext)); + } else if (is_array($data[self::FIELD_PATH])) { + $this->setPath(new FHIRString(array_merge($ext, $data[self::FIELD_PATH]))); + } } else { $this->setPath(new FHIRString($data[self::FIELD_PATH])); } @@ -593,8 +644,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_REQUEST_METHOD] instanceof FHIRTestScriptRequestMethodCode) { $this->setRequestMethod($data[self::FIELD_REQUEST_METHOD]); - } elseif ($ext && is_scalar($data[self::FIELD_REQUEST_METHOD])) { - $this->setRequestMethod(new FHIRTestScriptRequestMethodCode([FHIRTestScriptRequestMethodCode::FIELD_VALUE => $data[self::FIELD_REQUEST_METHOD]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_REQUEST_METHOD])) { + $this->setRequestMethod(new FHIRTestScriptRequestMethodCode([FHIRTestScriptRequestMethodCode::FIELD_VALUE => $data[self::FIELD_REQUEST_METHOD]] + $ext)); + } else if (is_array($data[self::FIELD_REQUEST_METHOD])) { + $this->setRequestMethod(new FHIRTestScriptRequestMethodCode(array_merge($ext, $data[self::FIELD_REQUEST_METHOD]))); + } } else { $this->setRequestMethod(new FHIRTestScriptRequestMethodCode($data[self::FIELD_REQUEST_METHOD])); } @@ -605,8 +660,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_REQUEST_URL] instanceof FHIRString) { $this->setRequestURL($data[self::FIELD_REQUEST_URL]); - } elseif ($ext && is_scalar($data[self::FIELD_REQUEST_URL])) { - $this->setRequestURL(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_REQUEST_URL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_REQUEST_URL])) { + $this->setRequestURL(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_REQUEST_URL]] + $ext)); + } else if (is_array($data[self::FIELD_REQUEST_URL])) { + $this->setRequestURL(new FHIRString(array_merge($ext, $data[self::FIELD_REQUEST_URL]))); + } } else { $this->setRequestURL(new FHIRString($data[self::FIELD_REQUEST_URL])); } @@ -617,8 +676,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_RESOURCE] instanceof FHIRFHIRDefinedType) { $this->setResource($data[self::FIELD_RESOURCE]); - } elseif ($ext && is_scalar($data[self::FIELD_RESOURCE])) { - $this->setResource(new FHIRFHIRDefinedType([FHIRFHIRDefinedType::FIELD_VALUE => $data[self::FIELD_RESOURCE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_RESOURCE])) { + $this->setResource(new FHIRFHIRDefinedType([FHIRFHIRDefinedType::FIELD_VALUE => $data[self::FIELD_RESOURCE]] + $ext)); + } else if (is_array($data[self::FIELD_RESOURCE])) { + $this->setResource(new FHIRFHIRDefinedType(array_merge($ext, $data[self::FIELD_RESOURCE]))); + } } else { $this->setResource(new FHIRFHIRDefinedType($data[self::FIELD_RESOURCE])); } @@ -629,8 +692,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_RESPONSE] instanceof FHIRAssertionResponseTypes) { $this->setResponse($data[self::FIELD_RESPONSE]); - } elseif ($ext && is_scalar($data[self::FIELD_RESPONSE])) { - $this->setResponse(new FHIRAssertionResponseTypes([FHIRAssertionResponseTypes::FIELD_VALUE => $data[self::FIELD_RESPONSE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_RESPONSE])) { + $this->setResponse(new FHIRAssertionResponseTypes([FHIRAssertionResponseTypes::FIELD_VALUE => $data[self::FIELD_RESPONSE]] + $ext)); + } else if (is_array($data[self::FIELD_RESPONSE])) { + $this->setResponse(new FHIRAssertionResponseTypes(array_merge($ext, $data[self::FIELD_RESPONSE]))); + } } else { $this->setResponse(new FHIRAssertionResponseTypes($data[self::FIELD_RESPONSE])); } @@ -641,8 +708,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_RESPONSE_CODE] instanceof FHIRString) { $this->setResponseCode($data[self::FIELD_RESPONSE_CODE]); - } elseif ($ext && is_scalar($data[self::FIELD_RESPONSE_CODE])) { - $this->setResponseCode(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_RESPONSE_CODE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_RESPONSE_CODE])) { + $this->setResponseCode(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_RESPONSE_CODE]] + $ext)); + } else if (is_array($data[self::FIELD_RESPONSE_CODE])) { + $this->setResponseCode(new FHIRString(array_merge($ext, $data[self::FIELD_RESPONSE_CODE]))); + } } else { $this->setResponseCode(new FHIRString($data[self::FIELD_RESPONSE_CODE])); } @@ -667,8 +738,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SOURCE_ID] instanceof FHIRId) { $this->setSourceId($data[self::FIELD_SOURCE_ID]); - } elseif ($ext && is_scalar($data[self::FIELD_SOURCE_ID])) { - $this->setSourceId(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_SOURCE_ID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SOURCE_ID])) { + $this->setSourceId(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_SOURCE_ID]] + $ext)); + } else if (is_array($data[self::FIELD_SOURCE_ID])) { + $this->setSourceId(new FHIRId(array_merge($ext, $data[self::FIELD_SOURCE_ID]))); + } } else { $this->setSourceId(new FHIRId($data[self::FIELD_SOURCE_ID])); } @@ -679,8 +754,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALIDATE_PROFILE_ID] instanceof FHIRId) { $this->setValidateProfileId($data[self::FIELD_VALIDATE_PROFILE_ID]); - } elseif ($ext && is_scalar($data[self::FIELD_VALIDATE_PROFILE_ID])) { - $this->setValidateProfileId(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_VALIDATE_PROFILE_ID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALIDATE_PROFILE_ID])) { + $this->setValidateProfileId(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_VALIDATE_PROFILE_ID]] + $ext)); + } else if (is_array($data[self::FIELD_VALIDATE_PROFILE_ID])) { + $this->setValidateProfileId(new FHIRId(array_merge($ext, $data[self::FIELD_VALIDATE_PROFILE_ID]))); + } } else { $this->setValidateProfileId(new FHIRId($data[self::FIELD_VALIDATE_PROFILE_ID])); } @@ -691,8 +770,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE] instanceof FHIRString) { $this->setValue($data[self::FIELD_VALUE]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE])) { - $this->setValue(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VALUE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE])) { + $this->setValue(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VALUE]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE])) { + $this->setValue(new FHIRString(array_merge($ext, $data[self::FIELD_VALUE]))); + } } else { $this->setValue(new FHIRString($data[self::FIELD_VALUE])); } @@ -703,8 +786,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_WARNING_ONLY] instanceof FHIRBoolean) { $this->setWarningOnly($data[self::FIELD_WARNING_ONLY]); - } elseif ($ext && is_scalar($data[self::FIELD_WARNING_ONLY])) { - $this->setWarningOnly(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_WARNING_ONLY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_WARNING_ONLY])) { + $this->setWarningOnly(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_WARNING_ONLY]] + $ext)); + } else if (is_array($data[self::FIELD_WARNING_ONLY])) { + $this->setWarningOnly(new FHIRBoolean(array_merge($ext, $data[self::FIELD_WARNING_ONLY]))); + } } else { $this->setWarningOnly(new FHIRBoolean($data[self::FIELD_WARNING_ONLY])); } @@ -1798,6 +1885,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getCompareToSourceExpression())) { $v->xmlSerialize($sxe->addChild(self::FIELD_COMPARE_TO_SOURCE_EXPRESSION, null, $v->_getFHIRXMLNamespace())); } @@ -1807,14 +1895,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getCompareToSourcePath())) { $v->xmlSerialize($sxe->addChild(self::FIELD_COMPARE_TO_SOURCE_PATH, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getContentType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CONTENT_TYPE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getDescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESCRIPTION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDirection())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DIRECTION, null, $v->_getFHIRXMLNamespace())); } @@ -1833,36 +1919,30 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getNavigationLinks())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NAVIGATION_LINKS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOperator())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OPERATOR, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getPath())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATH, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRequestMethod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REQUEST_METHOD, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getRequestURL())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REQUEST_URL, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getResource())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RESOURCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getResponse())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RESPONSE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getResponseCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RESPONSE_CODE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRule())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RULE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRuleset())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RULESET, null, $v->_getFHIRXMLNamespace())); } @@ -1873,6 +1953,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_VALIDATE_PROFILE_ID, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getValue())) { + $sxe->addAttribute(self::FIELD_VALUE, (string)$v); $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getWarningOnly())) { @@ -1888,70 +1969,202 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getCompareToSourceExpression())) { - $a[self::FIELD_COMPARE_TO_SOURCE_EXPRESSION] = $v->getValue(); - $a[self::FIELD_COMPARE_TO_SOURCE_EXPRESSION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_COMPARE_TO_SOURCE_EXPRESSION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_COMPARE_TO_SOURCE_EXPRESSION_EXT] = $enc; + } + } else { + $a[self::FIELD_COMPARE_TO_SOURCE_EXPRESSION] = $v; + } } if (null !== ($v = $this->getCompareToSourceId())) { - $a[self::FIELD_COMPARE_TO_SOURCE_ID] = $v->getValue(); - $a[self::FIELD_COMPARE_TO_SOURCE_ID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_COMPARE_TO_SOURCE_ID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_COMPARE_TO_SOURCE_ID_EXT] = $enc; + } + } else { + $a[self::FIELD_COMPARE_TO_SOURCE_ID] = $v; + } } if (null !== ($v = $this->getCompareToSourcePath())) { - $a[self::FIELD_COMPARE_TO_SOURCE_PATH] = $v->getValue(); - $a[self::FIELD_COMPARE_TO_SOURCE_PATH_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_COMPARE_TO_SOURCE_PATH] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_COMPARE_TO_SOURCE_PATH_EXT] = $enc; + } + } else { + $a[self::FIELD_COMPARE_TO_SOURCE_PATH] = $v; + } } if (null !== ($v = $this->getContentType())) { - $a[self::FIELD_CONTENT_TYPE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CONTENT_TYPE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CONTENT_TYPE_EXT] = $enc; + } + } else { + $a[self::FIELD_CONTENT_TYPE] = $v; + } } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if (null !== ($v = $this->getDirection())) { - $a[self::FIELD_DIRECTION] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DIRECTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DIRECTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DIRECTION] = $v; + } } if (null !== ($v = $this->getExpression())) { - $a[self::FIELD_EXPRESSION] = $v->getValue(); - $a[self::FIELD_EXPRESSION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EXPRESSION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EXPRESSION_EXT] = $enc; + } + } else { + $a[self::FIELD_EXPRESSION] = $v; + } } if (null !== ($v = $this->getHeaderField())) { - $a[self::FIELD_HEADER_FIELD] = $v->getValue(); - $a[self::FIELD_HEADER_FIELD_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_HEADER_FIELD] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_HEADER_FIELD_EXT] = $enc; + } + } else { + $a[self::FIELD_HEADER_FIELD] = $v; + } } if (null !== ($v = $this->getLabel())) { - $a[self::FIELD_LABEL] = $v->getValue(); - $a[self::FIELD_LABEL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_LABEL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_LABEL_EXT] = $enc; + } + } else { + $a[self::FIELD_LABEL] = $v; + } } if (null !== ($v = $this->getMinimumId())) { - $a[self::FIELD_MINIMUM_ID] = $v->getValue(); - $a[self::FIELD_MINIMUM_ID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MINIMUM_ID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MINIMUM_ID_EXT] = $enc; + } + } else { + $a[self::FIELD_MINIMUM_ID] = $v; + } } if (null !== ($v = $this->getNavigationLinks())) { - $a[self::FIELD_NAVIGATION_LINKS] = $v->getValue(); - $a[self::FIELD_NAVIGATION_LINKS_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAVIGATION_LINKS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAVIGATION_LINKS_EXT] = $enc; + } + } else { + $a[self::FIELD_NAVIGATION_LINKS] = $v; + } } if (null !== ($v = $this->getOperator())) { - $a[self::FIELD_OPERATOR] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_OPERATOR] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_OPERATOR_EXT] = $enc; + } + } else { + $a[self::FIELD_OPERATOR] = $v; + } } if (null !== ($v = $this->getPath())) { - $a[self::FIELD_PATH] = $v->getValue(); - $a[self::FIELD_PATH_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PATH] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PATH_EXT] = $enc; + } + } else { + $a[self::FIELD_PATH] = $v; + } } if (null !== ($v = $this->getRequestMethod())) { - $a[self::FIELD_REQUEST_METHOD] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_REQUEST_METHOD] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_REQUEST_METHOD_EXT] = $enc; + } + } else { + $a[self::FIELD_REQUEST_METHOD] = $v; + } } if (null !== ($v = $this->getRequestURL())) { - $a[self::FIELD_REQUEST_URL] = $v->getValue(); - $a[self::FIELD_REQUEST_URL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_REQUEST_URL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_REQUEST_URL_EXT] = $enc; + } + } else { + $a[self::FIELD_REQUEST_URL] = $v; + } } if (null !== ($v = $this->getResource())) { - $a[self::FIELD_RESOURCE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_RESOURCE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_RESOURCE_EXT] = $enc; + } + } else { + $a[self::FIELD_RESOURCE] = $v; + } } if (null !== ($v = $this->getResponse())) { - $a[self::FIELD_RESPONSE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_RESPONSE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_RESPONSE_EXT] = $enc; + } + } else { + $a[self::FIELD_RESPONSE] = $v; + } } if (null !== ($v = $this->getResponseCode())) { - $a[self::FIELD_RESPONSE_CODE] = $v->getValue(); - $a[self::FIELD_RESPONSE_CODE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_RESPONSE_CODE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_RESPONSE_CODE_EXT] = $enc; + } + } else { + $a[self::FIELD_RESPONSE_CODE] = $v; + } } if (null !== ($v = $this->getRule())) { $a[self::FIELD_RULE] = $v; @@ -1960,20 +2173,48 @@ public function jsonSerialize() $a[self::FIELD_RULESET] = $v; } if (null !== ($v = $this->getSourceId())) { - $a[self::FIELD_SOURCE_ID] = $v->getValue(); - $a[self::FIELD_SOURCE_ID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SOURCE_ID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SOURCE_ID_EXT] = $enc; + } + } else { + $a[self::FIELD_SOURCE_ID] = $v; + } } if (null !== ($v = $this->getValidateProfileId())) { - $a[self::FIELD_VALIDATE_PROFILE_ID] = $v->getValue(); - $a[self::FIELD_VALIDATE_PROFILE_ID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALIDATE_PROFILE_ID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALIDATE_PROFILE_ID_EXT] = $enc; + } + } else { + $a[self::FIELD_VALIDATE_PROFILE_ID] = $v; + } } if (null !== ($v = $this->getValue())) { - $a[self::FIELD_VALUE] = $v->getValue(); - $a[self::FIELD_VALUE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE] = $v; + } } if (null !== ($v = $this->getWarningOnly())) { - $a[self::FIELD_WARNING_ONLY] = $v->getValue(); - $a[self::FIELD_WARNING_ONLY_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_WARNING_ONLY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_WARNING_ONLY_EXT] = $enc; + } + } else { + $a[self::FIELD_WARNING_ONLY] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptCapability.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptCapability.php index cf0d953586..88bbfef7e8 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptCapability.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptCapability.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -82,10 +82,6 @@ class FHIRTestScriptCapability extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_TEST_SCRIPT_DOT_CAPABILITY; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CAPABILITIES = 'capabilities'; const FIELD_DESCRIPTION = 'description'; const FIELD_DESCRIPTION_EXT = '_description'; @@ -181,6 +177,9 @@ class FHIRTestScriptCapability extends FHIRBackboneElement */ protected $validated = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRTestScriptCapability Constructor * @param null|array $data @@ -210,8 +209,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -222,8 +225,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESTINATION] instanceof FHIRInteger) { $this->setDestination($data[self::FIELD_DESTINATION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESTINATION])) { - $this->setDestination(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_DESTINATION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESTINATION])) { + $this->setDestination(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_DESTINATION]] + $ext)); + } else if (is_array($data[self::FIELD_DESTINATION])) { + $this->setDestination(new FHIRInteger(array_merge($ext, $data[self::FIELD_DESTINATION]))); + } } else { $this->setDestination(new FHIRInteger($data[self::FIELD_DESTINATION])); } @@ -234,17 +241,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_LINK])) { foreach($data[self::FIELD_LINK] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRUri) { $this->addLink($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addLink(new FHIRUri([FHIRUri::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addLink(new FHIRUri([FHIRUri::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addLink(new FHIRUri(array_merge($v, $ext[$i]))); + } } else { $this->addLink(new FHIRUri($v)); } } } elseif ($data[self::FIELD_LINK] instanceof FHIRUri) { $this->addLink($data[self::FIELD_LINK]); - } elseif ($ext && is_scalar($data[self::FIELD_LINK])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_LINK])) { $this->addLink(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_LINK]] + $ext)); } else { $this->addLink(new FHIRUri($data[self::FIELD_LINK])); @@ -256,17 +270,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_ORIGIN])) { foreach($data[self::FIELD_ORIGIN] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRInteger) { $this->addOrigin($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addOrigin(new FHIRInteger([FHIRInteger::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addOrigin(new FHIRInteger([FHIRInteger::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addOrigin(new FHIRInteger(array_merge($v, $ext[$i]))); + } } else { $this->addOrigin(new FHIRInteger($v)); } } } elseif ($data[self::FIELD_ORIGIN] instanceof FHIRInteger) { $this->addOrigin($data[self::FIELD_ORIGIN]); - } elseif ($ext && is_scalar($data[self::FIELD_ORIGIN])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_ORIGIN])) { $this->addOrigin(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_ORIGIN]] + $ext)); } else { $this->addOrigin(new FHIRInteger($data[self::FIELD_ORIGIN])); @@ -278,8 +299,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_REQUIRED] instanceof FHIRBoolean) { $this->setRequired($data[self::FIELD_REQUIRED]); - } elseif ($ext && is_scalar($data[self::FIELD_REQUIRED])) { - $this->setRequired(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_REQUIRED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_REQUIRED])) { + $this->setRequired(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_REQUIRED]] + $ext)); + } else if (is_array($data[self::FIELD_REQUIRED])) { + $this->setRequired(new FHIRBoolean(array_merge($ext, $data[self::FIELD_REQUIRED]))); + } } else { $this->setRequired(new FHIRBoolean($data[self::FIELD_REQUIRED])); } @@ -290,8 +315,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALIDATED] instanceof FHIRBoolean) { $this->setValidated($data[self::FIELD_VALIDATED]); - } elseif ($ext && is_scalar($data[self::FIELD_VALIDATED])) { - $this->setValidated(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_VALIDATED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALIDATED])) { + $this->setValidated(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_VALIDATED]] + $ext)); + } else if (is_array($data[self::FIELD_VALIDATED])) { + $this->setValidated(new FHIRBoolean(array_merge($ext, $data[self::FIELD_VALIDATED]))); + } } else { $this->setValidated(new FHIRBoolean($data[self::FIELD_VALIDATED])); } @@ -804,12 +833,26 @@ public function jsonSerialize() $a[self::FIELD_CAPABILITIES] = $v; } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if (null !== ($v = $this->getDestination())) { - $a[self::FIELD_DESTINATION] = $v->getValue(); - $a[self::FIELD_DESTINATION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESTINATION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESTINATION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESTINATION] = $v; + } } if ([] !== ($vs = $this->getLink())) { $a[self::FIELD_LINK] = []; @@ -817,8 +860,17 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_LINK][] = $v->getValue(); - $a[self::FIELD_LINK_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_LINK][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_LINK_EXT][] = $enc; + } else { + $a[self::FIELD_LINK_EXT][] = null; + } + } else { + $a[self::FIELD_LINK][] = $v; + } } } if ([] !== ($vs = $this->getOrigin())) { @@ -827,17 +879,40 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_ORIGIN][] = $v->getValue(); - $a[self::FIELD_ORIGIN_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ORIGIN][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ORIGIN_EXT][] = $enc; + } else { + $a[self::FIELD_ORIGIN_EXT][] = null; + } + } else { + $a[self::FIELD_ORIGIN][] = $v; + } } } if (null !== ($v = $this->getRequired())) { - $a[self::FIELD_REQUIRED] = $v->getValue(); - $a[self::FIELD_REQUIRED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_REQUIRED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_REQUIRED_EXT] = $enc; + } + } else { + $a[self::FIELD_REQUIRED] = $v; + } } if (null !== ($v = $this->getValidated())) { - $a[self::FIELD_VALIDATED] = $v->getValue(); - $a[self::FIELD_VALIDATED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALIDATED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALIDATED_EXT] = $enc; + } + } else { + $a[self::FIELD_VALIDATED] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptDestination.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptDestination.php index 22c7f4f139..afc234e3e5 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptDestination.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptDestination.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRTestScriptDestination extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_TEST_SCRIPT_DOT_DESTINATION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_INDEX = 'index'; const FIELD_INDEX_EXT = '_index'; const FIELD_PROFILE = 'profile'; @@ -110,6 +106,9 @@ class FHIRTestScriptDestination extends FHIRBackboneElement */ protected $profile = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRTestScriptDestination Constructor * @param null|array $data @@ -132,8 +131,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_INDEX] instanceof FHIRInteger) { $this->setIndex($data[self::FIELD_INDEX]); - } elseif ($ext && is_scalar($data[self::FIELD_INDEX])) { - $this->setIndex(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_INDEX]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_INDEX])) { + $this->setIndex(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_INDEX]] + $ext)); + } else if (is_array($data[self::FIELD_INDEX])) { + $this->setIndex(new FHIRInteger(array_merge($ext, $data[self::FIELD_INDEX]))); + } } else { $this->setIndex(new FHIRInteger($data[self::FIELD_INDEX])); } @@ -325,10 +328,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getIndex())) { $v->xmlSerialize($sxe->addChild(self::FIELD_INDEX, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getProfile())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PROFILE, null, $v->_getFHIRXMLNamespace())); } @@ -342,8 +345,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getIndex())) { - $a[self::FIELD_INDEX] = $v->getValue(); - $a[self::FIELD_INDEX_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_INDEX] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_INDEX_EXT] = $enc; + } + } else { + $a[self::FIELD_INDEX] = $v; + } } if (null !== ($v = $this->getProfile())) { $a[self::FIELD_PROFILE] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptFixture.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptFixture.php index 7099250d17..3f5e0c03e0 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptFixture.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptFixture.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRTestScriptFixture extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_TEST_SCRIPT_DOT_FIXTURE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_AUTOCREATE = 'autocreate'; const FIELD_AUTOCREATE_EXT = '_autocreate'; const FIELD_AUTODELETE = 'autodelete'; @@ -127,6 +123,9 @@ class FHIRTestScriptFixture extends FHIRBackboneElement */ protected $resource = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRTestScriptFixture Constructor * @param null|array $data @@ -149,8 +148,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_AUTOCREATE] instanceof FHIRBoolean) { $this->setAutocreate($data[self::FIELD_AUTOCREATE]); - } elseif ($ext && is_scalar($data[self::FIELD_AUTOCREATE])) { - $this->setAutocreate(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_AUTOCREATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_AUTOCREATE])) { + $this->setAutocreate(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_AUTOCREATE]] + $ext)); + } else if (is_array($data[self::FIELD_AUTOCREATE])) { + $this->setAutocreate(new FHIRBoolean(array_merge($ext, $data[self::FIELD_AUTOCREATE]))); + } } else { $this->setAutocreate(new FHIRBoolean($data[self::FIELD_AUTOCREATE])); } @@ -161,8 +164,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_AUTODELETE] instanceof FHIRBoolean) { $this->setAutodelete($data[self::FIELD_AUTODELETE]); - } elseif ($ext && is_scalar($data[self::FIELD_AUTODELETE])) { - $this->setAutodelete(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_AUTODELETE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_AUTODELETE])) { + $this->setAutodelete(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_AUTODELETE]] + $ext)); + } else if (is_array($data[self::FIELD_AUTODELETE])) { + $this->setAutodelete(new FHIRBoolean(array_merge($ext, $data[self::FIELD_AUTODELETE]))); + } } else { $this->setAutodelete(new FHIRBoolean($data[self::FIELD_AUTODELETE])); } @@ -406,13 +413,13 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getAutocreate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AUTOCREATE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getAutodelete())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AUTODELETE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getResource())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RESOURCE, null, $v->_getFHIRXMLNamespace())); } @@ -426,12 +433,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getAutocreate())) { - $a[self::FIELD_AUTOCREATE] = $v->getValue(); - $a[self::FIELD_AUTOCREATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_AUTOCREATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_AUTOCREATE_EXT] = $enc; + } + } else { + $a[self::FIELD_AUTOCREATE] = $v; + } } if (null !== ($v = $this->getAutodelete())) { - $a[self::FIELD_AUTODELETE] = $v->getValue(); - $a[self::FIELD_AUTODELETE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_AUTODELETE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_AUTODELETE_EXT] = $enc; + } + } else { + $a[self::FIELD_AUTODELETE] = $v; + } } if (null !== ($v = $this->getResource())) { $a[self::FIELD_RESOURCE] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptLink.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptLink.php index bd1d054b3f..562c8fe9c5 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptLink.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptLink.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRTestScriptLink extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_TEST_SCRIPT_DOT_LINK; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DESCRIPTION = 'description'; const FIELD_DESCRIPTION_EXT = '_description'; const FIELD_URL = 'url'; @@ -110,6 +106,9 @@ class FHIRTestScriptLink extends FHIRBackboneElement */ protected $url = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRTestScriptLink Constructor * @param null|array $data @@ -132,8 +131,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -144,8 +147,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_URL] instanceof FHIRUri) { $this->setUrl($data[self::FIELD_URL]); - } elseif ($ext && is_scalar($data[self::FIELD_URL])) { - $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } else if (is_array($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri(array_merge($ext, $data[self::FIELD_URL]))); + } } else { $this->setUrl(new FHIRUri($data[self::FIELD_URL])); } @@ -339,6 +346,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getDescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESCRIPTION, null, $v->_getFHIRXMLNamespace())); } @@ -355,12 +363,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if (null !== ($v = $this->getUrl())) { - $a[self::FIELD_URL] = $v->getValue(); - $a[self::FIELD_URL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_URL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_URL_EXT] = $enc; + } + } else { + $a[self::FIELD_URL] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptMetadata.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptMetadata.php index 8ba7c8eb40..2b6f485bc2 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptMetadata.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptMetadata.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -77,10 +77,6 @@ class FHIRTestScriptMetadata extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_TEST_SCRIPT_DOT_METADATA; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CAPABILITY = 'capability'; const FIELD_LINK = 'link'; @@ -105,6 +101,9 @@ class FHIRTestScriptMetadata extends FHIRBackboneElement */ protected $link = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRTestScriptMetadata Constructor * @param null|array $data @@ -124,6 +123,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CAPABILITY])) { if (is_array($data[self::FIELD_CAPABILITY])) { foreach($data[self::FIELD_CAPABILITY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRTestScriptCapability) { $this->addCapability($v); } else { @@ -139,6 +141,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_LINK])) { if (is_array($data[self::FIELD_LINK])) { foreach($data[self::FIELD_LINK] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRTestScriptLink) { $this->addLink($v); } else { @@ -380,7 +385,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_CAPABILITY, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getLink())) { foreach($vs as $v) { if (null === $v) { diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptOperation.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptOperation.php index fdfdc40368..71d01343a8 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptOperation.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptOperation.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -84,10 +84,6 @@ class FHIRTestScriptOperation extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_TEST_SCRIPT_DOT_OPERATION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ACCEPT = 'accept'; const FIELD_ACCEPT_EXT = '_accept'; const FIELD_CONTENT_TYPE = 'contentType'; @@ -310,6 +306,9 @@ class FHIRTestScriptOperation extends FHIRBackboneElement */ protected $url = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRTestScriptOperation Constructor * @param null|array $data @@ -332,8 +331,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ACCEPT] instanceof FHIRContentType) { $this->setAccept($data[self::FIELD_ACCEPT]); - } elseif ($ext && is_scalar($data[self::FIELD_ACCEPT])) { - $this->setAccept(new FHIRContentType([FHIRContentType::FIELD_VALUE => $data[self::FIELD_ACCEPT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ACCEPT])) { + $this->setAccept(new FHIRContentType([FHIRContentType::FIELD_VALUE => $data[self::FIELD_ACCEPT]] + $ext)); + } else if (is_array($data[self::FIELD_ACCEPT])) { + $this->setAccept(new FHIRContentType(array_merge($ext, $data[self::FIELD_ACCEPT]))); + } } else { $this->setAccept(new FHIRContentType($data[self::FIELD_ACCEPT])); } @@ -344,8 +347,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CONTENT_TYPE] instanceof FHIRContentType) { $this->setContentType($data[self::FIELD_CONTENT_TYPE]); - } elseif ($ext && is_scalar($data[self::FIELD_CONTENT_TYPE])) { - $this->setContentType(new FHIRContentType([FHIRContentType::FIELD_VALUE => $data[self::FIELD_CONTENT_TYPE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CONTENT_TYPE])) { + $this->setContentType(new FHIRContentType([FHIRContentType::FIELD_VALUE => $data[self::FIELD_CONTENT_TYPE]] + $ext)); + } else if (is_array($data[self::FIELD_CONTENT_TYPE])) { + $this->setContentType(new FHIRContentType(array_merge($ext, $data[self::FIELD_CONTENT_TYPE]))); + } } else { $this->setContentType(new FHIRContentType($data[self::FIELD_CONTENT_TYPE])); } @@ -356,8 +363,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -368,8 +379,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESTINATION] instanceof FHIRInteger) { $this->setDestination($data[self::FIELD_DESTINATION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESTINATION])) { - $this->setDestination(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_DESTINATION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESTINATION])) { + $this->setDestination(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_DESTINATION]] + $ext)); + } else if (is_array($data[self::FIELD_DESTINATION])) { + $this->setDestination(new FHIRInteger(array_merge($ext, $data[self::FIELD_DESTINATION]))); + } } else { $this->setDestination(new FHIRInteger($data[self::FIELD_DESTINATION])); } @@ -380,8 +395,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ENCODE_REQUEST_URL] instanceof FHIRBoolean) { $this->setEncodeRequestUrl($data[self::FIELD_ENCODE_REQUEST_URL]); - } elseif ($ext && is_scalar($data[self::FIELD_ENCODE_REQUEST_URL])) { - $this->setEncodeRequestUrl(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_ENCODE_REQUEST_URL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ENCODE_REQUEST_URL])) { + $this->setEncodeRequestUrl(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_ENCODE_REQUEST_URL]] + $ext)); + } else if (is_array($data[self::FIELD_ENCODE_REQUEST_URL])) { + $this->setEncodeRequestUrl(new FHIRBoolean(array_merge($ext, $data[self::FIELD_ENCODE_REQUEST_URL]))); + } } else { $this->setEncodeRequestUrl(new FHIRBoolean($data[self::FIELD_ENCODE_REQUEST_URL])); } @@ -392,8 +411,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_LABEL] instanceof FHIRString) { $this->setLabel($data[self::FIELD_LABEL]); - } elseif ($ext && is_scalar($data[self::FIELD_LABEL])) { - $this->setLabel(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_LABEL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_LABEL])) { + $this->setLabel(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_LABEL]] + $ext)); + } else if (is_array($data[self::FIELD_LABEL])) { + $this->setLabel(new FHIRString(array_merge($ext, $data[self::FIELD_LABEL]))); + } } else { $this->setLabel(new FHIRString($data[self::FIELD_LABEL])); } @@ -404,8 +427,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ORIGIN] instanceof FHIRInteger) { $this->setOrigin($data[self::FIELD_ORIGIN]); - } elseif ($ext && is_scalar($data[self::FIELD_ORIGIN])) { - $this->setOrigin(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_ORIGIN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ORIGIN])) { + $this->setOrigin(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_ORIGIN]] + $ext)); + } else if (is_array($data[self::FIELD_ORIGIN])) { + $this->setOrigin(new FHIRInteger(array_merge($ext, $data[self::FIELD_ORIGIN]))); + } } else { $this->setOrigin(new FHIRInteger($data[self::FIELD_ORIGIN])); } @@ -416,8 +443,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PARAMS] instanceof FHIRString) { $this->setParams($data[self::FIELD_PARAMS]); - } elseif ($ext && is_scalar($data[self::FIELD_PARAMS])) { - $this->setParams(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PARAMS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PARAMS])) { + $this->setParams(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PARAMS]] + $ext)); + } else if (is_array($data[self::FIELD_PARAMS])) { + $this->setParams(new FHIRString(array_merge($ext, $data[self::FIELD_PARAMS]))); + } } else { $this->setParams(new FHIRString($data[self::FIELD_PARAMS])); } @@ -428,17 +459,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_REQUEST_HEADER])) { foreach($data[self::FIELD_REQUEST_HEADER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRTestScriptRequestHeader) { $this->addRequestHeader($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addRequestHeader(new FHIRTestScriptRequestHeader([FHIRTestScriptRequestHeader::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addRequestHeader(new FHIRTestScriptRequestHeader([FHIRTestScriptRequestHeader::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addRequestHeader(new FHIRTestScriptRequestHeader(array_merge($v, $ext[$i]))); + } } else { $this->addRequestHeader(new FHIRTestScriptRequestHeader($v)); } } } elseif ($data[self::FIELD_REQUEST_HEADER] instanceof FHIRTestScriptRequestHeader) { $this->addRequestHeader($data[self::FIELD_REQUEST_HEADER]); - } elseif ($ext && is_scalar($data[self::FIELD_REQUEST_HEADER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_REQUEST_HEADER])) { $this->addRequestHeader(new FHIRTestScriptRequestHeader([FHIRTestScriptRequestHeader::FIELD_VALUE => $data[self::FIELD_REQUEST_HEADER]] + $ext)); } else { $this->addRequestHeader(new FHIRTestScriptRequestHeader($data[self::FIELD_REQUEST_HEADER])); @@ -450,8 +488,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_REQUEST_ID] instanceof FHIRId) { $this->setRequestId($data[self::FIELD_REQUEST_ID]); - } elseif ($ext && is_scalar($data[self::FIELD_REQUEST_ID])) { - $this->setRequestId(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_REQUEST_ID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_REQUEST_ID])) { + $this->setRequestId(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_REQUEST_ID]] + $ext)); + } else if (is_array($data[self::FIELD_REQUEST_ID])) { + $this->setRequestId(new FHIRId(array_merge($ext, $data[self::FIELD_REQUEST_ID]))); + } } else { $this->setRequestId(new FHIRId($data[self::FIELD_REQUEST_ID])); } @@ -462,8 +504,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_RESOURCE] instanceof FHIRFHIRDefinedType) { $this->setResource($data[self::FIELD_RESOURCE]); - } elseif ($ext && is_scalar($data[self::FIELD_RESOURCE])) { - $this->setResource(new FHIRFHIRDefinedType([FHIRFHIRDefinedType::FIELD_VALUE => $data[self::FIELD_RESOURCE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_RESOURCE])) { + $this->setResource(new FHIRFHIRDefinedType([FHIRFHIRDefinedType::FIELD_VALUE => $data[self::FIELD_RESOURCE]] + $ext)); + } else if (is_array($data[self::FIELD_RESOURCE])) { + $this->setResource(new FHIRFHIRDefinedType(array_merge($ext, $data[self::FIELD_RESOURCE]))); + } } else { $this->setResource(new FHIRFHIRDefinedType($data[self::FIELD_RESOURCE])); } @@ -474,8 +520,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_RESPONSE_ID] instanceof FHIRId) { $this->setResponseId($data[self::FIELD_RESPONSE_ID]); - } elseif ($ext && is_scalar($data[self::FIELD_RESPONSE_ID])) { - $this->setResponseId(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_RESPONSE_ID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_RESPONSE_ID])) { + $this->setResponseId(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_RESPONSE_ID]] + $ext)); + } else if (is_array($data[self::FIELD_RESPONSE_ID])) { + $this->setResponseId(new FHIRId(array_merge($ext, $data[self::FIELD_RESPONSE_ID]))); + } } else { $this->setResponseId(new FHIRId($data[self::FIELD_RESPONSE_ID])); } @@ -486,8 +536,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SOURCE_ID] instanceof FHIRId) { $this->setSourceId($data[self::FIELD_SOURCE_ID]); - } elseif ($ext && is_scalar($data[self::FIELD_SOURCE_ID])) { - $this->setSourceId(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_SOURCE_ID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SOURCE_ID])) { + $this->setSourceId(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_SOURCE_ID]] + $ext)); + } else if (is_array($data[self::FIELD_SOURCE_ID])) { + $this->setSourceId(new FHIRId(array_merge($ext, $data[self::FIELD_SOURCE_ID]))); + } } else { $this->setSourceId(new FHIRId($data[self::FIELD_SOURCE_ID])); } @@ -498,8 +552,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TARGET_ID] instanceof FHIRId) { $this->setTargetId($data[self::FIELD_TARGET_ID]); - } elseif ($ext && is_scalar($data[self::FIELD_TARGET_ID])) { - $this->setTargetId(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_TARGET_ID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TARGET_ID])) { + $this->setTargetId(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_TARGET_ID]] + $ext)); + } else if (is_array($data[self::FIELD_TARGET_ID])) { + $this->setTargetId(new FHIRId(array_merge($ext, $data[self::FIELD_TARGET_ID]))); + } } else { $this->setTargetId(new FHIRId($data[self::FIELD_TARGET_ID])); } @@ -517,8 +575,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_URL] instanceof FHIRString) { $this->setUrl($data[self::FIELD_URL]); - } elseif ($ext && is_scalar($data[self::FIELD_URL])) { - $this->setUrl(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_URL])) { + $this->setUrl(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } else if (is_array($data[self::FIELD_URL])) { + $this->setUrl(new FHIRString(array_merge($ext, $data[self::FIELD_URL]))); + } } else { $this->setUrl(new FHIRString($data[self::FIELD_URL])); } @@ -1332,7 +1394,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getAccept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ACCEPT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getContentType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CONTENT_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -1354,7 +1415,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getParams())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PARAMS, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getRequestHeader())) { foreach($vs as $v) { if (null === $v) { @@ -1366,7 +1426,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getRequestId())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REQUEST_ID, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getResource())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RESOURCE, null, $v->_getFHIRXMLNamespace())); } @@ -1379,7 +1438,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getTargetId())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TARGET_ID, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -1396,63 +1454,180 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getAccept())) { - $a[self::FIELD_ACCEPT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ACCEPT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ACCEPT_EXT] = $enc; + } + } else { + $a[self::FIELD_ACCEPT] = $v; + } } if (null !== ($v = $this->getContentType())) { - $a[self::FIELD_CONTENT_TYPE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CONTENT_TYPE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CONTENT_TYPE_EXT] = $enc; + } + } else { + $a[self::FIELD_CONTENT_TYPE] = $v; + } } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if (null !== ($v = $this->getDestination())) { - $a[self::FIELD_DESTINATION] = $v->getValue(); - $a[self::FIELD_DESTINATION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESTINATION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESTINATION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESTINATION] = $v; + } } if (null !== ($v = $this->getEncodeRequestUrl())) { - $a[self::FIELD_ENCODE_REQUEST_URL] = $v->getValue(); - $a[self::FIELD_ENCODE_REQUEST_URL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ENCODE_REQUEST_URL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ENCODE_REQUEST_URL_EXT] = $enc; + } + } else { + $a[self::FIELD_ENCODE_REQUEST_URL] = $v; + } } if (null !== ($v = $this->getLabel())) { - $a[self::FIELD_LABEL] = $v->getValue(); - $a[self::FIELD_LABEL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_LABEL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_LABEL_EXT] = $enc; + } + } else { + $a[self::FIELD_LABEL] = $v; + } } if (null !== ($v = $this->getOrigin())) { - $a[self::FIELD_ORIGIN] = $v->getValue(); - $a[self::FIELD_ORIGIN_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ORIGIN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ORIGIN_EXT] = $enc; + } + } else { + $a[self::FIELD_ORIGIN] = $v; + } } if (null !== ($v = $this->getParams())) { - $a[self::FIELD_PARAMS] = $v->getValue(); - $a[self::FIELD_PARAMS_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PARAMS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PARAMS_EXT] = $enc; + } + } else { + $a[self::FIELD_PARAMS] = $v; + } } if ([] !== ($vs = $this->getRequestHeader())) { - $a[self::FIELD_REQUEST_HEADER] = $vs; + $a[self::FIELD_REQUEST_HEADER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_REQUEST_HEADER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_REQUEST_HEADER_EXT][] = $enc; + } else { + $a[self::FIELD_REQUEST_HEADER_EXT][] = null; + } + } else { + $a[self::FIELD_REQUEST_HEADER][] = $v; + } + } } if (null !== ($v = $this->getRequestId())) { - $a[self::FIELD_REQUEST_ID] = $v->getValue(); - $a[self::FIELD_REQUEST_ID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_REQUEST_ID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_REQUEST_ID_EXT] = $enc; + } + } else { + $a[self::FIELD_REQUEST_ID] = $v; + } } if (null !== ($v = $this->getResource())) { - $a[self::FIELD_RESOURCE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_RESOURCE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_RESOURCE_EXT] = $enc; + } + } else { + $a[self::FIELD_RESOURCE] = $v; + } } if (null !== ($v = $this->getResponseId())) { - $a[self::FIELD_RESPONSE_ID] = $v->getValue(); - $a[self::FIELD_RESPONSE_ID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_RESPONSE_ID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_RESPONSE_ID_EXT] = $enc; + } + } else { + $a[self::FIELD_RESPONSE_ID] = $v; + } } if (null !== ($v = $this->getSourceId())) { - $a[self::FIELD_SOURCE_ID] = $v->getValue(); - $a[self::FIELD_SOURCE_ID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SOURCE_ID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SOURCE_ID_EXT] = $enc; + } + } else { + $a[self::FIELD_SOURCE_ID] = $v; + } } if (null !== ($v = $this->getTargetId())) { - $a[self::FIELD_TARGET_ID] = $v->getValue(); - $a[self::FIELD_TARGET_ID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TARGET_ID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TARGET_ID_EXT] = $enc; + } + } else { + $a[self::FIELD_TARGET_ID] = $v; + } } if (null !== ($v = $this->getType())) { $a[self::FIELD_TYPE] = $v; } if (null !== ($v = $this->getUrl())) { - $a[self::FIELD_URL] = $v->getValue(); - $a[self::FIELD_URL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_URL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_URL_EXT] = $enc; + } + } else { + $a[self::FIELD_URL] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptOrigin.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptOrigin.php index c34a2bc066..101416484c 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptOrigin.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptOrigin.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRTestScriptOrigin extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_TEST_SCRIPT_DOT_ORIGIN; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_INDEX = 'index'; const FIELD_INDEX_EXT = '_index'; const FIELD_PROFILE = 'profile'; @@ -110,6 +106,9 @@ class FHIRTestScriptOrigin extends FHIRBackboneElement */ protected $profile = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRTestScriptOrigin Constructor * @param null|array $data @@ -132,8 +131,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_INDEX] instanceof FHIRInteger) { $this->setIndex($data[self::FIELD_INDEX]); - } elseif ($ext && is_scalar($data[self::FIELD_INDEX])) { - $this->setIndex(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_INDEX]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_INDEX])) { + $this->setIndex(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_INDEX]] + $ext)); + } else if (is_array($data[self::FIELD_INDEX])) { + $this->setIndex(new FHIRInteger(array_merge($ext, $data[self::FIELD_INDEX]))); + } } else { $this->setIndex(new FHIRInteger($data[self::FIELD_INDEX])); } @@ -325,10 +328,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getIndex())) { $v->xmlSerialize($sxe->addChild(self::FIELD_INDEX, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getProfile())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PROFILE, null, $v->_getFHIRXMLNamespace())); } @@ -342,8 +345,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getIndex())) { - $a[self::FIELD_INDEX] = $v->getValue(); - $a[self::FIELD_INDEX_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_INDEX] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_INDEX_EXT] = $enc; + } + } else { + $a[self::FIELD_INDEX] = $v; + } } if (null !== ($v = $this->getProfile())) { $a[self::FIELD_PROFILE] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptParam.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptParam.php index 9455e77034..e36fe933c9 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptParam.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptParam.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRTestScriptParam extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_TEST_SCRIPT_DOT_PARAM; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_NAME = 'name'; const FIELD_NAME_EXT = '_name'; const FIELD_VALUE = 'value'; @@ -111,6 +107,9 @@ class FHIRTestScriptParam extends FHIRBackboneElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRTestScriptParam Constructor * @param null|array $data @@ -137,8 +136,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -149,8 +152,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE] instanceof FHIRString) { $this->setValue($data[self::FIELD_VALUE]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE])) { - $this->setValue(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VALUE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE])) { + $this->setValue(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VALUE]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE])) { + $this->setValue(new FHIRString(array_merge($ext, $data[self::FIELD_VALUE]))); + } } else { $this->setValue(new FHIRString($data[self::FIELD_VALUE])); } @@ -348,10 +355,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NAME, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getValue())) { + $sxe->addAttribute(self::FIELD_VALUE, (string)$v); $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE, null, $v->_getFHIRXMLNamespace())); } return $sxe; @@ -364,12 +373,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if (null !== ($v = $this->getValue())) { - $a[self::FIELD_VALUE] = $v->getValue(); - $a[self::FIELD_VALUE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptParam1.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptParam1.php index 50e4180bae..85db217078 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptParam1.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptParam1.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRTestScriptParam1 extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_TEST_SCRIPT_DOT_PARAM_1; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_NAME = 'name'; const FIELD_NAME_EXT = '_name'; const FIELD_VALUE = 'value'; @@ -111,6 +107,9 @@ class FHIRTestScriptParam1 extends FHIRBackboneElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRTestScriptParam1 Constructor * @param null|array $data @@ -137,8 +136,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -149,8 +152,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE] instanceof FHIRString) { $this->setValue($data[self::FIELD_VALUE]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE])) { - $this->setValue(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VALUE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE])) { + $this->setValue(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VALUE]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE])) { + $this->setValue(new FHIRString(array_merge($ext, $data[self::FIELD_VALUE]))); + } } else { $this->setValue(new FHIRString($data[self::FIELD_VALUE])); } @@ -348,10 +355,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NAME, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getValue())) { + $sxe->addAttribute(self::FIELD_VALUE, (string)$v); $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE, null, $v->_getFHIRXMLNamespace())); } return $sxe; @@ -364,12 +373,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if (null !== ($v = $this->getValue())) { - $a[self::FIELD_VALUE] = $v->getValue(); - $a[self::FIELD_VALUE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptParam2.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptParam2.php index 300320b104..a3aa157b51 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptParam2.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptParam2.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRTestScriptParam2 extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_TEST_SCRIPT_DOT_PARAM_2; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_NAME = 'name'; const FIELD_NAME_EXT = '_name'; const FIELD_VALUE = 'value'; @@ -111,6 +107,9 @@ class FHIRTestScriptParam2 extends FHIRBackboneElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRTestScriptParam2 Constructor * @param null|array $data @@ -137,8 +136,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -149,8 +152,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE] instanceof FHIRString) { $this->setValue($data[self::FIELD_VALUE]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE])) { - $this->setValue(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VALUE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE])) { + $this->setValue(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VALUE]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE])) { + $this->setValue(new FHIRString(array_merge($ext, $data[self::FIELD_VALUE]))); + } } else { $this->setValue(new FHIRString($data[self::FIELD_VALUE])); } @@ -348,10 +355,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NAME, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getValue())) { + $sxe->addAttribute(self::FIELD_VALUE, (string)$v); $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE, null, $v->_getFHIRXMLNamespace())); } return $sxe; @@ -364,12 +373,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if (null !== ($v = $this->getValue())) { - $a[self::FIELD_VALUE] = $v->getValue(); - $a[self::FIELD_VALUE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptParam3.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptParam3.php index 4c18d7680b..ae939e1995 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptParam3.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptParam3.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRTestScriptParam3 extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_TEST_SCRIPT_DOT_PARAM_3; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_NAME = 'name'; const FIELD_NAME_EXT = '_name'; const FIELD_VALUE = 'value'; @@ -111,6 +107,9 @@ class FHIRTestScriptParam3 extends FHIRBackboneElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRTestScriptParam3 Constructor * @param null|array $data @@ -137,8 +136,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -149,8 +152,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE] instanceof FHIRString) { $this->setValue($data[self::FIELD_VALUE]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE])) { - $this->setValue(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VALUE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE])) { + $this->setValue(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VALUE]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE])) { + $this->setValue(new FHIRString(array_merge($ext, $data[self::FIELD_VALUE]))); + } } else { $this->setValue(new FHIRString($data[self::FIELD_VALUE])); } @@ -348,10 +355,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NAME, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getValue())) { + $sxe->addAttribute(self::FIELD_VALUE, (string)$v); $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE, null, $v->_getFHIRXMLNamespace())); } return $sxe; @@ -364,12 +373,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if (null !== ($v = $this->getValue())) { - $a[self::FIELD_VALUE] = $v->getValue(); - $a[self::FIELD_VALUE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptRequestHeader.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptRequestHeader.php index 9f12b62b57..b5bb4b68b5 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptRequestHeader.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptRequestHeader.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRTestScriptRequestHeader extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_TEST_SCRIPT_DOT_REQUEST_HEADER; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_FIELD = 'field'; const FIELD_FIELD_EXT = '_field'; const FIELD_VALUE = 'value'; @@ -109,6 +105,9 @@ class FHIRTestScriptRequestHeader extends FHIRBackboneElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRTestScriptRequestHeader Constructor * @param null|array $data @@ -135,8 +134,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_FIELD] instanceof FHIRString) { $this->setField($data[self::FIELD_FIELD]); - } elseif ($ext && is_scalar($data[self::FIELD_FIELD])) { - $this->setField(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_FIELD]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_FIELD])) { + $this->setField(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_FIELD]] + $ext)); + } else if (is_array($data[self::FIELD_FIELD])) { + $this->setField(new FHIRString(array_merge($ext, $data[self::FIELD_FIELD]))); + } } else { $this->setField(new FHIRString($data[self::FIELD_FIELD])); } @@ -147,8 +150,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE] instanceof FHIRString) { $this->setValue($data[self::FIELD_VALUE]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE])) { - $this->setValue(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VALUE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE])) { + $this->setValue(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VALUE]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE])) { + $this->setValue(new FHIRString(array_merge($ext, $data[self::FIELD_VALUE]))); + } } else { $this->setValue(new FHIRString($data[self::FIELD_VALUE])); } @@ -342,10 +349,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getField())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FIELD, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getValue())) { + $sxe->addAttribute(self::FIELD_VALUE, (string)$v); $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE, null, $v->_getFHIRXMLNamespace())); } return $sxe; @@ -358,12 +367,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getField())) { - $a[self::FIELD_FIELD] = $v->getValue(); - $a[self::FIELD_FIELD_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FIELD] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FIELD_EXT] = $enc; + } + } else { + $a[self::FIELD_FIELD] = $v; + } } if (null !== ($v = $this->getValue())) { - $a[self::FIELD_VALUE] = $v->getValue(); - $a[self::FIELD_VALUE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptRule.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptRule.php index 5bbb307d7f..512ea344ed 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptRule.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptRule.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRTestScriptRule extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_TEST_SCRIPT_DOT_RULE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_PARAM = 'param'; const FIELD_PARAM_EXT = '_param'; const FIELD_RESOURCE = 'resource'; @@ -108,6 +104,9 @@ class FHIRTestScriptRule extends FHIRBackboneElement */ protected $resource = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRTestScriptRule Constructor * @param null|array $data @@ -130,17 +129,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_PARAM])) { foreach($data[self::FIELD_PARAM] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRTestScriptParam) { $this->addParam($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addParam(new FHIRTestScriptParam([FHIRTestScriptParam::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addParam(new FHIRTestScriptParam([FHIRTestScriptParam::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addParam(new FHIRTestScriptParam(array_merge($v, $ext[$i]))); + } } else { $this->addParam(new FHIRTestScriptParam($v)); } } } elseif ($data[self::FIELD_PARAM] instanceof FHIRTestScriptParam) { $this->addParam($data[self::FIELD_PARAM]); - } elseif ($ext && is_scalar($data[self::FIELD_PARAM])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_PARAM])) { $this->addParam(new FHIRTestScriptParam([FHIRTestScriptParam::FIELD_VALUE => $data[self::FIELD_PARAM]] + $ext)); } else { $this->addParam(new FHIRTestScriptParam($data[self::FIELD_PARAM])); @@ -356,7 +362,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_PARAM, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getResource())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RESOURCE, null, $v->_getFHIRXMLNamespace())); } @@ -370,7 +375,23 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if ([] !== ($vs = $this->getParam())) { - $a[self::FIELD_PARAM] = $vs; + $a[self::FIELD_PARAM] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PARAM][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PARAM_EXT][] = $enc; + } else { + $a[self::FIELD_PARAM_EXT][] = null; + } + } else { + $a[self::FIELD_PARAM][] = $v; + } + } } if (null !== ($v = $this->getResource())) { $a[self::FIELD_RESOURCE] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptRule1.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptRule1.php index 4faee670dd..f8cc8d7cf9 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptRule1.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptRule1.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRTestScriptRule1 extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_TEST_SCRIPT_DOT_RULE_1; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_PARAM = 'param'; const FIELD_PARAM_EXT = '_param'; const FIELD_RULE_ID = 'ruleId'; @@ -111,6 +107,9 @@ class FHIRTestScriptRule1 extends FHIRBackboneElement */ protected $ruleId = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRTestScriptRule1 Constructor * @param null|array $data @@ -133,17 +132,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_PARAM])) { foreach($data[self::FIELD_PARAM] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRTestScriptParam1) { $this->addParam($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addParam(new FHIRTestScriptParam1([FHIRTestScriptParam1::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addParam(new FHIRTestScriptParam1([FHIRTestScriptParam1::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addParam(new FHIRTestScriptParam1(array_merge($v, $ext[$i]))); + } } else { $this->addParam(new FHIRTestScriptParam1($v)); } } } elseif ($data[self::FIELD_PARAM] instanceof FHIRTestScriptParam1) { $this->addParam($data[self::FIELD_PARAM]); - } elseif ($ext && is_scalar($data[self::FIELD_PARAM])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_PARAM])) { $this->addParam(new FHIRTestScriptParam1([FHIRTestScriptParam1::FIELD_VALUE => $data[self::FIELD_PARAM]] + $ext)); } else { $this->addParam(new FHIRTestScriptParam1($data[self::FIELD_PARAM])); @@ -155,8 +161,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_RULE_ID] instanceof FHIRId) { $this->setRuleId($data[self::FIELD_RULE_ID]); - } elseif ($ext && is_scalar($data[self::FIELD_RULE_ID])) { - $this->setRuleId(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_RULE_ID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_RULE_ID])) { + $this->setRuleId(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_RULE_ID]] + $ext)); + } else if (is_array($data[self::FIELD_RULE_ID])) { + $this->setRuleId(new FHIRId(array_merge($ext, $data[self::FIELD_RULE_ID]))); + } } else { $this->setRuleId(new FHIRId($data[self::FIELD_RULE_ID])); } @@ -392,11 +402,34 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if ([] !== ($vs = $this->getParam())) { - $a[self::FIELD_PARAM] = $vs; + $a[self::FIELD_PARAM] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PARAM][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PARAM_EXT][] = $enc; + } else { + $a[self::FIELD_PARAM_EXT][] = null; + } + } else { + $a[self::FIELD_PARAM][] = $v; + } + } } if (null !== ($v = $this->getRuleId())) { - $a[self::FIELD_RULE_ID] = $v->getValue(); - $a[self::FIELD_RULE_ID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_RULE_ID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_RULE_ID_EXT] = $enc; + } + } else { + $a[self::FIELD_RULE_ID] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptRule2.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptRule2.php index c06f912517..63b4010488 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptRule2.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptRule2.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRTestScriptRule2 extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_TEST_SCRIPT_DOT_RULE_2; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_PARAM = 'param'; const FIELD_PARAM_EXT = '_param'; const FIELD_RULE_ID = 'ruleId'; @@ -111,6 +107,9 @@ class FHIRTestScriptRule2 extends FHIRBackboneElement */ protected $ruleId = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRTestScriptRule2 Constructor * @param null|array $data @@ -133,17 +132,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_PARAM])) { foreach($data[self::FIELD_PARAM] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRTestScriptParam2) { $this->addParam($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addParam(new FHIRTestScriptParam2([FHIRTestScriptParam2::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addParam(new FHIRTestScriptParam2([FHIRTestScriptParam2::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addParam(new FHIRTestScriptParam2(array_merge($v, $ext[$i]))); + } } else { $this->addParam(new FHIRTestScriptParam2($v)); } } } elseif ($data[self::FIELD_PARAM] instanceof FHIRTestScriptParam2) { $this->addParam($data[self::FIELD_PARAM]); - } elseif ($ext && is_scalar($data[self::FIELD_PARAM])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_PARAM])) { $this->addParam(new FHIRTestScriptParam2([FHIRTestScriptParam2::FIELD_VALUE => $data[self::FIELD_PARAM]] + $ext)); } else { $this->addParam(new FHIRTestScriptParam2($data[self::FIELD_PARAM])); @@ -155,8 +161,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_RULE_ID] instanceof FHIRId) { $this->setRuleId($data[self::FIELD_RULE_ID]); - } elseif ($ext && is_scalar($data[self::FIELD_RULE_ID])) { - $this->setRuleId(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_RULE_ID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_RULE_ID])) { + $this->setRuleId(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_RULE_ID]] + $ext)); + } else if (is_array($data[self::FIELD_RULE_ID])) { + $this->setRuleId(new FHIRId(array_merge($ext, $data[self::FIELD_RULE_ID]))); + } } else { $this->setRuleId(new FHIRId($data[self::FIELD_RULE_ID])); } @@ -392,11 +402,34 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if ([] !== ($vs = $this->getParam())) { - $a[self::FIELD_PARAM] = $vs; + $a[self::FIELD_PARAM] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PARAM][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PARAM_EXT][] = $enc; + } else { + $a[self::FIELD_PARAM_EXT][] = null; + } + } else { + $a[self::FIELD_PARAM][] = $v; + } + } } if (null !== ($v = $this->getRuleId())) { - $a[self::FIELD_RULE_ID] = $v->getValue(); - $a[self::FIELD_RULE_ID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_RULE_ID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_RULE_ID_EXT] = $enc; + } + } else { + $a[self::FIELD_RULE_ID] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptRule3.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptRule3.php index 2107e4233d..ed3e56937a 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptRule3.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptRule3.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRTestScriptRule3 extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_TEST_SCRIPT_DOT_RULE_3; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_PARAM = 'param'; const FIELD_PARAM_EXT = '_param'; const FIELD_RULE_ID = 'ruleId'; @@ -111,6 +107,9 @@ class FHIRTestScriptRule3 extends FHIRBackboneElement */ protected $ruleId = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRTestScriptRule3 Constructor * @param null|array $data @@ -133,17 +132,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_PARAM])) { foreach($data[self::FIELD_PARAM] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRTestScriptParam3) { $this->addParam($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addParam(new FHIRTestScriptParam3([FHIRTestScriptParam3::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addParam(new FHIRTestScriptParam3([FHIRTestScriptParam3::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addParam(new FHIRTestScriptParam3(array_merge($v, $ext[$i]))); + } } else { $this->addParam(new FHIRTestScriptParam3($v)); } } } elseif ($data[self::FIELD_PARAM] instanceof FHIRTestScriptParam3) { $this->addParam($data[self::FIELD_PARAM]); - } elseif ($ext && is_scalar($data[self::FIELD_PARAM])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_PARAM])) { $this->addParam(new FHIRTestScriptParam3([FHIRTestScriptParam3::FIELD_VALUE => $data[self::FIELD_PARAM]] + $ext)); } else { $this->addParam(new FHIRTestScriptParam3($data[self::FIELD_PARAM])); @@ -155,8 +161,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_RULE_ID] instanceof FHIRId) { $this->setRuleId($data[self::FIELD_RULE_ID]); - } elseif ($ext && is_scalar($data[self::FIELD_RULE_ID])) { - $this->setRuleId(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_RULE_ID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_RULE_ID])) { + $this->setRuleId(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_RULE_ID]] + $ext)); + } else if (is_array($data[self::FIELD_RULE_ID])) { + $this->setRuleId(new FHIRId(array_merge($ext, $data[self::FIELD_RULE_ID]))); + } } else { $this->setRuleId(new FHIRId($data[self::FIELD_RULE_ID])); } @@ -392,11 +402,34 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if ([] !== ($vs = $this->getParam())) { - $a[self::FIELD_PARAM] = $vs; + $a[self::FIELD_PARAM] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PARAM][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PARAM_EXT][] = $enc; + } else { + $a[self::FIELD_PARAM_EXT][] = null; + } + } else { + $a[self::FIELD_PARAM][] = $v; + } + } } if (null !== ($v = $this->getRuleId())) { - $a[self::FIELD_RULE_ID] = $v->getValue(); - $a[self::FIELD_RULE_ID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_RULE_ID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_RULE_ID_EXT] = $enc; + } + } else { + $a[self::FIELD_RULE_ID] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptRuleset.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptRuleset.php index 1da38634b7..d1d88d7c3d 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptRuleset.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptRuleset.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRTestScriptRuleset extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_TEST_SCRIPT_DOT_RULESET; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_RESOURCE = 'resource'; const FIELD_RULE = 'rule'; @@ -107,6 +103,9 @@ class FHIRTestScriptRuleset extends FHIRBackboneElement */ protected $rule = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRTestScriptRuleset Constructor * @param null|array $data @@ -133,6 +132,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_RULE])) { if (is_array($data[self::FIELD_RULE])) { foreach($data[self::FIELD_RULE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRTestScriptRule1) { $this->addRule($v); } else { @@ -343,7 +345,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getResource())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RESOURCE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getRule())) { foreach($vs as $v) { if (null === $v) { diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptRuleset1.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptRuleset1.php index 2dc9932a94..cce9505d52 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptRuleset1.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptRuleset1.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRTestScriptRuleset1 extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_TEST_SCRIPT_DOT_RULESET_1; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_RULE = 'rule'; const FIELD_RULESET_ID = 'rulesetId'; const FIELD_RULESET_ID_EXT = '_rulesetId'; @@ -110,6 +106,9 @@ class FHIRTestScriptRuleset1 extends FHIRBackboneElement */ protected $rulesetId = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRTestScriptRuleset1 Constructor * @param null|array $data @@ -129,6 +128,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_RULE])) { if (is_array($data[self::FIELD_RULE])) { foreach($data[self::FIELD_RULE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRTestScriptRule3) { $this->addRule($v); } else { @@ -147,8 +149,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_RULESET_ID] instanceof FHIRId) { $this->setRulesetId($data[self::FIELD_RULESET_ID]); - } elseif ($ext && is_scalar($data[self::FIELD_RULESET_ID])) { - $this->setRulesetId(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_RULESET_ID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_RULESET_ID])) { + $this->setRulesetId(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_RULESET_ID]] + $ext)); + } else if (is_array($data[self::FIELD_RULESET_ID])) { + $this->setRulesetId(new FHIRId(array_merge($ext, $data[self::FIELD_RULESET_ID]))); + } } else { $this->setRulesetId(new FHIRId($data[self::FIELD_RULESET_ID])); } @@ -387,8 +393,15 @@ public function jsonSerialize() $a[self::FIELD_RULE] = $vs; } if (null !== ($v = $this->getRulesetId())) { - $a[self::FIELD_RULESET_ID] = $v->getValue(); - $a[self::FIELD_RULESET_ID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_RULESET_ID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_RULESET_ID_EXT] = $enc; + } + } else { + $a[self::FIELD_RULESET_ID] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptSetup.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptSetup.php index 15b9beaca6..c88fe93224 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptSetup.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptSetup.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -77,10 +77,6 @@ class FHIRTestScriptSetup extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_TEST_SCRIPT_DOT_SETUP; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ACTION = 'action'; /** @@ -93,6 +89,9 @@ class FHIRTestScriptSetup extends FHIRBackboneElement */ protected $action = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRTestScriptSetup Constructor * @param null|array $data @@ -112,6 +111,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ACTION])) { if (is_array($data[self::FIELD_ACTION])) { foreach($data[self::FIELD_ACTION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRTestScriptAction) { $this->addAction($v); } else { diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptTeardown.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptTeardown.php index d2fff7cbf7..26f8879831 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptTeardown.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptTeardown.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -77,10 +77,6 @@ class FHIRTestScriptTeardown extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_TEST_SCRIPT_DOT_TEARDOWN; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ACTION = 'action'; /** @@ -93,6 +89,9 @@ class FHIRTestScriptTeardown extends FHIRBackboneElement */ protected $action = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRTestScriptTeardown Constructor * @param null|array $data @@ -112,6 +111,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ACTION])) { if (is_array($data[self::FIELD_ACTION])) { foreach($data[self::FIELD_ACTION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRTestScriptAction2) { $this->addAction($v); } else { diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptTest.php index fb61f77502..17f123f194 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptTest.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRTestScriptTest extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_TEST_SCRIPT_DOT_TEST; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ACTION = 'action'; const FIELD_DESCRIPTION = 'description'; const FIELD_DESCRIPTION_EXT = '_description'; @@ -121,6 +117,9 @@ class FHIRTestScriptTest extends FHIRBackboneElement */ protected $name = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRTestScriptTest Constructor * @param null|array $data @@ -140,6 +139,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ACTION])) { if (is_array($data[self::FIELD_ACTION])) { foreach($data[self::FIELD_ACTION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRTestScriptAction1) { $this->addAction($v); } else { @@ -158,8 +160,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -170,8 +176,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -453,12 +463,26 @@ public function jsonSerialize() $a[self::FIELD_ACTION] = $vs; } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptVariable.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptVariable.php index 81e9e3f4ed..83678882c1 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptVariable.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptVariable.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRTestScriptVariable extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_TEST_SCRIPT_DOT_VARIABLE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DEFAULT_VALUE = 'defaultValue'; const FIELD_DEFAULT_VALUE_EXT = '_defaultValue'; const FIELD_DESCRIPTION = 'description'; @@ -197,6 +193,9 @@ class FHIRTestScriptVariable extends FHIRBackboneElement */ protected $sourceId = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRTestScriptVariable Constructor * @param null|array $data @@ -219,8 +218,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DEFAULT_VALUE] instanceof FHIRString) { $this->setDefaultValue($data[self::FIELD_DEFAULT_VALUE]); - } elseif ($ext && is_scalar($data[self::FIELD_DEFAULT_VALUE])) { - $this->setDefaultValue(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DEFAULT_VALUE])) { + $this->setDefaultValue(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE]] + $ext)); + } else if (is_array($data[self::FIELD_DEFAULT_VALUE])) { + $this->setDefaultValue(new FHIRString(array_merge($ext, $data[self::FIELD_DEFAULT_VALUE]))); + } } else { $this->setDefaultValue(new FHIRString($data[self::FIELD_DEFAULT_VALUE])); } @@ -231,8 +234,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -243,8 +250,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EXPRESSION] instanceof FHIRString) { $this->setExpression($data[self::FIELD_EXPRESSION]); - } elseif ($ext && is_scalar($data[self::FIELD_EXPRESSION])) { - $this->setExpression(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_EXPRESSION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EXPRESSION])) { + $this->setExpression(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_EXPRESSION]] + $ext)); + } else if (is_array($data[self::FIELD_EXPRESSION])) { + $this->setExpression(new FHIRString(array_merge($ext, $data[self::FIELD_EXPRESSION]))); + } } else { $this->setExpression(new FHIRString($data[self::FIELD_EXPRESSION])); } @@ -255,8 +266,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_HEADER_FIELD] instanceof FHIRString) { $this->setHeaderField($data[self::FIELD_HEADER_FIELD]); - } elseif ($ext && is_scalar($data[self::FIELD_HEADER_FIELD])) { - $this->setHeaderField(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_HEADER_FIELD]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_HEADER_FIELD])) { + $this->setHeaderField(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_HEADER_FIELD]] + $ext)); + } else if (is_array($data[self::FIELD_HEADER_FIELD])) { + $this->setHeaderField(new FHIRString(array_merge($ext, $data[self::FIELD_HEADER_FIELD]))); + } } else { $this->setHeaderField(new FHIRString($data[self::FIELD_HEADER_FIELD])); } @@ -267,8 +282,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_HINT] instanceof FHIRString) { $this->setHint($data[self::FIELD_HINT]); - } elseif ($ext && is_scalar($data[self::FIELD_HINT])) { - $this->setHint(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_HINT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_HINT])) { + $this->setHint(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_HINT]] + $ext)); + } else if (is_array($data[self::FIELD_HINT])) { + $this->setHint(new FHIRString(array_merge($ext, $data[self::FIELD_HINT]))); + } } else { $this->setHint(new FHIRString($data[self::FIELD_HINT])); } @@ -279,8 +298,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -291,8 +314,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PATH] instanceof FHIRString) { $this->setPath($data[self::FIELD_PATH]); - } elseif ($ext && is_scalar($data[self::FIELD_PATH])) { - $this->setPath(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PATH]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PATH])) { + $this->setPath(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PATH]] + $ext)); + } else if (is_array($data[self::FIELD_PATH])) { + $this->setPath(new FHIRString(array_merge($ext, $data[self::FIELD_PATH]))); + } } else { $this->setPath(new FHIRString($data[self::FIELD_PATH])); } @@ -303,8 +330,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SOURCE_ID] instanceof FHIRId) { $this->setSourceId($data[self::FIELD_SOURCE_ID]); - } elseif ($ext && is_scalar($data[self::FIELD_SOURCE_ID])) { - $this->setSourceId(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_SOURCE_ID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SOURCE_ID])) { + $this->setSourceId(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_SOURCE_ID]] + $ext)); + } else if (is_array($data[self::FIELD_SOURCE_ID])) { + $this->setSourceId(new FHIRId(array_merge($ext, $data[self::FIELD_SOURCE_ID]))); + } } else { $this->setSourceId(new FHIRId($data[self::FIELD_SOURCE_ID])); } @@ -780,6 +811,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getDefaultValue())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFAULT_VALUE, null, $v->_getFHIRXMLNamespace())); } @@ -814,36 +846,92 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getDefaultValue())) { - $a[self::FIELD_DEFAULT_VALUE] = $v->getValue(); - $a[self::FIELD_DEFAULT_VALUE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DEFAULT_VALUE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DEFAULT_VALUE_EXT] = $enc; + } + } else { + $a[self::FIELD_DEFAULT_VALUE] = $v; + } } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if (null !== ($v = $this->getExpression())) { - $a[self::FIELD_EXPRESSION] = $v->getValue(); - $a[self::FIELD_EXPRESSION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EXPRESSION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EXPRESSION_EXT] = $enc; + } + } else { + $a[self::FIELD_EXPRESSION] = $v; + } } if (null !== ($v = $this->getHeaderField())) { - $a[self::FIELD_HEADER_FIELD] = $v->getValue(); - $a[self::FIELD_HEADER_FIELD_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_HEADER_FIELD] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_HEADER_FIELD_EXT] = $enc; + } + } else { + $a[self::FIELD_HEADER_FIELD] = $v; + } } if (null !== ($v = $this->getHint())) { - $a[self::FIELD_HINT] = $v->getValue(); - $a[self::FIELD_HINT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_HINT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_HINT_EXT] = $enc; + } + } else { + $a[self::FIELD_HINT] = $v; + } } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if (null !== ($v = $this->getPath())) { - $a[self::FIELD_PATH] = $v->getValue(); - $a[self::FIELD_PATH_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PATH] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PATH_EXT] = $enc; + } + } else { + $a[self::FIELD_PATH] = $v; + } } if (null !== ($v = $this->getSourceId())) { - $a[self::FIELD_SOURCE_ID] = $v->getValue(); - $a[self::FIELD_SOURCE_ID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SOURCE_ID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SOURCE_ID_EXT] = $enc; + } + } else { + $a[self::FIELD_SOURCE_ID] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetCompose.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetCompose.php index d86cb9253c..0140195509 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetCompose.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetCompose.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRValueSetCompose extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_VALUE_SET_DOT_COMPOSE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_EXCLUDE = 'exclude'; const FIELD_INACTIVE = 'inactive'; const FIELD_INACTIVE_EXT = '_inactive'; @@ -138,6 +134,9 @@ class FHIRValueSetCompose extends FHIRBackboneElement */ protected $lockedDate = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRValueSetCompose Constructor * @param null|array $data @@ -157,6 +156,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_EXCLUDE])) { if (is_array($data[self::FIELD_EXCLUDE])) { foreach($data[self::FIELD_EXCLUDE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRValueSetInclude) { $this->addExclude($v); } else { @@ -175,8 +177,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_INACTIVE] instanceof FHIRBoolean) { $this->setInactive($data[self::FIELD_INACTIVE]); - } elseif ($ext && is_scalar($data[self::FIELD_INACTIVE])) { - $this->setInactive(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_INACTIVE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_INACTIVE])) { + $this->setInactive(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_INACTIVE]] + $ext)); + } else if (is_array($data[self::FIELD_INACTIVE])) { + $this->setInactive(new FHIRBoolean(array_merge($ext, $data[self::FIELD_INACTIVE]))); + } } else { $this->setInactive(new FHIRBoolean($data[self::FIELD_INACTIVE])); } @@ -184,6 +190,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_INCLUDE])) { if (is_array($data[self::FIELD_INCLUDE])) { foreach($data[self::FIELD_INCLUDE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRValueSetInclude) { $this->addInclude($v); } else { @@ -202,8 +211,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_LOCKED_DATE] instanceof FHIRDate) { $this->setLockedDate($data[self::FIELD_LOCKED_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_LOCKED_DATE])) { - $this->setLockedDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_LOCKED_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_LOCKED_DATE])) { + $this->setLockedDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_LOCKED_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_LOCKED_DATE])) { + $this->setLockedDate(new FHIRDate(array_merge($ext, $data[self::FIELD_LOCKED_DATE]))); + } } else { $this->setLockedDate(new FHIRDate($data[self::FIELD_LOCKED_DATE])); } @@ -538,7 +551,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getInactive())) { $v->xmlSerialize($sxe->addChild(self::FIELD_INACTIVE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getInclude())) { foreach($vs as $v) { if (null === $v) { @@ -563,15 +575,29 @@ public function jsonSerialize() $a[self::FIELD_EXCLUDE] = $vs; } if (null !== ($v = $this->getInactive())) { - $a[self::FIELD_INACTIVE] = $v->getValue(); - $a[self::FIELD_INACTIVE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_INACTIVE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_INACTIVE_EXT] = $enc; + } + } else { + $a[self::FIELD_INACTIVE] = $v; + } } if ([] !== ($vs = $this->getInclude())) { $a[self::FIELD_INCLUDE] = $vs; } if (null !== ($v = $this->getLockedDate())) { - $a[self::FIELD_LOCKED_DATE] = $v->getValue(); - $a[self::FIELD_LOCKED_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_LOCKED_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_LOCKED_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_LOCKED_DATE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetConcept.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetConcept.php index 12e7c96983..115c145730 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetConcept.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetConcept.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRValueSetConcept extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_VALUE_SET_DOT_CONCEPT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CODE = 'code'; const FIELD_CODE_EXT = '_code'; const FIELD_DESIGNATION = 'designation'; @@ -124,6 +120,9 @@ class FHIRValueSetConcept extends FHIRBackboneElement */ protected $display = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRValueSetConcept Constructor * @param null|array $data @@ -146,8 +145,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CODE] instanceof FHIRCode) { $this->setCode($data[self::FIELD_CODE]); - } elseif ($ext && is_scalar($data[self::FIELD_CODE])) { - $this->setCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_CODE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CODE])) { + $this->setCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_CODE]] + $ext)); + } else if (is_array($data[self::FIELD_CODE])) { + $this->setCode(new FHIRCode(array_merge($ext, $data[self::FIELD_CODE]))); + } } else { $this->setCode(new FHIRCode($data[self::FIELD_CODE])); } @@ -158,17 +161,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_DESIGNATION])) { foreach($data[self::FIELD_DESIGNATION] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRValueSetDesignation) { $this->addDesignation($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addDesignation(new FHIRValueSetDesignation([FHIRValueSetDesignation::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addDesignation(new FHIRValueSetDesignation([FHIRValueSetDesignation::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addDesignation(new FHIRValueSetDesignation(array_merge($v, $ext[$i]))); + } } else { $this->addDesignation(new FHIRValueSetDesignation($v)); } } } elseif ($data[self::FIELD_DESIGNATION] instanceof FHIRValueSetDesignation) { $this->addDesignation($data[self::FIELD_DESIGNATION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESIGNATION])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_DESIGNATION])) { $this->addDesignation(new FHIRValueSetDesignation([FHIRValueSetDesignation::FIELD_VALUE => $data[self::FIELD_DESIGNATION]] + $ext)); } else { $this->addDesignation(new FHIRValueSetDesignation($data[self::FIELD_DESIGNATION])); @@ -180,8 +190,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DISPLAY] instanceof FHIRString) { $this->setDisplay($data[self::FIELD_DISPLAY]); - } elseif ($ext && is_scalar($data[self::FIELD_DISPLAY])) { - $this->setDisplay(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DISPLAY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DISPLAY])) { + $this->setDisplay(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DISPLAY]] + $ext)); + } else if (is_array($data[self::FIELD_DISPLAY])) { + $this->setDisplay(new FHIRString(array_merge($ext, $data[self::FIELD_DISPLAY]))); + } } else { $this->setDisplay(new FHIRString($data[self::FIELD_DISPLAY])); } @@ -439,10 +453,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getDesignation())) { foreach($vs as $v) { if (null === $v) { @@ -464,15 +478,45 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getCode())) { - $a[self::FIELD_CODE] = $v->getValue(); - $a[self::FIELD_CODE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CODE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CODE_EXT] = $enc; + } + } else { + $a[self::FIELD_CODE] = $v; + } } if ([] !== ($vs = $this->getDesignation())) { - $a[self::FIELD_DESIGNATION] = $vs; + $a[self::FIELD_DESIGNATION] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESIGNATION][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESIGNATION_EXT][] = $enc; + } else { + $a[self::FIELD_DESIGNATION_EXT][] = null; + } + } else { + $a[self::FIELD_DESIGNATION][] = $v; + } + } } if (null !== ($v = $this->getDisplay())) { - $a[self::FIELD_DISPLAY] = $v->getValue(); - $a[self::FIELD_DISPLAY_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DISPLAY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DISPLAY_EXT] = $enc; + } + } else { + $a[self::FIELD_DISPLAY] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetContains.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetContains.php index 2a9fcf379a..9b8647fe0f 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetContains.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetContains.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRValueSetContains extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_VALUE_SET_DOT_CONTAINS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ABSTRACT = 'abstract'; const FIELD_ABSTRACT_EXT = '_abstract'; const FIELD_CODE = 'code'; @@ -192,6 +188,9 @@ class FHIRValueSetContains extends FHIRBackboneElement */ protected $version = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRValueSetContains Constructor * @param null|array $data @@ -214,8 +213,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ABSTRACT] instanceof FHIRBoolean) { $this->setAbstract($data[self::FIELD_ABSTRACT]); - } elseif ($ext && is_scalar($data[self::FIELD_ABSTRACT])) { - $this->setAbstract(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_ABSTRACT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ABSTRACT])) { + $this->setAbstract(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_ABSTRACT]] + $ext)); + } else if (is_array($data[self::FIELD_ABSTRACT])) { + $this->setAbstract(new FHIRBoolean(array_merge($ext, $data[self::FIELD_ABSTRACT]))); + } } else { $this->setAbstract(new FHIRBoolean($data[self::FIELD_ABSTRACT])); } @@ -226,8 +229,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CODE] instanceof FHIRCode) { $this->setCode($data[self::FIELD_CODE]); - } elseif ($ext && is_scalar($data[self::FIELD_CODE])) { - $this->setCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_CODE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CODE])) { + $this->setCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_CODE]] + $ext)); + } else if (is_array($data[self::FIELD_CODE])) { + $this->setCode(new FHIRCode(array_merge($ext, $data[self::FIELD_CODE]))); + } } else { $this->setCode(new FHIRCode($data[self::FIELD_CODE])); } @@ -235,6 +242,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CONTAINS])) { if (is_array($data[self::FIELD_CONTAINS])) { foreach($data[self::FIELD_CONTAINS] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRValueSetContains) { $this->addContains($v); } else { @@ -253,17 +263,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_DESIGNATION])) { foreach($data[self::FIELD_DESIGNATION] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRValueSetDesignation) { $this->addDesignation($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addDesignation(new FHIRValueSetDesignation([FHIRValueSetDesignation::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addDesignation(new FHIRValueSetDesignation([FHIRValueSetDesignation::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addDesignation(new FHIRValueSetDesignation(array_merge($v, $ext[$i]))); + } } else { $this->addDesignation(new FHIRValueSetDesignation($v)); } } } elseif ($data[self::FIELD_DESIGNATION] instanceof FHIRValueSetDesignation) { $this->addDesignation($data[self::FIELD_DESIGNATION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESIGNATION])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_DESIGNATION])) { $this->addDesignation(new FHIRValueSetDesignation([FHIRValueSetDesignation::FIELD_VALUE => $data[self::FIELD_DESIGNATION]] + $ext)); } else { $this->addDesignation(new FHIRValueSetDesignation($data[self::FIELD_DESIGNATION])); @@ -275,8 +292,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DISPLAY] instanceof FHIRString) { $this->setDisplay($data[self::FIELD_DISPLAY]); - } elseif ($ext && is_scalar($data[self::FIELD_DISPLAY])) { - $this->setDisplay(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DISPLAY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DISPLAY])) { + $this->setDisplay(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DISPLAY]] + $ext)); + } else if (is_array($data[self::FIELD_DISPLAY])) { + $this->setDisplay(new FHIRString(array_merge($ext, $data[self::FIELD_DISPLAY]))); + } } else { $this->setDisplay(new FHIRString($data[self::FIELD_DISPLAY])); } @@ -287,8 +308,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_INACTIVE] instanceof FHIRBoolean) { $this->setInactive($data[self::FIELD_INACTIVE]); - } elseif ($ext && is_scalar($data[self::FIELD_INACTIVE])) { - $this->setInactive(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_INACTIVE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_INACTIVE])) { + $this->setInactive(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_INACTIVE]] + $ext)); + } else if (is_array($data[self::FIELD_INACTIVE])) { + $this->setInactive(new FHIRBoolean(array_merge($ext, $data[self::FIELD_INACTIVE]))); + } } else { $this->setInactive(new FHIRBoolean($data[self::FIELD_INACTIVE])); } @@ -299,8 +324,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SYSTEM] instanceof FHIRUri) { $this->setSystem($data[self::FIELD_SYSTEM]); - } elseif ($ext && is_scalar($data[self::FIELD_SYSTEM])) { - $this->setSystem(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_SYSTEM]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SYSTEM])) { + $this->setSystem(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_SYSTEM]] + $ext)); + } else if (is_array($data[self::FIELD_SYSTEM])) { + $this->setSystem(new FHIRUri(array_merge($ext, $data[self::FIELD_SYSTEM]))); + } } else { $this->setSystem(new FHIRUri($data[self::FIELD_SYSTEM])); } @@ -311,8 +340,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VERSION] instanceof FHIRString) { $this->setVersion($data[self::FIELD_VERSION]); - } elseif ($ext && is_scalar($data[self::FIELD_VERSION])) { - $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } else if (is_array($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString(array_merge($ext, $data[self::FIELD_VERSION]))); + } } else { $this->setVersion(new FHIRString($data[self::FIELD_VERSION])); } @@ -810,13 +843,13 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getAbstract())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ABSTRACT, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getContains())) { foreach($vs as $v) { if (null === $v) { @@ -825,7 +858,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_CONTAINS, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getDesignation())) { foreach($vs as $v) { if (null === $v) { @@ -856,34 +888,92 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getAbstract())) { - $a[self::FIELD_ABSTRACT] = $v->getValue(); - $a[self::FIELD_ABSTRACT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ABSTRACT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ABSTRACT_EXT] = $enc; + } + } else { + $a[self::FIELD_ABSTRACT] = $v; + } } if (null !== ($v = $this->getCode())) { - $a[self::FIELD_CODE] = $v->getValue(); - $a[self::FIELD_CODE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CODE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CODE_EXT] = $enc; + } + } else { + $a[self::FIELD_CODE] = $v; + } } if ([] !== ($vs = $this->getContains())) { $a[self::FIELD_CONTAINS] = $vs; } if ([] !== ($vs = $this->getDesignation())) { - $a[self::FIELD_DESIGNATION] = $vs; + $a[self::FIELD_DESIGNATION] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESIGNATION][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESIGNATION_EXT][] = $enc; + } else { + $a[self::FIELD_DESIGNATION_EXT][] = null; + } + } else { + $a[self::FIELD_DESIGNATION][] = $v; + } + } } if (null !== ($v = $this->getDisplay())) { - $a[self::FIELD_DISPLAY] = $v->getValue(); - $a[self::FIELD_DISPLAY_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DISPLAY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DISPLAY_EXT] = $enc; + } + } else { + $a[self::FIELD_DISPLAY] = $v; + } } if (null !== ($v = $this->getInactive())) { - $a[self::FIELD_INACTIVE] = $v->getValue(); - $a[self::FIELD_INACTIVE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_INACTIVE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_INACTIVE_EXT] = $enc; + } + } else { + $a[self::FIELD_INACTIVE] = $v; + } } if (null !== ($v = $this->getSystem())) { - $a[self::FIELD_SYSTEM] = $v->getValue(); - $a[self::FIELD_SYSTEM_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SYSTEM] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SYSTEM_EXT] = $enc; + } + } else { + $a[self::FIELD_SYSTEM] = $v; + } } if (null !== ($v = $this->getVersion())) { - $a[self::FIELD_VERSION] = $v->getValue(); - $a[self::FIELD_VERSION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VERSION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VERSION_EXT] = $enc; + } + } else { + $a[self::FIELD_VERSION] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetDesignation.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetDesignation.php index 0e660476e8..7660ddf6f4 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetDesignation.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetDesignation.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRValueSetDesignation extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_VALUE_SET_DOT_DESIGNATION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_LANGUAGE = 'language'; const FIELD_LANGUAGE_EXT = '_language'; const FIELD_USE = 'use'; @@ -123,6 +119,9 @@ class FHIRValueSetDesignation extends FHIRBackboneElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRValueSetDesignation Constructor * @param null|array $data @@ -149,8 +148,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_LANGUAGE] instanceof FHIRCode) { $this->setLanguage($data[self::FIELD_LANGUAGE]); - } elseif ($ext && is_scalar($data[self::FIELD_LANGUAGE])) { - $this->setLanguage(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_LANGUAGE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_LANGUAGE])) { + $this->setLanguage(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_LANGUAGE]] + $ext)); + } else if (is_array($data[self::FIELD_LANGUAGE])) { + $this->setLanguage(new FHIRCode(array_merge($ext, $data[self::FIELD_LANGUAGE]))); + } } else { $this->setLanguage(new FHIRCode($data[self::FIELD_LANGUAGE])); } @@ -168,8 +171,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE] instanceof FHIRString) { $this->setValue($data[self::FIELD_VALUE]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE])) { - $this->setValue(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VALUE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE])) { + $this->setValue(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VALUE]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE])) { + $this->setValue(new FHIRString(array_merge($ext, $data[self::FIELD_VALUE]))); + } } else { $this->setValue(new FHIRString($data[self::FIELD_VALUE])); } @@ -398,14 +405,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getLanguage())) { $v->xmlSerialize($sxe->addChild(self::FIELD_LANGUAGE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getUse())) { $v->xmlSerialize($sxe->addChild(self::FIELD_USE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getValue())) { + $sxe->addAttribute(self::FIELD_VALUE, (string)$v); $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE, null, $v->_getFHIRXMLNamespace())); } return $sxe; @@ -418,15 +426,29 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getLanguage())) { - $a[self::FIELD_LANGUAGE] = $v->getValue(); - $a[self::FIELD_LANGUAGE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_LANGUAGE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_LANGUAGE_EXT] = $enc; + } + } else { + $a[self::FIELD_LANGUAGE] = $v; + } } if (null !== ($v = $this->getUse())) { $a[self::FIELD_USE] = $v; } if (null !== ($v = $this->getValue())) { - $a[self::FIELD_VALUE] = $v->getValue(); - $a[self::FIELD_VALUE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetExpansion.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetExpansion.php index 8d9587befd..a717970173 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetExpansion.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetExpansion.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRValueSetExpansion extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_VALUE_SET_DOT_EXPANSION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CONTAINS = 'contains'; const FIELD_IDENTIFIER = 'identifier'; const FIELD_IDENTIFIER_EXT = '_identifier'; @@ -167,6 +163,9 @@ class FHIRValueSetExpansion extends FHIRBackboneElement */ protected $total = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRValueSetExpansion Constructor * @param null|array $data @@ -186,6 +185,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CONTAINS])) { if (is_array($data[self::FIELD_CONTAINS])) { foreach($data[self::FIELD_CONTAINS] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRValueSetContains) { $this->addContains($v); } else { @@ -204,8 +206,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IDENTIFIER] instanceof FHIRUri) { $this->setIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { - $this->setIdentifier(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRUri(array_merge($ext, $data[self::FIELD_IDENTIFIER]))); + } } else { $this->setIdentifier(new FHIRUri($data[self::FIELD_IDENTIFIER])); } @@ -216,8 +222,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_OFFSET] instanceof FHIRInteger) { $this->setOffset($data[self::FIELD_OFFSET]); - } elseif ($ext && is_scalar($data[self::FIELD_OFFSET])) { - $this->setOffset(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_OFFSET]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_OFFSET])) { + $this->setOffset(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_OFFSET]] + $ext)); + } else if (is_array($data[self::FIELD_OFFSET])) { + $this->setOffset(new FHIRInteger(array_merge($ext, $data[self::FIELD_OFFSET]))); + } } else { $this->setOffset(new FHIRInteger($data[self::FIELD_OFFSET])); } @@ -225,6 +235,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PARAMETER])) { if (is_array($data[self::FIELD_PARAMETER])) { foreach($data[self::FIELD_PARAMETER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRValueSetParameter) { $this->addParameter($v); } else { @@ -243,8 +256,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TIMESTAMP] instanceof FHIRDateTime) { $this->setTimestamp($data[self::FIELD_TIMESTAMP]); - } elseif ($ext && is_scalar($data[self::FIELD_TIMESTAMP])) { - $this->setTimestamp(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_TIMESTAMP]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TIMESTAMP])) { + $this->setTimestamp(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_TIMESTAMP]] + $ext)); + } else if (is_array($data[self::FIELD_TIMESTAMP])) { + $this->setTimestamp(new FHIRDateTime(array_merge($ext, $data[self::FIELD_TIMESTAMP]))); + } } else { $this->setTimestamp(new FHIRDateTime($data[self::FIELD_TIMESTAMP])); } @@ -255,8 +272,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TOTAL] instanceof FHIRInteger) { $this->setTotal($data[self::FIELD_TOTAL]); - } elseif ($ext && is_scalar($data[self::FIELD_TOTAL])) { - $this->setTotal(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_TOTAL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TOTAL])) { + $this->setTotal(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_TOTAL]] + $ext)); + } else if (is_array($data[self::FIELD_TOTAL])) { + $this->setTotal(new FHIRInteger(array_merge($ext, $data[self::FIELD_TOTAL]))); + } } else { $this->setTotal(new FHIRInteger($data[self::FIELD_TOTAL])); } @@ -687,7 +708,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getOffset())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OFFSET, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getParameter())) { foreach($vs as $v) { if (null === $v) { @@ -715,23 +735,51 @@ public function jsonSerialize() $a[self::FIELD_CONTAINS] = $vs; } if (null !== ($v = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $v->getValue(); - $a[self::FIELD_IDENTIFIER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_IDENTIFIER] = $v; + } } if (null !== ($v = $this->getOffset())) { - $a[self::FIELD_OFFSET] = $v->getValue(); - $a[self::FIELD_OFFSET_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_OFFSET] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_OFFSET_EXT] = $enc; + } + } else { + $a[self::FIELD_OFFSET] = $v; + } } if ([] !== ($vs = $this->getParameter())) { $a[self::FIELD_PARAMETER] = $vs; } if (null !== ($v = $this->getTimestamp())) { - $a[self::FIELD_TIMESTAMP] = $v->getValue(); - $a[self::FIELD_TIMESTAMP_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TIMESTAMP] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TIMESTAMP_EXT] = $enc; + } + } else { + $a[self::FIELD_TIMESTAMP] = $v; + } } if (null !== ($v = $this->getTotal())) { - $a[self::FIELD_TOTAL] = $v->getValue(); - $a[self::FIELD_TOTAL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TOTAL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TOTAL_EXT] = $enc; + } + } else { + $a[self::FIELD_TOTAL] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetFilter.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetFilter.php index a1ec998059..980143cd72 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetFilter.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetFilter.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRValueSetFilter extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_VALUE_SET_DOT_FILTER; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_OP = 'op'; const FIELD_OP_EXT = '_op'; const FIELD_PROPERTY = 'property'; @@ -126,6 +122,9 @@ class FHIRValueSetFilter extends FHIRBackboneElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRValueSetFilter Constructor * @param null|array $data @@ -152,8 +151,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_OP] instanceof FHIRFilterOperator) { $this->setOp($data[self::FIELD_OP]); - } elseif ($ext && is_scalar($data[self::FIELD_OP])) { - $this->setOp(new FHIRFilterOperator([FHIRFilterOperator::FIELD_VALUE => $data[self::FIELD_OP]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_OP])) { + $this->setOp(new FHIRFilterOperator([FHIRFilterOperator::FIELD_VALUE => $data[self::FIELD_OP]] + $ext)); + } else if (is_array($data[self::FIELD_OP])) { + $this->setOp(new FHIRFilterOperator(array_merge($ext, $data[self::FIELD_OP]))); + } } else { $this->setOp(new FHIRFilterOperator($data[self::FIELD_OP])); } @@ -164,8 +167,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PROPERTY] instanceof FHIRCode) { $this->setProperty($data[self::FIELD_PROPERTY]); - } elseif ($ext && is_scalar($data[self::FIELD_PROPERTY])) { - $this->setProperty(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_PROPERTY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PROPERTY])) { + $this->setProperty(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_PROPERTY]] + $ext)); + } else if (is_array($data[self::FIELD_PROPERTY])) { + $this->setProperty(new FHIRCode(array_merge($ext, $data[self::FIELD_PROPERTY]))); + } } else { $this->setProperty(new FHIRCode($data[self::FIELD_PROPERTY])); } @@ -176,8 +183,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE] instanceof FHIRCode) { $this->setValue($data[self::FIELD_VALUE]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE])) { - $this->setValue(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_VALUE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE])) { + $this->setValue(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_VALUE]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE])) { + $this->setValue(new FHIRCode(array_merge($ext, $data[self::FIELD_VALUE]))); + } } else { $this->setValue(new FHIRCode($data[self::FIELD_VALUE])); } @@ -420,6 +431,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_PROPERTY, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getValue())) { + $sxe->addAttribute(self::FIELD_VALUE, (string)$v); $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE, null, $v->_getFHIRXMLNamespace())); } return $sxe; @@ -432,15 +444,37 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getOp())) { - $a[self::FIELD_OP] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_OP] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_OP_EXT] = $enc; + } + } else { + $a[self::FIELD_OP] = $v; + } } if (null !== ($v = $this->getProperty())) { - $a[self::FIELD_PROPERTY] = $v->getValue(); - $a[self::FIELD_PROPERTY_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PROPERTY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PROPERTY_EXT] = $enc; + } + } else { + $a[self::FIELD_PROPERTY] = $v; + } } if (null !== ($v = $this->getValue())) { - $a[self::FIELD_VALUE] = $v->getValue(); - $a[self::FIELD_VALUE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetInclude.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetInclude.php index 1bff94b694..656a55952d 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetInclude.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetInclude.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRValueSetInclude extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_VALUE_SET_DOT_INCLUDE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CONCEPT = 'concept'; const FIELD_FILTER = 'filter'; const FIELD_FILTER_EXT = '_filter'; @@ -147,6 +143,9 @@ class FHIRValueSetInclude extends FHIRBackboneElement */ protected $version = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRValueSetInclude Constructor * @param null|array $data @@ -166,6 +165,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CONCEPT])) { if (is_array($data[self::FIELD_CONCEPT])) { foreach($data[self::FIELD_CONCEPT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRValueSetConcept) { $this->addConcept($v); } else { @@ -184,17 +186,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_FILTER])) { foreach($data[self::FIELD_FILTER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRValueSetFilter) { $this->addFilter($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addFilter(new FHIRValueSetFilter([FHIRValueSetFilter::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addFilter(new FHIRValueSetFilter([FHIRValueSetFilter::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addFilter(new FHIRValueSetFilter(array_merge($v, $ext[$i]))); + } } else { $this->addFilter(new FHIRValueSetFilter($v)); } } } elseif ($data[self::FIELD_FILTER] instanceof FHIRValueSetFilter) { $this->addFilter($data[self::FIELD_FILTER]); - } elseif ($ext && is_scalar($data[self::FIELD_FILTER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_FILTER])) { $this->addFilter(new FHIRValueSetFilter([FHIRValueSetFilter::FIELD_VALUE => $data[self::FIELD_FILTER]] + $ext)); } else { $this->addFilter(new FHIRValueSetFilter($data[self::FIELD_FILTER])); @@ -206,8 +215,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SYSTEM] instanceof FHIRUri) { $this->setSystem($data[self::FIELD_SYSTEM]); - } elseif ($ext && is_scalar($data[self::FIELD_SYSTEM])) { - $this->setSystem(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_SYSTEM]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SYSTEM])) { + $this->setSystem(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_SYSTEM]] + $ext)); + } else if (is_array($data[self::FIELD_SYSTEM])) { + $this->setSystem(new FHIRUri(array_merge($ext, $data[self::FIELD_SYSTEM]))); + } } else { $this->setSystem(new FHIRUri($data[self::FIELD_SYSTEM])); } @@ -218,17 +231,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_VALUE_SET])) { foreach($data[self::FIELD_VALUE_SET] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRUri) { $this->addValueSet($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addValueSet(new FHIRUri([FHIRUri::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addValueSet(new FHIRUri([FHIRUri::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addValueSet(new FHIRUri(array_merge($v, $ext[$i]))); + } } else { $this->addValueSet(new FHIRUri($v)); } } } elseif ($data[self::FIELD_VALUE_SET] instanceof FHIRUri) { $this->addValueSet($data[self::FIELD_VALUE_SET]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_SET])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_VALUE_SET])) { $this->addValueSet(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_VALUE_SET]] + $ext)); } else { $this->addValueSet(new FHIRUri($data[self::FIELD_VALUE_SET])); @@ -240,8 +260,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VERSION] instanceof FHIRString) { $this->setVersion($data[self::FIELD_VERSION]); - } elseif ($ext && is_scalar($data[self::FIELD_VERSION])) { - $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } else if (is_array($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString(array_merge($ext, $data[self::FIELD_VERSION]))); + } } else { $this->setVersion(new FHIRString($data[self::FIELD_VERSION])); } @@ -637,7 +661,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_CONCEPT, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getFilter())) { foreach($vs as $v) { if (null === $v) { @@ -673,11 +696,34 @@ public function jsonSerialize() $a[self::FIELD_CONCEPT] = $vs; } if ([] !== ($vs = $this->getFilter())) { - $a[self::FIELD_FILTER] = $vs; + $a[self::FIELD_FILTER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FILTER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FILTER_EXT][] = $enc; + } else { + $a[self::FIELD_FILTER_EXT][] = null; + } + } else { + $a[self::FIELD_FILTER][] = $v; + } + } } if (null !== ($v = $this->getSystem())) { - $a[self::FIELD_SYSTEM] = $v->getValue(); - $a[self::FIELD_SYSTEM_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SYSTEM] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SYSTEM_EXT] = $enc; + } + } else { + $a[self::FIELD_SYSTEM] = $v; + } } if ([] !== ($vs = $this->getValueSet())) { $a[self::FIELD_VALUE_SET] = []; @@ -685,13 +731,29 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_VALUE_SET][] = $v->getValue(); - $a[self::FIELD_VALUE_SET_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_SET][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_SET_EXT][] = $enc; + } else { + $a[self::FIELD_VALUE_SET_EXT][] = null; + } + } else { + $a[self::FIELD_VALUE_SET][] = $v; + } } } if (null !== ($v = $this->getVersion())) { - $a[self::FIELD_VERSION] = $v->getValue(); - $a[self::FIELD_VERSION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VERSION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VERSION_EXT] = $enc; + } + } else { + $a[self::FIELD_VERSION] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetParameter.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetParameter.php index 7a6f8ffa83..e700dafe5a 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetParameter.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetParameter.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -82,10 +82,6 @@ class FHIRValueSetParameter extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_VALUE_SET_DOT_PARAMETER; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_NAME = 'name'; const FIELD_NAME_EXT = '_name'; const FIELD_VALUE_BOOLEAN = 'valueBoolean'; @@ -179,6 +175,9 @@ class FHIRValueSetParameter extends FHIRBackboneElement */ protected $valueUri = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRValueSetParameter Constructor * @param null|array $data @@ -201,8 +200,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -213,8 +216,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_BOOLEAN] instanceof FHIRBoolean) { $this->setValueBoolean($data[self::FIELD_VALUE_BOOLEAN]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_BOOLEAN])) { - $this->setValueBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_VALUE_BOOLEAN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_BOOLEAN])) { + $this->setValueBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_VALUE_BOOLEAN]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_BOOLEAN])) { + $this->setValueBoolean(new FHIRBoolean(array_merge($ext, $data[self::FIELD_VALUE_BOOLEAN]))); + } } else { $this->setValueBoolean(new FHIRBoolean($data[self::FIELD_VALUE_BOOLEAN])); } @@ -225,8 +232,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_CODE] instanceof FHIRCode) { $this->setValueCode($data[self::FIELD_VALUE_CODE]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_CODE])) { - $this->setValueCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_VALUE_CODE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_CODE])) { + $this->setValueCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_VALUE_CODE]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_CODE])) { + $this->setValueCode(new FHIRCode(array_merge($ext, $data[self::FIELD_VALUE_CODE]))); + } } else { $this->setValueCode(new FHIRCode($data[self::FIELD_VALUE_CODE])); } @@ -237,8 +248,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_DECIMAL] instanceof FHIRDecimal) { $this->setValueDecimal($data[self::FIELD_VALUE_DECIMAL]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_DECIMAL])) { - $this->setValueDecimal(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_VALUE_DECIMAL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_DECIMAL])) { + $this->setValueDecimal(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_VALUE_DECIMAL]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_DECIMAL])) { + $this->setValueDecimal(new FHIRDecimal(array_merge($ext, $data[self::FIELD_VALUE_DECIMAL]))); + } } else { $this->setValueDecimal(new FHIRDecimal($data[self::FIELD_VALUE_DECIMAL])); } @@ -249,8 +264,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_INTEGER] instanceof FHIRInteger) { $this->setValueInteger($data[self::FIELD_VALUE_INTEGER]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_INTEGER])) { - $this->setValueInteger(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_VALUE_INTEGER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_INTEGER])) { + $this->setValueInteger(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_VALUE_INTEGER]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_INTEGER])) { + $this->setValueInteger(new FHIRInteger(array_merge($ext, $data[self::FIELD_VALUE_INTEGER]))); + } } else { $this->setValueInteger(new FHIRInteger($data[self::FIELD_VALUE_INTEGER])); } @@ -261,8 +280,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_STRING] instanceof FHIRString) { $this->setValueString($data[self::FIELD_VALUE_STRING]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_STRING])) { - $this->setValueString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VALUE_STRING]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_STRING])) { + $this->setValueString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VALUE_STRING]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_STRING])) { + $this->setValueString(new FHIRString(array_merge($ext, $data[self::FIELD_VALUE_STRING]))); + } } else { $this->setValueString(new FHIRString($data[self::FIELD_VALUE_STRING])); } @@ -273,8 +296,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_URI] instanceof FHIRUri) { $this->setValueUri($data[self::FIELD_VALUE_URI]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_URI])) { - $this->setValueUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_VALUE_URI]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_URI])) { + $this->setValueUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_VALUE_URI]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_URI])) { + $this->setValueUri(new FHIRUri(array_merge($ext, $data[self::FIELD_VALUE_URI]))); + } } else { $this->setValueUri(new FHIRUri($data[self::FIELD_VALUE_URI])); } @@ -690,6 +717,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NAME, null, $v->_getFHIRXMLNamespace())); } @@ -721,32 +749,81 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if (null !== ($v = $this->getValueBoolean())) { - $a[self::FIELD_VALUE_BOOLEAN] = $v->getValue(); - $a[self::FIELD_VALUE_BOOLEAN_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_BOOLEAN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_BOOLEAN_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_BOOLEAN] = $v; + } } if (null !== ($v = $this->getValueCode())) { - $a[self::FIELD_VALUE_CODE] = $v->getValue(); - $a[self::FIELD_VALUE_CODE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_CODE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_CODE_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_CODE] = $v; + } } if (null !== ($v = $this->getValueDecimal())) { - $a[self::FIELD_VALUE_DECIMAL] = $v->getValue(); - $a[self::FIELD_VALUE_DECIMAL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_DECIMAL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_DECIMAL_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_DECIMAL] = $v; + } } if (null !== ($v = $this->getValueInteger())) { - $a[self::FIELD_VALUE_INTEGER] = $v->getValue(); - $a[self::FIELD_VALUE_INTEGER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_INTEGER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_INTEGER_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_INTEGER] = $v; + } } if (null !== ($v = $this->getValueString())) { - $a[self::FIELD_VALUE_STRING] = $v->getValue(); - $a[self::FIELD_VALUE_STRING_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_STRING] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_STRING_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_STRING] = $v; + } } if (null !== ($v = $this->getValueUri())) { - $a[self::FIELD_VALUE_URI] = $v->getValue(); - $a[self::FIELD_VALUE_URI_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_URI] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_URI_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_URI] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRVisionPrescription/FHIRVisionPrescriptionDispense.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRVisionPrescription/FHIRVisionPrescriptionDispense.php index 7ff63eb309..5d24f15602 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRVisionPrescription/FHIRVisionPrescriptionDispense.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBackboneElement/FHIRVisionPrescription/FHIRVisionPrescriptionDispense.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -84,10 +84,6 @@ class FHIRVisionPrescriptionDispense extends FHIRBackboneElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_VISION_PRESCRIPTION_DOT_DISPENSE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ADD = 'add'; const FIELD_ADD_EXT = '_add'; const FIELD_AXIS = 'axis'; @@ -292,6 +288,9 @@ class FHIRVisionPrescriptionDispense extends FHIRBackboneElement */ protected $sphere = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRVisionPrescriptionDispense Constructor * @param null|array $data @@ -314,8 +313,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ADD] instanceof FHIRDecimal) { $this->setAdd($data[self::FIELD_ADD]); - } elseif ($ext && is_scalar($data[self::FIELD_ADD])) { - $this->setAdd(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_ADD]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ADD])) { + $this->setAdd(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_ADD]] + $ext)); + } else if (is_array($data[self::FIELD_ADD])) { + $this->setAdd(new FHIRDecimal(array_merge($ext, $data[self::FIELD_ADD]))); + } } else { $this->setAdd(new FHIRDecimal($data[self::FIELD_ADD])); } @@ -326,8 +329,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_AXIS] instanceof FHIRInteger) { $this->setAxis($data[self::FIELD_AXIS]); - } elseif ($ext && is_scalar($data[self::FIELD_AXIS])) { - $this->setAxis(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_AXIS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_AXIS])) { + $this->setAxis(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_AXIS]] + $ext)); + } else if (is_array($data[self::FIELD_AXIS])) { + $this->setAxis(new FHIRInteger(array_merge($ext, $data[self::FIELD_AXIS]))); + } } else { $this->setAxis(new FHIRInteger($data[self::FIELD_AXIS])); } @@ -338,8 +345,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_BACK_CURVE] instanceof FHIRDecimal) { $this->setBackCurve($data[self::FIELD_BACK_CURVE]); - } elseif ($ext && is_scalar($data[self::FIELD_BACK_CURVE])) { - $this->setBackCurve(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_BACK_CURVE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_BACK_CURVE])) { + $this->setBackCurve(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_BACK_CURVE]] + $ext)); + } else if (is_array($data[self::FIELD_BACK_CURVE])) { + $this->setBackCurve(new FHIRDecimal(array_merge($ext, $data[self::FIELD_BACK_CURVE]))); + } } else { $this->setBackCurve(new FHIRDecimal($data[self::FIELD_BACK_CURVE])); } @@ -350,8 +361,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_BASE] instanceof FHIRVisionBase) { $this->setBase($data[self::FIELD_BASE]); - } elseif ($ext && is_scalar($data[self::FIELD_BASE])) { - $this->setBase(new FHIRVisionBase([FHIRVisionBase::FIELD_VALUE => $data[self::FIELD_BASE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_BASE])) { + $this->setBase(new FHIRVisionBase([FHIRVisionBase::FIELD_VALUE => $data[self::FIELD_BASE]] + $ext)); + } else if (is_array($data[self::FIELD_BASE])) { + $this->setBase(new FHIRVisionBase(array_merge($ext, $data[self::FIELD_BASE]))); + } } else { $this->setBase(new FHIRVisionBase($data[self::FIELD_BASE])); } @@ -362,8 +377,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_BRAND] instanceof FHIRString) { $this->setBrand($data[self::FIELD_BRAND]); - } elseif ($ext && is_scalar($data[self::FIELD_BRAND])) { - $this->setBrand(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_BRAND]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_BRAND])) { + $this->setBrand(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_BRAND]] + $ext)); + } else if (is_array($data[self::FIELD_BRAND])) { + $this->setBrand(new FHIRString(array_merge($ext, $data[self::FIELD_BRAND]))); + } } else { $this->setBrand(new FHIRString($data[self::FIELD_BRAND])); } @@ -374,8 +393,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_COLOR] instanceof FHIRString) { $this->setColor($data[self::FIELD_COLOR]); - } elseif ($ext && is_scalar($data[self::FIELD_COLOR])) { - $this->setColor(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_COLOR]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_COLOR])) { + $this->setColor(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_COLOR]] + $ext)); + } else if (is_array($data[self::FIELD_COLOR])) { + $this->setColor(new FHIRString(array_merge($ext, $data[self::FIELD_COLOR]))); + } } else { $this->setColor(new FHIRString($data[self::FIELD_COLOR])); } @@ -386,8 +409,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CYLINDER] instanceof FHIRDecimal) { $this->setCylinder($data[self::FIELD_CYLINDER]); - } elseif ($ext && is_scalar($data[self::FIELD_CYLINDER])) { - $this->setCylinder(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_CYLINDER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CYLINDER])) { + $this->setCylinder(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_CYLINDER]] + $ext)); + } else if (is_array($data[self::FIELD_CYLINDER])) { + $this->setCylinder(new FHIRDecimal(array_merge($ext, $data[self::FIELD_CYLINDER]))); + } } else { $this->setCylinder(new FHIRDecimal($data[self::FIELD_CYLINDER])); } @@ -398,8 +425,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DIAMETER] instanceof FHIRDecimal) { $this->setDiameter($data[self::FIELD_DIAMETER]); - } elseif ($ext && is_scalar($data[self::FIELD_DIAMETER])) { - $this->setDiameter(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_DIAMETER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DIAMETER])) { + $this->setDiameter(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_DIAMETER]] + $ext)); + } else if (is_array($data[self::FIELD_DIAMETER])) { + $this->setDiameter(new FHIRDecimal(array_merge($ext, $data[self::FIELD_DIAMETER]))); + } } else { $this->setDiameter(new FHIRDecimal($data[self::FIELD_DIAMETER])); } @@ -410,8 +441,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DURATION] instanceof FHIRQuantity) { $this->setDuration($data[self::FIELD_DURATION]); - } elseif ($ext && is_scalar($data[self::FIELD_DURATION])) { - $this->setDuration(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_DURATION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DURATION])) { + $this->setDuration(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_DURATION]] + $ext)); + } else if (is_array($data[self::FIELD_DURATION])) { + $this->setDuration(new FHIRQuantity(array_merge($ext, $data[self::FIELD_DURATION]))); + } } else { $this->setDuration(new FHIRQuantity($data[self::FIELD_DURATION])); } @@ -422,8 +457,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EYE] instanceof FHIRVisionEyes) { $this->setEye($data[self::FIELD_EYE]); - } elseif ($ext && is_scalar($data[self::FIELD_EYE])) { - $this->setEye(new FHIRVisionEyes([FHIRVisionEyes::FIELD_VALUE => $data[self::FIELD_EYE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EYE])) { + $this->setEye(new FHIRVisionEyes([FHIRVisionEyes::FIELD_VALUE => $data[self::FIELD_EYE]] + $ext)); + } else if (is_array($data[self::FIELD_EYE])) { + $this->setEye(new FHIRVisionEyes(array_merge($ext, $data[self::FIELD_EYE]))); + } } else { $this->setEye(new FHIRVisionEyes($data[self::FIELD_EYE])); } @@ -431,6 +470,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_NOTE])) { if (is_array($data[self::FIELD_NOTE])) { foreach($data[self::FIELD_NOTE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRAnnotation) { $this->addNote($v); } else { @@ -449,8 +491,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_POWER] instanceof FHIRDecimal) { $this->setPower($data[self::FIELD_POWER]); - } elseif ($ext && is_scalar($data[self::FIELD_POWER])) { - $this->setPower(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_POWER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_POWER])) { + $this->setPower(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_POWER]] + $ext)); + } else if (is_array($data[self::FIELD_POWER])) { + $this->setPower(new FHIRDecimal(array_merge($ext, $data[self::FIELD_POWER]))); + } } else { $this->setPower(new FHIRDecimal($data[self::FIELD_POWER])); } @@ -461,8 +507,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PRISM] instanceof FHIRDecimal) { $this->setPrism($data[self::FIELD_PRISM]); - } elseif ($ext && is_scalar($data[self::FIELD_PRISM])) { - $this->setPrism(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_PRISM]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PRISM])) { + $this->setPrism(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_PRISM]] + $ext)); + } else if (is_array($data[self::FIELD_PRISM])) { + $this->setPrism(new FHIRDecimal(array_merge($ext, $data[self::FIELD_PRISM]))); + } } else { $this->setPrism(new FHIRDecimal($data[self::FIELD_PRISM])); } @@ -480,8 +530,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SPHERE] instanceof FHIRDecimal) { $this->setSphere($data[self::FIELD_SPHERE]); - } elseif ($ext && is_scalar($data[self::FIELD_SPHERE])) { - $this->setSphere(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_SPHERE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SPHERE])) { + $this->setSphere(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_SPHERE]] + $ext)); + } else if (is_array($data[self::FIELD_SPHERE])) { + $this->setSphere(new FHIRDecimal(array_merge($ext, $data[self::FIELD_SPHERE]))); + } } else { $this->setSphere(new FHIRDecimal($data[self::FIELD_SPHERE])); } @@ -1241,6 +1295,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getAdd())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ADD, null, $v->_getFHIRXMLNamespace())); } @@ -1250,7 +1305,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getBackCurve())) { $v->xmlSerialize($sxe->addChild(self::FIELD_BACK_CURVE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getBase())) { $v->xmlSerialize($sxe->addChild(self::FIELD_BASE, null, $v->_getFHIRXMLNamespace())); } @@ -1266,15 +1320,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDiameter())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DIAMETER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDuration())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DURATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getEye())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EYE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getNote())) { foreach($vs as $v) { if (null === $v) { @@ -1289,7 +1340,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getPrism())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PRISM, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getProduct())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PRODUCT, null, $v->_getFHIRXMLNamespace())); } @@ -1306,59 +1356,153 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getAdd())) { - $a[self::FIELD_ADD] = $v->getValue(); - $a[self::FIELD_ADD_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ADD] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ADD_EXT] = $enc; + } + } else { + $a[self::FIELD_ADD] = $v; + } } if (null !== ($v = $this->getAxis())) { - $a[self::FIELD_AXIS] = $v->getValue(); - $a[self::FIELD_AXIS_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_AXIS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_AXIS_EXT] = $enc; + } + } else { + $a[self::FIELD_AXIS] = $v; + } } if (null !== ($v = $this->getBackCurve())) { - $a[self::FIELD_BACK_CURVE] = $v->getValue(); - $a[self::FIELD_BACK_CURVE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_BACK_CURVE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_BACK_CURVE_EXT] = $enc; + } + } else { + $a[self::FIELD_BACK_CURVE] = $v; + } } if (null !== ($v = $this->getBase())) { - $a[self::FIELD_BASE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_BASE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_BASE_EXT] = $enc; + } + } else { + $a[self::FIELD_BASE] = $v; + } } if (null !== ($v = $this->getBrand())) { - $a[self::FIELD_BRAND] = $v->getValue(); - $a[self::FIELD_BRAND_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_BRAND] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_BRAND_EXT] = $enc; + } + } else { + $a[self::FIELD_BRAND] = $v; + } } if (null !== ($v = $this->getColor())) { - $a[self::FIELD_COLOR] = $v->getValue(); - $a[self::FIELD_COLOR_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_COLOR] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_COLOR_EXT] = $enc; + } + } else { + $a[self::FIELD_COLOR] = $v; + } } if (null !== ($v = $this->getCylinder())) { - $a[self::FIELD_CYLINDER] = $v->getValue(); - $a[self::FIELD_CYLINDER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CYLINDER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CYLINDER_EXT] = $enc; + } + } else { + $a[self::FIELD_CYLINDER] = $v; + } } if (null !== ($v = $this->getDiameter())) { - $a[self::FIELD_DIAMETER] = $v->getValue(); - $a[self::FIELD_DIAMETER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DIAMETER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DIAMETER_EXT] = $enc; + } + } else { + $a[self::FIELD_DIAMETER] = $v; + } } if (null !== ($v = $this->getDuration())) { - $a[self::FIELD_DURATION] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DURATION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DURATION_EXT] = $enc; + } + } else { + $a[self::FIELD_DURATION] = $v; + } } if (null !== ($v = $this->getEye())) { - $a[self::FIELD_EYE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EYE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EYE_EXT] = $enc; + } + } else { + $a[self::FIELD_EYE] = $v; + } } if ([] !== ($vs = $this->getNote())) { $a[self::FIELD_NOTE] = $vs; } if (null !== ($v = $this->getPower())) { - $a[self::FIELD_POWER] = $v->getValue(); - $a[self::FIELD_POWER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_POWER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_POWER_EXT] = $enc; + } + } else { + $a[self::FIELD_POWER] = $v; + } } if (null !== ($v = $this->getPrism())) { - $a[self::FIELD_PRISM] = $v->getValue(); - $a[self::FIELD_PRISM_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PRISM] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PRISM_EXT] = $enc; + } + } else { + $a[self::FIELD_PRISM] = $v; + } } if (null !== ($v = $this->getProduct())) { $a[self::FIELD_PRODUCT] = $v; } if (null !== ($v = $this->getSphere())) { - $a[self::FIELD_SPHERE] = $v->getValue(); - $a[self::FIELD_SPHERE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SPHERE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SPHERE_EXT] = $enc; + } + } else { + $a[self::FIELD_SPHERE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBase64Binary.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBase64Binary.php index c25f20da59..9574802f68 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBase64Binary.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBase64Binary.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRBase64Binary extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_BASE_64BINARY; - - /** @var string */ - protected $_xmlns = ''; - const FIELD_VALUE = 'value'; /** @@ -90,6 +86,8 @@ class FHIRBase64Binary extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; /** * FHIRBase64Binary Constructor diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBindingStrength.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBindingStrength.php index e80f6e3b4c..16baf86bad 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBindingStrength.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBindingStrength.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRBindingStrength extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_BINDING_STRENGTH; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRBindingStrength extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRBindingStrength Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBoolean.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBoolean.php index 8fe74064ef..36e1154118 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBoolean.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBoolean.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRBoolean extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_BOOLEAN; - - /** @var string */ - protected $_xmlns = ''; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,8 @@ class FHIRBoolean extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; /** * FHIRBoolean Constructor diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBundleType.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBundleType.php index b4e1d746be..c5d02cc394 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBundleType.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRBundleType.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRBundleType extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_BUNDLE_TYPE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRBundleType extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRBundleType Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRCapabilityStatementKind.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRCapabilityStatementKind.php index 5065958b65..aed6d3d1b2 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRCapabilityStatementKind.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRCapabilityStatementKind.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRCapabilityStatementKind extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CAPABILITY_STATEMENT_KIND; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRCapabilityStatementKind extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRCapabilityStatementKind Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRCarePlanActivityStatus.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRCarePlanActivityStatus.php index bf9db60b50..b7121a76ab 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRCarePlanActivityStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRCarePlanActivityStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRCarePlanActivityStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CARE_PLAN_ACTIVITY_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRCarePlanActivityStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRCarePlanActivityStatus Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRCarePlanIntent.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRCarePlanIntent.php index 134e645bf0..e56c0bd312 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRCarePlanIntent.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRCarePlanIntent.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRCarePlanIntent extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CARE_PLAN_INTENT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -90,6 +86,9 @@ class FHIRCarePlanIntent extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRCarePlanIntent Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRCarePlanStatus.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRCarePlanStatus.php index 1f39330fc0..4bc053d4dc 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRCarePlanStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRCarePlanStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRCarePlanStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CARE_PLAN_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -90,6 +86,9 @@ class FHIRCarePlanStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRCarePlanStatus Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRCareTeamStatus.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRCareTeamStatus.php index f5c1c3270d..15cbbe6449 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRCareTeamStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRCareTeamStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRCareTeamStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CARE_TEAM_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRCareTeamStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRCareTeamStatus Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRChargeItemStatus.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRChargeItemStatus.php index c26c80a160..1b3b7da17a 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRChargeItemStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRChargeItemStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRChargeItemStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CHARGE_ITEM_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRChargeItemStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRChargeItemStatus Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRClinicalImpressionStatus.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRClinicalImpressionStatus.php index 1d0bd69d64..3f7009cb53 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRClinicalImpressionStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRClinicalImpressionStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRClinicalImpressionStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CLINICAL_IMPRESSION_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRClinicalImpressionStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRClinicalImpressionStatus Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRCode.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRCode.php index 13022a2219..8bf8853010 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRCode.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRCode.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRCode extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CODE; - - /** @var string */ - protected $_xmlns = ''; - const FIELD_VALUE = 'value'; /** @@ -91,6 +87,8 @@ class FHIRCode extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; /** * FHIRCode Constructor diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRCodeSystemContentMode.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRCodeSystemContentMode.php index 0ce810867a..6b56e185a5 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRCodeSystemContentMode.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRCodeSystemContentMode.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRCodeSystemContentMode extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CODE_SYSTEM_CONTENT_MODE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -90,6 +86,9 @@ class FHIRCodeSystemContentMode extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRCodeSystemContentMode Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRCodeSystemHierarchyMeaning.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRCodeSystemHierarchyMeaning.php index 4099d237ff..c21caa66e4 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRCodeSystemHierarchyMeaning.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRCodeSystemHierarchyMeaning.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRCodeSystemHierarchyMeaning extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CODE_SYSTEM_HIERARCHY_MEANING; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRCodeSystemHierarchyMeaning extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRCodeSystemHierarchyMeaning Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRCodeableConcept.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRCodeableConcept.php index 89f43b008b..2c1c974d7c 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRCodeableConcept.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRCodeableConcept.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRCodeableConcept extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CODEABLE_CONCEPT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CODING = 'coding'; const FIELD_TEXT = 'text'; const FIELD_TEXT_EXT = '_text'; @@ -111,6 +107,9 @@ class FHIRCodeableConcept extends FHIRElement */ protected $text = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRCodeableConcept Constructor * @param null|array $data @@ -130,6 +129,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CODING])) { if (is_array($data[self::FIELD_CODING])) { foreach($data[self::FIELD_CODING] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCoding) { $this->addCoding($v); } else { @@ -148,8 +150,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TEXT] instanceof FHIRString) { $this->setText($data[self::FIELD_TEXT]); - } elseif ($ext && is_scalar($data[self::FIELD_TEXT])) { - $this->setText(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TEXT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TEXT])) { + $this->setText(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TEXT]] + $ext)); + } else if (is_array($data[self::FIELD_TEXT])) { + $this->setText(new FHIRString(array_merge($ext, $data[self::FIELD_TEXT]))); + } } else { $this->setText(new FHIRString($data[self::FIELD_TEXT])); } @@ -389,8 +395,15 @@ public function jsonSerialize() $a[self::FIELD_CODING] = $vs; } if (null !== ($v = $this->getText())) { - $a[self::FIELD_TEXT] = $v->getValue(); - $a[self::FIELD_TEXT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TEXT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TEXT_EXT] = $enc; + } + } else { + $a[self::FIELD_TEXT] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRCoding.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRCoding.php index 3fcf9c746c..3b0d318baf 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRCoding.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRCoding.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRCoding extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CODING; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CODE = 'code'; const FIELD_CODE_EXT = '_code'; const FIELD_DISPLAY = 'display'; @@ -156,6 +152,9 @@ class FHIRCoding extends FHIRElement */ protected $version = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRCoding Constructor * @param null|array $data @@ -178,8 +177,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CODE] instanceof FHIRCode) { $this->setCode($data[self::FIELD_CODE]); - } elseif ($ext && is_scalar($data[self::FIELD_CODE])) { - $this->setCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_CODE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CODE])) { + $this->setCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_CODE]] + $ext)); + } else if (is_array($data[self::FIELD_CODE])) { + $this->setCode(new FHIRCode(array_merge($ext, $data[self::FIELD_CODE]))); + } } else { $this->setCode(new FHIRCode($data[self::FIELD_CODE])); } @@ -190,8 +193,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DISPLAY] instanceof FHIRString) { $this->setDisplay($data[self::FIELD_DISPLAY]); - } elseif ($ext && is_scalar($data[self::FIELD_DISPLAY])) { - $this->setDisplay(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DISPLAY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DISPLAY])) { + $this->setDisplay(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DISPLAY]] + $ext)); + } else if (is_array($data[self::FIELD_DISPLAY])) { + $this->setDisplay(new FHIRString(array_merge($ext, $data[self::FIELD_DISPLAY]))); + } } else { $this->setDisplay(new FHIRString($data[self::FIELD_DISPLAY])); } @@ -202,8 +209,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SYSTEM] instanceof FHIRUri) { $this->setSystem($data[self::FIELD_SYSTEM]); - } elseif ($ext && is_scalar($data[self::FIELD_SYSTEM])) { - $this->setSystem(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_SYSTEM]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SYSTEM])) { + $this->setSystem(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_SYSTEM]] + $ext)); + } else if (is_array($data[self::FIELD_SYSTEM])) { + $this->setSystem(new FHIRUri(array_merge($ext, $data[self::FIELD_SYSTEM]))); + } } else { $this->setSystem(new FHIRUri($data[self::FIELD_SYSTEM])); } @@ -214,8 +225,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_USER_SELECTED] instanceof FHIRBoolean) { $this->setUserSelected($data[self::FIELD_USER_SELECTED]); - } elseif ($ext && is_scalar($data[self::FIELD_USER_SELECTED])) { - $this->setUserSelected(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_USER_SELECTED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_USER_SELECTED])) { + $this->setUserSelected(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_USER_SELECTED]] + $ext)); + } else if (is_array($data[self::FIELD_USER_SELECTED])) { + $this->setUserSelected(new FHIRBoolean(array_merge($ext, $data[self::FIELD_USER_SELECTED]))); + } } else { $this->setUserSelected(new FHIRBoolean($data[self::FIELD_USER_SELECTED])); } @@ -226,8 +241,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VERSION] instanceof FHIRString) { $this->setVersion($data[self::FIELD_VERSION]); - } elseif ($ext && is_scalar($data[self::FIELD_VERSION])) { - $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } else if (is_array($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString(array_merge($ext, $data[self::FIELD_VERSION]))); + } } else { $this->setVersion(new FHIRString($data[self::FIELD_VERSION])); } @@ -569,6 +588,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } @@ -594,24 +614,59 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getCode())) { - $a[self::FIELD_CODE] = $v->getValue(); - $a[self::FIELD_CODE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CODE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CODE_EXT] = $enc; + } + } else { + $a[self::FIELD_CODE] = $v; + } } if (null !== ($v = $this->getDisplay())) { - $a[self::FIELD_DISPLAY] = $v->getValue(); - $a[self::FIELD_DISPLAY_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DISPLAY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DISPLAY_EXT] = $enc; + } + } else { + $a[self::FIELD_DISPLAY] = $v; + } } if (null !== ($v = $this->getSystem())) { - $a[self::FIELD_SYSTEM] = $v->getValue(); - $a[self::FIELD_SYSTEM_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SYSTEM] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SYSTEM_EXT] = $enc; + } + } else { + $a[self::FIELD_SYSTEM] = $v; + } } if (null !== ($v = $this->getUserSelected())) { - $a[self::FIELD_USER_SELECTED] = $v->getValue(); - $a[self::FIELD_USER_SELECTED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_USER_SELECTED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_USER_SELECTED_EXT] = $enc; + } + } else { + $a[self::FIELD_USER_SELECTED] = $v; + } } if (null !== ($v = $this->getVersion())) { - $a[self::FIELD_VERSION] = $v->getValue(); - $a[self::FIELD_VERSION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VERSION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VERSION_EXT] = $enc; + } + } else { + $a[self::FIELD_VERSION] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRCompartmentType.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRCompartmentType.php index 9fd0b852a4..5c7941f4ef 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRCompartmentType.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRCompartmentType.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRCompartmentType extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_COMPARTMENT_TYPE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRCompartmentType extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRCompartmentType Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRCompositionAttestationMode.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRCompositionAttestationMode.php index d0730bc638..a8cfc0dd86 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRCompositionAttestationMode.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRCompositionAttestationMode.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRCompositionAttestationMode extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_COMPOSITION_ATTESTATION_MODE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRCompositionAttestationMode extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRCompositionAttestationMode Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRCompositionStatus.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRCompositionStatus.php index 9449f60f4b..fe81027c08 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRCompositionStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRCompositionStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRCompositionStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_COMPOSITION_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRCompositionStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRCompositionStatus Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRConceptMapEquivalence.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRConceptMapEquivalence.php index cf1ae32d28..74065070dc 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRConceptMapEquivalence.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRConceptMapEquivalence.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -77,10 +77,6 @@ class FHIRConceptMapEquivalence extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONCEPT_MAP_EQUIVALENCE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -88,6 +84,9 @@ class FHIRConceptMapEquivalence extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRConceptMapEquivalence Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRConceptMapGroupUnmappedMode.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRConceptMapGroupUnmappedMode.php index 13793965d3..4c5ee50047 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRConceptMapGroupUnmappedMode.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRConceptMapGroupUnmappedMode.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRConceptMapGroupUnmappedMode extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONCEPT_MAP_GROUP_UNMAPPED_MODE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRConceptMapGroupUnmappedMode extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRConceptMapGroupUnmappedMode Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRConditionClinicalStatusCodes.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRConditionClinicalStatusCodes.php index 1a21d57255..b410840287 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRConditionClinicalStatusCodes.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRConditionClinicalStatusCodes.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRConditionClinicalStatusCodes extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONDITION_CLINICAL_STATUS_CODES; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRConditionClinicalStatusCodes extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRConditionClinicalStatusCodes Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRConditionVerificationStatus.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRConditionVerificationStatus.php index 9ba30f714a..62295b1af1 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRConditionVerificationStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRConditionVerificationStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRConditionVerificationStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONDITION_VERIFICATION_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -90,6 +86,9 @@ class FHIRConditionVerificationStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRConditionVerificationStatus Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRConditionalDeleteStatus.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRConditionalDeleteStatus.php index a1f4f0b2de..bb54bb345f 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRConditionalDeleteStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRConditionalDeleteStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRConditionalDeleteStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONDITIONAL_DELETE_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRConditionalDeleteStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRConditionalDeleteStatus Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRConditionalReadStatus.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRConditionalReadStatus.php index 0b73ff8b8e..ad338c436f 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRConditionalReadStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRConditionalReadStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRConditionalReadStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONDITIONAL_READ_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRConditionalReadStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRConditionalReadStatus Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRConfidentialityClassification.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRConfidentialityClassification.php index f8379a18f6..265ed2fd91 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRConfidentialityClassification.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRConfidentialityClassification.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRConfidentialityClassification extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONFIDENTIALITY_CLASSIFICATION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRConfidentialityClassification extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRConfidentialityClassification Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRConsentDataMeaning.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRConsentDataMeaning.php index ab1fb952ec..fa6e6d4243 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRConsentDataMeaning.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRConsentDataMeaning.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRConsentDataMeaning extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONSENT_DATA_MEANING; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRConsentDataMeaning extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRConsentDataMeaning Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRConsentExceptType.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRConsentExceptType.php index 8eb45ffaa0..5a284b114a 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRConsentExceptType.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRConsentExceptType.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRConsentExceptType extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONSENT_EXCEPT_TYPE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -90,6 +86,9 @@ class FHIRConsentExceptType extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRConsentExceptType Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRConsentState.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRConsentState.php index 7fae136793..54d1cbdae9 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRConsentState.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRConsentState.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRConsentState extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONSENT_STATE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRConsentState extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRConsentState Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRConstraintSeverity.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRConstraintSeverity.php index 5bfba18bdf..31e8245484 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRConstraintSeverity.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRConstraintSeverity.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRConstraintSeverity extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONSTRAINT_SEVERITY; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRConstraintSeverity extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRConstraintSeverity Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRContactDetail.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRContactDetail.php index 101416af82..bff8199d3d 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRContactDetail.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRContactDetail.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRContactDetail extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONTACT_DETAIL; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_NAME = 'name'; const FIELD_NAME_EXT = '_name'; const FIELD_TELECOM = 'telecom'; @@ -111,6 +107,9 @@ class FHIRContactDetail extends FHIRElement */ protected $telecom = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRContactDetail Constructor * @param null|array $data @@ -133,8 +132,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -145,17 +148,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_TELECOM])) { foreach($data[self::FIELD_TELECOM] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContactPoint) { $this->addTelecom($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addTelecom(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addTelecom(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addTelecom(new FHIRContactPoint(array_merge($v, $ext[$i]))); + } } else { $this->addTelecom(new FHIRContactPoint($v)); } } } elseif ($data[self::FIELD_TELECOM] instanceof FHIRContactPoint) { $this->addTelecom($data[self::FIELD_TELECOM]); - } elseif ($ext && is_scalar($data[self::FIELD_TELECOM])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_TELECOM])) { $this->addTelecom(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $data[self::FIELD_TELECOM]] + $ext)); } else { $this->addTelecom(new FHIRContactPoint($data[self::FIELD_TELECOM])); @@ -373,10 +383,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NAME, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getTelecom())) { foreach($vs as $v) { if (null === $v) { @@ -395,11 +405,34 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if ([] !== ($vs = $this->getTelecom())) { - $a[self::FIELD_TELECOM] = $vs; + $a[self::FIELD_TELECOM] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TELECOM][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TELECOM_EXT][] = $enc; + } else { + $a[self::FIELD_TELECOM_EXT][] = null; + } + } else { + $a[self::FIELD_TELECOM][] = $v; + } + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRContactPoint.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRContactPoint.php index 5f44624081..4d46448154 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRContactPoint.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRContactPoint.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRContactPoint extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONTACT_POINT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_PERIOD = 'period'; const FIELD_RANK = 'rank'; const FIELD_RANK_EXT = '_rank'; @@ -149,6 +145,9 @@ class FHIRContactPoint extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRContactPoint Constructor * @param null|array $data @@ -182,8 +181,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_RANK] instanceof FHIRPositiveInt) { $this->setRank($data[self::FIELD_RANK]); - } elseif ($ext && is_scalar($data[self::FIELD_RANK])) { - $this->setRank(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_RANK]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_RANK])) { + $this->setRank(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_RANK]] + $ext)); + } else if (is_array($data[self::FIELD_RANK])) { + $this->setRank(new FHIRPositiveInt(array_merge($ext, $data[self::FIELD_RANK]))); + } } else { $this->setRank(new FHIRPositiveInt($data[self::FIELD_RANK])); } @@ -194,8 +197,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SYSTEM] instanceof FHIRContactPointSystem) { $this->setSystem($data[self::FIELD_SYSTEM]); - } elseif ($ext && is_scalar($data[self::FIELD_SYSTEM])) { - $this->setSystem(new FHIRContactPointSystem([FHIRContactPointSystem::FIELD_VALUE => $data[self::FIELD_SYSTEM]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SYSTEM])) { + $this->setSystem(new FHIRContactPointSystem([FHIRContactPointSystem::FIELD_VALUE => $data[self::FIELD_SYSTEM]] + $ext)); + } else if (is_array($data[self::FIELD_SYSTEM])) { + $this->setSystem(new FHIRContactPointSystem(array_merge($ext, $data[self::FIELD_SYSTEM]))); + } } else { $this->setSystem(new FHIRContactPointSystem($data[self::FIELD_SYSTEM])); } @@ -206,8 +213,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_USE] instanceof FHIRContactPointUse) { $this->setUse($data[self::FIELD_USE]); - } elseif ($ext && is_scalar($data[self::FIELD_USE])) { - $this->setUse(new FHIRContactPointUse([FHIRContactPointUse::FIELD_VALUE => $data[self::FIELD_USE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_USE])) { + $this->setUse(new FHIRContactPointUse([FHIRContactPointUse::FIELD_VALUE => $data[self::FIELD_USE]] + $ext)); + } else if (is_array($data[self::FIELD_USE])) { + $this->setUse(new FHIRContactPointUse(array_merge($ext, $data[self::FIELD_USE]))); + } } else { $this->setUse(new FHIRContactPointUse($data[self::FIELD_USE])); } @@ -218,8 +229,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE] instanceof FHIRString) { $this->setValue($data[self::FIELD_VALUE]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE])) { - $this->setValue(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VALUE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE])) { + $this->setValue(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VALUE]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE])) { + $this->setValue(new FHIRString(array_merge($ext, $data[self::FIELD_VALUE]))); + } } else { $this->setValue(new FHIRString($data[self::FIELD_VALUE])); } @@ -521,15 +536,14 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getRank())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RANK, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSystem())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SYSTEM, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getUse())) { $v->xmlSerialize($sxe->addChild(self::FIELD_USE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getValue())) { + $sxe->addAttribute(self::FIELD_VALUE, (string)$v); $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE, null, $v->_getFHIRXMLNamespace())); } return $sxe; @@ -545,18 +559,48 @@ public function jsonSerialize() $a[self::FIELD_PERIOD] = $v; } if (null !== ($v = $this->getRank())) { - $a[self::FIELD_RANK] = $v->getValue(); - $a[self::FIELD_RANK_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_RANK] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_RANK_EXT] = $enc; + } + } else { + $a[self::FIELD_RANK] = $v; + } } if (null !== ($v = $this->getSystem())) { - $a[self::FIELD_SYSTEM] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SYSTEM] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SYSTEM_EXT] = $enc; + } + } else { + $a[self::FIELD_SYSTEM] = $v; + } } if (null !== ($v = $this->getUse())) { - $a[self::FIELD_USE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_USE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_USE_EXT] = $enc; + } + } else { + $a[self::FIELD_USE] = $v; + } } if (null !== ($v = $this->getValue())) { - $a[self::FIELD_VALUE] = $v->getValue(); - $a[self::FIELD_VALUE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRContactPointSystem.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRContactPointSystem.php index 5997595551..4880ad70ab 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRContactPointSystem.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRContactPointSystem.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRContactPointSystem extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONTACT_POINT_SYSTEM; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRContactPointSystem extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRContactPointSystem Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRContactPointUse.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRContactPointUse.php index 743b1c2109..404cf8fc17 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRContactPointUse.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRContactPointUse.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRContactPointUse extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONTACT_POINT_USE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRContactPointUse extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRContactPointUse Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRContentType.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRContentType.php index 0bce464fee..51b75f3314 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRContentType.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRContentType.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRContentType extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONTENT_TYPE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRContentType extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRContentType Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRContractResourceStatusCodes.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRContractResourceStatusCodes.php index 12d0147e59..feb88e797a 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRContractResourceStatusCodes.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRContractResourceStatusCodes.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRContractResourceStatusCodes extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONTRACT_RESOURCE_STATUS_CODES; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRContractResourceStatusCodes extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRContractResourceStatusCodes Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRContributor.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRContributor.php index 556e8941ab..1cc24b699d 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRContributor.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRContributor.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRContributor extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONTRIBUTOR; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CONTACT = 'contact'; const FIELD_NAME = 'name'; const FIELD_NAME_EXT = '_name'; @@ -122,6 +118,9 @@ class FHIRContributor extends FHIRElement */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRContributor Constructor * @param null|array $data @@ -141,6 +140,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CONTACT])) { if (is_array($data[self::FIELD_CONTACT])) { foreach($data[self::FIELD_CONTACT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContactDetail) { $this->addContact($v); } else { @@ -159,8 +161,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -171,8 +177,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TYPE] instanceof FHIRContributorType) { $this->setType($data[self::FIELD_TYPE]); - } elseif ($ext && is_scalar($data[self::FIELD_TYPE])) { - $this->setType(new FHIRContributorType([FHIRContributorType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TYPE])) { + $this->setType(new FHIRContributorType([FHIRContributorType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } else if (is_array($data[self::FIELD_TYPE])) { + $this->setType(new FHIRContributorType(array_merge($ext, $data[self::FIELD_TYPE]))); + } } else { $this->setType(new FHIRContributorType($data[self::FIELD_TYPE])); } @@ -429,7 +439,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NAME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -446,11 +455,26 @@ public function jsonSerialize() $a[self::FIELD_CONTACT] = $vs; } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if (null !== ($v = $this->getType())) { - $a[self::FIELD_TYPE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TYPE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TYPE_EXT] = $enc; + } + } else { + $a[self::FIELD_TYPE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRContributorType.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRContributorType.php index 80d5d45a42..d945586a0c 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRContributorType.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRContributorType.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRContributorType extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONTRIBUTOR_TYPE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRContributorType extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRContributorType Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRDataElementStringency.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRDataElementStringency.php index b756edf454..85a2e6165d 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRDataElementStringency.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRDataElementStringency.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRDataElementStringency extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DATA_ELEMENT_STRINGENCY; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRDataElementStringency extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRDataElementStringency Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRDataRequirement.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRDataRequirement.php index 367d2a35f0..1ecb88bc1a 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRDataRequirement.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRDataRequirement.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -81,10 +81,6 @@ class FHIRDataRequirement extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DATA_REQUIREMENT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CODE_FILTER = 'codeFilter'; const FIELD_DATE_FILTER = 'dateFilter'; const FIELD_MUST_SUPPORT = 'mustSupport'; @@ -162,6 +158,9 @@ class FHIRDataRequirement extends FHIRElement */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRDataRequirement Constructor * @param null|array $data @@ -181,6 +180,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CODE_FILTER])) { if (is_array($data[self::FIELD_CODE_FILTER])) { foreach($data[self::FIELD_CODE_FILTER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRDataRequirementCodeFilter) { $this->addCodeFilter($v); } else { @@ -196,6 +198,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_DATE_FILTER])) { if (is_array($data[self::FIELD_DATE_FILTER])) { foreach($data[self::FIELD_DATE_FILTER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRDataRequirementDateFilter) { $this->addDateFilter($v); } else { @@ -214,17 +219,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_MUST_SUPPORT])) { foreach($data[self::FIELD_MUST_SUPPORT] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRString) { $this->addMustSupport($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addMustSupport(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addMustSupport(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addMustSupport(new FHIRString(array_merge($v, $ext[$i]))); + } } else { $this->addMustSupport(new FHIRString($v)); } } } elseif ($data[self::FIELD_MUST_SUPPORT] instanceof FHIRString) { $this->addMustSupport($data[self::FIELD_MUST_SUPPORT]); - } elseif ($ext && is_scalar($data[self::FIELD_MUST_SUPPORT])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_MUST_SUPPORT])) { $this->addMustSupport(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_MUST_SUPPORT]] + $ext)); } else { $this->addMustSupport(new FHIRString($data[self::FIELD_MUST_SUPPORT])); @@ -236,17 +248,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_PROFILE])) { foreach($data[self::FIELD_PROFILE] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRUri) { $this->addProfile($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addProfile(new FHIRUri([FHIRUri::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addProfile(new FHIRUri([FHIRUri::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addProfile(new FHIRUri(array_merge($v, $ext[$i]))); + } } else { $this->addProfile(new FHIRUri($v)); } } } elseif ($data[self::FIELD_PROFILE] instanceof FHIRUri) { $this->addProfile($data[self::FIELD_PROFILE]); - } elseif ($ext && is_scalar($data[self::FIELD_PROFILE])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_PROFILE])) { $this->addProfile(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_PROFILE]] + $ext)); } else { $this->addProfile(new FHIRUri($data[self::FIELD_PROFILE])); @@ -258,8 +277,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TYPE] instanceof FHIRCode) { $this->setType($data[self::FIELD_TYPE]); - } elseif ($ext && is_scalar($data[self::FIELD_TYPE])) { - $this->setType(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TYPE])) { + $this->setType(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } else if (is_array($data[self::FIELD_TYPE])) { + $this->setType(new FHIRCode(array_merge($ext, $data[self::FIELD_TYPE]))); + } } else { $this->setType(new FHIRCode($data[self::FIELD_TYPE])); } @@ -721,7 +744,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_CODE_FILTER, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getDateFilter())) { foreach($vs as $v) { if (null === $v) { @@ -770,8 +792,17 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_MUST_SUPPORT][] = $v->getValue(); - $a[self::FIELD_MUST_SUPPORT_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MUST_SUPPORT][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MUST_SUPPORT_EXT][] = $enc; + } else { + $a[self::FIELD_MUST_SUPPORT_EXT][] = null; + } + } else { + $a[self::FIELD_MUST_SUPPORT][] = $v; + } } } if ([] !== ($vs = $this->getProfile())) { @@ -780,13 +811,29 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_PROFILE][] = $v->getValue(); - $a[self::FIELD_PROFILE_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PROFILE][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PROFILE_EXT][] = $enc; + } else { + $a[self::FIELD_PROFILE_EXT][] = null; + } + } else { + $a[self::FIELD_PROFILE][] = $v; + } } } if (null !== ($v = $this->getType())) { - $a[self::FIELD_TYPE] = $v->getValue(); - $a[self::FIELD_TYPE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TYPE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TYPE_EXT] = $enc; + } + } else { + $a[self::FIELD_TYPE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRDataRequirement/FHIRDataRequirementCodeFilter.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRDataRequirement/FHIRDataRequirementCodeFilter.php index 13680b1f0e..b27c8e57f6 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRDataRequirement/FHIRDataRequirementCodeFilter.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRDataRequirement/FHIRDataRequirementCodeFilter.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -84,10 +84,6 @@ class FHIRDataRequirementCodeFilter extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DATA_REQUIREMENT_DOT_CODE_FILTER; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_PATH = 'path'; const FIELD_PATH_EXT = '_path'; const FIELD_VALUE_CODE = 'valueCode'; @@ -186,6 +182,9 @@ class FHIRDataRequirementCodeFilter extends FHIRElement */ protected $valueSetString = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRDataRequirementCodeFilter Constructor * @param null|array $data @@ -208,8 +207,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PATH] instanceof FHIRString) { $this->setPath($data[self::FIELD_PATH]); - } elseif ($ext && is_scalar($data[self::FIELD_PATH])) { - $this->setPath(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PATH]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PATH])) { + $this->setPath(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PATH]] + $ext)); + } else if (is_array($data[self::FIELD_PATH])) { + $this->setPath(new FHIRString(array_merge($ext, $data[self::FIELD_PATH]))); + } } else { $this->setPath(new FHIRString($data[self::FIELD_PATH])); } @@ -220,17 +223,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_VALUE_CODE])) { foreach($data[self::FIELD_VALUE_CODE] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCode) { $this->addValueCode($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addValueCode(new FHIRCode([FHIRCode::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addValueCode(new FHIRCode([FHIRCode::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addValueCode(new FHIRCode(array_merge($v, $ext[$i]))); + } } else { $this->addValueCode(new FHIRCode($v)); } } } elseif ($data[self::FIELD_VALUE_CODE] instanceof FHIRCode) { $this->addValueCode($data[self::FIELD_VALUE_CODE]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_CODE])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_VALUE_CODE])) { $this->addValueCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_VALUE_CODE]] + $ext)); } else { $this->addValueCode(new FHIRCode($data[self::FIELD_VALUE_CODE])); @@ -239,6 +249,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_VALUE_CODEABLE_CONCEPT])) { if (is_array($data[self::FIELD_VALUE_CODEABLE_CONCEPT])) { foreach($data[self::FIELD_VALUE_CODEABLE_CONCEPT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addValueCodeableConcept($v); } else { @@ -254,6 +267,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_VALUE_CODING])) { if (is_array($data[self::FIELD_VALUE_CODING])) { foreach($data[self::FIELD_VALUE_CODING] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCoding) { $this->addValueCoding($v); } else { @@ -279,8 +295,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_SET_STRING] instanceof FHIRString) { $this->setValueSetString($data[self::FIELD_VALUE_SET_STRING]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_SET_STRING])) { - $this->setValueSetString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VALUE_SET_STRING]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_SET_STRING])) { + $this->setValueSetString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VALUE_SET_STRING]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_SET_STRING])) { + $this->setValueSetString(new FHIRString(array_merge($ext, $data[self::FIELD_VALUE_SET_STRING]))); + } } else { $this->setValueSetString(new FHIRString($data[self::FIELD_VALUE_SET_STRING])); } @@ -756,6 +776,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getPath())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATH, null, $v->_getFHIRXMLNamespace())); } @@ -767,7 +788,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_CODE, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getValueCodeableConcept())) { foreach($vs as $v) { if (null === $v) { @@ -776,7 +796,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getValueCoding())) { foreach($vs as $v) { if (null === $v) { @@ -785,7 +804,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_CODING, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getValueSetReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_SET_REFERENCE, null, $v->_getFHIRXMLNamespace())); } @@ -802,8 +820,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getPath())) { - $a[self::FIELD_PATH] = $v->getValue(); - $a[self::FIELD_PATH_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PATH] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PATH_EXT] = $enc; + } + } else { + $a[self::FIELD_PATH] = $v; + } } if ([] !== ($vs = $this->getValueCode())) { $a[self::FIELD_VALUE_CODE] = []; @@ -811,8 +836,17 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_VALUE_CODE][] = $v->getValue(); - $a[self::FIELD_VALUE_CODE_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_CODE][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_CODE_EXT][] = $enc; + } else { + $a[self::FIELD_VALUE_CODE_EXT][] = null; + } + } else { + $a[self::FIELD_VALUE_CODE][] = $v; + } } } if ([] !== ($vs = $this->getValueCodeableConcept())) { @@ -825,8 +859,15 @@ public function jsonSerialize() $a[self::FIELD_VALUE_SET_REFERENCE] = $v; } if (null !== ($v = $this->getValueSetString())) { - $a[self::FIELD_VALUE_SET_STRING] = $v->getValue(); - $a[self::FIELD_VALUE_SET_STRING_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_SET_STRING] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_SET_STRING_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_SET_STRING] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRDataRequirement/FHIRDataRequirementDateFilter.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRDataRequirement/FHIRDataRequirementDateFilter.php index 9729b4c701..b2f2ae38f4 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRDataRequirement/FHIRDataRequirementDateFilter.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRDataRequirement/FHIRDataRequirementDateFilter.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -83,15 +83,12 @@ class FHIRDataRequirementDateFilter extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DATA_REQUIREMENT_DOT_DATE_FILTER; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_PATH = 'path'; const FIELD_PATH_EXT = '_path'; const FIELD_VALUE_DATE_TIME = 'valueDateTime'; const FIELD_VALUE_DATE_TIME_EXT = '_valueDateTime'; const FIELD_VALUE_DURATION = 'valueDuration'; + const FIELD_VALUE_DURATION_EXT = '_valueDuration'; const FIELD_VALUE_PERIOD = 'valuePeriod'; /** @@ -161,6 +158,9 @@ class FHIRDataRequirementDateFilter extends FHIRElement */ protected $valuePeriod = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRDataRequirementDateFilter Constructor * @param null|array $data @@ -183,8 +183,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PATH] instanceof FHIRString) { $this->setPath($data[self::FIELD_PATH]); - } elseif ($ext && is_scalar($data[self::FIELD_PATH])) { - $this->setPath(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PATH]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PATH])) { + $this->setPath(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PATH]] + $ext)); + } else if (is_array($data[self::FIELD_PATH])) { + $this->setPath(new FHIRString(array_merge($ext, $data[self::FIELD_PATH]))); + } } else { $this->setPath(new FHIRString($data[self::FIELD_PATH])); } @@ -195,15 +199,28 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_DATE_TIME] instanceof FHIRDateTime) { $this->setValueDateTime($data[self::FIELD_VALUE_DATE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_DATE_TIME])) { - $this->setValueDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_VALUE_DATE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_DATE_TIME])) { + $this->setValueDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_VALUE_DATE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_DATE_TIME])) { + $this->setValueDateTime(new FHIRDateTime(array_merge($ext, $data[self::FIELD_VALUE_DATE_TIME]))); + } } else { $this->setValueDateTime(new FHIRDateTime($data[self::FIELD_VALUE_DATE_TIME])); } } if (isset($data[self::FIELD_VALUE_DURATION])) { + $ext = (isset($data[self::FIELD_VALUE_DURATION_EXT]) && is_array($data[self::FIELD_VALUE_DURATION_EXT])) + ? $data[self::FIELD_VALUE_DURATION_EXT] + : null; if ($data[self::FIELD_VALUE_DURATION] instanceof FHIRDuration) { $this->setValueDuration($data[self::FIELD_VALUE_DURATION]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_DURATION])) { + $this->setValueDuration(new FHIRDuration([FHIRDuration::FIELD_VALUE => $data[self::FIELD_VALUE_DURATION]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_DURATION])) { + $this->setValueDuration(new FHIRDuration(array_merge($ext, $data[self::FIELD_VALUE_DURATION]))); + } } else { $this->setValueDuration(new FHIRDuration($data[self::FIELD_VALUE_DURATION])); } @@ -516,17 +533,16 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getPath())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATH, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getValueDateTime())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_DATE_TIME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueDuration())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_DURATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValuePeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_PERIOD, null, $v->_getFHIRXMLNamespace())); } @@ -540,15 +556,37 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getPath())) { - $a[self::FIELD_PATH] = $v->getValue(); - $a[self::FIELD_PATH_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PATH] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PATH_EXT] = $enc; + } + } else { + $a[self::FIELD_PATH] = $v; + } } if (null !== ($v = $this->getValueDateTime())) { - $a[self::FIELD_VALUE_DATE_TIME] = $v->getValue(); - $a[self::FIELD_VALUE_DATE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_DATE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_DATE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_DATE_TIME] = $v; + } } if (null !== ($v = $this->getValueDuration())) { - $a[self::FIELD_VALUE_DURATION] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_DURATION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_DURATION_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_DURATION] = $v; + } } if (null !== ($v = $this->getValuePeriod())) { $a[self::FIELD_VALUE_PERIOD] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRDate.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRDate.php index f5555efc6c..8a958489cf 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRDate.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRDate.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRDate extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DATE; - - /** @var string */ - protected $_xmlns = ''; - const FIELD_VALUE = 'value'; /** @@ -91,6 +87,8 @@ class FHIRDate extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; /** * FHIRDate Constructor diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRDateTime.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRDateTime.php index c424a248d0..e7b8c36e95 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRDateTime.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRDateTime.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -82,10 +82,6 @@ class FHIRDateTime extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DATE_TIME; - - /** @var string */ - protected $_xmlns = ''; - const FIELD_VALUE = 'value'; /** @@ -93,6 +89,8 @@ class FHIRDateTime extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; /** * FHIRDateTime Constructor diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRDaysOfWeek.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRDaysOfWeek.php index aea4ce3268..bd3e133653 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRDaysOfWeek.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRDaysOfWeek.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRDaysOfWeek extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DAYS_OF_WEEK; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRDaysOfWeek extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRDaysOfWeek Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRDecimal.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRDecimal.php index 4497c6823d..bb14a19dfc 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRDecimal.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRDecimal.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRDecimal extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DECIMAL; - - /** @var string */ - protected $_xmlns = ''; - const FIELD_VALUE = 'value'; /** @@ -91,6 +87,8 @@ class FHIRDecimal extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; /** * FHIRDecimal Constructor diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRDetectedIssueSeverity.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRDetectedIssueSeverity.php index de06f566e7..9b622ca4e0 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRDetectedIssueSeverity.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRDetectedIssueSeverity.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRDetectedIssueSeverity extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DETECTED_ISSUE_SEVERITY; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRDetectedIssueSeverity extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRDetectedIssueSeverity Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRDeviceMetricCalibrationState.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRDeviceMetricCalibrationState.php index 7e88d46ad6..25095732eb 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRDeviceMetricCalibrationState.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRDeviceMetricCalibrationState.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRDeviceMetricCalibrationState extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DEVICE_METRIC_CALIBRATION_STATE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRDeviceMetricCalibrationState extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRDeviceMetricCalibrationState Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRDeviceMetricCalibrationType.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRDeviceMetricCalibrationType.php index 63a8193a5d..d6dfa99aa0 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRDeviceMetricCalibrationType.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRDeviceMetricCalibrationType.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRDeviceMetricCalibrationType extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DEVICE_METRIC_CALIBRATION_TYPE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRDeviceMetricCalibrationType extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRDeviceMetricCalibrationType Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRDeviceMetricCategory.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRDeviceMetricCategory.php index b84eb68aec..085f26a217 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRDeviceMetricCategory.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRDeviceMetricCategory.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRDeviceMetricCategory extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DEVICE_METRIC_CATEGORY; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRDeviceMetricCategory extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRDeviceMetricCategory Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRDeviceMetricColor.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRDeviceMetricColor.php index 1a40db6410..6573a850f3 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRDeviceMetricColor.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRDeviceMetricColor.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRDeviceMetricColor extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DEVICE_METRIC_COLOR; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRDeviceMetricColor extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRDeviceMetricColor Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRDeviceMetricOperationalStatus.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRDeviceMetricOperationalStatus.php index bda75c80b1..c77f851510 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRDeviceMetricOperationalStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRDeviceMetricOperationalStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRDeviceMetricOperationalStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DEVICE_METRIC_OPERATIONAL_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRDeviceMetricOperationalStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRDeviceMetricOperationalStatus Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRDeviceUseStatementStatus.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRDeviceUseStatementStatus.php index 75b243c02c..ce9be7877f 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRDeviceUseStatementStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRDeviceUseStatementStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRDeviceUseStatementStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DEVICE_USE_STATEMENT_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRDeviceUseStatementStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRDeviceUseStatementStatus Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRDiagnosticReportStatus.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRDiagnosticReportStatus.php index 2efd254397..f07589959f 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRDiagnosticReportStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRDiagnosticReportStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRDiagnosticReportStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DIAGNOSTIC_REPORT_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRDiagnosticReportStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRDiagnosticReportStatus Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRDigitalMediaType.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRDigitalMediaType.php index ea6c84e60d..b1b91751be 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRDigitalMediaType.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRDigitalMediaType.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRDigitalMediaType extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DIGITAL_MEDIA_TYPE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRDigitalMediaType extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRDigitalMediaType Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRDiscriminatorType.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRDiscriminatorType.php index 4b9a827e91..ea4d78d0a7 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRDiscriminatorType.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRDiscriminatorType.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRDiscriminatorType extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DISCRIMINATOR_TYPE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRDiscriminatorType extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRDiscriminatorType Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRDocumentMode.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRDocumentMode.php index a7de7814c0..7d8264136b 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRDocumentMode.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRDocumentMode.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRDocumentMode extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DOCUMENT_MODE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRDocumentMode extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRDocumentMode Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRDocumentReferenceStatus.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRDocumentReferenceStatus.php index a64f182264..57b5cd3090 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRDocumentReferenceStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRDocumentReferenceStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -77,10 +77,6 @@ class FHIRDocumentReferenceStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DOCUMENT_REFERENCE_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -88,6 +84,9 @@ class FHIRDocumentReferenceStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRDocumentReferenceStatus Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRDocumentRelationshipType.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRDocumentRelationshipType.php index 719f2a0820..06d12fef92 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRDocumentRelationshipType.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRDocumentRelationshipType.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRDocumentRelationshipType extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DOCUMENT_RELATIONSHIP_TYPE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRDocumentRelationshipType extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRDocumentRelationshipType Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRDosage.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRDosage.php index 43e1b41672..06278f3db6 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRDosage.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRDosage.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRDosage extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DOSAGE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ADDITIONAL_INSTRUCTION = 'additionalInstruction'; const FIELD_AS_NEEDED_BOOLEAN = 'asNeededBoolean'; const FIELD_AS_NEEDED_BOOLEAN_EXT = '_asNeededBoolean'; @@ -330,6 +326,9 @@ class FHIRDosage extends FHIRElement */ protected $timing = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRDosage Constructor * @param null|array $data @@ -349,6 +348,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ADDITIONAL_INSTRUCTION])) { if (is_array($data[self::FIELD_ADDITIONAL_INSTRUCTION])) { foreach($data[self::FIELD_ADDITIONAL_INSTRUCTION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addAdditionalInstruction($v); } else { @@ -367,8 +369,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_AS_NEEDED_BOOLEAN] instanceof FHIRBoolean) { $this->setAsNeededBoolean($data[self::FIELD_AS_NEEDED_BOOLEAN]); - } elseif ($ext && is_scalar($data[self::FIELD_AS_NEEDED_BOOLEAN])) { - $this->setAsNeededBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_AS_NEEDED_BOOLEAN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_AS_NEEDED_BOOLEAN])) { + $this->setAsNeededBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_AS_NEEDED_BOOLEAN]] + $ext)); + } else if (is_array($data[self::FIELD_AS_NEEDED_BOOLEAN])) { + $this->setAsNeededBoolean(new FHIRBoolean(array_merge($ext, $data[self::FIELD_AS_NEEDED_BOOLEAN]))); + } } else { $this->setAsNeededBoolean(new FHIRBoolean($data[self::FIELD_AS_NEEDED_BOOLEAN])); } @@ -386,8 +392,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DOSE_QUANTITY] instanceof FHIRQuantity) { $this->setDoseQuantity($data[self::FIELD_DOSE_QUANTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_DOSE_QUANTITY])) { - $this->setDoseQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_DOSE_QUANTITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DOSE_QUANTITY])) { + $this->setDoseQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_DOSE_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_DOSE_QUANTITY])) { + $this->setDoseQuantity(new FHIRQuantity(array_merge($ext, $data[self::FIELD_DOSE_QUANTITY]))); + } } else { $this->setDoseQuantity(new FHIRQuantity($data[self::FIELD_DOSE_QUANTITY])); } @@ -405,8 +415,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MAX_DOSE_PER_ADMINISTRATION] instanceof FHIRQuantity) { $this->setMaxDosePerAdministration($data[self::FIELD_MAX_DOSE_PER_ADMINISTRATION]); - } elseif ($ext && is_scalar($data[self::FIELD_MAX_DOSE_PER_ADMINISTRATION])) { - $this->setMaxDosePerAdministration(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_MAX_DOSE_PER_ADMINISTRATION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MAX_DOSE_PER_ADMINISTRATION])) { + $this->setMaxDosePerAdministration(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_MAX_DOSE_PER_ADMINISTRATION]] + $ext)); + } else if (is_array($data[self::FIELD_MAX_DOSE_PER_ADMINISTRATION])) { + $this->setMaxDosePerAdministration(new FHIRQuantity(array_merge($ext, $data[self::FIELD_MAX_DOSE_PER_ADMINISTRATION]))); + } } else { $this->setMaxDosePerAdministration(new FHIRQuantity($data[self::FIELD_MAX_DOSE_PER_ADMINISTRATION])); } @@ -417,8 +431,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MAX_DOSE_PER_LIFETIME] instanceof FHIRQuantity) { $this->setMaxDosePerLifetime($data[self::FIELD_MAX_DOSE_PER_LIFETIME]); - } elseif ($ext && is_scalar($data[self::FIELD_MAX_DOSE_PER_LIFETIME])) { - $this->setMaxDosePerLifetime(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_MAX_DOSE_PER_LIFETIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MAX_DOSE_PER_LIFETIME])) { + $this->setMaxDosePerLifetime(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_MAX_DOSE_PER_LIFETIME]] + $ext)); + } else if (is_array($data[self::FIELD_MAX_DOSE_PER_LIFETIME])) { + $this->setMaxDosePerLifetime(new FHIRQuantity(array_merge($ext, $data[self::FIELD_MAX_DOSE_PER_LIFETIME]))); + } } else { $this->setMaxDosePerLifetime(new FHIRQuantity($data[self::FIELD_MAX_DOSE_PER_LIFETIME])); } @@ -443,8 +461,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PATIENT_INSTRUCTION] instanceof FHIRString) { $this->setPatientInstruction($data[self::FIELD_PATIENT_INSTRUCTION]); - } elseif ($ext && is_scalar($data[self::FIELD_PATIENT_INSTRUCTION])) { - $this->setPatientInstruction(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PATIENT_INSTRUCTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PATIENT_INSTRUCTION])) { + $this->setPatientInstruction(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PATIENT_INSTRUCTION]] + $ext)); + } else if (is_array($data[self::FIELD_PATIENT_INSTRUCTION])) { + $this->setPatientInstruction(new FHIRString(array_merge($ext, $data[self::FIELD_PATIENT_INSTRUCTION]))); + } } else { $this->setPatientInstruction(new FHIRString($data[self::FIELD_PATIENT_INSTRUCTION])); } @@ -455,8 +477,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_RATE_QUANTITY] instanceof FHIRQuantity) { $this->setRateQuantity($data[self::FIELD_RATE_QUANTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_RATE_QUANTITY])) { - $this->setRateQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_RATE_QUANTITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_RATE_QUANTITY])) { + $this->setRateQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_RATE_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_RATE_QUANTITY])) { + $this->setRateQuantity(new FHIRQuantity(array_merge($ext, $data[self::FIELD_RATE_QUANTITY]))); + } } else { $this->setRateQuantity(new FHIRQuantity($data[self::FIELD_RATE_QUANTITY])); } @@ -488,8 +514,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SEQUENCE] instanceof FHIRInteger) { $this->setSequence($data[self::FIELD_SEQUENCE]); - } elseif ($ext && is_scalar($data[self::FIELD_SEQUENCE])) { - $this->setSequence(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_SEQUENCE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SEQUENCE])) { + $this->setSequence(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_SEQUENCE]] + $ext)); + } else if (is_array($data[self::FIELD_SEQUENCE])) { + $this->setSequence(new FHIRInteger(array_merge($ext, $data[self::FIELD_SEQUENCE]))); + } } else { $this->setSequence(new FHIRInteger($data[self::FIELD_SEQUENCE])); } @@ -507,8 +537,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TEXT] instanceof FHIRString) { $this->setText($data[self::FIELD_TEXT]); - } elseif ($ext && is_scalar($data[self::FIELD_TEXT])) { - $this->setText(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TEXT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TEXT])) { + $this->setText(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TEXT]] + $ext)); + } else if (is_array($data[self::FIELD_TEXT])) { + $this->setText(new FHIRString(array_merge($ext, $data[self::FIELD_TEXT]))); + } } else { $this->setText(new FHIRString($data[self::FIELD_TEXT])); } @@ -1346,64 +1380,51 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getAsNeededBoolean())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AS_NEEDED_BOOLEAN, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getAsNeededCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AS_NEEDED_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDoseQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DOSE_QUANTITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDoseRange())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DOSE_RANGE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getMaxDosePerAdministration())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MAX_DOSE_PER_ADMINISTRATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getMaxDosePerLifetime())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MAX_DOSE_PER_LIFETIME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getMaxDosePerPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MAX_DOSE_PER_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getMethod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_METHOD, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getPatientInstruction())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATIENT_INSTRUCTION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRateQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RATE_QUANTITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRateRange())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RATE_RANGE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRateRatio())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RATE_RATIO, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRoute())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ROUTE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getSequence())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SEQUENCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSite())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SITE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getText())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TEXT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getTiming())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TIMING, null, $v->_getFHIRXMLNamespace())); } @@ -1420,23 +1441,54 @@ public function jsonSerialize() $a[self::FIELD_ADDITIONAL_INSTRUCTION] = $vs; } if (null !== ($v = $this->getAsNeededBoolean())) { - $a[self::FIELD_AS_NEEDED_BOOLEAN] = $v->getValue(); - $a[self::FIELD_AS_NEEDED_BOOLEAN_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_AS_NEEDED_BOOLEAN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_AS_NEEDED_BOOLEAN_EXT] = $enc; + } + } else { + $a[self::FIELD_AS_NEEDED_BOOLEAN] = $v; + } } if (null !== ($v = $this->getAsNeededCodeableConcept())) { $a[self::FIELD_AS_NEEDED_CODEABLE_CONCEPT] = $v; } if (null !== ($v = $this->getDoseQuantity())) { - $a[self::FIELD_DOSE_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DOSE_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DOSE_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_DOSE_QUANTITY] = $v; + } } if (null !== ($v = $this->getDoseRange())) { $a[self::FIELD_DOSE_RANGE] = $v; } if (null !== ($v = $this->getMaxDosePerAdministration())) { - $a[self::FIELD_MAX_DOSE_PER_ADMINISTRATION] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MAX_DOSE_PER_ADMINISTRATION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MAX_DOSE_PER_ADMINISTRATION_EXT] = $enc; + } + } else { + $a[self::FIELD_MAX_DOSE_PER_ADMINISTRATION] = $v; + } } if (null !== ($v = $this->getMaxDosePerLifetime())) { - $a[self::FIELD_MAX_DOSE_PER_LIFETIME] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MAX_DOSE_PER_LIFETIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MAX_DOSE_PER_LIFETIME_EXT] = $enc; + } + } else { + $a[self::FIELD_MAX_DOSE_PER_LIFETIME] = $v; + } } if (null !== ($v = $this->getMaxDosePerPeriod())) { $a[self::FIELD_MAX_DOSE_PER_PERIOD] = $v; @@ -1445,11 +1497,26 @@ public function jsonSerialize() $a[self::FIELD_METHOD] = $v; } if (null !== ($v = $this->getPatientInstruction())) { - $a[self::FIELD_PATIENT_INSTRUCTION] = $v->getValue(); - $a[self::FIELD_PATIENT_INSTRUCTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PATIENT_INSTRUCTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PATIENT_INSTRUCTION_EXT] = $enc; + } + } else { + $a[self::FIELD_PATIENT_INSTRUCTION] = $v; + } } if (null !== ($v = $this->getRateQuantity())) { - $a[self::FIELD_RATE_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_RATE_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_RATE_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_RATE_QUANTITY] = $v; + } } if (null !== ($v = $this->getRateRange())) { $a[self::FIELD_RATE_RANGE] = $v; @@ -1461,15 +1528,29 @@ public function jsonSerialize() $a[self::FIELD_ROUTE] = $v; } if (null !== ($v = $this->getSequence())) { - $a[self::FIELD_SEQUENCE] = $v->getValue(); - $a[self::FIELD_SEQUENCE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SEQUENCE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SEQUENCE_EXT] = $enc; + } + } else { + $a[self::FIELD_SEQUENCE] = $v; + } } if (null !== ($v = $this->getSite())) { $a[self::FIELD_SITE] = $v; } if (null !== ($v = $this->getText())) { - $a[self::FIELD_TEXT] = $v->getValue(); - $a[self::FIELD_TEXT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TEXT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TEXT_EXT] = $enc; + } + } else { + $a[self::FIELD_TEXT] = $v; + } } if (null !== ($v = $this->getTiming())) { $a[self::FIELD_TIMING] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRElementDefinition.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRElementDefinition.php index 3b4dff8113..ebd3723574 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRElementDefinition.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRElementDefinition.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -90,10 +90,6 @@ class FHIRElementDefinition extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ELEMENT_DEFINITION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ALIAS = 'alias'; const FIELD_ALIAS_EXT = '_alias'; const FIELD_BASE = 'base'; @@ -108,6 +104,7 @@ class FHIRElementDefinition extends FHIRElement const FIELD_CONTENT_REFERENCE_EXT = '_contentReference'; const FIELD_DEFAULT_VALUE_ADDRESS = 'defaultValueAddress'; const FIELD_DEFAULT_VALUE_AGE = 'defaultValueAge'; + const FIELD_DEFAULT_VALUE_AGE_EXT = '_defaultValueAge'; const FIELD_DEFAULT_VALUE_ANNOTATION = 'defaultValueAnnotation'; const FIELD_DEFAULT_VALUE_ATTACHMENT = 'defaultValueAttachment'; const FIELD_DEFAULT_VALUE_BASE_64BINARY = 'defaultValueBase64Binary'; @@ -121,6 +118,7 @@ class FHIRElementDefinition extends FHIRElement const FIELD_DEFAULT_VALUE_CONTACT_POINT = 'defaultValueContactPoint'; const FIELD_DEFAULT_VALUE_CONTACT_POINT_EXT = '_defaultValueContactPoint'; const FIELD_DEFAULT_VALUE_COUNT = 'defaultValueCount'; + const FIELD_DEFAULT_VALUE_COUNT_EXT = '_defaultValueCount'; const FIELD_DEFAULT_VALUE_DATE = 'defaultValueDate'; const FIELD_DEFAULT_VALUE_DATE_EXT = '_defaultValueDate'; const FIELD_DEFAULT_VALUE_DATE_TIME = 'defaultValueDateTime'; @@ -128,7 +126,9 @@ class FHIRElementDefinition extends FHIRElement const FIELD_DEFAULT_VALUE_DECIMAL = 'defaultValueDecimal'; const FIELD_DEFAULT_VALUE_DECIMAL_EXT = '_defaultValueDecimal'; const FIELD_DEFAULT_VALUE_DISTANCE = 'defaultValueDistance'; + const FIELD_DEFAULT_VALUE_DISTANCE_EXT = '_defaultValueDistance'; const FIELD_DEFAULT_VALUE_DURATION = 'defaultValueDuration'; + const FIELD_DEFAULT_VALUE_DURATION_EXT = '_defaultValueDuration'; const FIELD_DEFAULT_VALUE_HUMAN_NAME = 'defaultValueHumanName'; const FIELD_DEFAULT_VALUE_ID = 'defaultValueId'; const FIELD_DEFAULT_VALUE_ID_EXT = '_defaultValueId'; @@ -142,6 +142,7 @@ class FHIRElementDefinition extends FHIRElement const FIELD_DEFAULT_VALUE_MARKDOWN_EXT = '_defaultValueMarkdown'; const FIELD_DEFAULT_VALUE_META = 'defaultValueMeta'; const FIELD_DEFAULT_VALUE_MONEY = 'defaultValueMoney'; + const FIELD_DEFAULT_VALUE_MONEY_EXT = '_defaultValueMoney'; const FIELD_DEFAULT_VALUE_OID = 'defaultValueOid'; const FIELD_DEFAULT_VALUE_OID_EXT = '_defaultValueOid'; const FIELD_DEFAULT_VALUE_PERIOD = 'defaultValuePeriod'; @@ -168,6 +169,7 @@ class FHIRElementDefinition extends FHIRElement const FIELD_EXAMPLE = 'example'; const FIELD_FIXED_ADDRESS = 'fixedAddress'; const FIELD_FIXED_AGE = 'fixedAge'; + const FIELD_FIXED_AGE_EXT = '_fixedAge'; const FIELD_FIXED_ANNOTATION = 'fixedAnnotation'; const FIELD_FIXED_ATTACHMENT = 'fixedAttachment'; const FIELD_FIXED_BASE_64BINARY = 'fixedBase64Binary'; @@ -181,6 +183,7 @@ class FHIRElementDefinition extends FHIRElement const FIELD_FIXED_CONTACT_POINT = 'fixedContactPoint'; const FIELD_FIXED_CONTACT_POINT_EXT = '_fixedContactPoint'; const FIELD_FIXED_COUNT = 'fixedCount'; + const FIELD_FIXED_COUNT_EXT = '_fixedCount'; const FIELD_FIXED_DATE = 'fixedDate'; const FIELD_FIXED_DATE_EXT = '_fixedDate'; const FIELD_FIXED_DATE_TIME = 'fixedDateTime'; @@ -188,7 +191,9 @@ class FHIRElementDefinition extends FHIRElement const FIELD_FIXED_DECIMAL = 'fixedDecimal'; const FIELD_FIXED_DECIMAL_EXT = '_fixedDecimal'; const FIELD_FIXED_DISTANCE = 'fixedDistance'; + const FIELD_FIXED_DISTANCE_EXT = '_fixedDistance'; const FIELD_FIXED_DURATION = 'fixedDuration'; + const FIELD_FIXED_DURATION_EXT = '_fixedDuration'; const FIELD_FIXED_HUMAN_NAME = 'fixedHumanName'; const FIELD_FIXED_ID = 'fixedId'; const FIELD_FIXED_ID_EXT = '_fixedId'; @@ -202,6 +207,7 @@ class FHIRElementDefinition extends FHIRElement const FIELD_FIXED_MARKDOWN_EXT = '_fixedMarkdown'; const FIELD_FIXED_META = 'fixedMeta'; const FIELD_FIXED_MONEY = 'fixedMoney'; + const FIELD_FIXED_MONEY_EXT = '_fixedMoney'; const FIELD_FIXED_OID = 'fixedOid'; const FIELD_FIXED_OID_EXT = '_fixedOid'; const FIELD_FIXED_PERIOD = 'fixedPeriod'; @@ -282,6 +288,7 @@ class FHIRElementDefinition extends FHIRElement const FIELD_PATH_EXT = '_path'; const FIELD_PATTERN_ADDRESS = 'patternAddress'; const FIELD_PATTERN_AGE = 'patternAge'; + const FIELD_PATTERN_AGE_EXT = '_patternAge'; const FIELD_PATTERN_ANNOTATION = 'patternAnnotation'; const FIELD_PATTERN_ATTACHMENT = 'patternAttachment'; const FIELD_PATTERN_BASE_64BINARY = 'patternBase64Binary'; @@ -295,6 +302,7 @@ class FHIRElementDefinition extends FHIRElement const FIELD_PATTERN_CONTACT_POINT = 'patternContactPoint'; const FIELD_PATTERN_CONTACT_POINT_EXT = '_patternContactPoint'; const FIELD_PATTERN_COUNT = 'patternCount'; + const FIELD_PATTERN_COUNT_EXT = '_patternCount'; const FIELD_PATTERN_DATE = 'patternDate'; const FIELD_PATTERN_DATE_EXT = '_patternDate'; const FIELD_PATTERN_DATE_TIME = 'patternDateTime'; @@ -302,7 +310,9 @@ class FHIRElementDefinition extends FHIRElement const FIELD_PATTERN_DECIMAL = 'patternDecimal'; const FIELD_PATTERN_DECIMAL_EXT = '_patternDecimal'; const FIELD_PATTERN_DISTANCE = 'patternDistance'; + const FIELD_PATTERN_DISTANCE_EXT = '_patternDistance'; const FIELD_PATTERN_DURATION = 'patternDuration'; + const FIELD_PATTERN_DURATION_EXT = '_patternDuration'; const FIELD_PATTERN_HUMAN_NAME = 'patternHumanName'; const FIELD_PATTERN_ID = 'patternId'; const FIELD_PATTERN_ID_EXT = '_patternId'; @@ -316,6 +326,7 @@ class FHIRElementDefinition extends FHIRElement const FIELD_PATTERN_MARKDOWN_EXT = '_patternMarkdown'; const FIELD_PATTERN_META = 'patternMeta'; const FIELD_PATTERN_MONEY = 'patternMoney'; + const FIELD_PATTERN_MONEY_EXT = '_patternMoney'; const FIELD_PATTERN_OID = 'patternOid'; const FIELD_PATTERN_OID_EXT = '_patternOid'; const FIELD_PATTERN_PERIOD = 'patternPeriod'; @@ -2634,6 +2645,9 @@ class FHIRElementDefinition extends FHIRElement */ protected $type = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRElementDefinition Constructor * @param null|array $data @@ -2656,17 +2670,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_ALIAS])) { foreach($data[self::FIELD_ALIAS] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRString) { $this->addAlias($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addAlias(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addAlias(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addAlias(new FHIRString(array_merge($v, $ext[$i]))); + } } else { $this->addAlias(new FHIRString($v)); } } } elseif ($data[self::FIELD_ALIAS] instanceof FHIRString) { $this->addAlias($data[self::FIELD_ALIAS]); - } elseif ($ext && is_scalar($data[self::FIELD_ALIAS])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_ALIAS])) { $this->addAlias(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_ALIAS]] + $ext)); } else { $this->addAlias(new FHIRString($data[self::FIELD_ALIAS])); @@ -2689,6 +2710,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CODE])) { if (is_array($data[self::FIELD_CODE])) { foreach($data[self::FIELD_CODE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCoding) { $this->addCode($v); } else { @@ -2707,8 +2731,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_COMMENT] instanceof FHIRMarkdown) { $this->setComment($data[self::FIELD_COMMENT]); - } elseif ($ext && is_scalar($data[self::FIELD_COMMENT])) { - $this->setComment(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_COMMENT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_COMMENT])) { + $this->setComment(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_COMMENT]] + $ext)); + } else if (is_array($data[self::FIELD_COMMENT])) { + $this->setComment(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_COMMENT]))); + } } else { $this->setComment(new FHIRMarkdown($data[self::FIELD_COMMENT])); } @@ -2719,17 +2747,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_CONDITION])) { foreach($data[self::FIELD_CONDITION] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRId) { $this->addCondition($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addCondition(new FHIRId([FHIRId::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addCondition(new FHIRId([FHIRId::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addCondition(new FHIRId(array_merge($v, $ext[$i]))); + } } else { $this->addCondition(new FHIRId($v)); } } } elseif ($data[self::FIELD_CONDITION] instanceof FHIRId) { $this->addCondition($data[self::FIELD_CONDITION]); - } elseif ($ext && is_scalar($data[self::FIELD_CONDITION])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_CONDITION])) { $this->addCondition(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_CONDITION]] + $ext)); } else { $this->addCondition(new FHIRId($data[self::FIELD_CONDITION])); @@ -2738,6 +2773,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CONSTRAINT])) { if (is_array($data[self::FIELD_CONSTRAINT])) { foreach($data[self::FIELD_CONSTRAINT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRElementDefinitionConstraint) { $this->addConstraint($v); } else { @@ -2756,8 +2794,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CONTENT_REFERENCE] instanceof FHIRUri) { $this->setContentReference($data[self::FIELD_CONTENT_REFERENCE]); - } elseif ($ext && is_scalar($data[self::FIELD_CONTENT_REFERENCE])) { - $this->setContentReference(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_CONTENT_REFERENCE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CONTENT_REFERENCE])) { + $this->setContentReference(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_CONTENT_REFERENCE]] + $ext)); + } else if (is_array($data[self::FIELD_CONTENT_REFERENCE])) { + $this->setContentReference(new FHIRUri(array_merge($ext, $data[self::FIELD_CONTENT_REFERENCE]))); + } } else { $this->setContentReference(new FHIRUri($data[self::FIELD_CONTENT_REFERENCE])); } @@ -2770,8 +2812,17 @@ public function __construct($data = null) } } if (isset($data[self::FIELD_DEFAULT_VALUE_AGE])) { + $ext = (isset($data[self::FIELD_DEFAULT_VALUE_AGE_EXT]) && is_array($data[self::FIELD_DEFAULT_VALUE_AGE_EXT])) + ? $data[self::FIELD_DEFAULT_VALUE_AGE_EXT] + : null; if ($data[self::FIELD_DEFAULT_VALUE_AGE] instanceof FHIRAge) { $this->setDefaultValueAge($data[self::FIELD_DEFAULT_VALUE_AGE]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DEFAULT_VALUE_AGE])) { + $this->setDefaultValueAge(new FHIRAge([FHIRAge::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_AGE]] + $ext)); + } else if (is_array($data[self::FIELD_DEFAULT_VALUE_AGE])) { + $this->setDefaultValueAge(new FHIRAge(array_merge($ext, $data[self::FIELD_DEFAULT_VALUE_AGE]))); + } } else { $this->setDefaultValueAge(new FHIRAge($data[self::FIELD_DEFAULT_VALUE_AGE])); } @@ -2796,8 +2847,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DEFAULT_VALUE_BASE_64BINARY] instanceof FHIRBase64Binary) { $this->setDefaultValueBase64Binary($data[self::FIELD_DEFAULT_VALUE_BASE_64BINARY]); - } elseif ($ext && is_scalar($data[self::FIELD_DEFAULT_VALUE_BASE_64BINARY])) { - $this->setDefaultValueBase64Binary(new FHIRBase64Binary([FHIRBase64Binary::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_BASE_64BINARY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DEFAULT_VALUE_BASE_64BINARY])) { + $this->setDefaultValueBase64Binary(new FHIRBase64Binary([FHIRBase64Binary::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_BASE_64BINARY]] + $ext)); + } else if (is_array($data[self::FIELD_DEFAULT_VALUE_BASE_64BINARY])) { + $this->setDefaultValueBase64Binary(new FHIRBase64Binary(array_merge($ext, $data[self::FIELD_DEFAULT_VALUE_BASE_64BINARY]))); + } } else { $this->setDefaultValueBase64Binary(new FHIRBase64Binary($data[self::FIELD_DEFAULT_VALUE_BASE_64BINARY])); } @@ -2808,8 +2863,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DEFAULT_VALUE_BOOLEAN] instanceof FHIRBoolean) { $this->setDefaultValueBoolean($data[self::FIELD_DEFAULT_VALUE_BOOLEAN]); - } elseif ($ext && is_scalar($data[self::FIELD_DEFAULT_VALUE_BOOLEAN])) { - $this->setDefaultValueBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_BOOLEAN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DEFAULT_VALUE_BOOLEAN])) { + $this->setDefaultValueBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_BOOLEAN]] + $ext)); + } else if (is_array($data[self::FIELD_DEFAULT_VALUE_BOOLEAN])) { + $this->setDefaultValueBoolean(new FHIRBoolean(array_merge($ext, $data[self::FIELD_DEFAULT_VALUE_BOOLEAN]))); + } } else { $this->setDefaultValueBoolean(new FHIRBoolean($data[self::FIELD_DEFAULT_VALUE_BOOLEAN])); } @@ -2820,8 +2879,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DEFAULT_VALUE_CODE] instanceof FHIRCode) { $this->setDefaultValueCode($data[self::FIELD_DEFAULT_VALUE_CODE]); - } elseif ($ext && is_scalar($data[self::FIELD_DEFAULT_VALUE_CODE])) { - $this->setDefaultValueCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_CODE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DEFAULT_VALUE_CODE])) { + $this->setDefaultValueCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_CODE]] + $ext)); + } else if (is_array($data[self::FIELD_DEFAULT_VALUE_CODE])) { + $this->setDefaultValueCode(new FHIRCode(array_merge($ext, $data[self::FIELD_DEFAULT_VALUE_CODE]))); + } } else { $this->setDefaultValueCode(new FHIRCode($data[self::FIELD_DEFAULT_VALUE_CODE])); } @@ -2846,15 +2909,28 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DEFAULT_VALUE_CONTACT_POINT] instanceof FHIRContactPoint) { $this->setDefaultValueContactPoint($data[self::FIELD_DEFAULT_VALUE_CONTACT_POINT]); - } elseif ($ext && is_scalar($data[self::FIELD_DEFAULT_VALUE_CONTACT_POINT])) { - $this->setDefaultValueContactPoint(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_CONTACT_POINT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DEFAULT_VALUE_CONTACT_POINT])) { + $this->setDefaultValueContactPoint(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_CONTACT_POINT]] + $ext)); + } else if (is_array($data[self::FIELD_DEFAULT_VALUE_CONTACT_POINT])) { + $this->setDefaultValueContactPoint(new FHIRContactPoint(array_merge($ext, $data[self::FIELD_DEFAULT_VALUE_CONTACT_POINT]))); + } } else { $this->setDefaultValueContactPoint(new FHIRContactPoint($data[self::FIELD_DEFAULT_VALUE_CONTACT_POINT])); } } if (isset($data[self::FIELD_DEFAULT_VALUE_COUNT])) { + $ext = (isset($data[self::FIELD_DEFAULT_VALUE_COUNT_EXT]) && is_array($data[self::FIELD_DEFAULT_VALUE_COUNT_EXT])) + ? $data[self::FIELD_DEFAULT_VALUE_COUNT_EXT] + : null; if ($data[self::FIELD_DEFAULT_VALUE_COUNT] instanceof FHIRCount) { $this->setDefaultValueCount($data[self::FIELD_DEFAULT_VALUE_COUNT]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DEFAULT_VALUE_COUNT])) { + $this->setDefaultValueCount(new FHIRCount([FHIRCount::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_COUNT]] + $ext)); + } else if (is_array($data[self::FIELD_DEFAULT_VALUE_COUNT])) { + $this->setDefaultValueCount(new FHIRCount(array_merge($ext, $data[self::FIELD_DEFAULT_VALUE_COUNT]))); + } } else { $this->setDefaultValueCount(new FHIRCount($data[self::FIELD_DEFAULT_VALUE_COUNT])); } @@ -2865,8 +2941,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DEFAULT_VALUE_DATE] instanceof FHIRDate) { $this->setDefaultValueDate($data[self::FIELD_DEFAULT_VALUE_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_DEFAULT_VALUE_DATE])) { - $this->setDefaultValueDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DEFAULT_VALUE_DATE])) { + $this->setDefaultValueDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_DEFAULT_VALUE_DATE])) { + $this->setDefaultValueDate(new FHIRDate(array_merge($ext, $data[self::FIELD_DEFAULT_VALUE_DATE]))); + } } else { $this->setDefaultValueDate(new FHIRDate($data[self::FIELD_DEFAULT_VALUE_DATE])); } @@ -2877,8 +2957,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DEFAULT_VALUE_DATE_TIME] instanceof FHIRDateTime) { $this->setDefaultValueDateTime($data[self::FIELD_DEFAULT_VALUE_DATE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_DEFAULT_VALUE_DATE_TIME])) { - $this->setDefaultValueDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_DATE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DEFAULT_VALUE_DATE_TIME])) { + $this->setDefaultValueDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_DATE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_DEFAULT_VALUE_DATE_TIME])) { + $this->setDefaultValueDateTime(new FHIRDateTime(array_merge($ext, $data[self::FIELD_DEFAULT_VALUE_DATE_TIME]))); + } } else { $this->setDefaultValueDateTime(new FHIRDateTime($data[self::FIELD_DEFAULT_VALUE_DATE_TIME])); } @@ -2889,22 +2973,44 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DEFAULT_VALUE_DECIMAL] instanceof FHIRDecimal) { $this->setDefaultValueDecimal($data[self::FIELD_DEFAULT_VALUE_DECIMAL]); - } elseif ($ext && is_scalar($data[self::FIELD_DEFAULT_VALUE_DECIMAL])) { - $this->setDefaultValueDecimal(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_DECIMAL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DEFAULT_VALUE_DECIMAL])) { + $this->setDefaultValueDecimal(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_DECIMAL]] + $ext)); + } else if (is_array($data[self::FIELD_DEFAULT_VALUE_DECIMAL])) { + $this->setDefaultValueDecimal(new FHIRDecimal(array_merge($ext, $data[self::FIELD_DEFAULT_VALUE_DECIMAL]))); + } } else { $this->setDefaultValueDecimal(new FHIRDecimal($data[self::FIELD_DEFAULT_VALUE_DECIMAL])); } } if (isset($data[self::FIELD_DEFAULT_VALUE_DISTANCE])) { + $ext = (isset($data[self::FIELD_DEFAULT_VALUE_DISTANCE_EXT]) && is_array($data[self::FIELD_DEFAULT_VALUE_DISTANCE_EXT])) + ? $data[self::FIELD_DEFAULT_VALUE_DISTANCE_EXT] + : null; if ($data[self::FIELD_DEFAULT_VALUE_DISTANCE] instanceof FHIRDistance) { $this->setDefaultValueDistance($data[self::FIELD_DEFAULT_VALUE_DISTANCE]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DEFAULT_VALUE_DISTANCE])) { + $this->setDefaultValueDistance(new FHIRDistance([FHIRDistance::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_DISTANCE]] + $ext)); + } else if (is_array($data[self::FIELD_DEFAULT_VALUE_DISTANCE])) { + $this->setDefaultValueDistance(new FHIRDistance(array_merge($ext, $data[self::FIELD_DEFAULT_VALUE_DISTANCE]))); + } } else { $this->setDefaultValueDistance(new FHIRDistance($data[self::FIELD_DEFAULT_VALUE_DISTANCE])); } } if (isset($data[self::FIELD_DEFAULT_VALUE_DURATION])) { + $ext = (isset($data[self::FIELD_DEFAULT_VALUE_DURATION_EXT]) && is_array($data[self::FIELD_DEFAULT_VALUE_DURATION_EXT])) + ? $data[self::FIELD_DEFAULT_VALUE_DURATION_EXT] + : null; if ($data[self::FIELD_DEFAULT_VALUE_DURATION] instanceof FHIRDuration) { $this->setDefaultValueDuration($data[self::FIELD_DEFAULT_VALUE_DURATION]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DEFAULT_VALUE_DURATION])) { + $this->setDefaultValueDuration(new FHIRDuration([FHIRDuration::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_DURATION]] + $ext)); + } else if (is_array($data[self::FIELD_DEFAULT_VALUE_DURATION])) { + $this->setDefaultValueDuration(new FHIRDuration(array_merge($ext, $data[self::FIELD_DEFAULT_VALUE_DURATION]))); + } } else { $this->setDefaultValueDuration(new FHIRDuration($data[self::FIELD_DEFAULT_VALUE_DURATION])); } @@ -2922,8 +3028,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DEFAULT_VALUE_ID] instanceof FHIRId) { $this->setDefaultValueId($data[self::FIELD_DEFAULT_VALUE_ID]); - } elseif ($ext && is_scalar($data[self::FIELD_DEFAULT_VALUE_ID])) { - $this->setDefaultValueId(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_ID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DEFAULT_VALUE_ID])) { + $this->setDefaultValueId(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_ID]] + $ext)); + } else if (is_array($data[self::FIELD_DEFAULT_VALUE_ID])) { + $this->setDefaultValueId(new FHIRId(array_merge($ext, $data[self::FIELD_DEFAULT_VALUE_ID]))); + } } else { $this->setDefaultValueId(new FHIRId($data[self::FIELD_DEFAULT_VALUE_ID])); } @@ -2934,8 +3044,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DEFAULT_VALUE_IDENTIFIER] instanceof FHIRIdentifier) { $this->setDefaultValueIdentifier($data[self::FIELD_DEFAULT_VALUE_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_DEFAULT_VALUE_IDENTIFIER])) { - $this->setDefaultValueIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DEFAULT_VALUE_IDENTIFIER])) { + $this->setDefaultValueIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_DEFAULT_VALUE_IDENTIFIER])) { + $this->setDefaultValueIdentifier(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_DEFAULT_VALUE_IDENTIFIER]))); + } } else { $this->setDefaultValueIdentifier(new FHIRIdentifier($data[self::FIELD_DEFAULT_VALUE_IDENTIFIER])); } @@ -2946,8 +3060,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DEFAULT_VALUE_INSTANT] instanceof FHIRInstant) { $this->setDefaultValueInstant($data[self::FIELD_DEFAULT_VALUE_INSTANT]); - } elseif ($ext && is_scalar($data[self::FIELD_DEFAULT_VALUE_INSTANT])) { - $this->setDefaultValueInstant(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_INSTANT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DEFAULT_VALUE_INSTANT])) { + $this->setDefaultValueInstant(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_INSTANT]] + $ext)); + } else if (is_array($data[self::FIELD_DEFAULT_VALUE_INSTANT])) { + $this->setDefaultValueInstant(new FHIRInstant(array_merge($ext, $data[self::FIELD_DEFAULT_VALUE_INSTANT]))); + } } else { $this->setDefaultValueInstant(new FHIRInstant($data[self::FIELD_DEFAULT_VALUE_INSTANT])); } @@ -2958,8 +3076,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DEFAULT_VALUE_INTEGER] instanceof FHIRInteger) { $this->setDefaultValueInteger($data[self::FIELD_DEFAULT_VALUE_INTEGER]); - } elseif ($ext && is_scalar($data[self::FIELD_DEFAULT_VALUE_INTEGER])) { - $this->setDefaultValueInteger(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_INTEGER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DEFAULT_VALUE_INTEGER])) { + $this->setDefaultValueInteger(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_INTEGER]] + $ext)); + } else if (is_array($data[self::FIELD_DEFAULT_VALUE_INTEGER])) { + $this->setDefaultValueInteger(new FHIRInteger(array_merge($ext, $data[self::FIELD_DEFAULT_VALUE_INTEGER]))); + } } else { $this->setDefaultValueInteger(new FHIRInteger($data[self::FIELD_DEFAULT_VALUE_INTEGER])); } @@ -2970,8 +3092,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DEFAULT_VALUE_MARKDOWN] instanceof FHIRMarkdown) { $this->setDefaultValueMarkdown($data[self::FIELD_DEFAULT_VALUE_MARKDOWN]); - } elseif ($ext && is_scalar($data[self::FIELD_DEFAULT_VALUE_MARKDOWN])) { - $this->setDefaultValueMarkdown(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_MARKDOWN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DEFAULT_VALUE_MARKDOWN])) { + $this->setDefaultValueMarkdown(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_MARKDOWN]] + $ext)); + } else if (is_array($data[self::FIELD_DEFAULT_VALUE_MARKDOWN])) { + $this->setDefaultValueMarkdown(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_DEFAULT_VALUE_MARKDOWN]))); + } } else { $this->setDefaultValueMarkdown(new FHIRMarkdown($data[self::FIELD_DEFAULT_VALUE_MARKDOWN])); } @@ -2984,8 +3110,17 @@ public function __construct($data = null) } } if (isset($data[self::FIELD_DEFAULT_VALUE_MONEY])) { + $ext = (isset($data[self::FIELD_DEFAULT_VALUE_MONEY_EXT]) && is_array($data[self::FIELD_DEFAULT_VALUE_MONEY_EXT])) + ? $data[self::FIELD_DEFAULT_VALUE_MONEY_EXT] + : null; if ($data[self::FIELD_DEFAULT_VALUE_MONEY] instanceof FHIRMoney) { $this->setDefaultValueMoney($data[self::FIELD_DEFAULT_VALUE_MONEY]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DEFAULT_VALUE_MONEY])) { + $this->setDefaultValueMoney(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_MONEY]] + $ext)); + } else if (is_array($data[self::FIELD_DEFAULT_VALUE_MONEY])) { + $this->setDefaultValueMoney(new FHIRMoney(array_merge($ext, $data[self::FIELD_DEFAULT_VALUE_MONEY]))); + } } else { $this->setDefaultValueMoney(new FHIRMoney($data[self::FIELD_DEFAULT_VALUE_MONEY])); } @@ -2996,8 +3131,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DEFAULT_VALUE_OID] instanceof FHIROid) { $this->setDefaultValueOid($data[self::FIELD_DEFAULT_VALUE_OID]); - } elseif ($ext && is_scalar($data[self::FIELD_DEFAULT_VALUE_OID])) { - $this->setDefaultValueOid(new FHIROid([FHIROid::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_OID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DEFAULT_VALUE_OID])) { + $this->setDefaultValueOid(new FHIROid([FHIROid::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_OID]] + $ext)); + } else if (is_array($data[self::FIELD_DEFAULT_VALUE_OID])) { + $this->setDefaultValueOid(new FHIROid(array_merge($ext, $data[self::FIELD_DEFAULT_VALUE_OID]))); + } } else { $this->setDefaultValueOid(new FHIROid($data[self::FIELD_DEFAULT_VALUE_OID])); } @@ -3015,8 +3154,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DEFAULT_VALUE_POSITIVE_INT] instanceof FHIRPositiveInt) { $this->setDefaultValuePositiveInt($data[self::FIELD_DEFAULT_VALUE_POSITIVE_INT]); - } elseif ($ext && is_scalar($data[self::FIELD_DEFAULT_VALUE_POSITIVE_INT])) { - $this->setDefaultValuePositiveInt(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_POSITIVE_INT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DEFAULT_VALUE_POSITIVE_INT])) { + $this->setDefaultValuePositiveInt(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_POSITIVE_INT]] + $ext)); + } else if (is_array($data[self::FIELD_DEFAULT_VALUE_POSITIVE_INT])) { + $this->setDefaultValuePositiveInt(new FHIRPositiveInt(array_merge($ext, $data[self::FIELD_DEFAULT_VALUE_POSITIVE_INT]))); + } } else { $this->setDefaultValuePositiveInt(new FHIRPositiveInt($data[self::FIELD_DEFAULT_VALUE_POSITIVE_INT])); } @@ -3027,8 +3170,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DEFAULT_VALUE_QUANTITY] instanceof FHIRQuantity) { $this->setDefaultValueQuantity($data[self::FIELD_DEFAULT_VALUE_QUANTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_DEFAULT_VALUE_QUANTITY])) { - $this->setDefaultValueQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_QUANTITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DEFAULT_VALUE_QUANTITY])) { + $this->setDefaultValueQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_DEFAULT_VALUE_QUANTITY])) { + $this->setDefaultValueQuantity(new FHIRQuantity(array_merge($ext, $data[self::FIELD_DEFAULT_VALUE_QUANTITY]))); + } } else { $this->setDefaultValueQuantity(new FHIRQuantity($data[self::FIELD_DEFAULT_VALUE_QUANTITY])); } @@ -3074,8 +3221,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DEFAULT_VALUE_STRING] instanceof FHIRString) { $this->setDefaultValueString($data[self::FIELD_DEFAULT_VALUE_STRING]); - } elseif ($ext && is_scalar($data[self::FIELD_DEFAULT_VALUE_STRING])) { - $this->setDefaultValueString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_STRING]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DEFAULT_VALUE_STRING])) { + $this->setDefaultValueString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_STRING]] + $ext)); + } else if (is_array($data[self::FIELD_DEFAULT_VALUE_STRING])) { + $this->setDefaultValueString(new FHIRString(array_merge($ext, $data[self::FIELD_DEFAULT_VALUE_STRING]))); + } } else { $this->setDefaultValueString(new FHIRString($data[self::FIELD_DEFAULT_VALUE_STRING])); } @@ -3086,8 +3237,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DEFAULT_VALUE_TIME] instanceof FHIRTime) { $this->setDefaultValueTime($data[self::FIELD_DEFAULT_VALUE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_DEFAULT_VALUE_TIME])) { - $this->setDefaultValueTime(new FHIRTime([FHIRTime::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DEFAULT_VALUE_TIME])) { + $this->setDefaultValueTime(new FHIRTime([FHIRTime::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_DEFAULT_VALUE_TIME])) { + $this->setDefaultValueTime(new FHIRTime(array_merge($ext, $data[self::FIELD_DEFAULT_VALUE_TIME]))); + } } else { $this->setDefaultValueTime(new FHIRTime($data[self::FIELD_DEFAULT_VALUE_TIME])); } @@ -3105,8 +3260,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DEFAULT_VALUE_UNSIGNED_INT] instanceof FHIRUnsignedInt) { $this->setDefaultValueUnsignedInt($data[self::FIELD_DEFAULT_VALUE_UNSIGNED_INT]); - } elseif ($ext && is_scalar($data[self::FIELD_DEFAULT_VALUE_UNSIGNED_INT])) { - $this->setDefaultValueUnsignedInt(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_UNSIGNED_INT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DEFAULT_VALUE_UNSIGNED_INT])) { + $this->setDefaultValueUnsignedInt(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_UNSIGNED_INT]] + $ext)); + } else if (is_array($data[self::FIELD_DEFAULT_VALUE_UNSIGNED_INT])) { + $this->setDefaultValueUnsignedInt(new FHIRUnsignedInt(array_merge($ext, $data[self::FIELD_DEFAULT_VALUE_UNSIGNED_INT]))); + } } else { $this->setDefaultValueUnsignedInt(new FHIRUnsignedInt($data[self::FIELD_DEFAULT_VALUE_UNSIGNED_INT])); } @@ -3117,8 +3276,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DEFAULT_VALUE_URI] instanceof FHIRUri) { $this->setDefaultValueUri($data[self::FIELD_DEFAULT_VALUE_URI]); - } elseif ($ext && is_scalar($data[self::FIELD_DEFAULT_VALUE_URI])) { - $this->setDefaultValueUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_URI]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DEFAULT_VALUE_URI])) { + $this->setDefaultValueUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_DEFAULT_VALUE_URI]] + $ext)); + } else if (is_array($data[self::FIELD_DEFAULT_VALUE_URI])) { + $this->setDefaultValueUri(new FHIRUri(array_merge($ext, $data[self::FIELD_DEFAULT_VALUE_URI]))); + } } else { $this->setDefaultValueUri(new FHIRUri($data[self::FIELD_DEFAULT_VALUE_URI])); } @@ -3129,8 +3292,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DEFINITION] instanceof FHIRMarkdown) { $this->setDefinition($data[self::FIELD_DEFINITION]); - } elseif ($ext && is_scalar($data[self::FIELD_DEFINITION])) { - $this->setDefinition(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_DEFINITION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DEFINITION])) { + $this->setDefinition(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_DEFINITION]] + $ext)); + } else if (is_array($data[self::FIELD_DEFINITION])) { + $this->setDefinition(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_DEFINITION]))); + } } else { $this->setDefinition(new FHIRMarkdown($data[self::FIELD_DEFINITION])); } @@ -3138,6 +3305,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_EXAMPLE])) { if (is_array($data[self::FIELD_EXAMPLE])) { foreach($data[self::FIELD_EXAMPLE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRElementDefinitionExample) { $this->addExample($v); } else { @@ -3158,8 +3328,17 @@ public function __construct($data = null) } } if (isset($data[self::FIELD_FIXED_AGE])) { + $ext = (isset($data[self::FIELD_FIXED_AGE_EXT]) && is_array($data[self::FIELD_FIXED_AGE_EXT])) + ? $data[self::FIELD_FIXED_AGE_EXT] + : null; if ($data[self::FIELD_FIXED_AGE] instanceof FHIRAge) { $this->setFixedAge($data[self::FIELD_FIXED_AGE]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_FIXED_AGE])) { + $this->setFixedAge(new FHIRAge([FHIRAge::FIELD_VALUE => $data[self::FIELD_FIXED_AGE]] + $ext)); + } else if (is_array($data[self::FIELD_FIXED_AGE])) { + $this->setFixedAge(new FHIRAge(array_merge($ext, $data[self::FIELD_FIXED_AGE]))); + } } else { $this->setFixedAge(new FHIRAge($data[self::FIELD_FIXED_AGE])); } @@ -3184,8 +3363,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_FIXED_BASE_64BINARY] instanceof FHIRBase64Binary) { $this->setFixedBase64Binary($data[self::FIELD_FIXED_BASE_64BINARY]); - } elseif ($ext && is_scalar($data[self::FIELD_FIXED_BASE_64BINARY])) { - $this->setFixedBase64Binary(new FHIRBase64Binary([FHIRBase64Binary::FIELD_VALUE => $data[self::FIELD_FIXED_BASE_64BINARY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_FIXED_BASE_64BINARY])) { + $this->setFixedBase64Binary(new FHIRBase64Binary([FHIRBase64Binary::FIELD_VALUE => $data[self::FIELD_FIXED_BASE_64BINARY]] + $ext)); + } else if (is_array($data[self::FIELD_FIXED_BASE_64BINARY])) { + $this->setFixedBase64Binary(new FHIRBase64Binary(array_merge($ext, $data[self::FIELD_FIXED_BASE_64BINARY]))); + } } else { $this->setFixedBase64Binary(new FHIRBase64Binary($data[self::FIELD_FIXED_BASE_64BINARY])); } @@ -3196,8 +3379,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_FIXED_BOOLEAN] instanceof FHIRBoolean) { $this->setFixedBoolean($data[self::FIELD_FIXED_BOOLEAN]); - } elseif ($ext && is_scalar($data[self::FIELD_FIXED_BOOLEAN])) { - $this->setFixedBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_FIXED_BOOLEAN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_FIXED_BOOLEAN])) { + $this->setFixedBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_FIXED_BOOLEAN]] + $ext)); + } else if (is_array($data[self::FIELD_FIXED_BOOLEAN])) { + $this->setFixedBoolean(new FHIRBoolean(array_merge($ext, $data[self::FIELD_FIXED_BOOLEAN]))); + } } else { $this->setFixedBoolean(new FHIRBoolean($data[self::FIELD_FIXED_BOOLEAN])); } @@ -3208,8 +3395,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_FIXED_CODE] instanceof FHIRCode) { $this->setFixedCode($data[self::FIELD_FIXED_CODE]); - } elseif ($ext && is_scalar($data[self::FIELD_FIXED_CODE])) { - $this->setFixedCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_FIXED_CODE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_FIXED_CODE])) { + $this->setFixedCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_FIXED_CODE]] + $ext)); + } else if (is_array($data[self::FIELD_FIXED_CODE])) { + $this->setFixedCode(new FHIRCode(array_merge($ext, $data[self::FIELD_FIXED_CODE]))); + } } else { $this->setFixedCode(new FHIRCode($data[self::FIELD_FIXED_CODE])); } @@ -3234,15 +3425,28 @@ public function __construct($data = null) : null; if ($data[self::FIELD_FIXED_CONTACT_POINT] instanceof FHIRContactPoint) { $this->setFixedContactPoint($data[self::FIELD_FIXED_CONTACT_POINT]); - } elseif ($ext && is_scalar($data[self::FIELD_FIXED_CONTACT_POINT])) { - $this->setFixedContactPoint(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $data[self::FIELD_FIXED_CONTACT_POINT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_FIXED_CONTACT_POINT])) { + $this->setFixedContactPoint(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $data[self::FIELD_FIXED_CONTACT_POINT]] + $ext)); + } else if (is_array($data[self::FIELD_FIXED_CONTACT_POINT])) { + $this->setFixedContactPoint(new FHIRContactPoint(array_merge($ext, $data[self::FIELD_FIXED_CONTACT_POINT]))); + } } else { $this->setFixedContactPoint(new FHIRContactPoint($data[self::FIELD_FIXED_CONTACT_POINT])); } } if (isset($data[self::FIELD_FIXED_COUNT])) { + $ext = (isset($data[self::FIELD_FIXED_COUNT_EXT]) && is_array($data[self::FIELD_FIXED_COUNT_EXT])) + ? $data[self::FIELD_FIXED_COUNT_EXT] + : null; if ($data[self::FIELD_FIXED_COUNT] instanceof FHIRCount) { $this->setFixedCount($data[self::FIELD_FIXED_COUNT]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_FIXED_COUNT])) { + $this->setFixedCount(new FHIRCount([FHIRCount::FIELD_VALUE => $data[self::FIELD_FIXED_COUNT]] + $ext)); + } else if (is_array($data[self::FIELD_FIXED_COUNT])) { + $this->setFixedCount(new FHIRCount(array_merge($ext, $data[self::FIELD_FIXED_COUNT]))); + } } else { $this->setFixedCount(new FHIRCount($data[self::FIELD_FIXED_COUNT])); } @@ -3253,8 +3457,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_FIXED_DATE] instanceof FHIRDate) { $this->setFixedDate($data[self::FIELD_FIXED_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_FIXED_DATE])) { - $this->setFixedDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_FIXED_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_FIXED_DATE])) { + $this->setFixedDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_FIXED_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_FIXED_DATE])) { + $this->setFixedDate(new FHIRDate(array_merge($ext, $data[self::FIELD_FIXED_DATE]))); + } } else { $this->setFixedDate(new FHIRDate($data[self::FIELD_FIXED_DATE])); } @@ -3265,8 +3473,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_FIXED_DATE_TIME] instanceof FHIRDateTime) { $this->setFixedDateTime($data[self::FIELD_FIXED_DATE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_FIXED_DATE_TIME])) { - $this->setFixedDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_FIXED_DATE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_FIXED_DATE_TIME])) { + $this->setFixedDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_FIXED_DATE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_FIXED_DATE_TIME])) { + $this->setFixedDateTime(new FHIRDateTime(array_merge($ext, $data[self::FIELD_FIXED_DATE_TIME]))); + } } else { $this->setFixedDateTime(new FHIRDateTime($data[self::FIELD_FIXED_DATE_TIME])); } @@ -3277,22 +3489,44 @@ public function __construct($data = null) : null; if ($data[self::FIELD_FIXED_DECIMAL] instanceof FHIRDecimal) { $this->setFixedDecimal($data[self::FIELD_FIXED_DECIMAL]); - } elseif ($ext && is_scalar($data[self::FIELD_FIXED_DECIMAL])) { - $this->setFixedDecimal(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_FIXED_DECIMAL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_FIXED_DECIMAL])) { + $this->setFixedDecimal(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_FIXED_DECIMAL]] + $ext)); + } else if (is_array($data[self::FIELD_FIXED_DECIMAL])) { + $this->setFixedDecimal(new FHIRDecimal(array_merge($ext, $data[self::FIELD_FIXED_DECIMAL]))); + } } else { $this->setFixedDecimal(new FHIRDecimal($data[self::FIELD_FIXED_DECIMAL])); } } if (isset($data[self::FIELD_FIXED_DISTANCE])) { + $ext = (isset($data[self::FIELD_FIXED_DISTANCE_EXT]) && is_array($data[self::FIELD_FIXED_DISTANCE_EXT])) + ? $data[self::FIELD_FIXED_DISTANCE_EXT] + : null; if ($data[self::FIELD_FIXED_DISTANCE] instanceof FHIRDistance) { $this->setFixedDistance($data[self::FIELD_FIXED_DISTANCE]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_FIXED_DISTANCE])) { + $this->setFixedDistance(new FHIRDistance([FHIRDistance::FIELD_VALUE => $data[self::FIELD_FIXED_DISTANCE]] + $ext)); + } else if (is_array($data[self::FIELD_FIXED_DISTANCE])) { + $this->setFixedDistance(new FHIRDistance(array_merge($ext, $data[self::FIELD_FIXED_DISTANCE]))); + } } else { $this->setFixedDistance(new FHIRDistance($data[self::FIELD_FIXED_DISTANCE])); } } if (isset($data[self::FIELD_FIXED_DURATION])) { + $ext = (isset($data[self::FIELD_FIXED_DURATION_EXT]) && is_array($data[self::FIELD_FIXED_DURATION_EXT])) + ? $data[self::FIELD_FIXED_DURATION_EXT] + : null; if ($data[self::FIELD_FIXED_DURATION] instanceof FHIRDuration) { $this->setFixedDuration($data[self::FIELD_FIXED_DURATION]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_FIXED_DURATION])) { + $this->setFixedDuration(new FHIRDuration([FHIRDuration::FIELD_VALUE => $data[self::FIELD_FIXED_DURATION]] + $ext)); + } else if (is_array($data[self::FIELD_FIXED_DURATION])) { + $this->setFixedDuration(new FHIRDuration(array_merge($ext, $data[self::FIELD_FIXED_DURATION]))); + } } else { $this->setFixedDuration(new FHIRDuration($data[self::FIELD_FIXED_DURATION])); } @@ -3310,8 +3544,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_FIXED_ID] instanceof FHIRId) { $this->setFixedId($data[self::FIELD_FIXED_ID]); - } elseif ($ext && is_scalar($data[self::FIELD_FIXED_ID])) { - $this->setFixedId(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_FIXED_ID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_FIXED_ID])) { + $this->setFixedId(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_FIXED_ID]] + $ext)); + } else if (is_array($data[self::FIELD_FIXED_ID])) { + $this->setFixedId(new FHIRId(array_merge($ext, $data[self::FIELD_FIXED_ID]))); + } } else { $this->setFixedId(new FHIRId($data[self::FIELD_FIXED_ID])); } @@ -3322,8 +3560,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_FIXED_IDENTIFIER] instanceof FHIRIdentifier) { $this->setFixedIdentifier($data[self::FIELD_FIXED_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_FIXED_IDENTIFIER])) { - $this->setFixedIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_FIXED_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_FIXED_IDENTIFIER])) { + $this->setFixedIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_FIXED_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_FIXED_IDENTIFIER])) { + $this->setFixedIdentifier(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_FIXED_IDENTIFIER]))); + } } else { $this->setFixedIdentifier(new FHIRIdentifier($data[self::FIELD_FIXED_IDENTIFIER])); } @@ -3334,8 +3576,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_FIXED_INSTANT] instanceof FHIRInstant) { $this->setFixedInstant($data[self::FIELD_FIXED_INSTANT]); - } elseif ($ext && is_scalar($data[self::FIELD_FIXED_INSTANT])) { - $this->setFixedInstant(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_FIXED_INSTANT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_FIXED_INSTANT])) { + $this->setFixedInstant(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_FIXED_INSTANT]] + $ext)); + } else if (is_array($data[self::FIELD_FIXED_INSTANT])) { + $this->setFixedInstant(new FHIRInstant(array_merge($ext, $data[self::FIELD_FIXED_INSTANT]))); + } } else { $this->setFixedInstant(new FHIRInstant($data[self::FIELD_FIXED_INSTANT])); } @@ -3346,8 +3592,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_FIXED_INTEGER] instanceof FHIRInteger) { $this->setFixedInteger($data[self::FIELD_FIXED_INTEGER]); - } elseif ($ext && is_scalar($data[self::FIELD_FIXED_INTEGER])) { - $this->setFixedInteger(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_FIXED_INTEGER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_FIXED_INTEGER])) { + $this->setFixedInteger(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_FIXED_INTEGER]] + $ext)); + } else if (is_array($data[self::FIELD_FIXED_INTEGER])) { + $this->setFixedInteger(new FHIRInteger(array_merge($ext, $data[self::FIELD_FIXED_INTEGER]))); + } } else { $this->setFixedInteger(new FHIRInteger($data[self::FIELD_FIXED_INTEGER])); } @@ -3358,8 +3608,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_FIXED_MARKDOWN] instanceof FHIRMarkdown) { $this->setFixedMarkdown($data[self::FIELD_FIXED_MARKDOWN]); - } elseif ($ext && is_scalar($data[self::FIELD_FIXED_MARKDOWN])) { - $this->setFixedMarkdown(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_FIXED_MARKDOWN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_FIXED_MARKDOWN])) { + $this->setFixedMarkdown(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_FIXED_MARKDOWN]] + $ext)); + } else if (is_array($data[self::FIELD_FIXED_MARKDOWN])) { + $this->setFixedMarkdown(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_FIXED_MARKDOWN]))); + } } else { $this->setFixedMarkdown(new FHIRMarkdown($data[self::FIELD_FIXED_MARKDOWN])); } @@ -3372,8 +3626,17 @@ public function __construct($data = null) } } if (isset($data[self::FIELD_FIXED_MONEY])) { + $ext = (isset($data[self::FIELD_FIXED_MONEY_EXT]) && is_array($data[self::FIELD_FIXED_MONEY_EXT])) + ? $data[self::FIELD_FIXED_MONEY_EXT] + : null; if ($data[self::FIELD_FIXED_MONEY] instanceof FHIRMoney) { $this->setFixedMoney($data[self::FIELD_FIXED_MONEY]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_FIXED_MONEY])) { + $this->setFixedMoney(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_FIXED_MONEY]] + $ext)); + } else if (is_array($data[self::FIELD_FIXED_MONEY])) { + $this->setFixedMoney(new FHIRMoney(array_merge($ext, $data[self::FIELD_FIXED_MONEY]))); + } } else { $this->setFixedMoney(new FHIRMoney($data[self::FIELD_FIXED_MONEY])); } @@ -3384,8 +3647,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_FIXED_OID] instanceof FHIROid) { $this->setFixedOid($data[self::FIELD_FIXED_OID]); - } elseif ($ext && is_scalar($data[self::FIELD_FIXED_OID])) { - $this->setFixedOid(new FHIROid([FHIROid::FIELD_VALUE => $data[self::FIELD_FIXED_OID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_FIXED_OID])) { + $this->setFixedOid(new FHIROid([FHIROid::FIELD_VALUE => $data[self::FIELD_FIXED_OID]] + $ext)); + } else if (is_array($data[self::FIELD_FIXED_OID])) { + $this->setFixedOid(new FHIROid(array_merge($ext, $data[self::FIELD_FIXED_OID]))); + } } else { $this->setFixedOid(new FHIROid($data[self::FIELD_FIXED_OID])); } @@ -3403,8 +3670,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_FIXED_POSITIVE_INT] instanceof FHIRPositiveInt) { $this->setFixedPositiveInt($data[self::FIELD_FIXED_POSITIVE_INT]); - } elseif ($ext && is_scalar($data[self::FIELD_FIXED_POSITIVE_INT])) { - $this->setFixedPositiveInt(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_FIXED_POSITIVE_INT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_FIXED_POSITIVE_INT])) { + $this->setFixedPositiveInt(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_FIXED_POSITIVE_INT]] + $ext)); + } else if (is_array($data[self::FIELD_FIXED_POSITIVE_INT])) { + $this->setFixedPositiveInt(new FHIRPositiveInt(array_merge($ext, $data[self::FIELD_FIXED_POSITIVE_INT]))); + } } else { $this->setFixedPositiveInt(new FHIRPositiveInt($data[self::FIELD_FIXED_POSITIVE_INT])); } @@ -3415,8 +3686,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_FIXED_QUANTITY] instanceof FHIRQuantity) { $this->setFixedQuantity($data[self::FIELD_FIXED_QUANTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_FIXED_QUANTITY])) { - $this->setFixedQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_FIXED_QUANTITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_FIXED_QUANTITY])) { + $this->setFixedQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_FIXED_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_FIXED_QUANTITY])) { + $this->setFixedQuantity(new FHIRQuantity(array_merge($ext, $data[self::FIELD_FIXED_QUANTITY]))); + } } else { $this->setFixedQuantity(new FHIRQuantity($data[self::FIELD_FIXED_QUANTITY])); } @@ -3462,8 +3737,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_FIXED_STRING] instanceof FHIRString) { $this->setFixedString($data[self::FIELD_FIXED_STRING]); - } elseif ($ext && is_scalar($data[self::FIELD_FIXED_STRING])) { - $this->setFixedString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_FIXED_STRING]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_FIXED_STRING])) { + $this->setFixedString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_FIXED_STRING]] + $ext)); + } else if (is_array($data[self::FIELD_FIXED_STRING])) { + $this->setFixedString(new FHIRString(array_merge($ext, $data[self::FIELD_FIXED_STRING]))); + } } else { $this->setFixedString(new FHIRString($data[self::FIELD_FIXED_STRING])); } @@ -3474,8 +3753,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_FIXED_TIME] instanceof FHIRTime) { $this->setFixedTime($data[self::FIELD_FIXED_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_FIXED_TIME])) { - $this->setFixedTime(new FHIRTime([FHIRTime::FIELD_VALUE => $data[self::FIELD_FIXED_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_FIXED_TIME])) { + $this->setFixedTime(new FHIRTime([FHIRTime::FIELD_VALUE => $data[self::FIELD_FIXED_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_FIXED_TIME])) { + $this->setFixedTime(new FHIRTime(array_merge($ext, $data[self::FIELD_FIXED_TIME]))); + } } else { $this->setFixedTime(new FHIRTime($data[self::FIELD_FIXED_TIME])); } @@ -3493,8 +3776,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_FIXED_UNSIGNED_INT] instanceof FHIRUnsignedInt) { $this->setFixedUnsignedInt($data[self::FIELD_FIXED_UNSIGNED_INT]); - } elseif ($ext && is_scalar($data[self::FIELD_FIXED_UNSIGNED_INT])) { - $this->setFixedUnsignedInt(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_FIXED_UNSIGNED_INT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_FIXED_UNSIGNED_INT])) { + $this->setFixedUnsignedInt(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_FIXED_UNSIGNED_INT]] + $ext)); + } else if (is_array($data[self::FIELD_FIXED_UNSIGNED_INT])) { + $this->setFixedUnsignedInt(new FHIRUnsignedInt(array_merge($ext, $data[self::FIELD_FIXED_UNSIGNED_INT]))); + } } else { $this->setFixedUnsignedInt(new FHIRUnsignedInt($data[self::FIELD_FIXED_UNSIGNED_INT])); } @@ -3505,8 +3792,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_FIXED_URI] instanceof FHIRUri) { $this->setFixedUri($data[self::FIELD_FIXED_URI]); - } elseif ($ext && is_scalar($data[self::FIELD_FIXED_URI])) { - $this->setFixedUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_FIXED_URI]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_FIXED_URI])) { + $this->setFixedUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_FIXED_URI]] + $ext)); + } else if (is_array($data[self::FIELD_FIXED_URI])) { + $this->setFixedUri(new FHIRUri(array_merge($ext, $data[self::FIELD_FIXED_URI]))); + } } else { $this->setFixedUri(new FHIRUri($data[self::FIELD_FIXED_URI])); } @@ -3517,8 +3808,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IS_MODIFIER] instanceof FHIRBoolean) { $this->setIsModifier($data[self::FIELD_IS_MODIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IS_MODIFIER])) { - $this->setIsModifier(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_IS_MODIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IS_MODIFIER])) { + $this->setIsModifier(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_IS_MODIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_IS_MODIFIER])) { + $this->setIsModifier(new FHIRBoolean(array_merge($ext, $data[self::FIELD_IS_MODIFIER]))); + } } else { $this->setIsModifier(new FHIRBoolean($data[self::FIELD_IS_MODIFIER])); } @@ -3529,8 +3824,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IS_SUMMARY] instanceof FHIRBoolean) { $this->setIsSummary($data[self::FIELD_IS_SUMMARY]); - } elseif ($ext && is_scalar($data[self::FIELD_IS_SUMMARY])) { - $this->setIsSummary(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_IS_SUMMARY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IS_SUMMARY])) { + $this->setIsSummary(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_IS_SUMMARY]] + $ext)); + } else if (is_array($data[self::FIELD_IS_SUMMARY])) { + $this->setIsSummary(new FHIRBoolean(array_merge($ext, $data[self::FIELD_IS_SUMMARY]))); + } } else { $this->setIsSummary(new FHIRBoolean($data[self::FIELD_IS_SUMMARY])); } @@ -3541,8 +3840,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_LABEL] instanceof FHIRString) { $this->setLabel($data[self::FIELD_LABEL]); - } elseif ($ext && is_scalar($data[self::FIELD_LABEL])) { - $this->setLabel(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_LABEL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_LABEL])) { + $this->setLabel(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_LABEL]] + $ext)); + } else if (is_array($data[self::FIELD_LABEL])) { + $this->setLabel(new FHIRString(array_merge($ext, $data[self::FIELD_LABEL]))); + } } else { $this->setLabel(new FHIRString($data[self::FIELD_LABEL])); } @@ -3550,6 +3853,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_MAPPING])) { if (is_array($data[self::FIELD_MAPPING])) { foreach($data[self::FIELD_MAPPING] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRElementDefinitionMapping) { $this->addMapping($v); } else { @@ -3568,8 +3874,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MAX] instanceof FHIRString) { $this->setMax($data[self::FIELD_MAX]); - } elseif ($ext && is_scalar($data[self::FIELD_MAX])) { - $this->setMax(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_MAX]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MAX])) { + $this->setMax(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_MAX]] + $ext)); + } else if (is_array($data[self::FIELD_MAX])) { + $this->setMax(new FHIRString(array_merge($ext, $data[self::FIELD_MAX]))); + } } else { $this->setMax(new FHIRString($data[self::FIELD_MAX])); } @@ -3580,8 +3890,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MAX_LENGTH] instanceof FHIRInteger) { $this->setMaxLength($data[self::FIELD_MAX_LENGTH]); - } elseif ($ext && is_scalar($data[self::FIELD_MAX_LENGTH])) { - $this->setMaxLength(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_MAX_LENGTH]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MAX_LENGTH])) { + $this->setMaxLength(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_MAX_LENGTH]] + $ext)); + } else if (is_array($data[self::FIELD_MAX_LENGTH])) { + $this->setMaxLength(new FHIRInteger(array_merge($ext, $data[self::FIELD_MAX_LENGTH]))); + } } else { $this->setMaxLength(new FHIRInteger($data[self::FIELD_MAX_LENGTH])); } @@ -3592,8 +3906,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MAX_VALUE_DATE] instanceof FHIRDate) { $this->setMaxValueDate($data[self::FIELD_MAX_VALUE_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_MAX_VALUE_DATE])) { - $this->setMaxValueDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_MAX_VALUE_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MAX_VALUE_DATE])) { + $this->setMaxValueDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_MAX_VALUE_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_MAX_VALUE_DATE])) { + $this->setMaxValueDate(new FHIRDate(array_merge($ext, $data[self::FIELD_MAX_VALUE_DATE]))); + } } else { $this->setMaxValueDate(new FHIRDate($data[self::FIELD_MAX_VALUE_DATE])); } @@ -3604,8 +3922,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MAX_VALUE_DATE_TIME] instanceof FHIRDateTime) { $this->setMaxValueDateTime($data[self::FIELD_MAX_VALUE_DATE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_MAX_VALUE_DATE_TIME])) { - $this->setMaxValueDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_MAX_VALUE_DATE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MAX_VALUE_DATE_TIME])) { + $this->setMaxValueDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_MAX_VALUE_DATE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_MAX_VALUE_DATE_TIME])) { + $this->setMaxValueDateTime(new FHIRDateTime(array_merge($ext, $data[self::FIELD_MAX_VALUE_DATE_TIME]))); + } } else { $this->setMaxValueDateTime(new FHIRDateTime($data[self::FIELD_MAX_VALUE_DATE_TIME])); } @@ -3616,8 +3938,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MAX_VALUE_DECIMAL] instanceof FHIRDecimal) { $this->setMaxValueDecimal($data[self::FIELD_MAX_VALUE_DECIMAL]); - } elseif ($ext && is_scalar($data[self::FIELD_MAX_VALUE_DECIMAL])) { - $this->setMaxValueDecimal(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_MAX_VALUE_DECIMAL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MAX_VALUE_DECIMAL])) { + $this->setMaxValueDecimal(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_MAX_VALUE_DECIMAL]] + $ext)); + } else if (is_array($data[self::FIELD_MAX_VALUE_DECIMAL])) { + $this->setMaxValueDecimal(new FHIRDecimal(array_merge($ext, $data[self::FIELD_MAX_VALUE_DECIMAL]))); + } } else { $this->setMaxValueDecimal(new FHIRDecimal($data[self::FIELD_MAX_VALUE_DECIMAL])); } @@ -3628,8 +3954,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MAX_VALUE_INSTANT] instanceof FHIRInstant) { $this->setMaxValueInstant($data[self::FIELD_MAX_VALUE_INSTANT]); - } elseif ($ext && is_scalar($data[self::FIELD_MAX_VALUE_INSTANT])) { - $this->setMaxValueInstant(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_MAX_VALUE_INSTANT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MAX_VALUE_INSTANT])) { + $this->setMaxValueInstant(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_MAX_VALUE_INSTANT]] + $ext)); + } else if (is_array($data[self::FIELD_MAX_VALUE_INSTANT])) { + $this->setMaxValueInstant(new FHIRInstant(array_merge($ext, $data[self::FIELD_MAX_VALUE_INSTANT]))); + } } else { $this->setMaxValueInstant(new FHIRInstant($data[self::FIELD_MAX_VALUE_INSTANT])); } @@ -3640,8 +3970,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MAX_VALUE_INTEGER] instanceof FHIRInteger) { $this->setMaxValueInteger($data[self::FIELD_MAX_VALUE_INTEGER]); - } elseif ($ext && is_scalar($data[self::FIELD_MAX_VALUE_INTEGER])) { - $this->setMaxValueInteger(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_MAX_VALUE_INTEGER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MAX_VALUE_INTEGER])) { + $this->setMaxValueInteger(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_MAX_VALUE_INTEGER]] + $ext)); + } else if (is_array($data[self::FIELD_MAX_VALUE_INTEGER])) { + $this->setMaxValueInteger(new FHIRInteger(array_merge($ext, $data[self::FIELD_MAX_VALUE_INTEGER]))); + } } else { $this->setMaxValueInteger(new FHIRInteger($data[self::FIELD_MAX_VALUE_INTEGER])); } @@ -3652,8 +3986,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MAX_VALUE_POSITIVE_INT] instanceof FHIRPositiveInt) { $this->setMaxValuePositiveInt($data[self::FIELD_MAX_VALUE_POSITIVE_INT]); - } elseif ($ext && is_scalar($data[self::FIELD_MAX_VALUE_POSITIVE_INT])) { - $this->setMaxValuePositiveInt(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_MAX_VALUE_POSITIVE_INT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MAX_VALUE_POSITIVE_INT])) { + $this->setMaxValuePositiveInt(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_MAX_VALUE_POSITIVE_INT]] + $ext)); + } else if (is_array($data[self::FIELD_MAX_VALUE_POSITIVE_INT])) { + $this->setMaxValuePositiveInt(new FHIRPositiveInt(array_merge($ext, $data[self::FIELD_MAX_VALUE_POSITIVE_INT]))); + } } else { $this->setMaxValuePositiveInt(new FHIRPositiveInt($data[self::FIELD_MAX_VALUE_POSITIVE_INT])); } @@ -3664,8 +4002,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MAX_VALUE_QUANTITY] instanceof FHIRQuantity) { $this->setMaxValueQuantity($data[self::FIELD_MAX_VALUE_QUANTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_MAX_VALUE_QUANTITY])) { - $this->setMaxValueQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_MAX_VALUE_QUANTITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MAX_VALUE_QUANTITY])) { + $this->setMaxValueQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_MAX_VALUE_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_MAX_VALUE_QUANTITY])) { + $this->setMaxValueQuantity(new FHIRQuantity(array_merge($ext, $data[self::FIELD_MAX_VALUE_QUANTITY]))); + } } else { $this->setMaxValueQuantity(new FHIRQuantity($data[self::FIELD_MAX_VALUE_QUANTITY])); } @@ -3676,8 +4018,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MAX_VALUE_TIME] instanceof FHIRTime) { $this->setMaxValueTime($data[self::FIELD_MAX_VALUE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_MAX_VALUE_TIME])) { - $this->setMaxValueTime(new FHIRTime([FHIRTime::FIELD_VALUE => $data[self::FIELD_MAX_VALUE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MAX_VALUE_TIME])) { + $this->setMaxValueTime(new FHIRTime([FHIRTime::FIELD_VALUE => $data[self::FIELD_MAX_VALUE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_MAX_VALUE_TIME])) { + $this->setMaxValueTime(new FHIRTime(array_merge($ext, $data[self::FIELD_MAX_VALUE_TIME]))); + } } else { $this->setMaxValueTime(new FHIRTime($data[self::FIELD_MAX_VALUE_TIME])); } @@ -3688,8 +4034,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MAX_VALUE_UNSIGNED_INT] instanceof FHIRUnsignedInt) { $this->setMaxValueUnsignedInt($data[self::FIELD_MAX_VALUE_UNSIGNED_INT]); - } elseif ($ext && is_scalar($data[self::FIELD_MAX_VALUE_UNSIGNED_INT])) { - $this->setMaxValueUnsignedInt(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_MAX_VALUE_UNSIGNED_INT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MAX_VALUE_UNSIGNED_INT])) { + $this->setMaxValueUnsignedInt(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_MAX_VALUE_UNSIGNED_INT]] + $ext)); + } else if (is_array($data[self::FIELD_MAX_VALUE_UNSIGNED_INT])) { + $this->setMaxValueUnsignedInt(new FHIRUnsignedInt(array_merge($ext, $data[self::FIELD_MAX_VALUE_UNSIGNED_INT]))); + } } else { $this->setMaxValueUnsignedInt(new FHIRUnsignedInt($data[self::FIELD_MAX_VALUE_UNSIGNED_INT])); } @@ -3700,8 +4050,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MEANING_WHEN_MISSING] instanceof FHIRMarkdown) { $this->setMeaningWhenMissing($data[self::FIELD_MEANING_WHEN_MISSING]); - } elseif ($ext && is_scalar($data[self::FIELD_MEANING_WHEN_MISSING])) { - $this->setMeaningWhenMissing(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_MEANING_WHEN_MISSING]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MEANING_WHEN_MISSING])) { + $this->setMeaningWhenMissing(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_MEANING_WHEN_MISSING]] + $ext)); + } else if (is_array($data[self::FIELD_MEANING_WHEN_MISSING])) { + $this->setMeaningWhenMissing(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_MEANING_WHEN_MISSING]))); + } } else { $this->setMeaningWhenMissing(new FHIRMarkdown($data[self::FIELD_MEANING_WHEN_MISSING])); } @@ -3712,8 +4066,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MIN] instanceof FHIRUnsignedInt) { $this->setMin($data[self::FIELD_MIN]); - } elseif ($ext && is_scalar($data[self::FIELD_MIN])) { - $this->setMin(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_MIN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MIN])) { + $this->setMin(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_MIN]] + $ext)); + } else if (is_array($data[self::FIELD_MIN])) { + $this->setMin(new FHIRUnsignedInt(array_merge($ext, $data[self::FIELD_MIN]))); + } } else { $this->setMin(new FHIRUnsignedInt($data[self::FIELD_MIN])); } @@ -3724,8 +4082,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MIN_VALUE_DATE] instanceof FHIRDate) { $this->setMinValueDate($data[self::FIELD_MIN_VALUE_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_MIN_VALUE_DATE])) { - $this->setMinValueDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_MIN_VALUE_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MIN_VALUE_DATE])) { + $this->setMinValueDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_MIN_VALUE_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_MIN_VALUE_DATE])) { + $this->setMinValueDate(new FHIRDate(array_merge($ext, $data[self::FIELD_MIN_VALUE_DATE]))); + } } else { $this->setMinValueDate(new FHIRDate($data[self::FIELD_MIN_VALUE_DATE])); } @@ -3736,8 +4098,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MIN_VALUE_DATE_TIME] instanceof FHIRDateTime) { $this->setMinValueDateTime($data[self::FIELD_MIN_VALUE_DATE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_MIN_VALUE_DATE_TIME])) { - $this->setMinValueDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_MIN_VALUE_DATE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MIN_VALUE_DATE_TIME])) { + $this->setMinValueDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_MIN_VALUE_DATE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_MIN_VALUE_DATE_TIME])) { + $this->setMinValueDateTime(new FHIRDateTime(array_merge($ext, $data[self::FIELD_MIN_VALUE_DATE_TIME]))); + } } else { $this->setMinValueDateTime(new FHIRDateTime($data[self::FIELD_MIN_VALUE_DATE_TIME])); } @@ -3748,8 +4114,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MIN_VALUE_DECIMAL] instanceof FHIRDecimal) { $this->setMinValueDecimal($data[self::FIELD_MIN_VALUE_DECIMAL]); - } elseif ($ext && is_scalar($data[self::FIELD_MIN_VALUE_DECIMAL])) { - $this->setMinValueDecimal(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_MIN_VALUE_DECIMAL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MIN_VALUE_DECIMAL])) { + $this->setMinValueDecimal(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_MIN_VALUE_DECIMAL]] + $ext)); + } else if (is_array($data[self::FIELD_MIN_VALUE_DECIMAL])) { + $this->setMinValueDecimal(new FHIRDecimal(array_merge($ext, $data[self::FIELD_MIN_VALUE_DECIMAL]))); + } } else { $this->setMinValueDecimal(new FHIRDecimal($data[self::FIELD_MIN_VALUE_DECIMAL])); } @@ -3760,8 +4130,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MIN_VALUE_INSTANT] instanceof FHIRInstant) { $this->setMinValueInstant($data[self::FIELD_MIN_VALUE_INSTANT]); - } elseif ($ext && is_scalar($data[self::FIELD_MIN_VALUE_INSTANT])) { - $this->setMinValueInstant(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_MIN_VALUE_INSTANT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MIN_VALUE_INSTANT])) { + $this->setMinValueInstant(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_MIN_VALUE_INSTANT]] + $ext)); + } else if (is_array($data[self::FIELD_MIN_VALUE_INSTANT])) { + $this->setMinValueInstant(new FHIRInstant(array_merge($ext, $data[self::FIELD_MIN_VALUE_INSTANT]))); + } } else { $this->setMinValueInstant(new FHIRInstant($data[self::FIELD_MIN_VALUE_INSTANT])); } @@ -3772,8 +4146,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MIN_VALUE_INTEGER] instanceof FHIRInteger) { $this->setMinValueInteger($data[self::FIELD_MIN_VALUE_INTEGER]); - } elseif ($ext && is_scalar($data[self::FIELD_MIN_VALUE_INTEGER])) { - $this->setMinValueInteger(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_MIN_VALUE_INTEGER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MIN_VALUE_INTEGER])) { + $this->setMinValueInteger(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_MIN_VALUE_INTEGER]] + $ext)); + } else if (is_array($data[self::FIELD_MIN_VALUE_INTEGER])) { + $this->setMinValueInteger(new FHIRInteger(array_merge($ext, $data[self::FIELD_MIN_VALUE_INTEGER]))); + } } else { $this->setMinValueInteger(new FHIRInteger($data[self::FIELD_MIN_VALUE_INTEGER])); } @@ -3784,8 +4162,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MIN_VALUE_POSITIVE_INT] instanceof FHIRPositiveInt) { $this->setMinValuePositiveInt($data[self::FIELD_MIN_VALUE_POSITIVE_INT]); - } elseif ($ext && is_scalar($data[self::FIELD_MIN_VALUE_POSITIVE_INT])) { - $this->setMinValuePositiveInt(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_MIN_VALUE_POSITIVE_INT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MIN_VALUE_POSITIVE_INT])) { + $this->setMinValuePositiveInt(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_MIN_VALUE_POSITIVE_INT]] + $ext)); + } else if (is_array($data[self::FIELD_MIN_VALUE_POSITIVE_INT])) { + $this->setMinValuePositiveInt(new FHIRPositiveInt(array_merge($ext, $data[self::FIELD_MIN_VALUE_POSITIVE_INT]))); + } } else { $this->setMinValuePositiveInt(new FHIRPositiveInt($data[self::FIELD_MIN_VALUE_POSITIVE_INT])); } @@ -3796,8 +4178,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MIN_VALUE_QUANTITY] instanceof FHIRQuantity) { $this->setMinValueQuantity($data[self::FIELD_MIN_VALUE_QUANTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_MIN_VALUE_QUANTITY])) { - $this->setMinValueQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_MIN_VALUE_QUANTITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MIN_VALUE_QUANTITY])) { + $this->setMinValueQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_MIN_VALUE_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_MIN_VALUE_QUANTITY])) { + $this->setMinValueQuantity(new FHIRQuantity(array_merge($ext, $data[self::FIELD_MIN_VALUE_QUANTITY]))); + } } else { $this->setMinValueQuantity(new FHIRQuantity($data[self::FIELD_MIN_VALUE_QUANTITY])); } @@ -3808,8 +4194,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MIN_VALUE_TIME] instanceof FHIRTime) { $this->setMinValueTime($data[self::FIELD_MIN_VALUE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_MIN_VALUE_TIME])) { - $this->setMinValueTime(new FHIRTime([FHIRTime::FIELD_VALUE => $data[self::FIELD_MIN_VALUE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MIN_VALUE_TIME])) { + $this->setMinValueTime(new FHIRTime([FHIRTime::FIELD_VALUE => $data[self::FIELD_MIN_VALUE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_MIN_VALUE_TIME])) { + $this->setMinValueTime(new FHIRTime(array_merge($ext, $data[self::FIELD_MIN_VALUE_TIME]))); + } } else { $this->setMinValueTime(new FHIRTime($data[self::FIELD_MIN_VALUE_TIME])); } @@ -3820,8 +4210,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MIN_VALUE_UNSIGNED_INT] instanceof FHIRUnsignedInt) { $this->setMinValueUnsignedInt($data[self::FIELD_MIN_VALUE_UNSIGNED_INT]); - } elseif ($ext && is_scalar($data[self::FIELD_MIN_VALUE_UNSIGNED_INT])) { - $this->setMinValueUnsignedInt(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_MIN_VALUE_UNSIGNED_INT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MIN_VALUE_UNSIGNED_INT])) { + $this->setMinValueUnsignedInt(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_MIN_VALUE_UNSIGNED_INT]] + $ext)); + } else if (is_array($data[self::FIELD_MIN_VALUE_UNSIGNED_INT])) { + $this->setMinValueUnsignedInt(new FHIRUnsignedInt(array_merge($ext, $data[self::FIELD_MIN_VALUE_UNSIGNED_INT]))); + } } else { $this->setMinValueUnsignedInt(new FHIRUnsignedInt($data[self::FIELD_MIN_VALUE_UNSIGNED_INT])); } @@ -3832,8 +4226,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MUST_SUPPORT] instanceof FHIRBoolean) { $this->setMustSupport($data[self::FIELD_MUST_SUPPORT]); - } elseif ($ext && is_scalar($data[self::FIELD_MUST_SUPPORT])) { - $this->setMustSupport(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_MUST_SUPPORT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MUST_SUPPORT])) { + $this->setMustSupport(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_MUST_SUPPORT]] + $ext)); + } else if (is_array($data[self::FIELD_MUST_SUPPORT])) { + $this->setMustSupport(new FHIRBoolean(array_merge($ext, $data[self::FIELD_MUST_SUPPORT]))); + } } else { $this->setMustSupport(new FHIRBoolean($data[self::FIELD_MUST_SUPPORT])); } @@ -3844,8 +4242,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ORDER_MEANING] instanceof FHIRString) { $this->setOrderMeaning($data[self::FIELD_ORDER_MEANING]); - } elseif ($ext && is_scalar($data[self::FIELD_ORDER_MEANING])) { - $this->setOrderMeaning(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_ORDER_MEANING]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ORDER_MEANING])) { + $this->setOrderMeaning(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_ORDER_MEANING]] + $ext)); + } else if (is_array($data[self::FIELD_ORDER_MEANING])) { + $this->setOrderMeaning(new FHIRString(array_merge($ext, $data[self::FIELD_ORDER_MEANING]))); + } } else { $this->setOrderMeaning(new FHIRString($data[self::FIELD_ORDER_MEANING])); } @@ -3856,8 +4258,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PATH] instanceof FHIRString) { $this->setPath($data[self::FIELD_PATH]); - } elseif ($ext && is_scalar($data[self::FIELD_PATH])) { - $this->setPath(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PATH]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PATH])) { + $this->setPath(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PATH]] + $ext)); + } else if (is_array($data[self::FIELD_PATH])) { + $this->setPath(new FHIRString(array_merge($ext, $data[self::FIELD_PATH]))); + } } else { $this->setPath(new FHIRString($data[self::FIELD_PATH])); } @@ -3870,8 +4276,17 @@ public function __construct($data = null) } } if (isset($data[self::FIELD_PATTERN_AGE])) { + $ext = (isset($data[self::FIELD_PATTERN_AGE_EXT]) && is_array($data[self::FIELD_PATTERN_AGE_EXT])) + ? $data[self::FIELD_PATTERN_AGE_EXT] + : null; if ($data[self::FIELD_PATTERN_AGE] instanceof FHIRAge) { $this->setPatternAge($data[self::FIELD_PATTERN_AGE]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PATTERN_AGE])) { + $this->setPatternAge(new FHIRAge([FHIRAge::FIELD_VALUE => $data[self::FIELD_PATTERN_AGE]] + $ext)); + } else if (is_array($data[self::FIELD_PATTERN_AGE])) { + $this->setPatternAge(new FHIRAge(array_merge($ext, $data[self::FIELD_PATTERN_AGE]))); + } } else { $this->setPatternAge(new FHIRAge($data[self::FIELD_PATTERN_AGE])); } @@ -3896,8 +4311,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PATTERN_BASE_64BINARY] instanceof FHIRBase64Binary) { $this->setPatternBase64Binary($data[self::FIELD_PATTERN_BASE_64BINARY]); - } elseif ($ext && is_scalar($data[self::FIELD_PATTERN_BASE_64BINARY])) { - $this->setPatternBase64Binary(new FHIRBase64Binary([FHIRBase64Binary::FIELD_VALUE => $data[self::FIELD_PATTERN_BASE_64BINARY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PATTERN_BASE_64BINARY])) { + $this->setPatternBase64Binary(new FHIRBase64Binary([FHIRBase64Binary::FIELD_VALUE => $data[self::FIELD_PATTERN_BASE_64BINARY]] + $ext)); + } else if (is_array($data[self::FIELD_PATTERN_BASE_64BINARY])) { + $this->setPatternBase64Binary(new FHIRBase64Binary(array_merge($ext, $data[self::FIELD_PATTERN_BASE_64BINARY]))); + } } else { $this->setPatternBase64Binary(new FHIRBase64Binary($data[self::FIELD_PATTERN_BASE_64BINARY])); } @@ -3908,8 +4327,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PATTERN_BOOLEAN] instanceof FHIRBoolean) { $this->setPatternBoolean($data[self::FIELD_PATTERN_BOOLEAN]); - } elseif ($ext && is_scalar($data[self::FIELD_PATTERN_BOOLEAN])) { - $this->setPatternBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_PATTERN_BOOLEAN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PATTERN_BOOLEAN])) { + $this->setPatternBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_PATTERN_BOOLEAN]] + $ext)); + } else if (is_array($data[self::FIELD_PATTERN_BOOLEAN])) { + $this->setPatternBoolean(new FHIRBoolean(array_merge($ext, $data[self::FIELD_PATTERN_BOOLEAN]))); + } } else { $this->setPatternBoolean(new FHIRBoolean($data[self::FIELD_PATTERN_BOOLEAN])); } @@ -3920,8 +4343,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PATTERN_CODE] instanceof FHIRCode) { $this->setPatternCode($data[self::FIELD_PATTERN_CODE]); - } elseif ($ext && is_scalar($data[self::FIELD_PATTERN_CODE])) { - $this->setPatternCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_PATTERN_CODE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PATTERN_CODE])) { + $this->setPatternCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_PATTERN_CODE]] + $ext)); + } else if (is_array($data[self::FIELD_PATTERN_CODE])) { + $this->setPatternCode(new FHIRCode(array_merge($ext, $data[self::FIELD_PATTERN_CODE]))); + } } else { $this->setPatternCode(new FHIRCode($data[self::FIELD_PATTERN_CODE])); } @@ -3946,15 +4373,28 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PATTERN_CONTACT_POINT] instanceof FHIRContactPoint) { $this->setPatternContactPoint($data[self::FIELD_PATTERN_CONTACT_POINT]); - } elseif ($ext && is_scalar($data[self::FIELD_PATTERN_CONTACT_POINT])) { - $this->setPatternContactPoint(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $data[self::FIELD_PATTERN_CONTACT_POINT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PATTERN_CONTACT_POINT])) { + $this->setPatternContactPoint(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $data[self::FIELD_PATTERN_CONTACT_POINT]] + $ext)); + } else if (is_array($data[self::FIELD_PATTERN_CONTACT_POINT])) { + $this->setPatternContactPoint(new FHIRContactPoint(array_merge($ext, $data[self::FIELD_PATTERN_CONTACT_POINT]))); + } } else { $this->setPatternContactPoint(new FHIRContactPoint($data[self::FIELD_PATTERN_CONTACT_POINT])); } } if (isset($data[self::FIELD_PATTERN_COUNT])) { + $ext = (isset($data[self::FIELD_PATTERN_COUNT_EXT]) && is_array($data[self::FIELD_PATTERN_COUNT_EXT])) + ? $data[self::FIELD_PATTERN_COUNT_EXT] + : null; if ($data[self::FIELD_PATTERN_COUNT] instanceof FHIRCount) { $this->setPatternCount($data[self::FIELD_PATTERN_COUNT]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PATTERN_COUNT])) { + $this->setPatternCount(new FHIRCount([FHIRCount::FIELD_VALUE => $data[self::FIELD_PATTERN_COUNT]] + $ext)); + } else if (is_array($data[self::FIELD_PATTERN_COUNT])) { + $this->setPatternCount(new FHIRCount(array_merge($ext, $data[self::FIELD_PATTERN_COUNT]))); + } } else { $this->setPatternCount(new FHIRCount($data[self::FIELD_PATTERN_COUNT])); } @@ -3965,8 +4405,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PATTERN_DATE] instanceof FHIRDate) { $this->setPatternDate($data[self::FIELD_PATTERN_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_PATTERN_DATE])) { - $this->setPatternDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_PATTERN_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PATTERN_DATE])) { + $this->setPatternDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_PATTERN_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_PATTERN_DATE])) { + $this->setPatternDate(new FHIRDate(array_merge($ext, $data[self::FIELD_PATTERN_DATE]))); + } } else { $this->setPatternDate(new FHIRDate($data[self::FIELD_PATTERN_DATE])); } @@ -3977,8 +4421,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PATTERN_DATE_TIME] instanceof FHIRDateTime) { $this->setPatternDateTime($data[self::FIELD_PATTERN_DATE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_PATTERN_DATE_TIME])) { - $this->setPatternDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_PATTERN_DATE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PATTERN_DATE_TIME])) { + $this->setPatternDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_PATTERN_DATE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_PATTERN_DATE_TIME])) { + $this->setPatternDateTime(new FHIRDateTime(array_merge($ext, $data[self::FIELD_PATTERN_DATE_TIME]))); + } } else { $this->setPatternDateTime(new FHIRDateTime($data[self::FIELD_PATTERN_DATE_TIME])); } @@ -3989,22 +4437,44 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PATTERN_DECIMAL] instanceof FHIRDecimal) { $this->setPatternDecimal($data[self::FIELD_PATTERN_DECIMAL]); - } elseif ($ext && is_scalar($data[self::FIELD_PATTERN_DECIMAL])) { - $this->setPatternDecimal(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_PATTERN_DECIMAL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PATTERN_DECIMAL])) { + $this->setPatternDecimal(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_PATTERN_DECIMAL]] + $ext)); + } else if (is_array($data[self::FIELD_PATTERN_DECIMAL])) { + $this->setPatternDecimal(new FHIRDecimal(array_merge($ext, $data[self::FIELD_PATTERN_DECIMAL]))); + } } else { $this->setPatternDecimal(new FHIRDecimal($data[self::FIELD_PATTERN_DECIMAL])); } } if (isset($data[self::FIELD_PATTERN_DISTANCE])) { + $ext = (isset($data[self::FIELD_PATTERN_DISTANCE_EXT]) && is_array($data[self::FIELD_PATTERN_DISTANCE_EXT])) + ? $data[self::FIELD_PATTERN_DISTANCE_EXT] + : null; if ($data[self::FIELD_PATTERN_DISTANCE] instanceof FHIRDistance) { $this->setPatternDistance($data[self::FIELD_PATTERN_DISTANCE]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PATTERN_DISTANCE])) { + $this->setPatternDistance(new FHIRDistance([FHIRDistance::FIELD_VALUE => $data[self::FIELD_PATTERN_DISTANCE]] + $ext)); + } else if (is_array($data[self::FIELD_PATTERN_DISTANCE])) { + $this->setPatternDistance(new FHIRDistance(array_merge($ext, $data[self::FIELD_PATTERN_DISTANCE]))); + } } else { $this->setPatternDistance(new FHIRDistance($data[self::FIELD_PATTERN_DISTANCE])); } } if (isset($data[self::FIELD_PATTERN_DURATION])) { + $ext = (isset($data[self::FIELD_PATTERN_DURATION_EXT]) && is_array($data[self::FIELD_PATTERN_DURATION_EXT])) + ? $data[self::FIELD_PATTERN_DURATION_EXT] + : null; if ($data[self::FIELD_PATTERN_DURATION] instanceof FHIRDuration) { $this->setPatternDuration($data[self::FIELD_PATTERN_DURATION]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PATTERN_DURATION])) { + $this->setPatternDuration(new FHIRDuration([FHIRDuration::FIELD_VALUE => $data[self::FIELD_PATTERN_DURATION]] + $ext)); + } else if (is_array($data[self::FIELD_PATTERN_DURATION])) { + $this->setPatternDuration(new FHIRDuration(array_merge($ext, $data[self::FIELD_PATTERN_DURATION]))); + } } else { $this->setPatternDuration(new FHIRDuration($data[self::FIELD_PATTERN_DURATION])); } @@ -4022,8 +4492,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PATTERN_ID] instanceof FHIRId) { $this->setPatternId($data[self::FIELD_PATTERN_ID]); - } elseif ($ext && is_scalar($data[self::FIELD_PATTERN_ID])) { - $this->setPatternId(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_PATTERN_ID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PATTERN_ID])) { + $this->setPatternId(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_PATTERN_ID]] + $ext)); + } else if (is_array($data[self::FIELD_PATTERN_ID])) { + $this->setPatternId(new FHIRId(array_merge($ext, $data[self::FIELD_PATTERN_ID]))); + } } else { $this->setPatternId(new FHIRId($data[self::FIELD_PATTERN_ID])); } @@ -4034,8 +4508,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PATTERN_IDENTIFIER] instanceof FHIRIdentifier) { $this->setPatternIdentifier($data[self::FIELD_PATTERN_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_PATTERN_IDENTIFIER])) { - $this->setPatternIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_PATTERN_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PATTERN_IDENTIFIER])) { + $this->setPatternIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_PATTERN_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_PATTERN_IDENTIFIER])) { + $this->setPatternIdentifier(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_PATTERN_IDENTIFIER]))); + } } else { $this->setPatternIdentifier(new FHIRIdentifier($data[self::FIELD_PATTERN_IDENTIFIER])); } @@ -4046,8 +4524,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PATTERN_INSTANT] instanceof FHIRInstant) { $this->setPatternInstant($data[self::FIELD_PATTERN_INSTANT]); - } elseif ($ext && is_scalar($data[self::FIELD_PATTERN_INSTANT])) { - $this->setPatternInstant(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_PATTERN_INSTANT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PATTERN_INSTANT])) { + $this->setPatternInstant(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_PATTERN_INSTANT]] + $ext)); + } else if (is_array($data[self::FIELD_PATTERN_INSTANT])) { + $this->setPatternInstant(new FHIRInstant(array_merge($ext, $data[self::FIELD_PATTERN_INSTANT]))); + } } else { $this->setPatternInstant(new FHIRInstant($data[self::FIELD_PATTERN_INSTANT])); } @@ -4058,8 +4540,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PATTERN_INTEGER] instanceof FHIRInteger) { $this->setPatternInteger($data[self::FIELD_PATTERN_INTEGER]); - } elseif ($ext && is_scalar($data[self::FIELD_PATTERN_INTEGER])) { - $this->setPatternInteger(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_PATTERN_INTEGER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PATTERN_INTEGER])) { + $this->setPatternInteger(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_PATTERN_INTEGER]] + $ext)); + } else if (is_array($data[self::FIELD_PATTERN_INTEGER])) { + $this->setPatternInteger(new FHIRInteger(array_merge($ext, $data[self::FIELD_PATTERN_INTEGER]))); + } } else { $this->setPatternInteger(new FHIRInteger($data[self::FIELD_PATTERN_INTEGER])); } @@ -4070,8 +4556,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PATTERN_MARKDOWN] instanceof FHIRMarkdown) { $this->setPatternMarkdown($data[self::FIELD_PATTERN_MARKDOWN]); - } elseif ($ext && is_scalar($data[self::FIELD_PATTERN_MARKDOWN])) { - $this->setPatternMarkdown(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_PATTERN_MARKDOWN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PATTERN_MARKDOWN])) { + $this->setPatternMarkdown(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_PATTERN_MARKDOWN]] + $ext)); + } else if (is_array($data[self::FIELD_PATTERN_MARKDOWN])) { + $this->setPatternMarkdown(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_PATTERN_MARKDOWN]))); + } } else { $this->setPatternMarkdown(new FHIRMarkdown($data[self::FIELD_PATTERN_MARKDOWN])); } @@ -4084,8 +4574,17 @@ public function __construct($data = null) } } if (isset($data[self::FIELD_PATTERN_MONEY])) { + $ext = (isset($data[self::FIELD_PATTERN_MONEY_EXT]) && is_array($data[self::FIELD_PATTERN_MONEY_EXT])) + ? $data[self::FIELD_PATTERN_MONEY_EXT] + : null; if ($data[self::FIELD_PATTERN_MONEY] instanceof FHIRMoney) { $this->setPatternMoney($data[self::FIELD_PATTERN_MONEY]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PATTERN_MONEY])) { + $this->setPatternMoney(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_PATTERN_MONEY]] + $ext)); + } else if (is_array($data[self::FIELD_PATTERN_MONEY])) { + $this->setPatternMoney(new FHIRMoney(array_merge($ext, $data[self::FIELD_PATTERN_MONEY]))); + } } else { $this->setPatternMoney(new FHIRMoney($data[self::FIELD_PATTERN_MONEY])); } @@ -4096,8 +4595,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PATTERN_OID] instanceof FHIROid) { $this->setPatternOid($data[self::FIELD_PATTERN_OID]); - } elseif ($ext && is_scalar($data[self::FIELD_PATTERN_OID])) { - $this->setPatternOid(new FHIROid([FHIROid::FIELD_VALUE => $data[self::FIELD_PATTERN_OID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PATTERN_OID])) { + $this->setPatternOid(new FHIROid([FHIROid::FIELD_VALUE => $data[self::FIELD_PATTERN_OID]] + $ext)); + } else if (is_array($data[self::FIELD_PATTERN_OID])) { + $this->setPatternOid(new FHIROid(array_merge($ext, $data[self::FIELD_PATTERN_OID]))); + } } else { $this->setPatternOid(new FHIROid($data[self::FIELD_PATTERN_OID])); } @@ -4115,8 +4618,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PATTERN_POSITIVE_INT] instanceof FHIRPositiveInt) { $this->setPatternPositiveInt($data[self::FIELD_PATTERN_POSITIVE_INT]); - } elseif ($ext && is_scalar($data[self::FIELD_PATTERN_POSITIVE_INT])) { - $this->setPatternPositiveInt(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_PATTERN_POSITIVE_INT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PATTERN_POSITIVE_INT])) { + $this->setPatternPositiveInt(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_PATTERN_POSITIVE_INT]] + $ext)); + } else if (is_array($data[self::FIELD_PATTERN_POSITIVE_INT])) { + $this->setPatternPositiveInt(new FHIRPositiveInt(array_merge($ext, $data[self::FIELD_PATTERN_POSITIVE_INT]))); + } } else { $this->setPatternPositiveInt(new FHIRPositiveInt($data[self::FIELD_PATTERN_POSITIVE_INT])); } @@ -4127,8 +4634,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PATTERN_QUANTITY] instanceof FHIRQuantity) { $this->setPatternQuantity($data[self::FIELD_PATTERN_QUANTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_PATTERN_QUANTITY])) { - $this->setPatternQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_PATTERN_QUANTITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PATTERN_QUANTITY])) { + $this->setPatternQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_PATTERN_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_PATTERN_QUANTITY])) { + $this->setPatternQuantity(new FHIRQuantity(array_merge($ext, $data[self::FIELD_PATTERN_QUANTITY]))); + } } else { $this->setPatternQuantity(new FHIRQuantity($data[self::FIELD_PATTERN_QUANTITY])); } @@ -4174,8 +4685,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PATTERN_STRING] instanceof FHIRString) { $this->setPatternString($data[self::FIELD_PATTERN_STRING]); - } elseif ($ext && is_scalar($data[self::FIELD_PATTERN_STRING])) { - $this->setPatternString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PATTERN_STRING]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PATTERN_STRING])) { + $this->setPatternString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PATTERN_STRING]] + $ext)); + } else if (is_array($data[self::FIELD_PATTERN_STRING])) { + $this->setPatternString(new FHIRString(array_merge($ext, $data[self::FIELD_PATTERN_STRING]))); + } } else { $this->setPatternString(new FHIRString($data[self::FIELD_PATTERN_STRING])); } @@ -4186,8 +4701,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PATTERN_TIME] instanceof FHIRTime) { $this->setPatternTime($data[self::FIELD_PATTERN_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_PATTERN_TIME])) { - $this->setPatternTime(new FHIRTime([FHIRTime::FIELD_VALUE => $data[self::FIELD_PATTERN_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PATTERN_TIME])) { + $this->setPatternTime(new FHIRTime([FHIRTime::FIELD_VALUE => $data[self::FIELD_PATTERN_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_PATTERN_TIME])) { + $this->setPatternTime(new FHIRTime(array_merge($ext, $data[self::FIELD_PATTERN_TIME]))); + } } else { $this->setPatternTime(new FHIRTime($data[self::FIELD_PATTERN_TIME])); } @@ -4205,8 +4724,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PATTERN_UNSIGNED_INT] instanceof FHIRUnsignedInt) { $this->setPatternUnsignedInt($data[self::FIELD_PATTERN_UNSIGNED_INT]); - } elseif ($ext && is_scalar($data[self::FIELD_PATTERN_UNSIGNED_INT])) { - $this->setPatternUnsignedInt(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_PATTERN_UNSIGNED_INT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PATTERN_UNSIGNED_INT])) { + $this->setPatternUnsignedInt(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_PATTERN_UNSIGNED_INT]] + $ext)); + } else if (is_array($data[self::FIELD_PATTERN_UNSIGNED_INT])) { + $this->setPatternUnsignedInt(new FHIRUnsignedInt(array_merge($ext, $data[self::FIELD_PATTERN_UNSIGNED_INT]))); + } } else { $this->setPatternUnsignedInt(new FHIRUnsignedInt($data[self::FIELD_PATTERN_UNSIGNED_INT])); } @@ -4217,8 +4740,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PATTERN_URI] instanceof FHIRUri) { $this->setPatternUri($data[self::FIELD_PATTERN_URI]); - } elseif ($ext && is_scalar($data[self::FIELD_PATTERN_URI])) { - $this->setPatternUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_PATTERN_URI]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PATTERN_URI])) { + $this->setPatternUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_PATTERN_URI]] + $ext)); + } else if (is_array($data[self::FIELD_PATTERN_URI])) { + $this->setPatternUri(new FHIRUri(array_merge($ext, $data[self::FIELD_PATTERN_URI]))); + } } else { $this->setPatternUri(new FHIRUri($data[self::FIELD_PATTERN_URI])); } @@ -4229,17 +4756,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_REPRESENTATION])) { foreach($data[self::FIELD_REPRESENTATION] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRPropertyRepresentation) { $this->addRepresentation($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addRepresentation(new FHIRPropertyRepresentation([FHIRPropertyRepresentation::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addRepresentation(new FHIRPropertyRepresentation([FHIRPropertyRepresentation::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addRepresentation(new FHIRPropertyRepresentation(array_merge($v, $ext[$i]))); + } } else { $this->addRepresentation(new FHIRPropertyRepresentation($v)); } } } elseif ($data[self::FIELD_REPRESENTATION] instanceof FHIRPropertyRepresentation) { $this->addRepresentation($data[self::FIELD_REPRESENTATION]); - } elseif ($ext && is_scalar($data[self::FIELD_REPRESENTATION])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_REPRESENTATION])) { $this->addRepresentation(new FHIRPropertyRepresentation([FHIRPropertyRepresentation::FIELD_VALUE => $data[self::FIELD_REPRESENTATION]] + $ext)); } else { $this->addRepresentation(new FHIRPropertyRepresentation($data[self::FIELD_REPRESENTATION])); @@ -4251,8 +4785,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_REQUIREMENTS] instanceof FHIRMarkdown) { $this->setRequirements($data[self::FIELD_REQUIREMENTS]); - } elseif ($ext && is_scalar($data[self::FIELD_REQUIREMENTS])) { - $this->setRequirements(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_REQUIREMENTS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_REQUIREMENTS])) { + $this->setRequirements(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_REQUIREMENTS]] + $ext)); + } else if (is_array($data[self::FIELD_REQUIREMENTS])) { + $this->setRequirements(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_REQUIREMENTS]))); + } } else { $this->setRequirements(new FHIRMarkdown($data[self::FIELD_REQUIREMENTS])); } @@ -4263,8 +4801,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SHORT] instanceof FHIRString) { $this->setShort($data[self::FIELD_SHORT]); - } elseif ($ext && is_scalar($data[self::FIELD_SHORT])) { - $this->setShort(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SHORT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SHORT])) { + $this->setShort(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SHORT]] + $ext)); + } else if (is_array($data[self::FIELD_SHORT])) { + $this->setShort(new FHIRString(array_merge($ext, $data[self::FIELD_SHORT]))); + } } else { $this->setShort(new FHIRString($data[self::FIELD_SHORT])); } @@ -4275,8 +4817,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SLICE_NAME] instanceof FHIRString) { $this->setSliceName($data[self::FIELD_SLICE_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_SLICE_NAME])) { - $this->setSliceName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SLICE_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SLICE_NAME])) { + $this->setSliceName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SLICE_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_SLICE_NAME])) { + $this->setSliceName(new FHIRString(array_merge($ext, $data[self::FIELD_SLICE_NAME]))); + } } else { $this->setSliceName(new FHIRString($data[self::FIELD_SLICE_NAME])); } @@ -4291,6 +4837,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_TYPE])) { if (is_array($data[self::FIELD_TYPE])) { foreach($data[self::FIELD_TYPE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRElementDefinitionType) { $this->addType($v); } else { @@ -11858,6 +12407,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if ([] !== ($vs = $this->getAlias())) { foreach($vs as $v) { if (null === $v) { @@ -11866,15 +12416,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_ALIAS, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getBase())) { $v->xmlSerialize($sxe->addChild(self::FIELD_BASE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getBinding())) { $v->xmlSerialize($sxe->addChild(self::FIELD_BINDING, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getCode())) { foreach($vs as $v) { if (null === $v) { @@ -11894,7 +12441,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_CONDITION, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getConstraint())) { foreach($vs as $v) { if (null === $v) { @@ -11906,19 +12452,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getContentReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CONTENT_REFERENCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDefaultValueAddress())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFAULT_VALUE_ADDRESS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDefaultValueAge())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFAULT_VALUE_AGE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDefaultValueAnnotation())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFAULT_VALUE_ANNOTATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDefaultValueAttachment())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFAULT_VALUE_ATTACHMENT, null, $v->_getFHIRXMLNamespace())); } @@ -11931,19 +12473,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDefaultValueCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFAULT_VALUE_CODE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDefaultValueCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFAULT_VALUE_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDefaultValueCoding())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFAULT_VALUE_CODING, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDefaultValueContactPoint())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFAULT_VALUE_CONTACT_POINT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDefaultValueCount())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFAULT_VALUE_COUNT, null, $v->_getFHIRXMLNamespace())); } @@ -11956,22 +12494,18 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDefaultValueDecimal())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFAULT_VALUE_DECIMAL, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDefaultValueDistance())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFAULT_VALUE_DISTANCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDefaultValueDuration())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFAULT_VALUE_DURATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDefaultValueHumanName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFAULT_VALUE_HUMAN_NAME, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getDefaultValueId())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFAULT_VALUE_ID, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDefaultValueIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFAULT_VALUE_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } @@ -11984,45 +12518,36 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDefaultValueMarkdown())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFAULT_VALUE_MARKDOWN, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDefaultValueMeta())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFAULT_VALUE_META, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDefaultValueMoney())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFAULT_VALUE_MONEY, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getDefaultValueOid())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFAULT_VALUE_OID, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDefaultValuePeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFAULT_VALUE_PERIOD, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getDefaultValuePositiveInt())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFAULT_VALUE_POSITIVE_INT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDefaultValueQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFAULT_VALUE_QUANTITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDefaultValueRange())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFAULT_VALUE_RANGE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDefaultValueRatio())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFAULT_VALUE_RATIO, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDefaultValueReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFAULT_VALUE_REFERENCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDefaultValueSampledData())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFAULT_VALUE_SAMPLED_DATA, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDefaultValueSignature())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFAULT_VALUE_SIGNATURE, null, $v->_getFHIRXMLNamespace())); } @@ -12032,7 +12557,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDefaultValueTime())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFAULT_VALUE_TIME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDefaultValueTiming())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFAULT_VALUE_TIMING, null, $v->_getFHIRXMLNamespace())); } @@ -12045,7 +12569,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDefinition())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFINITION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getExample())) { foreach($vs as $v) { if (null === $v) { @@ -12054,19 +12577,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_EXAMPLE, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getFixedAddress())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FIXED_ADDRESS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getFixedAge())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FIXED_AGE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getFixedAnnotation())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FIXED_ANNOTATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getFixedAttachment())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FIXED_ATTACHMENT, null, $v->_getFHIRXMLNamespace())); } @@ -12079,19 +12598,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getFixedCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FIXED_CODE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getFixedCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FIXED_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getFixedCoding())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FIXED_CODING, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getFixedContactPoint())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FIXED_CONTACT_POINT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getFixedCount())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FIXED_COUNT, null, $v->_getFHIRXMLNamespace())); } @@ -12104,22 +12619,18 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getFixedDecimal())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FIXED_DECIMAL, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getFixedDistance())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FIXED_DISTANCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getFixedDuration())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FIXED_DURATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getFixedHumanName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FIXED_HUMAN_NAME, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getFixedId())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FIXED_ID, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getFixedIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FIXED_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } @@ -12132,45 +12643,36 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getFixedMarkdown())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FIXED_MARKDOWN, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getFixedMeta())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FIXED_META, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getFixedMoney())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FIXED_MONEY, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getFixedOid())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FIXED_OID, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getFixedPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FIXED_PERIOD, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getFixedPositiveInt())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FIXED_POSITIVE_INT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getFixedQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FIXED_QUANTITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getFixedRange())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FIXED_RANGE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getFixedRatio())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FIXED_RATIO, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getFixedReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FIXED_REFERENCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getFixedSampledData())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FIXED_SAMPLED_DATA, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getFixedSignature())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FIXED_SIGNATURE, null, $v->_getFHIRXMLNamespace())); } @@ -12180,7 +12682,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getFixedTime())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FIXED_TIME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getFixedTiming())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FIXED_TIMING, null, $v->_getFHIRXMLNamespace())); } @@ -12199,7 +12700,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getLabel())) { $v->xmlSerialize($sxe->addChild(self::FIELD_LABEL, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getMapping())) { foreach($vs as $v) { if (null === $v) { @@ -12232,7 +12732,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getMaxValuePositiveInt())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MAX_VALUE_POSITIVE_INT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getMaxValueQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MAX_VALUE_QUANTITY, null, $v->_getFHIRXMLNamespace())); } @@ -12266,7 +12765,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getMinValuePositiveInt())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MIN_VALUE_POSITIVE_INT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getMinValueQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MIN_VALUE_QUANTITY, null, $v->_getFHIRXMLNamespace())); } @@ -12285,19 +12783,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getPath())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATH, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPatternAddress())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATTERN_ADDRESS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPatternAge())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATTERN_AGE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPatternAnnotation())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATTERN_ANNOTATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPatternAttachment())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATTERN_ATTACHMENT, null, $v->_getFHIRXMLNamespace())); } @@ -12310,19 +12804,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getPatternCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATTERN_CODE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPatternCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATTERN_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPatternCoding())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATTERN_CODING, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPatternContactPoint())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATTERN_CONTACT_POINT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPatternCount())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATTERN_COUNT, null, $v->_getFHIRXMLNamespace())); } @@ -12335,22 +12825,18 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getPatternDecimal())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATTERN_DECIMAL, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPatternDistance())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATTERN_DISTANCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPatternDuration())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATTERN_DURATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPatternHumanName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATTERN_HUMAN_NAME, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getPatternId())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATTERN_ID, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPatternIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATTERN_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } @@ -12363,45 +12849,36 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getPatternMarkdown())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATTERN_MARKDOWN, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPatternMeta())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATTERN_META, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPatternMoney())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATTERN_MONEY, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getPatternOid())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATTERN_OID, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPatternPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATTERN_PERIOD, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getPatternPositiveInt())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATTERN_POSITIVE_INT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPatternQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATTERN_QUANTITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPatternRange())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATTERN_RANGE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPatternRatio())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATTERN_RATIO, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPatternReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATTERN_REFERENCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPatternSampledData())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATTERN_SAMPLED_DATA, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPatternSignature())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATTERN_SIGNATURE, null, $v->_getFHIRXMLNamespace())); } @@ -12411,7 +12888,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getPatternTime())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATTERN_TIME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPatternTiming())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATTERN_TIMING, null, $v->_getFHIRXMLNamespace())); } @@ -12421,7 +12897,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getPatternUri())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATTERN_URI, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getRepresentation())) { foreach($vs as $v) { if (null === $v) { @@ -12439,11 +12914,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getSliceName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SLICE_NAME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSlicing())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SLICING, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getType())) { foreach($vs as $v) { if (null === $v) { @@ -12467,8 +12940,17 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_ALIAS][] = $v->getValue(); - $a[self::FIELD_ALIAS_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ALIAS][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ALIAS_EXT][] = $enc; + } else { + $a[self::FIELD_ALIAS_EXT][] = null; + } + } else { + $a[self::FIELD_ALIAS][] = $v; + } } } if (null !== ($v = $this->getBase())) { @@ -12481,8 +12963,15 @@ public function jsonSerialize() $a[self::FIELD_CODE] = $vs; } if (null !== ($v = $this->getComment())) { - $a[self::FIELD_COMMENT] = $v->getValue(); - $a[self::FIELD_COMMENT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_COMMENT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_COMMENT_EXT] = $enc; + } + } else { + $a[self::FIELD_COMMENT] = $v; + } } if ([] !== ($vs = $this->getCondition())) { $a[self::FIELD_CONDITION] = []; @@ -12490,22 +12979,46 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_CONDITION][] = $v->getValue(); - $a[self::FIELD_CONDITION_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CONDITION][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CONDITION_EXT][] = $enc; + } else { + $a[self::FIELD_CONDITION_EXT][] = null; + } + } else { + $a[self::FIELD_CONDITION][] = $v; + } } } if ([] !== ($vs = $this->getConstraint())) { $a[self::FIELD_CONSTRAINT] = $vs; } if (null !== ($v = $this->getContentReference())) { - $a[self::FIELD_CONTENT_REFERENCE] = $v->getValue(); - $a[self::FIELD_CONTENT_REFERENCE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CONTENT_REFERENCE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CONTENT_REFERENCE_EXT] = $enc; + } + } else { + $a[self::FIELD_CONTENT_REFERENCE] = $v; + } } if (null !== ($v = $this->getDefaultValueAddress())) { $a[self::FIELD_DEFAULT_VALUE_ADDRESS] = $v; } if (null !== ($v = $this->getDefaultValueAge())) { - $a[self::FIELD_DEFAULT_VALUE_AGE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DEFAULT_VALUE_AGE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DEFAULT_VALUE_AGE_EXT] = $enc; + } + } else { + $a[self::FIELD_DEFAULT_VALUE_AGE] = $v; + } } if (null !== ($v = $this->getDefaultValueAnnotation())) { $a[self::FIELD_DEFAULT_VALUE_ANNOTATION] = $v; @@ -12514,16 +13027,37 @@ public function jsonSerialize() $a[self::FIELD_DEFAULT_VALUE_ATTACHMENT] = $v; } if (null !== ($v = $this->getDefaultValueBase64Binary())) { - $a[self::FIELD_DEFAULT_VALUE_BASE_64BINARY] = $v->getValue(); - $a[self::FIELD_DEFAULT_VALUE_BASE_64BINARY_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DEFAULT_VALUE_BASE_64BINARY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DEFAULT_VALUE_BASE_64BINARY_EXT] = $enc; + } + } else { + $a[self::FIELD_DEFAULT_VALUE_BASE_64BINARY] = $v; + } } if (null !== ($v = $this->getDefaultValueBoolean())) { - $a[self::FIELD_DEFAULT_VALUE_BOOLEAN] = $v->getValue(); - $a[self::FIELD_DEFAULT_VALUE_BOOLEAN_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DEFAULT_VALUE_BOOLEAN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DEFAULT_VALUE_BOOLEAN_EXT] = $enc; + } + } else { + $a[self::FIELD_DEFAULT_VALUE_BOOLEAN] = $v; + } } if (null !== ($v = $this->getDefaultValueCode())) { - $a[self::FIELD_DEFAULT_VALUE_CODE] = $v->getValue(); - $a[self::FIELD_DEFAULT_VALUE_CODE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DEFAULT_VALUE_CODE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DEFAULT_VALUE_CODE_EXT] = $enc; + } + } else { + $a[self::FIELD_DEFAULT_VALUE_CODE] = $v; + } } if (null !== ($v = $this->getDefaultValueCodeableConcept())) { $a[self::FIELD_DEFAULT_VALUE_CODEABLE_CONCEPT] = $v; @@ -12532,70 +13066,189 @@ public function jsonSerialize() $a[self::FIELD_DEFAULT_VALUE_CODING] = $v; } if (null !== ($v = $this->getDefaultValueContactPoint())) { - $a[self::FIELD_DEFAULT_VALUE_CONTACT_POINT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DEFAULT_VALUE_CONTACT_POINT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DEFAULT_VALUE_CONTACT_POINT_EXT] = $enc; + } + } else { + $a[self::FIELD_DEFAULT_VALUE_CONTACT_POINT] = $v; + } } if (null !== ($v = $this->getDefaultValueCount())) { - $a[self::FIELD_DEFAULT_VALUE_COUNT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DEFAULT_VALUE_COUNT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DEFAULT_VALUE_COUNT_EXT] = $enc; + } + } else { + $a[self::FIELD_DEFAULT_VALUE_COUNT] = $v; + } } if (null !== ($v = $this->getDefaultValueDate())) { - $a[self::FIELD_DEFAULT_VALUE_DATE] = $v->getValue(); - $a[self::FIELD_DEFAULT_VALUE_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DEFAULT_VALUE_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DEFAULT_VALUE_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_DEFAULT_VALUE_DATE] = $v; + } } if (null !== ($v = $this->getDefaultValueDateTime())) { - $a[self::FIELD_DEFAULT_VALUE_DATE_TIME] = $v->getValue(); - $a[self::FIELD_DEFAULT_VALUE_DATE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DEFAULT_VALUE_DATE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DEFAULT_VALUE_DATE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_DEFAULT_VALUE_DATE_TIME] = $v; + } } if (null !== ($v = $this->getDefaultValueDecimal())) { - $a[self::FIELD_DEFAULT_VALUE_DECIMAL] = $v->getValue(); - $a[self::FIELD_DEFAULT_VALUE_DECIMAL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DEFAULT_VALUE_DECIMAL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DEFAULT_VALUE_DECIMAL_EXT] = $enc; + } + } else { + $a[self::FIELD_DEFAULT_VALUE_DECIMAL] = $v; + } } if (null !== ($v = $this->getDefaultValueDistance())) { - $a[self::FIELD_DEFAULT_VALUE_DISTANCE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DEFAULT_VALUE_DISTANCE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DEFAULT_VALUE_DISTANCE_EXT] = $enc; + } + } else { + $a[self::FIELD_DEFAULT_VALUE_DISTANCE] = $v; + } } if (null !== ($v = $this->getDefaultValueDuration())) { - $a[self::FIELD_DEFAULT_VALUE_DURATION] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DEFAULT_VALUE_DURATION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DEFAULT_VALUE_DURATION_EXT] = $enc; + } + } else { + $a[self::FIELD_DEFAULT_VALUE_DURATION] = $v; + } } if (null !== ($v = $this->getDefaultValueHumanName())) { $a[self::FIELD_DEFAULT_VALUE_HUMAN_NAME] = $v; } if (null !== ($v = $this->getDefaultValueId())) { - $a[self::FIELD_DEFAULT_VALUE_ID] = $v->getValue(); - $a[self::FIELD_DEFAULT_VALUE_ID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DEFAULT_VALUE_ID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DEFAULT_VALUE_ID_EXT] = $enc; + } + } else { + $a[self::FIELD_DEFAULT_VALUE_ID] = $v; + } } if (null !== ($v = $this->getDefaultValueIdentifier())) { - $a[self::FIELD_DEFAULT_VALUE_IDENTIFIER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DEFAULT_VALUE_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DEFAULT_VALUE_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_DEFAULT_VALUE_IDENTIFIER] = $v; + } } if (null !== ($v = $this->getDefaultValueInstant())) { - $a[self::FIELD_DEFAULT_VALUE_INSTANT] = $v->getValue(); - $a[self::FIELD_DEFAULT_VALUE_INSTANT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DEFAULT_VALUE_INSTANT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DEFAULT_VALUE_INSTANT_EXT] = $enc; + } + } else { + $a[self::FIELD_DEFAULT_VALUE_INSTANT] = $v; + } } if (null !== ($v = $this->getDefaultValueInteger())) { - $a[self::FIELD_DEFAULT_VALUE_INTEGER] = $v->getValue(); - $a[self::FIELD_DEFAULT_VALUE_INTEGER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DEFAULT_VALUE_INTEGER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DEFAULT_VALUE_INTEGER_EXT] = $enc; + } + } else { + $a[self::FIELD_DEFAULT_VALUE_INTEGER] = $v; + } } if (null !== ($v = $this->getDefaultValueMarkdown())) { - $a[self::FIELD_DEFAULT_VALUE_MARKDOWN] = $v->getValue(); - $a[self::FIELD_DEFAULT_VALUE_MARKDOWN_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DEFAULT_VALUE_MARKDOWN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DEFAULT_VALUE_MARKDOWN_EXT] = $enc; + } + } else { + $a[self::FIELD_DEFAULT_VALUE_MARKDOWN] = $v; + } } if (null !== ($v = $this->getDefaultValueMeta())) { $a[self::FIELD_DEFAULT_VALUE_META] = $v; } if (null !== ($v = $this->getDefaultValueMoney())) { - $a[self::FIELD_DEFAULT_VALUE_MONEY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DEFAULT_VALUE_MONEY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DEFAULT_VALUE_MONEY_EXT] = $enc; + } + } else { + $a[self::FIELD_DEFAULT_VALUE_MONEY] = $v; + } } if (null !== ($v = $this->getDefaultValueOid())) { - $a[self::FIELD_DEFAULT_VALUE_OID] = $v->getValue(); - $a[self::FIELD_DEFAULT_VALUE_OID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DEFAULT_VALUE_OID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DEFAULT_VALUE_OID_EXT] = $enc; + } + } else { + $a[self::FIELD_DEFAULT_VALUE_OID] = $v; + } } if (null !== ($v = $this->getDefaultValuePeriod())) { $a[self::FIELD_DEFAULT_VALUE_PERIOD] = $v; } if (null !== ($v = $this->getDefaultValuePositiveInt())) { - $a[self::FIELD_DEFAULT_VALUE_POSITIVE_INT] = $v->getValue(); - $a[self::FIELD_DEFAULT_VALUE_POSITIVE_INT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DEFAULT_VALUE_POSITIVE_INT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DEFAULT_VALUE_POSITIVE_INT_EXT] = $enc; + } + } else { + $a[self::FIELD_DEFAULT_VALUE_POSITIVE_INT] = $v; + } } if (null !== ($v = $this->getDefaultValueQuantity())) { - $a[self::FIELD_DEFAULT_VALUE_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DEFAULT_VALUE_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DEFAULT_VALUE_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_DEFAULT_VALUE_QUANTITY] = $v; + } } if (null !== ($v = $this->getDefaultValueRange())) { $a[self::FIELD_DEFAULT_VALUE_RANGE] = $v; @@ -12613,27 +13266,62 @@ public function jsonSerialize() $a[self::FIELD_DEFAULT_VALUE_SIGNATURE] = $v; } if (null !== ($v = $this->getDefaultValueString())) { - $a[self::FIELD_DEFAULT_VALUE_STRING] = $v->getValue(); - $a[self::FIELD_DEFAULT_VALUE_STRING_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DEFAULT_VALUE_STRING] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DEFAULT_VALUE_STRING_EXT] = $enc; + } + } else { + $a[self::FIELD_DEFAULT_VALUE_STRING] = $v; + } } if (null !== ($v = $this->getDefaultValueTime())) { - $a[self::FIELD_DEFAULT_VALUE_TIME] = $v->getValue(); - $a[self::FIELD_DEFAULT_VALUE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DEFAULT_VALUE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DEFAULT_VALUE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_DEFAULT_VALUE_TIME] = $v; + } } if (null !== ($v = $this->getDefaultValueTiming())) { $a[self::FIELD_DEFAULT_VALUE_TIMING] = $v; } if (null !== ($v = $this->getDefaultValueUnsignedInt())) { - $a[self::FIELD_DEFAULT_VALUE_UNSIGNED_INT] = $v->getValue(); - $a[self::FIELD_DEFAULT_VALUE_UNSIGNED_INT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DEFAULT_VALUE_UNSIGNED_INT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DEFAULT_VALUE_UNSIGNED_INT_EXT] = $enc; + } + } else { + $a[self::FIELD_DEFAULT_VALUE_UNSIGNED_INT] = $v; + } } if (null !== ($v = $this->getDefaultValueUri())) { - $a[self::FIELD_DEFAULT_VALUE_URI] = $v->getValue(); - $a[self::FIELD_DEFAULT_VALUE_URI_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DEFAULT_VALUE_URI] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DEFAULT_VALUE_URI_EXT] = $enc; + } + } else { + $a[self::FIELD_DEFAULT_VALUE_URI] = $v; + } } if (null !== ($v = $this->getDefinition())) { - $a[self::FIELD_DEFINITION] = $v->getValue(); - $a[self::FIELD_DEFINITION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DEFINITION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DEFINITION_EXT] = $enc; + } + } else { + $a[self::FIELD_DEFINITION] = $v; + } } if ([] !== ($vs = $this->getExample())) { $a[self::FIELD_EXAMPLE] = $vs; @@ -12642,7 +13330,15 @@ public function jsonSerialize() $a[self::FIELD_FIXED_ADDRESS] = $v; } if (null !== ($v = $this->getFixedAge())) { - $a[self::FIELD_FIXED_AGE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FIXED_AGE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FIXED_AGE_EXT] = $enc; + } + } else { + $a[self::FIELD_FIXED_AGE] = $v; + } } if (null !== ($v = $this->getFixedAnnotation())) { $a[self::FIELD_FIXED_ANNOTATION] = $v; @@ -12651,16 +13347,37 @@ public function jsonSerialize() $a[self::FIELD_FIXED_ATTACHMENT] = $v; } if (null !== ($v = $this->getFixedBase64Binary())) { - $a[self::FIELD_FIXED_BASE_64BINARY] = $v->getValue(); - $a[self::FIELD_FIXED_BASE_64BINARY_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FIXED_BASE_64BINARY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FIXED_BASE_64BINARY_EXT] = $enc; + } + } else { + $a[self::FIELD_FIXED_BASE_64BINARY] = $v; + } } if (null !== ($v = $this->getFixedBoolean())) { - $a[self::FIELD_FIXED_BOOLEAN] = $v->getValue(); - $a[self::FIELD_FIXED_BOOLEAN_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FIXED_BOOLEAN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FIXED_BOOLEAN_EXT] = $enc; + } + } else { + $a[self::FIELD_FIXED_BOOLEAN] = $v; + } } if (null !== ($v = $this->getFixedCode())) { - $a[self::FIELD_FIXED_CODE] = $v->getValue(); - $a[self::FIELD_FIXED_CODE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FIXED_CODE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FIXED_CODE_EXT] = $enc; + } + } else { + $a[self::FIELD_FIXED_CODE] = $v; + } } if (null !== ($v = $this->getFixedCodeableConcept())) { $a[self::FIELD_FIXED_CODEABLE_CONCEPT] = $v; @@ -12669,70 +13386,189 @@ public function jsonSerialize() $a[self::FIELD_FIXED_CODING] = $v; } if (null !== ($v = $this->getFixedContactPoint())) { - $a[self::FIELD_FIXED_CONTACT_POINT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FIXED_CONTACT_POINT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FIXED_CONTACT_POINT_EXT] = $enc; + } + } else { + $a[self::FIELD_FIXED_CONTACT_POINT] = $v; + } } if (null !== ($v = $this->getFixedCount())) { - $a[self::FIELD_FIXED_COUNT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FIXED_COUNT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FIXED_COUNT_EXT] = $enc; + } + } else { + $a[self::FIELD_FIXED_COUNT] = $v; + } } if (null !== ($v = $this->getFixedDate())) { - $a[self::FIELD_FIXED_DATE] = $v->getValue(); - $a[self::FIELD_FIXED_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FIXED_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FIXED_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_FIXED_DATE] = $v; + } } if (null !== ($v = $this->getFixedDateTime())) { - $a[self::FIELD_FIXED_DATE_TIME] = $v->getValue(); - $a[self::FIELD_FIXED_DATE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FIXED_DATE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FIXED_DATE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_FIXED_DATE_TIME] = $v; + } } if (null !== ($v = $this->getFixedDecimal())) { - $a[self::FIELD_FIXED_DECIMAL] = $v->getValue(); - $a[self::FIELD_FIXED_DECIMAL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FIXED_DECIMAL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FIXED_DECIMAL_EXT] = $enc; + } + } else { + $a[self::FIELD_FIXED_DECIMAL] = $v; + } } if (null !== ($v = $this->getFixedDistance())) { - $a[self::FIELD_FIXED_DISTANCE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FIXED_DISTANCE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FIXED_DISTANCE_EXT] = $enc; + } + } else { + $a[self::FIELD_FIXED_DISTANCE] = $v; + } } if (null !== ($v = $this->getFixedDuration())) { - $a[self::FIELD_FIXED_DURATION] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FIXED_DURATION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FIXED_DURATION_EXT] = $enc; + } + } else { + $a[self::FIELD_FIXED_DURATION] = $v; + } } if (null !== ($v = $this->getFixedHumanName())) { $a[self::FIELD_FIXED_HUMAN_NAME] = $v; } if (null !== ($v = $this->getFixedId())) { - $a[self::FIELD_FIXED_ID] = $v->getValue(); - $a[self::FIELD_FIXED_ID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FIXED_ID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FIXED_ID_EXT] = $enc; + } + } else { + $a[self::FIELD_FIXED_ID] = $v; + } } if (null !== ($v = $this->getFixedIdentifier())) { - $a[self::FIELD_FIXED_IDENTIFIER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FIXED_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FIXED_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_FIXED_IDENTIFIER] = $v; + } } if (null !== ($v = $this->getFixedInstant())) { - $a[self::FIELD_FIXED_INSTANT] = $v->getValue(); - $a[self::FIELD_FIXED_INSTANT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FIXED_INSTANT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FIXED_INSTANT_EXT] = $enc; + } + } else { + $a[self::FIELD_FIXED_INSTANT] = $v; + } } if (null !== ($v = $this->getFixedInteger())) { - $a[self::FIELD_FIXED_INTEGER] = $v->getValue(); - $a[self::FIELD_FIXED_INTEGER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FIXED_INTEGER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FIXED_INTEGER_EXT] = $enc; + } + } else { + $a[self::FIELD_FIXED_INTEGER] = $v; + } } if (null !== ($v = $this->getFixedMarkdown())) { - $a[self::FIELD_FIXED_MARKDOWN] = $v->getValue(); - $a[self::FIELD_FIXED_MARKDOWN_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FIXED_MARKDOWN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FIXED_MARKDOWN_EXT] = $enc; + } + } else { + $a[self::FIELD_FIXED_MARKDOWN] = $v; + } } if (null !== ($v = $this->getFixedMeta())) { $a[self::FIELD_FIXED_META] = $v; } if (null !== ($v = $this->getFixedMoney())) { - $a[self::FIELD_FIXED_MONEY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FIXED_MONEY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FIXED_MONEY_EXT] = $enc; + } + } else { + $a[self::FIELD_FIXED_MONEY] = $v; + } } if (null !== ($v = $this->getFixedOid())) { - $a[self::FIELD_FIXED_OID] = $v->getValue(); - $a[self::FIELD_FIXED_OID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FIXED_OID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FIXED_OID_EXT] = $enc; + } + } else { + $a[self::FIELD_FIXED_OID] = $v; + } } if (null !== ($v = $this->getFixedPeriod())) { $a[self::FIELD_FIXED_PERIOD] = $v; } if (null !== ($v = $this->getFixedPositiveInt())) { - $a[self::FIELD_FIXED_POSITIVE_INT] = $v->getValue(); - $a[self::FIELD_FIXED_POSITIVE_INT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FIXED_POSITIVE_INT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FIXED_POSITIVE_INT_EXT] = $enc; + } + } else { + $a[self::FIELD_FIXED_POSITIVE_INT] = $v; + } } if (null !== ($v = $this->getFixedQuantity())) { - $a[self::FIELD_FIXED_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FIXED_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FIXED_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_FIXED_QUANTITY] = $v; + } } if (null !== ($v = $this->getFixedRange())) { $a[self::FIELD_FIXED_RANGE] = $v; @@ -12750,142 +13586,376 @@ public function jsonSerialize() $a[self::FIELD_FIXED_SIGNATURE] = $v; } if (null !== ($v = $this->getFixedString())) { - $a[self::FIELD_FIXED_STRING] = $v->getValue(); - $a[self::FIELD_FIXED_STRING_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FIXED_STRING] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FIXED_STRING_EXT] = $enc; + } + } else { + $a[self::FIELD_FIXED_STRING] = $v; + } } if (null !== ($v = $this->getFixedTime())) { - $a[self::FIELD_FIXED_TIME] = $v->getValue(); - $a[self::FIELD_FIXED_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FIXED_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FIXED_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_FIXED_TIME] = $v; + } } if (null !== ($v = $this->getFixedTiming())) { $a[self::FIELD_FIXED_TIMING] = $v; } if (null !== ($v = $this->getFixedUnsignedInt())) { - $a[self::FIELD_FIXED_UNSIGNED_INT] = $v->getValue(); - $a[self::FIELD_FIXED_UNSIGNED_INT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FIXED_UNSIGNED_INT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FIXED_UNSIGNED_INT_EXT] = $enc; + } + } else { + $a[self::FIELD_FIXED_UNSIGNED_INT] = $v; + } } if (null !== ($v = $this->getFixedUri())) { - $a[self::FIELD_FIXED_URI] = $v->getValue(); - $a[self::FIELD_FIXED_URI_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FIXED_URI] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FIXED_URI_EXT] = $enc; + } + } else { + $a[self::FIELD_FIXED_URI] = $v; + } } if (null !== ($v = $this->getIsModifier())) { - $a[self::FIELD_IS_MODIFIER] = $v->getValue(); - $a[self::FIELD_IS_MODIFIER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IS_MODIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IS_MODIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_IS_MODIFIER] = $v; + } } if (null !== ($v = $this->getIsSummary())) { - $a[self::FIELD_IS_SUMMARY] = $v->getValue(); - $a[self::FIELD_IS_SUMMARY_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IS_SUMMARY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IS_SUMMARY_EXT] = $enc; + } + } else { + $a[self::FIELD_IS_SUMMARY] = $v; + } } if (null !== ($v = $this->getLabel())) { - $a[self::FIELD_LABEL] = $v->getValue(); - $a[self::FIELD_LABEL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_LABEL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_LABEL_EXT] = $enc; + } + } else { + $a[self::FIELD_LABEL] = $v; + } } if ([] !== ($vs = $this->getMapping())) { $a[self::FIELD_MAPPING] = $vs; } if (null !== ($v = $this->getMax())) { - $a[self::FIELD_MAX] = $v->getValue(); - $a[self::FIELD_MAX_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MAX] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MAX_EXT] = $enc; + } + } else { + $a[self::FIELD_MAX] = $v; + } } if (null !== ($v = $this->getMaxLength())) { - $a[self::FIELD_MAX_LENGTH] = $v->getValue(); - $a[self::FIELD_MAX_LENGTH_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MAX_LENGTH] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MAX_LENGTH_EXT] = $enc; + } + } else { + $a[self::FIELD_MAX_LENGTH] = $v; + } } if (null !== ($v = $this->getMaxValueDate())) { - $a[self::FIELD_MAX_VALUE_DATE] = $v->getValue(); - $a[self::FIELD_MAX_VALUE_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MAX_VALUE_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MAX_VALUE_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_MAX_VALUE_DATE] = $v; + } } if (null !== ($v = $this->getMaxValueDateTime())) { - $a[self::FIELD_MAX_VALUE_DATE_TIME] = $v->getValue(); - $a[self::FIELD_MAX_VALUE_DATE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MAX_VALUE_DATE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MAX_VALUE_DATE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_MAX_VALUE_DATE_TIME] = $v; + } } if (null !== ($v = $this->getMaxValueDecimal())) { - $a[self::FIELD_MAX_VALUE_DECIMAL] = $v->getValue(); - $a[self::FIELD_MAX_VALUE_DECIMAL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MAX_VALUE_DECIMAL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MAX_VALUE_DECIMAL_EXT] = $enc; + } + } else { + $a[self::FIELD_MAX_VALUE_DECIMAL] = $v; + } } if (null !== ($v = $this->getMaxValueInstant())) { - $a[self::FIELD_MAX_VALUE_INSTANT] = $v->getValue(); - $a[self::FIELD_MAX_VALUE_INSTANT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MAX_VALUE_INSTANT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MAX_VALUE_INSTANT_EXT] = $enc; + } + } else { + $a[self::FIELD_MAX_VALUE_INSTANT] = $v; + } } if (null !== ($v = $this->getMaxValueInteger())) { - $a[self::FIELD_MAX_VALUE_INTEGER] = $v->getValue(); - $a[self::FIELD_MAX_VALUE_INTEGER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MAX_VALUE_INTEGER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MAX_VALUE_INTEGER_EXT] = $enc; + } + } else { + $a[self::FIELD_MAX_VALUE_INTEGER] = $v; + } } if (null !== ($v = $this->getMaxValuePositiveInt())) { - $a[self::FIELD_MAX_VALUE_POSITIVE_INT] = $v->getValue(); - $a[self::FIELD_MAX_VALUE_POSITIVE_INT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MAX_VALUE_POSITIVE_INT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MAX_VALUE_POSITIVE_INT_EXT] = $enc; + } + } else { + $a[self::FIELD_MAX_VALUE_POSITIVE_INT] = $v; + } } if (null !== ($v = $this->getMaxValueQuantity())) { - $a[self::FIELD_MAX_VALUE_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MAX_VALUE_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MAX_VALUE_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_MAX_VALUE_QUANTITY] = $v; + } } if (null !== ($v = $this->getMaxValueTime())) { - $a[self::FIELD_MAX_VALUE_TIME] = $v->getValue(); - $a[self::FIELD_MAX_VALUE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MAX_VALUE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MAX_VALUE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_MAX_VALUE_TIME] = $v; + } } if (null !== ($v = $this->getMaxValueUnsignedInt())) { - $a[self::FIELD_MAX_VALUE_UNSIGNED_INT] = $v->getValue(); - $a[self::FIELD_MAX_VALUE_UNSIGNED_INT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MAX_VALUE_UNSIGNED_INT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MAX_VALUE_UNSIGNED_INT_EXT] = $enc; + } + } else { + $a[self::FIELD_MAX_VALUE_UNSIGNED_INT] = $v; + } } if (null !== ($v = $this->getMeaningWhenMissing())) { - $a[self::FIELD_MEANING_WHEN_MISSING] = $v->getValue(); - $a[self::FIELD_MEANING_WHEN_MISSING_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MEANING_WHEN_MISSING] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MEANING_WHEN_MISSING_EXT] = $enc; + } + } else { + $a[self::FIELD_MEANING_WHEN_MISSING] = $v; + } } if (null !== ($v = $this->getMin())) { - $a[self::FIELD_MIN] = $v->getValue(); - $a[self::FIELD_MIN_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MIN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MIN_EXT] = $enc; + } + } else { + $a[self::FIELD_MIN] = $v; + } } if (null !== ($v = $this->getMinValueDate())) { - $a[self::FIELD_MIN_VALUE_DATE] = $v->getValue(); - $a[self::FIELD_MIN_VALUE_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MIN_VALUE_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MIN_VALUE_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_MIN_VALUE_DATE] = $v; + } } if (null !== ($v = $this->getMinValueDateTime())) { - $a[self::FIELD_MIN_VALUE_DATE_TIME] = $v->getValue(); - $a[self::FIELD_MIN_VALUE_DATE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MIN_VALUE_DATE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MIN_VALUE_DATE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_MIN_VALUE_DATE_TIME] = $v; + } } if (null !== ($v = $this->getMinValueDecimal())) { - $a[self::FIELD_MIN_VALUE_DECIMAL] = $v->getValue(); - $a[self::FIELD_MIN_VALUE_DECIMAL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MIN_VALUE_DECIMAL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MIN_VALUE_DECIMAL_EXT] = $enc; + } + } else { + $a[self::FIELD_MIN_VALUE_DECIMAL] = $v; + } } if (null !== ($v = $this->getMinValueInstant())) { - $a[self::FIELD_MIN_VALUE_INSTANT] = $v->getValue(); - $a[self::FIELD_MIN_VALUE_INSTANT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MIN_VALUE_INSTANT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MIN_VALUE_INSTANT_EXT] = $enc; + } + } else { + $a[self::FIELD_MIN_VALUE_INSTANT] = $v; + } } if (null !== ($v = $this->getMinValueInteger())) { - $a[self::FIELD_MIN_VALUE_INTEGER] = $v->getValue(); - $a[self::FIELD_MIN_VALUE_INTEGER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MIN_VALUE_INTEGER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MIN_VALUE_INTEGER_EXT] = $enc; + } + } else { + $a[self::FIELD_MIN_VALUE_INTEGER] = $v; + } } if (null !== ($v = $this->getMinValuePositiveInt())) { - $a[self::FIELD_MIN_VALUE_POSITIVE_INT] = $v->getValue(); - $a[self::FIELD_MIN_VALUE_POSITIVE_INT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MIN_VALUE_POSITIVE_INT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MIN_VALUE_POSITIVE_INT_EXT] = $enc; + } + } else { + $a[self::FIELD_MIN_VALUE_POSITIVE_INT] = $v; + } } if (null !== ($v = $this->getMinValueQuantity())) { - $a[self::FIELD_MIN_VALUE_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MIN_VALUE_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MIN_VALUE_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_MIN_VALUE_QUANTITY] = $v; + } } if (null !== ($v = $this->getMinValueTime())) { - $a[self::FIELD_MIN_VALUE_TIME] = $v->getValue(); - $a[self::FIELD_MIN_VALUE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MIN_VALUE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MIN_VALUE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_MIN_VALUE_TIME] = $v; + } } if (null !== ($v = $this->getMinValueUnsignedInt())) { - $a[self::FIELD_MIN_VALUE_UNSIGNED_INT] = $v->getValue(); - $a[self::FIELD_MIN_VALUE_UNSIGNED_INT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MIN_VALUE_UNSIGNED_INT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MIN_VALUE_UNSIGNED_INT_EXT] = $enc; + } + } else { + $a[self::FIELD_MIN_VALUE_UNSIGNED_INT] = $v; + } } if (null !== ($v = $this->getMustSupport())) { - $a[self::FIELD_MUST_SUPPORT] = $v->getValue(); - $a[self::FIELD_MUST_SUPPORT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MUST_SUPPORT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MUST_SUPPORT_EXT] = $enc; + } + } else { + $a[self::FIELD_MUST_SUPPORT] = $v; + } } if (null !== ($v = $this->getOrderMeaning())) { - $a[self::FIELD_ORDER_MEANING] = $v->getValue(); - $a[self::FIELD_ORDER_MEANING_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ORDER_MEANING] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ORDER_MEANING_EXT] = $enc; + } + } else { + $a[self::FIELD_ORDER_MEANING] = $v; + } } if (null !== ($v = $this->getPath())) { - $a[self::FIELD_PATH] = $v->getValue(); - $a[self::FIELD_PATH_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PATH] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PATH_EXT] = $enc; + } + } else { + $a[self::FIELD_PATH] = $v; + } } if (null !== ($v = $this->getPatternAddress())) { $a[self::FIELD_PATTERN_ADDRESS] = $v; } if (null !== ($v = $this->getPatternAge())) { - $a[self::FIELD_PATTERN_AGE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PATTERN_AGE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PATTERN_AGE_EXT] = $enc; + } + } else { + $a[self::FIELD_PATTERN_AGE] = $v; + } } if (null !== ($v = $this->getPatternAnnotation())) { $a[self::FIELD_PATTERN_ANNOTATION] = $v; @@ -12894,16 +13964,37 @@ public function jsonSerialize() $a[self::FIELD_PATTERN_ATTACHMENT] = $v; } if (null !== ($v = $this->getPatternBase64Binary())) { - $a[self::FIELD_PATTERN_BASE_64BINARY] = $v->getValue(); - $a[self::FIELD_PATTERN_BASE_64BINARY_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PATTERN_BASE_64BINARY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PATTERN_BASE_64BINARY_EXT] = $enc; + } + } else { + $a[self::FIELD_PATTERN_BASE_64BINARY] = $v; + } } if (null !== ($v = $this->getPatternBoolean())) { - $a[self::FIELD_PATTERN_BOOLEAN] = $v->getValue(); - $a[self::FIELD_PATTERN_BOOLEAN_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PATTERN_BOOLEAN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PATTERN_BOOLEAN_EXT] = $enc; + } + } else { + $a[self::FIELD_PATTERN_BOOLEAN] = $v; + } } if (null !== ($v = $this->getPatternCode())) { - $a[self::FIELD_PATTERN_CODE] = $v->getValue(); - $a[self::FIELD_PATTERN_CODE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PATTERN_CODE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PATTERN_CODE_EXT] = $enc; + } + } else { + $a[self::FIELD_PATTERN_CODE] = $v; + } } if (null !== ($v = $this->getPatternCodeableConcept())) { $a[self::FIELD_PATTERN_CODEABLE_CONCEPT] = $v; @@ -12912,70 +14003,189 @@ public function jsonSerialize() $a[self::FIELD_PATTERN_CODING] = $v; } if (null !== ($v = $this->getPatternContactPoint())) { - $a[self::FIELD_PATTERN_CONTACT_POINT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PATTERN_CONTACT_POINT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PATTERN_CONTACT_POINT_EXT] = $enc; + } + } else { + $a[self::FIELD_PATTERN_CONTACT_POINT] = $v; + } } if (null !== ($v = $this->getPatternCount())) { - $a[self::FIELD_PATTERN_COUNT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PATTERN_COUNT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PATTERN_COUNT_EXT] = $enc; + } + } else { + $a[self::FIELD_PATTERN_COUNT] = $v; + } } if (null !== ($v = $this->getPatternDate())) { - $a[self::FIELD_PATTERN_DATE] = $v->getValue(); - $a[self::FIELD_PATTERN_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PATTERN_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PATTERN_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_PATTERN_DATE] = $v; + } } if (null !== ($v = $this->getPatternDateTime())) { - $a[self::FIELD_PATTERN_DATE_TIME] = $v->getValue(); - $a[self::FIELD_PATTERN_DATE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PATTERN_DATE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PATTERN_DATE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_PATTERN_DATE_TIME] = $v; + } } if (null !== ($v = $this->getPatternDecimal())) { - $a[self::FIELD_PATTERN_DECIMAL] = $v->getValue(); - $a[self::FIELD_PATTERN_DECIMAL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PATTERN_DECIMAL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PATTERN_DECIMAL_EXT] = $enc; + } + } else { + $a[self::FIELD_PATTERN_DECIMAL] = $v; + } } if (null !== ($v = $this->getPatternDistance())) { - $a[self::FIELD_PATTERN_DISTANCE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PATTERN_DISTANCE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PATTERN_DISTANCE_EXT] = $enc; + } + } else { + $a[self::FIELD_PATTERN_DISTANCE] = $v; + } } if (null !== ($v = $this->getPatternDuration())) { - $a[self::FIELD_PATTERN_DURATION] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PATTERN_DURATION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PATTERN_DURATION_EXT] = $enc; + } + } else { + $a[self::FIELD_PATTERN_DURATION] = $v; + } } if (null !== ($v = $this->getPatternHumanName())) { $a[self::FIELD_PATTERN_HUMAN_NAME] = $v; } if (null !== ($v = $this->getPatternId())) { - $a[self::FIELD_PATTERN_ID] = $v->getValue(); - $a[self::FIELD_PATTERN_ID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PATTERN_ID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PATTERN_ID_EXT] = $enc; + } + } else { + $a[self::FIELD_PATTERN_ID] = $v; + } } if (null !== ($v = $this->getPatternIdentifier())) { - $a[self::FIELD_PATTERN_IDENTIFIER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PATTERN_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PATTERN_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_PATTERN_IDENTIFIER] = $v; + } } if (null !== ($v = $this->getPatternInstant())) { - $a[self::FIELD_PATTERN_INSTANT] = $v->getValue(); - $a[self::FIELD_PATTERN_INSTANT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PATTERN_INSTANT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PATTERN_INSTANT_EXT] = $enc; + } + } else { + $a[self::FIELD_PATTERN_INSTANT] = $v; + } } if (null !== ($v = $this->getPatternInteger())) { - $a[self::FIELD_PATTERN_INTEGER] = $v->getValue(); - $a[self::FIELD_PATTERN_INTEGER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PATTERN_INTEGER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PATTERN_INTEGER_EXT] = $enc; + } + } else { + $a[self::FIELD_PATTERN_INTEGER] = $v; + } } if (null !== ($v = $this->getPatternMarkdown())) { - $a[self::FIELD_PATTERN_MARKDOWN] = $v->getValue(); - $a[self::FIELD_PATTERN_MARKDOWN_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PATTERN_MARKDOWN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PATTERN_MARKDOWN_EXT] = $enc; + } + } else { + $a[self::FIELD_PATTERN_MARKDOWN] = $v; + } } if (null !== ($v = $this->getPatternMeta())) { $a[self::FIELD_PATTERN_META] = $v; } if (null !== ($v = $this->getPatternMoney())) { - $a[self::FIELD_PATTERN_MONEY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PATTERN_MONEY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PATTERN_MONEY_EXT] = $enc; + } + } else { + $a[self::FIELD_PATTERN_MONEY] = $v; + } } if (null !== ($v = $this->getPatternOid())) { - $a[self::FIELD_PATTERN_OID] = $v->getValue(); - $a[self::FIELD_PATTERN_OID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PATTERN_OID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PATTERN_OID_EXT] = $enc; + } + } else { + $a[self::FIELD_PATTERN_OID] = $v; + } } if (null !== ($v = $this->getPatternPeriod())) { $a[self::FIELD_PATTERN_PERIOD] = $v; } if (null !== ($v = $this->getPatternPositiveInt())) { - $a[self::FIELD_PATTERN_POSITIVE_INT] = $v->getValue(); - $a[self::FIELD_PATTERN_POSITIVE_INT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PATTERN_POSITIVE_INT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PATTERN_POSITIVE_INT_EXT] = $enc; + } + } else { + $a[self::FIELD_PATTERN_POSITIVE_INT] = $v; + } } if (null !== ($v = $this->getPatternQuantity())) { - $a[self::FIELD_PATTERN_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PATTERN_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PATTERN_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_PATTERN_QUANTITY] = $v; + } } if (null !== ($v = $this->getPatternRange())) { $a[self::FIELD_PATTERN_RANGE] = $v; @@ -12993,38 +14203,103 @@ public function jsonSerialize() $a[self::FIELD_PATTERN_SIGNATURE] = $v; } if (null !== ($v = $this->getPatternString())) { - $a[self::FIELD_PATTERN_STRING] = $v->getValue(); - $a[self::FIELD_PATTERN_STRING_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PATTERN_STRING] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PATTERN_STRING_EXT] = $enc; + } + } else { + $a[self::FIELD_PATTERN_STRING] = $v; + } } if (null !== ($v = $this->getPatternTime())) { - $a[self::FIELD_PATTERN_TIME] = $v->getValue(); - $a[self::FIELD_PATTERN_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PATTERN_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PATTERN_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_PATTERN_TIME] = $v; + } } if (null !== ($v = $this->getPatternTiming())) { $a[self::FIELD_PATTERN_TIMING] = $v; } if (null !== ($v = $this->getPatternUnsignedInt())) { - $a[self::FIELD_PATTERN_UNSIGNED_INT] = $v->getValue(); - $a[self::FIELD_PATTERN_UNSIGNED_INT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PATTERN_UNSIGNED_INT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PATTERN_UNSIGNED_INT_EXT] = $enc; + } + } else { + $a[self::FIELD_PATTERN_UNSIGNED_INT] = $v; + } } if (null !== ($v = $this->getPatternUri())) { - $a[self::FIELD_PATTERN_URI] = $v->getValue(); - $a[self::FIELD_PATTERN_URI_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PATTERN_URI] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PATTERN_URI_EXT] = $enc; + } + } else { + $a[self::FIELD_PATTERN_URI] = $v; + } } if ([] !== ($vs = $this->getRepresentation())) { - $a[self::FIELD_REPRESENTATION] = $vs; + $a[self::FIELD_REPRESENTATION] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_REPRESENTATION][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_REPRESENTATION_EXT][] = $enc; + } else { + $a[self::FIELD_REPRESENTATION_EXT][] = null; + } + } else { + $a[self::FIELD_REPRESENTATION][] = $v; + } + } } if (null !== ($v = $this->getRequirements())) { - $a[self::FIELD_REQUIREMENTS] = $v->getValue(); - $a[self::FIELD_REQUIREMENTS_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_REQUIREMENTS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_REQUIREMENTS_EXT] = $enc; + } + } else { + $a[self::FIELD_REQUIREMENTS] = $v; + } } if (null !== ($v = $this->getShort())) { - $a[self::FIELD_SHORT] = $v->getValue(); - $a[self::FIELD_SHORT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SHORT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SHORT_EXT] = $enc; + } + } else { + $a[self::FIELD_SHORT] = $v; + } } if (null !== ($v = $this->getSliceName())) { - $a[self::FIELD_SLICE_NAME] = $v->getValue(); - $a[self::FIELD_SLICE_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SLICE_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SLICE_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_SLICE_NAME] = $v; + } } if (null !== ($v = $this->getSlicing())) { $a[self::FIELD_SLICING] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRElementDefinition/FHIRElementDefinitionBase.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRElementDefinition/FHIRElementDefinitionBase.php index 5e290a8415..808304e240 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRElementDefinition/FHIRElementDefinitionBase.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRElementDefinition/FHIRElementDefinitionBase.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRElementDefinitionBase extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ELEMENT_DEFINITION_DOT_BASE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_MAX = 'max'; const FIELD_MAX_EXT = '_max'; const FIELD_MIN = 'min'; @@ -127,6 +123,9 @@ class FHIRElementDefinitionBase extends FHIRElement */ protected $path = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRElementDefinitionBase Constructor * @param null|array $data @@ -149,8 +148,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MAX] instanceof FHIRString) { $this->setMax($data[self::FIELD_MAX]); - } elseif ($ext && is_scalar($data[self::FIELD_MAX])) { - $this->setMax(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_MAX]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MAX])) { + $this->setMax(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_MAX]] + $ext)); + } else if (is_array($data[self::FIELD_MAX])) { + $this->setMax(new FHIRString(array_merge($ext, $data[self::FIELD_MAX]))); + } } else { $this->setMax(new FHIRString($data[self::FIELD_MAX])); } @@ -161,8 +164,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MIN] instanceof FHIRUnsignedInt) { $this->setMin($data[self::FIELD_MIN]); - } elseif ($ext && is_scalar($data[self::FIELD_MIN])) { - $this->setMin(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_MIN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MIN])) { + $this->setMin(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_MIN]] + $ext)); + } else if (is_array($data[self::FIELD_MIN])) { + $this->setMin(new FHIRUnsignedInt(array_merge($ext, $data[self::FIELD_MIN]))); + } } else { $this->setMin(new FHIRUnsignedInt($data[self::FIELD_MIN])); } @@ -173,8 +180,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PATH] instanceof FHIRString) { $this->setPath($data[self::FIELD_PATH]); - } elseif ($ext && is_scalar($data[self::FIELD_PATH])) { - $this->setPath(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PATH]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PATH])) { + $this->setPath(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PATH]] + $ext)); + } else if (is_array($data[self::FIELD_PATH])) { + $this->setPath(new FHIRString(array_merge($ext, $data[self::FIELD_PATH]))); + } } else { $this->setPath(new FHIRString($data[self::FIELD_PATH])); } @@ -418,6 +429,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getMax())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MAX, null, $v->_getFHIRXMLNamespace())); } @@ -437,16 +449,37 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getMax())) { - $a[self::FIELD_MAX] = $v->getValue(); - $a[self::FIELD_MAX_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MAX] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MAX_EXT] = $enc; + } + } else { + $a[self::FIELD_MAX] = $v; + } } if (null !== ($v = $this->getMin())) { - $a[self::FIELD_MIN] = $v->getValue(); - $a[self::FIELD_MIN_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MIN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MIN_EXT] = $enc; + } + } else { + $a[self::FIELD_MIN] = $v; + } } if (null !== ($v = $this->getPath())) { - $a[self::FIELD_PATH] = $v->getValue(); - $a[self::FIELD_PATH_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PATH] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PATH_EXT] = $enc; + } + } else { + $a[self::FIELD_PATH] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRElementDefinition/FHIRElementDefinitionBinding.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRElementDefinition/FHIRElementDefinitionBinding.php index 75f66e19a6..b7d708e3be 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRElementDefinition/FHIRElementDefinitionBinding.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRElementDefinition/FHIRElementDefinitionBinding.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -82,10 +82,6 @@ class FHIRElementDefinitionBinding extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ELEMENT_DEFINITION_DOT_BINDING; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DESCRIPTION = 'description'; const FIELD_DESCRIPTION_EXT = '_description'; const FIELD_STRENGTH = 'strength'; @@ -149,6 +145,9 @@ class FHIRElementDefinitionBinding extends FHIRElement */ protected $valueSetUri = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRElementDefinitionBinding Constructor * @param null|array $data @@ -171,8 +170,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -183,8 +186,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STRENGTH] instanceof FHIRBindingStrength) { $this->setStrength($data[self::FIELD_STRENGTH]); - } elseif ($ext && is_scalar($data[self::FIELD_STRENGTH])) { - $this->setStrength(new FHIRBindingStrength([FHIRBindingStrength::FIELD_VALUE => $data[self::FIELD_STRENGTH]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STRENGTH])) { + $this->setStrength(new FHIRBindingStrength([FHIRBindingStrength::FIELD_VALUE => $data[self::FIELD_STRENGTH]] + $ext)); + } else if (is_array($data[self::FIELD_STRENGTH])) { + $this->setStrength(new FHIRBindingStrength(array_merge($ext, $data[self::FIELD_STRENGTH]))); + } } else { $this->setStrength(new FHIRBindingStrength($data[self::FIELD_STRENGTH])); } @@ -202,8 +209,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_SET_URI] instanceof FHIRUri) { $this->setValueSetUri($data[self::FIELD_VALUE_SET_URI]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_SET_URI])) { - $this->setValueSetUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_VALUE_SET_URI]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_SET_URI])) { + $this->setValueSetUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_VALUE_SET_URI]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_SET_URI])) { + $this->setValueSetUri(new FHIRUri(array_merge($ext, $data[self::FIELD_VALUE_SET_URI]))); + } } else { $this->setValueSetUri(new FHIRUri($data[self::FIELD_VALUE_SET_URI])); } @@ -485,14 +496,13 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getDescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESCRIPTION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStrength())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STRENGTH, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueSetReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_SET_REFERENCE, null, $v->_getFHIRXMLNamespace())); } @@ -509,18 +519,40 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if (null !== ($v = $this->getStrength())) { - $a[self::FIELD_STRENGTH] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STRENGTH] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STRENGTH_EXT] = $enc; + } + } else { + $a[self::FIELD_STRENGTH] = $v; + } } if (null !== ($v = $this->getValueSetReference())) { $a[self::FIELD_VALUE_SET_REFERENCE] = $v; } if (null !== ($v = $this->getValueSetUri())) { - $a[self::FIELD_VALUE_SET_URI] = $v->getValue(); - $a[self::FIELD_VALUE_SET_URI_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_SET_URI] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_SET_URI_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_SET_URI] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRElementDefinition/FHIRElementDefinitionConstraint.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRElementDefinition/FHIRElementDefinitionConstraint.php index 6825ecb0b4..649467f83d 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRElementDefinition/FHIRElementDefinitionConstraint.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRElementDefinition/FHIRElementDefinitionConstraint.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -82,10 +82,6 @@ class FHIRElementDefinitionConstraint extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ELEMENT_DEFINITION_DOT_CONSTRAINT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_EXPRESSION = 'expression'; const FIELD_EXPRESSION_EXT = '_expression'; const FIELD_HUMAN = 'human'; @@ -186,6 +182,9 @@ class FHIRElementDefinitionConstraint extends FHIRElement */ protected $xpath = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRElementDefinitionConstraint Constructor * @param null|array $data @@ -208,8 +207,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EXPRESSION] instanceof FHIRString) { $this->setExpression($data[self::FIELD_EXPRESSION]); - } elseif ($ext && is_scalar($data[self::FIELD_EXPRESSION])) { - $this->setExpression(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_EXPRESSION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EXPRESSION])) { + $this->setExpression(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_EXPRESSION]] + $ext)); + } else if (is_array($data[self::FIELD_EXPRESSION])) { + $this->setExpression(new FHIRString(array_merge($ext, $data[self::FIELD_EXPRESSION]))); + } } else { $this->setExpression(new FHIRString($data[self::FIELD_EXPRESSION])); } @@ -220,8 +223,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_HUMAN] instanceof FHIRString) { $this->setHuman($data[self::FIELD_HUMAN]); - } elseif ($ext && is_scalar($data[self::FIELD_HUMAN])) { - $this->setHuman(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_HUMAN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_HUMAN])) { + $this->setHuman(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_HUMAN]] + $ext)); + } else if (is_array($data[self::FIELD_HUMAN])) { + $this->setHuman(new FHIRString(array_merge($ext, $data[self::FIELD_HUMAN]))); + } } else { $this->setHuman(new FHIRString($data[self::FIELD_HUMAN])); } @@ -232,8 +239,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_KEY] instanceof FHIRId) { $this->setKey($data[self::FIELD_KEY]); - } elseif ($ext && is_scalar($data[self::FIELD_KEY])) { - $this->setKey(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_KEY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_KEY])) { + $this->setKey(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_KEY]] + $ext)); + } else if (is_array($data[self::FIELD_KEY])) { + $this->setKey(new FHIRId(array_merge($ext, $data[self::FIELD_KEY]))); + } } else { $this->setKey(new FHIRId($data[self::FIELD_KEY])); } @@ -244,8 +255,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_REQUIREMENTS] instanceof FHIRString) { $this->setRequirements($data[self::FIELD_REQUIREMENTS]); - } elseif ($ext && is_scalar($data[self::FIELD_REQUIREMENTS])) { - $this->setRequirements(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_REQUIREMENTS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_REQUIREMENTS])) { + $this->setRequirements(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_REQUIREMENTS]] + $ext)); + } else if (is_array($data[self::FIELD_REQUIREMENTS])) { + $this->setRequirements(new FHIRString(array_merge($ext, $data[self::FIELD_REQUIREMENTS]))); + } } else { $this->setRequirements(new FHIRString($data[self::FIELD_REQUIREMENTS])); } @@ -256,8 +271,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SEVERITY] instanceof FHIRConstraintSeverity) { $this->setSeverity($data[self::FIELD_SEVERITY]); - } elseif ($ext && is_scalar($data[self::FIELD_SEVERITY])) { - $this->setSeverity(new FHIRConstraintSeverity([FHIRConstraintSeverity::FIELD_VALUE => $data[self::FIELD_SEVERITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SEVERITY])) { + $this->setSeverity(new FHIRConstraintSeverity([FHIRConstraintSeverity::FIELD_VALUE => $data[self::FIELD_SEVERITY]] + $ext)); + } else if (is_array($data[self::FIELD_SEVERITY])) { + $this->setSeverity(new FHIRConstraintSeverity(array_merge($ext, $data[self::FIELD_SEVERITY]))); + } } else { $this->setSeverity(new FHIRConstraintSeverity($data[self::FIELD_SEVERITY])); } @@ -268,8 +287,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SOURCE] instanceof FHIRUri) { $this->setSource($data[self::FIELD_SOURCE]); - } elseif ($ext && is_scalar($data[self::FIELD_SOURCE])) { - $this->setSource(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_SOURCE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SOURCE])) { + $this->setSource(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_SOURCE]] + $ext)); + } else if (is_array($data[self::FIELD_SOURCE])) { + $this->setSource(new FHIRUri(array_merge($ext, $data[self::FIELD_SOURCE]))); + } } else { $this->setSource(new FHIRUri($data[self::FIELD_SOURCE])); } @@ -280,8 +303,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_XPATH] instanceof FHIRString) { $this->setXpath($data[self::FIELD_XPATH]); - } elseif ($ext && is_scalar($data[self::FIELD_XPATH])) { - $this->setXpath(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_XPATH]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_XPATH])) { + $this->setXpath(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_XPATH]] + $ext)); + } else if (is_array($data[self::FIELD_XPATH])) { + $this->setXpath(new FHIRString(array_merge($ext, $data[self::FIELD_XPATH]))); + } } else { $this->setXpath(new FHIRString($data[self::FIELD_XPATH])); } @@ -700,6 +727,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getExpression())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EXPRESSION, null, $v->_getFHIRXMLNamespace())); } @@ -712,7 +740,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getRequirements())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REQUIREMENTS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSeverity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SEVERITY, null, $v->_getFHIRXMLNamespace())); } @@ -732,31 +759,81 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getExpression())) { - $a[self::FIELD_EXPRESSION] = $v->getValue(); - $a[self::FIELD_EXPRESSION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EXPRESSION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EXPRESSION_EXT] = $enc; + } + } else { + $a[self::FIELD_EXPRESSION] = $v; + } } if (null !== ($v = $this->getHuman())) { - $a[self::FIELD_HUMAN] = $v->getValue(); - $a[self::FIELD_HUMAN_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_HUMAN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_HUMAN_EXT] = $enc; + } + } else { + $a[self::FIELD_HUMAN] = $v; + } } if (null !== ($v = $this->getKey())) { - $a[self::FIELD_KEY] = $v->getValue(); - $a[self::FIELD_KEY_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_KEY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_KEY_EXT] = $enc; + } + } else { + $a[self::FIELD_KEY] = $v; + } } if (null !== ($v = $this->getRequirements())) { - $a[self::FIELD_REQUIREMENTS] = $v->getValue(); - $a[self::FIELD_REQUIREMENTS_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_REQUIREMENTS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_REQUIREMENTS_EXT] = $enc; + } + } else { + $a[self::FIELD_REQUIREMENTS] = $v; + } } if (null !== ($v = $this->getSeverity())) { - $a[self::FIELD_SEVERITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SEVERITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SEVERITY_EXT] = $enc; + } + } else { + $a[self::FIELD_SEVERITY] = $v; + } } if (null !== ($v = $this->getSource())) { - $a[self::FIELD_SOURCE] = $v->getValue(); - $a[self::FIELD_SOURCE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SOURCE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SOURCE_EXT] = $enc; + } + } else { + $a[self::FIELD_SOURCE] = $v; + } } if (null !== ($v = $this->getXpath())) { - $a[self::FIELD_XPATH] = $v->getValue(); - $a[self::FIELD_XPATH_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_XPATH] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_XPATH_EXT] = $enc; + } + } else { + $a[self::FIELD_XPATH] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRElementDefinition/FHIRElementDefinitionDiscriminator.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRElementDefinition/FHIRElementDefinitionDiscriminator.php index fe26a6a06d..b5d42b15b4 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRElementDefinition/FHIRElementDefinitionDiscriminator.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRElementDefinition/FHIRElementDefinitionDiscriminator.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRElementDefinitionDiscriminator extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ELEMENT_DEFINITION_DOT_DISCRIMINATOR; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_PATH = 'path'; const FIELD_PATH_EXT = '_path'; const FIELD_TYPE = 'type'; @@ -111,6 +107,9 @@ class FHIRElementDefinitionDiscriminator extends FHIRElement */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRElementDefinitionDiscriminator Constructor * @param null|array $data @@ -133,8 +132,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PATH] instanceof FHIRString) { $this->setPath($data[self::FIELD_PATH]); - } elseif ($ext && is_scalar($data[self::FIELD_PATH])) { - $this->setPath(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PATH]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PATH])) { + $this->setPath(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PATH]] + $ext)); + } else if (is_array($data[self::FIELD_PATH])) { + $this->setPath(new FHIRString(array_merge($ext, $data[self::FIELD_PATH]))); + } } else { $this->setPath(new FHIRString($data[self::FIELD_PATH])); } @@ -145,8 +148,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TYPE] instanceof FHIRDiscriminatorType) { $this->setType($data[self::FIELD_TYPE]); - } elseif ($ext && is_scalar($data[self::FIELD_TYPE])) { - $this->setType(new FHIRDiscriminatorType([FHIRDiscriminatorType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TYPE])) { + $this->setType(new FHIRDiscriminatorType([FHIRDiscriminatorType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } else if (is_array($data[self::FIELD_TYPE])) { + $this->setType(new FHIRDiscriminatorType(array_merge($ext, $data[self::FIELD_TYPE]))); + } } else { $this->setType(new FHIRDiscriminatorType($data[self::FIELD_TYPE])); } @@ -329,10 +336,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getPath())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATH, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -346,11 +353,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getPath())) { - $a[self::FIELD_PATH] = $v->getValue(); - $a[self::FIELD_PATH_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PATH] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PATH_EXT] = $enc; + } + } else { + $a[self::FIELD_PATH] = $v; + } } if (null !== ($v = $this->getType())) { - $a[self::FIELD_TYPE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TYPE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TYPE_EXT] = $enc; + } + } else { + $a[self::FIELD_TYPE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRElementDefinition/FHIRElementDefinitionExample.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRElementDefinition/FHIRElementDefinitionExample.php index 1258cba58f..2137056c01 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRElementDefinition/FHIRElementDefinitionExample.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRElementDefinition/FHIRElementDefinitionExample.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -116,14 +116,11 @@ class FHIRElementDefinitionExample extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ELEMENT_DEFINITION_DOT_EXAMPLE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_LABEL = 'label'; const FIELD_LABEL_EXT = '_label'; const FIELD_VALUE_ADDRESS = 'valueAddress'; const FIELD_VALUE_AGE = 'valueAge'; + const FIELD_VALUE_AGE_EXT = '_valueAge'; const FIELD_VALUE_ANNOTATION = 'valueAnnotation'; const FIELD_VALUE_ATTACHMENT = 'valueAttachment'; const FIELD_VALUE_BASE_64BINARY = 'valueBase64Binary'; @@ -137,6 +134,7 @@ class FHIRElementDefinitionExample extends FHIRElement const FIELD_VALUE_CONTACT_POINT = 'valueContactPoint'; const FIELD_VALUE_CONTACT_POINT_EXT = '_valueContactPoint'; const FIELD_VALUE_COUNT = 'valueCount'; + const FIELD_VALUE_COUNT_EXT = '_valueCount'; const FIELD_VALUE_DATE = 'valueDate'; const FIELD_VALUE_DATE_EXT = '_valueDate'; const FIELD_VALUE_DATE_TIME = 'valueDateTime'; @@ -144,7 +142,9 @@ class FHIRElementDefinitionExample extends FHIRElement const FIELD_VALUE_DECIMAL = 'valueDecimal'; const FIELD_VALUE_DECIMAL_EXT = '_valueDecimal'; const FIELD_VALUE_DISTANCE = 'valueDistance'; + const FIELD_VALUE_DISTANCE_EXT = '_valueDistance'; const FIELD_VALUE_DURATION = 'valueDuration'; + const FIELD_VALUE_DURATION_EXT = '_valueDuration'; const FIELD_VALUE_HUMAN_NAME = 'valueHumanName'; const FIELD_VALUE_ID = 'valueId'; const FIELD_VALUE_ID_EXT = '_valueId'; @@ -158,6 +158,7 @@ class FHIRElementDefinitionExample extends FHIRElement const FIELD_VALUE_MARKDOWN_EXT = '_valueMarkdown'; const FIELD_VALUE_META = 'valueMeta'; const FIELD_VALUE_MONEY = 'valueMoney'; + const FIELD_VALUE_MONEY_EXT = '_valueMoney'; const FIELD_VALUE_OID = 'valueOid'; const FIELD_VALUE_OID_EXT = '_valueOid'; const FIELD_VALUE_PERIOD = 'valuePeriod'; @@ -685,6 +686,9 @@ class FHIRElementDefinitionExample extends FHIRElement */ protected $valueUri = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRElementDefinitionExample Constructor * @param null|array $data @@ -707,8 +711,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_LABEL] instanceof FHIRString) { $this->setLabel($data[self::FIELD_LABEL]); - } elseif ($ext && is_scalar($data[self::FIELD_LABEL])) { - $this->setLabel(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_LABEL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_LABEL])) { + $this->setLabel(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_LABEL]] + $ext)); + } else if (is_array($data[self::FIELD_LABEL])) { + $this->setLabel(new FHIRString(array_merge($ext, $data[self::FIELD_LABEL]))); + } } else { $this->setLabel(new FHIRString($data[self::FIELD_LABEL])); } @@ -721,8 +729,17 @@ public function __construct($data = null) } } if (isset($data[self::FIELD_VALUE_AGE])) { + $ext = (isset($data[self::FIELD_VALUE_AGE_EXT]) && is_array($data[self::FIELD_VALUE_AGE_EXT])) + ? $data[self::FIELD_VALUE_AGE_EXT] + : null; if ($data[self::FIELD_VALUE_AGE] instanceof FHIRAge) { $this->setValueAge($data[self::FIELD_VALUE_AGE]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_AGE])) { + $this->setValueAge(new FHIRAge([FHIRAge::FIELD_VALUE => $data[self::FIELD_VALUE_AGE]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_AGE])) { + $this->setValueAge(new FHIRAge(array_merge($ext, $data[self::FIELD_VALUE_AGE]))); + } } else { $this->setValueAge(new FHIRAge($data[self::FIELD_VALUE_AGE])); } @@ -747,8 +764,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_BASE_64BINARY] instanceof FHIRBase64Binary) { $this->setValueBase64Binary($data[self::FIELD_VALUE_BASE_64BINARY]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_BASE_64BINARY])) { - $this->setValueBase64Binary(new FHIRBase64Binary([FHIRBase64Binary::FIELD_VALUE => $data[self::FIELD_VALUE_BASE_64BINARY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_BASE_64BINARY])) { + $this->setValueBase64Binary(new FHIRBase64Binary([FHIRBase64Binary::FIELD_VALUE => $data[self::FIELD_VALUE_BASE_64BINARY]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_BASE_64BINARY])) { + $this->setValueBase64Binary(new FHIRBase64Binary(array_merge($ext, $data[self::FIELD_VALUE_BASE_64BINARY]))); + } } else { $this->setValueBase64Binary(new FHIRBase64Binary($data[self::FIELD_VALUE_BASE_64BINARY])); } @@ -759,8 +780,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_BOOLEAN] instanceof FHIRBoolean) { $this->setValueBoolean($data[self::FIELD_VALUE_BOOLEAN]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_BOOLEAN])) { - $this->setValueBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_VALUE_BOOLEAN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_BOOLEAN])) { + $this->setValueBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_VALUE_BOOLEAN]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_BOOLEAN])) { + $this->setValueBoolean(new FHIRBoolean(array_merge($ext, $data[self::FIELD_VALUE_BOOLEAN]))); + } } else { $this->setValueBoolean(new FHIRBoolean($data[self::FIELD_VALUE_BOOLEAN])); } @@ -771,8 +796,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_CODE] instanceof FHIRCode) { $this->setValueCode($data[self::FIELD_VALUE_CODE]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_CODE])) { - $this->setValueCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_VALUE_CODE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_CODE])) { + $this->setValueCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_VALUE_CODE]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_CODE])) { + $this->setValueCode(new FHIRCode(array_merge($ext, $data[self::FIELD_VALUE_CODE]))); + } } else { $this->setValueCode(new FHIRCode($data[self::FIELD_VALUE_CODE])); } @@ -797,15 +826,28 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_CONTACT_POINT] instanceof FHIRContactPoint) { $this->setValueContactPoint($data[self::FIELD_VALUE_CONTACT_POINT]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_CONTACT_POINT])) { - $this->setValueContactPoint(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $data[self::FIELD_VALUE_CONTACT_POINT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_CONTACT_POINT])) { + $this->setValueContactPoint(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $data[self::FIELD_VALUE_CONTACT_POINT]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_CONTACT_POINT])) { + $this->setValueContactPoint(new FHIRContactPoint(array_merge($ext, $data[self::FIELD_VALUE_CONTACT_POINT]))); + } } else { $this->setValueContactPoint(new FHIRContactPoint($data[self::FIELD_VALUE_CONTACT_POINT])); } } if (isset($data[self::FIELD_VALUE_COUNT])) { + $ext = (isset($data[self::FIELD_VALUE_COUNT_EXT]) && is_array($data[self::FIELD_VALUE_COUNT_EXT])) + ? $data[self::FIELD_VALUE_COUNT_EXT] + : null; if ($data[self::FIELD_VALUE_COUNT] instanceof FHIRCount) { $this->setValueCount($data[self::FIELD_VALUE_COUNT]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_COUNT])) { + $this->setValueCount(new FHIRCount([FHIRCount::FIELD_VALUE => $data[self::FIELD_VALUE_COUNT]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_COUNT])) { + $this->setValueCount(new FHIRCount(array_merge($ext, $data[self::FIELD_VALUE_COUNT]))); + } } else { $this->setValueCount(new FHIRCount($data[self::FIELD_VALUE_COUNT])); } @@ -816,8 +858,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_DATE] instanceof FHIRDate) { $this->setValueDate($data[self::FIELD_VALUE_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_DATE])) { - $this->setValueDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_VALUE_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_DATE])) { + $this->setValueDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_VALUE_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_DATE])) { + $this->setValueDate(new FHIRDate(array_merge($ext, $data[self::FIELD_VALUE_DATE]))); + } } else { $this->setValueDate(new FHIRDate($data[self::FIELD_VALUE_DATE])); } @@ -828,8 +874,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_DATE_TIME] instanceof FHIRDateTime) { $this->setValueDateTime($data[self::FIELD_VALUE_DATE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_DATE_TIME])) { - $this->setValueDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_VALUE_DATE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_DATE_TIME])) { + $this->setValueDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_VALUE_DATE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_DATE_TIME])) { + $this->setValueDateTime(new FHIRDateTime(array_merge($ext, $data[self::FIELD_VALUE_DATE_TIME]))); + } } else { $this->setValueDateTime(new FHIRDateTime($data[self::FIELD_VALUE_DATE_TIME])); } @@ -840,22 +890,44 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_DECIMAL] instanceof FHIRDecimal) { $this->setValueDecimal($data[self::FIELD_VALUE_DECIMAL]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_DECIMAL])) { - $this->setValueDecimal(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_VALUE_DECIMAL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_DECIMAL])) { + $this->setValueDecimal(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_VALUE_DECIMAL]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_DECIMAL])) { + $this->setValueDecimal(new FHIRDecimal(array_merge($ext, $data[self::FIELD_VALUE_DECIMAL]))); + } } else { $this->setValueDecimal(new FHIRDecimal($data[self::FIELD_VALUE_DECIMAL])); } } if (isset($data[self::FIELD_VALUE_DISTANCE])) { + $ext = (isset($data[self::FIELD_VALUE_DISTANCE_EXT]) && is_array($data[self::FIELD_VALUE_DISTANCE_EXT])) + ? $data[self::FIELD_VALUE_DISTANCE_EXT] + : null; if ($data[self::FIELD_VALUE_DISTANCE] instanceof FHIRDistance) { $this->setValueDistance($data[self::FIELD_VALUE_DISTANCE]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_DISTANCE])) { + $this->setValueDistance(new FHIRDistance([FHIRDistance::FIELD_VALUE => $data[self::FIELD_VALUE_DISTANCE]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_DISTANCE])) { + $this->setValueDistance(new FHIRDistance(array_merge($ext, $data[self::FIELD_VALUE_DISTANCE]))); + } } else { $this->setValueDistance(new FHIRDistance($data[self::FIELD_VALUE_DISTANCE])); } } if (isset($data[self::FIELD_VALUE_DURATION])) { + $ext = (isset($data[self::FIELD_VALUE_DURATION_EXT]) && is_array($data[self::FIELD_VALUE_DURATION_EXT])) + ? $data[self::FIELD_VALUE_DURATION_EXT] + : null; if ($data[self::FIELD_VALUE_DURATION] instanceof FHIRDuration) { $this->setValueDuration($data[self::FIELD_VALUE_DURATION]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_DURATION])) { + $this->setValueDuration(new FHIRDuration([FHIRDuration::FIELD_VALUE => $data[self::FIELD_VALUE_DURATION]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_DURATION])) { + $this->setValueDuration(new FHIRDuration(array_merge($ext, $data[self::FIELD_VALUE_DURATION]))); + } } else { $this->setValueDuration(new FHIRDuration($data[self::FIELD_VALUE_DURATION])); } @@ -873,8 +945,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_ID] instanceof FHIRId) { $this->setValueId($data[self::FIELD_VALUE_ID]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_ID])) { - $this->setValueId(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_VALUE_ID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_ID])) { + $this->setValueId(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_VALUE_ID]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_ID])) { + $this->setValueId(new FHIRId(array_merge($ext, $data[self::FIELD_VALUE_ID]))); + } } else { $this->setValueId(new FHIRId($data[self::FIELD_VALUE_ID])); } @@ -885,8 +961,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_IDENTIFIER] instanceof FHIRIdentifier) { $this->setValueIdentifier($data[self::FIELD_VALUE_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_IDENTIFIER])) { - $this->setValueIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_VALUE_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_IDENTIFIER])) { + $this->setValueIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_VALUE_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_IDENTIFIER])) { + $this->setValueIdentifier(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_VALUE_IDENTIFIER]))); + } } else { $this->setValueIdentifier(new FHIRIdentifier($data[self::FIELD_VALUE_IDENTIFIER])); } @@ -897,8 +977,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_INSTANT] instanceof FHIRInstant) { $this->setValueInstant($data[self::FIELD_VALUE_INSTANT]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_INSTANT])) { - $this->setValueInstant(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_VALUE_INSTANT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_INSTANT])) { + $this->setValueInstant(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_VALUE_INSTANT]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_INSTANT])) { + $this->setValueInstant(new FHIRInstant(array_merge($ext, $data[self::FIELD_VALUE_INSTANT]))); + } } else { $this->setValueInstant(new FHIRInstant($data[self::FIELD_VALUE_INSTANT])); } @@ -909,8 +993,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_INTEGER] instanceof FHIRInteger) { $this->setValueInteger($data[self::FIELD_VALUE_INTEGER]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_INTEGER])) { - $this->setValueInteger(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_VALUE_INTEGER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_INTEGER])) { + $this->setValueInteger(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_VALUE_INTEGER]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_INTEGER])) { + $this->setValueInteger(new FHIRInteger(array_merge($ext, $data[self::FIELD_VALUE_INTEGER]))); + } } else { $this->setValueInteger(new FHIRInteger($data[self::FIELD_VALUE_INTEGER])); } @@ -921,8 +1009,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_MARKDOWN] instanceof FHIRMarkdown) { $this->setValueMarkdown($data[self::FIELD_VALUE_MARKDOWN]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_MARKDOWN])) { - $this->setValueMarkdown(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_VALUE_MARKDOWN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_MARKDOWN])) { + $this->setValueMarkdown(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_VALUE_MARKDOWN]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_MARKDOWN])) { + $this->setValueMarkdown(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_VALUE_MARKDOWN]))); + } } else { $this->setValueMarkdown(new FHIRMarkdown($data[self::FIELD_VALUE_MARKDOWN])); } @@ -935,8 +1027,17 @@ public function __construct($data = null) } } if (isset($data[self::FIELD_VALUE_MONEY])) { + $ext = (isset($data[self::FIELD_VALUE_MONEY_EXT]) && is_array($data[self::FIELD_VALUE_MONEY_EXT])) + ? $data[self::FIELD_VALUE_MONEY_EXT] + : null; if ($data[self::FIELD_VALUE_MONEY] instanceof FHIRMoney) { $this->setValueMoney($data[self::FIELD_VALUE_MONEY]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_MONEY])) { + $this->setValueMoney(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_VALUE_MONEY]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_MONEY])) { + $this->setValueMoney(new FHIRMoney(array_merge($ext, $data[self::FIELD_VALUE_MONEY]))); + } } else { $this->setValueMoney(new FHIRMoney($data[self::FIELD_VALUE_MONEY])); } @@ -947,8 +1048,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_OID] instanceof FHIROid) { $this->setValueOid($data[self::FIELD_VALUE_OID]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_OID])) { - $this->setValueOid(new FHIROid([FHIROid::FIELD_VALUE => $data[self::FIELD_VALUE_OID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_OID])) { + $this->setValueOid(new FHIROid([FHIROid::FIELD_VALUE => $data[self::FIELD_VALUE_OID]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_OID])) { + $this->setValueOid(new FHIROid(array_merge($ext, $data[self::FIELD_VALUE_OID]))); + } } else { $this->setValueOid(new FHIROid($data[self::FIELD_VALUE_OID])); } @@ -966,8 +1071,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_POSITIVE_INT] instanceof FHIRPositiveInt) { $this->setValuePositiveInt($data[self::FIELD_VALUE_POSITIVE_INT]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_POSITIVE_INT])) { - $this->setValuePositiveInt(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_VALUE_POSITIVE_INT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_POSITIVE_INT])) { + $this->setValuePositiveInt(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_VALUE_POSITIVE_INT]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_POSITIVE_INT])) { + $this->setValuePositiveInt(new FHIRPositiveInt(array_merge($ext, $data[self::FIELD_VALUE_POSITIVE_INT]))); + } } else { $this->setValuePositiveInt(new FHIRPositiveInt($data[self::FIELD_VALUE_POSITIVE_INT])); } @@ -978,8 +1087,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_QUANTITY] instanceof FHIRQuantity) { $this->setValueQuantity($data[self::FIELD_VALUE_QUANTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_QUANTITY])) { - $this->setValueQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_VALUE_QUANTITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_QUANTITY])) { + $this->setValueQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_VALUE_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_QUANTITY])) { + $this->setValueQuantity(new FHIRQuantity(array_merge($ext, $data[self::FIELD_VALUE_QUANTITY]))); + } } else { $this->setValueQuantity(new FHIRQuantity($data[self::FIELD_VALUE_QUANTITY])); } @@ -1025,8 +1138,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_STRING] instanceof FHIRString) { $this->setValueString($data[self::FIELD_VALUE_STRING]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_STRING])) { - $this->setValueString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VALUE_STRING]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_STRING])) { + $this->setValueString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VALUE_STRING]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_STRING])) { + $this->setValueString(new FHIRString(array_merge($ext, $data[self::FIELD_VALUE_STRING]))); + } } else { $this->setValueString(new FHIRString($data[self::FIELD_VALUE_STRING])); } @@ -1037,8 +1154,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_TIME] instanceof FHIRTime) { $this->setValueTime($data[self::FIELD_VALUE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_TIME])) { - $this->setValueTime(new FHIRTime([FHIRTime::FIELD_VALUE => $data[self::FIELD_VALUE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_TIME])) { + $this->setValueTime(new FHIRTime([FHIRTime::FIELD_VALUE => $data[self::FIELD_VALUE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_TIME])) { + $this->setValueTime(new FHIRTime(array_merge($ext, $data[self::FIELD_VALUE_TIME]))); + } } else { $this->setValueTime(new FHIRTime($data[self::FIELD_VALUE_TIME])); } @@ -1056,8 +1177,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_UNSIGNED_INT] instanceof FHIRUnsignedInt) { $this->setValueUnsignedInt($data[self::FIELD_VALUE_UNSIGNED_INT]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_UNSIGNED_INT])) { - $this->setValueUnsignedInt(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_VALUE_UNSIGNED_INT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_UNSIGNED_INT])) { + $this->setValueUnsignedInt(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_VALUE_UNSIGNED_INT]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_UNSIGNED_INT])) { + $this->setValueUnsignedInt(new FHIRUnsignedInt(array_merge($ext, $data[self::FIELD_VALUE_UNSIGNED_INT]))); + } } else { $this->setValueUnsignedInt(new FHIRUnsignedInt($data[self::FIELD_VALUE_UNSIGNED_INT])); } @@ -1068,8 +1193,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_URI] instanceof FHIRUri) { $this->setValueUri($data[self::FIELD_VALUE_URI]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_URI])) { - $this->setValueUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_VALUE_URI]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_URI])) { + $this->setValueUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_VALUE_URI]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_URI])) { + $this->setValueUri(new FHIRUri(array_merge($ext, $data[self::FIELD_VALUE_URI]))); + } } else { $this->setValueUri(new FHIRUri($data[self::FIELD_VALUE_URI])); } @@ -2801,22 +2930,19 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getLabel())) { $v->xmlSerialize($sxe->addChild(self::FIELD_LABEL, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueAddress())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_ADDRESS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueAge())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_AGE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueAnnotation())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_ANNOTATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueAttachment())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_ATTACHMENT, null, $v->_getFHIRXMLNamespace())); } @@ -2829,19 +2955,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getValueCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_CODE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueCoding())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_CODING, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueContactPoint())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_CONTACT_POINT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueCount())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_COUNT, null, $v->_getFHIRXMLNamespace())); } @@ -2854,22 +2976,18 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getValueDecimal())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_DECIMAL, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueDistance())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_DISTANCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueDuration())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_DURATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueHumanName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_HUMAN_NAME, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getValueId())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_ID, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } @@ -2882,45 +3000,36 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getValueMarkdown())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_MARKDOWN, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueMeta())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_META, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueMoney())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_MONEY, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getValueOid())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_OID, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValuePeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_PERIOD, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getValuePositiveInt())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_POSITIVE_INT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_QUANTITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueRange())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_RANGE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueRatio())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_RATIO, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_REFERENCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueSampledData())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_SAMPLED_DATA, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueSignature())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_SIGNATURE, null, $v->_getFHIRXMLNamespace())); } @@ -2930,7 +3039,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getValueTime())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_TIME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueTiming())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_TIMING, null, $v->_getFHIRXMLNamespace())); } @@ -2950,14 +3058,29 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getLabel())) { - $a[self::FIELD_LABEL] = $v->getValue(); - $a[self::FIELD_LABEL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_LABEL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_LABEL_EXT] = $enc; + } + } else { + $a[self::FIELD_LABEL] = $v; + } } if (null !== ($v = $this->getValueAddress())) { $a[self::FIELD_VALUE_ADDRESS] = $v; } if (null !== ($v = $this->getValueAge())) { - $a[self::FIELD_VALUE_AGE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_AGE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_AGE_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_AGE] = $v; + } } if (null !== ($v = $this->getValueAnnotation())) { $a[self::FIELD_VALUE_ANNOTATION] = $v; @@ -2966,16 +3089,37 @@ public function jsonSerialize() $a[self::FIELD_VALUE_ATTACHMENT] = $v; } if (null !== ($v = $this->getValueBase64Binary())) { - $a[self::FIELD_VALUE_BASE_64BINARY] = $v->getValue(); - $a[self::FIELD_VALUE_BASE_64BINARY_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_BASE_64BINARY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_BASE_64BINARY_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_BASE_64BINARY] = $v; + } } if (null !== ($v = $this->getValueBoolean())) { - $a[self::FIELD_VALUE_BOOLEAN] = $v->getValue(); - $a[self::FIELD_VALUE_BOOLEAN_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_BOOLEAN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_BOOLEAN_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_BOOLEAN] = $v; + } } if (null !== ($v = $this->getValueCode())) { - $a[self::FIELD_VALUE_CODE] = $v->getValue(); - $a[self::FIELD_VALUE_CODE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_CODE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_CODE_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_CODE] = $v; + } } if (null !== ($v = $this->getValueCodeableConcept())) { $a[self::FIELD_VALUE_CODEABLE_CONCEPT] = $v; @@ -2984,70 +3128,189 @@ public function jsonSerialize() $a[self::FIELD_VALUE_CODING] = $v; } if (null !== ($v = $this->getValueContactPoint())) { - $a[self::FIELD_VALUE_CONTACT_POINT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_CONTACT_POINT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_CONTACT_POINT_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_CONTACT_POINT] = $v; + } } if (null !== ($v = $this->getValueCount())) { - $a[self::FIELD_VALUE_COUNT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_COUNT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_COUNT_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_COUNT] = $v; + } } if (null !== ($v = $this->getValueDate())) { - $a[self::FIELD_VALUE_DATE] = $v->getValue(); - $a[self::FIELD_VALUE_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_DATE] = $v; + } } if (null !== ($v = $this->getValueDateTime())) { - $a[self::FIELD_VALUE_DATE_TIME] = $v->getValue(); - $a[self::FIELD_VALUE_DATE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_DATE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_DATE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_DATE_TIME] = $v; + } } if (null !== ($v = $this->getValueDecimal())) { - $a[self::FIELD_VALUE_DECIMAL] = $v->getValue(); - $a[self::FIELD_VALUE_DECIMAL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_DECIMAL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_DECIMAL_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_DECIMAL] = $v; + } } if (null !== ($v = $this->getValueDistance())) { - $a[self::FIELD_VALUE_DISTANCE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_DISTANCE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_DISTANCE_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_DISTANCE] = $v; + } } if (null !== ($v = $this->getValueDuration())) { - $a[self::FIELD_VALUE_DURATION] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_DURATION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_DURATION_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_DURATION] = $v; + } } if (null !== ($v = $this->getValueHumanName())) { $a[self::FIELD_VALUE_HUMAN_NAME] = $v; } if (null !== ($v = $this->getValueId())) { - $a[self::FIELD_VALUE_ID] = $v->getValue(); - $a[self::FIELD_VALUE_ID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_ID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_ID_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_ID] = $v; + } } if (null !== ($v = $this->getValueIdentifier())) { - $a[self::FIELD_VALUE_IDENTIFIER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_IDENTIFIER] = $v; + } } if (null !== ($v = $this->getValueInstant())) { - $a[self::FIELD_VALUE_INSTANT] = $v->getValue(); - $a[self::FIELD_VALUE_INSTANT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_INSTANT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_INSTANT_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_INSTANT] = $v; + } } if (null !== ($v = $this->getValueInteger())) { - $a[self::FIELD_VALUE_INTEGER] = $v->getValue(); - $a[self::FIELD_VALUE_INTEGER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_INTEGER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_INTEGER_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_INTEGER] = $v; + } } if (null !== ($v = $this->getValueMarkdown())) { - $a[self::FIELD_VALUE_MARKDOWN] = $v->getValue(); - $a[self::FIELD_VALUE_MARKDOWN_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_MARKDOWN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_MARKDOWN_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_MARKDOWN] = $v; + } } if (null !== ($v = $this->getValueMeta())) { $a[self::FIELD_VALUE_META] = $v; } if (null !== ($v = $this->getValueMoney())) { - $a[self::FIELD_VALUE_MONEY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_MONEY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_MONEY_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_MONEY] = $v; + } } if (null !== ($v = $this->getValueOid())) { - $a[self::FIELD_VALUE_OID] = $v->getValue(); - $a[self::FIELD_VALUE_OID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_OID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_OID_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_OID] = $v; + } } if (null !== ($v = $this->getValuePeriod())) { $a[self::FIELD_VALUE_PERIOD] = $v; } if (null !== ($v = $this->getValuePositiveInt())) { - $a[self::FIELD_VALUE_POSITIVE_INT] = $v->getValue(); - $a[self::FIELD_VALUE_POSITIVE_INT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_POSITIVE_INT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_POSITIVE_INT_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_POSITIVE_INT] = $v; + } } if (null !== ($v = $this->getValueQuantity())) { - $a[self::FIELD_VALUE_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_QUANTITY] = $v; + } } if (null !== ($v = $this->getValueRange())) { $a[self::FIELD_VALUE_RANGE] = $v; @@ -3065,23 +3328,51 @@ public function jsonSerialize() $a[self::FIELD_VALUE_SIGNATURE] = $v; } if (null !== ($v = $this->getValueString())) { - $a[self::FIELD_VALUE_STRING] = $v->getValue(); - $a[self::FIELD_VALUE_STRING_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_STRING] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_STRING_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_STRING] = $v; + } } if (null !== ($v = $this->getValueTime())) { - $a[self::FIELD_VALUE_TIME] = $v->getValue(); - $a[self::FIELD_VALUE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_TIME] = $v; + } } if (null !== ($v = $this->getValueTiming())) { $a[self::FIELD_VALUE_TIMING] = $v; } if (null !== ($v = $this->getValueUnsignedInt())) { - $a[self::FIELD_VALUE_UNSIGNED_INT] = $v->getValue(); - $a[self::FIELD_VALUE_UNSIGNED_INT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_UNSIGNED_INT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_UNSIGNED_INT_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_UNSIGNED_INT] = $v; + } } if (null !== ($v = $this->getValueUri())) { - $a[self::FIELD_VALUE_URI] = $v->getValue(); - $a[self::FIELD_VALUE_URI_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_URI] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_URI_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_URI] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRElementDefinition/FHIRElementDefinitionMapping.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRElementDefinition/FHIRElementDefinitionMapping.php index 0302cd31f8..8ab109871d 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRElementDefinition/FHIRElementDefinitionMapping.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRElementDefinition/FHIRElementDefinitionMapping.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -81,10 +81,6 @@ class FHIRElementDefinitionMapping extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ELEMENT_DEFINITION_DOT_MAPPING; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_COMMENT = 'comment'; const FIELD_COMMENT_EXT = '_comment'; const FIELD_IDENTITY = 'identity'; @@ -142,6 +138,9 @@ class FHIRElementDefinitionMapping extends FHIRElement */ protected $map = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRElementDefinitionMapping Constructor * @param null|array $data @@ -164,8 +163,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_COMMENT] instanceof FHIRString) { $this->setComment($data[self::FIELD_COMMENT]); - } elseif ($ext && is_scalar($data[self::FIELD_COMMENT])) { - $this->setComment(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_COMMENT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_COMMENT])) { + $this->setComment(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_COMMENT]] + $ext)); + } else if (is_array($data[self::FIELD_COMMENT])) { + $this->setComment(new FHIRString(array_merge($ext, $data[self::FIELD_COMMENT]))); + } } else { $this->setComment(new FHIRString($data[self::FIELD_COMMENT])); } @@ -176,8 +179,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IDENTITY] instanceof FHIRId) { $this->setIdentity($data[self::FIELD_IDENTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTITY])) { - $this->setIdentity(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_IDENTITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IDENTITY])) { + $this->setIdentity(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_IDENTITY]] + $ext)); + } else if (is_array($data[self::FIELD_IDENTITY])) { + $this->setIdentity(new FHIRId(array_merge($ext, $data[self::FIELD_IDENTITY]))); + } } else { $this->setIdentity(new FHIRId($data[self::FIELD_IDENTITY])); } @@ -188,8 +195,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_LANGUAGE] instanceof FHIRCode) { $this->setLanguage($data[self::FIELD_LANGUAGE]); - } elseif ($ext && is_scalar($data[self::FIELD_LANGUAGE])) { - $this->setLanguage(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_LANGUAGE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_LANGUAGE])) { + $this->setLanguage(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_LANGUAGE]] + $ext)); + } else if (is_array($data[self::FIELD_LANGUAGE])) { + $this->setLanguage(new FHIRCode(array_merge($ext, $data[self::FIELD_LANGUAGE]))); + } } else { $this->setLanguage(new FHIRCode($data[self::FIELD_LANGUAGE])); } @@ -200,8 +211,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MAP] instanceof FHIRString) { $this->setMap($data[self::FIELD_MAP]); - } elseif ($ext && is_scalar($data[self::FIELD_MAP])) { - $this->setMap(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_MAP]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MAP])) { + $this->setMap(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_MAP]] + $ext)); + } else if (is_array($data[self::FIELD_MAP])) { + $this->setMap(new FHIRString(array_merge($ext, $data[self::FIELD_MAP]))); + } } else { $this->setMap(new FHIRString($data[self::FIELD_MAP])); } @@ -491,6 +506,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getComment())) { $v->xmlSerialize($sxe->addChild(self::FIELD_COMMENT, null, $v->_getFHIRXMLNamespace())); } @@ -513,20 +529,48 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getComment())) { - $a[self::FIELD_COMMENT] = $v->getValue(); - $a[self::FIELD_COMMENT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_COMMENT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_COMMENT_EXT] = $enc; + } + } else { + $a[self::FIELD_COMMENT] = $v; + } } if (null !== ($v = $this->getIdentity())) { - $a[self::FIELD_IDENTITY] = $v->getValue(); - $a[self::FIELD_IDENTITY_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_IDENTITY] = $v; + } } if (null !== ($v = $this->getLanguage())) { - $a[self::FIELD_LANGUAGE] = $v->getValue(); - $a[self::FIELD_LANGUAGE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_LANGUAGE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_LANGUAGE_EXT] = $enc; + } + } else { + $a[self::FIELD_LANGUAGE] = $v; + } } if (null !== ($v = $this->getMap())) { - $a[self::FIELD_MAP] = $v->getValue(); - $a[self::FIELD_MAP_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MAP] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MAP_EXT] = $enc; + } + } else { + $a[self::FIELD_MAP] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRElementDefinition/FHIRElementDefinitionSlicing.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRElementDefinition/FHIRElementDefinitionSlicing.php index f6cb4b9a50..7656a7966c 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRElementDefinition/FHIRElementDefinitionSlicing.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRElementDefinition/FHIRElementDefinitionSlicing.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -81,10 +81,6 @@ class FHIRElementDefinitionSlicing extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ELEMENT_DEFINITION_DOT_SLICING; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DESCRIPTION = 'description'; const FIELD_DESCRIPTION_EXT = '_description'; const FIELD_DISCRIMINATOR = 'discriminator'; @@ -143,6 +139,9 @@ class FHIRElementDefinitionSlicing extends FHIRElement */ protected $rules = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRElementDefinitionSlicing Constructor * @param null|array $data @@ -165,8 +164,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -174,6 +177,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_DISCRIMINATOR])) { if (is_array($data[self::FIELD_DISCRIMINATOR])) { foreach($data[self::FIELD_DISCRIMINATOR] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRElementDefinitionDiscriminator) { $this->addDiscriminator($v); } else { @@ -192,8 +198,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ORDERED] instanceof FHIRBoolean) { $this->setOrdered($data[self::FIELD_ORDERED]); - } elseif ($ext && is_scalar($data[self::FIELD_ORDERED])) { - $this->setOrdered(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_ORDERED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ORDERED])) { + $this->setOrdered(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_ORDERED]] + $ext)); + } else if (is_array($data[self::FIELD_ORDERED])) { + $this->setOrdered(new FHIRBoolean(array_merge($ext, $data[self::FIELD_ORDERED]))); + } } else { $this->setOrdered(new FHIRBoolean($data[self::FIELD_ORDERED])); } @@ -204,8 +214,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_RULES] instanceof FHIRSlicingRules) { $this->setRules($data[self::FIELD_RULES]); - } elseif ($ext && is_scalar($data[self::FIELD_RULES])) { - $this->setRules(new FHIRSlicingRules([FHIRSlicingRules::FIELD_VALUE => $data[self::FIELD_RULES]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_RULES])) { + $this->setRules(new FHIRSlicingRules([FHIRSlicingRules::FIELD_VALUE => $data[self::FIELD_RULES]] + $ext)); + } else if (is_array($data[self::FIELD_RULES])) { + $this->setRules(new FHIRSlicingRules(array_merge($ext, $data[self::FIELD_RULES]))); + } } else { $this->setRules(new FHIRSlicingRules($data[self::FIELD_RULES])); } @@ -509,10 +523,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getDescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESCRIPTION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getDiscriminator())) { foreach($vs as $v) { if (null === $v) { @@ -524,7 +538,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getOrdered())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ORDERED, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRules())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RULES, null, $v->_getFHIRXMLNamespace())); } @@ -538,18 +551,40 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if ([] !== ($vs = $this->getDiscriminator())) { $a[self::FIELD_DISCRIMINATOR] = $vs; } if (null !== ($v = $this->getOrdered())) { - $a[self::FIELD_ORDERED] = $v->getValue(); - $a[self::FIELD_ORDERED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ORDERED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ORDERED_EXT] = $enc; + } + } else { + $a[self::FIELD_ORDERED] = $v; + } } if (null !== ($v = $this->getRules())) { - $a[self::FIELD_RULES] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_RULES] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_RULES_EXT] = $enc; + } + } else { + $a[self::FIELD_RULES] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRElementDefinition/FHIRElementDefinitionType.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRElementDefinition/FHIRElementDefinitionType.php index dcfa0fbc03..e8692555fd 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRElementDefinition/FHIRElementDefinitionType.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRElementDefinition/FHIRElementDefinitionType.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -81,10 +81,6 @@ class FHIRElementDefinitionType extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ELEMENT_DEFINITION_DOT_TYPE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_AGGREGATION = 'aggregation'; const FIELD_AGGREGATION_EXT = '_aggregation'; const FIELD_CODE = 'code'; @@ -166,6 +162,9 @@ class FHIRElementDefinitionType extends FHIRElement */ protected $versioning = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRElementDefinitionType Constructor * @param null|array $data @@ -188,17 +187,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_AGGREGATION])) { foreach($data[self::FIELD_AGGREGATION] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRAggregationMode) { $this->addAggregation($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addAggregation(new FHIRAggregationMode([FHIRAggregationMode::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addAggregation(new FHIRAggregationMode([FHIRAggregationMode::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addAggregation(new FHIRAggregationMode(array_merge($v, $ext[$i]))); + } } else { $this->addAggregation(new FHIRAggregationMode($v)); } } } elseif ($data[self::FIELD_AGGREGATION] instanceof FHIRAggregationMode) { $this->addAggregation($data[self::FIELD_AGGREGATION]); - } elseif ($ext && is_scalar($data[self::FIELD_AGGREGATION])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_AGGREGATION])) { $this->addAggregation(new FHIRAggregationMode([FHIRAggregationMode::FIELD_VALUE => $data[self::FIELD_AGGREGATION]] + $ext)); } else { $this->addAggregation(new FHIRAggregationMode($data[self::FIELD_AGGREGATION])); @@ -210,8 +216,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CODE] instanceof FHIRUri) { $this->setCode($data[self::FIELD_CODE]); - } elseif ($ext && is_scalar($data[self::FIELD_CODE])) { - $this->setCode(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_CODE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CODE])) { + $this->setCode(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_CODE]] + $ext)); + } else if (is_array($data[self::FIELD_CODE])) { + $this->setCode(new FHIRUri(array_merge($ext, $data[self::FIELD_CODE]))); + } } else { $this->setCode(new FHIRUri($data[self::FIELD_CODE])); } @@ -222,8 +232,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PROFILE] instanceof FHIRUri) { $this->setProfile($data[self::FIELD_PROFILE]); - } elseif ($ext && is_scalar($data[self::FIELD_PROFILE])) { - $this->setProfile(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_PROFILE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PROFILE])) { + $this->setProfile(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_PROFILE]] + $ext)); + } else if (is_array($data[self::FIELD_PROFILE])) { + $this->setProfile(new FHIRUri(array_merge($ext, $data[self::FIELD_PROFILE]))); + } } else { $this->setProfile(new FHIRUri($data[self::FIELD_PROFILE])); } @@ -234,8 +248,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TARGET_PROFILE] instanceof FHIRUri) { $this->setTargetProfile($data[self::FIELD_TARGET_PROFILE]); - } elseif ($ext && is_scalar($data[self::FIELD_TARGET_PROFILE])) { - $this->setTargetProfile(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_TARGET_PROFILE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TARGET_PROFILE])) { + $this->setTargetProfile(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_TARGET_PROFILE]] + $ext)); + } else if (is_array($data[self::FIELD_TARGET_PROFILE])) { + $this->setTargetProfile(new FHIRUri(array_merge($ext, $data[self::FIELD_TARGET_PROFILE]))); + } } else { $this->setTargetProfile(new FHIRUri($data[self::FIELD_TARGET_PROFILE])); } @@ -246,8 +264,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VERSIONING] instanceof FHIRReferenceVersionRules) { $this->setVersioning($data[self::FIELD_VERSIONING]); - } elseif ($ext && is_scalar($data[self::FIELD_VERSIONING])) { - $this->setVersioning(new FHIRReferenceVersionRules([FHIRReferenceVersionRules::FIELD_VALUE => $data[self::FIELD_VERSIONING]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VERSIONING])) { + $this->setVersioning(new FHIRReferenceVersionRules([FHIRReferenceVersionRules::FIELD_VALUE => $data[self::FIELD_VERSIONING]] + $ext)); + } else if (is_array($data[self::FIELD_VERSIONING])) { + $this->setVersioning(new FHIRReferenceVersionRules(array_merge($ext, $data[self::FIELD_VERSIONING]))); + } } else { $this->setVersioning(new FHIRReferenceVersionRules($data[self::FIELD_VERSIONING])); } @@ -628,7 +650,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getTargetProfile())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TARGET_PROFILE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getVersioning())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VERSIONING, null, $v->_getFHIRXMLNamespace())); } @@ -642,22 +663,67 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if ([] !== ($vs = $this->getAggregation())) { - $a[self::FIELD_AGGREGATION] = $vs; + $a[self::FIELD_AGGREGATION] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_AGGREGATION][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_AGGREGATION_EXT][] = $enc; + } else { + $a[self::FIELD_AGGREGATION_EXT][] = null; + } + } else { + $a[self::FIELD_AGGREGATION][] = $v; + } + } } if (null !== ($v = $this->getCode())) { - $a[self::FIELD_CODE] = $v->getValue(); - $a[self::FIELD_CODE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CODE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CODE_EXT] = $enc; + } + } else { + $a[self::FIELD_CODE] = $v; + } } if (null !== ($v = $this->getProfile())) { - $a[self::FIELD_PROFILE] = $v->getValue(); - $a[self::FIELD_PROFILE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PROFILE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PROFILE_EXT] = $enc; + } + } else { + $a[self::FIELD_PROFILE] = $v; + } } if (null !== ($v = $this->getTargetProfile())) { - $a[self::FIELD_TARGET_PROFILE] = $v->getValue(); - $a[self::FIELD_TARGET_PROFILE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TARGET_PROFILE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TARGET_PROFILE_EXT] = $enc; + } + } else { + $a[self::FIELD_TARGET_PROFILE] = $v; + } } if (null !== ($v = $this->getVersioning())) { - $a[self::FIELD_VERSIONING] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VERSIONING] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VERSIONING_EXT] = $enc; + } + } else { + $a[self::FIELD_VERSIONING] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIREncounterLocationStatus.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIREncounterLocationStatus.php index f452db2745..426953b405 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIREncounterLocationStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIREncounterLocationStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIREncounterLocationStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ENCOUNTER_LOCATION_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIREncounterLocationStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIREncounterLocationStatus Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIREncounterStatus.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIREncounterStatus.php index 6cf5c119b6..9139bd0bb8 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIREncounterStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIREncounterStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIREncounterStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ENCOUNTER_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIREncounterStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIREncounterStatus Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIREndpointStatus.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIREndpointStatus.php index 8724997f2e..57d57fc88f 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIREndpointStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIREndpointStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIREndpointStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ENDPOINT_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIREndpointStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIREndpointStatus Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIREpisodeOfCareStatus.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIREpisodeOfCareStatus.php index 2dfc73d624..5704fcb7bd 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIREpisodeOfCareStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIREpisodeOfCareStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIREpisodeOfCareStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_EPISODE_OF_CARE_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIREpisodeOfCareStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIREpisodeOfCareStatus Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIREventCapabilityMode.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIREventCapabilityMode.php index eb4c56692b..6596817159 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIREventCapabilityMode.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIREventCapabilityMode.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIREventCapabilityMode extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_EVENT_CAPABILITY_MODE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIREventCapabilityMode extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIREventCapabilityMode Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIREventStatus.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIREventStatus.php index e1e1764089..93664a1b38 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIREventStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIREventStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIREventStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_EVENT_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIREventStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIREventStatus Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIREventTiming.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIREventTiming.php index 0dd018d8d8..f82c52d6bd 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIREventTiming.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIREventTiming.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIREventTiming extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_EVENT_TIMING; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIREventTiming extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIREventTiming Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRExplanationOfBenefitStatus.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRExplanationOfBenefitStatus.php index d4833a0165..608809fe26 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRExplanationOfBenefitStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRExplanationOfBenefitStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRExplanationOfBenefitStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_EXPLANATION_OF_BENEFIT_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRExplanationOfBenefitStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRExplanationOfBenefitStatus Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRExtension.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRExtension.php index 56fd623fc8..e8b752143f 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRExtension.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRExtension.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -84,13 +84,10 @@ class FHIRExtension extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_EXTENSION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_URL = 'url'; const FIELD_VALUE_ADDRESS = 'valueAddress'; const FIELD_VALUE_AGE = 'valueAge'; + const FIELD_VALUE_AGE_EXT = '_valueAge'; const FIELD_VALUE_ANNOTATION = 'valueAnnotation'; const FIELD_VALUE_ATTACHMENT = 'valueAttachment'; const FIELD_VALUE_BASE_64BINARY = 'valueBase64Binary'; @@ -104,6 +101,7 @@ class FHIRExtension extends FHIRElement const FIELD_VALUE_CONTACT_POINT = 'valueContactPoint'; const FIELD_VALUE_CONTACT_POINT_EXT = '_valueContactPoint'; const FIELD_VALUE_COUNT = 'valueCount'; + const FIELD_VALUE_COUNT_EXT = '_valueCount'; const FIELD_VALUE_DATE = 'valueDate'; const FIELD_VALUE_DATE_EXT = '_valueDate'; const FIELD_VALUE_DATE_TIME = 'valueDateTime'; @@ -111,7 +109,9 @@ class FHIRExtension extends FHIRElement const FIELD_VALUE_DECIMAL = 'valueDecimal'; const FIELD_VALUE_DECIMAL_EXT = '_valueDecimal'; const FIELD_VALUE_DISTANCE = 'valueDistance'; + const FIELD_VALUE_DISTANCE_EXT = '_valueDistance'; const FIELD_VALUE_DURATION = 'valueDuration'; + const FIELD_VALUE_DURATION_EXT = '_valueDuration'; const FIELD_VALUE_HUMAN_NAME = 'valueHumanName'; const FIELD_VALUE_ID = 'valueId'; const FIELD_VALUE_ID_EXT = '_valueId'; @@ -125,6 +125,7 @@ class FHIRExtension extends FHIRElement const FIELD_VALUE_MARKDOWN_EXT = '_valueMarkdown'; const FIELD_VALUE_META = 'valueMeta'; const FIELD_VALUE_MONEY = 'valueMoney'; + const FIELD_VALUE_MONEY_EXT = '_valueMoney'; const FIELD_VALUE_OID = 'valueOid'; const FIELD_VALUE_OID_EXT = '_valueOid'; const FIELD_VALUE_PERIOD = 'valuePeriod'; @@ -646,6 +647,9 @@ class FHIRExtension extends FHIRElement */ protected $valueUri = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRExtension Constructor * @param null|array $data @@ -673,8 +677,17 @@ public function __construct($data = null) } } if (isset($data[self::FIELD_VALUE_AGE])) { + $ext = (isset($data[self::FIELD_VALUE_AGE_EXT]) && is_array($data[self::FIELD_VALUE_AGE_EXT])) + ? $data[self::FIELD_VALUE_AGE_EXT] + : null; if ($data[self::FIELD_VALUE_AGE] instanceof FHIRAge) { $this->setValueAge($data[self::FIELD_VALUE_AGE]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_AGE])) { + $this->setValueAge(new FHIRAge([FHIRAge::FIELD_VALUE => $data[self::FIELD_VALUE_AGE]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_AGE])) { + $this->setValueAge(new FHIRAge(array_merge($ext, $data[self::FIELD_VALUE_AGE]))); + } } else { $this->setValueAge(new FHIRAge($data[self::FIELD_VALUE_AGE])); } @@ -699,8 +712,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_BASE_64BINARY] instanceof FHIRBase64Binary) { $this->setValueBase64Binary($data[self::FIELD_VALUE_BASE_64BINARY]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_BASE_64BINARY])) { - $this->setValueBase64Binary(new FHIRBase64Binary([FHIRBase64Binary::FIELD_VALUE => $data[self::FIELD_VALUE_BASE_64BINARY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_BASE_64BINARY])) { + $this->setValueBase64Binary(new FHIRBase64Binary([FHIRBase64Binary::FIELD_VALUE => $data[self::FIELD_VALUE_BASE_64BINARY]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_BASE_64BINARY])) { + $this->setValueBase64Binary(new FHIRBase64Binary(array_merge($ext, $data[self::FIELD_VALUE_BASE_64BINARY]))); + } } else { $this->setValueBase64Binary(new FHIRBase64Binary($data[self::FIELD_VALUE_BASE_64BINARY])); } @@ -711,8 +728,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_BOOLEAN] instanceof FHIRBoolean) { $this->setValueBoolean($data[self::FIELD_VALUE_BOOLEAN]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_BOOLEAN])) { - $this->setValueBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_VALUE_BOOLEAN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_BOOLEAN])) { + $this->setValueBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_VALUE_BOOLEAN]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_BOOLEAN])) { + $this->setValueBoolean(new FHIRBoolean(array_merge($ext, $data[self::FIELD_VALUE_BOOLEAN]))); + } } else { $this->setValueBoolean(new FHIRBoolean($data[self::FIELD_VALUE_BOOLEAN])); } @@ -723,8 +744,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_CODE] instanceof FHIRCode) { $this->setValueCode($data[self::FIELD_VALUE_CODE]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_CODE])) { - $this->setValueCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_VALUE_CODE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_CODE])) { + $this->setValueCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_VALUE_CODE]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_CODE])) { + $this->setValueCode(new FHIRCode(array_merge($ext, $data[self::FIELD_VALUE_CODE]))); + } } else { $this->setValueCode(new FHIRCode($data[self::FIELD_VALUE_CODE])); } @@ -749,15 +774,28 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_CONTACT_POINT] instanceof FHIRContactPoint) { $this->setValueContactPoint($data[self::FIELD_VALUE_CONTACT_POINT]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_CONTACT_POINT])) { - $this->setValueContactPoint(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $data[self::FIELD_VALUE_CONTACT_POINT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_CONTACT_POINT])) { + $this->setValueContactPoint(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $data[self::FIELD_VALUE_CONTACT_POINT]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_CONTACT_POINT])) { + $this->setValueContactPoint(new FHIRContactPoint(array_merge($ext, $data[self::FIELD_VALUE_CONTACT_POINT]))); + } } else { $this->setValueContactPoint(new FHIRContactPoint($data[self::FIELD_VALUE_CONTACT_POINT])); } } if (isset($data[self::FIELD_VALUE_COUNT])) { + $ext = (isset($data[self::FIELD_VALUE_COUNT_EXT]) && is_array($data[self::FIELD_VALUE_COUNT_EXT])) + ? $data[self::FIELD_VALUE_COUNT_EXT] + : null; if ($data[self::FIELD_VALUE_COUNT] instanceof FHIRCount) { $this->setValueCount($data[self::FIELD_VALUE_COUNT]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_COUNT])) { + $this->setValueCount(new FHIRCount([FHIRCount::FIELD_VALUE => $data[self::FIELD_VALUE_COUNT]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_COUNT])) { + $this->setValueCount(new FHIRCount(array_merge($ext, $data[self::FIELD_VALUE_COUNT]))); + } } else { $this->setValueCount(new FHIRCount($data[self::FIELD_VALUE_COUNT])); } @@ -768,8 +806,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_DATE] instanceof FHIRDate) { $this->setValueDate($data[self::FIELD_VALUE_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_DATE])) { - $this->setValueDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_VALUE_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_DATE])) { + $this->setValueDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_VALUE_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_DATE])) { + $this->setValueDate(new FHIRDate(array_merge($ext, $data[self::FIELD_VALUE_DATE]))); + } } else { $this->setValueDate(new FHIRDate($data[self::FIELD_VALUE_DATE])); } @@ -780,8 +822,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_DATE_TIME] instanceof FHIRDateTime) { $this->setValueDateTime($data[self::FIELD_VALUE_DATE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_DATE_TIME])) { - $this->setValueDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_VALUE_DATE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_DATE_TIME])) { + $this->setValueDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_VALUE_DATE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_DATE_TIME])) { + $this->setValueDateTime(new FHIRDateTime(array_merge($ext, $data[self::FIELD_VALUE_DATE_TIME]))); + } } else { $this->setValueDateTime(new FHIRDateTime($data[self::FIELD_VALUE_DATE_TIME])); } @@ -792,22 +838,44 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_DECIMAL] instanceof FHIRDecimal) { $this->setValueDecimal($data[self::FIELD_VALUE_DECIMAL]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_DECIMAL])) { - $this->setValueDecimal(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_VALUE_DECIMAL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_DECIMAL])) { + $this->setValueDecimal(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_VALUE_DECIMAL]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_DECIMAL])) { + $this->setValueDecimal(new FHIRDecimal(array_merge($ext, $data[self::FIELD_VALUE_DECIMAL]))); + } } else { $this->setValueDecimal(new FHIRDecimal($data[self::FIELD_VALUE_DECIMAL])); } } if (isset($data[self::FIELD_VALUE_DISTANCE])) { + $ext = (isset($data[self::FIELD_VALUE_DISTANCE_EXT]) && is_array($data[self::FIELD_VALUE_DISTANCE_EXT])) + ? $data[self::FIELD_VALUE_DISTANCE_EXT] + : null; if ($data[self::FIELD_VALUE_DISTANCE] instanceof FHIRDistance) { $this->setValueDistance($data[self::FIELD_VALUE_DISTANCE]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_DISTANCE])) { + $this->setValueDistance(new FHIRDistance([FHIRDistance::FIELD_VALUE => $data[self::FIELD_VALUE_DISTANCE]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_DISTANCE])) { + $this->setValueDistance(new FHIRDistance(array_merge($ext, $data[self::FIELD_VALUE_DISTANCE]))); + } } else { $this->setValueDistance(new FHIRDistance($data[self::FIELD_VALUE_DISTANCE])); } } if (isset($data[self::FIELD_VALUE_DURATION])) { + $ext = (isset($data[self::FIELD_VALUE_DURATION_EXT]) && is_array($data[self::FIELD_VALUE_DURATION_EXT])) + ? $data[self::FIELD_VALUE_DURATION_EXT] + : null; if ($data[self::FIELD_VALUE_DURATION] instanceof FHIRDuration) { $this->setValueDuration($data[self::FIELD_VALUE_DURATION]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_DURATION])) { + $this->setValueDuration(new FHIRDuration([FHIRDuration::FIELD_VALUE => $data[self::FIELD_VALUE_DURATION]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_DURATION])) { + $this->setValueDuration(new FHIRDuration(array_merge($ext, $data[self::FIELD_VALUE_DURATION]))); + } } else { $this->setValueDuration(new FHIRDuration($data[self::FIELD_VALUE_DURATION])); } @@ -825,8 +893,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_ID] instanceof FHIRId) { $this->setValueId($data[self::FIELD_VALUE_ID]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_ID])) { - $this->setValueId(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_VALUE_ID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_ID])) { + $this->setValueId(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_VALUE_ID]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_ID])) { + $this->setValueId(new FHIRId(array_merge($ext, $data[self::FIELD_VALUE_ID]))); + } } else { $this->setValueId(new FHIRId($data[self::FIELD_VALUE_ID])); } @@ -837,8 +909,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_IDENTIFIER] instanceof FHIRIdentifier) { $this->setValueIdentifier($data[self::FIELD_VALUE_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_IDENTIFIER])) { - $this->setValueIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_VALUE_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_IDENTIFIER])) { + $this->setValueIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_VALUE_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_IDENTIFIER])) { + $this->setValueIdentifier(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_VALUE_IDENTIFIER]))); + } } else { $this->setValueIdentifier(new FHIRIdentifier($data[self::FIELD_VALUE_IDENTIFIER])); } @@ -849,8 +925,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_INSTANT] instanceof FHIRInstant) { $this->setValueInstant($data[self::FIELD_VALUE_INSTANT]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_INSTANT])) { - $this->setValueInstant(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_VALUE_INSTANT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_INSTANT])) { + $this->setValueInstant(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_VALUE_INSTANT]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_INSTANT])) { + $this->setValueInstant(new FHIRInstant(array_merge($ext, $data[self::FIELD_VALUE_INSTANT]))); + } } else { $this->setValueInstant(new FHIRInstant($data[self::FIELD_VALUE_INSTANT])); } @@ -861,8 +941,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_INTEGER] instanceof FHIRInteger) { $this->setValueInteger($data[self::FIELD_VALUE_INTEGER]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_INTEGER])) { - $this->setValueInteger(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_VALUE_INTEGER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_INTEGER])) { + $this->setValueInteger(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_VALUE_INTEGER]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_INTEGER])) { + $this->setValueInteger(new FHIRInteger(array_merge($ext, $data[self::FIELD_VALUE_INTEGER]))); + } } else { $this->setValueInteger(new FHIRInteger($data[self::FIELD_VALUE_INTEGER])); } @@ -873,8 +957,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_MARKDOWN] instanceof FHIRMarkdown) { $this->setValueMarkdown($data[self::FIELD_VALUE_MARKDOWN]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_MARKDOWN])) { - $this->setValueMarkdown(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_VALUE_MARKDOWN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_MARKDOWN])) { + $this->setValueMarkdown(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_VALUE_MARKDOWN]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_MARKDOWN])) { + $this->setValueMarkdown(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_VALUE_MARKDOWN]))); + } } else { $this->setValueMarkdown(new FHIRMarkdown($data[self::FIELD_VALUE_MARKDOWN])); } @@ -887,8 +975,17 @@ public function __construct($data = null) } } if (isset($data[self::FIELD_VALUE_MONEY])) { + $ext = (isset($data[self::FIELD_VALUE_MONEY_EXT]) && is_array($data[self::FIELD_VALUE_MONEY_EXT])) + ? $data[self::FIELD_VALUE_MONEY_EXT] + : null; if ($data[self::FIELD_VALUE_MONEY] instanceof FHIRMoney) { $this->setValueMoney($data[self::FIELD_VALUE_MONEY]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_MONEY])) { + $this->setValueMoney(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_VALUE_MONEY]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_MONEY])) { + $this->setValueMoney(new FHIRMoney(array_merge($ext, $data[self::FIELD_VALUE_MONEY]))); + } } else { $this->setValueMoney(new FHIRMoney($data[self::FIELD_VALUE_MONEY])); } @@ -899,8 +996,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_OID] instanceof FHIROid) { $this->setValueOid($data[self::FIELD_VALUE_OID]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_OID])) { - $this->setValueOid(new FHIROid([FHIROid::FIELD_VALUE => $data[self::FIELD_VALUE_OID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_OID])) { + $this->setValueOid(new FHIROid([FHIROid::FIELD_VALUE => $data[self::FIELD_VALUE_OID]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_OID])) { + $this->setValueOid(new FHIROid(array_merge($ext, $data[self::FIELD_VALUE_OID]))); + } } else { $this->setValueOid(new FHIROid($data[self::FIELD_VALUE_OID])); } @@ -918,8 +1019,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_POSITIVE_INT] instanceof FHIRPositiveInt) { $this->setValuePositiveInt($data[self::FIELD_VALUE_POSITIVE_INT]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_POSITIVE_INT])) { - $this->setValuePositiveInt(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_VALUE_POSITIVE_INT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_POSITIVE_INT])) { + $this->setValuePositiveInt(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_VALUE_POSITIVE_INT]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_POSITIVE_INT])) { + $this->setValuePositiveInt(new FHIRPositiveInt(array_merge($ext, $data[self::FIELD_VALUE_POSITIVE_INT]))); + } } else { $this->setValuePositiveInt(new FHIRPositiveInt($data[self::FIELD_VALUE_POSITIVE_INT])); } @@ -930,8 +1035,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_QUANTITY] instanceof FHIRQuantity) { $this->setValueQuantity($data[self::FIELD_VALUE_QUANTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_QUANTITY])) { - $this->setValueQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_VALUE_QUANTITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_QUANTITY])) { + $this->setValueQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_VALUE_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_QUANTITY])) { + $this->setValueQuantity(new FHIRQuantity(array_merge($ext, $data[self::FIELD_VALUE_QUANTITY]))); + } } else { $this->setValueQuantity(new FHIRQuantity($data[self::FIELD_VALUE_QUANTITY])); } @@ -977,8 +1086,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_STRING] instanceof FHIRString) { $this->setValueString($data[self::FIELD_VALUE_STRING]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_STRING])) { - $this->setValueString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VALUE_STRING]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_STRING])) { + $this->setValueString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VALUE_STRING]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_STRING])) { + $this->setValueString(new FHIRString(array_merge($ext, $data[self::FIELD_VALUE_STRING]))); + } } else { $this->setValueString(new FHIRString($data[self::FIELD_VALUE_STRING])); } @@ -989,8 +1102,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_TIME] instanceof FHIRTime) { $this->setValueTime($data[self::FIELD_VALUE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_TIME])) { - $this->setValueTime(new FHIRTime([FHIRTime::FIELD_VALUE => $data[self::FIELD_VALUE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_TIME])) { + $this->setValueTime(new FHIRTime([FHIRTime::FIELD_VALUE => $data[self::FIELD_VALUE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_TIME])) { + $this->setValueTime(new FHIRTime(array_merge($ext, $data[self::FIELD_VALUE_TIME]))); + } } else { $this->setValueTime(new FHIRTime($data[self::FIELD_VALUE_TIME])); } @@ -1008,8 +1125,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_UNSIGNED_INT] instanceof FHIRUnsignedInt) { $this->setValueUnsignedInt($data[self::FIELD_VALUE_UNSIGNED_INT]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_UNSIGNED_INT])) { - $this->setValueUnsignedInt(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_VALUE_UNSIGNED_INT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_UNSIGNED_INT])) { + $this->setValueUnsignedInt(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_VALUE_UNSIGNED_INT]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_UNSIGNED_INT])) { + $this->setValueUnsignedInt(new FHIRUnsignedInt(array_merge($ext, $data[self::FIELD_VALUE_UNSIGNED_INT]))); + } } else { $this->setValueUnsignedInt(new FHIRUnsignedInt($data[self::FIELD_VALUE_UNSIGNED_INT])); } @@ -1020,8 +1141,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_URI] instanceof FHIRUri) { $this->setValueUri($data[self::FIELD_VALUE_URI]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_URI])) { - $this->setValueUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_VALUE_URI]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_URI])) { + $this->setValueUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_VALUE_URI]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_URI])) { + $this->setValueUri(new FHIRUri(array_merge($ext, $data[self::FIELD_VALUE_URI]))); + } } else { $this->setValueUri(new FHIRUri($data[self::FIELD_VALUE_URI])); } @@ -2744,19 +2869,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getUrl())) { $sxe->addAttribute(self::FIELD_URL, (string)$v); } - if (null !== ($v = $this->getValueAddress())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_ADDRESS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueAge())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_AGE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueAnnotation())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_ANNOTATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueAttachment())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_ATTACHMENT, null, $v->_getFHIRXMLNamespace())); } @@ -2769,19 +2890,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getValueCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_CODE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueCoding())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_CODING, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueContactPoint())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_CONTACT_POINT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueCount())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_COUNT, null, $v->_getFHIRXMLNamespace())); } @@ -2794,22 +2911,18 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getValueDecimal())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_DECIMAL, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueDistance())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_DISTANCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueDuration())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_DURATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueHumanName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_HUMAN_NAME, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getValueId())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_ID, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } @@ -2822,45 +2935,36 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getValueMarkdown())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_MARKDOWN, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueMeta())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_META, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueMoney())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_MONEY, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getValueOid())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_OID, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValuePeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_PERIOD, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getValuePositiveInt())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_POSITIVE_INT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_QUANTITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueRange())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_RANGE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueRatio())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_RATIO, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_REFERENCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueSampledData())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_SAMPLED_DATA, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueSignature())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_SIGNATURE, null, $v->_getFHIRXMLNamespace())); } @@ -2870,7 +2974,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getValueTime())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_TIME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueTiming())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_TIMING, null, $v->_getFHIRXMLNamespace())); } @@ -2896,7 +2999,15 @@ public function jsonSerialize() $a[self::FIELD_VALUE_ADDRESS] = $v; } if (null !== ($v = $this->getValueAge())) { - $a[self::FIELD_VALUE_AGE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_AGE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_AGE_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_AGE] = $v; + } } if (null !== ($v = $this->getValueAnnotation())) { $a[self::FIELD_VALUE_ANNOTATION] = $v; @@ -2905,16 +3016,37 @@ public function jsonSerialize() $a[self::FIELD_VALUE_ATTACHMENT] = $v; } if (null !== ($v = $this->getValueBase64Binary())) { - $a[self::FIELD_VALUE_BASE_64BINARY] = $v->getValue(); - $a[self::FIELD_VALUE_BASE_64BINARY_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_BASE_64BINARY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_BASE_64BINARY_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_BASE_64BINARY] = $v; + } } if (null !== ($v = $this->getValueBoolean())) { - $a[self::FIELD_VALUE_BOOLEAN] = $v->getValue(); - $a[self::FIELD_VALUE_BOOLEAN_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_BOOLEAN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_BOOLEAN_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_BOOLEAN] = $v; + } } if (null !== ($v = $this->getValueCode())) { - $a[self::FIELD_VALUE_CODE] = $v->getValue(); - $a[self::FIELD_VALUE_CODE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_CODE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_CODE_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_CODE] = $v; + } } if (null !== ($v = $this->getValueCodeableConcept())) { $a[self::FIELD_VALUE_CODEABLE_CONCEPT] = $v; @@ -2923,70 +3055,189 @@ public function jsonSerialize() $a[self::FIELD_VALUE_CODING] = $v; } if (null !== ($v = $this->getValueContactPoint())) { - $a[self::FIELD_VALUE_CONTACT_POINT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_CONTACT_POINT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_CONTACT_POINT_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_CONTACT_POINT] = $v; + } } if (null !== ($v = $this->getValueCount())) { - $a[self::FIELD_VALUE_COUNT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_COUNT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_COUNT_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_COUNT] = $v; + } } if (null !== ($v = $this->getValueDate())) { - $a[self::FIELD_VALUE_DATE] = $v->getValue(); - $a[self::FIELD_VALUE_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_DATE] = $v; + } } if (null !== ($v = $this->getValueDateTime())) { - $a[self::FIELD_VALUE_DATE_TIME] = $v->getValue(); - $a[self::FIELD_VALUE_DATE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_DATE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_DATE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_DATE_TIME] = $v; + } } if (null !== ($v = $this->getValueDecimal())) { - $a[self::FIELD_VALUE_DECIMAL] = $v->getValue(); - $a[self::FIELD_VALUE_DECIMAL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_DECIMAL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_DECIMAL_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_DECIMAL] = $v; + } } if (null !== ($v = $this->getValueDistance())) { - $a[self::FIELD_VALUE_DISTANCE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_DISTANCE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_DISTANCE_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_DISTANCE] = $v; + } } if (null !== ($v = $this->getValueDuration())) { - $a[self::FIELD_VALUE_DURATION] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_DURATION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_DURATION_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_DURATION] = $v; + } } if (null !== ($v = $this->getValueHumanName())) { $a[self::FIELD_VALUE_HUMAN_NAME] = $v; } if (null !== ($v = $this->getValueId())) { - $a[self::FIELD_VALUE_ID] = $v->getValue(); - $a[self::FIELD_VALUE_ID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_ID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_ID_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_ID] = $v; + } } if (null !== ($v = $this->getValueIdentifier())) { - $a[self::FIELD_VALUE_IDENTIFIER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_IDENTIFIER] = $v; + } } if (null !== ($v = $this->getValueInstant())) { - $a[self::FIELD_VALUE_INSTANT] = $v->getValue(); - $a[self::FIELD_VALUE_INSTANT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_INSTANT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_INSTANT_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_INSTANT] = $v; + } } if (null !== ($v = $this->getValueInteger())) { - $a[self::FIELD_VALUE_INTEGER] = $v->getValue(); - $a[self::FIELD_VALUE_INTEGER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_INTEGER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_INTEGER_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_INTEGER] = $v; + } } if (null !== ($v = $this->getValueMarkdown())) { - $a[self::FIELD_VALUE_MARKDOWN] = $v->getValue(); - $a[self::FIELD_VALUE_MARKDOWN_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_MARKDOWN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_MARKDOWN_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_MARKDOWN] = $v; + } } if (null !== ($v = $this->getValueMeta())) { $a[self::FIELD_VALUE_META] = $v; } if (null !== ($v = $this->getValueMoney())) { - $a[self::FIELD_VALUE_MONEY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_MONEY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_MONEY_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_MONEY] = $v; + } } if (null !== ($v = $this->getValueOid())) { - $a[self::FIELD_VALUE_OID] = $v->getValue(); - $a[self::FIELD_VALUE_OID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_OID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_OID_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_OID] = $v; + } } if (null !== ($v = $this->getValuePeriod())) { $a[self::FIELD_VALUE_PERIOD] = $v; } if (null !== ($v = $this->getValuePositiveInt())) { - $a[self::FIELD_VALUE_POSITIVE_INT] = $v->getValue(); - $a[self::FIELD_VALUE_POSITIVE_INT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_POSITIVE_INT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_POSITIVE_INT_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_POSITIVE_INT] = $v; + } } if (null !== ($v = $this->getValueQuantity())) { - $a[self::FIELD_VALUE_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_QUANTITY] = $v; + } } if (null !== ($v = $this->getValueRange())) { $a[self::FIELD_VALUE_RANGE] = $v; @@ -3004,23 +3255,51 @@ public function jsonSerialize() $a[self::FIELD_VALUE_SIGNATURE] = $v; } if (null !== ($v = $this->getValueString())) { - $a[self::FIELD_VALUE_STRING] = $v->getValue(); - $a[self::FIELD_VALUE_STRING_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_STRING] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_STRING_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_STRING] = $v; + } } if (null !== ($v = $this->getValueTime())) { - $a[self::FIELD_VALUE_TIME] = $v->getValue(); - $a[self::FIELD_VALUE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_TIME] = $v; + } } if (null !== ($v = $this->getValueTiming())) { $a[self::FIELD_VALUE_TIMING] = $v; } if (null !== ($v = $this->getValueUnsignedInt())) { - $a[self::FIELD_VALUE_UNSIGNED_INT] = $v->getValue(); - $a[self::FIELD_VALUE_UNSIGNED_INT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_UNSIGNED_INT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_UNSIGNED_INT_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_UNSIGNED_INT] = $v; + } } if (null !== ($v = $this->getValueUri())) { - $a[self::FIELD_VALUE_URI] = $v->getValue(); - $a[self::FIELD_VALUE_URI_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_URI] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_URI_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_URI] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRExtensionContext.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRExtensionContext.php index 478dd3242c..fe9c37fb16 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRExtensionContext.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRExtensionContext.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRExtensionContext extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_EXTENSION_CONTEXT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRExtensionContext extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRExtensionContext Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRFHIRAllTypes.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRFHIRAllTypes.php index a2d890ed3e..d47bdee8ad 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRFHIRAllTypes.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRFHIRAllTypes.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -77,10 +77,6 @@ class FHIRFHIRAllTypes extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_FHIRALL_TYPES; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -88,6 +84,9 @@ class FHIRFHIRAllTypes extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRFHIRAllTypes Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRFHIRDefinedType.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRFHIRDefinedType.php index 2ecae26cee..89a1f74d58 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRFHIRDefinedType.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRFHIRDefinedType.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -77,10 +77,6 @@ class FHIRFHIRDefinedType extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_FHIRDEFINED_TYPE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -88,6 +84,9 @@ class FHIRFHIRDefinedType extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRFHIRDefinedType Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRFHIRDeviceStatus.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRFHIRDeviceStatus.php index 9912b4d205..cafae0b6d5 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRFHIRDeviceStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRFHIRDeviceStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRFHIRDeviceStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_FHIRDEVICE_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRFHIRDeviceStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRFHIRDeviceStatus Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRFHIRSubstanceStatus.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRFHIRSubstanceStatus.php index b0f144c502..925d6db77c 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRFHIRSubstanceStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRFHIRSubstanceStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRFHIRSubstanceStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_FHIRSUBSTANCE_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRFHIRSubstanceStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRFHIRSubstanceStatus Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRFamilyHistoryStatus.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRFamilyHistoryStatus.php index d840968214..521081ff56 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRFamilyHistoryStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRFamilyHistoryStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRFamilyHistoryStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_FAMILY_HISTORY_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRFamilyHistoryStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRFamilyHistoryStatus Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRFilterOperator.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRFilterOperator.php index e0b65a0b16..1a466e0634 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRFilterOperator.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRFilterOperator.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRFilterOperator extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_FILTER_OPERATOR; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRFilterOperator extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRFilterOperator Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRFinancialResourceStatusCodes.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRFinancialResourceStatusCodes.php index d3ddb143c8..4624ee1711 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRFinancialResourceStatusCodes.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRFinancialResourceStatusCodes.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRFinancialResourceStatusCodes extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_FINANCIAL_RESOURCE_STATUS_CODES; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRFinancialResourceStatusCodes extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRFinancialResourceStatusCodes Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRFlagStatus.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRFlagStatus.php index ded8fe2225..787479fac9 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRFlagStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRFlagStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRFlagStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_FLAG_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -90,6 +86,9 @@ class FHIRFlagStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRFlagStatus Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRGoalStatus.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRGoalStatus.php index 5264d1a578..a58e2ecffe 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRGoalStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRGoalStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRGoalStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_GOAL_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRGoalStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRGoalStatus Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRGraphCompartmentRule.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRGraphCompartmentRule.php index 40dccc87c1..f9079d3477 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRGraphCompartmentRule.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRGraphCompartmentRule.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRGraphCompartmentRule extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_GRAPH_COMPARTMENT_RULE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRGraphCompartmentRule extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRGraphCompartmentRule Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRGroupType.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRGroupType.php index cca797f161..b01d7cbd0a 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRGroupType.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRGroupType.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRGroupType extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_GROUP_TYPE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRGroupType extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRGroupType Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRGuidanceResponseStatus.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRGuidanceResponseStatus.php index 130ba456c4..e7702473a7 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRGuidanceResponseStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRGuidanceResponseStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRGuidanceResponseStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_GUIDANCE_RESPONSE_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRGuidanceResponseStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRGuidanceResponseStatus Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRGuideDependencyType.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRGuideDependencyType.php index 4e5f286c1b..88ca09a011 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRGuideDependencyType.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRGuideDependencyType.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRGuideDependencyType extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_GUIDE_DEPENDENCY_TYPE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRGuideDependencyType extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRGuideDependencyType Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRGuidePageKind.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRGuidePageKind.php index 7bc307046a..093b530d23 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRGuidePageKind.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRGuidePageKind.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRGuidePageKind extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_GUIDE_PAGE_KIND; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRGuidePageKind extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRGuidePageKind Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRHTTPVerb.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRHTTPVerb.php index 0d4f15318b..580c70bdb2 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRHTTPVerb.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRHTTPVerb.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRHTTPVerb extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_HTTPVERB; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRHTTPVerb extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRHTTPVerb Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRHumanName.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRHumanName.php index 00313eb01a..c013c0c6aa 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRHumanName.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRHumanName.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRHumanName extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_HUMAN_NAME; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_FAMILY = 'family'; const FIELD_FAMILY_EXT = '_family'; const FIELD_GIVEN = 'given'; @@ -175,6 +171,9 @@ class FHIRHumanName extends FHIRElement */ protected $use = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRHumanName Constructor * @param null|array $data @@ -197,8 +196,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_FAMILY] instanceof FHIRString) { $this->setFamily($data[self::FIELD_FAMILY]); - } elseif ($ext && is_scalar($data[self::FIELD_FAMILY])) { - $this->setFamily(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_FAMILY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_FAMILY])) { + $this->setFamily(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_FAMILY]] + $ext)); + } else if (is_array($data[self::FIELD_FAMILY])) { + $this->setFamily(new FHIRString(array_merge($ext, $data[self::FIELD_FAMILY]))); + } } else { $this->setFamily(new FHIRString($data[self::FIELD_FAMILY])); } @@ -209,17 +212,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_GIVEN])) { foreach($data[self::FIELD_GIVEN] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRString) { $this->addGiven($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addGiven(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addGiven(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addGiven(new FHIRString(array_merge($v, $ext[$i]))); + } } else { $this->addGiven(new FHIRString($v)); } } } elseif ($data[self::FIELD_GIVEN] instanceof FHIRString) { $this->addGiven($data[self::FIELD_GIVEN]); - } elseif ($ext && is_scalar($data[self::FIELD_GIVEN])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_GIVEN])) { $this->addGiven(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_GIVEN]] + $ext)); } else { $this->addGiven(new FHIRString($data[self::FIELD_GIVEN])); @@ -238,17 +248,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_PREFIX])) { foreach($data[self::FIELD_PREFIX] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRString) { $this->addPrefix($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addPrefix(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addPrefix(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addPrefix(new FHIRString(array_merge($v, $ext[$i]))); + } } else { $this->addPrefix(new FHIRString($v)); } } } elseif ($data[self::FIELD_PREFIX] instanceof FHIRString) { $this->addPrefix($data[self::FIELD_PREFIX]); - } elseif ($ext && is_scalar($data[self::FIELD_PREFIX])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_PREFIX])) { $this->addPrefix(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PREFIX]] + $ext)); } else { $this->addPrefix(new FHIRString($data[self::FIELD_PREFIX])); @@ -260,17 +277,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_SUFFIX])) { foreach($data[self::FIELD_SUFFIX] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRString) { $this->addSuffix($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addSuffix(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addSuffix(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addSuffix(new FHIRString(array_merge($v, $ext[$i]))); + } } else { $this->addSuffix(new FHIRString($v)); } } } elseif ($data[self::FIELD_SUFFIX] instanceof FHIRString) { $this->addSuffix($data[self::FIELD_SUFFIX]); - } elseif ($ext && is_scalar($data[self::FIELD_SUFFIX])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_SUFFIX])) { $this->addSuffix(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SUFFIX]] + $ext)); } else { $this->addSuffix(new FHIRString($data[self::FIELD_SUFFIX])); @@ -282,8 +306,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TEXT] instanceof FHIRString) { $this->setText($data[self::FIELD_TEXT]); - } elseif ($ext && is_scalar($data[self::FIELD_TEXT])) { - $this->setText(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TEXT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TEXT])) { + $this->setText(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TEXT]] + $ext)); + } else if (is_array($data[self::FIELD_TEXT])) { + $this->setText(new FHIRString(array_merge($ext, $data[self::FIELD_TEXT]))); + } } else { $this->setText(new FHIRString($data[self::FIELD_TEXT])); } @@ -294,8 +322,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_USE] instanceof FHIRNameUse) { $this->setUse($data[self::FIELD_USE]); - } elseif ($ext && is_scalar($data[self::FIELD_USE])) { - $this->setUse(new FHIRNameUse([FHIRNameUse::FIELD_VALUE => $data[self::FIELD_USE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_USE])) { + $this->setUse(new FHIRNameUse([FHIRNameUse::FIELD_VALUE => $data[self::FIELD_USE]] + $ext)); + } else if (is_array($data[self::FIELD_USE])) { + $this->setUse(new FHIRNameUse(array_merge($ext, $data[self::FIELD_USE]))); + } } else { $this->setUse(new FHIRNameUse($data[self::FIELD_USE])); } @@ -777,6 +809,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getFamily())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FAMILY, null, $v->_getFHIRXMLNamespace())); } @@ -788,7 +821,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_GIVEN, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PERIOD, null, $v->_getFHIRXMLNamespace())); } @@ -811,7 +843,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getText())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TEXT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getUse())) { $v->xmlSerialize($sxe->addChild(self::FIELD_USE, null, $v->_getFHIRXMLNamespace())); } @@ -825,8 +856,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getFamily())) { - $a[self::FIELD_FAMILY] = $v->getValue(); - $a[self::FIELD_FAMILY_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FAMILY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FAMILY_EXT] = $enc; + } + } else { + $a[self::FIELD_FAMILY] = $v; + } } if ([] !== ($vs = $this->getGiven())) { $a[self::FIELD_GIVEN] = []; @@ -834,8 +872,17 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_GIVEN][] = $v->getValue(); - $a[self::FIELD_GIVEN_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_GIVEN][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_GIVEN_EXT][] = $enc; + } else { + $a[self::FIELD_GIVEN_EXT][] = null; + } + } else { + $a[self::FIELD_GIVEN][] = $v; + } } } if (null !== ($v = $this->getPeriod())) { @@ -847,8 +894,17 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_PREFIX][] = $v->getValue(); - $a[self::FIELD_PREFIX_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PREFIX][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PREFIX_EXT][] = $enc; + } else { + $a[self::FIELD_PREFIX_EXT][] = null; + } + } else { + $a[self::FIELD_PREFIX][] = $v; + } } } if ([] !== ($vs = $this->getSuffix())) { @@ -857,16 +913,40 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_SUFFIX][] = $v->getValue(); - $a[self::FIELD_SUFFIX_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SUFFIX][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SUFFIX_EXT][] = $enc; + } else { + $a[self::FIELD_SUFFIX_EXT][] = null; + } + } else { + $a[self::FIELD_SUFFIX][] = $v; + } } } if (null !== ($v = $this->getText())) { - $a[self::FIELD_TEXT] = $v->getValue(); - $a[self::FIELD_TEXT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TEXT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TEXT_EXT] = $enc; + } + } else { + $a[self::FIELD_TEXT] = $v; + } } if (null !== ($v = $this->getUse())) { - $a[self::FIELD_USE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_USE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_USE_EXT] = $enc; + } + } else { + $a[self::FIELD_USE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRId.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRId.php index 465a31adbb..43d2ece692 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRId.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRId.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -82,10 +82,6 @@ class FHIRId extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ID; - - /** @var string */ - protected $_xmlns = ''; - const FIELD_VALUE = 'value'; /** @@ -93,6 +89,8 @@ class FHIRId extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; /** * FHIRId Constructor diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRIdentifier.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRIdentifier.php index 3e425a6d3c..e8d1158208 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRIdentifier.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRIdentifier.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRIdentifier extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_IDENTIFIER; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ASSIGNER = 'assigner'; const FIELD_PERIOD = 'period'; const FIELD_SYSTEM = 'system'; @@ -161,6 +157,9 @@ class FHIRIdentifier extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRIdentifier Constructor * @param null|array $data @@ -201,8 +200,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SYSTEM] instanceof FHIRUri) { $this->setSystem($data[self::FIELD_SYSTEM]); - } elseif ($ext && is_scalar($data[self::FIELD_SYSTEM])) { - $this->setSystem(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_SYSTEM]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SYSTEM])) { + $this->setSystem(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_SYSTEM]] + $ext)); + } else if (is_array($data[self::FIELD_SYSTEM])) { + $this->setSystem(new FHIRUri(array_merge($ext, $data[self::FIELD_SYSTEM]))); + } } else { $this->setSystem(new FHIRUri($data[self::FIELD_SYSTEM])); } @@ -220,8 +223,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_USE] instanceof FHIRIdentifierUse) { $this->setUse($data[self::FIELD_USE]); - } elseif ($ext && is_scalar($data[self::FIELD_USE])) { - $this->setUse(new FHIRIdentifierUse([FHIRIdentifierUse::FIELD_VALUE => $data[self::FIELD_USE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_USE])) { + $this->setUse(new FHIRIdentifierUse([FHIRIdentifierUse::FIELD_VALUE => $data[self::FIELD_USE]] + $ext)); + } else if (is_array($data[self::FIELD_USE])) { + $this->setUse(new FHIRIdentifierUse(array_merge($ext, $data[self::FIELD_USE]))); + } } else { $this->setUse(new FHIRIdentifierUse($data[self::FIELD_USE])); } @@ -232,8 +239,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE] instanceof FHIRString) { $this->setValue($data[self::FIELD_VALUE]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE])) { - $this->setValue(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VALUE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE])) { + $this->setValue(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VALUE]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE])) { + $this->setValue(new FHIRString(array_merge($ext, $data[self::FIELD_VALUE]))); + } } else { $this->setValue(new FHIRString($data[self::FIELD_VALUE])); } @@ -569,22 +580,20 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getAssigner())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ASSIGNER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PERIOD, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getSystem())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SYSTEM, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getUse())) { $v->xmlSerialize($sxe->addChild(self::FIELD_USE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getValue())) { + $sxe->addAttribute(self::FIELD_VALUE, (string)$v); $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE, null, $v->_getFHIRXMLNamespace())); } return $sxe; @@ -603,18 +612,40 @@ public function jsonSerialize() $a[self::FIELD_PERIOD] = $v; } if (null !== ($v = $this->getSystem())) { - $a[self::FIELD_SYSTEM] = $v->getValue(); - $a[self::FIELD_SYSTEM_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SYSTEM] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SYSTEM_EXT] = $enc; + } + } else { + $a[self::FIELD_SYSTEM] = $v; + } } if (null !== ($v = $this->getType())) { $a[self::FIELD_TYPE] = $v; } if (null !== ($v = $this->getUse())) { - $a[self::FIELD_USE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_USE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_USE_EXT] = $enc; + } + } else { + $a[self::FIELD_USE] = $v; + } } if (null !== ($v = $this->getValue())) { - $a[self::FIELD_VALUE] = $v->getValue(); - $a[self::FIELD_VALUE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRIdentifierUse.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRIdentifierUse.php index 6956d064c7..d09ea9efce 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRIdentifierUse.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRIdentifierUse.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRIdentifierUse extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_IDENTIFIER_USE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRIdentifierUse extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRIdentifierUse Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRIdentityAssuranceLevel.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRIdentityAssuranceLevel.php index 48e1f22bbf..7c85b0010b 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRIdentityAssuranceLevel.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRIdentityAssuranceLevel.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRIdentityAssuranceLevel extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_IDENTITY_ASSURANCE_LEVEL; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -90,6 +86,9 @@ class FHIRIdentityAssuranceLevel extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRIdentityAssuranceLevel Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRImmunizationStatusCodes.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRImmunizationStatusCodes.php index bf877a7bba..c93afd9b51 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRImmunizationStatusCodes.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRImmunizationStatusCodes.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRImmunizationStatusCodes extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_IMMUNIZATION_STATUS_CODES; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRImmunizationStatusCodes extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRImmunizationStatusCodes Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRInstanceAvailability.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRInstanceAvailability.php index 5490568551..d0802479c1 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRInstanceAvailability.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRInstanceAvailability.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRInstanceAvailability extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_INSTANCE_AVAILABILITY; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRInstanceAvailability extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRInstanceAvailability Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRInstant.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRInstant.php index 436d8b8c59..f4c5efc01c 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRInstant.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRInstant.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -81,10 +81,6 @@ class FHIRInstant extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_INSTANT; - - /** @var string */ - protected $_xmlns = ''; - const FIELD_VALUE = 'value'; /** @@ -92,6 +88,8 @@ class FHIRInstant extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; /** * FHIRInstant Constructor diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRInteger.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRInteger.php index 271ace0b7f..153ba3f410 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRInteger.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRInteger.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRInteger extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_INTEGER; - - /** @var string */ - protected $_xmlns = ''; - const FIELD_VALUE = 'value'; /** @@ -90,6 +86,8 @@ class FHIRInteger extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; /** * FHIRInteger Constructor diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRIssueSeverity.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRIssueSeverity.php index 24633a4edd..cd573871bf 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRIssueSeverity.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRIssueSeverity.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRIssueSeverity extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ISSUE_SEVERITY; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRIssueSeverity extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRIssueSeverity Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRIssueType.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRIssueType.php index 0bb08edca0..6e50159093 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRIssueType.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRIssueType.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRIssueType extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ISSUE_TYPE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRIssueType extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRIssueType Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRLinkType.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRLinkType.php index b2078ada6c..26b8589e5c 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRLinkType.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRLinkType.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRLinkType extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_LINK_TYPE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRLinkType extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRLinkType Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRLinkageType.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRLinkageType.php index 1bd93eb4c1..f2125df077 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRLinkageType.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRLinkageType.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRLinkageType extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_LINKAGE_TYPE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -90,6 +86,9 @@ class FHIRLinkageType extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRLinkageType Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRListMode.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRListMode.php index 7be504b043..b3a19682f3 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRListMode.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRListMode.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRListMode extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_LIST_MODE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRListMode extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRListMode Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRListStatus.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRListStatus.php index 10e96486cd..8623af8bd2 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRListStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRListStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRListStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_LIST_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRListStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRListStatus Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRLocationMode.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRLocationMode.php index ee685423c9..096ffb6e9d 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRLocationMode.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRLocationMode.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRLocationMode extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_LOCATION_MODE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -90,6 +86,9 @@ class FHIRLocationMode extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRLocationMode Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRLocationStatus.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRLocationStatus.php index 89a62589f9..85af4e984b 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRLocationStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRLocationStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRLocationStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_LOCATION_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRLocationStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRLocationStatus Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRMarkdown.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRMarkdown.php index 3052b778b1..e97aa89b9e 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRMarkdown.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRMarkdown.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -85,10 +85,6 @@ class FHIRMarkdown extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MARKDOWN; - - /** @var string */ - protected $_xmlns = ''; - const FIELD_VALUE = 'value'; /** @@ -96,6 +92,8 @@ class FHIRMarkdown extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; /** * FHIRMarkdown Constructor diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRMeasmntPrinciple.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRMeasmntPrinciple.php index 5ee57fef34..d2091ee622 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRMeasmntPrinciple.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRMeasmntPrinciple.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRMeasmntPrinciple extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MEASMNT_PRINCIPLE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRMeasmntPrinciple extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMeasmntPrinciple Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRMeasureReportStatus.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRMeasureReportStatus.php index e3fe3a3268..da1afbf099 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRMeasureReportStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRMeasureReportStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRMeasureReportStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MEASURE_REPORT_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRMeasureReportStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMeasureReportStatus Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRMeasureReportType.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRMeasureReportType.php index 54b09b44bc..ddc82db1fa 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRMeasureReportType.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRMeasureReportType.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRMeasureReportType extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MEASURE_REPORT_TYPE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRMeasureReportType extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMeasureReportType Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRMedicationAdministrationStatus.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRMedicationAdministrationStatus.php index 2ffd017cb1..c0270202a8 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRMedicationAdministrationStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRMedicationAdministrationStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRMedicationAdministrationStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MEDICATION_ADMINISTRATION_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRMedicationAdministrationStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMedicationAdministrationStatus Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRMedicationDispenseStatus.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRMedicationDispenseStatus.php index 053f02bb77..51728d42d9 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRMedicationDispenseStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRMedicationDispenseStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRMedicationDispenseStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MEDICATION_DISPENSE_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRMedicationDispenseStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMedicationDispenseStatus Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRMedicationRequestIntent.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRMedicationRequestIntent.php index b7f50924f9..5dd7164d34 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRMedicationRequestIntent.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRMedicationRequestIntent.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRMedicationRequestIntent extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MEDICATION_REQUEST_INTENT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRMedicationRequestIntent extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMedicationRequestIntent Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRMedicationRequestPriority.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRMedicationRequestPriority.php index 51bfba4bbb..daa8a2cca7 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRMedicationRequestPriority.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRMedicationRequestPriority.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRMedicationRequestPriority extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MEDICATION_REQUEST_PRIORITY; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRMedicationRequestPriority extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMedicationRequestPriority Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRMedicationRequestStatus.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRMedicationRequestStatus.php index 4f9e84a826..61f47cb7f5 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRMedicationRequestStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRMedicationRequestStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRMedicationRequestStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MEDICATION_REQUEST_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -90,6 +86,9 @@ class FHIRMedicationRequestStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMedicationRequestStatus Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRMedicationStatementStatus.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRMedicationStatementStatus.php index d15c6bffb1..1cb97d4964 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRMedicationStatementStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRMedicationStatementStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRMedicationStatementStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MEDICATION_STATEMENT_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRMedicationStatementStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMedicationStatementStatus Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRMedicationStatementTaken.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRMedicationStatementTaken.php index 15260bd3e2..718f6ada21 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRMedicationStatementTaken.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRMedicationStatementTaken.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRMedicationStatementTaken extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MEDICATION_STATEMENT_TAKEN; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -90,6 +86,9 @@ class FHIRMedicationStatementTaken extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMedicationStatementTaken Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRMedicationStatus.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRMedicationStatus.php index e2b6793a91..bd320383d6 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRMedicationStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRMedicationStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRMedicationStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MEDICATION_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRMedicationStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMedicationStatus Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRMessageSignificanceCategory.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRMessageSignificanceCategory.php index 02ba18543d..a9e53038c0 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRMessageSignificanceCategory.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRMessageSignificanceCategory.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRMessageSignificanceCategory extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MESSAGE_SIGNIFICANCE_CATEGORY; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRMessageSignificanceCategory extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMessageSignificanceCategory Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRMeta.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRMeta.php index d271090f22..d61deded44 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRMeta.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRMeta.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRMeta extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_META; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_LAST_UPDATED = 'lastUpdated'; const FIELD_LAST_UPDATED_EXT = '_lastUpdated'; const FIELD_PROFILE = 'profile'; @@ -159,6 +155,9 @@ class FHIRMeta extends FHIRElement */ protected $versionId = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMeta Constructor * @param null|array $data @@ -181,8 +180,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_LAST_UPDATED] instanceof FHIRInstant) { $this->setLastUpdated($data[self::FIELD_LAST_UPDATED]); - } elseif ($ext && is_scalar($data[self::FIELD_LAST_UPDATED])) { - $this->setLastUpdated(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_LAST_UPDATED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_LAST_UPDATED])) { + $this->setLastUpdated(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_LAST_UPDATED]] + $ext)); + } else if (is_array($data[self::FIELD_LAST_UPDATED])) { + $this->setLastUpdated(new FHIRInstant(array_merge($ext, $data[self::FIELD_LAST_UPDATED]))); + } } else { $this->setLastUpdated(new FHIRInstant($data[self::FIELD_LAST_UPDATED])); } @@ -193,17 +196,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_PROFILE])) { foreach($data[self::FIELD_PROFILE] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRUri) { $this->addProfile($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addProfile(new FHIRUri([FHIRUri::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addProfile(new FHIRUri([FHIRUri::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addProfile(new FHIRUri(array_merge($v, $ext[$i]))); + } } else { $this->addProfile(new FHIRUri($v)); } } } elseif ($data[self::FIELD_PROFILE] instanceof FHIRUri) { $this->addProfile($data[self::FIELD_PROFILE]); - } elseif ($ext && is_scalar($data[self::FIELD_PROFILE])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_PROFILE])) { $this->addProfile(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_PROFILE]] + $ext)); } else { $this->addProfile(new FHIRUri($data[self::FIELD_PROFILE])); @@ -212,6 +222,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SECURITY])) { if (is_array($data[self::FIELD_SECURITY])) { foreach($data[self::FIELD_SECURITY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCoding) { $this->addSecurity($v); } else { @@ -227,6 +240,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_TAG])) { if (is_array($data[self::FIELD_TAG])) { foreach($data[self::FIELD_TAG] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCoding) { $this->addTag($v); } else { @@ -245,8 +261,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VERSION_ID] instanceof FHIRId) { $this->setVersionId($data[self::FIELD_VERSION_ID]); - } elseif ($ext && is_scalar($data[self::FIELD_VERSION_ID])) { - $this->setVersionId(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_VERSION_ID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VERSION_ID])) { + $this->setVersionId(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_VERSION_ID]] + $ext)); + } else if (is_array($data[self::FIELD_VERSION_ID])) { + $this->setVersionId(new FHIRId(array_merge($ext, $data[self::FIELD_VERSION_ID]))); + } } else { $this->setVersionId(new FHIRId($data[self::FIELD_VERSION_ID])); } @@ -661,6 +681,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getLastUpdated())) { $v->xmlSerialize($sxe->addChild(self::FIELD_LAST_UPDATED, null, $v->_getFHIRXMLNamespace())); } @@ -672,7 +693,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_PROFILE, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getSecurity())) { foreach($vs as $v) { if (null === $v) { @@ -681,7 +701,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_SECURITY, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getTag())) { foreach($vs as $v) { if (null === $v) { @@ -703,8 +722,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getLastUpdated())) { - $a[self::FIELD_LAST_UPDATED] = $v->getValue(); - $a[self::FIELD_LAST_UPDATED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_LAST_UPDATED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_LAST_UPDATED_EXT] = $enc; + } + } else { + $a[self::FIELD_LAST_UPDATED] = $v; + } } if ([] !== ($vs = $this->getProfile())) { $a[self::FIELD_PROFILE] = []; @@ -712,8 +738,17 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_PROFILE][] = $v->getValue(); - $a[self::FIELD_PROFILE_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PROFILE][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PROFILE_EXT][] = $enc; + } else { + $a[self::FIELD_PROFILE_EXT][] = null; + } + } else { + $a[self::FIELD_PROFILE][] = $v; + } } } if ([] !== ($vs = $this->getSecurity())) { @@ -723,8 +758,15 @@ public function jsonSerialize() $a[self::FIELD_TAG] = $vs; } if (null !== ($v = $this->getVersionId())) { - $a[self::FIELD_VERSION_ID] = $v->getValue(); - $a[self::FIELD_VERSION_ID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VERSION_ID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VERSION_ID_EXT] = $enc; + } + } else { + $a[self::FIELD_VERSION_ID] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRNameUse.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRNameUse.php index 24f2375b52..2396631a32 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRNameUse.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRNameUse.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRNameUse extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_NAME_USE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRNameUse extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRNameUse Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRNamingSystemIdentifierType.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRNamingSystemIdentifierType.php index 75355e848b..e6dbb4eb2f 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRNamingSystemIdentifierType.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRNamingSystemIdentifierType.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRNamingSystemIdentifierType extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_NAMING_SYSTEM_IDENTIFIER_TYPE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRNamingSystemIdentifierType extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRNamingSystemIdentifierType Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRNamingSystemType.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRNamingSystemType.php index 82fe654c78..b04cb17989 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRNamingSystemType.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRNamingSystemType.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRNamingSystemType extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_NAMING_SYSTEM_TYPE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRNamingSystemType extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRNamingSystemType Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRNarrative.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRNarrative.php index 2a5886df83..ee1ea555f1 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRNarrative.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRNarrative.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRNarrative extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_NARRATIVE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DIV = 'div'; const FIELD_STATUS = 'status'; const FIELD_STATUS_EXT = '_status'; @@ -106,6 +102,9 @@ class FHIRNarrative extends FHIRElement */ protected $status = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRNarrative Constructor * @param null|array $data @@ -131,8 +130,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRNarrativeStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRNarrativeStatus([FHIRNarrativeStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRNarrativeStatus([FHIRNarrativeStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRNarrativeStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRNarrativeStatus($data[self::FIELD_STATUS])); } @@ -312,7 +315,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDiv())) { $sxe->addAttribute(self::FIELD_DIV, (string)$v); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } @@ -329,7 +331,15 @@ public function jsonSerialize() $a[self::FIELD_DIV] = $v; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRNarrativeStatus.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRNarrativeStatus.php index f30b5eae0c..9ec426d610 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRNarrativeStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRNarrativeStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRNarrativeStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_NARRATIVE_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRNarrativeStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRNarrativeStatus Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRNoteType.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRNoteType.php index 267e35f625..e711f4c676 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRNoteType.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRNoteType.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -77,10 +77,6 @@ class FHIRNoteType extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_NOTE_TYPE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -88,6 +84,9 @@ class FHIRNoteType extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRNoteType Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRNutritionOrderStatus.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRNutritionOrderStatus.php index 86061e92a5..3a7f3e1572 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRNutritionOrderStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRNutritionOrderStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRNutritionOrderStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_NUTRITION_ORDER_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -90,6 +86,9 @@ class FHIRNutritionOrderStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRNutritionOrderStatus Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRObservationRelationshipType.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRObservationRelationshipType.php index d70dc9f7c2..4537ceee85 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRObservationRelationshipType.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRObservationRelationshipType.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRObservationRelationshipType extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_OBSERVATION_RELATIONSHIP_TYPE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRObservationRelationshipType extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRObservationRelationshipType Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRObservationStatus.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRObservationStatus.php index a11dcadfcc..8a08585f53 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRObservationStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRObservationStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRObservationStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_OBSERVATION_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRObservationStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRObservationStatus Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIROid.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIROid.php index 647cf7632e..8f715e622f 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIROid.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIROid.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIROid extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_OID; - - /** @var string */ - protected $_xmlns = ''; - const FIELD_VALUE = 'value'; /** @@ -91,6 +87,8 @@ class FHIROid extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; /** * FHIROid Constructor diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIROperationKind.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIROperationKind.php index 38cd6a3c3b..3cb63adc7b 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIROperationKind.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIROperationKind.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIROperationKind extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_OPERATION_KIND; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIROperationKind extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIROperationKind Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIROperationParameterUse.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIROperationParameterUse.php index 78790c9ae8..a38d39957a 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIROperationParameterUse.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIROperationParameterUse.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIROperationParameterUse extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_OPERATION_PARAMETER_USE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIROperationParameterUse extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIROperationParameterUse Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRParameterDefinition.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRParameterDefinition.php index defe04193a..8eba24ead4 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRParameterDefinition.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRParameterDefinition.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRParameterDefinition extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_PARAMETER_DEFINITION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DOCUMENTATION = 'documentation'; const FIELD_DOCUMENTATION_EXT = '_documentation'; const FIELD_MAX = 'max'; @@ -183,6 +179,9 @@ class FHIRParameterDefinition extends FHIRElement */ protected $use = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRParameterDefinition Constructor * @param null|array $data @@ -205,8 +204,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DOCUMENTATION] instanceof FHIRString) { $this->setDocumentation($data[self::FIELD_DOCUMENTATION]); - } elseif ($ext && is_scalar($data[self::FIELD_DOCUMENTATION])) { - $this->setDocumentation(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DOCUMENTATION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DOCUMENTATION])) { + $this->setDocumentation(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DOCUMENTATION]] + $ext)); + } else if (is_array($data[self::FIELD_DOCUMENTATION])) { + $this->setDocumentation(new FHIRString(array_merge($ext, $data[self::FIELD_DOCUMENTATION]))); + } } else { $this->setDocumentation(new FHIRString($data[self::FIELD_DOCUMENTATION])); } @@ -217,8 +220,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MAX] instanceof FHIRString) { $this->setMax($data[self::FIELD_MAX]); - } elseif ($ext && is_scalar($data[self::FIELD_MAX])) { - $this->setMax(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_MAX]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MAX])) { + $this->setMax(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_MAX]] + $ext)); + } else if (is_array($data[self::FIELD_MAX])) { + $this->setMax(new FHIRString(array_merge($ext, $data[self::FIELD_MAX]))); + } } else { $this->setMax(new FHIRString($data[self::FIELD_MAX])); } @@ -229,8 +236,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MIN] instanceof FHIRInteger) { $this->setMin($data[self::FIELD_MIN]); - } elseif ($ext && is_scalar($data[self::FIELD_MIN])) { - $this->setMin(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_MIN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MIN])) { + $this->setMin(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_MIN]] + $ext)); + } else if (is_array($data[self::FIELD_MIN])) { + $this->setMin(new FHIRInteger(array_merge($ext, $data[self::FIELD_MIN]))); + } } else { $this->setMin(new FHIRInteger($data[self::FIELD_MIN])); } @@ -241,8 +252,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRCode) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRCode(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRCode($data[self::FIELD_NAME])); } @@ -260,8 +275,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TYPE] instanceof FHIRCode) { $this->setType($data[self::FIELD_TYPE]); - } elseif ($ext && is_scalar($data[self::FIELD_TYPE])) { - $this->setType(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TYPE])) { + $this->setType(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } else if (is_array($data[self::FIELD_TYPE])) { + $this->setType(new FHIRCode(array_merge($ext, $data[self::FIELD_TYPE]))); + } } else { $this->setType(new FHIRCode($data[self::FIELD_TYPE])); } @@ -272,8 +291,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_USE] instanceof FHIRCode) { $this->setUse($data[self::FIELD_USE]); - } elseif ($ext && is_scalar($data[self::FIELD_USE])) { - $this->setUse(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_USE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_USE])) { + $this->setUse(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_USE]] + $ext)); + } else if (is_array($data[self::FIELD_USE])) { + $this->setUse(new FHIRCode(array_merge($ext, $data[self::FIELD_USE]))); + } } else { $this->setUse(new FHIRCode($data[self::FIELD_USE])); } @@ -692,6 +715,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getDocumentation())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DOCUMENTATION, null, $v->_getFHIRXMLNamespace())); } @@ -704,7 +728,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NAME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getProfile())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PROFILE, null, $v->_getFHIRXMLNamespace())); } @@ -724,31 +747,73 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getDocumentation())) { - $a[self::FIELD_DOCUMENTATION] = $v->getValue(); - $a[self::FIELD_DOCUMENTATION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DOCUMENTATION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DOCUMENTATION_EXT] = $enc; + } + } else { + $a[self::FIELD_DOCUMENTATION] = $v; + } } if (null !== ($v = $this->getMax())) { - $a[self::FIELD_MAX] = $v->getValue(); - $a[self::FIELD_MAX_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MAX] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MAX_EXT] = $enc; + } + } else { + $a[self::FIELD_MAX] = $v; + } } if (null !== ($v = $this->getMin())) { - $a[self::FIELD_MIN] = $v->getValue(); - $a[self::FIELD_MIN_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MIN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MIN_EXT] = $enc; + } + } else { + $a[self::FIELD_MIN] = $v; + } } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if (null !== ($v = $this->getProfile())) { $a[self::FIELD_PROFILE] = $v; } if (null !== ($v = $this->getType())) { - $a[self::FIELD_TYPE] = $v->getValue(); - $a[self::FIELD_TYPE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TYPE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TYPE_EXT] = $enc; + } + } else { + $a[self::FIELD_TYPE] = $v; + } } if (null !== ($v = $this->getUse())) { - $a[self::FIELD_USE] = $v->getValue(); - $a[self::FIELD_USE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_USE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_USE_EXT] = $enc; + } + } else { + $a[self::FIELD_USE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRParticipantRequired.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRParticipantRequired.php index e2e75b48fd..92ff4badde 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRParticipantRequired.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRParticipantRequired.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRParticipantRequired extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_PARTICIPANT_REQUIRED; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRParticipantRequired extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRParticipantRequired Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRParticipationStatus.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRParticipationStatus.php index 6d64d2c722..7f8ee4085c 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRParticipationStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRParticipationStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRParticipationStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_PARTICIPATION_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRParticipationStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRParticipationStatus Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRPeriod.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRPeriod.php index 065235f3c3..97e3950234 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRPeriod.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRPeriod.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRPeriod extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_PERIOD; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_END = 'end'; const FIELD_END_EXT = '_end'; const FIELD_START = 'start'; @@ -117,6 +113,9 @@ class FHIRPeriod extends FHIRElement */ protected $start = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRPeriod Constructor * @param null|array $data @@ -139,8 +138,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_END] instanceof FHIRDateTime) { $this->setEnd($data[self::FIELD_END]); - } elseif ($ext && is_scalar($data[self::FIELD_END])) { - $this->setEnd(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_END]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_END])) { + $this->setEnd(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_END]] + $ext)); + } else if (is_array($data[self::FIELD_END])) { + $this->setEnd(new FHIRDateTime(array_merge($ext, $data[self::FIELD_END]))); + } } else { $this->setEnd(new FHIRDateTime($data[self::FIELD_END])); } @@ -151,8 +154,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_START] instanceof FHIRDateTime) { $this->setStart($data[self::FIELD_START]); - } elseif ($ext && is_scalar($data[self::FIELD_START])) { - $this->setStart(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_START]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_START])) { + $this->setStart(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_START]] + $ext)); + } else if (is_array($data[self::FIELD_START])) { + $this->setStart(new FHIRDateTime(array_merge($ext, $data[self::FIELD_START]))); + } } else { $this->setStart(new FHIRDateTime($data[self::FIELD_START])); } @@ -362,6 +369,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getEnd())) { $v->xmlSerialize($sxe->addChild(self::FIELD_END, null, $v->_getFHIRXMLNamespace())); } @@ -378,12 +386,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getEnd())) { - $a[self::FIELD_END] = $v->getValue(); - $a[self::FIELD_END_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_END] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_END_EXT] = $enc; + } + } else { + $a[self::FIELD_END] = $v; + } } if (null !== ($v = $this->getStart())) { - $a[self::FIELD_START] = $v->getValue(); - $a[self::FIELD_START_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_START] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_START_EXT] = $enc; + } + } else { + $a[self::FIELD_START] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRPositiveInt.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRPositiveInt.php index 565c1b9da6..de7f71bb80 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRPositiveInt.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRPositiveInt.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRPositiveInt extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_POSITIVE_INT; - - /** @var string */ - protected $_xmlns = ''; - const FIELD_VALUE = 'value'; /** @@ -90,6 +86,8 @@ class FHIRPositiveInt extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; /** * FHIRPositiveInt Constructor diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRPropertyRepresentation.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRPropertyRepresentation.php index 1a91768ecf..7029580120 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRPropertyRepresentation.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRPropertyRepresentation.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRPropertyRepresentation extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_PROPERTY_REPRESENTATION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRPropertyRepresentation extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRPropertyRepresentation Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRPropertyType.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRPropertyType.php index fd9dbf9bdb..7e545df99b 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRPropertyType.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRPropertyType.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRPropertyType extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_PROPERTY_TYPE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRPropertyType extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRPropertyType Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRProvenanceEntityRole.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRProvenanceEntityRole.php index 236c4ec30c..0d3d7d6662 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRProvenanceEntityRole.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRProvenanceEntityRole.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRProvenanceEntityRole extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_PROVENANCE_ENTITY_ROLE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRProvenanceEntityRole extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRProvenanceEntityRole Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRPublicationStatus.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRPublicationStatus.php index 0c5fb164cf..fbd5c7243c 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRPublicationStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRPublicationStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -77,10 +77,6 @@ class FHIRPublicationStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_PUBLICATION_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -88,6 +84,9 @@ class FHIRPublicationStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRPublicationStatus Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRQualityType.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRQualityType.php index a9a592a3bf..3ca278d48c 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRQualityType.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRQualityType.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRQualityType extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_QUALITY_TYPE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRQualityType extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRQualityType Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRQuantity.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRQuantity.php index 8c504b74c6..c8fb485703 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRQuantity.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRQuantity.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRQuantity extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_QUANTITY; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CODE = 'code'; const FIELD_CODE_EXT = '_code'; const FIELD_COMPARATOR = 'comparator'; @@ -154,6 +150,9 @@ class FHIRQuantity extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRQuantity Constructor * @param null|array $data @@ -180,8 +179,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CODE] instanceof FHIRCode) { $this->setCode($data[self::FIELD_CODE]); - } elseif ($ext && is_scalar($data[self::FIELD_CODE])) { - $this->setCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_CODE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CODE])) { + $this->setCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_CODE]] + $ext)); + } else if (is_array($data[self::FIELD_CODE])) { + $this->setCode(new FHIRCode(array_merge($ext, $data[self::FIELD_CODE]))); + } } else { $this->setCode(new FHIRCode($data[self::FIELD_CODE])); } @@ -192,8 +195,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_COMPARATOR] instanceof FHIRQuantityComparator) { $this->setComparator($data[self::FIELD_COMPARATOR]); - } elseif ($ext && is_scalar($data[self::FIELD_COMPARATOR])) { - $this->setComparator(new FHIRQuantityComparator([FHIRQuantityComparator::FIELD_VALUE => $data[self::FIELD_COMPARATOR]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_COMPARATOR])) { + $this->setComparator(new FHIRQuantityComparator([FHIRQuantityComparator::FIELD_VALUE => $data[self::FIELD_COMPARATOR]] + $ext)); + } else if (is_array($data[self::FIELD_COMPARATOR])) { + $this->setComparator(new FHIRQuantityComparator(array_merge($ext, $data[self::FIELD_COMPARATOR]))); + } } else { $this->setComparator(new FHIRQuantityComparator($data[self::FIELD_COMPARATOR])); } @@ -204,8 +211,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SYSTEM] instanceof FHIRUri) { $this->setSystem($data[self::FIELD_SYSTEM]); - } elseif ($ext && is_scalar($data[self::FIELD_SYSTEM])) { - $this->setSystem(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_SYSTEM]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SYSTEM])) { + $this->setSystem(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_SYSTEM]] + $ext)); + } else if (is_array($data[self::FIELD_SYSTEM])) { + $this->setSystem(new FHIRUri(array_merge($ext, $data[self::FIELD_SYSTEM]))); + } } else { $this->setSystem(new FHIRUri($data[self::FIELD_SYSTEM])); } @@ -216,8 +227,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_UNIT] instanceof FHIRString) { $this->setUnit($data[self::FIELD_UNIT]); - } elseif ($ext && is_scalar($data[self::FIELD_UNIT])) { - $this->setUnit(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_UNIT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_UNIT])) { + $this->setUnit(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_UNIT]] + $ext)); + } else if (is_array($data[self::FIELD_UNIT])) { + $this->setUnit(new FHIRString(array_merge($ext, $data[self::FIELD_UNIT]))); + } } else { $this->setUnit(new FHIRString($data[self::FIELD_UNIT])); } @@ -228,8 +243,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE] instanceof FHIRDecimal) { $this->setValue($data[self::FIELD_VALUE]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE])) { - $this->setValue(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_VALUE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE])) { + $this->setValue(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_VALUE]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE])) { + $this->setValue(new FHIRDecimal(array_merge($ext, $data[self::FIELD_VALUE]))); + } } else { $this->setValue(new FHIRDecimal($data[self::FIELD_VALUE])); } @@ -552,10 +571,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getComparator())) { $v->xmlSerialize($sxe->addChild(self::FIELD_COMPARATOR, null, $v->_getFHIRXMLNamespace())); } @@ -566,6 +585,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_UNIT, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getValue())) { + $sxe->addAttribute(self::FIELD_VALUE, (string)$v); $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE, null, $v->_getFHIRXMLNamespace())); } return $sxe; @@ -578,23 +598,59 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getCode())) { - $a[self::FIELD_CODE] = $v->getValue(); - $a[self::FIELD_CODE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CODE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CODE_EXT] = $enc; + } + } else { + $a[self::FIELD_CODE] = $v; + } } if (null !== ($v = $this->getComparator())) { - $a[self::FIELD_COMPARATOR] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_COMPARATOR] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_COMPARATOR_EXT] = $enc; + } + } else { + $a[self::FIELD_COMPARATOR] = $v; + } } if (null !== ($v = $this->getSystem())) { - $a[self::FIELD_SYSTEM] = $v->getValue(); - $a[self::FIELD_SYSTEM_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SYSTEM] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SYSTEM_EXT] = $enc; + } + } else { + $a[self::FIELD_SYSTEM] = $v; + } } if (null !== ($v = $this->getUnit())) { - $a[self::FIELD_UNIT] = $v->getValue(); - $a[self::FIELD_UNIT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_UNIT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_UNIT_EXT] = $enc; + } + } else { + $a[self::FIELD_UNIT] = $v; + } } if (null !== ($v = $this->getValue())) { - $a[self::FIELD_VALUE] = $v->getValue(); - $a[self::FIELD_VALUE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRQuantity/FHIRAge.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRQuantity/FHIRAge.php index fd0762ef04..5949761ae2 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRQuantity/FHIRAge.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRQuantity/FHIRAge.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,7 +78,6 @@ class FHIRAge extends FHIRQuantity { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_AGE; - /** @var string */ protected $_xmlns = 'http://hl7.org/fhir'; @@ -201,6 +200,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRQuantity/FHIRCount.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRQuantity/FHIRCount.php index ff6fe5460a..9bd31ae31f 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRQuantity/FHIRCount.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRQuantity/FHIRCount.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -80,7 +80,6 @@ class FHIRCount extends FHIRQuantity { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_COUNT; - /** @var string */ protected $_xmlns = 'http://hl7.org/fhir'; @@ -203,6 +202,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRQuantity/FHIRDistance.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRQuantity/FHIRDistance.php index 6956a3f4ea..f406ca68ea 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRQuantity/FHIRDistance.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRQuantity/FHIRDistance.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,7 +78,6 @@ class FHIRDistance extends FHIRQuantity { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DISTANCE; - /** @var string */ protected $_xmlns = 'http://hl7.org/fhir'; @@ -201,6 +200,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRQuantity/FHIRDuration.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRQuantity/FHIRDuration.php index ca1bc63913..9b729df822 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRQuantity/FHIRDuration.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRQuantity/FHIRDuration.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,7 +78,6 @@ class FHIRDuration extends FHIRQuantity { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DURATION; - /** @var string */ protected $_xmlns = 'http://hl7.org/fhir'; @@ -201,6 +200,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRQuantity/FHIRMoney.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRQuantity/FHIRMoney.php index 31a629cbdc..7294961d1d 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRQuantity/FHIRMoney.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRQuantity/FHIRMoney.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,7 +78,6 @@ class FHIRMoney extends FHIRQuantity { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MONEY; - /** @var string */ protected $_xmlns = 'http://hl7.org/fhir'; @@ -201,6 +200,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRQuantityComparator.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRQuantityComparator.php index 64e20177b2..5e8848675e 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRQuantityComparator.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRQuantityComparator.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRQuantityComparator extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_QUANTITY_COMPARATOR; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRQuantityComparator extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRQuantityComparator Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRQuestionnaireItemType.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRQuestionnaireItemType.php index b76b9aa879..d663f7a526 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRQuestionnaireItemType.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRQuestionnaireItemType.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRQuestionnaireItemType extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_QUESTIONNAIRE_ITEM_TYPE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -90,6 +86,9 @@ class FHIRQuestionnaireItemType extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRQuestionnaireItemType Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRQuestionnaireResponseStatus.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRQuestionnaireResponseStatus.php index 33b2df13f0..fdbc51db66 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRQuestionnaireResponseStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRQuestionnaireResponseStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRQuestionnaireResponseStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_QUESTIONNAIRE_RESPONSE_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRQuestionnaireResponseStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRQuestionnaireResponseStatus Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRRange.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRRange.php index 6e2223eb4e..1c2f57f9d4 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRRange.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRRange.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRRange extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_RANGE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_HIGH = 'high'; const FIELD_HIGH_EXT = '_high'; const FIELD_LOW = 'low'; @@ -113,6 +109,9 @@ class FHIRRange extends FHIRElement */ protected $low = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRRange Constructor * @param null|array $data @@ -135,8 +134,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_HIGH] instanceof FHIRQuantity) { $this->setHigh($data[self::FIELD_HIGH]); - } elseif ($ext && is_scalar($data[self::FIELD_HIGH])) { - $this->setHigh(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_HIGH]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_HIGH])) { + $this->setHigh(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_HIGH]] + $ext)); + } else if (is_array($data[self::FIELD_HIGH])) { + $this->setHigh(new FHIRQuantity(array_merge($ext, $data[self::FIELD_HIGH]))); + } } else { $this->setHigh(new FHIRQuantity($data[self::FIELD_HIGH])); } @@ -147,8 +150,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_LOW] instanceof FHIRQuantity) { $this->setLow($data[self::FIELD_LOW]); - } elseif ($ext && is_scalar($data[self::FIELD_LOW])) { - $this->setLow(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_LOW]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_LOW])) { + $this->setLow(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_LOW]] + $ext)); + } else if (is_array($data[self::FIELD_LOW])) { + $this->setLow(new FHIRQuantity(array_merge($ext, $data[self::FIELD_LOW]))); + } } else { $this->setLow(new FHIRQuantity($data[self::FIELD_LOW])); } @@ -332,7 +339,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getHigh())) { $v->xmlSerialize($sxe->addChild(self::FIELD_HIGH, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getLow())) { $v->xmlSerialize($sxe->addChild(self::FIELD_LOW, null, $v->_getFHIRXMLNamespace())); } @@ -346,10 +352,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getHigh())) { - $a[self::FIELD_HIGH] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_HIGH] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_HIGH_EXT] = $enc; + } + } else { + $a[self::FIELD_HIGH] = $v; + } } if (null !== ($v = $this->getLow())) { - $a[self::FIELD_LOW] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_LOW] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_LOW_EXT] = $enc; + } + } else { + $a[self::FIELD_LOW] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRRatio.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRRatio.php index 1f206872a7..f962b01e50 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRRatio.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRRatio.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRRatio extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_RATIO; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DENOMINATOR = 'denominator'; const FIELD_DENOMINATOR_EXT = '_denominator'; const FIELD_NUMERATOR = 'numerator'; @@ -114,6 +110,9 @@ class FHIRRatio extends FHIRElement */ protected $numerator = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRRatio Constructor * @param null|array $data @@ -136,8 +135,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DENOMINATOR] instanceof FHIRQuantity) { $this->setDenominator($data[self::FIELD_DENOMINATOR]); - } elseif ($ext && is_scalar($data[self::FIELD_DENOMINATOR])) { - $this->setDenominator(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_DENOMINATOR]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DENOMINATOR])) { + $this->setDenominator(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_DENOMINATOR]] + $ext)); + } else if (is_array($data[self::FIELD_DENOMINATOR])) { + $this->setDenominator(new FHIRQuantity(array_merge($ext, $data[self::FIELD_DENOMINATOR]))); + } } else { $this->setDenominator(new FHIRQuantity($data[self::FIELD_DENOMINATOR])); } @@ -148,8 +151,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NUMERATOR] instanceof FHIRQuantity) { $this->setNumerator($data[self::FIELD_NUMERATOR]); - } elseif ($ext && is_scalar($data[self::FIELD_NUMERATOR])) { - $this->setNumerator(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_NUMERATOR]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NUMERATOR])) { + $this->setNumerator(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_NUMERATOR]] + $ext)); + } else if (is_array($data[self::FIELD_NUMERATOR])) { + $this->setNumerator(new FHIRQuantity(array_merge($ext, $data[self::FIELD_NUMERATOR]))); + } } else { $this->setNumerator(new FHIRQuantity($data[self::FIELD_NUMERATOR])); } @@ -333,7 +340,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDenominator())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DENOMINATOR, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getNumerator())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NUMERATOR, null, $v->_getFHIRXMLNamespace())); } @@ -347,10 +353,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getDenominator())) { - $a[self::FIELD_DENOMINATOR] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DENOMINATOR] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DENOMINATOR_EXT] = $enc; + } + } else { + $a[self::FIELD_DENOMINATOR] = $v; + } } if (null !== ($v = $this->getNumerator())) { - $a[self::FIELD_NUMERATOR] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NUMERATOR] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NUMERATOR_EXT] = $enc; + } + } else { + $a[self::FIELD_NUMERATOR] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRReference.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRReference.php index 4fce341641..e25e4cf542 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRReference.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRReference.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRReference extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_REFERENCE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DISPLAY = 'display'; const FIELD_DISPLAY_EXT = '_display'; const FIELD_IDENTIFIER = 'identifier'; @@ -135,6 +131,9 @@ class FHIRReference extends FHIRElement */ protected $reference = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRReference Constructor * @param null|array $data @@ -157,8 +156,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DISPLAY] instanceof FHIRString) { $this->setDisplay($data[self::FIELD_DISPLAY]); - } elseif ($ext && is_scalar($data[self::FIELD_DISPLAY])) { - $this->setDisplay(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DISPLAY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DISPLAY])) { + $this->setDisplay(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DISPLAY]] + $ext)); + } else if (is_array($data[self::FIELD_DISPLAY])) { + $this->setDisplay(new FHIRString(array_merge($ext, $data[self::FIELD_DISPLAY]))); + } } else { $this->setDisplay(new FHIRString($data[self::FIELD_DISPLAY])); } @@ -169,8 +172,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->setIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { - $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_IDENTIFIER]))); + } } else { $this->setIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); } @@ -181,8 +188,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_REFERENCE] instanceof FHIRString) { $this->setReference($data[self::FIELD_REFERENCE]); - } elseif ($ext && is_scalar($data[self::FIELD_REFERENCE])) { - $this->setReference(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_REFERENCE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_REFERENCE])) { + $this->setReference(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_REFERENCE]] + $ext)); + } else if (is_array($data[self::FIELD_REFERENCE])) { + $this->setReference(new FHIRString(array_merge($ext, $data[self::FIELD_REFERENCE]))); + } } else { $this->setReference(new FHIRString($data[self::FIELD_REFERENCE])); } @@ -435,10 +446,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getDisplay())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DISPLAY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } @@ -455,15 +466,37 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getDisplay())) { - $a[self::FIELD_DISPLAY] = $v->getValue(); - $a[self::FIELD_DISPLAY_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DISPLAY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DISPLAY_EXT] = $enc; + } + } else { + $a[self::FIELD_DISPLAY] = $v; + } } if (null !== ($v = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_IDENTIFIER] = $v; + } } if (null !== ($v = $this->getReference())) { - $a[self::FIELD_REFERENCE] = $v->getValue(); - $a[self::FIELD_REFERENCE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_REFERENCE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_REFERENCE_EXT] = $enc; + } + } else { + $a[self::FIELD_REFERENCE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRReferenceHandlingPolicy.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRReferenceHandlingPolicy.php index 4ae69416a4..a0eb8431c9 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRReferenceHandlingPolicy.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRReferenceHandlingPolicy.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRReferenceHandlingPolicy extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_REFERENCE_HANDLING_POLICY; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRReferenceHandlingPolicy extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRReferenceHandlingPolicy Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRReferenceVersionRules.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRReferenceVersionRules.php index f916d7f93f..6df5cab619 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRReferenceVersionRules.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRReferenceVersionRules.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRReferenceVersionRules extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_REFERENCE_VERSION_RULES; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -90,6 +86,9 @@ class FHIRReferenceVersionRules extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRReferenceVersionRules Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRRelatedArtifact.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRRelatedArtifact.php index 4c02175558..43ae614f97 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRRelatedArtifact.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRRelatedArtifact.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRRelatedArtifact extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_RELATED_ARTIFACT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CITATION = 'citation'; const FIELD_CITATION_EXT = '_citation'; const FIELD_DISPLAY = 'display'; @@ -163,6 +159,9 @@ class FHIRRelatedArtifact extends FHIRElement */ protected $url = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRRelatedArtifact Constructor * @param null|array $data @@ -185,8 +184,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CITATION] instanceof FHIRString) { $this->setCitation($data[self::FIELD_CITATION]); - } elseif ($ext && is_scalar($data[self::FIELD_CITATION])) { - $this->setCitation(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_CITATION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CITATION])) { + $this->setCitation(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_CITATION]] + $ext)); + } else if (is_array($data[self::FIELD_CITATION])) { + $this->setCitation(new FHIRString(array_merge($ext, $data[self::FIELD_CITATION]))); + } } else { $this->setCitation(new FHIRString($data[self::FIELD_CITATION])); } @@ -197,8 +200,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DISPLAY] instanceof FHIRString) { $this->setDisplay($data[self::FIELD_DISPLAY]); - } elseif ($ext && is_scalar($data[self::FIELD_DISPLAY])) { - $this->setDisplay(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DISPLAY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DISPLAY])) { + $this->setDisplay(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DISPLAY]] + $ext)); + } else if (is_array($data[self::FIELD_DISPLAY])) { + $this->setDisplay(new FHIRString(array_merge($ext, $data[self::FIELD_DISPLAY]))); + } } else { $this->setDisplay(new FHIRString($data[self::FIELD_DISPLAY])); } @@ -223,8 +230,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TYPE] instanceof FHIRRelatedArtifactType) { $this->setType($data[self::FIELD_TYPE]); - } elseif ($ext && is_scalar($data[self::FIELD_TYPE])) { - $this->setType(new FHIRRelatedArtifactType([FHIRRelatedArtifactType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TYPE])) { + $this->setType(new FHIRRelatedArtifactType([FHIRRelatedArtifactType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } else if (is_array($data[self::FIELD_TYPE])) { + $this->setType(new FHIRRelatedArtifactType(array_merge($ext, $data[self::FIELD_TYPE]))); + } } else { $this->setType(new FHIRRelatedArtifactType($data[self::FIELD_TYPE])); } @@ -235,8 +246,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_URL] instanceof FHIRUri) { $this->setUrl($data[self::FIELD_URL]); - } elseif ($ext && is_scalar($data[self::FIELD_URL])) { - $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } else if (is_array($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri(array_merge($ext, $data[self::FIELD_URL]))); + } } else { $this->setUrl(new FHIRUri($data[self::FIELD_URL])); } @@ -579,21 +594,19 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getCitation())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CITATION, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getDisplay())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DISPLAY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDocument())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DOCUMENT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getResource())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RESOURCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -610,12 +623,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getCitation())) { - $a[self::FIELD_CITATION] = $v->getValue(); - $a[self::FIELD_CITATION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CITATION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CITATION_EXT] = $enc; + } + } else { + $a[self::FIELD_CITATION] = $v; + } } if (null !== ($v = $this->getDisplay())) { - $a[self::FIELD_DISPLAY] = $v->getValue(); - $a[self::FIELD_DISPLAY_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DISPLAY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DISPLAY_EXT] = $enc; + } + } else { + $a[self::FIELD_DISPLAY] = $v; + } } if (null !== ($v = $this->getDocument())) { $a[self::FIELD_DOCUMENT] = $v; @@ -624,11 +651,26 @@ public function jsonSerialize() $a[self::FIELD_RESOURCE] = $v; } if (null !== ($v = $this->getType())) { - $a[self::FIELD_TYPE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TYPE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TYPE_EXT] = $enc; + } + } else { + $a[self::FIELD_TYPE] = $v; + } } if (null !== ($v = $this->getUrl())) { - $a[self::FIELD_URL] = $v->getValue(); - $a[self::FIELD_URL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_URL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_URL_EXT] = $enc; + } + } else { + $a[self::FIELD_URL] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRRelatedArtifactType.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRRelatedArtifactType.php index 56d5fdfe58..499ee86b0c 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRRelatedArtifactType.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRRelatedArtifactType.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRRelatedArtifactType extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_RELATED_ARTIFACT_TYPE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRRelatedArtifactType extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRRelatedArtifactType Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRRemittanceOutcome.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRRemittanceOutcome.php index 613a6bf2e4..c10152dda0 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRRemittanceOutcome.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRRemittanceOutcome.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -77,10 +77,6 @@ class FHIRRemittanceOutcome extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_REMITTANCE_OUTCOME; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -88,6 +84,9 @@ class FHIRRemittanceOutcome extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRRemittanceOutcome Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRRepositoryType.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRRepositoryType.php index 1c34f7ff9f..8e7a870c4d 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRRepositoryType.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRRepositoryType.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRRepositoryType extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_REPOSITORY_TYPE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRRepositoryType extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRRepositoryType Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRRequestIntent.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRRequestIntent.php index a7649ddbf8..263424a6bd 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRRequestIntent.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRRequestIntent.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRRequestIntent extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_REQUEST_INTENT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRRequestIntent extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRRequestIntent Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRRequestPriority.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRRequestPriority.php index a0dce8f204..932629d9c2 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRRequestPriority.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRRequestPriority.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRRequestPriority extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_REQUEST_PRIORITY; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRRequestPriority extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRRequestPriority Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRRequestStatus.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRRequestStatus.php index e261018fc3..89f607f23c 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRRequestStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRRequestStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRRequestStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_REQUEST_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRRequestStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRRequestStatus Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRResearchStudyStatus.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRResearchStudyStatus.php index 34b976283c..d3830c470d 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRResearchStudyStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRResearchStudyStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRResearchStudyStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_RESEARCH_STUDY_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRResearchStudyStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRResearchStudyStatus Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRResearchSubjectStatus.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRResearchSubjectStatus.php index 703fd18029..4b0de9a297 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRResearchSubjectStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRResearchSubjectStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRResearchSubjectStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_RESEARCH_SUBJECT_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRResearchSubjectStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRResearchSubjectStatus Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRResourceVersionPolicy.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRResourceVersionPolicy.php index a3555e0095..136561a203 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRResourceVersionPolicy.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRResourceVersionPolicy.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRResourceVersionPolicy extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_RESOURCE_VERSION_POLICY; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRResourceVersionPolicy extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRResourceVersionPolicy Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRResponseType.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRResponseType.php index b8a8cf2457..b76108b9b2 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRResponseType.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRResponseType.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRResponseType extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_RESPONSE_TYPE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRResponseType extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRResponseType Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRRestfulCapabilityMode.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRRestfulCapabilityMode.php index 505f2768c0..86628d90ac 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRRestfulCapabilityMode.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRRestfulCapabilityMode.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRRestfulCapabilityMode extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_RESTFUL_CAPABILITY_MODE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRRestfulCapabilityMode extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRRestfulCapabilityMode Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRSampledData.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRSampledData.php index f2f54e3822..3cca100eeb 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRSampledData.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRSampledData.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRSampledData extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SAMPLED_DATA; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DATA = 'data'; const FIELD_DATA_EXT = '_data'; const FIELD_DIMENSIONS = 'dimensions'; @@ -185,6 +181,9 @@ class FHIRSampledData extends FHIRElement */ protected $upperLimit = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSampledData Constructor * @param null|array $data @@ -207,8 +206,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATA] instanceof FHIRSampledDataDataType) { $this->setData($data[self::FIELD_DATA]); - } elseif ($ext && is_scalar($data[self::FIELD_DATA])) { - $this->setData(new FHIRSampledDataDataType([FHIRSampledDataDataType::FIELD_VALUE => $data[self::FIELD_DATA]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATA])) { + $this->setData(new FHIRSampledDataDataType([FHIRSampledDataDataType::FIELD_VALUE => $data[self::FIELD_DATA]] + $ext)); + } else if (is_array($data[self::FIELD_DATA])) { + $this->setData(new FHIRSampledDataDataType(array_merge($ext, $data[self::FIELD_DATA]))); + } } else { $this->setData(new FHIRSampledDataDataType($data[self::FIELD_DATA])); } @@ -219,8 +222,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DIMENSIONS] instanceof FHIRPositiveInt) { $this->setDimensions($data[self::FIELD_DIMENSIONS]); - } elseif ($ext && is_scalar($data[self::FIELD_DIMENSIONS])) { - $this->setDimensions(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_DIMENSIONS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DIMENSIONS])) { + $this->setDimensions(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_DIMENSIONS]] + $ext)); + } else if (is_array($data[self::FIELD_DIMENSIONS])) { + $this->setDimensions(new FHIRPositiveInt(array_merge($ext, $data[self::FIELD_DIMENSIONS]))); + } } else { $this->setDimensions(new FHIRPositiveInt($data[self::FIELD_DIMENSIONS])); } @@ -231,8 +238,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_FACTOR] instanceof FHIRDecimal) { $this->setFactor($data[self::FIELD_FACTOR]); - } elseif ($ext && is_scalar($data[self::FIELD_FACTOR])) { - $this->setFactor(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_FACTOR]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_FACTOR])) { + $this->setFactor(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_FACTOR]] + $ext)); + } else if (is_array($data[self::FIELD_FACTOR])) { + $this->setFactor(new FHIRDecimal(array_merge($ext, $data[self::FIELD_FACTOR]))); + } } else { $this->setFactor(new FHIRDecimal($data[self::FIELD_FACTOR])); } @@ -243,8 +254,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_LOWER_LIMIT] instanceof FHIRDecimal) { $this->setLowerLimit($data[self::FIELD_LOWER_LIMIT]); - } elseif ($ext && is_scalar($data[self::FIELD_LOWER_LIMIT])) { - $this->setLowerLimit(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_LOWER_LIMIT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_LOWER_LIMIT])) { + $this->setLowerLimit(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_LOWER_LIMIT]] + $ext)); + } else if (is_array($data[self::FIELD_LOWER_LIMIT])) { + $this->setLowerLimit(new FHIRDecimal(array_merge($ext, $data[self::FIELD_LOWER_LIMIT]))); + } } else { $this->setLowerLimit(new FHIRDecimal($data[self::FIELD_LOWER_LIMIT])); } @@ -255,8 +270,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ORIGIN] instanceof FHIRQuantity) { $this->setOrigin($data[self::FIELD_ORIGIN]); - } elseif ($ext && is_scalar($data[self::FIELD_ORIGIN])) { - $this->setOrigin(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_ORIGIN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ORIGIN])) { + $this->setOrigin(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_ORIGIN]] + $ext)); + } else if (is_array($data[self::FIELD_ORIGIN])) { + $this->setOrigin(new FHIRQuantity(array_merge($ext, $data[self::FIELD_ORIGIN]))); + } } else { $this->setOrigin(new FHIRQuantity($data[self::FIELD_ORIGIN])); } @@ -267,8 +286,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PERIOD] instanceof FHIRDecimal) { $this->setPeriod($data[self::FIELD_PERIOD]); - } elseif ($ext && is_scalar($data[self::FIELD_PERIOD])) { - $this->setPeriod(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_PERIOD]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PERIOD])) { + $this->setPeriod(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_PERIOD]] + $ext)); + } else if (is_array($data[self::FIELD_PERIOD])) { + $this->setPeriod(new FHIRDecimal(array_merge($ext, $data[self::FIELD_PERIOD]))); + } } else { $this->setPeriod(new FHIRDecimal($data[self::FIELD_PERIOD])); } @@ -279,8 +302,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_UPPER_LIMIT] instanceof FHIRDecimal) { $this->setUpperLimit($data[self::FIELD_UPPER_LIMIT]); - } elseif ($ext && is_scalar($data[self::FIELD_UPPER_LIMIT])) { - $this->setUpperLimit(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_UPPER_LIMIT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_UPPER_LIMIT])) { + $this->setUpperLimit(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_UPPER_LIMIT]] + $ext)); + } else if (is_array($data[self::FIELD_UPPER_LIMIT])) { + $this->setUpperLimit(new FHIRDecimal(array_merge($ext, $data[self::FIELD_UPPER_LIMIT]))); + } } else { $this->setUpperLimit(new FHIRDecimal($data[self::FIELD_UPPER_LIMIT])); } @@ -703,6 +730,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getData())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DATA, null, $v->_getFHIRXMLNamespace())); } @@ -715,7 +743,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getLowerLimit())) { $v->xmlSerialize($sxe->addChild(self::FIELD_LOWER_LIMIT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOrigin())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ORIGIN, null, $v->_getFHIRXMLNamespace())); } @@ -735,31 +762,81 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getData())) { - $a[self::FIELD_DATA] = $v->getValue(); - $a[self::FIELD_DATA_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATA] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATA_EXT] = $enc; + } + } else { + $a[self::FIELD_DATA] = $v; + } } if (null !== ($v = $this->getDimensions())) { - $a[self::FIELD_DIMENSIONS] = $v->getValue(); - $a[self::FIELD_DIMENSIONS_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DIMENSIONS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DIMENSIONS_EXT] = $enc; + } + } else { + $a[self::FIELD_DIMENSIONS] = $v; + } } if (null !== ($v = $this->getFactor())) { - $a[self::FIELD_FACTOR] = $v->getValue(); - $a[self::FIELD_FACTOR_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FACTOR] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FACTOR_EXT] = $enc; + } + } else { + $a[self::FIELD_FACTOR] = $v; + } } if (null !== ($v = $this->getLowerLimit())) { - $a[self::FIELD_LOWER_LIMIT] = $v->getValue(); - $a[self::FIELD_LOWER_LIMIT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_LOWER_LIMIT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_LOWER_LIMIT_EXT] = $enc; + } + } else { + $a[self::FIELD_LOWER_LIMIT] = $v; + } } if (null !== ($v = $this->getOrigin())) { - $a[self::FIELD_ORIGIN] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ORIGIN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ORIGIN_EXT] = $enc; + } + } else { + $a[self::FIELD_ORIGIN] = $v; + } } if (null !== ($v = $this->getPeriod())) { - $a[self::FIELD_PERIOD] = $v->getValue(); - $a[self::FIELD_PERIOD_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PERIOD] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PERIOD_EXT] = $enc; + } + } else { + $a[self::FIELD_PERIOD] = $v; + } } if (null !== ($v = $this->getUpperLimit())) { - $a[self::FIELD_UPPER_LIMIT] = $v->getValue(); - $a[self::FIELD_UPPER_LIMIT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_UPPER_LIMIT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_UPPER_LIMIT_EXT] = $enc; + } + } else { + $a[self::FIELD_UPPER_LIMIT] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRSampledDataDataType.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRSampledDataDataType.php index d0451f40a5..267777fe71 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRSampledDataDataType.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRSampledDataDataType.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -75,10 +75,6 @@ class FHIRSampledDataDataType extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SAMPLED_DATA_DATA_TYPE; - - /** @var string */ - protected $_xmlns = ''; - const FIELD_VALUE = 'value'; /** @@ -86,6 +82,8 @@ class FHIRSampledDataDataType extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; /** * FHIRSampledDataDataType Constructor diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRSearchComparator.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRSearchComparator.php index f0745191e4..3ca1c0cd3a 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRSearchComparator.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRSearchComparator.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRSearchComparator extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SEARCH_COMPARATOR; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRSearchComparator extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSearchComparator Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRSearchEntryMode.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRSearchEntryMode.php index 9175c7adca..3fd329cc5b 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRSearchEntryMode.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRSearchEntryMode.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRSearchEntryMode extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SEARCH_ENTRY_MODE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -90,6 +86,9 @@ class FHIRSearchEntryMode extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSearchEntryMode Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRSearchModifierCode.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRSearchModifierCode.php index e2fd22bc20..a86ced6b2b 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRSearchModifierCode.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRSearchModifierCode.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRSearchModifierCode extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SEARCH_MODIFIER_CODE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRSearchModifierCode extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSearchModifierCode Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRSearchParamType.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRSearchParamType.php index efdbd214b2..3d9c8e3600 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRSearchParamType.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRSearchParamType.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -77,10 +77,6 @@ class FHIRSearchParamType extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SEARCH_PARAM_TYPE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -88,6 +84,9 @@ class FHIRSearchParamType extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSearchParamType Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRSignature.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRSignature.php index 57aff00f94..e569e6b476 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRSignature.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRSignature.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -81,10 +81,6 @@ class FHIRSignature extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SIGNATURE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_BLOB = 'blob'; const FIELD_BLOB_EXT = '_blob'; const FIELD_CONTENT_TYPE = 'contentType'; @@ -199,6 +195,9 @@ class FHIRSignature extends FHIRElement */ protected $whoUri = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSignature Constructor * @param null|array $data @@ -221,8 +220,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_BLOB] instanceof FHIRBase64Binary) { $this->setBlob($data[self::FIELD_BLOB]); - } elseif ($ext && is_scalar($data[self::FIELD_BLOB])) { - $this->setBlob(new FHIRBase64Binary([FHIRBase64Binary::FIELD_VALUE => $data[self::FIELD_BLOB]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_BLOB])) { + $this->setBlob(new FHIRBase64Binary([FHIRBase64Binary::FIELD_VALUE => $data[self::FIELD_BLOB]] + $ext)); + } else if (is_array($data[self::FIELD_BLOB])) { + $this->setBlob(new FHIRBase64Binary(array_merge($ext, $data[self::FIELD_BLOB]))); + } } else { $this->setBlob(new FHIRBase64Binary($data[self::FIELD_BLOB])); } @@ -233,8 +236,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CONTENT_TYPE] instanceof FHIRCode) { $this->setContentType($data[self::FIELD_CONTENT_TYPE]); - } elseif ($ext && is_scalar($data[self::FIELD_CONTENT_TYPE])) { - $this->setContentType(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_CONTENT_TYPE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CONTENT_TYPE])) { + $this->setContentType(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_CONTENT_TYPE]] + $ext)); + } else if (is_array($data[self::FIELD_CONTENT_TYPE])) { + $this->setContentType(new FHIRCode(array_merge($ext, $data[self::FIELD_CONTENT_TYPE]))); + } } else { $this->setContentType(new FHIRCode($data[self::FIELD_CONTENT_TYPE])); } @@ -252,8 +259,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ON_BEHALF_OF_URI] instanceof FHIRUri) { $this->setOnBehalfOfUri($data[self::FIELD_ON_BEHALF_OF_URI]); - } elseif ($ext && is_scalar($data[self::FIELD_ON_BEHALF_OF_URI])) { - $this->setOnBehalfOfUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_ON_BEHALF_OF_URI]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ON_BEHALF_OF_URI])) { + $this->setOnBehalfOfUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_ON_BEHALF_OF_URI]] + $ext)); + } else if (is_array($data[self::FIELD_ON_BEHALF_OF_URI])) { + $this->setOnBehalfOfUri(new FHIRUri(array_merge($ext, $data[self::FIELD_ON_BEHALF_OF_URI]))); + } } else { $this->setOnBehalfOfUri(new FHIRUri($data[self::FIELD_ON_BEHALF_OF_URI])); } @@ -261,6 +272,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_TYPE])) { if (is_array($data[self::FIELD_TYPE])) { foreach($data[self::FIELD_TYPE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCoding) { $this->addType($v); } else { @@ -279,8 +293,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_WHEN] instanceof FHIRInstant) { $this->setWhen($data[self::FIELD_WHEN]); - } elseif ($ext && is_scalar($data[self::FIELD_WHEN])) { - $this->setWhen(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_WHEN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_WHEN])) { + $this->setWhen(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_WHEN]] + $ext)); + } else if (is_array($data[self::FIELD_WHEN])) { + $this->setWhen(new FHIRInstant(array_merge($ext, $data[self::FIELD_WHEN]))); + } } else { $this->setWhen(new FHIRInstant($data[self::FIELD_WHEN])); } @@ -298,8 +316,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_WHO_URI] instanceof FHIRUri) { $this->setWhoUri($data[self::FIELD_WHO_URI]); - } elseif ($ext && is_scalar($data[self::FIELD_WHO_URI])) { - $this->setWhoUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_WHO_URI]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_WHO_URI])) { + $this->setWhoUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_WHO_URI]] + $ext)); + } else if (is_array($data[self::FIELD_WHO_URI])) { + $this->setWhoUri(new FHIRUri(array_merge($ext, $data[self::FIELD_WHO_URI]))); + } } else { $this->setWhoUri(new FHIRUri($data[self::FIELD_WHO_URI])); } @@ -778,20 +800,19 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getBlob())) { $v->xmlSerialize($sxe->addChild(self::FIELD_BLOB, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getContentType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CONTENT_TYPE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOnBehalfOfReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ON_BEHALF_OF_REFERENCE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getOnBehalfOfUri())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ON_BEHALF_OF_URI, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getType())) { foreach($vs as $v) { if (null === $v) { @@ -803,7 +824,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getWhen())) { $v->xmlSerialize($sxe->addChild(self::FIELD_WHEN, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getWhoReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_WHO_REFERENCE, null, $v->_getFHIRXMLNamespace())); } @@ -820,33 +840,68 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getBlob())) { - $a[self::FIELD_BLOB] = $v->getValue(); - $a[self::FIELD_BLOB_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_BLOB] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_BLOB_EXT] = $enc; + } + } else { + $a[self::FIELD_BLOB] = $v; + } } if (null !== ($v = $this->getContentType())) { - $a[self::FIELD_CONTENT_TYPE] = $v->getValue(); - $a[self::FIELD_CONTENT_TYPE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CONTENT_TYPE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CONTENT_TYPE_EXT] = $enc; + } + } else { + $a[self::FIELD_CONTENT_TYPE] = $v; + } } if (null !== ($v = $this->getOnBehalfOfReference())) { $a[self::FIELD_ON_BEHALF_OF_REFERENCE] = $v; } if (null !== ($v = $this->getOnBehalfOfUri())) { - $a[self::FIELD_ON_BEHALF_OF_URI] = $v->getValue(); - $a[self::FIELD_ON_BEHALF_OF_URI_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ON_BEHALF_OF_URI] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ON_BEHALF_OF_URI_EXT] = $enc; + } + } else { + $a[self::FIELD_ON_BEHALF_OF_URI] = $v; + } } if ([] !== ($vs = $this->getType())) { $a[self::FIELD_TYPE] = $vs; } if (null !== ($v = $this->getWhen())) { - $a[self::FIELD_WHEN] = $v->getValue(); - $a[self::FIELD_WHEN_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_WHEN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_WHEN_EXT] = $enc; + } + } else { + $a[self::FIELD_WHEN] = $v; + } } if (null !== ($v = $this->getWhoReference())) { $a[self::FIELD_WHO_REFERENCE] = $v; } if (null !== ($v = $this->getWhoUri())) { - $a[self::FIELD_WHO_URI] = $v->getValue(); - $a[self::FIELD_WHO_URI_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_WHO_URI] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_WHO_URI_EXT] = $enc; + } + } else { + $a[self::FIELD_WHO_URI] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRSlicingRules.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRSlicingRules.php index 94c6727ce8..bec066809e 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRSlicingRules.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRSlicingRules.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRSlicingRules extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SLICING_RULES; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRSlicingRules extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSlicingRules Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRSlotStatus.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRSlotStatus.php index d6793ba418..5095fd5b45 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRSlotStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRSlotStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRSlotStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SLOT_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRSlotStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSlotStatus Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRSpecimenStatus.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRSpecimenStatus.php index 00364f39e3..83d8d66259 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRSpecimenStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRSpecimenStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRSpecimenStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SPECIMEN_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRSpecimenStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSpecimenStatus Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRString.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRString.php index 47cf08c735..e5ad3e1ceb 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRString.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRString.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRString extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_STRING; - - /** @var string */ - protected $_xmlns = ''; - const FIELD_VALUE = 'value'; /** @@ -90,6 +86,8 @@ class FHIRString extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; /** * FHIRString Constructor diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRStructureDefinitionKind.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRStructureDefinitionKind.php index 222d162f97..fb8f13fd61 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRStructureDefinitionKind.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRStructureDefinitionKind.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRStructureDefinitionKind extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_STRUCTURE_DEFINITION_KIND; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRStructureDefinitionKind extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRStructureDefinitionKind Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRStructureMapContextType.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRStructureMapContextType.php index 1701b75ab5..b47c8e22ed 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRStructureMapContextType.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRStructureMapContextType.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRStructureMapContextType extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_STRUCTURE_MAP_CONTEXT_TYPE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRStructureMapContextType extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRStructureMapContextType Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRStructureMapGroupTypeMode.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRStructureMapGroupTypeMode.php index 8ec87cce14..6d88810ae3 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRStructureMapGroupTypeMode.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRStructureMapGroupTypeMode.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRStructureMapGroupTypeMode extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_STRUCTURE_MAP_GROUP_TYPE_MODE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -90,6 +86,9 @@ class FHIRStructureMapGroupTypeMode extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRStructureMapGroupTypeMode Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRStructureMapInputMode.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRStructureMapInputMode.php index 1a2b278044..3df9ce3a43 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRStructureMapInputMode.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRStructureMapInputMode.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRStructureMapInputMode extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_STRUCTURE_MAP_INPUT_MODE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRStructureMapInputMode extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRStructureMapInputMode Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRStructureMapModelMode.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRStructureMapModelMode.php index ed577cddc0..13f769e812 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRStructureMapModelMode.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRStructureMapModelMode.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRStructureMapModelMode extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_STRUCTURE_MAP_MODEL_MODE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRStructureMapModelMode extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRStructureMapModelMode Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRStructureMapSourceListMode.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRStructureMapSourceListMode.php index 0238bb6797..80a5a02aab 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRStructureMapSourceListMode.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRStructureMapSourceListMode.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRStructureMapSourceListMode extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_STRUCTURE_MAP_SOURCE_LIST_MODE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRStructureMapSourceListMode extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRStructureMapSourceListMode Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRStructureMapTargetListMode.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRStructureMapTargetListMode.php index 32b92d0b2f..44a8026de5 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRStructureMapTargetListMode.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRStructureMapTargetListMode.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRStructureMapTargetListMode extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_STRUCTURE_MAP_TARGET_LIST_MODE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRStructureMapTargetListMode extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRStructureMapTargetListMode Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRStructureMapTransform.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRStructureMapTransform.php index 6a95b5b30c..d45d9b6ba8 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRStructureMapTransform.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRStructureMapTransform.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRStructureMapTransform extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_STRUCTURE_MAP_TRANSFORM; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRStructureMapTransform extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRStructureMapTransform Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRSubscriptionChannelType.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRSubscriptionChannelType.php index 1ca58a8bbd..ee065545bd 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRSubscriptionChannelType.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRSubscriptionChannelType.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRSubscriptionChannelType extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SUBSCRIPTION_CHANNEL_TYPE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRSubscriptionChannelType extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSubscriptionChannelType Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRSubscriptionStatus.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRSubscriptionStatus.php index 45485a3b59..92f3c1e145 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRSubscriptionStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRSubscriptionStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRSubscriptionStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SUBSCRIPTION_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRSubscriptionStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSubscriptionStatus Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRSupplyDeliveryStatus.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRSupplyDeliveryStatus.php index ab60d3d165..3bc2d487c3 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRSupplyDeliveryStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRSupplyDeliveryStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRSupplyDeliveryStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SUPPLY_DELIVERY_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRSupplyDeliveryStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSupplyDeliveryStatus Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRSupplyRequestStatus.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRSupplyRequestStatus.php index 3a59505e66..723ea2a6e9 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRSupplyRequestStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRSupplyRequestStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRSupplyRequestStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SUPPLY_REQUEST_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRSupplyRequestStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSupplyRequestStatus Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRSystemRestfulInteraction.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRSystemRestfulInteraction.php index ba667ce6ce..58fca20dec 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRSystemRestfulInteraction.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRSystemRestfulInteraction.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRSystemRestfulInteraction extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SYSTEM_RESTFUL_INTERACTION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRSystemRestfulInteraction extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSystemRestfulInteraction Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRSystemVersionProcessingMode.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRSystemVersionProcessingMode.php index b3b75ce4a5..abdbe0a3cf 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRSystemVersionProcessingMode.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRSystemVersionProcessingMode.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRSystemVersionProcessingMode extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SYSTEM_VERSION_PROCESSING_MODE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -90,6 +86,9 @@ class FHIRSystemVersionProcessingMode extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSystemVersionProcessingMode Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRTaskStatus.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRTaskStatus.php index e2b02fda1b..652a881065 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRTaskStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRTaskStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRTaskStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_TASK_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRTaskStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRTaskStatus Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRTestReportActionResult.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRTestReportActionResult.php index cd18b8a896..32922966a1 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRTestReportActionResult.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRTestReportActionResult.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRTestReportActionResult extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_TEST_REPORT_ACTION_RESULT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRTestReportActionResult extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRTestReportActionResult Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRTestReportParticipantType.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRTestReportParticipantType.php index fed71e5008..ac4cb6dcbb 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRTestReportParticipantType.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRTestReportParticipantType.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRTestReportParticipantType extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_TEST_REPORT_PARTICIPANT_TYPE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRTestReportParticipantType extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRTestReportParticipantType Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRTestReportResult.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRTestReportResult.php index 8369f7d12f..2aa54b7c56 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRTestReportResult.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRTestReportResult.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRTestReportResult extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_TEST_REPORT_RESULT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRTestReportResult extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRTestReportResult Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRTestReportStatus.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRTestReportStatus.php index 498c5706fd..cf80167a56 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRTestReportStatus.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRTestReportStatus.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRTestReportStatus extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_TEST_REPORT_STATUS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRTestReportStatus extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRTestReportStatus Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRTestScriptRequestMethodCode.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRTestScriptRequestMethodCode.php index e14c23f501..67a86fa5a2 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRTestScriptRequestMethodCode.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRTestScriptRequestMethodCode.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRTestScriptRequestMethodCode extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_TEST_SCRIPT_REQUEST_METHOD_CODE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRTestScriptRequestMethodCode extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRTestScriptRequestMethodCode Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRTime.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRTime.php index 7e210e673a..ec9f47d20c 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRTime.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRTime.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRTime extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_TIME; - - /** @var string */ - protected $_xmlns = ''; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,8 @@ class FHIRTime extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; /** * FHIRTime Constructor diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRTiming.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRTiming.php index 53d800f700..ba3d87817a 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRTiming.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRTiming.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -83,10 +83,6 @@ class FHIRTiming extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_TIMING; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CODE = 'code'; const FIELD_EVENT = 'event'; const FIELD_EVENT_EXT = '_event'; @@ -138,6 +134,9 @@ class FHIRTiming extends FHIRElement */ protected $repeat = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRTiming Constructor * @param null|array $data @@ -167,17 +166,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_EVENT])) { foreach($data[self::FIELD_EVENT] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRDateTime) { $this->addEvent($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addEvent(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addEvent(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addEvent(new FHIRDateTime(array_merge($v, $ext[$i]))); + } } else { $this->addEvent(new FHIRDateTime($v)); } } } elseif ($data[self::FIELD_EVENT] instanceof FHIRDateTime) { $this->addEvent($data[self::FIELD_EVENT]); - } elseif ($ext && is_scalar($data[self::FIELD_EVENT])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_EVENT])) { $this->addEvent(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_EVENT]] + $ext)); } else { $this->addEvent(new FHIRDateTime($data[self::FIELD_EVENT])); @@ -470,7 +476,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_EVENT, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getRepeat())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REPEAT, null, $v->_getFHIRXMLNamespace())); } @@ -492,8 +497,17 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_EVENT][] = $v->getValue(); - $a[self::FIELD_EVENT_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EVENT][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EVENT_EXT][] = $enc; + } else { + $a[self::FIELD_EVENT_EXT][] = null; + } + } else { + $a[self::FIELD_EVENT][] = $v; + } } } if (null !== ($v = $this->getRepeat())) { diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRTiming/FHIRTimingRepeat.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRTiming/FHIRTimingRepeat.php index 8632bc71b2..e49a95f8f4 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRTiming/FHIRTimingRepeat.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRTiming/FHIRTimingRepeat.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -92,11 +92,8 @@ class FHIRTimingRepeat extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_TIMING_DOT_REPEAT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_BOUNDS_DURATION = 'boundsDuration'; + const FIELD_BOUNDS_DURATION_EXT = '_boundsDuration'; const FIELD_BOUNDS_PERIOD = 'boundsPeriod'; const FIELD_BOUNDS_RANGE = 'boundsRange'; const FIELD_COUNT = 'count'; @@ -328,6 +325,9 @@ class FHIRTimingRepeat extends FHIRElement */ protected $when = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRTimingRepeat Constructor * @param null|array $data @@ -345,8 +345,17 @@ public function __construct($data = null) } parent::__construct($data); if (isset($data[self::FIELD_BOUNDS_DURATION])) { + $ext = (isset($data[self::FIELD_BOUNDS_DURATION_EXT]) && is_array($data[self::FIELD_BOUNDS_DURATION_EXT])) + ? $data[self::FIELD_BOUNDS_DURATION_EXT] + : null; if ($data[self::FIELD_BOUNDS_DURATION] instanceof FHIRDuration) { $this->setBoundsDuration($data[self::FIELD_BOUNDS_DURATION]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_BOUNDS_DURATION])) { + $this->setBoundsDuration(new FHIRDuration([FHIRDuration::FIELD_VALUE => $data[self::FIELD_BOUNDS_DURATION]] + $ext)); + } else if (is_array($data[self::FIELD_BOUNDS_DURATION])) { + $this->setBoundsDuration(new FHIRDuration(array_merge($ext, $data[self::FIELD_BOUNDS_DURATION]))); + } } else { $this->setBoundsDuration(new FHIRDuration($data[self::FIELD_BOUNDS_DURATION])); } @@ -371,8 +380,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_COUNT] instanceof FHIRInteger) { $this->setCount($data[self::FIELD_COUNT]); - } elseif ($ext && is_scalar($data[self::FIELD_COUNT])) { - $this->setCount(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_COUNT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_COUNT])) { + $this->setCount(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_COUNT]] + $ext)); + } else if (is_array($data[self::FIELD_COUNT])) { + $this->setCount(new FHIRInteger(array_merge($ext, $data[self::FIELD_COUNT]))); + } } else { $this->setCount(new FHIRInteger($data[self::FIELD_COUNT])); } @@ -383,8 +396,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_COUNT_MAX] instanceof FHIRInteger) { $this->setCountMax($data[self::FIELD_COUNT_MAX]); - } elseif ($ext && is_scalar($data[self::FIELD_COUNT_MAX])) { - $this->setCountMax(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_COUNT_MAX]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_COUNT_MAX])) { + $this->setCountMax(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_COUNT_MAX]] + $ext)); + } else if (is_array($data[self::FIELD_COUNT_MAX])) { + $this->setCountMax(new FHIRInteger(array_merge($ext, $data[self::FIELD_COUNT_MAX]))); + } } else { $this->setCountMax(new FHIRInteger($data[self::FIELD_COUNT_MAX])); } @@ -395,17 +412,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_DAY_OF_WEEK])) { foreach($data[self::FIELD_DAY_OF_WEEK] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCode) { $this->addDayOfWeek($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addDayOfWeek(new FHIRCode([FHIRCode::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addDayOfWeek(new FHIRCode([FHIRCode::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addDayOfWeek(new FHIRCode(array_merge($v, $ext[$i]))); + } } else { $this->addDayOfWeek(new FHIRCode($v)); } } } elseif ($data[self::FIELD_DAY_OF_WEEK] instanceof FHIRCode) { $this->addDayOfWeek($data[self::FIELD_DAY_OF_WEEK]); - } elseif ($ext && is_scalar($data[self::FIELD_DAY_OF_WEEK])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_DAY_OF_WEEK])) { $this->addDayOfWeek(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_DAY_OF_WEEK]] + $ext)); } else { $this->addDayOfWeek(new FHIRCode($data[self::FIELD_DAY_OF_WEEK])); @@ -417,8 +441,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DURATION] instanceof FHIRDecimal) { $this->setDuration($data[self::FIELD_DURATION]); - } elseif ($ext && is_scalar($data[self::FIELD_DURATION])) { - $this->setDuration(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_DURATION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DURATION])) { + $this->setDuration(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_DURATION]] + $ext)); + } else if (is_array($data[self::FIELD_DURATION])) { + $this->setDuration(new FHIRDecimal(array_merge($ext, $data[self::FIELD_DURATION]))); + } } else { $this->setDuration(new FHIRDecimal($data[self::FIELD_DURATION])); } @@ -429,8 +457,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DURATION_MAX] instanceof FHIRDecimal) { $this->setDurationMax($data[self::FIELD_DURATION_MAX]); - } elseif ($ext && is_scalar($data[self::FIELD_DURATION_MAX])) { - $this->setDurationMax(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_DURATION_MAX]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DURATION_MAX])) { + $this->setDurationMax(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_DURATION_MAX]] + $ext)); + } else if (is_array($data[self::FIELD_DURATION_MAX])) { + $this->setDurationMax(new FHIRDecimal(array_merge($ext, $data[self::FIELD_DURATION_MAX]))); + } } else { $this->setDurationMax(new FHIRDecimal($data[self::FIELD_DURATION_MAX])); } @@ -441,8 +473,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DURATION_UNIT] instanceof FHIRUnitsOfTime) { $this->setDurationUnit($data[self::FIELD_DURATION_UNIT]); - } elseif ($ext && is_scalar($data[self::FIELD_DURATION_UNIT])) { - $this->setDurationUnit(new FHIRUnitsOfTime([FHIRUnitsOfTime::FIELD_VALUE => $data[self::FIELD_DURATION_UNIT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DURATION_UNIT])) { + $this->setDurationUnit(new FHIRUnitsOfTime([FHIRUnitsOfTime::FIELD_VALUE => $data[self::FIELD_DURATION_UNIT]] + $ext)); + } else if (is_array($data[self::FIELD_DURATION_UNIT])) { + $this->setDurationUnit(new FHIRUnitsOfTime(array_merge($ext, $data[self::FIELD_DURATION_UNIT]))); + } } else { $this->setDurationUnit(new FHIRUnitsOfTime($data[self::FIELD_DURATION_UNIT])); } @@ -453,8 +489,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_FREQUENCY] instanceof FHIRInteger) { $this->setFrequency($data[self::FIELD_FREQUENCY]); - } elseif ($ext && is_scalar($data[self::FIELD_FREQUENCY])) { - $this->setFrequency(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_FREQUENCY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_FREQUENCY])) { + $this->setFrequency(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_FREQUENCY]] + $ext)); + } else if (is_array($data[self::FIELD_FREQUENCY])) { + $this->setFrequency(new FHIRInteger(array_merge($ext, $data[self::FIELD_FREQUENCY]))); + } } else { $this->setFrequency(new FHIRInteger($data[self::FIELD_FREQUENCY])); } @@ -465,8 +505,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_FREQUENCY_MAX] instanceof FHIRInteger) { $this->setFrequencyMax($data[self::FIELD_FREQUENCY_MAX]); - } elseif ($ext && is_scalar($data[self::FIELD_FREQUENCY_MAX])) { - $this->setFrequencyMax(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_FREQUENCY_MAX]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_FREQUENCY_MAX])) { + $this->setFrequencyMax(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_FREQUENCY_MAX]] + $ext)); + } else if (is_array($data[self::FIELD_FREQUENCY_MAX])) { + $this->setFrequencyMax(new FHIRInteger(array_merge($ext, $data[self::FIELD_FREQUENCY_MAX]))); + } } else { $this->setFrequencyMax(new FHIRInteger($data[self::FIELD_FREQUENCY_MAX])); } @@ -477,8 +521,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_OFFSET] instanceof FHIRUnsignedInt) { $this->setOffset($data[self::FIELD_OFFSET]); - } elseif ($ext && is_scalar($data[self::FIELD_OFFSET])) { - $this->setOffset(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_OFFSET]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_OFFSET])) { + $this->setOffset(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_OFFSET]] + $ext)); + } else if (is_array($data[self::FIELD_OFFSET])) { + $this->setOffset(new FHIRUnsignedInt(array_merge($ext, $data[self::FIELD_OFFSET]))); + } } else { $this->setOffset(new FHIRUnsignedInt($data[self::FIELD_OFFSET])); } @@ -489,8 +537,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PERIOD] instanceof FHIRDecimal) { $this->setPeriod($data[self::FIELD_PERIOD]); - } elseif ($ext && is_scalar($data[self::FIELD_PERIOD])) { - $this->setPeriod(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_PERIOD]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PERIOD])) { + $this->setPeriod(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_PERIOD]] + $ext)); + } else if (is_array($data[self::FIELD_PERIOD])) { + $this->setPeriod(new FHIRDecimal(array_merge($ext, $data[self::FIELD_PERIOD]))); + } } else { $this->setPeriod(new FHIRDecimal($data[self::FIELD_PERIOD])); } @@ -501,8 +553,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PERIOD_MAX] instanceof FHIRDecimal) { $this->setPeriodMax($data[self::FIELD_PERIOD_MAX]); - } elseif ($ext && is_scalar($data[self::FIELD_PERIOD_MAX])) { - $this->setPeriodMax(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_PERIOD_MAX]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PERIOD_MAX])) { + $this->setPeriodMax(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_PERIOD_MAX]] + $ext)); + } else if (is_array($data[self::FIELD_PERIOD_MAX])) { + $this->setPeriodMax(new FHIRDecimal(array_merge($ext, $data[self::FIELD_PERIOD_MAX]))); + } } else { $this->setPeriodMax(new FHIRDecimal($data[self::FIELD_PERIOD_MAX])); } @@ -513,8 +569,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PERIOD_UNIT] instanceof FHIRUnitsOfTime) { $this->setPeriodUnit($data[self::FIELD_PERIOD_UNIT]); - } elseif ($ext && is_scalar($data[self::FIELD_PERIOD_UNIT])) { - $this->setPeriodUnit(new FHIRUnitsOfTime([FHIRUnitsOfTime::FIELD_VALUE => $data[self::FIELD_PERIOD_UNIT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PERIOD_UNIT])) { + $this->setPeriodUnit(new FHIRUnitsOfTime([FHIRUnitsOfTime::FIELD_VALUE => $data[self::FIELD_PERIOD_UNIT]] + $ext)); + } else if (is_array($data[self::FIELD_PERIOD_UNIT])) { + $this->setPeriodUnit(new FHIRUnitsOfTime(array_merge($ext, $data[self::FIELD_PERIOD_UNIT]))); + } } else { $this->setPeriodUnit(new FHIRUnitsOfTime($data[self::FIELD_PERIOD_UNIT])); } @@ -525,17 +585,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_TIME_OF_DAY])) { foreach($data[self::FIELD_TIME_OF_DAY] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRTime) { $this->addTimeOfDay($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addTimeOfDay(new FHIRTime([FHIRTime::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addTimeOfDay(new FHIRTime([FHIRTime::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addTimeOfDay(new FHIRTime(array_merge($v, $ext[$i]))); + } } else { $this->addTimeOfDay(new FHIRTime($v)); } } } elseif ($data[self::FIELD_TIME_OF_DAY] instanceof FHIRTime) { $this->addTimeOfDay($data[self::FIELD_TIME_OF_DAY]); - } elseif ($ext && is_scalar($data[self::FIELD_TIME_OF_DAY])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_TIME_OF_DAY])) { $this->addTimeOfDay(new FHIRTime([FHIRTime::FIELD_VALUE => $data[self::FIELD_TIME_OF_DAY]] + $ext)); } else { $this->addTimeOfDay(new FHIRTime($data[self::FIELD_TIME_OF_DAY])); @@ -547,17 +614,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_WHEN])) { foreach($data[self::FIELD_WHEN] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIREventTiming) { $this->addWhen($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addWhen(new FHIREventTiming([FHIREventTiming::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addWhen(new FHIREventTiming([FHIREventTiming::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addWhen(new FHIREventTiming(array_merge($v, $ext[$i]))); + } } else { $this->addWhen(new FHIREventTiming($v)); } } } elseif ($data[self::FIELD_WHEN] instanceof FHIREventTiming) { $this->addWhen($data[self::FIELD_WHEN]); - } elseif ($ext && is_scalar($data[self::FIELD_WHEN])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_WHEN])) { $this->addWhen(new FHIREventTiming([FHIREventTiming::FIELD_VALUE => $data[self::FIELD_WHEN]] + $ext)); } else { $this->addWhen(new FHIREventTiming($data[self::FIELD_WHEN])); @@ -1460,11 +1534,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getBoundsDuration())) { $v->xmlSerialize($sxe->addChild(self::FIELD_BOUNDS_DURATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getBoundsPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_BOUNDS_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getBoundsRange())) { $v->xmlSerialize($sxe->addChild(self::FIELD_BOUNDS_RANGE, null, $v->_getFHIRXMLNamespace())); } @@ -1488,7 +1560,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDurationMax())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DURATION_MAX, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDurationUnit())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DURATION_UNIT, null, $v->_getFHIRXMLNamespace())); } @@ -1507,7 +1578,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getPeriodMax())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PERIOD_MAX, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPeriodUnit())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PERIOD_UNIT, null, $v->_getFHIRXMLNamespace())); } @@ -1519,7 +1589,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_TIME_OF_DAY, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getWhen())) { foreach($vs as $v) { if (null === $v) { @@ -1538,7 +1607,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getBoundsDuration())) { - $a[self::FIELD_BOUNDS_DURATION] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_BOUNDS_DURATION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_BOUNDS_DURATION_EXT] = $enc; + } + } else { + $a[self::FIELD_BOUNDS_DURATION] = $v; + } } if (null !== ($v = $this->getBoundsPeriod())) { $a[self::FIELD_BOUNDS_PERIOD] = $v; @@ -1547,12 +1624,26 @@ public function jsonSerialize() $a[self::FIELD_BOUNDS_RANGE] = $v; } if (null !== ($v = $this->getCount())) { - $a[self::FIELD_COUNT] = $v->getValue(); - $a[self::FIELD_COUNT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_COUNT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_COUNT_EXT] = $enc; + } + } else { + $a[self::FIELD_COUNT] = $v; + } } if (null !== ($v = $this->getCountMax())) { - $a[self::FIELD_COUNT_MAX] = $v->getValue(); - $a[self::FIELD_COUNT_MAX_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_COUNT_MAX] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_COUNT_MAX_EXT] = $enc; + } + } else { + $a[self::FIELD_COUNT_MAX] = $v; + } } if ([] !== ($vs = $this->getDayOfWeek())) { $a[self::FIELD_DAY_OF_WEEK] = []; @@ -1560,43 +1651,117 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_DAY_OF_WEEK][] = $v->getValue(); - $a[self::FIELD_DAY_OF_WEEK_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DAY_OF_WEEK][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DAY_OF_WEEK_EXT][] = $enc; + } else { + $a[self::FIELD_DAY_OF_WEEK_EXT][] = null; + } + } else { + $a[self::FIELD_DAY_OF_WEEK][] = $v; + } } } if (null !== ($v = $this->getDuration())) { - $a[self::FIELD_DURATION] = $v->getValue(); - $a[self::FIELD_DURATION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DURATION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DURATION_EXT] = $enc; + } + } else { + $a[self::FIELD_DURATION] = $v; + } } if (null !== ($v = $this->getDurationMax())) { - $a[self::FIELD_DURATION_MAX] = $v->getValue(); - $a[self::FIELD_DURATION_MAX_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DURATION_MAX] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DURATION_MAX_EXT] = $enc; + } + } else { + $a[self::FIELD_DURATION_MAX] = $v; + } } if (null !== ($v = $this->getDurationUnit())) { - $a[self::FIELD_DURATION_UNIT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DURATION_UNIT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DURATION_UNIT_EXT] = $enc; + } + } else { + $a[self::FIELD_DURATION_UNIT] = $v; + } } if (null !== ($v = $this->getFrequency())) { - $a[self::FIELD_FREQUENCY] = $v->getValue(); - $a[self::FIELD_FREQUENCY_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FREQUENCY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FREQUENCY_EXT] = $enc; + } + } else { + $a[self::FIELD_FREQUENCY] = $v; + } } if (null !== ($v = $this->getFrequencyMax())) { - $a[self::FIELD_FREQUENCY_MAX] = $v->getValue(); - $a[self::FIELD_FREQUENCY_MAX_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FREQUENCY_MAX] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FREQUENCY_MAX_EXT] = $enc; + } + } else { + $a[self::FIELD_FREQUENCY_MAX] = $v; + } } if (null !== ($v = $this->getOffset())) { - $a[self::FIELD_OFFSET] = $v->getValue(); - $a[self::FIELD_OFFSET_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_OFFSET] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_OFFSET_EXT] = $enc; + } + } else { + $a[self::FIELD_OFFSET] = $v; + } } if (null !== ($v = $this->getPeriod())) { - $a[self::FIELD_PERIOD] = $v->getValue(); - $a[self::FIELD_PERIOD_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PERIOD] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PERIOD_EXT] = $enc; + } + } else { + $a[self::FIELD_PERIOD] = $v; + } } if (null !== ($v = $this->getPeriodMax())) { - $a[self::FIELD_PERIOD_MAX] = $v->getValue(); - $a[self::FIELD_PERIOD_MAX_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PERIOD_MAX] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PERIOD_MAX_EXT] = $enc; + } + } else { + $a[self::FIELD_PERIOD_MAX] = $v; + } } if (null !== ($v = $this->getPeriodUnit())) { - $a[self::FIELD_PERIOD_UNIT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PERIOD_UNIT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PERIOD_UNIT_EXT] = $enc; + } + } else { + $a[self::FIELD_PERIOD_UNIT] = $v; + } } if ([] !== ($vs = $this->getTimeOfDay())) { $a[self::FIELD_TIME_OF_DAY] = []; @@ -1604,12 +1769,37 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_TIME_OF_DAY][] = $v->getValue(); - $a[self::FIELD_TIME_OF_DAY_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TIME_OF_DAY][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TIME_OF_DAY_EXT][] = $enc; + } else { + $a[self::FIELD_TIME_OF_DAY_EXT][] = null; + } + } else { + $a[self::FIELD_TIME_OF_DAY][] = $v; + } } } if ([] !== ($vs = $this->getWhen())) { - $a[self::FIELD_WHEN] = $vs; + $a[self::FIELD_WHEN] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_WHEN][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_WHEN_EXT][] = $enc; + } else { + $a[self::FIELD_WHEN_EXT][] = null; + } + } else { + $a[self::FIELD_WHEN][] = $v; + } + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRTriggerDefinition.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRTriggerDefinition.php index bae307e9a4..cfd8545f44 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRTriggerDefinition.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRTriggerDefinition.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRTriggerDefinition extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_TRIGGER_DEFINITION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_EVENT_DATA = 'eventData'; const FIELD_EVENT_NAME = 'eventName'; const FIELD_EVENT_NAME_EXT = '_eventName'; @@ -179,6 +175,9 @@ class FHIRTriggerDefinition extends FHIRElement */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRTriggerDefinition Constructor * @param null|array $data @@ -208,8 +207,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EVENT_NAME] instanceof FHIRString) { $this->setEventName($data[self::FIELD_EVENT_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_EVENT_NAME])) { - $this->setEventName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_EVENT_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EVENT_NAME])) { + $this->setEventName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_EVENT_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_EVENT_NAME])) { + $this->setEventName(new FHIRString(array_merge($ext, $data[self::FIELD_EVENT_NAME]))); + } } else { $this->setEventName(new FHIRString($data[self::FIELD_EVENT_NAME])); } @@ -220,8 +223,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EVENT_TIMING_DATE] instanceof FHIRDate) { $this->setEventTimingDate($data[self::FIELD_EVENT_TIMING_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_EVENT_TIMING_DATE])) { - $this->setEventTimingDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_EVENT_TIMING_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EVENT_TIMING_DATE])) { + $this->setEventTimingDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_EVENT_TIMING_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_EVENT_TIMING_DATE])) { + $this->setEventTimingDate(new FHIRDate(array_merge($ext, $data[self::FIELD_EVENT_TIMING_DATE]))); + } } else { $this->setEventTimingDate(new FHIRDate($data[self::FIELD_EVENT_TIMING_DATE])); } @@ -232,8 +239,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EVENT_TIMING_DATE_TIME] instanceof FHIRDateTime) { $this->setEventTimingDateTime($data[self::FIELD_EVENT_TIMING_DATE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_EVENT_TIMING_DATE_TIME])) { - $this->setEventTimingDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_EVENT_TIMING_DATE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EVENT_TIMING_DATE_TIME])) { + $this->setEventTimingDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_EVENT_TIMING_DATE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_EVENT_TIMING_DATE_TIME])) { + $this->setEventTimingDateTime(new FHIRDateTime(array_merge($ext, $data[self::FIELD_EVENT_TIMING_DATE_TIME]))); + } } else { $this->setEventTimingDateTime(new FHIRDateTime($data[self::FIELD_EVENT_TIMING_DATE_TIME])); } @@ -258,8 +269,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TYPE] instanceof FHIRTriggerType) { $this->setType($data[self::FIELD_TYPE]); - } elseif ($ext && is_scalar($data[self::FIELD_TYPE])) { - $this->setType(new FHIRTriggerType([FHIRTriggerType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TYPE])) { + $this->setType(new FHIRTriggerType([FHIRTriggerType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } else if (is_array($data[self::FIELD_TYPE])) { + $this->setType(new FHIRTriggerType(array_merge($ext, $data[self::FIELD_TYPE]))); + } } else { $this->setType(new FHIRTriggerType($data[self::FIELD_TYPE])); } @@ -658,15 +673,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getEventTimingDateTime())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EVENT_TIMING_DATE_TIME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getEventTimingReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EVENT_TIMING_REFERENCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getEventTimingTiming())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EVENT_TIMING_TIMING, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -683,16 +695,37 @@ public function jsonSerialize() $a[self::FIELD_EVENT_DATA] = $v; } if (null !== ($v = $this->getEventName())) { - $a[self::FIELD_EVENT_NAME] = $v->getValue(); - $a[self::FIELD_EVENT_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EVENT_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EVENT_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_EVENT_NAME] = $v; + } } if (null !== ($v = $this->getEventTimingDate())) { - $a[self::FIELD_EVENT_TIMING_DATE] = $v->getValue(); - $a[self::FIELD_EVENT_TIMING_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EVENT_TIMING_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EVENT_TIMING_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_EVENT_TIMING_DATE] = $v; + } } if (null !== ($v = $this->getEventTimingDateTime())) { - $a[self::FIELD_EVENT_TIMING_DATE_TIME] = $v->getValue(); - $a[self::FIELD_EVENT_TIMING_DATE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EVENT_TIMING_DATE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EVENT_TIMING_DATE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_EVENT_TIMING_DATE_TIME] = $v; + } } if (null !== ($v = $this->getEventTimingReference())) { $a[self::FIELD_EVENT_TIMING_REFERENCE] = $v; @@ -701,7 +734,15 @@ public function jsonSerialize() $a[self::FIELD_EVENT_TIMING_TIMING] = $v; } if (null !== ($v = $this->getType())) { - $a[self::FIELD_TYPE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TYPE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TYPE_EXT] = $enc; + } + } else { + $a[self::FIELD_TYPE] = $v; + } } return $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRTriggerType.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRTriggerType.php index d3305dbf57..b4acf7c736 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRTriggerType.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRTriggerType.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRTriggerType extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_TRIGGER_TYPE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRTriggerType extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRTriggerType Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRTypeDerivationRule.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRTypeDerivationRule.php index b9b235d277..70500f69b4 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRTypeDerivationRule.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRTypeDerivationRule.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRTypeDerivationRule extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_TYPE_DERIVATION_RULE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRTypeDerivationRule extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRTypeDerivationRule Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRTypeRestfulInteraction.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRTypeRestfulInteraction.php index 19de440f9a..4ec4b58e6a 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRTypeRestfulInteraction.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRTypeRestfulInteraction.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRTypeRestfulInteraction extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_TYPE_RESTFUL_INTERACTION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRTypeRestfulInteraction extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRTypeRestfulInteraction Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRUDIEntryType.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRUDIEntryType.php index fa4df0fe18..642d368088 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRUDIEntryType.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRUDIEntryType.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRUDIEntryType extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_UDIENTRY_TYPE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRUDIEntryType extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRUDIEntryType Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRUnitsOfTime.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRUnitsOfTime.php index acf0ee663a..d62a808b71 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRUnitsOfTime.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRUnitsOfTime.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRUnitsOfTime extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_UNITS_OF_TIME; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRUnitsOfTime extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRUnitsOfTime Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRUnknownContentCode.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRUnknownContentCode.php index ed72f193ee..f14381b2b8 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRUnknownContentCode.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRUnknownContentCode.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRUnknownContentCode extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_UNKNOWN_CONTENT_CODE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -90,6 +86,9 @@ class FHIRUnknownContentCode extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRUnknownContentCode Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRUnsignedInt.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRUnsignedInt.php index 3434236721..aa6ebf6659 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRUnsignedInt.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRUnsignedInt.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRUnsignedInt extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_UNSIGNED_INT; - - /** @var string */ - protected $_xmlns = ''; - const FIELD_VALUE = 'value'; /** @@ -90,6 +86,8 @@ class FHIRUnsignedInt extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; /** * FHIRUnsignedInt Constructor diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRUri.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRUri.php index 3eea91ed3f..8551111971 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRUri.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRUri.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRUri extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_URI; - - /** @var string */ - protected $_xmlns = ''; - const FIELD_VALUE = 'value'; /** @@ -90,6 +86,8 @@ class FHIRUri extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; /** * FHIRUri Constructor diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRUsageContext.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRUsageContext.php index fcacf09735..9a54250a09 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRUsageContext.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRUsageContext.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -81,10 +81,6 @@ class FHIRUsageContext extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_USAGE_CONTEXT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CODE = 'code'; const FIELD_VALUE_CODEABLE_CONCEPT = 'valueCodeableConcept'; const FIELD_VALUE_QUANTITY = 'valueQuantity'; @@ -142,6 +138,9 @@ class FHIRUsageContext extends FHIRElement */ protected $valueRange = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRUsageContext Constructor * @param null|array $data @@ -178,8 +177,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_QUANTITY] instanceof FHIRQuantity) { $this->setValueQuantity($data[self::FIELD_VALUE_QUANTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_QUANTITY])) { - $this->setValueQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_VALUE_QUANTITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_QUANTITY])) { + $this->setValueQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_VALUE_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_QUANTITY])) { + $this->setValueQuantity(new FHIRQuantity(array_merge($ext, $data[self::FIELD_VALUE_QUANTITY]))); + } } else { $this->setValueQuantity(new FHIRQuantity($data[self::FIELD_VALUE_QUANTITY])); } @@ -442,15 +445,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_QUANTITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueRange())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_RANGE, null, $v->_getFHIRXMLNamespace())); } @@ -470,7 +470,15 @@ public function jsonSerialize() $a[self::FIELD_VALUE_CODEABLE_CONCEPT] = $v; } if (null !== ($v = $this->getValueQuantity())) { - $a[self::FIELD_VALUE_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_QUANTITY] = $v; + } } if (null !== ($v = $this->getValueRange())) { $a[self::FIELD_VALUE_RANGE] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRUse.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRUse.php index 91e64c0ca2..09a31ac390 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRUse.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRUse.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRUse extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_USE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRUse extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRUse Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRUuid.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRUuid.php index a3fa470dbf..80912ac746 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRUuid.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRUuid.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRUuid extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_UUID; - - /** @var string */ - protected $_xmlns = ''; - const FIELD_VALUE = 'value'; /** @@ -91,6 +87,8 @@ class FHIRUuid extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; /** * FHIRUuid Constructor diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRVisionBase.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRVisionBase.php index 3570cfd3d1..fa6f19d35b 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRVisionBase.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRVisionBase.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRVisionBase extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_VISION_BASE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRVisionBase extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRVisionBase Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRVisionEyes.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRVisionEyes.php index 5b845e0321..73da017c23 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRVisionEyes.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRVisionEyes.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -78,10 +78,6 @@ class FHIRVisionEyes extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_VISION_EYES; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -89,6 +85,9 @@ class FHIRVisionEyes extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRVisionEyes Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRXPathUsageType.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRXPathUsageType.php index 89d958c1c6..f9662da90a 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRXPathUsageType.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRElement/FHIRXPathUsageType.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -79,10 +79,6 @@ class FHIRXPathUsageType extends FHIRElement { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_XPATH_USAGE_TYPE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_VALUE = 'value'; /** @@ -90,6 +86,9 @@ class FHIRXPathUsageType extends FHIRElement */ protected $value = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRXPathUsageType Constructor * @param null|array $data diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIREncounterLocationStatusList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIREncounterLocationStatusList.php index 8eaba22a23..aaf28a36e1 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIREncounterLocationStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIREncounterLocationStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIREncounterStatusList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIREncounterStatusList.php index c519335624..dc76b0872c 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIREncounterStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIREncounterStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIREndpointStatusList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIREndpointStatusList.php index a490fdc0ac..bf67b458d1 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIREndpointStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIREndpointStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIREpisodeOfCareStatusList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIREpisodeOfCareStatusList.php index e704e989f7..1f840c4555 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIREpisodeOfCareStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIREpisodeOfCareStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIREventCapabilityModeList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIREventCapabilityModeList.php index f30e448e36..9d84a97204 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIREventCapabilityModeList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIREventCapabilityModeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIREventStatusList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIREventStatusList.php index abd0fe6450..528a2a574c 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIREventStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIREventStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIREventTimingList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIREventTimingList.php index 72cca1f2c2..03c6086231 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIREventTimingList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIREventTimingList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRExplanationOfBenefitStatusList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRExplanationOfBenefitStatusList.php index a8ddc4a3d4..0aaee81851 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRExplanationOfBenefitStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRExplanationOfBenefitStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRExtensionContextList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRExtensionContextList.php index 2e469fbabb..c5f1dace35 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRExtensionContextList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRExtensionContextList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRFHIRAllTypesList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRFHIRAllTypesList.php index 5c77d2655b..0bb05fb363 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRFHIRAllTypesList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRFHIRAllTypesList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRFHIRDefinedTypeList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRFHIRDefinedTypeList.php index 43022d0299..9c340dee27 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRFHIRDefinedTypeList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRFHIRDefinedTypeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRFHIRDeviceStatusList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRFHIRDeviceStatusList.php index e10edc38ce..8c78c5a92b 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRFHIRDeviceStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRFHIRDeviceStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRFHIRSubstanceStatusList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRFHIRSubstanceStatusList.php index 85ffe8dfbf..7f44df7f0f 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRFHIRSubstanceStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRFHIRSubstanceStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRFamilyHistoryStatusList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRFamilyHistoryStatusList.php index a015bff684..83418ce8df 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRFamilyHistoryStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRFamilyHistoryStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRFilterOperatorList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRFilterOperatorList.php index 115f0b97fd..a2093e218a 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRFilterOperatorList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRFilterOperatorList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRFinancialResourceStatusCodesList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRFinancialResourceStatusCodesList.php index af65bc4c62..7a018145b2 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRFinancialResourceStatusCodesList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRFinancialResourceStatusCodesList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRFlagStatusList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRFlagStatusList.php index ec9c26dd01..20381e94a8 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRFlagStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRFlagStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRGoalStatusList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRGoalStatusList.php index 0935e00298..5d85bda731 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRGoalStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRGoalStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRGraphCompartmentRuleList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRGraphCompartmentRuleList.php index e1457f2038..ecb5697c7b 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRGraphCompartmentRuleList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRGraphCompartmentRuleList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRGroupTypeList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRGroupTypeList.php index 70a4453b3d..cdb47d2c9e 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRGroupTypeList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRGroupTypeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRGuidanceResponseStatusList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRGuidanceResponseStatusList.php index cd1fc53b6a..90ea3e59a4 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRGuidanceResponseStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRGuidanceResponseStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRGuideDependencyTypeList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRGuideDependencyTypeList.php index f4d28b5ad1..fd332b281f 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRGuideDependencyTypeList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRGuideDependencyTypeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRGuidePageKindList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRGuidePageKindList.php index c72052afb5..a87438e97f 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRGuidePageKindList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRGuidePageKindList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRHTTPVerbList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRHTTPVerbList.php index 76c5b45889..feb4b08b91 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRHTTPVerbList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRHTTPVerbList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRIdPrimitive.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRIdPrimitive.php index 06dd887127..09cdc51e7a 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRIdPrimitive.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRIdPrimitive.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRIdentifierUseList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRIdentifierUseList.php index 24c99b52c7..9df0bfd7b6 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRIdentifierUseList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRIdentifierUseList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRIdentityAssuranceLevelList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRIdentityAssuranceLevelList.php index 52e1bfb4bc..6cf11e3b80 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRIdentityAssuranceLevelList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRIdentityAssuranceLevelList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRImmunizationStatusCodesList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRImmunizationStatusCodesList.php index 62250b41c0..4fb25089e1 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRImmunizationStatusCodesList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRImmunizationStatusCodesList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRInstanceAvailabilityList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRInstanceAvailabilityList.php index 642c49aaa7..1d3a54a1ee 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRInstanceAvailabilityList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRInstanceAvailabilityList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRInstantPrimitive.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRInstantPrimitive.php index d41ba0fafb..cc9db8e714 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRInstantPrimitive.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRInstantPrimitive.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRIntegerPrimitive.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRIntegerPrimitive.php index c97e9de724..3f4a9dc8ba 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRIntegerPrimitive.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRIntegerPrimitive.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRIssueSeverityList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRIssueSeverityList.php index 2b81f29f27..6ba094ab77 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRIssueSeverityList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRIssueSeverityList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRIssueTypeList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRIssueTypeList.php index 82fc2d7b11..76d07fdf2c 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRIssueTypeList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRIssueTypeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRLinkTypeList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRLinkTypeList.php index 94bce9b085..b74be8f39a 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRLinkTypeList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRLinkTypeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRLinkageTypeList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRLinkageTypeList.php index 6366bf7b97..61f886d184 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRLinkageTypeList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRLinkageTypeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRListModeList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRListModeList.php index 8e3c91af90..01549b398a 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRListModeList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRListModeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRListStatusList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRListStatusList.php index 3e70b2e9ed..ccf2d91a12 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRListStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRListStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRLocationModeList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRLocationModeList.php index 7565ce4c5d..b837b3eb4b 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRLocationModeList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRLocationModeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRLocationStatusList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRLocationStatusList.php index cc6f159bc8..4c596c706a 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRLocationStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRLocationStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRMarkdownPrimitive.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRMarkdownPrimitive.php index 0020a3032e..c8e4217665 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRMarkdownPrimitive.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRMarkdownPrimitive.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRMeasmntPrincipleList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRMeasmntPrincipleList.php index da932bb98c..d39ad0dc95 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRMeasmntPrincipleList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRMeasmntPrincipleList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRMeasureReportStatusList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRMeasureReportStatusList.php index e2331dd3a7..56f15a83b7 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRMeasureReportStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRMeasureReportStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRMeasureReportTypeList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRMeasureReportTypeList.php index c29cae01f9..2c91c9f25e 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRMeasureReportTypeList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRMeasureReportTypeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRMedicationAdministrationStatusList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRMedicationAdministrationStatusList.php index a795f7b8d1..5c55671f54 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRMedicationAdministrationStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRMedicationAdministrationStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRMedicationDispenseStatusList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRMedicationDispenseStatusList.php index 9ac5748ab0..2011994627 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRMedicationDispenseStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRMedicationDispenseStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRMedicationRequestIntentList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRMedicationRequestIntentList.php index c038474d35..7d8eb45f6b 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRMedicationRequestIntentList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRMedicationRequestIntentList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRMedicationRequestPriorityList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRMedicationRequestPriorityList.php index 3777dda830..96b12e47a4 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRMedicationRequestPriorityList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRMedicationRequestPriorityList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRMedicationRequestStatusList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRMedicationRequestStatusList.php index c265b44d17..839365a5ce 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRMedicationRequestStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRMedicationRequestStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRMedicationStatementStatusList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRMedicationStatementStatusList.php index 9892e49e68..7ee1f89842 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRMedicationStatementStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRMedicationStatementStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRMedicationStatementTakenList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRMedicationStatementTakenList.php index 7dc4d1f2e3..53aaccc208 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRMedicationStatementTakenList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRMedicationStatementTakenList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRMedicationStatusList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRMedicationStatusList.php index 93900d9e66..a132475390 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRMedicationStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRMedicationStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRMessageSignificanceCategoryList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRMessageSignificanceCategoryList.php index a878104fae..eba985585e 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRMessageSignificanceCategoryList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRMessageSignificanceCategoryList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRNameUseList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRNameUseList.php index e67df5669b..b5be09ab50 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRNameUseList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRNameUseList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRNamingSystemIdentifierTypeList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRNamingSystemIdentifierTypeList.php index 6a26f674b5..3d26d5653f 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRNamingSystemIdentifierTypeList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRNamingSystemIdentifierTypeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRNamingSystemTypeList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRNamingSystemTypeList.php index 66d4610389..d926958b5e 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRNamingSystemTypeList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRNamingSystemTypeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRNarrativeStatusList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRNarrativeStatusList.php index 8597bdd241..3dad4c1a92 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRNarrativeStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRNarrativeStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRNoteTypeList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRNoteTypeList.php index e579aafd51..69bce43b84 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRNoteTypeList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRNoteTypeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRNutritionOrderStatusList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRNutritionOrderStatusList.php index 33ce0929ea..97ff1bd041 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRNutritionOrderStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRNutritionOrderStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRObservationRelationshipTypeList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRObservationRelationshipTypeList.php index 70dc067fcf..81a3f615c8 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRObservationRelationshipTypeList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRObservationRelationshipTypeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRObservationStatusList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRObservationStatusList.php index 755f2fb2b2..7c92063a21 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRObservationStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRObservationStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIROidPrimitive.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIROidPrimitive.php index 99f31ea042..1dd5e8d7e1 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIROidPrimitive.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIROidPrimitive.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIROperationKindList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIROperationKindList.php index b526844d53..17614100d9 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIROperationKindList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIROperationKindList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIROperationParameterUseList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIROperationParameterUseList.php index 6f981dbdcd..ded29cedf2 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIROperationParameterUseList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIROperationParameterUseList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRParticipantRequiredList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRParticipantRequiredList.php index 80f25aec09..a2ab3b3ebc 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRParticipantRequiredList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRParticipantRequiredList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRParticipationStatusList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRParticipationStatusList.php index 27f2e9a7ab..8a33a2c42f 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRParticipationStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRParticipationStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRPositiveIntPrimitive.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRPositiveIntPrimitive.php index c65c826061..cd33db7d8e 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRPositiveIntPrimitive.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRPositiveIntPrimitive.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRPropertyRepresentationList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRPropertyRepresentationList.php index 9c63c9d16a..4e34d8581d 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRPropertyRepresentationList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRPropertyRepresentationList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRPropertyTypeList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRPropertyTypeList.php index 2f1f129b10..bbbf49093d 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRPropertyTypeList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRPropertyTypeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRProvenanceEntityRoleList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRProvenanceEntityRoleList.php index a2479bcab7..ce7f61556a 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRProvenanceEntityRoleList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRProvenanceEntityRoleList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRPublicationStatusList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRPublicationStatusList.php index eaa6dffbf7..8b9124c69d 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRPublicationStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRPublicationStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRQualityTypeList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRQualityTypeList.php index b38101276f..79f65382ea 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRQualityTypeList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRQualityTypeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRQuantityComparatorList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRQuantityComparatorList.php index da8b044101..c5e86d68a9 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRQuantityComparatorList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRQuantityComparatorList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRQuestionnaireItemTypeList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRQuestionnaireItemTypeList.php index 2db75b8ae6..53b7d2b54c 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRQuestionnaireItemTypeList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRQuestionnaireItemTypeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRQuestionnaireResponseStatusList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRQuestionnaireResponseStatusList.php index 02ba3c36bc..8091ffc69e 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRQuestionnaireResponseStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRQuestionnaireResponseStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRReferenceHandlingPolicyList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRReferenceHandlingPolicyList.php index 3ab2ad4de0..5eb55fc39a 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRReferenceHandlingPolicyList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRReferenceHandlingPolicyList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRReferenceVersionRulesList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRReferenceVersionRulesList.php index 103233125f..1ba5e49824 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRReferenceVersionRulesList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRReferenceVersionRulesList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRRelatedArtifactTypeList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRRelatedArtifactTypeList.php index d13f856cb3..af6367bf21 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRRelatedArtifactTypeList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRRelatedArtifactTypeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRRemittanceOutcomeList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRRemittanceOutcomeList.php index 0eee98ca35..2dd1a01f5e 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRRemittanceOutcomeList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRRemittanceOutcomeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRRepositoryTypeList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRRepositoryTypeList.php index e8009ef830..703aaf4243 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRRepositoryTypeList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRRepositoryTypeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRRequestIntentList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRRequestIntentList.php index 919934b979..78fa60d348 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRRequestIntentList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRRequestIntentList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRRequestPriorityList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRRequestPriorityList.php index 7cec774ee0..c1c79f3238 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRRequestPriorityList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRRequestPriorityList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRRequestStatusList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRRequestStatusList.php index 3fb1dac4d3..35b92ae07a 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRRequestStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRRequestStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResearchStudyStatusList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResearchStudyStatusList.php index a395e94a1f..66cc68f961 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResearchStudyStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResearchStudyStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResearchSubjectStatusList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResearchSubjectStatusList.php index 291c7ce790..7b29a61efc 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResearchSubjectStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResearchSubjectStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource.php index 3171f5b9fc..1167157efa 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -79,9 +79,7 @@ class FHIRResource implements PHPFHIRCommentContainerInterface, PHPFHIRTypeInter // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_RESOURCE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; + const FIELD_FHIR_COMMENTS = 'fhir_comments'; const FIELD_ID = 'id'; const FIELD_ID_EXT = '_id'; @@ -145,6 +143,9 @@ class FHIRResource implements PHPFHIRCommentContainerInterface, PHPFHIRTypeInter */ protected $meta = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRResource Constructor * @param null|array $data @@ -160,14 +161,25 @@ public function __construct($data = null) gettype($data) )); } + if (isset($data[self::FIELD_FHIR_COMMENTS])) { + if (is_array($data[self::FIELD_FHIR_COMMENTS])) { + $this->_setFHIRComments($data[self::FIELD_FHIR_COMMENTS]); + } else if (is_string($data[self::FIELD_FHIR_COMMENTS])) { + $this->_addFHIRComment($data[self::FIELD_FHIR_COMMENTS]); + } + } if (isset($data[self::FIELD_ID])) { $ext = (isset($data[self::FIELD_ID_EXT]) && is_array($data[self::FIELD_ID_EXT])) ? $data[self::FIELD_ID_EXT] : null; if ($data[self::FIELD_ID] instanceof FHIRId) { $this->setId($data[self::FIELD_ID]); - } elseif ($ext && is_scalar($data[self::FIELD_ID])) { - $this->setId(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_ID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ID])) { + $this->setId(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_ID]] + $ext)); + } else if (is_array($data[self::FIELD_ID])) { + $this->setId(new FHIRId(array_merge($ext, $data[self::FIELD_ID]))); + } } else { $this->setId(new FHIRId($data[self::FIELD_ID])); } @@ -178,8 +190,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IMPLICIT_RULES] instanceof FHIRUri) { $this->setImplicitRules($data[self::FIELD_IMPLICIT_RULES]); - } elseif ($ext && is_scalar($data[self::FIELD_IMPLICIT_RULES])) { - $this->setImplicitRules(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_IMPLICIT_RULES]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IMPLICIT_RULES])) { + $this->setImplicitRules(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_IMPLICIT_RULES]] + $ext)); + } else if (is_array($data[self::FIELD_IMPLICIT_RULES])) { + $this->setImplicitRules(new FHIRUri(array_merge($ext, $data[self::FIELD_IMPLICIT_RULES]))); + } } else { $this->setImplicitRules(new FHIRUri($data[self::FIELD_IMPLICIT_RULES])); } @@ -190,8 +206,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_LANGUAGE] instanceof FHIRCode) { $this->setLanguage($data[self::FIELD_LANGUAGE]); - } elseif ($ext && is_scalar($data[self::FIELD_LANGUAGE])) { - $this->setLanguage(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_LANGUAGE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_LANGUAGE])) { + $this->setLanguage(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_LANGUAGE]] + $ext)); + } else if (is_array($data[self::FIELD_LANGUAGE])) { + $this->setLanguage(new FHIRCode(array_merge($ext, $data[self::FIELD_LANGUAGE]))); + } } else { $this->setLanguage(new FHIRCode($data[self::FIELD_LANGUAGE])); } @@ -487,6 +507,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } + if (null !== ($v = $this->getId())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ID, null, $v->_getFHIRXMLNamespace())); } @@ -496,7 +517,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getLanguage())) { $v->xmlSerialize($sxe->addChild(self::FIELD_LANGUAGE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getMeta())) { $v->xmlSerialize($sxe->addChild(self::FIELD_META, null, $v->_getFHIRXMLNamespace())); } @@ -509,17 +529,41 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 public function jsonSerialize() { $a = []; + if ([] !== ($vs = $this->_getFHIRComments())) { + $a[self::FIELD_FHIR_COMMENTS] = $vs; + } if (null !== ($v = $this->getId())) { - $a[self::FIELD_ID] = $v->getValue(); - $a[self::FIELD_ID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ID_EXT] = $enc; + } + } else { + $a[self::FIELD_ID] = $v; + } } if (null !== ($v = $this->getImplicitRules())) { - $a[self::FIELD_IMPLICIT_RULES] = $v->getValue(); - $a[self::FIELD_IMPLICIT_RULES_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IMPLICIT_RULES] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IMPLICIT_RULES_EXT] = $enc; + } + } else { + $a[self::FIELD_IMPLICIT_RULES] = $v; + } } if (null !== ($v = $this->getLanguage())) { - $a[self::FIELD_LANGUAGE] = $v->getValue(); - $a[self::FIELD_LANGUAGE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_LANGUAGE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_LANGUAGE_EXT] = $enc; + } + } else { + $a[self::FIELD_LANGUAGE] = $v; + } } if (null !== ($v = $this->getMeta())) { $a[self::FIELD_META] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRBinary.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRBinary.php index 781f602879..8e4a04ee87 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRBinary.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRBinary.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -82,10 +82,6 @@ class FHIRBinary extends FHIRResource implements PHPFHIRContainedTypeInterface { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_BINARY; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CONTENT = 'content'; const FIELD_CONTENT_EXT = '_content'; const FIELD_CONTENT_TYPE = 'contentType'; @@ -126,6 +122,9 @@ class FHIRBinary extends FHIRResource implements PHPFHIRContainedTypeInterface */ protected $securityContext = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRBinary Constructor * @param null|array $data @@ -148,8 +147,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CONTENT] instanceof FHIRBase64Binary) { $this->setContent($data[self::FIELD_CONTENT]); - } elseif ($ext && is_scalar($data[self::FIELD_CONTENT])) { - $this->setContent(new FHIRBase64Binary([FHIRBase64Binary::FIELD_VALUE => $data[self::FIELD_CONTENT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CONTENT])) { + $this->setContent(new FHIRBase64Binary([FHIRBase64Binary::FIELD_VALUE => $data[self::FIELD_CONTENT]] + $ext)); + } else if (is_array($data[self::FIELD_CONTENT])) { + $this->setContent(new FHIRBase64Binary(array_merge($ext, $data[self::FIELD_CONTENT]))); + } } else { $this->setContent(new FHIRBase64Binary($data[self::FIELD_CONTENT])); } @@ -160,8 +163,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CONTENT_TYPE] instanceof FHIRCode) { $this->setContentType($data[self::FIELD_CONTENT_TYPE]); - } elseif ($ext && is_scalar($data[self::FIELD_CONTENT_TYPE])) { - $this->setContentType(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_CONTENT_TYPE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CONTENT_TYPE])) { + $this->setContentType(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_CONTENT_TYPE]] + $ext)); + } else if (is_array($data[self::FIELD_CONTENT_TYPE])) { + $this->setContentType(new FHIRCode(array_merge($ext, $data[self::FIELD_CONTENT_TYPE]))); + } } else { $this->setContentType(new FHIRCode($data[self::FIELD_CONTENT_TYPE])); } @@ -405,13 +412,13 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getContent())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CONTENT, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getContentType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CONTENT_TYPE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSecurityContext())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SECURITY_CONTEXT, null, $v->_getFHIRXMLNamespace())); } @@ -425,12 +432,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getContent())) { - $a[self::FIELD_CONTENT] = $v->getValue(); - $a[self::FIELD_CONTENT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CONTENT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CONTENT_EXT] = $enc; + } + } else { + $a[self::FIELD_CONTENT] = $v; + } } if (null !== ($v = $this->getContentType())) { - $a[self::FIELD_CONTENT_TYPE] = $v->getValue(); - $a[self::FIELD_CONTENT_TYPE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CONTENT_TYPE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CONTENT_TYPE_EXT] = $enc; + } + } else { + $a[self::FIELD_CONTENT_TYPE] = $v; + } } if (null !== ($v = $this->getSecurityContext())) { $a[self::FIELD_SECURITY_CONTEXT] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRBundle.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRBundle.php index 85834882ec..2933d1b0c8 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRBundle.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRBundle.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -84,10 +84,6 @@ class FHIRBundle extends FHIRResource implements PHPFHIRContainedTypeInterface { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_BUNDLE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ENTRY = 'entry'; const FIELD_IDENTIFIER = 'identifier'; const FIELD_IDENTIFIER_EXT = '_identifier'; @@ -165,6 +161,9 @@ class FHIRBundle extends FHIRResource implements PHPFHIRContainedTypeInterface */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRBundle Constructor * @param null|array $data @@ -184,6 +183,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ENTRY])) { if (is_array($data[self::FIELD_ENTRY])) { foreach($data[self::FIELD_ENTRY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRBundleEntry) { $this->addEntry($v); } else { @@ -202,8 +204,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->setIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { - $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_IDENTIFIER]))); + } } else { $this->setIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); } @@ -211,6 +217,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_LINK])) { if (is_array($data[self::FIELD_LINK])) { foreach($data[self::FIELD_LINK] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRBundleLink) { $this->addLink($v); } else { @@ -236,8 +245,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TOTAL] instanceof FHIRUnsignedInt) { $this->setTotal($data[self::FIELD_TOTAL]); - } elseif ($ext && is_scalar($data[self::FIELD_TOTAL])) { - $this->setTotal(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_TOTAL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TOTAL])) { + $this->setTotal(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_TOTAL]] + $ext)); + } else if (is_array($data[self::FIELD_TOTAL])) { + $this->setTotal(new FHIRUnsignedInt(array_merge($ext, $data[self::FIELD_TOTAL]))); + } } else { $this->setTotal(new FHIRUnsignedInt($data[self::FIELD_TOTAL])); } @@ -248,8 +261,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TYPE] instanceof FHIRBundleType) { $this->setType($data[self::FIELD_TYPE]); - } elseif ($ext && is_scalar($data[self::FIELD_TYPE])) { - $this->setType(new FHIRBundleType([FHIRBundleType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TYPE])) { + $this->setType(new FHIRBundleType([FHIRBundleType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } else if (is_array($data[self::FIELD_TYPE])) { + $this->setType(new FHIRBundleType(array_merge($ext, $data[self::FIELD_TYPE]))); + } } else { $this->setType(new FHIRBundleType($data[self::FIELD_TYPE])); } @@ -636,11 +653,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_ENTRY, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getLink())) { foreach($vs as $v) { if (null === $v) { @@ -649,14 +664,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_LINK, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getSignature())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SIGNATURE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getTotal())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TOTAL, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -673,7 +686,15 @@ public function jsonSerialize() $a[self::FIELD_ENTRY] = $vs; } if (null !== ($v = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_IDENTIFIER] = $v; + } } if ([] !== ($vs = $this->getLink())) { $a[self::FIELD_LINK] = $vs; @@ -682,11 +703,26 @@ public function jsonSerialize() $a[self::FIELD_SIGNATURE] = $v; } if (null !== ($v = $this->getTotal())) { - $a[self::FIELD_TOTAL] = $v->getValue(); - $a[self::FIELD_TOTAL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TOTAL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TOTAL_EXT] = $enc; + } + } else { + $a[self::FIELD_TOTAL] = $v; + } } if (null !== ($v = $this->getType())) { - $a[self::FIELD_TYPE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TYPE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TYPE_EXT] = $enc; + } + } else { + $a[self::FIELD_TYPE] = $v; + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource.php index adb9ba5ad4..8430ef68df 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIRDomainResource extends FHIRResource { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DOMAIN_RESOURCE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CONTAINED = 'contained'; const FIELD_EXTENSION = 'extension'; const FIELD_MODIFIER_EXTENSION = 'modifierExtension'; @@ -148,6 +144,9 @@ class FHIRDomainResource extends FHIRResource */ protected $text = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRDomainResource Constructor * @param null|array $data @@ -185,6 +184,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_EXTENSION])) { if (is_array($data[self::FIELD_EXTENSION])) { foreach($data[self::FIELD_EXTENSION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRExtension) { $this->addExtension($v); } else { @@ -200,6 +202,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_MODIFIER_EXTENSION])) { if (is_array($data[self::FIELD_MODIFIER_EXTENSION])) { foreach($data[self::FIELD_MODIFIER_EXTENSION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRExtension) { $this->addModifierExtension($v); } else { @@ -611,7 +616,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($tsxe->addChild($v->_getFHIRTypeName(), null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getExtension())) { foreach($vs as $v) { if (null === $v) { @@ -620,7 +624,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_EXTENSION, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getModifierExtension())) { foreach($vs as $v) { if (null === $v) { @@ -629,7 +632,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_MODIFIER_EXTENSION, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getText())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TEXT, null, $v->_getFHIRXMLNamespace())); } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRAccount.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRAccount.php index c6bf7bc5a0..cd2e6faf4e 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRAccount.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRAccount.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -88,12 +88,9 @@ class FHIRAccount extends FHIRDomainResource implements PHPFHIRContainedTypeInte { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ACCOUNT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ACTIVE = 'active'; const FIELD_BALANCE = 'balance'; + const FIELD_BALANCE_EXT = '_balance'; const FIELD_COVERAGE = 'coverage'; const FIELD_DESCRIPTION = 'description'; const FIELD_DESCRIPTION_EXT = '_description'; @@ -248,6 +245,9 @@ class FHIRAccount extends FHIRDomainResource implements PHPFHIRContainedTypeInte */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRAccount Constructor * @param null|array $data @@ -272,8 +272,17 @@ public function __construct($data = null) } } if (isset($data[self::FIELD_BALANCE])) { + $ext = (isset($data[self::FIELD_BALANCE_EXT]) && is_array($data[self::FIELD_BALANCE_EXT])) + ? $data[self::FIELD_BALANCE_EXT] + : null; if ($data[self::FIELD_BALANCE] instanceof FHIRMoney) { $this->setBalance($data[self::FIELD_BALANCE]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_BALANCE])) { + $this->setBalance(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_BALANCE]] + $ext)); + } else if (is_array($data[self::FIELD_BALANCE])) { + $this->setBalance(new FHIRMoney(array_merge($ext, $data[self::FIELD_BALANCE]))); + } } else { $this->setBalance(new FHIRMoney($data[self::FIELD_BALANCE])); } @@ -281,6 +290,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_COVERAGE])) { if (is_array($data[self::FIELD_COVERAGE])) { foreach($data[self::FIELD_COVERAGE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRAccountCoverage) { $this->addCoverage($v); } else { @@ -299,8 +311,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -308,6 +324,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_GUARANTOR])) { if (is_array($data[self::FIELD_GUARANTOR])) { foreach($data[self::FIELD_GUARANTOR] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRAccountGuarantor) { $this->addGuarantor($v); } else { @@ -326,17 +345,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -348,8 +374,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -374,8 +404,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRAccountStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRAccountStatus([FHIRAccountStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRAccountStatus([FHIRAccountStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRAccountStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRAccountStatus($data[self::FIELD_STATUS])); } @@ -1023,11 +1057,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getActive())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ACTIVE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getBalance())) { $v->xmlSerialize($sxe->addChild(self::FIELD_BALANCE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getCoverage())) { foreach($vs as $v) { if (null === $v) { @@ -1039,7 +1071,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESCRIPTION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getGuarantor())) { foreach($vs as $v) { if (null === $v) { @@ -1048,7 +1079,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_GUARANTOR, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -1060,23 +1090,18 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NAME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOwner())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OWNER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSubject())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBJECT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -1093,24 +1118,62 @@ public function jsonSerialize() $a[self::FIELD_ACTIVE] = $v; } if (null !== ($v = $this->getBalance())) { - $a[self::FIELD_BALANCE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_BALANCE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_BALANCE_EXT] = $enc; + } + } else { + $a[self::FIELD_BALANCE] = $v; + } } if ([] !== ($vs = $this->getCoverage())) { $a[self::FIELD_COVERAGE] = $vs; } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if ([] !== ($vs = $this->getGuarantor())) { $a[self::FIELD_GUARANTOR] = $vs; } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if (null !== ($v = $this->getOwner())) { $a[self::FIELD_OWNER] = $v; @@ -1119,7 +1182,15 @@ public function jsonSerialize() $a[self::FIELD_PERIOD] = $v; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getSubject())) { $a[self::FIELD_SUBJECT] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRActivityDefinition.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRActivityDefinition.php index 0ffd44c886..18a831ffb8 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRActivityDefinition.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRActivityDefinition.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -101,10 +101,6 @@ class FHIRActivityDefinition extends FHIRDomainResource implements PHPFHIRContai { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ACTIVITY_DEFINITION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_APPROVAL_DATE = 'approvalDate'; const FIELD_APPROVAL_DATE_EXT = '_approvalDate'; const FIELD_BODY_SITE = 'bodySite'; @@ -670,6 +666,9 @@ class FHIRActivityDefinition extends FHIRDomainResource implements PHPFHIRContai */ protected $version = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRActivityDefinition Constructor * @param null|array $data @@ -692,8 +691,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_APPROVAL_DATE] instanceof FHIRDate) { $this->setApprovalDate($data[self::FIELD_APPROVAL_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_APPROVAL_DATE])) { - $this->setApprovalDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_APPROVAL_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_APPROVAL_DATE])) { + $this->setApprovalDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_APPROVAL_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_APPROVAL_DATE])) { + $this->setApprovalDate(new FHIRDate(array_merge($ext, $data[self::FIELD_APPROVAL_DATE]))); + } } else { $this->setApprovalDate(new FHIRDate($data[self::FIELD_APPROVAL_DATE])); } @@ -701,6 +704,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_BODY_SITE])) { if (is_array($data[self::FIELD_BODY_SITE])) { foreach($data[self::FIELD_BODY_SITE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addBodySite($v); } else { @@ -723,6 +729,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CONTACT])) { if (is_array($data[self::FIELD_CONTACT])) { foreach($data[self::FIELD_CONTACT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContactDetail) { $this->addContact($v); } else { @@ -738,6 +747,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CONTRIBUTOR])) { if (is_array($data[self::FIELD_CONTRIBUTOR])) { foreach($data[self::FIELD_CONTRIBUTOR] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContributor) { $this->addContributor($v); } else { @@ -756,8 +768,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_COPYRIGHT] instanceof FHIRMarkdown) { $this->setCopyright($data[self::FIELD_COPYRIGHT]); - } elseif ($ext && is_scalar($data[self::FIELD_COPYRIGHT])) { - $this->setCopyright(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_COPYRIGHT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_COPYRIGHT])) { + $this->setCopyright(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_COPYRIGHT]] + $ext)); + } else if (is_array($data[self::FIELD_COPYRIGHT])) { + $this->setCopyright(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_COPYRIGHT]))); + } } else { $this->setCopyright(new FHIRMarkdown($data[self::FIELD_COPYRIGHT])); } @@ -768,8 +784,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATE] instanceof FHIRDateTime) { $this->setDate($data[self::FIELD_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_DATE])) { - $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime(array_merge($ext, $data[self::FIELD_DATE]))); + } } else { $this->setDate(new FHIRDateTime($data[self::FIELD_DATE])); } @@ -780,8 +800,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRMarkdown) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRMarkdown($data[self::FIELD_DESCRIPTION])); } @@ -789,6 +813,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_DOSAGE])) { if (is_array($data[self::FIELD_DOSAGE])) { foreach($data[self::FIELD_DOSAGE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRDosage) { $this->addDosage($v); } else { @@ -804,6 +831,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_DYNAMIC_VALUE])) { if (is_array($data[self::FIELD_DYNAMIC_VALUE])) { foreach($data[self::FIELD_DYNAMIC_VALUE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRActivityDefinitionDynamicValue) { $this->addDynamicValue($v); } else { @@ -829,8 +859,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EXPERIMENTAL] instanceof FHIRBoolean) { $this->setExperimental($data[self::FIELD_EXPERIMENTAL]); - } elseif ($ext && is_scalar($data[self::FIELD_EXPERIMENTAL])) { - $this->setExperimental(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_EXPERIMENTAL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EXPERIMENTAL])) { + $this->setExperimental(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_EXPERIMENTAL]] + $ext)); + } else if (is_array($data[self::FIELD_EXPERIMENTAL])) { + $this->setExperimental(new FHIRBoolean(array_merge($ext, $data[self::FIELD_EXPERIMENTAL]))); + } } else { $this->setExperimental(new FHIRBoolean($data[self::FIELD_EXPERIMENTAL])); } @@ -841,17 +875,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -860,6 +901,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_JURISDICTION])) { if (is_array($data[self::FIELD_JURISDICTION])) { foreach($data[self::FIELD_JURISDICTION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addJurisdiction($v); } else { @@ -881,8 +925,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_LAST_REVIEW_DATE] instanceof FHIRDate) { $this->setLastReviewDate($data[self::FIELD_LAST_REVIEW_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_LAST_REVIEW_DATE])) { - $this->setLastReviewDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_LAST_REVIEW_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_LAST_REVIEW_DATE])) { + $this->setLastReviewDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_LAST_REVIEW_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_LAST_REVIEW_DATE])) { + $this->setLastReviewDate(new FHIRDate(array_merge($ext, $data[self::FIELD_LAST_REVIEW_DATE]))); + } } else { $this->setLastReviewDate(new FHIRDate($data[self::FIELD_LAST_REVIEW_DATE])); } @@ -890,6 +938,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_LIBRARY])) { if (is_array($data[self::FIELD_LIBRARY])) { foreach($data[self::FIELD_LIBRARY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addLibrary($v); } else { @@ -915,8 +966,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -924,6 +979,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PARTICIPANT])) { if (is_array($data[self::FIELD_PARTICIPANT])) { foreach($data[self::FIELD_PARTICIPANT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRActivityDefinitionParticipant) { $this->addParticipant($v); } else { @@ -956,8 +1014,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PUBLISHER] instanceof FHIRString) { $this->setPublisher($data[self::FIELD_PUBLISHER]); - } elseif ($ext && is_scalar($data[self::FIELD_PUBLISHER])) { - $this->setPublisher(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PUBLISHER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PUBLISHER])) { + $this->setPublisher(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PUBLISHER]] + $ext)); + } else if (is_array($data[self::FIELD_PUBLISHER])) { + $this->setPublisher(new FHIRString(array_merge($ext, $data[self::FIELD_PUBLISHER]))); + } } else { $this->setPublisher(new FHIRString($data[self::FIELD_PUBLISHER])); } @@ -968,8 +1030,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PURPOSE] instanceof FHIRMarkdown) { $this->setPurpose($data[self::FIELD_PURPOSE]); - } elseif ($ext && is_scalar($data[self::FIELD_PURPOSE])) { - $this->setPurpose(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_PURPOSE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PURPOSE])) { + $this->setPurpose(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_PURPOSE]] + $ext)); + } else if (is_array($data[self::FIELD_PURPOSE])) { + $this->setPurpose(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_PURPOSE]))); + } } else { $this->setPurpose(new FHIRMarkdown($data[self::FIELD_PURPOSE])); } @@ -980,8 +1046,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_QUANTITY] instanceof FHIRQuantity) { $this->setQuantity($data[self::FIELD_QUANTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_QUANTITY])) { - $this->setQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_QUANTITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_QUANTITY])) { + $this->setQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_QUANTITY])) { + $this->setQuantity(new FHIRQuantity(array_merge($ext, $data[self::FIELD_QUANTITY]))); + } } else { $this->setQuantity(new FHIRQuantity($data[self::FIELD_QUANTITY])); } @@ -989,6 +1059,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_RELATED_ARTIFACT])) { if (is_array($data[self::FIELD_RELATED_ARTIFACT])) { foreach($data[self::FIELD_RELATED_ARTIFACT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRRelatedArtifact) { $this->addRelatedArtifact($v); } else { @@ -1007,8 +1080,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRPublicationStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRPublicationStatus([FHIRPublicationStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRPublicationStatus([FHIRPublicationStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRPublicationStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRPublicationStatus($data[self::FIELD_STATUS])); } @@ -1019,8 +1096,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TIMING_DATE_TIME] instanceof FHIRDateTime) { $this->setTimingDateTime($data[self::FIELD_TIMING_DATE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_TIMING_DATE_TIME])) { - $this->setTimingDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_TIMING_DATE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TIMING_DATE_TIME])) { + $this->setTimingDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_TIMING_DATE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_TIMING_DATE_TIME])) { + $this->setTimingDateTime(new FHIRDateTime(array_merge($ext, $data[self::FIELD_TIMING_DATE_TIME]))); + } } else { $this->setTimingDateTime(new FHIRDateTime($data[self::FIELD_TIMING_DATE_TIME])); } @@ -1052,8 +1133,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TITLE] instanceof FHIRString) { $this->setTitle($data[self::FIELD_TITLE]); - } elseif ($ext && is_scalar($data[self::FIELD_TITLE])) { - $this->setTitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TITLE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TITLE])) { + $this->setTitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TITLE]] + $ext)); + } else if (is_array($data[self::FIELD_TITLE])) { + $this->setTitle(new FHIRString(array_merge($ext, $data[self::FIELD_TITLE]))); + } } else { $this->setTitle(new FHIRString($data[self::FIELD_TITLE])); } @@ -1061,6 +1146,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_TOPIC])) { if (is_array($data[self::FIELD_TOPIC])) { foreach($data[self::FIELD_TOPIC] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addTopic($v); } else { @@ -1086,8 +1174,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_URL] instanceof FHIRUri) { $this->setUrl($data[self::FIELD_URL]); - } elseif ($ext && is_scalar($data[self::FIELD_URL])) { - $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } else if (is_array($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri(array_merge($ext, $data[self::FIELD_URL]))); + } } else { $this->setUrl(new FHIRUri($data[self::FIELD_URL])); } @@ -1098,8 +1190,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_USAGE] instanceof FHIRString) { $this->setUsage($data[self::FIELD_USAGE]); - } elseif ($ext && is_scalar($data[self::FIELD_USAGE])) { - $this->setUsage(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_USAGE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_USAGE])) { + $this->setUsage(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_USAGE]] + $ext)); + } else if (is_array($data[self::FIELD_USAGE])) { + $this->setUsage(new FHIRString(array_merge($ext, $data[self::FIELD_USAGE]))); + } } else { $this->setUsage(new FHIRString($data[self::FIELD_USAGE])); } @@ -1107,6 +1203,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_USE_CONTEXT])) { if (is_array($data[self::FIELD_USE_CONTEXT])) { foreach($data[self::FIELD_USE_CONTEXT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRUsageContext) { $this->addUseContext($v); } else { @@ -1125,8 +1224,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VERSION] instanceof FHIRString) { $this->setVersion($data[self::FIELD_VERSION]); - } elseif ($ext && is_scalar($data[self::FIELD_VERSION])) { - $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } else if (is_array($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString(array_merge($ext, $data[self::FIELD_VERSION]))); + } } else { $this->setVersion(new FHIRString($data[self::FIELD_VERSION])); } @@ -3199,10 +3302,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getApprovalDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_APPROVAL_DATE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getBodySite())) { foreach($vs as $v) { if (null === $v) { @@ -3211,11 +3314,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_BODY_SITE, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getContact())) { foreach($vs as $v) { if (null === $v) { @@ -3224,7 +3325,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_CONTACT, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getContributor())) { foreach($vs as $v) { if (null === $v) { @@ -3242,7 +3342,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESCRIPTION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getDosage())) { foreach($vs as $v) { if (null === $v) { @@ -3251,7 +3350,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_DOSAGE, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getDynamicValue())) { foreach($vs as $v) { if (null === $v) { @@ -3260,14 +3358,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_DYNAMIC_VALUE, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getEffectivePeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EFFECTIVE_PERIOD, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getExperimental())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EXPERIMENTAL, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -3276,7 +3372,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getJurisdiction())) { foreach($vs as $v) { if (null === $v) { @@ -3284,14 +3379,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 } $v->xmlSerialize($sxe->addChild(self::FIELD_JURISDICTION, null, $v->_getFHIRXMLNamespace())); } - } - if (null !== ($v = $this->getKind())) { + } if (null !== ($v = $this->getKind())) { $sxe->addAttribute(self::FIELD_KIND, (string)$v); } if (null !== ($v = $this->getLastReviewDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_LAST_REVIEW_DATE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getLibrary())) { foreach($vs as $v) { if (null === $v) { @@ -3300,14 +3393,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_LIBRARY, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getLocation())) { $v->xmlSerialize($sxe->addChild(self::FIELD_LOCATION, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NAME, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getParticipant())) { foreach($vs as $v) { if (null === $v) { @@ -3316,11 +3407,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_PARTICIPANT, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getProductCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PRODUCT_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getProductReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PRODUCT_REFERENCE, null, $v->_getFHIRXMLNamespace())); } @@ -3330,11 +3419,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getPurpose())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PURPOSE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_QUANTITY, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getRelatedArtifact())) { foreach($vs as $v) { if (null === $v) { @@ -3343,29 +3430,24 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_RELATED_ARTIFACT, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getTimingDateTime())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TIMING_DATE_TIME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getTimingPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TIMING_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getTimingRange())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TIMING_RANGE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getTimingTiming())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TIMING_TIMING, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getTitle())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TITLE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getTopic())) { foreach($vs as $v) { if (null === $v) { @@ -3374,7 +3456,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_TOPIC, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getTransform())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TRANSFORM, null, $v->_getFHIRXMLNamespace())); } @@ -3384,7 +3465,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getUsage())) { $v->xmlSerialize($sxe->addChild(self::FIELD_USAGE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getUseContext())) { foreach($vs as $v) { if (null === $v) { @@ -3406,8 +3486,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getApprovalDate())) { - $a[self::FIELD_APPROVAL_DATE] = $v->getValue(); - $a[self::FIELD_APPROVAL_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_APPROVAL_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_APPROVAL_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_APPROVAL_DATE] = $v; + } } if ([] !== ($vs = $this->getBodySite())) { $a[self::FIELD_BODY_SITE] = $vs; @@ -3422,16 +3509,37 @@ public function jsonSerialize() $a[self::FIELD_CONTRIBUTOR] = $vs; } if (null !== ($v = $this->getCopyright())) { - $a[self::FIELD_COPYRIGHT] = $v->getValue(); - $a[self::FIELD_COPYRIGHT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_COPYRIGHT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_COPYRIGHT_EXT] = $enc; + } + } else { + $a[self::FIELD_COPYRIGHT] = $v; + } } if (null !== ($v = $this->getDate())) { - $a[self::FIELD_DATE] = $v->getValue(); - $a[self::FIELD_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_DATE] = $v; + } } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if ([] !== ($vs = $this->getDosage())) { $a[self::FIELD_DOSAGE] = $vs; @@ -3443,11 +3551,34 @@ public function jsonSerialize() $a[self::FIELD_EFFECTIVE_PERIOD] = $v; } if (null !== ($v = $this->getExperimental())) { - $a[self::FIELD_EXPERIMENTAL] = $v->getValue(); - $a[self::FIELD_EXPERIMENTAL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EXPERIMENTAL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EXPERIMENTAL_EXT] = $enc; + } + } else { + $a[self::FIELD_EXPERIMENTAL] = $v; + } } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if ([] !== ($vs = $this->getJurisdiction())) { $a[self::FIELD_JURISDICTION] = $vs; @@ -3456,8 +3587,15 @@ public function jsonSerialize() $a[self::FIELD_KIND] = $v; } if (null !== ($v = $this->getLastReviewDate())) { - $a[self::FIELD_LAST_REVIEW_DATE] = $v->getValue(); - $a[self::FIELD_LAST_REVIEW_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_LAST_REVIEW_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_LAST_REVIEW_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_LAST_REVIEW_DATE] = $v; + } } if ([] !== ($vs = $this->getLibrary())) { $a[self::FIELD_LIBRARY] = $vs; @@ -3466,8 +3604,15 @@ public function jsonSerialize() $a[self::FIELD_LOCATION] = $v; } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if ([] !== ($vs = $this->getParticipant())) { $a[self::FIELD_PARTICIPANT] = $vs; @@ -3479,25 +3624,62 @@ public function jsonSerialize() $a[self::FIELD_PRODUCT_REFERENCE] = $v; } if (null !== ($v = $this->getPublisher())) { - $a[self::FIELD_PUBLISHER] = $v->getValue(); - $a[self::FIELD_PUBLISHER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PUBLISHER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PUBLISHER_EXT] = $enc; + } + } else { + $a[self::FIELD_PUBLISHER] = $v; + } } if (null !== ($v = $this->getPurpose())) { - $a[self::FIELD_PURPOSE] = $v->getValue(); - $a[self::FIELD_PURPOSE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PURPOSE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PURPOSE_EXT] = $enc; + } + } else { + $a[self::FIELD_PURPOSE] = $v; + } } if (null !== ($v = $this->getQuantity())) { - $a[self::FIELD_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_QUANTITY] = $v; + } } if ([] !== ($vs = $this->getRelatedArtifact())) { $a[self::FIELD_RELATED_ARTIFACT] = $vs; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getTimingDateTime())) { - $a[self::FIELD_TIMING_DATE_TIME] = $v->getValue(); - $a[self::FIELD_TIMING_DATE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TIMING_DATE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TIMING_DATE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_TIMING_DATE_TIME] = $v; + } } if (null !== ($v = $this->getTimingPeriod())) { $a[self::FIELD_TIMING_PERIOD] = $v; @@ -3509,8 +3691,15 @@ public function jsonSerialize() $a[self::FIELD_TIMING_TIMING] = $v; } if (null !== ($v = $this->getTitle())) { - $a[self::FIELD_TITLE] = $v->getValue(); - $a[self::FIELD_TITLE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TITLE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TITLE_EXT] = $enc; + } + } else { + $a[self::FIELD_TITLE] = $v; + } } if ([] !== ($vs = $this->getTopic())) { $a[self::FIELD_TOPIC] = $vs; @@ -3519,19 +3708,40 @@ public function jsonSerialize() $a[self::FIELD_TRANSFORM] = $v; } if (null !== ($v = $this->getUrl())) { - $a[self::FIELD_URL] = $v->getValue(); - $a[self::FIELD_URL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_URL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_URL_EXT] = $enc; + } + } else { + $a[self::FIELD_URL] = $v; + } } if (null !== ($v = $this->getUsage())) { - $a[self::FIELD_USAGE] = $v->getValue(); - $a[self::FIELD_USAGE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_USAGE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_USAGE_EXT] = $enc; + } + } else { + $a[self::FIELD_USAGE] = $v; + } } if ([] !== ($vs = $this->getUseContext())) { $a[self::FIELD_USE_CONTEXT] = $vs; } if (null !== ($v = $this->getVersion())) { - $a[self::FIELD_VERSION] = $v->getValue(); - $a[self::FIELD_VERSION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VERSION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VERSION_EXT] = $enc; + } + } else { + $a[self::FIELD_VERSION] = $v; + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRAdverseEvent.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRAdverseEvent.php index 15bdc9c6fe..9f7fd23e95 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRAdverseEvent.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRAdverseEvent.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -88,10 +88,6 @@ class FHIRAdverseEvent extends FHIRDomainResource implements PHPFHIRContainedTyp { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ADVERSE_EVENT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CATEGORY = 'category'; const FIELD_CATEGORY_EXT = '_category'; const FIELD_DATE = 'date'; @@ -306,6 +302,9 @@ class FHIRAdverseEvent extends FHIRDomainResource implements PHPFHIRContainedTyp */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRAdverseEvent Constructor * @param null|array $data @@ -328,8 +327,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CATEGORY] instanceof FHIRAdverseEventCategory) { $this->setCategory($data[self::FIELD_CATEGORY]); - } elseif ($ext && is_scalar($data[self::FIELD_CATEGORY])) { - $this->setCategory(new FHIRAdverseEventCategory([FHIRAdverseEventCategory::FIELD_VALUE => $data[self::FIELD_CATEGORY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CATEGORY])) { + $this->setCategory(new FHIRAdverseEventCategory([FHIRAdverseEventCategory::FIELD_VALUE => $data[self::FIELD_CATEGORY]] + $ext)); + } else if (is_array($data[self::FIELD_CATEGORY])) { + $this->setCategory(new FHIRAdverseEventCategory(array_merge($ext, $data[self::FIELD_CATEGORY]))); + } } else { $this->setCategory(new FHIRAdverseEventCategory($data[self::FIELD_CATEGORY])); } @@ -340,8 +343,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATE] instanceof FHIRDateTime) { $this->setDate($data[self::FIELD_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_DATE])) { - $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime(array_merge($ext, $data[self::FIELD_DATE]))); + } } else { $this->setDate(new FHIRDateTime($data[self::FIELD_DATE])); } @@ -352,8 +359,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -371,8 +382,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->setIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { - $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_IDENTIFIER]))); + } } else { $this->setIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); } @@ -394,6 +409,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REACTION])) { if (is_array($data[self::FIELD_REACTION])) { foreach($data[self::FIELD_REACTION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addReaction($v); } else { @@ -416,6 +434,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REFERENCE_DOCUMENT])) { if (is_array($data[self::FIELD_REFERENCE_DOCUMENT])) { foreach($data[self::FIELD_REFERENCE_DOCUMENT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addReferenceDocument($v); } else { @@ -438,6 +459,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_STUDY])) { if (is_array($data[self::FIELD_STUDY])) { foreach($data[self::FIELD_STUDY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addStudy($v); } else { @@ -460,6 +484,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SUBJECT_MEDICAL_HISTORY])) { if (is_array($data[self::FIELD_SUBJECT_MEDICAL_HISTORY])) { foreach($data[self::FIELD_SUBJECT_MEDICAL_HISTORY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addSubjectMedicalHistory($v); } else { @@ -475,6 +502,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SUSPECT_ENTITY])) { if (is_array($data[self::FIELD_SUSPECT_ENTITY])) { foreach($data[self::FIELD_SUSPECT_ENTITY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRAdverseEventSuspectEntity) { $this->addSuspectEntity($v); } else { @@ -1339,23 +1369,18 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESCRIPTION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getEventParticipant())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EVENT_PARTICIPANT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getLocation())) { $v->xmlSerialize($sxe->addChild(self::FIELD_LOCATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOutcome())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OUTCOME, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getReaction())) { foreach($vs as $v) { if (null === $v) { @@ -1364,11 +1389,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_REACTION, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getRecorder())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RECORDER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getReferenceDocument())) { foreach($vs as $v) { if (null === $v) { @@ -1377,11 +1400,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_REFERENCE_DOCUMENT, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getSeriousness())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SERIOUSNESS, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getStudy())) { foreach($vs as $v) { if (null === $v) { @@ -1390,11 +1411,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_STUDY, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getSubject())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBJECT, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getSubjectMedicalHistory())) { foreach($vs as $v) { if (null === $v) { @@ -1403,7 +1422,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_SUBJECT_MEDICAL_HISTORY, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getSuspectEntity())) { foreach($vs as $v) { if (null === $v) { @@ -1412,7 +1430,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_SUSPECT_ENTITY, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -1426,21 +1443,51 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getCategory())) { - $a[self::FIELD_CATEGORY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CATEGORY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CATEGORY_EXT] = $enc; + } + } else { + $a[self::FIELD_CATEGORY] = $v; + } } if (null !== ($v = $this->getDate())) { - $a[self::FIELD_DATE] = $v->getValue(); - $a[self::FIELD_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_DATE] = $v; + } } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if (null !== ($v = $this->getEventParticipant())) { $a[self::FIELD_EVENT_PARTICIPANT] = $v; } if (null !== ($v = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_IDENTIFIER] = $v; + } } if (null !== ($v = $this->getLocation())) { $a[self::FIELD_LOCATION] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRAllergyIntolerance.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRAllergyIntolerance.php index fa9aa22abe..01ed6f1d89 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRAllergyIntolerance.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRAllergyIntolerance.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -94,10 +94,6 @@ class FHIRAllergyIntolerance extends FHIRDomainResource implements PHPFHIRContai { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ALLERGY_INTOLERANCE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ASSERTED_DATE = 'assertedDate'; const FIELD_ASSERTED_DATE_EXT = '_assertedDate'; const FIELD_ASSERTER = 'asserter'; @@ -114,6 +110,7 @@ class FHIRAllergyIntolerance extends FHIRDomainResource implements PHPFHIRContai const FIELD_LAST_OCCURRENCE_EXT = '_lastOccurrence'; const FIELD_NOTE = 'note'; const FIELD_ONSET_AGE = 'onsetAge'; + const FIELD_ONSET_AGE_EXT = '_onsetAge'; const FIELD_ONSET_DATE_TIME = 'onsetDateTime'; const FIELD_ONSET_DATE_TIME_EXT = '_onsetDateTime'; const FIELD_ONSET_PERIOD = 'onsetPeriod'; @@ -364,6 +361,9 @@ class FHIRAllergyIntolerance extends FHIRDomainResource implements PHPFHIRContai */ protected $verificationStatus = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRAllergyIntolerance Constructor * @param null|array $data @@ -386,8 +386,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ASSERTED_DATE] instanceof FHIRDateTime) { $this->setAssertedDate($data[self::FIELD_ASSERTED_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_ASSERTED_DATE])) { - $this->setAssertedDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_ASSERTED_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ASSERTED_DATE])) { + $this->setAssertedDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_ASSERTED_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_ASSERTED_DATE])) { + $this->setAssertedDate(new FHIRDateTime(array_merge($ext, $data[self::FIELD_ASSERTED_DATE]))); + } } else { $this->setAssertedDate(new FHIRDateTime($data[self::FIELD_ASSERTED_DATE])); } @@ -405,17 +409,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_CATEGORY])) { foreach($data[self::FIELD_CATEGORY] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRAllergyIntoleranceCategory) { $this->addCategory($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addCategory(new FHIRAllergyIntoleranceCategory([FHIRAllergyIntoleranceCategory::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addCategory(new FHIRAllergyIntoleranceCategory([FHIRAllergyIntoleranceCategory::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addCategory(new FHIRAllergyIntoleranceCategory(array_merge($v, $ext[$i]))); + } } else { $this->addCategory(new FHIRAllergyIntoleranceCategory($v)); } } } elseif ($data[self::FIELD_CATEGORY] instanceof FHIRAllergyIntoleranceCategory) { $this->addCategory($data[self::FIELD_CATEGORY]); - } elseif ($ext && is_scalar($data[self::FIELD_CATEGORY])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_CATEGORY])) { $this->addCategory(new FHIRAllergyIntoleranceCategory([FHIRAllergyIntoleranceCategory::FIELD_VALUE => $data[self::FIELD_CATEGORY]] + $ext)); } else { $this->addCategory(new FHIRAllergyIntoleranceCategory($data[self::FIELD_CATEGORY])); @@ -427,8 +438,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CLINICAL_STATUS] instanceof FHIRAllergyIntoleranceClinicalStatus) { $this->setClinicalStatus($data[self::FIELD_CLINICAL_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_CLINICAL_STATUS])) { - $this->setClinicalStatus(new FHIRAllergyIntoleranceClinicalStatus([FHIRAllergyIntoleranceClinicalStatus::FIELD_VALUE => $data[self::FIELD_CLINICAL_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CLINICAL_STATUS])) { + $this->setClinicalStatus(new FHIRAllergyIntoleranceClinicalStatus([FHIRAllergyIntoleranceClinicalStatus::FIELD_VALUE => $data[self::FIELD_CLINICAL_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_CLINICAL_STATUS])) { + $this->setClinicalStatus(new FHIRAllergyIntoleranceClinicalStatus(array_merge($ext, $data[self::FIELD_CLINICAL_STATUS]))); + } } else { $this->setClinicalStatus(new FHIRAllergyIntoleranceClinicalStatus($data[self::FIELD_CLINICAL_STATUS])); } @@ -446,8 +461,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CRITICALITY] instanceof FHIRAllergyIntoleranceCriticality) { $this->setCriticality($data[self::FIELD_CRITICALITY]); - } elseif ($ext && is_scalar($data[self::FIELD_CRITICALITY])) { - $this->setCriticality(new FHIRAllergyIntoleranceCriticality([FHIRAllergyIntoleranceCriticality::FIELD_VALUE => $data[self::FIELD_CRITICALITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CRITICALITY])) { + $this->setCriticality(new FHIRAllergyIntoleranceCriticality([FHIRAllergyIntoleranceCriticality::FIELD_VALUE => $data[self::FIELD_CRITICALITY]] + $ext)); + } else if (is_array($data[self::FIELD_CRITICALITY])) { + $this->setCriticality(new FHIRAllergyIntoleranceCriticality(array_merge($ext, $data[self::FIELD_CRITICALITY]))); + } } else { $this->setCriticality(new FHIRAllergyIntoleranceCriticality($data[self::FIELD_CRITICALITY])); } @@ -458,17 +477,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -480,8 +506,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_LAST_OCCURRENCE] instanceof FHIRDateTime) { $this->setLastOccurrence($data[self::FIELD_LAST_OCCURRENCE]); - } elseif ($ext && is_scalar($data[self::FIELD_LAST_OCCURRENCE])) { - $this->setLastOccurrence(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_LAST_OCCURRENCE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_LAST_OCCURRENCE])) { + $this->setLastOccurrence(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_LAST_OCCURRENCE]] + $ext)); + } else if (is_array($data[self::FIELD_LAST_OCCURRENCE])) { + $this->setLastOccurrence(new FHIRDateTime(array_merge($ext, $data[self::FIELD_LAST_OCCURRENCE]))); + } } else { $this->setLastOccurrence(new FHIRDateTime($data[self::FIELD_LAST_OCCURRENCE])); } @@ -489,6 +519,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_NOTE])) { if (is_array($data[self::FIELD_NOTE])) { foreach($data[self::FIELD_NOTE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRAnnotation) { $this->addNote($v); } else { @@ -502,8 +535,17 @@ public function __construct($data = null) } } if (isset($data[self::FIELD_ONSET_AGE])) { + $ext = (isset($data[self::FIELD_ONSET_AGE_EXT]) && is_array($data[self::FIELD_ONSET_AGE_EXT])) + ? $data[self::FIELD_ONSET_AGE_EXT] + : null; if ($data[self::FIELD_ONSET_AGE] instanceof FHIRAge) { $this->setOnsetAge($data[self::FIELD_ONSET_AGE]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ONSET_AGE])) { + $this->setOnsetAge(new FHIRAge([FHIRAge::FIELD_VALUE => $data[self::FIELD_ONSET_AGE]] + $ext)); + } else if (is_array($data[self::FIELD_ONSET_AGE])) { + $this->setOnsetAge(new FHIRAge(array_merge($ext, $data[self::FIELD_ONSET_AGE]))); + } } else { $this->setOnsetAge(new FHIRAge($data[self::FIELD_ONSET_AGE])); } @@ -514,8 +556,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ONSET_DATE_TIME] instanceof FHIRDateTime) { $this->setOnsetDateTime($data[self::FIELD_ONSET_DATE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_ONSET_DATE_TIME])) { - $this->setOnsetDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_ONSET_DATE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ONSET_DATE_TIME])) { + $this->setOnsetDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_ONSET_DATE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_ONSET_DATE_TIME])) { + $this->setOnsetDateTime(new FHIRDateTime(array_merge($ext, $data[self::FIELD_ONSET_DATE_TIME]))); + } } else { $this->setOnsetDateTime(new FHIRDateTime($data[self::FIELD_ONSET_DATE_TIME])); } @@ -540,8 +586,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ONSET_STRING] instanceof FHIRString) { $this->setOnsetString($data[self::FIELD_ONSET_STRING]); - } elseif ($ext && is_scalar($data[self::FIELD_ONSET_STRING])) { - $this->setOnsetString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_ONSET_STRING]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ONSET_STRING])) { + $this->setOnsetString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_ONSET_STRING]] + $ext)); + } else if (is_array($data[self::FIELD_ONSET_STRING])) { + $this->setOnsetString(new FHIRString(array_merge($ext, $data[self::FIELD_ONSET_STRING]))); + } } else { $this->setOnsetString(new FHIRString($data[self::FIELD_ONSET_STRING])); } @@ -556,6 +606,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REACTION])) { if (is_array($data[self::FIELD_REACTION])) { foreach($data[self::FIELD_REACTION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRAllergyIntoleranceReaction) { $this->addReaction($v); } else { @@ -581,8 +634,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TYPE] instanceof FHIRAllergyIntoleranceType) { $this->setType($data[self::FIELD_TYPE]); - } elseif ($ext && is_scalar($data[self::FIELD_TYPE])) { - $this->setType(new FHIRAllergyIntoleranceType([FHIRAllergyIntoleranceType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TYPE])) { + $this->setType(new FHIRAllergyIntoleranceType([FHIRAllergyIntoleranceType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } else if (is_array($data[self::FIELD_TYPE])) { + $this->setType(new FHIRAllergyIntoleranceType(array_merge($ext, $data[self::FIELD_TYPE]))); + } } else { $this->setType(new FHIRAllergyIntoleranceType($data[self::FIELD_TYPE])); } @@ -593,8 +650,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VERIFICATION_STATUS] instanceof FHIRAllergyIntoleranceVerificationStatus) { $this->setVerificationStatus($data[self::FIELD_VERIFICATION_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_VERIFICATION_STATUS])) { - $this->setVerificationStatus(new FHIRAllergyIntoleranceVerificationStatus([FHIRAllergyIntoleranceVerificationStatus::FIELD_VALUE => $data[self::FIELD_VERIFICATION_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VERIFICATION_STATUS])) { + $this->setVerificationStatus(new FHIRAllergyIntoleranceVerificationStatus([FHIRAllergyIntoleranceVerificationStatus::FIELD_VALUE => $data[self::FIELD_VERIFICATION_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_VERIFICATION_STATUS])) { + $this->setVerificationStatus(new FHIRAllergyIntoleranceVerificationStatus(array_merge($ext, $data[self::FIELD_VERIFICATION_STATUS]))); + } } else { $this->setVerificationStatus(new FHIRAllergyIntoleranceVerificationStatus($data[self::FIELD_VERIFICATION_STATUS])); } @@ -1549,14 +1610,13 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getAssertedDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ASSERTED_DATE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getAsserter())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ASSERTER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getCategory())) { foreach($vs as $v) { if (null === $v) { @@ -1565,19 +1625,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_CATEGORY, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getClinicalStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CLINICAL_STATUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getCriticality())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CRITICALITY, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -1589,7 +1645,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getLastOccurrence())) { $v->xmlSerialize($sxe->addChild(self::FIELD_LAST_OCCURRENCE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getNote())) { foreach($vs as $v) { if (null === $v) { @@ -1598,29 +1653,24 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_NOTE, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getOnsetAge())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ONSET_AGE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getOnsetDateTime())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ONSET_DATE_TIME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOnsetPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ONSET_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOnsetRange())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ONSET_RANGE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getOnsetString())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ONSET_STRING, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPatient())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATIENT, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getReaction())) { foreach($vs as $v) { if (null === $v) { @@ -1629,15 +1679,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_REACTION, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getRecorder())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RECORDER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getVerificationStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VERIFICATION_STATUS, null, $v->_getFHIRXMLNamespace())); } @@ -1651,40 +1698,117 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getAssertedDate())) { - $a[self::FIELD_ASSERTED_DATE] = $v->getValue(); - $a[self::FIELD_ASSERTED_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ASSERTED_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ASSERTED_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_ASSERTED_DATE] = $v; + } } if (null !== ($v = $this->getAsserter())) { $a[self::FIELD_ASSERTER] = $v; } if ([] !== ($vs = $this->getCategory())) { - $a[self::FIELD_CATEGORY] = $vs; + $a[self::FIELD_CATEGORY] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CATEGORY][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CATEGORY_EXT][] = $enc; + } else { + $a[self::FIELD_CATEGORY_EXT][] = null; + } + } else { + $a[self::FIELD_CATEGORY][] = $v; + } + } } if (null !== ($v = $this->getClinicalStatus())) { - $a[self::FIELD_CLINICAL_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CLINICAL_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CLINICAL_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_CLINICAL_STATUS] = $v; + } } if (null !== ($v = $this->getCode())) { $a[self::FIELD_CODE] = $v; } if (null !== ($v = $this->getCriticality())) { - $a[self::FIELD_CRITICALITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CRITICALITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CRITICALITY_EXT] = $enc; + } + } else { + $a[self::FIELD_CRITICALITY] = $v; + } } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if (null !== ($v = $this->getLastOccurrence())) { - $a[self::FIELD_LAST_OCCURRENCE] = $v->getValue(); - $a[self::FIELD_LAST_OCCURRENCE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_LAST_OCCURRENCE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_LAST_OCCURRENCE_EXT] = $enc; + } + } else { + $a[self::FIELD_LAST_OCCURRENCE] = $v; + } } if ([] !== ($vs = $this->getNote())) { $a[self::FIELD_NOTE] = $vs; } if (null !== ($v = $this->getOnsetAge())) { - $a[self::FIELD_ONSET_AGE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ONSET_AGE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ONSET_AGE_EXT] = $enc; + } + } else { + $a[self::FIELD_ONSET_AGE] = $v; + } } if (null !== ($v = $this->getOnsetDateTime())) { - $a[self::FIELD_ONSET_DATE_TIME] = $v->getValue(); - $a[self::FIELD_ONSET_DATE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ONSET_DATE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ONSET_DATE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_ONSET_DATE_TIME] = $v; + } } if (null !== ($v = $this->getOnsetPeriod())) { $a[self::FIELD_ONSET_PERIOD] = $v; @@ -1693,8 +1817,15 @@ public function jsonSerialize() $a[self::FIELD_ONSET_RANGE] = $v; } if (null !== ($v = $this->getOnsetString())) { - $a[self::FIELD_ONSET_STRING] = $v->getValue(); - $a[self::FIELD_ONSET_STRING_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ONSET_STRING] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ONSET_STRING_EXT] = $enc; + } + } else { + $a[self::FIELD_ONSET_STRING] = $v; + } } if (null !== ($v = $this->getPatient())) { $a[self::FIELD_PATIENT] = $v; @@ -1706,10 +1837,26 @@ public function jsonSerialize() $a[self::FIELD_RECORDER] = $v; } if (null !== ($v = $this->getType())) { - $a[self::FIELD_TYPE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TYPE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TYPE_EXT] = $enc; + } + } else { + $a[self::FIELD_TYPE] = $v; + } } if (null !== ($v = $this->getVerificationStatus())) { - $a[self::FIELD_VERIFICATION_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VERIFICATION_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VERIFICATION_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_VERIFICATION_STATUS] = $v; + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRAppointment.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRAppointment.php index 5bedce0894..a0b5cd8918 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRAppointment.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRAppointment.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -91,10 +91,6 @@ class FHIRAppointment extends FHIRDomainResource implements PHPFHIRContainedType { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_APPOINTMENT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_APPOINTMENT_TYPE = 'appointmentType'; const FIELD_COMMENT = 'comment'; const FIELD_COMMENT_EXT = '_comment'; @@ -384,6 +380,9 @@ class FHIRAppointment extends FHIRDomainResource implements PHPFHIRContainedType */ protected $supportingInformation = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRAppointment Constructor * @param null|array $data @@ -413,8 +412,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_COMMENT] instanceof FHIRString) { $this->setComment($data[self::FIELD_COMMENT]); - } elseif ($ext && is_scalar($data[self::FIELD_COMMENT])) { - $this->setComment(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_COMMENT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_COMMENT])) { + $this->setComment(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_COMMENT]] + $ext)); + } else if (is_array($data[self::FIELD_COMMENT])) { + $this->setComment(new FHIRString(array_merge($ext, $data[self::FIELD_COMMENT]))); + } } else { $this->setComment(new FHIRString($data[self::FIELD_COMMENT])); } @@ -425,8 +428,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CREATED] instanceof FHIRDateTime) { $this->setCreated($data[self::FIELD_CREATED]); - } elseif ($ext && is_scalar($data[self::FIELD_CREATED])) { - $this->setCreated(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_CREATED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CREATED])) { + $this->setCreated(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_CREATED]] + $ext)); + } else if (is_array($data[self::FIELD_CREATED])) { + $this->setCreated(new FHIRDateTime(array_merge($ext, $data[self::FIELD_CREATED]))); + } } else { $this->setCreated(new FHIRDateTime($data[self::FIELD_CREATED])); } @@ -437,8 +444,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -449,8 +460,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_END] instanceof FHIRInstant) { $this->setEnd($data[self::FIELD_END]); - } elseif ($ext && is_scalar($data[self::FIELD_END])) { - $this->setEnd(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_END]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_END])) { + $this->setEnd(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_END]] + $ext)); + } else if (is_array($data[self::FIELD_END])) { + $this->setEnd(new FHIRInstant(array_merge($ext, $data[self::FIELD_END]))); + } } else { $this->setEnd(new FHIRInstant($data[self::FIELD_END])); } @@ -461,17 +476,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -480,6 +502,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_INCOMING_REFERRAL])) { if (is_array($data[self::FIELD_INCOMING_REFERRAL])) { foreach($data[self::FIELD_INCOMING_REFERRAL] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addIncomingReferral($v); } else { @@ -495,6 +520,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_INDICATION])) { if (is_array($data[self::FIELD_INDICATION])) { foreach($data[self::FIELD_INDICATION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addIndication($v); } else { @@ -513,8 +541,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MINUTES_DURATION] instanceof FHIRPositiveInt) { $this->setMinutesDuration($data[self::FIELD_MINUTES_DURATION]); - } elseif ($ext && is_scalar($data[self::FIELD_MINUTES_DURATION])) { - $this->setMinutesDuration(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_MINUTES_DURATION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MINUTES_DURATION])) { + $this->setMinutesDuration(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_MINUTES_DURATION]] + $ext)); + } else if (is_array($data[self::FIELD_MINUTES_DURATION])) { + $this->setMinutesDuration(new FHIRPositiveInt(array_merge($ext, $data[self::FIELD_MINUTES_DURATION]))); + } } else { $this->setMinutesDuration(new FHIRPositiveInt($data[self::FIELD_MINUTES_DURATION])); } @@ -522,6 +554,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PARTICIPANT])) { if (is_array($data[self::FIELD_PARTICIPANT])) { foreach($data[self::FIELD_PARTICIPANT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRAppointmentParticipant) { $this->addParticipant($v); } else { @@ -540,8 +575,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PRIORITY] instanceof FHIRUnsignedInt) { $this->setPriority($data[self::FIELD_PRIORITY]); - } elseif ($ext && is_scalar($data[self::FIELD_PRIORITY])) { - $this->setPriority(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_PRIORITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PRIORITY])) { + $this->setPriority(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_PRIORITY]] + $ext)); + } else if (is_array($data[self::FIELD_PRIORITY])) { + $this->setPriority(new FHIRUnsignedInt(array_merge($ext, $data[self::FIELD_PRIORITY]))); + } } else { $this->setPriority(new FHIRUnsignedInt($data[self::FIELD_PRIORITY])); } @@ -549,6 +588,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REASON])) { if (is_array($data[self::FIELD_REASON])) { foreach($data[self::FIELD_REASON] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addReason($v); } else { @@ -564,6 +606,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REQUESTED_PERIOD])) { if (is_array($data[self::FIELD_REQUESTED_PERIOD])) { foreach($data[self::FIELD_REQUESTED_PERIOD] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRPeriod) { $this->addRequestedPeriod($v); } else { @@ -586,6 +631,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SERVICE_TYPE])) { if (is_array($data[self::FIELD_SERVICE_TYPE])) { foreach($data[self::FIELD_SERVICE_TYPE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addServiceType($v); } else { @@ -601,6 +649,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SLOT])) { if (is_array($data[self::FIELD_SLOT])) { foreach($data[self::FIELD_SLOT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addSlot($v); } else { @@ -616,6 +667,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SPECIALTY])) { if (is_array($data[self::FIELD_SPECIALTY])) { foreach($data[self::FIELD_SPECIALTY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addSpecialty($v); } else { @@ -634,8 +688,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_START] instanceof FHIRInstant) { $this->setStart($data[self::FIELD_START]); - } elseif ($ext && is_scalar($data[self::FIELD_START])) { - $this->setStart(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_START]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_START])) { + $this->setStart(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_START]] + $ext)); + } else if (is_array($data[self::FIELD_START])) { + $this->setStart(new FHIRInstant(array_merge($ext, $data[self::FIELD_START]))); + } } else { $this->setStart(new FHIRInstant($data[self::FIELD_START])); } @@ -646,8 +704,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRAppointmentStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRAppointmentStatus([FHIRAppointmentStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRAppointmentStatus([FHIRAppointmentStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRAppointmentStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRAppointmentStatus($data[self::FIELD_STATUS])); } @@ -655,6 +717,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SUPPORTING_INFORMATION])) { if (is_array($data[self::FIELD_SUPPORTING_INFORMATION])) { foreach($data[self::FIELD_SUPPORTING_INFORMATION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addSupportingInformation($v); } else { @@ -1905,7 +1970,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getEnd())) { $v->xmlSerialize($sxe->addChild(self::FIELD_END, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -1914,7 +1978,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getIncomingReferral())) { foreach($vs as $v) { if (null === $v) { @@ -1923,7 +1986,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_INCOMING_REFERRAL, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getIndication())) { foreach($vs as $v) { if (null === $v) { @@ -1935,7 +1997,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getMinutesDuration())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MINUTES_DURATION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getParticipant())) { foreach($vs as $v) { if (null === $v) { @@ -1947,7 +2008,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getPriority())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PRIORITY, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getReason())) { foreach($vs as $v) { if (null === $v) { @@ -1956,7 +2016,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_REASON, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getRequestedPeriod())) { foreach($vs as $v) { if (null === $v) { @@ -1965,11 +2024,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_REQUESTED_PERIOD, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getServiceCategory())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SERVICE_CATEGORY, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getServiceType())) { foreach($vs as $v) { if (null === $v) { @@ -1978,7 +2035,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_SERVICE_TYPE, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getSlot())) { foreach($vs as $v) { if (null === $v) { @@ -1987,7 +2043,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_SLOT, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getSpecialty())) { foreach($vs as $v) { if (null === $v) { @@ -1999,11 +2054,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getStart())) { $v->xmlSerialize($sxe->addChild(self::FIELD_START, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getSupportingInformation())) { foreach($vs as $v) { if (null === $v) { @@ -2025,23 +2078,67 @@ public function jsonSerialize() $a[self::FIELD_APPOINTMENT_TYPE] = $v; } if (null !== ($v = $this->getComment())) { - $a[self::FIELD_COMMENT] = $v->getValue(); - $a[self::FIELD_COMMENT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_COMMENT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_COMMENT_EXT] = $enc; + } + } else { + $a[self::FIELD_COMMENT] = $v; + } } if (null !== ($v = $this->getCreated())) { - $a[self::FIELD_CREATED] = $v->getValue(); - $a[self::FIELD_CREATED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CREATED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CREATED_EXT] = $enc; + } + } else { + $a[self::FIELD_CREATED] = $v; + } } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if (null !== ($v = $this->getEnd())) { - $a[self::FIELD_END] = $v->getValue(); - $a[self::FIELD_END_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_END] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_END_EXT] = $enc; + } + } else { + $a[self::FIELD_END] = $v; + } } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if ([] !== ($vs = $this->getIncomingReferral())) { $a[self::FIELD_INCOMING_REFERRAL] = $vs; @@ -2050,15 +2147,29 @@ public function jsonSerialize() $a[self::FIELD_INDICATION] = $vs; } if (null !== ($v = $this->getMinutesDuration())) { - $a[self::FIELD_MINUTES_DURATION] = $v->getValue(); - $a[self::FIELD_MINUTES_DURATION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MINUTES_DURATION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MINUTES_DURATION_EXT] = $enc; + } + } else { + $a[self::FIELD_MINUTES_DURATION] = $v; + } } if ([] !== ($vs = $this->getParticipant())) { $a[self::FIELD_PARTICIPANT] = $vs; } if (null !== ($v = $this->getPriority())) { - $a[self::FIELD_PRIORITY] = $v->getValue(); - $a[self::FIELD_PRIORITY_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PRIORITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PRIORITY_EXT] = $enc; + } + } else { + $a[self::FIELD_PRIORITY] = $v; + } } if ([] !== ($vs = $this->getReason())) { $a[self::FIELD_REASON] = $vs; @@ -2079,11 +2190,26 @@ public function jsonSerialize() $a[self::FIELD_SPECIALTY] = $vs; } if (null !== ($v = $this->getStart())) { - $a[self::FIELD_START] = $v->getValue(); - $a[self::FIELD_START_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_START] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_START_EXT] = $enc; + } + } else { + $a[self::FIELD_START] = $v; + } } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if ([] !== ($vs = $this->getSupportingInformation())) { $a[self::FIELD_SUPPORTING_INFORMATION] = $vs; diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRAppointmentResponse.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRAppointmentResponse.php index 906ec646b2..b26bc25eb0 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRAppointmentResponse.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRAppointmentResponse.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -85,10 +85,6 @@ class FHIRAppointmentResponse extends FHIRDomainResource implements PHPFHIRConta { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_APPOINTMENT_RESPONSE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ACTOR = 'actor'; const FIELD_APPOINTMENT = 'appointment'; const FIELD_COMMENT = 'comment'; @@ -204,6 +200,9 @@ class FHIRAppointmentResponse extends FHIRDomainResource implements PHPFHIRConta */ protected $start = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRAppointmentResponse Constructor * @param null|array $data @@ -240,8 +239,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_COMMENT] instanceof FHIRString) { $this->setComment($data[self::FIELD_COMMENT]); - } elseif ($ext && is_scalar($data[self::FIELD_COMMENT])) { - $this->setComment(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_COMMENT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_COMMENT])) { + $this->setComment(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_COMMENT]] + $ext)); + } else if (is_array($data[self::FIELD_COMMENT])) { + $this->setComment(new FHIRString(array_merge($ext, $data[self::FIELD_COMMENT]))); + } } else { $this->setComment(new FHIRString($data[self::FIELD_COMMENT])); } @@ -252,8 +255,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_END] instanceof FHIRInstant) { $this->setEnd($data[self::FIELD_END]); - } elseif ($ext && is_scalar($data[self::FIELD_END])) { - $this->setEnd(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_END]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_END])) { + $this->setEnd(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_END]] + $ext)); + } else if (is_array($data[self::FIELD_END])) { + $this->setEnd(new FHIRInstant(array_merge($ext, $data[self::FIELD_END]))); + } } else { $this->setEnd(new FHIRInstant($data[self::FIELD_END])); } @@ -264,17 +271,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -286,8 +300,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PARTICIPANT_STATUS] instanceof FHIRParticipationStatus) { $this->setParticipantStatus($data[self::FIELD_PARTICIPANT_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_PARTICIPANT_STATUS])) { - $this->setParticipantStatus(new FHIRParticipationStatus([FHIRParticipationStatus::FIELD_VALUE => $data[self::FIELD_PARTICIPANT_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PARTICIPANT_STATUS])) { + $this->setParticipantStatus(new FHIRParticipationStatus([FHIRParticipationStatus::FIELD_VALUE => $data[self::FIELD_PARTICIPANT_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_PARTICIPANT_STATUS])) { + $this->setParticipantStatus(new FHIRParticipationStatus(array_merge($ext, $data[self::FIELD_PARTICIPANT_STATUS]))); + } } else { $this->setParticipantStatus(new FHIRParticipationStatus($data[self::FIELD_PARTICIPANT_STATUS])); } @@ -295,6 +313,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PARTICIPANT_TYPE])) { if (is_array($data[self::FIELD_PARTICIPANT_TYPE])) { foreach($data[self::FIELD_PARTICIPANT_TYPE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addParticipantType($v); } else { @@ -313,8 +334,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_START] instanceof FHIRInstant) { $this->setStart($data[self::FIELD_START]); - } elseif ($ext && is_scalar($data[self::FIELD_START])) { - $this->setStart(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_START]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_START])) { + $this->setStart(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_START]] + $ext)); + } else if (is_array($data[self::FIELD_START])) { + $this->setStart(new FHIRInstant(array_merge($ext, $data[self::FIELD_START]))); + } } else { $this->setStart(new FHIRInstant($data[self::FIELD_START])); } @@ -814,7 +839,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getActor())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ACTOR, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getAppointment())) { $v->xmlSerialize($sxe->addChild(self::FIELD_APPOINTMENT, null, $v->_getFHIRXMLNamespace())); } @@ -824,7 +848,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getEnd())) { $v->xmlSerialize($sxe->addChild(self::FIELD_END, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -833,11 +856,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getParticipantStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PARTICIPANT_STATUS, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getParticipantType())) { foreach($vs as $v) { if (null === $v) { @@ -865,25 +886,70 @@ public function jsonSerialize() $a[self::FIELD_APPOINTMENT] = $v; } if (null !== ($v = $this->getComment())) { - $a[self::FIELD_COMMENT] = $v->getValue(); - $a[self::FIELD_COMMENT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_COMMENT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_COMMENT_EXT] = $enc; + } + } else { + $a[self::FIELD_COMMENT] = $v; + } } if (null !== ($v = $this->getEnd())) { - $a[self::FIELD_END] = $v->getValue(); - $a[self::FIELD_END_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_END] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_END_EXT] = $enc; + } + } else { + $a[self::FIELD_END] = $v; + } } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if (null !== ($v = $this->getParticipantStatus())) { - $a[self::FIELD_PARTICIPANT_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PARTICIPANT_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PARTICIPANT_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_PARTICIPANT_STATUS] = $v; + } } if ([] !== ($vs = $this->getParticipantType())) { $a[self::FIELD_PARTICIPANT_TYPE] = $vs; } if (null !== ($v = $this->getStart())) { - $a[self::FIELD_START] = $v->getValue(); - $a[self::FIELD_START_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_START] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_START_EXT] = $enc; + } + } else { + $a[self::FIELD_START] = $v; + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRAuditEvent.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRAuditEvent.php index 734d123e3a..24ae2b8aa7 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRAuditEvent.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRAuditEvent.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -89,10 +89,6 @@ class FHIRAuditEvent extends FHIRDomainResource implements PHPFHIRContainedTypeI { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_AUDIT_EVENT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ACTION = 'action'; const FIELD_ACTION_EXT = '_action'; const FIELD_AGENT = 'agent'; @@ -222,6 +218,9 @@ class FHIRAuditEvent extends FHIRDomainResource implements PHPFHIRContainedTypeI */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRAuditEvent Constructor * @param null|array $data @@ -244,8 +243,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ACTION] instanceof FHIRAuditEventAction) { $this->setAction($data[self::FIELD_ACTION]); - } elseif ($ext && is_scalar($data[self::FIELD_ACTION])) { - $this->setAction(new FHIRAuditEventAction([FHIRAuditEventAction::FIELD_VALUE => $data[self::FIELD_ACTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ACTION])) { + $this->setAction(new FHIRAuditEventAction([FHIRAuditEventAction::FIELD_VALUE => $data[self::FIELD_ACTION]] + $ext)); + } else if (is_array($data[self::FIELD_ACTION])) { + $this->setAction(new FHIRAuditEventAction(array_merge($ext, $data[self::FIELD_ACTION]))); + } } else { $this->setAction(new FHIRAuditEventAction($data[self::FIELD_ACTION])); } @@ -253,6 +256,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_AGENT])) { if (is_array($data[self::FIELD_AGENT])) { foreach($data[self::FIELD_AGENT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRAuditEventAgent) { $this->addAgent($v); } else { @@ -268,6 +274,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ENTITY])) { if (is_array($data[self::FIELD_ENTITY])) { foreach($data[self::FIELD_ENTITY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRAuditEventEntity) { $this->addEntity($v); } else { @@ -286,8 +295,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_OUTCOME] instanceof FHIRAuditEventOutcome) { $this->setOutcome($data[self::FIELD_OUTCOME]); - } elseif ($ext && is_scalar($data[self::FIELD_OUTCOME])) { - $this->setOutcome(new FHIRAuditEventOutcome([FHIRAuditEventOutcome::FIELD_VALUE => $data[self::FIELD_OUTCOME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_OUTCOME])) { + $this->setOutcome(new FHIRAuditEventOutcome([FHIRAuditEventOutcome::FIELD_VALUE => $data[self::FIELD_OUTCOME]] + $ext)); + } else if (is_array($data[self::FIELD_OUTCOME])) { + $this->setOutcome(new FHIRAuditEventOutcome(array_merge($ext, $data[self::FIELD_OUTCOME]))); + } } else { $this->setOutcome(new FHIRAuditEventOutcome($data[self::FIELD_OUTCOME])); } @@ -298,8 +311,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_OUTCOME_DESC] instanceof FHIRString) { $this->setOutcomeDesc($data[self::FIELD_OUTCOME_DESC]); - } elseif ($ext && is_scalar($data[self::FIELD_OUTCOME_DESC])) { - $this->setOutcomeDesc(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_OUTCOME_DESC]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_OUTCOME_DESC])) { + $this->setOutcomeDesc(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_OUTCOME_DESC]] + $ext)); + } else if (is_array($data[self::FIELD_OUTCOME_DESC])) { + $this->setOutcomeDesc(new FHIRString(array_merge($ext, $data[self::FIELD_OUTCOME_DESC]))); + } } else { $this->setOutcomeDesc(new FHIRString($data[self::FIELD_OUTCOME_DESC])); } @@ -307,6 +324,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PURPOSE_OF_EVENT])) { if (is_array($data[self::FIELD_PURPOSE_OF_EVENT])) { foreach($data[self::FIELD_PURPOSE_OF_EVENT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addPurposeOfEvent($v); } else { @@ -325,8 +345,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_RECORDED] instanceof FHIRInstant) { $this->setRecorded($data[self::FIELD_RECORDED]); - } elseif ($ext && is_scalar($data[self::FIELD_RECORDED])) { - $this->setRecorded(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_RECORDED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_RECORDED])) { + $this->setRecorded(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_RECORDED]] + $ext)); + } else if (is_array($data[self::FIELD_RECORDED])) { + $this->setRecorded(new FHIRInstant(array_merge($ext, $data[self::FIELD_RECORDED]))); + } } else { $this->setRecorded(new FHIRInstant($data[self::FIELD_RECORDED])); } @@ -341,6 +365,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SUBTYPE])) { if (is_array($data[self::FIELD_SUBTYPE])) { foreach($data[self::FIELD_SUBTYPE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCoding) { $this->addSubtype($v); } else { @@ -946,7 +973,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getAction())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ACTION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getAgent())) { foreach($vs as $v) { if (null === $v) { @@ -955,7 +981,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_AGENT, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getEntity())) { foreach($vs as $v) { if (null === $v) { @@ -964,14 +989,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_ENTITY, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getOutcome())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OUTCOME, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getOutcomeDesc())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OUTCOME_DESC, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getPurposeOfEvent())) { foreach($vs as $v) { if (null === $v) { @@ -983,11 +1006,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getRecorded())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RECORDED, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSource())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SOURCE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getSubtype())) { foreach($vs as $v) { if (null === $v) { @@ -996,7 +1017,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_SUBTYPE, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -1010,7 +1030,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getAction())) { - $a[self::FIELD_ACTION] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ACTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ACTION_EXT] = $enc; + } + } else { + $a[self::FIELD_ACTION] = $v; + } } if ([] !== ($vs = $this->getAgent())) { $a[self::FIELD_AGENT] = $vs; @@ -1019,18 +1047,40 @@ public function jsonSerialize() $a[self::FIELD_ENTITY] = $vs; } if (null !== ($v = $this->getOutcome())) { - $a[self::FIELD_OUTCOME] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_OUTCOME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_OUTCOME_EXT] = $enc; + } + } else { + $a[self::FIELD_OUTCOME] = $v; + } } if (null !== ($v = $this->getOutcomeDesc())) { - $a[self::FIELD_OUTCOME_DESC] = $v->getValue(); - $a[self::FIELD_OUTCOME_DESC_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_OUTCOME_DESC] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_OUTCOME_DESC_EXT] = $enc; + } + } else { + $a[self::FIELD_OUTCOME_DESC] = $v; + } } if ([] !== ($vs = $this->getPurposeOfEvent())) { $a[self::FIELD_PURPOSE_OF_EVENT] = $vs; } if (null !== ($v = $this->getRecorded())) { - $a[self::FIELD_RECORDED] = $v->getValue(); - $a[self::FIELD_RECORDED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_RECORDED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_RECORDED_EXT] = $enc; + } + } else { + $a[self::FIELD_RECORDED] = $v; + } } if (null !== ($v = $this->getSource())) { $a[self::FIELD_SOURCE] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRBasic.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRBasic.php index 2235377052..e9dff627de 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRBasic.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRBasic.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -84,10 +84,6 @@ class FHIRBasic extends FHIRDomainResource implements PHPFHIRContainedTypeInterf { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_BASIC; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_AUTHOR = 'author'; const FIELD_CODE = 'code'; const FIELD_CREATED = 'created'; @@ -156,6 +152,9 @@ class FHIRBasic extends FHIRDomainResource implements PHPFHIRContainedTypeInterf */ protected $subject = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRBasic Constructor * @param null|array $data @@ -192,8 +191,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CREATED] instanceof FHIRDate) { $this->setCreated($data[self::FIELD_CREATED]); - } elseif ($ext && is_scalar($data[self::FIELD_CREATED])) { - $this->setCreated(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_CREATED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CREATED])) { + $this->setCreated(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_CREATED]] + $ext)); + } else if (is_array($data[self::FIELD_CREATED])) { + $this->setCreated(new FHIRDate(array_merge($ext, $data[self::FIELD_CREATED]))); + } } else { $this->setCreated(new FHIRDate($data[self::FIELD_CREATED])); } @@ -204,17 +207,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -555,14 +565,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getAuthor())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AUTHOR, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getCreated())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CREATED, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -571,7 +579,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getSubject())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBJECT, null, $v->_getFHIRXMLNamespace())); } @@ -591,11 +598,34 @@ public function jsonSerialize() $a[self::FIELD_CODE] = $v; } if (null !== ($v = $this->getCreated())) { - $a[self::FIELD_CREATED] = $v->getValue(); - $a[self::FIELD_CREATED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CREATED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CREATED_EXT] = $enc; + } + } else { + $a[self::FIELD_CREATED] = $v; + } } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if (null !== ($v = $this->getSubject())) { $a[self::FIELD_SUBJECT] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRBodySite.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRBodySite.php index 6f8db9686d..2df3bd8a0d 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRBodySite.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRBodySite.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -86,10 +86,6 @@ class FHIRBodySite extends FHIRDomainResource implements PHPFHIRContainedTypeInt { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_BODY_SITE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ACTIVE = 'active'; const FIELD_ACTIVE_EXT = '_active'; const FIELD_CODE = 'code'; @@ -180,6 +176,9 @@ class FHIRBodySite extends FHIRDomainResource implements PHPFHIRContainedTypeInt */ protected $qualifier = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRBodySite Constructor * @param null|array $data @@ -202,8 +201,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ACTIVE] instanceof FHIRBoolean) { $this->setActive($data[self::FIELD_ACTIVE]); - } elseif ($ext && is_scalar($data[self::FIELD_ACTIVE])) { - $this->setActive(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_ACTIVE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ACTIVE])) { + $this->setActive(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_ACTIVE]] + $ext)); + } else if (is_array($data[self::FIELD_ACTIVE])) { + $this->setActive(new FHIRBoolean(array_merge($ext, $data[self::FIELD_ACTIVE]))); + } } else { $this->setActive(new FHIRBoolean($data[self::FIELD_ACTIVE])); } @@ -221,8 +224,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -233,17 +240,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -252,6 +266,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_IMAGE])) { if (is_array($data[self::FIELD_IMAGE])) { foreach($data[self::FIELD_IMAGE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRAttachment) { $this->addImage($v); } else { @@ -274,6 +291,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_QUALIFIER])) { if (is_array($data[self::FIELD_QUALIFIER])) { foreach($data[self::FIELD_QUALIFIER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addQualifier($v); } else { @@ -738,17 +758,16 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getActive())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ACTIVE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getDescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESCRIPTION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -757,7 +776,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getImage())) { foreach($vs as $v) { if (null === $v) { @@ -766,11 +784,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_IMAGE, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getPatient())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATIENT, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getQualifier())) { foreach($vs as $v) { if (null === $v) { @@ -789,18 +805,48 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getActive())) { - $a[self::FIELD_ACTIVE] = $v->getValue(); - $a[self::FIELD_ACTIVE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ACTIVE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ACTIVE_EXT] = $enc; + } + } else { + $a[self::FIELD_ACTIVE] = $v; + } } if (null !== ($v = $this->getCode())) { $a[self::FIELD_CODE] = $v; } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if ([] !== ($vs = $this->getImage())) { $a[self::FIELD_IMAGE] = $vs; diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRCapabilityStatement.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRCapabilityStatement.php index 40a8cf4820..a3a7d947e0 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRCapabilityStatement.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRCapabilityStatement.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -99,10 +99,6 @@ class FHIRCapabilityStatement extends FHIRDomainResource implements PHPFHIRConta { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CAPABILITY_STATEMENT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ACCEPT_UNKNOWN = 'acceptUnknown'; const FIELD_ACCEPT_UNKNOWN_EXT = '_acceptUnknown'; const FIELD_CONTACT = 'contact'; @@ -521,6 +517,9 @@ class FHIRCapabilityStatement extends FHIRDomainResource implements PHPFHIRConta */ protected $version = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRCapabilityStatement Constructor * @param null|array $data @@ -543,8 +542,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ACCEPT_UNKNOWN] instanceof FHIRUnknownContentCode) { $this->setAcceptUnknown($data[self::FIELD_ACCEPT_UNKNOWN]); - } elseif ($ext && is_scalar($data[self::FIELD_ACCEPT_UNKNOWN])) { - $this->setAcceptUnknown(new FHIRUnknownContentCode([FHIRUnknownContentCode::FIELD_VALUE => $data[self::FIELD_ACCEPT_UNKNOWN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ACCEPT_UNKNOWN])) { + $this->setAcceptUnknown(new FHIRUnknownContentCode([FHIRUnknownContentCode::FIELD_VALUE => $data[self::FIELD_ACCEPT_UNKNOWN]] + $ext)); + } else if (is_array($data[self::FIELD_ACCEPT_UNKNOWN])) { + $this->setAcceptUnknown(new FHIRUnknownContentCode(array_merge($ext, $data[self::FIELD_ACCEPT_UNKNOWN]))); + } } else { $this->setAcceptUnknown(new FHIRUnknownContentCode($data[self::FIELD_ACCEPT_UNKNOWN])); } @@ -552,6 +555,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CONTACT])) { if (is_array($data[self::FIELD_CONTACT])) { foreach($data[self::FIELD_CONTACT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContactDetail) { $this->addContact($v); } else { @@ -570,8 +576,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_COPYRIGHT] instanceof FHIRMarkdown) { $this->setCopyright($data[self::FIELD_COPYRIGHT]); - } elseif ($ext && is_scalar($data[self::FIELD_COPYRIGHT])) { - $this->setCopyright(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_COPYRIGHT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_COPYRIGHT])) { + $this->setCopyright(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_COPYRIGHT]] + $ext)); + } else if (is_array($data[self::FIELD_COPYRIGHT])) { + $this->setCopyright(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_COPYRIGHT]))); + } } else { $this->setCopyright(new FHIRMarkdown($data[self::FIELD_COPYRIGHT])); } @@ -582,8 +592,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATE] instanceof FHIRDateTime) { $this->setDate($data[self::FIELD_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_DATE])) { - $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime(array_merge($ext, $data[self::FIELD_DATE]))); + } } else { $this->setDate(new FHIRDateTime($data[self::FIELD_DATE])); } @@ -594,8 +608,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRMarkdown) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRMarkdown($data[self::FIELD_DESCRIPTION])); } @@ -603,6 +621,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_DOCUMENT])) { if (is_array($data[self::FIELD_DOCUMENT])) { foreach($data[self::FIELD_DOCUMENT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCapabilityStatementDocument) { $this->addDocument($v); } else { @@ -621,8 +642,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EXPERIMENTAL] instanceof FHIRBoolean) { $this->setExperimental($data[self::FIELD_EXPERIMENTAL]); - } elseif ($ext && is_scalar($data[self::FIELD_EXPERIMENTAL])) { - $this->setExperimental(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_EXPERIMENTAL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EXPERIMENTAL])) { + $this->setExperimental(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_EXPERIMENTAL]] + $ext)); + } else if (is_array($data[self::FIELD_EXPERIMENTAL])) { + $this->setExperimental(new FHIRBoolean(array_merge($ext, $data[self::FIELD_EXPERIMENTAL]))); + } } else { $this->setExperimental(new FHIRBoolean($data[self::FIELD_EXPERIMENTAL])); } @@ -633,8 +658,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_FHIR_VERSION] instanceof FHIRId) { $this->setFhirVersion($data[self::FIELD_FHIR_VERSION]); - } elseif ($ext && is_scalar($data[self::FIELD_FHIR_VERSION])) { - $this->setFhirVersion(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_FHIR_VERSION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_FHIR_VERSION])) { + $this->setFhirVersion(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_FHIR_VERSION]] + $ext)); + } else if (is_array($data[self::FIELD_FHIR_VERSION])) { + $this->setFhirVersion(new FHIRId(array_merge($ext, $data[self::FIELD_FHIR_VERSION]))); + } } else { $this->setFhirVersion(new FHIRId($data[self::FIELD_FHIR_VERSION])); } @@ -645,17 +674,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_FORMAT])) { foreach($data[self::FIELD_FORMAT] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCode) { $this->addFormat($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addFormat(new FHIRCode([FHIRCode::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addFormat(new FHIRCode([FHIRCode::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addFormat(new FHIRCode(array_merge($v, $ext[$i]))); + } } else { $this->addFormat(new FHIRCode($v)); } } } elseif ($data[self::FIELD_FORMAT] instanceof FHIRCode) { $this->addFormat($data[self::FIELD_FORMAT]); - } elseif ($ext && is_scalar($data[self::FIELD_FORMAT])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_FORMAT])) { $this->addFormat(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_FORMAT]] + $ext)); } else { $this->addFormat(new FHIRCode($data[self::FIELD_FORMAT])); @@ -674,17 +710,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IMPLEMENTATION_GUIDE])) { foreach($data[self::FIELD_IMPLEMENTATION_GUIDE] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRUri) { $this->addImplementationGuide($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addImplementationGuide(new FHIRUri([FHIRUri::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addImplementationGuide(new FHIRUri([FHIRUri::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addImplementationGuide(new FHIRUri(array_merge($v, $ext[$i]))); + } } else { $this->addImplementationGuide(new FHIRUri($v)); } } } elseif ($data[self::FIELD_IMPLEMENTATION_GUIDE] instanceof FHIRUri) { $this->addImplementationGuide($data[self::FIELD_IMPLEMENTATION_GUIDE]); - } elseif ($ext && is_scalar($data[self::FIELD_IMPLEMENTATION_GUIDE])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IMPLEMENTATION_GUIDE])) { $this->addImplementationGuide(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_IMPLEMENTATION_GUIDE]] + $ext)); } else { $this->addImplementationGuide(new FHIRUri($data[self::FIELD_IMPLEMENTATION_GUIDE])); @@ -696,17 +739,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_INSTANTIATES])) { foreach($data[self::FIELD_INSTANTIATES] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRUri) { $this->addInstantiates($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addInstantiates(new FHIRUri([FHIRUri::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addInstantiates(new FHIRUri([FHIRUri::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addInstantiates(new FHIRUri(array_merge($v, $ext[$i]))); + } } else { $this->addInstantiates(new FHIRUri($v)); } } } elseif ($data[self::FIELD_INSTANTIATES] instanceof FHIRUri) { $this->addInstantiates($data[self::FIELD_INSTANTIATES]); - } elseif ($ext && is_scalar($data[self::FIELD_INSTANTIATES])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_INSTANTIATES])) { $this->addInstantiates(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_INSTANTIATES]] + $ext)); } else { $this->addInstantiates(new FHIRUri($data[self::FIELD_INSTANTIATES])); @@ -715,6 +765,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_JURISDICTION])) { if (is_array($data[self::FIELD_JURISDICTION])) { foreach($data[self::FIELD_JURISDICTION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addJurisdiction($v); } else { @@ -733,8 +786,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_KIND] instanceof FHIRCapabilityStatementKind) { $this->setKind($data[self::FIELD_KIND]); - } elseif ($ext && is_scalar($data[self::FIELD_KIND])) { - $this->setKind(new FHIRCapabilityStatementKind([FHIRCapabilityStatementKind::FIELD_VALUE => $data[self::FIELD_KIND]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_KIND])) { + $this->setKind(new FHIRCapabilityStatementKind([FHIRCapabilityStatementKind::FIELD_VALUE => $data[self::FIELD_KIND]] + $ext)); + } else if (is_array($data[self::FIELD_KIND])) { + $this->setKind(new FHIRCapabilityStatementKind(array_merge($ext, $data[self::FIELD_KIND]))); + } } else { $this->setKind(new FHIRCapabilityStatementKind($data[self::FIELD_KIND])); } @@ -742,6 +799,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_MESSAGING])) { if (is_array($data[self::FIELD_MESSAGING])) { foreach($data[self::FIELD_MESSAGING] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCapabilityStatementMessaging) { $this->addMessaging($v); } else { @@ -760,8 +820,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -772,17 +836,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_PATCH_FORMAT])) { foreach($data[self::FIELD_PATCH_FORMAT] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCode) { $this->addPatchFormat($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addPatchFormat(new FHIRCode([FHIRCode::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addPatchFormat(new FHIRCode([FHIRCode::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addPatchFormat(new FHIRCode(array_merge($v, $ext[$i]))); + } } else { $this->addPatchFormat(new FHIRCode($v)); } } } elseif ($data[self::FIELD_PATCH_FORMAT] instanceof FHIRCode) { $this->addPatchFormat($data[self::FIELD_PATCH_FORMAT]); - } elseif ($ext && is_scalar($data[self::FIELD_PATCH_FORMAT])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_PATCH_FORMAT])) { $this->addPatchFormat(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_PATCH_FORMAT]] + $ext)); } else { $this->addPatchFormat(new FHIRCode($data[self::FIELD_PATCH_FORMAT])); @@ -791,6 +862,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PROFILE])) { if (is_array($data[self::FIELD_PROFILE])) { foreach($data[self::FIELD_PROFILE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addProfile($v); } else { @@ -809,8 +883,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PUBLISHER] instanceof FHIRString) { $this->setPublisher($data[self::FIELD_PUBLISHER]); - } elseif ($ext && is_scalar($data[self::FIELD_PUBLISHER])) { - $this->setPublisher(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PUBLISHER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PUBLISHER])) { + $this->setPublisher(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PUBLISHER]] + $ext)); + } else if (is_array($data[self::FIELD_PUBLISHER])) { + $this->setPublisher(new FHIRString(array_merge($ext, $data[self::FIELD_PUBLISHER]))); + } } else { $this->setPublisher(new FHIRString($data[self::FIELD_PUBLISHER])); } @@ -821,8 +899,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PURPOSE] instanceof FHIRMarkdown) { $this->setPurpose($data[self::FIELD_PURPOSE]); - } elseif ($ext && is_scalar($data[self::FIELD_PURPOSE])) { - $this->setPurpose(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_PURPOSE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PURPOSE])) { + $this->setPurpose(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_PURPOSE]] + $ext)); + } else if (is_array($data[self::FIELD_PURPOSE])) { + $this->setPurpose(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_PURPOSE]))); + } } else { $this->setPurpose(new FHIRMarkdown($data[self::FIELD_PURPOSE])); } @@ -830,6 +912,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REST])) { if (is_array($data[self::FIELD_REST])) { foreach($data[self::FIELD_REST] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCapabilityStatementRest) { $this->addRest($v); } else { @@ -855,8 +940,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRPublicationStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRPublicationStatus([FHIRPublicationStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRPublicationStatus([FHIRPublicationStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRPublicationStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRPublicationStatus($data[self::FIELD_STATUS])); } @@ -867,8 +956,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TITLE] instanceof FHIRString) { $this->setTitle($data[self::FIELD_TITLE]); - } elseif ($ext && is_scalar($data[self::FIELD_TITLE])) { - $this->setTitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TITLE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TITLE])) { + $this->setTitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TITLE]] + $ext)); + } else if (is_array($data[self::FIELD_TITLE])) { + $this->setTitle(new FHIRString(array_merge($ext, $data[self::FIELD_TITLE]))); + } } else { $this->setTitle(new FHIRString($data[self::FIELD_TITLE])); } @@ -879,8 +972,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_URL] instanceof FHIRUri) { $this->setUrl($data[self::FIELD_URL]); - } elseif ($ext && is_scalar($data[self::FIELD_URL])) { - $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } else if (is_array($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri(array_merge($ext, $data[self::FIELD_URL]))); + } } else { $this->setUrl(new FHIRUri($data[self::FIELD_URL])); } @@ -888,6 +985,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_USE_CONTEXT])) { if (is_array($data[self::FIELD_USE_CONTEXT])) { foreach($data[self::FIELD_USE_CONTEXT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRUsageContext) { $this->addUseContext($v); } else { @@ -906,8 +1006,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VERSION] instanceof FHIRString) { $this->setVersion($data[self::FIELD_VERSION]); - } elseif ($ext && is_scalar($data[self::FIELD_VERSION])) { - $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } else if (is_array($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString(array_merge($ext, $data[self::FIELD_VERSION]))); + } } else { $this->setVersion(new FHIRString($data[self::FIELD_VERSION])); } @@ -2561,7 +2665,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getAcceptUnknown())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ACCEPT_UNKNOWN, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getContact())) { foreach($vs as $v) { if (null === $v) { @@ -2579,7 +2682,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESCRIPTION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getDocument())) { foreach($vs as $v) { if (null === $v) { @@ -2602,7 +2704,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_FORMAT, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getImplementation())) { $v->xmlSerialize($sxe->addChild(self::FIELD_IMPLEMENTATION, null, $v->_getFHIRXMLNamespace())); } @@ -2622,7 +2723,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_INSTANTIATES, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getJurisdiction())) { foreach($vs as $v) { if (null === $v) { @@ -2631,11 +2731,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_JURISDICTION, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getKind())) { $v->xmlSerialize($sxe->addChild(self::FIELD_KIND, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getMessaging())) { foreach($vs as $v) { if (null === $v) { @@ -2655,7 +2753,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_PATCH_FORMAT, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getProfile())) { foreach($vs as $v) { if (null === $v) { @@ -2670,7 +2767,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getPurpose())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PURPOSE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getRest())) { foreach($vs as $v) { if (null === $v) { @@ -2679,11 +2775,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_REST, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getSoftware())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SOFTWARE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } @@ -2693,7 +2787,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getUrl())) { $v->xmlSerialize($sxe->addChild(self::FIELD_URL, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getUseContext())) { foreach($vs as $v) { if (null === $v) { @@ -2715,33 +2808,76 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getAcceptUnknown())) { - $a[self::FIELD_ACCEPT_UNKNOWN] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ACCEPT_UNKNOWN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ACCEPT_UNKNOWN_EXT] = $enc; + } + } else { + $a[self::FIELD_ACCEPT_UNKNOWN] = $v; + } } if ([] !== ($vs = $this->getContact())) { $a[self::FIELD_CONTACT] = $vs; } if (null !== ($v = $this->getCopyright())) { - $a[self::FIELD_COPYRIGHT] = $v->getValue(); - $a[self::FIELD_COPYRIGHT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_COPYRIGHT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_COPYRIGHT_EXT] = $enc; + } + } else { + $a[self::FIELD_COPYRIGHT] = $v; + } } if (null !== ($v = $this->getDate())) { - $a[self::FIELD_DATE] = $v->getValue(); - $a[self::FIELD_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_DATE] = $v; + } } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if ([] !== ($vs = $this->getDocument())) { $a[self::FIELD_DOCUMENT] = $vs; } if (null !== ($v = $this->getExperimental())) { - $a[self::FIELD_EXPERIMENTAL] = $v->getValue(); - $a[self::FIELD_EXPERIMENTAL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EXPERIMENTAL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EXPERIMENTAL_EXT] = $enc; + } + } else { + $a[self::FIELD_EXPERIMENTAL] = $v; + } } if (null !== ($v = $this->getFhirVersion())) { - $a[self::FIELD_FHIR_VERSION] = $v->getValue(); - $a[self::FIELD_FHIR_VERSION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FHIR_VERSION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FHIR_VERSION_EXT] = $enc; + } + } else { + $a[self::FIELD_FHIR_VERSION] = $v; + } } if ([] !== ($vs = $this->getFormat())) { $a[self::FIELD_FORMAT] = []; @@ -2749,8 +2885,17 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_FORMAT][] = $v->getValue(); - $a[self::FIELD_FORMAT_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FORMAT][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FORMAT_EXT][] = $enc; + } else { + $a[self::FIELD_FORMAT_EXT][] = null; + } + } else { + $a[self::FIELD_FORMAT][] = $v; + } } } if (null !== ($v = $this->getImplementation())) { @@ -2762,8 +2907,17 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_IMPLEMENTATION_GUIDE][] = $v->getValue(); - $a[self::FIELD_IMPLEMENTATION_GUIDE_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IMPLEMENTATION_GUIDE][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IMPLEMENTATION_GUIDE_EXT][] = $enc; + } else { + $a[self::FIELD_IMPLEMENTATION_GUIDE_EXT][] = null; + } + } else { + $a[self::FIELD_IMPLEMENTATION_GUIDE][] = $v; + } } } if ([] !== ($vs = $this->getInstantiates())) { @@ -2772,22 +2926,46 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_INSTANTIATES][] = $v->getValue(); - $a[self::FIELD_INSTANTIATES_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_INSTANTIATES][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_INSTANTIATES_EXT][] = $enc; + } else { + $a[self::FIELD_INSTANTIATES_EXT][] = null; + } + } else { + $a[self::FIELD_INSTANTIATES][] = $v; + } } } if ([] !== ($vs = $this->getJurisdiction())) { $a[self::FIELD_JURISDICTION] = $vs; } if (null !== ($v = $this->getKind())) { - $a[self::FIELD_KIND] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_KIND] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_KIND_EXT] = $enc; + } + } else { + $a[self::FIELD_KIND] = $v; + } } if ([] !== ($vs = $this->getMessaging())) { $a[self::FIELD_MESSAGING] = $vs; } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if ([] !== ($vs = $this->getPatchFormat())) { $a[self::FIELD_PATCH_FORMAT] = []; @@ -2795,20 +2973,43 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_PATCH_FORMAT][] = $v->getValue(); - $a[self::FIELD_PATCH_FORMAT_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PATCH_FORMAT][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PATCH_FORMAT_EXT][] = $enc; + } else { + $a[self::FIELD_PATCH_FORMAT_EXT][] = null; + } + } else { + $a[self::FIELD_PATCH_FORMAT][] = $v; + } } } if ([] !== ($vs = $this->getProfile())) { $a[self::FIELD_PROFILE] = $vs; } if (null !== ($v = $this->getPublisher())) { - $a[self::FIELD_PUBLISHER] = $v->getValue(); - $a[self::FIELD_PUBLISHER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PUBLISHER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PUBLISHER_EXT] = $enc; + } + } else { + $a[self::FIELD_PUBLISHER] = $v; + } } if (null !== ($v = $this->getPurpose())) { - $a[self::FIELD_PURPOSE] = $v->getValue(); - $a[self::FIELD_PURPOSE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PURPOSE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PURPOSE_EXT] = $enc; + } + } else { + $a[self::FIELD_PURPOSE] = $v; + } } if ([] !== ($vs = $this->getRest())) { $a[self::FIELD_REST] = $vs; @@ -2817,22 +3018,51 @@ public function jsonSerialize() $a[self::FIELD_SOFTWARE] = $v; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getTitle())) { - $a[self::FIELD_TITLE] = $v->getValue(); - $a[self::FIELD_TITLE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TITLE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TITLE_EXT] = $enc; + } + } else { + $a[self::FIELD_TITLE] = $v; + } } if (null !== ($v = $this->getUrl())) { - $a[self::FIELD_URL] = $v->getValue(); - $a[self::FIELD_URL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_URL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_URL_EXT] = $enc; + } + } else { + $a[self::FIELD_URL] = $v; + } } if ([] !== ($vs = $this->getUseContext())) { $a[self::FIELD_USE_CONTEXT] = $vs; } if (null !== ($v = $this->getVersion())) { - $a[self::FIELD_VERSION] = $v->getValue(); - $a[self::FIELD_VERSION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VERSION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VERSION_EXT] = $enc; + } + } else { + $a[self::FIELD_VERSION] = $v; + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRCarePlan.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRCarePlan.php index 7dfa6f7815..3af8be41b7 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRCarePlan.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRCarePlan.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -89,10 +89,6 @@ class FHIRCarePlan extends FHIRDomainResource implements PHPFHIRContainedTypeInt { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CARE_PLAN; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ACTIVITY = 'activity'; const FIELD_ADDRESSES = 'addresses'; const FIELD_AUTHOR = 'author'; @@ -355,6 +351,9 @@ class FHIRCarePlan extends FHIRDomainResource implements PHPFHIRContainedTypeInt */ protected $title = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRCarePlan Constructor * @param null|array $data @@ -374,6 +373,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ACTIVITY])) { if (is_array($data[self::FIELD_ACTIVITY])) { foreach($data[self::FIELD_ACTIVITY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCarePlanActivity) { $this->addActivity($v); } else { @@ -389,6 +391,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ADDRESSES])) { if (is_array($data[self::FIELD_ADDRESSES])) { foreach($data[self::FIELD_ADDRESSES] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addAddresses($v); } else { @@ -404,6 +409,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_AUTHOR])) { if (is_array($data[self::FIELD_AUTHOR])) { foreach($data[self::FIELD_AUTHOR] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addAuthor($v); } else { @@ -419,6 +427,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_BASED_ON])) { if (is_array($data[self::FIELD_BASED_ON])) { foreach($data[self::FIELD_BASED_ON] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addBasedOn($v); } else { @@ -434,6 +445,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CARE_TEAM])) { if (is_array($data[self::FIELD_CARE_TEAM])) { foreach($data[self::FIELD_CARE_TEAM] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addCareTeam($v); } else { @@ -449,6 +463,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CATEGORY])) { if (is_array($data[self::FIELD_CATEGORY])) { foreach($data[self::FIELD_CATEGORY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addCategory($v); } else { @@ -471,6 +488,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_DEFINITION])) { if (is_array($data[self::FIELD_DEFINITION])) { foreach($data[self::FIELD_DEFINITION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addDefinition($v); } else { @@ -489,8 +509,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -498,6 +522,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_GOAL])) { if (is_array($data[self::FIELD_GOAL])) { foreach($data[self::FIELD_GOAL] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addGoal($v); } else { @@ -516,17 +543,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -538,8 +572,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_INTENT] instanceof FHIRCarePlanIntent) { $this->setIntent($data[self::FIELD_INTENT]); - } elseif ($ext && is_scalar($data[self::FIELD_INTENT])) { - $this->setIntent(new FHIRCarePlanIntent([FHIRCarePlanIntent::FIELD_VALUE => $data[self::FIELD_INTENT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_INTENT])) { + $this->setIntent(new FHIRCarePlanIntent([FHIRCarePlanIntent::FIELD_VALUE => $data[self::FIELD_INTENT]] + $ext)); + } else if (is_array($data[self::FIELD_INTENT])) { + $this->setIntent(new FHIRCarePlanIntent(array_merge($ext, $data[self::FIELD_INTENT]))); + } } else { $this->setIntent(new FHIRCarePlanIntent($data[self::FIELD_INTENT])); } @@ -547,6 +585,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_NOTE])) { if (is_array($data[self::FIELD_NOTE])) { foreach($data[self::FIELD_NOTE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRAnnotation) { $this->addNote($v); } else { @@ -562,6 +603,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PART_OF])) { if (is_array($data[self::FIELD_PART_OF])) { foreach($data[self::FIELD_PART_OF] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addPartOf($v); } else { @@ -584,6 +628,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REPLACES])) { if (is_array($data[self::FIELD_REPLACES])) { foreach($data[self::FIELD_REPLACES] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addReplaces($v); } else { @@ -602,8 +649,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRCarePlanStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRCarePlanStatus([FHIRCarePlanStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRCarePlanStatus([FHIRCarePlanStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRCarePlanStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRCarePlanStatus($data[self::FIELD_STATUS])); } @@ -618,6 +669,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SUPPORTING_INFO])) { if (is_array($data[self::FIELD_SUPPORTING_INFO])) { foreach($data[self::FIELD_SUPPORTING_INFO] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addSupportingInfo($v); } else { @@ -636,8 +690,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TITLE] instanceof FHIRString) { $this->setTitle($data[self::FIELD_TITLE]); - } elseif ($ext && is_scalar($data[self::FIELD_TITLE])) { - $this->setTitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TITLE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TITLE])) { + $this->setTitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TITLE]] + $ext)); + } else if (is_array($data[self::FIELD_TITLE])) { + $this->setTitle(new FHIRString(array_merge($ext, $data[self::FIELD_TITLE]))); + } } else { $this->setTitle(new FHIRString($data[self::FIELD_TITLE])); } @@ -1852,7 +1910,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_ACTIVITY, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getAddresses())) { foreach($vs as $v) { if (null === $v) { @@ -1861,7 +1918,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_ADDRESSES, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getAuthor())) { foreach($vs as $v) { if (null === $v) { @@ -1870,7 +1926,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_AUTHOR, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getBasedOn())) { foreach($vs as $v) { if (null === $v) { @@ -1879,7 +1934,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_BASED_ON, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getCareTeam())) { foreach($vs as $v) { if (null === $v) { @@ -1888,7 +1942,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_CARE_TEAM, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getCategory())) { foreach($vs as $v) { if (null === $v) { @@ -1897,11 +1950,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_CATEGORY, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getContext())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CONTEXT, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getDefinition())) { foreach($vs as $v) { if (null === $v) { @@ -1913,7 +1964,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESCRIPTION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getGoal())) { foreach($vs as $v) { if (null === $v) { @@ -1922,7 +1972,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_GOAL, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -1931,11 +1980,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getIntent())) { $v->xmlSerialize($sxe->addChild(self::FIELD_INTENT, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getNote())) { foreach($vs as $v) { if (null === $v) { @@ -1944,7 +1991,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_NOTE, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getPartOf())) { foreach($vs as $v) { if (null === $v) { @@ -1953,11 +1999,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_PART_OF, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getReplaces())) { foreach($vs as $v) { if (null === $v) { @@ -1966,15 +2010,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_REPLACES, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSubject())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBJECT, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getSupportingInfo())) { foreach($vs as $v) { if (null === $v) { @@ -2020,17 +2061,48 @@ public function jsonSerialize() $a[self::FIELD_DEFINITION] = $vs; } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if ([] !== ($vs = $this->getGoal())) { $a[self::FIELD_GOAL] = $vs; } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if (null !== ($v = $this->getIntent())) { - $a[self::FIELD_INTENT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_INTENT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_INTENT_EXT] = $enc; + } + } else { + $a[self::FIELD_INTENT] = $v; + } } if ([] !== ($vs = $this->getNote())) { $a[self::FIELD_NOTE] = $vs; @@ -2045,7 +2117,15 @@ public function jsonSerialize() $a[self::FIELD_REPLACES] = $vs; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getSubject())) { $a[self::FIELD_SUBJECT] = $v; @@ -2054,8 +2134,15 @@ public function jsonSerialize() $a[self::FIELD_SUPPORTING_INFO] = $vs; } if (null !== ($v = $this->getTitle())) { - $a[self::FIELD_TITLE] = $v->getValue(); - $a[self::FIELD_TITLE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TITLE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TITLE_EXT] = $enc; + } + } else { + $a[self::FIELD_TITLE] = $v; + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRCareTeam.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRCareTeam.php index e09c804197..66c68be0ab 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRCareTeam.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRCareTeam.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -87,10 +87,6 @@ class FHIRCareTeam extends FHIRDomainResource implements PHPFHIRContainedTypeInt { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CARE_TEAM; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CATEGORY = 'category'; const FIELD_CONTEXT = 'context'; const FIELD_IDENTIFIER = 'identifier'; @@ -247,6 +243,9 @@ class FHIRCareTeam extends FHIRDomainResource implements PHPFHIRContainedTypeInt */ protected $subject = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRCareTeam Constructor * @param null|array $data @@ -266,6 +265,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CATEGORY])) { if (is_array($data[self::FIELD_CATEGORY])) { foreach($data[self::FIELD_CATEGORY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addCategory($v); } else { @@ -291,17 +293,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -310,6 +319,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_MANAGING_ORGANIZATION])) { if (is_array($data[self::FIELD_MANAGING_ORGANIZATION])) { foreach($data[self::FIELD_MANAGING_ORGANIZATION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addManagingOrganization($v); } else { @@ -328,8 +340,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -337,6 +353,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_NOTE])) { if (is_array($data[self::FIELD_NOTE])) { foreach($data[self::FIELD_NOTE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRAnnotation) { $this->addNote($v); } else { @@ -352,6 +371,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PARTICIPANT])) { if (is_array($data[self::FIELD_PARTICIPANT])) { foreach($data[self::FIELD_PARTICIPANT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCareTeamParticipant) { $this->addParticipant($v); } else { @@ -374,6 +396,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REASON_CODE])) { if (is_array($data[self::FIELD_REASON_CODE])) { foreach($data[self::FIELD_REASON_CODE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addReasonCode($v); } else { @@ -389,6 +414,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REASON_REFERENCE])) { if (is_array($data[self::FIELD_REASON_REFERENCE])) { foreach($data[self::FIELD_REASON_REFERENCE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addReasonReference($v); } else { @@ -407,8 +435,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRCareTeamStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRCareTeamStatus([FHIRCareTeamStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRCareTeamStatus([FHIRCareTeamStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRCareTeamStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRCareTeamStatus($data[self::FIELD_STATUS])); } @@ -1164,11 +1196,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_CATEGORY, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getContext())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CONTEXT, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -1177,7 +1207,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getManagingOrganization())) { foreach($vs as $v) { if (null === $v) { @@ -1189,7 +1218,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NAME, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getNote())) { foreach($vs as $v) { if (null === $v) { @@ -1198,7 +1226,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_NOTE, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getParticipant())) { foreach($vs as $v) { if (null === $v) { @@ -1207,11 +1234,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_PARTICIPANT, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getReasonCode())) { foreach($vs as $v) { if (null === $v) { @@ -1220,7 +1245,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_REASON_CODE, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getReasonReference())) { foreach($vs as $v) { if (null === $v) { @@ -1229,11 +1253,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_REASON_REFERENCE, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSubject())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBJECT, null, $v->_getFHIRXMLNamespace())); } @@ -1253,14 +1275,37 @@ public function jsonSerialize() $a[self::FIELD_CONTEXT] = $v; } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if ([] !== ($vs = $this->getManagingOrganization())) { $a[self::FIELD_MANAGING_ORGANIZATION] = $vs; } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if ([] !== ($vs = $this->getNote())) { $a[self::FIELD_NOTE] = $vs; @@ -1278,7 +1323,15 @@ public function jsonSerialize() $a[self::FIELD_REASON_REFERENCE] = $vs; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getSubject())) { $a[self::FIELD_SUBJECT] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRChargeItem.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRChargeItem.php index 729b5e68da..d2caab17aa 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRChargeItem.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRChargeItem.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -96,10 +96,6 @@ class FHIRChargeItem extends FHIRDomainResource implements PHPFHIRContainedTypeI { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CHARGE_ITEM; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ACCOUNT = 'account'; const FIELD_BODYSITE = 'bodysite'; const FIELD_CODE = 'code'; @@ -124,6 +120,7 @@ class FHIRChargeItem extends FHIRDomainResource implements PHPFHIRContainedTypeI const FIELD_PARTICIPANT = 'participant'; const FIELD_PERFORMING_ORGANIZATION = 'performingOrganization'; const FIELD_PRICE_OVERRIDE = 'priceOverride'; + const FIELD_PRICE_OVERRIDE_EXT = '_priceOverride'; const FIELD_QUANTITY = 'quantity'; const FIELD_QUANTITY_EXT = '_quantity'; const FIELD_REASON = 'reason'; @@ -430,6 +427,9 @@ class FHIRChargeItem extends FHIRDomainResource implements PHPFHIRContainedTypeI */ protected $supportingInformation = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRChargeItem Constructor * @param null|array $data @@ -449,6 +449,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ACCOUNT])) { if (is_array($data[self::FIELD_ACCOUNT])) { foreach($data[self::FIELD_ACCOUNT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addAccount($v); } else { @@ -464,6 +467,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_BODYSITE])) { if (is_array($data[self::FIELD_BODYSITE])) { foreach($data[self::FIELD_BODYSITE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addBodysite($v); } else { @@ -496,17 +502,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_DEFINITION])) { foreach($data[self::FIELD_DEFINITION] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRUri) { $this->addDefinition($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addDefinition(new FHIRUri([FHIRUri::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addDefinition(new FHIRUri([FHIRUri::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addDefinition(new FHIRUri(array_merge($v, $ext[$i]))); + } } else { $this->addDefinition(new FHIRUri($v)); } } } elseif ($data[self::FIELD_DEFINITION] instanceof FHIRUri) { $this->addDefinition($data[self::FIELD_DEFINITION]); - } elseif ($ext && is_scalar($data[self::FIELD_DEFINITION])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_DEFINITION])) { $this->addDefinition(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_DEFINITION]] + $ext)); } else { $this->addDefinition(new FHIRUri($data[self::FIELD_DEFINITION])); @@ -518,8 +531,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ENTERED_DATE] instanceof FHIRDateTime) { $this->setEnteredDate($data[self::FIELD_ENTERED_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_ENTERED_DATE])) { - $this->setEnteredDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_ENTERED_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ENTERED_DATE])) { + $this->setEnteredDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_ENTERED_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_ENTERED_DATE])) { + $this->setEnteredDate(new FHIRDateTime(array_merge($ext, $data[self::FIELD_ENTERED_DATE]))); + } } else { $this->setEnteredDate(new FHIRDateTime($data[self::FIELD_ENTERED_DATE])); } @@ -537,8 +554,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_FACTOR_OVERRIDE] instanceof FHIRDecimal) { $this->setFactorOverride($data[self::FIELD_FACTOR_OVERRIDE]); - } elseif ($ext && is_scalar($data[self::FIELD_FACTOR_OVERRIDE])) { - $this->setFactorOverride(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_FACTOR_OVERRIDE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_FACTOR_OVERRIDE])) { + $this->setFactorOverride(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_FACTOR_OVERRIDE]] + $ext)); + } else if (is_array($data[self::FIELD_FACTOR_OVERRIDE])) { + $this->setFactorOverride(new FHIRDecimal(array_merge($ext, $data[self::FIELD_FACTOR_OVERRIDE]))); + } } else { $this->setFactorOverride(new FHIRDecimal($data[self::FIELD_FACTOR_OVERRIDE])); } @@ -549,8 +570,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->setIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { - $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_IDENTIFIER]))); + } } else { $this->setIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); } @@ -558,6 +583,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_NOTE])) { if (is_array($data[self::FIELD_NOTE])) { foreach($data[self::FIELD_NOTE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRAnnotation) { $this->addNote($v); } else { @@ -576,8 +604,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_OCCURRENCE_DATE_TIME] instanceof FHIRDateTime) { $this->setOccurrenceDateTime($data[self::FIELD_OCCURRENCE_DATE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_OCCURRENCE_DATE_TIME])) { - $this->setOccurrenceDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_OCCURRENCE_DATE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_OCCURRENCE_DATE_TIME])) { + $this->setOccurrenceDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_OCCURRENCE_DATE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_OCCURRENCE_DATE_TIME])) { + $this->setOccurrenceDateTime(new FHIRDateTime(array_merge($ext, $data[self::FIELD_OCCURRENCE_DATE_TIME]))); + } } else { $this->setOccurrenceDateTime(new FHIRDateTime($data[self::FIELD_OCCURRENCE_DATE_TIME])); } @@ -602,8 +634,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_OVERRIDE_REASON] instanceof FHIRString) { $this->setOverrideReason($data[self::FIELD_OVERRIDE_REASON]); - } elseif ($ext && is_scalar($data[self::FIELD_OVERRIDE_REASON])) { - $this->setOverrideReason(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_OVERRIDE_REASON]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_OVERRIDE_REASON])) { + $this->setOverrideReason(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_OVERRIDE_REASON]] + $ext)); + } else if (is_array($data[self::FIELD_OVERRIDE_REASON])) { + $this->setOverrideReason(new FHIRString(array_merge($ext, $data[self::FIELD_OVERRIDE_REASON]))); + } } else { $this->setOverrideReason(new FHIRString($data[self::FIELD_OVERRIDE_REASON])); } @@ -611,6 +647,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PART_OF])) { if (is_array($data[self::FIELD_PART_OF])) { foreach($data[self::FIELD_PART_OF] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addPartOf($v); } else { @@ -626,6 +665,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PARTICIPANT])) { if (is_array($data[self::FIELD_PARTICIPANT])) { foreach($data[self::FIELD_PARTICIPANT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRChargeItemParticipant) { $this->addParticipant($v); } else { @@ -646,8 +688,17 @@ public function __construct($data = null) } } if (isset($data[self::FIELD_PRICE_OVERRIDE])) { + $ext = (isset($data[self::FIELD_PRICE_OVERRIDE_EXT]) && is_array($data[self::FIELD_PRICE_OVERRIDE_EXT])) + ? $data[self::FIELD_PRICE_OVERRIDE_EXT] + : null; if ($data[self::FIELD_PRICE_OVERRIDE] instanceof FHIRMoney) { $this->setPriceOverride($data[self::FIELD_PRICE_OVERRIDE]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PRICE_OVERRIDE])) { + $this->setPriceOverride(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_PRICE_OVERRIDE]] + $ext)); + } else if (is_array($data[self::FIELD_PRICE_OVERRIDE])) { + $this->setPriceOverride(new FHIRMoney(array_merge($ext, $data[self::FIELD_PRICE_OVERRIDE]))); + } } else { $this->setPriceOverride(new FHIRMoney($data[self::FIELD_PRICE_OVERRIDE])); } @@ -658,8 +709,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_QUANTITY] instanceof FHIRQuantity) { $this->setQuantity($data[self::FIELD_QUANTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_QUANTITY])) { - $this->setQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_QUANTITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_QUANTITY])) { + $this->setQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_QUANTITY])) { + $this->setQuantity(new FHIRQuantity(array_merge($ext, $data[self::FIELD_QUANTITY]))); + } } else { $this->setQuantity(new FHIRQuantity($data[self::FIELD_QUANTITY])); } @@ -667,6 +722,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REASON])) { if (is_array($data[self::FIELD_REASON])) { foreach($data[self::FIELD_REASON] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addReason($v); } else { @@ -689,6 +747,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SERVICE])) { if (is_array($data[self::FIELD_SERVICE])) { foreach($data[self::FIELD_SERVICE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addService($v); } else { @@ -707,8 +768,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRChargeItemStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRChargeItemStatus([FHIRChargeItemStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRChargeItemStatus([FHIRChargeItemStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRChargeItemStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRChargeItemStatus($data[self::FIELD_STATUS])); } @@ -723,6 +788,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SUPPORTING_INFORMATION])) { if (is_array($data[self::FIELD_SUPPORTING_INFORMATION])) { foreach($data[self::FIELD_SUPPORTING_INFORMATION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addSupportingInformation($v); } else { @@ -2033,7 +2101,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_ACCOUNT, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getBodysite())) { foreach($vs as $v) { if (null === $v) { @@ -2042,11 +2109,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_BODYSITE, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getContext())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CONTEXT, null, $v->_getFHIRXMLNamespace())); } @@ -2061,18 +2126,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getEnteredDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ENTERED_DATE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getEnterer())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ENTERER, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getFactorOverride())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FACTOR_OVERRIDE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getNote())) { foreach($vs as $v) { if (null === $v) { @@ -2084,18 +2146,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getOccurrenceDateTime())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OCCURRENCE_DATE_TIME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOccurrencePeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OCCURRENCE_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOccurrenceTiming())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OCCURRENCE_TIMING, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getOverrideReason())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OVERRIDE_REASON, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getPartOf())) { foreach($vs as $v) { if (null === $v) { @@ -2104,7 +2163,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_PART_OF, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getParticipant())) { foreach($vs as $v) { if (null === $v) { @@ -2113,19 +2171,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_PARTICIPANT, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getPerformingOrganization())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PERFORMING_ORGANIZATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPriceOverride())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PRICE_OVERRIDE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_QUANTITY, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getReason())) { foreach($vs as $v) { if (null === $v) { @@ -2134,11 +2188,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_REASON, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getRequestingOrganization())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REQUESTING_ORGANIZATION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getService())) { foreach($vs as $v) { if (null === $v) { @@ -2147,15 +2199,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_SERVICE, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSubject())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBJECT, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getSupportingInformation())) { foreach($vs as $v) { if (null === $v) { @@ -2191,30 +2240,68 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_DEFINITION][] = $v->getValue(); - $a[self::FIELD_DEFINITION_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DEFINITION][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DEFINITION_EXT][] = $enc; + } else { + $a[self::FIELD_DEFINITION_EXT][] = null; + } + } else { + $a[self::FIELD_DEFINITION][] = $v; + } } } if (null !== ($v = $this->getEnteredDate())) { - $a[self::FIELD_ENTERED_DATE] = $v->getValue(); - $a[self::FIELD_ENTERED_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ENTERED_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ENTERED_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_ENTERED_DATE] = $v; + } } if (null !== ($v = $this->getEnterer())) { $a[self::FIELD_ENTERER] = $v; } if (null !== ($v = $this->getFactorOverride())) { - $a[self::FIELD_FACTOR_OVERRIDE] = $v->getValue(); - $a[self::FIELD_FACTOR_OVERRIDE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FACTOR_OVERRIDE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FACTOR_OVERRIDE_EXT] = $enc; + } + } else { + $a[self::FIELD_FACTOR_OVERRIDE] = $v; + } } if (null !== ($v = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_IDENTIFIER] = $v; + } } if ([] !== ($vs = $this->getNote())) { $a[self::FIELD_NOTE] = $vs; } if (null !== ($v = $this->getOccurrenceDateTime())) { - $a[self::FIELD_OCCURRENCE_DATE_TIME] = $v->getValue(); - $a[self::FIELD_OCCURRENCE_DATE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_OCCURRENCE_DATE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_OCCURRENCE_DATE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_OCCURRENCE_DATE_TIME] = $v; + } } if (null !== ($v = $this->getOccurrencePeriod())) { $a[self::FIELD_OCCURRENCE_PERIOD] = $v; @@ -2223,8 +2310,15 @@ public function jsonSerialize() $a[self::FIELD_OCCURRENCE_TIMING] = $v; } if (null !== ($v = $this->getOverrideReason())) { - $a[self::FIELD_OVERRIDE_REASON] = $v->getValue(); - $a[self::FIELD_OVERRIDE_REASON_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_OVERRIDE_REASON] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_OVERRIDE_REASON_EXT] = $enc; + } + } else { + $a[self::FIELD_OVERRIDE_REASON] = $v; + } } if ([] !== ($vs = $this->getPartOf())) { $a[self::FIELD_PART_OF] = $vs; @@ -2236,10 +2330,26 @@ public function jsonSerialize() $a[self::FIELD_PERFORMING_ORGANIZATION] = $v; } if (null !== ($v = $this->getPriceOverride())) { - $a[self::FIELD_PRICE_OVERRIDE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PRICE_OVERRIDE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PRICE_OVERRIDE_EXT] = $enc; + } + } else { + $a[self::FIELD_PRICE_OVERRIDE] = $v; + } } if (null !== ($v = $this->getQuantity())) { - $a[self::FIELD_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_QUANTITY] = $v; + } } if ([] !== ($vs = $this->getReason())) { $a[self::FIELD_REASON] = $vs; @@ -2251,7 +2361,15 @@ public function jsonSerialize() $a[self::FIELD_SERVICE] = $vs; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getSubject())) { $a[self::FIELD_SUBJECT] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRClaim.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRClaim.php index 427cda3df3..5b29517ff3 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRClaim.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRClaim.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -96,10 +96,6 @@ class FHIRClaim extends FHIRDomainResource implements PHPFHIRContainedTypeInterf { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CLAIM; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ACCIDENT = 'accident'; const FIELD_BILLABLE_PERIOD = 'billablePeriod'; const FIELD_CARE_TEAM = 'careTeam'; @@ -131,6 +127,7 @@ class FHIRClaim extends FHIRDomainResource implements PHPFHIRContainedTypeInterf const FIELD_STATUS_EXT = '_status'; const FIELD_SUB_TYPE = 'subType'; const FIELD_TOTAL = 'total'; + const FIELD_TOTAL_EXT = '_total'; const FIELD_TYPE = 'type'; const FIELD_USE = 'use'; const FIELD_USE_EXT = '_use'; @@ -482,6 +479,9 @@ class FHIRClaim extends FHIRDomainResource implements PHPFHIRContainedTypeInterf */ protected $use = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRClaim Constructor * @param null|array $data @@ -515,6 +515,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CARE_TEAM])) { if (is_array($data[self::FIELD_CARE_TEAM])) { foreach($data[self::FIELD_CARE_TEAM] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRClaimCareTeam) { $this->addCareTeam($v); } else { @@ -533,8 +536,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CREATED] instanceof FHIRDateTime) { $this->setCreated($data[self::FIELD_CREATED]); - } elseif ($ext && is_scalar($data[self::FIELD_CREATED])) { - $this->setCreated(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_CREATED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CREATED])) { + $this->setCreated(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_CREATED]] + $ext)); + } else if (is_array($data[self::FIELD_CREATED])) { + $this->setCreated(new FHIRDateTime(array_merge($ext, $data[self::FIELD_CREATED]))); + } } else { $this->setCreated(new FHIRDateTime($data[self::FIELD_CREATED])); } @@ -542,6 +549,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_DIAGNOSIS])) { if (is_array($data[self::FIELD_DIAGNOSIS])) { foreach($data[self::FIELD_DIAGNOSIS] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRClaimDiagnosis) { $this->addDiagnosis($v); } else { @@ -595,17 +605,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -614,6 +631,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_INFORMATION])) { if (is_array($data[self::FIELD_INFORMATION])) { foreach($data[self::FIELD_INFORMATION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRClaimInformation) { $this->addInformation($v); } else { @@ -629,6 +649,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_INSURANCE])) { if (is_array($data[self::FIELD_INSURANCE])) { foreach($data[self::FIELD_INSURANCE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRClaimInsurance) { $this->addInsurance($v); } else { @@ -651,6 +674,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ITEM])) { if (is_array($data[self::FIELD_ITEM])) { foreach($data[self::FIELD_ITEM] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRClaimItem) { $this->addItem($v); } else { @@ -708,6 +734,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PROCEDURE])) { if (is_array($data[self::FIELD_PROCEDURE])) { foreach($data[self::FIELD_PROCEDURE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRClaimProcedure) { $this->addProcedure($v); } else { @@ -737,6 +766,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_RELATED])) { if (is_array($data[self::FIELD_RELATED])) { foreach($data[self::FIELD_RELATED] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRClaimRelated) { $this->addRelated($v); } else { @@ -755,8 +787,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRFinancialResourceStatusCodes) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRFinancialResourceStatusCodes([FHIRFinancialResourceStatusCodes::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRFinancialResourceStatusCodes([FHIRFinancialResourceStatusCodes::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRFinancialResourceStatusCodes(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRFinancialResourceStatusCodes($data[self::FIELD_STATUS])); } @@ -764,6 +800,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SUB_TYPE])) { if (is_array($data[self::FIELD_SUB_TYPE])) { foreach($data[self::FIELD_SUB_TYPE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addSubType($v); } else { @@ -777,8 +816,17 @@ public function __construct($data = null) } } if (isset($data[self::FIELD_TOTAL])) { + $ext = (isset($data[self::FIELD_TOTAL_EXT]) && is_array($data[self::FIELD_TOTAL_EXT])) + ? $data[self::FIELD_TOTAL_EXT] + : null; if ($data[self::FIELD_TOTAL] instanceof FHIRMoney) { $this->setTotal($data[self::FIELD_TOTAL]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TOTAL])) { + $this->setTotal(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_TOTAL]] + $ext)); + } else if (is_array($data[self::FIELD_TOTAL])) { + $this->setTotal(new FHIRMoney(array_merge($ext, $data[self::FIELD_TOTAL]))); + } } else { $this->setTotal(new FHIRMoney($data[self::FIELD_TOTAL])); } @@ -796,8 +844,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_USE] instanceof FHIRUse) { $this->setUse($data[self::FIELD_USE]); - } elseif ($ext && is_scalar($data[self::FIELD_USE])) { - $this->setUse(new FHIRUse([FHIRUse::FIELD_VALUE => $data[self::FIELD_USE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_USE])) { + $this->setUse(new FHIRUse([FHIRUse::FIELD_VALUE => $data[self::FIELD_USE]] + $ext)); + } else if (is_array($data[self::FIELD_USE])) { + $this->setUse(new FHIRUse(array_merge($ext, $data[self::FIELD_USE]))); + } } else { $this->setUse(new FHIRUse($data[self::FIELD_USE])); } @@ -2202,11 +2254,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getAccident())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ACCIDENT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getBillablePeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_BILLABLE_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getCareTeam())) { foreach($vs as $v) { if (null === $v) { @@ -2218,7 +2268,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getCreated())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CREATED, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getDiagnosis())) { foreach($vs as $v) { if (null === $v) { @@ -2227,27 +2276,21 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_DIAGNOSIS, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getEmploymentImpacted())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EMPLOYMENT_IMPACTED, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getEnterer())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ENTERER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getFacility())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FACILITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getFundsReserve())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FUNDS_RESERVE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getHospitalization())) { $v->xmlSerialize($sxe->addChild(self::FIELD_HOSPITALIZATION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -2256,7 +2299,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getInformation())) { foreach($vs as $v) { if (null === $v) { @@ -2265,7 +2307,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_INFORMATION, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getInsurance())) { foreach($vs as $v) { if (null === $v) { @@ -2274,11 +2315,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_INSURANCE, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getInsurer())) { $v->xmlSerialize($sxe->addChild(self::FIELD_INSURER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getItem())) { foreach($vs as $v) { if (null === $v) { @@ -2287,31 +2326,24 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_ITEM, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getOrganization())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ORGANIZATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOriginalPrescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ORIGINAL_PRESCRIPTION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPatient())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATIENT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPayee())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PAYEE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPrescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PRESCRIPTION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPriority())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PRIORITY, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getProcedure())) { foreach($vs as $v) { if (null === $v) { @@ -2320,15 +2352,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_PROCEDURE, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getProvider())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PROVIDER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getReferral())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REFERRAL, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getRelated())) { foreach($vs as $v) { if (null === $v) { @@ -2337,11 +2366,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_RELATED, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getSubType())) { foreach($vs as $v) { if (null === $v) { @@ -2350,15 +2377,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_SUB_TYPE, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getTotal())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TOTAL, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getUse())) { $v->xmlSerialize($sxe->addChild(self::FIELD_USE, null, $v->_getFHIRXMLNamespace())); } @@ -2381,8 +2405,15 @@ public function jsonSerialize() $a[self::FIELD_CARE_TEAM] = $vs; } if (null !== ($v = $this->getCreated())) { - $a[self::FIELD_CREATED] = $v->getValue(); - $a[self::FIELD_CREATED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CREATED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CREATED_EXT] = $enc; + } + } else { + $a[self::FIELD_CREATED] = $v; + } } if ([] !== ($vs = $this->getDiagnosis())) { $a[self::FIELD_DIAGNOSIS] = $vs; @@ -2403,7 +2434,23 @@ public function jsonSerialize() $a[self::FIELD_HOSPITALIZATION] = $v; } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if ([] !== ($vs = $this->getInformation())) { $a[self::FIELD_INFORMATION] = $vs; @@ -2448,19 +2495,43 @@ public function jsonSerialize() $a[self::FIELD_RELATED] = $vs; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if ([] !== ($vs = $this->getSubType())) { $a[self::FIELD_SUB_TYPE] = $vs; } if (null !== ($v = $this->getTotal())) { - $a[self::FIELD_TOTAL] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TOTAL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TOTAL_EXT] = $enc; + } + } else { + $a[self::FIELD_TOTAL] = $v; + } } if (null !== ($v = $this->getType())) { $a[self::FIELD_TYPE] = $v; } if (null !== ($v = $this->getUse())) { - $a[self::FIELD_USE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_USE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_USE_EXT] = $enc; + } + } else { + $a[self::FIELD_USE] = $v; + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRClaimResponse.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRClaimResponse.php index c69bfd040a..1f20e464f9 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRClaimResponse.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRClaimResponse.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -93,10 +93,6 @@ class FHIRClaimResponse extends FHIRDomainResource implements PHPFHIRContainedTy { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CLAIM_RESPONSE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ADD_ITEM = 'addItem'; const FIELD_COMMUNICATION_REQUEST = 'communicationRequest'; const FIELD_CREATED = 'created'; @@ -122,8 +118,11 @@ class FHIRClaimResponse extends FHIRDomainResource implements PHPFHIRContainedTy const FIELD_STATUS = 'status'; const FIELD_STATUS_EXT = '_status'; const FIELD_TOTAL_BENEFIT = 'totalBenefit'; + const FIELD_TOTAL_BENEFIT_EXT = '_totalBenefit'; const FIELD_TOTAL_COST = 'totalCost'; + const FIELD_TOTAL_COST_EXT = '_totalCost'; const FIELD_UNALLOC_DEDUCTABLE = 'unallocDeductable'; + const FIELD_UNALLOC_DEDUCTABLE_EXT = '_unallocDeductable'; /** * This resource provides the adjudication details from the processing of a Claim @@ -380,6 +379,9 @@ class FHIRClaimResponse extends FHIRDomainResource implements PHPFHIRContainedTy */ protected $unallocDeductable = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRClaimResponse Constructor * @param null|array $data @@ -399,6 +401,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ADD_ITEM])) { if (is_array($data[self::FIELD_ADD_ITEM])) { foreach($data[self::FIELD_ADD_ITEM] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRClaimResponseAddItem) { $this->addAddItem($v); } else { @@ -414,6 +419,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_COMMUNICATION_REQUEST])) { if (is_array($data[self::FIELD_COMMUNICATION_REQUEST])) { foreach($data[self::FIELD_COMMUNICATION_REQUEST] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addCommunicationRequest($v); } else { @@ -432,8 +440,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CREATED] instanceof FHIRDateTime) { $this->setCreated($data[self::FIELD_CREATED]); - } elseif ($ext && is_scalar($data[self::FIELD_CREATED])) { - $this->setCreated(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_CREATED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CREATED])) { + $this->setCreated(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_CREATED]] + $ext)); + } else if (is_array($data[self::FIELD_CREATED])) { + $this->setCreated(new FHIRDateTime(array_merge($ext, $data[self::FIELD_CREATED]))); + } } else { $this->setCreated(new FHIRDateTime($data[self::FIELD_CREATED])); } @@ -444,8 +456,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DISPOSITION] instanceof FHIRString) { $this->setDisposition($data[self::FIELD_DISPOSITION]); - } elseif ($ext && is_scalar($data[self::FIELD_DISPOSITION])) { - $this->setDisposition(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DISPOSITION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DISPOSITION])) { + $this->setDisposition(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DISPOSITION]] + $ext)); + } else if (is_array($data[self::FIELD_DISPOSITION])) { + $this->setDisposition(new FHIRString(array_merge($ext, $data[self::FIELD_DISPOSITION]))); + } } else { $this->setDisposition(new FHIRString($data[self::FIELD_DISPOSITION])); } @@ -453,6 +469,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ERROR])) { if (is_array($data[self::FIELD_ERROR])) { foreach($data[self::FIELD_ERROR] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRClaimResponseError) { $this->addError($v); } else { @@ -478,17 +497,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -497,6 +523,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_INSURANCE])) { if (is_array($data[self::FIELD_INSURANCE])) { foreach($data[self::FIELD_INSURANCE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRClaimResponseInsurance) { $this->addInsurance($v); } else { @@ -519,6 +548,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ITEM])) { if (is_array($data[self::FIELD_ITEM])) { foreach($data[self::FIELD_ITEM] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRClaimResponseItem) { $this->addItem($v); } else { @@ -562,6 +594,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PROCESS_NOTE])) { if (is_array($data[self::FIELD_PROCESS_NOTE])) { foreach($data[self::FIELD_PROCESS_NOTE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRClaimResponseProcessNote) { $this->addProcessNote($v); } else { @@ -608,29 +643,60 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRFinancialResourceStatusCodes) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRFinancialResourceStatusCodes([FHIRFinancialResourceStatusCodes::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRFinancialResourceStatusCodes([FHIRFinancialResourceStatusCodes::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRFinancialResourceStatusCodes(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRFinancialResourceStatusCodes($data[self::FIELD_STATUS])); } } if (isset($data[self::FIELD_TOTAL_BENEFIT])) { + $ext = (isset($data[self::FIELD_TOTAL_BENEFIT_EXT]) && is_array($data[self::FIELD_TOTAL_BENEFIT_EXT])) + ? $data[self::FIELD_TOTAL_BENEFIT_EXT] + : null; if ($data[self::FIELD_TOTAL_BENEFIT] instanceof FHIRMoney) { $this->setTotalBenefit($data[self::FIELD_TOTAL_BENEFIT]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TOTAL_BENEFIT])) { + $this->setTotalBenefit(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_TOTAL_BENEFIT]] + $ext)); + } else if (is_array($data[self::FIELD_TOTAL_BENEFIT])) { + $this->setTotalBenefit(new FHIRMoney(array_merge($ext, $data[self::FIELD_TOTAL_BENEFIT]))); + } } else { $this->setTotalBenefit(new FHIRMoney($data[self::FIELD_TOTAL_BENEFIT])); } } if (isset($data[self::FIELD_TOTAL_COST])) { + $ext = (isset($data[self::FIELD_TOTAL_COST_EXT]) && is_array($data[self::FIELD_TOTAL_COST_EXT])) + ? $data[self::FIELD_TOTAL_COST_EXT] + : null; if ($data[self::FIELD_TOTAL_COST] instanceof FHIRMoney) { $this->setTotalCost($data[self::FIELD_TOTAL_COST]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TOTAL_COST])) { + $this->setTotalCost(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_TOTAL_COST]] + $ext)); + } else if (is_array($data[self::FIELD_TOTAL_COST])) { + $this->setTotalCost(new FHIRMoney(array_merge($ext, $data[self::FIELD_TOTAL_COST]))); + } } else { $this->setTotalCost(new FHIRMoney($data[self::FIELD_TOTAL_COST])); } } if (isset($data[self::FIELD_UNALLOC_DEDUCTABLE])) { + $ext = (isset($data[self::FIELD_UNALLOC_DEDUCTABLE_EXT]) && is_array($data[self::FIELD_UNALLOC_DEDUCTABLE_EXT])) + ? $data[self::FIELD_UNALLOC_DEDUCTABLE_EXT] + : null; if ($data[self::FIELD_UNALLOC_DEDUCTABLE] instanceof FHIRMoney) { $this->setUnallocDeductable($data[self::FIELD_UNALLOC_DEDUCTABLE]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_UNALLOC_DEDUCTABLE])) { + $this->setUnallocDeductable(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_UNALLOC_DEDUCTABLE]] + $ext)); + } else if (is_array($data[self::FIELD_UNALLOC_DEDUCTABLE])) { + $this->setUnallocDeductable(new FHIRMoney(array_merge($ext, $data[self::FIELD_UNALLOC_DEDUCTABLE]))); + } } else { $this->setUnallocDeductable(new FHIRMoney($data[self::FIELD_UNALLOC_DEDUCTABLE])); } @@ -1730,7 +1796,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_ADD_ITEM, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getCommunicationRequest())) { foreach($vs as $v) { if (null === $v) { @@ -1745,7 +1810,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDisposition())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DISPOSITION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getError())) { foreach($vs as $v) { if (null === $v) { @@ -1754,11 +1818,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_ERROR, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getForm())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FORM, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -1767,7 +1829,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getInsurance())) { foreach($vs as $v) { if (null === $v) { @@ -1776,11 +1837,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_INSURANCE, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getInsurer())) { $v->xmlSerialize($sxe->addChild(self::FIELD_INSURER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getItem())) { foreach($vs as $v) { if (null === $v) { @@ -1789,23 +1848,18 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_ITEM, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getOutcome())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OUTCOME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPatient())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATIENT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPayeeType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PAYEE_TYPE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPayment())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PAYMENT, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getProcessNote())) { foreach($vs as $v) { if (null === $v) { @@ -1814,35 +1868,27 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_PROCESS_NOTE, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getRequest())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REQUEST, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRequestOrganization())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REQUEST_ORGANIZATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRequestProvider())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REQUEST_PROVIDER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getReserved())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RESERVED, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getTotalBenefit())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TOTAL_BENEFIT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getTotalCost())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TOTAL_COST, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getUnallocDeductable())) { $v->xmlSerialize($sxe->addChild(self::FIELD_UNALLOC_DEDUCTABLE, null, $v->_getFHIRXMLNamespace())); } @@ -1862,12 +1908,26 @@ public function jsonSerialize() $a[self::FIELD_COMMUNICATION_REQUEST] = $vs; } if (null !== ($v = $this->getCreated())) { - $a[self::FIELD_CREATED] = $v->getValue(); - $a[self::FIELD_CREATED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CREATED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CREATED_EXT] = $enc; + } + } else { + $a[self::FIELD_CREATED] = $v; + } } if (null !== ($v = $this->getDisposition())) { - $a[self::FIELD_DISPOSITION] = $v->getValue(); - $a[self::FIELD_DISPOSITION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DISPOSITION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DISPOSITION_EXT] = $enc; + } + } else { + $a[self::FIELD_DISPOSITION] = $v; + } } if ([] !== ($vs = $this->getError())) { $a[self::FIELD_ERROR] = $vs; @@ -1876,7 +1936,23 @@ public function jsonSerialize() $a[self::FIELD_FORM] = $v; } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if ([] !== ($vs = $this->getInsurance())) { $a[self::FIELD_INSURANCE] = $vs; @@ -1915,16 +1991,48 @@ public function jsonSerialize() $a[self::FIELD_RESERVED] = $v; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getTotalBenefit())) { - $a[self::FIELD_TOTAL_BENEFIT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TOTAL_BENEFIT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TOTAL_BENEFIT_EXT] = $enc; + } + } else { + $a[self::FIELD_TOTAL_BENEFIT] = $v; + } } if (null !== ($v = $this->getTotalCost())) { - $a[self::FIELD_TOTAL_COST] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TOTAL_COST] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TOTAL_COST_EXT] = $enc; + } + } else { + $a[self::FIELD_TOTAL_COST] = $v; + } } if (null !== ($v = $this->getUnallocDeductable())) { - $a[self::FIELD_UNALLOC_DEDUCTABLE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_UNALLOC_DEDUCTABLE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_UNALLOC_DEDUCTABLE_EXT] = $enc; + } + } else { + $a[self::FIELD_UNALLOC_DEDUCTABLE] = $v; + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRClinicalImpression.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRClinicalImpression.php index 940525bae7..95c0b6614b 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRClinicalImpression.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRClinicalImpression.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -95,10 +95,6 @@ class FHIRClinicalImpression extends FHIRDomainResource implements PHPFHIRContai { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CLINICAL_IMPRESSION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ACTION = 'action'; const FIELD_ASSESSOR = 'assessor'; const FIELD_CODE = 'code'; @@ -375,6 +371,9 @@ class FHIRClinicalImpression extends FHIRDomainResource implements PHPFHIRContai */ protected $summary = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRClinicalImpression Constructor * @param null|array $data @@ -394,6 +393,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ACTION])) { if (is_array($data[self::FIELD_ACTION])) { foreach($data[self::FIELD_ACTION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addAction($v); } else { @@ -433,8 +435,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATE] instanceof FHIRDateTime) { $this->setDate($data[self::FIELD_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_DATE])) { - $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime(array_merge($ext, $data[self::FIELD_DATE]))); + } } else { $this->setDate(new FHIRDateTime($data[self::FIELD_DATE])); } @@ -445,8 +451,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -457,8 +467,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EFFECTIVE_DATE_TIME] instanceof FHIRDateTime) { $this->setEffectiveDateTime($data[self::FIELD_EFFECTIVE_DATE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_EFFECTIVE_DATE_TIME])) { - $this->setEffectiveDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_EFFECTIVE_DATE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EFFECTIVE_DATE_TIME])) { + $this->setEffectiveDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_EFFECTIVE_DATE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_EFFECTIVE_DATE_TIME])) { + $this->setEffectiveDateTime(new FHIRDateTime(array_merge($ext, $data[self::FIELD_EFFECTIVE_DATE_TIME]))); + } } else { $this->setEffectiveDateTime(new FHIRDateTime($data[self::FIELD_EFFECTIVE_DATE_TIME])); } @@ -473,6 +487,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_FINDING])) { if (is_array($data[self::FIELD_FINDING])) { foreach($data[self::FIELD_FINDING] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRClinicalImpressionFinding) { $this->addFinding($v); } else { @@ -491,17 +508,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -510,6 +534,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_INVESTIGATION])) { if (is_array($data[self::FIELD_INVESTIGATION])) { foreach($data[self::FIELD_INVESTIGATION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRClinicalImpressionInvestigation) { $this->addInvestigation($v); } else { @@ -525,6 +552,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_NOTE])) { if (is_array($data[self::FIELD_NOTE])) { foreach($data[self::FIELD_NOTE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRAnnotation) { $this->addNote($v); } else { @@ -547,6 +577,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PROBLEM])) { if (is_array($data[self::FIELD_PROBLEM])) { foreach($data[self::FIELD_PROBLEM] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addProblem($v); } else { @@ -562,6 +595,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PROGNOSIS_CODEABLE_CONCEPT])) { if (is_array($data[self::FIELD_PROGNOSIS_CODEABLE_CONCEPT])) { foreach($data[self::FIELD_PROGNOSIS_CODEABLE_CONCEPT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addPrognosisCodeableConcept($v); } else { @@ -577,6 +613,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PROGNOSIS_REFERENCE])) { if (is_array($data[self::FIELD_PROGNOSIS_REFERENCE])) { foreach($data[self::FIELD_PROGNOSIS_REFERENCE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addPrognosisReference($v); } else { @@ -595,17 +634,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_PROTOCOL])) { foreach($data[self::FIELD_PROTOCOL] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRUri) { $this->addProtocol($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addProtocol(new FHIRUri([FHIRUri::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addProtocol(new FHIRUri([FHIRUri::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addProtocol(new FHIRUri(array_merge($v, $ext[$i]))); + } } else { $this->addProtocol(new FHIRUri($v)); } } } elseif ($data[self::FIELD_PROTOCOL] instanceof FHIRUri) { $this->addProtocol($data[self::FIELD_PROTOCOL]); - } elseif ($ext && is_scalar($data[self::FIELD_PROTOCOL])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_PROTOCOL])) { $this->addProtocol(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_PROTOCOL]] + $ext)); } else { $this->addProtocol(new FHIRUri($data[self::FIELD_PROTOCOL])); @@ -617,8 +663,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRClinicalImpressionStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRClinicalImpressionStatus([FHIRClinicalImpressionStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRClinicalImpressionStatus([FHIRClinicalImpressionStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRClinicalImpressionStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRClinicalImpressionStatus($data[self::FIELD_STATUS])); } @@ -636,8 +686,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SUMMARY] instanceof FHIRString) { $this->setSummary($data[self::FIELD_SUMMARY]); - } elseif ($ext && is_scalar($data[self::FIELD_SUMMARY])) { - $this->setSummary(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SUMMARY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SUMMARY])) { + $this->setSummary(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SUMMARY]] + $ext)); + } else if (is_array($data[self::FIELD_SUMMARY])) { + $this->setSummary(new FHIRString(array_merge($ext, $data[self::FIELD_SUMMARY]))); + } } else { $this->setSummary(new FHIRString($data[self::FIELD_SUMMARY])); } @@ -1801,15 +1855,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_ACTION, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getAssessor())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ASSESSOR, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getContext())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CONTEXT, null, $v->_getFHIRXMLNamespace())); } @@ -1822,11 +1873,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getEffectiveDateTime())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EFFECTIVE_DATE_TIME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getEffectivePeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EFFECTIVE_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getFinding())) { foreach($vs as $v) { if (null === $v) { @@ -1835,7 +1884,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_FINDING, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -1844,7 +1892,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getInvestigation())) { foreach($vs as $v) { if (null === $v) { @@ -1853,7 +1900,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_INVESTIGATION, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getNote())) { foreach($vs as $v) { if (null === $v) { @@ -1862,11 +1908,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_NOTE, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getPrevious())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PREVIOUS, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getProblem())) { foreach($vs as $v) { if (null === $v) { @@ -1875,7 +1919,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_PROBLEM, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getPrognosisCodeableConcept())) { foreach($vs as $v) { if (null === $v) { @@ -1884,7 +1927,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_PROGNOSIS_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getPrognosisReference())) { foreach($vs as $v) { if (null === $v) { @@ -1901,11 +1943,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_PROTOCOL, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSubject())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBJECT, null, $v->_getFHIRXMLNamespace())); } @@ -1934,16 +1974,37 @@ public function jsonSerialize() $a[self::FIELD_CONTEXT] = $v; } if (null !== ($v = $this->getDate())) { - $a[self::FIELD_DATE] = $v->getValue(); - $a[self::FIELD_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_DATE] = $v; + } } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if (null !== ($v = $this->getEffectiveDateTime())) { - $a[self::FIELD_EFFECTIVE_DATE_TIME] = $v->getValue(); - $a[self::FIELD_EFFECTIVE_DATE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EFFECTIVE_DATE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EFFECTIVE_DATE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_EFFECTIVE_DATE_TIME] = $v; + } } if (null !== ($v = $this->getEffectivePeriod())) { $a[self::FIELD_EFFECTIVE_PERIOD] = $v; @@ -1952,7 +2013,23 @@ public function jsonSerialize() $a[self::FIELD_FINDING] = $vs; } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if ([] !== ($vs = $this->getInvestigation())) { $a[self::FIELD_INVESTIGATION] = $vs; @@ -1978,19 +2055,43 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_PROTOCOL][] = $v->getValue(); - $a[self::FIELD_PROTOCOL_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PROTOCOL][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PROTOCOL_EXT][] = $enc; + } else { + $a[self::FIELD_PROTOCOL_EXT][] = null; + } + } else { + $a[self::FIELD_PROTOCOL][] = $v; + } } } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getSubject())) { $a[self::FIELD_SUBJECT] = $v; } if (null !== ($v = $this->getSummary())) { - $a[self::FIELD_SUMMARY] = $v->getValue(); - $a[self::FIELD_SUMMARY_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SUMMARY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SUMMARY_EXT] = $enc; + } + } else { + $a[self::FIELD_SUMMARY] = $v; + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRCodeSystem.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRCodeSystem.php index 43227eeb2a..e0fea41c80 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRCodeSystem.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRCodeSystem.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -95,10 +95,6 @@ class FHIRCodeSystem extends FHIRDomainResource implements PHPFHIRContainedTypeI { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CODE_SYSTEM; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CASE_SENSITIVE = 'caseSensitive'; const FIELD_CASE_SENSITIVE_EXT = '_caseSensitive'; const FIELD_COMPOSITIONAL = 'compositional'; @@ -472,6 +468,9 @@ class FHIRCodeSystem extends FHIRDomainResource implements PHPFHIRContainedTypeI */ protected $versionNeeded = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRCodeSystem Constructor * @param null|array $data @@ -494,8 +493,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CASE_SENSITIVE] instanceof FHIRBoolean) { $this->setCaseSensitive($data[self::FIELD_CASE_SENSITIVE]); - } elseif ($ext && is_scalar($data[self::FIELD_CASE_SENSITIVE])) { - $this->setCaseSensitive(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_CASE_SENSITIVE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CASE_SENSITIVE])) { + $this->setCaseSensitive(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_CASE_SENSITIVE]] + $ext)); + } else if (is_array($data[self::FIELD_CASE_SENSITIVE])) { + $this->setCaseSensitive(new FHIRBoolean(array_merge($ext, $data[self::FIELD_CASE_SENSITIVE]))); + } } else { $this->setCaseSensitive(new FHIRBoolean($data[self::FIELD_CASE_SENSITIVE])); } @@ -506,8 +509,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_COMPOSITIONAL] instanceof FHIRBoolean) { $this->setCompositional($data[self::FIELD_COMPOSITIONAL]); - } elseif ($ext && is_scalar($data[self::FIELD_COMPOSITIONAL])) { - $this->setCompositional(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_COMPOSITIONAL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_COMPOSITIONAL])) { + $this->setCompositional(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_COMPOSITIONAL]] + $ext)); + } else if (is_array($data[self::FIELD_COMPOSITIONAL])) { + $this->setCompositional(new FHIRBoolean(array_merge($ext, $data[self::FIELD_COMPOSITIONAL]))); + } } else { $this->setCompositional(new FHIRBoolean($data[self::FIELD_COMPOSITIONAL])); } @@ -515,6 +522,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CONCEPT])) { if (is_array($data[self::FIELD_CONCEPT])) { foreach($data[self::FIELD_CONCEPT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeSystemConcept) { $this->addConcept($v); } else { @@ -530,6 +540,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CONTACT])) { if (is_array($data[self::FIELD_CONTACT])) { foreach($data[self::FIELD_CONTACT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContactDetail) { $this->addContact($v); } else { @@ -548,8 +561,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CONTENT] instanceof FHIRCodeSystemContentMode) { $this->setContent($data[self::FIELD_CONTENT]); - } elseif ($ext && is_scalar($data[self::FIELD_CONTENT])) { - $this->setContent(new FHIRCodeSystemContentMode([FHIRCodeSystemContentMode::FIELD_VALUE => $data[self::FIELD_CONTENT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CONTENT])) { + $this->setContent(new FHIRCodeSystemContentMode([FHIRCodeSystemContentMode::FIELD_VALUE => $data[self::FIELD_CONTENT]] + $ext)); + } else if (is_array($data[self::FIELD_CONTENT])) { + $this->setContent(new FHIRCodeSystemContentMode(array_merge($ext, $data[self::FIELD_CONTENT]))); + } } else { $this->setContent(new FHIRCodeSystemContentMode($data[self::FIELD_CONTENT])); } @@ -560,8 +577,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_COPYRIGHT] instanceof FHIRMarkdown) { $this->setCopyright($data[self::FIELD_COPYRIGHT]); - } elseif ($ext && is_scalar($data[self::FIELD_COPYRIGHT])) { - $this->setCopyright(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_COPYRIGHT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_COPYRIGHT])) { + $this->setCopyright(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_COPYRIGHT]] + $ext)); + } else if (is_array($data[self::FIELD_COPYRIGHT])) { + $this->setCopyright(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_COPYRIGHT]))); + } } else { $this->setCopyright(new FHIRMarkdown($data[self::FIELD_COPYRIGHT])); } @@ -572,8 +593,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_COUNT] instanceof FHIRUnsignedInt) { $this->setCount($data[self::FIELD_COUNT]); - } elseif ($ext && is_scalar($data[self::FIELD_COUNT])) { - $this->setCount(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_COUNT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_COUNT])) { + $this->setCount(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_COUNT]] + $ext)); + } else if (is_array($data[self::FIELD_COUNT])) { + $this->setCount(new FHIRUnsignedInt(array_merge($ext, $data[self::FIELD_COUNT]))); + } } else { $this->setCount(new FHIRUnsignedInt($data[self::FIELD_COUNT])); } @@ -584,8 +609,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATE] instanceof FHIRDateTime) { $this->setDate($data[self::FIELD_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_DATE])) { - $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime(array_merge($ext, $data[self::FIELD_DATE]))); + } } else { $this->setDate(new FHIRDateTime($data[self::FIELD_DATE])); } @@ -596,8 +625,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRMarkdown) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRMarkdown($data[self::FIELD_DESCRIPTION])); } @@ -608,8 +641,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EXPERIMENTAL] instanceof FHIRBoolean) { $this->setExperimental($data[self::FIELD_EXPERIMENTAL]); - } elseif ($ext && is_scalar($data[self::FIELD_EXPERIMENTAL])) { - $this->setExperimental(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_EXPERIMENTAL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EXPERIMENTAL])) { + $this->setExperimental(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_EXPERIMENTAL]] + $ext)); + } else if (is_array($data[self::FIELD_EXPERIMENTAL])) { + $this->setExperimental(new FHIRBoolean(array_merge($ext, $data[self::FIELD_EXPERIMENTAL]))); + } } else { $this->setExperimental(new FHIRBoolean($data[self::FIELD_EXPERIMENTAL])); } @@ -620,17 +657,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_FILTER])) { foreach($data[self::FIELD_FILTER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeSystemFilter) { $this->addFilter($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addFilter(new FHIRCodeSystemFilter([FHIRCodeSystemFilter::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addFilter(new FHIRCodeSystemFilter([FHIRCodeSystemFilter::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addFilter(new FHIRCodeSystemFilter(array_merge($v, $ext[$i]))); + } } else { $this->addFilter(new FHIRCodeSystemFilter($v)); } } } elseif ($data[self::FIELD_FILTER] instanceof FHIRCodeSystemFilter) { $this->addFilter($data[self::FIELD_FILTER]); - } elseif ($ext && is_scalar($data[self::FIELD_FILTER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_FILTER])) { $this->addFilter(new FHIRCodeSystemFilter([FHIRCodeSystemFilter::FIELD_VALUE => $data[self::FIELD_FILTER]] + $ext)); } else { $this->addFilter(new FHIRCodeSystemFilter($data[self::FIELD_FILTER])); @@ -642,8 +686,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_HIERARCHY_MEANING] instanceof FHIRCodeSystemHierarchyMeaning) { $this->setHierarchyMeaning($data[self::FIELD_HIERARCHY_MEANING]); - } elseif ($ext && is_scalar($data[self::FIELD_HIERARCHY_MEANING])) { - $this->setHierarchyMeaning(new FHIRCodeSystemHierarchyMeaning([FHIRCodeSystemHierarchyMeaning::FIELD_VALUE => $data[self::FIELD_HIERARCHY_MEANING]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_HIERARCHY_MEANING])) { + $this->setHierarchyMeaning(new FHIRCodeSystemHierarchyMeaning([FHIRCodeSystemHierarchyMeaning::FIELD_VALUE => $data[self::FIELD_HIERARCHY_MEANING]] + $ext)); + } else if (is_array($data[self::FIELD_HIERARCHY_MEANING])) { + $this->setHierarchyMeaning(new FHIRCodeSystemHierarchyMeaning(array_merge($ext, $data[self::FIELD_HIERARCHY_MEANING]))); + } } else { $this->setHierarchyMeaning(new FHIRCodeSystemHierarchyMeaning($data[self::FIELD_HIERARCHY_MEANING])); } @@ -654,8 +702,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->setIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { - $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_IDENTIFIER]))); + } } else { $this->setIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); } @@ -663,6 +715,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_JURISDICTION])) { if (is_array($data[self::FIELD_JURISDICTION])) { foreach($data[self::FIELD_JURISDICTION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addJurisdiction($v); } else { @@ -681,8 +736,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -690,6 +749,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PROPERTY])) { if (is_array($data[self::FIELD_PROPERTY])) { foreach($data[self::FIELD_PROPERTY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeSystemProperty) { $this->addProperty($v); } else { @@ -708,8 +770,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PUBLISHER] instanceof FHIRString) { $this->setPublisher($data[self::FIELD_PUBLISHER]); - } elseif ($ext && is_scalar($data[self::FIELD_PUBLISHER])) { - $this->setPublisher(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PUBLISHER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PUBLISHER])) { + $this->setPublisher(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PUBLISHER]] + $ext)); + } else if (is_array($data[self::FIELD_PUBLISHER])) { + $this->setPublisher(new FHIRString(array_merge($ext, $data[self::FIELD_PUBLISHER]))); + } } else { $this->setPublisher(new FHIRString($data[self::FIELD_PUBLISHER])); } @@ -720,8 +786,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PURPOSE] instanceof FHIRMarkdown) { $this->setPurpose($data[self::FIELD_PURPOSE]); - } elseif ($ext && is_scalar($data[self::FIELD_PURPOSE])) { - $this->setPurpose(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_PURPOSE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PURPOSE])) { + $this->setPurpose(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_PURPOSE]] + $ext)); + } else if (is_array($data[self::FIELD_PURPOSE])) { + $this->setPurpose(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_PURPOSE]))); + } } else { $this->setPurpose(new FHIRMarkdown($data[self::FIELD_PURPOSE])); } @@ -732,8 +802,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRPublicationStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRPublicationStatus([FHIRPublicationStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRPublicationStatus([FHIRPublicationStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRPublicationStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRPublicationStatus($data[self::FIELD_STATUS])); } @@ -744,8 +818,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TITLE] instanceof FHIRString) { $this->setTitle($data[self::FIELD_TITLE]); - } elseif ($ext && is_scalar($data[self::FIELD_TITLE])) { - $this->setTitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TITLE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TITLE])) { + $this->setTitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TITLE]] + $ext)); + } else if (is_array($data[self::FIELD_TITLE])) { + $this->setTitle(new FHIRString(array_merge($ext, $data[self::FIELD_TITLE]))); + } } else { $this->setTitle(new FHIRString($data[self::FIELD_TITLE])); } @@ -756,8 +834,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_URL] instanceof FHIRUri) { $this->setUrl($data[self::FIELD_URL]); - } elseif ($ext && is_scalar($data[self::FIELD_URL])) { - $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } else if (is_array($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri(array_merge($ext, $data[self::FIELD_URL]))); + } } else { $this->setUrl(new FHIRUri($data[self::FIELD_URL])); } @@ -765,6 +847,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_USE_CONTEXT])) { if (is_array($data[self::FIELD_USE_CONTEXT])) { foreach($data[self::FIELD_USE_CONTEXT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRUsageContext) { $this->addUseContext($v); } else { @@ -783,8 +868,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_SET] instanceof FHIRUri) { $this->setValueSet($data[self::FIELD_VALUE_SET]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_SET])) { - $this->setValueSet(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_VALUE_SET]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_SET])) { + $this->setValueSet(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_VALUE_SET]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_SET])) { + $this->setValueSet(new FHIRUri(array_merge($ext, $data[self::FIELD_VALUE_SET]))); + } } else { $this->setValueSet(new FHIRUri($data[self::FIELD_VALUE_SET])); } @@ -795,8 +884,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VERSION] instanceof FHIRString) { $this->setVersion($data[self::FIELD_VERSION]); - } elseif ($ext && is_scalar($data[self::FIELD_VERSION])) { - $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } else if (is_array($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString(array_merge($ext, $data[self::FIELD_VERSION]))); + } } else { $this->setVersion(new FHIRString($data[self::FIELD_VERSION])); } @@ -807,8 +900,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VERSION_NEEDED] instanceof FHIRBoolean) { $this->setVersionNeeded($data[self::FIELD_VERSION_NEEDED]); - } elseif ($ext && is_scalar($data[self::FIELD_VERSION_NEEDED])) { - $this->setVersionNeeded(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_VERSION_NEEDED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VERSION_NEEDED])) { + $this->setVersionNeeded(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_VERSION_NEEDED]] + $ext)); + } else if (is_array($data[self::FIELD_VERSION_NEEDED])) { + $this->setVersionNeeded(new FHIRBoolean(array_merge($ext, $data[self::FIELD_VERSION_NEEDED]))); + } } else { $this->setVersionNeeded(new FHIRBoolean($data[self::FIELD_VERSION_NEEDED])); } @@ -2192,13 +2289,13 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getCaseSensitive())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CASE_SENSITIVE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getCompositional())) { $v->xmlSerialize($sxe->addChild(self::FIELD_COMPOSITIONAL, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getConcept())) { foreach($vs as $v) { if (null === $v) { @@ -2207,7 +2304,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_CONCEPT, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getContact())) { foreach($vs as $v) { if (null === $v) { @@ -2216,7 +2312,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_CONTACT, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getContent())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CONTENT, null, $v->_getFHIRXMLNamespace())); } @@ -2235,7 +2330,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getExperimental())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EXPERIMENTAL, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getFilter())) { foreach($vs as $v) { if (null === $v) { @@ -2244,15 +2338,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_FILTER, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getHierarchyMeaning())) { $v->xmlSerialize($sxe->addChild(self::FIELD_HIERARCHY_MEANING, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getJurisdiction())) { foreach($vs as $v) { if (null === $v) { @@ -2264,7 +2355,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NAME, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getProperty())) { foreach($vs as $v) { if (null === $v) { @@ -2279,7 +2369,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getPurpose())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PURPOSE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } @@ -2289,7 +2378,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getUrl())) { $v->xmlSerialize($sxe->addChild(self::FIELD_URL, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getUseContext())) { foreach($vs as $v) { if (null === $v) { @@ -2317,12 +2405,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getCaseSensitive())) { - $a[self::FIELD_CASE_SENSITIVE] = $v->getValue(); - $a[self::FIELD_CASE_SENSITIVE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CASE_SENSITIVE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CASE_SENSITIVE_EXT] = $enc; + } + } else { + $a[self::FIELD_CASE_SENSITIVE] = $v; + } } if (null !== ($v = $this->getCompositional())) { - $a[self::FIELD_COMPOSITIONAL] = $v->getValue(); - $a[self::FIELD_COMPOSITIONAL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_COMPOSITIONAL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_COMPOSITIONAL_EXT] = $enc; + } + } else { + $a[self::FIELD_COMPOSITIONAL] = $v; + } } if ([] !== ($vs = $this->getConcept())) { $a[self::FIELD_CONCEPT] = $vs; @@ -2331,80 +2433,219 @@ public function jsonSerialize() $a[self::FIELD_CONTACT] = $vs; } if (null !== ($v = $this->getContent())) { - $a[self::FIELD_CONTENT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CONTENT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CONTENT_EXT] = $enc; + } + } else { + $a[self::FIELD_CONTENT] = $v; + } } if (null !== ($v = $this->getCopyright())) { - $a[self::FIELD_COPYRIGHT] = $v->getValue(); - $a[self::FIELD_COPYRIGHT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_COPYRIGHT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_COPYRIGHT_EXT] = $enc; + } + } else { + $a[self::FIELD_COPYRIGHT] = $v; + } } if (null !== ($v = $this->getCount())) { - $a[self::FIELD_COUNT] = $v->getValue(); - $a[self::FIELD_COUNT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_COUNT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_COUNT_EXT] = $enc; + } + } else { + $a[self::FIELD_COUNT] = $v; + } } if (null !== ($v = $this->getDate())) { - $a[self::FIELD_DATE] = $v->getValue(); - $a[self::FIELD_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_DATE] = $v; + } } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if (null !== ($v = $this->getExperimental())) { - $a[self::FIELD_EXPERIMENTAL] = $v->getValue(); - $a[self::FIELD_EXPERIMENTAL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EXPERIMENTAL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EXPERIMENTAL_EXT] = $enc; + } + } else { + $a[self::FIELD_EXPERIMENTAL] = $v; + } } if ([] !== ($vs = $this->getFilter())) { - $a[self::FIELD_FILTER] = $vs; + $a[self::FIELD_FILTER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FILTER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FILTER_EXT][] = $enc; + } else { + $a[self::FIELD_FILTER_EXT][] = null; + } + } else { + $a[self::FIELD_FILTER][] = $v; + } + } } if (null !== ($v = $this->getHierarchyMeaning())) { - $a[self::FIELD_HIERARCHY_MEANING] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_HIERARCHY_MEANING] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_HIERARCHY_MEANING_EXT] = $enc; + } + } else { + $a[self::FIELD_HIERARCHY_MEANING] = $v; + } } if (null !== ($v = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_IDENTIFIER] = $v; + } } if ([] !== ($vs = $this->getJurisdiction())) { $a[self::FIELD_JURISDICTION] = $vs; } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if ([] !== ($vs = $this->getProperty())) { $a[self::FIELD_PROPERTY] = $vs; } if (null !== ($v = $this->getPublisher())) { - $a[self::FIELD_PUBLISHER] = $v->getValue(); - $a[self::FIELD_PUBLISHER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PUBLISHER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PUBLISHER_EXT] = $enc; + } + } else { + $a[self::FIELD_PUBLISHER] = $v; + } } if (null !== ($v = $this->getPurpose())) { - $a[self::FIELD_PURPOSE] = $v->getValue(); - $a[self::FIELD_PURPOSE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PURPOSE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PURPOSE_EXT] = $enc; + } + } else { + $a[self::FIELD_PURPOSE] = $v; + } } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getTitle())) { - $a[self::FIELD_TITLE] = $v->getValue(); - $a[self::FIELD_TITLE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TITLE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TITLE_EXT] = $enc; + } + } else { + $a[self::FIELD_TITLE] = $v; + } } if (null !== ($v = $this->getUrl())) { - $a[self::FIELD_URL] = $v->getValue(); - $a[self::FIELD_URL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_URL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_URL_EXT] = $enc; + } + } else { + $a[self::FIELD_URL] = $v; + } } if ([] !== ($vs = $this->getUseContext())) { $a[self::FIELD_USE_CONTEXT] = $vs; } if (null !== ($v = $this->getValueSet())) { - $a[self::FIELD_VALUE_SET] = $v->getValue(); - $a[self::FIELD_VALUE_SET_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_SET] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_SET_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_SET] = $v; + } } if (null !== ($v = $this->getVersion())) { - $a[self::FIELD_VERSION] = $v->getValue(); - $a[self::FIELD_VERSION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VERSION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VERSION_EXT] = $enc; + } + } else { + $a[self::FIELD_VERSION] = $v; + } } if (null !== ($v = $this->getVersionNeeded())) { - $a[self::FIELD_VERSION_NEEDED] = $v->getValue(); - $a[self::FIELD_VERSION_NEEDED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VERSION_NEEDED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VERSION_NEEDED_EXT] = $enc; + } + } else { + $a[self::FIELD_VERSION_NEEDED] = $v; + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRCommunication.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRCommunication.php index e1cbdc8c3a..da5dce1c68 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRCommunication.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRCommunication.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -88,10 +88,6 @@ class FHIRCommunication extends FHIRDomainResource implements PHPFHIRContainedTy { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_COMMUNICATION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_BASED_ON = 'basedOn'; const FIELD_CATEGORY = 'category'; const FIELD_CONTEXT = 'context'; @@ -362,6 +358,9 @@ class FHIRCommunication extends FHIRDomainResource implements PHPFHIRContainedTy */ protected $topic = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRCommunication Constructor * @param null|array $data @@ -381,6 +380,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_BASED_ON])) { if (is_array($data[self::FIELD_BASED_ON])) { foreach($data[self::FIELD_BASED_ON] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addBasedOn($v); } else { @@ -396,6 +398,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CATEGORY])) { if (is_array($data[self::FIELD_CATEGORY])) { foreach($data[self::FIELD_CATEGORY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addCategory($v); } else { @@ -418,6 +423,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_DEFINITION])) { if (is_array($data[self::FIELD_DEFINITION])) { foreach($data[self::FIELD_DEFINITION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addDefinition($v); } else { @@ -436,17 +444,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -455,6 +470,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_MEDIUM])) { if (is_array($data[self::FIELD_MEDIUM])) { foreach($data[self::FIELD_MEDIUM] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addMedium($v); } else { @@ -473,8 +491,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NOT_DONE] instanceof FHIRBoolean) { $this->setNotDone($data[self::FIELD_NOT_DONE]); - } elseif ($ext && is_scalar($data[self::FIELD_NOT_DONE])) { - $this->setNotDone(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_NOT_DONE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NOT_DONE])) { + $this->setNotDone(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_NOT_DONE]] + $ext)); + } else if (is_array($data[self::FIELD_NOT_DONE])) { + $this->setNotDone(new FHIRBoolean(array_merge($ext, $data[self::FIELD_NOT_DONE]))); + } } else { $this->setNotDone(new FHIRBoolean($data[self::FIELD_NOT_DONE])); } @@ -489,6 +511,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_NOTE])) { if (is_array($data[self::FIELD_NOTE])) { foreach($data[self::FIELD_NOTE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRAnnotation) { $this->addNote($v); } else { @@ -504,6 +529,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PART_OF])) { if (is_array($data[self::FIELD_PART_OF])) { foreach($data[self::FIELD_PART_OF] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addPartOf($v); } else { @@ -519,6 +547,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PAYLOAD])) { if (is_array($data[self::FIELD_PAYLOAD])) { foreach($data[self::FIELD_PAYLOAD] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCommunicationPayload) { $this->addPayload($v); } else { @@ -534,6 +565,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REASON_CODE])) { if (is_array($data[self::FIELD_REASON_CODE])) { foreach($data[self::FIELD_REASON_CODE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addReasonCode($v); } else { @@ -549,6 +583,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REASON_REFERENCE])) { if (is_array($data[self::FIELD_REASON_REFERENCE])) { foreach($data[self::FIELD_REASON_REFERENCE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addReasonReference($v); } else { @@ -567,8 +604,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_RECEIVED] instanceof FHIRDateTime) { $this->setReceived($data[self::FIELD_RECEIVED]); - } elseif ($ext && is_scalar($data[self::FIELD_RECEIVED])) { - $this->setReceived(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_RECEIVED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_RECEIVED])) { + $this->setReceived(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_RECEIVED]] + $ext)); + } else if (is_array($data[self::FIELD_RECEIVED])) { + $this->setReceived(new FHIRDateTime(array_merge($ext, $data[self::FIELD_RECEIVED]))); + } } else { $this->setReceived(new FHIRDateTime($data[self::FIELD_RECEIVED])); } @@ -576,6 +617,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_RECIPIENT])) { if (is_array($data[self::FIELD_RECIPIENT])) { foreach($data[self::FIELD_RECIPIENT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addRecipient($v); } else { @@ -601,8 +645,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SENT] instanceof FHIRDateTime) { $this->setSent($data[self::FIELD_SENT]); - } elseif ($ext && is_scalar($data[self::FIELD_SENT])) { - $this->setSent(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_SENT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SENT])) { + $this->setSent(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_SENT]] + $ext)); + } else if (is_array($data[self::FIELD_SENT])) { + $this->setSent(new FHIRDateTime(array_merge($ext, $data[self::FIELD_SENT]))); + } } else { $this->setSent(new FHIRDateTime($data[self::FIELD_SENT])); } @@ -613,8 +661,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIREventStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIREventStatus([FHIREventStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIREventStatus([FHIREventStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIREventStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIREventStatus($data[self::FIELD_STATUS])); } @@ -629,6 +681,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_TOPIC])) { if (is_array($data[self::FIELD_TOPIC])) { foreach($data[self::FIELD_TOPIC] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addTopic($v); } else { @@ -1852,7 +1907,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_BASED_ON, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getCategory())) { foreach($vs as $v) { if (null === $v) { @@ -1861,11 +1915,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_CATEGORY, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getContext())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CONTEXT, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getDefinition())) { foreach($vs as $v) { if (null === $v) { @@ -1874,7 +1926,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_DEFINITION, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -1883,7 +1934,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getMedium())) { foreach($vs as $v) { if (null === $v) { @@ -1895,11 +1945,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getNotDone())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NOT_DONE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getNotDoneReason())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NOT_DONE_REASON, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getNote())) { foreach($vs as $v) { if (null === $v) { @@ -1908,7 +1956,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_NOTE, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getPartOf())) { foreach($vs as $v) { if (null === $v) { @@ -1917,7 +1964,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_PART_OF, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getPayload())) { foreach($vs as $v) { if (null === $v) { @@ -1926,7 +1972,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_PAYLOAD, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getReasonCode())) { foreach($vs as $v) { if (null === $v) { @@ -1935,7 +1980,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_REASON_CODE, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getReasonReference())) { foreach($vs as $v) { if (null === $v) { @@ -1947,7 +1991,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getReceived())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RECEIVED, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getRecipient())) { foreach($vs as $v) { if (null === $v) { @@ -1956,22 +1999,18 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_RECIPIENT, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getSender())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SENDER, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getSent())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SENT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSubject())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBJECT, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getTopic())) { foreach($vs as $v) { if (null === $v) { @@ -2002,14 +2041,37 @@ public function jsonSerialize() $a[self::FIELD_DEFINITION] = $vs; } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if ([] !== ($vs = $this->getMedium())) { $a[self::FIELD_MEDIUM] = $vs; } if (null !== ($v = $this->getNotDone())) { - $a[self::FIELD_NOT_DONE] = $v->getValue(); - $a[self::FIELD_NOT_DONE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NOT_DONE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NOT_DONE_EXT] = $enc; + } + } else { + $a[self::FIELD_NOT_DONE] = $v; + } } if (null !== ($v = $this->getNotDoneReason())) { $a[self::FIELD_NOT_DONE_REASON] = $v; @@ -2030,8 +2092,15 @@ public function jsonSerialize() $a[self::FIELD_REASON_REFERENCE] = $vs; } if (null !== ($v = $this->getReceived())) { - $a[self::FIELD_RECEIVED] = $v->getValue(); - $a[self::FIELD_RECEIVED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_RECEIVED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_RECEIVED_EXT] = $enc; + } + } else { + $a[self::FIELD_RECEIVED] = $v; + } } if ([] !== ($vs = $this->getRecipient())) { $a[self::FIELD_RECIPIENT] = $vs; @@ -2040,11 +2109,26 @@ public function jsonSerialize() $a[self::FIELD_SENDER] = $v; } if (null !== ($v = $this->getSent())) { - $a[self::FIELD_SENT] = $v->getValue(); - $a[self::FIELD_SENT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SENT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SENT_EXT] = $enc; + } + } else { + $a[self::FIELD_SENT] = $v; + } } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getSubject())) { $a[self::FIELD_SUBJECT] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRCommunicationRequest.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRCommunicationRequest.php index 42e4aff89e..61e55c0f72 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRCommunicationRequest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRCommunicationRequest.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -90,10 +90,6 @@ class FHIRCommunicationRequest extends FHIRDomainResource implements PHPFHIRCont { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_COMMUNICATION_REQUEST; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_AUTHORED_ON = 'authoredOn'; const FIELD_AUTHORED_ON_EXT = '_authoredOn'; const FIELD_BASED_ON = 'basedOn'; @@ -373,6 +369,9 @@ class FHIRCommunicationRequest extends FHIRDomainResource implements PHPFHIRCont */ protected $topic = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRCommunicationRequest Constructor * @param null|array $data @@ -395,8 +394,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_AUTHORED_ON] instanceof FHIRDateTime) { $this->setAuthoredOn($data[self::FIELD_AUTHORED_ON]); - } elseif ($ext && is_scalar($data[self::FIELD_AUTHORED_ON])) { - $this->setAuthoredOn(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_AUTHORED_ON]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_AUTHORED_ON])) { + $this->setAuthoredOn(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_AUTHORED_ON]] + $ext)); + } else if (is_array($data[self::FIELD_AUTHORED_ON])) { + $this->setAuthoredOn(new FHIRDateTime(array_merge($ext, $data[self::FIELD_AUTHORED_ON]))); + } } else { $this->setAuthoredOn(new FHIRDateTime($data[self::FIELD_AUTHORED_ON])); } @@ -404,6 +407,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_BASED_ON])) { if (is_array($data[self::FIELD_BASED_ON])) { foreach($data[self::FIELD_BASED_ON] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addBasedOn($v); } else { @@ -419,6 +425,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CATEGORY])) { if (is_array($data[self::FIELD_CATEGORY])) { foreach($data[self::FIELD_CATEGORY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addCategory($v); } else { @@ -444,8 +453,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_GROUP_IDENTIFIER] instanceof FHIRIdentifier) { $this->setGroupIdentifier($data[self::FIELD_GROUP_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_GROUP_IDENTIFIER])) { - $this->setGroupIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_GROUP_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_GROUP_IDENTIFIER])) { + $this->setGroupIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_GROUP_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_GROUP_IDENTIFIER])) { + $this->setGroupIdentifier(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_GROUP_IDENTIFIER]))); + } } else { $this->setGroupIdentifier(new FHIRIdentifier($data[self::FIELD_GROUP_IDENTIFIER])); } @@ -456,17 +469,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -475,6 +495,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_MEDIUM])) { if (is_array($data[self::FIELD_MEDIUM])) { foreach($data[self::FIELD_MEDIUM] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addMedium($v); } else { @@ -490,6 +513,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_NOTE])) { if (is_array($data[self::FIELD_NOTE])) { foreach($data[self::FIELD_NOTE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRAnnotation) { $this->addNote($v); } else { @@ -508,8 +534,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_OCCURRENCE_DATE_TIME] instanceof FHIRDateTime) { $this->setOccurrenceDateTime($data[self::FIELD_OCCURRENCE_DATE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_OCCURRENCE_DATE_TIME])) { - $this->setOccurrenceDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_OCCURRENCE_DATE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_OCCURRENCE_DATE_TIME])) { + $this->setOccurrenceDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_OCCURRENCE_DATE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_OCCURRENCE_DATE_TIME])) { + $this->setOccurrenceDateTime(new FHIRDateTime(array_merge($ext, $data[self::FIELD_OCCURRENCE_DATE_TIME]))); + } } else { $this->setOccurrenceDateTime(new FHIRDateTime($data[self::FIELD_OCCURRENCE_DATE_TIME])); } @@ -524,6 +554,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PAYLOAD])) { if (is_array($data[self::FIELD_PAYLOAD])) { foreach($data[self::FIELD_PAYLOAD] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCommunicationRequestPayload) { $this->addPayload($v); } else { @@ -542,8 +575,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PRIORITY] instanceof FHIRRequestPriority) { $this->setPriority($data[self::FIELD_PRIORITY]); - } elseif ($ext && is_scalar($data[self::FIELD_PRIORITY])) { - $this->setPriority(new FHIRRequestPriority([FHIRRequestPriority::FIELD_VALUE => $data[self::FIELD_PRIORITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PRIORITY])) { + $this->setPriority(new FHIRRequestPriority([FHIRRequestPriority::FIELD_VALUE => $data[self::FIELD_PRIORITY]] + $ext)); + } else if (is_array($data[self::FIELD_PRIORITY])) { + $this->setPriority(new FHIRRequestPriority(array_merge($ext, $data[self::FIELD_PRIORITY]))); + } } else { $this->setPriority(new FHIRRequestPriority($data[self::FIELD_PRIORITY])); } @@ -551,6 +588,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REASON_CODE])) { if (is_array($data[self::FIELD_REASON_CODE])) { foreach($data[self::FIELD_REASON_CODE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addReasonCode($v); } else { @@ -566,6 +606,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REASON_REFERENCE])) { if (is_array($data[self::FIELD_REASON_REFERENCE])) { foreach($data[self::FIELD_REASON_REFERENCE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addReasonReference($v); } else { @@ -581,6 +624,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_RECIPIENT])) { if (is_array($data[self::FIELD_RECIPIENT])) { foreach($data[self::FIELD_RECIPIENT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addRecipient($v); } else { @@ -596,6 +642,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REPLACES])) { if (is_array($data[self::FIELD_REPLACES])) { foreach($data[self::FIELD_REPLACES] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addReplaces($v); } else { @@ -628,8 +677,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRRequestStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRRequestStatus([FHIRRequestStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRRequestStatus([FHIRRequestStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRRequestStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRRequestStatus($data[self::FIELD_STATUS])); } @@ -644,6 +697,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_TOPIC])) { if (is_array($data[self::FIELD_TOPIC])) { foreach($data[self::FIELD_TOPIC] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addTopic($v); } else { @@ -1837,10 +1893,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getAuthoredOn())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AUTHORED_ON, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getBasedOn())) { foreach($vs as $v) { if (null === $v) { @@ -1849,7 +1905,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_BASED_ON, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getCategory())) { foreach($vs as $v) { if (null === $v) { @@ -1858,15 +1913,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_CATEGORY, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getContext())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CONTEXT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getGroupIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_GROUP_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -1875,7 +1927,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getMedium())) { foreach($vs as $v) { if (null === $v) { @@ -1884,7 +1935,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_MEDIUM, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getNote())) { foreach($vs as $v) { if (null === $v) { @@ -1896,11 +1946,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getOccurrenceDateTime())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OCCURRENCE_DATE_TIME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOccurrencePeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OCCURRENCE_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getPayload())) { foreach($vs as $v) { if (null === $v) { @@ -1909,11 +1957,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_PAYLOAD, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getPriority())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PRIORITY, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getReasonCode())) { foreach($vs as $v) { if (null === $v) { @@ -1922,7 +1968,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_REASON_CODE, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getReasonReference())) { foreach($vs as $v) { if (null === $v) { @@ -1931,7 +1976,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_REASON_REFERENCE, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getRecipient())) { foreach($vs as $v) { if (null === $v) { @@ -1940,7 +1984,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_RECIPIENT, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getReplaces())) { foreach($vs as $v) { if (null === $v) { @@ -1949,23 +1992,18 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_REPLACES, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getRequester())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REQUESTER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSender())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SENDER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSubject())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBJECT, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getTopic())) { foreach($vs as $v) { if (null === $v) { @@ -1984,8 +2022,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getAuthoredOn())) { - $a[self::FIELD_AUTHORED_ON] = $v->getValue(); - $a[self::FIELD_AUTHORED_ON_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_AUTHORED_ON] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_AUTHORED_ON_EXT] = $enc; + } + } else { + $a[self::FIELD_AUTHORED_ON] = $v; + } } if ([] !== ($vs = $this->getBasedOn())) { $a[self::FIELD_BASED_ON] = $vs; @@ -1997,10 +2042,34 @@ public function jsonSerialize() $a[self::FIELD_CONTEXT] = $v; } if (null !== ($v = $this->getGroupIdentifier())) { - $a[self::FIELD_GROUP_IDENTIFIER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_GROUP_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_GROUP_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_GROUP_IDENTIFIER] = $v; + } } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if ([] !== ($vs = $this->getMedium())) { $a[self::FIELD_MEDIUM] = $vs; @@ -2009,8 +2078,15 @@ public function jsonSerialize() $a[self::FIELD_NOTE] = $vs; } if (null !== ($v = $this->getOccurrenceDateTime())) { - $a[self::FIELD_OCCURRENCE_DATE_TIME] = $v->getValue(); - $a[self::FIELD_OCCURRENCE_DATE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_OCCURRENCE_DATE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_OCCURRENCE_DATE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_OCCURRENCE_DATE_TIME] = $v; + } } if (null !== ($v = $this->getOccurrencePeriod())) { $a[self::FIELD_OCCURRENCE_PERIOD] = $v; @@ -2019,7 +2095,15 @@ public function jsonSerialize() $a[self::FIELD_PAYLOAD] = $vs; } if (null !== ($v = $this->getPriority())) { - $a[self::FIELD_PRIORITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PRIORITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PRIORITY_EXT] = $enc; + } + } else { + $a[self::FIELD_PRIORITY] = $v; + } } if ([] !== ($vs = $this->getReasonCode())) { $a[self::FIELD_REASON_CODE] = $vs; @@ -2040,7 +2124,15 @@ public function jsonSerialize() $a[self::FIELD_SENDER] = $v; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getSubject())) { $a[self::FIELD_SUBJECT] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRCompartmentDefinition.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRCompartmentDefinition.php index 175f471994..9095b5830a 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRCompartmentDefinition.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRCompartmentDefinition.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -89,10 +89,6 @@ class FHIRCompartmentDefinition extends FHIRDomainResource implements PHPFHIRCon { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_COMPARTMENT_DEFINITION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CODE = 'code'; const FIELD_CODE_EXT = '_code'; const FIELD_CONTACT = 'contact'; @@ -317,6 +313,9 @@ class FHIRCompartmentDefinition extends FHIRDomainResource implements PHPFHIRCon */ protected $useContext = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRCompartmentDefinition Constructor * @param null|array $data @@ -339,8 +338,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CODE] instanceof FHIRCompartmentType) { $this->setCode($data[self::FIELD_CODE]); - } elseif ($ext && is_scalar($data[self::FIELD_CODE])) { - $this->setCode(new FHIRCompartmentType([FHIRCompartmentType::FIELD_VALUE => $data[self::FIELD_CODE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CODE])) { + $this->setCode(new FHIRCompartmentType([FHIRCompartmentType::FIELD_VALUE => $data[self::FIELD_CODE]] + $ext)); + } else if (is_array($data[self::FIELD_CODE])) { + $this->setCode(new FHIRCompartmentType(array_merge($ext, $data[self::FIELD_CODE]))); + } } else { $this->setCode(new FHIRCompartmentType($data[self::FIELD_CODE])); } @@ -348,6 +351,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CONTACT])) { if (is_array($data[self::FIELD_CONTACT])) { foreach($data[self::FIELD_CONTACT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContactDetail) { $this->addContact($v); } else { @@ -366,8 +372,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATE] instanceof FHIRDateTime) { $this->setDate($data[self::FIELD_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_DATE])) { - $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime(array_merge($ext, $data[self::FIELD_DATE]))); + } } else { $this->setDate(new FHIRDateTime($data[self::FIELD_DATE])); } @@ -378,8 +388,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRMarkdown) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRMarkdown($data[self::FIELD_DESCRIPTION])); } @@ -390,8 +404,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EXPERIMENTAL] instanceof FHIRBoolean) { $this->setExperimental($data[self::FIELD_EXPERIMENTAL]); - } elseif ($ext && is_scalar($data[self::FIELD_EXPERIMENTAL])) { - $this->setExperimental(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_EXPERIMENTAL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EXPERIMENTAL])) { + $this->setExperimental(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_EXPERIMENTAL]] + $ext)); + } else if (is_array($data[self::FIELD_EXPERIMENTAL])) { + $this->setExperimental(new FHIRBoolean(array_merge($ext, $data[self::FIELD_EXPERIMENTAL]))); + } } else { $this->setExperimental(new FHIRBoolean($data[self::FIELD_EXPERIMENTAL])); } @@ -399,6 +417,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_JURISDICTION])) { if (is_array($data[self::FIELD_JURISDICTION])) { foreach($data[self::FIELD_JURISDICTION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addJurisdiction($v); } else { @@ -417,8 +438,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -429,8 +454,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PUBLISHER] instanceof FHIRString) { $this->setPublisher($data[self::FIELD_PUBLISHER]); - } elseif ($ext && is_scalar($data[self::FIELD_PUBLISHER])) { - $this->setPublisher(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PUBLISHER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PUBLISHER])) { + $this->setPublisher(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PUBLISHER]] + $ext)); + } else if (is_array($data[self::FIELD_PUBLISHER])) { + $this->setPublisher(new FHIRString(array_merge($ext, $data[self::FIELD_PUBLISHER]))); + } } else { $this->setPublisher(new FHIRString($data[self::FIELD_PUBLISHER])); } @@ -441,8 +470,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PURPOSE] instanceof FHIRMarkdown) { $this->setPurpose($data[self::FIELD_PURPOSE]); - } elseif ($ext && is_scalar($data[self::FIELD_PURPOSE])) { - $this->setPurpose(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_PURPOSE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PURPOSE])) { + $this->setPurpose(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_PURPOSE]] + $ext)); + } else if (is_array($data[self::FIELD_PURPOSE])) { + $this->setPurpose(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_PURPOSE]))); + } } else { $this->setPurpose(new FHIRMarkdown($data[self::FIELD_PURPOSE])); } @@ -450,6 +483,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_RESOURCE])) { if (is_array($data[self::FIELD_RESOURCE])) { foreach($data[self::FIELD_RESOURCE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCompartmentDefinitionResource) { $this->addResource($v); } else { @@ -468,8 +504,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SEARCH] instanceof FHIRBoolean) { $this->setSearch($data[self::FIELD_SEARCH]); - } elseif ($ext && is_scalar($data[self::FIELD_SEARCH])) { - $this->setSearch(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_SEARCH]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SEARCH])) { + $this->setSearch(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_SEARCH]] + $ext)); + } else if (is_array($data[self::FIELD_SEARCH])) { + $this->setSearch(new FHIRBoolean(array_merge($ext, $data[self::FIELD_SEARCH]))); + } } else { $this->setSearch(new FHIRBoolean($data[self::FIELD_SEARCH])); } @@ -480,8 +520,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRPublicationStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRPublicationStatus([FHIRPublicationStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRPublicationStatus([FHIRPublicationStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRPublicationStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRPublicationStatus($data[self::FIELD_STATUS])); } @@ -492,8 +536,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TITLE] instanceof FHIRString) { $this->setTitle($data[self::FIELD_TITLE]); - } elseif ($ext && is_scalar($data[self::FIELD_TITLE])) { - $this->setTitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TITLE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TITLE])) { + $this->setTitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TITLE]] + $ext)); + } else if (is_array($data[self::FIELD_TITLE])) { + $this->setTitle(new FHIRString(array_merge($ext, $data[self::FIELD_TITLE]))); + } } else { $this->setTitle(new FHIRString($data[self::FIELD_TITLE])); } @@ -504,8 +552,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_URL] instanceof FHIRUri) { $this->setUrl($data[self::FIELD_URL]); - } elseif ($ext && is_scalar($data[self::FIELD_URL])) { - $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } else if (is_array($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri(array_merge($ext, $data[self::FIELD_URL]))); + } } else { $this->setUrl(new FHIRUri($data[self::FIELD_URL])); } @@ -513,6 +565,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_USE_CONTEXT])) { if (is_array($data[self::FIELD_USE_CONTEXT])) { foreach($data[self::FIELD_USE_CONTEXT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRUsageContext) { $this->addUseContext($v); } else { @@ -1414,7 +1469,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getContact())) { foreach($vs as $v) { if (null === $v) { @@ -1432,7 +1486,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getExperimental())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EXPERIMENTAL, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getJurisdiction())) { foreach($vs as $v) { if (null === $v) { @@ -1450,7 +1503,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getPurpose())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PURPOSE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getResource())) { foreach($vs as $v) { if (null === $v) { @@ -1462,7 +1514,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getSearch())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SEARCH, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } @@ -1472,7 +1523,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getUrl())) { $v->xmlSerialize($sxe->addChild(self::FIELD_URL, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getUseContext())) { foreach($vs as $v) { if (null === $v) { @@ -1491,55 +1541,134 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getCode())) { - $a[self::FIELD_CODE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CODE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CODE_EXT] = $enc; + } + } else { + $a[self::FIELD_CODE] = $v; + } } if ([] !== ($vs = $this->getContact())) { $a[self::FIELD_CONTACT] = $vs; } if (null !== ($v = $this->getDate())) { - $a[self::FIELD_DATE] = $v->getValue(); - $a[self::FIELD_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_DATE] = $v; + } } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if (null !== ($v = $this->getExperimental())) { - $a[self::FIELD_EXPERIMENTAL] = $v->getValue(); - $a[self::FIELD_EXPERIMENTAL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EXPERIMENTAL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EXPERIMENTAL_EXT] = $enc; + } + } else { + $a[self::FIELD_EXPERIMENTAL] = $v; + } } if ([] !== ($vs = $this->getJurisdiction())) { $a[self::FIELD_JURISDICTION] = $vs; } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if (null !== ($v = $this->getPublisher())) { - $a[self::FIELD_PUBLISHER] = $v->getValue(); - $a[self::FIELD_PUBLISHER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PUBLISHER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PUBLISHER_EXT] = $enc; + } + } else { + $a[self::FIELD_PUBLISHER] = $v; + } } if (null !== ($v = $this->getPurpose())) { - $a[self::FIELD_PURPOSE] = $v->getValue(); - $a[self::FIELD_PURPOSE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PURPOSE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PURPOSE_EXT] = $enc; + } + } else { + $a[self::FIELD_PURPOSE] = $v; + } } if ([] !== ($vs = $this->getResource())) { $a[self::FIELD_RESOURCE] = $vs; } if (null !== ($v = $this->getSearch())) { - $a[self::FIELD_SEARCH] = $v->getValue(); - $a[self::FIELD_SEARCH_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SEARCH] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SEARCH_EXT] = $enc; + } + } else { + $a[self::FIELD_SEARCH] = $v; + } } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getTitle())) { - $a[self::FIELD_TITLE] = $v->getValue(); - $a[self::FIELD_TITLE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TITLE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TITLE_EXT] = $enc; + } + } else { + $a[self::FIELD_TITLE] = $v; + } } if (null !== ($v = $this->getUrl())) { - $a[self::FIELD_URL] = $v->getValue(); - $a[self::FIELD_URL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_URL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_URL_EXT] = $enc; + } + } else { + $a[self::FIELD_URL] = $v; + } } if ([] !== ($vs = $this->getUseContext())) { $a[self::FIELD_USE_CONTEXT] = $vs; diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRComposition.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRComposition.php index 1d1f7b1516..60b72d5801 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRComposition.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRComposition.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -94,10 +94,6 @@ class FHIRComposition extends FHIRDomainResource implements PHPFHIRContainedType { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_COMPOSITION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ATTESTER = 'attester'; const FIELD_AUTHOR = 'author'; const FIELD_CLASS = 'class'; @@ -314,6 +310,9 @@ class FHIRComposition extends FHIRDomainResource implements PHPFHIRContainedType */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRComposition Constructor * @param null|array $data @@ -333,6 +332,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ATTESTER])) { if (is_array($data[self::FIELD_ATTESTER])) { foreach($data[self::FIELD_ATTESTER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCompositionAttester) { $this->addAttester($v); } else { @@ -348,6 +350,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_AUTHOR])) { if (is_array($data[self::FIELD_AUTHOR])) { foreach($data[self::FIELD_AUTHOR] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addAuthor($v); } else { @@ -373,8 +378,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CONFIDENTIALITY] instanceof FHIRConfidentialityClassification) { $this->setConfidentiality($data[self::FIELD_CONFIDENTIALITY]); - } elseif ($ext && is_scalar($data[self::FIELD_CONFIDENTIALITY])) { - $this->setConfidentiality(new FHIRConfidentialityClassification([FHIRConfidentialityClassification::FIELD_VALUE => $data[self::FIELD_CONFIDENTIALITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CONFIDENTIALITY])) { + $this->setConfidentiality(new FHIRConfidentialityClassification([FHIRConfidentialityClassification::FIELD_VALUE => $data[self::FIELD_CONFIDENTIALITY]] + $ext)); + } else if (is_array($data[self::FIELD_CONFIDENTIALITY])) { + $this->setConfidentiality(new FHIRConfidentialityClassification(array_merge($ext, $data[self::FIELD_CONFIDENTIALITY]))); + } } else { $this->setConfidentiality(new FHIRConfidentialityClassification($data[self::FIELD_CONFIDENTIALITY])); } @@ -392,8 +401,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATE] instanceof FHIRDateTime) { $this->setDate($data[self::FIELD_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_DATE])) { - $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime(array_merge($ext, $data[self::FIELD_DATE]))); + } } else { $this->setDate(new FHIRDateTime($data[self::FIELD_DATE])); } @@ -408,6 +421,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_EVENT])) { if (is_array($data[self::FIELD_EVENT])) { foreach($data[self::FIELD_EVENT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCompositionEvent) { $this->addEvent($v); } else { @@ -426,8 +442,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->setIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { - $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_IDENTIFIER]))); + } } else { $this->setIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); } @@ -435,6 +455,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_RELATES_TO])) { if (is_array($data[self::FIELD_RELATES_TO])) { foreach($data[self::FIELD_RELATES_TO] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCompositionRelatesTo) { $this->addRelatesTo($v); } else { @@ -450,6 +473,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SECTION])) { if (is_array($data[self::FIELD_SECTION])) { foreach($data[self::FIELD_SECTION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCompositionSection) { $this->addSection($v); } else { @@ -468,8 +494,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRCompositionStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRCompositionStatus([FHIRCompositionStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRCompositionStatus([FHIRCompositionStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRCompositionStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRCompositionStatus($data[self::FIELD_STATUS])); } @@ -487,8 +517,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TITLE] instanceof FHIRString) { $this->setTitle($data[self::FIELD_TITLE]); - } elseif ($ext && is_scalar($data[self::FIELD_TITLE])) { - $this->setTitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TITLE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TITLE])) { + $this->setTitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TITLE]] + $ext)); + } else if (is_array($data[self::FIELD_TITLE])) { + $this->setTitle(new FHIRString(array_merge($ext, $data[self::FIELD_TITLE]))); + } } else { $this->setTitle(new FHIRString($data[self::FIELD_TITLE])); } @@ -1350,7 +1384,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_ATTESTER, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getAuthor())) { foreach($vs as $v) { if (null === $v) { @@ -1359,26 +1392,21 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_AUTHOR, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getClass())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CLASS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getConfidentiality())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CONFIDENTIALITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getCustodian())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CUSTODIAN, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DATE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getEncounter())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ENCOUNTER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getEvent())) { foreach($vs as $v) { if (null === $v) { @@ -1387,11 +1415,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_EVENT, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getRelatesTo())) { foreach($vs as $v) { if (null === $v) { @@ -1400,7 +1426,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_RELATES_TO, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getSection())) { foreach($vs as $v) { if (null === $v) { @@ -1409,18 +1434,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_SECTION, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSubject())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBJECT, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getTitle())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TITLE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -1443,14 +1465,29 @@ public function jsonSerialize() $a[self::FIELD_CLASS] = $v; } if (null !== ($v = $this->getConfidentiality())) { - $a[self::FIELD_CONFIDENTIALITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CONFIDENTIALITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CONFIDENTIALITY_EXT] = $enc; + } + } else { + $a[self::FIELD_CONFIDENTIALITY] = $v; + } } if (null !== ($v = $this->getCustodian())) { $a[self::FIELD_CUSTODIAN] = $v; } if (null !== ($v = $this->getDate())) { - $a[self::FIELD_DATE] = $v->getValue(); - $a[self::FIELD_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_DATE] = $v; + } } if (null !== ($v = $this->getEncounter())) { $a[self::FIELD_ENCOUNTER] = $v; @@ -1459,7 +1496,15 @@ public function jsonSerialize() $a[self::FIELD_EVENT] = $vs; } if (null !== ($v = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_IDENTIFIER] = $v; + } } if ([] !== ($vs = $this->getRelatesTo())) { $a[self::FIELD_RELATES_TO] = $vs; @@ -1468,14 +1513,29 @@ public function jsonSerialize() $a[self::FIELD_SECTION] = $vs; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getSubject())) { $a[self::FIELD_SUBJECT] = $v; } if (null !== ($v = $this->getTitle())) { - $a[self::FIELD_TITLE] = $v->getValue(); - $a[self::FIELD_TITLE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TITLE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TITLE_EXT] = $enc; + } + } else { + $a[self::FIELD_TITLE] = $v; + } } if (null !== ($v = $this->getType())) { $a[self::FIELD_TYPE] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRConceptMap.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRConceptMap.php index 7362acfd79..798c21eea2 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRConceptMap.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRConceptMap.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -91,10 +91,6 @@ class FHIRConceptMap extends FHIRDomainResource implements PHPFHIRContainedTypeI { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONCEPT_MAP; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CONTACT = 'contact'; const FIELD_COPYRIGHT = 'copyright'; const FIELD_COPYRIGHT_EXT = '_copyright'; @@ -400,6 +396,9 @@ class FHIRConceptMap extends FHIRDomainResource implements PHPFHIRContainedTypeI */ protected $version = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRConceptMap Constructor * @param null|array $data @@ -419,6 +418,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CONTACT])) { if (is_array($data[self::FIELD_CONTACT])) { foreach($data[self::FIELD_CONTACT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContactDetail) { $this->addContact($v); } else { @@ -437,8 +439,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_COPYRIGHT] instanceof FHIRMarkdown) { $this->setCopyright($data[self::FIELD_COPYRIGHT]); - } elseif ($ext && is_scalar($data[self::FIELD_COPYRIGHT])) { - $this->setCopyright(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_COPYRIGHT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_COPYRIGHT])) { + $this->setCopyright(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_COPYRIGHT]] + $ext)); + } else if (is_array($data[self::FIELD_COPYRIGHT])) { + $this->setCopyright(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_COPYRIGHT]))); + } } else { $this->setCopyright(new FHIRMarkdown($data[self::FIELD_COPYRIGHT])); } @@ -449,8 +455,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATE] instanceof FHIRDateTime) { $this->setDate($data[self::FIELD_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_DATE])) { - $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime(array_merge($ext, $data[self::FIELD_DATE]))); + } } else { $this->setDate(new FHIRDateTime($data[self::FIELD_DATE])); } @@ -461,8 +471,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRMarkdown) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRMarkdown($data[self::FIELD_DESCRIPTION])); } @@ -473,8 +487,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EXPERIMENTAL] instanceof FHIRBoolean) { $this->setExperimental($data[self::FIELD_EXPERIMENTAL]); - } elseif ($ext && is_scalar($data[self::FIELD_EXPERIMENTAL])) { - $this->setExperimental(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_EXPERIMENTAL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EXPERIMENTAL])) { + $this->setExperimental(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_EXPERIMENTAL]] + $ext)); + } else if (is_array($data[self::FIELD_EXPERIMENTAL])) { + $this->setExperimental(new FHIRBoolean(array_merge($ext, $data[self::FIELD_EXPERIMENTAL]))); + } } else { $this->setExperimental(new FHIRBoolean($data[self::FIELD_EXPERIMENTAL])); } @@ -482,6 +500,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_GROUP])) { if (is_array($data[self::FIELD_GROUP])) { foreach($data[self::FIELD_GROUP] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRConceptMapGroup) { $this->addGroup($v); } else { @@ -500,8 +521,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->setIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { - $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_IDENTIFIER]))); + } } else { $this->setIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); } @@ -509,6 +534,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_JURISDICTION])) { if (is_array($data[self::FIELD_JURISDICTION])) { foreach($data[self::FIELD_JURISDICTION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addJurisdiction($v); } else { @@ -527,8 +555,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -539,8 +571,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PUBLISHER] instanceof FHIRString) { $this->setPublisher($data[self::FIELD_PUBLISHER]); - } elseif ($ext && is_scalar($data[self::FIELD_PUBLISHER])) { - $this->setPublisher(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PUBLISHER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PUBLISHER])) { + $this->setPublisher(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PUBLISHER]] + $ext)); + } else if (is_array($data[self::FIELD_PUBLISHER])) { + $this->setPublisher(new FHIRString(array_merge($ext, $data[self::FIELD_PUBLISHER]))); + } } else { $this->setPublisher(new FHIRString($data[self::FIELD_PUBLISHER])); } @@ -551,8 +587,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PURPOSE] instanceof FHIRMarkdown) { $this->setPurpose($data[self::FIELD_PURPOSE]); - } elseif ($ext && is_scalar($data[self::FIELD_PURPOSE])) { - $this->setPurpose(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_PURPOSE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PURPOSE])) { + $this->setPurpose(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_PURPOSE]] + $ext)); + } else if (is_array($data[self::FIELD_PURPOSE])) { + $this->setPurpose(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_PURPOSE]))); + } } else { $this->setPurpose(new FHIRMarkdown($data[self::FIELD_PURPOSE])); } @@ -570,8 +610,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SOURCE_URI] instanceof FHIRUri) { $this->setSourceUri($data[self::FIELD_SOURCE_URI]); - } elseif ($ext && is_scalar($data[self::FIELD_SOURCE_URI])) { - $this->setSourceUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_SOURCE_URI]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SOURCE_URI])) { + $this->setSourceUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_SOURCE_URI]] + $ext)); + } else if (is_array($data[self::FIELD_SOURCE_URI])) { + $this->setSourceUri(new FHIRUri(array_merge($ext, $data[self::FIELD_SOURCE_URI]))); + } } else { $this->setSourceUri(new FHIRUri($data[self::FIELD_SOURCE_URI])); } @@ -582,8 +626,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRPublicationStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRPublicationStatus([FHIRPublicationStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRPublicationStatus([FHIRPublicationStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRPublicationStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRPublicationStatus($data[self::FIELD_STATUS])); } @@ -601,8 +649,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TARGET_URI] instanceof FHIRUri) { $this->setTargetUri($data[self::FIELD_TARGET_URI]); - } elseif ($ext && is_scalar($data[self::FIELD_TARGET_URI])) { - $this->setTargetUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_TARGET_URI]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TARGET_URI])) { + $this->setTargetUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_TARGET_URI]] + $ext)); + } else if (is_array($data[self::FIELD_TARGET_URI])) { + $this->setTargetUri(new FHIRUri(array_merge($ext, $data[self::FIELD_TARGET_URI]))); + } } else { $this->setTargetUri(new FHIRUri($data[self::FIELD_TARGET_URI])); } @@ -613,8 +665,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TITLE] instanceof FHIRString) { $this->setTitle($data[self::FIELD_TITLE]); - } elseif ($ext && is_scalar($data[self::FIELD_TITLE])) { - $this->setTitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TITLE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TITLE])) { + $this->setTitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TITLE]] + $ext)); + } else if (is_array($data[self::FIELD_TITLE])) { + $this->setTitle(new FHIRString(array_merge($ext, $data[self::FIELD_TITLE]))); + } } else { $this->setTitle(new FHIRString($data[self::FIELD_TITLE])); } @@ -625,8 +681,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_URL] instanceof FHIRUri) { $this->setUrl($data[self::FIELD_URL]); - } elseif ($ext && is_scalar($data[self::FIELD_URL])) { - $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } else if (is_array($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri(array_merge($ext, $data[self::FIELD_URL]))); + } } else { $this->setUrl(new FHIRUri($data[self::FIELD_URL])); } @@ -634,6 +694,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_USE_CONTEXT])) { if (is_array($data[self::FIELD_USE_CONTEXT])) { foreach($data[self::FIELD_USE_CONTEXT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRUsageContext) { $this->addUseContext($v); } else { @@ -652,8 +715,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VERSION] instanceof FHIRString) { $this->setVersion($data[self::FIELD_VERSION]); - } elseif ($ext && is_scalar($data[self::FIELD_VERSION])) { - $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } else if (is_array($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString(array_merge($ext, $data[self::FIELD_VERSION]))); + } } else { $this->setVersion(new FHIRString($data[self::FIELD_VERSION])); } @@ -1798,7 +1865,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getExperimental())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EXPERIMENTAL, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getGroup())) { foreach($vs as $v) { if (null === $v) { @@ -1807,11 +1873,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_GROUP, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getJurisdiction())) { foreach($vs as $v) { if (null === $v) { @@ -1829,18 +1893,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getPurpose())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PURPOSE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSourceReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SOURCE_REFERENCE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getSourceUri())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SOURCE_URI, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getTargetReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TARGET_REFERENCE, null, $v->_getFHIRXMLNamespace())); } @@ -1853,7 +1914,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getUrl())) { $v->xmlSerialize($sxe->addChild(self::FIELD_URL, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getUseContext())) { foreach($vs as $v) { if (null === $v) { @@ -1878,73 +1938,173 @@ public function jsonSerialize() $a[self::FIELD_CONTACT] = $vs; } if (null !== ($v = $this->getCopyright())) { - $a[self::FIELD_COPYRIGHT] = $v->getValue(); - $a[self::FIELD_COPYRIGHT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_COPYRIGHT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_COPYRIGHT_EXT] = $enc; + } + } else { + $a[self::FIELD_COPYRIGHT] = $v; + } } if (null !== ($v = $this->getDate())) { - $a[self::FIELD_DATE] = $v->getValue(); - $a[self::FIELD_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_DATE] = $v; + } } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if (null !== ($v = $this->getExperimental())) { - $a[self::FIELD_EXPERIMENTAL] = $v->getValue(); - $a[self::FIELD_EXPERIMENTAL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EXPERIMENTAL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EXPERIMENTAL_EXT] = $enc; + } + } else { + $a[self::FIELD_EXPERIMENTAL] = $v; + } } if ([] !== ($vs = $this->getGroup())) { $a[self::FIELD_GROUP] = $vs; } if (null !== ($v = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_IDENTIFIER] = $v; + } } if ([] !== ($vs = $this->getJurisdiction())) { $a[self::FIELD_JURISDICTION] = $vs; } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if (null !== ($v = $this->getPublisher())) { - $a[self::FIELD_PUBLISHER] = $v->getValue(); - $a[self::FIELD_PUBLISHER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PUBLISHER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PUBLISHER_EXT] = $enc; + } + } else { + $a[self::FIELD_PUBLISHER] = $v; + } } if (null !== ($v = $this->getPurpose())) { - $a[self::FIELD_PURPOSE] = $v->getValue(); - $a[self::FIELD_PURPOSE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PURPOSE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PURPOSE_EXT] = $enc; + } + } else { + $a[self::FIELD_PURPOSE] = $v; + } } if (null !== ($v = $this->getSourceReference())) { $a[self::FIELD_SOURCE_REFERENCE] = $v; } if (null !== ($v = $this->getSourceUri())) { - $a[self::FIELD_SOURCE_URI] = $v->getValue(); - $a[self::FIELD_SOURCE_URI_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SOURCE_URI] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SOURCE_URI_EXT] = $enc; + } + } else { + $a[self::FIELD_SOURCE_URI] = $v; + } } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getTargetReference())) { $a[self::FIELD_TARGET_REFERENCE] = $v; } if (null !== ($v = $this->getTargetUri())) { - $a[self::FIELD_TARGET_URI] = $v->getValue(); - $a[self::FIELD_TARGET_URI_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TARGET_URI] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TARGET_URI_EXT] = $enc; + } + } else { + $a[self::FIELD_TARGET_URI] = $v; + } } if (null !== ($v = $this->getTitle())) { - $a[self::FIELD_TITLE] = $v->getValue(); - $a[self::FIELD_TITLE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TITLE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TITLE_EXT] = $enc; + } + } else { + $a[self::FIELD_TITLE] = $v; + } } if (null !== ($v = $this->getUrl())) { - $a[self::FIELD_URL] = $v->getValue(); - $a[self::FIELD_URL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_URL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_URL_EXT] = $enc; + } + } else { + $a[self::FIELD_URL] = $v; + } } if ([] !== ($vs = $this->getUseContext())) { $a[self::FIELD_USE_CONTEXT] = $vs; } if (null !== ($v = $this->getVersion())) { - $a[self::FIELD_VERSION] = $v->getValue(); - $a[self::FIELD_VERSION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VERSION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VERSION_EXT] = $enc; + } + } else { + $a[self::FIELD_VERSION] = $v; + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRCondition.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRCondition.php index 646d358e4f..c379f92ad2 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRCondition.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRCondition.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -93,11 +93,8 @@ class FHIRCondition extends FHIRDomainResource implements PHPFHIRContainedTypeIn { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONDITION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ABATEMENT_AGE = 'abatementAge'; + const FIELD_ABATEMENT_AGE_EXT = '_abatementAge'; const FIELD_ABATEMENT_BOOLEAN = 'abatementBoolean'; const FIELD_ABATEMENT_BOOLEAN_EXT = '_abatementBoolean'; const FIELD_ABATEMENT_DATE_TIME = 'abatementDateTime'; @@ -120,6 +117,7 @@ class FHIRCondition extends FHIRDomainResource implements PHPFHIRContainedTypeIn const FIELD_IDENTIFIER_EXT = '_identifier'; const FIELD_NOTE = 'note'; const FIELD_ONSET_AGE = 'onsetAge'; + const FIELD_ONSET_AGE_EXT = '_onsetAge'; const FIELD_ONSET_DATE_TIME = 'onsetDateTime'; const FIELD_ONSET_DATE_TIME_EXT = '_onsetDateTime'; const FIELD_ONSET_PERIOD = 'onsetPeriod'; @@ -447,6 +445,9 @@ class FHIRCondition extends FHIRDomainResource implements PHPFHIRContainedTypeIn */ protected $verificationStatus = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRCondition Constructor * @param null|array $data @@ -464,8 +465,17 @@ public function __construct($data = null) } parent::__construct($data); if (isset($data[self::FIELD_ABATEMENT_AGE])) { + $ext = (isset($data[self::FIELD_ABATEMENT_AGE_EXT]) && is_array($data[self::FIELD_ABATEMENT_AGE_EXT])) + ? $data[self::FIELD_ABATEMENT_AGE_EXT] + : null; if ($data[self::FIELD_ABATEMENT_AGE] instanceof FHIRAge) { $this->setAbatementAge($data[self::FIELD_ABATEMENT_AGE]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ABATEMENT_AGE])) { + $this->setAbatementAge(new FHIRAge([FHIRAge::FIELD_VALUE => $data[self::FIELD_ABATEMENT_AGE]] + $ext)); + } else if (is_array($data[self::FIELD_ABATEMENT_AGE])) { + $this->setAbatementAge(new FHIRAge(array_merge($ext, $data[self::FIELD_ABATEMENT_AGE]))); + } } else { $this->setAbatementAge(new FHIRAge($data[self::FIELD_ABATEMENT_AGE])); } @@ -476,8 +486,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ABATEMENT_BOOLEAN] instanceof FHIRBoolean) { $this->setAbatementBoolean($data[self::FIELD_ABATEMENT_BOOLEAN]); - } elseif ($ext && is_scalar($data[self::FIELD_ABATEMENT_BOOLEAN])) { - $this->setAbatementBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_ABATEMENT_BOOLEAN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ABATEMENT_BOOLEAN])) { + $this->setAbatementBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_ABATEMENT_BOOLEAN]] + $ext)); + } else if (is_array($data[self::FIELD_ABATEMENT_BOOLEAN])) { + $this->setAbatementBoolean(new FHIRBoolean(array_merge($ext, $data[self::FIELD_ABATEMENT_BOOLEAN]))); + } } else { $this->setAbatementBoolean(new FHIRBoolean($data[self::FIELD_ABATEMENT_BOOLEAN])); } @@ -488,8 +502,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ABATEMENT_DATE_TIME] instanceof FHIRDateTime) { $this->setAbatementDateTime($data[self::FIELD_ABATEMENT_DATE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_ABATEMENT_DATE_TIME])) { - $this->setAbatementDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_ABATEMENT_DATE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ABATEMENT_DATE_TIME])) { + $this->setAbatementDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_ABATEMENT_DATE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_ABATEMENT_DATE_TIME])) { + $this->setAbatementDateTime(new FHIRDateTime(array_merge($ext, $data[self::FIELD_ABATEMENT_DATE_TIME]))); + } } else { $this->setAbatementDateTime(new FHIRDateTime($data[self::FIELD_ABATEMENT_DATE_TIME])); } @@ -514,8 +532,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ABATEMENT_STRING] instanceof FHIRString) { $this->setAbatementString($data[self::FIELD_ABATEMENT_STRING]); - } elseif ($ext && is_scalar($data[self::FIELD_ABATEMENT_STRING])) { - $this->setAbatementString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_ABATEMENT_STRING]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ABATEMENT_STRING])) { + $this->setAbatementString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_ABATEMENT_STRING]] + $ext)); + } else if (is_array($data[self::FIELD_ABATEMENT_STRING])) { + $this->setAbatementString(new FHIRString(array_merge($ext, $data[self::FIELD_ABATEMENT_STRING]))); + } } else { $this->setAbatementString(new FHIRString($data[self::FIELD_ABATEMENT_STRING])); } @@ -526,8 +548,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ASSERTED_DATE] instanceof FHIRDateTime) { $this->setAssertedDate($data[self::FIELD_ASSERTED_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_ASSERTED_DATE])) { - $this->setAssertedDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_ASSERTED_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ASSERTED_DATE])) { + $this->setAssertedDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_ASSERTED_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_ASSERTED_DATE])) { + $this->setAssertedDate(new FHIRDateTime(array_merge($ext, $data[self::FIELD_ASSERTED_DATE]))); + } } else { $this->setAssertedDate(new FHIRDateTime($data[self::FIELD_ASSERTED_DATE])); } @@ -542,6 +568,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_BODY_SITE])) { if (is_array($data[self::FIELD_BODY_SITE])) { foreach($data[self::FIELD_BODY_SITE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addBodySite($v); } else { @@ -557,6 +586,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CATEGORY])) { if (is_array($data[self::FIELD_CATEGORY])) { foreach($data[self::FIELD_CATEGORY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addCategory($v); } else { @@ -575,8 +607,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CLINICAL_STATUS] instanceof FHIRConditionClinicalStatusCodes) { $this->setClinicalStatus($data[self::FIELD_CLINICAL_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_CLINICAL_STATUS])) { - $this->setClinicalStatus(new FHIRConditionClinicalStatusCodes([FHIRConditionClinicalStatusCodes::FIELD_VALUE => $data[self::FIELD_CLINICAL_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CLINICAL_STATUS])) { + $this->setClinicalStatus(new FHIRConditionClinicalStatusCodes([FHIRConditionClinicalStatusCodes::FIELD_VALUE => $data[self::FIELD_CLINICAL_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_CLINICAL_STATUS])) { + $this->setClinicalStatus(new FHIRConditionClinicalStatusCodes(array_merge($ext, $data[self::FIELD_CLINICAL_STATUS]))); + } } else { $this->setClinicalStatus(new FHIRConditionClinicalStatusCodes($data[self::FIELD_CLINICAL_STATUS])); } @@ -598,6 +634,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_EVIDENCE])) { if (is_array($data[self::FIELD_EVIDENCE])) { foreach($data[self::FIELD_EVIDENCE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRConditionEvidence) { $this->addEvidence($v); } else { @@ -616,17 +655,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -635,6 +681,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_NOTE])) { if (is_array($data[self::FIELD_NOTE])) { foreach($data[self::FIELD_NOTE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRAnnotation) { $this->addNote($v); } else { @@ -648,8 +697,17 @@ public function __construct($data = null) } } if (isset($data[self::FIELD_ONSET_AGE])) { + $ext = (isset($data[self::FIELD_ONSET_AGE_EXT]) && is_array($data[self::FIELD_ONSET_AGE_EXT])) + ? $data[self::FIELD_ONSET_AGE_EXT] + : null; if ($data[self::FIELD_ONSET_AGE] instanceof FHIRAge) { $this->setOnsetAge($data[self::FIELD_ONSET_AGE]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ONSET_AGE])) { + $this->setOnsetAge(new FHIRAge([FHIRAge::FIELD_VALUE => $data[self::FIELD_ONSET_AGE]] + $ext)); + } else if (is_array($data[self::FIELD_ONSET_AGE])) { + $this->setOnsetAge(new FHIRAge(array_merge($ext, $data[self::FIELD_ONSET_AGE]))); + } } else { $this->setOnsetAge(new FHIRAge($data[self::FIELD_ONSET_AGE])); } @@ -660,8 +718,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ONSET_DATE_TIME] instanceof FHIRDateTime) { $this->setOnsetDateTime($data[self::FIELD_ONSET_DATE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_ONSET_DATE_TIME])) { - $this->setOnsetDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_ONSET_DATE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ONSET_DATE_TIME])) { + $this->setOnsetDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_ONSET_DATE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_ONSET_DATE_TIME])) { + $this->setOnsetDateTime(new FHIRDateTime(array_merge($ext, $data[self::FIELD_ONSET_DATE_TIME]))); + } } else { $this->setOnsetDateTime(new FHIRDateTime($data[self::FIELD_ONSET_DATE_TIME])); } @@ -686,8 +748,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ONSET_STRING] instanceof FHIRString) { $this->setOnsetString($data[self::FIELD_ONSET_STRING]); - } elseif ($ext && is_scalar($data[self::FIELD_ONSET_STRING])) { - $this->setOnsetString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_ONSET_STRING]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ONSET_STRING])) { + $this->setOnsetString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_ONSET_STRING]] + $ext)); + } else if (is_array($data[self::FIELD_ONSET_STRING])) { + $this->setOnsetString(new FHIRString(array_merge($ext, $data[self::FIELD_ONSET_STRING]))); + } } else { $this->setOnsetString(new FHIRString($data[self::FIELD_ONSET_STRING])); } @@ -719,8 +785,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VERIFICATION_STATUS] instanceof FHIRConditionVerificationStatus) { $this->setVerificationStatus($data[self::FIELD_VERIFICATION_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_VERIFICATION_STATUS])) { - $this->setVerificationStatus(new FHIRConditionVerificationStatus([FHIRConditionVerificationStatus::FIELD_VALUE => $data[self::FIELD_VERIFICATION_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VERIFICATION_STATUS])) { + $this->setVerificationStatus(new FHIRConditionVerificationStatus([FHIRConditionVerificationStatus::FIELD_VALUE => $data[self::FIELD_VERIFICATION_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_VERIFICATION_STATUS])) { + $this->setVerificationStatus(new FHIRConditionVerificationStatus(array_merge($ext, $data[self::FIELD_VERIFICATION_STATUS]))); + } } else { $this->setVerificationStatus(new FHIRConditionVerificationStatus($data[self::FIELD_VERIFICATION_STATUS])); } @@ -1962,11 +2032,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getAbatementDateTime())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ABATEMENT_DATE_TIME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getAbatementPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ABATEMENT_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getAbatementRange())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ABATEMENT_RANGE, null, $v->_getFHIRXMLNamespace())); } @@ -1976,11 +2044,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getAssertedDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ASSERTED_DATE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getAsserter())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ASSERTER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getBodySite())) { foreach($vs as $v) { if (null === $v) { @@ -1989,7 +2055,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_BODY_SITE, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getCategory())) { foreach($vs as $v) { if (null === $v) { @@ -1998,19 +2063,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_CATEGORY, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getClinicalStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CLINICAL_STATUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getContext())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CONTEXT, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getEvidence())) { foreach($vs as $v) { if (null === $v) { @@ -2019,7 +2080,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_EVIDENCE, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -2028,7 +2088,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getNote())) { foreach($vs as $v) { if (null === $v) { @@ -2037,37 +2096,30 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_NOTE, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getOnsetAge())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ONSET_AGE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getOnsetDateTime())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ONSET_DATE_TIME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOnsetPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ONSET_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOnsetRange())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ONSET_RANGE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getOnsetString())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ONSET_STRING, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSeverity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SEVERITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStage())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STAGE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSubject())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBJECT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getVerificationStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VERIFICATION_STATUS, null, $v->_getFHIRXMLNamespace())); } @@ -2081,15 +2133,37 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getAbatementAge())) { - $a[self::FIELD_ABATEMENT_AGE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ABATEMENT_AGE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ABATEMENT_AGE_EXT] = $enc; + } + } else { + $a[self::FIELD_ABATEMENT_AGE] = $v; + } } if (null !== ($v = $this->getAbatementBoolean())) { - $a[self::FIELD_ABATEMENT_BOOLEAN] = $v->getValue(); - $a[self::FIELD_ABATEMENT_BOOLEAN_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ABATEMENT_BOOLEAN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ABATEMENT_BOOLEAN_EXT] = $enc; + } + } else { + $a[self::FIELD_ABATEMENT_BOOLEAN] = $v; + } } if (null !== ($v = $this->getAbatementDateTime())) { - $a[self::FIELD_ABATEMENT_DATE_TIME] = $v->getValue(); - $a[self::FIELD_ABATEMENT_DATE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ABATEMENT_DATE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ABATEMENT_DATE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_ABATEMENT_DATE_TIME] = $v; + } } if (null !== ($v = $this->getAbatementPeriod())) { $a[self::FIELD_ABATEMENT_PERIOD] = $v; @@ -2098,12 +2172,26 @@ public function jsonSerialize() $a[self::FIELD_ABATEMENT_RANGE] = $v; } if (null !== ($v = $this->getAbatementString())) { - $a[self::FIELD_ABATEMENT_STRING] = $v->getValue(); - $a[self::FIELD_ABATEMENT_STRING_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ABATEMENT_STRING] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ABATEMENT_STRING_EXT] = $enc; + } + } else { + $a[self::FIELD_ABATEMENT_STRING] = $v; + } } if (null !== ($v = $this->getAssertedDate())) { - $a[self::FIELD_ASSERTED_DATE] = $v->getValue(); - $a[self::FIELD_ASSERTED_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ASSERTED_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ASSERTED_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_ASSERTED_DATE] = $v; + } } if (null !== ($v = $this->getAsserter())) { $a[self::FIELD_ASSERTER] = $v; @@ -2115,7 +2203,15 @@ public function jsonSerialize() $a[self::FIELD_CATEGORY] = $vs; } if (null !== ($v = $this->getClinicalStatus())) { - $a[self::FIELD_CLINICAL_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CLINICAL_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CLINICAL_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_CLINICAL_STATUS] = $v; + } } if (null !== ($v = $this->getCode())) { $a[self::FIELD_CODE] = $v; @@ -2127,17 +2223,48 @@ public function jsonSerialize() $a[self::FIELD_EVIDENCE] = $vs; } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if ([] !== ($vs = $this->getNote())) { $a[self::FIELD_NOTE] = $vs; } if (null !== ($v = $this->getOnsetAge())) { - $a[self::FIELD_ONSET_AGE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ONSET_AGE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ONSET_AGE_EXT] = $enc; + } + } else { + $a[self::FIELD_ONSET_AGE] = $v; + } } if (null !== ($v = $this->getOnsetDateTime())) { - $a[self::FIELD_ONSET_DATE_TIME] = $v->getValue(); - $a[self::FIELD_ONSET_DATE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ONSET_DATE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ONSET_DATE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_ONSET_DATE_TIME] = $v; + } } if (null !== ($v = $this->getOnsetPeriod())) { $a[self::FIELD_ONSET_PERIOD] = $v; @@ -2146,8 +2273,15 @@ public function jsonSerialize() $a[self::FIELD_ONSET_RANGE] = $v; } if (null !== ($v = $this->getOnsetString())) { - $a[self::FIELD_ONSET_STRING] = $v->getValue(); - $a[self::FIELD_ONSET_STRING_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ONSET_STRING] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ONSET_STRING_EXT] = $enc; + } + } else { + $a[self::FIELD_ONSET_STRING] = $v; + } } if (null !== ($v = $this->getSeverity())) { $a[self::FIELD_SEVERITY] = $v; @@ -2159,7 +2293,15 @@ public function jsonSerialize() $a[self::FIELD_SUBJECT] = $v; } if (null !== ($v = $this->getVerificationStatus())) { - $a[self::FIELD_VERIFICATION_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VERIFICATION_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VERIFICATION_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_VERIFICATION_STATUS] = $v; + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRConsent.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRConsent.php index 740a288fcc..b048736ffa 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRConsent.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRConsent.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -93,10 +93,6 @@ class FHIRConsent extends FHIRDomainResource implements PHPFHIRContainedTypeInte { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONSENT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ACTION = 'action'; const FIELD_ACTOR = 'actor'; const FIELD_CATEGORY = 'category'; @@ -368,6 +364,9 @@ class FHIRConsent extends FHIRDomainResource implements PHPFHIRContainedTypeInte */ protected $status = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRConsent Constructor * @param null|array $data @@ -387,6 +386,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ACTION])) { if (is_array($data[self::FIELD_ACTION])) { foreach($data[self::FIELD_ACTION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addAction($v); } else { @@ -402,6 +404,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ACTOR])) { if (is_array($data[self::FIELD_ACTOR])) { foreach($data[self::FIELD_ACTOR] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRConsentActor) { $this->addActor($v); } else { @@ -417,6 +422,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CATEGORY])) { if (is_array($data[self::FIELD_CATEGORY])) { foreach($data[self::FIELD_CATEGORY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addCategory($v); } else { @@ -432,6 +440,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CONSENTING_PARTY])) { if (is_array($data[self::FIELD_CONSENTING_PARTY])) { foreach($data[self::FIELD_CONSENTING_PARTY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addConsentingParty($v); } else { @@ -447,6 +458,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_DATA])) { if (is_array($data[self::FIELD_DATA])) { foreach($data[self::FIELD_DATA] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRConsentData) { $this->addData($v); } else { @@ -472,8 +486,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATE_TIME] instanceof FHIRDateTime) { $this->setDateTime($data[self::FIELD_DATE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_DATE_TIME])) { - $this->setDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATE_TIME])) { + $this->setDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_DATE_TIME])) { + $this->setDateTime(new FHIRDateTime(array_merge($ext, $data[self::FIELD_DATE_TIME]))); + } } else { $this->setDateTime(new FHIRDateTime($data[self::FIELD_DATE_TIME])); } @@ -481,6 +499,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_EXCEPT])) { if (is_array($data[self::FIELD_EXCEPT])) { foreach($data[self::FIELD_EXCEPT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRConsentExcept) { $this->addExcept($v); } else { @@ -499,8 +520,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->setIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { - $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_IDENTIFIER]))); + } } else { $this->setIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); } @@ -508,6 +533,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ORGANIZATION])) { if (is_array($data[self::FIELD_ORGANIZATION])) { foreach($data[self::FIELD_ORGANIZATION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addOrganization($v); } else { @@ -537,6 +565,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_POLICY])) { if (is_array($data[self::FIELD_POLICY])) { foreach($data[self::FIELD_POLICY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRConsentPolicy) { $this->addPolicy($v); } else { @@ -555,8 +586,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_POLICY_RULE] instanceof FHIRUri) { $this->setPolicyRule($data[self::FIELD_POLICY_RULE]); - } elseif ($ext && is_scalar($data[self::FIELD_POLICY_RULE])) { - $this->setPolicyRule(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_POLICY_RULE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_POLICY_RULE])) { + $this->setPolicyRule(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_POLICY_RULE]] + $ext)); + } else if (is_array($data[self::FIELD_POLICY_RULE])) { + $this->setPolicyRule(new FHIRUri(array_merge($ext, $data[self::FIELD_POLICY_RULE]))); + } } else { $this->setPolicyRule(new FHIRUri($data[self::FIELD_POLICY_RULE])); } @@ -564,6 +599,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PURPOSE])) { if (is_array($data[self::FIELD_PURPOSE])) { foreach($data[self::FIELD_PURPOSE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCoding) { $this->addPurpose($v); } else { @@ -579,6 +617,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SECURITY_LABEL])) { if (is_array($data[self::FIELD_SECURITY_LABEL])) { foreach($data[self::FIELD_SECURITY_LABEL] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCoding) { $this->addSecurityLabel($v); } else { @@ -604,8 +645,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SOURCE_IDENTIFIER] instanceof FHIRIdentifier) { $this->setSourceIdentifier($data[self::FIELD_SOURCE_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_SOURCE_IDENTIFIER])) { - $this->setSourceIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_SOURCE_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SOURCE_IDENTIFIER])) { + $this->setSourceIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_SOURCE_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_SOURCE_IDENTIFIER])) { + $this->setSourceIdentifier(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_SOURCE_IDENTIFIER]))); + } } else { $this->setSourceIdentifier(new FHIRIdentifier($data[self::FIELD_SOURCE_IDENTIFIER])); } @@ -623,8 +668,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRConsentState) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRConsentState([FHIRConsentState::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRConsentState([FHIRConsentState::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRConsentState(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRConsentState($data[self::FIELD_STATUS])); } @@ -1772,7 +1821,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_ACTION, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getActor())) { foreach($vs as $v) { if (null === $v) { @@ -1781,7 +1829,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_ACTOR, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getCategory())) { foreach($vs as $v) { if (null === $v) { @@ -1790,7 +1837,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_CATEGORY, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getConsentingParty())) { foreach($vs as $v) { if (null === $v) { @@ -1799,7 +1845,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_CONSENTING_PARTY, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getData())) { foreach($vs as $v) { if (null === $v) { @@ -1808,14 +1853,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_DATA, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getDataPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DATA_PERIOD, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getDateTime())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DATE_TIME, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getExcept())) { foreach($vs as $v) { if (null === $v) { @@ -1824,11 +1867,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_EXCEPT, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getOrganization())) { foreach($vs as $v) { if (null === $v) { @@ -1837,15 +1878,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_ORGANIZATION, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getPatient())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATIENT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getPolicy())) { foreach($vs as $v) { if (null === $v) { @@ -1857,7 +1895,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getPolicyRule())) { $v->xmlSerialize($sxe->addChild(self::FIELD_POLICY_RULE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getPurpose())) { foreach($vs as $v) { if (null === $v) { @@ -1866,7 +1903,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_PURPOSE, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getSecurityLabel())) { foreach($vs as $v) { if (null === $v) { @@ -1875,19 +1911,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_SECURITY_LABEL, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getSourceAttachment())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SOURCE_ATTACHMENT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSourceIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SOURCE_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSourceReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SOURCE_REFERENCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } @@ -1919,14 +1951,29 @@ public function jsonSerialize() $a[self::FIELD_DATA_PERIOD] = $v; } if (null !== ($v = $this->getDateTime())) { - $a[self::FIELD_DATE_TIME] = $v->getValue(); - $a[self::FIELD_DATE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_DATE_TIME] = $v; + } } if ([] !== ($vs = $this->getExcept())) { $a[self::FIELD_EXCEPT] = $vs; } if (null !== ($v = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_IDENTIFIER] = $v; + } } if ([] !== ($vs = $this->getOrganization())) { $a[self::FIELD_ORGANIZATION] = $vs; @@ -1941,8 +1988,15 @@ public function jsonSerialize() $a[self::FIELD_POLICY] = $vs; } if (null !== ($v = $this->getPolicyRule())) { - $a[self::FIELD_POLICY_RULE] = $v->getValue(); - $a[self::FIELD_POLICY_RULE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_POLICY_RULE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_POLICY_RULE_EXT] = $enc; + } + } else { + $a[self::FIELD_POLICY_RULE] = $v; + } } if ([] !== ($vs = $this->getPurpose())) { $a[self::FIELD_PURPOSE] = $vs; @@ -1954,13 +2008,29 @@ public function jsonSerialize() $a[self::FIELD_SOURCE_ATTACHMENT] = $v; } if (null !== ($v = $this->getSourceIdentifier())) { - $a[self::FIELD_SOURCE_IDENTIFIER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SOURCE_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SOURCE_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_SOURCE_IDENTIFIER] = $v; + } } if (null !== ($v = $this->getSourceReference())) { $a[self::FIELD_SOURCE_REFERENCE] = $v; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRContract.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRContract.php index 841556b750..8dbf93ae30 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRContract.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRContract.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -94,10 +94,6 @@ class FHIRContract extends FHIRDomainResource implements PHPFHIRContainedTypeInt { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_CONTRACT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ACTION = 'action'; const FIELD_ACTION_REASON = 'actionReason'; const FIELD_AGENT = 'agent'; @@ -420,6 +416,9 @@ class FHIRContract extends FHIRDomainResource implements PHPFHIRContainedTypeInt */ protected $valuedItem = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRContract Constructor * @param null|array $data @@ -439,6 +438,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ACTION])) { if (is_array($data[self::FIELD_ACTION])) { foreach($data[self::FIELD_ACTION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addAction($v); } else { @@ -454,6 +456,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ACTION_REASON])) { if (is_array($data[self::FIELD_ACTION_REASON])) { foreach($data[self::FIELD_ACTION_REASON] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addActionReason($v); } else { @@ -469,6 +474,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_AGENT])) { if (is_array($data[self::FIELD_AGENT])) { foreach($data[self::FIELD_AGENT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContractAgent) { $this->addAgent($v); } else { @@ -491,6 +499,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_AUTHORITY])) { if (is_array($data[self::FIELD_AUTHORITY])) { foreach($data[self::FIELD_AUTHORITY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addAuthority($v); } else { @@ -534,6 +545,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_DOMAIN])) { if (is_array($data[self::FIELD_DOMAIN])) { foreach($data[self::FIELD_DOMAIN] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addDomain($v); } else { @@ -549,6 +563,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_FRIENDLY])) { if (is_array($data[self::FIELD_FRIENDLY])) { foreach($data[self::FIELD_FRIENDLY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContractFriendly) { $this->addFriendly($v); } else { @@ -567,8 +584,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->setIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { - $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_IDENTIFIER]))); + } } else { $this->setIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); } @@ -579,8 +600,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ISSUED] instanceof FHIRDateTime) { $this->setIssued($data[self::FIELD_ISSUED]); - } elseif ($ext && is_scalar($data[self::FIELD_ISSUED])) { - $this->setIssued(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_ISSUED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ISSUED])) { + $this->setIssued(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_ISSUED]] + $ext)); + } else if (is_array($data[self::FIELD_ISSUED])) { + $this->setIssued(new FHIRDateTime(array_merge($ext, $data[self::FIELD_ISSUED]))); + } } else { $this->setIssued(new FHIRDateTime($data[self::FIELD_ISSUED])); } @@ -588,6 +613,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_LEGAL])) { if (is_array($data[self::FIELD_LEGAL])) { foreach($data[self::FIELD_LEGAL] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContractLegal) { $this->addLegal($v); } else { @@ -603,6 +631,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_RULE])) { if (is_array($data[self::FIELD_RULE])) { foreach($data[self::FIELD_RULE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContractRule) { $this->addRule($v); } else { @@ -618,6 +649,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SECURITY_LABEL])) { if (is_array($data[self::FIELD_SECURITY_LABEL])) { foreach($data[self::FIELD_SECURITY_LABEL] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCoding) { $this->addSecurityLabel($v); } else { @@ -633,6 +667,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SIGNER])) { if (is_array($data[self::FIELD_SIGNER])) { foreach($data[self::FIELD_SIGNER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContractSigner) { $this->addSigner($v); } else { @@ -651,8 +688,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRContractResourceStatusCodes) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRContractResourceStatusCodes([FHIRContractResourceStatusCodes::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRContractResourceStatusCodes([FHIRContractResourceStatusCodes::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRContractResourceStatusCodes(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRContractResourceStatusCodes($data[self::FIELD_STATUS])); } @@ -660,6 +701,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SUB_TYPE])) { if (is_array($data[self::FIELD_SUB_TYPE])) { foreach($data[self::FIELD_SUB_TYPE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addSubType($v); } else { @@ -675,6 +719,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SUBJECT])) { if (is_array($data[self::FIELD_SUBJECT])) { foreach($data[self::FIELD_SUBJECT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addSubject($v); } else { @@ -690,6 +737,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_TERM])) { if (is_array($data[self::FIELD_TERM])) { foreach($data[self::FIELD_TERM] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContractTerm) { $this->addTerm($v); } else { @@ -705,6 +755,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_TOPIC])) { if (is_array($data[self::FIELD_TOPIC])) { foreach($data[self::FIELD_TOPIC] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addTopic($v); } else { @@ -727,6 +780,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_VALUED_ITEM])) { if (is_array($data[self::FIELD_VALUED_ITEM])) { foreach($data[self::FIELD_VALUED_ITEM] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContractValuedItem) { $this->addValuedItem($v); } else { @@ -2156,7 +2212,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_ACTION, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getActionReason())) { foreach($vs as $v) { if (null === $v) { @@ -2165,7 +2220,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_ACTION_REASON, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getAgent())) { foreach($vs as $v) { if (null === $v) { @@ -2174,11 +2228,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_AGENT, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getApplies())) { $v->xmlSerialize($sxe->addChild(self::FIELD_APPLIES, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getAuthority())) { foreach($vs as $v) { if (null === $v) { @@ -2187,23 +2239,18 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_AUTHORITY, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getBindingAttachment())) { $v->xmlSerialize($sxe->addChild(self::FIELD_BINDING_ATTACHMENT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getBindingReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_BINDING_REFERENCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getContentDerivative())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CONTENT_DERIVATIVE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDecisionType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DECISION_TYPE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getDomain())) { foreach($vs as $v) { if (null === $v) { @@ -2212,7 +2259,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_DOMAIN, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getFriendly())) { foreach($vs as $v) { if (null === $v) { @@ -2221,14 +2267,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_FRIENDLY, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getIssued())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ISSUED, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getLegal())) { foreach($vs as $v) { if (null === $v) { @@ -2237,7 +2281,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_LEGAL, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getRule())) { foreach($vs as $v) { if (null === $v) { @@ -2246,7 +2289,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_RULE, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getSecurityLabel())) { foreach($vs as $v) { if (null === $v) { @@ -2255,7 +2297,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_SECURITY_LABEL, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getSigner())) { foreach($vs as $v) { if (null === $v) { @@ -2264,11 +2305,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_SIGNER, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getSubType())) { foreach($vs as $v) { if (null === $v) { @@ -2277,7 +2316,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_SUB_TYPE, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getSubject())) { foreach($vs as $v) { if (null === $v) { @@ -2286,7 +2324,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_SUBJECT, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getTerm())) { foreach($vs as $v) { if (null === $v) { @@ -2295,7 +2332,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_TERM, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getTopic())) { foreach($vs as $v) { if (null === $v) { @@ -2304,11 +2340,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_TOPIC, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getValuedItem())) { foreach($vs as $v) { if (null === $v) { @@ -2360,11 +2394,26 @@ public function jsonSerialize() $a[self::FIELD_FRIENDLY] = $vs; } if (null !== ($v = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_IDENTIFIER] = $v; + } } if (null !== ($v = $this->getIssued())) { - $a[self::FIELD_ISSUED] = $v->getValue(); - $a[self::FIELD_ISSUED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ISSUED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ISSUED_EXT] = $enc; + } + } else { + $a[self::FIELD_ISSUED] = $v; + } } if ([] !== ($vs = $this->getLegal())) { $a[self::FIELD_LEGAL] = $vs; @@ -2379,7 +2428,15 @@ public function jsonSerialize() $a[self::FIELD_SIGNER] = $vs; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if ([] !== ($vs = $this->getSubType())) { $a[self::FIELD_SUB_TYPE] = $vs; diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRCoverage.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRCoverage.php index c9bcf93d23..28cd1762f9 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRCoverage.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRCoverage.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -87,10 +87,6 @@ class FHIRCoverage extends FHIRDomainResource implements PHPFHIRContainedTypeInt { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_COVERAGE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_BENEFICIARY = 'beneficiary'; const FIELD_CONTRACT = 'contract'; const FIELD_DEPENDENT = 'dependent'; @@ -311,6 +307,9 @@ class FHIRCoverage extends FHIRDomainResource implements PHPFHIRContainedTypeInt */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRCoverage Constructor * @param null|array $data @@ -337,6 +336,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CONTRACT])) { if (is_array($data[self::FIELD_CONTRACT])) { foreach($data[self::FIELD_CONTRACT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addContract($v); } else { @@ -355,8 +357,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DEPENDENT] instanceof FHIRString) { $this->setDependent($data[self::FIELD_DEPENDENT]); - } elseif ($ext && is_scalar($data[self::FIELD_DEPENDENT])) { - $this->setDependent(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DEPENDENT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DEPENDENT])) { + $this->setDependent(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DEPENDENT]] + $ext)); + } else if (is_array($data[self::FIELD_DEPENDENT])) { + $this->setDependent(new FHIRString(array_merge($ext, $data[self::FIELD_DEPENDENT]))); + } } else { $this->setDependent(new FHIRString($data[self::FIELD_DEPENDENT])); } @@ -374,17 +380,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -396,8 +409,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NETWORK] instanceof FHIRString) { $this->setNetwork($data[self::FIELD_NETWORK]); - } elseif ($ext && is_scalar($data[self::FIELD_NETWORK])) { - $this->setNetwork(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NETWORK]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NETWORK])) { + $this->setNetwork(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NETWORK]] + $ext)); + } else if (is_array($data[self::FIELD_NETWORK])) { + $this->setNetwork(new FHIRString(array_merge($ext, $data[self::FIELD_NETWORK]))); + } } else { $this->setNetwork(new FHIRString($data[self::FIELD_NETWORK])); } @@ -408,8 +425,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ORDER] instanceof FHIRPositiveInt) { $this->setOrder($data[self::FIELD_ORDER]); - } elseif ($ext && is_scalar($data[self::FIELD_ORDER])) { - $this->setOrder(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_ORDER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ORDER])) { + $this->setOrder(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_ORDER]] + $ext)); + } else if (is_array($data[self::FIELD_ORDER])) { + $this->setOrder(new FHIRPositiveInt(array_merge($ext, $data[self::FIELD_ORDER]))); + } } else { $this->setOrder(new FHIRPositiveInt($data[self::FIELD_ORDER])); } @@ -417,6 +438,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PAYOR])) { if (is_array($data[self::FIELD_PAYOR])) { foreach($data[self::FIELD_PAYOR] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addPayor($v); } else { @@ -456,8 +480,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SEQUENCE] instanceof FHIRString) { $this->setSequence($data[self::FIELD_SEQUENCE]); - } elseif ($ext && is_scalar($data[self::FIELD_SEQUENCE])) { - $this->setSequence(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SEQUENCE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SEQUENCE])) { + $this->setSequence(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SEQUENCE]] + $ext)); + } else if (is_array($data[self::FIELD_SEQUENCE])) { + $this->setSequence(new FHIRString(array_merge($ext, $data[self::FIELD_SEQUENCE]))); + } } else { $this->setSequence(new FHIRString($data[self::FIELD_SEQUENCE])); } @@ -468,8 +496,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRFinancialResourceStatusCodes) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRFinancialResourceStatusCodes([FHIRFinancialResourceStatusCodes::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRFinancialResourceStatusCodes([FHIRFinancialResourceStatusCodes::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRFinancialResourceStatusCodes(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRFinancialResourceStatusCodes($data[self::FIELD_STATUS])); } @@ -487,8 +519,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SUBSCRIBER_ID] instanceof FHIRString) { $this->setSubscriberId($data[self::FIELD_SUBSCRIBER_ID]); - } elseif ($ext && is_scalar($data[self::FIELD_SUBSCRIBER_ID])) { - $this->setSubscriberId(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SUBSCRIBER_ID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SUBSCRIBER_ID])) { + $this->setSubscriberId(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SUBSCRIBER_ID]] + $ext)); + } else if (is_array($data[self::FIELD_SUBSCRIBER_ID])) { + $this->setSubscriberId(new FHIRString(array_merge($ext, $data[self::FIELD_SUBSCRIBER_ID]))); + } } else { $this->setSubscriberId(new FHIRString($data[self::FIELD_SUBSCRIBER_ID])); } @@ -1326,7 +1362,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getBeneficiary())) { $v->xmlSerialize($sxe->addChild(self::FIELD_BENEFICIARY, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getContract())) { foreach($vs as $v) { if (null === $v) { @@ -1338,11 +1373,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDependent())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEPENDENT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getGrouping())) { $v->xmlSerialize($sxe->addChild(self::FIELD_GROUPING, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -1357,7 +1390,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getOrder())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ORDER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getPayor())) { foreach($vs as $v) { if (null === $v) { @@ -1366,33 +1398,27 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_PAYOR, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPolicyHolder())) { $v->xmlSerialize($sxe->addChild(self::FIELD_POLICY_HOLDER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRelationship())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RELATIONSHIP, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getSequence())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SEQUENCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSubscriber())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBSCRIBER, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getSubscriberId())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBSCRIBER_ID, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -1412,22 +1438,59 @@ public function jsonSerialize() $a[self::FIELD_CONTRACT] = $vs; } if (null !== ($v = $this->getDependent())) { - $a[self::FIELD_DEPENDENT] = $v->getValue(); - $a[self::FIELD_DEPENDENT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DEPENDENT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DEPENDENT_EXT] = $enc; + } + } else { + $a[self::FIELD_DEPENDENT] = $v; + } } if (null !== ($v = $this->getGrouping())) { $a[self::FIELD_GROUPING] = $v; } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if (null !== ($v = $this->getNetwork())) { - $a[self::FIELD_NETWORK] = $v->getValue(); - $a[self::FIELD_NETWORK_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NETWORK] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NETWORK_EXT] = $enc; + } + } else { + $a[self::FIELD_NETWORK] = $v; + } } if (null !== ($v = $this->getOrder())) { - $a[self::FIELD_ORDER] = $v->getValue(); - $a[self::FIELD_ORDER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ORDER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ORDER_EXT] = $enc; + } + } else { + $a[self::FIELD_ORDER] = $v; + } } if ([] !== ($vs = $this->getPayor())) { $a[self::FIELD_PAYOR] = $vs; @@ -1442,18 +1505,40 @@ public function jsonSerialize() $a[self::FIELD_RELATIONSHIP] = $v; } if (null !== ($v = $this->getSequence())) { - $a[self::FIELD_SEQUENCE] = $v->getValue(); - $a[self::FIELD_SEQUENCE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SEQUENCE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SEQUENCE_EXT] = $enc; + } + } else { + $a[self::FIELD_SEQUENCE] = $v; + } } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getSubscriber())) { $a[self::FIELD_SUBSCRIBER] = $v; } if (null !== ($v = $this->getSubscriberId())) { - $a[self::FIELD_SUBSCRIBER_ID] = $v->getValue(); - $a[self::FIELD_SUBSCRIBER_ID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SUBSCRIBER_ID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SUBSCRIBER_ID_EXT] = $enc; + } + } else { + $a[self::FIELD_SUBSCRIBER_ID] = $v; + } } if (null !== ($v = $this->getType())) { $a[self::FIELD_TYPE] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRDataElement.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRDataElement.php index 29953ed34c..29b2c5c94e 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRDataElement.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRDataElement.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -92,10 +92,6 @@ class FHIRDataElement extends FHIRDomainResource implements PHPFHIRContainedType { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DATA_ELEMENT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CONTACT = 'contact'; const FIELD_COPYRIGHT = 'copyright'; const FIELD_COPYRIGHT_EXT = '_copyright'; @@ -333,6 +329,9 @@ class FHIRDataElement extends FHIRDomainResource implements PHPFHIRContainedType */ protected $version = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRDataElement Constructor * @param null|array $data @@ -352,6 +351,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CONTACT])) { if (is_array($data[self::FIELD_CONTACT])) { foreach($data[self::FIELD_CONTACT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContactDetail) { $this->addContact($v); } else { @@ -370,8 +372,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_COPYRIGHT] instanceof FHIRMarkdown) { $this->setCopyright($data[self::FIELD_COPYRIGHT]); - } elseif ($ext && is_scalar($data[self::FIELD_COPYRIGHT])) { - $this->setCopyright(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_COPYRIGHT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_COPYRIGHT])) { + $this->setCopyright(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_COPYRIGHT]] + $ext)); + } else if (is_array($data[self::FIELD_COPYRIGHT])) { + $this->setCopyright(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_COPYRIGHT]))); + } } else { $this->setCopyright(new FHIRMarkdown($data[self::FIELD_COPYRIGHT])); } @@ -382,8 +388,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATE] instanceof FHIRDateTime) { $this->setDate($data[self::FIELD_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_DATE])) { - $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime(array_merge($ext, $data[self::FIELD_DATE]))); + } } else { $this->setDate(new FHIRDateTime($data[self::FIELD_DATE])); } @@ -391,6 +401,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ELEMENT])) { if (is_array($data[self::FIELD_ELEMENT])) { foreach($data[self::FIELD_ELEMENT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRElementDefinition) { $this->addElement($v); } else { @@ -409,8 +422,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EXPERIMENTAL] instanceof FHIRBoolean) { $this->setExperimental($data[self::FIELD_EXPERIMENTAL]); - } elseif ($ext && is_scalar($data[self::FIELD_EXPERIMENTAL])) { - $this->setExperimental(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_EXPERIMENTAL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EXPERIMENTAL])) { + $this->setExperimental(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_EXPERIMENTAL]] + $ext)); + } else if (is_array($data[self::FIELD_EXPERIMENTAL])) { + $this->setExperimental(new FHIRBoolean(array_merge($ext, $data[self::FIELD_EXPERIMENTAL]))); + } } else { $this->setExperimental(new FHIRBoolean($data[self::FIELD_EXPERIMENTAL])); } @@ -421,17 +438,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -440,6 +464,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_JURISDICTION])) { if (is_array($data[self::FIELD_JURISDICTION])) { foreach($data[self::FIELD_JURISDICTION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addJurisdiction($v); } else { @@ -455,6 +482,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_MAPPING])) { if (is_array($data[self::FIELD_MAPPING])) { foreach($data[self::FIELD_MAPPING] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRDataElementMapping) { $this->addMapping($v); } else { @@ -473,8 +503,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -485,8 +519,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PUBLISHER] instanceof FHIRString) { $this->setPublisher($data[self::FIELD_PUBLISHER]); - } elseif ($ext && is_scalar($data[self::FIELD_PUBLISHER])) { - $this->setPublisher(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PUBLISHER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PUBLISHER])) { + $this->setPublisher(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PUBLISHER]] + $ext)); + } else if (is_array($data[self::FIELD_PUBLISHER])) { + $this->setPublisher(new FHIRString(array_merge($ext, $data[self::FIELD_PUBLISHER]))); + } } else { $this->setPublisher(new FHIRString($data[self::FIELD_PUBLISHER])); } @@ -497,8 +535,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRPublicationStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRPublicationStatus([FHIRPublicationStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRPublicationStatus([FHIRPublicationStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRPublicationStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRPublicationStatus($data[self::FIELD_STATUS])); } @@ -509,8 +551,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STRINGENCY] instanceof FHIRDataElementStringency) { $this->setStringency($data[self::FIELD_STRINGENCY]); - } elseif ($ext && is_scalar($data[self::FIELD_STRINGENCY])) { - $this->setStringency(new FHIRDataElementStringency([FHIRDataElementStringency::FIELD_VALUE => $data[self::FIELD_STRINGENCY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STRINGENCY])) { + $this->setStringency(new FHIRDataElementStringency([FHIRDataElementStringency::FIELD_VALUE => $data[self::FIELD_STRINGENCY]] + $ext)); + } else if (is_array($data[self::FIELD_STRINGENCY])) { + $this->setStringency(new FHIRDataElementStringency(array_merge($ext, $data[self::FIELD_STRINGENCY]))); + } } else { $this->setStringency(new FHIRDataElementStringency($data[self::FIELD_STRINGENCY])); } @@ -521,8 +567,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TITLE] instanceof FHIRString) { $this->setTitle($data[self::FIELD_TITLE]); - } elseif ($ext && is_scalar($data[self::FIELD_TITLE])) { - $this->setTitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TITLE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TITLE])) { + $this->setTitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TITLE]] + $ext)); + } else if (is_array($data[self::FIELD_TITLE])) { + $this->setTitle(new FHIRString(array_merge($ext, $data[self::FIELD_TITLE]))); + } } else { $this->setTitle(new FHIRString($data[self::FIELD_TITLE])); } @@ -533,8 +583,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_URL] instanceof FHIRUri) { $this->setUrl($data[self::FIELD_URL]); - } elseif ($ext && is_scalar($data[self::FIELD_URL])) { - $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } else if (is_array($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri(array_merge($ext, $data[self::FIELD_URL]))); + } } else { $this->setUrl(new FHIRUri($data[self::FIELD_URL])); } @@ -542,6 +596,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_USE_CONTEXT])) { if (is_array($data[self::FIELD_USE_CONTEXT])) { foreach($data[self::FIELD_USE_CONTEXT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRUsageContext) { $this->addUseContext($v); } else { @@ -560,8 +617,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VERSION] instanceof FHIRString) { $this->setVersion($data[self::FIELD_VERSION]); - } elseif ($ext && is_scalar($data[self::FIELD_VERSION])) { - $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } else if (is_array($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString(array_merge($ext, $data[self::FIELD_VERSION]))); + } } else { $this->setVersion(new FHIRString($data[self::FIELD_VERSION])); } @@ -1550,7 +1611,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DATE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getElement())) { foreach($vs as $v) { if (null === $v) { @@ -1562,7 +1622,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getExperimental())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EXPERIMENTAL, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -1571,7 +1630,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getJurisdiction())) { foreach($vs as $v) { if (null === $v) { @@ -1580,7 +1638,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_JURISDICTION, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getMapping())) { foreach($vs as $v) { if (null === $v) { @@ -1595,11 +1652,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getPublisher())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PUBLISHER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStringency())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STRINGENCY, null, $v->_getFHIRXMLNamespace())); } @@ -1609,7 +1664,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getUrl())) { $v->xmlSerialize($sxe->addChild(self::FIELD_URL, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getUseContext())) { foreach($vs as $v) { if (null === $v) { @@ -1634,22 +1688,59 @@ public function jsonSerialize() $a[self::FIELD_CONTACT] = $vs; } if (null !== ($v = $this->getCopyright())) { - $a[self::FIELD_COPYRIGHT] = $v->getValue(); - $a[self::FIELD_COPYRIGHT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_COPYRIGHT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_COPYRIGHT_EXT] = $enc; + } + } else { + $a[self::FIELD_COPYRIGHT] = $v; + } } if (null !== ($v = $this->getDate())) { - $a[self::FIELD_DATE] = $v->getValue(); - $a[self::FIELD_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_DATE] = $v; + } } if ([] !== ($vs = $this->getElement())) { $a[self::FIELD_ELEMENT] = $vs; } if (null !== ($v = $this->getExperimental())) { - $a[self::FIELD_EXPERIMENTAL] = $v->getValue(); - $a[self::FIELD_EXPERIMENTAL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EXPERIMENTAL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EXPERIMENTAL_EXT] = $enc; + } + } else { + $a[self::FIELD_EXPERIMENTAL] = $v; + } } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if ([] !== ($vs = $this->getJurisdiction())) { $a[self::FIELD_JURISDICTION] = $vs; @@ -1658,33 +1749,84 @@ public function jsonSerialize() $a[self::FIELD_MAPPING] = $vs; } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if (null !== ($v = $this->getPublisher())) { - $a[self::FIELD_PUBLISHER] = $v->getValue(); - $a[self::FIELD_PUBLISHER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PUBLISHER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PUBLISHER_EXT] = $enc; + } + } else { + $a[self::FIELD_PUBLISHER] = $v; + } } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getStringency())) { - $a[self::FIELD_STRINGENCY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STRINGENCY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STRINGENCY_EXT] = $enc; + } + } else { + $a[self::FIELD_STRINGENCY] = $v; + } } if (null !== ($v = $this->getTitle())) { - $a[self::FIELD_TITLE] = $v->getValue(); - $a[self::FIELD_TITLE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TITLE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TITLE_EXT] = $enc; + } + } else { + $a[self::FIELD_TITLE] = $v; + } } if (null !== ($v = $this->getUrl())) { - $a[self::FIELD_URL] = $v->getValue(); - $a[self::FIELD_URL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_URL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_URL_EXT] = $enc; + } + } else { + $a[self::FIELD_URL] = $v; + } } if ([] !== ($vs = $this->getUseContext())) { $a[self::FIELD_USE_CONTEXT] = $vs; } if (null !== ($v = $this->getVersion())) { - $a[self::FIELD_VERSION] = $v->getValue(); - $a[self::FIELD_VERSION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VERSION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VERSION_EXT] = $enc; + } + } else { + $a[self::FIELD_VERSION] = $v; + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRDetectedIssue.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRDetectedIssue.php index 23127563b5..1a28898581 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRDetectedIssue.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRDetectedIssue.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -89,10 +89,6 @@ class FHIRDetectedIssue extends FHIRDomainResource implements PHPFHIRContainedTy { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DETECTED_ISSUE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_AUTHOR = 'author'; const FIELD_CATEGORY = 'category'; const FIELD_DATE = 'date'; @@ -241,6 +237,9 @@ class FHIRDetectedIssue extends FHIRDomainResource implements PHPFHIRContainedTy */ protected $status = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRDetectedIssue Constructor * @param null|array $data @@ -277,8 +276,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATE] instanceof FHIRDateTime) { $this->setDate($data[self::FIELD_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_DATE])) { - $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime(array_merge($ext, $data[self::FIELD_DATE]))); + } } else { $this->setDate(new FHIRDateTime($data[self::FIELD_DATE])); } @@ -289,8 +292,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DETAIL] instanceof FHIRString) { $this->setDetail($data[self::FIELD_DETAIL]); - } elseif ($ext && is_scalar($data[self::FIELD_DETAIL])) { - $this->setDetail(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DETAIL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DETAIL])) { + $this->setDetail(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DETAIL]] + $ext)); + } else if (is_array($data[self::FIELD_DETAIL])) { + $this->setDetail(new FHIRString(array_merge($ext, $data[self::FIELD_DETAIL]))); + } } else { $this->setDetail(new FHIRString($data[self::FIELD_DETAIL])); } @@ -301,8 +308,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->setIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { - $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_IDENTIFIER]))); + } } else { $this->setIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); } @@ -310,6 +321,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_IMPLICATED])) { if (is_array($data[self::FIELD_IMPLICATED])) { foreach($data[self::FIELD_IMPLICATED] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addImplicated($v); } else { @@ -325,6 +339,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_MITIGATION])) { if (is_array($data[self::FIELD_MITIGATION])) { foreach($data[self::FIELD_MITIGATION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRDetectedIssueMitigation) { $this->addMitigation($v); } else { @@ -350,8 +367,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_REFERENCE] instanceof FHIRUri) { $this->setReference($data[self::FIELD_REFERENCE]); - } elseif ($ext && is_scalar($data[self::FIELD_REFERENCE])) { - $this->setReference(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_REFERENCE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_REFERENCE])) { + $this->setReference(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_REFERENCE]] + $ext)); + } else if (is_array($data[self::FIELD_REFERENCE])) { + $this->setReference(new FHIRUri(array_merge($ext, $data[self::FIELD_REFERENCE]))); + } } else { $this->setReference(new FHIRUri($data[self::FIELD_REFERENCE])); } @@ -362,8 +383,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SEVERITY] instanceof FHIRDetectedIssueSeverity) { $this->setSeverity($data[self::FIELD_SEVERITY]); - } elseif ($ext && is_scalar($data[self::FIELD_SEVERITY])) { - $this->setSeverity(new FHIRDetectedIssueSeverity([FHIRDetectedIssueSeverity::FIELD_VALUE => $data[self::FIELD_SEVERITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SEVERITY])) { + $this->setSeverity(new FHIRDetectedIssueSeverity([FHIRDetectedIssueSeverity::FIELD_VALUE => $data[self::FIELD_SEVERITY]] + $ext)); + } else if (is_array($data[self::FIELD_SEVERITY])) { + $this->setSeverity(new FHIRDetectedIssueSeverity(array_merge($ext, $data[self::FIELD_SEVERITY]))); + } } else { $this->setSeverity(new FHIRDetectedIssueSeverity($data[self::FIELD_SEVERITY])); } @@ -374,8 +399,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRObservationStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRObservationStatus([FHIRObservationStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRObservationStatus([FHIRObservationStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRObservationStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRObservationStatus($data[self::FIELD_STATUS])); } @@ -967,7 +996,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getAuthor())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AUTHOR, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getCategory())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CATEGORY, null, $v->_getFHIRXMLNamespace())); } @@ -977,11 +1005,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDetail())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DETAIL, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getImplicated())) { foreach($vs as $v) { if (null === $v) { @@ -990,7 +1016,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_IMPLICATED, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getMitigation())) { foreach($vs as $v) { if (null === $v) { @@ -999,18 +1024,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_MITIGATION, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getPatient())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATIENT, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REFERENCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSeverity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SEVERITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } @@ -1030,15 +1052,37 @@ public function jsonSerialize() $a[self::FIELD_CATEGORY] = $v; } if (null !== ($v = $this->getDate())) { - $a[self::FIELD_DATE] = $v->getValue(); - $a[self::FIELD_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_DATE] = $v; + } } if (null !== ($v = $this->getDetail())) { - $a[self::FIELD_DETAIL] = $v->getValue(); - $a[self::FIELD_DETAIL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DETAIL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DETAIL_EXT] = $enc; + } + } else { + $a[self::FIELD_DETAIL] = $v; + } } if (null !== ($v = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_IDENTIFIER] = $v; + } } if ([] !== ($vs = $this->getImplicated())) { $a[self::FIELD_IMPLICATED] = $vs; @@ -1050,14 +1094,37 @@ public function jsonSerialize() $a[self::FIELD_PATIENT] = $v; } if (null !== ($v = $this->getReference())) { - $a[self::FIELD_REFERENCE] = $v->getValue(); - $a[self::FIELD_REFERENCE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_REFERENCE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_REFERENCE_EXT] = $enc; + } + } else { + $a[self::FIELD_REFERENCE] = $v; + } } if (null !== ($v = $this->getSeverity())) { - $a[self::FIELD_SEVERITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SEVERITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SEVERITY_EXT] = $enc; + } + } else { + $a[self::FIELD_SEVERITY] = $v; + } } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRDevice.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRDevice.php index 1d13a61256..19dfa5120e 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRDevice.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRDevice.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -94,10 +94,6 @@ class FHIRDevice extends FHIRDomainResource implements PHPFHIRContainedTypeInter { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DEVICE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CONTACT = 'contact'; const FIELD_CONTACT_EXT = '_contact'; const FIELD_EXPIRATION_DATE = 'expirationDate'; @@ -336,6 +332,9 @@ class FHIRDevice extends FHIRDomainResource implements PHPFHIRContainedTypeInter */ protected $version = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRDevice Constructor * @param null|array $data @@ -358,17 +357,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_CONTACT])) { foreach($data[self::FIELD_CONTACT] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContactPoint) { $this->addContact($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addContact(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addContact(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addContact(new FHIRContactPoint(array_merge($v, $ext[$i]))); + } } else { $this->addContact(new FHIRContactPoint($v)); } } } elseif ($data[self::FIELD_CONTACT] instanceof FHIRContactPoint) { $this->addContact($data[self::FIELD_CONTACT]); - } elseif ($ext && is_scalar($data[self::FIELD_CONTACT])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_CONTACT])) { $this->addContact(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $data[self::FIELD_CONTACT]] + $ext)); } else { $this->addContact(new FHIRContactPoint($data[self::FIELD_CONTACT])); @@ -380,8 +386,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EXPIRATION_DATE] instanceof FHIRDateTime) { $this->setExpirationDate($data[self::FIELD_EXPIRATION_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_EXPIRATION_DATE])) { - $this->setExpirationDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_EXPIRATION_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EXPIRATION_DATE])) { + $this->setExpirationDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_EXPIRATION_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_EXPIRATION_DATE])) { + $this->setExpirationDate(new FHIRDateTime(array_merge($ext, $data[self::FIELD_EXPIRATION_DATE]))); + } } else { $this->setExpirationDate(new FHIRDateTime($data[self::FIELD_EXPIRATION_DATE])); } @@ -392,17 +402,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -421,8 +438,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_LOT_NUMBER] instanceof FHIRString) { $this->setLotNumber($data[self::FIELD_LOT_NUMBER]); - } elseif ($ext && is_scalar($data[self::FIELD_LOT_NUMBER])) { - $this->setLotNumber(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_LOT_NUMBER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_LOT_NUMBER])) { + $this->setLotNumber(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_LOT_NUMBER]] + $ext)); + } else if (is_array($data[self::FIELD_LOT_NUMBER])) { + $this->setLotNumber(new FHIRString(array_merge($ext, $data[self::FIELD_LOT_NUMBER]))); + } } else { $this->setLotNumber(new FHIRString($data[self::FIELD_LOT_NUMBER])); } @@ -433,8 +454,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MANUFACTURE_DATE] instanceof FHIRDateTime) { $this->setManufactureDate($data[self::FIELD_MANUFACTURE_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_MANUFACTURE_DATE])) { - $this->setManufactureDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_MANUFACTURE_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MANUFACTURE_DATE])) { + $this->setManufactureDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_MANUFACTURE_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_MANUFACTURE_DATE])) { + $this->setManufactureDate(new FHIRDateTime(array_merge($ext, $data[self::FIELD_MANUFACTURE_DATE]))); + } } else { $this->setManufactureDate(new FHIRDateTime($data[self::FIELD_MANUFACTURE_DATE])); } @@ -445,8 +470,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MANUFACTURER] instanceof FHIRString) { $this->setManufacturer($data[self::FIELD_MANUFACTURER]); - } elseif ($ext && is_scalar($data[self::FIELD_MANUFACTURER])) { - $this->setManufacturer(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_MANUFACTURER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MANUFACTURER])) { + $this->setManufacturer(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_MANUFACTURER]] + $ext)); + } else if (is_array($data[self::FIELD_MANUFACTURER])) { + $this->setManufacturer(new FHIRString(array_merge($ext, $data[self::FIELD_MANUFACTURER]))); + } } else { $this->setManufacturer(new FHIRString($data[self::FIELD_MANUFACTURER])); } @@ -457,8 +486,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MODEL] instanceof FHIRString) { $this->setModel($data[self::FIELD_MODEL]); - } elseif ($ext && is_scalar($data[self::FIELD_MODEL])) { - $this->setModel(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_MODEL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MODEL])) { + $this->setModel(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_MODEL]] + $ext)); + } else if (is_array($data[self::FIELD_MODEL])) { + $this->setModel(new FHIRString(array_merge($ext, $data[self::FIELD_MODEL]))); + } } else { $this->setModel(new FHIRString($data[self::FIELD_MODEL])); } @@ -466,6 +499,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_NOTE])) { if (is_array($data[self::FIELD_NOTE])) { foreach($data[self::FIELD_NOTE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRAnnotation) { $this->addNote($v); } else { @@ -495,6 +531,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SAFETY])) { if (is_array($data[self::FIELD_SAFETY])) { foreach($data[self::FIELD_SAFETY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addSafety($v); } else { @@ -513,8 +552,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRFHIRDeviceStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRFHIRDeviceStatus([FHIRFHIRDeviceStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRFHIRDeviceStatus([FHIRFHIRDeviceStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRFHIRDeviceStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRFHIRDeviceStatus($data[self::FIELD_STATUS])); } @@ -539,8 +582,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_URL] instanceof FHIRUri) { $this->setUrl($data[self::FIELD_URL]); - } elseif ($ext && is_scalar($data[self::FIELD_URL])) { - $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } else if (is_array($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri(array_merge($ext, $data[self::FIELD_URL]))); + } } else { $this->setUrl(new FHIRUri($data[self::FIELD_URL])); } @@ -551,8 +598,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VERSION] instanceof FHIRString) { $this->setVersion($data[self::FIELD_VERSION]); - } elseif ($ext && is_scalar($data[self::FIELD_VERSION])) { - $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } else if (is_array($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString(array_merge($ext, $data[self::FIELD_VERSION]))); + } } else { $this->setVersion(new FHIRString($data[self::FIELD_VERSION])); } @@ -1481,7 +1532,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getExpirationDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EXPIRATION_DATE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -1490,7 +1540,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getLocation())) { $v->xmlSerialize($sxe->addChild(self::FIELD_LOCATION, null, $v->_getFHIRXMLNamespace())); } @@ -1506,7 +1555,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getModel())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MODEL, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getNote())) { foreach($vs as $v) { if (null === $v) { @@ -1515,15 +1563,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_NOTE, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getOwner())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OWNER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPatient())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATIENT, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getSafety())) { foreach($vs as $v) { if (null === $v) { @@ -1532,15 +1577,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_SAFETY, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getUdi())) { $v->xmlSerialize($sxe->addChild(self::FIELD_UDI, null, $v->_getFHIRXMLNamespace())); } @@ -1560,33 +1602,100 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if ([] !== ($vs = $this->getContact())) { - $a[self::FIELD_CONTACT] = $vs; + $a[self::FIELD_CONTACT] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CONTACT][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CONTACT_EXT][] = $enc; + } else { + $a[self::FIELD_CONTACT_EXT][] = null; + } + } else { + $a[self::FIELD_CONTACT][] = $v; + } + } } if (null !== ($v = $this->getExpirationDate())) { - $a[self::FIELD_EXPIRATION_DATE] = $v->getValue(); - $a[self::FIELD_EXPIRATION_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EXPIRATION_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EXPIRATION_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_EXPIRATION_DATE] = $v; + } } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if (null !== ($v = $this->getLocation())) { $a[self::FIELD_LOCATION] = $v; } if (null !== ($v = $this->getLotNumber())) { - $a[self::FIELD_LOT_NUMBER] = $v->getValue(); - $a[self::FIELD_LOT_NUMBER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_LOT_NUMBER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_LOT_NUMBER_EXT] = $enc; + } + } else { + $a[self::FIELD_LOT_NUMBER] = $v; + } } if (null !== ($v = $this->getManufactureDate())) { - $a[self::FIELD_MANUFACTURE_DATE] = $v->getValue(); - $a[self::FIELD_MANUFACTURE_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MANUFACTURE_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MANUFACTURE_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_MANUFACTURE_DATE] = $v; + } } if (null !== ($v = $this->getManufacturer())) { - $a[self::FIELD_MANUFACTURER] = $v->getValue(); - $a[self::FIELD_MANUFACTURER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MANUFACTURER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MANUFACTURER_EXT] = $enc; + } + } else { + $a[self::FIELD_MANUFACTURER] = $v; + } } if (null !== ($v = $this->getModel())) { - $a[self::FIELD_MODEL] = $v->getValue(); - $a[self::FIELD_MODEL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MODEL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MODEL_EXT] = $enc; + } + } else { + $a[self::FIELD_MODEL] = $v; + } } if ([] !== ($vs = $this->getNote())) { $a[self::FIELD_NOTE] = $vs; @@ -1601,7 +1710,15 @@ public function jsonSerialize() $a[self::FIELD_SAFETY] = $vs; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getType())) { $a[self::FIELD_TYPE] = $v; @@ -1610,12 +1727,26 @@ public function jsonSerialize() $a[self::FIELD_UDI] = $v; } if (null !== ($v = $this->getUrl())) { - $a[self::FIELD_URL] = $v->getValue(); - $a[self::FIELD_URL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_URL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_URL_EXT] = $enc; + } + } else { + $a[self::FIELD_URL] = $v; + } } if (null !== ($v = $this->getVersion())) { - $a[self::FIELD_VERSION] = $v->getValue(); - $a[self::FIELD_VERSION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VERSION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VERSION_EXT] = $enc; + } + } else { + $a[self::FIELD_VERSION] = $v; + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRDeviceComponent.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRDeviceComponent.php index 62761c830a..3bafaed040 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRDeviceComponent.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRDeviceComponent.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -85,10 +85,6 @@ class FHIRDeviceComponent extends FHIRDomainResource implements PHPFHIRContained { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DEVICE_COMPONENT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_IDENTIFIER = 'identifier'; const FIELD_IDENTIFIER_EXT = '_identifier'; const FIELD_LANGUAGE_CODE = 'languageCode'; @@ -226,6 +222,9 @@ class FHIRDeviceComponent extends FHIRDomainResource implements PHPFHIRContained */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRDeviceComponent Constructor * @param null|array $data @@ -248,8 +247,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->setIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { - $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_IDENTIFIER]))); + } } else { $this->setIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); } @@ -267,8 +270,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_LAST_SYSTEM_CHANGE] instanceof FHIRInstant) { $this->setLastSystemChange($data[self::FIELD_LAST_SYSTEM_CHANGE]); - } elseif ($ext && is_scalar($data[self::FIELD_LAST_SYSTEM_CHANGE])) { - $this->setLastSystemChange(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_LAST_SYSTEM_CHANGE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_LAST_SYSTEM_CHANGE])) { + $this->setLastSystemChange(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_LAST_SYSTEM_CHANGE]] + $ext)); + } else if (is_array($data[self::FIELD_LAST_SYSTEM_CHANGE])) { + $this->setLastSystemChange(new FHIRInstant(array_merge($ext, $data[self::FIELD_LAST_SYSTEM_CHANGE]))); + } } else { $this->setLastSystemChange(new FHIRInstant($data[self::FIELD_LAST_SYSTEM_CHANGE])); } @@ -279,8 +286,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MEASUREMENT_PRINCIPLE] instanceof FHIRMeasmntPrinciple) { $this->setMeasurementPrinciple($data[self::FIELD_MEASUREMENT_PRINCIPLE]); - } elseif ($ext && is_scalar($data[self::FIELD_MEASUREMENT_PRINCIPLE])) { - $this->setMeasurementPrinciple(new FHIRMeasmntPrinciple([FHIRMeasmntPrinciple::FIELD_VALUE => $data[self::FIELD_MEASUREMENT_PRINCIPLE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MEASUREMENT_PRINCIPLE])) { + $this->setMeasurementPrinciple(new FHIRMeasmntPrinciple([FHIRMeasmntPrinciple::FIELD_VALUE => $data[self::FIELD_MEASUREMENT_PRINCIPLE]] + $ext)); + } else if (is_array($data[self::FIELD_MEASUREMENT_PRINCIPLE])) { + $this->setMeasurementPrinciple(new FHIRMeasmntPrinciple(array_merge($ext, $data[self::FIELD_MEASUREMENT_PRINCIPLE]))); + } } else { $this->setMeasurementPrinciple(new FHIRMeasmntPrinciple($data[self::FIELD_MEASUREMENT_PRINCIPLE])); } @@ -288,6 +299,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_OPERATIONAL_STATUS])) { if (is_array($data[self::FIELD_OPERATIONAL_STATUS])) { foreach($data[self::FIELD_OPERATIONAL_STATUS] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addOperationalStatus($v); } else { @@ -317,6 +331,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PRODUCTION_SPECIFICATION])) { if (is_array($data[self::FIELD_PRODUCTION_SPECIFICATION])) { foreach($data[self::FIELD_PRODUCTION_SPECIFICATION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRDeviceComponentProductionSpecification) { $this->addProductionSpecification($v); } else { @@ -880,18 +897,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getLanguageCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_LANGUAGE_CODE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getLastSystemChange())) { $v->xmlSerialize($sxe->addChild(self::FIELD_LAST_SYSTEM_CHANGE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getMeasurementPrinciple())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MEASUREMENT_PRINCIPLE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getOperationalStatus())) { foreach($vs as $v) { if (null === $v) { @@ -900,15 +914,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_OPERATIONAL_STATUS, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getParameterGroup())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PARAMETER_GROUP, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getParent())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PARENT, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getProductionSpecification())) { foreach($vs as $v) { if (null === $v) { @@ -917,11 +928,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_PRODUCTION_SPECIFICATION, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getSource())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SOURCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -935,17 +944,40 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_IDENTIFIER] = $v; + } } if (null !== ($v = $this->getLanguageCode())) { $a[self::FIELD_LANGUAGE_CODE] = $v; } if (null !== ($v = $this->getLastSystemChange())) { - $a[self::FIELD_LAST_SYSTEM_CHANGE] = $v->getValue(); - $a[self::FIELD_LAST_SYSTEM_CHANGE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_LAST_SYSTEM_CHANGE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_LAST_SYSTEM_CHANGE_EXT] = $enc; + } + } else { + $a[self::FIELD_LAST_SYSTEM_CHANGE] = $v; + } } if (null !== ($v = $this->getMeasurementPrinciple())) { - $a[self::FIELD_MEASUREMENT_PRINCIPLE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MEASUREMENT_PRINCIPLE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MEASUREMENT_PRINCIPLE_EXT] = $enc; + } + } else { + $a[self::FIELD_MEASUREMENT_PRINCIPLE] = $v; + } } if ([] !== ($vs = $this->getOperationalStatus())) { $a[self::FIELD_OPERATIONAL_STATUS] = $vs; diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRDeviceMetric.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRDeviceMetric.php index ba713bebf4..2da02161a6 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRDeviceMetric.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRDeviceMetric.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -86,10 +86,6 @@ class FHIRDeviceMetric extends FHIRDomainResource implements PHPFHIRContainedTyp { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DEVICE_METRIC; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CALIBRATION = 'calibration'; const FIELD_CATEGORY = 'category'; const FIELD_CATEGORY_EXT = '_category'; @@ -241,6 +237,9 @@ class FHIRDeviceMetric extends FHIRDomainResource implements PHPFHIRContainedTyp */ protected $unit = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRDeviceMetric Constructor * @param null|array $data @@ -260,6 +259,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CALIBRATION])) { if (is_array($data[self::FIELD_CALIBRATION])) { foreach($data[self::FIELD_CALIBRATION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRDeviceMetricCalibration) { $this->addCalibration($v); } else { @@ -278,8 +280,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CATEGORY] instanceof FHIRDeviceMetricCategory) { $this->setCategory($data[self::FIELD_CATEGORY]); - } elseif ($ext && is_scalar($data[self::FIELD_CATEGORY])) { - $this->setCategory(new FHIRDeviceMetricCategory([FHIRDeviceMetricCategory::FIELD_VALUE => $data[self::FIELD_CATEGORY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CATEGORY])) { + $this->setCategory(new FHIRDeviceMetricCategory([FHIRDeviceMetricCategory::FIELD_VALUE => $data[self::FIELD_CATEGORY]] + $ext)); + } else if (is_array($data[self::FIELD_CATEGORY])) { + $this->setCategory(new FHIRDeviceMetricCategory(array_merge($ext, $data[self::FIELD_CATEGORY]))); + } } else { $this->setCategory(new FHIRDeviceMetricCategory($data[self::FIELD_CATEGORY])); } @@ -290,8 +296,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_COLOR] instanceof FHIRDeviceMetricColor) { $this->setColor($data[self::FIELD_COLOR]); - } elseif ($ext && is_scalar($data[self::FIELD_COLOR])) { - $this->setColor(new FHIRDeviceMetricColor([FHIRDeviceMetricColor::FIELD_VALUE => $data[self::FIELD_COLOR]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_COLOR])) { + $this->setColor(new FHIRDeviceMetricColor([FHIRDeviceMetricColor::FIELD_VALUE => $data[self::FIELD_COLOR]] + $ext)); + } else if (is_array($data[self::FIELD_COLOR])) { + $this->setColor(new FHIRDeviceMetricColor(array_merge($ext, $data[self::FIELD_COLOR]))); + } } else { $this->setColor(new FHIRDeviceMetricColor($data[self::FIELD_COLOR])); } @@ -302,8 +312,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->setIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { - $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_IDENTIFIER]))); + } } else { $this->setIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); } @@ -321,8 +335,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_OPERATIONAL_STATUS] instanceof FHIRDeviceMetricOperationalStatus) { $this->setOperationalStatus($data[self::FIELD_OPERATIONAL_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_OPERATIONAL_STATUS])) { - $this->setOperationalStatus(new FHIRDeviceMetricOperationalStatus([FHIRDeviceMetricOperationalStatus::FIELD_VALUE => $data[self::FIELD_OPERATIONAL_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_OPERATIONAL_STATUS])) { + $this->setOperationalStatus(new FHIRDeviceMetricOperationalStatus([FHIRDeviceMetricOperationalStatus::FIELD_VALUE => $data[self::FIELD_OPERATIONAL_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_OPERATIONAL_STATUS])) { + $this->setOperationalStatus(new FHIRDeviceMetricOperationalStatus(array_merge($ext, $data[self::FIELD_OPERATIONAL_STATUS]))); + } } else { $this->setOperationalStatus(new FHIRDeviceMetricOperationalStatus($data[self::FIELD_OPERATIONAL_STATUS])); } @@ -882,39 +900,30 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_CALIBRATION, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getCategory())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CATEGORY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getColor())) { $v->xmlSerialize($sxe->addChild(self::FIELD_COLOR, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getMeasurementPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MEASUREMENT_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOperationalStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OPERATIONAL_STATUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getParent())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PARENT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSource())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SOURCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getUnit())) { $v->xmlSerialize($sxe->addChild(self::FIELD_UNIT, null, $v->_getFHIRXMLNamespace())); } @@ -931,19 +940,51 @@ public function jsonSerialize() $a[self::FIELD_CALIBRATION] = $vs; } if (null !== ($v = $this->getCategory())) { - $a[self::FIELD_CATEGORY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CATEGORY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CATEGORY_EXT] = $enc; + } + } else { + $a[self::FIELD_CATEGORY] = $v; + } } if (null !== ($v = $this->getColor())) { - $a[self::FIELD_COLOR] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_COLOR] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_COLOR_EXT] = $enc; + } + } else { + $a[self::FIELD_COLOR] = $v; + } } if (null !== ($v = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_IDENTIFIER] = $v; + } } if (null !== ($v = $this->getMeasurementPeriod())) { $a[self::FIELD_MEASUREMENT_PERIOD] = $v; } if (null !== ($v = $this->getOperationalStatus())) { - $a[self::FIELD_OPERATIONAL_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_OPERATIONAL_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_OPERATIONAL_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_OPERATIONAL_STATUS] = $v; + } } if (null !== ($v = $this->getParent())) { $a[self::FIELD_PARENT] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRDeviceRequest.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRDeviceRequest.php index 05f0ec6432..a8bd184ba6 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRDeviceRequest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRDeviceRequest.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -89,10 +89,6 @@ class FHIRDeviceRequest extends FHIRDomainResource implements PHPFHIRContainedTy { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DEVICE_REQUEST; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_AUTHORED_ON = 'authoredOn'; const FIELD_AUTHORED_ON_EXT = '_authoredOn'; const FIELD_BASED_ON = 'basedOn'; @@ -418,6 +414,9 @@ class FHIRDeviceRequest extends FHIRDomainResource implements PHPFHIRContainedTy */ protected $supportingInfo = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRDeviceRequest Constructor * @param null|array $data @@ -440,8 +439,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_AUTHORED_ON] instanceof FHIRDateTime) { $this->setAuthoredOn($data[self::FIELD_AUTHORED_ON]); - } elseif ($ext && is_scalar($data[self::FIELD_AUTHORED_ON])) { - $this->setAuthoredOn(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_AUTHORED_ON]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_AUTHORED_ON])) { + $this->setAuthoredOn(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_AUTHORED_ON]] + $ext)); + } else if (is_array($data[self::FIELD_AUTHORED_ON])) { + $this->setAuthoredOn(new FHIRDateTime(array_merge($ext, $data[self::FIELD_AUTHORED_ON]))); + } } else { $this->setAuthoredOn(new FHIRDateTime($data[self::FIELD_AUTHORED_ON])); } @@ -449,6 +452,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_BASED_ON])) { if (is_array($data[self::FIELD_BASED_ON])) { foreach($data[self::FIELD_BASED_ON] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addBasedOn($v); } else { @@ -485,6 +491,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_DEFINITION])) { if (is_array($data[self::FIELD_DEFINITION])) { foreach($data[self::FIELD_DEFINITION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addDefinition($v); } else { @@ -503,8 +512,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_GROUP_IDENTIFIER] instanceof FHIRIdentifier) { $this->setGroupIdentifier($data[self::FIELD_GROUP_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_GROUP_IDENTIFIER])) { - $this->setGroupIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_GROUP_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_GROUP_IDENTIFIER])) { + $this->setGroupIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_GROUP_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_GROUP_IDENTIFIER])) { + $this->setGroupIdentifier(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_GROUP_IDENTIFIER]))); + } } else { $this->setGroupIdentifier(new FHIRIdentifier($data[self::FIELD_GROUP_IDENTIFIER])); } @@ -515,17 +528,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -541,6 +561,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_NOTE])) { if (is_array($data[self::FIELD_NOTE])) { foreach($data[self::FIELD_NOTE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRAnnotation) { $this->addNote($v); } else { @@ -559,8 +582,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_OCCURRENCE_DATE_TIME] instanceof FHIRDateTime) { $this->setOccurrenceDateTime($data[self::FIELD_OCCURRENCE_DATE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_OCCURRENCE_DATE_TIME])) { - $this->setOccurrenceDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_OCCURRENCE_DATE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_OCCURRENCE_DATE_TIME])) { + $this->setOccurrenceDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_OCCURRENCE_DATE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_OCCURRENCE_DATE_TIME])) { + $this->setOccurrenceDateTime(new FHIRDateTime(array_merge($ext, $data[self::FIELD_OCCURRENCE_DATE_TIME]))); + } } else { $this->setOccurrenceDateTime(new FHIRDateTime($data[self::FIELD_OCCURRENCE_DATE_TIME])); } @@ -596,6 +623,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PRIOR_REQUEST])) { if (is_array($data[self::FIELD_PRIOR_REQUEST])) { foreach($data[self::FIELD_PRIOR_REQUEST] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addPriorRequest($v); } else { @@ -614,8 +644,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PRIORITY] instanceof FHIRRequestPriority) { $this->setPriority($data[self::FIELD_PRIORITY]); - } elseif ($ext && is_scalar($data[self::FIELD_PRIORITY])) { - $this->setPriority(new FHIRRequestPriority([FHIRRequestPriority::FIELD_VALUE => $data[self::FIELD_PRIORITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PRIORITY])) { + $this->setPriority(new FHIRRequestPriority([FHIRRequestPriority::FIELD_VALUE => $data[self::FIELD_PRIORITY]] + $ext)); + } else if (is_array($data[self::FIELD_PRIORITY])) { + $this->setPriority(new FHIRRequestPriority(array_merge($ext, $data[self::FIELD_PRIORITY]))); + } } else { $this->setPriority(new FHIRRequestPriority($data[self::FIELD_PRIORITY])); } @@ -623,6 +657,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REASON_CODE])) { if (is_array($data[self::FIELD_REASON_CODE])) { foreach($data[self::FIELD_REASON_CODE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addReasonCode($v); } else { @@ -638,6 +675,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REASON_REFERENCE])) { if (is_array($data[self::FIELD_REASON_REFERENCE])) { foreach($data[self::FIELD_REASON_REFERENCE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addReasonReference($v); } else { @@ -653,6 +693,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_RELEVANT_HISTORY])) { if (is_array($data[self::FIELD_RELEVANT_HISTORY])) { foreach($data[self::FIELD_RELEVANT_HISTORY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addRelevantHistory($v); } else { @@ -678,8 +721,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRRequestStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRRequestStatus([FHIRRequestStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRRequestStatus([FHIRRequestStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRRequestStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRRequestStatus($data[self::FIELD_STATUS])); } @@ -694,6 +741,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SUPPORTING_INFO])) { if (is_array($data[self::FIELD_SUPPORTING_INFO])) { foreach($data[self::FIELD_SUPPORTING_INFO] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addSupportingInfo($v); } else { @@ -1950,10 +2000,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getAuthoredOn())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AUTHORED_ON, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getBasedOn())) { foreach($vs as $v) { if (null === $v) { @@ -1962,19 +2012,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_BASED_ON, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getCodeCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getCodeReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE_REFERENCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getContext())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CONTEXT, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getDefinition())) { foreach($vs as $v) { if (null === $v) { @@ -1983,11 +2029,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_DEFINITION, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getGroupIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_GROUP_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -1996,11 +2040,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getIntent())) { $v->xmlSerialize($sxe->addChild(self::FIELD_INTENT, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getNote())) { foreach($vs as $v) { if (null === $v) { @@ -2012,23 +2054,18 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getOccurrenceDateTime())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OCCURRENCE_DATE_TIME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOccurrencePeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OCCURRENCE_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOccurrenceTiming())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OCCURRENCE_TIMING, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPerformer())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PERFORMER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPerformerType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PERFORMER_TYPE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getPriorRequest())) { foreach($vs as $v) { if (null === $v) { @@ -2037,11 +2074,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_PRIOR_REQUEST, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getPriority())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PRIORITY, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getReasonCode())) { foreach($vs as $v) { if (null === $v) { @@ -2050,7 +2085,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_REASON_CODE, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getReasonReference())) { foreach($vs as $v) { if (null === $v) { @@ -2059,7 +2093,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_REASON_REFERENCE, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getRelevantHistory())) { foreach($vs as $v) { if (null === $v) { @@ -2068,19 +2101,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_RELEVANT_HISTORY, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getRequester())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REQUESTER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSubject())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBJECT, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getSupportingInfo())) { foreach($vs as $v) { if (null === $v) { @@ -2099,8 +2128,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getAuthoredOn())) { - $a[self::FIELD_AUTHORED_ON] = $v->getValue(); - $a[self::FIELD_AUTHORED_ON_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_AUTHORED_ON] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_AUTHORED_ON_EXT] = $enc; + } + } else { + $a[self::FIELD_AUTHORED_ON] = $v; + } } if ([] !== ($vs = $this->getBasedOn())) { $a[self::FIELD_BASED_ON] = $vs; @@ -2118,10 +2154,34 @@ public function jsonSerialize() $a[self::FIELD_DEFINITION] = $vs; } if (null !== ($v = $this->getGroupIdentifier())) { - $a[self::FIELD_GROUP_IDENTIFIER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_GROUP_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_GROUP_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_GROUP_IDENTIFIER] = $v; + } } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if (null !== ($v = $this->getIntent())) { $a[self::FIELD_INTENT] = $v; @@ -2130,8 +2190,15 @@ public function jsonSerialize() $a[self::FIELD_NOTE] = $vs; } if (null !== ($v = $this->getOccurrenceDateTime())) { - $a[self::FIELD_OCCURRENCE_DATE_TIME] = $v->getValue(); - $a[self::FIELD_OCCURRENCE_DATE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_OCCURRENCE_DATE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_OCCURRENCE_DATE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_OCCURRENCE_DATE_TIME] = $v; + } } if (null !== ($v = $this->getOccurrencePeriod())) { $a[self::FIELD_OCCURRENCE_PERIOD] = $v; @@ -2149,7 +2216,15 @@ public function jsonSerialize() $a[self::FIELD_PRIOR_REQUEST] = $vs; } if (null !== ($v = $this->getPriority())) { - $a[self::FIELD_PRIORITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PRIORITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PRIORITY_EXT] = $enc; + } + } else { + $a[self::FIELD_PRIORITY] = $v; + } } if ([] !== ($vs = $this->getReasonCode())) { $a[self::FIELD_REASON_CODE] = $vs; @@ -2164,7 +2239,15 @@ public function jsonSerialize() $a[self::FIELD_REQUESTER] = $v; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getSubject())) { $a[self::FIELD_SUBJECT] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRDeviceUseStatement.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRDeviceUseStatement.php index 157f99a601..2307c95490 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRDeviceUseStatement.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRDeviceUseStatement.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -87,10 +87,6 @@ class FHIRDeviceUseStatement extends FHIRDomainResource implements PHPFHIRContai { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DEVICE_USE_STATEMENT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_BODY_SITE = 'bodySite'; const FIELD_DEVICE = 'device'; const FIELD_IDENTIFIER = 'identifier'; @@ -269,6 +265,9 @@ class FHIRDeviceUseStatement extends FHIRDomainResource implements PHPFHIRContai */ protected $whenUsed = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRDeviceUseStatement Constructor * @param null|array $data @@ -305,17 +304,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -324,6 +330,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_INDICATION])) { if (is_array($data[self::FIELD_INDICATION])) { foreach($data[self::FIELD_INDICATION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addIndication($v); } else { @@ -339,6 +348,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_NOTE])) { if (is_array($data[self::FIELD_NOTE])) { foreach($data[self::FIELD_NOTE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRAnnotation) { $this->addNote($v); } else { @@ -357,8 +369,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_RECORDED_ON] instanceof FHIRDateTime) { $this->setRecordedOn($data[self::FIELD_RECORDED_ON]); - } elseif ($ext && is_scalar($data[self::FIELD_RECORDED_ON])) { - $this->setRecordedOn(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_RECORDED_ON]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_RECORDED_ON])) { + $this->setRecordedOn(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_RECORDED_ON]] + $ext)); + } else if (is_array($data[self::FIELD_RECORDED_ON])) { + $this->setRecordedOn(new FHIRDateTime(array_merge($ext, $data[self::FIELD_RECORDED_ON]))); + } } else { $this->setRecordedOn(new FHIRDateTime($data[self::FIELD_RECORDED_ON])); } @@ -376,8 +392,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRDeviceUseStatementStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRDeviceUseStatementStatus([FHIRDeviceUseStatementStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRDeviceUseStatementStatus([FHIRDeviceUseStatementStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRDeviceUseStatementStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRDeviceUseStatementStatus($data[self::FIELD_STATUS])); } @@ -395,8 +415,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TIMING_DATE_TIME] instanceof FHIRDateTime) { $this->setTimingDateTime($data[self::FIELD_TIMING_DATE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_TIMING_DATE_TIME])) { - $this->setTimingDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_TIMING_DATE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TIMING_DATE_TIME])) { + $this->setTimingDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_TIMING_DATE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_TIMING_DATE_TIME])) { + $this->setTimingDateTime(new FHIRDateTime(array_merge($ext, $data[self::FIELD_TIMING_DATE_TIME]))); + } } else { $this->setTimingDateTime(new FHIRDateTime($data[self::FIELD_TIMING_DATE_TIME])); } @@ -1108,11 +1132,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getBodySite())) { $v->xmlSerialize($sxe->addChild(self::FIELD_BODY_SITE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDevice())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEVICE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -1121,7 +1143,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getIndication())) { foreach($vs as $v) { if (null === $v) { @@ -1130,7 +1151,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_INDICATION, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getNote())) { foreach($vs as $v) { if (null === $v) { @@ -1142,30 +1162,24 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getRecordedOn())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RECORDED_ON, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSource())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SOURCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSubject())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBJECT, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getTimingDateTime())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TIMING_DATE_TIME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getTimingPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TIMING_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getTimingTiming())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TIMING_TIMING, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getWhenUsed())) { $v->xmlSerialize($sxe->addChild(self::FIELD_WHEN_USED, null, $v->_getFHIRXMLNamespace())); } @@ -1185,7 +1199,23 @@ public function jsonSerialize() $a[self::FIELD_DEVICE] = $v; } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if ([] !== ($vs = $this->getIndication())) { $a[self::FIELD_INDICATION] = $vs; @@ -1194,21 +1224,43 @@ public function jsonSerialize() $a[self::FIELD_NOTE] = $vs; } if (null !== ($v = $this->getRecordedOn())) { - $a[self::FIELD_RECORDED_ON] = $v->getValue(); - $a[self::FIELD_RECORDED_ON_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_RECORDED_ON] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_RECORDED_ON_EXT] = $enc; + } + } else { + $a[self::FIELD_RECORDED_ON] = $v; + } } if (null !== ($v = $this->getSource())) { $a[self::FIELD_SOURCE] = $v; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getSubject())) { $a[self::FIELD_SUBJECT] = $v; } if (null !== ($v = $this->getTimingDateTime())) { - $a[self::FIELD_TIMING_DATE_TIME] = $v->getValue(); - $a[self::FIELD_TIMING_DATE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TIMING_DATE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TIMING_DATE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_TIMING_DATE_TIME] = $v; + } } if (null !== ($v = $this->getTimingPeriod())) { $a[self::FIELD_TIMING_PERIOD] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRDiagnosticReport.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRDiagnosticReport.php index 7fcfa0bcbf..c2e5c0f224 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRDiagnosticReport.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRDiagnosticReport.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -93,10 +93,6 @@ class FHIRDiagnosticReport extends FHIRDomainResource implements PHPFHIRContaine { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DIAGNOSTIC_REPORT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_BASED_ON = 'basedOn'; const FIELD_CATEGORY = 'category'; const FIELD_CODE = 'code'; @@ -351,6 +347,9 @@ class FHIRDiagnosticReport extends FHIRDomainResource implements PHPFHIRContaine */ protected $subject = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRDiagnosticReport Constructor * @param null|array $data @@ -370,6 +369,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_BASED_ON])) { if (is_array($data[self::FIELD_BASED_ON])) { foreach($data[self::FIELD_BASED_ON] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addBasedOn($v); } else { @@ -399,6 +401,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CODED_DIAGNOSIS])) { if (is_array($data[self::FIELD_CODED_DIAGNOSIS])) { foreach($data[self::FIELD_CODED_DIAGNOSIS] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addCodedDiagnosis($v); } else { @@ -417,8 +422,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CONCLUSION] instanceof FHIRString) { $this->setConclusion($data[self::FIELD_CONCLUSION]); - } elseif ($ext && is_scalar($data[self::FIELD_CONCLUSION])) { - $this->setConclusion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_CONCLUSION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CONCLUSION])) { + $this->setConclusion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_CONCLUSION]] + $ext)); + } else if (is_array($data[self::FIELD_CONCLUSION])) { + $this->setConclusion(new FHIRString(array_merge($ext, $data[self::FIELD_CONCLUSION]))); + } } else { $this->setConclusion(new FHIRString($data[self::FIELD_CONCLUSION])); } @@ -436,8 +445,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EFFECTIVE_DATE_TIME] instanceof FHIRDateTime) { $this->setEffectiveDateTime($data[self::FIELD_EFFECTIVE_DATE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_EFFECTIVE_DATE_TIME])) { - $this->setEffectiveDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_EFFECTIVE_DATE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EFFECTIVE_DATE_TIME])) { + $this->setEffectiveDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_EFFECTIVE_DATE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_EFFECTIVE_DATE_TIME])) { + $this->setEffectiveDateTime(new FHIRDateTime(array_merge($ext, $data[self::FIELD_EFFECTIVE_DATE_TIME]))); + } } else { $this->setEffectiveDateTime(new FHIRDateTime($data[self::FIELD_EFFECTIVE_DATE_TIME])); } @@ -455,17 +468,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -474,6 +494,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_IMAGE])) { if (is_array($data[self::FIELD_IMAGE])) { foreach($data[self::FIELD_IMAGE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRDiagnosticReportImage) { $this->addImage($v); } else { @@ -489,6 +512,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_IMAGING_STUDY])) { if (is_array($data[self::FIELD_IMAGING_STUDY])) { foreach($data[self::FIELD_IMAGING_STUDY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addImagingStudy($v); } else { @@ -507,8 +533,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ISSUED] instanceof FHIRInstant) { $this->setIssued($data[self::FIELD_ISSUED]); - } elseif ($ext && is_scalar($data[self::FIELD_ISSUED])) { - $this->setIssued(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_ISSUED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ISSUED])) { + $this->setIssued(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_ISSUED]] + $ext)); + } else if (is_array($data[self::FIELD_ISSUED])) { + $this->setIssued(new FHIRInstant(array_merge($ext, $data[self::FIELD_ISSUED]))); + } } else { $this->setIssued(new FHIRInstant($data[self::FIELD_ISSUED])); } @@ -516,6 +546,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PERFORMER])) { if (is_array($data[self::FIELD_PERFORMER])) { foreach($data[self::FIELD_PERFORMER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRDiagnosticReportPerformer) { $this->addPerformer($v); } else { @@ -531,6 +564,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PRESENTED_FORM])) { if (is_array($data[self::FIELD_PRESENTED_FORM])) { foreach($data[self::FIELD_PRESENTED_FORM] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRAttachment) { $this->addPresentedForm($v); } else { @@ -546,6 +582,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_RESULT])) { if (is_array($data[self::FIELD_RESULT])) { foreach($data[self::FIELD_RESULT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addResult($v); } else { @@ -561,6 +600,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SPECIMEN])) { if (is_array($data[self::FIELD_SPECIMEN])) { foreach($data[self::FIELD_SPECIMEN] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addSpecimen($v); } else { @@ -579,8 +621,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRDiagnosticReportStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRDiagnosticReportStatus([FHIRDiagnosticReportStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRDiagnosticReportStatus([FHIRDiagnosticReportStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRDiagnosticReportStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRDiagnosticReportStatus($data[self::FIELD_STATUS])); } @@ -1666,15 +1712,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_BASED_ON, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getCategory())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CATEGORY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getCodedDiagnosis())) { foreach($vs as $v) { if (null === $v) { @@ -1686,18 +1729,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getConclusion())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CONCLUSION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getContext())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CONTEXT, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getEffectiveDateTime())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EFFECTIVE_DATE_TIME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getEffectivePeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EFFECTIVE_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -1706,7 +1746,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getImage())) { foreach($vs as $v) { if (null === $v) { @@ -1715,7 +1754,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_IMAGE, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getImagingStudy())) { foreach($vs as $v) { if (null === $v) { @@ -1727,7 +1765,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getIssued())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ISSUED, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getPerformer())) { foreach($vs as $v) { if (null === $v) { @@ -1736,7 +1773,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_PERFORMER, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getPresentedForm())) { foreach($vs as $v) { if (null === $v) { @@ -1745,7 +1781,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_PRESENTED_FORM, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getResult())) { foreach($vs as $v) { if (null === $v) { @@ -1754,7 +1789,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_RESULT, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getSpecimen())) { foreach($vs as $v) { if (null === $v) { @@ -1763,11 +1797,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_SPECIMEN, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSubject())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBJECT, null, $v->_getFHIRXMLNamespace())); } @@ -1793,21 +1825,51 @@ public function jsonSerialize() $a[self::FIELD_CODED_DIAGNOSIS] = $vs; } if (null !== ($v = $this->getConclusion())) { - $a[self::FIELD_CONCLUSION] = $v->getValue(); - $a[self::FIELD_CONCLUSION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CONCLUSION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CONCLUSION_EXT] = $enc; + } + } else { + $a[self::FIELD_CONCLUSION] = $v; + } } if (null !== ($v = $this->getContext())) { $a[self::FIELD_CONTEXT] = $v; } if (null !== ($v = $this->getEffectiveDateTime())) { - $a[self::FIELD_EFFECTIVE_DATE_TIME] = $v->getValue(); - $a[self::FIELD_EFFECTIVE_DATE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EFFECTIVE_DATE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EFFECTIVE_DATE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_EFFECTIVE_DATE_TIME] = $v; + } } if (null !== ($v = $this->getEffectivePeriod())) { $a[self::FIELD_EFFECTIVE_PERIOD] = $v; } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if ([] !== ($vs = $this->getImage())) { $a[self::FIELD_IMAGE] = $vs; @@ -1816,8 +1878,15 @@ public function jsonSerialize() $a[self::FIELD_IMAGING_STUDY] = $vs; } if (null !== ($v = $this->getIssued())) { - $a[self::FIELD_ISSUED] = $v->getValue(); - $a[self::FIELD_ISSUED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ISSUED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ISSUED_EXT] = $enc; + } + } else { + $a[self::FIELD_ISSUED] = $v; + } } if ([] !== ($vs = $this->getPerformer())) { $a[self::FIELD_PERFORMER] = $vs; @@ -1832,7 +1901,15 @@ public function jsonSerialize() $a[self::FIELD_SPECIMEN] = $vs; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getSubject())) { $a[self::FIELD_SUBJECT] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRDocumentManifest.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRDocumentManifest.php index eceada4f1c..faa6aba48c 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRDocumentManifest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRDocumentManifest.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -88,10 +88,6 @@ class FHIRDocumentManifest extends FHIRDomainResource implements PHPFHIRContaine { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DOCUMENT_MANIFEST; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_AUTHOR = 'author'; const FIELD_CONTENT = 'content'; const FIELD_CREATED = 'created'; @@ -258,6 +254,9 @@ class FHIRDocumentManifest extends FHIRDomainResource implements PHPFHIRContaine */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRDocumentManifest Constructor * @param null|array $data @@ -277,6 +276,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_AUTHOR])) { if (is_array($data[self::FIELD_AUTHOR])) { foreach($data[self::FIELD_AUTHOR] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addAuthor($v); } else { @@ -292,6 +294,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CONTENT])) { if (is_array($data[self::FIELD_CONTENT])) { foreach($data[self::FIELD_CONTENT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRDocumentManifestContent) { $this->addContent($v); } else { @@ -310,8 +315,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CREATED] instanceof FHIRDateTime) { $this->setCreated($data[self::FIELD_CREATED]); - } elseif ($ext && is_scalar($data[self::FIELD_CREATED])) { - $this->setCreated(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_CREATED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CREATED])) { + $this->setCreated(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_CREATED]] + $ext)); + } else if (is_array($data[self::FIELD_CREATED])) { + $this->setCreated(new FHIRDateTime(array_merge($ext, $data[self::FIELD_CREATED]))); + } } else { $this->setCreated(new FHIRDateTime($data[self::FIELD_CREATED])); } @@ -322,8 +331,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -334,17 +347,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -356,8 +376,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MASTER_IDENTIFIER] instanceof FHIRIdentifier) { $this->setMasterIdentifier($data[self::FIELD_MASTER_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_MASTER_IDENTIFIER])) { - $this->setMasterIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_MASTER_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MASTER_IDENTIFIER])) { + $this->setMasterIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_MASTER_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_MASTER_IDENTIFIER])) { + $this->setMasterIdentifier(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_MASTER_IDENTIFIER]))); + } } else { $this->setMasterIdentifier(new FHIRIdentifier($data[self::FIELD_MASTER_IDENTIFIER])); } @@ -365,6 +389,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_RECIPIENT])) { if (is_array($data[self::FIELD_RECIPIENT])) { foreach($data[self::FIELD_RECIPIENT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addRecipient($v); } else { @@ -380,6 +407,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_RELATED])) { if (is_array($data[self::FIELD_RELATED])) { foreach($data[self::FIELD_RELATED] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRDocumentManifestRelated) { $this->addRelated($v); } else { @@ -398,8 +428,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SOURCE] instanceof FHIRUri) { $this->setSource($data[self::FIELD_SOURCE]); - } elseif ($ext && is_scalar($data[self::FIELD_SOURCE])) { - $this->setSource(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_SOURCE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SOURCE])) { + $this->setSource(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_SOURCE]] + $ext)); + } else if (is_array($data[self::FIELD_SOURCE])) { + $this->setSource(new FHIRUri(array_merge($ext, $data[self::FIELD_SOURCE]))); + } } else { $this->setSource(new FHIRUri($data[self::FIELD_SOURCE])); } @@ -410,8 +444,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRDocumentReferenceStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRDocumentReferenceStatus([FHIRDocumentReferenceStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRDocumentReferenceStatus([FHIRDocumentReferenceStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRDocumentReferenceStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRDocumentReferenceStatus($data[self::FIELD_STATUS])); } @@ -1148,7 +1186,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_AUTHOR, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getContent())) { foreach($vs as $v) { if (null === $v) { @@ -1163,7 +1200,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESCRIPTION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -1172,11 +1208,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getMasterIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MASTER_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getRecipient())) { foreach($vs as $v) { if (null === $v) { @@ -1185,7 +1219,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_RECIPIENT, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getRelated())) { foreach($vs as $v) { if (null === $v) { @@ -1197,15 +1230,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getSource())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SOURCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSubject())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBJECT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -1225,18 +1255,56 @@ public function jsonSerialize() $a[self::FIELD_CONTENT] = $vs; } if (null !== ($v = $this->getCreated())) { - $a[self::FIELD_CREATED] = $v->getValue(); - $a[self::FIELD_CREATED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CREATED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CREATED_EXT] = $enc; + } + } else { + $a[self::FIELD_CREATED] = $v; + } } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if (null !== ($v = $this->getMasterIdentifier())) { - $a[self::FIELD_MASTER_IDENTIFIER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MASTER_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MASTER_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_MASTER_IDENTIFIER] = $v; + } } if ([] !== ($vs = $this->getRecipient())) { $a[self::FIELD_RECIPIENT] = $vs; @@ -1245,11 +1313,26 @@ public function jsonSerialize() $a[self::FIELD_RELATED] = $vs; } if (null !== ($v = $this->getSource())) { - $a[self::FIELD_SOURCE] = $v->getValue(); - $a[self::FIELD_SOURCE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SOURCE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SOURCE_EXT] = $enc; + } + } else { + $a[self::FIELD_SOURCE] = $v; + } } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getSubject())) { $a[self::FIELD_SUBJECT] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRDocumentReference.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRDocumentReference.php index 8e05167c38..6f0cb23846 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRDocumentReference.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRDocumentReference.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -89,10 +89,6 @@ class FHIRDocumentReference extends FHIRDomainResource implements PHPFHIRContain { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_DOCUMENT_REFERENCE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_AUTHENTICATOR = 'authenticator'; const FIELD_AUTHOR = 'author'; const FIELD_CLASS = 'class'; @@ -322,6 +318,9 @@ class FHIRDocumentReference extends FHIRDomainResource implements PHPFHIRContain */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRDocumentReference Constructor * @param null|array $data @@ -348,6 +347,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_AUTHOR])) { if (is_array($data[self::FIELD_AUTHOR])) { foreach($data[self::FIELD_AUTHOR] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addAuthor($v); } else { @@ -370,6 +372,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CONTENT])) { if (is_array($data[self::FIELD_CONTENT])) { foreach($data[self::FIELD_CONTENT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRDocumentReferenceContent) { $this->addContent($v); } else { @@ -395,8 +400,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CREATED] instanceof FHIRDateTime) { $this->setCreated($data[self::FIELD_CREATED]); - } elseif ($ext && is_scalar($data[self::FIELD_CREATED])) { - $this->setCreated(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_CREATED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CREATED])) { + $this->setCreated(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_CREATED]] + $ext)); + } else if (is_array($data[self::FIELD_CREATED])) { + $this->setCreated(new FHIRDateTime(array_merge($ext, $data[self::FIELD_CREATED]))); + } } else { $this->setCreated(new FHIRDateTime($data[self::FIELD_CREATED])); } @@ -414,8 +423,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -426,8 +439,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DOC_STATUS] instanceof FHIRCompositionStatus) { $this->setDocStatus($data[self::FIELD_DOC_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_DOC_STATUS])) { - $this->setDocStatus(new FHIRCompositionStatus([FHIRCompositionStatus::FIELD_VALUE => $data[self::FIELD_DOC_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DOC_STATUS])) { + $this->setDocStatus(new FHIRCompositionStatus([FHIRCompositionStatus::FIELD_VALUE => $data[self::FIELD_DOC_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_DOC_STATUS])) { + $this->setDocStatus(new FHIRCompositionStatus(array_merge($ext, $data[self::FIELD_DOC_STATUS]))); + } } else { $this->setDocStatus(new FHIRCompositionStatus($data[self::FIELD_DOC_STATUS])); } @@ -438,17 +455,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -460,8 +484,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_INDEXED] instanceof FHIRInstant) { $this->setIndexed($data[self::FIELD_INDEXED]); - } elseif ($ext && is_scalar($data[self::FIELD_INDEXED])) { - $this->setIndexed(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_INDEXED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_INDEXED])) { + $this->setIndexed(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_INDEXED]] + $ext)); + } else if (is_array($data[self::FIELD_INDEXED])) { + $this->setIndexed(new FHIRInstant(array_merge($ext, $data[self::FIELD_INDEXED]))); + } } else { $this->setIndexed(new FHIRInstant($data[self::FIELD_INDEXED])); } @@ -472,8 +500,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MASTER_IDENTIFIER] instanceof FHIRIdentifier) { $this->setMasterIdentifier($data[self::FIELD_MASTER_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_MASTER_IDENTIFIER])) { - $this->setMasterIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_MASTER_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MASTER_IDENTIFIER])) { + $this->setMasterIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_MASTER_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_MASTER_IDENTIFIER])) { + $this->setMasterIdentifier(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_MASTER_IDENTIFIER]))); + } } else { $this->setMasterIdentifier(new FHIRIdentifier($data[self::FIELD_MASTER_IDENTIFIER])); } @@ -481,6 +513,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_RELATES_TO])) { if (is_array($data[self::FIELD_RELATES_TO])) { foreach($data[self::FIELD_RELATES_TO] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRDocumentReferenceRelatesTo) { $this->addRelatesTo($v); } else { @@ -496,6 +531,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SECURITY_LABEL])) { if (is_array($data[self::FIELD_SECURITY_LABEL])) { foreach($data[self::FIELD_SECURITY_LABEL] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addSecurityLabel($v); } else { @@ -514,8 +552,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRDocumentReferenceStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRDocumentReferenceStatus([FHIRDocumentReferenceStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRDocumentReferenceStatus([FHIRDocumentReferenceStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRDocumentReferenceStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRDocumentReferenceStatus($data[self::FIELD_STATUS])); } @@ -1419,7 +1461,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getAuthenticator())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AUTHENTICATOR, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getAuthor())) { foreach($vs as $v) { if (null === $v) { @@ -1428,11 +1469,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_AUTHOR, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getClass())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CLASS, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getContent())) { foreach($vs as $v) { if (null === $v) { @@ -1441,25 +1480,21 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_CONTENT, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getContext())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CONTEXT, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getCreated())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CREATED, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getCustodian())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CUSTODIAN, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getDescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESCRIPTION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDocStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DOC_STATUS, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -1471,11 +1506,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getIndexed())) { $v->xmlSerialize($sxe->addChild(self::FIELD_INDEXED, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getMasterIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MASTER_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getRelatesTo())) { foreach($vs as $v) { if (null === $v) { @@ -1484,7 +1517,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_RELATES_TO, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getSecurityLabel())) { foreach($vs as $v) { if (null === $v) { @@ -1493,15 +1525,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_SECURITY_LABEL, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSubject())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBJECT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -1530,28 +1559,81 @@ public function jsonSerialize() $a[self::FIELD_CONTEXT] = $v; } if (null !== ($v = $this->getCreated())) { - $a[self::FIELD_CREATED] = $v->getValue(); - $a[self::FIELD_CREATED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CREATED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CREATED_EXT] = $enc; + } + } else { + $a[self::FIELD_CREATED] = $v; + } } if (null !== ($v = $this->getCustodian())) { $a[self::FIELD_CUSTODIAN] = $v; } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if (null !== ($v = $this->getDocStatus())) { - $a[self::FIELD_DOC_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DOC_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DOC_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_DOC_STATUS] = $v; + } } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if (null !== ($v = $this->getIndexed())) { - $a[self::FIELD_INDEXED] = $v->getValue(); - $a[self::FIELD_INDEXED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_INDEXED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_INDEXED_EXT] = $enc; + } + } else { + $a[self::FIELD_INDEXED] = $v; + } } if (null !== ($v = $this->getMasterIdentifier())) { - $a[self::FIELD_MASTER_IDENTIFIER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MASTER_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MASTER_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_MASTER_IDENTIFIER] = $v; + } } if ([] !== ($vs = $this->getRelatesTo())) { $a[self::FIELD_RELATES_TO] = $vs; @@ -1560,7 +1642,15 @@ public function jsonSerialize() $a[self::FIELD_SECURITY_LABEL] = $vs; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getSubject())) { $a[self::FIELD_SUBJECT] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIREligibilityRequest.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIREligibilityRequest.php index 13426743c6..478a551527 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIREligibilityRequest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIREligibilityRequest.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -89,10 +89,6 @@ class FHIREligibilityRequest extends FHIRDomainResource implements PHPFHIRContai { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ELIGIBILITY_REQUEST; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_BENEFIT_CATEGORY = 'benefitCategory'; const FIELD_BENEFIT_SUB_CATEGORY = 'benefitSubCategory'; const FIELD_BUSINESS_ARRANGEMENT = 'businessArrangement'; @@ -300,6 +296,9 @@ class FHIREligibilityRequest extends FHIRDomainResource implements PHPFHIRContai */ protected $status = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIREligibilityRequest Constructor * @param null|array $data @@ -336,8 +335,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_BUSINESS_ARRANGEMENT] instanceof FHIRString) { $this->setBusinessArrangement($data[self::FIELD_BUSINESS_ARRANGEMENT]); - } elseif ($ext && is_scalar($data[self::FIELD_BUSINESS_ARRANGEMENT])) { - $this->setBusinessArrangement(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_BUSINESS_ARRANGEMENT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_BUSINESS_ARRANGEMENT])) { + $this->setBusinessArrangement(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_BUSINESS_ARRANGEMENT]] + $ext)); + } else if (is_array($data[self::FIELD_BUSINESS_ARRANGEMENT])) { + $this->setBusinessArrangement(new FHIRString(array_merge($ext, $data[self::FIELD_BUSINESS_ARRANGEMENT]))); + } } else { $this->setBusinessArrangement(new FHIRString($data[self::FIELD_BUSINESS_ARRANGEMENT])); } @@ -355,8 +358,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CREATED] instanceof FHIRDateTime) { $this->setCreated($data[self::FIELD_CREATED]); - } elseif ($ext && is_scalar($data[self::FIELD_CREATED])) { - $this->setCreated(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_CREATED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CREATED])) { + $this->setCreated(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_CREATED]] + $ext)); + } else if (is_array($data[self::FIELD_CREATED])) { + $this->setCreated(new FHIRDateTime(array_merge($ext, $data[self::FIELD_CREATED]))); + } } else { $this->setCreated(new FHIRDateTime($data[self::FIELD_CREATED])); } @@ -381,17 +388,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -438,8 +452,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SERVICED_DATE] instanceof FHIRDate) { $this->setServicedDate($data[self::FIELD_SERVICED_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_SERVICED_DATE])) { - $this->setServicedDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_SERVICED_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SERVICED_DATE])) { + $this->setServicedDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_SERVICED_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_SERVICED_DATE])) { + $this->setServicedDate(new FHIRDate(array_merge($ext, $data[self::FIELD_SERVICED_DATE]))); + } } else { $this->setServicedDate(new FHIRDate($data[self::FIELD_SERVICED_DATE])); } @@ -457,8 +475,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRFinancialResourceStatusCodes) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRFinancialResourceStatusCodes([FHIRFinancialResourceStatusCodes::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRFinancialResourceStatusCodes([FHIRFinancialResourceStatusCodes::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRFinancialResourceStatusCodes(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRFinancialResourceStatusCodes($data[self::FIELD_STATUS])); } @@ -1183,29 +1205,24 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getBenefitCategory())) { $v->xmlSerialize($sxe->addChild(self::FIELD_BENEFIT_CATEGORY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getBenefitSubCategory())) { $v->xmlSerialize($sxe->addChild(self::FIELD_BENEFIT_SUB_CATEGORY, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getBusinessArrangement())) { $v->xmlSerialize($sxe->addChild(self::FIELD_BUSINESS_ARRANGEMENT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getCoverage())) { $v->xmlSerialize($sxe->addChild(self::FIELD_COVERAGE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getCreated())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CREATED, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getEnterer())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ENTERER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getFacility())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FACILITY, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -1214,34 +1231,27 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getInsurer())) { $v->xmlSerialize($sxe->addChild(self::FIELD_INSURER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOrganization())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ORGANIZATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPatient())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATIENT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPriority())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PRIORITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getProvider())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PROVIDER, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getServicedDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SERVICED_DATE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getServicedPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SERVICED_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } @@ -1261,15 +1271,29 @@ public function jsonSerialize() $a[self::FIELD_BENEFIT_SUB_CATEGORY] = $v; } if (null !== ($v = $this->getBusinessArrangement())) { - $a[self::FIELD_BUSINESS_ARRANGEMENT] = $v->getValue(); - $a[self::FIELD_BUSINESS_ARRANGEMENT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_BUSINESS_ARRANGEMENT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_BUSINESS_ARRANGEMENT_EXT] = $enc; + } + } else { + $a[self::FIELD_BUSINESS_ARRANGEMENT] = $v; + } } if (null !== ($v = $this->getCoverage())) { $a[self::FIELD_COVERAGE] = $v; } if (null !== ($v = $this->getCreated())) { - $a[self::FIELD_CREATED] = $v->getValue(); - $a[self::FIELD_CREATED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CREATED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CREATED_EXT] = $enc; + } + } else { + $a[self::FIELD_CREATED] = $v; + } } if (null !== ($v = $this->getEnterer())) { $a[self::FIELD_ENTERER] = $v; @@ -1278,7 +1302,23 @@ public function jsonSerialize() $a[self::FIELD_FACILITY] = $v; } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if (null !== ($v = $this->getInsurer())) { $a[self::FIELD_INSURER] = $v; @@ -1296,14 +1336,29 @@ public function jsonSerialize() $a[self::FIELD_PROVIDER] = $v; } if (null !== ($v = $this->getServicedDate())) { - $a[self::FIELD_SERVICED_DATE] = $v->getValue(); - $a[self::FIELD_SERVICED_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SERVICED_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SERVICED_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_SERVICED_DATE] = $v; + } } if (null !== ($v = $this->getServicedPeriod())) { $a[self::FIELD_SERVICED_PERIOD] = $v; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIREligibilityResponse.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIREligibilityResponse.php index 25653b02aa..621236194c 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIREligibilityResponse.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIREligibilityResponse.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -88,10 +88,6 @@ class FHIREligibilityResponse extends FHIRDomainResource implements PHPFHIRConta { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ELIGIBILITY_RESPONSE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CREATED = 'created'; const FIELD_CREATED_EXT = '_created'; const FIELD_DISPOSITION = 'disposition'; @@ -257,6 +253,9 @@ class FHIREligibilityResponse extends FHIRDomainResource implements PHPFHIRConta */ protected $status = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIREligibilityResponse Constructor * @param null|array $data @@ -279,8 +278,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CREATED] instanceof FHIRDateTime) { $this->setCreated($data[self::FIELD_CREATED]); - } elseif ($ext && is_scalar($data[self::FIELD_CREATED])) { - $this->setCreated(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_CREATED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CREATED])) { + $this->setCreated(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_CREATED]] + $ext)); + } else if (is_array($data[self::FIELD_CREATED])) { + $this->setCreated(new FHIRDateTime(array_merge($ext, $data[self::FIELD_CREATED]))); + } } else { $this->setCreated(new FHIRDateTime($data[self::FIELD_CREATED])); } @@ -291,8 +294,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DISPOSITION] instanceof FHIRString) { $this->setDisposition($data[self::FIELD_DISPOSITION]); - } elseif ($ext && is_scalar($data[self::FIELD_DISPOSITION])) { - $this->setDisposition(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DISPOSITION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DISPOSITION])) { + $this->setDisposition(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DISPOSITION]] + $ext)); + } else if (is_array($data[self::FIELD_DISPOSITION])) { + $this->setDisposition(new FHIRString(array_merge($ext, $data[self::FIELD_DISPOSITION]))); + } } else { $this->setDisposition(new FHIRString($data[self::FIELD_DISPOSITION])); } @@ -300,6 +307,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ERROR])) { if (is_array($data[self::FIELD_ERROR])) { foreach($data[self::FIELD_ERROR] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIREligibilityResponseError) { $this->addError($v); } else { @@ -325,17 +335,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -347,8 +364,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_INFORCE] instanceof FHIRBoolean) { $this->setInforce($data[self::FIELD_INFORCE]); - } elseif ($ext && is_scalar($data[self::FIELD_INFORCE])) { - $this->setInforce(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_INFORCE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_INFORCE])) { + $this->setInforce(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_INFORCE]] + $ext)); + } else if (is_array($data[self::FIELD_INFORCE])) { + $this->setInforce(new FHIRBoolean(array_merge($ext, $data[self::FIELD_INFORCE]))); + } } else { $this->setInforce(new FHIRBoolean($data[self::FIELD_INFORCE])); } @@ -356,6 +377,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_INSURANCE])) { if (is_array($data[self::FIELD_INSURANCE])) { foreach($data[self::FIELD_INSURANCE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIREligibilityResponseInsurance) { $this->addInsurance($v); } else { @@ -409,8 +433,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRFinancialResourceStatusCodes) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRFinancialResourceStatusCodes([FHIRFinancialResourceStatusCodes::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRFinancialResourceStatusCodes([FHIRFinancialResourceStatusCodes::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRFinancialResourceStatusCodes(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRFinancialResourceStatusCodes($data[self::FIELD_STATUS])); } @@ -1075,13 +1103,13 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getCreated())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CREATED, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getDisposition())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DISPOSITION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getError())) { foreach($vs as $v) { if (null === $v) { @@ -1090,11 +1118,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_ERROR, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getForm())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FORM, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -1106,7 +1132,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getInforce())) { $v->xmlSerialize($sxe->addChild(self::FIELD_INFORCE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getInsurance())) { foreach($vs as $v) { if (null === $v) { @@ -1115,27 +1140,21 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_INSURANCE, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getInsurer())) { $v->xmlSerialize($sxe->addChild(self::FIELD_INSURER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOutcome())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OUTCOME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRequest())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REQUEST, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRequestOrganization())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REQUEST_ORGANIZATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRequestProvider())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REQUEST_PROVIDER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } @@ -1149,12 +1168,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getCreated())) { - $a[self::FIELD_CREATED] = $v->getValue(); - $a[self::FIELD_CREATED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CREATED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CREATED_EXT] = $enc; + } + } else { + $a[self::FIELD_CREATED] = $v; + } } if (null !== ($v = $this->getDisposition())) { - $a[self::FIELD_DISPOSITION] = $v->getValue(); - $a[self::FIELD_DISPOSITION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DISPOSITION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DISPOSITION_EXT] = $enc; + } + } else { + $a[self::FIELD_DISPOSITION] = $v; + } } if ([] !== ($vs = $this->getError())) { $a[self::FIELD_ERROR] = $vs; @@ -1163,11 +1196,34 @@ public function jsonSerialize() $a[self::FIELD_FORM] = $v; } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if (null !== ($v = $this->getInforce())) { - $a[self::FIELD_INFORCE] = $v->getValue(); - $a[self::FIELD_INFORCE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_INFORCE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_INFORCE_EXT] = $enc; + } + } else { + $a[self::FIELD_INFORCE] = $v; + } } if ([] !== ($vs = $this->getInsurance())) { $a[self::FIELD_INSURANCE] = $vs; @@ -1188,7 +1244,15 @@ public function jsonSerialize() $a[self::FIELD_REQUEST_PROVIDER] = $v; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIREncounter.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIREncounter.php index 173cfded56..bf62d8f581 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIREncounter.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIREncounter.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -92,10 +92,6 @@ class FHIREncounter extends FHIRDomainResource implements PHPFHIRContainedTypeIn { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ENCOUNTER; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ACCOUNT = 'account'; const FIELD_APPOINTMENT = 'appointment'; const FIELD_CLASS = 'class'; @@ -107,6 +103,7 @@ class FHIREncounter extends FHIRDomainResource implements PHPFHIRContainedTypeIn const FIELD_IDENTIFIER_EXT = '_identifier'; const FIELD_INCOMING_REFERRAL = 'incomingReferral'; const FIELD_LENGTH = 'length'; + const FIELD_LENGTH_EXT = '_length'; const FIELD_LOCATION = 'location'; const FIELD_PART_OF = 'partOf'; const FIELD_PARTICIPANT = 'participant'; @@ -369,6 +366,9 @@ class FHIREncounter extends FHIRDomainResource implements PHPFHIRContainedTypeIn */ protected $type = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIREncounter Constructor * @param null|array $data @@ -388,6 +388,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ACCOUNT])) { if (is_array($data[self::FIELD_ACCOUNT])) { foreach($data[self::FIELD_ACCOUNT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addAccount($v); } else { @@ -417,6 +420,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CLASS_HISTORY])) { if (is_array($data[self::FIELD_CLASS_HISTORY])) { foreach($data[self::FIELD_CLASS_HISTORY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIREncounterClassHistory) { $this->addClassHistory($v); } else { @@ -432,6 +438,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_DIAGNOSIS])) { if (is_array($data[self::FIELD_DIAGNOSIS])) { foreach($data[self::FIELD_DIAGNOSIS] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIREncounterDiagnosis) { $this->addDiagnosis($v); } else { @@ -447,6 +456,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_EPISODE_OF_CARE])) { if (is_array($data[self::FIELD_EPISODE_OF_CARE])) { foreach($data[self::FIELD_EPISODE_OF_CARE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addEpisodeOfCare($v); } else { @@ -472,17 +484,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -491,6 +510,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_INCOMING_REFERRAL])) { if (is_array($data[self::FIELD_INCOMING_REFERRAL])) { foreach($data[self::FIELD_INCOMING_REFERRAL] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addIncomingReferral($v); } else { @@ -504,8 +526,17 @@ public function __construct($data = null) } } if (isset($data[self::FIELD_LENGTH])) { + $ext = (isset($data[self::FIELD_LENGTH_EXT]) && is_array($data[self::FIELD_LENGTH_EXT])) + ? $data[self::FIELD_LENGTH_EXT] + : null; if ($data[self::FIELD_LENGTH] instanceof FHIRDuration) { $this->setLength($data[self::FIELD_LENGTH]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_LENGTH])) { + $this->setLength(new FHIRDuration([FHIRDuration::FIELD_VALUE => $data[self::FIELD_LENGTH]] + $ext)); + } else if (is_array($data[self::FIELD_LENGTH])) { + $this->setLength(new FHIRDuration(array_merge($ext, $data[self::FIELD_LENGTH]))); + } } else { $this->setLength(new FHIRDuration($data[self::FIELD_LENGTH])); } @@ -513,6 +544,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_LOCATION])) { if (is_array($data[self::FIELD_LOCATION])) { foreach($data[self::FIELD_LOCATION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIREncounterLocation) { $this->addLocation($v); } else { @@ -535,6 +569,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PARTICIPANT])) { if (is_array($data[self::FIELD_PARTICIPANT])) { foreach($data[self::FIELD_PARTICIPANT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIREncounterParticipant) { $this->addParticipant($v); } else { @@ -564,6 +601,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REASON])) { if (is_array($data[self::FIELD_REASON])) { foreach($data[self::FIELD_REASON] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addReason($v); } else { @@ -589,8 +629,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIREncounterStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIREncounterStatus([FHIREncounterStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIREncounterStatus([FHIREncounterStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIREncounterStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIREncounterStatus($data[self::FIELD_STATUS])); } @@ -598,6 +642,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_STATUS_HISTORY])) { if (is_array($data[self::FIELD_STATUS_HISTORY])) { foreach($data[self::FIELD_STATUS_HISTORY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIREncounterStatusHistory) { $this->addStatusHistory($v); } else { @@ -620,6 +667,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_TYPE])) { if (is_array($data[self::FIELD_TYPE])) { foreach($data[self::FIELD_TYPE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addType($v); } else { @@ -1800,15 +1850,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_ACCOUNT, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getAppointment())) { $v->xmlSerialize($sxe->addChild(self::FIELD_APPOINTMENT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getClass())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CLASS, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getClassHistory())) { foreach($vs as $v) { if (null === $v) { @@ -1817,7 +1864,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_CLASS_HISTORY, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getDiagnosis())) { foreach($vs as $v) { if (null === $v) { @@ -1826,7 +1872,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_DIAGNOSIS, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getEpisodeOfCare())) { foreach($vs as $v) { if (null === $v) { @@ -1835,11 +1880,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_EPISODE_OF_CARE, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getHospitalization())) { $v->xmlSerialize($sxe->addChild(self::FIELD_HOSPITALIZATION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -1848,7 +1891,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getIncomingReferral())) { foreach($vs as $v) { if (null === $v) { @@ -1857,11 +1899,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_INCOMING_REFERRAL, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getLength())) { $v->xmlSerialize($sxe->addChild(self::FIELD_LENGTH, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getLocation())) { foreach($vs as $v) { if (null === $v) { @@ -1870,11 +1910,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_LOCATION, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getPartOf())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PART_OF, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getParticipant())) { foreach($vs as $v) { if (null === $v) { @@ -1883,15 +1921,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_PARTICIPANT, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPriority())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PRIORITY, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getReason())) { foreach($vs as $v) { if (null === $v) { @@ -1900,15 +1935,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_REASON, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getServiceProvider())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SERVICE_PROVIDER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getStatusHistory())) { foreach($vs as $v) { if (null === $v) { @@ -1917,11 +1949,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS_HISTORY, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getSubject())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBJECT, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getType())) { foreach($vs as $v) { if (null === $v) { @@ -1961,13 +1991,37 @@ public function jsonSerialize() $a[self::FIELD_HOSPITALIZATION] = $v; } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if ([] !== ($vs = $this->getIncomingReferral())) { $a[self::FIELD_INCOMING_REFERRAL] = $vs; } if (null !== ($v = $this->getLength())) { - $a[self::FIELD_LENGTH] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_LENGTH] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_LENGTH_EXT] = $enc; + } + } else { + $a[self::FIELD_LENGTH] = $v; + } } if ([] !== ($vs = $this->getLocation())) { $a[self::FIELD_LOCATION] = $vs; @@ -1991,7 +2045,15 @@ public function jsonSerialize() $a[self::FIELD_SERVICE_PROVIDER] = $v; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if ([] !== ($vs = $this->getStatusHistory())) { $a[self::FIELD_STATUS_HISTORY] = $vs; diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIREndpoint.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIREndpoint.php index 4b5eff76dc..f547e46ef2 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIREndpoint.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIREndpoint.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -90,10 +90,6 @@ class FHIREndpoint extends FHIRDomainResource implements PHPFHIRContainedTypeInt { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ENDPOINT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ADDRESS = 'address'; const FIELD_ADDRESS_EXT = '_address'; const FIELD_CONNECTION_TYPE = 'connectionType'; @@ -245,6 +241,9 @@ class FHIREndpoint extends FHIRDomainResource implements PHPFHIRContainedTypeInt */ protected $status = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIREndpoint Constructor * @param null|array $data @@ -267,8 +266,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ADDRESS] instanceof FHIRUri) { $this->setAddress($data[self::FIELD_ADDRESS]); - } elseif ($ext && is_scalar($data[self::FIELD_ADDRESS])) { - $this->setAddress(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_ADDRESS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ADDRESS])) { + $this->setAddress(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_ADDRESS]] + $ext)); + } else if (is_array($data[self::FIELD_ADDRESS])) { + $this->setAddress(new FHIRUri(array_merge($ext, $data[self::FIELD_ADDRESS]))); + } } else { $this->setAddress(new FHIRUri($data[self::FIELD_ADDRESS])); } @@ -286,17 +289,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_CONTACT])) { foreach($data[self::FIELD_CONTACT] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContactPoint) { $this->addContact($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addContact(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addContact(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addContact(new FHIRContactPoint(array_merge($v, $ext[$i]))); + } } else { $this->addContact(new FHIRContactPoint($v)); } } } elseif ($data[self::FIELD_CONTACT] instanceof FHIRContactPoint) { $this->addContact($data[self::FIELD_CONTACT]); - } elseif ($ext && is_scalar($data[self::FIELD_CONTACT])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_CONTACT])) { $this->addContact(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $data[self::FIELD_CONTACT]] + $ext)); } else { $this->addContact(new FHIRContactPoint($data[self::FIELD_CONTACT])); @@ -308,17 +318,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_HEADER])) { foreach($data[self::FIELD_HEADER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRString) { $this->addHeader($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addHeader(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addHeader(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addHeader(new FHIRString(array_merge($v, $ext[$i]))); + } } else { $this->addHeader(new FHIRString($v)); } } } elseif ($data[self::FIELD_HEADER] instanceof FHIRString) { $this->addHeader($data[self::FIELD_HEADER]); - } elseif ($ext && is_scalar($data[self::FIELD_HEADER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_HEADER])) { $this->addHeader(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_HEADER]] + $ext)); } else { $this->addHeader(new FHIRString($data[self::FIELD_HEADER])); @@ -330,17 +347,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -359,8 +383,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -371,17 +399,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_PAYLOAD_MIME_TYPE])) { foreach($data[self::FIELD_PAYLOAD_MIME_TYPE] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCode) { $this->addPayloadMimeType($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addPayloadMimeType(new FHIRCode([FHIRCode::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addPayloadMimeType(new FHIRCode([FHIRCode::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addPayloadMimeType(new FHIRCode(array_merge($v, $ext[$i]))); + } } else { $this->addPayloadMimeType(new FHIRCode($v)); } } } elseif ($data[self::FIELD_PAYLOAD_MIME_TYPE] instanceof FHIRCode) { $this->addPayloadMimeType($data[self::FIELD_PAYLOAD_MIME_TYPE]); - } elseif ($ext && is_scalar($data[self::FIELD_PAYLOAD_MIME_TYPE])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_PAYLOAD_MIME_TYPE])) { $this->addPayloadMimeType(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_PAYLOAD_MIME_TYPE]] + $ext)); } else { $this->addPayloadMimeType(new FHIRCode($data[self::FIELD_PAYLOAD_MIME_TYPE])); @@ -390,6 +425,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PAYLOAD_TYPE])) { if (is_array($data[self::FIELD_PAYLOAD_TYPE])) { foreach($data[self::FIELD_PAYLOAD_TYPE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addPayloadType($v); } else { @@ -415,8 +453,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIREndpointStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIREndpointStatus([FHIREndpointStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIREndpointStatus([FHIREndpointStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIREndpointStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIREndpointStatus($data[self::FIELD_STATUS])); } @@ -1107,14 +1149,13 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getAddress())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ADDRESS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getConnectionType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CONNECTION_TYPE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getContact())) { foreach($vs as $v) { if (null === $v) { @@ -1131,7 +1172,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_HEADER, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -1140,7 +1180,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getManagingOrganization())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MANAGING_ORGANIZATION, null, $v->_getFHIRXMLNamespace())); } @@ -1155,7 +1194,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_PAYLOAD_MIME_TYPE, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getPayloadType())) { foreach($vs as $v) { if (null === $v) { @@ -1164,11 +1202,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_PAYLOAD_TYPE, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } @@ -1182,14 +1218,37 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getAddress())) { - $a[self::FIELD_ADDRESS] = $v->getValue(); - $a[self::FIELD_ADDRESS_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ADDRESS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ADDRESS_EXT] = $enc; + } + } else { + $a[self::FIELD_ADDRESS] = $v; + } } if (null !== ($v = $this->getConnectionType())) { $a[self::FIELD_CONNECTION_TYPE] = $v; } if ([] !== ($vs = $this->getContact())) { - $a[self::FIELD_CONTACT] = $vs; + $a[self::FIELD_CONTACT] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CONTACT][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CONTACT_EXT][] = $enc; + } else { + $a[self::FIELD_CONTACT_EXT][] = null; + } + } else { + $a[self::FIELD_CONTACT][] = $v; + } + } } if ([] !== ($vs = $this->getHeader())) { $a[self::FIELD_HEADER] = []; @@ -1197,19 +1256,51 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_HEADER][] = $v->getValue(); - $a[self::FIELD_HEADER_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_HEADER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_HEADER_EXT][] = $enc; + } else { + $a[self::FIELD_HEADER_EXT][] = null; + } + } else { + $a[self::FIELD_HEADER][] = $v; + } } } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if (null !== ($v = $this->getManagingOrganization())) { $a[self::FIELD_MANAGING_ORGANIZATION] = $v; } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if ([] !== ($vs = $this->getPayloadMimeType())) { $a[self::FIELD_PAYLOAD_MIME_TYPE] = []; @@ -1217,8 +1308,17 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_PAYLOAD_MIME_TYPE][] = $v->getValue(); - $a[self::FIELD_PAYLOAD_MIME_TYPE_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PAYLOAD_MIME_TYPE][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PAYLOAD_MIME_TYPE_EXT][] = $enc; + } else { + $a[self::FIELD_PAYLOAD_MIME_TYPE_EXT][] = null; + } + } else { + $a[self::FIELD_PAYLOAD_MIME_TYPE][] = $v; + } } } if ([] !== ($vs = $this->getPayloadType())) { @@ -1228,7 +1328,15 @@ public function jsonSerialize() $a[self::FIELD_PERIOD] = $v; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIREnrollmentRequest.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIREnrollmentRequest.php index dddb7831c7..fb4ee6212a 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIREnrollmentRequest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIREnrollmentRequest.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -83,10 +83,6 @@ class FHIREnrollmentRequest extends FHIRDomainResource implements PHPFHIRContain { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ENROLLMENT_REQUEST; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_COVERAGE = 'coverage'; const FIELD_CREATED = 'created'; const FIELD_CREATED_EXT = '_created'; @@ -189,6 +185,9 @@ class FHIREnrollmentRequest extends FHIRDomainResource implements PHPFHIRContain */ protected $subject = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIREnrollmentRequest Constructor * @param null|array $data @@ -218,8 +217,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CREATED] instanceof FHIRDateTime) { $this->setCreated($data[self::FIELD_CREATED]); - } elseif ($ext && is_scalar($data[self::FIELD_CREATED])) { - $this->setCreated(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_CREATED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CREATED])) { + $this->setCreated(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_CREATED]] + $ext)); + } else if (is_array($data[self::FIELD_CREATED])) { + $this->setCreated(new FHIRDateTime(array_merge($ext, $data[self::FIELD_CREATED]))); + } } else { $this->setCreated(new FHIRDateTime($data[self::FIELD_CREATED])); } @@ -230,17 +233,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -273,8 +283,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRFinancialResourceStatusCodes) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRFinancialResourceStatusCodes([FHIRFinancialResourceStatusCodes::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRFinancialResourceStatusCodes([FHIRFinancialResourceStatusCodes::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRFinancialResourceStatusCodes(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRFinancialResourceStatusCodes($data[self::FIELD_STATUS])); } @@ -709,7 +723,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getCreated())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CREATED, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -718,23 +731,18 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getInsurer())) { $v->xmlSerialize($sxe->addChild(self::FIELD_INSURER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOrganization())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ORGANIZATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getProvider())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PROVIDER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSubject())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBJECT, null, $v->_getFHIRXMLNamespace())); } @@ -751,11 +759,34 @@ public function jsonSerialize() $a[self::FIELD_COVERAGE] = $v; } if (null !== ($v = $this->getCreated())) { - $a[self::FIELD_CREATED] = $v->getValue(); - $a[self::FIELD_CREATED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CREATED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CREATED_EXT] = $enc; + } + } else { + $a[self::FIELD_CREATED] = $v; + } } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if (null !== ($v = $this->getInsurer())) { $a[self::FIELD_INSURER] = $v; @@ -767,7 +798,15 @@ public function jsonSerialize() $a[self::FIELD_PROVIDER] = $v; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getSubject())) { $a[self::FIELD_SUBJECT] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIREnrollmentResponse.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIREnrollmentResponse.php index a6f65dd338..ecdb52e169 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIREnrollmentResponse.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIREnrollmentResponse.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -85,10 +85,6 @@ class FHIREnrollmentResponse extends FHIRDomainResource implements PHPFHIRContai { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ENROLLMENT_RESPONSE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CREATED = 'created'; const FIELD_CREATED_EXT = '_created'; const FIELD_DISPOSITION = 'disposition'; @@ -205,6 +201,9 @@ class FHIREnrollmentResponse extends FHIRDomainResource implements PHPFHIRContai */ protected $status = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIREnrollmentResponse Constructor * @param null|array $data @@ -227,8 +226,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CREATED] instanceof FHIRDateTime) { $this->setCreated($data[self::FIELD_CREATED]); - } elseif ($ext && is_scalar($data[self::FIELD_CREATED])) { - $this->setCreated(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_CREATED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CREATED])) { + $this->setCreated(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_CREATED]] + $ext)); + } else if (is_array($data[self::FIELD_CREATED])) { + $this->setCreated(new FHIRDateTime(array_merge($ext, $data[self::FIELD_CREATED]))); + } } else { $this->setCreated(new FHIRDateTime($data[self::FIELD_CREATED])); } @@ -239,8 +242,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DISPOSITION] instanceof FHIRString) { $this->setDisposition($data[self::FIELD_DISPOSITION]); - } elseif ($ext && is_scalar($data[self::FIELD_DISPOSITION])) { - $this->setDisposition(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DISPOSITION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DISPOSITION])) { + $this->setDisposition(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DISPOSITION]] + $ext)); + } else if (is_array($data[self::FIELD_DISPOSITION])) { + $this->setDisposition(new FHIRString(array_merge($ext, $data[self::FIELD_DISPOSITION]))); + } } else { $this->setDisposition(new FHIRString($data[self::FIELD_DISPOSITION])); } @@ -251,17 +258,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -308,8 +322,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRFinancialResourceStatusCodes) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRFinancialResourceStatusCodes([FHIRFinancialResourceStatusCodes::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRFinancialResourceStatusCodes([FHIRFinancialResourceStatusCodes::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRFinancialResourceStatusCodes(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRFinancialResourceStatusCodes($data[self::FIELD_STATUS])); } @@ -776,13 +794,13 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getCreated())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CREATED, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getDisposition())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DISPOSITION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -791,27 +809,21 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getOrganization())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ORGANIZATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOutcome())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OUTCOME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRequest())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REQUEST, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRequestOrganization())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REQUEST_ORGANIZATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRequestProvider())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REQUEST_PROVIDER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } @@ -825,15 +837,45 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getCreated())) { - $a[self::FIELD_CREATED] = $v->getValue(); - $a[self::FIELD_CREATED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CREATED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CREATED_EXT] = $enc; + } + } else { + $a[self::FIELD_CREATED] = $v; + } } if (null !== ($v = $this->getDisposition())) { - $a[self::FIELD_DISPOSITION] = $v->getValue(); - $a[self::FIELD_DISPOSITION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DISPOSITION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DISPOSITION_EXT] = $enc; + } + } else { + $a[self::FIELD_DISPOSITION] = $v; + } } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if (null !== ($v = $this->getOrganization())) { $a[self::FIELD_ORGANIZATION] = $v; @@ -851,7 +893,15 @@ public function jsonSerialize() $a[self::FIELD_REQUEST_PROVIDER] = $v; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIREpisodeOfCare.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIREpisodeOfCare.php index 3eaac3c1bf..d8c5bb7856 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIREpisodeOfCare.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIREpisodeOfCare.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -87,10 +87,6 @@ class FHIREpisodeOfCare extends FHIRDomainResource implements PHPFHIRContainedTy { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_EPISODE_OF_CARE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ACCOUNT = 'account'; const FIELD_CARE_MANAGER = 'careManager'; const FIELD_DIAGNOSIS = 'diagnosis'; @@ -246,6 +242,9 @@ class FHIREpisodeOfCare extends FHIRDomainResource implements PHPFHIRContainedTy */ protected $type = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIREpisodeOfCare Constructor * @param null|array $data @@ -265,6 +264,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ACCOUNT])) { if (is_array($data[self::FIELD_ACCOUNT])) { foreach($data[self::FIELD_ACCOUNT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addAccount($v); } else { @@ -287,6 +289,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_DIAGNOSIS])) { if (is_array($data[self::FIELD_DIAGNOSIS])) { foreach($data[self::FIELD_DIAGNOSIS] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIREpisodeOfCareDiagnosis) { $this->addDiagnosis($v); } else { @@ -305,17 +310,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -345,6 +357,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REFERRAL_REQUEST])) { if (is_array($data[self::FIELD_REFERRAL_REQUEST])) { foreach($data[self::FIELD_REFERRAL_REQUEST] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addReferralRequest($v); } else { @@ -363,8 +378,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIREpisodeOfCareStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIREpisodeOfCareStatus([FHIREpisodeOfCareStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIREpisodeOfCareStatus([FHIREpisodeOfCareStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIREpisodeOfCareStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIREpisodeOfCareStatus($data[self::FIELD_STATUS])); } @@ -372,6 +391,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_STATUS_HISTORY])) { if (is_array($data[self::FIELD_STATUS_HISTORY])) { foreach($data[self::FIELD_STATUS_HISTORY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIREpisodeOfCareStatusHistory) { $this->addStatusHistory($v); } else { @@ -387,6 +409,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_TEAM])) { if (is_array($data[self::FIELD_TEAM])) { foreach($data[self::FIELD_TEAM] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addTeam($v); } else { @@ -402,6 +427,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_TYPE])) { if (is_array($data[self::FIELD_TYPE])) { foreach($data[self::FIELD_TYPE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addType($v); } else { @@ -1147,11 +1175,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_ACCOUNT, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getCareManager())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CARE_MANAGER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getDiagnosis())) { foreach($vs as $v) { if (null === $v) { @@ -1160,7 +1186,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_DIAGNOSIS, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -1169,19 +1194,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getManagingOrganization())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MANAGING_ORGANIZATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPatient())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATIENT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getReferralRequest())) { foreach($vs as $v) { if (null === $v) { @@ -1190,11 +1211,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_REFERRAL_REQUEST, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getStatusHistory())) { foreach($vs as $v) { if (null === $v) { @@ -1203,7 +1222,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS_HISTORY, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getTeam())) { foreach($vs as $v) { if (null === $v) { @@ -1212,7 +1230,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_TEAM, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getType())) { foreach($vs as $v) { if (null === $v) { @@ -1240,7 +1257,23 @@ public function jsonSerialize() $a[self::FIELD_DIAGNOSIS] = $vs; } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if (null !== ($v = $this->getManagingOrganization())) { $a[self::FIELD_MANAGING_ORGANIZATION] = $v; @@ -1255,7 +1288,15 @@ public function jsonSerialize() $a[self::FIELD_REFERRAL_REQUEST] = $vs; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if ([] !== ($vs = $this->getStatusHistory())) { $a[self::FIELD_STATUS_HISTORY] = $vs; diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRExpansionProfile.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRExpansionProfile.php index e5a1a91ab6..004ea57967 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRExpansionProfile.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRExpansionProfile.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -92,10 +92,6 @@ class FHIRExpansionProfile extends FHIRDomainResource implements PHPFHIRContaine { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_EXPANSION_PROFILE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ACTIVE_ONLY = 'activeOnly'; const FIELD_ACTIVE_ONLY_EXT = '_activeOnly'; const FIELD_CONTACT = 'contact'; @@ -424,6 +420,9 @@ class FHIRExpansionProfile extends FHIRDomainResource implements PHPFHIRContaine */ protected $version = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRExpansionProfile Constructor * @param null|array $data @@ -446,8 +445,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ACTIVE_ONLY] instanceof FHIRBoolean) { $this->setActiveOnly($data[self::FIELD_ACTIVE_ONLY]); - } elseif ($ext && is_scalar($data[self::FIELD_ACTIVE_ONLY])) { - $this->setActiveOnly(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_ACTIVE_ONLY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ACTIVE_ONLY])) { + $this->setActiveOnly(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_ACTIVE_ONLY]] + $ext)); + } else if (is_array($data[self::FIELD_ACTIVE_ONLY])) { + $this->setActiveOnly(new FHIRBoolean(array_merge($ext, $data[self::FIELD_ACTIVE_ONLY]))); + } } else { $this->setActiveOnly(new FHIRBoolean($data[self::FIELD_ACTIVE_ONLY])); } @@ -455,6 +458,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CONTACT])) { if (is_array($data[self::FIELD_CONTACT])) { foreach($data[self::FIELD_CONTACT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContactDetail) { $this->addContact($v); } else { @@ -473,8 +479,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATE] instanceof FHIRDateTime) { $this->setDate($data[self::FIELD_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_DATE])) { - $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime(array_merge($ext, $data[self::FIELD_DATE]))); + } } else { $this->setDate(new FHIRDateTime($data[self::FIELD_DATE])); } @@ -485,8 +495,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRMarkdown) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRMarkdown($data[self::FIELD_DESCRIPTION])); } @@ -504,8 +518,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DISPLAY_LANGUAGE] instanceof FHIRCode) { $this->setDisplayLanguage($data[self::FIELD_DISPLAY_LANGUAGE]); - } elseif ($ext && is_scalar($data[self::FIELD_DISPLAY_LANGUAGE])) { - $this->setDisplayLanguage(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_DISPLAY_LANGUAGE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DISPLAY_LANGUAGE])) { + $this->setDisplayLanguage(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_DISPLAY_LANGUAGE]] + $ext)); + } else if (is_array($data[self::FIELD_DISPLAY_LANGUAGE])) { + $this->setDisplayLanguage(new FHIRCode(array_merge($ext, $data[self::FIELD_DISPLAY_LANGUAGE]))); + } } else { $this->setDisplayLanguage(new FHIRCode($data[self::FIELD_DISPLAY_LANGUAGE])); } @@ -516,8 +534,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EXCLUDE_NESTED] instanceof FHIRBoolean) { $this->setExcludeNested($data[self::FIELD_EXCLUDE_NESTED]); - } elseif ($ext && is_scalar($data[self::FIELD_EXCLUDE_NESTED])) { - $this->setExcludeNested(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_EXCLUDE_NESTED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EXCLUDE_NESTED])) { + $this->setExcludeNested(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_EXCLUDE_NESTED]] + $ext)); + } else if (is_array($data[self::FIELD_EXCLUDE_NESTED])) { + $this->setExcludeNested(new FHIRBoolean(array_merge($ext, $data[self::FIELD_EXCLUDE_NESTED]))); + } } else { $this->setExcludeNested(new FHIRBoolean($data[self::FIELD_EXCLUDE_NESTED])); } @@ -528,8 +550,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EXCLUDE_NOT_FOR_UI] instanceof FHIRBoolean) { $this->setExcludeNotForUI($data[self::FIELD_EXCLUDE_NOT_FOR_UI]); - } elseif ($ext && is_scalar($data[self::FIELD_EXCLUDE_NOT_FOR_UI])) { - $this->setExcludeNotForUI(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_EXCLUDE_NOT_FOR_UI]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EXCLUDE_NOT_FOR_UI])) { + $this->setExcludeNotForUI(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_EXCLUDE_NOT_FOR_UI]] + $ext)); + } else if (is_array($data[self::FIELD_EXCLUDE_NOT_FOR_UI])) { + $this->setExcludeNotForUI(new FHIRBoolean(array_merge($ext, $data[self::FIELD_EXCLUDE_NOT_FOR_UI]))); + } } else { $this->setExcludeNotForUI(new FHIRBoolean($data[self::FIELD_EXCLUDE_NOT_FOR_UI])); } @@ -540,8 +566,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EXCLUDE_POST_COORDINATED] instanceof FHIRBoolean) { $this->setExcludePostCoordinated($data[self::FIELD_EXCLUDE_POST_COORDINATED]); - } elseif ($ext && is_scalar($data[self::FIELD_EXCLUDE_POST_COORDINATED])) { - $this->setExcludePostCoordinated(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_EXCLUDE_POST_COORDINATED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EXCLUDE_POST_COORDINATED])) { + $this->setExcludePostCoordinated(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_EXCLUDE_POST_COORDINATED]] + $ext)); + } else if (is_array($data[self::FIELD_EXCLUDE_POST_COORDINATED])) { + $this->setExcludePostCoordinated(new FHIRBoolean(array_merge($ext, $data[self::FIELD_EXCLUDE_POST_COORDINATED]))); + } } else { $this->setExcludePostCoordinated(new FHIRBoolean($data[self::FIELD_EXCLUDE_POST_COORDINATED])); } @@ -559,8 +589,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EXPERIMENTAL] instanceof FHIRBoolean) { $this->setExperimental($data[self::FIELD_EXPERIMENTAL]); - } elseif ($ext && is_scalar($data[self::FIELD_EXPERIMENTAL])) { - $this->setExperimental(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_EXPERIMENTAL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EXPERIMENTAL])) { + $this->setExperimental(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_EXPERIMENTAL]] + $ext)); + } else if (is_array($data[self::FIELD_EXPERIMENTAL])) { + $this->setExperimental(new FHIRBoolean(array_merge($ext, $data[self::FIELD_EXPERIMENTAL]))); + } } else { $this->setExperimental(new FHIRBoolean($data[self::FIELD_EXPERIMENTAL])); } @@ -568,6 +602,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_FIXED_VERSION])) { if (is_array($data[self::FIELD_FIXED_VERSION])) { foreach($data[self::FIELD_FIXED_VERSION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRExpansionProfileFixedVersion) { $this->addFixedVersion($v); } else { @@ -586,8 +623,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->setIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { - $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_IDENTIFIER]))); + } } else { $this->setIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); } @@ -598,8 +639,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_INCLUDE_DEFINITION] instanceof FHIRBoolean) { $this->setIncludeDefinition($data[self::FIELD_INCLUDE_DEFINITION]); - } elseif ($ext && is_scalar($data[self::FIELD_INCLUDE_DEFINITION])) { - $this->setIncludeDefinition(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_INCLUDE_DEFINITION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_INCLUDE_DEFINITION])) { + $this->setIncludeDefinition(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_INCLUDE_DEFINITION]] + $ext)); + } else if (is_array($data[self::FIELD_INCLUDE_DEFINITION])) { + $this->setIncludeDefinition(new FHIRBoolean(array_merge($ext, $data[self::FIELD_INCLUDE_DEFINITION]))); + } } else { $this->setIncludeDefinition(new FHIRBoolean($data[self::FIELD_INCLUDE_DEFINITION])); } @@ -610,8 +655,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_INCLUDE_DESIGNATIONS] instanceof FHIRBoolean) { $this->setIncludeDesignations($data[self::FIELD_INCLUDE_DESIGNATIONS]); - } elseif ($ext && is_scalar($data[self::FIELD_INCLUDE_DESIGNATIONS])) { - $this->setIncludeDesignations(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_INCLUDE_DESIGNATIONS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_INCLUDE_DESIGNATIONS])) { + $this->setIncludeDesignations(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_INCLUDE_DESIGNATIONS]] + $ext)); + } else if (is_array($data[self::FIELD_INCLUDE_DESIGNATIONS])) { + $this->setIncludeDesignations(new FHIRBoolean(array_merge($ext, $data[self::FIELD_INCLUDE_DESIGNATIONS]))); + } } else { $this->setIncludeDesignations(new FHIRBoolean($data[self::FIELD_INCLUDE_DESIGNATIONS])); } @@ -619,6 +668,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_JURISDICTION])) { if (is_array($data[self::FIELD_JURISDICTION])) { foreach($data[self::FIELD_JURISDICTION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addJurisdiction($v); } else { @@ -637,8 +689,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_LIMITED_EXPANSION] instanceof FHIRBoolean) { $this->setLimitedExpansion($data[self::FIELD_LIMITED_EXPANSION]); - } elseif ($ext && is_scalar($data[self::FIELD_LIMITED_EXPANSION])) { - $this->setLimitedExpansion(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_LIMITED_EXPANSION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_LIMITED_EXPANSION])) { + $this->setLimitedExpansion(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_LIMITED_EXPANSION]] + $ext)); + } else if (is_array($data[self::FIELD_LIMITED_EXPANSION])) { + $this->setLimitedExpansion(new FHIRBoolean(array_merge($ext, $data[self::FIELD_LIMITED_EXPANSION]))); + } } else { $this->setLimitedExpansion(new FHIRBoolean($data[self::FIELD_LIMITED_EXPANSION])); } @@ -649,8 +705,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -661,8 +721,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PUBLISHER] instanceof FHIRString) { $this->setPublisher($data[self::FIELD_PUBLISHER]); - } elseif ($ext && is_scalar($data[self::FIELD_PUBLISHER])) { - $this->setPublisher(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PUBLISHER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PUBLISHER])) { + $this->setPublisher(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PUBLISHER]] + $ext)); + } else if (is_array($data[self::FIELD_PUBLISHER])) { + $this->setPublisher(new FHIRString(array_merge($ext, $data[self::FIELD_PUBLISHER]))); + } } else { $this->setPublisher(new FHIRString($data[self::FIELD_PUBLISHER])); } @@ -673,8 +737,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRPublicationStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRPublicationStatus([FHIRPublicationStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRPublicationStatus([FHIRPublicationStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRPublicationStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRPublicationStatus($data[self::FIELD_STATUS])); } @@ -685,8 +753,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_URL] instanceof FHIRUri) { $this->setUrl($data[self::FIELD_URL]); - } elseif ($ext && is_scalar($data[self::FIELD_URL])) { - $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } else if (is_array($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri(array_merge($ext, $data[self::FIELD_URL]))); + } } else { $this->setUrl(new FHIRUri($data[self::FIELD_URL])); } @@ -694,6 +766,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_USE_CONTEXT])) { if (is_array($data[self::FIELD_USE_CONTEXT])) { foreach($data[self::FIELD_USE_CONTEXT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRUsageContext) { $this->addUseContext($v); } else { @@ -712,8 +787,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VERSION] instanceof FHIRString) { $this->setVersion($data[self::FIELD_VERSION]); - } elseif ($ext && is_scalar($data[self::FIELD_VERSION])) { - $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } else if (is_array($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString(array_merge($ext, $data[self::FIELD_VERSION]))); + } } else { $this->setVersion(new FHIRString($data[self::FIELD_VERSION])); } @@ -1937,10 +2016,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getActiveOnly())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ACTIVE_ONLY, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getContact())) { foreach($vs as $v) { if (null === $v) { @@ -1955,7 +2034,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESCRIPTION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDesignation())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESIGNATION, null, $v->_getFHIRXMLNamespace())); } @@ -1971,14 +2049,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getExcludePostCoordinated())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EXCLUDE_POST_COORDINATED, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getExcludedSystem())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EXCLUDED_SYSTEM, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getExperimental())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EXPERIMENTAL, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getFixedVersion())) { foreach($vs as $v) { if (null === $v) { @@ -1987,7 +2063,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_FIXED_VERSION, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } @@ -1997,7 +2072,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getIncludeDesignations())) { $v->xmlSerialize($sxe->addChild(self::FIELD_INCLUDE_DESIGNATIONS, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getJurisdiction())) { foreach($vs as $v) { if (null === $v) { @@ -2015,14 +2089,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getPublisher())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PUBLISHER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getUrl())) { $v->xmlSerialize($sxe->addChild(self::FIELD_URL, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getUseContext())) { foreach($vs as $v) { if (null === $v) { @@ -2044,88 +2116,209 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getActiveOnly())) { - $a[self::FIELD_ACTIVE_ONLY] = $v->getValue(); - $a[self::FIELD_ACTIVE_ONLY_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ACTIVE_ONLY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ACTIVE_ONLY_EXT] = $enc; + } + } else { + $a[self::FIELD_ACTIVE_ONLY] = $v; + } } if ([] !== ($vs = $this->getContact())) { $a[self::FIELD_CONTACT] = $vs; } if (null !== ($v = $this->getDate())) { - $a[self::FIELD_DATE] = $v->getValue(); - $a[self::FIELD_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_DATE] = $v; + } } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if (null !== ($v = $this->getDesignation())) { $a[self::FIELD_DESIGNATION] = $v; } if (null !== ($v = $this->getDisplayLanguage())) { - $a[self::FIELD_DISPLAY_LANGUAGE] = $v->getValue(); - $a[self::FIELD_DISPLAY_LANGUAGE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DISPLAY_LANGUAGE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DISPLAY_LANGUAGE_EXT] = $enc; + } + } else { + $a[self::FIELD_DISPLAY_LANGUAGE] = $v; + } } if (null !== ($v = $this->getExcludeNested())) { - $a[self::FIELD_EXCLUDE_NESTED] = $v->getValue(); - $a[self::FIELD_EXCLUDE_NESTED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EXCLUDE_NESTED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EXCLUDE_NESTED_EXT] = $enc; + } + } else { + $a[self::FIELD_EXCLUDE_NESTED] = $v; + } } if (null !== ($v = $this->getExcludeNotForUI())) { - $a[self::FIELD_EXCLUDE_NOT_FOR_UI] = $v->getValue(); - $a[self::FIELD_EXCLUDE_NOT_FOR_UI_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EXCLUDE_NOT_FOR_UI] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EXCLUDE_NOT_FOR_UI_EXT] = $enc; + } + } else { + $a[self::FIELD_EXCLUDE_NOT_FOR_UI] = $v; + } } if (null !== ($v = $this->getExcludePostCoordinated())) { - $a[self::FIELD_EXCLUDE_POST_COORDINATED] = $v->getValue(); - $a[self::FIELD_EXCLUDE_POST_COORDINATED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EXCLUDE_POST_COORDINATED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EXCLUDE_POST_COORDINATED_EXT] = $enc; + } + } else { + $a[self::FIELD_EXCLUDE_POST_COORDINATED] = $v; + } } if (null !== ($v = $this->getExcludedSystem())) { $a[self::FIELD_EXCLUDED_SYSTEM] = $v; } if (null !== ($v = $this->getExperimental())) { - $a[self::FIELD_EXPERIMENTAL] = $v->getValue(); - $a[self::FIELD_EXPERIMENTAL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EXPERIMENTAL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EXPERIMENTAL_EXT] = $enc; + } + } else { + $a[self::FIELD_EXPERIMENTAL] = $v; + } } if ([] !== ($vs = $this->getFixedVersion())) { $a[self::FIELD_FIXED_VERSION] = $vs; } if (null !== ($v = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_IDENTIFIER] = $v; + } } if (null !== ($v = $this->getIncludeDefinition())) { - $a[self::FIELD_INCLUDE_DEFINITION] = $v->getValue(); - $a[self::FIELD_INCLUDE_DEFINITION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_INCLUDE_DEFINITION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_INCLUDE_DEFINITION_EXT] = $enc; + } + } else { + $a[self::FIELD_INCLUDE_DEFINITION] = $v; + } } if (null !== ($v = $this->getIncludeDesignations())) { - $a[self::FIELD_INCLUDE_DESIGNATIONS] = $v->getValue(); - $a[self::FIELD_INCLUDE_DESIGNATIONS_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_INCLUDE_DESIGNATIONS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_INCLUDE_DESIGNATIONS_EXT] = $enc; + } + } else { + $a[self::FIELD_INCLUDE_DESIGNATIONS] = $v; + } } if ([] !== ($vs = $this->getJurisdiction())) { $a[self::FIELD_JURISDICTION] = $vs; } if (null !== ($v = $this->getLimitedExpansion())) { - $a[self::FIELD_LIMITED_EXPANSION] = $v->getValue(); - $a[self::FIELD_LIMITED_EXPANSION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_LIMITED_EXPANSION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_LIMITED_EXPANSION_EXT] = $enc; + } + } else { + $a[self::FIELD_LIMITED_EXPANSION] = $v; + } } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if (null !== ($v = $this->getPublisher())) { - $a[self::FIELD_PUBLISHER] = $v->getValue(); - $a[self::FIELD_PUBLISHER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PUBLISHER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PUBLISHER_EXT] = $enc; + } + } else { + $a[self::FIELD_PUBLISHER] = $v; + } } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getUrl())) { - $a[self::FIELD_URL] = $v->getValue(); - $a[self::FIELD_URL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_URL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_URL_EXT] = $enc; + } + } else { + $a[self::FIELD_URL] = $v; + } } if ([] !== ($vs = $this->getUseContext())) { $a[self::FIELD_USE_CONTEXT] = $vs; } if (null !== ($v = $this->getVersion())) { - $a[self::FIELD_VERSION] = $v->getValue(); - $a[self::FIELD_VERSION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VERSION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VERSION_EXT] = $enc; + } + } else { + $a[self::FIELD_VERSION] = $v; + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRExplanationOfBenefit.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRExplanationOfBenefit.php index 489c341b6a..6a4144e856 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRExplanationOfBenefit.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRExplanationOfBenefit.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -102,10 +102,6 @@ class FHIRExplanationOfBenefit extends FHIRDomainResource implements PHPFHIRCont { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_EXPLANATION_OF_BENEFIT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ACCIDENT = 'accident'; const FIELD_ADD_ITEM = 'addItem'; const FIELD_BENEFIT_BALANCE = 'benefitBalance'; @@ -147,9 +143,12 @@ class FHIRExplanationOfBenefit extends FHIRDomainResource implements PHPFHIRCont const FIELD_STATUS_EXT = '_status'; const FIELD_SUB_TYPE = 'subType'; const FIELD_TOTAL_BENEFIT = 'totalBenefit'; + const FIELD_TOTAL_BENEFIT_EXT = '_totalBenefit'; const FIELD_TOTAL_COST = 'totalCost'; + const FIELD_TOTAL_COST_EXT = '_totalCost'; const FIELD_TYPE = 'type'; const FIELD_UNALLOC_DEDUCTABLE = 'unallocDeductable'; + const FIELD_UNALLOC_DEDUCTABLE_EXT = '_unallocDeductable'; /** * This resource provides: the claim details; adjudication details from the @@ -604,6 +603,9 @@ class FHIRExplanationOfBenefit extends FHIRDomainResource implements PHPFHIRCont */ protected $unallocDeductable = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRExplanationOfBenefit Constructor * @param null|array $data @@ -630,6 +632,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ADD_ITEM])) { if (is_array($data[self::FIELD_ADD_ITEM])) { foreach($data[self::FIELD_ADD_ITEM] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRExplanationOfBenefitAddItem) { $this->addAddItem($v); } else { @@ -645,6 +650,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_BENEFIT_BALANCE])) { if (is_array($data[self::FIELD_BENEFIT_BALANCE])) { foreach($data[self::FIELD_BENEFIT_BALANCE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRExplanationOfBenefitBenefitBalance) { $this->addBenefitBalance($v); } else { @@ -667,6 +675,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CARE_TEAM])) { if (is_array($data[self::FIELD_CARE_TEAM])) { foreach($data[self::FIELD_CARE_TEAM] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRExplanationOfBenefitCareTeam) { $this->addCareTeam($v); } else { @@ -699,8 +710,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CREATED] instanceof FHIRDateTime) { $this->setCreated($data[self::FIELD_CREATED]); - } elseif ($ext && is_scalar($data[self::FIELD_CREATED])) { - $this->setCreated(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_CREATED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CREATED])) { + $this->setCreated(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_CREATED]] + $ext)); + } else if (is_array($data[self::FIELD_CREATED])) { + $this->setCreated(new FHIRDateTime(array_merge($ext, $data[self::FIELD_CREATED]))); + } } else { $this->setCreated(new FHIRDateTime($data[self::FIELD_CREATED])); } @@ -708,6 +723,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_DIAGNOSIS])) { if (is_array($data[self::FIELD_DIAGNOSIS])) { foreach($data[self::FIELD_DIAGNOSIS] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRExplanationOfBenefitDiagnosis) { $this->addDiagnosis($v); } else { @@ -726,8 +744,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DISPOSITION] instanceof FHIRString) { $this->setDisposition($data[self::FIELD_DISPOSITION]); - } elseif ($ext && is_scalar($data[self::FIELD_DISPOSITION])) { - $this->setDisposition(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DISPOSITION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DISPOSITION])) { + $this->setDisposition(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DISPOSITION]] + $ext)); + } else if (is_array($data[self::FIELD_DISPOSITION])) { + $this->setDisposition(new FHIRString(array_merge($ext, $data[self::FIELD_DISPOSITION]))); + } } else { $this->setDisposition(new FHIRString($data[self::FIELD_DISPOSITION])); } @@ -773,17 +795,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -792,6 +821,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_INFORMATION])) { if (is_array($data[self::FIELD_INFORMATION])) { foreach($data[self::FIELD_INFORMATION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRExplanationOfBenefitInformation) { $this->addInformation($v); } else { @@ -821,6 +853,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ITEM])) { if (is_array($data[self::FIELD_ITEM])) { foreach($data[self::FIELD_ITEM] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRExplanationOfBenefitItem) { $this->addItem($v); } else { @@ -881,8 +916,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PRECEDENCE] instanceof FHIRPositiveInt) { $this->setPrecedence($data[self::FIELD_PRECEDENCE]); - } elseif ($ext && is_scalar($data[self::FIELD_PRECEDENCE])) { - $this->setPrecedence(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_PRECEDENCE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PRECEDENCE])) { + $this->setPrecedence(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_PRECEDENCE]] + $ext)); + } else if (is_array($data[self::FIELD_PRECEDENCE])) { + $this->setPrecedence(new FHIRPositiveInt(array_merge($ext, $data[self::FIELD_PRECEDENCE]))); + } } else { $this->setPrecedence(new FHIRPositiveInt($data[self::FIELD_PRECEDENCE])); } @@ -897,6 +936,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PROCEDURE])) { if (is_array($data[self::FIELD_PROCEDURE])) { foreach($data[self::FIELD_PROCEDURE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRExplanationOfBenefitProcedure) { $this->addProcedure($v); } else { @@ -912,6 +954,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PROCESS_NOTE])) { if (is_array($data[self::FIELD_PROCESS_NOTE])) { foreach($data[self::FIELD_PROCESS_NOTE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRExplanationOfBenefitProcessNote) { $this->addProcessNote($v); } else { @@ -941,6 +986,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_RELATED])) { if (is_array($data[self::FIELD_RELATED])) { foreach($data[self::FIELD_RELATED] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRExplanationOfBenefitRelated) { $this->addRelated($v); } else { @@ -959,8 +1007,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRExplanationOfBenefitStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRExplanationOfBenefitStatus([FHIRExplanationOfBenefitStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRExplanationOfBenefitStatus([FHIRExplanationOfBenefitStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRExplanationOfBenefitStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRExplanationOfBenefitStatus($data[self::FIELD_STATUS])); } @@ -968,6 +1020,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SUB_TYPE])) { if (is_array($data[self::FIELD_SUB_TYPE])) { foreach($data[self::FIELD_SUB_TYPE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addSubType($v); } else { @@ -981,15 +1036,33 @@ public function __construct($data = null) } } if (isset($data[self::FIELD_TOTAL_BENEFIT])) { + $ext = (isset($data[self::FIELD_TOTAL_BENEFIT_EXT]) && is_array($data[self::FIELD_TOTAL_BENEFIT_EXT])) + ? $data[self::FIELD_TOTAL_BENEFIT_EXT] + : null; if ($data[self::FIELD_TOTAL_BENEFIT] instanceof FHIRMoney) { $this->setTotalBenefit($data[self::FIELD_TOTAL_BENEFIT]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TOTAL_BENEFIT])) { + $this->setTotalBenefit(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_TOTAL_BENEFIT]] + $ext)); + } else if (is_array($data[self::FIELD_TOTAL_BENEFIT])) { + $this->setTotalBenefit(new FHIRMoney(array_merge($ext, $data[self::FIELD_TOTAL_BENEFIT]))); + } } else { $this->setTotalBenefit(new FHIRMoney($data[self::FIELD_TOTAL_BENEFIT])); } } if (isset($data[self::FIELD_TOTAL_COST])) { + $ext = (isset($data[self::FIELD_TOTAL_COST_EXT]) && is_array($data[self::FIELD_TOTAL_COST_EXT])) + ? $data[self::FIELD_TOTAL_COST_EXT] + : null; if ($data[self::FIELD_TOTAL_COST] instanceof FHIRMoney) { $this->setTotalCost($data[self::FIELD_TOTAL_COST]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TOTAL_COST])) { + $this->setTotalCost(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_TOTAL_COST]] + $ext)); + } else if (is_array($data[self::FIELD_TOTAL_COST])) { + $this->setTotalCost(new FHIRMoney(array_merge($ext, $data[self::FIELD_TOTAL_COST]))); + } } else { $this->setTotalCost(new FHIRMoney($data[self::FIELD_TOTAL_COST])); } @@ -1002,8 +1075,17 @@ public function __construct($data = null) } } if (isset($data[self::FIELD_UNALLOC_DEDUCTABLE])) { + $ext = (isset($data[self::FIELD_UNALLOC_DEDUCTABLE_EXT]) && is_array($data[self::FIELD_UNALLOC_DEDUCTABLE_EXT])) + ? $data[self::FIELD_UNALLOC_DEDUCTABLE_EXT] + : null; if ($data[self::FIELD_UNALLOC_DEDUCTABLE] instanceof FHIRMoney) { $this->setUnallocDeductable($data[self::FIELD_UNALLOC_DEDUCTABLE]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_UNALLOC_DEDUCTABLE])) { + $this->setUnallocDeductable(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_UNALLOC_DEDUCTABLE]] + $ext)); + } else if (is_array($data[self::FIELD_UNALLOC_DEDUCTABLE])) { + $this->setUnallocDeductable(new FHIRMoney(array_merge($ext, $data[self::FIELD_UNALLOC_DEDUCTABLE]))); + } } else { $this->setUnallocDeductable(new FHIRMoney($data[self::FIELD_UNALLOC_DEDUCTABLE])); } @@ -2803,7 +2885,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getAccident())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ACCIDENT, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getAddItem())) { foreach($vs as $v) { if (null === $v) { @@ -2812,7 +2893,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_ADD_ITEM, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getBenefitBalance())) { foreach($vs as $v) { if (null === $v) { @@ -2821,11 +2901,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_BENEFIT_BALANCE, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getBillablePeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_BILLABLE_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getCareTeam())) { foreach($vs as $v) { if (null === $v) { @@ -2834,18 +2912,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_CARE_TEAM, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getClaim())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CLAIM, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getClaimResponse())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CLAIM_RESPONSE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getCreated())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CREATED, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getDiagnosis())) { foreach($vs as $v) { if (null === $v) { @@ -2857,27 +2932,21 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDisposition())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DISPOSITION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getEmploymentImpacted())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EMPLOYMENT_IMPACTED, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getEnterer())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ENTERER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getFacility())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FACILITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getForm())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FORM, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getHospitalization())) { $v->xmlSerialize($sxe->addChild(self::FIELD_HOSPITALIZATION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -2886,7 +2955,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getInformation())) { foreach($vs as $v) { if (null === $v) { @@ -2895,15 +2963,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_INFORMATION, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getInsurance())) { $v->xmlSerialize($sxe->addChild(self::FIELD_INSURANCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getInsurer())) { $v->xmlSerialize($sxe->addChild(self::FIELD_INSURER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getItem())) { foreach($vs as $v) { if (null === $v) { @@ -2912,38 +2977,30 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_ITEM, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getOrganization())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ORGANIZATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOriginalPrescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ORIGINAL_PRESCRIPTION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOutcome())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OUTCOME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPatient())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATIENT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPayee())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PAYEE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPayment())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PAYMENT, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getPrecedence())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PRECEDENCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPrescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PRESCRIPTION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getProcedure())) { foreach($vs as $v) { if (null === $v) { @@ -2952,7 +3009,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_PROCEDURE, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getProcessNote())) { foreach($vs as $v) { if (null === $v) { @@ -2961,15 +3017,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_PROCESS_NOTE, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getProvider())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PROVIDER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getReferral())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REFERRAL, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getRelated())) { foreach($vs as $v) { if (null === $v) { @@ -2978,11 +3031,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_RELATED, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getSubType())) { foreach($vs as $v) { if (null === $v) { @@ -2991,19 +3042,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_SUB_TYPE, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getTotalBenefit())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TOTAL_BENEFIT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getTotalCost())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TOTAL_COST, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getUnallocDeductable())) { $v->xmlSerialize($sxe->addChild(self::FIELD_UNALLOC_DEDUCTABLE, null, $v->_getFHIRXMLNamespace())); } @@ -3038,15 +3085,29 @@ public function jsonSerialize() $a[self::FIELD_CLAIM_RESPONSE] = $v; } if (null !== ($v = $this->getCreated())) { - $a[self::FIELD_CREATED] = $v->getValue(); - $a[self::FIELD_CREATED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CREATED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CREATED_EXT] = $enc; + } + } else { + $a[self::FIELD_CREATED] = $v; + } } if ([] !== ($vs = $this->getDiagnosis())) { $a[self::FIELD_DIAGNOSIS] = $vs; } if (null !== ($v = $this->getDisposition())) { - $a[self::FIELD_DISPOSITION] = $v->getValue(); - $a[self::FIELD_DISPOSITION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DISPOSITION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DISPOSITION_EXT] = $enc; + } + } else { + $a[self::FIELD_DISPOSITION] = $v; + } } if (null !== ($v = $this->getEmploymentImpacted())) { $a[self::FIELD_EMPLOYMENT_IMPACTED] = $v; @@ -3064,7 +3125,23 @@ public function jsonSerialize() $a[self::FIELD_HOSPITALIZATION] = $v; } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if ([] !== ($vs = $this->getInformation())) { $a[self::FIELD_INFORMATION] = $vs; @@ -3097,8 +3174,15 @@ public function jsonSerialize() $a[self::FIELD_PAYMENT] = $v; } if (null !== ($v = $this->getPrecedence())) { - $a[self::FIELD_PRECEDENCE] = $v->getValue(); - $a[self::FIELD_PRECEDENCE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PRECEDENCE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PRECEDENCE_EXT] = $enc; + } + } else { + $a[self::FIELD_PRECEDENCE] = $v; + } } if (null !== ($v = $this->getPrescription())) { $a[self::FIELD_PRESCRIPTION] = $v; @@ -3119,22 +3203,54 @@ public function jsonSerialize() $a[self::FIELD_RELATED] = $vs; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if ([] !== ($vs = $this->getSubType())) { $a[self::FIELD_SUB_TYPE] = $vs; } if (null !== ($v = $this->getTotalBenefit())) { - $a[self::FIELD_TOTAL_BENEFIT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TOTAL_BENEFIT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TOTAL_BENEFIT_EXT] = $enc; + } + } else { + $a[self::FIELD_TOTAL_BENEFIT] = $v; + } } if (null !== ($v = $this->getTotalCost())) { - $a[self::FIELD_TOTAL_COST] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TOTAL_COST] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TOTAL_COST_EXT] = $enc; + } + } else { + $a[self::FIELD_TOTAL_COST] = $v; + } } if (null !== ($v = $this->getType())) { $a[self::FIELD_TYPE] = $v; } if (null !== ($v = $this->getUnallocDeductable())) { - $a[self::FIELD_UNALLOC_DEDUCTABLE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_UNALLOC_DEDUCTABLE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_UNALLOC_DEDUCTABLE_EXT] = $enc; + } + } else { + $a[self::FIELD_UNALLOC_DEDUCTABLE] = $v; + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRFamilyMemberHistory.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRFamilyMemberHistory.php index 25ef6f9db7..f4187c454c 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRFamilyMemberHistory.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRFamilyMemberHistory.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -93,11 +93,8 @@ class FHIRFamilyMemberHistory extends FHIRDomainResource implements PHPFHIRConta { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_FAMILY_MEMBER_HISTORY; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_AGE_AGE = 'ageAge'; + const FIELD_AGE_AGE_EXT = '_ageAge'; const FIELD_AGE_RANGE = 'ageRange'; const FIELD_AGE_STRING = 'ageString'; const FIELD_AGE_STRING_EXT = '_ageString'; @@ -110,6 +107,7 @@ class FHIRFamilyMemberHistory extends FHIRDomainResource implements PHPFHIRConta const FIELD_DATE = 'date'; const FIELD_DATE_EXT = '_date'; const FIELD_DECEASED_AGE = 'deceasedAge'; + const FIELD_DECEASED_AGE_EXT = '_deceasedAge'; const FIELD_DECEASED_BOOLEAN = 'deceasedBoolean'; const FIELD_DECEASED_BOOLEAN_EXT = '_deceasedBoolean'; const FIELD_DECEASED_DATE = 'deceasedDate'; @@ -446,6 +444,9 @@ class FHIRFamilyMemberHistory extends FHIRDomainResource implements PHPFHIRConta */ protected $status = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRFamilyMemberHistory Constructor * @param null|array $data @@ -463,8 +464,17 @@ public function __construct($data = null) } parent::__construct($data); if (isset($data[self::FIELD_AGE_AGE])) { + $ext = (isset($data[self::FIELD_AGE_AGE_EXT]) && is_array($data[self::FIELD_AGE_AGE_EXT])) + ? $data[self::FIELD_AGE_AGE_EXT] + : null; if ($data[self::FIELD_AGE_AGE] instanceof FHIRAge) { $this->setAgeAge($data[self::FIELD_AGE_AGE]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_AGE_AGE])) { + $this->setAgeAge(new FHIRAge([FHIRAge::FIELD_VALUE => $data[self::FIELD_AGE_AGE]] + $ext)); + } else if (is_array($data[self::FIELD_AGE_AGE])) { + $this->setAgeAge(new FHIRAge(array_merge($ext, $data[self::FIELD_AGE_AGE]))); + } } else { $this->setAgeAge(new FHIRAge($data[self::FIELD_AGE_AGE])); } @@ -482,8 +492,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_AGE_STRING] instanceof FHIRString) { $this->setAgeString($data[self::FIELD_AGE_STRING]); - } elseif ($ext && is_scalar($data[self::FIELD_AGE_STRING])) { - $this->setAgeString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_AGE_STRING]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_AGE_STRING])) { + $this->setAgeString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_AGE_STRING]] + $ext)); + } else if (is_array($data[self::FIELD_AGE_STRING])) { + $this->setAgeString(new FHIRString(array_merge($ext, $data[self::FIELD_AGE_STRING]))); + } } else { $this->setAgeString(new FHIRString($data[self::FIELD_AGE_STRING])); } @@ -494,8 +508,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_BORN_DATE] instanceof FHIRDate) { $this->setBornDate($data[self::FIELD_BORN_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_BORN_DATE])) { - $this->setBornDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_BORN_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_BORN_DATE])) { + $this->setBornDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_BORN_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_BORN_DATE])) { + $this->setBornDate(new FHIRDate(array_merge($ext, $data[self::FIELD_BORN_DATE]))); + } } else { $this->setBornDate(new FHIRDate($data[self::FIELD_BORN_DATE])); } @@ -513,8 +531,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_BORN_STRING] instanceof FHIRString) { $this->setBornString($data[self::FIELD_BORN_STRING]); - } elseif ($ext && is_scalar($data[self::FIELD_BORN_STRING])) { - $this->setBornString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_BORN_STRING]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_BORN_STRING])) { + $this->setBornString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_BORN_STRING]] + $ext)); + } else if (is_array($data[self::FIELD_BORN_STRING])) { + $this->setBornString(new FHIRString(array_merge($ext, $data[self::FIELD_BORN_STRING]))); + } } else { $this->setBornString(new FHIRString($data[self::FIELD_BORN_STRING])); } @@ -522,6 +544,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CONDITION])) { if (is_array($data[self::FIELD_CONDITION])) { foreach($data[self::FIELD_CONDITION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRFamilyMemberHistoryCondition) { $this->addCondition($v); } else { @@ -540,15 +565,28 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATE] instanceof FHIRDateTime) { $this->setDate($data[self::FIELD_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_DATE])) { - $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime(array_merge($ext, $data[self::FIELD_DATE]))); + } } else { $this->setDate(new FHIRDateTime($data[self::FIELD_DATE])); } } if (isset($data[self::FIELD_DECEASED_AGE])) { + $ext = (isset($data[self::FIELD_DECEASED_AGE_EXT]) && is_array($data[self::FIELD_DECEASED_AGE_EXT])) + ? $data[self::FIELD_DECEASED_AGE_EXT] + : null; if ($data[self::FIELD_DECEASED_AGE] instanceof FHIRAge) { $this->setDeceasedAge($data[self::FIELD_DECEASED_AGE]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DECEASED_AGE])) { + $this->setDeceasedAge(new FHIRAge([FHIRAge::FIELD_VALUE => $data[self::FIELD_DECEASED_AGE]] + $ext)); + } else if (is_array($data[self::FIELD_DECEASED_AGE])) { + $this->setDeceasedAge(new FHIRAge(array_merge($ext, $data[self::FIELD_DECEASED_AGE]))); + } } else { $this->setDeceasedAge(new FHIRAge($data[self::FIELD_DECEASED_AGE])); } @@ -559,8 +597,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DECEASED_BOOLEAN] instanceof FHIRBoolean) { $this->setDeceasedBoolean($data[self::FIELD_DECEASED_BOOLEAN]); - } elseif ($ext && is_scalar($data[self::FIELD_DECEASED_BOOLEAN])) { - $this->setDeceasedBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_DECEASED_BOOLEAN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DECEASED_BOOLEAN])) { + $this->setDeceasedBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_DECEASED_BOOLEAN]] + $ext)); + } else if (is_array($data[self::FIELD_DECEASED_BOOLEAN])) { + $this->setDeceasedBoolean(new FHIRBoolean(array_merge($ext, $data[self::FIELD_DECEASED_BOOLEAN]))); + } } else { $this->setDeceasedBoolean(new FHIRBoolean($data[self::FIELD_DECEASED_BOOLEAN])); } @@ -571,8 +613,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DECEASED_DATE] instanceof FHIRDate) { $this->setDeceasedDate($data[self::FIELD_DECEASED_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_DECEASED_DATE])) { - $this->setDeceasedDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_DECEASED_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DECEASED_DATE])) { + $this->setDeceasedDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_DECEASED_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_DECEASED_DATE])) { + $this->setDeceasedDate(new FHIRDate(array_merge($ext, $data[self::FIELD_DECEASED_DATE]))); + } } else { $this->setDeceasedDate(new FHIRDate($data[self::FIELD_DECEASED_DATE])); } @@ -590,8 +636,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DECEASED_STRING] instanceof FHIRString) { $this->setDeceasedString($data[self::FIELD_DECEASED_STRING]); - } elseif ($ext && is_scalar($data[self::FIELD_DECEASED_STRING])) { - $this->setDeceasedString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DECEASED_STRING]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DECEASED_STRING])) { + $this->setDeceasedString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DECEASED_STRING]] + $ext)); + } else if (is_array($data[self::FIELD_DECEASED_STRING])) { + $this->setDeceasedString(new FHIRString(array_merge($ext, $data[self::FIELD_DECEASED_STRING]))); + } } else { $this->setDeceasedString(new FHIRString($data[self::FIELD_DECEASED_STRING])); } @@ -599,6 +649,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_DEFINITION])) { if (is_array($data[self::FIELD_DEFINITION])) { foreach($data[self::FIELD_DEFINITION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addDefinition($v); } else { @@ -617,8 +670,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ESTIMATED_AGE] instanceof FHIRBoolean) { $this->setEstimatedAge($data[self::FIELD_ESTIMATED_AGE]); - } elseif ($ext && is_scalar($data[self::FIELD_ESTIMATED_AGE])) { - $this->setEstimatedAge(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_ESTIMATED_AGE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ESTIMATED_AGE])) { + $this->setEstimatedAge(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_ESTIMATED_AGE]] + $ext)); + } else if (is_array($data[self::FIELD_ESTIMATED_AGE])) { + $this->setEstimatedAge(new FHIRBoolean(array_merge($ext, $data[self::FIELD_ESTIMATED_AGE]))); + } } else { $this->setEstimatedAge(new FHIRBoolean($data[self::FIELD_ESTIMATED_AGE])); } @@ -629,8 +686,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_GENDER] instanceof FHIRAdministrativeGender) { $this->setGender($data[self::FIELD_GENDER]); - } elseif ($ext && is_scalar($data[self::FIELD_GENDER])) { - $this->setGender(new FHIRAdministrativeGender([FHIRAdministrativeGender::FIELD_VALUE => $data[self::FIELD_GENDER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_GENDER])) { + $this->setGender(new FHIRAdministrativeGender([FHIRAdministrativeGender::FIELD_VALUE => $data[self::FIELD_GENDER]] + $ext)); + } else if (is_array($data[self::FIELD_GENDER])) { + $this->setGender(new FHIRAdministrativeGender(array_merge($ext, $data[self::FIELD_GENDER]))); + } } else { $this->setGender(new FHIRAdministrativeGender($data[self::FIELD_GENDER])); } @@ -641,17 +702,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -663,8 +731,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -675,8 +747,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NOT_DONE] instanceof FHIRBoolean) { $this->setNotDone($data[self::FIELD_NOT_DONE]); - } elseif ($ext && is_scalar($data[self::FIELD_NOT_DONE])) { - $this->setNotDone(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_NOT_DONE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NOT_DONE])) { + $this->setNotDone(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_NOT_DONE]] + $ext)); + } else if (is_array($data[self::FIELD_NOT_DONE])) { + $this->setNotDone(new FHIRBoolean(array_merge($ext, $data[self::FIELD_NOT_DONE]))); + } } else { $this->setNotDone(new FHIRBoolean($data[self::FIELD_NOT_DONE])); } @@ -691,6 +767,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_NOTE])) { if (is_array($data[self::FIELD_NOTE])) { foreach($data[self::FIELD_NOTE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRAnnotation) { $this->addNote($v); } else { @@ -713,6 +792,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REASON_CODE])) { if (is_array($data[self::FIELD_REASON_CODE])) { foreach($data[self::FIELD_REASON_CODE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addReasonCode($v); } else { @@ -728,6 +810,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REASON_REFERENCE])) { if (is_array($data[self::FIELD_REASON_REFERENCE])) { foreach($data[self::FIELD_REASON_REFERENCE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addReasonReference($v); } else { @@ -753,8 +838,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRFamilyHistoryStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRFamilyHistoryStatus([FHIRFamilyHistoryStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRFamilyHistoryStatus([FHIRFamilyHistoryStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRFamilyHistoryStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRFamilyHistoryStatus($data[self::FIELD_STATUS])); } @@ -2065,7 +2154,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getAgeAge())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AGE_AGE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getAgeRange())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AGE_RANGE, null, $v->_getFHIRXMLNamespace())); } @@ -2075,14 +2163,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getBornDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_BORN_DATE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getBornPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_BORN_PERIOD, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getBornString())) { $v->xmlSerialize($sxe->addChild(self::FIELD_BORN_STRING, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getCondition())) { foreach($vs as $v) { if (null === $v) { @@ -2094,7 +2180,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DATE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDeceasedAge())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DECEASED_AGE, null, $v->_getFHIRXMLNamespace())); } @@ -2104,14 +2189,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDeceasedDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DECEASED_DATE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDeceasedRange())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DECEASED_RANGE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getDeceasedString())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DECEASED_STRING, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getDefinition())) { foreach($vs as $v) { if (null === $v) { @@ -2123,11 +2206,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getEstimatedAge())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ESTIMATED_AGE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getGender())) { $v->xmlSerialize($sxe->addChild(self::FIELD_GENDER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -2142,11 +2223,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getNotDone())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NOT_DONE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getNotDoneReason())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NOT_DONE_REASON, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getNote())) { foreach($vs as $v) { if (null === $v) { @@ -2155,11 +2234,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_NOTE, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getPatient())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATIENT, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getReasonCode())) { foreach($vs as $v) { if (null === $v) { @@ -2168,7 +2245,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_REASON_CODE, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getReasonReference())) { foreach($vs as $v) { if (null === $v) { @@ -2177,11 +2253,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_REASON_REFERENCE, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getRelationship())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RELATIONSHIP, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } @@ -2195,71 +2269,181 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getAgeAge())) { - $a[self::FIELD_AGE_AGE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_AGE_AGE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_AGE_AGE_EXT] = $enc; + } + } else { + $a[self::FIELD_AGE_AGE] = $v; + } } if (null !== ($v = $this->getAgeRange())) { $a[self::FIELD_AGE_RANGE] = $v; } if (null !== ($v = $this->getAgeString())) { - $a[self::FIELD_AGE_STRING] = $v->getValue(); - $a[self::FIELD_AGE_STRING_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_AGE_STRING] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_AGE_STRING_EXT] = $enc; + } + } else { + $a[self::FIELD_AGE_STRING] = $v; + } } if (null !== ($v = $this->getBornDate())) { - $a[self::FIELD_BORN_DATE] = $v->getValue(); - $a[self::FIELD_BORN_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_BORN_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_BORN_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_BORN_DATE] = $v; + } } if (null !== ($v = $this->getBornPeriod())) { $a[self::FIELD_BORN_PERIOD] = $v; } if (null !== ($v = $this->getBornString())) { - $a[self::FIELD_BORN_STRING] = $v->getValue(); - $a[self::FIELD_BORN_STRING_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_BORN_STRING] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_BORN_STRING_EXT] = $enc; + } + } else { + $a[self::FIELD_BORN_STRING] = $v; + } } if ([] !== ($vs = $this->getCondition())) { $a[self::FIELD_CONDITION] = $vs; } if (null !== ($v = $this->getDate())) { - $a[self::FIELD_DATE] = $v->getValue(); - $a[self::FIELD_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_DATE] = $v; + } } if (null !== ($v = $this->getDeceasedAge())) { - $a[self::FIELD_DECEASED_AGE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DECEASED_AGE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DECEASED_AGE_EXT] = $enc; + } + } else { + $a[self::FIELD_DECEASED_AGE] = $v; + } } if (null !== ($v = $this->getDeceasedBoolean())) { - $a[self::FIELD_DECEASED_BOOLEAN] = $v->getValue(); - $a[self::FIELD_DECEASED_BOOLEAN_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DECEASED_BOOLEAN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DECEASED_BOOLEAN_EXT] = $enc; + } + } else { + $a[self::FIELD_DECEASED_BOOLEAN] = $v; + } } if (null !== ($v = $this->getDeceasedDate())) { - $a[self::FIELD_DECEASED_DATE] = $v->getValue(); - $a[self::FIELD_DECEASED_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DECEASED_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DECEASED_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_DECEASED_DATE] = $v; + } } if (null !== ($v = $this->getDeceasedRange())) { $a[self::FIELD_DECEASED_RANGE] = $v; } if (null !== ($v = $this->getDeceasedString())) { - $a[self::FIELD_DECEASED_STRING] = $v->getValue(); - $a[self::FIELD_DECEASED_STRING_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DECEASED_STRING] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DECEASED_STRING_EXT] = $enc; + } + } else { + $a[self::FIELD_DECEASED_STRING] = $v; + } } if ([] !== ($vs = $this->getDefinition())) { $a[self::FIELD_DEFINITION] = $vs; } if (null !== ($v = $this->getEstimatedAge())) { - $a[self::FIELD_ESTIMATED_AGE] = $v->getValue(); - $a[self::FIELD_ESTIMATED_AGE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ESTIMATED_AGE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ESTIMATED_AGE_EXT] = $enc; + } + } else { + $a[self::FIELD_ESTIMATED_AGE] = $v; + } } if (null !== ($v = $this->getGender())) { - $a[self::FIELD_GENDER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_GENDER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_GENDER_EXT] = $enc; + } + } else { + $a[self::FIELD_GENDER] = $v; + } } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if (null !== ($v = $this->getNotDone())) { - $a[self::FIELD_NOT_DONE] = $v->getValue(); - $a[self::FIELD_NOT_DONE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NOT_DONE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NOT_DONE_EXT] = $enc; + } + } else { + $a[self::FIELD_NOT_DONE] = $v; + } } if (null !== ($v = $this->getNotDoneReason())) { $a[self::FIELD_NOT_DONE_REASON] = $v; @@ -2280,7 +2464,15 @@ public function jsonSerialize() $a[self::FIELD_RELATIONSHIP] = $v; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRFlag.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRFlag.php index d898519aaa..27b266cb1d 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRFlag.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRFlag.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -83,10 +83,6 @@ class FHIRFlag extends FHIRDomainResource implements PHPFHIRContainedTypeInterfa { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_FLAG; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_AUTHOR = 'author'; const FIELD_CATEGORY = 'category'; const FIELD_CODE = 'code'; @@ -192,6 +188,9 @@ class FHIRFlag extends FHIRDomainResource implements PHPFHIRContainedTypeInterfa */ protected $subject = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRFlag Constructor * @param null|array $data @@ -242,17 +241,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -271,8 +277,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRFlagStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRFlagStatus([FHIRFlagStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRFlagStatus([FHIRFlagStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRFlagStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRFlagStatus($data[self::FIELD_STATUS])); } @@ -701,19 +711,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getAuthor())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AUTHOR, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getCategory())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CATEGORY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getEncounter())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ENCOUNTER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -722,15 +728,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSubject())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBJECT, null, $v->_getFHIRXMLNamespace())); } @@ -756,13 +759,37 @@ public function jsonSerialize() $a[self::FIELD_ENCOUNTER] = $v; } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if (null !== ($v = $this->getPeriod())) { $a[self::FIELD_PERIOD] = $v; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getSubject())) { $a[self::FIELD_SUBJECT] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRGoal.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRGoal.php index c41ca03fb7..c62e22bded 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRGoal.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRGoal.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -88,10 +88,6 @@ class FHIRGoal extends FHIRDomainResource implements PHPFHIRContainedTypeInterfa { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_GOAL; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ADDRESSES = 'addresses'; const FIELD_CATEGORY = 'category'; const FIELD_DESCRIPTION = 'description'; @@ -307,6 +303,9 @@ class FHIRGoal extends FHIRDomainResource implements PHPFHIRContainedTypeInterfa */ protected $target = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRGoal Constructor * @param null|array $data @@ -326,6 +325,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ADDRESSES])) { if (is_array($data[self::FIELD_ADDRESSES])) { foreach($data[self::FIELD_ADDRESSES] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addAddresses($v); } else { @@ -341,6 +343,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CATEGORY])) { if (is_array($data[self::FIELD_CATEGORY])) { foreach($data[self::FIELD_CATEGORY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addCategory($v); } else { @@ -373,17 +378,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -392,6 +404,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_NOTE])) { if (is_array($data[self::FIELD_NOTE])) { foreach($data[self::FIELD_NOTE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRAnnotation) { $this->addNote($v); } else { @@ -407,6 +422,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_OUTCOME_CODE])) { if (is_array($data[self::FIELD_OUTCOME_CODE])) { foreach($data[self::FIELD_OUTCOME_CODE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addOutcomeCode($v); } else { @@ -422,6 +440,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_OUTCOME_REFERENCE])) { if (is_array($data[self::FIELD_OUTCOME_REFERENCE])) { foreach($data[self::FIELD_OUTCOME_REFERENCE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addOutcomeReference($v); } else { @@ -454,8 +475,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_START_DATE] instanceof FHIRDate) { $this->setStartDate($data[self::FIELD_START_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_START_DATE])) { - $this->setStartDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_START_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_START_DATE])) { + $this->setStartDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_START_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_START_DATE])) { + $this->setStartDate(new FHIRDate(array_merge($ext, $data[self::FIELD_START_DATE]))); + } } else { $this->setStartDate(new FHIRDate($data[self::FIELD_START_DATE])); } @@ -466,8 +491,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRGoalStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRGoalStatus([FHIRGoalStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRGoalStatus([FHIRGoalStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRGoalStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRGoalStatus($data[self::FIELD_STATUS])); } @@ -478,8 +507,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS_DATE] instanceof FHIRDate) { $this->setStatusDate($data[self::FIELD_STATUS_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS_DATE])) { - $this->setStatusDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_STATUS_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS_DATE])) { + $this->setStatusDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_STATUS_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS_DATE])) { + $this->setStatusDate(new FHIRDate(array_merge($ext, $data[self::FIELD_STATUS_DATE]))); + } } else { $this->setStatusDate(new FHIRDate($data[self::FIELD_STATUS_DATE])); } @@ -490,8 +523,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS_REASON] instanceof FHIRString) { $this->setStatusReason($data[self::FIELD_STATUS_REASON]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS_REASON])) { - $this->setStatusReason(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_STATUS_REASON]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS_REASON])) { + $this->setStatusReason(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_STATUS_REASON]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS_REASON])) { + $this->setStatusReason(new FHIRString(array_merge($ext, $data[self::FIELD_STATUS_REASON]))); + } } else { $this->setStatusReason(new FHIRString($data[self::FIELD_STATUS_REASON])); } @@ -1399,7 +1436,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_ADDRESSES, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getCategory())) { foreach($vs as $v) { if (null === $v) { @@ -1408,15 +1444,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_CATEGORY, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getDescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESCRIPTION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getExpressedBy())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EXPRESSED_BY, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -1425,7 +1458,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getNote())) { foreach($vs as $v) { if (null === $v) { @@ -1434,7 +1466,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_NOTE, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getOutcomeCode())) { foreach($vs as $v) { if (null === $v) { @@ -1443,7 +1474,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_OUTCOME_CODE, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getOutcomeReference())) { foreach($vs as $v) { if (null === $v) { @@ -1452,18 +1482,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_OUTCOME_REFERENCE, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getPriority())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PRIORITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStartCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_START_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getStartDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_START_DATE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } @@ -1473,11 +1500,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getStatusReason())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS_REASON, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSubject())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBJECT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getTarget())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TARGET, null, $v->_getFHIRXMLNamespace())); } @@ -1503,7 +1528,23 @@ public function jsonSerialize() $a[self::FIELD_EXPRESSED_BY] = $v; } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if ([] !== ($vs = $this->getNote())) { $a[self::FIELD_NOTE] = $vs; @@ -1521,19 +1562,48 @@ public function jsonSerialize() $a[self::FIELD_START_CODEABLE_CONCEPT] = $v; } if (null !== ($v = $this->getStartDate())) { - $a[self::FIELD_START_DATE] = $v->getValue(); - $a[self::FIELD_START_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_START_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_START_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_START_DATE] = $v; + } } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getStatusDate())) { - $a[self::FIELD_STATUS_DATE] = $v->getValue(); - $a[self::FIELD_STATUS_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS_DATE] = $v; + } } if (null !== ($v = $this->getStatusReason())) { - $a[self::FIELD_STATUS_REASON] = $v->getValue(); - $a[self::FIELD_STATUS_REASON_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS_REASON] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_REASON_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS_REASON] = $v; + } } if (null !== ($v = $this->getSubject())) { $a[self::FIELD_SUBJECT] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRGraphDefinition.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRGraphDefinition.php index 4d4201fc54..f930b9e8d4 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRGraphDefinition.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRGraphDefinition.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -91,10 +91,6 @@ class FHIRGraphDefinition extends FHIRDomainResource implements PHPFHIRContained { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_GRAPH_DEFINITION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CONTACT = 'contact'; const FIELD_DATE = 'date'; const FIELD_DATE_EXT = '_date'; @@ -325,6 +321,9 @@ class FHIRGraphDefinition extends FHIRDomainResource implements PHPFHIRContained */ protected $version = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRGraphDefinition Constructor * @param null|array $data @@ -344,6 +343,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CONTACT])) { if (is_array($data[self::FIELD_CONTACT])) { foreach($data[self::FIELD_CONTACT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContactDetail) { $this->addContact($v); } else { @@ -362,8 +364,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATE] instanceof FHIRDateTime) { $this->setDate($data[self::FIELD_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_DATE])) { - $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime(array_merge($ext, $data[self::FIELD_DATE]))); + } } else { $this->setDate(new FHIRDateTime($data[self::FIELD_DATE])); } @@ -374,8 +380,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRMarkdown) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRMarkdown($data[self::FIELD_DESCRIPTION])); } @@ -386,8 +396,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EXPERIMENTAL] instanceof FHIRBoolean) { $this->setExperimental($data[self::FIELD_EXPERIMENTAL]); - } elseif ($ext && is_scalar($data[self::FIELD_EXPERIMENTAL])) { - $this->setExperimental(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_EXPERIMENTAL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EXPERIMENTAL])) { + $this->setExperimental(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_EXPERIMENTAL]] + $ext)); + } else if (is_array($data[self::FIELD_EXPERIMENTAL])) { + $this->setExperimental(new FHIRBoolean(array_merge($ext, $data[self::FIELD_EXPERIMENTAL]))); + } } else { $this->setExperimental(new FHIRBoolean($data[self::FIELD_EXPERIMENTAL])); } @@ -395,6 +409,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_JURISDICTION])) { if (is_array($data[self::FIELD_JURISDICTION])) { foreach($data[self::FIELD_JURISDICTION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addJurisdiction($v); } else { @@ -410,6 +427,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_LINK])) { if (is_array($data[self::FIELD_LINK])) { foreach($data[self::FIELD_LINK] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRGraphDefinitionLink) { $this->addLink($v); } else { @@ -428,8 +448,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -440,8 +464,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PROFILE] instanceof FHIRUri) { $this->setProfile($data[self::FIELD_PROFILE]); - } elseif ($ext && is_scalar($data[self::FIELD_PROFILE])) { - $this->setProfile(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_PROFILE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PROFILE])) { + $this->setProfile(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_PROFILE]] + $ext)); + } else if (is_array($data[self::FIELD_PROFILE])) { + $this->setProfile(new FHIRUri(array_merge($ext, $data[self::FIELD_PROFILE]))); + } } else { $this->setProfile(new FHIRUri($data[self::FIELD_PROFILE])); } @@ -452,8 +480,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PUBLISHER] instanceof FHIRString) { $this->setPublisher($data[self::FIELD_PUBLISHER]); - } elseif ($ext && is_scalar($data[self::FIELD_PUBLISHER])) { - $this->setPublisher(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PUBLISHER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PUBLISHER])) { + $this->setPublisher(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PUBLISHER]] + $ext)); + } else if (is_array($data[self::FIELD_PUBLISHER])) { + $this->setPublisher(new FHIRString(array_merge($ext, $data[self::FIELD_PUBLISHER]))); + } } else { $this->setPublisher(new FHIRString($data[self::FIELD_PUBLISHER])); } @@ -464,8 +496,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PURPOSE] instanceof FHIRMarkdown) { $this->setPurpose($data[self::FIELD_PURPOSE]); - } elseif ($ext && is_scalar($data[self::FIELD_PURPOSE])) { - $this->setPurpose(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_PURPOSE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PURPOSE])) { + $this->setPurpose(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_PURPOSE]] + $ext)); + } else if (is_array($data[self::FIELD_PURPOSE])) { + $this->setPurpose(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_PURPOSE]))); + } } else { $this->setPurpose(new FHIRMarkdown($data[self::FIELD_PURPOSE])); } @@ -479,8 +515,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRPublicationStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRPublicationStatus([FHIRPublicationStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRPublicationStatus([FHIRPublicationStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRPublicationStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRPublicationStatus($data[self::FIELD_STATUS])); } @@ -491,8 +531,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_URL] instanceof FHIRUri) { $this->setUrl($data[self::FIELD_URL]); - } elseif ($ext && is_scalar($data[self::FIELD_URL])) { - $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } else if (is_array($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri(array_merge($ext, $data[self::FIELD_URL]))); + } } else { $this->setUrl(new FHIRUri($data[self::FIELD_URL])); } @@ -500,6 +544,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_USE_CONTEXT])) { if (is_array($data[self::FIELD_USE_CONTEXT])) { foreach($data[self::FIELD_USE_CONTEXT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRUsageContext) { $this->addUseContext($v); } else { @@ -518,8 +565,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VERSION] instanceof FHIRString) { $this->setVersion($data[self::FIELD_VERSION]); - } elseif ($ext && is_scalar($data[self::FIELD_VERSION])) { - $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } else if (is_array($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString(array_merge($ext, $data[self::FIELD_VERSION]))); + } } else { $this->setVersion(new FHIRString($data[self::FIELD_VERSION])); } @@ -1454,7 +1505,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getExperimental())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EXPERIMENTAL, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getJurisdiction())) { foreach($vs as $v) { if (null === $v) { @@ -1463,7 +1513,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_JURISDICTION, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getLink())) { foreach($vs as $v) { if (null === $v) { @@ -1483,18 +1532,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 } if (null !== ($v = $this->getPurpose())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PURPOSE, null, $v->_getFHIRXMLNamespace())); - } - if (null !== ($v = $this->getStart())) { + } if (null !== ($v = $this->getStart())) { $sxe->addAttribute(self::FIELD_START, (string)$v); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getUrl())) { $v->xmlSerialize($sxe->addChild(self::FIELD_URL, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getUseContext())) { foreach($vs as $v) { if (null === $v) { @@ -1519,16 +1565,37 @@ public function jsonSerialize() $a[self::FIELD_CONTACT] = $vs; } if (null !== ($v = $this->getDate())) { - $a[self::FIELD_DATE] = $v->getValue(); - $a[self::FIELD_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_DATE] = $v; + } } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if (null !== ($v = $this->getExperimental())) { - $a[self::FIELD_EXPERIMENTAL] = $v->getValue(); - $a[self::FIELD_EXPERIMENTAL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EXPERIMENTAL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EXPERIMENTAL_EXT] = $enc; + } + } else { + $a[self::FIELD_EXPERIMENTAL] = $v; + } } if ([] !== ($vs = $this->getJurisdiction())) { $a[self::FIELD_JURISDICTION] = $vs; @@ -1537,37 +1604,87 @@ public function jsonSerialize() $a[self::FIELD_LINK] = $vs; } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if (null !== ($v = $this->getProfile())) { - $a[self::FIELD_PROFILE] = $v->getValue(); - $a[self::FIELD_PROFILE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PROFILE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PROFILE_EXT] = $enc; + } + } else { + $a[self::FIELD_PROFILE] = $v; + } } if (null !== ($v = $this->getPublisher())) { - $a[self::FIELD_PUBLISHER] = $v->getValue(); - $a[self::FIELD_PUBLISHER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PUBLISHER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PUBLISHER_EXT] = $enc; + } + } else { + $a[self::FIELD_PUBLISHER] = $v; + } } if (null !== ($v = $this->getPurpose())) { - $a[self::FIELD_PURPOSE] = $v->getValue(); - $a[self::FIELD_PURPOSE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PURPOSE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PURPOSE_EXT] = $enc; + } + } else { + $a[self::FIELD_PURPOSE] = $v; + } } if (null !== ($v = $this->getStart())) { $a[self::FIELD_START] = $v; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getUrl())) { - $a[self::FIELD_URL] = $v->getValue(); - $a[self::FIELD_URL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_URL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_URL_EXT] = $enc; + } + } else { + $a[self::FIELD_URL] = $v; + } } if ([] !== ($vs = $this->getUseContext())) { $a[self::FIELD_USE_CONTEXT] = $vs; } if (null !== ($v = $this->getVersion())) { - $a[self::FIELD_VERSION] = $v->getValue(); - $a[self::FIELD_VERSION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VERSION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VERSION_EXT] = $enc; + } + } else { + $a[self::FIELD_VERSION] = $v; + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRGroup.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRGroup.php index 44c34c5635..881b16e99c 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRGroup.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRGroup.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -88,10 +88,6 @@ class FHIRGroup extends FHIRDomainResource implements PHPFHIRContainedTypeInterf { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_GROUP; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ACTIVE = 'active'; const FIELD_ACTIVE_EXT = '_active'; const FIELD_ACTUAL = 'actual'; @@ -208,6 +204,9 @@ class FHIRGroup extends FHIRDomainResource implements PHPFHIRContainedTypeInterf */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRGroup Constructor * @param null|array $data @@ -230,8 +229,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ACTIVE] instanceof FHIRBoolean) { $this->setActive($data[self::FIELD_ACTIVE]); - } elseif ($ext && is_scalar($data[self::FIELD_ACTIVE])) { - $this->setActive(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_ACTIVE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ACTIVE])) { + $this->setActive(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_ACTIVE]] + $ext)); + } else if (is_array($data[self::FIELD_ACTIVE])) { + $this->setActive(new FHIRBoolean(array_merge($ext, $data[self::FIELD_ACTIVE]))); + } } else { $this->setActive(new FHIRBoolean($data[self::FIELD_ACTIVE])); } @@ -242,8 +245,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ACTUAL] instanceof FHIRBoolean) { $this->setActual($data[self::FIELD_ACTUAL]); - } elseif ($ext && is_scalar($data[self::FIELD_ACTUAL])) { - $this->setActual(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_ACTUAL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ACTUAL])) { + $this->setActual(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_ACTUAL]] + $ext)); + } else if (is_array($data[self::FIELD_ACTUAL])) { + $this->setActual(new FHIRBoolean(array_merge($ext, $data[self::FIELD_ACTUAL]))); + } } else { $this->setActual(new FHIRBoolean($data[self::FIELD_ACTUAL])); } @@ -251,6 +258,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CHARACTERISTIC])) { if (is_array($data[self::FIELD_CHARACTERISTIC])) { foreach($data[self::FIELD_CHARACTERISTIC] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRGroupCharacteristic) { $this->addCharacteristic($v); } else { @@ -276,17 +286,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -295,6 +312,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_MEMBER])) { if (is_array($data[self::FIELD_MEMBER])) { foreach($data[self::FIELD_MEMBER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRGroupMember) { $this->addMember($v); } else { @@ -313,8 +333,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -325,8 +349,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_QUANTITY] instanceof FHIRUnsignedInt) { $this->setQuantity($data[self::FIELD_QUANTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_QUANTITY])) { - $this->setQuantity(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_QUANTITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_QUANTITY])) { + $this->setQuantity(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_QUANTITY])) { + $this->setQuantity(new FHIRUnsignedInt(array_merge($ext, $data[self::FIELD_QUANTITY]))); + } } else { $this->setQuantity(new FHIRUnsignedInt($data[self::FIELD_QUANTITY])); } @@ -337,8 +365,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TYPE] instanceof FHIRGroupType) { $this->setType($data[self::FIELD_TYPE]); - } elseif ($ext && is_scalar($data[self::FIELD_TYPE])) { - $this->setType(new FHIRGroupType([FHIRGroupType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TYPE])) { + $this->setType(new FHIRGroupType([FHIRGroupType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } else if (is_array($data[self::FIELD_TYPE])) { + $this->setType(new FHIRGroupType(array_merge($ext, $data[self::FIELD_TYPE]))); + } } else { $this->setType(new FHIRGroupType($data[self::FIELD_TYPE])); } @@ -879,13 +911,13 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getActive())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ACTIVE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getActual())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ACTUAL, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getCharacteristic())) { foreach($vs as $v) { if (null === $v) { @@ -894,11 +926,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_CHARACTERISTIC, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -907,7 +937,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getMember())) { foreach($vs as $v) { if (null === $v) { @@ -922,7 +951,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_QUANTITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -936,12 +964,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getActive())) { - $a[self::FIELD_ACTIVE] = $v->getValue(); - $a[self::FIELD_ACTIVE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ACTIVE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ACTIVE_EXT] = $enc; + } + } else { + $a[self::FIELD_ACTIVE] = $v; + } } if (null !== ($v = $this->getActual())) { - $a[self::FIELD_ACTUAL] = $v->getValue(); - $a[self::FIELD_ACTUAL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ACTUAL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ACTUAL_EXT] = $enc; + } + } else { + $a[self::FIELD_ACTUAL] = $v; + } } if ([] !== ($vs = $this->getCharacteristic())) { $a[self::FIELD_CHARACTERISTIC] = $vs; @@ -950,21 +992,59 @@ public function jsonSerialize() $a[self::FIELD_CODE] = $v; } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if ([] !== ($vs = $this->getMember())) { $a[self::FIELD_MEMBER] = $vs; } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if (null !== ($v = $this->getQuantity())) { - $a[self::FIELD_QUANTITY] = $v->getValue(); - $a[self::FIELD_QUANTITY_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_QUANTITY] = $v; + } } if (null !== ($v = $this->getType())) { - $a[self::FIELD_TYPE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TYPE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TYPE_EXT] = $enc; + } + } else { + $a[self::FIELD_TYPE] = $v; + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRGuidanceResponse.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRGuidanceResponse.php index 9c5b31f8dd..3f50f3eef4 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRGuidanceResponse.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRGuidanceResponse.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -88,10 +88,6 @@ class FHIRGuidanceResponse extends FHIRDomainResource implements PHPFHIRContaine { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_GUIDANCE_RESPONSE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CONTEXT = 'context'; const FIELD_DATA_REQUIREMENT = 'dataRequirement'; const FIELD_EVALUATION_MESSAGE = 'evaluationMessage'; @@ -310,6 +306,9 @@ class FHIRGuidanceResponse extends FHIRDomainResource implements PHPFHIRContaine */ protected $subject = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRGuidanceResponse Constructor * @param null|array $data @@ -336,6 +335,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_DATA_REQUIREMENT])) { if (is_array($data[self::FIELD_DATA_REQUIREMENT])) { foreach($data[self::FIELD_DATA_REQUIREMENT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRDataRequirement) { $this->addDataRequirement($v); } else { @@ -351,6 +353,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_EVALUATION_MESSAGE])) { if (is_array($data[self::FIELD_EVALUATION_MESSAGE])) { foreach($data[self::FIELD_EVALUATION_MESSAGE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addEvaluationMessage($v); } else { @@ -369,8 +374,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->setIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { - $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_IDENTIFIER]))); + } } else { $this->setIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); } @@ -385,6 +394,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_NOTE])) { if (is_array($data[self::FIELD_NOTE])) { foreach($data[self::FIELD_NOTE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRAnnotation) { $this->addNote($v); } else { @@ -403,8 +415,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_OCCURRENCE_DATE_TIME] instanceof FHIRDateTime) { $this->setOccurrenceDateTime($data[self::FIELD_OCCURRENCE_DATE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_OCCURRENCE_DATE_TIME])) { - $this->setOccurrenceDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_OCCURRENCE_DATE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_OCCURRENCE_DATE_TIME])) { + $this->setOccurrenceDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_OCCURRENCE_DATE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_OCCURRENCE_DATE_TIME])) { + $this->setOccurrenceDateTime(new FHIRDateTime(array_merge($ext, $data[self::FIELD_OCCURRENCE_DATE_TIME]))); + } } else { $this->setOccurrenceDateTime(new FHIRDateTime($data[self::FIELD_OCCURRENCE_DATE_TIME])); } @@ -443,8 +459,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_REQUEST_ID] instanceof FHIRId) { $this->setRequestId($data[self::FIELD_REQUEST_ID]); - } elseif ($ext && is_scalar($data[self::FIELD_REQUEST_ID])) { - $this->setRequestId(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_REQUEST_ID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_REQUEST_ID])) { + $this->setRequestId(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_REQUEST_ID]] + $ext)); + } else if (is_array($data[self::FIELD_REQUEST_ID])) { + $this->setRequestId(new FHIRId(array_merge($ext, $data[self::FIELD_REQUEST_ID]))); + } } else { $this->setRequestId(new FHIRId($data[self::FIELD_REQUEST_ID])); } @@ -462,8 +482,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRGuidanceResponseStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRGuidanceResponseStatus([FHIRGuidanceResponseStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRGuidanceResponseStatus([FHIRGuidanceResponseStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRGuidanceResponseStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRGuidanceResponseStatus($data[self::FIELD_STATUS])); } @@ -1262,7 +1286,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getContext())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CONTEXT, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getDataRequirement())) { foreach($vs as $v) { if (null === $v) { @@ -1271,7 +1294,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_DATA_REQUIREMENT, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getEvaluationMessage())) { foreach($vs as $v) { if (null === $v) { @@ -1280,15 +1302,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_EVALUATION_MESSAGE, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getModule())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MODULE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getNote())) { foreach($vs as $v) { if (null === $v) { @@ -1300,34 +1319,27 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getOccurrenceDateTime())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OCCURRENCE_DATE_TIME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOutputParameters())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OUTPUT_PARAMETERS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPerformer())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PERFORMER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getReasonCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REASON_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getReasonReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REASON_REFERENCE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getRequestId())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REQUEST_ID, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getResult())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RESULT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSubject())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBJECT, null, $v->_getFHIRXMLNamespace())); } @@ -1350,7 +1362,15 @@ public function jsonSerialize() $a[self::FIELD_EVALUATION_MESSAGE] = $vs; } if (null !== ($v = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_IDENTIFIER] = $v; + } } if (null !== ($v = $this->getModule())) { $a[self::FIELD_MODULE] = $v; @@ -1359,8 +1379,15 @@ public function jsonSerialize() $a[self::FIELD_NOTE] = $vs; } if (null !== ($v = $this->getOccurrenceDateTime())) { - $a[self::FIELD_OCCURRENCE_DATE_TIME] = $v->getValue(); - $a[self::FIELD_OCCURRENCE_DATE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_OCCURRENCE_DATE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_OCCURRENCE_DATE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_OCCURRENCE_DATE_TIME] = $v; + } } if (null !== ($v = $this->getOutputParameters())) { $a[self::FIELD_OUTPUT_PARAMETERS] = $v; @@ -1375,14 +1402,29 @@ public function jsonSerialize() $a[self::FIELD_REASON_REFERENCE] = $v; } if (null !== ($v = $this->getRequestId())) { - $a[self::FIELD_REQUEST_ID] = $v->getValue(); - $a[self::FIELD_REQUEST_ID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_REQUEST_ID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_REQUEST_ID_EXT] = $enc; + } + } else { + $a[self::FIELD_REQUEST_ID] = $v; + } } if (null !== ($v = $this->getResult())) { $a[self::FIELD_RESULT] = $v; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getSubject())) { $a[self::FIELD_SUBJECT] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRHealthcareService.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRHealthcareService.php index 192c3f739b..ca837b5b64 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRHealthcareService.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRHealthcareService.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -87,10 +87,6 @@ class FHIRHealthcareService extends FHIRDomainResource implements PHPFHIRContain { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_HEALTHCARE_SERVICE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ACTIVE = 'active'; const FIELD_ACTIVE_EXT = '_active'; const FIELD_APPOINTMENT_REQUIRED = 'appointmentRequired'; @@ -407,6 +403,9 @@ class FHIRHealthcareService extends FHIRDomainResource implements PHPFHIRContain */ protected $type = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRHealthcareService Constructor * @param null|array $data @@ -429,8 +428,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ACTIVE] instanceof FHIRBoolean) { $this->setActive($data[self::FIELD_ACTIVE]); - } elseif ($ext && is_scalar($data[self::FIELD_ACTIVE])) { - $this->setActive(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_ACTIVE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ACTIVE])) { + $this->setActive(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_ACTIVE]] + $ext)); + } else if (is_array($data[self::FIELD_ACTIVE])) { + $this->setActive(new FHIRBoolean(array_merge($ext, $data[self::FIELD_ACTIVE]))); + } } else { $this->setActive(new FHIRBoolean($data[self::FIELD_ACTIVE])); } @@ -441,8 +444,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_APPOINTMENT_REQUIRED] instanceof FHIRBoolean) { $this->setAppointmentRequired($data[self::FIELD_APPOINTMENT_REQUIRED]); - } elseif ($ext && is_scalar($data[self::FIELD_APPOINTMENT_REQUIRED])) { - $this->setAppointmentRequired(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_APPOINTMENT_REQUIRED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_APPOINTMENT_REQUIRED])) { + $this->setAppointmentRequired(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_APPOINTMENT_REQUIRED]] + $ext)); + } else if (is_array($data[self::FIELD_APPOINTMENT_REQUIRED])) { + $this->setAppointmentRequired(new FHIRBoolean(array_merge($ext, $data[self::FIELD_APPOINTMENT_REQUIRED]))); + } } else { $this->setAppointmentRequired(new FHIRBoolean($data[self::FIELD_APPOINTMENT_REQUIRED])); } @@ -453,8 +460,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_AVAILABILITY_EXCEPTIONS] instanceof FHIRString) { $this->setAvailabilityExceptions($data[self::FIELD_AVAILABILITY_EXCEPTIONS]); - } elseif ($ext && is_scalar($data[self::FIELD_AVAILABILITY_EXCEPTIONS])) { - $this->setAvailabilityExceptions(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_AVAILABILITY_EXCEPTIONS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_AVAILABILITY_EXCEPTIONS])) { + $this->setAvailabilityExceptions(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_AVAILABILITY_EXCEPTIONS]] + $ext)); + } else if (is_array($data[self::FIELD_AVAILABILITY_EXCEPTIONS])) { + $this->setAvailabilityExceptions(new FHIRString(array_merge($ext, $data[self::FIELD_AVAILABILITY_EXCEPTIONS]))); + } } else { $this->setAvailabilityExceptions(new FHIRString($data[self::FIELD_AVAILABILITY_EXCEPTIONS])); } @@ -462,6 +473,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_AVAILABLE_TIME])) { if (is_array($data[self::FIELD_AVAILABLE_TIME])) { foreach($data[self::FIELD_AVAILABLE_TIME] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRHealthcareServiceAvailableTime) { $this->addAvailableTime($v); } else { @@ -484,6 +498,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CHARACTERISTIC])) { if (is_array($data[self::FIELD_CHARACTERISTIC])) { foreach($data[self::FIELD_CHARACTERISTIC] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addCharacteristic($v); } else { @@ -502,8 +519,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_COMMENT] instanceof FHIRString) { $this->setComment($data[self::FIELD_COMMENT]); - } elseif ($ext && is_scalar($data[self::FIELD_COMMENT])) { - $this->setComment(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_COMMENT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_COMMENT])) { + $this->setComment(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_COMMENT]] + $ext)); + } else if (is_array($data[self::FIELD_COMMENT])) { + $this->setComment(new FHIRString(array_merge($ext, $data[self::FIELD_COMMENT]))); + } } else { $this->setComment(new FHIRString($data[self::FIELD_COMMENT])); } @@ -511,6 +532,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_COVERAGE_AREA])) { if (is_array($data[self::FIELD_COVERAGE_AREA])) { foreach($data[self::FIELD_COVERAGE_AREA] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addCoverageArea($v); } else { @@ -536,8 +560,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ELIGIBILITY_NOTE] instanceof FHIRString) { $this->setEligibilityNote($data[self::FIELD_ELIGIBILITY_NOTE]); - } elseif ($ext && is_scalar($data[self::FIELD_ELIGIBILITY_NOTE])) { - $this->setEligibilityNote(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_ELIGIBILITY_NOTE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ELIGIBILITY_NOTE])) { + $this->setEligibilityNote(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_ELIGIBILITY_NOTE]] + $ext)); + } else if (is_array($data[self::FIELD_ELIGIBILITY_NOTE])) { + $this->setEligibilityNote(new FHIRString(array_merge($ext, $data[self::FIELD_ELIGIBILITY_NOTE]))); + } } else { $this->setEligibilityNote(new FHIRString($data[self::FIELD_ELIGIBILITY_NOTE])); } @@ -545,6 +573,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ENDPOINT])) { if (is_array($data[self::FIELD_ENDPOINT])) { foreach($data[self::FIELD_ENDPOINT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addEndpoint($v); } else { @@ -563,8 +594,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EXTRA_DETAILS] instanceof FHIRString) { $this->setExtraDetails($data[self::FIELD_EXTRA_DETAILS]); - } elseif ($ext && is_scalar($data[self::FIELD_EXTRA_DETAILS])) { - $this->setExtraDetails(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_EXTRA_DETAILS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EXTRA_DETAILS])) { + $this->setExtraDetails(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_EXTRA_DETAILS]] + $ext)); + } else if (is_array($data[self::FIELD_EXTRA_DETAILS])) { + $this->setExtraDetails(new FHIRString(array_merge($ext, $data[self::FIELD_EXTRA_DETAILS]))); + } } else { $this->setExtraDetails(new FHIRString($data[self::FIELD_EXTRA_DETAILS])); } @@ -575,17 +610,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -594,6 +636,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_LOCATION])) { if (is_array($data[self::FIELD_LOCATION])) { foreach($data[self::FIELD_LOCATION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addLocation($v); } else { @@ -612,8 +657,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -621,6 +670,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_NOT_AVAILABLE])) { if (is_array($data[self::FIELD_NOT_AVAILABLE])) { foreach($data[self::FIELD_NOT_AVAILABLE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRHealthcareServiceNotAvailable) { $this->addNotAvailable($v); } else { @@ -646,17 +698,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_PROGRAM_NAME])) { foreach($data[self::FIELD_PROGRAM_NAME] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRString) { $this->addProgramName($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addProgramName(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addProgramName(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addProgramName(new FHIRString(array_merge($v, $ext[$i]))); + } } else { $this->addProgramName(new FHIRString($v)); } } } elseif ($data[self::FIELD_PROGRAM_NAME] instanceof FHIRString) { $this->addProgramName($data[self::FIELD_PROGRAM_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_PROGRAM_NAME])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_PROGRAM_NAME])) { $this->addProgramName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PROGRAM_NAME]] + $ext)); } else { $this->addProgramName(new FHIRString($data[self::FIELD_PROGRAM_NAME])); @@ -672,6 +731,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REFERRAL_METHOD])) { if (is_array($data[self::FIELD_REFERRAL_METHOD])) { foreach($data[self::FIELD_REFERRAL_METHOD] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addReferralMethod($v); } else { @@ -687,6 +749,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SERVICE_PROVISION_CODE])) { if (is_array($data[self::FIELD_SERVICE_PROVISION_CODE])) { foreach($data[self::FIELD_SERVICE_PROVISION_CODE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addServiceProvisionCode($v); } else { @@ -702,6 +767,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SPECIALTY])) { if (is_array($data[self::FIELD_SPECIALTY])) { foreach($data[self::FIELD_SPECIALTY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addSpecialty($v); } else { @@ -720,17 +788,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_TELECOM])) { foreach($data[self::FIELD_TELECOM] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContactPoint) { $this->addTelecom($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addTelecom(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addTelecom(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addTelecom(new FHIRContactPoint(array_merge($v, $ext[$i]))); + } } else { $this->addTelecom(new FHIRContactPoint($v)); } } } elseif ($data[self::FIELD_TELECOM] instanceof FHIRContactPoint) { $this->addTelecom($data[self::FIELD_TELECOM]); - } elseif ($ext && is_scalar($data[self::FIELD_TELECOM])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_TELECOM])) { $this->addTelecom(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $data[self::FIELD_TELECOM]] + $ext)); } else { $this->addTelecom(new FHIRContactPoint($data[self::FIELD_TELECOM])); @@ -739,6 +814,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_TYPE])) { if (is_array($data[self::FIELD_TYPE])) { foreach($data[self::FIELD_TYPE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addType($v); } else { @@ -2146,6 +2224,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getActive())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ACTIVE, null, $v->_getFHIRXMLNamespace())); } @@ -2155,7 +2234,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getAvailabilityExceptions())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AVAILABILITY_EXCEPTIONS, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getAvailableTime())) { foreach($vs as $v) { if (null === $v) { @@ -2164,11 +2242,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_AVAILABLE_TIME, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getCategory())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CATEGORY, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getCharacteristic())) { foreach($vs as $v) { if (null === $v) { @@ -2180,7 +2256,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getComment())) { $v->xmlSerialize($sxe->addChild(self::FIELD_COMMENT, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getCoverageArea())) { foreach($vs as $v) { if (null === $v) { @@ -2189,14 +2264,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_COVERAGE_AREA, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getEligibility())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ELIGIBILITY, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getEligibilityNote())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ELIGIBILITY_NOTE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getEndpoint())) { foreach($vs as $v) { if (null === $v) { @@ -2208,7 +2281,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getExtraDetails())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EXTRA_DETAILS, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -2217,7 +2289,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getLocation())) { foreach($vs as $v) { if (null === $v) { @@ -2229,7 +2300,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NAME, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getNotAvailable())) { foreach($vs as $v) { if (null === $v) { @@ -2238,7 +2308,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_NOT_AVAILABLE, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getPhoto())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PHOTO, null, $v->_getFHIRXMLNamespace())); } @@ -2250,11 +2319,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_PROGRAM_NAME, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getProvidedBy())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PROVIDED_BY, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getReferralMethod())) { foreach($vs as $v) { if (null === $v) { @@ -2263,7 +2330,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_REFERRAL_METHOD, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getServiceProvisionCode())) { foreach($vs as $v) { if (null === $v) { @@ -2272,7 +2338,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_SERVICE_PROVISION_CODE, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getSpecialty())) { foreach($vs as $v) { if (null === $v) { @@ -2281,7 +2346,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_SPECIALTY, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getTelecom())) { foreach($vs as $v) { if (null === $v) { @@ -2290,7 +2354,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_TELECOM, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getType())) { foreach($vs as $v) { if (null === $v) { @@ -2309,16 +2372,37 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getActive())) { - $a[self::FIELD_ACTIVE] = $v->getValue(); - $a[self::FIELD_ACTIVE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ACTIVE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ACTIVE_EXT] = $enc; + } + } else { + $a[self::FIELD_ACTIVE] = $v; + } } if (null !== ($v = $this->getAppointmentRequired())) { - $a[self::FIELD_APPOINTMENT_REQUIRED] = $v->getValue(); - $a[self::FIELD_APPOINTMENT_REQUIRED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_APPOINTMENT_REQUIRED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_APPOINTMENT_REQUIRED_EXT] = $enc; + } + } else { + $a[self::FIELD_APPOINTMENT_REQUIRED] = $v; + } } if (null !== ($v = $this->getAvailabilityExceptions())) { - $a[self::FIELD_AVAILABILITY_EXCEPTIONS] = $v->getValue(); - $a[self::FIELD_AVAILABILITY_EXCEPTIONS_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_AVAILABILITY_EXCEPTIONS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_AVAILABILITY_EXCEPTIONS_EXT] = $enc; + } + } else { + $a[self::FIELD_AVAILABILITY_EXCEPTIONS] = $v; + } } if ([] !== ($vs = $this->getAvailableTime())) { $a[self::FIELD_AVAILABLE_TIME] = $vs; @@ -2330,8 +2414,15 @@ public function jsonSerialize() $a[self::FIELD_CHARACTERISTIC] = $vs; } if (null !== ($v = $this->getComment())) { - $a[self::FIELD_COMMENT] = $v->getValue(); - $a[self::FIELD_COMMENT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_COMMENT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_COMMENT_EXT] = $enc; + } + } else { + $a[self::FIELD_COMMENT] = $v; + } } if ([] !== ($vs = $this->getCoverageArea())) { $a[self::FIELD_COVERAGE_AREA] = $vs; @@ -2340,25 +2431,62 @@ public function jsonSerialize() $a[self::FIELD_ELIGIBILITY] = $v; } if (null !== ($v = $this->getEligibilityNote())) { - $a[self::FIELD_ELIGIBILITY_NOTE] = $v->getValue(); - $a[self::FIELD_ELIGIBILITY_NOTE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ELIGIBILITY_NOTE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ELIGIBILITY_NOTE_EXT] = $enc; + } + } else { + $a[self::FIELD_ELIGIBILITY_NOTE] = $v; + } } if ([] !== ($vs = $this->getEndpoint())) { $a[self::FIELD_ENDPOINT] = $vs; } if (null !== ($v = $this->getExtraDetails())) { - $a[self::FIELD_EXTRA_DETAILS] = $v->getValue(); - $a[self::FIELD_EXTRA_DETAILS_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EXTRA_DETAILS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EXTRA_DETAILS_EXT] = $enc; + } + } else { + $a[self::FIELD_EXTRA_DETAILS] = $v; + } } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if ([] !== ($vs = $this->getLocation())) { $a[self::FIELD_LOCATION] = $vs; } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if ([] !== ($vs = $this->getNotAvailable())) { $a[self::FIELD_NOT_AVAILABLE] = $vs; @@ -2372,8 +2500,17 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_PROGRAM_NAME][] = $v->getValue(); - $a[self::FIELD_PROGRAM_NAME_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PROGRAM_NAME][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PROGRAM_NAME_EXT][] = $enc; + } else { + $a[self::FIELD_PROGRAM_NAME_EXT][] = null; + } + } else { + $a[self::FIELD_PROGRAM_NAME][] = $v; + } } } if (null !== ($v = $this->getProvidedBy())) { @@ -2389,7 +2526,23 @@ public function jsonSerialize() $a[self::FIELD_SPECIALTY] = $vs; } if ([] !== ($vs = $this->getTelecom())) { - $a[self::FIELD_TELECOM] = $vs; + $a[self::FIELD_TELECOM] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TELECOM][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TELECOM_EXT][] = $enc; + } else { + $a[self::FIELD_TELECOM_EXT][] = null; + } + } else { + $a[self::FIELD_TELECOM][] = $v; + } + } } if ([] !== ($vs = $this->getType())) { $a[self::FIELD_TYPE] = $vs; diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRImagingManifest.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRImagingManifest.php index bdf1256b87..0dd25db38a 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRImagingManifest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRImagingManifest.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -84,10 +84,6 @@ class FHIRImagingManifest extends FHIRDomainResource implements PHPFHIRContained { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_IMAGING_MANIFEST; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_AUTHOR = 'author'; const FIELD_AUTHORING_TIME = 'authoringTime'; const FIELD_AUTHORING_TIME_EXT = '_authoringTime'; @@ -181,6 +177,9 @@ class FHIRImagingManifest extends FHIRDomainResource implements PHPFHIRContained */ protected $study = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRImagingManifest Constructor * @param null|array $data @@ -210,8 +209,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_AUTHORING_TIME] instanceof FHIRDateTime) { $this->setAuthoringTime($data[self::FIELD_AUTHORING_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_AUTHORING_TIME])) { - $this->setAuthoringTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_AUTHORING_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_AUTHORING_TIME])) { + $this->setAuthoringTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_AUTHORING_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_AUTHORING_TIME])) { + $this->setAuthoringTime(new FHIRDateTime(array_merge($ext, $data[self::FIELD_AUTHORING_TIME]))); + } } else { $this->setAuthoringTime(new FHIRDateTime($data[self::FIELD_AUTHORING_TIME])); } @@ -222,8 +225,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -234,8 +241,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->setIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { - $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_IDENTIFIER]))); + } } else { $this->setIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); } @@ -250,6 +261,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_STUDY])) { if (is_array($data[self::FIELD_STUDY])) { foreach($data[self::FIELD_STUDY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRImagingManifestStudy) { $this->addStudy($v); } else { @@ -663,15 +677,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESCRIPTION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPatient())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATIENT, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getStudy())) { foreach($vs as $v) { if (null === $v) { @@ -693,15 +704,37 @@ public function jsonSerialize() $a[self::FIELD_AUTHOR] = $v; } if (null !== ($v = $this->getAuthoringTime())) { - $a[self::FIELD_AUTHORING_TIME] = $v->getValue(); - $a[self::FIELD_AUTHORING_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_AUTHORING_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_AUTHORING_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_AUTHORING_TIME] = $v; + } } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if (null !== ($v = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_IDENTIFIER] = $v; + } } if (null !== ($v = $this->getPatient())) { $a[self::FIELD_PATIENT] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRImagingStudy.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRImagingStudy.php index 1799681f43..43783f17df 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRImagingStudy.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRImagingStudy.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -92,10 +92,6 @@ class FHIRImagingStudy extends FHIRDomainResource implements PHPFHIRContainedTyp { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_IMAGING_STUDY; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ACCESSION = 'accession'; const FIELD_ACCESSION_EXT = '_accession'; const FIELD_AVAILABILITY = 'availability'; @@ -355,6 +351,9 @@ class FHIRImagingStudy extends FHIRDomainResource implements PHPFHIRContainedTyp */ protected $uid = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRImagingStudy Constructor * @param null|array $data @@ -377,8 +376,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ACCESSION] instanceof FHIRIdentifier) { $this->setAccession($data[self::FIELD_ACCESSION]); - } elseif ($ext && is_scalar($data[self::FIELD_ACCESSION])) { - $this->setAccession(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_ACCESSION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ACCESSION])) { + $this->setAccession(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_ACCESSION]] + $ext)); + } else if (is_array($data[self::FIELD_ACCESSION])) { + $this->setAccession(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_ACCESSION]))); + } } else { $this->setAccession(new FHIRIdentifier($data[self::FIELD_ACCESSION])); } @@ -389,8 +392,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_AVAILABILITY] instanceof FHIRInstanceAvailability) { $this->setAvailability($data[self::FIELD_AVAILABILITY]); - } elseif ($ext && is_scalar($data[self::FIELD_AVAILABILITY])) { - $this->setAvailability(new FHIRInstanceAvailability([FHIRInstanceAvailability::FIELD_VALUE => $data[self::FIELD_AVAILABILITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_AVAILABILITY])) { + $this->setAvailability(new FHIRInstanceAvailability([FHIRInstanceAvailability::FIELD_VALUE => $data[self::FIELD_AVAILABILITY]] + $ext)); + } else if (is_array($data[self::FIELD_AVAILABILITY])) { + $this->setAvailability(new FHIRInstanceAvailability(array_merge($ext, $data[self::FIELD_AVAILABILITY]))); + } } else { $this->setAvailability(new FHIRInstanceAvailability($data[self::FIELD_AVAILABILITY])); } @@ -398,6 +405,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_BASED_ON])) { if (is_array($data[self::FIELD_BASED_ON])) { foreach($data[self::FIELD_BASED_ON] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addBasedOn($v); } else { @@ -423,8 +433,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -432,6 +446,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ENDPOINT])) { if (is_array($data[self::FIELD_ENDPOINT])) { foreach($data[self::FIELD_ENDPOINT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addEndpoint($v); } else { @@ -450,17 +467,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -469,6 +493,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_INTERPRETER])) { if (is_array($data[self::FIELD_INTERPRETER])) { foreach($data[self::FIELD_INTERPRETER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addInterpreter($v); } else { @@ -484,6 +511,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_MODALITY_LIST])) { if (is_array($data[self::FIELD_MODALITY_LIST])) { foreach($data[self::FIELD_MODALITY_LIST] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCoding) { $this->addModalityList($v); } else { @@ -502,8 +532,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NUMBER_OF_INSTANCES] instanceof FHIRUnsignedInt) { $this->setNumberOfInstances($data[self::FIELD_NUMBER_OF_INSTANCES]); - } elseif ($ext && is_scalar($data[self::FIELD_NUMBER_OF_INSTANCES])) { - $this->setNumberOfInstances(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_NUMBER_OF_INSTANCES]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NUMBER_OF_INSTANCES])) { + $this->setNumberOfInstances(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_NUMBER_OF_INSTANCES]] + $ext)); + } else if (is_array($data[self::FIELD_NUMBER_OF_INSTANCES])) { + $this->setNumberOfInstances(new FHIRUnsignedInt(array_merge($ext, $data[self::FIELD_NUMBER_OF_INSTANCES]))); + } } else { $this->setNumberOfInstances(new FHIRUnsignedInt($data[self::FIELD_NUMBER_OF_INSTANCES])); } @@ -514,8 +548,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NUMBER_OF_SERIES] instanceof FHIRUnsignedInt) { $this->setNumberOfSeries($data[self::FIELD_NUMBER_OF_SERIES]); - } elseif ($ext && is_scalar($data[self::FIELD_NUMBER_OF_SERIES])) { - $this->setNumberOfSeries(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_NUMBER_OF_SERIES]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NUMBER_OF_SERIES])) { + $this->setNumberOfSeries(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_NUMBER_OF_SERIES]] + $ext)); + } else if (is_array($data[self::FIELD_NUMBER_OF_SERIES])) { + $this->setNumberOfSeries(new FHIRUnsignedInt(array_merge($ext, $data[self::FIELD_NUMBER_OF_SERIES]))); + } } else { $this->setNumberOfSeries(new FHIRUnsignedInt($data[self::FIELD_NUMBER_OF_SERIES])); } @@ -530,6 +568,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PROCEDURE_CODE])) { if (is_array($data[self::FIELD_PROCEDURE_CODE])) { foreach($data[self::FIELD_PROCEDURE_CODE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addProcedureCode($v); } else { @@ -545,6 +586,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PROCEDURE_REFERENCE])) { if (is_array($data[self::FIELD_PROCEDURE_REFERENCE])) { foreach($data[self::FIELD_PROCEDURE_REFERENCE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addProcedureReference($v); } else { @@ -574,6 +618,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SERIES])) { if (is_array($data[self::FIELD_SERIES])) { foreach($data[self::FIELD_SERIES] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRImagingStudySeries) { $this->addSeries($v); } else { @@ -592,8 +639,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STARTED] instanceof FHIRDateTime) { $this->setStarted($data[self::FIELD_STARTED]); - } elseif ($ext && is_scalar($data[self::FIELD_STARTED])) { - $this->setStarted(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_STARTED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STARTED])) { + $this->setStarted(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_STARTED]] + $ext)); + } else if (is_array($data[self::FIELD_STARTED])) { + $this->setStarted(new FHIRDateTime(array_merge($ext, $data[self::FIELD_STARTED]))); + } } else { $this->setStarted(new FHIRDateTime($data[self::FIELD_STARTED])); } @@ -604,8 +655,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_UID] instanceof FHIROid) { $this->setUid($data[self::FIELD_UID]); - } elseif ($ext && is_scalar($data[self::FIELD_UID])) { - $this->setUid(new FHIROid([FHIROid::FIELD_VALUE => $data[self::FIELD_UID]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_UID])) { + $this->setUid(new FHIROid([FHIROid::FIELD_VALUE => $data[self::FIELD_UID]] + $ext)); + } else if (is_array($data[self::FIELD_UID])) { + $this->setUid(new FHIROid(array_merge($ext, $data[self::FIELD_UID]))); + } } else { $this->setUid(new FHIROid($data[self::FIELD_UID])); } @@ -1682,11 +1737,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getAccession())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ACCESSION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getAvailability())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AVAILABILITY, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getBasedOn())) { foreach($vs as $v) { if (null === $v) { @@ -1695,14 +1748,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_BASED_ON, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getContext())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CONTEXT, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getDescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESCRIPTION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getEndpoint())) { foreach($vs as $v) { if (null === $v) { @@ -1711,7 +1762,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_ENDPOINT, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -1720,7 +1770,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getInterpreter())) { foreach($vs as $v) { if (null === $v) { @@ -1729,7 +1778,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_INTERPRETER, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getModalityList())) { foreach($vs as $v) { if (null === $v) { @@ -1744,11 +1792,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getNumberOfSeries())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NUMBER_OF_SERIES, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPatient())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATIENT, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getProcedureCode())) { foreach($vs as $v) { if (null === $v) { @@ -1757,7 +1803,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_PROCEDURE_CODE, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getProcedureReference())) { foreach($vs as $v) { if (null === $v) { @@ -1766,15 +1811,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_PROCEDURE_REFERENCE, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getReason())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REASON, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getReferrer())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REFERRER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getSeries())) { foreach($vs as $v) { if (null === $v) { @@ -1799,10 +1841,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getAccession())) { - $a[self::FIELD_ACCESSION] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ACCESSION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ACCESSION_EXT] = $enc; + } + } else { + $a[self::FIELD_ACCESSION] = $v; + } } if (null !== ($v = $this->getAvailability())) { - $a[self::FIELD_AVAILABILITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_AVAILABILITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_AVAILABILITY_EXT] = $enc; + } + } else { + $a[self::FIELD_AVAILABILITY] = $v; + } } if ([] !== ($vs = $this->getBasedOn())) { $a[self::FIELD_BASED_ON] = $vs; @@ -1811,14 +1869,37 @@ public function jsonSerialize() $a[self::FIELD_CONTEXT] = $v; } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if ([] !== ($vs = $this->getEndpoint())) { $a[self::FIELD_ENDPOINT] = $vs; } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if ([] !== ($vs = $this->getInterpreter())) { $a[self::FIELD_INTERPRETER] = $vs; @@ -1827,12 +1908,26 @@ public function jsonSerialize() $a[self::FIELD_MODALITY_LIST] = $vs; } if (null !== ($v = $this->getNumberOfInstances())) { - $a[self::FIELD_NUMBER_OF_INSTANCES] = $v->getValue(); - $a[self::FIELD_NUMBER_OF_INSTANCES_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NUMBER_OF_INSTANCES] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NUMBER_OF_INSTANCES_EXT] = $enc; + } + } else { + $a[self::FIELD_NUMBER_OF_INSTANCES] = $v; + } } if (null !== ($v = $this->getNumberOfSeries())) { - $a[self::FIELD_NUMBER_OF_SERIES] = $v->getValue(); - $a[self::FIELD_NUMBER_OF_SERIES_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NUMBER_OF_SERIES] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NUMBER_OF_SERIES_EXT] = $enc; + } + } else { + $a[self::FIELD_NUMBER_OF_SERIES] = $v; + } } if (null !== ($v = $this->getPatient())) { $a[self::FIELD_PATIENT] = $v; @@ -1853,12 +1948,26 @@ public function jsonSerialize() $a[self::FIELD_SERIES] = $vs; } if (null !== ($v = $this->getStarted())) { - $a[self::FIELD_STARTED] = $v->getValue(); - $a[self::FIELD_STARTED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STARTED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STARTED_EXT] = $enc; + } + } else { + $a[self::FIELD_STARTED] = $v; + } } if (null !== ($v = $this->getUid())) { - $a[self::FIELD_UID] = $v->getValue(); - $a[self::FIELD_UID_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_UID] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_UID_EXT] = $enc; + } + } else { + $a[self::FIELD_UID] = $v; + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRImmunization.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRImmunization.php index 803e91e1e2..2b911759fa 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRImmunization.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRImmunization.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -94,10 +94,6 @@ class FHIRImmunization extends FHIRDomainResource implements PHPFHIRContainedTyp { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_IMMUNIZATION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DATE = 'date'; const FIELD_DATE_EXT = '_date'; const FIELD_DOSE_QUANTITY = 'doseQuantity'; @@ -374,6 +370,9 @@ class FHIRImmunization extends FHIRDomainResource implements PHPFHIRContainedTyp */ protected $vaccineCode = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRImmunization Constructor * @param null|array $data @@ -396,8 +395,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATE] instanceof FHIRDateTime) { $this->setDate($data[self::FIELD_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_DATE])) { - $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime(array_merge($ext, $data[self::FIELD_DATE]))); + } } else { $this->setDate(new FHIRDateTime($data[self::FIELD_DATE])); } @@ -408,8 +411,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DOSE_QUANTITY] instanceof FHIRQuantity) { $this->setDoseQuantity($data[self::FIELD_DOSE_QUANTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_DOSE_QUANTITY])) { - $this->setDoseQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_DOSE_QUANTITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DOSE_QUANTITY])) { + $this->setDoseQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_DOSE_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_DOSE_QUANTITY])) { + $this->setDoseQuantity(new FHIRQuantity(array_merge($ext, $data[self::FIELD_DOSE_QUANTITY]))); + } } else { $this->setDoseQuantity(new FHIRQuantity($data[self::FIELD_DOSE_QUANTITY])); } @@ -427,8 +434,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EXPIRATION_DATE] instanceof FHIRDate) { $this->setExpirationDate($data[self::FIELD_EXPIRATION_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_EXPIRATION_DATE])) { - $this->setExpirationDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_EXPIRATION_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EXPIRATION_DATE])) { + $this->setExpirationDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_EXPIRATION_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_EXPIRATION_DATE])) { + $this->setExpirationDate(new FHIRDate(array_merge($ext, $data[self::FIELD_EXPIRATION_DATE]))); + } } else { $this->setExpirationDate(new FHIRDate($data[self::FIELD_EXPIRATION_DATE])); } @@ -446,17 +457,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -475,8 +493,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_LOT_NUMBER] instanceof FHIRString) { $this->setLotNumber($data[self::FIELD_LOT_NUMBER]); - } elseif ($ext && is_scalar($data[self::FIELD_LOT_NUMBER])) { - $this->setLotNumber(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_LOT_NUMBER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_LOT_NUMBER])) { + $this->setLotNumber(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_LOT_NUMBER]] + $ext)); + } else if (is_array($data[self::FIELD_LOT_NUMBER])) { + $this->setLotNumber(new FHIRString(array_merge($ext, $data[self::FIELD_LOT_NUMBER]))); + } } else { $this->setLotNumber(new FHIRString($data[self::FIELD_LOT_NUMBER])); } @@ -494,8 +516,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NOT_GIVEN] instanceof FHIRBoolean) { $this->setNotGiven($data[self::FIELD_NOT_GIVEN]); - } elseif ($ext && is_scalar($data[self::FIELD_NOT_GIVEN])) { - $this->setNotGiven(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_NOT_GIVEN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NOT_GIVEN])) { + $this->setNotGiven(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_NOT_GIVEN]] + $ext)); + } else if (is_array($data[self::FIELD_NOT_GIVEN])) { + $this->setNotGiven(new FHIRBoolean(array_merge($ext, $data[self::FIELD_NOT_GIVEN]))); + } } else { $this->setNotGiven(new FHIRBoolean($data[self::FIELD_NOT_GIVEN])); } @@ -503,6 +529,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_NOTE])) { if (is_array($data[self::FIELD_NOTE])) { foreach($data[self::FIELD_NOTE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRAnnotation) { $this->addNote($v); } else { @@ -525,6 +554,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PRACTITIONER])) { if (is_array($data[self::FIELD_PRACTITIONER])) { foreach($data[self::FIELD_PRACTITIONER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRImmunizationPractitioner) { $this->addPractitioner($v); } else { @@ -543,8 +575,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PRIMARY_SOURCE] instanceof FHIRBoolean) { $this->setPrimarySource($data[self::FIELD_PRIMARY_SOURCE]); - } elseif ($ext && is_scalar($data[self::FIELD_PRIMARY_SOURCE])) { - $this->setPrimarySource(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_PRIMARY_SOURCE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PRIMARY_SOURCE])) { + $this->setPrimarySource(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_PRIMARY_SOURCE]] + $ext)); + } else if (is_array($data[self::FIELD_PRIMARY_SOURCE])) { + $this->setPrimarySource(new FHIRBoolean(array_merge($ext, $data[self::FIELD_PRIMARY_SOURCE]))); + } } else { $this->setPrimarySource(new FHIRBoolean($data[self::FIELD_PRIMARY_SOURCE])); } @@ -552,6 +588,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REACTION])) { if (is_array($data[self::FIELD_REACTION])) { foreach($data[self::FIELD_REACTION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRImmunizationReaction) { $this->addReaction($v); } else { @@ -591,8 +630,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRImmunizationStatusCodes) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRImmunizationStatusCodes([FHIRImmunizationStatusCodes::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRImmunizationStatusCodes([FHIRImmunizationStatusCodes::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRImmunizationStatusCodes(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRImmunizationStatusCodes($data[self::FIELD_STATUS])); } @@ -600,6 +643,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_VACCINATION_PROTOCOL])) { if (is_array($data[self::FIELD_VACCINATION_PROTOCOL])) { foreach($data[self::FIELD_VACCINATION_PROTOCOL] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRImmunizationVaccinationProtocol) { $this->addVaccinationProtocol($v); } else { @@ -1650,25 +1696,22 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DATE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDoseQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DOSE_QUANTITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getEncounter())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ENCOUNTER, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getExpirationDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EXPIRATION_DATE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getExplanation())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EXPLANATION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -1677,21 +1720,18 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getLocation())) { $v->xmlSerialize($sxe->addChild(self::FIELD_LOCATION, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getLotNumber())) { $v->xmlSerialize($sxe->addChild(self::FIELD_LOT_NUMBER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getManufacturer())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MANUFACTURER, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getNotGiven())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NOT_GIVEN, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getNote())) { foreach($vs as $v) { if (null === $v) { @@ -1700,11 +1740,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_NOTE, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getPatient())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATIENT, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getPractitioner())) { foreach($vs as $v) { if (null === $v) { @@ -1716,7 +1754,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getPrimarySource())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PRIMARY_SOURCE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getReaction())) { foreach($vs as $v) { if (null === $v) { @@ -1725,23 +1762,18 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_REACTION, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getReportOrigin())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REPORT_ORIGIN, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRoute())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ROUTE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSite())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SITE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getVaccinationProtocol())) { foreach($vs as $v) { if (null === $v) { @@ -1750,7 +1782,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_VACCINATION_PROTOCOL, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getVaccineCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VACCINE_CODE, null, $v->_getFHIRXMLNamespace())); } @@ -1764,38 +1795,90 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getDate())) { - $a[self::FIELD_DATE] = $v->getValue(); - $a[self::FIELD_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_DATE] = $v; + } } if (null !== ($v = $this->getDoseQuantity())) { - $a[self::FIELD_DOSE_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DOSE_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DOSE_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_DOSE_QUANTITY] = $v; + } } if (null !== ($v = $this->getEncounter())) { $a[self::FIELD_ENCOUNTER] = $v; } if (null !== ($v = $this->getExpirationDate())) { - $a[self::FIELD_EXPIRATION_DATE] = $v->getValue(); - $a[self::FIELD_EXPIRATION_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EXPIRATION_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EXPIRATION_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_EXPIRATION_DATE] = $v; + } } if (null !== ($v = $this->getExplanation())) { $a[self::FIELD_EXPLANATION] = $v; } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if (null !== ($v = $this->getLocation())) { $a[self::FIELD_LOCATION] = $v; } if (null !== ($v = $this->getLotNumber())) { - $a[self::FIELD_LOT_NUMBER] = $v->getValue(); - $a[self::FIELD_LOT_NUMBER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_LOT_NUMBER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_LOT_NUMBER_EXT] = $enc; + } + } else { + $a[self::FIELD_LOT_NUMBER] = $v; + } } if (null !== ($v = $this->getManufacturer())) { $a[self::FIELD_MANUFACTURER] = $v; } if (null !== ($v = $this->getNotGiven())) { - $a[self::FIELD_NOT_GIVEN] = $v->getValue(); - $a[self::FIELD_NOT_GIVEN_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NOT_GIVEN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NOT_GIVEN_EXT] = $enc; + } + } else { + $a[self::FIELD_NOT_GIVEN] = $v; + } } if ([] !== ($vs = $this->getNote())) { $a[self::FIELD_NOTE] = $vs; @@ -1807,8 +1890,15 @@ public function jsonSerialize() $a[self::FIELD_PRACTITIONER] = $vs; } if (null !== ($v = $this->getPrimarySource())) { - $a[self::FIELD_PRIMARY_SOURCE] = $v->getValue(); - $a[self::FIELD_PRIMARY_SOURCE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PRIMARY_SOURCE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PRIMARY_SOURCE_EXT] = $enc; + } + } else { + $a[self::FIELD_PRIMARY_SOURCE] = $v; + } } if ([] !== ($vs = $this->getReaction())) { $a[self::FIELD_REACTION] = $vs; @@ -1823,7 +1913,15 @@ public function jsonSerialize() $a[self::FIELD_SITE] = $v; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if ([] !== ($vs = $this->getVaccinationProtocol())) { $a[self::FIELD_VACCINATION_PROTOCOL] = $vs; diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRImmunizationRecommendation.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRImmunizationRecommendation.php index 16dbe1c4f0..bdd90f50f1 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRImmunizationRecommendation.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRImmunizationRecommendation.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -83,10 +83,6 @@ class FHIRImmunizationRecommendation extends FHIRDomainResource implements PHPFH { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_IMMUNIZATION_RECOMMENDATION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_IDENTIFIER = 'identifier'; const FIELD_IDENTIFIER_EXT = '_identifier'; const FIELD_PATIENT = 'patient'; @@ -125,6 +121,9 @@ class FHIRImmunizationRecommendation extends FHIRDomainResource implements PHPFH */ protected $recommendation = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRImmunizationRecommendation Constructor * @param null|array $data @@ -147,17 +146,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -173,6 +179,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_RECOMMENDATION])) { if (is_array($data[self::FIELD_RECOMMENDATION])) { foreach($data[self::FIELD_RECOMMENDATION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRImmunizationRecommendationRecommendation) { $this->addRecommendation($v); } else { @@ -458,11 +467,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getPatient())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATIENT, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getRecommendation())) { foreach($vs as $v) { if (null === $v) { @@ -481,7 +488,23 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if (null !== ($v = $this->getPatient())) { $a[self::FIELD_PATIENT] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRImplementationGuide.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRImplementationGuide.php index 0d1b8ace89..ac4f66d7a6 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRImplementationGuide.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRImplementationGuide.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -94,10 +94,6 @@ class FHIRImplementationGuide extends FHIRDomainResource implements PHPFHIRConta { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_IMPLEMENTATION_GUIDE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_BINARY = 'binary'; const FIELD_BINARY_EXT = '_binary'; const FIELD_CONTACT = 'contact'; @@ -377,6 +373,9 @@ class FHIRImplementationGuide extends FHIRDomainResource implements PHPFHIRConta */ protected $version = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRImplementationGuide Constructor * @param null|array $data @@ -399,17 +398,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_BINARY])) { foreach($data[self::FIELD_BINARY] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRUri) { $this->addBinary($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addBinary(new FHIRUri([FHIRUri::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addBinary(new FHIRUri([FHIRUri::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addBinary(new FHIRUri(array_merge($v, $ext[$i]))); + } } else { $this->addBinary(new FHIRUri($v)); } } } elseif ($data[self::FIELD_BINARY] instanceof FHIRUri) { $this->addBinary($data[self::FIELD_BINARY]); - } elseif ($ext && is_scalar($data[self::FIELD_BINARY])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_BINARY])) { $this->addBinary(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_BINARY]] + $ext)); } else { $this->addBinary(new FHIRUri($data[self::FIELD_BINARY])); @@ -418,6 +424,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CONTACT])) { if (is_array($data[self::FIELD_CONTACT])) { foreach($data[self::FIELD_CONTACT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContactDetail) { $this->addContact($v); } else { @@ -436,8 +445,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_COPYRIGHT] instanceof FHIRMarkdown) { $this->setCopyright($data[self::FIELD_COPYRIGHT]); - } elseif ($ext && is_scalar($data[self::FIELD_COPYRIGHT])) { - $this->setCopyright(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_COPYRIGHT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_COPYRIGHT])) { + $this->setCopyright(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_COPYRIGHT]] + $ext)); + } else if (is_array($data[self::FIELD_COPYRIGHT])) { + $this->setCopyright(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_COPYRIGHT]))); + } } else { $this->setCopyright(new FHIRMarkdown($data[self::FIELD_COPYRIGHT])); } @@ -448,8 +461,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATE] instanceof FHIRDateTime) { $this->setDate($data[self::FIELD_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_DATE])) { - $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime(array_merge($ext, $data[self::FIELD_DATE]))); + } } else { $this->setDate(new FHIRDateTime($data[self::FIELD_DATE])); } @@ -457,6 +474,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_DEPENDENCY])) { if (is_array($data[self::FIELD_DEPENDENCY])) { foreach($data[self::FIELD_DEPENDENCY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRImplementationGuideDependency) { $this->addDependency($v); } else { @@ -475,8 +495,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRMarkdown) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRMarkdown($data[self::FIELD_DESCRIPTION])); } @@ -487,8 +511,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EXPERIMENTAL] instanceof FHIRBoolean) { $this->setExperimental($data[self::FIELD_EXPERIMENTAL]); - } elseif ($ext && is_scalar($data[self::FIELD_EXPERIMENTAL])) { - $this->setExperimental(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_EXPERIMENTAL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EXPERIMENTAL])) { + $this->setExperimental(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_EXPERIMENTAL]] + $ext)); + } else if (is_array($data[self::FIELD_EXPERIMENTAL])) { + $this->setExperimental(new FHIRBoolean(array_merge($ext, $data[self::FIELD_EXPERIMENTAL]))); + } } else { $this->setExperimental(new FHIRBoolean($data[self::FIELD_EXPERIMENTAL])); } @@ -499,8 +527,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_FHIR_VERSION] instanceof FHIRId) { $this->setFhirVersion($data[self::FIELD_FHIR_VERSION]); - } elseif ($ext && is_scalar($data[self::FIELD_FHIR_VERSION])) { - $this->setFhirVersion(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_FHIR_VERSION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_FHIR_VERSION])) { + $this->setFhirVersion(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_FHIR_VERSION]] + $ext)); + } else if (is_array($data[self::FIELD_FHIR_VERSION])) { + $this->setFhirVersion(new FHIRId(array_merge($ext, $data[self::FIELD_FHIR_VERSION]))); + } } else { $this->setFhirVersion(new FHIRId($data[self::FIELD_FHIR_VERSION])); } @@ -508,6 +540,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_GLOBAL])) { if (is_array($data[self::FIELD_GLOBAL])) { foreach($data[self::FIELD_GLOBAL] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRImplementationGuideGlobal) { $this->addGlobal($v); } else { @@ -523,6 +558,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_JURISDICTION])) { if (is_array($data[self::FIELD_JURISDICTION])) { foreach($data[self::FIELD_JURISDICTION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addJurisdiction($v); } else { @@ -541,8 +579,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -550,6 +592,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PACKAGE])) { if (is_array($data[self::FIELD_PACKAGE])) { foreach($data[self::FIELD_PACKAGE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRImplementationGuidePackage) { $this->addPackage($v); } else { @@ -575,8 +620,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PUBLISHER] instanceof FHIRString) { $this->setPublisher($data[self::FIELD_PUBLISHER]); - } elseif ($ext && is_scalar($data[self::FIELD_PUBLISHER])) { - $this->setPublisher(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PUBLISHER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PUBLISHER])) { + $this->setPublisher(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PUBLISHER]] + $ext)); + } else if (is_array($data[self::FIELD_PUBLISHER])) { + $this->setPublisher(new FHIRString(array_merge($ext, $data[self::FIELD_PUBLISHER]))); + } } else { $this->setPublisher(new FHIRString($data[self::FIELD_PUBLISHER])); } @@ -587,8 +636,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRPublicationStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRPublicationStatus([FHIRPublicationStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRPublicationStatus([FHIRPublicationStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRPublicationStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRPublicationStatus($data[self::FIELD_STATUS])); } @@ -599,8 +652,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_URL] instanceof FHIRUri) { $this->setUrl($data[self::FIELD_URL]); - } elseif ($ext && is_scalar($data[self::FIELD_URL])) { - $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } else if (is_array($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri(array_merge($ext, $data[self::FIELD_URL]))); + } } else { $this->setUrl(new FHIRUri($data[self::FIELD_URL])); } @@ -608,6 +665,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_USE_CONTEXT])) { if (is_array($data[self::FIELD_USE_CONTEXT])) { foreach($data[self::FIELD_USE_CONTEXT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRUsageContext) { $this->addUseContext($v); } else { @@ -626,8 +686,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VERSION] instanceof FHIRString) { $this->setVersion($data[self::FIELD_VERSION]); - } elseif ($ext && is_scalar($data[self::FIELD_VERSION])) { - $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } else if (is_array($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString(array_merge($ext, $data[self::FIELD_VERSION]))); + } } else { $this->setVersion(new FHIRString($data[self::FIELD_VERSION])); } @@ -1754,6 +1818,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if ([] !== ($vs = $this->getBinary())) { foreach($vs as $v) { if (null === $v) { @@ -1762,7 +1827,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_BINARY, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getContact())) { foreach($vs as $v) { if (null === $v) { @@ -1777,7 +1841,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DATE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getDependency())) { foreach($vs as $v) { if (null === $v) { @@ -1795,7 +1858,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getFhirVersion())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FHIR_VERSION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getGlobal())) { foreach($vs as $v) { if (null === $v) { @@ -1804,7 +1866,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_GLOBAL, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getJurisdiction())) { foreach($vs as $v) { if (null === $v) { @@ -1816,7 +1877,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NAME, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getPackage())) { foreach($vs as $v) { if (null === $v) { @@ -1825,21 +1885,18 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_PACKAGE, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getPage())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PAGE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getPublisher())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PUBLISHER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getUrl())) { $v->xmlSerialize($sxe->addChild(self::FIELD_URL, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getUseContext())) { foreach($vs as $v) { if (null === $v) { @@ -1866,35 +1923,79 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_BINARY][] = $v->getValue(); - $a[self::FIELD_BINARY_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_BINARY][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_BINARY_EXT][] = $enc; + } else { + $a[self::FIELD_BINARY_EXT][] = null; + } + } else { + $a[self::FIELD_BINARY][] = $v; + } } } if ([] !== ($vs = $this->getContact())) { $a[self::FIELD_CONTACT] = $vs; } if (null !== ($v = $this->getCopyright())) { - $a[self::FIELD_COPYRIGHT] = $v->getValue(); - $a[self::FIELD_COPYRIGHT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_COPYRIGHT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_COPYRIGHT_EXT] = $enc; + } + } else { + $a[self::FIELD_COPYRIGHT] = $v; + } } if (null !== ($v = $this->getDate())) { - $a[self::FIELD_DATE] = $v->getValue(); - $a[self::FIELD_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_DATE] = $v; + } } if ([] !== ($vs = $this->getDependency())) { $a[self::FIELD_DEPENDENCY] = $vs; } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if (null !== ($v = $this->getExperimental())) { - $a[self::FIELD_EXPERIMENTAL] = $v->getValue(); - $a[self::FIELD_EXPERIMENTAL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EXPERIMENTAL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EXPERIMENTAL_EXT] = $enc; + } + } else { + $a[self::FIELD_EXPERIMENTAL] = $v; + } } if (null !== ($v = $this->getFhirVersion())) { - $a[self::FIELD_FHIR_VERSION] = $v->getValue(); - $a[self::FIELD_FHIR_VERSION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FHIR_VERSION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FHIR_VERSION_EXT] = $enc; + } + } else { + $a[self::FIELD_FHIR_VERSION] = $v; + } } if ([] !== ($vs = $this->getGlobal())) { $a[self::FIELD_GLOBAL] = $vs; @@ -1903,8 +2004,15 @@ public function jsonSerialize() $a[self::FIELD_JURISDICTION] = $vs; } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if ([] !== ($vs = $this->getPackage())) { $a[self::FIELD_PACKAGE] = $vs; @@ -1913,22 +2021,51 @@ public function jsonSerialize() $a[self::FIELD_PAGE] = $v; } if (null !== ($v = $this->getPublisher())) { - $a[self::FIELD_PUBLISHER] = $v->getValue(); - $a[self::FIELD_PUBLISHER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PUBLISHER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PUBLISHER_EXT] = $enc; + } + } else { + $a[self::FIELD_PUBLISHER] = $v; + } } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getUrl())) { - $a[self::FIELD_URL] = $v->getValue(); - $a[self::FIELD_URL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_URL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_URL_EXT] = $enc; + } + } else { + $a[self::FIELD_URL] = $v; + } } if ([] !== ($vs = $this->getUseContext())) { $a[self::FIELD_USE_CONTEXT] = $vs; } if (null !== ($v = $this->getVersion())) { - $a[self::FIELD_VERSION] = $v->getValue(); - $a[self::FIELD_VERSION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VERSION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VERSION_EXT] = $enc; + } + } else { + $a[self::FIELD_VERSION] = $v; + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRLibrary.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRLibrary.php index 0309949f07..40f5e50cf0 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRLibrary.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRLibrary.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -98,10 +98,6 @@ class FHIRLibrary extends FHIRDomainResource implements PHPFHIRContainedTypeInte { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_LIBRARY; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_APPROVAL_DATE = 'approvalDate'; const FIELD_APPROVAL_DATE_EXT = '_approvalDate'; const FIELD_CONTACT = 'contact'; @@ -502,6 +498,9 @@ class FHIRLibrary extends FHIRDomainResource implements PHPFHIRContainedTypeInte */ protected $version = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRLibrary Constructor * @param null|array $data @@ -524,8 +523,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_APPROVAL_DATE] instanceof FHIRDate) { $this->setApprovalDate($data[self::FIELD_APPROVAL_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_APPROVAL_DATE])) { - $this->setApprovalDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_APPROVAL_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_APPROVAL_DATE])) { + $this->setApprovalDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_APPROVAL_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_APPROVAL_DATE])) { + $this->setApprovalDate(new FHIRDate(array_merge($ext, $data[self::FIELD_APPROVAL_DATE]))); + } } else { $this->setApprovalDate(new FHIRDate($data[self::FIELD_APPROVAL_DATE])); } @@ -533,6 +536,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CONTACT])) { if (is_array($data[self::FIELD_CONTACT])) { foreach($data[self::FIELD_CONTACT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContactDetail) { $this->addContact($v); } else { @@ -548,6 +554,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CONTENT])) { if (is_array($data[self::FIELD_CONTENT])) { foreach($data[self::FIELD_CONTENT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRAttachment) { $this->addContent($v); } else { @@ -563,6 +572,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CONTRIBUTOR])) { if (is_array($data[self::FIELD_CONTRIBUTOR])) { foreach($data[self::FIELD_CONTRIBUTOR] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContributor) { $this->addContributor($v); } else { @@ -581,8 +593,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_COPYRIGHT] instanceof FHIRMarkdown) { $this->setCopyright($data[self::FIELD_COPYRIGHT]); - } elseif ($ext && is_scalar($data[self::FIELD_COPYRIGHT])) { - $this->setCopyright(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_COPYRIGHT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_COPYRIGHT])) { + $this->setCopyright(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_COPYRIGHT]] + $ext)); + } else if (is_array($data[self::FIELD_COPYRIGHT])) { + $this->setCopyright(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_COPYRIGHT]))); + } } else { $this->setCopyright(new FHIRMarkdown($data[self::FIELD_COPYRIGHT])); } @@ -590,6 +606,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_DATA_REQUIREMENT])) { if (is_array($data[self::FIELD_DATA_REQUIREMENT])) { foreach($data[self::FIELD_DATA_REQUIREMENT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRDataRequirement) { $this->addDataRequirement($v); } else { @@ -608,8 +627,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATE] instanceof FHIRDateTime) { $this->setDate($data[self::FIELD_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_DATE])) { - $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime(array_merge($ext, $data[self::FIELD_DATE]))); + } } else { $this->setDate(new FHIRDateTime($data[self::FIELD_DATE])); } @@ -620,8 +643,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRMarkdown) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRMarkdown($data[self::FIELD_DESCRIPTION])); } @@ -639,8 +666,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EXPERIMENTAL] instanceof FHIRBoolean) { $this->setExperimental($data[self::FIELD_EXPERIMENTAL]); - } elseif ($ext && is_scalar($data[self::FIELD_EXPERIMENTAL])) { - $this->setExperimental(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_EXPERIMENTAL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EXPERIMENTAL])) { + $this->setExperimental(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_EXPERIMENTAL]] + $ext)); + } else if (is_array($data[self::FIELD_EXPERIMENTAL])) { + $this->setExperimental(new FHIRBoolean(array_merge($ext, $data[self::FIELD_EXPERIMENTAL]))); + } } else { $this->setExperimental(new FHIRBoolean($data[self::FIELD_EXPERIMENTAL])); } @@ -651,17 +682,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -670,6 +708,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_JURISDICTION])) { if (is_array($data[self::FIELD_JURISDICTION])) { foreach($data[self::FIELD_JURISDICTION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addJurisdiction($v); } else { @@ -688,8 +729,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_LAST_REVIEW_DATE] instanceof FHIRDate) { $this->setLastReviewDate($data[self::FIELD_LAST_REVIEW_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_LAST_REVIEW_DATE])) { - $this->setLastReviewDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_LAST_REVIEW_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_LAST_REVIEW_DATE])) { + $this->setLastReviewDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_LAST_REVIEW_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_LAST_REVIEW_DATE])) { + $this->setLastReviewDate(new FHIRDate(array_merge($ext, $data[self::FIELD_LAST_REVIEW_DATE]))); + } } else { $this->setLastReviewDate(new FHIRDate($data[self::FIELD_LAST_REVIEW_DATE])); } @@ -700,8 +745,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -709,6 +758,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PARAMETER])) { if (is_array($data[self::FIELD_PARAMETER])) { foreach($data[self::FIELD_PARAMETER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRParameterDefinition) { $this->addParameter($v); } else { @@ -727,8 +779,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PUBLISHER] instanceof FHIRString) { $this->setPublisher($data[self::FIELD_PUBLISHER]); - } elseif ($ext && is_scalar($data[self::FIELD_PUBLISHER])) { - $this->setPublisher(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PUBLISHER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PUBLISHER])) { + $this->setPublisher(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PUBLISHER]] + $ext)); + } else if (is_array($data[self::FIELD_PUBLISHER])) { + $this->setPublisher(new FHIRString(array_merge($ext, $data[self::FIELD_PUBLISHER]))); + } } else { $this->setPublisher(new FHIRString($data[self::FIELD_PUBLISHER])); } @@ -739,8 +795,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PURPOSE] instanceof FHIRMarkdown) { $this->setPurpose($data[self::FIELD_PURPOSE]); - } elseif ($ext && is_scalar($data[self::FIELD_PURPOSE])) { - $this->setPurpose(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_PURPOSE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PURPOSE])) { + $this->setPurpose(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_PURPOSE]] + $ext)); + } else if (is_array($data[self::FIELD_PURPOSE])) { + $this->setPurpose(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_PURPOSE]))); + } } else { $this->setPurpose(new FHIRMarkdown($data[self::FIELD_PURPOSE])); } @@ -748,6 +808,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_RELATED_ARTIFACT])) { if (is_array($data[self::FIELD_RELATED_ARTIFACT])) { foreach($data[self::FIELD_RELATED_ARTIFACT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRRelatedArtifact) { $this->addRelatedArtifact($v); } else { @@ -766,8 +829,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRPublicationStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRPublicationStatus([FHIRPublicationStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRPublicationStatus([FHIRPublicationStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRPublicationStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRPublicationStatus($data[self::FIELD_STATUS])); } @@ -778,8 +845,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TITLE] instanceof FHIRString) { $this->setTitle($data[self::FIELD_TITLE]); - } elseif ($ext && is_scalar($data[self::FIELD_TITLE])) { - $this->setTitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TITLE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TITLE])) { + $this->setTitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TITLE]] + $ext)); + } else if (is_array($data[self::FIELD_TITLE])) { + $this->setTitle(new FHIRString(array_merge($ext, $data[self::FIELD_TITLE]))); + } } else { $this->setTitle(new FHIRString($data[self::FIELD_TITLE])); } @@ -787,6 +858,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_TOPIC])) { if (is_array($data[self::FIELD_TOPIC])) { foreach($data[self::FIELD_TOPIC] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addTopic($v); } else { @@ -812,8 +886,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_URL] instanceof FHIRUri) { $this->setUrl($data[self::FIELD_URL]); - } elseif ($ext && is_scalar($data[self::FIELD_URL])) { - $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } else if (is_array($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri(array_merge($ext, $data[self::FIELD_URL]))); + } } else { $this->setUrl(new FHIRUri($data[self::FIELD_URL])); } @@ -824,8 +902,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_USAGE] instanceof FHIRString) { $this->setUsage($data[self::FIELD_USAGE]); - } elseif ($ext && is_scalar($data[self::FIELD_USAGE])) { - $this->setUsage(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_USAGE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_USAGE])) { + $this->setUsage(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_USAGE]] + $ext)); + } else if (is_array($data[self::FIELD_USAGE])) { + $this->setUsage(new FHIRString(array_merge($ext, $data[self::FIELD_USAGE]))); + } } else { $this->setUsage(new FHIRString($data[self::FIELD_USAGE])); } @@ -833,6 +915,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_USE_CONTEXT])) { if (is_array($data[self::FIELD_USE_CONTEXT])) { foreach($data[self::FIELD_USE_CONTEXT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRUsageContext) { $this->addUseContext($v); } else { @@ -851,8 +936,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VERSION] instanceof FHIRString) { $this->setVersion($data[self::FIELD_VERSION]); - } elseif ($ext && is_scalar($data[self::FIELD_VERSION])) { - $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } else if (is_array($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString(array_merge($ext, $data[self::FIELD_VERSION]))); + } } else { $this->setVersion(new FHIRString($data[self::FIELD_VERSION])); } @@ -2414,10 +2503,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getApprovalDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_APPROVAL_DATE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getContact())) { foreach($vs as $v) { if (null === $v) { @@ -2426,7 +2515,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_CONTACT, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getContent())) { foreach($vs as $v) { if (null === $v) { @@ -2435,7 +2523,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_CONTENT, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getContributor())) { foreach($vs as $v) { if (null === $v) { @@ -2447,7 +2534,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getCopyright())) { $v->xmlSerialize($sxe->addChild(self::FIELD_COPYRIGHT, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getDataRequirement())) { foreach($vs as $v) { if (null === $v) { @@ -2462,14 +2548,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESCRIPTION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getEffectivePeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EFFECTIVE_PERIOD, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getExperimental())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EXPERIMENTAL, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -2478,7 +2562,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getJurisdiction())) { foreach($vs as $v) { if (null === $v) { @@ -2493,7 +2576,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NAME, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getParameter())) { foreach($vs as $v) { if (null === $v) { @@ -2508,7 +2590,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getPurpose())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PURPOSE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getRelatedArtifact())) { foreach($vs as $v) { if (null === $v) { @@ -2517,14 +2598,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_RELATED_ARTIFACT, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getTitle())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TITLE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getTopic())) { foreach($vs as $v) { if (null === $v) { @@ -2533,7 +2612,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_TOPIC, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -2543,7 +2621,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getUsage())) { $v->xmlSerialize($sxe->addChild(self::FIELD_USAGE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getUseContext())) { foreach($vs as $v) { if (null === $v) { @@ -2565,8 +2642,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getApprovalDate())) { - $a[self::FIELD_APPROVAL_DATE] = $v->getValue(); - $a[self::FIELD_APPROVAL_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_APPROVAL_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_APPROVAL_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_APPROVAL_DATE] = $v; + } } if ([] !== ($vs = $this->getContact())) { $a[self::FIELD_CONTACT] = $vs; @@ -2578,61 +2662,148 @@ public function jsonSerialize() $a[self::FIELD_CONTRIBUTOR] = $vs; } if (null !== ($v = $this->getCopyright())) { - $a[self::FIELD_COPYRIGHT] = $v->getValue(); - $a[self::FIELD_COPYRIGHT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_COPYRIGHT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_COPYRIGHT_EXT] = $enc; + } + } else { + $a[self::FIELD_COPYRIGHT] = $v; + } } if ([] !== ($vs = $this->getDataRequirement())) { $a[self::FIELD_DATA_REQUIREMENT] = $vs; } if (null !== ($v = $this->getDate())) { - $a[self::FIELD_DATE] = $v->getValue(); - $a[self::FIELD_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_DATE] = $v; + } } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if (null !== ($v = $this->getEffectivePeriod())) { $a[self::FIELD_EFFECTIVE_PERIOD] = $v; } if (null !== ($v = $this->getExperimental())) { - $a[self::FIELD_EXPERIMENTAL] = $v->getValue(); - $a[self::FIELD_EXPERIMENTAL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EXPERIMENTAL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EXPERIMENTAL_EXT] = $enc; + } + } else { + $a[self::FIELD_EXPERIMENTAL] = $v; + } } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if ([] !== ($vs = $this->getJurisdiction())) { $a[self::FIELD_JURISDICTION] = $vs; } if (null !== ($v = $this->getLastReviewDate())) { - $a[self::FIELD_LAST_REVIEW_DATE] = $v->getValue(); - $a[self::FIELD_LAST_REVIEW_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_LAST_REVIEW_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_LAST_REVIEW_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_LAST_REVIEW_DATE] = $v; + } } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if ([] !== ($vs = $this->getParameter())) { $a[self::FIELD_PARAMETER] = $vs; } if (null !== ($v = $this->getPublisher())) { - $a[self::FIELD_PUBLISHER] = $v->getValue(); - $a[self::FIELD_PUBLISHER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PUBLISHER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PUBLISHER_EXT] = $enc; + } + } else { + $a[self::FIELD_PUBLISHER] = $v; + } } if (null !== ($v = $this->getPurpose())) { - $a[self::FIELD_PURPOSE] = $v->getValue(); - $a[self::FIELD_PURPOSE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PURPOSE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PURPOSE_EXT] = $enc; + } + } else { + $a[self::FIELD_PURPOSE] = $v; + } } if ([] !== ($vs = $this->getRelatedArtifact())) { $a[self::FIELD_RELATED_ARTIFACT] = $vs; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getTitle())) { - $a[self::FIELD_TITLE] = $v->getValue(); - $a[self::FIELD_TITLE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TITLE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TITLE_EXT] = $enc; + } + } else { + $a[self::FIELD_TITLE] = $v; + } } if ([] !== ($vs = $this->getTopic())) { $a[self::FIELD_TOPIC] = $vs; @@ -2641,19 +2812,40 @@ public function jsonSerialize() $a[self::FIELD_TYPE] = $v; } if (null !== ($v = $this->getUrl())) { - $a[self::FIELD_URL] = $v->getValue(); - $a[self::FIELD_URL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_URL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_URL_EXT] = $enc; + } + } else { + $a[self::FIELD_URL] = $v; + } } if (null !== ($v = $this->getUsage())) { - $a[self::FIELD_USAGE] = $v->getValue(); - $a[self::FIELD_USAGE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_USAGE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_USAGE_EXT] = $enc; + } + } else { + $a[self::FIELD_USAGE] = $v; + } } if ([] !== ($vs = $this->getUseContext())) { $a[self::FIELD_USE_CONTEXT] = $vs; } if (null !== ($v = $this->getVersion())) { - $a[self::FIELD_VERSION] = $v->getValue(); - $a[self::FIELD_VERSION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VERSION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VERSION_EXT] = $enc; + } + } else { + $a[self::FIELD_VERSION] = $v; + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRLinkage.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRLinkage.php index f3d7915eb9..78b27a578f 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRLinkage.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRLinkage.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -82,10 +82,6 @@ class FHIRLinkage extends FHIRDomainResource implements PHPFHIRContainedTypeInte { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_LINKAGE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ACTIVE = 'active'; const FIELD_ACTIVE_EXT = '_active'; const FIELD_AUTHOR = 'author'; @@ -125,6 +121,9 @@ class FHIRLinkage extends FHIRDomainResource implements PHPFHIRContainedTypeInte */ protected $item = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRLinkage Constructor * @param null|array $data @@ -147,8 +146,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ACTIVE] instanceof FHIRBoolean) { $this->setActive($data[self::FIELD_ACTIVE]); - } elseif ($ext && is_scalar($data[self::FIELD_ACTIVE])) { - $this->setActive(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_ACTIVE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ACTIVE])) { + $this->setActive(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_ACTIVE]] + $ext)); + } else if (is_array($data[self::FIELD_ACTIVE])) { + $this->setActive(new FHIRBoolean(array_merge($ext, $data[self::FIELD_ACTIVE]))); + } } else { $this->setActive(new FHIRBoolean($data[self::FIELD_ACTIVE])); } @@ -163,6 +166,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ITEM])) { if (is_array($data[self::FIELD_ITEM])) { foreach($data[self::FIELD_ITEM] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRLinkageItem) { $this->addItem($v); } else { @@ -425,14 +431,13 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getActive())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ACTIVE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getAuthor())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AUTHOR, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getItem())) { foreach($vs as $v) { if (null === $v) { @@ -451,8 +456,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getActive())) { - $a[self::FIELD_ACTIVE] = $v->getValue(); - $a[self::FIELD_ACTIVE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ACTIVE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ACTIVE_EXT] = $enc; + } + } else { + $a[self::FIELD_ACTIVE] = $v; + } } if (null !== ($v = $this->getAuthor())) { $a[self::FIELD_AUTHOR] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRList.php index 104a20451e..0b3e2138d0 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -87,10 +87,6 @@ class FHIRList extends FHIRDomainResource implements PHPFHIRContainedTypeInterfa { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_LIST; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CODE = 'code'; const FIELD_DATE = 'date'; const FIELD_DATE_EXT = '_date'; @@ -262,6 +258,9 @@ class FHIRList extends FHIRDomainResource implements PHPFHIRContainedTypeInterfa */ protected $title = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRList Constructor * @param null|array $data @@ -291,8 +290,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATE] instanceof FHIRDateTime) { $this->setDate($data[self::FIELD_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_DATE])) { - $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime(array_merge($ext, $data[self::FIELD_DATE]))); + } } else { $this->setDate(new FHIRDateTime($data[self::FIELD_DATE])); } @@ -314,6 +317,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ENTRY])) { if (is_array($data[self::FIELD_ENTRY])) { foreach($data[self::FIELD_ENTRY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRListEntry) { $this->addEntry($v); } else { @@ -332,17 +338,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -354,8 +367,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MODE] instanceof FHIRListMode) { $this->setMode($data[self::FIELD_MODE]); - } elseif ($ext && is_scalar($data[self::FIELD_MODE])) { - $this->setMode(new FHIRListMode([FHIRListMode::FIELD_VALUE => $data[self::FIELD_MODE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MODE])) { + $this->setMode(new FHIRListMode([FHIRListMode::FIELD_VALUE => $data[self::FIELD_MODE]] + $ext)); + } else if (is_array($data[self::FIELD_MODE])) { + $this->setMode(new FHIRListMode(array_merge($ext, $data[self::FIELD_MODE]))); + } } else { $this->setMode(new FHIRListMode($data[self::FIELD_MODE])); } @@ -363,6 +380,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_NOTE])) { if (is_array($data[self::FIELD_NOTE])) { foreach($data[self::FIELD_NOTE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRAnnotation) { $this->addNote($v); } else { @@ -395,8 +415,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRListStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRListStatus([FHIRListStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRListStatus([FHIRListStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRListStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRListStatus($data[self::FIELD_STATUS])); } @@ -414,8 +438,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TITLE] instanceof FHIRString) { $this->setTitle($data[self::FIELD_TITLE]); - } elseif ($ext && is_scalar($data[self::FIELD_TITLE])) { - $this->setTitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TITLE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TITLE])) { + $this->setTitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TITLE]] + $ext)); + } else if (is_array($data[self::FIELD_TITLE])) { + $this->setTitle(new FHIRString(array_merge($ext, $data[self::FIELD_TITLE]))); + } } else { $this->setTitle(new FHIRString($data[self::FIELD_TITLE])); } @@ -1089,15 +1117,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DATE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getEmptyReason())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EMPTY_REASON, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getEncounter())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ENCOUNTER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getEntry())) { foreach($vs as $v) { if (null === $v) { @@ -1106,7 +1131,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_ENTRY, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -1115,11 +1139,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getMode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MODE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getNote())) { foreach($vs as $v) { if (null === $v) { @@ -1128,19 +1150,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_NOTE, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getOrderedBy())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ORDERED_BY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSource())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SOURCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSubject())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBJECT, null, $v->_getFHIRXMLNamespace())); } @@ -1160,8 +1178,15 @@ public function jsonSerialize() $a[self::FIELD_CODE] = $v; } if (null !== ($v = $this->getDate())) { - $a[self::FIELD_DATE] = $v->getValue(); - $a[self::FIELD_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_DATE] = $v; + } } if (null !== ($v = $this->getEmptyReason())) { $a[self::FIELD_EMPTY_REASON] = $v; @@ -1173,10 +1198,34 @@ public function jsonSerialize() $a[self::FIELD_ENTRY] = $vs; } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if (null !== ($v = $this->getMode())) { - $a[self::FIELD_MODE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MODE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MODE_EXT] = $enc; + } + } else { + $a[self::FIELD_MODE] = $v; + } } if ([] !== ($vs = $this->getNote())) { $a[self::FIELD_NOTE] = $vs; @@ -1188,14 +1237,29 @@ public function jsonSerialize() $a[self::FIELD_SOURCE] = $v; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getSubject())) { $a[self::FIELD_SUBJECT] = $v; } if (null !== ($v = $this->getTitle())) { - $a[self::FIELD_TITLE] = $v->getValue(); - $a[self::FIELD_TITLE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TITLE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TITLE_EXT] = $enc; + } + } else { + $a[self::FIELD_TITLE] = $v; + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRLocation.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRLocation.php index d1ec004db7..1b6172d7af 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRLocation.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRLocation.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -90,10 +90,6 @@ class FHIRLocation extends FHIRDomainResource implements PHPFHIRContainedTypeInt { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_LOCATION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ADDRESS = 'address'; const FIELD_ALIAS = 'alias'; const FIELD_ALIAS_EXT = '_alias'; @@ -298,6 +294,9 @@ class FHIRLocation extends FHIRDomainResource implements PHPFHIRContainedTypeInt */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRLocation Constructor * @param null|array $data @@ -327,17 +326,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_ALIAS])) { foreach($data[self::FIELD_ALIAS] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRString) { $this->addAlias($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addAlias(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addAlias(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addAlias(new FHIRString(array_merge($v, $ext[$i]))); + } } else { $this->addAlias(new FHIRString($v)); } } } elseif ($data[self::FIELD_ALIAS] instanceof FHIRString) { $this->addAlias($data[self::FIELD_ALIAS]); - } elseif ($ext && is_scalar($data[self::FIELD_ALIAS])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_ALIAS])) { $this->addAlias(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_ALIAS]] + $ext)); } else { $this->addAlias(new FHIRString($data[self::FIELD_ALIAS])); @@ -349,8 +355,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -358,6 +368,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ENDPOINT])) { if (is_array($data[self::FIELD_ENDPOINT])) { foreach($data[self::FIELD_ENDPOINT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addEndpoint($v); } else { @@ -376,17 +389,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -405,8 +425,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MODE] instanceof FHIRLocationMode) { $this->setMode($data[self::FIELD_MODE]); - } elseif ($ext && is_scalar($data[self::FIELD_MODE])) { - $this->setMode(new FHIRLocationMode([FHIRLocationMode::FIELD_VALUE => $data[self::FIELD_MODE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MODE])) { + $this->setMode(new FHIRLocationMode([FHIRLocationMode::FIELD_VALUE => $data[self::FIELD_MODE]] + $ext)); + } else if (is_array($data[self::FIELD_MODE])) { + $this->setMode(new FHIRLocationMode(array_merge($ext, $data[self::FIELD_MODE]))); + } } else { $this->setMode(new FHIRLocationMode($data[self::FIELD_MODE])); } @@ -417,8 +441,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -457,8 +485,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRLocationStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRLocationStatus([FHIRLocationStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRLocationStatus([FHIRLocationStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRLocationStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRLocationStatus($data[self::FIELD_STATUS])); } @@ -469,17 +501,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_TELECOM])) { foreach($data[self::FIELD_TELECOM] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContactPoint) { $this->addTelecom($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addTelecom(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addTelecom(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addTelecom(new FHIRContactPoint(array_merge($v, $ext[$i]))); + } } else { $this->addTelecom(new FHIRContactPoint($v)); } } } elseif ($data[self::FIELD_TELECOM] instanceof FHIRContactPoint) { $this->addTelecom($data[self::FIELD_TELECOM]); - } elseif ($ext && is_scalar($data[self::FIELD_TELECOM])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_TELECOM])) { $this->addTelecom(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $data[self::FIELD_TELECOM]] + $ext)); } else { $this->addTelecom(new FHIRContactPoint($data[self::FIELD_TELECOM])); @@ -1292,7 +1331,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESCRIPTION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getEndpoint())) { foreach($vs as $v) { if (null === $v) { @@ -1301,7 +1339,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_ENDPOINT, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -1310,38 +1347,30 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getManagingOrganization())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MANAGING_ORGANIZATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getMode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MODE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NAME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOperationalStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OPERATIONAL_STATUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPartOf())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PART_OF, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPhysicalType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PHYSICAL_TYPE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPosition())) { $v->xmlSerialize($sxe->addChild(self::FIELD_POSITION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getTelecom())) { foreach($vs as $v) { if (null === $v) { @@ -1350,7 +1379,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_TELECOM, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -1372,29 +1400,76 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_ALIAS][] = $v->getValue(); - $a[self::FIELD_ALIAS_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ALIAS][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ALIAS_EXT][] = $enc; + } else { + $a[self::FIELD_ALIAS_EXT][] = null; + } + } else { + $a[self::FIELD_ALIAS][] = $v; + } } } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if ([] !== ($vs = $this->getEndpoint())) { $a[self::FIELD_ENDPOINT] = $vs; } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if (null !== ($v = $this->getManagingOrganization())) { $a[self::FIELD_MANAGING_ORGANIZATION] = $v; } if (null !== ($v = $this->getMode())) { - $a[self::FIELD_MODE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MODE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MODE_EXT] = $enc; + } + } else { + $a[self::FIELD_MODE] = $v; + } } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if (null !== ($v = $this->getOperationalStatus())) { $a[self::FIELD_OPERATIONAL_STATUS] = $v; @@ -1409,10 +1484,34 @@ public function jsonSerialize() $a[self::FIELD_POSITION] = $v; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if ([] !== ($vs = $this->getTelecom())) { - $a[self::FIELD_TELECOM] = $vs; + $a[self::FIELD_TELECOM] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TELECOM][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TELECOM_EXT][] = $enc; + } else { + $a[self::FIELD_TELECOM_EXT][] = null; + } + } else { + $a[self::FIELD_TELECOM][] = $v; + } + } } if (null !== ($v = $this->getType())) { $a[self::FIELD_TYPE] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRMeasure.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRMeasure.php index 28bf7904dc..87e1c22d1f 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRMeasure.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRMeasure.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -95,10 +95,6 @@ class FHIRMeasure extends FHIRDomainResource implements PHPFHIRContainedTypeInte { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MEASURE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_APPROVAL_DATE = 'approvalDate'; const FIELD_APPROVAL_DATE_EXT = '_approvalDate'; const FIELD_CLINICAL_RECOMMENDATION_STATEMENT = 'clinicalRecommendationStatement'; @@ -677,6 +673,9 @@ class FHIRMeasure extends FHIRDomainResource implements PHPFHIRContainedTypeInte */ protected $version = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMeasure Constructor * @param null|array $data @@ -699,8 +698,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_APPROVAL_DATE] instanceof FHIRDate) { $this->setApprovalDate($data[self::FIELD_APPROVAL_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_APPROVAL_DATE])) { - $this->setApprovalDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_APPROVAL_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_APPROVAL_DATE])) { + $this->setApprovalDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_APPROVAL_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_APPROVAL_DATE])) { + $this->setApprovalDate(new FHIRDate(array_merge($ext, $data[self::FIELD_APPROVAL_DATE]))); + } } else { $this->setApprovalDate(new FHIRDate($data[self::FIELD_APPROVAL_DATE])); } @@ -711,8 +714,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CLINICAL_RECOMMENDATION_STATEMENT] instanceof FHIRMarkdown) { $this->setClinicalRecommendationStatement($data[self::FIELD_CLINICAL_RECOMMENDATION_STATEMENT]); - } elseif ($ext && is_scalar($data[self::FIELD_CLINICAL_RECOMMENDATION_STATEMENT])) { - $this->setClinicalRecommendationStatement(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_CLINICAL_RECOMMENDATION_STATEMENT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CLINICAL_RECOMMENDATION_STATEMENT])) { + $this->setClinicalRecommendationStatement(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_CLINICAL_RECOMMENDATION_STATEMENT]] + $ext)); + } else if (is_array($data[self::FIELD_CLINICAL_RECOMMENDATION_STATEMENT])) { + $this->setClinicalRecommendationStatement(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_CLINICAL_RECOMMENDATION_STATEMENT]))); + } } else { $this->setClinicalRecommendationStatement(new FHIRMarkdown($data[self::FIELD_CLINICAL_RECOMMENDATION_STATEMENT])); } @@ -727,6 +734,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CONTACT])) { if (is_array($data[self::FIELD_CONTACT])) { foreach($data[self::FIELD_CONTACT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContactDetail) { $this->addContact($v); } else { @@ -742,6 +752,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CONTRIBUTOR])) { if (is_array($data[self::FIELD_CONTRIBUTOR])) { foreach($data[self::FIELD_CONTRIBUTOR] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContributor) { $this->addContributor($v); } else { @@ -760,8 +773,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_COPYRIGHT] instanceof FHIRMarkdown) { $this->setCopyright($data[self::FIELD_COPYRIGHT]); - } elseif ($ext && is_scalar($data[self::FIELD_COPYRIGHT])) { - $this->setCopyright(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_COPYRIGHT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_COPYRIGHT])) { + $this->setCopyright(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_COPYRIGHT]] + $ext)); + } else if (is_array($data[self::FIELD_COPYRIGHT])) { + $this->setCopyright(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_COPYRIGHT]))); + } } else { $this->setCopyright(new FHIRMarkdown($data[self::FIELD_COPYRIGHT])); } @@ -772,8 +789,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATE] instanceof FHIRDateTime) { $this->setDate($data[self::FIELD_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_DATE])) { - $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime(array_merge($ext, $data[self::FIELD_DATE]))); + } } else { $this->setDate(new FHIRDateTime($data[self::FIELD_DATE])); } @@ -784,17 +805,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_DEFINITION])) { foreach($data[self::FIELD_DEFINITION] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRMarkdown) { $this->addDefinition($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addDefinition(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addDefinition(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addDefinition(new FHIRMarkdown(array_merge($v, $ext[$i]))); + } } else { $this->addDefinition(new FHIRMarkdown($v)); } } } elseif ($data[self::FIELD_DEFINITION] instanceof FHIRMarkdown) { $this->addDefinition($data[self::FIELD_DEFINITION]); - } elseif ($ext && is_scalar($data[self::FIELD_DEFINITION])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_DEFINITION])) { $this->addDefinition(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_DEFINITION]] + $ext)); } else { $this->addDefinition(new FHIRMarkdown($data[self::FIELD_DEFINITION])); @@ -806,8 +834,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRMarkdown) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRMarkdown($data[self::FIELD_DESCRIPTION])); } @@ -818,8 +850,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DISCLAIMER] instanceof FHIRMarkdown) { $this->setDisclaimer($data[self::FIELD_DISCLAIMER]); - } elseif ($ext && is_scalar($data[self::FIELD_DISCLAIMER])) { - $this->setDisclaimer(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_DISCLAIMER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DISCLAIMER])) { + $this->setDisclaimer(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_DISCLAIMER]] + $ext)); + } else if (is_array($data[self::FIELD_DISCLAIMER])) { + $this->setDisclaimer(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_DISCLAIMER]))); + } } else { $this->setDisclaimer(new FHIRMarkdown($data[self::FIELD_DISCLAIMER])); } @@ -837,8 +873,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EXPERIMENTAL] instanceof FHIRBoolean) { $this->setExperimental($data[self::FIELD_EXPERIMENTAL]); - } elseif ($ext && is_scalar($data[self::FIELD_EXPERIMENTAL])) { - $this->setExperimental(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_EXPERIMENTAL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EXPERIMENTAL])) { + $this->setExperimental(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_EXPERIMENTAL]] + $ext)); + } else if (is_array($data[self::FIELD_EXPERIMENTAL])) { + $this->setExperimental(new FHIRBoolean(array_merge($ext, $data[self::FIELD_EXPERIMENTAL]))); + } } else { $this->setExperimental(new FHIRBoolean($data[self::FIELD_EXPERIMENTAL])); } @@ -846,6 +886,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_GROUP])) { if (is_array($data[self::FIELD_GROUP])) { foreach($data[self::FIELD_GROUP] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRMeasureGroup) { $this->addGroup($v); } else { @@ -864,8 +907,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_GUIDANCE] instanceof FHIRMarkdown) { $this->setGuidance($data[self::FIELD_GUIDANCE]); - } elseif ($ext && is_scalar($data[self::FIELD_GUIDANCE])) { - $this->setGuidance(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_GUIDANCE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_GUIDANCE])) { + $this->setGuidance(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_GUIDANCE]] + $ext)); + } else if (is_array($data[self::FIELD_GUIDANCE])) { + $this->setGuidance(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_GUIDANCE]))); + } } else { $this->setGuidance(new FHIRMarkdown($data[self::FIELD_GUIDANCE])); } @@ -876,17 +923,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -898,8 +952,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IMPROVEMENT_NOTATION] instanceof FHIRString) { $this->setImprovementNotation($data[self::FIELD_IMPROVEMENT_NOTATION]); - } elseif ($ext && is_scalar($data[self::FIELD_IMPROVEMENT_NOTATION])) { - $this->setImprovementNotation(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_IMPROVEMENT_NOTATION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IMPROVEMENT_NOTATION])) { + $this->setImprovementNotation(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_IMPROVEMENT_NOTATION]] + $ext)); + } else if (is_array($data[self::FIELD_IMPROVEMENT_NOTATION])) { + $this->setImprovementNotation(new FHIRString(array_merge($ext, $data[self::FIELD_IMPROVEMENT_NOTATION]))); + } } else { $this->setImprovementNotation(new FHIRString($data[self::FIELD_IMPROVEMENT_NOTATION])); } @@ -907,6 +965,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_JURISDICTION])) { if (is_array($data[self::FIELD_JURISDICTION])) { foreach($data[self::FIELD_JURISDICTION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addJurisdiction($v); } else { @@ -925,8 +986,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_LAST_REVIEW_DATE] instanceof FHIRDate) { $this->setLastReviewDate($data[self::FIELD_LAST_REVIEW_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_LAST_REVIEW_DATE])) { - $this->setLastReviewDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_LAST_REVIEW_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_LAST_REVIEW_DATE])) { + $this->setLastReviewDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_LAST_REVIEW_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_LAST_REVIEW_DATE])) { + $this->setLastReviewDate(new FHIRDate(array_merge($ext, $data[self::FIELD_LAST_REVIEW_DATE]))); + } } else { $this->setLastReviewDate(new FHIRDate($data[self::FIELD_LAST_REVIEW_DATE])); } @@ -934,6 +999,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_LIBRARY])) { if (is_array($data[self::FIELD_LIBRARY])) { foreach($data[self::FIELD_LIBRARY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addLibrary($v); } else { @@ -952,8 +1020,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -964,8 +1036,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PUBLISHER] instanceof FHIRString) { $this->setPublisher($data[self::FIELD_PUBLISHER]); - } elseif ($ext && is_scalar($data[self::FIELD_PUBLISHER])) { - $this->setPublisher(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PUBLISHER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PUBLISHER])) { + $this->setPublisher(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PUBLISHER]] + $ext)); + } else if (is_array($data[self::FIELD_PUBLISHER])) { + $this->setPublisher(new FHIRString(array_merge($ext, $data[self::FIELD_PUBLISHER]))); + } } else { $this->setPublisher(new FHIRString($data[self::FIELD_PUBLISHER])); } @@ -976,8 +1052,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PURPOSE] instanceof FHIRMarkdown) { $this->setPurpose($data[self::FIELD_PURPOSE]); - } elseif ($ext && is_scalar($data[self::FIELD_PURPOSE])) { - $this->setPurpose(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_PURPOSE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PURPOSE])) { + $this->setPurpose(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_PURPOSE]] + $ext)); + } else if (is_array($data[self::FIELD_PURPOSE])) { + $this->setPurpose(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_PURPOSE]))); + } } else { $this->setPurpose(new FHIRMarkdown($data[self::FIELD_PURPOSE])); } @@ -988,8 +1068,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_RATE_AGGREGATION] instanceof FHIRString) { $this->setRateAggregation($data[self::FIELD_RATE_AGGREGATION]); - } elseif ($ext && is_scalar($data[self::FIELD_RATE_AGGREGATION])) { - $this->setRateAggregation(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_RATE_AGGREGATION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_RATE_AGGREGATION])) { + $this->setRateAggregation(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_RATE_AGGREGATION]] + $ext)); + } else if (is_array($data[self::FIELD_RATE_AGGREGATION])) { + $this->setRateAggregation(new FHIRString(array_merge($ext, $data[self::FIELD_RATE_AGGREGATION]))); + } } else { $this->setRateAggregation(new FHIRString($data[self::FIELD_RATE_AGGREGATION])); } @@ -1000,8 +1084,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_RATIONALE] instanceof FHIRMarkdown) { $this->setRationale($data[self::FIELD_RATIONALE]); - } elseif ($ext && is_scalar($data[self::FIELD_RATIONALE])) { - $this->setRationale(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_RATIONALE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_RATIONALE])) { + $this->setRationale(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_RATIONALE]] + $ext)); + } else if (is_array($data[self::FIELD_RATIONALE])) { + $this->setRationale(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_RATIONALE]))); + } } else { $this->setRationale(new FHIRMarkdown($data[self::FIELD_RATIONALE])); } @@ -1009,6 +1097,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_RELATED_ARTIFACT])) { if (is_array($data[self::FIELD_RELATED_ARTIFACT])) { foreach($data[self::FIELD_RELATED_ARTIFACT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRRelatedArtifact) { $this->addRelatedArtifact($v); } else { @@ -1027,8 +1118,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_RISK_ADJUSTMENT] instanceof FHIRString) { $this->setRiskAdjustment($data[self::FIELD_RISK_ADJUSTMENT]); - } elseif ($ext && is_scalar($data[self::FIELD_RISK_ADJUSTMENT])) { - $this->setRiskAdjustment(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_RISK_ADJUSTMENT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_RISK_ADJUSTMENT])) { + $this->setRiskAdjustment(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_RISK_ADJUSTMENT]] + $ext)); + } else if (is_array($data[self::FIELD_RISK_ADJUSTMENT])) { + $this->setRiskAdjustment(new FHIRString(array_merge($ext, $data[self::FIELD_RISK_ADJUSTMENT]))); + } } else { $this->setRiskAdjustment(new FHIRString($data[self::FIELD_RISK_ADJUSTMENT])); } @@ -1046,8 +1141,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SET] instanceof FHIRString) { $this->setSet($data[self::FIELD_SET]); - } elseif ($ext && is_scalar($data[self::FIELD_SET])) { - $this->setSet(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SET]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SET])) { + $this->setSet(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_SET]] + $ext)); + } else if (is_array($data[self::FIELD_SET])) { + $this->setSet(new FHIRString(array_merge($ext, $data[self::FIELD_SET]))); + } } else { $this->setSet(new FHIRString($data[self::FIELD_SET])); } @@ -1058,8 +1157,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRPublicationStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRPublicationStatus([FHIRPublicationStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRPublicationStatus([FHIRPublicationStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRPublicationStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRPublicationStatus($data[self::FIELD_STATUS])); } @@ -1067,6 +1170,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SUPPLEMENTAL_DATA])) { if (is_array($data[self::FIELD_SUPPLEMENTAL_DATA])) { foreach($data[self::FIELD_SUPPLEMENTAL_DATA] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRMeasureSupplementalData) { $this->addSupplementalData($v); } else { @@ -1085,8 +1191,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TITLE] instanceof FHIRString) { $this->setTitle($data[self::FIELD_TITLE]); - } elseif ($ext && is_scalar($data[self::FIELD_TITLE])) { - $this->setTitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TITLE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TITLE])) { + $this->setTitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TITLE]] + $ext)); + } else if (is_array($data[self::FIELD_TITLE])) { + $this->setTitle(new FHIRString(array_merge($ext, $data[self::FIELD_TITLE]))); + } } else { $this->setTitle(new FHIRString($data[self::FIELD_TITLE])); } @@ -1094,6 +1204,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_TOPIC])) { if (is_array($data[self::FIELD_TOPIC])) { foreach($data[self::FIELD_TOPIC] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addTopic($v); } else { @@ -1109,6 +1222,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_TYPE])) { if (is_array($data[self::FIELD_TYPE])) { foreach($data[self::FIELD_TYPE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addType($v); } else { @@ -1127,8 +1243,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_URL] instanceof FHIRUri) { $this->setUrl($data[self::FIELD_URL]); - } elseif ($ext && is_scalar($data[self::FIELD_URL])) { - $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } else if (is_array($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri(array_merge($ext, $data[self::FIELD_URL]))); + } } else { $this->setUrl(new FHIRUri($data[self::FIELD_URL])); } @@ -1139,8 +1259,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_USAGE] instanceof FHIRString) { $this->setUsage($data[self::FIELD_USAGE]); - } elseif ($ext && is_scalar($data[self::FIELD_USAGE])) { - $this->setUsage(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_USAGE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_USAGE])) { + $this->setUsage(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_USAGE]] + $ext)); + } else if (is_array($data[self::FIELD_USAGE])) { + $this->setUsage(new FHIRString(array_merge($ext, $data[self::FIELD_USAGE]))); + } } else { $this->setUsage(new FHIRString($data[self::FIELD_USAGE])); } @@ -1148,6 +1272,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_USE_CONTEXT])) { if (is_array($data[self::FIELD_USE_CONTEXT])) { foreach($data[self::FIELD_USE_CONTEXT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRUsageContext) { $this->addUseContext($v); } else { @@ -1166,8 +1293,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VERSION] instanceof FHIRString) { $this->setVersion($data[self::FIELD_VERSION]); - } elseif ($ext && is_scalar($data[self::FIELD_VERSION])) { - $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } else if (is_array($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString(array_merge($ext, $data[self::FIELD_VERSION]))); + } } else { $this->setVersion(new FHIRString($data[self::FIELD_VERSION])); } @@ -3321,17 +3452,16 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getApprovalDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_APPROVAL_DATE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getClinicalRecommendationStatement())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CLINICAL_RECOMMENDATION_STATEMENT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getCompositeScoring())) { $v->xmlSerialize($sxe->addChild(self::FIELD_COMPOSITE_SCORING, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getContact())) { foreach($vs as $v) { if (null === $v) { @@ -3340,7 +3470,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_CONTACT, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getContributor())) { foreach($vs as $v) { if (null === $v) { @@ -3369,14 +3498,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDisclaimer())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DISCLAIMER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getEffectivePeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EFFECTIVE_PERIOD, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getExperimental())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EXPERIMENTAL, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getGroup())) { foreach($vs as $v) { if (null === $v) { @@ -3388,7 +3515,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getGuidance())) { $v->xmlSerialize($sxe->addChild(self::FIELD_GUIDANCE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -3400,7 +3526,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getImprovementNotation())) { $v->xmlSerialize($sxe->addChild(self::FIELD_IMPROVEMENT_NOTATION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getJurisdiction())) { foreach($vs as $v) { if (null === $v) { @@ -3412,7 +3537,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getLastReviewDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_LAST_REVIEW_DATE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getLibrary())) { foreach($vs as $v) { if (null === $v) { @@ -3436,7 +3560,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getRationale())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RATIONALE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getRelatedArtifact())) { foreach($vs as $v) { if (null === $v) { @@ -3448,18 +3571,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getRiskAdjustment())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RISK_ADJUSTMENT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getScoring())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SCORING, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getSet())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SET, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getSupplementalData())) { foreach($vs as $v) { if (null === $v) { @@ -3471,7 +3591,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getTitle())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TITLE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getTopic())) { foreach($vs as $v) { if (null === $v) { @@ -3480,7 +3599,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_TOPIC, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getType())) { foreach($vs as $v) { if (null === $v) { @@ -3495,7 +3613,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getUsage())) { $v->xmlSerialize($sxe->addChild(self::FIELD_USAGE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getUseContext())) { foreach($vs as $v) { if (null === $v) { @@ -3517,12 +3634,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getApprovalDate())) { - $a[self::FIELD_APPROVAL_DATE] = $v->getValue(); - $a[self::FIELD_APPROVAL_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_APPROVAL_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_APPROVAL_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_APPROVAL_DATE] = $v; + } } if (null !== ($v = $this->getClinicalRecommendationStatement())) { - $a[self::FIELD_CLINICAL_RECOMMENDATION_STATEMENT] = $v->getValue(); - $a[self::FIELD_CLINICAL_RECOMMENDATION_STATEMENT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CLINICAL_RECOMMENDATION_STATEMENT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CLINICAL_RECOMMENDATION_STATEMENT_EXT] = $enc; + } + } else { + $a[self::FIELD_CLINICAL_RECOMMENDATION_STATEMENT] = $v; + } } if (null !== ($v = $this->getCompositeScoring())) { $a[self::FIELD_COMPOSITE_SCORING] = $v; @@ -3534,12 +3665,26 @@ public function jsonSerialize() $a[self::FIELD_CONTRIBUTOR] = $vs; } if (null !== ($v = $this->getCopyright())) { - $a[self::FIELD_COPYRIGHT] = $v->getValue(); - $a[self::FIELD_COPYRIGHT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_COPYRIGHT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_COPYRIGHT_EXT] = $enc; + } + } else { + $a[self::FIELD_COPYRIGHT] = $v; + } } if (null !== ($v = $this->getDate())) { - $a[self::FIELD_DATE] = $v->getValue(); - $a[self::FIELD_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_DATE] = $v; + } } if ([] !== ($vs = $this->getDefinition())) { $a[self::FIELD_DEFINITION] = []; @@ -3547,92 +3692,223 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_DEFINITION][] = $v->getValue(); - $a[self::FIELD_DEFINITION_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DEFINITION][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DEFINITION_EXT][] = $enc; + } else { + $a[self::FIELD_DEFINITION_EXT][] = null; + } + } else { + $a[self::FIELD_DEFINITION][] = $v; + } } } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if (null !== ($v = $this->getDisclaimer())) { - $a[self::FIELD_DISCLAIMER] = $v->getValue(); - $a[self::FIELD_DISCLAIMER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DISCLAIMER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DISCLAIMER_EXT] = $enc; + } + } else { + $a[self::FIELD_DISCLAIMER] = $v; + } } if (null !== ($v = $this->getEffectivePeriod())) { $a[self::FIELD_EFFECTIVE_PERIOD] = $v; } if (null !== ($v = $this->getExperimental())) { - $a[self::FIELD_EXPERIMENTAL] = $v->getValue(); - $a[self::FIELD_EXPERIMENTAL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EXPERIMENTAL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EXPERIMENTAL_EXT] = $enc; + } + } else { + $a[self::FIELD_EXPERIMENTAL] = $v; + } } if ([] !== ($vs = $this->getGroup())) { $a[self::FIELD_GROUP] = $vs; } if (null !== ($v = $this->getGuidance())) { - $a[self::FIELD_GUIDANCE] = $v->getValue(); - $a[self::FIELD_GUIDANCE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_GUIDANCE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_GUIDANCE_EXT] = $enc; + } + } else { + $a[self::FIELD_GUIDANCE] = $v; + } } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if (null !== ($v = $this->getImprovementNotation())) { - $a[self::FIELD_IMPROVEMENT_NOTATION] = $v->getValue(); - $a[self::FIELD_IMPROVEMENT_NOTATION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IMPROVEMENT_NOTATION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IMPROVEMENT_NOTATION_EXT] = $enc; + } + } else { + $a[self::FIELD_IMPROVEMENT_NOTATION] = $v; + } } if ([] !== ($vs = $this->getJurisdiction())) { $a[self::FIELD_JURISDICTION] = $vs; } if (null !== ($v = $this->getLastReviewDate())) { - $a[self::FIELD_LAST_REVIEW_DATE] = $v->getValue(); - $a[self::FIELD_LAST_REVIEW_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_LAST_REVIEW_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_LAST_REVIEW_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_LAST_REVIEW_DATE] = $v; + } } if ([] !== ($vs = $this->getLibrary())) { $a[self::FIELD_LIBRARY] = $vs; } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if (null !== ($v = $this->getPublisher())) { - $a[self::FIELD_PUBLISHER] = $v->getValue(); - $a[self::FIELD_PUBLISHER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PUBLISHER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PUBLISHER_EXT] = $enc; + } + } else { + $a[self::FIELD_PUBLISHER] = $v; + } } if (null !== ($v = $this->getPurpose())) { - $a[self::FIELD_PURPOSE] = $v->getValue(); - $a[self::FIELD_PURPOSE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PURPOSE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PURPOSE_EXT] = $enc; + } + } else { + $a[self::FIELD_PURPOSE] = $v; + } } if (null !== ($v = $this->getRateAggregation())) { - $a[self::FIELD_RATE_AGGREGATION] = $v->getValue(); - $a[self::FIELD_RATE_AGGREGATION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_RATE_AGGREGATION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_RATE_AGGREGATION_EXT] = $enc; + } + } else { + $a[self::FIELD_RATE_AGGREGATION] = $v; + } } if (null !== ($v = $this->getRationale())) { - $a[self::FIELD_RATIONALE] = $v->getValue(); - $a[self::FIELD_RATIONALE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_RATIONALE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_RATIONALE_EXT] = $enc; + } + } else { + $a[self::FIELD_RATIONALE] = $v; + } } if ([] !== ($vs = $this->getRelatedArtifact())) { $a[self::FIELD_RELATED_ARTIFACT] = $vs; } if (null !== ($v = $this->getRiskAdjustment())) { - $a[self::FIELD_RISK_ADJUSTMENT] = $v->getValue(); - $a[self::FIELD_RISK_ADJUSTMENT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_RISK_ADJUSTMENT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_RISK_ADJUSTMENT_EXT] = $enc; + } + } else { + $a[self::FIELD_RISK_ADJUSTMENT] = $v; + } } if (null !== ($v = $this->getScoring())) { $a[self::FIELD_SCORING] = $v; } if (null !== ($v = $this->getSet())) { - $a[self::FIELD_SET] = $v->getValue(); - $a[self::FIELD_SET_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SET] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SET_EXT] = $enc; + } + } else { + $a[self::FIELD_SET] = $v; + } } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if ([] !== ($vs = $this->getSupplementalData())) { $a[self::FIELD_SUPPLEMENTAL_DATA] = $vs; } if (null !== ($v = $this->getTitle())) { - $a[self::FIELD_TITLE] = $v->getValue(); - $a[self::FIELD_TITLE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TITLE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TITLE_EXT] = $enc; + } + } else { + $a[self::FIELD_TITLE] = $v; + } } if ([] !== ($vs = $this->getTopic())) { $a[self::FIELD_TOPIC] = $vs; @@ -3641,19 +3917,40 @@ public function jsonSerialize() $a[self::FIELD_TYPE] = $vs; } if (null !== ($v = $this->getUrl())) { - $a[self::FIELD_URL] = $v->getValue(); - $a[self::FIELD_URL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_URL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_URL_EXT] = $enc; + } + } else { + $a[self::FIELD_URL] = $v; + } } if (null !== ($v = $this->getUsage())) { - $a[self::FIELD_USAGE] = $v->getValue(); - $a[self::FIELD_USAGE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_USAGE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_USAGE_EXT] = $enc; + } + } else { + $a[self::FIELD_USAGE] = $v; + } } if ([] !== ($vs = $this->getUseContext())) { $a[self::FIELD_USE_CONTEXT] = $vs; } if (null !== ($v = $this->getVersion())) { - $a[self::FIELD_VERSION] = $v->getValue(); - $a[self::FIELD_VERSION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VERSION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VERSION_EXT] = $enc; + } + } else { + $a[self::FIELD_VERSION] = $v; + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRMeasureReport.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRMeasureReport.php index ba6a3724cf..2a47161c3a 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRMeasureReport.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRMeasureReport.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -85,10 +85,6 @@ class FHIRMeasureReport extends FHIRDomainResource implements PHPFHIRContainedTy { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MEASURE_REPORT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DATE = 'date'; const FIELD_DATE_EXT = '_date'; const FIELD_EVALUATED_RESOURCES = 'evaluatedResources'; @@ -221,6 +217,9 @@ class FHIRMeasureReport extends FHIRDomainResource implements PHPFHIRContainedTy */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMeasureReport Constructor * @param null|array $data @@ -243,8 +242,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATE] instanceof FHIRDateTime) { $this->setDate($data[self::FIELD_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_DATE])) { - $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime(array_merge($ext, $data[self::FIELD_DATE]))); + } } else { $this->setDate(new FHIRDateTime($data[self::FIELD_DATE])); } @@ -259,6 +262,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_GROUP])) { if (is_array($data[self::FIELD_GROUP])) { foreach($data[self::FIELD_GROUP] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRMeasureReportGroup) { $this->addGroup($v); } else { @@ -277,8 +283,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->setIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { - $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_IDENTIFIER]))); + } } else { $this->setIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); } @@ -317,8 +327,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRMeasureReportStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRMeasureReportStatus([FHIRMeasureReportStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRMeasureReportStatus([FHIRMeasureReportStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRMeasureReportStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRMeasureReportStatus($data[self::FIELD_STATUS])); } @@ -329,8 +343,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TYPE] instanceof FHIRMeasureReportType) { $this->setType($data[self::FIELD_TYPE]); - } elseif ($ext && is_scalar($data[self::FIELD_TYPE])) { - $this->setType(new FHIRMeasureReportType([FHIRMeasureReportType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TYPE])) { + $this->setType(new FHIRMeasureReportType([FHIRMeasureReportType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } else if (is_array($data[self::FIELD_TYPE])) { + $this->setType(new FHIRMeasureReportType(array_merge($ext, $data[self::FIELD_TYPE]))); + } } else { $this->setType(new FHIRMeasureReportType($data[self::FIELD_TYPE])); } @@ -825,14 +843,13 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DATE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getEvaluatedResources())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EVALUATED_RESOURCES, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getGroup())) { foreach($vs as $v) { if (null === $v) { @@ -841,31 +858,24 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_GROUP, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getMeasure())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MEASURE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPatient())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATIENT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getReportingOrganization())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REPORTING_ORGANIZATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -879,8 +889,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getDate())) { - $a[self::FIELD_DATE] = $v->getValue(); - $a[self::FIELD_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_DATE] = $v; + } } if (null !== ($v = $this->getEvaluatedResources())) { $a[self::FIELD_EVALUATED_RESOURCES] = $v; @@ -889,7 +906,15 @@ public function jsonSerialize() $a[self::FIELD_GROUP] = $vs; } if (null !== ($v = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_IDENTIFIER] = $v; + } } if (null !== ($v = $this->getMeasure())) { $a[self::FIELD_MEASURE] = $v; @@ -904,10 +929,26 @@ public function jsonSerialize() $a[self::FIELD_REPORTING_ORGANIZATION] = $v; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getType())) { - $a[self::FIELD_TYPE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TYPE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TYPE_EXT] = $enc; + } + } else { + $a[self::FIELD_TYPE] = $v; + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRMedia.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRMedia.php index 7650c7c71c..a61424e69f 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRMedia.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRMedia.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -89,10 +89,6 @@ class FHIRMedia extends FHIRDomainResource implements PHPFHIRContainedTypeInterf { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MEDIA; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_BASED_ON = 'basedOn'; const FIELD_BODY_SITE = 'bodySite'; const FIELD_CONTENT = 'content'; @@ -347,6 +343,9 @@ class FHIRMedia extends FHIRDomainResource implements PHPFHIRContainedTypeInterf */ protected $width = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMedia Constructor * @param null|array $data @@ -366,6 +365,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_BASED_ON])) { if (is_array($data[self::FIELD_BASED_ON])) { foreach($data[self::FIELD_BASED_ON] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addBasedOn($v); } else { @@ -412,8 +414,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DURATION] instanceof FHIRUnsignedInt) { $this->setDuration($data[self::FIELD_DURATION]); - } elseif ($ext && is_scalar($data[self::FIELD_DURATION])) { - $this->setDuration(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_DURATION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DURATION])) { + $this->setDuration(new FHIRUnsignedInt([FHIRUnsignedInt::FIELD_VALUE => $data[self::FIELD_DURATION]] + $ext)); + } else if (is_array($data[self::FIELD_DURATION])) { + $this->setDuration(new FHIRUnsignedInt(array_merge($ext, $data[self::FIELD_DURATION]))); + } } else { $this->setDuration(new FHIRUnsignedInt($data[self::FIELD_DURATION])); } @@ -424,8 +430,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_FRAMES] instanceof FHIRPositiveInt) { $this->setFrames($data[self::FIELD_FRAMES]); - } elseif ($ext && is_scalar($data[self::FIELD_FRAMES])) { - $this->setFrames(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_FRAMES]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_FRAMES])) { + $this->setFrames(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_FRAMES]] + $ext)); + } else if (is_array($data[self::FIELD_FRAMES])) { + $this->setFrames(new FHIRPositiveInt(array_merge($ext, $data[self::FIELD_FRAMES]))); + } } else { $this->setFrames(new FHIRPositiveInt($data[self::FIELD_FRAMES])); } @@ -436,8 +446,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_HEIGHT] instanceof FHIRPositiveInt) { $this->setHeight($data[self::FIELD_HEIGHT]); - } elseif ($ext && is_scalar($data[self::FIELD_HEIGHT])) { - $this->setHeight(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_HEIGHT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_HEIGHT])) { + $this->setHeight(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_HEIGHT]] + $ext)); + } else if (is_array($data[self::FIELD_HEIGHT])) { + $this->setHeight(new FHIRPositiveInt(array_merge($ext, $data[self::FIELD_HEIGHT]))); + } } else { $this->setHeight(new FHIRPositiveInt($data[self::FIELD_HEIGHT])); } @@ -448,17 +462,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -467,6 +488,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_NOTE])) { if (is_array($data[self::FIELD_NOTE])) { foreach($data[self::FIELD_NOTE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRAnnotation) { $this->addNote($v); } else { @@ -485,8 +509,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_OCCURRENCE_DATE_TIME] instanceof FHIRDateTime) { $this->setOccurrenceDateTime($data[self::FIELD_OCCURRENCE_DATE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_OCCURRENCE_DATE_TIME])) { - $this->setOccurrenceDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_OCCURRENCE_DATE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_OCCURRENCE_DATE_TIME])) { + $this->setOccurrenceDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_OCCURRENCE_DATE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_OCCURRENCE_DATE_TIME])) { + $this->setOccurrenceDateTime(new FHIRDateTime(array_merge($ext, $data[self::FIELD_OCCURRENCE_DATE_TIME]))); + } } else { $this->setOccurrenceDateTime(new FHIRDateTime($data[self::FIELD_OCCURRENCE_DATE_TIME])); } @@ -508,6 +536,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REASON_CODE])) { if (is_array($data[self::FIELD_REASON_CODE])) { foreach($data[self::FIELD_REASON_CODE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addReasonCode($v); } else { @@ -540,8 +571,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TYPE] instanceof FHIRDigitalMediaType) { $this->setType($data[self::FIELD_TYPE]); - } elseif ($ext && is_scalar($data[self::FIELD_TYPE])) { - $this->setType(new FHIRDigitalMediaType([FHIRDigitalMediaType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TYPE])) { + $this->setType(new FHIRDigitalMediaType([FHIRDigitalMediaType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } else if (is_array($data[self::FIELD_TYPE])) { + $this->setType(new FHIRDigitalMediaType(array_merge($ext, $data[self::FIELD_TYPE]))); + } } else { $this->setType(new FHIRDigitalMediaType($data[self::FIELD_TYPE])); } @@ -559,8 +594,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_WIDTH] instanceof FHIRPositiveInt) { $this->setWidth($data[self::FIELD_WIDTH]); - } elseif ($ext && is_scalar($data[self::FIELD_WIDTH])) { - $this->setWidth(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_WIDTH]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_WIDTH])) { + $this->setWidth(new FHIRPositiveInt([FHIRPositiveInt::FIELD_VALUE => $data[self::FIELD_WIDTH]] + $ext)); + } else if (is_array($data[self::FIELD_WIDTH])) { + $this->setWidth(new FHIRPositiveInt(array_merge($ext, $data[self::FIELD_WIDTH]))); + } } else { $this->setWidth(new FHIRPositiveInt($data[self::FIELD_WIDTH])); } @@ -1517,19 +1556,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_BASED_ON, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getBodySite())) { $v->xmlSerialize($sxe->addChild(self::FIELD_BODY_SITE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getContent())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CONTENT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getContext())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CONTEXT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDevice())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEVICE, null, $v->_getFHIRXMLNamespace())); } @@ -1542,7 +1577,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getHeight())) { $v->xmlSerialize($sxe->addChild(self::FIELD_HEIGHT, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -1551,7 +1585,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getNote())) { foreach($vs as $v) { if (null === $v) { @@ -1563,15 +1596,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getOccurrenceDateTime())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OCCURRENCE_DATE_TIME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOccurrencePeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OCCURRENCE_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOperator())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OPERATOR, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getReasonCode())) { foreach($vs as $v) { if (null === $v) { @@ -1580,19 +1610,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_REASON_CODE, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getSubject())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBJECT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSubtype())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBTYPE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getView())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VIEW, null, $v->_getFHIRXMLNamespace())); } @@ -1624,26 +1650,70 @@ public function jsonSerialize() $a[self::FIELD_DEVICE] = $v; } if (null !== ($v = $this->getDuration())) { - $a[self::FIELD_DURATION] = $v->getValue(); - $a[self::FIELD_DURATION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DURATION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DURATION_EXT] = $enc; + } + } else { + $a[self::FIELD_DURATION] = $v; + } } if (null !== ($v = $this->getFrames())) { - $a[self::FIELD_FRAMES] = $v->getValue(); - $a[self::FIELD_FRAMES_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FRAMES] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FRAMES_EXT] = $enc; + } + } else { + $a[self::FIELD_FRAMES] = $v; + } } if (null !== ($v = $this->getHeight())) { - $a[self::FIELD_HEIGHT] = $v->getValue(); - $a[self::FIELD_HEIGHT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_HEIGHT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_HEIGHT_EXT] = $enc; + } + } else { + $a[self::FIELD_HEIGHT] = $v; + } } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if ([] !== ($vs = $this->getNote())) { $a[self::FIELD_NOTE] = $vs; } if (null !== ($v = $this->getOccurrenceDateTime())) { - $a[self::FIELD_OCCURRENCE_DATE_TIME] = $v->getValue(); - $a[self::FIELD_OCCURRENCE_DATE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_OCCURRENCE_DATE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_OCCURRENCE_DATE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_OCCURRENCE_DATE_TIME] = $v; + } } if (null !== ($v = $this->getOccurrencePeriod())) { $a[self::FIELD_OCCURRENCE_PERIOD] = $v; @@ -1661,14 +1731,29 @@ public function jsonSerialize() $a[self::FIELD_SUBTYPE] = $v; } if (null !== ($v = $this->getType())) { - $a[self::FIELD_TYPE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TYPE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TYPE_EXT] = $enc; + } + } else { + $a[self::FIELD_TYPE] = $v; + } } if (null !== ($v = $this->getView())) { $a[self::FIELD_VIEW] = $v; } if (null !== ($v = $this->getWidth())) { - $a[self::FIELD_WIDTH] = $v->getValue(); - $a[self::FIELD_WIDTH_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_WIDTH] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_WIDTH_EXT] = $enc; + } + } else { + $a[self::FIELD_WIDTH] = $v; + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRMedication.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRMedication.php index be513ea4b1..a702b36eaf 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRMedication.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRMedication.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -86,10 +86,6 @@ class FHIRMedication extends FHIRDomainResource implements PHPFHIRContainedTypeI { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MEDICATION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CODE = 'code'; const FIELD_FORM = 'form'; const FIELD_IMAGE = 'image'; @@ -204,6 +200,9 @@ class FHIRMedication extends FHIRDomainResource implements PHPFHIRContainedTypeI */ protected $status = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMedication Constructor * @param null|array $data @@ -237,6 +236,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_IMAGE])) { if (is_array($data[self::FIELD_IMAGE])) { foreach($data[self::FIELD_IMAGE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRAttachment) { $this->addImage($v); } else { @@ -252,6 +254,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_INGREDIENT])) { if (is_array($data[self::FIELD_INGREDIENT])) { foreach($data[self::FIELD_INGREDIENT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRMedicationIngredient) { $this->addIngredient($v); } else { @@ -270,8 +275,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IS_BRAND] instanceof FHIRBoolean) { $this->setIsBrand($data[self::FIELD_IS_BRAND]); - } elseif ($ext && is_scalar($data[self::FIELD_IS_BRAND])) { - $this->setIsBrand(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_IS_BRAND]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IS_BRAND])) { + $this->setIsBrand(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_IS_BRAND]] + $ext)); + } else if (is_array($data[self::FIELD_IS_BRAND])) { + $this->setIsBrand(new FHIRBoolean(array_merge($ext, $data[self::FIELD_IS_BRAND]))); + } } else { $this->setIsBrand(new FHIRBoolean($data[self::FIELD_IS_BRAND])); } @@ -282,8 +291,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IS_OVER_THE_COUNTER] instanceof FHIRBoolean) { $this->setIsOverTheCounter($data[self::FIELD_IS_OVER_THE_COUNTER]); - } elseif ($ext && is_scalar($data[self::FIELD_IS_OVER_THE_COUNTER])) { - $this->setIsOverTheCounter(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_IS_OVER_THE_COUNTER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IS_OVER_THE_COUNTER])) { + $this->setIsOverTheCounter(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_IS_OVER_THE_COUNTER]] + $ext)); + } else if (is_array($data[self::FIELD_IS_OVER_THE_COUNTER])) { + $this->setIsOverTheCounter(new FHIRBoolean(array_merge($ext, $data[self::FIELD_IS_OVER_THE_COUNTER]))); + } } else { $this->setIsOverTheCounter(new FHIRBoolean($data[self::FIELD_IS_OVER_THE_COUNTER])); } @@ -308,8 +321,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRMedicationStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRMedicationStatus([FHIRMedicationStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRMedicationStatus([FHIRMedicationStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRMedicationStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRMedicationStatus($data[self::FIELD_STATUS])); } @@ -805,11 +822,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getForm())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FORM, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getImage())) { foreach($vs as $v) { if (null === $v) { @@ -818,7 +833,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_IMAGE, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getIngredient())) { foreach($vs as $v) { if (null === $v) { @@ -833,15 +847,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getIsOverTheCounter())) { $v->xmlSerialize($sxe->addChild(self::FIELD_IS_OVER_THE_COUNTER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getManufacturer())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MANUFACTURER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPackage())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PACKAGE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } @@ -867,12 +878,26 @@ public function jsonSerialize() $a[self::FIELD_INGREDIENT] = $vs; } if (null !== ($v = $this->getIsBrand())) { - $a[self::FIELD_IS_BRAND] = $v->getValue(); - $a[self::FIELD_IS_BRAND_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IS_BRAND] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IS_BRAND_EXT] = $enc; + } + } else { + $a[self::FIELD_IS_BRAND] = $v; + } } if (null !== ($v = $this->getIsOverTheCounter())) { - $a[self::FIELD_IS_OVER_THE_COUNTER] = $v->getValue(); - $a[self::FIELD_IS_OVER_THE_COUNTER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IS_OVER_THE_COUNTER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IS_OVER_THE_COUNTER_EXT] = $enc; + } + } else { + $a[self::FIELD_IS_OVER_THE_COUNTER] = $v; + } } if (null !== ($v = $this->getManufacturer())) { $a[self::FIELD_MANUFACTURER] = $v; @@ -881,7 +906,15 @@ public function jsonSerialize() $a[self::FIELD_PACKAGE] = $v; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRMedicationAdministration.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRMedicationAdministration.php index e1e22b8684..b915c8fb88 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRMedicationAdministration.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRMedicationAdministration.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -92,10 +92,6 @@ class FHIRMedicationAdministration extends FHIRDomainResource implements PHPFHIR { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MEDICATION_ADMINISTRATION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CATEGORY = 'category'; const FIELD_CONTEXT = 'context'; const FIELD_DEFINITION = 'definition'; @@ -403,6 +399,9 @@ class FHIRMedicationAdministration extends FHIRDomainResource implements PHPFHIR */ protected $supportingInformation = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMedicationAdministration Constructor * @param null|array $data @@ -436,6 +435,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_DEFINITION])) { if (is_array($data[self::FIELD_DEFINITION])) { foreach($data[self::FIELD_DEFINITION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addDefinition($v); } else { @@ -451,6 +453,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_DEVICE])) { if (is_array($data[self::FIELD_DEVICE])) { foreach($data[self::FIELD_DEVICE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addDevice($v); } else { @@ -476,8 +481,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EFFECTIVE_DATE_TIME] instanceof FHIRDateTime) { $this->setEffectiveDateTime($data[self::FIELD_EFFECTIVE_DATE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_EFFECTIVE_DATE_TIME])) { - $this->setEffectiveDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_EFFECTIVE_DATE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EFFECTIVE_DATE_TIME])) { + $this->setEffectiveDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_EFFECTIVE_DATE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_EFFECTIVE_DATE_TIME])) { + $this->setEffectiveDateTime(new FHIRDateTime(array_merge($ext, $data[self::FIELD_EFFECTIVE_DATE_TIME]))); + } } else { $this->setEffectiveDateTime(new FHIRDateTime($data[self::FIELD_EFFECTIVE_DATE_TIME])); } @@ -492,6 +501,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_EVENT_HISTORY])) { if (is_array($data[self::FIELD_EVENT_HISTORY])) { foreach($data[self::FIELD_EVENT_HISTORY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addEventHistory($v); } else { @@ -510,17 +522,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -546,8 +565,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NOT_GIVEN] instanceof FHIRBoolean) { $this->setNotGiven($data[self::FIELD_NOT_GIVEN]); - } elseif ($ext && is_scalar($data[self::FIELD_NOT_GIVEN])) { - $this->setNotGiven(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_NOT_GIVEN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NOT_GIVEN])) { + $this->setNotGiven(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_NOT_GIVEN]] + $ext)); + } else if (is_array($data[self::FIELD_NOT_GIVEN])) { + $this->setNotGiven(new FHIRBoolean(array_merge($ext, $data[self::FIELD_NOT_GIVEN]))); + } } else { $this->setNotGiven(new FHIRBoolean($data[self::FIELD_NOT_GIVEN])); } @@ -555,6 +578,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_NOTE])) { if (is_array($data[self::FIELD_NOTE])) { foreach($data[self::FIELD_NOTE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRAnnotation) { $this->addNote($v); } else { @@ -570,6 +596,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PART_OF])) { if (is_array($data[self::FIELD_PART_OF])) { foreach($data[self::FIELD_PART_OF] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addPartOf($v); } else { @@ -585,6 +614,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PERFORMER])) { if (is_array($data[self::FIELD_PERFORMER])) { foreach($data[self::FIELD_PERFORMER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRMedicationAdministrationPerformer) { $this->addPerformer($v); } else { @@ -607,6 +639,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REASON_CODE])) { if (is_array($data[self::FIELD_REASON_CODE])) { foreach($data[self::FIELD_REASON_CODE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addReasonCode($v); } else { @@ -622,6 +657,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REASON_NOT_GIVEN])) { if (is_array($data[self::FIELD_REASON_NOT_GIVEN])) { foreach($data[self::FIELD_REASON_NOT_GIVEN] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addReasonNotGiven($v); } else { @@ -637,6 +675,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REASON_REFERENCE])) { if (is_array($data[self::FIELD_REASON_REFERENCE])) { foreach($data[self::FIELD_REASON_REFERENCE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addReasonReference($v); } else { @@ -655,8 +696,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRMedicationAdministrationStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRMedicationAdministrationStatus([FHIRMedicationAdministrationStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRMedicationAdministrationStatus([FHIRMedicationAdministrationStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRMedicationAdministrationStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRMedicationAdministrationStatus($data[self::FIELD_STATUS])); } @@ -671,6 +716,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SUPPORTING_INFORMATION])) { if (is_array($data[self::FIELD_SUPPORTING_INFORMATION])) { foreach($data[self::FIELD_SUPPORTING_INFORMATION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addSupportingInformation($v); } else { @@ -1944,11 +1992,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getCategory())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CATEGORY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getContext())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CONTEXT, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getDefinition())) { foreach($vs as $v) { if (null === $v) { @@ -1957,7 +2003,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_DEFINITION, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getDevice())) { foreach($vs as $v) { if (null === $v) { @@ -1966,18 +2011,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_DEVICE, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getDosage())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DOSAGE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getEffectiveDateTime())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EFFECTIVE_DATE_TIME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getEffectivePeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EFFECTIVE_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getEventHistory())) { foreach($vs as $v) { if (null === $v) { @@ -1986,7 +2028,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_EVENT_HISTORY, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -1995,18 +2036,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getMedicationCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MEDICATION_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getMedicationReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MEDICATION_REFERENCE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getNotGiven())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NOT_GIVEN, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getNote())) { foreach($vs as $v) { if (null === $v) { @@ -2015,7 +2053,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_NOTE, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getPartOf())) { foreach($vs as $v) { if (null === $v) { @@ -2024,7 +2061,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_PART_OF, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getPerformer())) { foreach($vs as $v) { if (null === $v) { @@ -2033,11 +2069,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_PERFORMER, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getPrescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PRESCRIPTION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getReasonCode())) { foreach($vs as $v) { if (null === $v) { @@ -2046,7 +2080,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_REASON_CODE, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getReasonNotGiven())) { foreach($vs as $v) { if (null === $v) { @@ -2055,7 +2088,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_REASON_NOT_GIVEN, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getReasonReference())) { foreach($vs as $v) { if (null === $v) { @@ -2064,15 +2096,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_REASON_REFERENCE, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSubject())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBJECT, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getSupportingInformation())) { foreach($vs as $v) { if (null === $v) { @@ -2106,8 +2135,15 @@ public function jsonSerialize() $a[self::FIELD_DOSAGE] = $v; } if (null !== ($v = $this->getEffectiveDateTime())) { - $a[self::FIELD_EFFECTIVE_DATE_TIME] = $v->getValue(); - $a[self::FIELD_EFFECTIVE_DATE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EFFECTIVE_DATE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EFFECTIVE_DATE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_EFFECTIVE_DATE_TIME] = $v; + } } if (null !== ($v = $this->getEffectivePeriod())) { $a[self::FIELD_EFFECTIVE_PERIOD] = $v; @@ -2116,7 +2152,23 @@ public function jsonSerialize() $a[self::FIELD_EVENT_HISTORY] = $vs; } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if (null !== ($v = $this->getMedicationCodeableConcept())) { $a[self::FIELD_MEDICATION_CODEABLE_CONCEPT] = $v; @@ -2125,8 +2177,15 @@ public function jsonSerialize() $a[self::FIELD_MEDICATION_REFERENCE] = $v; } if (null !== ($v = $this->getNotGiven())) { - $a[self::FIELD_NOT_GIVEN] = $v->getValue(); - $a[self::FIELD_NOT_GIVEN_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NOT_GIVEN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NOT_GIVEN_EXT] = $enc; + } + } else { + $a[self::FIELD_NOT_GIVEN] = $v; + } } if ([] !== ($vs = $this->getNote())) { $a[self::FIELD_NOTE] = $vs; @@ -2150,7 +2209,15 @@ public function jsonSerialize() $a[self::FIELD_REASON_REFERENCE] = $vs; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getSubject())) { $a[self::FIELD_SUBJECT] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRMedicationDispense.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRMedicationDispense.php index fa3b6d1a99..ffcb3b9316 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRMedicationDispense.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRMedicationDispense.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -92,10 +92,6 @@ class FHIRMedicationDispense extends FHIRDomainResource implements PHPFHIRContai { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MEDICATION_DISPENSE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_AUTHORIZING_PRESCRIPTION = 'authorizingPrescription'; const FIELD_CATEGORY = 'category'; const FIELD_CONTEXT = 'context'; @@ -452,6 +448,9 @@ class FHIRMedicationDispense extends FHIRDomainResource implements PHPFHIRContai */ protected $whenPrepared = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMedicationDispense Constructor * @param null|array $data @@ -471,6 +470,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_AUTHORIZING_PRESCRIPTION])) { if (is_array($data[self::FIELD_AUTHORIZING_PRESCRIPTION])) { foreach($data[self::FIELD_AUTHORIZING_PRESCRIPTION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addAuthorizingPrescription($v); } else { @@ -503,8 +505,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DAYS_SUPPLY] instanceof FHIRQuantity) { $this->setDaysSupply($data[self::FIELD_DAYS_SUPPLY]); - } elseif ($ext && is_scalar($data[self::FIELD_DAYS_SUPPLY])) { - $this->setDaysSupply(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_DAYS_SUPPLY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DAYS_SUPPLY])) { + $this->setDaysSupply(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_DAYS_SUPPLY]] + $ext)); + } else if (is_array($data[self::FIELD_DAYS_SUPPLY])) { + $this->setDaysSupply(new FHIRQuantity(array_merge($ext, $data[self::FIELD_DAYS_SUPPLY]))); + } } else { $this->setDaysSupply(new FHIRQuantity($data[self::FIELD_DAYS_SUPPLY])); } @@ -519,6 +525,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_DETECTED_ISSUE])) { if (is_array($data[self::FIELD_DETECTED_ISSUE])) { foreach($data[self::FIELD_DETECTED_ISSUE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addDetectedIssue($v); } else { @@ -534,6 +543,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_DOSAGE_INSTRUCTION])) { if (is_array($data[self::FIELD_DOSAGE_INSTRUCTION])) { foreach($data[self::FIELD_DOSAGE_INSTRUCTION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRDosage) { $this->addDosageInstruction($v); } else { @@ -549,6 +561,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_EVENT_HISTORY])) { if (is_array($data[self::FIELD_EVENT_HISTORY])) { foreach($data[self::FIELD_EVENT_HISTORY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addEventHistory($v); } else { @@ -567,17 +582,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -603,8 +625,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NOT_DONE] instanceof FHIRBoolean) { $this->setNotDone($data[self::FIELD_NOT_DONE]); - } elseif ($ext && is_scalar($data[self::FIELD_NOT_DONE])) { - $this->setNotDone(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_NOT_DONE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NOT_DONE])) { + $this->setNotDone(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_NOT_DONE]] + $ext)); + } else if (is_array($data[self::FIELD_NOT_DONE])) { + $this->setNotDone(new FHIRBoolean(array_merge($ext, $data[self::FIELD_NOT_DONE]))); + } } else { $this->setNotDone(new FHIRBoolean($data[self::FIELD_NOT_DONE])); } @@ -626,6 +652,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_NOTE])) { if (is_array($data[self::FIELD_NOTE])) { foreach($data[self::FIELD_NOTE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRAnnotation) { $this->addNote($v); } else { @@ -641,6 +670,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PART_OF])) { if (is_array($data[self::FIELD_PART_OF])) { foreach($data[self::FIELD_PART_OF] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addPartOf($v); } else { @@ -656,6 +688,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PERFORMER])) { if (is_array($data[self::FIELD_PERFORMER])) { foreach($data[self::FIELD_PERFORMER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRMedicationDispensePerformer) { $this->addPerformer($v); } else { @@ -674,8 +709,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_QUANTITY] instanceof FHIRQuantity) { $this->setQuantity($data[self::FIELD_QUANTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_QUANTITY])) { - $this->setQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_QUANTITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_QUANTITY])) { + $this->setQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_QUANTITY])) { + $this->setQuantity(new FHIRQuantity(array_merge($ext, $data[self::FIELD_QUANTITY]))); + } } else { $this->setQuantity(new FHIRQuantity($data[self::FIELD_QUANTITY])); } @@ -683,6 +722,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_RECEIVER])) { if (is_array($data[self::FIELD_RECEIVER])) { foreach($data[self::FIELD_RECEIVER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addReceiver($v); } else { @@ -701,8 +743,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRMedicationDispenseStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRMedicationDispenseStatus([FHIRMedicationDispenseStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRMedicationDispenseStatus([FHIRMedicationDispenseStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRMedicationDispenseStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRMedicationDispenseStatus($data[self::FIELD_STATUS])); } @@ -724,6 +770,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SUPPORTING_INFORMATION])) { if (is_array($data[self::FIELD_SUPPORTING_INFORMATION])) { foreach($data[self::FIELD_SUPPORTING_INFORMATION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addSupportingInformation($v); } else { @@ -749,8 +798,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_WHEN_HANDED_OVER] instanceof FHIRDateTime) { $this->setWhenHandedOver($data[self::FIELD_WHEN_HANDED_OVER]); - } elseif ($ext && is_scalar($data[self::FIELD_WHEN_HANDED_OVER])) { - $this->setWhenHandedOver(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_WHEN_HANDED_OVER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_WHEN_HANDED_OVER])) { + $this->setWhenHandedOver(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_WHEN_HANDED_OVER]] + $ext)); + } else if (is_array($data[self::FIELD_WHEN_HANDED_OVER])) { + $this->setWhenHandedOver(new FHIRDateTime(array_merge($ext, $data[self::FIELD_WHEN_HANDED_OVER]))); + } } else { $this->setWhenHandedOver(new FHIRDateTime($data[self::FIELD_WHEN_HANDED_OVER])); } @@ -761,8 +814,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_WHEN_PREPARED] instanceof FHIRDateTime) { $this->setWhenPrepared($data[self::FIELD_WHEN_PREPARED]); - } elseif ($ext && is_scalar($data[self::FIELD_WHEN_PREPARED])) { - $this->setWhenPrepared(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_WHEN_PREPARED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_WHEN_PREPARED])) { + $this->setWhenPrepared(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_WHEN_PREPARED]] + $ext)); + } else if (is_array($data[self::FIELD_WHEN_PREPARED])) { + $this->setWhenPrepared(new FHIRDateTime(array_merge($ext, $data[self::FIELD_WHEN_PREPARED]))); + } } else { $this->setWhenPrepared(new FHIRDateTime($data[self::FIELD_WHEN_PREPARED])); } @@ -2138,23 +2195,18 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_AUTHORIZING_PRESCRIPTION, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getCategory())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CATEGORY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getContext())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CONTEXT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDaysSupply())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DAYS_SUPPLY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDestination())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESTINATION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getDetectedIssue())) { foreach($vs as $v) { if (null === $v) { @@ -2163,7 +2215,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_DETECTED_ISSUE, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getDosageInstruction())) { foreach($vs as $v) { if (null === $v) { @@ -2172,7 +2223,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_DOSAGE_INSTRUCTION, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getEventHistory())) { foreach($vs as $v) { if (null === $v) { @@ -2181,7 +2231,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_EVENT_HISTORY, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -2190,26 +2239,21 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getMedicationCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MEDICATION_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getMedicationReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MEDICATION_REFERENCE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getNotDone())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NOT_DONE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getNotDoneReasonCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NOT_DONE_REASON_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getNotDoneReasonReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NOT_DONE_REASON_REFERENCE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getNote())) { foreach($vs as $v) { if (null === $v) { @@ -2218,7 +2262,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_NOTE, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getPartOf())) { foreach($vs as $v) { if (null === $v) { @@ -2227,7 +2270,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_PART_OF, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getPerformer())) { foreach($vs as $v) { if (null === $v) { @@ -2236,11 +2278,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_PERFORMER, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_QUANTITY, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getReceiver())) { foreach($vs as $v) { if (null === $v) { @@ -2249,19 +2289,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_RECEIVER, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSubject())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBJECT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSubstitution())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBSTITUTION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getSupportingInformation())) { foreach($vs as $v) { if (null === $v) { @@ -2270,7 +2306,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_SUPPORTING_INFORMATION, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -2299,7 +2334,15 @@ public function jsonSerialize() $a[self::FIELD_CONTEXT] = $v; } if (null !== ($v = $this->getDaysSupply())) { - $a[self::FIELD_DAYS_SUPPLY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DAYS_SUPPLY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DAYS_SUPPLY_EXT] = $enc; + } + } else { + $a[self::FIELD_DAYS_SUPPLY] = $v; + } } if (null !== ($v = $this->getDestination())) { $a[self::FIELD_DESTINATION] = $v; @@ -2314,7 +2357,23 @@ public function jsonSerialize() $a[self::FIELD_EVENT_HISTORY] = $vs; } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if (null !== ($v = $this->getMedicationCodeableConcept())) { $a[self::FIELD_MEDICATION_CODEABLE_CONCEPT] = $v; @@ -2323,8 +2382,15 @@ public function jsonSerialize() $a[self::FIELD_MEDICATION_REFERENCE] = $v; } if (null !== ($v = $this->getNotDone())) { - $a[self::FIELD_NOT_DONE] = $v->getValue(); - $a[self::FIELD_NOT_DONE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NOT_DONE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NOT_DONE_EXT] = $enc; + } + } else { + $a[self::FIELD_NOT_DONE] = $v; + } } if (null !== ($v = $this->getNotDoneReasonCodeableConcept())) { $a[self::FIELD_NOT_DONE_REASON_CODEABLE_CONCEPT] = $v; @@ -2342,13 +2408,29 @@ public function jsonSerialize() $a[self::FIELD_PERFORMER] = $vs; } if (null !== ($v = $this->getQuantity())) { - $a[self::FIELD_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_QUANTITY] = $v; + } } if ([] !== ($vs = $this->getReceiver())) { $a[self::FIELD_RECEIVER] = $vs; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getSubject())) { $a[self::FIELD_SUBJECT] = $v; @@ -2363,12 +2445,26 @@ public function jsonSerialize() $a[self::FIELD_TYPE] = $v; } if (null !== ($v = $this->getWhenHandedOver())) { - $a[self::FIELD_WHEN_HANDED_OVER] = $v->getValue(); - $a[self::FIELD_WHEN_HANDED_OVER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_WHEN_HANDED_OVER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_WHEN_HANDED_OVER_EXT] = $enc; + } + } else { + $a[self::FIELD_WHEN_HANDED_OVER] = $v; + } } if (null !== ($v = $this->getWhenPrepared())) { - $a[self::FIELD_WHEN_PREPARED] = $v->getValue(); - $a[self::FIELD_WHEN_PREPARED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_WHEN_PREPARED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_WHEN_PREPARED_EXT] = $enc; + } + } else { + $a[self::FIELD_WHEN_PREPARED] = $v; + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRMedicationRequest.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRMedicationRequest.php index 19da1f7a55..7e197eef4f 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRMedicationRequest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRMedicationRequest.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -94,10 +94,6 @@ class FHIRMedicationRequest extends FHIRDomainResource implements PHPFHIRContain { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MEDICATION_REQUEST; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_AUTHORED_ON = 'authoredOn'; const FIELD_AUTHORED_ON_EXT = '_authoredOn'; const FIELD_BASED_ON = 'basedOn'; @@ -454,6 +450,9 @@ class FHIRMedicationRequest extends FHIRDomainResource implements PHPFHIRContain */ protected $supportingInformation = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMedicationRequest Constructor * @param null|array $data @@ -476,8 +475,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_AUTHORED_ON] instanceof FHIRDateTime) { $this->setAuthoredOn($data[self::FIELD_AUTHORED_ON]); - } elseif ($ext && is_scalar($data[self::FIELD_AUTHORED_ON])) { - $this->setAuthoredOn(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_AUTHORED_ON]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_AUTHORED_ON])) { + $this->setAuthoredOn(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_AUTHORED_ON]] + $ext)); + } else if (is_array($data[self::FIELD_AUTHORED_ON])) { + $this->setAuthoredOn(new FHIRDateTime(array_merge($ext, $data[self::FIELD_AUTHORED_ON]))); + } } else { $this->setAuthoredOn(new FHIRDateTime($data[self::FIELD_AUTHORED_ON])); } @@ -485,6 +488,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_BASED_ON])) { if (is_array($data[self::FIELD_BASED_ON])) { foreach($data[self::FIELD_BASED_ON] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addBasedOn($v); } else { @@ -514,6 +520,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_DEFINITION])) { if (is_array($data[self::FIELD_DEFINITION])) { foreach($data[self::FIELD_DEFINITION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addDefinition($v); } else { @@ -529,6 +538,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_DETECTED_ISSUE])) { if (is_array($data[self::FIELD_DETECTED_ISSUE])) { foreach($data[self::FIELD_DETECTED_ISSUE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addDetectedIssue($v); } else { @@ -551,6 +563,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_DOSAGE_INSTRUCTION])) { if (is_array($data[self::FIELD_DOSAGE_INSTRUCTION])) { foreach($data[self::FIELD_DOSAGE_INSTRUCTION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRDosage) { $this->addDosageInstruction($v); } else { @@ -566,6 +581,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_EVENT_HISTORY])) { if (is_array($data[self::FIELD_EVENT_HISTORY])) { foreach($data[self::FIELD_EVENT_HISTORY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addEventHistory($v); } else { @@ -584,8 +602,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_GROUP_IDENTIFIER] instanceof FHIRIdentifier) { $this->setGroupIdentifier($data[self::FIELD_GROUP_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_GROUP_IDENTIFIER])) { - $this->setGroupIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_GROUP_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_GROUP_IDENTIFIER])) { + $this->setGroupIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_GROUP_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_GROUP_IDENTIFIER])) { + $this->setGroupIdentifier(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_GROUP_IDENTIFIER]))); + } } else { $this->setGroupIdentifier(new FHIRIdentifier($data[self::FIELD_GROUP_IDENTIFIER])); } @@ -596,17 +618,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -618,8 +647,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_INTENT] instanceof FHIRMedicationRequestIntent) { $this->setIntent($data[self::FIELD_INTENT]); - } elseif ($ext && is_scalar($data[self::FIELD_INTENT])) { - $this->setIntent(new FHIRMedicationRequestIntent([FHIRMedicationRequestIntent::FIELD_VALUE => $data[self::FIELD_INTENT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_INTENT])) { + $this->setIntent(new FHIRMedicationRequestIntent([FHIRMedicationRequestIntent::FIELD_VALUE => $data[self::FIELD_INTENT]] + $ext)); + } else if (is_array($data[self::FIELD_INTENT])) { + $this->setIntent(new FHIRMedicationRequestIntent(array_merge($ext, $data[self::FIELD_INTENT]))); + } } else { $this->setIntent(new FHIRMedicationRequestIntent($data[self::FIELD_INTENT])); } @@ -641,6 +674,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_NOTE])) { if (is_array($data[self::FIELD_NOTE])) { foreach($data[self::FIELD_NOTE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRAnnotation) { $this->addNote($v); } else { @@ -666,8 +702,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PRIORITY] instanceof FHIRMedicationRequestPriority) { $this->setPriority($data[self::FIELD_PRIORITY]); - } elseif ($ext && is_scalar($data[self::FIELD_PRIORITY])) { - $this->setPriority(new FHIRMedicationRequestPriority([FHIRMedicationRequestPriority::FIELD_VALUE => $data[self::FIELD_PRIORITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PRIORITY])) { + $this->setPriority(new FHIRMedicationRequestPriority([FHIRMedicationRequestPriority::FIELD_VALUE => $data[self::FIELD_PRIORITY]] + $ext)); + } else if (is_array($data[self::FIELD_PRIORITY])) { + $this->setPriority(new FHIRMedicationRequestPriority(array_merge($ext, $data[self::FIELD_PRIORITY]))); + } } else { $this->setPriority(new FHIRMedicationRequestPriority($data[self::FIELD_PRIORITY])); } @@ -675,6 +715,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REASON_CODE])) { if (is_array($data[self::FIELD_REASON_CODE])) { foreach($data[self::FIELD_REASON_CODE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addReasonCode($v); } else { @@ -690,6 +733,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REASON_REFERENCE])) { if (is_array($data[self::FIELD_REASON_REFERENCE])) { foreach($data[self::FIELD_REASON_REFERENCE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addReasonReference($v); } else { @@ -722,8 +768,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRMedicationRequestStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRMedicationRequestStatus([FHIRMedicationRequestStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRMedicationRequestStatus([FHIRMedicationRequestStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRMedicationRequestStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRMedicationRequestStatus($data[self::FIELD_STATUS])); } @@ -745,6 +795,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SUPPORTING_INFORMATION])) { if (is_array($data[self::FIELD_SUPPORTING_INFORMATION])) { foreach($data[self::FIELD_SUPPORTING_INFORMATION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addSupportingInformation($v); } else { @@ -2095,10 +2148,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getAuthoredOn())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AUTHORED_ON, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getBasedOn())) { foreach($vs as $v) { if (null === $v) { @@ -2107,15 +2160,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_BASED_ON, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getCategory())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CATEGORY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getContext())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CONTEXT, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getDefinition())) { foreach($vs as $v) { if (null === $v) { @@ -2124,7 +2174,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_DEFINITION, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getDetectedIssue())) { foreach($vs as $v) { if (null === $v) { @@ -2133,11 +2182,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_DETECTED_ISSUE, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getDispenseRequest())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DISPENSE_REQUEST, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getDosageInstruction())) { foreach($vs as $v) { if (null === $v) { @@ -2146,7 +2193,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_DOSAGE_INSTRUCTION, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getEventHistory())) { foreach($vs as $v) { if (null === $v) { @@ -2155,11 +2201,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_EVENT_HISTORY, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getGroupIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_GROUP_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -2168,19 +2212,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getIntent())) { $v->xmlSerialize($sxe->addChild(self::FIELD_INTENT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getMedicationCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MEDICATION_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getMedicationReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MEDICATION_REFERENCE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getNote())) { foreach($vs as $v) { if (null === $v) { @@ -2189,15 +2229,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_NOTE, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getPriorPrescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PRIOR_PRESCRIPTION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPriority())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PRIORITY, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getReasonCode())) { foreach($vs as $v) { if (null === $v) { @@ -2206,7 +2243,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_REASON_CODE, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getReasonReference())) { foreach($vs as $v) { if (null === $v) { @@ -2215,27 +2251,21 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_REASON_REFERENCE, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getRecorder())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RECORDER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRequester())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REQUESTER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSubject())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBJECT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSubstitution())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBSTITUTION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getSupportingInformation())) { foreach($vs as $v) { if (null === $v) { @@ -2254,8 +2284,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getAuthoredOn())) { - $a[self::FIELD_AUTHORED_ON] = $v->getValue(); - $a[self::FIELD_AUTHORED_ON_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_AUTHORED_ON] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_AUTHORED_ON_EXT] = $enc; + } + } else { + $a[self::FIELD_AUTHORED_ON] = $v; + } } if ([] !== ($vs = $this->getBasedOn())) { $a[self::FIELD_BASED_ON] = $vs; @@ -2282,13 +2319,45 @@ public function jsonSerialize() $a[self::FIELD_EVENT_HISTORY] = $vs; } if (null !== ($v = $this->getGroupIdentifier())) { - $a[self::FIELD_GROUP_IDENTIFIER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_GROUP_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_GROUP_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_GROUP_IDENTIFIER] = $v; + } } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if (null !== ($v = $this->getIntent())) { - $a[self::FIELD_INTENT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_INTENT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_INTENT_EXT] = $enc; + } + } else { + $a[self::FIELD_INTENT] = $v; + } } if (null !== ($v = $this->getMedicationCodeableConcept())) { $a[self::FIELD_MEDICATION_CODEABLE_CONCEPT] = $v; @@ -2303,7 +2372,15 @@ public function jsonSerialize() $a[self::FIELD_PRIOR_PRESCRIPTION] = $v; } if (null !== ($v = $this->getPriority())) { - $a[self::FIELD_PRIORITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PRIORITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PRIORITY_EXT] = $enc; + } + } else { + $a[self::FIELD_PRIORITY] = $v; + } } if ([] !== ($vs = $this->getReasonCode())) { $a[self::FIELD_REASON_CODE] = $vs; @@ -2318,7 +2395,15 @@ public function jsonSerialize() $a[self::FIELD_REQUESTER] = $v; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getSubject())) { $a[self::FIELD_SUBJECT] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRMedicationStatement.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRMedicationStatement.php index 619a85aabd..882dc0c025 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRMedicationStatement.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRMedicationStatement.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -106,10 +106,6 @@ class FHIRMedicationStatement extends FHIRDomainResource implements PHPFHIRConta { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MEDICATION_STATEMENT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_BASED_ON = 'basedOn'; const FIELD_CATEGORY = 'category'; const FIELD_CONTEXT = 'context'; @@ -386,6 +382,9 @@ class FHIRMedicationStatement extends FHIRDomainResource implements PHPFHIRConta */ protected $taken = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMedicationStatement Constructor * @param null|array $data @@ -405,6 +404,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_BASED_ON])) { if (is_array($data[self::FIELD_BASED_ON])) { foreach($data[self::FIELD_BASED_ON] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addBasedOn($v); } else { @@ -437,8 +439,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATE_ASSERTED] instanceof FHIRDateTime) { $this->setDateAsserted($data[self::FIELD_DATE_ASSERTED]); - } elseif ($ext && is_scalar($data[self::FIELD_DATE_ASSERTED])) { - $this->setDateAsserted(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE_ASSERTED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATE_ASSERTED])) { + $this->setDateAsserted(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE_ASSERTED]] + $ext)); + } else if (is_array($data[self::FIELD_DATE_ASSERTED])) { + $this->setDateAsserted(new FHIRDateTime(array_merge($ext, $data[self::FIELD_DATE_ASSERTED]))); + } } else { $this->setDateAsserted(new FHIRDateTime($data[self::FIELD_DATE_ASSERTED])); } @@ -446,6 +452,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_DERIVED_FROM])) { if (is_array($data[self::FIELD_DERIVED_FROM])) { foreach($data[self::FIELD_DERIVED_FROM] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addDerivedFrom($v); } else { @@ -461,6 +470,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_DOSAGE])) { if (is_array($data[self::FIELD_DOSAGE])) { foreach($data[self::FIELD_DOSAGE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRDosage) { $this->addDosage($v); } else { @@ -479,8 +491,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EFFECTIVE_DATE_TIME] instanceof FHIRDateTime) { $this->setEffectiveDateTime($data[self::FIELD_EFFECTIVE_DATE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_EFFECTIVE_DATE_TIME])) { - $this->setEffectiveDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_EFFECTIVE_DATE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EFFECTIVE_DATE_TIME])) { + $this->setEffectiveDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_EFFECTIVE_DATE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_EFFECTIVE_DATE_TIME])) { + $this->setEffectiveDateTime(new FHIRDateTime(array_merge($ext, $data[self::FIELD_EFFECTIVE_DATE_TIME]))); + } } else { $this->setEffectiveDateTime(new FHIRDateTime($data[self::FIELD_EFFECTIVE_DATE_TIME])); } @@ -498,17 +514,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -538,6 +561,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_NOTE])) { if (is_array($data[self::FIELD_NOTE])) { foreach($data[self::FIELD_NOTE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRAnnotation) { $this->addNote($v); } else { @@ -553,6 +579,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PART_OF])) { if (is_array($data[self::FIELD_PART_OF])) { foreach($data[self::FIELD_PART_OF] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addPartOf($v); } else { @@ -568,6 +597,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REASON_CODE])) { if (is_array($data[self::FIELD_REASON_CODE])) { foreach($data[self::FIELD_REASON_CODE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addReasonCode($v); } else { @@ -583,6 +615,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REASON_NOT_TAKEN])) { if (is_array($data[self::FIELD_REASON_NOT_TAKEN])) { foreach($data[self::FIELD_REASON_NOT_TAKEN] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addReasonNotTaken($v); } else { @@ -598,6 +633,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REASON_REFERENCE])) { if (is_array($data[self::FIELD_REASON_REFERENCE])) { foreach($data[self::FIELD_REASON_REFERENCE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addReasonReference($v); } else { @@ -616,8 +654,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRMedicationStatementStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRMedicationStatementStatus([FHIRMedicationStatementStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRMedicationStatementStatus([FHIRMedicationStatementStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRMedicationStatementStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRMedicationStatementStatus($data[self::FIELD_STATUS])); } @@ -635,8 +677,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TAKEN] instanceof FHIRMedicationStatementTaken) { $this->setTaken($data[self::FIELD_TAKEN]); - } elseif ($ext && is_scalar($data[self::FIELD_TAKEN])) { - $this->setTaken(new FHIRMedicationStatementTaken([FHIRMedicationStatementTaken::FIELD_VALUE => $data[self::FIELD_TAKEN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TAKEN])) { + $this->setTaken(new FHIRMedicationStatementTaken([FHIRMedicationStatementTaken::FIELD_VALUE => $data[self::FIELD_TAKEN]] + $ext)); + } else if (is_array($data[self::FIELD_TAKEN])) { + $this->setTaken(new FHIRMedicationStatementTaken(array_merge($ext, $data[self::FIELD_TAKEN]))); + } } else { $this->setTaken(new FHIRMedicationStatementTaken($data[self::FIELD_TAKEN])); } @@ -1764,18 +1810,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_BASED_ON, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getCategory())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CATEGORY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getContext())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CONTEXT, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getDateAsserted())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DATE_ASSERTED, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getDerivedFrom())) { foreach($vs as $v) { if (null === $v) { @@ -1784,7 +1827,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_DERIVED_FROM, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getDosage())) { foreach($vs as $v) { if (null === $v) { @@ -1796,11 +1838,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getEffectiveDateTime())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EFFECTIVE_DATE_TIME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getEffectivePeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EFFECTIVE_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -1809,19 +1849,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getInformationSource())) { $v->xmlSerialize($sxe->addChild(self::FIELD_INFORMATION_SOURCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getMedicationCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MEDICATION_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getMedicationReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MEDICATION_REFERENCE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getNote())) { foreach($vs as $v) { if (null === $v) { @@ -1830,7 +1866,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_NOTE, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getPartOf())) { foreach($vs as $v) { if (null === $v) { @@ -1839,7 +1874,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_PART_OF, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getReasonCode())) { foreach($vs as $v) { if (null === $v) { @@ -1848,7 +1882,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_REASON_CODE, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getReasonNotTaken())) { foreach($vs as $v) { if (null === $v) { @@ -1857,7 +1890,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_REASON_NOT_TAKEN, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getReasonReference())) { foreach($vs as $v) { if (null === $v) { @@ -1866,15 +1898,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_REASON_REFERENCE, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSubject())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBJECT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getTaken())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TAKEN, null, $v->_getFHIRXMLNamespace())); } @@ -1897,8 +1926,15 @@ public function jsonSerialize() $a[self::FIELD_CONTEXT] = $v; } if (null !== ($v = $this->getDateAsserted())) { - $a[self::FIELD_DATE_ASSERTED] = $v->getValue(); - $a[self::FIELD_DATE_ASSERTED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATE_ASSERTED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATE_ASSERTED_EXT] = $enc; + } + } else { + $a[self::FIELD_DATE_ASSERTED] = $v; + } } if ([] !== ($vs = $this->getDerivedFrom())) { $a[self::FIELD_DERIVED_FROM] = $vs; @@ -1907,14 +1943,37 @@ public function jsonSerialize() $a[self::FIELD_DOSAGE] = $vs; } if (null !== ($v = $this->getEffectiveDateTime())) { - $a[self::FIELD_EFFECTIVE_DATE_TIME] = $v->getValue(); - $a[self::FIELD_EFFECTIVE_DATE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EFFECTIVE_DATE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EFFECTIVE_DATE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_EFFECTIVE_DATE_TIME] = $v; + } } if (null !== ($v = $this->getEffectivePeriod())) { $a[self::FIELD_EFFECTIVE_PERIOD] = $v; } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if (null !== ($v = $this->getInformationSource())) { $a[self::FIELD_INFORMATION_SOURCE] = $v; @@ -1941,13 +2000,29 @@ public function jsonSerialize() $a[self::FIELD_REASON_REFERENCE] = $vs; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getSubject())) { $a[self::FIELD_SUBJECT] = $v; } if (null !== ($v = $this->getTaken())) { - $a[self::FIELD_TAKEN] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TAKEN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TAKEN_EXT] = $enc; + } + } else { + $a[self::FIELD_TAKEN] = $v; + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRMessageDefinition.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRMessageDefinition.php index 6eae30c6d7..dd713a2661 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRMessageDefinition.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRMessageDefinition.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -95,10 +95,6 @@ class FHIRMessageDefinition extends FHIRDomainResource implements PHPFHIRContain { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MESSAGE_DEFINITION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ALLOWED_RESPONSE = 'allowedResponse'; const FIELD_BASE = 'base'; const FIELD_CATEGORY = 'category'; @@ -443,6 +439,9 @@ class FHIRMessageDefinition extends FHIRDomainResource implements PHPFHIRContain */ protected $version = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMessageDefinition Constructor * @param null|array $data @@ -462,6 +461,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ALLOWED_RESPONSE])) { if (is_array($data[self::FIELD_ALLOWED_RESPONSE])) { foreach($data[self::FIELD_ALLOWED_RESPONSE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRMessageDefinitionAllowedResponse) { $this->addAllowedResponse($v); } else { @@ -487,8 +489,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CATEGORY] instanceof FHIRMessageSignificanceCategory) { $this->setCategory($data[self::FIELD_CATEGORY]); - } elseif ($ext && is_scalar($data[self::FIELD_CATEGORY])) { - $this->setCategory(new FHIRMessageSignificanceCategory([FHIRMessageSignificanceCategory::FIELD_VALUE => $data[self::FIELD_CATEGORY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CATEGORY])) { + $this->setCategory(new FHIRMessageSignificanceCategory([FHIRMessageSignificanceCategory::FIELD_VALUE => $data[self::FIELD_CATEGORY]] + $ext)); + } else if (is_array($data[self::FIELD_CATEGORY])) { + $this->setCategory(new FHIRMessageSignificanceCategory(array_merge($ext, $data[self::FIELD_CATEGORY]))); + } } else { $this->setCategory(new FHIRMessageSignificanceCategory($data[self::FIELD_CATEGORY])); } @@ -496,6 +502,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CONTACT])) { if (is_array($data[self::FIELD_CONTACT])) { foreach($data[self::FIELD_CONTACT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContactDetail) { $this->addContact($v); } else { @@ -514,8 +523,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_COPYRIGHT] instanceof FHIRMarkdown) { $this->setCopyright($data[self::FIELD_COPYRIGHT]); - } elseif ($ext && is_scalar($data[self::FIELD_COPYRIGHT])) { - $this->setCopyright(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_COPYRIGHT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_COPYRIGHT])) { + $this->setCopyright(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_COPYRIGHT]] + $ext)); + } else if (is_array($data[self::FIELD_COPYRIGHT])) { + $this->setCopyright(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_COPYRIGHT]))); + } } else { $this->setCopyright(new FHIRMarkdown($data[self::FIELD_COPYRIGHT])); } @@ -526,8 +539,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATE] instanceof FHIRDateTime) { $this->setDate($data[self::FIELD_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_DATE])) { - $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime(array_merge($ext, $data[self::FIELD_DATE]))); + } } else { $this->setDate(new FHIRDateTime($data[self::FIELD_DATE])); } @@ -538,8 +555,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRMarkdown) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRMarkdown($data[self::FIELD_DESCRIPTION])); } @@ -557,8 +578,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EXPERIMENTAL] instanceof FHIRBoolean) { $this->setExperimental($data[self::FIELD_EXPERIMENTAL]); - } elseif ($ext && is_scalar($data[self::FIELD_EXPERIMENTAL])) { - $this->setExperimental(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_EXPERIMENTAL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EXPERIMENTAL])) { + $this->setExperimental(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_EXPERIMENTAL]] + $ext)); + } else if (is_array($data[self::FIELD_EXPERIMENTAL])) { + $this->setExperimental(new FHIRBoolean(array_merge($ext, $data[self::FIELD_EXPERIMENTAL]))); + } } else { $this->setExperimental(new FHIRBoolean($data[self::FIELD_EXPERIMENTAL])); } @@ -566,6 +591,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_FOCUS])) { if (is_array($data[self::FIELD_FOCUS])) { foreach($data[self::FIELD_FOCUS] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRMessageDefinitionFocus) { $this->addFocus($v); } else { @@ -584,8 +612,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->setIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { - $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_IDENTIFIER]))); + } } else { $this->setIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); } @@ -593,6 +625,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_JURISDICTION])) { if (is_array($data[self::FIELD_JURISDICTION])) { foreach($data[self::FIELD_JURISDICTION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addJurisdiction($v); } else { @@ -611,8 +646,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -620,6 +659,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PARENT])) { if (is_array($data[self::FIELD_PARENT])) { foreach($data[self::FIELD_PARENT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addParent($v); } else { @@ -638,8 +680,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PUBLISHER] instanceof FHIRString) { $this->setPublisher($data[self::FIELD_PUBLISHER]); - } elseif ($ext && is_scalar($data[self::FIELD_PUBLISHER])) { - $this->setPublisher(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PUBLISHER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PUBLISHER])) { + $this->setPublisher(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PUBLISHER]] + $ext)); + } else if (is_array($data[self::FIELD_PUBLISHER])) { + $this->setPublisher(new FHIRString(array_merge($ext, $data[self::FIELD_PUBLISHER]))); + } } else { $this->setPublisher(new FHIRString($data[self::FIELD_PUBLISHER])); } @@ -650,8 +696,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PURPOSE] instanceof FHIRMarkdown) { $this->setPurpose($data[self::FIELD_PURPOSE]); - } elseif ($ext && is_scalar($data[self::FIELD_PURPOSE])) { - $this->setPurpose(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_PURPOSE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PURPOSE])) { + $this->setPurpose(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_PURPOSE]] + $ext)); + } else if (is_array($data[self::FIELD_PURPOSE])) { + $this->setPurpose(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_PURPOSE]))); + } } else { $this->setPurpose(new FHIRMarkdown($data[self::FIELD_PURPOSE])); } @@ -659,6 +709,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REPLACES])) { if (is_array($data[self::FIELD_REPLACES])) { foreach($data[self::FIELD_REPLACES] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addReplaces($v); } else { @@ -677,8 +730,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_RESPONSE_REQUIRED] instanceof FHIRBoolean) { $this->setResponseRequired($data[self::FIELD_RESPONSE_REQUIRED]); - } elseif ($ext && is_scalar($data[self::FIELD_RESPONSE_REQUIRED])) { - $this->setResponseRequired(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_RESPONSE_REQUIRED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_RESPONSE_REQUIRED])) { + $this->setResponseRequired(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_RESPONSE_REQUIRED]] + $ext)); + } else if (is_array($data[self::FIELD_RESPONSE_REQUIRED])) { + $this->setResponseRequired(new FHIRBoolean(array_merge($ext, $data[self::FIELD_RESPONSE_REQUIRED]))); + } } else { $this->setResponseRequired(new FHIRBoolean($data[self::FIELD_RESPONSE_REQUIRED])); } @@ -689,8 +746,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRPublicationStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRPublicationStatus([FHIRPublicationStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRPublicationStatus([FHIRPublicationStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRPublicationStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRPublicationStatus($data[self::FIELD_STATUS])); } @@ -701,8 +762,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TITLE] instanceof FHIRString) { $this->setTitle($data[self::FIELD_TITLE]); - } elseif ($ext && is_scalar($data[self::FIELD_TITLE])) { - $this->setTitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TITLE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TITLE])) { + $this->setTitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TITLE]] + $ext)); + } else if (is_array($data[self::FIELD_TITLE])) { + $this->setTitle(new FHIRString(array_merge($ext, $data[self::FIELD_TITLE]))); + } } else { $this->setTitle(new FHIRString($data[self::FIELD_TITLE])); } @@ -713,8 +778,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_URL] instanceof FHIRUri) { $this->setUrl($data[self::FIELD_URL]); - } elseif ($ext && is_scalar($data[self::FIELD_URL])) { - $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } else if (is_array($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri(array_merge($ext, $data[self::FIELD_URL]))); + } } else { $this->setUrl(new FHIRUri($data[self::FIELD_URL])); } @@ -722,6 +791,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_USE_CONTEXT])) { if (is_array($data[self::FIELD_USE_CONTEXT])) { foreach($data[self::FIELD_USE_CONTEXT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRUsageContext) { $this->addUseContext($v); } else { @@ -740,8 +812,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VERSION] instanceof FHIRString) { $this->setVersion($data[self::FIELD_VERSION]); - } elseif ($ext && is_scalar($data[self::FIELD_VERSION])) { - $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } else if (is_array($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString(array_merge($ext, $data[self::FIELD_VERSION]))); + } } else { $this->setVersion(new FHIRString($data[self::FIELD_VERSION])); } @@ -2058,15 +2134,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_ALLOWED_RESPONSE, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getBase())) { $v->xmlSerialize($sxe->addChild(self::FIELD_BASE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getCategory())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CATEGORY, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getContact())) { foreach($vs as $v) { if (null === $v) { @@ -2084,14 +2157,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESCRIPTION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getEvent())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EVENT, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getExperimental())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EXPERIMENTAL, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getFocus())) { foreach($vs as $v) { if (null === $v) { @@ -2100,11 +2171,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_FOCUS, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getJurisdiction())) { foreach($vs as $v) { if (null === $v) { @@ -2116,7 +2185,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NAME, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getParent())) { foreach($vs as $v) { if (null === $v) { @@ -2131,7 +2199,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getPurpose())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PURPOSE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getReplaces())) { foreach($vs as $v) { if (null === $v) { @@ -2143,7 +2210,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getResponseRequired())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RESPONSE_REQUIRED, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } @@ -2153,7 +2219,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getUrl())) { $v->xmlSerialize($sxe->addChild(self::FIELD_URL, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getUseContext())) { foreach($vs as $v) { if (null === $v) { @@ -2181,78 +2246,179 @@ public function jsonSerialize() $a[self::FIELD_BASE] = $v; } if (null !== ($v = $this->getCategory())) { - $a[self::FIELD_CATEGORY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CATEGORY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CATEGORY_EXT] = $enc; + } + } else { + $a[self::FIELD_CATEGORY] = $v; + } } if ([] !== ($vs = $this->getContact())) { $a[self::FIELD_CONTACT] = $vs; } if (null !== ($v = $this->getCopyright())) { - $a[self::FIELD_COPYRIGHT] = $v->getValue(); - $a[self::FIELD_COPYRIGHT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_COPYRIGHT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_COPYRIGHT_EXT] = $enc; + } + } else { + $a[self::FIELD_COPYRIGHT] = $v; + } } if (null !== ($v = $this->getDate())) { - $a[self::FIELD_DATE] = $v->getValue(); - $a[self::FIELD_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_DATE] = $v; + } } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if (null !== ($v = $this->getEvent())) { $a[self::FIELD_EVENT] = $v; } if (null !== ($v = $this->getExperimental())) { - $a[self::FIELD_EXPERIMENTAL] = $v->getValue(); - $a[self::FIELD_EXPERIMENTAL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EXPERIMENTAL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EXPERIMENTAL_EXT] = $enc; + } + } else { + $a[self::FIELD_EXPERIMENTAL] = $v; + } } if ([] !== ($vs = $this->getFocus())) { $a[self::FIELD_FOCUS] = $vs; } if (null !== ($v = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_IDENTIFIER] = $v; + } } if ([] !== ($vs = $this->getJurisdiction())) { $a[self::FIELD_JURISDICTION] = $vs; } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if ([] !== ($vs = $this->getParent())) { $a[self::FIELD_PARENT] = $vs; } if (null !== ($v = $this->getPublisher())) { - $a[self::FIELD_PUBLISHER] = $v->getValue(); - $a[self::FIELD_PUBLISHER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PUBLISHER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PUBLISHER_EXT] = $enc; + } + } else { + $a[self::FIELD_PUBLISHER] = $v; + } } if (null !== ($v = $this->getPurpose())) { - $a[self::FIELD_PURPOSE] = $v->getValue(); - $a[self::FIELD_PURPOSE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PURPOSE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PURPOSE_EXT] = $enc; + } + } else { + $a[self::FIELD_PURPOSE] = $v; + } } if ([] !== ($vs = $this->getReplaces())) { $a[self::FIELD_REPLACES] = $vs; } if (null !== ($v = $this->getResponseRequired())) { - $a[self::FIELD_RESPONSE_REQUIRED] = $v->getValue(); - $a[self::FIELD_RESPONSE_REQUIRED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_RESPONSE_REQUIRED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_RESPONSE_REQUIRED_EXT] = $enc; + } + } else { + $a[self::FIELD_RESPONSE_REQUIRED] = $v; + } } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getTitle())) { - $a[self::FIELD_TITLE] = $v->getValue(); - $a[self::FIELD_TITLE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TITLE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TITLE_EXT] = $enc; + } + } else { + $a[self::FIELD_TITLE] = $v; + } } if (null !== ($v = $this->getUrl())) { - $a[self::FIELD_URL] = $v->getValue(); - $a[self::FIELD_URL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_URL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_URL_EXT] = $enc; + } + } else { + $a[self::FIELD_URL] = $v; + } } if ([] !== ($vs = $this->getUseContext())) { $a[self::FIELD_USE_CONTEXT] = $vs; } if (null !== ($v = $this->getVersion())) { - $a[self::FIELD_VERSION] = $v->getValue(); - $a[self::FIELD_VERSION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VERSION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VERSION_EXT] = $enc; + } + } else { + $a[self::FIELD_VERSION] = $v; + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRMessageHeader.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRMessageHeader.php index c7818107bc..ae405e9f1a 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRMessageHeader.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRMessageHeader.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -88,10 +88,6 @@ class FHIRMessageHeader extends FHIRDomainResource implements PHPFHIRContainedTy { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_MESSAGE_HEADER; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_AUTHOR = 'author'; const FIELD_DESTINATION = 'destination'; const FIELD_ENTERER = 'enterer'; @@ -256,6 +252,9 @@ class FHIRMessageHeader extends FHIRDomainResource implements PHPFHIRContainedTy */ protected $timestamp = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRMessageHeader Constructor * @param null|array $data @@ -282,6 +281,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_DESTINATION])) { if (is_array($data[self::FIELD_DESTINATION])) { foreach($data[self::FIELD_DESTINATION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRMessageHeaderDestination) { $this->addDestination($v); } else { @@ -311,6 +313,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_FOCUS])) { if (is_array($data[self::FIELD_FOCUS])) { foreach($data[self::FIELD_FOCUS] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addFocus($v); } else { @@ -371,8 +376,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TIMESTAMP] instanceof FHIRInstant) { $this->setTimestamp($data[self::FIELD_TIMESTAMP]); - } elseif ($ext && is_scalar($data[self::FIELD_TIMESTAMP])) { - $this->setTimestamp(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_TIMESTAMP]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TIMESTAMP])) { + $this->setTimestamp(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_TIMESTAMP]] + $ext)); + } else if (is_array($data[self::FIELD_TIMESTAMP])) { + $this->setTimestamp(new FHIRInstant(array_merge($ext, $data[self::FIELD_TIMESTAMP]))); + } } else { $this->setTimestamp(new FHIRInstant($data[self::FIELD_TIMESTAMP])); } @@ -991,7 +1000,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getAuthor())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AUTHOR, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getDestination())) { foreach($vs as $v) { if (null === $v) { @@ -1000,15 +1008,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_DESTINATION, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getEnterer())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ENTERER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getEvent())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EVENT, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getFocus())) { foreach($vs as $v) { if (null === $v) { @@ -1017,27 +1022,21 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_FOCUS, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getReason())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REASON, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getReceiver())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RECEIVER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getResponse())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RESPONSE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getResponsible())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RESPONSIBLE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSender())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SENDER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSource())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SOURCE, null, $v->_getFHIRXMLNamespace())); } @@ -1087,8 +1086,15 @@ public function jsonSerialize() $a[self::FIELD_SOURCE] = $v; } if (null !== ($v = $this->getTimestamp())) { - $a[self::FIELD_TIMESTAMP] = $v->getValue(); - $a[self::FIELD_TIMESTAMP_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TIMESTAMP] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TIMESTAMP_EXT] = $enc; + } + } else { + $a[self::FIELD_TIMESTAMP] = $v; + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRNamingSystem.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRNamingSystem.php index 77bb67032e..f29c2e3103 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRNamingSystem.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRNamingSystem.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -90,10 +90,6 @@ class FHIRNamingSystem extends FHIRDomainResource implements PHPFHIRContainedTyp { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_NAMING_SYSTEM; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CONTACT = 'contact'; const FIELD_DATE = 'date'; const FIELD_DATE_EXT = '_date'; @@ -300,6 +296,9 @@ class FHIRNamingSystem extends FHIRDomainResource implements PHPFHIRContainedTyp */ protected $useContext = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRNamingSystem Constructor * @param null|array $data @@ -319,6 +318,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CONTACT])) { if (is_array($data[self::FIELD_CONTACT])) { foreach($data[self::FIELD_CONTACT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContactDetail) { $this->addContact($v); } else { @@ -337,8 +339,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATE] instanceof FHIRDateTime) { $this->setDate($data[self::FIELD_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_DATE])) { - $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime(array_merge($ext, $data[self::FIELD_DATE]))); + } } else { $this->setDate(new FHIRDateTime($data[self::FIELD_DATE])); } @@ -349,8 +355,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRMarkdown) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRMarkdown($data[self::FIELD_DESCRIPTION])); } @@ -358,6 +368,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_JURISDICTION])) { if (is_array($data[self::FIELD_JURISDICTION])) { foreach($data[self::FIELD_JURISDICTION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addJurisdiction($v); } else { @@ -376,8 +389,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_KIND] instanceof FHIRNamingSystemType) { $this->setKind($data[self::FIELD_KIND]); - } elseif ($ext && is_scalar($data[self::FIELD_KIND])) { - $this->setKind(new FHIRNamingSystemType([FHIRNamingSystemType::FIELD_VALUE => $data[self::FIELD_KIND]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_KIND])) { + $this->setKind(new FHIRNamingSystemType([FHIRNamingSystemType::FIELD_VALUE => $data[self::FIELD_KIND]] + $ext)); + } else if (is_array($data[self::FIELD_KIND])) { + $this->setKind(new FHIRNamingSystemType(array_merge($ext, $data[self::FIELD_KIND]))); + } } else { $this->setKind(new FHIRNamingSystemType($data[self::FIELD_KIND])); } @@ -388,8 +405,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -400,8 +421,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PUBLISHER] instanceof FHIRString) { $this->setPublisher($data[self::FIELD_PUBLISHER]); - } elseif ($ext && is_scalar($data[self::FIELD_PUBLISHER])) { - $this->setPublisher(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PUBLISHER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PUBLISHER])) { + $this->setPublisher(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PUBLISHER]] + $ext)); + } else if (is_array($data[self::FIELD_PUBLISHER])) { + $this->setPublisher(new FHIRString(array_merge($ext, $data[self::FIELD_PUBLISHER]))); + } } else { $this->setPublisher(new FHIRString($data[self::FIELD_PUBLISHER])); } @@ -419,8 +444,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_RESPONSIBLE] instanceof FHIRString) { $this->setResponsible($data[self::FIELD_RESPONSIBLE]); - } elseif ($ext && is_scalar($data[self::FIELD_RESPONSIBLE])) { - $this->setResponsible(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_RESPONSIBLE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_RESPONSIBLE])) { + $this->setResponsible(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_RESPONSIBLE]] + $ext)); + } else if (is_array($data[self::FIELD_RESPONSIBLE])) { + $this->setResponsible(new FHIRString(array_merge($ext, $data[self::FIELD_RESPONSIBLE]))); + } } else { $this->setResponsible(new FHIRString($data[self::FIELD_RESPONSIBLE])); } @@ -431,8 +460,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRPublicationStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRPublicationStatus([FHIRPublicationStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRPublicationStatus([FHIRPublicationStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRPublicationStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRPublicationStatus($data[self::FIELD_STATUS])); } @@ -450,17 +483,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_UNIQUE_ID])) { foreach($data[self::FIELD_UNIQUE_ID] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRNamingSystemUniqueId) { $this->addUniqueId($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addUniqueId(new FHIRNamingSystemUniqueId([FHIRNamingSystemUniqueId::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addUniqueId(new FHIRNamingSystemUniqueId([FHIRNamingSystemUniqueId::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addUniqueId(new FHIRNamingSystemUniqueId(array_merge($v, $ext[$i]))); + } } else { $this->addUniqueId(new FHIRNamingSystemUniqueId($v)); } } } elseif ($data[self::FIELD_UNIQUE_ID] instanceof FHIRNamingSystemUniqueId) { $this->addUniqueId($data[self::FIELD_UNIQUE_ID]); - } elseif ($ext && is_scalar($data[self::FIELD_UNIQUE_ID])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_UNIQUE_ID])) { $this->addUniqueId(new FHIRNamingSystemUniqueId([FHIRNamingSystemUniqueId::FIELD_VALUE => $data[self::FIELD_UNIQUE_ID]] + $ext)); } else { $this->addUniqueId(new FHIRNamingSystemUniqueId($data[self::FIELD_UNIQUE_ID])); @@ -472,8 +512,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_USAGE] instanceof FHIRString) { $this->setUsage($data[self::FIELD_USAGE]); - } elseif ($ext && is_scalar($data[self::FIELD_USAGE])) { - $this->setUsage(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_USAGE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_USAGE])) { + $this->setUsage(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_USAGE]] + $ext)); + } else if (is_array($data[self::FIELD_USAGE])) { + $this->setUsage(new FHIRString(array_merge($ext, $data[self::FIELD_USAGE]))); + } } else { $this->setUsage(new FHIRString($data[self::FIELD_USAGE])); } @@ -481,6 +525,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_USE_CONTEXT])) { if (is_array($data[self::FIELD_USE_CONTEXT])) { foreach($data[self::FIELD_USE_CONTEXT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRUsageContext) { $this->addUseContext($v); } else { @@ -1321,7 +1368,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESCRIPTION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getJurisdiction())) { foreach($vs as $v) { if (null === $v) { @@ -1330,7 +1376,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_JURISDICTION, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getKind())) { $v->xmlSerialize($sxe->addChild(self::FIELD_KIND, null, $v->_getFHIRXMLNamespace())); } @@ -1340,22 +1385,18 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getPublisher())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PUBLISHER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getReplacedBy())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REPLACED_BY, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getResponsible())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RESPONSIBLE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getUniqueId())) { foreach($vs as $v) { if (null === $v) { @@ -1367,7 +1408,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getUsage())) { $v->xmlSerialize($sxe->addChild(self::FIELD_USAGE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getUseContext())) { foreach($vs as $v) { if (null === $v) { @@ -1389,46 +1429,120 @@ public function jsonSerialize() $a[self::FIELD_CONTACT] = $vs; } if (null !== ($v = $this->getDate())) { - $a[self::FIELD_DATE] = $v->getValue(); - $a[self::FIELD_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_DATE] = $v; + } } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if ([] !== ($vs = $this->getJurisdiction())) { $a[self::FIELD_JURISDICTION] = $vs; } if (null !== ($v = $this->getKind())) { - $a[self::FIELD_KIND] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_KIND] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_KIND_EXT] = $enc; + } + } else { + $a[self::FIELD_KIND] = $v; + } } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if (null !== ($v = $this->getPublisher())) { - $a[self::FIELD_PUBLISHER] = $v->getValue(); - $a[self::FIELD_PUBLISHER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PUBLISHER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PUBLISHER_EXT] = $enc; + } + } else { + $a[self::FIELD_PUBLISHER] = $v; + } } if (null !== ($v = $this->getReplacedBy())) { $a[self::FIELD_REPLACED_BY] = $v; } if (null !== ($v = $this->getResponsible())) { - $a[self::FIELD_RESPONSIBLE] = $v->getValue(); - $a[self::FIELD_RESPONSIBLE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_RESPONSIBLE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_RESPONSIBLE_EXT] = $enc; + } + } else { + $a[self::FIELD_RESPONSIBLE] = $v; + } } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getType())) { $a[self::FIELD_TYPE] = $v; } if ([] !== ($vs = $this->getUniqueId())) { - $a[self::FIELD_UNIQUE_ID] = $vs; + $a[self::FIELD_UNIQUE_ID] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_UNIQUE_ID][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_UNIQUE_ID_EXT][] = $enc; + } else { + $a[self::FIELD_UNIQUE_ID_EXT][] = null; + } + } else { + $a[self::FIELD_UNIQUE_ID][] = $v; + } + } } if (null !== ($v = $this->getUsage())) { - $a[self::FIELD_USAGE] = $v->getValue(); - $a[self::FIELD_USAGE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_USAGE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_USAGE_EXT] = $enc; + } + } else { + $a[self::FIELD_USAGE] = $v; + } } if ([] !== ($vs = $this->getUseContext())) { $a[self::FIELD_USE_CONTEXT] = $vs; diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRNutritionOrder.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRNutritionOrder.php index 295d76a10f..b2c2024bad 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRNutritionOrder.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRNutritionOrder.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -87,10 +87,6 @@ class FHIRNutritionOrder extends FHIRDomainResource implements PHPFHIRContainedT { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_NUTRITION_ORDER; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ALLERGY_INTOLERANCE = 'allergyIntolerance'; const FIELD_DATE_TIME = 'dateTime'; const FIELD_DATE_TIME_EXT = '_dateTime'; @@ -259,6 +255,9 @@ class FHIRNutritionOrder extends FHIRDomainResource implements PHPFHIRContainedT */ protected $supplement = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRNutritionOrder Constructor * @param null|array $data @@ -278,6 +277,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ALLERGY_INTOLERANCE])) { if (is_array($data[self::FIELD_ALLERGY_INTOLERANCE])) { foreach($data[self::FIELD_ALLERGY_INTOLERANCE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addAllergyIntolerance($v); } else { @@ -296,8 +298,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATE_TIME] instanceof FHIRDateTime) { $this->setDateTime($data[self::FIELD_DATE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_DATE_TIME])) { - $this->setDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATE_TIME])) { + $this->setDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_DATE_TIME])) { + $this->setDateTime(new FHIRDateTime(array_merge($ext, $data[self::FIELD_DATE_TIME]))); + } } else { $this->setDateTime(new FHIRDateTime($data[self::FIELD_DATE_TIME])); } @@ -319,6 +325,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_EXCLUDE_FOOD_MODIFIER])) { if (is_array($data[self::FIELD_EXCLUDE_FOOD_MODIFIER])) { foreach($data[self::FIELD_EXCLUDE_FOOD_MODIFIER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addExcludeFoodModifier($v); } else { @@ -334,6 +343,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_FOOD_PREFERENCE_MODIFIER])) { if (is_array($data[self::FIELD_FOOD_PREFERENCE_MODIFIER])) { foreach($data[self::FIELD_FOOD_PREFERENCE_MODIFIER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addFoodPreferenceModifier($v); } else { @@ -352,17 +364,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -395,8 +414,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRNutritionOrderStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRNutritionOrderStatus([FHIRNutritionOrderStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRNutritionOrderStatus([FHIRNutritionOrderStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRNutritionOrderStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRNutritionOrderStatus($data[self::FIELD_STATUS])); } @@ -404,6 +427,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SUPPLEMENT])) { if (is_array($data[self::FIELD_SUPPLEMENT])) { foreach($data[self::FIELD_SUPPLEMENT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRNutritionOrderSupplement) { $this->addSupplement($v); } else { @@ -1139,15 +1165,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDateTime())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DATE_TIME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getEncounter())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ENCOUNTER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getEnteralFormula())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ENTERAL_FORMULA, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getExcludeFoodModifier())) { foreach($vs as $v) { if (null === $v) { @@ -1156,7 +1179,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_EXCLUDE_FOOD_MODIFIER, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getFoodPreferenceModifier())) { foreach($vs as $v) { if (null === $v) { @@ -1165,7 +1187,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_FOOD_PREFERENCE_MODIFIER, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -1174,23 +1195,18 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getOralDiet())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ORAL_DIET, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOrderer())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ORDERER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPatient())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATIENT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getSupplement())) { foreach($vs as $v) { if (null === $v) { @@ -1212,8 +1228,15 @@ public function jsonSerialize() $a[self::FIELD_ALLERGY_INTOLERANCE] = $vs; } if (null !== ($v = $this->getDateTime())) { - $a[self::FIELD_DATE_TIME] = $v->getValue(); - $a[self::FIELD_DATE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_DATE_TIME] = $v; + } } if (null !== ($v = $this->getEncounter())) { $a[self::FIELD_ENCOUNTER] = $v; @@ -1228,7 +1251,23 @@ public function jsonSerialize() $a[self::FIELD_FOOD_PREFERENCE_MODIFIER] = $vs; } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if (null !== ($v = $this->getOralDiet())) { $a[self::FIELD_ORAL_DIET] = $v; @@ -1240,7 +1279,15 @@ public function jsonSerialize() $a[self::FIELD_PATIENT] = $v; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if ([] !== ($vs = $this->getSupplement())) { $a[self::FIELD_SUPPLEMENT] = $vs; diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRObservation.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRObservation.php index 7efa79f9c4..8399c3ac71 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRObservation.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRObservation.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -97,10 +97,6 @@ class FHIRObservation extends FHIRDomainResource implements PHPFHIRContainedType { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_OBSERVATION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_BASED_ON = 'basedOn'; const FIELD_BODY_SITE = 'bodySite'; const FIELD_CATEGORY = 'category'; @@ -547,6 +543,9 @@ class FHIRObservation extends FHIRDomainResource implements PHPFHIRContainedType */ protected $valueTime = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRObservation Constructor * @param null|array $data @@ -566,6 +565,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_BASED_ON])) { if (is_array($data[self::FIELD_BASED_ON])) { foreach($data[self::FIELD_BASED_ON] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addBasedOn($v); } else { @@ -588,6 +590,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CATEGORY])) { if (is_array($data[self::FIELD_CATEGORY])) { foreach($data[self::FIELD_CATEGORY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addCategory($v); } else { @@ -613,8 +618,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_COMMENT] instanceof FHIRString) { $this->setComment($data[self::FIELD_COMMENT]); - } elseif ($ext && is_scalar($data[self::FIELD_COMMENT])) { - $this->setComment(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_COMMENT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_COMMENT])) { + $this->setComment(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_COMMENT]] + $ext)); + } else if (is_array($data[self::FIELD_COMMENT])) { + $this->setComment(new FHIRString(array_merge($ext, $data[self::FIELD_COMMENT]))); + } } else { $this->setComment(new FHIRString($data[self::FIELD_COMMENT])); } @@ -622,6 +631,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_COMPONENT])) { if (is_array($data[self::FIELD_COMPONENT])) { foreach($data[self::FIELD_COMPONENT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRObservationComponent) { $this->addComponent($v); } else { @@ -661,8 +673,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EFFECTIVE_DATE_TIME] instanceof FHIRDateTime) { $this->setEffectiveDateTime($data[self::FIELD_EFFECTIVE_DATE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_EFFECTIVE_DATE_TIME])) { - $this->setEffectiveDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_EFFECTIVE_DATE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EFFECTIVE_DATE_TIME])) { + $this->setEffectiveDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_EFFECTIVE_DATE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_EFFECTIVE_DATE_TIME])) { + $this->setEffectiveDateTime(new FHIRDateTime(array_merge($ext, $data[self::FIELD_EFFECTIVE_DATE_TIME]))); + } } else { $this->setEffectiveDateTime(new FHIRDateTime($data[self::FIELD_EFFECTIVE_DATE_TIME])); } @@ -680,17 +696,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -709,8 +732,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ISSUED] instanceof FHIRInstant) { $this->setIssued($data[self::FIELD_ISSUED]); - } elseif ($ext && is_scalar($data[self::FIELD_ISSUED])) { - $this->setIssued(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_ISSUED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ISSUED])) { + $this->setIssued(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_ISSUED]] + $ext)); + } else if (is_array($data[self::FIELD_ISSUED])) { + $this->setIssued(new FHIRInstant(array_merge($ext, $data[self::FIELD_ISSUED]))); + } } else { $this->setIssued(new FHIRInstant($data[self::FIELD_ISSUED])); } @@ -725,6 +752,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PERFORMER])) { if (is_array($data[self::FIELD_PERFORMER])) { foreach($data[self::FIELD_PERFORMER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addPerformer($v); } else { @@ -740,6 +770,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REFERENCE_RANGE])) { if (is_array($data[self::FIELD_REFERENCE_RANGE])) { foreach($data[self::FIELD_REFERENCE_RANGE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRObservationReferenceRange) { $this->addReferenceRange($v); } else { @@ -755,6 +788,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_RELATED])) { if (is_array($data[self::FIELD_RELATED])) { foreach($data[self::FIELD_RELATED] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRObservationRelated) { $this->addRelated($v); } else { @@ -780,8 +816,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRObservationStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRObservationStatus([FHIRObservationStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRObservationStatus([FHIRObservationStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRObservationStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRObservationStatus($data[self::FIELD_STATUS])); } @@ -806,8 +846,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_BOOLEAN] instanceof FHIRBoolean) { $this->setValueBoolean($data[self::FIELD_VALUE_BOOLEAN]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_BOOLEAN])) { - $this->setValueBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_VALUE_BOOLEAN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_BOOLEAN])) { + $this->setValueBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_VALUE_BOOLEAN]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_BOOLEAN])) { + $this->setValueBoolean(new FHIRBoolean(array_merge($ext, $data[self::FIELD_VALUE_BOOLEAN]))); + } } else { $this->setValueBoolean(new FHIRBoolean($data[self::FIELD_VALUE_BOOLEAN])); } @@ -825,8 +869,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_DATE_TIME] instanceof FHIRDateTime) { $this->setValueDateTime($data[self::FIELD_VALUE_DATE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_DATE_TIME])) { - $this->setValueDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_VALUE_DATE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_DATE_TIME])) { + $this->setValueDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_VALUE_DATE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_DATE_TIME])) { + $this->setValueDateTime(new FHIRDateTime(array_merge($ext, $data[self::FIELD_VALUE_DATE_TIME]))); + } } else { $this->setValueDateTime(new FHIRDateTime($data[self::FIELD_VALUE_DATE_TIME])); } @@ -844,8 +892,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_QUANTITY] instanceof FHIRQuantity) { $this->setValueQuantity($data[self::FIELD_VALUE_QUANTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_QUANTITY])) { - $this->setValueQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_VALUE_QUANTITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_QUANTITY])) { + $this->setValueQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_VALUE_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_QUANTITY])) { + $this->setValueQuantity(new FHIRQuantity(array_merge($ext, $data[self::FIELD_VALUE_QUANTITY]))); + } } else { $this->setValueQuantity(new FHIRQuantity($data[self::FIELD_VALUE_QUANTITY])); } @@ -877,8 +929,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_STRING] instanceof FHIRString) { $this->setValueString($data[self::FIELD_VALUE_STRING]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_STRING])) { - $this->setValueString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VALUE_STRING]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_STRING])) { + $this->setValueString(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VALUE_STRING]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_STRING])) { + $this->setValueString(new FHIRString(array_merge($ext, $data[self::FIELD_VALUE_STRING]))); + } } else { $this->setValueString(new FHIRString($data[self::FIELD_VALUE_STRING])); } @@ -889,8 +945,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VALUE_TIME] instanceof FHIRTime) { $this->setValueTime($data[self::FIELD_VALUE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_VALUE_TIME])) { - $this->setValueTime(new FHIRTime([FHIRTime::FIELD_VALUE => $data[self::FIELD_VALUE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VALUE_TIME])) { + $this->setValueTime(new FHIRTime([FHIRTime::FIELD_VALUE => $data[self::FIELD_VALUE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_VALUE_TIME])) { + $this->setValueTime(new FHIRTime(array_merge($ext, $data[self::FIELD_VALUE_TIME]))); + } } else { $this->setValueTime(new FHIRTime($data[self::FIELD_VALUE_TIME])); } @@ -2448,11 +2508,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_BASED_ON, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getBodySite())) { $v->xmlSerialize($sxe->addChild(self::FIELD_BODY_SITE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getCategory())) { foreach($vs as $v) { if (null === $v) { @@ -2461,14 +2519,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_CATEGORY, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getComment())) { $v->xmlSerialize($sxe->addChild(self::FIELD_COMMENT, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getComponent())) { foreach($vs as $v) { if (null === $v) { @@ -2477,26 +2533,21 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_COMPONENT, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getContext())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CONTEXT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDataAbsentReason())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DATA_ABSENT_REASON, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDevice())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEVICE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getEffectiveDateTime())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EFFECTIVE_DATE_TIME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getEffectivePeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EFFECTIVE_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -2505,18 +2556,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getInterpretation())) { $v->xmlSerialize($sxe->addChild(self::FIELD_INTERPRETATION, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getIssued())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ISSUED, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getMethod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_METHOD, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getPerformer())) { foreach($vs as $v) { if (null === $v) { @@ -2525,7 +2573,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_PERFORMER, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getReferenceRange())) { foreach($vs as $v) { if (null === $v) { @@ -2534,7 +2581,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_REFERENCE_RANGE, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getRelated())) { foreach($vs as $v) { if (null === $v) { @@ -2543,49 +2589,39 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_RELATED, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getSpecimen())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SPECIMEN, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSubject())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBJECT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueAttachment())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_ATTACHMENT, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getValueBoolean())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_BOOLEAN, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getValueDateTime())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_DATE_TIME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValuePeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_QUANTITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueRange())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_RANGE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueRatio())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_RATIO, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getValueSampledData())) { $v->xmlSerialize($sxe->addChild(self::FIELD_VALUE_SAMPLED_DATA, null, $v->_getFHIRXMLNamespace())); } @@ -2617,8 +2653,15 @@ public function jsonSerialize() $a[self::FIELD_CODE] = $v; } if (null !== ($v = $this->getComment())) { - $a[self::FIELD_COMMENT] = $v->getValue(); - $a[self::FIELD_COMMENT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_COMMENT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_COMMENT_EXT] = $enc; + } + } else { + $a[self::FIELD_COMMENT] = $v; + } } if ([] !== ($vs = $this->getComponent())) { $a[self::FIELD_COMPONENT] = $vs; @@ -2633,21 +2676,51 @@ public function jsonSerialize() $a[self::FIELD_DEVICE] = $v; } if (null !== ($v = $this->getEffectiveDateTime())) { - $a[self::FIELD_EFFECTIVE_DATE_TIME] = $v->getValue(); - $a[self::FIELD_EFFECTIVE_DATE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EFFECTIVE_DATE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EFFECTIVE_DATE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_EFFECTIVE_DATE_TIME] = $v; + } } if (null !== ($v = $this->getEffectivePeriod())) { $a[self::FIELD_EFFECTIVE_PERIOD] = $v; } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if (null !== ($v = $this->getInterpretation())) { $a[self::FIELD_INTERPRETATION] = $v; } if (null !== ($v = $this->getIssued())) { - $a[self::FIELD_ISSUED] = $v->getValue(); - $a[self::FIELD_ISSUED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ISSUED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ISSUED_EXT] = $enc; + } + } else { + $a[self::FIELD_ISSUED] = $v; + } } if (null !== ($v = $this->getMethod())) { $a[self::FIELD_METHOD] = $v; @@ -2665,7 +2738,15 @@ public function jsonSerialize() $a[self::FIELD_SPECIMEN] = $v; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getSubject())) { $a[self::FIELD_SUBJECT] = $v; @@ -2674,21 +2755,43 @@ public function jsonSerialize() $a[self::FIELD_VALUE_ATTACHMENT] = $v; } if (null !== ($v = $this->getValueBoolean())) { - $a[self::FIELD_VALUE_BOOLEAN] = $v->getValue(); - $a[self::FIELD_VALUE_BOOLEAN_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_BOOLEAN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_BOOLEAN_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_BOOLEAN] = $v; + } } if (null !== ($v = $this->getValueCodeableConcept())) { $a[self::FIELD_VALUE_CODEABLE_CONCEPT] = $v; } if (null !== ($v = $this->getValueDateTime())) { - $a[self::FIELD_VALUE_DATE_TIME] = $v->getValue(); - $a[self::FIELD_VALUE_DATE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_DATE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_DATE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_DATE_TIME] = $v; + } } if (null !== ($v = $this->getValuePeriod())) { $a[self::FIELD_VALUE_PERIOD] = $v; } if (null !== ($v = $this->getValueQuantity())) { - $a[self::FIELD_VALUE_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_QUANTITY] = $v; + } } if (null !== ($v = $this->getValueRange())) { $a[self::FIELD_VALUE_RANGE] = $v; @@ -2700,12 +2803,26 @@ public function jsonSerialize() $a[self::FIELD_VALUE_SAMPLED_DATA] = $v; } if (null !== ($v = $this->getValueString())) { - $a[self::FIELD_VALUE_STRING] = $v->getValue(); - $a[self::FIELD_VALUE_STRING_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_STRING] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_STRING_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_STRING] = $v; + } } if (null !== ($v = $this->getValueTime())) { - $a[self::FIELD_VALUE_TIME] = $v->getValue(); - $a[self::FIELD_VALUE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VALUE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VALUE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_VALUE_TIME] = $v; + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIROperationDefinition.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIROperationDefinition.php index 9bfe3edda9..fcafcccecf 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIROperationDefinition.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIROperationDefinition.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -94,10 +94,6 @@ class FHIROperationDefinition extends FHIRDomainResource implements PHPFHIRConta { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_OPERATION_DEFINITION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_BASE = 'base'; const FIELD_CODE = 'code'; const FIELD_CODE_EXT = '_code'; @@ -433,6 +429,9 @@ class FHIROperationDefinition extends FHIRDomainResource implements PHPFHIRConta */ protected $version = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIROperationDefinition Constructor * @param null|array $data @@ -462,8 +461,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CODE] instanceof FHIRCode) { $this->setCode($data[self::FIELD_CODE]); - } elseif ($ext && is_scalar($data[self::FIELD_CODE])) { - $this->setCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_CODE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CODE])) { + $this->setCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_CODE]] + $ext)); + } else if (is_array($data[self::FIELD_CODE])) { + $this->setCode(new FHIRCode(array_merge($ext, $data[self::FIELD_CODE]))); + } } else { $this->setCode(new FHIRCode($data[self::FIELD_CODE])); } @@ -474,8 +477,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_COMMENT] instanceof FHIRString) { $this->setComment($data[self::FIELD_COMMENT]); - } elseif ($ext && is_scalar($data[self::FIELD_COMMENT])) { - $this->setComment(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_COMMENT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_COMMENT])) { + $this->setComment(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_COMMENT]] + $ext)); + } else if (is_array($data[self::FIELD_COMMENT])) { + $this->setComment(new FHIRString(array_merge($ext, $data[self::FIELD_COMMENT]))); + } } else { $this->setComment(new FHIRString($data[self::FIELD_COMMENT])); } @@ -483,6 +490,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CONTACT])) { if (is_array($data[self::FIELD_CONTACT])) { foreach($data[self::FIELD_CONTACT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContactDetail) { $this->addContact($v); } else { @@ -501,8 +511,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATE] instanceof FHIRDateTime) { $this->setDate($data[self::FIELD_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_DATE])) { - $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime(array_merge($ext, $data[self::FIELD_DATE]))); + } } else { $this->setDate(new FHIRDateTime($data[self::FIELD_DATE])); } @@ -513,8 +527,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRMarkdown) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRMarkdown($data[self::FIELD_DESCRIPTION])); } @@ -525,8 +543,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EXPERIMENTAL] instanceof FHIRBoolean) { $this->setExperimental($data[self::FIELD_EXPERIMENTAL]); - } elseif ($ext && is_scalar($data[self::FIELD_EXPERIMENTAL])) { - $this->setExperimental(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_EXPERIMENTAL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EXPERIMENTAL])) { + $this->setExperimental(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_EXPERIMENTAL]] + $ext)); + } else if (is_array($data[self::FIELD_EXPERIMENTAL])) { + $this->setExperimental(new FHIRBoolean(array_merge($ext, $data[self::FIELD_EXPERIMENTAL]))); + } } else { $this->setExperimental(new FHIRBoolean($data[self::FIELD_EXPERIMENTAL])); } @@ -537,8 +559,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IDEMPOTENT] instanceof FHIRBoolean) { $this->setIdempotent($data[self::FIELD_IDEMPOTENT]); - } elseif ($ext && is_scalar($data[self::FIELD_IDEMPOTENT])) { - $this->setIdempotent(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_IDEMPOTENT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IDEMPOTENT])) { + $this->setIdempotent(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_IDEMPOTENT]] + $ext)); + } else if (is_array($data[self::FIELD_IDEMPOTENT])) { + $this->setIdempotent(new FHIRBoolean(array_merge($ext, $data[self::FIELD_IDEMPOTENT]))); + } } else { $this->setIdempotent(new FHIRBoolean($data[self::FIELD_IDEMPOTENT])); } @@ -549,8 +575,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_INSTANCE] instanceof FHIRBoolean) { $this->setInstance($data[self::FIELD_INSTANCE]); - } elseif ($ext && is_scalar($data[self::FIELD_INSTANCE])) { - $this->setInstance(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_INSTANCE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_INSTANCE])) { + $this->setInstance(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_INSTANCE]] + $ext)); + } else if (is_array($data[self::FIELD_INSTANCE])) { + $this->setInstance(new FHIRBoolean(array_merge($ext, $data[self::FIELD_INSTANCE]))); + } } else { $this->setInstance(new FHIRBoolean($data[self::FIELD_INSTANCE])); } @@ -558,6 +588,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_JURISDICTION])) { if (is_array($data[self::FIELD_JURISDICTION])) { foreach($data[self::FIELD_JURISDICTION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addJurisdiction($v); } else { @@ -576,8 +609,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_KIND] instanceof FHIROperationKind) { $this->setKind($data[self::FIELD_KIND]); - } elseif ($ext && is_scalar($data[self::FIELD_KIND])) { - $this->setKind(new FHIROperationKind([FHIROperationKind::FIELD_VALUE => $data[self::FIELD_KIND]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_KIND])) { + $this->setKind(new FHIROperationKind([FHIROperationKind::FIELD_VALUE => $data[self::FIELD_KIND]] + $ext)); + } else if (is_array($data[self::FIELD_KIND])) { + $this->setKind(new FHIROperationKind(array_merge($ext, $data[self::FIELD_KIND]))); + } } else { $this->setKind(new FHIROperationKind($data[self::FIELD_KIND])); } @@ -588,8 +625,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -597,6 +638,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_OVERLOAD])) { if (is_array($data[self::FIELD_OVERLOAD])) { foreach($data[self::FIELD_OVERLOAD] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIROperationDefinitionOverload) { $this->addOverload($v); } else { @@ -612,6 +656,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PARAMETER])) { if (is_array($data[self::FIELD_PARAMETER])) { foreach($data[self::FIELD_PARAMETER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIROperationDefinitionParameter) { $this->addParameter($v); } else { @@ -630,8 +677,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PUBLISHER] instanceof FHIRString) { $this->setPublisher($data[self::FIELD_PUBLISHER]); - } elseif ($ext && is_scalar($data[self::FIELD_PUBLISHER])) { - $this->setPublisher(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PUBLISHER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PUBLISHER])) { + $this->setPublisher(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PUBLISHER]] + $ext)); + } else if (is_array($data[self::FIELD_PUBLISHER])) { + $this->setPublisher(new FHIRString(array_merge($ext, $data[self::FIELD_PUBLISHER]))); + } } else { $this->setPublisher(new FHIRString($data[self::FIELD_PUBLISHER])); } @@ -642,8 +693,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PURPOSE] instanceof FHIRMarkdown) { $this->setPurpose($data[self::FIELD_PURPOSE]); - } elseif ($ext && is_scalar($data[self::FIELD_PURPOSE])) { - $this->setPurpose(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_PURPOSE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PURPOSE])) { + $this->setPurpose(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_PURPOSE]] + $ext)); + } else if (is_array($data[self::FIELD_PURPOSE])) { + $this->setPurpose(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_PURPOSE]))); + } } else { $this->setPurpose(new FHIRMarkdown($data[self::FIELD_PURPOSE])); } @@ -651,6 +706,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_RESOURCE])) { if (is_array($data[self::FIELD_RESOURCE])) { foreach($data[self::FIELD_RESOURCE] as $v) { + if (null === $v) { + continue; + } $this->addResource($v); } } else { @@ -663,8 +721,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRPublicationStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRPublicationStatus([FHIRPublicationStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRPublicationStatus([FHIRPublicationStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRPublicationStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRPublicationStatus($data[self::FIELD_STATUS])); } @@ -675,8 +737,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SYSTEM] instanceof FHIRBoolean) { $this->setSystem($data[self::FIELD_SYSTEM]); - } elseif ($ext && is_scalar($data[self::FIELD_SYSTEM])) { - $this->setSystem(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_SYSTEM]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SYSTEM])) { + $this->setSystem(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_SYSTEM]] + $ext)); + } else if (is_array($data[self::FIELD_SYSTEM])) { + $this->setSystem(new FHIRBoolean(array_merge($ext, $data[self::FIELD_SYSTEM]))); + } } else { $this->setSystem(new FHIRBoolean($data[self::FIELD_SYSTEM])); } @@ -687,8 +753,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TYPE] instanceof FHIRBoolean) { $this->setType($data[self::FIELD_TYPE]); - } elseif ($ext && is_scalar($data[self::FIELD_TYPE])) { - $this->setType(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TYPE])) { + $this->setType(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } else if (is_array($data[self::FIELD_TYPE])) { + $this->setType(new FHIRBoolean(array_merge($ext, $data[self::FIELD_TYPE]))); + } } else { $this->setType(new FHIRBoolean($data[self::FIELD_TYPE])); } @@ -699,8 +769,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_URL] instanceof FHIRUri) { $this->setUrl($data[self::FIELD_URL]); - } elseif ($ext && is_scalar($data[self::FIELD_URL])) { - $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } else if (is_array($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri(array_merge($ext, $data[self::FIELD_URL]))); + } } else { $this->setUrl(new FHIRUri($data[self::FIELD_URL])); } @@ -708,6 +782,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_USE_CONTEXT])) { if (is_array($data[self::FIELD_USE_CONTEXT])) { foreach($data[self::FIELD_USE_CONTEXT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRUsageContext) { $this->addUseContext($v); } else { @@ -726,8 +803,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VERSION] instanceof FHIRString) { $this->setVersion($data[self::FIELD_VERSION]); - } elseif ($ext && is_scalar($data[self::FIELD_VERSION])) { - $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } else if (is_array($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString(array_merge($ext, $data[self::FIELD_VERSION]))); + } } else { $this->setVersion(new FHIRString($data[self::FIELD_VERSION])); } @@ -2034,7 +2115,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getComment())) { $v->xmlSerialize($sxe->addChild(self::FIELD_COMMENT, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getContact())) { foreach($vs as $v) { if (null === $v) { @@ -2058,7 +2138,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getInstance())) { $v->xmlSerialize($sxe->addChild(self::FIELD_INSTANCE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getJurisdiction())) { foreach($vs as $v) { if (null === $v) { @@ -2067,14 +2146,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_JURISDICTION, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getKind())) { $v->xmlSerialize($sxe->addChild(self::FIELD_KIND, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NAME, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getOverload())) { foreach($vs as $v) { if (null === $v) { @@ -2083,7 +2160,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_OVERLOAD, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getParameter())) { foreach($vs as $v) { if (null === $v) { @@ -2097,8 +2173,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 } if (null !== ($v = $this->getPurpose())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PURPOSE, null, $v->_getFHIRXMLNamespace())); - } - if ([] !== ($vs = $this->getResource())) { + } if ([] !== ($vs = $this->getResource())) { foreach($vs as $v) { if (null === $v) { continue; @@ -2106,7 +2181,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_RESOURCE, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } @@ -2119,7 +2193,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getUrl())) { $v->xmlSerialize($sxe->addChild(self::FIELD_URL, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getUseContext())) { foreach($vs as $v) { if (null === $v) { @@ -2144,45 +2217,109 @@ public function jsonSerialize() $a[self::FIELD_BASE] = $v; } if (null !== ($v = $this->getCode())) { - $a[self::FIELD_CODE] = $v->getValue(); - $a[self::FIELD_CODE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CODE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CODE_EXT] = $enc; + } + } else { + $a[self::FIELD_CODE] = $v; + } } if (null !== ($v = $this->getComment())) { - $a[self::FIELD_COMMENT] = $v->getValue(); - $a[self::FIELD_COMMENT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_COMMENT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_COMMENT_EXT] = $enc; + } + } else { + $a[self::FIELD_COMMENT] = $v; + } } if ([] !== ($vs = $this->getContact())) { $a[self::FIELD_CONTACT] = $vs; } if (null !== ($v = $this->getDate())) { - $a[self::FIELD_DATE] = $v->getValue(); - $a[self::FIELD_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_DATE] = $v; + } } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if (null !== ($v = $this->getExperimental())) { - $a[self::FIELD_EXPERIMENTAL] = $v->getValue(); - $a[self::FIELD_EXPERIMENTAL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EXPERIMENTAL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EXPERIMENTAL_EXT] = $enc; + } + } else { + $a[self::FIELD_EXPERIMENTAL] = $v; + } } if (null !== ($v = $this->getIdempotent())) { - $a[self::FIELD_IDEMPOTENT] = $v->getValue(); - $a[self::FIELD_IDEMPOTENT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDEMPOTENT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDEMPOTENT_EXT] = $enc; + } + } else { + $a[self::FIELD_IDEMPOTENT] = $v; + } } if (null !== ($v = $this->getInstance())) { - $a[self::FIELD_INSTANCE] = $v->getValue(); - $a[self::FIELD_INSTANCE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_INSTANCE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_INSTANCE_EXT] = $enc; + } + } else { + $a[self::FIELD_INSTANCE] = $v; + } } if ([] !== ($vs = $this->getJurisdiction())) { $a[self::FIELD_JURISDICTION] = $vs; } if (null !== ($v = $this->getKind())) { - $a[self::FIELD_KIND] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_KIND] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_KIND_EXT] = $enc; + } + } else { + $a[self::FIELD_KIND] = $v; + } } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if ([] !== ($vs = $this->getOverload())) { $a[self::FIELD_OVERLOAD] = $vs; @@ -2191,37 +2328,87 @@ public function jsonSerialize() $a[self::FIELD_PARAMETER] = $vs; } if (null !== ($v = $this->getPublisher())) { - $a[self::FIELD_PUBLISHER] = $v->getValue(); - $a[self::FIELD_PUBLISHER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PUBLISHER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PUBLISHER_EXT] = $enc; + } + } else { + $a[self::FIELD_PUBLISHER] = $v; + } } if (null !== ($v = $this->getPurpose())) { - $a[self::FIELD_PURPOSE] = $v->getValue(); - $a[self::FIELD_PURPOSE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PURPOSE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PURPOSE_EXT] = $enc; + } + } else { + $a[self::FIELD_PURPOSE] = $v; + } } if ([] !== ($vs = $this->getResource())) { $a[self::FIELD_RESOURCE] = $vs; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getSystem())) { - $a[self::FIELD_SYSTEM] = $v->getValue(); - $a[self::FIELD_SYSTEM_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SYSTEM] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SYSTEM_EXT] = $enc; + } + } else { + $a[self::FIELD_SYSTEM] = $v; + } } if (null !== ($v = $this->getType())) { - $a[self::FIELD_TYPE] = $v->getValue(); - $a[self::FIELD_TYPE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TYPE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TYPE_EXT] = $enc; + } + } else { + $a[self::FIELD_TYPE] = $v; + } } if (null !== ($v = $this->getUrl())) { - $a[self::FIELD_URL] = $v->getValue(); - $a[self::FIELD_URL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_URL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_URL_EXT] = $enc; + } + } else { + $a[self::FIELD_URL] = $v; + } } if ([] !== ($vs = $this->getUseContext())) { $a[self::FIELD_USE_CONTEXT] = $vs; } if (null !== ($v = $this->getVersion())) { - $a[self::FIELD_VERSION] = $v->getValue(); - $a[self::FIELD_VERSION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VERSION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VERSION_EXT] = $enc; + } + } else { + $a[self::FIELD_VERSION] = $v; + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIROperationOutcome.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIROperationOutcome.php index 57f6acae4b..3c07361ba4 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIROperationOutcome.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIROperationOutcome.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -80,10 +80,6 @@ class FHIROperationOutcome extends FHIRDomainResource implements PHPFHIRContaine { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_OPERATION_OUTCOME; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ISSUE = 'issue'; /** @@ -96,6 +92,9 @@ class FHIROperationOutcome extends FHIRDomainResource implements PHPFHIRContaine */ protected $issue = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIROperationOutcome Constructor * @param null|array $data @@ -115,6 +114,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ISSUE])) { if (is_array($data[self::FIELD_ISSUE])) { foreach($data[self::FIELD_ISSUE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIROperationOutcomeIssue) { $this->addIssue($v); } else { diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIROrganization.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIROrganization.php index 0b0fc89ffb..99fb70733e 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIROrganization.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIROrganization.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -89,10 +89,6 @@ class FHIROrganization extends FHIRDomainResource implements PHPFHIRContainedTyp { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_ORGANIZATION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ACTIVE = 'active'; const FIELD_ACTIVE_EXT = '_active'; const FIELD_ADDRESS = 'address'; @@ -227,6 +223,9 @@ class FHIROrganization extends FHIRDomainResource implements PHPFHIRContainedTyp */ protected $type = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIROrganization Constructor * @param null|array $data @@ -249,8 +248,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ACTIVE] instanceof FHIRBoolean) { $this->setActive($data[self::FIELD_ACTIVE]); - } elseif ($ext && is_scalar($data[self::FIELD_ACTIVE])) { - $this->setActive(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_ACTIVE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ACTIVE])) { + $this->setActive(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_ACTIVE]] + $ext)); + } else if (is_array($data[self::FIELD_ACTIVE])) { + $this->setActive(new FHIRBoolean(array_merge($ext, $data[self::FIELD_ACTIVE]))); + } } else { $this->setActive(new FHIRBoolean($data[self::FIELD_ACTIVE])); } @@ -258,6 +261,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ADDRESS])) { if (is_array($data[self::FIELD_ADDRESS])) { foreach($data[self::FIELD_ADDRESS] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRAddress) { $this->addAddress($v); } else { @@ -276,17 +282,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_ALIAS])) { foreach($data[self::FIELD_ALIAS] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRString) { $this->addAlias($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addAlias(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addAlias(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addAlias(new FHIRString(array_merge($v, $ext[$i]))); + } } else { $this->addAlias(new FHIRString($v)); } } } elseif ($data[self::FIELD_ALIAS] instanceof FHIRString) { $this->addAlias($data[self::FIELD_ALIAS]); - } elseif ($ext && is_scalar($data[self::FIELD_ALIAS])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_ALIAS])) { $this->addAlias(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_ALIAS]] + $ext)); } else { $this->addAlias(new FHIRString($data[self::FIELD_ALIAS])); @@ -295,6 +308,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CONTACT])) { if (is_array($data[self::FIELD_CONTACT])) { foreach($data[self::FIELD_CONTACT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIROrganizationContact) { $this->addContact($v); } else { @@ -310,6 +326,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ENDPOINT])) { if (is_array($data[self::FIELD_ENDPOINT])) { foreach($data[self::FIELD_ENDPOINT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addEndpoint($v); } else { @@ -328,17 +347,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -350,8 +376,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -369,17 +399,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_TELECOM])) { foreach($data[self::FIELD_TELECOM] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContactPoint) { $this->addTelecom($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addTelecom(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addTelecom(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addTelecom(new FHIRContactPoint(array_merge($v, $ext[$i]))); + } } else { $this->addTelecom(new FHIRContactPoint($v)); } } } elseif ($data[self::FIELD_TELECOM] instanceof FHIRContactPoint) { $this->addTelecom($data[self::FIELD_TELECOM]); - } elseif ($ext && is_scalar($data[self::FIELD_TELECOM])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_TELECOM])) { $this->addTelecom(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $data[self::FIELD_TELECOM]] + $ext)); } else { $this->addTelecom(new FHIRContactPoint($data[self::FIELD_TELECOM])); @@ -388,6 +425,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_TYPE])) { if (is_array($data[self::FIELD_TYPE])) { foreach($data[self::FIELD_TYPE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addType($v); } else { @@ -1093,10 +1133,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getActive())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ACTIVE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getAddress())) { foreach($vs as $v) { if (null === $v) { @@ -1113,7 +1153,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_ALIAS, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getContact())) { foreach($vs as $v) { if (null === $v) { @@ -1122,7 +1161,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_CONTACT, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getEndpoint())) { foreach($vs as $v) { if (null === $v) { @@ -1131,7 +1169,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_ENDPOINT, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -1143,11 +1180,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NAME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPartOf())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PART_OF, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getTelecom())) { foreach($vs as $v) { if (null === $v) { @@ -1156,7 +1191,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_TELECOM, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getType())) { foreach($vs as $v) { if (null === $v) { @@ -1175,8 +1209,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getActive())) { - $a[self::FIELD_ACTIVE] = $v->getValue(); - $a[self::FIELD_ACTIVE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ACTIVE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ACTIVE_EXT] = $enc; + } + } else { + $a[self::FIELD_ACTIVE] = $v; + } } if ([] !== ($vs = $this->getAddress())) { $a[self::FIELD_ADDRESS] = $vs; @@ -1187,8 +1228,17 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_ALIAS][] = $v->getValue(); - $a[self::FIELD_ALIAS_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ALIAS][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ALIAS_EXT][] = $enc; + } else { + $a[self::FIELD_ALIAS_EXT][] = null; + } + } else { + $a[self::FIELD_ALIAS][] = $v; + } } } if ([] !== ($vs = $this->getContact())) { @@ -1198,17 +1248,56 @@ public function jsonSerialize() $a[self::FIELD_ENDPOINT] = $vs; } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if (null !== ($v = $this->getPartOf())) { $a[self::FIELD_PART_OF] = $v; } if ([] !== ($vs = $this->getTelecom())) { - $a[self::FIELD_TELECOM] = $vs; + $a[self::FIELD_TELECOM] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TELECOM][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TELECOM_EXT][] = $enc; + } else { + $a[self::FIELD_TELECOM_EXT][] = null; + } + } else { + $a[self::FIELD_TELECOM][] = $v; + } + } } if ([] !== ($vs = $this->getType())) { $a[self::FIELD_TYPE] = $vs; diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRPatient.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRPatient.php index 7be0e43445..fba986c1fe 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRPatient.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRPatient.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -95,10 +95,6 @@ class FHIRPatient extends FHIRDomainResource implements PHPFHIRContainedTypeInte { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_PATIENT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ACTIVE = 'active'; const FIELD_ACTIVE_EXT = '_active'; const FIELD_ADDRESS = 'address'; @@ -343,6 +339,9 @@ class FHIRPatient extends FHIRDomainResource implements PHPFHIRContainedTypeInte */ protected $telecom = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRPatient Constructor * @param null|array $data @@ -365,8 +364,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ACTIVE] instanceof FHIRBoolean) { $this->setActive($data[self::FIELD_ACTIVE]); - } elseif ($ext && is_scalar($data[self::FIELD_ACTIVE])) { - $this->setActive(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_ACTIVE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ACTIVE])) { + $this->setActive(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_ACTIVE]] + $ext)); + } else if (is_array($data[self::FIELD_ACTIVE])) { + $this->setActive(new FHIRBoolean(array_merge($ext, $data[self::FIELD_ACTIVE]))); + } } else { $this->setActive(new FHIRBoolean($data[self::FIELD_ACTIVE])); } @@ -374,6 +377,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ADDRESS])) { if (is_array($data[self::FIELD_ADDRESS])) { foreach($data[self::FIELD_ADDRESS] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRAddress) { $this->addAddress($v); } else { @@ -399,8 +405,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_BIRTH_DATE] instanceof FHIRDate) { $this->setBirthDate($data[self::FIELD_BIRTH_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_BIRTH_DATE])) { - $this->setBirthDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_BIRTH_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_BIRTH_DATE])) { + $this->setBirthDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_BIRTH_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_BIRTH_DATE])) { + $this->setBirthDate(new FHIRDate(array_merge($ext, $data[self::FIELD_BIRTH_DATE]))); + } } else { $this->setBirthDate(new FHIRDate($data[self::FIELD_BIRTH_DATE])); } @@ -408,6 +418,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_COMMUNICATION])) { if (is_array($data[self::FIELD_COMMUNICATION])) { foreach($data[self::FIELD_COMMUNICATION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRPatientCommunication) { $this->addCommunication($v); } else { @@ -423,6 +436,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CONTACT])) { if (is_array($data[self::FIELD_CONTACT])) { foreach($data[self::FIELD_CONTACT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRPatientContact) { $this->addContact($v); } else { @@ -441,8 +457,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DECEASED_BOOLEAN] instanceof FHIRBoolean) { $this->setDeceasedBoolean($data[self::FIELD_DECEASED_BOOLEAN]); - } elseif ($ext && is_scalar($data[self::FIELD_DECEASED_BOOLEAN])) { - $this->setDeceasedBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_DECEASED_BOOLEAN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DECEASED_BOOLEAN])) { + $this->setDeceasedBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_DECEASED_BOOLEAN]] + $ext)); + } else if (is_array($data[self::FIELD_DECEASED_BOOLEAN])) { + $this->setDeceasedBoolean(new FHIRBoolean(array_merge($ext, $data[self::FIELD_DECEASED_BOOLEAN]))); + } } else { $this->setDeceasedBoolean(new FHIRBoolean($data[self::FIELD_DECEASED_BOOLEAN])); } @@ -453,8 +473,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DECEASED_DATE_TIME] instanceof FHIRDateTime) { $this->setDeceasedDateTime($data[self::FIELD_DECEASED_DATE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_DECEASED_DATE_TIME])) { - $this->setDeceasedDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DECEASED_DATE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DECEASED_DATE_TIME])) { + $this->setDeceasedDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DECEASED_DATE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_DECEASED_DATE_TIME])) { + $this->setDeceasedDateTime(new FHIRDateTime(array_merge($ext, $data[self::FIELD_DECEASED_DATE_TIME]))); + } } else { $this->setDeceasedDateTime(new FHIRDateTime($data[self::FIELD_DECEASED_DATE_TIME])); } @@ -465,8 +489,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_GENDER] instanceof FHIRAdministrativeGender) { $this->setGender($data[self::FIELD_GENDER]); - } elseif ($ext && is_scalar($data[self::FIELD_GENDER])) { - $this->setGender(new FHIRAdministrativeGender([FHIRAdministrativeGender::FIELD_VALUE => $data[self::FIELD_GENDER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_GENDER])) { + $this->setGender(new FHIRAdministrativeGender([FHIRAdministrativeGender::FIELD_VALUE => $data[self::FIELD_GENDER]] + $ext)); + } else if (is_array($data[self::FIELD_GENDER])) { + $this->setGender(new FHIRAdministrativeGender(array_merge($ext, $data[self::FIELD_GENDER]))); + } } else { $this->setGender(new FHIRAdministrativeGender($data[self::FIELD_GENDER])); } @@ -474,6 +502,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_GENERAL_PRACTITIONER])) { if (is_array($data[self::FIELD_GENERAL_PRACTITIONER])) { foreach($data[self::FIELD_GENERAL_PRACTITIONER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addGeneralPractitioner($v); } else { @@ -492,17 +523,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -511,6 +549,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_LINK])) { if (is_array($data[self::FIELD_LINK])) { foreach($data[self::FIELD_LINK] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRPatientLink) { $this->addLink($v); } else { @@ -543,8 +584,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MULTIPLE_BIRTH_BOOLEAN] instanceof FHIRBoolean) { $this->setMultipleBirthBoolean($data[self::FIELD_MULTIPLE_BIRTH_BOOLEAN]); - } elseif ($ext && is_scalar($data[self::FIELD_MULTIPLE_BIRTH_BOOLEAN])) { - $this->setMultipleBirthBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_MULTIPLE_BIRTH_BOOLEAN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MULTIPLE_BIRTH_BOOLEAN])) { + $this->setMultipleBirthBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_MULTIPLE_BIRTH_BOOLEAN]] + $ext)); + } else if (is_array($data[self::FIELD_MULTIPLE_BIRTH_BOOLEAN])) { + $this->setMultipleBirthBoolean(new FHIRBoolean(array_merge($ext, $data[self::FIELD_MULTIPLE_BIRTH_BOOLEAN]))); + } } else { $this->setMultipleBirthBoolean(new FHIRBoolean($data[self::FIELD_MULTIPLE_BIRTH_BOOLEAN])); } @@ -555,8 +600,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MULTIPLE_BIRTH_INTEGER] instanceof FHIRInteger) { $this->setMultipleBirthInteger($data[self::FIELD_MULTIPLE_BIRTH_INTEGER]); - } elseif ($ext && is_scalar($data[self::FIELD_MULTIPLE_BIRTH_INTEGER])) { - $this->setMultipleBirthInteger(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_MULTIPLE_BIRTH_INTEGER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MULTIPLE_BIRTH_INTEGER])) { + $this->setMultipleBirthInteger(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_MULTIPLE_BIRTH_INTEGER]] + $ext)); + } else if (is_array($data[self::FIELD_MULTIPLE_BIRTH_INTEGER])) { + $this->setMultipleBirthInteger(new FHIRInteger(array_merge($ext, $data[self::FIELD_MULTIPLE_BIRTH_INTEGER]))); + } } else { $this->setMultipleBirthInteger(new FHIRInteger($data[self::FIELD_MULTIPLE_BIRTH_INTEGER])); } @@ -564,6 +613,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_NAME])) { if (is_array($data[self::FIELD_NAME])) { foreach($data[self::FIELD_NAME] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRHumanName) { $this->addName($v); } else { @@ -579,6 +631,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PHOTO])) { if (is_array($data[self::FIELD_PHOTO])) { foreach($data[self::FIELD_PHOTO] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRAttachment) { $this->addPhoto($v); } else { @@ -597,17 +652,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_TELECOM])) { foreach($data[self::FIELD_TELECOM] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContactPoint) { $this->addTelecom($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addTelecom(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addTelecom(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addTelecom(new FHIRContactPoint(array_merge($v, $ext[$i]))); + } } else { $this->addTelecom(new FHIRContactPoint($v)); } } } elseif ($data[self::FIELD_TELECOM] instanceof FHIRContactPoint) { $this->addTelecom($data[self::FIELD_TELECOM]); - } elseif ($ext && is_scalar($data[self::FIELD_TELECOM])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_TELECOM])) { $this->addTelecom(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $data[self::FIELD_TELECOM]] + $ext)); } else { $this->addTelecom(new FHIRContactPoint($data[self::FIELD_TELECOM])); @@ -1683,10 +1745,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getActive())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ACTIVE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getAddress())) { foreach($vs as $v) { if (null === $v) { @@ -1695,14 +1757,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_ADDRESS, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getAnimal())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ANIMAL, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getBirthDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_BIRTH_DATE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getCommunication())) { foreach($vs as $v) { if (null === $v) { @@ -1711,7 +1771,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_COMMUNICATION, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getContact())) { foreach($vs as $v) { if (null === $v) { @@ -1726,11 +1785,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDeceasedDateTime())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DECEASED_DATE_TIME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getGender())) { $v->xmlSerialize($sxe->addChild(self::FIELD_GENDER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getGeneralPractitioner())) { foreach($vs as $v) { if (null === $v) { @@ -1739,7 +1796,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_GENERAL_PRACTITIONER, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -1748,7 +1804,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getLink())) { foreach($vs as $v) { if (null === $v) { @@ -1757,11 +1812,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_LINK, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getManagingOrganization())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MANAGING_ORGANIZATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getMaritalStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MARITAL_STATUS, null, $v->_getFHIRXMLNamespace())); } @@ -1771,7 +1824,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getMultipleBirthInteger())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MULTIPLE_BIRTH_INTEGER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getName())) { foreach($vs as $v) { if (null === $v) { @@ -1780,7 +1832,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_NAME, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getPhoto())) { foreach($vs as $v) { if (null === $v) { @@ -1789,7 +1840,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_PHOTO, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getTelecom())) { foreach($vs as $v) { if (null === $v) { @@ -1808,8 +1858,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getActive())) { - $a[self::FIELD_ACTIVE] = $v->getValue(); - $a[self::FIELD_ACTIVE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ACTIVE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ACTIVE_EXT] = $enc; + } + } else { + $a[self::FIELD_ACTIVE] = $v; + } } if ([] !== ($vs = $this->getAddress())) { $a[self::FIELD_ADDRESS] = $vs; @@ -1818,8 +1875,15 @@ public function jsonSerialize() $a[self::FIELD_ANIMAL] = $v; } if (null !== ($v = $this->getBirthDate())) { - $a[self::FIELD_BIRTH_DATE] = $v->getValue(); - $a[self::FIELD_BIRTH_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_BIRTH_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_BIRTH_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_BIRTH_DATE] = $v; + } } if ([] !== ($vs = $this->getCommunication())) { $a[self::FIELD_COMMUNICATION] = $vs; @@ -1828,21 +1892,59 @@ public function jsonSerialize() $a[self::FIELD_CONTACT] = $vs; } if (null !== ($v = $this->getDeceasedBoolean())) { - $a[self::FIELD_DECEASED_BOOLEAN] = $v->getValue(); - $a[self::FIELD_DECEASED_BOOLEAN_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DECEASED_BOOLEAN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DECEASED_BOOLEAN_EXT] = $enc; + } + } else { + $a[self::FIELD_DECEASED_BOOLEAN] = $v; + } } if (null !== ($v = $this->getDeceasedDateTime())) { - $a[self::FIELD_DECEASED_DATE_TIME] = $v->getValue(); - $a[self::FIELD_DECEASED_DATE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DECEASED_DATE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DECEASED_DATE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_DECEASED_DATE_TIME] = $v; + } } if (null !== ($v = $this->getGender())) { - $a[self::FIELD_GENDER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_GENDER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_GENDER_EXT] = $enc; + } + } else { + $a[self::FIELD_GENDER] = $v; + } } if ([] !== ($vs = $this->getGeneralPractitioner())) { $a[self::FIELD_GENERAL_PRACTITIONER] = $vs; } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if ([] !== ($vs = $this->getLink())) { $a[self::FIELD_LINK] = $vs; @@ -1854,12 +1956,26 @@ public function jsonSerialize() $a[self::FIELD_MARITAL_STATUS] = $v; } if (null !== ($v = $this->getMultipleBirthBoolean())) { - $a[self::FIELD_MULTIPLE_BIRTH_BOOLEAN] = $v->getValue(); - $a[self::FIELD_MULTIPLE_BIRTH_BOOLEAN_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MULTIPLE_BIRTH_BOOLEAN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MULTIPLE_BIRTH_BOOLEAN_EXT] = $enc; + } + } else { + $a[self::FIELD_MULTIPLE_BIRTH_BOOLEAN] = $v; + } } if (null !== ($v = $this->getMultipleBirthInteger())) { - $a[self::FIELD_MULTIPLE_BIRTH_INTEGER] = $v->getValue(); - $a[self::FIELD_MULTIPLE_BIRTH_INTEGER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MULTIPLE_BIRTH_INTEGER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MULTIPLE_BIRTH_INTEGER_EXT] = $enc; + } + } else { + $a[self::FIELD_MULTIPLE_BIRTH_INTEGER] = $v; + } } if ([] !== ($vs = $this->getName())) { $a[self::FIELD_NAME] = $vs; @@ -1868,7 +1984,23 @@ public function jsonSerialize() $a[self::FIELD_PHOTO] = $vs; } if ([] !== ($vs = $this->getTelecom())) { - $a[self::FIELD_TELECOM] = $vs; + $a[self::FIELD_TELECOM] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TELECOM][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TELECOM_EXT][] = $enc; + } else { + $a[self::FIELD_TELECOM_EXT][] = null; + } + } else { + $a[self::FIELD_TELECOM][] = $v; + } + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRPaymentNotice.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRPaymentNotice.php index 7343d861ad..a6371df7a2 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRPaymentNotice.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRPaymentNotice.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -85,10 +85,6 @@ class FHIRPaymentNotice extends FHIRDomainResource implements PHPFHIRContainedTy { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_PAYMENT_NOTICE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CREATED = 'created'; const FIELD_CREATED_EXT = '_created'; const FIELD_IDENTIFIER = 'identifier'; @@ -218,6 +214,9 @@ class FHIRPaymentNotice extends FHIRDomainResource implements PHPFHIRContainedTy */ protected $target = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRPaymentNotice Constructor * @param null|array $data @@ -240,8 +239,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CREATED] instanceof FHIRDateTime) { $this->setCreated($data[self::FIELD_CREATED]); - } elseif ($ext && is_scalar($data[self::FIELD_CREATED])) { - $this->setCreated(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_CREATED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CREATED])) { + $this->setCreated(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_CREATED]] + $ext)); + } else if (is_array($data[self::FIELD_CREATED])) { + $this->setCreated(new FHIRDateTime(array_merge($ext, $data[self::FIELD_CREATED]))); + } } else { $this->setCreated(new FHIRDateTime($data[self::FIELD_CREATED])); } @@ -252,17 +255,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -309,8 +319,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRFinancialResourceStatusCodes) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRFinancialResourceStatusCodes([FHIRFinancialResourceStatusCodes::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRFinancialResourceStatusCodes([FHIRFinancialResourceStatusCodes::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRFinancialResourceStatusCodes(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRFinancialResourceStatusCodes($data[self::FIELD_STATUS])); } @@ -321,8 +335,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS_DATE] instanceof FHIRDate) { $this->setStatusDate($data[self::FIELD_STATUS_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS_DATE])) { - $this->setStatusDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_STATUS_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS_DATE])) { + $this->setStatusDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_STATUS_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS_DATE])) { + $this->setStatusDate(new FHIRDate(array_merge($ext, $data[self::FIELD_STATUS_DATE]))); + } } else { $this->setStatusDate(new FHIRDate($data[self::FIELD_STATUS_DATE])); } @@ -831,10 +849,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getCreated())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CREATED, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -843,34 +861,27 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getOrganization())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ORGANIZATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPaymentStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PAYMENT_STATUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getProvider())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PROVIDER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRequest())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REQUEST, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getResponse())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RESPONSE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getStatusDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS_DATE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getTarget())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TARGET, null, $v->_getFHIRXMLNamespace())); } @@ -884,11 +895,34 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getCreated())) { - $a[self::FIELD_CREATED] = $v->getValue(); - $a[self::FIELD_CREATED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CREATED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CREATED_EXT] = $enc; + } + } else { + $a[self::FIELD_CREATED] = $v; + } } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if (null !== ($v = $this->getOrganization())) { $a[self::FIELD_ORGANIZATION] = $v; @@ -906,11 +940,26 @@ public function jsonSerialize() $a[self::FIELD_RESPONSE] = $v; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getStatusDate())) { - $a[self::FIELD_STATUS_DATE] = $v->getValue(); - $a[self::FIELD_STATUS_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS_DATE] = $v; + } } if (null !== ($v = $this->getTarget())) { $a[self::FIELD_TARGET] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRPaymentReconciliation.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRPaymentReconciliation.php index a9e5243539..636bb94368 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRPaymentReconciliation.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRPaymentReconciliation.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -89,10 +89,6 @@ class FHIRPaymentReconciliation extends FHIRDomainResource implements PHPFHIRCon { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_PAYMENT_RECONCILIATION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CREATED = 'created'; const FIELD_CREATED_EXT = '_created'; const FIELD_DETAIL = 'detail'; @@ -111,6 +107,7 @@ class FHIRPaymentReconciliation extends FHIRDomainResource implements PHPFHIRCon const FIELD_STATUS = 'status'; const FIELD_STATUS_EXT = '_status'; const FIELD_TOTAL = 'total'; + const FIELD_TOTAL_EXT = '_total'; /** * A date, date-time or partial date (e.g. just year or year + month). If hours and @@ -269,6 +266,9 @@ class FHIRPaymentReconciliation extends FHIRDomainResource implements PHPFHIRCon */ protected $total = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRPaymentReconciliation Constructor * @param null|array $data @@ -291,8 +291,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CREATED] instanceof FHIRDateTime) { $this->setCreated($data[self::FIELD_CREATED]); - } elseif ($ext && is_scalar($data[self::FIELD_CREATED])) { - $this->setCreated(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_CREATED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CREATED])) { + $this->setCreated(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_CREATED]] + $ext)); + } else if (is_array($data[self::FIELD_CREATED])) { + $this->setCreated(new FHIRDateTime(array_merge($ext, $data[self::FIELD_CREATED]))); + } } else { $this->setCreated(new FHIRDateTime($data[self::FIELD_CREATED])); } @@ -300,6 +304,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_DETAIL])) { if (is_array($data[self::FIELD_DETAIL])) { foreach($data[self::FIELD_DETAIL] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRPaymentReconciliationDetail) { $this->addDetail($v); } else { @@ -318,8 +325,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DISPOSITION] instanceof FHIRString) { $this->setDisposition($data[self::FIELD_DISPOSITION]); - } elseif ($ext && is_scalar($data[self::FIELD_DISPOSITION])) { - $this->setDisposition(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DISPOSITION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DISPOSITION])) { + $this->setDisposition(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DISPOSITION]] + $ext)); + } else if (is_array($data[self::FIELD_DISPOSITION])) { + $this->setDisposition(new FHIRString(array_merge($ext, $data[self::FIELD_DISPOSITION]))); + } } else { $this->setDisposition(new FHIRString($data[self::FIELD_DISPOSITION])); } @@ -337,17 +348,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -377,6 +395,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PROCESS_NOTE])) { if (is_array($data[self::FIELD_PROCESS_NOTE])) { foreach($data[self::FIELD_PROCESS_NOTE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRPaymentReconciliationProcessNote) { $this->addProcessNote($v); } else { @@ -416,15 +437,28 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRFinancialResourceStatusCodes) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRFinancialResourceStatusCodes([FHIRFinancialResourceStatusCodes::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRFinancialResourceStatusCodes([FHIRFinancialResourceStatusCodes::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRFinancialResourceStatusCodes(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRFinancialResourceStatusCodes($data[self::FIELD_STATUS])); } } if (isset($data[self::FIELD_TOTAL])) { + $ext = (isset($data[self::FIELD_TOTAL_EXT]) && is_array($data[self::FIELD_TOTAL_EXT])) + ? $data[self::FIELD_TOTAL_EXT] + : null; if ($data[self::FIELD_TOTAL] instanceof FHIRMoney) { $this->setTotal($data[self::FIELD_TOTAL]); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TOTAL])) { + $this->setTotal(new FHIRMoney([FHIRMoney::FIELD_VALUE => $data[self::FIELD_TOTAL]] + $ext)); + } else if (is_array($data[self::FIELD_TOTAL])) { + $this->setTotal(new FHIRMoney(array_merge($ext, $data[self::FIELD_TOTAL]))); + } } else { $this->setTotal(new FHIRMoney($data[self::FIELD_TOTAL])); } @@ -1110,10 +1144,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getCreated())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CREATED, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getDetail())) { foreach($vs as $v) { if (null === $v) { @@ -1125,11 +1159,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDisposition())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DISPOSITION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getForm())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FORM, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -1138,19 +1170,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getOrganization())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ORGANIZATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOutcome())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OUTCOME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getProcessNote())) { foreach($vs as $v) { if (null === $v) { @@ -1159,23 +1187,18 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_PROCESS_NOTE, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getRequest())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REQUEST, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRequestOrganization())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REQUEST_ORGANIZATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRequestProvider())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REQUEST_PROVIDER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getTotal())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TOTAL, null, $v->_getFHIRXMLNamespace())); } @@ -1189,21 +1212,51 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getCreated())) { - $a[self::FIELD_CREATED] = $v->getValue(); - $a[self::FIELD_CREATED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CREATED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CREATED_EXT] = $enc; + } + } else { + $a[self::FIELD_CREATED] = $v; + } } if ([] !== ($vs = $this->getDetail())) { $a[self::FIELD_DETAIL] = $vs; } if (null !== ($v = $this->getDisposition())) { - $a[self::FIELD_DISPOSITION] = $v->getValue(); - $a[self::FIELD_DISPOSITION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DISPOSITION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DISPOSITION_EXT] = $enc; + } + } else { + $a[self::FIELD_DISPOSITION] = $v; + } } if (null !== ($v = $this->getForm())) { $a[self::FIELD_FORM] = $v; } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if (null !== ($v = $this->getOrganization())) { $a[self::FIELD_ORGANIZATION] = $v; @@ -1227,10 +1280,26 @@ public function jsonSerialize() $a[self::FIELD_REQUEST_PROVIDER] = $v; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getTotal())) { - $a[self::FIELD_TOTAL] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TOTAL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TOTAL_EXT] = $enc; + } + } else { + $a[self::FIELD_TOTAL] = $v; + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRPerson.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRPerson.php index 997c32e17b..1b377f31d2 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRPerson.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRPerson.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -89,10 +89,6 @@ class FHIRPerson extends FHIRDomainResource implements PHPFHIRContainedTypeInter { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_PERSON; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ACTIVE = 'active'; const FIELD_ACTIVE_EXT = '_active'; const FIELD_ADDRESS = 'address'; @@ -222,6 +218,9 @@ class FHIRPerson extends FHIRDomainResource implements PHPFHIRContainedTypeInter */ protected $telecom = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRPerson Constructor * @param null|array $data @@ -244,8 +243,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ACTIVE] instanceof FHIRBoolean) { $this->setActive($data[self::FIELD_ACTIVE]); - } elseif ($ext && is_scalar($data[self::FIELD_ACTIVE])) { - $this->setActive(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_ACTIVE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ACTIVE])) { + $this->setActive(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_ACTIVE]] + $ext)); + } else if (is_array($data[self::FIELD_ACTIVE])) { + $this->setActive(new FHIRBoolean(array_merge($ext, $data[self::FIELD_ACTIVE]))); + } } else { $this->setActive(new FHIRBoolean($data[self::FIELD_ACTIVE])); } @@ -253,6 +256,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ADDRESS])) { if (is_array($data[self::FIELD_ADDRESS])) { foreach($data[self::FIELD_ADDRESS] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRAddress) { $this->addAddress($v); } else { @@ -271,8 +277,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_BIRTH_DATE] instanceof FHIRDate) { $this->setBirthDate($data[self::FIELD_BIRTH_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_BIRTH_DATE])) { - $this->setBirthDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_BIRTH_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_BIRTH_DATE])) { + $this->setBirthDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_BIRTH_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_BIRTH_DATE])) { + $this->setBirthDate(new FHIRDate(array_merge($ext, $data[self::FIELD_BIRTH_DATE]))); + } } else { $this->setBirthDate(new FHIRDate($data[self::FIELD_BIRTH_DATE])); } @@ -283,8 +293,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_GENDER] instanceof FHIRAdministrativeGender) { $this->setGender($data[self::FIELD_GENDER]); - } elseif ($ext && is_scalar($data[self::FIELD_GENDER])) { - $this->setGender(new FHIRAdministrativeGender([FHIRAdministrativeGender::FIELD_VALUE => $data[self::FIELD_GENDER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_GENDER])) { + $this->setGender(new FHIRAdministrativeGender([FHIRAdministrativeGender::FIELD_VALUE => $data[self::FIELD_GENDER]] + $ext)); + } else if (is_array($data[self::FIELD_GENDER])) { + $this->setGender(new FHIRAdministrativeGender(array_merge($ext, $data[self::FIELD_GENDER]))); + } } else { $this->setGender(new FHIRAdministrativeGender($data[self::FIELD_GENDER])); } @@ -295,17 +309,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -314,6 +335,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_LINK])) { if (is_array($data[self::FIELD_LINK])) { foreach($data[self::FIELD_LINK] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRPersonLink) { $this->addLink($v); } else { @@ -336,6 +360,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_NAME])) { if (is_array($data[self::FIELD_NAME])) { foreach($data[self::FIELD_NAME] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRHumanName) { $this->addName($v); } else { @@ -361,17 +388,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_TELECOM])) { foreach($data[self::FIELD_TELECOM] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContactPoint) { $this->addTelecom($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addTelecom(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addTelecom(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addTelecom(new FHIRContactPoint(array_merge($v, $ext[$i]))); + } } else { $this->addTelecom(new FHIRContactPoint($v)); } } } elseif ($data[self::FIELD_TELECOM] instanceof FHIRContactPoint) { $this->addTelecom($data[self::FIELD_TELECOM]); - } elseif ($ext && is_scalar($data[self::FIELD_TELECOM])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_TELECOM])) { $this->addTelecom(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $data[self::FIELD_TELECOM]] + $ext)); } else { $this->addTelecom(new FHIRContactPoint($data[self::FIELD_TELECOM])); @@ -988,10 +1022,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getActive())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ACTIVE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getAddress())) { foreach($vs as $v) { if (null === $v) { @@ -1003,11 +1037,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getBirthDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_BIRTH_DATE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getGender())) { $v->xmlSerialize($sxe->addChild(self::FIELD_GENDER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -1016,7 +1048,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getLink())) { foreach($vs as $v) { if (null === $v) { @@ -1025,11 +1056,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_LINK, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getManagingOrganization())) { $v->xmlSerialize($sxe->addChild(self::FIELD_MANAGING_ORGANIZATION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getName())) { foreach($vs as $v) { if (null === $v) { @@ -1038,11 +1067,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_NAME, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getPhoto())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PHOTO, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getTelecom())) { foreach($vs as $v) { if (null === $v) { @@ -1061,21 +1088,59 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getActive())) { - $a[self::FIELD_ACTIVE] = $v->getValue(); - $a[self::FIELD_ACTIVE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ACTIVE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ACTIVE_EXT] = $enc; + } + } else { + $a[self::FIELD_ACTIVE] = $v; + } } if ([] !== ($vs = $this->getAddress())) { $a[self::FIELD_ADDRESS] = $vs; } if (null !== ($v = $this->getBirthDate())) { - $a[self::FIELD_BIRTH_DATE] = $v->getValue(); - $a[self::FIELD_BIRTH_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_BIRTH_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_BIRTH_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_BIRTH_DATE] = $v; + } } if (null !== ($v = $this->getGender())) { - $a[self::FIELD_GENDER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_GENDER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_GENDER_EXT] = $enc; + } + } else { + $a[self::FIELD_GENDER] = $v; + } } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if ([] !== ($vs = $this->getLink())) { $a[self::FIELD_LINK] = $vs; @@ -1090,7 +1155,23 @@ public function jsonSerialize() $a[self::FIELD_PHOTO] = $v; } if ([] !== ($vs = $this->getTelecom())) { - $a[self::FIELD_TELECOM] = $vs; + $a[self::FIELD_TELECOM] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TELECOM][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TELECOM_EXT][] = $enc; + } else { + $a[self::FIELD_TELECOM_EXT][] = null; + } + } else { + $a[self::FIELD_TELECOM][] = $v; + } + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRPlanDefinition.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRPlanDefinition.php index 4a2e5a4a0c..d2c57cb04e 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRPlanDefinition.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRPlanDefinition.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -98,10 +98,6 @@ class FHIRPlanDefinition extends FHIRDomainResource implements PHPFHIRContainedT { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_PLAN_DEFINITION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ACTION = 'action'; const FIELD_APPROVAL_DATE = 'approvalDate'; const FIELD_APPROVAL_DATE_EXT = '_approvalDate'; @@ -503,6 +499,9 @@ class FHIRPlanDefinition extends FHIRDomainResource implements PHPFHIRContainedT */ protected $version = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRPlanDefinition Constructor * @param null|array $data @@ -522,6 +521,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ACTION])) { if (is_array($data[self::FIELD_ACTION])) { foreach($data[self::FIELD_ACTION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRPlanDefinitionAction) { $this->addAction($v); } else { @@ -540,8 +542,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_APPROVAL_DATE] instanceof FHIRDate) { $this->setApprovalDate($data[self::FIELD_APPROVAL_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_APPROVAL_DATE])) { - $this->setApprovalDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_APPROVAL_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_APPROVAL_DATE])) { + $this->setApprovalDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_APPROVAL_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_APPROVAL_DATE])) { + $this->setApprovalDate(new FHIRDate(array_merge($ext, $data[self::FIELD_APPROVAL_DATE]))); + } } else { $this->setApprovalDate(new FHIRDate($data[self::FIELD_APPROVAL_DATE])); } @@ -549,6 +555,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CONTACT])) { if (is_array($data[self::FIELD_CONTACT])) { foreach($data[self::FIELD_CONTACT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContactDetail) { $this->addContact($v); } else { @@ -564,6 +573,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CONTRIBUTOR])) { if (is_array($data[self::FIELD_CONTRIBUTOR])) { foreach($data[self::FIELD_CONTRIBUTOR] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContributor) { $this->addContributor($v); } else { @@ -582,8 +594,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_COPYRIGHT] instanceof FHIRMarkdown) { $this->setCopyright($data[self::FIELD_COPYRIGHT]); - } elseif ($ext && is_scalar($data[self::FIELD_COPYRIGHT])) { - $this->setCopyright(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_COPYRIGHT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_COPYRIGHT])) { + $this->setCopyright(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_COPYRIGHT]] + $ext)); + } else if (is_array($data[self::FIELD_COPYRIGHT])) { + $this->setCopyright(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_COPYRIGHT]))); + } } else { $this->setCopyright(new FHIRMarkdown($data[self::FIELD_COPYRIGHT])); } @@ -594,8 +610,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATE] instanceof FHIRDateTime) { $this->setDate($data[self::FIELD_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_DATE])) { - $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime(array_merge($ext, $data[self::FIELD_DATE]))); + } } else { $this->setDate(new FHIRDateTime($data[self::FIELD_DATE])); } @@ -606,8 +626,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRMarkdown) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRMarkdown($data[self::FIELD_DESCRIPTION])); } @@ -625,8 +649,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EXPERIMENTAL] instanceof FHIRBoolean) { $this->setExperimental($data[self::FIELD_EXPERIMENTAL]); - } elseif ($ext && is_scalar($data[self::FIELD_EXPERIMENTAL])) { - $this->setExperimental(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_EXPERIMENTAL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EXPERIMENTAL])) { + $this->setExperimental(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_EXPERIMENTAL]] + $ext)); + } else if (is_array($data[self::FIELD_EXPERIMENTAL])) { + $this->setExperimental(new FHIRBoolean(array_merge($ext, $data[self::FIELD_EXPERIMENTAL]))); + } } else { $this->setExperimental(new FHIRBoolean($data[self::FIELD_EXPERIMENTAL])); } @@ -634,6 +662,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_GOAL])) { if (is_array($data[self::FIELD_GOAL])) { foreach($data[self::FIELD_GOAL] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRPlanDefinitionGoal) { $this->addGoal($v); } else { @@ -652,17 +683,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -671,6 +709,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_JURISDICTION])) { if (is_array($data[self::FIELD_JURISDICTION])) { foreach($data[self::FIELD_JURISDICTION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addJurisdiction($v); } else { @@ -689,8 +730,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_LAST_REVIEW_DATE] instanceof FHIRDate) { $this->setLastReviewDate($data[self::FIELD_LAST_REVIEW_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_LAST_REVIEW_DATE])) { - $this->setLastReviewDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_LAST_REVIEW_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_LAST_REVIEW_DATE])) { + $this->setLastReviewDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_LAST_REVIEW_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_LAST_REVIEW_DATE])) { + $this->setLastReviewDate(new FHIRDate(array_merge($ext, $data[self::FIELD_LAST_REVIEW_DATE]))); + } } else { $this->setLastReviewDate(new FHIRDate($data[self::FIELD_LAST_REVIEW_DATE])); } @@ -698,6 +743,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_LIBRARY])) { if (is_array($data[self::FIELD_LIBRARY])) { foreach($data[self::FIELD_LIBRARY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addLibrary($v); } else { @@ -716,8 +764,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -728,8 +780,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PUBLISHER] instanceof FHIRString) { $this->setPublisher($data[self::FIELD_PUBLISHER]); - } elseif ($ext && is_scalar($data[self::FIELD_PUBLISHER])) { - $this->setPublisher(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PUBLISHER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PUBLISHER])) { + $this->setPublisher(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PUBLISHER]] + $ext)); + } else if (is_array($data[self::FIELD_PUBLISHER])) { + $this->setPublisher(new FHIRString(array_merge($ext, $data[self::FIELD_PUBLISHER]))); + } } else { $this->setPublisher(new FHIRString($data[self::FIELD_PUBLISHER])); } @@ -740,8 +796,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PURPOSE] instanceof FHIRMarkdown) { $this->setPurpose($data[self::FIELD_PURPOSE]); - } elseif ($ext && is_scalar($data[self::FIELD_PURPOSE])) { - $this->setPurpose(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_PURPOSE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PURPOSE])) { + $this->setPurpose(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_PURPOSE]] + $ext)); + } else if (is_array($data[self::FIELD_PURPOSE])) { + $this->setPurpose(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_PURPOSE]))); + } } else { $this->setPurpose(new FHIRMarkdown($data[self::FIELD_PURPOSE])); } @@ -749,6 +809,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_RELATED_ARTIFACT])) { if (is_array($data[self::FIELD_RELATED_ARTIFACT])) { foreach($data[self::FIELD_RELATED_ARTIFACT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRRelatedArtifact) { $this->addRelatedArtifact($v); } else { @@ -767,8 +830,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRPublicationStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRPublicationStatus([FHIRPublicationStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRPublicationStatus([FHIRPublicationStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRPublicationStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRPublicationStatus($data[self::FIELD_STATUS])); } @@ -779,8 +846,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TITLE] instanceof FHIRString) { $this->setTitle($data[self::FIELD_TITLE]); - } elseif ($ext && is_scalar($data[self::FIELD_TITLE])) { - $this->setTitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TITLE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TITLE])) { + $this->setTitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TITLE]] + $ext)); + } else if (is_array($data[self::FIELD_TITLE])) { + $this->setTitle(new FHIRString(array_merge($ext, $data[self::FIELD_TITLE]))); + } } else { $this->setTitle(new FHIRString($data[self::FIELD_TITLE])); } @@ -788,6 +859,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_TOPIC])) { if (is_array($data[self::FIELD_TOPIC])) { foreach($data[self::FIELD_TOPIC] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addTopic($v); } else { @@ -813,8 +887,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_URL] instanceof FHIRUri) { $this->setUrl($data[self::FIELD_URL]); - } elseif ($ext && is_scalar($data[self::FIELD_URL])) { - $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } else if (is_array($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri(array_merge($ext, $data[self::FIELD_URL]))); + } } else { $this->setUrl(new FHIRUri($data[self::FIELD_URL])); } @@ -825,8 +903,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_USAGE] instanceof FHIRString) { $this->setUsage($data[self::FIELD_USAGE]); - } elseif ($ext && is_scalar($data[self::FIELD_USAGE])) { - $this->setUsage(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_USAGE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_USAGE])) { + $this->setUsage(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_USAGE]] + $ext)); + } else if (is_array($data[self::FIELD_USAGE])) { + $this->setUsage(new FHIRString(array_merge($ext, $data[self::FIELD_USAGE]))); + } } else { $this->setUsage(new FHIRString($data[self::FIELD_USAGE])); } @@ -834,6 +916,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_USE_CONTEXT])) { if (is_array($data[self::FIELD_USE_CONTEXT])) { foreach($data[self::FIELD_USE_CONTEXT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRUsageContext) { $this->addUseContext($v); } else { @@ -852,8 +937,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VERSION] instanceof FHIRString) { $this->setVersion($data[self::FIELD_VERSION]); - } elseif ($ext && is_scalar($data[self::FIELD_VERSION])) { - $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } else if (is_array($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString(array_merge($ext, $data[self::FIELD_VERSION]))); + } } else { $this->setVersion(new FHIRString($data[self::FIELD_VERSION])); } @@ -2428,7 +2517,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getApprovalDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_APPROVAL_DATE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getContact())) { foreach($vs as $v) { if (null === $v) { @@ -2437,7 +2525,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_CONTACT, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getContributor())) { foreach($vs as $v) { if (null === $v) { @@ -2455,14 +2542,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESCRIPTION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getEffectivePeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EFFECTIVE_PERIOD, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getExperimental())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EXPERIMENTAL, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getGoal())) { foreach($vs as $v) { if (null === $v) { @@ -2471,7 +2556,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_GOAL, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -2480,7 +2564,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getJurisdiction())) { foreach($vs as $v) { if (null === $v) { @@ -2492,7 +2575,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getLastReviewDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_LAST_REVIEW_DATE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getLibrary())) { foreach($vs as $v) { if (null === $v) { @@ -2510,7 +2592,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getPurpose())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PURPOSE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getRelatedArtifact())) { foreach($vs as $v) { if (null === $v) { @@ -2519,14 +2600,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_RELATED_ARTIFACT, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getTitle())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TITLE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getTopic())) { foreach($vs as $v) { if (null === $v) { @@ -2535,7 +2614,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_TOPIC, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -2545,7 +2623,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getUsage())) { $v->xmlSerialize($sxe->addChild(self::FIELD_USAGE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getUseContext())) { foreach($vs as $v) { if (null === $v) { @@ -2570,8 +2647,15 @@ public function jsonSerialize() $a[self::FIELD_ACTION] = $vs; } if (null !== ($v = $this->getApprovalDate())) { - $a[self::FIELD_APPROVAL_DATE] = $v->getValue(); - $a[self::FIELD_APPROVAL_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_APPROVAL_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_APPROVAL_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_APPROVAL_DATE] = $v; + } } if ([] !== ($vs = $this->getContact())) { $a[self::FIELD_CONTACT] = $vs; @@ -2580,61 +2664,148 @@ public function jsonSerialize() $a[self::FIELD_CONTRIBUTOR] = $vs; } if (null !== ($v = $this->getCopyright())) { - $a[self::FIELD_COPYRIGHT] = $v->getValue(); - $a[self::FIELD_COPYRIGHT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_COPYRIGHT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_COPYRIGHT_EXT] = $enc; + } + } else { + $a[self::FIELD_COPYRIGHT] = $v; + } } if (null !== ($v = $this->getDate())) { - $a[self::FIELD_DATE] = $v->getValue(); - $a[self::FIELD_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_DATE] = $v; + } } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if (null !== ($v = $this->getEffectivePeriod())) { $a[self::FIELD_EFFECTIVE_PERIOD] = $v; } if (null !== ($v = $this->getExperimental())) { - $a[self::FIELD_EXPERIMENTAL] = $v->getValue(); - $a[self::FIELD_EXPERIMENTAL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EXPERIMENTAL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EXPERIMENTAL_EXT] = $enc; + } + } else { + $a[self::FIELD_EXPERIMENTAL] = $v; + } } if ([] !== ($vs = $this->getGoal())) { $a[self::FIELD_GOAL] = $vs; } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if ([] !== ($vs = $this->getJurisdiction())) { $a[self::FIELD_JURISDICTION] = $vs; } if (null !== ($v = $this->getLastReviewDate())) { - $a[self::FIELD_LAST_REVIEW_DATE] = $v->getValue(); - $a[self::FIELD_LAST_REVIEW_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_LAST_REVIEW_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_LAST_REVIEW_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_LAST_REVIEW_DATE] = $v; + } } if ([] !== ($vs = $this->getLibrary())) { $a[self::FIELD_LIBRARY] = $vs; } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if (null !== ($v = $this->getPublisher())) { - $a[self::FIELD_PUBLISHER] = $v->getValue(); - $a[self::FIELD_PUBLISHER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PUBLISHER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PUBLISHER_EXT] = $enc; + } + } else { + $a[self::FIELD_PUBLISHER] = $v; + } } if (null !== ($v = $this->getPurpose())) { - $a[self::FIELD_PURPOSE] = $v->getValue(); - $a[self::FIELD_PURPOSE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PURPOSE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PURPOSE_EXT] = $enc; + } + } else { + $a[self::FIELD_PURPOSE] = $v; + } } if ([] !== ($vs = $this->getRelatedArtifact())) { $a[self::FIELD_RELATED_ARTIFACT] = $vs; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getTitle())) { - $a[self::FIELD_TITLE] = $v->getValue(); - $a[self::FIELD_TITLE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TITLE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TITLE_EXT] = $enc; + } + } else { + $a[self::FIELD_TITLE] = $v; + } } if ([] !== ($vs = $this->getTopic())) { $a[self::FIELD_TOPIC] = $vs; @@ -2643,19 +2814,40 @@ public function jsonSerialize() $a[self::FIELD_TYPE] = $v; } if (null !== ($v = $this->getUrl())) { - $a[self::FIELD_URL] = $v->getValue(); - $a[self::FIELD_URL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_URL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_URL_EXT] = $enc; + } + } else { + $a[self::FIELD_URL] = $v; + } } if (null !== ($v = $this->getUsage())) { - $a[self::FIELD_USAGE] = $v->getValue(); - $a[self::FIELD_USAGE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_USAGE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_USAGE_EXT] = $enc; + } + } else { + $a[self::FIELD_USAGE] = $v; + } } if ([] !== ($vs = $this->getUseContext())) { $a[self::FIELD_USE_CONTEXT] = $vs; } if (null !== ($v = $this->getVersion())) { - $a[self::FIELD_VERSION] = $v->getValue(); - $a[self::FIELD_VERSION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VERSION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VERSION_EXT] = $enc; + } + } else { + $a[self::FIELD_VERSION] = $v; + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRPractitioner.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRPractitioner.php index 15983062dc..68eb33cf72 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRPractitioner.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRPractitioner.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -89,10 +89,6 @@ class FHIRPractitioner extends FHIRDomainResource implements PHPFHIRContainedTyp { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_PRACTITIONER; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ACTIVE = 'active'; const FIELD_ACTIVE_EXT = '_active'; const FIELD_ADDRESS = 'address'; @@ -226,6 +222,9 @@ class FHIRPractitioner extends FHIRDomainResource implements PHPFHIRContainedTyp */ protected $telecom = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRPractitioner Constructor * @param null|array $data @@ -248,8 +247,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ACTIVE] instanceof FHIRBoolean) { $this->setActive($data[self::FIELD_ACTIVE]); - } elseif ($ext && is_scalar($data[self::FIELD_ACTIVE])) { - $this->setActive(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_ACTIVE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ACTIVE])) { + $this->setActive(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_ACTIVE]] + $ext)); + } else if (is_array($data[self::FIELD_ACTIVE])) { + $this->setActive(new FHIRBoolean(array_merge($ext, $data[self::FIELD_ACTIVE]))); + } } else { $this->setActive(new FHIRBoolean($data[self::FIELD_ACTIVE])); } @@ -257,6 +260,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ADDRESS])) { if (is_array($data[self::FIELD_ADDRESS])) { foreach($data[self::FIELD_ADDRESS] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRAddress) { $this->addAddress($v); } else { @@ -275,8 +281,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_BIRTH_DATE] instanceof FHIRDate) { $this->setBirthDate($data[self::FIELD_BIRTH_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_BIRTH_DATE])) { - $this->setBirthDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_BIRTH_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_BIRTH_DATE])) { + $this->setBirthDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_BIRTH_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_BIRTH_DATE])) { + $this->setBirthDate(new FHIRDate(array_merge($ext, $data[self::FIELD_BIRTH_DATE]))); + } } else { $this->setBirthDate(new FHIRDate($data[self::FIELD_BIRTH_DATE])); } @@ -284,6 +294,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_COMMUNICATION])) { if (is_array($data[self::FIELD_COMMUNICATION])) { foreach($data[self::FIELD_COMMUNICATION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addCommunication($v); } else { @@ -302,8 +315,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_GENDER] instanceof FHIRAdministrativeGender) { $this->setGender($data[self::FIELD_GENDER]); - } elseif ($ext && is_scalar($data[self::FIELD_GENDER])) { - $this->setGender(new FHIRAdministrativeGender([FHIRAdministrativeGender::FIELD_VALUE => $data[self::FIELD_GENDER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_GENDER])) { + $this->setGender(new FHIRAdministrativeGender([FHIRAdministrativeGender::FIELD_VALUE => $data[self::FIELD_GENDER]] + $ext)); + } else if (is_array($data[self::FIELD_GENDER])) { + $this->setGender(new FHIRAdministrativeGender(array_merge($ext, $data[self::FIELD_GENDER]))); + } } else { $this->setGender(new FHIRAdministrativeGender($data[self::FIELD_GENDER])); } @@ -314,17 +331,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -333,6 +357,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_NAME])) { if (is_array($data[self::FIELD_NAME])) { foreach($data[self::FIELD_NAME] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRHumanName) { $this->addName($v); } else { @@ -348,6 +375,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PHOTO])) { if (is_array($data[self::FIELD_PHOTO])) { foreach($data[self::FIELD_PHOTO] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRAttachment) { $this->addPhoto($v); } else { @@ -363,6 +393,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_QUALIFICATION])) { if (is_array($data[self::FIELD_QUALIFICATION])) { foreach($data[self::FIELD_QUALIFICATION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRPractitionerQualification) { $this->addQualification($v); } else { @@ -381,17 +414,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_TELECOM])) { foreach($data[self::FIELD_TELECOM] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContactPoint) { $this->addTelecom($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addTelecom(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addTelecom(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addTelecom(new FHIRContactPoint(array_merge($v, $ext[$i]))); + } } else { $this->addTelecom(new FHIRContactPoint($v)); } } } elseif ($data[self::FIELD_TELECOM] instanceof FHIRContactPoint) { $this->addTelecom($data[self::FIELD_TELECOM]); - } elseif ($ext && is_scalar($data[self::FIELD_TELECOM])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_TELECOM])) { $this->addTelecom(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $data[self::FIELD_TELECOM]] + $ext)); } else { $this->addTelecom(new FHIRContactPoint($data[self::FIELD_TELECOM])); @@ -1076,10 +1116,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getActive())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ACTIVE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getAddress())) { foreach($vs as $v) { if (null === $v) { @@ -1091,7 +1131,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getBirthDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_BIRTH_DATE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getCommunication())) { foreach($vs as $v) { if (null === $v) { @@ -1100,11 +1139,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_COMMUNICATION, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getGender())) { $v->xmlSerialize($sxe->addChild(self::FIELD_GENDER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -1113,7 +1150,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getName())) { foreach($vs as $v) { if (null === $v) { @@ -1122,7 +1158,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_NAME, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getPhoto())) { foreach($vs as $v) { if (null === $v) { @@ -1131,7 +1166,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_PHOTO, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getQualification())) { foreach($vs as $v) { if (null === $v) { @@ -1140,7 +1174,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_QUALIFICATION, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getTelecom())) { foreach($vs as $v) { if (null === $v) { @@ -1159,24 +1192,62 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getActive())) { - $a[self::FIELD_ACTIVE] = $v->getValue(); - $a[self::FIELD_ACTIVE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ACTIVE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ACTIVE_EXT] = $enc; + } + } else { + $a[self::FIELD_ACTIVE] = $v; + } } if ([] !== ($vs = $this->getAddress())) { $a[self::FIELD_ADDRESS] = $vs; } if (null !== ($v = $this->getBirthDate())) { - $a[self::FIELD_BIRTH_DATE] = $v->getValue(); - $a[self::FIELD_BIRTH_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_BIRTH_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_BIRTH_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_BIRTH_DATE] = $v; + } } if ([] !== ($vs = $this->getCommunication())) { $a[self::FIELD_COMMUNICATION] = $vs; } if (null !== ($v = $this->getGender())) { - $a[self::FIELD_GENDER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_GENDER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_GENDER_EXT] = $enc; + } + } else { + $a[self::FIELD_GENDER] = $v; + } } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if ([] !== ($vs = $this->getName())) { $a[self::FIELD_NAME] = $vs; @@ -1188,7 +1259,23 @@ public function jsonSerialize() $a[self::FIELD_QUALIFICATION] = $vs; } if ([] !== ($vs = $this->getTelecom())) { - $a[self::FIELD_TELECOM] = $vs; + $a[self::FIELD_TELECOM] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TELECOM][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TELECOM_EXT][] = $enc; + } else { + $a[self::FIELD_TELECOM_EXT][] = null; + } + } else { + $a[self::FIELD_TELECOM][] = $v; + } + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRPractitionerRole.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRPractitionerRole.php index e05b75603a..3e80ecd00a 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRPractitionerRole.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRPractitionerRole.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -88,10 +88,6 @@ class FHIRPractitionerRole extends FHIRDomainResource implements PHPFHIRContaine { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_PRACTITIONER_ROLE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ACTIVE = 'active'; const FIELD_ACTIVE_EXT = '_active'; const FIELD_AVAILABILITY_EXCEPTIONS = 'availabilityExceptions'; @@ -271,6 +267,9 @@ class FHIRPractitionerRole extends FHIRDomainResource implements PHPFHIRContaine */ protected $telecom = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRPractitionerRole Constructor * @param null|array $data @@ -293,8 +292,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ACTIVE] instanceof FHIRBoolean) { $this->setActive($data[self::FIELD_ACTIVE]); - } elseif ($ext && is_scalar($data[self::FIELD_ACTIVE])) { - $this->setActive(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_ACTIVE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ACTIVE])) { + $this->setActive(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_ACTIVE]] + $ext)); + } else if (is_array($data[self::FIELD_ACTIVE])) { + $this->setActive(new FHIRBoolean(array_merge($ext, $data[self::FIELD_ACTIVE]))); + } } else { $this->setActive(new FHIRBoolean($data[self::FIELD_ACTIVE])); } @@ -305,8 +308,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_AVAILABILITY_EXCEPTIONS] instanceof FHIRString) { $this->setAvailabilityExceptions($data[self::FIELD_AVAILABILITY_EXCEPTIONS]); - } elseif ($ext && is_scalar($data[self::FIELD_AVAILABILITY_EXCEPTIONS])) { - $this->setAvailabilityExceptions(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_AVAILABILITY_EXCEPTIONS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_AVAILABILITY_EXCEPTIONS])) { + $this->setAvailabilityExceptions(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_AVAILABILITY_EXCEPTIONS]] + $ext)); + } else if (is_array($data[self::FIELD_AVAILABILITY_EXCEPTIONS])) { + $this->setAvailabilityExceptions(new FHIRString(array_merge($ext, $data[self::FIELD_AVAILABILITY_EXCEPTIONS]))); + } } else { $this->setAvailabilityExceptions(new FHIRString($data[self::FIELD_AVAILABILITY_EXCEPTIONS])); } @@ -314,6 +321,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_AVAILABLE_TIME])) { if (is_array($data[self::FIELD_AVAILABLE_TIME])) { foreach($data[self::FIELD_AVAILABLE_TIME] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRPractitionerRoleAvailableTime) { $this->addAvailableTime($v); } else { @@ -329,6 +339,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CODE])) { if (is_array($data[self::FIELD_CODE])) { foreach($data[self::FIELD_CODE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addCode($v); } else { @@ -344,6 +357,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ENDPOINT])) { if (is_array($data[self::FIELD_ENDPOINT])) { foreach($data[self::FIELD_ENDPOINT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addEndpoint($v); } else { @@ -359,6 +375,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_HEALTHCARE_SERVICE])) { if (is_array($data[self::FIELD_HEALTHCARE_SERVICE])) { foreach($data[self::FIELD_HEALTHCARE_SERVICE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addHealthcareService($v); } else { @@ -377,17 +396,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -396,6 +422,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_LOCATION])) { if (is_array($data[self::FIELD_LOCATION])) { foreach($data[self::FIELD_LOCATION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addLocation($v); } else { @@ -411,6 +440,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_NOT_AVAILABLE])) { if (is_array($data[self::FIELD_NOT_AVAILABLE])) { foreach($data[self::FIELD_NOT_AVAILABLE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRPractitionerRoleNotAvailable) { $this->addNotAvailable($v); } else { @@ -447,6 +479,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SPECIALTY])) { if (is_array($data[self::FIELD_SPECIALTY])) { foreach($data[self::FIELD_SPECIALTY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addSpecialty($v); } else { @@ -465,17 +500,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_TELECOM])) { foreach($data[self::FIELD_TELECOM] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContactPoint) { $this->addTelecom($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addTelecom(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addTelecom(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addTelecom(new FHIRContactPoint(array_merge($v, $ext[$i]))); + } } else { $this->addTelecom(new FHIRContactPoint($v)); } } } elseif ($data[self::FIELD_TELECOM] instanceof FHIRContactPoint) { $this->addTelecom($data[self::FIELD_TELECOM]); - } elseif ($ext && is_scalar($data[self::FIELD_TELECOM])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_TELECOM])) { $this->addTelecom(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $data[self::FIELD_TELECOM]] + $ext)); } else { $this->addTelecom(new FHIRContactPoint($data[self::FIELD_TELECOM])); @@ -1342,13 +1384,13 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getActive())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ACTIVE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getAvailabilityExceptions())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AVAILABILITY_EXCEPTIONS, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getAvailableTime())) { foreach($vs as $v) { if (null === $v) { @@ -1357,7 +1399,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_AVAILABLE_TIME, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getCode())) { foreach($vs as $v) { if (null === $v) { @@ -1366,7 +1407,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getEndpoint())) { foreach($vs as $v) { if (null === $v) { @@ -1375,7 +1415,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_ENDPOINT, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getHealthcareService())) { foreach($vs as $v) { if (null === $v) { @@ -1384,7 +1423,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_HEALTHCARE_SERVICE, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -1393,7 +1431,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getLocation())) { foreach($vs as $v) { if (null === $v) { @@ -1402,7 +1439,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_LOCATION, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getNotAvailable())) { foreach($vs as $v) { if (null === $v) { @@ -1411,19 +1447,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_NOT_AVAILABLE, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getOrganization())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ORGANIZATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPractitioner())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PRACTITIONER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getSpecialty())) { foreach($vs as $v) { if (null === $v) { @@ -1432,7 +1464,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_SPECIALTY, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getTelecom())) { foreach($vs as $v) { if (null === $v) { @@ -1451,12 +1482,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getActive())) { - $a[self::FIELD_ACTIVE] = $v->getValue(); - $a[self::FIELD_ACTIVE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ACTIVE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ACTIVE_EXT] = $enc; + } + } else { + $a[self::FIELD_ACTIVE] = $v; + } } if (null !== ($v = $this->getAvailabilityExceptions())) { - $a[self::FIELD_AVAILABILITY_EXCEPTIONS] = $v->getValue(); - $a[self::FIELD_AVAILABILITY_EXCEPTIONS_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_AVAILABILITY_EXCEPTIONS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_AVAILABILITY_EXCEPTIONS_EXT] = $enc; + } + } else { + $a[self::FIELD_AVAILABILITY_EXCEPTIONS] = $v; + } } if ([] !== ($vs = $this->getAvailableTime())) { $a[self::FIELD_AVAILABLE_TIME] = $vs; @@ -1471,7 +1516,23 @@ public function jsonSerialize() $a[self::FIELD_HEALTHCARE_SERVICE] = $vs; } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if ([] !== ($vs = $this->getLocation())) { $a[self::FIELD_LOCATION] = $vs; @@ -1492,7 +1553,23 @@ public function jsonSerialize() $a[self::FIELD_SPECIALTY] = $vs; } if ([] !== ($vs = $this->getTelecom())) { - $a[self::FIELD_TELECOM] = $vs; + $a[self::FIELD_TELECOM] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TELECOM][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TELECOM_EXT][] = $enc; + } else { + $a[self::FIELD_TELECOM_EXT][] = null; + } + } else { + $a[self::FIELD_TELECOM][] = $v; + } + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRProcedure.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRProcedure.php index 421881a0bc..606e816ea2 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRProcedure.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRProcedure.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -90,10 +90,6 @@ class FHIRProcedure extends FHIRDomainResource implements PHPFHIRContainedTypeIn { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_PROCEDURE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_BASED_ON = 'basedOn'; const FIELD_BODY_SITE = 'bodySite'; const FIELD_CATEGORY = 'category'; @@ -459,6 +455,9 @@ class FHIRProcedure extends FHIRDomainResource implements PHPFHIRContainedTypeIn */ protected $usedReference = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRProcedure Constructor * @param null|array $data @@ -478,6 +477,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_BASED_ON])) { if (is_array($data[self::FIELD_BASED_ON])) { foreach($data[self::FIELD_BASED_ON] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addBasedOn($v); } else { @@ -493,6 +495,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_BODY_SITE])) { if (is_array($data[self::FIELD_BODY_SITE])) { foreach($data[self::FIELD_BODY_SITE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addBodySite($v); } else { @@ -522,6 +527,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_COMPLICATION])) { if (is_array($data[self::FIELD_COMPLICATION])) { foreach($data[self::FIELD_COMPLICATION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addComplication($v); } else { @@ -537,6 +545,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_COMPLICATION_DETAIL])) { if (is_array($data[self::FIELD_COMPLICATION_DETAIL])) { foreach($data[self::FIELD_COMPLICATION_DETAIL] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addComplicationDetail($v); } else { @@ -559,6 +570,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_DEFINITION])) { if (is_array($data[self::FIELD_DEFINITION])) { foreach($data[self::FIELD_DEFINITION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addDefinition($v); } else { @@ -574,6 +588,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_FOCAL_DEVICE])) { if (is_array($data[self::FIELD_FOCAL_DEVICE])) { foreach($data[self::FIELD_FOCAL_DEVICE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRProcedureFocalDevice) { $this->addFocalDevice($v); } else { @@ -589,6 +606,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_FOLLOW_UP])) { if (is_array($data[self::FIELD_FOLLOW_UP])) { foreach($data[self::FIELD_FOLLOW_UP] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addFollowUp($v); } else { @@ -607,17 +627,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -636,8 +663,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NOT_DONE] instanceof FHIRBoolean) { $this->setNotDone($data[self::FIELD_NOT_DONE]); - } elseif ($ext && is_scalar($data[self::FIELD_NOT_DONE])) { - $this->setNotDone(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_NOT_DONE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NOT_DONE])) { + $this->setNotDone(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_NOT_DONE]] + $ext)); + } else if (is_array($data[self::FIELD_NOT_DONE])) { + $this->setNotDone(new FHIRBoolean(array_merge($ext, $data[self::FIELD_NOT_DONE]))); + } } else { $this->setNotDone(new FHIRBoolean($data[self::FIELD_NOT_DONE])); } @@ -652,6 +683,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_NOTE])) { if (is_array($data[self::FIELD_NOTE])) { foreach($data[self::FIELD_NOTE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRAnnotation) { $this->addNote($v); } else { @@ -674,6 +708,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PART_OF])) { if (is_array($data[self::FIELD_PART_OF])) { foreach($data[self::FIELD_PART_OF] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addPartOf($v); } else { @@ -692,8 +729,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PERFORMED_DATE_TIME] instanceof FHIRDateTime) { $this->setPerformedDateTime($data[self::FIELD_PERFORMED_DATE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_PERFORMED_DATE_TIME])) { - $this->setPerformedDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_PERFORMED_DATE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PERFORMED_DATE_TIME])) { + $this->setPerformedDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_PERFORMED_DATE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_PERFORMED_DATE_TIME])) { + $this->setPerformedDateTime(new FHIRDateTime(array_merge($ext, $data[self::FIELD_PERFORMED_DATE_TIME]))); + } } else { $this->setPerformedDateTime(new FHIRDateTime($data[self::FIELD_PERFORMED_DATE_TIME])); } @@ -708,6 +749,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PERFORMER])) { if (is_array($data[self::FIELD_PERFORMER])) { foreach($data[self::FIELD_PERFORMER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRProcedurePerformer) { $this->addPerformer($v); } else { @@ -723,6 +767,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REASON_CODE])) { if (is_array($data[self::FIELD_REASON_CODE])) { foreach($data[self::FIELD_REASON_CODE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addReasonCode($v); } else { @@ -738,6 +785,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REASON_REFERENCE])) { if (is_array($data[self::FIELD_REASON_REFERENCE])) { foreach($data[self::FIELD_REASON_REFERENCE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addReasonReference($v); } else { @@ -753,6 +803,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REPORT])) { if (is_array($data[self::FIELD_REPORT])) { foreach($data[self::FIELD_REPORT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addReport($v); } else { @@ -771,8 +824,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIREventStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIREventStatus([FHIREventStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIREventStatus([FHIREventStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIREventStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIREventStatus($data[self::FIELD_STATUS])); } @@ -787,6 +844,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_USED_CODE])) { if (is_array($data[self::FIELD_USED_CODE])) { foreach($data[self::FIELD_USED_CODE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addUsedCode($v); } else { @@ -802,6 +862,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_USED_REFERENCE])) { if (is_array($data[self::FIELD_USED_REFERENCE])) { foreach($data[self::FIELD_USED_REFERENCE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addUsedReference($v); } else { @@ -2387,7 +2450,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_BASED_ON, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getBodySite())) { foreach($vs as $v) { if (null === $v) { @@ -2396,15 +2458,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_BODY_SITE, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getCategory())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CATEGORY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getComplication())) { foreach($vs as $v) { if (null === $v) { @@ -2413,7 +2472,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_COMPLICATION, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getComplicationDetail())) { foreach($vs as $v) { if (null === $v) { @@ -2422,11 +2480,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_COMPLICATION_DETAIL, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getContext())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CONTEXT, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getDefinition())) { foreach($vs as $v) { if (null === $v) { @@ -2435,7 +2491,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_DEFINITION, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getFocalDevice())) { foreach($vs as $v) { if (null === $v) { @@ -2444,7 +2499,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_FOCAL_DEVICE, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getFollowUp())) { foreach($vs as $v) { if (null === $v) { @@ -2453,7 +2507,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_FOLLOW_UP, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -2462,18 +2515,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getLocation())) { $v->xmlSerialize($sxe->addChild(self::FIELD_LOCATION, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getNotDone())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NOT_DONE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getNotDoneReason())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NOT_DONE_REASON, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getNote())) { foreach($vs as $v) { if (null === $v) { @@ -2482,11 +2532,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_NOTE, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getOutcome())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OUTCOME, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getPartOf())) { foreach($vs as $v) { if (null === $v) { @@ -2498,11 +2546,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getPerformedDateTime())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PERFORMED_DATE_TIME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPerformedPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PERFORMED_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getPerformer())) { foreach($vs as $v) { if (null === $v) { @@ -2511,7 +2557,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_PERFORMER, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getReasonCode())) { foreach($vs as $v) { if (null === $v) { @@ -2520,7 +2565,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_REASON_CODE, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getReasonReference())) { foreach($vs as $v) { if (null === $v) { @@ -2529,7 +2573,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_REASON_REFERENCE, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getReport())) { foreach($vs as $v) { if (null === $v) { @@ -2538,15 +2581,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_REPORT, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSubject())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBJECT, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getUsedCode())) { foreach($vs as $v) { if (null === $v) { @@ -2555,7 +2595,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_USED_CODE, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getUsedReference())) { foreach($vs as $v) { if (null === $v) { @@ -2604,14 +2643,37 @@ public function jsonSerialize() $a[self::FIELD_FOLLOW_UP] = $vs; } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if (null !== ($v = $this->getLocation())) { $a[self::FIELD_LOCATION] = $v; } if (null !== ($v = $this->getNotDone())) { - $a[self::FIELD_NOT_DONE] = $v->getValue(); - $a[self::FIELD_NOT_DONE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NOT_DONE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NOT_DONE_EXT] = $enc; + } + } else { + $a[self::FIELD_NOT_DONE] = $v; + } } if (null !== ($v = $this->getNotDoneReason())) { $a[self::FIELD_NOT_DONE_REASON] = $v; @@ -2626,8 +2688,15 @@ public function jsonSerialize() $a[self::FIELD_PART_OF] = $vs; } if (null !== ($v = $this->getPerformedDateTime())) { - $a[self::FIELD_PERFORMED_DATE_TIME] = $v->getValue(); - $a[self::FIELD_PERFORMED_DATE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PERFORMED_DATE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PERFORMED_DATE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_PERFORMED_DATE_TIME] = $v; + } } if (null !== ($v = $this->getPerformedPeriod())) { $a[self::FIELD_PERFORMED_PERIOD] = $v; @@ -2645,7 +2714,15 @@ public function jsonSerialize() $a[self::FIELD_REPORT] = $vs; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getSubject())) { $a[self::FIELD_SUBJECT] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRProcedureRequest.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRProcedureRequest.php index 3f279e1590..b02857ff29 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRProcedureRequest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRProcedureRequest.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -91,10 +91,6 @@ class FHIRProcedureRequest extends FHIRDomainResource implements PHPFHIRContaine { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_PROCEDURE_REQUEST; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_AS_NEEDED_BOOLEAN = 'asNeededBoolean'; const FIELD_AS_NEEDED_BOOLEAN_EXT = '_asNeededBoolean'; const FIELD_AS_NEEDED_CODEABLE_CONCEPT = 'asNeededCodeableConcept'; @@ -493,6 +489,9 @@ class FHIRProcedureRequest extends FHIRDomainResource implements PHPFHIRContaine */ protected $supportingInfo = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRProcedureRequest Constructor * @param null|array $data @@ -515,8 +514,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_AS_NEEDED_BOOLEAN] instanceof FHIRBoolean) { $this->setAsNeededBoolean($data[self::FIELD_AS_NEEDED_BOOLEAN]); - } elseif ($ext && is_scalar($data[self::FIELD_AS_NEEDED_BOOLEAN])) { - $this->setAsNeededBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_AS_NEEDED_BOOLEAN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_AS_NEEDED_BOOLEAN])) { + $this->setAsNeededBoolean(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_AS_NEEDED_BOOLEAN]] + $ext)); + } else if (is_array($data[self::FIELD_AS_NEEDED_BOOLEAN])) { + $this->setAsNeededBoolean(new FHIRBoolean(array_merge($ext, $data[self::FIELD_AS_NEEDED_BOOLEAN]))); + } } else { $this->setAsNeededBoolean(new FHIRBoolean($data[self::FIELD_AS_NEEDED_BOOLEAN])); } @@ -534,8 +537,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_AUTHORED_ON] instanceof FHIRDateTime) { $this->setAuthoredOn($data[self::FIELD_AUTHORED_ON]); - } elseif ($ext && is_scalar($data[self::FIELD_AUTHORED_ON])) { - $this->setAuthoredOn(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_AUTHORED_ON]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_AUTHORED_ON])) { + $this->setAuthoredOn(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_AUTHORED_ON]] + $ext)); + } else if (is_array($data[self::FIELD_AUTHORED_ON])) { + $this->setAuthoredOn(new FHIRDateTime(array_merge($ext, $data[self::FIELD_AUTHORED_ON]))); + } } else { $this->setAuthoredOn(new FHIRDateTime($data[self::FIELD_AUTHORED_ON])); } @@ -543,6 +550,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_BASED_ON])) { if (is_array($data[self::FIELD_BASED_ON])) { foreach($data[self::FIELD_BASED_ON] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addBasedOn($v); } else { @@ -558,6 +568,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_BODY_SITE])) { if (is_array($data[self::FIELD_BODY_SITE])) { foreach($data[self::FIELD_BODY_SITE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addBodySite($v); } else { @@ -573,6 +586,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CATEGORY])) { if (is_array($data[self::FIELD_CATEGORY])) { foreach($data[self::FIELD_CATEGORY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addCategory($v); } else { @@ -602,6 +618,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_DEFINITION])) { if (is_array($data[self::FIELD_DEFINITION])) { foreach($data[self::FIELD_DEFINITION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addDefinition($v); } else { @@ -620,8 +639,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DO_NOT_PERFORM] instanceof FHIRBoolean) { $this->setDoNotPerform($data[self::FIELD_DO_NOT_PERFORM]); - } elseif ($ext && is_scalar($data[self::FIELD_DO_NOT_PERFORM])) { - $this->setDoNotPerform(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_DO_NOT_PERFORM]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DO_NOT_PERFORM])) { + $this->setDoNotPerform(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_DO_NOT_PERFORM]] + $ext)); + } else if (is_array($data[self::FIELD_DO_NOT_PERFORM])) { + $this->setDoNotPerform(new FHIRBoolean(array_merge($ext, $data[self::FIELD_DO_NOT_PERFORM]))); + } } else { $this->setDoNotPerform(new FHIRBoolean($data[self::FIELD_DO_NOT_PERFORM])); } @@ -632,17 +655,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -654,8 +684,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_INTENT] instanceof FHIRRequestIntent) { $this->setIntent($data[self::FIELD_INTENT]); - } elseif ($ext && is_scalar($data[self::FIELD_INTENT])) { - $this->setIntent(new FHIRRequestIntent([FHIRRequestIntent::FIELD_VALUE => $data[self::FIELD_INTENT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_INTENT])) { + $this->setIntent(new FHIRRequestIntent([FHIRRequestIntent::FIELD_VALUE => $data[self::FIELD_INTENT]] + $ext)); + } else if (is_array($data[self::FIELD_INTENT])) { + $this->setIntent(new FHIRRequestIntent(array_merge($ext, $data[self::FIELD_INTENT]))); + } } else { $this->setIntent(new FHIRRequestIntent($data[self::FIELD_INTENT])); } @@ -663,6 +697,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_NOTE])) { if (is_array($data[self::FIELD_NOTE])) { foreach($data[self::FIELD_NOTE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRAnnotation) { $this->addNote($v); } else { @@ -681,8 +718,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_OCCURRENCE_DATE_TIME] instanceof FHIRDateTime) { $this->setOccurrenceDateTime($data[self::FIELD_OCCURRENCE_DATE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_OCCURRENCE_DATE_TIME])) { - $this->setOccurrenceDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_OCCURRENCE_DATE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_OCCURRENCE_DATE_TIME])) { + $this->setOccurrenceDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_OCCURRENCE_DATE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_OCCURRENCE_DATE_TIME])) { + $this->setOccurrenceDateTime(new FHIRDateTime(array_merge($ext, $data[self::FIELD_OCCURRENCE_DATE_TIME]))); + } } else { $this->setOccurrenceDateTime(new FHIRDateTime($data[self::FIELD_OCCURRENCE_DATE_TIME])); } @@ -721,8 +762,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PRIORITY] instanceof FHIRRequestPriority) { $this->setPriority($data[self::FIELD_PRIORITY]); - } elseif ($ext && is_scalar($data[self::FIELD_PRIORITY])) { - $this->setPriority(new FHIRRequestPriority([FHIRRequestPriority::FIELD_VALUE => $data[self::FIELD_PRIORITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PRIORITY])) { + $this->setPriority(new FHIRRequestPriority([FHIRRequestPriority::FIELD_VALUE => $data[self::FIELD_PRIORITY]] + $ext)); + } else if (is_array($data[self::FIELD_PRIORITY])) { + $this->setPriority(new FHIRRequestPriority(array_merge($ext, $data[self::FIELD_PRIORITY]))); + } } else { $this->setPriority(new FHIRRequestPriority($data[self::FIELD_PRIORITY])); } @@ -730,6 +775,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REASON_CODE])) { if (is_array($data[self::FIELD_REASON_CODE])) { foreach($data[self::FIELD_REASON_CODE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addReasonCode($v); } else { @@ -745,6 +793,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REASON_REFERENCE])) { if (is_array($data[self::FIELD_REASON_REFERENCE])) { foreach($data[self::FIELD_REASON_REFERENCE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addReasonReference($v); } else { @@ -760,6 +811,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_RELEVANT_HISTORY])) { if (is_array($data[self::FIELD_RELEVANT_HISTORY])) { foreach($data[self::FIELD_RELEVANT_HISTORY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addRelevantHistory($v); } else { @@ -775,6 +829,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REPLACES])) { if (is_array($data[self::FIELD_REPLACES])) { foreach($data[self::FIELD_REPLACES] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addReplaces($v); } else { @@ -800,8 +857,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_REQUISITION] instanceof FHIRIdentifier) { $this->setRequisition($data[self::FIELD_REQUISITION]); - } elseif ($ext && is_scalar($data[self::FIELD_REQUISITION])) { - $this->setRequisition(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_REQUISITION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_REQUISITION])) { + $this->setRequisition(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_REQUISITION]] + $ext)); + } else if (is_array($data[self::FIELD_REQUISITION])) { + $this->setRequisition(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_REQUISITION]))); + } } else { $this->setRequisition(new FHIRIdentifier($data[self::FIELD_REQUISITION])); } @@ -809,6 +870,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SPECIMEN])) { if (is_array($data[self::FIELD_SPECIMEN])) { foreach($data[self::FIELD_SPECIMEN] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addSpecimen($v); } else { @@ -827,8 +891,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRRequestStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRRequestStatus([FHIRRequestStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRRequestStatus([FHIRRequestStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRRequestStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRRequestStatus($data[self::FIELD_STATUS])); } @@ -843,6 +911,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SUPPORTING_INFO])) { if (is_array($data[self::FIELD_SUPPORTING_INFO])) { foreach($data[self::FIELD_SUPPORTING_INFO] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addSupportingInfo($v); } else { @@ -2401,17 +2472,16 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getAsNeededBoolean())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AS_NEEDED_BOOLEAN, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getAsNeededCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AS_NEEDED_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getAuthoredOn())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AUTHORED_ON, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getBasedOn())) { foreach($vs as $v) { if (null === $v) { @@ -2420,7 +2490,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_BASED_ON, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getBodySite())) { foreach($vs as $v) { if (null === $v) { @@ -2429,7 +2498,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_BODY_SITE, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getCategory())) { foreach($vs as $v) { if (null === $v) { @@ -2438,15 +2506,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_CATEGORY, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getContext())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CONTEXT, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getDefinition())) { foreach($vs as $v) { if (null === $v) { @@ -2458,7 +2523,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDoNotPerform())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DO_NOT_PERFORM, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -2467,11 +2531,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getIntent())) { $v->xmlSerialize($sxe->addChild(self::FIELD_INTENT, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getNote())) { foreach($vs as $v) { if (null === $v) { @@ -2483,27 +2545,21 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getOccurrenceDateTime())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OCCURRENCE_DATE_TIME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOccurrencePeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OCCURRENCE_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOccurrenceTiming())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OCCURRENCE_TIMING, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPerformer())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PERFORMER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPerformerType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PERFORMER_TYPE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPriority())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PRIORITY, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getReasonCode())) { foreach($vs as $v) { if (null === $v) { @@ -2512,7 +2568,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_REASON_CODE, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getReasonReference())) { foreach($vs as $v) { if (null === $v) { @@ -2521,7 +2576,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_REASON_REFERENCE, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getRelevantHistory())) { foreach($vs as $v) { if (null === $v) { @@ -2530,7 +2584,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_RELEVANT_HISTORY, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getReplaces())) { foreach($vs as $v) { if (null === $v) { @@ -2539,15 +2592,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_REPLACES, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getRequester())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REQUESTER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRequisition())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REQUISITION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getSpecimen())) { foreach($vs as $v) { if (null === $v) { @@ -2556,15 +2606,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_SPECIMEN, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSubject())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBJECT, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getSupportingInfo())) { foreach($vs as $v) { if (null === $v) { @@ -2583,15 +2630,29 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getAsNeededBoolean())) { - $a[self::FIELD_AS_NEEDED_BOOLEAN] = $v->getValue(); - $a[self::FIELD_AS_NEEDED_BOOLEAN_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_AS_NEEDED_BOOLEAN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_AS_NEEDED_BOOLEAN_EXT] = $enc; + } + } else { + $a[self::FIELD_AS_NEEDED_BOOLEAN] = $v; + } } if (null !== ($v = $this->getAsNeededCodeableConcept())) { $a[self::FIELD_AS_NEEDED_CODEABLE_CONCEPT] = $v; } if (null !== ($v = $this->getAuthoredOn())) { - $a[self::FIELD_AUTHORED_ON] = $v->getValue(); - $a[self::FIELD_AUTHORED_ON_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_AUTHORED_ON] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_AUTHORED_ON_EXT] = $enc; + } + } else { + $a[self::FIELD_AUTHORED_ON] = $v; + } } if ([] !== ($vs = $this->getBasedOn())) { $a[self::FIELD_BASED_ON] = $vs; @@ -2612,21 +2673,59 @@ public function jsonSerialize() $a[self::FIELD_DEFINITION] = $vs; } if (null !== ($v = $this->getDoNotPerform())) { - $a[self::FIELD_DO_NOT_PERFORM] = $v->getValue(); - $a[self::FIELD_DO_NOT_PERFORM_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DO_NOT_PERFORM] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DO_NOT_PERFORM_EXT] = $enc; + } + } else { + $a[self::FIELD_DO_NOT_PERFORM] = $v; + } } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if (null !== ($v = $this->getIntent())) { - $a[self::FIELD_INTENT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_INTENT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_INTENT_EXT] = $enc; + } + } else { + $a[self::FIELD_INTENT] = $v; + } } if ([] !== ($vs = $this->getNote())) { $a[self::FIELD_NOTE] = $vs; } if (null !== ($v = $this->getOccurrenceDateTime())) { - $a[self::FIELD_OCCURRENCE_DATE_TIME] = $v->getValue(); - $a[self::FIELD_OCCURRENCE_DATE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_OCCURRENCE_DATE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_OCCURRENCE_DATE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_OCCURRENCE_DATE_TIME] = $v; + } } if (null !== ($v = $this->getOccurrencePeriod())) { $a[self::FIELD_OCCURRENCE_PERIOD] = $v; @@ -2641,7 +2740,15 @@ public function jsonSerialize() $a[self::FIELD_PERFORMER_TYPE] = $v; } if (null !== ($v = $this->getPriority())) { - $a[self::FIELD_PRIORITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PRIORITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PRIORITY_EXT] = $enc; + } + } else { + $a[self::FIELD_PRIORITY] = $v; + } } if ([] !== ($vs = $this->getReasonCode())) { $a[self::FIELD_REASON_CODE] = $vs; @@ -2659,13 +2766,29 @@ public function jsonSerialize() $a[self::FIELD_REQUESTER] = $v; } if (null !== ($v = $this->getRequisition())) { - $a[self::FIELD_REQUISITION] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_REQUISITION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_REQUISITION_EXT] = $enc; + } + } else { + $a[self::FIELD_REQUISITION] = $v; + } } if ([] !== ($vs = $this->getSpecimen())) { $a[self::FIELD_SPECIMEN] = $vs; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getSubject())) { $a[self::FIELD_SUBJECT] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRProcessRequest.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRProcessRequest.php index a865159cd9..c5b2a7b299 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRProcessRequest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRProcessRequest.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -88,10 +88,6 @@ class FHIRProcessRequest extends FHIRDomainResource implements PHPFHIRContainedT { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_PROCESS_REQUEST; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ACTION = 'action'; const FIELD_ACTION_EXT = '_action'; const FIELD_CREATED = 'created'; @@ -283,6 +279,9 @@ class FHIRProcessRequest extends FHIRDomainResource implements PHPFHIRContainedT */ protected $target = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRProcessRequest Constructor * @param null|array $data @@ -305,8 +304,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ACTION] instanceof FHIRActionList) { $this->setAction($data[self::FIELD_ACTION]); - } elseif ($ext && is_scalar($data[self::FIELD_ACTION])) { - $this->setAction(new FHIRActionList([FHIRActionList::FIELD_VALUE => $data[self::FIELD_ACTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ACTION])) { + $this->setAction(new FHIRActionList([FHIRActionList::FIELD_VALUE => $data[self::FIELD_ACTION]] + $ext)); + } else if (is_array($data[self::FIELD_ACTION])) { + $this->setAction(new FHIRActionList(array_merge($ext, $data[self::FIELD_ACTION]))); + } } else { $this->setAction(new FHIRActionList($data[self::FIELD_ACTION])); } @@ -317,8 +320,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CREATED] instanceof FHIRDateTime) { $this->setCreated($data[self::FIELD_CREATED]); - } elseif ($ext && is_scalar($data[self::FIELD_CREATED])) { - $this->setCreated(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_CREATED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CREATED])) { + $this->setCreated(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_CREATED]] + $ext)); + } else if (is_array($data[self::FIELD_CREATED])) { + $this->setCreated(new FHIRDateTime(array_merge($ext, $data[self::FIELD_CREATED]))); + } } else { $this->setCreated(new FHIRDateTime($data[self::FIELD_CREATED])); } @@ -329,17 +336,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_EXCLUDE])) { foreach($data[self::FIELD_EXCLUDE] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRString) { $this->addExclude($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addExclude(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addExclude(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addExclude(new FHIRString(array_merge($v, $ext[$i]))); + } } else { $this->addExclude(new FHIRString($v)); } } } elseif ($data[self::FIELD_EXCLUDE] instanceof FHIRString) { $this->addExclude($data[self::FIELD_EXCLUDE]); - } elseif ($ext && is_scalar($data[self::FIELD_EXCLUDE])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_EXCLUDE])) { $this->addExclude(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_EXCLUDE]] + $ext)); } else { $this->addExclude(new FHIRString($data[self::FIELD_EXCLUDE])); @@ -351,17 +365,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -373,17 +394,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_INCLUDE])) { foreach($data[self::FIELD_INCLUDE] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRString) { $this->addInclude($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addInclude(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addInclude(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addInclude(new FHIRString(array_merge($v, $ext[$i]))); + } } else { $this->addInclude(new FHIRString($v)); } } } elseif ($data[self::FIELD_INCLUDE] instanceof FHIRString) { $this->addInclude($data[self::FIELD_INCLUDE]); - } elseif ($ext && is_scalar($data[self::FIELD_INCLUDE])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_INCLUDE])) { $this->addInclude(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_INCLUDE]] + $ext)); } else { $this->addInclude(new FHIRString($data[self::FIELD_INCLUDE])); @@ -392,6 +420,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ITEM])) { if (is_array($data[self::FIELD_ITEM])) { foreach($data[self::FIELD_ITEM] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRProcessRequestItem) { $this->addItem($v); } else { @@ -410,8 +441,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NULLIFY] instanceof FHIRBoolean) { $this->setNullify($data[self::FIELD_NULLIFY]); - } elseif ($ext && is_scalar($data[self::FIELD_NULLIFY])) { - $this->setNullify(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_NULLIFY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NULLIFY])) { + $this->setNullify(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_NULLIFY]] + $ext)); + } else if (is_array($data[self::FIELD_NULLIFY])) { + $this->setNullify(new FHIRBoolean(array_merge($ext, $data[self::FIELD_NULLIFY]))); + } } else { $this->setNullify(new FHIRBoolean($data[self::FIELD_NULLIFY])); } @@ -443,8 +478,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_REFERENCE] instanceof FHIRString) { $this->setReference($data[self::FIELD_REFERENCE]); - } elseif ($ext && is_scalar($data[self::FIELD_REFERENCE])) { - $this->setReference(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_REFERENCE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_REFERENCE])) { + $this->setReference(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_REFERENCE]] + $ext)); + } else if (is_array($data[self::FIELD_REFERENCE])) { + $this->setReference(new FHIRString(array_merge($ext, $data[self::FIELD_REFERENCE]))); + } } else { $this->setReference(new FHIRString($data[self::FIELD_REFERENCE])); } @@ -469,8 +508,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRFinancialResourceStatusCodes) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRFinancialResourceStatusCodes([FHIRFinancialResourceStatusCodes::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRFinancialResourceStatusCodes([FHIRFinancialResourceStatusCodes::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRFinancialResourceStatusCodes(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRFinancialResourceStatusCodes($data[self::FIELD_STATUS])); } @@ -1272,7 +1315,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_EXCLUDE, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -1289,7 +1331,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_INCLUDE, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getItem())) { foreach($vs as $v) { if (null === $v) { @@ -1301,34 +1342,27 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getNullify())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NULLIFY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOrganization())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ORGANIZATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getProvider())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PROVIDER, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REFERENCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRequest())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REQUEST, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getResponse())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RESPONSE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getTarget())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TARGET, null, $v->_getFHIRXMLNamespace())); } @@ -1342,11 +1376,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getAction())) { - $a[self::FIELD_ACTION] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ACTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ACTION_EXT] = $enc; + } + } else { + $a[self::FIELD_ACTION] = $v; + } } if (null !== ($v = $this->getCreated())) { - $a[self::FIELD_CREATED] = $v->getValue(); - $a[self::FIELD_CREATED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CREATED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CREATED_EXT] = $enc; + } + } else { + $a[self::FIELD_CREATED] = $v; + } } if ([] !== ($vs = $this->getExclude())) { $a[self::FIELD_EXCLUDE] = []; @@ -1354,12 +1403,37 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_EXCLUDE][] = $v->getValue(); - $a[self::FIELD_EXCLUDE_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EXCLUDE][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EXCLUDE_EXT][] = $enc; + } else { + $a[self::FIELD_EXCLUDE_EXT][] = null; + } + } else { + $a[self::FIELD_EXCLUDE][] = $v; + } } } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if ([] !== ($vs = $this->getInclude())) { $a[self::FIELD_INCLUDE] = []; @@ -1367,16 +1441,32 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_INCLUDE][] = $v->getValue(); - $a[self::FIELD_INCLUDE_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_INCLUDE][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_INCLUDE_EXT][] = $enc; + } else { + $a[self::FIELD_INCLUDE_EXT][] = null; + } + } else { + $a[self::FIELD_INCLUDE][] = $v; + } } } if ([] !== ($vs = $this->getItem())) { $a[self::FIELD_ITEM] = $vs; } if (null !== ($v = $this->getNullify())) { - $a[self::FIELD_NULLIFY] = $v->getValue(); - $a[self::FIELD_NULLIFY_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NULLIFY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NULLIFY_EXT] = $enc; + } + } else { + $a[self::FIELD_NULLIFY] = $v; + } } if (null !== ($v = $this->getOrganization())) { $a[self::FIELD_ORGANIZATION] = $v; @@ -1388,8 +1478,15 @@ public function jsonSerialize() $a[self::FIELD_PROVIDER] = $v; } if (null !== ($v = $this->getReference())) { - $a[self::FIELD_REFERENCE] = $v->getValue(); - $a[self::FIELD_REFERENCE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_REFERENCE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_REFERENCE_EXT] = $enc; + } + } else { + $a[self::FIELD_REFERENCE] = $v; + } } if (null !== ($v = $this->getRequest())) { $a[self::FIELD_REQUEST] = $v; @@ -1398,7 +1495,15 @@ public function jsonSerialize() $a[self::FIELD_RESPONSE] = $v; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getTarget())) { $a[self::FIELD_TARGET] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRProcessResponse.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRProcessResponse.php index f849cc5836..206d6bab64 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRProcessResponse.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRProcessResponse.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -86,10 +86,6 @@ class FHIRProcessResponse extends FHIRDomainResource implements PHPFHIRContained { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_PROCESS_RESPONSE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_COMMUNICATION_REQUEST = 'communicationRequest'; const FIELD_CREATED = 'created'; const FIELD_CREATED_EXT = '_created'; @@ -257,6 +253,9 @@ class FHIRProcessResponse extends FHIRDomainResource implements PHPFHIRContained */ protected $status = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRProcessResponse Constructor * @param null|array $data @@ -276,6 +275,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_COMMUNICATION_REQUEST])) { if (is_array($data[self::FIELD_COMMUNICATION_REQUEST])) { foreach($data[self::FIELD_COMMUNICATION_REQUEST] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addCommunicationRequest($v); } else { @@ -294,8 +296,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CREATED] instanceof FHIRDateTime) { $this->setCreated($data[self::FIELD_CREATED]); - } elseif ($ext && is_scalar($data[self::FIELD_CREATED])) { - $this->setCreated(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_CREATED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CREATED])) { + $this->setCreated(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_CREATED]] + $ext)); + } else if (is_array($data[self::FIELD_CREATED])) { + $this->setCreated(new FHIRDateTime(array_merge($ext, $data[self::FIELD_CREATED]))); + } } else { $this->setCreated(new FHIRDateTime($data[self::FIELD_CREATED])); } @@ -306,8 +312,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DISPOSITION] instanceof FHIRString) { $this->setDisposition($data[self::FIELD_DISPOSITION]); - } elseif ($ext && is_scalar($data[self::FIELD_DISPOSITION])) { - $this->setDisposition(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DISPOSITION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DISPOSITION])) { + $this->setDisposition(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DISPOSITION]] + $ext)); + } else if (is_array($data[self::FIELD_DISPOSITION])) { + $this->setDisposition(new FHIRString(array_merge($ext, $data[self::FIELD_DISPOSITION]))); + } } else { $this->setDisposition(new FHIRString($data[self::FIELD_DISPOSITION])); } @@ -315,6 +325,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ERROR])) { if (is_array($data[self::FIELD_ERROR])) { foreach($data[self::FIELD_ERROR] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addError($v); } else { @@ -340,17 +353,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -373,6 +393,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PROCESS_NOTE])) { if (is_array($data[self::FIELD_PROCESS_NOTE])) { foreach($data[self::FIELD_PROCESS_NOTE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRProcessResponseProcessNote) { $this->addProcessNote($v); } else { @@ -412,8 +435,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRFinancialResourceStatusCodes) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRFinancialResourceStatusCodes([FHIRFinancialResourceStatusCodes::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRFinancialResourceStatusCodes([FHIRFinancialResourceStatusCodes::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRFinancialResourceStatusCodes(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRFinancialResourceStatusCodes($data[self::FIELD_STATUS])); } @@ -1119,7 +1146,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDisposition())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DISPOSITION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getError())) { foreach($vs as $v) { if (null === $v) { @@ -1128,11 +1154,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_ERROR, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getForm())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FORM, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -1141,15 +1165,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getOrganization())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ORGANIZATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOutcome())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OUTCOME, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getProcessNote())) { foreach($vs as $v) { if (null === $v) { @@ -1158,19 +1179,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_PROCESS_NOTE, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getRequest())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REQUEST, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRequestOrganization())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REQUEST_ORGANIZATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRequestProvider())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REQUEST_PROVIDER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } @@ -1187,12 +1204,26 @@ public function jsonSerialize() $a[self::FIELD_COMMUNICATION_REQUEST] = $vs; } if (null !== ($v = $this->getCreated())) { - $a[self::FIELD_CREATED] = $v->getValue(); - $a[self::FIELD_CREATED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CREATED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CREATED_EXT] = $enc; + } + } else { + $a[self::FIELD_CREATED] = $v; + } } if (null !== ($v = $this->getDisposition())) { - $a[self::FIELD_DISPOSITION] = $v->getValue(); - $a[self::FIELD_DISPOSITION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DISPOSITION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DISPOSITION_EXT] = $enc; + } + } else { + $a[self::FIELD_DISPOSITION] = $v; + } } if ([] !== ($vs = $this->getError())) { $a[self::FIELD_ERROR] = $vs; @@ -1201,7 +1232,23 @@ public function jsonSerialize() $a[self::FIELD_FORM] = $v; } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if (null !== ($v = $this->getOrganization())) { $a[self::FIELD_ORGANIZATION] = $v; @@ -1222,7 +1269,15 @@ public function jsonSerialize() $a[self::FIELD_REQUEST_PROVIDER] = $v; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRProvenance.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRProvenance.php index 02f29441ae..0a41c54941 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRProvenance.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRProvenance.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -94,10 +94,6 @@ class FHIRProvenance extends FHIRDomainResource implements PHPFHIRContainedTypeI { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_PROVENANCE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ACTIVITY = 'activity'; const FIELD_AGENT = 'agent'; const FIELD_ENTITY = 'entity'; @@ -246,6 +242,9 @@ class FHIRProvenance extends FHIRDomainResource implements PHPFHIRContainedTypeI */ protected $target = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRProvenance Constructor * @param null|array $data @@ -272,6 +271,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_AGENT])) { if (is_array($data[self::FIELD_AGENT])) { foreach($data[self::FIELD_AGENT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRProvenanceAgent) { $this->addAgent($v); } else { @@ -287,6 +289,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ENTITY])) { if (is_array($data[self::FIELD_ENTITY])) { foreach($data[self::FIELD_ENTITY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRProvenanceEntity) { $this->addEntity($v); } else { @@ -319,17 +324,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_POLICY])) { foreach($data[self::FIELD_POLICY] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRUri) { $this->addPolicy($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addPolicy(new FHIRUri([FHIRUri::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addPolicy(new FHIRUri([FHIRUri::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addPolicy(new FHIRUri(array_merge($v, $ext[$i]))); + } } else { $this->addPolicy(new FHIRUri($v)); } } } elseif ($data[self::FIELD_POLICY] instanceof FHIRUri) { $this->addPolicy($data[self::FIELD_POLICY]); - } elseif ($ext && is_scalar($data[self::FIELD_POLICY])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_POLICY])) { $this->addPolicy(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_POLICY]] + $ext)); } else { $this->addPolicy(new FHIRUri($data[self::FIELD_POLICY])); @@ -338,6 +350,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REASON])) { if (is_array($data[self::FIELD_REASON])) { foreach($data[self::FIELD_REASON] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCoding) { $this->addReason($v); } else { @@ -356,8 +371,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_RECORDED] instanceof FHIRInstant) { $this->setRecorded($data[self::FIELD_RECORDED]); - } elseif ($ext && is_scalar($data[self::FIELD_RECORDED])) { - $this->setRecorded(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_RECORDED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_RECORDED])) { + $this->setRecorded(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_RECORDED]] + $ext)); + } else if (is_array($data[self::FIELD_RECORDED])) { + $this->setRecorded(new FHIRInstant(array_merge($ext, $data[self::FIELD_RECORDED]))); + } } else { $this->setRecorded(new FHIRInstant($data[self::FIELD_RECORDED])); } @@ -365,6 +384,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SIGNATURE])) { if (is_array($data[self::FIELD_SIGNATURE])) { foreach($data[self::FIELD_SIGNATURE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRSignature) { $this->addSignature($v); } else { @@ -380,6 +402,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_TARGET])) { if (is_array($data[self::FIELD_TARGET])) { foreach($data[self::FIELD_TARGET] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addTarget($v); } else { @@ -1096,7 +1121,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getActivity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ACTIVITY, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getAgent())) { foreach($vs as $v) { if (null === $v) { @@ -1105,7 +1129,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_AGENT, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getEntity())) { foreach($vs as $v) { if (null === $v) { @@ -1114,11 +1137,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_ENTITY, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getLocation())) { $v->xmlSerialize($sxe->addChild(self::FIELD_LOCATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PERIOD, null, $v->_getFHIRXMLNamespace())); } @@ -1130,7 +1151,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_POLICY, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getReason())) { foreach($vs as $v) { if (null === $v) { @@ -1142,7 +1162,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getRecorded())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RECORDED, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getSignature())) { foreach($vs as $v) { if (null === $v) { @@ -1151,7 +1170,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_SIGNATURE, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getTarget())) { foreach($vs as $v) { if (null === $v) { @@ -1190,16 +1208,32 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_POLICY][] = $v->getValue(); - $a[self::FIELD_POLICY_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_POLICY][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_POLICY_EXT][] = $enc; + } else { + $a[self::FIELD_POLICY_EXT][] = null; + } + } else { + $a[self::FIELD_POLICY][] = $v; + } } } if ([] !== ($vs = $this->getReason())) { $a[self::FIELD_REASON] = $vs; } if (null !== ($v = $this->getRecorded())) { - $a[self::FIELD_RECORDED] = $v->getValue(); - $a[self::FIELD_RECORDED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_RECORDED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_RECORDED_EXT] = $enc; + } + } else { + $a[self::FIELD_RECORDED] = $v; + } } if ([] !== ($vs = $this->getSignature())) { $a[self::FIELD_SIGNATURE] = $vs; diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRQuestionnaire.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRQuestionnaire.php index 2055edc5ab..e9092e52a7 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRQuestionnaire.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRQuestionnaire.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -95,10 +95,6 @@ class FHIRQuestionnaire extends FHIRDomainResource implements PHPFHIRContainedTy { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_QUESTIONNAIRE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_APPROVAL_DATE = 'approvalDate'; const FIELD_APPROVAL_DATE_EXT = '_approvalDate'; const FIELD_CODE = 'code'; @@ -422,6 +418,9 @@ class FHIRQuestionnaire extends FHIRDomainResource implements PHPFHIRContainedTy */ protected $version = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRQuestionnaire Constructor * @param null|array $data @@ -444,8 +443,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_APPROVAL_DATE] instanceof FHIRDate) { $this->setApprovalDate($data[self::FIELD_APPROVAL_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_APPROVAL_DATE])) { - $this->setApprovalDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_APPROVAL_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_APPROVAL_DATE])) { + $this->setApprovalDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_APPROVAL_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_APPROVAL_DATE])) { + $this->setApprovalDate(new FHIRDate(array_merge($ext, $data[self::FIELD_APPROVAL_DATE]))); + } } else { $this->setApprovalDate(new FHIRDate($data[self::FIELD_APPROVAL_DATE])); } @@ -453,6 +456,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CODE])) { if (is_array($data[self::FIELD_CODE])) { foreach($data[self::FIELD_CODE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCoding) { $this->addCode($v); } else { @@ -468,6 +474,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CONTACT])) { if (is_array($data[self::FIELD_CONTACT])) { foreach($data[self::FIELD_CONTACT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContactDetail) { $this->addContact($v); } else { @@ -486,8 +495,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_COPYRIGHT] instanceof FHIRMarkdown) { $this->setCopyright($data[self::FIELD_COPYRIGHT]); - } elseif ($ext && is_scalar($data[self::FIELD_COPYRIGHT])) { - $this->setCopyright(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_COPYRIGHT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_COPYRIGHT])) { + $this->setCopyright(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_COPYRIGHT]] + $ext)); + } else if (is_array($data[self::FIELD_COPYRIGHT])) { + $this->setCopyright(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_COPYRIGHT]))); + } } else { $this->setCopyright(new FHIRMarkdown($data[self::FIELD_COPYRIGHT])); } @@ -498,8 +511,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATE] instanceof FHIRDateTime) { $this->setDate($data[self::FIELD_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_DATE])) { - $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime(array_merge($ext, $data[self::FIELD_DATE]))); + } } else { $this->setDate(new FHIRDateTime($data[self::FIELD_DATE])); } @@ -510,8 +527,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRMarkdown) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRMarkdown($data[self::FIELD_DESCRIPTION])); } @@ -529,8 +550,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EXPERIMENTAL] instanceof FHIRBoolean) { $this->setExperimental($data[self::FIELD_EXPERIMENTAL]); - } elseif ($ext && is_scalar($data[self::FIELD_EXPERIMENTAL])) { - $this->setExperimental(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_EXPERIMENTAL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EXPERIMENTAL])) { + $this->setExperimental(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_EXPERIMENTAL]] + $ext)); + } else if (is_array($data[self::FIELD_EXPERIMENTAL])) { + $this->setExperimental(new FHIRBoolean(array_merge($ext, $data[self::FIELD_EXPERIMENTAL]))); + } } else { $this->setExperimental(new FHIRBoolean($data[self::FIELD_EXPERIMENTAL])); } @@ -541,17 +566,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -560,6 +592,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ITEM])) { if (is_array($data[self::FIELD_ITEM])) { foreach($data[self::FIELD_ITEM] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRQuestionnaireItem) { $this->addItem($v); } else { @@ -575,6 +610,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_JURISDICTION])) { if (is_array($data[self::FIELD_JURISDICTION])) { foreach($data[self::FIELD_JURISDICTION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addJurisdiction($v); } else { @@ -593,8 +631,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_LAST_REVIEW_DATE] instanceof FHIRDate) { $this->setLastReviewDate($data[self::FIELD_LAST_REVIEW_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_LAST_REVIEW_DATE])) { - $this->setLastReviewDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_LAST_REVIEW_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_LAST_REVIEW_DATE])) { + $this->setLastReviewDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_LAST_REVIEW_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_LAST_REVIEW_DATE])) { + $this->setLastReviewDate(new FHIRDate(array_merge($ext, $data[self::FIELD_LAST_REVIEW_DATE]))); + } } else { $this->setLastReviewDate(new FHIRDate($data[self::FIELD_LAST_REVIEW_DATE])); } @@ -605,8 +647,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -617,8 +663,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PUBLISHER] instanceof FHIRString) { $this->setPublisher($data[self::FIELD_PUBLISHER]); - } elseif ($ext && is_scalar($data[self::FIELD_PUBLISHER])) { - $this->setPublisher(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PUBLISHER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PUBLISHER])) { + $this->setPublisher(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PUBLISHER]] + $ext)); + } else if (is_array($data[self::FIELD_PUBLISHER])) { + $this->setPublisher(new FHIRString(array_merge($ext, $data[self::FIELD_PUBLISHER]))); + } } else { $this->setPublisher(new FHIRString($data[self::FIELD_PUBLISHER])); } @@ -629,8 +679,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PURPOSE] instanceof FHIRMarkdown) { $this->setPurpose($data[self::FIELD_PURPOSE]); - } elseif ($ext && is_scalar($data[self::FIELD_PURPOSE])) { - $this->setPurpose(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_PURPOSE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PURPOSE])) { + $this->setPurpose(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_PURPOSE]] + $ext)); + } else if (is_array($data[self::FIELD_PURPOSE])) { + $this->setPurpose(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_PURPOSE]))); + } } else { $this->setPurpose(new FHIRMarkdown($data[self::FIELD_PURPOSE])); } @@ -641,8 +695,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRPublicationStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRPublicationStatus([FHIRPublicationStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRPublicationStatus([FHIRPublicationStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRPublicationStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRPublicationStatus($data[self::FIELD_STATUS])); } @@ -650,6 +708,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SUBJECT_TYPE])) { if (is_array($data[self::FIELD_SUBJECT_TYPE])) { foreach($data[self::FIELD_SUBJECT_TYPE] as $v) { + if (null === $v) { + continue; + } $this->addSubjectType($v); } } else { @@ -662,8 +723,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TITLE] instanceof FHIRString) { $this->setTitle($data[self::FIELD_TITLE]); - } elseif ($ext && is_scalar($data[self::FIELD_TITLE])) { - $this->setTitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TITLE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TITLE])) { + $this->setTitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TITLE]] + $ext)); + } else if (is_array($data[self::FIELD_TITLE])) { + $this->setTitle(new FHIRString(array_merge($ext, $data[self::FIELD_TITLE]))); + } } else { $this->setTitle(new FHIRString($data[self::FIELD_TITLE])); } @@ -674,8 +739,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_URL] instanceof FHIRUri) { $this->setUrl($data[self::FIELD_URL]); - } elseif ($ext && is_scalar($data[self::FIELD_URL])) { - $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } else if (is_array($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri(array_merge($ext, $data[self::FIELD_URL]))); + } } else { $this->setUrl(new FHIRUri($data[self::FIELD_URL])); } @@ -683,6 +752,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_USE_CONTEXT])) { if (is_array($data[self::FIELD_USE_CONTEXT])) { foreach($data[self::FIELD_USE_CONTEXT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRUsageContext) { $this->addUseContext($v); } else { @@ -701,8 +773,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VERSION] instanceof FHIRString) { $this->setVersion($data[self::FIELD_VERSION]); - } elseif ($ext && is_scalar($data[self::FIELD_VERSION])) { - $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } else if (is_array($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString(array_merge($ext, $data[self::FIELD_VERSION]))); + } } else { $this->setVersion(new FHIRString($data[self::FIELD_VERSION])); } @@ -1971,10 +2047,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getApprovalDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_APPROVAL_DATE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getCode())) { foreach($vs as $v) { if (null === $v) { @@ -1983,7 +2059,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getContact())) { foreach($vs as $v) { if (null === $v) { @@ -2001,14 +2076,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESCRIPTION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getEffectivePeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EFFECTIVE_PERIOD, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getExperimental())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EXPERIMENTAL, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -2017,7 +2090,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getItem())) { foreach($vs as $v) { if (null === $v) { @@ -2026,7 +2098,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_ITEM, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getJurisdiction())) { foreach($vs as $v) { if (null === $v) { @@ -2047,11 +2118,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getPurpose())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PURPOSE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); - } - if ([] !== ($vs = $this->getSubjectType())) { + } if ([] !== ($vs = $this->getSubjectType())) { foreach($vs as $v) { if (null === $v) { continue; @@ -2065,7 +2134,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getUrl())) { $v->xmlSerialize($sxe->addChild(self::FIELD_URL, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getUseContext())) { foreach($vs as $v) { if (null === $v) { @@ -2087,8 +2155,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getApprovalDate())) { - $a[self::FIELD_APPROVAL_DATE] = $v->getValue(); - $a[self::FIELD_APPROVAL_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_APPROVAL_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_APPROVAL_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_APPROVAL_DATE] = $v; + } } if ([] !== ($vs = $this->getCode())) { $a[self::FIELD_CODE] = $vs; @@ -2097,26 +2172,70 @@ public function jsonSerialize() $a[self::FIELD_CONTACT] = $vs; } if (null !== ($v = $this->getCopyright())) { - $a[self::FIELD_COPYRIGHT] = $v->getValue(); - $a[self::FIELD_COPYRIGHT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_COPYRIGHT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_COPYRIGHT_EXT] = $enc; + } + } else { + $a[self::FIELD_COPYRIGHT] = $v; + } } if (null !== ($v = $this->getDate())) { - $a[self::FIELD_DATE] = $v->getValue(); - $a[self::FIELD_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_DATE] = $v; + } } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if (null !== ($v = $this->getEffectivePeriod())) { $a[self::FIELD_EFFECTIVE_PERIOD] = $v; } if (null !== ($v = $this->getExperimental())) { - $a[self::FIELD_EXPERIMENTAL] = $v->getValue(); - $a[self::FIELD_EXPERIMENTAL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EXPERIMENTAL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EXPERIMENTAL_EXT] = $enc; + } + } else { + $a[self::FIELD_EXPERIMENTAL] = $v; + } } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if ([] !== ($vs = $this->getItem())) { $a[self::FIELD_ITEM] = $vs; @@ -2125,41 +2244,98 @@ public function jsonSerialize() $a[self::FIELD_JURISDICTION] = $vs; } if (null !== ($v = $this->getLastReviewDate())) { - $a[self::FIELD_LAST_REVIEW_DATE] = $v->getValue(); - $a[self::FIELD_LAST_REVIEW_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_LAST_REVIEW_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_LAST_REVIEW_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_LAST_REVIEW_DATE] = $v; + } } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if (null !== ($v = $this->getPublisher())) { - $a[self::FIELD_PUBLISHER] = $v->getValue(); - $a[self::FIELD_PUBLISHER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PUBLISHER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PUBLISHER_EXT] = $enc; + } + } else { + $a[self::FIELD_PUBLISHER] = $v; + } } if (null !== ($v = $this->getPurpose())) { - $a[self::FIELD_PURPOSE] = $v->getValue(); - $a[self::FIELD_PURPOSE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PURPOSE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PURPOSE_EXT] = $enc; + } + } else { + $a[self::FIELD_PURPOSE] = $v; + } } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if ([] !== ($vs = $this->getSubjectType())) { $a[self::FIELD_SUBJECT_TYPE] = $vs; } if (null !== ($v = $this->getTitle())) { - $a[self::FIELD_TITLE] = $v->getValue(); - $a[self::FIELD_TITLE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TITLE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TITLE_EXT] = $enc; + } + } else { + $a[self::FIELD_TITLE] = $v; + } } if (null !== ($v = $this->getUrl())) { - $a[self::FIELD_URL] = $v->getValue(); - $a[self::FIELD_URL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_URL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_URL_EXT] = $enc; + } + } else { + $a[self::FIELD_URL] = $v; + } } if ([] !== ($vs = $this->getUseContext())) { $a[self::FIELD_USE_CONTEXT] = $vs; } if (null !== ($v = $this->getVersion())) { - $a[self::FIELD_VERSION] = $v->getValue(); - $a[self::FIELD_VERSION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VERSION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VERSION_EXT] = $enc; + } + } else { + $a[self::FIELD_VERSION] = $v; + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRQuestionnaireResponse.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRQuestionnaireResponse.php index 872b457c3f..a6002b035b 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRQuestionnaireResponse.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRQuestionnaireResponse.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -85,10 +85,6 @@ class FHIRQuestionnaireResponse extends FHIRDomainResource implements PHPFHIRCon { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_QUESTIONNAIRE_RESPONSE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_AUTHOR = 'author'; const FIELD_AUTHORED = 'authored'; const FIELD_AUTHORED_EXT = '_authored'; @@ -238,6 +234,9 @@ class FHIRQuestionnaireResponse extends FHIRDomainResource implements PHPFHIRCon */ protected $subject = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRQuestionnaireResponse Constructor * @param null|array $data @@ -267,8 +266,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_AUTHORED] instanceof FHIRDateTime) { $this->setAuthored($data[self::FIELD_AUTHORED]); - } elseif ($ext && is_scalar($data[self::FIELD_AUTHORED])) { - $this->setAuthored(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_AUTHORED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_AUTHORED])) { + $this->setAuthored(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_AUTHORED]] + $ext)); + } else if (is_array($data[self::FIELD_AUTHORED])) { + $this->setAuthored(new FHIRDateTime(array_merge($ext, $data[self::FIELD_AUTHORED]))); + } } else { $this->setAuthored(new FHIRDateTime($data[self::FIELD_AUTHORED])); } @@ -276,6 +279,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_BASED_ON])) { if (is_array($data[self::FIELD_BASED_ON])) { foreach($data[self::FIELD_BASED_ON] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addBasedOn($v); } else { @@ -301,8 +307,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->setIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { - $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_IDENTIFIER]))); + } } else { $this->setIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); } @@ -310,6 +320,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ITEM])) { if (is_array($data[self::FIELD_ITEM])) { foreach($data[self::FIELD_ITEM] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRQuestionnaireResponseItem) { $this->addItem($v); } else { @@ -325,6 +338,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PARENT])) { if (is_array($data[self::FIELD_PARENT])) { foreach($data[self::FIELD_PARENT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addParent($v); } else { @@ -357,8 +373,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRQuestionnaireResponseStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRQuestionnaireResponseStatus([FHIRQuestionnaireResponseStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRQuestionnaireResponseStatus([FHIRQuestionnaireResponseStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRQuestionnaireResponseStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRQuestionnaireResponseStatus($data[self::FIELD_STATUS])); } @@ -975,7 +995,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getAuthored())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AUTHORED, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getBasedOn())) { foreach($vs as $v) { if (null === $v) { @@ -984,15 +1003,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_BASED_ON, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getContext())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CONTEXT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getItem())) { foreach($vs as $v) { if (null === $v) { @@ -1001,7 +1017,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_ITEM, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getParent())) { foreach($vs as $v) { if (null === $v) { @@ -1010,19 +1025,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_PARENT, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getQuestionnaire())) { $v->xmlSerialize($sxe->addChild(self::FIELD_QUESTIONNAIRE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSource())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SOURCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSubject())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBJECT, null, $v->_getFHIRXMLNamespace())); } @@ -1039,8 +1050,15 @@ public function jsonSerialize() $a[self::FIELD_AUTHOR] = $v; } if (null !== ($v = $this->getAuthored())) { - $a[self::FIELD_AUTHORED] = $v->getValue(); - $a[self::FIELD_AUTHORED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_AUTHORED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_AUTHORED_EXT] = $enc; + } + } else { + $a[self::FIELD_AUTHORED] = $v; + } } if ([] !== ($vs = $this->getBasedOn())) { $a[self::FIELD_BASED_ON] = $vs; @@ -1049,7 +1067,15 @@ public function jsonSerialize() $a[self::FIELD_CONTEXT] = $v; } if (null !== ($v = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_IDENTIFIER] = $v; + } } if ([] !== ($vs = $this->getItem())) { $a[self::FIELD_ITEM] = $vs; @@ -1064,7 +1090,15 @@ public function jsonSerialize() $a[self::FIELD_SOURCE] = $v; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getSubject())) { $a[self::FIELD_SUBJECT] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRReferralRequest.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRReferralRequest.php index 90b9aec89d..0e94102515 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRReferralRequest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRReferralRequest.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -90,10 +90,6 @@ class FHIRReferralRequest extends FHIRDomainResource implements PHPFHIRContained { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_REFERRAL_REQUEST; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_AUTHORED_ON = 'authoredOn'; const FIELD_AUTHORED_ON_EXT = '_authoredOn'; const FIELD_BASED_ON = 'basedOn'; @@ -424,6 +420,9 @@ class FHIRReferralRequest extends FHIRDomainResource implements PHPFHIRContained */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRReferralRequest Constructor * @param null|array $data @@ -446,8 +445,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_AUTHORED_ON] instanceof FHIRDateTime) { $this->setAuthoredOn($data[self::FIELD_AUTHORED_ON]); - } elseif ($ext && is_scalar($data[self::FIELD_AUTHORED_ON])) { - $this->setAuthoredOn(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_AUTHORED_ON]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_AUTHORED_ON])) { + $this->setAuthoredOn(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_AUTHORED_ON]] + $ext)); + } else if (is_array($data[self::FIELD_AUTHORED_ON])) { + $this->setAuthoredOn(new FHIRDateTime(array_merge($ext, $data[self::FIELD_AUTHORED_ON]))); + } } else { $this->setAuthoredOn(new FHIRDateTime($data[self::FIELD_AUTHORED_ON])); } @@ -455,6 +458,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_BASED_ON])) { if (is_array($data[self::FIELD_BASED_ON])) { foreach($data[self::FIELD_BASED_ON] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addBasedOn($v); } else { @@ -477,6 +483,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_DEFINITION])) { if (is_array($data[self::FIELD_DEFINITION])) { foreach($data[self::FIELD_DEFINITION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addDefinition($v); } else { @@ -495,8 +504,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -507,8 +520,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_GROUP_IDENTIFIER] instanceof FHIRIdentifier) { $this->setGroupIdentifier($data[self::FIELD_GROUP_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_GROUP_IDENTIFIER])) { - $this->setGroupIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_GROUP_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_GROUP_IDENTIFIER])) { + $this->setGroupIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_GROUP_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_GROUP_IDENTIFIER])) { + $this->setGroupIdentifier(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_GROUP_IDENTIFIER]))); + } } else { $this->setGroupIdentifier(new FHIRIdentifier($data[self::FIELD_GROUP_IDENTIFIER])); } @@ -519,17 +536,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -541,8 +565,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_INTENT] instanceof FHIRRequestIntent) { $this->setIntent($data[self::FIELD_INTENT]); - } elseif ($ext && is_scalar($data[self::FIELD_INTENT])) { - $this->setIntent(new FHIRRequestIntent([FHIRRequestIntent::FIELD_VALUE => $data[self::FIELD_INTENT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_INTENT])) { + $this->setIntent(new FHIRRequestIntent([FHIRRequestIntent::FIELD_VALUE => $data[self::FIELD_INTENT]] + $ext)); + } else if (is_array($data[self::FIELD_INTENT])) { + $this->setIntent(new FHIRRequestIntent(array_merge($ext, $data[self::FIELD_INTENT]))); + } } else { $this->setIntent(new FHIRRequestIntent($data[self::FIELD_INTENT])); } @@ -550,6 +578,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_NOTE])) { if (is_array($data[self::FIELD_NOTE])) { foreach($data[self::FIELD_NOTE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRAnnotation) { $this->addNote($v); } else { @@ -568,8 +599,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_OCCURRENCE_DATE_TIME] instanceof FHIRDateTime) { $this->setOccurrenceDateTime($data[self::FIELD_OCCURRENCE_DATE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_OCCURRENCE_DATE_TIME])) { - $this->setOccurrenceDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_OCCURRENCE_DATE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_OCCURRENCE_DATE_TIME])) { + $this->setOccurrenceDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_OCCURRENCE_DATE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_OCCURRENCE_DATE_TIME])) { + $this->setOccurrenceDateTime(new FHIRDateTime(array_merge($ext, $data[self::FIELD_OCCURRENCE_DATE_TIME]))); + } } else { $this->setOccurrenceDateTime(new FHIRDateTime($data[self::FIELD_OCCURRENCE_DATE_TIME])); } @@ -587,8 +622,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PRIORITY] instanceof FHIRRequestPriority) { $this->setPriority($data[self::FIELD_PRIORITY]); - } elseif ($ext && is_scalar($data[self::FIELD_PRIORITY])) { - $this->setPriority(new FHIRRequestPriority([FHIRRequestPriority::FIELD_VALUE => $data[self::FIELD_PRIORITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PRIORITY])) { + $this->setPriority(new FHIRRequestPriority([FHIRRequestPriority::FIELD_VALUE => $data[self::FIELD_PRIORITY]] + $ext)); + } else if (is_array($data[self::FIELD_PRIORITY])) { + $this->setPriority(new FHIRRequestPriority(array_merge($ext, $data[self::FIELD_PRIORITY]))); + } } else { $this->setPriority(new FHIRRequestPriority($data[self::FIELD_PRIORITY])); } @@ -596,6 +635,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REASON_CODE])) { if (is_array($data[self::FIELD_REASON_CODE])) { foreach($data[self::FIELD_REASON_CODE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addReasonCode($v); } else { @@ -611,6 +653,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REASON_REFERENCE])) { if (is_array($data[self::FIELD_REASON_REFERENCE])) { foreach($data[self::FIELD_REASON_REFERENCE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addReasonReference($v); } else { @@ -626,6 +671,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_RECIPIENT])) { if (is_array($data[self::FIELD_RECIPIENT])) { foreach($data[self::FIELD_RECIPIENT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addRecipient($v); } else { @@ -641,6 +689,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_RELEVANT_HISTORY])) { if (is_array($data[self::FIELD_RELEVANT_HISTORY])) { foreach($data[self::FIELD_RELEVANT_HISTORY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addRelevantHistory($v); } else { @@ -656,6 +707,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REPLACES])) { if (is_array($data[self::FIELD_REPLACES])) { foreach($data[self::FIELD_REPLACES] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addReplaces($v); } else { @@ -678,6 +732,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SERVICE_REQUESTED])) { if (is_array($data[self::FIELD_SERVICE_REQUESTED])) { foreach($data[self::FIELD_SERVICE_REQUESTED] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addServiceRequested($v); } else { @@ -703,8 +760,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRRequestStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRRequestStatus([FHIRRequestStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRRequestStatus([FHIRRequestStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRRequestStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRRequestStatus($data[self::FIELD_STATUS])); } @@ -719,6 +780,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SUPPORTING_INFO])) { if (is_array($data[self::FIELD_SUPPORTING_INFO])) { foreach($data[self::FIELD_SUPPORTING_INFO] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addSupportingInfo($v); } else { @@ -2063,10 +2127,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getAuthoredOn())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AUTHORED_ON, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getBasedOn())) { foreach($vs as $v) { if (null === $v) { @@ -2075,11 +2139,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_BASED_ON, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getContext())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CONTEXT, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getDefinition())) { foreach($vs as $v) { if (null === $v) { @@ -2091,11 +2153,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESCRIPTION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getGroupIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_GROUP_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -2104,11 +2164,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getIntent())) { $v->xmlSerialize($sxe->addChild(self::FIELD_INTENT, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getNote())) { foreach($vs as $v) { if (null === $v) { @@ -2120,15 +2178,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getOccurrenceDateTime())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OCCURRENCE_DATE_TIME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOccurrencePeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OCCURRENCE_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPriority())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PRIORITY, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getReasonCode())) { foreach($vs as $v) { if (null === $v) { @@ -2137,7 +2192,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_REASON_CODE, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getReasonReference())) { foreach($vs as $v) { if (null === $v) { @@ -2146,7 +2200,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_REASON_REFERENCE, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getRecipient())) { foreach($vs as $v) { if (null === $v) { @@ -2155,7 +2208,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_RECIPIENT, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getRelevantHistory())) { foreach($vs as $v) { if (null === $v) { @@ -2164,7 +2216,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_RELEVANT_HISTORY, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getReplaces())) { foreach($vs as $v) { if (null === $v) { @@ -2173,11 +2224,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_REPLACES, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getRequester())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REQUESTER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getServiceRequested())) { foreach($vs as $v) { if (null === $v) { @@ -2186,19 +2235,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_SERVICE_REQUESTED, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getSpecialty())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SPECIALTY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSubject())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBJECT, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getSupportingInfo())) { foreach($vs as $v) { if (null === $v) { @@ -2207,7 +2252,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_SUPPORTING_INFO, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -2221,8 +2265,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getAuthoredOn())) { - $a[self::FIELD_AUTHORED_ON] = $v->getValue(); - $a[self::FIELD_AUTHORED_ON_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_AUTHORED_ON] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_AUTHORED_ON_EXT] = $enc; + } + } else { + $a[self::FIELD_AUTHORED_ON] = $v; + } } if ([] !== ($vs = $this->getBasedOn())) { $a[self::FIELD_BASED_ON] = $vs; @@ -2234,30 +2285,84 @@ public function jsonSerialize() $a[self::FIELD_DEFINITION] = $vs; } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if (null !== ($v = $this->getGroupIdentifier())) { - $a[self::FIELD_GROUP_IDENTIFIER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_GROUP_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_GROUP_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_GROUP_IDENTIFIER] = $v; + } } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if (null !== ($v = $this->getIntent())) { - $a[self::FIELD_INTENT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_INTENT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_INTENT_EXT] = $enc; + } + } else { + $a[self::FIELD_INTENT] = $v; + } } if ([] !== ($vs = $this->getNote())) { $a[self::FIELD_NOTE] = $vs; } if (null !== ($v = $this->getOccurrenceDateTime())) { - $a[self::FIELD_OCCURRENCE_DATE_TIME] = $v->getValue(); - $a[self::FIELD_OCCURRENCE_DATE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_OCCURRENCE_DATE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_OCCURRENCE_DATE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_OCCURRENCE_DATE_TIME] = $v; + } } if (null !== ($v = $this->getOccurrencePeriod())) { $a[self::FIELD_OCCURRENCE_PERIOD] = $v; } if (null !== ($v = $this->getPriority())) { - $a[self::FIELD_PRIORITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PRIORITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PRIORITY_EXT] = $enc; + } + } else { + $a[self::FIELD_PRIORITY] = $v; + } } if ([] !== ($vs = $this->getReasonCode())) { $a[self::FIELD_REASON_CODE] = $vs; @@ -2284,7 +2389,15 @@ public function jsonSerialize() $a[self::FIELD_SPECIALTY] = $v; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getSubject())) { $a[self::FIELD_SUBJECT] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRRelatedPerson.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRRelatedPerson.php index cf102dbe9b..bbdbba90a2 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRRelatedPerson.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRRelatedPerson.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -91,10 +91,6 @@ class FHIRRelatedPerson extends FHIRDomainResource implements PHPFHIRContainedTy { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_RELATED_PERSON; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ACTIVE = 'active'; const FIELD_ACTIVE_EXT = '_active'; const FIELD_ADDRESS = 'address'; @@ -239,6 +235,9 @@ class FHIRRelatedPerson extends FHIRDomainResource implements PHPFHIRContainedTy */ protected $telecom = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRRelatedPerson Constructor * @param null|array $data @@ -261,8 +260,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ACTIVE] instanceof FHIRBoolean) { $this->setActive($data[self::FIELD_ACTIVE]); - } elseif ($ext && is_scalar($data[self::FIELD_ACTIVE])) { - $this->setActive(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_ACTIVE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ACTIVE])) { + $this->setActive(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_ACTIVE]] + $ext)); + } else if (is_array($data[self::FIELD_ACTIVE])) { + $this->setActive(new FHIRBoolean(array_merge($ext, $data[self::FIELD_ACTIVE]))); + } } else { $this->setActive(new FHIRBoolean($data[self::FIELD_ACTIVE])); } @@ -270,6 +273,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ADDRESS])) { if (is_array($data[self::FIELD_ADDRESS])) { foreach($data[self::FIELD_ADDRESS] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRAddress) { $this->addAddress($v); } else { @@ -288,8 +294,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_BIRTH_DATE] instanceof FHIRDate) { $this->setBirthDate($data[self::FIELD_BIRTH_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_BIRTH_DATE])) { - $this->setBirthDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_BIRTH_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_BIRTH_DATE])) { + $this->setBirthDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_BIRTH_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_BIRTH_DATE])) { + $this->setBirthDate(new FHIRDate(array_merge($ext, $data[self::FIELD_BIRTH_DATE]))); + } } else { $this->setBirthDate(new FHIRDate($data[self::FIELD_BIRTH_DATE])); } @@ -300,8 +310,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_GENDER] instanceof FHIRAdministrativeGender) { $this->setGender($data[self::FIELD_GENDER]); - } elseif ($ext && is_scalar($data[self::FIELD_GENDER])) { - $this->setGender(new FHIRAdministrativeGender([FHIRAdministrativeGender::FIELD_VALUE => $data[self::FIELD_GENDER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_GENDER])) { + $this->setGender(new FHIRAdministrativeGender([FHIRAdministrativeGender::FIELD_VALUE => $data[self::FIELD_GENDER]] + $ext)); + } else if (is_array($data[self::FIELD_GENDER])) { + $this->setGender(new FHIRAdministrativeGender(array_merge($ext, $data[self::FIELD_GENDER]))); + } } else { $this->setGender(new FHIRAdministrativeGender($data[self::FIELD_GENDER])); } @@ -312,17 +326,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -331,6 +352,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_NAME])) { if (is_array($data[self::FIELD_NAME])) { foreach($data[self::FIELD_NAME] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRHumanName) { $this->addName($v); } else { @@ -360,6 +384,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PHOTO])) { if (is_array($data[self::FIELD_PHOTO])) { foreach($data[self::FIELD_PHOTO] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRAttachment) { $this->addPhoto($v); } else { @@ -385,17 +412,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_TELECOM])) { foreach($data[self::FIELD_TELECOM] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContactPoint) { $this->addTelecom($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addTelecom(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addTelecom(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addTelecom(new FHIRContactPoint(array_merge($v, $ext[$i]))); + } } else { $this->addTelecom(new FHIRContactPoint($v)); } } } elseif ($data[self::FIELD_TELECOM] instanceof FHIRContactPoint) { $this->addTelecom($data[self::FIELD_TELECOM]); - } elseif ($ext && is_scalar($data[self::FIELD_TELECOM])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_TELECOM])) { $this->addTelecom(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $data[self::FIELD_TELECOM]] + $ext)); } else { $this->addTelecom(new FHIRContactPoint($data[self::FIELD_TELECOM])); @@ -1052,10 +1086,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getActive())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ACTIVE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getAddress())) { foreach($vs as $v) { if (null === $v) { @@ -1067,11 +1101,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getBirthDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_BIRTH_DATE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getGender())) { $v->xmlSerialize($sxe->addChild(self::FIELD_GENDER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -1080,7 +1112,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getName())) { foreach($vs as $v) { if (null === $v) { @@ -1089,15 +1120,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_NAME, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getPatient())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATIENT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getPhoto())) { foreach($vs as $v) { if (null === $v) { @@ -1106,11 +1134,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_PHOTO, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getRelationship())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RELATIONSHIP, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getTelecom())) { foreach($vs as $v) { if (null === $v) { @@ -1129,21 +1155,59 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getActive())) { - $a[self::FIELD_ACTIVE] = $v->getValue(); - $a[self::FIELD_ACTIVE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ACTIVE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ACTIVE_EXT] = $enc; + } + } else { + $a[self::FIELD_ACTIVE] = $v; + } } if ([] !== ($vs = $this->getAddress())) { $a[self::FIELD_ADDRESS] = $vs; } if (null !== ($v = $this->getBirthDate())) { - $a[self::FIELD_BIRTH_DATE] = $v->getValue(); - $a[self::FIELD_BIRTH_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_BIRTH_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_BIRTH_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_BIRTH_DATE] = $v; + } } if (null !== ($v = $this->getGender())) { - $a[self::FIELD_GENDER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_GENDER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_GENDER_EXT] = $enc; + } + } else { + $a[self::FIELD_GENDER] = $v; + } } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if ([] !== ($vs = $this->getName())) { $a[self::FIELD_NAME] = $vs; @@ -1161,7 +1225,23 @@ public function jsonSerialize() $a[self::FIELD_RELATIONSHIP] = $v; } if ([] !== ($vs = $this->getTelecom())) { - $a[self::FIELD_TELECOM] = $vs; + $a[self::FIELD_TELECOM] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TELECOM][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TELECOM_EXT][] = $enc; + } else { + $a[self::FIELD_TELECOM_EXT][] = null; + } + } else { + $a[self::FIELD_TELECOM][] = $v; + } + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRRequestGroup.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRRequestGroup.php index d27168ee73..f6acb4dbb5 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRRequestGroup.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRRequestGroup.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -88,10 +88,6 @@ class FHIRRequestGroup extends FHIRDomainResource implements PHPFHIRContainedTyp { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_REQUEST_GROUP; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ACTION = 'action'; const FIELD_AUTHOR = 'author'; const FIELD_AUTHORED_ON = 'authoredOn'; @@ -304,6 +300,9 @@ class FHIRRequestGroup extends FHIRDomainResource implements PHPFHIRContainedTyp */ protected $subject = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRRequestGroup Constructor * @param null|array $data @@ -323,6 +322,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ACTION])) { if (is_array($data[self::FIELD_ACTION])) { foreach($data[self::FIELD_ACTION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRRequestGroupAction) { $this->addAction($v); } else { @@ -348,8 +350,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_AUTHORED_ON] instanceof FHIRDateTime) { $this->setAuthoredOn($data[self::FIELD_AUTHORED_ON]); - } elseif ($ext && is_scalar($data[self::FIELD_AUTHORED_ON])) { - $this->setAuthoredOn(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_AUTHORED_ON]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_AUTHORED_ON])) { + $this->setAuthoredOn(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_AUTHORED_ON]] + $ext)); + } else if (is_array($data[self::FIELD_AUTHORED_ON])) { + $this->setAuthoredOn(new FHIRDateTime(array_merge($ext, $data[self::FIELD_AUTHORED_ON]))); + } } else { $this->setAuthoredOn(new FHIRDateTime($data[self::FIELD_AUTHORED_ON])); } @@ -357,6 +363,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_BASED_ON])) { if (is_array($data[self::FIELD_BASED_ON])) { foreach($data[self::FIELD_BASED_ON] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addBasedOn($v); } else { @@ -379,6 +388,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_DEFINITION])) { if (is_array($data[self::FIELD_DEFINITION])) { foreach($data[self::FIELD_DEFINITION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addDefinition($v); } else { @@ -397,8 +409,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_GROUP_IDENTIFIER] instanceof FHIRIdentifier) { $this->setGroupIdentifier($data[self::FIELD_GROUP_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_GROUP_IDENTIFIER])) { - $this->setGroupIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_GROUP_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_GROUP_IDENTIFIER])) { + $this->setGroupIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_GROUP_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_GROUP_IDENTIFIER])) { + $this->setGroupIdentifier(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_GROUP_IDENTIFIER]))); + } } else { $this->setGroupIdentifier(new FHIRIdentifier($data[self::FIELD_GROUP_IDENTIFIER])); } @@ -409,17 +425,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -431,8 +454,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_INTENT] instanceof FHIRRequestIntent) { $this->setIntent($data[self::FIELD_INTENT]); - } elseif ($ext && is_scalar($data[self::FIELD_INTENT])) { - $this->setIntent(new FHIRRequestIntent([FHIRRequestIntent::FIELD_VALUE => $data[self::FIELD_INTENT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_INTENT])) { + $this->setIntent(new FHIRRequestIntent([FHIRRequestIntent::FIELD_VALUE => $data[self::FIELD_INTENT]] + $ext)); + } else if (is_array($data[self::FIELD_INTENT])) { + $this->setIntent(new FHIRRequestIntent(array_merge($ext, $data[self::FIELD_INTENT]))); + } } else { $this->setIntent(new FHIRRequestIntent($data[self::FIELD_INTENT])); } @@ -440,6 +467,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_NOTE])) { if (is_array($data[self::FIELD_NOTE])) { foreach($data[self::FIELD_NOTE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRAnnotation) { $this->addNote($v); } else { @@ -458,8 +488,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PRIORITY] instanceof FHIRRequestPriority) { $this->setPriority($data[self::FIELD_PRIORITY]); - } elseif ($ext && is_scalar($data[self::FIELD_PRIORITY])) { - $this->setPriority(new FHIRRequestPriority([FHIRRequestPriority::FIELD_VALUE => $data[self::FIELD_PRIORITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PRIORITY])) { + $this->setPriority(new FHIRRequestPriority([FHIRRequestPriority::FIELD_VALUE => $data[self::FIELD_PRIORITY]] + $ext)); + } else if (is_array($data[self::FIELD_PRIORITY])) { + $this->setPriority(new FHIRRequestPriority(array_merge($ext, $data[self::FIELD_PRIORITY]))); + } } else { $this->setPriority(new FHIRRequestPriority($data[self::FIELD_PRIORITY])); } @@ -481,6 +515,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REPLACES])) { if (is_array($data[self::FIELD_REPLACES])) { foreach($data[self::FIELD_REPLACES] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addReplaces($v); } else { @@ -499,8 +536,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRRequestStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRRequestStatus([FHIRRequestStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRRequestStatus([FHIRRequestStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRRequestStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRRequestStatus($data[self::FIELD_STATUS])); } @@ -1364,14 +1405,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_ACTION, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getAuthor())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AUTHOR, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getAuthoredOn())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AUTHORED_ON, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getBasedOn())) { foreach($vs as $v) { if (null === $v) { @@ -1380,11 +1419,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_BASED_ON, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getContext())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CONTEXT, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getDefinition())) { foreach($vs as $v) { if (null === $v) { @@ -1393,11 +1430,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_DEFINITION, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getGroupIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_GROUP_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -1406,11 +1441,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getIntent())) { $v->xmlSerialize($sxe->addChild(self::FIELD_INTENT, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getNote())) { foreach($vs as $v) { if (null === $v) { @@ -1419,19 +1452,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_NOTE, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getPriority())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PRIORITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getReasonCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REASON_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getReasonReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REASON_REFERENCE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getReplaces())) { foreach($vs as $v) { if (null === $v) { @@ -1440,11 +1469,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_REPLACES, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSubject())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBJECT, null, $v->_getFHIRXMLNamespace())); } @@ -1464,8 +1491,15 @@ public function jsonSerialize() $a[self::FIELD_AUTHOR] = $v; } if (null !== ($v = $this->getAuthoredOn())) { - $a[self::FIELD_AUTHORED_ON] = $v->getValue(); - $a[self::FIELD_AUTHORED_ON_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_AUTHORED_ON] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_AUTHORED_ON_EXT] = $enc; + } + } else { + $a[self::FIELD_AUTHORED_ON] = $v; + } } if ([] !== ($vs = $this->getBasedOn())) { $a[self::FIELD_BASED_ON] = $vs; @@ -1477,19 +1511,59 @@ public function jsonSerialize() $a[self::FIELD_DEFINITION] = $vs; } if (null !== ($v = $this->getGroupIdentifier())) { - $a[self::FIELD_GROUP_IDENTIFIER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_GROUP_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_GROUP_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_GROUP_IDENTIFIER] = $v; + } } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if (null !== ($v = $this->getIntent())) { - $a[self::FIELD_INTENT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_INTENT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_INTENT_EXT] = $enc; + } + } else { + $a[self::FIELD_INTENT] = $v; + } } if ([] !== ($vs = $this->getNote())) { $a[self::FIELD_NOTE] = $vs; } if (null !== ($v = $this->getPriority())) { - $a[self::FIELD_PRIORITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PRIORITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PRIORITY_EXT] = $enc; + } + } else { + $a[self::FIELD_PRIORITY] = $v; + } } if (null !== ($v = $this->getReasonCodeableConcept())) { $a[self::FIELD_REASON_CODEABLE_CONCEPT] = $v; @@ -1501,7 +1575,15 @@ public function jsonSerialize() $a[self::FIELD_REPLACES] = $vs; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getSubject())) { $a[self::FIELD_SUBJECT] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRResearchStudy.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRResearchStudy.php index 651cd14ce9..9b814ce0d6 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRResearchStudy.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRResearchStudy.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -94,10 +94,6 @@ class FHIRResearchStudy extends FHIRDomainResource implements PHPFHIRContainedTy { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_RESEARCH_STUDY; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ARM = 'arm'; const FIELD_CATEGORY = 'category'; const FIELD_CONTACT = 'contact'; @@ -367,6 +363,9 @@ class FHIRResearchStudy extends FHIRDomainResource implements PHPFHIRContainedTy */ protected $title = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRResearchStudy Constructor * @param null|array $data @@ -386,6 +385,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ARM])) { if (is_array($data[self::FIELD_ARM])) { foreach($data[self::FIELD_ARM] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRResearchStudyArm) { $this->addArm($v); } else { @@ -401,6 +403,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CATEGORY])) { if (is_array($data[self::FIELD_CATEGORY])) { foreach($data[self::FIELD_CATEGORY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addCategory($v); } else { @@ -416,6 +421,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CONTACT])) { if (is_array($data[self::FIELD_CONTACT])) { foreach($data[self::FIELD_CONTACT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContactDetail) { $this->addContact($v); } else { @@ -434,8 +442,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRMarkdown) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRMarkdown($data[self::FIELD_DESCRIPTION])); } @@ -443,6 +455,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ENROLLMENT])) { if (is_array($data[self::FIELD_ENROLLMENT])) { foreach($data[self::FIELD_ENROLLMENT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addEnrollment($v); } else { @@ -458,6 +473,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_FOCUS])) { if (is_array($data[self::FIELD_FOCUS])) { foreach($data[self::FIELD_FOCUS] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addFocus($v); } else { @@ -476,17 +494,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -495,6 +520,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_JURISDICTION])) { if (is_array($data[self::FIELD_JURISDICTION])) { foreach($data[self::FIELD_JURISDICTION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addJurisdiction($v); } else { @@ -510,6 +538,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_KEYWORD])) { if (is_array($data[self::FIELD_KEYWORD])) { foreach($data[self::FIELD_KEYWORD] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addKeyword($v); } else { @@ -525,6 +556,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_NOTE])) { if (is_array($data[self::FIELD_NOTE])) { foreach($data[self::FIELD_NOTE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRAnnotation) { $this->addNote($v); } else { @@ -540,6 +574,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PART_OF])) { if (is_array($data[self::FIELD_PART_OF])) { foreach($data[self::FIELD_PART_OF] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addPartOf($v); } else { @@ -569,6 +606,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PROTOCOL])) { if (is_array($data[self::FIELD_PROTOCOL])) { foreach($data[self::FIELD_PROTOCOL] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addProtocol($v); } else { @@ -591,6 +631,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_RELATED_ARTIFACT])) { if (is_array($data[self::FIELD_RELATED_ARTIFACT])) { foreach($data[self::FIELD_RELATED_ARTIFACT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRRelatedArtifact) { $this->addRelatedArtifact($v); } else { @@ -606,6 +649,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SITE])) { if (is_array($data[self::FIELD_SITE])) { foreach($data[self::FIELD_SITE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addSite($v); } else { @@ -631,8 +677,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRResearchStudyStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRResearchStudyStatus([FHIRResearchStudyStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRResearchStudyStatus([FHIRResearchStudyStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRResearchStudyStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRResearchStudyStatus($data[self::FIELD_STATUS])); } @@ -643,8 +693,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TITLE] instanceof FHIRString) { $this->setTitle($data[self::FIELD_TITLE]); - } elseif ($ext && is_scalar($data[self::FIELD_TITLE])) { - $this->setTitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TITLE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TITLE])) { + $this->setTitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TITLE]] + $ext)); + } else if (is_array($data[self::FIELD_TITLE])) { + $this->setTitle(new FHIRString(array_merge($ext, $data[self::FIELD_TITLE]))); + } } else { $this->setTitle(new FHIRString($data[self::FIELD_TITLE])); } @@ -1878,7 +1932,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_ARM, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getCategory())) { foreach($vs as $v) { if (null === $v) { @@ -1887,7 +1940,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_CATEGORY, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getContact())) { foreach($vs as $v) { if (null === $v) { @@ -1899,7 +1951,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESCRIPTION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getEnrollment())) { foreach($vs as $v) { if (null === $v) { @@ -1908,7 +1959,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_ENROLLMENT, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getFocus())) { foreach($vs as $v) { if (null === $v) { @@ -1917,7 +1967,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_FOCUS, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -1926,7 +1975,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getJurisdiction())) { foreach($vs as $v) { if (null === $v) { @@ -1935,7 +1983,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_JURISDICTION, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getKeyword())) { foreach($vs as $v) { if (null === $v) { @@ -1944,7 +1991,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_KEYWORD, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getNote())) { foreach($vs as $v) { if (null === $v) { @@ -1953,7 +1999,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_NOTE, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getPartOf())) { foreach($vs as $v) { if (null === $v) { @@ -1962,15 +2007,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_PART_OF, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPrincipalInvestigator())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PRINCIPAL_INVESTIGATOR, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getProtocol())) { foreach($vs as $v) { if (null === $v) { @@ -1979,11 +2021,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_PROTOCOL, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getReasonStopped())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REASON_STOPPED, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getRelatedArtifact())) { foreach($vs as $v) { if (null === $v) { @@ -1992,7 +2032,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_RELATED_ARTIFACT, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getSite())) { foreach($vs as $v) { if (null === $v) { @@ -2001,11 +2040,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_SITE, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getSponsor())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SPONSOR, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } @@ -2031,8 +2068,15 @@ public function jsonSerialize() $a[self::FIELD_CONTACT] = $vs; } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if ([] !== ($vs = $this->getEnrollment())) { $a[self::FIELD_ENROLLMENT] = $vs; @@ -2041,7 +2085,23 @@ public function jsonSerialize() $a[self::FIELD_FOCUS] = $vs; } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if ([] !== ($vs = $this->getJurisdiction())) { $a[self::FIELD_JURISDICTION] = $vs; @@ -2077,11 +2137,26 @@ public function jsonSerialize() $a[self::FIELD_SPONSOR] = $v; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getTitle())) { - $a[self::FIELD_TITLE] = $v->getValue(); - $a[self::FIELD_TITLE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TITLE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TITLE_EXT] = $enc; + } + } else { + $a[self::FIELD_TITLE] = $v; + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRResearchSubject.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRResearchSubject.php index da354e88c6..f6234a91f1 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRResearchSubject.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRResearchSubject.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -88,10 +88,6 @@ class FHIRResearchSubject extends FHIRDomainResource implements PHPFHIRContained { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_RESEARCH_SUBJECT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ACTUAL_ARM = 'actualArm'; const FIELD_ACTUAL_ARM_EXT = '_actualArm'; const FIELD_ASSIGNED_ARM = 'assignedArm'; @@ -194,6 +190,9 @@ class FHIRResearchSubject extends FHIRDomainResource implements PHPFHIRContained */ protected $study = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRResearchSubject Constructor * @param null|array $data @@ -216,8 +215,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ACTUAL_ARM] instanceof FHIRString) { $this->setActualArm($data[self::FIELD_ACTUAL_ARM]); - } elseif ($ext && is_scalar($data[self::FIELD_ACTUAL_ARM])) { - $this->setActualArm(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_ACTUAL_ARM]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ACTUAL_ARM])) { + $this->setActualArm(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_ACTUAL_ARM]] + $ext)); + } else if (is_array($data[self::FIELD_ACTUAL_ARM])) { + $this->setActualArm(new FHIRString(array_merge($ext, $data[self::FIELD_ACTUAL_ARM]))); + } } else { $this->setActualArm(new FHIRString($data[self::FIELD_ACTUAL_ARM])); } @@ -228,8 +231,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ASSIGNED_ARM] instanceof FHIRString) { $this->setAssignedArm($data[self::FIELD_ASSIGNED_ARM]); - } elseif ($ext && is_scalar($data[self::FIELD_ASSIGNED_ARM])) { - $this->setAssignedArm(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_ASSIGNED_ARM]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ASSIGNED_ARM])) { + $this->setAssignedArm(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_ASSIGNED_ARM]] + $ext)); + } else if (is_array($data[self::FIELD_ASSIGNED_ARM])) { + $this->setAssignedArm(new FHIRString(array_merge($ext, $data[self::FIELD_ASSIGNED_ARM]))); + } } else { $this->setAssignedArm(new FHIRString($data[self::FIELD_ASSIGNED_ARM])); } @@ -247,8 +254,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->setIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { - $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_IDENTIFIER]))); + } } else { $this->setIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); } @@ -273,8 +284,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRResearchSubjectStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRResearchSubjectStatus([FHIRResearchSubjectStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRResearchSubjectStatus([FHIRResearchSubjectStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRResearchSubjectStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRResearchSubjectStatus($data[self::FIELD_STATUS])); } @@ -683,33 +698,28 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getActualArm())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ACTUAL_ARM, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getAssignedArm())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ASSIGNED_ARM, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getConsent())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CONSENT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getIndividual())) { $v->xmlSerialize($sxe->addChild(self::FIELD_INDIVIDUAL, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStudy())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STUDY, null, $v->_getFHIRXMLNamespace())); } @@ -723,18 +733,40 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getActualArm())) { - $a[self::FIELD_ACTUAL_ARM] = $v->getValue(); - $a[self::FIELD_ACTUAL_ARM_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ACTUAL_ARM] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ACTUAL_ARM_EXT] = $enc; + } + } else { + $a[self::FIELD_ACTUAL_ARM] = $v; + } } if (null !== ($v = $this->getAssignedArm())) { - $a[self::FIELD_ASSIGNED_ARM] = $v->getValue(); - $a[self::FIELD_ASSIGNED_ARM_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ASSIGNED_ARM] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ASSIGNED_ARM_EXT] = $enc; + } + } else { + $a[self::FIELD_ASSIGNED_ARM] = $v; + } } if (null !== ($v = $this->getConsent())) { $a[self::FIELD_CONSENT] = $v; } if (null !== ($v = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_IDENTIFIER] = $v; + } } if (null !== ($v = $this->getIndividual())) { $a[self::FIELD_INDIVIDUAL] = $v; @@ -743,7 +775,15 @@ public function jsonSerialize() $a[self::FIELD_PERIOD] = $v; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getStudy())) { $a[self::FIELD_STUDY] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRRiskAssessment.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRRiskAssessment.php index 0567ac4264..f360377f35 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRRiskAssessment.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRRiskAssessment.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -87,10 +87,6 @@ class FHIRRiskAssessment extends FHIRDomainResource implements PHPFHIRContainedT { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_RISK_ASSESSMENT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_BASED_ON = 'basedOn'; const FIELD_BASIS = 'basis'; const FIELD_CODE = 'code'; @@ -320,6 +316,9 @@ class FHIRRiskAssessment extends FHIRDomainResource implements PHPFHIRContainedT */ protected $subject = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRRiskAssessment Constructor * @param null|array $data @@ -346,6 +345,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_BASIS])) { if (is_array($data[self::FIELD_BASIS])) { foreach($data[self::FIELD_BASIS] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addBasis($v); } else { @@ -371,8 +373,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_COMMENT] instanceof FHIRString) { $this->setComment($data[self::FIELD_COMMENT]); - } elseif ($ext && is_scalar($data[self::FIELD_COMMENT])) { - $this->setComment(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_COMMENT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_COMMENT])) { + $this->setComment(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_COMMENT]] + $ext)); + } else if (is_array($data[self::FIELD_COMMENT])) { + $this->setComment(new FHIRString(array_merge($ext, $data[self::FIELD_COMMENT]))); + } } else { $this->setComment(new FHIRString($data[self::FIELD_COMMENT])); } @@ -397,8 +403,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->setIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { - $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_IDENTIFIER]))); + } } else { $this->setIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); } @@ -416,8 +426,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_MITIGATION] instanceof FHIRString) { $this->setMitigation($data[self::FIELD_MITIGATION]); - } elseif ($ext && is_scalar($data[self::FIELD_MITIGATION])) { - $this->setMitigation(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_MITIGATION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_MITIGATION])) { + $this->setMitigation(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_MITIGATION]] + $ext)); + } else if (is_array($data[self::FIELD_MITIGATION])) { + $this->setMitigation(new FHIRString(array_merge($ext, $data[self::FIELD_MITIGATION]))); + } } else { $this->setMitigation(new FHIRString($data[self::FIELD_MITIGATION])); } @@ -428,8 +442,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_OCCURRENCE_DATE_TIME] instanceof FHIRDateTime) { $this->setOccurrenceDateTime($data[self::FIELD_OCCURRENCE_DATE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_OCCURRENCE_DATE_TIME])) { - $this->setOccurrenceDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_OCCURRENCE_DATE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_OCCURRENCE_DATE_TIME])) { + $this->setOccurrenceDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_OCCURRENCE_DATE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_OCCURRENCE_DATE_TIME])) { + $this->setOccurrenceDateTime(new FHIRDateTime(array_merge($ext, $data[self::FIELD_OCCURRENCE_DATE_TIME]))); + } } else { $this->setOccurrenceDateTime(new FHIRDateTime($data[self::FIELD_OCCURRENCE_DATE_TIME])); } @@ -458,6 +476,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PREDICTION])) { if (is_array($data[self::FIELD_PREDICTION])) { foreach($data[self::FIELD_PREDICTION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRRiskAssessmentPrediction) { $this->addPrediction($v); } else { @@ -490,8 +511,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRObservationStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRObservationStatus([FHIRObservationStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRObservationStatus([FHIRObservationStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRObservationStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRObservationStatus($data[self::FIELD_STATUS])); } @@ -1313,7 +1338,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getBasedOn())) { $v->xmlSerialize($sxe->addChild(self::FIELD_BASED_ON, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getBasis())) { foreach($vs as $v) { if (null === $v) { @@ -1322,26 +1346,21 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_BASIS, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getComment())) { $v->xmlSerialize($sxe->addChild(self::FIELD_COMMENT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getCondition())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CONDITION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getContext())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CONTEXT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getMethod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_METHOD, null, $v->_getFHIRXMLNamespace())); } @@ -1351,19 +1370,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getOccurrenceDateTime())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OCCURRENCE_DATE_TIME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOccurrencePeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OCCURRENCE_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getParent())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PARENT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPerformer())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PERFORMER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getPrediction())) { foreach($vs as $v) { if (null === $v) { @@ -1372,19 +1387,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_PREDICTION, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getReasonCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REASON_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getReasonReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REASON_REFERENCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSubject())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBJECT, null, $v->_getFHIRXMLNamespace())); } @@ -1407,8 +1418,15 @@ public function jsonSerialize() $a[self::FIELD_CODE] = $v; } if (null !== ($v = $this->getComment())) { - $a[self::FIELD_COMMENT] = $v->getValue(); - $a[self::FIELD_COMMENT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_COMMENT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_COMMENT_EXT] = $enc; + } + } else { + $a[self::FIELD_COMMENT] = $v; + } } if (null !== ($v = $this->getCondition())) { $a[self::FIELD_CONDITION] = $v; @@ -1417,18 +1435,40 @@ public function jsonSerialize() $a[self::FIELD_CONTEXT] = $v; } if (null !== ($v = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_IDENTIFIER] = $v; + } } if (null !== ($v = $this->getMethod())) { $a[self::FIELD_METHOD] = $v; } if (null !== ($v = $this->getMitigation())) { - $a[self::FIELD_MITIGATION] = $v->getValue(); - $a[self::FIELD_MITIGATION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MITIGATION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MITIGATION_EXT] = $enc; + } + } else { + $a[self::FIELD_MITIGATION] = $v; + } } if (null !== ($v = $this->getOccurrenceDateTime())) { - $a[self::FIELD_OCCURRENCE_DATE_TIME] = $v->getValue(); - $a[self::FIELD_OCCURRENCE_DATE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_OCCURRENCE_DATE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_OCCURRENCE_DATE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_OCCURRENCE_DATE_TIME] = $v; + } } if (null !== ($v = $this->getOccurrencePeriod())) { $a[self::FIELD_OCCURRENCE_PERIOD] = $v; @@ -1449,7 +1489,15 @@ public function jsonSerialize() $a[self::FIELD_REASON_REFERENCE] = $v; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getSubject())) { $a[self::FIELD_SUBJECT] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRSchedule.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRSchedule.php index f549227d9c..74e148045b 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRSchedule.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRSchedule.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -84,10 +84,6 @@ class FHIRSchedule extends FHIRDomainResource implements PHPFHIRContainedTypeInt { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SCHEDULE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ACTIVE = 'active'; const FIELD_ACTIVE_EXT = '_active'; const FIELD_ACTOR = 'actor'; @@ -200,6 +196,9 @@ class FHIRSchedule extends FHIRDomainResource implements PHPFHIRContainedTypeInt */ protected $specialty = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSchedule Constructor * @param null|array $data @@ -222,8 +221,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ACTIVE] instanceof FHIRBoolean) { $this->setActive($data[self::FIELD_ACTIVE]); - } elseif ($ext && is_scalar($data[self::FIELD_ACTIVE])) { - $this->setActive(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_ACTIVE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ACTIVE])) { + $this->setActive(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_ACTIVE]] + $ext)); + } else if (is_array($data[self::FIELD_ACTIVE])) { + $this->setActive(new FHIRBoolean(array_merge($ext, $data[self::FIELD_ACTIVE]))); + } } else { $this->setActive(new FHIRBoolean($data[self::FIELD_ACTIVE])); } @@ -231,6 +234,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ACTOR])) { if (is_array($data[self::FIELD_ACTOR])) { foreach($data[self::FIELD_ACTOR] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addActor($v); } else { @@ -249,8 +255,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_COMMENT] instanceof FHIRString) { $this->setComment($data[self::FIELD_COMMENT]); - } elseif ($ext && is_scalar($data[self::FIELD_COMMENT])) { - $this->setComment(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_COMMENT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_COMMENT])) { + $this->setComment(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_COMMENT]] + $ext)); + } else if (is_array($data[self::FIELD_COMMENT])) { + $this->setComment(new FHIRString(array_merge($ext, $data[self::FIELD_COMMENT]))); + } } else { $this->setComment(new FHIRString($data[self::FIELD_COMMENT])); } @@ -261,17 +271,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -294,6 +311,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SERVICE_TYPE])) { if (is_array($data[self::FIELD_SERVICE_TYPE])) { foreach($data[self::FIELD_SERVICE_TYPE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addServiceType($v); } else { @@ -309,6 +329,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SPECIALTY])) { if (is_array($data[self::FIELD_SPECIALTY])) { foreach($data[self::FIELD_SPECIALTY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addSpecialty($v); } else { @@ -857,10 +880,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getActive())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ACTIVE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getActor())) { foreach($vs as $v) { if (null === $v) { @@ -872,7 +895,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getComment())) { $v->xmlSerialize($sxe->addChild(self::FIELD_COMMENT, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -881,15 +903,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getPlanningHorizon())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PLANNING_HORIZON, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getServiceCategory())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SERVICE_CATEGORY, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getServiceType())) { foreach($vs as $v) { if (null === $v) { @@ -898,7 +917,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_SERVICE_TYPE, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getSpecialty())) { foreach($vs as $v) { if (null === $v) { @@ -917,18 +935,48 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getActive())) { - $a[self::FIELD_ACTIVE] = $v->getValue(); - $a[self::FIELD_ACTIVE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ACTIVE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ACTIVE_EXT] = $enc; + } + } else { + $a[self::FIELD_ACTIVE] = $v; + } } if ([] !== ($vs = $this->getActor())) { $a[self::FIELD_ACTOR] = $vs; } if (null !== ($v = $this->getComment())) { - $a[self::FIELD_COMMENT] = $v->getValue(); - $a[self::FIELD_COMMENT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_COMMENT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_COMMENT_EXT] = $enc; + } + } else { + $a[self::FIELD_COMMENT] = $v; + } } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if (null !== ($v = $this->getPlanningHorizon())) { $a[self::FIELD_PLANNING_HORIZON] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRSearchParameter.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRSearchParameter.php index 3560f0c2cf..4cc97cd359 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRSearchParameter.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRSearchParameter.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -95,10 +95,6 @@ class FHIRSearchParameter extends FHIRDomainResource implements PHPFHIRContained { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SEARCH_PARAMETER; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_BASE = 'base'; const FIELD_CHAIN = 'chain'; const FIELD_CHAIN_EXT = '_chain'; @@ -452,6 +448,9 @@ class FHIRSearchParameter extends FHIRDomainResource implements PHPFHIRContained */ protected $xpathUsage = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSearchParameter Constructor * @param null|array $data @@ -471,6 +470,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_BASE])) { if (is_array($data[self::FIELD_BASE])) { foreach($data[self::FIELD_BASE] as $v) { + if (null === $v) { + continue; + } $this->addBase($v); } } else { @@ -483,17 +485,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_CHAIN])) { foreach($data[self::FIELD_CHAIN] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRString) { $this->addChain($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addChain(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addChain(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addChain(new FHIRString(array_merge($v, $ext[$i]))); + } } else { $this->addChain(new FHIRString($v)); } } } elseif ($data[self::FIELD_CHAIN] instanceof FHIRString) { $this->addChain($data[self::FIELD_CHAIN]); - } elseif ($ext && is_scalar($data[self::FIELD_CHAIN])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_CHAIN])) { $this->addChain(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_CHAIN]] + $ext)); } else { $this->addChain(new FHIRString($data[self::FIELD_CHAIN])); @@ -505,8 +514,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CODE] instanceof FHIRCode) { $this->setCode($data[self::FIELD_CODE]); - } elseif ($ext && is_scalar($data[self::FIELD_CODE])) { - $this->setCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_CODE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CODE])) { + $this->setCode(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_CODE]] + $ext)); + } else if (is_array($data[self::FIELD_CODE])) { + $this->setCode(new FHIRCode(array_merge($ext, $data[self::FIELD_CODE]))); + } } else { $this->setCode(new FHIRCode($data[self::FIELD_CODE])); } @@ -517,17 +530,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_COMPARATOR])) { foreach($data[self::FIELD_COMPARATOR] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRSearchComparator) { $this->addComparator($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addComparator(new FHIRSearchComparator([FHIRSearchComparator::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addComparator(new FHIRSearchComparator([FHIRSearchComparator::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addComparator(new FHIRSearchComparator(array_merge($v, $ext[$i]))); + } } else { $this->addComparator(new FHIRSearchComparator($v)); } } } elseif ($data[self::FIELD_COMPARATOR] instanceof FHIRSearchComparator) { $this->addComparator($data[self::FIELD_COMPARATOR]); - } elseif ($ext && is_scalar($data[self::FIELD_COMPARATOR])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_COMPARATOR])) { $this->addComparator(new FHIRSearchComparator([FHIRSearchComparator::FIELD_VALUE => $data[self::FIELD_COMPARATOR]] + $ext)); } else { $this->addComparator(new FHIRSearchComparator($data[self::FIELD_COMPARATOR])); @@ -536,6 +556,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_COMPONENT])) { if (is_array($data[self::FIELD_COMPONENT])) { foreach($data[self::FIELD_COMPONENT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRSearchParameterComponent) { $this->addComponent($v); } else { @@ -551,6 +574,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CONTACT])) { if (is_array($data[self::FIELD_CONTACT])) { foreach($data[self::FIELD_CONTACT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContactDetail) { $this->addContact($v); } else { @@ -569,8 +595,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATE] instanceof FHIRDateTime) { $this->setDate($data[self::FIELD_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_DATE])) { - $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime(array_merge($ext, $data[self::FIELD_DATE]))); + } } else { $this->setDate(new FHIRDateTime($data[self::FIELD_DATE])); } @@ -581,8 +611,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DERIVED_FROM] instanceof FHIRUri) { $this->setDerivedFrom($data[self::FIELD_DERIVED_FROM]); - } elseif ($ext && is_scalar($data[self::FIELD_DERIVED_FROM])) { - $this->setDerivedFrom(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_DERIVED_FROM]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DERIVED_FROM])) { + $this->setDerivedFrom(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_DERIVED_FROM]] + $ext)); + } else if (is_array($data[self::FIELD_DERIVED_FROM])) { + $this->setDerivedFrom(new FHIRUri(array_merge($ext, $data[self::FIELD_DERIVED_FROM]))); + } } else { $this->setDerivedFrom(new FHIRUri($data[self::FIELD_DERIVED_FROM])); } @@ -593,8 +627,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRMarkdown) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRMarkdown($data[self::FIELD_DESCRIPTION])); } @@ -605,8 +643,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EXPERIMENTAL] instanceof FHIRBoolean) { $this->setExperimental($data[self::FIELD_EXPERIMENTAL]); - } elseif ($ext && is_scalar($data[self::FIELD_EXPERIMENTAL])) { - $this->setExperimental(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_EXPERIMENTAL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EXPERIMENTAL])) { + $this->setExperimental(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_EXPERIMENTAL]] + $ext)); + } else if (is_array($data[self::FIELD_EXPERIMENTAL])) { + $this->setExperimental(new FHIRBoolean(array_merge($ext, $data[self::FIELD_EXPERIMENTAL]))); + } } else { $this->setExperimental(new FHIRBoolean($data[self::FIELD_EXPERIMENTAL])); } @@ -617,8 +659,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EXPRESSION] instanceof FHIRString) { $this->setExpression($data[self::FIELD_EXPRESSION]); - } elseif ($ext && is_scalar($data[self::FIELD_EXPRESSION])) { - $this->setExpression(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_EXPRESSION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EXPRESSION])) { + $this->setExpression(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_EXPRESSION]] + $ext)); + } else if (is_array($data[self::FIELD_EXPRESSION])) { + $this->setExpression(new FHIRString(array_merge($ext, $data[self::FIELD_EXPRESSION]))); + } } else { $this->setExpression(new FHIRString($data[self::FIELD_EXPRESSION])); } @@ -626,6 +672,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_JURISDICTION])) { if (is_array($data[self::FIELD_JURISDICTION])) { foreach($data[self::FIELD_JURISDICTION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addJurisdiction($v); } else { @@ -644,17 +693,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_MODIFIER])) { foreach($data[self::FIELD_MODIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRSearchModifierCode) { $this->addModifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addModifier(new FHIRSearchModifierCode([FHIRSearchModifierCode::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addModifier(new FHIRSearchModifierCode([FHIRSearchModifierCode::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addModifier(new FHIRSearchModifierCode(array_merge($v, $ext[$i]))); + } } else { $this->addModifier(new FHIRSearchModifierCode($v)); } } } elseif ($data[self::FIELD_MODIFIER] instanceof FHIRSearchModifierCode) { $this->addModifier($data[self::FIELD_MODIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_MODIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_MODIFIER])) { $this->addModifier(new FHIRSearchModifierCode([FHIRSearchModifierCode::FIELD_VALUE => $data[self::FIELD_MODIFIER]] + $ext)); } else { $this->addModifier(new FHIRSearchModifierCode($data[self::FIELD_MODIFIER])); @@ -666,8 +722,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -678,8 +738,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PUBLISHER] instanceof FHIRString) { $this->setPublisher($data[self::FIELD_PUBLISHER]); - } elseif ($ext && is_scalar($data[self::FIELD_PUBLISHER])) { - $this->setPublisher(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PUBLISHER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PUBLISHER])) { + $this->setPublisher(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PUBLISHER]] + $ext)); + } else if (is_array($data[self::FIELD_PUBLISHER])) { + $this->setPublisher(new FHIRString(array_merge($ext, $data[self::FIELD_PUBLISHER]))); + } } else { $this->setPublisher(new FHIRString($data[self::FIELD_PUBLISHER])); } @@ -690,8 +754,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PURPOSE] instanceof FHIRMarkdown) { $this->setPurpose($data[self::FIELD_PURPOSE]); - } elseif ($ext && is_scalar($data[self::FIELD_PURPOSE])) { - $this->setPurpose(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_PURPOSE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PURPOSE])) { + $this->setPurpose(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_PURPOSE]] + $ext)); + } else if (is_array($data[self::FIELD_PURPOSE])) { + $this->setPurpose(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_PURPOSE]))); + } } else { $this->setPurpose(new FHIRMarkdown($data[self::FIELD_PURPOSE])); } @@ -702,8 +770,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRPublicationStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRPublicationStatus([FHIRPublicationStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRPublicationStatus([FHIRPublicationStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRPublicationStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRPublicationStatus($data[self::FIELD_STATUS])); } @@ -711,6 +783,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_TARGET])) { if (is_array($data[self::FIELD_TARGET])) { foreach($data[self::FIELD_TARGET] as $v) { + if (null === $v) { + continue; + } $this->addTarget($v); } } else { @@ -723,8 +798,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TYPE] instanceof FHIRSearchParamType) { $this->setType($data[self::FIELD_TYPE]); - } elseif ($ext && is_scalar($data[self::FIELD_TYPE])) { - $this->setType(new FHIRSearchParamType([FHIRSearchParamType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TYPE])) { + $this->setType(new FHIRSearchParamType([FHIRSearchParamType::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } else if (is_array($data[self::FIELD_TYPE])) { + $this->setType(new FHIRSearchParamType(array_merge($ext, $data[self::FIELD_TYPE]))); + } } else { $this->setType(new FHIRSearchParamType($data[self::FIELD_TYPE])); } @@ -735,8 +814,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_URL] instanceof FHIRUri) { $this->setUrl($data[self::FIELD_URL]); - } elseif ($ext && is_scalar($data[self::FIELD_URL])) { - $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } else if (is_array($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri(array_merge($ext, $data[self::FIELD_URL]))); + } } else { $this->setUrl(new FHIRUri($data[self::FIELD_URL])); } @@ -744,6 +827,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_USE_CONTEXT])) { if (is_array($data[self::FIELD_USE_CONTEXT])) { foreach($data[self::FIELD_USE_CONTEXT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRUsageContext) { $this->addUseContext($v); } else { @@ -762,8 +848,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VERSION] instanceof FHIRString) { $this->setVersion($data[self::FIELD_VERSION]); - } elseif ($ext && is_scalar($data[self::FIELD_VERSION])) { - $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } else if (is_array($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString(array_merge($ext, $data[self::FIELD_VERSION]))); + } } else { $this->setVersion(new FHIRString($data[self::FIELD_VERSION])); } @@ -774,8 +864,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_XPATH] instanceof FHIRString) { $this->setXpath($data[self::FIELD_XPATH]); - } elseif ($ext && is_scalar($data[self::FIELD_XPATH])) { - $this->setXpath(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_XPATH]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_XPATH])) { + $this->setXpath(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_XPATH]] + $ext)); + } else if (is_array($data[self::FIELD_XPATH])) { + $this->setXpath(new FHIRString(array_merge($ext, $data[self::FIELD_XPATH]))); + } } else { $this->setXpath(new FHIRString($data[self::FIELD_XPATH])); } @@ -786,8 +880,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_XPATH_USAGE] instanceof FHIRXPathUsageType) { $this->setXpathUsage($data[self::FIELD_XPATH_USAGE]); - } elseif ($ext && is_scalar($data[self::FIELD_XPATH_USAGE])) { - $this->setXpathUsage(new FHIRXPathUsageType([FHIRXPathUsageType::FIELD_VALUE => $data[self::FIELD_XPATH_USAGE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_XPATH_USAGE])) { + $this->setXpathUsage(new FHIRXPathUsageType([FHIRXPathUsageType::FIELD_VALUE => $data[self::FIELD_XPATH_USAGE]] + $ext)); + } else if (is_array($data[self::FIELD_XPATH_USAGE])) { + $this->setXpathUsage(new FHIRXPathUsageType(array_merge($ext, $data[self::FIELD_XPATH_USAGE]))); + } } else { $this->setXpathUsage(new FHIRXPathUsageType($data[self::FIELD_XPATH_USAGE])); } @@ -2229,7 +2327,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getComparator())) { foreach($vs as $v) { if (null === $v) { @@ -2238,7 +2335,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_COMPARATOR, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getComponent())) { foreach($vs as $v) { if (null === $v) { @@ -2247,7 +2343,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_COMPONENT, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getContact())) { foreach($vs as $v) { if (null === $v) { @@ -2271,7 +2366,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getExpression())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EXPRESSION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getJurisdiction())) { foreach($vs as $v) { if (null === $v) { @@ -2280,7 +2374,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_JURISDICTION, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getModifier())) { foreach($vs as $v) { if (null === $v) { @@ -2298,11 +2391,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getPurpose())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PURPOSE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); - } - if ([] !== ($vs = $this->getTarget())) { + } if ([] !== ($vs = $this->getTarget())) { foreach($vs as $v) { if (null === $v) { continue; @@ -2310,14 +2401,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_TARGET, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getUrl())) { $v->xmlSerialize($sxe->addChild(self::FIELD_URL, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getUseContext())) { foreach($vs as $v) { if (null === $v) { @@ -2332,7 +2421,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getXpath())) { $v->xmlSerialize($sxe->addChild(self::FIELD_XPATH, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getXpathUsage())) { $v->xmlSerialize($sxe->addChild(self::FIELD_XPATH_USAGE, null, $v->_getFHIRXMLNamespace())); } @@ -2354,16 +2442,48 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_CHAIN][] = $v->getValue(); - $a[self::FIELD_CHAIN_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CHAIN][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CHAIN_EXT][] = $enc; + } else { + $a[self::FIELD_CHAIN_EXT][] = null; + } + } else { + $a[self::FIELD_CHAIN][] = $v; + } } } if (null !== ($v = $this->getCode())) { - $a[self::FIELD_CODE] = $v->getValue(); - $a[self::FIELD_CODE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CODE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CODE_EXT] = $enc; + } + } else { + $a[self::FIELD_CODE] = $v; + } } if ([] !== ($vs = $this->getComparator())) { - $a[self::FIELD_COMPARATOR] = $vs; + $a[self::FIELD_COMPARATOR] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_COMPARATOR][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_COMPARATOR_EXT][] = $enc; + } else { + $a[self::FIELD_COMPARATOR_EXT][] = null; + } + } else { + $a[self::FIELD_COMPARATOR][] = $v; + } + } } if ([] !== ($vs = $this->getComponent())) { $a[self::FIELD_COMPONENT] = $vs; @@ -2372,69 +2492,186 @@ public function jsonSerialize() $a[self::FIELD_CONTACT] = $vs; } if (null !== ($v = $this->getDate())) { - $a[self::FIELD_DATE] = $v->getValue(); - $a[self::FIELD_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_DATE] = $v; + } } if (null !== ($v = $this->getDerivedFrom())) { - $a[self::FIELD_DERIVED_FROM] = $v->getValue(); - $a[self::FIELD_DERIVED_FROM_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DERIVED_FROM] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DERIVED_FROM_EXT] = $enc; + } + } else { + $a[self::FIELD_DERIVED_FROM] = $v; + } } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if (null !== ($v = $this->getExperimental())) { - $a[self::FIELD_EXPERIMENTAL] = $v->getValue(); - $a[self::FIELD_EXPERIMENTAL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EXPERIMENTAL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EXPERIMENTAL_EXT] = $enc; + } + } else { + $a[self::FIELD_EXPERIMENTAL] = $v; + } } if (null !== ($v = $this->getExpression())) { - $a[self::FIELD_EXPRESSION] = $v->getValue(); - $a[self::FIELD_EXPRESSION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EXPRESSION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EXPRESSION_EXT] = $enc; + } + } else { + $a[self::FIELD_EXPRESSION] = $v; + } } if ([] !== ($vs = $this->getJurisdiction())) { $a[self::FIELD_JURISDICTION] = $vs; } if ([] !== ($vs = $this->getModifier())) { - $a[self::FIELD_MODIFIER] = $vs; + $a[self::FIELD_MODIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_MODIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_MODIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_MODIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_MODIFIER][] = $v; + } + } } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if (null !== ($v = $this->getPublisher())) { - $a[self::FIELD_PUBLISHER] = $v->getValue(); - $a[self::FIELD_PUBLISHER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PUBLISHER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PUBLISHER_EXT] = $enc; + } + } else { + $a[self::FIELD_PUBLISHER] = $v; + } } if (null !== ($v = $this->getPurpose())) { - $a[self::FIELD_PURPOSE] = $v->getValue(); - $a[self::FIELD_PURPOSE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PURPOSE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PURPOSE_EXT] = $enc; + } + } else { + $a[self::FIELD_PURPOSE] = $v; + } } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if ([] !== ($vs = $this->getTarget())) { $a[self::FIELD_TARGET] = $vs; } if (null !== ($v = $this->getType())) { - $a[self::FIELD_TYPE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TYPE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TYPE_EXT] = $enc; + } + } else { + $a[self::FIELD_TYPE] = $v; + } } if (null !== ($v = $this->getUrl())) { - $a[self::FIELD_URL] = $v->getValue(); - $a[self::FIELD_URL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_URL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_URL_EXT] = $enc; + } + } else { + $a[self::FIELD_URL] = $v; + } } if ([] !== ($vs = $this->getUseContext())) { $a[self::FIELD_USE_CONTEXT] = $vs; } if (null !== ($v = $this->getVersion())) { - $a[self::FIELD_VERSION] = $v->getValue(); - $a[self::FIELD_VERSION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VERSION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VERSION_EXT] = $enc; + } + } else { + $a[self::FIELD_VERSION] = $v; + } } if (null !== ($v = $this->getXpath())) { - $a[self::FIELD_XPATH] = $v->getValue(); - $a[self::FIELD_XPATH_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_XPATH] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_XPATH_EXT] = $enc; + } + } else { + $a[self::FIELD_XPATH] = $v; + } } if (null !== ($v = $this->getXpathUsage())) { - $a[self::FIELD_XPATH_USAGE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_XPATH_USAGE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_XPATH_USAGE_EXT] = $enc; + } + } else { + $a[self::FIELD_XPATH_USAGE] = $v; + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRSequence.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRSequence.php index 6440666674..92514f4467 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRSequence.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRSequence.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -88,10 +88,6 @@ class FHIRSequence extends FHIRDomainResource implements PHPFHIRContainedTypeInt { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SEQUENCE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_COORDINATE_SYSTEM = 'coordinateSystem'; const FIELD_COORDINATE_SYSTEM_EXT = '_coordinateSystem'; const FIELD_DEVICE = 'device'; @@ -288,6 +284,9 @@ class FHIRSequence extends FHIRDomainResource implements PHPFHIRContainedTypeInt */ protected $variant = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSequence Constructor * @param null|array $data @@ -310,8 +309,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_COORDINATE_SYSTEM] instanceof FHIRInteger) { $this->setCoordinateSystem($data[self::FIELD_COORDINATE_SYSTEM]); - } elseif ($ext && is_scalar($data[self::FIELD_COORDINATE_SYSTEM])) { - $this->setCoordinateSystem(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_COORDINATE_SYSTEM]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_COORDINATE_SYSTEM])) { + $this->setCoordinateSystem(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_COORDINATE_SYSTEM]] + $ext)); + } else if (is_array($data[self::FIELD_COORDINATE_SYSTEM])) { + $this->setCoordinateSystem(new FHIRInteger(array_merge($ext, $data[self::FIELD_COORDINATE_SYSTEM]))); + } } else { $this->setCoordinateSystem(new FHIRInteger($data[self::FIELD_COORDINATE_SYSTEM])); } @@ -329,17 +332,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -351,8 +361,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_OBSERVED_SEQ] instanceof FHIRString) { $this->setObservedSeq($data[self::FIELD_OBSERVED_SEQ]); - } elseif ($ext && is_scalar($data[self::FIELD_OBSERVED_SEQ])) { - $this->setObservedSeq(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_OBSERVED_SEQ]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_OBSERVED_SEQ])) { + $this->setObservedSeq(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_OBSERVED_SEQ]] + $ext)); + } else if (is_array($data[self::FIELD_OBSERVED_SEQ])) { + $this->setObservedSeq(new FHIRString(array_merge($ext, $data[self::FIELD_OBSERVED_SEQ]))); + } } else { $this->setObservedSeq(new FHIRString($data[self::FIELD_OBSERVED_SEQ])); } @@ -374,6 +388,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_POINTER])) { if (is_array($data[self::FIELD_POINTER])) { foreach($data[self::FIELD_POINTER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addPointer($v); } else { @@ -389,6 +406,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_QUALITY])) { if (is_array($data[self::FIELD_QUALITY])) { foreach($data[self::FIELD_QUALITY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRSequenceQuality) { $this->addQuality($v); } else { @@ -407,8 +427,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_QUANTITY] instanceof FHIRQuantity) { $this->setQuantity($data[self::FIELD_QUANTITY]); - } elseif ($ext && is_scalar($data[self::FIELD_QUANTITY])) { - $this->setQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_QUANTITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_QUANTITY])) { + $this->setQuantity(new FHIRQuantity([FHIRQuantity::FIELD_VALUE => $data[self::FIELD_QUANTITY]] + $ext)); + } else if (is_array($data[self::FIELD_QUANTITY])) { + $this->setQuantity(new FHIRQuantity(array_merge($ext, $data[self::FIELD_QUANTITY]))); + } } else { $this->setQuantity(new FHIRQuantity($data[self::FIELD_QUANTITY])); } @@ -419,8 +443,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_READ_COVERAGE] instanceof FHIRInteger) { $this->setReadCoverage($data[self::FIELD_READ_COVERAGE]); - } elseif ($ext && is_scalar($data[self::FIELD_READ_COVERAGE])) { - $this->setReadCoverage(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_READ_COVERAGE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_READ_COVERAGE])) { + $this->setReadCoverage(new FHIRInteger([FHIRInteger::FIELD_VALUE => $data[self::FIELD_READ_COVERAGE]] + $ext)); + } else if (is_array($data[self::FIELD_READ_COVERAGE])) { + $this->setReadCoverage(new FHIRInteger(array_merge($ext, $data[self::FIELD_READ_COVERAGE]))); + } } else { $this->setReadCoverage(new FHIRInteger($data[self::FIELD_READ_COVERAGE])); } @@ -435,6 +463,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REPOSITORY])) { if (is_array($data[self::FIELD_REPOSITORY])) { foreach($data[self::FIELD_REPOSITORY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRSequenceRepository) { $this->addRepository($v); } else { @@ -460,8 +491,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TYPE] instanceof FHIRCode) { $this->setType($data[self::FIELD_TYPE]); - } elseif ($ext && is_scalar($data[self::FIELD_TYPE])) { - $this->setType(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TYPE])) { + $this->setType(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } else if (is_array($data[self::FIELD_TYPE])) { + $this->setType(new FHIRCode(array_merge($ext, $data[self::FIELD_TYPE]))); + } } else { $this->setType(new FHIRCode($data[self::FIELD_TYPE])); } @@ -469,6 +504,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_VARIANT])) { if (is_array($data[self::FIELD_VARIANT])) { foreach($data[self::FIELD_VARIANT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRSequenceVariant) { $this->addVariant($v); } else { @@ -1289,14 +1327,13 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getCoordinateSystem())) { $v->xmlSerialize($sxe->addChild(self::FIELD_COORDINATE_SYSTEM, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDevice())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEVICE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -1308,15 +1345,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getObservedSeq())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OBSERVED_SEQ, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPatient())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATIENT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPerformer())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PERFORMER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getPointer())) { foreach($vs as $v) { if (null === $v) { @@ -1325,7 +1359,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_POINTER, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getQuality())) { foreach($vs as $v) { if (null === $v) { @@ -1334,18 +1367,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_QUALITY, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getQuantity())) { $v->xmlSerialize($sxe->addChild(self::FIELD_QUANTITY, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getReadCoverage())) { $v->xmlSerialize($sxe->addChild(self::FIELD_READ_COVERAGE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getReferenceSeq())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REFERENCE_SEQ, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getRepository())) { foreach($vs as $v) { if (null === $v) { @@ -1354,14 +1384,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_REPOSITORY, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getSpecimen())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SPECIMEN, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getVariant())) { foreach($vs as $v) { if (null === $v) { @@ -1380,18 +1408,48 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getCoordinateSystem())) { - $a[self::FIELD_COORDINATE_SYSTEM] = $v->getValue(); - $a[self::FIELD_COORDINATE_SYSTEM_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_COORDINATE_SYSTEM] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_COORDINATE_SYSTEM_EXT] = $enc; + } + } else { + $a[self::FIELD_COORDINATE_SYSTEM] = $v; + } } if (null !== ($v = $this->getDevice())) { $a[self::FIELD_DEVICE] = $v; } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if (null !== ($v = $this->getObservedSeq())) { - $a[self::FIELD_OBSERVED_SEQ] = $v->getValue(); - $a[self::FIELD_OBSERVED_SEQ_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_OBSERVED_SEQ] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_OBSERVED_SEQ_EXT] = $enc; + } + } else { + $a[self::FIELD_OBSERVED_SEQ] = $v; + } } if (null !== ($v = $this->getPatient())) { $a[self::FIELD_PATIENT] = $v; @@ -1406,11 +1464,26 @@ public function jsonSerialize() $a[self::FIELD_QUALITY] = $vs; } if (null !== ($v = $this->getQuantity())) { - $a[self::FIELD_QUANTITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_QUANTITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_QUANTITY_EXT] = $enc; + } + } else { + $a[self::FIELD_QUANTITY] = $v; + } } if (null !== ($v = $this->getReadCoverage())) { - $a[self::FIELD_READ_COVERAGE] = $v->getValue(); - $a[self::FIELD_READ_COVERAGE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_READ_COVERAGE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_READ_COVERAGE_EXT] = $enc; + } + } else { + $a[self::FIELD_READ_COVERAGE] = $v; + } } if (null !== ($v = $this->getReferenceSeq())) { $a[self::FIELD_REFERENCE_SEQ] = $v; @@ -1422,8 +1495,15 @@ public function jsonSerialize() $a[self::FIELD_SPECIMEN] = $v; } if (null !== ($v = $this->getType())) { - $a[self::FIELD_TYPE] = $v->getValue(); - $a[self::FIELD_TYPE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TYPE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TYPE_EXT] = $enc; + } + } else { + $a[self::FIELD_TYPE] = $v; + } } if ([] !== ($vs = $this->getVariant())) { $a[self::FIELD_VARIANT] = $vs; diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRServiceDefinition.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRServiceDefinition.php index e2f7a3b94b..7a569b8437 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRServiceDefinition.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRServiceDefinition.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -97,10 +97,6 @@ class FHIRServiceDefinition extends FHIRDomainResource implements PHPFHIRContain { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SERVICE_DEFINITION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_APPROVAL_DATE = 'approvalDate'; const FIELD_APPROVAL_DATE_EXT = '_approvalDate'; const FIELD_CONTACT = 'contact'; @@ -485,6 +481,9 @@ class FHIRServiceDefinition extends FHIRDomainResource implements PHPFHIRContain */ protected $version = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRServiceDefinition Constructor * @param null|array $data @@ -507,8 +506,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_APPROVAL_DATE] instanceof FHIRDate) { $this->setApprovalDate($data[self::FIELD_APPROVAL_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_APPROVAL_DATE])) { - $this->setApprovalDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_APPROVAL_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_APPROVAL_DATE])) { + $this->setApprovalDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_APPROVAL_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_APPROVAL_DATE])) { + $this->setApprovalDate(new FHIRDate(array_merge($ext, $data[self::FIELD_APPROVAL_DATE]))); + } } else { $this->setApprovalDate(new FHIRDate($data[self::FIELD_APPROVAL_DATE])); } @@ -516,6 +519,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CONTACT])) { if (is_array($data[self::FIELD_CONTACT])) { foreach($data[self::FIELD_CONTACT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContactDetail) { $this->addContact($v); } else { @@ -531,6 +537,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CONTRIBUTOR])) { if (is_array($data[self::FIELD_CONTRIBUTOR])) { foreach($data[self::FIELD_CONTRIBUTOR] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContributor) { $this->addContributor($v); } else { @@ -549,8 +558,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_COPYRIGHT] instanceof FHIRMarkdown) { $this->setCopyright($data[self::FIELD_COPYRIGHT]); - } elseif ($ext && is_scalar($data[self::FIELD_COPYRIGHT])) { - $this->setCopyright(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_COPYRIGHT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_COPYRIGHT])) { + $this->setCopyright(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_COPYRIGHT]] + $ext)); + } else if (is_array($data[self::FIELD_COPYRIGHT])) { + $this->setCopyright(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_COPYRIGHT]))); + } } else { $this->setCopyright(new FHIRMarkdown($data[self::FIELD_COPYRIGHT])); } @@ -558,6 +571,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_DATA_REQUIREMENT])) { if (is_array($data[self::FIELD_DATA_REQUIREMENT])) { foreach($data[self::FIELD_DATA_REQUIREMENT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRDataRequirement) { $this->addDataRequirement($v); } else { @@ -576,8 +592,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATE] instanceof FHIRDateTime) { $this->setDate($data[self::FIELD_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_DATE])) { - $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime(array_merge($ext, $data[self::FIELD_DATE]))); + } } else { $this->setDate(new FHIRDateTime($data[self::FIELD_DATE])); } @@ -588,8 +608,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRMarkdown) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRMarkdown($data[self::FIELD_DESCRIPTION])); } @@ -607,8 +631,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EXPERIMENTAL] instanceof FHIRBoolean) { $this->setExperimental($data[self::FIELD_EXPERIMENTAL]); - } elseif ($ext && is_scalar($data[self::FIELD_EXPERIMENTAL])) { - $this->setExperimental(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_EXPERIMENTAL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EXPERIMENTAL])) { + $this->setExperimental(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_EXPERIMENTAL]] + $ext)); + } else if (is_array($data[self::FIELD_EXPERIMENTAL])) { + $this->setExperimental(new FHIRBoolean(array_merge($ext, $data[self::FIELD_EXPERIMENTAL]))); + } } else { $this->setExperimental(new FHIRBoolean($data[self::FIELD_EXPERIMENTAL])); } @@ -619,17 +647,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -638,6 +673,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_JURISDICTION])) { if (is_array($data[self::FIELD_JURISDICTION])) { foreach($data[self::FIELD_JURISDICTION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addJurisdiction($v); } else { @@ -656,8 +694,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_LAST_REVIEW_DATE] instanceof FHIRDate) { $this->setLastReviewDate($data[self::FIELD_LAST_REVIEW_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_LAST_REVIEW_DATE])) { - $this->setLastReviewDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_LAST_REVIEW_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_LAST_REVIEW_DATE])) { + $this->setLastReviewDate(new FHIRDate([FHIRDate::FIELD_VALUE => $data[self::FIELD_LAST_REVIEW_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_LAST_REVIEW_DATE])) { + $this->setLastReviewDate(new FHIRDate(array_merge($ext, $data[self::FIELD_LAST_REVIEW_DATE]))); + } } else { $this->setLastReviewDate(new FHIRDate($data[self::FIELD_LAST_REVIEW_DATE])); } @@ -668,8 +710,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -687,8 +733,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PUBLISHER] instanceof FHIRString) { $this->setPublisher($data[self::FIELD_PUBLISHER]); - } elseif ($ext && is_scalar($data[self::FIELD_PUBLISHER])) { - $this->setPublisher(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PUBLISHER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PUBLISHER])) { + $this->setPublisher(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PUBLISHER]] + $ext)); + } else if (is_array($data[self::FIELD_PUBLISHER])) { + $this->setPublisher(new FHIRString(array_merge($ext, $data[self::FIELD_PUBLISHER]))); + } } else { $this->setPublisher(new FHIRString($data[self::FIELD_PUBLISHER])); } @@ -699,8 +749,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PURPOSE] instanceof FHIRMarkdown) { $this->setPurpose($data[self::FIELD_PURPOSE]); - } elseif ($ext && is_scalar($data[self::FIELD_PURPOSE])) { - $this->setPurpose(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_PURPOSE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PURPOSE])) { + $this->setPurpose(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_PURPOSE]] + $ext)); + } else if (is_array($data[self::FIELD_PURPOSE])) { + $this->setPurpose(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_PURPOSE]))); + } } else { $this->setPurpose(new FHIRMarkdown($data[self::FIELD_PURPOSE])); } @@ -708,6 +762,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_RELATED_ARTIFACT])) { if (is_array($data[self::FIELD_RELATED_ARTIFACT])) { foreach($data[self::FIELD_RELATED_ARTIFACT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRRelatedArtifact) { $this->addRelatedArtifact($v); } else { @@ -726,8 +783,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRPublicationStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRPublicationStatus([FHIRPublicationStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRPublicationStatus([FHIRPublicationStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRPublicationStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRPublicationStatus($data[self::FIELD_STATUS])); } @@ -738,8 +799,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TITLE] instanceof FHIRString) { $this->setTitle($data[self::FIELD_TITLE]); - } elseif ($ext && is_scalar($data[self::FIELD_TITLE])) { - $this->setTitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TITLE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TITLE])) { + $this->setTitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TITLE]] + $ext)); + } else if (is_array($data[self::FIELD_TITLE])) { + $this->setTitle(new FHIRString(array_merge($ext, $data[self::FIELD_TITLE]))); + } } else { $this->setTitle(new FHIRString($data[self::FIELD_TITLE])); } @@ -747,6 +812,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_TOPIC])) { if (is_array($data[self::FIELD_TOPIC])) { foreach($data[self::FIELD_TOPIC] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addTopic($v); } else { @@ -762,6 +830,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_TRIGGER])) { if (is_array($data[self::FIELD_TRIGGER])) { foreach($data[self::FIELD_TRIGGER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRTriggerDefinition) { $this->addTrigger($v); } else { @@ -780,8 +851,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_URL] instanceof FHIRUri) { $this->setUrl($data[self::FIELD_URL]); - } elseif ($ext && is_scalar($data[self::FIELD_URL])) { - $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } else if (is_array($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri(array_merge($ext, $data[self::FIELD_URL]))); + } } else { $this->setUrl(new FHIRUri($data[self::FIELD_URL])); } @@ -792,8 +867,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_USAGE] instanceof FHIRString) { $this->setUsage($data[self::FIELD_USAGE]); - } elseif ($ext && is_scalar($data[self::FIELD_USAGE])) { - $this->setUsage(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_USAGE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_USAGE])) { + $this->setUsage(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_USAGE]] + $ext)); + } else if (is_array($data[self::FIELD_USAGE])) { + $this->setUsage(new FHIRString(array_merge($ext, $data[self::FIELD_USAGE]))); + } } else { $this->setUsage(new FHIRString($data[self::FIELD_USAGE])); } @@ -801,6 +880,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_USE_CONTEXT])) { if (is_array($data[self::FIELD_USE_CONTEXT])) { foreach($data[self::FIELD_USE_CONTEXT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRUsageContext) { $this->addUseContext($v); } else { @@ -819,8 +901,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VERSION] instanceof FHIRString) { $this->setVersion($data[self::FIELD_VERSION]); - } elseif ($ext && is_scalar($data[self::FIELD_VERSION])) { - $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } else if (is_array($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString(array_merge($ext, $data[self::FIELD_VERSION]))); + } } else { $this->setVersion(new FHIRString($data[self::FIELD_VERSION])); } @@ -2312,10 +2398,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getApprovalDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_APPROVAL_DATE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getContact())) { foreach($vs as $v) { if (null === $v) { @@ -2324,7 +2410,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_CONTACT, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getContributor())) { foreach($vs as $v) { if (null === $v) { @@ -2336,7 +2421,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getCopyright())) { $v->xmlSerialize($sxe->addChild(self::FIELD_COPYRIGHT, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getDataRequirement())) { foreach($vs as $v) { if (null === $v) { @@ -2351,14 +2435,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESCRIPTION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getEffectivePeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EFFECTIVE_PERIOD, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getExperimental())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EXPERIMENTAL, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -2367,7 +2449,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getJurisdiction())) { foreach($vs as $v) { if (null === $v) { @@ -2382,7 +2463,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NAME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOperationDefinition())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OPERATION_DEFINITION, null, $v->_getFHIRXMLNamespace())); } @@ -2392,7 +2472,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getPurpose())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PURPOSE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getRelatedArtifact())) { foreach($vs as $v) { if (null === $v) { @@ -2401,14 +2480,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_RELATED_ARTIFACT, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getTitle())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TITLE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getTopic())) { foreach($vs as $v) { if (null === $v) { @@ -2417,7 +2494,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_TOPIC, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getTrigger())) { foreach($vs as $v) { if (null === $v) { @@ -2432,7 +2508,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getUsage())) { $v->xmlSerialize($sxe->addChild(self::FIELD_USAGE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getUseContext())) { foreach($vs as $v) { if (null === $v) { @@ -2454,8 +2529,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getApprovalDate())) { - $a[self::FIELD_APPROVAL_DATE] = $v->getValue(); - $a[self::FIELD_APPROVAL_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_APPROVAL_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_APPROVAL_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_APPROVAL_DATE] = $v; + } } if ([] !== ($vs = $this->getContact())) { $a[self::FIELD_CONTACT] = $vs; @@ -2464,61 +2546,148 @@ public function jsonSerialize() $a[self::FIELD_CONTRIBUTOR] = $vs; } if (null !== ($v = $this->getCopyright())) { - $a[self::FIELD_COPYRIGHT] = $v->getValue(); - $a[self::FIELD_COPYRIGHT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_COPYRIGHT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_COPYRIGHT_EXT] = $enc; + } + } else { + $a[self::FIELD_COPYRIGHT] = $v; + } } if ([] !== ($vs = $this->getDataRequirement())) { $a[self::FIELD_DATA_REQUIREMENT] = $vs; } if (null !== ($v = $this->getDate())) { - $a[self::FIELD_DATE] = $v->getValue(); - $a[self::FIELD_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_DATE] = $v; + } } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if (null !== ($v = $this->getEffectivePeriod())) { $a[self::FIELD_EFFECTIVE_PERIOD] = $v; } if (null !== ($v = $this->getExperimental())) { - $a[self::FIELD_EXPERIMENTAL] = $v->getValue(); - $a[self::FIELD_EXPERIMENTAL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EXPERIMENTAL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EXPERIMENTAL_EXT] = $enc; + } + } else { + $a[self::FIELD_EXPERIMENTAL] = $v; + } } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if ([] !== ($vs = $this->getJurisdiction())) { $a[self::FIELD_JURISDICTION] = $vs; } if (null !== ($v = $this->getLastReviewDate())) { - $a[self::FIELD_LAST_REVIEW_DATE] = $v->getValue(); - $a[self::FIELD_LAST_REVIEW_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_LAST_REVIEW_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_LAST_REVIEW_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_LAST_REVIEW_DATE] = $v; + } } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if (null !== ($v = $this->getOperationDefinition())) { $a[self::FIELD_OPERATION_DEFINITION] = $v; } if (null !== ($v = $this->getPublisher())) { - $a[self::FIELD_PUBLISHER] = $v->getValue(); - $a[self::FIELD_PUBLISHER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PUBLISHER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PUBLISHER_EXT] = $enc; + } + } else { + $a[self::FIELD_PUBLISHER] = $v; + } } if (null !== ($v = $this->getPurpose())) { - $a[self::FIELD_PURPOSE] = $v->getValue(); - $a[self::FIELD_PURPOSE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PURPOSE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PURPOSE_EXT] = $enc; + } + } else { + $a[self::FIELD_PURPOSE] = $v; + } } if ([] !== ($vs = $this->getRelatedArtifact())) { $a[self::FIELD_RELATED_ARTIFACT] = $vs; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getTitle())) { - $a[self::FIELD_TITLE] = $v->getValue(); - $a[self::FIELD_TITLE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TITLE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TITLE_EXT] = $enc; + } + } else { + $a[self::FIELD_TITLE] = $v; + } } if ([] !== ($vs = $this->getTopic())) { $a[self::FIELD_TOPIC] = $vs; @@ -2527,19 +2696,40 @@ public function jsonSerialize() $a[self::FIELD_TRIGGER] = $vs; } if (null !== ($v = $this->getUrl())) { - $a[self::FIELD_URL] = $v->getValue(); - $a[self::FIELD_URL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_URL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_URL_EXT] = $enc; + } + } else { + $a[self::FIELD_URL] = $v; + } } if (null !== ($v = $this->getUsage())) { - $a[self::FIELD_USAGE] = $v->getValue(); - $a[self::FIELD_USAGE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_USAGE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_USAGE_EXT] = $enc; + } + } else { + $a[self::FIELD_USAGE] = $v; + } } if ([] !== ($vs = $this->getUseContext())) { $a[self::FIELD_USE_CONTEXT] = $vs; } if (null !== ($v = $this->getVersion())) { - $a[self::FIELD_VERSION] = $v->getValue(); - $a[self::FIELD_VERSION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VERSION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VERSION_EXT] = $enc; + } + } else { + $a[self::FIELD_VERSION] = $v; + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRSlot.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRSlot.php index 88eef4304f..174ad8198f 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRSlot.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRSlot.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -85,10 +85,6 @@ class FHIRSlot extends FHIRDomainResource implements PHPFHIRContainedTypeInterfa { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SLOT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_APPOINTMENT_TYPE = 'appointmentType'; const FIELD_COMMENT = 'comment'; const FIELD_COMMENT_EXT = '_comment'; @@ -242,6 +238,9 @@ class FHIRSlot extends FHIRDomainResource implements PHPFHIRContainedTypeInterfa */ protected $status = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSlot Constructor * @param null|array $data @@ -271,8 +270,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_COMMENT] instanceof FHIRString) { $this->setComment($data[self::FIELD_COMMENT]); - } elseif ($ext && is_scalar($data[self::FIELD_COMMENT])) { - $this->setComment(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_COMMENT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_COMMENT])) { + $this->setComment(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_COMMENT]] + $ext)); + } else if (is_array($data[self::FIELD_COMMENT])) { + $this->setComment(new FHIRString(array_merge($ext, $data[self::FIELD_COMMENT]))); + } } else { $this->setComment(new FHIRString($data[self::FIELD_COMMENT])); } @@ -283,8 +286,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_END] instanceof FHIRInstant) { $this->setEnd($data[self::FIELD_END]); - } elseif ($ext && is_scalar($data[self::FIELD_END])) { - $this->setEnd(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_END]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_END])) { + $this->setEnd(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_END]] + $ext)); + } else if (is_array($data[self::FIELD_END])) { + $this->setEnd(new FHIRInstant(array_merge($ext, $data[self::FIELD_END]))); + } } else { $this->setEnd(new FHIRInstant($data[self::FIELD_END])); } @@ -295,17 +302,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -317,8 +331,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_OVERBOOKED] instanceof FHIRBoolean) { $this->setOverbooked($data[self::FIELD_OVERBOOKED]); - } elseif ($ext && is_scalar($data[self::FIELD_OVERBOOKED])) { - $this->setOverbooked(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_OVERBOOKED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_OVERBOOKED])) { + $this->setOverbooked(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_OVERBOOKED]] + $ext)); + } else if (is_array($data[self::FIELD_OVERBOOKED])) { + $this->setOverbooked(new FHIRBoolean(array_merge($ext, $data[self::FIELD_OVERBOOKED]))); + } } else { $this->setOverbooked(new FHIRBoolean($data[self::FIELD_OVERBOOKED])); } @@ -340,6 +358,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SERVICE_TYPE])) { if (is_array($data[self::FIELD_SERVICE_TYPE])) { foreach($data[self::FIELD_SERVICE_TYPE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addServiceType($v); } else { @@ -355,6 +376,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SPECIALTY])) { if (is_array($data[self::FIELD_SPECIALTY])) { foreach($data[self::FIELD_SPECIALTY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addSpecialty($v); } else { @@ -373,8 +397,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_START] instanceof FHIRInstant) { $this->setStart($data[self::FIELD_START]); - } elseif ($ext && is_scalar($data[self::FIELD_START])) { - $this->setStart(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_START]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_START])) { + $this->setStart(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_START]] + $ext)); + } else if (is_array($data[self::FIELD_START])) { + $this->setStart(new FHIRInstant(array_merge($ext, $data[self::FIELD_START]))); + } } else { $this->setStart(new FHIRInstant($data[self::FIELD_START])); } @@ -385,8 +413,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRSlotStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRSlotStatus([FHIRSlotStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRSlotStatus([FHIRSlotStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRSlotStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRSlotStatus($data[self::FIELD_STATUS])); } @@ -1035,7 +1067,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getEnd())) { $v->xmlSerialize($sxe->addChild(self::FIELD_END, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -1047,15 +1078,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getOverbooked())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OVERBOOKED, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSchedule())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SCHEDULE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getServiceCategory())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SERVICE_CATEGORY, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getServiceType())) { foreach($vs as $v) { if (null === $v) { @@ -1064,7 +1092,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_SERVICE_TYPE, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getSpecialty())) { foreach($vs as $v) { if (null === $v) { @@ -1076,7 +1103,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getStart())) { $v->xmlSerialize($sxe->addChild(self::FIELD_START, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } @@ -1093,19 +1119,56 @@ public function jsonSerialize() $a[self::FIELD_APPOINTMENT_TYPE] = $v; } if (null !== ($v = $this->getComment())) { - $a[self::FIELD_COMMENT] = $v->getValue(); - $a[self::FIELD_COMMENT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_COMMENT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_COMMENT_EXT] = $enc; + } + } else { + $a[self::FIELD_COMMENT] = $v; + } } if (null !== ($v = $this->getEnd())) { - $a[self::FIELD_END] = $v->getValue(); - $a[self::FIELD_END_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_END] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_END_EXT] = $enc; + } + } else { + $a[self::FIELD_END] = $v; + } } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if (null !== ($v = $this->getOverbooked())) { - $a[self::FIELD_OVERBOOKED] = $v->getValue(); - $a[self::FIELD_OVERBOOKED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_OVERBOOKED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_OVERBOOKED_EXT] = $enc; + } + } else { + $a[self::FIELD_OVERBOOKED] = $v; + } } if (null !== ($v = $this->getSchedule())) { $a[self::FIELD_SCHEDULE] = $v; @@ -1120,11 +1183,26 @@ public function jsonSerialize() $a[self::FIELD_SPECIALTY] = $vs; } if (null !== ($v = $this->getStart())) { - $a[self::FIELD_START] = $v->getValue(); - $a[self::FIELD_START_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_START] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_START_EXT] = $enc; + } + } else { + $a[self::FIELD_START] = $v; + } } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRSpecimen.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRSpecimen.php index f349a90521..6a2e61deab 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRSpecimen.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRSpecimen.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -87,10 +87,6 @@ class FHIRSpecimen extends FHIRDomainResource implements PHPFHIRContainedTypeInt { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SPECIMEN; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ACCESSION_IDENTIFIER = 'accessionIdentifier'; const FIELD_ACCESSION_IDENTIFIER_EXT = '_accessionIdentifier'; const FIELD_COLLECTION = 'collection'; @@ -245,6 +241,9 @@ class FHIRSpecimen extends FHIRDomainResource implements PHPFHIRContainedTypeInt */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSpecimen Constructor * @param null|array $data @@ -267,8 +266,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ACCESSION_IDENTIFIER] instanceof FHIRIdentifier) { $this->setAccessionIdentifier($data[self::FIELD_ACCESSION_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_ACCESSION_IDENTIFIER])) { - $this->setAccessionIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_ACCESSION_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ACCESSION_IDENTIFIER])) { + $this->setAccessionIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_ACCESSION_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_ACCESSION_IDENTIFIER])) { + $this->setAccessionIdentifier(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_ACCESSION_IDENTIFIER]))); + } } else { $this->setAccessionIdentifier(new FHIRIdentifier($data[self::FIELD_ACCESSION_IDENTIFIER])); } @@ -283,6 +286,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CONTAINER])) { if (is_array($data[self::FIELD_CONTAINER])) { foreach($data[self::FIELD_CONTAINER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRSpecimenContainer) { $this->addContainer($v); } else { @@ -301,17 +307,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -320,6 +333,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_NOTE])) { if (is_array($data[self::FIELD_NOTE])) { foreach($data[self::FIELD_NOTE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRAnnotation) { $this->addNote($v); } else { @@ -335,6 +351,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PARENT])) { if (is_array($data[self::FIELD_PARENT])) { foreach($data[self::FIELD_PARENT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addParent($v); } else { @@ -350,6 +369,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PROCESSING])) { if (is_array($data[self::FIELD_PROCESSING])) { foreach($data[self::FIELD_PROCESSING] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRSpecimenProcessing) { $this->addProcessing($v); } else { @@ -368,8 +390,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_RECEIVED_TIME] instanceof FHIRDateTime) { $this->setReceivedTime($data[self::FIELD_RECEIVED_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_RECEIVED_TIME])) { - $this->setReceivedTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_RECEIVED_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_RECEIVED_TIME])) { + $this->setReceivedTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_RECEIVED_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_RECEIVED_TIME])) { + $this->setReceivedTime(new FHIRDateTime(array_merge($ext, $data[self::FIELD_RECEIVED_TIME]))); + } } else { $this->setReceivedTime(new FHIRDateTime($data[self::FIELD_RECEIVED_TIME])); } @@ -377,6 +403,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_REQUEST])) { if (is_array($data[self::FIELD_REQUEST])) { foreach($data[self::FIELD_REQUEST] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addRequest($v); } else { @@ -395,8 +424,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRSpecimenStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRSpecimenStatus([FHIRSpecimenStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRSpecimenStatus([FHIRSpecimenStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRSpecimenStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRSpecimenStatus($data[self::FIELD_STATUS])); } @@ -1114,11 +1147,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getAccessionIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ACCESSION_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getCollection())) { $v->xmlSerialize($sxe->addChild(self::FIELD_COLLECTION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getContainer())) { foreach($vs as $v) { if (null === $v) { @@ -1127,7 +1158,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_CONTAINER, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -1136,7 +1166,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getNote())) { foreach($vs as $v) { if (null === $v) { @@ -1145,7 +1174,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_NOTE, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getParent())) { foreach($vs as $v) { if (null === $v) { @@ -1154,7 +1182,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_PARENT, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getProcessing())) { foreach($vs as $v) { if (null === $v) { @@ -1166,7 +1193,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getReceivedTime())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RECEIVED_TIME, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getRequest())) { foreach($vs as $v) { if (null === $v) { @@ -1175,15 +1201,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_REQUEST, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSubject())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUBJECT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -1197,7 +1220,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getAccessionIdentifier())) { - $a[self::FIELD_ACCESSION_IDENTIFIER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ACCESSION_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ACCESSION_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_ACCESSION_IDENTIFIER] = $v; + } } if (null !== ($v = $this->getCollection())) { $a[self::FIELD_COLLECTION] = $v; @@ -1206,7 +1237,23 @@ public function jsonSerialize() $a[self::FIELD_CONTAINER] = $vs; } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if ([] !== ($vs = $this->getNote())) { $a[self::FIELD_NOTE] = $vs; @@ -1218,14 +1265,29 @@ public function jsonSerialize() $a[self::FIELD_PROCESSING] = $vs; } if (null !== ($v = $this->getReceivedTime())) { - $a[self::FIELD_RECEIVED_TIME] = $v->getValue(); - $a[self::FIELD_RECEIVED_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_RECEIVED_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_RECEIVED_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_RECEIVED_TIME] = $v; + } } if ([] !== ($vs = $this->getRequest())) { $a[self::FIELD_REQUEST] = $vs; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getSubject())) { $a[self::FIELD_SUBJECT] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRStructureDefinition.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRStructureDefinition.php index 94d2705886..883013358e 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRStructureDefinition.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRStructureDefinition.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -99,10 +99,6 @@ class FHIRStructureDefinition extends FHIRDomainResource implements PHPFHIRConta { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_STRUCTURE_DEFINITION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_ABSTRACT = 'abstract'; const FIELD_ABSTRACT_EXT = '_abstract'; const FIELD_BASE_DEFINITION = 'baseDefinition'; @@ -527,6 +523,9 @@ class FHIRStructureDefinition extends FHIRDomainResource implements PHPFHIRConta */ protected $version = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRStructureDefinition Constructor * @param null|array $data @@ -549,8 +548,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ABSTRACT] instanceof FHIRBoolean) { $this->setAbstract($data[self::FIELD_ABSTRACT]); - } elseif ($ext && is_scalar($data[self::FIELD_ABSTRACT])) { - $this->setAbstract(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_ABSTRACT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ABSTRACT])) { + $this->setAbstract(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_ABSTRACT]] + $ext)); + } else if (is_array($data[self::FIELD_ABSTRACT])) { + $this->setAbstract(new FHIRBoolean(array_merge($ext, $data[self::FIELD_ABSTRACT]))); + } } else { $this->setAbstract(new FHIRBoolean($data[self::FIELD_ABSTRACT])); } @@ -561,8 +564,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_BASE_DEFINITION] instanceof FHIRUri) { $this->setBaseDefinition($data[self::FIELD_BASE_DEFINITION]); - } elseif ($ext && is_scalar($data[self::FIELD_BASE_DEFINITION])) { - $this->setBaseDefinition(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_BASE_DEFINITION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_BASE_DEFINITION])) { + $this->setBaseDefinition(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_BASE_DEFINITION]] + $ext)); + } else if (is_array($data[self::FIELD_BASE_DEFINITION])) { + $this->setBaseDefinition(new FHIRUri(array_merge($ext, $data[self::FIELD_BASE_DEFINITION]))); + } } else { $this->setBaseDefinition(new FHIRUri($data[self::FIELD_BASE_DEFINITION])); } @@ -570,6 +577,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CONTACT])) { if (is_array($data[self::FIELD_CONTACT])) { foreach($data[self::FIELD_CONTACT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContactDetail) { $this->addContact($v); } else { @@ -588,17 +598,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_CONTEXT])) { foreach($data[self::FIELD_CONTEXT] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRString) { $this->addContext($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addContext(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addContext(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addContext(new FHIRString(array_merge($v, $ext[$i]))); + } } else { $this->addContext(new FHIRString($v)); } } } elseif ($data[self::FIELD_CONTEXT] instanceof FHIRString) { $this->addContext($data[self::FIELD_CONTEXT]); - } elseif ($ext && is_scalar($data[self::FIELD_CONTEXT])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_CONTEXT])) { $this->addContext(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_CONTEXT]] + $ext)); } else { $this->addContext(new FHIRString($data[self::FIELD_CONTEXT])); @@ -610,17 +627,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_CONTEXT_INVARIANT])) { foreach($data[self::FIELD_CONTEXT_INVARIANT] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRString) { $this->addContextInvariant($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addContextInvariant(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addContextInvariant(new FHIRString([FHIRString::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addContextInvariant(new FHIRString(array_merge($v, $ext[$i]))); + } } else { $this->addContextInvariant(new FHIRString($v)); } } } elseif ($data[self::FIELD_CONTEXT_INVARIANT] instanceof FHIRString) { $this->addContextInvariant($data[self::FIELD_CONTEXT_INVARIANT]); - } elseif ($ext && is_scalar($data[self::FIELD_CONTEXT_INVARIANT])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_CONTEXT_INVARIANT])) { $this->addContextInvariant(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_CONTEXT_INVARIANT]] + $ext)); } else { $this->addContextInvariant(new FHIRString($data[self::FIELD_CONTEXT_INVARIANT])); @@ -632,8 +656,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CONTEXT_TYPE] instanceof FHIRExtensionContext) { $this->setContextType($data[self::FIELD_CONTEXT_TYPE]); - } elseif ($ext && is_scalar($data[self::FIELD_CONTEXT_TYPE])) { - $this->setContextType(new FHIRExtensionContext([FHIRExtensionContext::FIELD_VALUE => $data[self::FIELD_CONTEXT_TYPE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CONTEXT_TYPE])) { + $this->setContextType(new FHIRExtensionContext([FHIRExtensionContext::FIELD_VALUE => $data[self::FIELD_CONTEXT_TYPE]] + $ext)); + } else if (is_array($data[self::FIELD_CONTEXT_TYPE])) { + $this->setContextType(new FHIRExtensionContext(array_merge($ext, $data[self::FIELD_CONTEXT_TYPE]))); + } } else { $this->setContextType(new FHIRExtensionContext($data[self::FIELD_CONTEXT_TYPE])); } @@ -644,8 +672,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_COPYRIGHT] instanceof FHIRMarkdown) { $this->setCopyright($data[self::FIELD_COPYRIGHT]); - } elseif ($ext && is_scalar($data[self::FIELD_COPYRIGHT])) { - $this->setCopyright(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_COPYRIGHT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_COPYRIGHT])) { + $this->setCopyright(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_COPYRIGHT]] + $ext)); + } else if (is_array($data[self::FIELD_COPYRIGHT])) { + $this->setCopyright(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_COPYRIGHT]))); + } } else { $this->setCopyright(new FHIRMarkdown($data[self::FIELD_COPYRIGHT])); } @@ -656,8 +688,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATE] instanceof FHIRDateTime) { $this->setDate($data[self::FIELD_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_DATE])) { - $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime(array_merge($ext, $data[self::FIELD_DATE]))); + } } else { $this->setDate(new FHIRDateTime($data[self::FIELD_DATE])); } @@ -668,8 +704,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DERIVATION] instanceof FHIRTypeDerivationRule) { $this->setDerivation($data[self::FIELD_DERIVATION]); - } elseif ($ext && is_scalar($data[self::FIELD_DERIVATION])) { - $this->setDerivation(new FHIRTypeDerivationRule([FHIRTypeDerivationRule::FIELD_VALUE => $data[self::FIELD_DERIVATION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DERIVATION])) { + $this->setDerivation(new FHIRTypeDerivationRule([FHIRTypeDerivationRule::FIELD_VALUE => $data[self::FIELD_DERIVATION]] + $ext)); + } else if (is_array($data[self::FIELD_DERIVATION])) { + $this->setDerivation(new FHIRTypeDerivationRule(array_merge($ext, $data[self::FIELD_DERIVATION]))); + } } else { $this->setDerivation(new FHIRTypeDerivationRule($data[self::FIELD_DERIVATION])); } @@ -680,8 +720,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRMarkdown) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRMarkdown($data[self::FIELD_DESCRIPTION])); } @@ -699,8 +743,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EXPERIMENTAL] instanceof FHIRBoolean) { $this->setExperimental($data[self::FIELD_EXPERIMENTAL]); - } elseif ($ext && is_scalar($data[self::FIELD_EXPERIMENTAL])) { - $this->setExperimental(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_EXPERIMENTAL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EXPERIMENTAL])) { + $this->setExperimental(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_EXPERIMENTAL]] + $ext)); + } else if (is_array($data[self::FIELD_EXPERIMENTAL])) { + $this->setExperimental(new FHIRBoolean(array_merge($ext, $data[self::FIELD_EXPERIMENTAL]))); + } } else { $this->setExperimental(new FHIRBoolean($data[self::FIELD_EXPERIMENTAL])); } @@ -711,8 +759,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_FHIR_VERSION] instanceof FHIRId) { $this->setFhirVersion($data[self::FIELD_FHIR_VERSION]); - } elseif ($ext && is_scalar($data[self::FIELD_FHIR_VERSION])) { - $this->setFhirVersion(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_FHIR_VERSION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_FHIR_VERSION])) { + $this->setFhirVersion(new FHIRId([FHIRId::FIELD_VALUE => $data[self::FIELD_FHIR_VERSION]] + $ext)); + } else if (is_array($data[self::FIELD_FHIR_VERSION])) { + $this->setFhirVersion(new FHIRId(array_merge($ext, $data[self::FIELD_FHIR_VERSION]))); + } } else { $this->setFhirVersion(new FHIRId($data[self::FIELD_FHIR_VERSION])); } @@ -723,17 +775,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -742,6 +801,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_JURISDICTION])) { if (is_array($data[self::FIELD_JURISDICTION])) { foreach($data[self::FIELD_JURISDICTION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addJurisdiction($v); } else { @@ -757,6 +819,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_KEYWORD])) { if (is_array($data[self::FIELD_KEYWORD])) { foreach($data[self::FIELD_KEYWORD] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCoding) { $this->addKeyword($v); } else { @@ -775,8 +840,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_KIND] instanceof FHIRStructureDefinitionKind) { $this->setKind($data[self::FIELD_KIND]); - } elseif ($ext && is_scalar($data[self::FIELD_KIND])) { - $this->setKind(new FHIRStructureDefinitionKind([FHIRStructureDefinitionKind::FIELD_VALUE => $data[self::FIELD_KIND]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_KIND])) { + $this->setKind(new FHIRStructureDefinitionKind([FHIRStructureDefinitionKind::FIELD_VALUE => $data[self::FIELD_KIND]] + $ext)); + } else if (is_array($data[self::FIELD_KIND])) { + $this->setKind(new FHIRStructureDefinitionKind(array_merge($ext, $data[self::FIELD_KIND]))); + } } else { $this->setKind(new FHIRStructureDefinitionKind($data[self::FIELD_KIND])); } @@ -784,6 +853,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_MAPPING])) { if (is_array($data[self::FIELD_MAPPING])) { foreach($data[self::FIELD_MAPPING] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRStructureDefinitionMapping) { $this->addMapping($v); } else { @@ -802,8 +874,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -814,8 +890,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PUBLISHER] instanceof FHIRString) { $this->setPublisher($data[self::FIELD_PUBLISHER]); - } elseif ($ext && is_scalar($data[self::FIELD_PUBLISHER])) { - $this->setPublisher(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PUBLISHER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PUBLISHER])) { + $this->setPublisher(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PUBLISHER]] + $ext)); + } else if (is_array($data[self::FIELD_PUBLISHER])) { + $this->setPublisher(new FHIRString(array_merge($ext, $data[self::FIELD_PUBLISHER]))); + } } else { $this->setPublisher(new FHIRString($data[self::FIELD_PUBLISHER])); } @@ -826,8 +906,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PURPOSE] instanceof FHIRMarkdown) { $this->setPurpose($data[self::FIELD_PURPOSE]); - } elseif ($ext && is_scalar($data[self::FIELD_PURPOSE])) { - $this->setPurpose(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_PURPOSE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PURPOSE])) { + $this->setPurpose(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_PURPOSE]] + $ext)); + } else if (is_array($data[self::FIELD_PURPOSE])) { + $this->setPurpose(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_PURPOSE]))); + } } else { $this->setPurpose(new FHIRMarkdown($data[self::FIELD_PURPOSE])); } @@ -845,8 +929,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRPublicationStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRPublicationStatus([FHIRPublicationStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRPublicationStatus([FHIRPublicationStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRPublicationStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRPublicationStatus($data[self::FIELD_STATUS])); } @@ -857,8 +945,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TITLE] instanceof FHIRString) { $this->setTitle($data[self::FIELD_TITLE]); - } elseif ($ext && is_scalar($data[self::FIELD_TITLE])) { - $this->setTitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TITLE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TITLE])) { + $this->setTitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TITLE]] + $ext)); + } else if (is_array($data[self::FIELD_TITLE])) { + $this->setTitle(new FHIRString(array_merge($ext, $data[self::FIELD_TITLE]))); + } } else { $this->setTitle(new FHIRString($data[self::FIELD_TITLE])); } @@ -869,8 +961,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TYPE] instanceof FHIRCode) { $this->setType($data[self::FIELD_TYPE]); - } elseif ($ext && is_scalar($data[self::FIELD_TYPE])) { - $this->setType(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TYPE])) { + $this->setType(new FHIRCode([FHIRCode::FIELD_VALUE => $data[self::FIELD_TYPE]] + $ext)); + } else if (is_array($data[self::FIELD_TYPE])) { + $this->setType(new FHIRCode(array_merge($ext, $data[self::FIELD_TYPE]))); + } } else { $this->setType(new FHIRCode($data[self::FIELD_TYPE])); } @@ -881,8 +977,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_URL] instanceof FHIRUri) { $this->setUrl($data[self::FIELD_URL]); - } elseif ($ext && is_scalar($data[self::FIELD_URL])) { - $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } else if (is_array($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri(array_merge($ext, $data[self::FIELD_URL]))); + } } else { $this->setUrl(new FHIRUri($data[self::FIELD_URL])); } @@ -890,6 +990,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_USE_CONTEXT])) { if (is_array($data[self::FIELD_USE_CONTEXT])) { foreach($data[self::FIELD_USE_CONTEXT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRUsageContext) { $this->addUseContext($v); } else { @@ -908,8 +1011,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VERSION] instanceof FHIRString) { $this->setVersion($data[self::FIELD_VERSION]); - } elseif ($ext && is_scalar($data[self::FIELD_VERSION])) { - $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } else if (is_array($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString(array_merge($ext, $data[self::FIELD_VERSION]))); + } } else { $this->setVersion(new FHIRString($data[self::FIELD_VERSION])); } @@ -2492,13 +2599,13 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getAbstract())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ABSTRACT, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getBaseDefinition())) { $v->xmlSerialize($sxe->addChild(self::FIELD_BASE_DEFINITION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getContact())) { foreach($vs as $v) { if (null === $v) { @@ -2523,7 +2630,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_CONTEXT_INVARIANT, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getContextType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CONTEXT_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -2533,14 +2639,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDate())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DATE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDerivation())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DERIVATION, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getDescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESCRIPTION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDifferential())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DIFFERENTIAL, null, $v->_getFHIRXMLNamespace())); } @@ -2550,7 +2654,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getFhirVersion())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FHIR_VERSION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -2559,7 +2662,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getJurisdiction())) { foreach($vs as $v) { if (null === $v) { @@ -2568,7 +2670,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_JURISDICTION, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getKeyword())) { foreach($vs as $v) { if (null === $v) { @@ -2577,11 +2678,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_KEYWORD, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getKind())) { $v->xmlSerialize($sxe->addChild(self::FIELD_KIND, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getMapping())) { foreach($vs as $v) { if (null === $v) { @@ -2599,11 +2698,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getPurpose())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PURPOSE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSnapshot())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SNAPSHOT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } @@ -2616,7 +2713,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getUrl())) { $v->xmlSerialize($sxe->addChild(self::FIELD_URL, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getUseContext())) { foreach($vs as $v) { if (null === $v) { @@ -2638,12 +2734,26 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getAbstract())) { - $a[self::FIELD_ABSTRACT] = $v->getValue(); - $a[self::FIELD_ABSTRACT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ABSTRACT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ABSTRACT_EXT] = $enc; + } + } else { + $a[self::FIELD_ABSTRACT] = $v; + } } if (null !== ($v = $this->getBaseDefinition())) { - $a[self::FIELD_BASE_DEFINITION] = $v->getValue(); - $a[self::FIELD_BASE_DEFINITION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_BASE_DEFINITION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_BASE_DEFINITION_EXT] = $enc; + } + } else { + $a[self::FIELD_BASE_DEFINITION] = $v; + } } if ([] !== ($vs = $this->getContact())) { $a[self::FIELD_CONTACT] = $vs; @@ -2654,8 +2764,17 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_CONTEXT][] = $v->getValue(); - $a[self::FIELD_CONTEXT_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CONTEXT][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CONTEXT_EXT][] = $enc; + } else { + $a[self::FIELD_CONTEXT_EXT][] = null; + } + } else { + $a[self::FIELD_CONTEXT][] = $v; + } } } if ([] !== ($vs = $this->getContextInvariant())) { @@ -2664,41 +2783,117 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_CONTEXT_INVARIANT][] = $v->getValue(); - $a[self::FIELD_CONTEXT_INVARIANT_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CONTEXT_INVARIANT][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CONTEXT_INVARIANT_EXT][] = $enc; + } else { + $a[self::FIELD_CONTEXT_INVARIANT_EXT][] = null; + } + } else { + $a[self::FIELD_CONTEXT_INVARIANT][] = $v; + } } } if (null !== ($v = $this->getContextType())) { - $a[self::FIELD_CONTEXT_TYPE] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CONTEXT_TYPE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CONTEXT_TYPE_EXT] = $enc; + } + } else { + $a[self::FIELD_CONTEXT_TYPE] = $v; + } } if (null !== ($v = $this->getCopyright())) { - $a[self::FIELD_COPYRIGHT] = $v->getValue(); - $a[self::FIELD_COPYRIGHT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_COPYRIGHT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_COPYRIGHT_EXT] = $enc; + } + } else { + $a[self::FIELD_COPYRIGHT] = $v; + } } if (null !== ($v = $this->getDate())) { - $a[self::FIELD_DATE] = $v->getValue(); - $a[self::FIELD_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_DATE] = $v; + } } if (null !== ($v = $this->getDerivation())) { - $a[self::FIELD_DERIVATION] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DERIVATION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DERIVATION_EXT] = $enc; + } + } else { + $a[self::FIELD_DERIVATION] = $v; + } } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if (null !== ($v = $this->getDifferential())) { $a[self::FIELD_DIFFERENTIAL] = $v; } if (null !== ($v = $this->getExperimental())) { - $a[self::FIELD_EXPERIMENTAL] = $v->getValue(); - $a[self::FIELD_EXPERIMENTAL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EXPERIMENTAL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EXPERIMENTAL_EXT] = $enc; + } + } else { + $a[self::FIELD_EXPERIMENTAL] = $v; + } } if (null !== ($v = $this->getFhirVersion())) { - $a[self::FIELD_FHIR_VERSION] = $v->getValue(); - $a[self::FIELD_FHIR_VERSION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_FHIR_VERSION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_FHIR_VERSION_EXT] = $enc; + } + } else { + $a[self::FIELD_FHIR_VERSION] = $v; + } } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if ([] !== ($vs = $this->getJurisdiction())) { $a[self::FIELD_JURISDICTION] = $vs; @@ -2707,47 +2902,112 @@ public function jsonSerialize() $a[self::FIELD_KEYWORD] = $vs; } if (null !== ($v = $this->getKind())) { - $a[self::FIELD_KIND] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_KIND] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_KIND_EXT] = $enc; + } + } else { + $a[self::FIELD_KIND] = $v; + } } if ([] !== ($vs = $this->getMapping())) { $a[self::FIELD_MAPPING] = $vs; } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if (null !== ($v = $this->getPublisher())) { - $a[self::FIELD_PUBLISHER] = $v->getValue(); - $a[self::FIELD_PUBLISHER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PUBLISHER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PUBLISHER_EXT] = $enc; + } + } else { + $a[self::FIELD_PUBLISHER] = $v; + } } if (null !== ($v = $this->getPurpose())) { - $a[self::FIELD_PURPOSE] = $v->getValue(); - $a[self::FIELD_PURPOSE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PURPOSE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PURPOSE_EXT] = $enc; + } + } else { + $a[self::FIELD_PURPOSE] = $v; + } } if (null !== ($v = $this->getSnapshot())) { $a[self::FIELD_SNAPSHOT] = $v; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getTitle())) { - $a[self::FIELD_TITLE] = $v->getValue(); - $a[self::FIELD_TITLE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TITLE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TITLE_EXT] = $enc; + } + } else { + $a[self::FIELD_TITLE] = $v; + } } if (null !== ($v = $this->getType())) { - $a[self::FIELD_TYPE] = $v->getValue(); - $a[self::FIELD_TYPE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TYPE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TYPE_EXT] = $enc; + } + } else { + $a[self::FIELD_TYPE] = $v; + } } if (null !== ($v = $this->getUrl())) { - $a[self::FIELD_URL] = $v->getValue(); - $a[self::FIELD_URL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_URL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_URL_EXT] = $enc; + } + } else { + $a[self::FIELD_URL] = $v; + } } if ([] !== ($vs = $this->getUseContext())) { $a[self::FIELD_USE_CONTEXT] = $vs; } if (null !== ($v = $this->getVersion())) { - $a[self::FIELD_VERSION] = $v->getValue(); - $a[self::FIELD_VERSION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VERSION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VERSION_EXT] = $enc; + } + } else { + $a[self::FIELD_VERSION] = $v; + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRStructureMap.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRStructureMap.php index e343575b21..0321014607 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRStructureMap.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRStructureMap.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -90,10 +90,6 @@ class FHIRStructureMap extends FHIRDomainResource implements PHPFHIRContainedTyp { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_STRUCTURE_MAP; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CONTACT = 'contact'; const FIELD_COPYRIGHT = 'copyright'; const FIELD_COPYRIGHT_EXT = '_copyright'; @@ -371,6 +367,9 @@ class FHIRStructureMap extends FHIRDomainResource implements PHPFHIRContainedTyp */ protected $version = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRStructureMap Constructor * @param null|array $data @@ -390,6 +389,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CONTACT])) { if (is_array($data[self::FIELD_CONTACT])) { foreach($data[self::FIELD_CONTACT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContactDetail) { $this->addContact($v); } else { @@ -408,8 +410,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_COPYRIGHT] instanceof FHIRMarkdown) { $this->setCopyright($data[self::FIELD_COPYRIGHT]); - } elseif ($ext && is_scalar($data[self::FIELD_COPYRIGHT])) { - $this->setCopyright(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_COPYRIGHT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_COPYRIGHT])) { + $this->setCopyright(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_COPYRIGHT]] + $ext)); + } else if (is_array($data[self::FIELD_COPYRIGHT])) { + $this->setCopyright(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_COPYRIGHT]))); + } } else { $this->setCopyright(new FHIRMarkdown($data[self::FIELD_COPYRIGHT])); } @@ -420,8 +426,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATE] instanceof FHIRDateTime) { $this->setDate($data[self::FIELD_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_DATE])) { - $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime(array_merge($ext, $data[self::FIELD_DATE]))); + } } else { $this->setDate(new FHIRDateTime($data[self::FIELD_DATE])); } @@ -432,8 +442,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRMarkdown) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRMarkdown($data[self::FIELD_DESCRIPTION])); } @@ -444,8 +458,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EXPERIMENTAL] instanceof FHIRBoolean) { $this->setExperimental($data[self::FIELD_EXPERIMENTAL]); - } elseif ($ext && is_scalar($data[self::FIELD_EXPERIMENTAL])) { - $this->setExperimental(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_EXPERIMENTAL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EXPERIMENTAL])) { + $this->setExperimental(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_EXPERIMENTAL]] + $ext)); + } else if (is_array($data[self::FIELD_EXPERIMENTAL])) { + $this->setExperimental(new FHIRBoolean(array_merge($ext, $data[self::FIELD_EXPERIMENTAL]))); + } } else { $this->setExperimental(new FHIRBoolean($data[self::FIELD_EXPERIMENTAL])); } @@ -453,6 +471,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_GROUP])) { if (is_array($data[self::FIELD_GROUP])) { foreach($data[self::FIELD_GROUP] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRStructureMapGroup) { $this->addGroup($v); } else { @@ -471,17 +492,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -493,17 +521,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IMPORT])) { foreach($data[self::FIELD_IMPORT] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRUri) { $this->addImport($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addImport(new FHIRUri([FHIRUri::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addImport(new FHIRUri([FHIRUri::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addImport(new FHIRUri(array_merge($v, $ext[$i]))); + } } else { $this->addImport(new FHIRUri($v)); } } } elseif ($data[self::FIELD_IMPORT] instanceof FHIRUri) { $this->addImport($data[self::FIELD_IMPORT]); - } elseif ($ext && is_scalar($data[self::FIELD_IMPORT])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IMPORT])) { $this->addImport(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_IMPORT]] + $ext)); } else { $this->addImport(new FHIRUri($data[self::FIELD_IMPORT])); @@ -512,6 +547,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_JURISDICTION])) { if (is_array($data[self::FIELD_JURISDICTION])) { foreach($data[self::FIELD_JURISDICTION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addJurisdiction($v); } else { @@ -530,8 +568,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -542,8 +584,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PUBLISHER] instanceof FHIRString) { $this->setPublisher($data[self::FIELD_PUBLISHER]); - } elseif ($ext && is_scalar($data[self::FIELD_PUBLISHER])) { - $this->setPublisher(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PUBLISHER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PUBLISHER])) { + $this->setPublisher(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PUBLISHER]] + $ext)); + } else if (is_array($data[self::FIELD_PUBLISHER])) { + $this->setPublisher(new FHIRString(array_merge($ext, $data[self::FIELD_PUBLISHER]))); + } } else { $this->setPublisher(new FHIRString($data[self::FIELD_PUBLISHER])); } @@ -554,8 +600,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PURPOSE] instanceof FHIRMarkdown) { $this->setPurpose($data[self::FIELD_PURPOSE]); - } elseif ($ext && is_scalar($data[self::FIELD_PURPOSE])) { - $this->setPurpose(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_PURPOSE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PURPOSE])) { + $this->setPurpose(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_PURPOSE]] + $ext)); + } else if (is_array($data[self::FIELD_PURPOSE])) { + $this->setPurpose(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_PURPOSE]))); + } } else { $this->setPurpose(new FHIRMarkdown($data[self::FIELD_PURPOSE])); } @@ -566,8 +616,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRPublicationStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRPublicationStatus([FHIRPublicationStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRPublicationStatus([FHIRPublicationStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRPublicationStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRPublicationStatus($data[self::FIELD_STATUS])); } @@ -575,6 +629,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_STRUCTURE])) { if (is_array($data[self::FIELD_STRUCTURE])) { foreach($data[self::FIELD_STRUCTURE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRStructureMapStructure) { $this->addStructure($v); } else { @@ -593,8 +650,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TITLE] instanceof FHIRString) { $this->setTitle($data[self::FIELD_TITLE]); - } elseif ($ext && is_scalar($data[self::FIELD_TITLE])) { - $this->setTitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TITLE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TITLE])) { + $this->setTitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TITLE]] + $ext)); + } else if (is_array($data[self::FIELD_TITLE])) { + $this->setTitle(new FHIRString(array_merge($ext, $data[self::FIELD_TITLE]))); + } } else { $this->setTitle(new FHIRString($data[self::FIELD_TITLE])); } @@ -605,8 +666,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_URL] instanceof FHIRUri) { $this->setUrl($data[self::FIELD_URL]); - } elseif ($ext && is_scalar($data[self::FIELD_URL])) { - $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } else if (is_array($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri(array_merge($ext, $data[self::FIELD_URL]))); + } } else { $this->setUrl(new FHIRUri($data[self::FIELD_URL])); } @@ -614,6 +679,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_USE_CONTEXT])) { if (is_array($data[self::FIELD_USE_CONTEXT])) { foreach($data[self::FIELD_USE_CONTEXT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRUsageContext) { $this->addUseContext($v); } else { @@ -632,8 +700,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VERSION] instanceof FHIRString) { $this->setVersion($data[self::FIELD_VERSION]); - } elseif ($ext && is_scalar($data[self::FIELD_VERSION])) { - $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } else if (is_array($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString(array_merge($ext, $data[self::FIELD_VERSION]))); + } } else { $this->setVersion(new FHIRString($data[self::FIELD_VERSION])); } @@ -1780,7 +1852,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getExperimental())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EXPERIMENTAL, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getGroup())) { foreach($vs as $v) { if (null === $v) { @@ -1789,7 +1860,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_GROUP, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -1806,7 +1876,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_IMPORT, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getJurisdiction())) { foreach($vs as $v) { if (null === $v) { @@ -1824,11 +1893,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getPurpose())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PURPOSE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getStructure())) { foreach($vs as $v) { if (null === $v) { @@ -1843,7 +1910,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getUrl())) { $v->xmlSerialize($sxe->addChild(self::FIELD_URL, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getUseContext())) { foreach($vs as $v) { if (null === $v) { @@ -1868,26 +1934,70 @@ public function jsonSerialize() $a[self::FIELD_CONTACT] = $vs; } if (null !== ($v = $this->getCopyright())) { - $a[self::FIELD_COPYRIGHT] = $v->getValue(); - $a[self::FIELD_COPYRIGHT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_COPYRIGHT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_COPYRIGHT_EXT] = $enc; + } + } else { + $a[self::FIELD_COPYRIGHT] = $v; + } } if (null !== ($v = $this->getDate())) { - $a[self::FIELD_DATE] = $v->getValue(); - $a[self::FIELD_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_DATE] = $v; + } } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if (null !== ($v = $this->getExperimental())) { - $a[self::FIELD_EXPERIMENTAL] = $v->getValue(); - $a[self::FIELD_EXPERIMENTAL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EXPERIMENTAL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EXPERIMENTAL_EXT] = $enc; + } + } else { + $a[self::FIELD_EXPERIMENTAL] = $v; + } } if ([] !== ($vs = $this->getGroup())) { $a[self::FIELD_GROUP] = $vs; } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if ([] !== ($vs = $this->getImport())) { $a[self::FIELD_IMPORT] = []; @@ -1895,45 +2005,104 @@ public function jsonSerialize() if (null === $v) { continue; } - $a[self::FIELD_IMPORT][] = $v->getValue(); - $a[self::FIELD_IMPORT_EXT][] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IMPORT][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IMPORT_EXT][] = $enc; + } else { + $a[self::FIELD_IMPORT_EXT][] = null; + } + } else { + $a[self::FIELD_IMPORT][] = $v; + } } } if ([] !== ($vs = $this->getJurisdiction())) { $a[self::FIELD_JURISDICTION] = $vs; } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if (null !== ($v = $this->getPublisher())) { - $a[self::FIELD_PUBLISHER] = $v->getValue(); - $a[self::FIELD_PUBLISHER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PUBLISHER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PUBLISHER_EXT] = $enc; + } + } else { + $a[self::FIELD_PUBLISHER] = $v; + } } if (null !== ($v = $this->getPurpose())) { - $a[self::FIELD_PURPOSE] = $v->getValue(); - $a[self::FIELD_PURPOSE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PURPOSE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PURPOSE_EXT] = $enc; + } + } else { + $a[self::FIELD_PURPOSE] = $v; + } } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if ([] !== ($vs = $this->getStructure())) { $a[self::FIELD_STRUCTURE] = $vs; } if (null !== ($v = $this->getTitle())) { - $a[self::FIELD_TITLE] = $v->getValue(); - $a[self::FIELD_TITLE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TITLE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TITLE_EXT] = $enc; + } + } else { + $a[self::FIELD_TITLE] = $v; + } } if (null !== ($v = $this->getUrl())) { - $a[self::FIELD_URL] = $v->getValue(); - $a[self::FIELD_URL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_URL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_URL_EXT] = $enc; + } + } else { + $a[self::FIELD_URL] = $v; + } } if ([] !== ($vs = $this->getUseContext())) { $a[self::FIELD_USE_CONTEXT] = $vs; } if (null !== ($v = $this->getVersion())) { - $a[self::FIELD_VERSION] = $v->getValue(); - $a[self::FIELD_VERSION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VERSION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VERSION_EXT] = $enc; + } + } else { + $a[self::FIELD_VERSION] = $v; + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRSubscription.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRSubscription.php index 065861eadb..c970db2f89 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRSubscription.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRSubscription.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -88,10 +88,6 @@ class FHIRSubscription extends FHIRDomainResource implements PHPFHIRContainedTyp { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SUBSCRIPTION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CHANNEL = 'channel'; const FIELD_CONTACT = 'contact'; const FIELD_CONTACT_EXT = '_contact'; @@ -205,6 +201,9 @@ class FHIRSubscription extends FHIRDomainResource implements PHPFHIRContainedTyp */ protected $tag = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSubscription Constructor * @param null|array $data @@ -234,17 +233,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_CONTACT])) { foreach($data[self::FIELD_CONTACT] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContactPoint) { $this->addContact($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addContact(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addContact(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addContact(new FHIRContactPoint(array_merge($v, $ext[$i]))); + } } else { $this->addContact(new FHIRContactPoint($v)); } } } elseif ($data[self::FIELD_CONTACT] instanceof FHIRContactPoint) { $this->addContact($data[self::FIELD_CONTACT]); - } elseif ($ext && is_scalar($data[self::FIELD_CONTACT])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_CONTACT])) { $this->addContact(new FHIRContactPoint([FHIRContactPoint::FIELD_VALUE => $data[self::FIELD_CONTACT]] + $ext)); } else { $this->addContact(new FHIRContactPoint($data[self::FIELD_CONTACT])); @@ -256,8 +262,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_CRITERIA] instanceof FHIRString) { $this->setCriteria($data[self::FIELD_CRITERIA]); - } elseif ($ext && is_scalar($data[self::FIELD_CRITERIA])) { - $this->setCriteria(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_CRITERIA]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_CRITERIA])) { + $this->setCriteria(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_CRITERIA]] + $ext)); + } else if (is_array($data[self::FIELD_CRITERIA])) { + $this->setCriteria(new FHIRString(array_merge($ext, $data[self::FIELD_CRITERIA]))); + } } else { $this->setCriteria(new FHIRString($data[self::FIELD_CRITERIA])); } @@ -268,8 +278,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_END] instanceof FHIRInstant) { $this->setEnd($data[self::FIELD_END]); - } elseif ($ext && is_scalar($data[self::FIELD_END])) { - $this->setEnd(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_END]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_END])) { + $this->setEnd(new FHIRInstant([FHIRInstant::FIELD_VALUE => $data[self::FIELD_END]] + $ext)); + } else if (is_array($data[self::FIELD_END])) { + $this->setEnd(new FHIRInstant(array_merge($ext, $data[self::FIELD_END]))); + } } else { $this->setEnd(new FHIRInstant($data[self::FIELD_END])); } @@ -280,8 +294,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ERROR] instanceof FHIRString) { $this->setError($data[self::FIELD_ERROR]); - } elseif ($ext && is_scalar($data[self::FIELD_ERROR])) { - $this->setError(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_ERROR]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ERROR])) { + $this->setError(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_ERROR]] + $ext)); + } else if (is_array($data[self::FIELD_ERROR])) { + $this->setError(new FHIRString(array_merge($ext, $data[self::FIELD_ERROR]))); + } } else { $this->setError(new FHIRString($data[self::FIELD_ERROR])); } @@ -292,8 +310,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_REASON] instanceof FHIRString) { $this->setReason($data[self::FIELD_REASON]); - } elseif ($ext && is_scalar($data[self::FIELD_REASON])) { - $this->setReason(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_REASON]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_REASON])) { + $this->setReason(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_REASON]] + $ext)); + } else if (is_array($data[self::FIELD_REASON])) { + $this->setReason(new FHIRString(array_merge($ext, $data[self::FIELD_REASON]))); + } } else { $this->setReason(new FHIRString($data[self::FIELD_REASON])); } @@ -304,8 +326,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRSubscriptionStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRSubscriptionStatus([FHIRSubscriptionStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRSubscriptionStatus([FHIRSubscriptionStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRSubscriptionStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRSubscriptionStatus($data[self::FIELD_STATUS])); } @@ -313,6 +339,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_TAG])) { if (is_array($data[self::FIELD_TAG])) { foreach($data[self::FIELD_TAG] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCoding) { $this->addTag($v); } else { @@ -825,7 +854,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getChannel())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CHANNEL, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getContact())) { foreach($vs as $v) { if (null === $v) { @@ -846,11 +874,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getReason())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REASON, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getTag())) { foreach($vs as $v) { if (null === $v) { @@ -872,26 +898,78 @@ public function jsonSerialize() $a[self::FIELD_CHANNEL] = $v; } if ([] !== ($vs = $this->getContact())) { - $a[self::FIELD_CONTACT] = $vs; + $a[self::FIELD_CONTACT] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CONTACT][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CONTACT_EXT][] = $enc; + } else { + $a[self::FIELD_CONTACT_EXT][] = null; + } + } else { + $a[self::FIELD_CONTACT][] = $v; + } + } } if (null !== ($v = $this->getCriteria())) { - $a[self::FIELD_CRITERIA] = $v->getValue(); - $a[self::FIELD_CRITERIA_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_CRITERIA] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_CRITERIA_EXT] = $enc; + } + } else { + $a[self::FIELD_CRITERIA] = $v; + } } if (null !== ($v = $this->getEnd())) { - $a[self::FIELD_END] = $v->getValue(); - $a[self::FIELD_END_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_END] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_END_EXT] = $enc; + } + } else { + $a[self::FIELD_END] = $v; + } } if (null !== ($v = $this->getError())) { - $a[self::FIELD_ERROR] = $v->getValue(); - $a[self::FIELD_ERROR_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ERROR] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ERROR_EXT] = $enc; + } + } else { + $a[self::FIELD_ERROR] = $v; + } } if (null !== ($v = $this->getReason())) { - $a[self::FIELD_REASON] = $v->getValue(); - $a[self::FIELD_REASON_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_REASON] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_REASON_EXT] = $enc; + } + } else { + $a[self::FIELD_REASON] = $v; + } } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if ([] !== ($vs = $this->getTag())) { $a[self::FIELD_TAG] = $vs; diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRSubstance.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRSubstance.php index 133cb89468..cbe21bf89a 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRSubstance.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRSubstance.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -84,10 +84,6 @@ class FHIRSubstance extends FHIRDomainResource implements PHPFHIRContainedTypeIn { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SUBSTANCE; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CATEGORY = 'category'; const FIELD_CODE = 'code'; const FIELD_DESCRIPTION = 'description'; @@ -176,6 +172,9 @@ class FHIRSubstance extends FHIRDomainResource implements PHPFHIRContainedTypeIn */ protected $status = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSubstance Constructor * @param null|array $data @@ -195,6 +194,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CATEGORY])) { if (is_array($data[self::FIELD_CATEGORY])) { foreach($data[self::FIELD_CATEGORY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addCategory($v); } else { @@ -220,8 +222,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -232,17 +238,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -251,6 +264,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_INGREDIENT])) { if (is_array($data[self::FIELD_INGREDIENT])) { foreach($data[self::FIELD_INGREDIENT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRSubstanceIngredient) { $this->addIngredient($v); } else { @@ -266,6 +282,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_INSTANCE])) { if (is_array($data[self::FIELD_INSTANCE])) { foreach($data[self::FIELD_INSTANCE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRSubstanceInstance) { $this->addInstance($v); } else { @@ -284,8 +303,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRFHIRSubstanceStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRFHIRSubstanceStatus([FHIRFHIRSubstanceStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRFHIRSubstanceStatus([FHIRFHIRSubstanceStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRFHIRSubstanceStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRFHIRSubstanceStatus($data[self::FIELD_STATUS])); } @@ -761,14 +784,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_CATEGORY, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getDescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESCRIPTION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -777,7 +798,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getIngredient())) { foreach($vs as $v) { if (null === $v) { @@ -786,7 +806,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_INGREDIENT, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getInstance())) { foreach($vs as $v) { if (null === $v) { @@ -795,7 +814,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_INSTANCE, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } @@ -815,11 +833,34 @@ public function jsonSerialize() $a[self::FIELD_CODE] = $v; } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if ([] !== ($vs = $this->getIngredient())) { $a[self::FIELD_INGREDIENT] = $vs; @@ -828,7 +869,15 @@ public function jsonSerialize() $a[self::FIELD_INSTANCE] = $vs; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRSupplyDelivery.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRSupplyDelivery.php index 12bef83880..19f1fbf411 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRSupplyDelivery.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRSupplyDelivery.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -86,10 +86,6 @@ class FHIRSupplyDelivery extends FHIRDomainResource implements PHPFHIRContainedT { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SUPPLY_DELIVERY; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_BASED_ON = 'basedOn'; const FIELD_DESTINATION = 'destination'; const FIELD_IDENTIFIER = 'identifier'; @@ -257,6 +253,9 @@ class FHIRSupplyDelivery extends FHIRDomainResource implements PHPFHIRContainedT */ protected $type = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSupplyDelivery Constructor * @param null|array $data @@ -276,6 +275,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_BASED_ON])) { if (is_array($data[self::FIELD_BASED_ON])) { foreach($data[self::FIELD_BASED_ON] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addBasedOn($v); } else { @@ -301,8 +303,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->setIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { - $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_IDENTIFIER]))); + } } else { $this->setIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); } @@ -313,8 +319,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_OCCURRENCE_DATE_TIME] instanceof FHIRDateTime) { $this->setOccurrenceDateTime($data[self::FIELD_OCCURRENCE_DATE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_OCCURRENCE_DATE_TIME])) { - $this->setOccurrenceDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_OCCURRENCE_DATE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_OCCURRENCE_DATE_TIME])) { + $this->setOccurrenceDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_OCCURRENCE_DATE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_OCCURRENCE_DATE_TIME])) { + $this->setOccurrenceDateTime(new FHIRDateTime(array_merge($ext, $data[self::FIELD_OCCURRENCE_DATE_TIME]))); + } } else { $this->setOccurrenceDateTime(new FHIRDateTime($data[self::FIELD_OCCURRENCE_DATE_TIME])); } @@ -336,6 +346,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PART_OF])) { if (is_array($data[self::FIELD_PART_OF])) { foreach($data[self::FIELD_PART_OF] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addPartOf($v); } else { @@ -358,6 +371,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_RECEIVER])) { if (is_array($data[self::FIELD_RECEIVER])) { foreach($data[self::FIELD_RECEIVER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addReceiver($v); } else { @@ -376,8 +392,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRSupplyDeliveryStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRSupplyDeliveryStatus([FHIRSupplyDeliveryStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRSupplyDeliveryStatus([FHIRSupplyDeliveryStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRSupplyDeliveryStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRSupplyDeliveryStatus($data[self::FIELD_STATUS])); } @@ -1059,26 +1079,21 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_BASED_ON, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getDestination())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESTINATION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getOccurrenceDateTime())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OCCURRENCE_DATE_TIME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOccurrencePeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OCCURRENCE_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOccurrenceTiming())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OCCURRENCE_TIMING, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getPartOf())) { foreach($vs as $v) { if (null === $v) { @@ -1087,11 +1102,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_PART_OF, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getPatient())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATIENT, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getReceiver())) { foreach($vs as $v) { if (null === $v) { @@ -1100,19 +1113,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_RECEIVER, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSuppliedItem())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUPPLIED_ITEM, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSupplier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SUPPLIER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getType())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TYPE, null, $v->_getFHIRXMLNamespace())); } @@ -1132,11 +1141,26 @@ public function jsonSerialize() $a[self::FIELD_DESTINATION] = $v; } if (null !== ($v = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_IDENTIFIER] = $v; + } } if (null !== ($v = $this->getOccurrenceDateTime())) { - $a[self::FIELD_OCCURRENCE_DATE_TIME] = $v->getValue(); - $a[self::FIELD_OCCURRENCE_DATE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_OCCURRENCE_DATE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_OCCURRENCE_DATE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_OCCURRENCE_DATE_TIME] = $v; + } } if (null !== ($v = $this->getOccurrencePeriod())) { $a[self::FIELD_OCCURRENCE_PERIOD] = $v; @@ -1154,7 +1178,15 @@ public function jsonSerialize() $a[self::FIELD_RECEIVER] = $vs; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getSuppliedItem())) { $a[self::FIELD_SUPPLIED_ITEM] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRSupplyRequest.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRSupplyRequest.php index 3261a2b335..947aff6b30 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRSupplyRequest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRSupplyRequest.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -89,10 +89,6 @@ class FHIRSupplyRequest extends FHIRDomainResource implements PHPFHIRContainedTy { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_SUPPLY_REQUEST; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_AUTHORED_ON = 'authoredOn'; const FIELD_AUTHORED_ON_EXT = '_authoredOn'; const FIELD_CATEGORY = 'category'; @@ -290,6 +286,9 @@ class FHIRSupplyRequest extends FHIRDomainResource implements PHPFHIRContainedTy */ protected $supplier = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRSupplyRequest Constructor * @param null|array $data @@ -312,8 +311,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_AUTHORED_ON] instanceof FHIRDateTime) { $this->setAuthoredOn($data[self::FIELD_AUTHORED_ON]); - } elseif ($ext && is_scalar($data[self::FIELD_AUTHORED_ON])) { - $this->setAuthoredOn(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_AUTHORED_ON]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_AUTHORED_ON])) { + $this->setAuthoredOn(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_AUTHORED_ON]] + $ext)); + } else if (is_array($data[self::FIELD_AUTHORED_ON])) { + $this->setAuthoredOn(new FHIRDateTime(array_merge($ext, $data[self::FIELD_AUTHORED_ON]))); + } } else { $this->setAuthoredOn(new FHIRDateTime($data[self::FIELD_AUTHORED_ON])); } @@ -345,8 +348,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->setIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { - $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_IDENTIFIER]))); + } } else { $this->setIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); } @@ -357,8 +364,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_OCCURRENCE_DATE_TIME] instanceof FHIRDateTime) { $this->setOccurrenceDateTime($data[self::FIELD_OCCURRENCE_DATE_TIME]); - } elseif ($ext && is_scalar($data[self::FIELD_OCCURRENCE_DATE_TIME])) { - $this->setOccurrenceDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_OCCURRENCE_DATE_TIME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_OCCURRENCE_DATE_TIME])) { + $this->setOccurrenceDateTime(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_OCCURRENCE_DATE_TIME]] + $ext)); + } else if (is_array($data[self::FIELD_OCCURRENCE_DATE_TIME])) { + $this->setOccurrenceDateTime(new FHIRDateTime(array_merge($ext, $data[self::FIELD_OCCURRENCE_DATE_TIME]))); + } } else { $this->setOccurrenceDateTime(new FHIRDateTime($data[self::FIELD_OCCURRENCE_DATE_TIME])); } @@ -390,8 +401,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PRIORITY] instanceof FHIRRequestPriority) { $this->setPriority($data[self::FIELD_PRIORITY]); - } elseif ($ext && is_scalar($data[self::FIELD_PRIORITY])) { - $this->setPriority(new FHIRRequestPriority([FHIRRequestPriority::FIELD_VALUE => $data[self::FIELD_PRIORITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PRIORITY])) { + $this->setPriority(new FHIRRequestPriority([FHIRRequestPriority::FIELD_VALUE => $data[self::FIELD_PRIORITY]] + $ext)); + } else if (is_array($data[self::FIELD_PRIORITY])) { + $this->setPriority(new FHIRRequestPriority(array_merge($ext, $data[self::FIELD_PRIORITY]))); + } } else { $this->setPriority(new FHIRRequestPriority($data[self::FIELD_PRIORITY])); } @@ -423,8 +438,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRSupplyRequestStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRSupplyRequestStatus([FHIRSupplyRequestStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRSupplyRequestStatus([FHIRSupplyRequestStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRSupplyRequestStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRSupplyRequestStatus($data[self::FIELD_STATUS])); } @@ -432,6 +451,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_SUPPLIER])) { if (is_array($data[self::FIELD_SUPPLIER])) { foreach($data[self::FIELD_SUPPLIER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addSupplier($v); } else { @@ -1120,61 +1142,49 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getAuthoredOn())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AUTHORED_ON, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getCategory())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CATEGORY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDeliverFrom())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DELIVER_FROM, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDeliverTo())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DELIVER_TO, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getOccurrenceDateTime())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OCCURRENCE_DATE_TIME, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOccurrencePeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OCCURRENCE_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOccurrenceTiming())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OCCURRENCE_TIMING, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getOrderedItem())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ORDERED_ITEM, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPriority())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PRIORITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getReasonCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REASON_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getReasonReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REASON_REFERENCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRequester())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REQUESTER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getSupplier())) { foreach($vs as $v) { if (null === $v) { @@ -1193,8 +1203,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getAuthoredOn())) { - $a[self::FIELD_AUTHORED_ON] = $v->getValue(); - $a[self::FIELD_AUTHORED_ON_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_AUTHORED_ON] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_AUTHORED_ON_EXT] = $enc; + } + } else { + $a[self::FIELD_AUTHORED_ON] = $v; + } } if (null !== ($v = $this->getCategory())) { $a[self::FIELD_CATEGORY] = $v; @@ -1206,11 +1223,26 @@ public function jsonSerialize() $a[self::FIELD_DELIVER_TO] = $v; } if (null !== ($v = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_IDENTIFIER] = $v; + } } if (null !== ($v = $this->getOccurrenceDateTime())) { - $a[self::FIELD_OCCURRENCE_DATE_TIME] = $v->getValue(); - $a[self::FIELD_OCCURRENCE_DATE_TIME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_OCCURRENCE_DATE_TIME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_OCCURRENCE_DATE_TIME_EXT] = $enc; + } + } else { + $a[self::FIELD_OCCURRENCE_DATE_TIME] = $v; + } } if (null !== ($v = $this->getOccurrencePeriod())) { $a[self::FIELD_OCCURRENCE_PERIOD] = $v; @@ -1222,7 +1254,15 @@ public function jsonSerialize() $a[self::FIELD_ORDERED_ITEM] = $v; } if (null !== ($v = $this->getPriority())) { - $a[self::FIELD_PRIORITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PRIORITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PRIORITY_EXT] = $enc; + } + } else { + $a[self::FIELD_PRIORITY] = $v; + } } if (null !== ($v = $this->getReasonCodeableConcept())) { $a[self::FIELD_REASON_CODEABLE_CONCEPT] = $v; @@ -1234,7 +1274,15 @@ public function jsonSerialize() $a[self::FIELD_REQUESTER] = $v; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if ([] !== ($vs = $this->getSupplier())) { $a[self::FIELD_SUPPLIER] = $vs; diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRTask.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRTask.php index 52fa7a2c1d..7922ce2492 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRTask.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRTask.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -93,10 +93,6 @@ class FHIRTask extends FHIRDomainResource implements PHPFHIRContainedTypeInterfa { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_TASK; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_AUTHORED_ON = 'authoredOn'; const FIELD_AUTHORED_ON_EXT = '_authoredOn'; const FIELD_BASED_ON = 'basedOn'; @@ -463,6 +459,9 @@ class FHIRTask extends FHIRDomainResource implements PHPFHIRContainedTypeInterfa */ protected $statusReason = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRTask Constructor * @param null|array $data @@ -485,8 +484,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_AUTHORED_ON] instanceof FHIRDateTime) { $this->setAuthoredOn($data[self::FIELD_AUTHORED_ON]); - } elseif ($ext && is_scalar($data[self::FIELD_AUTHORED_ON])) { - $this->setAuthoredOn(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_AUTHORED_ON]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_AUTHORED_ON])) { + $this->setAuthoredOn(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_AUTHORED_ON]] + $ext)); + } else if (is_array($data[self::FIELD_AUTHORED_ON])) { + $this->setAuthoredOn(new FHIRDateTime(array_merge($ext, $data[self::FIELD_AUTHORED_ON]))); + } } else { $this->setAuthoredOn(new FHIRDateTime($data[self::FIELD_AUTHORED_ON])); } @@ -494,6 +497,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_BASED_ON])) { if (is_array($data[self::FIELD_BASED_ON])) { foreach($data[self::FIELD_BASED_ON] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addBasedOn($v); } else { @@ -540,8 +546,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DEFINITION_URI] instanceof FHIRUri) { $this->setDefinitionUri($data[self::FIELD_DEFINITION_URI]); - } elseif ($ext && is_scalar($data[self::FIELD_DEFINITION_URI])) { - $this->setDefinitionUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_DEFINITION_URI]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DEFINITION_URI])) { + $this->setDefinitionUri(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_DEFINITION_URI]] + $ext)); + } else if (is_array($data[self::FIELD_DEFINITION_URI])) { + $this->setDefinitionUri(new FHIRUri(array_merge($ext, $data[self::FIELD_DEFINITION_URI]))); + } } else { $this->setDefinitionUri(new FHIRUri($data[self::FIELD_DEFINITION_URI])); } @@ -552,8 +562,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRString) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRString(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRString($data[self::FIELD_DESCRIPTION])); } @@ -585,8 +599,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_GROUP_IDENTIFIER] instanceof FHIRIdentifier) { $this->setGroupIdentifier($data[self::FIELD_GROUP_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_GROUP_IDENTIFIER])) { - $this->setGroupIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_GROUP_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_GROUP_IDENTIFIER])) { + $this->setGroupIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_GROUP_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_GROUP_IDENTIFIER])) { + $this->setGroupIdentifier(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_GROUP_IDENTIFIER]))); + } } else { $this->setGroupIdentifier(new FHIRIdentifier($data[self::FIELD_GROUP_IDENTIFIER])); } @@ -597,17 +615,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -616,6 +641,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_INPUT])) { if (is_array($data[self::FIELD_INPUT])) { foreach($data[self::FIELD_INPUT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRTaskInput) { $this->addInput($v); } else { @@ -634,8 +662,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_INTENT] instanceof FHIRRequestIntent) { $this->setIntent($data[self::FIELD_INTENT]); - } elseif ($ext && is_scalar($data[self::FIELD_INTENT])) { - $this->setIntent(new FHIRRequestIntent([FHIRRequestIntent::FIELD_VALUE => $data[self::FIELD_INTENT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_INTENT])) { + $this->setIntent(new FHIRRequestIntent([FHIRRequestIntent::FIELD_VALUE => $data[self::FIELD_INTENT]] + $ext)); + } else if (is_array($data[self::FIELD_INTENT])) { + $this->setIntent(new FHIRRequestIntent(array_merge($ext, $data[self::FIELD_INTENT]))); + } } else { $this->setIntent(new FHIRRequestIntent($data[self::FIELD_INTENT])); } @@ -646,8 +678,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_LAST_MODIFIED] instanceof FHIRDateTime) { $this->setLastModified($data[self::FIELD_LAST_MODIFIED]); - } elseif ($ext && is_scalar($data[self::FIELD_LAST_MODIFIED])) { - $this->setLastModified(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_LAST_MODIFIED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_LAST_MODIFIED])) { + $this->setLastModified(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_LAST_MODIFIED]] + $ext)); + } else if (is_array($data[self::FIELD_LAST_MODIFIED])) { + $this->setLastModified(new FHIRDateTime(array_merge($ext, $data[self::FIELD_LAST_MODIFIED]))); + } } else { $this->setLastModified(new FHIRDateTime($data[self::FIELD_LAST_MODIFIED])); } @@ -655,6 +691,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_NOTE])) { if (is_array($data[self::FIELD_NOTE])) { foreach($data[self::FIELD_NOTE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRAnnotation) { $this->addNote($v); } else { @@ -670,6 +709,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_OUTPUT])) { if (is_array($data[self::FIELD_OUTPUT])) { foreach($data[self::FIELD_OUTPUT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRTaskOutput) { $this->addOutput($v); } else { @@ -692,6 +734,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PART_OF])) { if (is_array($data[self::FIELD_PART_OF])) { foreach($data[self::FIELD_PART_OF] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addPartOf($v); } else { @@ -707,6 +752,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PERFORMER_TYPE])) { if (is_array($data[self::FIELD_PERFORMER_TYPE])) { foreach($data[self::FIELD_PERFORMER_TYPE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addPerformerType($v); } else { @@ -725,8 +773,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PRIORITY] instanceof FHIRRequestPriority) { $this->setPriority($data[self::FIELD_PRIORITY]); - } elseif ($ext && is_scalar($data[self::FIELD_PRIORITY])) { - $this->setPriority(new FHIRRequestPriority([FHIRRequestPriority::FIELD_VALUE => $data[self::FIELD_PRIORITY]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PRIORITY])) { + $this->setPriority(new FHIRRequestPriority([FHIRRequestPriority::FIELD_VALUE => $data[self::FIELD_PRIORITY]] + $ext)); + } else if (is_array($data[self::FIELD_PRIORITY])) { + $this->setPriority(new FHIRRequestPriority(array_merge($ext, $data[self::FIELD_PRIORITY]))); + } } else { $this->setPriority(new FHIRRequestPriority($data[self::FIELD_PRIORITY])); } @@ -741,6 +793,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_RELEVANT_HISTORY])) { if (is_array($data[self::FIELD_RELEVANT_HISTORY])) { foreach($data[self::FIELD_RELEVANT_HISTORY] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addRelevantHistory($v); } else { @@ -773,8 +828,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRTaskStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRTaskStatus([FHIRTaskStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRTaskStatus([FHIRTaskStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRTaskStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRTaskStatus($data[self::FIELD_STATUS])); } @@ -2133,10 +2192,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getAuthoredOn())) { $v->xmlSerialize($sxe->addChild(self::FIELD_AUTHORED_ON, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getBasedOn())) { foreach($vs as $v) { if (null === $v) { @@ -2145,19 +2204,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_BASED_ON, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getBusinessStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_BUSINESS_STATUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getCode())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CODE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getContext())) { $v->xmlSerialize($sxe->addChild(self::FIELD_CONTEXT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getDefinitionReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DEFINITION_REFERENCE, null, $v->_getFHIRXMLNamespace())); } @@ -2167,23 +2222,18 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESCRIPTION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getExecutionPeriod())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EXECUTION_PERIOD, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getFocus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FOCUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getFor())) { $v->xmlSerialize($sxe->addChild(self::FIELD_FOR, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getGroupIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_GROUP_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -2192,7 +2242,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getInput())) { foreach($vs as $v) { if (null === $v) { @@ -2201,14 +2250,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_INPUT, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getIntent())) { $v->xmlSerialize($sxe->addChild(self::FIELD_INTENT, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getLastModified())) { $v->xmlSerialize($sxe->addChild(self::FIELD_LAST_MODIFIED, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getNote())) { foreach($vs as $v) { if (null === $v) { @@ -2217,7 +2264,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_NOTE, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getOutput())) { foreach($vs as $v) { if (null === $v) { @@ -2226,11 +2272,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_OUTPUT, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getOwner())) { $v->xmlSerialize($sxe->addChild(self::FIELD_OWNER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getPartOf())) { foreach($vs as $v) { if (null === $v) { @@ -2239,7 +2283,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_PART_OF, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getPerformerType())) { foreach($vs as $v) { if (null === $v) { @@ -2248,15 +2291,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_PERFORMER_TYPE, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getPriority())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PRIORITY, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getReason())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REASON, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getRelevantHistory())) { foreach($vs as $v) { if (null === $v) { @@ -2265,19 +2305,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_RELEVANT_HISTORY, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getRequester())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REQUESTER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getRestriction())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RESTRICTION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatusReason())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS_REASON, null, $v->_getFHIRXMLNamespace())); } @@ -2291,8 +2327,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getAuthoredOn())) { - $a[self::FIELD_AUTHORED_ON] = $v->getValue(); - $a[self::FIELD_AUTHORED_ON_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_AUTHORED_ON] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_AUTHORED_ON_EXT] = $enc; + } + } else { + $a[self::FIELD_AUTHORED_ON] = $v; + } } if ([] !== ($vs = $this->getBasedOn())) { $a[self::FIELD_BASED_ON] = $vs; @@ -2310,12 +2353,26 @@ public function jsonSerialize() $a[self::FIELD_DEFINITION_REFERENCE] = $v; } if (null !== ($v = $this->getDefinitionUri())) { - $a[self::FIELD_DEFINITION_URI] = $v->getValue(); - $a[self::FIELD_DEFINITION_URI_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DEFINITION_URI] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DEFINITION_URI_EXT] = $enc; + } + } else { + $a[self::FIELD_DEFINITION_URI] = $v; + } } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if (null !== ($v = $this->getExecutionPeriod())) { $a[self::FIELD_EXECUTION_PERIOD] = $v; @@ -2327,20 +2384,59 @@ public function jsonSerialize() $a[self::FIELD_FOR] = $v; } if (null !== ($v = $this->getGroupIdentifier())) { - $a[self::FIELD_GROUP_IDENTIFIER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_GROUP_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_GROUP_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_GROUP_IDENTIFIER] = $v; + } } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if ([] !== ($vs = $this->getInput())) { $a[self::FIELD_INPUT] = $vs; } if (null !== ($v = $this->getIntent())) { - $a[self::FIELD_INTENT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_INTENT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_INTENT_EXT] = $enc; + } + } else { + $a[self::FIELD_INTENT] = $v; + } } if (null !== ($v = $this->getLastModified())) { - $a[self::FIELD_LAST_MODIFIED] = $v->getValue(); - $a[self::FIELD_LAST_MODIFIED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_LAST_MODIFIED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_LAST_MODIFIED_EXT] = $enc; + } + } else { + $a[self::FIELD_LAST_MODIFIED] = $v; + } } if ([] !== ($vs = $this->getNote())) { $a[self::FIELD_NOTE] = $vs; @@ -2358,7 +2454,15 @@ public function jsonSerialize() $a[self::FIELD_PERFORMER_TYPE] = $vs; } if (null !== ($v = $this->getPriority())) { - $a[self::FIELD_PRIORITY] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PRIORITY] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PRIORITY_EXT] = $enc; + } + } else { + $a[self::FIELD_PRIORITY] = $v; + } } if (null !== ($v = $this->getReason())) { $a[self::FIELD_REASON] = $v; @@ -2373,7 +2477,15 @@ public function jsonSerialize() $a[self::FIELD_RESTRICTION] = $v; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getStatusReason())) { $a[self::FIELD_STATUS_REASON] = $v; diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRTestReport.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRTestReport.php index 2d2042ea56..e6d8bea9d1 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRTestReport.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRTestReport.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -89,10 +89,6 @@ class FHIRTestReport extends FHIRDomainResource implements PHPFHIRContainedTypeI { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_TEST_REPORT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_IDENTIFIER = 'identifier'; const FIELD_IDENTIFIER_EXT = '_identifier'; const FIELD_ISSUED = 'issued'; @@ -245,6 +241,9 @@ class FHIRTestReport extends FHIRDomainResource implements PHPFHIRContainedTypeI */ protected $tester = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRTestReport Constructor * @param null|array $data @@ -267,8 +266,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->setIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { - $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_IDENTIFIER]))); + } } else { $this->setIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); } @@ -279,8 +282,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_ISSUED] instanceof FHIRDateTime) { $this->setIssued($data[self::FIELD_ISSUED]); - } elseif ($ext && is_scalar($data[self::FIELD_ISSUED])) { - $this->setIssued(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_ISSUED]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_ISSUED])) { + $this->setIssued(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_ISSUED]] + $ext)); + } else if (is_array($data[self::FIELD_ISSUED])) { + $this->setIssued(new FHIRDateTime(array_merge($ext, $data[self::FIELD_ISSUED]))); + } } else { $this->setIssued(new FHIRDateTime($data[self::FIELD_ISSUED])); } @@ -291,8 +298,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -300,6 +311,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PARTICIPANT])) { if (is_array($data[self::FIELD_PARTICIPANT])) { foreach($data[self::FIELD_PARTICIPANT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRTestReportParticipant) { $this->addParticipant($v); } else { @@ -318,8 +332,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_RESULT] instanceof FHIRTestReportResult) { $this->setResult($data[self::FIELD_RESULT]); - } elseif ($ext && is_scalar($data[self::FIELD_RESULT])) { - $this->setResult(new FHIRTestReportResult([FHIRTestReportResult::FIELD_VALUE => $data[self::FIELD_RESULT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_RESULT])) { + $this->setResult(new FHIRTestReportResult([FHIRTestReportResult::FIELD_VALUE => $data[self::FIELD_RESULT]] + $ext)); + } else if (is_array($data[self::FIELD_RESULT])) { + $this->setResult(new FHIRTestReportResult(array_merge($ext, $data[self::FIELD_RESULT]))); + } } else { $this->setResult(new FHIRTestReportResult($data[self::FIELD_RESULT])); } @@ -330,8 +348,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_SCORE] instanceof FHIRDecimal) { $this->setScore($data[self::FIELD_SCORE]); - } elseif ($ext && is_scalar($data[self::FIELD_SCORE])) { - $this->setScore(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_SCORE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_SCORE])) { + $this->setScore(new FHIRDecimal([FHIRDecimal::FIELD_VALUE => $data[self::FIELD_SCORE]] + $ext)); + } else if (is_array($data[self::FIELD_SCORE])) { + $this->setScore(new FHIRDecimal(array_merge($ext, $data[self::FIELD_SCORE]))); + } } else { $this->setScore(new FHIRDecimal($data[self::FIELD_SCORE])); } @@ -349,8 +371,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRTestReportStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRTestReportStatus([FHIRTestReportStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRTestReportStatus([FHIRTestReportStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRTestReportStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRTestReportStatus($data[self::FIELD_STATUS])); } @@ -365,6 +391,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_TEST])) { if (is_array($data[self::FIELD_TEST])) { foreach($data[self::FIELD_TEST] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRTestReportTest) { $this->addTest($v); } else { @@ -390,8 +419,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TESTER] instanceof FHIRString) { $this->setTester($data[self::FIELD_TESTER]); - } elseif ($ext && is_scalar($data[self::FIELD_TESTER])) { - $this->setTester(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TESTER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TESTER])) { + $this->setTester(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TESTER]] + $ext)); + } else if (is_array($data[self::FIELD_TESTER])) { + $this->setTester(new FHIRString(array_merge($ext, $data[self::FIELD_TESTER]))); + } } else { $this->setTester(new FHIRString($data[self::FIELD_TESTER])); } @@ -1008,7 +1041,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NAME, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getParticipant())) { foreach($vs as $v) { if (null === $v) { @@ -1017,26 +1049,21 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_PARTICIPANT, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getResult())) { $v->xmlSerialize($sxe->addChild(self::FIELD_RESULT, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getScore())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SCORE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getSetup())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SETUP, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getTeardown())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TEARDOWN, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getTest())) { foreach($vs as $v) { if (null === $v) { @@ -1045,7 +1072,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_TEST, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getTestScript())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TEST_SCRIPT, null, $v->_getFHIRXMLNamespace())); } @@ -1062,31 +1088,76 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_IDENTIFIER] = $v; + } } if (null !== ($v = $this->getIssued())) { - $a[self::FIELD_ISSUED] = $v->getValue(); - $a[self::FIELD_ISSUED_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_ISSUED] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_ISSUED_EXT] = $enc; + } + } else { + $a[self::FIELD_ISSUED] = $v; + } } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if ([] !== ($vs = $this->getParticipant())) { $a[self::FIELD_PARTICIPANT] = $vs; } if (null !== ($v = $this->getResult())) { - $a[self::FIELD_RESULT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_RESULT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_RESULT_EXT] = $enc; + } + } else { + $a[self::FIELD_RESULT] = $v; + } } if (null !== ($v = $this->getScore())) { - $a[self::FIELD_SCORE] = $v->getValue(); - $a[self::FIELD_SCORE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_SCORE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_SCORE_EXT] = $enc; + } + } else { + $a[self::FIELD_SCORE] = $v; + } } if (null !== ($v = $this->getSetup())) { $a[self::FIELD_SETUP] = $v; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getTeardown())) { $a[self::FIELD_TEARDOWN] = $v; @@ -1098,8 +1169,15 @@ public function jsonSerialize() $a[self::FIELD_TEST_SCRIPT] = $v; } if (null !== ($v = $this->getTester())) { - $a[self::FIELD_TESTER] = $v->getValue(); - $a[self::FIELD_TESTER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TESTER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TESTER_EXT] = $enc; + } + } else { + $a[self::FIELD_TESTER] = $v; + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRTestScript.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRTestScript.php index 4712e6b16c..9e898bf065 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRTestScript.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRTestScript.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -100,10 +100,6 @@ class FHIRTestScript extends FHIRDomainResource implements PHPFHIRContainedTypeI { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_TEST_SCRIPT; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_CONTACT = 'contact'; const FIELD_COPYRIGHT = 'copyright'; const FIELD_COPYRIGHT_EXT = '_copyright'; @@ -473,6 +469,9 @@ class FHIRTestScript extends FHIRDomainResource implements PHPFHIRContainedTypeI */ protected $version = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRTestScript Constructor * @param null|array $data @@ -492,6 +491,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CONTACT])) { if (is_array($data[self::FIELD_CONTACT])) { foreach($data[self::FIELD_CONTACT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContactDetail) { $this->addContact($v); } else { @@ -510,8 +512,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_COPYRIGHT] instanceof FHIRMarkdown) { $this->setCopyright($data[self::FIELD_COPYRIGHT]); - } elseif ($ext && is_scalar($data[self::FIELD_COPYRIGHT])) { - $this->setCopyright(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_COPYRIGHT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_COPYRIGHT])) { + $this->setCopyright(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_COPYRIGHT]] + $ext)); + } else if (is_array($data[self::FIELD_COPYRIGHT])) { + $this->setCopyright(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_COPYRIGHT]))); + } } else { $this->setCopyright(new FHIRMarkdown($data[self::FIELD_COPYRIGHT])); } @@ -522,8 +528,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATE] instanceof FHIRDateTime) { $this->setDate($data[self::FIELD_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_DATE])) { - $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime(array_merge($ext, $data[self::FIELD_DATE]))); + } } else { $this->setDate(new FHIRDateTime($data[self::FIELD_DATE])); } @@ -534,8 +544,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRMarkdown) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRMarkdown($data[self::FIELD_DESCRIPTION])); } @@ -543,6 +557,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_DESTINATION])) { if (is_array($data[self::FIELD_DESTINATION])) { foreach($data[self::FIELD_DESTINATION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRTestScriptDestination) { $this->addDestination($v); } else { @@ -561,8 +578,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EXPERIMENTAL] instanceof FHIRBoolean) { $this->setExperimental($data[self::FIELD_EXPERIMENTAL]); - } elseif ($ext && is_scalar($data[self::FIELD_EXPERIMENTAL])) { - $this->setExperimental(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_EXPERIMENTAL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EXPERIMENTAL])) { + $this->setExperimental(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_EXPERIMENTAL]] + $ext)); + } else if (is_array($data[self::FIELD_EXPERIMENTAL])) { + $this->setExperimental(new FHIRBoolean(array_merge($ext, $data[self::FIELD_EXPERIMENTAL]))); + } } else { $this->setExperimental(new FHIRBoolean($data[self::FIELD_EXPERIMENTAL])); } @@ -570,6 +591,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_FIXTURE])) { if (is_array($data[self::FIELD_FIXTURE])) { foreach($data[self::FIELD_FIXTURE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRTestScriptFixture) { $this->addFixture($v); } else { @@ -588,8 +612,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->setIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { - $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); + } else if (is_array($data[self::FIELD_IDENTIFIER])) { + $this->setIdentifier(new FHIRIdentifier(array_merge($ext, $data[self::FIELD_IDENTIFIER]))); + } } else { $this->setIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); } @@ -597,6 +625,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_JURISDICTION])) { if (is_array($data[self::FIELD_JURISDICTION])) { foreach($data[self::FIELD_JURISDICTION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addJurisdiction($v); } else { @@ -622,8 +653,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -631,6 +666,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_ORIGIN])) { if (is_array($data[self::FIELD_ORIGIN])) { foreach($data[self::FIELD_ORIGIN] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRTestScriptOrigin) { $this->addOrigin($v); } else { @@ -646,6 +684,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PROFILE])) { if (is_array($data[self::FIELD_PROFILE])) { foreach($data[self::FIELD_PROFILE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRReference) { $this->addProfile($v); } else { @@ -664,8 +705,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PUBLISHER] instanceof FHIRString) { $this->setPublisher($data[self::FIELD_PUBLISHER]); - } elseif ($ext && is_scalar($data[self::FIELD_PUBLISHER])) { - $this->setPublisher(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PUBLISHER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PUBLISHER])) { + $this->setPublisher(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PUBLISHER]] + $ext)); + } else if (is_array($data[self::FIELD_PUBLISHER])) { + $this->setPublisher(new FHIRString(array_merge($ext, $data[self::FIELD_PUBLISHER]))); + } } else { $this->setPublisher(new FHIRString($data[self::FIELD_PUBLISHER])); } @@ -676,8 +721,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PURPOSE] instanceof FHIRMarkdown) { $this->setPurpose($data[self::FIELD_PURPOSE]); - } elseif ($ext && is_scalar($data[self::FIELD_PURPOSE])) { - $this->setPurpose(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_PURPOSE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PURPOSE])) { + $this->setPurpose(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_PURPOSE]] + $ext)); + } else if (is_array($data[self::FIELD_PURPOSE])) { + $this->setPurpose(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_PURPOSE]))); + } } else { $this->setPurpose(new FHIRMarkdown($data[self::FIELD_PURPOSE])); } @@ -685,6 +734,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_RULE])) { if (is_array($data[self::FIELD_RULE])) { foreach($data[self::FIELD_RULE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRTestScriptRule) { $this->addRule($v); } else { @@ -700,6 +752,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_RULESET])) { if (is_array($data[self::FIELD_RULESET])) { foreach($data[self::FIELD_RULESET] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRTestScriptRuleset) { $this->addRuleset($v); } else { @@ -725,8 +780,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRPublicationStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRPublicationStatus([FHIRPublicationStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRPublicationStatus([FHIRPublicationStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRPublicationStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRPublicationStatus($data[self::FIELD_STATUS])); } @@ -741,6 +800,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_TEST])) { if (is_array($data[self::FIELD_TEST])) { foreach($data[self::FIELD_TEST] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRTestScriptTest) { $this->addTest($v); } else { @@ -759,8 +821,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TITLE] instanceof FHIRString) { $this->setTitle($data[self::FIELD_TITLE]); - } elseif ($ext && is_scalar($data[self::FIELD_TITLE])) { - $this->setTitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TITLE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TITLE])) { + $this->setTitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TITLE]] + $ext)); + } else if (is_array($data[self::FIELD_TITLE])) { + $this->setTitle(new FHIRString(array_merge($ext, $data[self::FIELD_TITLE]))); + } } else { $this->setTitle(new FHIRString($data[self::FIELD_TITLE])); } @@ -771,8 +837,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_URL] instanceof FHIRUri) { $this->setUrl($data[self::FIELD_URL]); - } elseif ($ext && is_scalar($data[self::FIELD_URL])) { - $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } else if (is_array($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri(array_merge($ext, $data[self::FIELD_URL]))); + } } else { $this->setUrl(new FHIRUri($data[self::FIELD_URL])); } @@ -780,6 +850,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_USE_CONTEXT])) { if (is_array($data[self::FIELD_USE_CONTEXT])) { foreach($data[self::FIELD_USE_CONTEXT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRUsageContext) { $this->addUseContext($v); } else { @@ -795,6 +868,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_VARIABLE])) { if (is_array($data[self::FIELD_VARIABLE])) { foreach($data[self::FIELD_VARIABLE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRTestScriptVariable) { $this->addVariable($v); } else { @@ -813,8 +889,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VERSION] instanceof FHIRString) { $this->setVersion($data[self::FIELD_VERSION]); - } elseif ($ext && is_scalar($data[self::FIELD_VERSION])) { - $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } else if (is_array($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString(array_merge($ext, $data[self::FIELD_VERSION]))); + } } else { $this->setVersion(new FHIRString($data[self::FIELD_VERSION])); } @@ -2315,7 +2395,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESCRIPTION, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getDestination())) { foreach($vs as $v) { if (null === $v) { @@ -2327,7 +2406,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getExperimental())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EXPERIMENTAL, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getFixture())) { foreach($vs as $v) { if (null === $v) { @@ -2336,11 +2414,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_FIXTURE, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getIdentifier())) { $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getJurisdiction())) { foreach($vs as $v) { if (null === $v) { @@ -2349,14 +2425,12 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_JURISDICTION, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getMetadata())) { $v->xmlSerialize($sxe->addChild(self::FIELD_METADATA, null, $v->_getFHIRXMLNamespace())); } if (null !== ($v = $this->getName())) { $v->xmlSerialize($sxe->addChild(self::FIELD_NAME, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getOrigin())) { foreach($vs as $v) { if (null === $v) { @@ -2365,7 +2439,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_ORIGIN, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getProfile())) { foreach($vs as $v) { if (null === $v) { @@ -2380,7 +2453,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getPurpose())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PURPOSE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getRule())) { foreach($vs as $v) { if (null === $v) { @@ -2389,7 +2461,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_RULE, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getRuleset())) { foreach($vs as $v) { if (null === $v) { @@ -2398,19 +2469,15 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_RULESET, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getSetup())) { $v->xmlSerialize($sxe->addChild(self::FIELD_SETUP, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getTeardown())) { $v->xmlSerialize($sxe->addChild(self::FIELD_TEARDOWN, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getTest())) { foreach($vs as $v) { if (null === $v) { @@ -2425,7 +2492,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getUrl())) { $v->xmlSerialize($sxe->addChild(self::FIELD_URL, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getUseContext())) { foreach($vs as $v) { if (null === $v) { @@ -2434,7 +2500,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_USE_CONTEXT, null, $v->_getFHIRXMLNamespace())); } } - if ([] !== ($vs = $this->getVariable())) { foreach($vs as $v) { if (null === $v) { @@ -2459,29 +2524,65 @@ public function jsonSerialize() $a[self::FIELD_CONTACT] = $vs; } if (null !== ($v = $this->getCopyright())) { - $a[self::FIELD_COPYRIGHT] = $v->getValue(); - $a[self::FIELD_COPYRIGHT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_COPYRIGHT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_COPYRIGHT_EXT] = $enc; + } + } else { + $a[self::FIELD_COPYRIGHT] = $v; + } } if (null !== ($v = $this->getDate())) { - $a[self::FIELD_DATE] = $v->getValue(); - $a[self::FIELD_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_DATE] = $v; + } } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if ([] !== ($vs = $this->getDestination())) { $a[self::FIELD_DESTINATION] = $vs; } if (null !== ($v = $this->getExperimental())) { - $a[self::FIELD_EXPERIMENTAL] = $v->getValue(); - $a[self::FIELD_EXPERIMENTAL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EXPERIMENTAL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EXPERIMENTAL_EXT] = $enc; + } + } else { + $a[self::FIELD_EXPERIMENTAL] = $v; + } } if ([] !== ($vs = $this->getFixture())) { $a[self::FIELD_FIXTURE] = $vs; } if (null !== ($v = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT] = $enc; + } + } else { + $a[self::FIELD_IDENTIFIER] = $v; + } } if ([] !== ($vs = $this->getJurisdiction())) { $a[self::FIELD_JURISDICTION] = $vs; @@ -2490,8 +2591,15 @@ public function jsonSerialize() $a[self::FIELD_METADATA] = $v; } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if ([] !== ($vs = $this->getOrigin())) { $a[self::FIELD_ORIGIN] = $vs; @@ -2500,12 +2608,26 @@ public function jsonSerialize() $a[self::FIELD_PROFILE] = $vs; } if (null !== ($v = $this->getPublisher())) { - $a[self::FIELD_PUBLISHER] = $v->getValue(); - $a[self::FIELD_PUBLISHER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PUBLISHER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PUBLISHER_EXT] = $enc; + } + } else { + $a[self::FIELD_PUBLISHER] = $v; + } } if (null !== ($v = $this->getPurpose())) { - $a[self::FIELD_PURPOSE] = $v->getValue(); - $a[self::FIELD_PURPOSE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PURPOSE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PURPOSE_EXT] = $enc; + } + } else { + $a[self::FIELD_PURPOSE] = $v; + } } if ([] !== ($vs = $this->getRule())) { $a[self::FIELD_RULE] = $vs; @@ -2517,7 +2639,15 @@ public function jsonSerialize() $a[self::FIELD_SETUP] = $v; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getTeardown())) { $a[self::FIELD_TEARDOWN] = $v; @@ -2526,12 +2656,26 @@ public function jsonSerialize() $a[self::FIELD_TEST] = $vs; } if (null !== ($v = $this->getTitle())) { - $a[self::FIELD_TITLE] = $v->getValue(); - $a[self::FIELD_TITLE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TITLE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TITLE_EXT] = $enc; + } + } else { + $a[self::FIELD_TITLE] = $v; + } } if (null !== ($v = $this->getUrl())) { - $a[self::FIELD_URL] = $v->getValue(); - $a[self::FIELD_URL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_URL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_URL_EXT] = $enc; + } + } else { + $a[self::FIELD_URL] = $v; + } } if ([] !== ($vs = $this->getUseContext())) { $a[self::FIELD_USE_CONTEXT] = $vs; @@ -2540,8 +2684,15 @@ public function jsonSerialize() $a[self::FIELD_VARIABLE] = $vs; } if (null !== ($v = $this->getVersion())) { - $a[self::FIELD_VERSION] = $v->getValue(); - $a[self::FIELD_VERSION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VERSION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VERSION_EXT] = $enc; + } + } else { + $a[self::FIELD_VERSION] = $v; + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRValueSet.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRValueSet.php index c745747ad3..097c96775c 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRValueSet.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRValueSet.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -90,10 +90,6 @@ class FHIRValueSet extends FHIRDomainResource implements PHPFHIRContainedTypeInt { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_VALUE_SET; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_COMPOSE = 'compose'; const FIELD_CONTACT = 'contact'; const FIELD_COPYRIGHT = 'copyright'; @@ -383,6 +379,9 @@ class FHIRValueSet extends FHIRDomainResource implements PHPFHIRContainedTypeInt */ protected $version = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRValueSet Constructor * @param null|array $data @@ -409,6 +408,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_CONTACT])) { if (is_array($data[self::FIELD_CONTACT])) { foreach($data[self::FIELD_CONTACT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRContactDetail) { $this->addContact($v); } else { @@ -427,8 +429,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_COPYRIGHT] instanceof FHIRMarkdown) { $this->setCopyright($data[self::FIELD_COPYRIGHT]); - } elseif ($ext && is_scalar($data[self::FIELD_COPYRIGHT])) { - $this->setCopyright(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_COPYRIGHT]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_COPYRIGHT])) { + $this->setCopyright(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_COPYRIGHT]] + $ext)); + } else if (is_array($data[self::FIELD_COPYRIGHT])) { + $this->setCopyright(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_COPYRIGHT]))); + } } else { $this->setCopyright(new FHIRMarkdown($data[self::FIELD_COPYRIGHT])); } @@ -439,8 +445,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATE] instanceof FHIRDateTime) { $this->setDate($data[self::FIELD_DATE]); - } elseif ($ext && is_scalar($data[self::FIELD_DATE])) { - $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE]] + $ext)); + } else if (is_array($data[self::FIELD_DATE])) { + $this->setDate(new FHIRDateTime(array_merge($ext, $data[self::FIELD_DATE]))); + } } else { $this->setDate(new FHIRDateTime($data[self::FIELD_DATE])); } @@ -451,8 +461,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DESCRIPTION] instanceof FHIRMarkdown) { $this->setDescription($data[self::FIELD_DESCRIPTION]); - } elseif ($ext && is_scalar($data[self::FIELD_DESCRIPTION])) { - $this->setDescription(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_DESCRIPTION]] + $ext)); + } else if (is_array($data[self::FIELD_DESCRIPTION])) { + $this->setDescription(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_DESCRIPTION]))); + } } else { $this->setDescription(new FHIRMarkdown($data[self::FIELD_DESCRIPTION])); } @@ -470,8 +484,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EXPERIMENTAL] instanceof FHIRBoolean) { $this->setExperimental($data[self::FIELD_EXPERIMENTAL]); - } elseif ($ext && is_scalar($data[self::FIELD_EXPERIMENTAL])) { - $this->setExperimental(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_EXPERIMENTAL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EXPERIMENTAL])) { + $this->setExperimental(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_EXPERIMENTAL]] + $ext)); + } else if (is_array($data[self::FIELD_EXPERIMENTAL])) { + $this->setExperimental(new FHIRBoolean(array_merge($ext, $data[self::FIELD_EXPERIMENTAL]))); + } } else { $this->setExperimental(new FHIRBoolean($data[self::FIELD_EXPERIMENTAL])); } @@ -482,8 +500,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_EXTENSIBLE] instanceof FHIRBoolean) { $this->setExtensible($data[self::FIELD_EXTENSIBLE]); - } elseif ($ext && is_scalar($data[self::FIELD_EXTENSIBLE])) { - $this->setExtensible(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_EXTENSIBLE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_EXTENSIBLE])) { + $this->setExtensible(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_EXTENSIBLE]] + $ext)); + } else if (is_array($data[self::FIELD_EXTENSIBLE])) { + $this->setExtensible(new FHIRBoolean(array_merge($ext, $data[self::FIELD_EXTENSIBLE]))); + } } else { $this->setExtensible(new FHIRBoolean($data[self::FIELD_EXTENSIBLE])); } @@ -494,17 +516,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -516,8 +545,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_IMMUTABLE] instanceof FHIRBoolean) { $this->setImmutable($data[self::FIELD_IMMUTABLE]); - } elseif ($ext && is_scalar($data[self::FIELD_IMMUTABLE])) { - $this->setImmutable(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_IMMUTABLE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_IMMUTABLE])) { + $this->setImmutable(new FHIRBoolean([FHIRBoolean::FIELD_VALUE => $data[self::FIELD_IMMUTABLE]] + $ext)); + } else if (is_array($data[self::FIELD_IMMUTABLE])) { + $this->setImmutable(new FHIRBoolean(array_merge($ext, $data[self::FIELD_IMMUTABLE]))); + } } else { $this->setImmutable(new FHIRBoolean($data[self::FIELD_IMMUTABLE])); } @@ -525,6 +558,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_JURISDICTION])) { if (is_array($data[self::FIELD_JURISDICTION])) { foreach($data[self::FIELD_JURISDICTION] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRCodeableConcept) { $this->addJurisdiction($v); } else { @@ -543,8 +579,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_NAME] instanceof FHIRString) { $this->setName($data[self::FIELD_NAME]); - } elseif ($ext && is_scalar($data[self::FIELD_NAME])) { - $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_NAME])) { + $this->setName(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_NAME]] + $ext)); + } else if (is_array($data[self::FIELD_NAME])) { + $this->setName(new FHIRString(array_merge($ext, $data[self::FIELD_NAME]))); + } } else { $this->setName(new FHIRString($data[self::FIELD_NAME])); } @@ -555,8 +595,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PUBLISHER] instanceof FHIRString) { $this->setPublisher($data[self::FIELD_PUBLISHER]); - } elseif ($ext && is_scalar($data[self::FIELD_PUBLISHER])) { - $this->setPublisher(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PUBLISHER]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PUBLISHER])) { + $this->setPublisher(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_PUBLISHER]] + $ext)); + } else if (is_array($data[self::FIELD_PUBLISHER])) { + $this->setPublisher(new FHIRString(array_merge($ext, $data[self::FIELD_PUBLISHER]))); + } } else { $this->setPublisher(new FHIRString($data[self::FIELD_PUBLISHER])); } @@ -567,8 +611,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_PURPOSE] instanceof FHIRMarkdown) { $this->setPurpose($data[self::FIELD_PURPOSE]); - } elseif ($ext && is_scalar($data[self::FIELD_PURPOSE])) { - $this->setPurpose(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_PURPOSE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_PURPOSE])) { + $this->setPurpose(new FHIRMarkdown([FHIRMarkdown::FIELD_VALUE => $data[self::FIELD_PURPOSE]] + $ext)); + } else if (is_array($data[self::FIELD_PURPOSE])) { + $this->setPurpose(new FHIRMarkdown(array_merge($ext, $data[self::FIELD_PURPOSE]))); + } } else { $this->setPurpose(new FHIRMarkdown($data[self::FIELD_PURPOSE])); } @@ -579,8 +627,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRPublicationStatus) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRPublicationStatus([FHIRPublicationStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRPublicationStatus([FHIRPublicationStatus::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRPublicationStatus(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRPublicationStatus($data[self::FIELD_STATUS])); } @@ -591,8 +643,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_TITLE] instanceof FHIRString) { $this->setTitle($data[self::FIELD_TITLE]); - } elseif ($ext && is_scalar($data[self::FIELD_TITLE])) { - $this->setTitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TITLE]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_TITLE])) { + $this->setTitle(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_TITLE]] + $ext)); + } else if (is_array($data[self::FIELD_TITLE])) { + $this->setTitle(new FHIRString(array_merge($ext, $data[self::FIELD_TITLE]))); + } } else { $this->setTitle(new FHIRString($data[self::FIELD_TITLE])); } @@ -603,8 +659,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_URL] instanceof FHIRUri) { $this->setUrl($data[self::FIELD_URL]); - } elseif ($ext && is_scalar($data[self::FIELD_URL])) { - $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri([FHIRUri::FIELD_VALUE => $data[self::FIELD_URL]] + $ext)); + } else if (is_array($data[self::FIELD_URL])) { + $this->setUrl(new FHIRUri(array_merge($ext, $data[self::FIELD_URL]))); + } } else { $this->setUrl(new FHIRUri($data[self::FIELD_URL])); } @@ -612,6 +672,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_USE_CONTEXT])) { if (is_array($data[self::FIELD_USE_CONTEXT])) { foreach($data[self::FIELD_USE_CONTEXT] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRUsageContext) { $this->addUseContext($v); } else { @@ -630,8 +693,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_VERSION] instanceof FHIRString) { $this->setVersion($data[self::FIELD_VERSION]); - } elseif ($ext && is_scalar($data[self::FIELD_VERSION])) { - $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString([FHIRString::FIELD_VALUE => $data[self::FIELD_VERSION]] + $ext)); + } else if (is_array($data[self::FIELD_VERSION])) { + $this->setVersion(new FHIRString(array_merge($ext, $data[self::FIELD_VERSION]))); + } } else { $this->setVersion(new FHIRString($data[self::FIELD_VERSION])); } @@ -1721,7 +1788,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getCompose())) { $v->xmlSerialize($sxe->addChild(self::FIELD_COMPOSE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getContact())) { foreach($vs as $v) { if (null === $v) { @@ -1739,7 +1805,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getDescription())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DESCRIPTION, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getExpansion())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EXPANSION, null, $v->_getFHIRXMLNamespace())); } @@ -1749,7 +1814,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getExtensible())) { $v->xmlSerialize($sxe->addChild(self::FIELD_EXTENSIBLE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -1761,7 +1825,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getImmutable())) { $v->xmlSerialize($sxe->addChild(self::FIELD_IMMUTABLE, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getJurisdiction())) { foreach($vs as $v) { if (null === $v) { @@ -1779,7 +1842,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getPurpose())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PURPOSE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } @@ -1789,7 +1851,6 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null !== ($v = $this->getUrl())) { $v->xmlSerialize($sxe->addChild(self::FIELD_URL, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getUseContext())) { foreach($vs as $v) { if (null === $v) { @@ -1817,67 +1878,175 @@ public function jsonSerialize() $a[self::FIELD_CONTACT] = $vs; } if (null !== ($v = $this->getCopyright())) { - $a[self::FIELD_COPYRIGHT] = $v->getValue(); - $a[self::FIELD_COPYRIGHT_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_COPYRIGHT] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_COPYRIGHT_EXT] = $enc; + } + } else { + $a[self::FIELD_COPYRIGHT] = $v; + } } if (null !== ($v = $this->getDate())) { - $a[self::FIELD_DATE] = $v->getValue(); - $a[self::FIELD_DATE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATE_EXT] = $enc; + } + } else { + $a[self::FIELD_DATE] = $v; + } } if (null !== ($v = $this->getDescription())) { - $a[self::FIELD_DESCRIPTION] = $v->getValue(); - $a[self::FIELD_DESCRIPTION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DESCRIPTION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DESCRIPTION_EXT] = $enc; + } + } else { + $a[self::FIELD_DESCRIPTION] = $v; + } } if (null !== ($v = $this->getExpansion())) { $a[self::FIELD_EXPANSION] = $v; } if (null !== ($v = $this->getExperimental())) { - $a[self::FIELD_EXPERIMENTAL] = $v->getValue(); - $a[self::FIELD_EXPERIMENTAL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EXPERIMENTAL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EXPERIMENTAL_EXT] = $enc; + } + } else { + $a[self::FIELD_EXPERIMENTAL] = $v; + } } if (null !== ($v = $this->getExtensible())) { - $a[self::FIELD_EXTENSIBLE] = $v->getValue(); - $a[self::FIELD_EXTENSIBLE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_EXTENSIBLE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_EXTENSIBLE_EXT] = $enc; + } + } else { + $a[self::FIELD_EXTENSIBLE] = $v; + } } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if (null !== ($v = $this->getImmutable())) { - $a[self::FIELD_IMMUTABLE] = $v->getValue(); - $a[self::FIELD_IMMUTABLE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IMMUTABLE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IMMUTABLE_EXT] = $enc; + } + } else { + $a[self::FIELD_IMMUTABLE] = $v; + } } if ([] !== ($vs = $this->getJurisdiction())) { $a[self::FIELD_JURISDICTION] = $vs; } if (null !== ($v = $this->getName())) { - $a[self::FIELD_NAME] = $v->getValue(); - $a[self::FIELD_NAME_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_NAME] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_NAME_EXT] = $enc; + } + } else { + $a[self::FIELD_NAME] = $v; + } } if (null !== ($v = $this->getPublisher())) { - $a[self::FIELD_PUBLISHER] = $v->getValue(); - $a[self::FIELD_PUBLISHER_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PUBLISHER] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PUBLISHER_EXT] = $enc; + } + } else { + $a[self::FIELD_PUBLISHER] = $v; + } } if (null !== ($v = $this->getPurpose())) { - $a[self::FIELD_PURPOSE] = $v->getValue(); - $a[self::FIELD_PURPOSE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_PURPOSE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_PURPOSE_EXT] = $enc; + } + } else { + $a[self::FIELD_PURPOSE] = $v; + } } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } if (null !== ($v = $this->getTitle())) { - $a[self::FIELD_TITLE] = $v->getValue(); - $a[self::FIELD_TITLE_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_TITLE] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_TITLE_EXT] = $enc; + } + } else { + $a[self::FIELD_TITLE] = $v; + } } if (null !== ($v = $this->getUrl())) { - $a[self::FIELD_URL] = $v->getValue(); - $a[self::FIELD_URL_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_URL] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_URL_EXT] = $enc; + } + } else { + $a[self::FIELD_URL] = $v; + } } if ([] !== ($vs = $this->getUseContext())) { $a[self::FIELD_USE_CONTEXT] = $vs; } if (null !== ($v = $this->getVersion())) { - $a[self::FIELD_VERSION] = $v->getValue(); - $a[self::FIELD_VERSION_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_VERSION] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_VERSION_EXT] = $enc; + } + } else { + $a[self::FIELD_VERSION] = $v; + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRVisionPrescription.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRVisionPrescription.php index afac969c59..cd53acedf0 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRVisionPrescription.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRDomainResource/FHIRVisionPrescription.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -84,10 +84,6 @@ class FHIRVisionPrescription extends FHIRDomainResource implements PHPFHIRContai { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_VISION_PRESCRIPTION; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_DATE_WRITTEN = 'dateWritten'; const FIELD_DATE_WRITTEN_EXT = '_dateWritten'; const FIELD_DISPENSE = 'dispense'; @@ -204,6 +200,9 @@ class FHIRVisionPrescription extends FHIRDomainResource implements PHPFHIRContai */ protected $status = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRVisionPrescription Constructor * @param null|array $data @@ -226,8 +225,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_DATE_WRITTEN] instanceof FHIRDateTime) { $this->setDateWritten($data[self::FIELD_DATE_WRITTEN]); - } elseif ($ext && is_scalar($data[self::FIELD_DATE_WRITTEN])) { - $this->setDateWritten(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE_WRITTEN]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_DATE_WRITTEN])) { + $this->setDateWritten(new FHIRDateTime([FHIRDateTime::FIELD_VALUE => $data[self::FIELD_DATE_WRITTEN]] + $ext)); + } else if (is_array($data[self::FIELD_DATE_WRITTEN])) { + $this->setDateWritten(new FHIRDateTime(array_merge($ext, $data[self::FIELD_DATE_WRITTEN]))); + } } else { $this->setDateWritten(new FHIRDateTime($data[self::FIELD_DATE_WRITTEN])); } @@ -235,6 +238,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_DISPENSE])) { if (is_array($data[self::FIELD_DISPENSE])) { foreach($data[self::FIELD_DISPENSE] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRVisionPrescriptionDispense) { $this->addDispense($v); } else { @@ -260,17 +266,24 @@ public function __construct($data = null) : null; if (is_array($data[self::FIELD_IDENTIFIER])) { foreach($data[self::FIELD_IDENTIFIER] as $i => $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRIdentifier) { $this->addIdentifier($v); - } elseif ($ext && is_scalar($v) && isset($ext[$i]) && is_array($ext[$i])) { - $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (null !== $ext && isset($ext[$i]) && is_array($ext[$i])) { + if (is_scalar($v)) { + $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $v] + $ext[$i])); + } elseif (is_array($v)) { + $this->addIdentifier(new FHIRIdentifier(array_merge($v, $ext[$i]))); + } } else { $this->addIdentifier(new FHIRIdentifier($v)); } } } elseif ($data[self::FIELD_IDENTIFIER] instanceof FHIRIdentifier) { $this->addIdentifier($data[self::FIELD_IDENTIFIER]); - } elseif ($ext && is_scalar($data[self::FIELD_IDENTIFIER])) { + } elseif (null !== $ext && is_scalar($data[self::FIELD_IDENTIFIER])) { $this->addIdentifier(new FHIRIdentifier([FHIRIdentifier::FIELD_VALUE => $data[self::FIELD_IDENTIFIER]] + $ext)); } else { $this->addIdentifier(new FHIRIdentifier($data[self::FIELD_IDENTIFIER])); @@ -310,8 +323,12 @@ public function __construct($data = null) : null; if ($data[self::FIELD_STATUS] instanceof FHIRFinancialResourceStatusCodes) { $this->setStatus($data[self::FIELD_STATUS]); - } elseif ($ext && is_scalar($data[self::FIELD_STATUS])) { - $this->setStatus(new FHIRFinancialResourceStatusCodes([FHIRFinancialResourceStatusCodes::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } elseif (null !== $ext) { + if (is_scalar($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRFinancialResourceStatusCodes([FHIRFinancialResourceStatusCodes::FIELD_VALUE => $data[self::FIELD_STATUS]] + $ext)); + } else if (is_array($data[self::FIELD_STATUS])) { + $this->setStatus(new FHIRFinancialResourceStatusCodes(array_merge($ext, $data[self::FIELD_STATUS]))); + } } else { $this->setStatus(new FHIRFinancialResourceStatusCodes($data[self::FIELD_STATUS])); } @@ -796,10 +813,10 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } parent::xmlSerialize($sxe); + if (null !== ($v = $this->getDateWritten())) { $v->xmlSerialize($sxe->addChild(self::FIELD_DATE_WRITTEN, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getDispense())) { foreach($vs as $v) { if (null === $v) { @@ -808,11 +825,9 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_DISPENSE, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getEncounter())) { $v->xmlSerialize($sxe->addChild(self::FIELD_ENCOUNTER, null, $v->_getFHIRXMLNamespace())); } - if ([] !== ($vs = $this->getIdentifier())) { foreach($vs as $v) { if (null === $v) { @@ -821,23 +836,18 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 $v->xmlSerialize($sxe->addChild(self::FIELD_IDENTIFIER, null, $v->_getFHIRXMLNamespace())); } } - if (null !== ($v = $this->getPatient())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PATIENT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getPrescriber())) { $v->xmlSerialize($sxe->addChild(self::FIELD_PRESCRIBER, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getReasonCodeableConcept())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REASON_CODEABLE_CONCEPT, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getReasonReference())) { $v->xmlSerialize($sxe->addChild(self::FIELD_REASON_REFERENCE, null, $v->_getFHIRXMLNamespace())); } - if (null !== ($v = $this->getStatus())) { $v->xmlSerialize($sxe->addChild(self::FIELD_STATUS, null, $v->_getFHIRXMLNamespace())); } @@ -851,8 +861,15 @@ public function jsonSerialize() { $a = parent::jsonSerialize(); if (null !== ($v = $this->getDateWritten())) { - $a[self::FIELD_DATE_WRITTEN] = $v->getValue(); - $a[self::FIELD_DATE_WRITTEN_EXT] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_DATE_WRITTEN] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_DATE_WRITTEN_EXT] = $enc; + } + } else { + $a[self::FIELD_DATE_WRITTEN] = $v; + } } if ([] !== ($vs = $this->getDispense())) { $a[self::FIELD_DISPENSE] = $vs; @@ -861,7 +878,23 @@ public function jsonSerialize() $a[self::FIELD_ENCOUNTER] = $v; } if ([] !== ($vs = $this->getIdentifier())) { - $a[self::FIELD_IDENTIFIER] = $vs; + $a[self::FIELD_IDENTIFIER] = []; + foreach ($vs as $v) { + if (null === $v) { + continue; + } + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_IDENTIFIER][] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_IDENTIFIER_EXT][] = $enc; + } else { + $a[self::FIELD_IDENTIFIER_EXT][] = null; + } + } else { + $a[self::FIELD_IDENTIFIER][] = $v; + } + } } if (null !== ($v = $this->getPatient())) { $a[self::FIELD_PATIENT] = $v; @@ -876,7 +909,15 @@ public function jsonSerialize() $a[self::FIELD_REASON_REFERENCE] = $v; } if (null !== ($v = $this->getStatus())) { - $a[self::FIELD_STATUS] = $v; + if (null !== ($val = $v->getValue())) { + $a[self::FIELD_STATUS] = $val; + if (1 < count($enc = $v->jsonSerialize())) { + unset($enc[$v::FIELD_VALUE]); + $a[self::FIELD_STATUS_EXT] = $enc; + } + } else { + $a[self::FIELD_STATUS] = $v; + } } return [PHPFHIRConstants::JSON_FIELD_RESOURCE_TYPE => $this->_getResourceType()] + $a; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRParameters.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRParameters.php index cd0185f56c..79247f3468 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRParameters.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResource/FHIRParameters.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -81,10 +81,6 @@ class FHIRParameters extends FHIRResource implements PHPFHIRContainedTypeInterfa { // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_PARAMETERS; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; - const FIELD_PARAMETER = 'parameter'; /** @@ -98,6 +94,9 @@ class FHIRParameters extends FHIRResource implements PHPFHIRContainedTypeInterfa */ protected $parameter = []; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRParameters Constructor * @param null|array $data @@ -117,6 +116,9 @@ public function __construct($data = null) if (isset($data[self::FIELD_PARAMETER])) { if (is_array($data[self::FIELD_PARAMETER])) { foreach($data[self::FIELD_PARAMETER] as $v) { + if (null === $v) { + continue; + } if ($v instanceof FHIRParametersParameter) { $this->addParameter($v); } else { diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResourceContainer.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResourceContainer.php index dbec95d010..d2d96fa0ec 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResourceContainer.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResourceContainer.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -190,9 +190,7 @@ class FHIRResourceContainer implements PHPFHIRCommentContainerInterface, PHPFHIR // name of FHIR type this class describes const FHIR_TYPE_NAME = PHPFHIRConstants::TYPE_NAME_RESOURCE_CONTAINER; - - /** @var string */ - protected $_xmlns = 'http://hl7.org/fhir'; + const FIELD_FHIR_COMMENTS = 'fhir_comments'; const FIELD_ACCOUNT = 'Account'; const FIELD_ACTIVITY_DEFINITION = 'ActivityDefinition'; @@ -1453,6 +1451,9 @@ class FHIRResourceContainer implements PHPFHIRCommentContainerInterface, PHPFHIR */ protected $VisionPrescription = null; + /** @var string */ + protected $_xmlns = 'http://hl7.org/fhir'; + /** * FHIRResourceContainer Constructor * @param null|array $data @@ -1468,6 +1469,13 @@ public function __construct($data = null) gettype($data) )); } + if (isset($data[self::FIELD_FHIR_COMMENTS])) { + if (is_array($data[self::FIELD_FHIR_COMMENTS])) { + $this->_setFHIRComments($data[self::FIELD_FHIR_COMMENTS]); + } else if (is_string($data[self::FIELD_FHIR_COMMENTS])) { + $this->_addFHIRComment($data[self::FIELD_FHIR_COMMENTS]); + } + } if (isset($data[self::FIELD_ACCOUNT])) { if ($data[self::FIELD_ACCOUNT] instanceof FHIRAccount) { $this->setAccount($data[self::FIELD_ACCOUNT]); @@ -6423,6 +6431,7 @@ public function xmlSerialize(\SimpleXMLElement $sxe = null, $libxmlOpts = 591872 if (null === $sxe) { $sxe = new \SimpleXMLElement($this->_getFHIRXMLElementDefinition(), $libxmlOpts, false); } + return $sxe; } diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResourceType.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResourceType.php index f0de5b37c7..6c5b8930c2 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResourceType.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResourceType.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResourceTypeList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResourceTypeList.php index 105bf9cd89..f5eef3843d 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResourceTypeList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResourceTypeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResourceVersionPolicyList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResourceVersionPolicyList.php index 32093b315d..4843999ff9 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResourceVersionPolicyList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResourceVersionPolicyList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResponseTypeList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResponseTypeList.php index 05c38285e8..13f9dee27a 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResponseTypeList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRResponseTypeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRRestfulCapabilityModeList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRRestfulCapabilityModeList.php index 81a4deebdd..35e7f24101 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRRestfulCapabilityModeList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRRestfulCapabilityModeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRSampledDataDataTypePrimitive.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRSampledDataDataTypePrimitive.php index b2a3d24565..d30e306ef8 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRSampledDataDataTypePrimitive.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRSampledDataDataTypePrimitive.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRSearchComparatorList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRSearchComparatorList.php index 82e09eb155..7c17539fc1 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRSearchComparatorList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRSearchComparatorList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRSearchEntryModeList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRSearchEntryModeList.php index 7b558479c7..fed1503a58 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRSearchEntryModeList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRSearchEntryModeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRSearchModifierCodeList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRSearchModifierCodeList.php index 264b569d0d..d3dac73ef3 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRSearchModifierCodeList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRSearchModifierCodeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRSearchParamTypeList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRSearchParamTypeList.php index 4bfdf16688..fd0ce9f3c0 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRSearchParamTypeList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRSearchParamTypeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRSlicingRulesList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRSlicingRulesList.php index b3b4293635..46103804ea 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRSlicingRulesList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRSlicingRulesList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRSlotStatusList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRSlotStatusList.php index 670f47d284..4a6eba9420 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRSlotStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRSlotStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRSpecimenStatusList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRSpecimenStatusList.php index 41af0ed747..e40c90d832 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRSpecimenStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRSpecimenStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRStringPrimitive.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRStringPrimitive.php index 69bd056f24..4e920a90f3 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRStringPrimitive.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRStringPrimitive.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRStructureDefinitionKindList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRStructureDefinitionKindList.php index 960f8696ca..98ef4e6025 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRStructureDefinitionKindList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRStructureDefinitionKindList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRStructureMapContextTypeList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRStructureMapContextTypeList.php index b270118259..62611b8805 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRStructureMapContextTypeList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRStructureMapContextTypeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRStructureMapGroupTypeModeList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRStructureMapGroupTypeModeList.php index 26f7eeaccb..ad9f86afca 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRStructureMapGroupTypeModeList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRStructureMapGroupTypeModeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRStructureMapInputModeList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRStructureMapInputModeList.php index c355c858ce..bd1f37dc23 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRStructureMapInputModeList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRStructureMapInputModeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRStructureMapModelModeList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRStructureMapModelModeList.php index 701291c14d..8ae14e287e 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRStructureMapModelModeList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRStructureMapModelModeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRStructureMapSourceListModeList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRStructureMapSourceListModeList.php index f26f641e2c..670e8cdf8f 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRStructureMapSourceListModeList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRStructureMapSourceListModeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRStructureMapTargetListModeList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRStructureMapTargetListModeList.php index 2bd53516ff..26b219fe40 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRStructureMapTargetListModeList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRStructureMapTargetListModeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRStructureMapTransformList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRStructureMapTransformList.php index b5b9987880..cb22ef7612 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRStructureMapTransformList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRStructureMapTransformList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRSubscriptionChannelTypeList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRSubscriptionChannelTypeList.php index 74665f2d44..720c8eed78 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRSubscriptionChannelTypeList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRSubscriptionChannelTypeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRSubscriptionStatusList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRSubscriptionStatusList.php index f324c67d82..9cb4e0c873 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRSubscriptionStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRSubscriptionStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRSupplyDeliveryStatusList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRSupplyDeliveryStatusList.php index 4ca47a5324..19340c4989 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRSupplyDeliveryStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRSupplyDeliveryStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRSupplyRequestStatusList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRSupplyRequestStatusList.php index 175a4fd73f..4aeef8b7c8 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRSupplyRequestStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRSupplyRequestStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRSystemRestfulInteractionList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRSystemRestfulInteractionList.php index 630e854956..2139775929 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRSystemRestfulInteractionList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRSystemRestfulInteractionList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRSystemVersionProcessingModeList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRSystemVersionProcessingModeList.php index b24808fdac..7af9d5bac4 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRSystemVersionProcessingModeList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRSystemVersionProcessingModeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRTaskStatusList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRTaskStatusList.php index 187a8c9039..d5259828d9 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRTaskStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRTaskStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRTestReportActionResultList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRTestReportActionResultList.php index 9690f49adb..a5ac2b4ff2 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRTestReportActionResultList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRTestReportActionResultList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRTestReportParticipantTypeList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRTestReportParticipantTypeList.php index 1f476bbb0d..d41a8f8bcd 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRTestReportParticipantTypeList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRTestReportParticipantTypeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRTestReportResultList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRTestReportResultList.php index 563ecd2ef5..ef09920332 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRTestReportResultList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRTestReportResultList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRTestReportStatusList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRTestReportStatusList.php index 648eaf7d3b..dc248bad78 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRTestReportStatusList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRTestReportStatusList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRTestScriptRequestMethodCodeList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRTestScriptRequestMethodCodeList.php index 44a2bddf2f..2eea0623e8 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRTestScriptRequestMethodCodeList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRTestScriptRequestMethodCodeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRTimePrimitive.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRTimePrimitive.php index c3b317460a..81b935704c 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRTimePrimitive.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRTimePrimitive.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRTriggerTypeList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRTriggerTypeList.php index 6d27b13a09..35ccbba5c5 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRTriggerTypeList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRTriggerTypeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRTypeDerivationRuleList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRTypeDerivationRuleList.php index 8c92733f1f..d058c6e784 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRTypeDerivationRuleList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRTypeDerivationRuleList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRTypeRestfulInteractionList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRTypeRestfulInteractionList.php index a5d3293a70..5bf03a30f0 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRTypeRestfulInteractionList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRTypeRestfulInteractionList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRUDIEntryTypeList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRUDIEntryTypeList.php index 249ecae7ad..e27b49a9dc 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRUDIEntryTypeList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRUDIEntryTypeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRUnitsOfTimeList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRUnitsOfTimeList.php index b9b40f90a0..f0893402fc 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRUnitsOfTimeList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRUnitsOfTimeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRUnknownContentCodeList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRUnknownContentCodeList.php index 9df5906f77..41a5bf530a 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRUnknownContentCodeList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRUnknownContentCodeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRUnsignedIntPrimitive.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRUnsignedIntPrimitive.php index 4a9263384c..4045f09fbe 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRUnsignedIntPrimitive.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRUnsignedIntPrimitive.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRUriPrimitive.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRUriPrimitive.php index c093da698a..a51a2019f3 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRUriPrimitive.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRUriPrimitive.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRUseList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRUseList.php index 2fbaf0e4b2..45b6bce7e9 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRUseList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRUseList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRUuidPrimitive.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRUuidPrimitive.php index 7e06cbe4c6..4eeade97ca 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRUuidPrimitive.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRUuidPrimitive.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRVisionBaseList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRVisionBaseList.php index cee6b9420b..1fd4c0ccea 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRVisionBaseList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRVisionBaseList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRVisionEyesList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRVisionEyesList.php index ae83253d59..231149af9c 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRVisionEyesList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRVisionEyesList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRXPathUsageTypeList.php b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRXPathUsageTypeList.php index 101a06677b..7422c1bf04 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/FHIRXPathUsageTypeList.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/FHIRXPathUsageTypeList.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRAutoloader.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRAutoloader.php index 21b9918423..79bcdce630 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRAutoloader.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRAutoloader.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRCommentContainerInterface.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRCommentContainerInterface.php index a0a6704a60..e7714b4b3c 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRCommentContainerInterface.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRCommentContainerInterface.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRCommentContainerTrait.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRCommentContainerTrait.php index 4309e26761..abec401696 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRCommentContainerTrait.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRCommentContainerTrait.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -69,7 +69,7 @@ trait PHPFHIRCommentContainerTrait { /** @var array */ - private $_fhirComments = []; + protected $_fhirComments = []; /** * Arbitrary comments of a hopefully useful nature diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRConstants.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRConstants.php index a4243df6f3..b652ea8eb1 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRConstants.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRConstants.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * @@ -73,7 +73,7 @@ abstract class PHPFHIRConstants const SOURCE_GENERATION_DATE = 'Wed, Apr 19, 2017 07:44+1000'; // PHPFHIR - const CODE_GENERATION_DATE = 'November 10th, 2019 18:12+0000'; + const CODE_GENERATION_DATE = 'November 17th, 2019 04:38+0000'; // Common const JSON_FIELD_RESOURCE_TYPE = 'resourceType'; diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRContainedTypeInterface.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRContainedTypeInterface.php index a18726b4d9..951a35206b 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRContainedTypeInterface.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRContainedTypeInterface.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRResponseParser.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRResponseParser.php index 37ef13c61e..e3f55276cc 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRResponseParser.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRResponseParser.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRResponseParserConfig.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRResponseParserConfig.php index 267172d43a..5e1594eedd 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRResponseParserConfig.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRResponseParserConfig.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRAccountStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRAccountStatusListTest.php index 1e77c90de6..42c2577c34 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRAccountStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRAccountStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRActionCardinalityBehaviorListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRActionCardinalityBehaviorListTest.php index 57d456916a..2619823c75 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRActionCardinalityBehaviorListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRActionCardinalityBehaviorListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRActionConditionKindListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRActionConditionKindListTest.php index 09dc1c0942..f7f977be75 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRActionConditionKindListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRActionConditionKindListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRActionGroupingBehaviorListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRActionGroupingBehaviorListTest.php index f2d9adcf23..ab35fefccb 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRActionGroupingBehaviorListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRActionGroupingBehaviorListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRActionListListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRActionListListTest.php index 06a3f204ee..ff497b9a7e 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRActionListListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRActionListListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRActionParticipantTypeListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRActionParticipantTypeListTest.php index 661cf9429e..82c4c23b6c 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRActionParticipantTypeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRActionParticipantTypeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRActionPrecheckBehaviorListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRActionPrecheckBehaviorListTest.php index fa003e7c48..3f29b8934b 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRActionPrecheckBehaviorListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRActionPrecheckBehaviorListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRActionRelationshipTypeListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRActionRelationshipTypeListTest.php index 1b98476ab2..21e82d7926 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRActionRelationshipTypeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRActionRelationshipTypeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRActionRequiredBehaviorListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRActionRequiredBehaviorListTest.php index 6cbe2461c0..4477789d27 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRActionRequiredBehaviorListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRActionRequiredBehaviorListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRActionSelectionBehaviorListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRActionSelectionBehaviorListTest.php index d6becaf2a8..d21060b22b 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRActionSelectionBehaviorListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRActionSelectionBehaviorListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRAddressTypeListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRAddressTypeListTest.php index b58a18cdad..0c55ac384b 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRAddressTypeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRAddressTypeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRAddressUseListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRAddressUseListTest.php index 921944a8da..ef0ae1ae86 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRAddressUseListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRAddressUseListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRAdministrativeGenderListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRAdministrativeGenderListTest.php index 80a8973304..b6c22628b7 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRAdministrativeGenderListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRAdministrativeGenderListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRAdverseEventCategoryListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRAdverseEventCategoryListTest.php index a3e8815204..e8718a18f8 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRAdverseEventCategoryListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRAdverseEventCategoryListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRAdverseEventCausalityListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRAdverseEventCausalityListTest.php index 6dc2df90e0..5e3216a5ad 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRAdverseEventCausalityListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRAdverseEventCausalityListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRAggregationModeListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRAggregationModeListTest.php index d6ea3c4375..de786912ed 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRAggregationModeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRAggregationModeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRAllergyIntoleranceCategoryListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRAllergyIntoleranceCategoryListTest.php index 63eab1fc49..1e493e6e7f 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRAllergyIntoleranceCategoryListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRAllergyIntoleranceCategoryListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRAllergyIntoleranceClinicalStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRAllergyIntoleranceClinicalStatusListTest.php index 47cc7fa1cd..e5bf1288e9 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRAllergyIntoleranceClinicalStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRAllergyIntoleranceClinicalStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRAllergyIntoleranceCriticalityListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRAllergyIntoleranceCriticalityListTest.php index 6437d4f72c..a73f7f2141 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRAllergyIntoleranceCriticalityListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRAllergyIntoleranceCriticalityListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRAllergyIntoleranceSeverityListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRAllergyIntoleranceSeverityListTest.php index d69c637fbe..927b11141b 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRAllergyIntoleranceSeverityListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRAllergyIntoleranceSeverityListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRAllergyIntoleranceTypeListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRAllergyIntoleranceTypeListTest.php index 1e8627620f..a438b302be 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRAllergyIntoleranceTypeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRAllergyIntoleranceTypeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRAllergyIntoleranceVerificationStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRAllergyIntoleranceVerificationStatusListTest.php index 41df8868d6..68e2dbd94e 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRAllergyIntoleranceVerificationStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRAllergyIntoleranceVerificationStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRAppointmentStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRAppointmentStatusListTest.php index 6cb20aa2fd..81c23f6023 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRAppointmentStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRAppointmentStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRAssertionDirectionTypeListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRAssertionDirectionTypeListTest.php index aa6591f124..09ead72cb9 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRAssertionDirectionTypeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRAssertionDirectionTypeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRAssertionOperatorTypeListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRAssertionOperatorTypeListTest.php index b4fb4d54bf..481da10cf3 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRAssertionOperatorTypeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRAssertionOperatorTypeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRAssertionResponseTypesListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRAssertionResponseTypesListTest.php index 9bdb8f0de1..b43f9dbc16 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRAssertionResponseTypesListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRAssertionResponseTypesListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRAuditEventActionListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRAuditEventActionListTest.php index faf327b8bb..a0dfc082ab 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRAuditEventActionListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRAuditEventActionListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRAuditEventAgentNetworkTypeListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRAuditEventAgentNetworkTypeListTest.php index bcd2e90d3c..490d107de1 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRAuditEventAgentNetworkTypeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRAuditEventAgentNetworkTypeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRAuditEventOutcomeListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRAuditEventOutcomeListTest.php index e6cd0fe6dc..4431ddc430 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRAuditEventOutcomeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRAuditEventOutcomeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRBase64BinaryPrimitiveTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRBase64BinaryPrimitiveTest.php index f00539fb68..fbc47db701 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRBase64BinaryPrimitiveTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRBase64BinaryPrimitiveTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRBindingStrengthListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRBindingStrengthListTest.php index 2f01c68f30..3034333f19 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRBindingStrengthListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRBindingStrengthListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRBooleanPrimitiveTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRBooleanPrimitiveTest.php index cc3d397b13..3ce03c8807 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRBooleanPrimitiveTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRBooleanPrimitiveTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRBundleTypeListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRBundleTypeListTest.php index db2929d803..f661115936 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRBundleTypeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRBundleTypeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRCapabilityStatementKindListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRCapabilityStatementKindListTest.php index e5aaa302e6..90e2cdf5a5 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRCapabilityStatementKindListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRCapabilityStatementKindListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRCarePlanActivityStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRCarePlanActivityStatusListTest.php index 81b8527dcb..d2d6de1f9d 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRCarePlanActivityStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRCarePlanActivityStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRCarePlanIntentListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRCarePlanIntentListTest.php index d3f00e526d..4080de0ba6 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRCarePlanIntentListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRCarePlanIntentListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRCarePlanStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRCarePlanStatusListTest.php index 4a71f512dd..70267fc271 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRCarePlanStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRCarePlanStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRCareTeamStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRCareTeamStatusListTest.php index 64acae1c0c..91f84bad21 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRCareTeamStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRCareTeamStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRChargeItemStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRChargeItemStatusListTest.php index 783f9eb960..a4baa94a3a 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRChargeItemStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRChargeItemStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRClinicalImpressionStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRClinicalImpressionStatusListTest.php index 3538d7285f..d39e4d34a7 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRClinicalImpressionStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRClinicalImpressionStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRCodePrimitiveTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRCodePrimitiveTest.php index 52e3ac2214..6f0936412c 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRCodePrimitiveTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRCodePrimitiveTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRCodeSystemContentModeListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRCodeSystemContentModeListTest.php index 9361fc40b1..3160e30acd 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRCodeSystemContentModeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRCodeSystemContentModeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRCodeSystemHierarchyMeaningListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRCodeSystemHierarchyMeaningListTest.php index ea726f59b9..b9d6504143 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRCodeSystemHierarchyMeaningListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRCodeSystemHierarchyMeaningListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRCompartmentTypeListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRCompartmentTypeListTest.php index 492e2b7fb3..ff7e7a4ddd 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRCompartmentTypeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRCompartmentTypeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRCompositionAttestationModeListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRCompositionAttestationModeListTest.php index 822c779097..437ab3c2df 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRCompositionAttestationModeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRCompositionAttestationModeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRCompositionStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRCompositionStatusListTest.php index 6ad0620591..ed66319876 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRCompositionStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRCompositionStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRConceptMapEquivalenceListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRConceptMapEquivalenceListTest.php index 61dd6e81b0..8bbf2faf8e 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRConceptMapEquivalenceListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRConceptMapEquivalenceListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRConceptMapGroupUnmappedModeListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRConceptMapGroupUnmappedModeListTest.php index 99e6240106..eda663d654 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRConceptMapGroupUnmappedModeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRConceptMapGroupUnmappedModeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRConditionClinicalStatusCodesListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRConditionClinicalStatusCodesListTest.php index 0d0e1ba21a..487d9d51e6 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRConditionClinicalStatusCodesListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRConditionClinicalStatusCodesListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRConditionVerificationStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRConditionVerificationStatusListTest.php index a010e9e4a1..cdd1627b1c 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRConditionVerificationStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRConditionVerificationStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRConditionalDeleteStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRConditionalDeleteStatusListTest.php index 3b32ae8813..0da6b0dd2a 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRConditionalDeleteStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRConditionalDeleteStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRConditionalReadStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRConditionalReadStatusListTest.php index a706133e30..20cf6cf72e 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRConditionalReadStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRConditionalReadStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRConfidentialityClassificationListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRConfidentialityClassificationListTest.php index 073e39c9b1..dc7f7f69bc 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRConfidentialityClassificationListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRConfidentialityClassificationListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRConsentDataMeaningListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRConsentDataMeaningListTest.php index aeb0d477ca..7a040daa98 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRConsentDataMeaningListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRConsentDataMeaningListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRConsentExceptTypeListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRConsentExceptTypeListTest.php index fdd2f2fd9e..17e1ffd145 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRConsentExceptTypeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRConsentExceptTypeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRConsentStateListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRConsentStateListTest.php index 0bf8ffabc9..6e88de7621 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRConsentStateListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRConsentStateListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRConstraintSeverityListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRConstraintSeverityListTest.php index e08dd3f940..ba1d9d8e45 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRConstraintSeverityListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRConstraintSeverityListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRContactPointSystemListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRContactPointSystemListTest.php index 73d0d0a1bc..409167e80c 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRContactPointSystemListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRContactPointSystemListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRContactPointUseListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRContactPointUseListTest.php index 571ebd938a..db02e996b5 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRContactPointUseListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRContactPointUseListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRContentTypeListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRContentTypeListTest.php index 7a1013d528..6f391aceeb 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRContentTypeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRContentTypeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRContractResourceStatusCodesListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRContractResourceStatusCodesListTest.php index ee6cc96879..fcdbad4186 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRContractResourceStatusCodesListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRContractResourceStatusCodesListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRContributorTypeListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRContributorTypeListTest.php index 56c8d8c173..1120da71a0 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRContributorTypeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRContributorTypeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRDataElementStringencyListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRDataElementStringencyListTest.php index b3ef4a26f8..d9c42c9fdf 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRDataElementStringencyListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRDataElementStringencyListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRDatePrimitiveTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRDatePrimitiveTest.php index c8f06c6846..d3a6b751f7 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRDatePrimitiveTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRDatePrimitiveTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRDateTimePrimitiveTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRDateTimePrimitiveTest.php index f050d36bd5..bcb03eb35d 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRDateTimePrimitiveTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRDateTimePrimitiveTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRDaysOfWeekListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRDaysOfWeekListTest.php index b85a93c2f4..27c723fbbb 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRDaysOfWeekListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRDaysOfWeekListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRDecimalPrimitiveTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRDecimalPrimitiveTest.php index 311f81ec29..8ffb95b372 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRDecimalPrimitiveTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRDecimalPrimitiveTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRDetectedIssueSeverityListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRDetectedIssueSeverityListTest.php index f33fc8efc4..fb40a91eb5 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRDetectedIssueSeverityListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRDetectedIssueSeverityListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRDeviceMetricCalibrationStateListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRDeviceMetricCalibrationStateListTest.php index 56458bbc13..8fc4b1a2a4 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRDeviceMetricCalibrationStateListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRDeviceMetricCalibrationStateListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRDeviceMetricCalibrationTypeListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRDeviceMetricCalibrationTypeListTest.php index b2c845e9ab..fc24f84055 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRDeviceMetricCalibrationTypeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRDeviceMetricCalibrationTypeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRDeviceMetricCategoryListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRDeviceMetricCategoryListTest.php index 253de6dfb2..5b5f3b9953 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRDeviceMetricCategoryListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRDeviceMetricCategoryListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRDeviceMetricColorListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRDeviceMetricColorListTest.php index 9a5886b3ec..e09c30f3fc 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRDeviceMetricColorListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRDeviceMetricColorListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRDeviceMetricOperationalStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRDeviceMetricOperationalStatusListTest.php index d3bd6fc1cd..e9eb11cce4 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRDeviceMetricOperationalStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRDeviceMetricOperationalStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRDeviceUseStatementStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRDeviceUseStatementStatusListTest.php index 465b8b8420..f03f045fe5 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRDeviceUseStatementStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRDeviceUseStatementStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRDiagnosticReportStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRDiagnosticReportStatusListTest.php index c7502fea84..520b7de70b 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRDiagnosticReportStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRDiagnosticReportStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRDigitalMediaTypeListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRDigitalMediaTypeListTest.php index f81ffe918d..27588b4504 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRDigitalMediaTypeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRDigitalMediaTypeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRDiscriminatorTypeListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRDiscriminatorTypeListTest.php index 02be93179e..1e5daffc16 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRDiscriminatorTypeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRDiscriminatorTypeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRDocumentModeListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRDocumentModeListTest.php index 10ac2c1b62..1e7c53fe8e 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRDocumentModeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRDocumentModeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRDocumentReferenceStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRDocumentReferenceStatusListTest.php index 911c4db2c9..d7831c79e5 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRDocumentReferenceStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRDocumentReferenceStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRDocumentRelationshipTypeListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRDocumentRelationshipTypeListTest.php index 7b8d44cb10..0c6e0fc25b 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRDocumentRelationshipTypeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRDocumentRelationshipTypeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRAccountStatusTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRAccountStatusTest.php index 76f7ca456d..22174203a7 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRAccountStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRAccountStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRActionCardinalityBehaviorTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRActionCardinalityBehaviorTest.php index c164d1a321..87f3f570ae 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRActionCardinalityBehaviorTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRActionCardinalityBehaviorTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRActionConditionKindTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRActionConditionKindTest.php index db426c6bb0..9a564f875f 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRActionConditionKindTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRActionConditionKindTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRActionGroupingBehaviorTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRActionGroupingBehaviorTest.php index 06e37cd318..0b5166a445 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRActionGroupingBehaviorTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRActionGroupingBehaviorTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRActionListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRActionListTest.php index 28fdde9e90..ae825596e5 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRActionListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRActionListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRActionParticipantTypeTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRActionParticipantTypeTest.php index 6a7ac1e7b3..25f4305837 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRActionParticipantTypeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRActionParticipantTypeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRActionPrecheckBehaviorTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRActionPrecheckBehaviorTest.php index 28b1c64a6d..ac7d9b0195 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRActionPrecheckBehaviorTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRActionPrecheckBehaviorTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRActionRelationshipTypeTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRActionRelationshipTypeTest.php index 098e5c4e2d..9ff3b22849 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRActionRelationshipTypeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRActionRelationshipTypeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRActionRequiredBehaviorTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRActionRequiredBehaviorTest.php index 07331dca98..5b28e4e4d0 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRActionRequiredBehaviorTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRActionRequiredBehaviorTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRActionSelectionBehaviorTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRActionSelectionBehaviorTest.php index eeb6f4cd23..2c92a55368 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRActionSelectionBehaviorTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRActionSelectionBehaviorTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRAddressTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRAddressTest.php index 748470b36b..0b9568a2c2 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRAddressTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRAddressTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRAddressTypeTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRAddressTypeTest.php index 2239502aa8..9f99ea9168 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRAddressTypeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRAddressTypeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRAddressUseTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRAddressUseTest.php index 12a5d82c60..1afbf18d7f 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRAddressUseTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRAddressUseTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRAdministrativeGenderTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRAdministrativeGenderTest.php index e954d3e94e..0dc8b4ac34 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRAdministrativeGenderTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRAdministrativeGenderTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRAdverseEventCategoryTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRAdverseEventCategoryTest.php index 14d7558005..5a123a1fcd 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRAdverseEventCategoryTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRAdverseEventCategoryTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRAdverseEventCausalityTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRAdverseEventCausalityTest.php index 496646d4ae..309ffb16c3 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRAdverseEventCausalityTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRAdverseEventCausalityTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRAggregationModeTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRAggregationModeTest.php index f007a37840..e79e31791f 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRAggregationModeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRAggregationModeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRAllergyIntoleranceCategoryTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRAllergyIntoleranceCategoryTest.php index a81de3ba27..7e7ac0e545 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRAllergyIntoleranceCategoryTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRAllergyIntoleranceCategoryTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRAllergyIntoleranceClinicalStatusTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRAllergyIntoleranceClinicalStatusTest.php index 82c79ae1ba..e98d0a5aaa 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRAllergyIntoleranceClinicalStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRAllergyIntoleranceClinicalStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRAllergyIntoleranceCriticalityTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRAllergyIntoleranceCriticalityTest.php index 5cea9ae5ff..34c0b15f02 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRAllergyIntoleranceCriticalityTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRAllergyIntoleranceCriticalityTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRAllergyIntoleranceSeverityTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRAllergyIntoleranceSeverityTest.php index 1100f0069d..4278c84b69 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRAllergyIntoleranceSeverityTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRAllergyIntoleranceSeverityTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRAllergyIntoleranceTypeTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRAllergyIntoleranceTypeTest.php index 0bc7a78b5d..6c9a40178a 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRAllergyIntoleranceTypeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRAllergyIntoleranceTypeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRAllergyIntoleranceVerificationStatusTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRAllergyIntoleranceVerificationStatusTest.php index ad1f3dd7a7..bc06620982 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRAllergyIntoleranceVerificationStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRAllergyIntoleranceVerificationStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRAnnotationTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRAnnotationTest.php index 9774bee3a9..6b86098b25 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRAnnotationTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRAnnotationTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRAppointmentStatusTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRAppointmentStatusTest.php index 555b77cd1e..b7a42220d5 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRAppointmentStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRAppointmentStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRAssertionDirectionTypeTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRAssertionDirectionTypeTest.php index 3dc1d437d5..93f9f0478a 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRAssertionDirectionTypeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRAssertionDirectionTypeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRAssertionOperatorTypeTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRAssertionOperatorTypeTest.php index df45a63687..bfa41bce16 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRAssertionOperatorTypeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRAssertionOperatorTypeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRAssertionResponseTypesTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRAssertionResponseTypesTest.php index 1466823cac..7dee92292f 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRAssertionResponseTypesTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRAssertionResponseTypesTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRAttachmentTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRAttachmentTest.php index df90b7fded..12e6e8ba63 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRAttachmentTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRAttachmentTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRAuditEventActionTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRAuditEventActionTest.php index ee43a12c67..494856332a 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRAuditEventActionTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRAuditEventActionTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRAuditEventAgentNetworkTypeTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRAuditEventAgentNetworkTypeTest.php index 12c82a6607..2e05983fe9 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRAuditEventAgentNetworkTypeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRAuditEventAgentNetworkTypeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRAuditEventOutcomeTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRAuditEventOutcomeTest.php index 9af3e7f6e9..d2a2cb033a 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRAuditEventOutcomeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRAuditEventOutcomeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRAccount/FHIRAccountCoverageTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRAccount/FHIRAccountCoverageTest.php index 4b38b1a54b..779b591e3f 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRAccount/FHIRAccountCoverageTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRAccount/FHIRAccountCoverageTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRAccount/FHIRAccountGuarantorTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRAccount/FHIRAccountGuarantorTest.php index 5ee0849c67..55b1a2d098 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRAccount/FHIRAccountGuarantorTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRAccount/FHIRAccountGuarantorTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRActivityDefinition/FHIRActivityDefinitionDynamicValueTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRActivityDefinition/FHIRActivityDefinitionDynamicValueTest.php index 6a43700f78..2428da5856 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRActivityDefinition/FHIRActivityDefinitionDynamicValueTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRActivityDefinition/FHIRActivityDefinitionDynamicValueTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRActivityDefinition/FHIRActivityDefinitionParticipantTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRActivityDefinition/FHIRActivityDefinitionParticipantTest.php index 09949efb7a..ca0822cdbd 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRActivityDefinition/FHIRActivityDefinitionParticipantTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRActivityDefinition/FHIRActivityDefinitionParticipantTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRAdverseEvent/FHIRAdverseEventSuspectEntityTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRAdverseEvent/FHIRAdverseEventSuspectEntityTest.php index 167aeae62e..a1c4ab6752 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRAdverseEvent/FHIRAdverseEventSuspectEntityTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRAdverseEvent/FHIRAdverseEventSuspectEntityTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRAllergyIntolerance/FHIRAllergyIntoleranceReactionTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRAllergyIntolerance/FHIRAllergyIntoleranceReactionTest.php index a6d73a2193..53d94701b8 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRAllergyIntolerance/FHIRAllergyIntoleranceReactionTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRAllergyIntolerance/FHIRAllergyIntoleranceReactionTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRAppointment/FHIRAppointmentParticipantTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRAppointment/FHIRAppointmentParticipantTest.php index 1c8424a62b..782f9d2414 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRAppointment/FHIRAppointmentParticipantTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRAppointment/FHIRAppointmentParticipantTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRAuditEvent/FHIRAuditEventAgentTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRAuditEvent/FHIRAuditEventAgentTest.php index f5d62d3fec..ca6cde1dc4 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRAuditEvent/FHIRAuditEventAgentTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRAuditEvent/FHIRAuditEventAgentTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRAuditEvent/FHIRAuditEventDetailTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRAuditEvent/FHIRAuditEventDetailTest.php index 60a55e35f1..71729ec01d 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRAuditEvent/FHIRAuditEventDetailTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRAuditEvent/FHIRAuditEventDetailTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRAuditEvent/FHIRAuditEventEntityTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRAuditEvent/FHIRAuditEventEntityTest.php index 9d27c8a724..9bfc0fb2a6 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRAuditEvent/FHIRAuditEventEntityTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRAuditEvent/FHIRAuditEventEntityTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRAuditEvent/FHIRAuditEventNetworkTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRAuditEvent/FHIRAuditEventNetworkTest.php index 02a42a3e3f..da2f4345f2 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRAuditEvent/FHIRAuditEventNetworkTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRAuditEvent/FHIRAuditEventNetworkTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRAuditEvent/FHIRAuditEventSourceTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRAuditEvent/FHIRAuditEventSourceTest.php index ac5286588f..fbc75064ea 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRAuditEvent/FHIRAuditEventSourceTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRAuditEvent/FHIRAuditEventSourceTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRBundle/FHIRBundleEntryTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRBundle/FHIRBundleEntryTest.php index a665d440ca..ca2e86a204 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRBundle/FHIRBundleEntryTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRBundle/FHIRBundleEntryTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRBundle/FHIRBundleLinkTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRBundle/FHIRBundleLinkTest.php index 0c022c1cba..d4d4bc30d4 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRBundle/FHIRBundleLinkTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRBundle/FHIRBundleLinkTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRBundle/FHIRBundleRequestTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRBundle/FHIRBundleRequestTest.php index 96843e2590..a0dd161faa 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRBundle/FHIRBundleRequestTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRBundle/FHIRBundleRequestTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRBundle/FHIRBundleResponseTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRBundle/FHIRBundleResponseTest.php index 121a8bac0b..248c32a938 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRBundle/FHIRBundleResponseTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRBundle/FHIRBundleResponseTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRBundle/FHIRBundleSearchTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRBundle/FHIRBundleSearchTest.php index be82386beb..f994067309 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRBundle/FHIRBundleSearchTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRBundle/FHIRBundleSearchTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementCertificateTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementCertificateTest.php index a1645ca475..13c52d4d90 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementCertificateTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementCertificateTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementDocumentTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementDocumentTest.php index 01dda988d5..316ecd0e89 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementDocumentTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementDocumentTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementEndpointTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementEndpointTest.php index a460ac1348..4b06811897 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementEndpointTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementEndpointTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementEventTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementEventTest.php index 4d9647a82d..d8b2c9932e 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementEventTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementEventTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementImplementationTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementImplementationTest.php index d55b420eb3..6051b436a2 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementImplementationTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementImplementationTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementInteraction1Test.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementInteraction1Test.php index ff6060546d..e4622d1e0b 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementInteraction1Test.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementInteraction1Test.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementInteractionTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementInteractionTest.php index a45de6089e..4bfe5bc6db 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementInteractionTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementInteractionTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementMessagingTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementMessagingTest.php index 36e4868ad7..53757fc3d3 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementMessagingTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementMessagingTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementOperationTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementOperationTest.php index c708690989..07985109ed 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementOperationTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementOperationTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementResourceTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementResourceTest.php index 8ad13a2b95..27517bd9ed 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementResourceTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementResourceTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementRestTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementRestTest.php index bdf35efeec..ce1df9f8d4 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementRestTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementRestTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementSearchParamTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementSearchParamTest.php index 565e93e7ed..652ae3cb96 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementSearchParamTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementSearchParamTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementSecurityTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementSecurityTest.php index df97b66546..c365acfad8 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementSecurityTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementSecurityTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementSoftwareTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementSoftwareTest.php index 3bc3985ebf..e867deab4e 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementSoftwareTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementSoftwareTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementSupportedMessageTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementSupportedMessageTest.php index dc7df3649a..fa1c2fc754 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementSupportedMessageTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCapabilityStatement/FHIRCapabilityStatementSupportedMessageTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCarePlan/FHIRCarePlanActivityTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCarePlan/FHIRCarePlanActivityTest.php index 9075c6bcea..792a83b82b 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCarePlan/FHIRCarePlanActivityTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCarePlan/FHIRCarePlanActivityTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCarePlan/FHIRCarePlanDetailTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCarePlan/FHIRCarePlanDetailTest.php index 9db169f1fc..cf24cf5f57 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCarePlan/FHIRCarePlanDetailTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCarePlan/FHIRCarePlanDetailTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCareTeam/FHIRCareTeamParticipantTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCareTeam/FHIRCareTeamParticipantTest.php index 5f2a57cff3..ce7c7277c7 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCareTeam/FHIRCareTeamParticipantTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCareTeam/FHIRCareTeamParticipantTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRChargeItem/FHIRChargeItemParticipantTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRChargeItem/FHIRChargeItemParticipantTest.php index de544543ab..3db608b7ca 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRChargeItem/FHIRChargeItemParticipantTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRChargeItem/FHIRChargeItemParticipantTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimAccidentTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimAccidentTest.php index 22fd88e612..aedcf78594 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimAccidentTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimAccidentTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimCareTeamTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimCareTeamTest.php index 3bb348c60d..535df27dc8 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimCareTeamTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimCareTeamTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimDetailTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimDetailTest.php index 43e23954a5..ca9f12adf1 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimDetailTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimDetailTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimDiagnosisTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimDiagnosisTest.php index 6b040ab69f..1dc9f3e0c4 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimDiagnosisTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimDiagnosisTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimInformationTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimInformationTest.php index e584a3f477..453910d0d4 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimInformationTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimInformationTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimInsuranceTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimInsuranceTest.php index 20260d18b0..27343df9fa 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimInsuranceTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimInsuranceTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimItemTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimItemTest.php index cee2de8bd1..5362cd53cd 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimItemTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimItemTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimPayeeTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimPayeeTest.php index f23d826b72..1ca9cb4d88 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimPayeeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimPayeeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimProcedureTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimProcedureTest.php index 2195f1e82e..27cd0d5df9 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimProcedureTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimProcedureTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimRelatedTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimRelatedTest.php index 72e81f95eb..692414d8a2 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimRelatedTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimRelatedTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimSubDetailTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimSubDetailTest.php index f9bd851a16..c0a56e43ce 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimSubDetailTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaim/FHIRClaimSubDetailTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseAddItemTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseAddItemTest.php index 361421f1f0..5fa25e8262 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseAddItemTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseAddItemTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseAdjudicationTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseAdjudicationTest.php index 7351502f3c..2174384972 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseAdjudicationTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseAdjudicationTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseDetail1Test.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseDetail1Test.php index c436800620..f472801e2c 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseDetail1Test.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseDetail1Test.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseDetailTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseDetailTest.php index 23d700b98d..31e3821c20 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseDetailTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseDetailTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseErrorTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseErrorTest.php index da6e912912..88d4c65390 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseErrorTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseErrorTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseInsuranceTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseInsuranceTest.php index 9b6b684b74..a3fc0f03da 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseInsuranceTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseInsuranceTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseItemTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseItemTest.php index 2c66870901..b65e8a556b 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseItemTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseItemTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponsePaymentTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponsePaymentTest.php index cca58705df..86ef4085d3 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponsePaymentTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponsePaymentTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseProcessNoteTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseProcessNoteTest.php index 15c44e4182..ed7bb12773 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseProcessNoteTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseProcessNoteTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseSubDetailTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseSubDetailTest.php index ba60645097..3a1eb3b89f 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseSubDetailTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClaimResponse/FHIRClaimResponseSubDetailTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClinicalImpression/FHIRClinicalImpressionFindingTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClinicalImpression/FHIRClinicalImpressionFindingTest.php index e764a57c01..fd54fc420d 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClinicalImpression/FHIRClinicalImpressionFindingTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClinicalImpression/FHIRClinicalImpressionFindingTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClinicalImpression/FHIRClinicalImpressionInvestigationTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClinicalImpression/FHIRClinicalImpressionInvestigationTest.php index 9766ba4a15..4294a9c157 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClinicalImpression/FHIRClinicalImpressionInvestigationTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRClinicalImpression/FHIRClinicalImpressionInvestigationTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCodeSystem/FHIRCodeSystemConceptTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCodeSystem/FHIRCodeSystemConceptTest.php index 1bbb0ffbfb..c2373ff44a 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCodeSystem/FHIRCodeSystemConceptTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCodeSystem/FHIRCodeSystemConceptTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCodeSystem/FHIRCodeSystemDesignationTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCodeSystem/FHIRCodeSystemDesignationTest.php index 893e049ee1..b46394292b 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCodeSystem/FHIRCodeSystemDesignationTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCodeSystem/FHIRCodeSystemDesignationTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCodeSystem/FHIRCodeSystemFilterTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCodeSystem/FHIRCodeSystemFilterTest.php index 8d6601bcbb..50c71220f7 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCodeSystem/FHIRCodeSystemFilterTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCodeSystem/FHIRCodeSystemFilterTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCodeSystem/FHIRCodeSystemProperty1Test.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCodeSystem/FHIRCodeSystemProperty1Test.php index 09670abb6f..091ee0623e 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCodeSystem/FHIRCodeSystemProperty1Test.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCodeSystem/FHIRCodeSystemProperty1Test.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCodeSystem/FHIRCodeSystemPropertyTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCodeSystem/FHIRCodeSystemPropertyTest.php index 7ad19a70b1..038728c774 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCodeSystem/FHIRCodeSystemPropertyTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCodeSystem/FHIRCodeSystemPropertyTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCommunication/FHIRCommunicationPayloadTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCommunication/FHIRCommunicationPayloadTest.php index f5bae68d03..153e33b67e 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCommunication/FHIRCommunicationPayloadTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCommunication/FHIRCommunicationPayloadTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCommunicationRequest/FHIRCommunicationRequestPayloadTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCommunicationRequest/FHIRCommunicationRequestPayloadTest.php index f9b6a4743e..95f9f3f59f 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCommunicationRequest/FHIRCommunicationRequestPayloadTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCommunicationRequest/FHIRCommunicationRequestPayloadTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCommunicationRequest/FHIRCommunicationRequestRequesterTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCommunicationRequest/FHIRCommunicationRequestRequesterTest.php index 6292007057..6a079300b9 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCommunicationRequest/FHIRCommunicationRequestRequesterTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCommunicationRequest/FHIRCommunicationRequestRequesterTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCompartmentDefinition/FHIRCompartmentDefinitionResourceTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCompartmentDefinition/FHIRCompartmentDefinitionResourceTest.php index 9f7722014b..6b38997d53 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCompartmentDefinition/FHIRCompartmentDefinitionResourceTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCompartmentDefinition/FHIRCompartmentDefinitionResourceTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRComposition/FHIRCompositionAttesterTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRComposition/FHIRCompositionAttesterTest.php index 6253f03df6..45298c15a4 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRComposition/FHIRCompositionAttesterTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRComposition/FHIRCompositionAttesterTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRComposition/FHIRCompositionEventTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRComposition/FHIRCompositionEventTest.php index 5ad47b921a..6df9c9b190 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRComposition/FHIRCompositionEventTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRComposition/FHIRCompositionEventTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRComposition/FHIRCompositionRelatesToTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRComposition/FHIRCompositionRelatesToTest.php index 1e92c65dac..955ff5033e 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRComposition/FHIRCompositionRelatesToTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRComposition/FHIRCompositionRelatesToTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRComposition/FHIRCompositionSectionTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRComposition/FHIRCompositionSectionTest.php index 971db555ce..11e39ccec3 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRComposition/FHIRCompositionSectionTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRComposition/FHIRCompositionSectionTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConceptMap/FHIRConceptMapDependsOnTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConceptMap/FHIRConceptMapDependsOnTest.php index 88d4051b21..86e2aff83a 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConceptMap/FHIRConceptMapDependsOnTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConceptMap/FHIRConceptMapDependsOnTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConceptMap/FHIRConceptMapElementTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConceptMap/FHIRConceptMapElementTest.php index f229228e12..5d7db753e5 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConceptMap/FHIRConceptMapElementTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConceptMap/FHIRConceptMapElementTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConceptMap/FHIRConceptMapGroupTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConceptMap/FHIRConceptMapGroupTest.php index cb426b98a9..856e16eefd 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConceptMap/FHIRConceptMapGroupTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConceptMap/FHIRConceptMapGroupTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConceptMap/FHIRConceptMapTargetTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConceptMap/FHIRConceptMapTargetTest.php index 6c2e7f3572..dc87734cb6 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConceptMap/FHIRConceptMapTargetTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConceptMap/FHIRConceptMapTargetTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConceptMap/FHIRConceptMapUnmappedTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConceptMap/FHIRConceptMapUnmappedTest.php index fc60268d9d..e90f536f0f 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConceptMap/FHIRConceptMapUnmappedTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConceptMap/FHIRConceptMapUnmappedTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCondition/FHIRConditionEvidenceTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCondition/FHIRConditionEvidenceTest.php index 5d6e0f336e..20875fddbc 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCondition/FHIRConditionEvidenceTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCondition/FHIRConditionEvidenceTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCondition/FHIRConditionStageTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCondition/FHIRConditionStageTest.php index 635dd55652..8208377fb6 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCondition/FHIRConditionStageTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCondition/FHIRConditionStageTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConsent/FHIRConsentActor1Test.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConsent/FHIRConsentActor1Test.php index b61d0545fd..4d75af579f 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConsent/FHIRConsentActor1Test.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConsent/FHIRConsentActor1Test.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConsent/FHIRConsentActorTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConsent/FHIRConsentActorTest.php index d69f412f2a..680ebd015a 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConsent/FHIRConsentActorTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConsent/FHIRConsentActorTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConsent/FHIRConsentData1Test.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConsent/FHIRConsentData1Test.php index cc2ce370b0..5585f79b8e 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConsent/FHIRConsentData1Test.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConsent/FHIRConsentData1Test.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConsent/FHIRConsentDataTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConsent/FHIRConsentDataTest.php index f796587f8d..bd06f83193 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConsent/FHIRConsentDataTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConsent/FHIRConsentDataTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConsent/FHIRConsentExceptTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConsent/FHIRConsentExceptTest.php index ceabfd2efb..da807fced8 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConsent/FHIRConsentExceptTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConsent/FHIRConsentExceptTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConsent/FHIRConsentPolicyTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConsent/FHIRConsentPolicyTest.php index 7f60b97328..e6bd20c390 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConsent/FHIRConsentPolicyTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRConsent/FHIRConsentPolicyTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractAgent1Test.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractAgent1Test.php index 91bdb3207a..7802426591 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractAgent1Test.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractAgent1Test.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractAgentTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractAgentTest.php index eb77d2471f..b5101f2c2e 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractAgentTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractAgentTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractFriendlyTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractFriendlyTest.php index 0939f53edd..f0591d46fb 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractFriendlyTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractFriendlyTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractLegalTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractLegalTest.php index eef4681700..a85d96ebd8 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractLegalTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractLegalTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractRuleTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractRuleTest.php index 09da682c6f..9d661b0c9e 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractRuleTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractRuleTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractSignerTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractSignerTest.php index 6f79948ce5..b98a634c70 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractSignerTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractSignerTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractTermTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractTermTest.php index f6835e790d..836e7582e9 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractTermTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractTermTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractValuedItem1Test.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractValuedItem1Test.php index 58d61434b6..7c966553b8 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractValuedItem1Test.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractValuedItem1Test.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractValuedItemTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractValuedItemTest.php index 05f7155e73..7d4ed8f6a9 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractValuedItemTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRContract/FHIRContractValuedItemTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCoverage/FHIRCoverageGroupingTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCoverage/FHIRCoverageGroupingTest.php index a7beed2f61..d88f21feac 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCoverage/FHIRCoverageGroupingTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRCoverage/FHIRCoverageGroupingTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDataElement/FHIRDataElementMappingTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDataElement/FHIRDataElementMappingTest.php index 863439609e..b550e31b88 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDataElement/FHIRDataElementMappingTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDataElement/FHIRDataElementMappingTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDetectedIssue/FHIRDetectedIssueMitigationTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDetectedIssue/FHIRDetectedIssueMitigationTest.php index ec9e9cb9d9..66e3075f5b 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDetectedIssue/FHIRDetectedIssueMitigationTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDetectedIssue/FHIRDetectedIssueMitigationTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDevice/FHIRDeviceUdiTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDevice/FHIRDeviceUdiTest.php index 5bbcb78e9e..4c526cc0a5 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDevice/FHIRDeviceUdiTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDevice/FHIRDeviceUdiTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDeviceComponent/FHIRDeviceComponentProductionSpecificationTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDeviceComponent/FHIRDeviceComponentProductionSpecificationTest.php index c19244969f..522666897c 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDeviceComponent/FHIRDeviceComponentProductionSpecificationTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDeviceComponent/FHIRDeviceComponentProductionSpecificationTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDeviceMetric/FHIRDeviceMetricCalibrationTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDeviceMetric/FHIRDeviceMetricCalibrationTest.php index 813b5750d6..f5845055f6 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDeviceMetric/FHIRDeviceMetricCalibrationTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDeviceMetric/FHIRDeviceMetricCalibrationTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDeviceRequest/FHIRDeviceRequestRequesterTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDeviceRequest/FHIRDeviceRequestRequesterTest.php index a3d4606aee..37d366899c 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDeviceRequest/FHIRDeviceRequestRequesterTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDeviceRequest/FHIRDeviceRequestRequesterTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDiagnosticReport/FHIRDiagnosticReportImageTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDiagnosticReport/FHIRDiagnosticReportImageTest.php index a771f2d57e..a90bb11289 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDiagnosticReport/FHIRDiagnosticReportImageTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDiagnosticReport/FHIRDiagnosticReportImageTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDiagnosticReport/FHIRDiagnosticReportPerformerTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDiagnosticReport/FHIRDiagnosticReportPerformerTest.php index f6693728d9..5ad5da466b 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDiagnosticReport/FHIRDiagnosticReportPerformerTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDiagnosticReport/FHIRDiagnosticReportPerformerTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDocumentManifest/FHIRDocumentManifestContentTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDocumentManifest/FHIRDocumentManifestContentTest.php index 45a0581119..06fc262043 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDocumentManifest/FHIRDocumentManifestContentTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDocumentManifest/FHIRDocumentManifestContentTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDocumentManifest/FHIRDocumentManifestRelatedTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDocumentManifest/FHIRDocumentManifestRelatedTest.php index 15d9b2ab0b..afc3b440c5 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDocumentManifest/FHIRDocumentManifestRelatedTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDocumentManifest/FHIRDocumentManifestRelatedTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDocumentReference/FHIRDocumentReferenceContentTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDocumentReference/FHIRDocumentReferenceContentTest.php index df95b5ad2f..870b08faad 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDocumentReference/FHIRDocumentReferenceContentTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDocumentReference/FHIRDocumentReferenceContentTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDocumentReference/FHIRDocumentReferenceContextTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDocumentReference/FHIRDocumentReferenceContextTest.php index 9750e7150c..9e6abecec5 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDocumentReference/FHIRDocumentReferenceContextTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDocumentReference/FHIRDocumentReferenceContextTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDocumentReference/FHIRDocumentReferenceRelatedTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDocumentReference/FHIRDocumentReferenceRelatedTest.php index 455c990d5c..bdbc809354 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDocumentReference/FHIRDocumentReferenceRelatedTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDocumentReference/FHIRDocumentReferenceRelatedTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDocumentReference/FHIRDocumentReferenceRelatesToTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDocumentReference/FHIRDocumentReferenceRelatesToTest.php index 70bb128378..eaa6e63c57 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDocumentReference/FHIRDocumentReferenceRelatesToTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRDocumentReference/FHIRDocumentReferenceRelatesToTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIREligibilityResponse/FHIREligibilityResponseBenefitBalanceTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIREligibilityResponse/FHIREligibilityResponseBenefitBalanceTest.php index 132468693d..f353257fa0 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIREligibilityResponse/FHIREligibilityResponseBenefitBalanceTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIREligibilityResponse/FHIREligibilityResponseBenefitBalanceTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIREligibilityResponse/FHIREligibilityResponseErrorTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIREligibilityResponse/FHIREligibilityResponseErrorTest.php index ccf4deeb2a..d4e31f3c82 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIREligibilityResponse/FHIREligibilityResponseErrorTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIREligibilityResponse/FHIREligibilityResponseErrorTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIREligibilityResponse/FHIREligibilityResponseFinancialTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIREligibilityResponse/FHIREligibilityResponseFinancialTest.php index a672b4e186..2f7ace0102 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIREligibilityResponse/FHIREligibilityResponseFinancialTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIREligibilityResponse/FHIREligibilityResponseFinancialTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIREligibilityResponse/FHIREligibilityResponseInsuranceTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIREligibilityResponse/FHIREligibilityResponseInsuranceTest.php index 277d5630b9..dcaf29c34c 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIREligibilityResponse/FHIREligibilityResponseInsuranceTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIREligibilityResponse/FHIREligibilityResponseInsuranceTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIREncounter/FHIREncounterClassHistoryTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIREncounter/FHIREncounterClassHistoryTest.php index e449baf664..f46787c2cf 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIREncounter/FHIREncounterClassHistoryTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIREncounter/FHIREncounterClassHistoryTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIREncounter/FHIREncounterDiagnosisTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIREncounter/FHIREncounterDiagnosisTest.php index 70b02c8185..f3eae827d1 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIREncounter/FHIREncounterDiagnosisTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIREncounter/FHIREncounterDiagnosisTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIREncounter/FHIREncounterHospitalizationTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIREncounter/FHIREncounterHospitalizationTest.php index 3701d4ec3c..d2ab18da9e 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIREncounter/FHIREncounterHospitalizationTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIREncounter/FHIREncounterHospitalizationTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIREncounter/FHIREncounterLocationTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIREncounter/FHIREncounterLocationTest.php index 44f2faee32..ccb1ca2a21 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIREncounter/FHIREncounterLocationTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIREncounter/FHIREncounterLocationTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIREncounter/FHIREncounterParticipantTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIREncounter/FHIREncounterParticipantTest.php index b19184d99d..6868532f54 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIREncounter/FHIREncounterParticipantTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIREncounter/FHIREncounterParticipantTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIREncounter/FHIREncounterStatusHistoryTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIREncounter/FHIREncounterStatusHistoryTest.php index 9775bfc767..311127981a 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIREncounter/FHIREncounterStatusHistoryTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIREncounter/FHIREncounterStatusHistoryTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIREpisodeOfCare/FHIREpisodeOfCareDiagnosisTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIREpisodeOfCare/FHIREpisodeOfCareDiagnosisTest.php index 6e1f82ff50..313206b595 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIREpisodeOfCare/FHIREpisodeOfCareDiagnosisTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIREpisodeOfCare/FHIREpisodeOfCareDiagnosisTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIREpisodeOfCare/FHIREpisodeOfCareStatusHistoryTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIREpisodeOfCare/FHIREpisodeOfCareStatusHistoryTest.php index e760ff23a2..67b1842ea3 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIREpisodeOfCare/FHIREpisodeOfCareStatusHistoryTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIREpisodeOfCare/FHIREpisodeOfCareStatusHistoryTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExpansionProfile/FHIRExpansionProfileDesignation1Test.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExpansionProfile/FHIRExpansionProfileDesignation1Test.php index 3c202c474d..82f8bd5930 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExpansionProfile/FHIRExpansionProfileDesignation1Test.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExpansionProfile/FHIRExpansionProfileDesignation1Test.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExpansionProfile/FHIRExpansionProfileDesignation2Test.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExpansionProfile/FHIRExpansionProfileDesignation2Test.php index a6a2550f11..fdcebe5005 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExpansionProfile/FHIRExpansionProfileDesignation2Test.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExpansionProfile/FHIRExpansionProfileDesignation2Test.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExpansionProfile/FHIRExpansionProfileDesignationTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExpansionProfile/FHIRExpansionProfileDesignationTest.php index 67b7fdd99d..1964608987 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExpansionProfile/FHIRExpansionProfileDesignationTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExpansionProfile/FHIRExpansionProfileDesignationTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExpansionProfile/FHIRExpansionProfileExcludeTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExpansionProfile/FHIRExpansionProfileExcludeTest.php index b86b558be4..24d750eba5 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExpansionProfile/FHIRExpansionProfileExcludeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExpansionProfile/FHIRExpansionProfileExcludeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExpansionProfile/FHIRExpansionProfileExcludedSystemTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExpansionProfile/FHIRExpansionProfileExcludedSystemTest.php index 924993202b..da1c603f92 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExpansionProfile/FHIRExpansionProfileExcludedSystemTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExpansionProfile/FHIRExpansionProfileExcludedSystemTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExpansionProfile/FHIRExpansionProfileFixedVersionTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExpansionProfile/FHIRExpansionProfileFixedVersionTest.php index ec77cafe5b..5713c0ce6b 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExpansionProfile/FHIRExpansionProfileFixedVersionTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExpansionProfile/FHIRExpansionProfileFixedVersionTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExpansionProfile/FHIRExpansionProfileIncludeTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExpansionProfile/FHIRExpansionProfileIncludeTest.php index c1f4e65a24..6aa3525cc9 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExpansionProfile/FHIRExpansionProfileIncludeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExpansionProfile/FHIRExpansionProfileIncludeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitAccidentTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitAccidentTest.php index a87143fe4c..74c83f0aaf 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitAccidentTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitAccidentTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitAddItemTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitAddItemTest.php index ce04db1ebe..ea9dddebe8 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitAddItemTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitAddItemTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitAdjudicationTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitAdjudicationTest.php index eaffbaae2f..900e5c5a29 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitAdjudicationTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitAdjudicationTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitBenefitBalanceTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitBenefitBalanceTest.php index df3dc782f9..a18a132fdc 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitBenefitBalanceTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitBenefitBalanceTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitCareTeamTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitCareTeamTest.php index 665c351e4b..cba27ed516 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitCareTeamTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitCareTeamTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitDetail1Test.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitDetail1Test.php index d35856be26..1e69fb0bd7 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitDetail1Test.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitDetail1Test.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitDetailTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitDetailTest.php index 6c5a60fdd6..67ce3631fd 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitDetailTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitDetailTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitDiagnosisTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitDiagnosisTest.php index 0bc1400b57..bf65e5ff6c 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitDiagnosisTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitDiagnosisTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitFinancialTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitFinancialTest.php index a03ba7522a..4bcef33adf 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitFinancialTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitFinancialTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitInformationTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitInformationTest.php index 8f0e60a149..bd1cd16162 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitInformationTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitInformationTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitInsuranceTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitInsuranceTest.php index ae80c9c9f5..de3c1e2352 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitInsuranceTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitInsuranceTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitItemTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitItemTest.php index 59c54fc985..844b81468f 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitItemTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitItemTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitPayeeTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitPayeeTest.php index 278a5c65f5..e310d05270 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitPayeeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitPayeeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitPaymentTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitPaymentTest.php index f21a2f9bb4..729bd706cd 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitPaymentTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitPaymentTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitProcedureTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitProcedureTest.php index e00fea7378..bce8d7839a 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitProcedureTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitProcedureTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitProcessNoteTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitProcessNoteTest.php index d4bdf721cf..c768eb5352 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitProcessNoteTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitProcessNoteTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitRelatedTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitRelatedTest.php index 66dff4f47a..77ce46f294 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitRelatedTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitRelatedTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitSubDetailTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitSubDetailTest.php index 482fe0a946..cc25fab81e 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitSubDetailTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRExplanationOfBenefit/FHIRExplanationOfBenefitSubDetailTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRFamilyMemberHistory/FHIRFamilyMemberHistoryConditionTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRFamilyMemberHistory/FHIRFamilyMemberHistoryConditionTest.php index d33a998659..571b7ba8e9 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRFamilyMemberHistory/FHIRFamilyMemberHistoryConditionTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRFamilyMemberHistory/FHIRFamilyMemberHistoryConditionTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRGoal/FHIRGoalTargetTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRGoal/FHIRGoalTargetTest.php index 1fa9ea55ee..7edc899a66 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRGoal/FHIRGoalTargetTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRGoal/FHIRGoalTargetTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRGraphDefinition/FHIRGraphDefinitionCompartmentTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRGraphDefinition/FHIRGraphDefinitionCompartmentTest.php index 3ffc5001d0..cc003c6efb 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRGraphDefinition/FHIRGraphDefinitionCompartmentTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRGraphDefinition/FHIRGraphDefinitionCompartmentTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRGraphDefinition/FHIRGraphDefinitionLinkTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRGraphDefinition/FHIRGraphDefinitionLinkTest.php index b8edc7edd9..cd7fea42d0 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRGraphDefinition/FHIRGraphDefinitionLinkTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRGraphDefinition/FHIRGraphDefinitionLinkTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRGraphDefinition/FHIRGraphDefinitionTargetTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRGraphDefinition/FHIRGraphDefinitionTargetTest.php index 0e843b35d7..ac6560bfa9 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRGraphDefinition/FHIRGraphDefinitionTargetTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRGraphDefinition/FHIRGraphDefinitionTargetTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRGroup/FHIRGroupCharacteristicTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRGroup/FHIRGroupCharacteristicTest.php index 8cb95a2c54..a4337ef990 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRGroup/FHIRGroupCharacteristicTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRGroup/FHIRGroupCharacteristicTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRGroup/FHIRGroupMemberTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRGroup/FHIRGroupMemberTest.php index 94a9c6188a..a30456bd69 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRGroup/FHIRGroupMemberTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRGroup/FHIRGroupMemberTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRHealthcareService/FHIRHealthcareServiceAvailableTimeTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRHealthcareService/FHIRHealthcareServiceAvailableTimeTest.php index 37ce4dd167..ccbdd6adf0 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRHealthcareService/FHIRHealthcareServiceAvailableTimeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRHealthcareService/FHIRHealthcareServiceAvailableTimeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRHealthcareService/FHIRHealthcareServiceNotAvailableTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRHealthcareService/FHIRHealthcareServiceNotAvailableTest.php index a4593e9d75..e918944edb 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRHealthcareService/FHIRHealthcareServiceNotAvailableTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRHealthcareService/FHIRHealthcareServiceNotAvailableTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImagingManifest/FHIRImagingManifestInstanceTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImagingManifest/FHIRImagingManifestInstanceTest.php index e05da64936..943eca4087 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImagingManifest/FHIRImagingManifestInstanceTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImagingManifest/FHIRImagingManifestInstanceTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImagingManifest/FHIRImagingManifestSeriesTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImagingManifest/FHIRImagingManifestSeriesTest.php index 48f5114358..87e09a8399 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImagingManifest/FHIRImagingManifestSeriesTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImagingManifest/FHIRImagingManifestSeriesTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImagingManifest/FHIRImagingManifestStudyTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImagingManifest/FHIRImagingManifestStudyTest.php index 87e4801bdf..a8d7493ddc 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImagingManifest/FHIRImagingManifestStudyTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImagingManifest/FHIRImagingManifestStudyTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImagingStudy/FHIRImagingStudyInstanceTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImagingStudy/FHIRImagingStudyInstanceTest.php index efef46c3f3..e757563d35 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImagingStudy/FHIRImagingStudyInstanceTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImagingStudy/FHIRImagingStudyInstanceTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImagingStudy/FHIRImagingStudySeriesTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImagingStudy/FHIRImagingStudySeriesTest.php index 56b3b47cbe..4f614e2af0 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImagingStudy/FHIRImagingStudySeriesTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImagingStudy/FHIRImagingStudySeriesTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImmunization/FHIRImmunizationExplanationTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImmunization/FHIRImmunizationExplanationTest.php index 7d4a03903a..70d50cde66 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImmunization/FHIRImmunizationExplanationTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImmunization/FHIRImmunizationExplanationTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImmunization/FHIRImmunizationPractitionerTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImmunization/FHIRImmunizationPractitionerTest.php index 850900cb34..ec20f55bd3 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImmunization/FHIRImmunizationPractitionerTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImmunization/FHIRImmunizationPractitionerTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImmunization/FHIRImmunizationReactionTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImmunization/FHIRImmunizationReactionTest.php index 0cd3b85171..ce4d2c471a 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImmunization/FHIRImmunizationReactionTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImmunization/FHIRImmunizationReactionTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImmunization/FHIRImmunizationVaccinationProtocolTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImmunization/FHIRImmunizationVaccinationProtocolTest.php index c888dc458a..dc2a77e710 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImmunization/FHIRImmunizationVaccinationProtocolTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImmunization/FHIRImmunizationVaccinationProtocolTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImmunizationRecommendation/FHIRImmunizationRecommendationDateCriterionTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImmunizationRecommendation/FHIRImmunizationRecommendationDateCriterionTest.php index 884cdf8d8e..1928c77d0e 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImmunizationRecommendation/FHIRImmunizationRecommendationDateCriterionTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImmunizationRecommendation/FHIRImmunizationRecommendationDateCriterionTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImmunizationRecommendation/FHIRImmunizationRecommendationProtocolTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImmunizationRecommendation/FHIRImmunizationRecommendationProtocolTest.php index 19455cd880..97f6c18967 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImmunizationRecommendation/FHIRImmunizationRecommendationProtocolTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImmunizationRecommendation/FHIRImmunizationRecommendationProtocolTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImmunizationRecommendation/FHIRImmunizationRecommendationRecommendationTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImmunizationRecommendation/FHIRImmunizationRecommendationRecommendationTest.php index a525ab3c24..c97da9ef32 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImmunizationRecommendation/FHIRImmunizationRecommendationRecommendationTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImmunizationRecommendation/FHIRImmunizationRecommendationRecommendationTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuideDependencyTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuideDependencyTest.php index 6388f39ea5..070eb97019 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuideDependencyTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuideDependencyTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuideGlobalTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuideGlobalTest.php index 0ae6ee0dd8..61328e5003 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuideGlobalTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuideGlobalTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuidePackageTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuidePackageTest.php index 64e637dc6a..65f54add49 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuidePackageTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuidePackageTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuidePageTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuidePageTest.php index 19f5b0e7ba..55bec6c2a1 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuidePageTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuidePageTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuideResourceTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuideResourceTest.php index 378fe6f588..6bae2c5553 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuideResourceTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRImplementationGuide/FHIRImplementationGuideResourceTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRLinkage/FHIRLinkageItemTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRLinkage/FHIRLinkageItemTest.php index ba7ffc5d08..a283518922 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRLinkage/FHIRLinkageItemTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRLinkage/FHIRLinkageItemTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRList/FHIRListEntryTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRList/FHIRListEntryTest.php index 950a8db5a8..20d1618bfa 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRList/FHIRListEntryTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRList/FHIRListEntryTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRLocation/FHIRLocationPositionTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRLocation/FHIRLocationPositionTest.php index cf8de8a766..7b6bd33397 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRLocation/FHIRLocationPositionTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRLocation/FHIRLocationPositionTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMeasure/FHIRMeasureGroupTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMeasure/FHIRMeasureGroupTest.php index 9856a30727..c45fd04a5e 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMeasure/FHIRMeasureGroupTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMeasure/FHIRMeasureGroupTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMeasure/FHIRMeasurePopulationTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMeasure/FHIRMeasurePopulationTest.php index 4fd5fd4454..a118031c4b 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMeasure/FHIRMeasurePopulationTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMeasure/FHIRMeasurePopulationTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMeasure/FHIRMeasureStratifierTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMeasure/FHIRMeasureStratifierTest.php index e2c8f7105e..34130dba2a 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMeasure/FHIRMeasureStratifierTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMeasure/FHIRMeasureStratifierTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMeasure/FHIRMeasureSupplementalDataTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMeasure/FHIRMeasureSupplementalDataTest.php index 953e5360bf..c4ba556ee6 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMeasure/FHIRMeasureSupplementalDataTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMeasure/FHIRMeasureSupplementalDataTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMeasureReport/FHIRMeasureReportGroupTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMeasureReport/FHIRMeasureReportGroupTest.php index 3343b8ab90..59ce132003 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMeasureReport/FHIRMeasureReportGroupTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMeasureReport/FHIRMeasureReportGroupTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMeasureReport/FHIRMeasureReportPopulation1Test.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMeasureReport/FHIRMeasureReportPopulation1Test.php index 35f2588419..3cc2a98a74 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMeasureReport/FHIRMeasureReportPopulation1Test.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMeasureReport/FHIRMeasureReportPopulation1Test.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMeasureReport/FHIRMeasureReportPopulationTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMeasureReport/FHIRMeasureReportPopulationTest.php index f95742172a..dfdc3c2136 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMeasureReport/FHIRMeasureReportPopulationTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMeasureReport/FHIRMeasureReportPopulationTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMeasureReport/FHIRMeasureReportStratifierTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMeasureReport/FHIRMeasureReportStratifierTest.php index 2b69654879..88ee84115c 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMeasureReport/FHIRMeasureReportStratifierTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMeasureReport/FHIRMeasureReportStratifierTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMeasureReport/FHIRMeasureReportStratumTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMeasureReport/FHIRMeasureReportStratumTest.php index 2c77c46592..fd5efe486d 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMeasureReport/FHIRMeasureReportStratumTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMeasureReport/FHIRMeasureReportStratumTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedication/FHIRMedicationBatchTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedication/FHIRMedicationBatchTest.php index f117dab03e..87e398211e 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedication/FHIRMedicationBatchTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedication/FHIRMedicationBatchTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedication/FHIRMedicationContentTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedication/FHIRMedicationContentTest.php index 5b95eae0ad..ef1664793f 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedication/FHIRMedicationContentTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedication/FHIRMedicationContentTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedication/FHIRMedicationIngredientTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedication/FHIRMedicationIngredientTest.php index 629fc4eec1..e97f42d18d 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedication/FHIRMedicationIngredientTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedication/FHIRMedicationIngredientTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedication/FHIRMedicationPackageTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedication/FHIRMedicationPackageTest.php index 9ee132a94a..311a34d79b 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedication/FHIRMedicationPackageTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedication/FHIRMedicationPackageTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationAdministration/FHIRMedicationAdministrationDosageTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationAdministration/FHIRMedicationAdministrationDosageTest.php index 4f70cfedab..e567830cf4 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationAdministration/FHIRMedicationAdministrationDosageTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationAdministration/FHIRMedicationAdministrationDosageTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationAdministration/FHIRMedicationAdministrationPerformerTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationAdministration/FHIRMedicationAdministrationPerformerTest.php index d7ad3507e0..7086ab2f44 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationAdministration/FHIRMedicationAdministrationPerformerTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationAdministration/FHIRMedicationAdministrationPerformerTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationDispense/FHIRMedicationDispensePerformerTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationDispense/FHIRMedicationDispensePerformerTest.php index d1bc3ace5e..4e0e36e545 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationDispense/FHIRMedicationDispensePerformerTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationDispense/FHIRMedicationDispensePerformerTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationDispense/FHIRMedicationDispenseSubstitutionTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationDispense/FHIRMedicationDispenseSubstitutionTest.php index 3ddaf3ba0b..2f5ec20a50 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationDispense/FHIRMedicationDispenseSubstitutionTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationDispense/FHIRMedicationDispenseSubstitutionTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationRequest/FHIRMedicationRequestDispenseRequestTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationRequest/FHIRMedicationRequestDispenseRequestTest.php index 1e3b775fd4..3fed10727f 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationRequest/FHIRMedicationRequestDispenseRequestTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationRequest/FHIRMedicationRequestDispenseRequestTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationRequest/FHIRMedicationRequestRequesterTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationRequest/FHIRMedicationRequestRequesterTest.php index ab0a79a4c2..e12b71137c 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationRequest/FHIRMedicationRequestRequesterTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationRequest/FHIRMedicationRequestRequesterTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationRequest/FHIRMedicationRequestSubstitutionTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationRequest/FHIRMedicationRequestSubstitutionTest.php index abc0f04985..ef02105f16 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationRequest/FHIRMedicationRequestSubstitutionTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMedicationRequest/FHIRMedicationRequestSubstitutionTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMessageDefinition/FHIRMessageDefinitionAllowedResponseTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMessageDefinition/FHIRMessageDefinitionAllowedResponseTest.php index 78fc296e78..d8f0f081e5 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMessageDefinition/FHIRMessageDefinitionAllowedResponseTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMessageDefinition/FHIRMessageDefinitionAllowedResponseTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMessageDefinition/FHIRMessageDefinitionFocusTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMessageDefinition/FHIRMessageDefinitionFocusTest.php index 8b6f112792..56e95e95db 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMessageDefinition/FHIRMessageDefinitionFocusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMessageDefinition/FHIRMessageDefinitionFocusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMessageHeader/FHIRMessageHeaderDestinationTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMessageHeader/FHIRMessageHeaderDestinationTest.php index 6a5b70b4b3..16541d080f 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMessageHeader/FHIRMessageHeaderDestinationTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMessageHeader/FHIRMessageHeaderDestinationTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMessageHeader/FHIRMessageHeaderResponseTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMessageHeader/FHIRMessageHeaderResponseTest.php index d9f8e2af48..f77c50f75d 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMessageHeader/FHIRMessageHeaderResponseTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMessageHeader/FHIRMessageHeaderResponseTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMessageHeader/FHIRMessageHeaderSourceTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMessageHeader/FHIRMessageHeaderSourceTest.php index 1269853030..a1ef390507 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMessageHeader/FHIRMessageHeaderSourceTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRMessageHeader/FHIRMessageHeaderSourceTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRNamingSystem/FHIRNamingSystemUniqueIdTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRNamingSystem/FHIRNamingSystemUniqueIdTest.php index 085bb1bea8..b0e432fd48 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRNamingSystem/FHIRNamingSystemUniqueIdTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRNamingSystem/FHIRNamingSystemUniqueIdTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRNutritionOrder/FHIRNutritionOrderAdministrationTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRNutritionOrder/FHIRNutritionOrderAdministrationTest.php index 4cacfeec71..320b8ef565 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRNutritionOrder/FHIRNutritionOrderAdministrationTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRNutritionOrder/FHIRNutritionOrderAdministrationTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRNutritionOrder/FHIRNutritionOrderEnteralFormulaTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRNutritionOrder/FHIRNutritionOrderEnteralFormulaTest.php index f1a747aa27..d9f02aee91 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRNutritionOrder/FHIRNutritionOrderEnteralFormulaTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRNutritionOrder/FHIRNutritionOrderEnteralFormulaTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRNutritionOrder/FHIRNutritionOrderNutrientTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRNutritionOrder/FHIRNutritionOrderNutrientTest.php index 48c7d0bc09..3dd9eb6bbc 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRNutritionOrder/FHIRNutritionOrderNutrientTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRNutritionOrder/FHIRNutritionOrderNutrientTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRNutritionOrder/FHIRNutritionOrderOralDietTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRNutritionOrder/FHIRNutritionOrderOralDietTest.php index 52797c68ec..b70cc61f51 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRNutritionOrder/FHIRNutritionOrderOralDietTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRNutritionOrder/FHIRNutritionOrderOralDietTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRNutritionOrder/FHIRNutritionOrderSupplementTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRNutritionOrder/FHIRNutritionOrderSupplementTest.php index 2f60af1808..2cdae66366 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRNutritionOrder/FHIRNutritionOrderSupplementTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRNutritionOrder/FHIRNutritionOrderSupplementTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRNutritionOrder/FHIRNutritionOrderTextureTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRNutritionOrder/FHIRNutritionOrderTextureTest.php index 60fd1dbe86..7b9231212b 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRNutritionOrder/FHIRNutritionOrderTextureTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRNutritionOrder/FHIRNutritionOrderTextureTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRObservation/FHIRObservationComponentTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRObservation/FHIRObservationComponentTest.php index 3593187c63..209e11eec9 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRObservation/FHIRObservationComponentTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRObservation/FHIRObservationComponentTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRObservation/FHIRObservationReferenceRangeTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRObservation/FHIRObservationReferenceRangeTest.php index 65efcf9093..1453f39a37 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRObservation/FHIRObservationReferenceRangeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRObservation/FHIRObservationReferenceRangeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRObservation/FHIRObservationRelatedTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRObservation/FHIRObservationRelatedTest.php index fe20d71490..5689e1213c 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRObservation/FHIRObservationRelatedTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRObservation/FHIRObservationRelatedTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIROperationDefinition/FHIROperationDefinitionBindingTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIROperationDefinition/FHIROperationDefinitionBindingTest.php index 925052361f..3472ae30a9 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIROperationDefinition/FHIROperationDefinitionBindingTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIROperationDefinition/FHIROperationDefinitionBindingTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIROperationDefinition/FHIROperationDefinitionOverloadTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIROperationDefinition/FHIROperationDefinitionOverloadTest.php index 5fce28059b..cd16f5b57b 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIROperationDefinition/FHIROperationDefinitionOverloadTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIROperationDefinition/FHIROperationDefinitionOverloadTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIROperationDefinition/FHIROperationDefinitionParameterTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIROperationDefinition/FHIROperationDefinitionParameterTest.php index 788e8b728f..0f18d1d070 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIROperationDefinition/FHIROperationDefinitionParameterTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIROperationDefinition/FHIROperationDefinitionParameterTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIROperationOutcome/FHIROperationOutcomeIssueTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIROperationOutcome/FHIROperationOutcomeIssueTest.php index eb130cc7f3..51e179fc53 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIROperationOutcome/FHIROperationOutcomeIssueTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIROperationOutcome/FHIROperationOutcomeIssueTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIROrganization/FHIROrganizationContactTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIROrganization/FHIROrganizationContactTest.php index fb88c04925..b019653b0e 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIROrganization/FHIROrganizationContactTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIROrganization/FHIROrganizationContactTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRParameters/FHIRParametersParameterTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRParameters/FHIRParametersParameterTest.php index e38d666824..8009b226e8 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRParameters/FHIRParametersParameterTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRParameters/FHIRParametersParameterTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPatient/FHIRPatientAnimalTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPatient/FHIRPatientAnimalTest.php index 718b93dd59..754141ee07 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPatient/FHIRPatientAnimalTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPatient/FHIRPatientAnimalTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPatient/FHIRPatientCommunicationTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPatient/FHIRPatientCommunicationTest.php index 8b243ceed2..1211904304 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPatient/FHIRPatientCommunicationTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPatient/FHIRPatientCommunicationTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPatient/FHIRPatientContactTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPatient/FHIRPatientContactTest.php index 833f97cd1e..d17458191b 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPatient/FHIRPatientContactTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPatient/FHIRPatientContactTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPatient/FHIRPatientLinkTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPatient/FHIRPatientLinkTest.php index d0241c4a47..401608bcbb 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPatient/FHIRPatientLinkTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPatient/FHIRPatientLinkTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPaymentReconciliation/FHIRPaymentReconciliationDetailTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPaymentReconciliation/FHIRPaymentReconciliationDetailTest.php index 0ceaf02bec..51862e8ffa 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPaymentReconciliation/FHIRPaymentReconciliationDetailTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPaymentReconciliation/FHIRPaymentReconciliationDetailTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPaymentReconciliation/FHIRPaymentReconciliationProcessNoteTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPaymentReconciliation/FHIRPaymentReconciliationProcessNoteTest.php index 01b5b572c5..3255725b2d 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPaymentReconciliation/FHIRPaymentReconciliationProcessNoteTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPaymentReconciliation/FHIRPaymentReconciliationProcessNoteTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPerson/FHIRPersonLinkTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPerson/FHIRPersonLinkTest.php index 1d00779b8a..cada62dcc5 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPerson/FHIRPersonLinkTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPerson/FHIRPersonLinkTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPlanDefinition/FHIRPlanDefinitionActionTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPlanDefinition/FHIRPlanDefinitionActionTest.php index 15dc257d08..98bad5188b 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPlanDefinition/FHIRPlanDefinitionActionTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPlanDefinition/FHIRPlanDefinitionActionTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPlanDefinition/FHIRPlanDefinitionConditionTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPlanDefinition/FHIRPlanDefinitionConditionTest.php index fa52f03bc0..5a2a67e222 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPlanDefinition/FHIRPlanDefinitionConditionTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPlanDefinition/FHIRPlanDefinitionConditionTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPlanDefinition/FHIRPlanDefinitionDynamicValueTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPlanDefinition/FHIRPlanDefinitionDynamicValueTest.php index 015058c757..1630477974 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPlanDefinition/FHIRPlanDefinitionDynamicValueTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPlanDefinition/FHIRPlanDefinitionDynamicValueTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPlanDefinition/FHIRPlanDefinitionGoalTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPlanDefinition/FHIRPlanDefinitionGoalTest.php index 1cccfbec98..206550d43b 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPlanDefinition/FHIRPlanDefinitionGoalTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPlanDefinition/FHIRPlanDefinitionGoalTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPlanDefinition/FHIRPlanDefinitionParticipantTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPlanDefinition/FHIRPlanDefinitionParticipantTest.php index 7094e41aaa..ba339eff5c 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPlanDefinition/FHIRPlanDefinitionParticipantTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPlanDefinition/FHIRPlanDefinitionParticipantTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPlanDefinition/FHIRPlanDefinitionRelatedActionTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPlanDefinition/FHIRPlanDefinitionRelatedActionTest.php index 95d649b4b2..490875b99c 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPlanDefinition/FHIRPlanDefinitionRelatedActionTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPlanDefinition/FHIRPlanDefinitionRelatedActionTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPlanDefinition/FHIRPlanDefinitionTargetTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPlanDefinition/FHIRPlanDefinitionTargetTest.php index 763d7a278b..a65f0abc0e 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPlanDefinition/FHIRPlanDefinitionTargetTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPlanDefinition/FHIRPlanDefinitionTargetTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPractitioner/FHIRPractitionerQualificationTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPractitioner/FHIRPractitionerQualificationTest.php index 6701e65a52..cd91625773 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPractitioner/FHIRPractitionerQualificationTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPractitioner/FHIRPractitionerQualificationTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPractitionerRole/FHIRPractitionerRoleAvailableTimeTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPractitionerRole/FHIRPractitionerRoleAvailableTimeTest.php index 1185a7a4ad..152ba65818 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPractitionerRole/FHIRPractitionerRoleAvailableTimeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPractitionerRole/FHIRPractitionerRoleAvailableTimeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPractitionerRole/FHIRPractitionerRoleNotAvailableTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPractitionerRole/FHIRPractitionerRoleNotAvailableTest.php index 987293e360..03b448ea7f 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPractitionerRole/FHIRPractitionerRoleNotAvailableTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRPractitionerRole/FHIRPractitionerRoleNotAvailableTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRProcedure/FHIRProcedureFocalDeviceTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRProcedure/FHIRProcedureFocalDeviceTest.php index 11bb8eea6b..635dcfd3b1 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRProcedure/FHIRProcedureFocalDeviceTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRProcedure/FHIRProcedureFocalDeviceTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRProcedure/FHIRProcedurePerformerTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRProcedure/FHIRProcedurePerformerTest.php index 30f2f8aaa2..7dfb9fb19d 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRProcedure/FHIRProcedurePerformerTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRProcedure/FHIRProcedurePerformerTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRProcedureRequest/FHIRProcedureRequestRequesterTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRProcedureRequest/FHIRProcedureRequestRequesterTest.php index d64f57ab8f..1f8f68a339 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRProcedureRequest/FHIRProcedureRequestRequesterTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRProcedureRequest/FHIRProcedureRequestRequesterTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRProcessRequest/FHIRProcessRequestItemTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRProcessRequest/FHIRProcessRequestItemTest.php index a89752e890..c0f4805beb 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRProcessRequest/FHIRProcessRequestItemTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRProcessRequest/FHIRProcessRequestItemTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRProcessResponse/FHIRProcessResponseProcessNoteTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRProcessResponse/FHIRProcessResponseProcessNoteTest.php index 5abb3c4f98..34de2cdf9f 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRProcessResponse/FHIRProcessResponseProcessNoteTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRProcessResponse/FHIRProcessResponseProcessNoteTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRProvenance/FHIRProvenanceAgentTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRProvenance/FHIRProvenanceAgentTest.php index b1a6a34506..7844dac668 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRProvenance/FHIRProvenanceAgentTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRProvenance/FHIRProvenanceAgentTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRProvenance/FHIRProvenanceEntityTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRProvenance/FHIRProvenanceEntityTest.php index a90c24fb0a..aa1f358e51 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRProvenance/FHIRProvenanceEntityTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRProvenance/FHIRProvenanceEntityTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRQuestionnaire/FHIRQuestionnaireEnableWhenTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRQuestionnaire/FHIRQuestionnaireEnableWhenTest.php index 3e41f686cf..6ffab69d98 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRQuestionnaire/FHIRQuestionnaireEnableWhenTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRQuestionnaire/FHIRQuestionnaireEnableWhenTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRQuestionnaire/FHIRQuestionnaireItemTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRQuestionnaire/FHIRQuestionnaireItemTest.php index 683b6bf5dd..0853b82735 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRQuestionnaire/FHIRQuestionnaireItemTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRQuestionnaire/FHIRQuestionnaireItemTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRQuestionnaire/FHIRQuestionnaireOptionTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRQuestionnaire/FHIRQuestionnaireOptionTest.php index 1d12f88a17..27f7bd6aca 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRQuestionnaire/FHIRQuestionnaireOptionTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRQuestionnaire/FHIRQuestionnaireOptionTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRQuestionnaireResponse/FHIRQuestionnaireResponseAnswerTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRQuestionnaireResponse/FHIRQuestionnaireResponseAnswerTest.php index 6037a8fd5f..5f92905671 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRQuestionnaireResponse/FHIRQuestionnaireResponseAnswerTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRQuestionnaireResponse/FHIRQuestionnaireResponseAnswerTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRQuestionnaireResponse/FHIRQuestionnaireResponseItemTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRQuestionnaireResponse/FHIRQuestionnaireResponseItemTest.php index d26da8ba49..9874eb4e46 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRQuestionnaireResponse/FHIRQuestionnaireResponseItemTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRQuestionnaireResponse/FHIRQuestionnaireResponseItemTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRReferralRequest/FHIRReferralRequestRequesterTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRReferralRequest/FHIRReferralRequestRequesterTest.php index f437fbf194..e57ac5f89f 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRReferralRequest/FHIRReferralRequestRequesterTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRReferralRequest/FHIRReferralRequestRequesterTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRRequestGroup/FHIRRequestGroupActionTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRRequestGroup/FHIRRequestGroupActionTest.php index 38777b7123..1e2a11cfcb 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRRequestGroup/FHIRRequestGroupActionTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRRequestGroup/FHIRRequestGroupActionTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRRequestGroup/FHIRRequestGroupConditionTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRRequestGroup/FHIRRequestGroupConditionTest.php index 0b2da70f3e..b045ce4882 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRRequestGroup/FHIRRequestGroupConditionTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRRequestGroup/FHIRRequestGroupConditionTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRRequestGroup/FHIRRequestGroupRelatedActionTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRRequestGroup/FHIRRequestGroupRelatedActionTest.php index 5f2d799198..02e0b9da73 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRRequestGroup/FHIRRequestGroupRelatedActionTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRRequestGroup/FHIRRequestGroupRelatedActionTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResearchStudy/FHIRResearchStudyArmTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResearchStudy/FHIRResearchStudyArmTest.php index 60294d5bff..b2b9fa20ff 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResearchStudy/FHIRResearchStudyArmTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRResearchStudy/FHIRResearchStudyArmTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRRiskAssessment/FHIRRiskAssessmentPredictionTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRRiskAssessment/FHIRRiskAssessmentPredictionTest.php index 21498401c7..6aabf068b6 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRRiskAssessment/FHIRRiskAssessmentPredictionTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRRiskAssessment/FHIRRiskAssessmentPredictionTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSearchParameter/FHIRSearchParameterComponentTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSearchParameter/FHIRSearchParameterComponentTest.php index 58d34e658f..0f072daa4e 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSearchParameter/FHIRSearchParameterComponentTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSearchParameter/FHIRSearchParameterComponentTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSequence/FHIRSequenceQualityTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSequence/FHIRSequenceQualityTest.php index 175d8eb49f..a8d01092cd 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSequence/FHIRSequenceQualityTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSequence/FHIRSequenceQualityTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSequence/FHIRSequenceReferenceSeqTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSequence/FHIRSequenceReferenceSeqTest.php index a51093c09a..0d8f9b145a 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSequence/FHIRSequenceReferenceSeqTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSequence/FHIRSequenceReferenceSeqTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSequence/FHIRSequenceRepositoryTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSequence/FHIRSequenceRepositoryTest.php index 8e99645098..b23ae50307 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSequence/FHIRSequenceRepositoryTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSequence/FHIRSequenceRepositoryTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSequence/FHIRSequenceVariantTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSequence/FHIRSequenceVariantTest.php index defd529211..3232da1c50 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSequence/FHIRSequenceVariantTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSequence/FHIRSequenceVariantTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSpecimen/FHIRSpecimenCollectionTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSpecimen/FHIRSpecimenCollectionTest.php index 79cece3b77..50256797f6 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSpecimen/FHIRSpecimenCollectionTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSpecimen/FHIRSpecimenCollectionTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSpecimen/FHIRSpecimenContainerTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSpecimen/FHIRSpecimenContainerTest.php index 8fddac45bc..9766f561d7 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSpecimen/FHIRSpecimenContainerTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSpecimen/FHIRSpecimenContainerTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSpecimen/FHIRSpecimenProcessingTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSpecimen/FHIRSpecimenProcessingTest.php index 79f2bc6a57..bd86c25496 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSpecimen/FHIRSpecimenProcessingTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSpecimen/FHIRSpecimenProcessingTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRStructureDefinition/FHIRStructureDefinitionDifferentialTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRStructureDefinition/FHIRStructureDefinitionDifferentialTest.php index 4118fc6bee..da4394c424 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRStructureDefinition/FHIRStructureDefinitionDifferentialTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRStructureDefinition/FHIRStructureDefinitionDifferentialTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRStructureDefinition/FHIRStructureDefinitionMappingTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRStructureDefinition/FHIRStructureDefinitionMappingTest.php index 4dd5ad5dd2..76e861d648 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRStructureDefinition/FHIRStructureDefinitionMappingTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRStructureDefinition/FHIRStructureDefinitionMappingTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRStructureDefinition/FHIRStructureDefinitionSnapshotTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRStructureDefinition/FHIRStructureDefinitionSnapshotTest.php index 34f0a54070..bb313d6efd 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRStructureDefinition/FHIRStructureDefinitionSnapshotTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRStructureDefinition/FHIRStructureDefinitionSnapshotTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRStructureMap/FHIRStructureMapDependentTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRStructureMap/FHIRStructureMapDependentTest.php index 7eb767d196..8f4a9074f2 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRStructureMap/FHIRStructureMapDependentTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRStructureMap/FHIRStructureMapDependentTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRStructureMap/FHIRStructureMapGroupTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRStructureMap/FHIRStructureMapGroupTest.php index 98730a7021..b7f6072a99 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRStructureMap/FHIRStructureMapGroupTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRStructureMap/FHIRStructureMapGroupTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRStructureMap/FHIRStructureMapInputTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRStructureMap/FHIRStructureMapInputTest.php index c1b0b09614..50c16be3b2 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRStructureMap/FHIRStructureMapInputTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRStructureMap/FHIRStructureMapInputTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRStructureMap/FHIRStructureMapParameterTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRStructureMap/FHIRStructureMapParameterTest.php index 701c0e6eaa..ab4f341c24 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRStructureMap/FHIRStructureMapParameterTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRStructureMap/FHIRStructureMapParameterTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRStructureMap/FHIRStructureMapRuleTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRStructureMap/FHIRStructureMapRuleTest.php index 991b9d6a6d..d7d8d38549 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRStructureMap/FHIRStructureMapRuleTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRStructureMap/FHIRStructureMapRuleTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRStructureMap/FHIRStructureMapSourceTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRStructureMap/FHIRStructureMapSourceTest.php index c8234991b7..6931355c00 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRStructureMap/FHIRStructureMapSourceTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRStructureMap/FHIRStructureMapSourceTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRStructureMap/FHIRStructureMapStructureTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRStructureMap/FHIRStructureMapStructureTest.php index df0481bea4..ce9fa827b6 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRStructureMap/FHIRStructureMapStructureTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRStructureMap/FHIRStructureMapStructureTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRStructureMap/FHIRStructureMapTargetTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRStructureMap/FHIRStructureMapTargetTest.php index 21a5245423..4c381913e3 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRStructureMap/FHIRStructureMapTargetTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRStructureMap/FHIRStructureMapTargetTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubscription/FHIRSubscriptionChannelTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubscription/FHIRSubscriptionChannelTest.php index 311fff3547..d11fa3cf09 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubscription/FHIRSubscriptionChannelTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubscription/FHIRSubscriptionChannelTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubstance/FHIRSubstanceIngredientTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubstance/FHIRSubstanceIngredientTest.php index 6c4a74d2e2..6c9fbbaf0e 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubstance/FHIRSubstanceIngredientTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubstance/FHIRSubstanceIngredientTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubstance/FHIRSubstanceInstanceTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubstance/FHIRSubstanceInstanceTest.php index 16adcaff6f..f2e4aef9b9 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubstance/FHIRSubstanceInstanceTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSubstance/FHIRSubstanceInstanceTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSupplyDelivery/FHIRSupplyDeliverySuppliedItemTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSupplyDelivery/FHIRSupplyDeliverySuppliedItemTest.php index 779245c27b..b7519731dd 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSupplyDelivery/FHIRSupplyDeliverySuppliedItemTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSupplyDelivery/FHIRSupplyDeliverySuppliedItemTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSupplyRequest/FHIRSupplyRequestOrderedItemTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSupplyRequest/FHIRSupplyRequestOrderedItemTest.php index def2a456a2..ab0f19393f 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSupplyRequest/FHIRSupplyRequestOrderedItemTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSupplyRequest/FHIRSupplyRequestOrderedItemTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSupplyRequest/FHIRSupplyRequestRequesterTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSupplyRequest/FHIRSupplyRequestRequesterTest.php index 48de2258a7..595012bd42 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSupplyRequest/FHIRSupplyRequestRequesterTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRSupplyRequest/FHIRSupplyRequestRequesterTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTask/FHIRTaskInputTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTask/FHIRTaskInputTest.php index 98ee1d7adf..380c7a135d 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTask/FHIRTaskInputTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTask/FHIRTaskInputTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTask/FHIRTaskOutputTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTask/FHIRTaskOutputTest.php index 8598c85dec..8c51fd19b2 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTask/FHIRTaskOutputTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTask/FHIRTaskOutputTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTask/FHIRTaskRequesterTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTask/FHIRTaskRequesterTest.php index 28b0cc1d97..7af0244327 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTask/FHIRTaskRequesterTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTask/FHIRTaskRequesterTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTask/FHIRTaskRestrictionTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTask/FHIRTaskRestrictionTest.php index dce2659d75..a8ceff9756 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTask/FHIRTaskRestrictionTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTask/FHIRTaskRestrictionTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestReport/FHIRTestReportAction1Test.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestReport/FHIRTestReportAction1Test.php index 62bc74139d..ba314ed7e8 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestReport/FHIRTestReportAction1Test.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestReport/FHIRTestReportAction1Test.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestReport/FHIRTestReportAction2Test.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestReport/FHIRTestReportAction2Test.php index b37337bd2b..3bee337ce4 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestReport/FHIRTestReportAction2Test.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestReport/FHIRTestReportAction2Test.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestReport/FHIRTestReportActionTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestReport/FHIRTestReportActionTest.php index 98932e0540..eed0b0c370 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestReport/FHIRTestReportActionTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestReport/FHIRTestReportActionTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestReport/FHIRTestReportAssertTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestReport/FHIRTestReportAssertTest.php index 62984d16e6..3be9d1ae4d 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestReport/FHIRTestReportAssertTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestReport/FHIRTestReportAssertTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestReport/FHIRTestReportOperationTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestReport/FHIRTestReportOperationTest.php index e214aee0aa..473f287e51 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestReport/FHIRTestReportOperationTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestReport/FHIRTestReportOperationTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestReport/FHIRTestReportParticipantTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestReport/FHIRTestReportParticipantTest.php index 06d4b5fe8a..1c8fc5a038 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestReport/FHIRTestReportParticipantTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestReport/FHIRTestReportParticipantTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestReport/FHIRTestReportSetupTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestReport/FHIRTestReportSetupTest.php index a3c641cede..7ab065e15b 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestReport/FHIRTestReportSetupTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestReport/FHIRTestReportSetupTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestReport/FHIRTestReportTeardownTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestReport/FHIRTestReportTeardownTest.php index bfeeed1a40..dbc9be3a95 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestReport/FHIRTestReportTeardownTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestReport/FHIRTestReportTeardownTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestReport/FHIRTestReportTestTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestReport/FHIRTestReportTestTest.php index a1561fa5b7..494738b48a 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestReport/FHIRTestReportTestTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestReport/FHIRTestReportTestTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptAction1Test.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptAction1Test.php index ff39971d7f..ddd193309a 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptAction1Test.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptAction1Test.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptAction2Test.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptAction2Test.php index f8fa4fd9f5..88b31cdffe 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptAction2Test.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptAction2Test.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptActionTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptActionTest.php index 5142f85b17..3ceb7b6acc 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptActionTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptActionTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptAssertTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptAssertTest.php index 30573e93b9..b1e342eb12 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptAssertTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptAssertTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptCapabilityTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptCapabilityTest.php index 54af915e99..ae7e34df54 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptCapabilityTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptCapabilityTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptDestinationTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptDestinationTest.php index 9f6b68d57f..d9b2569303 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptDestinationTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptDestinationTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptFixtureTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptFixtureTest.php index b5da9f30d3..e13373dd36 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptFixtureTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptFixtureTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptLinkTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptLinkTest.php index 64c4528630..3f82ee5b3d 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptLinkTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptLinkTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptMetadataTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptMetadataTest.php index 67a1578f7c..0c3e46f2ea 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptMetadataTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptMetadataTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptOperationTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptOperationTest.php index 0790157fc3..8f59f2ad61 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptOperationTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptOperationTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptOriginTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptOriginTest.php index 96476b441d..1d684dc01e 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptOriginTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptOriginTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptParam1Test.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptParam1Test.php index 7b774cde23..db00b0aa9a 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptParam1Test.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptParam1Test.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptParam2Test.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptParam2Test.php index 16867b77c1..e155a958a8 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptParam2Test.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptParam2Test.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptParam3Test.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptParam3Test.php index 1993f81e8f..3e97dbdfb2 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptParam3Test.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptParam3Test.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptParamTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptParamTest.php index aea3ed2582..de92be01d0 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptParamTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptParamTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptRequestHeaderTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptRequestHeaderTest.php index e0cab517a1..2070d67a31 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptRequestHeaderTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptRequestHeaderTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptRule1Test.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptRule1Test.php index 4f77cb16a3..da4a5e665a 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptRule1Test.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptRule1Test.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptRule2Test.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptRule2Test.php index 5f9c790197..5c84f716af 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptRule2Test.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptRule2Test.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptRule3Test.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptRule3Test.php index a6ac10436b..d161a4375e 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptRule3Test.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptRule3Test.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptRuleTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptRuleTest.php index 3d4df03043..f9bb7d0b73 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptRuleTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptRuleTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptRuleset1Test.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptRuleset1Test.php index 3294dddd10..f0fd89da19 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptRuleset1Test.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptRuleset1Test.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptRulesetTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptRulesetTest.php index 75fcb3bb42..733f73dbdb 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptRulesetTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptRulesetTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptSetupTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptSetupTest.php index 3806e47490..6c1fe4aa0e 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptSetupTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptSetupTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptTeardownTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptTeardownTest.php index b356d546a2..1ba8a1e5b3 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptTeardownTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptTeardownTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptTestTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptTestTest.php index 440f5881ba..4f56b7db00 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptTestTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptTestTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptVariableTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptVariableTest.php index 131b56dc71..cf6b381848 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptVariableTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRTestScript/FHIRTestScriptVariableTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetComposeTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetComposeTest.php index f4d4760ef4..2f94b12683 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetComposeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetComposeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetConceptTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetConceptTest.php index 489c1e7aea..3a32877042 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetConceptTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetConceptTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetContainsTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetContainsTest.php index 508c0166bb..86fe7b4620 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetContainsTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetContainsTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetDesignationTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetDesignationTest.php index b4d1c41946..9c8f1b6c28 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetDesignationTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetDesignationTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetExpansionTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetExpansionTest.php index 2affb7c27d..a5462adb10 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetExpansionTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetExpansionTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetFilterTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetFilterTest.php index 1dcd27f92f..b8815f72a7 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetFilterTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetFilterTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetIncludeTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetIncludeTest.php index e5f45688aa..55e7f2dd04 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetIncludeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetIncludeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetParameterTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetParameterTest.php index 6b995114e0..ec067569ae 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetParameterTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRValueSet/FHIRValueSetParameterTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRVisionPrescription/FHIRVisionPrescriptionDispenseTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRVisionPrescription/FHIRVisionPrescriptionDispenseTest.php index c11689d147..8939ec0b7a 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRVisionPrescription/FHIRVisionPrescriptionDispenseTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElement/FHIRVisionPrescription/FHIRVisionPrescriptionDispenseTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElementTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElementTest.php index 9d72f1d5b5..18c75636a8 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElementTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBackboneElementTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBase64BinaryTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBase64BinaryTest.php index 9176f099f6..92182b6274 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBase64BinaryTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBase64BinaryTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBindingStrengthTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBindingStrengthTest.php index 72a653c2cf..fb7c0e0aa7 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBindingStrengthTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBindingStrengthTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBooleanTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBooleanTest.php index d990f31b5c..a28d73744a 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBooleanTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBooleanTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBundleTypeTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBundleTypeTest.php index ff57fc7a49..f08246692e 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBundleTypeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRBundleTypeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRCapabilityStatementKindTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRCapabilityStatementKindTest.php index 701157c163..6bfbcf38dd 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRCapabilityStatementKindTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRCapabilityStatementKindTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRCarePlanActivityStatusTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRCarePlanActivityStatusTest.php index 7b48d629c1..cbc666f5ab 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRCarePlanActivityStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRCarePlanActivityStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRCarePlanIntentTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRCarePlanIntentTest.php index e431114bbb..891949bc1c 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRCarePlanIntentTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRCarePlanIntentTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRCarePlanStatusTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRCarePlanStatusTest.php index 3cee402397..8a7d6ba24b 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRCarePlanStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRCarePlanStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRCareTeamStatusTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRCareTeamStatusTest.php index ff9d991c2b..b62987e209 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRCareTeamStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRCareTeamStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRChargeItemStatusTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRChargeItemStatusTest.php index f10d3ff6a6..8f39fcf214 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRChargeItemStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRChargeItemStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRClinicalImpressionStatusTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRClinicalImpressionStatusTest.php index 223434839e..c668d9a612 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRClinicalImpressionStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRClinicalImpressionStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRCodeSystemContentModeTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRCodeSystemContentModeTest.php index 7f063213a9..fec2c233d4 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRCodeSystemContentModeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRCodeSystemContentModeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRCodeSystemHierarchyMeaningTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRCodeSystemHierarchyMeaningTest.php index e6fdd86266..cc19a41794 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRCodeSystemHierarchyMeaningTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRCodeSystemHierarchyMeaningTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRCodeTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRCodeTest.php index 463f73fcd4..e00eff3ec2 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRCodeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRCodeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRCodeableConceptTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRCodeableConceptTest.php index 3ec58534d3..26a3c2a7d5 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRCodeableConceptTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRCodeableConceptTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRCodingTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRCodingTest.php index a3d08db956..303327ba9a 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRCodingTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRCodingTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRCompartmentTypeTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRCompartmentTypeTest.php index 721b37174f..3f85c16fac 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRCompartmentTypeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRCompartmentTypeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRCompositionAttestationModeTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRCompositionAttestationModeTest.php index 6f415ab77f..d5a8bb2a17 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRCompositionAttestationModeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRCompositionAttestationModeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRCompositionStatusTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRCompositionStatusTest.php index 869c8ca584..cab8abc280 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRCompositionStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRCompositionStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRConceptMapEquivalenceTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRConceptMapEquivalenceTest.php index 3ce89b1d02..25ea2d3b57 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRConceptMapEquivalenceTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRConceptMapEquivalenceTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRConceptMapGroupUnmappedModeTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRConceptMapGroupUnmappedModeTest.php index 42d68a9fa4..427ec7b573 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRConceptMapGroupUnmappedModeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRConceptMapGroupUnmappedModeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRConditionClinicalStatusCodesTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRConditionClinicalStatusCodesTest.php index 1fee95ccae..ea785df2df 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRConditionClinicalStatusCodesTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRConditionClinicalStatusCodesTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRConditionVerificationStatusTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRConditionVerificationStatusTest.php index f075cc05ab..949160dd6d 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRConditionVerificationStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRConditionVerificationStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRConditionalDeleteStatusTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRConditionalDeleteStatusTest.php index 65ede0d46b..258126d943 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRConditionalDeleteStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRConditionalDeleteStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRConditionalReadStatusTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRConditionalReadStatusTest.php index 60bcb81958..a0dbb37b33 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRConditionalReadStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRConditionalReadStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRConfidentialityClassificationTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRConfidentialityClassificationTest.php index 0d2a969b75..85cf819f2b 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRConfidentialityClassificationTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRConfidentialityClassificationTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRConsentDataMeaningTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRConsentDataMeaningTest.php index 357f882ed7..14fefd5f0d 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRConsentDataMeaningTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRConsentDataMeaningTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRConsentExceptTypeTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRConsentExceptTypeTest.php index e088aab5af..8094792c14 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRConsentExceptTypeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRConsentExceptTypeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRConsentStateTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRConsentStateTest.php index c3b6f1224a..bb5575a69d 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRConsentStateTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRConsentStateTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRConstraintSeverityTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRConstraintSeverityTest.php index 4623e080d8..e42b1d3380 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRConstraintSeverityTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRConstraintSeverityTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRContactDetailTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRContactDetailTest.php index 880721438b..c1804ca4d2 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRContactDetailTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRContactDetailTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRContactPointSystemTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRContactPointSystemTest.php index 6439d885b8..169586b844 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRContactPointSystemTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRContactPointSystemTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRContactPointTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRContactPointTest.php index 46be1657e6..ec8f99e2bb 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRContactPointTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRContactPointTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRContactPointUseTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRContactPointUseTest.php index 0b6e7edbb4..fdd20e601f 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRContactPointUseTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRContactPointUseTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRContentTypeTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRContentTypeTest.php index 2caffad79c..4cfcf1fa9d 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRContentTypeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRContentTypeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRContractResourceStatusCodesTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRContractResourceStatusCodesTest.php index 055d61f4f8..b6d73ee100 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRContractResourceStatusCodesTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRContractResourceStatusCodesTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRContributorTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRContributorTest.php index aea5b57067..1a9ebd4de8 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRContributorTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRContributorTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRContributorTypeTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRContributorTypeTest.php index 73b34f2db8..7a54109e98 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRContributorTypeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRContributorTypeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRDataElementStringencyTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRDataElementStringencyTest.php index 459363a0c6..181b28ee45 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRDataElementStringencyTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRDataElementStringencyTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRDataRequirement/FHIRDataRequirementCodeFilterTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRDataRequirement/FHIRDataRequirementCodeFilterTest.php index d9ac208f94..c961eb2995 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRDataRequirement/FHIRDataRequirementCodeFilterTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRDataRequirement/FHIRDataRequirementCodeFilterTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRDataRequirement/FHIRDataRequirementDateFilterTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRDataRequirement/FHIRDataRequirementDateFilterTest.php index a78aa28fb0..d0bca932a3 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRDataRequirement/FHIRDataRequirementDateFilterTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRDataRequirement/FHIRDataRequirementDateFilterTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRDataRequirementTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRDataRequirementTest.php index 4af3adef66..73f3428b05 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRDataRequirementTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRDataRequirementTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRDateTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRDateTest.php index c7af5bbd0f..a2db1363cb 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRDateTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRDateTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRDateTimeTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRDateTimeTest.php index 073abf0118..e4dfe619ad 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRDateTimeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRDateTimeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRDaysOfWeekTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRDaysOfWeekTest.php index 9adce07005..450f075c9e 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRDaysOfWeekTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRDaysOfWeekTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRDecimalTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRDecimalTest.php index c95f96628f..a144bc0d58 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRDecimalTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRDecimalTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRDetectedIssueSeverityTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRDetectedIssueSeverityTest.php index 5fc545f7db..3829677dde 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRDetectedIssueSeverityTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRDetectedIssueSeverityTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRDeviceMetricCalibrationStateTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRDeviceMetricCalibrationStateTest.php index c27894f3dc..1a30e065fe 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRDeviceMetricCalibrationStateTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRDeviceMetricCalibrationStateTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRDeviceMetricCalibrationTypeTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRDeviceMetricCalibrationTypeTest.php index f1ca358148..08af0a3de4 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRDeviceMetricCalibrationTypeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRDeviceMetricCalibrationTypeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRDeviceMetricCategoryTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRDeviceMetricCategoryTest.php index 451117cb2a..dac8333e52 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRDeviceMetricCategoryTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRDeviceMetricCategoryTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRDeviceMetricColorTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRDeviceMetricColorTest.php index deb6fc48b8..09b4191350 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRDeviceMetricColorTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRDeviceMetricColorTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRDeviceMetricOperationalStatusTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRDeviceMetricOperationalStatusTest.php index 4a6d411b27..26dee7012e 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRDeviceMetricOperationalStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRDeviceMetricOperationalStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRDeviceUseStatementStatusTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRDeviceUseStatementStatusTest.php index 5ebb532c3b..b477bdbd41 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRDeviceUseStatementStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRDeviceUseStatementStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRDiagnosticReportStatusTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRDiagnosticReportStatusTest.php index 476513e1e4..6c11471b17 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRDiagnosticReportStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRDiagnosticReportStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRDigitalMediaTypeTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRDigitalMediaTypeTest.php index dc78525e9d..7ad56f4733 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRDigitalMediaTypeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRDigitalMediaTypeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRDiscriminatorTypeTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRDiscriminatorTypeTest.php index bd3c0c97c5..e3780a134d 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRDiscriminatorTypeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRDiscriminatorTypeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRDocumentModeTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRDocumentModeTest.php index e976f1ab68..949673ca87 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRDocumentModeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRDocumentModeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRDocumentReferenceStatusTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRDocumentReferenceStatusTest.php index 319e3c3b57..f581275210 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRDocumentReferenceStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRDocumentReferenceStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRDocumentRelationshipTypeTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRDocumentRelationshipTypeTest.php index 68d4ac53b1..eef4458c0c 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRDocumentRelationshipTypeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRDocumentRelationshipTypeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRDosageTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRDosageTest.php index f0d0c83b8c..097677cabc 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRDosageTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRDosageTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRElementDefinition/FHIRElementDefinitionBaseTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRElementDefinition/FHIRElementDefinitionBaseTest.php index d7990afcf1..b41a5b7401 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRElementDefinition/FHIRElementDefinitionBaseTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRElementDefinition/FHIRElementDefinitionBaseTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRElementDefinition/FHIRElementDefinitionBindingTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRElementDefinition/FHIRElementDefinitionBindingTest.php index ec8d421acd..a8b6f25666 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRElementDefinition/FHIRElementDefinitionBindingTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRElementDefinition/FHIRElementDefinitionBindingTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRElementDefinition/FHIRElementDefinitionConstraintTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRElementDefinition/FHIRElementDefinitionConstraintTest.php index b2a9f45bf7..efc97bdaea 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRElementDefinition/FHIRElementDefinitionConstraintTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRElementDefinition/FHIRElementDefinitionConstraintTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRElementDefinition/FHIRElementDefinitionDiscriminatorTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRElementDefinition/FHIRElementDefinitionDiscriminatorTest.php index e4140f5eac..3104151292 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRElementDefinition/FHIRElementDefinitionDiscriminatorTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRElementDefinition/FHIRElementDefinitionDiscriminatorTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRElementDefinition/FHIRElementDefinitionExampleTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRElementDefinition/FHIRElementDefinitionExampleTest.php index 90f09e983f..1d6d189317 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRElementDefinition/FHIRElementDefinitionExampleTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRElementDefinition/FHIRElementDefinitionExampleTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRElementDefinition/FHIRElementDefinitionMappingTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRElementDefinition/FHIRElementDefinitionMappingTest.php index 3e0b35ac9f..009ede0a10 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRElementDefinition/FHIRElementDefinitionMappingTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRElementDefinition/FHIRElementDefinitionMappingTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRElementDefinition/FHIRElementDefinitionSlicingTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRElementDefinition/FHIRElementDefinitionSlicingTest.php index 74684a14a2..b5a582d930 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRElementDefinition/FHIRElementDefinitionSlicingTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRElementDefinition/FHIRElementDefinitionSlicingTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRElementDefinition/FHIRElementDefinitionTypeTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRElementDefinition/FHIRElementDefinitionTypeTest.php index 03c97c41e8..1a8be813aa 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRElementDefinition/FHIRElementDefinitionTypeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRElementDefinition/FHIRElementDefinitionTypeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRElementDefinitionTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRElementDefinitionTest.php index 9860c46979..01ec688900 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRElementDefinitionTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRElementDefinitionTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIREncounterLocationStatusTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIREncounterLocationStatusTest.php index 8516bdedb8..532470745b 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIREncounterLocationStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIREncounterLocationStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIREncounterStatusTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIREncounterStatusTest.php index b7400f6be6..87e72d7b28 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIREncounterStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIREncounterStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIREndpointStatusTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIREndpointStatusTest.php index 065f6dd783..ddcb37b3e1 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIREndpointStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIREndpointStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIREpisodeOfCareStatusTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIREpisodeOfCareStatusTest.php index e6d39fee40..c9460a8dd0 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIREpisodeOfCareStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIREpisodeOfCareStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIREventCapabilityModeTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIREventCapabilityModeTest.php index d769cd9ec3..44eaa5678d 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIREventCapabilityModeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIREventCapabilityModeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIREventStatusTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIREventStatusTest.php index 92ba5ff0de..ecbd1280c1 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIREventStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIREventStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIREventTimingTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIREventTimingTest.php index 5e4d5fa272..206a230500 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIREventTimingTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIREventTimingTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRExplanationOfBenefitStatusTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRExplanationOfBenefitStatusTest.php index d6c5dfcf82..9fad3626be 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRExplanationOfBenefitStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRExplanationOfBenefitStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRExtensionContextTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRExtensionContextTest.php index e791cf9aab..93c85eb23d 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRExtensionContextTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRExtensionContextTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRExtensionTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRExtensionTest.php index d90d284c82..063ae4451f 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRExtensionTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRExtensionTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRFHIRAllTypesTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRFHIRAllTypesTest.php index 1758cceede..861330a6c6 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRFHIRAllTypesTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRFHIRAllTypesTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRFHIRDefinedTypeTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRFHIRDefinedTypeTest.php index 582e83b274..d1b861a56f 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRFHIRDefinedTypeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRFHIRDefinedTypeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRFHIRDeviceStatusTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRFHIRDeviceStatusTest.php index 702f88ca23..88c3cd7715 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRFHIRDeviceStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRFHIRDeviceStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRFHIRSubstanceStatusTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRFHIRSubstanceStatusTest.php index a42ec8a129..76e154c6df 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRFHIRSubstanceStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRFHIRSubstanceStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRFamilyHistoryStatusTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRFamilyHistoryStatusTest.php index 6ac4642ce8..45af187f66 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRFamilyHistoryStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRFamilyHistoryStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRFilterOperatorTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRFilterOperatorTest.php index 01556feec9..7d48bb94f6 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRFilterOperatorTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRFilterOperatorTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRFinancialResourceStatusCodesTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRFinancialResourceStatusCodesTest.php index 62f8c2f41c..67755bce5c 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRFinancialResourceStatusCodesTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRFinancialResourceStatusCodesTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRFlagStatusTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRFlagStatusTest.php index 548e25b520..c1bae130be 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRFlagStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRFlagStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRGoalStatusTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRGoalStatusTest.php index 4586a46bdc..475926213b 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRGoalStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRGoalStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRGraphCompartmentRuleTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRGraphCompartmentRuleTest.php index d4da82188d..648c4c49e1 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRGraphCompartmentRuleTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRGraphCompartmentRuleTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRGroupTypeTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRGroupTypeTest.php index a5748fac26..c77876c249 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRGroupTypeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRGroupTypeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRGuidanceResponseStatusTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRGuidanceResponseStatusTest.php index 9802f3cd51..cefba81971 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRGuidanceResponseStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRGuidanceResponseStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRGuideDependencyTypeTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRGuideDependencyTypeTest.php index 2b2a67255b..f513d73c33 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRGuideDependencyTypeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRGuideDependencyTypeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRGuidePageKindTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRGuidePageKindTest.php index 387aa51737..485833e6c5 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRGuidePageKindTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRGuidePageKindTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRHTTPVerbTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRHTTPVerbTest.php index a998432ba2..63cc64d260 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRHTTPVerbTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRHTTPVerbTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRHumanNameTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRHumanNameTest.php index 7c1a713001..1524b548b8 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRHumanNameTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRHumanNameTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRIdTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRIdTest.php index e49ebb0a27..b2c7f8f56f 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRIdTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRIdTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRIdentifierTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRIdentifierTest.php index 2fedaec5cb..ca7292827d 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRIdentifierTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRIdentifierTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRIdentifierUseTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRIdentifierUseTest.php index 75c8c34c7e..1d0b1baad0 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRIdentifierUseTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRIdentifierUseTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRIdentityAssuranceLevelTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRIdentityAssuranceLevelTest.php index 7e8bbee241..02ffbbf894 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRIdentityAssuranceLevelTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRIdentityAssuranceLevelTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRImmunizationStatusCodesTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRImmunizationStatusCodesTest.php index 81d273fc33..9f5c5dd64e 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRImmunizationStatusCodesTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRImmunizationStatusCodesTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRInstanceAvailabilityTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRInstanceAvailabilityTest.php index 16bea21526..cb020e0481 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRInstanceAvailabilityTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRInstanceAvailabilityTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRInstantTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRInstantTest.php index a0dd4d095a..b9189ef57d 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRInstantTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRInstantTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRIntegerTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRIntegerTest.php index 9868077550..dee6ad3b4a 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRIntegerTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRIntegerTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRIssueSeverityTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRIssueSeverityTest.php index 231e672ab1..579f986e10 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRIssueSeverityTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRIssueSeverityTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRIssueTypeTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRIssueTypeTest.php index 0d5bbd78c0..d5b9035907 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRIssueTypeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRIssueTypeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRLinkTypeTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRLinkTypeTest.php index f60666de21..876957743a 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRLinkTypeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRLinkTypeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRLinkageTypeTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRLinkageTypeTest.php index 626e0e44e6..fb6019b0a4 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRLinkageTypeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRLinkageTypeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRListModeTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRListModeTest.php index 5f2a1c136f..8b019f6377 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRListModeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRListModeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRListStatusTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRListStatusTest.php index a56d987ea0..c01b3a850e 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRListStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRListStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRLocationModeTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRLocationModeTest.php index 57de94680b..3ce558c144 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRLocationModeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRLocationModeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRLocationStatusTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRLocationStatusTest.php index ef38b2c42d..7db6f7349f 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRLocationStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRLocationStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRMarkdownTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRMarkdownTest.php index 5f2535f41d..6f0a6fdd68 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRMarkdownTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRMarkdownTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRMeasmntPrincipleTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRMeasmntPrincipleTest.php index 8e82198aa8..1d657c86f5 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRMeasmntPrincipleTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRMeasmntPrincipleTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRMeasureReportStatusTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRMeasureReportStatusTest.php index 249bb35a31..99f6382d44 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRMeasureReportStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRMeasureReportStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRMeasureReportTypeTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRMeasureReportTypeTest.php index 8c3db7da0d..6f1e006197 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRMeasureReportTypeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRMeasureReportTypeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRMedicationAdministrationStatusTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRMedicationAdministrationStatusTest.php index e79565e435..62d03ac278 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRMedicationAdministrationStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRMedicationAdministrationStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRMedicationDispenseStatusTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRMedicationDispenseStatusTest.php index 3ff732ee5e..a3d607d905 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRMedicationDispenseStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRMedicationDispenseStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRMedicationRequestIntentTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRMedicationRequestIntentTest.php index d79cabf05a..55610ec32b 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRMedicationRequestIntentTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRMedicationRequestIntentTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRMedicationRequestPriorityTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRMedicationRequestPriorityTest.php index 94206e930b..e224deae41 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRMedicationRequestPriorityTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRMedicationRequestPriorityTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRMedicationRequestStatusTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRMedicationRequestStatusTest.php index 0d1a261e24..81d777caeb 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRMedicationRequestStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRMedicationRequestStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRMedicationStatementStatusTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRMedicationStatementStatusTest.php index d3fb5695c9..1789866c86 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRMedicationStatementStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRMedicationStatementStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRMedicationStatementTakenTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRMedicationStatementTakenTest.php index 45a996bbed..73bd12a325 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRMedicationStatementTakenTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRMedicationStatementTakenTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRMedicationStatusTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRMedicationStatusTest.php index c43b02cd1d..ae7960c28a 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRMedicationStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRMedicationStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRMessageSignificanceCategoryTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRMessageSignificanceCategoryTest.php index 17a25c9454..af21b13072 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRMessageSignificanceCategoryTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRMessageSignificanceCategoryTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRMetaTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRMetaTest.php index 12c61ca32d..d266b5f420 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRMetaTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRMetaTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRNameUseTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRNameUseTest.php index b1f9983bb4..61edcd897b 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRNameUseTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRNameUseTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRNamingSystemIdentifierTypeTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRNamingSystemIdentifierTypeTest.php index bc2f2f89f5..544b6fe233 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRNamingSystemIdentifierTypeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRNamingSystemIdentifierTypeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRNamingSystemTypeTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRNamingSystemTypeTest.php index 3c7c55addf..7da6c0a71d 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRNamingSystemTypeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRNamingSystemTypeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRNarrativeStatusTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRNarrativeStatusTest.php index 38089a16ae..a220a0af46 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRNarrativeStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRNarrativeStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRNarrativeTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRNarrativeTest.php index caabe399f7..a3e47750e6 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRNarrativeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRNarrativeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRNoteTypeTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRNoteTypeTest.php index aa59610792..93f1fc8411 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRNoteTypeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRNoteTypeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRNutritionOrderStatusTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRNutritionOrderStatusTest.php index 2f5b7bcab5..28dfb57dfa 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRNutritionOrderStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRNutritionOrderStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRObservationRelationshipTypeTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRObservationRelationshipTypeTest.php index 7d2c6a8525..34cb44976a 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRObservationRelationshipTypeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRObservationRelationshipTypeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRObservationStatusTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRObservationStatusTest.php index 4303c136bd..30442687f2 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRObservationStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRObservationStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIROidTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIROidTest.php index 692030a8af..387d19c0b0 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIROidTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIROidTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIROperationKindTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIROperationKindTest.php index 6e09efed11..3dcb1f18ed 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIROperationKindTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIROperationKindTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIROperationParameterUseTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIROperationParameterUseTest.php index 434e2191a2..48bca91ff5 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIROperationParameterUseTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIROperationParameterUseTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRParameterDefinitionTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRParameterDefinitionTest.php index 6252de5aaa..f7bbd32081 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRParameterDefinitionTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRParameterDefinitionTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRParticipantRequiredTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRParticipantRequiredTest.php index 1218f4c6e0..2a5d6aa79e 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRParticipantRequiredTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRParticipantRequiredTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRParticipationStatusTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRParticipationStatusTest.php index 05c31a1c86..d7a6458b42 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRParticipationStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRParticipationStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRPeriodTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRPeriodTest.php index 5b3c7ed6a0..bcff7f8b20 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRPeriodTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRPeriodTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRPositiveIntTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRPositiveIntTest.php index ba58ffee34..e2d8603808 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRPositiveIntTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRPositiveIntTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRPropertyRepresentationTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRPropertyRepresentationTest.php index c8af943291..bcf04c966c 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRPropertyRepresentationTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRPropertyRepresentationTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRPropertyTypeTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRPropertyTypeTest.php index f7bf43d6a7..db34a3a1e5 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRPropertyTypeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRPropertyTypeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRProvenanceEntityRoleTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRProvenanceEntityRoleTest.php index 6a23db6a38..7f1d956696 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRProvenanceEntityRoleTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRProvenanceEntityRoleTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRPublicationStatusTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRPublicationStatusTest.php index 708ad98449..911fe52999 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRPublicationStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRPublicationStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRQualityTypeTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRQualityTypeTest.php index f7b4490eed..792d2709d0 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRQualityTypeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRQualityTypeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRQuantity/FHIRAgeTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRQuantity/FHIRAgeTest.php index 9dcfbea0c7..95da1e1b19 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRQuantity/FHIRAgeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRQuantity/FHIRAgeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRQuantity/FHIRCountTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRQuantity/FHIRCountTest.php index 7a45556720..5fd97945fb 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRQuantity/FHIRCountTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRQuantity/FHIRCountTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRQuantity/FHIRDistanceTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRQuantity/FHIRDistanceTest.php index 40ffd0fca9..d6b495c487 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRQuantity/FHIRDistanceTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRQuantity/FHIRDistanceTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRQuantity/FHIRDurationTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRQuantity/FHIRDurationTest.php index c3fd645c88..f40f1f2b2b 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRQuantity/FHIRDurationTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRQuantity/FHIRDurationTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRQuantity/FHIRMoneyTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRQuantity/FHIRMoneyTest.php index 7c2a7d9e7f..c5ea5c150e 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRQuantity/FHIRMoneyTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRQuantity/FHIRMoneyTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRQuantityComparatorTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRQuantityComparatorTest.php index c79dcaa7c7..d7c72e9177 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRQuantityComparatorTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRQuantityComparatorTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRQuantityTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRQuantityTest.php index 7f4eab1c1f..85ee03d004 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRQuantityTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRQuantityTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRQuestionnaireItemTypeTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRQuestionnaireItemTypeTest.php index 30310e61c1..3d610116ac 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRQuestionnaireItemTypeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRQuestionnaireItemTypeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRQuestionnaireResponseStatusTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRQuestionnaireResponseStatusTest.php index c3a1143055..dd971fdaca 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRQuestionnaireResponseStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRQuestionnaireResponseStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRRangeTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRRangeTest.php index b4ac8a9d34..b0c4023af1 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRRangeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRRangeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRRatioTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRRatioTest.php index 9cb32fb226..5a20596bb0 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRRatioTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRRatioTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRReferenceHandlingPolicyTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRReferenceHandlingPolicyTest.php index 7a8f247aa2..1d36a357b1 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRReferenceHandlingPolicyTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRReferenceHandlingPolicyTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRReferenceTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRReferenceTest.php index 872ac69b05..44314dbd68 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRReferenceTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRReferenceTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRReferenceVersionRulesTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRReferenceVersionRulesTest.php index 7a3b9cb853..152af65632 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRReferenceVersionRulesTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRReferenceVersionRulesTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRRelatedArtifactTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRRelatedArtifactTest.php index a218943633..46beb9e1fd 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRRelatedArtifactTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRRelatedArtifactTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRRelatedArtifactTypeTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRRelatedArtifactTypeTest.php index e9d41e7381..4f2ad83050 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRRelatedArtifactTypeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRRelatedArtifactTypeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRRemittanceOutcomeTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRRemittanceOutcomeTest.php index ca841d9bae..a76b94bb3e 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRRemittanceOutcomeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRRemittanceOutcomeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRRepositoryTypeTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRRepositoryTypeTest.php index 549cbfd168..b124e37299 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRRepositoryTypeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRRepositoryTypeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRRequestIntentTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRRequestIntentTest.php index 11749148a7..8a29a3e024 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRRequestIntentTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRRequestIntentTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRRequestPriorityTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRRequestPriorityTest.php index 2b9237e839..a0b46c564f 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRRequestPriorityTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRRequestPriorityTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRRequestStatusTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRRequestStatusTest.php index 5f0d7d73ff..e41dcfff29 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRRequestStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRRequestStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRResearchStudyStatusTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRResearchStudyStatusTest.php index 265b9d61c5..da444a75b7 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRResearchStudyStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRResearchStudyStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRResearchSubjectStatusTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRResearchSubjectStatusTest.php index cae18bacb7..5e7c65de0e 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRResearchSubjectStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRResearchSubjectStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRResourceVersionPolicyTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRResourceVersionPolicyTest.php index 6e01f3377d..65e67c529c 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRResourceVersionPolicyTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRResourceVersionPolicyTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRResponseTypeTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRResponseTypeTest.php index 66a5da5540..c4b3979f55 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRResponseTypeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRResponseTypeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRRestfulCapabilityModeTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRRestfulCapabilityModeTest.php index 0b6840e510..f7763c0f19 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRRestfulCapabilityModeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRRestfulCapabilityModeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRSampledDataDataTypeTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRSampledDataDataTypeTest.php index dda29e2cfa..24180068f6 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRSampledDataDataTypeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRSampledDataDataTypeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRSampledDataTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRSampledDataTest.php index 6d54ae501b..6dba9d449d 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRSampledDataTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRSampledDataTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRSearchComparatorTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRSearchComparatorTest.php index fc71064981..8112bf4c03 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRSearchComparatorTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRSearchComparatorTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRSearchEntryModeTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRSearchEntryModeTest.php index 8f3e2aa5ac..2e0957b4bc 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRSearchEntryModeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRSearchEntryModeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRSearchModifierCodeTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRSearchModifierCodeTest.php index b6d7e67b2d..b1ee7557f8 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRSearchModifierCodeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRSearchModifierCodeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRSearchParamTypeTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRSearchParamTypeTest.php index 51a053c753..dd716da669 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRSearchParamTypeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRSearchParamTypeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRSignatureTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRSignatureTest.php index 12d9d2da79..ea52b73bd5 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRSignatureTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRSignatureTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRSlicingRulesTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRSlicingRulesTest.php index 455300454a..a37f472229 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRSlicingRulesTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRSlicingRulesTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRSlotStatusTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRSlotStatusTest.php index 11530f5e3e..f6f1379e85 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRSlotStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRSlotStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRSpecimenStatusTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRSpecimenStatusTest.php index 9f6d491a5f..d48eecc47f 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRSpecimenStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRSpecimenStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRStringTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRStringTest.php index 834d6f7cb1..7c3335f0e2 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRStringTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRStringTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRStructureDefinitionKindTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRStructureDefinitionKindTest.php index 9842225d6f..f2d56411a9 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRStructureDefinitionKindTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRStructureDefinitionKindTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRStructureMapContextTypeTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRStructureMapContextTypeTest.php index 8a66540ea3..b1a8dd6be8 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRStructureMapContextTypeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRStructureMapContextTypeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRStructureMapGroupTypeModeTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRStructureMapGroupTypeModeTest.php index 6c4f06aae6..e58d2c9e24 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRStructureMapGroupTypeModeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRStructureMapGroupTypeModeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRStructureMapInputModeTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRStructureMapInputModeTest.php index f95309d433..f141ebdacc 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRStructureMapInputModeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRStructureMapInputModeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRStructureMapModelModeTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRStructureMapModelModeTest.php index bc4ebd1449..f2a619cd36 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRStructureMapModelModeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRStructureMapModelModeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRStructureMapSourceListModeTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRStructureMapSourceListModeTest.php index 850bfe7c95..02d6dc1e43 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRStructureMapSourceListModeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRStructureMapSourceListModeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRStructureMapTargetListModeTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRStructureMapTargetListModeTest.php index e779569731..25da48fd9f 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRStructureMapTargetListModeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRStructureMapTargetListModeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRStructureMapTransformTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRStructureMapTransformTest.php index ed983464f1..bc32c18207 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRStructureMapTransformTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRStructureMapTransformTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRSubscriptionChannelTypeTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRSubscriptionChannelTypeTest.php index e3efe36841..4f896f9c23 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRSubscriptionChannelTypeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRSubscriptionChannelTypeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRSubscriptionStatusTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRSubscriptionStatusTest.php index a5abf5508b..55797b48cf 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRSubscriptionStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRSubscriptionStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRSupplyDeliveryStatusTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRSupplyDeliveryStatusTest.php index 0e672971fb..36869dddd0 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRSupplyDeliveryStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRSupplyDeliveryStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRSupplyRequestStatusTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRSupplyRequestStatusTest.php index 1319f18b7f..3f0d850149 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRSupplyRequestStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRSupplyRequestStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRSystemRestfulInteractionTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRSystemRestfulInteractionTest.php index c2925064a7..30de9a95cd 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRSystemRestfulInteractionTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRSystemRestfulInteractionTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRSystemVersionProcessingModeTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRSystemVersionProcessingModeTest.php index 6beceb2cc0..3564a148d1 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRSystemVersionProcessingModeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRSystemVersionProcessingModeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRTaskStatusTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRTaskStatusTest.php index e22b84129d..6e58894004 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRTaskStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRTaskStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRTestReportActionResultTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRTestReportActionResultTest.php index 2181e22486..2d9d88a458 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRTestReportActionResultTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRTestReportActionResultTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRTestReportParticipantTypeTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRTestReportParticipantTypeTest.php index b8733b49eb..4b299eb9e5 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRTestReportParticipantTypeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRTestReportParticipantTypeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRTestReportResultTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRTestReportResultTest.php index 780c19d331..050606c54d 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRTestReportResultTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRTestReportResultTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRTestReportStatusTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRTestReportStatusTest.php index a4d1eab69c..0c7e6d2f28 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRTestReportStatusTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRTestReportStatusTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRTestScriptRequestMethodCodeTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRTestScriptRequestMethodCodeTest.php index 283d080979..fc6b68ebdf 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRTestScriptRequestMethodCodeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRTestScriptRequestMethodCodeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRTimeTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRTimeTest.php index dfa4cc0ae4..dac1f14307 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRTimeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRTimeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRTiming/FHIRTimingRepeatTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRTiming/FHIRTimingRepeatTest.php index a06835da9f..562c0f22ba 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRTiming/FHIRTimingRepeatTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRTiming/FHIRTimingRepeatTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRTimingTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRTimingTest.php index 4c6db00066..21b504efed 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRTimingTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRTimingTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRTriggerDefinitionTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRTriggerDefinitionTest.php index 751c49c822..08c34705a0 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRTriggerDefinitionTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRTriggerDefinitionTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRTriggerTypeTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRTriggerTypeTest.php index 42aad95102..71053af5a5 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRTriggerTypeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRTriggerTypeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRTypeDerivationRuleTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRTypeDerivationRuleTest.php index 10dd18fc1c..553061d28a 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRTypeDerivationRuleTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRTypeDerivationRuleTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRTypeRestfulInteractionTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRTypeRestfulInteractionTest.php index 1e76179386..f9dcbc823d 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRTypeRestfulInteractionTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRTypeRestfulInteractionTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRUDIEntryTypeTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRUDIEntryTypeTest.php index 6e5b0a44ee..92584be79d 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRUDIEntryTypeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRUDIEntryTypeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRUnitsOfTimeTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRUnitsOfTimeTest.php index 85fa216bf0..a0b9b4450c 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRUnitsOfTimeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRUnitsOfTimeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRUnknownContentCodeTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRUnknownContentCodeTest.php index 62baa93caa..234da7e6e5 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRUnknownContentCodeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRUnknownContentCodeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRUnsignedIntTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRUnsignedIntTest.php index 08c0d7e604..ad76973463 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRUnsignedIntTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRUnsignedIntTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRUriTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRUriTest.php index 84ab41a9ca..03fcf3fe92 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRUriTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRUriTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRUsageContextTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRUsageContextTest.php index 252b28c9d6..d172b06040 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRUsageContextTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRUsageContextTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRUseTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRUseTest.php index d020d7e362..4356709257 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRUseTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRUseTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRUuidTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRUuidTest.php index 055a4ec9de..e8302f2b11 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRUuidTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRUuidTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRVisionBaseTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRVisionBaseTest.php index ddada70216..343264a6c7 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRVisionBaseTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRVisionBaseTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRVisionEyesTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRVisionEyesTest.php index 73cf1e385e..26dcf720f8 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRVisionEyesTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRVisionEyesTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRXPathUsageTypeTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRXPathUsageTypeTest.php index 8b7d18ff41..b25d56ef03 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRXPathUsageTypeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElement/FHIRXPathUsageTypeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElementTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElementTest.php index 449f74fc6f..125fb03470 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElementTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRElementTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIREncounterLocationStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIREncounterLocationStatusListTest.php index b2ba250761..5aed71db0c 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIREncounterLocationStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIREncounterLocationStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIREncounterStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIREncounterStatusListTest.php index 8f9b1c3324..766b6bb298 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIREncounterStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIREncounterStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIREndpointStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIREndpointStatusListTest.php index 4fd0325210..9df1d456f6 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIREndpointStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIREndpointStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIREpisodeOfCareStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIREpisodeOfCareStatusListTest.php index 1bd7207ef1..f589beeffa 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIREpisodeOfCareStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIREpisodeOfCareStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIREventCapabilityModeListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIREventCapabilityModeListTest.php index 9c4761c352..c9a6ac0c61 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIREventCapabilityModeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIREventCapabilityModeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIREventStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIREventStatusListTest.php index 802a001be2..b9c1a4d9a0 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIREventStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIREventStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIREventTimingListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIREventTimingListTest.php index 64ab04fa50..aba23150b5 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIREventTimingListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIREventTimingListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRExplanationOfBenefitStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRExplanationOfBenefitStatusListTest.php index 06cd4aa872..1d48d00086 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRExplanationOfBenefitStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRExplanationOfBenefitStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRExtensionContextListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRExtensionContextListTest.php index ac2d40a522..2d430ab127 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRExtensionContextListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRExtensionContextListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRFHIRAllTypesListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRFHIRAllTypesListTest.php index 541a7b46fe..e6f5c6d068 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRFHIRAllTypesListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRFHIRAllTypesListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRFHIRDefinedTypeListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRFHIRDefinedTypeListTest.php index 67b5a0dbb7..6702eb2606 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRFHIRDefinedTypeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRFHIRDefinedTypeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRFHIRDeviceStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRFHIRDeviceStatusListTest.php index 10cae85280..e2820fe7dd 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRFHIRDeviceStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRFHIRDeviceStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRFHIRSubstanceStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRFHIRSubstanceStatusListTest.php index 44b4a2e718..cb21e471ca 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRFHIRSubstanceStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRFHIRSubstanceStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRFamilyHistoryStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRFamilyHistoryStatusListTest.php index ed38d241b4..94c464085b 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRFamilyHistoryStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRFamilyHistoryStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRFilterOperatorListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRFilterOperatorListTest.php index 5d858fe76a..ce9ad4b575 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRFilterOperatorListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRFilterOperatorListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRFinancialResourceStatusCodesListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRFinancialResourceStatusCodesListTest.php index 1921bcf08b..f9fc79d1ed 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRFinancialResourceStatusCodesListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRFinancialResourceStatusCodesListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRFlagStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRFlagStatusListTest.php index 3ad9136a96..9627130149 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRFlagStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRFlagStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRGoalStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRGoalStatusListTest.php index 587b7e7f07..0eb57de3eb 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRGoalStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRGoalStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRGraphCompartmentRuleListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRGraphCompartmentRuleListTest.php index 23d2bca607..1520d4f3d6 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRGraphCompartmentRuleListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRGraphCompartmentRuleListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRGroupTypeListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRGroupTypeListTest.php index 37868af2d8..b1955d1185 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRGroupTypeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRGroupTypeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRGuidanceResponseStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRGuidanceResponseStatusListTest.php index d2cf91a2e0..ed96822b13 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRGuidanceResponseStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRGuidanceResponseStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRGuideDependencyTypeListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRGuideDependencyTypeListTest.php index 2c3156cf02..1bac07a711 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRGuideDependencyTypeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRGuideDependencyTypeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRGuidePageKindListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRGuidePageKindListTest.php index c8c617787f..9dfc637219 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRGuidePageKindListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRGuidePageKindListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRHTTPVerbListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRHTTPVerbListTest.php index 548225ee8f..4695134c35 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRHTTPVerbListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRHTTPVerbListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRIdPrimitiveTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRIdPrimitiveTest.php index 866c1907e1..67cc62631c 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRIdPrimitiveTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRIdPrimitiveTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRIdentifierUseListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRIdentifierUseListTest.php index 1d4cb6af96..813f69d44d 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRIdentifierUseListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRIdentifierUseListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRIdentityAssuranceLevelListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRIdentityAssuranceLevelListTest.php index 1a905529ab..109839a709 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRIdentityAssuranceLevelListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRIdentityAssuranceLevelListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRImmunizationStatusCodesListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRImmunizationStatusCodesListTest.php index 6b3be34bdb..72d8639a24 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRImmunizationStatusCodesListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRImmunizationStatusCodesListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRInstanceAvailabilityListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRInstanceAvailabilityListTest.php index e48c63db2c..c5d24f788c 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRInstanceAvailabilityListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRInstanceAvailabilityListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRInstantPrimitiveTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRInstantPrimitiveTest.php index d2352562ef..19c2a67542 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRInstantPrimitiveTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRInstantPrimitiveTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRIntegerPrimitiveTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRIntegerPrimitiveTest.php index ff62823d33..9948690f14 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRIntegerPrimitiveTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRIntegerPrimitiveTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRIssueSeverityListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRIssueSeverityListTest.php index 96bf7e771e..11bcdffafa 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRIssueSeverityListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRIssueSeverityListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRIssueTypeListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRIssueTypeListTest.php index 42c72f86b8..3db28cc69a 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRIssueTypeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRIssueTypeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRLinkTypeListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRLinkTypeListTest.php index b6c6213955..f0b24e0eb9 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRLinkTypeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRLinkTypeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRLinkageTypeListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRLinkageTypeListTest.php index dd1062485b..930aa0e86c 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRLinkageTypeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRLinkageTypeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRListModeListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRListModeListTest.php index 89569bd14e..2ee3160ed9 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRListModeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRListModeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRListStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRListStatusListTest.php index d793b3eb95..4dfded02a4 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRListStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRListStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRLocationModeListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRLocationModeListTest.php index ddc76a474e..cd3a77efe6 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRLocationModeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRLocationModeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRLocationStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRLocationStatusListTest.php index 918f011be2..afd9d283d8 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRLocationStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRLocationStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRMarkdownPrimitiveTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRMarkdownPrimitiveTest.php index 9e30e47396..c279f69f0f 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRMarkdownPrimitiveTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRMarkdownPrimitiveTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRMeasmntPrincipleListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRMeasmntPrincipleListTest.php index 99c63334ee..36228f2fab 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRMeasmntPrincipleListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRMeasmntPrincipleListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRMeasureReportStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRMeasureReportStatusListTest.php index 2e503ea7be..348fbd8c86 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRMeasureReportStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRMeasureReportStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRMeasureReportTypeListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRMeasureReportTypeListTest.php index b409d4bfc7..cf4f60831b 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRMeasureReportTypeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRMeasureReportTypeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRMedicationAdministrationStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRMedicationAdministrationStatusListTest.php index 6e77a4e234..dba64b0e85 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRMedicationAdministrationStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRMedicationAdministrationStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRMedicationDispenseStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRMedicationDispenseStatusListTest.php index fcbd863e99..ec9563b1a2 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRMedicationDispenseStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRMedicationDispenseStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRMedicationRequestIntentListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRMedicationRequestIntentListTest.php index 1f3e20042b..865e4371e1 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRMedicationRequestIntentListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRMedicationRequestIntentListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRMedicationRequestPriorityListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRMedicationRequestPriorityListTest.php index 11c040113b..4ca3c2731b 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRMedicationRequestPriorityListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRMedicationRequestPriorityListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRMedicationRequestStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRMedicationRequestStatusListTest.php index f6d088d439..224be4e1f2 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRMedicationRequestStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRMedicationRequestStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRMedicationStatementStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRMedicationStatementStatusListTest.php index f8b7fedbe1..1609131118 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRMedicationStatementStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRMedicationStatementStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRMedicationStatementTakenListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRMedicationStatementTakenListTest.php index ac5d993160..43021107d0 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRMedicationStatementTakenListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRMedicationStatementTakenListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRMedicationStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRMedicationStatusListTest.php index 6858bfcc45..53a30cf0df 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRMedicationStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRMedicationStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRMessageSignificanceCategoryListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRMessageSignificanceCategoryListTest.php index e6e335f381..7090b9fdee 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRMessageSignificanceCategoryListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRMessageSignificanceCategoryListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRNameUseListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRNameUseListTest.php index 38555e3335..02cae15082 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRNameUseListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRNameUseListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRNamingSystemIdentifierTypeListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRNamingSystemIdentifierTypeListTest.php index 77a644ab6b..3bec39fc65 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRNamingSystemIdentifierTypeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRNamingSystemIdentifierTypeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRNamingSystemTypeListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRNamingSystemTypeListTest.php index 9949d8ee9e..acdd7bfb68 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRNamingSystemTypeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRNamingSystemTypeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRNarrativeStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRNarrativeStatusListTest.php index 34d9cf5c13..9bee7a4acd 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRNarrativeStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRNarrativeStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRNoteTypeListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRNoteTypeListTest.php index 213306d862..1bc0cc8688 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRNoteTypeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRNoteTypeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRNutritionOrderStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRNutritionOrderStatusListTest.php index 6ea413e607..4603c19776 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRNutritionOrderStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRNutritionOrderStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRObservationRelationshipTypeListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRObservationRelationshipTypeListTest.php index 4c6b0d7d89..98beb1369e 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRObservationRelationshipTypeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRObservationRelationshipTypeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRObservationStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRObservationStatusListTest.php index d8d4001eef..7c9ae4ea2d 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRObservationStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRObservationStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIROidPrimitiveTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIROidPrimitiveTest.php index 27870f269c..93932a3895 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIROidPrimitiveTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIROidPrimitiveTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIROperationKindListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIROperationKindListTest.php index 36f06823ff..65705e6706 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIROperationKindListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIROperationKindListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIROperationParameterUseListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIROperationParameterUseListTest.php index 3f95777cd0..5feb2afeb9 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIROperationParameterUseListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIROperationParameterUseListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRParticipantRequiredListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRParticipantRequiredListTest.php index eef2502974..a225702ada 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRParticipantRequiredListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRParticipantRequiredListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRParticipationStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRParticipationStatusListTest.php index 3eb62900ff..9baa8a38ee 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRParticipationStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRParticipationStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRPositiveIntPrimitiveTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRPositiveIntPrimitiveTest.php index cf927ee3e4..c854a88964 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRPositiveIntPrimitiveTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRPositiveIntPrimitiveTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRPropertyRepresentationListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRPropertyRepresentationListTest.php index 5f06abd324..a7d8cf30d8 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRPropertyRepresentationListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRPropertyRepresentationListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRPropertyTypeListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRPropertyTypeListTest.php index e1ed483c52..78b5c7889d 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRPropertyTypeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRPropertyTypeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRProvenanceEntityRoleListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRProvenanceEntityRoleListTest.php index ffacf9a5f8..4011317a0a 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRProvenanceEntityRoleListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRProvenanceEntityRoleListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRPublicationStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRPublicationStatusListTest.php index de9b9ed1e9..8101b33d5f 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRPublicationStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRPublicationStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRQualityTypeListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRQualityTypeListTest.php index 3d36dd1b51..26923dfa71 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRQualityTypeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRQualityTypeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRQuantityComparatorListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRQuantityComparatorListTest.php index c4df2dd8b4..29383ce84f 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRQuantityComparatorListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRQuantityComparatorListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRQuestionnaireItemTypeListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRQuestionnaireItemTypeListTest.php index 0ec485c367..509fbbfda9 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRQuestionnaireItemTypeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRQuestionnaireItemTypeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRQuestionnaireResponseStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRQuestionnaireResponseStatusListTest.php index dc09a65e31..8ddd165f72 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRQuestionnaireResponseStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRQuestionnaireResponseStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRReferenceHandlingPolicyListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRReferenceHandlingPolicyListTest.php index aad4e6daed..eab38f0f89 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRReferenceHandlingPolicyListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRReferenceHandlingPolicyListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRReferenceVersionRulesListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRReferenceVersionRulesListTest.php index e595d8c64b..9d00988cab 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRReferenceVersionRulesListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRReferenceVersionRulesListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRRelatedArtifactTypeListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRRelatedArtifactTypeListTest.php index 8e5298c9c1..516c04fbf3 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRRelatedArtifactTypeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRRelatedArtifactTypeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRRemittanceOutcomeListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRRemittanceOutcomeListTest.php index fbeb47db29..4a090bb335 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRRemittanceOutcomeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRRemittanceOutcomeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRRepositoryTypeListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRRepositoryTypeListTest.php index 4d78ff581a..ccbe66fd7c 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRRepositoryTypeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRRepositoryTypeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRRequestIntentListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRRequestIntentListTest.php index fb6f5e2584..71d2759693 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRRequestIntentListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRRequestIntentListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRRequestPriorityListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRRequestPriorityListTest.php index 882c29bd2f..4e4743e5c4 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRRequestPriorityListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRRequestPriorityListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRRequestStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRRequestStatusListTest.php index f39672c524..94e9fdc5fb 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRRequestStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRRequestStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResearchStudyStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResearchStudyStatusListTest.php index 381a3f8d6c..0ae1b2410f 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResearchStudyStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResearchStudyStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResearchSubjectStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResearchSubjectStatusListTest.php index 95d2d1a8e3..afcec787df 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResearchSubjectStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResearchSubjectStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRBinaryTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRBinaryTest.php index bc588b1485..592aa43ac7 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRBinaryTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRBinaryTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRBundleTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRBundleTest.php index 4782be63a1..f5ba535bb2 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRBundleTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRBundleTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRAccountTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRAccountTest.php index 86f71bb0c4..4c8d468d74 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRAccountTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRAccountTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRActivityDefinitionTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRActivityDefinitionTest.php index 73ae5da84b..d47a365800 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRActivityDefinitionTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRActivityDefinitionTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRAdverseEventTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRAdverseEventTest.php index b9862aca06..c477d724ad 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRAdverseEventTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRAdverseEventTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRAllergyIntoleranceTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRAllergyIntoleranceTest.php index f9db0c4ead..ad3b14cdae 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRAllergyIntoleranceTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRAllergyIntoleranceTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRAppointmentResponseTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRAppointmentResponseTest.php index 5ae498b5bb..e0b8e1b12f 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRAppointmentResponseTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRAppointmentResponseTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRAppointmentTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRAppointmentTest.php index 3f80c1642c..b2d82ff5e6 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRAppointmentTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRAppointmentTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRAuditEventTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRAuditEventTest.php index c806317af6..7f26d94d9e 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRAuditEventTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRAuditEventTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRBasicTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRBasicTest.php index 0fb03c4e83..b8b9cf3e5f 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRBasicTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRBasicTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRBodySiteTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRBodySiteTest.php index c080690f0e..8d7fab25b7 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRBodySiteTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRBodySiteTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRCapabilityStatementTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRCapabilityStatementTest.php index 03482c1b97..e2a6bcf5b9 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRCapabilityStatementTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRCapabilityStatementTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRCarePlanTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRCarePlanTest.php index 50d51e7fdd..a078a967f2 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRCarePlanTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRCarePlanTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRCareTeamTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRCareTeamTest.php index 5a85d5b6bf..424ed396aa 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRCareTeamTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRCareTeamTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRChargeItemTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRChargeItemTest.php index 638266abf2..3f9cbdfc61 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRChargeItemTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRChargeItemTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRClaimResponseTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRClaimResponseTest.php index 862cfdcbb0..26b3fdd195 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRClaimResponseTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRClaimResponseTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRClaimTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRClaimTest.php index d225bf2f94..51f2e2ef87 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRClaimTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRClaimTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRClinicalImpressionTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRClinicalImpressionTest.php index 3abe143196..f96064a489 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRClinicalImpressionTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRClinicalImpressionTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRCodeSystemTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRCodeSystemTest.php index 655bf2b49a..b45a1d4ca9 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRCodeSystemTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRCodeSystemTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRCommunicationRequestTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRCommunicationRequestTest.php index e9cfcc83b8..a238f4ed27 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRCommunicationRequestTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRCommunicationRequestTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRCommunicationTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRCommunicationTest.php index 2f6af127e4..f89b1bcbf8 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRCommunicationTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRCommunicationTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRCompartmentDefinitionTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRCompartmentDefinitionTest.php index b2af3eef34..771e295de1 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRCompartmentDefinitionTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRCompartmentDefinitionTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRCompositionTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRCompositionTest.php index dc8b43ce0b..dd00d69053 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRCompositionTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRCompositionTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRConceptMapTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRConceptMapTest.php index 269d1fa803..fbf18d7794 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRConceptMapTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRConceptMapTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRConditionTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRConditionTest.php index 52a7839a86..5870eff64a 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRConditionTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRConditionTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRConsentTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRConsentTest.php index 6d6b9dfb65..5af156cbe8 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRConsentTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRConsentTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRContractTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRContractTest.php index c2b4b0814c..3b4749af7c 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRContractTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRContractTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRCoverageTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRCoverageTest.php index b2641f708b..46274cdbe1 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRCoverageTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRCoverageTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRDataElementTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRDataElementTest.php index f204a89f05..de79ad8cea 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRDataElementTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRDataElementTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRDetectedIssueTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRDetectedIssueTest.php index 9e96110171..83b1972279 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRDetectedIssueTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRDetectedIssueTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRDeviceComponentTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRDeviceComponentTest.php index 6fb56abbe4..bb332b8f87 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRDeviceComponentTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRDeviceComponentTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRDeviceMetricTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRDeviceMetricTest.php index d1c8c78a9a..3815152958 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRDeviceMetricTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRDeviceMetricTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRDeviceRequestTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRDeviceRequestTest.php index b4e2c74909..5424aced67 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRDeviceRequestTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRDeviceRequestTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRDeviceTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRDeviceTest.php index 7cf85bb87a..6e822a2c79 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRDeviceTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRDeviceTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRDeviceUseStatementTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRDeviceUseStatementTest.php index 59aa073a1d..f16a59cc0d 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRDeviceUseStatementTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRDeviceUseStatementTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRDiagnosticReportTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRDiagnosticReportTest.php index 324c1e9022..589dbd4e00 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRDiagnosticReportTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRDiagnosticReportTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRDocumentManifestTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRDocumentManifestTest.php index 7e27824531..9765ec3b40 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRDocumentManifestTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRDocumentManifestTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRDocumentReferenceTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRDocumentReferenceTest.php index 83613eda2c..6041f73adb 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRDocumentReferenceTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRDocumentReferenceTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIREligibilityRequestTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIREligibilityRequestTest.php index b80c2e629a..3e86f62bd8 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIREligibilityRequestTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIREligibilityRequestTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIREligibilityResponseTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIREligibilityResponseTest.php index 35379aa68c..bf7fd21376 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIREligibilityResponseTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIREligibilityResponseTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIREncounterTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIREncounterTest.php index 5bb329394b..fa6c8be444 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIREncounterTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIREncounterTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIREndpointTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIREndpointTest.php index 535419b9c9..665618c1e1 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIREndpointTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIREndpointTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIREnrollmentRequestTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIREnrollmentRequestTest.php index 3d85c8ead5..389fc50edd 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIREnrollmentRequestTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIREnrollmentRequestTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIREnrollmentResponseTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIREnrollmentResponseTest.php index 07c14088cc..db30a081a9 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIREnrollmentResponseTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIREnrollmentResponseTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIREpisodeOfCareTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIREpisodeOfCareTest.php index 453f59691b..51a7a8ded1 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIREpisodeOfCareTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIREpisodeOfCareTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRExpansionProfileTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRExpansionProfileTest.php index 66f43aa90a..aa797c2b78 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRExpansionProfileTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRExpansionProfileTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRExplanationOfBenefitTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRExplanationOfBenefitTest.php index 70f621d20a..a0ca0e307f 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRExplanationOfBenefitTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRExplanationOfBenefitTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRFamilyMemberHistoryTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRFamilyMemberHistoryTest.php index 1ed43a578f..53e441dd0d 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRFamilyMemberHistoryTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRFamilyMemberHistoryTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRFlagTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRFlagTest.php index ba5068c31c..22b723f7e9 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRFlagTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRFlagTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRGoalTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRGoalTest.php index 0ab3522a5c..ab711f9d0d 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRGoalTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRGoalTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRGraphDefinitionTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRGraphDefinitionTest.php index 59fc3719ab..78c57dbfe9 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRGraphDefinitionTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRGraphDefinitionTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRGroupTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRGroupTest.php index 50e8bdab06..0bdd04bc1c 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRGroupTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRGroupTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRGuidanceResponseTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRGuidanceResponseTest.php index feaf10f0d4..86a4c21c68 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRGuidanceResponseTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRGuidanceResponseTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRHealthcareServiceTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRHealthcareServiceTest.php index d678be8a32..e4078bd00a 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRHealthcareServiceTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRHealthcareServiceTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRImagingManifestTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRImagingManifestTest.php index 680da15b7c..fb608cdae9 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRImagingManifestTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRImagingManifestTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRImagingStudyTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRImagingStudyTest.php index 4a56f4a11a..a4136e5cf5 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRImagingStudyTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRImagingStudyTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRImmunizationRecommendationTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRImmunizationRecommendationTest.php index 77c46f9e9b..ad0781f958 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRImmunizationRecommendationTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRImmunizationRecommendationTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRImmunizationTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRImmunizationTest.php index 8a8f8b5ca9..22defb648a 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRImmunizationTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRImmunizationTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRImplementationGuideTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRImplementationGuideTest.php index 05162ce34e..342be6aaec 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRImplementationGuideTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRImplementationGuideTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRLibraryTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRLibraryTest.php index b6f80c0d90..3ec2ac17d7 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRLibraryTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRLibraryTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRLinkageTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRLinkageTest.php index 832e0f9729..fc09336137 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRLinkageTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRLinkageTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRListTest.php index 6fc12845f1..d50653531e 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRLocationTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRLocationTest.php index 8f393bb5be..92ecfc13f4 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRLocationTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRLocationTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRMeasureReportTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRMeasureReportTest.php index 7139e4a528..a7af87f911 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRMeasureReportTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRMeasureReportTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRMeasureTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRMeasureTest.php index 37ae631333..120f4c5da0 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRMeasureTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRMeasureTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRMediaTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRMediaTest.php index 41386d8735..019c1cc50a 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRMediaTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRMediaTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRMedicationAdministrationTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRMedicationAdministrationTest.php index 0896c53fa9..2b889b9c70 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRMedicationAdministrationTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRMedicationAdministrationTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRMedicationDispenseTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRMedicationDispenseTest.php index 69b74fd7db..56d676899a 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRMedicationDispenseTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRMedicationDispenseTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRMedicationRequestTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRMedicationRequestTest.php index 4e3ebeed98..52b39994b3 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRMedicationRequestTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRMedicationRequestTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRMedicationStatementTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRMedicationStatementTest.php index fef05780e9..caa0c360f8 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRMedicationStatementTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRMedicationStatementTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRMedicationTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRMedicationTest.php index 9849354762..452ed809fb 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRMedicationTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRMedicationTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRMessageDefinitionTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRMessageDefinitionTest.php index 9eab407fa1..be4cacbc1b 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRMessageDefinitionTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRMessageDefinitionTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRMessageHeaderTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRMessageHeaderTest.php index 4594b4afa5..9f308e139a 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRMessageHeaderTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRMessageHeaderTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRNamingSystemTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRNamingSystemTest.php index 88597b77fc..b80a42c812 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRNamingSystemTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRNamingSystemTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRNutritionOrderTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRNutritionOrderTest.php index 3cedf96b49..bfce411192 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRNutritionOrderTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRNutritionOrderTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRObservationTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRObservationTest.php index 4c2cef030f..c3663e04be 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRObservationTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRObservationTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIROperationDefinitionTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIROperationDefinitionTest.php index da7394204b..045b49f015 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIROperationDefinitionTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIROperationDefinitionTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIROperationOutcomeTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIROperationOutcomeTest.php index 68939b2832..4d03b62c46 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIROperationOutcomeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIROperationOutcomeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIROrganizationTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIROrganizationTest.php index da81ed3bd5..a0852ecdb2 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIROrganizationTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIROrganizationTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRPatientTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRPatientTest.php index 7fb67d5f50..298986be80 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRPatientTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRPatientTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRPaymentNoticeTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRPaymentNoticeTest.php index 8498e23026..69d6ef761f 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRPaymentNoticeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRPaymentNoticeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRPaymentReconciliationTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRPaymentReconciliationTest.php index 0591cdb77e..a43f9c80ea 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRPaymentReconciliationTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRPaymentReconciliationTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRPersonTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRPersonTest.php index d9a37c8d36..2c5c2b61b2 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRPersonTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRPersonTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRPlanDefinitionTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRPlanDefinitionTest.php index 03d8269cc1..5db299d78f 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRPlanDefinitionTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRPlanDefinitionTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRPractitionerRoleTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRPractitionerRoleTest.php index d6aa2e9763..4d530ed5cb 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRPractitionerRoleTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRPractitionerRoleTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRPractitionerTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRPractitionerTest.php index 95c2f90423..8a5ddca744 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRPractitionerTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRPractitionerTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRProcedureRequestTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRProcedureRequestTest.php index 89ef2cb167..bced693cd3 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRProcedureRequestTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRProcedureRequestTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRProcedureTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRProcedureTest.php index e74d321e12..819683e4fd 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRProcedureTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRProcedureTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRProcessRequestTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRProcessRequestTest.php index 81db4f29a5..2d85bd0c6c 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRProcessRequestTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRProcessRequestTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRProcessResponseTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRProcessResponseTest.php index 5c00550a22..ba2a0a7fd1 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRProcessResponseTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRProcessResponseTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRProvenanceTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRProvenanceTest.php index 0608bb1294..b959e2b4d5 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRProvenanceTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRProvenanceTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRQuestionnaireResponseTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRQuestionnaireResponseTest.php index ca84675b61..9956747813 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRQuestionnaireResponseTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRQuestionnaireResponseTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRQuestionnaireTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRQuestionnaireTest.php index 957c5d1b02..76f97b408e 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRQuestionnaireTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRQuestionnaireTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRReferralRequestTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRReferralRequestTest.php index e1b95117fe..0302c760ee 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRReferralRequestTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRReferralRequestTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRRelatedPersonTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRRelatedPersonTest.php index bcbc504df3..01966c05e2 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRRelatedPersonTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRRelatedPersonTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRRequestGroupTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRRequestGroupTest.php index 416e1a2f9f..b44409925c 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRRequestGroupTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRRequestGroupTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRResearchStudyTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRResearchStudyTest.php index 5546eae934..428d72cb3b 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRResearchStudyTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRResearchStudyTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRResearchSubjectTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRResearchSubjectTest.php index 019addcade..759a1ac4cf 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRResearchSubjectTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRResearchSubjectTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRRiskAssessmentTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRRiskAssessmentTest.php index 7987b783fc..1277f172f5 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRRiskAssessmentTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRRiskAssessmentTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRScheduleTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRScheduleTest.php index 34f6af61ca..8daeb2c731 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRScheduleTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRScheduleTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRSearchParameterTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRSearchParameterTest.php index 1df2901c0b..e845684e2f 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRSearchParameterTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRSearchParameterTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRSequenceTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRSequenceTest.php index 419d477e21..49293841fd 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRSequenceTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRSequenceTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRServiceDefinitionTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRServiceDefinitionTest.php index f0a597ee01..1a1157b42f 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRServiceDefinitionTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRServiceDefinitionTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRSlotTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRSlotTest.php index d9dea56f3b..203b0917ad 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRSlotTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRSlotTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRSpecimenTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRSpecimenTest.php index 599b9de3f2..5fbce99e26 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRSpecimenTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRSpecimenTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRStructureDefinitionTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRStructureDefinitionTest.php index fd8ddfd4af..7e79b52132 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRStructureDefinitionTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRStructureDefinitionTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRStructureMapTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRStructureMapTest.php index b7ca7d3cc0..d4eccc5181 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRStructureMapTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRStructureMapTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRSubscriptionTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRSubscriptionTest.php index d25dca5af4..1f42761f1b 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRSubscriptionTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRSubscriptionTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRSubstanceTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRSubstanceTest.php index 05587fa672..a32815dcc7 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRSubstanceTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRSubstanceTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRSupplyDeliveryTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRSupplyDeliveryTest.php index 75057e6e3b..71a473f86d 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRSupplyDeliveryTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRSupplyDeliveryTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRSupplyRequestTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRSupplyRequestTest.php index 7a57d7f4be..f7cbd7fd92 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRSupplyRequestTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRSupplyRequestTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRTaskTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRTaskTest.php index 1a448f01b6..3829624535 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRTaskTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRTaskTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRTestReportTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRTestReportTest.php index d39cdc4ce6..1702392cf3 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRTestReportTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRTestReportTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRTestScriptTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRTestScriptTest.php index 66fb35fecc..72211c5f38 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRTestScriptTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRTestScriptTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRValueSetTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRValueSetTest.php index 84d1b8c5b8..42f704d2ea 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRValueSetTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRValueSetTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRVisionPrescriptionTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRVisionPrescriptionTest.php index 9977d2c297..df4f97ea57 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRVisionPrescriptionTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResource/FHIRVisionPrescriptionTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResourceTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResourceTest.php index bd27b365f2..4366c32fa0 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResourceTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRDomainResourceTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRParametersTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRParametersTest.php index ec860b0008..b6bfc37f73 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRParametersTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResource/FHIRParametersTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResourceContainerTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResourceContainerTest.php index 6347c50a7a..37134971f3 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResourceContainerTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResourceContainerTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResourceTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResourceTest.php index c8a7670be8..bfa6d39e64 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResourceTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResourceTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResourceTypeListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResourceTypeListTest.php index aa11f5ba9a..d158be0d20 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResourceTypeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResourceTypeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResourceTypeTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResourceTypeTest.php index bd9bfe4995..9ac37110d0 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResourceTypeTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResourceTypeTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResourceVersionPolicyListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResourceVersionPolicyListTest.php index a9df3b8b6e..b4a14261b2 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResourceVersionPolicyListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResourceVersionPolicyListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResponseTypeListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResponseTypeListTest.php index 1bf9e1f8b8..3c8c8637f7 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResponseTypeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRResponseTypeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRRestfulCapabilityModeListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRRestfulCapabilityModeListTest.php index dfe0d5934f..fff9193dbe 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRRestfulCapabilityModeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRRestfulCapabilityModeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRSampledDataDataTypePrimitiveTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRSampledDataDataTypePrimitiveTest.php index a44a47522b..1d2580811b 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRSampledDataDataTypePrimitiveTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRSampledDataDataTypePrimitiveTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRSearchComparatorListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRSearchComparatorListTest.php index 0950028da6..0faa134290 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRSearchComparatorListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRSearchComparatorListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRSearchEntryModeListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRSearchEntryModeListTest.php index d2fb3d49b2..eb710da759 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRSearchEntryModeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRSearchEntryModeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRSearchModifierCodeListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRSearchModifierCodeListTest.php index 911c7736e4..139da522aa 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRSearchModifierCodeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRSearchModifierCodeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRSearchParamTypeListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRSearchParamTypeListTest.php index cb18bec3f9..1b150ce59d 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRSearchParamTypeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRSearchParamTypeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRSlicingRulesListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRSlicingRulesListTest.php index c806dca5c5..f847550794 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRSlicingRulesListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRSlicingRulesListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRSlotStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRSlotStatusListTest.php index c76cd1e087..c0380db900 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRSlotStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRSlotStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRSpecimenStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRSpecimenStatusListTest.php index e7df3fd4af..8cd84090df 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRSpecimenStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRSpecimenStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRStringPrimitiveTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRStringPrimitiveTest.php index d3ef102dcc..e342dc86ef 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRStringPrimitiveTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRStringPrimitiveTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRStructureDefinitionKindListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRStructureDefinitionKindListTest.php index cc4ee93ff3..efa810345f 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRStructureDefinitionKindListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRStructureDefinitionKindListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRStructureMapContextTypeListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRStructureMapContextTypeListTest.php index 95e0740581..61658f3836 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRStructureMapContextTypeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRStructureMapContextTypeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRStructureMapGroupTypeModeListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRStructureMapGroupTypeModeListTest.php index 7606b3ec9e..2b35f0c5f3 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRStructureMapGroupTypeModeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRStructureMapGroupTypeModeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRStructureMapInputModeListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRStructureMapInputModeListTest.php index a9601abf7f..937d65fa33 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRStructureMapInputModeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRStructureMapInputModeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRStructureMapModelModeListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRStructureMapModelModeListTest.php index 63e5880828..182b24f774 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRStructureMapModelModeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRStructureMapModelModeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRStructureMapSourceListModeListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRStructureMapSourceListModeListTest.php index 407148660b..02cfcac399 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRStructureMapSourceListModeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRStructureMapSourceListModeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRStructureMapTargetListModeListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRStructureMapTargetListModeListTest.php index 25427a19e4..c61d601589 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRStructureMapTargetListModeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRStructureMapTargetListModeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRStructureMapTransformListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRStructureMapTransformListTest.php index 2744f36ae4..1f670df0e5 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRStructureMapTransformListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRStructureMapTransformListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRSubscriptionChannelTypeListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRSubscriptionChannelTypeListTest.php index 6de9deb47f..102ca39ba7 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRSubscriptionChannelTypeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRSubscriptionChannelTypeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRSubscriptionStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRSubscriptionStatusListTest.php index 159abd52dd..4973a31222 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRSubscriptionStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRSubscriptionStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRSupplyDeliveryStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRSupplyDeliveryStatusListTest.php index fa0961251d..6846403c4c 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRSupplyDeliveryStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRSupplyDeliveryStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRSupplyRequestStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRSupplyRequestStatusListTest.php index eaae535d19..cf48ddd782 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRSupplyRequestStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRSupplyRequestStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRSystemRestfulInteractionListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRSystemRestfulInteractionListTest.php index b5aa973dbd..271a50e18e 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRSystemRestfulInteractionListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRSystemRestfulInteractionListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRSystemVersionProcessingModeListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRSystemVersionProcessingModeListTest.php index 78b3d3466c..a96cdfe5e9 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRSystemVersionProcessingModeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRSystemVersionProcessingModeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRTaskStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRTaskStatusListTest.php index f43ee1f292..e34dc75101 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRTaskStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRTaskStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRTestReportActionResultListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRTestReportActionResultListTest.php index 85831d8bdb..228a8b5573 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRTestReportActionResultListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRTestReportActionResultListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRTestReportParticipantTypeListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRTestReportParticipantTypeListTest.php index 00183fde1f..bd5395686b 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRTestReportParticipantTypeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRTestReportParticipantTypeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRTestReportResultListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRTestReportResultListTest.php index 9e94794bfe..c2eb56b8ed 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRTestReportResultListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRTestReportResultListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRTestReportStatusListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRTestReportStatusListTest.php index 23243a3f45..b2960f8d43 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRTestReportStatusListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRTestReportStatusListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRTestScriptRequestMethodCodeListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRTestScriptRequestMethodCodeListTest.php index 800f6db381..fdfa4986bd 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRTestScriptRequestMethodCodeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRTestScriptRequestMethodCodeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRTimePrimitiveTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRTimePrimitiveTest.php index 95d119616c..3735341a0f 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRTimePrimitiveTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRTimePrimitiveTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRTriggerTypeListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRTriggerTypeListTest.php index b584146477..dbaed55155 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRTriggerTypeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRTriggerTypeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRTypeDerivationRuleListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRTypeDerivationRuleListTest.php index c498b3a316..d93c166ddb 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRTypeDerivationRuleListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRTypeDerivationRuleListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRTypeRestfulInteractionListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRTypeRestfulInteractionListTest.php index bc5506f8bc..72a50d3ae5 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRTypeRestfulInteractionListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRTypeRestfulInteractionListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRUDIEntryTypeListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRUDIEntryTypeListTest.php index 8220b7531c..6590968d29 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRUDIEntryTypeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRUDIEntryTypeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRUnitsOfTimeListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRUnitsOfTimeListTest.php index d3296dd085..a0830d3abe 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRUnitsOfTimeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRUnitsOfTimeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRUnknownContentCodeListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRUnknownContentCodeListTest.php index 7ecd9a3713..68f332db9c 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRUnknownContentCodeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRUnknownContentCodeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRUnsignedIntPrimitiveTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRUnsignedIntPrimitiveTest.php index 0565aea3ce..4228facd5b 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRUnsignedIntPrimitiveTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRUnsignedIntPrimitiveTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRUriPrimitiveTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRUriPrimitiveTest.php index 00d5dde0cb..7d10957375 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRUriPrimitiveTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRUriPrimitiveTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRUseListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRUseListTest.php index 6de2bf9d3a..60dc151353 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRUseListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRUseListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRUuidPrimitiveTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRUuidPrimitiveTest.php index 4c21b9a50c..20226843b2 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRUuidPrimitiveTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRUuidPrimitiveTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRVisionBaseListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRVisionBaseListTest.php index 3e24f9132d..53f18d41b3 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRVisionBaseListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRVisionBaseListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRVisionEyesListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRVisionEyesListTest.php index c7e7be202a..f65f2b19c6 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRVisionEyesListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRVisionEyesListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRXPathUsageTypeListTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRXPathUsageTypeListTest.php index 7271f40564..d69443bf94 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRXPathUsageTypeListTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/FHIRXPathUsageTypeListTest.php @@ -5,7 +5,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/PHPFHIRConstantsTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/PHPFHIRConstantsTest.php index 98dfc7881e..3b0f7862f8 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/PHPFHIRConstantsTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/PHPFHIRConstantsTest.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/PHPFHIRTypeMapTest.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/PHPFHIRTypeMapTest.php index f0e0be58db..253c13cfca 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/PHPFHIRTypeMapTest.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTests/PHPFHIRTypeMapTest.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTypeInterface.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTypeInterface.php index 1865e9c90b..41b7c9fa7c 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTypeInterface.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTypeInterface.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: * diff --git a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTypeMap.php b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTypeMap.php index 5e99a1192b..c5144e1996 100644 --- a/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTypeMap.php +++ b/src/DCarbone/PHPFHIRGenerated/STU3/PHPFHIRTypeMap.php @@ -6,7 +6,7 @@ * This class was generated with the PHPFHIR library (https://github.com/dcarbone/php-fhir) using * class definitions from HL7 FHIR (https://www.hl7.org/fhir/) * - * Class creation date: November 10th, 2019 18:12+0000 + * Class creation date: November 17th, 2019 04:38+0000 * * PHPFHIR Copyright: *